diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index 52c65f0c3da..a243b94c2da 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -23,7 +23,7 @@ import account
 import installer
 import project
 import partner
-import invoice
+import account_invoice
 import account_bank_statement
 import account_bank
 import account_cash_statement
@@ -32,8 +32,8 @@ import account_analytic_line
 import wizard
 import report
 import product
-import sequence
+import ir_sequence
 import company
 import res_currency
-
+import edi
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index a0ff63ba0d3..e9cd0ed2254 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Accounting & Finance',
     'complexity': "normal",
     "description": """
 Accounting and Financial Management.
@@ -53,7 +53,7 @@ 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"],
+    "depends" : ["base_setup", "product", "analytic", "process", "board", "edi"],
     'update_xml': [
         'security/account_security.xml',
         'security/ir.model.access.csv',
@@ -99,12 +99,12 @@ module named account_voucher.
         'wizard/account_reconcile_partner_process_view.xml',
         'wizard/account_automatic_reconcile_view.xml',
         'wizard/account_tax_generate_view.xml',
+        'wizard/account_financial_report_view.xml',
         'project/wizard/project_account_analytic_line_view.xml',
         'account_end_fy.xml',
         'account_invoice_view.xml',
         'partner_view.xml',
-        'data/account_invoice.xml',
-        'data/account_data2.xml',
+        'data/account_data.xml',
         'account_invoice_workflow.xml',
         'project/project_view.xml',
         'project/project_report.xml',
@@ -119,12 +119,14 @@ module named account_voucher.
         'process/statement_process.xml',
         'process/customer_invoice_process.xml',
         'process/supplier_invoice_process.xml',
-        'sequence_view.xml',
+        'ir_sequence_view.xml',
         'company_view.xml',
         'board_account_view.xml',
         "wizard/account_report_profit_loss_view.xml",
         "wizard/account_report_balance_sheet_view.xml",
-        "account_bank_view.xml"
+        "edi/invoice_action_data.xml",
+        "account_bank_view.xml",
+        "account_pre_install.yml"
     ],
     'demo_xml': [
         'demo/account_demo.xml',
@@ -146,10 +148,9 @@ module named account_voucher.
         'test/account_fiscalyear_close.yml',
         'test/account_bank_statement.yml',
         'test/account_cash_statement.yml',
+        'test/test_edi_invoice.yml',
         'test/account_report.yml',
-
-
-            ],
+    ],
     'installable': True,
     'active': False,
     'certificate': '0080331923549',
diff --git a/addons/account/account.py b/addons/account/account.py
index cf290f2ad36..a347f5bcce2 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -102,7 +102,7 @@ class account_payment_term_line(osv.osv):
                                    ('fixed', 'Fixed Amount')], 'Valuation',
                                    required=True, help="""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."""),
 
-        'value_amount': fields.float('Value Amount', digits_compute=dp.get_precision('Payment Term'), help="For Value percent enter % ratio between 0-1."),
+        'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
         '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)."),
@@ -131,7 +131,7 @@ class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
     _columns = {
-        'name': fields.char('Acc. Type Name', size=64, required=True),
+        'name': fields.char('Account Type', size=64, required=True),
         'code': fields.char('Code', size=32, required=True),
         'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
 
@@ -139,14 +139,14 @@ 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."""),
-        'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign on Reports', required=True, help='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.'),
+        'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='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.'),
         'report_type':fields.selection([
             ('none','/'),
             ('income','Profit & Loss (Income Accounts)'),
             ('expense','Profit & Loss (Expense Accounts)'),
-            ('asset','Balance Sheet (Assets Accounts)'),
+            ('asset','Balance Sheet (Asset Accounts)'),
             ('liability','Balance Sheet (Liability Accounts)')
-        ],'P&L / BS Category', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
+        ],'P&L / BS Category', select=True, readonly=False, help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
         'note': fields.text('Description'),
     }
     _defaults = {
@@ -243,13 +243,15 @@ class account_account(osv.osv):
             'balance': "COALESCE(SUM(l.debit),0) " \
                        "- COALESCE(SUM(l.credit), 0) as balance",
             'debit': "COALESCE(SUM(l.debit), 0) as debit",
-            'credit': "COALESCE(SUM(l.credit), 0) as credit"
+            'credit': "COALESCE(SUM(l.credit), 0) as credit",
+            'foreign_balance': "COALESCE(SUM(l.amount_currency), 0) as foreign_balance",
         }
         #get all the necessary accounts
         children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
         #compute for each account the balance/debit/credit from the move lines
         accounts = {}
         res = {}
+        null_result = dict((fn, 0.0) for fn in field_names)
         if children_and_consolidated:
             aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
@@ -269,7 +271,7 @@ class account_account(osv.osv):
             # ON l.account_id = tmp.id
             # or make _get_children_and_consol return a query and join on that
             request = ("SELECT l.account_id as id, " +\
-                       ', '.join(map(mapping.__getitem__, field_names)) +
+                       ', '.join(map(mapping.__getitem__, mapping.keys())) +
                        " FROM account_move_line l" \
                        " WHERE l.account_id IN %s " \
                             + filters +
@@ -288,7 +290,7 @@ class account_account(osv.osv):
             sums = {}
             currency_obj = self.pool.get('res.currency')
             while brs:
-                current = brs[0]
+                current = brs.pop(0)
 #                can_compute = True
 #                for child in current.child_id:
 #                    if child.id not in sums:
@@ -298,7 +300,6 @@ class account_account(osv.osv):
 #                        except ValueError:
 #                            brs.insert(0, child)
 #                if can_compute:
-                brs.pop(0)
                 for fn in field_names:
                     sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
                     for child in current.child_id:
@@ -306,12 +307,21 @@ class account_account(osv.osv):
                             sums[current.id][fn] += sums[child.id][fn]
                         else:
                             sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
-            null_result = dict((fn, 0.0) for fn in field_names)
+
+                # as we have to relay on values computed before this is calculated separately than previous fields
+                if current.currency_id and current.exchange_rate and \
+                            ('adjusted_balance' in field_names or 'unrealized_gain_loss' in field_names):
+                    # Computing Adjusted Balance and Unrealized Gains and losses
+                    # Adjusted Balance = Foreign Balance / Exchange Rate
+                    # Unrealized Gains and losses = Adjusted Balance - Balance
+                    adj_bal = sums[current.id].get('foreign_balance', 0.0) / current.exchange_rate
+                    sums[current.id].update({'adjusted_balance': adj_bal, 'unrealized_gain_loss': adj_bal - sums[current.id].get('balance', 0.0)})
+
             for id in ids:
                 res[id] = sums.get(id, null_result)
         else:
             for id in ids:
-                res[id] = 0.0
+                res[id] = null_result
         return res
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
@@ -340,14 +350,61 @@ class account_account(osv.osv):
         accounts = self.browse(cr, uid, ids, context=context)
         for account in accounts:
             level = 0
-            if account.parent_id:
-                obj = self.browse(cr, uid, account.parent_id.id)
-                level = obj.level + 1
+            parent = account.parent_id
+            while parent:
+                level += 1
+                parent = parent.parent_id
             res[account.id] = level
         return res
 
+    def _set_credit_debit(self, cr, uid, account_id, name, value, arg, context=None):
+        if context.get('config_invisible', True):
+            return True
+
+        account = self.browse(cr, uid, account_id, context=context)
+        diff = value - getattr(account,name)
+        if not diff:
+            return True
+
+        journal_obj = self.pool.get('account.journal')
+        jids = journal_obj.search(cr, uid, [('type','=','situation'),('centralisation','=',1),('company_id','=',account.company_id.id)], context=context)
+        if not jids:
+            raise osv.except_osv(_('Error!'),_("You need an Opening journal with centralisation checked to set the initial balance!"))
+
+        period_obj = self.pool.get('account.period')
+        pids = period_obj.search(cr, uid, [('special','=',True),('company_id','=',account.company_id.id)], context=context)
+        if not pids:
+            raise osv.except_osv(_('Error!'),_("No opening/closing period defined, please create one to set the initial balance!"))
+
+        move_obj = self.pool.get('account.move.line')
+        move_id = move_obj.search(cr, uid, [
+            ('journal_id','=',jids[0]),
+            ('period_id','=',pids[0]),
+            ('account_id','=', account_id),
+            (name,'>', 0.0),
+            ('name','=', _('Opening Balance'))
+        ], context=context)
+        if move_id:
+            move = move_obj.browse(cr, uid, move_id[0], context=context)
+            move_obj.write(cr, uid, move_id[0], {
+                name: diff+getattr(move,name)
+            }, context=context)
+        else:
+            if diff<0.0:
+                raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)!"))
+            nameinv = (name=='credit' and 'debit') or 'credit'
+            move_id = move_obj.create(cr, uid, {
+                'name': _('Opening Balance'),
+                'account_id': account_id,
+                'journal_id': jids[0],
+                'period_id': pids[0],
+                name: diff,
+                nameinv: 0.0
+            }, context=context)
+        return True
+
     _columns = {
-        'name': fields.char('Name', size=128, required=True, select=True),
+        'name': fields.char('Name', size=256, required=True, select=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'code': fields.char('Code', size=64, required=True, select=1),
         'type': fields.selection([
@@ -358,21 +415,28 @@ class account_account(osv.osv):
             ('liquidity','Liquidity'),
             ('consolidation', 'Consolidation'),
             ('closed', 'Closed'),
-        ], 'Internal Type', required=True, help="This type is used to differentiate types with "\
-            "special effects in OpenERP: view can not have entries, consolidation are accounts that "\
+        ], 'Internal Type', required=True, help="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."),
         'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
-            help="These types are defined according to your country. The type contains more information "\
-            "about the account and its specificities."),
+            help="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."),
         'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
         'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
-        'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
-        'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
-        'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."),
+        'credit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
+        'debit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
+        'foreign_balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Foreign Balance', multi='balance',
+                                           help="Total amount (in Secondary currency) for transactions held in secondary currency for this account."),
+        'adjusted_balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Adjusted Balance', multi='balance',
+                                            help="Total amount (in Company currency) for transactions held in secondary currency for this account."),
+        'unrealized_gain_loss': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Unrealized Gain or Loss', multi='balance',
+                                                help="Value of Loss or Gain due to changes in exchange rate when doing multi-currency transactions."),
+        'reconcile': fields.boolean('Allow Reconciliation', help="Check this box if this account allows reconciliation of journal items."),
+        'exchange_rate': fields.related('currency_id', 'rate', type='float', string='Exchange Rate', digits=(12,6)),
         'shortcut': fields.char('Shortcut', size=12),
         'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
             'account_id', 'tax_id', 'Default Taxes'),
@@ -390,11 +454,14 @@ class account_account(osv.osv):
             'manage this. So if you import from another software system you may have to use the rate at date. ' \
             'Incoming transactions always use the rate at date.', \
             required=True),
-        'level': fields.function(_get_level, string='Level', store=True, type='integer'),
+        'level': fields.function(_get_level, string='Level', method=True, type='integer',
+             store={
+                    'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
+                   }),
     }
 
     _defaults = {
-        'type': 'view',
+        'type': 'other',
         'reconcile': False,
         'active': True,
         'currency_mode': 'current',
@@ -431,9 +498,16 @@ class account_account(osv.osv):
                 return False
         return True
 
+    def _check_account_type(self, cr, uid, ids, context=None):
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.type in ('receivable', 'payable') and account.user_type.close_method != 'unreconciled':
+                return False
+        return True
+
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']),
-        (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
+        (_check_type, 'Configuration Error! \nYou can not define children to an account with internal type different of "View"! ', ['type']),
+        (_check_account_type, 'Configuration Error! \nYou can not select an account type with a deferral method different of "Unreconciled" for accounts with internal type "Payable/Receivable"! ', ['user_type','type']),
     ]
     _sql_constraints = [
         ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
@@ -509,14 +583,14 @@ class account_account(osv.osv):
 
         if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
             if method == 'write':
-                raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
+                raise osv.except_osv(_('Error !'), _('You can not desactivate an account that contains some journal items.'))
             elif method == 'unlink':
-                raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
+                raise osv.except_osv(_('Error !'), _('You can not remove an account containing journal items!. '))
         #Checking whether the account is set as a property to any Partner or not
         value = 'account.account,' + str(ids[0])
         partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
         if partner_prop_acc:
-            raise osv.except_osv(_('Warning !'), _('You cannot remove/deactivate an account which is set as a property to any Partner.'))
+            raise osv.except_osv(_('Warning !'), _('You can not remove/desactivate an account which is set on a customer or supplier.'))
         return True
 
     def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
@@ -529,15 +603,20 @@ class account_account(osv.osv):
             if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
                 #Check for 'Closed' type
                 if old_type == 'closed' and new_type !='closed':
-                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains account entries!"))
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!"))
                 #Check for change From group1 to group2 and vice versa
                 if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
-                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains account entries!") % (old_type,new_type,))
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
+
         if context is None:
             context = {}
+        if not ids:
+            return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
 
         # Dont allow changing the company_id when account_move_line already exist
         if 'company_id' in vals:
@@ -604,11 +683,11 @@ class account_journal(osv.osv):
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
         'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
-                                 help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
-                                 " 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."),
+                                 help="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."),
         'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
         'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP 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."),
@@ -623,7 +702,7 @@ class account_journal(osv.osv):
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
-        'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
+        'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
     }
 
     _defaults = {
@@ -637,6 +716,19 @@ class account_journal(osv.osv):
 
     _order = 'code'
 
+    def _check_currency(self, cr, uid, ids, context=None):
+        for journal in self.browse(cr, uid, ids, context=context):
+            if journal.currency:
+                if journal.default_credit_account_id and not journal.default_credit_account_id.currency_id.id == journal.currency.id:
+                    return False
+                if journal.default_debit_account_id and not journal.default_debit_account_id.currency_id.id == journal.currency.id:
+                    return False
+        return True
+
+    _constraints = [
+        (_check_currency, 'Configuration error! The 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):
         journal = self.browse(cr, uid, id, context=context)
         if not default:
@@ -650,44 +742,33 @@ class account_journal(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         for journal in self.browse(cr, uid, ids, context=context):
             if 'company_id' in vals and journal.company_id.id != vals['company_id']:
                 move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
                 if move_lines:
-                    raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
+                    raise osv.except_osv(_('Warning !'), _('You can not modify the company of this journal as its related record exist in journal items'))
         return super(account_journal, self).write(cr, uid, ids, vals, context=context)
 
     def create_sequence(self, cr, uid, vals, context=None):
+        """ Create new no_gap entry sequence for every new Joural
         """
-        Create new entry sequence for every new Joural
-        @param cr: cursor to database
-        @param user: id of current user
-        @param ids: list of record ids to be process
-        @param context: context arguments, like lang, time zone
-        @return: return a result
-        """
-        seq_pool = self.pool.get('ir.sequence')
-        seq_typ_pool = self.pool.get('ir.sequence.type')
-
-        name = vals['name']
-        code = vals['code'].lower()
-
-        types = {
-            'name': name,
-            'code': code
-        }
-        seq_typ_pool.create(cr, uid, types)
+        # in account.journal code is actually the prefix of the sequence
+        # whereas ir.sequence code is a key to lookup global sequences.
+        prefix = vals['code'].upper()
 
         seq = {
-            'name': name,
-            'code': code,
+            'name': vals['name'],
             'company_id': vals['company_id'],
-            'active': True,
-            'prefix': code + "/%(year)s/",
+            'implementation':'no_gap',
+            'prefix': prefix + "/%(year)s/",
             'padding': 4,
             'number_increment': 1
         }
-        return seq_pool.create(cr, uid, seq)
+        if 'company_id' in vals:
+            seq['company_id'] = vals['company_id']
+        return self.pool.get('ir.sequence').create(cr, uid, seq)
 
     def create(self, cr, uid, vals, context=None):
         if not 'sequence_id' in vals or not vals['sequence_id']:
@@ -779,21 +860,8 @@ class account_fiscalyear(osv.osv):
         'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
-    _order = "date_start"
+    _order = "date_start, id"
 
-    def _check_fiscal_year(self, cr, uid, ids, context=None):
-        current_fiscal_yr = self.browse(cr, uid, ids, context=context)[0]
-        obj_fiscal_ids = self.search(cr, uid, [('company_id', '=', current_fiscal_yr.company_id.id)], context=context)
-        obj_fiscal_ids.remove(ids[0])
-        data_fiscal_yr = self.browse(cr, uid, obj_fiscal_ids, context=context)
-
-        for old_fy in data_fiscal_yr:
-            if old_fy.company_id.id == current_fiscal_yr['company_id'].id:
-                # Condition to check if the current fiscal year falls in between any previously defined fiscal year
-                if old_fy.date_start <= current_fiscal_yr['date_start'] <= old_fy.date_stop or \
-                    old_fy.date_start <= current_fiscal_yr['date_stop'] <= old_fy.date_stop:
-                    return False
-        return True
 
     def _check_duration(self, cr, uid, ids, context=None):
         obj_fy = self.browse(cr, uid, ids[0], context=context)
@@ -802,8 +870,7 @@ class account_fiscalyear(osv.osv):
         return True
 
     _constraints = [
-        (_check_duration, 'Error! The duration of the Fiscal Year is invalid. ', ['date_stop']),
-        (_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
+        (_check_duration, 'Error! The start date of the fiscal year must be before his end date.', ['date_start','date_stop'])
     ]
 
     def create_period3(self, cr, uid, ids, context=None):
@@ -838,15 +905,26 @@ class account_fiscalyear(osv.osv):
         return True
 
     def find(self, cr, uid, dt=None, exception=True, context=None):
+        res = self.finds(cr, uid, dt, exception, context=context)
+        return res and res[0] or False
+
+    def finds(self, cr, uid, dt=None, exception=True, context=None):
+        if context is None: context = {}
         if not dt:
             dt = time.strftime('%Y-%m-%d')
-        ids = self.search(cr, uid, [('date_start', '<=', dt), ('date_stop', '>=', dt)])
+        args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
+        if context.get('company_id', False):
+            args.append(('company_id', '=', context['company_id']))
+        else:
+            company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+            args.append(('company_id', '=', company_id))
+        ids = self.search(cr, uid, args, context=context)
         if not ids:
             if exception:
                 raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one.'))
             else:
-                return False
-        return ids[0]
+                return []
+        return ids
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if args is None:
@@ -881,6 +959,9 @@ class account_period(osv.osv):
         'state': 'draft',
     }
     _order = "date_start, special desc"
+    _sql_constraints = [
+        ('name_company_uniq', 'unique(name, company_id)', 'The name of the period must be unique per company!'),
+    ]
 
     def _check_duration(self,cr,uid,ids,context=None):
         obj_period = self.browse(cr, uid, ids[0], context=context)
@@ -917,10 +998,17 @@ class account_period(osv.osv):
         return False
 
     def find(self, cr, uid, dt=None, context=None):
+        if context is None: context = {}
         if not dt:
             dt = time.strftime('%Y-%m-%d')
 #CHECKME: shouldn't we check the state of the period?
-        ids = self.search(cr, uid, [('date_start','<=',dt),('date_stop','>=',dt)])
+        args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
+        if context.get('company_id', False):
+            args.append(('company_id', '=', context['company_id']))
+        else:
+            company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+            args.append(('company_id', '=', company_id))
+        ids = self.search(cr, uid, args, context=context)
         if not ids:
             raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create one.')%dt)
         return ids
@@ -947,7 +1035,7 @@ class account_period(osv.osv):
         if 'company_id' in vals:
             move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
             if move_lines:
-                raise osv.except_osv(_('Warning !'), _('You cannot modify company of this period as its related record exist in Entry Lines'))
+                raise osv.except_osv(_('Warning !'), _('You can not modify company of this period as some journal items exists.'))
         return super(account_period, self).write(cr, uid, ids, vals, context=context)
 
     def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
@@ -1164,22 +1252,10 @@ class account_move(osv.osv):
                     return False
         return True
 
-    def _check_period_journal(self, cursor, user, ids, context=None):
-        for move in self.browse(cursor, user, ids, context=context):
-            for line in move.line_id:
-                if line.period_id.id != move.period_id.id:
-                    return False
-                if line.journal_id.id != move.journal_id.id:
-                    return False
-        return True
-
     _constraints = [
         (_check_centralisation,
-            'You cannot create more than one move per period on centralized journal',
+            'You can not create more than one move per period on centralized journal',
             ['journal_id']),
-        (_check_period_journal,
-            'You cannot create entries on different periods/journals in the same move',
-            ['line_id']),
     ]
 
     def post(self, cr, uid, ids, context=None):
@@ -1189,7 +1265,7 @@ class account_move(osv.osv):
         valid_moves = self.validate(cr, uid, ids, context)
 
         if not valid_moves:
-            raise osv.except_osv(_('Integrity Error !'), _('You cannot validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
+            raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non-balanced entry !\nMake sure you have configured payment terms properly !\nThe latest payment term line should be of the type "Balance" !'))
         obj_sequence = self.pool.get('ir.sequence')
         for move in self.browse(cr, uid, valid_moves, context=context):
             if move.name =='/':
@@ -1201,7 +1277,7 @@ class account_move(osv.osv):
                 else:
                     if journal.sequence_id:
                         c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
-                        new_name = obj_sequence.get_id(cr, uid, journal.sequence_id.id, context=c)
+                        new_name = obj_sequence.next_by_id(cr, uid, journal.sequence_id.id, c)
                     else:
                         raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
 
@@ -1225,7 +1301,7 @@ class account_move(osv.osv):
                 if not top:
                     top = account2.id
                 elif top<>account2.id:
-                    raise osv.except_osv(_('Error !'), _('You cannot validate a Journal Entry unless all journal items are in same chart of accounts !'))
+                    raise osv.except_osv(_('Error !'), _('You can not validate a journal entry unless all journal items belongs to the same chart of accounts !'))
         return self.post(cursor, user, ids, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
@@ -1243,7 +1319,7 @@ class account_move(osv.osv):
             context = {}
         c = context.copy()
         c['novalidate'] = True
-        result = super(osv.osv, self).write(cr, uid, ids, vals, c)
+        result = super(account_move, self).write(cr, uid, ids, vals, c)
         self.validate(cr, uid, ids, context=context)
         return result
 
@@ -1312,7 +1388,7 @@ class account_move(osv.osv):
         for move in self.browse(cr, uid, ids, context=context):
             if move['state'] != 'draft':
                 raise osv.except_osv(_('UserError'),
-                        _('You can not delete posted movement: "%s"!') % \
+                        _('You can not delete a posted journal entry "%s"!') % \
                                 move['name'])
             line_ids = map(lambda x: x.id, move.line_id)
             context['journal_id'] = move.journal_id.id
@@ -1332,7 +1408,7 @@ class account_move(osv.osv):
 
     def _centralise(self, cr, uid, move, mode, context=None):
         assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
-        currency_obj = self.pool.get('res.currency') 
+        currency_obj = self.pool.get('res.currency')
         if context is None:
             context = {}
 
@@ -1462,8 +1538,6 @@ class account_move(osv.osv):
                 # Update the move lines (set them as valid)
 
                 obj_move_line.write(cr, uid, line_draft_ids, {
-                    'journal_id': move.journal_id.id,
-                    'period_id': move.period_id.id,
                     'state': 'valid'
                 }, context, check=False)
 
@@ -1504,8 +1578,6 @@ class account_move(osv.osv):
                 # We can't validate it (it's unbalanced)
                 # Setting the lines as draft
                 obj_move_line.write(cr, uid, line_ids, {
-                    'journal_id': move.journal_id.id,
-                    'period_id': move.period_id.id,
                     'state': 'draft'
                 }, context, check=False)
         # Create analytic lines for the valid moves
@@ -1530,11 +1602,15 @@ class account_move_reconcile(osv.osv):
     _defaults = {
         'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
     }
+
     def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
         total = 0.0
         for rec in self.browse(cr, uid, ids, context=context):
             for line in rec.line_partial_ids:
-                total += (line.debit or 0.0) - (line.credit or 0.0)
+                if line.account_id.currency_id:
+                    total += line.amount_currency
+                else:
+                    total += (line.debit or 0.0) - (line.credit or 0.0)
         if not total:
             self.pool.get('account.move.line').write(cr, uid,
                 map(lambda x: x.id, rec.line_partial_ids),
@@ -1594,7 +1670,7 @@ class account_tax_code(osv.osv):
                        (parent_ids,) + where_params)
         res=dict(cr.fetchall())
         obj_precision = self.pool.get('decimal.precision')
-        res2 = {} 
+        res2 = {}
         for record in self.browse(cr, uid, ids, context=context):
             def _rec_get(record):
                 amount = res.get(record.id, 0.0)
@@ -1611,13 +1687,15 @@ class account_tax_code(osv.osv):
         if context.get('state', 'all') == 'all':
             move_state = ('draft', 'posted', )
         if context.get('fiscalyear_id', False):
-            fiscalyear_id = context['fiscalyear_id']
+            fiscalyear_id = [context['fiscalyear_id']]
         else:
-            fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid, exception=False)
+            fiscalyear_id = self.pool.get('account.fiscalyear').finds(cr, uid, exception=False)
         where = ''
         where_params = ()
         if fiscalyear_id:
-            pids = map(lambda x: str(x.id), self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id).period_ids)
+            pids = []
+            for fy in fiscalyear_id:
+                pids += map(lambda x: str(x.id), self.pool.get('account.fiscalyear').browse(cr, uid, fy).period_ids)
             if pids:
                 where = ' AND line.period_id IN %s AND move.state IN %s '
                 where_params = (tuple(pids), move_state)
@@ -1763,6 +1841,9 @@ class account_tax(osv.osv):
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
     }
+    _sql_constraints = [
+        ('name_company_uniq', 'unique(name, company_id)', 'Tax Name must be unique per company!'),
+    ]
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         """
@@ -1926,8 +2007,11 @@ class account_tax(osv.osv):
                 cur_price_unit+=amount2
         return res
 
-    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None, force_excluded=False):
         """
+        :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of
+            tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or
+            False
         RETURN: {
                 'total': 0.0,                # Total without taxes
                 'total_included: 0.0,        # Total with taxes
@@ -1939,10 +2023,10 @@ class account_tax(osv.osv):
         tin = []
         tex = []
         for tax in taxes:
-            if tax.price_include:
-                tin.append(tax)
-            else:
+            if not tax.price_include or force_excluded:
                 tex.append(tax)
+            else:
+                tin.append(tax)
         tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
         for r in tin:
             totalex -= r.get('amount', 0.0)
@@ -2108,6 +2192,7 @@ class account_model(osv.osv):
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         pt_obj = self.pool.get('account.payment.term')
+        period_obj = self.pool.get('account.period')
 
         if context is None:
             context = {}
@@ -2115,13 +2200,18 @@ class account_model(osv.osv):
         if datas.get('date', False):
             context.update({'date': datas['date']})
 
-        period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
-        if not period_id:
-            raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
-        period_id = period_id[0]
-
+        move_date = context.get('date', time.strftime('%Y-%m-%d'))
+        move_date = datetime.strptime(move_date,"%Y-%m-%d")
         for model in self.browse(cr, uid, ids, context=context):
-            entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
+            ctx = context.copy()
+            ctx.update({'company_id': model.company_id.id})
+            period_ids = period_obj.find(cr, uid, dt=context.get('date', False), context=ctx)
+            period_id = period_ids and period_ids[0] or False
+            ctx.update({'journal_id': model.journal_id.id,'period_id': period_id})
+            try:
+                entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
+            except:
+                raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
             move_id = account_move_obj.create(cr, uid, {
                 'ref': entry['name'],
                 'period_id': period_id,
@@ -2142,7 +2232,7 @@ class account_model(osv.osv):
                     'analytic_account_id': analytic_account_id
                 }
 
-                date_maturity = time.strftime('%Y-%m-%d')
+                date_maturity = context.get('date',time.strftime('%Y-%m-%d'))
                 if line.date_maturity == 'partner':
                     if not line.partner_id:
                         raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
@@ -2166,9 +2256,7 @@ class account_model(osv.osv):
                     'date': context.get('date',time.strftime('%Y-%m-%d')),
                     'date_maturity': date_maturity
                 })
-                c = context.copy()
-                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
-                account_move_line_obj.create(cr, uid, val, context=c)
+                account_move_line_obj.create(cr, uid, val, context=ctx)
 
         return move_ids
 
@@ -2193,8 +2281,8 @@ class account_model_line(osv.osv):
     }
     _order = 'sequence'
     _sql_constraints = [
-        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model (Credit Or Debit Must Be "0")!'),
-        ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model (Credit + Debit Must Be greater "0")!'),
+        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model, they must be positive!'),
+        ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model, they must be positive!'),
     ]
 account_model_line()
 
@@ -2315,7 +2403,7 @@ class account_account_template(osv.osv):
     _description ='Templates for Accounts'
 
     _columns = {
-        'name': fields.char('Name', size=128, required=True, select=True),
+        'name': fields.char('Name', size=256, required=True, select=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'code': fields.char('Code', size=64, select=1),
         'type': fields.selection([
@@ -2361,7 +2449,7 @@ class account_account_template(osv.osv):
     _check_recursion = check_cycle
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']),
-        (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
+        (_check_type, 'Configuration Error!\nYou can not define children to an account with internal type different of "View"! ', ['type']),
 
     ]
 
@@ -2445,7 +2533,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
         ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
         res = None
         if not ptids or not ptids[0]['code']:
-            raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
+            raise osv.except_osv(_('Error !'), _('I can not locate a parent code for the template account!'))
             res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
         return res and res[0] or False
 
@@ -2700,7 +2788,8 @@ class account_fiscal_position_template(osv.osv):
         'name': fields.char('Fiscal Position Template', size=64, required=True),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
-        'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
+        'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping'),
+        'note': fields.text('Notes', translate=True),
     }
 
     def generate_fiscal_position(self, cr, uid, chart_temp_id, tax_template_ref, acc_template_ref, company_id, context=None):
@@ -2762,7 +2851,88 @@ class account_fiscal_position_account_template(osv.osv):
 
 account_fiscal_position_account_template()
 
-    # Multi charts of Accounts wizard
+# ---------------------------------------------------------
+# Account Financial Report
+# ---------------------------------------------------------
+
+class account_financial_report(osv.osv):
+    _name = "account.financial.report"
+    _description = "Account Report"
+
+    def _get_level(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for report in self.browse(cr, uid, ids, context=context):
+            level = 0
+            if report.parent_id:
+                level = report.parent_id.level + 1
+            res[report.id] = level
+        return res
+
+    def _get_children_by_order(self, cr, uid, ids, context=None):
+        res = []
+        for id in ids:
+            res.append(id)
+            ids2 = self.search(cr, uid, [('parent_id', '=', id)], order='sequence ASC', context=context)
+            res += self._get_children_by_order(cr, uid, ids2, context=context)
+        return res
+
+    def _get_balance(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        res_all = {}
+        for report in self.browse(cr, uid, ids, context=context):
+            balance = 0.0
+            if report.id in res_all:
+                balance = res_all[report.id]
+            elif report.type == 'accounts':
+                # it's the sum of balance of the linked accounts
+                for a in report.account_ids:
+                    balance += a.balance
+            elif report.type == 'account_report' and report.account_report_id:
+                # it's the amount of the linked report
+                res2 = self._get_balance(cr, uid, [report.account_report_id.id], 'balance', False, context=context)
+                res_all.update(res2)
+                for key, value in res2.items():
+                    balance += value
+            elif report.type == 'sum':
+                # it's the sum of balance of the children of this account.report
+                #for child in report.children_ids:
+                res2 = self._get_balance(cr, uid, [rec.id for rec in report.children_ids], 'balance', False, context=context)
+                res_all.update(res2)
+                for key, value in res2.items():
+                    balance += value
+            res[report.id] = balance
+            res_all[report.id] = balance
+        return res
+
+    _columns = {
+        'name': fields.char('Report Name', size=128, required=True, translate=True),
+        'parent_id': fields.many2one('account.financial.report', 'Parent'),
+        'children_ids':  fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
+        'sequence': fields.integer('Sequence'),
+        'note': fields.text('Notes'),
+        'balance': fields.function(_get_balance, 'Balance'),
+        'level': fields.function(_get_level, string='Level', store=True, type='integer'),
+        'type': fields.selection([
+            ('sum','View'),
+            ('accounts','Accounts'),
+            ('account_type','Account Type'),
+            ('account_report','Report Value'),
+            ],'Type'),
+        'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
+        'display_detail': fields.boolean('Display details', help='Display every account with its balance instead of the sum.'),
+        'account_report_id':  fields.many2one('account.financial.report', 'Report Value'),
+        'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'),
+    }
+
+    _defaults = {
+        'type': 'sum',
+    }
+
+account_financial_report()
+
+# ---------------------------------------------------------
+# Account generation from template wizards
+# ---------------------------------------------------------
 
 class wizard_multi_charts_accounts(osv.osv_memory):
     """
@@ -2783,7 +2953,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
-        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
+        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
         'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
         "sale_tax": fields.many2one("account.tax.template", "Default Sales Tax"),
@@ -2852,7 +3022,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
         for field in res['fields']:
             if field == 'company_id':
-                res['fields'][field]['domain'] = unconfigured_cmp
+                res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
                 res['fields'][field]['selection'] = [('', '')]
                 if unconfigured_cmp:
                     cmp_select = [(line.id, line.name) for line in company_obj.browse(cr, uid, unconfigured_cmp)]
@@ -3183,7 +3353,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         for line in journal_data:
             #create the account_account for this bank journal
             if not ref_acc_bank.code:
-                raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of account hasn\'t a code.'))
+                raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of accounts hasn\'t a code.'))
             while True:
                 new_code = str(ref_acc_bank.code.ljust(code_digits-len(str(current_num)), '0')) + str(current_num)
                 ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 08123c8f460..ea1829db310 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -123,7 +123,7 @@ class account_analytic_line(osv.osv):
             ctx['uom'] = unit
         amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id]
         prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-        amount = amount_unit * quantity or 1.0
+        amount = amount_unit * quantity or 0.0
         result = round(amount, prec)
         if not flag:
             result *= -1
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index a3d66ccdf7c..01eab2fbb01 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -37,15 +37,23 @@ class bank(osv.osv):
         self.post_write(cr, uid, ids, context=context)
         return result
 
+    def _prepare_name(self, bank):
+        "Return the name to use when creating a bank journal"
+        return (bank.bank_name or '') + ' ' + bank.acc_number
+
     def post_write(self, cr, uid, ids, context={}):
+        if isinstance(ids, (int, long)):
+          ids = [ids]
+
         obj_acc = self.pool.get('account.account')
         obj_data = self.pool.get('ir.model.data')
+
         for bank in self.browse(cr, uid, ids, context):
             if bank.company_id and not bank.journal_id:
                 # Find the code and parent of the bank account to create
                 dig = 6
                 current_num = 1
-                ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context) 
+                ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context)
                 # No liquidity account exists, no template available
                 if not ids: continue
 
@@ -57,9 +65,9 @@ class bank(osv.osv):
                     if not ids:
                         break
                     current_num += 1
-
+                name = self._prepare_name(bank)
                 acc = {
-                    'name': (bank.bank_name or '')+' '+bank.acc_number,
+                    'name': name,
                     'currency_id': bank.company_id.currency_id.id,
                     'code': new_code,
                     'type': 'liquidity',
@@ -74,7 +82,7 @@ class bank(osv.osv):
                 data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
                 data = obj_data.browse(cr, uid, data_id[0], context=context)
                 view_id_cash = data.res_id
-                
+
                 jour_obj = self.pool.get('account.journal')
                 new_code = 1
                 while True:
@@ -86,7 +94,7 @@ class bank(osv.osv):
 
                 #create the bank journal
                 vals_journal = {
-                    'name':  (bank.bank_name or '')+' '+bank.acc_number,
+                    'name': name,
                     'code': code,
                     'type': 'bank',
                     'company_id': bank.company_id.id,
@@ -101,3 +109,4 @@ class bank(osv.osv):
                 self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context)
         return True
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index f712cc9ab0c..57472e228ef 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -58,13 +58,6 @@ class account_bank_statement(osv.osv):
                 journal_id = ids[0]
         return journal_id
 
-    def _default_balance_start(self, cr, uid, context=None):
-        cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
-        res = cr.fetchone()
-        if res:
-            return self.browse(cr, uid, res[0], context=context).balance_end
-        return 0.0
-
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
@@ -90,7 +83,8 @@ class account_bank_statement(osv.osv):
                         res[statement.id] -= res_currency_obj.compute(cursor,
                                 user, company_currency_id, currency_id,
                                 line.credit, context=context)
-            if statement.state == 'draft':
+
+            if statement.state in ('draft', 'open'):
                 for line in statement.line_ids:
                     res[statement.id] += line.amount
         for r in res:
@@ -123,11 +117,17 @@ class account_bank_statement(osv.osv):
             res[statement_id] = (currency_id, currency_names[currency_id])
         return res
 
+    def _get_statement(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
+            result[line.statement_id.id] = True
+        return result.keys()
+
     _order = "date desc, id desc"
     _name = "account.bank.statement"
     _description = "Bank Statement"
     _columns = {
-        'name': fields.char('Name', size=64, required=True, help='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', states={'confirm': [('readonly', True)]}),
+        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='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'), # readonly for account_cash_statement
         'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,
             readonly=True, states={'draft':[('readonly',False)]}),
@@ -136,19 +136,25 @@ class account_bank_statement(osv.osv):
         'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly',True)]}),
         'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
-            states={'confirm':[('readonly', True)]}),
-        'balance_end': fields.function(_end_balance, string='Balance'),
+            states={'confirm': [('readonly', True)]}),
+        'balance_end': fields.function(_end_balance,
+            store = {
+                'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
+                'account.bank.statement.line': (_get_statement, ['amount'], 10),
+            },
+            string="Computed Balance", help='Balance as calculated based on Starting Balance and transaction lines'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'line_ids': fields.one2many('account.bank.statement.line',
             'statement_id', 'Statement lines',
             states={'confirm':[('readonly', True)]}),
         'move_line_ids': fields.one2many('account.move.line', 'statement_id',
             'Entry lines', states={'confirm':[('readonly',True)]}),
-        'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
-            'State', required=True,
-            states={'confirm': [('readonly', 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.'),
+        'state': fields.selection([('draft', 'New'),
+                                   ('open','Open'), # used by cash statements
+                                   ('confirm', 'Closed')],
+                                   'State', 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.'),
         '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.'),
@@ -158,7 +164,6 @@ class account_bank_statement(osv.osv):
         'name': "/",
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': 'draft',
-        'balance_start': _default_balance_start,
         'journal_id': _default_journal_id,
         'period_id': _get_period,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
@@ -214,6 +219,7 @@ class account_bank_statement(osv.osv):
             'period_id': st.period_id.id,
             'date': st_line.date,
             'name': st_line_number,
+            'ref': st_line.ref,
         }, context=context)
         account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
             'move_ids': [(4, move_id, False)]
@@ -311,7 +317,7 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def check_status_condition(self, cr, uid, state, journal_type='bank'):
-        return state=='draft'
+        return state in ('draft','open')
 
     def button_confirm_bank(self, cr, uid, ids, context=None):
         obj_seq = self.pool.get('ir.sequence')
@@ -335,9 +341,9 @@ class account_bank_statement(osv.osv):
             else:
                 if st.journal_id.sequence_id:
                     c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
-                    st_number = obj_seq.get_id(cr, uid, st.journal_id.sequence_id.id, context=c)
+                    st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c)
                 else:
-                    st_number = obj_seq.get(cr, uid, 'account.bank.statement')
+                    st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement')
 
             for line in st.move_line_ids:
                 if line.state <> 'valid':
@@ -386,7 +392,7 @@ class account_bank_statement(osv.osv):
             if t['state'] in ('draft'):
                 unlink_ids.append(t['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement(s) which are already confirmed !'))
+                raise osv.except_osv(_('Invalid action !'), _('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
@@ -470,7 +476,7 @@ class account_bank_statement_line(osv.osv):
     }
     _defaults = {
         'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': lambda self,cr,uid,context={}: context.get('date', time.strftime('%Y-%m-%d')),
         'type': 'general',
     }
 
diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index d91739817ac..1a0e26e7c1f 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -13,7 +13,7 @@
         <field name="inherit_id" ref="base.view_partner_bank_form"/>
         <field name="arch" type="xml">
             <group name="bank" position="after">
-                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}">
+                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}" groups="base.group_extended">
                     <separator string="Accounting Information" colspan="2"/>
                     <field name="journal_id"/>
                 </group>
@@ -23,16 +23,16 @@
 
 
     <record id="action_bank_tree" model="ir.actions.act_window">
-        <field name="name">Bank Accounts</field>
+        <field name="name">Setup your Bank Accounts</field>
         <field name="res_model">res.partner.bank</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
-        <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
+        <field name="help">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.</field>
     </record>
     <menuitem
         sequence="0"
-    	parent="account.account_account_menu"
+        parent="account.account_account_menu"
         id="menu_action_bank_tree"
         action="action_bank_tree"/>
 
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 982383ea2a7..ebc97fe8a84 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -119,39 +119,6 @@ class account_cash_statement(osv.osv):
             res2[statement.id] = encoding_total
         return res2
 
-    def _end_balance(self, cursor, user, ids, name, attr, context=None):
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-        res = {}
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-        statements = self.browse(cursor, user, ids, context=context)
-        for statement in statements:
-            res[statement.id] = statement.balance_start
-            currency_id = statement.currency.id
-            for line in statement.move_line_ids:
-                if line.debit > 0:
-                    if line.account_id.id == \
-                            statement.journal_id.default_debit_account_id.id:
-                        res[statement.id] += res_currency_obj.compute(cursor,
-                                user, company_currency_id, currency_id,
-                                line.debit, context=context)
-                else:
-                    if line.account_id.id == \
-                            statement.journal_id.default_credit_account_id.id:
-                        res[statement.id] -= res_currency_obj.compute(cursor,
-                                user, company_currency_id, currency_id,
-                                line.credit, context=context)
-
-            if statement.state in ('draft', 'open'):
-                for line in statement.line_ids:
-                    res[statement.id] += line.amount
-        for r in res:
-            res[r] = round(res[r], 2)
-        return res
-
     def _get_company(self, cr, uid, context=None):
         user_pool = self.pool.get('res.users')
         company_pool = self.pool.get('res.company')
@@ -217,38 +184,33 @@ class account_cash_statement(osv.osv):
         res['end'] = end_l
         return res
 
+    def _get_statement(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
+            result[line.statement_id.id] = True
+        return result.keys()
+
     _columns = {
-        'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm': [('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
-        'state': fields.selection(
-            [('draft', 'Draft'),
-            ('confirm', 'Closed'),
-            ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-        'total_entry_encoding': fields.function(_get_sum_entry_encoding, store=True, string="Cash Transaction", help="Total cash transactions"),
+        'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Cash Transaction", help="Total cash transactions",
+            store = {
+                'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
+                'account.bank.statement.line': (_get_statement, ['amount'], 10),
+            }),
         'closing_date': fields.datetime("Closed On"),
-        'balance_end': fields.function(_end_balance, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
-        'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Balance', help="Closing balance based on cashBox"),
+        'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Closing Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
-        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='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'),
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
     }
     _defaults = {
         'state': 'draft',
-        'date': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
+        'date': lambda self,cr,uid,context={}: context.get('date', time.strftime("%Y-%m-%d %H:%M:%S")),
         'user_id': lambda self, cr, uid, context=None: uid,
         'starting_details_ids': _get_cash_open_box_lines,
         'ending_details_ids': _get_default_cash_close_box_lines
      }
 
     def create(self, cr, uid, vals, context=None):
-        sql = [
-                ('journal_id', '=', vals.get('journal_id', False)),
-                ('state', '=', 'open')
-        ]
-        open_jrnl = self.search(cr, uid, sql)
-        if open_jrnl:
-            raise osv.except_osv(_('Error'), _('You can not have two open register for the same journal'))
-
         if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
             open_close = self._get_cash_open_close_box_lines(cr, uid, context)
             if vals.get('starting_details_ids', False):
@@ -332,15 +294,14 @@ class account_cash_statement(osv.osv):
             if statement.name and statement.name == '/':
                 if statement.journal_id.sequence_id:
                     c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
-                    st_number = obj_seq.get_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
+                    st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
                 else:
-                    st_number = obj_seq.get(cr, uid, 'account.cash.statement')
+                    st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement')
                 vals.update({
                     'name': st_number
                 })
 
             vals.update({
-                'date': time.strftime("%Y-%m-%d %H:%M:%S"),
                 'state': 'open',
             })
             self.write(cr, uid, [statement.id], vals, context=context)
@@ -350,7 +311,7 @@ class account_cash_statement(osv.osv):
         if journal_type == 'bank':
             return super(account_cash_statement, self).balance_check(cr, uid, cash_id, journal_type, context)
         if not self._equal_balance(cr, uid, cash_id, context):
-            raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !'))
+            raise osv.except_osv(_('Error !'), _('The closing balance should be the same than the computed balance !'))
         return True
 
     def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index a0de49a168a..cbdb665e157 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -11,7 +11,7 @@
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Accounting Chart</attribute>
+                    <attribute name="string">Configure Your Chart of Accounts</attribute>
                 </separator>
                 <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
@@ -23,12 +23,13 @@
                     <attribute name="rowspan">23</attribute>
                     <attribute name="string"/>
                 </xpath>
-                <group colspan="8">
+                <group colspan="8" position="inside">
                     <group colspan="4" width="600">
                         <field name="charts"/>
-                            <group colspan="4" groups="base.group_extended">
+                            <group colspan="4" groups="account.group_account_user">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                                <field name="company_id" colspan="4" 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 -->
+                                <field name="has_default_company" invisible="1" />
+                                <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- 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 -->
                                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>
@@ -39,28 +40,8 @@
             </field>
         </record>
 
-        <record id="view_account_modules_installer" model="ir.ui.view">
-            <field name="name">account.installer.modules.form</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='account_accountant']" position="replace">
-                    <newline/>
-                    <separator string="Accounting &amp; Finance Features" colspan="4"/>
-                    <field name="account_followup"/>
-                    <field name="account_payment"/>
-                    <field name="account_analytic_plans"/>
-                    <field name="account_anglo_saxon"/>
-                    <field name="account_asset"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Accounting Chart Configuration</field>
+            <field name="name">Install your Chart of Accounts</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"/>
@@ -72,7 +53,7 @@
         <record id="category_accounting_configuration" model="ir.actions.todo.category">
             <field name="name">Accounting</field>
             <field name="sequence">5</field>
-        </record>    
+        </record>
 
         <record id="account_configuration_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_account_configuration_installer"/>
@@ -81,5 +62,48 @@
             <field name="type">automatic</field>
         </record>
 
+        <record id="action_view_financial_accounts_installer" model="ir.actions.act_window">
+            <field name="name">Review your Financial Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'config_invisible': False}</field>
+        </record>
+
+        <record id="view_financial_accounts_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_view_financial_accounts_installer" />
+            <field name="category_id" ref="category_accounting_configuration" />
+            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
+        </record>
+
+        <record id="action_review_financial_journals_installer" model="ir.actions.act_window">
+            <field name="name">Review your Financial Journals</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">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.</field>
+        </record>
+
+        <record id="review_financial_journals_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_review_financial_journals_installer" />
+            <field name="category_id" ref="category_accounting_configuration" />
+            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
+        </record>
+        <record id="action_review_payment_terms_installer" model="ir.actions.act_window">
+            <field name="name">Review your Payment Terms</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.payment.term</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">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.</field>
+        </record>
+
+        <record id="review_payment_terms_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_review_payment_terms_installer" />
+            <field name="category_id" ref="category_accounting_configuration" />
+            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
+        </record>
     </data>
 </openerp>
diff --git a/addons/account/invoice.py b/addons/account/account_invoice.py
similarity index 97%
rename from addons/account/invoice.py
rename to addons/account/account_invoice.py
index 09e8304340c..27881bf1280 100644
--- a/addons/account/invoice.py
+++ b/addons/account/account_invoice.py
@@ -209,7 +209,7 @@ class account_invoice(osv.osv):
             \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.'),
-        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True, help="Keep empty to use the current date"),
+        '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,
             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."),
@@ -251,7 +251,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('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'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
         '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 ?
@@ -286,6 +286,9 @@ class account_invoice(osv.osv):
         'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
     }
+    _sql_constraints = [
+        ('number_uniq', 'unique(number, company_id)', 'Invoice Number must be unique per Company!'),
+    ]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         journal_obj = self.pool.get('account.journal')
@@ -306,9 +309,9 @@ class account_invoice(osv.osv):
             view_id = view_id[0]
         res = super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
-        type = context.get('journal_type', 'sale')
+        type = context.get('journal_type', False)
         for field in res['fields']:
-            if field == 'journal_id':
+            if field == 'journal_id' and type:
                 journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
                 res['fields'][field]['selection'] = journal_select
 
@@ -375,7 +378,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 !'), _('Cannot delete invoice(s) that are already opened(or been in opened state ever) or paid!'))
+                raise osv.except_osv(_('Invalid action !'), _('You can not delete an invoice which is open or paid. We suggest you to refund it instead.'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
@@ -795,6 +798,7 @@ class account_invoice(osv.osv):
         """Creates invoice related analytics and financial move lines"""
         ait_obj = self.pool.get('account.invoice.tax')
         cur_obj = self.pool.get('res.currency')
+        period_obj = self.pool.get('account.period')
         context = {}
         for inv in self.browse(cr, uid, ids):
             if not inv.journal_id.sequence_id:
@@ -828,7 +832,7 @@ class account_invoice(osv.osv):
                         total_percent += line.value_amount
                 total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
                 if (total_fixed + total_percent) > 100:
-                    raise osv.except_osv(_('Error !'), _("Cannot create the invoice !\nThe payment term defined gives a computed amount greater than the total invoiced amount."))
+                    raise osv.except_osv(_('Error !'), _("Can not create the invoice !\nThe related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount."))
 
             # one move line per tax line
             iml += ait_obj.move_line_get(cr, uid, inv.id)
@@ -860,10 +864,10 @@ class account_invoice(osv.osv):
             if totlines:
                 res_amount_currency = total_currency
                 i = 0
+                ctx.update({'date': inv.date_invoice})
                 for t in totlines:
                     if inv.currency_id.id != company_currency:
-                        amount_currency = cur_obj.compute(cr, uid,
-                                company_currency, inv.currency_id.id, t[1])
+                        amount_currency = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, t[1], context=ctx)
                     else:
                         amount_currency = False
 
@@ -880,7 +884,7 @@ class account_invoice(osv.osv):
                         'account_id': acc_id,
                         'date_maturity': t[0],
                         'amount_currency': diff_currency_p \
-                                and  amount_currency or False,
+                                and amount_currency or False,
                         'currency_id': diff_currency_p \
                                 and inv.currency_id.id or False,
                         'ref': ref,
@@ -910,7 +914,7 @@ class account_invoice(osv.osv):
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
             if journal.centralisation:
                 raise osv.except_osv(_('UserError'),
-                        _('Cannot create invoice move on centralised journal'))
+                        _('You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu.'))
 
             line = self.finalize_invoice_move_lines(cr, uid, inv, line)
 
@@ -923,10 +927,10 @@ class account_invoice(osv.osv):
                 'narration':inv.comment
             }
             period_id = inv.period_id and inv.period_id.id or False
+            ctx.update({'company_id': inv.company_id.id})
             if not period_id:
-                period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d')), ('company_id', '=', inv.company_id.id)])
-                if period_ids:
-                    period_id = period_ids[0]
+                period_ids = period_obj.find(cr, uid, inv.date_invoice, context=ctx)
+                period_id = period_ids and period_ids[0] or False
             if period_id:
                 move['period_id'] = period_id
                 for i in line:
@@ -1019,7 +1023,7 @@ class account_invoice(osv.osv):
                 pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
                 for move_line in pay_ids:
                     if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
-                        raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
+                        raise osv.except_osv(_('Error !'), _('You can not cancel an invoice which is partially paid! You need to unreconcile related payment entries first!'))
 
         # First, set the invoices as cancelled and detach the move ids
         self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
@@ -1241,6 +1245,7 @@ class account_invoice(osv.osv):
 account_invoice()
 
 class account_invoice_line(osv.osv):
+
     def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
         res = {}
         tax_obj = self.pool.get('account.tax')
@@ -1322,9 +1327,9 @@ class account_invoice_line(osv.osv):
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
             if type in ('in_invoice', 'in_refund'):
-                return {'value': {'categ_id': False}, 'domain':{'product_uom':[]}}
+                return {'value': {}, 'domain':{'product_uom':[]}}
             else:
-                return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
+                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         fpos_obj = self.pool.get('account.fiscal.position')
         fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
@@ -1352,6 +1357,17 @@ class account_invoice_line(osv.osv):
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
+        if type in ('in_invoice','in_refund') and tax_id and price_unit:
+            tax_pool = self.pool.get('account.tax')
+            tax_browse = tax_pool.browse(cr, uid, tax_id)
+            if not isinstance(tax_browse, list):
+                tax_browse = [tax_browse]
+            taxes = tax_pool.compute_inv(cr, uid, tax_browse, price_unit, 1)
+            tax_amount = reduce(lambda total, tax_dict: total + tax_dict.get('amount', 0.0), taxes, 0.0)
+            price_unit = price_unit - tax_amount
+            if qty != 0:
+                price_unit = price_unit / float(qty)
+
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
@@ -1366,7 +1382,6 @@ class account_invoice_line(osv.osv):
             if res2:
                 domain = {'uos_id':[('category_id','=',res2 )]}
 
-        result['categ_id'] = res.categ_id.id
         res_final = {'value':result, 'domain':domain}
 
         if not company_id or not currency_id:
@@ -1558,6 +1573,7 @@ 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, inv.address_invoice_id.id, 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']
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b21d3e9604f..4cc1a63db61 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -51,26 +51,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Line">
-                    <notebook>
-                        <page string="Line">
-                            <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.address_invoice_id, parent.currency_id, context, parent.company_id)"/>
-                            <field name="uos_id"  on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)"/>
-                            <field name="quantity"/>
-                            <field name="price_unit"/>
-                            <field name="discount" groups="base.group_extended"/>
-                            <field colspan="4" name="name"/>
-                            <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
-                            <newline/>
-                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                            <separator colspan="4" string="Taxes"/>
-                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"
-                            nolabel="1"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <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.address_invoice_id, parent.currency_id, context, parent.company_id)"/>
+                    <field colspan="2" name="name"/>
+                    <label string="Quantity :" align="1.0"/>
+                    <group colspan="1" col="2">
+                        <field name="quantity" nolabel="1"/>
+                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)" nolabel="1"/>
+                    </group>
+                    <field name="price_unit"/>
+                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
+                    <field name="discount" groups="base.group_extended"/>
+                    <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="company_id" groups="base.group_multi_company" readonly="1"/>
+                    <separator string="Notes" colspan="4"/>
+                    <field colspan="4" name="note" nolabel="1"/>
+                    <separator colspan="4" string="Taxes"/>
+                    <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -119,7 +115,7 @@
             <field name="model">account.invoice</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
+                <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
@@ -157,7 +153,7 @@
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
                         <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
-                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" context="{'default_partner_id': partner_id}"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
                         <field name="date_invoice"/>
@@ -209,13 +205,13 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
+                                    <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)]}" icon="gtk-convert" 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="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                 </group>
                             </group>
@@ -238,6 +234,7 @@
                             <field name="payment_ids" colspan="4" nolabel="1" >
                                 <tree string="Payments">
                                     <field name="date" string="Payment Date"/>
+                                    <field name="move_id"/>
                                     <field name="ref"/>
                                     <field name="name" groups="base.group_extended"/>
                                     <field name="journal_id"/>
@@ -267,7 +264,7 @@
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
                     <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}"/>
-                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" context="{'default_partner_id': partner_id}"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
                     <field name="date_invoice"/>
@@ -297,20 +294,20 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
 
+                                    <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)]}" icon="gtk-convert" 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="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
@@ -336,6 +333,7 @@
                             <field name="payment_ids" colspan="4" nolabel="1">
                                 <tree string="Payments">
                                     <field name="date"/>
+                                    <field name="move_id"/>
                                     <field name="ref"/>
                                     <field name="name"/>
                                     <field name="journal_id" groups="base.group_user"/>
@@ -357,7 +355,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                   <group col="10" colspan="4">
+                   <group>
                         <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"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
@@ -366,16 +364,16 @@
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" select="1" widget="selection" string="Salesman">
-                        <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" separator="1"/>
+                        <field name="user_id" widget="selection" string="Salesman">
+                        <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
                         </field>
                         <field name="origin"/>
                         <field name="amount_total"/>
                     </group>
                     <newline/>
-                    <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" select='1'/>
-                        <field name="period_id" select='1' string="Period"/>
+                    <group>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="period_id" string="Period"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -434,7 +432,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+            <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
         </record>
@@ -462,7 +460,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','in_invoice')]</field>
-            <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
+            <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
         </record>
@@ -475,7 +473,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','out_refund')]</field>
-            <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
+            <field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Customer Refunds you can manage the credit notes for your customers. 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.</field>
         </record>
@@ -501,7 +499,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','in_refund')]</field>
-            <field name="context">{'type':'in_refund', 'journal_type': 'purchase_refund'}</field>
+            <field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Supplier Refunds you can manage the credit notes you receive from your 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.</field>
         </record>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 062e1f6382b..6c651405c92 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -30,6 +30,7 @@
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" 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_accounting" sequence="18"/>
 
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
             parent="menu_finance_periodical_processing" sequence="15"
@@ -42,6 +43,7 @@
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
         <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
             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 06a3d8c44e9..55e154eed6d 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -23,8 +23,10 @@ import time
 from datetime import datetime
 from operator import itemgetter
 
+from lxml import etree
+
 import netsvc
-from osv import fields, osv
+from osv import fields, osv, orm
 from tools.translate import _
 import decimal_precision as dp
 import tools
@@ -492,8 +494,14 @@ class account_move_line(osv.osv):
         'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
         'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
-        'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
+        'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, readonly=True,
+                                store = {
+                                    'account.move': (_get_move_lines, ['journal_id'], 20)
+                                }),
+        'period_id': fields.related('move_id', 'period_id', string='Period', type='many2one', relation='account.period', required=True, select=True, readonly=True,
+                                store = {
+                                    'account.move': (_get_move_lines, ['period_id'], 20)
+                                }),
         'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
         'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
@@ -551,6 +559,8 @@ class account_move_line(osv.osv):
         'state': 'draft',
         'currency_id': _get_currency,
         'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
+        'credit': 0.0,
+        'debit': 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)
@@ -588,10 +598,26 @@ class account_move_line(osv.osv):
                 return False
         return True
 
+    def _check_date(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.journal_id.allow_date:
+                if not time.strptime(l.date[:10],'%Y-%m-%d') >= time.strptime(l.period_id.date_start, '%Y-%m-%d') or not time.strptime(l.date[:10], '%Y-%m-%d') <= time.strptime(l.period_id.date_stop, '%Y-%m-%d'):
+                    return False
+        return True
+
+    def _check_currency(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.account_id.currency_id:
+                if not l.currency_id or not l.currency_id.id == l.account_id.currency_id.id:
+                    return False
+        return True
+
     _constraints = [
         (_check_no_view, 'You can not create move line on view account.', ['account_id']),
         (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
-        (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
+        (_check_company_id, 'Company must be same for its related account and period.', ['company_id']),
+        (_check_date, 'The date of your Journal Entry is not in the defined period!', ['date']),
+        (_check_currency, 'The selected account of your Journal Entry must receive a value in its secondary currency', ['currency_id']),
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -642,14 +668,15 @@ class account_move_line(osv.osv):
             id2 =  part.property_account_receivable.id
             if journal:
                 jt = journal_obj.browse(cr, uid, journal).type
-                #FIXME: Bank and cash journal are such a journal we can not assume a account based on this 2 journals
-                # Bank and cash journal can have a payment or receipt transaction, and in both type partner account
-                # will not be same id payment then payable, and if receipt then receivable
-                #if jt in ('sale', 'purchase_refund', 'bank', 'cash'):
                 if jt in ('sale', 'purchase_refund'):
                     val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2)
-                elif jt in ('purchase', 'sale_refund', 'expense', 'bank', 'cash'):
+                elif jt in ('purchase', 'sale_refund'):
                     val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
+                elif jt in ('general', 'bank', 'cash'):
+                    if part.customer:
+                        val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2)
+                    elif part.supplier:
+                        val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
                 if val.get('account_id', False):
                     d = self.onchange_account_id(cr, uid, ids, val['account_id'])
                     val.update(d['value'])
@@ -709,7 +736,7 @@ class account_move_line(osv.osv):
             )
         return cr.fetchone()
 
-    def reconcile_partial(self, cr, uid, ids, type='auto', context=None):
+    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')
         merges = []
         unmerge = []
@@ -724,7 +751,10 @@ class account_move_line(osv.osv):
             company_list.append(line.company_id.id)
 
         for line in self.browse(cr, uid, ids, context=context):
-            company_currency_id = line.company_id.currency_id
+            if line.account_id.currency_id:
+                currency_id = line.account_id.currency_id
+            else:
+                currency_id = line.company_id.currency_id
             if line.reconcile_id:
                 raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
@@ -732,13 +762,19 @@ class account_move_line(osv.osv):
                     if not line2.reconcile_id:
                         if line2.id not in merges:
                             merges.append(line2.id)
-                        total += (line2.debit or 0.0) - (line2.credit or 0.0)
+                        if line2.account_id.currency_id:
+                            total += line2.amount_currency
+                        else:
+                            total += (line2.debit or 0.0) - (line2.credit or 0.0)
                 merges_rec.append(line.reconcile_partial_id.id)
             else:
                 unmerge.append(line.id)
-                total += (line.debit or 0.0) - (line.credit or 0.0)
-        if self.pool.get('res.currency').is_zero(cr, uid, company_currency_id, total):
-            res = self.reconcile(cr, uid, merges+unmerge, context=context)
+                if line.account_id.currency_id:
+                    total += line.amount_currency
+                else:
+                    total += (line.debit or 0.0) - (line.credit or 0.0)
+        if self.pool.get('res.currency').is_zero(cr, uid, currency_id, total):
+            res = self.reconcile(cr, uid, merges+unmerge, context=context, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id)
             return res
         r_id = move_rec_obj.create(cr, uid, {
             'type': type,
@@ -803,7 +839,7 @@ class account_move_line(osv.osv):
         if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
            (account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
             if not writeoff_acc_id:
-                raise osv.except_osv(_('Warning'), _('You have to provide an account for the write off entry !'))
+                raise osv.except_osv(_('Warning'), _('You have to provide an account for the write off/exchange difference entry !'))
             if writeoff > 0:
                 debit = writeoff
                 credit = 0.0
@@ -961,7 +997,6 @@ class account_move_line(osv.osv):
         fields = {}
         flds = []
         title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
-        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
 
         ids = journal_pool.search(cr, uid, [])
         journals = journal_pool.browse(cr, uid, ids, context=context)
@@ -973,14 +1008,14 @@ class account_move_line(osv.osv):
             for field in journal.view_id.columns_id:
                 if not field.field in fields:
                     fields[field.field] = [journal.id]
-                    fld.append((field.field, field.sequence, field.name))
+                    fld.append((field.field, field.sequence))
                     flds.append(field.field)
                     common_fields[field.field] = 1
                 else:
                     fields.get(field.field).append(journal.id)
                     common_fields[field.field] = common_fields[field.field] + 1
-        fld.append(('period_id', 3, _('Period')))
-        fld.append(('journal_id', 10, _('Journal')))
+        fld.append(('period_id', 3))
+        fld.append(('journal_id', 10))
         flds.append('period_id')
         flds.append('journal_id')
         fields['period_id'] = all_journal
@@ -992,62 +1027,69 @@ class account_move_line(osv.osv):
             'tax_code_id': 50,
             'move_id': 40,
         }
-        for field_it in fld:
-            field = field_it[0]
+
+        document = etree.Element('tree', string=title, editable="top",
+                                 refresh="5", on_write="on_create_write",
+                                 colors="red:state=='draft';black:state=='valid'")
+        fields_get = self.fields_get(cr, uid, flds, context)
+        for field, _seq in fld:
             if common_fields.get(field) == total:
                 fields.get(field).append(None)
-#            if field=='state':
-#                state = 'colors="red:state==\'draft\'"'
-            attrs = []
+            # if field=='state':
+            #     state = 'colors="red:state==\'draft\'"'
+            f = etree.SubElement(document, 'field', name=field)
+
             if field == 'debit':
-                attrs.append('sum = "%s"' % _("Total debit"))
+                f.set('sum', _("Total debit"))
 
             elif field == 'credit':
-                attrs.append('sum = "%s"' % _("Total credit"))
+                f.set('sum', _("Total credit"))
 
             elif field == 'move_id':
-                attrs.append('required = "False"')
+                f.set('required', 'False')
 
             elif field == 'account_tax_id':
-                attrs.append('domain="[(\'parent_id\', \'=\' ,False)]"')
-                attrs.append("context=\"{'journal_id': journal_id}\"")
+                f.set('domain', "[('parent_id', '=' ,False)]")
+                f.set('context', "{'journal_id': journal_id}")
 
             elif field == 'account_id' and journal.id:
-                attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
+                f.set('domain', "[('journal_id', '=', journal_id),('type','!=','view'), ('type','!=','closed')]")
+                f.set('on_change', 'onchange_account_id(account_id, partner_id)')
 
             elif field == 'partner_id':
-                attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
+                f.set('on_change', 'onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)')
 
             elif field == 'journal_id':
-                attrs.append("context=\"{'journal_id': journal_id}\"")
+                f.set('context', "{'journal_id': journal_id}")
 
             elif field == 'statement_id':
-                attrs.append("domain=\"[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]\"")
+                f.set('domain', "[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]")
 
             elif field == 'date':
-                attrs.append('on_change="onchange_date(date)"')
+                f.set('on_change', 'onchange_date(date)')
 
             elif field == 'analytic_account_id':
-                attrs.append('''groups="analytic.group_analytic_accounting"''') # Currently it is not working due to framework problem may be ..
+                # Currently it is not working due to being executed by superclass's fields_view_get
+                # f.set('groups', 'analytic.group_analytic_accounting')
+                pass
 
             if field in ('amount_currency', 'currency_id'):
-                attrs.append('on_change="onchange_currency(account_id, amount_currency, currency_id, date, journal_id)"')
-                attrs.append('''attrs="{'readonly': [('state', '=', 'valid')]}"''')
+                f.set('on_change', 'onchange_currency(account_id, amount_currency, currency_id, date, journal_id)')
+                f.set('attrs', "{'readonly': [('state', '=', 'valid')]}")
 
             if field in widths:
-                attrs.append('width="'+str(widths[field])+'"')
+                f.set('width', str(widths[field]))
 
             if field in ('journal_id',):
-                attrs.append("invisible=\"context.get('journal_id', False)\"")
+                f.set("invisible", "context.get('journal_id', False)")
             elif field in ('period_id',):
-                attrs.append("invisible=\"context.get('period_id', False)\"")
-            else:
-                attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
-            xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
+                f.set("invisible", "context.get('period_id', False)")
 
-        xml += '''</tree>'''
-        result['arch'] = xml
-        result['fields'] = self.fields_get(cr, uid, flds, context)
+            orm.setup_modifiers(f, fields_get[field], context=context,
+                                in_tree_view=True)
+
+        result['arch'] = etree.tostring(document, pretty_print=True)
+        result['fields'] = fields_get
         return result
 
     def _check_moves(self, cr, uid, context=None):
@@ -1098,35 +1140,6 @@ class account_move_line(osv.osv):
             move_obj.validate(cr, uid, move_ids, context=context)
         return result
 
-    def _check_date(self, cr, uid, vals, context=None, check=True):
-        if context is None:
-            context = {}
-        move_obj = self.pool.get('account.move')
-        journal_obj = self.pool.get('account.journal')
-        period_obj = self.pool.get('account.period')
-        journal_id = False
-        if 'date' in vals.keys():
-            if 'journal_id' in vals and 'journal_id' not in context:
-                journal_id = vals['journal_id']
-            if 'period_id' in vals and 'period_id' not in context:
-                period_id = vals['period_id']
-            elif 'journal_id' not in context and 'move_id' in vals:
-                if vals.get('move_id', False):
-                    m = move_obj.browse(cr, uid, vals['move_id'])
-                    journal_id = m.journal_id.id
-                    period_id = m.period_id.id
-            else:
-                journal_id = context.get('journal_id', False)
-                period_id = context.get('period_id', False)
-            if journal_id:
-                journal = journal_obj.browse(cr, uid, journal_id, context=context)
-                if journal.allow_date and period_id:
-                    period = period_obj.browse(cr, uid, period_id, context=context)
-                    if not time.strptime(vals['date'][:10],'%Y-%m-%d') >= time.strptime(period.date_start, '%Y-%m-%d') or not time.strptime(vals['date'][:10], '%Y-%m-%d') <= time.strptime(period.date_stop, '%Y-%m-%d'):
-                        raise osv.except_osv(_('Error'),_('The date of your Journal Entry is not in the defined period!'))
-        else:
-            return True
-
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         if context is None:
             context={}
@@ -1137,7 +1150,6 @@ class account_move_line(osv.osv):
             ids = [ids]
         if vals.get('account_tax_id', False):
             raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
-        self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
         if update_check:
@@ -1221,7 +1233,6 @@ class account_move_line(osv.osv):
             company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
             if company_id:
                 vals['company_id'] = company_id[0]
-        self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
         if 'journal_id' in vals:
@@ -1232,7 +1243,12 @@ class account_move_line(osv.osv):
             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)):
+            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(_('Encoding error'), _('No period found or period given is ambigous.'))
+            context['period_id'] = period_candidate_ids[0][0]
         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)
@@ -1244,7 +1260,7 @@ class account_move_line(osv.osv):
                     vals['move_id'] = res[0]
             if not vals.get('move_id', False):
                 if journal.sequence_id:
-                    #name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
+                    #name = self.pool.get('ir.sequence').next_by_id(cr, uid, journal.sequence_id.id)
                     v = {
                         'date': vals.get('date', time.strftime('%Y-%m-%d')),
                         'period_id': context['period_id'],
@@ -1255,7 +1271,7 @@ class account_move_line(osv.osv):
                     move_id = move_obj.create(cr, uid, v, context)
                     vals['move_id'] = move_id
                 else:
-                    raise osv.except_osv(_('No piece number !'), _('Can not create an automatic sequence for this piece !\n\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
+                    raise osv.except_osv(_('No piece number !'), _('Can not create an automatic sequence for this piece!\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
         ok = not (journal.type_control_ids or journal.account_control_ids)
         if ('account_id' in vals):
             account = account_obj.browse(cr, uid, vals['account_id'], context=context)
@@ -1272,7 +1288,7 @@ class account_move_line(osv.osv):
                         break
             # Automatically convert in the account's secondary currency if there is one and
             # the provided values were not already multi-currency
-            if account.currency_id and 'amount_currency' not in vals and account.currency_id.id != account.company_id.currency_id.id:
+            if account.currency_id and (vals.get('amount_currency', False) is False) and account.currency_id.id != account.company_id.currency_id.id:
                 vals['currency_id'] = account.currency_id.id
                 ctx = {}
                 if 'date' in vals:
@@ -1280,7 +1296,7 @@ class account_move_line(osv.osv):
                 vals['amount_currency'] = cur_obj.compute(cr, uid, account.company_id.currency_id.id,
                     account.currency_id.id, vals.get('debit', 0.0)-vals.get('credit', 0.0), context=ctx)
         if not ok:
-            raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
+            raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal, check the tab \'Entry Controls\' on the related journal !'))
 
         if vals.get('analytic_account_id',False):
             if journal.analytic_journal_id:
@@ -1296,7 +1312,7 @@ class account_move_line(osv.osv):
                         'user_id': uid
             })]
 
-        result = super(osv.osv, self).create(cr, uid, vals, context=context)
+        result = super(account_move_line, self).create(cr, uid, vals, context=context)
         # CREATE Taxes
         if vals.get('account_tax_id', False):
             tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
@@ -1314,7 +1330,7 @@ class account_move_line(osv.osv):
                 base_sign = 'base_sign'
                 tax_sign = 'tax_sign'
             tmp_cnt = 0
-            for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00).get('taxes'):
+            for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00, force_excluded=True).get('taxes'):
                 #create the base movement
                 if tmp_cnt == 0:
                     if tax[base_code]:
@@ -1326,8 +1342,6 @@ class account_move_line(osv.osv):
                 else:
                     data = {
                         'move_id': vals['move_id'],
-                        'journal_id': vals['journal_id'],
-                        'period_id': vals['period_id'],
                         'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
                         'date': vals['date'],
                         'partner_id': vals.get('partner_id',False),
@@ -1344,8 +1358,6 @@ class account_move_line(osv.osv):
                 #create the VAT movement
                 data = {
                     'move_id': vals['move_id'],
-                    'journal_id': vals['journal_id'],
-                    'period_id': vals['period_id'],
                     'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
                     'date': vals['date'],
                     'partner_id': vals.get('partner_id',False),
diff --git a/addons/account/account_pre_install.yml b/addons/account/account_pre_install.yml
new file mode 100644
index 00000000000..13adbe8108f
--- /dev/null
+++ b/addons/account/account_pre_install.yml
@@ -0,0 +1,22 @@
+-
+  I configure automatically if the country is set on the company, mainly for online offers.
+-
+  !python {model: account.installer}: |
+    modules = self.pool.get('ir.module.module')
+    wizards = self.pool.get('ir.actions.todo')
+    wiz = wizards.browse(cr, uid, ref('account.account_configuration_installer_todo'))
+    part = self.pool.get('res.partner').browse(cr, uid, ref('base.main_partner'))
+    # if we know the country and the wizard has not yet been executed, we do it
+    if (part.country.id) and (wiz.state=='open'):
+        mod = 'l10n_'+part.country.code.lower()
+        ids = modules.search(cr, uid, [ ('name','=',mod) ], context=context)
+        if ids:
+            wizards.write(cr, uid, [ref('account.account_configuration_installer_todo')], {
+                'state': 'done'
+            })
+            wiz_id = self.create(cr, uid, {
+                'charts': mod
+            })
+            self.execute_simple(cr, uid, [wiz_id])
+            modules.state_update(cr, uid, ids,
+                'to install', ['uninstalled'], context=context)
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 2a22324d015..9bb40a7a503 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -19,12 +19,11 @@
             rml="account/report/account_print_invoice.rml"
             string="Invoices"
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
+            usage="default"
             multi="True"/>
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
-        <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
-
         <report
             auto="False"
             id="account_vat_declaration"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1b7d0a88e62..0516015f1e1 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -44,7 +44,7 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('done') " string="Fiscalyear">
+                <tree colors="blue:state == 'draft';gray:state == 'done' " string="Fiscalyear">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company"/>
@@ -111,7 +111,7 @@
             <field name="model">account.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-              <tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
+              <tree colors="blue:state == 'draft';gray:state == 'done' " string="Period">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -162,17 +162,21 @@
             <field name="arch" type="xml">
                 <form string="Account">
                     <group col="6" colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="parent_id"/>
-                    <field name="type" select="1"/>
-                    <field name="user_type" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="parent_id"/>
+                        <field name="type" select="1"/>
+                        <field name="user_type" select="1"/>
+                        <field name="active" groups="base.group_extended" />
+                        <newline/>
+                        <field name="debit" invisible="context.get('config_invisible', True)"/>
+                        <field name="credit" invisible="context.get('config_invisible', True)"/>
+                        <field name="balance" invisible="context.get('config_invisible', True)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field name="active" groups="base.group_extended" />
                             <newline/>
                             <group col="2" colspan="2">
                                 <separator string="Currency" colspan="2"/>
@@ -202,14 +206,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
                         <field name="name"/>
                         <field name="user_type"/>
-                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -228,7 +231,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
-                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+                <tree colors="blue:type == 'view';black:type in ('other','receivable','payable','consolidation');gray:type == 'closed'" string="Chart of accounts" toolbar="1" >
                     <field name="code"/>
                     <field name="name"/>
                     <field name="parent_id" invisible="1"/>
@@ -271,7 +274,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
-                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+                <tree colors="blue:type == 'view';black:type in ('other','receivable','payable','consolidation');gray:type == 'closed'" string="Chart of accounts" toolbar="1" >
                     <field name="code"/>
                     <field name="name"/>
                     <field name="debit"/>
@@ -292,6 +295,40 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
 
+         <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="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Unrealized Gains and losses">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="currency_id"/>
+                    <field name="exchange_rate"/>
+                    <field name="foreign_balance"/>
+                    <field name="adjusted_balance"/>
+                    <field name="balance"/>
+                    <field name="unrealized_gain_loss"/>
+                </tree>
+            </field>
+        </record>
+
+          <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>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_account_gain_loss_tree"/>
+            <field name="domain">[('currency_id','!=',False)]</field>
+            <field name="help">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.</field>
+        </record>
+
+        <menuitem
+            name="Unrealized Gain or Loss"
+            action="action_account_gain_loss"
+            id="menu_unrealized_gains_losses"
+            parent="account.menu_multi_currency"/>
+
         <!--
         Journal
 
@@ -362,7 +399,7 @@
             <field name="help">Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it.</field>
         </record>
 
-        <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_journals"/>
+        <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_journals" sequence="20"  groups="base.group_extended"/>
 
         <!--
     # Account Journal
@@ -387,7 +424,7 @@
             <field name="model">account.journal</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <tree string="Search Account Journal">
+                <search string="Search Account Journal">
                     <group>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
@@ -404,7 +441,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
                     </group>
-                </tree>
+                </search>
             </field>
         </record>
         <record id="view_account_journal_form" model="ir.ui.view">
@@ -438,9 +475,9 @@
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Validations" colspan="4"/>
-                                <field name="allow_date" groups="base.group_extended"/>
+                                <field name="allow_date"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Other Configuration" colspan="4"/>
@@ -452,9 +489,9 @@
 <!--                                <field name="invoice_sequence_id"/>-->
                                 <field name="group_invoice_lines"/>
                             </group>
-                            <group colspan="2" col="2" groups="base.group_extended">
+                            <group colspan="2" col="2"> <!-- can't set the field as hidden for certain groups as it's required in the object and not in the view, and GTK doesn't handle that correctly -->
                                 <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id"/>
+                                <field name="sequence_id" required="0"/>
                             </group>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">
@@ -482,7 +519,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
@@ -526,7 +563,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
@@ -564,7 +601,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Transaction" name="statement_line_ids">
-                            <field colspan="4" name="line_ids" nolabel="1">
+                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" readonly="1" invisible="1"/>
                                     <field name="date" groups="base.group_extended"/>
@@ -596,7 +633,7 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                         <field name="balance_end"/>
                         <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
@@ -749,6 +786,7 @@
                     <group col="2" colspan="2">
                         <separator string="Reporting Configuration" colspan="4"/>
                         <field name="report_type" select="2"/>
+                        <field name="sign" />                        
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Closing Method" colspan="4"/>
@@ -767,7 +805,7 @@
             <field name="search_view_id" ref="view_account_type_search"/>
             <field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field>
         </record>
-        <menuitem action="action_account_type_form" sequence="6" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_extended"/>
+        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_extended"/>
         <!--
     Entries
     -->
@@ -776,7 +814,7 @@
             <field name="model">account.move</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('posted')" string="Journal Entries">
+                <tree colors="blue:state == 'draft';black:state == 'posted'" string="Journal Entries">
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="date"/>
@@ -907,7 +945,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Taxes">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="description"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -1007,7 +1045,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('draft');black:state in ('valid')" string="Journal Items" editable="top" on_write="on_create_write">
+                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" editable="top" on_write="on_create_write">
                     <field name="date"/>
                     <field name="period_id"/>
                     <field name="move_id"/>
@@ -1102,7 +1140,7 @@
                             <separator string="Internal Note" colspan="4"/>
                             <field name="narration" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                         </page>
                     </notebook>
@@ -1149,7 +1187,7 @@
                             <field name="reconcile_partial_id"/>
                             <field name="state"/>
                         </page>
-                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
                             <field colspan="4" name="analytic_lines" nolabel="1" />
                         </page>
                     </notebook>
@@ -1176,7 +1214,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
-                    <group col='10' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1188,20 +1226,20 @@
                             domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                             name="unreconciled"/>
                         <separator orientation="vertical"/>
-                        <field name="move_id" select="1" string="Number (Move)"/>
-                        <field name="date" select='1'/>
-                        <field name="account_id" select='1'/>
-                        <field name="partner_id" select='1'>
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                        <field name="move_id" string="Number (Move)"/>
+                        <field name="date"/>
+                        <field name="account_id"/>
+                        <field name="partner_id">
+                            <filter help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                     </group>
                     <newline/>
-                    <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self, 'normal_view':False}"/>
-                        <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
+                    <group>
+                        <field name="journal_id" widget="selection" context="{'journal_id':self}"/>
+                        <field name="period_id" context="{'period_id':self}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1268,7 +1306,6 @@
             <field name="model">account.account</field>
             <field name="name">Open Journal Items</field>
             <field eval="'ir.actions.act_window,%d'%action_move_line_select" name="value"/>
-            <field eval="True" name="object"/>
         </record>
         <!--
     Account.Entry Edition
@@ -1290,7 +1327,7 @@
             <field name="model">account.move</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('posted')" string="Journal Entries">
+                <tree colors="blue:state == 'draft';black:state == 'posted'" string="Journal Entries">
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="date"/>
@@ -1390,12 +1427,12 @@
                                             <separator string="Internal Note" colspan="4"/>
                                             <field name="narration" colspan="4" nolabel="1"/>
                                         </page>
-                                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
                                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                                         </page>
                                     </notebook>
                                 </form>
-                                <tree colors="blue:state in ('draft');black:state in ('posted')" editable="top" string="Journal Items">
+                                <tree colors="blue:state == 'draft';black:state == 'posted'" editable="top" string="Journal Items">
                                     <field name="ref"/>
                                     <field name="invoice"/>
                                     <field name="name"/>
@@ -1433,7 +1470,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                         <separator orientation="vertical"/>
@@ -1445,12 +1482,12 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1546,7 +1583,12 @@
             context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
             src_model="account.account"/>
 
-        <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
+        <act_window
+            domain="[('reconcile_id', '=', active_id)]"
+            id="act_account_acount_move_line_reconcile_open"
+            name="Reconciled entries"
+            res_model="account.move.line"
+            src_model="account.move.reconcile"/>
 
 
         <!--
@@ -1560,7 +1602,7 @@
             <field name="model">account.journal.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('printed')" string="Journals">
+                <tree colors="blue:state == 'draft';gray:state == 'done';black:state == 'printed'" string="Journals">
                     <field icon="icon" name="fiscalyear_id"/>
                     <field name="period_id"/>
                     <field name="journal_id"/>
@@ -1588,7 +1630,7 @@
                 <tree string="Journal Entry Model Line" editable="bottom">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="account_id"/>
+                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit"/>
@@ -1607,12 +1649,12 @@
                 <form string="Journal Entry Model Line">
                     <field colspan="4" name="name" select="1"/>
                     <field name="sequence"/>
-                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                    <field name="account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit" select="1"/>
                     <field name="credit" select="1"/>
-                     <field name="quantity"/>
+                    <field name="quantity"/>
                     <field name="date_maturity"/>
                 </form>
             </field>
@@ -1710,35 +1752,37 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Term">
-                    <field name="name" select="1"/>
-                    <field name="sequence"/>
-                    <group colspan="2" col="4">
-                        <separator string="Amount Computation" colspan="4"/>
-                        <field name="value" colspan="4"/>
-                        <field name="value_amount" colspan="4" attrs="{'readonly':[('value','=','balance')]}"/>
+                    <group>
+	                    <group colspan="2" col="4">
+	                        <field name="name" select="1"/>
+	                        <separator string="Amount Computation" colspan="4"/>
+	                        <field name="value" colspan="4"/>
+	                        <field name="value_amount" colspan="4" attrs="{'readonly':[('value','=','balance')]}"/>
+	                    </group>
+	                    <group colspan="2" col="4">
+	                        <field name="sequence"/>
+	                        <separator string="Due Date Computation" colspan="4"/>
+	                        <field name="days" colspan="4"/>
+	                        <field name="days2" colspan="4"/>
+	                    </group>
                     </group>
-                    <group colspan="2" col="4">
-                        <separator string="Due date Computation" colspan="4"/>
-                        <field name="days" colspan="4"/>
-                        <field name="days2" colspan="4"/>
-                    </group>
-                    <label string=""/>
                     <newline/>
-                    <label string="Example: at 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
+                    <separator string="Example" colspan="4"/>
+                    <label string="At 14 net days 2 percent, remaining amount at 30 days end of month." colspan="4"/>
                     <group colspan="2" col="2">
                         <label string="Line 1:" colspan="2"/>
-                        <label string="  valuation: percent"/>
-                        <label string="  number of days: 14"/>
-                        <label string="  value amount: 0.02"/>
-                        <label string="  day of the month: 0"/>
+                        <label string="  Valuation: Percent"/>
+                        <label string="  Number of Days: 14"/>
+                        <label string="  Value amount: 0.02"/>
+                        <label string="  Day of the Month: 0"/>
                     </group>
                     <newline/>
                     <group colspan="2" col="2">
                         <label string="Line 2:" colspan="2"/>
-                        <label string="  valuation: balance"/>
-                        <label string="  number of days: 30"/>
-                        <label string="  value amount: n.a"/>
-                        <label string="  day of the month= -1"/>
+                        <label string="  Valuation: Balance"/>
+                        <label string="  Number of Days: 30"/>
+                        <label string="  Value amount: n.a"/>
+                        <label string="  Day of the Month= -1"/>
                     </group>
                 </form>
             </field>
@@ -1765,7 +1809,7 @@
                     <separator colspan="4" string="Information"/>
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
-                    <separator colspan="4" string="Description on invoices"/>
+                    <separator colspan="4" string="Description On Invoices"/>
                     <field colspan="4" name="note" nolabel="1"/>
                     <separator colspan="4" string="Computation"/>
                     <field colspan="4" name="line_ids" nolabel="1"/>
@@ -1816,7 +1860,7 @@
             <field name="model">account.subscription</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('running')" string="Entry Subscription">
+                <tree colors="blue:state == 'draft';gray:state == 'done';black:state == 'running'" string="Entry Subscription">
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="ref"/>
@@ -1832,7 +1876,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                         <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                         <separator orientation="vertical"/>
@@ -1946,7 +1990,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('draft');black:state in ('valid')" string="Journal Items">
+                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="statement_id" string="St."/>
@@ -1977,7 +2021,6 @@
             <field name="model">account.tax.code</field>
             <field name="name">Tax Details</field>
             <field eval="'ir.actions.act_window,%d'%action_tax_code_line_open" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
 
@@ -1999,7 +2042,14 @@
            res_model="account.move.line"
            src_model="account.journal"/>
 
-        <act_window context="{'search_default_reconcile_id':False, '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" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
+        <act_window
+            context="{'search_default_reconcile_id':False, '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"
+            res_model="account.move.line"
+            src_model="res.partner"
+            groups="base.group_extended"/>
 
         <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
 
@@ -2286,7 +2336,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>
@@ -2382,8 +2432,7 @@
                   <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                <attribute name="string"
-                       >Generate Your Accounting Chart from a Chart Template</attribute>
+                <attribute name="string">Generate Your Chart of Accounts from a Chart Template</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
@@ -2395,7 +2444,7 @@
                   </xpath>
                 <group string="res_config_contents" position="replace">
                     <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 -->
-                    <field name ="code_digits" groups="base.group_extended"/>
+                    <field name ="code_digits" groups="account.group_account_user"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
                     <field name="sale_tax" attrs="{'invisible': [('complete_tax', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
@@ -2404,7 +2453,7 @@
                     <field name ="purchase_tax_rate" attrs="{'invisible': [('complete_tax', '=', True)]}"/>
                     <field name ="complete_tax" invisible="1"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
-                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="base.group_extended">
+                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
                         <form string="Bank Information">
                             <field name="acc_name"/>
                             <field name="account_type"/>
@@ -2437,10 +2486,10 @@
             <field name="model_id" ref="base.model_ir_actions_todo"/>
             <field eval="5" name="sequence"/>
             <field name="code">
-act_window_ids = self.pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
-todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context)
-self.pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
-action = self.pool.get('res.config').next(cr, uid, [], context)
+act_window_ids = pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
+todo_ids = pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_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>
@@ -2541,7 +2590,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.bank.statement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open')" string="Statement">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state == 'open'" string="Statement">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="period_id"/>
@@ -2566,7 +2615,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company"/>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" widget="selection"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
                         <field name="user_id" select="1" readonly="1"/>
                         <field name="period_id" select="1"/>
                         <field name="currency" invisible="1"/>
@@ -2574,7 +2623,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
 
                     <notebook colspan="4">
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
-                            <field colspan="4" name="line_ids" nolabel="1">
+                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" invisible="1"/>
                                     <field name="date" groups="base.group_extended"/>
@@ -2648,12 +2697,12 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Closing Balance" colspan="4"/>
-                            <field name="balance_end" string="Calculated Balance"/>
-                            <field name="balance_end_cash" string="CashBox Balance"/>
+                            <field name="balance_end"/>
+                            <field name="balance_end_cash"/>
                         </group>
                     </group>
                     <group col="8" colspan="4">
-                        <field name="state" colspan="4"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm" colspan="4"/>
                         <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                         <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
@@ -2714,5 +2763,113 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
             parent="menu_finance_payables"
             action="base.action_partner_supplier_form" sequence="100"/>
 
+        <!--
+            Account Reports
+        -->
+
+        <record id="view_account_financial_report_form" model="ir.ui.view">
+            <field name="name">account.financial.report.form</field>
+            <field name="model">account.financial.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Report">
+                    <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="parent_id"/>
+                        <field name="sequence"/>
+                        <field name="type"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Report" attrs="{'invisible': [('state','!=','confirm')]}">
+                            <field name="display_detail" attrs="{'invisible': [('type','!=','accounts')]}"/>
+                            <newline/>
+                            <field name="account_ids" nolabel="1" colspan="6" attrs="{'invisible': [('type', '!=', 'accounts')]}"/>
+                            <newline/>
+                            <field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/>
+                            <newline/>
+                            <field name="account_type_ids" nolabel="1" attrs="{'invisible': [('type', '!=', 'account_type')]}"/>
+                            <newline/>
+                        </page>
+                        <page string="Notes" attrs="{'invisible': [('state','!=','confirm')]}">
+                            <field name="note" nolabel="1" colspan="4"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_account_financial_report_tree" model="ir.ui.view">
+            <field name="name">account.financial.report.tree</field>
+            <field name="model">account.financial.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Account Report">
+                    <field name="name"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="type"/>
+                    <field name="account_report_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_account_financial_report_search" model="ir.ui.view">
+            <field name="name">account.financial.report.search</field>
+            <field name="model">account.financial.report</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Account Report">
+                    <group>
+                        <field name="name"/>
+                        <field name="type"/>
+                        <field name="account_report_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_account_financial_report_tree" model="ir.actions.act_window">
+            <field name="name">Financial Reports</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.financial.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_financial_report_search"/>
+            <field name="view_id" ref="view_account_financial_report_tree"/>
+            <field name="help">Makes a generic system to draw financial reports easily.</field>
+        </record>
+
+        <menuitem id="menu_account_financial_reports_tree" name="Account Reports" parent="menu_account_reports" action="action_account_financial_report_tree"/>
+
+        <record id="view_account_report_tree_hierarchy" model="ir.ui.view">
+            <field name="name">account.report.hierarchy</field>
+            <field name="model">account.financial.report</field>
+            <field name="type">tree</field>
+            <field name="field_parent">children_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Account Reports Hierarchy">
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="account_report_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_account_report_tree_hierarchy" model="ir.actions.act_window">
+            <field name="name">Financial Reports Hierarchy</field>
+            <field name="res_model">account.financial.report</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_report_tree_hierarchy"/>
+            <field name="domain">[('parent_id','=',False)]</field>
+        </record>
+
+        <menuitem id="menu_account_report_tree_hierarchy" name="Account Reports Hierarchy"
+                  parent="menu_account_reports" action="action_account_report_tree_hierarchy"/>
+
     </data>
 </openerp>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index e5b262c07f9..5108a62cf3e 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -30,6 +30,7 @@
           <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">
@@ -38,17 +39,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Board">
-                    <hpaned>
-                        <child1>
-                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
-                            <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" groups="account.group_account_manager"/>
-                        </child1>
-                        <child2>
-                            <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury" groups="account.group_account_manager,account.group_account_user"/>
-                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables" groups="account.group_account_manager,account.group_account_user"/>
-                            <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
-                        </child2>
-                    </hpaned>
+                    <board style="2-1">
+                        <column>
+                            <action name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" 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"/> <!--groups="account.group_account_manager,account.group_account_user"-->
+                            <action name="%(action_aged_receivable)d" string="Aged Receivables"/> <!--groups="account.group_account_manager,account.group_account_user"-->
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/account/company.py b/addons/account/company.py
index c7836e0128b..4ad4d1226d7 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -24,6 +24,7 @@ from osv import fields, osv
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
+        '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',
@@ -32,16 +33,17 @@ class res_company(osv.osv):
             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.), Which is calculated from Profit & Loss Report"),
+            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 = {
-        'overdue_msg': 'Please note that the following payments are now due. If your payment \
-                        has been sent, kindly forward your payment details. If payment will be \
-                        delayed further, please contact us to discuss. \
-                        \nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
+        'overdue_msg': '''Our records indicate that the following payments are still due. If the amount
+has already been paid, please disregard this notice. However, if you have any
+queries regarding your account, please contact us.
+Thank you in advance.
+'''
     }
 
 res_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/account/company_view.xml b/addons/account/company_view.xml
index 60a3d0eea84..0cc67f23cfe 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -7,7 +7,7 @@
             <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <notebook>
+                <notebook position="inside">
                     <page string="Overdue Payments" position="inside">
                         <separator string="Overdue Payments Message" colspan="4"/>
                         <field name="overdue_msg" nolabel="1" colspan ="4"/>
@@ -24,6 +24,7 @@
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
+                      <field name="paypal_account" />
                 </field>
             </field>
         </record>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index b2936955246..0ac7a51405d 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -21,26 +21,26 @@
           <field name="close_method">none</field>
         </record>
 
-	    <record model="account.account.type" id="account_type_income_view1">
-	        <field name="name">Income View</field>
-	        <field name="code">view</field>
-	        <field name="report_type">income</field>
-	    </record>
-	    <record model="account.account.type" id="account_type_expense_view1">
-	        <field name="name">Expense View</field>
-	        <field name="code">expense</field>
-	        <field name="report_type">expense</field>
-	    </record>
-	    <record model="account.account.type" id="account_type_asset_view1">
-	        <field name="name">Asset View</field>
-	        <field name="code">asset</field>
-	        <field name="report_type">asset</field>
-	    </record>
-	    <record model="account.account.type" id="account_type_liability_view1">
-	        <field name="name">Liability View</field>
-	        <field name="code">liability</field>
-	        <field name="report_type">liability</field>
-	    </record>
+        <record model="account.account.type" id="account_type_income_view1">
+            <field name="name">Income View</field>
+            <field name="code">view</field>
+            <field name="report_type">income</field>
+        </record>
+        <record model="account.account.type" id="account_type_expense_view1">
+            <field name="name">Expense View</field>
+            <field name="code">expense</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record model="account.account.type" id="account_type_asset_view1">
+            <field name="name">Asset View</field>
+            <field name="code">asset</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record model="account.account.type" id="account_type_liability_view1">
+            <field name="name">Liability View</field>
+            <field name="code">liability</field>
+            <field name="report_type">liability</field>
+        </record>
 
         <record model="account.account.type" id="conf_account_type_income">
           <field name="name">Income</field>
@@ -87,7 +87,7 @@
         <record model="account.account.type" id="conf_account_type_equity">
           <field name="name">Equity</field>
           <field name="code">equity</field>
-          <field name="report_type">asset</field>
+          <field name="report_type">liability</field>
           <field name="close_method">balance</field>
         </record>
 
@@ -106,16 +106,16 @@
 
 
 
-		<!-- Account Templates-->
-		<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="conf_account_type_view"/>
-		</record>
+        <!-- Account Templates-->
+        <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="conf_account_type_view"/>
+        </record>
 
-       	<!-- Balance Sheet -->
+           <!-- Balance Sheet -->
 
         <record id="conf_bal" model="account.account.template">
             <field name="code">1</field>
@@ -125,120 +125,120 @@
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
 
-	        <record id="conf_fas" model="account.account.template">
-	            <field name="code">10</field>
-	            <field name="name">Fixed Assets</field>
-	            <field ref="conf_bal" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_asset_view1"/>
-	        </record>
+            <record id="conf_fas" model="account.account.template">
+                <field name="code">10</field>
+                <field name="name">Fixed Assets</field>
+                <field ref="conf_bal" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_asset_view1"/>
+            </record>
 
-		        <record id="conf_xfa" model="account.account.template">
-		            <field name="code">100</field>
-		            <field name="name">Fixed Asset Account</field>
-		            <field ref="conf_fas" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="account_type_asset_view1"/>
-		        </record>
+                <record id="conf_xfa" model="account.account.template">
+                    <field name="code">100</field>
+                    <field name="name">Fixed Asset Account</field>
+                    <field ref="conf_fas" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_asset_view1"/>
+                </record>
 
-	        <record id="conf_nca" model="account.account.template">
-	            <field name="code">11</field>
-	            <field name="name">Net Current Assets</field>
-	            <field ref="conf_bal" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_asset_view1"/>
-	        </record>
+            <record id="conf_nca" model="account.account.template">
+                <field name="code">11</field>
+                <field name="name">Net Current Assets</field>
+                <field ref="conf_bal" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_asset_view1"/>
+            </record>
 
-		        <record id="conf_cas" model="account.account.template">
-		            <field name="code">110</field>
-		            <field name="name">Current Assets</field>
-		            <field ref="conf_nca" name="parent_id"/>
-		            <field name="type">view</field>
-		            <field name="user_type" ref="account_type_asset_view1"/>
-		        </record>
+                <record id="conf_cas" model="account.account.template">
+                    <field name="code">110</field>
+                    <field name="name">Current Assets</field>
+                    <field ref="conf_nca" name="parent_id"/>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_asset_view1"/>
+                </record>
 
-			        <record id="conf_stk" model="account.account.template">
-			            <field name="code">1101</field>
-			            <field name="name">Purchased Stocks</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_asset"/>
-			        </record>
+                    <record id="conf_stk" model="account.account.template">
+                        <field name="code">1101</field>
+                        <field name="name">Purchased Stocks</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_asset"/>
+                    </record>
 
-			        <record id="conf_a_recv" model="account.account.template">
-			            <field name="code">1102</field>
-			            <field name="name">Debtors</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">receivable</field>
-			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_asset"/>
-			        </record>
+                    <record id="conf_a_recv" model="account.account.template">
+                        <field name="code">1102</field>
+                        <field name="name">Debtors</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">receivable</field>
+                        <field eval="True" name="reconcile"/>
+                        <field name="user_type" ref="conf_account_type_receivable"/>
+                    </record>
 
-			        <record id="conf_ova" model="account.account.template">
-			            <field name="code">1103</field>
-			            <field name="name">Tax Paid</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_asset"/>
-			        </record>
+                    <record id="conf_ova" model="account.account.template">
+                        <field name="code">1103</field>
+                        <field name="name">Tax Paid</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_asset"/>
+                    </record>
 
-			        <record id="conf_bnk" model="account.account.template">
-			            <field name="code">1104</field>
-			            <field name="name">Bank Current Account</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">liquidity</field>
-			            <field name="user_type" ref="conf_account_type_asset"/>
-			        </record>
+                    <record id="conf_bnk" model="account.account.template">
+                        <field name="code">1104</field>
+                        <field name="name">Bank Current Account</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">view</field>
+                        <field name="user_type" ref="account_type_asset_view1"/>
+                    </record>
 
-			        <record id="conf_o_income" model="account.account.template">
-			            <field name="code">1106</field>
-			            <field name="name">Opening Income Account</field>
-			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_income"/>
-			        </record>
+                    <record id="conf_o_income" model="account.account.template">
+                        <field name="code">1106</field>
+                        <field name="name">Opening Income Account</field>
+                        <field ref="conf_cas" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_income"/>
+                    </record>
 
-		        <record id="conf_cli" model="account.account.template">
-		            <field name="code">111</field>
-		            <field name="name">Current Liabilities</field>
-		            <field ref="conf_nca" name="parent_id"/>
-		            <field name="type">view</field>
-		            <field name="user_type" ref="account_type_liability_view1"/>
-		        </record>
+                <record id="conf_cli" model="account.account.template">
+                    <field name="code">12</field>
+                    <field name="name">Current Liabilities</field>
+                    <field ref="conf_bal" name="parent_id"/>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_liability_view1"/>
+                </record>
 
-			        <record id="conf_a_pay" model="account.account.template">
-			            <field name="code">1111</field>
-			            <field name="name">Creditors</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">payable</field>
-			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_liability"/>
-			        </record>
+                    <record id="conf_a_pay" model="account.account.template">
+                        <field name="code">120</field>
+                        <field name="name">Creditors</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">payable</field>
+                        <field eval="True" name="reconcile"/>
+                        <field name="user_type" ref="conf_account_type_payable"/>
+                    </record>
 
-			        <record id="conf_iva" model="account.account.template">
-			            <field name="code">1112</field>
-			            <field name="name">Tax Received</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_liability"/>
-			        </record>
+                    <record id="conf_iva" model="account.account.template">
+                        <field name="code">121</field>
+                        <field name="name">Tax Received</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_liability"/>
+                    </record>
 
-			        <record id="conf_a_reserve_and_surplus" model="account.account.template">
-			            <field name="code">1113</field>
-			            <field name="name">Reserve and Profit/Loss Account</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_liability"/>
-			        </record>
+                    <record id="conf_a_reserve_and_surplus" model="account.account.template">
+                        <field name="code">122</field>
+                        <field name="name">Reserve and Profit/Loss Account</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field eval="True" name="reconcile"/>
+                        <field name="user_type" ref="conf_account_type_liability"/>
+                    </record>
 
-			        <record id="conf_o_expense" model="account.account.template">
-			            <field name="code">1114</field>
-			            <field name="name">Opening Expense Account</field>
-			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">other</field>
-			            <field name="user_type" ref="conf_account_type_expense"/>
-			        </record>
+                    <record id="conf_o_expense" model="account.account.template">
+                        <field name="code">123</field>
+                        <field name="name">Opening Expense Account</field>
+                        <field ref="conf_cli" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="conf_account_type_expense"/>
+                    </record>
 
         <!-- Profit and Loss -->
 
@@ -250,53 +250,53 @@
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
 
-	        <record id="conf_rev" model="account.account.template">
-	            <field name="code">20</field>
-	            <field name="name">Revenue</field>
-	            <field ref="conf_gpf" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_income_view1"/>
-	        </record>
+            <record id="conf_rev" model="account.account.template">
+                <field name="code">20</field>
+                <field name="name">Revenue</field>
+                <field ref="conf_gpf" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_income_view1"/>
+            </record>
 
-		        <record id="conf_a_sale" model="account.account.template">
-		            <field name="code">200</field>
-		            <field name="name">Product Sales</field>
-		            <field ref="conf_rev" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="conf_account_type_income"/>
-		        </record>
+                <record id="conf_a_sale" model="account.account.template">
+                    <field name="code">200</field>
+                    <field name="name">Product Sales</field>
+                    <field ref="conf_rev" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="conf_account_type_income"/>
+                </record>
 
-	        <record id="conf_cos" model="account.account.template">
-	            <field name="code">21</field>
-	            <field name="name">Cost of Sales</field>
-	            <field ref="conf_gpf" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_income_view1"/>
-	        </record>
+            <record id="conf_cos" model="account.account.template">
+                <field name="code">21</field>
+                <field name="name">Cost of Sales</field>
+                <field ref="conf_gpf" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_income_view1"/>
+            </record>
 
-		        <record id="conf_cog" model="account.account.template">
-		            <field name="code">210</field>
-		            <field name="name">Cost of Goods Sold</field>
-		            <field ref="conf_cos" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="conf_account_type_expense"/>
-		        </record>
+                <record id="conf_cog" model="account.account.template">
+                    <field name="code">210</field>
+                    <field name="name">Cost of Goods Sold</field>
+                    <field ref="conf_cos" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="conf_account_type_expense"/>
+                </record>
 
-	        <record id="conf_ovr" model="account.account.template">
-	            <field name="code">22</field>
-	            <field name="name">Overheads</field>
-	            <field ref="conf_gpf" name="parent_id"/>
-	            <field name="type">view</field>
-	            <field name="user_type" ref="account_type_expense_view1"/>
-	        </record>
+            <record id="conf_ovr" model="account.account.template">
+                <field name="code">22</field>
+                <field name="name">Overheads</field>
+                <field ref="conf_gpf" name="parent_id"/>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_expense_view1"/>
+            </record>
 
-		        <record id="conf_a_expense" model="account.account.template">
-		            <field name="code">220</field>
-		            <field name="name">Expenses</field>
-		            <field ref="conf_ovr" name="parent_id"/>
-		            <field name="type">other</field>
-		            <field name="user_type" ref="conf_account_type_expense"/>
-		        </record>
+                <record id="conf_a_expense" model="account.account.template">
+                    <field name="code">220</field>
+                    <field name="name">Expenses</field>
+                    <field ref="conf_ovr" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="conf_account_type_expense"/>
+                </record>
 
                 <record id="conf_a_salary_expense" model="account.account.template">
                     <field name="code">221</field>
@@ -315,126 +315,126 @@
             <field name="name">Plan Fees </field>
         </record>
 
-	        <record id="tax_code_balance_net" model="account.tax.code.template">
-	            <field name="name">Tax Balance to Pay</field>
-	            <field name="parent_id" ref="tax_code_chart_root"/>
-	        </record>
+            <record id="tax_code_balance_net" model="account.tax.code.template">
+                <field name="name">Tax Balance to Pay</field>
+                <field name="parent_id" ref="tax_code_chart_root"/>
+            </record>
 
-			<!-- Input TAX -->
-	        <record id="tax_code_input" model="account.tax.code.template">
-	            <field name="name">Tax Received</field>
-	            <field name="parent_id" ref="tax_code_balance_net"/>
-	            <field eval="-1" name="sign"/>
-	        </record>
+            <!-- Input TAX -->
+            <record id="tax_code_input" model="account.tax.code.template">
+                <field name="name">Tax Received</field>
+                <field name="parent_id" ref="tax_code_balance_net"/>
+                <field eval="-1" name="sign"/>
+            </record>
 
-		        <record id="tax_code_input_S" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate S (15%)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_S" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate S (15%)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-		        <record id="tax_code_input_R" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate R (5%)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_R" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate R (5%)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-		        <record id="tax_code_input_X" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate X (Exempt)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_X" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate X (Exempt)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-		        <record id="tax_code_input_O" model="account.tax.code.template">
-		            <field name="name">Tax Received Rate O (Out of scope)</field>
-		            <field name="parent_id" ref="tax_code_input"/>
-		        </record>
+                <record id="tax_code_input_O" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate O (Out of scope)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
 
-	        <!-- Output TAX -->
+            <!-- Output TAX -->
 
-	        <record id="tax_code_output" model="account.tax.code.template">
-	            <field name="name">Tax Paid</field>
-	            <field name="parent_id" ref="tax_code_balance_net"/>
-	        </record>
+            <record id="tax_code_output" model="account.tax.code.template">
+                <field name="name">Tax Paid</field>
+                <field name="parent_id" ref="tax_code_balance_net"/>
+            </record>
 
-		        <record id="tax_code_output_S" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate S (15%)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_S" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate S (15%)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
-		        <record id="tax_code_output_R" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate R (5%)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_R" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate R (5%)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
-		        <record id="tax_code_output_X" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate X (Exempt)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_X" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate X (Exempt)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
-		        <record id="tax_code_output_O" model="account.tax.code.template">
-		            <field name="name">Tax Paid Rate O (Out of scope)</field>
-		            <field name="parent_id" ref="tax_code_output"/>
-		        </record>
+                <record id="tax_code_output_O" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate O (Out of scope)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
 
 
-	        <!-- Invoiced Base of TAX -->
+            <!-- Invoiced Base of TAX -->
 
-	        <!-- Purchases -->
+            <!-- Purchases -->
 
-	        <record id="tax_code_base_net" model="account.tax.code.template">
-	            <field name="name">Tax Bases</field>
-	            <field name="parent_id" ref="tax_code_chart_root"/>
-	        </record>
+            <record id="tax_code_base_net" model="account.tax.code.template">
+                <field name="name">Tax Bases</field>
+                <field name="parent_id" ref="tax_code_chart_root"/>
+            </record>
 
-		        <record id="tax_code_base_purchases" model="account.tax.code.template">
-		            <field name="name">Taxable Purchases Base</field>
-		            <field name="parent_id" ref="tax_code_base_net"/>
-		        </record>
+                <record id="tax_code_base_purchases" model="account.tax.code.template">
+                    <field name="name">Taxable Purchases Base</field>
+                    <field name="parent_id" ref="tax_code_base_net"/>
+                </record>
 
-			        <record id="tax_code_purch_S" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Rated S (15%)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_S" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Rated S (15%)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-			        <record id="tax_code_purch_R" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Rated R (5%)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_R" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Rated R (5%)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-			        <record id="tax_code_purch_X" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Type X (Exempt)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_X" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Type X (Exempt)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-			        <record id="tax_code_purch_O" model="account.tax.code.template">
-			            <field name="name">Taxable Purchases Type O (Out of scope)</field>
-			            <field name="parent_id" ref="tax_code_base_purchases"/>
-			        </record>
+                    <record id="tax_code_purch_O" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Type O (Out of scope)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
 
-		        <!-- Sales -->
+                <!-- Sales -->
 
-		        <record id="tax_code_base_sales" model="account.tax.code.template">
-		            <field name="name">Base of Taxable Sales</field>
-		            <field name="parent_id" ref="tax_code_base_net"/>
-		        </record>
+                <record id="tax_code_base_sales" model="account.tax.code.template">
+                    <field name="name">Base of Taxable Sales</field>
+                    <field name="parent_id" ref="tax_code_base_net"/>
+                </record>
 
-			        <record id="tax_code_sales_S" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Rated S (15%)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_S" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Rated S (15%)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
-			        <record id="tax_code_sales_R" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Rated R (5%)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_R" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Rated R (5%)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
-			        <record id="tax_code_sales_X" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Type X (Exempt)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_X" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Type X (Exempt)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
-			        <record id="tax_code_sales_O" model="account.tax.code.template">
-			            <field name="name">Taxable Sales Type O (Out of scope)</field>
-			            <field name="parent_id" ref="tax_code_base_sales"/>
-			        </record>
+                    <record id="tax_code_sales_O" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Type O (Out of scope)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
 
         <record id="configurable_chart_template" model="account.chart.template">
             <field name="name">Configurable Account Chart Template</field>
@@ -446,11 +446,11 @@
             <field name="property_account_expense_categ" ref="conf_a_expense"/>
             <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_account_expense_opening" ref="conf_o_expense"/>
             <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
         </record>
 
-     	<!-- VAT Codes -->
+         <!-- VAT Codes -->
         <!-- Purchases + Output VAT -->
 
         <record id="otaxs" model="account.tax.template">
@@ -569,9 +569,9 @@
 
 
 
-	    <!-- = = = = = = = = = = = = = = = -->
-	     <!-- Fiscal Mapping Templates     -->
-	    <!-- = = = = = = = = = = = = = = = -->
+        <!-- = = = = = = = = = = = = = = = -->
+         <!-- Fiscal Mapping Templates     -->
+        <!-- = = = = = = = = = = = = = = = -->
 
 
         <record id="fiscal_position_normal_taxes_template1" model="account.fiscal.position.template">
@@ -584,40 +584,40 @@
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
-	    <!-- = = = = = = = = = = = = = = = -->
-	    <!-- Fiscal Position Tax Templates -->
-	    <!-- = = = = = = = = = = = = = = = -->
+        <!-- = = = = = = = = = = = = = = = -->
+        <!-- Fiscal Position Tax Templates -->
+        <!-- = = = = = = = = = = = = = = = -->
 
 
-    	<record id="fiscal_position_normal_taxes" model="account.fiscal.position.tax.template">
+        <record id="fiscal_position_normal_taxes" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_normal_taxes_template1"/>
             <field name="tax_src_id" ref="itaxs"/>
             <field name="tax_dest_id" ref="otaxs"/>
         </record>
 
-    	<record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
+        <record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_tax_exempt_template2"/>
             <field name="tax_src_id" ref="itaxx"/>
             <field name="tax_dest_id" ref="otaxx"/>
         </record>
 
 
-		<!--  Assigned Default Taxes For Different Account -->
+        <!--  Assigned Default Taxes For Different Account -->
 
-		<record id="conf_a_sale" model="account.account.template">
-			<field name="tax_ids" eval="[(6,0,[ref('itaxs')])]"/>
-		</record>
+        <record id="conf_a_sale" model="account.account.template">
+            <field name="tax_ids" eval="[(6,0,[ref('itaxs')])]"/>
+        </record>
 
-		<record id="conf_a_expense" model="account.account.template">
-			<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
-		</record>
-		
-		<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
-			<field name="name">Generate Chart of Accounts from a Chart Template</field>
-			<field name="action_id" ref="account.action_wizard_multi_chart"/>
-			<field name="category_id" ref="account.category_accounting_configuration"/>
-			<field name="type">automatic</field>
-		</record>
+        <record id="conf_a_expense" model="account.account.template">
+            <field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
+        </record>
+
+        <record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
+            <field name="type">automatic</field>
+        </record>
 
 
     </data>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data.xml
similarity index 88%
rename from addons/account/data/account_data2.xml
rename to addons/account/data/account_data.xml
index 4a44c726960..e111c453325 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data.xml
@@ -25,6 +25,40 @@
             <field name="name">Payment Term</field>
             <field name="digits">6</field>
         </record>
+
+        <record id="account_payment_term_net" model="account.payment.term">
+            <field name="name">30 Net Days</field>
+            <field name="note">30 Net Days</field>
+        </record>
+        <record id="account_payment_term_line_net" model="account.payment.term.line">
+            <field name="name">30 Net Days</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_net" name="payment_id"/>
+        </record>
+
+        <record id="account_payment_term_advance" model="account.payment.term">
+            <field name="name">30% Advance End 30 Days</field>
+            <field name="note">30% Advance End 30 Days</field>
+        </record>
+        <record id="account_payment_term_line_advance1" model="account.payment.term.line">
+            <field name="name">30% Advance</field>
+            <field name="value">procent</field>
+            <field eval="3" name="sequence"/>
+            <field eval="0.300000" name="value_amount"/>
+            <field eval="0" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
+        <record id="account_payment_term_line_advance2" model="account.payment.term.line">
+            <field name="name">Remaining Balance</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="-1" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
+
         <!--
         Account Journal View
         -->
@@ -435,66 +469,48 @@
         Account Journal Sequences
         -->
 
-        <record id="sequence_journal_type" model="ir.sequence.type">
-            <field name="name">Account Journal</field>
-            <field name="code">account.journal</field>
-        </record>
-        <record id="sequence_journal" model="ir.sequence">
-            <field name="name">Account Journal</field>
-            <field name="code">account.journal</field>
-            <field name="prefix"/>
-        </record>
         <record id="sequence_sale_journal" model="ir.sequence">
-            <field name="name">Sale Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Sales Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">SAJ/%(year)s/</field>
         </record>
         <record id="sequence_refund_sales_journal" model="ir.sequence">
-            <field name="name">Sales Credit Note Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Sales Credit Note Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">SCNJ/%(year)s/</field>
         </record>
         <record id="sequence_purchase_journal" model="ir.sequence">
-            <field name="name">Purchase Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Expenses Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">EXJ/%(year)s/</field>
         </record>
         <record id="sequence_refund_purchase_journal" model="ir.sequence">
-            <field name="name">Expenses Credit Notes Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Expenses Credit Notes Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">ECNJ/%(year)s/</field>
         </record>
         <record id="sequence_bank_journal" model="ir.sequence">
-            <field name="name">Bank Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Bank Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">BNK/%(year)s/</field>
         </record>
         <record id="sequence_check_journal" model="ir.sequence">
-            <field name="name">Checks Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Checks Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">CHK/%(year)s/</field>
         </record>
         <record id="sequence_cash_journal" model="ir.sequence">
-            <field name="name">Cash Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Cash Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">CSH/%(year)s/</field>
         </record>
         <record id="sequence_opening_journal" model="ir.sequence">
-            <field name="name">Opening Entries Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Opening Entries Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">OPEJ/%(year)s/</field>
         </record>
         <record id="sequence_miscellaneous_journal" model="ir.sequence">
-            <field name="name">Miscellaneous Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Miscellaneous Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">MISJ/%(year)s/</field>
         </record>
@@ -504,7 +520,7 @@
         -->
 
         <record id="sequence_reconcile" model="ir.sequence.type">
-            <field name="name">Account reconcile sequence</field>
+            <field name="name">Account Reconcile</field>
             <field name="code">account.reconcile</field>
         </record>
         <record id="sequence_reconcile_seq" model="ir.sequence">
@@ -516,7 +532,7 @@
         </record>
 
         <record id="sequence_statement_type" model="ir.sequence.type">
-            <field name="name">Bank Statement</field>
+            <field name="name">Account Bank Statement</field>
             <field name="code">account.bank.statement</field>
         </record>
         <record id="sequence_statement" model="ir.sequence">
@@ -528,7 +544,7 @@
         </record>
 
         <record id="cash_sequence_statement_type" model="ir.sequence.type">
-            <field name="name">Cash Statement</field>
+            <field name="name">Account Cash Statement</field>
             <field name="code">account.cash.statement</field>
         </record>
         <record id="cash_sequence_statement" model="ir.sequence">
@@ -538,5 +554,30 @@
             <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
+
+        <!-- 
+        Sequence for analytic account 
+        -->
+        <record id="seq_type_analytic_account" model="ir.sequence.type">
+            <field name="name">Analytic account</field>
+            <field name="code">account.analytic.account</field>
+        </record>
+        <record id="seq_analytic_account" model="ir.sequence">
+            <field name="name">Analytic account sequence</field>
+            <field name="code">account.analytic.account</field>
+            <field eval="3" name="padding"/>
+            <field eval="2708" name="number_next"/>
+        </record>
+
+        <!--
+        Invoice requests (deprecated)
+        -->
+        <record id="req_link_invoice" model="res.request.link">
+            <field name="name">Invoice</field>
+            <field name="object">account.invoice</field>
+        </record>
+
+
+
     </data>
 </openerp>
diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml
deleted file mode 100644
index 54f5ed6de91..00000000000
--- a/addons/account/data/account_invoice.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="req_link_invoice" model="res.request.link">
-            <field name="name">Invoice</field>
-            <field name="object">account.invoice</field>
-        </record>
-
-        <!--
-        Sequences types for invoices
-        -->
-        <record id="seq_type_out_invoice" model="ir.sequence.type">
-            <field name="name">Account Invoice Out</field>
-            <field name="code">account.invoice.out_invoice</field>
-        </record>
-        <record id="seq_type_in_invoice" model="ir.sequence.type">
-            <field name="name">Account Invoice In</field>
-            <field name="code">account.invoice.in_invoice</field>
-        </record>
-        <record id="seq_type_out_refund" model="ir.sequence.type">
-            <field name="name">Account Refund Out</field>
-            <field name="code">account.invoice.out_refund</field>
-        </record>
-        <record id="seq_type_in_refund" model="ir.sequence.type">
-            <field name="name">Account Refund In</field>
-            <field name="code">account.invoice.in_refund</field>
-        </record>
-        
-        <!--
-        Sequences for invoices
-        -->
-        <record id="seq_out_invoice" model="ir.sequence">
-            <field name="name">Account Invoice Out</field>
-            <field name="code">account.invoice.out_invoice</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        <record id="seq_in_invoice" model="ir.sequence">
-            <field name="name">Account Invoice In</field>
-            <field name="code">account.invoice.in_invoice</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        <record id="seq_out_refund" model="ir.sequence">
-            <field name="name">Account Refund Out</field>
-            <field name="code">account.invoice.out_refund</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        <record id="seq_in_refund" model="ir.sequence">
-            <field name="name">Account Refund In</field>
-            <field name="code">account.invoice.in_refund</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        
-        <!--
-        Sequences types for analytic account 
-        -->
-        <record id="seq_type_analytic_account" model="ir.sequence.type">
-            <field name="name">Analytic account</field>
-            <field name="code">account.analytic.account</field>
-        </record>
-        
-        <!-- 
-        Sequence for analytic account 
-        -->
-        <record id="seq_analytic_account" model="ir.sequence">
-            <field name="name">Analytic account sequence</field>
-            <field name="code">account.analytic.account</field>
-            <field eval="3" name="padding"/>
-            <field eval="2708" name="number_next"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 566185c70c3..0bbfa71af62 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -7,7 +7,7 @@
         -->    
         
         <record id="data_fiscalyear" model="account.fiscalyear">
-            <field eval="'Fiscal Year '+time.strftime('%Y')" name="name"/>
+            <field eval="'Fiscal Year X '+time.strftime('%Y')" name="name"/>
             <field eval="'FY'+time.strftime('%Y')" name="code"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
@@ -20,7 +20,7 @@
         
         <record id="period_1" model="account.period">
             <field eval="'01/'+time.strftime('%Y')" name="code"/>
-            <field eval="'01/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 01/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
@@ -29,7 +29,7 @@
         </record>
         <record id="period_2" model="account.period">
             <field eval="'02/'+time.strftime('%Y')" name="code"/>
-            <field eval="'02/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 02/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
@@ -38,7 +38,7 @@
         </record>
         <record id="period_3" model="account.period">
             <field eval="'03/'+time.strftime('%Y')" name="code"/>
-            <field eval="'03/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 03/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
@@ -47,7 +47,7 @@
         </record>
         <record id="period_4" model="account.period">
             <field eval="'04/'+time.strftime('%Y')" name="code"/>
-            <field eval="'04/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 04/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
@@ -56,7 +56,7 @@
         </record>
         <record id="period_5" model="account.period">
             <field eval="'05/'+time.strftime('%Y')" name="code"/>
-            <field eval="'05/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 05/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
@@ -65,7 +65,7 @@
         </record>
         <record id="period_6" model="account.period">
             <field eval="'06/'+time.strftime('%Y')" name="code"/>
-            <field eval="'06/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 06/'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="True" name="special"/>
             <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
@@ -74,7 +74,7 @@
         </record>
         <record id="period_7" model="account.period">
             <field eval="'07/'+time.strftime('%Y')" name="code"/>
-            <field eval="'07/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 07/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
@@ -83,7 +83,7 @@
         </record>
         <record id="period_8" model="account.period">
             <field eval="'08/'+time.strftime('%Y')" name="code"/>
-            <field eval="'08/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 08/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
@@ -92,7 +92,7 @@
         </record>
         <record id="period_9" model="account.period">
             <field eval="'09/'+time.strftime('%Y')" name="code"/>
-            <field eval="'09/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 09/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
@@ -101,7 +101,7 @@
         </record>
         <record id="period_10" model="account.period">
             <field eval="'10/'+time.strftime('%Y')" name="code"/>
-            <field eval="'10/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 10/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
@@ -110,7 +110,7 @@
         </record>
         <record id="period_11" model="account.period">
             <field eval="'11/'+time.strftime('%Y')" name="code"/>
-            <field eval="'11/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 11/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
@@ -119,7 +119,7 @@
         </record>
         <record id="period_12" model="account.period">
             <field eval="'12/'+time.strftime('%Y')" name="code"/>
-            <field eval="'12/'+time.strftime('%Y')" name="name"/>
+            <field eval="'X 12/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
@@ -129,6 +129,6 @@
 
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/> 
-        </record>      
+        </record>
     </data>
 </openerp>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index cadd590eb2d..50b597c8e49 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -49,7 +49,7 @@
         <record id="account_type_cash_equity" model="account.account.type">
             <field name="name">Equity</field>
             <field name="code">equity</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
         <record id="account_type_cash_moves" model="account.account.type">
@@ -60,7 +60,7 @@
         </record>
 
         <!--
-        Chart of Account
+        Chart of Accounts
         -->
 
         <record id="chart0" model="account.account">
diff --git a/addons/account/edi/__init__.py b/addons/account/edi/__init__.py
new file mode 100644
index 00000000000..a5bf0bbfa2d
--- /dev/null
+++ b/addons/account/edi/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 invoice
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
new file mode 100644
index 00000000000..d36e9163ba9
--- /dev/null
+++ b/addons/account/edi/invoice.py
@@ -0,0 +1,275 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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, orm
+from edi import EDIMixin
+
+INVOICE_LINE_EDI_STRUCT = {
+    'name': True,
+    'origin': True,
+    'uos_id': True,
+    'product_id': True,
+    'price_unit': True,
+    'quantity': True,
+    'discount': True,
+    'note': True,
+
+    # fields used for web preview only - discarded on import
+    'price_subtotal': True,
+}
+
+INVOICE_TAX_LINE_EDI_STRUCT = {
+    'name': True,
+    'base': True,
+    'amount': True,
+    'manual': True,
+    'sequence': True,
+    'base_amount': True,
+    'tax_amount': True,
+}
+
+INVOICE_EDI_STRUCT = {
+    'name': True,
+    'origin': True,
+    'company_id': True, # -> to be changed into partner
+    'type': True, # -> reversed at import
+    'internal_number': True, # -> reference at import
+    'comment': True,
+    'date_invoice': True,
+    'date_due': True,
+    'partner_id': True,
+    'payment_term': True,
+    #custom: currency_id
+    'invoice_line': INVOICE_LINE_EDI_STRUCT,
+    'tax_line': INVOICE_TAX_LINE_EDI_STRUCT,
+
+    # fields used for web preview only - discarded on import
+    #custom: 'partner_ref'
+    'amount_total': True,
+    'amount_untaxed': True,
+    'amount_tax': True,
+}
+
+class account_invoice(osv.osv, EDIMixin):
+    _inherit = 'account.invoice'
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        """Exports a supplier or customer invoice"""
+        edi_struct = dict(edi_struct or INVOICE_EDI_STRUCT)
+        res_company = self.pool.get('res.company')
+        res_partner_address = self.pool.get('res.partner.address')
+        edi_doc_list = []
+        for invoice in records:
+            # generate the main report
+            self._edi_generate_report_attachment(cr, uid, invoice, context=context)
+            edi_doc = super(account_invoice,self).edi_export(cr, uid, [invoice], edi_struct, context)[0]
+            edi_doc.update({
+                    'company_address': res_company.edi_export_address(cr, uid, invoice.company_id, context=context),
+                    'company_paypal_account': invoice.company_id.paypal_account,
+                    'partner_address': res_partner_address.edi_export(cr, uid, [invoice.address_invoice_id], context=context)[0],
+
+                    'currency': self.pool.get('res.currency').edi_export(cr, uid, [invoice.currency_id], context=context)[0],
+                    'partner_ref': invoice.reference or False,
+            })
+            edi_doc_list.append(edi_doc)
+        return edi_doc_list
+
+    def _edi_tax_account(self, cr, uid, invoice_type='out_invoice', context=None):
+        #TODO/FIXME: should select proper Tax Account
+        account_pool = self.pool.get('account.account')
+        account_ids = account_pool.search(cr, uid, [('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')])
+        tax_account = False
+        if account_ids:
+            tax_account = account_pool.browse(cr, uid, account_ids[0])
+        return tax_account
+
+    def _edi_invoice_account(self, cr, uid, partner_id, invoice_type, context=None):
+        partner_pool = self.pool.get('res.partner')
+        partner = partner_pool.browse(cr, uid, partner_id, context=context)
+        if invoice_type in ('out_invoice', 'out_refund'):
+            invoice_account = partner.property_account_receivable
+        else:
+            invoice_account = partner.property_account_payable
+        return invoice_account
+
+    def _edi_product_account(self, cr, uid, product_id, invoice_type, context=None):
+        product_pool = self.pool.get('product.product')
+        product = product_pool.browse(cr, uid, product_id, context=context)
+        if invoice_type in ('out_invoice','out_refund'):
+            account = product.property_account_income or product.categ_id.property_account_income_categ
+        else:
+            account = product.property_account_expense or product.categ_id.property_account_expense_categ
+        return account
+
+    def _edi_import_company(self, cr, uid, edi_document, context=None):
+        # TODO: for multi-company setups, we currently import the document in the
+        #       user's current company, but we should perhaps foresee a way to select
+        #       the desired company among the user's allowed companies
+
+        self._edi_requires_attributes(('company_id','company_address','type'), edi_document)
+        res_partner_address = self.pool.get('res.partner.address')
+        res_partner = self.pool.get('res.partner')
+
+        # imported company = new partner
+        src_company_id, src_company_name = edi_document.pop('company_id')
+        partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
+                                              src_company_id, context=context)
+        invoice_type = edi_document['type']
+        partner_value = {}
+        if invoice_type in ('out_invoice', 'out_refund'):
+            partner_value.update({'customer': True})
+        if invoice_type in ('in_invoice', 'in_refund'):
+            partner_value.update({'supplier': True})
+        res_partner.write(cr, uid, [partner_id], partner_value, context=context)
+
+        # imported company_address = new partner address
+        address_info = edi_document.pop('company_address')
+        address_info['partner_id'] = (src_company_id, src_company_name)
+        address_info['type'] = 'invoice'
+        address_id = res_partner_address.edi_import(cr, uid, address_info, context=context)
+
+        # modify edi_document to refer to new partner
+        partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
+        edi_document['partner_id'] = (src_company_id, src_company_name)
+        edi_document.pop('partner_address', False) # ignored
+        edi_document['address_invoice_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
+
+        return partner_id
+
+
+    def edi_import(self, cr, uid, edi_document, context=None):
+        """ During import, invoices will import the company that is provided in the invoice as
+            a new partner (e.g. supplier company for a customer invoice will be come a supplier
+            record for the new invoice.
+            Summary of tasks that need to be done:
+                - import company as a new partner, if type==in then supplier=1, else customer=1
+                - partner_id field is modified to point to the new partner
+                - company_address data used to add address to new partner
+                - change type: out_invoice'<->'in_invoice','out_refund'<->'in_refund'
+                - reference: should contain the value of the 'internal_number'
+                - reference_type: 'none'
+                - internal number: reset to False, auto-generated
+                - journal_id: should be selected based on type: simply put the 'type'
+                    in the context when calling create(), will be selected correctly
+                - payment_term: if set, create a default one based on name...
+                - for invoice lines, the account_id value should be taken from the
+                    product's default, i.e. from the default category, as it will not
+                    be provided.
+                - for tax lines, we disconnect from the invoice.line, so all tax lines
+                    will be of type 'manual', and default accounts should be picked based
+                    on the tax config of the DB where it is imported.
+        """
+        if context is None:
+            context = {}
+        self._edi_requires_attributes(('company_id','company_address','type','invoice_line','currency'), edi_document)
+
+        # extract currency info
+        res_currency = self.pool.get('res.currency')
+        currency_info = edi_document.pop('currency')
+        currency_id = res_currency.edi_import(cr, uid, currency_info, context=context)
+        currency = res_currency.browse(cr, uid, currency_id)
+        edi_document['currency_id'] =  self.edi_m2o(cr, uid, currency, context=context)
+
+        # change type: out_invoice'<->'in_invoice','out_refund'<->'in_refund'
+        invoice_type = edi_document['type']
+        invoice_type = invoice_type.startswith('in_') and invoice_type.replace('in_','out_') or invoice_type.replace('out_','in_')
+        edi_document['type'] = invoice_type
+
+        #import company as a new partner
+        partner_id = self._edi_import_company(cr, uid, edi_document, context=context)
+
+        # Set Account
+        invoice_account = self._edi_invoice_account(cr, uid, partner_id, invoice_type, context=context)
+        edi_document['account_id'] = invoice_account and self.edi_m2o(cr, uid, invoice_account, context=context) or False
+
+        # reference: should contain the value of the 'internal_number'
+        edi_document['reference'] = edi_document.get('internal_number', False)
+        # reference_type: 'none'
+        edi_document['reference_type'] = 'none'
+
+        # internal number: reset to False, auto-generated
+        edi_document['internal_number'] = False
+
+        # discard web preview fields, if present
+        edi_document.pop('partner_ref', None)
+
+        # journal_id: should be selected based on type: simply put the 'type' in the context when calling create(), will be selected correctly
+        context.update(type=invoice_type)
+
+        # for invoice lines, the account_id value should be taken from the product's default, i.e. from the default category, as it will not be provided.
+        for edi_invoice_line in edi_document['invoice_line']:
+            product_info = edi_invoice_line['product_id']
+            product_id = self.edi_import_relation(cr, uid, 'product.product', product_info[1],
+                                                  product_info[0], context=context)
+            account = self._edi_product_account(cr, uid, product_id, invoice_type, context=context)
+            # TODO: could be improved with fiscal positions perhaps
+            # account = fpos_obj.map_account(cr, uid, fiscal_position_id, account.id)
+            edi_invoice_line['account_id'] = self.edi_m2o(cr, uid, account, context=context) if account else False
+
+            # discard web preview fields, if present
+            edi_invoice_line.pop('price_subtotal', None)
+
+        # for tax lines, we disconnect from the invoice.line, so all tax lines will be of type 'manual', and default accounts should be picked based
+        # on the tax config of the DB where it is imported.
+        tax_account = self._edi_tax_account(cr, uid, context=context)
+        tax_account_info = self.edi_m2o(cr, uid, tax_account, context=context)
+        for edi_tax_line in edi_document.get('tax_line', []):
+            edi_tax_line['account_id'] = tax_account_info
+            edi_tax_line['manual'] = True
+
+        return super(account_invoice,self).edi_import(cr, uid, edi_document, context=context)
+
+
+    def _edi_record_display_action(self, cr, uid, id, context=None):
+        """Returns an appropriate action definition dict for displaying
+           the record with ID ``rec_id``.
+
+           :param int id: database ID of record to display
+           :return: action definition dict
+        """
+        action = super(account_invoice,self)._edi_record_display_action(cr, uid, id, context=context)
+        try:
+            invoice = self.browse(cr, uid, id, context=context)
+            if 'out_' in invoice.type:
+                view_ext_id = 'invoice_form'
+                journal_type = 'sale'
+            else:
+                view_ext_id = 'invoice_supplier_form'
+                journal_type = 'purchase'
+            ctx = "{'type': '%s', 'journal_type': '%s'}" % (invoice.type, journal_type)
+            action.update(context=ctx)
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', view_ext_id)[1]
+            action.update(views=[(view_id,'form'), (False, 'tree')])
+        except ValueError:
+            # ignore if views are missing
+            pass
+        return action
+
+
+class account_invoice_line(osv.osv, EDIMixin):
+    _inherit='account.invoice.line'
+
+class account_invoice_tax(osv.osv, EDIMixin):
+    _inherit = "account.invoice.tax"
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
new file mode 100644
index 00000000000..0904ec6fd54
--- /dev/null
+++ b/addons/account/edi/invoice_action_data.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <!-- EDI Export + Send email Action  -->
+        <record id="ir_actions_server_edi_invoice" model="ir.actions.server">
+            <field name="code">if (object.type in ('out_invoice', 'out_refund')) and not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)</field>
+            <field eval="6" name="sequence"/>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field name="condition">True</field>
+            <field name="name">Auto-email confirmed invoices</field>
+        </record>
+
+        <!-- EDI related Email Templates menu -->
+        <record model="ir.actions.act_window" id="action_email_templates">
+            <field name="name">Email Templates</field>
+            <field name="res_model">email.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_template.email_template_tree" />
+            <field name="search_view_id" ref="email_template.view_email_template_search"/>
+            <field name="context">{'search_default_model_id':'account.invoice'}</field>
+            <field name="context" eval="{'search_default_model_id': ref('account.model_account_invoice')}"/>
+        </record>
+        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30"/>
+
+    </data>
+
+    <!-- Mail template and workflow bindings are done in a NOUPDATE block
+         so users can freely customize/delete them -->
+    <data noupdate="1">
+        <!-- bind the mailing server action to invoice open activity -->
+        <record id="account.act_open" model="workflow.activity">
+            <field name="action_id" ref="ir_actions_server_edi_invoice"/>
+        </record>
+
+        <!--Email template -->
+        <record id="email_template_edi_invoice" model="email.template">
+            <field name="name">Automated Invoice Notification Mail</field>
+            <field name="email_from">${object.user_id.user_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.address_invoice_id.email or ''}</field>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html"><![CDATA[
+<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); ">
+
+    <p>Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},</p>
+    
+    <p>A new invoice is available for ${object.partner_id.name}: </p>
+    
+    <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
+       &nbsp;&nbsp;<strong>REFERENCES</strong><br />
+       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />
+       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />
+       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />
+       % if object.origin:
+       &nbsp;&nbsp;Order reference: ${object.origin}<br />
+       % endif
+       &nbsp;&nbsp;Your contact: <a href="mailto:${object.user_id.user_email or ''}?subject=Invoice%20${object.number}">${object.user_id.name}</a>
+    </p>  
+    
+    <p>
+    You can view the invoice document, download it and pay online using the following link:
+    </p>
+            <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;" 
+               href="${ctx.get('edi_web_url_view') or ''}">View Invoice</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&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;" \
+                 "invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&amp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s" % \
+                 (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)
+    %>
+    <br/>
+    <p>It is also possible to directly pay with Paypal:</p>
+        <a style="margin-left: 120px;" href="${paypal_url}">
+            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+        </a>
+    % endif
+    
+    <br/>
+    <p>If you have any question, do not hesitate to contact us.</p>
+    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>
+    <br/>
+    <br/>
+    <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;">
+        <h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;">
+            <strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
+    </div>
+    <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
+        <span style="color: #222; margin-bottom: 5px; display: block; ">
+        % if object.company_id.street:
+            ${object.company_id.street}<br/>
+        % endif
+        % if object.company_id.street2:
+            ${object.company_id.street2}<br/>
+        % endif
+        % if object.company_id.city or object.company_id.zip:
+            ${object.company_id.zip} ${object.company_id.city}<br/>
+        % 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 ''}<br/>
+        % endif
+        </span>
+        % if object.company_id.phone:
+            <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; ">
+                Phone:&nbsp; ${object.company_id.phone}
+            </div>
+        % endif
+        % if object.company_id.website:
+            <div>
+                Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
+            </div>
+        %endif
+        <p></p>
+    </div>
+</div>
+            ]]></field>
+            <field name="body_text"><![CDATA[
+Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_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.user_email and '<%s>'%(object.user_id.user_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.user_email and '<%s>'%(object.user_id.user_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 382fabf09fa..0ee325832c3 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -451,8 +451,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1071,6 +1069,7 @@ 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
@@ -1258,6 +1257,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -1919,7 +1928,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -1980,6 +1989,9 @@ 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
+
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2001,11 +2013,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2305,6 +2322,7 @@ 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
@@ -2537,6 +2555,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2786,7 +2806,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2800,6 +2819,17 @@ msgstr ""
 #: 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 ""
 
@@ -3001,6 +3031,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3059,6 +3090,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3477,11 +3518,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4132,7 +4172,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4267,7 +4307,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4280,10 +4319,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4293,6 +4330,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4408,6 +4455,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5081,6 +5130,19 @@ msgstr ""
 #. module: account
 #: code:addons/account/report/common_report_header.py:100
 #, python-format
+#: 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
 msgid "No Filter"
 msgstr ""
 
@@ -5938,6 +6000,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6137,7 +6200,7 @@ 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 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."
+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
@@ -6756,6 +6819,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -6997,6 +7061,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7068,11 +7145,17 @@ msgid "Company Currency"
 msgstr ""
 
 #. module: account
-#: report:account.general.ledger:0
+#: report:account.account.balance:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
+#: 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 "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -7181,6 +7264,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7246,6 +7335,8 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
+#: view:account.print.invoice:0
+#: field:account.print.invoice,date_due:0
 msgid "Due Date"
 msgstr ""
 
@@ -7405,6 +7496,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -7658,12 +7750,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -7775,7 +7872,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -7794,6 +7896,15 @@ 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 ""
 
@@ -7974,7 +8085,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -7991,12 +8102,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8016,7 +8132,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8186,6 +8302,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8262,6 +8379,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8463,13 +8592,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8493,7 +8619,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -8695,6 +8821,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -8764,6 +8891,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9115,3 +9252,26 @@ 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 ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Expenses"
+msgstr ""
+
+#. module: account
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Income"
+msgstr ""
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index a4c12ebb0bb..3b5edf1e87d 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-06-18 11:20+0000\n"
-"Last-Translator: Ahmed Mokhlis <Unknown>\n"
+"PO-Revision-Date: 2011-11-15 03:49+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@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: 2011-06-19 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-16 05:21+0000\n"
+"X-Generator: Launchpad (build 14291)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr "الدفع عن طريق النظام"
+msgstr "نظام الدفع"
 
 #. module: account
 #: view:account.journal:0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "لايوجد نهاية لسجل السنة للعام المحاسبي"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -43,12 +43,12 @@ msgstr "لايمكن الغاء/تعطيل حساب معد كخاص بأي طر
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "تسوية اليومية"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "إدارة القسائم"
 
 #. module: account
 #: view:account.account:0
@@ -65,10 +65,10 @@ msgid "Residual"
 msgstr "متبقي"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "يرجى تحديد تسلسل على الفاتورة"
 
 #. module: account
 #: constraint:account.period:0
@@ -83,17 +83,17 @@ msgstr "عملة الحساب"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "تعريف فروع"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "فترة المقبوضات حتى اليوم"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
 msgid "Include Reconciled Entries"
-msgstr ""
+msgstr "إضافة السجلات المسواه"
 
 #. module: account
 #: view:account.pl.report:0
@@ -111,7 +111,7 @@ msgstr "إستيراد من فاتورة أو دفعة"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: view:account.move:0
@@ -124,6 +124,8 @@ 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 ""
+"إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
+"ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -131,10 +133,10 @@ msgid "Accounting Entries-"
 msgstr "المدخلات المحاسبية -"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr ""
+msgstr "لا يمكنك حذف حركة تم ترحيلها: \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
@@ -150,7 +152,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
@@ -173,9 +175,11 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"إذا تم تعيين الحقل النشط إلى خطأ ، فإنه سيسمح لك بإخفاء مدة السداد دون "
+"إزالتها."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
@@ -189,7 +193,7 @@ 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
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -214,30 +218,34 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 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
 msgid "account.tax"
-msgstr ""
+msgstr "حساب.ضريبة"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
 msgstr ""
+"لا توجد مدة معرّفة لهذا التاريخ: %s\n"
+"يرجى إنشاء سنة مالية."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "انقل السطر و اختر الموازنة"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -255,53 +263,53 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "فاتورة '%s' ستدفع علي الأجزاء التالية: %s%s of %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
 msgid "Belgian Reports"
-msgstr ""
+msgstr "تقارير دولة بلجيكا"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr ""
+msgstr "لايمكن اضافة/تعديل البيانات في سجل مقفل"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr ""
+msgstr "الرصيد الحسابي"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "تكرار يدوي"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "إغلاق السنة المالية"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "السماح بالشطب"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "اختر الفترة للتحليل"
 
 #. module: account
 #: view:account.move.line:0
@@ -309,15 +317,15 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr ""
+msgstr "الشركة في سطر حساب الفاتورة تختلف عن الشركة في الفاتورة"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr "إسم الحقل"
+msgstr "اسم الحقل"
 
 #. module: account
 #: help:account.installer,charts:0
@@ -339,13 +347,13 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "إلغاء موازنة الحساب"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "خصائص الشراء"
 
 #. module: account
 #: view:account.installer:0
@@ -360,7 +368,7 @@ msgstr "إضبط"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr "يونيو"
+msgstr "يونيو/حزيران"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -373,12 +381,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr ""
+msgstr "account.tax.template"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "account.bank.accounts.wizard"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -389,7 +397,7 @@ msgstr "تاريخ الإنشاء"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "رد المشتروات"
+msgstr "إعادة المشتريات"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -404,7 +412,7 @@ msgstr "العملة المستعملة لإدخال البيان"
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "السنة المالية للفتح"
+msgstr "فتح سنة مالية"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -431,14 +439,14 @@ msgstr "موجب"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "مفتوح لإلغاء التسوية"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "قالب مخطط"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -484,8 +492,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -494,22 +500,22 @@ msgstr ""
 #: field:validate.account.move,journal_id:0
 #, python-format
 msgid "Journal"
-msgstr ""
+msgstr "يومية"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "تأكيد الفوراتير المختارة"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+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
@@ -528,17 +534,17 @@ msgstr ""
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "اختر مخططات الحسابات"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "ضرائب الشراء"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "استرجاع فاتورة"
 
 #. module: account
 #: report:account.overdue:0
@@ -548,13 +554,13 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "حركات لم تسوى"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "رصيد النقدية لايساوي الرصيد الحسابي"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -567,12 +573,12 @@ msgstr ""
 #: 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 ""
+msgstr "إغلاق السنة المالية"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "الحساب يؤكد الكشف"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -583,17 +589,17 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "الكل"
 
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "اسم عنوان الفاتورة"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "ربع سنوي"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -605,12 +611,12 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 يوم   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "المتواليات"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -620,7 +626,7 @@ msgstr ""
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "سجل مركزي"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -633,7 +639,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -648,7 +654,7 @@ msgstr ""
 #: 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
@@ -658,19 +664,19 @@ msgstr ""
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+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:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr ""
+msgstr "الشركة يجب ان تكون واحدة لجميع المدخلات حتى يمكن تسويتها"
 
 #. module: account
 #: view:account.account:0
@@ -682,56 +688,56 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-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
 msgid "Re-Open"
-msgstr ""
+msgstr "إعادة فتح"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "هل أنت متأكد من إنشاء القيد؟"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "تأكيد"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "شركاء تم تسويتهم اليوم"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+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
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "يمكن تغيير العملة في مسودة الفتورة"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -745,7 +751,7 @@ msgstr ""
 #: field:account.move.reconcile,type:0
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "نوع"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -755,7 +761,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "مرجع الشريك لهذه الفاتورة"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -763,22 +769,22 @@ msgstr ""
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr ""
+msgstr "عكس التسوية"
 
 #. 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
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr ""
+msgstr "تاريخ استحقاق الحساب"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -792,18 +798,18 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr ""
+msgstr "سبتمبر"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "أيام"
 
 #. module: account
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "لو تم التعليم عليها، فلن يحتوي الدليل المحاسبي عليها إفتراضياً"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -816,20 +822,20 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "اشتراك جديد"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "أحسب/حساب"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "الشريك التالي للموازنة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -840,30 +846,30 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+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 ""
+msgstr "دليل الضرائب"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "إنشاء فترة 3 اشهر"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "مستحق"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "إجمالي مع الضرائب"
 
 #. module: account
 #: view:account.invoice:0
@@ -871,21 +877,21 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "تصديق"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "إجمالي المبلغ"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "تجميع"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -893,27 +899,27 @@ msgstr ""
 #: view:account.invoice.report:0
 #: view:account.move.line: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
@@ -926,7 +932,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "مشتريات"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -948,18 +954,18 @@ msgstr ""
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "رمز"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "لا يوجد يومية تحليلية !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -968,12 +974,12 @@ msgstr ""
 #: 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 ""
+msgstr "سجل الشريك"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "اسم الحساب"
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
@@ -984,7 +990,7 @@ msgstr ""
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "اسبوع السنة"
 
 #. module: account
 #: field:account.bs.report,display_type:0
@@ -996,12 +1002,12 @@ msgstr ""
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "فاتورة الزبون للموافقة"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "اختيار السنة المالية للاقفال"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1019,50 +1025,51 @@ msgstr ""
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+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 ""
+msgstr "سجلات النقدية"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Expense Accounts)"
-msgstr ""
+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
 msgid "Manager"
-msgstr ""
+msgstr "مدير"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "تكوين المدخلات قبل:"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Bank"
-msgstr ""
+msgstr "مصرف"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr ""
+msgstr "بداية الفترة"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "تأكيد الكشف"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1087,12 +1094,12 @@ msgstr ""
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "الغاء الفواتير"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "إلغاء تسوية المعاملات"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1100,7 +1107,7 @@ msgstr ""
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "رمز الضرائب"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -1115,7 +1122,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "عدد الحركات"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1124,13 +1131,13 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr ""
+msgstr "تسمية القيد"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr ""
+msgstr "لا يمكنك تعديل/مسح يومية بقيود لهذه الفترة"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1142,7 +1149,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
-msgstr ""
+msgstr "أخرى"
 
 #. module: account
 #: view:account.account:0
@@ -1169,24 +1176,24 @@ msgstr ""
 #: model:ir.model,name:account.model_account_account
 #: field:report.account.sales,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "حساب"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+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 ""
+msgstr "تحليل القيود"
 
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "مستوى"
 
 #. module: account
 #: report:account.invoice:0
@@ -1201,47 +1208,47 @@ 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_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+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
 #: report:account.invoice:0
 msgid "Your Reference"
-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
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "مدفوعات متأخرة"
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "رصيد أول المدة"
 
 #. module: account
 #: view:account.invoice:0
@@ -1251,23 +1258,24 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr ""
+msgstr "معلومات البنك"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr ""
+msgstr "خيارات التقرير"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "تحليل عناصر اليومية"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "شركاء"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1276,28 +1284,28 @@ msgstr ""
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "كشف حساب بنك"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account owner"
-msgstr ""
+msgstr "كشف حساب البنك"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr ""
+msgstr "المدينون"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "اليومية العامة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
-msgstr ""
+msgstr "لا يمكنك إستخدام هذا الحساب العام في هذه اليومية !"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1306,13 +1314,23 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "برصيد لا يساوي صفر"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "بحث الضرائب"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1322,27 +1340,27 @@ msgstr ""
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr ""
+msgstr "إنشاء قيود"
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "عدد العناصر"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr ""
+msgstr "قيمة الحد الأقصي للإلغاء"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "حساب الضرائب"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr ""
+msgstr "عدد خانات الأرقام"
 
 #. module: account
 #: field:account.journal,entry_posted:0
@@ -1353,7 +1371,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "الإجمالي دون الضرائب"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1367,7 +1385,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "عدد القيود "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1387,18 +1405,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: 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 ""
+"لا يمكنك من إنشاء الفاتورة !\n"
+"طريقة السداد المحددة تعطي قيمة حسابية أكبر من إجمالي قيمة الفاتورة."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "المحاسبة الإنجليزية"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1414,12 +1434,12 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "القيود التكرارية"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "قوالب للمركز المالي"
 
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
@@ -1429,55 +1449,56 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "معاملات تمت تسويتها"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "أعمدة"
 
 #. module: account
 #: report:account.overdue:0
 msgid "."
-msgstr ""
+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
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+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
 #: sql_constraint:account.model.line:0
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 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
@@ -1505,19 +1526,19 @@ msgstr ""
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+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 ""
+msgstr "الحساب العام"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "حد المدفوعات"
 
 #. module: account
 #: report:account.invoice:0
@@ -1527,18 +1548,18 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+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 ""
+msgstr "تحليل التكاليف للفاتورة"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "مسلسل السنة المالية"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1546,19 +1567,20 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "مسئول"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "جزئي:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "المبيعات حسب نوع الحساب"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1570,7 +1592,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "الفواتير"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -1612,7 +1634,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1620,7 +1642,7 @@ msgstr ""
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "قيم"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1642,13 +1664,13 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "المدينون و الدائنون"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
-msgstr ""
+msgstr "يجب إعطاء حساب لقيود الإعدام !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -1658,7 +1680,7 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "كل الشركاء"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1668,20 +1690,20 @@ msgstr ""
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "خرائط حساب تحليلي"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "قيود خاصة بي"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "مرجع العميل"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1689,7 +1711,7 @@ msgstr ""
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "هذه الفترات يمكن أن تتداخل."
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
@@ -1702,7 +1724,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1710,7 +1732,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "مبلغ الدائنون"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1718,17 +1740,18 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:529
+#: 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 ""
+"لا يمكنك تغيير نوع الحساب من \"مغلق\" إلي أي نوع آخر يحتوي علي قيود يومية!"
 
 #. module: account
 #: view:res.company:0
 msgid "Reserve And Profit/Loss Account"
-msgstr ""
+msgstr "حساب الإحتياطي و الأرباح و الخسائر"
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -1740,22 +1763,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "تحليل الفواتير"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "غلق الفترة"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "ضبط السنة المالية"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "القيود في سطر"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -1766,7 +1789,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
@@ -1776,34 +1799,34 @@ msgstr ""
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "الجزئي"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "تحليل الخزانة"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "حساب تحليلي"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:332
 #, 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
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "صالح"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -1814,17 +1837,17 @@ 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
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "حساب الإحتياطي و الأرباح و الخسائر"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
@@ -1835,13 +1858,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
@@ -1868,14 +1891,14 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "حساب الإربح و الخسائر"
 
 #. module: account
 #: field:account.installer,config_logo:0
 #: field:account.installer.modules,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "صورة"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1886,7 +1909,7 @@ msgstr ""
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "المبلغ دون ضرائب"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1894,6 +1917,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"إذا كان الحقل النشط به لا أو (False) سيسمح لك بإخفاء الضريبة دون إزالتها"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1908,7 +1932,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "إلغاء تسوية القيود"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -1918,18 +1942,18 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "سنة مالية"
 
 #. module: account
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr ""
+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
@@ -1939,7 +1963,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "إستيراد من فاتورة"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1948,22 +1972,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "يناير"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "عمليات التحقق من الصحة"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "هذه السنة المالية"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "خريطة حساب الضرائب"
 
 #. module: account
 #: constraint:account.period:0
@@ -1978,21 +2002,23 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "كمسألة شكلية"
 
 #. module: account
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " يومية"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"لا يوجد حساب إفتراضي معرف \n"
+"في دفتر يومية الـ \"%s\""
 
 #. module: account
 #: help:account.account,type:0
@@ -2009,7 +2035,7 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "بحث قوالب دليل الحسابات"
 
 #. module: account
 #: view:account.installer:0
@@ -2036,10 +2062,10 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "وصف"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2049,57 +2075,62 @@ msgstr ""
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+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 ""
+msgstr "حساب الدخل"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr ""
+msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "خصائص محاسبية"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "ترتيب القيود حسب"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "تغيير إلي"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "عدد كمية المنتجات "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "قالب المنتج"
 
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2110,7 +2141,7 @@ msgstr ""
 #: report:account.vat.declaration:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "سنة مالية"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2129,17 +2160,17 @@ msgstr ""
 #: help:account.report.general.ledger,fiscalyear_id:0
 #: help:account.vat.declaration,fiscalyear_id:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "اتركه فارغ لجميع السنوات المالية المفتوحة"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "قيد الحساب"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "المسلسل الرئيسي"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2151,23 +2182,23 @@ 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
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr ""
+msgstr "الأوضاع المالية"
 
 #. module: account
 #: field:account.period.close,sure:0
 msgid "Check this box"
-msgstr ""
+msgstr "علم هذا الربع"
 
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr ""
+msgstr "مرشحات الفرز"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2182,24 +2213,24 @@ msgstr ""
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr ""
+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 ""
+msgstr "حالة مسودة من الفاتورة"
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr ""
+msgstr "علم علي هذه لو أن هذا المستخدم لتسوية قيود هذا الحساب."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "تسوية الشريك"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2208,7 +2239,7 @@ msgid "Account Tax Code"
 msgstr "كود الحساب الضريبي"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2226,7 +2257,7 @@ msgstr "رمز الأساس"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "تعطيك ترتيب المسلسل حين عرض القائمة للفاتورة الضريبية."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2265,12 +2296,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "يوم"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "حسابات للتجديد"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2278,7 +2309,7 @@ msgid "Account Model Entries"
 msgstr "إدخالات نماذج الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2302,24 +2333,24 @@ msgstr ""
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Select period"
-msgstr ""
+msgstr "اختر فترة"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "كشوف حسابات"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 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
@@ -2330,14 +2361,14 @@ msgstr ""
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "خطأ! لا يمكنك إنشاء فئات متداخلة."
 
 #. module: account
 #: 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
@@ -2348,7 +2379,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
@@ -2359,27 +2390,28 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "حسابات"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "خطأ في الإعدادات!"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "متوسط السعر"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
-msgstr ""
+msgstr "تاريخ:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2389,29 +2421,29 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "تسمية"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "معلومات محاسبية"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+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 ""
+msgstr "تسوية البنك"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "نسبة الخصم"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -2421,7 +2453,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr ""
+msgstr "مرجع"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
@@ -2431,12 +2463,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
@@ -2449,12 +2481,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr ""
+msgstr "كشوف حسابات البنك"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "صحيح"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2462,13 +2494,13 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-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
 #: view:account.subscription.generate:0
@@ -2476,24 +2508,26 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"إنشاء قيود اليومية تلقائياً علي أساس ما تم إدخاله في النظام قبل التاريخ "
+"المحدد."
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "رصيد الشريك العمري"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "قيود المحاسبة"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "الخصم (%)"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2509,14 +2543,14 @@ 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 ""
+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 ""
+msgstr "المبيعات بعرض الحسابات"
 
 #. module: account
 #: view:account.use.model:0
@@ -2524,16 +2558,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2544,20 +2578,20 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "رموز الضريبة"
 
 #. module: account
 #: 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
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "الفترة إلي"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2566,7 +2600,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "أغسطس"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:306
@@ -2589,7 +2623,7 @@ msgstr ""
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Reference Number"
-msgstr ""
+msgstr "رقم المرجع"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2598,7 +2632,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "أكتوبر"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2610,19 +2644,19 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "خط 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+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 ""
+msgstr "حساب المصروف"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -2643,7 +2677,7 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "ضريبة البيع الإفتراضية"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2656,13 +2690,15 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+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
 msgid "Profit And Loss"
-msgstr ""
+msgstr "الربح و الخسارة"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2676,7 +2712,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "الوضع المالي"
 
 #. module: account
 #: help:account.partner.ledger,initial_balance:0
@@ -2690,15 +2726,17 @@ msgstr ""
 #: view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 msgid "Analytic Entries"
-msgstr ""
+msgstr "قيود تحليلية"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one."
 msgstr ""
+"لا  يوجد سنة مالية معرفة لهذا التاريخ !\n"
+"قم بإنشائها."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -2706,7 +2744,7 @@ msgstr ""
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "فاتورة العميل"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -2723,32 +2761,32 @@ msgstr ""
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "بحث فترة"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "عملة الفاتورة"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "الشروط"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "حركة نقدية"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "حساب المصرفي"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "قائمة قالب الضريبة"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -2773,29 +2811,29 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "بحث السنة المالية"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "دائماً"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "إجمالي الكمية"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "حساب الديون المعدومة"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "نموذج"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
@@ -2807,7 +2845,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "View"
-msgstr ""
+msgstr "عرض"
 
 #. module: account
 #: code:addons/account/account.py:2951
@@ -2816,7 +2854,7 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2830,7 +2868,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "ملف إالكتروني"
 
 #. module: account
 #: view:res.partner:0
@@ -2845,12 +2883,12 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+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
@@ -2867,7 +2905,7 @@ msgstr ""
 #: 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 ""
+msgstr "إجبار جميع الحركات لهذا الحساب أن تكون لها هذه العملة الثانية."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2880,12 +2918,12 @@ 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 ""
+msgstr "قوالب شجرة الحسابات"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "إنشاء شجرة حسابات من قالب"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -2910,7 +2948,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr ""
+msgstr "اتركها فارغة لإستخدام حساب المصروفات"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -2925,9 +2963,7 @@ msgstr ""
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2941,13 +2977,24 @@ msgstr ""
 #: 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 ""
+msgstr "اليوميات"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "الشركاء الباقيين"
 
 #. module: account
 #: view:account.subscription:0
@@ -2964,7 +3011,7 @@ msgstr ""
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "شراء"
 
 #. module: account
 #: view:account.installer:0
@@ -2978,30 +3025,30 @@ msgstr ""
 #: 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
 msgid "Starting Balance"
-msgstr ""
+msgstr "رصيد أول المدة"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
-msgstr ""
+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 ""
+msgstr "إغلاق الفترة"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr ""
+msgstr "حسابات فارغة؟ "
 
 #. module: account
 #: report:account.overdue:0
@@ -3028,43 +3075,44 @@ msgstr ""
 #: 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 ""
+msgstr "مسودّة"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "إعدادات شجرة الحسابات"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr ""
+msgstr "لا يمكن طباعتها في الفاتورة"
 
 #. module: account
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+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
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "سنة"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -3077,22 +3125,24 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"كل قيود اليومية المختارة سيتم التحقق منها و ترحيلها. و هو ما يعني لأنك لن "
+"تستطيع  تعديل أي منها."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr ""
+msgstr "لا يمكن حذف فاتورة إذا كانت مفتوحة أو مدفوعة!"
 
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Total :"
-msgstr ""
+msgstr "المجموع:"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "تحويلات"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3102,22 +3152,22 @@ msgstr ""
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr ""
+msgstr "خرائط الحساب"
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "قيمة الضريبة"
 
 #. module: account
 #: view:account.installer:0
 msgid "Your bank and cash accounts"
-msgstr ""
+msgstr "حسابك البنكي و النقدية"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "بحث حركة"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3129,7 +3179,7 @@ msgstr ""
 #: report:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "مسودة للفاتورة"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -3140,18 +3190,18 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: 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!"
-msgstr ""
+msgstr "لا يمكنك تغيير نوع الحساب من '%s' إلي '%s'  ما دام يشمل علي قيود!"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "نظير"
 
 #. module: account
 #: view:account.journal:0
@@ -3161,13 +3211,13 @@ msgstr ""
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "حالة الفاتورة"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "فئة المنتج"
 
 #. module: account
 #: view:account.move:0
@@ -3175,13 +3225,13 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "سرد"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "إنشاء حساب"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
@@ -3191,12 +3241,12 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "تفاصيل"
 
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "حساب البنك و حساب النقدية"
 
 #. module: account
 #: report:account.invoice:0
@@ -3208,8 +3258,18 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
-msgstr ""
+msgstr "شجرة الحسابات"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -3219,7 +3279,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "النظير المركزي"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3229,7 +3289,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: view:account.chart:0
@@ -3252,7 +3312,6 @@ 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
 #: view:account.move:0
@@ -3276,27 +3335,27 @@ msgstr ""
 #: field:analytic.entries.report,date:0
 #, python-format
 msgid "Date"
-msgstr ""
+msgstr "تاريخ"
 
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr ""
+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 ""
+msgstr "دفتر اليومية يجب أن يتضمن حساب إفتراضي دائن و أخر مدين"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "قالب شجرة الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3305,18 +3364,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr ""
+msgstr "بعض القيود تمت تسويتها من قبل !"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: 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 ""
+"لا يمكنك التحقق من قيد يومية إذا لم تكن عناصر اليومية تابعة لشجرة حسابات "
+"واحدة !"
 
 #. module: account
 #: view:account.tax:0
@@ -3326,7 +3387,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "الميزانيات"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3345,17 +3406,17 @@ msgstr ""
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr ""
+msgstr "لا مرشحات"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
 msgid "Situation"
-msgstr ""
+msgstr "الحالة"
 
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "المحفوظات"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3375,7 +3436,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "الكمية"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
@@ -3385,7 +3446,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "تقاضي"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3395,7 +3456,7 @@ msgstr ""
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "دائن"
 
 #. module: account
 #: constraint:account.move:0
@@ -3417,39 +3478,39 @@ msgstr ""
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "رصيد الحساب"
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+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:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
-msgstr ""
+msgstr "لا يمكن تغيير الضريبة !"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "#القيود"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "لقد اخترت وحدة مقياس غير ملائمة للمنتج."
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3459,7 +3520,7 @@ msgstr ""
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "فاتورة غير مسددة"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
@@ -3482,7 +3543,7 @@ msgstr ""
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr ""
+msgstr "اسم"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -3498,12 +3559,12 @@ msgstr ""
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr ""
+msgstr "الترميز المعياري"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "دفتر اليومية للقيود التحليلية"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -3513,7 +3574,7 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "المحاسبة"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3528,12 +3589,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "المحاسبة العامة"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr ""
+msgstr "رصيد:"
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -3549,29 +3610,29 @@ msgstr ""
 #: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "الاسم"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "حفظ كمسودة"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "خطوط تكرارية"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "عرض الشركاء"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr ""
+msgstr "تحقق"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -3589,12 +3650,12 @@ msgstr ""
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "تأكيد الفواتير"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "متوسط النسبة"
 
 #. module: account
 #: view:account.state.open:0
@@ -3619,41 +3680,40 @@ msgstr ""
 #: field:account.report.general.ledger,period_from:0
 #: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "بداية الفترة"
 
 #. module: account
 #: field:account.tax,name:0
 #: field:account.tax.template,name:0
 #: report:account.vat.declaration:0
 msgid "Tax Name"
-msgstr ""
+msgstr "اسم الضريبة"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+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 ""
+msgstr "نهاية الشهر 30 يوم"
 
 #. 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
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
-msgstr ""
+msgstr "صافي الخسارة"
 
 #. module: account
 #: help:account.account,active:0
@@ -3676,7 +3736,7 @@ msgstr ""
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr ""
+msgstr "إختصار"
 
 #. module: account
 #: view:account.account:0
@@ -3690,7 +3750,7 @@ msgstr ""
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr ""
+msgstr "نوع الحساب"
 
 #. module: account
 #: report:account.account.balance:0
@@ -3699,12 +3759,12 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "ميزان المراجعة"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "إلغاء الفواتير المختارة"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3717,7 +3777,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "3"
-msgstr ""
+msgstr "٣"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -3743,7 +3803,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3757,29 +3817,29 @@ msgstr ""
 #: field:report.account.sales,month:0
 #: field:report.account_type.sales,month:0
 msgid "Month"
-msgstr ""
+msgstr "شهر"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "وحدة القياس المرجعية"
 
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr ""
+msgstr "ملحوظة"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "حساب المتأخرات"
 
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr ""
+msgstr "مدفوع"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -3802,7 +3862,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3815,7 +3875,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "وصف الضريبة"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -3839,7 +3899,7 @@ msgstr ""
 #: 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:357
@@ -3855,7 +3915,7 @@ msgstr ""
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "نطاق الشهر"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
@@ -3893,7 +3953,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "نمط العرض"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -3908,24 +3968,24 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "خريطة الحساب"
 
 #. module: account
 #: report:account.account.balance.landscape:0
 #: report:account.analytic.account.balance:0
 #: report:account.central.journal:0
 msgid "Account Name"
-msgstr ""
+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
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "إحصائيات الفواتير"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -3936,30 +3996,30 @@ msgstr ""
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "تسوية المبالغ المعدومة"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr ""
+msgstr "تاريخ الإستحقاق"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "الحسابات حسب النوع"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "رصيد الإغلاق"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "غير مطبق"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -3969,7 +4029,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "طباعة الفاتورة"
 
 #. module: account
 #: view:account.tax.template:0
@@ -3977,7 +4037,7 @@ msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -3986,12 +4046,12 @@ msgstr ""
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Voucher No"
-msgstr ""
+msgstr "رقم المستند"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -4001,17 +4061,17 @@ msgstr ""
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "إنشاء قيد من النماذج"
 
 #. module: account
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr ""
+msgstr "سماح بالتسوية"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "إحصائيات الحساب التحليلي"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4024,7 +4084,7 @@ msgstr ""
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "السعر شامل الضريبة"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
@@ -4035,24 +4095,24 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "نماذج التكرارات"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "4"
-msgstr ""
+msgstr "٤"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Change"
-msgstr ""
+msgstr "تغيير"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4061,7 +4121,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "خطأ مستخدم"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
@@ -4091,7 +4151,7 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "ملغي"
 
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
@@ -4116,7 +4176,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "إنشاء قيود"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
@@ -4137,12 +4197,12 @@ msgstr ""
 #: code:addons/account/invoice.py:320
 #, python-format
 msgid "Customer"
-msgstr ""
+msgstr "عميل"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "مؤكد"
 
 #. module: account
 #: report:account.invoice:0
@@ -4156,7 +4216,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4190,7 +4250,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "تاريخ الإبتداء"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -4218,10 +4278,10 @@ msgstr ""
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "الفواتير"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4234,7 +4294,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "مندوب المبيعات"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4244,12 +4304,12 @@ msgstr ""
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr ""
+msgstr "إستخدام نموذج"
 
 #. module: account
 #: view:account.state.open:0
 msgid "No"
-msgstr ""
+msgstr "ﻻ"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -4259,12 +4319,12 @@ msgstr ""
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "إضافة"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "اتركه فارغ لإستخدام التاريخ الحالي"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -4274,7 +4334,7 @@ msgstr ""
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure ?"
-msgstr ""
+msgstr "هل أنت متأكد؟"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -4290,7 +4350,7 @@ msgstr ""
 #: view:account.bank.statement:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr ""
+msgstr "احسب"
 
 #. module: account
 #: field:account.tax,type_tax_use:0
@@ -4320,11 +4380,11 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "عناصر اليومية"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4333,24 +4393,25 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4364,15 +4425,15 @@ msgstr ""
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
 msgid "End of period"
-msgstr ""
+msgstr "نهاية الفترة"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr ""
+msgstr "تفاصيل البنك"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr ""
@@ -4403,12 +4464,12 @@ msgstr ""
 #: view:account.invoice.cancel:0
 #: view:account.invoice.confirm:0
 msgid "Close"
-msgstr ""
+msgstr "إغلاق"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr ""
+msgstr "حركات"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4419,7 +4480,7 @@ msgstr ""
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "للغلق"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -4427,7 +4488,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4438,7 +4499,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr ""
+msgstr "قوالب"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -4446,7 +4507,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4454,15 +4515,14 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "5"
-msgstr ""
+msgstr "٥"
 
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "رصيد تحليلي -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4475,11 +4535,8 @@ msgstr ""
 #: 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
 #: 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
@@ -4489,20 +4546,30 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr ""
+msgstr "نوع الفترة"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "مدفوعات"
 
 #. module: account
 #: view:account.tax:0
@@ -4512,7 +4579,7 @@ msgstr ""
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "قيد"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -4524,12 +4591,12 @@ msgstr ""
 #: 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
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr ""
+msgstr "اسم العامود"
 
 #. module: account
 #: view:account.general.journal:0
@@ -4546,7 +4613,7 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "سنة"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
@@ -4559,7 +4626,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4572,13 +4639,13 @@ msgstr "اسم داخلي"
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "شهر"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "عنصر اليومية \"%s\" غير صحيح"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4588,7 +4655,7 @@ msgstr ""
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "الشريك التالي للتسوية"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4605,8 +4672,10 @@ msgstr "نتيجة التسوية"
 #: 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
 msgid "Balance Sheet"
-msgstr ""
+msgstr "الميزانية العمومية"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -4624,13 +4693,13 @@ msgstr "إدخالات"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "هذه الفترة"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "وحدة القياس"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:138
@@ -4652,7 +4721,7 @@ msgstr "رمز الحساب (إذا كان النوع = الرمز)"
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "بيع"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4673,7 +4742,7 @@ msgstr "المبلغ"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr ""
+msgstr "قيد نهاية السنة المالية"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4683,7 +4752,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "التحقّق"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -4705,16 +4774,16 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
-msgstr ""
+msgstr "لم يتمكن من إيجاد فترة !"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "السماح بإلغاء القيود"
 
 #. module: account
 #: field:account.tax.code,sign:0
@@ -4724,12 +4793,12 @@ msgstr ""
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "اسم (الحساب/الشريك)"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "معاملة"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4762,12 +4831,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr ""
+msgstr "account.installer"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "إدراجها في المبلغ الرئيسي"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -4777,17 +4846,17 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
 msgid "Bank Journal "
-msgstr ""
+msgstr "دفتر يومية البنك "
 
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "ضوابط القيد"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -4802,10 +4871,10 @@ msgstr ""
 #: field:account.analytic.cost.ledger.journal.report,date1:0
 #: field:account.analytic.inverted.balance,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "بداية الفترة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4820,12 +4889,12 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "إتصالات"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "محاسبة تحليلية"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -4861,12 +4930,12 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4943,7 +5012,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5090,7 +5159,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5126,7 +5195,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5263,7 +5332,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5288,14 +5357,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5314,6 +5383,19 @@ msgstr ""
 
 #. 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 ""
@@ -5330,7 +5412,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5541,7 +5623,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5807,9 +5889,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -5958,8 +6040,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -5970,7 +6052,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6008,7 +6090,7 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6072,31 +6154,30 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6206,7 +6287,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6227,7 +6308,6 @@ msgstr ""
 #: 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 ""
@@ -6281,7 +6361,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6311,7 +6391,7 @@ msgid "Child Codes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6321,7 +6401,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr ""
+msgstr "فواتير العميل"
 
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
@@ -6468,7 +6548,7 @@ msgid "Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6636,7 +6716,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6740,7 +6820,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6769,6 +6849,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -6784,7 +6865,7 @@ msgstr ""
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "غير متوازن"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -6798,7 +6879,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
@@ -6824,13 +6904,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6848,7 +6928,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7085,17 +7165,17 @@ msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7158,7 +7238,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7207,7 +7287,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7268,7 +7348,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7333,7 +7413,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7368,7 +7448,6 @@ msgstr ""
 #: 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
@@ -7381,6 +7460,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7463,14 +7555,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7531,7 +7615,7 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7581,8 +7665,13 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr ""
 
@@ -7620,7 +7709,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7659,7 +7748,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "المورّدون"
 
 #. module: account
 #: constraint:account.move:0
@@ -7787,8 +7876,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -7799,7 +7888,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7993,14 +8082,14 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8049,7 +8138,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8065,7 +8154,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8102,18 +8191,22 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8150,7 +8243,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8178,7 +8271,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8226,8 +8319,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8246,7 +8343,15 @@ 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 ""
 
@@ -8361,7 +8466,6 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8369,7 +8473,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8462,13 +8566,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8507,7 +8615,7 @@ msgid "Account Subscription"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8534,7 +8642,6 @@ msgstr ""
 #: 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
@@ -8563,7 +8670,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -8621,13 +8728,13 @@ msgid "Active"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8674,6 +8781,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -8751,6 +8859,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8813,7 +8933,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "فواتير الموردون"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8909,6 +9029,7 @@ msgstr ""
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr ""
 
@@ -8927,7 +9048,6 @@ msgstr ""
 #: 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
@@ -8960,13 +9080,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8981,7 +9098,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -8990,7 +9107,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9131,8 +9248,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9160,7 +9277,7 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "حركة الإعدام"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -9202,6 +9319,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -9235,7 +9353,7 @@ msgid "Recurring"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9256,7 +9374,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9271,6 +9389,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9386,7 +9514,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9411,7 +9539,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9445,12 +9573,12 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr ""
+msgstr "الحسابات المصرفية"
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr ""
+msgstr "إجمالي المدينون"
 
 #. module: account
 #: view:account.account:0
@@ -9458,13 +9586,13 @@ msgstr ""
 #: view:account.journal:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "معلومات عامة"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "مستندات المحاسبة"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -9475,22 +9603,22 @@ 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
 msgid "Invoice's state is Done."
-msgstr ""
+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
@@ -9505,7 +9633,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -9516,14 +9644,14 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+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 ""
+msgstr "السنوات المالية"
 
 #. module: account
 #: help:account.analytic.journal,active:0
@@ -9531,17 +9659,19 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"إذا كان الحقل النشط موضوع بـ لا (False)، سيسمح لك بإخفاء الحساب التحليلي دون "
+"إزالته."
 
 #. module: account
 #: field:account.analytic.line,ref:0
 msgid "Ref."
-msgstr ""
+msgstr "مرجع"
 
 #. module: account
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "نموذج حساب"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9550,7 +9680,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "فبراير"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9559,28 +9689,28 @@ 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
 msgid "Maturity"
-msgstr ""
+msgstr "الإستحقاق"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "مستقبل"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "بحث عناصر اليومية"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9592,7 +9722,7 @@ msgstr ""
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr ""
+msgstr "دائماً 1 أو -1"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -9602,24 +9732,24 @@ msgstr ""
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "حساب المصروفات من قالب المنتجات"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "مبلغ العملة"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
-msgstr ""
+msgstr "لابد من إدخال الفترة علي ألا تكون صفر أو أقل"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
-msgstr ""
+msgstr "لا يمكنك حذف حساب مستدخدم في قيود يومية!. "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -9632,6 +9762,11 @@ 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
@@ -9640,6 +9775,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "أصول"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "خصوم"
+
 #~ msgid "Asset"
 #~ msgstr "أصل"
 
@@ -9700,3 +9847,26 @@ msgstr ""
 
 #~ msgid "Recurrent Entries"
 #~ msgstr "إدخالات متكررة"
+
+#~ msgid "Subscription Periods"
+#~ msgstr "فترات الاشتراك"
+
+#~ msgid "Charts of Account"
+#~ msgstr "شجرة الحسابات"
+
+#~ msgid "Move line select"
+#~ msgstr "تحريك السطر المختار"
+
+#, python-format
+#~ msgid "The statement balance is incorrect !\n"
+#~ msgstr "رصيد الكشف خطأ\n"
+
+#~ msgid "Balance:"
+#~ msgstr "الرصيد:"
+
+#, python-format
+#~ msgid "Invoice "
+#~ msgstr "فاتورة "
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "الميزانية العمومية (حسابات الأصول)"
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 459ce5b9914..4599a3ad64e 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: 2011-04-29 05:05+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -505,8 +505,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1148,6 +1146,7 @@ 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
@@ -1335,6 +1334,16 @@ msgstr "Не може да използвате главна сметка за 
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "С баланс различен от 0"
 
@@ -2056,7 +2065,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Търсене в шаблони за сметкоплан"
 
 #. module: account
@@ -2120,6 +2129,8 @@ 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
 msgid "Entries Sorted By"
 msgstr "Записи подредени по"
 
@@ -2141,11 +2152,16 @@ msgstr "Шаблон за продукт"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2471,6 +2487,7 @@ 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
@@ -2720,6 +2737,8 @@ 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
 msgid "Profit And Loss"
 msgstr "Печалба и загуби"
 
@@ -2994,7 +3013,6 @@ msgstr "Запазете празно за да изпозвате сметка
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3008,6 +3026,17 @@ msgstr "Запазете празно за да изпозвате сметка
 #: 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 "Дневници"
 
@@ -3221,6 +3250,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Съконтрагент"
 
@@ -3279,6 +3309,16 @@ msgstr "ДДС :"
 #: 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.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 "Chart of Accounts"
 msgstr "Диаграма на сметки"
 
@@ -3724,11 +3764,10 @@ msgid "Analytic Balance"
 msgstr "Аналитичен баланс"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Нетна загуба"
 
@@ -4405,7 +4444,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4546,7 +4585,6 @@ msgid "Analytic Balance -"
 msgstr "Аналитичен баланс -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4559,10 +4597,8 @@ msgstr "Аналитичен баланс -"
 #: 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.journal.period.print: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
@@ -4572,6 +4608,16 @@ msgstr "Аналитичен баланс -"
 #: 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
 msgid "Target Moves"
 msgstr "Целеви движения"
 
@@ -4689,6 +4735,8 @@ msgstr "Резултат от изравняване"
 #: 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
 msgid "Balance Sheet"
 msgstr "Баланс"
 
@@ -5405,6 +5453,19 @@ msgstr "Главен дневник на сметка"
 
 #. 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 "Без филтър"
@@ -6326,6 +6387,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6565,7 +6627,7 @@ msgstr "Аналитични редове"
 #: 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 "
+"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) "
@@ -7250,6 +7312,7 @@ msgstr "Сума (словом):"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7504,6 +7567,19 @@ msgstr "Счетоводство и финанси"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Период"
@@ -7588,14 +7664,6 @@ msgstr "Тел. :"
 msgid "Company Currency"
 msgstr "Валута на компанията"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Сметкоплан"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7710,6 +7778,12 @@ msgstr "Дневник за обещетения"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Филтриране по"
 
@@ -7949,6 +8023,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8236,12 +8311,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Начало на период"
 
@@ -8359,7 +8439,12 @@ msgstr "Запазете празно за да изпозвате сметка
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8378,6 +8463,15 @@ 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 "Показване на сметка"
 
@@ -8578,7 +8672,7 @@ msgstr "Юли"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Диаграма на сметки"
 
 #. module: account
@@ -8595,12 +8689,17 @@ msgstr "Баланс на аналитична сметка"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Краен период"
 
@@ -8620,7 +8719,7 @@ msgstr "Краен период"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Сметкоплан"
 
 #. module: account
@@ -8805,6 +8904,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8886,6 +8986,18 @@ msgstr "Общ"
 #: selection:account.pl.report,filter: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
@@ -9095,13 +9207,10 @@ msgid "Tax Source"
 msgstr "Източник на данък"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Нетна печалба"
 
@@ -9125,8 +9234,8 @@ msgstr "Няма зададена приходна сметка за проду
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "Журнал"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9333,6 +9442,7 @@ msgstr "Фактура за доставчик"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9406,6 +9516,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "С движения"
 
@@ -9777,11 +9897,17 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Оставете празно за да бъде изпозван периода на проверка на дадата."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Грешка! Не може да създавате рекурсивна сметка."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #, python-format
 #~ msgid "Account move line \"%s\" is not valid"
@@ -9811,18 +9937,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Общо записи"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Отстъка (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Ако искате ли плащането да бъде извършено след като изпратите този email, "
-#~ "моля считайте този като нулев. Не се притеснявайте да се обадите на "
-#~ "търговския ни отдел на ..............."
-
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Неплатени обезщетения на доставчици"
 
@@ -9835,9 +9949,6 @@ msgstr ""
 #~ msgid "Account Entry Reconcile"
 #~ msgstr "Обединяване на записи от сметка"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Sign for parent"
 #~ msgstr "Знак за родител"
 
@@ -10027,9 +10138,6 @@ msgstr ""
 #~ msgid "Select Period and Journal for Validation"
 #~ msgstr "Иберете период и дневник за проверка"
 
-#~ msgid "Partner ID"
-#~ msgstr "Идентификатор на партньор"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Нова клиентска фактура"
 
@@ -10060,15 +10168,9 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Документ"
 
-#~ msgid "Move name"
-#~ msgstr "Име на движение"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Отказа на избраните фактури"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Financial Management"
 #~ msgstr "Управление на финанси"
 
@@ -10104,9 +10206,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Плащане и приравняване"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Баланс пренесен напред"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Ново обещетение за доставчик"
 
@@ -10122,9 +10221,6 @@ msgstr ""
 #~ msgid "Entry encoding"
 #~ msgstr "Кодиране на ред"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Период за отписване"
-
 #~ msgid "Other"
 #~ msgstr "Друго"
 
@@ -10265,9 +10361,6 @@ msgstr ""
 #~ msgid "Full Payment"
 #~ msgstr "Пълно плащане"
 
-#~ msgid "All account entries"
-#~ msgstr "Всични записи на сметката"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Неплатени обезщетения на клиент"
 
@@ -10335,29 +10428,15 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Разписка за дневник"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Не може да проверявате небалансиран запис !"
-
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "Очаквания баланс (%.2f) е различен от изчисления. (%.2f)"
 
-#~ msgid "Crédit"
-#~ msgstr "Кредит"
-
-#~ msgid "Débit"
-#~ msgstr "Дебит"
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Баланса на отчета не е правилен !\n"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Грешка при конфигурация !"
-
 #, python-format
 #~ msgid "Your journal must have a default credit and debit account."
 #~ msgstr ""
@@ -10400,29 +10479,14 @@ msgstr ""
 #~ msgid "No records found for your selection!"
 #~ msgstr "Няма намерен данък за вашия избор"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Тази сметка не е предвидена за приравняване !"
-
 #, python-format
 #~ msgid "The journal must have centralised counterpart"
 #~ msgstr "Дневника трябва да има централно копие"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "Старата финансова година няма записи за приравняване!"
-
-#~ msgid "Partner name"
-#~ msgstr "Име на партньор"
-
 #, python-format
 #~ msgid "Can not pay draft/proforma/cancel invoice."
 #~ msgstr "Не може да бъде платена  проект/проформа/отказана фактура."
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Не може да деактивирате сметка която съдържа движения по сметка."
-
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Датата не е в зададената финансова година"
@@ -10466,15 +10530,6 @@ msgstr ""
 #~ msgid "Error ! The duration of the Fiscal Year is invalid. "
 #~ msgstr "Грешка ! Продължителността на фискалната година е невалидна. "
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Ако използвате \"усовия за плащане\",  датата на падежа ще бъде изчислена "
-#~ "автоматично при създаването на счетоводни записи. Ако оставите условията за "
-#~ "плащане и падежната дата празни, това означава директно плащане."
-
 #~ msgid "Asset"
 #~ msgstr "Актив"
 
@@ -10523,3 +10578,9 @@ msgstr ""
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "е валидирано."
+
+#~ msgid "Chart of Accounts"
+#~ msgstr "Сметкоплан"
+
+#~ msgid "JNRL"
+#~ msgstr "Журнал"
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index 4cda655a107..460accdcfd2 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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,5 +9742,14 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "supplier"
-#~ msgstr "pourchaser"
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 88a7e4c41fe..961dea39a3c 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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -487,8 +487,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1125,6 +1123,7 @@ msgstr "Broj transakcija"
 
 #. 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
@@ -1312,6 +1311,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Sa saldom različit od 0"
 
@@ -2019,7 +2028,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2083,6 +2092,8 @@ msgstr "Svojstva računovodstva"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Stavke poredane po"
 
@@ -2104,11 +2115,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2430,6 +2446,7 @@ msgstr "Popust (%)"
 
 #. 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
@@ -2675,6 +2692,8 @@ msgstr "Financijsko računovodstvo"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2947,7 +2966,6 @@ msgstr "Ostavite prazno za korištenje rashodovnog računa"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2961,6 +2979,17 @@ msgstr "Ostavite prazno za korištenje rashodovnog računa"
 #: 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 "Nalozi za knjiženje"
 
@@ -3170,6 +3199,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3228,6 +3258,16 @@ msgstr "PDV:"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontni plan"
 
@@ -3670,11 +3710,10 @@ msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4349,7 +4388,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4488,7 +4527,6 @@ msgid "Analytic Balance -"
 msgstr "Analitički saldo -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4501,10 +4539,8 @@ msgstr "Analitički saldo -"
 #: 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.journal.period.print: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
@@ -4514,6 +4550,16 @@ msgstr "Analitički saldo -"
 #: 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
 msgid "Target Moves"
 msgstr "Cilj prijenosa"
 
@@ -4630,6 +4676,8 @@ msgstr "Rezultat poravnjavanja"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5343,6 +5391,19 @@ msgstr ""
 
 #. 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 "Bez filtera"
@@ -6257,6 +6318,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6488,7 +6550,7 @@ msgstr "Retci analitike"
 #: 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 "
+"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) "
@@ -7171,6 +7233,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7425,6 +7488,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Period"
@@ -7509,14 +7585,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Valuta preduzeća"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7628,6 +7696,12 @@ msgstr "Nalog za knjiženje povrata"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7866,6 +7940,7 @@ msgstr "Iznos izražen u opcionalnoj drugoj valuti ako je viševalutni unos."
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8149,12 +8224,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8272,7 +8352,12 @@ msgstr "Ne popunjavati za upotrebu računa za prihod"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8291,6 +8376,15 @@ 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 ""
 
@@ -8488,7 +8582,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"
 
 #. module: account
@@ -8505,12 +8599,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8530,7 +8629,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8713,6 +8812,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8794,6 +8894,18 @@ msgstr "Općenito"
 #: selection:account.pl.report,filter: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
@@ -9003,13 +9115,10 @@ msgid "Tax Source"
 msgstr "Izvorni porez"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9033,8 +9142,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9241,6 +9350,7 @@ msgstr "Ulazna faktura"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9314,6 +9424,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Sa kretanjima"
 
@@ -9683,6 +9803,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
 
@@ -9806,9 +9938,6 @@ msgstr ""
 #~ msgid "Status"
 #~ msgstr "Stanje"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Sign for parent"
 #~ msgstr "Predznak za roditelja"
 
@@ -10022,9 +10151,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Kreni"
 
-#~ msgid "Partner ID"
-#~ msgstr "Šifra partnera"
-
 #~ msgid "Delta Credit"
 #~ msgstr "Delta potražuje"
 
@@ -10265,6 +10391,9 @@ msgstr ""
 #~ msgid "Quantities"
 #~ msgstr "Količine"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "General Ledger -"
 #~ msgstr "Glavna knjiga -"
 
@@ -10419,9 +10548,6 @@ msgstr ""
 #~ msgid "Journal Purchase"
 #~ msgstr "Nalog za knjiženje nabave"
 
-#~ msgid "All account entries"
-#~ msgstr "Sve stavke konta"
-
 #~ msgid "Date Filter"
 #~ msgstr "Datumski filtar"
 
@@ -10557,9 +10683,6 @@ msgstr ""
 #~ msgid "Invoice line"
 #~ msgstr "Redak fakture"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Donešeni saldo"
-
 #~ msgid "Pay and reconcile"
 #~ msgstr "Plati i uskladi"
 
@@ -10591,9 +10714,6 @@ msgstr ""
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definiraj fiskalne godine i odaberi računske planove"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Otpisno razdoblje"
-
 #~ msgid "3 Months"
 #~ msgstr "3 mjeseca"
 
@@ -10751,13 +10871,6 @@ msgstr ""
 #~ msgid "Invoice Sequence"
 #~ msgstr "Sekvenca fakture"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Bankovni račun partnera na koji se vrši plaćanje\n"
-#~ "Ostaviti prazno da koristite podrazumijevani"
-
 #~ 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 "
@@ -10808,148 +10921,9 @@ msgstr ""
 #~ "Ovaj konto će se koristiti za vrijednost izlazne količine trenutne "
 #~ "kategorije proizvoda"
 
-#~ msgid "Draft invoices"
-#~ msgstr "Predračuni"
-
 #~ msgid "The sequence used for invoice numbers in this journal."
 #~ msgstr "Sekvence korištene za brojeve faktura u ovoj knjizi."
 
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Prikaži duguje/potražuje podatke"
-
-#~ msgid "My indicators"
-#~ msgstr "Moji indikatori"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Troškovi za fakturisanje"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Konta za fakturisanje"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Tabla za računovođu"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Zastarjela potraživanja"
-
-#~ msgid "Aged income"
-#~ msgstr "Zastarjeli prihodi"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Odabir stavki zasnovan na"
-
-#~ msgid "All accounts"
-#~ msgstr "Sva konta"
-
-#~ msgid "Financial Period"
-#~ msgstr "Financijski period"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Odaberite referentna konta (za poređenje u %)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Ne uspoređuj"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Prikaži konta"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Prikaži usporedbu u %"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Prikaži izvješće u položenoj formi"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je."
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Modul za računovodstvene bilanse je dodatna funkcionalnost modula "
-#~ "finansijskog upravljanja.\n"
-#~ "\n"
-#~ "    Ovaj modul nudi slijedeće mogućnosti za printanje bilansi.\n"
-#~ "\n"
-#~ "    1. Možete porediti bilanse različitih godina.\n"
-#~ "\n"
-#~ "    2. Možete odabrati poređenje po novcu ili procentualno.\n"
-#~ "\n"
-#~ "    3. Možete odabrati referentna konta za procentualno poređenje za "
-#~ "određenje godine.\n"
-#~ "\n"
-#~ "    4. Možete odabrati periode stvarnog datuma ili periode datuma unosa.\n"
-#~ "\n"
-#~ "    5. Imate mogućnost ispisa željenog izvještaja u položenom formatu.\n"
-#~ "    "
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Izabrali ste opciju \"Postotak\" sa više od dvije godine, ali niste "
-#~ "odabrali \"Položeni\" format."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Možda ste napravili sljedeće pogreške. Ispravite ih i pokušajte ponovno."
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa "
-#~ "stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
-#~ "papira. Molimo pokušajte ponovno."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
-
-#~ msgid "Customize Report"
-#~ msgstr "Prilagodite izvješće"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr ""
-#~ "Modul koji dodaje nove izvještaje baziran na računovodstvenom modulu."
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Računovodstveno izvještavanje - izvještavanje."
-
 #~ msgid "Account Entry Line"
 #~ msgstr "Linija stavke računa"
 
@@ -11005,26 +10979,5 @@ msgstr ""
 #~ "Ovaj konto će se koristiti umjesto podrazumijevanog za vrijednovanje "
 #~ "izlaznih količina trenutnog proizvoda."
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Analitička konta koja će biti zatvorena"
-
-#~ msgid "Notification"
-#~ msgstr "Obavijest"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Saldo konta - poređenje godina"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Usporedi odabrane godine pod slijedećim uvjetima:"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Odaberite periode"
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Ostavite prazno za usporedbu sa roditeljem"
-
-#~ msgid "Creation Date"
-#~ msgstr "Datum kreiranja"
-
 #~ msgid "Journal de frais"
 #~ msgstr "Knjiga troškova"
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index eef3e59d973..66e9ff59800 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,31 +7,30 @@ 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:10+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-11-07 13:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Sistema de pagaments"
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Altra configuració"
 
 #. 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 ""
+msgstr "No hi ha cap diari de tancament definit per a l'exercici fiscal"
 
 #. module: account
 #: code:addons/account/account.py:506
@@ -39,17 +38,17 @@ msgstr ""
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
-msgstr ""
+msgstr "No podeu suprimir/desactivar un compte vinculat a una empresa"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Concilia l'assentament comptable"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Gestió de rebuts"
 
 #. module: account
 #: view:account.account:0
@@ -69,7 +68,7 @@ msgstr "Pendent"
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Definiu una seqüència en el diari de la factura"
 
 #. module: account
 #: constraint:account.period:0
@@ -79,12 +78,12 @@ msgstr "Error! La durada del període(s) no és vàlid. "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Moneda comptable"
 
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Definició de fills"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -102,11 +101,13 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"L'informe de pèrdues i guanys (PiG) li dóna una visió global de les pèrdues "
+"i guanys de la seva companyia en un únic document"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Importa des de factura o pagament"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -124,6 +125,8 @@ 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 desconcileu transaccions, heu de verificar totes les accions relacionades "
+"amb aquestes perquè no es desactivaran."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -165,7 +168,7 @@ msgstr "Referència"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Seleccioneu l'exercici fiscal "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -173,12 +176,14 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el termini de pagament sense "
+"eliminar-ho."
 
 #. module: account
 #: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avís!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -205,7 +210,7 @@ msgstr "Negatiu"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr ""
+msgstr "Diari: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -214,6 +219,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Dona el tipus de diari analític. Quan necessiteu crear entrades analítiques "
+"per un document (p.ex: una factura), OpenERP cercarà un diari del mateix "
+"tipus."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -233,11 +241,13 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
 msgstr ""
+"Sense període definit per aquesta data: %s !\n"
+"Creeu un any fiscal."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Selecciona conciliació de la línia moviment"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -262,17 +272,17 @@ msgstr ""
 #: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "Factura '%s' està pagada parcialment: %s%s de %s%s (%s%s restant)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr ""
+msgstr "Els assentaments comptables són una entrada de la conciliació."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr ""
+msgstr "Informes Belgues"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1176
@@ -283,24 +293,24 @@ msgstr "No podeu afegir/modificar assentaments en un diari tancat."
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr ""
+msgstr "Balanç calculat"
 
 #. 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 ""
+msgstr "Recurrència manual"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "Tanca any fiscal"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "Permetre desfasament"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -317,6 +327,8 @@ msgstr "Est."
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
+"L'empresa del compte de la línia de la factura no coincideix amb l'empresa "
+"de la factura"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -329,6 +341,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Instal·leu plans comptables localitzats referits al seu país per cobrir les "
+"necessitats comptables de la seva companyia."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -339,11 +353,15 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"No es pot trobar cap diari comptable del tipus %s per aquesta companyia.\n"
+"\n"
+"Podeu crear un al menu: \n"
+"Configuració/Comptabilitat financera/Comptes/Diaris."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Desconciliar compte"
 
 #. module: account
 #: view:product.product:0
@@ -355,7 +373,7 @@ msgstr "Propietats de compra"
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -364,7 +382,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -373,6 +391,9 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"Els comptables utilitzen aquesta vista per gravar registres en massa a "
+"OpenERP. OpenERP crea els moviments comptables si fa ús d'extractes "
+"bancaris, registres de caixa o pagaments de client/proveïdor."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -393,12 +414,12 @@ msgstr "Data creació"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Abonament de compra"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Situació obertura/tancament"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -416,6 +437,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Aquest camp conté la informació relacionada amb la numeració dels "
+"assentaments d'aquest diari."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -435,7 +458,7 @@ msgstr "Positiu"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "Obre per trencar la conciliació"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
@@ -456,6 +479,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"Quan es crea un període de diari, l'estat és 'esborrany'. Si un informe es "
+"imprès, passa a estat 'imprès'. Quan totes les transaccions s'han fet, passa "
+"a estat 'realitzat'."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -465,6 +491,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 ""
+"La taula d'impostos és una vista en arbre que reflecteix l'estructura de "
+"tipus impositius (o codis d'impost) i mostra la situació impositiva actual. "
+"La taula d'impostos representa la quantitat econòmica corresponent a cada "
+"codi de la declaració d'impostos del país. Es representa en una estructura "
+"jeràrquica, que pot ser modificada d'acord a les vostres necessitats."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -488,8 +519,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -503,17 +532,17 @@ msgstr "Diari"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "Confirma les factures seleccionades"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Destinació pare"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Compte utilitzat en aquest diari"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -532,7 +561,7 @@ msgstr ""
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Seleccioneu el pla comptable"
 
 #. module: account
 #: view:product.product:0
@@ -542,7 +571,7 @@ msgstr "Impostos de compres"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Abonament de factura"
 
 #. module: account
 #: report:account.overdue:0
@@ -558,7 +587,7 @@ msgstr "Transaccions no conciliades"
 #: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "El saldo del diari de caixa no concorda amb el saldo calculat !"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -576,7 +605,7 @@ msgstr "Tanca un exercici fiscal"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "El comptable confirma l'extracte."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -592,12 +621,12 @@ msgstr "Tots"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "Nom de l'adreça de la factura"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "Trimestral"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -612,7 +641,7 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 dies   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -627,12 +656,12 @@ msgstr "Mapa de relacions d'impostos"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "Diari centralitzat"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "La seqüència principal ha de ser diferent de l'actual!"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -649,7 +678,7 @@ msgstr "VENDA"
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
 msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "tancant el balanç introduït pel verificador de caixa"
 
 #. module: account
 #: view:account.period:0
@@ -660,7 +689,7 @@ msgstr "Tanca període"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Informe del compte comú amb l'empresa"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -670,7 +699,7 @@ msgstr "Període assentaments d'obertura"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "Diari del període"
 
 #. module: account
 #: code:addons/account/account_move_line.py:732
@@ -678,6 +707,8 @@ msgstr ""
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
+"Per conciliar els seients, la companyia hauria de ser la mateixa per a tots "
+"els assentaments"
 
 #. module: account
 #: view:account.account:0
@@ -694,7 +725,7 @@ msgstr "Comptes a cobrar"
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Informe del llibre major"
 
 #. module: account
 #: view:account.invoice:0
@@ -709,12 +740,12 @@ msgstr "Esteu segurs que voleu crear els assentaments?"
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Comprova"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Empreses conciliades avui"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -732,13 +763,13 @@ msgstr "Resums"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr ""
+msgstr "Assentaments analítics per línia"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "Només podeu canviar la moneda per a factures a l'esborrany!"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -775,17 +806,17 @@ msgstr "No conciliació"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Diari analític comptable"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Conciliació automàtica"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr ""
+msgstr "Càlcul de la data de venciment"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -799,7 +830,7 @@ msgstr "C.Diari / Nom mov."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -810,7 +841,7 @@ msgstr "dies"
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "Si està marcat, el nou pla comptable no ho contindrà per defecte."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -819,6 +850,9 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"No es pot %s factura que ja està conciliada, primer hauríeu de trencar la "
+"conciliació de la factura. Només podeu fer un abonament (factura "
+"rectificativa) d'aquesta factura."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -833,7 +867,7 @@ msgstr "Càlcul"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "Propera empresa a conciliar"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1191
@@ -849,7 +883,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Retard mitjà per a pagar"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -872,7 +906,7 @@ msgstr "Degut"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Total amb impostos"
 
 #. module: account
 #: view:account.invoice:0
@@ -880,7 +914,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprova"
 
 #. module: account
 #: view:account.invoice:0
@@ -902,22 +936,22 @@ msgstr "Consolidació"
 #: view:account.invoice.report:0
 #: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Diari centralitzat"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Abonament de vendes"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Extracte bancari"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -931,11 +965,14 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+"Si el compte és un compte de tipus impositiu, aquest camp contindrà la suma "
+"de l'impost. Si el compte és un tipus de base impositiva, el camp contindrà "
+"la suma de la base imposable (sense impost)."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Compres"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -982,13 +1019,13 @@ msgstr "Balanç d'empresa"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "Nom del compte"
 
 #. 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 ""
+msgstr "Compte de reserves i de pèrdues i guanys"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1005,12 +1042,12 @@ msgstr "Mode horitzontal"
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "Factures de client per aprovar"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Seleccioneu un exercici fiscal per tancar"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1019,11 +1056,14 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
+"Aquests tipus es defineixen d'acord a la legislació comptable del vostre "
+"país. El tipus conté més informació sobre el compte i les seves "
+"especificitats."
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Opcions per la vostra aplicació"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1034,12 +1074,12 @@ msgstr "A quadrar"
 #: 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 ""
+msgstr "Registres de caixa"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Expense Accounts)"
-msgstr ""
+msgstr "Pèrdues i Guanys (comptes de despeses)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1052,17 +1092,17 @@ msgstr "-"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Director"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "Genera els assentaments abans:"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Bank"
-msgstr ""
+msgstr "Banc"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -1072,7 +1112,7 @@ msgstr "Inici del període"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Confirma extracte"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1093,11 +1133,15 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"Amb les factures de proveïdor podeu introduir i gestionar factures emeses "
+"pels seus proveïdors. OpenERP també pot generar esborranys de factura "
+"automàticament des de comandes o albarans de compra. D'aquesta forma, podeu "
+"contrastar la factura del seu proveïdor amb el comprat o rebut."
 
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Cancel·la factures"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -1129,6 +1173,7 @@ msgstr "# de transacció"
 
 #. 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
@@ -1184,19 +1229,19 @@ msgstr "Compte"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Inclòs en l'import base"
 
 #. 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 ""
+msgstr "Anàlisi d'assentaments"
 
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "Nivell"
 
 #. module: account
 #: report:account.invoice:0
@@ -1217,7 +1262,7 @@ msgstr "Impostos"
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Seleccioneu un període inicial i final"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1227,12 +1272,12 @@ msgstr "Plantilles per comptes"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Cerca plantilla impostos"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "La vostra referència"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1251,12 +1296,12 @@ msgstr "Pagaments fora de termini"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Balanç inicial"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Inicialitza a esborrany"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1272,13 +1317,13 @@ msgstr "Opcions de l'informe"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Anàlisi d'elements del diari"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "Empreses"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1317,18 +1362,28 @@ msgstr "No podeu utilitzar aquest compte general en aquest diari!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Amb balanç si no és igual a 0"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Cerca impostos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "Comptabilitat. Diari de costos analítics"
 
 #. module: account
 #: view:account.model:0
@@ -1338,7 +1393,7 @@ msgstr "Crea els assentaments"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "Nº d'elements"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1358,13 +1413,13 @@ msgstr "Núm. de dígits"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Omet estat 'Esborrany' pels assentaments manuals."
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Total base"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1374,16 +1429,20 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Un assentament de diari es compon de diverses anotacions, cadascuna de les "
+"quals és una operació bé al deure o al haver. OpenERP crea automàticament un "
+"assentament per cada document comptable: factura, reemborsament, pagament a "
+"proveïdor, extractes de compte bancari, etc"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "Nombre d'assentaments "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Una taula temporal utilitzada per a la vista de taulell"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1396,6 +1455,7 @@ msgstr "Factures rectificatives (abonament) de proveïdor"
 msgid ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 msgstr ""
+"Per exemple: a 14 dies nets 2 per cent, import restant a 30 dies fi de mes."
 
 #. module: account
 #: code:addons/account/invoice.py:815
@@ -1405,11 +1465,14 @@ msgid ""
 "The payment term defined gives a computed amount greater than the total "
 "invoiced amount."
 msgstr ""
+"No es pot crear la factura!\n"
+"El termini de pagament definit genera un import superior a l'import total "
+"facturat."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Comptabilitat anglosaxona"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1425,7 +1488,7 @@ msgstr "Tancament"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Assentaments recurrents"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1435,7 +1498,7 @@ msgstr "Plantilla per posició fiscal"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "Test codi impost"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1471,18 +1534,20 @@ msgstr "Base"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Vés a la següent empresa"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Cerca extractes bancaris"
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Valors deure o haver incorrectes en el model (deure + haver ha de ser major "
+"que \"0\")!"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1512,11 +1577,17 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Un extracte de compte bancari és un resum de totes les transaccions "
+"financeres ocorregudes en un període de temps en un compte de dipòsit, una "
+"targeta de crèdit o qualsevol altre tipus de compte financer. El balanç "
+"inicial serà proposat automàticament i el balanç de tancament es basarà en "
+"el seu extracte. Situant-se sobre la columna Pagaments d'una línia, podeu "
+"prémer F1 per obrir el formulari de conciliació."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Data/Codi"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1544,7 +1615,7 @@ msgstr "Factura"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Costos analítics a facturar"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1560,7 +1631,7 @@ msgstr "Seqüències de diaris separades"
 #: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: account
 #: report:account.overdue:0
@@ -1570,7 +1641,7 @@ msgstr "Subtotal :"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Vendes per tipus de compte"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1578,11 +1649,13 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Cancel·la la factura: Crea la factura d'abonament (rectificativa), la valida "
+"i concilia per cancel·lar la factura actual."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -1603,12 +1676,12 @@ msgstr "Suma de l'any"
 #. module: account
 #: model:ir.actions.report.xml,name:account.report_account_voucher_new
 msgid "Print Voucher"
-msgstr ""
+msgstr "Imprimeix rebut"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Aquest assistent canviarà la moneda de la factura"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1617,11 +1690,14 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Mostra el pla de comptes de l'empresa per exercici fiscal i filtrat pel "
+"període. Obteniu una vista en arbre completa de tots els assentaments per "
+"codi de compte que podeu estendre fent clic sobre un compte."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Error! No podeu definir exercicis fiscals que es superposin"
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
@@ -1632,7 +1708,7 @@ msgstr "El compte no s'ha definit per ser conciliat!"
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Valors"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1640,6 +1716,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Si el camp actiu està establert a fals, us permetrà ocultar el període del "
+"diari sense esborrar-lo."
 
 #. module: account
 #: view:res.partner:0
@@ -1665,17 +1743,17 @@ msgstr "Heu d'indicar un compte per l'assentament d'ajust!"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Comptabilitat. Informe diari comú"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Totes les empreses"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Ref. :"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1685,7 +1763,7 @@ msgstr "Plans de comptes analítics"
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Els meus assentaments"
 
 #. module: account
 #: report:account.overdue:0
@@ -1696,7 +1774,7 @@ msgstr "Ref. client:"
 #: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "L'usuari %s no te drets per accedir al diari %s !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1711,7 +1789,7 @@ msgstr "Extracte esborrany"
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Declaració d'impostos: Factures rectficatives"
 
 #. module: account
 #: code:addons/account/account.py:499
@@ -1727,7 +1805,7 @@ msgstr "Import haver"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "No podeu crear una línia de moviment en un compte tancat."
 
 #. module: account
 #: code:addons/account/account.py:519
@@ -1742,60 +1820,60 @@ msgstr ""
 #. module: account
 #: view:res.company:0
 msgid "Reserve And Profit/Loss Account"
-msgstr ""
+msgstr "Compte de reserves i pèrdues/guanys"
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valor erroni del deure o haver en l'assentament comptable !"
 
 #. 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 ""
+msgstr "Anàlisi de factures"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "tancament del període"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Configura l'exercici fiscal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Assentaments per línia"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Codi del compte"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Assentament del Diari"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Declaració d'impostos: Factures"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Subtotal"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Anàlisi de tresoreria"
 
 #. module: account
 #: constraint:res.company:0
@@ -1823,12 +1901,12 @@ msgstr "Vàlid"
 #: 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 "Comptabilitat. Imprimeix diari"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Categoria del producte"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1838,18 +1916,20 @@ msgstr "/"
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "Compte de Reserves i Pèrdues/Guanys"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Closing balance based on Starting Balance and Cash Transactions"
 msgstr ""
+"Saldo de tancament calculat a partir del balanç inicial i les transaccions "
+"de caixa."
 
 #. 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 "Comparació entre assentaments comptables i de pagament"
 
 #. module: account
 #: view:account.tax:0
@@ -1873,6 +1953,8 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Afegeix la columna de moneda si la moneda és diferent de la moneda de "
+"l'empresa."
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1880,23 +1962,25 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Si es marca aquesta opció, no s'accepten assentaments la data dels quals no "
+"estigui dins de les dates del període."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "Compte de pèrdues i guanys"
 
 #. 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 ""
+msgstr "Imatge"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: account
 #: view:account.invoice:0
@@ -1910,6 +1994,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Si el camp actiu està desmarcat, permetrà ocultar l'impost sense eliminar-lo."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1918,6 +2003,9 @@ msgid ""
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"si li doneu un nom diferent de /, l'assentament comptable tindrà el mateix "
+"nom que l'extracte. Això permet que els assentaments de l'extracte tinguin "
+"les mateixes referències que el propi extracte"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -1945,17 +2033,17 @@ msgstr "Obre assentaments"
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Comptes a conciliar"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Importa al sistema un extracte des d'un fitxer electrònic"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Importa des de factura"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1964,22 +2052,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Validacions"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Aquest exercici fiscal"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Pla d'impostos comptables"
 
 #. module: account
 #: constraint:account.period:0
@@ -2002,7 +2090,7 @@ msgstr "Pro-forma"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " Diari"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -2011,6 +2099,8 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"No s'ha definit cap compte deure per defecte\n"
+"al diari \"%s\""
 
 #. module: account
 #: help:account.account,type:0
@@ -2023,11 +2113,16 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Aquesta classificació s'utilitza per diferenciar tipus amb efectes especials "
+"a l'OpenERP: vista no pot tenir anotacions, consolidació són comptes que "
+"poden tenir comptes fills per a consolidacions multi-empresa, "
+"pagable/cobrable són per a comptes d'empreses (per als càlculs de crèdit / "
+"dèbit), tancat és per a comptes de depreciació."
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
-msgstr ""
+msgid "Search Chart of Accounts Templates"
+msgstr "Cerca plantilles de pla comptable"
 
 #. module: account
 #: view:account.installer:0
@@ -2036,6 +2131,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"El pla comptable per defecte s'ajusta a la selecció del país. Si no existeix "
+"un pla comptable certificat per al país especificat, es pot instal·lar un de "
+"genèric que serà seleccionat per defecte."
 
 #. module: account
 #: view:account.account.type:0
@@ -2061,7 +2159,7 @@ msgstr "Descripció"
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
@@ -2090,32 +2188,39 @@ msgstr "Propietats de comptabilitat"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Assentaments ordenats per"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Canvia a"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "Nº qtat de productes "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Plantilla del producte"
 
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2204,7 +2309,7 @@ msgstr "Obert"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Estat esborrany d'una factura"
 
 #. module: account
 #: help:account.account,reconcile:0
@@ -2217,7 +2322,7 @@ msgstr ""
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Conciliació d'empresa"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2234,6 +2339,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"No es troba cap diari del tipus %s per a aquesta companyia.\n"
+"\n"
+"Heu de crear un en el menú: \n"
+"Configuració\\Comptabilitat financera\\Comptes\\Diaris."
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2245,6 +2354,7 @@ msgstr "Codi base"
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
 msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista d'impostos de factura."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2264,6 +2374,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 ""
+"Aquest menú imprimeix una declaració d'IVA basada en factures o pagaments. "
+"Seleccioneu un o diversos períodes de l'exercici fiscal. La informació "
+"necessària per a la declaració d'IVA és generada automàticament per OpenERP "
+"a partir de les factures (o pagaments, en alguns països). Aquesta informació "
+"s'actualitza en temps real. És molt útil perquè li permet previsualitzar en "
+"qualsevol moment els impostos que deu al principi i fi del mes o trimestre."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2274,7 +2390,7 @@ msgstr "Centralització del deure"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Confirma factures esborrany"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2283,12 +2399,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Comptes a renovar"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2330,7 +2446,7 @@ msgstr "Seleccioneu període"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Extractes"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2343,17 +2459,21 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"La posició fiscal calcularà els impostos i els comptes comptables utilitzats "
+"per a aquesta empresa."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
+"Aquest informe us proporciona una visió global sobre la situació d'un diari "
+"específic"
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Error! No podeu crear categories recursives."
 
 #. module: account
 #: report:account.invoice:0
@@ -2382,7 +2502,7 @@ msgstr "Compte analític"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Comptes"
 
 #. module: account
 #: code:addons/account/invoice.py:351
@@ -2394,7 +2514,7 @@ msgstr "Error de configuració!"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Preu mitjà"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2409,16 +2529,17 @@ msgid ""
 "You cannot modify company of this journal as its related record exist in "
 "Entry Lines"
 msgstr ""
+"No podeu modificar l'empresa d'aquest diari perquè ja conté assentaments"
 
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informació comptable"
 
 #. module: account
 #: view:account.tax:0
@@ -2439,6 +2560,7 @@ msgstr "Desc.(%)"
 
 #. 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
@@ -2450,11 +2572,13 @@ msgstr "Ref."
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
 msgstr ""
+"El compte pot ser o bé un compte d'un codi d'impost base o bé d'un codi "
+"d'impost."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Conciliació automàtica"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2472,7 +2596,7 @@ msgstr "Codi base reintegrament"
 #: 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 "Extractes bancaris"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2485,7 +2609,7 @@ msgstr "Cert"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2499,6 +2623,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Genera automàticament els assentaments a partir del que s'ha introduït en el "
+"sistema abans d'una data concreta."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2511,7 +2637,7 @@ msgstr "Balanç d'empresa anterior"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Assentaments comptables"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2527,30 +2653,35 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Marqueu aquesta opció si no desitjeu que les noves anotacions passin per "
+"l'estat 'Esborrany' i per tant vagin directament a l'estat 'Assentat' sense "
+"cap validació manual.\n"
+"Tingueu en compte que les anotacions creades automàticament pel sistema "
+"sempre obvien aquest estat."
 
 #. 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 "Configuració financera per una nova companyia"
 
 #. 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 ""
+msgstr "Vendes per compte"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Aquest assistent crearà assentaments comptables recursius"
 
 #. module: account
 #: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "No s'ha definit una seqüència en el diari !"
 
 #. module: account
 #: code:addons/account/account.py:2083
@@ -2573,7 +2704,7 @@ msgstr "Codis impostos"
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Clients"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -2589,7 +2720,7 @@ msgstr "Període fins"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:306
@@ -2598,16 +2729,18 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"El saldo del compte no és correcte!\n"
+"El balanç del que s'esperava (%.2f) és diferent a la calculada un. (%.2f)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Number:"
-msgstr ""
+msgstr "Número:"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -2621,7 +2754,7 @@ msgstr "Número de referència"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2629,11 +2762,14 @@ 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 quantitat opcional expressada per aquesta línia, per exemple: el nombre "
+"de productes venuts. La quantitat no és un requisit legal, però és molt útil "
+"per a alguns informes."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "Línia 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
@@ -2658,6 +2794,8 @@ msgstr ""
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"utilitzat en el domini de conciliació d'extractes, però no s'hauria "
+"d'utilitzar en cap altre lloc."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2667,7 +2805,7 @@ msgstr "Import codi base"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Impost de venda per defecte"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2676,6 +2814,9 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"La data de venciment dels assentaments generats per aquest model. Podeu "
+"triar entre la data de creació o la data de creació dels assentaments més "
+"els terminis de pagament de l'empresa."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2685,8 +2826,10 @@ msgstr "Comptabilitat financera"
 #. 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
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Pèrdues i guanys"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2709,6 +2852,8 @@ msgid ""
 "It adds initial balance row on report which display previous sum amount of "
 "debit/credit/balance"
 msgstr ""
+"Afegeix una fila de saldo inicial en l'informe que mostra l'import previ del "
+"deure/haver/saldo"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -2751,12 +2896,12 @@ msgstr "L'usuari responsable d'aquest diari"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Cerca període"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Moneda de la factura"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2766,7 +2911,7 @@ msgstr "Terminis de pagament"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "Transició de caixa"
 
 #. module: account
 #: view:res.partner:0
@@ -2806,17 +2951,17 @@ msgstr "Nom línia"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Cerca exercici fiscal"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "Sempre"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "Quantitat total"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -2846,7 +2991,7 @@ msgstr "Vista"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNC%s"
 
 #. module: account
 #: code:addons/account/account.py:2906
@@ -2878,17 +3023,17 @@ msgstr "Plantilla codis d'impostos"
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "Comença en"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Llibre major de l'empresa"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Indica l'ordre de seqüència de la columna del diari."
 
 #. module: account
 #: view:account.tax.template:0
@@ -2901,6 +3046,7 @@ msgstr "Declaració d'impostos"
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
+"Força a tots els moviments d'aquest compte, tenir aquesta moneda secundària."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2908,6 +3054,9 @@ 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 ""
+"Aquest assentament validarà tots els assentaments d'un diari i període en "
+"particular. Una vegada que es validen els assentaments, no es poden "
+"modificar més."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -2923,7 +3072,7 @@ msgstr "Genera pla comptable a partir d'una plantilla de pla comptable"
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Concilia el compte desconciliat"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -2938,6 +3087,15 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Estableix aquí el mètode que utilitzarà l'assistent genèric per crear el "
+"assentament de tancament d'exercici per a tots els comptes d'aquest tipus.\n"
+"\n"
+"'Cap' significa que no es farà res.\n"
+"'Saldo' normalment s'utilitzarà per a comptes d'efectiu.\n"
+"'Detallat' copiarà cada anotació de l'exercici anterior, fins i tot els no "
+"conciliats.\n"
+"'Sense conciliar' copiarà només les anotacions no conciliades el primer dia "
+"del nou exercici fiscal."
 
 #. module: account
 #: view:account.tax:0
@@ -2959,7 +3117,6 @@ msgstr "Deixar buit pel compte de despeses"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2973,13 +3130,24 @@ msgstr "Deixar buit pel compte de despeses"
 #: 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 "Diaris"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "Empreses restants"
 
 #. module: account
 #: view:account.subscription:0
@@ -3004,7 +3172,7 @@ msgstr "Compra"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Configuració de l'aplicació de comptabilitat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3046,11 +3214,13 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"L'import expressat en la moneda comptable relacionada no és igual al de la "
+"companyia."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Journal:"
-msgstr ""
+msgstr "Diari:"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3070,7 +3240,7 @@ msgstr "Esborrany"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "Configuració del pla comptable"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3082,17 +3252,17 @@ msgstr "No s'imprimeix en factura"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "Pla dels impostos"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Cerca diari"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Factura pendent"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -3102,7 +3272,7 @@ msgstr "any"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "Signant autoritzat"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3110,6 +3280,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 ""
+"Tots els assentaments seleccionats seran validats i assentats. Això "
+"significa que ja no podreu modificar els camps comptables."
 
 #. module: account
 #: code:addons/account/invoice.py:370
@@ -3120,7 +3292,7 @@ msgstr "No es poden esborrar factures obertes o pagades!"
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3130,7 +3302,7 @@ msgstr "Transferències"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: n.a"
-msgstr ""
+msgstr "  import valor: n.a"
 
 #. module: account
 #: view:account.chart:0
@@ -3145,12 +3317,12 @@ msgstr "Import impostos"
 #. module: account
 #: view:account.installer:0
 msgid "Your bank and cash accounts"
-msgstr ""
+msgstr "Comptes bancaris i de caixa"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "Cerca moviment"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3171,6 +3343,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"La/es factura/es seleccionada/es no es pot/den cancel·lar ja que està en "
+"estat 'Cancel·lat' o 'Realitzat'!"
 
 #. module: account
 #: code:addons/account/account.py:522
@@ -3184,24 +3358,25 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Contrapartida"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dades de facturació"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Estat de la factura"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Categoria del producte"
 
 #. module: account
 #: view:account.move:0
@@ -3209,18 +3384,18 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "Notes"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Crea compte"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Informe de les vendes per tipus de compte"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3230,7 +3405,7 @@ msgstr "Detall"
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "Els seus comptes de banc i caixa"
 
 #. module: account
 #: report:account.invoice:0
@@ -3242,6 +3417,16 @@ msgstr "CIF/NIF:"
 #: 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.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 "Chart of Accounts"
 msgstr "Resum de comptes"
 
@@ -3249,6 +3434,7 @@ msgstr "Resum de comptes"
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
 msgstr ""
+"(si no seleccioneu el període s'utilitzaran tots els períodes oberts)"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3258,7 +3444,7 @@ msgstr "Homòleg centralitzat"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Procés de conciliació empresa per empresa"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3338,6 +3524,9 @@ msgid ""
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"La data de venciment de l'anotació generada per la línia del model '%s' del "
+"model '%s' es basa en el termini de pagament de l'empresa.\n"
+"definiu l'empresa en ell!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:810
@@ -3352,6 +3541,8 @@ msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
 "chart of accounts !"
 msgstr ""
+"No podeu validar un assentament fins que tots els moviments estiguin en el "
+"mateix pla comptable!"
 
 #. module: account
 #: view:account.tax:0
@@ -3361,7 +3552,7 @@ msgstr "Compte d'impostos"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Pressupostos"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3380,7 +3571,7 @@ msgstr ""
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr ""
+msgstr "Sense filtres"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3390,7 +3581,7 @@ msgstr "Situació"
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3412,12 +3603,12 @@ msgstr "Codi aplicable (si tipus=codi)"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Qtat"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Adreça del contacte"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -3427,7 +3618,7 @@ msgstr "Litigi"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Cerca línies analítiques"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -3439,6 +3630,7 @@ msgstr "Compte a pagar"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"No podeu crear apunts en diferents períodes/diaris en el mateix assentament"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3467,7 +3659,7 @@ msgstr "Preu un."
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "Anotacions analítiques"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1128
@@ -3478,7 +3670,7 @@ msgstr "No ha estat possible canviar l'impost!"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "Núm. assentament"
 
 #. module: account
 #: code:addons/account/invoice.py:1422
@@ -3486,6 +3678,7 @@ msgstr ""
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
+"Heu seleccionat una unitat de mesura que no és compatible amb el producte."
 
 #. module: account
 #: code:addons/account/invoice.py:473
@@ -3505,12 +3698,12 @@ msgstr "Obre factura"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Factor de multiplicació del impost"
 
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "Correspondència"
 
 #. module: account
 #: field:account.account,name:0
@@ -3528,7 +3721,7 @@ msgstr "Nom"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Informe de comprovació de venciments en el balanç"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3544,7 +3737,7 @@ msgstr "Codificació estàndard"
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Diari d'assentaments analítics"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -3565,11 +3758,13 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Imprimeix informe amb la columna de la moneda, si la moneda és diferent de "
+"la moneda de la companyia."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Comptabilitat general"
 
 #. module: account
 #: report:account.overdue:0
@@ -3584,13 +3779,17 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"El més recomanable és utilitzar un diari dedicat als assentaments d'obertura "
+"de tots els exercicis. Tingueu en compte que ho hauríeu de definir amb "
+"comptes de deure/haver per defecte, de tipus 'situació' i amb una "
+"contrapartida centralitzada."
 
 #. module: account
 #: view:account.installer:0
 #: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: account
 #: view:account.invoice:0
@@ -3602,12 +3801,12 @@ msgstr "Canvia a esborrany"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Línies recursives"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Mostra empreses"
 
 #. module: account
 #: view:account.invoice:0
@@ -3618,6 +3817,7 @@ msgstr "Validar"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"Valor erroni del deure o haver en el model (deure o haver ha de ser \"0\")!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3626,11 +3826,15 @@ 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 d'aquest informe, podeu tenir una visió general de l'import "
+"facturat als seus clients, així com els retards en els pagaments. L'eina de "
+"recerca també es pot utilitzar per personalitzar els informes de les "
+"factures i per tant, adaptar aquest anàlisi a les seves necessitats."
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Confirma factures"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3660,7 +3864,7 @@ msgstr "(heu de trencar la conciliació si desitgeu obrir la factura)"
 #: field:account.report.general.ledger,period_from:0
 #: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "Període inicial"
 
 #. module: account
 #: field:account.tax,name:0
@@ -3688,13 +3892,12 @@ msgid "Analytic Balance"
 msgstr "Saldo analític"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
-msgstr ""
+msgstr "Pèrdues netes"
 
 #. module: account
 #: help:account.account,active:0
@@ -3702,16 +3905,17 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el compte sense eliminar-lo."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Cerca plantilles d'impostos"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Assentaments en esborrany"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3740,12 +3944,12 @@ msgstr "Tipus de compte"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Balanç de sumes i saldos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Cancel·la les factures seleccionades"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3754,6 +3958,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
 msgstr ""
+"Aquest compte s'utilitzarà per valorar l'estoc que ha sortit de la categoria "
+"de producte actual utilitzant el preu de venda."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3766,22 +3972,25 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
+"Els costos analítics (fulls de serveis, alguns productes comprats, ...) "
+"provenen dels comptes analítics. Aquests generen factures esborrador de "
+"proveïdor."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "Tanca caixa"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Retard mig del deute"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Tipus de compte"
 
 #. module: account
 #: code:addons/account/invoice.py:714
@@ -3803,7 +4012,7 @@ msgstr "Mes"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referència UdM"
 
 #. module: account
 #: field:account.account,note:0
@@ -3814,7 +4023,7 @@ msgstr "Nota"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "Compta d'endarreriments"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -3830,7 +4039,7 @@ msgstr "Línies d'impostos"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Codi base del compte"
 
 #. module: account
 #: help:account.move,state:0
@@ -3841,12 +4050,18 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"Tots els assentaments creats manualment estan, generalment, en l'estat 'No "
+"assentant', però podeu configurar l'opció d'ometre aquest estat en el diari "
+"corresponent. En aquest cas, es comporten com els assentaments creats "
+"automàticament pel sistema de validació de documents (factures, extractes "
+"bancaris, ...) i es crearan en estat 'Assentat'."
 
 #. 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 hi ha compte de despeses definit per aquest producte: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
@@ -3887,11 +4102,12 @@ msgstr "Tots els assentaments fixats"
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
 msgstr ""
+"S'ha confirmat l'extracte %s, s'han creat els assentaments comptables."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Error! La durada de l'exercici fiscal no és vàlida. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -3906,12 +4122,12 @@ msgstr "Comproveu si també voleu mostrar comptes amb saldo 0."
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "Codi calculat"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Impostos per defecte"
 
 #. module: account
 #: code:addons/account/invoice.py:88
@@ -3930,26 +4146,28 @@ 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 ""
+"Quan es crea una nova anotació, l'estat serà 'Esborrany'.\n"
+"* Quan es realitzin tots els pagaments, l'estat serà 'Vàlid'"
 
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "Mode de visualització"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Extracte des de factura o pagament"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month: 0"
-msgstr ""
+msgstr "  dia del mes: 0"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "Pla comptable"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -3961,23 +4179,23 @@ msgstr "Nom de compte"
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr ""
+msgstr "Indiqueu el nom dels nous assentaments"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Estadístiques de factures"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "S'han introduït els extractes bancaris en el sistema."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Desfés conciliació"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -4000,17 +4218,17 @@ msgstr "Balanç en el tancament"
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "No s'ha implementat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "Seleccioneu compte de diari"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Imprimeix factura"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4032,12 +4250,12 @@ msgstr "Núm. de val"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_continguts"
 
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Transaccions no conciliades"
 
 #. module: account
 #: view:account.use.model:0
@@ -4072,13 +4290,13 @@ msgstr "Impostos inclosos en preu"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Llibre de costos analítics per informe diari"
 
 #. 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 ""
+msgstr "Models recursius"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4114,12 +4332,12 @@ msgstr "Controls de tipus"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "Actua com un compte per defecte per als imports en l'haver"
 
 #. module: account
 #: help:account.partner.ledger,reconcil:0
 msgid "Consider reconciled entries"
-msgstr ""
+msgstr "Considerar assentaments conciliats."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4127,7 +4345,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr ""
+msgstr "Assentar assentaments"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4139,7 +4357,7 @@ msgstr "Cancel·lat"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Saldo del tancament basat en la caixa."
 
 #. module: account
 #: constraint:account.account:0
@@ -4153,18 +4371,20 @@ msgid ""
 "You cannot create an account! \n"
 "Make sure if the account has children then it should be type \"View\"!"
 msgstr ""
+"No podeu crear el compte!\n"
+"Assegureu-vos que si el compte té fills, el seu tipus sigui \"Vista\"!"
 
 #. 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 ""
+msgstr "Genera assentaments"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Selecciona pla d'impuestos."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4185,12 +4405,12 @@ msgstr "Client"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmat"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancel·lada"
 
 #. module: account
 #: code:addons/account/invoice.py:73
@@ -4206,6 +4426,9 @@ msgid ""
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"No s'ha pogut crear moviment amb moneda diferent de la moneda secundària del "
+"compte \"% s -% s\". Esborreu el camp de moneda secundària de la definició "
+"del compte si voleu acceptar totes les monedes.m"
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4224,6 +4447,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 ""
+"Tots els assentaments en esborrany d'aquest diari i període seran validats. "
+"Això significa que ja no podreu modificar els camps comptables."
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -4233,7 +4458,7 @@ msgstr "Balanç compte -"
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -4245,6 +4470,8 @@ msgstr "Compte d'ingressos en plantilla producte"
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
 msgstr ""
+"Data en què els assentaments comptables de l'empresa van ser conciliats per "
+"última vegada."
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4279,12 +4506,12 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturat"
 
 #. module: account
 #: view:account.use.model:0
@@ -4304,7 +4531,7 @@ msgstr "La base de l'impost de la declaració d'impostos."
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Afegeix"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4314,7 +4541,7 @@ msgstr "Deixa-ho buit per utilitzar la data actual."
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr ""
+msgstr "Banc i xecs"
 
 #. module: account
 #: view:account.period.close:0
@@ -4329,7 +4556,7 @@ msgstr "L'extracte bancari utilitzat per la conciliació amb el banc"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Factures en esborrany són validades. "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4365,17 +4592,17 @@ msgstr "Aplicació impost"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Apunts comptables"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgid "Balance Sheet (Asset Accounts)"
+msgstr "Balanç de situació (comptes d'actiu)"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Third Party (Country)"
-msgstr ""
+msgstr "Tercera part (país)"
 
 #. module: account
 #: code:addons/account/account.py:938
@@ -4429,11 +4656,16 @@ 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 ""
+"Per imprimir un diari analític (o costos) durant un període determinat. En "
+"l'informe es llista el codi, el nom de moviment, número de compte, l'import "
+"general i l'import analític."
 
 #. module: account
 #: help:account.journal,refund_journal:0
 msgid "Fill this if the journal is to be used for refunds of invoices."
 msgstr ""
+"Marqueu aquesta opció si el diari s'utilitzarà per a factures rectificatives "
+"(abonaments)."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -4443,7 +4675,7 @@ msgstr "Genera assentaments obertura exercici fiscal"
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Agrupa línies de factura"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -4460,17 +4692,17 @@ msgstr "Moviments"
 #: 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 ""
+msgstr "Compte declaració d'IVA"
 
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Per tancar"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr ""
+msgstr "Comprova la data, no està en el període"
 
 #. module: account
 #: code:addons/account/account.py:1210
@@ -4498,7 +4730,7 @@ msgstr "Comptes impostos filles"
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "El període inicial ha de ser més petit que el període final"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4511,7 +4743,6 @@ msgid "Analytic Balance -"
 msgstr "Balanç analític -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4524,10 +4755,8 @@ msgstr "Balanç analític -"
 #: 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.journal.period.print: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
@@ -4537,6 +4766,16 @@ msgstr "Balanç analític -"
 #: 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
 msgid "Target Moves"
 msgstr "Moviments destí"
 
@@ -4555,7 +4794,7 @@ msgstr "Pagaments"
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "Codi de càlcul invers"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -4584,6 +4823,7 @@ msgstr "Nom columna"
 msgid ""
 "This report gives you an overview of the situation of your general journals"
 msgstr ""
+"Aquest informe proporciona una vista general de la situació dels seus diaris"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4594,17 +4834,17 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "Obertura de caixa"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr ""
+msgstr "Línia 1:"
 
 #. module: account
 #: code:addons/account/account.py:1167
@@ -4626,7 +4866,7 @@ msgstr "mes"
 #: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "L'anotació \"%s\" no és vàlida"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4636,7 +4876,7 @@ msgstr "Descripció en factures"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Següent empresa per concilia"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4653,13 +4893,15 @@ msgstr "Resultat de conciliació"
 #: 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
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Balanç de situació"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "Informes comptables"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4672,7 +4914,7 @@ msgstr "Assentaments"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Aquest període"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -4731,7 +4973,7 @@ msgstr "Assentament fi d'exercici fiscal"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "Validació"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -4739,6 +4981,8 @@ msgid ""
 "The Journal Entry of the invoice have been totally reconciled with one or "
 "several Journal Entries of payment."
 msgstr ""
+"El assentament de la factura ha estat totalment conciliat amb un o diversos "
+"assentaments de pagament."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -4751,6 +4995,8 @@ msgstr "Impost en fills"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"No podeu crear una línia de moviment en un compte a cobrar/a pagar sense una "
+"empresa."
 
 #. module: account
 #: code:addons/account/account.py:2067
@@ -4767,7 +5013,7 @@ msgstr "Permetre cancel·lar assentaments"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Coeficient per a pare"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -4777,7 +5023,7 @@ msgstr "(Compte/Empresa) Nom"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "Transacció"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4794,7 +5040,7 @@ msgstr "Utilitzeu aquest codi per a la declaració de l'IVA."
 #. module: account
 #: view:account.move.line:0
 msgid "Debit/Credit"
-msgstr ""
+msgstr "Deure/Haver"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
@@ -4810,7 +5056,7 @@ msgstr "Plantilles codis d'impostos"
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr ""
+msgstr "account.instal·lador"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -4867,12 +5113,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Informe comptable comú"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicació"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -4931,6 +5177,9 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Aquestes són les empreses restants a les quals hauríeu de comprovar si hi ha "
+"alguna cosa per conciliar o no. Aquesta xifra ja comptabilitza l'empresa "
+"actual com a conciliada."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -4940,7 +5189,7 @@ msgstr "Línies dels assentaments periòdics"
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Quantitat de productes"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4949,25 +5198,25 @@ msgstr ""
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr ""
+msgstr "Sense comptabilitzar"
 
 #. 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 ""
+msgstr "Canvia la moneda"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr ""
+msgstr "Assentaments comptables."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Data de pagament"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4988,11 +5237,13 @@ msgid ""
 "According value related accounts will be display on respective reports "
 "(Balance Sheet Profit & Loss Account)"
 msgstr ""
+"Segons el valor relacionat els comptes es mostraran en els seus respectius "
+"informes (Balanç de situació comptable de pèrdues i guanys)."
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort By"
-msgstr ""
+msgstr "Ordena per"
 
 #. module: account
 #: code:addons/account/account.py:1326
@@ -5001,6 +5252,8 @@ msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"No s'ha definit un compte d'haver per defecte\n"
+"en el diari \"%s\""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
@@ -5022,7 +5275,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr ""
+msgstr "Línies a conciliar"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5042,12 +5295,12 @@ msgstr "Quantitat"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Número (moviment)"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "Opcions de factura rectificativa (abonament)"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5055,6 +5308,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 ""
+"La potència de la conciliació automàtica a seleccionar és el número dels "
+"imports parcials que es poden combinar per trobar un saldo a zero."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5086,6 +5341,10 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Si no heu d'introduir més assentaments en un exercici fiscal, podeu tancar "
+"des d'aquí. Es tancaran tots els períodes oberts en aquest exercici que farà "
+"impossible introduir cap assentament nou. Tanqueu l'exercici fiscal quan "
+"necessiteu els resultats finals del exercici definitivament. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5100,7 +5359,7 @@ msgstr "Mostra divisa"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr ""
+msgstr "Obre caixa"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5116,40 +5375,40 @@ msgstr "Import fix"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Vàlid fins"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "A cobrar vençuts"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Compte de conciliació automàtica"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Anotació comptable"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr ""
+msgstr "Diari de moviments"
 
 #. 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 ""
+msgstr "Genera assentaments d'obertura"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
-msgstr ""
+msgstr "Ja està conciliat!"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5162,6 +5421,8 @@ msgid ""
 "This module will support the Anglo-Saxons accounting methodology by changing "
 "the accounting logic with stock transactions."
 msgstr ""
+"Aquest mòdul suporta la metodologia comptable anglosaxona, canviant la "
+"lògica comptable en les transaccions d'estoc."
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5173,7 +5434,7 @@ msgstr "Data creació"
 #: 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 "Diaris analítics"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5213,7 +5474,7 @@ msgstr "Proveïdor"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: account
 #: view:account.account.template:0
@@ -5231,11 +5492,13 @@ msgid ""
 "Streamlines invoice payment and creates hooks to plug automated payment "
 "systems in."
 msgstr ""
+"Agilita el pagament de factures i crea interfícies per connectar sistemes de "
+"pagament automatitzats."
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "Valoració"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5250,13 +5513,13 @@ msgstr "Comptes a cobrar i pagar"
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Assignació fiscal"
 
 #. 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 ""
+msgstr "Estat del compte obert"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5280,6 +5543,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Des d'aquesta vista obteniu un anàlisi dels diferents comptes financers. El "
+"document mostra el deure i haver tenint en consideració algun criteri que "
+"podeu seleccionar utilitzant l'eina de cerca."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5288,6 +5554,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 ""
+"La definició dels codis d'impostos depèn de la declaració d'impostos del "
+"país. OpenERP li permet definir i gestionar l'estructura d'impostos des "
+"d'aquest menú. Podeu definir codis numèrics i alfanumèrics."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5295,6 +5564,8 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Mostra el progrés realitzat avui en el procés de conciliació. Indica:\n"
+"Empreses conciliades avui / (Empreses restants + Empreses conciliades avui)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5303,6 +5574,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Seleccioneu el tipus de valoració relacionat amb aquesta línia de termini de "
+"pagament. Tingueu en compte que heu de tenir l'última línia amb el tipus "
+"'Saldo' per garantir que l'import total sigui processat."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5316,13 +5590,13 @@ msgstr "Força període"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# de línies"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "La nova moneda no està configurada correctament!"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5341,7 +5615,7 @@ msgstr ""
 #: field:account.report.general.ledger,filter:0
 #: field:account.vat.declaration,filter:0
 msgid "Filter by"
-msgstr ""
+msgstr "Filtra per"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1131
@@ -5366,10 +5640,23 @@ msgstr "Compte impostos de factures"
 #: 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 "Compte del diari 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 "Sense filtre"
@@ -5395,12 +5682,12 @@ msgstr "Acció no vàlida!"
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr ""
+msgstr "Període: %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Plantilla posició fiscal impost"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5423,7 +5710,7 @@ msgstr "Cap"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 Dies  "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -5434,7 +5721,7 @@ msgstr "Factures rectificatives (abonament) de client"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Càlcul del import"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5444,18 +5731,18 @@ msgstr "Nom diari-període"
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr ""
+msgstr "Factor de multiplicació per al codi base"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "no implementat"
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Companyia relacionada amb aquest diari"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5464,6 +5751,8 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
+"La/es factura/es seleccionada/es no es pot/den confirmar ja que no està/n en "
+"estat 'Esborrany' o 'Pro-forma'!"
 
 #. module: account
 #: report:account.invoice:0
@@ -5475,7 +5764,7 @@ msgstr "Observació posició fiscal :"
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Anàlisi assentaments analítics"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -5501,11 +5790,16 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
+"Aquesta vista pot ser utilitzada pels comptables per registrar assentaments "
+"ràpidament en OpenERP. Si desitgeu registrar una factura de proveïdor, "
+"comenceu registrant l'anotació del compte de despeses. OpenERP li proposarà "
+"automàticament l'impost associat en aquest compte i el \"compte a pagar\" de "
+"contrapartida."
 
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -5518,6 +5812,8 @@ msgid ""
 "The code will be used to generate the numbers of the journal entries of this "
 "journal."
 msgstr ""
+"El codi s'utilitzarà per generar els números dels assentaments d'aquest "
+"diari."
 
 #. module: account
 #: view:account.invoice:0
@@ -5530,12 +5826,14 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"Tan aviat com la reconciliació es fa, l'estat de les factures es converteix "
+"en \"realitzada\" (és a dir, pagada) en el sistema."
 
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Factura '%s' és validada."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5546,12 +5844,12 @@ msgstr "Compte principal"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Data de l'última conciliació"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línia analítica"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -5561,18 +5859,18 @@ msgstr "Impostos client"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Crea un compte basat en aquesta plantilla"
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Configuració d'informes"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La companyia ha de ser la mateixa pel compte i període relacionat."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5589,12 +5887,12 @@ msgstr "Plantilles de comptes"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Declaració d'impostos"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: account
 #: code:addons/account/account.py:532
@@ -5603,11 +5901,13 @@ msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
 "Lines"
 msgstr ""
+"No podeu modificar la companyia del compte perquè ja hi ha anotacions en "
+"aquest compte"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Seleccioneu un exercici fiscal per tancar"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -5717,27 +6017,27 @@ msgstr "Compte haver per defecte"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Configureu el pla comptable"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 30"
-msgstr ""
+msgstr "  número de dies: 30"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "La moneda comptable relacionada si no és igual a la de la companyia."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr ""
+msgstr "Caixa"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -5747,7 +6047,7 @@ msgstr "Percentatge"
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Diari i Empresa"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -5757,7 +6057,7 @@ msgstr "Força"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr ""
+msgstr "Tipus d'abonament"
 
 #. module: account
 #: report:account.invoice:0
@@ -5772,7 +6072,7 @@ msgstr "Veure línies comptables analítiques"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Liability Accounts)"
-msgstr ""
+msgstr "Balanç de situació (comptes amb risc)"
 
 #. module: account
 #: field:account.invoice,internal_number:0
@@ -5786,11 +6086,13 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Indica si la suma de l'impost ha de ser inclòs en la quantitat base per al "
+"càlcul dels impostos següents"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Reconciliació: Vés a següent empresa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -5825,13 +6127,13 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "Liquiditat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Anotacions analítiques"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -5840,11 +6142,15 @@ 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 ""
+"Aquest assistent generarà els assentaments de finalització d'exercici per a "
+"l'exercici fiscal seleccionat. Tingueu en compte que podeu executar aquest "
+"assistent diverses vegades per al mateix exercici fiscal: simplement es "
+"substitueixen els assentaments d'obertura vells pels nous."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr ""
+msgstr "Banc i caixa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -5854,16 +6160,20 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Des d'aquesta vista, disposeu d'un anàlisi dels diferents assentaments "
+"analítics del compte analític, que heu definit per ajustar-se a les seves "
+"necessitats del negoci. Utilitzeu l'eina de cerca per analitzar la "
+"informació sobre els assentaments analítics generats en el sistema."
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "El nom del diari ha de ser únic per companyia!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Crea opcional"
 
 #. module: account
 #: code:addons/account/invoice.py:406
@@ -5872,12 +6182,14 @@ msgstr ""
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
+"No s'ha trobat un pla comptable per a aquesta companyia. Creeu un pla "
+"comptable."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Introduïu una data d'inici!"
 
 #. module: account
 #: report:account.invoice:0
@@ -5890,7 +6202,7 @@ msgstr "Factura rectificativa (abonament) de proveïdor"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
 msgid "Dashboard"
-msgstr ""
+msgstr "Taulell"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -5905,7 +6217,7 @@ msgstr "Centralització"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Genera el seu pla comptable des d'una plantilla de pla comptable"
 
 #. module: account
 #: view:account.account:0
@@ -5927,7 +6239,7 @@ msgstr ""
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -5937,7 +6249,7 @@ msgstr "Només lectura"
 #. module: account
 #: model:ir.model,name:account.model_account_pl_report
 msgid "Account Profit And Loss Report"
-msgstr ""
+msgstr "Compte de resultats (pèrdues i guanys)"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -5972,7 +6284,7 @@ msgstr "Diari analític"
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "Reconciliat"
 
 #. module: account
 #: report:account.invoice:0
@@ -5993,7 +6305,7 @@ msgstr "Compte categoria despeses"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Transaccions en efectiur"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
@@ -6016,7 +6328,7 @@ msgstr "Notes"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Estadístiques d'assentaments analítics"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:143
@@ -6028,7 +6340,7 @@ msgstr "Assentaments: "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Crea manualment assentaments recurrents en un diari seleccionat."
 
 #. module: account
 #: code:addons/account/account.py:1393
@@ -6047,6 +6359,13 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
+"Un tipus de compte és utilitzat per determinar com s'utilitza un compte en "
+"cada diari. El mètode per defecte d'un tipus de compte determina el procés "
+"per al tancament anual. Informes com el balanç i el de pèrdues i guanys "
+"utilitzen la categoria (perdudes/guanys o balanç). Per exemple, el tipus de "
+"compte pot ser associat a un compte d'actius, despeses o pagaments. Des "
+"d'aquesta vista, podeu crear i gestionar els tipus de compte necessaris per "
+"a la seva companyia."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6055,11 +6374,14 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"La conciliació bancària consisteix en verificar que el seu extracte bancari "
+"correspon amb les entrades (o registres) d'aquest compte en el sistema "
+"comptable."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr ""
+msgstr "L'estat és esborrany"
 
 #. module: account
 #: view:account.move.line:0
@@ -6083,7 +6405,7 @@ msgstr "Fax :"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,based_on:0
 msgid "Based On"
-msgstr ""
+msgstr "Basat en"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6111,6 +6433,8 @@ msgstr "Codi de Python"
 msgid ""
 "Please define the Reserve and Profit/Loss account for current user company !"
 msgstr ""
+"Defineix el compte de reserves i pèrdues/guanys per a la companyia de "
+"l'usuari actual!"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6118,6 +6442,8 @@ 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 ""
+"Marqueu aquesta casella si voleu permetre la cancel·lació dels assentaments "
+"relacionats amb aquest diari o de la factura relacionada amb aquest diari"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6132,7 +6458,7 @@ msgstr "Crea assentament"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: percent"
-msgstr ""
+msgstr "  valoració: percentatge"
 
 #. module: account
 #: code:addons/account/account.py:499
@@ -6195,12 +6521,18 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Perquè una factura es consideri pagada, les anotacions comptables de la "
+"factura han d'estar conciliades amb les seves contrapartides, normalment "
+"pagaments. Amb la funcionalitat de reconciliació automàtica, OpenERP "
+"realitza la seva pròpia recerca d'anotacions a conciliar en una sèrie de "
+"comptes. Troba les anotacions, per a cada empresa, quan les quantitats es "
+"corresponguin."
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "Per revisa"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6209,12 +6541,12 @@ 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 "Assentaments comptables"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "Mostra el llibre major amb una empresa per pàgina."
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6223,6 +6555,8 @@ 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 ""
+"Aquest informe és un anàlisi realitzat per una empresa. És un informe PDF  "
+"amb una línia per cada empresa que representa el saldo acumulat de l'haver."
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6230,6 +6564,8 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
+"Les anotacions seleccionades no tenen cap moviment comptable en estat "
+"esborrany"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6261,17 +6597,19 @@ msgstr "Tots els assentaments"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Error: La UdM per defecte i la UdM de compra han d'estar en la mateixa "
+"categoria."
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Seleccioneu diari"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "La moneda actual no està configurada correctament!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6281,10 +6619,11 @@ msgstr "Compte conciliació"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "Posició fiscal impostos"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6295,7 +6634,7 @@ msgstr "Llibre major"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "L'ordre de pagament ha estat enviada al banc."
 
 #. module: account
 #: view:account.balance.report:0
@@ -6305,6 +6644,9 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Aquest informe li permet imprimir o generar un pdf del seu balanç de sumes i "
+"saldos, permetent comprovar amb rapidesa el saldo de cadascuna dels seus "
+"comptes en un únic informe."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6312,6 +6654,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 ""
+"Marqueu aquesta opció si no esteu segur d'aquest assentament i desitgeu "
+"marcar-ho com 'Per ser revisat' per un expert comptable."
 
 #. module: account
 #: help:account.installer.modules,account_voucher:0
@@ -6319,6 +6663,9 @@ msgid ""
 "Account Voucher module includes all the basic requirements of Voucher "
 "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
 msgstr ""
+"El mòdul de rebuts (justificants) comptables inclou tots els requisits "
+"bàsics de justificants bancaris, de caixa, vendes, compres, despeses, "
+"contrapartides, etc... "
 
 #. module: account
 #: view:account.chart.template:0
@@ -6328,7 +6675,7 @@ msgstr "Propietats"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr ""
+msgstr "Compte del pla d'impostos"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6353,6 +6700,13 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
+"Podeu indicar l'any, mes i data en el nom del model utilitzant les següents "
+"etiquetes :\n"
+"\n"
+"%(year)s: Per especificar l'any\n"
+"%(month)s: Per especificar el mes\n"
+"%(date)s: Data actual\n"
+"Exemple: El meu model a %(date)s"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
@@ -6362,7 +6716,7 @@ msgstr "Comptes d'ingressos"
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Referència del document que ha generat aquest informe de factura."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -6391,7 +6745,7 @@ msgstr "Import desajustat"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "Vendes"
 
 #. module: account
 #: view:account.journal.column:0
@@ -6411,6 +6765,8 @@ msgstr "Realitzat"
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
 msgstr ""
+"Un extracte amb entrades manuals es converteix en un extracte en estat "
+"esborrany."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6422,12 +6778,18 @@ 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 vençuts d'empresa és un informe més detallat dels efectes a cobrar "
+"per intervals. En obrir l'informe, OpenERP pregunta pel nom de la companyia, "
+"el període fiscal, i la grandària de l'interval a analitzar (en dies). "
+"Després OpenERP calcula una taula del saldo deutor per període. Així que si "
+"sol·liciteu un interval de 30 dies, OpenERP genera un anàlisi de tots els "
+"deutors en el mes passat, últims dos mesos, etc. "
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Document d'origen"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -6442,12 +6804,12 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Assentaments no conciliats"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr ""
+msgstr "Conciliació d'extractes"
 
 #. module: account
 #: report:account.invoice:0
@@ -6457,7 +6819,7 @@ msgstr "Impostos:"
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "Per als impostos de tipus percentual, introduïu valors entre 0-1%."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6467,13 +6829,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 assentament recurrent és un assentament comptable que ocurreix de forma "
+"recurrent des d'una determinada data. Per exemple la signatura d'un "
+"contracte o un acord amb un client o proveïdor. Amb la definició "
+"d'assentaments recurrents, podeu crear aquests assentaments per automatitzar "
+"les anotacions comptables en el sistema."
 
 #. 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 ""
+msgstr "UdM del producte"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6483,6 +6850,11 @@ 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 registre de caixa li permet gestionar els assentaments de caixa en els "
+"diaris de caixa. Aquesta funcionalitat proveeix d'una forma fàcil de "
+"realitzar el seguiment dels pagaments de caixa a diari. Podeu introduir les "
+"monedes que té en la seva caixa i després registrar els assentaments quan "
+"entren o surten diners de la caixa."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -6506,7 +6878,7 @@ msgstr "Longitud del període (dies)"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Volum mensual"
 
 #. module: account
 #: view:account.move:0
@@ -6518,12 +6890,18 @@ msgstr "Línies analítiques"
 #: 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 "
+"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 ""
+"El pla de comptes normals té una estructura predefinida pels requisits "
+"legals del país. L'estructura del pla de comptes analítics hauria de "
+"reflectir les necessitats del seu negoci de cara a l'anàlisi de costos i "
+"ingressos. En general, s'estructuren per contractes, projectes, productes o "
+"departaments. La majoria de les operacions d'OpenERP (factures, fulls de "
+"servei, despeses, etc) generen assentaments analítics en el compte associat."
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -6538,6 +6916,8 @@ msgid ""
 "Can not find account chart for this company in invoice line account, Please "
 "Create account."
 msgstr ""
+"No s'ha trobat un pla comptable per a aquesta companyia en el compte de la "
+"línia de factura. Creeu un compte."
 
 #. module: account
 #: view:account.tax.template:0
@@ -6547,7 +6927,7 @@ msgstr "Plantilla d'impost"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Esteu segur que voleu obrir els assentaments de diari?"
 
 #. module: account
 #: view:account.state.open:0
@@ -6576,7 +6956,7 @@ msgstr "Extracte"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Actua com un compte per defecte per la quantitat del deure"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6602,6 +6982,26 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"Mòdul financer i comptable que cobreix:\n"
+"    Comptabilitat general\n"
+"    Comptabilitat analítica / de costos\n"
+"    Gestió de tercers\n"
+"    Gestió d'impostos\n"
+"    Pressupostos\n"
+"    Facturació de clients i proveïdors\n"
+"    Extractes bancaris\n"
+"    Conciliació per tercer\n"
+"    Crea un taulell per a comptables que inclou:\n"
+"    * Llista de pressupostos sense facturar\n"
+"    * Gràfic de comptes vençuts a cobrar\n"
+"    * Gràfic d'efectes a cobrar\n"
+"\n"
+"Els processos, com el manteniment del llibre major es realitza a través dels "
+"diaris financers definits\n"
+"(els assentaments s'agrupen per diari) per a un exercici fiscal determinat; "
+"i per la preparació de rebuts\n"
+"existeix un mòdul anomenat account_voucher.\n"
+"    "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -6609,6 +7009,9 @@ 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 ""
+"Podeu cercar un assentament comptable en concret a través d'informació útil. "
+"Per cercar assentaments comptables, obriu un diari i seleccioneu una "
+"anotació."
 
 #. module: account
 #: report:account.invoice:0
@@ -6627,7 +7030,7 @@ msgstr "Import total que aquest client li deu."
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.secuència"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -6644,12 +7047,12 @@ msgstr "D'acord"
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Empresa desconeguda"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo d'obertura"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -6665,7 +7068,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr ""
+msgstr "Tancat el"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
@@ -6675,12 +7078,12 @@ msgstr "Línia d'extracte bancari"
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Impost de compra per defecte"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6693,6 +7096,9 @@ msgid ""
 "Bank Account Number, Company bank account if Invoice is customer or supplier "
 "refund, otherwise Partner bank account number."
 msgstr ""
+"Número de compte bancari, compte bancari de la companyia si la factura és  "
+"de client o un abonament proveïdor, en cas contrari número de compte bancari "
+"de l'empresa."
 
 #. module: account
 #: help:account.tax,domain:0
@@ -6710,6 +7116,7 @@ msgstr ""
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
+"Hauríeu d'haver seleccionat períodes que pertanyin a la mateixa companyia"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -6729,12 +7136,12 @@ msgstr "Informe"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "El codi del diari ha de ser únic per companyia!"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr ""
+msgstr "Tancament de caixa"
 
 #. module: account
 #: view:account.journal:0
@@ -6754,6 +7161,9 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"Aquest camp mostra la següent empresa que serà triada automàticament pel "
+"sistema, per passar pel procés de conciliació, basant-se en l'últim dia que "
+"ha estat conciliada."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -6769,7 +7179,7 @@ msgstr "Domini"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Utilitza el model"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -6779,6 +7189,11 @@ 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 ""
+"Aquesta vista és utilitzada pels comptables per registrar assentaments "
+"massivament en OpenERP. Si voleu registrar una factura de proveïdor, "
+"comenceu introduint l'anotació del compte de despeses. OpenERP li proposarà "
+"automàticament l'impost associat a aquest compte, i el \"compte a pagar\" de "
+"contrapartida."
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -6787,6 +7202,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), Which is calculated from "
 "Profit & Loss Report"
 msgstr ""
+"Aquest compte s'utilitza per transferir les Pèrdues/Guanys (si és un Guany: "
+"l'import serà afegit, Pèrdua: l'mport serà reduït), que es calcula en "
+"l'informe de Pèrdues i Guanys."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -6813,17 +7231,17 @@ msgstr "Signe en informes"
 #: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
-msgstr ""
+msgstr "No podeu tenir dos registres oberts per al mateix diari"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month= -1"
-msgstr ""
+msgstr "  dia del mes= -1"
 
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursius."
 
 #. module: account
 #: help:account.journal,type:0
@@ -6835,6 +7253,13 @@ msgid ""
 "Situation' to be used at the time of new fiscal year creation or end of year "
 "entries generation."
 msgstr ""
+"Seleccioneu 'Vendes' per al diari de vendes que serà utilitzat quan es "
+"creuïn factures. Seleccioneu 'Compres' per al diari a utilitzar quan "
+"s'aprovin les comandes de compra. Seleccioneu 'Efectiu' (Caixa) perquè "
+"s'utilitzi a l'hora de fer pagaments. Seleccioneu 'General' per a operacions "
+"miscel·lànies. Seleccioneu 'Situació obertura/tancament' per utilitzar-ho "
+"quan es crea un nou exercici fiscal o la generació del assentament de "
+"tancament."
 
 #. module: account
 #: report:account.invoice:0
@@ -6849,13 +7274,16 @@ msgid ""
 "Helps you generate reminder letters for unpaid invoices, including multiple "
 "levels of reminding and customized per-partner policies."
 msgstr ""
+"Li ajuda a generar cartes recordatòries per a les factures pendents de "
+"pagament, incloent múltiples nivells de recordatori i polítiques "
+"personalitzades per 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 ""
+msgstr "desquadrat"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -6892,6 +7320,8 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"Aquest camp s'utilitza per a assentaments a pagar i a cobrar. Podeu "
+"introduir la data límit per al pagament d'aquesta línia."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1271
@@ -6910,7 +7340,7 @@ msgstr "Diari de vendes"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr ""
+msgstr "Assentaments oberts!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -6932,7 +7362,7 @@ msgstr "Propietats de venda"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Conciliació manual"
 
 #. module: account
 #: report:account.overdue:0
@@ -6955,7 +7385,7 @@ msgstr "Exercici fiscal a tancar"
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "Cancela les factures seleccionades"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -6964,7 +7394,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: account
 #: view:account.account:0
@@ -6992,7 +7422,7 @@ msgstr "Codi"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "Publica assentaments de diari d'un diari"
 
 #. module: account
 #: view:product.product:0
@@ -7016,7 +7446,7 @@ msgstr "Compte destí"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Pagament de factures"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7034,7 +7464,7 @@ msgstr "Seqüència"
 #. module: account
 #: model:ir.model,name:account.model_account_bs_report
 msgid "Account Balance Sheet Report"
-msgstr ""
+msgstr "Informe de balanç de situació"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -7054,17 +7484,17 @@ msgstr "Sí"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr ""
+msgstr "Vendes per tipus de compte"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Enllaç als assentaments generats automàticament."
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensualment"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7075,21 +7505,26 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
+"Aquí podeu personalitzar la vista d'un diari existent o crear una nova "
+"vista. Les vistes de diaris determinen la forma en la qual podeu registrar "
+"assentaments en els diaris. Seleccioneu els camps que desitgeu que apareguin "
+"en un diari i determineu la seqüència en què apareixen. Després podeu crear "
+"un diari nou i associar-li una vista."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 14"
-msgstr ""
+msgstr "  número de dies: 14"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Dies    "
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Progrés"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7100,7 +7535,7 @@ msgstr "Pare"
 #. module: account
 #: field:account.installer.modules,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Plans analítics múltiples"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -7116,7 +7551,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Informes legals"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -7137,7 +7572,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "Línia de caixa"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7152,7 +7587,7 @@ msgstr "Llibre major d'empresa"
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Year :"
-msgstr ""
+msgstr "Any:"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -7178,13 +7613,13 @@ msgstr "Atenció!"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Estat de línia moviment"
 
 #. 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 ""
+msgstr "Conciliar línia moviment"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7195,13 +7630,14 @@ msgstr "Calcula assentaments periòdics"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Import (en paraules):"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7223,7 +7659,7 @@ msgstr "Empresa"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Seleccioneu una moneda per aplicar en la factura."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:100
@@ -7235,7 +7671,7 @@ msgstr "No es pot %s factura esborrany/proforma/cancel.lada."
 #: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "No hi ha línies de factura!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7263,6 +7699,8 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Seleccioneu l'exercici fiscal en que desitgeu eliminar assentaments del seu "
+"diari de final d'exercici."
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7284,17 +7722,17 @@ msgstr "Mètode tancament"
 #: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "La factura '%s' està pagada."
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Assentament automàtic"
 
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Error! No podeu crear codis d'impostos recursius."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7316,6 +7754,8 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"Quan es creen els períodes mensuals l'estat és 'Esborrany'. Al final del "
+"període mensual està en estat 'Realitzat'."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -7358,19 +7798,19 @@ msgstr "Informació addicional"
 #. module: account
 #: view:account.installer:0
 msgid "Bank and Cash Accounts"
-msgstr ""
+msgstr "Comptes de caixa i banc"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Total residual"
 
 #. 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 ""
+msgstr "L'estat de la factura és Oberta"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7379,11 +7819,15 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"El pla d'impostos s'utilitza per generar els informes periòdics d'impostos. "
+"Veurà els impostos amb codis relatius als requisits legals d'acord al seu "
+"país."
 
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
 msgstr ""
+"Afegeix funcionalitats comptables extres a les que ja té instal·lades."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7396,12 +7840,12 @@ msgstr "Cost comptable"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Cod. diari/Nom mov."
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -7413,7 +7857,7 @@ msgstr "Escolliu l'exercici fiscal"
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Diari d'abonament de compres"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -7432,11 +7876,13 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Modifica factura: Cancel·la la factura actual i crea una nova còpia "
+"preparada per editar."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and Financial Management"
-msgstr ""
+msgstr "Gestió comptable i financera"
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -7457,6 +7903,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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íode"
@@ -7469,7 +7928,7 @@ msgstr "Base:"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Informes genèrics"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -7504,7 +7963,7 @@ msgstr "Plantilles de posicions fiscals"
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr ""
+msgstr "Tipus intern"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -7519,6 +7978,10 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
+"Amb les factures rectficatives (abonaments) a clients podeu gestionar les "
+"devolucions dels seus clients. Una factura rectificativa és un document que "
+"abona una factura completa o parcialment. Podeu generar fàcilment factures "
+"rectificatives i conciliar-les directament des del formulari de factura."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -7530,6 +7993,13 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Aquest menú imprimeix una declaració d'IVA basada en factures o pagaments. "
+"Podeu seleccionar un o diversos períodes de l'exercici fiscal. La informació "
+"necessària per a la declaració d'impostos és generada per OpenERP a partir "
+"de les factures (o pagaments, en alguns països). Aquesta informació "
+"s'actualitza en temps real; la qual cosa és molt útil perquè li permet "
+"previsualizar en qualsevol moment els impostos a pagar al principi i al "
+"final del mes o trimestre."
 
 #. module: account
 #: report:account.invoice:0
@@ -7541,19 +8011,11 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Divisa de la companyia"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other: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 ""
+msgstr "Pagament"
 
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
@@ -7562,6 +8024,9 @@ msgid ""
 "added, Loss: Amount will be duducted), which is calculated from Profilt & "
 "Loss Report"
 msgstr ""
+"Aquest compte s'utilitza per transferir pèrdues/guanys (Guany: L'import serà "
+"afegit, Pèrdua: L'import serà deduït), que es calcula en l'informe de "
+"pèrdues i guanys."
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -7569,6 +8034,8 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Podeu marcar aquesta opció per indicar aquest assentament com un litigi amb "
+"l'empresa associada."
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -7579,28 +8046,28 @@ msgstr "Conciliació parcial"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Balanç analític invertit"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Informe comú"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Importació automàtica de l'extracte bancari"
 
 #. 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 "Vistes de diari"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Concilia moviments banc"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -7617,7 +8084,7 @@ msgstr "No es pot crear un assentament de factura en un compte centralitzat"
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "Categoria Balanç / PiG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7642,12 +8109,12 @@ msgstr "Compte a cobrar"
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox Balance"
-msgstr ""
+msgstr "Saldo de caixa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Tanca l'estat del exercici fiscal"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -7660,8 +8127,14 @@ msgstr "Diari reintegrament"
 #: report:account.central.journal: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
 msgid "Filter By"
-msgstr ""
+msgstr "Filtra per"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -7671,13 +8144,17 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"Amb les factures de client podeu crear i gestionar les factures de venda "
+"emeses als seus clients. OpenERP pot generar automàticament factures "
+"esborrany des de les comandes o des d'albarans. Només haureu de confirmar-"
+"les abans de ser enviades als seus clients."
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "Anàlisi de la companyia"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -7707,21 +8184,22 @@ msgstr "Diari de compres"
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
 msgstr ""
+"Factura rectficativa: Crea la factura d'abonament, preparada per editar-la."
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
 
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Imprimeix declaració d'impostots"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Línia de model del assentament"
 
 #. module: account
 #: view:account.invoice:0
@@ -7736,13 +8214,13 @@ msgstr "Data venciment"
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Proveïdors"
 
 #. module: account
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on centralized journal"
-msgstr ""
+msgstr "No podeu crear més d'un apunt per període a un diari centralitzat."
 
 #. module: account
 #: view:account.journal:0
@@ -7760,16 +8238,18 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"L'import residual d'una anotació a cobrar o a pagar expressat en la moneda "
+"de la companyia."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: balance"
-msgstr ""
+msgstr "  valoració: saldo"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Estadístiques"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -7780,17 +8260,17 @@ msgstr "Des de"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Tancament del exercici fiscal"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "El codi del compte ha de ser únic per companyia!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Factures impagades"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -7801,7 +8281,7 @@ msgstr "Import deure"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "Tresoreria"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7824,12 +8304,12 @@ msgstr "Comptes permeses (buit per cap control)"
 #: 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 "Pla de comptes analítics"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Varis"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -7840,7 +8320,7 @@ msgstr "Import total que heu de pagar a aquest proveïdor."
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Costos analítics"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -7863,6 +8343,8 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"L'import del rebut ha de ser del mateix import que el de la línia del "
+"extracte"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1131
@@ -7874,13 +8356,13 @@ msgstr "Compte incorrecte!"
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Deixar-ho buit per obrir tots els exercicis fiscals."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "El moviment comptable (%s) per a centralització ha estat confirmat!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -7900,6 +8382,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -7923,11 +8406,14 @@ msgstr "Divisa"
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
 msgstr ""
+"Indiqueu l'ordre de seqüència quan es mostra una llista de línies d'extracte "
+"bancari."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
 msgstr ""
+"El comptable valida els assentaments comptables provinents de la factura."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -7940,6 +8426,13 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
+"Defineix l'exercici fiscal de la seva companyia d'acord a les seves "
+"necessitats. Un exercici fiscal és un període al final d'aquest es tanquen "
+"els comptes (normalment 12 mesos). L'exercici fiscal, normalment, és "
+"referencia amb l'any en el que acaba. Per exemple, si l'exercici fiscal "
+"d'una companyia acaba el 30 de novembre de 2013, llavors tot el que hi hagi "
+"entre l'1 de desembre de 2012 i el 30 de novembre de 2013 es referencia com "
+"EF2013. No esteu obligats a seguir l'any del calendari real."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -7963,6 +8456,16 @@ msgid ""
 "* The 'Paid' state is set automatically when invoice is paid.            \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * L'estat 'Esborrany' s'utilitza quan un usuari està introduint una nova "
+"factura sense confirmar.             \n"
+"* L'estat 'Pro-forma' s'utilitza quan la factura és una Pro-forma sense "
+"número de factura.             \n"
+"* L'estat 'Obert' s'utilitza quan l'usuari confirma una factura; es genera "
+"automàticament un número de factura. Està en estat obert mentre l'usuari no "
+"paga la factura.             \n"
+"* L'estat 'Pagat' s'estableix automàticament quan es paga la factura.        "
+"     \n"
+"* L'estat 'Cancel·lat' s'utilitza quan l'usuari cancel·la la factura."
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -7972,19 +8475,19 @@ msgstr "Força període"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Imprimeix balanç comptable de l'empresa"
 
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contractes"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 msgid "unknown"
-msgstr ""
+msgstr "Desconegut"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -7994,7 +8497,7 @@ msgstr "Diari assentaments d'obertura"
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Factures en esborrany són comprovades, validades i impreses."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8003,6 +8506,9 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
+"Aquest compte s'utilitza per transferir les Pèrdues/Guanys (si és un Guany: "
+"Import serà afegit, Pèrdua: Import serà deduït), que es calcula en l'informe "
+"de Pèrdues i Guanys."
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -8012,7 +8518,7 @@ msgstr "Tipus referència"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for period"
-msgstr ""
+msgstr "Resum de costos per període"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8027,7 +8533,7 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Calculat per codi Python"
 
 #. module: account
 #: field:account.analytic.journal,code:0
@@ -8041,13 +8547,16 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Podeu indicar aquí el coeficient que s'utilitzarà quan es consolidi l'import "
+"d'aquest codi dins del seu pare. Per exemple, indiqueu 1/-1 si desitgeu "
+"sumar/restar l'import."
 
 #. 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 ""
+msgstr "Import residual"
 
 #. module: account
 #: field:account.invoice,move_lines:0
@@ -8078,7 +8587,7 @@ msgstr "Període des de"
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Diari d'abonament de vendes"
 
 #. module: account
 #: code:addons/account/account.py:927
@@ -8087,6 +8596,8 @@ msgid ""
 "You cannot modify company of this period as its related record exist in "
 "Entry Lines"
 msgstr ""
+"No podeu modificar la companyia d'aquest període perquè ja hi ha anotacions "
+"en aquest període."
 
 #. module: account
 #: view:account.move:0
@@ -8098,17 +8609,17 @@ msgstr "Informació"
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Pagament registrat"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Tancament d'estats d'exercicis i períodes fiscals"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Informació del producte"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8127,13 +8638,13 @@ msgstr "Crea factura"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Impost de la compra (%)"
 
 #. module: account
 #: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Creeu algunes línies de factura"
 
 #. module: account
 #: report:account.overdue:0
@@ -8143,14 +8654,14 @@ msgstr "Estimat Sr./Sra.,"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Configureu l'aplicació de comptabilitat"
 
 #. module: account
 #: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8158,6 +8669,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
+"Els costos analítics (fulls de serveis, alguns productes comprats, ...) "
+"provenen dels comptes analítics. Aquests generen factures esborrany."
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -8167,6 +8680,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Estableix la vista utilitzada quan s'escriuen o consulten assentaments en "
+"aquest diari. La vista li indica a OpenERP quins camps han de ser visibles, "
+"requerits o de només lectura, i en quin ordre. Podeu crear la seva pròpia "
+"vista en cada diari per introduir anotacions més ràpid."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8177,26 +8694,31 @@ msgstr "Fi de període"
 #. module: account
 #: field:account.installer.modules,account_followup:0
 msgid "Followups Management"
-msgstr ""
+msgstr "Gestió de seguiments"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
-msgstr ""
+msgstr "Període inicial"
 
 #. module: account
 #: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
-msgstr ""
+msgstr "No es pot localitzar el codi pare per a la plantilla de comptes!"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
@@ -8228,6 +8750,7 @@ msgstr "Total haver"
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
+"El comptable valida els assentaments comptables provinents de la factura. "
 
 #. module: account
 #: code:addons/account/invoice.py:1008
@@ -8247,7 +8770,7 @@ msgstr "Atentament,"
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Impagada"
 
 #. module: account
 #: report:account.overdue:0
@@ -8257,13 +8780,13 @@ msgstr "Document: Estat comptable del client"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "La moneda actual no està configurada correctament!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8273,21 +8796,26 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"Amb factures rectificatives de proveïdor podeu gestionar les factures "
+"d'abonament que rebi dels seus proveïdors. Una factura rectificativa és un "
+"document que abona una factura total o parcialment. Podeu generar fàcilment "
+"factures rectificatives i conciliar-les directament des del formulari de "
+"factura."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Comptes a cobrar"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Particulars"
-msgstr ""
+msgstr "Particulars"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Income Accounts)"
-msgstr ""
+msgstr "Pèrdua i guanys (comptes d'ingressos)"
 
 #. module: account
 #: view:account.tax:0
@@ -8308,7 +8836,12 @@ msgstr "Deixar buit pel compte d'ingressos"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8323,12 +8856,21 @@ msgstr "Saldo pendent"
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Introduït manualment o automàticament en el sistema"
 
 #. 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 ""
+msgstr "Mostra compte"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8338,12 +8880,12 @@ msgstr "("
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify"
-msgstr ""
+msgstr "Modifica"
 
 #. module: account
 #: view:account.account.type:0
 msgid "Closing Method"
-msgstr ""
+msgstr "Mètode de tancament"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_partner_balance
@@ -8351,6 +8893,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
+"Aquest informe és l'anàlisi per l'empresa. És un informe PDF que conté una "
+"línia per empresa representant el saldo de crèdit acumulatiu."
 
 #. module: account
 #: selection:account.account,type:0
@@ -8364,7 +8908,7 @@ msgstr "A pagar"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "Aquest any"
 
 #. module: account
 #: view:board.board:0
@@ -8386,12 +8930,19 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Aquesta vista és utilitzada pels comptables per registrar assentaments "
+"massivament en OpenERP. Si voleu registrar una factura de client, "
+"seleccioneu el diari i el període en la barra d'eines de cerca. Després, "
+"comenceu introduint l'anotació del compte d'ingressos. OpenERP li proposarà "
+"automàticament l'impost associat a aquest compte, i el \"compte 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 es pot eliminar extracte/s bancari/s que ja estigui/n confirmat/s!"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -8408,6 +8959,7 @@ msgstr "Saldo per tipus de compte"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
 msgstr ""
+"Els assentaments comptables són la primera entrada de la conciliació."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8419,11 +8971,17 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"Aquí podeu definir un període fiscal, un interval de temps dins de "
+"l'exercici fiscal de la seva companyia. Un període comptable típicament és "
+"un mes o un trimestre. Normalment, correspon als períodes de la declaració "
+"d'impostos. Creeu i gestioneu períodes aquí i decideix quin període s'haurà "
+"de tancar o deixar obert depenent de les activitats de la seva companyia en "
+"un període específic."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "Signatura del receptor"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8431,13 +8989,13 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Filtres per"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Entrada manual"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8456,7 +9014,7 @@ msgstr "No es pot canviar l'impost, ha d'eliminar i recrear les línies!"
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "Nº compte"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8468,6 +9026,7 @@ msgstr "Extractes Bancaris"
 msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
+"Crea una compte, amb la plantilla seleccionada, sota el pare existent."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -8492,7 +9051,7 @@ msgstr "Conciliació de transaccions"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Informe comú"
 
 #. module: account
 #: view:account.account:0
@@ -8507,13 +9066,15 @@ msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
+"El diari ha de tenir una contrapartida centralitzada sense l'opció d'ometre "
+"l'estat esborrany marcat!"
 
 #. 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 ""
+msgstr "Assentaments de pagament"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8522,11 +9083,11 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Pla comptable"
 
 #. module: account
@@ -8537,20 +9098,25 @@ msgstr "Assentament periòdic"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Balanç del saldo analític"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
-msgstr ""
+msgstr "Període final"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8568,13 +9134,13 @@ msgstr ""
 #: 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 ""
+msgid "Chart of Accounts"
+msgstr "Pla comptable"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Data de venciment"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8663,6 +9229,15 @@ 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 període és una termini de temps fiscal durant la qual s'han de registrar "
+"en assentaments, les activitats relacionades amb la comptabilitat. "
+"Normalment, és un període mensual però, depenent del país i les necessitats "
+"de la seva companyia, podríeu utilitzar també períodes trimestrals (per "
+"exemple en Espanya les PIMES habitualment utilitzen períodes trimestrals). "
+"Tancar un període impedeix registrar nous assentaments, qualsevol nou "
+"assentament haurà d'anotar-se en el següent període obert. Tanca un període "
+"quan no tingueu que escriure nous assentaments i desitgeu bloquejar aquest "
+"període per motius relacionats amb el càlcul d'impostos."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8673,12 +9248,12 @@ msgstr "Pendent"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Des de comptes analítics"
 
 #. module: account
 #: field:account.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Gestió dels pagaments a proveïdors"
 
 #. module: account
 #: field:account.period,name:0
@@ -8703,7 +9278,7 @@ msgstr "Actiu"
 #: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "S'ha produït un error desconegut"
 
 #. module: account
 #: code:addons/account/account.py:1167
@@ -8713,6 +9288,10 @@ msgid ""
 "Make sure you have configured Payment Term properly !\n"
 "It should contain atleast one Payment Term Line with type \"Balance\" !"
 msgstr ""
+"No es pot confirmar un assentament desquadrat!\n"
+"Assegureu-vos d'haver configurat el termini de pagament correctament!\n"
+"Hauria de tenir, almenys, una línia de termini de pagament de tipus "
+"\"Saldo\"!"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -8738,7 +9317,7 @@ msgstr "Divisa secundària"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Valida moviment comptable"
 
 #. module: account
 #: field:account.account,credit:0
@@ -8751,6 +9330,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8771,22 +9351,25 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Podeu seleccionar aquí el diari a utilitzar per a la factura rectificativa "
+"(abonament) que es crearà. Si deixeu aquest camp buit, s'utilitzarà el "
+"mateix diari que la factura actual."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Through :"
-msgstr ""
+msgstr "A través de:"
 
 #. module: account
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr ""
+msgstr "Diaris generals"
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Model d'assentament"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -8796,6 +9379,9 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"La data de venciment, de l'anotació, generada per la línia del model '%s' es "
+"basa en el termini de pagament de l'empresa.\n"
+"Si us plau, definiu l'empresa en ell!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -8832,6 +9418,18 @@ msgstr "General"
 #: selection:account.pl.report,filter: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
@@ -8846,7 +9444,7 @@ msgstr "Períodes"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "Tipus de canvi"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -8860,12 +9458,12 @@ msgstr "Per percentatges introduïu valors % entre 0-1."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Obre per a conciliació"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -8878,17 +9476,21 @@ msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
+"Factura rectficativa (abonament) basada en aquest tipus. No podeu modificar "
+"i cancel·lar si la factura ja està conciliada."
 
 #. module: account
 #: help:account.installer.modules,account_analytic_plans:0
 msgid ""
 "Allows invoice lines to impact multiple analytic accounts simultaneously."
 msgstr ""
+"Permet a les línies de factura, impactar múltiples comptes analítics "
+"simultàniament."
 
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr ""
+msgstr "Impost de venda (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -8919,6 +9521,9 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"El procés de validació d'assentaments, també anomenat 'assentar', "
+"transfereix els imports del deure i del haver de l'anotació original a un "
+"llibre major."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8941,13 +9546,15 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Aquest informe li permet imprimir o generar un pdf del seu llibre major amb "
+"el detall de tots els seus diaris comptables."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Regular"
 
 #. module: account
 #: view:account.account:0
@@ -8961,7 +9568,7 @@ msgstr "Tipus intern"
 #. module: account
 #: report:account.move.voucher:0
 msgid "State:"
-msgstr ""
+msgstr "Estat:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -9041,15 +9648,12 @@ msgid "Tax Source"
 msgstr "Origen impost"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
-msgstr ""
+msgstr "Benefici net"
 
 #. module: account
 #: view:ir.sequence:0
@@ -9066,18 +9670,19 @@ msgstr "Aquest és un model per assentaments comptable recurrent"
 #, 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: account
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "LLIBRE"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: 0.02"
-msgstr ""
+msgstr "  import valor: 0.02"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9105,7 +9710,7 @@ msgstr "Total"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "Diari: Tots"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9140,17 +9745,17 @@ msgstr "Companyia"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Defineix assentaments recurrents"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Data de venciment"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr ""
+msgstr "Total transicions de caixa."
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -9159,6 +9764,9 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"Aquesta xifra representa el número total d'empreses que avui han passat a "
+"través del procés de conciliació. L'empresa actual es comptabilitza com que "
+"ja s'ha processat."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9168,12 +9776,12 @@ msgstr "Crea períodes mensuals"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Signe per a pare"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Informe de sumes i saldos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9185,6 +9793,8 @@ msgstr "Extractes bancaris esborrany"
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Creació manual o automàtica dels assentaments de pagament d'acord amb els "
+"extractes"
 
 #. module: account
 #: view:account.invoice:0
@@ -9209,7 +9819,7 @@ msgstr "Línies de factura"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Període final"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
@@ -9231,11 +9841,13 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
+"Aquest compte s'utilitzarà per valorar l'estoc sortint per a la categoria de "
+"producte actual utilitzant el preu de cost."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "On Account of :"
-msgstr ""
+msgstr "En compte de:"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9246,17 +9858,17 @@ msgstr "Moviment de desajust"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "L'estat de la factura és Realitzada"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Informe de les vendes per compte"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Comptes de posició fiscal"
 
 #. module: account
 #: report:account.invoice:0
@@ -9279,6 +9891,7 @@ msgstr "Factura de proveïdor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9300,7 +9913,7 @@ msgstr "Línies de factura"
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Error ! No es poden crear plantilles de comptes recursives."
 
 #. module: account
 #: constraint:account.account.template:0
@@ -9309,11 +9922,14 @@ msgid ""
 "Make sure if the account template has parent then it should be type "
 "\"View\"! "
 msgstr ""
+"No podeu crear una plantilla de compte!\n"
+"Assegureu-vos  de que la plantilla del compte si té un pare, que sigui de "
+"tipus \"Vista\"! "
 
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Recurrent"
 
 #. module: account
 #: code:addons/account/account_move_line.py:805
@@ -9356,6 +9972,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Amb moviments"
 
@@ -9381,7 +10007,7 @@ msgstr "Manualment"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9392,7 +10018,7 @@ msgstr "Imprimeix diaris analítics"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Compte.fi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -9403,7 +10029,7 @@ msgstr "A cobrar anteriors"
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "Aplicació"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -9421,16 +10047,18 @@ msgstr "L'altra divisa opcional si és un assentament multi-divisa."
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
+"Importació de l'extracte en el sistema des d'una factura de proveïdor o "
+"client"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "Compte pare"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9442,11 +10070,18 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
+"Creeu i gestioneu els períodes de la seva companyia des d'aquest menú. "
+"S'utilitza un diari per registrar transaccions de totes les dades comptables "
+"relatives al dia a dia del negoci de la companyia utilitzant el sistema "
+"comptable de doble entrada. Depenent de la naturalesa de les seves "
+"activitats i el número de transaccions diàries, una companyia pot tenir "
+"diversos tipus de diaris especialitzats com un diari de caixa, un diari de "
+"compra, un diari de venda, ..."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Compte del pla analític"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -9456,14 +10091,14 @@ msgstr "Import degut restant."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr ""
+msgstr "Informes estadístics"
 
 #. module: account
 #: field:account.installer,progress:0
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -9474,7 +10109,7 @@ msgstr "Mapa de relacions de comptes"
 #: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "La factura '%s' està esperant per ser validada."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9483,12 +10118,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer_modules
 msgid "account.installer.modules"
-msgstr ""
+msgstr "compte.instal·lador.mòduls"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -9500,7 +10135,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "La data del seu assentament no està en el període definit!"
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -9516,7 +10151,7 @@ msgstr "Diari general"
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Cerca factura"
 
 #. module: account
 #: report:account.invoice:0
@@ -9550,12 +10185,12 @@ msgstr "Informació general"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Documents comptables"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Comptabilitat. Validar línies moviment"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9566,17 +10201,17 @@ msgstr "Cost comptable (només quantitats)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "L'estat de la factura és Realitzada."
 
 #. 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 "Tan aviat com la conciliació es realitzi, la factura estarà pagada."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Cerca plantilles de comptes"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -9591,7 +10226,7 @@ msgstr "Pare dret"
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "account.afegeixplantilla.assistent"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -9602,7 +10237,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "D'empreses"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -9617,6 +10252,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el diari analític sense "
+"eliminar-l'ho."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -9636,7 +10273,7 @@ msgstr "Model d'assentament"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9651,7 +10288,7 @@ msgstr "Compte bancari"
 #: 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 "Diari central comptable"
 
 #. module: account
 #: report:account.overdue:0
@@ -9666,7 +10303,7 @@ msgstr "Futur"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Cerca línies assentaments"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9683,7 +10320,7 @@ msgstr "Normalment 1 o -1."
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Plantilla d'assignació de comptes fiscals"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
@@ -9693,7 +10330,7 @@ msgstr "Compte de despeses en plantilla producte"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Moneda de l'import"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
@@ -9718,6 +10355,13 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
+"Creeu i gestioneu els comptes que necessiteu per codificar el assentaments "
+"en els diaris. Un compte és part d'un pla de comptes que permet a la seva "
+"companyia registrar tot tipus de transaccions de crèdit i dèbit. Les "
+"companyies presenten els seus comptes anuals en dues parts principals: El "
+"balanç i el compte de pèrdues i guanys. Els comptes anuals d'una companyia "
+"són exigides per llei perquè contenen certa quantitat d'informació. Han de "
+"ser certificades per un auditor extern anualment."
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -9725,21 +10369,20 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+"L'import residual d'una anotació a cobrar o a pagar expressat en la seva "
+"moneda (pot ser diferent de la moneda de la companyia)."
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Deixar-ho buit per utilitzar el període de la data de validació."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "Actius"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Error! No es pot crear un compte recursiu."
-
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Si utilitza terminis de pagament, la data de venciment es calcularà "
-#~ "automàticament en la generació d'assentaments comptables. Si deixeu buits el "
-#~ "termini de pagament i la data de venciment, significa pagament directe."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Passiu"
 
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Factures de proveïdor sense pagar"
@@ -9811,18 +10454,6 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Conciliació del pagament"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Desc. %"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Si el pagament s'hagués realitzat després d'enviar aquest correu, no el "
-#~ "tingueu en compte. No dubteu en contactar amb el nostre departament de "
-#~ "comptabilitat."
-
 #~ msgid "Contra"
 #~ msgstr "Contra"
 
@@ -9858,9 +10489,6 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Diari de bons"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Factura analítica"
 
@@ -9994,9 +10622,6 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Tanca estats"
 
-#~ msgid "Crédit"
-#~ msgstr "Haver"
-
 #~ msgid "Income"
 #~ msgstr "Ingrés"
 
@@ -10135,10 +10760,6 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Factures de proveïdor esborrany"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Error de configuració!"
-
 #~ 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 "
@@ -10148,9 +10769,6 @@ msgstr ""
 #~ "impagades. Si us plau, preneu les mesures necessàries per realitzar el "
 #~ "pagament en els propers 8 dies."
 
-#~ msgid "Débit"
-#~ msgstr "Deure"
-
 #~ msgid "x Checks Journal"
 #~ msgstr "x Diari de xecs"
 
@@ -10222,9 +10840,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Vés"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID empresa"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nova factura de client"
 
@@ -10275,9 +10890,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Document"
 
-#~ msgid "Move name"
-#~ msgstr "Nom moviment"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Cancel·la factures seleccionades"
 
@@ -10287,9 +10899,6 @@ msgstr ""
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Factura proposada per ser comprovada, validada e impresa"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "By Date and Period"
 #~ msgstr "Per data i període"
 
@@ -10306,10 +10915,6 @@ msgstr ""
 #~ msgid "Statement encoding produces payment entries"
 #~ msgstr "Codificació d'extractes crea assentaments de pagament"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "El compte no està definit per ser conciliat!"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Informació addicional"
 
@@ -10351,9 +10956,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Paga i concilia"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldo a compte nou"
-
 #~ msgid "Entry Model"
 #~ msgstr "Model d'assentament"
 
@@ -10366,9 +10968,6 @@ msgstr ""
 #~ msgid "Entry encoding"
 #~ msgstr "Codificació extracte"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Període de desajust"
-
 #~ msgid ""
 #~ "Check this box if you want to print all entries when printing the General "
 #~ "Ledger, otherwise it will only print its balance."
@@ -10491,9 +11090,6 @@ msgstr ""
 #~ msgid "Unpaid Customer Invoices"
 #~ msgstr "Factures de client sense pagar"
 
-#~ msgid "Partner name"
-#~ msgstr "Nom empresa"
-
 #~ msgid "Journal/Payment Mode"
 #~ msgstr "Diari/Mode de pagament"
 
@@ -10521,6 +11117,9 @@ msgstr ""
 #~ msgid "Set starting and ending balance for control"
 #~ msgstr "Indica balanç inicial i final per a control"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "General Ledger -"
 #~ msgstr "Llibro major -"
 
@@ -10545,10 +11144,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Assentaments codificats per apunt"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "No podeu desactivar un compte que conté assentaments comptables."
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filtra per empreses"
 
@@ -10677,9 +11272,6 @@ msgstr ""
 #~ "Heu seleccionat apunts que no tenen cap assentament comptable en estat "
 #~ "esborrany"
 
-#~ msgid "All account entries"
-#~ msgstr "Tots els assentaments del compte"
-
 #~ msgid "Date Filter"
 #~ msgstr "Filtrat per data"
 
@@ -10823,23 +11415,12 @@ msgstr ""
 #~ msgid "Journal de vente"
 #~ msgstr "Diari de vendes"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "No es pot validar un assentament no quadrat!"
-
 #~ msgid "Fiscal Position Template Account Mapping"
 #~ msgstr "Mapa comptes plantilla posició fiscal"
 
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "Error: Número BVR no vàlid (checksum erroni)."
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "El compte bancari de l'empresa per pagar\n"
-#~ "Deixa buit per utilitzar el valor per defecte"
-
 #~ msgid "Journal d'extourne"
 #~ msgstr "Diari d'inversió"
 
@@ -10867,11 +11448,6 @@ msgstr ""
 #~ "Aquest compte s'utilitzarà en comptes del compte per defecte per valorar "
 #~ "l'estoc sortint pel producte actual."
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr ""
-#~ "L'exercici fiscal anterior no ha de tenir cap assentament a conciliar!"
-
 #~ msgid "Maximum Quantity"
 #~ msgstr "Quantitat màxima"
 
@@ -11182,165 +11758,19 @@ msgstr ""
 #~ msgid "Account Entry Lines"
 #~ msgstr "Línies assentament comptable"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Comptes analítics a tancar"
+#, python-format
+#~ msgid "Invoice "
+#~ msgstr "Factura "
 
-#~ msgid "Draft invoices"
-#~ msgstr "Factures esborrany"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balanç de situació (comptes d'actiu)"
 
-#~ msgid "Accounts to invoice"
-#~ msgstr "Comptes a facturar"
+#, python-format
+#~ msgid "is validated."
+#~ msgstr "està validada."
 
-#~ msgid "Costs to invoice"
-#~ msgstr "Costos a facturar"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Pla comptable"
 
-#~ msgid "Aged receivables"
-#~ msgstr "A cobrar anteriors"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Taulell per comptables"
-
-#~ msgid "My indicators"
-#~ msgstr "Els meus indicadors"
-
-#~ msgid "Aged income"
-#~ msgstr "Ingressos anteriors"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Mostra informació dèbit/crèdit"
-
-#~ msgid "All accounts"
-#~ msgstr "Tots els comptes"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Selecció d'entrades basada en"
-
-#~ msgid "Notification"
-#~ msgstr "Notificació"
-
-#~ msgid "Financial Period"
-#~ msgstr "Període financer"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Selecciona període(s)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Compara exercicis seleccionats en termes de"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Selecciona exercici(s) fiscal(s) (màxim 3 anys)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Selecciona compte de referència (per comparació %)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Saldo comptable-Compara exercicis"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "El mòdul de balanç de comptes és una funcionalitat afegida al mòdul de "
-#~ "gestió financera.\n"
-#~ "\n"
-#~ "    Aquest mòdul ofereix diverses opcions d'impressió de balanços.\n"
-#~ "\n"
-#~ "    1. Es pot comparar el balanç de diferents anys.\n"
-#~ "\n"
-#~ "    2. Podeu establir la comparació en import o percentual entre dos anys.\n"
-#~ "\n"
-#~ "    3. Podeu configurar el compte de referència per a la comparació "
-#~ "percentual per a anys en particular.\n"
-#~ "\n"
-#~ "    4. Podeu seleccionar períodes com una data real o períodes com a data de "
-#~ "creació.\n"
-#~ "\n"
-#~ "    5. Podeu imprimir l'informe escollit en format apaïsat.\n"
-#~ "    "
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Heu de seleccionar l'opció 'Horitzontal'. Marqueu-la."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Mostra informe en format horitzontal"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Mostra comparació en %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "No compara"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Mostra comptes"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Ha de seleccionar més de 3 exercicis en qualsevol cas."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Gestió comptable financera - Comparació de comptes"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr ""
-#~ "Pot seleccionar un màxim de 3 exercicis. Seleccioneu un altre vegada."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Heu seleccionat la opció 'Percentatge' amb més de 2 exercicis, però no "
-#~ "ha seleccionat format horitzontal."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Podríeu haver comès els següents errors. Corregiu-los e intenteu de nou."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Deixeu-lo buit per a comparar amb els seus pares"
-
-#~ msgid "Creation Date"
-#~ msgstr "Data creació"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. No heu seleccionat l'opció 'Percentatge', però heu seleccionat més de 2 "
-#~ "exercicis."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Pot haver seleccionat les opcions comparar amb més de 1 exercici amb "
-#~ "columnes crèdit/dèbit i opció %. Això pot ocasionar que hi hagin continguts "
-#~ "que s'imprimeixin fora del paper. Intenteu de nou."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Heu de seleccionar al menys un exercici fiscal. Intenteu de nou."
-
-#~ msgid "Customize Report"
-#~ msgstr "Informe personalitzat"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr ""
-#~ "Mòdul que afegeix nous informes basat en el mòdul comptable-financer."
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Informe comptable - Informe"
+#~ msgid "Balance:"
+#~ msgstr "Balanç:"
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index b5151f9ab0d..9e369a56f98 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -4,17 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-08-13 17:32+0000\n"
-"Last-Translator: Jan B. Krejčí <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-11-07 12:46+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: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account
@@ -31,10 +31,10 @@ msgstr "Ostatní nastavení"
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr ""
+msgstr "Není zadán konec roku knihy pro finanční rok"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +67,7 @@ msgid "Residual"
 msgstr "Zbytek"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Prosím nadefinujte číselnou řadu knihy faktur"
@@ -136,7 +136,7 @@ msgid "Accounting Entries-"
 msgstr "Účetní záznamy -"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Nemůžet smazat zaúčtované pohyby: \"%s\"!"
@@ -182,7 +182,7 @@ msgstr ""
 "jeho odebrání."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Varování!"
@@ -237,7 +237,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -271,7 +271,7 @@ msgstr ""
 "tomuto daňovému kódu žádné DPH"
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, 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)"
@@ -287,7 +287,7 @@ msgid "Belgian Reports"
 msgstr "Belgické výkazy"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, 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."
@@ -325,7 +325,7 @@ msgid "St."
 msgstr "Sv."
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Firma řádku faktury nesouhlasí s firmou faktury"
@@ -517,8 +517,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -584,7 +582,7 @@ msgid "Not reconciled transactions"
 msgstr "Nezlikvidované transakce"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Stav pokladny neodpovídá vypočtenému zůstatku!"
@@ -668,7 +666,7 @@ msgid "Tax Code Amount"
 msgstr "Částka kódu daně"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -701,8 +699,8 @@ msgid "Journal Period"
 msgstr "Období knihy"
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, 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,10 +758,10 @@ msgstr "Diagramy"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "Analitické položky dle řádku"
+msgstr "Analytické položky dle řádku"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Měnu můžete změnit pouze u Návrhových faktůr !"
@@ -798,12 +796,12 @@ msgstr "Odkaz na partnera pro tuto fakturu."
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Zrušení likvidace"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Analytický účet knihy"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
@@ -839,6 +837,7 @@ msgstr "dnů"
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
 msgstr ""
+"Pokud je zaškrtnuto, nový účtový rozvrh toto nebude obsahovat jako výchozí."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -847,6 +846,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Nelze %s faktury, která je již likvidována, u faktury by měla být nejprve "
+"zrušena likvidace. Můžete vrátit peníze pouze této faktury"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -864,12 +865,14 @@ msgid "Next Partner to reconcile"
 msgstr "Další partner k vyrovnání"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 ""
+"Nemůžete provést tuto úpravu na potvrzeném záznamu ! Prosíme berte na "
+"vědomí, že můžete změnit jen některé nedůležité pole !"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -882,7 +885,7 @@ msgstr "Průmerné zpoždění placení"
 #: 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 ""
+msgstr "Daňový rozvrh"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -891,7 +894,6 @@ msgstr "Vytvořit 3-měsíční období"
 
 #. module: account
 #: report:account.overdue:0
-#: report:account.aged_trial_balance:0
 msgid "Due"
 msgstr "Do"
 
@@ -934,12 +936,12 @@ msgstr "Rozšířené filtry..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Centralizovaná kniha"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Prodejní dobropis"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -983,19 +985,15 @@ msgstr "Položky modelu"
 #: field:account.journal,code:0
 #: report:account.partner.balance:0
 #: field:account.period,code:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
 msgid "Code"
 msgstr "Kód"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1076,6 +1074,7 @@ msgstr "Zisk & ztráty (Nákladové účty)"
 
 #. 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 "-"
@@ -1134,7 +1133,7 @@ msgstr "Zrušit faktury"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Nezlikvidované transakce"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1147,12 +1146,12 @@ msgstr "Kód daně"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Odchozí měnový poměr"
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "Přesun této řádky záznamu"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1169,7 +1168,7 @@ msgid "Entry Label"
 msgstr "Název položky"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, 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í !"
@@ -1307,8 +1306,8 @@ msgid "Journal Items Analysis"
 msgstr "Analýza položek deníku"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
-#: report:account.aged_trial_balance:0
 msgid "Partners"
 msgstr "Partneři"
 
@@ -1337,7 +1336,7 @@ msgid "Central Journal"
 msgstr "Centrální deník"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Nemůžete použít tento obecný účet pro tento deník !"
@@ -1349,6 +1348,16 @@ msgstr "Nemůžete použít tento obecný účet pro tento deník !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Se zůstatkem nerovným nule"
 
@@ -1390,7 +1399,7 @@ msgstr "# cifer"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Přeskočit stav 'Koncept' pro ruční záznamy"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1431,9 +1440,11 @@ msgstr ""
 msgid ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 msgstr ""
+"Příklad: při 14 čistých dnech 2 procenta, zbývající čístka při 30 dnech "
+"konce měsíce."
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1518,6 +1529,8 @@ msgstr "Hledat v bankovních výpisech"
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Nesprávná hodnota Dal nebo Má dáti v modelu (Dal + Má dáti musí být větší "
+"než \"0\")!"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1596,6 +1609,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Odopovědné"
@@ -1641,7 +1655,7 @@ msgstr "Roční součet"
 #. module: account
 #: model:ir.actions.report.xml,name:account.report_account_voucher_new
 msgid "Print Voucher"
-msgstr ""
+msgstr "Tisknout poukaz"
 
 #. module: account
 #: view:account.change.currency:0
@@ -1655,6 +1669,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Zobrazí účtový rozvrh na finanční rok vaší společnosti a filtruje podle "
+"období. Kliknutím na účet získáte celkový stromový pohled položek knihy na "
+"kód účtu."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -1662,10 +1679,10 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Chyba! Nemůžete definovat překrývající se finanční roky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Účet není definován pro likvidaci !"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -1678,6 +1695,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Pokud je aktivní pole nastaveno na Nepravda, umožní vám skrýt období knihy "
+"bez jeho odebrání."
 
 #. module: account
 #: view:res.partner:0
@@ -1695,15 +1714,15 @@ msgid "Receivables & Payables"
 msgstr "Pohledávky & Závazky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
-msgstr ""
+msgstr "Musíte poskytnout účet pro výpis záznamu !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Obecný výkaz účetní knihy"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1713,7 +1732,7 @@ msgstr "Všichni partneři"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Odk. :"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1728,13 +1747,13 @@ msgstr "Moje položyk"
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Odkaz zákazníka:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "U6ivatel %s nemá práva pro přístup k deníku %s !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1752,7 +1771,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "Nemůžete deaktivovat účet, který obsahuje účetní pohyby."
@@ -1760,7 +1779,7 @@ msgstr "Nemůžete deaktivovat účet, který obsahuje účetní pohyby."
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Částka Dal"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1768,7 +1787,7 @@ msgid "You can not create move line on closed account."
 msgstr "Nemůžete vytvořit pohybové řádky v uzavřeném účtu."
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1785,7 +1804,7 @@ msgstr "Účet rezerv a zisku/ztrát"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Chybná hodnota Má dáti nebo dal v účetním záznamu !"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1812,7 +1831,7 @@ msgstr "Položky dle řádku"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Kód A/c"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1908,7 +1927,7 @@ msgstr ""
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr ""
+msgstr "Přidává aktuální sloupec, pokud jměna je jiná než měna společnosti"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1916,6 +1935,8 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Pokud je Pravda, pak nepříjímat záznam pokud datum záznamu není v rozmezí "
+"období dat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
@@ -1932,7 +1953,7 @@ msgstr "Obrázek"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "Zrušeno"
 
 #. module: account
 #: view:account.invoice:0
@@ -2019,7 +2040,7 @@ msgstr "Tento D.rok"
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Daňový účtový rozvrh"
 
 #. module: account
 #: constraint:account.period:0
@@ -2045,7 +2066,7 @@ msgid " Journal"
 msgstr " Deník"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2066,7 +2087,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Hledat šablony účtové osnovy"
 
 #. module: account
@@ -2097,7 +2118,7 @@ msgid "Description"
 msgstr "Popis"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2117,7 +2138,7 @@ msgid "Income Account"
 msgstr "Účet příjmů"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2128,9 +2149,10 @@ msgid "Accounting Properties"
 msgstr "Vlastnoti účetnictví"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Položky řazené dle"
 
@@ -2152,12 +2174,16 @@ msgstr "Šablona výrobku"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2167,11 +2193,6 @@ msgstr "Šablona výrobku"
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 #: model:ir.model,name:account.model_account_fiscalyear
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
-#: report:account.aged_trial_balance:0
 msgid "Fiscal Year"
 msgstr "Účetní období"
 
@@ -2271,7 +2292,7 @@ msgid "Account Tax Code"
 msgstr "Daňový kód účtu"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2341,7 +2362,7 @@ msgid "Account Model Entries"
 msgstr "Položky modelu účtu"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2425,7 +2446,7 @@ msgid "Accounts"
 msgstr "Účty"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurační chyba!"
@@ -2437,12 +2458,13 @@ msgid "Average Price"
 msgstr "Průměrná cena"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Datum:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2454,7 +2476,7 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Označení"
 
 #. module: account
 #: view:account.tax:0
@@ -2476,7 +2498,7 @@ msgstr "Bankovní vyrovnání"
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Slev.(%)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -2589,16 +2611,16 @@ 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:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Pro deník není určena posloupnost !"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2640,16 +2662,18 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"Výpis zůstatku je neplatný !\n"
+"Zůstatek útrat (%.2f) je jiný než vypočtený. (%.2f)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Platební položky jsou druhý vstup pro vyrovnání."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Number:"
-msgstr ""
+msgstr "Číslo:"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -2703,7 +2727,7 @@ msgstr "použito v rámci likvidace výpisu, nemělo by se používat jinde"
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Částka základního kódu"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2726,6 +2750,8 @@ msgstr "Finanční účetnictví"
 #. 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
 msgid "Profit And Loss"
 msgstr "Zisk a ztráty"
 
@@ -2758,7 +2784,7 @@ msgid "Analytic Entries"
 msgstr "Analytická položky"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2880,10 +2906,10 @@ msgstr "Pohled"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNK%s"
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2922,7 +2948,7 @@ msgstr "Nadřazená účetní kniha účtu"
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Dává pořadí do sloupce knihy."
 
 #. module: account
 #: view:account.tax.template:0
@@ -2942,6 +2968,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 ""
+"Průvodce ověří všechny záznamy knihy určité knihy a období. Jakmile jsou "
+"záznamy ověřeny, nemůžete je již aktualizovat."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -2992,9 +3020,7 @@ msgstr "Nechejte prázdné pro použití výdajového účtu"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3008,6 +3034,17 @@ msgstr "Nechejte prázdné pro použití výdajového účtu"
 #: 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 "Deníky"
 
@@ -3053,7 +3090,7 @@ msgid "Starting Balance"
 msgstr "Počáteční zůstatek"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nebyl definován partner !"
@@ -3080,12 +3117,12 @@ msgstr "DPH:"
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr ""
+msgstr "Částka vyjádřena ve vztažené měně, pokud neodpovídá té společnosti."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Journal:"
-msgstr ""
+msgstr "Kniha:"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3095,6 +3132,7 @@ msgstr ""
 #: 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
@@ -3136,7 +3174,7 @@ msgstr "rok"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "Autorizovaný podpis"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3144,12 +3182,14 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"Všechny vybrané záznamy deníku budou ověřeny a poslané. To znamená, že "
+"nebudete schopni nadále měnit jejich účetní pole."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr ""
+msgstr "Nelze odstranit faktury, které jsou již otevřené a zaplacené !"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -3164,7 +3204,7 @@ msgstr "Přesuny"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: n.a"
-msgstr ""
+msgstr "  částka hodnoty: není"
 
 #. module: account
 #: view:account.chart:0
@@ -3190,7 +3230,7 @@ msgstr "Hledat pohyby"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr ""
+msgstr "Jméno daňového případu"
 
 #. module: account
 #: report:account.invoice:0
@@ -3205,9 +3245,11 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Vybrané faktury nemohou být zrušeny, protože jsou již ve stavu 'Zrušeno' "
+"nebo 'Dokončeno'!"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3264,7 +3306,7 @@ msgstr "Podrobnosti"
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "Vaše bankovní a hotovostní účty"
 
 #. module: account
 #: report:account.invoice:0
@@ -3276,6 +3318,16 @@ msgstr "DPH :"
 #: 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.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 "Chart of Accounts"
 msgstr "Grafy účtů"
 
@@ -3292,7 +3344,7 @@ msgstr "Centralizované protějšek"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Proces likvidace partner po partnerovi"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3303,6 +3355,7 @@ msgstr "2"
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
+"(Pokud nemáte vybraný Fiskální rok, budou vzaty všechny fiskální roky)"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3320,7 +3373,6 @@ 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
 #: view:account.move:0
@@ -3356,7 +3408,7 @@ msgstr "Nevyrovnaný"
 #: code:addons/account/wizard/account_fiscalyear_close.py:79
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr ""
+msgstr "Kniha musí mít výchozí účty Dal a Má dáti"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3364,7 +3416,7 @@ msgid "Chart of Accounts Template"
 msgstr "Šablona Účetní osnovy"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3373,18 +3425,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr ""
+msgstr "Některé položky byly již zlikvidovány !"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: 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 ""
+"Nemůžete ověřit záznamy knihy, pokud nejsou všechny položky ve stejném "
+"účtovém rozvrhu."
 
 #. module: account
 #: view:account.tax:0
@@ -3448,12 +3502,12 @@ msgstr "Množ."
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Jméno kontaktu adresy"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "Spor"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3481,6 +3535,8 @@ msgstr "Platební příkaz"
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
+"Zaškrtněte tuto volbu, pokud chcete, aby uživatel likvidoval záznanmy v "
+"tomto účtu."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3499,7 +3555,7 @@ msgid "Analytic Items"
 msgstr "Analytické položky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Nelze změnit daň !"
@@ -3510,14 +3566,14 @@ msgid "#Entries"
 msgstr "#Položky"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "Vybrali jste Měrnou jednotku, která není slučitelná s výrobkem."
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3629,7 +3685,7 @@ msgstr "Nastavit na koncept"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Opakující se řádky"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
@@ -3667,7 +3723,7 @@ msgstr "Průměrný kurz"
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(Faktura by měla být vyrovnánan, pokud ji chcete otevřít)"
 
 #. module: account
 #: field:account.aged.trial.balance,period_from:0
@@ -3706,7 +3762,7 @@ msgstr "Nastavení"
 #: 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 ""
+msgstr "30 den v měsíci"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
@@ -3715,11 +3771,10 @@ msgid "Analytic Balance"
 msgstr "Analytický zůstatek"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Čisté ztráty"
 
@@ -3734,7 +3789,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Hledat daňovou šablonu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -3782,6 +3837,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
 msgstr ""
+"Tento účet bude použit pro ovenění odchozích zásob pro aktuální kategorii "
+"výrobků s použitím prodejní ceny"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3798,7 +3855,7 @@ msgstr ""
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "Uzevření pokladny"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3812,10 +3869,10 @@ msgid "Acc.Type"
 msgstr "Typ učtu"
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
-msgstr ""
+msgstr "Definovány celkové daně, ale nejsou v řádcích faktury !"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -3831,7 +3888,7 @@ msgstr "Měsíc"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referenční MJ"
 
 #. module: account
 #: field:account.account,note:0
@@ -3873,10 +3930,10 @@ msgstr ""
 "jde pro vybrané knihy přeskakovat, takže založené záznamy se rovnou zaúčtují."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Pro tento výrobek nebyl definován nákladový účet: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
@@ -3916,7 +3973,7 @@ msgstr "Všechny poslané položky"
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "Výpis %s je potvrzen, záznamy knihy jsou vytvořeny."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -3931,7 +3988,7 @@ msgstr "Rozsah měsíců"
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Zaškrtněte pokud chcete zobrazit také účty s nulovým zůstatkem."
 
 #. module: account
 #: view:account.tax:0
@@ -4035,7 +4092,7 @@ msgstr "Nerealizováno"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "Výběr knihy účtu"
 
 #. module: account
 #: view:account.invoice:0
@@ -4045,14 +4102,14 @@ msgstr "Tisknout fakturu"
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Poznámky Dal"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: 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 ""
+msgstr "Nelze najít platné období !"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -4062,17 +4119,17 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Nevyrovnané transakce"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "Vytvořit položky z modelů"
 
 #. module: account
 #: field:account.account.template,reconcile:0
@@ -4090,12 +4147,14 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Toto automaticky nastaví váš účetní rozvrh, bankovní účty, daně a knihy "
+"podle vybrané šablony"
 
 #. module: account
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Daň zahrnutá v ceně"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
@@ -4106,7 +4165,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Model opakování"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4119,11 +4178,11 @@ msgid "Change"
 msgstr "Změnit"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4132,7 +4191,7 @@ msgstr "Změnit"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "UserError"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
@@ -4142,12 +4201,12 @@ msgstr "Typ prvků"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "Chová se jako výchozí účet pro částku Dal"
 
 #. module: account
 #: help:account.partner.ledger,reconcil:0
 msgid "Consider reconciled entries"
-msgstr ""
+msgstr "Uvažte vyrovnané záznamy"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4167,7 +4226,7 @@ msgstr "Zrušeno"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Uzavírací zůstek založeny na pokladně"
 
 #. module: account
 #: constraint:account.account:0
@@ -4181,6 +4240,8 @@ msgid ""
 "You cannot create an account! \n"
 "Make sure if the account has children then it should be type \"View\"!"
 msgstr ""
+"Nemůžete vytvořit účet! \n"
+"Ujistěte se, že účet má potomky, které mají být typu \"View\"!"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -4192,7 +4253,7 @@ msgstr "Generová položky"
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Vyberte daňový rozvrh"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4224,10 +4285,10 @@ msgstr "Zrušené faktury"
 #: code:addons/account/invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s' !"
-msgstr ""
+msgstr "Musíte definovat analytickou knihu typu '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4266,13 +4327,13 @@ msgstr "Počáteční den"
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Příjmový účet na šabloně výrobku"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
-msgstr ""
+msgstr "Datum, při kterém byly naposledy vyrovnány účetní záznamy partnera"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4292,12 +4353,14 @@ msgid "Invoices"
 msgstr "Faktury"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: 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."
 msgstr ""
+"Prosíme zkontrolujte cenu na faktuře !\n"
+"Skutečný součet neodpovídá vypočtenému součtu."
 
 #. module: account
 #: view:account.invoice:0
@@ -4325,7 +4388,7 @@ msgstr "Ne"
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "Daňový základ pro deklaraci daně"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4335,7 +4398,7 @@ msgstr "Přidat"
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Nechejte prázdné pro použití aktuálního data"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -4355,7 +4418,7 @@ msgstr "Bankovní výpis použitý pro likvidaci banky"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Koncepty faktůr jsou ověřeny. "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4366,7 +4429,7 @@ msgstr "Spočítat"
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Daňová aplikace"
 
 #. module: account
 #: view:account.move:0
@@ -4395,8 +4458,8 @@ msgstr "Položky deníku"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgid "Balance Sheet (Asset Accounts)"
+msgstr "Rozvaha (Majetkové účty)"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -4404,24 +4467,25 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4443,7 +4507,7 @@ msgid "Bank Details"
 msgstr "Bankovní podrobnosti"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Chybí daně !"
@@ -4463,12 +4527,12 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Generovat otvírající záznamy finančního roku"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Skupinové řádky faktury"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -4498,7 +4562,7 @@ msgid "Check Date not in the Period"
 msgstr "Zkontrolovat zda datum není v období"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4517,7 +4581,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4530,10 +4594,9 @@ msgstr "5"
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Analytický zůstatek -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4546,11 +4609,8 @@ msgstr ""
 #: 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
 #: 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
@@ -4560,11 +4620,16 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,target_move:0
-#: report:account.balancesheet.horizontal: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:pl.account.horizontal:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:pl.account:0
-#: report:account.aged_trial_balance:0
+#: report:pl.account.horizontal:0
 msgid "Target Moves"
 msgstr "Cílové pohyby"
 
@@ -4583,7 +4648,7 @@ msgstr "Platby"
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "Opačný výpočtový kód"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -4627,7 +4692,7 @@ msgstr "Rok"
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "Otevírání pokladny"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4635,7 +4700,7 @@ msgid "Line 1:"
 msgstr "Řádek 1:"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Chyba integrity !"
@@ -4654,7 +4719,7 @@ msgstr "měsíc"
 #: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "Položka knihy \"%s\" není platná"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4681,10 +4746,10 @@ msgstr "Výsledek vyrovnání"
 #: 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.horizontal:0
 #: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
 msgid "Balance Sheet"
-msgstr "Zůstatkový list"
+msgstr "Rozvaha"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -4714,7 +4779,7 @@ msgstr "UoM"
 #: code:addons/account/wizard/account_invoice_refund.py:138
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr ""
+msgstr "Na faktuře nenalezeno žádné období!"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4781,9 +4846,10 @@ msgstr "Daň z dětí"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Bez partnera nemůžet vytvořit pohybový řádek v účtu pohledávek/závazků"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4797,7 +4863,7 @@ msgstr "Povolit zrušení položek"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Koeficient pro nadřazený"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -4819,7 +4885,7 @@ msgstr "Transakce"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr ""
+msgstr "Použije tento kód pro deklaraci DPH."
 
 #. module: account
 #: view:account.move.line:0
@@ -4829,13 +4895,13 @@ msgstr "Dluh/Vklad"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statistiky analytických záznamů"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr ""
+msgstr "Šablony kódu daně"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -4853,9 +4919,11 @@ 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 ""
+"Počet dní pro přidáno před výpočtem dne v měsíci.Pokud datum=15.1, číslo "
+"dne=22, Den v měsíci=-1, pak datum splatnosti je 28.2."
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4871,7 +4939,7 @@ msgstr "Vstupní prvky"
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(Nechejte prázdné pro otevření aktuální situace)"
 
 #. module: account
 #: field:account.analytic.Journal.report,date1:0
@@ -4883,7 +4951,7 @@ msgid "Start of period"
 msgstr "Začátek období"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4925,7 +4993,7 @@ msgstr "Výchozí daně"
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Znak kódu daně"
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
@@ -4935,16 +5003,16 @@ msgstr "Výkaz faktur vytvořených za posledních 15 dnů"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Záznamy knihy konce roku"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5014,6 +5082,8 @@ msgid ""
 "According value related accounts will be display on respective reports "
 "(Balance Sheet Profit & Loss Account)"
 msgstr ""
+"Podle hodnoty vztažených účtů budou zobrazeny na příslušných výkazech "
+"(Rozvaha účtů zisku & ztrát)"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -5021,12 +5091,14 @@ msgid "Sort By"
 msgstr "Řadit podle"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Není definován výchozí účet Dal \n"
+"v knize \"%s\""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
@@ -5042,6 +5114,7 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
+"Zadaná kniha nemá žádné pohybové záznamy v stavu Konceptu pro toto období"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5071,7 +5144,7 @@ msgstr "Číslo (pohyb)"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "Volby dobropisu faktury"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5079,6 +5152,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 ""
+"Počet dílčích částek, které mohou být sloučeny k nalezení zůstatkového bodu "
+"mohou být vybrány jako mocnina automatického vyrovnání"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5143,12 +5218,12 @@ msgstr "Platné po"
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "Staré pohledávky"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Automatické vyrovnání účtu"
 
 #. module: account
 #: view:account.move:0
@@ -5168,7 +5243,7 @@ msgid "Generate Opening Entries"
 msgstr "Generovat počáteční položky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Již vyrovnáno!"
@@ -5176,7 +5251,7 @@ msgstr "Již vyrovnáno!"
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "Výpočetní metoda pro částku daně."
 
 #. module: account
 #: help:account.installer.modules,account_anglo_saxon:0
@@ -5184,6 +5259,8 @@ msgid ""
 "This module will support the Anglo-Saxons accounting methodology by changing "
 "the accounting logic with stock transactions."
 msgstr ""
+"Tento modul bude podporovat Anglo-saskou účetní metodologii pomocí změny "
+"účetní logiky se skladovými transakcemi."
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5204,7 +5281,7 @@ msgstr "Dětské účty"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
@@ -5257,7 +5334,7 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "Ohodnocení"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5278,12 +5355,12 @@ msgstr "Finanční mapování"
 #: 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 ""
+msgstr "Stav účtu otevřený"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max. množ.:"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5302,6 +5379,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Z tohoto pohledu, mít analýzu vašich různých finančních účtů. Dokument "
+"ukazuje vaše Má dáti a Dal bráno v potaz některé kritéria, které můžete "
+"vybrat použitím nástroje hledání."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5341,7 +5421,7 @@ msgid "# of Lines"
 msgstr "# z řádek"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "Nová měna není správně nastavena !"
@@ -5366,17 +5446,17 @@ msgid "Filter by"
 msgstr "Filtrovat podle"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Nemůžete použít neaktivní účet!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
-msgstr ""
+msgstr "Záznamy nejsou ze stejného účtu nebo jsou již zlikvidovány ! "
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -5392,6 +5472,19 @@ msgstr "Obecný deník účtu"
 
 #. 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 "Bez filtru"
@@ -5408,7 +5501,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "Neplatná akce !"
@@ -5427,7 +5520,7 @@ msgstr ""
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Toto jméno bude zobrazeno ve výkazech"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -5466,7 +5559,7 @@ msgstr "Jméno období deníku"
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr ""
+msgstr "Násobek pro základní kód"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:126
@@ -5477,7 +5570,7 @@ msgstr "nerealizováno"
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Společnost vztažená k této knize"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5497,7 +5590,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Analýza analytických záznamů"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -5513,7 +5606,7 @@ msgstr "Analytická položka"
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Zpráva zpožděných plateb"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -5539,12 +5632,12 @@ msgstr "částka hodnoty"
 msgid ""
 "The code will be used to generate the numbers of the journal entries of this "
 "journal."
-msgstr ""
+msgstr "Kód bude použit pro generování čísel záznamů knihy této knihy."
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(nechejte prázdné pro použití aktuálního období)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -5557,7 +5650,7 @@ msgstr ""
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Faktura '%s' je ověřena."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5583,7 +5676,7 @@ msgstr "Daně zákazníka"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Vytvořit účet založený na šabloně"
 
 #. module: account
 #: view:account.account.type:0
@@ -5594,7 +5687,7 @@ msgstr "Nastavení vykazování"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Společnost musí být stejná pro její vztažené účty a období."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5619,7 +5712,7 @@ msgid "Companies"
 msgstr "Společnosti"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5636,12 +5729,12 @@ msgstr "Vyberte finanční rok k uzavření"
 #. 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 "Seznam všech daní, které mají být instalovány průvodcem"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
 msgid "IntraCom"
-msgstr ""
+msgstr "IntraCom"
 
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
@@ -5741,7 +5834,7 @@ msgstr "Výchozí zůstatek účtu"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Nastavit váš Účtový rozvrh"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5751,7 +5844,7 @@ msgstr "  počet dní: 30"
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Vztažená měna účtu, pokud neodpovídá té společnosti."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5761,7 +5854,7 @@ msgstr "Aktuální"
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr ""
+msgstr "Pokladna"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -5791,12 +5884,12 @@ msgstr "Cena"
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Zobrazit řádky analytického účtu"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Liability Accounts)"
-msgstr ""
+msgstr "Rozvaha (Závazkové účty)"
 
 #. module: account
 #: field:account.invoice,internal_number:0
@@ -5814,13 +5907,13 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Likvidace: Přejít na dalšího partnera"
 
 #. 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 ""
+msgstr "Převrácený analytický zůstatek"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
@@ -5831,7 +5924,7 @@ msgstr "Typ platnosti"
 #: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr ""
+msgstr "Reference faktury"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -5840,6 +5933,9 @@ 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 ""
+"Toto pole posloupnosti je použito pro pořadí řádků daní od nižších "
+"posloupností po vyšší. Pořadí je důležité, pokud máte daň, která má několik "
+"daňových potomků. V tomto případě je vyhodnocení pořadí důležité."
 
 #. module: account
 #: selection:account.account,type:0
@@ -5879,20 +5975,21 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Jméno knihy musí být jedinečné pro každou společnost !"
 
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Volitelné vytvoření"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
+"Nelze nalézt účtový rozvrh pro tuto společnost, Prosíme vytvořte účet."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
@@ -5926,7 +6023,7 @@ msgstr "Centralizace"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Generovat váš Účtový rozvrh z Šablony rozvrhu"
 
 #. module: account
 #: view:account.account:0
@@ -6018,7 +6115,7 @@ msgstr "Hotovostní transakce"
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled"
-msgstr ""
+msgstr "Faktura je již zlikvidována"
 
 #. module: account
 #: view:account.account:0
@@ -6035,11 +6132,11 @@ msgstr "Poznámky"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Statistika analytických účtů"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Položky: "
@@ -6047,13 +6144,13 @@ msgstr "Položky: "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Ručně vytvořit opakované záznamy ve vybrané knize."
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr ""
+msgstr "Nelze vytvoit pohyb mezi různými společnostmi."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6090,7 +6187,7 @@ msgid "Total debit"
 msgstr "Celkový dluh"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Položka \"%s\" není platná !"
@@ -6112,6 +6209,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Tento účet bude použit namísto výchozího jako jako účet pohledávek pro "
+"aktuálního partnera"
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6130,6 +6229,7 @@ msgstr "Kód Pythonu"
 msgid ""
 "Please define the Reserve and Profit/Loss account for current user company !"
 msgstr ""
+"Prosíme zadejte účet Rezerv a Zisku/Ztrát pro aktuální společnost uživatele !"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6137,6 +6237,8 @@ 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 ""
+"Zaškrtněte toto políčko, pokud chcete povolit zrušení záznamů vztažených k "
+"této knize nebo faktur vztažených k této knize"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6151,34 +6253,33 @@ msgstr "Vytvořit položku"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: percent"
-msgstr ""
+msgstr "  ocenění: procenta"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6189,7 +6290,7 @@ msgstr "Chyba !"
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr ""
+msgstr "Daňový výkaz"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -6250,6 +6351,7 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
+"Vybrané řádky záznamů nemají žádný záznamy pohybů účtu ve stavu koncept"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6280,7 +6382,7 @@ msgstr "Všechny položky"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Chyba: Výchozí MJ a nákupní MJ musí být ve stejné kategorii."
 
 #. module: account
 #: view:account.journal.select:0
@@ -6288,7 +6390,7 @@ msgid "Journal Select"
 msgstr "Vybrat deník"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Aktuální měna není správně nastavena !"
@@ -6301,7 +6403,7 @@ msgstr "Vyrovnání účtu"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "Finanční pozice daně"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6309,7 +6411,6 @@ msgstr ""
 #: 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 "Obecná účetní kniha"
@@ -6350,7 +6451,7 @@ msgstr "Vlastnosti"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr ""
+msgstr "Daňový rozvrh účtu"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6359,13 +6460,11 @@ msgstr ""
 #: report:account.general.journal:0
 #: report:account.invoice:0
 #: report:account.partner.balance:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
 msgid "Total:"
 msgstr "Celkem:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6386,16 +6485,16 @@ msgstr "Příjmové účty"
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Odkaz na dokumenty, které generovaly tento výkaz faktury."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Podřízené kódy"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6421,7 +6520,7 @@ msgstr "Obchod"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr ""
+msgstr "Sloupec knihy"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6464,7 +6563,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Nevyrovnané položky"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
@@ -6517,6 +6616,8 @@ msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
 msgstr ""
+"Tento datum bude použit jako datum faktury pro Dobropis faktury a Období "
+"bude vybráno obdobně!"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
@@ -6538,7 +6639,7 @@ msgstr "Analytická řádky"
 #: 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 "
+"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) "
@@ -6552,7 +6653,7 @@ msgid "Lines"
 msgstr "Řádky"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6567,12 +6668,12 @@ msgstr "Šablona daně účtu"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Jste si jisti, že chcete otevřít Záznamy deníku?"
 
 #. module: account
 #: view:account.state.open:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr ""
+msgstr "Jste si jisti, že chcete otevřít fakturu ?"
 
 #. module: account
 #: code:addons/account/account_move_line.py:963
@@ -6596,7 +6697,7 @@ msgstr "Výpis"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Chová se jako výchozí účet pro částku Má dáti"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6629,6 +6730,8 @@ 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 ""
+"Můžete hledat jednotlivé záznamy účtů přes užitečné informace. K hledání "
+"záznamů účtů, otevřete knihu a pak vyberte řádek záznamu."
 
 #. module: account
 #: report:account.invoice:0
@@ -6642,7 +6745,7 @@ msgstr "Datum faktury"
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Celková částka, kterou vám zákazník dluží."
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -6710,6 +6813,8 @@ msgid ""
 "Bank Account Number, Company bank account if Invoice is customer or supplier "
 "refund, otherwise Partner bank account number."
 msgstr ""
+"Číslo bakovního účtu, Bankovní účet společnosti, pokud faktura je dobropis "
+"zákazníka nebo dodavatele, jinak číslo bankovního účtu partnera."
 
 #. module: account
 #: help:account.tax,domain:0
@@ -6720,10 +6825,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "Měli byste vybrat období, které patří ke stejné společnosti"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -6748,7 +6853,7 @@ msgstr "Kód deníku musí být jedinečně na společnost !"
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr ""
+msgstr "Uzávěrka pokladny"
 
 #. module: account
 #: view:account.journal:0
@@ -6768,6 +6873,9 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"Pole ukazuje dalšího partnera, který bude automaticky vybrán systémem pro "
+"průchod procesem likvidace, založeném na posledních dnech, kdy byl "
+"likvidován."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -6801,6 +6909,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), Which is calculated from "
 "Profit & Loss Report"
 msgstr ""
+"Tento účet je použit pro přesun Zisku/Ztrát(Pokud je zisk: Částka bude "
+"přidána, Ztráta : Částka bude odečtena.), Který je spočítán z Výkazu Zisků & "
+"Ztrát"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -6824,10 +6935,10 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
-msgstr ""
+msgstr "Nemůžete mít dva otevřené registry pro stejné knihy"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -6853,6 +6964,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -6862,6 +6974,8 @@ msgid ""
 "Helps you generate reminder letters for unpaid invoices, including multiple "
 "levels of reminding and customized per-partner policies."
 msgstr ""
+"Pomůže vám generovat připomínkové dopisy pro nezaplacené faktury, včetně "
+"více úrovní připomínání a přizpůsobitelnou politiku dle partner."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -6882,7 +6996,6 @@ msgstr "Doplňující informace"
 
 #. 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
@@ -6898,7 +7011,7 @@ msgstr ":"
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr ""
+msgstr "V datum"
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -6908,13 +7021,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Chybný účet !"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6932,7 +7045,7 @@ msgid "Invoice Tax"
 msgstr "Daň faktury"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "Žádné číslo kusu !"
@@ -6946,7 +7059,7 @@ msgstr "Vlastnosti obchodu"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Ruční likvidace"
 
 #. module: account
 #: report:account.overdue:0
@@ -6995,7 +7108,7 @@ msgstr "Účty závazků"
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr ""
+msgstr "Šablona pro Účtový rozvrh"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -7048,7 +7161,7 @@ msgstr "Posloupnost"
 #. module: account
 #: model:ir.model,name:account.model_account_bs_report
 msgid "Account Balance Sheet Report"
-msgstr ""
+msgstr "Výkaz rozvahy účtu"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -7057,6 +7170,8 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
+"Zaškrtněte toto, pokud cena, kterou používáte u výrobku a faktur zahrnuje "
+"tuto daň."
 
 #. module: account
 #: view:account.state.open:0
@@ -7128,7 +7243,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Zákonné výkazy"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -7146,7 +7261,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "Řádek pokladny"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7169,17 +7284,17 @@ msgid "Fixed"
 msgstr "Pevné"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Varování !"
@@ -7187,13 +7302,13 @@ msgstr "Varování !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Stav poybového řádku"
 
 #. 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 ""
+msgstr "Likvidace řádky pohybu účtu"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7204,7 +7319,7 @@ msgstr "Vypočítat předpaltné"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Částka (slovně) :"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -7242,7 +7357,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Fakturu nelze %s návrh/proforma/zrušit."
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Žádné řádky faktury !"
@@ -7291,7 +7406,7 @@ msgid "Deferral Method"
 msgstr "Metoda zpoždění"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Faktura '%s' je zaplacena."
@@ -7317,6 +7432,8 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
+"Pokud je políčko zaškrtnuto, systém se pokusí seskupit účetní řádky, když je "
+"generuje z faktůr."
 
 #. module: account
 #: help:account.period,state:0
@@ -7352,7 +7469,7 @@ msgid "Associated Partner"
 msgstr "Přidruženého partnera"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Musíte nejdříve vybrat partnera !"
@@ -7420,7 +7537,7 @@ msgid "Choose Fiscal Year"
 msgstr "Vyberte daňový rok"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7455,7 +7572,6 @@ msgstr "Účetní a finanční správa"
 #: 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
@@ -7468,6 +7584,19 @@ msgstr "Účetní a finanční správa"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Období"
@@ -7550,19 +7679,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Měna společnosti"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
-#: report:account.aged_trial_balance:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7588,7 +7704,7 @@ msgstr ""
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr ""
+msgstr "Částečná likvidace"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
@@ -7598,18 +7714,18 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Obecný výkaz účtu"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Automatický import bankovního výpisu"
 
 #. 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 "Zobrazení knihy"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -7623,10 +7739,10 @@ msgid "Account Types"
 msgstr "Typy účtů"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
-msgstr ""
+msgstr "Nelze vytvořit pohyb faktury na centralizované knize"
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -7656,7 +7772,7 @@ msgstr "Účet pohledávek"
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox Balance"
-msgstr ""
+msgstr "Zůstatek pokladny"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -7673,12 +7789,13 @@ msgstr "Deník vrácení peněz"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
-#: report:account.balancesheet.horizontal:0
 #: report:account.balancesheet:0
-#: report:pl.account.horizontal: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 "Filter By"
 msgstr "Filtrovat podle"
 
@@ -7716,7 +7833,7 @@ msgid "Payment Term Line"
 msgstr "Řádek platebního období"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7780,11 +7897,13 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"Zbytková částka na pohledávkovém nebo závazkovém záznamu účtu vyjádřená v "
+"měně společnosti."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: balance"
-msgstr ""
+msgstr "  ocenění: zůstatek"
 
 #. module: account
 #: view:account.tax.code:0
@@ -7800,12 +7919,12 @@ msgstr "Od"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Uzavření finačního roku"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Kód účtu musí být jedinečný pro společnosti !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -7837,14 +7956,14 @@ msgstr "Tisk"
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Povolené účty (prázdné pro neřízení)"
 
 #. 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 ""
+msgstr "Rozvrh analytických účtů"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -7885,8 +8004,8 @@ msgid ""
 msgstr "Částka na dokladu musí odpovídat částce v řádku výpisu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Nesprávný účet!"
@@ -7897,10 +8016,10 @@ 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:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "Pohyb účtu (%s) pro centralizaci byl potvrzen!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -7908,6 +8027,7 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
+"Částka vyjádřena ve volitelné jiné měně, pokud je položka více-měnová."
 
 #. module: account
 #: view:account.account:0
@@ -7946,7 +8066,7 @@ msgstr "Určuje pořadí v zobrazení seznamu řádků výpisu"
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr ""
+msgstr "Učetní ověří účetní položky přicházející z faktury"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8013,7 +8133,7 @@ msgstr "Počáteční položky deníku"
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Konceptové faktury jsou zkontrolovány, ověřeny a vytištěny."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8058,6 +8178,9 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Můžete zde určit koeficient, který bude použit, při konsolidaci částek "
+"tohoto případu do jeho rodiče. Například, nastavte 1/-1 pokud chcete hodnotu "
+"přičíst/odečíst."
 
 #. module: account
 #: view:account.invoice:0
@@ -8091,19 +8214,21 @@ msgid "Period from"
 msgstr "Období od"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Kniha dobropisů prodeje"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: 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 ""
+"Nemůžete upravit společnost tohoto období, protože její vztažený záznam "
+"existuje v řádcích záznamu"
 
 #. module: account
 #: view:account.move:0
@@ -8120,7 +8245,7 @@ msgstr "Registrované platby"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Zavírací stavy finančního roku a období"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8133,7 +8258,7 @@ msgstr "Informace o výrobku"
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr "Analitické"
+msgstr "Analytické"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
@@ -8147,7 +8272,7 @@ msgid "Purchase Tax(%)"
 msgstr "Daň nákupu(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Prosíme vytvořete nějaké řádky faktury."
@@ -8163,7 +8288,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Nastavit vaši účetní aplikaci"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8200,25 +8325,28 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr "Začátek období"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
-msgstr ""
+msgstr "Nelze najít nadřazený kód pro šablonu účtu!"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
-#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8249,12 +8377,14 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: 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 ""
+"Nemůžete zrušit fakturu, která je Částečně zaplacena! Potřebujete zrušit "
+"vyrovnání týkajících se platebních podmínek!"
 
 #. module: account
 #: report:account.overdue:0
@@ -8269,7 +8399,7 @@ msgstr "Nezaplacené"
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Dokument: Výpis účtu zákazníka"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -8277,7 +8407,7 @@ msgid "You can not create move line on view account."
 msgstr "Nemůžete vytvořit řádek pohybu ve zobrazení účtu."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Aktuální měna není správně nastavena !"
@@ -8325,8 +8455,12 @@ msgstr "Nechejte prázdné pro použití příjmového účtu"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8335,10 +8469,6 @@ msgstr "Nechejte prázdné pro použití příjmového účtu"
 #: report:account.third_party_ledger_other:0
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
 msgid "Balance"
 msgstr "Zůstatek"
 
@@ -8349,11 +8479,15 @@ msgstr "Ručně nebo automaticky zadáno do systému"
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.general.ledger_landscape:0
-#: report:account.balancesheet.horizontal:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 #: report:account.balancesheet:0
-#: report:pl.account.horizontal: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 "Zobrazit účet"
 
@@ -8378,6 +8512,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
+"Tento výkaz je analýza podle partnera. Jedná se o PDF výkaz obsahující jeden "
+"řádek na partnera vyjadřující souhrnný zůstatek ve prospěch."
 
 #. module: account
 #: selection:account.account,type:0
@@ -8450,7 +8586,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "Podpis příjemce"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8468,7 +8604,6 @@ msgstr "Ruční položka"
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8476,10 +8611,10 @@ msgid "Move"
 msgstr "Pohyb"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr ""
+msgstr "Nemůžete změnit daň, měli byste odstranit a znovu vytvořit řádky !"
 
 #. module: account
 #: report:account.central.journal:0
@@ -8495,7 +8630,7 @@ msgstr "Bankovní výpisy"
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
-msgstr ""
+msgstr "Vytváří účet s vybranou šablonou pod tímto existujícím rodičem."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -8509,6 +8644,8 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
+"Musíte zadat bankovní účet\n"
+"v definici knihy pro likvidaci."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -8524,7 +8661,7 @@ msgstr "Běžný výkaz"
 #: view:account.account:0
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr ""
+msgstr "Konsolidovaný potomek"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:82
@@ -8533,6 +8670,8 @@ msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
+"Kniha musí mít centralizovaný protějšek bez zaškrtnutého stavu Přeskakovat "
+"koncept!"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -8552,7 +8691,7 @@ msgstr "Červenec"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Grafy účtů"
 
 #. module: account
@@ -8569,13 +8708,17 @@ msgstr "Analytický zůstatek účtu"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr "Konec období"
 
@@ -8595,7 +8738,7 @@ msgstr "Konec období"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Diagram účtů"
 
 #. module: account
@@ -8614,7 +8757,7 @@ msgid "Account Subscription"
 msgstr "Předplatné účtu"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8643,7 +8786,6 @@ msgstr "Vstupní předplatné"
 #: 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
@@ -8656,7 +8798,6 @@ msgstr "Vstupní předplatné"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_from:0
-#: report:account.aged_trial_balance:0
 msgid "Start Date"
 msgstr "Počáteční datum"
 
@@ -8673,7 +8814,7 @@ msgid "Unreconciled"
 msgstr "Nevyrovnaný"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Špatný součet !"
@@ -8731,13 +8872,13 @@ msgid "Active"
 msgstr "Aktivní"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr "Neznámá chyba"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8751,6 +8892,8 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
+"Tento účet bude použit namísto výchozího jako závazkový účet pro aktuálního "
+"partnera"
 
 #. module: account
 #: field:account.period,special:0
@@ -8784,6 +8927,7 @@ msgstr "Ověřit pohyb účtu"
 #: report:account.journal.period.print: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
@@ -8800,11 +8944,14 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Nemůžete zde vybrat knihu pro použití pro dobropis faktury, která bude "
+"vytvořena. Pokud necháte toto pole prázdné, bude použita stejná kniha jako u "
+"aktuální faktury."
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Through :"
-msgstr ""
+msgstr "Skrz :"
 
 #. module: account
 #: view:account.general.journal:0
@@ -8861,6 +9008,18 @@ msgstr "Obecný"
 #: selection:account.pl.report,filter: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
@@ -8880,7 +9039,7 @@ msgstr "Kurz měny"
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For Value percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Pro hodnotu v procentech zadejte % koeficient mezi 0-1."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8913,11 +9072,12 @@ msgstr ""
 msgid ""
 "Allows invoice lines to impact multiple analytic accounts simultaneously."
 msgstr ""
+"Umožní, aby řádky faktury měli dopad na více analytických účtů současně."
 
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr ""
+msgstr "Prodejní daň(%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -8970,6 +9130,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Tento výkaz vám umožní tisknout nebo generovat pdf vaší obecné účetní knihy "
+"s podrobnosti o všech vašich účtech"
 
 #. module: account
 #: selection:account.account,type:0
@@ -8990,7 +9152,7 @@ msgstr "Vnitřní typ"
 #. module: account
 #: report:account.move.voucher:0
 msgid "State:"
-msgstr ""
+msgstr "Stav:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -9019,6 +9181,7 @@ msgstr "Vyberte období"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr ""
 
@@ -9037,7 +9200,6 @@ msgstr ""
 #: 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
@@ -9070,13 +9232,10 @@ msgid "Tax Source"
 msgstr "Zdroj daně"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Čistý zisk"
 
@@ -9091,7 +9250,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Toto je model pro opakující se účetní položky"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: 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)"
@@ -9100,8 +9259,8 @@ msgstr "Pro tento výrobek není definován příjmový účet: \"%s\" (id: %d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "JRNL"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9127,7 +9286,6 @@ msgstr "Stavy"
 #: field:report.account.sales,amount_total:0
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
-#: report:account.aged_trial_balance:0
 msgid "Total"
 msgstr "Celkem"
 
@@ -9242,8 +9400,8 @@ msgid "End period"
 msgstr "Konec období"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9265,7 +9423,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "On Account of :"
-msgstr ""
+msgstr "Na účtu :"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9281,7 +9439,7 @@ msgstr "Stav faktury je Hotovo"
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Výkaz prodejů podle účtu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
@@ -9313,6 +9471,7 @@ msgstr "Faktura dodavatele"
 #: report:account.journal.period.print: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
@@ -9339,6 +9498,8 @@ msgid ""
 "Make sure if the account template has parent then it should be type "
 "\"View\"! "
 msgstr ""
+"Nemůžete vytvořit šablonu účtu! \n"
+"Ujistěte se, že pokud má šablona účtu rodiče, měl by být typu \"Pohled\"! "
 
 #. module: account
 #: view:account.subscription:0
@@ -9346,7 +9507,7 @@ msgid "Recurring"
 msgstr "Opakující se"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Položka již je srovnaná"
@@ -9367,7 +9528,7 @@ msgid "Range"
 msgstr "Rozsah"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9382,6 +9543,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "S pohyby"
 
@@ -9418,7 +9589,7 @@ msgstr "Tisk Analytických deníků"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.Account"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -9497,7 +9668,7 @@ msgid "Accounts Mapping"
 msgstr "Mapování účtů"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Faktura '%s' čeká na ověření."
@@ -9522,7 +9693,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "Příjmový a výdajový účet vztažený k vybranému výrobku."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9551,7 +9722,7 @@ msgstr "Hlead fakturu"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr ""
+msgstr "Dobropis"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -9580,7 +9751,7 @@ msgstr "Účetní dokumenty"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Ověřit řádky pohybů účtu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9626,7 +9797,6 @@ msgstr "account.addtmpl.wizard"
 #: field:account.partner.ledger,result_selection:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-#: report:account.aged_trial_balance:0
 msgid "Partner's"
 msgstr "Partneři"
 
@@ -9677,7 +9847,7 @@ msgstr "Bankovní účet"
 #: 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 "Ústřední kniha účtů"
 
 #. module: account
 #: report:account.overdue:0
@@ -9709,12 +9879,12 @@ msgstr "Obvykle 1 nebo -1."
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Fiskální mapování šablony účtu"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Účet útrat na šabloně výrobku"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -9728,7 +9898,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "Musíte zadat délku období, která nesmí být 0 nebo kratší !"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Nemůžete odebrat účet, který má účetní položky!. "
@@ -9751,6 +9921,20 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+"Zbytková částka pohledávkovém a závazkovém záznamu knihy vyjádřená ve své "
+"měně (může být jiná než měna společnosti)."
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #~ msgid "Generate entries before:"
 #~ msgstr "Generovat položky před:"
@@ -9959,6 +10143,15 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "není platné."
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Nesprávný zůstatek výpisu!\n"
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Rozvaha (Majetkové účty)"
+
+#~ msgid "Chart of Accounts"
+#~ msgstr "Účtový rozvrh"
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 51a7f482d66..eac657b4dc4 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,19 +8,19 @@ 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-22 07:21+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-13 20:57+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: 2011-04-29 05:05+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-14 05:15+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Systembetaling"
 
 #. module: account
 #: view:account.journal:0
@@ -39,17 +39,17 @@ msgstr ""
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
-msgstr ""
+msgstr "Du kan ikke fjerne/deaktivere en konto som er tilknyttet en kontakt."
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Afstem kasseklade"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Bilagshåndtering"
 
 #. module: account
 #: view:account.account:0
@@ -69,7 +69,7 @@ msgstr "Resterende"
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Definer venligst sekvensen på faktura journalen"
 
 #. module: account
 #: constraint:account.period:0
@@ -102,6 +102,8 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Profit og Tab rapporten giver dig et overblik af din virksomheds profit og "
+"tab i et enkelt dokument."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -128,7 +130,7 @@ msgstr ""
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr "Konto posteringer-"
+msgstr "Posteringer"
 
 #. module: account
 #: code:addons/account/account.py:1291
@@ -178,7 +180,7 @@ msgstr ""
 #: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Advarsel!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -325,6 +327,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Installerer lokal kontoplan, der passer så godt som muligt til jeres firmas "
+"behov, baseret på land."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -360,7 +364,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -484,8 +488,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1122,6 +1124,7 @@ 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
@@ -1309,6 +1312,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -1737,7 +1750,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Forkert kredit eller debet værdi i posteringerne!"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1839,7 +1852,7 @@ 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 "Sammenligning mellem bogførings- og betalingsindtastninger"
 
 #. module: account
 #: view:account.tax:0
@@ -2071,11 +2084,13 @@ msgstr ""
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Regnskab, egenskaber"
 
 #. 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2097,11 +2112,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2419,10 +2439,11 @@ msgstr "Bankafstemning"
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Rabatprocent"
 
 #. 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
@@ -2663,11 +2684,13 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Finans"
 
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2721,6 +2744,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Vælg: Hvis afgiftsbeløbet, skal indgå i beregningsgrundlaget for beregning "
+"af de følgende afgifter"
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -2939,7 +2964,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2953,6 +2977,17 @@ msgstr ""
 #: 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 ""
 
@@ -2984,13 +3019,13 @@ msgstr "Indløb"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Regnskabsmodulets konfigurering"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Regnskab, overblik"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3162,6 +3197,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3220,8 +3256,18 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
-msgstr ""
+msgstr "Kontoplan"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -3658,11 +3704,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4337,7 +4382,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4476,7 +4521,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4489,10 +4533,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4502,6 +4544,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4618,6 +4670,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4737,7 +4791,7 @@ msgstr ""
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "(Konto / Kontakt) Navn"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5327,6 +5381,19 @@ msgstr ""
 
 #. 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 ""
@@ -6235,6 +6302,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6563,7 +6631,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:report.invoice.created,date_invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Faktura dato"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7059,7 +7127,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr ""
+msgstr "Periode sum"
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -7137,6 +7205,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7190,7 +7259,7 @@ msgstr ""
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "Stat"
+msgstr "Tilstand"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -7389,6 +7458,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periode"
@@ -7471,14 +7553,6 @@ msgstr "Tel:"
 msgid "Company Currency"
 msgstr "Firma valuta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7590,6 +7664,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7827,6 +7907,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8108,12 +8189,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8231,7 +8317,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8250,6 +8341,15 @@ 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 ""
 
@@ -8448,7 +8548,7 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr ""
+msgstr "Kontoplan"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
@@ -8464,12 +8564,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8670,6 +8775,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8751,6 +8857,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8960,13 +9078,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8990,7 +9105,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9198,6 +9313,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9271,6 +9387,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9640,6 +9766,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Ubetalte leverandør fakturaer."
 
@@ -9664,9 +9802,6 @@ msgstr ""
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C eller flyt navn"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Fejl! Du kan ikke oprette rekursive konto."
-
 #~ msgid "Contact"
 #~ msgstr "Kontaktperson"
 
@@ -9746,16 +9881,6 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Vis kontoer "
 
-#~ msgid "Crédit"
-#~ msgstr "Kredit"
-
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Partners bank konto for betaling\n"
-#~ "Holdes tom for default værdier"
-
 #~ msgid "Invoice Movement"
 #~ msgstr "Faktura bevægelser"
 
@@ -9779,6 +9904,3 @@ msgstr ""
 
 #~ msgid "Charts of Account"
 #~ msgstr "Diagrammer af kontoen"
-
-#~ msgid "supplier"
-#~ msgstr "leverandør"
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 3d6a63f1bd9..174c6f66060 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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-02 08:42+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 13:03+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: 2011-07-03 04:46+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -34,7 +34,7 @@ msgstr ""
 "Es ist kein Journal für den Jahresabschluss des Geschäftsjahres definiert"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -68,7 +68,7 @@ msgid "Residual"
 msgstr "Restwert"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Bitte definieren Sie den Sequenzer für das Rechnungsjournal."
@@ -138,7 +138,7 @@ msgid "Accounting Entries-"
 msgstr "Buchungssätze-"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Sie können keine gebuchten Vorgänge löschen: \"%s\"!"
@@ -184,7 +184,7 @@ msgstr ""
 "angezeigt."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Achtung!"
@@ -240,7 +240,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -272,7 +272,7 @@ msgstr ""
 "Rechnung erscheinen sollen"
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Belgian Reports"
 msgstr "Auswertungen für Belgien"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -330,7 +330,7 @@ msgid "St."
 msgstr "Beleg"
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -527,8 +527,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -594,7 +592,7 @@ msgid "Not reconciled transactions"
 msgstr "Nicht ausgeglichene Posten"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Kassenbestand passt nicht zu Kontensaldo"
@@ -679,7 +677,7 @@ msgid "Tax Code Amount"
 msgstr "Steuerbetrag"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -712,8 +710,8 @@ msgid "Journal Period"
 msgstr "Journal Periode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -776,7 +774,7 @@ msgid "Analytic Entries by line"
 msgstr "Analytische Buchungsbelege"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Sie können die Währung nur bei Rechnungen"
@@ -880,7 +878,7 @@ msgid "Next Partner to reconcile"
 msgstr "Weiterer Partner für automat. Ausgleich"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -1009,11 +1007,11 @@ msgid "Code"
 msgstr "Kurzbezeichnung"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1095,6 +1093,7 @@ msgstr "GuV (Aufwendungen)"
 
 #. 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 "-"
@@ -1193,7 +1192,7 @@ msgid "Entry Label"
 msgstr "Buchungstext"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1333,6 +1332,7 @@ msgid "Journal Items Analysis"
 msgstr "Analyse der Journaleinträge"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partner"
@@ -1362,7 +1362,7 @@ msgid "Central Journal"
 msgstr "Zentrales Journal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Sie können dieses Sachkonto nicht in diesem Journal einsetzen."
@@ -1374,6 +1374,16 @@ msgstr "Sie können dieses Sachkonto nicht in diesem Journal einsetzen."
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Konten mit Saldo"
 
@@ -1459,7 +1469,7 @@ msgid ""
 msgstr "Beispiel: 14 Tage 2% Skonto, 30 Tage Netto"
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1630,6 +1640,7 @@ msgid "Separated Journal Sequences"
 msgstr "Unterschiedliche Journal Sequenzer"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Mitarbeiter"
@@ -1703,7 +1714,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Fehler ! Sie können keine Überschneidungen bei Geschäftsjahren haben"
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1740,7 +1751,7 @@ msgid "Receivables & Payables"
 msgstr "Debitoren & Kreditoren"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Sie müssen ein Konto für die Forderungsabschreibung hinterlegen!"
@@ -1776,7 +1787,7 @@ msgid "Customer Ref:"
 msgstr "Kundenreferenz:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Benutzer %s hat keinen Zugriff auf das %s Journal!"
@@ -1797,7 +1808,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Steuermeldung: Ausweis von Gutschriften"
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "Sie können kein Konto mit vorhandenen Buchungen deaktivieren."
@@ -1814,7 +1825,7 @@ msgstr ""
 "Sie können keine Buchung auf einem bereits abgeschlossenen Konto vornehmen."
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2099,7 +2110,7 @@ msgid " Journal"
 msgstr " Journal"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2128,7 +2139,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Suche Kontenplan Vorlage"
 
 #. module: account
@@ -2162,7 +2173,7 @@ msgid "Description"
 msgstr "Buchungstext"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2182,7 +2193,7 @@ msgid "Income Account"
 msgstr "Erlöskonto"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2195,9 +2206,10 @@ msgid "Accounting Properties"
 msgstr "Finanzbuchhaltung Eigenschaften"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Buchungen sortiert nach"
 
@@ -2219,12 +2231,16 @@ msgstr "Vorlage f. Produkte"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2333,7 +2349,7 @@ msgid "Account Tax Code"
 msgstr "Umsatzsteuer"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2415,7 +2431,7 @@ msgid "Account Model Entries"
 msgstr "Buchungsvorlage"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2507,7 +2523,7 @@ msgid "Accounts"
 msgstr "Finanzkonten"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfehler !"
@@ -2519,12 +2535,13 @@ msgid "Average Price"
 msgstr "Durchschnittspreis"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Datum:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2679,16 +2696,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Diese Assistent erzeugt wiederkehrende Buchungen."
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Kein Sequenzer für dieses Journal definiert !"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2828,6 +2845,8 @@ msgstr "Finanzen"
 #. 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
 msgid "Profit And Loss"
 msgstr "Gewinn und Verlust"
 
@@ -2862,7 +2881,7 @@ msgid "Analytic Entries"
 msgstr "Analytische Buchungen"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2994,7 +3013,7 @@ msgid "BNK%s"
 msgstr "BNK%s"
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3119,9 +3138,7 @@ msgstr "Leer lassen um Aufwandskonto zu verwenden"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3135,6 +3152,17 @@ msgstr "Leer lassen um Aufwandskonto zu verwenden"
 #: 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 "Buchungsjournale"
 
@@ -3180,7 +3208,7 @@ msgid "Starting Balance"
 msgstr "Anfangssaldo"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Kein Partner definiert!"
@@ -3224,6 +3252,7 @@ msgstr "Journal:"
 #: 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
@@ -3277,7 +3306,7 @@ msgstr ""
 "bedeutet, dass Sie Ihre einzelnen Buchungen nicht ändern können."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Kann offene oder bezahlte Rechnungen nicht löschen"
@@ -3340,7 +3369,7 @@ msgstr ""
 "'Abgebrochen' oder 'Erledigt' Status ist."
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3410,6 +3439,16 @@ msgstr "UST:"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontenplan Finanzen"
 
@@ -3456,7 +3495,6 @@ msgstr "(Wenn kein Geschäftsjahr ausgewählt wird, werden alle genommen)"
 #: 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
 #: view:account.move:0
@@ -3500,7 +3538,7 @@ msgid "Chart of Accounts Template"
 msgstr "Vorlage Kontenplan"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3512,13 +3550,13 @@ msgstr ""
 "Bitte ordnen Sie dem Partner eine Zahlungsbedingungen zu."
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Einige Einträge wurden bereits ausgeglichen!"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3646,7 +3684,7 @@ msgid "Analytic Items"
 msgstr "Analytische Buchungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Die Steuer kann nicht geändert werden!"
@@ -3657,7 +3695,7 @@ msgid "#Entries"
 msgstr "# Buchungen"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -3665,7 +3703,7 @@ msgstr ""
 "Sie haben eine Mengeneinheit gewählt, die nicht kompatibel zum Produkt ist."
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3876,11 +3914,10 @@ msgid "Analytic Balance"
 msgstr "Saldo Analyt. Konto"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Jahresfehlbetrag"
 
@@ -3979,7 +4016,7 @@ msgid "Acc.Type"
 msgstr "Kontotyp"
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -4044,7 +4081,7 @@ msgstr ""
 "Status unmittelbar 'Gebucht' ist."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4226,7 +4263,7 @@ msgid "Credit Notes"
 msgstr "Gutschrift"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4299,11 +4336,11 @@ msgid "Change"
 msgstr "Ändere Währung"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4410,7 +4447,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Ein Analytisches Journal vom Typ '%s' muss definiert werden"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4482,7 +4519,7 @@ msgid "Invoices"
 msgstr "Rechnung"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4587,7 +4624,7 @@ msgstr "Buchungsjournale"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Bilanz (Vermögen)"
 
 #. module: account
@@ -4596,24 +4633,25 @@ msgid "Third Party (Country)"
 msgstr "Drittwelt (Land)"
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4635,7 +4673,7 @@ msgid "Bank Details"
 msgstr "Bankkonto Details"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Steuerkonfiguration fehlt!"
@@ -4695,7 +4733,7 @@ msgid "Check Date not in the Period"
 msgstr "Prüfe auf  ein Datum nicht in Periode"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4717,7 +4755,7 @@ msgid "Child Tax Accounts"
 msgstr "untergeordnete Steuerkonten"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Beginn der Periode sollte kleiner sein als Ende der Periode"
@@ -4733,7 +4771,6 @@ msgid "Analytic Balance -"
 msgstr "Saldo (Anal.)"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4746,11 +4783,8 @@ msgstr "Saldo (Anal.)"
 #: 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
 #: 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
@@ -4760,6 +4794,16 @@ msgstr "Saldo (Anal.)"
 #: 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
 msgid "Target Moves"
 msgstr "Filter Buchungen"
 
@@ -4832,7 +4876,7 @@ msgid "Line 1:"
 msgstr "Zeile 1:"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integritätsfehler!"
@@ -4878,6 +4922,8 @@ msgstr "Ergebnis Kontoabstimmung"
 #: 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
 msgid "Balance Sheet"
 msgstr "Bilanz"
 
@@ -4982,7 +5028,7 @@ msgstr ""
 "einen vorher vorhandenen Partner erstellen."
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -5059,7 +5105,7 @@ msgstr ""
 "->> Fälligkeitstag = 28.2"
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -5087,7 +5133,7 @@ msgid "Start of period"
 msgstr "Start Periode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5146,12 +5192,12 @@ msgstr "Journal Eröffnungsbuchungen"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5232,7 +5278,7 @@ msgid "Sort By"
 msgstr "Sortiert nach"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5393,7 +5439,7 @@ msgid "Generate Opening Entries"
 msgstr "Erstelle Vortragsbuchungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Bereits ausgeglichen"
@@ -5432,7 +5478,7 @@ msgstr "untergeordnete Konten"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Abschreibung"
@@ -5587,7 +5633,7 @@ msgid "# of Lines"
 msgstr "# Positionen"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "Neue Währung wurde nicht vollständig konfiguriert !"
@@ -5612,14 +5658,14 @@ msgid "Filter by"
 msgstr "Filter durch"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Sie können kein inaktives Konto verwenden!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5640,6 +5686,19 @@ msgstr "Zentraljournal"
 
 #. 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 "Kein Filter"
@@ -5656,7 +5715,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "Fehlerhafte Aktion"
@@ -5878,7 +5937,7 @@ msgid "Companies"
 msgstr "Unternehmen"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6159,9 +6218,9 @@ msgid "Optional create"
 msgstr "Erzeuge optional"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -6314,8 +6373,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Auswertung analytische Buchungen"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Buchungen: "
@@ -6326,7 +6385,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Händisch wiederkehrende Buchungen in ein bestimmtes Journal buchen."
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Konnte keine überbetriebliche Buchung erzeugen"
@@ -6375,7 +6434,7 @@ msgid "Total debit"
 msgstr "Gesamt Soll"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Eintrag \"%s\" ist ungültig !"
@@ -6445,31 +6504,30 @@ msgid "  valuation: percent"
 msgstr "  Wertansatz: Prozent"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6590,7 +6648,7 @@ msgid "Journal Select"
 msgstr "Wähle Journal"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Die aktuelle Währung ist nicht korrekt konfiguriert !"
@@ -6611,7 +6669,6 @@ msgstr "Steuern Zuordnung"
 #: 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 "Umsätze nach Konten und Perioden"
@@ -6672,7 +6729,7 @@ msgid "Total:"
 msgstr "Summe:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6710,7 +6767,7 @@ msgid "Child Codes"
 msgstr "untergeordnete Codes"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6880,7 +6937,7 @@ msgstr "Analytische Buchungen"
 #: 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 "
+"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) "
@@ -6901,7 +6958,7 @@ msgid "Lines"
 msgstr "Positionen"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -7100,7 +7157,7 @@ msgstr ""
 "Steuerberechnung gebraucht wird."
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7219,7 +7276,7 @@ msgid "Sign on Reports"
 msgstr "Sign On Reports"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -7256,6 +7313,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -7288,7 +7346,6 @@ msgstr "Informationen (Optional)"
 
 #. 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
@@ -7317,13 +7374,13 @@ msgstr ""
 "bezahlt werden soll."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Falsches Konto!"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7341,7 +7398,7 @@ msgid "Invoice Tax"
 msgstr "Umsatzsteuer"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "Keine Stückzahl!"
@@ -7587,17 +7644,17 @@ msgid "Fixed"
 msgstr "Fest"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Warnung"
@@ -7660,7 +7717,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Kann Entwurf/ProForma/Storno für Rechnung %s nicht durchführen"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Keine Rechnungszeilen !"
@@ -7711,7 +7768,7 @@ msgid "Deferral Method"
 msgstr "Abgrenzung Jahreswechsel"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Rechnung '%s' wurde bezahlt."
@@ -7775,7 +7832,7 @@ msgid "Associated Partner"
 msgstr "Zugehöriger Partner"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sie müssen zuerst einen Partner wählen!"
@@ -7843,7 +7900,7 @@ msgid "Choose Fiscal Year"
 msgstr "Wähle Geschäftsjahr"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7882,7 +7939,6 @@ msgstr "Finanzbuchhaltung"
 #: 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
@@ -7895,6 +7951,19 @@ msgstr "Finanzbuchhaltung"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periode"
@@ -7990,14 +8059,6 @@ msgstr "Tel.:"
 msgid "Company Currency"
 msgstr "Betriebl. Währung"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Kontenplan"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -8064,7 +8125,7 @@ msgid "Account Types"
 msgstr "Kontoartkonfiguration"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "Kann keine Rechnungsbuchungen in zentralisiertem Journal durchführen"
@@ -8114,8 +8175,13 @@ msgstr "Journal Gutschriften"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr "Filter nach"
 
@@ -8158,7 +8224,7 @@ msgid "Payment Term Line"
 msgstr "Zahlungsbedingungen"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -8334,8 +8400,8 @@ msgstr ""
 "Bankauszug übereinstimmen."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Falsches Konto!"
@@ -8346,7 +8412,7 @@ 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:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Die Buchungszeile (%s)"
@@ -8573,14 +8639,14 @@ msgid "Period from"
 msgstr "Gültig ab"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Gutschriften Ausgangsrechnungen Journal"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8630,7 +8696,7 @@ msgid "Purchase Tax(%)"
 msgstr "Steuer Einkauf (%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Bitte erstellen Sie einige Rechnungspositionen"
@@ -8646,7 +8712,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Konfigurieren Sie die Anwendungen für die Finanzbuchhaltung"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8690,18 +8756,22 @@ msgstr "Überwachung von Zahlungseingängen"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr "Start Periode"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Kann keine Buchung auf einem Oberkonto vonehmen."
@@ -8739,7 +8809,7 @@ msgstr ""
 "Buchhalter verbucht und validiert die Buchungszeilen einer Rechnung. "
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8769,7 +8839,7 @@ msgid "You can not create move line on view account."
 msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Aktuelle Währung ist nicht korrekt definiert"
@@ -8823,8 +8893,12 @@ msgstr "Leer lassen um das Erlöskonto zu nutzen"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8843,7 +8917,15 @@ msgstr "Händisch oder automatisch im System erfasst."
 
 #. 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 "Anzeige Konten"
 
@@ -8975,7 +9057,6 @@ msgstr "Händische Buchung"
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8983,7 +9064,7 @@ msgid "Move"
 msgstr "Buchung"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, 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."
@@ -9065,7 +9146,7 @@ msgstr "Juli"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontenplan Finanzkonten"
 
 #. module: account
@@ -9082,13 +9163,17 @@ msgstr "Saldo Analytisches Konto"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr "Ende der Periode"
 
@@ -9108,7 +9193,7 @@ msgstr "Ende der Periode"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Kontenplan Finanzen"
 
 #. module: account
@@ -9127,7 +9212,7 @@ msgid "Account Subscription"
 msgstr "Konto Automatische Buchung"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -9156,7 +9241,6 @@ msgstr "Eingabe automat. Buchung"
 #: 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
@@ -9185,7 +9269,7 @@ msgid "Unreconciled"
 msgstr "Offene Posten"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Falsche Summe!"
@@ -9252,13 +9336,13 @@ msgid "Active"
 msgstr "Aktiv"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9313,6 +9397,7 @@ msgstr "Buchen"
 #: report:account.journal.period.print: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
@@ -9396,6 +9481,18 @@ msgstr "Sonstige"
 #: selection:account.pl.report,filter: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
@@ -9561,6 +9658,7 @@ msgstr "Periode auswählen"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Gebucht"
 
@@ -9579,7 +9677,6 @@ msgstr "Gebucht"
 #: 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
@@ -9612,13 +9709,10 @@ msgid "Tax Source"
 msgstr "Steuer"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Netto Gewinn"
 
@@ -9633,7 +9727,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Dieses ist ein Modell für wiederkehrende Buchungen."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9643,8 +9737,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "Journal"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9796,8 +9890,8 @@ msgid "End period"
 msgstr "Ende Periode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9869,6 +9963,7 @@ msgstr "Eingangsrechnungen"
 #: report:account.journal.period.print: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
@@ -9905,7 +10000,7 @@ msgid "Recurring"
 msgstr "Wiederkehrend"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Buchung wurde bereits ausgeglichen"
@@ -9926,7 +10021,7 @@ msgid "Range"
 msgstr "Bereich"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9944,6 +10039,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Konten mit Buchungen"
 
@@ -10067,7 +10172,7 @@ msgid "Accounts Mapping"
 msgstr "Zuordnung Finanzkonten"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Rechnung '%s' wartet auf Buchungsfreigabe."
@@ -10092,7 +10197,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "Aufwand- und Erlöskonto des Produktes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -10302,7 +10407,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "Die Länge der Periode muss größer als 0 sein"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr ""
@@ -10338,19 +10443,17 @@ msgstr ""
 "Der verbleibende Saldo auf einem Debitor oder Kreditor nach vorgenommenen "
 "Buchung in der Landeswährung."
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Frei lassen für Periode des Validierungsdatums."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "Anlagen"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Fehler! Sie können keine rekursiven Konten definieren."
-
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Falls Sie Zahlungsbedingungen einsetzen wird das Fälligkeitsdatum für die "
-#~ "Rechnungen automatisch berechnet."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Verbindlichkeiten"
 
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Offene Eingangsrechnungen"
@@ -10414,18 +10517,6 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Zahlungsausgleich Offener Posten"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Rabatt (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Sollte Ihre Zahlung erfolgt sein und sich mit dieser Nachricht zeitlich "
-#~ "überschneiden, betrachten Sie diesen Hinweis als gegenstandlos. Bitte fragen "
-#~ "Sie bei Unklarheiten unsere Finanzbuchhaltung."
-
 #~ msgid "Contra"
 #~ msgstr "Gegenposition"
 
@@ -10465,9 +10556,6 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Journal Beleg"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Analytische Rechnung"
 
@@ -10604,9 +10692,6 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Beende Jahr"
 
-#~ msgid "Crédit"
-#~ msgstr "Haben"
-
 #~ msgid "Income"
 #~ msgstr "Erlöse"
 
@@ -10741,10 +10826,6 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Entwurf Eingangsrechnung"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Konfigurationsfehler!"
-
 #~ 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 "
@@ -10753,9 +10834,6 @@ msgstr ""
 #~ "Vorbehaltlich eines Fehlers unsererseits sind folgende Rechnungen unbezahlt. "
 #~ "Bitte bezahlen Sie innerhalb der nächsten 8 Tage."
 
-#~ msgid "Débit"
-#~ msgstr "Soll"
-
 #~ msgid "x Checks Journal"
 #~ msgstr "x Checks Journal"
 
@@ -10830,9 +10908,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Gehe zu"
 
-#~ msgid "Partner ID"
-#~ msgstr "Partner Kurzbez."
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Neue Ausgangrechnung"
 
@@ -10885,9 +10960,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Dokument"
 
-#~ msgid "Move name"
-#~ msgstr "Buchung Bezeichnung"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Storniere ausgew. Rechnungen"
 
@@ -10899,9 +10971,6 @@ msgstr ""
 #~ "Vorgeschlagene Ausgangsrechnungen müssen geprüft, validiert und gedruckt "
 #~ "werden."
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "By Date and Period"
 #~ msgstr "Nach Datum und Periode"
 
@@ -10919,10 +10988,6 @@ msgstr ""
 #~ msgid "Financial Management"
 #~ msgstr "Finanzen"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Das Konto zum Ausziffern wurde noch nicht definiert!"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Zusatzinformation"
 
@@ -10970,9 +11035,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Zahle Rechnung / OP Ausgleich"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldenliste anzeigen"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Neue Gutschrift Lieferanten"
 
@@ -10994,9 +11056,6 @@ msgstr ""
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definiere Wirtschaftsjahr und Kontenplan"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Dauer Abschreibung"
-
 #~ msgid "3 Months"
 #~ msgstr "3 Monate"
 
@@ -11137,9 +11196,6 @@ msgstr ""
 #~ msgid "Unpaid Customer Invoices"
 #~ msgstr "Offene Ausgangsrechnungen"
 
-#~ msgid "Partner name"
-#~ msgstr "Name Partner"
-
 #~ msgid "Journal/Payment Mode"
 #~ msgstr "Journal/Zahlungsbedingung"
 
@@ -11166,6 +11222,9 @@ msgstr ""
 #~ "Trage Anfangssaldo und Endsaldo ein um von einer Eingabeprüfung zu "
 #~ "profitieren."
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "General Ledger -"
 #~ msgstr "Hauptbuch -"
 
@@ -11190,10 +11249,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Erfassen Buchungen"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Sie können kein Konto deaktivieren welches Buchungen beinhaltet."
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filter Kunden / Lieferanten"
 
@@ -11326,9 +11381,6 @@ msgstr ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 #~ msgstr "Ausgewählte Buchungen haben keine Entwurfspositionen"
 
-#~ msgid "All account entries"
-#~ msgstr "Alle Buchungen"
-
 #~ msgid "Date Filter"
 #~ msgstr "Filter Datum"
 
@@ -11451,10 +11503,6 @@ msgstr ""
 #~ msgid "Journal de vente"
 #~ msgstr "Verkaufsjournal"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Soll-Haben ungleiche Buchungen können nicht validiert werden."
-
 #~ msgid "Parent Analytic Account"
 #~ msgstr "Übergeordnetes Analyse Konto"
 
@@ -11476,13 +11524,6 @@ msgstr ""
 #~ msgid "Date or Code"
 #~ msgstr "Datum oder Code"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Das Bankkonto des Partner für diese Zahlung.\n"
-#~ "Leer für Standard"
-
 #~ msgid "Journal d'ouverture"
 #~ msgstr "Eröffnungsjournal"
 
@@ -11506,10 +11547,6 @@ msgstr ""
 #~ msgid "Fiscal Position Template Tax Mapping"
 #~ msgstr "Steuerliche Position Vorlage Steuerzuordnung"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "Keine ausgleichbaren Buchungen im alten Geschäftsjahr"
-
 #~ msgid "Maximum Quantity"
 #~ msgstr "Max. Menge"
 
@@ -11678,217 +11715,14 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Beleg OP-Ausgleich"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Analytische Konten für Periodenabschluss"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Entwurf Rechnungen"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Abzurechnende Analytische Konten"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Abzurechnende Kosten"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Anzeigetafel für Rechnungswesen"
-
-#~ msgid "My indicators"
-#~ msgstr "Meine Indikatoren"
-
-#~ msgid "Aged income"
-#~ msgstr "Überfällige Erträge"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Zeige Soll/Haben Information"
-
-#~ msgid "All accounts"
-#~ msgstr "Alle Konten"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Auswahl der Buchungen basiert auf"
-
-#~ msgid "Notification"
-#~ msgstr "Benachrichtigung"
-
-#~ msgid "Financial Period"
-#~ msgstr "Geschäftsjahres Periode"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Periodenauswahl"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Vergleiche ausgewählte Jahre in Bezig auf"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Auswahl der Geschäftsjahre (Max 3)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Auswahl des Referenzkontos ( für % Vergleich)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Konten Saldo - Jahresvergleich"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Account Balance erweitert die Funktionalität der Finanz Modules\n"
-#~ "\n"
-#~ "    Mit diesem Modul können verschiedene Darstellungen einer BIlanz gedruckt "
-#~ "werden\n"
-#~ "\n"
-#~ "    1. Jahresvergleiche\n"
-#~ "\n"
-#~ "    2. Vergleichswerte in Geld oder Prozent.\n"
-#~ "\n"
-#~ "    3. Definition des Kontos der 100% Basis\n"
-#~ "\n"
-#~ "    4. Auswahl der Perioden aufgrund Buchungs oder Erstellungsdatum\n"
-#~ "\n"
-#~ "    5. Druck in Hoch oder Querformat\n"
-#~ "    "
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Sie müssen \"Querformat\" auswählen."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Report im Querformat anzeigen"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Zeige Vergleich in %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "NIcht Vergleichen"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Zeige Konten"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Sie haben jedenfalls mehr als 3 Jahre ausgewählt."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Buchhaltung und Finanzmanagement - Vergleiche Konten"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Sie können maximal 3 Jahre auswählen.  Nochmals versuchen!"
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Sie haben die 'Prozent' Option mit mehr als 2 Jahren ausgewählt, jedoch "
-#~ "nicht \"Querformat\"."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Sie haben möglicherweise folgende Fehler gemacht. Bitte korrigieren und "
-#~ "nochmals versuchen."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Für Vergleich mit übergeordnetem Satz leer lassen"
-
-#~ msgid "Creation Date"
-#~ msgstr "Erzeugt am"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr "2. Sie haben mehr als 2 Jahre ohne \"Prozent\" Option ausgewählt."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Sie haben die Vergleiche mit mehr als einem Jahr, sowie Soll/Haben Spalten "
-#~ "und der % Option ausgewählt.\r\n"
-#~ "Das könnte dazu führen, das über den Papierrand gedruckt wird. Ändern Sie "
-#~ "bitte die Anforderung."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Sie müssen mindestens 1 Geschäftsjahr auswählen. Nochmals versuchen!"
-
-#~ msgid "Customize Report"
-#~ msgstr "Personalisierung Report"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Dieses Module erwietert das Finanz Module um weitere Reports"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Finanz Reporting"
-
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Steuer Umschlüsselung Vorlage"
-
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Konten Steuer Umschlüsselung"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Steuer Umschlüsselung Vorlagen"
-
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Steuer Umschlüsselung Anmerkung:"
-
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "Die Steuerumschlüsselung legt Steuern und Konten für diesen PArtner fest."
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Steuern Umschlüsselung"
-
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Steuer Umschlüsselung Vorlage"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Steuerumschlüsselung Vorlage"
-
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Steuer Umschlüsselung"
-
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr ""
 #~ "Es ist kein Journal für die Abschlussbuchungen des Geschäftsjahres definiert"
 
-#~ msgid "supplier"
-#~ msgstr "Lieferant"
-
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Gutschriften Lieferanten Journal -(Test)"
-
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "Ein Journal besteht aus Buchungssätzen, wobei eine Buchung entweder im Soll "
-#~ "oder im Haben erfolgt. OpenERP erzeugt automatisch Buchungen bei folgenden "
-#~ "Belegen der Finanzbuchhaltung: Rechnung, Gutschrift, Lieferantenzahlung, "
-#~ "Bankauszug, etc."
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Der Saldo für diesen gebuchten Auszug stimmt nicht überein !\n"
@@ -11897,397 +11731,25 @@ msgstr ""
 #~ msgid "UnknownError"
 #~ msgstr "UnbekannterFehler"
 
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Ausgangsrechnungen ermöglichen die Erstellung von Rechnungen an Ihre Kunden. "
-#~ "OpenERP erzeugt Rechnungen im Status 'Entwurf' automatisch, somit müssen Sie "
-#~ "vor dem Versenden der Rechnung nur noch bestätigen."
-
-#~ msgid ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder "
-#~ "sogar den gesamte Rechnungsbetrag auf Ihrem Konto beim Lieferanten als "
-#~ "Gutschrift ausweist .."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die ID für das Zertifikat des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Eingansrechnungen ermöglicht Ihnen eine Erfassung von Rechnungen Ihrer "
-#~ "Lieferanten. OpenERP erzeugt automatisch Rechnungen im Status Entwurf. "
-#~ "Hierdurch können Sie dann auch einen Abgleich mit dem "
-#~ "Wareneingangslieferschein oder der Bestellung vornehmen."
-
-#~ msgid "Move/Entry label"
-#~ msgstr "Buchungstext"
-
-#~ msgid "Entry No"
-#~ msgstr "Buchung Nr."
-
-#~ msgid ""
-#~ "A recurring entry is a payment related entry that occurs on a recurrent "
-#~ "basis from a specific date corresponding to the signature of a contract or "
-#~ "an agreement with a customer or a supplier. With Define Recurring Entries, "
-#~ "you can create them in the system in order to automate their entries in the "
-#~ "system."
-#~ msgstr ""
-#~ "Eine wiederkehrende Buchung ist eine Zahlung oder Rechnung, die je nach "
-#~ "vertraglichen Konditionen immer wiederkehrend einer bestimmten zeitlichen "
-#~ "Abfolge folgt.Sie können wiederkehrende Buchungen erstellen und automatisch "
-#~ "oder händisch in beliebiger Frequenz vornehmen."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen!"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the payment "
-#~ "term without removing it."
-#~ msgstr ""
-#~ "Durch Aktivierung dieser Option, kann die Ansicht dieser Zahlungsbedingung "
-#~ "verhindert werden ohne sie zu löschen."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Rechnung "
 
-#~ msgid ""
-#~ "Define your company's fiscal year depending on the period you have chosen to "
-#~ "follow. A fiscal year is a 1 year period over which a company budgets its "
-#~ "spending. It may run over any period of 12 months. The fiscal year is "
-#~ "referred to by the date in which it ends. For example, if a company's fiscal "
-#~ "year ends November 30, 2011, then everything between December 1, 2010 and "
-#~ "November 30, 2011  would be referred to as FY 2011. Not using the actual "
-#~ "calendar year gives many companies an advantage, allowing them to close "
-#~ "their books at a time which is most convenient for them."
-#~ msgstr ""
-#~ "Definieren Sie das Geschäftsjahr in Abhängigkeit der von Ihnen zu "
-#~ "erstellenden Periodenabschlüsse. Ein Geschäftsjahr ist ein 1-Jahres-"
-#~ "Zeitraum, den ein Unternehmen selbst definieren kann. Das Geschäftsjahr "
-#~ "erstreckt sich generell über einen Zeitraum von 12 Monaten. Ein "
-#~ "Geschäftsjahr wird außerdem gekennzeichnet durch den Zeitpunkt, in dem es "
-#~ "endet. Wenn z.B. in einem Unternehmen das Geschäftsjahr am 30. November 2011 "
-#~ "endet, dann entspricht alles zwischen dem 1. Dezember 2010 und 30. November "
-#~ "2011 dem Geschäftsjahr für  2011. Eine Abweichung vom tatsächlichen "
-#~ "Kalenderjahr könnte für viele Unternehmen insofern einen Vorteil bieten, "
-#~ "wenn Sie hierdurch ihre Bücher zu einem Zeitpunkt abschliessen können, der "
-#~ "aus unterschiedlichen internen Gründen für das Unternehmen der günstigste "
-#~ "sein kann."
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilanz (Vermögen)"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "Dieses Konto wird anstelle des Default-Kontos verwendet für die Erfassung "
-#~ "von Aufwendungen für das aktuelle Produkt."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn dieses Feld aktiviert ist , kann eine definierte Steuer ausgeblendet "
-#~ "werden, ohne diese vollständig zu entfernen."
-
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "wurde geprüft und gebucht."
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-#~ msgstr ""
-#~ "Durch Aktivierung dieser Option, kann die Anzeige dieses Journals verhindert "
-#~ "werden ohne das Journal zu löschen."
-
-#~ msgid "Sales Credit Note Journal - (test)"
-#~ msgstr "Verkaufsgutschrift Journal - (test)"
-
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Barkasse Journal (test)"
-
-#~ msgid ""
-#~ "Here you can personalize and create each view of your financial journals by "
-#~ "selecting the fields you want to appear and the sequence they will appear."
-#~ msgstr ""
-#~ "Sie können hier die Ansicht Ihrer Journale personalisieren, indem Sie die "
-#~ "anzuzeigenden Felder und deren Reihenfolge angeben."
-
-#~ msgid ""
-#~ "Here, you can define a period, an interval of time between successive "
-#~ "closings of the books of your company. An accounting period typically is a "
-#~ "month or a quarter, corresponding to the tax year used by the business. "
-#~ "Create and manage them from here and decide whether a period should be left "
-#~ "open or closed depending on your company's activities over a specific period."
-#~ msgstr ""
-#~ "Sie können hier eine Periode anlegen, d.h. ein Zeitintervall nach deren "
-#~ "Ablauf üblichweise dann der Zeitraum beendet und ausgewertet wird. Eine "
-#~ "Buchungsperiode umfasst normalerweise ein Monat oder ein Quartal, in "
-#~ "Korrespondenz mit den abzugebenden Steuererklärungen. Erzeugen Sie hier Ihre "
-#~ "Perioden und steuern Sie auch inwieweit Perioden geöffnet oder beendet "
-#~ "werden, je nachdem wie die gängige Praxis in Ihrem Unternehmen ist oder die "
-#~ "Steuerbehörden dieses erfordern."
-
-#~ msgid "Bank Journal - (test)"
-#~ msgstr "Bank Journal - (test)"
-
-#~ msgid "Central Journals"
-#~ msgstr "Erstelle  Journale"
-
-#~ msgid ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-#~ msgstr ""
-#~ "Die Kassenbuch Anwendung ermöglicht Buchen von Barkassen und Abstimmung von "
-#~ "Bargeldbeständen."
-
-#~ msgid "Default UoM"
-#~ msgstr "Standard Menge (ME)"
-
-#~ msgid "Expenses Journal - (test)"
-#~ msgstr "Aufwendungen Journal - (test)"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Grösse des Feldes darf nie kleiner als 1 sein !"
-
-#~ msgid "Sales Journal - (test)"
-#~ msgstr "Verkauf Journal - (test)"
-
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Fehler! Sie können keine rekursiven Konten definieren."
 
-#~ msgid ""
-#~ "Create and manage your company's financial journals from this menu. A "
-#~ "journal is a business diary in which all financial data related to the day "
-#~ "to day business transactions of your company is recorded using double-entry "
-#~ "book keeping system. Depending on the nature of its activities and number of "
-#~ "daily transactions, a company may keep several  types of specialized "
-#~ "journals such as a cash journal, purchases journal, and sales journal."
-#~ msgstr ""
-#~ "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 Anzahl an "
-#~ "täglichen Buchungsvorgängen, kann ein Unternehmen diverse verschiedene "
-#~ "Journale für unterschiedliche Zwecke anlegen, z.B. Journale für diverse "
-#~ "Kassen, Bankkonten, Verkaufslager etc."
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "Dieses Konto wird anstelle des Standard Kontos bei der Buchung von "
-#~ "Ausgangsrechnungen für dieses Produkt verwendet"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
-
-#~ msgid ""
-#~ "You can look up individual account entries by searching for useful "
-#~ "information. To search for account entries, open a journal, then select a "
-#~ "record line."
-#~ msgstr ""
-#~ "Sie können Details zu bestimmten einzelnen Buchungen durch die Suche in "
-#~ "Finanzjournalen aufspüren. Öffnen Sie hierzu einfach ein Journal und nutzen "
-#~ "Sie die Suche."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Dieses Konto wird gebucht bei Rechnungspositionen zu Produkten aus der "
-#~ "aktuellen Kategorie"
-
-#~ msgid ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-#~ "& Loss Report"
-#~ msgstr ""
-#~ "Dieses Konto wird als vorläufiges Konto für einen Gewinn oder Verlust aus "
-#~ "dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird "
-#~ "gutgeschrieben, bei vorläufigem Verlust: Betrag wird belastet.) Der Betrag "
-#~ "wird durch die Auswertung Gewinn & Verlust generiert."
-
-#~ msgid ""
-#~ "A tax code is a reference of a tax that will be taken out of a gross income "
-#~ "depending on the country and sometimes industry sector. OpenERP allows you "
-#~ "to define and manage them from this menu."
-#~ msgstr ""
-#~ "Ein Steuerkonto repräsentiert die berechnete  Umsatzsteuer oder Vorsteuer "
-#~ "bei Ausgangs- oder Eingangsrechnungen, die in Abhängigkeit von "
-#~ "Ursprungsland, Zielland, Produkt etc. vom Nettobetrag über den Prozentwert "
-#~ "der Steuer errechnet wird und als Aufschlag auf den Nettobetrag Bestandteil "
-#~ "der gesamten Rechnungssumme ist."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-#~ msgstr ""
-#~ "Der Umsatzsteuerkontenplan wird genutzt, um periodisch die "
-#~ "Steuervoranmeldung zu erzeugen. Sie finden hier die Steuern mit den "
-#~ "Kurzbezeichnungen für eine offizielle Umsatzsteuererklärung gemäß der "
-#~ "Anforderungen für Ihr Land."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Der Name des Moduls muss eindeutig sein."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the analytic "
-#~ "journal without removing it."
-#~ msgstr ""
-#~ "Durch Aktivierung dieser Option, kann die Ansicht dieser analytischen "
-#~ "Journale verhindert werden ohne diese komplett zu löschen."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn diese Option aktiviert wird, kann das Konto derart zur Weiterverwendung "
-#~ "von Prezi genutzt werden."
-
-#~ msgid ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
-#~ msgstr ""
-#~ "Ein beste Praxis Ansatz wäre die Definition eines Journals für die Buchungen "
-#~ "der Eröffnungsbilanz. Beachten Sie dabei, dass Sie ein Standard Soll/Haben "
-#~ "Konto hinterlegen, sowie die Option 'Zentrales Gegenkonto' aktivieren."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Dieses Konto wird gebucht bei Rechnungspositionen zu Produkten aus der "
-#~ "aktuellen Produktkategorie"
-
-#~ msgid "Checks Journal - (test)"
-#~ msgstr "Schecks Journal - (test)"
-
-#~ msgid "Low Level"
-#~ msgstr "Basiskonfiguration"
-
-#~ msgid ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-#~ msgstr ""
-#~ "Kundengutschriften ermöglichen die Erfassung von Gutschriften für Ihre "
-#~ "Kunden. Eine Gutschrift ist ein Beleg, der eine Rechnung teilweise oder ganz "
-#~ "storniert. Sie können sehr einfach Gutschriften zu einer vorhandenen "
-#~ "Rechnung erzeugen und gleichzeitig Rechnung und Gutschrift miteinander "
-#~ "ausgleichen."
-
-#~ msgid ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-#~ msgstr ""
-#~ "Ein Bankauszug ist eine Zusammenfassung aller finanziellen Transkationen, "
-#~ "die über eine bestimmten  Zeitraum auf einem anderen Finanzkonto, "
-#~ "Kreditkarte oder Onlinekonto erfasst wurden. Beginnen Sie einen neuen "
-#~ "Bankauszug durch die Erfassung eines Eröffnungs- und Endsaldos, bevor Sie "
-#~ "anschließend alle einzelnen Buchungspositionen eingeben. Wenn Sie in der "
-#~ "Spalte Zahlung sind, können Sie dann per F1 das Fenster für den Ausgleich "
-#~ "offener Posten öffnen."
-
-#~ msgid "Aged receivables"
-#~ msgstr "Überfällige Debitoren"
-
-#~ msgid ""
-#~ "An account type is a name or code given to an account that indicates its "
-#~ "purpose. For example, the account type could be linked to an asset account, "
-#~ "expense account or payable account. From this view, you can create and "
-#~ "manage the account types you need to be used for your company management."
-#~ msgstr ""
-#~ "Durch die Kontoart soll für einen Buchhalter erkennbar sein, welchen Zweck "
-#~ "ein definiertes Konto dieser Art erfüllt. Zum Beispiel, können Kontoarten "
-#~ "wie  z.B. Anlagekonto, Aufwand oder Ertrag zu einzelnen Konten hinterlegt "
-#~ "werden und somit z.B. bei täglichen Buchungen oder Auswertungen als "
-#~ "Suchhilfe dienen. Hier können Sie konkret die Kontoarten definieren, die Sie "
-#~ "in Ihrem Unternehmen für die Finanzbuchhaltung benötigen."
-
-#~ msgid ""
-#~ "Create and manage accounts you will need to record financial entries in. "
-#~ "Accounts are financial records of your company that register all financial "
-#~ "transactions. Companies present their annual accounts in two main parts: the "
-#~ "balance sheet and the income statement (profit and loss account). The annual "
-#~ "accounts of a company are required by law to disclose a certain amount of "
-#~ "information. They have to be certified by an external auditor yearly."
-#~ msgstr ""
-#~ "Erstelle und verwalte Konten für die Finanzbuchhaltung. Finanzkonten sind "
-#~ "vorgesehen für die Aufzeichnung aller Geschäftsvorfälle mit Auswirkungen auf "
-#~ "die Vermögens-, Finanz- und Ertragslage eines Unternehmens. Unternehmen sind "
-#~ "i.d.R. verpflichtet diese finanzielle Situation in Form einer Bilanz und "
-#~ "Gewinn- und Verlustrechnung gegenüber Dritten, wie z.B. den Finanzbehörden "
-#~ "oder Anteilseignern und Kapitalgebern darzustellen. Diese Finanzkonten "
-#~ "bilden die Grundlage für den Jahresabschluss und die  Prüfung eines "
-#~ "Unternehmens."
-
-#~ msgid "End of Year"
-#~ msgstr "Jahresende"
-
-#~ msgid ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder "
-#~ "sogar den gesamte Rechnungsbetrag auf Ihrem Konto beim Lieferanten als "
-#~ "Gutschrift ausweist .."
-
-#~ msgid ""
-#~ "given a period and a journal, the sum of debit will always be equal to the "
-#~ "sum of credit, so there is no point to display it"
-#~ msgstr ""
-#~ "Bezogen auf eine bestimmte Periode, muss der Wert der Soll- und Habenbuchung "
-#~ "übereinstimmen."
-
-#~ msgid "Must be after setLang()"
-#~ msgstr "Sollte nach setLang() folgen"
-
-#~ msgid ""
-#~ "This menu helps you manage the credit notes issued/to be issued for your "
-#~ "customers. A refund invoice is a document that cancels an invoice or a part "
-#~ "of it. You can easily generate refunds and reconcile them from the invoice "
-#~ "form."
-#~ msgstr ""
-#~ "Dieses Menü hilft Ihnen beim Management der erstellten bzw. zu erstellenden "
-#~ "Gutschriften für Ihre Kunden. Eine Gutschrift ist ein Beleg der entweder den "
-#~ "gesamten Rechnungsbetrag oder einen Teilbetrag storniert. Sie können auf "
-#~ "einfache Weise ausgehend vom Rechnungsformular Gutschriften erstellen und "
-#~ "diese zusammen mit der korrespondierenden Rechnung ausgleichen."
-
-#~ msgid ""
-#~ "This Account is used for transferring Profit/Loss(If It is Profit: Amount "
-#~ "will be added, Loss : Amount will be duducted.), Which is calculated from "
-#~ "Profilt & Loss Report"
-#~ msgstr ""
-#~ "Dieses Konto wird als vorläufiges Konto für einen Gewinn oder Verlust aus "
-#~ "dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird "
-#~ "gutgeschrieben, bei vorläufigem Verlust: Betrag wird belastet.) Der Betrag "
-#~ "wird durch die Auswertung Gewinn & Verlust generiert."
+#~ msgid "Chart of Accounts"
+#~ msgstr "Kontenplan"
 
 #~ msgid ""
 #~ "Gives the view used when writing or browsing entries in this journal. The "
@@ -12311,3 +11773,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Kein Zeitraum für dieses Datum definiert!\n"
 #~ "Bitte erzeugen Sie ein neues Geschäftsjahr."
+
+#~ msgid "Balance:"
+#~ msgstr "Saldo:"
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index e43d385fdfc..269a7b1c8a4 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: 2011-04-29 05:06+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -41,7 +41,7 @@ msgid ""
 "Partner."
 msgstr ""
 "Δεν μπορείτε να καταργήσετε / απενεργοποίησετε έναν λογαριασμού που έχει "
-"οριστεί ως ιδιοτητα σε κάθε εταίρο"
+"οριστεί ως ιδιοτητα σε κάποιο Συνεργάτη"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -104,6 +104,8 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Η αναφορά Κερδών & Ζημιών σας δίνει μια σύνοψη των κερδών ή ζημιών της "
+"εταιρείας σας σε ένα έγγραφο"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -514,8 +516,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1156,6 +1156,7 @@ 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
@@ -1346,6 +1347,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Με υπόλοιπο δάιφορο του 0"
 
@@ -2059,7 +2070,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2123,6 +2134,8 @@ 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
 msgid "Entries Sorted By"
 msgstr "Εγγραφές Ταξινομημένες Ανά"
 
@@ -2144,11 +2157,16 @@ msgstr "Πρότυπο Προϊόντος"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2472,6 +2490,7 @@ 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
@@ -2718,6 +2737,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2993,7 +3014,6 @@ msgstr "Διατηρήστε κενό για να χρησιμοποιήσετε
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3007,6 +3027,17 @@ msgstr "Διατηρήστε κενό για να χρησιμοποιήσετε
 #: 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 "Ημερολόγια"
 
@@ -3217,6 +3248,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3275,6 +3307,16 @@ msgstr "ΦΠΑ :"
 #: 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.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 "Chart of Accounts"
 msgstr "Λογιστικό Σχέδιο"
 
@@ -3721,11 +3763,10 @@ msgid "Analytic Balance"
 msgstr "Αναλυτικό Ισοζύγιο"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4406,7 +4447,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4549,7 +4590,6 @@ msgid "Analytic Balance -"
 msgstr "Αναλυτικό ισοζύγιο"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4562,10 +4602,8 @@ msgstr "Αναλυτικό ισοζύγιο"
 #: 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.journal.period.print: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
@@ -4575,6 +4613,16 @@ msgstr "Αναλυτικό ισοζύγιο"
 #: 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
 msgid "Target Moves"
 msgstr "Επιλεγμένες Κινήσεις"
 
@@ -4691,6 +4739,8 @@ msgstr "Αποτελέσματα Εκκαθάρισης"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5409,6 +5459,19 @@ msgstr ""
 
 #. 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 "Κανένα Φίλτρο"
@@ -6322,6 +6385,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6553,7 +6617,7 @@ msgstr "Αναλυτικές Γραμμές"
 #: 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 "
+"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) "
@@ -7235,6 +7299,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7490,6 +7555,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Περίοδος"
@@ -7574,14 +7652,6 @@ msgstr "Τηλ. :"
 msgid "Company Currency"
 msgstr "Νόμισμα Εταιρίας"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7694,6 +7764,12 @@ msgstr "Ημερολόγιο Επιστροφών"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7936,6 +8012,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8219,12 +8296,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8342,7 +8424,12 @@ msgstr "Διατηρήστε το κενό για να χρησιμοποιηθ
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8361,6 +8448,15 @@ 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 ""
 
@@ -8562,7 +8658,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Λογιστικό Σχέδιο"
 
 #. module: account
@@ -8579,12 +8675,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8604,7 +8705,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8787,6 +8888,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8868,6 +8970,18 @@ msgstr "Γενικά"
 #: selection:account.pl.report,filter: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
@@ -9077,13 +9191,10 @@ msgid "Tax Source"
 msgstr "Πηγή Φόρου"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Καθαρό Κέρδος"
 
@@ -9107,8 +9218,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9315,6 +9426,7 @@ msgstr "Τιμολόγιο Προμηθευτή"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9391,6 +9503,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Με κινήσεις"
 
@@ -9763,6 +9885,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Entries Encoding"
 #~ msgstr "Κωδικοποίηση Εγγραφών"
 
@@ -9811,18 +9945,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Σύνολο εγγραφών"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Έκπτωση (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Εφόσον έχετε τακτοποιήσει την πληρωμή μετά την αποστολή αυτής της "
-#~ "αλληλογραφίας, παρακαλούμε θεωρείστε την παρούσα άκυρη. Παρακαλούμε μην "
-#~ "διστάσετε να επικοινωνήσετε με το λογιστήριο στο +32 81 81 37 00."
-
 #~ msgid "Supplier invoice"
 #~ msgstr "Τιμολόγιο Προμηθευτή"
 
@@ -9838,9 +9960,6 @@ msgstr ""
 #~ msgid "Analytic Invoice"
 #~ msgstr "Τιμολόγιο Αναλυτικής"
 
-#~ msgid "account.move.line"
-#~ msgstr "λογαριασμός.κίνηση.γραμμή"
-
 #~ msgid "Partner account"
 #~ msgstr "Λογαριασμός συνεργάτη"
 
@@ -9913,9 +10032,6 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Παρουσίαση λογαριασμών "
 
-#~ msgid "Crédit"
-#~ msgstr "Πίστωση"
-
 #~ msgid "Print General Journal"
 #~ msgstr "Εκτύπωση Γενικού Ημερολογίου"
 
@@ -9940,9 +10056,6 @@ msgstr ""
 #~ msgid "New Statement"
 #~ msgstr "Νέα Δήλωση"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Σφάλμα! Δεν μπορείτε να δημιουργήσετε επαναλαμβανόμενο λογαριασμό."
-
 #~ msgid "Account Entry Reconcile"
 #~ msgstr "Συμφωνία Εγγραφών Λογαριασμού"
 
@@ -9959,13 +10072,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Επιλέξτε τα τιμολόγια που θέλετε να πληρώσετε και διαχειριστείτε προκαταβολές"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Ο λογαριασμός τραπέζης του συνεργάτη προς πληρωμή\n"
-#~ "Διατηρήστε κενό για να χρησιμοποιηθεί η προκαθορισμένη"
-
 #~ msgid "Account to reconcile"
 #~ msgstr "Λογαριασμός προς συμφωνία"
 
@@ -10026,13 +10132,6 @@ msgstr ""
 #~ msgid "Validated accounting entries."
 #~ msgstr "Επικυρωμένες εγγραφές λογιστικής."
 
-#~ msgid "Débit"
-#~ msgstr "Χρέωση"
-
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Σφάλμα Παραμετροποίησης!"
-
 #~ msgid "Date Invoiced"
 #~ msgstr "Ημερομηνία Τιμολόγησης"
 
@@ -10228,10 +10327,6 @@ msgstr ""
 #~ msgid "Close Fiscal Year with new entries"
 #~ msgstr "Κλείσίμο Λογιστικής Χρήσης με νέες εγγραφές"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "Η παλαιά Λογιστική Χρήση δεν περιέχει εγγραφές για συμφωνία"
-
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Η ημερομηνία δεν ανήκει σε Λογιστική Χρήση"
@@ -10253,10 +10348,6 @@ msgstr ""
 #~ msgid "Standard entry"
 #~ msgstr "Τυπική εγγραφή"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Δεν μπορείτε να επικυρώσετε μιά μή αντιλογισμένη εγγραφή!"
-
 #~ msgid "Journal de vente"
 #~ msgstr "Ημερολόγιο Πωλήσεων"
 
@@ -10372,9 +10463,6 @@ msgstr ""
 #~ msgid "Account No."
 #~ msgstr "Αρ. Λογαριασμού"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Αφήστε το κενό για χρήση της περιόδου επικύρωσης"
-
 #~ msgid "Automatic reconciliation"
 #~ msgstr "Αυτόματη συμφωνία"
 
@@ -10433,9 +10521,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Go"
 
-#~ msgid "Partner ID"
-#~ msgstr "Αρ. Συνεργάτη"
-
 #~ msgid "Analytic account costs and revenues"
 #~ msgstr "Έσοδα και κόστος αναλυτικού λογαριασμού"
 
@@ -10489,18 +10574,12 @@ msgstr ""
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Η \"ημερομηνία σε\" πρέπει να οριστεί ανάμεσα στην %s και την %s"
 
-#~ msgid "Move name"
-#~ msgstr "Όνομα κίνησης"
-
 #~ msgid "Reconcilate the entries from payment"
 #~ msgstr "Συμφωνία εγγραφών από πληρωμές"
 
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Προτεινόμενο τιμολόγιο για έλεγχο, επικύρωση και εκτύπωση"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Journal de Banque CHF"
 #~ msgstr "Ημερολόγιο Ελβετικής Τράπεζας"
 
@@ -10511,10 +10590,6 @@ msgstr ""
 #~ "Οι κινήσεις λογαριασμού του τιμολογίου έχουν συμφωνηθεί με κινήσεις από "
 #~ "πληρωμές."
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Ο λογαριασμός δεν έχει οριστεί να συμφωνεί!"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Επιπλέον Πληροφορίες"
 
@@ -10558,9 +10633,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Πληρωμή και συμφωνία"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Υπόλοιπο από μεταφορά"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Νέα Επιστροφή σε Προμηθευτή"
 
@@ -10579,9 +10651,6 @@ msgstr ""
 #~ msgid "Credit Note"
 #~ msgstr "Πιστωτικό Τιμολόγιο"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Περίοδος Παραγραφής"
-
 #~ msgid "3 Months"
 #~ msgstr "3 Μήνες"
 
@@ -10677,9 +10746,6 @@ msgstr ""
 #~ msgid "Payment date"
 #~ msgstr "Ημερ/νία πληρωμής"
 
-#~ msgid "Partner name"
-#~ msgstr "Όνομα συνεργάτη"
-
 #~ msgid "Canceled Invoice"
 #~ msgstr "Ακυρωμένο Τιμολόγιο"
 
@@ -10897,9 +10963,6 @@ msgstr ""
 #~ msgid "Cash Receipt"
 #~ msgstr "Απόδειξη Μετρητών"
 
-#~ msgid "All account entries"
-#~ msgstr "Όλες οι εγγραφές λογαριασμού"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Επιστροφές Πελατών Πληρωτέες"
 
@@ -11055,6 +11118,9 @@ msgstr ""
 #~ msgid "Overdue Payment Report Message"
 #~ msgstr "Μήνυμα αναφοράς καθυστερημένων πληρωμών"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "Subscription Entries"
 #~ msgstr "Καταχωρήσεις προεγγραφής"
 
@@ -11124,220 +11190,6 @@ msgstr ""
 #~ "Αν είναι λογαριασμός φόρου εδώ θα περιέχει το ποσό μετά τον φόρο, αν είναι "
 #~ "λογαριασμός βάσης του φόρου θα περιέχει το αφορολόγητο ποσό."
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Αναλυτικοί λογαριασμοί για κλείσιμο"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Πρόχειρα τιμολόγια"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Λογαριασμοί για τιμολόγηση"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Κόστη για τιμολόγηση"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Παλαιωμένα εισπρακτέα"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Πίνακας Λογιστηρίου"
-
-#~ msgid "My indicators"
-#~ msgstr "Οι δείκτες μου"
-
-#~ msgid "Aged income"
-#~ msgstr "Παλαιωμένα έσοδα"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Προβολή Πληροφοριών Χρέωσης/Πίστωσης"
-
-#~ msgid "All accounts"
-#~ msgstr "Όλοι οι λογαριασμοί"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Επιλογή Εγγραφών Βασισμένων σε"
-
-#~ msgid "Notification"
-#~ msgstr "Υπενθύμιση"
-
-#~ msgid "Financial Period"
-#~ msgstr "Οικονομική Περίοδος"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Επιλέξτε Περίοδο(ους)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Σύγκριση Επιλεγμένων Ετών σε Όρους"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Επιλογή Λογιστικού Έτους(ων) (Μέγιστο Τρία Έτη)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Επιλέξτε Λογαριασμό Αναφοράς (για % σύγκρισης)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Ισοζύγιο Λογαριασμού-Σύγκριση Ετών"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Το κομμάτι Ισολογισμών είναι ένα επιπρόσθετο λειτουργικό κομμάτι στο κομμάτι "
-#~ "της Οικονομικής Διαχείρισης\n"
-#~ "\n"
-#~ "    Αυτό το κομμάτι σου δίνει διάφορες επιλογές για εκτύπωση ισολογισμών.\n"
-#~ "\n"
-#~ "    1. Μπορείς να συγκρίνεις τους ισολογισμούς διαφόρων ετών.\n"
-#~ "\n"
-#~ "    2. Μπορείς να ορίσεις την απόλυτη ή επί τοις εκατό σύγκριση μεταξύ δύο "
-#~ "ετών.\n"
-#~ "\n"
-#~ "    3. Μπορείς να ορίσεις το ισολογισμό αναφοράς για την επί τοις εκατό "
-#~ "σύγκριση συγκεκριμένων ετών.\n"
-#~ "\n"
-#~ "    4. Μπορείς να επιλέξεις περιόδους ως πραγματική ημερομηνία ή περιόδους "
-#~ "ως ημέρα δημιουργίας.\n"
-#~ "\n"
-#~ "    5. Έχεις δυνατότητα να εκτυπώσεις την επιθυμητή αναφορά σε μορφή "
-#~ "Landscape.\n"
-#~ "    "
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr ""
-#~ "Θα πρέπει να επιλέξτε την επιλογή 'Landscape'. Παρακαλώ επιλέξτε την."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Εμφάνση Αναφοράς σε Φόρμα Landscape"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Εμφάνιση Σύγκρισης σε %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Χωρίς Σύγκριση"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Εμφάνιση Λογαριασμών"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Έχετε επιλέξτε περισσότερα απο 3 έτη σε κάθε περίπτωση."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Λογιστική και οικονομική διαχείριση - Σύγκριση λογαριασμών"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Μπορείτε να επιλέξετε το πολύ 3 έτη. Παρακαλώ ελέγξτε ξανά."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Έχετε επιλέξτε επιλογή 'Ποσοστό' με περισσότερα απο 2 έτη, αλλα δεν έχετε "
-#~ "επιλέξει διάταξη landscape."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Μπορεί να έχετε κάνει τα ακόλουθα λάθη. Παρακαλώ διορθώστε και "
-#~ "ξαναπροσπαθήστε."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Διατηρήστε κενα για σύγκριση με κατηγορίες"
-
-#~ msgid "Creation Date"
-#~ msgstr "Ημερομηνία Δημιουργίας"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Δεν έχετε επιλέξει 'Ποσοστό', αλλα έχετε επιλέξει περισσότερο απο 2 έτη."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Μπορεί να επιλέξατε την επιλογή σύγκρισης με περισσότερα απο 1 έτη με στήλες "
-#~ "χρέωσης/πίστωσης και %. Αυτό μπορεί να οδηγήσει σε περιεχόμενα που θα "
-#~ "εκτυπωθούν πέρα απο τα όρια του χαρτιού. Παρακαλώ επιλέξτε ξανά."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr ""
-#~ "Θα πρέπει να επιλέξετε τουλάχιστον 1 λογιστικό έτος. Προσπαθήστε ξανά."
-
-#~ msgid "Customize Report"
-#~ msgstr "Παραμετροποίηση Αναφοράς"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Ένα πρόσθετο με νέες αναφορές βασισμένο στο account module"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Αναφορές Λογαρισμών - Αναφορές"
-
-#~ msgid "at"
-#~ msgstr "σε"
-
-#~ msgid "Printing date:"
-#~ msgstr "Ημερομηνία εκτύπωσης:"
-
-#~ msgid "Account Information"
-#~ msgstr "Πληροφορίες Λογαριασμού"
-
-#~ msgid "Currency:"
-#~ msgstr "Νόμισμα:"
-
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Πρότυπα Οικονομικής Απεικόνισης"
-
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Οικονομική Απεικόνιση Λογαριασμών"
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Φορολογητέα Οικονομική Απεικόνικη"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Πρότυπο Οικονομικής Απεικόνισης"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Πρότυπο για Οικονομική Απεικόνιση"
-
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "Η οικονομική απεικόνιση θα προσδιορίσει τους φόρους ακι τους λογαριασμούς "
-#~ "που χρησιμοποιούνται για τον συνεργάτη"
-
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Πρότυπο για Φορολογητέα Οικονομική Απεικόνιση"
-
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Παρατήρηση Οικονομικής Απεικόνισης"
-
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Οικονομικές Απεικονίσεις"
-
-#~ msgid "supplier"
-#~ msgstr "προμηθευτής"
-
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "Άγνωστο Λάθος"
-
-#~ msgid "End of Year"
-#~ msgstr "Τέλος του Έτους"
diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po
new file mode 100644
index 00000000000..50fd512d33b
--- /dev/null
+++ b/addons/account/i18n/en_GB.po
@@ -0,0 +1,9792 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-13 09:07+0000\n"
+"Last-Translator: John Bradshaw <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: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr "System payment"
+
+#. module: account
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr "Other Configuration"
+
+#. 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 End of year journal defined for the fiscal year"
+
+#. 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 ""
+"You cannot remove/deactivate an account which is set as a property to any "
+"Partner."
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr "Journal Entry Reconcile"
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr "Voucher Management"
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr "Account Statistics"
+
+#. module: account
+#: field:account.invoice,residual:0
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr "Residual"
+
+#. module: account
+#: code:addons/account/invoice.py:785
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Please define sequence on invoice journal"
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr "Error ! The duration of the Period(s) is/are invalid. "
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Account currency"
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr "Children Definition"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Aged Receivable Till Today"
+
+#. module: account
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "Include Reconciled Entries"
+
+#. 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 ""
+"The Profit and Loss report provides an overview of your company profit and "
+"loss in a single document"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr "Import from invoice or payment"
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "Total Debit"
+
+#. module: account
+#: view:account.unreconcile:0
+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 ""
+"If you unreconciliate transactions, you must also verify all actions linked "
+"to those transactions as they will not be disabled"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr "Accounting Entries-"
+
+#. module: account
+#: code:addons/account/account.py:1291
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "You can not delete posted movement: \"%s\"!"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr "Origin"
+
+#. 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 "Reconcile"
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: view:account.move.line:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr "Reference"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr "Choose Fiscal Year "
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+"If the active field is set to False, it will let you hide the payment term "
+"without removing it."
+
+#. module: account
+#: code:addons/account/invoice.py:1421
+#, python-format
+msgid "Warning!"
+msgstr "Warning!"
+
+#. 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 "Account Source"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr "All Analytic Entries"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Invoices Created Within Past 15 Days"
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Negative"
+msgstr "Negative"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr "Journal: %s"
+
+#. module: account
+#: help:account.analytic.journal,type:0
+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 ""
+"Gives the type of the analytic journal. When it needs a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
+
+#. 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 "Tax Templates"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. 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 period defined for this date: %s !\n"
+"Please create a fiscal year."
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr "Move line reconcile select"
+
+#. 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 ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones"
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+
+#. module: account
+#: code:addons/account/invoice.py:1210
+#, 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)"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr "Accounting entries are an input of the reconciliation."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr "Belgian Reports"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1176
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "You can not add/modify entries in a closed journal."
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "Calculated Balance"
+
+#. 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 "Manual Recurring"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr "Close Fiscalyear"
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr "Allow write off"
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr "Select the Period for Analysis"
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr "St."
+
+#. module: account
+#: code:addons/account/invoice.py:529
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr "Invoice line account company does not match with invoice company."
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr "Field Name"
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+"Installs localised accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr "Account Unreconcile"
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr "Purchase Properties"
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+msgid "Configure"
+msgstr "Configure"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr "June"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+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 ""
+"This view is used by accountants to record entries massively in OpenERP. "
+"Journal items are created by OpenERP if you use Bank Statements, Cash "
+"Registers, or Customer/Supplier payments."
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr "account.bank.accounts.wizard"
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr "Creation date"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr "Purchase Refund"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr "Opening/Closing Situation"
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr "The currency used to enter statement"
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr "Fiscal Year to Open"
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the informatin related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+"This field contains the informatin related to the numbering of the journal "
+"entries of this journal."
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr "Default Debit Account"
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr "Total Credit"
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Positive"
+msgstr "Positive"
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr "Open For Unreconciliation"
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr "Chart Template"
+
+#. 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."
+
+#. module: account
+#: help:account.journal.period,state:0
+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 ""
+"When journal period is created. The state is 'Draft'. If a report is printed "
+"it changes to 'Printed' state. When all transactions are done, it changes to "
+"'Done' state."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_tax_chart
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+msgstr ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: 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
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: 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 "Journal"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr "Confirm the selected invoices"
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr "Parent target"
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr "Account used in this journal"
+
+#. 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
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: 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
+msgid "Select Charts of Accounts"
+msgstr "Select Charts of Accounts"
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr "Purchase Taxes"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Invoice Refund"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr "Not reconciled transactions"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:348
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr "CashBox Balance is not matching with Calculated Balance !"
+
+#. 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 "Tax Mapping"
+
+#. 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 "Close a Fiscal Year"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr "The accountant confirms the statement."
+
+#. 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
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "All"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr "Invoice Address Name"
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr "3 Monthly"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"If you unreconciliate transactions, you must also verify all actions linked "
+"to those transactions as they will not be disabled"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "   30 Days   "
+msgstr "   30 Days   "
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr "Sequences"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr "Taxes Mapping"
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr "Centralised Journal"
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr "Main Sequence must be different from current !"
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr "Tax Code Amount"
+
+#. module: account
+#: code:addons/account/account.py:2779
+#: code:addons/account/installer.py:434
+#, python-format
+msgid "SAJ"
+msgstr "SAJ"
+
+#. module: account
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr "closing balance entered by the cashbox verifier"
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr "Close Period"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr "Account Common Partner Report"
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr "Opening Entries Period"
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr "Journal Period"
+
+#. module: account
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
+#, 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"
+
+#. 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 "Accounts Receivable"
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr "General Ledger Report"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr "Re-Open"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr "Are you sure you want to create entries?"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "Check"
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr "Partners Reconciled Today"
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr "Percent"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr "Charts"
+
+#. 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 "Analytic Entries by line"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:39
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr "You can only change currency for Draft Invoice !"
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,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
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr "Account Subscription Line"
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr "The partner reference of this invoice."
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr "Unreconciliation"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_Journal_report
+msgid "Account Analytic Journal"
+msgstr "Account Analytic Journal"
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#, python-format
+msgid ""
+"Can not %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only Refund this invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"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)."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+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
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: 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 ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+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 ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+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 ""
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+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 ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+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 ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+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 ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+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 ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"purchase orders or receipts. This way, you can control the invoice from your "
+"supplier according to what you purchased or received."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+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 ""
+
+#. module: account
+#: code:addons/account/account.py:976
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+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 ""
+
+#. module: account
+#: field:account.account,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:120
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+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 ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+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 ""
+
+#. 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit transaction. OpenERP automatically creates one journal "
+"entry per accounting document: invoice, refund, supplier payment, bank "
+"statements, etc."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card or any other type "
+"of financial account. The starting balance will be proposed automatically "
+"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 ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+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 ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+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 ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,user_id:0
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
+"cancel the current invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+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
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.report_account_voucher_new
+msgid "Print Voucher"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"Have a complete tree view of all journal items per account code by clicking "
+"on an account."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:808
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Debit"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Ref. :"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:328
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Credit Notes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:499
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:332
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+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 ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Closing balance based on Starting Balance and Cash Transactions"
+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 ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column if the currency is different then the company "
+"currency"
+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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+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 ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Canceled"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+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
+#: 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.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date period is not in the scope "
+"of the fiscal year. "
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1319
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2844
+#: code:addons/account/installer.py:498
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+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 ""
+
+#. module: account
+#: code:addons/account/invoice.py:352
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+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
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance: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
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.period,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
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+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
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: 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
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+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 ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: code:addons/account/wizard/account_move_journal.py:106
+#: selection:report.invoice.created,state:0
+#, python-format
+msgid "Open"
+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 ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:545
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The 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."
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2796
+#: code:addons/account/installer.py:454
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+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 ""
+
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:351
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+#: report:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+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 ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid ""
+"Automatically generate entries based on what has been entered in the  system "
+"before a specific date."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1181
+#, python-format
+msgid "No sequence defined on the journal !"
+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
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+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 ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Number:"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 2:"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+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 ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+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
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:822
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2906
+#: code:addons/account/installer.py:296
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: help:account.journal.column,sequence:0
+msgid "Gives the sequence order to journal column."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+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
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: view:account.journal.period: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
+#: field:account.vat.declaration,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 ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+#: model:ir.actions.act_window,name:account.action_account_installer
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "No Partner Defined !"
+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 ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Journal:"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Authorised Signatory"
+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 ""
+
+#. module: account
+#: code:addons/account/invoice.py:370
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: n.a"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Your bank and cash accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state!"
+msgstr ""
+
+#. 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!"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+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.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 "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. 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.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print: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
+#: selection:account.vat.declaration,filter:0
+#: code:addons/account/report/common_report_header.py:97
+#: field:analytic.entries.report,date:0
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+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 ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2095
+#, 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 ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:810
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+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
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: 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
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+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 ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+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."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name: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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"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 ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+#: view:wizard.multi.charts.accounts:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+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.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+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 ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+#: view:res.company:0
+msgid "Configuration"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Loss"
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using sale price"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:714
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The duration of the Fiscal Year is invalid. "
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:88
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,state:0
+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 ""
+
+#. module: account
+#: field:account.journal,view_id:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month: 0"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:133
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_real:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#, python-format
+msgid "Not implemented"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+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 ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+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"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+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 ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+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 ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,reconcil:0
+msgid "Consider reconciled entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+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 ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:320
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1397
+#, 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 ""
+
+#. module: account
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+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 ""
+
+#. module: account
+#: view:validate.account.move:0
+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 ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were reconciled last time"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+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."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Asset Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. 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/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_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
+#, python-format
+msgid "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
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:720
+#, python-format
+msgid "Taxes missing !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+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 ""
+
+#. module: account
+#: help:account.journal,refund_journal:0
+msgid "Fill this if the journal is to be used for refunds of invoices."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+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 ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1210
+#, 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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:940
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,target_move: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
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.journal.period.print:0
+#: field:account.move.journal,target_move: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
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+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 ""
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1167
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:293
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+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
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: 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 ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:138
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+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
+msgid "Start of period"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+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/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+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 ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1326
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid ""
+"Specified Journal does not have any account move entries in draft state for "
+"this period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_move_line
+msgid "Lines to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"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
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+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 ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:738
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+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."
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+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 ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:830
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+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
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Valuation"
+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
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+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 ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"The tax code definition depends on the tax declaration of your country. "
+"OpenERP allows you to define the tax structure and manage it from this menu. "
+"You can define both numeric and alphanumeric tax codes."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+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 ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:60
+#, python-format
+msgid "New currency is not confirured properly !"
+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
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: 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
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:803
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:370
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+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 ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state!"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+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 ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"This view can be used by accountants in order to quickly record entries in "
+"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 ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice  '%s' is validated."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+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 ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:532
+#, python-format
+msgid ""
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+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 ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+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 ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+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.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: 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
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: code:addons/account/wizard/account_move_journal.py:105
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,name:0
+msgid "Acc. Type Name"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Accounting Chart"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  number of days: 30"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Type"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Liability Accounts)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+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 ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"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 ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "Enter a Start date !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_dashboard_acc
+msgid "Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Accounting Chart from a Chart Template"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_pl_report
+msgid "Account Profit And Loss Report"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2% "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1393
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is used to determine how an account is used in each journal. "
+"The deferral method of an account type determines the process for the annual "
+"closing. Reports such as the Balance Sheet and the Profit and Loss report "
+"use the category (profit/loss or balance sheet). For example, the account "
+"type could be linked to an asset account, expense account or payable "
+"account. From this view, you can create and manage the account types you "
+"need for your company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1003
+#, python-format
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:781
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+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 !"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+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_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/wizard/account_use_model.py:44
+#, python-format
+msgid "Error !"
+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 ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: 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 ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state"
+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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: 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 ""
+
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:65
+#, python-format
+msgid "Currnt currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: 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.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+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 ""
+
+#. module: account
+#: help:account.move,to_check:0
+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 ""
+
+#. 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... "
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2050
+#, 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:473
+#: code:addons/account/wizard/account_invoice_refund.py:137
+#, python-format
+msgid "Data Insufficient !"
+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 ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
+"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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"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 ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "9"
+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 ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period length (days)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+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.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:963
+#, python-format
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:938
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.account.type,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: report:account.move.voucher:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+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 ""
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1271
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2777
+#: code:addons/account/installer.py:432
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:104
+#, python-format
+msgid "Open Journal Items !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1246
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template: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:304
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: account
+#: 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
+msgid "Cash"
+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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bs_report
+msgid "Account Balance Sheet Report"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid ""
+"Here you can customize an existing journal view or create a new view. "
+"Journal views determine the way you can record entries in your journal. "
+"Select the fields you want to appear in a journal and determine the sequence "
+"in which they will appear. Then you can create a new journal and link your "
+"view to it."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  number of days: 14"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: view:account.analytic.account:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_analytic_plans:0
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"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)."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: 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 ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+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
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+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 ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:346
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:359
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+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 ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Add extra Accounting functionalities to the ones already installed."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: 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 ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2841
+#: code:addons/account/installer.py:495
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Modify Invoice: Cancels the current invoice and creates a new copy of it "
+"ready for editing."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and Financial Management"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: 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: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 ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+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 ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+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 ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"With Customer Refunds you can manage the credit notes for your customers. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_vat_declaration
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+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"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:897
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal: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
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"With Customer Invoices you can create and manage sales invoices issued to "
+"your customers. OpenERP can also generate draft invoices automatically from "
+"sales orders or deliveries. You should only confirm them before sending them "
+"to your customers."
+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 ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2794
+#: code:addons/account/installer.py:452
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice: Creates the refund invoice, ready for editing."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: balance"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+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.common.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no 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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: 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
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid ""
+"Define your company's financial year according to your needs. A financial "
+"year is a period at the end of which a company's accounts are made up "
+"(usually 12 months). The financial year is usually referred to by the date "
+"in which it ends. For example, if a company's financial year ends November "
+"30, 2011, then everything between December 1, 2010 and November 30, 2011  "
+"would be referred to as FY 2011. You are not obliged to follow the actual "
+"calendar year."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+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."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,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 "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+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 ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "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 ""
+
+#. module: account
+#: code:addons/account/account.py:2817
+#: code:addons/account/installer.py:476
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.installer,purchase_tax:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2820
+#: code:addons/account/installer.py:479
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP 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 ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2333
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:71
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"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 ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Particulars"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+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.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.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+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 ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "("
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+msgid "Closing Method"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Payable"
+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 ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"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/account_bank_statement.py:391
+#, python-format
+msgid "Cannot delete bank statement(s) which are already confirmed !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid ""
+"Here you can define a financial period, an interval of time in your "
+"company's financial year. An accounting period typically is a month or a "
+"quarter. It usually corresponds to the periods of the tax declaration. "
+"Create and manage periods from here and decide whether a period should be "
+"closed or left open depending on your company's activities over a specific "
+"period."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Receiver's Signature"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, python-format
+msgid "You can not change the tax, you should remove and recreate lines !"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:82
+#, python-format
+msgid ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
+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 ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+msgid "End Period"
+msgstr ""
+
+#. 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 Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:717
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from: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
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger: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
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:804
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"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
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_payment:0
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:354
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+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 ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Through :"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number:0
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+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
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period: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
+#: 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
+#: 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 ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For Value percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+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 ""
+
+#. module: account
+#: help:account.installer.modules,account_analytic_plans:0
+msgid ""
+"Allows invoice lines to impact multiple analytic accounts simultaneously."
+msgstr ""
+
+#. module: account
+#: field:account.installer,sale_tax:0
+msgid "Sale Tax(%)"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+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 ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid ")"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+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 ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "State:"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+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 ""
+
+#. 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
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+#: report:account.move.voucher:0
+msgid "Posted"
+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
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger: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
+msgid "End Date"
+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 ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+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 ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Profit"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+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 ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,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
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.period,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using cost price"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+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\"! "
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:805
+#, python-format
+msgid "Entry is already reconciled"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. 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 ""
+
+#. 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
+#: 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 "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+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 ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:165
+#, python-format
+msgid "This period is already closed !"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"may keep several types of specialized journals such as a cash journal, "
+"purchase journal, sales journal..."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+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 ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:346
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+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 ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+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 ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+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 ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+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 ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#, python-format
+msgid "You must enter a period length that cannot be 0 or below !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:501
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"Create and manage the accounts you need to record journal entries. An "
+"account is part of a ledger allowing your company to register all kinds of "
+"debit and credit transactions. Companies present their annual accounts in "
+"two main parts: the balance sheet and the income statement (profit and loss "
+"account). The annual accounts of a company are required by law to disclose a "
+"certain amount of information. They have to be certified by an external "
+"auditor annually."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual_currency:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po
index 4f8e6057dfa..0b1fcdfea2c 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: 2011-04-29 05:13+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2012,7 +2021,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2076,6 +2085,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2097,11 +2108,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2418,6 +2434,7 @@ 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
@@ -2663,6 +2680,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2928,7 +2947,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2942,6 +2960,17 @@ msgstr ""
 #: 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 ""
 
@@ -3151,6 +3180,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3209,6 +3239,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3649,11 +3689,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4326,7 +4365,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4465,7 +4504,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4478,10 +4516,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4491,6 +4527,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4607,6 +4653,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5316,6 +5364,19 @@ msgstr ""
 
 #. 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 ""
@@ -6224,6 +6285,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6453,7 +6515,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7123,6 +7185,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7375,6 +7438,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7457,14 +7533,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7576,6 +7644,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7813,6 +7887,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8094,12 +8169,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8217,7 +8297,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8236,6 +8321,15 @@ 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 ""
 
@@ -8433,7 +8527,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8450,12 +8544,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8475,7 +8574,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8656,6 +8755,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8737,6 +8837,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8946,13 +9058,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8976,7 +9085,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9184,6 +9293,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9257,6 +9367,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9625,3 +9745,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index e17b9f3b4fd..551facfaab9 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-27 11:05+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -524,8 +523,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1179,6 +1176,7 @@ msgstr "# de transacción"
 
 #. 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
@@ -1367,6 +1365,16 @@ msgstr "¡No puede usar esta cuenta general en este diario!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Con balance si no es igual a 0"
 
@@ -2118,7 +2126,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Buscar plantillas de plan contable"
 
 #. module: account
@@ -2185,6 +2193,8 @@ msgstr "Propiedades de contabilidad"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Asientos ordenados por"
 
@@ -2206,11 +2216,16 @@ msgstr "Plantilla de producto"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2552,6 +2567,7 @@ msgstr "Desc.(%)"
 
 #. 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
@@ -2815,6 +2831,8 @@ msgstr "Contabilidad financiera"
 #. 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
 msgid "Profit And Loss"
 msgstr "Pérdidas y ganancias"
 
@@ -2979,7 +2997,7 @@ msgstr "Vista"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNC%s"
 
 #. module: account
 #: code:addons/account/account.py:2906
@@ -3104,7 +3122,6 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3118,6 +3135,17 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: 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"
 
@@ -3335,6 +3363,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Contrapartida"
 
@@ -3393,6 +3422,16 @@ msgstr "CIF/NIF:"
 #: 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.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 "Chart of Accounts"
 msgstr "Plan contable"
 
@@ -3856,11 +3895,10 @@ msgid "Analytic Balance"
 msgstr "Saldo analítico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: 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"
 
@@ -4562,7 +4600,7 @@ msgstr "Apuntes contables"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Balance de situación (cuentas de activos)"
 
 #. module: account
@@ -4709,7 +4747,6 @@ msgid "Analytic Balance -"
 msgstr "Balance analítico -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4722,10 +4759,8 @@ 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.journal.period.print: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
@@ -4735,6 +4770,16 @@ msgstr "Balance analítico -"
 #: 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
 msgid "Target Moves"
 msgstr "Movimientos destino"
 
@@ -4852,6 +4897,8 @@ msgstr "Resultado de conciliación"
 #: 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
 msgid "Balance Sheet"
 msgstr "Balance de situación"
 
@@ -5603,6 +5650,19 @@ 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"
@@ -5778,7 +5838,7 @@ msgstr ""
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Factura '%s' es validada."
 
 #. module: account
 #: view:account.chart.template:0
@@ -6568,6 +6628,7 @@ msgstr "Posición fiscal impuestos"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6833,7 +6894,7 @@ msgstr "Líneas analíticas"
 #: 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 "
+"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) "
@@ -7579,6 +7640,7 @@ msgstr "Importe (en palabras):"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7843,6 +7905,19 @@ msgstr "Gestión contable y financiera"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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"
@@ -7938,14 +8013,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Divisa de la compañía"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Plan contable"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -8062,6 +8129,12 @@ msgstr "Diario reintegro"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8313,6 +8386,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8630,12 +8704,17 @@ msgstr "Gestión de seguimientos"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Periodo inicial"
 
@@ -8761,7 +8840,12 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8780,6 +8864,15 @@ msgstr "Introducido manualmente o automáticamente en el sistema"
 
 #. 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"
 
@@ -8998,7 +9091,7 @@ msgstr "Julio"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan contable"
 
 #. module: account
@@ -9015,12 +9108,17 @@ msgstr "Contabilidad. Saldo analítico"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Periodo final"
 
@@ -9040,7 +9138,7 @@ msgstr "Periodo final"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Plan contable"
 
 #. module: account
@@ -9236,6 +9334,7 @@ msgstr "Validar movimiento contable"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -9323,6 +9422,18 @@ msgstr "General"
 #: selection:account.pl.report,filter: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
@@ -9540,13 +9651,10 @@ msgid "Tax Source"
 msgstr "Origen impuesto"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Beneficio neto"
 
@@ -9571,8 +9679,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "LIBRO"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9785,6 +9893,7 @@ msgstr "Factura de proveedor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9865,6 +9974,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Con movimientos"
 
@@ -10257,11 +10376,17 @@ 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)."
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Error! No puede crear una cuenta recursiva."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "Activo"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Dejarlo vacío para usar el período de la fecha de validación."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Pasivos"
 
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
@@ -10287,15 +10412,6 @@ msgstr ""
 #~ "\n"
 #~ "por ej. Mi modelo de %(date)s"
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Si utiliza plazos de pago, la fecha de vencimiento se calculará "
-#~ "automáticamente en la generación de asientos contables. Si deja vacíos el "
-#~ "plazo de pago y la fecha de vencimiento, significa pago directo."
-
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Facturas de proveedor sin pagar"
 
@@ -10365,18 +10481,6 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Conciliación del pago"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Desc. (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Si el pago ha sido realizado después de que este correo haya sido enviado, "
-#~ "por favor no tenga en cuenta este correo. No dude en contactar con nuestro "
-#~ "departamento de contabilidad."
-
 #~ msgid "Contra"
 #~ msgstr "Contra"
 
@@ -10409,9 +10513,6 @@ msgstr ""
 #~ 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 "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Factura analítica"
 
@@ -10549,9 +10650,6 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Cerrar estados"
 
-#~ msgid "Crédit"
-#~ msgstr "Haber"
-
 #~ msgid "Income"
 #~ msgstr "Ingreso"
 
@@ -10690,10 +10788,6 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Facturas de proveedor en borrador"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "¡Error de configuración!"
-
 #~ 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 "
@@ -10703,9 +10797,6 @@ msgstr ""
 #~ "constan como impagadas. Por favor, tome las medidas apropiadas para realizar "
 #~ "el pago de las mismas en los próximos 8 días."
 
-#~ msgid "Débit"
-#~ msgstr "Debe"
-
 #~ msgid "x Checks Journal"
 #~ msgstr "x Diario de cheques"
 
@@ -10777,9 +10868,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Ir"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID empresa"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nueva factura de cliente"
 
@@ -10830,9 +10918,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Documento"
 
-#~ msgid "Move name"
-#~ msgstr "Nombre movimiento"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Cancelar las facturas seleccionadas"
 
@@ -10842,9 +10927,6 @@ msgstr ""
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Factura propuesta para ser comprobada, validada e impresa"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid ""
 #~ "The account moves of the invoice have been reconciled with account moves of "
 #~ "the payment(s)."
@@ -10857,10 +10939,6 @@ msgstr ""
 #~ msgid "Statement encoding produces payment entries"
 #~ msgstr "Codificación de extractos crea asientos de pago"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "¡La cuenta no está definida para ser conciliada!"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Información adicional"
 
@@ -10896,9 +10974,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Pagar y conciliar"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldo a cuenta nueva"
-
 #~ msgid "Entry Model"
 #~ msgstr "Modelo de asiento"
 
@@ -10911,9 +10986,6 @@ msgstr ""
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definir ejercicios fiscales y seleccionar plan contable"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Período de desajuste"
-
 #~ msgid ""
 #~ "Check this box if you want to print all entries when printing the General "
 #~ "Ledger, otherwise it will only print its balance."
@@ -11029,9 +11101,6 @@ msgstr ""
 #~ msgid "Unpaid Customer Invoices"
 #~ msgstr "Facturas de cliente sin pagar"
 
-#~ msgid "Partner name"
-#~ msgstr "Nombre empresa"
-
 #~ msgid "Journal/Payment Mode"
 #~ msgstr "Diario/Modo de pago"
 
@@ -11059,6 +11128,9 @@ msgstr ""
 #~ 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 -"
 
@@ -11083,10 +11155,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Asientos codificados por apunte"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "No puede desactivar una cuenta que contiene asientos contables."
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filtrar por empresas"
 
@@ -11218,9 +11286,6 @@ msgstr ""
 #~ "Ha seleccionado apuntes que no tienen ningún asiento contable en estado "
 #~ "borrador"
 
-#~ msgid "All account entries"
-#~ msgstr "Todos los asientos contables"
-
 #~ msgid "Date Filter"
 #~ msgstr "Filtrado por fecha"
 
@@ -11331,10 +11396,6 @@ msgstr ""
 #~ msgid "Journal de vente"
 #~ msgstr "Diario de ventas"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "¡No se puede validar un asiento descuadrado!"
-
 #~ msgid "Parent Analytic Account"
 #~ msgstr "Cuenta analítica padre"
 
@@ -11355,11 +11416,6 @@ msgstr ""
 #~ msgid "No records found for your selection!"
 #~ msgstr "¡No se han encontrado registros en su selección!"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr ""
-#~ "¡El ejercicio fiscal anterior no debe tener ningún asiento a conciliar!"
-
 #~ msgid "Maximum Quantity"
 #~ msgstr "Cantidad máxima"
 
@@ -11411,13 +11467,6 @@ msgstr ""
 #~ msgid "Fiscal Position Template Account Mapping"
 #~ msgstr "Mapeo cuentas plantilla posición fiscal"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "La cuenta bancaria de la empresa para pagar\n"
-#~ "Dejarlo vacío para utilizar el valor por defecto"
-
 #~ msgid "Journal d'extourne"
 #~ msgstr "Diario de inversión"
 
@@ -11634,172 +11683,6 @@ msgstr ""
 #~ msgid "Generate entries before:"
 #~ msgstr "Generar asientos hasta:"
 
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr ""
-#~ "Módulo que añade nuevos informes basado en el módulo contable-financiero."
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Informe contable - Informe"
-
-#~ msgid "My indicators"
-#~ msgstr "Mis indicadores"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Facturas borrador"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Costos a facturar"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Cuentas a facturar"
-
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Cuentas analíticas a cerrar"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Tablero para contables"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Efectos vencidos a cobrar"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Selección de entradas basada en"
-
-#~ msgid "Notification"
-#~ msgstr "Notificación"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Mostrar información débito/crédito"
-
-#~ msgid "All accounts"
-#~ msgstr "Todas las cuentas"
-
-#~ msgid "Aged income"
-#~ msgstr "Ingresos vencidos"
-
-#~ msgid "Financial Period"
-#~ msgstr "Periodo financiero"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Comparar ejercicios seleccionados en términos de"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Seleccione período(s)"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "El módulo de balance de cuentas es una funcionalidad añadida al módulo de "
-#~ "gestión financiera.\n"
-#~ "\n"
-#~ "    Este módulo ofrece diversas opciones de impresión de balances.\n"
-#~ "\n"
-#~ "    1. Se puede comparar el balance de distintos años.\n"
-#~ "\n"
-#~ "    2. Puede establecer la comparación en importe o porcentual entre dos "
-#~ "años.\n"
-#~ "\n"
-#~ "    3. Puede establecer la cuenta de referencia para la comparación "
-#~ "porcentual para años en particular.\n"
-#~ "\n"
-#~ "    4. Puede seleccionar períodos como una fecha real o períodos como fecha "
-#~ "de creación.\n"
-#~ "\n"
-#~ "    5. Puede imprimir el informe que desee en formato apaisado.\n"
-#~ "    "
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Mostrar comparación en %"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Mostrar informe en formato horizontal"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Debe seleccionar la opción 'Horizontal'. Por favor, márquela."
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Balance contable-Compara ejercicios"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Seleccione cuenta de referencia (para comparación %)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Seleccionar ejercicio(s) fiscal(es) (máximo 3 años)"
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Dejarlo vacío para comparar con sus padres"
-
-#~ msgid "Don't Compare"
-#~ msgstr "No comparar"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Mostrar cuentas"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Ha seleccionado más de 3 ejercicios en cualquier caso."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Gestión contable y financiera - Comparación de cuentas"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr ""
-#~ "Puede seleccionar un máximo de 3 ejercicios. Por favor, seleccione otra vez."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Ha seleccionado la opción 'Porcentaje' con más de 2 ejercicios, pero no "
-#~ "ha seleccionado formato horizontal."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Podría haber cometido los siguientes errores. Por favor, corríjalos e "
-#~ "inténtelo de nuevo."
-
-#~ msgid "Creation Date"
-#~ msgstr "Fecha creación"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. No ha seleccionado la opción 'Porcentaje', pero ha seleccionado más de 2 "
-#~ "ejercicios."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr ""
-#~ "Debe seleccionar al menos un ejercicio fiscal. Por favor, inténtelo de nuevo."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Puede haber seleccionado las opciones comparar con más de 1 ejercicio con "
-#~ "columnas crédito/débito y opción %. Esto pueden ocasionar que hayan "
-#~ "contenidos que se impriman fuera del papel. Por favor, inténtelo de nuevo."
-
-#~ msgid "Customize Report"
-#~ msgstr "Informe personalizado"
-
 #~ msgid "Account Entry Line"
 #~ msgstr "Apunte"
 
@@ -11879,415 +11762,19 @@ msgstr ""
 #~ msgid "Invoice Sequence"
 #~ msgstr "Secuencia de facturas"
 
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Observación de mapeo fiscal"
-
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Modelo de mapeos fiscales"
-
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Mapeo de cuentas fiscales"
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Mapeo de impuestos ficales"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Modelos de mapeos fiscales"
-
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "El mapeo fiscal determinará los impuestos y las cuentas utilizadas para la "
-#~ "empresa."
-
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Mapeo fiscal de modelo de impuestos"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Modelo para mapeo fiscal"
-
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Mapeos fiscales"
-
-#~ msgid "supplier"
-#~ msgstr "proveedor"
-
-#~ msgid ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Un abono de proveedor de es una factura rectificativa de su proveedor "
-#~ "indicando que le abona parte o totalmente la factura que le fue enviada."
-
-#~ msgid "Sales Credit Note Journal - (test)"
-#~ msgstr "Diaro facturas rectificativas ventas - (prueba)"
-
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Diaro facturas rectificativas gastos - (prueba)"
-
-#~ msgid ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-#~ msgstr ""
-#~ "Los abonos de cliente le ayuda a gestionar las facturas rectificativas que "
-#~ "se emiten a sus clientes. Una factura rectificativa o de abono es un "
-#~ "documento que cancela una factura o una parte de ella. Puede generar las "
-#~ "facturas rectificativas y reconciliarlas en el formulario de factura."
-
-#~ msgid "End of Year"
-#~ msgstr "Fin del ejercicio"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Move/Entry label"
-#~ msgstr "Etiqueta movimiento/asiento"
-
-#~ msgid "Entry No"
-#~ msgstr "Nº asiento"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "If the active field is set to true, 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."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Factura "
 
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el impuesto sin eliminarlo."
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance de situación (cuentas de activos)"
 
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "está validada."
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el periodo del diario sin "
-#~ "eliminarlo."
+#~ msgid "Chart of Accounts"
+#~ msgstr "Plan contable"
 
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Diario de caja - (prueba)"
-
-#~ msgid "Central Journals"
-#~ msgstr "Diarios centralizados"
-
-#~ msgid "Bank Journal - (test)"
-#~ msgstr "Diario banco - (prueba)"
-
-#~ msgid "Default UoM"
-#~ msgstr "UdM por defecto"
-
-#~ msgid ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-#~ msgstr ""
-#~ "El registro de caja le permite gestionar asientos de caja en sus diarios de "
-#~ "caja."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Sales Journal - (test)"
-#~ msgstr "Diario de ventas - (prueba)"
-
-#~ msgid "Expenses Journal - (test)"
-#~ msgstr "Diario de gastos - (prueba)"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en las facturas en lugar de la por defecto para "
-#~ "anotar las ventas del producto actual."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en las facturas para anotar las ventas de la "
-#~ "categoría de productos actual."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-#~ msgstr ""
-#~ "El plan de impuestos se utiliza para generar su declaración periódica de "
-#~ "impuestos. Aquí podrá ver los impuestos con los códigos relacionados con su "
-#~ "declaración legal de acuerdo a su país."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "If the active field is set to true, 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."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la cuenta sin eliminarla."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en las facturas para anotar los gastos de la "
-#~ "categoría de productos actual."
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en las facturas en lugar de la por defecto para "
-#~ "anotar los gastos del producto actual."
-
-#~ msgid "Checks Journal - (test)"
-#~ msgstr "Diario de cheques - (prueba)"
-
-#~ msgid "Low Level"
-#~ msgstr "Nivel inferior"
-
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Las facturas de clientes le permiten crear y administrar la facturas "
-#~ "dirigidas a sus clientes. OpenERP generara facturas borrador de forma "
-#~ "automática, así sólo tiene que confirmarlas antes de enviarlas a sus "
-#~ "clientes."
-
-#~ msgid ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Un abono de proveedor de es una factura rectificativa de su proveedor "
-#~ "indicando que le abona parte o totalmente la factura que le fue enviada."
-
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "Un asiento se compone de varios apuntes, siendo cada uno de ellos al debe o "
-#~ "al haber. OpenERP crea automáticamente asientos para cada documento a "
-#~ "contabilizar: facturas, reembolsos, pago a proveedores, extractos bancarios, "
-#~ "etc."
-
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Las facturas de proveedores le permiten introducir y gestionar las facturas "
-#~ "emitidas por sus proveedores. OpenERP genera un borrador de facturas de "
-#~ "proveedor de forma automática, para que pueda controlar lo que recibió de su "
-#~ "proveedor de acuerdo a lo que compró o recibió."
-
-#~ msgid ""
-#~ "given a period and a journal, the sum of debit will always be equal to the "
-#~ "sum of credit, so there is no point to display it"
-#~ msgstr ""
-#~ "dado un período y un diario, la suma del debe será siempre igual a la suma "
-#~ "del haber, por lo que no hay lugar para mostrarlo"
-
-#~ msgid ""
-#~ "A recurring entry is a payment related entry that occurs on a recurrent "
-#~ "basis from a specific date corresponding to the signature of a contract or "
-#~ "an agreement with a customer or a supplier. With Define Recurring Entries, "
-#~ "you can create them in the system in order to automate their entries in the "
-#~ "system."
-#~ msgstr ""
-#~ "Un asiento recurrente es un asiento relacionados con los pagos que se "
-#~ "produce de forma recurrente a partir de una fecha concreta correspondiente a "
-#~ "la firma de un contrato o un acuerdo con un cliente o proveedor. Mediante la "
-#~ "definición de asientos recurrentes, puede automatizar sus asientos en el "
-#~ "sistema."
-
-#~ msgid ""
-#~ "Here you can personalize and create each view of your financial journals by "
-#~ "selecting the fields you want to appear and the sequence they will appear."
-#~ msgstr ""
-#~ "Aquí puede personalizar y crear cada vista de sus diarios financieros "
-#~ "seleccionando los campos que desea que aparezcan y la secuencia en la que "
-#~ "aparezcan."
-
-#~ msgid "Must be after setLang()"
-#~ msgstr "Debe estar después de setLang()"
-
-#~ msgid ""
-#~ "You can look up individual account entries by searching for useful "
-#~ "information. To search for account entries, open a journal, then select a "
-#~ "record line."
-#~ msgstr ""
-#~ "Puede buscar asientos contables individuales mediante la búsqueda de "
-#~ "información útil. Para buscar asientos contables, abra un diario y "
-#~ "seleccione una línea de registro."
-
-#~ msgid ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), 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."
-
-#~ msgid ""
-#~ "Create and manage accounts you will need to record financial entries in. "
-#~ "Accounts are financial records of your company that register all financial "
-#~ "transactions. Companies present their annual accounts in two main parts: the "
-#~ "balance sheet and the income statement (profit and loss account). The annual "
-#~ "accounts of a company are required by law to disclose a certain amount of "
-#~ "information. They have to be certified by an external auditor yearly."
-#~ msgstr ""
-#~ "Cree y gestione las cuentas que necesite para registrar los asientos "
-#~ "financieros. Las cuentas son registros de su compañía para apuntar todas las "
-#~ "transacciones financieras. Las compañías resumen sus cuentas anuales en dos "
-#~ "informes principales: el balance y el informe de pérdidas y ganancias. "
-#~ "Habitualmente la presentación de las cuentas anuales es una exigencia legal, "
-#~ "y en algunos países deben ser certificadas anualmente por un auditor externo."
-
-#~ msgid ""
-#~ "A tax code is a reference of a tax that will be taken out of a gross income "
-#~ "depending on the country and sometimes industry sector. OpenERP allows you "
-#~ "to define and manage them from this menu."
-#~ msgstr ""
-#~ "Un código de impuesto es una referencia al tipo impositivo a aplicar sobre "
-#~ "la base imponible (o descontar sobre el bruto) dependiente del país y a "
-#~ "veces del sector industrial. OpenERP le permite definirlos y gestionarlos "
-#~ "desde este menú."
-
-#~ msgid ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-#~ msgstr ""
-#~ "Un extracto bancario es un resumen de todas las transacciones financieras "
-#~ "ocurridas durante un periodo determinado de tiempo en una cuenta bancaria, "
-#~ "tarjeta de crédito o cualquier otro tipo de cuenta. Comience introduciendo "
-#~ "el saldo de apertura y cierre, y luego introduzca todas las lineas de su "
-#~ "extracto. Situándose en la columna Pago de una línea, puede pulsar F1 para "
-#~ "abrir el formulario de conciliación."
-
-#~ msgid ""
-#~ "Define your company's fiscal year depending on the period you have chosen to "
-#~ "follow. A fiscal year is a 1 year period over which a company budgets its "
-#~ "spending. It may run over any period of 12 months. The fiscal year is "
-#~ "referred to by the date in which it ends. For example, if a company's fiscal "
-#~ "year ends November 30, 2011, then everything between December 1, 2010 and "
-#~ "November 30, 2011  would be referred to as FY 2011. Not using the actual "
-#~ "calendar year gives many companies an advantage, allowing them to close "
-#~ "their books at a time which is most convenient for them."
-#~ msgstr ""
-#~ "Defina el ejercicio fiscal de su compañía según la periodicidad que ha "
-#~ "decidido seguir. Un ejercicio fiscal es un periodo de 1 año sobre el cual la "
-#~ "compañía presupuesta sus gastos. Puede incluir cualquier periodo de 12 "
-#~ "meses. El ejercicio fiscal suele denominarse según la fecha en la que acaba. "
-#~ "Así, si el ejercicio fiscal de una compañía finaliza el 30 de noviembre de "
-#~ "2011, entonces todo lo comprendido entre el 1 de diciembre de 2010 y el 30 "
-#~ "de noviembre de 2011 será considerado como el EF 2011. No usar el calendario "
-#~ "natural es una ventaja para muchas compañías, ya que les permite cerrar sus "
-#~ "libros en el momento más conveniente para ellas."
-
-#~ msgid ""
-#~ "Here, you can define a period, an interval of time between successive "
-#~ "closings of the books of your company. An accounting period typically is a "
-#~ "month or a quarter, corresponding to the tax year used by the business. "
-#~ "Create and manage them from here and decide whether a period should be left "
-#~ "open or closed depending on your company's activities over a specific period."
-#~ msgstr ""
-#~ "Aquí puede definir un periodo, un intervalo de tiempo entre cierres "
-#~ "consecutivos de los libros de su compañía. Un periodo contable es "
-#~ "típicamente un mes o un trimestre, correspondientemente al régimen "
-#~ "impositivo usado en el negocio. Creelos y gestionelos desde aquí, y decida "
-#~ "si un periodo debe permanecer abierto o cerrado según las actividades de su "
-#~ "compañía en un plazo específico."
-
-#~ msgid ""
-#~ "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
-#~ "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
-#~ "o.journal_id.currency and o.journal_id.currency.symbol"
-#~ msgstr ""
-#~ "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
-#~ "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
-#~ "o.journal_id.currency and o.journal_id.currency.symbol"
-
-#~ msgid ""
-#~ "This menu helps you manage the credit notes issued/to be issued for your "
-#~ "customers. A refund invoice is a document that cancels an invoice or a part "
-#~ "of it. You can easily generate refunds and reconcile them from the invoice "
-#~ "form."
-#~ msgstr ""
-#~ "Este menú le permite gestionar notas de crédito (reembolsos) emitidas/a "
-#~ "emitir a sus clientes. Una factura rectificativa es un documento que anula "
-#~ "una factura o parte de ella. Puede generar reembolsos fácilmente y "
-#~ "reconciliarlos desde el formulario de factura."
-
-#~ msgid ""
-#~ "This Account is used for transferring Profit/Loss(If It is Profit: Amount "
-#~ "will be added, Loss : Amount will be duducted.), 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."
-
-#~ msgid ""
-#~ "An account type is a name or code given to an account that indicates its "
-#~ "purpose. For example, the account type could be linked to an asset account, "
-#~ "expense account or payable account. From this view, you can create and "
-#~ "manage the account types you need to be used for your company management."
-#~ msgstr ""
-#~ "Un tipo de cuenta es un nombre o código asignado a una cuenta que indica su "
-#~ "propósito. Por ejemplo, el tipo de cuenta podría estar asociado a una cuenta "
-#~ "de activos, de gastos o a pagar. Desde esta vista, puede crear y gestionar "
-#~ "los tipos de cuenta que necesite usar para la gestión de su compañía."
-
-#~ msgid ""
-#~ "Create and manage your company's financial journals from this menu. A "
-#~ "journal is a business diary in which all financial data related to the day "
-#~ "to day business transactions of your company is recorded using double-entry "
-#~ "book keeping system. Depending on the nature of its activities and number of "
-#~ "daily transactions, a company may keep several  types of specialized "
-#~ "journals such as a cash journal, purchases journal, and sales journal."
-#~ msgstr ""
-#~ "Cree y gestione los diarios financieros de su compañía desde este menú. Un "
-#~ "diario es un histórico del negocio en el que se anotan todos los datos, "
-#~ "relacionados con gestiones financieras de la empresa, del día a día, usando "
-#~ "un sistema de doble entrada para el mantenimiento del libro. Dependiendo de "
-#~ "la naturaleza de sus actividades, y del número de transacciones diarias, una "
-#~ "compañía puede tener varios tipos de diarios especializados, como un diario "
-#~ "de caja, diario de compras y diario de ventas."
+#~ msgid "Balance:"
+#~ msgstr "Balance:"
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 779d7e1aaf7..9429373deb6 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/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: 2011-04-29 05:13+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -488,8 +488,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1128,6 +1126,7 @@ msgstr "# de transacción"
 
 #. 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
@@ -1316,6 +1315,16 @@ msgstr "¡No puede usar esta cuenta general en este diario!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Con balance distinto a 0"
 
@@ -2025,7 +2034,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2089,6 +2098,8 @@ msgstr "Propiedades contables"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Asientos ordenados por"
 
@@ -2110,11 +2121,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2438,6 +2454,7 @@ msgstr "Desc.(%)"
 
 #. 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
@@ -2684,6 +2701,8 @@ msgstr "Contabilidad Financiera"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2959,7 +2978,6 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2973,6 +2991,17 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: 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"
 
@@ -3184,6 +3213,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3242,6 +3272,16 @@ msgstr "CUIT:"
 #: 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.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 "Chart of Accounts"
 msgstr "Plan de Cuentas"
 
@@ -3688,11 +3728,10 @@ msgid "Analytic Balance"
 msgstr "Balance analítico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4370,7 +4409,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4512,7 +4551,6 @@ msgid "Analytic Balance -"
 msgstr "Balance analítico -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4525,10 +4563,8 @@ 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.journal.period.print: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
@@ -4538,6 +4574,16 @@ msgstr "Balance analítico -"
 #: 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
 msgid "Target Moves"
 msgstr "Movimientos destino"
 
@@ -4654,6 +4700,8 @@ msgstr "Resultado de la Conciliación"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5372,6 +5420,19 @@ msgstr ""
 
 #. 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"
@@ -6287,6 +6348,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6520,7 +6582,7 @@ msgstr "Líneas analíticas"
 #: 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 "
+"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) "
@@ -7203,6 +7265,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7457,6 +7520,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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"
@@ -7541,14 +7617,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Moneda de la compañía"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7661,6 +7729,12 @@ msgstr "Diario de reembolso"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7902,6 +7976,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8185,12 +8260,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8310,7 +8390,12 @@ msgstr "Dejar vacío para usar la cuenta de ingresos"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8329,6 +8414,15 @@ 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 ""
 
@@ -8529,7 +8623,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan de cuentas"
 
 #. module: account
@@ -8546,12 +8640,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8571,7 +8670,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8756,6 +8855,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8837,6 +8937,18 @@ msgstr "General"
 #: selection:account.pl.report,filter: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
@@ -9046,13 +9158,10 @@ msgid "Tax Source"
 msgstr "Origen del impuesto"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9076,8 +9185,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9284,6 +9393,7 @@ msgstr "Factura de proveedor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9361,6 +9471,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Con movimientos"
 
@@ -9741,6 +9861,18 @@ 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 ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Confirm statement from draft"
 #~ msgstr "Confirmar extracto desde borrador"
 
@@ -9804,17 +9936,6 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "Confirmar el extracto con o sin conciliación desde el borrador"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Desc. (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Si hay realizado el pago con posterioridad a este aviso, por favor no lo "
-#~ "tenga en cuenta. No dude en contactarnos por cualquier consulta al respecto"
-
 #~ msgid "Contra"
 #~ msgstr "Contra"
 
@@ -9830,9 +9951,6 @@ msgstr ""
 #~ msgid "Mvt"
 #~ msgstr "Movimiento"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Error! No se puede crear una cuenta recursiva."
-
 #~ msgid "Fiscal Position Accounts Mapping"
 #~ msgstr "Mapeo de cuentas y posición fiscal"
 
@@ -9845,9 +9963,6 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Número de cupón"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Sign for parent"
 #~ msgstr "Signo para el padre"
 
@@ -9969,9 +10084,6 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Cerrar estados"
 
-#~ msgid "Crédit"
-#~ msgstr "Haber"
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "El balance del extracto es incorrecto!\n"
@@ -10084,9 +10196,6 @@ msgstr ""
 #~ msgid "Validated accounting entries."
 #~ msgstr "Asientos contables validados."
 
-#~ msgid "Débit"
-#~ msgstr "Debe"
-
 #~ msgid "x Checks Journal"
 #~ msgstr "x Diario de cheques"
 
@@ -10099,10 +10208,6 @@ msgstr ""
 #~ "constan como impagas. Por favor, tome las medidas apropiadas para realizar "
 #~ "el pago de las mismas en los próximos días."
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Error de configuración !"
-
 #~ msgid "Create subscription entries"
 #~ msgstr "Crear asientos de suscripción"
 
@@ -10125,9 +10230,6 @@ msgstr ""
 #~ msgid "Account No."
 #~ msgstr "Núm. cuenta"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Dejar vacío para usar el período de la fecha de validación."
-
 #~ msgid "Automatic reconciliation"
 #~ msgstr "Conciliación automática"
 
@@ -10180,9 +10282,6 @@ msgstr ""
 #~ msgid "Open State"
 #~ msgstr "Estado abierto"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID del Partner"
-
 #~ msgid "Analytic account costs and revenues"
 #~ msgstr "Cuenta analítica de costos e ingresos"
 
@@ -10233,9 +10332,6 @@ msgstr ""
 #~ msgid "Reconcilate the entries from payment"
 #~ msgstr "Conciliar los asientos desde el pago"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Factura propuesta a verificar, validada e impresa"
 
@@ -10261,10 +10357,6 @@ msgstr ""
 #~ msgid " Close states of Fiscal year and periods"
 #~ msgstr " Cerrar estados del año  fiscal y periodos"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "La cuenta no está definida para ser conciliada !"
-
 #~ msgid "The amount in the currency of the journal"
 #~ msgstr "La cantidad en la moneda del diario"
 
@@ -10299,9 +10391,6 @@ msgstr ""
 #~ "Fuerza a todos los movimientos de esta cuenta que tengan esta moneda "
 #~ "secundaria."
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldo a cuenta nueva"
-
 #~ msgid "Pay and reconcile"
 #~ msgstr "Pagar y conciliar"
 
@@ -10317,9 +10406,6 @@ msgstr ""
 #~ msgid "Journal code"
 #~ msgstr "Código del diario"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Período de cancelación"
-
 #~ msgid "Entry Name"
 #~ msgstr "Nombre de asiento"
 
@@ -10453,9 +10539,6 @@ msgstr ""
 #~ msgid "Journal/Payment Mode"
 #~ msgstr "Diario/Modo de pago"
 
-#~ msgid "Partner name"
-#~ msgstr "Nombre del Parner"
-
 #~ msgid "Import file from your bank statement"
 #~ msgstr "Importar archivo desde extracto bancario"
 
@@ -10477,12 +10560,12 @@ msgstr ""
 #~ msgid "File statement"
 #~ msgstr "Archivar extracto"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "Set starting and ending balance for control"
 #~ msgstr "Indicar balance inicial y final para control"
 
-#~ msgid "Move name"
-#~ msgstr "Nombre del movimiento"
-
 #~ msgid "Date Start"
 #~ msgstr "Fecha de inicio"
 
@@ -10501,10 +10584,6 @@ msgstr ""
 #~ msgid "Modify Invoice"
 #~ msgstr "Modificar factura"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "No puede desactivar una cuenta que contiene movimientos contables."
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filtrar por partners"
 
@@ -10623,9 +10702,6 @@ msgstr ""
 #~ msgid "Cash Receipt"
 #~ msgstr "Recibo de caja"
 
-#~ msgid "All account entries"
-#~ msgstr "Todos los asientos contables"
-
 #~ msgid "Date Filter"
 #~ msgstr "Filtro por fecha"
 
@@ -10722,15 +10798,6 @@ msgstr ""
 #~ msgid "General Debit"
 #~ msgstr "Debe general"
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Si usa términos de pago, la fecha de vencimiento se calculará "
-#~ "automáticamente en la generación de asientos contables. Si deja vacíos el "
-#~ "término de pago y la fecha de vencimiento, significa pago directo."
-
 #~ msgid "Link to the automatically generated account moves."
 #~ msgstr "Enlace al asiento contable generado automáticamente."
 
@@ -10856,10 +10923,6 @@ msgstr ""
 #~ msgid "J.C. or Move name"
 #~ msgstr "Cód. diario o asiento"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "¡No se puede validar un asiento sin cuadrar!"
-
 #~ msgid "Parent Analytic Account"
 #~ msgstr "Cuenta analítica padre"
 
@@ -10881,13 +10944,6 @@ msgstr ""
 #~ msgid "Date or Code"
 #~ msgstr "Fecha o código"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "La cuenta bancaria del partner para pagar\n"
-#~ "Dejar vacío para utilizar el valor predeterminado"
-
 #~ msgid "Invoice Sequence"
 #~ msgstr "Secuencia de la factura"
 
@@ -10939,11 +10995,6 @@ msgstr ""
 #~ msgid "Fiscal Position Template Tax Mapping"
 #~ msgstr "Asociación de impuestos plantilla posición fiscal"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr ""
-#~ "¡El ejercicio fiscal anterior no tiene ningún asiento para conciliar!"
-
 #~ msgid "Maximum Quantity"
 #~ msgstr "Cantidad máxima"
 
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index 5a93cd3609a..199ca43934f 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: 2011-06-07 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -34,7 +34,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +66,7 @@ msgid "Residual"
 msgstr "Pendiente"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "Accounting Entries-"
 msgstr "Asientos contables -"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -230,7 +230,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -258,7 +258,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -274,7 +274,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -312,7 +312,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -487,8 +487,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -554,7 +552,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr ""
@@ -636,7 +634,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -669,8 +667,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,7 +729,7 @@ msgid "Analytic Entries by line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -832,7 +830,7 @@ msgid "Next Partner to reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -954,11 +952,11 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1037,6 +1035,7 @@ 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 "-"
@@ -1130,7 +1129,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1268,6 +1267,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1297,7 +1297,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr ""
@@ -1309,6 +1309,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -1390,7 +1400,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1549,6 +1559,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1615,7 +1626,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1648,7 +1659,7 @@ msgid "Receivables & Payables"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr ""
@@ -1684,7 +1695,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1705,7 +1716,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1721,7 +1732,7 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1990,7 +2001,7 @@ msgid " Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2011,7 +2022,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2042,7 +2053,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2062,7 +2073,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2073,9 +2084,10 @@ msgid "Accounting Properties"
 msgstr ""
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2097,12 +2109,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2211,7 +2227,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2281,7 +2297,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2365,7 +2381,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2377,12 +2393,13 @@ msgid "Average Price"
 msgstr ""
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2527,16 +2544,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2664,6 +2681,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2696,7 +2715,7 @@ msgid "Analytic Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2819,7 +2838,7 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2928,9 +2947,7 @@ msgstr ""
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2944,6 +2961,17 @@ msgstr ""
 #: 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 ""
 
@@ -2989,7 +3017,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3031,6 +3059,7 @@ msgstr ""
 #: 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
@@ -3082,7 +3111,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -3143,7 +3172,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3211,6 +3240,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3255,7 +3294,6 @@ 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
 #: view:account.move:0
@@ -3299,7 +3337,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3308,13 +3346,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3434,7 +3472,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3445,14 +3483,14 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3650,11 +3688,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -3746,7 +3783,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3805,7 +3842,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3980,7 +4017,7 @@ msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4051,11 +4088,11 @@ msgid "Change"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4159,7 +4196,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4224,7 +4261,7 @@ msgid "Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4327,7 +4364,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4336,24 +4373,25 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4375,7 +4413,7 @@ msgid "Bank Details"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr ""
@@ -4430,7 +4468,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4449,7 +4487,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4465,7 +4503,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4478,11 +4515,8 @@ msgstr ""
 #: 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
 #: 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
@@ -4492,6 +4526,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4562,7 +4606,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4608,6 +4652,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4708,7 +4754,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4780,7 +4826,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4808,7 +4854,7 @@ msgid "Start of period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4864,12 +4910,12 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4946,7 +4992,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5093,7 +5139,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5129,7 +5175,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5266,7 +5312,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5291,14 +5337,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5317,6 +5363,19 @@ msgstr ""
 
 #. 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 ""
@@ -5333,7 +5392,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5544,7 +5603,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5810,9 +5869,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -5961,8 +6020,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -5973,7 +6032,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6011,7 +6070,7 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6075,31 +6134,30 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6209,7 +6267,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6230,7 +6288,6 @@ msgstr ""
 #: 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 ""
@@ -6284,7 +6341,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6314,7 +6371,7 @@ msgid "Child Codes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6457,7 +6514,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -6471,7 +6528,7 @@ msgid "Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6639,7 +6696,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6743,7 +6800,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6772,6 +6829,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -6801,7 +6859,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
@@ -6827,13 +6884,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6851,7 +6908,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7085,17 +7142,17 @@ msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7158,7 +7215,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7207,7 +7264,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7268,7 +7325,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7333,7 +7390,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7368,7 +7425,6 @@ msgstr ""
 #: 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
@@ -7381,6 +7437,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7463,14 +7532,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7531,7 +7592,7 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7581,8 +7642,13 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr ""
 
@@ -7620,7 +7686,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7787,8 +7853,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -7799,7 +7865,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7993,14 +8059,14 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8049,7 +8115,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8065,7 +8131,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8102,18 +8168,22 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8150,7 +8220,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8178,7 +8248,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8226,8 +8296,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8246,7 +8320,15 @@ 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 ""
 
@@ -8361,7 +8443,6 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8369,7 +8450,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8445,7 +8526,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8462,13 +8543,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8488,7 +8573,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8507,7 +8592,7 @@ msgid "Account Subscription"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8534,7 +8619,6 @@ msgstr ""
 #: 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
@@ -8563,7 +8647,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -8621,13 +8705,13 @@ msgid "Active"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8674,6 +8758,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -8751,6 +8836,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8909,6 +9006,7 @@ msgstr ""
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr ""
 
@@ -8927,7 +9025,6 @@ msgstr ""
 #: 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
@@ -8960,13 +9057,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8981,7 +9075,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -8990,7 +9084,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9131,8 +9225,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9202,6 +9296,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -9235,7 +9330,7 @@ msgid "Recurring"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9256,7 +9351,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9271,6 +9366,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9386,7 +9491,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9411,7 +9516,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9616,7 +9721,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr ""
@@ -9639,3 +9744,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 7c9b092fa19..b7f20d8a83f 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -78,7 +78,7 @@ msgstr "Por favor definir una secuencia para facturas en el diario"
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "¡Error! La duración del periodo o periodos es inválida. "
+msgstr "Error! La duración del periodo o periodos es inválida. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
@@ -188,7 +188,7 @@ msgstr ""
 #: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr "Aviso!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -246,13 +246,13 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
 msgstr ""
-"No period defined for this date: %s !\n"
-"Please create a fiscal year."
+"No hay ejercicio fiscal para esta fecha: %s !\n"
+"Por favor crear un ejercicio fiscal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Move line reconcile select"
+msgstr "Seleccione Linea Contable a conciliar"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -277,23 +277,23 @@ msgstr ""
 #: code:addons/account/invoice.py:1210
 #, 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)"
+msgstr "Factura '%s' esta abonada: %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 "Accounting entries are an input of the reconciliation."
+msgstr "Lineas contables son la entrada para la conciliación"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr "Belgian Reports"
+msgstr "Reportes de Bélgica"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "You can not add/modify entries in a closed journal."
+msgstr "No puede agregar/modificar asientos en un diario cerrado."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -320,7 +320,7 @@ msgstr "Permitir desajuste"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Seleccionar periodo para analisis"
+msgstr "Seleccionar período para análisis"
 
 #. module: account
 #: view:account.move.line:0
@@ -331,7 +331,7 @@ msgstr "Ext."
 #: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr "Invoice line account company does not match with invoice company."
+msgstr "Cuenta de facturación no empatacon la de la compañía"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -432,7 +432,7 @@ msgstr "Moneda usada para los asientos"
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "Fiscal Year to Open"
+msgstr "Ejercicio Fiscal a Abrir"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -440,8 +440,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"This field contains the informatin related to the numbering of the journal "
-"entries of this journal."
+"Este campo tiene información relacionada a la numeración de los asientos "
+"contables de este diario."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -521,8 +521,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -541,7 +539,7 @@ msgstr "Confirmar las facturas seleccionadas"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr "Padre Objetivo"
+msgstr "Padre"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -664,7 +662,7 @@ msgstr "Diario Centralizado"
 #. 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 "La secuencia principal debe ser diferente de la actual!"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -676,7 +674,7 @@ msgstr "Importe código impuesto"
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
-msgstr "SAJ"
+msgstr "DV"
 
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
@@ -687,7 +685,7 @@ msgstr "Saldo a cerrar ingresado por el verificador de caja"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Cerrar Periodo"
+msgstr "Cerrar Período"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
@@ -697,12 +695,12 @@ msgstr "Cuenta común de Reporte de Empresa"
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr "Periodo para Asientos de apertura"
+msgstr "Período para Asientos de apertura"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "Periodo de Diario"
+msgstr "Período de Diario"
 
 #. module: account
 #: code:addons/account/account_move_line.py:732
@@ -1050,7 +1048,7 @@ msgstr "Facturas de cliente para aprobar"
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr "Select a Fiscal year to close"
+msgstr "Seleccione el ejercicio fiscal a cerrar"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1109,7 +1107,7 @@ msgstr "Banco"
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "Inicio de Periodo"
+msgstr "Inicio de Período"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1175,6 +1173,7 @@ msgstr "# de Transacción"
 
 #. 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
@@ -1262,7 +1261,7 @@ msgstr "Impuestos"
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr "Seleccione un periodo de inicio y fin"
+msgstr "Seleccione un período de inicio y fin"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1362,6 +1361,16 @@ msgstr "You can not use this general account in this journal !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Con saldo diferente de 0"
 
@@ -1536,7 +1545,7 @@ msgstr "Buscar Extractos Bancarios"
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
-"¡Valores debe o haber incorrectos en el modelo (debe + haber debe ser mayor "
+"Valores debe o haber incorrectos en el modelo (debe + haber debe ser mayor "
 "que \"0\")!"
 
 #. module: account
@@ -1568,7 +1577,7 @@ msgid ""
 "form."
 msgstr ""
 "Un extracto bancario es un resumen de todas las transacciones financieras "
-"ocurridas sobre un periodo y depositadas en una cuenta, tarjeta de creditoo "
+"ocurridas sobre un período y depositadas en una cuenta, tarjeta de creditoo "
 "algun otro tipo de cuenta financiera. El saldo inicial es propuesto "
 "automaticamente y el saldo final se encuentra en tu extracto. Cuando usted "
 "está en la columna de pago de una línea, puede presionar F1 para abrir el "
@@ -1610,7 +1619,7 @@ msgstr "Analytic costs to invoice"
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr "Fiscal Year Sequence"
+msgstr "Secuencia para Ejercicio Fiscal"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1764,7 +1773,7 @@ msgstr "Cliente Ref:"
 #: code:addons/account/account_cash_statement.py:328
 #, 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 "El usuario %s no tienen derechos para acceder al diario %s !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1815,7 +1824,7 @@ msgstr "Cuenta de Pérdidas & Ganancias"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "¡Valor crédito o débito erróneo en apunte contable!"
+msgstr "Valor crédito o débito erróneo en apunte contable!"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1827,7 +1836,7 @@ msgstr "Analisis de Facturas"
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr "Periodo de Cierre"
+msgstr "Período de Cierre"
 
 #. module: account
 #: view:account.installer:0
@@ -1868,7 +1877,7 @@ msgstr "Análisis de tesorería"
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
+msgstr "Error! No puede crear compañías recursivas."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1974,7 +1983,7 @@ msgstr "Cancelado"
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr "Base Impnible"
+msgstr "Base Imponible"
 
 #. module: account
 #: help:account.tax,active:0
@@ -2110,7 +2119,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Buscar Plan de Cuentas"
 
 #. module: account
@@ -2177,6 +2186,8 @@ msgstr "Propiedades Contables"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Asientos ordenados por"
 
@@ -2198,11 +2209,16 @@ msgstr "Plantilla de producto"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2285,7 +2301,7 @@ msgstr "Filtros"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr "Open"
+msgstr "Abierto"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -2421,7 +2437,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Select period"
-msgstr "Seleccionar Periodo"
+msgstr "Seleccionar Período"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
@@ -2453,7 +2469,7 @@ msgstr ""
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+msgstr "Error! No puede crear categorías recursivas."
 
 #. module: account
 #: report:account.invoice:0
@@ -2541,6 +2557,7 @@ msgstr "Desc.(%)"
 
 #. 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
@@ -2689,7 +2706,7 @@ msgstr "Clientes"
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr "Periodo a"
+msgstr "Período a"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2800,6 +2817,8 @@ msgstr "Contabilidad financiera"
 #. 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
 msgid "Profit And Loss"
 msgstr "Pérdidas y Ganacias"
 
@@ -2840,7 +2859,7 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one."
 msgstr ""
-"No hay un periodo fiscal definido para esta fecha !\n"
+"No hay un período fiscal definido para esta fecha !\n"
 "Por favor crear uno."
 
 #. module: account
@@ -2868,7 +2887,7 @@ msgstr "El usuario responsable de este diario"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr "Buscar Periodo"
+msgstr "Buscar Período"
 
 #. module: account
 #: view:account.change.currency:0
@@ -3088,7 +3107,6 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3102,6 +3120,17 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: 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"
 
@@ -3157,7 +3186,7 @@ msgstr "No hay Empresa Definida !"
 #: 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 "Cerrar un período"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
@@ -3319,6 +3348,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Contrapartida"
 
@@ -3377,13 +3407,23 @@ msgstr "IVA:"
 #: 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.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 "Chart of Accounts"
 msgstr "Plan de Cuentas"
 
 #. 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 "(Si no selecciona un período, tomaraa todos los períodos abiertos)"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3404,7 +3444,7 @@ msgstr "2"
 #: 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)"
+"(Si no selecciona un ejercicio fiscal, tomara todos los ejercicios abiertos"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3578,7 +3618,7 @@ msgstr "Cuenta a pagar"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
-"No puede crear asientos con movimientos en distintos periodos/diarios"
+"No puede crear asientos con movimientos en distintos períodos/diarios"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3810,7 +3850,7 @@ msgstr "(Invoice should be unreconciled if you want to open it)"
 #: field:account.report.general.ledger,period_from:0
 #: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr "Periodo Desde:"
+msgstr "Período Desde:"
 
 #. module: account
 #: field:account.tax,name:0
@@ -3838,11 +3878,10 @@ msgid "Analytic Balance"
 msgstr "Saldo Analitico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Perdida Neto"
 
@@ -4041,7 +4080,7 @@ msgstr "Descripción de Impuesto"
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "All Posted Entries"
+msgstr "Asientos Contabilizados"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:357
@@ -4302,13 +4341,13 @@ msgstr "Cancelado"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr "Closing balance based on cashBox"
+msgstr "Cerrar balance basado en Cajas"
 
 #. 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."
+msgstr "Error! No se pueden crear cuentas recursivas."
 
 #. module: account
 #: constraint:account.account:0
@@ -4316,20 +4355,20 @@ 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\"!"
+"No se puede crear la cuenta! \n"
+"Asegúrese de que si la cuenta tiene hijos su tipo sea \"Vista\"!"
 
 #. 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 "Generate Entries"
+msgstr "Generar Asientos"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr "Select Charts of Taxes"
+msgstr "Seleccione Plan de Impuestos"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4350,7 +4389,7 @@ msgstr "Cliente"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr "Confirmed"
+msgstr "Confirmado"
 
 #. module: account
 #: report:account.invoice:0
@@ -4361,7 +4400,7 @@ msgstr "Facturas Canceladas"
 #: code:addons/account/invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s' !"
-msgstr "You must define an analytic journal of type '%s' !"
+msgstr "Debes definir un tipo diario de costos '%s' !"
 
 #. module: account
 #: code:addons/account/account.py:1397
@@ -4392,7 +4431,7 @@ 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 "
+"Todos los asientos borrador de este diario y período serán validados. Esto "
 "significa que ya no podrá modificar sus campos contables."
 
 #. module: account
@@ -4403,7 +4442,7 @@ msgstr "Saldo de cuenta -"
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr "Starting Date"
+msgstr "Fecha Inicial"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -4420,7 +4459,7 @@ msgstr ""
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
-msgstr "New Fiscal Year"
+msgstr "Nuevo Ejercicio Fiscal"
 
 #. module: account
 #: view:account.invoice:0
@@ -4441,8 +4480,8 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
 msgstr ""
-"Please verify the price of the invoice !\n"
-"The real total does not match the computed total."
+"Por favor verificar el valor de la factura !\n"
+"El valor real no es igual al calculado !"
 
 #. module: account
 #: view:account.invoice:0
@@ -4450,17 +4489,17 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr "Salesman"
+msgstr "Vendedor"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr "Invoiced"
+msgstr "Facturado"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr "Use Model"
+msgstr "Usar Modelo"
 
 #. module: account
 #: view:account.state.open:0
@@ -4475,7 +4514,7 @@ msgstr "El impuesto basico para declaracion"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr "Add"
+msgstr "Agregar"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4485,7 +4524,7 @@ msgstr "Dejarlo vacío para utilizar la fecha actual."
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr "Bank and Cheques"
+msgstr "Banco y Cheques"
 
 #. module: account
 #: view:account.period.close:0
@@ -4500,7 +4539,7 @@ msgstr "El estado de cuenta usado para conciliacion bancaria"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr "Draft invoices are validated. "
+msgstr "Facturas borrador son validadas "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4536,12 +4575,12 @@ msgstr "Aplicacion de impuesto"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "Asientos Contables"
+msgstr "Detalle de asientos Contables"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
+msgstr ""
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -4581,7 +4620,7 @@ msgstr "Error"
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
 msgid "End of period"
-msgstr "Fin de periodo"
+msgstr "Fin de período"
 
 #. module: account
 #: view:res.partner:0
@@ -4592,7 +4631,7 @@ msgstr "Detalles de banco"
 #: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
-msgstr "Taxes missing !"
+msgstr "No hay Impuestos !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4611,12 +4650,12 @@ msgstr "Fill this if the journal is to be used for refunds of invoices."
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "Generate Fiscal Year Opening Entries"
+msgstr "Generara Asiento de apertura de Ejercicio Fiscal"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr "Group Invoice Lines"
+msgstr "Agrupar Líneas de factura"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -4643,7 +4682,7 @@ msgstr "Para Cerrar"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr "Check Date not in the Period"
+msgstr "Revisar fecha no esta en Período"
 
 #. module: account
 #: code:addons/account/account.py:1210
@@ -4671,7 +4710,7 @@ msgstr "Cuentas de impuesto hijas"
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr "Start period should be smaller then End period"
+msgstr "Período Inicial debe ser menor que el final"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4684,7 +4723,6 @@ msgid "Analytic Balance -"
 msgstr "Saldo analitico -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4697,10 +4735,8 @@ msgstr "Saldo analitico -"
 #: 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.journal.period.print: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
@@ -4710,8 +4746,18 @@ msgstr "Saldo analitico -"
 #: 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
 msgid "Target Moves"
-msgstr "Target Moves"
+msgstr "Seleccionar Asientos"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -4768,23 +4814,23 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr "Year"
+msgstr "Año"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr "Opening Cashbox"
+msgstr "Abrir Cajas"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr "Line 1:"
+msgstr "Linea 1:"
 
 #. module: account
 #: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
-msgstr "Integrity Error !"
+msgstr "Error de Integridad !"
 
 #. module: account
 #: field:account.tax.template,description:0
@@ -4810,7 +4856,7 @@ msgstr "Descripción en facturas"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr "Next Partner to Reconcile"
+msgstr "Siguiente Partner a conciliar"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4821,19 +4867,21 @@ msgstr "Cuenta impuesto"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation result"
-msgstr "Reconciliation result"
+msgstr "Resultado de conciliación"
 
 #. 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
 msgid "Balance Sheet"
-msgstr "Balance Sheet"
+msgstr "Hoja de Balance"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr "Accounting Reports"
+msgstr "Reportes Contables"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4846,7 +4894,7 @@ msgstr "Asientos"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr "This Period"
+msgstr "Este Período"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -4858,7 +4906,7 @@ msgstr "UdM"
 #: code:addons/account/wizard/account_invoice_refund.py:138
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr "No Period found on Invoice!"
+msgstr "No hay período para Factura"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4889,7 +4937,7 @@ msgstr "Venta"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
-msgstr "Amount"
+msgstr "Monto"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -4905,7 +4953,7 @@ 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 "Validation"
+msgstr "Validación"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -4935,7 +4983,7 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
-msgstr "No period found !"
+msgstr "No hay Período !"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -4945,12 +4993,12 @@ msgstr "Permitir cancelación de asientos"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr "Coefficent for parent"
+msgstr "Coeficiente para Padre"
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "(Account/Partner) Name"
+msgstr "Nombre (Cuenta/Partner)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5039,13 +5087,13 @@ msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
 "you can just change some non important fields !"
 msgstr ""
-"You can not do this modification on a reconciled entry ! Please note that "
-"you can just change some non important fields !"
+"No puede modificar una linea conciliada ! Por favor revise que sus cambios "
+"sea sobre campos no importantes"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr "Account Common Account Report"
+msgstr "Cuenta Comun de Reporte Contable"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
@@ -5055,7 +5103,7 @@ msgstr "Comunicación"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "Analytic Accounting"
+msgstr "Contabilidad de Costos"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5069,7 +5117,7 @@ msgstr "Nota de Debito"
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr "Default Taxes"
+msgstr "Impuestos por Defecto"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5100,7 +5148,7 @@ msgstr "Diario asientos cierre del ejercicio"
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr "Configuration Error !"
+msgstr "Error de Configuracion"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5121,7 +5169,7 @@ msgstr "Detalle de suscripcion"
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr "Products Quantity"
+msgstr "Cant. Productos"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5130,7 +5178,7 @@ msgstr "Products Quantity"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "Unposted"
+msgstr "No Contabilizado"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5161,7 +5209,7 @@ msgstr "6"
 #: model:ir.actions.act_window,name:account.action_analytic_open
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Analytic Accounts"
+msgstr "Cuentas de Costos"
 
 #. module: account
 #: help:account.account.type,report_type:0
@@ -5175,7 +5223,7 @@ msgstr ""
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort By"
-msgstr "Sort By"
+msgstr "Ordenar por"
 
 #. module: account
 #: code:addons/account/account.py:1326
@@ -5192,7 +5240,7 @@ msgstr ""
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Amount Currency"
+msgstr "Monto en Moneda"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5201,13 +5249,13 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"Specified Journal does not have any account move entries in draft state for "
-"this period"
+"Diario especificado no tiene ningun asiento contable en borrador para este "
+"período."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr "Lines to reconcile"
+msgstr "Líneas a Conciliar"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5222,12 +5270,12 @@ msgstr "Lines to reconcile"
 #: field:report.account.sales,quantity:0
 #: field:report.account_type.sales,quantity:0
 msgid "Quantity"
-msgstr "Quantity"
+msgstr "Cantidad"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr "Number (Move)"
+msgstr "Núm (Mov.)"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5256,14 +5304,14 @@ msgstr ""
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Fiscal Position Template"
+msgstr "Plantilla de Tipo de Contribuyentes"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:account.chart:0
 #: view:account.tax.chart:0
 msgid "Open Charts"
-msgstr "Open Charts"
+msgstr "Abrir Plan de Cuentas"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -5287,17 +5335,17 @@ msgstr ""
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr "With Currency"
+msgstr "Con Moneda"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr "Open CashBox"
+msgstr "Abrir Caja"
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr "Reconcile With Write-Off"
+msgstr "Conciliar con ajuste"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -5308,7 +5356,7 @@ msgstr "Importe fijo"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr "Valid Up to"
+msgstr "Válido hasta"
 
 #. module: account
 #: view:board.board:0
@@ -5318,18 +5366,18 @@ msgstr "Por cobrar vencidas"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr "Account Automatic Reconcile"
+msgstr "Conciliación Automática"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "Journal Item"
+msgstr "Detalle de Diario"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr "Move journal"
+msgstr "Asiento de Diario"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -5367,7 +5415,7 @@ msgstr "Fecha de Creación"
 #: 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 "Analytic Journals"
+msgstr "Diario de Costos"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5417,7 +5465,7 @@ msgstr "Plantilla de cuentas"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr "Account n°"
+msgstr "Cuenta n°"
 
 #. module: account
 #: help:account.installer.modules,account_payment:0
@@ -5578,6 +5626,19 @@ msgstr "Account General Journal"
 
 #. 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"
@@ -5790,7 +5851,7 @@ msgstr "Reporting Configuration"
 #. 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 "La compañía debe ser la misma para la cuenta y período relacionados."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5827,7 +5888,7 @@ msgstr ""
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr "Select a fiscal year to close"
+msgstr "Seleccione el ejercicio fiscal a cerrrar"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -5863,12 +5924,12 @@ msgstr "Information addendum"
 #: field:account.report.general.ledger,fiscalyear_id:0
 #: field:account.vat.declaration,fiscalyear_id:0
 msgid "Fiscal year"
-msgstr "Fiscal year"
+msgstr "Ejercicio Fiscal"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr "Partial Reconcile Entries"
+msgstr "Conciliación Parcial de Líneas"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5988,18 +6049,18 @@ msgstr "Price"
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr "View Account Analytic Lines"
+msgstr "Ver detalle de Cuentas de costos"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Liability Accounts)"
-msgstr "Balance Sheet (Liability Accounts)"
+msgstr "Hoja de Balance (Cuentas de Pasivo)"
 
 #. module: account
 #: field:account.invoice,internal_number:0
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr "Invoice Number"
+msgstr "Núm. Factura"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6007,19 +6068,19 @@ 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"
+"Indica Si el monto del impuesto debe ser incluido en la base para el calculo "
+"del siguiente impuesto."
 
 #. 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 "Conciliacion: Ir a Siguiente Empresa"
 
 #. 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 "Inverted Analytic Balance"
+msgstr "Balance de Costos Invertido"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
@@ -6048,13 +6109,13 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr "Liquidity"
+msgstr "Pasivo"
 
 #. 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 "Analytic Journal Items"
+msgstr "Detalle de Diario de Costos"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6088,7 +6149,7 @@ msgstr ""
 #. 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 "El nombre del diaro debe ser único por compañía!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6365,7 +6426,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr "Create"
+msgstr "Crear"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
@@ -6375,7 +6436,7 @@ msgstr "Crear asiento"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: percent"
-msgstr "  valuation: percent"
+msgstr "  Evaluacion: porcentaje"
 
 #. module: account
 #: code:addons/account/account.py:499
@@ -6412,7 +6473,7 @@ msgstr "Error !"
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr "Taxes Report"
+msgstr "Reporte de Impuestos"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -6462,7 +6523,7 @@ msgstr "Asientos Contables"
 #. 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 "Mostrar Mayor con Partner por Página"
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6505,7 +6566,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_move_line_list
 #, python-format
 msgid "All Entries"
-msgstr "All Entries"
+msgstr "Todos los Asientos"
 
 #. module: account
 #: constraint:product.template:0
@@ -6518,13 +6579,13 @@ msgstr ""
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr "Journal Select"
+msgstr "Seleccione Diario"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr "Currnt currency is not confirured properly !"
+msgstr "Moneda actual esta mal configurada !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6534,10 +6595,11 @@ msgstr "Cuenta de conciliacion"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr "Taxes Fiscal Position"
+msgstr "Posicion Fiscal de Impuestos"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6802,14 +6864,14 @@ msgstr "Analytic Lines"
 #: 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 "
+"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 ""
 "The normal chart of accounts has a structure defined by the legal "
-"requirement of the country. The analytic chart of account structure should "
+"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) "
@@ -6932,7 +6994,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:report.invoice.created,date_invoice:0
 msgid "Invoice Date"
-msgstr "Invoice Date"
+msgstr "Fecha de Factura"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -6942,7 +7004,7 @@ msgstr "Importe total que este cliente debe."
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr "ir.secuencia"
+msgstr "Secuencias"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -6959,12 +7021,12 @@ msgstr "Ok"
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr "Unknown Partner"
+msgstr "Partner Desconocido"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Balance"
-msgstr "Opening Balance"
+msgstr "Saldo Inicial"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -6980,7 +7042,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr "Closed On"
+msgstr "Cerrado En"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
@@ -6990,12 +7052,12 @@ msgstr "Detalle de Extracto"
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr "Ending Date"
+msgstr "Fecha de Cierre"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "Default Purchase Tax"
+msgstr "Impuesto de compra por defecto"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7046,12 +7108,12 @@ msgstr "Informes"
 #. 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!"
+msgstr "El código del diario debe ser único por compañía!"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr "Closing Cashbox"
+msgstr "Cerrado Caja"
 
 #. module: account
 #: view:account.journal:0
@@ -7078,7 +7140,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr "Comment"
+msgstr "Comentario"
 
 #. module: account
 #: field:account.tax,domain:0
@@ -7089,7 +7151,7 @@ msgstr "Dominio"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr "Use model"
+msgstr "Usar modelo"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7129,7 +7191,7 @@ msgstr "Detalle de Factura"
 #: field:account.pl.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display accounts"
-msgstr "Display accounts"
+msgstr "Mostrar cuentas"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -7140,7 +7202,7 @@ msgstr "Signo en Reporte"
 #: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
-msgstr "You can not have two open register for the same journal"
+msgstr "No puedes tener dos cajas abiertas con el mismo diario"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7209,7 +7271,7 @@ msgstr "Información Opcional"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,user_id:0
 msgid "User"
-msgstr "User"
+msgstr "Usuario"
 
 #. module: account
 #: report:account.general.journal:0
@@ -7234,20 +7296,20 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
-msgstr "Bad account !"
+msgstr "Error en cuenta !"
 
 #. module: account
 #: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
-msgstr "Sales Journal"
+msgstr "Diario de Ventas"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "¡Asientos abiertos!"
+msgstr "Asientos abiertos!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7371,7 +7433,7 @@ msgstr "Sequence"
 #. module: account
 #: model:ir.model,name:account.model_account_bs_report
 msgid "Account Balance Sheet Report"
-msgstr "Account Balance Sheet Report"
+msgstr "Reporte de Saldo de Cuenta"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -7390,17 +7452,17 @@ msgstr "Si"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr "Sales by Account type"
+msgstr "Ventas por tipo de cuenta"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr "Link to the automatically generated Journal Items."
+msgstr "Relacionar a las líneas de diario generadas"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr "Monthly"
+msgstr "Mensualmente"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7425,12 +7487,12 @@ msgstr "  number of days: 14"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr "    7 Days    "
+msgstr "    7 Días    "
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr "Progress"
+msgstr "Progreso"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7441,7 +7503,7 @@ msgstr "Padre"
 #. module: account
 #: field:account.installer.modules,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr "Multiple Analytic Plans"
+msgstr "Plan de Costos Multiple"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -7519,13 +7581,13 @@ msgstr "Aviso !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "State of Move Line"
+msgstr "Estado de la línea de asiento"
 
 #. 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 "Account move line reconcile"
+msgstr "Detalle de asiento a conciliar"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7543,6 +7605,7 @@ msgstr "Monto (en letras) :"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7564,13 +7627,13 @@ msgstr "Empresa"
 #. 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 "Seleccione una moneda para aplicar a la factura"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:100
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
-msgstr "Can not %s draft/proforma/cancel invoice."
+msgstr "No puedes %s borrador/proforma/cancelar la factura."
 
 #. module: account
 #: code:addons/account/invoice.py:787
@@ -7604,8 +7667,8 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
-"Select Fiscal Year which you want to remove entries for its End of year "
-"entries journal"
+"Seleccione el ejercicio fiscal que desea remover las entradas contables para "
+"su asinto de cierre de ejercicio"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7627,17 +7690,17 @@ msgstr "Método cierre"
 #: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr "Invoice '%s' is paid."
+msgstr "La factura '%s' está pagada."
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr "Automatic entry"
+msgstr "Entrada automática"
 
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Error ! You can not create recursive Tax Codes."
+msgstr "Error ! No puede crear códigos recursivos"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7670,12 +7733,12 @@ msgstr "Balance de Costos Invertido -"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for bank reconciliation"
-msgstr "Open for bank reconciliation"
+msgstr "Abrir para conciliación bancaria"
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
-msgstr "One Partner Per Page"
+msgstr "Una empresa por página"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
@@ -7686,36 +7749,36 @@ msgstr "Hijos"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr "Associated Partner"
+msgstr "Empresa Asociada"
 
 #. module: account
 #: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
-msgstr "You must first select a partner !"
+msgstr "Primero debe seleccionar una empresa !"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr "Additional Information"
+msgstr "Info Adicional"
 
 #. module: account
 #: view:account.installer:0
 msgid "Bank and Cash Accounts"
-msgstr "Bank and Cash Accounts"
+msgstr "Cuentas de Banco y Efectivo"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr "Total Residual"
+msgstr "Total Pendiente"
 
 #. 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 "El estado de la factura es Abierto"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7740,7 +7803,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 "Cost Ledger"
+msgstr "Mayor de Costos"
 
 #. module: account
 #: view:account.invoice:0
@@ -7750,19 +7813,19 @@ msgstr "Proforma"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr "J.C. /Move name"
+msgstr "J.C. /Movimiento"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
 msgid "Choose Fiscal Year"
-msgstr "Choose Fiscal Year"
+msgstr "Seleccionar Ejercicio Fiscal"
 
 #. module: account
 #: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Purchase Refund Journal"
+msgstr "Diario de Reembolso de Compras"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -7807,9 +7870,22 @@ msgstr "Administracion Financiera y Contable"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Period"
+msgstr "Período"
 
 #. module: account
 #: report:account.invoice:0
@@ -7819,12 +7895,12 @@ msgstr "Net Total:"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr "Generic Reporting"
+msgstr "Reportes Comunes"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr "Write-Off Journal"
+msgstr "Diario de Ajuste"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -7849,12 +7925,12 @@ msgstr "Cuenta de la categoría de ingresos"
 #: 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 "Plantilla de Tipos de Contribuyentes"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr "Int.Type"
+msgstr "Tipo Int."
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -7901,19 +7977,11 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Moneda de la compañía"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Chart of Account"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr "Payment"
+msgstr "Pago"
 
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
@@ -7944,17 +8012,17 @@ msgstr "Conciliación parcial"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr "Account Analytic Inverted Balance"
+msgstr "Balance Invertido"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr "Account Common Report"
+msgstr "Cuentas comunes"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr "Automatic import of the bank sta"
+msgstr "Carga automática de extracto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
@@ -7977,12 +8045,12 @@ msgstr "Tipos de cuentas"
 #: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
-msgstr "Cannot create invoice move on centralised journal"
+msgstr "No puede crear un movimiento de factura en un diario centralizado"
 
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr "P&L / BS Category"
+msgstr "Categoría para PYG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7996,37 +8064,43 @@ msgstr "P&L / BS Category"
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr "Reconciliation"
+msgstr "Conciliación"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "Receivable Account"
+msgstr "Cuenta por Cobrar"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox Balance"
-msgstr "CashBox Balance"
+msgstr "Saldo de Caja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr "Fiscalyear Close state"
+msgstr "Cerrar Ejercicio Fiscal"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "Refund Journal"
+msgstr "Diario de Reembolsos"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal: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
 msgid "Filter By"
-msgstr "Filter By"
+msgstr "Filtrar por"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -8046,7 +8120,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr "Company Analysis"
+msgstr "Análisis de la Compañia"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -8085,12 +8159,12 @@ msgstr "Subtotal"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "Print Tax Statement"
+msgstr "Imprimir Declaración de Impuestos"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr "Journal Entry Model Line"
+msgstr "Modelo de detalle de asiento"
 
 #. module: account
 #: view:account.invoice:0
@@ -8112,7 +8186,7 @@ msgstr "Proveedores"
 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"
+"No puede crear más de un movimiento por período en un diario centralizado"
 
 #. module: account
 #: view:account.journal:0
@@ -8141,33 +8215,33 @@ msgstr "  valuation: balance"
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr "Statistics"
+msgstr "Estadísticas"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
 #: field:project.account.analytic.line,from_date:0
 msgid "From"
-msgstr "From"
+msgstr "Desde"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr "Fiscalyear Close"
+msgstr "Cerrar Ejercicio Fiscal"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "The code of the account must be unique per company !"
+msgstr "El código debe ser único por compañia"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr "Unpaid Invoices"
+msgstr "Facturas sin Pagar"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
 msgid "Debit amount"
-msgstr "Debit amount"
+msgstr "Valor Debe"
 
 #. module: account
 #: view:board.board:0
@@ -8196,7 +8270,7 @@ msgstr "Cuentas permitidas (vacío para ningún control)"
 #: 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 "Chart of Analytic Accounts"
+msgstr "Plan de Cuentas de Costos"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -8212,14 +8286,14 @@ msgstr "Importe total que debe pagar a este proveedor."
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr "Analytic Costs"
+msgstr "Costos Analíticos"
 
 #. module: account
 #: field:account.analytic.journal,name:0
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "Journal Name"
+msgstr "Nombre de Diario"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8227,8 +8301,7 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
-"Unique number of the invoice, computed automatically when the invoice is "
-"created."
+"Núm único de Factura, cálculado automáticamente cuando la factura es creada"
 
 #. module: account
 #: constraint:account.bank.statement.line:0
@@ -8244,18 +8317,18 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
-msgstr "Bad account!"
+msgstr "Error en Cuenta !"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr "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:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
+msgstr "El movimiento contable (%s) para centralización ha sido confirmado!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8275,6 +8348,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8291,7 +8365,7 @@ msgstr ""
 #: field:report.account_type.sales,currency_id:0
 #: field:report.invoice.created,currency_id:0
 msgid "Currency"
-msgstr "Currency"
+msgstr "Moneda"
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -8358,34 +8432,34 @@ msgstr ""
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr "Force period"
+msgstr "Forzar Período"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "Print Account Partner Balance"
+msgstr "Imprimir Balance de Empresa"
 
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr "Contracts"
+msgstr "Contratos"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 msgid "unknown"
-msgstr "unknown"
+msgstr "Desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "Opening Entries Journal"
+msgstr "Diario de Asiento de Apertura"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr "Draft invoices are checked, validated and printed."
+msgstr "Facturas borrador están revisadas, validadas e impresas"
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8406,7 +8480,7 @@ msgstr "Tipo de referencia"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for period"
-msgstr "Cost Ledger for period"
+msgstr "Mayor de Costos para período"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8421,12 +8495,12 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr "Given by Python Code"
+msgstr "Por Código Python"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "Journal Code"
+msgstr "Código de Diario"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -8444,7 +8518,7 @@ msgstr ""
 #: field:account.move.line,amount_residual:0
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
-msgstr "Residual Amount"
+msgstr "Saldo Pendiente"
 
 #. module: account
 #: field:account.invoice,move_lines:0
@@ -8456,7 +8530,7 @@ msgstr "Líneas de asiento"
 #: 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 "Abrir Diario"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8468,7 +8542,7 @@ msgstr "KI"
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr "Period from"
+msgstr "Desde"
 
 #. module: account
 #: code:addons/account/account.py:2817
@@ -8502,7 +8576,7 @@ msgstr "Pago registrado"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr "Close states of Fiscal year and periods"
+msgstr "Cerrar ejercicio fiscal y períodos"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8515,7 +8589,7 @@ msgstr "Información de Producto"
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr "Analytic"
+msgstr "Analitico"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
@@ -8526,13 +8600,13 @@ msgstr "Crear factura"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr "Purchase Tax(%)"
+msgstr "Imp. de Compra (%)"
 
 #. module: account
 #: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
-msgstr "Please create some invoice lines."
+msgstr "Por favor crear algun detalle."
 
 #. module: account
 #: report:account.overdue:0
@@ -8588,25 +8662,30 @@ msgstr "Administración de Seguimientos"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
-msgstr "Periodo Inicial"
+msgstr "Período Inicial"
 
 #. module: account
 #: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
-msgstr "Cannot locate parent code for template account!"
+msgstr "No se puede encontrar el código padre para la cuenta"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
-msgstr "Analysis Direction"
+msgstr "Dirección de Análisis"
 
 #. module: account
 #: field:res.partner,ref_companies:0
@@ -8627,7 +8706,7 @@ msgstr "Vista de Diario"
 #: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "Total credit"
-msgstr "Total haber"
+msgstr "Total crédito"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -8648,7 +8727,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Best regards."
+msgstr "Saludos cordiales,"
 
 #. module: account
 #: view:account.invoice:0
@@ -8718,7 +8797,12 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8737,8 +8821,17 @@ msgstr "Manually or automatically entered in the system"
 
 #. 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 "Display Account"
+msgstr "Mostrar Cuentas"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8776,7 +8869,7 @@ msgstr "A pagar"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr "This Year"
+msgstr "Este Año"
 
 #. module: account
 #: view:board.board:0
@@ -8808,13 +8901,13 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:391
 #, python-format
 msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr "Cannot delete bank statement(s) which are already confirmed !"
+msgstr "No puede borrar extractos que están confirmados"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr "You must select accounts to reconcile"
+msgstr "Debe seleccionar cuentas para conciliar"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -8824,7 +8917,7 @@ msgstr "Saldo por tipo de cuenta"
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr "Accounting entries are the first input of the reconciliation."
+msgstr "Líneas de Asientos son la primera entrada para la conciliación"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8854,13 +8947,13 @@ msgstr "Receiver's Signature"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr "Filters By"
+msgstr "Filtrado Por"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr "Manual entry"
+msgstr "Entrada Manual"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8868,7 +8961,7 @@ msgstr "Manual entry"
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Move"
+msgstr "Movimiento"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1128
@@ -8911,12 +9004,12 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation transactions"
-msgstr "Reconciliation transactions"
+msgstr "Transacciones de Conciliación"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr "Common Report"
+msgstr "Reporte Común"
 
 #. module: account
 #: view:account.account:0
@@ -8952,7 +9045,7 @@ msgstr "Julio"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan contable"
 
 #. module: account
@@ -8963,20 +9056,25 @@ msgstr "Subscripción"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr "Account Analytic Balance"
+msgstr "Balance de Costos"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
-msgstr "End Period"
+msgstr "Período Final"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8994,18 +9092,18 @@ msgstr "End Period"
 #: 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 "Chart of account"
+msgid "Chart of Accounts"
+msgstr "Plan de Cuentas"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr "Due date"
+msgstr "Fecha Límite"
 
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard entries"
-msgstr "Standard entries"
+msgstr "Entradas estandar"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -9019,8 +9117,8 @@ msgid ""
 "Tax base different !\n"
 "Click on compute to update tax base"
 msgstr ""
-"Tax base different !\n"
-"Click on compute to update tax base"
+"Base de impuestos difiere !\n"
+"Clic para calcular y actualizar !"
 
 #. module: account
 #: view:account.subscription:0
@@ -9055,7 +9153,7 @@ msgstr "Asiento periódico"
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_from:0
 msgid "Start Date"
-msgstr "Start Date"
+msgstr "Fecha Inicio"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
@@ -9073,7 +9171,7 @@ msgstr "No conciliado"
 #: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
-msgstr "Bad total !"
+msgstr "Total erróneo !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -9102,13 +9200,13 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr "Pending"
+msgstr "Pendiente"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "From analytic accounts"
+msgstr "De cuentas de costos"
 
 #. module: account
 #: field:account.installer.modules,account_payment:0
@@ -9123,7 +9221,7 @@ msgstr "Nombre de período"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr "Code/Date"
+msgstr "Código/Fecha"
 
 #. module: account
 #: field:account.account,active:0
@@ -9176,7 +9274,7 @@ msgstr "Divisa secundaria"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr "Validate Account Move"
+msgstr "Validar Asiento contable"
 
 #. module: account
 #: field:account.account,credit:0
@@ -9189,6 +9287,7 @@ msgstr "Validate Account Move"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -9200,7 +9299,7 @@ msgstr "Validate Account Move"
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr "Haber"
+msgstr "Crédito"
 
 #. module: account
 #: help:account.invoice.refund,journal_id:0
@@ -9222,12 +9321,12 @@ msgstr "Through :"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr "General Journals"
+msgstr "Diarios Generales"
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr "Journal Entry Model"
+msgstr "Modelo de Asiento Contable"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9239,14 +9338,14 @@ msgid ""
 msgstr ""
 "La fecha de vencimiento de la línea de asiento 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!"
+"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 "Number"
+msgstr "Número"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9276,6 +9375,18 @@ msgstr "General"
 #: selection:account.pl.report,filter: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
@@ -9285,12 +9396,12 @@ msgstr "General"
 #: model:ir.ui.menu,name:account.next_id_23
 #, python-format
 msgid "Periods"
-msgstr "Periodos"
+msgstr "Períodos"
 
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr "Currency Rate"
+msgstr "Tasa de Cambio"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -9304,12 +9415,12 @@ msgstr "For Value percent enter % ratio between 0-1."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr "April"
+msgstr "Abril"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr "Open for Reconciliation"
+msgstr "Abrir para Conciliación"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -9322,20 +9433,21 @@ msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
-"Refund invoice base on this type. You can not Modify and Cancel if the "
-"invoice is already reconciled"
+"Reembolsar factura basada en este tipo.No puedes modiicar 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."
 msgstr ""
-"Allows invoice lines to impact multiple analytic accounts simultaneously."
+"Permite al detalle de factura afectar varias cuentas de costos "
+"simultaneamente"
 
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr "Sale Tax(%)"
+msgstr "IVA en Ventas(%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9434,7 +9546,7 @@ msgstr "Este mes"
 #: view:account.analytic.inverted.balance:0
 #: model:ir.actions.act_window,name:account.action_account_partner_ledger
 msgid "Select Period"
-msgstr "Seleccionar periodo"
+msgstr "Seleccionar período"
 
 #. module: account
 #: view:account.entries.report:0
@@ -9444,7 +9556,7 @@ msgstr "Seleccionar periodo"
 #: view:account.move.line:0
 #: report:account.move.voucher:0
 msgid "Posted"
-msgstr "Fijado"
+msgstr "Contabilizado"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9493,15 +9605,12 @@ msgid "Tax Source"
 msgstr "Origen impuesto"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
-msgstr "Net Profit"
+msgstr "Ingresos Netos"
 
 #. module: account
 #: view:ir.sequence:0
@@ -9524,8 +9633,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "JRNL"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9619,7 +9728,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr "Crear Periodos Mensuales"
+msgstr "Crear Períodos Mensuales"
 
 #. module: account
 #: field:account.tax.code.template,sign:0
@@ -9666,7 +9775,7 @@ msgstr "Detalle de Facturas"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr "End period"
+msgstr "Período Final"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
@@ -9679,7 +9788,7 @@ msgstr "End period"
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Warning"
-msgstr "Warning"
+msgstr "Aviso"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -9694,7 +9803,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "On Account of :"
-msgstr "On Account of :"
+msgstr "Cuenta de :"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9705,17 +9814,17 @@ msgstr "Write-Off Move"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr "Invoice's state is Done"
+msgstr "Estado de factura es Cerrado"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr "Report of the Sales by Account"
+msgstr "Reporte de Ventas por Cuenta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "Accounts Fiscal Position"
+msgstr "Cuentas para Tipos de Contribuyentes"
 
 #. module: account
 #: report:account.invoice:0
@@ -9738,6 +9847,7 @@ msgstr "Factura de Proveedor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9759,7 +9869,7 @@ msgstr "Detalle de factura"
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr "Error ! You can not create recursive account templates."
+msgstr "Error ! No puede crear cuentas recursivas"
 
 #. module: account
 #: constraint:account.account.template:0
@@ -9768,20 +9878,20 @@ msgid ""
 "Make sure if the account template has parent then it should be type "
 "\"View\"! "
 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 "
+"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 "Recurring"
+msgstr "Recurrente"
 
 #. module: account
 #: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
-msgstr "Entry is already reconciled"
+msgstr "Entrada ya esta conciliada"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
@@ -9818,6 +9928,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Con movimientos"
 
@@ -9843,7 +9963,7 @@ msgstr "Manualmente"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr "December"
+msgstr "Diciembre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9854,7 +9974,7 @@ msgstr "Imprimir diarios analíticos"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr "Fin.Account"
+msgstr "Cuenta Fin."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -9865,7 +9985,7 @@ msgstr "Por cobrar vencidos"
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr "Applicability"
+msgstr "Aplicabilidad"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -9888,12 +10008,12 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr "Billing"
+msgstr "Facturación"
 
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
-msgstr "Parent Account"
+msgstr "Cuenta Padre"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9915,7 +10035,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr "Account Analytic Chart"
+msgstr "Plan de Cuentas de Costos"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -9943,7 +10063,7 @@ msgstr "Intercambio de Cuentas"
 #: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr "Invoice '%s' is waiting for validation."
+msgstr "La factura '%s' está esperando validación"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9952,7 +10072,7 @@ msgstr "Invoice '%s' is waiting for validation."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr "November"
+msgstr "Noviembre"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer_modules
@@ -10023,7 +10143,7 @@ msgstr "Documentos Contables"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr "Validate Account Move Lines"
+msgstr "Validar detalle de asientos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -10034,7 +10154,7 @@ msgstr "Mayor de costos (Solo cantidades)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr "Invoice's state is Done."
+msgstr "Estado de facturas es terminado"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
@@ -10070,7 +10190,7 @@ msgstr "account.addtmpl.wizard"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr "Partner's"
+msgstr "Empresas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -10106,7 +10226,7 @@ msgstr "Modelo de asiento"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr "February"
+msgstr "Febrero"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10121,7 +10241,7 @@ msgstr "Cuenta de Banco"
 #: 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 "Account Central Journal"
+msgstr "Diario Central"
 
 #. module: account
 #: report:account.overdue:0
@@ -10175,7 +10295,7 @@ msgstr "You must enter a period length that cannot be 0 or below !"
 #: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
-msgstr "You cannot remove an account which has account entries!. "
+msgstr "No puedes borrar una cuentas con movimientos ! "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -10205,6 +10325,18 @@ 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 "Activos"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Pasivos"
+
 #~ msgid "Asset"
 #~ msgstr "Activo"
 
@@ -10282,18 +10414,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Total asientos"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Desc. (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Si el pago ha sido realizado después de que este correo haya sido enviado, "
-#~ "por favor no tenga en cuenta este correo. No dude en contactar con nuestro "
-#~ "departamento de contabilidad."
-
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr ""
 #~ "Confirmar extracto bancario con/sin conciliación a partir del extracto "
@@ -10308,9 +10428,6 @@ msgstr ""
 #~ msgid "Mvt"
 #~ msgstr "Mov."
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "¡Error! No puede crear una cuenta recursiva."
-
 #~ msgid "Contact"
 #~ msgstr "Contacto"
 
@@ -10376,10 +10493,6 @@ msgstr ""
 #~ msgid "Standard entry"
 #~ msgstr "Asiento estándar"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "¡No se puede validar un asiento descuadrado!"
-
 #~ msgid "New Analytic Account"
 #~ msgstr "Nueva cuenta analítica"
 
@@ -10410,13 +10523,6 @@ msgstr ""
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Calcular fechas asiento"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "La cuenta bancaria de la empresa para pagar\n"
-#~ "Dejarlo vacío para utilizar el valor por defecto"
-
 #~ msgid "Close states"
 #~ msgstr "Cerrar estados"
 
@@ -10539,9 +10645,6 @@ msgstr ""
 #~ msgid "Bank Reconciliation"
 #~ msgstr "Conciliación Bancaria"
 
-#~ msgid "account.move.line"
-#~ msgstr "Linea de Asiento Contable"
-
 #~ msgid "Sign for parent"
 #~ msgstr "Signo para el padre"
 
@@ -10784,9 +10887,6 @@ msgstr ""
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nueva factura de cliente"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID empresa"
-
 #~ msgid "Analytic account costs and revenues"
 #~ msgstr "Cuenta analítica costes y retornos"
 
@@ -10844,9 +10944,6 @@ msgstr ""
 #~ msgid "Reconcilate the entries from payment"
 #~ msgstr "Conciliar los asientos desde pago"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Journal de Banque CHF"
 #~ msgstr "Diario de banco"
 
@@ -10909,9 +11006,6 @@ msgstr ""
 #~ msgid "Import invoice"
 #~ msgstr "Importar factura"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldo a cuenta nueva"
-
 #~ msgid "Pay and reconcile"
 #~ msgstr "Pagar y conciliar"
 
@@ -10940,9 +11034,6 @@ 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 "Write-Off Period"
-#~ msgstr "Período de desajuste"
-
 #~ msgid "Credit Note"
 #~ msgstr "Factura rectificativa (abono)"
 
@@ -11076,25 +11167,6 @@ msgstr ""
 #~ msgid "Subtotal w/o tax"
 #~ msgstr "Subtotal sin imp."
 
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Plantilla de Tipos de Contribuyente"
-
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Posiciones fiscales contables"
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Impuestos por tipo de contribuyente"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Plantillas de Mapeo de Impuestos"
-
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "El tipo de contribuyente determinara impuestos y cuentas usadas por el "
-#~ "partner"
-
 #~ msgid "The currency of the journal"
 #~ msgstr "Moneda del diario"
 
@@ -11126,15 +11198,6 @@ msgstr ""
 #~ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 #~ msgstr "Costes analíticos para refacturar compras, hojas de servicios, ..."
 
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Posiciones Fiscales"
-
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Plantilla para cambio de impuestos"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Plantilla para posiciones fiscales"
-
 #~ msgid "Name of the fiscal year as displayed in reports."
 #~ msgstr "Nombre del ejercicio fiscal que se muestra en informes."
 
@@ -11338,9 +11401,6 @@ msgstr ""
 #~ msgid "Accounting entries at statement's confirmation"
 #~ msgstr "Confirmacion de asientos contables"
 
-#~ msgid "All account entries"
-#~ msgstr "Todas las entradas contables"
-
 #~ msgid "Date Filter"
 #~ msgstr "Fecha para filtro"
 
@@ -11457,140 +11517,12 @@ msgstr ""
 #~ msgid "Name of the fiscal year as displayed on screens."
 #~ msgstr "Descripcion del ejercicio fiscal mostrado en pantalla"
 
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Configuracion de Contribuyentes"
-
 #~ msgid "Statement Process"
 #~ msgstr "Proceso de estado de cuentas"
 
 #~ msgid "Statement reconcile"
 #~ msgstr "Cuentas para conciliar"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Costos para cerrar"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Facturas en borrador"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Cuentas a facturar"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Costos para facturar"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Por cobar vencidas"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Tablero para contador"
-
-#~ msgid "My indicators"
-#~ msgstr "Mis indicadores"
-
-#~ msgid "Aged income"
-#~ msgstr "Ingresos vencidos"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Mostrar informacion debito/credito"
-
-#~ msgid "All accounts"
-#~ msgstr "Todas las cuentas"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Seleccion de entradas basadas en"
-
-#~ msgid "Notification"
-#~ msgstr "Notificacion"
-
-#~ msgid "Financial Period"
-#~ msgstr "Periodo financiero"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Seleccione Periodo(s)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Comparar años seleccionados en terminos de"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Seleccionar Año fiscal (maximo tres años)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Seleccionar cuenta de ref. (para comparacion %)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Comparacion de saldos de cuentas por año"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Has seleccionado la opcion 'horizontal. Revisar'"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Mostrar reporte en horizontal"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Mostrar comparacion en %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "No comparar"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Mostrar Cuentas"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Has selecciona mas de 3 años en todos los casos."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Administracion de comparacion contable y financiera de cuentas."
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Puedes seleccionar maximo 3 años. Por favor revise de nuevo."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Has seleccionado la opcion Porcentaje con mas de 2 años, y no has "
-#~ "seleccionado el formato."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Talves cometio los siguientes errores, por favor corrijalos e intente de "
-#~ "nuevo."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Dejar vacio para la comparacion con su padre"
-
-#~ msgid "Creation Date"
-#~ msgstr "Fecha de creacion"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "No ha seleccionado la opcion de porcentaje, pero has seleccionado mas de 2 "
-#~ "años."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Talves has seleccionado las opciones de comparacion con mas de 1 año con "
-#~ "debito/credito y la opcion %s. Esto puede llevar contenido para imprimir "
-#~ "fuera de pagina. Trate de nuevo."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Debes seleccionar al menos un año fiscal, Intente de nuevo"
-
-#~ msgid "Customize Report"
-#~ msgstr "Reporte personalizado"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Un modulo que agrega nuevos reportes basados en el modulo contable"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Reportes contables - Reportes"
-
 #~ msgid ""
 #~ "Indicate if the amount of tax must be included in the base amount for the "
 #~ "computation of the next taxes"
@@ -11598,141 +11530,16 @@ msgstr ""
 #~ "Indique si el importe del impuesto debe ser incluido en el importe base para "
 #~ "el cálculo de otros impuestos"
 
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "El módulo de balance de cuentas es una funcionalidad añadida al módulo de "
-#~ "gestión financiera.\n"
-#~ "\n"
-#~ "    Este módulo ofrece diversas opciones de impresión de balances.\n"
-#~ "\n"
-#~ "    1. Se puede comparar el balance de distintos años.\n"
-#~ "\n"
-#~ "    2. Puede establecer la comparación en importe o porcentual entre dos "
-#~ "años.\n"
-#~ "\n"
-#~ "    3. Puede establecer la cuenta de referencia para la comparación "
-#~ "porcentual para años en particular.\n"
-#~ "\n"
-#~ "    4. Puede seleccionar períodos como una fecha real o períodos como fecha "
-#~ "de creación.\n"
-#~ "\n"
-#~ "    5. Puede imprimir el informe que desee en formato apaisado.\n"
-#~ "    "
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
 
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr "No hay diario definido para el cierre de ejercicio fiscal"
 
-#~ msgid ""
-#~ "A tool search lets you know statistics on your different financial accounts "
-#~ "that match your needs."
-#~ msgstr ""
-#~ "A tool search lets you know statistics on your different financial accounts "
-#~ "that match your needs."
-
-#~ msgid "supplier"
-#~ msgstr "Proveedor"
-
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Diario Egresos Notas de Credito - (test)"
-
-#~ msgid "Income View"
-#~ msgstr "Vista de Ingresos"
-
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-
-#~ msgid ""
-#~ "Can't find any account journal of %s type for this company. You can create "
-#~ "one in the menu: Configuration Financial Accounting Accounts Journals.' % "
-#~ "(context.get('journal_type"
-#~ msgstr ""
-#~ "Can't find any account journal of %s type for this company. You can create "
-#~ "one in the menu:  nConfiguration Financial Accounting AccountsJournals.' % "
-#~ "(context.get('journal_type"
-
-#~ 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."
-#~ msgstr ""
-#~ "All draft account entries in this journal and period will be validated. It "
-#~ "means you won't be able to modify their accounting fields."
-
 #~ msgid "logo"
 #~ msgstr "logo"
 
-#~ msgid ""
-#~ "Maturity date of entry line generated by model line '%s' of model '%s' is "
-#~ "based on partner payment term! \\n                    \n"
-#~ "Please define partner on it!\"%(line.name, model.name)))\n"
-#~ "                    if line.partner_id.property_payment_term:\n"
-#~ "                        payment_term_id = "
-#~ "line.partner_id.property_payment_term.id\n"
-#~ "                        pterm_list = pt_obj.compute(cr, uid, "
-#~ "payment_term_id, value=1, date_ref=date_maturity)\n"
-#~ "                        if pterm_list:\n"
-#~ "                            pterm_list = [l[0] for l in pterm_list]\n"
-#~ "                            pterm_list.sort()\n"
-#~ "                            date_maturity = pterm_list[-1]\n"
-#~ "\n"
-#~ "                val.update({\n"
-#~ "                    'name': line.name,\n"
-#~ "                    'quantity': line.quantity,\n"
-#~ "                    'debit': line.debit,\n"
-#~ "                    'credit': line.credit,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'move_id': move_id,\n"
-#~ "                    'partner_id': line.partner_id.id,\n"
-#~ "                    'date': context.get('date',time.strftime('%Y-%m-%d"
-#~ msgstr ""
-#~ "Maturity date of entry line generated by model line '%s' of model '%s' is "
-#~ "based on partner payment term! \\n                    \n"
-#~ "Please define partner on it!\"%(line.name, model.name)))\n"
-#~ "                    if line.partner_id.property_payment_term:\n"
-#~ "                        payment_term_id = "
-#~ "line.partner_id.property_payment_term.id\n"
-#~ "                        pterm_list = pt_obj.compute(cr, uid, "
-#~ "payment_term_id, value=1, date_ref=date_maturity)\n"
-#~ "                        if pterm_list:\n"
-#~ "                            pterm_list = [l[0] for l in pterm_list]\n"
-#~ "                            pterm_list.sort()\n"
-#~ "                            date_maturity = pterm_list[-1]\n"
-#~ "\n"
-#~ "                val.update({\n"
-#~ "                    'name': line.name,\n"
-#~ "                    'quantity': line.quantity,\n"
-#~ "                    'debit': line.debit,\n"
-#~ "                    'credit': line.credit,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'move_id': move_id,\n"
-#~ "                    'partner_id': line.partner_id.id,\n"
-#~ "                    'date': context.get('date',time.strftime('%Y-%m-%d"
-
 #~ 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 "
@@ -11745,18 +11552,6 @@ msgstr ""
 #~ msgid "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 #~ msgstr "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 
-#~ msgid ""
-#~ "A tool search lets you know statistics on invoices that match your needs."
-#~ msgstr ""
-#~ "A tool search lets you know statistics on invoices that match your needs."
-
-#~ msgid ""
-#~ "A tool search lets you know statistics on your analytics records that match "
-#~ "your needs."
-#~ msgstr ""
-#~ "A tool search lets you know statistics on your analytics records that match "
-#~ "your needs."
-
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "Desconocido"
@@ -11764,256 +11559,27 @@ msgstr ""
 #~ msgid "<stroke color=\"darkblue\"/>"
 #~ msgstr "<stroke color=\"darkblue\"/>"
 
-#, python-format
-#~ msgid "You cannot create a bank or cash register without a journal!"
-#~ msgstr "You cannot create a bank or cash register without a journal!"
-
 #~ msgid "Import Invoice"
 #~ msgstr "Importar Factura"
 
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-
-#~ msgid "Validate Journal Entries of a Journal"
-#~ msgstr "Validar asientos de u Diario"
-
-#~ msgid "Validate Journal Entries"
-#~ msgstr "Validar asientos de diario"
-
-#~ msgid ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-
 #~ msgid "</drawString>"
 #~ msgstr "</drawString>"
 
-#~ msgid "Select recurring to create a manualy recurring accounting entries"
-#~ msgstr "Select recurring to create a manualy recurring accounting entries"
-
-#~ 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.\"\"\" % "
-#~ "(line.account_id.code, line.account_id.name)))\n"
-#~ "\n"
-#~ "            if abs(amount) < 10 ** -4:\n"
-#~ "                # If the move is balanced\n"
-#~ "                # Add to the list of valid moves\n"
-#~ "                # (analytic lines will be created later for valid moves)\n"
-#~ "                valid_moves.append(move)\n"
-#~ "\n"
-#~ "                # Check whether the move lines are confirmed\n"
-#~ "\n"
-#~ "                if not line_draft_ids:\n"
-#~ "                    continue\n"
-#~ "                # Update the move lines (set them as valid)\n"
-#~ "\n"
-#~ "                obj_move_line.write(cr, uid, line_draft_ids, {\n"
-#~ "                    'journal_id': move.journal_id.id,\n"
-#~ "                    'period_id': move.period_id.id,\n"
-#~ "                    'state': 'valid'\n"
-#~ "                }, context, check=False)\n"
-#~ "\n"
-#~ "                account = {}\n"
-#~ "                account2 = {}\n"
-#~ "\n"
-#~ "                if journal.type in ('purchase','sale"
-#~ msgstr ""
-#~ "\"\"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.\"\"\" % "
-#~ "(line.account_id.code, line.account_id.name)))\n"
-#~ "\n"
-#~ "            if abs(amount) < 10 ** -4:\n"
-#~ "                # If the move is balanced\n"
-#~ "                # Add to the list of valid moves\n"
-#~ "                # (analytic lines will be created later for valid moves)\n"
-#~ "                valid_moves.append(move)\n"
-#~ "\n"
-#~ "                # Check whether the move lines are confirmed\n"
-#~ "\n"
-#~ "                if not line_draft_ids:\n"
-#~ "                    continue\n"
-#~ "                # Update the move lines (set them as valid)\n"
-#~ "\n"
-#~ "                obj_move_line.write(cr, uid, line_draft_ids, {\n"
-#~ "                    'journal_id': move.journal_id.id,\n"
-#~ "                    'period_id': move.period_id.id,\n"
-#~ "                    'state': 'valid'\n"
-#~ "                }, context, check=False)\n"
-#~ "\n"
-#~ "                account = {}\n"
-#~ "                account2 = {}\n"
-#~ "\n"
-#~ "                if journal.type in ('purchase','sale"
-
-#~ msgid ""
-#~ "To get detailed information about a partner you can ask for the Partner "
-#~ "Ledgers."
-#~ msgstr ""
-#~ "To get detailed information about a partner you can ask for the Partner "
-#~ "Ledgers."
-
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no income account defined ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "The certificate ID of the module must be unique !"
-
-#~ msgid ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-#~ msgstr ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 
-#~ msgid "Customer Invoices to Validate"
-#~ msgstr "Facturas de Cliente a Validar"
-
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-
-#~ msgid "Move/Entry label"
-#~ msgstr "Etiqueta Mov."
-
-#~ msgid ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-#~ msgstr ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-
-#~ msgid "Entry No"
-#~ msgstr "Entry No"
-
-#~ msgid ""
-#~ "User %s does not have rights to access %s journal !' % "
-#~ "(statement.user_id.name, statement.journal_id.name)))\n"
-#~ "\n"
-#~ "            if statement.name and statement.name == '/':\n"
-#~ "                number = self.pool.get('ir.sequence"
-#~ msgstr ""
-#~ "User %s does not have rights to access %s journal !' % "
-#~ "(statement.user_id.name, statement.journal_id.name)))\n"
-#~ "\n"
-#~ "            if statement.name and statement.name == '/':\n"
-#~ "                number = self.pool.get('ir.sequence"
-
-#~ msgid ""
-#~ "A recurring entry is a payment related entry that occurs on a recurrent "
-#~ "basis from a specific date corresponding to the signature of a contract or "
-#~ "an agreement with a customer or a supplier. With Define Recurring Entries, "
-#~ "you can create them in the system in order to automate their entries in the "
-#~ "system."
-#~ msgstr ""
-#~ "A recurring entry is a payment related entry that occurs on a recurrent "
-#~ "basis from a specific date corresponding to the signature of a contract or "
-#~ "an agreement with a customer or a supplier. With Define Recurring Entries, "
-#~ "you can create them in the system in order to automate their entries in the "
-#~ "system."
-
 #~ msgid "<fill color=\"darkblue\"/>"
 #~ msgstr "<fill color=\"darkblue\"/>"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! Usted no puede crear menús recursivos."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the payment "
-#~ "term without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the payment "
-#~ "term without removing it."
-
-#, python-format
-#~ msgid "Invoice "
-#~ msgstr "Invoice "
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Rule must have at least one checked access right !"
-
-#~ msgid "Asset View"
-#~ msgstr "Asset View"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-
-#~ msgid "Treasory"
-#~ msgstr "Treasory"
-
 #~ msgid "Generate entries before:"
 #~ msgstr "Generate entries before:"
 
-#~ msgid ""
-#~ "Can't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration Financial Accounting Accounts Journals.' % (journal_type)))\n"
-#~ "            dom = {'journal_id':  [('id', 'in', journal_ids)]}\n"
-#~ "        else:\n"
-#~ "            journal_ids = obj_journal.search(cr, uid, [])\n"
-#~ "\n"
-#~ "        if currency_id and company_id:\n"
-#~ "            currency = self.pool.get('res.currency"
-#~ msgstr ""
-#~ "Can't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration Financial Accounting Accounts Journals.' % (journal_type)))\n"
-#~ "            dom = {'journal_id':  [('id', 'in', journal_ids)]}\n"
-#~ "        else:\n"
-#~ "            journal_ids = obj_journal.search(cr, uid, [])\n"
-#~ "\n"
-#~ "        if currency_id and company_id:\n"
-#~ "            currency = self.pool.get('res.currency"
-
-#~ msgid ""
-#~ "If no additional entries should be recorded on a fiscal year, you can close "
-#~ "it from here. It will close all opened periods in this year that will make "
-#~ "impossible any new entry record. Close a fiscal year when you need to "
-#~ "finalize your end of year results definitive."
-#~ msgstr ""
-#~ "If no additional entries should be recorded on a fiscal year, you can close "
-#~ "it from here. It will close all opened periods in this year that will make "
-#~ "impossible any new entry record. Close a fiscal year when you need to "
-#~ "finalize your end of year results definitive."
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "The statement balance is incorrect !\n"
@@ -12021,255 +11587,34 @@ msgstr ""
 #~ msgid "TITLE COMPANY"
 #~ msgstr "TITLE COMPANY"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-
-#~ msgid ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-#~ msgstr ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "is validated."
 
-#~ msgid "Treasory Analysis"
-#~ msgstr "Treasory Analysis"
-
 #~ msgid "COL 1"
 #~ msgstr "COL 1"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-
-#~ msgid "Sales Credit Note Journal - (test)"
-#~ msgstr "Sales Credit Note Journal - (test)"
-
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Diario de Efectivo - (test)"
-
-#~ msgid "Bank Journal - (test)"
-#~ msgstr "Bank Journal - (test)"
-
-#~ msgid "Central Journals"
-#~ msgstr "Central Journals"
-
-#~ msgid "Default UoM"
-#~ msgstr "Default UoM"
-
-#~ msgid "Tax Exempt"
-#~ msgstr "Tax Exempt"
-
-#~ msgid ""
-#~ "This wizard will definitelly close a fiscal year and its related periods. "
-#~ "That means that no one will be able to create or modify journal entries in "
-#~ "it."
-#~ msgstr ""
-#~ "This wizard will definitelly close a fiscal year and its related periods. "
-#~ "That means that no one will be able to create or modify journal entries in "
-#~ "it."
-
-#~ msgid "Expenses Journal - (test)"
-#~ msgstr "Expenses Journal - (test)"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Size of the field can never be less than 1 !"
-
-#~ msgid "Sales Journal - (test)"
-#~ msgstr "Sales Journal - (test)"
-
 #~ msgid "Tax Report"
 #~ msgstr "Reporte de Impuestos"
 
-#~ msgid ""
-#~ "For an invoice to be considered as paid, the invoice entries must be "
-#~ "reconciled with counterparts, usually payments. With the automatic "
-#~ "reconciliation functionality, OpenERP make its own search for entries to "
-#~ "reconcile in a series of accounts. It tries to find entries for each partner "
-#~ "where the amounts correspond."
-#~ msgstr ""
-#~ "For an invoice to be considered as paid, the invoice entries must be "
-#~ "reconciled with counterparts, usually payments. With the automatic "
-#~ "reconciliation functionality, OpenERP make its own search for entries to "
-#~ "reconcile in a series of accounts. It tries to find entries for each partner "
-#~ "where the amounts correspond."
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-
-#~ msgid ""
-#~ "All selected journal entries will be validated and posted. It means you "
-#~ "won't be able to modify their accounting fields."
-#~ msgstr ""
-#~ "All selected journal entries will be validated and posted. It means you "
-#~ "won't be able to modify their accounting fields."
-
 #~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
 #~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
 
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "The name of the group must be unique !"
-
 #~ msgid "</drawRightString>"
 #~ msgstr "</drawRightString>"
 
-#~ msgid ""
-#~ "Maturity date of entry line generated by model line '%s' is based on partner "
-#~ "payment term! \\n                                                    \n"
-#~ "Please define partner on it!\"%(line.name)))\n"
-#~ "        pass\n"
-#~ "\n"
-#~ "    def create_entries(self, cr, uid, ids, context=None):\n"
-#~ "        account_model_obj = self.pool.get('account.model"
-#~ msgstr ""
-#~ "Maturity date of entry line generated by model line '%s' is based on partner "
-#~ "payment term! \\n                                                    \n"
-#~ "Please define partner on it!\"%(line.name)))\n"
-#~ "        pass\n"
-#~ "\n"
-#~ "    def create_entries(self, cr, uid, ids, context=None):\n"
-#~ "        account_model_obj = self.pool.get('account.model"
-
-#~ msgid ""
-#~ "You can look up individual account entries by searching for useful "
-#~ "information. To search for account entries, open a journal, then select a "
-#~ "record line."
-#~ msgstr ""
-#~ "You can look up individual account entries by searching for useful "
-#~ "information. To search for account entries, open a journal, then select a "
-#~ "record line."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-
 #~ msgid "Partner Ref."
 #~ msgstr "Partner Ref."
 
-#~ msgid ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-#~ "& Loss Report"
-#~ msgstr ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-#~ "& Loss Report"
+#, python-format
+#~ msgid "Invoice "
+#~ msgstr "Factura "
 
-#~ msgid "Liability View"
-#~ msgstr "Vista de Pasivo"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Hoja de Balance (Cuentas de Activo)"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son compatibles con los objetos osv_memory!"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Plan de Cuentas"
 
-#~ msgid ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-#~ msgstr ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-
-#~ msgid ""
-#~ "You have to define \\nthe bank account\n"
-#~ "in the journal definition for reconciliation."
-#~ msgstr ""
-#~ "You have to define \\nthe bank account\n"
-#~ "in the journal definition for reconciliation."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "The name of the module must be unique !"
-
-#~ msgid "Normal Taxes"
-#~ msgstr "Impuestos"
-
-#~ msgid "Expense View"
-#~ msgstr "Expense View"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the analytic "
-#~ "journal without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the analytic "
-#~ "journal without removing it."
-
-#~ 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' to be used at the time of stock input/output. Select "
-#~ "'Situation' to be used at the time of making vouchers."
-#~ msgstr ""
-#~ "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' to be used at the time of stock input/output. Select "
-#~ "'Situation' to be used at the time of making vouchers."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-
-#~ msgid ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
-#~ msgstr ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-
-#~ msgid "Checks Journal - (test)"
-#~ msgstr "Checks Journal - (test)"
-
-#~ msgid "Low Level"
-#~ msgstr "Configuración Básica"
-
-#~ msgid "End of Year"
-#~ msgstr "Fin del ejercicio"
-
-#~ msgid ""
-#~ "given a period and a journal, the sum of debit will always be equal to the "
-#~ "sum of credit, so there is no point to display it"
-#~ msgstr ""
-#~ "given a period and a journal, the sum of debit will always be equal to the "
-#~ "sum of credit, so there is no point to display it"
-
-#~ msgid "Ansicht"
-#~ msgstr "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 "Balance:"
+#~ msgstr "Saldo"
diff --git a/addons/account/i18n/es_MX.po b/addons/account/i18n/es_MX.po
new file mode 100644
index 00000000000..51cbd2a70bc
--- /dev/null
+++ b/addons/account/i18n/es_MX.po
@@ -0,0 +1,11777 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account
+#
+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"
+"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"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr "Sistema de pagos"
+
+#. 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
+#: 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"
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr "Estadísticas de cuentas"
+
+#. 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"
+
+#. 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. "
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Moneda contable"
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr "Definición hijos"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "Total debe"
+
+#. module: account
+#: view:account.unreconcile:0
+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\"!"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. 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"
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: view:account.move.line:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr "Seleccione el ejercicio fiscal "
+
+#. module: account
+#: help:account.payment.term,active:0
+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
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr "Diario: %s"
+
+#. module: account
+#: help:account.analytic.journal,type:0
+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 ""
+"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"
+
+#. 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
+#: help:account.tax.code.template,notprintable:0
+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
+#, 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."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr "Informes Belgas"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1176
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "No puede añadir/modificar asientos en un diario cerrado."
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "Saldo calculado"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr "Cerrar ejercicio fiscal"
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr "Permitir desfase"
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr "Seleccione el período de análisis"
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr "Ext."
+
+#. module: account
+#: code:addons/account/invoice.py:529
+#, 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"
+
+#. module: account
+#: help:account.installer,charts:0
+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
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"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"
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr "Propiedades de compra"
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+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 ""
+"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
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr "cuenta.impuesto.plantilla"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr "cuenta.banco.cuentas.asistente"
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr "Fecha creación"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr "Abono de compra"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr "Situación apertura/cierre"
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr "La divisa utilizada para introducir asientos."
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr "Ejercicio fiscal a abrir"
+
+#. module: account
+#: help:account.journal,sequence_id:0
+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"
+
+#. 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"
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr "Abrir para romper conciliación"
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr "Plantilla plan contable"
+
+#. 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."
+
+#. module: account
+#: help:account.journal.period,state:0
+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 ""
+"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
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+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
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: 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
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr "Confirmar las facturas seleccionadas"
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr "Destino padre"
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr "Cuenta utilizada en este diario"
+
+#. 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
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: 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
+msgid "Select Charts of Accounts"
+msgstr "Seleccionar plan contable."
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr "Impuestos de compras"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Abono factura"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr "Transacciones no conciliadas"
+
+#. 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!"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr "El contable confirma el extracto."
+
+#. 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
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "Todas"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr "Nombre dirección factura"
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr "Trimestral"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"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   "
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr "Secuencias"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr "Mapeo de impuestos"
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr "Diario centralizado"
+
+#. 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!"
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr "Importe código impuesto"
+
+#. module: account
+#: code:addons/account/account.py:2779
+#: code:addons/account/installer.py:434
+#, 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"
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr "Cerrar período"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr "Rapport du compte commun partenaire"
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr "Período asientos de apertura"
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr "Periodo diario"
+
+#. module: account
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
+#, 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr "Informe del libro mayor"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr "Reabrir"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr "¿Está seguro que desea crear los asientos?"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "Comprobar"
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr "Empresas conciliadas hoy"
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr "Porcentaje"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr "Planes contables"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:39
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,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
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr "Contabilidad. Línea de subscripción"
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr "La referencia de la empresa de esta factura."
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr "No conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_Journal_report
+msgid "Account Analytic Journal"
+msgstr "Contabilidad. Diario analítico"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr "C.Diario / Nombre mov."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr "días"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#, 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"
+
+#. 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr "Retraso promedio a pagar"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr "Crear períodos trimestrales"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr "Debido"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Total con impuestos"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr "Consolidación"
+
+#. 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..."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr "Diario centralizado"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr "Abono ventas"
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr "Extracto bancario"
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr "Línea de movimiento"
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"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)."
+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
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr "Asientos del modelo"
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr "Código"
+
+#. 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
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "¡No diario analítico!"
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: 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"
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr "Nombre cuenta."
+
+#. 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"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana del año"
+
+#. 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"
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr "Facturas de cliente para aprobar"
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr "Seleccione un ejercicio fiscal para cerrar."
+
+#. 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
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr "Opciones para su aplicación"
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr "A cuadrar"
+
+#. 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)"
+
+#. 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 "-"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr "Generar asientos antes:"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Bank"
+msgstr "Banco"
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr "Inicio del periodo"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr "Confirmar extracto"
+
+#. 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"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr "Centralización del haber"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"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
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr "Cancelar facturas"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Transacciones no conciliadas"
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr "Tasa de divisas de salida"
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr "El asiento de este apunte."
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr "# de transacción"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account.py:976
+#, 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."
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr "Otros"
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr "Incluido en importe base"
+
+#. 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"
+
+#. module: account
+#: field:account.account,level:0
+msgid "Level"
+msgstr "Nivel"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:120
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr "Seleccione un periodo inicial y final"
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Plantillas para cuentas"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr "Pagos fuera de plazo"
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr "Saldo inicial"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr "Información bancaria"
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr "Opciones del informe"
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr "Análisis elementos diario"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: 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"
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr "Cuenta a cobrar"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr "Diario central"
+
+#. 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "With balance is not equal to 0"
+msgstr "Con balance si no es igual a 0"
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr "Buscar impuestos"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr "Contabilidad. Diario de costes analíticos"
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr "Crear asientos"
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr "Nº de elementos"
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr "Importe máximo de desajuste"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr "Calcular impuestos"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr "Núm. de dígitos"
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr "Omitir estado 'Borrador' para asientos manuales."
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr "Total base"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit transaction. OpenERP automatically creates one journal "
+"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 "
+
+#. 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"
+
+#. 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
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Cierre"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr "Asientos recurrentes"
+
+#. 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"
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr "Transacciones conciliadas"
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr "Columnas"
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr "."
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr "y diarios"
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr "Base"
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr "Ir a la siguiente empresa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr "Buscar extractos bancarios"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+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"
+
+#. 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"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr "Líneas extracto"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card or any other type "
+"of financial account. The starting balance will be proposed automatically "
+"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 ""
+"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"
+
+#. 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"
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr "Límite a pagar"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. 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"
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr "Secuencia ejercicio fiscal"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+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"
+
+#. 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"
+
+#. module: account
+#: view:account.invoice.refund:0
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr "Suma del año"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.report_account_voucher_new
+msgid "Print Voucher"
+msgstr "Imprimir recibo"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"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"
+
+#. 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"
+
+#. module: account
+#: help:account.journal.period,active:0
+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"
+
+#. 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!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr "Contabilidad. Informe diario común"
+
+#. 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. :"
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr "Planes de cuentas analíticas"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "My Entries"
+msgstr "Mis asientos"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr "Ref. cliente:"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:328
+#, 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 !"
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr "Estos períodos se pueden solapar."
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr "Extracto borrador"
+
+#. 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."
+
+#. 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"
+
+#. 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!"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr "cierre periodo"
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr "Configurar ejercicio fiscal"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr "Asientos por línea"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr "Código cuenta"
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr "Asiento contable"
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr "Declaración de impuestos: Facturas"
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: account
+#: view:account.account:0
+msgid "Treasury Analysis"
+msgstr "Análisis de tesorería"
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:332
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr "Compruebe que se ha definido una cuenta en el diario."
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr "Válido"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. 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
+#: 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"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr "Definición de impuestos"
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+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
+#: help:account.report.general.ledger,amount_currency:0
+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
+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"
+
+#. 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"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: account
+#: help:account.tax,active:0
+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"
+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"
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr "Apuntes de conciliación parcial"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr "Ejercicio fiscal"
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr "Abrir asientos"
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr "Cuentas a conciliar"
+
+#. 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"
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr "Importa desde factura"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr "Validaciones"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr "Este ejercicio fiscal"
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr "Plan de impuestos contables"
+
+#. module: account
+#: constraint:account.period:0
+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
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " Diario"
+
+#. module: account
+#: code:addons/account/account.py:1319
+#, 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 ""
+"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."
+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"
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+"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
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account
+#: code:addons/account/account.py:2844
+#: code:addons/account/installer.py:498
+#, python-format
+msgid "ECNJ"
+msgstr "ACOMPRA"
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/invoice.py:352
+#, 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!"
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr "Propiedades de contabilidad"
+
+#. 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
+msgid "Entries Sorted By"
+msgstr "Asientos ordenados por"
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr "Cambiar a"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr "Nº ctdad de productos "
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: account
+#: report:account.account.balance: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
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.period,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
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#. 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
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: 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
+msgid "Keep empty for all open fiscal year"
+msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr "Asiento contable"
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr "Secuencia principal"
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. 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"
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr "Marque esta opción"
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: code:addons/account/wizard/account_move_journal.py:106
+#: selection:report.invoice.created,state:0
+#, python-format
+msgid "Open"
+msgstr "Abierto"
+
+#. 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"
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr "Código impuesto contable"
+
+#. module: account
+#: code:addons/account/invoice.py:545
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"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
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr "Código base"
+
+#. 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
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr "Signo código base"
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The 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."
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr "Cuentas a renovar"
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr "Contabilidad. Líneas de modelo"
+
+#. module: account
+#: code:addons/account/account.py:2796
+#: code:addons/account/installer.py:454
+#, python-format
+msgid "EXJ"
+msgstr "COMPRA"
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr "Impuestos proveedor"
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+"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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr "Declaraciones"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr "Mover nombre"
+
+#. module: account
+#: help:res.partner,property_account_position:0
+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."
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account
+#: view:account.account:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account
+#: code:addons/account/invoice.py:351
+#, python-format
+msgid "Configuration Error!"
+msgstr "¡Error de configuración!"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr "Precio promedio"
+
+#. 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
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: account
+#: view:account.tax:0
+msgid "Accounting Information"
+msgstr "Información contable"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr "Cálculo especial"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. 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."
+
+#. 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
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr "Conciliación automática"
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr "Pagado/Conciliado"
+
+#. 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"
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr "Cuenta impuestos padre"
+
+#. module: account
+#: view:account.subscription.generate:0
+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.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr "Saldos vencidos de empresa"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr "Asientos contables"
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"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"
+
+#. 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"
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr "Este asistente creará asientos contables recurrentes"
+
+#. module: account
+#: code:addons/account/account.py:1181
+#, 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: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
+#, 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'!"
+
+#. 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr "Clientes"
+
+#. 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. 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 ""
+"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:"
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr "Requerido"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr "Impuesto de venta por defecto"
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+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 ""
+"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"
+
+#. 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
+msgid "Profit And Loss"
+msgstr "Pérdidas y ganancias"
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: 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
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one."
+msgstr ""
+"¡No se ha definido un ejercicio fiscal para esta fecha!\n"
+"Por favor, cree uno."
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr "Factura de cliente"
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+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"
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr "Buscar periodo"
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr "Moneda factura"
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr "Plazos de pago"
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr "Transición de caja"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr "Cuenta bancaria"
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr "Lista plantilla impuestos"
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"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: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."
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr "Nombre línea"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr "Buscar ejercicio fiscal"
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr "Siempre"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr "Cantidad total"
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr "Cuenta de desajuste"
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. 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."
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "View"
+msgstr "Vista"
+
+#. 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
+#, python-format
+msgid "BNK"
+msgstr "BANCO"
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr "Líneas analíticas"
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr "Archivo electrónico"
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr "Haber del cliente"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr "Empieza en"
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr "Contabilidad. Libro mayor empresa"
+
+#. 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"
+
+#. module: account
+#: help:account.account,currency_id:0
+#: 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 ""
+"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
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr "Contabilidad. Romper conciliación. Conciliar"
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" '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
+#: 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"
+
+#. 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
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: view:account.journal.period: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
+#: field:account.vat.declaration,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"
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr "Empresas restantes"
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr "Apuntes de asientos periódicos"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr "Compra"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr "Saldo inicial"
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "No Partner Defined !"
+msgstr "¡No se ha definido empresa!"
+
+#. 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"
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr "¿Cuentas vacías? "
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr "IVA:"
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+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"
+
+#. 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"
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr "Plan de impuestos"
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr "Buscar diario"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr "Factura pendiente"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr "año"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Authorised Signatory"
+msgstr "Firma autorizada"
+
+#. 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 ""
+"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"
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr "Planes contables"
+
+#. 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"
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr "Buscar movimiento"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+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!"
+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"
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "Datos facturación"
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr "Estado factura"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr "Detalle"
+
+#. module: account
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr "Sus cuentas de banco y caja"
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. 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.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 "Chart of Accounts"
+msgstr "Plan contable"
+
+#. 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)"
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr "Homólogo centralizado"
+
+#. 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr "2"
+
+#. 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
+#: 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.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print: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
+#: selection:account.vat.declaration,filter:0
+#: code:addons/account/report/common_report_header.py:97
+#: field:analytic.entries.report,date:0
+#, python-format
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
+#. 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."
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr "Plantilla del plan contable"
+
+#. module: account
+#: code:addons/account/account.py:2095
+#, 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
+#, 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#. 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
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: 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
+msgid "No Filters"
+msgstr "No filtros"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr "Situación"
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+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)"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr "Cantidad"
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr "Nombre dirección contacto"
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr "Desacuerdo"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr "Buscar líneas analíticas"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr "Apuntes analíticos"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, python-format
+msgid "Unable to change tax !"
+msgstr "¡No ha sido posible cambiar el impuesto!"
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr "Nº asientos"
+
+#. module: account
+#: code:addons/account/invoice.py:1422
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+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"
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr "Código impuesto factor multiplicación"
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr "Asignaciones"
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name: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"
+
+#. 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"
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr "Fecha vigencia"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr "Codificación estándar"
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr "Diario para asientos analíticos"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+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
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr "Contabilidad general"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr "Saldo :"
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"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 ""
+"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"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr "Líneas recurrentes"
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr "Mostrar empresas"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+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."
+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"
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr "Tasa promedio"
+
+#. 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)"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: help:account.account,active:0
+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.tax.template:0
+msgid "Search Tax Templates"
+msgstr "Buscar plantillas impuestos"
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr "Asientos borrador"
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr "Abreviación"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr "Tipo de cuenta"
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Cancelar las facturas seleccionadas"
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+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"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr "Retraso promedio deuda"
+
+#. 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr "Cuenta atrasos"
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr "Líneas de impuestos"
+
+#. 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"
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr "Descripción impuesto"
+
+#. 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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr "Todos los asientos asentados"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, 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"
+
+#. 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."
+
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr "Código cálculo"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr "Impuestos por defecto"
+
+#. module: account
+#: code:addons/account/invoice.py:88
+#, python-format
+msgid "Free Reference"
+msgstr "Referencia libre"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr "Procesamiento periódico"
+
+#. module: account
+#: help:account.move.line,state:0
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr "Plan contable"
+
+#. 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"
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr "Indique el nombre de los nuevos asientos."
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Estadísticas de facturas"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Cuentas por tipo"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#, python-format
+msgid "Not implemented"
+msgstr "No implementado"
+
+#. 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"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr "Abonos"
+
+#. 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"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr "Romper conciliación transacciones"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr "Crear asientos desde modelos"
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr "Permitir conciliación"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr "Estadísticas cuenta analítica"
+
+#. 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"
+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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr "4"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+msgstr "Cambiar"
+
+#. 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"
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr "Controles de tipo"
+
+#. 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."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr "Asentar asientos"
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. 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.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"
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr "Selecciona plan de impuestos."
+
+#. 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"
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:320
+#, python-format
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. 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
+#, 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
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+msgstr "Fecha operación"
+
+#. 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"
+
+#. module: account
+#: view:validate.account.move:0
+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 -"
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr "Cuenta de ingresos en plantilla producto"
+
+#. 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"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. 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."
+msgstr ""
+"¡Compruebe el importe de la factura!\n"
+"El total real no concuerda con el total calculado."
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr "Usar modelo"
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr "No"
+
+#. 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."
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr "Añadir"
+
+#. 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"
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr "¿Está seguro?"
+
+#. 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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr "Facturas borrador son validadas. "
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr "Aplicación impuesto"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. 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/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_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
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. 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
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles del banco"
+
+#. module: account
+#: code:addons/account/invoice.py:720
+#, python-format
+msgid "Taxes missing !"
+msgstr "¡Faltan impuestos!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+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."
+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"
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr "Agrupar líneas de factura"
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr "Movimientos"
+
+#. 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"
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr "Para cerrar"
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr "Comprobar fecha no está en el periodo"
+
+#. module: account
+#: code:addons/account/account.py:1210
+#, 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"
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr "Cuentas impuestos hijas"
+
+#. module: account
+#: code:addons/account/account.py:940
+#, 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr "5"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr "Balance analítico -"
+
+#. module: account
+#: field:account.aged.trial.balance,target_move: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
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.journal.period.print:0
+#: field:account.move.journal,target_move: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
+msgid "Target Moves"
+msgstr "Movimientos destino"
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr "Período: Unidad de tiempo"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr "Pagos"
+
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr "Código cálculo inverso"
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr "Asiento"
+
+#. 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)"
+
+#. 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"
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr "Nombre columna"
+
+#. 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr "Apertura caja"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr "Línea 1:"
+
+#. module: account
+#: code:addons/account/account.py:1167
+#, python-format
+msgid "Integrity Error !"
+msgstr "¡Error de integridad!"
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr "Nombre interno"
+
+#. 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"
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr "Próxima empresa a conciliar"
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr "Cuenta impuesto"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr "Resultado de conciliación"
+
+#. 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
+msgid "Balance Sheet"
+msgstr "Balance de situación"
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr "Informes contables"
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr "Este periodo"
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:138
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr "No se encontro un período en la factura"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr "Código para calcular (si tipo=código)"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr "Venta"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount: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"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: 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!"
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr "Permitir cancelación de asientos"
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr "Coeficiente para padre"
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr "Nombre de Cuenta/Empresa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr "Transacción"
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr "Utilice este código para la declaración del IVA."
+
+#. module: account
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr "Debe/Haber"
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr "Estadística de asientos analíticos"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr "account.instalador"
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr "Incluir en importe base"
+
+#. module: account
+#: help:account.payment.term.line,days:0
+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 "
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr "Controles de asiento"
+
+#. 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)"
+
+#. 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
+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"
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr "Contabilidad analítica"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr "Signo código impuesto"
+
+#. 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"
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr "Diario asientos cierre del ejercicio"
+
+#. 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/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr "¡Error de configuración!"
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+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 ""
+"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"
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr "Cantidad de productos"
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr "No asentado"
+
+#. 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr "Asientos contables."
+
+#. 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"
+
+#. 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\""
+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"
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+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"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr "Número (movimiento)"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+msgstr "Opciones factura rectificativa (abono)"
+
+#. 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 ""
+"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
+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"
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr "Abrir plan contable"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"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
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr "Con divisa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr "Abrir caja"
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr "Conciliación con desfase"
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr "Importe fijo"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr "Válido hasta"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr "A cobrar vencidos"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr "Contabilidad. Conciliación automática"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr "Apunte contable"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+msgstr "Diario movimientos"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account_move_line.py:738
+#, python-format
+msgid "Already Reconciled!"
+msgstr "¡Ya está conciliado!"
+
+#. 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."
+
+#. 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."
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr "Cuentas hijas"
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:830
+#, python-format
+msgid "Write-Off"
+msgstr "Desajuste"
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr "Total a pagar"
+
+#. 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"
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:322
+#, python-format
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr "Plantilla de cuenta"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr "Cuenta n°"
+
+#. module: account
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
+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"
+
+#. 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
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr "Cuentas a cobrar y pagar"
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr "Mapeo fiscal"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr "Ctdad máx."
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr "Reintegrar factura"
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"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
+msgid ""
+"The tax code definition depends on the tax declaration of your country. "
+"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
+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
+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 ""
+"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
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr "Forzar período"
+
+#. 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!"
+
+#. 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
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: 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
+msgid "Filter by"
+msgstr "Filtrar por"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr "¡No puede utilizar una cuenta inactiva!"
+
+#. module: account
+#: code:addons/account/account_move_line.py:803
+#, 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! "
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr "Número de días"
+
+#. 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
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr "Período: %s"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr "Plantilla posición fiscal impuesto"
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr "Este nombre se mostrará en los informes"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr "Fecha impresión"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+msgstr "  365 Días  "
+
+#. 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"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr "Calculo importe"
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr "Nombre diario-período"
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+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:126
+#, python-format
+msgid "not implemented"
+msgstr "no implementado"
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr "Compañía relacionada con este diario"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+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
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
+#. 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"
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr "Anterior"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr "Asiento analítico"
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr "Mensaje pagos vencidos"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"This view can be used by accountants in order to quickly record entries in "
+"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 ""
+"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
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr "(vacío para período actual)"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+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"
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr "Fecha última conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr "Impuestos cliente"
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr "Crear una cuenta basada en esta plantilla"
+
+#. 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."
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr "Tipo impuesto"
+
+#. 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"
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr "Declaración de impuestos"
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account
+#: code:addons/account/account.py:532
+#, python-format
+msgid ""
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
+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."
+
+#. 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"
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr "Información adicional"
+
+#. 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"
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr "Asientos parcialmente conciliados"
+
+#. 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.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: 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
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: code:addons/account/wizard/account_move_journal.py:105
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: 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"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. 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"
+
+#. 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."
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr "Caja"
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr "Diario y Empresa"
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr "Fuerza"
+
+#. 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"
+
+#. 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)"
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr "Número factura"
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+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"
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"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"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear.close:0
+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 ""
+"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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"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!"
+
+#. 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
+#, python-format
+msgid "Enter a Start date !"
+msgstr "¡Introduzca una fecha inicial!"
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: 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"
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr "Apuntes"
+
+#. 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"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr "Sólo lectura"
+
+#. 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"
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: account
+#: constraint:account.payment.term.line:0
+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
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr "contabilidad.secuencia.ejerciciofiscal"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr "Conciliado"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr "Base"
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr "Nombre modelo"
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr "Cuenta categoría gastos"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr "Transacciones de caja"
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr "La factura ya está conciliada"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr "Estadísticas asientos analíticos"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
+#, python-format
+msgid "Entries: "
+msgstr "Asientos: "
+
+#. 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."
+
+#. module: account
+#: code:addons/account/account.py:1393
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr "No se ha podido crear movimiento entre diferentes compañías"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is used to determine how an account is used in each journal. "
+"The deferral method of an account type determines the process for the annual "
+"closing. Reports such as the Balance Sheet and the Profit and Loss report "
+"use the category (profit/loss or balance sheet). For example, the account "
+"type could be linked to an asset account, expense account or payable "
+"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
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"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"
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1003
+#, python-format
+msgid "Total debit"
+msgstr "Total debe"
+
+#. module: account
+#: code:addons/account/account_move_line.py:781
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "¡El asiento \"%s\" no es válido!"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr "Basado en"
+
+#. 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 ""
+"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
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr "Código Python"
+
+#. 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 !"
+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
+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"
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr "Crear asiento"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+msgstr "  valoración: porcentaje"
+
+#. 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_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/wizard/account_use_model.py:44
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. 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"
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr "Impreso"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr "Línea de proyecto"
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"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"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: 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"
+
+#. 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."
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+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
+#, python-format
+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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: 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"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:65
+#, python-format
+msgid "Currnt currency is not confirured properly !"
+msgstr "¡La moneda actual no está configurada correctamente!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr "Contabilidad. Conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr "Posición fiscal impuestos"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: 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.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr "Libro mayor"
+
+#. 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."
+
+#. 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
+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... "
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr "Contabilidad. Plan de impuestos"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account
+#: code:addons/account/account.py:2050
+#, 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 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."
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos hijos"
+
+#. module: account
+#: code:addons/account/invoice.py:473
+#: code:addons/account/wizard/account_invoice_refund.py:137
+#, python-format
+msgid "Data Insufficient !"
+msgstr "¡Datos insuficientes!"
+
+#. 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"
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr "Importe desajuste"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr "Columna diario"
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. 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
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+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
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
+msgstr "Asientos no conciliados"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr "Conciliación de extractos"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. 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."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
+"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 ""
+"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
+#: 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"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 ""
+"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
+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"
+
+#. 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"
+
+#. 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?"
+
+#. 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?"
+
+#. module: account
+#: code:addons/account/account_move_line.py:963
+#, python-format
+msgid "Accounting Entries"
+msgstr "Asientos contables"
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr "Plantilla cuenta padre"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr "Extracto"
+
+#. 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
+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
+#: 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"
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr "Importe total que este cliente le debe."
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr "ir.secuencia"
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr "Icono"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. 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"
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea de extracto bancario"
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr "Impuesto de compra por defecto"
+
+#. 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
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+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
+#, 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
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr "Nombre de nuevos asientos"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr "Crear asientos"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr "Informe"
+
+#. 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!"
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr "Cierre de caja"
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr "Diario de contabilidad"
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr "Factura pagada"
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"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."
+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"
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr "Usar modelo"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"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 ""
+"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
+#: 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"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr "Información opcional"
+
+#. 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"
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ":"
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr "En fecha"
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+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
+#, python-format
+msgid "Bad account !"
+msgstr "¡Cuenta incorrecta!"
+
+#. module: account
+#: code:addons/account/account.py:2777
+#: code:addons/account/installer.py:432
+#, python-format
+msgid "Sales Journal"
+msgstr "Diario de ventas"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:104
+#, python-format
+msgid "Open Journal Items !"
+msgstr "¡Asientos abiertos!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr "Impuesto de factura"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1246
+#, python-format
+msgid "No piece number !"
+msgstr "¡Ningún trozo de número!"
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr "Propiedades de venta"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr "Conciliación manual"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr "Importe total debido:"
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template: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:304
+#, python-format
+msgid "Payable Accounts"
+msgstr "Cuentas a pagar"
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Plantillas para el plan contable"
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código"
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr "Asentar asientos de un diario"
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr "Impuestos de ventas"
+
+#. module: account
+#: 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
+msgid "Cash"
+msgstr "Efectivo"
+
+#. 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pago de facturas"
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+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
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr "Ventas por tipo de cuenta"
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr "Enlace a los asientos generados automáticamente."
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid ""
+"Here you can customize an existing journal view or create a new view. "
+"Journal views determine the way you can record entries in your journal. "
+"Select the fields you want to appear in a journal and determine the sequence "
+"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"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr "    7 Días    "
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: account
+#: field:account.account,parent_id:0
+#: view:account.analytic.account: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"
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"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)."
+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"
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr "Suma del período"
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"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"
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: 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 :"
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. 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
+#, python-format
+msgid "Warning !"
+msgstr "¡Atención!"
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr "Estado de línea movimiento"
+
+#. 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"
+
+#. 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):"
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr "No se puede %s factura borrador/proforma/cancelada."
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "No Invoice Lines !"
+msgstr "¡No hay líneas de factura!"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+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"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:346
+#, 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."
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr "Método cierre"
+
+#. module: account
+#: code:addons/account/invoice.py:359
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr "La factura '%s' está pagada."
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr "Asiento automático"
+
+#. 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"
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+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.period,state:0
+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 -"
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+msgstr "Abrir para la conciliación bancaria"
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr "Una empresa por página"
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr "Hijos"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr "Empresa asociada"
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "You must first select a partner !"
+msgstr "¡Primero debe seleccionar una empresa!"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr "Información adicional"
+
+#. module: account
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr "Cuentas de banco y caja"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "Total Residual"
+msgstr "Total residual"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"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."
+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"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "Cód. diario/Nombre mov."
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr "Seleccione el ejercicio fiscal"
+
+#. module: account
+#: code:addons/account/account.py:2841
+#: code:addons/account/installer.py:495
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr "Diario de abono de compras"
+
+#. 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."
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr "8"
+
+#. module: account
+#: view:account.invoice.refund:0
+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
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: 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: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"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr "Base:"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr "Informes genéricos"
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr "Diario de desajuste"
+
+#. 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 ""
+"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"
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr "Cuenta de la categoría de ingresos"
+
+#. 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr "Tipo interno"
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr "Importe impuestos/base"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"With Customer Refunds you can manage the credit notes for your customers. 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 ""
+"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
+msgid ""
+"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."
+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. :"
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr "Divisa de la compañía"
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr "Pago"
+
+#. 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"
+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
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr "Contabilidad. Balance invertido analítico"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr "Contabilidad. Informe común"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr "Conciliar movimientos banco"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr "Tipos de cuentas"
+
+#. 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"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr "Conciliación"
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta a cobrar"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr "Saldo de caja"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr "Cerrar estado ejercicio fiscal"
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr "Diario reintegro"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal: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
+msgid "Filter By"
+msgstr "Filtrar por"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"With Customer Invoices you can create and manage sales invoices issued to "
+"your customers. OpenERP can also generate draft invoices automatically from "
+"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
+#: 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"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr "Línea de plazo de pago"
+
+#. module: account
+#: code:addons/account/account.py:2794
+#: code:addons/account/installer.py:452
+#, python-format
+msgid "Purchase Journal"
+msgstr "Diario de compras"
+
+#. 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"
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr "Imprimir declaración de impuestos"
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr "Línea de modelo de asiento"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr "Fecha vencimiento"
+
+#. 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)"
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr "Propiedades de contabilidad del proveedor"
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+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"
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr "Desde"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr "Cierre ejercicio fiscal"
+
+#. 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!"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr "Facturas impagadas"
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr "Importe debe"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+msgstr "Tesorería"
+
+#. 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.common.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr "Cuentas permitidas (vacío para ningún control)"
+
+#. 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. 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."
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: help:account.invoice,internal_number:0
+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
+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!"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+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
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+msgid "Currency"
+msgstr "Divisa"
+
+#. 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
+msgid ""
+"Define your company's financial year according to your needs. A financial "
+"year is a period at the end of which a company's accounts are made up "
+"(usually 12 months). The financial year is usually referred to by the date "
+"in which it ends. For example, if a company's financial year ends November "
+"30, 2011, then everything between December 1, 2010 and November 30, 2011  "
+"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
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr "Asientos conciliados"
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr "Dirección contacto"
+
+#. 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."
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr "Imprimir balance contable de empresa"
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr "Contratos"
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+msgid "Opening Entries Journal"
+msgstr "Diario asientos de apertura"
+
+#. 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."
+
+#. module: account
+#: help:account.chart.template,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 "
+"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"
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr "Resumen de costes por periodo"
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+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"
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr "Código diario"
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"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"
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr "Apuntes"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr "KI"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account.py:2817
+#: code:addons/account/installer.py:476
+#, 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr "Pago registrado"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr "Cerrar estados de ejercicio fiscal y periodos"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr "Información del producto"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr "Analítico"
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: account
+#: field:account.installer,purchase_tax:0
+msgid "Purchase Tax(%)"
+msgstr "Impuesto compra (%)"
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "Please create some invoice lines."
+msgstr "Cree algunas líneas de factura"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr "Apreciado Sr./Sra.,"
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr "Configure su aplicación de contabilidad"
+
+#. module: account
+#: code:addons/account/account.py:2820
+#: code:addons/account/installer.py:479
+#, python-format
+msgid "SCNJ"
+msgstr "AVENTA"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+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
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP 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 ""
+"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"
+
+#. module: account
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr "Gestión de seguimientos"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+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!"
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr "Dirección análisis"
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr "Compañías que se refieren a la empresa"
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr "Vista de diario"
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "Total credit"
+msgstr "Total haber"
+
+#. 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,"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr "Impagada"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr "Documento: Estado contable del cliente"
+
+#. 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!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"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 ""
+"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"
+
+#. 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"
+
+#. 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.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.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. 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"
+
+#. 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"
+
+#. 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
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr "A pagar"
+
+#. 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"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"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
+#, 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"
+
+#. 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."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid ""
+"Here you can define a financial period, an interval of time in your "
+"company's financial year. An accounting period typically is a month or a "
+"quarter. It usually corresponds to the periods of the tax declaration. "
+"Create and manage periods from here and decide whether a period should be "
+"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"
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr "Entrada manual"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr "Asiento"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, 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
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr "Nº cuenta"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr "Extractos bancarios"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+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"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr "Informe común"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr "Hijos consolidados"
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:82
+#, 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
+#: 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr "Plan contable"
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr "Asientos periódicos"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr "Contabilidad. Saldo analítico"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+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"
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr "Fecha vencimiento"
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr "Asientos estándares"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr "Asiento periódico"
+
+#. 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!"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr "Asiento periódico"
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from: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
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger: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
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr "Facturas borrador"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr "No conciliado"
+
+#. module: account
+#: code:addons/account/invoice.py:804
+#, python-format
+msgid "Bad total !"
+msgstr "¡Total erróneo!"
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr "Secuencia del asiento"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"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"
+
+#. 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"
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr "Nombre del período"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr "Código/Fecha"
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: account
+#: code:addons/account/invoice.py:354
+#, 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
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr "Validar movimiento contable"
+
+#. 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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+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 ""
+"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 :"
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr "Diarios generales"
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr "Modelo de asiento"
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%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' 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"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr "General"
+
+#. 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
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period: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
+#: 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
+#: 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"
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr "Tipo de cambio"
+
+#. 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."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr "Abrir para conciliación"
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr "Padre izquierdo"
+
+#. 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 ""
+"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."
+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"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+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 ""
+"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 ")"
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr "Período contable"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr "Eliminar líneas"
+
+#. 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 ""
+"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"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: 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:"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr "Asientos periódicos en proceso"
+
+#. 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"
+
+#. 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
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr "Seleccionar periodo"
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+#: report:account.move.voucher:0
+msgid "Posted"
+msgstr "Asentado"
+
+#. 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
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger: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
+msgid "End Date"
+msgstr "Fecha final"
+
+#. 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"
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr "Día del mes"
+
+#. 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"
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr "Secuencias ejercicios fiscales"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr "  importe valor: 0.02"
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr "Estados"
+
+#. module: account
+#: 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr "Diario: Todos"
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,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
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.period,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr "Definir asientos recurrentes"
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr "Fecha vencimiento"
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr "Total transiciones de caja."
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"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"
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr "Signo para padre"
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr "Informe de sumas y saldos"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr "Extractos bancarios borrador"
+
+#. 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
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr "Líneas de factura"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+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 :"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Movimiento de desajuste"
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr "El estado de la factura es Realizada"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr "Contabilidad. Posición fiscal"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. 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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. 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."
+
+#. 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\"! "
+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"
+
+#. module: account
+#: code:addons/account/account_move_line.py:805
+#, python-format
+msgid "Entry is already reconciled"
+msgstr "El asiento ya está conciliado"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Cuentas a cobrar"
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr "Plazo de pago de la empresa"
+
+#. 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
+#: 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 "With movements"
+msgstr "Con movimientos"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr "Datos de la cuenta"
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr "Plantilla códigos impuestos contables"
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr "Manualmente"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. 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"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr "Cuenta fin."
+
+#. 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"
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr "Aplicación"
+
+#. 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!"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: view:account.account:0
+msgid "Parent Account"
+msgstr "Cuenta padre"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"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
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr "Contabilidad. Plan analítico"
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr "Importe debido restante."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr "Informes estadísticos"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr "Mapeo de cuentas"
+
+#. module: account
+#: code:addons/account/invoice.py:346
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr "La factura '%s' está esperando para validación."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr "cuenta.instalador.módulos"
+
+#. 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"
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr "Diario general"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr "Buscar factura"
+
+#. 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"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+msgstr "Cuentas de banco"
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr "Total a cobrar"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr "Documentos contables"
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr "Contabilidad. Validar líneas movimiento"
+
+#. 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)"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr "El estado de la factura es Realizada."
+
+#. 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"
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr "Impuestos factura manual"
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr "Padre derecho"
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr "account.añadirplantilla.asistente"
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr "De empresas"
+
+#. 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"
+
+#. module: account
+#: help:account.analytic.journal,active:0
+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."
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr "Modelo de asiento"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. 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"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr "Vencimiento"
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr "Futuro"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr "Buscar líneas asientos"
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: 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."
+
+#. 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"
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr "Cuenta de gastos en plantilla producto"
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "Moneda del importe"
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#, 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
+msgid ""
+"Create and manage the accounts you need to record journal entries. An "
+"account is part of a ledger allowing your company to register all kinds of "
+"debit and credit transactions. Companies present their annual accounts in "
+"two main parts: the balance sheet and the income statement (profit and loss "
+"account). The annual accounts of a company are required by law to disclose a "
+"certain amount of information. They have to be certified by an external "
+"auditor 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
+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_MX.po.moved b/addons/account/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..0dff34cef17
--- /dev/null
+++ b/addons/account/i18n/es_MX.po.moved
@@ -0,0 +1,9130 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-10-07 15:12+0000\n"
+"PO-Revision-Date: 2011-10-07 15:12+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr "Sistema de pagos"
+
+#. module: account
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr "Otra configuración"
+
+#. module: account
+#: code:addons/account/account.py:516
+#, 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
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr "Conciliar poliza contable"
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr "Gestión de recibos"
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr "Estadísticas de cuentas"
+
+#. module: account
+#: field:account.invoice,residual:0
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr "Pendiente"
+
+#. module: account
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Defina una secuencia en el diario de la factura"
+
+#. 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. "
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Moneda contable"
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr "Definición hijos"
+
+#. 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 polizas conciliadas"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "Total debe"
+
+#. module: account
+#: view:account.unreconcile:0
+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 "Polizas contables"
+
+#. module: account
+#: code:addons/account/account.py:1309
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "¡No puede eliminar el movimiento asentado: \"%s\"!"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. 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"
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: view:account.move.line:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr "Seleccione el ejercicio fiscal "
+
+#. module: account
+#: help:account.payment.term,active:0
+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:1436
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr "Todas las polizas analíticas"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr "Diario: %s"
+
+#. module: account
+#: help:account.analytic.journal,type:0
+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 "Indica el tipo de diario analítico. Cuando se necesita para un documento (por ej. una factura) para crear polizas analíticas, 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr "contabilidad.impuesto"
+
+#. module: account
+#: code:addons/account/account.py:919
+#, 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
+#: help:account.tax.code.template,notprintable:0
+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:1224
+#, 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 "Las polizass contables son una entrada de la conciliación."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr "Informes Belgas"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1185
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "No puede añadir/modificar polizas en un diario cerrado."
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "Saldo calculado"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr "Cerrar ejercicio fiscal"
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr "Permitir desfase"
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr "Seleccione el período de análisis"
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr "Ext."
+
+#. module: account
+#: code:addons/account/invoice.py:532
+#, 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"
+
+#. module: account
+#: help:account.installer,charts:0
+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
+#, python-format
+msgid "Can't find any account journal of %s type for this company.\n"
+"\n"
+"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"
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr "Propiedades de compra"
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+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 "Los contadores utilizan esta vista para introducir polizas masivamente en OpenERP. Cuando utiliza los extractos bancarios, registros de caja, o pagos de cliente/proveedor OpenERP crea automáticamente apuntes contables."
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr "cuenta.impuesto.plantilla"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr "cuenta.banco.cuentas.asistente"
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr "Fecha creación"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr "Abono de compra"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr "Situación apertura/cierre"
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr "La divisa utilizada para introducir polizas."
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr "Ejercicio fiscal a abrir"
+
+#. module: account
+#: help:account.journal,sequence_id:0
+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 las polizas de este diario."
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr "Cuenta deudora por defecto"
+
+#. 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"
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr "Abrir para romper conciliación"
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr "Plantilla plan contable"
+
+#. 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."
+
+#. module: account
+#: help:account.journal.period,state:0
+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 "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
+msgid "Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs."
+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
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: 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
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: code:addons/account/account_move_line.py:986
+#: 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr "Confirmar las facturas seleccionadas"
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr "Destino padre"
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr "Cuenta utilizada en este diario"
+
+#. 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
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: 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
+msgid "Select Charts of Accounts"
+msgstr "Seleccionar plan contable."
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr "Impuestos de compras"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Abono factura"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr "Transacciones no conciliadas"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr "¡El saldo de caja no coincide con el saldo calculado!"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr "El contable confirma el extracto."
+
+#. 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
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "Todas"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr "Nombre dirección factura"
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr "Trimestral"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
+msgstr "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   "
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr "Secuencias"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr "Mapeo de impuestos"
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr "Diario centralizado"
+
+#. 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!"
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr "Importe código impuesto"
+
+#. module: account
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:434
+#, 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"
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr "Cerrar período"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr "Rapport du compte commun partenaire"
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr "Período polizas de apertura"
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr "Periodo diario"
+
+#. module: account
+#: code:addons/account/account_move_line.py:726
+#: code:addons/account/account_move_line.py:770
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+msgstr "Para conciliar las polizas, la compañía debería ser la misma para todos los polizas"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr "Informe del libro mayor"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr "Reabrir"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr "¿Está seguro que desea crear las polizas?"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "Comprobar"
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr "Empresas conciliadas hoy"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:306
+#, python-format
+msgid "The statement balance is incorrect !\n"
+""
+msgstr "¡El balance del extracto bancario es incorrecto!\n"
+""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr "Porcentaje"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr "Planes contables"
+
+#. 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 "Polizas analíticas por línea"
+
+#. 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!"
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,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
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr "Contabilidad. Línea de subscripción"
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr "La referencia de la empresa de esta factura."
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr "No conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_Journal_report
+msgid "Account Analytic Journal"
+msgstr "Contabilidad. Diario analítico"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr "C.Diario / Nombre mov."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr "días"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#, 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 (nota de credito) de esta factura."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr "Nueva suscripción"
+
+#. 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:1200
+#, 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 una poliza confirmada! ¡Observe que sólo puede cambiar algunos campos no importantes!"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr "Crear períodos trimestrales"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr "Debido"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Total con impuestos"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr "Consolidación"
+
+#. module: account
+#: field:account.invoice,date_invoice:0
+msgid "Date Invoiced"
+msgstr "Date Invoiced"
+
+#. 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..."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr "Diario centralizado"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr "Abono ventas"
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr "Extracto bancario"
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr "Línea de movimiento"
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid "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)."
+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
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr "Polizas del modelo"
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account
+#: code:addons/account/account.py:2135
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "¡No diario analítico!"
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: 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"
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr "Nombre cuenta."
+
+#. 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"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana del año"
+
+#. 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"
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr "Facturas de cliente para aprobar"
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr "Seleccione un ejercicio fiscal para cerrar."
+
+#. 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
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr "Opciones para su aplicación"
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr "A cuadrar"
+
+#. 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)"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "-"
+msgstr "-"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr "Generar polizas antes:"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Bank"
+msgstr "Banco"
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr "Inicio del periodo"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr "Confirmar extracto"
+
+#. 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"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr "Centralización del haber"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid "With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from 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
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr "Cancelar facturas"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Transacciones no conciliadas"
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr "Tasa de divisas de salida"
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr "La poliza de este apunte."
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr "# de transacción"
+
+#. 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 poliza"
+
+#. module: account
+#: code:addons/account/account.py:994
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr "¡No puede modificar/eliminar un diario con polizas 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."
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr "Otros"
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr "Incluido en importe base"
+
+#. 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 polizas"
+
+#. module: account
+#: field:account.account,level:0
+msgid "Level"
+msgstr "Nivel"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:120
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr "Seleccione un periodo inicial y final"
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Plantillas para cuentas"
+
+#. 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"
+
+#. 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 las polizas"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr "Pagos fuera de plazo"
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr "Saldo inicial"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr "Información bancaria"
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr "Opciones del informe"
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr "Análisis elementos diario"
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: 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"
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr "Cuenta a cobrar"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr "Diario central"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1280
+#, 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
+msgid "With balance is not equal to 0"
+msgstr "Con balance si no es igual a 0"
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr "Buscar impuestos"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr "Contabilidad. Diario de costes analíticos"
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr "Crear polizas"
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr "Nº de elementos"
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr "Importe máximo de desajuste"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr "Calcular impuestos"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr "Núm. de dígitos"
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr "Omitir estado 'Borrador' para polizas manuales."
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr "Total base"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid "A journal entry consists of several journal items, each of which is either a debit or a credit transaction. OpenERP automatically creates one journal entry per accounting document: invoice, refund, supplier payment, bank statements, etc."
+msgstr "Una poliza 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 una poliza por cada documento contable: factura, nota de credito (abono), pago a proveedor, extractos de cuenta bancaria, etc."
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr "Nº de polizas "
+
+#. 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"
+
+#. 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 "Nota de Credito 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:823
+#, 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
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Movimiento de desajuste"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr "Polizas recurrentes"
+
+#. 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
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr "Transacciones conciliadas"
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr "Columnas"
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr "."
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr "y diarios"
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr "Base"
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr "Ir a la siguiente empresa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr "Buscar extractos bancarios"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+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"
+
+#. 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"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr "Líneas extracto"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card or any other type of financial account. The starting balance will be proposed automatically 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 "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"
+
+#. 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"
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr "Límite a pagar"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. 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"
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr "Secuencia ejercicio fiscal"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+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 "Responsible"
+
+#. 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"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice."
+msgstr "Cancelar factura: Crea la factura de abono (nota de credito), 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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr "Suma del año"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid "Display your company chart of accounts per fiscal year and filter by period. 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 todas los polizas 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"
+
+#. module: account
+#: code:addons/account/account_move_line.py:802
+#, 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"
+
+#. module: account
+#: help:account.journal.period,active:0
+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 las polizas"
+
+#. 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:809
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr "¡Debe indicar una cuenta para la poliza de ajuste!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr "Contabilidad. Informe diario común"
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr "Todas empresas"
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr "Planes de cuentas analíticas"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "My Entries"
+msgstr "Mis polizas"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr "Ref. cliente:"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:329
+#, 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 !"
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr "Estos períodos se pueden solapar."
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr "Extracto borrador"
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Credit Notes"
+msgstr "Declaración de impuestos: Nota de Credito"
+
+#. module: account
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr "No puede desactivar una cuenta que contiene polizas contables."
+
+#. 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:529
+#, 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 polizas contables!"
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr "Cuenta de reservas y pérdidas/ganancias"
+
+#. 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 la poliza contable!"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr "cierre periodo"
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr "Configurar ejercicio fiscal"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr "Polizas por línea"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr "Código cuenta"
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr "Poliza contable"
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr "Declaración de impuestos: Facturas"
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: account
+#: view:account.account:0
+msgid "Treasury Analysis"
+msgstr "Análisis de tesorería"
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:332
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr "Compruebe que se ha definido una cuenta en el diario."
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr "Válido"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. 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
+#: 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 polizas contables y de pago"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr "Definición de impuestos"
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+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
+#: help:account.report.general.ledger,amount_currency:0
+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
+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 aceptan polizas que la fecha de la poliza 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"
+
+#. 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"
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: account
+#: help:account.tax,active:0
+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"
+msgstr "si le da un nombre distinto de /, su poliza contable tendrá el mismo nombre que el extracto. Esto permite que las polizas 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 las polizas"
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr "Apuntes de conciliación parcial"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr "Ejercicio fiscal"
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr "Abrir polizas"
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr "Cuentas a conciliar"
+
+#. 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"
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr "Importa desde factura"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr "Validaciones"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr "Este ejercicio fiscal"
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr "Plan de impuestos contables"
+
+#. module: account
+#: constraint:account.period:0
+msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
+msgstr "¡Periodo inválida! Algunos periodos se superponen o la fecha del periodo no está dentro del intervalo del ejercicio fiscal. "
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " Diario"
+
+#. module: account
+#: code:addons/account/account.py:1339
+#, 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 "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."
+msgstr "Esta clasificación se utiliza para diferenciar tipos con efectos especiales en OpenERP: vista no puede tener polizas, 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 Accounts Templates"
+msgstr "Buscar plantillas de plan contable"
+
+#. module: account
+#: view:account.installer:0
+msgid "The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."
+msgstr "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
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account
+#: code:addons/account/account.py:2926
+#: code:addons/account/installer.py:498
+#, python-format
+msgid "ECNJ"
+msgstr "ACOMPRA"
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/invoice.py:351
+#, 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!"
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr "Propiedades de contabilidad"
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted By"
+msgstr "Polizas ordenadas por"
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr "Cambiar a"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr "Nº ctdad de productos "
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal: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.partner.balance:0
+#: field:account.period,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
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#. 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
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: 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
+msgid "Keep empty for all open fiscal year"
+msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr "Poliza contable"
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr "Secuencia principal"
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. 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"
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr "Marque esta opción"
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: code:addons/account/wizard/account_move_journal.py:106
+#: selection:report.invoice.created,state:0
+#, python-format
+msgid "Open"
+msgstr "Abierto"
+
+#. 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 polizas en esta cuenta."
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr "Conciliciación empresa"
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr "Código impuesto contable"
+
+#. module: account
+#: code:addons/account/invoice.py:552
+#, python-format
+msgid "Can't find any account journal of %s type for this company.\n"
+"\n"
+"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
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr "Código base"
+
+#. 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
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr "Signo código base"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr "Centralización del debe"
+
+#. 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"
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr "Cuentas a renovar"
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr "Contabilidad. Líneas de modelo"
+
+#. module: account
+#: code:addons/account/account.py:2878
+#: code:addons/account/installer.py:454
+#, python-format
+msgid "EXJ"
+msgstr "COMPRA"
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr "Impuestos proveedor"
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
+msgstr "Si utiliza los plazos de pago, la fecha de vencimiento será calculada automáticamente en la generación de las polizas 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr "Declaraciones"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr "Mover nombre"
+
+#. module: account
+#: help:res.partner,property_account_position:0
+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."
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account
+#: view:account.account:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account
+#: code:addons/account/invoice.py:350
+#, python-format
+msgid "Configuration Error!"
+msgstr "¡Error de configuración!"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr "Precio promedio"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: account
+#: code:addons/account/account.py:654
+#, 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 polizas"
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: account
+#: view:account.tax:0
+msgid "Accounting Information"
+msgstr "Información contable"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr "Cálculo especial"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. 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."
+
+#. 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
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr "Conciliación automática"
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr "Pagado/Conciliado"
+
+#. 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"
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr "Cuenta impuestos padre"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Automatically generate entries based on what has been entered in the  system before a specific date."
+msgstr "Genera automáticamente los polizas 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.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr "Saldos vencidos de empresa"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr "Polizas contables"
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid "Check this box if you don't want new journal entries to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation. \n"
+"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 polizas 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"
+
+#. 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"
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr "Este asistente creará polizas contables recurrentes"
+
+#. module: account
+#: code:addons/account/account.py:1199
+#, 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:2135
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+#, 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'!"
+
+#. 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr "Clientes"
+
+#. 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: 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:307
+#, python-format
+msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr "Ploizas de pago son la segunda entrada para la conciliación."
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Número de referencia"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. 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 "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:"
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr "Requerido"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr "Impuesto de venta por defecto"
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+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 "La fecha de vencimiento de las polizas generadas por este modelo. Puede elegir entre la fecha de creación o la fecha de creación de las polizas 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"
+
+#. module: account
+#: view:account.pl.report:0
+#: model:ir.ui.menu,name:account.menu_account_pl_report
+msgid "Profit And Loss"
+msgstr "Pérdidas y ganancias"
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: 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 "Polizas analíticas"
+
+#. module: account
+#: code:addons/account/account.py:833
+#, python-format
+msgid "No fiscal year defined for this date !\n"
+"Please create one."
+msgstr "¡No se ha definido un ejercicio fiscal para esta fecha!\n"
+"Por favor, cree uno."
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr "Factura de cliente"
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+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"
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr "Buscar periodo"
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr "Moneda factura"
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr "Plazos de pago"
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr "Transición de caja"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr "Cuenta bancaria"
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr "Lista plantilla impuestos"
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another 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: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."
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr "Nombre línea"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr "Buscar ejercicio fiscal"
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr "Siempre"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr "Cantidad total"
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr "Cuenta de desajuste"
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. 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."
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "View"
+msgstr "Vista"
+
+#. module: account
+#: code:addons/account/account.py:2989
+#: code:addons/account/installer.py:296
+#, python-format
+msgid "BNK"
+msgstr "BANCO"
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr "Líneas analíticas"
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr "Archivo electrónico"
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr "Haber del cliente"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr "Empieza en"
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr "Contabilidad. Libro mayor empresa"
+
+#. 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"
+
+#. module: account
+#: help:account.account,currency_id:0
+#: 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 "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
+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á todas las polizas de un diario y período en particular. Una vez que se validan las polizas, 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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr "Contabilidad. Romper conciliación. Conciliar"
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid "Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even the reconciled ones.\n"
+" '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 la poliza 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 conciliadas.\n"
+" 'Sin conciliar' copiará sólo los apuntes aun no conciliadas el primer día del nuevo ejercicio fiscal."
+
+#. 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
+#: 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"
+
+#. 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
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids: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
+#: field:account.vat.declaration,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
+msgid "Journals"
+msgstr "Diarios"
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr "Empresas restantes"
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr "Apuntes de polizas periódicas"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr "Compra"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr "Saldo inicial"
+
+#. module: account
+#: code:addons/account/invoice.py:1298
+#, python-format
+msgid "No Partner Defined !"
+msgstr "¡No se ha definido empresa!"
+
+#. 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"
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr "¿Cuentas vacías? "
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr "IVA:"
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+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
+#: 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
+#: 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"
+
+#. 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"
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr "Plan de impuestos"
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr "Buscar diario"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr "Factura pendiente"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr "año"
+
+#. 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 "Todas las polizas seleccionadas serán validadas y asentadas. Esto significa que ya no podrá modificar sus campos contables."
+
+#. module: account
+#: code:addons/account/invoice.py:373
+#, 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
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "Descuadrado"
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr "Planes contables"
+
+#. 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"
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr "Buscar movimiento"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+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:532
+#, python-format
+msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
+msgstr "¡No puede cambiar el tipo de cuenta de '%s' a '%s' si contiene polizas contables!"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr "Contrapartida"
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "Datos facturación"
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr "Estado factura"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr "Detalle"
+
+#. module: account
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr "Sus cuentas de banco y caja"
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. 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
+msgid "Chart of Accounts"
+msgstr "Plan contable"
+
+#. 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)"
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr "Homólogo centralizado"
+
+#. 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr "2"
+
+#. 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
+#: 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.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: 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
+#: 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
+#: selection:account.vat.declaration,filter:0
+#: code:addons/account/report/common_report_header.py:97
+#: field:analytic.entries.report,date:0
+#, python-format
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:81
+#, 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
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr "Plantilla del plan contable"
+
+#. module: account
+#: code:addons/account/account.py:2147
+#, 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 dla linea 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:804
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr "¡Algunas polizas ya están conciliadas!"
+
+#. module: account
+#: code:addons/account/account.py:1222
+#, python-format
+msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
+msgstr "¡No puede validar una poliza 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#. 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
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: 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
+msgid "No Filters"
+msgstr "No filtros"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr "Situación"
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+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)"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr "Cantidad"
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr "Nombre dirección contacto"
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr "Desacuerdo"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr "Buscar líneas analíticas"
+
+#. 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 polizas con movimientos en distintos periodos/diarios"
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr "Orden de pago"
+
+#. 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 polizas en esta cuenta."
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Balance contable"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr "Apuntes analíticos"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1137
+#, python-format
+msgid "Unable to change tax !"
+msgstr "¡No ha sido posible cambiar el impuesto!"
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr "Nº polizas"
+
+#. module: account
+#: code:addons/account/invoice.py:1437
+#, python-format
+msgid "You selected an Unit of Measure which is not compatible with the product."
+msgstr "Ha seleccionado una unidad de medida que no es compatible con el producto."
+
+#. module: account
+#: code:addons/account/invoice.py:476
+#, 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"
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr "Código impuesto factor multiplicación"
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr "Asignaciones"
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name: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"
+
+#. 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"
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr "Fecha vigencia"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr "Codificación estándar"
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr "Diario para polizas analíticas"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+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
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr "Contabilidad general"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr "Saldo :"
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid "The best practice here is to use a journal dedicated to contain the opening 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 "Lo más recomendable es usar un diario dedicado a contener las polizas 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"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr "Líneas recurrentes"
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr "Mostrar empresas"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+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."
+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"
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr "Tasa promedio"
+
+#. 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)"
+
+#. 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"
+
+#. 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"
+
+#. 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
+#: code:addons/account/report/account_balance_sheet.py:78
+#: code:addons/account/report/account_balance_sheet.py:124
+#: code:addons/account/report/account_profit_loss.py:79
+#: code:addons/account/report/account_profit_loss.py:130
+#, python-format
+msgid "Net Loss"
+msgstr "Pérdida neta"
+
+#. module: account
+#: help:account.account,active:0
+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.tax.template:0
+msgid "Search Tax Templates"
+msgstr "Buscar plantillas impuestos"
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr "Polizas borrador"
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr "Abreviación"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr "Tipo de cuenta"
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Cancelar las facturas seleccionadas"
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+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"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr "Retraso promedio deuda"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr "Tipo cuenta"
+
+#. module: account
+#: code:addons/account/invoice.py:722
+#, 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr "Cuenta atrasos"
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr "Líneas de impuestos"
+
+#. 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 "Todas los polizas creadas 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 polizas creadas 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:90
+#, 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"
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr "Descripción impuesto"
+
+#. 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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr "Todas las polizas asentadas"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr "Se ha confirmado el extracto %s, se han creado los polizas 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álida. "
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Rango mensual"
+
+#. 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."
+
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr "Código cálculo"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr "Impuestos por defecto"
+
+#. module: account
+#: code:addons/account/invoice.py:88
+#, python-format
+msgid "Free Reference"
+msgstr "Referencia libre"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr "Procesamiento periódico"
+
+#. module: account
+#: help:account.move.line,state:0
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr "Plan contable"
+
+#. 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"
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr "Indique el nombre de las nuevas polizas."
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Estadísticas de facturas"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Cuentas por tipo"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#, python-format
+msgid "Not implemented"
+msgstr "No implementado"
+
+#. 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"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr "Abonos"
+
+#. module: account
+#: code:addons/account/account.py:2119
+#: 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álida!"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr "Núm. de bono"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr "Romper conciliación transacciones"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr "Crear polizas desde modelos"
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr "Permitir conciliación"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr "Estadísticas cuenta analítica"
+
+#. 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"
+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"
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid "Configuration Error! \n"
+"You cannot define children to an account with internal type different of \"View\"! "
+msgstr "¡Error de configuración!\n"
+"¡No puede definir hijos de una cuenta de tipo interno distinto al tipo \"Vista\"! "
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr "4"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+msgstr "Cambiar"
+
+#. module: account
+#: code:addons/account/account.py:1308
+#: code:addons/account/account.py:1338
+#: code:addons/account/account.py:1345
+#: code:addons/account/account_move_line.py:1064
+#: code:addons/account/invoice.py:904
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:80
+#: code:addons/account/wizard/account_fiscalyear_close.py:83
+#: 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"
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr "Controles de tipo"
+
+#. 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 polizas conciliadas."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr "Asentar polizas"
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. 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
+#: 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 polizas"
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr "Selecciona plan de impuestos."
+
+#. 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"
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:320
+#, python-format
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. 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:1447
+#, 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
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+msgstr "Fecha operación"
+
+#. 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"
+
+#. module: account
+#: view:validate.account.move:0
+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 "Todas las polizas 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 -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Factura "
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr "Cuenta de ingresos en plantilla producto"
+
+#. 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 las polizas contables de la empresa fueron conciliadas por última vez."
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr "Nuevo ejercicio fiscal"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: account
+#: code:addons/account/invoice.py:812
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr "¡Compruebe el importe de la factura!\n"
+"El total real no concuerda con el total calculado."
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr "Usar modelo"
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr "No"
+
+#. 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."
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr "Añadir"
+
+#. 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"
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr "¿Está seguro?"
+
+#. 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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr "Facturas borrador son validadas. "
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr "Aplicación impuesto"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr "Journal Items"
+
+#. 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
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your 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 "Con notas de credito de proveedor puede gestionar las facturas de abono que recibe de sus proveedores. Una nota de credito es un documento que abona una factura total o parcialmente. Puede fácilmente generar notas de credito y conciliarlas directamente desde el formulario de factura."
+
+#. 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
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles del banco"
+
+#. module: account
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+msgstr "¡Faltan impuestos!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+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."
+msgstr "Marque esta opción si el diario se utilizará para notas de credito (abonos)."
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr "Generar polizas de apertura ejercicio fiscal"
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr "Agrupar líneas de factura"
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr "Movimientos"
+
+#. 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"
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr "Para cerrar"
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr "Comprobar fecha no está en el periodo"
+
+#. module: account
+#: code:addons/account/account.py:1228
+#, 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 poliza asentada de este diario!\n"
+"Debe configurar el diario para permitir la cancelación de las polizas si quiere hacerlo."
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr "Plantillas"
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr "Cuentas impuestos hijas"
+
+#. module: account
+#: code:addons/account/account.py:958
+#, 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr "5"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr "Balance analítico -"
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move: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
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: 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
+#: 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
+msgid "Target Moves"
+msgstr "Movimientos destino"
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr "Período: Unidad de tiempo"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr "Pagos"
+
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr "Código cálculo inverso"
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr "Poliza"
+
+#. 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)"
+
+#. 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"
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr "Nombre columna"
+
+#. 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr "Apertura caja"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr "Línea 1:"
+
+#. module: account
+#: code:addons/account/account.py:1185
+#, python-format
+msgid "Integrity Error !"
+msgstr "¡Error de integridad!"
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr "Nombre interno"
+
+#. 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álida"
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr "Descripción en facturas"
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr "Próxima empresa a conciliar"
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr "Cuenta impuesto"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr "Resultado de conciliación"
+
+#. 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
+msgid "Balance Sheet"
+msgstr "Balance de situación"
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr "Informes contables"
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: 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 "Polizas"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr "Este periodo"
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:138
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr "No se encontro un período en la factura"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr "Código para calcular (si tipo=código)"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr "Venta"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount: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 "Poliza fin de ejercicio fiscal"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: 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 "La poliza de la factura ha sido totalmente conciliada con una o varias polizas 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
+#: code:addons/account/account.py:2119
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr "¡No se ha encontrado período!"
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr "Permitir cancelación de polizas"
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr "Coeficiente para padre"
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr "Nombre de Cuenta/Empresa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr "Transacción"
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr "Utilice este código para la declaración del IVA."
+
+#. module: account
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr "Debe/Haber"
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr "Estadística de polizas analíticas"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr "account.instalador"
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr "Incluir en importe base"
+
+#. module: account
+#: help:account.payment.term.line,days:0
+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:2978
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+msgstr "Diario bancario "
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr "Controles de poliza"
+
+#. 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)"
+
+#. 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
+msgid "Start of period"
+msgstr "Inicio del período"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1202
+#, 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 una poliza conciliada! ¡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"
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr "Contabilidad analítica"
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr "Nota de credito de cliente"
+
+#. 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"
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr "Signo código impuesto"
+
+#. 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"
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr "Diario de polizas cierre del ejercicio"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:331
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr "¡Error de configuración!"
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+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 "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 las polizas periódicos"
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr "Cantidad de productos"
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr "No asentado"
+
+#. 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr "Polizas contables."
+
+#. 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"
+
+#. 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:1346
+#, python-format
+msgid "There is no default default credit account defined \n"
+"on journal \"%s\""
+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"
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid "Specified Journal does not have any account move entries in draft state for this period"
+msgstr "El diario indicado no tiene polizas 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"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr "Número (movimiento)"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+msgstr "Opciones Nota de credito (abono)"
+
+#. 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 "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
+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"
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr "Abrir plan contable"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make 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 polizas 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úna poliza nueva. Cierre un ejercicio fiscal cuando necesite finalizar los resultados de fin de ejercicio definitivamente. "
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr "Con divisa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr "Abrir caja"
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr "Conciliación con desfase"
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr "Importe fijo"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr "Válido hasta"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr "A cobrar vencidos"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr "Contabilidad. Conciliación automática"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr "Apunte contable"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+msgstr "Diario movimientos"
+
+#. 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 polizas de apertura"
+
+#. module: account
+#: code:addons/account/account_move_line.py:732
+#, python-format
+msgid "Already Reconciled!"
+msgstr "¡Ya está conciliado!"
+
+#. 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."
+
+#. 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."
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr "Cuentas hijas"
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "Write-Off"
+msgstr "Desajuste"
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr "Total a pagar"
+
+#. 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"
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:322
+#, python-format
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr "Plantilla de cuenta"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr "Cuenta n°"
+
+#. module: account
+#: help:account.installer.modules,account_payment:0
+msgid "Streamlines invoice payment and creates hooks to plug automated payment systems in."
+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"
+
+#. 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
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr "Cuentas a cobrar y pagar"
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr "Mapeo fiscal"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr "Ctdad máx."
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr "Reintegrar factura"
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid "From this view, have an analysis of your different financial accounts. The 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
+msgid "The tax code definition depends on the tax declaration of your country. 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
+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
+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 "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
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr "Forzar período"
+
+#. 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:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr "¡La nueva moneda no está configurada correctamente!"
+
+#. 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
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: 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
+msgid "Filter by"
+msgstr "Filtrar por"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1140
+#: code:addons/account/account_move_line.py:1223
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr "¡No puede utilizar una cuenta inactiva!"
+
+#. module: account
+#: code:addons/account/account_move_line.py:797
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr "¡Las polizas no son de la misma cuenta o ya están conciliadas! "
+
+#. 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"
+
+#. 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
+#, python-format
+msgid "No Filter"
+msgstr "Sin filtro"
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr "Número de días"
+
+#. 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:373
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr "Período: %s"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr "Plantilla posición fiscal impuesto"
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr "Este nombre se mostrará en los informes"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr "Fecha impresión"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+msgstr "  365 Días  "
+
+#. 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 "Notas de credito de cliente"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr "Calculo importe"
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr "Nombre diario-período"
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+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:126
+#, python-format
+msgid "not implemented"
+msgstr "no implementado"
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr "Compañía relacionada con este diario"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+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
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
+#. 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 de polizas analíticas"
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr "Anterior"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr "Poliza analítica"
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr "Mensaje pagos vencidos"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid "This view can be used by accountants in order to quickly record entries in 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 "Esta vista puede ser utilizada por los contadores para registrar polizas rápidamente en OpenERP. Si desea registrar una factura de proveedor, comience registrando la linea 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 las polizas de este diario."
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr "(vacío para período actual)"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+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 "is validated."
+msgstr "está validada."
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr "Cuenta principal"
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr "Fecha última conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr "Impuestos cliente"
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr "Crear una cuenta basada en esta plantilla"
+
+#. module: account
+#: view:account.account.type:0
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr "Configuración informes"
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr "Tipo impuesto"
+
+#. 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"
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr "Declaración de impuestos"
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account
+#: code:addons/account/account.py:546
+#, python-format
+msgid "You cannot modify Company of account as its related record exist in Entry Lines"
+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."
+
+#. 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"
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr "Información adicional"
+
+#. 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"
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr "Polizas parcialmente conciliadas"
+
+#. 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.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: 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
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: code:addons/account/wizard/account_move_journal.py:105
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: 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"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. 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"
+
+#. 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."
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr "Caja"
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr "Diario y Empresa"
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr "Fuerza"
+
+#. 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"
+
+#. 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)"
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr "Número factura"
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+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"
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid "The sequence field is used to order the taxes lines from lower sequences to 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"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear.close:0
+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 "Este asistente generará las polizas 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 las polizas 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid "From this view, have an analysis of your different analytic entries following the analytic account you defined matching your business need. Use 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 polizas 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 las polizas 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!"
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr "Crear opcional"
+
+#. module: account
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+#, 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
+#, python-format
+msgid "Enter a Start date !"
+msgstr "¡Introduzca una fecha inicial!"
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Refund"
+msgstr "Nota de credito de proveedor"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_dashboard_acc
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr "Apuntes"
+
+#. 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"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr "Sólo lectura"
+
+#. 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"
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: account
+#: constraint:account.payment.term.line:0
+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
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr "contabilidad.secuencia.ejerciciofiscal"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr "Conciliado"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr "Base"
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr "Nombre modelo"
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr "Cuenta categoría gastos"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr "Transacciones de caja"
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr "La factura ya está conciliada"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr "Estadísticas polizas analíticos"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:900
+#, python-format
+msgid "Entries: "
+msgstr "Polizas: "
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr "Crear polizas recurrentes manuales en un diario seleccionado."
+
+#. module: account
+#: code:addons/account/account.py:1442
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr "No se ha podido crear movimiento entre diferentes compañías"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid "An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable 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
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid "Bank Reconciliation consists of verifying that your bank statement 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"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "Total debit"
+msgstr "Total debit"
+
+#. module: account
+#: code:addons/account/account_move_line.py:775
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "¡La poliza \"%s\" no es válida!"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr "Basado en"
+
+#. 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 "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
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr "Código Python"
+
+#. 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 !"
+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
+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 polizas relacionados con este diario o de la factura relacionada con este diario."
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr "Crear poliza"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+msgstr "  valoración: porcentaje"
+
+#. module: account
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:833
+#: code:addons/account/account.py:919
+#: code:addons/account/account.py:994
+#: code:addons/account/account.py:1222
+#: code:addons/account/account.py:1228
+#: code:addons/account/account.py:2147
+#: code:addons/account/account.py:2395
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
+#: 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:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1185
+#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1202
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. 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"
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr "Impreso"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr "Línea de proyecto"
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to 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 conciliadas 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"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: 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 "Polizas contables"
+
+#. 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."
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr "LIBRO"
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+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
+#, python-format
+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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: 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 las polizas"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#, python-format
+msgid "Currnt currency is not confirured properly !"
+msgstr "¡La moneda actual no está configurada correctamente!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr "Contabilidad. Conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr "Posición fiscal impuestos"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: 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"
+
+#. 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."
+
+#. 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
+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 poliza 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... "
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr "Contabilidad. Plan de impuestos"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account
+#: code:addons/account/account.py:2102
+#, 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 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."
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos hijos"
+
+#. module: account
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+#, python-format
+msgid "Data Insufficient !"
+msgstr "¡Datos insuficientes!"
+
+#. 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"
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr "Importe desajuste"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr "Columna diario"
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. 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
+msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "
+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
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
+msgstr "Polizas no conciliadas"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr "Conciliación de extractos"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. 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."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid "A recurring entry is a miscellaneous entry that occurs on a recurrent basis 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 "Un poliza recurrente es un poliza 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 polizas recurrentes, puede crear estos polizas para automatizar las anotaciones contables en el sistema."
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid "A Cash Register allows you to manage cash entries in your cash journals. 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 "Un registro de caja le permite gestionar las polizas 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 polizas 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
+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 nota de credito (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"
+
+#. 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 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 "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 polizas 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:524
+#, 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"
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr "¿Está seguro que quiere abrir las polizas?"
+
+#. 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?"
+
+#. module: account
+#: code:addons/account/account_move_line.py:966
+#, python-format
+msgid "Accounting Entries"
+msgstr "Polizas contables"
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr "Plantilla cuenta padre"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr "Extracto"
+
+#. 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"
+"(las polizas 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
+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 poliza contable en concreto a través de información útil. Para buscar polizas contables, abra un diario, luego seleccione un apunte."
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr "Importe total que este cliente le debe."
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr "ir.secuencia"
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr "Icono"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. 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"
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
+msgstr "Marque esta opción para que cada poliza 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea de extracto bancario"
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr "Impuesto de compra por defecto"
+
+#. 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
+#: help:account.tax.template,domain:0
+msgid "This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."
+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:956
+#, 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
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr "Nombre de nuevos polizas"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr "Crear polizas"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr "Informes"
+
+#. 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!"
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr "Cierre de caja"
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr "Diario de contabilidad"
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr "Factura pagada"
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid "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."
+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"
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr "Usar modelo"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid "This view is used by accountants in order to record entries massively in 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 "Esta vista es usada por los contables para registrar polizas masivamente en OpenERP. Si quiere registrar una factura de proveedor, comience introduciendo la linea 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:250
+#, 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
+#: 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 poliza de cierre."
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice: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
+#: view:account.payment.term.line:0
+msgid "  value amount: n.a"
+msgstr "  importe valor: n.a"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr "Información opcional"
+
+#. 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"
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ":"
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr "En fecha"
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+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 polizas 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:1280
+#, python-format
+msgid "Bad account !"
+msgstr "¡Cuenta incorrecta!"
+
+#. module: account
+#: code:addons/account/account.py:2859
+#: code:addons/account/installer.py:432
+#, python-format
+msgid "Sales Journal"
+msgstr "Diario de ventas"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:104
+#, python-format
+msgid "Open Journal Items !"
+msgstr "¡Polizas abiertos!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr "Impuesto de factura"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1255
+#, python-format
+msgid "No piece number !"
+msgstr "¡Ningún trozo de número!"
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr "Propiedades de venta"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr "Conciliación manual"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr "Importe total debido:"
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1397
+#, python-format
+msgid "Currency Adjustment"
+msgstr "Currency Adjustment"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template: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:304
+#, python-format
+msgid "Payable Accounts"
+msgstr "Cuentas a pagar"
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Plantillas para el plan contable"
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código"
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr "Asentar polizas de un diario"
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr "Impuestos de ventas"
+
+#. module: account
+#: 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
+msgid "Cash"
+msgstr "Efectivo"
+
+#. 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pago de facturas"
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+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
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr "Ventas por tipo de cuenta"
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr "Enlace a las polizas generados automáticamente."
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid "Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence 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 polizas 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"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr "    7 Días    "
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: account
+#: field:account.account,parent_id:0
+#: view:account.analytic.account: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"
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid "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)."
+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"
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr "Suma del período"
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid "The sequence field is used to order the tax lines from the lowest sequences 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"
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: 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 :"
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: account
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:945
+#: code:addons/account/account_move_line.py:726
+#: code:addons/account/account_move_line.py:770
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Warning !"
+msgstr "¡Atención!"
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr "Estado de línea movimiento"
+
+#. 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"
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr "Calcular polizas periódicos"
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr "No se puede %s factura borrador/proforma/cancelada."
+
+#. module: account
+#: code:addons/account/invoice.py:795
+#, python-format
+msgid "No Invoice Lines !"
+msgstr "¡No hay líneas de factura!"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+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 polizas de su diario de polizas fin de ejercicio."
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr "Impuesto usado en"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:346
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr "Las líneas de las polizas contables no están en estado válida."
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr "Método cierre"
+
+#. module: account
+#: code:addons/account/invoice.py:360
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr "La factura '%s' está pagada."
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr "Asiento automático"
+
+#. 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"
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+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 poliza cuando se generen desde facturas."
+
+#. module: account
+#: help:account.period,state:0
+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 -"
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+msgstr "Abrir para la conciliación bancaria"
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr "Una empresa por página"
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr "Hijos"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr "Empresa asociada"
+
+#. module: account
+#: code:addons/account/invoice.py:1298
+#, python-format
+msgid "You must first select a partner !"
+msgstr "¡Primero debe seleccionar una empresa!"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr "Información adicional"
+
+#. module: account
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr "Cuentas de banco y caja"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "Total Residual"
+msgstr "Total residual"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid "The chart of taxes is used to generate your periodical tax statement. You 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."
+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"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "Cód. diario/Nombre mov."
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr "Seleccione el ejercicio fiscal"
+
+#. module: account
+#: code:addons/account/account.py:2923
+#: code:addons/account/installer.py:495
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr "Diario de abono de compras"
+
+#. 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."
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr "8"
+
+#. module: account
+#: view:account.invoice.refund:0
+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
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: 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
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: code:addons/account/account_move_line.py:985
+#: field:validate.account.move,period_id:0
+#, python-format
+msgid "Period"
+msgstr "Período"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr "Base:"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr "Informes genéricos"
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr "Diario de desajuste"
+
+#. 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 "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"
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr "Cuenta de la categoría de ingresos"
+
+#. 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr "Tipo interno"
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr "Importe impuestos/base"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid "With Customer Refunds you can manage the credit notes for your customers. 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 "Con las notas de credito (abonos) a clientes puede gestionar las devoluciones de sus clientes. Una nota de credito es un documento que abona una factura completa o parcialmente. Puede generar fácilmente notas de credito y conciliarlas directamente desde el formulario de factura."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_vat_declaration
+msgid "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."
+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. :"
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr "Divisa de la compañía"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Chart of Accounts"
+msgstr "Plan contable"
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr "Pago"
+
+#. 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"
+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
+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 poliza 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"
+
+#. 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."
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr "Contabilidad. Informe común"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr "Conciliar movimientos banco"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr "Tipos de cuentas"
+
+#. module: account
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr "No se puede crear poliza factura en el diario centralizado"
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoría Balance / PyG"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr "Conciliación"
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta a cobrar"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr "Saldo de caja"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr "Cerrar estado ejercicio fiscal"
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr "Diario reintegro"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr "Filtrar por"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid "With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from 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
+#: 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"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr "Línea de plazo de pago"
+
+#. module: account
+#: code:addons/account/account.py:2876
+#: code:addons/account/installer.py:452
+#, python-format
+msgid "Purchase Journal"
+msgstr "Diario de compras"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice: Creates the refund invoice, ready for editing."
+msgstr "Nota de credito: Crea la factura de abono, preparada para editarla."
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr "Imprimir declaración de impuestos"
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr "Línea de modelo de poliza"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr "Fecha vencimiento"
+
+#. 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)"
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr "Propiedades de contabilidad del proveedor"
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+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"
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr "Desde"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr "Cierre ejercicio fiscal"
+
+#. 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!"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr "Facturas impagadas"
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr "Importe debe"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+msgstr "Tesorería"
+
+#. 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.common.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr "Cuentas permitidas (vacío para ningún control)"
+
+#. 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. 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."
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: help:account.invoice,internal_number:0
+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
+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:1140
+#: code:addons/account/account_move_line.py:1223
+#, python-format
+msgid "Bad account!"
+msgstr "¡Cuenta incorrecta!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr "Contabilidad. Balance invertido analítico"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1065
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+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 poliza multi-divisa."
+
+#. module: account
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+msgid "Currency"
+msgstr "Divisa"
+
+#. 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 las polizas contables provenientes de la factura."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid "Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011  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
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr "Polizas conciliadas"
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr "Dirección contacto"
+
+#. 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."
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr "Imprimir balance contable de empresa"
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr "Contratos"
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+msgid "Opening Entries Journal"
+msgstr "Diario polizas de apertura"
+
+#. 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."
+
+#. module: account
+#: help:account.chart.template,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 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"
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr "Resumen de costes por periodo"
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+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"
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr "Código diario"
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid "You can specify here the coefficient that will be used when consolidating 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"
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr "Apuntes"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr "KI"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account.py:2899
+#: code:addons/account/installer.py:476
+#, python-format
+msgid "Sales Refund Journal"
+msgstr "Diario de abono de ventas"
+
+#. module: account
+#: code:addons/account/account.py:945
+#, 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr "Pago registrado"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr "Cerrar estados de ejercicio fiscal y periodos"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr "Información del producto"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr "Analítico"
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: account
+#: field:account.installer,purchase_tax:0
+msgid "Purchase Tax(%)"
+msgstr "Impuesto compra (%)"
+
+#. module: account
+#: code:addons/account/invoice.py:795
+#, python-format
+msgid "Please create some invoice lines."
+msgstr "Cree algunas líneas de factura"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr "Apreciado Sr./Sra.,"
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr "Configure su aplicación de contabilidad"
+
+#. module: account
+#: code:addons/account/account.py:2902
+#: code:addons/account/installer.py:479
+#, python-format
+msgid "SCNJ"
+msgstr "AVENTA"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+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
+msgid "Gives the view used when writing or browsing entries in this journal. The view tells OpenERP 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 "Establece la vista usada cuando se escriben o consultan polizas 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"
+
+#. module: account
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr "Gestión de seguimientos"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal: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.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+msgid "Start Period"
+msgstr "Periodo inicial"
+
+#. module: account
+#: code:addons/account/account.py:2395
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr "¡No se puede localizar código padre para plantilla de cuentas!"
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr "Dirección análisis"
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr "Compañías que se refieren a la empresa"
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr "Vista de diario"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1009
+#, python-format
+msgid "Total credit"
+msgstr "Total credit"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr "El contable valida las polizas contables provenientes de la factura. "
+
+#. module: account
+#: code:addons/account/invoice.py:1014
+#, 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 las polizas de pago relacionados!"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr "Atentamente,"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr "Impagada"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr "Documento: Estado contable del cliente"
+
+#. 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:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr "¡La moneda actual no está configurada correctamente!"
+
+#. module: account
+#: code:addons/account/account.py:956
+#: code:addons/account/account.py:958
+#: code:addons/account/account.py:1199
+#: code:addons/account/account.py:1442
+#: code:addons/account/account.py:1447
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:797
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:802
+#: code:addons/account/account_move_line.py:804
+#: code:addons/account/account_move_line.py:1126
+#: 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_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr "Cuentas a cobrar"
+
+#. 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"
+
+#. 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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape: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:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. 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"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.general.ledger_landscape: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"
+
+#. 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
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr "A pagar"
+
+#. 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"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of 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 polizas 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 la linea 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
+#, 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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr "Polizas contables son la primera entrada de la conciliación."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid "Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be 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
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days invoice date"
+msgstr "30 días fecha factura"
+
+#. 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr "Entrada manual"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr "Asiento"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1137
+#, 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
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr "Nº cuenta"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr "Extractos bancarios"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+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"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr "Informe común"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr "Hijos consolidados"
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#, 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
+#: 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 "Polizas de pago"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of Accounts"
+msgstr "Plan contable"
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr "Polizas periódicos"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr "Contabilidad. Saldo analítico"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal: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.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration: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 Accounts"
+msgstr "Plan contable"
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr "Fecha vencimiento"
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr "Polizas estándares"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr "Asiento periódico"
+
+#. module: account
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid "Tax base different !\n"
+"Click on compute to update tax base"
+msgstr "¡Base de impuesto diferente!"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr "Asiento periódico"
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from: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
+#: 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
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr "Facturas borrador"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr "No conciliado"
+
+#. module: account
+#: code:addons/account/invoice.py:812
+#, python-format
+msgid "Bad total !"
+msgstr "¡Total erróneo!"
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr "Secuencia del poliza"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid "A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following 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 polizas 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 polizas, cualquier nuevo poliza deberá anotarse en el siguiente periodo abierto. Cierre un periodo cuando no vaya a escribir nuevos polizas 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"
+
+#. 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"
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr "Nombre del período"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr "Código/Fecha"
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: account
+#: code:addons/account/invoice.py:353
+#, python-format
+msgid "Unknown Error"
+msgstr "Error desconocido"
+
+#. module: account
+#: code:addons/account/account.py:1185
+#, 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 poliza 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
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr "Validar movimiento contable"
+
+#. 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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+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 "Puede seleccionar aquí el diario a usar para la nota de credito (abono) que se creará. Si deja este campo vacío, se usará el mismo diario que la factura actual."
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr "Diarios generales"
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr "Modelo de poliza"
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term!\n"
+"Please define partner on it!"
+msgstr "La fecha de vencimiento dla linea 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"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr "General"
+
+#. 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
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period: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
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter: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"
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr "Tipo de cambio"
+
+#. 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."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr "Abrir para conciliación"
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr "Padre izquierdo"
+
+#. 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 "Nota de credito (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."
+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"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+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 "El proceso de validación de polizas, 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 ")"
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr "Período contable"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr "Eliminar líneas"
+
+#. 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 "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"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr "Tipo interno"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr "Polizas periódicos en proceso"
+
+#. 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"
+
+#. 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
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr "Seleccionar periodo"
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Posted"
+msgstr "Asentado"
+
+#. 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
+#: 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
+msgid "End Date"
+msgstr "Fecha final"
+
+#. 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 polizas de apertura"
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr "Día del mes"
+
+#. 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
+#: code:addons/account/report/account_balance_sheet.py:73
+#: code:addons/account/report/account_balance_sheet.py:118
+#: code:addons/account/report/account_balance_sheet.py:121
+#: code:addons/account/report/account_balance_sheet.py:122
+#: code:addons/account/report/account_profit_loss.py:74
+#: code:addons/account/report/account_profit_loss.py:133
+#, python-format
+msgid "Net Profit"
+msgstr "Beneficio neto"
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr "Secuencias ejercicios fiscales"
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr "Este es un modelo para polizas contables recurrentes"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:99
+#, 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 "JNRL"
+msgstr "JNRL"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr "  importe valor: 0.02"
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr "Estados"
+
+#. module: account
+#: 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr "Diario: Todos"
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,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
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.period,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr "Definir polizas recurrentes"
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr "Fecha vencimiento"
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr "Total transiciones de caja."
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid "This figure depicts the total number of partners that have gone throught the 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"
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr "Signo para padre"
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr "Informe de sumas y saldos"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr "Extractos bancarios borrador"
+
+#. 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 polizas de pago acorde a los extractos"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr "Líneas de factura"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:809
+#: code:addons/account/installer.py:585
+#: 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"
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+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
+#: view:account.vat.declaration:0
+msgid "This menu prints a VAT declaration based on invoices. Select one or several periods of the fiscal year. The 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."
+msgstr "This menu prints a VAT declaration based on invoices. Select one or several periods of the fiscal year. The 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
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Cierre"
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr "El estado de la factura es Realizada"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr "Contabilidad. Posición fiscal"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. 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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. 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."
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr "Recurrente"
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "Entry is already reconciled"
+msgstr "La poliza ya está conciliado"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Cuentas a cobrar"
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr "Plazo de pago de la empresa"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Intervalo"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1255
+#, 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 poliza!\n"
+"\n"
+"Indique una secuencia en la definición de diario para la numeración automática o cree manualmente una secuencia para este poliza."
+
+#. 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
+msgid "With movements"
+msgstr "Con movimientos"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr "Datos de la cuenta"
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr "Plantilla códigos impuestos contables"
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr "Manualmente"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. 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"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr "Cuenta fin."
+
+#. 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"
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr "Aplicación"
+
+#. 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!"
+
+#. 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 poliza multi-divisa."
+
+#. 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"
+
+#. module: account
+#: view:account.account:0
+msgid "Parent Account"
+msgstr "Cuenta padre"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid "Create and manage your company's journals from this menu. A journal is used to record transactions of all accounting data related to the day-to-day business of your company using double-entry bookkeeping system. Depending on the nature of its activities and the number of daily transactions, a company 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
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr "Contabilidad. Plan analítico"
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr "Importe debido restante."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr "Informes estadísticos"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr "Mapeo de cuentas"
+
+#. module: account
+#: code:addons/account/invoice.py:345
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr "La factura '%s' está esperando para validación."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr "cuenta.instalador.módulos"
+
+#. 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:1126
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr "¡La fecha de su poliza no está en el periodo definido!"
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr "Número de periodos"
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr "Diario general"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr "Buscar factura"
+
+#. 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 "Nota de credito"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+msgstr "Cuentas de banco"
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr "Total a cobrar"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr "Documentos contables"
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr "Contabilidad. Validar líneas movimiento"
+
+#. 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)"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr "El estado de la factura es Realizada."
+
+#. 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"
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr "Impuestos factura manual"
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr "Padre derecho"
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr "account.añadirplantilla.asistente"
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr "De empresas"
+
+#. 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"
+
+#. module: account
+#: help:account.analytic.journal,active:0
+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."
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr "Modelo de poliza"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. 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"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr "Vencimiento"
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr "Futuro"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr "Buscar líneas polizas"
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: 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."
+
+#. 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"
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr "Cuenta de gastos en plantilla producto"
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "Moneda del importe"
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#, 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:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr "¡No puede eliminar una cuenta que contiene polizas contables! "
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
+msgstr "Cree y gestione las cuentas que necesite para codificar polizas 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
+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)."
+
diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po
index 4061a414424..989447bc187 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -523,8 +523,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1178,6 +1176,7 @@ msgstr "# de transacción"
 
 #. 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
@@ -1366,6 +1365,16 @@ msgstr "¡No puede usar esta cuenta general en este diario!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Con saldo distinto a 0"
 
@@ -2117,7 +2126,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Buscar plantillas de plan contable"
 
 #. module: account
@@ -2184,6 +2193,8 @@ msgstr "Propiedades de contabilidad"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Asientos ordenados por"
 
@@ -2205,11 +2216,16 @@ msgstr "Plantilla de producto"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2551,6 +2567,7 @@ msgstr "Desc.(%)"
 
 #. 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
@@ -2814,6 +2831,8 @@ msgstr "Contabilidad financiera"
 #. 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
 msgid "Profit And Loss"
 msgstr "Pérdidas y ganancias"
 
@@ -3103,7 +3122,6 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3117,6 +3135,17 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: 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"
 
@@ -3334,6 +3363,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Contrapartida"
 
@@ -3392,6 +3422,16 @@ msgstr "IVA"
 #: 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.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 "Chart of Accounts"
 msgstr "Plan contable"
 
@@ -3853,11 +3893,10 @@ msgid "Analytic Balance"
 msgstr "Saldo analítico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: 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"
 
@@ -4559,8 +4598,8 @@ msgstr "Registros del diario"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr "Balance de situación (cuentas de activos)"
+msgid "Balance Sheet (Asset Accounts)"
+msgstr ""
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -4706,7 +4745,6 @@ msgid "Analytic Balance -"
 msgstr "Balance analítico -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4719,10 +4757,8 @@ 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.journal.period.print: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
@@ -4732,6 +4768,16 @@ msgstr "Balance analítico -"
 #: 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
 msgid "Target Moves"
 msgstr "Movimientos destino"
 
@@ -4849,6 +4895,8 @@ msgstr "Resultado de conciliación"
 #: 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
 msgid "Balance Sheet"
 msgstr "Hoja de balance"
 
@@ -5601,6 +5649,19 @@ 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 "No filtrar"
@@ -6565,6 +6626,7 @@ msgstr "Posición fiscal impuestos"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6830,7 +6892,7 @@ msgstr "Líneas analíticas"
 #: 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 "
+"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) "
@@ -7576,6 +7638,7 @@ msgstr "Importe (en palabras):"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7840,6 +7903,19 @@ msgstr "Gestión contable y financiera"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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"
@@ -7935,14 +8011,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Moneda de la compañía"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Plan contable"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -8059,6 +8127,12 @@ msgstr "Diario reintegro"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8311,6 +8385,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8628,12 +8703,17 @@ msgstr "Gestión de seguimientos"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Periodo inicial"
 
@@ -8758,7 +8838,12 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8777,6 +8862,15 @@ msgstr "Introducido manualmente o automáticamente en el sistema"
 
 #. 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"
 
@@ -8995,7 +9089,7 @@ msgstr "Julio"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan contable"
 
 #. module: account
@@ -9012,12 +9106,17 @@ msgstr "Contabilidad. Saldo analítico"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Periodo final"
 
@@ -9037,7 +9136,7 @@ msgstr "Periodo final"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Plan contable"
 
 #. module: account
@@ -9235,6 +9334,7 @@ msgstr "Validar movimiento contable"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -9322,6 +9422,18 @@ msgstr "General"
 #: selection:account.pl.report,filter: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
@@ -9539,13 +9651,10 @@ msgid "Tax Source"
 msgstr "Origen impuesto"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Beneficio Neto"
 
@@ -9570,8 +9679,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9784,6 +9893,7 @@ msgstr "Factura de Proveedor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9864,6 +9974,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Con movimientos"
 
@@ -10256,6 +10376,18 @@ 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 ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "¡El balance del extracto bancario es incorrecto!\n"
@@ -10269,6 +10401,15 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Factura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance de situación (cuentas de activos)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "está validada."
+
+#~ msgid "Chart of Accounts"
+#~ msgstr "Plan contable"
+
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
diff --git a/addons/account/i18n/es_VE.po b/addons/account/i18n/es_VE.po
new file mode 100644
index 00000000000..51cbd2a70bc
--- /dev/null
+++ b/addons/account/i18n/es_VE.po
@@ -0,0 +1,11777 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account
+#
+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"
+"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"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr "Sistema de pagos"
+
+#. 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
+#: 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"
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr "Estadísticas de cuentas"
+
+#. 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"
+
+#. 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. "
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Moneda contable"
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr "Definición hijos"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "Total debe"
+
+#. module: account
+#: view:account.unreconcile:0
+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\"!"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. 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"
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: view:account.move.line:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr "Seleccione el ejercicio fiscal "
+
+#. module: account
+#: help:account.payment.term,active:0
+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
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr "Diario: %s"
+
+#. module: account
+#: help:account.analytic.journal,type:0
+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 ""
+"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"
+
+#. 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
+#: help:account.tax.code.template,notprintable:0
+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
+#, 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."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr "Informes Belgas"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1176
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "No puede añadir/modificar asientos en un diario cerrado."
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "Saldo calculado"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr "Cerrar ejercicio fiscal"
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr "Permitir desfase"
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr "Seleccione el período de análisis"
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr "Ext."
+
+#. module: account
+#: code:addons/account/invoice.py:529
+#, 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"
+
+#. module: account
+#: help:account.installer,charts:0
+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
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"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"
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr "Propiedades de compra"
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+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 ""
+"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
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr "cuenta.impuesto.plantilla"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr "cuenta.banco.cuentas.asistente"
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr "Fecha creación"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr "Abono de compra"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr "Situación apertura/cierre"
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr "La divisa utilizada para introducir asientos."
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr "Ejercicio fiscal a abrir"
+
+#. module: account
+#: help:account.journal,sequence_id:0
+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"
+
+#. 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"
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr "Abrir para romper conciliación"
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr "Plantilla plan contable"
+
+#. 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."
+
+#. module: account
+#: help:account.journal.period,state:0
+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 ""
+"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
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+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
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: 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
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr "Confirmar las facturas seleccionadas"
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr "Destino padre"
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr "Cuenta utilizada en este diario"
+
+#. 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
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: 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
+msgid "Select Charts of Accounts"
+msgstr "Seleccionar plan contable."
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr "Impuestos de compras"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Abono factura"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr "Transacciones no conciliadas"
+
+#. 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!"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr "El contable confirma el extracto."
+
+#. 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
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "Todas"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr "Nombre dirección factura"
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr "Trimestral"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"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   "
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr "Secuencias"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr "Mapeo de impuestos"
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr "Diario centralizado"
+
+#. 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!"
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr "Importe código impuesto"
+
+#. module: account
+#: code:addons/account/account.py:2779
+#: code:addons/account/installer.py:434
+#, 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"
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr "Cerrar período"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr "Rapport du compte commun partenaire"
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr "Período asientos de apertura"
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr "Periodo diario"
+
+#. module: account
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
+#, 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr "Informe del libro mayor"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr "Reabrir"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr "¿Está seguro que desea crear los asientos?"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "Comprobar"
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr "Empresas conciliadas hoy"
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr "Porcentaje"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr "Planes contables"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:39
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,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
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr "Contabilidad. Línea de subscripción"
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr "La referencia de la empresa de esta factura."
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr "No conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_Journal_report
+msgid "Account Analytic Journal"
+msgstr "Contabilidad. Diario analítico"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr "C.Diario / Nombre mov."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr "días"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#, 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"
+
+#. 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr "Retraso promedio a pagar"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr "Crear períodos trimestrales"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr "Debido"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Total con impuestos"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr "Consolidación"
+
+#. 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..."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr "Diario centralizado"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr "Abono ventas"
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr "Extracto bancario"
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr "Línea de movimiento"
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"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)."
+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
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr "Asientos del modelo"
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr "Código"
+
+#. 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
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "¡No diario analítico!"
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: 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"
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr "Nombre cuenta."
+
+#. 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"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana del año"
+
+#. 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"
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr "Facturas de cliente para aprobar"
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr "Seleccione un ejercicio fiscal para cerrar."
+
+#. 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
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr "Opciones para su aplicación"
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr "A cuadrar"
+
+#. 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)"
+
+#. 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 "-"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr "Generar asientos antes:"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Bank"
+msgstr "Banco"
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr "Inicio del periodo"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr "Confirmar extracto"
+
+#. 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"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr "Centralización del haber"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"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
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr "Cancelar facturas"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Transacciones no conciliadas"
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr "Tasa de divisas de salida"
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr "El asiento de este apunte."
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr "# de transacción"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account.py:976
+#, 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."
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr "Otros"
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr "Incluido en importe base"
+
+#. 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"
+
+#. module: account
+#: field:account.account,level:0
+msgid "Level"
+msgstr "Nivel"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:120
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr "Seleccione un periodo inicial y final"
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Plantillas para cuentas"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr "Pagos fuera de plazo"
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr "Saldo inicial"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr "Información bancaria"
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr "Opciones del informe"
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr "Análisis elementos diario"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: 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"
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr "Cuenta a cobrar"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr "Diario central"
+
+#. 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "With balance is not equal to 0"
+msgstr "Con balance si no es igual a 0"
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr "Buscar impuestos"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr "Contabilidad. Diario de costes analíticos"
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr "Crear asientos"
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr "Nº de elementos"
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr "Importe máximo de desajuste"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr "Calcular impuestos"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr "Núm. de dígitos"
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr "Omitir estado 'Borrador' para asientos manuales."
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr "Total base"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit transaction. OpenERP automatically creates one journal "
+"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 "
+
+#. 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"
+
+#. 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
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Cierre"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr "Asientos recurrentes"
+
+#. 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"
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr "Transacciones conciliadas"
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr "Columnas"
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr "."
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr "y diarios"
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr "Base"
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr "Ir a la siguiente empresa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr "Buscar extractos bancarios"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+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"
+
+#. 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"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr "Líneas extracto"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card or any other type "
+"of financial account. The starting balance will be proposed automatically "
+"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 ""
+"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"
+
+#. 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"
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr "Límite a pagar"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. 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"
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr "Secuencia ejercicio fiscal"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+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"
+
+#. 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"
+
+#. module: account
+#: view:account.invoice.refund:0
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr "Suma del año"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.report_account_voucher_new
+msgid "Print Voucher"
+msgstr "Imprimir recibo"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"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"
+
+#. 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"
+
+#. module: account
+#: help:account.journal.period,active:0
+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"
+
+#. 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!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr "Contabilidad. Informe diario común"
+
+#. 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. :"
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr "Planes de cuentas analíticas"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "My Entries"
+msgstr "Mis asientos"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr "Ref. cliente:"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:328
+#, 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 !"
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr "Estos períodos se pueden solapar."
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr "Extracto borrador"
+
+#. 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."
+
+#. 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"
+
+#. 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!"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr "cierre periodo"
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr "Configurar ejercicio fiscal"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr "Asientos por línea"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr "Código cuenta"
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr "Asiento contable"
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr "Declaración de impuestos: Facturas"
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: account
+#: view:account.account:0
+msgid "Treasury Analysis"
+msgstr "Análisis de tesorería"
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:332
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr "Compruebe que se ha definido una cuenta en el diario."
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr "Válido"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. 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
+#: 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"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr "Definición de impuestos"
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+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
+#: help:account.report.general.ledger,amount_currency:0
+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
+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"
+
+#. 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"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: account
+#: help:account.tax,active:0
+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"
+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"
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr "Apuntes de conciliación parcial"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr "Ejercicio fiscal"
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr "Abrir asientos"
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr "Cuentas a conciliar"
+
+#. 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"
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr "Importa desde factura"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr "Validaciones"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr "Este ejercicio fiscal"
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr "Plan de impuestos contables"
+
+#. module: account
+#: constraint:account.period:0
+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
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " Diario"
+
+#. module: account
+#: code:addons/account/account.py:1319
+#, 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 ""
+"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."
+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"
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+"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
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account
+#: code:addons/account/account.py:2844
+#: code:addons/account/installer.py:498
+#, python-format
+msgid "ECNJ"
+msgstr "ACOMPRA"
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/invoice.py:352
+#, 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!"
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr "Propiedades de contabilidad"
+
+#. 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
+msgid "Entries Sorted By"
+msgstr "Asientos ordenados por"
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr "Cambiar a"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr "Nº ctdad de productos "
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: account
+#: report:account.account.balance: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
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.period,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
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#. 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
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: 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
+msgid "Keep empty for all open fiscal year"
+msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr "Asiento contable"
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr "Secuencia principal"
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. 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"
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr "Marque esta opción"
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: code:addons/account/wizard/account_move_journal.py:106
+#: selection:report.invoice.created,state:0
+#, python-format
+msgid "Open"
+msgstr "Abierto"
+
+#. 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"
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr "Código impuesto contable"
+
+#. module: account
+#: code:addons/account/invoice.py:545
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"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
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr "Código base"
+
+#. 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
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr "Signo código base"
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The 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."
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr "Cuentas a renovar"
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr "Contabilidad. Líneas de modelo"
+
+#. module: account
+#: code:addons/account/account.py:2796
+#: code:addons/account/installer.py:454
+#, python-format
+msgid "EXJ"
+msgstr "COMPRA"
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr "Impuestos proveedor"
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+"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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr "Declaraciones"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr "Mover nombre"
+
+#. module: account
+#: help:res.partner,property_account_position:0
+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."
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account
+#: view:account.account:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account
+#: code:addons/account/invoice.py:351
+#, python-format
+msgid "Configuration Error!"
+msgstr "¡Error de configuración!"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr "Precio promedio"
+
+#. 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
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: account
+#: view:account.tax:0
+msgid "Accounting Information"
+msgstr "Información contable"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr "Cálculo especial"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. 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."
+
+#. 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
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr "Conciliación automática"
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr "Pagado/Conciliado"
+
+#. 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"
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Verdadero"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr "Cuenta impuestos padre"
+
+#. module: account
+#: view:account.subscription.generate:0
+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.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr "Saldos vencidos de empresa"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr "Asientos contables"
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"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"
+
+#. 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"
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr "Este asistente creará asientos contables recurrentes"
+
+#. module: account
+#: code:addons/account/account.py:1181
+#, 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: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
+#, 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'!"
+
+#. 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr "Clientes"
+
+#. 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. 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 ""
+"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:"
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr "Requerido"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr "Impuesto de venta por defecto"
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+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 ""
+"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"
+
+#. 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
+msgid "Profit And Loss"
+msgstr "Pérdidas y ganancias"
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: 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
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one."
+msgstr ""
+"¡No se ha definido un ejercicio fiscal para esta fecha!\n"
+"Por favor, cree uno."
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr "Factura de cliente"
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+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"
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr "Buscar periodo"
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr "Moneda factura"
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr "Plazos de pago"
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr "Transición de caja"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr "Cuenta bancaria"
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr "Lista plantilla impuestos"
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"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: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."
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr "Nombre línea"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr "Buscar ejercicio fiscal"
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr "Siempre"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr "Cantidad total"
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr "Cuenta de desajuste"
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. 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."
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "View"
+msgstr "Vista"
+
+#. 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
+#, python-format
+msgid "BNK"
+msgstr "BANCO"
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr "Líneas analíticas"
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr "Archivo electrónico"
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr "Haber del cliente"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr "Empieza en"
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr "Contabilidad. Libro mayor empresa"
+
+#. 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"
+
+#. module: account
+#: help:account.account,currency_id:0
+#: 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 ""
+"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
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr "Contabilidad. Romper conciliación. Conciliar"
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" '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
+#: 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"
+
+#. 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
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: view:account.journal.period: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
+#: field:account.vat.declaration,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"
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr "Empresas restantes"
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr "Apuntes de asientos periódicos"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr "Compra"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr "Saldo inicial"
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "No Partner Defined !"
+msgstr "¡No se ha definido empresa!"
+
+#. 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"
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr "¿Cuentas vacías? "
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr "IVA:"
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+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"
+
+#. 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"
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr "Plan de impuestos"
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr "Buscar diario"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr "Factura pendiente"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr "año"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Authorised Signatory"
+msgstr "Firma autorizada"
+
+#. 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 ""
+"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"
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr "Planes contables"
+
+#. 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"
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr "Buscar movimiento"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+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!"
+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"
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "Datos facturación"
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr "Estado factura"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr "Detalle"
+
+#. module: account
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr "Sus cuentas de banco y caja"
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. 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.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 "Chart of Accounts"
+msgstr "Plan contable"
+
+#. 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)"
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr "Homólogo centralizado"
+
+#. 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr "2"
+
+#. 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
+#: 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.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print: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
+#: selection:account.vat.declaration,filter:0
+#: code:addons/account/report/common_report_header.py:97
+#: field:analytic.entries.report,date:0
+#, python-format
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
+#. 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."
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr "Plantilla del plan contable"
+
+#. module: account
+#: code:addons/account/account.py:2095
+#, 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
+#, 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#. 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
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: 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
+msgid "No Filters"
+msgstr "No filtros"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr "Situación"
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+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)"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr "Cantidad"
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr "Nombre dirección contacto"
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr "Desacuerdo"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr "Buscar líneas analíticas"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr "Apuntes analíticos"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, python-format
+msgid "Unable to change tax !"
+msgstr "¡No ha sido posible cambiar el impuesto!"
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr "Nº asientos"
+
+#. module: account
+#: code:addons/account/invoice.py:1422
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+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"
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr "Código impuesto factor multiplicación"
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr "Asignaciones"
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name: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"
+
+#. 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"
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr "Fecha vigencia"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr "Codificación estándar"
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr "Diario para asientos analíticos"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+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
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr "Contabilidad general"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr "Saldo :"
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"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 ""
+"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"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr "Líneas recurrentes"
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr "Mostrar empresas"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+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."
+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"
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr "Tasa promedio"
+
+#. 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)"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: help:account.account,active:0
+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.tax.template:0
+msgid "Search Tax Templates"
+msgstr "Buscar plantillas impuestos"
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr "Asientos borrador"
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr "Abreviación"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr "Tipo de cuenta"
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Cancelar las facturas seleccionadas"
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+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"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr "Retraso promedio deuda"
+
+#. 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr "Cuenta atrasos"
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr "Líneas de impuestos"
+
+#. 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"
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr "Descripción impuesto"
+
+#. 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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr "Todos los asientos asentados"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, 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"
+
+#. 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."
+
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr "Código cálculo"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr "Impuestos por defecto"
+
+#. module: account
+#: code:addons/account/invoice.py:88
+#, python-format
+msgid "Free Reference"
+msgstr "Referencia libre"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr "Procesamiento periódico"
+
+#. module: account
+#: help:account.move.line,state:0
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr "Plan contable"
+
+#. 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"
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr "Indique el nombre de los nuevos asientos."
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Estadísticas de facturas"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Cuentas por tipo"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#, python-format
+msgid "Not implemented"
+msgstr "No implementado"
+
+#. 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"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr "Abonos"
+
+#. 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"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr "Romper conciliación transacciones"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr "Crear asientos desde modelos"
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr "Permitir conciliación"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr "Estadísticas cuenta analítica"
+
+#. 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"
+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"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr "4"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+msgstr "Cambiar"
+
+#. 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"
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr "Controles de tipo"
+
+#. 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."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr "Asentar asientos"
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. 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.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"
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr "Selecciona plan de impuestos."
+
+#. 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"
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:320
+#, python-format
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. 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
+#, 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
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+msgstr "Fecha operación"
+
+#. 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"
+
+#. module: account
+#: view:validate.account.move:0
+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 -"
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr "Cuenta de ingresos en plantilla producto"
+
+#. 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"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. 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."
+msgstr ""
+"¡Compruebe el importe de la factura!\n"
+"El total real no concuerda con el total calculado."
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr "Usar modelo"
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr "No"
+
+#. 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."
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr "Añadir"
+
+#. 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"
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr "¿Está seguro?"
+
+#. 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"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr "Facturas borrador son validadas. "
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr "Aplicación impuesto"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. 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/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_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
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. 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
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Detalles del banco"
+
+#. module: account
+#: code:addons/account/invoice.py:720
+#, python-format
+msgid "Taxes missing !"
+msgstr "¡Faltan impuestos!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+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."
+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"
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr "Agrupar líneas de factura"
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr "Movimientos"
+
+#. 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"
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr "Para cerrar"
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr "Comprobar fecha no está en el periodo"
+
+#. module: account
+#: code:addons/account/account.py:1210
+#, 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"
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr "Cuentas impuestos hijas"
+
+#. module: account
+#: code:addons/account/account.py:940
+#, 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"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr "5"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr "Balance analítico -"
+
+#. module: account
+#: field:account.aged.trial.balance,target_move: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
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.journal.period.print:0
+#: field:account.move.journal,target_move: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
+msgid "Target Moves"
+msgstr "Movimientos destino"
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr "Período: Unidad de tiempo"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr "Pagos"
+
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr "Código cálculo inverso"
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr "Asiento"
+
+#. 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)"
+
+#. 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"
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr "Nombre columna"
+
+#. 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
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr "Apertura caja"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr "Línea 1:"
+
+#. module: account
+#: code:addons/account/account.py:1167
+#, python-format
+msgid "Integrity Error !"
+msgstr "¡Error de integridad!"
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr "Nombre interno"
+
+#. 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"
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr "Próxima empresa a conciliar"
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr "Cuenta impuesto"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr "Resultado de conciliación"
+
+#. 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
+msgid "Balance Sheet"
+msgstr "Balance de situación"
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr "Informes contables"
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr "Este periodo"
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:138
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr "No se encontro un período en la factura"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr "Código para calcular (si tipo=código)"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr "Venta"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount: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"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: 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!"
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr "Permitir cancelación de asientos"
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr "Coeficiente para padre"
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr "Nombre de Cuenta/Empresa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr "Transacción"
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr "Utilice este código para la declaración del IVA."
+
+#. module: account
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr "Debe/Haber"
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr "Estadística de asientos analíticos"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr "account.instalador"
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr "Incluir en importe base"
+
+#. module: account
+#: help:account.payment.term.line,days:0
+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 "
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr "Controles de asiento"
+
+#. 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)"
+
+#. 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
+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"
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr "Contabilidad analítica"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr "Signo código impuesto"
+
+#. 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"
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr "Diario asientos cierre del ejercicio"
+
+#. 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/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr "¡Error de configuración!"
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+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 ""
+"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"
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr "Cantidad de productos"
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr "No asentado"
+
+#. 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr "Asientos contables."
+
+#. 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"
+
+#. 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\""
+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"
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+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"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr "Número (movimiento)"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+msgstr "Opciones factura rectificativa (abono)"
+
+#. 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 ""
+"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
+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"
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr "Abrir plan contable"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"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
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr "Con divisa"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr "Abrir caja"
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr "Conciliación con desfase"
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr "Importe fijo"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr "Válido hasta"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr "A cobrar vencidos"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr "Contabilidad. Conciliación automática"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr "Apunte contable"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+msgstr "Diario movimientos"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account_move_line.py:738
+#, python-format
+msgid "Already Reconciled!"
+msgstr "¡Ya está conciliado!"
+
+#. 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."
+
+#. 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."
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr "Cuentas hijas"
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:830
+#, python-format
+msgid "Write-Off"
+msgstr "Desajuste"
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr "Total a pagar"
+
+#. 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"
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:322
+#, python-format
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr "Plantilla de cuenta"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr "Cuenta n°"
+
+#. module: account
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
+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"
+
+#. 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
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr "Cuentas a cobrar y pagar"
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr "Mapeo fiscal"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr "Ctdad máx."
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr "Reintegrar factura"
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"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
+msgid ""
+"The tax code definition depends on the tax declaration of your country. "
+"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
+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
+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 ""
+"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
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr "Forzar período"
+
+#. 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!"
+
+#. 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
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: 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
+msgid "Filter by"
+msgstr "Filtrar por"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr "¡No puede utilizar una cuenta inactiva!"
+
+#. module: account
+#: code:addons/account/account_move_line.py:803
+#, 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! "
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr "Número de días"
+
+#. 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
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr "Período: %s"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr "Plantilla posición fiscal impuesto"
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr "Este nombre se mostrará en los informes"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr "Fecha impresión"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+msgstr "  365 Días  "
+
+#. 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"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr "Calculo importe"
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr "Nombre diario-período"
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+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:126
+#, python-format
+msgid "not implemented"
+msgstr "no implementado"
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr "Compañía relacionada con este diario"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+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
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
+#. 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"
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr "Anterior"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr "Asiento analítico"
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr "Mensaje pagos vencidos"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"This view can be used by accountants in order to quickly record entries in "
+"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 ""
+"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
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr "(vacío para período actual)"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+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"
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr "Fecha última conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr "Impuestos cliente"
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr "Crear una cuenta basada en esta plantilla"
+
+#. 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."
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr "Tipo impuesto"
+
+#. 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"
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr "Declaración de impuestos"
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account
+#: code:addons/account/account.py:532
+#, python-format
+msgid ""
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
+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."
+
+#. 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"
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr "Información adicional"
+
+#. 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"
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr "Asientos parcialmente conciliados"
+
+#. 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.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: 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
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: code:addons/account/wizard/account_move_journal.py:105
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: 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"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. 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"
+
+#. 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."
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr "Caja"
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr "Diario y Empresa"
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr "Fuerza"
+
+#. 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"
+
+#. 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)"
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr "Número factura"
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+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"
+
+#. 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"
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+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"
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"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"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscalyear.close:0
+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 ""
+"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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"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!"
+
+#. 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
+#, python-format
+msgid "Enter a Start date !"
+msgstr "¡Introduzca una fecha inicial!"
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: 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"
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr "Apuntes"
+
+#. 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"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr "Sólo lectura"
+
+#. 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"
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: account
+#: constraint:account.payment.term.line:0
+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
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr "contabilidad.secuencia.ejerciciofiscal"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr "Conciliado"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr "Base"
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr "Nombre modelo"
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr "Cuenta categoría gastos"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr "Transacciones de caja"
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr "La factura ya está conciliada"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr "Estadísticas asientos analíticos"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
+#, python-format
+msgid "Entries: "
+msgstr "Asientos: "
+
+#. 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."
+
+#. module: account
+#: code:addons/account/account.py:1393
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr "No se ha podido crear movimiento entre diferentes compañías"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is used to determine how an account is used in each journal. "
+"The deferral method of an account type determines the process for the annual "
+"closing. Reports such as the Balance Sheet and the Profit and Loss report "
+"use the category (profit/loss or balance sheet). For example, the account "
+"type could be linked to an asset account, expense account or payable "
+"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
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"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"
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1003
+#, python-format
+msgid "Total debit"
+msgstr "Total debe"
+
+#. module: account
+#: code:addons/account/account_move_line.py:781
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "¡El asiento \"%s\" no es válido!"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr "Basado en"
+
+#. 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 ""
+"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
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr "Código Python"
+
+#. 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 !"
+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
+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"
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr "Crear asiento"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+msgstr "  valoración: porcentaje"
+
+#. 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_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/wizard/account_use_model.py:44
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. 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"
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr "Impreso"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr "Línea de proyecto"
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"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"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: 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"
+
+#. 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."
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+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
+#, python-format
+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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: 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"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:65
+#, python-format
+msgid "Currnt currency is not confirured properly !"
+msgstr "¡La moneda actual no está configurada correctamente!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr "Contabilidad. Conciliación"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr "Posición fiscal impuestos"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: 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.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr "Libro mayor"
+
+#. 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."
+
+#. 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
+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... "
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr "Contabilidad. Plan de impuestos"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account
+#: code:addons/account/account.py:2050
+#, 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 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."
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos hijos"
+
+#. module: account
+#: code:addons/account/invoice.py:473
+#: code:addons/account/wizard/account_invoice_refund.py:137
+#, python-format
+msgid "Data Insufficient !"
+msgstr "¡Datos insuficientes!"
+
+#. 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"
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr "Importe desajuste"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr "Columna diario"
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. 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
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+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
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
+msgstr "Asientos no conciliados"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr "Conciliación de extractos"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. 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."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
+"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 ""
+"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
+#: 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"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 ""
+"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
+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"
+
+#. 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"
+
+#. 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?"
+
+#. 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?"
+
+#. module: account
+#: code:addons/account/account_move_line.py:963
+#, python-format
+msgid "Accounting Entries"
+msgstr "Asientos contables"
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr "Plantilla cuenta padre"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr "Extracto"
+
+#. 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
+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
+#: 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"
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr "Importe total que este cliente le debe."
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr "ir.secuencia"
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr "Icono"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. 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"
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea de extracto bancario"
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr "Impuesto de compra por defecto"
+
+#. 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
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+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
+#, 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
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr "Nombre de nuevos asientos"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr "Crear asientos"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr "Informe"
+
+#. 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!"
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr "Cierre de caja"
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr "Diario de contabilidad"
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr "Factura pagada"
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"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."
+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"
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr "Usar modelo"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"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 ""
+"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
+#: 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"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr "Información opcional"
+
+#. 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"
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ":"
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr "En fecha"
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+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
+#, python-format
+msgid "Bad account !"
+msgstr "¡Cuenta incorrecta!"
+
+#. module: account
+#: code:addons/account/account.py:2777
+#: code:addons/account/installer.py:432
+#, python-format
+msgid "Sales Journal"
+msgstr "Diario de ventas"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:104
+#, python-format
+msgid "Open Journal Items !"
+msgstr "¡Asientos abiertos!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr "Impuesto de factura"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1246
+#, python-format
+msgid "No piece number !"
+msgstr "¡Ningún trozo de número!"
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr "Propiedades de venta"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr "Conciliación manual"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr "Importe total debido:"
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template: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:304
+#, python-format
+msgid "Payable Accounts"
+msgstr "Cuentas a pagar"
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Plantillas para el plan contable"
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Código"
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr "Asentar asientos de un diario"
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr "Impuestos de ventas"
+
+#. module: account
+#: 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
+msgid "Cash"
+msgstr "Efectivo"
+
+#. 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Pago de facturas"
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+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
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr "Ventas por tipo de cuenta"
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr "Enlace a los asientos generados automáticamente."
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid ""
+"Here you can customize an existing journal view or create a new view. "
+"Journal views determine the way you can record entries in your journal. "
+"Select the fields you want to appear in a journal and determine the sequence "
+"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"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr "    7 Días    "
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: account
+#: field:account.account,parent_id:0
+#: view:account.analytic.account: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"
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"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)."
+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"
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr "Suma del período"
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"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"
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: 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 :"
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. 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
+#, python-format
+msgid "Warning !"
+msgstr "¡Atención!"
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr "Estado de línea movimiento"
+
+#. 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"
+
+#. 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):"
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr "No se puede %s factura borrador/proforma/cancelada."
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "No Invoice Lines !"
+msgstr "¡No hay líneas de factura!"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+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"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:346
+#, 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."
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr "Método cierre"
+
+#. module: account
+#: code:addons/account/invoice.py:359
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr "La factura '%s' está pagada."
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr "Asiento automático"
+
+#. 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"
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+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.period,state:0
+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 -"
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+msgstr "Abrir para la conciliación bancaria"
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr "Una empresa por página"
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr "Hijos"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr "Empresa asociada"
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "You must first select a partner !"
+msgstr "¡Primero debe seleccionar una empresa!"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr "Información adicional"
+
+#. module: account
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr "Cuentas de banco y caja"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "Total Residual"
+msgstr "Total residual"
+
+#. 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"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"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."
+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"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "Cód. diario/Nombre mov."
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr "Seleccione el ejercicio fiscal"
+
+#. module: account
+#: code:addons/account/account.py:2841
+#: code:addons/account/installer.py:495
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr "Diario de abono de compras"
+
+#. 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."
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr "8"
+
+#. module: account
+#: view:account.invoice.refund:0
+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
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: 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: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"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr "Base:"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr "Informes genéricos"
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr "Diario de desajuste"
+
+#. 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 ""
+"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"
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr "Cuenta de la categoría de ingresos"
+
+#. 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"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr "Tipo interno"
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr "Importe impuestos/base"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"With Customer Refunds you can manage the credit notes for your customers. 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 ""
+"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
+msgid ""
+"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."
+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. :"
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr "Divisa de la compañía"
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr "Pago"
+
+#. 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"
+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
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr "Contabilidad. Balance invertido analítico"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr "Contabilidad. Informe común"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr "Conciliar movimientos banco"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr "Tipos de cuentas"
+
+#. 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"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr "Conciliación"
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Cuenta a cobrar"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr "Saldo de caja"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr "Cerrar estado ejercicio fiscal"
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr "Diario reintegro"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal: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
+msgid "Filter By"
+msgstr "Filtrar por"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"With Customer Invoices you can create and manage sales invoices issued to "
+"your customers. OpenERP can also generate draft invoices automatically from "
+"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
+#: 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"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr "Línea de plazo de pago"
+
+#. module: account
+#: code:addons/account/account.py:2794
+#: code:addons/account/installer.py:452
+#, python-format
+msgid "Purchase Journal"
+msgstr "Diario de compras"
+
+#. 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"
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr "Imprimir declaración de impuestos"
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr "Línea de modelo de asiento"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr "Fecha vencimiento"
+
+#. 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)"
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr "Propiedades de contabilidad del proveedor"
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+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"
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr "Desde"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr "Cierre ejercicio fiscal"
+
+#. 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!"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr "Facturas impagadas"
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr "Importe debe"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+msgstr "Tesorería"
+
+#. 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.common.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr "Cuentas permitidas (vacío para ningún control)"
+
+#. 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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. 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."
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: help:account.invoice,internal_number:0
+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
+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!"
+
+#. 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."
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+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
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+msgid "Currency"
+msgstr "Divisa"
+
+#. 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
+msgid ""
+"Define your company's financial year according to your needs. A financial "
+"year is a period at the end of which a company's accounts are made up "
+"(usually 12 months). The financial year is usually referred to by the date "
+"in which it ends. For example, if a company's financial year ends November "
+"30, 2011, then everything between December 1, 2010 and November 30, 2011  "
+"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
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr "Asientos conciliados"
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr "Dirección contacto"
+
+#. 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."
+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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr "Imprimir balance contable de empresa"
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr "Contratos"
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+msgid "Opening Entries Journal"
+msgstr "Diario asientos de apertura"
+
+#. 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."
+
+#. module: account
+#: help:account.chart.template,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 "
+"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"
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr "Resumen de costes por periodo"
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+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"
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr "Código diario"
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"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"
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr "Apuntes"
+
+#. 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"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr "KI"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/account.py:2817
+#: code:addons/account/installer.py:476
+#, 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"
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr "Pago registrado"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr "Cerrar estados de ejercicio fiscal y periodos"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr "Información del producto"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr "Analítico"
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: account
+#: field:account.installer,purchase_tax:0
+msgid "Purchase Tax(%)"
+msgstr "Impuesto compra (%)"
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "Please create some invoice lines."
+msgstr "Cree algunas líneas de factura"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr "Apreciado Sr./Sra.,"
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr "Configure su aplicación de contabilidad"
+
+#. module: account
+#: code:addons/account/account.py:2820
+#: code:addons/account/installer.py:479
+#, python-format
+msgid "SCNJ"
+msgstr "AVENTA"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+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
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP 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 ""
+"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"
+
+#. module: account
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr "Gestión de seguimientos"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+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!"
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr "Dirección análisis"
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr "Compañías que se refieren a la empresa"
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr "Vista de diario"
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "Total credit"
+msgstr "Total haber"
+
+#. 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,"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr "Impagada"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr "Documento: Estado contable del cliente"
+
+#. 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!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"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 ""
+"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"
+
+#. 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"
+
+#. 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.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.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. 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"
+
+#. 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"
+
+#. 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
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr "A pagar"
+
+#. 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"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"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
+#, 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"
+
+#. 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."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid ""
+"Here you can define a financial period, an interval of time in your "
+"company's financial year. An accounting period typically is a month or a "
+"quarter. It usually corresponds to the periods of the tax declaration. "
+"Create and manage periods from here and decide whether a period should be "
+"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"
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr "Entrada manual"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr "Asiento"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, 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
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr "Nº cuenta"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr "Extractos bancarios"
+
+#. 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+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"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr "Informe común"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr "Hijos consolidados"
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:82
+#, 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
+#: 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"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr "Plan contable"
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr "Asientos periódicos"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr "Contabilidad. Saldo analítico"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+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"
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr "Fecha vencimiento"
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr "Asientos estándares"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr "Asiento periódico"
+
+#. 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!"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr "Asiento periódico"
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from: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
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger: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
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr "Facturas borrador"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr "No conciliado"
+
+#. module: account
+#: code:addons/account/invoice.py:804
+#, python-format
+msgid "Bad total !"
+msgstr "¡Total erróneo!"
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr "Secuencia del asiento"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"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"
+
+#. 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"
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr "Nombre del período"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr "Código/Fecha"
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: account
+#: code:addons/account/invoice.py:354
+#, 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
+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"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr "Validar movimiento contable"
+
+#. 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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+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 ""
+"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 :"
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr "Diarios generales"
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr "Modelo de asiento"
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%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' 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"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr "General"
+
+#. 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
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period: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
+#: 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
+#: 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"
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr "Tipo de cambio"
+
+#. 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."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr "Abrir para conciliación"
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr "Padre izquierdo"
+
+#. 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 ""
+"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."
+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"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+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 ""
+"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 ")"
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr "Período contable"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr "Eliminar líneas"
+
+#. 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 ""
+"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"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: 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:"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr "Asientos periódicos en proceso"
+
+#. 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"
+
+#. 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
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr "Seleccionar periodo"
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+#: report:account.move.voucher:0
+msgid "Posted"
+msgstr "Asentado"
+
+#. 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
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger: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
+msgid "End Date"
+msgstr "Fecha final"
+
+#. 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"
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr "Día del mes"
+
+#. 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"
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr "Secuencias ejercicios fiscales"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr "  importe valor: 0.02"
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr "Estados"
+
+#. module: account
+#: 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"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr "Diario: Todos"
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,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
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.period,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,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"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr "Definir asientos recurrentes"
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr "Fecha vencimiento"
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr "Total transiciones de caja."
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"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"
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr "Signo para padre"
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr "Informe de sumas y saldos"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr "Extractos bancarios borrador"
+
+#. 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
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr "Líneas de factura"
+
+#. 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"
+
+#. 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"
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+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 :"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Movimiento de desajuste"
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr "El estado de la factura es Realizada"
+
+#. 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"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr "Contabilidad. Posición fiscal"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. 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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. 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."
+
+#. 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\"! "
+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"
+
+#. module: account
+#: code:addons/account/account_move_line.py:805
+#, python-format
+msgid "Entry is already reconciled"
+msgstr "El asiento ya está conciliado"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Cuentas a cobrar"
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr "Plazo de pago de la empresa"
+
+#. 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
+#: 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 "With movements"
+msgstr "Con movimientos"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr "Datos de la cuenta"
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr "Plantilla códigos impuestos contables"
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr "Manualmente"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. 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"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr "Cuenta fin."
+
+#. 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"
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr "Aplicación"
+
+#. 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!"
+
+#. 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."
+
+#. 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"
+
+#. module: account
+#: view:account.account:0
+msgid "Parent Account"
+msgstr "Cuenta padre"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"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
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr "Contabilidad. Plan analítico"
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr "Importe debido restante."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr "Informes estadísticos"
+
+#. 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"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr "Mapeo de cuentas"
+
+#. module: account
+#: code:addons/account/invoice.py:346
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr "La factura '%s' está esperando para validación."
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr "cuenta.instalador.módulos"
+
+#. 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"
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr "Diario general"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr "Buscar factura"
+
+#. 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"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+msgstr "Cuentas de banco"
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr "Total a cobrar"
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr "Documentos contables"
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr "Contabilidad. Validar líneas movimiento"
+
+#. 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)"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr "El estado de la factura es Realizada."
+
+#. 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"
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr "Impuestos factura manual"
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr "Padre derecho"
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr "account.añadirplantilla.asistente"
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr "De empresas"
+
+#. 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"
+
+#. module: account
+#: help:account.analytic.journal,active:0
+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."
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr "Modelo de asiento"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. 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"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr "Vencimiento"
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr "Futuro"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr "Buscar líneas asientos"
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: 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."
+
+#. 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"
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr "Cuenta de gastos en plantilla producto"
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "Moneda del importe"
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#, 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
+msgid ""
+"Create and manage the accounts you need to record journal entries. An "
+"account is part of a ledger allowing your company to register all kinds of "
+"debit and credit transactions. Companies present their annual accounts in "
+"two main parts: the balance sheet and the income statement (profit and loss "
+"account). The annual accounts of a company are required by law to disclose a "
+"certain amount of information. They have to be certified by an external "
+"auditor 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
+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/et.po b/addons/account/i18n/et.po
index afe95c27fb7..6984ae7e704 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -7,24 +7,24 @@ 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-12 00:12+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-10 19:34+0000\n"
+"Last-Translator: Raiko Pajur <Unknown>\n"
 "Language-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-29 05:05+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Süsteemi maksed"
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Muud konfiguratsioonid"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -39,6 +39,8 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+"Sa ei saa kustutada / desaktiveerida kontot, mis on määratud mis tahes "
+"\"Partner\" varaks."
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -48,7 +50,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Voucheri juhtimine"
 
 #. module: account
 #: view:account.account:0
@@ -78,7 +80,7 @@ msgstr "Viga! Perioodi(de) kestvus(ed) on vale(d). "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Konto valuuta"
 
 #. module: account
 #: view:account.tax:0
@@ -133,13 +135,13 @@ msgstr "Raamatupidamise kirjed-"
 #: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr ""
+msgstr "Sa ei saa kustutada postitatud liikumist: \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr "Päritolu"
+msgstr "Allikas"
 
 #. module: account
 #: view:account.account:0
@@ -164,7 +166,7 @@ msgstr "Viide"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Vali eelarveaasta "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -172,12 +174,14 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Kui aktiivne ala on väärne ( False ), siis see võimaldab teil peita/varjata "
+"maksetähtaeg seda kustutamata."
 
 #. module: account
 #: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Hoiatus!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -204,7 +208,7 @@ msgstr "Negatiivne"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr ""
+msgstr "Päevik: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -231,7 +235,7 @@ msgstr "konto.maks"
 msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
-msgstr ""
+msgstr "Periood ei ole defineeritud sellele kuupäevale: %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -252,12 +256,14 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
+"Märgista see kast, kui soovid arvel ei kuvataks ühtegi selle koodiga seotud "
+"KM."
 
 #. module: account
 #: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "Arve '%s' on makstud osaliselt: %s%s on tasutud %s%s (%s%s maksmata)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -278,7 +284,7 @@ msgstr "Teie ei saa lisada/muuta suletud päeviku kirjeid."
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr ""
+msgstr "Välja arvutatud tasakaal (Calculated Balance)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -350,7 +356,7 @@ msgstr "Ostu omadused"
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Seadista"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -359,7 +365,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Juuni"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -393,12 +399,12 @@ msgstr ""
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Avamise/Sulgemise situatsioon"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Valuuta väite sisestamiseks"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -483,8 +489,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -498,17 +502,17 @@ msgstr "Päevik"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "Kinnita valitud arved"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Lapsevanema sihtmärk"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Konto kasutatud selles arveraamatus"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -527,7 +531,7 @@ msgstr ""
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Vali Kontode graafikud"
 
 #. module: account
 #: view:product.product:0
@@ -537,7 +541,7 @@ msgstr "Ostumaksud"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Arveraamatu tagasimakse"
 
 #. module: account
 #: report:account.overdue:0
@@ -560,7 +564,7 @@ msgstr ""
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "Maksude kaardistamine"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
@@ -571,7 +575,7 @@ msgstr "Sule majandusaasta"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "Raamatupidaja kinnitab selle avalduse"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -587,12 +591,12 @@ msgstr "Kõik"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "Arveraamatu Aadressi Nimi"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "Iga 3 kuu tagant"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -604,7 +608,7 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 päeva   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -614,7 +618,7 @@ msgstr "Järjekorrad"
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr ""
+msgstr "Maksude kaardistamine"
 
 #. module: account
 #: report:account.central.journal:0
@@ -624,12 +628,12 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "Pea"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Maksukoodi summa"
 
 #. module: account
 #: code:addons/account/account.py:2779
@@ -652,12 +656,12 @@ msgstr "Sulge periood"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Konto tava \"Partner\" aruanne"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Avatud sissekanete periood"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
@@ -791,7 +795,7 @@ msgstr "J.C./liiguta nime"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -802,7 +806,7 @@ msgstr "päevad"
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "Kui märgitud, siis uus kontode graafik ei sisalda seda puudujääki."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -820,12 +824,12 @@ msgstr "Uus tellimus"
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "Arvutus"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "Kooskõlastama järgmise \"Partner\"-iga"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1191
@@ -834,12 +838,14 @@ msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
 "can just change some non important fields !"
 msgstr ""
+"Teie ei saa teha see muudatus kinnitatud kirjel ! Teie saate muuta ainult "
+"mõned vähetähtsad väljad !"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Keskmine viivitus maksete tegemisel"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -856,13 +862,13 @@ msgstr "Loo 3 kuupikkused perioodid"
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "Tähtaeg"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Kokku koos maksudega"
 
 #. module: account
 #: view:account.invoice:0
@@ -870,7 +876,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "Nõustu"
 
 #. module: account
 #: view:account.invoice:0
@@ -925,12 +931,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Ostud"
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "Mudeli kirjed"
 
 #. module: account
 #: field:account.account,code:0
@@ -958,7 +964,7 @@ msgstr "Kood"
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Puudub analüütiline päevik !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -972,7 +978,7 @@ msgstr "Partneri bilanss"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "Konto nimi."
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
@@ -983,7 +989,7 @@ msgstr ""
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Nädal"
 
 #. module: account
 #: field:account.bs.report,display_type:0
@@ -995,12 +1001,12 @@ msgstr "Rõhtpaigutus"
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "Kliendi arved kinnitamiseks"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Vali eelarve aasta mida sulgeda"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1018,13 +1024,13 @@ msgstr ""
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "Vaidlustatav"
 
 #. 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 ""
+msgstr "Raha register"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1037,12 +1043,12 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Juhataja"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -1052,7 +1058,7 @@ msgstr ""
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Bank"
-msgstr ""
+msgstr "Pank"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -1062,13 +1068,13 @@ msgstr "Perioodi algus"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Kinnita avaldus"
 
 #. 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 ""
+msgstr "Vahetus maks"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -1087,12 +1093,12 @@ msgstr ""
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Peata arved"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Mittesobivad tehingud"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1110,20 +1116,21 @@ msgstr ""
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "Selle rea liigutus."
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "Kande nr."
 
 #. 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 ""
+msgstr "Kirje silt"
 
 #. module: account
 #: code:addons/account/account.py:976
@@ -1173,7 +1180,7 @@ msgstr "Konto"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Lisa baas osa"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1185,7 +1192,7 @@ msgstr ""
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "Tase"
 
 #. module: account
 #: report:account.invoice:0
@@ -1206,7 +1213,7 @@ msgstr "Maksud"
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Vali algus ja lõpp periood"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1216,12 +1223,12 @@ msgstr "Mallid kontodele"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Otsi maksu templati"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Teie viide"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1245,7 +1252,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Lähtesta mustandiks"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1267,7 +1274,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "Partnerid"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1276,7 +1283,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Pangabilanss"
+msgstr "Pangateatis"
 
 #. module: account
 #: view:res.partner:0
@@ -1306,13 +1313,23 @@ msgstr "Te ei saa kasutada üldist kontot selles päevikus !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Bilanss pole 0"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Otsi maksu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1327,7 +1344,7 @@ msgstr "Loo sissekanded"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "# detaile"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1342,7 +1359,7 @@ msgstr "Arvuta maksud"
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr ""
+msgstr "# numbrit"
 
 #. module: account
 #: field:account.journal,entry_posted:0
@@ -1353,7 +1370,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Kokku ilma maksudeta"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1367,7 +1384,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "# sisestusi "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1424,7 +1441,7 @@ msgstr "Mall finantspositsioonile"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "Maksu koodi test"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1434,22 +1451,22 @@ msgstr ""
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "Veerud"
 
 #. module: account
 #: report:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr ""
+msgstr "ja arveraamatud"
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupid"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
@@ -1460,18 +1477,20 @@ msgstr "Maksuvaba"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Mine järgmise \"Partner\"-ile"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Otsi panga avaldust"
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Vale krediidi või deebeti arv mudelis ( Krediit + Deebet Peab olema suurem "
+"kui \"0\" ) !"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1483,13 +1502,13 @@ msgstr "Võlgade konto"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Maksu tagasimakse konto"
+msgstr "Maksu hüvitise konto"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Teatise read"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1505,14 +1524,14 @@ msgstr ""
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Kuupäev/Kood"
 
 #. 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 ""
+msgstr "Üldine konto"
 
 #. module: account
 #: field:res.partner,debit_limit:0
@@ -1543,13 +1562,13 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr ""
+msgstr "Eraldatud päeviku järjekorrad"
 
 #. module: account
 #: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastutav"
 
 #. module: account
 #: report:account.overdue:0
@@ -1559,7 +1578,7 @@ msgstr "Vahesumma:"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Müügid konto järgi"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1571,7 +1590,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Arveldamine"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -1587,17 +1606,17 @@ msgstr "Kaasa algsed"
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "Aasta kokkuvõtte"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.report_account_voucher_new
 msgid "Print Voucher"
-msgstr ""
+msgstr "Prindi voucher"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "See wizard muudab valuuta arvelduses"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1621,7 +1640,7 @@ msgstr ""
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Väärtused"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1643,7 +1662,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Nõuded ja võlad"
 
 #. module: account
 #: code:addons/account/account_move_line.py:815
@@ -1664,7 +1683,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Viide:"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1674,7 +1693,7 @@ msgstr "Analüütilised kontoplaanid"
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Minu sisestused"
 
 #. module: account
 #: report:account.overdue:0
@@ -1685,17 +1704,17 @@ msgstr "Kliendi viide:"
 #: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "Kasutajal %s ei ole õigusi et siseneda %s arveraamatusse !"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Need perioodid võivad kattuda"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "Mustandteatis"
 
 #. module: account
 #: view:account.tax:0
@@ -1706,12 +1725,12 @@ msgstr ""
 #: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "Sa ei saa deaktiveerida kontot mis sisaldab konto liikumisi."
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Kreedidi kogus"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1734,7 +1753,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Vale kreedit või deebeti raamatupidamise sisend !"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1746,7 +1765,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "Periood suletud"
 
 #. module: account
 #: view:account.installer:0
@@ -1756,18 +1775,18 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "SIsestused ridade kaupa"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "A/c kood"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Päevaraamatu kanne"
 
 #. module: account
 #: view:account.tax:0
@@ -1777,7 +1796,7 @@ msgstr ""
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Vahesumma"
 
 #. module: account
 #: view:account.account:0
@@ -1787,7 +1806,7 @@ msgstr ""
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Viga! Sa ei saa luua rekursiivseid ettevõtteid."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1810,12 +1829,12 @@ msgstr "Kehtiv"
 #: 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 "Prindi konto arveraamat"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Toote kategooria"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1825,7 +1844,7 @@ msgstr "/"
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "Reservi & kasumi/kahjumi konto"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
@@ -1876,12 +1895,12 @@ msgstr ""
 #: field:account.installer.modules,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Pilt"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "Tühistatud"
 
 #. module: account
 #: view:account.invoice:0
@@ -2009,7 +2028,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2073,6 +2092,8 @@ msgstr "Raamatupidamise omadused"
 #. 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2094,11 +2115,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2220,7 +2246,7 @@ msgstr ""
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "Baaskood"
+msgstr "Aluse kood"
 
 #. module: account
 #: help:account.invoice.tax,sequence:0
@@ -2233,7 +2259,7 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "Baaskoodi märk"
+msgstr "Aluse koodi märk"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2415,6 +2441,7 @@ msgstr "Allah. (%)"
 
 #. 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
@@ -2441,7 +2468,7 @@ msgstr "Makstud/võrreldud"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Tagasimakse baaskood"
+msgstr "Hüvitise aluse kood"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
@@ -2637,7 +2664,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Basskoodi summa"
+msgstr "Aluse koodi summa"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2660,6 +2687,8 @@ msgstr "Finantsraamatupidamine"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2698,6 +2727,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one."
 msgstr ""
+"Selle kuupäeva jaoks pole majandusaastat määratletud !\n"
+"Palun loo uus."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -2925,7 +2956,6 @@ msgstr "Jäta tühjaks kasutamaks kulu kontot"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2939,6 +2969,17 @@ msgstr "Jäta tühjaks kasutamaks kulu kontot"
 #: 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 "Päevikud"
 
@@ -2987,7 +3028,7 @@ msgstr "Algbilanss"
 #: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
-msgstr ""
+msgstr "Partner ei ole määratud !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
@@ -3081,7 +3122,7 @@ msgstr ""
 #: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr ""
+msgstr "Ei saa kustutada arvet/arveid, mis on juba avatud või makstud !"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -3148,6 +3189,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3206,6 +3248,16 @@ msgstr "KM :"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontoplaan"
 
@@ -3285,7 +3337,7 @@ msgstr ""
 #: code:addons/account/wizard/account_fiscalyear_close.py:79
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr ""
+msgstr "Päevik peab sisaldama vaikimisi kreedit ja deebet kontosid"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3644,11 +3696,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -3983,7 +4034,7 @@ msgstr ""
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Kviitungi nr."
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4058,7 +4109,7 @@ msgstr "Muuda"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Kasutaja Viga"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
@@ -4243,7 +4294,7 @@ msgstr ""
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr ""
+msgstr "Kasuta mudelit"
 
 #. module: account
 #: view:account.state.open:0
@@ -4323,7 +4374,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4355,7 +4406,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Viga"
 
 #. module: account
 #: field:account.analytic.Journal.report,date2:0
@@ -4462,7 +4513,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4475,10 +4525,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4488,6 +4536,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4604,6 +4662,8 @@ msgstr "Võrdluse tulemus"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4635,7 +4695,7 @@ msgstr "Mõõtühik"
 #: code:addons/account/wizard/account_invoice_refund.py:138
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr ""
+msgstr "Arvel ei leitud perioodi!"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4824,7 +4884,7 @@ msgstr "Analüütiline raamatupidamine"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Kliendi tagasimakse"
+msgstr "Kliendi hüvitis"
 
 #. module: account
 #: view:account.account:0
@@ -5248,7 +5308,7 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Sunni periood"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5308,6 +5368,19 @@ msgstr ""
 
 #. 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 "Filter puudub"
@@ -5327,7 +5400,7 @@ msgstr "7"
 #: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Vigane toiming!"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
@@ -5705,7 +5778,7 @@ msgstr "Hind"
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Vaata konto analüütilisi ridasid"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -5820,7 +5893,7 @@ msgstr ""
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "Tarnija tagasimakse"
+msgstr "Tarnija hüvitis"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
@@ -5835,7 +5908,7 @@ msgstr "Kirje read"
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "Tsentraliseerimine"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -5867,7 +5940,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "Ainult loetav"
 
 #. module: account
 #: model:ir.model,name:account.model_account_pl_report
@@ -5877,7 +5950,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Mõõtühik"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -5900,7 +5973,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analüütiline päevik"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5916,7 +5989,7 @@ msgstr "Baas"
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr ""
+msgstr "Mudeli nimetus"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -6216,6 +6289,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6445,7 +6519,7 @@ msgstr "Analüütilised read"
 #: 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 "
+"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) "
@@ -6498,7 +6572,7 @@ msgstr "Ülemkonto mall"
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr ""
+msgstr "Teatis"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
@@ -6594,7 +6668,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Pangabilansi rida"
+msgstr "Pangateatise rida"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
@@ -6825,7 +6899,7 @@ msgstr ""
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
-msgstr ""
+msgstr "Müügipäevik"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
@@ -7119,6 +7193,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7338,7 +7413,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -7371,6 +7446,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periood"
@@ -7453,14 +7541,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Ettevõtte valuuta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7652,12 @@ msgstr "Hüvitiste päevik"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7613,7 +7699,7 @@ msgstr "Maksetingimuste Rida"
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
-msgstr ""
+msgstr "Ostupäevik"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -7809,6 +7895,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -7966,7 +8053,7 @@ msgstr "Kirje read"
 #: 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 "Ava päevik"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -7978,7 +8065,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Periood alates"
 
 #. module: account
 #: code:addons/account/account.py:2817
@@ -8023,13 +8110,13 @@ msgstr ""
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr ""
+msgstr "Analüütiline"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Loo arve"
 
 #. module: account
 #: field:account.installer,purchase_tax:0
@@ -8045,7 +8132,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Lugupeetud Härra/Proua,"
 
 #. module: account
 #: view:account.installer.modules:0
@@ -8090,12 +8177,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8108,12 +8200,12 @@ msgstr ""
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Analüüsi suund"
 
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr ""
+msgstr "Ettevõtted, mis viidavad partnerile"
 
 #. module: account
 #: view:account.journal:0
@@ -8147,7 +8239,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr ""
+msgstr "Parimate soovidega."
 
 #. module: account
 #: view:account.invoice:0
@@ -8213,7 +8305,12 @@ msgstr "Hoia tühjana, et kasutada tulude kontot"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,13 +8329,22 @@ 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 ""
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
@@ -8280,7 +8386,7 @@ msgstr ""
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr ""
+msgstr "Legend"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -8366,7 +8472,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "Pangabilansid"
+msgstr "Pangateatised"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -8429,7 +8535,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontoplaan"
 
 #. module: account
@@ -8446,12 +8552,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8582,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8763,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8845,18 @@ msgstr "Üldine"
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9066,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9093,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9079,7 +9200,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr ""
+msgstr "Mustandteatised"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -9180,6 +9301,7 @@ msgstr "Tarnija arve"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9375,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Liikumistega"
 
@@ -9348,7 +9480,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Maksta jäänud summa."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
@@ -9422,7 +9554,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Tagasimakse"
+msgstr "Hüvitis"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -9595,7 +9727,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
-msgstr ""
+msgstr "Sa pea sisestama perioodi pikkuse, mis ei või olla 0 või väiksem."
 
 #. module: account
 #: code:addons/account/account.py:501
@@ -9622,24 +9754,58 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Jäta tühjaks kasutamaks perioodi kinnitamise kuupäeva."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
+#~ msgid "Subscription Periods"
+#~ msgstr "Tellimusperioodid"
 
 #~ msgid "Generate entries before:"
 #~ msgstr "Genereerida kirjed enne:"
 
+#~ msgid "Third party"
+#~ msgstr "Kolmas pool"
+
 #~ msgid "Analytic Journal Report"
 #~ msgstr "Analüütilise päeviku raport"
 
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "Teie päevik peab sisaldama vaikimisi kreedit ja deebet kontosid."
+
 #~ msgid "x Checks Journal"
 #~ msgstr "x Tšekkide päevik"
 
+#~ msgid "Select Period and Journal for Validation"
+#~ msgstr "Valige periood ja päevik valideerimiseks"
+
+#~ msgid "1cm 27.7cm 20cm 27.7cm"
+#~ msgstr "1cm 27,7cm 20cm 27,7cm"
+
+#~ msgid "Analytic Journal -"
+#~ msgstr "Analüütiline päevik -"
+
 #~ msgid "Reconcile Paid"
 #~ msgstr "Kooskõlasta makstud"
 
 #~ msgid "Close states"
 #~ msgstr "Suletud seisud"
 
+#~ msgid "Account to reconcile"
+#~ msgstr "Konto kooskõlastavaks võrdlemiseks"
+
+#~ msgid "Open for reconciliation"
+#~ msgstr "Avatud kooskõlastavaks võrdlemiseks"
+
 #~ msgid "Entries Encoding"
 #~ msgstr "Kirjete kodeering"
 
@@ -9676,9 +9842,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Kokku kirjeid"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Allahindl. (%)"
-
 #~ msgid "Printing Date"
 #~ msgstr "Printimise kuupäev"
 
@@ -9808,18 +9971,12 @@ msgstr ""
 #~ msgid "Other"
 #~ msgstr "Muu"
 
-#~ msgid "Import from your bank statements"
-#~ msgstr "Impodi oma pangabilanssidest"
-
 #~ msgid "Select entries"
 #~ msgstr "Vali kirjed"
 
 #~ msgid "Cash Payment"
 #~ msgstr "Kassamakse"
 
-#~ msgid "Date/Period Filter"
-#~ msgstr "Kuupäev/Periood filter"
-
 #~ msgid "Search Entries"
 #~ msgstr "Otsi kirjeid"
 
@@ -9834,15 +9991,9 @@ msgstr ""
 #~ msgid "Payment date"
 #~ msgstr "Makse kuupäev"
 
-#~ msgid "Partner name"
-#~ msgstr "Partneri nimi"
-
 #~ msgid "Canceled Invoice"
 #~ msgstr "Tühistatud Arve"
 
-#~ msgid "Import file from your bank statement"
-#~ msgstr "Impordi fail oma pangabilansist"
-
 #~ msgid "Bank Payment"
 #~ msgstr "Pangamakse"
 
@@ -10135,13 +10286,6 @@ msgstr ""
 #~ msgid "analytic Invoice"
 #~ msgstr "Analüütiline arve"
 
-#~ msgid ""
-#~ "This account will be used to value incoming stock for the current product "
-#~ "category"
-#~ msgstr ""
-#~ "Seda kontot kasutatakse sissetuleva kauba hindamiseks kehtiva "
-#~ "tootekategooria jaoks"
-
 #~ msgid "Confirm statement from draft"
 #~ msgstr "Kinnita teatist mustandilt"
 
@@ -10170,9 +10314,6 @@ msgstr ""
 #~ msgid "Move Lines Created."
 #~ msgstr "Liiguta loodud read."
 
-#~ msgid "Entries by Statements"
-#~ msgstr "Kirjed aruannete järgi"
-
 #~ msgid "Grand total"
 #~ msgstr "Kogusumma"
 
@@ -10233,12 +10374,37 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Mine"
 
+#~ msgid "Entries by Statements"
+#~ msgstr "Kirjed teatiste järgi"
+
 #~ msgid "New Statement"
 #~ msgstr "Uus teatis"
 
+#~ msgid "Import invoice from statement"
+#~ msgstr "Impordi arve teatisest"
+
+#~ msgid "Import file from your bank statement"
+#~ msgstr "Impordi fail oma pangateatisest"
+
+#~ msgid "Import from your bank statements"
+#~ msgstr "Impordi oma pangateatistest"
+
+#~ msgid "By date"
+#~ msgstr "Kuupäeva järgi"
+
+#~ msgid "Date/Period Filter"
+#~ msgstr "Kuupäeva/Perioodi filter"
+
 #~ msgid "Validate Account Entries"
 #~ msgstr "Kinnita kontokirjed"
 
+#~ msgid ""
+#~ "This account will be used to value incoming stock for the current product "
+#~ "category"
+#~ msgstr ""
+#~ "Seda kontot kasutatakse sissetuleva kauba hindamiseks käesoleva "
+#~ "tootekategooria jaoks"
+
 #, python-format
 #~ msgid "No analytic journal !"
 #~ msgstr "Puudub analüütiline päevik !"
@@ -10259,9 +10425,6 @@ msgstr ""
 #~ msgid "Confirm statement with/without reconciliation from draft statement"
 #~ msgstr "Kinnita avaldus koos/ilma alates leppimise avalduse esitamisest"
 
-#~ msgid "Sign for parent"
-#~ msgstr "Logi vanemana"
-
 #~ msgid "Message"
 #~ msgstr "Sõnum"
 
@@ -10271,53 +10434,20 @@ msgstr ""
 #~ msgid "Create subscription entries"
 #~ msgstr "Koosta tellimus sissekanded"
 
-#~ msgid "All account entries"
-#~ msgstr "Kõik kontokirjed"
+#~ msgid "Sign for parent"
+#~ msgstr "Märk ülema suhtes"
 
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Konto aruandlus - Aruandlus"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Moodul, mis lisab uusi aruandeid konto mooduli põhjal."
-
-#~ msgid "Customize Report"
-#~ msgstr "Kohanda aruannet"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Sa võid valida maksimaalselt  3 aastat. Palun märgista uuesti."
+#, python-format
+#~ msgid "The statement balance is incorrect !\n"
+#~ msgstr "Teatise bilanss on vale!\n"
 
+#, python-format
 #~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
+#~ "No period defined for this date !\n"
+#~ "Please create a fiscal year."
 #~ msgstr ""
-#~ "Võimalik, et Teie tegite järgmised vead. Palun parandage need ja proovige "
-#~ "uuesti."
+#~ "Selle kuupäeva jaoks pole perioodi määratletud !\n"
+#~ "Palun loo majandusaasta."
 
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Jätke tühjaks, et võrrelda selle vanemaga"
-
-#~ msgid "Creation Date"
-#~ msgstr "Loomise kuupäev"
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Te peate valima vähemalt ühe finantsaasta. Proovige uuesti."
-
-#~ msgid "Don't Compare"
-#~ msgstr "Ära võrdle"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Näita kontosid"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Teie valisite rohkem kui kolm aastat igal juhul"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Näita võrdlus protsentides %"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Konto bilanss - võrdle aastaid"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Valige võrdluskonto (% võrdluseks)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Vali finantsaasta(d) (maksimum kolm aastat)"
+#~ msgid "Open State"
+#~ msgstr "Lahtine olek"
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index f3e173a72ff..5d987ab7c17 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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ msgstr "Desk. (%)"
 
 #. 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr "Emaitzen adiskidetza"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Aktiboa"
 
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index e76b46a5459..7188834f961 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: 2011-04-29 05:09+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "دارائي"
 
@@ -9630,6 +9762,3 @@ msgstr ""
 
 #~ msgid "OK"
 #~ msgstr "تایید"
-
-#~ msgid "Disc. (%)"
-#~ msgstr "تخفيف(%)"
diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po
index 0b5b5c5e39c..b12f34cf088 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9621,3 +9741,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index ab8edb3fc8d..e8edcc40bee 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.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:14+0000\n"
-"PO-Revision-Date: 2011-01-18 09:18+0000\n"
-"Last-Translator: Pekka Pylvänäinen <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Järjestelmämaksu"
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Muut määritykset"
 
 #. 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 ""
+msgstr "Vuodenloppu päiväkirjaa ei ole määritelty kirjanpitovuodelle"
 
 #. module: account
 #: code:addons/account/account.py:506
@@ -40,16 +40,18 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+"Et voi poistaa/poistaa käytöstä tiliä joka on asetettu jonkin kumppanin "
+"omaisuudeksi."
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Päiväkirjavientien täsmäytys"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Kuponkien hallinta"
 
 #. module: account
 #: view:account.account:0
@@ -69,7 +71,7 @@ msgstr "Jäännös"
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Ole hyvä ja määrittele järjestys laskupäiväkirjalla"
 
 #. module: account
 #: constraint:account.period:0
@@ -79,17 +81,17 @@ msgstr "Virhe! Jakson / jaksojen pituus on virheellinen. "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Tilin valuutta"
 
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Alatason määrittelyt"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Ikääntyneet saatavat tähän päivään asti"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
@@ -102,11 +104,13 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Voitto/tappio raportti antaa sinulle yleiskuvan yrityksen voitoista ja "
+"tappioista yhdellä dokumentilla"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Tuo laskulta tai maksulta"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -124,6 +128,9 @@ 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 ""
+"Jos poistat täsmäytyksen tapahtumilta, sinun pitää myös tarkistaa kaikki "
+"toiminnot jotka on linkitetty näihin tapahtumiin, koska niitä ei oteta pois "
+"käytöstä"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -173,6 +180,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Jos aktiivinen kenttä on tilassa epätosi (false), voit piilottaa maksun "
+"poistamatta sitä."
 
 #. module: account
 #: code:addons/account/invoice.py:1421
@@ -205,7 +214,7 @@ msgstr "Negatiivinen"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr ""
+msgstr "Päiväkirja: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -214,6 +223,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Antaa analyyttisen päiväkirjan tyypin. Kun tarvitaan dokumentissa "
+"(esim.lasku) analyyttisiä tilejä, OpenERP etsii vastaavaa samantyyppistä "
+"päiväkirjaa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -239,7 +251,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Siirtorivin täsmäytyksen valinta"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -267,12 +279,12 @@ msgstr "Lasku '%s' on osittain maksettu: %s%s määrästä %s%s (%s%s jäljellä
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr ""
+msgstr "Kirjanpitoviennit ovat syötteenä täsmäytykselle"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr ""
+msgstr "Belgialaiset raportit"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1176
@@ -283,14 +295,14 @@ msgstr "Et voi muokata merkintöjä suljetussa päiväkirjassa."
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr ""
+msgstr "Laskettu saldo"
 
 #. 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 ""
+msgstr "Käsin toistettava"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -300,7 +312,7 @@ msgstr "Sulje kirjanpitovuosi"
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "Salli hylkäykset"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -316,7 +328,7 @@ msgstr "St."
 #: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr ""
+msgstr "Laskurivin tilin yritys ei täsmää laskun yritykseen"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -343,7 +355,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Poista tilin täsmäytys"
 
 #. module: account
 #: view:product.product:0
@@ -355,7 +367,7 @@ msgstr "Ostojen ominaisuudet"
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -393,12 +405,12 @@ msgstr "Luomispäivämäärä"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Oston hyvitys"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Avaus/sulkeimistilanne"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -416,6 +428,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Kenttä sisältää tietoja päiväkirjan vientien numeroinnista tässä "
+"päiväkirjassa."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -435,7 +449,7 @@ msgstr "Positiivinen"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "Avaa täsmäytyksen peruuttamista varten"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
@@ -488,8 +502,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -503,17 +515,17 @@ msgstr "Päiväkirja"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "Vahvista vlitut laskut"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Ylätason kohde"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Tiliä käytetty tässä päiväkirjassa"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -542,7 +554,7 @@ msgstr "Ostoverot"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Laskun hyvitys"
 
 #. module: account
 #: report:account.overdue:0
@@ -558,7 +570,7 @@ msgstr "Suorittamattomat tapahtumat"
 #: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "Kassan saldo ei täsmää laskettuun saldoon !"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -576,7 +588,7 @@ msgstr "Sulje tilikausi"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "Kirjanpitäjä vahvistaa tiliotteen."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -592,12 +604,12 @@ msgstr "Kaikki"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "Laskuosoitteen nimi"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "neljännesvuosittainen"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -611,7 +623,7 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 päivää   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -626,12 +638,12 @@ msgstr "Verokartoitus"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "Keskitetty päiväkirja"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "Pääjärjestyksen tulee olla eri nykyiseen nähden!"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -648,7 +660,7 @@ msgstr "SAJ"
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
 msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "Loppusaldo jonka on syöttänyt kassantarkistaja"
 
 #. module: account
 #: view:account.period:0
@@ -659,7 +671,7 @@ msgstr "Sulje jakso"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Tilin yhteiskumppanien raportti"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -669,7 +681,7 @@ msgstr "Avaa kohteiden jaksoa"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "Päiväkirjan jakso"
 
 #. module: account
 #: code:addons/account/account_move_line.py:732
@@ -677,6 +689,7 @@ msgstr ""
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
+"Täsmäyttääksesi viennit yrityksen tulisi olla sama kaikille vienneille"
 
 #. module: account
 #: view:account.account:0
@@ -708,12 +721,12 @@ msgstr "Oletko varma että haluat luoda merkinnät?"
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Šekki"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Tänään täsmäytetyt kumppanit"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -731,13 +744,13 @@ msgstr "Tilikartat"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr ""
+msgstr "Analyyttiset viennit riveittäin"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "Voit vaihtaa valuutan vain luonnostilassa olevalle laskulle"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -774,17 +787,17 @@ msgstr "Suoritusten poisto"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Analyyttisten tilien päiväkirja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Automaattitäsmäytys"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr ""
+msgstr "Eräpäivän laskenta"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -809,7 +822,7 @@ msgstr "päivät"
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "Jos valittu, uuti tilikirja ei sisälltä tätä oletusarvoisesti."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -818,6 +831,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Ei voi %s laskua joka on jo täsmäytetty. Laskun täsmäytys pitää ensin "
+"purkaa. Voit vain hyvittää tämän laskun"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -832,7 +847,7 @@ msgstr "Laskenta"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "Seuraava täsmäytettävä kumppani"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1191
@@ -848,7 +863,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Keskimääräinen maksuviive"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -871,7 +886,7 @@ msgstr "kuluessa"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Summa sisältäen veron"
 
 #. module: account
 #: view:account.invoice:0
@@ -879,14 +894,14 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Kokonaismäärä"
 
 #. module: account
 #: selection:account.account,type:0
@@ -901,22 +916,22 @@ msgstr "Yhdistetty"
 #: view:account.invoice.report:0
 #: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Keskuspäiväkirja"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Myynnin hyvitys"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Pankin tiliote"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -934,7 +949,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Ostot"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -981,18 +996,18 @@ msgstr "Kumppanin saldo"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "Tilin nimi."
 
 #. 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 ""
+msgstr "Varaus ja voitto/tappio tili"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Vuoden viikko"
 
 #. module: account
 #: field:account.bs.report,display_type:0
@@ -1004,12 +1019,12 @@ msgstr "Maisematila"
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "Hyväksyttävät asiakaslaskut"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Valitse suljettava kirjanpitovuosi"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1022,7 +1037,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Voimassaolosäännöt"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1033,12 +1048,12 @@ msgstr "Väittelyssä"
 #: 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 ""
+msgstr "Kassakoneet"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Expense Accounts)"
-msgstr ""
+msgstr "Voitto ja tappio (kulutilit)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1051,17 +1066,17 @@ msgstr "-"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Päällikkö"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "Luo viennit ennen:"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Bank"
-msgstr ""
+msgstr "Pankki"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -1071,7 +1086,7 @@ msgstr "Jakson alku"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Vahvista tiliote"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1096,7 +1111,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Peruuta laskut"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -1128,6 +1143,7 @@ msgstr "Liiketoimen nro"
 
 #. 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
@@ -1183,19 +1199,19 @@ msgstr "Tili"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Sisältyy perusmäärään"
 
 #. 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 ""
+msgstr "Vientien analyysi"
 
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "taso"
 
 #. module: account
 #: report:account.invoice:0
@@ -1216,7 +1232,7 @@ msgstr "Verot"
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Valitse alku ja loppujakso"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1226,7 +1242,7 @@ msgstr "Tilimallit"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Hae veropohja"
 
 #. module: account
 #: report:account.invoice:0
@@ -1250,12 +1266,12 @@ msgstr "Erääntyneet maksut"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Alkusaldo"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Palauta luonnokseksi"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1266,18 +1282,18 @@ msgstr "Pankkitiedot"
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr ""
+msgstr "Raporttivalinnat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "päiväkirjamerkintöjen analyysi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "Kumppanit"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1316,13 +1332,23 @@ msgstr "Et voi käyttää tätä yleistiliä tässä päiväkirjassa!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Saldo ei ole tasan 0"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Hae veroja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1337,7 +1363,7 @@ msgstr "Luo tapahtumat"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "tapahtumien määrä"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1357,13 +1383,13 @@ msgstr "Desimaalien määrä"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Ohita 'luonnos' tila käsinsyötetyissä vienneissä"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Summa ilman veroa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1377,7 +1403,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "Vientien määrä "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1394,7 +1420,7 @@ msgstr "Toimittajan hyvitykset"
 #: view:account.payment.term.line:0
 msgid ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
-msgstr ""
+msgstr "Esim. 14 päivää -2 %, lopput 30 pv kuukaudenlopusta"
 
 #. module: account
 #: code:addons/account/invoice.py:815
@@ -1424,7 +1450,7 @@ msgstr "Suljettu"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Toistuvat viennit"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1434,7 +1460,7 @@ msgstr "Malli talouskannalle"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "Verokoodien testaus"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1470,12 +1496,12 @@ msgstr "Veroton"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Siirry seuraavaan kumppaniin"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Hae pankkitiliotteita"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -1515,7 +1541,7 @@ msgstr ""
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Päivä/koodi"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1543,12 +1569,12 @@ msgstr "Lasku"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Analyyttisiä kuluja laskutettavaksi"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Kirjanpitovuoden järjestys"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1559,7 +1585,7 @@ msgstr "Erotellut päiväkirjan sarjat"
 #: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: account
 #: report:account.overdue:0
@@ -1569,7 +1595,7 @@ msgstr "Välisumma:"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Myynti tilityypeittäin"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1577,11 +1603,13 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Peruuta lasku. Luo hyvityslaskun, tarkista ja täsmäytä se peruuttaaksesi "
+"nykyisen laskun"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -1607,7 +1635,7 @@ msgstr ""
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Tämän velhon avulla voit vaihtaa laskun valuuttaa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1620,18 +1648,18 @@ msgstr ""
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Virhe! Et voi määritellä päällekkäisiä kirjanpitovuosia"
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Tiliä ei ole määritelty täsmäytettäväksi !"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Arvot"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1669,7 +1697,7 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Kaikki kumppanit"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1684,7 +1712,7 @@ msgstr "Analyyttisen kirjanpidon kartat"
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Omat viennit"
 
 #. module: account
 #: report:account.overdue:0
@@ -1695,7 +1723,7 @@ msgstr "Asiakkaan Viite:"
 #: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "Käyttäjällä %s ei ole oikeuksia päiväkirjaan %s !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1716,7 +1744,7 @@ msgstr ""
 #: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "Et voi poistaa käytöstä tiliä jolla on tilisiirtoja"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -1726,7 +1754,7 @@ msgstr "Luotonmäärä"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä suljetulle tilille."
 
 #. module: account
 #: code:addons/account/account.py:519
@@ -1735,6 +1763,7 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains account entries!"
 msgstr ""
+"Et voi vaihtaa tilin tyyppiä 'suljettu' miksikään joka sisältää tilivientejä!"
 
 #. module: account
 #: view:res.company:0
@@ -1744,60 +1773,60 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Väärä kredit tai debet arvo tiliviennissä"
 
 #. 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 ""
+msgstr "Laskuanalyysi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "Sulje jakso"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Määrittele kirjanpitovuosi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Viennit riveittäin"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "tilikoodi"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Päiväkirjavienti"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Veroilmoitus: laskut"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Välisumma"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Omaisuuden analyysi"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1820,12 +1849,12 @@ msgstr "Voimassa"
 #: 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 "Tulosta tilitapahtumat"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Tuotteen kategoria"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1846,7 +1875,7 @@ 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 "Vertailu kirjanpito ja maksutapahtumien välillä"
 
 #. module: account
 #: view:account.tax:0
@@ -1869,7 +1898,7 @@ msgstr ""
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr ""
+msgstr "Lisää valuuttasarakkeen, jos valuutta on eri kuin yrityksen valuutta"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1877,18 +1906,20 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Jos asetetaan arvoon tosi (true) ei jakson ulkopuolisia päivämääriä "
+"hyväksytä vientien päivämääriksi."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "Voitto ja tappio tili"
 
 #. 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 ""
+msgstr "kuva"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1899,7 +1930,7 @@ msgstr ""
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Veroton summa"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1907,6 +1938,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Jos aktiivisen kentän arvoksi asetetaan epätosi (false), voit piilottaa "
+"veron poistamatta sitä"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1942,7 +1975,7 @@ msgstr "Avoimet merkinnät"
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Täsmäytettävät tilit"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -1952,7 +1985,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Tuo laskulta"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1961,22 +1994,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Tarkistukset"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Kuluva kirjanpitovuosi"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Tilin verokartta"
 
 #. module: account
 #: constraint:account.period:0
@@ -1999,7 +2032,7 @@ msgstr "Proforma"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " päiväkirja"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -2023,7 +2056,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2087,32 +2120,39 @@ msgstr "Kirjanpidon ominaisuudet"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Merkintöjen järjestelyn peruste"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Vaihda"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "Tuotteiden määrä "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Tuotteen malli"
 
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2201,7 +2241,7 @@ msgstr "Avoin"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Laskun luonnostila"
 
 #. module: account
 #: help:account.account,reconcile:0
@@ -2271,7 +2311,7 @@ msgstr "Debettien keskitys"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Vahvista luonnoslaskut"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2280,12 +2320,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Uudistettavat tilit"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2326,7 +2366,7 @@ msgstr "Valitse jakso"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Tiliotteet"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2349,7 +2389,7 @@ msgstr ""
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Virhe ! Et voi luoda rekursiivisia luokkia."
 
 #. module: account
 #: report:account.invoice:0
@@ -2378,19 +2418,19 @@ msgstr "Analyyttinen tili"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Tilit"
 
 #. module: account
 #: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfiguraatio virhe!"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Keskimääräinen hinta"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2409,12 +2449,12 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Otsikko"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Kirjanpitotiedot"
 
 #. module: account
 #: view:account.tax:0
@@ -2431,10 +2471,11 @@ msgstr "Pankkitapahtumien suoritusmerkinnät"
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Alennus (%)"
 
 #. 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
@@ -2450,7 +2491,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Automaattinen täsmäytys"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2468,7 +2509,7 @@ msgstr "Hyvityksen peruskoodi"
 #: 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 "Pankin tiliotteet"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2481,7 +2522,7 @@ msgstr "Tosi"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-msgstr ""
+msgstr "Päivämäärät"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2507,7 +2548,7 @@ msgstr "Tase kumppanien erääntyvistä"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Tiliviennit"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2528,19 +2569,19 @@ 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 ""
+msgstr "Uuden yrityksen taloudelliset asetukset"
 
 #. 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 ""
+msgstr "Myynnit tileittäin"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Velho luo toistuvat kirjanpitoviennit"
 
 #. module: account
 #: code:addons/account/account.py:1181
@@ -2569,7 +2610,7 @@ msgstr "Varokoodit"
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Asiakkaat"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -2585,7 +2626,7 @@ msgstr "Kausi"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:306
@@ -2617,7 +2658,7 @@ msgstr "Viitenumero"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2629,7 +2670,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "Rivi 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
@@ -2662,7 +2703,7 @@ msgstr "Peruskoodin määrä"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Oletus myyntivero"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2680,8 +2721,10 @@ msgstr "Taloudellinen kirjanpito"
 #. 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
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Voitto ja tappio"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2746,12 +2789,12 @@ msgstr "Päiväkirjasta vastaava käyttäjä"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Hae Jaksoa"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Laskutusvaluutta"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2761,7 +2804,7 @@ msgstr "Termit"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "Käteistapahtuma"
 
 #. module: account
 #: view:res.partner:0
@@ -2801,17 +2844,17 @@ msgstr "Rivinimi"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Hae kirjanpitovuosi"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "Aina"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "Kokonaismäärä"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -2873,7 +2916,7 @@ msgstr "Verokoodimalli"
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "Alkaa"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -2896,6 +2939,8 @@ msgstr "Veron kuvaus"
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
+"Pakottaa kaikki tälle tilille kohdistuvat siirrot käyttämään toissijaista "
+"valuuttaa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2954,7 +2999,6 @@ msgstr "Jätä tyhjäksi jos haluat käyttää kulutiliä"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2968,13 +3012,24 @@ msgstr "Jätä tyhjäksi jos haluat käyttää kulutiliä"
 #: 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 "Päiväkirjat"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "Jäljelläolevat kumppanit"
 
 #. module: account
 #: view:account.subscription:0
@@ -2999,13 +3054,13 @@ msgstr "Osto"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Kirjanpitoohjelmiston konfiguraatio"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Kirjanpidon työpöytä"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3028,7 +3083,7 @@ msgstr "Sulje jakso"
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr ""
+msgstr "Tyhjennä tilit? "
 
 #. module: account
 #: report:account.overdue:0
@@ -3065,7 +3120,7 @@ msgstr "Luonnos"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "Tilikirjan konfiguraatio"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3077,7 +3132,7 @@ msgstr "lasku ei ole tulostettavissa"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "Verotaulukko"
 
 #. module: account
 #: view:account.journal:0
@@ -3087,7 +3142,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Odottava lasku"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -3115,7 +3170,7 @@ msgstr "Laskua(laskuja) jotka ovat avatuja tai maksettuja ei voida poistaa"
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Total :"
-msgstr ""
+msgstr "Yhteensä:"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3140,12 +3195,12 @@ msgstr "Verotili"
 #. module: account
 #: view:account.installer:0
 msgid "Your bank and cash accounts"
-msgstr ""
+msgstr "Pankki ja käteistilisi"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "Hae siirtoa"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3177,24 +3232,25 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Vastapuoli"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Laskutustiedot"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Laskun tila"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Tuotteen Luokka"
 
 #. module: account
 #: view:account.move:0
@@ -3208,12 +3264,12 @@ msgstr ""
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Luo tili"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Myyntiraportti tilityypeittäin"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3223,7 +3279,7 @@ msgstr "Yksityiskohdat"
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "Pankki ja käteistilisi"
 
 #. module: account
 #: report:account.invoice:0
@@ -3235,13 +3291,23 @@ msgstr "ALV:"
 #: 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.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 "Chart of Accounts"
 msgstr "Tilikartat"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "(jos et valitse jaksoa, käytetään kaikkia avoimia jaksoja)"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3352,7 +3418,7 @@ msgstr "Tilivero"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Budjetit"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3371,7 +3437,7 @@ msgstr ""
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr ""
+msgstr "Ei suotimia"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3381,7 +3447,7 @@ msgstr "Tilanne"
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3402,12 +3468,12 @@ msgstr "Soveltuva koodi (jos tyyppi=koodi)"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Määrä"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Kontaktiosoitteen nimi"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -3417,7 +3483,7 @@ msgstr "Oikeudenkäynti"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Hae analyyttisiä rivejä"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -3467,14 +3533,14 @@ msgstr "Veroa ei voida muuttaa!"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "Vientien määrä"
 
 #. module: account
 #: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "Valitsit mittayksikön joka ei ole yhteensopiva tuotteen kanssa."
 
 #. module: account
 #: code:addons/account/invoice.py:473
@@ -3498,7 +3564,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "Mäppäys"
 
 #. module: account
 #: field:account.account,name:0
@@ -3557,7 +3623,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Yleiskirjanpito"
 
 #. module: account
 #: report:account.overdue:0
@@ -3578,7 +3644,7 @@ msgstr ""
 #: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: account
 #: view:account.invoice:0
@@ -3590,12 +3656,12 @@ msgstr "Aseta luonnokseksi"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Toistuvat rivit"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Näytä kumppanit"
 
 #. module: account
 #: view:account.invoice:0
@@ -3618,7 +3684,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Vahvista laskut"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3648,7 +3714,7 @@ msgstr "(Laskun suoritusmerkinnät tulisi poistaa jos se halutaan avata)"
 #: field:account.report.general.ledger,period_from:0
 #: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "Jakson aloitus"
 
 #. module: account
 #: field:account.tax,name:0
@@ -3676,13 +3742,12 @@ msgid "Analytic Balance"
 msgstr "Analyyttinen saldo"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
-msgstr ""
+msgstr "Nettotappio"
 
 #. module: account
 #: help:account.account,active:0
@@ -3694,12 +3759,12 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Hae veropohjia"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Viennit luonnostilassa"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3733,7 +3798,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Peruuta valitut laskut"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3758,13 +3823,13 @@ msgstr ""
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "Sulje kassakone"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Keskimääräinen maksun myöhästymä"
 
 #. module: account
 #: view:account.entries.report:0
@@ -3791,7 +3856,7 @@ msgstr "Kuukausi"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Viitemittayksikkö"
 
 #. module: account
 #: field:account.account,note:0
@@ -3834,7 +3899,7 @@ msgstr ""
 #: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Tälle tuotteelle ei ole määritetty kulutiliä: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
@@ -3879,27 +3944,27 @@ msgstr ""
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Virhe! Kirjanpitovuoden kesto on virheellinen. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Kuukausiväli"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Valitse jos haluat näyttää myös 0 saldolla olevat tilit"
 
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "Laske koodi"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Oletusverot"
 
 #. module: account
 #: code:addons/account/invoice.py:88
@@ -3922,7 +3987,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "Näytön tila"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -3937,7 +4002,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "Tilikartta"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -3949,17 +4014,17 @@ msgstr "Tilin nimi"
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr ""
+msgstr "Anna nimi uusille viennille"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "laskutilastot"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Pankin tiliotteet syötetään järjestelmään."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
@@ -3976,19 +4041,19 @@ msgstr "Eräpäivä"
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Käyttäjätilit tyypin mukaan"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Loppusaldo"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "ei toteutettu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -3998,7 +4063,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Tulosta lasku"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4025,7 +4090,7 @@ msgstr ""
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Pura tapahtumien täsmäytys"
 
 #. module: account
 #: view:account.use.model:0
@@ -4066,7 +4131,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Toistuvat mallit"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4127,7 +4192,7 @@ msgstr "Peruttu"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Loppusaldo kassakoneessa"
 
 #. module: account
 #: constraint:account.account:0
@@ -4147,12 +4212,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Luo viennit"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Valitse verokartta"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4173,12 +4238,12 @@ msgstr "Asiakas"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Peruutettu lasku"
 
 #. module: account
 #: code:addons/account/invoice.py:73
@@ -4221,7 +4286,7 @@ msgstr "Tilin saldo -"
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -4267,12 +4332,12 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Myyjä"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Laskutettu"
 
 #. module: account
 #: view:account.use.model:0
@@ -4292,7 +4357,7 @@ msgstr "Veron kuvauksen lähtökohdat"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "LIsää"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4302,7 +4367,7 @@ msgstr "Jätä tyhjäksi käyttääksesi nykyistä päivämäärää"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr ""
+msgstr "Pankki ja shekit"
 
 #. module: account
 #: view:account.period.close:0
@@ -4317,7 +4382,7 @@ msgstr "Pankkisuorituksiin käytettävä pankkitiliote"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Luonnoslaskut on tarkistettu. "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4353,17 +4418,17 @@ msgstr "Verosovellus"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Päiväkirjan tapahtumat"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgid "Balance Sheet (Asset Accounts)"
+msgstr "Tase (omaisuustilit)"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Third Party (Country)"
-msgstr ""
+msgstr "Kolmas osapuoli (maa)"
 
 #. module: account
 #: code:addons/account/account.py:938
@@ -4431,7 +4496,7 @@ msgstr "Luo merkinnät tilikauden avaukselle"
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Ryhmän laskurivit"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -4453,12 +4518,12 @@ msgstr ""
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Suljetaan"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr ""
+msgstr "Tarkistuspäivä ei jaksolla"
 
 #. module: account
 #: code:addons/account/account.py:1210
@@ -4486,7 +4551,7 @@ msgstr "Alemmat verotilit"
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Alkuperiodin tulee olla aikaisempi kuin loppuperiodin"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4499,7 +4564,6 @@ msgid "Analytic Balance -"
 msgstr "Analyyttinen saldo -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4512,10 +4576,8 @@ msgstr "Analyyttinen saldo -"
 #: 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.journal.period.print: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
@@ -4525,6 +4587,16 @@ msgstr "Analyyttinen saldo -"
 #: 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
 msgid "Target Moves"
 msgstr "Kohteen liikkeet"
 
@@ -4582,17 +4654,17 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "Kassakoneen avaus"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr ""
+msgstr "Rivi 1:"
 
 #. module: account
 #: code:addons/account/account.py:1167
@@ -4624,7 +4696,7 @@ msgstr "Laskujen kuvaus"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Seuraava täsmäytettävä kumppani"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4641,13 +4713,15 @@ msgstr "Suoritusajon tulos"
 #: 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
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Tilinpäätös"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "Kirjanpitoraportit"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4660,7 +4734,7 @@ msgstr "Merkinnät"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Nykyinen jakso"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -4719,7 +4793,7 @@ msgstr "Tilikauden päättymisen merkintä"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "Tarkistus"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -4765,7 +4839,7 @@ msgstr "(Tilin/Kumppanin) Nimi"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "Transaktio"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4782,7 +4856,7 @@ msgstr "Käytä tätä koodia ALV:n esittelyyn"
 #. module: account
 #: view:account.move.line:0
 msgid "Debit/Credit"
-msgstr ""
+msgstr "Debet/kredit"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
@@ -4861,7 +4935,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Viestintä"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -4893,7 +4967,7 @@ msgstr "Verokoodin merkki"
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Laskuraportti viimeisimmän 15 päivän ajalta"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -4911,7 +4985,7 @@ msgstr "Päätösmerkintöjen päiväkirja"
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Konfiguraatio virhe !"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -4929,7 +5003,7 @@ msgstr "Ennakkomaksun rivit"
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Tuotteen määrä"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4945,7 +5019,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr ""
+msgstr "Vaihda valuuttaa"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -4956,7 +5030,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Maksun päivämäärä"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4981,7 +5055,7 @@ msgstr ""
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort By"
-msgstr ""
+msgstr "Lajittelu"
 
 #. module: account
 #: code:addons/account/account.py:1326
@@ -5088,7 +5162,7 @@ msgstr "Valuuttana"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr ""
+msgstr "Avaa kassakone"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5104,12 +5178,12 @@ msgstr "Korjattu määrä"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Voimassa asti"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "Ikääntyneet saatavat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5131,13 +5205,13 @@ msgstr ""
 #: 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 ""
+msgstr "Luo avausviennit"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
-msgstr ""
+msgstr "On jo täsmäytetty!"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5154,7 +5228,7 @@ msgstr ""
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -5201,7 +5275,7 @@ msgstr "Toimittaja"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: account
 #: view:account.account.template:0
@@ -5223,7 +5297,7 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "Arvostus"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5304,13 +5378,13 @@ msgstr "Pakota jakso"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Rivien lukumäärä"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "Uutta valuuttaa ei ole konfiguroitu kunnolla !"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5329,7 +5403,7 @@ msgstr ""
 #: field:account.report.general.ledger,filter:0
 #: field:account.vat.declaration,filter:0
 msgid "Filter by"
-msgstr ""
+msgstr "Suodata"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1131
@@ -5358,6 +5432,19 @@ msgstr ""
 
 #. 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 "Ei suodatusta"
@@ -5383,7 +5470,7 @@ msgstr "Virheellinen toiminto!"
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr ""
+msgstr "Jakso: %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -5411,7 +5498,7 @@ msgstr "Ei mikään"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 päivää  "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -5422,7 +5509,7 @@ msgstr "Asiakashyvitykset"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Määrän laskenta"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5438,12 +5525,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "ei toteutettu"
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Päiväkirjaan liittyvä yritys"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5456,7 +5543,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Tilikausiposition huomautus :"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -5493,7 +5580,7 @@ msgstr ""
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -5534,12 +5621,12 @@ msgstr "Juuritili"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Viimeisin täsmäytyspäivä"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analyyttinen rivi"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -5549,18 +5636,18 @@ msgstr "Asiakasverot"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Luo tili tämän mallin pohjalta"
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Raportoinnin konfiguraatio"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Yrityksen tulee olla sama liittyvälle tilille ja jaksolle."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5582,7 +5669,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Yritykset"
 
 #. module: account
 #: code:addons/account/account.py:532
@@ -5595,7 +5682,7 @@ msgstr ""
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Valitse suljettava kirjanpitovuosi"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -5635,7 +5722,7 @@ msgstr "Tilikausi"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr ""
+msgstr "Vientien osittainen täsmäytys"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5705,37 +5792,37 @@ msgstr "Oletus luottotili"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Konfiguroi tilikartta"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 30"
-msgstr ""
+msgstr "  päivien määrä: 30"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Liittyvän tilin valuutta jos ei sama kun yrityksen valuutta."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr ""
+msgstr "Kassakone"
 
 #. module: account
 #: selection:account.tax,type:0
 msgid "Percentage"
-msgstr ""
+msgstr "Prosenttiosuus"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Päiväkirja & kumppani"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -5745,7 +5832,7 @@ msgstr "Voima"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr ""
+msgstr "Hyvityksen tyyppi"
 
 #. module: account
 #: report:account.invoice:0
@@ -5778,7 +5865,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Täsmäytys: siirry seuraavaan kumppaniin"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -5813,7 +5900,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "Likviditeetti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
@@ -5832,7 +5919,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr ""
+msgstr "Pankki ja käteinen"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -5846,7 +5933,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Päiväkirjan nimen tulee olla uniikki yrityskohtaisesti !"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -5865,7 +5952,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Syötä aloituspäivä !"
 
 #. module: account
 #: report:account.invoice:0
@@ -5878,7 +5965,7 @@ msgstr "Toimittajan hyvitys"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
 msgid "Dashboard"
-msgstr ""
+msgstr "Työpöytä"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -5893,7 +5980,7 @@ msgstr "Keskitys"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Luo tilikarttasi mallipohjan perusteella"
 
 #. module: account
 #: view:account.account:0
@@ -5915,7 +6002,7 @@ msgstr ""
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -5925,7 +6012,7 @@ msgstr "Vain luku"
 #. module: account
 #: model:ir.model,name:account.model_account_pl_report
 msgid "Account Profit And Loss Report"
-msgstr ""
+msgstr "Voitto ja tappiotilin raportti"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -5958,7 +6045,7 @@ msgstr "Analyyttinen päiväkirja"
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "Täsmäytetty"
 
 #. module: account
 #: report:account.invoice:0
@@ -5979,7 +6066,7 @@ msgstr "Menoluokkatili"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Käteistapahtumat"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
@@ -6045,7 +6132,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr ""
+msgstr "Tila on luonnos"
 
 #. module: account
 #: view:account.move.line:0
@@ -6069,7 +6156,7 @@ msgstr "Faksi:"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,based_on:0
 msgid "Based On"
-msgstr ""
+msgstr "Perustuen"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6116,7 +6203,7 @@ msgstr "Luo merkintä"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: percent"
-msgstr ""
+msgstr "  arvoostus: prosenttia"
 
 #. module: account
 #: code:addons/account/account.py:499
@@ -6184,7 +6271,7 @@ msgstr ""
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "Tarkastettavaksi"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6193,7 +6280,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 "Päiväkirjatapahtumat"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -6245,6 +6332,8 @@ msgstr "Kaikki merkinnät"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa "
+"kategoriassa."
 
 #. module: account
 #: view:account.journal.select:0
@@ -6255,7 +6344,7 @@ msgstr ""
 #: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "Nykyistä valuuttaa ei ole konfiguroitu kunnolla !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6269,6 +6358,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6279,7 +6369,7 @@ msgstr "Yleinen tilikirja"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "Maksumääräys on lähetetty pankkiin"
 
 #. module: account
 #: view:account.balance.report:0
@@ -6341,7 +6431,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Tulotilit"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -6375,7 +6465,7 @@ msgstr "Arvonalennuksen määrä"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "Myynti"
 
 #. module: account
 #: view:account.journal.column:0
@@ -6411,7 +6501,7 @@ msgstr ""
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Lähdedokumentti"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -6426,7 +6516,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Täsmäyttämättömät viennit"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
@@ -6457,7 +6547,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Tuotteen mittayksikkö"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6488,7 +6578,7 @@ msgstr "Jakson pituus (päiviä)"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Kuukausittainen liikevaihto"
 
 #. module: account
 #: view:account.move:0
@@ -6500,7 +6590,7 @@ msgstr "Analyyttiset rivit"
 #: 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 "
+"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) "
@@ -6626,12 +6716,12 @@ msgstr "OK"
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Tuntematon kumppani"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Alkusaldo"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -6647,7 +6737,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr ""
+msgstr "Suljettu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
@@ -6657,12 +6747,12 @@ msgstr "Pankin tiliotteen rivi"
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Ostojen veron oletusarvo"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6710,12 +6800,12 @@ msgstr "Raportointi"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Päiväkirjan koodi tulee olla joka yrityksellä uniikki!"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr ""
+msgstr "Kassakoneen sulkeminen"
 
 #. module: account
 #: view:account.journal:0
@@ -6739,7 +6829,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr ""
+msgstr "Huomautus"
 
 #. module: account
 #: field:account.tax,domain:0
@@ -6750,7 +6840,7 @@ msgstr "Toimialue"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Käytä mallia"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -6794,7 +6884,7 @@ msgstr "Etumerkki raporteissa"
 #: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
-msgstr ""
+msgstr "Samalla päiväkirjalla ei voi olla kahta avointa kassaa"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -6804,7 +6894,7 @@ msgstr ""
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: account
 #: help:account.journal,type:0
@@ -6836,7 +6926,7 @@ msgstr ""
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "Epätasapainossa"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -6913,7 +7003,7 @@ msgstr "Myynnin ominaisuudet"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Käsin tehty täsmäytys"
 
 #. module: account
 #: report:account.overdue:0
@@ -6936,7 +7026,7 @@ msgstr "Suljettava tilikausi"
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "Peruuta valitut laskut"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -6945,7 +7035,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: account
 #: view:account.account:0
@@ -6997,7 +7087,7 @@ msgstr "Kirjanpidon kohde"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Laskujen maksu"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7015,7 +7105,7 @@ msgstr "Sarja"
 #. module: account
 #: model:ir.model,name:account.model_account_bs_report
 msgid "Account Balance Sheet Report"
-msgstr ""
+msgstr "Tilin saldoraportti"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -7033,7 +7123,7 @@ msgstr "Kyllä"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr ""
+msgstr "Myynti tilityypeittäin"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -7043,7 +7133,7 @@ msgstr ""
 #. module: account
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Kuukausittain"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7058,17 +7148,17 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 14"
-msgstr ""
+msgstr "  päivien määrä: 14"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 päivää    "
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Edistyminen"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7079,7 +7169,7 @@ msgstr "Ylempi tili"
 #. module: account
 #: field:account.installer.modules,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Useita analyyttisiä suunnitelmia"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -7131,7 +7221,7 @@ msgstr "Kumppanin tilikirja"
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Year :"
-msgstr ""
+msgstr "Vuosi :"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -7181,6 +7271,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7202,7 +7293,7 @@ msgstr "Kumppani"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Valitse laskun valuutta"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:100
@@ -7214,7 +7305,7 @@ msgstr "Ei voi %s vedos/proforma/peruuttaa laskua"
 #: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "Ei laskurivejä !"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7263,17 +7354,17 @@ msgstr "Jaksotusmenetelmä"
 #: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "Lasku '%s' on maksettu."
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Automaattinen vienti"
 
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä verokoodeja"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7337,7 +7428,7 @@ msgstr "Lisätietoja"
 #. module: account
 #: view:account.installer:0
 msgid "Bank and Cash Accounts"
-msgstr ""
+msgstr "Pankki ja käteistilit"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7349,7 +7440,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr ""
+msgstr "Laskun tila on Avoin"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7397,7 +7488,7 @@ msgstr ""
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Verotyypin prosenttimääräksi, syötä % osuus välillä 0-1."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -7410,11 +7501,13 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Muuta laskua: Peruuttaa nykyisen laskun ja luo siitä uuden kopion "
+"editoitavaksi."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and Financial Management"
-msgstr ""
+msgstr "Kirjanpito ja taloushallinto"
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -7435,6 +7528,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Jakso"
@@ -7447,7 +7553,7 @@ msgstr "Netto:"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Yleisraportointi"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -7517,19 +7623,11 @@ msgstr "Puh.:"
 msgid "Company Currency"
 msgstr "Yritysvaluutta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other: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 ""
+msgstr "Maksu"
 
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
@@ -7560,7 +7658,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Tilin yleisraportti"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -7571,7 +7669,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr ""
+msgstr "Päiväkirjanäkymät"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -7618,12 +7716,12 @@ msgstr "Saatavat tili"
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox Balance"
-msgstr ""
+msgstr "Kassakoneen saldo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Kirjanpitovuoden sulkemisen tila"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -7636,8 +7734,14 @@ msgstr "Hyvityspäiväkirja"
 #: report:account.central.journal: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
 msgid "Filter By"
-msgstr ""
+msgstr "Suodata käyttäen"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -7653,7 +7757,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "Yritysanalyysi"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -7687,12 +7791,12 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Välisumma"
 
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Tulosta veroilmoitus"
 
 #. module: account
 #: view:account.model.line:0
@@ -7712,7 +7816,7 @@ msgstr "Eräpäivä"
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Toimittajat"
 
 #. module: account
 #: constraint:account.move:0
@@ -7745,7 +7849,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Tilastot"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -7756,17 +7860,17 @@ msgstr "Mistä"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Kirjanpitovuoden sulkeminen"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Tilikoodin tulee olla uniikki yrityksittäin !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Maksamattomat laskut"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -7777,7 +7881,7 @@ msgstr "Debet ,äärä"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "Omaisuus"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7805,7 +7909,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Sekalaiset"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -7816,7 +7920,7 @@ msgstr "Kokonaismaksun määrä joka sinun täytyy maksaa toimittajalle"
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Analyyttiset kulut"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -7837,7 +7941,7 @@ msgstr "Laskunnumero, lasketaan automaattisesti kun laskua luodaan."
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Kupongin määrä tulee olla sama kuin tiliotteen rivillä"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1131
@@ -7849,7 +7953,7 @@ msgstr "Virheellinen tili!"
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Jätä tyhjäksi niin käytetään kaikkia avoimia kirjanpitovuosia"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1056
@@ -7875,6 +7979,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -7952,14 +8057,14 @@ msgstr ""
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Sopimukset"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 msgid "unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -7969,7 +8074,7 @@ msgstr "Avauspäiväkirja"
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Luonnoslaskut on tarkistettu, hyväksytty ja tulostettu."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8001,7 +8106,7 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Syötetään Python koodina"
 
 #. module: account
 #: field:account.analytic.journal,code:0
@@ -8072,7 +8177,7 @@ msgstr "Tieto"
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Rekisteröiy maksu"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -8082,7 +8187,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Tuotetiedot"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8101,13 +8206,13 @@ msgstr "Luo lasku"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Oston vero (%9"
 
 #. module: account
 #: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Ole hyvä ja luo laskurivejä"
 
 #. module: account
 #: report:account.overdue:0
@@ -8117,7 +8222,7 @@ msgstr "Hyvä Herra/Rouva"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Konfiguroi kirjanpito-ohjelmistosi"
 
 #. module: account
 #: code:addons/account/account.py:2820
@@ -8140,7 +8245,7 @@ msgid ""
 "view tells OpenERP 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 ""
+msgstr "loi"
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8157,14 +8262,19 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
-msgstr ""
+msgstr "Aloita jakso"
 
 #. module: account
 #: code:addons/account/account.py:2333
@@ -8219,7 +8329,7 @@ msgstr "Ystävällisin terveisin"
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Maksamaton"
 
 #. module: account
 #: report:account.overdue:0
@@ -8229,13 +8339,13 @@ msgstr "Dokumentti: Asiakkaan tiliote"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä näkymätilille."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "Nykyistä valuuttaa ei ole konfiguroitu kunnolla !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8249,7 +8359,7 @@ msgstr ""
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Saatavien tilit"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8259,7 +8369,7 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Income Accounts)"
-msgstr ""
+msgstr "Voitto ja tapiio (tulotilit)"
 
 #. module: account
 #: view:account.tax:0
@@ -8280,7 +8390,12 @@ msgstr "Jätä tyhjäksi käyttääksesi tulotiliä"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8295,12 +8410,21 @@ msgstr "Saldo"
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Käsin tai automaattisesti syötetty järjestelmään"
 
 #. 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 ""
+msgstr "Näytä tili"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8310,7 +8434,7 @@ msgstr "("
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify"
-msgstr ""
+msgstr "Muokkaa"
 
 #. module: account
 #: view:account.account.type:0
@@ -8336,7 +8460,7 @@ msgstr "Maksettavat"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "Tänä vuonna"
 
 #. module: account
 #: view:board.board:0
@@ -8374,7 +8498,7 @@ msgstr "Valitse tilit suorituksille"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo tilityypeittäin"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -8403,13 +8527,13 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Suotimet"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Käsin tehty vienti"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8429,7 +8553,7 @@ msgstr ""
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "Tili numero."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8465,7 +8589,7 @@ msgstr "Suoritustapahtumat"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Yleisraportti"
 
 #. module: account
 #: view:account.account:0
@@ -8486,7 +8610,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr ""
+msgstr "Maksuviennit"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8495,11 +8619,11 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Tilikartta"
 
 #. module: account
@@ -8516,14 +8640,19 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
-msgstr ""
+msgstr "Lopeta jaso"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8541,13 +8670,13 @@ msgstr ""
 #: 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 ""
+msgid "Chart of Accounts"
+msgstr "Tilikartta"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Eräpäivä"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8648,12 +8777,12 @@ msgstr "Odottaa"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Analyyttisiltä tileiltä"
 
 #. module: account
 #: field:account.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Toimittajan maksujen hallinta"
 
 #. module: account
 #: field:account.period,name:0
@@ -8678,7 +8807,7 @@ msgstr "Aktiivinen"
 #: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Tuntematon virhe"
 
 #. module: account
 #: code:addons/account/account.py:1167
@@ -8712,7 +8841,7 @@ msgstr "Toissijainen valuutta"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Vahvista tilisiirto"
 
 #. module: account
 #: field:account.account,credit:0
@@ -8725,6 +8854,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8776,7 +8906,7 @@ msgstr ""
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr ""
+msgstr "Lukumäärä"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8806,6 +8936,18 @@ msgstr "Yleinen"
 #: selection:account.pl.report,filter: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
@@ -8820,7 +8962,7 @@ msgstr "Jaksot"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "Valuuttakurssi"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -8834,12 +8976,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Avaa täsmäytettäväksi"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -8862,7 +9004,7 @@ msgstr ""
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr ""
+msgstr "Myyntivero (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -8921,7 +9063,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Tavallinen"
 
 #. module: account
 #: view:account.account:0
@@ -9015,15 +9157,12 @@ msgid "Tax Source"
 msgstr "Verolähde"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
-msgstr ""
+msgstr "Nettovoitto"
 
 #. module: account
 #: view:ir.sequence:0
@@ -9039,19 +9178,19 @@ msgstr "Tämä on malli toistuvasta kirjanpidon merkinnästä"
 #: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Tulotiliä ei ole määritelty tälle tuotteelle: \"%s\" (id:%d)"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: 0.02"
-msgstr ""
+msgstr "  arvo: 0.02"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9114,7 +9253,7 @@ msgstr "Yritys"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Määrittele toistuvat viennit"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
@@ -9183,7 +9322,7 @@ msgstr "Laskun rivit"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Lopeta jakso"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
@@ -9220,7 +9359,7 @@ msgstr "Arvonalennussiirto"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Laskun tila on valmis"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -9253,6 +9392,7 @@ msgstr "Toimittajan lasku"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9287,7 +9427,7 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Toistuva"
 
 #. module: account
 #: code:addons/account/account_move_line.py:805
@@ -9308,7 +9448,7 @@ msgstr "Kumppani maksutermi"
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Väli"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1246
@@ -9330,6 +9470,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Siirtojen kanssa"
 
@@ -9355,7 +9505,7 @@ msgstr "Manuaalisesti"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9399,7 +9549,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: account
 #: view:account.account:0
@@ -9437,7 +9587,7 @@ msgstr ""
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -9457,7 +9607,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer_modules
@@ -9489,7 +9639,7 @@ msgstr "Yleinen päiväkirja"
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Hae laskua"
 
 #. module: account
 #: report:account.invoice:0
@@ -9523,7 +9673,7 @@ msgstr "Yleistiedot"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Kirjanpitodokumentit"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -9539,17 +9689,17 @@ msgstr "Kustannustilikirja (Vain määrät)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Laskun tila on valmis"
 
 #. 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 "Kun täsmäytys on tehty, lasku voidaan maksaa"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Hae tilipohjia"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -9575,7 +9725,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "Kumppanin"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -9609,7 +9759,7 @@ msgstr "Tilimalli"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9666,7 +9816,7 @@ msgstr "Tuotemallin kustannustili"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Määrän valuutta"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
@@ -9699,6 +9849,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "Omaisuus"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Vastuut"
+
 #~ msgid "Select Message"
 #~ msgstr "Valitse viesti"
 
@@ -9717,9 +9879,6 @@ msgstr ""
 #~ msgid "Printing Date"
 #~ msgstr "Tulostuspäivämäärä"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Virhe! Et voi luoda rekursiivista tiliä"
-
 #~ msgid "Partner account"
 #~ msgstr "Yhteistyökumppani tili"
 
@@ -9738,9 +9897,6 @@ msgstr ""
 #~ msgid "Analytic Invoice"
 #~ msgstr "Analyyttinen lasku"
 
-#~ msgid "account.move.line"
-#~ msgstr "tili.siirto.rivi"
-
 #~ msgid "Move Lines Created."
 #~ msgstr "Siirtorivit luotu"
 
@@ -9806,9 +9962,6 @@ msgstr ""
 #~ msgid "Income"
 #~ msgstr "Tulo"
 
-#~ msgid "Crédit"
-#~ msgstr "Luotto"
-
 #~ msgid "Invoice Movement"
 #~ msgstr "Laskun liikehdintä"
 
@@ -9866,13 +10019,6 @@ msgstr ""
 #~ msgid "Unpaid invoices"
 #~ msgstr "Maksamattomat laskut"
 
-#~ msgid "Débit"
-#~ msgstr "Debet"
-
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Asetusvirhe"
-
 #~ msgid "Date Invoiced"
 #~ msgstr "Päiväys laskutettu"
 
@@ -9900,9 +10046,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Mene"
 
-#~ msgid "Partner ID"
-#~ msgstr "Kumppani tunnus"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Uusi asiakaslasku"
 
@@ -9922,9 +10065,6 @@ msgstr ""
 #~ msgid "Analytic Debit"
 #~ msgstr "Analyyttinen debet"
 
-#~ msgid "Move name"
-#~ msgstr "Siirrä nimi"
-
 #, python-format
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Päiväys täytyy asettaa välille %s ja %s"
@@ -9960,9 +10100,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Merkintöjen kokonaismäärä"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Alen. (%)"
-
 #~ msgid "Contra"
 #~ msgstr "Kontra"
 
@@ -10037,13 +10174,6 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Sulje tilat"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Kumppanin maksutili\n"
-#~ "Jätä tyhjäksi käyttääksesi oletusta"
-
 #~ msgid "Include in base amount"
 #~ msgstr "Sisällytä perusmäärään"
 
@@ -10132,9 +10262,6 @@ msgstr ""
 #~ msgid "Import invoice"
 #~ msgstr "Tuo lasku"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldoa tuotu eteenpäin"
-
 #~ msgid "Filter on Periods"
 #~ msgstr "Jaksojen suodatin"
 
@@ -10548,10 +10675,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Analyyttiset kustannukset uudelleenlaskuttaa ostoja, tuntilistoja jne."
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Et voi hyväksyä merkintää joka ei ole tasapuolinen!"
-
 #~ msgid "Mvt"
 #~ msgstr "Mvt"
 
@@ -10594,11 +10717,6 @@ msgstr ""
 #~ msgid "Name of the fiscal year as displayed in reports."
 #~ msgstr "Tilikauden nimi siten kun se näytetään raporteissa."
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr ""
-#~ "Vanhalla tilikaudella ei ole yhtään suoritettavissa olevaa merkintää!"
-
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Päivämäärä ei ole määritellyllä tilikaudella"
@@ -10633,21 +10751,9 @@ msgstr ""
 #~ msgid "Write-Off journal"
 #~ msgstr "Arvonalennuspäiväkirja"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Arvonalennusjakso"
-
 #~ msgid "Total write-off"
 #~ msgstr "Arvonalennus yhteensä"
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Jos maksu on jo suoritettu muistutuksen lähettämisen jälkeen, voi tämän "
-#~ "jättää huomiotta. Voit ottaa yhteyttä laskutukseemme numerossa +32 81 81 37 "
-#~ "00."
-
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "Virhe: Virheellinen BVR-numero (väärä tarkistussumma)."
 
@@ -10691,9 +10797,6 @@ msgstr ""
 #~ "Tätä kenttää käytetään merkintöihin maksettavista ja saatavista. Voit "
 #~ "asettaa rajapäivämäärän merkintärivin maksulle."
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid ""
 #~ "The account moves of the invoice have been reconciled with account moves of "
 #~ "the payment(s)."
@@ -10763,9 +10866,6 @@ msgstr ""
 #~ msgid "Entry Model Line"
 #~ msgstr "Merkintämallin rivi"
 
-#~ msgid "Partner name"
-#~ msgstr "Kumppanin nimi"
-
 #~ msgid "Canceled Invoice"
 #~ msgstr "Peruutettu lasku"
 
@@ -10775,6 +10875,9 @@ msgstr ""
 #~ msgid "Quantities"
 #~ msgstr "Määrät"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "Number of entries are generated"
 #~ msgstr "Luotavien merkintöjen lukumäärä"
 
@@ -10784,10 +10887,6 @@ msgstr ""
 #~ msgid "The date of the generated entries"
 #~ msgstr "Luotujen merkintöjen päivämäärä"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Tiliä joka sisältää tilisiirtoja ei voi ottaa pois käytöstä."
-
 #~ msgid "By Date"
 #~ msgstr "Päivämäärän mukaan"
 
@@ -10839,9 +10938,6 @@ msgstr ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 #~ msgstr "Yhtään tilisiirtomerkintää ei ole luonnostilassa"
 
-#~ msgid "All account entries"
-#~ msgstr "Kaikki tilin merkinnät"
-
 #~ msgid "Accounting entries at statement's confirmation"
 #~ msgstr "Kirjanpidon merkinnät tiliotteen vahvistuksessa"
 
@@ -10927,10 +11023,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Maksa ja suorita"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Tiliä ei ole määritelty suoritusmerkinnöille!"
-
 #~ msgid "Paid invoice when reconciled."
 #~ msgstr "Lasku maksettu kun suoritukset on tehty."
 
@@ -11057,26 +11149,19 @@ msgstr ""
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Avaa suoritusten poistolle"
 
-#~ msgid "All accounts"
-#~ msgstr "Kaikki tilit"
+#, python-format
+#~ msgid "Invoice "
+#~ msgstr "Lasku "
 
-#~ msgid "Don't Compare"
-#~ msgstr "Älä vertaa"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Tilikirja"
 
-#~ msgid "Show Accounts"
-#~ msgstr "Näytä tilit"
+#~ msgid "Balance:"
+#~ msgstr "Saldo:"
 
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Olet valinnut enemmän kuin 3 vuotta joka tapauksessa"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Tase (omaisuustilit)"
 
-#~ msgid "Creation Date"
-#~ msgstr "Luomispäivämäärä"
-
-#~ msgid "Account Information"
-#~ msgstr "Tilitiedot"
-
-#~ msgid "Printing date:"
-#~ msgstr "Tulostus päiväys:"
-
-#~ msgid "Currency:"
-#~ msgstr "Valuutta"
+#, python-format
+#~ msgid "is validated."
+#~ msgstr "on tarkistettu."
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index c753f7a992d..62cbf363e3a 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-23 19:29+0000\n"
-"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
+"PO-Revision-Date: 2011-11-25 15:24+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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:50+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Vous ne pouvez pas supprimer l'écriture comptabilisée : \"%s\" !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, 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.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -40,7 +40,7 @@ msgstr ""
 "Veuillez en créer un."
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Certaines écritures sont déjà rapprochées !"
@@ -61,9 +61,6 @@ msgstr ""
 "Vous devez définir le compte bancaire\n"
 "dans la définition du journal pour le rapprochement."
 
-#~ msgid "All account entries"
-#~ msgstr "Toutes les écritures de compte"
-
 #, python-format
 #~ msgid "The opening journal must not have any entry in the new fiscal year !"
 #~ msgstr ""
@@ -108,7 +105,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Pas de fin d'année définie sur le journal pour l'année fiscale"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -142,7 +139,7 @@ msgid "Residual"
 msgstr "Solde dû"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Veuillez définir une séquence sur le journal des factures"
@@ -240,7 +237,7 @@ msgstr "Référence"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr "Choisir une année fiscale "
+msgstr "Choisir un exercice comptable "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -252,7 +249,7 @@ msgstr ""
 "règlement sans les supprimer."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Attention !"
@@ -307,7 +304,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -341,7 +338,7 @@ msgstr ""
 "n'apparaisse sur les factures"
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -390,7 +387,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -587,8 +584,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -654,7 +649,7 @@ msgid "Not reconciled transactions"
 msgstr "Écritures non rapprochées"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Le solde de la caisse ne correspond pas au solde théorique !"
@@ -739,7 +734,7 @@ msgid "Tax Code Amount"
 msgstr "Montant de la taxe"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -772,8 +767,8 @@ msgid "Journal Period"
 msgstr "Période de journal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -836,7 +831,7 @@ msgid "Analytic Entries by line"
 msgstr "Écritures analytiques par ligne"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Vous ne pouvez changer la devise que pour les factures brouillon !"
@@ -942,7 +937,7 @@ msgid "Next Partner to reconcile"
 msgstr "Partenaire suivant à rapprocher"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -971,7 +966,6 @@ msgstr "Créer des périodes trimestrielles"
 
 #. module: account
 #: report:account.overdue:0
-#: report:account.aged_trial_balance:0
 msgid "Due"
 msgstr "Due"
 
@@ -1066,19 +1060,15 @@ msgstr "Modèle d'écritures"
 #: field:account.journal,code:0
 #: report:account.partner.balance:0
 #: field:account.period,code:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
 msgid "Code"
 msgstr "Code"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1159,6 +1149,7 @@ msgstr "Pertes et profits (comptes de charges)"
 
 #. 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 "-"
@@ -1257,7 +1248,7 @@ msgid "Entry Label"
 msgstr "Libellé de la pièce comptable"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1396,8 +1387,8 @@ msgid "Journal Items Analysis"
 msgstr "Analyse des écritures comptables"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
-#: report:account.aged_trial_balance:0
 msgid "Partners"
 msgstr "Partenaires"
 
@@ -1426,7 +1417,7 @@ msgid "Central Journal"
 msgstr "Journal centralisé"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Vous ne pouvez pas utiliser ce compte général dans ce journal !"
@@ -1438,6 +1429,16 @@ msgstr "Vous ne pouvez pas utiliser ce compte général dans ce journal !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Avec la balance qui n'est pas égale à 0"
 
@@ -1523,7 +1524,7 @@ msgid ""
 msgstr "Exemple : 2% à 14 jours nets, solde à 30 jours fin de mois"
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1693,6 +1694,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"
@@ -1763,7 +1765,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Erreur ! Les exercices ne doivent pas se chevaucher."
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "Ce compte n'est pas à rapprocher !"
@@ -1798,7 +1800,7 @@ msgid "Receivables & Payables"
 msgstr "Créditeurs & Débiteurs"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Vous devez sélectionner un compte !"
@@ -1834,7 +1836,7 @@ msgid "Customer Ref:"
 msgstr "Référence Client:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, 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 !"
@@ -1855,7 +1857,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Déclaration de taxes : avoirs"
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1873,7 +1875,7 @@ msgid "You can not create move line on closed account."
 msgstr "Impossible de créer une ligne d'écriture sur un compte clôturé"
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2087,7 +2089,7 @@ msgstr "Lignes d'Entrée Partielle"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr "Exercice fiscal"
+msgstr "Exercice comptable"
 
 #. module: account
 #: view:account.journal.select:0
@@ -2158,7 +2160,7 @@ msgid " Journal"
 msgstr " Journal"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2197,7 +2199,7 @@ msgid ""
 "can be installed and will be selected by default."
 msgstr ""
 "Le plan de comptes par défaut correspond au pays sélectionné. Si aucun plan "
-"de comptes certifiés n'existe pour le pays spécifié, un plan de compte "
+"de comptes certifié n'existe pour le pays spécifié, un plan de compte "
 "générique pourra être installé et sera sélectionné par défaut."
 
 #. module: account
@@ -2220,7 +2222,7 @@ msgid "Description"
 msgstr "Description"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2240,7 +2242,7 @@ msgid "Income Account"
 msgstr "Compte de revenus"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, 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 !"
@@ -2251,9 +2253,10 @@ msgid "Accounting Properties"
 msgstr "Propriétés des comptes"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Écritures triées par"
 
@@ -2275,12 +2278,16 @@ msgstr "Modèle de produit"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2290,13 +2297,8 @@ msgstr "Modèle de produit"
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 #: model:ir.model,name:account.model_account_fiscalyear
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
-#: report:account.aged_trial_balance:0
 msgid "Fiscal Year"
-msgstr "Exercice fiscal"
+msgstr "Exercice comptable"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2396,7 +2398,7 @@ msgid "Account Tax Code"
 msgstr "Code du compte taxe"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2440,12 +2442,12 @@ msgid ""
 "the start and end of the month or quarter."
 msgstr ""
 "Ce menu permet d'imprimer une déclaration de TVA fondée sur des factures ou "
-"des paiements. Sélectionnez une ou plusieurs périodes de l'exercice fiscal. "
-"Les informations requises par une déclaration fiscale sont générées "
-"automatiquement par OpenERP à partir des factures (ou des paiements, dans "
-"certains pays). Ces données sont actualisées en temps réel. C'est très utile "
-"car cela permet de prévoir à tout moment les taxes dues en début et en fin "
-"de mois ou du trimestre."
+"des paiements. Sélectionnez une ou plusieurs périodes de l'exercice "
+"comptable. Les informations requises par une déclaration fiscale sont "
+"générées automatiquement par OpenERP à partir des factures (ou des "
+"paiements, dans certains pays). Ces données sont actualisées en temps réel. "
+"C'est très utile car cela permet de prévoir à tout moment les taxes dues en "
+"début et en fin de mois ou du trimestre."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2478,7 +2480,7 @@ msgid "Account Model Entries"
 msgstr "Modèle d'écriture comptable"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2569,7 +2571,7 @@ msgid "Accounts"
 msgstr "Comptes"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erreur de paramétrage !"
@@ -2581,12 +2583,13 @@ msgid "Average Price"
 msgstr "Prix moyen"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Date :"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2742,16 +2745,16 @@ 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:1195
+#: code:addons/account/account.py:1181
 #, 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:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2775,7 +2778,7 @@ msgstr "Clients"
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr "Depuis"
+msgstr "Période jusqu'au"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2890,8 +2893,10 @@ msgstr "Comptabilité financière"
 #. 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
 msgid "Profit And Loss"
-msgstr "Pertes et profits"
+msgstr "Compte de résultat"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3047,7 +3052,7 @@ msgid "BNK%s"
 msgstr "BNK%s"
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3169,9 +3174,7 @@ msgstr "Laisser vide pour utiliser le compte de dépense"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3185,6 +3188,17 @@ msgstr "Laisser vide pour utiliser le compte de dépense"
 #: 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 "Journaux"
 
@@ -3230,7 +3244,7 @@ msgid "Starting Balance"
 msgstr "Solde de début"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Pas de partenaire défini !"
@@ -3274,6 +3288,7 @@ msgstr "Journal :"
 #: 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
@@ -3328,7 +3343,7 @@ msgstr ""
 "comptable."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -3392,7 +3407,7 @@ msgstr ""
 "statut \"Annulée\" ou \"Terminée\"."
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3462,8 +3477,18 @@ msgstr "TVA"
 #: 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.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 "Chart of Accounts"
-msgstr "Plan de comptes"
+msgstr "Plan comptable"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -3510,7 +3535,6 @@ 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
 #: view:account.move:0
@@ -3554,7 +3578,7 @@ msgid "Chart of Accounts Template"
 msgstr "Modèle de plan de comptes"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3566,7 +3590,7 @@ msgstr ""
 "Veuillez y indiquer un partenaire !"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3694,7 +3718,7 @@ msgid "Analytic Items"
 msgstr "Écritures analytiques"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Impossible de changer la taxe !"
@@ -3705,14 +3729,14 @@ msgid "#Entries"
 msgstr "Nb d'écritures"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "Vous avez choisi une utité de mesure incompatible avec le produit."
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3923,11 +3947,10 @@ msgid "Analytic Balance"
 msgstr "Balance analytique"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Perte nette"
 
@@ -4026,7 +4049,7 @@ msgid "Acc.Type"
 msgstr "Type de cpte."
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -4092,7 +4115,7 @@ msgstr ""
 "«comptabilisé»."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4273,7 +4296,7 @@ msgid "Credit Notes"
 msgstr "Avoirs"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4346,11 +4369,11 @@ msgid "Change"
 msgstr "Change"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4456,7 +4479,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Vous devez définir un journal analytique de type '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4528,7 +4551,7 @@ msgid "Invoices"
 msgstr "Factures"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4633,7 +4656,7 @@ msgstr "Écritures comptables"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Bilan (comptes d'actif)"
 
 #. module: account
@@ -4642,24 +4665,25 @@ msgid "Third Party (Country)"
 msgstr "Tiers (pays)"
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4681,7 +4705,7 @@ msgid "Bank Details"
 msgstr "Informations bancaires"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Taxes manquantes"
@@ -4717,7 +4741,7 @@ msgstr "Grouper les lignes de facture"
 #: view:account.invoice.cancel:0
 #: view:account.invoice.confirm:0
 msgid "Close"
-msgstr "Clôturé"
+msgstr "Fermer"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
@@ -4741,7 +4765,7 @@ msgid "Check Date not in the Period"
 msgstr "Date de vérification hors période"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4763,7 +4787,7 @@ msgid "Child Tax Accounts"
 msgstr "Comptes de taxe enfant"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, 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"
@@ -4779,7 +4803,6 @@ msgid "Analytic Balance -"
 msgstr "Balance Analytique -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4792,11 +4815,8 @@ msgstr "Balance Analytique -"
 #: 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
 #: 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
@@ -4806,11 +4826,16 @@ msgstr "Balance Analytique -"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,target_move:0
-#: report:account.balancesheet.horizontal: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:pl.account.horizontal:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:pl.account:0
-#: report:account.aged_trial_balance:0
+#: report:pl.account.horizontal:0
 msgid "Target Moves"
 msgstr "Mouvements Cibles"
 
@@ -4881,7 +4906,7 @@ msgid "Line 1:"
 msgstr "Ligne 1 :"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Erreur d'Intégrité !"
@@ -4927,8 +4952,8 @@ msgstr "Résultat du lettrage"
 #: 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.horizontal:0
 #: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
 msgid "Balance Sheet"
 msgstr "Bilan"
 
@@ -5027,7 +5052,7 @@ msgstr ""
 "partenaire."
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -5102,7 +5127,7 @@ msgstr ""
 "sera le 28/02"
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -5130,7 +5155,7 @@ msgid "Start of period"
 msgstr "Début de la période"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5186,12 +5211,12 @@ msgstr "Journal des opérations de fin d'année"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5273,7 +5298,7 @@ msgid "Sort By"
 msgstr "Trier par"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5433,7 +5458,7 @@ msgid "Generate Opening Entries"
 msgstr "Générer les écritures d'ouverture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Déjà rapprochée !"
@@ -5471,7 +5496,7 @@ msgstr "Comptes fils"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustement"
@@ -5479,7 +5504,7 @@ msgstr "Ajustement"
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "Montant à payer"
+msgstr "Total à payer"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -5624,7 +5649,7 @@ msgid "# of Lines"
 msgstr "Nb. de lignes"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "La nouvelle devise n'est pas correctement paramétrée !"
@@ -5649,14 +5674,14 @@ msgid "Filter by"
 msgstr "Filtrer par"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Vous ne pouvez pas utiliser un compte inactif!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Les écritures n'ont pas de compte commun ou sont déjà rapprochées. "
@@ -5675,6 +5700,19 @@ msgstr "Journal général de comptabilité"
 
 #. 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 "Pas de filtre"
@@ -5691,7 +5729,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "Action invalide !"
@@ -5912,7 +5950,7 @@ msgid "Companies"
 msgstr "Sociétés"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5959,7 +5997,7 @@ msgstr "Informations supplémentaires"
 #: field:account.report.general.ledger,fiscalyear_id:0
 #: field:account.vat.declaration,fiscalyear_id:0
 msgid "Fiscal year"
-msgstr "Exercice fiscal"
+msgstr "Exercice comptable"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -6024,7 +6062,7 @@ msgstr "Créditeurs"
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr "Autre information"
+msgstr "Autres informations"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
@@ -6195,9 +6233,9 @@ msgid "Optional create"
 msgstr "Création facultative"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -6350,8 +6388,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Statistiques sur les écritures analytiques"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Écritures : "
@@ -6362,7 +6400,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Créer une écriture récurrente manuelle dans un journal donné."
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Impossible de créer des mouvements entre différentes sociétés"
@@ -6410,7 +6448,7 @@ msgid "Total debit"
 msgstr "Total débit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "L'écriture \"%s\" n'est pas valide !"
@@ -6480,31 +6518,30 @@ msgid "  valuation: percent"
 msgstr "  valorisation : pourcentage"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6626,7 +6663,7 @@ msgid "Journal Select"
 msgstr "Sélection du journal"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "La devise actuelle n'est pas correctement paramétrée !"
@@ -6647,7 +6684,6 @@ msgstr "Position fiscale des taxes"
 #: 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 "Grand livre"
@@ -6683,8 +6719,8 @@ msgid ""
 "Account Voucher module includes all the basic requirements of Voucher "
 "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
 msgstr ""
-"Le module Chèques comprend toutes les fonctionnalités de base pour la "
-"Banque, la trésorerie, les ventes, les achats, les frais, etc. "
+"Le module \"Justificatifs\" comprend toutes les fonctionnalités de base pour "
+"la Banque, la trésorerie, les ventes, les achats, les frais, etc. "
 
 #. module: account
 #: view:account.chart.template:0
@@ -6703,13 +6739,11 @@ msgstr "Plan de taxes comptables"
 #: report:account.general.journal:0
 #: report:account.invoice:0
 #: report:account.partner.balance:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
 msgid "Total:"
 msgstr "Total :"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6746,7 +6780,7 @@ msgid "Child Codes"
 msgstr "Codes fils"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6934,7 +6968,7 @@ msgid "Lines"
 msgstr "Lignes"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -7136,7 +7170,7 @@ msgstr ""
 "domaine spécifique."
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, 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é"
@@ -7251,7 +7285,7 @@ msgid "Sign on Reports"
 msgstr "Signes sur les Rapports"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "Impossible d'avoir deux registres ouverts pour le même journal"
@@ -7286,6 +7320,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -7318,7 +7353,6 @@ msgstr "Information optionnelle"
 
 #. 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
@@ -7346,13 +7380,13 @@ msgstr ""
 "la date limite pour le paiement de cette ligne."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Compte incorrect !"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7370,7 +7404,7 @@ msgid "Invoice Tax"
 msgstr "Taxe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "Pas de Numéro de Pièce !"
@@ -7619,17 +7653,17 @@ msgid "Fixed"
 msgstr "Fixe"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -7692,7 +7726,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Impossible de %s une facture brouillon/proforma/annulée."
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Aucune ligne de facture !"
@@ -7743,7 +7777,7 @@ msgid "Deferral Method"
 msgstr "Méthode de report à nouveau"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La facture \"%s\" est réglée"
@@ -7808,7 +7842,7 @@ msgid "Associated Partner"
 msgstr "Partenaire Associé"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Vous devez d'abord sélectionner un partenaire !"
@@ -7878,7 +7912,7 @@ msgid "Choose Fiscal Year"
 msgstr "Choisissez l'exercice comptable"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7915,7 +7949,6 @@ msgstr "Gestion de la comptabilité et des finances"
 #: 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
@@ -7928,6 +7961,19 @@ msgstr "Gestion de la comptabilité et des finances"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Période"
@@ -8023,19 +8069,6 @@ msgstr "Tél. :"
 msgid "Company Currency"
 msgstr "Devise société"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
-#: report:account.aged_trial_balance:0
-msgid "Chart of Account"
-msgstr "Plan comptable"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -8101,7 +8134,7 @@ msgid "Account Types"
 msgstr "Types de compte"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -8152,12 +8185,13 @@ msgstr "Journal d'avoirs"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
-#: report:account.balancesheet.horizontal:0
 #: report:account.balancesheet:0
-#: report:pl.account.horizontal: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 "Filter By"
 msgstr "Filtré par"
 
@@ -8199,7 +8233,7 @@ msgid "Payment Term Line"
 msgstr "Détail des conditions de règlement"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -8215,7 +8249,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Sous total"
+msgstr "Sous-total"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -8372,12 +8406,10 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
-"Le montant du justificatif doit être identique à celui de la ligne le "
-"concernant"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Compte Incorrect !"
@@ -8388,7 +8420,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:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "L'écriture (%s) de centralisation a été confirmé !"
@@ -8610,14 +8642,14 @@ msgid "Period from"
 msgstr "Période du"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Journal de remboursement de ventes"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8668,7 +8700,7 @@ msgid "Purchase Tax(%)"
 msgstr "Taxe à l'achat (%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Créer quelques lignes de facture SVP."
@@ -8684,7 +8716,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Configurer votre application de comptabilité"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8716,7 +8748,7 @@ msgstr ""
 #: field:account.period,date_stop:0
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Period"
-msgstr "Fin de Période"
+msgstr "Fin de période"
 
 #. module: account
 #: field:account.installer.modules,account_followup:0
@@ -8727,25 +8759,28 @@ msgstr "Gestion des suivis"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
-msgstr "Démarrer la période"
+msgstr "Période de début"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Impossible de trouver le code parent pour le compte modèle !"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
-#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direction d'Analyse"
 
@@ -8777,7 +8812,7 @@ msgstr ""
 "Le comptable valide les écritures comptables provenant des factures. "
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8810,7 +8845,7 @@ msgstr ""
 "Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "La devise du compte n'est pas paramétrée correctement."
@@ -8862,8 +8897,12 @@ msgstr "Laisser vide pour utiliser le compte de revenu"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8872,12 +8911,8 @@ msgstr "Laisser vide pour utiliser le compte de revenu"
 #: report:account.third_party_ledger_other:0
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.balancesheet:0
-#: report:pl.account.horizontal:0
-#: report:pl.account:0
 msgid "Balance"
-msgstr "Solde de la balance"
+msgstr "Balance"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
@@ -8886,11 +8921,15 @@ msgstr "Saisi manuellement ou automatiquement dans le système"
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.general.ledger_landscape:0
-#: report:account.balancesheet.horizontal:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 #: report:account.balancesheet:0
-#: report:pl.account.horizontal: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 "Afficher le compte"
 
@@ -9022,7 +9061,6 @@ msgstr "Saisie manuelle"
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -9030,7 +9068,7 @@ msgid "Move"
 msgstr "N° d'écriture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9119,15 +9157,19 @@ msgstr "Solde analytique"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
-msgstr "Fin de période"
+msgstr "Période de fin"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -9164,7 +9206,7 @@ msgid "Account Subscription"
 msgstr "Écritures périodiques"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -9193,7 +9235,6 @@ msgstr "Écriture d'abonnement"
 #: 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
@@ -9206,7 +9247,6 @@ msgstr "Écriture d'abonnement"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_from:0
-#: report:account.aged_trial_balance:0
 msgid "Start Date"
 msgstr "Date de début"
 
@@ -9223,7 +9263,7 @@ msgid "Unreconciled"
 msgstr "Non-rapprochée"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Mauvais montant !"
@@ -9290,13 +9330,13 @@ msgid "Active"
 msgstr "Actif"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9349,6 +9389,7 @@ msgstr "Valider les mouvements de compte"
 #: report:account.journal.period.print: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
@@ -9402,7 +9443,7 @@ msgstr ""
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr "Nombre"
+msgstr "Numéro"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9432,6 +9473,18 @@ msgstr "Général"
 #: selection:account.pl.report,filter: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
@@ -9599,6 +9652,7 @@ msgstr "Sélectionnez une Période"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Validé"
 
@@ -9617,7 +9671,6 @@ msgstr "Validé"
 #: 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
@@ -9630,7 +9683,7 @@ msgstr "Validé"
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_to:0
 msgid "End Date"
-msgstr "Date de Fin"
+msgstr "Date de fin"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
@@ -9650,13 +9703,10 @@ msgid "Tax Source"
 msgstr "Base de la taxe"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Profit net"
 
@@ -9671,7 +9721,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Ceci est un modèle pour des écritures comptable récurrentes"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9681,8 +9731,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "JRNL"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9708,7 +9758,6 @@ msgstr "États"
 #: field:report.account.sales,amount_total:0
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
-#: report:account.aged_trial_balance:0
 msgid "Total"
 msgstr "Total"
 
@@ -9828,8 +9877,8 @@ msgid "End period"
 msgstr "Clôturer la période"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9901,6 +9950,7 @@ msgstr "Facture fournisseur"
 #: report:account.journal.period.print: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
@@ -9936,7 +9986,7 @@ msgid "Recurring"
 msgstr "Récurrent"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "L'écriture est déjà rapprochée"
@@ -9957,7 +10007,7 @@ msgid "Range"
 msgstr "Intervalle"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9976,6 +10026,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Avec mouvements"
 
@@ -10099,7 +10159,7 @@ msgid "Accounts Mapping"
 msgstr "Affectation des comptes"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La facture '%s' est en attente de validation."
@@ -10124,7 +10184,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "Le compte de revenu ou de dépense associé au produit sélectionné."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: 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 date de la pièce comptable n'est pas dans la période définie."
@@ -10132,7 +10192,7 @@ msgstr "La date de la pièce comptable n'est pas dans la période définie."
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr "Nombre de Périodes"
+msgstr "Nombre de périodes"
 
 #. module: account
 #: report:account.general.journal:0
@@ -10228,7 +10288,6 @@ msgstr "account.addtmpl.wizard"
 #: field:account.partner.ledger,result_selection:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-#: report:account.aged_trial_balance:0
 msgid "Partner's"
 msgstr "Du partenaire"
 
@@ -10334,7 +10393,7 @@ msgstr ""
 "inférieur."
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Impossible de supprimer un compte qui contient des écritures ! "
@@ -10368,11 +10427,17 @@ msgstr ""
 "exprimée dans la devise du journal (si elle est différente de la devise de "
 "la société)"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Laissez vide pour utiliser la période de la date de validation"
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "Actif"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de comptes récursifs"
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Passif"
 
 #~ msgid "Aged Trial Balance"
 #~ msgstr "Balance Agée"
@@ -10405,16 +10470,6 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Écriture de facturation"
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Si vous utilisez les termes de paiement, la date de livraison sera calculée "
-#~ "automatiquement lors de la génération des entrées comptables. Si vous "
-#~ "laissez les termes de paiement et la date de livraison vides, cela indique "
-#~ "un paiement direct."
-
 #~ msgid "Credit Trans."
 #~ msgstr "Crédit trans."
 
@@ -10485,18 +10540,6 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Lettrage lié au règlement"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Rem. (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Dans le cas où votre paiement aurait été effectué après l'envoi de ce mail, "
-#~ "veuillez considérer la présente comme nulle et non avenue. N'hésitez pas à "
-#~ "contacter notre département comptabilité ou répondez à l'email."
-
 #~ msgid "Contra"
 #~ msgstr "Contrat"
 
@@ -10529,9 +10572,6 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Pièce justificative"
 
-#~ msgid "account.move.line"
-#~ msgstr "Ligne de mouvement de compte"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Facturation analytique"
 
@@ -10637,9 +10677,6 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Clôturer l'état"
 
-#~ msgid "Crédit"
-#~ msgstr "Crédit"
-
 #~ msgid "Income"
 #~ msgstr "Produits"
 
@@ -10758,10 +10795,6 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Facture fournisseur brouillon"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Erreur de configuration !"
-
 #~ 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 "
@@ -10771,9 +10804,6 @@ msgstr ""
 #~ "impayées. Nous vous prions de prendre les mesures nécessaires afin de "
 #~ "procéder au règlement sous huitaine."
 
-#~ msgid "Débit"
-#~ msgstr "Débit"
-
 #~ msgid "x Checks Journal"
 #~ msgstr "x Journal de contrôle"
 
@@ -10845,9 +10875,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Commencer"
 
-#~ msgid "Partner ID"
-#~ msgstr "Code partenaire"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nouvelle facture client"
 
@@ -10889,9 +10916,6 @@ msgstr ""
 #~ msgid "Draft Customer Refunds"
 #~ msgstr "Avoirs client brouillon"
 
-#~ msgid "Move name"
-#~ msgstr "Nom du mouvement"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Annuler les factures sélectionnées"
 
@@ -10901,9 +10925,6 @@ msgstr ""
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Facture à contrôler, valider et imprimer"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "By Date and Period"
 #~ msgstr "Par date et période"
 
@@ -10919,10 +10940,6 @@ msgstr ""
 #~ msgid "Financial Management"
 #~ msgstr "Finance & Comptabilité"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Le compte n'est pas définit pour être lettrable !"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Commentaire"
 
@@ -10959,9 +10976,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Payer et lettrer"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Balance cumulée"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Nouvel avoir fournisseur"
 
@@ -10980,9 +10994,6 @@ msgstr ""
 #~ msgid "Credit Note"
 #~ msgstr "Avoir"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Période d'ajustement"
-
 #~ msgid "3 Months"
 #~ msgstr "3 mois"
 
@@ -11096,9 +11107,6 @@ msgstr ""
 #~ msgid "Unpaid Customer Invoices"
 #~ msgstr "Factures client en attente de règlement"
 
-#~ msgid "Partner name"
-#~ msgstr "Nom du partenaire"
-
 #~ msgid "Journal/Payment Mode"
 #~ msgstr "Journal/Mode de règlement"
 
@@ -11126,6 +11134,9 @@ msgstr ""
 #~ msgid "Set starting and ending balance for control"
 #~ msgstr "Choisir date début et fin de la balance pour contrôle"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "General Ledger -"
 #~ msgstr "Grand livre -"
 
@@ -11150,10 +11161,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Écritures par mouvement"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Vous ne pouvez pas désactiver un compte qui contient des écritures."
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filtre sur les partenaires"
 
@@ -11430,10 +11437,6 @@ msgstr ""
 #~ msgid "Entries by Statements"
 #~ msgstr "Écritures par état"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Vous ne pouvez pas valider une écriture non équilibrée !"
-
 #~ msgid "Standard entry"
 #~ msgstr "Écriture standard"
 
@@ -11645,10 +11648,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Laissez ce champ vide si l'exercice fiscal appartient à plusieurs sociétés."
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "L'ancien exercice fiscal n'a pas d'écriture à rapprocher !"
-
 #~ msgid "Fiscal Position Template Tax Mapping"
 #~ msgstr "Affectation des taxes dans le modèle de régime fiscal"
 
@@ -11668,13 +11667,6 @@ msgstr ""
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Définir l'exercice fiscal et choisir le plan comptable"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Le compte bancaire du partenaire pour le paiement\n"
-#~ "Laissez vide pour utiliser celui par défaut"
-
 #~ 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 "
@@ -11723,206 +11715,6 @@ msgstr ""
 #~ msgid "asgfas"
 #~ msgstr "asgfas"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Comptes analytiques à cloturer"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Factures brouillons"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Comptes à facturer"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Coûts à facturer"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Creances âgés"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Tableau de bord du comptable"
-
-#~ msgid "My indicators"
-#~ msgstr "Mes indicateurs"
-
-#~ msgid "Aged income"
-#~ msgstr "Revenus âgés"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Afficher les informations de Débit/Crédit"
-
-#~ msgid "All accounts"
-#~ msgstr "Tous les comptes"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Sélection basée sur les écritures"
-
-#~ msgid "Notification"
-#~ msgstr "Notification"
-
-#~ msgid "Financial Period"
-#~ msgstr "Période Fiscale"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Sélectioner la(les) Période(s)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Comparer l'année sélectionnée en terme de"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Sélectionner la ou les Années Fiscales (Maximum Trois Ans)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Sélectionner le COmpte Référence (pour la comparaison en %)"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Vous avez choisi l'option 'Paysage'. Merci de vérifier."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Afficher le Rapport au Format Paysage"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Afficher la Comparaison en %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Ne pas comparer"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Afficher les Comptes"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Vous avez sélectionner plus de 3 années dans tous les cas."
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr ""
-#~ "Vous pouvez sélectionner un maximum de 3 années. Merci de vérifier encore."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "Vous avez sélectionné l'option 'Pourcentage' avec plus de 2 années, mais "
-#~ "vous n'avez pas sélcetionné le format 'paysage'."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Vous avez peut être terminer en oubliant des erreurs. Merci de les corrigés "
-#~ "et d'essayer encore."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Laisser vide pour comparer avec le parent"
-
-#~ msgid "Creation Date"
-#~ msgstr "Date de création"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "Vous n'avez pas sélectionné l'option 'Pourcentage', mais vous avez "
-#~ "sélectionné plus de 2 années."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Vous devez au moins sélectionner 1 année fiscale. Essayer encore."
-
-#~ msgid "Customize Report"
-#~ msgstr "Personnaliser  le Rapport"
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Gestion financière et comptable - Comparez les comptes"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Le module de Balance des Comptes est une fonctionnalité additionnelle du "
-#~ "module de Gestion Financière.\n"
-#~ "\n"
-#~ "    Ce module vous offre plusieurs options d'impression du bilan.\n"
-#~ "\n"
-#~ "    1. Comparaison des bilans de différentes années.\n"
-#~ "\n"
-#~ "    2. Affichage des écarts entre deux années en pourcentage ou en valeur.\n"
-#~ "\n"
-#~ "    3. Définition d'une valeur de référence à comparer à une seule année.\n"
-#~ "\n"
-#~ "    4. Affichage jusqu'à la date actuelle ou depuis la date de création.\n"
-#~ "\n"
-#~ "    5. Impression au format portrait ou paysage.\n"
-#~ "    "
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Balance des Comptes - Comparer les Années"
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Vous avez choisi de comparer avec l’option supérieure à 1 an sur les "
-#~ "colonnes de crédit/ débit et des %.\r\n"
-#~ "Cela peut conduire le contenu à être imprimé en dehors de la plage du format "
-#~ "de papier. Veuillez essayer à nouveau."
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr ""
-#~ "Un module qui ajoute de nouveaux rapports basé sur le module account."
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Rapports financiers et de comptabilité - Rapports"
-
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Correspondance fiscale des comptes"
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Correspondance fiscale des taxes"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Modèles de correspondance fiscale"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Modèle pour la correspondance fiscale"
-
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Modèle de correspondance fiscale"
-
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Correspondances fiscales"
-
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Remarque sur la correspondance fiscale :"
-
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "La correspondance fiscale déterminera les taxes et les comptes utilisés pour "
-#~ "le partenaire."
-
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Modèle de correspondance fiscale de taxe"
-
-#~ msgid "supplier"
-#~ msgstr "fournisseur"
-
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Journal des avoir de frais - (test)"
-
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "Erreur inconnue"
@@ -11933,108 +11725,14 @@ msgstr ""
 #~ "Aucun journal n'a été défini pour l'écriture finale pour cet exercice "
 #~ "comptable"
 
-#~ msgid "Low Level"
-#~ msgstr "Bas niveau"
-
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Les factures fournisseurs permettent de saisir et de gérer les factures "
-#~ "émises par les fournisseurs. OpenERP génère les factures fournisseurs "
-#~ "brouillon automatiquement pour que vous puissiez contrôler si ce que vous "
-#~ "recevez des fournisseurs correspond à ce que vous avez commandé ou reçu."
-
-#~ msgid "Bilanzkonten - Passiva - Kapitalkonten"
-#~ msgstr "Compte de bilan - passif - compte de capital"
-
-#~ msgid "End of Year"
-#~ msgstr "Fin d'exercice"
-
-#~ msgid "Ansicht"
-#~ msgstr "Vue"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Facture "
 
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "Ce compte sera utilisé pour les factures à la place du compte par défaut "
-#~ "pour valoriser les charges liées au produit actuel"
-
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "est validé."
 
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Journal de liquidités - (test)"
-
-#~ msgid "Sales Credit Note Journal - (test)"
-#~ msgstr "Journal des avoirs de vente - (test)"
-
-#~ msgid "Bank Journal - (test)"
-#~ msgstr "Journal de banque - (test)"
-
-#~ msgid "Default UoM"
-#~ msgstr "UdM par défaut"
-
-#~ msgid ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-#~ msgstr ""
-#~ "Les registres de liquidités permettent de gérer les écritures dans les "
-#~ "journaux de liquidités."
-
-#~ msgid "Expenses Journal - (test)"
-#~ msgstr "Journal des frais - (test)"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
-
-#~ msgid "Sales Journal - (test)"
-#~ msgstr "Journal des ventes - (test)"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Le nom du groupe doit être unique !"
-
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "Une écriture se compose de plusieurs lignes en crédit ou en débit. OpenERP "
-#~ "génère automatiquement une écriture dans le journal pour chaque document "
-#~ "comptable : facture, remboursement, paiement de fournisseur, relevé "
-#~ "bancaire, etc."
-
-#~ 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"
-
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "La facturation client permet de générer et de gérer les factures envoyées à "
-#~ "vos clients. OpenERP génère automatiquement des factures brouillon qu'il "
-#~ "suffit de valider et d'expédier aux clients."
-
-#~ msgid ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Un remboursement fournisseur est un avoir émis par votre fournisseur "
-#~ "indiquant qu'il rembourse une partie ou la totalité de la facture qu'il vous "
-#~ "a adressée."
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Le solde du relevé est incorrect.\n"
@@ -12044,162 +11742,11 @@ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "Le solde affiché (%.2f) est différent du solde calculé. (%.2f)"
 
-#~ msgid ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-#~ msgstr ""
-#~ "Les avoirs clients vous permettent de gérer les avoirs générés ou à générer "
-#~ "pour vos clients. Une facture d'avoir est un document qui annule la facture "
-#~ "pour tout ou partie. Vous pouvez facilement générer des avoirs et les "
-#~ "rapprocher avec la facture."
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilan (comptes d'actif)"
 
-#~ msgid "Erfolgskonten - Erlöse"
-#~ msgstr "Compte de résultat - Chiffre d'affaires"
-
-#~ msgid "Erfolgskonten - Aufwendungen"
-#~ msgstr "Comptes de résultats - Dépenses"
-
-#~ msgid "Bilanzkonten - Aktiva - Vermögenskonten"
-#~ msgstr "Bilanzkonten - Aktiva - Vermögenskonten"
-
-#~ msgid ""
-#~ "given a period and a journal, the sum of debit will always be equal to the "
-#~ "sum of credit, so there is no point to display it"
-#~ msgstr ""
-#~ "pour une période et un journal, la somme des débits sera toujours égale à la "
-#~ "somme des crédits, il n'y a donc aucun intérêt à l'afficher"
-
-#~ msgid ""
-#~ "A recurring entry is a payment related entry that occurs on a recurrent "
-#~ "basis from a specific date corresponding to the signature of a contract or "
-#~ "an agreement with a customer or a supplier. With Define Recurring Entries, "
-#~ "you can create them in the system in order to automate their entries in the "
-#~ "system."
-#~ msgstr ""
-#~ "Une entrée récurrente est un paiement connexe qui se produit sur une "
-#~ "certaine périodicité à partir de la date anniversaire d'un contrat ou d'un "
-#~ "accord avec un client ou un fournisseur. \"Définir des écritures "
-#~ "périodiques\" permet d'automatiser la création de ces écritures dans le "
-#~ "système."
-
-#~ msgid ""
-#~ "Define your company's fiscal year depending on the period you have chosen to "
-#~ "follow. A fiscal year is a 1 year period over which a company budgets its "
-#~ "spending. It may run over any period of 12 months. The fiscal year is "
-#~ "referred to by the date in which it ends. For example, if a company's fiscal "
-#~ "year ends November 30, 2011, then everything between December 1, 2010 and "
-#~ "November 30, 2011  would be referred to as FY 2011. Not using the actual "
-#~ "calendar year gives many companies an advantage, allowing them to close "
-#~ "their books at a time which is most convenient for them."
-#~ msgstr ""
-#~ "Définissez l'exercice comptable de votre société selon la période que vous "
-#~ "avez choisie. Un exercice comptable est une période d'1 an pendant laquelle "
-#~ "une société programme ses dépenses. Un exercice financier est référencé par "
-#~ "sa date de fin. Par exemple, si l'exercice d'une entreprise se termine le 30 "
-#~ "Novembre 2011, la période du 1er Décembre 2010 au 30 Novembre 2011 sera "
-#~ "nommée \"exercice 2011\". Ne pas coïncider avec l'année civile est "
-#~ "avantageux pour beaucoup d'entreprises, cela leur permet de fermer leurs "
-#~ "livres au moment qui leur convient le mieux."
-
-#~ msgid ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-#~ msgstr ""
-#~ "Un relevé bancaire est un résumé de toutes les transactions financières qui "
-#~ "ont été émises durant une période donnée sur un compte de dépôt, une carte "
-#~ "de crédit, ou tout autre type de compte. Commencez par remplir les balances "
-#~ "d'ouverture et de fermeture, puis enregistrer toutes les lignes de votre "
-#~ "relevé. Quand vous êtes dans la colonne paiement de la ligne, vous pouvez "
-#~ "appuyer sur F1 pour ouvrir le formulaire de rapprochement."
-
-#~ msgid ""
-#~ "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
-#~ "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
-#~ "o.journal_id.currency and o.journal_id.currency.symbol"
-#~ msgstr ""
-#~ "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
-#~ "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
-#~ "o.journal_id.currency and o.journal_id.currency.symbol"
-
-#~ msgid ""
-#~ "Here you can personalize and create each view of your financial journals by "
-#~ "selecting the fields you want to appear and the sequence they will appear."
-#~ msgstr ""
-#~ "Ici, vous pouvez personnaliser et créer chaque vue de vos journaux "
-#~ "financiers en sélectionnant les champs que vous voulez afficher et l'ordre "
-#~ "dans lequel ils vont s'afficher."
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "Ce compte sera utilisé pour les factures à la place du compte par défaut "
-#~ "pour valoriser les ventes du produit actuel"
-
-#~ msgid ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Un avoir fournisseur est une note de crédit reçue de votre fournisseur qui "
-#~ "vous indique vous faire un avoir sur tout ou partie de sa facture."
-
-#~ msgid ""
-#~ "Here, you can define a period, an interval of time between successive "
-#~ "closings of the books of your company. An accounting period typically is a "
-#~ "month or a quarter, corresponding to the tax year used by the business. "
-#~ "Create and manage them from here and decide whether a period should be left "
-#~ "open or closed depending on your company's activities over a specific period."
-#~ msgstr ""
-#~ "Ici, vous pouvez définir une période, un intervalle de temps entre les "
-#~ "fermetures successives des livres de votre société. Une période comptable, "
-#~ "généralement un mois ou un trimestre, correspondant à l'année d'imposition "
-#~ "utilisée par l'entreprise. Les créer et les gérer à partir d'ici et décider "
-#~ "si un délai doit être laissé ouvert ou fermé selon les activités de votre "
-#~ "entreprise pour une période donnée."
-
-#~ msgid "Must be after setLang()"
-#~ msgstr "Doit être après setlang ()"
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Ce compte sera utilisé pour les factures pour valoriser les ventes de "
-#~ "produits de la catégorie courante"
-
-#~ msgid ""
-#~ "A tax code is a reference of a tax that will be taken out of a gross income "
-#~ "depending on the country and sometimes industry sector. OpenERP allows you "
-#~ "to define and manage them from this menu."
-#~ msgstr ""
-#~ "Un code de taxe est une référence à une taxe qui sera prise sur un revenu "
-#~ "brut selon les pays voire un secteur industriel. OpenERP permet de les "
-#~ "définir et les gérer depuis ce menu."
-
-#~ msgid ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-#~ msgstr ""
-#~ "Le plan de taxes est utilisé pour générer vos relevés de taxe périodiques. "
-#~ "Vous verrez ici les taxes avec les codes associés à votre déclaration selon "
-#~ "votre pays."
-
-#~ msgid ""
-#~ "This menu helps you manage the credit notes issued/to be issued for your "
-#~ "customers. A refund invoice is a document that cancels an invoice or a part "
-#~ "of it. You can easily generate refunds and reconcile them from the invoice "
-#~ "form."
-#~ msgstr ""
-#~ "Menu destiné à gérer les avoirs \"émis\" ou \"à émettre\" vers vos clients. "
-#~ "Une facture de remboursement est un document qui annule une facture ou une "
-#~ "partie de celle-ci. Vous pouvez facilement générer des remboursements et les "
-#~ "réconcilier à partir de la vue formulaire de factures."
+#~ msgid "Chart of Account"
+#~ msgstr "Plan comptable"
 
 #~ msgid "Balance:"
 #~ msgstr "Solde de la balance:"
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
index 1af843c859e..b7ccc3e677f 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: 2011-04-29 05:13+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2012,7 +2021,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2076,6 +2085,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2097,11 +2108,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2418,6 +2434,7 @@ 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
@@ -2663,6 +2680,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2928,7 +2947,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2942,6 +2960,17 @@ msgstr ""
 #: 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 ""
 
@@ -3151,6 +3180,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3209,6 +3239,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3647,11 +3687,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4324,7 +4363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4463,7 +4502,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4476,10 +4514,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4489,6 +4525,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4605,6 +4651,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5314,6 +5362,19 @@ msgstr ""
 
 #. 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 ""
@@ -6222,6 +6283,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6451,7 +6513,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7121,6 +7183,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7373,6 +7436,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7455,14 +7531,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7574,6 +7642,12 @@ msgstr "Journal des Remboursements"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7812,6 +7886,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8093,12 +8168,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8216,7 +8296,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8235,6 +8320,15 @@ 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 ""
 
@@ -8432,7 +8526,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8449,12 +8543,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8474,7 +8573,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8655,6 +8754,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8736,6 +8836,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8945,13 +9057,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8975,7 +9084,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9183,6 +9292,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9256,6 +9366,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9625,20 +9745,14 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Une note de crédit reçue de votre fournisseur vous indique qu'il rembourse "
-#~ "en totalité ou en partie une facture qu'il a émise à votre nom."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
 
-#~ msgid ""
-#~ "This menu helps you manage the credit notes issued/to be issued for your "
-#~ "customers. A refund invoice is a document that cancels an invoice or a part "
-#~ "of it. You can easily generate refunds and reconcile them from the invoice "
-#~ "form."
-#~ msgstr ""
-#~ "Ce menu permet de gérer les notes de crédit clients. Une note de crédit est "
-#~ "un document qui annule une facture ou une partie de facture. Les actions "
-#~ "contextuelles sur une facture permettent facilement de générer une note de "
-#~ "crédit et de la réconcilier avec la facture."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 037e8126901..ae1a3c872c8 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -8,19 +8,19 @@ 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-04-27 15:37+0000\n"
-"Last-Translator: Xosé <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:52+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: 2011-04-29 05:06+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Sistema de pagos"
 
 #. module: account
 #: view:account.journal:0
@@ -40,7 +40,7 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
-"Non pode eliminar/desactivar unha conta que está marcada como propiedade "
+"Non pode eliminar/desactivar unha conta que estea marcada como propietaria "
 "para un Partner."
 
 #. module: account
@@ -59,7 +59,7 @@ msgstr "Xestión de Pagos"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr "Estatísticas da conta"
+msgstr "Estadísticas da conta"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -523,8 +523,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -861,7 +859,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 msgid "New Subscription"
-msgstr "Nova Subscripción"
+msgstr "Nova subscripción"
 
 #. module: account
 #: view:account.payment.term:0
@@ -1176,6 +1174,7 @@ msgstr "# de Transacción"
 
 #. 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
@@ -1364,6 +1363,16 @@ msgstr "¡Non pode usar esta conta xeral neste diario!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Con saldo non é igual a 0"
 
@@ -2109,7 +2118,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Busca as Plantillas do Plan de Contas"
 
 #. module: account
@@ -2176,6 +2185,8 @@ msgstr "Propiedades Contables"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Entradas Ordenadas Por"
 
@@ -2197,11 +2208,16 @@ msgstr "Modelo de Producto"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2539,6 +2555,7 @@ msgstr "Desc.(%)"
 
 #. 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
@@ -2799,6 +2816,8 @@ msgstr "Contabilidade Financieira"
 #. 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
 msgid "Profit And Loss"
 msgstr "Pérdidas e Ganancias"
 
@@ -2903,6 +2922,12 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Permite seleccionar a forma en que se calculará a tasa da divisa actual nas "
+"transaccións de saida. Na maioría dos países o método legal é \"Promedio\", "
+"pero so uns poucos sistemas de software son capaces de xestionalo. Pola "
+"contra, se a inportación procede de outro sistema de software, é posible que "
+"teña que empregar a tasa \"En data\". As transaccións de entrada sempre "
+"empregan a tasa \"En data\"."
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
@@ -3020,6 +3045,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 ""
+"Este asistente validará todos os asientos de un diario e período en "
+"particular. Unha vez que se validan os asientos, non se poden modificar máis."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3050,6 +3077,15 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Estableza aquí o método que empregará o asistente xenérico para crear o "
+"asiento de peche de exercicio para todas as contas de este tipo.\n"
+"\n"
+"'Ningún' significa que non se fará nada.\n"
+"'Saldo' normalmente empregarase para contas de efectivo.\n"
+"'Detallado' copiará cada apunte do exercicio anterior, incluso os non "
+"conciliados.\n"
+"'Sin conciliar' copiará so os apuntes ainda non conciliados o primeiro día "
+"do novo exercicio fiscal."
 
 #. module: account
 #: view:account.tax:0
@@ -3071,7 +3107,6 @@ msgstr "Manter vacío para usar a conta de gastos"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3085,6 +3120,17 @@ msgstr "Manter vacío para usar a conta de gastos"
 #: 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"
 
@@ -3158,6 +3204,7 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"O importe expresado na moeda contable relacionada non é igual o da compañía."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -3300,6 +3347,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Contrapartida"
 
@@ -3336,7 +3384,7 @@ msgstr "Crear Conta"
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Informe das vendas por tipo de conta"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3358,8 +3406,18 @@ msgstr "IVE:"
 #: 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.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 "Chart of Accounts"
-msgstr ""
+msgstr "Plan contable"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -3453,6 +3511,9 @@ msgid ""
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"A data de vencemento do apunte xerado pola línea do modelo '%s' do modelo "
+"'%s' basease no plazo de pago da empresa.\n"
+"¡Por favor, defina a empresa nel!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:810
@@ -3516,6 +3577,8 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Si non é aplicable (calculado a través de un código Python), o imposto non "
+"aparecerá na factura."
 
 #. module: account
 #: view:account.tax:0
@@ -3654,12 +3717,12 @@ msgstr "Data efectiva"
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr ""
+msgstr "Codificación estándar"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Diario para asientos analíticos"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -3669,7 +3732,7 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidade"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3680,11 +3743,13 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Imprime o informe coa columna da moeda se a moeda é distinta a moeda da "
+"compañía."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Contabilidade xeral"
 
 #. module: account
 #: report:account.overdue:0
@@ -3699,6 +3764,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"O máis recomendable é empregar un diario dedicado a conter os asientos de "
+"apertura de todos os exercicios. Teña en conta que debería definilo con "
+"contas de debe/haber por defecto, de tipo 'situación' e con unha "
+"contrapartida centralizada."
 
 #. module: account
 #: view:account.installer:0
@@ -3717,12 +3786,12 @@ msgstr "Establecer a Borrador"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Líñas recurrentes"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Amosas empresas"
 
 #. module: account
 #: view:account.invoice:0
@@ -3733,6 +3802,7 @@ msgstr "Validar"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"¡Valor de haber ou debe no modelo erróneo (haber ou debe debería ser \"0\")!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3741,21 +3811,25 @@ 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 informe, podese ter unha visión xeral do importe facturado os "
+"seus clientes, así como os retrasos nos pagos. A ferramenta de busca tamén "
+"se pode empregar para personalizar os informes das facturas e porlo tanto, "
+"adaptar este análisis as suas necesidades."
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Confirmar facturas"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Tasa promedio"
 
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(debería romper a conciliación se desexa abrir a factura)"
 
 #. module: account
 #: field:account.aged.trial.balance,period_from:0
@@ -3794,7 +3868,7 @@ msgstr "Configuración"
 #: 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 ""
+msgstr "30 días fin de mes"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
@@ -3803,11 +3877,10 @@ msgid "Analytic Balance"
 msgstr "Saldo Analítico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Pérdidas Netas"
 
@@ -3817,16 +3890,17 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Si se desmarca o campo activo, permitese ocultar a conta sin eliminala."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Buscar pantillas de impuestos"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Asentos borrador"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3855,12 +3929,12 @@ msgstr "Tipo de Conta"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Balance de Comprobación"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Cancelar as facturas selecciondas"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3869,6 +3943,8 @@ 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
@@ -3881,6 +3957,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
+"Os costes analíticos (follas de servizos, algúns productos mercados, ...) "
+"proveñen das contas analíticias. Estos xeran facturas borrador de proveedor."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3891,18 +3969,18 @@ msgstr "Peche de Caixa"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Atraso medio débeda"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Tipo conta"
 
 #. module: account
 #: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
-msgstr ""
+msgstr "¡Impuestos globales definidos, pero non están en líneas de factura!"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -3918,7 +3996,7 @@ msgstr "Mes"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referencia UdM"
 
 #. module: account
 #: field:account.account,note:0
@@ -3929,7 +4007,7 @@ msgstr "Nota"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "Conta atrasos"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -3945,7 +4023,7 @@ msgstr "Liñas de Imposto"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Código base conta"
 
 #. module: account
 #: help:account.move,state:0
@@ -3956,22 +4034,28 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"Todos os asientos creados manualmente están, polo xeral, en estado 'Non "
+"asentado', pero pode configurar a opción de omitir ese estado no diario "
+"correspondente. Nese caso, comportanse como asientos creados automáticamente "
+"polo sistema na validación de documentos (facturas, extractos bancarios, "
+"...) e creanse 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 ""
+"Non se definei unha encuesta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr ""
+msgstr "Propiedades de contabilidade do cliente"
 
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Descripción do imposto"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -3995,28 +4079,28 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr ""
+msgstr "Todos os asientos asentados"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "Confirmouse o extracto %s, crearonse os asientos contables."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "¡Erro! A duración do exercicio fiscal non é valida. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Rango mensual"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Comprobe si tamén desexa mostrar contas con saldo 0."
 
 #. module: account
 #: view:account.tax:0
@@ -4026,18 +4110,18 @@ msgstr "Cálculo do Código"
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Imposto por defecto"
 
 #. module: account
 #: code:addons/account/invoice.py:88
 #, python-format
 msgid "Free Reference"
-msgstr ""
+msgstr "Referencia libre"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Procesamento periódico"
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4045,21 +4129,23 @@ 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 ""
+"Cando se crea un novo apunte, o estado será 'Borrador'.\n"
+"* Cando se realicen todos os pagos, o estado será 'Válido'"
 
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "Modo de visualización"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Extracto dende factura ou pago"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month: 0"
-msgstr ""
+msgstr "  día do mes: 0"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4076,29 +4162,29 @@ msgstr "Nome da conta"
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr ""
+msgstr "Indique o nome dos novos asientos."
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Estadísticas de facturas"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Foron introducidos os extractos bancarios no sistema."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Desfase conciliación"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr ""
+msgstr "Data vencementos"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -4115,12 +4201,12 @@ msgstr "Saldo de Peche"
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "Sen implementar"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "Contabilidade. Seleccionar diario"
 
 #. module: account
 #: view:account.invoice:0
@@ -4130,44 +4216,44 @@ msgstr "Imprimir Factura"
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Abonos"
 
 #. 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 ""
+msgstr "¡Non foi posible atopar un período válido!"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Núm. de bono"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Romper conciliación das transaccións"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "Crear asientos dende modelos"
 
 #. module: account
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr ""
+msgstr "Permitir conciliación"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Estadísticas conta analítica"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4175,23 +4261,25 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Permite configurar automáticamente o seu plan contable, contas de bancos, "
+"impostos, e diarios según a plantilla seleccionada"
 
 #. module: account
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Impostos incluidos no prezo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Contabilidade. Libro de custos analíticos para informe diario"
 
 #. 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 ""
+msgstr "Modelos recurrentes"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4222,17 +4310,17 @@ msgstr "ErroDeUsuario"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr ""
+msgstr "Tipos de controis"
 
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "Actúa como unha conta por defecto para os importes no haber."
 
 #. module: account
 #: help:account.partner.ledger,reconcil:0
 msgid "Consider reconciled entries"
-msgstr ""
+msgstr "Considerar asentos conciliados."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4240,7 +4328,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr ""
+msgstr "Asertar asentos"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4252,13 +4340,13 @@ msgstr "Cancelado"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Saldo de peche baseado na caixa."
 
 #. module: account
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "¡Erro! Non podes crear contas recursivas."
 
 #. module: account
 #: constraint:account.account:0
@@ -4272,19 +4360,19 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Xerar asentos"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Selecciona plan de impostos"
 
 #. 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 ""
+msgstr "Mapeo de contas"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -4303,13 +4391,13 @@ msgstr "Confirmado"
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancelada"
 
 #. module: account
 #: code:addons/account/invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s' !"
-msgstr ""
+msgstr "¡Debe definir un diario analítico de tipo '%s'!"
 
 #. module: account
 #: code:addons/account/account.py:1397
@@ -4319,17 +4407,20 @@ msgid ""
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Non se puido crear o movemento con moeda distinta da moeda secundaria da "
+"conta \"%s - %s\". Borrar o campo de moeda secundaria da definición da conta "
+"si se desexa aceptar todas as moedas."
 
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
-msgstr ""
+msgstr "Data operación"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr ""
+msgstr "Código imposto reintegro"
 
 #. module: account
 #: view:validate.account.move:0
@@ -4337,6 +4428,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 ""
+"Todos os asientos borrador de este diario e período serán validados. Esto "
+"significa que xa non poderá modificar os seus campos contables."
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -4346,23 +4439,24 @@ msgstr "Balance de conta -"
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data de inicio"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Conta de ingresos en plantilla producto"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
 msgstr ""
+"Data na que os asentos contables da empresa foron conciliados por última vez."
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Novo exercicio fiscal"
 
 #. module: account
 #: view:account.invoice:0
@@ -4374,7 +4468,7 @@ msgstr ""
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Facturas"
 
 #. module: account
 #: code:addons/account/invoice.py:804
@@ -4383,6 +4477,8 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
 msgstr ""
+"¡Por favor, conprobe o importe da factura!\n"
+"O total real non coincide co total calculado."
 
 #. module: account
 #: view:account.invoice:0
@@ -4390,68 +4486,68 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturado"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr ""
+msgstr "Usar modelo"
 
 #. module: account
 #: view:account.state.open:0
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "A base do imposto da declaración de impostos"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Engadir"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Deixalo vacío para empregar a data actual"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr ""
+msgstr "Banco e cheques"
 
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure ?"
-msgstr ""
+msgstr "¿Estás seguro?"
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "O extracto bancario empregado para a conciliación bancaria"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "As facturar borrador son válidas. "
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr ""
+msgstr "Calcular"
 
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Aplicación de impostos"
 
 #. module: account
 #: view:account.move:0
@@ -4476,17 +4572,17 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Elementos de diario"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgid "Balance Sheet (Asset Accounts)"
+msgstr "Balance de situación (contas de activos)"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Third Party (Country)"
-msgstr ""
+msgstr "Terceira parte (país)"
 
 #. module: account
 #: code:addons/account/account.py:938
@@ -4521,18 +4617,18 @@ msgstr ""
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
 msgid "End of period"
-msgstr ""
+msgstr "Fin do período"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Detalles bancarios"
 
 #. module: account
 #: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
-msgstr ""
+msgstr "¡Faltan os impostos!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4540,48 +4636,53 @@ 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 (ou costes) para un periodo determinado. "
+"No informe listase o código, o nome do movemento, o número de conta, o "
+"importe xeral e o 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."
 msgstr ""
+"Marque esta opción si se empregará o diario para facturas rectificativas "
+"(abonos)."
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Xerar asentos de apertura de exercicio fiscal"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Agrupar líneas de factura"
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: view:account.invoice.confirm:0
 msgid "Close"
-msgstr ""
+msgstr "Pechar"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr ""
+msgstr "Movementos"
 
 #. 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 ""
+msgstr "Contabilidade Declaración IVE"
 
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Para pechar"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr ""
+msgstr "Comprobar data non está no período"
 
 #. module: account
 #: code:addons/account/account.py:1210
@@ -4591,35 +4692,37 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
+"¡Non pode modificar un asento asentado de neste diario!\n"
+"Debe configurar o diario para permitir a cancelación de asentos se quere "
+"facelo."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr ""
+msgstr "Plantillas"
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Contas impuestos fillas"
 
 #. module: account
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "O período inicial debería ser mais pequeno que o período final"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "5"
-msgstr ""
+msgstr "Función XSLT/XPath non válida."
 
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Balance analítico"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4632,10 +4735,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4645,53 +4746,64 @@ msgstr ""
 #: 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
 msgid "Target Moves"
-msgstr ""
+msgstr "Movementos destino"
 
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr ""
+msgstr "Tipo de período"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Pagos"
 
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "Código Cálculo Inverso"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "Asento"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Código Python (inverso)"
 
 #. 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 ""
+msgstr "Condicións de Pago"
 
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Nome da Columna"
 
 #. 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 unha vista xeral da situación dos seus diarios"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4702,17 +4814,17 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "Apertura da ciaxa"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr ""
+msgstr "Liña 1:"
 
 #. module: account
 #: code:addons/account/account.py:1167
@@ -4728,46 +4840,48 @@ msgstr "Nome interno"
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "mes"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "O apunte \"%s\" non é válido"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on invoices"
-msgstr ""
+msgstr "Descipción en facturas"
 
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Próxima empresa a conciliar"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr ""
+msgstr "Conta de impuesto"
 
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Resultado da conciliación"
 
 #. 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
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Balance de situación"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "Informes contables"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4780,24 +4894,24 @@ msgstr "Entradas"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Este periodo"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:138
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr ""
+msgstr "Non se atopou período na factura"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Código para calcular (se tipo=código)"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -4808,7 +4922,7 @@ msgstr ""
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Venda"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4829,7 +4943,7 @@ msgstr "Cantidade"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr ""
+msgstr "Asento fin de Exercicio Fiscal"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4839,7 +4953,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "Validación"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -4847,12 +4961,14 @@ msgid ""
 "The Journal Entry of the invoice have been totally reconciled with one or "
 "several Journal Entries of payment."
 msgstr ""
+"O asento da factura foi totalmente conciliado con un ou varios asentos de "
+"pago."
 
 #. module: account
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Importo en fillos"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -4865,7 +4981,7 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
-msgstr ""
+msgstr "¡Non se atopou o período!"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -4875,17 +4991,17 @@ msgstr "Permitir cancelar entradas"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Coeficiente para padre"
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Nombre de Cuenta/Empresa"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "Transacción"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4897,33 +5013,33 @@ msgstr ""
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr ""
+msgstr "Empregue este código para a declaración do IVE."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Debit/Credit"
-msgstr ""
+msgstr "Debe/Haber"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Estadísticas de asientos analíticos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr ""
+msgstr "Plantillas códigos de impuestos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr ""
+msgstr "account.installer"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Incluir en Importe Base"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -4931,6 +5047,8 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Número de días a engadir antes do cálculo do día de mes. Se data=15/01, "
+"Número de días=22 e Día de mes=-1, entonces a data de vencemento e 28/02."
 
 #. module: account
 #: code:addons/account/account.py:2896
@@ -4938,18 +5056,18 @@ msgstr ""
 #: code:addons/account/installer.py:295
 #, python-format
 msgid "Bank Journal "
-msgstr ""
+msgstr "Diario bancario "
 
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Controis de asento"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(deixalo vacío para abrir a situación actual)"
 
 #. module: account
 #: field:account.analytic.Journal.report,date1:0
@@ -4958,7 +5076,7 @@ msgstr ""
 #: field:account.analytic.cost.ledger.journal.report,date1:0
 #: field:account.analytic.inverted.balance,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "Inicio do período"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1193
@@ -4967,35 +5085,37 @@ msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
 "you can just change some non important fields !"
 msgstr ""
+"¡Non pode facer esta modificación nun asento conciliado! ¡Observer que so "
+"pode cambiar algúns campos non importantes!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Contabilidade. Informe contable común"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicación"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Contabilidade analítica"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Factura rectificativa (abono) de cliente"
 
 #. module: account
 #: view:account.account:0
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr ""
+msgstr "Impostos por defecto"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5003,17 +5123,17 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Signo código imposto"
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Informe de facturas creadas nos últimos 15 días"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Diario asentos peche do exercicio"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
@@ -5026,7 +5146,7 @@ msgstr ""
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "¡Erro de configuración!"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5035,16 +5155,18 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Estas son as empresas restantes as que debería comprobar se hai algo para "
+"conciliar ou non. Esta cifra xa contabiliza a empresa actual como conciliada."
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "Líneas dos asentos períodicos"
 
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Cantidade de productos"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5053,30 +5175,30 @@ msgstr ""
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr ""
+msgstr "Non asentado"
 
 #. 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 ""
+msgstr "Cambiar moeda"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr ""
+msgstr "Asentos contables"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Data de pago"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5084,7 +5206,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_analytic_open
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Contas analíticas"
 
 #. module: account
 #: help:account.account.type,report_type:0
@@ -5092,11 +5214,13 @@ msgid ""
 "According value related accounts will be display on respective reports "
 "(Balance Sheet Profit & Loss Account)"
 msgstr ""
+"Según o valor relacionado as contas mostraránse nos seus respectivos "
+"informes (Balance de situación contable pérdidas e ganancias)"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort By"
-msgstr ""
+msgstr "Ordear Por"
 
 #. module: account
 #: code:addons/account/account.py:1326
@@ -5105,13 +5229,15 @@ msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Non se definiu unha conta haber por defecto\n"
+"no 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 ""
+msgstr "Importe divisa"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5120,11 +5246,13 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
+"O diario indicado non ten asentos 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 ""
+msgstr "Líneas a conciliar"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5139,17 +5267,17 @@ msgstr ""
 #: field:report.account.sales,quantity:0
 #: field:report.account_type.sales,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidade"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Número (movementos)"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "Opcións factura rectificativa (abono)"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5157,6 +5285,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 ""
+"A potencia da conciliación automática a seleccionar e o número dos importes "
+"parciais que se poden combinar para atopar un saldo a cero."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5164,19 +5294,21 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
+"O campo secuencia e empregado para ordear as liñas 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 ""
+msgstr "Plantilla de posición fiscal"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:account.chart:0
 #: view:account.tax.chart:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Abrir taboa"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -5186,6 +5318,10 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Si non debe introducir mais asentos nun exercicio fiscal, podeo pechar dende "
+"aquí. Pecharanse todos os períodos abertos neste exercicio que fará "
+"imposible introducir ningún asento novo. Peche un exercicio fiscal cando "
+"precise finalizar os resultados de fin de exercicio definitivamente. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5195,66 +5331,66 @@ msgstr ""
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr ""
+msgstr "Con divisa"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr ""
+msgstr "Abrir caixa"
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Conciliación con desfase"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Cantidade fixa"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Válido ata"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "A cobrar vencidos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Contabilidade. Conciliación automática"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Apunte contable"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr ""
+msgstr "Diario movementos"
 
 #. 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 ""
+msgstr "Xerar asentos de apertura"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
-msgstr ""
+msgstr "¡Xa está conciliado!"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "O método de cálculo do importe do imposto."
 
 #. module: account
 #: help:account.installer.modules,account_anglo_saxon:0
@@ -5262,40 +5398,42 @@ msgid ""
 "This module will support the Anglo-Saxons accounting methodology by changing "
 "the accounting logic with stock transactions."
 msgstr ""
+"Este módulo soporta a metodoloxía contable angloxajona, cambiando a lóxica "
+"contable nas transaccións de stock."
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creación"
 
 #. module: account
 #: view:account.analytic.journal:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr ""
+msgstr "Diarios analíticos"
 
 #. module: account
 #: field:account.account,child_id:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Contas Fillas"
 
 #. module: account
 #: view:account.move.line.reconcile:0
 #: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Desaxuste"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Total a pagar"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -5304,7 +5442,7 @@ msgstr ""
 #: code:addons/account/invoice.py:322
 #, python-format
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -5313,17 +5451,17 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr ""
+msgstr "Plantilla de conta"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Conta nº"
 
 #. module: account
 #: help:account.installer.modules,account_payment:0
@@ -5331,11 +5469,13 @@ msgid ""
 "Streamlines invoice payment and creates hooks to plug automated payment "
 "systems in."
 msgstr ""
+"Axiliza o pago de facturas e crea interfaces para conectar sistemas de pago "
+"automatizados."
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "Valoración"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5345,33 +5485,33 @@ msgstr ""
 #: code:addons/account/report/account_partner_balance.py:306
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Contas a cobrar e pagar"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Mapeo fiscal"
 
 #. 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 ""
+msgstr "Contabilidade. Abrir estado"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Ctdade máx."
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Reintegrar factura"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Dirección de factura"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -5380,6 +5520,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Dende esta vista obtense unha análise das suas distintas contas financeiras. "
+"O documento mostra o debe e o haber tendo en consideración algún criterio "
+"que pode seleccionar empregando a ferramenta de busca."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5388,6 +5531,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 ""
+"A definición dos códigos de impostos depende da declaración de impostos do "
+"seu país. OpenERP permitelle definir e xestionar a estructura de impostos "
+"dende este menú. Pode  definir códigos tanto numéricos como alfanuméricos."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5395,6 +5541,8 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Mostralle o progreso realizado hoxe no proceso de conciliación. Indica:\n"
+"Empresas conciliadas hoxe/ (Empresas restantes + Empresas conciliadas hoxe)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5403,6 +5551,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Seleccione aquí o tipo de valoración relacionada con esta línea de plazo de "
+"pago. Teña en conta que debe ter a última lña co tipo 'Saldo' para "
+"garantizar que o importe total sexa procesado."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5410,19 +5561,19 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Forzar período"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# de líneas"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "¡A nova moeda non está configurada correctamente!"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5441,121 +5592,134 @@ msgstr ""
 #: field:account.report.general.ledger,filter:0
 #: field:account.vat.declaration,filter:0
 msgid "Filter by"
-msgstr ""
+msgstr "Filtrar por"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1131
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
-msgstr ""
+msgstr "¡Non pode empregar unha conta inactiva!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
-msgstr ""
+msgstr "¡Os asentos non son da mesma conta ou xa están conciliados! "
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Factura de conta de impostos"
 
 #. 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 ""
+msgstr "Contabilidade. Diario xeral"
 
 #. 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 ""
+msgstr "Non filtrar"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Número de Días"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
 #: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "¡Acción non válida!"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr ""
+msgstr "Período: %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Plantilla posición fiscal imposto"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Este nome mostrarase nos informes"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Data de impresión"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr ""
+msgstr "Ningún"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 Días  "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Facturas rectificativas de cliente"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Cálculo importe"
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Nome diario-período"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr ""
+msgstr "Factor de multiplicación para código base"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "non implementado"
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Compañía relacionada con este diario"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5564,34 +5728,36 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
+"¡A(s) factura(s) seleccionada(s) non se pode confirmar xa que non está en "
+"estado 'Borrador' ou 'Pro-forma'!"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Observación posición fiscal:"
 
 #. module: account
 #: view:analytic.entries.report:0
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Análisis asentos analíticos"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Anterior"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Asento analítico"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Mensaxe pagos vencidos"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -5601,35 +5767,40 @@ 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 pode ser empregada polos contables para rexistrar asentos "
+"rápidamente en OpenERP. Se desexa rexistrar unha factura de proveedor, "
+"comece rexistrando o apunte da conta de gastos. OpenERP proporalle "
+"automáticamente o imposto asociado a esa conta e a \"conta a pagar\" de "
+"contrapartida."
 
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "Data de creación"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+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 ""
+msgstr "O código empregarare para xerar os números de asentos deste diario."
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(vacío para período actual)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
-msgstr ""
+msgstr "Tan pronto como a conciliación se realizou"
 
 #. module: account
 #: code:addons/account/invoice.py:997
@@ -5641,60 +5812,60 @@ msgstr ""
 #: view:account.chart.template:0
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Conta principal"
 
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Data última conciliación"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Liña analítica"
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Impostos cliente"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Crear unha conta baseada en esta plantilla"
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Configuración informes"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "A compañía debe ser a mesma nos seus períodos e contas relacionadas."
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Tipo 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 ""
+msgstr "Plantillas de contas"
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Declaración de impostos"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: account
 #: code:addons/account/account.py:532
@@ -5703,26 +5874,27 @@ msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
 "Lines"
 msgstr ""
+"Non pode modificar a compañía da conta porque xa hai apuntes con esa conta"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Seleccionar un exercicio fiscal a pechar."
 
 #. 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 "Lista de todos os impostos que deben ser instalados polo asistente"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
 msgid "IntraCom"
-msgstr ""
+msgstr "IntraCom"
 
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Information addendum"
-msgstr ""
+msgstr "Información adicional"
 
 #. module: account
 #: field:account.aged.trial.balance,fiscalyear_id:0
@@ -5747,7 +5919,7 @@ msgstr "Exercicio fiscal"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr ""
+msgstr "Asentos parcialmente conciliados"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5795,49 +5967,49 @@ msgstr "Cancelar"
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
-msgstr ""
+msgstr "Nome tipo conta"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr ""
+msgstr "Por cobrar"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr ""
+msgstr "Outra información"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr ""
+msgstr "Conta haber por defecto"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Configure o seu plan contable"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 30"
-msgstr ""
+msgstr "  Número de días: 30"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "A moeda contable relacionada se non é igual a da compañía."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "Corrente"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr ""
+msgstr "Caixa"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -5847,27 +6019,27 @@ msgstr "Porcentaxe"
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Diario e Empresa"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr ""
+msgstr "Enerxía"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr ""
+msgstr "Tipo abono"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Prezo"
 
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Ver as liñas contables analíticas"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -5878,7 +6050,7 @@ msgstr ""
 #: field:account.invoice,internal_number:0
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Número de factura"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -5886,22 +6058,24 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Indica si o importe do imposto debe ser incluido no importe base para o "
+"cálculo dos seguintes impostos."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Conciliación: ir a seguinte empresa"
 
 #. 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 ""
+msgstr "Saldo analítico invertido"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Tipo aplicable"
 
 #. module: account
 #: field:account.invoice,reference:0
@@ -6378,6 +6552,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6607,7 +6782,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -6938,7 +7113,7 @@ msgstr ""
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "Non balanceado"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7277,6 +7452,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7529,6 +7705,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7611,14 +7800,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7730,6 +7911,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7967,6 +8154,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8248,12 +8436,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8336,6 +8529,11 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"Con facturas rectificativas de proveedores pode xestionar as facturas de "
+"abono que recibe dos seus fornecedores. Unha factura rectificativa e un "
+"documento que abona unha factura total ou parcialmente. Pode fácilmente "
+"xerar facturas rectificacivas e concilialas directamente dende o formulario "
+"de factura."
 
 #. module: account
 #: view:account.account.template:0
@@ -8371,7 +8569,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8390,6 +8593,15 @@ 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 ""
 
@@ -8587,7 +8799,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8604,12 +8816,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8629,7 +8846,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8810,6 +9027,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8891,6 +9109,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -9100,13 +9330,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9130,7 +9357,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9300,7 +9527,7 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Movementos de desaxuste"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -9338,6 +9565,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9411,6 +9639,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Con movementos"
 
@@ -9780,6 +10018,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Select Message"
 #~ msgstr "Seleccionar mensaxe"
 
@@ -9792,9 +10042,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Entradas totais"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Desc. (%)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo incorrecto na definición da acción."
 
@@ -9819,153 +10066,6 @@ msgstr ""
 #~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
 #~ "especial!"
 
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Mostrar información débito/crédito"
-
-#~ msgid "All accounts"
-#~ msgstr "Todas as contas"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Selección de entradas baseada en"
-
-#~ msgid "Notification"
-#~ msgstr "Notificación"
-
-#~ msgid "Financial Period"
-#~ msgstr "Periodo financeiro"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Selecciona período(s)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Comparar exercicios seleccionados en térmos de"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Seleccionar exercicio(s) fiscai(s) (máximo 3 exercicios)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Selecciona conta de referencia (para comparación %)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Balance contábel-Compara exercicios"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "O módulo de balance de contas é unha funcionalidade engadida ao módulo de "
-#~ "xestión financieira.\n"
-#~ "\n"
-#~ "    Este módulo ofrece diversas opcións de impresión de balances.\n"
-#~ "\n"
-#~ "    1. Podese comparar o balance de distintos anos.\n"
-#~ "\n"
-#~ "    2. Pode establecer a comparación en importe ou porcentual entre dous "
-#~ "anos.\n"
-#~ "\n"
-#~ "    3. Pode establecer a conta de referencia para a comparación porcentual "
-#~ "para anos en particular.\n"
-#~ "\n"
-#~ "    4. Pode seleccionar períodos como unha data real ou períodos como data "
-#~ "de creación.\n"
-#~ "\n"
-#~ "    5. Pode imprimir o informe que desexe en formato apaisado.\n"
-#~ "    "
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Debe seleccionar a opción 'Horizontal'. Por favor, márquea."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Mostrar informe en formato horizontal"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Mostrar comparación en %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Non comparar"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Mostrar contas"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Debe seleccionar máis de 3 exercicios en calquera caso."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Xestión contable e financieira - Comparación de contas"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr ""
-#~ "Pode seleccionar un máximo de 3 exercicios. Por favor, seleccione outra vez."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Seleccionou a opción 'Porcentaxe' con máis de 2 exercicios, pero non "
-#~ "seleccionou formato horizontal."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Podería ter cometido os seguintes erros. Por favor, corríxaos e ténteo de "
-#~ "novo."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Deixalo baleiro para comparar cos seus pais"
-
-#~ msgid "Creation Date"
-#~ msgstr "Creación de data"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Non seleccionou a opción 'Porcentaxe', pero seleccionou máis de 2 "
-#~ "exercicios."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Pode ter seleccionado as opcións comparar con máis dun 1 exercicio con "
-#~ "columnas crédito/débito e opción %. Isto pode ocasionar que haxa contidos "
-#~ "que se impriman fóra do papel. Por favor, inténteo de novo."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr ""
-#~ "Debe seleccionar a lo menos un exercicio fiscal. Por favor, inténteo de novo."
-
-#~ msgid "Customize Report"
-#~ msgstr "Informe personalizado"
-
-#~ msgid "Account Information"
-#~ msgstr "Información da conta"
-
-#~ msgid "Printing date:"
-#~ msgstr "Data impresión:"
-
-#~ msgid "at"
-#~ msgstr "ás"
-
-#~ msgid "Currency:"
-#~ msgstr "Moeda:"
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "¡O estado do saldo é incorrecto!\n"
@@ -9974,3 +10074,14 @@ msgstr ""
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "O balance agardado(%.2f) é diferente do calculado: (%.2f)"
+
+#, python-format
+#~ msgid "Invoice "
+#~ msgstr "Factura "
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance de situación (contas de activos)"
+
+#, python-format
+#~ msgid "is validated."
+#~ msgstr "está validada."
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 8a2e2ed6e87..c38db31fea3 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/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: 2011-04-29 05:06+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "સમયગાળો"
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr "જનરલ"
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "OK"
 #~ msgstr "બરાબર"
 
@@ -9663,6 +9795,3 @@ msgstr ""
 
 #~ msgid "_Cancel"
 #~ msgstr "રદ કરો (_C)"
-
-#~ msgid "Disc. (%)"
-#~ msgstr "છુટ"
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 2008cd4d734..4a54084cd37 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: 2011-06-20 04:33+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -34,7 +34,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +66,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr ""
@@ -131,7 +131,7 @@ msgid "Accounting Entries-"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr ""
@@ -175,7 +175,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "account.tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -255,7 +255,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -271,7 +271,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -309,7 +309,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -551,7 +549,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr ""
@@ -633,7 +631,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -666,8 +664,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -728,7 +726,7 @@ msgid "Analytic Entries by line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -829,7 +827,7 @@ msgid "Next Partner to reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -951,11 +949,11 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1034,6 +1032,7 @@ 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 "-"
@@ -1127,7 +1126,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1265,6 +1264,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr ""
@@ -1306,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -1387,7 +1397,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1546,6 +1556,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1612,7 +1623,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1645,7 +1656,7 @@ msgid "Receivables & Payables"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr ""
@@ -1681,7 +1692,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1702,7 +1713,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1718,7 +1729,7 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -1987,7 +1998,7 @@ msgid " Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2008,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2039,7 +2050,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2059,7 +2070,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2070,9 +2081,10 @@ msgid "Accounting Properties"
 msgstr ""
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2094,12 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2208,7 +2224,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2278,7 +2294,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2362,7 +2378,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2374,12 +2390,13 @@ msgid "Average Price"
 msgstr ""
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2524,16 +2541,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2693,7 +2712,7 @@ msgid "Analytic Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2816,7 +2835,7 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2925,9 +2944,7 @@ msgstr ""
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2941,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -2986,7 +3014,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3028,6 +3056,7 @@ msgstr ""
 #: 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
@@ -3079,7 +3108,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -3140,7 +3169,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3208,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3252,7 +3291,6 @@ 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
 #: view:account.move:0
@@ -3296,7 +3334,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3305,13 +3343,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3431,7 +3469,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3442,14 +3480,14 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3647,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -3743,7 +3780,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3802,7 +3839,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3977,7 +4014,7 @@ msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4048,11 +4085,11 @@ msgid "Change"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4156,7 +4193,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4221,7 +4258,7 @@ msgid "Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4324,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4333,24 +4370,25 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4372,7 +4410,7 @@ msgid "Bank Details"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr ""
@@ -4427,7 +4465,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4446,7 +4484,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4462,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4475,11 +4512,8 @@ msgstr ""
 #: 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
 #: 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
@@ -4489,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4559,7 +4603,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4605,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4705,7 +4751,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4777,7 +4823,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4805,7 +4851,7 @@ msgid "Start of period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4861,12 +4907,12 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4943,7 +4989,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5090,7 +5136,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5126,7 +5172,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5263,7 +5309,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5288,14 +5334,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5314,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -5330,7 +5389,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5541,7 +5600,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5807,9 +5866,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -5958,8 +6017,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -5970,7 +6029,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6008,7 +6067,7 @@ msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6072,31 +6131,30 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6206,7 +6264,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6227,7 +6285,6 @@ msgstr ""
 #: 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 ""
@@ -6281,7 +6338,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6311,7 +6368,7 @@ msgid "Child Codes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6454,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -6468,7 +6525,7 @@ msgid "Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6636,7 +6693,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6740,7 +6797,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6769,6 +6826,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -6798,7 +6856,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
@@ -6824,13 +6881,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6848,7 +6905,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7082,17 +7139,17 @@ msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7155,7 +7212,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7204,7 +7261,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7265,7 +7322,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7330,7 +7387,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7365,7 +7422,6 @@ msgstr ""
 #: 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
@@ -7378,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7460,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7528,7 +7589,7 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7578,8 +7639,13 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr ""
 
@@ -7617,7 +7683,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7784,8 +7850,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -7796,7 +7862,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7990,14 +8056,14 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8046,7 +8112,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8062,7 +8128,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8099,18 +8165,22 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8147,7 +8217,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8175,7 +8245,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8223,8 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8243,7 +8317,15 @@ 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 ""
 
@@ -8358,7 +8440,6 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8366,7 +8447,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8442,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8459,13 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8485,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8504,7 +8589,7 @@ msgid "Account Subscription"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8531,7 +8616,6 @@ msgstr ""
 #: 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
@@ -8560,7 +8644,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -8618,13 +8702,13 @@ msgid "Active"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8671,6 +8755,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -8748,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8906,6 +9003,7 @@ msgstr ""
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr ""
 
@@ -8924,7 +9022,6 @@ msgstr ""
 #: 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
@@ -8957,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8978,7 +9072,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -8987,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9128,8 +9222,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9199,6 +9293,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -9232,7 +9327,7 @@ msgid "Recurring"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9253,7 +9348,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9268,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9383,7 +9488,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9408,7 +9513,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9613,7 +9718,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr ""
@@ -9636,3 +9741,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index 69dcc54f033..e8b2a167f67 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: 2011-04-29 05:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -485,8 +485,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1121,6 +1119,7 @@ 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
@@ -1308,6 +1307,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2011,7 +2020,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2075,6 +2084,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2096,11 +2107,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2417,6 +2433,7 @@ 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
@@ -2662,6 +2679,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2927,7 +2946,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2941,6 +2959,17 @@ msgstr ""
 #: 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 ""
 
@@ -3150,6 +3179,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3208,6 +3238,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3646,11 +3686,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4323,7 +4362,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4462,7 +4501,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4475,10 +4513,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4488,6 +4524,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4604,6 +4650,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5313,6 +5361,19 @@ msgstr ""
 
 #. 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 ""
@@ -6221,6 +6282,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6450,7 +6512,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7120,6 +7182,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7372,6 +7435,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7454,14 +7530,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7573,6 +7641,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7810,6 +7884,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8091,12 +8166,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8214,7 +8294,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8233,6 +8318,15 @@ 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 ""
 
@@ -8430,7 +8524,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8447,12 +8541,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8472,7 +8571,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8653,6 +8752,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8734,6 +8834,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8943,13 +9055,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8973,7 +9082,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9181,6 +9290,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9254,6 +9364,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9623,6 +9743,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr "वितीय वर्ष की समाप्ति के लिए जोर्नल परिभाषित नहीं है"
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 72899bbb623..9ff165ef150 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-17 06:59+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
+"PO-Revision-Date: 2011-11-07 12:52+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: 2011-04-29 05:10+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Poredak plaćanja"
 
 #. module: account
 #: view:account.journal:0
@@ -38,7 +38,8 @@ msgstr "Nije definiran dnevnik završetka ove fiskalne godine"
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
-msgstr "Konto se koristi kao obilježje partnera."
+msgstr ""
+"Ne možete obrisati/deaktivirati konto koji se koristi kao obilježje partnera."
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -489,8 +490,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1131,6 +1130,7 @@ msgstr "Broj transakcija"
 
 #. 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
@@ -1318,6 +1318,16 @@ msgstr "Ne možete koristiti odabrani opći konto u ovon dnevniku!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Sa saldom različitim od 0"
 
@@ -1827,7 +1837,7 @@ msgstr "Ispis dnevnika"
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Kategorija proizvoda"
+msgstr "Grupa proizvoda"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -2025,7 +2035,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Traži predloške kontnog plana"
 
 #. module: account
@@ -2089,6 +2099,8 @@ msgstr "Računovodstveni podaci"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Stavke poredane po"
 
@@ -2110,11 +2122,16 @@ msgstr "Predložak proizvoda"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2436,6 +2453,7 @@ msgstr "Pop.(%)"
 
 #. 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
@@ -2681,6 +2699,8 @@ msgstr "Financijsko računovodstvo"
 #. 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
 msgid "Profit And Loss"
 msgstr "Račun dobiti i gubitka"
 
@@ -2948,7 +2968,6 @@ msgstr "Ostavite prazno za korištenje konta troška"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2962,6 +2981,17 @@ msgstr "Ostavite prazno za korištenje konta troška"
 #: 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 "Dnevnici"
 
@@ -3171,6 +3201,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Protustavka"
 
@@ -3229,6 +3260,16 @@ msgstr "PDV :"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontni plan"
 
@@ -3671,11 +3712,10 @@ msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Gubitak"
 
@@ -4352,7 +4392,7 @@ msgstr "Stavke dnevnika"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Bilanca (konta imovine)"
 
 #. module: account
@@ -4491,7 +4531,6 @@ msgid "Analytic Balance -"
 msgstr "Analitički saldo -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4504,10 +4543,8 @@ msgstr "Analitički saldo -"
 #: 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.journal.period.print: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
@@ -4517,6 +4554,16 @@ msgstr "Analitički saldo -"
 #: 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
 msgid "Target Moves"
 msgstr "Ciljna knjiženja"
 
@@ -4633,6 +4680,8 @@ msgstr "Rezultat zatvaranja"
 #: 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
 msgid "Balance Sheet"
 msgstr "Bilanca stanja"
 
@@ -5349,6 +5398,19 @@ msgstr "Glavna knjiga"
 
 #. 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 "Bez filtra"
@@ -5408,7 +5470,7 @@ msgstr "  365 dana  "
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Storno URE"
+msgstr "Povrati od kupca"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -6266,6 +6328,7 @@ msgstr "Fiskalna pozicija poreza"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6497,7 +6560,7 @@ msgstr "Retci analitike"
 #: 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 "
+"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) "
@@ -7172,6 +7235,7 @@ msgstr "Iznos (slovima) :"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7427,6 +7491,19 @@ msgstr "Računovodstvo i financije"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Period"
@@ -7509,14 +7586,6 @@ msgstr "Tel.:"
 msgid "Company Currency"
 msgstr "Valuta tvrtke"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Kontni plan"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7628,6 +7697,12 @@ msgstr "Dnevnik povrata"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Filtriraj po"
 
@@ -7866,6 +7941,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8149,12 +8225,17 @@ msgstr "Upravljanje opomenama"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Od perioda"
 
@@ -8272,7 +8353,12 @@ msgstr "Ostavite prazno za  koto prihoda"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8291,6 +8377,15 @@ 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 "Prikaži konto"
 
@@ -8490,7 +8585,7 @@ msgstr "Srpanj"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"
 
 #. module: account
@@ -8507,12 +8602,17 @@ msgstr "Saldo Analitike"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Do perioda"
 
@@ -8532,7 +8632,7 @@ msgstr "Do perioda"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"
 
 #. module: account
@@ -8715,6 +8815,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8726,7 +8827,7 @@ msgstr ""
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr "Kredit"
+msgstr "Potražuje"
 
 #. module: account
 #: help:account.invoice.refund,journal_id:0
@@ -8796,6 +8897,18 @@ msgstr "Općenito"
 #: selection:account.pl.report,filter: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
@@ -9005,13 +9118,10 @@ msgid "Tax Source"
 msgstr "Porez"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Neto dobit"
 
@@ -9035,7 +9145,7 @@ msgstr "Ne postoji konto prihoda za ovaj proizvod: \"%s\" (id:%d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9243,6 +9353,7 @@ msgstr "Račun Dobavljača"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9319,6 +9430,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Sa stavkama"
 
@@ -9688,6 +9809,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Sredstvo"
 
@@ -9709,9 +9842,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "U redu"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Popust (%)"
-
 #~ msgid "Printing Date"
 #~ msgstr "Datum ispisa"
 
@@ -9858,9 +9988,6 @@ msgstr ""
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nova izlazna faktura"
 
-#~ msgid "Partner ID"
-#~ msgstr "Šifra partnera"
-
 #~ msgid "Open State"
 #~ msgstr "Otvoreno stanje"
 
@@ -9900,9 +10027,6 @@ msgstr ""
 #~ msgid "Real Entries"
 #~ msgstr "Stvarne stavke"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Donešeni saldo"
-
 #~ msgid "Filter on Periods"
 #~ msgstr "Filtar po razdobljima"
 
@@ -10212,27 +10336,6 @@ msgstr ""
 #~ msgid "Date Invoiced"
 #~ msgstr "Datum izrade računa"
 
-#~ msgid "All accounts"
-#~ msgstr "Svi računi"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Odabir stavaka zasnovan na"
-
-#~ msgid "Notification"
-#~ msgstr "Obavijest"
-
-#~ msgid "Financial Period"
-#~ msgstr "Financijsko razdoblje"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Odaberite razdoblja"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Modul koji dodaje nove izvještaje na osnovi ACCOUNT Modula"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Izvještavanje o tvrtki Kupcu - Izvještavanje"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
@@ -10334,13 +10437,6 @@ msgstr ""
 #~ msgid "Statement reconcile line"
 #~ msgstr "Redak zatvaranja izvoda"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "The partner bank account to pay\n"
-#~ "Ostavite prazno ako je primjenjiva zadana vrijednost"
-
 #~ msgid "Print General Journal"
 #~ msgstr "Ispis glavne knjige"
 
@@ -10541,9 +10637,6 @@ msgstr ""
 #~ msgid "Journal code"
 #~ msgstr "Šifra dnevnika"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Period otpisa"
-
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definiraj fiskalne godine i odaberi kontne planove"
 
@@ -10683,9 +10776,6 @@ msgstr ""
 #~ msgid "Journal Purchase"
 #~ msgstr "Dnevnik nabave"
 
-#~ msgid "All account entries"
-#~ msgstr "Sve stavke konta"
-
 #~ msgid "Accounting entries at statement's confirmation"
 #~ msgstr "Knjiženja prilikom potvrde izvoda"
 
@@ -10793,21 +10883,12 @@ msgstr ""
 #~ "Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
 #~ "o kontu i njegovim specificnostima."
 
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Fiskalno mapiranje poreza"
-
 #~ msgid "Voucher Nb"
 #~ msgstr "Nbr Vaucera"
 
 #~ msgid "Journal de vente"
 #~ msgstr "Dnevnik Prodaje"
 
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Predlozci poreskih mapiranja"
-
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Napomena Fiskalnog mapiranja:"
-
 #~ msgid "From analytic accounts, Create invoice."
 #~ msgstr "Iz konta analitike, kreiraj račun."
 
@@ -10817,15 +10898,12 @@ msgstr ""
 #~ msgid "Journal de Banque CHF"
 #~ msgstr "Dnevnik CHF Banke"
 
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Fiskalna mapiranja"
-
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Predložak fiskalnog mapiranja"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Predložak fiskalnog mapiranja"
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Račun "
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilanca (konta imovine)"
+
+#~ msgid "Chart of Accounts"
+#~ msgstr "Kontni plan"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 1a8cc7b459c..4a366100553 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2011-11-07 12:52+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: 2011-04-29 05:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -520,8 +521,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1174,6 +1173,7 @@ msgstr "Tranzakció száma"
 
 #. 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
@@ -1363,6 +1363,16 @@ msgstr "Ezt a főkönyvi számlát nem használhatja ebben a naplóban!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Nem 0 egyenlegűek"
 
@@ -2105,7 +2115,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Számlatükör sablon keresése"
 
 #. module: account
@@ -2172,6 +2182,8 @@ msgstr "Könyvelési beállítások"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Tételek sorbarendezésének alapja"
 
@@ -2193,11 +2205,16 @@ msgstr "Terméksablon"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2532,6 +2549,7 @@ msgstr "Eng. (%)"
 
 #. 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
@@ -2792,6 +2810,8 @@ msgstr "Pénzügyi számvitel"
 #. 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
 msgid "Profit And Loss"
 msgstr "Eredménykimutatás"
 
@@ -3073,7 +3093,6 @@ msgstr "-"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3087,6 +3106,17 @@ msgstr "-"
 #: 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 "Naplók"
 
@@ -3302,6 +3332,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Ellenszámla"
 
@@ -3360,6 +3391,16 @@ msgstr "ÁFA :"
 #: 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.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 "Chart of Accounts"
 msgstr "Számlatükör"
 
@@ -3822,11 +3863,10 @@ msgid "Analytic Balance"
 msgstr "Gyűjtőkód kivonat"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Veszteség"
 
@@ -4525,7 +4565,7 @@ msgstr "Könyvelési tételsorok"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Mérleg (eszköz számlák)"
 
 #. module: account
@@ -4670,7 +4710,6 @@ msgid "Analytic Balance -"
 msgstr "Gyűjtőkód kivonat -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4683,10 +4722,8 @@ msgstr "Gyűjtőkód kivonat -"
 #: 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.journal.period.print: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
@@ -4696,6 +4733,16 @@ msgstr "Gyűjtőkód kivonat -"
 #: 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
 msgid "Target Moves"
 msgstr "Figyelembe vett tételek"
 
@@ -4812,6 +4859,8 @@ msgstr "Párosítás eredménye"
 #: 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
 msgid "Balance Sheet"
 msgstr "Mérleg"
 
@@ -5558,6 +5607,19 @@ msgstr "Általános napló"
 
 #. 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 "Nincs szűrés"
@@ -6507,6 +6569,7 @@ msgstr "ÁFA pozíció"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6769,7 +6832,7 @@ msgstr "Gyűjtőkód tételek"
 #: 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 "
+"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) "
@@ -7504,6 +7567,7 @@ msgstr "Összeg (betűkkel) :"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7767,6 +7831,19 @@ msgstr "Könyvelés és pénzügy"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Időszak"
@@ -7859,14 +7936,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Vállalat pénzneme"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Számlatükör"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7980,6 +8049,12 @@ msgstr "Jóváíró számla napló"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Szűrés"
 
@@ -8230,6 +8305,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8539,12 +8615,17 @@ msgstr "Fizetési emlékeztetők kezelése"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Kezdő időszak"
 
@@ -8668,7 +8749,12 @@ msgstr "-"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8687,6 +8773,15 @@ msgstr "Kézzel vagy automatikusan berögzítve a rendszerbe"
 
 #. 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 "Számla megjelenítése"
 
@@ -8903,7 +8998,7 @@ msgstr "Július"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Számlatükör"
 
 #. module: account
@@ -8920,12 +9015,17 @@ msgstr "Gyűjtőkód kivonat"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Záró időszak"
 
@@ -8945,7 +9045,7 @@ msgstr "Záró időszak"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Számlatükör"
 
 #. module: account
@@ -9140,6 +9240,7 @@ msgstr "Könyvelési tételek jóváhagyása"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -9227,6 +9328,18 @@ msgstr "Általános"
 #: selection:account.pl.report,filter: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
@@ -9441,13 +9554,10 @@ msgid "Tax Source"
 msgstr "Eredeti adó"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Nyereség"
 
@@ -9472,8 +9582,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "Napló"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9686,6 +9796,7 @@ msgstr "Bejövő számla"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9765,6 +9876,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Amelyeken van mozgás"
 
@@ -10144,6 +10265,18 @@ msgstr ""
 "A könyvelési tételben lévő vevőkövetelés vagy szállítói tartozás rendezetlen "
 "devizaösszege (eltérhet a vállalat pénznemétől)."
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Eszköz"
 
@@ -10234,9 +10367,6 @@ msgstr ""
 #~ msgid "Date End"
 #~ msgstr "Záró dátum"
 
-#~ msgid "Partner ID"
-#~ msgstr "Partner ID"
-
 #~ msgid "Document"
 #~ msgstr "Dokumentum"
 
@@ -10485,10 +10615,19 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Számla "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Mérleg (eszköz számlák)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "jóváhagyásra került."
 
+#~ msgid "Chart of Accounts"
+#~ msgstr "Számlatükör"
+
+#~ msgid "JNRL"
+#~ msgstr "Napló"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index dd4ccf6c2a8..dca71cfb112 100644
--- a/addons/account/i18n/id.po
+++ b/addons/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: 2011-04-29 05:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -135,7 +135,7 @@ msgstr ""
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr "Akuntansi Entri"
+msgstr "Entri Akuntansi"
 
 #. module: account
 #: code:addons/account/account.py:1291
@@ -204,7 +204,7 @@ msgstr "Seluruh Ayat Analitik"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Invoice/Tagihan yang Dibuat dalam 15 Hari Terakhir"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -224,6 +224,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Tentukan tipe jurnal analitis. Jika dibutuhkan sebuah dokumen (mis. invoice) "
+"untuk membuat berbagai entri analitis, OpenERP akan mencari jurnal yang "
+"sesuai dari tipe yang sama."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -305,7 +308,7 @@ msgstr "Saldo Terhitung"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Manual Operasional"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -523,8 +526,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1046,7 +1047,7 @@ msgstr "Minggu dalam setahun"
 #: field:account.pl.report,display_type:0
 #: field:account.report.general.ledger,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "Modus Datar"
 
 #. module: account
 #: view:board.board:0
@@ -1120,7 +1121,7 @@ msgstr "Awal Periode"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Konfirmasi pernyataan"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1182,6 +1183,7 @@ msgstr "# dari Transaksi"
 
 #. 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
@@ -1193,6 +1195,7 @@ msgstr "Judul Catatan"
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
+"Anda tidak dapat mengubah / menghapus jurnal dengan entri untuk periode ini"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1369,6 +1372,16 @@ msgstr "Anda tidak dapat menggunakan akun umum ini di jurnal ini !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Dengan saldo tidak sama dengan 0"
 
@@ -1416,7 +1429,7 @@ msgstr "Lewati Status 'Konsep' untuk Catatan-catatan Manual"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Jumlah Tanpa Pajak"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1439,19 +1452,21 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Tabel sementara yang digunakan untuk tampilan Dashboard"
 
 #. 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 "Pengembalian Pemasok"
 
 #. 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 ""
+"Contoh: di 14 hari bersih 2 persentase, jumlah yang tersisa  30 hari pada "
+"akhir bulan."
 
 #. module: account
 #: code:addons/account/invoice.py:815
@@ -1461,6 +1476,9 @@ msgid ""
 "The payment term defined gives a computed amount greater than the total "
 "invoiced amount."
 msgstr ""
+"Tidak dapat membuat invoice!\n"
+"Jangka waktu pembayaran pasti memberikan jumlah yang dihitung lebih besar "
+"dari jumlah total tagihan."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
@@ -1481,17 +1499,17 @@ msgstr "Ditutup"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Operasional Entri"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "Template untuk Posisi Fiskal"
 
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "Tes Kode Pajak"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1522,23 +1540,25 @@ msgstr "Kelompok"
 #: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Tidak kena pajak"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "ke partner selanjutnya"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Pencarian statement Bank"
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Kesalahan nilai pada kredit atau debet ( kredit + debet harus lebih besar "
+"daripada \"0\" )"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1556,7 +1576,7 @@ msgstr "Akun Pengembalian Pajak"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Baris Statemen"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1568,11 +1588,17 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Sebuah statement bank adalah ringkasan dari semua transaksi keuangan yang "
+"terjadi selama periode waktu tertentu pada rekening deposito, kartu kredit "
+"atau jenis lain dari akun finansial. Saldo awal akan diajukan secara "
+"otomatis dan saldo akhir dapat ditemukan pada laporan Anda. Ketika Anda "
+"berada di kolom baris Pembayaran , anda dapat menekan F1 untuk membuka "
+"bentuk rekonsiliasi."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Tanggal / Kode"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1600,33 +1626,33 @@ msgstr "Tagihan"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Analitik biaya untuk invoice"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Urutan Tahun Fiskal"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr ""
+msgstr "Urutan Jurnal yang terpisah"
 
 #. module: account
 #: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "Bertanggung Jawab"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Sales Berdasarkan tipe akun"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1634,22 +1660,24 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Batalkan invoice : Buat invoice pengembalian, validasi dan rekonsiliasi "
+"untuk membatalkan invoice saat ini"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Penagihan"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr ""
+msgstr "Root kode pajak"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include initial balances"
-msgstr ""
+msgstr "Sertakan saldo awal"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1664,7 +1692,7 @@ msgstr ""
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Panduan ini akan mengubah mata uang invoice"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1673,22 +1701,25 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Tampilkan perusahaan Anda diagram akun per tahun fiskal dan filter oleh "
+"periode. Memiliki tampilan struktur pohon lengkap semua item jurnal per kode "
+"akun dengan mengklik account"
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Error! Anda tidak dapat menetapkan tumpang tindih tahun fiskal"
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Akun ini tidak didefinisikan untuk direkonsiliasi!"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Nilai"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1696,16 +1727,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Jika kolom aktif diatur ke False, itu akan memungkinkan Anda untuk "
+"menyembunyikan periode jurnal tanpa menghapusnya."
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr ""
+msgstr "Supplier Debet"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Jumlah pilihan di masukan"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1721,12 +1754,12 @@ msgstr "Anda harus menyediakan sebuah akun untuk penghapusan catatan !"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Laporan Rekening Jurnal Umum"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Semua Partner"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1736,12 +1769,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Grafik Akun Analitik"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Entri Saya"
 
 #. module: account
 #: report:account.overdue:0
@@ -1752,28 +1785,28 @@ msgstr "Ref. Pelanggan:"
 #: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "User% s tidak memiliki hak untuk mengakses jurnal% s!"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Periode ini bisa overlap."
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "Draft pernyataan"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Deklarasi Pajak: Catatan Kredit"
 
 #. module: account
 #: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "Anda tidak dapat menonaktifkan account yang berisi akun bergerak"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -1783,7 +1816,7 @@ msgstr "Jumlah Kredit"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Anda tidak dapat membuat line yang berindah pada account tertutup."
 
 #. module: account
 #: code:addons/account/account.py:519
@@ -1792,11 +1825,13 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains account entries!"
 msgstr ""
+"Anda tidak dapat mengubah jenis rekening dari 'Tertutup' ke jenis lain yang "
+"berisi entri account!"
 
 #. module: account
 #: view:res.company:0
 msgid "Reserve And Profit/Loss Account"
-msgstr ""
+msgstr "Akun Cadangan Dan Laba / Rugi"
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -1808,22 +1843,22 @@ msgstr "Nilai kredit atau debit salah dalam catatan akuntansi !"
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "Analisa Invoice"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "periode dekat"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Pengaturan Tahun Fiskal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Entri berdasarkan baris"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -1839,22 +1874,22 @@ msgstr "Ayat Jurnal"
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Deklarasi Pajak: Invoice"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Perbendaharaan Analisa"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! Anda tidak dapat membuat perusahaan secara berulang ulang"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1865,7 +1900,7 @@ msgstr "Akun Analitik"
 #: code:addons/account/account_bank_statement.py:332
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr ""
+msgstr "Harap memverifikasi bahwa account didefinisikan di dalam jurnal."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -1877,12 +1912,12 @@ msgstr "Berlaku"
 #: 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 "Akun Cetak Jurnal"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Kategori Produk"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1892,18 +1927,18 @@ msgstr "/"
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "Akun Cadangan & Laba / Rugi"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Closing balance based on Starting Balance and Cash Transactions"
-msgstr ""
+msgstr "Penutupan buku didasarkan pada Mulai Transaksi Saldo dan Kas"
 
 #. 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 "Perbandingan antara catatan akuntansi dan pembayaran"
 
 #. module: account
 #: view:account.tax:0
@@ -1917,6 +1952,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 ""
+"Centang kotak ini jika Anda ingin menggunakan urutan yang berbeda untuk "
+"setiap jurnal yang dibuat. Jika tidak, semua akan menggunakan urutan yang "
+"sama."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1925,6 +1963,8 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Hal ini akan menambahkan kolom mata uang jika mata uang yang berbeda maka "
+"mata uang perusahaan"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1938,14 +1978,14 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "Akun Laba Dan Rugi"
 
 #. 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 ""
+msgstr "Gambar"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1956,7 +1996,7 @@ msgstr ""
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Jumlah sebelum kena pajak"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1964,6 +2004,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Jika kolom aktif diset ke False, akan memungkinkan Anda untuk menyembunyikan "
+"pajak tanpa menghapusnya."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1972,13 +2014,16 @@ msgid ""
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"jika Anda memberikan Nama yang lain maka /, Akuntansi Entries Move dibuat "
+"dengan nama sama dengan nama laporan. Hal ini memungkinkan entri pernyataan "
+"untuk memiliki referensi yang sama dari pernyataan itu sendiri"
 
 #. 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 ""
+msgstr "Unreconciled Entri"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -1994,22 +2039,22 @@ msgstr "Tahun Pembukuan"
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr ""
+msgstr "Entri terbuka"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Akun untuk rekonsiliasi"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Impor pernyataan dalam sistem dari file elektronik"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Impor dari invoice"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2018,22 +2063,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Validasi"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Fiskal tahun ini"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Akun grafik pajak"
 
 #. module: account
 #: constraint:account.period:0
@@ -2041,6 +2086,8 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"periode tidak valid! Beberapa periode yang overlap atau periode tanggal "
+"tidak dalam lingkup tahun fiskal "
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2048,13 +2095,13 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: account
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " Jurnal"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -2063,6 +2110,8 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Tidak ada default standar rekening debet didefinisikan\n"
+"di jurnal yang \"%s\""
 
 #. module: account
 #: help:account.account,type:0
@@ -2075,11 +2124,16 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Tipe ini digunakan untuk membedakan jenis dengan efek khusus dalam ERP "
+"sistem: tampilan tidak dapat memiliki entri, konsolidasi rekening yang dapat "
+"memiliki rekening turunan untuk konsolidasi multi-perusahaan, hutang / "
+"piutang adalah piutang mitra (untuk debit / perhitungan kredit), akun "
+"tertutup untuk depresiasi."
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
-msgstr ""
+msgid "Search Chart of Accounts Templates"
+msgstr "Cari template grafik akun"
 
 #. module: account
 #: view:account.installer:0
@@ -2088,6 +2142,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Grafik akun standar harus yang sesuai dengan pilihan negara anda. Jika "
+"grafik akun tidak tersertifikasi untuk negara anda secara spesifik, maka "
+"grafik akun standar generik akan diinstallkan secara default."
 
 #. module: account
 #: view:account.account.type:0
@@ -2106,7 +2163,7 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
 #. module: account
 #: code:addons/account/account.py:2844
@@ -2119,36 +2176,38 @@ msgstr ""
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Berjalan"
 
 #. 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 ""
+msgstr "Akun pendapatan"
 
 #. module: account
 #: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr ""
+msgstr "Tidak ada Jurnal Akuntansi tipe of Sale / Purchase didefinisikan!"
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Properties Akutansi"
 
 #. 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
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Entri di sortir berdasarkan .."
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Ubah ke .."
 
 #. module: account
 #: view:account.entries.report:0
@@ -2158,16 +2217,21 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produk Template"
 
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2178,7 +2242,7 @@ msgstr ""
 #: report:account.vat.declaration:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Tahun Fiskal"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2197,7 +2261,7 @@ msgstr ""
 #: help:account.report.general.ledger,fiscalyear_id:0
 #: help:account.vat.declaration,fiscalyear_id:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "Tetap kosongkan untuk semua tahun fiskal yang terbuka"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2207,7 +2271,7 @@ msgstr "Ayat Akun"
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Urutan Utama"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2219,23 +2283,23 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Termin Pembayaran"
 
 #. 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 ""
+msgstr "Posisi Fiskal"
 
 #. module: account
 #: field:account.period.close,sure:0
 msgid "Check this box"
-msgstr ""
+msgstr "Centang Box ini"
 
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr ""
+msgstr "Filter"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2256,18 +2320,20 @@ msgstr "Buka"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Draft Status invoice"
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
+"Periksalah ini jika user diperbolehkan untuk menggabungkan entri dalam akun "
+"ini."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Mitra Rekonsiliasi"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2284,6 +2350,7 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Tidak dapat menemukan jurnal rekening dari% s tipe untuk perusahaan ini"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2295,6 +2362,7 @@ msgstr "Kode Dasar"
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
 msgstr ""
+"Memberikan perintah berurutan ketika menampilkan daftar pajak invoice."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2302,7 +2370,7 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Berdasarkan Daftar Kode"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2314,6 +2382,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 ""
+"Menu ini mencetak deklarasi PPN didasarkan pada faktur atau pembayaran. "
+"Pilih satu atau beberapa periode tahun fiskal. Informasi yang diperlukan "
+"untuk suatu pernyataan pajak secara otomatis dihasilkan menurut ERP sistem "
+"dari invoice (atau pembayaran, di beberapa negara). Data ini diperbaharui "
+"secara real time. Itu sangat berguna karena memungkinkan Anda untuk meninjau "
+"setiap saat pajak yang Anda berutang pada awal dan akhir bulan atau triwulan."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2324,7 +2398,7 @@ msgstr "Pengelompokan Debit"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Konfirmasi Draft Invoice"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2333,12 +2407,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Hari"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Akun untuk di perbaharui"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2366,6 +2440,11 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Jika Anda menggunakan persyaratan pembayaran, tanggal jatuh tempo akan "
+"dihitung secara otomatis pada generasi entri akuntansi. Jika Anda menjaga "
+"jangka waktu pembayaran dan tanggal jatuh tempo kosongkan, itu berarti "
+"pembayaran langsung. Jangka waktu pembayaran dapat menghitung beberapa "
+"tanggal jatuh tempo, misalnya 50% sekarang, 50% dalam satu bulan."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2375,7 +2454,7 @@ msgstr "Pilih periode"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Pernyataan"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2388,17 +2467,19 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Posisi fiskal akan menentukan pajak dan Akun yang digunakan untuk partner."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
+"Laporan ini memberikan Anda gambaran situasi sebuah jurnal yang spesifik."
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Error! Anda tidak dapat membuat kategori rekursif"
 
 #. module: account
 #: report:account.invoice:0
@@ -2416,7 +2497,7 @@ msgstr "Pajak"
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Akun Analisis"
 
 #. module: account
 #: view:account.account:0
@@ -2427,19 +2508,19 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Akun"
 
 #. module: account
 #: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurasi error !"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Harga Rata-rata"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2460,12 +2541,12 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Label"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informasi Akuntansi"
 
 #. module: account
 #: view:account.tax:0
@@ -2482,10 +2563,11 @@ msgstr "Rekonsiliasi Bank"
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Potongan (%)"
 
 #. 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
@@ -2496,12 +2578,12 @@ 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 "Rekening dapat menjadi basis kode pajak  atau kode account pajak."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Rekonsiliasi Otomatis"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2512,14 +2594,14 @@ msgstr "Terbayar/ Terekonsiliasi"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Pengembalian dana beradasarkan kode"
 
 #. 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 "Pernyataan Bank"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2532,7 +2614,7 @@ msgstr "Benar"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-msgstr ""
+msgstr "Tanggal"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2546,6 +2628,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Secara otomatis membuat entri berdasarkan apa yang telah dimasukkan dalam "
+"sistem sebelum tanggal spesifik"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2558,7 +2642,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Entri Akunting"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2574,30 +2658,35 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Centang box ini jika Anda tidak ingin entri jurnal baru untuk melewati "
+"status 'draft' dan bukannya pergi langsung ke 'status yang sudah diposting' "
+"tanpa validasi manual.\n"
+"Perhatikan bahwa jurnal entri yang otomatis akan dibuat menurut sistem "
+"dimana status selalu dilewat."
 
 #. 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 "Mengatur Keuangan Perusahaan Baru"
 
 #. 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 ""
+msgstr "Penjualan menurut Akun"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Panduan ini akan membuat entri akuntansi yang berulang"
 
 #. module: account
 #: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "Tidak ada sequence yang didefinisikan di jurnal ini!"
 
 #. module: account
 #: code:addons/account/account.py:2083
@@ -2607,7 +2696,7 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Anda harus mendefinisikan jurnal analitik di jurnal '%s'!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2620,14 +2709,14 @@ msgstr "Kode-kode pajak"
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Customer"
 
 #. 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 ""
+msgstr "Periode untuk"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2636,7 +2725,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "Agustus"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:306
@@ -2649,7 +2738,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "entri Pembayaran adalah input kedua dari rekonsiliasi"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2659,7 +2748,7 @@ msgstr ""
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Reference Number"
-msgstr ""
+msgstr "Nomor Referensi"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2668,7 +2757,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2676,6 +2765,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 ""
+"Jumlah pilihan dinyatakan oleh baris ini, misalnya: jumlah produk yang "
+"dijual. Jumlah yang tidak merupakan persyaratan hukum, tetapi sangat berguna "
+"untuk beberapa laporan."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2685,7 +2777,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Diperlukan"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2698,17 +2790,20 @@ msgstr "Akun Biaya"
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
+"Tetap kosongkan untuk menggunakan periode tanggal validasi (invoice)."
 
 #. module: account
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"digunakan dalam domain laporan rekonsiliasi, tetapi seharusnya tidak "
+"digunakan di tempat lain."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Dasar pengenakan pajak"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2731,6 +2826,8 @@ msgstr "Akuntansi Keuangan"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2996,7 +3093,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3010,6 +3106,17 @@ msgstr ""
 #: 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 "Jurnal-jurnal"
 
@@ -3219,6 +3326,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3277,6 +3385,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr "Bagan Akun"
 
@@ -3720,11 +3838,10 @@ msgid "Analytic Balance"
 msgstr "Saldo Analitik"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4403,7 +4520,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4545,7 +4662,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4558,10 +4674,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4571,6 +4685,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4687,6 +4811,8 @@ msgstr "Hasil rekonsiliasi"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5408,6 +5534,19 @@ msgstr ""
 
 #. 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 ""
@@ -6320,6 +6459,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6556,7 +6696,7 @@ msgstr "Baris Analitik"
 #: 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 "
+"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) "
@@ -7251,6 +7391,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7503,6 +7644,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periode"
@@ -7585,14 +7739,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr "Mata uang perusahaan"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7704,6 +7850,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7945,6 +8097,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8228,12 +8381,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8351,7 +8509,12 @@ msgstr "Biarkan kosong untuk menggunkan akun pendapatan"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8370,6 +8533,15 @@ 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 ""
 
@@ -8573,7 +8745,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Susunan akun-akun"
 
 #. module: account
@@ -8590,12 +8762,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8615,7 +8792,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8800,6 +8977,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8884,6 +9062,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -9096,13 +9286,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9126,7 +9313,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9334,6 +9521,7 @@ msgstr "Faktur Pembelian"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9407,6 +9595,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9787,6 +9985,18 @@ msgstr ""
 "Jumlah residual pada piutang / hutang dari catatan jurnal dinyatakan dalam "
 "mata uang (mungkin berbeda dari mata uang perusahaan)."
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Aktiva"
 
@@ -9817,9 +10027,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Total Transaksi"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Potongan (%)"
-
 #~ msgid "Supplier invoice"
 #~ msgstr "Faktur Pembelian"
 
@@ -9934,9 +10141,6 @@ msgstr ""
 #~ msgid "Analytic Chart of Accounts"
 #~ msgstr "Susunan Akun Analisis"
 
-#~ msgid "Partner ID"
-#~ msgstr "Kode Rekanan"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Faktur Penjulan Baru"
 
@@ -9970,9 +10174,6 @@ msgstr ""
 #~ msgid "Journal code"
 #~ msgstr "Kode jurnal"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Periode Penghapusan"
-
 #~ msgid "Entry Name"
 #~ msgstr "Nama Transaksi"
 
@@ -10054,123 +10255,15 @@ msgstr ""
 #~ msgid "Quantities"
 #~ msgstr "Kwantitas"
 
-#~ msgid "Can not %s draft invoice."
-#~ msgstr "Tidak dapat %s draft invoice"
-
-#~ msgid "Maximal quantity"
-#~ msgstr "Kwantitas maksimal"
-
-#~ msgid "x Expenses Journal"
-#~ msgstr "x Jurnal Beban"
-
-#~ msgid "Account type"
-#~ msgstr "Type akun"
-
-#~ msgid "Account code"
-#~ msgstr "Kode Akun"
-
-#~ msgid "Analytic entries"
-#~ msgstr "Transaksi Analisis"
-
-#~ msgid "Associated partner"
-#~ msgstr "Terhubung dengan rekanan"
-
-#~ msgid "Sub-Total:"
-#~ msgstr "Sub-Total :"
-
-#~ msgid "The responsible user of this journal"
-#~ msgstr "User yang bertanggung jawab untuk jurnal ini"
-
-#~ msgid "Account name"
-#~ msgstr "Nama akun"
-
 #~ msgid "Balance:"
 #~ msgstr "Saldo:"
 
-#~ msgid "Starting date"
-#~ msgstr "Tanggal Mulai"
-
-#~ msgid "Number of period"
-#~ msgstr "Jumlah periode"
-
-#~ msgid "Account entry"
-#~ msgstr "Transaksi Jurnal"
-
-#~ msgid "Open a Closed Fiscal Year"
-#~ msgstr "Buka tahun buku yang telah ditutup"
-
-#~ msgid "Usualy 1 or -1."
-#~ msgstr "Biasanya 1 atau -1"
-
-#~ msgid "Close Fiscal Year"
-#~ msgstr "Tutup Tahun Buku"
-
-#~ msgid "           Start date"
-#~ msgstr "           Tanggal Mulai"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nama model tidak valid di definsi aksi"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML tidak valid untuk Tampilkan Arsitektur!"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Akun analitik yang ditutup"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Draf faktur"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Akun ke faktur"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Biaya ke faktur"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Usia lanjut yang dapat diterima"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Bord untuk akuntan"
-
-#~ msgid "My indicators"
-#~ msgstr "Indikator saya"
-
-#~ msgid "Aged income"
-#~ msgstr "Usia pemasukan"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Tampilkan Informasi Debit/Kredit"
-
-#~ msgid "Notification"
-#~ msgstr "Pemberitahuan"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Pilihan Periode"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Pilihlah tahun pembukuan(Max. 3 tahun)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Memilih Akun referensi (untuk perbandingan bentuk %)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Neraca Saldo - Perbandingan Tahun"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Menampilakan Laporan dalam bentuk Lanscape"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Menampilkan perbandingan dalam %"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Menampilkan Akun-akun"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Anda dapat memilih lebih dari 3 tahun pada beberapa kasus"
-
-#~ msgid "Customize Report"
-#~ msgstr "Mengatur Laporan"
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Saldo neraca salah !\n"
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index c55cd48dbdb..857e0f46a34 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-05 12:13+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Altra configurazione"
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr "Nessun Giornale di Chiusura definito per l'anno contabile"
+msgstr "Nessun sezionale di chiusura definito per l'anno contabile"
 
 #. module: account
 #: code:addons/account/account.py:506
@@ -70,7 +70,7 @@ msgstr "Residuo"
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr "Definire una sequenza per il giornale fatture"
+msgstr "Definire una sequenza per il sezionale fatture"
 
 #. module: account
 #: constraint:account.period:0
@@ -213,7 +213,7 @@ msgstr "Negativo"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "Giornale: %s"
+msgstr "Sezionale: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -222,9 +222,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Fornisce il tipo di giornale analitico. Quando cerca un documento (es: una "
+"Fornisce il tipo di sezionale analitico. Quando cerca un documento (es: una "
 "fattura) per creare una registrazione analitica, OpenERP controllerà la "
-"presenza di un giornale dello stesso tipo."
+"presenza di un sezionale dello stesso tipo."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -292,7 +292,8 @@ msgstr "Reports belgi"
 #: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "Non si può aggiungere/modificare registrazioni in un giornale chiuso"
+msgstr ""
+"Non si possono aggiungere/modificare registrazioni in un sezionale chiuso"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -357,10 +358,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
-"Non trovo nessun giornale di tipo %s per questa azienda:\n"
+"Non trovo nessun sezionale di tipo %s per questa azienda:\n"
 "\n"
 "Puoi crearne uno tramite il menu:\n"
-"Configurazione/Contabilità Generale/Conti/Giornali."
+"Configurazione/Contabilità Generale/Conti/Sezionali."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
@@ -395,9 +396,9 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
-"Questa vista viene usata dai contabili per inserire massivamente "
-"registrazioni in OpenERP. Le registrazioni sui giornali vengono create da "
-"OpenERP se si usano movimenti bancari, registratori di cassa o pagamenti "
+"Questa vista viene usata dai contabili per l'inserimento massivo di "
+"registrazioni in OpenERP. I movimenti contabili vengono creati da OpenERP se "
+"si usano estratti conto bancari, registratori di cassa o pagamenti "
 "clienti/fornitori."
 
 #. module: account
@@ -442,8 +443,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"Questo campo contiene informazioni relative alla numerazione delle scritture "
-"in questo giornale."
+"Questo campo contiene informazioni relative alla numerazione delle "
+"registrazioni in questo sezionale."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -484,9 +485,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"Quando viene creato un periodo giornale il suo stato è 'Bozza', se stampato "
-"il suo stato  è: 'Stampato'. Quando sono registrate tutte le transazioni il "
-"suo stato è: 'Completato'"
+"Quando viene creato un periodo contabile il suo stato è 'Bozza', se viene "
+"stampato il suo stato  è: 'Stampato'. Quando tutte le transazioni sono "
+"registrate il suo stato è: 'Completato'."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -524,8 +525,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -534,7 +533,7 @@ msgstr ""
 #: field:validate.account.move,journal_id:0
 #, python-format
 msgid "Journal"
-msgstr "Giornale"
+msgstr "Sezionale"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -549,7 +548,7 @@ msgstr "Riferimento gerarchico superiore"
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Conto utlilizzato in questo registro"
+msgstr "Conto utlilizzato in questo sezionale"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -662,7 +661,7 @@ msgstr "Corrispondenza di imposte"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "Giornale Centralizzato"
+msgstr "Sezionale Centralizzato"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -705,7 +704,7 @@ msgstr "Periodo delle voci di apertura"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "Periodo del giornale"
+msgstr "Periodo del Sezionale"
 
 #. module: account
 #: code:addons/account/account_move_line.py:732
@@ -896,7 +895,7 @@ msgstr "Ritardo medio di pagamento"
 #: 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 "Report delle Imposte"
+msgstr "Piano conti imposte"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -947,7 +946,7 @@ msgstr "Filtri estesi..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "Giornale Centralizzato"
+msgstr "Sezionale Centralizzato"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1179,6 +1178,7 @@ msgstr "# di Transazione"
 
 #. 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
@@ -1190,7 +1190,7 @@ msgstr "Descrizione della registrazione"
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
-"Non puoi modificare/cancellare un giornale con registrazioni per questo "
+"Non puoi modificare/cancellare un Sezionale con registrazioni per questo "
 "periodo !"
 
 #. module: account
@@ -1323,7 +1323,7 @@ msgstr "Opzioni Report"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "Analisi Voci Giornale"
+msgstr "Analisi Movimenti Contabili"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
@@ -1353,13 +1353,14 @@ msgstr "Conto di credito"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "Giornale centralizzato"
+msgstr "Sezionale centralizzato"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
-msgstr "Non è possibile utilizzare questo conto generale in questo giornale!"
+msgstr ""
+"Non è possibile utilizzare questo conto generale in questo Sezionale!"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1368,6 +1369,16 @@ msgstr "Non è possibile utilizzare questo conto generale in questo giornale!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Con chiusura diversa da zero"
 
@@ -1425,10 +1436,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
-"Un Movimento Giornale consiste in diversi componenti, ognuno di essi è una "
-"transazione a credito o a debito. OpenERP crea automaticate un movimento per "
-"ciascun documento contabile: fatture, note di credito, pagamento fornitori, "
-"estratti conto, ecc."
+"Una registrazione contabile è costituita da diversi movimenti contabili, "
+"ognuno dei quali è in dare o in avere. OpenERP crea automaticamente una "
+"registrazione contabile per ciascun documento contabile: fatture, note di "
+"credito, pagamento fornitori, estratti conto, ecc."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1515,7 +1526,7 @@ msgstr ","
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "e Giornali"
+msgstr "e Sezionali"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1536,7 +1547,7 @@ msgstr "Vai al partner successivo"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "Ricerca Movimenti Bancari"
+msgstr "Ricerca Estratti Conto Bancari"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -1556,7 +1567,7 @@ msgstr "Conto di debito"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Conto per rimborso imposte"
+msgstr "Conto Imposta Note di Credito"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1622,7 +1633,7 @@ msgstr "Sequenza per anni fiscali"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "Sequenze Separate per Giornale"
+msgstr "Sequenze Separate per Sezionale"
 
 #. module: account
 #: field:account.bank.statement,user_id:0
@@ -1687,9 +1698,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
-"Mostra il piano dei conti della azienda per anno fiscale, scegliendo il "
-"periodo. Cliccare su un conto per avere una vista ad albero di tutte le voci "
-"giornale organizzate per codice di conto."
+"Mostra il piano dei conti della tua azienda per anno fiscale, scegliendo il "
+"periodo. Cliccare su un conto per avere una vista ad albero di tutti i "
+"movimenti contabili organizzati per codice di conto."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -1713,8 +1724,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
-"Il campo, impostato come \"falso\", permette di nascondere il periodo "
-"fiscale del giornale senza eliminarlo."
+"Se impostato come \"falso\", permette di nascondere il periodo fiscale del "
+"Sezionale senza eliminarlo."
 
 #. module: account
 #: view:res.partner:0
@@ -1740,7 +1751,7 @@ msgstr "Occorre inserire un conto per la scrittura della registrazione"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr "Report Giornale Contabile Semplice"
+msgstr "Report Sezionale Contabile Semplice"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1771,7 +1782,7 @@ msgstr "Rif. cliente:"
 #: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr "L'utente %s non ha diritti di accesso al giornale %s!"
+msgstr "L'utente %s non ha diritti di accesso al Sezionale %s!"
 
 #. module: account
 #: help:account.period,special:0
@@ -1887,7 +1898,7 @@ msgstr "Conto analitico"
 #: code:addons/account/account_bank_statement.py:332
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "Verificare che al giornale sia associato un conto."
+msgstr "Verificare che al Sezionale sia associato un conto."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -1940,7 +1951,7 @@ msgid ""
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
 "Spuntare la casella se si vuole utilizzare una sequenza diversa per ogni "
-"giornale creato. Altrimenti tutti utilizzeranno la stessa sequenza."
+"Sezionale creato. Altrimenti tutti utilizzeranno la stessa sequenza."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -2087,7 +2098,7 @@ msgstr "Proforma"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr " giornale"
+msgstr " Sezionale"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -2095,7 +2106,7 @@ msgstr " giornale"
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr "Il giornale \"%s\" non ha un conto di debito di default predefinito"
+msgstr "Il Sezionale \"%s\" non ha un conto di debito predefinito"
 
 #. module: account
 #: help:account.account,type:0
@@ -2115,7 +2126,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Ricerca template di piano dei conti"
 
 #. module: account
@@ -2172,7 +2183,7 @@ msgstr "Conto di ricavo"
 #: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "Manca un giornale di tipo : vendite/acquisti !"
+msgstr "Manca un Sezionale di tipo : vendite/acquisti !"
 
 #. module: account
 #: view:product.category:0
@@ -2182,6 +2193,8 @@ msgstr "Proprietà contabilità"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Registrazioni ordinate per"
 
@@ -2203,11 +2216,16 @@ msgstr "Template di prodotto"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2313,7 +2331,7 @@ msgstr "Riconciliazione per il partner"
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Codice conto imposte"
+msgstr "Conto imposta"
 
 #. module: account
 #: code:addons/account/invoice.py:545
@@ -2324,10 +2342,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
-"Per questa azienda manca un giornale di tipo %s\n"
+"Per questa azienda manca un Sezionale di tipo %s\n"
 "\n"
 "Se ne può creare uno dal menu:\n"
-"Configurazione\\contabilità generale\\conti\\giornali"
+"Configurazione\\contabilità generale\\conti\\Sezionali"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2451,7 +2469,7 @@ msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
 "Quesrto report fornisce una visione generale della situazione di uno "
-"specifico giornale"
+"specifico Sezionale"
 
 #. module: account
 #: constraint:product.category:0
@@ -2512,7 +2530,7 @@ msgid ""
 "You cannot modify company of this journal as its related record exist in "
 "Entry Lines"
 msgstr ""
-"Non si può modificare l'azienda di questo giornale poiché esistono voci "
+"Non si può modificare l'azienda di questo Sezionale poiché esistono voci "
 "correlate alla ditta fra le registrazioni."
 
 #. module: account
@@ -2544,6 +2562,7 @@ msgstr "Sconto (%)"
 
 #. 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
@@ -2572,14 +2591,14 @@ msgstr "Pagato/ Riconciliato"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Codice base rimborso"
+msgstr "Conto imponibile note di credito"
 
 #. 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 "Movimenti Bancari"
+msgstr "Estratti Conto Bancari"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2662,7 +2681,7 @@ msgstr "Questo wizard crea voci contabili ricorrenti."
 #: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr "Manca la definizione di una sequenza per il giornale."
+msgstr "Manca la definizione di una sequenza per il Sezionale."
 
 #. module: account
 #: code:addons/account/account.py:2083
@@ -2672,14 +2691,14 @@ msgstr "Manca la definizione di una sequenza per il giornale."
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "Occorre definire un giornale analitico per il giornale: '%s'!"
+msgstr "Occorre definire un giornale analitico per il Sezionale: '%s'!"
 
 #. 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 "Codici Imposte"
+msgstr "Conti Imposte"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -2803,6 +2822,8 @@ msgstr "Contabilità Generale"
 #. 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
 msgid "Profit And Loss"
 msgstr "Profitto e perdita"
 
@@ -2866,7 +2887,7 @@ msgstr ""
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "L'utente responsabile per questo libro giornale"
+msgstr "L'utente responsabile per questo sezionale"
 
 #. module: account
 #: view:account.period:0
@@ -3008,7 +3029,7 @@ msgstr "Mastrino  partner"
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr "Fornisce l'ordine di sequenza per la colonna del giornale"
+msgstr "Fornisce l'ordine di sequenza per la colonna del sezionale"
 
 #. module: account
 #: view:account.tax.template:0
@@ -3029,7 +3050,7 @@ 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 ""
-"Questo wizard rende valide tutte le registrazoni di un particolare giornale "
+"Questo wizard rende valide tutte le registrazoni di un particolare sezionale "
 "o periodo. Una volta che questo è stato fatto non si possono più fare "
 "modifiche."
 
@@ -3067,8 +3088,8 @@ msgstr ""
 "\n"
 "'Nessuno': significa che non viene fatto nulla.\n"
 "'Saldo': viene in genere usato per i conti relativi al contante.\n"
-"'Dettaglio': riporta ogni movimento del giornale dell'anno precedente, anche "
-"quelli riconciliati.\n"
+"'Dettaglio': riporta ogni movimento del sezionale dell'anno precedente, "
+"anche quelli riconciliati.\n"
 "'Non riconciliato': riporta solo i movimenti non ancora riconciliati al "
 "primo giorno del nuovo anno fiscale."
 
@@ -3092,7 +3113,6 @@ msgstr "Lasciare il campo vuoto per usare il conto Spesa"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3106,8 +3126,19 @@ msgstr "Lasciare il campo vuoto per usare il conto Spesa"
 #: 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 "Giornali"
+msgstr "Sezionali"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
@@ -3221,7 +3252,7 @@ msgstr "Piano delle imposte"
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Ricerca Giornale Contabile"
+msgstr "Ricerca Sezionale Contabile"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3244,7 +3275,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 ""
-"Tutte le voci selezionate nel giornale verranno validate e confermate. "
+"Tutte le voci selezionate nel sezionale verranno validate e confermate. "
 "Significa che non sarà più possibile modificarle."
 
 #. module: account
@@ -3292,7 +3323,7 @@ msgstr "Ricerca del movimento"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Tipo di imposta"
+msgstr "Nome"
 
 #. module: account
 #: report:account.invoice:0
@@ -3322,6 +3353,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Controparte"
 
@@ -3380,6 +3412,16 @@ msgstr "IVA"
 #: 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.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 "Chart of Accounts"
 msgstr "Piano dei conti"
 
@@ -3462,7 +3504,7 @@ msgstr "Annulla riconciliazione"
 #: code:addons/account/wizard/account_fiscalyear_close.py:79
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr "Il giornale deve avere un conto predefinito di credito e debito"
+msgstr "Il sezionale deve avere un conto predefinito di credito e debito"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3493,8 +3535,8 @@ msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
 "chart of accounts !"
 msgstr ""
-"Non si può validare una scrittura nel giornale se tutte le registrazioni non "
-"sono nell stesso piano dei conti !"
+"Non si può validare una scrittura nel sezionale se tutte le registrazioni "
+"non sono nello stesso piano dei conti !"
 
 #. module: account
 #: view:account.tax:0
@@ -3582,7 +3624,7 @@ msgstr "Conto di debito"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
-"Non si possono creare scritture in giornali differenti con una stessa "
+"Non si possono creare scritture in sezionali differenti con una stessa "
 "registrazione."
 
 #. module: account
@@ -3731,7 +3773,7 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
-"Il metodo migliore è l'utilizzo di un giornale dedicato ai movimenti di "
+"Il metodo migliore è l'utilizzo di un sezionale dedicato ai movimenti di "
 "apertura di tutti gli anni fiscali. Tenere presente che si potrebbe definire "
 "conti di debito/credito predefiniti, di tipo 'situazione' e con una "
 "contropartita centralizzata."
@@ -3844,11 +3886,10 @@ msgid "Analytic Balance"
 msgstr "Bilancio analitico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Perdita netta"
 
@@ -3993,7 +4034,7 @@ msgstr "Voci imposta"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr "Codice base Conto"
+msgstr "Conto imponibile"
 
 #. module: account
 #: help:account.move,state:0
@@ -4006,10 +4047,10 @@ msgid ""
 msgstr ""
 "Tutte le nuove scritture contabili sono solitamente nello stato di 'Non "
 "Pubblicate', ma è possibile impostare l'opzione per saltare lo stato sul "
-"relativo Giornale. In tal caso, esse si comporteranno come normali "
+"relativo sezionale. In tal caso, esse si comporteranno come normali "
 "registrazioni contabili create automaticamente dal sistema nella conferma "
-"documenti (fatture, estratti conto...) e saranno create con lo stato di "
-"'Pubblicate'."
+"documenti (fatture, estratti conto bancari...) e saranno create con lo stato "
+"di 'Pubblicate'."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:91
@@ -4057,7 +4098,7 @@ msgstr "Tutte le registrazioni Pubblicate"
 msgid "Statement %s is confirmed, journal items are created."
 msgstr ""
 "La registrazione %s e' confermata, sono state create le voci corrispondenti "
-"nel giornale."
+"nel sezionale."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -4178,7 +4219,7 @@ msgstr "Non implementato"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr "Selezione Giornale di Contabilità"
+msgstr "Selezione Sezionale di Contabilità"
 
 #. module: account
 #: view:account.invoice:0
@@ -4234,7 +4275,7 @@ msgid ""
 "taxes and journals according to the selected template"
 msgstr ""
 "Questa operazione automaticamente configurerà il piano dei conti, i "
-"riferimenti bancari, le tasse ed i giornali seguendo il modello selezionato."
+"riferimenti bancari, le tasse ed i sezionali seguendo il modello selezionato."
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4300,7 +4341,7 @@ msgstr "Considera le registrazioni riconciliate"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Conferma le scritture di libro giornale"
+msgstr "Conferma le scritture contabili"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4379,6 +4420,9 @@ msgid ""
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Non è possibile creare movimenti con valuta diversa dalla valuta secondaria "
+"del conto \"%s - %s\". Cancellare il campo di valuta secondaria definita nel "
+"conto se è necessario utilizzare tutte le valute."
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4389,7 +4433,7 @@ msgstr "Data operazione"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "Codice rimborso imposta"
+msgstr "Conto imposta note di credito"
 
 #. module: account
 #: view:validate.account.move:0
@@ -4397,6 +4441,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 ""
+"Tutti i movimenti in bozza in questo sezionale e periodo saranno validati. "
+"Ciò significa che non sarà più possibile modificare le registrazioni "
+"contabili eseguite."
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -4540,11 +4587,11 @@ msgstr "Applicazione imposta"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "Voci Giornale"
+msgstr "Voci sezionale"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Bilancio (Attività)"
 
 #. module: account
@@ -4609,7 +4656,7 @@ msgstr ""
 #: help:account.journal,refund_journal:0
 msgid "Fill this if the journal is to be used for refunds of invoices."
 msgstr ""
-"Riempire questo se il giornale viene utilizzato per lo storno di fatture."
+"Riempire questo se il sezionale viene utilizzato per lo storno di fatture."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -4656,8 +4703,8 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"Non puoi modificare un movimento validato di questo giornale!\n"
-"Devi configurare il giornale per abilitare la cancellazione dei movimenti."
+"Non puoi modificare un movimento validato di questo sezionale!\n"
+"Devi configurare il sezionale per abilitare la cancellazione dei movimenti."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -4667,7 +4714,7 @@ msgstr "Modelli"
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Conti imposta figli"
 
 #. module: account
 #: code:addons/account/account.py:940
@@ -4686,7 +4733,6 @@ msgid "Analytic Balance -"
 msgstr "Bilancio analitico -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4699,10 +4745,8 @@ msgstr "Bilancio analitico -"
 #: 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.journal.period.print: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
@@ -4712,6 +4756,16 @@ msgstr "Bilancio analitico -"
 #: 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
 msgid "Target Moves"
 msgstr "Registrazioni:"
 
@@ -4758,7 +4812,7 @@ msgstr "Nome colonna"
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr "Questgo report fornisce una visione delle situazione nei giornali"
+msgstr "Questo report fornisce una visione delle situazione nei sezionali"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4801,7 +4855,7 @@ msgstr "Mese"
 #: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr "La voce di giornale \"%s\" non e' valida"
+msgstr "La voce di sezionale \"%s\" non e' valida"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4828,6 +4882,8 @@ msgstr "Risultato riconciliato"
 #: 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
 msgid "Balance Sheet"
 msgstr "Bilancio"
 
@@ -5012,7 +5068,7 @@ msgstr ""
 #: code:addons/account/installer.py:295
 #, python-format
 msgid "Bank Journal "
-msgstr "Giornale di Banca "
+msgstr "Sezionale di Banca "
 
 #. module: account
 #: view:account.journal:0
@@ -5089,7 +5145,7 @@ msgstr "Rapporto delle fatture create negli ultimi 15 giorni"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "Registrazioni di giornale di fine anno"
+msgstr "Registrazioni di sezionale di fine anno"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
@@ -5184,7 +5240,7 @@ msgstr "Ordina per"
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr "Non c'e' in conto di default di credito per il giornale \"%s\""
+msgstr "Non c'e' in conto di default di credito per il sezionale \"%s\""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
@@ -5200,8 +5256,8 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"Il Giornale specificato non ha nessun movimento in stato di bozza per questo "
-"periodo"
+"Il sezionale specificato non ha nessun movimento in stato di bozza per "
+"questo periodo"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5322,7 +5378,7 @@ msgstr "Riconciliazione automatica conti"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "Voce Giornale"
+msgstr "Voce sezionale"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
@@ -5566,10 +5622,23 @@ msgstr "Conto Imposta Fattura"
 #: 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 "Giornale di Contabilità Generale"
+msgstr "Sezionale di Contabilità Generale"
 
 #. 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 "Nessun filtro"
@@ -5639,7 +5708,7 @@ msgstr "Calcolo ammontare"
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "Nome periodo del giornale"
+msgstr "Nome periodo del sezionale"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -5655,7 +5724,7 @@ msgstr "non implementato"
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr "Azienda collegata a questo giornale."
+msgstr "Azienda collegata a questo sezionale."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5725,7 +5794,7 @@ msgid ""
 "The code will be used to generate the numbers of the journal entries of this "
 "journal."
 msgstr ""
-"Il codice vera' usato per numerare le registrazioni in questo giornale."
+"Il codice vera' usato per numerare le registrazioni in questo sezionale."
 
 #. module: account
 #: view:account.invoice:0
@@ -5960,7 +6029,7 @@ msgstr "Percentuale"
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr "Giornale & Partner"
+msgstr "Sezionale & Partner"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -6056,9 +6125,9 @@ 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 ""
-"Questo wizard genera le scritture nel giornale di chiusura dell'anno fiscale "
-"selezionato. Nota che si puo'  far correre il wizard piu' volte per lo "
-"stesso anno fiscale, semplicemente le vecchie registrazioni vengono "
+"Questo wizard genera le scritture nel sezionale di chiusura dell'anno "
+"fiscale selezionato. Nota che si puo'  far correre il wizard piu' volte per "
+"lo stesso anno fiscale, semplicemente le vecchie registrazioni vengono "
 "sostituite dalle nuove."
 
 #. module: account
@@ -6082,7 +6151,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "Il nome del giornale deve essere unico per ogni azienda!"
+msgstr "Il nome del sezionale deve essere unico per ogni azienda!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6254,7 +6323,7 @@ msgstr "Registrazioni: "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr "Crea registrazioni manuali periodiche nel giornle scelto"
+msgstr "Crea registrazioni manuali periodiche nel sezionale scelto"
 
 #. module: account
 #: code:addons/account/account.py:1393
@@ -6349,7 +6418,8 @@ msgid ""
 "this journal or of the invoice related to this journal"
 msgstr ""
 "Spuntare la casella se si vuole permettere la cancellazione delle "
-"registrazioni di questo giornale o delle fatture collegate a questo giornale."
+"registrazioni di questo sezionale o delle fatture collegate a questo "
+"sezionale."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6441,7 +6511,7 @@ msgstr "Da rivedere"
 #: 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 "Registrazioni Giornale"
+msgstr "Registrazioni Sezionale"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -6499,7 +6569,7 @@ msgstr ""
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr "Selezione Giornale"
+msgstr "Selezione sezionale"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:65
@@ -6519,6 +6589,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6639,7 +6710,7 @@ msgstr "Vendite"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "Colonna Giornale"
+msgstr "Colonna sezionale"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6760,7 +6831,7 @@ msgstr "Linee analitiche"
 #: 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 "
+"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) "
@@ -6789,7 +6860,7 @@ msgstr "Template Conto Imposta"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr "Sei sicuro di voler aprire il giornale ?"
+msgstr "Sei sicuro di voler aprire il sezionale ?"
 
 #. module: account
 #: view:account.state.open:0
@@ -6968,7 +7039,7 @@ msgstr "Reportistica"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "Il codice del giornale deve essere unico per una stessa azienda!"
+msgstr "Il codice del sezionale deve essere unico per una stessa azienda!"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -6978,7 +7049,7 @@ msgstr "Chiusura di Cassa"
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr "Giornale Contabile"
+msgstr "Sezionale Contabile"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7143,7 +7214,7 @@ msgstr "Conto sbagliato !"
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
-msgstr "Giornale Vendite"
+msgstr "Sezionale Vendite"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
@@ -7226,12 +7297,12 @@ msgstr "Template per il piano dei conti"
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr ""
+msgstr "Codice"
 
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "Conferma le scritture di un giornale"
+msgstr "Conferma le scritture di un sezionale"
 
 #. module: account
 #: view:product.product:0
@@ -7297,7 +7368,7 @@ msgstr "Vendite per tipo conto"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr "Collegamento alle voci del giornale generate automaticamente."
+msgstr "Collegamento alle voci del sezionale generate automaticamente."
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7440,6 +7511,7 @@ msgstr "Importo (in lettere) :"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7653,7 +7725,7 @@ msgstr "Seleziona l'Anno Fiscale"
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Giornale Note di Credito Fornitori"
+msgstr "Sezionale Note di Credito Fornitori"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -7698,6 +7770,19 @@ msgstr "Gestione Contabilità e Finanza"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periodo"
@@ -7715,7 +7800,7 @@ msgstr "Reporting  Generico"
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr "Giornale Storni"
+msgstr "Sezionale Storni"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -7793,14 +7878,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Valuta azienda"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Piano dei conti"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7848,7 +7925,7 @@ msgstr "Import automatico dei movimenti bancari"
 #: 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 "Visuali Libro Giornale"
+msgstr "Visualizzazioni sezionale"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -7866,7 +7943,7 @@ msgstr "Tipi di conto"
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
-"Impossibile creare la registrazione della fattura su un giornale "
+"Impossibile creare la registrazione della fattura su un sezionale "
 "centralizzato"
 
 #. module: account
@@ -7908,13 +7985,19 @@ msgstr "Stato chiusura esercizio Fiscale"
 #: field:account.invoice.refund,journal_id:0
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "Giornale Storni"
+msgstr "Sezionale Storni"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Filtra per"
 
@@ -7948,7 +8031,7 @@ msgstr "Il conto del partner utilizzato per questa fattura."
 #: view:account.tax.code.template:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr "Codice conto mastro"
+msgstr "Conto padre"
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
@@ -7960,7 +8043,7 @@ msgstr "Riga termine di pagamento"
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
-msgstr "Giornale Acquisti"
+msgstr "Sezionale Acquisti"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -7980,7 +8063,7 @@ msgstr ""
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr "Modello di linea del Libro Giornale"
+msgstr "Riga del modello di registrazione"
 
 #. module: account
 #: view:account.invoice:0
@@ -8002,7 +8085,7 @@ msgstr "Fornitori"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
-"Non si puo' creare piu' di un movimento per periodo su un giornale "
+"Non si puo' creare piu' di un movimento per periodo su un sezionale "
 "centralizzato"
 
 #. module: account
@@ -8110,7 +8193,7 @@ msgstr "Costi (analitica)"
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "Nome Giornale"
+msgstr "Nome sezionale"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8165,6 +8248,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8275,7 +8359,7 @@ msgstr "sconosciuto"
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "Giornale delle voci di apertura"
+msgstr "Sezionale delle voci di apertura"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -8318,7 +8402,7 @@ msgstr "Calcolato con codice Python"
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "Codice Giornale"
+msgstr "Codice sezionale"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -8345,7 +8429,7 @@ msgstr "Righe movimento"
 #: 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 "Apri Libro Giornale"
+msgstr "Apri sezionale"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8364,7 +8448,7 @@ msgstr "Periodo da"
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "Giornale Nota di Credito"
+msgstr "Sezionale Note di Credito"
 
 #. module: account
 #: code:addons/account/account.py:927
@@ -8413,7 +8497,7 @@ msgstr "Crea fattura"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr "Imposta per acquisto(%)"
+msgstr "Imposta acquisti (%)"
 
 #. module: account
 #: code:addons/account/invoice.py:787
@@ -8455,17 +8539,17 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"Mostra la visuale usata quando si scrive o si naviga nelle registrazioni in "
-"questo libro giornale. La visuale fa si che OpenERP sappia quali campi deve "
-"rendere visibili, obbligatori o in sola lettura ed in quale ordine. Si può "
-"creare una vista personalizzata per una codifica più agevole e veloce di "
-"ciascun libro giornale."
+"Mostra la visualizzazione usata quando si scrive o si naviga nelle "
+"registrazioni in questo sezionale. La visualizzazione fa si che OpenERP "
+"sappia quali campi deve rendere visibili, obbligatori o in sola lettura ed "
+"in quale ordine. Si può creare una vista personalizzata per una codifica più "
+"agevole e veloce di ciascun sezionale."
 
 #. module: account
 #: field:account.period,date_stop:0
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Period"
-msgstr "Concludi il periodo"
+msgstr "Fine del periodo"
 
 #. module: account
 #: field:account.installer.modules,account_followup:0
@@ -8476,12 +8560,17 @@ msgstr "Gestione Richiami"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Periodo di inizio"
 
@@ -8508,7 +8597,7 @@ msgstr "Aziende collegate al Partner"
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "Vista Giornale"
+msgstr "Vista sezionale"
 
 #. module: account
 #: view:account.move.line:0
@@ -8607,7 +8696,12 @@ msgstr "Lasciare vuoto per usare il conto di ricavo"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8626,6 +8720,15 @@ msgstr "Inseriti in modo automatico o manuale nel sistema"
 
 #. 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 "Mostra il conto"
 
@@ -8769,7 +8872,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "Movimenti bancari"
+msgstr "Estratti Conto Bancari"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -8790,7 +8893,7 @@ msgid ""
 "in the journal definition for reconciliation."
 msgstr ""
 "Bisogna definire il conto bancario\n"
-"nella definizione del giornale per la riconciliazione."
+"nella definizione del sezionale per la riconciliazione."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -8815,8 +8918,8 @@ msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
-"Questo registro deve avere una controparte centralizzata senza che l'opzione "
-"per saltare lo stato di bozza sia marcata!"
+"Questo sezionale deve avere una controparte centralizzata senza che "
+"l'opzione per saltare lo stato di bozza sia marcata!"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -8836,7 +8939,7 @@ msgstr "Luglio"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Piano dei conti"
 
 #. module: account
@@ -8853,12 +8956,17 @@ msgstr "Bilancio Contabilità Analitica"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Periodo finale"
 
@@ -8878,7 +8986,7 @@ msgstr "Periodo finale"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "piano dei conti"
 
 #. module: account
@@ -9034,7 +9142,7 @@ msgstr ""
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Aprire/chiudere un periodo"
+msgstr "Periodo di apertura/chiusura"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -9059,6 +9167,7 @@ msgstr "Convalida movimento in conto"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -9079,9 +9188,9 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
-"Quì puoi selezionare il registro da usare per le note di credito che "
+"Quì puoi selezionare il sezionale da usare per le note di credito che "
 "verranno create. Se lasci questo campo vuoto, verrà utilizzato lo stesso "
-"registro delle fatture correnti."
+"sezionale delle fatture correnti."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9143,6 +9252,18 @@ msgstr "Generale"
 #: selection:account.pl.report,filter: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
@@ -9201,7 +9322,7 @@ msgstr ""
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr "Impostasu vendite (%)"
+msgstr "Imposta vendite (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9254,8 +9375,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
-"Questo report permette di generare un PDF del libro gironale con i dettagli "
-"di tutti i conti"
+"Questo report permette di generare un PDF del sezionale con i dettagli di "
+"tutti i conti"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9356,13 +9477,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Profitto netto"
 
@@ -9386,7 +9504,7 @@ msgstr "Non e' definito un conto per incassi per il prodotto: \"%s\" (id:%d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9420,7 +9538,7 @@ msgstr "Totale"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr "Giornali : Tutti"
+msgstr "Sezionale : Tutti"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9562,7 +9680,7 @@ msgstr "Sul conto:"
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Storno"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -9600,6 +9718,7 @@ msgstr "Fattura fornitore"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9673,13 +9792,23 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Con i movimenti"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr "Data conto"
+msgstr "Dati conto"
 
 #. module: account
 #: view:account.tax.code.template:0
@@ -9761,12 +9890,12 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
-"Crea e gestisti i registri dell'azienda da questo menu. Un Registro è usato "
-"per inserire tutte le transazioni di contabilità relative agli affari "
+"Crea e gestisti i sezionali dell'azienda da questo menu. Un sezionale è "
+"usato per inserire tutte le transazioni di contabilità relative agli affari "
 "giornalieri utilizzando il sistema della partita doppia. A seconda della "
 "natura dell'attività ed al numero di transazioni giornaliere, un'azienda può "
-"mantenere diversi tipi di registri specializzati quali ad esempio il "
-"registro di cassa, registro acquisti, registro vendite ecc..."
+"mantenere diversi tipi di sezionali specializzati quali ad esempio il "
+"sezionale di cassa, registro acquisti, registro vendite ecc..."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -9991,7 +10120,7 @@ msgstr "Futuro"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Cerca elementi di libro giornale"
+msgstr "Cerca scritture"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10051,12 +10180,17 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr ""
-#~ "Lasciare il campo vuoto per usare il periodo della data di validazione."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Errore! Non puoi creare un conto ricorsivo."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Registrazioni per movimento"
@@ -10115,9 +10249,6 @@ msgstr ""
 #~ msgid "1cm 27.7cm 20cm 27.7cm"
 #~ msgstr "1cm 27.7cm 20cm 27.7cm"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Import invoice"
 #~ msgstr "Totale fattura"
 
@@ -10185,18 +10316,6 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Riconciliazione dei pagamenti"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Sconto (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Se il Vostro pagamento è già stato effettuato, per cortesia considerate "
-#~ "nulla la presente. Non esitate a contattare il nostro ufficio contabilità al "
-#~ "numero +32 81 81 37 00."
-
 #~ msgid "Contra"
 #~ msgstr "contraente"
 
@@ -10218,9 +10337,6 @@ msgstr ""
 #~ msgid "Account Entry Reconcile"
 #~ msgstr "Riconcilia la registrazione contabile"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Fattura analitica"
 
@@ -10389,9 +10505,6 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Bozze"
 
-#~ msgid "Débit"
-#~ msgstr "Debito"
-
 #~ msgid "Create subscription entries"
 #~ msgstr "Creare voci relative a canoni"
 
@@ -10434,9 +10547,6 @@ msgstr ""
 #~ msgid "Analytic Chart of Accounts"
 #~ msgstr "Piano dei conti analitico"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID Partner"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nuova fattura cliente"
 
@@ -10586,9 +10696,6 @@ msgstr ""
 #~ msgid "Cash Receipt"
 #~ msgstr "Ricevuta di cassa"
 
-#~ msgid "All account entries"
-#~ msgstr "Righe contabilità"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Non pagati"
 
@@ -10708,13 +10815,6 @@ msgstr ""
 #~ msgid "x Checks Journal"
 #~ msgstr "x Controllo giornale"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Il conto della banca del partner da pagare\n"
-#~ "Lasciare vuoto per usare il default"
-
 #~ msgid "to :"
 #~ msgstr "a:"
 
@@ -10757,34 +10857,6 @@ msgstr ""
 #~ msgid "Generic Reports"
 #~ msgstr "Stampe generiche"
 
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Modulo che aggiunge nuovi report basati sul modulo Conti (Account)"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Resoconto - Rapporto"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Non hai selezionato l'opzione 'Percentuale', ma hai selezionato più di 2 "
-#~ "anni."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Devi selezionare almeno 1 anno Fiscale. Riprova."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Potresti aver selezionato le opzioni confronto per più di 1 anno con le "
-#~ "colonne credito/debito e % come opzione. Questo potrebbe far uscire i "
-#~ "contenuti dai margini di stampa. Controlla."
-
-#~ msgid "Customize Report"
-#~ msgstr "Rapporto Personalizzato"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome modello non valido nella definizione dell'azione."
 
@@ -10794,9 +10866,6 @@ msgstr ""
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Bozza fattura da controllare, validare e stampare"
 
-#~ msgid "Creation Date"
-#~ msgstr "Data di Creazione"
-
 #~ msgid "Maximum Quantity"
 #~ msgstr "Quantità massima"
 
@@ -10825,26 +10894,12 @@ msgstr ""
 #~ msgid "Error ! The duration of the Fiscal Year is invalid. "
 #~ msgstr "Errore! La durata dell'anno fiscale non è valida. "
 
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Mappatura Posizioni Fiscali"
-
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. o nome movimento"
 
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Hai fatto i seguenti errori. Per favore, correggete a provare di nuovo."
-
-#~ msgid "Show Accounts"
-#~ msgstr "Mostra conti"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "E' possibile selezionare al massimo 3 anni. Ricontrollare."
-
 #~ msgid "Movement"
 #~ msgstr "Movimento"
 
@@ -10854,21 +10909,12 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Movimento contabile"
 
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Visualizza il report in formato orizzontale"
-
 #~ msgid "Filter on Periods"
 #~ msgstr "Filtro su: Periodi"
 
 #~ msgid "Account Configure Wizard "
 #~ msgstr "Wizard configurazione conto "
 
-#~ msgid "Draft invoices"
-#~ msgstr "Fatture bozza"
-
-#~ msgid "All accounts"
-#~ msgstr "Tutti i conti"
-
 #~ msgid "Account cost and revenue by journal"
 #~ msgstr "Bilancio costi e ricavi per libro giornale"
 
@@ -10951,25 +10997,10 @@ msgstr ""
 #~ msgid "Statement reconcile line"
 #~ msgstr "Documento di riconciliazione"
 
-#~ msgid "supplier"
-#~ msgstr "fornitore"
-
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "Errore Sconosciuto"
 
-#~ msgid "End of Year"
-#~ msgstr "Fine dell'anno"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Entry No"
-#~ msgstr "Voce n."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Fattura "
@@ -10978,37 +11009,6 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "è convalidato."
 
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "Una registrazione in un registro consiste di parecchie voci, ognuno dei "
-#~ "quali è un debito o credito. OpenERP crea automaticamente una registrazione "
-#~ "per ogni documento contabileç fatture, rimborsi, pagamento ai fornitori, "
-#~ "movimenti bancari etc."
-
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Il menu delle fatture dei fornitori permette di inserire e gestire le "
-#~ "fatture emesse dai fornitori. OpenERP genera automaticamente le fatture in "
-#~ "bozza, in modo che si possano controllare le voci della fattura in base a "
-#~ "quanto acquistato od effettivamente ricevuto."
-
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Il menu delle fatture dei clienti permette di creare e gestire le fatture "
-#~ "emesse. OpenERP genera in modo automatico le fatture in stato di bozza, in "
-#~ "modo che basti confermarle per poterle spedire al cliente."
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Il bilancio della registrazione non è corretto!\n"
@@ -11024,86 +11024,25 @@ msgstr ""
 #~ msgid "Entry encoding"
 #~ msgstr "Codifica movimenti"
 
-#~ msgid ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Il rimborso da un fornitore consiste in una nota di credito che indica che "
-#~ "rimborsa in tutto od in parte una fattura che ha inviato."
-
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "Il saldo calcolato (%.2f) è diverso da quello inserito. (%.2f)"
 
-#~ msgid ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Il rimborso da un fornitore consiste in una nota di credito che indica che "
-#~ "rimborsa in tutto od in parte una fattura che ha inviato."
-
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr ""
 #~ "Nessun giornale è stato definito per l'anno fiscale per le scritture di "
 #~ "chiusura"
 
-#~ msgid ""
-#~ "given a period and a journal, the sum of debit will always be equal to the "
-#~ "sum of credit, so there is no point to display it"
-#~ msgstr ""
-#~ "Dato un periodo ed un registro, la somma del dare risulta sempre eguale alla "
-#~ "somma dell'avere."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Errore: UOS deve esere in una categria diversa da UOM"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "Per il prodotto corrente verra' usato nelle fatture questo conto usato "
-#~ "invece di quello di default"
-
 #~ msgid "Statements reconciliation"
 #~ msgstr "Riconciliazione registrazioni"
 
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Registro di cassa - (test)"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Piano dei conti"
 
-#~ msgid "Sales Credit Note Journal - (test)"
-#~ msgstr "Registro per note di credito per le vendite"
-
-#~ msgid ""
-#~ "Here you can personalize and create each view of your financial journals by "
-#~ "selecting the fields you want to appear and the sequence they will appear."
-#~ msgstr ""
-#~ "Qui si possono personalizzare e creare le viste dei registri contabili, "
-#~ "scegliendo i campi che si vuole appaiano e l'ordine in cui appaiono"
-
-#~ msgid "Bank Journal - (test)"
-#~ msgstr "Registro di banca - (test)"
-
-#~ msgid "Default UoM"
-#~ msgstr "UOM di default"
-
-#~ msgid "Sales Journal - (test)"
-#~ msgstr "Registro vendite"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "Questo conto verra' usato per le fatture al posto del conto di default per i "
-#~ "ricavi configurato per questo prodotto"
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Questo conto verra' usato per le fatture al posto del conto di ricavo per la "
-#~ "categoria prodotto"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilancio (Attività)"
 
 #~ msgid "Header"
 #~ msgstr "Intestazione"
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 2c700f5b1fb..4b990fc53b3 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: 2011-04-29 05:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Entry label"
 #~ msgstr "Anekcum label"
 
diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po
new file mode 100644
index 00000000000..a05fae1c191
--- /dev/null
+++ b/addons/account/i18n/kk.po
@@ -0,0 +1,9755 @@
+# Kazakh 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-09-02 10:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Kazakh <kk@li.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-11-08 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,residual:0
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:785
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr "Балалар"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+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 ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1291
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+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 ""
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: view:account.move.line:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr "Сілтеме"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr ""
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:1421
+#, python-format
+msgid "Warning!"
+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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Negative"
+msgstr "Теріс"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,type:0
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+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
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:1210
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1176
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:529
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr ""
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+msgid "Configure"
+msgstr "Баптау"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr "Маусым"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the informatin related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Positive"
+msgstr "Оң сомасы:"
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_tax_chart
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: 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
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: 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 "Күнделік"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+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
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: 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
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:348
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. 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
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "Бүкіл"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2779
+#: code:addons/account/installer.py:434
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "Тексеру"
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr "Пайыз"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:39
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,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
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr "Түрі"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_Journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr "Қыркүйек"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr "күн"
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#, python-format
+msgid ""
+"Can not %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only Refund this invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr "Мерзімі"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"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)."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+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
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: 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 ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+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 ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+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 ""
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+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 ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+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 ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+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 ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr "Менеджер"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+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 ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"purchase orders or receipts. This way, you can control the invoice from your "
+"supplier according to what you purchased or received."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+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 ""
+
+#. module: account
+#: code:addons/account/account.py:976
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr "Басқалар"
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr "Тіркелгі"
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+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 ""
+
+#. module: account
+#: field:account.account,level:0
+msgid "Level"
+msgstr "Деңгейі"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:120
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+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 ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+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 ""
+
+#. 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit transaction. OpenERP automatically creates one journal "
+"entry per accounting document: invoice, refund, supplier payment, bank "
+"statements, etc."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr "Бағандар"
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr "Топтар"
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card or any other type "
+"of financial account. The starting balance will be proposed automatically "
+"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 ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+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 ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+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 ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,user_id:0
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
+"cancel the current invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+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
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.report_account_voucher_new
+msgid "Print Voucher"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"Have a complete tree view of all journal items per account code by clicking "
+"on an account."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:808
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr "Мәндері"
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Debit"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Ref. :"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:328
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Credit Notes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:499
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:332
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+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 ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Closing balance based on Starting Balance and Cash Transactions"
+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 ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column if the currency is different then the company "
+"currency"
+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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+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 "Сурет"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Canceled"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+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
+#: 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.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr "Қаңтар"
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date period is not in the scope "
+"of the fiscal year. "
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1319
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr "Сипаттамасы"
+
+#. module: account
+#: code:addons/account/account.py:2844
+#: code:addons/account/installer.py:498
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+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 ""
+
+#. module: account
+#: code:addons/account/invoice.py:352
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+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
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance: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
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.period,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
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+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
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: 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
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+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 ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr "Сүзгілер"
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: code:addons/account/wizard/account_move_journal.py:106
+#: selection:report.invoice.created,state:0
+#, python-format
+msgid "Open"
+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 ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:545
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The 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."
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr "күн"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2796
+#: code:addons/account/installer.py:454
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+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 ""
+
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Салық"
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr "Тіркелгілер"
+
+#. module: account
+#: code:addons/account/invoice.py:351
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+#: report:account.overdue:0
+msgid "Date:"
+msgstr "Күні:"
+
+#. 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 ""
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr "Жарлық"
+
+#. module: account
+#: view:account.tax:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+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 ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid ""
+"Automatically generate entries based on what has been entered in the  system "
+"before a specific date."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1181
+#, python-format
+msgid "No sequence defined on the journal !"
+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
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+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 ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Number:"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 2:"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+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 ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+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
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:822
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2906
+#: code:addons/account/installer.py:296
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: help:account.journal.column,sequence:0
+msgid "Gives the sequence order to journal column."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+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
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: view:account.journal.period: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
+#: field:account.vat.declaration,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 ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+#: model:ir.actions.act_window,name:account.action_account_installer
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "No Partner Defined !"
+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 ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Journal:"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Authorised Signatory"
+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 ""
+
+#. module: account
+#: code:addons/account/invoice.py:370
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: n.a"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Your bank and cash accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state!"
+msgstr ""
+
+#. 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!"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+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.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 "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. 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.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print: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
+#: selection:account.vat.declaration,filter:0
+#: code:addons/account/report/common_report_header.py:97
+#: field:analytic.entries.report,date:0
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+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 ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2095
+#, 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 ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:810
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+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
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: 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
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+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 ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+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."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name: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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"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 ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+#: view:wizard.multi.charts.accounts:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+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.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+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 ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+#: view:res.company:0
+msgid "Configuration"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Loss"
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using sale price"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:714
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The duration of the Fiscal Year is invalid. "
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:88
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,state:0
+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 ""
+
+#. module: account
+#: field:account.journal,view_id:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month: 0"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:133
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_real:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#, python-format
+msgid "Not implemented"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+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 ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+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"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+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 ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+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 ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,reconcil:0
+msgid "Consider reconciled entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+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 ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:320
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1397
+#, 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 ""
+
+#. module: account
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+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 ""
+
+#. module: account
+#: view:validate.account.move:0
+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 ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were reconciled last time"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+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."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Asset Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. 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/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_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
+#, python-format
+msgid "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
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:720
+#, python-format
+msgid "Taxes missing !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+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 ""
+
+#. module: account
+#: help:account.journal,refund_journal:0
+msgid "Fill this if the journal is to be used for refunds of invoices."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+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 ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1210
+#, 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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:940
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,target_move: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
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.journal.period.print:0
+#: field:account.move.journal,target_move: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
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+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 ""
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1167
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:293
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+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
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: 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 ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:138
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+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
+msgid "Start of period"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+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/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+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 ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1326
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid ""
+"Specified Journal does not have any account move entries in draft state for "
+"this period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_move_line
+msgid "Lines to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"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
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+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 ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:738
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+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."
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+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 ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:830
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+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
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Valuation"
+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
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+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 ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"The tax code definition depends on the tax declaration of your country. "
+"OpenERP allows you to define the tax structure and manage it from this menu. "
+"You can define both numeric and alphanumeric tax codes."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+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 ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:60
+#, python-format
+msgid "New currency is not confirured properly !"
+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
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: 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
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:803
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:370
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+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 ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state!"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+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 ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"This view can be used by accountants in order to quickly record entries in "
+"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 ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice  '%s' is validated."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+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 ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:532
+#, python-format
+msgid ""
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+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 ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+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 ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+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.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: 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
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: code:addons/account/wizard/account_move_journal.py:105
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,name:0
+msgid "Acc. Type Name"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Accounting Chart"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  number of days: 30"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Type"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Liability Accounts)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+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 ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"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 ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "Enter a Start date !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_dashboard_acc
+msgid "Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Accounting Chart from a Chart Template"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_pl_report
+msgid "Account Profit And Loss Report"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2% "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1393
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is used to determine how an account is used in each journal. "
+"The deferral method of an account type determines the process for the annual "
+"closing. Reports such as the Balance Sheet and the Profit and Loss report "
+"use the category (profit/loss or balance sheet). For example, the account "
+"type could be linked to an asset account, expense account or payable "
+"account. From this view, you can create and manage the account types you "
+"need for your company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1003
+#, python-format
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:781
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+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 !"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+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_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/wizard/account_use_model.py:44
+#, python-format
+msgid "Error !"
+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 ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: 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 ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state"
+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
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: 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
+#: 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 ""
+
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:65
+#, python-format
+msgid "Currnt currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: 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.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+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 ""
+
+#. module: account
+#: help:account.move,to_check:0
+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 ""
+
+#. 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... "
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2050
+#, 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:473
+#: code:addons/account/wizard/account_invoice_refund.py:137
+#, python-format
+msgid "Data Insufficient !"
+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 ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
+"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 ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"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 ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "9"
+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 ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period length (days)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+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.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:963
+#, python-format
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:938
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.account.type,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: report:account.move.voucher:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+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 ""
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1271
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2777
+#: code:addons/account/installer.py:432
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:104
+#, python-format
+msgid "Open Journal Items !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1246
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template: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:304
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: account
+#: 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
+msgid "Cash"
+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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bs_report
+msgid "Account Balance Sheet Report"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid ""
+"Here you can customize an existing journal view or create a new view. "
+"Journal views determine the way you can record entries in your journal. "
+"Select the fields you want to appear in a journal and determine the sequence "
+"in which they will appear. Then you can create a new journal and link your "
+"view to it."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  number of days: 14"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: view:account.analytic.account:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_analytic_plans:0
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"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)."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: 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 ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+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
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+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 ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:346
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:359
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+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 ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:1284
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Add extra Accounting functionalities to the ones already installed."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: 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 ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2841
+#: code:addons/account/installer.py:495
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Modify Invoice: Cancels the current invoice and creates a new copy of it "
+"ready for editing."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and Financial Management"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: 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: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 ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+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 ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+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 ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"With Customer Refunds you can manage the credit notes for your customers. 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 ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_vat_declaration
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+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"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:897
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal: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
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"With Customer Invoices you can create and manage sales invoices issued to "
+"your customers. OpenERP can also generate draft invoices automatically from "
+"sales orders or deliveries. You should only confirm them before sending them "
+"to your customers."
+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 ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2794
+#: code:addons/account/installer.py:452
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice: Creates the refund invoice, ready for editing."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: balance"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+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.common.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no 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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: 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
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid ""
+"Define your company's financial year according to your needs. A financial "
+"year is a period at the end of which a company's accounts are made up "
+"(usually 12 months). The financial year is usually referred to by the date "
+"in which it ends. For example, if a company's financial year ends November "
+"30, 2011, then everything between December 1, 2010 and November 30, 2011  "
+"would be referred to as FY 2011. You are not obliged to follow the actual "
+"calendar year."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+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."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,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 "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+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 ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "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 ""
+
+#. module: account
+#: code:addons/account/account.py:2817
+#: code:addons/account/installer.py:476
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.installer,purchase_tax:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:787
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2820
+#: code:addons/account/installer.py:479
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP 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 ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2333
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:71
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"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 ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Particulars"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+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.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.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+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 ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "("
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+msgid "Closing Method"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Payable"
+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 ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"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/account_bank_statement.py:391
+#, python-format
+msgid "Cannot delete bank statement(s) which are already confirmed !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid ""
+"Here you can define a financial period, an interval of time in your "
+"company's financial year. An accounting period typically is a month or a "
+"quarter. It usually corresponds to the periods of the tax declaration. "
+"Create and manage periods from here and decide whether a period should be "
+"closed or left open depending on your company's activities over a specific "
+"period."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Receiver's Signature"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1128
+#, python-format
+msgid "You can not change the tax, you should remove and recreate lines !"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:82
+#, python-format
+msgid ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
+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 ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance: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
+msgid "End Period"
+msgstr ""
+
+#. 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 Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:717
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from: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
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger: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
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:804
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"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
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_payment:0
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:354
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+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 ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Through :"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number:0
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+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
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period: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
+#: 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
+#: 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 ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For Value percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+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 ""
+
+#. module: account
+#: help:account.installer.modules,account_analytic_plans:0
+msgid ""
+"Allows invoice lines to impact multiple analytic accounts simultaneously."
+msgstr ""
+
+#. module: account
+#: field:account.installer,sale_tax:0
+msgid "Sale Tax(%)"
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+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 ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid ")"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+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 ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "State:"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+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 ""
+
+#. 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
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+#: report:account.move.voucher:0
+msgid "Posted"
+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
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger: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
+msgid "End Date"
+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 ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+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 ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Profit"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+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 ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,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
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.period,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using cost price"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+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.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print: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
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+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\"! "
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:805
+#, python-format
+msgid "Entry is already reconciled"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. 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 ""
+
+#. 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
+#: 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 "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+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 ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:165
+#, python-format
+msgid "This period is already closed !"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"may keep several types of specialized journals such as a cash journal, "
+"purchase journal, sales journal..."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+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 ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:346
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+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 ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+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 ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+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 ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+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 ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+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 ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#, python-format
+msgid "You must enter a period length that cannot be 0 or below !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:501
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"Create and manage the accounts you need to record journal entries. An "
+"account is part of a ledger allowing your company to register all kinds of "
+"debit and credit transactions. Companies present their annual accounts in "
+"two main parts: the balance sheet and the income statement (profit and loss "
+"account). The annual accounts of a company are required by law to disclose a "
+"certain amount of information. They have to be certified by an external "
+"auditor annually."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual_currency:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 70949a48b3f..4aff5b3b705 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: 2011-04-29 05:08+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "밸런스가 0이 아닌"
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr "재조정 결과"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr "다중 통화 엔트리의 경우, 선택적인 다른 통화로 표현
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "무브먼트와 함께"
 
@@ -9622,34 +9742,32 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #~ msgid "Asset"
 #~ msgstr "자산"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "유효 날짜의 기간을 이용하려면 비워 두십시오."
-
 #~ msgid ""
 #~ "This account will be used to value incoming stock for the current product "
 #~ "category"
 #~ msgstr "이 계정은 현재 상품 카테고리의 입고품 평가에 이용됩니다"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "에러! 재귀적 계정을 만들 수는 없습니다."
-
 #~ msgid "All periods if empty"
 #~ msgstr "비워두면 모든 기간이 적용됩니다."
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "결제 조건을 사용할 경우, 회계 항목 생성 시점에 지급 날짜가 자동 계산됩니다. 결제 조건과 지급 날짜를 비워두면, 직접 지불을 "
-#~ "의미합니다."
-
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "미결제 공급자 인보이스"
 
@@ -9675,121 +9793,3 @@ msgstr ""
 #, python-format
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "계정이동 라인 \"%s\"은 유효하지 않습니다"
-
-#~ msgid "Analytic accounts to close"
-#~ msgstr "닫을 분석 계정"
-
-#~ msgid "Draft invoices"
-#~ msgstr "초안 인보이스"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "인보이스할 계정"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "인보이스할 원가"
-
-#~ msgid "Aged receivables"
-#~ msgstr "오래된 채권"
-
-#~ msgid "Board for accountant"
-#~ msgstr "회계사 위원회"
-
-#~ msgid "My indicators"
-#~ msgstr "내 지시자"
-
-#~ msgid "Aged income"
-#~ msgstr "오래된 소득"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "차변/대변 정보 보기"
-
-#~ msgid "All accounts"
-#~ msgstr "모든 계정"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "엔트리 선정의 기준"
-
-#~ msgid "Notification"
-#~ msgstr "통지"
-
-#~ msgid "Financial Period"
-#~ msgstr "회계 기간"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "기간 선택"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "선택한 년도들의 비교 기준"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "선택된 회계년도 (최대 3년)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "참조 계정을 선택하십시오 (% 비교)."
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "계정 밸런스-비교 년도들"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "\"랜드스케이프\" 옵션을 선택해야 합니다. 체크하십시오."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "팬드스케이프 폼으로 리포트 보기"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "%로 비교"
-
-#~ msgid "Don't Compare"
-#~ msgstr "비교하지 않습니다."
-
-#~ msgid "Show Accounts"
-#~ msgstr "계정 보기"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. 3년 이상을 선택하면 안됩니다."
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "최대 3년 간을 선택할 수 있습니다."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr "3. 2년 이상을 '퍼센트' 옵션으로 선택했지만, 랜드스케이프 포맷을 선택하지 않았습니다."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr "다음과 같은 실수가 있었습니다. 교정한 뒤 다시 시도하십시오."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "페어런트와 비교를 원하면 비워두십시오."
-
-#~ msgid "Creation Date"
-#~ msgstr "생성 날짜"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr "2. 2년 이상을 선택하면서, '퍼센트' 옵션을 선택하지 않았습니다."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "적어도 1년 이상을 대변/차변 칼럼과 % 옵션으로 비교하는 것을 선택했습니다. 그렇게 하면 페이지의 인쇄 범주를 넘어 서게 됩니다. 다시 "
-#~ "시도하십시오."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "적어도 1년 이상의 회계년도를 선택하십시오."
-
-#~ msgid "Customize Report"
-#~ msgstr "리포트 커스터마이즈"
-
-#~ msgid "Printing date:"
-#~ msgstr "인쇄 날짜:"
-
-#~ msgid "Account Information"
-#~ msgstr "계정 정보"
-
-#~ msgid "Currency:"
-#~ msgstr "통화:"
diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po
index d25e9b32c31..a349e5a75b2 100644
--- a/addons/account/i18n/lo.po
+++ b/addons/account/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: 2011-04-29 05:08+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9621,3 +9741,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 8a55b558acc..a02b614605d 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/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: 2011-07-08 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Neužbaigtas metų žurnalas fiskaliniams metams"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +67,7 @@ msgid "Residual"
 msgstr "Likutis"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Prašome nurodyti eiliškumą sąskaitų žurnale"
@@ -136,7 +136,7 @@ msgid "Accounting Entries-"
 msgstr "Apskaitos įrašai-"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Jūs negalite ištrinti patvirtintų įrašų: \"%s\"!"
@@ -182,7 +182,7 @@ msgstr ""
 "terminą jo nepašalinus."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Įspėjimas!"
@@ -234,7 +234,7 @@ msgid "account.tax"
 msgstr "Mokesčių sąskaita"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -266,7 +266,7 @@ msgstr ""
 "mokesčio kodu būtų rodomas sąskaitoje faktūroje."
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Jūs negalite pridėti/keisti įrašų uždarytame žurnale."
@@ -320,7 +320,7 @@ msgid "St."
 msgstr "g."
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -495,8 +495,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -562,7 +560,7 @@ msgid "Not reconciled transactions"
 msgstr "Nesugretintos transakcijos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr ""
@@ -646,7 +644,7 @@ msgid "Tax Code Amount"
 msgstr "Mokesčio kodo suma"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -679,8 +677,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -741,7 +739,7 @@ msgid "Analytic Entries by line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -842,7 +840,7 @@ msgid "Next Partner to reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -966,11 +964,11 @@ msgid "Code"
 msgstr "Kodas"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1049,6 +1047,7 @@ 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 "-"
@@ -1142,7 +1141,7 @@ msgid "Entry Label"
 msgstr "Įrašo žymė"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1280,6 +1279,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1309,7 +1309,7 @@ msgid "Central Journal"
 msgstr "Centrinis žurnalas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Jūs negalite naudoti suminės sąskaitos šiame žurnale !"
@@ -1321,6 +1321,16 @@ msgstr "Jūs negalite naudoti suminės sąskaitos šiame žurnale !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Kurių balansas nelygus nuliui"
 
@@ -1402,7 +1412,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1561,6 +1571,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 ""
@@ -1627,7 +1638,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1660,7 +1671,7 @@ msgid "Receivables & Payables"
 msgstr "Gautinos ir mokėtinos sumos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Jūs turite nurodyti sąskaitą nurašymo įrašui"
@@ -1696,7 +1707,7 @@ msgid "Customer Ref:"
 msgstr "Kliento nuoroda"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1717,7 +1728,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1733,7 +1744,7 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2006,7 +2017,7 @@ msgid " Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2032,7 +2043,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2063,7 +2074,7 @@ msgid "Description"
 msgstr "Aprašymas"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2083,7 +2094,7 @@ msgid "Income Account"
 msgstr "Pajamų sąskaita"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2094,9 +2105,10 @@ msgid "Accounting Properties"
 msgstr "Apskaitos savybės"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Įrašai surikiuoti pagal"
 
@@ -2118,12 +2130,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2234,7 +2250,7 @@ msgid "Account Tax Code"
 msgstr "Sąskaitos mokesčio kodas"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2304,7 +2320,7 @@ msgid "Account Model Entries"
 msgstr "Sąskaitos modelio įrašai"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2388,7 +2404,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2400,12 +2416,13 @@ msgid "Average Price"
 msgstr ""
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Data:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2550,16 +2567,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2687,6 +2704,8 @@ msgstr "Finansinė apskaita"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2719,7 +2738,7 @@ msgid "Analytic Entries"
 msgstr "Analitiniai įrašai"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2842,7 +2861,7 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -2951,9 +2970,7 @@ msgstr "Norėdami naudoti sąnaudų sąskaitą, palikite tuščią"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2967,6 +2984,17 @@ msgstr "Norėdami naudoti sąnaudų sąskaitą, palikite tuščią"
 #: 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 "Žurnalai"
 
@@ -3012,7 +3040,7 @@ msgid "Starting Balance"
 msgstr "Pradinis likutis"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nėra nurodyta partnerio !"
@@ -3054,6 +3082,7 @@ msgstr ""
 #: 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
@@ -3105,7 +3134,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -3167,7 +3196,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3235,6 +3264,16 @@ msgstr "PVM:"
 #: 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.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 "Chart of Accounts"
 msgstr "Sąskaitų planas"
 
@@ -3281,7 +3320,6 @@ 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
 #: view:account.move:0
@@ -3326,7 +3364,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sąskaitų plano šablonas"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3335,13 +3373,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Kai kurie įrašai jau yra sugretinti !"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3463,7 +3501,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Negalima pakeisti mokesčio !"
@@ -3474,14 +3512,14 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3681,11 +3719,10 @@ msgid "Analytic Balance"
 msgstr "Analitinis balansas"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -3777,7 +3814,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr "Sąskaitos faktūros eilutėse nėra nurodyta mokesčių !"
@@ -3836,7 +3873,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4011,7 +4048,7 @@ msgid "Credit Notes"
 msgstr "Grąžinimas"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4082,11 +4119,11 @@ msgid "Change"
 msgstr "Keisti"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4190,7 +4227,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Jūs turite pasirinkti analitinio žurnalo tipą  '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4255,7 +4292,7 @@ msgid "Invoices"
 msgstr "Sąskaitos faktūros"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4358,7 +4395,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4367,24 +4404,25 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4406,7 +4444,7 @@ msgid "Bank Details"
 msgstr "Banko rekvizitai"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Mokesčiai praleisti !"
@@ -4461,7 +4499,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4483,7 +4521,7 @@ msgid "Child Tax Accounts"
 msgstr "Vaikinė mokesčio sąskaita"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4499,7 +4537,6 @@ msgid "Analytic Balance -"
 msgstr "Analitinis balansas -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4512,11 +4549,8 @@ msgstr "Analitinis balansas -"
 #: 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
 #: 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
@@ -4526,6 +4560,16 @@ msgstr "Analitinis balansas -"
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4596,7 +4640,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integracijos klaida !"
@@ -4642,6 +4686,8 @@ msgstr "Sugretinimo rezultatas"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4742,7 +4788,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4816,7 +4862,7 @@ msgstr ""
 "01.15, dienų skaičius=22, mėnesio diena=-1, tai apmokėjimo data 02.28."
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4844,7 +4890,7 @@ msgid "Start of period"
 msgstr "Periodo pradžia"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -4902,12 +4948,12 @@ msgstr "Fiskalinių metų uždarymo įrašų žurnalas"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4984,7 +5030,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5133,7 +5179,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5169,7 +5215,7 @@ msgstr "Vaikinės sąskaitos"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Nurašymas"
@@ -5306,7 +5352,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5331,14 +5377,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Negalite naudoti neaktyvios sąskaitos!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Įrašai nėra tos pačios sąskaitos arba jau sugretinti ! "
@@ -5357,6 +5403,19 @@ msgstr ""
 
 #. 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 "Nėra filtro"
@@ -5373,7 +5432,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5584,7 +5643,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -5850,9 +5909,9 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -6001,8 +6060,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Įrašai: "
@@ -6013,7 +6072,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Sukurti pasikartojančius įrašus pasirinktame žurnale."
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Negalima sukurti DK įrašų skirtingoms įmonėms"
@@ -6051,7 +6110,7 @@ msgid "Total debit"
 msgstr "Iš viso debeto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Įrašas \"%s\" yra nepatvirtintas !"
@@ -6116,31 +6175,30 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6250,7 +6308,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -6271,7 +6329,6 @@ msgstr ""
 #: 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 "Didžioji knyga"
@@ -6325,7 +6382,7 @@ msgid "Total:"
 msgstr "Iš viso:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6355,7 +6412,7 @@ msgid "Child Codes"
 msgstr "Vaikiniai kodai"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6500,7 +6557,7 @@ msgstr "Analitinės eilutės"
 #: 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 "
+"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) "
@@ -6514,7 +6571,7 @@ msgid "Lines"
 msgstr "Eilutės"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6682,7 +6739,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6786,7 +6843,7 @@ msgid "Sign on Reports"
 msgstr "Ženklas ataskaitose"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
@@ -6815,6 +6872,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "Išankstinė sąskaita"
 
@@ -6844,7 +6902,6 @@ msgstr "Papildoma informacija"
 
 #. 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
@@ -6870,13 +6927,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Bloga sąskaita !"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -6894,7 +6951,7 @@ msgid "Invoice Tax"
 msgstr "Sąskaitos faktūros mokesčiai"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "Nenurodytas numeris !"
@@ -7133,17 +7190,17 @@ msgid "Fixed"
 msgstr "Fiksuotas"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Įspėjimas!"
@@ -7206,7 +7263,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7255,7 +7312,7 @@ msgid "Deferral Method"
 msgstr "Metų pabaigos veiksmas"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7316,7 +7373,7 @@ msgid "Associated Partner"
 msgstr "Susijęs partneris"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Visų pirma turite pasirinkti partnerį !"
@@ -7381,7 +7438,7 @@ msgid "Choose Fiscal Year"
 msgstr "Pasirinkite mokestinius metus"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7416,7 +7473,6 @@ msgstr ""
 #: 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
@@ -7429,6 +7485,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Laikotarpis"
@@ -7511,14 +7580,6 @@ msgstr "Tel.:"
 msgid "Company Currency"
 msgstr "Įmonės naudojama valiuta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7579,7 +7640,7 @@ msgid "Account Types"
 msgstr "Sąskaitų tipai"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7630,8 +7691,13 @@ msgstr "Grąžinimų žurnalas"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr ""
 
@@ -7669,7 +7735,7 @@ msgid "Payment Term Line"
 msgstr "Mokėjimo terminų eilutės"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7838,8 +7904,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Netinkama sąskaita !"
@@ -7850,7 +7916,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8048,14 +8114,14 @@ msgid "Period from"
 msgstr "Periodas nuo"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8104,7 +8170,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8120,7 +8186,7 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8157,18 +8223,22 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -8205,7 +8275,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8233,7 +8303,7 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
@@ -8281,8 +8351,12 @@ msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8301,7 +8375,15 @@ 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 ""
 
@@ -8416,7 +8498,6 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8424,7 +8505,7 @@ msgid "Move"
 msgstr "DK įrašas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8500,7 +8581,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Sąskaitų planas"
 
 #. module: account
@@ -8517,13 +8598,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8543,7 +8628,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8562,7 +8647,7 @@ msgid "Account Subscription"
 msgstr "Periodiniai įrašai"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8591,7 +8676,6 @@ msgstr "Periodiniai įrašai"
 #: 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
@@ -8620,7 +8704,7 @@ msgid "Unreconciled"
 msgstr "Nesugretinta"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Bloga suma !"
@@ -8678,13 +8762,13 @@ msgid "Active"
 msgstr "Aktyvus"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8733,6 +8817,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -8810,6 +8895,18 @@ msgstr "Bendra"
 #: selection:account.pl.report,filter: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
@@ -8968,6 +9065,7 @@ msgstr ""
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Užregistruota"
 
@@ -8986,7 +9084,6 @@ msgstr "Užregistruota"
 #: 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
@@ -9019,13 +9116,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9040,7 +9134,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Modelis skirtas pasikartojantiems sąskaitų įrašams"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9049,7 +9143,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9190,8 +9284,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9261,6 +9355,7 @@ msgstr "Tiekėjo sąskaita faktūra"
 #: report:account.journal.period.print: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
@@ -9294,7 +9389,7 @@ msgid "Recurring"
 msgstr "Pasikartojantis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Įrašas jau yra sugretintas"
@@ -9315,7 +9410,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9330,6 +9425,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Su DK įrašais"
 
@@ -9445,7 +9550,7 @@ msgid "Accounts Mapping"
 msgstr "Sąskaitų nustatymai"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9470,7 +9575,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "Pajamų ir išlaidų sąskaitos susijusios su pasirinktu produktu."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -9676,7 +9781,7 @@ msgstr ""
 "Turite įvesti periodo trukmę, kuri negali būti lygi 0 ar būti neigiama."
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Jūs negali ištrinti sąskaitos kuri turi įrašų! "
@@ -9700,6 +9805,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Turtas"
 
@@ -9742,9 +9859,6 @@ msgstr ""
 #~ msgid "Amount paid"
 #~ msgstr "Sumokėta suma"
 
-#~ msgid "Partner name"
-#~ msgstr "Kontrahento pavadinimas"
-
 #~ msgid "General Credit"
 #~ msgstr "Bendras Kreditas"
 
@@ -9811,9 +9925,6 @@ msgstr ""
 #~ msgid "Automatic reconciliation"
 #~ msgstr "Automatinis sugretinimas"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Palikite tuščią norėdami naudoti einamąjį periodą"
-
 #~ msgid "Date End"
 #~ msgstr "Pabaigos data"
 
@@ -9847,9 +9958,6 @@ msgstr ""
 #~ msgid "Journal code"
 #~ msgstr "Žurnalo kodas"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Nurašymų periodas"
-
 #~ msgid "Entry Name"
 #~ msgstr "Įrašo pavadinimas"
 
@@ -9907,9 +10015,6 @@ msgstr ""
 #~ msgid "Write-Off journal"
 #~ msgstr "Nurašymų žurnalas"
 
-#~ msgid "All account entries"
-#~ msgstr "Visi sąskaitos įrašai"
-
 #~ msgid "Subscription Entries"
 #~ msgstr "Periodiniai įrašai"
 
@@ -10084,9 +10189,6 @@ msgstr ""
 #~ msgid "PRO-FORMA Customer Invoices"
 #~ msgstr "Išankstinė sąskaita klientui"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Nuol. (%)"
-
 #~ msgid "Contact"
 #~ msgstr "Kontaktas"
 
@@ -10117,10 +10219,6 @@ msgstr ""
 #~ msgid "Unpaid invoices"
 #~ msgstr "Neapmokėtos sąskaitos"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Konfigūracijos klaida!"
-
 #~ msgid "Create a Fiscal Year"
 #~ msgstr "Sukurti fiskalinius metus"
 
@@ -10164,9 +10262,6 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Orderis"
 
-#~ msgid "account.move.line"
-#~ msgstr "Įrašo eilutė"
-
 #~ msgid "(Keep empty for all open fiscal years)"
 #~ msgstr "(palikite tuščią, jei norite visų atvirų fiskalinių metų)"
 
@@ -10198,10 +10293,6 @@ msgstr ""
 #~ msgid "Voucher Nb"
 #~ msgstr "Dokumento numeris"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Jūs negalite patvirtinti įrašo, neturinčio balanso !"
-
 #~ msgid "Are you sure you want to close the fiscal year ?"
 #~ msgstr "Ar tikrai norite uždaryti fiskalinius metus ?"
 
@@ -10374,9 +10465,6 @@ msgstr ""
 #~ msgid "Analytic Debit"
 #~ msgstr "Analitinis debetas"
 
-#~ msgid "Move name"
-#~ msgstr "Didžiosios knygos įrašas"
-
 #~ msgid "Reconcilate the entries from payment"
 #~ msgstr "Įrašų sugretinimas iš mokėjimo"
 
@@ -10391,10 +10479,6 @@ msgstr ""
 #~ msgid "By Date and Period"
 #~ msgstr "Pagal datą ir periodą"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Ši sąskaita nepažymėta kaip gretinama !"
-
 #~ msgid "Statement encoding produces payment entries"
 #~ msgstr "Dokumentai padeda sukurti mokėjimo eilutes"
 
@@ -10518,12 +10602,6 @@ msgstr ""
 #~ msgid "Number of entries are generated"
 #~ msgstr "Įrašų numeriai yra sugeneruojami"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr ""
-#~ "Jūs negalite deaktyvuoti sąskaitų , kurios turi susijusių didžiosios knygos "
-#~ "įrašų."
-
 #~ msgid "Modify Invoice"
 #~ msgstr "Redaguoti sąskaitą faktūrą"
 
@@ -10654,15 +10732,6 @@ msgstr ""
 #~ msgid "Name of the fiscal year as displayed on screens."
 #~ msgstr "Fiskalinių metų pavadinimas rodomas ekrane."
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Jeigu naudojate mokėjimo terminą, mokėjimo data bus užpildoma automatiškai, "
-#~ "kai bus generuojamos sąskaitos eilutės. Jeigu nenaudojate mokėjimo termino, "
-#~ "tai reiškia, kad bus tiesioginis mokėjimas."
-
 #~ msgid "Account Code"
 #~ msgstr "Sąskaitos kodas"
 
@@ -10798,9 +10867,6 @@ msgstr ""
 #~ msgid "Account Entry Lines"
 #~ msgstr "Sąskaitos įrašo eilutės"
 
-#~ msgid "Partner ID"
-#~ msgstr "Partnerio ID"
-
 #~ msgid "Untaxed amount"
 #~ msgstr "Suma be mokesčių"
 
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 1b2aebdfacc..e405a76f739 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: 2011-04-29 05:08+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -25,7 +25,7 @@ msgstr "Sistēmas maksājums"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Cita konfigurācija"
+msgstr "Cita Konfigurācija"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -40,16 +40,17 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+"Nav iespējams dzēst/atslēgt kontu, kas ir piesaistīts kādam no Partneriem."
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Sasaistīt Žurnāla Rindas"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Maksājumu Orderi"
 
 #. module: account
 #: view:account.account:0
@@ -69,7 +70,7 @@ msgstr "Atlikums"
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Lūdzu nodefinējiet numerāciju rēķinu žurnālam"
 
 #. module: account
 #: constraint:account.period:0
@@ -84,17 +85,17 @@ msgstr "Konta Valūta"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Apakšdefinīcija"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Ilgtermiņa Debitori uz Šodienu"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
 msgid "Include Reconciled Entries"
-msgstr "Iekļaut saskaņotos ierakstus"
+msgstr "Iekļaut savienotos ierakstus"
 
 #. module: account
 #: view:account.pl.report:0
@@ -102,6 +103,8 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Peļņas un zaudējumu pārskats sniedz pārskatu par jūsu uzņēmuma peļņu un "
+"zaudējumiem atsevišķā dokumentā"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -116,7 +119,7 @@ msgstr "wizard.multi.charts.accounts"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Kopā debets"
+msgstr "Kopējais Debets"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -124,6 +127,8 @@ 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 ""
+"Pie darījumu atsaistes ir nepieciešams pārbaudīt arī citas saistītās "
+"darbības, jo tās automātiski netiek atceltas."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -134,7 +139,7 @@ msgstr "Grāmatvedības Ieraksti"
 #: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "Nevar dzēst iegrāmatotu kustību \"%s\"!"
+msgstr "Jūs nevarat dzēst iegrāmatotu kustību \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
@@ -165,7 +170,7 @@ msgstr "Atsauce"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr "Izvēlēties finanšu gadu "
+msgstr "Izvēlaties Finanšu Gadu "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -173,6 +178,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Atzīmējot lauku kā \"False\", iespējams noslēpt attiecīgo maksājumu termiņa "
+"objektu to neizdzēšot."
 
 #. module: account
 #: code:addons/account/invoice.py:1421
@@ -184,7 +191,7 @@ msgstr "Uzmanību!"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr "Konta avots"
+msgstr "Konta Avots"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -214,6 +221,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Tiek norādīts analītiskā žurnāla tips. Veidojot jaunu dokumentu, kuram "
+"nepieciešami arī analītiskie ieraksti, OpenERP piemeklēs žurnālu ar "
+"atbilstošu tipu."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -239,7 +249,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Grāmatojuma rindas savienošanas izvēlne"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -247,6 +257,7 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"Secības lauks tiek izmantots, lai sarindotu objektus noteiktā secībā."
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -255,6 +266,8 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
+"Atzīmējiet šo izvēles lauciņu, ja nevēlaties, lai PVN, kas attiecas uz šo "
+"nodokļa kodu, tiktu parādīts rēķinos"
 
 #. module: account
 #: code:addons/account/invoice.py:1210
@@ -266,6 +279,8 @@ msgstr "Rēķins '%s' ir apmaksāts daļēji: %s%s no %s%s (%s%s atlicis)"
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
 msgstr ""
+"Grāmatojumi ir ievades objekti, caur kuriem notiek grāmatojuma rindu "
+"savienošana."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -276,24 +291,24 @@ msgstr "Beļģijas atskaites"
 #: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr ""
+msgstr "Jūs nevarat pievienot/modificēt grāmatojumus slēgtā žurnālā."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr "Aprēķināta bilance"
+msgstr "Aprēķinātā Bilance"
 
 #. 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 ""
+msgstr "Manuāla Atkārtošanās"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr "Slēgt finanšu gadu"
+msgstr "Slēgt Finanšu Gadu"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -303,12 +318,12 @@ msgstr "Atļaut norakstīšanu"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Izvēlēties Analīzes periodu"
+msgstr "Izvēlēties Analīzes Periodu"
 
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr ""
+msgstr "Izr."
 
 #. module: account
 #: code:addons/account/invoice.py:529
@@ -327,6 +342,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Uzstāda lokalizētos kontu plānus un citus attiecīgās valsts specifikai "
+"atbilstošus grāmatvedības uzstādījumus."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -337,11 +354,16 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"Atbilstošajam uzņēmumam nevar atrast nevienu grāmatvedības žurnālu ar šādu "
+"tipu %s!\n"
+"\n"
+"To iespējams izveidot šajā izvēlnē: \n"
+"Iestatījumi/Grāmatvedība/Konti/Žurnāli."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Konta Atsaiste"
 
 #. module: account
 #: view:product.product:0
@@ -371,6 +393,9 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"Šo OpenERP skatu grāmatveži izmanto, lai veiktu masveida ierakstus. Žurnāla "
+"vienumi tiek izveidoti, ja izmantojat Bankas Konta Izrakstus, Kases Aparātus "
+"vai Pircēju/Piegādātaju maksājumus."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -391,17 +416,17 @@ msgstr "Izveides datums"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Iepirkuma atgriešana"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Perioda Bilance"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Atskaitē lietotā vaūta"
+msgstr "Atskaitē lietotā valūta"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -414,16 +439,17 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Šis lauks satur informāciju par šā žurnāla ierakstu numurēšanas sistēmu."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr "Noklusējuma debeta konts"
+msgstr "Noklusējuma Debeta Konts"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Kopā kredīts"
+msgstr "Kopējais Kredīts"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -433,19 +459,19 @@ msgstr "Pozitīvs"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "Atvērt Sasaistes Atcelšanai"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "Grafika sagatave"
+msgstr "Grafika Sagatave"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Summa citā valūtā"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -454,6 +480,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"Kad žurnāla periods ir izveidots tā stāvoklis ir \"Projekts\". Ja atskaite "
+"tiek izdrukāta, tas ir \"Izdrukāts\". Kad visu darbību pabeigšanas tiek "
+"nonāk stāvoklī \"Pabeigts\"."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -463,6 +492,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 ""
+"Nodokļu diagrammas ir koka skata struktūrā, atspoguļojot nodokļu struktūru "
+"(vai nodokļu kodus) un parāda pašreizējo nodokļu situāciju. Nodokļu "
+"diagrammas attēlo summu par katru jūsu valsts nodokļu deklarēšanas jomu. Tie "
+"ir parādīti hierarhiskā struktūrā, kuru var mainīt atbilstoši jūsu "
+"vajadzībām."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -486,8 +520,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -506,12 +538,12 @@ msgstr "Apstiprināt izvēlētos rēķinus"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Vecākais mērķis"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Žurnālā izmantotais konts"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -530,40 +562,40 @@ msgstr ""
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Izvēlēties kontu plānu"
+msgstr "Izvēlēties Kontu Plānu"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr "Iegādes nodokļi"
+msgstr "Iepirkuma Nodokļi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Kredītrēķini"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Saist."
 
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Nesasaistītie Kontējumi"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "Kases Bilance nesakrīt ar aprēķināto Bilanci!"
 
 #. 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 ""
+msgstr "Nodokļu Formēšana/Aizvietošana"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
@@ -574,7 +606,7 @@ msgstr "Slēgt Fiskālo Gadu"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "Grāmatvedim jāapstiprina izraksts."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -590,7 +622,7 @@ msgstr "Visi"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr "Rēķina adreses nosaukums"
+msgstr "Rēķina Adreses Nosaukums"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -603,6 +635,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Atceļot kontējumu sasaisti, jāpārbauda arī saistītās darbības, jo tās "
+"automātiski netiek atceltas."
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -612,39 +646,39 @@ msgstr "   30 dienas   "
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr "Sērijas"
+msgstr "Secība"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr ""
+msgstr "Nodokļu Formēšana/Aizvietošana"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "Centralizēts žurnāls"
+msgstr "Centralizētais Žurnāls"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "Pamata secībai ir jāatšķiras no tekošās!"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Summa pēc Nodokļa Koda"
 
 #. module: account
 #: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
-msgstr ""
+msgstr "REL"
 
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
 msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "kases slēgšanas bilance ievadīta pēc pārbaudes"
 
 #. module: account
 #: view:account.period:0
@@ -655,12 +689,12 @@ msgstr "Slēgt Periodu"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Konta Partnera Kopējais Pārskats"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Sākuma Ierakstu Periods"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
@@ -672,7 +706,7 @@ msgstr "Žurnāla periods"
 #: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr ""
+msgstr "Kontējumu sasaisti var veikt tikai viena uzņēmuma ietvaros"
 
 #. module: account
 #: view:account.account:0
@@ -684,17 +718,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Debitoru Konti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "Galvenās grāmatas atskaite"
+msgstr "Galvenās Grāmatas Atskaite"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Atvērt"
 
 #. module: account
 #: view:account.use.model:0
@@ -704,12 +738,12 @@ msgstr "Vai esat pārliecināti, ka vēlaties izveidot ierakstus?"
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Pārbaudīt"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Šodien Sasaistītie Partneri"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -720,20 +754,20 @@ msgstr "Procenti"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "Diagrammas"
+msgstr "Kontu Plāni"
 
 #. 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 "Analītiskie ieraksti pa rindām"
+msgstr "Analītiskie Ieraksti pa rindām"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "Tikai rēķina Melnrakstam ir iespējams mainīt valūtu!"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -752,12 +786,12 @@ msgstr "Veids"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Konta Parakstīšanās Rinda"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Atsauce uz Partneri rēķinā."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -770,22 +804,22 @@ msgstr "Atsaiste"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Konta Analītiskais Žurnāls"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Automātiska Grāmatošana"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr "Termiņa aprēķins"
+msgstr "Apmaksas Termiņa Aprēķins"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C./Pārvietošanas vārds"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -806,6 +840,8 @@ msgstr "dienas"
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
 msgstr ""
+"Ja ieķeksēsiet, jaunizveidotajā kontu plānā pēc noklusējuma šis netiks "
+"iekļauts."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -814,11 +850,13 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Nav iespējams %s rēķinu, kurš ir iegrāmatots, rēķins vispirms ir "
+"jāatgrāmato. Vai arī varat izrakstīt kredītrēķinu."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "Jauna Parakstīšanās"
 
 #. module: account
 #: view:account.payment.term:0
@@ -828,7 +866,7 @@ msgstr "Aprēķins"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "Nākamais Parteris grāmatošanai"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1191
@@ -837,12 +875,14 @@ msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
 "can just change some non important fields !"
 msgstr ""
+"Jūs nevar veikt izmaiņas apstiprinātiem grāmatojumiem! Izmaiņas var veikt "
+"tikai dažos nenozīmīgos laukos!"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "vid. Apmaksas kavējums"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -865,7 +905,7 @@ msgstr "Nav apmaksāts"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Kopā ar Nodokli"
 
 #. module: account
 #: view:account.invoice:0
@@ -873,21 +913,21 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "Apstiprināt"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Kopā"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Konsolidācija"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -895,22 +935,22 @@ msgstr ""
 #: view:account.invoice.report:0
 #: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Paplašinātie filtri..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Cenralizētais Žurnāls"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Preču Atgriešana"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Bankas izraksts"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -924,11 +964,13 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+"Ja konts ir nodokļu konts, tad šajā laukā tiek attēlots nodoklis. Ja konts "
+"ir nodokļu bāze, tad  šajā laukā tiek attēlota bāze (bez nodokļa)."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Iepirkumi"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -970,12 +1012,12 @@ msgstr "Nav norādīts analītiskais žurnāls!"
 #: 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 ""
+msgstr "Partnera Bilance"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "Konta nosaukums."
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
@@ -986,24 +1028,24 @@ msgstr ""
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Gada Nedēļa"
 
 #. 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 ""
+msgstr "Izklājrežīms"
 
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "Neapstiprinātie Klientu Rēķini"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Izvēlieties slēgšanai Fiskālo gadu"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1016,18 +1058,18 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Pielietojuma Opcijas"
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "Strīdīgs"
 
 #. 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 ""
+msgstr "Kases Iekārtas"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1045,17 +1087,17 @@ msgstr "-"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Vadītājs"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "Veidot Kontējumus no:"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Bank"
-msgstr ""
+msgstr "Banka"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -1065,18 +1107,18 @@ msgstr "Perioda Sākums"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Apstiprināt Izrakstu"
 
 #. 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 ""
+msgstr "Nodoklis, ar kuru tiks aizvietots"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr ""
+msgstr "Kredīta Centralizācija"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1090,12 +1132,12 @@ msgstr ""
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Atcelt Rēķinus"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Darbības, kas jāveic, lai veiktu kontējumu atsaisti"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1103,42 +1145,45 @@ msgstr ""
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "Nodokļa Kods"
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Izejošais Valūtas Kurss"
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "Grāmatojuma kontējums"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "Transakciju skaits"
 
 #. 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 ""
+msgstr "Grāmatojuma Birka"
 
 #. module: account
 #: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
+"Nav iespējams modificēt/dzēst žurnālu, jo tas satur grāmatojumus šajā "
+"periodā!"
 
 #. module: account
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "Atsauce uz pirmdokumentu."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1176,19 +1221,19 @@ msgstr "Konts"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Iekļauts bāzes summā"
 
 #. 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 ""
+msgstr "Ierakstu Analīze"
 
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "Līmenis"
 
 #. module: account
 #: report:account.invoice:0
@@ -1209,7 +1254,7 @@ msgstr "Nodokļi"
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Izvēlieties sākuma un beigu periodu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1219,12 +1264,12 @@ msgstr "Kontu Šabloni"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Meklēt nodokļu parauga veidni"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Jūsu Atsauce"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1243,12 +1288,12 @@ msgstr "Kavētie Maksājumi"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Sākotnējā Bilance"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Atstatīt uz neapstiprināts"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1259,18 +1304,18 @@ msgstr "Bankas Informācija"
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr ""
+msgstr "Atskaites Opcijas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Žurnāla grāmatojumu Analīze"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1289,12 +1334,12 @@ msgstr "Bankas konta īpašnieks"
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr ""
+msgstr "Debitoru Konts"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Virsgrāmata"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1271
@@ -1309,28 +1354,38 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Meklēt Nodokļus"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "Analītisko Kontu Virsgrāmata"
 
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr ""
+msgstr "Kontēt"
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "Kontējumu skaits"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1350,13 +1405,13 @@ msgstr "Ciparu skaits"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Izlaist stāvokli \"Neapstiprināts\" manuālai ievadei"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Kopā Bez Nodokļa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1366,16 +1421,20 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Žurnāla grāmatojums sastāv no vairākiem kontējumiem, kuri ir ieraksti konta "
+"debeta vai kredīta pusē. OpenERP automātiski veic grāmatojumus dažādiem "
+"dokumentiem: rēķiniem, kredītrēķiniem, maksājumiem par piegādātajām precēm, "
+"banku izrakstiem utt."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "Grāmatojumu skaits "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Pagaidu tabula, kas tiek izmantota Kopsavilkuma skatījumam"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1397,11 +1456,14 @@ msgid ""
 "The payment term defined gives a computed amount greater than the total "
 "invoiced amount."
 msgstr ""
+"Nevar izveidot rēķinu!\n"
+"Definēto maksājuma nosacījumu rezultātā aprēķinātā summa ir lielāka, kā "
+"piestādāmā summa."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Anglo-Sakšu Grāmatvedības Uzskaite"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1417,22 +1479,22 @@ msgstr "Slēgts"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Grāmatojumi, kas atkārtojas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "Nodokļu Profilu paraugi/veidnes."
 
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "Nodokļa Koda Pārbaude"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Savienotie Kontējumi"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
@@ -1447,7 +1509,7 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr ""
+msgstr "un Žurnāli"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1463,12 +1525,12 @@ msgstr "Bez nodokļa"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Doties uz nākamo partneri"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Meklēt Bankas Izrakstus"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -1480,19 +1542,19 @@ msgstr ""
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr ""
+msgstr "Kreditoru Konts"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr ""
+msgstr "Reversais Nodokļu Konts"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Izraksta rindas"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1508,19 +1570,19 @@ msgstr ""
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Datums/Kods"
 
 #. 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 ""
+msgstr "Pamata Konts"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "Apmaksas Limits"
 
 #. module: account
 #: report:account.invoice:0
@@ -1541,7 +1603,7 @@ msgstr ""
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Fiskālā Gada Numerācija"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1552,17 +1614,17 @@ msgstr ""
 #: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "Atbildīgais"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Kopā:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Pārdošana pēc Konta tipa"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1570,22 +1632,24 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Rēķina atcelšana: Tiek veidots kredītrēķins, tas jāapstiprina un jāveic "
+"sasaiste ar attiecīgo rēķinu."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Rēķinu izrakstīšana"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr ""
+msgstr "Saknes Nodokļa Kods"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include initial balances"
-msgstr ""
+msgstr "Iekļaut sākotnējo bilanci"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1600,7 +1664,7 @@ msgstr ""
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Ar šo vedni iespējams mainīt rēķina valūtu"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1609,22 +1673,25 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Attēlo uzņēmuma kontu plānu katram fiskālajam gadam vai noteiktajā periodā. "
+"Uzspiežot iespējams atvērt kokveida skatījumu visiem žurnāla grāmatojumiem "
+"pēc koda."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Kļūda! Nav iespējams definēt fiskālos gadus, kuru periodi pārklājas."
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Konts nav atzīmēts, kā sasaistāms!"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Vērtības"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1632,21 +1699,23 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Uzliekot vērtību \"False\" laukam Aktīvs, iespējams slēpt žurnāla periodu to "
+"neizdzēšot."
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr ""
+msgstr "Piegādātāja Debeta Konts"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Papildu daudzums ierakstiem"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Ieņēmumi/Izdevumi"
 
 #. module: account
 #: code:addons/account/account_move_line.py:815
@@ -1662,7 +1731,7 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Visi Partneri"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1672,54 +1741,54 @@ msgstr ""
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Analītiskais Kontu Plāns"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Mani Grāmatojumi"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Klienta Atsauce:"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "Lietotajam %s nav pieejas tiesību žurnālam %s !"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Šie periodi var pārklāties."
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "Neapstiprināts Izraksts"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Nodokļu atskaites: Kredītrēķini"
 
 #. module: account
 #: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "Nav iespējams atslēgt kontu, kurš satur grāmatojumus."
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Kredīta summa"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Nav iespējams veikt grāmatojumus slēgtā kontā."
 
 #. module: account
 #: code:addons/account/account.py:519
@@ -1728,6 +1797,8 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains account entries!"
 msgstr ""
+"Nedrīkst mainīt konta tipu no \"Slēgts\" uz jebkuru citu, ja tas satur "
+"grāmatojumus!"
 
 #. module: account
 #: view:res.company:0
@@ -1737,60 +1808,60 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Kļūdaina kredīta vai debeta vērtība grāmatojumā!"
 
 #. 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 ""
+msgstr "Rēķinu Analīze"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "perioda slēgšana"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Konfigurēt Fiskālo Gadu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Grāmatojumi pēc ierakstiem"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Gr. Kods"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Grāmatojumi"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Nodokļu atskaites: Rēķini"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Apakšsumma"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Kopā"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1801,24 +1872,24 @@ msgstr "Analītiskais konts"
 #: code:addons/account/account_bank_statement.py:332
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr ""
+msgstr "Pārbaudiet, vai žurnālam ir definēts konts."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Derīgs"
 
 #. 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 ""
+msgstr "Kontu Drukas Žurnāls"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Produkta Kategorija"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1833,13 +1904,13 @@ msgstr ""
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Closing balance based on Starting Balance and Cash Transactions"
-msgstr ""
+msgstr "Beigu Saldo bāzēts uz Sākuma Saldo un Naudas darījumiem"
 
 #. 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 "Kontējumu un maksājumu salīdzināšana"
 
 #. module: account
 #: view:account.tax:0
@@ -1853,6 +1924,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 ""
+"Atzīmēt, ja vēlaties izmantot citu numerāciju katram izveidotajam žurnālam. "
+"Pretējā gadījumā tiks izmantota viena numerācija visiem žurnāliem."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1861,6 +1934,7 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Tiek pievienota valūtas kolonna, ja valūta atšķiras no uzņēmuma valūtas"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1872,14 +1946,14 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "Peļņas / Zaudējumu Konts"
 
 #. 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 ""
+msgstr "Attēls"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1890,7 +1964,7 @@ msgstr ""
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Summa bez nodokļiem"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1898,6 +1972,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Atzīmējot lauku Aktīvs kā \"False\", iespējams noslēpt nodokli to neizdzēšot."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1933,7 +2008,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Konti, kuros jāsasaista kontējumi"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -1952,22 +2027,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvāris"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Apstiprinājumi"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Šis Fisk. Gads"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Nodokļu konti kokveida skatījumā"
 
 #. module: account
 #: constraint:account.period:0
@@ -1988,7 +2063,7 @@ msgstr "Priekšapmaksas"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " Žurnāls"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -2012,7 +2087,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2060,48 +2135,56 @@ msgstr "Darbojas"
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Ieņēmumu Konts"
 
 #. module: account
 #: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
+"Nav definēts neviens \"Pārdošanas/Iepirkuma\" tipa grāmatvedības žurnāls!"
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Grāmatvedības Uzstādījumi"
 
 #. 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
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Ieraksti kārtoti pēc"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Mainīt uz"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "Produktu skaits "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produkta Veidne"
 
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2131,7 +2214,7 @@ msgstr "Fiskālais Gads"
 #: help:account.report.general.ledger,fiscalyear_id:0
 #: help:account.vat.declaration,fiscalyear_id:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "Atstāt tukšu visiem nenoslēgtajiem fiskālajiem gadiem"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2164,7 +2247,7 @@ msgstr "Fiskālās Pozīcijas"
 #. module: account
 #: field:account.period.close,sure:0
 msgid "Check this box"
-msgstr ""
+msgstr "Atzīmēt"
 
 #. module: account
 #: view:account.common.report:0
@@ -2184,24 +2267,24 @@ msgstr "Filtri"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Atvērts"
 
 #. 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 ""
+msgstr "Neapstiprināts Rēķins"
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr ""
+msgstr "Atzīmēt, lai atļautu lietotājam sasaistīt kontējumus šajā kontā."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Partnera Kontējumu Sasaiste"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2218,6 +2301,9 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Nevar atrast nevienu %s tipa grāmatvedības žurnālu šim uzņēmumam.\n"
+"To var izveidot izvēlnē:\n"
+"Uzstādījumi\\Grāmatvedība\\Konti\\Žurnāli"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2228,7 +2314,7 @@ msgstr "Bāzes Kods"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "Norāda secību kādā tiek atspoguļotas nodokļu rindas rēķinā."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2258,7 +2344,7 @@ msgstr "Debeta centralizācija"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Apstiprināt Rēķinus"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2267,7 +2353,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Diena"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
@@ -2284,7 +2370,7 @@ msgstr "Tipveida ieraksti"
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
-msgstr ""
+msgstr "IEP"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2314,7 +2400,7 @@ msgstr "Izvēlies periodu"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Izraksti"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2366,19 +2452,19 @@ msgstr "Analītiskais Konts"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Konti"
 
 #. module: account
 #: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurācijas kļūda!"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Vidējā Svērtā Cena"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2393,16 +2479,18 @@ msgid ""
 "You cannot modify company of this journal as its related record exist in "
 "Entry Lines"
 msgstr ""
+"Nav iespējams mainīt uzņēmumu žurnālam, jo tas satur grāmatojumus, kas "
+"attiecas uz noteiktu uzņēmumu."
 
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Uzraksts"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Grāmatvedības informācija"
 
 #. module: account
 #: view:account.tax:0
@@ -2423,6 +2511,7 @@ msgstr "Atlaide %"
 
 #. 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
@@ -2433,12 +2522,12 @@ msgstr "Norāde"
 #. 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 "Konts var būt gan nodokļa bāze, gan aprēķinātais nodoklis."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Automātiskā Kontējumu Sasaiste"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2456,7 +2545,7 @@ msgstr "Atmaksas Bāzes Kods"
 #: 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 "Bankas Izraksti"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2469,13 +2558,13 @@ msgstr "Jā"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr ""
+msgstr "Nodokļu Virskonts"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2489,13 +2578,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "Savstarpējo Norēķinu Bilance"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Kontējumi"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2516,25 +2605,25 @@ 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 ""
+msgstr "Jauna uzņēmuma Grāmatvedības Uzstādījumi"
 
 #. 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 ""
+msgstr "Pārdošanas dati pēc Konta"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Ar šī vedņa palīdzību tiek veidoti regulārie grāmatojumi"
 
 #. module: account
 #: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "Žurnālam nav definēta numerācija!"
 
 #. module: account
 #: code:addons/account/account.py:2083
@@ -2544,7 +2633,7 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Žurnālam '%s'  ir jādefinē atbilstošs analītiskais žurnāls!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2557,7 +2646,7 @@ msgstr "Nodokļu kodi"
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Klienti"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -2573,7 +2662,7 @@ msgstr "Periods līdz"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusts"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:306
@@ -2596,7 +2685,7 @@ msgstr ""
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Reference Number"
-msgstr ""
+msgstr "Atsauces Nr."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2605,7 +2694,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktobris"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2617,7 +2706,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "Rinda 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
@@ -2668,8 +2757,10 @@ msgstr "Finansu Grāmatvedība"
 #. 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
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Peļņa un Zaudējumi"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2705,7 +2796,7 @@ msgstr "Analītiskie Ieraksti"
 msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one."
-msgstr ""
+msgstr "Attiecīgajam datumam nav definēts fiskālais gads! Tas ir jāizveido."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -2732,12 +2823,12 @@ msgstr "Atbildīgais par žurnālu."
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Meklēt pēc Perioda"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Rēķina Valūta"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2787,17 +2878,17 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "Vienmēr"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "Kopējais Daudzums"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Norakstīšanas Konts"
 
 #. module: account
 #: field:account.model.line,model_id:0
@@ -2829,7 +2920,7 @@ msgstr ""
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
-msgstr ""
+msgstr "BNK"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
@@ -2839,32 +2930,32 @@ msgstr "Analītiskās rindas"
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronisks Fails"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Klienta Kredīta Konts"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Nodokļa Kodu Veidne/Paraugs"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "Sākuma datums"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Partnera Reģistrs"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Nosaka žurnāla kolonnas attēlošanas secību."
 
 #. module: account
 #: view:account.tax.template:0
@@ -2876,7 +2967,7 @@ msgstr "Nodokļa Deklarācija"
 #: 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 ""
+msgstr "Piespiež norādīt visiem konta ierakstiem norādīt sekundāro valūtu."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2889,17 +2980,17 @@ 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 ""
+msgstr "Kontu Plāna Veidnes"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Veidot Kontu plānu no Veidnes"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Kontējumu Sasaiste/Atsaiste"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -2935,7 +3026,6 @@ msgstr "Atstājiet neaizpildītu, lai lietotu izdevumu kontu"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2949,6 +3039,17 @@ msgstr "Atstājiet neaizpildītu, lai lietotu izdevumu kontu"
 #: 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 "Žurnāli"
 
@@ -2980,13 +3081,13 @@ msgstr "Iepirkumi"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Grāmatvedības Konfigurācija"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Grāmatvedības Rīku Panelis"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -2997,7 +3098,7 @@ msgstr "Sākuma Bilance"
 #: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
-msgstr ""
+msgstr "Nav definēts Partneris!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
@@ -3009,7 +3110,7 @@ msgstr "Slēgt Periodu"
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr ""
+msgstr "Nav ierakstu Kontos? "
 
 #. module: account
 #: report:account.overdue:0
@@ -3046,7 +3147,7 @@ msgstr "Neapstiprināts"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "Kontu Plāna Konfigurācija"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3058,17 +3159,17 @@ msgstr "Nedrukāt Rēķinā"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "Nodokļu Plāns"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Meklēt Žurnālā"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Rēķins (gaida)"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -3091,17 +3192,17 @@ msgstr ""
 #: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr ""
+msgstr "Nav iespējams dzēst rēķinu/s, kas ir jau apmaksāti vai apstiprināti!"
 
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Total :"
-msgstr ""
+msgstr "Kopā:"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Pārvedumi"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3111,7 +3212,7 @@ msgstr ""
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr ""
+msgstr "Kontu plāni"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3121,12 +3222,12 @@ msgstr "Nodokļa summa"
 #. module: account
 #: view:account.installer:0
 msgid "Your bank and cash accounts"
-msgstr ""
+msgstr "Bankas un norēķinu konti"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "Meklēt Ierakstu"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3158,24 +3259,25 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Pretējā puse"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dati rēķinu izrakstišanai"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Rēķina Statuss"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Produkta Kategorija"
 
 #. module: account
 #: view:account.move:0
@@ -3183,13 +3285,13 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "Komentārs/Skaidrojums"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Veidot Kontu"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
@@ -3204,7 +3306,7 @@ msgstr "Detaļas"
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "Bankas un norēķinu Konti"
 
 #. module: account
 #: report:account.invoice:0
@@ -3216,6 +3318,16 @@ msgstr "PVN :"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontu Plāns"
 
@@ -3243,6 +3355,7 @@ msgstr "2"
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
+"(Neizvēloties Fiskālo gadu, tiks izmantoti visi nenoslēgtie fiskālie gadi.)"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3295,12 +3408,12 @@ msgstr "Atsaistīt"
 #: code:addons/account/wizard/account_fiscalyear_close.py:79
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr ""
+msgstr "Jānorāda žurnāla noklusētie kredīta un debeta konti"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Kontu Plāns (Veidne)"
 
 #. module: account
 #: code:addons/account/account.py:2095
@@ -3315,7 +3428,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr ""
+msgstr "Daži kontējumi ir jau sasaistīti!"
 
 #. module: account
 #: code:addons/account/account.py:1204
@@ -3333,7 +3446,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Budžeti"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3352,7 +3465,7 @@ msgstr ""
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr ""
+msgstr "Nav Filtru"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3362,7 +3475,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Vēsture"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3382,7 +3495,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Sk."
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
@@ -3402,7 +3515,7 @@ msgstr ""
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "Izdevumu Konts"
 
 #. module: account
 #: constraint:account.move:0
@@ -3424,7 +3537,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Konta bilance"
 
 #. module: account
 #: report:account.invoice:0
@@ -3435,25 +3548,25 @@ msgstr "Vienības Cena"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "Analītiskie Ieraksti"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
-msgstr ""
+msgstr "Nav iespējams mainīt nodokli!"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "#Ieraksti"
 
 #. module: account
 #: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "Izvēlēta ir mērvienība, kura neatbilst produktam."
 
 #. module: account
 #: code:addons/account/invoice.py:473
@@ -3466,7 +3579,7 @@ msgstr ""
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Neapmaksāts Rēķins"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
@@ -3476,7 +3589,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "Aizvietošana"
 
 #. module: account
 #: field:account.account,name:0
@@ -3499,18 +3612,18 @@ msgstr ""
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr ""
+msgstr "Izdošanas datums"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr ""
+msgstr "Standarta Kodējums"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Žurnāls analītiskajiem ierakstiem"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -3535,7 +3648,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Grāmatvedības Uzskaite"
 
 #. module: account
 #: report:account.overdue:0
@@ -3556,24 +3669,24 @@ msgstr ""
 #: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "nosaukums"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Atzīmēt kā Melnrakstu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Rindas, kas atkārtojas"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Attēlot Partnerus"
 
 #. module: account
 #: view:account.invoice:0
@@ -3596,17 +3709,17 @@ msgstr ""
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Apstiprināt Rēķinu"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Vidējais Koeficients"
 
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(Lai atvērtu jau apmaksātus rēķinus, tiem jānoņem sasaiste)"
 
 #. module: account
 #: field:account.aged.trial.balance,period_from:0
@@ -3626,7 +3739,7 @@ msgstr ""
 #: field:account.report.general.ledger,period_from:0
 #: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "Sākuma periods"
 
 #. module: account
 #: field:account.tax,name:0
@@ -3645,7 +3758,7 @@ msgstr "Iestatījumi"
 #: 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 ""
+msgstr "Mēnesis"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
@@ -3654,11 +3767,10 @@ msgid "Analytic Balance"
 msgstr "Analītiskā Bilance"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -3677,7 +3789,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Neapstiprināti Grāmatojumi"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3706,12 +3818,12 @@ msgstr "Konta Veids"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Atcelt izvēlētos Rēķinus"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3747,13 +3859,13 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Konta Tips"
 
 #. module: account
 #: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
-msgstr ""
+msgstr "Rēķinam ir definēti nodokļi/s, bet neviena rēķina rinda tos nesatur!"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -3769,7 +3881,7 @@ msgstr "Mēnesis"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Atsauces Mērv."
 
 #. module: account
 #: field:account.account,note:0
@@ -4333,7 +4445,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4474,7 +4586,6 @@ msgid "Analytic Balance -"
 msgstr "Analītiskā Bilance -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4487,10 +4598,8 @@ msgstr "Analītiskā Bilance -"
 #: 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.journal.period.print: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
@@ -4500,6 +4609,16 @@ msgstr "Analītiskā Bilance -"
 #: 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
 msgid "Target Moves"
 msgstr "Mērķa Grāmatojumi"
 
@@ -4616,6 +4735,8 @@ msgstr "Saistīšanas rezultāts"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5326,6 +5447,19 @@ msgstr ""
 
 #. 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 ""
@@ -6234,6 +6368,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6463,7 +6598,7 @@ msgstr "Analītiskās Rindas"
 #: 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 "
+"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) "
@@ -6794,7 +6929,7 @@ msgstr ""
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "Nebalansēts"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7046,6 +7181,9 @@ 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 ""
+"Mēneša diena. Norādīet -1 pēdējai tekošā mēneša dienai. Pozitīvs skaitlis "
+"dos nākamā mēneša dienu. Norādīet 0 atskaitei no tekošā brīža par visām "
+"dienām (pretējā gadījumā atskaites punkts ir mēneša sākums)."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -7133,6 +7271,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7320,7 +7459,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 "Izmaksu Grāmata"
 
 #. module: account
 #: view:account.invoice:0
@@ -7385,6 +7524,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periods"
@@ -7467,14 +7619,6 @@ msgstr "Tālr.:"
 msgid "Company Currency"
 msgstr "Uzņēmuma valūta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7586,6 +7730,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7823,6 +7973,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8104,12 +8255,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8227,7 +8383,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8246,6 +8407,15 @@ 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 ""
 
@@ -8443,7 +8613,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontu plāns"
 
 #. module: account
@@ -8460,12 +8630,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8485,7 +8660,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8666,6 +8841,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8747,6 +8923,18 @@ msgstr "Vispārīgi"
 #: selection:account.pl.report,filter: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
@@ -8956,13 +9144,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8986,7 +9171,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9156,7 +9341,7 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Pārpalikuma Grāmatojums"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -9194,6 +9379,7 @@ msgstr "Ienākošais Rēķins"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9267,6 +9453,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9636,6 +9832,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Entries Encoding"
 #~ msgstr "Rindu Ievade"
 
@@ -9672,9 +9880,6 @@ msgstr ""
 #~ msgid "Contact"
 #~ msgstr "Kontakts"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Move Lines Created."
 #~ msgstr "Grāmatojumi Veikti."
 
@@ -9718,9 +9923,6 @@ msgstr ""
 #~ msgid "1cm 27.7cm 20cm 27.7cm"
 #~ msgstr "1cm 27.7cm 20cm 27.7cm"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "account.analytic.journal"
 #~ msgstr "account.analytic.journal"
 
@@ -9793,9 +9995,6 @@ msgstr ""
 #~ msgid "Contra"
 #~ msgstr "Kontra"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Atlaide (%)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Procesa definīcijā nepareizs modeļa nosaukums."
 
@@ -9954,9 +10153,6 @@ msgstr ""
 #~ msgid "New Customer Invoice"
 #~ msgstr "Jauns Izejošais Rēķins"
 
-#~ msgid "Partner ID"
-#~ msgstr "Partnera ID"
-
 #~ msgid "Full Account Name"
 #~ msgstr "Pilns Konta Nosaukums"
 
@@ -10118,3 +10314,7 @@ msgstr ""
 
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Neapstiprināti Ienākošie Rēķini"
+
+#, python-format
+#~ msgid "The statement balance is incorrect !\n"
+#~ msgstr "Izraksta bilance ir kļūdaina!\n"
diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po
index e3390c6cd5f..3da1de603f0 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: 2011-05-08 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -486,8 +486,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1122,6 +1120,7 @@ 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
@@ -1309,6 +1308,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2012,7 +2021,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2076,6 +2085,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2097,11 +2108,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2418,6 +2434,7 @@ 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
@@ -2663,6 +2680,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2928,7 +2947,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2942,6 +2960,17 @@ msgstr ""
 #: 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 ""
 
@@ -3151,6 +3180,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3209,6 +3239,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3647,11 +3687,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4324,7 +4363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4463,7 +4502,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4476,10 +4514,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4489,6 +4525,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4605,6 +4651,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5314,6 +5362,19 @@ msgstr ""
 
 #. 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 ""
@@ -6222,6 +6283,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6451,7 +6513,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7121,6 +7183,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7373,6 +7436,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7455,14 +7531,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7574,6 +7642,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7811,6 +7885,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8092,12 +8167,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8215,7 +8295,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8234,6 +8319,15 @@ 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 ""
 
@@ -8431,7 +8525,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8448,12 +8542,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8473,7 +8572,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8654,6 +8753,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8735,6 +8835,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8944,13 +9056,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8974,7 +9083,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9182,6 +9291,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9255,6 +9365,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9623,3 +9743,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index e1d053568d2..85a478e921d 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-19 10:00+0000\n"
+"PO-Revision-Date: 2011-11-07 13:02+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: 2011-04-29 05:08+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -497,8 +497,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1135,6 +1133,7 @@ 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
@@ -1322,6 +1321,16 @@ msgstr "Та энэ журналд ерөнхий данс хэрэглэх бо
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Баланс нь тэгээс ялгаатай"
 
@@ -2040,7 +2049,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2105,6 +2114,8 @@ 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
 msgid "Entries Sorted By"
 msgstr "Гүйлгээний эрэмбэ"
 
@@ -2126,11 +2137,16 @@ msgstr "Барааны загвар"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2459,6 +2475,7 @@ 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
@@ -2711,6 +2728,8 @@ 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
 msgid "Profit And Loss"
 msgstr "Орлого зарлагын тайлан"
 
@@ -2996,7 +3015,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3010,6 +3028,17 @@ msgstr ""
 #: 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 "Журнал"
 
@@ -3223,6 +3252,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3281,6 +3311,16 @@ msgstr "НӨАТ :"
 #: 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.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 "Chart of Accounts"
 msgstr "Дансны мод"
 
@@ -3730,11 +3770,10 @@ msgid "Analytic Balance"
 msgstr "Аналитик баланс"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Цэвэр алдагдал"
 
@@ -4422,7 +4461,7 @@ msgstr "Журналын бичилт"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Баланс тайлан (Хөрөнгө)"
 
 #. module: account
@@ -4566,7 +4605,6 @@ msgid "Analytic Balance -"
 msgstr "Аналитик баланс -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4579,10 +4617,8 @@ msgstr "Аналитик баланс -"
 #: 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.journal.period.print: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
@@ -4592,6 +4628,16 @@ msgstr "Аналитик баланс -"
 #: 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
 msgid "Target Moves"
 msgstr "Хэрэглэх гүйлгээ"
 
@@ -4708,6 +4754,8 @@ msgstr "Гүйцээлтийн үр дүн"
 #: 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
 msgid "Balance Sheet"
 msgstr "Баланс тайлан"
 
@@ -5425,6 +5473,19 @@ msgstr ""
 
 #. 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 "Шүүлтгүй"
@@ -6349,6 +6410,7 @@ msgstr "Санхүүгийн татварын харгалзаа"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6590,7 +6652,7 @@ msgstr "Аналитик бичилт"
 #: 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 "
+"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) "
@@ -7275,6 +7337,7 @@ msgstr "Дүн (үсгээр) :"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7534,6 +7597,19 @@ msgstr "Санхүүг нягтлан бодох удирдлага"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Мөчлөг"
@@ -7616,14 +7692,6 @@ msgstr "Утас. :"
 msgid "Company Currency"
 msgstr "Компаны валют"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Дансны төлөвлөгөө"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7737,6 +7805,12 @@ msgstr "Буцаалтын журнал"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Шүүлтүүр"
 
@@ -7978,6 +8052,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8276,12 +8351,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Эхлэх мөчлөг"
 
@@ -8400,7 +8480,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8419,6 +8504,15 @@ 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 "Харагдах данс"
 
@@ -8616,7 +8710,7 @@ msgstr "7 сар"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Дансны мод"
 
 #. module: account
@@ -8633,12 +8727,17 @@ msgstr "Дансны аналитик баланс"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Дуусах мөчлөг"
 
@@ -8658,7 +8757,7 @@ msgstr "Дуусах мөчлөг"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Дансны төлөвлөгөө"
 
 #. module: account
@@ -8839,6 +8938,7 @@ msgstr "Ажил гүйлгээ батлах"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8923,6 +9023,18 @@ msgstr "Ерөнхий"
 #: selection:account.pl.report,filter: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
@@ -9134,13 +9246,10 @@ msgid "Tax Source"
 msgstr "Эх татвар"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Цэвэр ашиг"
 
@@ -9164,8 +9273,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9372,6 +9481,7 @@ msgstr "Нийлүүлэгчийн нэхэмжлэл"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9445,6 +9555,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Гүйлгээтэй"
 
@@ -9816,6 +9936,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Хөрөнгө"
 
@@ -10086,9 +10218,6 @@ msgstr ""
 #~ msgid "Generic Reports"
 #~ msgstr "Ерөнхий тайлангууд"
 
-#~ msgid "Partner ID"
-#~ msgstr "Харилцагчийн дугаар"
-
 #~ msgid "Skip 'Draft' State for Created Entries"
 #~ msgstr "Үүссэн гүйлгээг шууд батлах"
 
@@ -10252,9 +10381,6 @@ msgstr ""
 #~ msgid "Select Message"
 #~ msgstr "Мессеж сонгох"
 
-#~ msgid "           Start date"
-#~ msgstr "           Эхлэх огноо"
-
 #~ msgid "Taxed Amount"
 #~ msgstr "Татварын хэмжээ"
 
@@ -10297,10 +10423,6 @@ msgstr ""
 #~ msgid "analytic Invoice"
 #~ msgstr "аналитик нэхэмжлэл"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Та баланс тэнцээгүй гүйлгээг батлах боломжгүй !"
-
 #~ msgid "VAT"
 #~ msgstr "НӨАТ"
 
@@ -10500,9 +10622,6 @@ msgstr ""
 #~ msgid "Contact"
 #~ msgstr "Холбоо барих"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Can be draft or validated"
 #~ msgstr "Ноорог эсвэл шалгасан байж болно"
 
@@ -10524,13 +10643,6 @@ msgstr ""
 #~ msgid "Bank Receipt"
 #~ msgstr "Банкны баримт"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Төлбөр хийх харилцагчийн банкны данс\n"
-#~ "Үндсэн дансыг ашиглах бол хоосон орхино"
-
 #~ msgid "Select invoices you want to pay and manages advances"
 #~ msgstr "Төлөх нэхэмжлэл сонгох"
 
@@ -10558,9 +10670,6 @@ msgstr ""
 #~ msgid "Invoice line"
 #~ msgstr "Нэхэмжлэлийн мөр"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Цуцлалтын мөчлөг"
-
 #~ msgid "Overdue Payment Report Message"
 #~ msgstr "Хугацаа хэтэрсэн төлбөр тайлагнах мэдэгдэл"
 
@@ -10579,9 +10688,6 @@ msgstr ""
 #~ msgid "Date payment"
 #~ msgstr "Төлбөрийн огноо"
 
-#~ msgid "Creation Date"
-#~ msgstr "Үүсгэсэн Огноо"
-
 #~ msgid "Specify The Message for the Overdue Payment Report."
 #~ msgstr "Хугацаа хожимдсон төлбөрийн тайлангийн мэдээг тодорхойлох."
 
@@ -10594,9 +10700,6 @@ msgstr ""
 #~ msgid "Move Lines"
 #~ msgstr "Гүйлгээний шугамууд"
 
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Дансны санхүүгийн төлөвлөлт."
-
 #~ msgid "Move Lines Created."
 #~ msgstr "Гүйлгээний цуваа үүссэн."
 
@@ -10636,9 +10739,6 @@ msgstr ""
 #~ msgid "Grand total"
 #~ msgstr "нийт дүн"
 
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "санхүүгийн зурагжуулах загвар"
-
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
@@ -10651,18 +10751,6 @@ msgstr ""
 #~ msgid "Open State"
 #~ msgstr "Нээлттэй төлөв"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Татварын санхүү зурагжуулалт"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Санхүүгийн зурагжуулах загвар"
-
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Санхүүгийн зурагжуулах санамж :"
-
 #~ msgid "Cost Legder for period"
 #~ msgstr "Хугацааны өртөгийн дэвтэр"
 
@@ -10684,12 +10772,6 @@ msgstr ""
 #~ msgid "Subtotal w/o tax"
 #~ msgstr "хасагдсан татварын завсрын үр дүн"
 
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "татварын санхүү зурагжуулалтын загвар"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Санхүүгийн зурагжуулалтад зориулсан загвар"
-
 #~ msgid "Base on"
 #~ msgstr "тулгуурлах"
 
@@ -10720,16 +10802,6 @@ msgstr ""
 #~ "Бидний талаас алдаа гаргасан тул дараах төлбөр хийгдээгүйд тооцно. Зохих "
 #~ "арга хэмжээний дагуу төлбөрийг ирэх 8 хоногийн дотор дуусгана уу."
 
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "Санхүүгийн зурагжуулалт нь харилцагчид хамааралтай татвар болон дансыг "
-#~ "тодорхойлно."
-
-#~ msgid "Balance brought forward"
-#~ msgstr "балансны хугацааг сунгах"
-
 #~ msgid ""
 #~ "The account moves of the invoice have been reconciled with account moves of "
 #~ "the payment(s)."
@@ -10831,51 +10903,9 @@ msgstr ""
 #~ msgid "General Debit"
 #~ msgstr "Ерөнхий орлого"
 
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Санхүүгийн зурагжуулалт"
-
 #~ msgid "Statement Process"
 #~ msgstr "Бримтын үйл явц"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Аналитик данс хаах"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Ноорог нэхэмжлэл"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Дансны нэхэмжлэл"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Үнийн нэхэмжлэл"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Нягтлан бодохын самбар"
-
-#~ msgid "My indicators"
-#~ msgstr "Эдийн засгийн үзүүлэлт"
-
-#~ msgid "All accounts"
-#~ msgstr "Бүх данс"
-
-#~ msgid "Notification"
-#~ msgstr "Мэдэгдэл"
-
-#~ msgid "Financial Period"
-#~ msgstr "Санхүүгийн мөчлөг"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Мөчлөг сонгох"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Харицуулахгүй"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Дансыг харуулах"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Санхүүгийн тайлан-Тайлан"
-
 #~ msgid "Draft Customer Invoices"
 #~ msgstr "Үйлчлүүлэгчийн ноорог нэхэмжлэл"
 
@@ -10948,9 +10978,6 @@ msgstr ""
 #~ msgid "Cash Receipt"
 #~ msgstr "Кассын баримт"
 
-#~ msgid "All account entries"
-#~ msgstr "Бүх дансны бичилт"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Үйлчлүүлэгчийн төлөгдөөгүй буцаалтууд"
 
@@ -10963,12 +10990,6 @@ msgstr ""
 #~ msgid "Current Date"
 #~ msgstr "Одоогийн огноо"
 
-#~ msgid "Aged income"
-#~ msgstr "Насжилтын орлого"
-
-#~ msgid "Customize Report"
-#~ msgstr "Хувийн тайлан"
-
 #~ msgid "x Expenses Credit Notes Journal"
 #~ msgstr "Зардлыг кредитийн журналд тэмдэглэх"
 
@@ -11005,24 +11026,15 @@ msgstr ""
 #~ msgid "Reconcile Entries."
 #~ msgstr "Бичилт тулгах"
 
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Дансны тэнцлийг жилээр нь харьцуулах"
-
 #~ msgid "PRO-FORMA Customer Invoices"
 #~ msgstr "Үйлчлүүлэгчийн нэхэмжлэл PRO-FORMA"
 
 #~ msgid "Print VAT Decl."
 #~ msgstr "НӨАТ хэвлэх"
 
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Тайланг хөндлөнгөөр харуулах"
-
 #~ msgid "Receivable and Payable"
 #~ msgstr "Авлага болон өглөг"
 
-#~ msgid "Aged receivables"
-#~ msgstr "Авлагын насжилт"
-
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Дансны өртөг, орлого журналаар"
 
@@ -11075,27 +11087,6 @@ msgstr ""
 #~ msgid "Encode manually statement comes into the draft statement"
 #~ msgstr "Гараар оруулсан гүйлгээнүүд ноорог хэлбэрээр үүснэ"
 
-#~ msgid "supplier"
-#~ msgstr "нийлүүлэгч"
-
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "Ажил гүйлгээ нь хэд хэдэн журналын бичилт агуулах бөгөөд бичилт бүр нь дебит "
-#~ "эсвэл кредит талд нэг л утгатай байна. OpenERP санхүүгийн баримт (нэхэмжлэл, "
-#~ "буцаалт, нийлүүлэгчийн төлбөр, харилцах, кассын ордер гэх мэт) бүр дээр "
-#~ "үндэслэн автоматаар нэг ажил гүйлгээ үүсгэдэг."
-
-#~ 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."
-#~ msgstr ""
-#~ "Тухайн журналын тухайн мөчлөгөд бичигдсэн бүх ноорог бичилтүүдийг батална. "
-#~ "Ингэснээр тухайн бичилтүүдийг засварлах боломжгүй болно."
-
 #~ msgid "logo"
 #~ msgstr "лого"
 
@@ -11127,31 +11118,16 @@ msgstr ""
 #~ msgid "Import Invoice"
 #~ msgstr "Нэхэмжлэл импорт"
 
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Үйлчлүүлэгчийн нэхэмжлэл нь таны үйлчлүүлэгчид илгээсэн нэхэмжлэлийн нэгдсэн "
-#~ "бүртгэл юм. OpenERP ноорог нэхэмжлэлийг автоматаар үүсгэж харин та "
-#~ "үйлчлүүлэгчиддээ илгээхээс өмнө зөвхөн батлах шаардлагатай."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
 
-#~ msgid "Validate Journal Entries of a Journal"
-#~ msgstr "Журналын бичилт батлах"
-
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Санхүүгийн жилтэй тохирохгүй огноо байна"
 
-#~ msgid "Validate Journal Entries"
-#~ msgstr "Журналын бичилт батлах"
-
 #, python-format
 #~ msgid "No Data Available"
 #~ msgstr "Тохирох өгөгдөл алга"
@@ -11159,237 +11135,66 @@ msgstr ""
 #~ msgid "</drawString>"
 #~ msgstr "</drawString>"
 
-#~ msgid ""
-#~ " After closing a period, you will no longer be able to post entries to the "
-#~ "period once it has been closed."
-#~ msgstr ""
-#~ " Мөчлөгийг хаасны дараа та тухайн мөчлөгт гүйлгээ батлах ямар ч боломжгүй "
-#~ "болно."
-
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr "Энэ бараанд орлогын данс тодорхойлогдоогүй байна : \"%s\" (id:%d)"
-
-#~ msgid "Purchase Tax"
-#~ msgstr "Худалдан авалтын татвар"
-
-#~ msgid ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-#~ msgstr ""
-#~ "Кассын ордер нь танд бэлэн мөнгөний журналд гүйлгээ удирдах боломж олгоно."
-
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr ""
 #~ "Бодит үлдэгдэл (%.2f) нь тооцоолсон үлдэгдлээс ялгаатай байна. (%.2f)"
 
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Нийлүүлэгчийн нэхэмжлэл нь таны нийлүүлэгчээс ирсэн нэхэмжлэлийн нэгдсэн "
-#~ "бүртгэл юм. OpenERP ноорог нэхэмжлэлийг автоматаар үүсгэх ба нийлүүлэгч "
-#~ "нэхэмжлэлээ ирүүлсэн үед та түүнийг зөвхөн батлах шаардлагатай."
-
 #~ msgid "1cm 27.7cm 20cm 27.7cm"
 #~ msgstr "1cm 27.7cm 20cm 27.7cm"
 
-#~ msgid ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-#~ msgstr ""
-#~ "Үйлчлүүлэгчийн буцаалт нь танд үйлчлүүлэгчийн зүгээс гаргасан кредит "
-#~ "залруулгыг бүртгэхэд тусална. Буцаалтын нэхэмжлэл нь буцаалт хийсэн баримт "
-#~ "нотолгоо болно. Та нэхэмжлэлийн дэлгэц ашиглан хялбархнаар буцаалтын "
-#~ "бичилтэд гүйцээлт хийх боломжтой."
-
 #~ msgid "<fill color=\"darkblue\"/>"
 #~ msgstr "<fill color=\"darkblue\"/>"
 
-#~ msgid "Sale Tax"
-#~ msgstr "Борлуулалтын татвар"
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Нэхэмжлэл "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Баланс тайлан (Хөрөнгө)"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
-#~ msgid "Purchase Accounts"
-#~ msgstr "Худалдан авалтын данс"
-
-#~ msgid "Please select periods."
-#~ msgstr "Мөчлөгөө сонгоно уу."
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Үлдэгдэл тохирохгүй байна !\n"
 
-#~ msgid ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-#~ msgstr ""
-#~ "Харилцахын орлого зарлагын ордер бол хадгаламж, банк, кредит карт болон "
-#~ "бусад бүх төрлийн санхүүгийн мөнгөн гүйлгээг хураангуйлсан бүртгэл юм. "
-#~ "Эхлээд нээлтийн болон хаалтийн үлдэгдлээ оруулаад бүх гүйлгээнүүдээ шивж "
-#~ "оруулна."
-
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "батлагдсан."
 
-#~ msgid "Treasory Analysis"
-#~ msgstr "Сан хөмрөгийн анализ"
-
-#~ msgid "Default UoM"
-#~ msgstr "Үндсэн хэмжих нэгж"
-
-#~ msgid ""
-#~ "This wizard will definitelly close a fiscal year and its related periods. "
-#~ "That means that no one will be able to create or modify journal entries in "
-#~ "it."
-#~ msgstr ""
-#~ "Энэ визард нь санхүүгийн жил болон холбогдох мөчлөгүүдийг хаана. Ингэснээр "
-#~ "журналын бичилт үүсгэх, засварлах боломжгүй болно."
-
-#~ msgid "Select FiscalYear(s)"
-#~ msgstr "Санхүүгийн жил сонгох"
-
-#~ msgid "Extended options..."
-#~ msgstr "Өргөтгөсөн хайлт..."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын өгөгдлийн урт нэгээс бага байж болохгүй !"
-
 #~ msgid "Tax Report"
 #~ msgstr "Татварын тайлан"
 
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "Энэ данс нь тухайн бүтээгдэхүүнтэй холбоотой борлуулалтын нэхэмжлэл дээр "
-#~ "хэрэглэгдэнэ"
-
-#~ msgid ""
-#~ "All selected journal entries will be validated and posted. It means you "
-#~ "won't be able to modify their accounting fields."
-#~ msgstr ""
-#~ "Сонгогдсон журналын бүх гүйлгээнүүд хянагдаж батлагдана. Ингэснээр та "
-#~ "тэдгээр гүйлгээг засварлах боломжгүй болно."
-
 #~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
 #~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
 
 #~ msgid "</drawRightString>"
 #~ msgstr "</drawRightString>"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Дансны төлөвлөгөө"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулын нэр давхардах ёсгүй !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурс меню үүсгэхгүй"
-
-#~ 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' to be used at the time of stock input/output. Select "
-#~ "'Situation' to be used at the time of making vouchers."
-#~ msgstr ""
-#~ "'Борлуулалт' төрлийг сонговол нэхэмжлэл үүсгэхэд хэрэглэгдэнэ. 'Худалдан "
-#~ "авалт' төрлийг сонговол худалдан авалтын захиалга үүсгэхэд хэрэглэгдэнэ. "
-#~ "'Бэлэн мөнгө' төрлийг сонговол төлбөр үүсгэхэд хэрэглэгдэнэ. 'Ерөнхий' төрөл "
-#~ "нь бараа материалын орлого/зарлагад хэрэглэгдэнэ. 'Байрлал' төрөл нь ваучерт "
-#~ "хэрэглэгдэнэ."
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
 
 #, python-format
 #~ msgid "Can not pay draft/proforma/cancel invoice."
 #~ msgstr "Ноорог/проформа/цуцлагдсан нэхэмжлэлийг төлөх боломжгүй."
 
-#~ msgid ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
-#~ msgstr ""
-#~ "Шалгарсан арга бол санхүүгийн жил нээхэд зориулж тусгайлан журнал үүсгэх ба "
-#~ "түүнийгээ зөвхөн энэ тохиолдолд хэрэглэнэ. Уг журнал нь үндсэн дебит, кредит "
-#~ "данс тодорхойлсон, хуулбар гүйлгээ оруулж болох тохиргоотой байх ёстой."
-
-#~ msgid "Import Entries"
-#~ msgstr "Гүйлгээ импорт"
-
 #~ msgid "Validate Account Entries"
 #~ msgstr "Журналын бичилт батлах"
 
-#~ msgid "Please Enter Periods ! "
-#~ msgstr "Мөчлөг оруулна уу ! "
-
 #~ msgid "Import from your bank statements"
 #~ msgstr "Таны харилцахын ордероос импортлох"
 
 #~ msgid "Liability"
 #~ msgstr "Эх үүсвэр"
 
-#~ msgid "Entry No"
-#~ msgstr "Гүйлгээний №"
-
-#~ msgid "Periods :"
-#~ msgstr "Мөчлөг :"
-
-#~ msgid "Central Journals"
-#~ msgstr "Төв журнал"
-
 #~ msgid "Partner Other Ledger"
 #~ msgstr "Харилцагчийн дэвтэр"
 
-#~ msgid "Low Level"
-#~ msgstr "Доод төвшин"
-
-#~ msgid ""
-#~ "A tool search lets you know statistics on your different financial accounts "
-#~ "that match your needs."
-#~ msgstr ""
-#~ "Уг хайлтын багаж нь танд санхүү бүртгэлийн дансуудыг хооронд нь харьцуулж "
-#~ "шинжилгээ хийх боломж олгоно."
-
-#~ msgid ""
-#~ "A tool search lets you know statistics on invoices that match your needs."
-#~ msgstr ""
-#~ "Уг хайлтын багаж нь танд нэхэмжлэлүүдийг харьцуулж дүн шинжилгээ хийх боломж "
-#~ "олно."
-
-#~ msgid ""
-#~ "A tool search lets you know statistics on your analytics records that match "
-#~ "your needs."
-#~ msgstr ""
-#~ "Уг хайлтын багаж нь танд аналитик бичилтүүдийг харьцуулж шинжилгээ хийх "
-#~ "боломж олгоно."
-
-#~ msgid ""
-#~ "To get detailed information about a partner you can ask for the Partner "
-#~ "Ledgers."
-#~ msgstr ""
-#~ "Харилцагчийн дэвтэрээс тухайн харилцагчийн дэлгэрэнгүй мэдээллийг авч болно."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Группын нэр давхардах ёсгүй !"
-
 #~ msgid "Reconcile Paid"
 #~ msgstr "Төлж гүйцээх"
-
-#~ msgid "Sort By:"
-#~ msgstr "Эрэмбэлэх"
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index ebecac0e914..99441de1406 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.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:14+0000\n"
-"PO-Revision-Date: 2011-03-30 13:55+0000\n"
-"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:43+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: 2011-04-29 05:08+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -509,8 +509,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1152,6 +1150,7 @@ msgstr "Ant. transaksjon"
 
 #. 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
@@ -1340,6 +1339,16 @@ msgstr "Du kan ikke benytte angitt konto i aktuell journal!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Hvor saldo ikke er lik 0"
 
@@ -2043,7 +2052,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Søk kontoplanmal"
 
 #. module: account
@@ -2107,6 +2116,8 @@ msgstr "Instillinger for regnskap"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Posteringer sortert på"
 
@@ -2128,11 +2139,16 @@ msgstr "Produktmal"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2453,6 +2469,7 @@ msgstr "Rab.(%)"
 
 #. 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
@@ -2698,6 +2715,8 @@ msgstr "Finansregnskap"
 #. 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
 msgid "Profit And Loss"
 msgstr "Vinning og tap"
 
@@ -2968,7 +2987,6 @@ msgstr "Behold ledig for å bruke utgiftskonto"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2982,6 +3000,17 @@ msgstr "Behold ledig for å bruke utgiftskonto"
 #: 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 "Journaler"
 
@@ -3193,6 +3222,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Motpart"
 
@@ -3251,6 +3281,16 @@ msgstr "MVA:"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontoplan"
 
@@ -3691,11 +3731,10 @@ msgid "Analytic Balance"
 msgstr "Analytisk saldo"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Netto tap"
 
@@ -4373,7 +4412,7 @@ msgstr "Journalregistreringer"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Balanse (Aktivakonti)"
 
 #. module: account
@@ -4512,7 +4551,6 @@ msgid "Analytic Balance -"
 msgstr "Analytisk saldo -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4525,10 +4563,8 @@ msgstr "Analytisk saldo -"
 #: 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.journal.period.print: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
@@ -4538,6 +4574,16 @@ msgstr "Analytisk saldo -"
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4654,6 +4700,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr "Balanse"
 
@@ -4885,7 +4933,7 @@ msgstr "Analytisk bokføring"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Kunderefusjon"
+msgstr "Kreditnota"
 
 #. module: account
 #: view:account.account:0
@@ -5369,6 +5417,19 @@ msgstr ""
 
 #. 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 "Ingen filter"
@@ -5428,7 +5489,7 @@ msgstr "  365 dager  "
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Kunderefusjon"
+msgstr "Kreditnota"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5884,7 +5945,7 @@ msgstr "Legg inn en startdato !"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "Leverandørrefusjon"
+msgstr "Kreditnota"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
@@ -6282,6 +6343,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6511,7 +6573,7 @@ msgstr "Analytiske linjer"
 #: 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 "
+"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) "
@@ -6753,7 +6815,7 @@ msgstr "Kommentar"
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr "Område"
+msgstr "Domene"
 
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
@@ -7189,6 +7251,7 @@ msgstr "Beløp (som tekst):"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7441,6 +7504,19 @@ msgstr "Regnskap og finans"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periode"
@@ -7523,14 +7599,6 @@ msgstr "Tlf. :"
 msgid "Company Currency"
 msgstr "Firmavaluta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Kontoplan"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7642,6 +7710,12 @@ msgstr "Refusjonsjournal"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Filtrer etter"
 
@@ -7881,6 +7955,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8162,12 +8237,17 @@ msgstr "Økonomistyring"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Periodestart"
 
@@ -8287,7 +8367,12 @@ msgstr "Beholdes blankt til bruk for inntektskonto"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8306,6 +8391,15 @@ 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 "Vis kontoer"
 
@@ -8503,7 +8597,7 @@ msgstr "Juli"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontoplan"
 
 #. module: account
@@ -8520,12 +8614,17 @@ msgstr "Analytisk saldo"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Periodeslutt"
 
@@ -8545,7 +8644,7 @@ msgstr "Periodeslutt"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Kontoplan"
 
 #. module: account
@@ -8726,6 +8825,7 @@ msgstr "Bekreft kontobevegelser"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8807,6 +8907,18 @@ msgstr "Generell"
 #: selection:account.pl.report,filter: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
@@ -9016,13 +9128,10 @@ msgid "Tax Source"
 msgstr "Avgiftsgrunnlag"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Netto resultat"
 
@@ -9046,8 +9155,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9254,6 +9363,7 @@ msgstr "Leverandørfaktura"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9327,6 +9437,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Med bevegelser"
 
@@ -9496,7 +9616,7 @@ msgstr "Søk faktura"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Refusjon"
+msgstr "Kreditnota"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -9696,6 +9816,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Eiendel"
 
@@ -9711,6 +9843,15 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Faktura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balanse (Aktivakonti)"
+
+#~ msgid "Chart of Accounts"
+#~ msgstr "Kontoplan"
+
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Ubetalte leverandørfakturaer"
 
@@ -9727,9 +9868,6 @@ msgstr ""
 #~ "Denne konto vil bli benyttet for å fastsette inngående lagerverdi for "
 #~ "aktuell produktkategori"
 
-#~ msgid "           Start date"
-#~ msgstr "           Startdato"
-
 #~ msgid "Taxed Amount"
 #~ msgstr "Avgi.ber. beløp"
 
@@ -10274,9 +10412,6 @@ msgstr ""
 #~ msgid "PRO-FORMA Customer Invoices"
 #~ msgstr "PRO-FORMA kundefakturaer"
 
-#~ msgid "The bank account to pay to or to be paid from"
-#~ msgstr "Bankkonto for betaling eller innbetaling"
-
 #~ msgid "Analytic Journal Definition"
 #~ msgstr "Analytisk journaldefinisjon"
 
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 07805d20446..3de4d94b10e 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 22:08+0000\n"
-"Last-Translator: debaetsr <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: code:addons/account/account.py:1167
@@ -525,8 +525,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1180,6 +1178,7 @@ msgstr "# van de transactie"
 
 #. 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
@@ -1368,6 +1367,16 @@ msgstr "Deze grootboekkaart kan niet worden gebruikt in dit dagboek"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Met saldo ongelijk aan 0"
 
@@ -2117,7 +2126,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Rekeningschema sjablonen zoeken"
 
 #. module: account
@@ -2185,6 +2194,8 @@ msgstr "Administratieve instellingen"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Boekingen gesorteerd op"
 
@@ -2206,11 +2217,16 @@ msgstr "Product sjabloon"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2547,6 +2563,7 @@ msgstr "Korting. (%)"
 
 #. 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
@@ -2809,6 +2826,8 @@ msgstr "Financiële administratie"
 #. 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
 msgid "Profit And Loss"
 msgstr "Winst en verlies"
 
@@ -2877,7 +2896,7 @@ msgstr "De verantwoordelijke gebruiker voor dit dagboek"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Periode zoeken"
 
 #. module: account
 #: view:account.change.currency:0
@@ -3095,7 +3114,6 @@ msgstr "Laat leeg om de uitgaven grootboekkaart te gebruiken"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3109,6 +3127,17 @@ msgstr "Laat leeg om de uitgaven grootboekkaart te gebruiken"
 #: 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 "Dagboeken"
 
@@ -3328,6 +3357,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Tegenboeking"
 
@@ -3386,6 +3416,16 @@ msgstr "BTW"
 #: 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.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 "Chart of Accounts"
 msgstr "Grootboekschema"
 
@@ -3628,7 +3668,7 @@ msgstr "Kon belasting niet wijzigen!"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "Mutaties"
 
 #. module: account
 #: code:addons/account/invoice.py:1422
@@ -3778,11 +3818,14 @@ 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 ""
+"Deze rapportage geeft een overzicht van de uitstaande bedragen gefactureerd "
+"aan uw klanten, en van de overschrijdingen van de betalingstermijnen. De "
+"zoekopties geven de mogelijkheid om de analyses aan te passen."
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Facturen bevestigen"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3840,11 +3883,10 @@ msgid "Analytic Balance"
 msgstr "Analytische balans"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Nettoverlies"
 
@@ -3854,6 +3896,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Als het veld \"actief\" uitstaat, kunt u de grootboekrekening verbergen "
+"zonder deze te verwijderen."
 
 #. module: account
 #: view:account.tax.template:0
@@ -3957,7 +4001,7 @@ msgstr "Maand"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referentie meeteenheid"
 
 #. module: account
 #: field:account.account,note:0
@@ -4127,18 +4171,18 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Factuur statistieken"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Bankafschriften zijn in het systeem geladen"
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Afschrijving afletteren"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -4198,7 +4242,7 @@ msgstr ""
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Afletteren transactief ongedaan maken"
 
 #. module: account
 #: view:account.use.model:0
@@ -4533,7 +4577,7 @@ msgstr "Dagboekregels"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Balans (Actiefrekeningen)"
 
 #. module: account
@@ -4664,7 +4708,7 @@ msgstr "Onderliggende belastingrekeningen"
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Beginperiode moet voor de eindperiode liggen"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4677,7 +4721,6 @@ msgid "Analytic Balance -"
 msgstr "Analytisch Saldo -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4690,10 +4733,8 @@ msgstr "Analytisch Saldo -"
 #: 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.journal.period.print: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
@@ -4703,6 +4744,16 @@ msgstr "Analytisch Saldo -"
 #: 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
 msgid "Target Moves"
 msgstr "Doelrekening"
 
@@ -4813,6 +4864,8 @@ msgstr "Afletterresultaat"
 #: 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
 msgid "Balance Sheet"
 msgstr "Balans"
 
@@ -4832,7 +4885,7 @@ msgstr "Boekingen"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Deze periode"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -5529,6 +5582,19 @@ msgstr ""
 
 #. 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 "Geen filter"
@@ -6444,6 +6510,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6586,7 +6653,7 @@ msgstr ""
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Bron document"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -6678,7 +6745,7 @@ msgstr "Analytische regels"
 #: 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 "
+"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) "
@@ -6884,7 +6951,7 @@ msgstr "Maak boekingen aan"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "Overzichten"
+msgstr "Rapportages"
 
 #. module: account
 #: sql_constraint:account.journal:0
@@ -7363,6 +7430,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7445,7 +7513,7 @@ msgstr "Deferral Method"
 #: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "Factuur '%s' is betaald."
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -7617,6 +7685,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periode"
@@ -7701,14 +7782,6 @@ msgstr "Tel.:"
 msgid "Company Currency"
 msgstr "Bedrijfsvaluta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7820,6 +7893,12 @@ msgstr "Creditnota dagboek"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7896,7 +7975,7 @@ msgstr "Vervaldatum"
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Leveranciers"
 
 #. module: account
 #: constraint:account.move:0
@@ -8061,6 +8140,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8344,12 +8424,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8469,7 +8554,12 @@ msgstr "Laat leeg om de inkomsten rekening te gebruiken"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8488,6 +8578,15 @@ 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 ""
 
@@ -8689,7 +8788,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Grootboekschema"
 
 #. module: account
@@ -8706,12 +8805,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8731,7 +8835,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8843,7 +8947,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Crediteurenbeheer"
 
 #. module: account
 #: field:account.period,name:0
@@ -8916,6 +9020,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8997,6 +9102,18 @@ msgstr "Algemeen"
 #: selection:account.pl.report,filter: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
@@ -9203,16 +9320,13 @@ msgstr "Dag van de maand"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "Bron belastingen"
+msgstr "BTW code"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9236,8 +9350,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9444,6 +9558,7 @@ msgstr "Inkoopfactuur"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9521,6 +9636,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Met mutaties"
 
@@ -9891,8 +10016,17 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Laat dit veld leeg wanneer je de huidige datum wilt gebruiken."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #, python-format
 #~ msgid ""
@@ -9902,9 +10036,6 @@ msgstr ""
 #~ "Geen periode ingesteld voor deze datum !\n"
 #~ "Maak een boekjaar aan."
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Fout! U kunt geen reeds gemaakte rekening aanmaken."
-
 #, python-format
 #~ msgid ""
 #~ "You can specify year, month and date in the name of the model using the "
@@ -9925,16 +10056,6 @@ msgstr ""
 #~ "\n"
 #~ "Bijv. Mijn model op %(date)s"
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Indien u betalingstermijnen hanteert zal de vervaldatum automatisch worden "
-#~ "berekend bij het aanmaken van de boekhoudmutaties. Wanneer u de "
-#~ "betaaltermijn en de vervaldatum leeg laat zal deze als directe betaling "
-#~ "worden geboekt"
-
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Onbetaalde inkoopfacturen"
 
@@ -10008,17 +10129,6 @@ msgstr ""
 #~ msgid "Payment Reconcilation"
 #~ msgstr "Aflettering betalingen"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Korting (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Als de betaling is uitgevoerd terwijl u dit bericht al verzonden is, "
-#~ "beschouw deze dan als niet-verzonden."
-
 #~ msgid "Contra"
 #~ msgstr "Tegenover"
 
@@ -10056,9 +10166,6 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Dagboekoverzicht"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Analitische Factuur"
 
@@ -10193,9 +10300,6 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Afsluit statuscodes"
 
-#~ msgid "Crédit"
-#~ msgstr "Credit"
-
 #~ msgid "Income"
 #~ msgstr "Inkomen"
 
@@ -10320,10 +10424,6 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Concept-inkoopfacturen"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Instellings-fout"
-
 #~ 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 "
@@ -10333,9 +10433,6 @@ msgstr ""
 #~ "volgende facturen nog niet zijn betaald. Wij verzoeken u maatregelen te "
 #~ "nemen om deze betalingen binnen de komende 8 dagen uit te voeren."
 
-#~ msgid "Débit"
-#~ msgstr "Debet"
-
 #~ msgid "x Checks Journal"
 #~ msgstr "x Controleert Journal"
 
@@ -10410,9 +10507,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Ga naar"
 
-#~ msgid "Partner ID"
-#~ msgstr "Partner ID"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nieuwe verkoopfactuur"
 
@@ -10463,9 +10557,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Document"
 
-#~ msgid "Move name"
-#~ msgstr "Boekingsnaam"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Annuleer de geselecteerde facturen"
 
@@ -10476,9 +10567,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Voorgestelde factuur wordt gecontroleerd, akkoord gegeven en geprint."
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "By Date and Period"
 #~ msgstr "Op datum en periode"
 
@@ -10498,10 +10586,6 @@ msgstr ""
 #~ msgid "Financial Management"
 #~ msgstr "Financiële administratie"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Deze grootboekkaart is en gedefineerd als af te letteren!"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Extra Informatie"
 
@@ -10541,9 +10625,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Betaal en letter af"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Voortgebracht saldo"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Nieuwe credit inkoopfactuur"
 
@@ -10565,9 +10646,6 @@ msgstr ""
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Stel boekjaar in en kies een grootboek rekeningschema"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Afboekingsperiode"
-
 #~ msgid "3 Months"
 #~ msgstr "3 maanden"
 
@@ -10687,9 +10765,6 @@ msgstr ""
 #~ msgid "Unpaid Customer Invoices"
 #~ msgstr "Onbetaalde verkoopfacturen"
 
-#~ msgid "Partner name"
-#~ msgstr "Relatie"
-
 #~ msgid "Journal/Payment Mode"
 #~ msgstr "Dagboek/Betaal modus"
 
@@ -10717,6 +10792,9 @@ msgstr ""
 #~ msgid "Set starting and ending balance for control"
 #~ msgstr "Geeft het begin en eind saldo voor controle"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "General Ledger -"
 #~ msgstr "Grootboek"
 
@@ -10741,10 +10819,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Boekingen maken per journaalpost"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "U kunt een rekening met mutaties niet de-activeren"
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filteren op"
 
@@ -10867,9 +10941,6 @@ msgstr ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 #~ msgstr "Geselecteerde mutaties hebben geen boekingen in de concept status"
 
-#~ msgid "All account entries"
-#~ msgstr "Alle boekingsregels"
-
 #~ msgid "Date Filter"
 #~ msgstr "Datumfilter"
 
@@ -11018,10 +11089,6 @@ msgstr ""
 #~ "Als een standaard-belasting is ingesteld bij de relatie, dan overschrijft "
 #~ "deze alleen belastingen van rekeningen (of producten) in dezelfde groep."
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "U kunt een niet-gebalanceerde post niet valideren!"
-
 #~ 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 "
@@ -11038,10 +11105,6 @@ msgstr ""
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Importeer facturen in bankafschrift"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "Het oude boekjaar heeft geen enkele af te letteren post meer!"
-
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Datum valt niet in enig boekjaar."
@@ -11125,13 +11188,6 @@ msgstr ""
 #~ msgid "Fiscal Position Template Account Mapping"
 #~ msgstr "Vervangingstabel belastingpositie-sjabloon"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "De bankrekening van de relatie voor betaling.\n"
-#~ "Laat leeg voor de standaardwaarde."
-
 #~ msgid "Error: BVR reference is required."
 #~ msgstr "Fout: Referentie omzetbelasting is verplicht."
 
@@ -11288,163 +11344,6 @@ msgstr ""
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
-#~ msgid "My indicators"
-#~ msgstr "Mijn indicatoren"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Concept-facturen"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Te factureren kosten"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Te factureren rekeningen"
-
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Af te sluiten kostenplaatsen"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Dashboard voor accountant"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Te late debiteuren"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Keuze gebaseerd op"
-
-#~ msgid "Notification"
-#~ msgstr "Mededeling"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Toon debet-/credit informatie"
-
-#~ msgid "All accounts"
-#~ msgstr "Alle rekeningen"
-
-#~ msgid "Aged income"
-#~ msgstr "Te late inkomsten"
-
-#~ msgid "Financial Period"
-#~ msgstr "Boekingsperiode"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Kies periode(n)"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Toon vergelijking in %"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Toon overzicht in liggend formaat"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr ""
-#~ "U dient de 'Liggend' afdrukstand te kiezen. Controleer dit alstublieft."
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Account Balans is een uitbreiding van de Financieel Beheer module.\n"
-#~ "    Deze module geeft u meerder mogelijkheden om een balans af te drukken.\n"
-#~ "    1. U kunt de balans van verschillende boekjaren met elkaar vergelijken\n"
-#~ "    2. U kunt een vergelijking uitdrukken in percentages of bedragen.\n"
-#~ "    3. U kunt referentierekeningen gebruiken voor de vergelijking van "
-#~ "specifieke boekjaren.\n"
-#~ "    4. U kunt perioden kiezen op basis van effectieve datum of op basis van "
-#~ "aanmaakdatum.\n"
-#~ "    5. U krijgt een optie om het gewenste overzicht in liggend formaat af te "
-#~ "drukken.\n"
-#~ "    "
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Rekening saldi-Vergelijk boekjaren"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Kies referentie rekening (voor % vergelijking)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Kies boekjaren (max. 3 jaar)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Vergelijk geselecteerde jaren in termen van"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Niet vergelijken"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Toon rekeningen"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. U hebt meer dan 3 boekjaren geselecteerd"
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Boekhouding en financieel beheer-Vergelijk rekeningen"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "U  kunt maximaal 3 boekjaren selecteren. Probeer opnieuw."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. U heeft de 'Percentage' optie gebruikt met meer dan 2 boekjaren, maar u "
-#~ "hebt niet het liggend formaat gekozen."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Het kan zijn dat u één van onderstaande vergissingen hebt gemaakt. Corrigeer "
-#~ "deze alstublieft en probeer het dan opnieuw."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Leeg laten voor vergelijking met de bovenliggende"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. U heeft de 'Percentage' optie niet gekozen, maar u hebt meer dan 2 "
-#~ "boekjaren geselecteerd."
-
-#~ msgid "Creation Date"
-#~ msgstr "Aanmaakdatum"
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "U dient tenminste 1 boekjaar te selecteren. Probeer opnieuw."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Misschien heeft u de vergelijk optie gebruikt met meer dan 1 jaar met "
-#~ "credit/debet kolommen en % optie. Dit kan er toe leiden dat er buiten de "
-#~ "marges van het papier wordt afgedrukt. Probeer het opnieuw."
-
-#~ msgid "Customize Report"
-#~ msgstr "Overzicht aanpassen"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Een module die nieuwe overzichten toevoegt aan de account-module"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Financiële overzichten - Overzichten"
-
 #~ msgid "Header"
 #~ msgstr "Koptekst"
 
@@ -11501,68 +11400,12 @@ msgstr ""
 #~ msgid "COL 2"
 #~ msgstr "KOL 2"
 
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Sjabloon fiscale toewijzing"
-
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "De fiscale toewijzing bepaalt de gebruikte belastingen en "
-#~ "grootboekrekeningen voor de relatie."
-
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Fiscale toewijzing grootboekrekeningen"
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Toewijzing belastingen"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Sjablonen fiscale toewijzing"
-
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Fiscale toewijzing opmerking:"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Sjabloon voor fiscale toewijzing"
-
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Sjabloon fiscale toewijzing belasting"
-
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Fiscale toewijzingen"
-
 #~ msgid "asgfas"
 #~ msgstr "asgfas"
 
-#~ msgid "supplier"
-#~ msgstr "leverancier"
-
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Uitgaven creditnota dagboek - (test)"
-
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Klant facturen laat u facturen aan klanten maken en beheren. OpenERP "
-#~ "genereert automatisch concept facturen dus u hoeft ze alleen te bevestigen "
-#~ "voor ze naar uw klanten te sturen."
-
-#~ msgid "End of Year"
-#~ msgstr "Eind jaar"
-
-#~ msgid ""
-#~ "given a period and a journal, the sum of debit will always be equal to the "
-#~ "sum of credit, so there is no point to display it"
-#~ msgstr ""
-#~ "gegeven een periode en een dagboek is het debettotaal altijd gelijk aan het "
-#~ "credittotaal, dus het heeft geen zin om het af te beelden"
-
-#~ msgid "Ansicht"
-#~ msgstr "Weergave"
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Factuur "
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balans (Actiefrekeningen)"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index e1f6b7a07b6..96a98f19d63 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: 2011-04-29 05:13+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -24,7 +24,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Andere configuratie"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -39,6 +39,8 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+"Een rekening als eigenschap gekoppeld aan een partner kan niet worden "
+"verwijderd of gedeactiveerd."
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -149,7 +151,7 @@ msgstr "Oorsprong"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr ""
+msgstr "Afpunten"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -164,7 +166,7 @@ msgstr "Referentie"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Boekjaar kiezen "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -177,7 +179,7 @@ msgstr ""
 #: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Waarschuwing!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -232,6 +234,8 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
 msgstr ""
+"Geen periode gedefinieerd voor deze datum: %s !\n"
+"Gelieve een boekjaar te maken."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -259,6 +263,7 @@ msgstr ""
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
+"Factuur '%s' is gedeeltelijk betaald: %s%s of %s%s (%s%s blijft open)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -268,7 +273,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr ""
+msgstr "Belgische rapporten"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1176
@@ -286,12 +291,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Manuele recurrente boeking"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "Boekjaar afsluiten"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -313,6 +318,7 @@ msgstr "St."
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
+"De firma van de factuurlijn is niet dezelfde als de firma van de factuur."
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -360,7 +366,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -389,12 +395,12 @@ msgstr "Aanmaakdatum"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Aankoopcreditnota"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Openings-/Afsluitjournaal"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -484,8 +490,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -528,7 +532,7 @@ msgstr ""
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Boekhoudplan kiezen"
 
 #. module: account
 #: view:product.product:0
@@ -593,7 +597,7 @@ msgstr ""
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "3-maandelijks"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -607,7 +611,7 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 dagen   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -622,7 +626,7 @@ msgstr ""
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "Centralisatiedagboek"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -639,7 +643,7 @@ msgstr "Btw-bedrag"
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
-msgstr ""
+msgstr "VK"
 
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
@@ -673,6 +677,8 @@ msgstr ""
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
+"Om de boekingen te kunnen afpunten, moeten alle boekingen tot hetzelfde "
+"bedrijf behoren."
 
 #. module: account
 #: view:account.account:0
@@ -684,12 +690,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Klanten"
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Grootboek"
 
 #. module: account
 #: view:account.invoice:0
@@ -720,7 +726,7 @@ msgstr "Procent"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr ""
+msgstr "Boekhoudplannen"
 
 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
@@ -733,7 +739,7 @@ msgstr ""
 #: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "U kunt alleen de munt van voorlopige facturen wijzigen"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -765,7 +771,7 @@ msgstr "Relatiereferentie van factuur"
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Afpunten ongedaan maken"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
@@ -775,12 +781,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Automatisch afpunten"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr ""
+msgstr "Berekening vervaldatum"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -828,7 +834,7 @@ msgstr "Berekening"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "Volgende af te punten relatie"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1191
@@ -837,6 +843,8 @@ msgid ""
 "You can not do this modification on a confirmed entry ! Please note that you "
 "can just change some non important fields !"
 msgstr ""
+"Bevestigde boekingen kunnen niet worden aangepast! Er kunnen slechts enkele "
+"onbelangrijke velden worden gewijzigd."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -849,7 +857,7 @@ msgstr ""
 #: 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 ""
+msgstr "Btw-plan"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -865,7 +873,7 @@ msgstr "Vervallen"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Totaal incl. btw"
 
 #. module: account
 #: view:account.invoice:0
@@ -873,14 +881,14 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "Goedkeuren"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totaalbedrag"
 
 #. module: account
 #: selection:account.account,type:0
@@ -895,7 +903,7 @@ msgstr "Consolidatie"
 #: view:account.invoice.report:0
 #: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
@@ -905,7 +913,7 @@ msgstr ""
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Verkoopcreditnota"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -928,7 +936,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Aankopen"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -950,7 +958,7 @@ msgstr "Modelboekingen"
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 #. module: account
 #: code:addons/account/account.py:2083
@@ -961,7 +969,7 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Geen analytisch dagboek"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -970,7 +978,7 @@ msgstr ""
 #: 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 ""
+msgstr "Relatiebalans"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -981,7 +989,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 "Reserve- en winst-en-verliesrekening"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -998,12 +1006,12 @@ msgstr "Maak factuur volgens analytische rekeningen"
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "Goed te keuren verkoopfacturen"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Kies het af te sluiten boekjaar"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1012,6 +1020,8 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
+"Deze types zijn gedefinieerd op basis van uw land. Het type bevat extra "
+"informatie over de rekening en de bijbehorende kenmerken."
 
 #. module: account
 #: view:account.tax:0
@@ -1050,17 +1060,17 @@ msgstr ""
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "Boekingen genereren voor:"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Bank"
-msgstr ""
+msgstr "Bank"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr ""
+msgstr "Begin van de periode"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1090,12 +1100,12 @@ msgstr ""
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Facturen annuleren"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Niet-afgepunte transacties"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1118,10 +1128,11 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "# van de transactie"
 
 #. 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
@@ -1176,7 +1187,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Opgenomen in basisbedrag"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1188,7 +1199,7 @@ msgstr ""
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "Niveau"
 
 #. module: account
 #: report:account.invoice:0
@@ -1203,13 +1214,13 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Btw"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Begin- en eindperiode kiezen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1224,14 +1235,14 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Uw referentie"
 
 #. 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 "Boekingen afpunten"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
@@ -1243,7 +1254,7 @@ msgstr "Achterstallige betalingen"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Beginbalans"
 
 #. module: account
 #: view:account.invoice:0
@@ -1253,7 +1264,7 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr ""
+msgstr "Bankinformatie"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -1284,12 +1295,12 @@ msgstr "Rekeninguittreksel"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account owner"
-msgstr ""
+msgstr "Eigenaar bankrekening"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr ""
+msgstr "Leveranciers"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
@@ -1309,8 +1320,18 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "Met saldo verschillend van 0"
 
 #. module: account
 #: view:account.tax:0
@@ -1325,7 +1346,7 @@ msgstr ""
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr ""
+msgstr "Boekingen maken"
 
 #. module: account
 #: field:account.entries.report,nbr:0
@@ -1356,7 +1377,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Totaal exclusief btw"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1370,24 +1391,26 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "Aantal boekingen "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Een tijdelijke tabel gebruikt voor de dashboardweergave"
 
 #. 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 "Aankoopcreditnota's"
 
 #. 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 ""
+"Voorbeeld: twee procent netto binnen 14 dagen, restbedrag binnen 30 dagen "
+"einde maand."
 
 #. module: account
 #: code:addons/account/invoice.py:815
@@ -1422,7 +1445,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "Sjabloon voor fiscale positie"
 
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
@@ -1432,12 +1455,12 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Afgepunte transacties"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "Kolommen"
 
 #. module: account
 #: report:account.overdue:0
@@ -1463,7 +1486,7 @@ msgstr "Onbelast"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Ga naar volgende relatie"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1475,6 +1498,8 @@ msgstr ""
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Verkeerde debet- of creditwaarde in model (debet en credit moeten samen "
+"groter zijn dan 0)."
 
 #. module: account
 #: view:account.chart.template:0
@@ -1508,14 +1533,14 @@ msgstr ""
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Datum/code"
 
 #. 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 ""
+msgstr "Grootboekrekening"
 
 #. module: account
 #: field:res.partner,debit_limit:0
@@ -1530,7 +1555,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factuur"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
@@ -1546,7 +1571,7 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr ""
+msgstr "Afzonderlijke journaalnummering"
 
 #. module: account
 #: field:account.bank.statement,user_id:0
@@ -1562,7 +1587,7 @@ msgstr "Subtotaal:"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Verkopen per rekeningtype"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1570,6 +1595,8 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Annuleer factuur: maakt een creditnota, valideert en punt af om de huidige "
+"factuur te annuleren."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1585,7 +1612,7 @@ msgstr ""
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include initial balances"
-msgstr ""
+msgstr "Beginbalans opnemen"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1600,7 +1627,7 @@ msgstr ""
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Deze assistent wijzigt de munt van de factuur"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1609,17 +1636,20 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Bekijk het boekhoudplan van uw bedrijf per boekjaar en filter per periode. "
+"Klik op een rekening om een volledig beeld van alle journaalposten voor deze "
+"rekening te krijgen."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Fout! U kunt geen overlappende boekjaren definiëren."
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Deze rekening is niet ingesteld voor afpunten."
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -1646,7 +1676,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Te ontvangen & te betalen"
 
 #. module: account
 #: code:addons/account/account_move_line.py:815
@@ -1662,7 +1692,7 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Alle relaties"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1677,12 +1707,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Mijn boekingen"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Klantenref."
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:328
@@ -1693,7 +1723,7 @@ msgstr ""
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Deze perioden mogen overlappen."
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
@@ -1703,7 +1733,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Btw-aangifte: creditnota's"
 
 #. module: account
 #: code:addons/account/account.py:499
@@ -1714,7 +1744,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Creditbedrag"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1754,7 +1784,7 @@ msgstr ""
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Boekjaar configureren"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
@@ -1775,12 +1805,12 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Btw-aangifte: facturen"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Subtotaal"
 
 #. module: account
 #: view:account.account:0
@@ -1795,7 +1825,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:332
@@ -1807,7 +1837,7 @@ msgstr ""
 #: selection:account.entries.report,move_line_state:0
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Geldig"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -1818,12 +1848,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Productcategorie"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
@@ -1861,6 +1891,7 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Voegt een kolom toe met de munt, indien deze verschilt van de firmamunt."
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1872,7 +1903,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr ""
+msgstr "Winst-en-verliesrekening"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1890,7 +1921,7 @@ msgstr ""
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Bedrag excl. btw"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1922,7 +1953,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "Boekjaar"
 
 #. module: account
 #: view:account.journal.select:0
@@ -1933,7 +1964,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Af te punten rekeningen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -1952,7 +1983,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: account
 #: view:account.journal:0
@@ -1975,6 +2006,8 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Ongeldige periode. Sommige perioden overlappen of de datum van de periode "
+"valt niet binnen het boekjaar. "
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -1997,6 +2030,8 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Er is geen standaard debetrekening gedefinieerd\n"
+"voor het journaal \"%s\""
 
 #. module: account
 #: help:account.account,type:0
@@ -2012,7 +2047,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2040,7 +2075,7 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: account
 #: code:addons/account/account.py:2844
@@ -2060,13 +2095,13 @@ msgstr ""
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Opbrengstenrekening"
 
 #. module: account
 #: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr ""
+msgstr "Er is geen aankoop- of verkoopjournaal ingesteld."
 
 #. module: account
 #: view:product.category:0
@@ -2076,8 +2111,10 @@ 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
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Boekingen gesorteerd op"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
@@ -2092,16 +2129,21 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Productsjabloon"
 
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2112,7 +2154,7 @@ msgstr ""
 #: report:account.vat.declaration:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Boekjaar"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2159,7 +2201,7 @@ msgstr ""
 #: 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 "Fiscale posities"
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2284,7 +2326,7 @@ msgstr "Rekeningmodelboekingen"
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
-msgstr ""
+msgstr "AK"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2424,6 +2466,7 @@ msgstr "Korting(%)"
 
 #. 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
@@ -2669,6 +2712,8 @@ msgstr "Financiële boekhouding"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2945,7 +2990,6 @@ msgstr "Leeg laten voor kostenrekening"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2959,6 +3003,17 @@ msgstr "Leeg laten voor kostenrekening"
 #: 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 "Journalen"
 
@@ -3168,6 +3223,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3226,6 +3282,16 @@ msgstr "Btw:"
 #: 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.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 "Chart of Accounts"
 msgstr "Boekhoudplan"
 
@@ -3666,11 +3732,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4343,7 +4408,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4482,7 +4547,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4495,10 +4559,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4508,6 +4570,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr "Doelbewegingen"
 
@@ -4624,6 +4696,8 @@ msgstr "Afletterresultaat"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5337,6 +5411,19 @@ msgstr ""
 
 #. 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 "Geen filter"
@@ -6245,6 +6332,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6474,7 +6562,7 @@ msgstr "Analytische lijnen"
 #: 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 "
+"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) "
@@ -7148,6 +7236,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7400,6 +7489,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Periode"
@@ -7482,14 +7584,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Firmamunt"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7601,6 +7695,12 @@ msgstr "Terugbetalingsjournaal"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7840,6 +7940,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8123,12 +8224,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8246,7 +8352,12 @@ msgstr "Leeg laten voor opbrengstenrekening"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8265,6 +8376,15 @@ 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 ""
 
@@ -8462,7 +8582,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8479,12 +8599,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8504,7 +8629,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8685,6 +8810,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8766,6 +8892,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8975,13 +9113,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9005,7 +9140,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9213,6 +9348,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9286,6 +9422,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9655,13 +9801,17 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Indien dit schrijven uw betaling mocht kruisen, mag u dit negeren. Aarzel "
-#~ "niet om contact op te nemen met onze boekhouding voor eventuele vragen."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -9795,9 +9945,6 @@ msgstr ""
 #~ msgid "Analytic Invoice"
 #~ msgstr "Analytische factuur"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Sign for parent"
 #~ msgstr "Teken voor hoofdcode"
 
@@ -9947,13 +10094,6 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Rekeningen tonen "
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "De bankrekening van de relatie voor betaling.\n"
-#~ "Laat leeg voor de standaardwaarde."
-
 #~ msgid "Print General Journal"
 #~ msgstr "Algemeen dagboek afdrukken"
 
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 9cdf50d4df5..89b53dd4f27 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: 2011-04-29 05:09+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ msgstr "Nb. de transaccions"
 
 #. 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ msgstr "Rem.(%)"
 
 #. 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 "Jornals"
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr "TVA :"
 #: 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.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 "Chart of Accounts"
 msgstr "Plan de comptes"
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr "Resultat del letratge"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan comptable"
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr "Basa de la taxa"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr ""
 #~ "Cap de jornal per l'escritura finala es pas estat definit per aqueste "
@@ -9723,9 +9855,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Document"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Journal code"
 #~ msgstr "Jornal"
 
@@ -9800,18 +9929,3 @@ msgstr ""
 
 #~ msgid "Supplier invoice"
 #~ msgstr "Factura del provesidor"
-
-#~ msgid "All accounts"
-#~ msgstr "Totes los comptes"
-
-#~ msgid "Notification"
-#~ msgstr "Notificacion"
-
-#~ msgid "Financial Period"
-#~ msgstr "Periòde Fiscal"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Afichar los Comptes"
-
-#~ msgid "Creation Date"
-#~ msgstr "Data de creacion"
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 29b239a7d74..b4ee9d3d541 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 06:21+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+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: 2011-04-29 05:09+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -519,8 +519,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -679,7 +677,7 @@ msgstr "DS"
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
 msgid "closing balance entered by the cashbox verifier"
-msgstr "bilans zamknięcia wprowadzony przez wreyfikatora kasy"
+msgstr "Saldo końcowe wprowadzone przez weryfikatora kasy"
 
 #. module: account
 #: view:account.period:0
@@ -1168,6 +1166,7 @@ msgstr "Numer Transakcji"
 
 #. 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
@@ -1355,6 +1354,16 @@ msgstr "Nie możesz stosować głównego konta w tym dzienniku !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Z saldem różnym od zera"
 
@@ -2079,7 +2088,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Przeszukaj szablon planu kont"
 
 #. module: account
@@ -2143,6 +2152,8 @@ msgstr "Właściwości księgowości"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Zapisy sortowane wg"
 
@@ -2164,11 +2175,16 @@ msgstr "Szablon produktu"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2501,6 +2517,7 @@ msgstr "Up.(%)"
 
 #. 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
@@ -2754,6 +2771,8 @@ msgstr "Księgowość"
 #. 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
 msgid "Profit And Loss"
 msgstr "Zyski i straty"
 
@@ -3030,7 +3049,6 @@ msgstr "Zostaw puste żeby używać konta kosztowego"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3044,6 +3062,17 @@ msgstr "Zostaw puste żeby używać konta kosztowego"
 #: 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 "Dzienniki"
 
@@ -3259,6 +3288,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Strona przeciwna"
 
@@ -3317,6 +3347,16 @@ msgstr "NIP :"
 #: 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.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 "Chart of Accounts"
 msgstr "Plan kont"
 
@@ -3765,11 +3805,10 @@ msgid "Analytic Balance"
 msgstr "Bilans analityczny"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Strata netto"
 
@@ -4078,7 +4117,7 @@ msgstr "Konta wg typu"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,balance_end_real:0
 msgid "Closing Balance"
-msgstr "Bilans zamknięcia"
+msgstr "Saldo końcowe"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
@@ -4458,7 +4497,7 @@ msgstr "Pozycje zapisów"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Bilans (konta aktywów)"
 
 #. module: account
@@ -4600,7 +4639,6 @@ msgid "Analytic Balance -"
 msgstr "Bilans analityczny -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4613,10 +4651,8 @@ msgstr "Bilans analityczny -"
 #: 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.journal.period.print: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
@@ -4626,6 +4662,16 @@ msgstr "Bilans analityczny -"
 #: 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
 msgid "Target Moves"
 msgstr "Zapisy docelowe"
 
@@ -4742,6 +4788,8 @@ msgstr "Rezultat uzgodnienia"
 #: 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
 msgid "Balance Sheet"
 msgstr "Bilans"
 
@@ -5471,6 +5519,19 @@ msgstr "Dziennik główny"
 
 #. 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 "Brak filtra"
@@ -6401,6 +6462,7 @@ msgstr "Obszar podatkowy"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6641,7 +6703,7 @@ msgstr "Pozycje analityczne"
 #: 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 "
+"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) "
@@ -7363,6 +7425,7 @@ msgstr "Kwota (słownie)"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7623,6 +7686,19 @@ msgstr "Księgowość"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Okres"
@@ -7710,14 +7786,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Waluta firmy"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Plan kont"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7829,6 +7897,12 @@ msgstr "Dziennik korekt"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Filtruj wg"
 
@@ -8067,6 +8141,7 @@ msgstr "Wartość wyrażona w drugiej walucie, jeśli zapis jest wielowalutowy."
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8163,7 +8238,7 @@ msgstr "nieznany"
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "Otwieranie dziennika zapisów"
+msgstr "Dziennik zapisów otwarcia"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -8363,12 +8438,17 @@ msgstr "Windykacja"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Okres początkowy"
 
@@ -8488,7 +8568,12 @@ msgstr "Pozostaw puste, aby stosować konto dochodowe"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8507,6 +8592,15 @@ msgstr "Wprowadzone do systemu ręcznie lub automatycznie"
 
 #. 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 "Wyświetl konto"
 
@@ -8710,7 +8804,7 @@ msgstr "Lipiec"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan kont"
 
 #. module: account
@@ -8727,12 +8821,17 @@ msgstr "Bilans analityczny"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Okres końcowy"
 
@@ -8752,7 +8851,7 @@ msgstr "Okres końcowy"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Plan kont"
 
 #. module: account
@@ -8940,6 +9039,7 @@ msgstr "Zatwierdź zapis"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -9026,6 +9126,18 @@ msgstr "Ogólne"
 #: selection:account.pl.report,filter: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
@@ -9235,13 +9347,10 @@ msgid "Tax Source"
 msgstr "Podatek źródłowy"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Zysk netto"
 
@@ -9265,8 +9374,8 @@ msgstr "Brak konta przychodu dla produktu: \"%s\" (id:%d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "DZ"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9476,6 +9585,7 @@ msgstr "Faktura od dostawcy"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9553,6 +9663,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Ze zmianami stanu"
 
@@ -9924,6 +10044,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Contact"
 #~ msgstr "Kontakt"
 
@@ -9990,9 +10122,6 @@ msgstr ""
 #~ msgid "Printing Date"
 #~ msgstr "Data wydruku"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Błąd! Nie możesz tworzyć kont rekurencyjnych."
-
 #~ msgid "Partner account"
 #~ msgstr "Konto partnera"
 
@@ -10048,13 +10177,6 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Wyświetl konta "
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Konto bankowe partnera do płatności\n"
-#~ "Pozostaw puste, by stosować domyślne"
-
 #~ msgid "VAT"
 #~ msgstr "VAT"
 
@@ -10097,10 +10219,6 @@ msgstr ""
 #~ msgid "Unpaid invoices"
 #~ msgstr "Niezapłacone faktury"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Błąd konfiguracji !"
-
 #~ msgid "Date Invoiced"
 #~ msgstr "Data fakturowania"
 
@@ -10152,9 +10270,6 @@ msgstr ""
 #~ msgid "Account Analytic Lines Analysis"
 #~ msgstr "Analiza pozycji analitycznych konta"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID partnera"
-
 #~ msgid "Analytic account costs and revenues"
 #~ msgstr "Konto analityczne kosztów i dochodów"
 
@@ -10187,10 +10302,6 @@ msgstr ""
 #~ msgid "Financial Management"
 #~ msgstr "Księgowość"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Tego konta nie jest zdefiniowano do uzgodnień !"
-
 #~ msgid "Close Fiscal Year with new entries"
 #~ msgstr "Zamknij rok podatkowy z nowymi zapisami"
 
@@ -10227,9 +10338,6 @@ msgstr ""
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definiuj rok podatkowy i wybierz plan kont"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Okres odpisu"
-
 #~ msgid "By date"
 #~ msgstr "Wg daty"
 
@@ -10300,9 +10408,6 @@ msgstr ""
 #~ msgid "Payment date"
 #~ msgstr "Data zapłaty"
 
-#~ msgid "Partner name"
-#~ msgstr "Nazwa partnera"
-
 #~ msgid "Canceled Invoice"
 #~ msgstr "Anulowana faktura"
 
@@ -10465,9 +10570,6 @@ msgstr ""
 #~ "Nie jest to wymagane prawnie, ale może być bardzo użyteczne w niektórych "
 #~ "raportach."
 
-#~ msgid "All account entries"
-#~ msgstr "Wszystkie zapisy konta"
-
 #~ msgid "Supplier invoice"
 #~ msgstr "Faktura od dostawcy"
 
@@ -10645,9 +10747,6 @@ msgstr ""
 #~ msgid "Payment Reconcile"
 #~ msgstr "Uzgodnienie płatności"
 
-#~ msgid "Débit"
-#~ msgstr "Winien"
-
 #, python-format
 #~ msgid "Your journal must have a default credit and debit account."
 #~ msgstr "Twój dziennik musi mieć domyślne konto Winien i Ma."
@@ -10711,15 +10810,6 @@ msgstr ""
 #~ msgid "Accounting Statement"
 #~ msgstr "Zestawienie księgowe"
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Jeśli twoja płatność została uregulowana po wysłaniu tego maila, to zignoruj "
-#~ "ten mail. W razie wątpliwości skontaktuj się z naszym działem księgowym +32 "
-#~ "81 81 37 00."
-
 #~ msgid "Reconcile Paid"
 #~ msgstr "Uzgodnij zapłacone"
 
@@ -10752,9 +10842,6 @@ msgstr ""
 #~ msgid "        Start date"
 #~ msgstr "        Data początkowa"
 
-#~ msgid "Crédit"
-#~ msgstr "Ma"
-
 #~ msgid "Include in base amount"
 #~ msgstr "Włącz do kwoty bazowej"
 
@@ -10848,16 +10935,9 @@ msgstr ""
 #~ msgid "General Debit"
 #~ msgstr "Ogólnie Winien"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Nie możesz zatwierdzić niezbilansowanego zapisu !"
-
 #~ msgid "Can be draft or validated"
 #~ msgstr "Może być projektem lub zatwierdzone"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Pozostaw puste, by zastosować okres z daty zatwierdzenia."
-
 #~ msgid "Select Period and Journal for Validation"
 #~ msgstr "Wybierz okres i dziennik do zatwierdzenia"
 
@@ -10876,9 +10956,6 @@ msgstr ""
 #~ msgid "Ending Balance"
 #~ msgstr "Saldo końcowe"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Up. (%)"
-
 #~ msgid "From analytic accounts, Create invoice."
 #~ msgstr "Z analitycznych kont, Utwórz fakturę."
 
@@ -10915,10 +10992,6 @@ msgstr ""
 #~ msgid "Please set an analytic journal on this financial journal !"
 #~ msgstr "Proszę ustawić dziennik analityczny dla tego dziennika finansowego !"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "Stary rok podatkowy nie ma żadnych zapisów do uzgodnienia!"
-
 #~ msgid ""
 #~ "You can check this box to mark the entry line as a litigation with the "
 #~ "associated partner"
@@ -10929,9 +11002,6 @@ msgstr ""
 #~ msgid "Set starting and ending balance for control"
 #~ msgstr "Ustaw saldo początkowe i końcowe dla sprawdzenia"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldo z przeniesienia"
-
 #~ msgid "Analytic Check -"
 #~ msgstr "Kontrola analityczna -"
 
@@ -11089,9 +11159,6 @@ msgstr ""
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "Pozycja zapisu konta \"%s\" jest niedozwolona"
 
-#~ msgid "Move name"
-#~ msgstr "Nazwa zapisu"
-
 #~ 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 "
@@ -11101,10 +11168,6 @@ msgstr ""
 #~ "stan 'projekt' i zamiast tego od razu wchodziły w stan 'zaksięgowane' bez "
 #~ "żadnego ręcznego zatwierdzania."
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Nie możesz deaktywować  konta, które zawiera zapisy."
-
 #, python-format
 #~ msgid ""
 #~ "Selected Move lines does not have any account move enties in draft state"
@@ -11214,6 +11277,9 @@ msgstr ""
 #~ msgid "Header"
 #~ msgstr "Nagłówek"
 
+#~ msgid "JNRL"
+#~ msgstr "DZ"
+
 #~ msgid ""
 #~ "Example: 14 days 2%, 30 days net\n"
 #~ "1. Line 1: percent 0.02 14 days\n"
@@ -11230,48 +11296,6 @@ msgstr ""
 #~ "To konto będzie stosowane do rejestrowania wartości zapasów wychodzących "
 #~ "przy sprzedaży dla bieżącej kategorii produktów"
 
-#~ msgid "Draft invoices"
-#~ msgstr "Projekty faktur"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Koszty do faktur"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Konta do faktur"
-
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Konta analityczne do zamknięcia"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Konsola dla księgowści"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Przeterminowane wierzytelności"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Wybór zapisów wg"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Pokaż informację Winien/Ma"
-
-#~ msgid "Aged income"
-#~ msgstr "Przeterminowany dochód"
-
-#~ msgid "My indicators"
-#~ msgstr "Moje wskaźniki"
-
-#~ msgid "Financial Period"
-#~ msgstr "Okres finansowy"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Wybierz okres(y)"
-
-#~ msgid "Notification"
-#~ msgstr "Powiadomienia"
-
-#~ msgid "All accounts"
-#~ msgstr "Wszystkie konta"
-
 #, python-format
 #~ msgid "The journal must have centralised counterpart"
 #~ msgstr "Dzinnik musi mieć centralne konto przeciwstawne"
@@ -11279,121 +11303,9 @@ msgstr ""
 #~ msgid "Balance Brought Forward"
 #~ msgstr "Saldo z przeniesienia"
 
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Bilans - Porównanie lat"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Pokaż porównanie w %"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Pokaż raport w poziomie"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Musisz wybrać opcję 'Poziomo'. Zaznacz ją."
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Moduł bilansu jest dodatkową funkcjonalnością modułu księgowego.\n"
-#~ "\n"
-#~ "    Ten moduł daje kilka opcji drukowania bilansu.\n"
-#~ "\n"
-#~ "    1. Możesz porównać bilanse z różnych lat.\n"
-#~ "\n"
-#~ "    2. Możesz ustawić liczbowo lub procentowo porównanie pomiędzy dwoma "
-#~ "latami.\n"
-#~ "\n"
-#~ "    3. Możesz ustawić konto referencyjne do procentowego porównania "
-#~ "poszczególnych lat.\n"
-#~ "\n"
-#~ "    4. Możesz wybrać okres jako datę bieżącą lub jako datę utworzenia.\n"
-#~ "\n"
-#~ "    5. Możesz drukować raporty w formacie poziomym.\n"
-#~ "    "
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Wybierz konto referencyjne (do porównania %)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Wybierz lata podatkowe (maksymalnie 3)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Porównaj wybrane lata pod kątem"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Pokaż konta"
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Księgowość - Porównanie kont"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Możesz wybrać maksymalnie 3 lata. Sprawdź ponownie."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Wybrałeś opcję 'Procentowo' z więcej niż dwoma latami, ale nie wybrałeś "
-#~ "wydruku poziomego."
-
-#~ msgid "Don't Compare"
-#~ msgstr "Nie porównuj"
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Mogłaś(eś) popełnić jeden z poniższych błędów. Popraw i spróbuj ponownie."
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Wybrałeś więcej niż 3 lata w którymś przypadku."
-
 #~ msgid "Account Entry Lines"
 #~ msgstr "Pozycje zapisów"
 
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr "2. Nie wybrałeś opcji 'Procentowo', ale wybrałeś więcej niż 2 lata."
-
-#~ msgid "Creation Date"
-#~ msgstr "Data utworzenia"
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Musisz wybrać co najmniej 1 rok podatkowy. Spróbuj ponownie."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Pewnie wybrałaś(eś) opcję porównania z więcej niż 1 rokiem z kolumnami "
-#~ "Winien/Ma i opcją %. To prowadzi do wydruku poza papierem. Spróbuj ponownie."
-
-#~ msgid "Customize Report"
-#~ msgstr "Dostosuj raport"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Moduł dodający nowe raporty dla księgowości"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Kisęgowość - Raportowanie"
-
 #~ msgid "Credit Note"
 #~ msgstr "Korekta"
 
@@ -11418,52 +11330,15 @@ msgstr ""
 #~ msgid "Sign for parent"
 #~ msgstr "Znak do nadrzędnego"
 
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Mapowanie fiskalne podatków"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Szablony mapowania fiskalnego"
-
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Mapowanie fiskalne kont"
-
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "Błąd! Nieprawidłowy numer Bvr (nieporawna suma kontrolna)"
 
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Szablon mapowania fiskalnego"
-
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr ""
-#~ "Mapowanie fiskalne określa zmiany podatków i kont (ustalonych w produktach) "
-#~ "w zależności od partnera."
-
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Uwaga do mapowania fiskalnego :"
-
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Szablon mapowania fiskalnego podatku"
-
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Szablon mapowania fiskalnego"
-
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Mapowanie fiskalne"
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Pozostaw puste do porównania z nadrzędnymi."
-
 #~ msgid "Asset"
 #~ msgstr "Środek trwały"
 
 #~ msgid "Journal de vente"
 #~ msgstr "Dziennik sprzedaży"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
@@ -11476,213 +11351,16 @@ msgstr ""
 #~ msgid "Mvt"
 #~ msgstr "Mvt"
 
-#~ msgid "supplier"
-#~ msgstr "dostawca"
-
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "Zapis dziennika zawiera kilka pozycji. Każda pozycja zawiera wartość Winien "
-#~ "lub Ma. OpenERP tworzy automatycznie zapisy dla dokumentów: faktur, korekt, "
-#~ "płatności, wyciągów bankowych itp."
-
-#~ msgid "End of Year"
-#~ msgstr "Koniec roku"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "Entry No"
-#~ msgstr "Nr zapisu"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Faktura "
 
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilans (konta aktywów)"
 
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "zostało zatwierdzone."
 
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Dziennik kasowy (test)"
-
-#~ msgid "Bank Journal - (test)"
-#~ msgstr "Dziennik bankowy (test)"
-
-#~ msgid "Central Journals"
-#~ msgstr "Dzienniki centralizowane"
-
-#~ msgid "Default UoM"
-#~ msgstr "Domyślna JM"
-
-#~ msgid ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-#~ msgstr ""
-#~ "Rejestry kasowe pozwalają zarządzać zapisami kasowymi w dziennikach kasowych."
-
-#, python-format
-#~ msgid "You cannot create a bank or cash register without a journal!"
-#~ msgstr "Nie możesz tworzyć rejestru bankowego lub kasowego bez dziennika !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
-#~ msgid "Expenses Journal - (test)"
-#~ msgstr "Dziennik wydatków (test)"
-
-#~ msgid "Sales Journal - (test)"
-#~ msgstr "Dziennik sprzedaży (test)"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Nazwa grupy musi być unikalna !"
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "To konto będzie stosowane do księgowania sprzedaży dla bieżącej kategorii "
-#~ "produktu"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "OpenERP generuje projekty faktur automatycznie, abyś mógł tylko je "
-#~ "potwierdzać przed wysłaniem do klientów."
-
-#~ msgid ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "Korekta od dostawcy jest fakturą korygującą przysłaną przez dostawcę, która "
-#~ "niweluje część lub całość faktury przysłanej wcześniej."
-
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Faktury od dostawców pozwala ci przeglądać te faktury. OpenERP generuje "
-#~ "faktury od dostawców automatycznie według tego co zamawiasz, kupujesz lub "
-#~ "przyjmujesz."
-
-#~ msgid ""
-#~ "Define your company's fiscal year depending on the period you have chosen to "
-#~ "follow. A fiscal year is a 1 year period over which a company budgets its "
-#~ "spending. It may run over any period of 12 months. The fiscal year is "
-#~ "referred to by the date in which it ends. For example, if a company's fiscal "
-#~ "year ends November 30, 2011, then everything between December 1, 2010 and "
-#~ "November 30, 2011  would be referred to as FY 2011. Not using the actual "
-#~ "calendar year gives many companies an advantage, allowing them to close "
-#~ "their books at a time which is most convenient for them."
-#~ msgstr ""
-#~ "Zdefiniuj firmowy rok podatkowy według swoich okresów rozliczeniowych. Rok "
-#~ "podatkowy jest okresem, dla którego w firmie tworzony jest budżet. Może to "
-#~ "być dowolne 12 miesięcy. Rok podatkowy jest oznaczany rokiem, w którym się "
-#~ "kończy. Tzn. Jeśli rok kończy się 30 listopada 2011, to powinien być "
-#~ "nazywany \"RPod. 2011\" lub podobnie. Nie stosowanie roku kalendarzowego "
-#~ "może firmie przynieść korzyści wynikające z zamykania ksiąg w wygodniejszym "
-#~ "dla nich momencie."
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "To konto będzie stosowane (zamiast domyślnego) do zapisów wydatków dla "
-#~ "bieżącego produktu."
-
-#~ msgid ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-#~ msgstr ""
-#~ "Wyciąg bankowy jest spisem transakcji finansowych związanych kontem "
-#~ "bankowym, kartą kredytową lub innym kontem finansowym w danym okresie. "
-#~ "Rozpocznij wpisując stan początkowy i końcowy, a następnie wpisuj kolejne "
-#~ "pozycje. W kolumnie Płatność możesz nacisnąć F11, aby otworzyć formularz "
-#~ "uzgodnienia."
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "To konto będzie stosowane dla produktu (zamiast domyślnego) do zapisów "
-#~ "sprzedaży."
-
-#~ msgid ""
-#~ "Create and manage your company's financial journals from this menu. A "
-#~ "journal is a business diary in which all financial data related to the day "
-#~ "to day business transactions of your company is recorded using double-entry "
-#~ "book keeping system. Depending on the nature of its activities and number of "
-#~ "daily transactions, a company may keep several  types of specialized "
-#~ "journals such as a cash journal, purchases journal, and sales journal."
-#~ msgstr ""
-#~ "W tym menu możesz zarządzać dziennikami. Dziennik jest miejscem "
-#~ "porządkowania zapisów księgowych. W zależności od złożoności operacji "
-#~ "księgowych firma może prowadzić wiele dzienników księgowych."
-
-#~ msgid ""
-#~ "You can look up individual account entries by searching for useful "
-#~ "information. To search for account entries, open a journal, then select a "
-#~ "record line."
-#~ msgstr "Możesz przeglądać zapisy. Do tego celu otwórz dziennik."
-
-#~ msgid ""
-#~ "An account type is a name or code given to an account that indicates its "
-#~ "purpose. For example, the account type could be linked to an asset account, "
-#~ "expense account or payable account. From this view, you can create and "
-#~ "manage the account types you need to be used for your company management."
-#~ msgstr ""
-#~ "Typ konta jest nazwą lub kodem nadanym do określania zastosowania konta. Na "
-#~ "przykład, typ może być konto środków trwałych, wydatków, płatności itp."
-
-#~ msgid ""
-#~ "Create and manage accounts you will need to record financial entries in. "
-#~ "Accounts are financial records of your company that register all financial "
-#~ "transactions. Companies present their annual accounts in two main parts: the "
-#~ "balance sheet and the income statement (profit and loss account). The annual "
-#~ "accounts of a company are required by law to disclose a certain amount of "
-#~ "information. They have to be certified by an external auditor yearly."
-#~ msgstr "Tutaj możesz operować kontami księgowymi."
-
-#~ msgid ""
-#~ "A tax code is a reference of a tax that will be taken out of a gross income "
-#~ "depending on the country and sometimes industry sector. OpenERP allows you "
-#~ "to define and manage them from this menu."
-#~ msgstr ""
-#~ "Rejestry podatkowe służą do rozdzielania kwot brutto w zależności od kraju i "
-#~ "czasem sektora firmy. Możesz nimi zarządzać w tym menu."
-
-#~ msgid ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-#~ msgstr ""
-#~ "Rejestry podatkowe pozwalają ci oglądać hierarchię rejestrów i ich stan na "
-#~ "bieżący okres."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "To konto będzie stosowane w fakturach do zapisów wydatkowych dla bieżącej "
-#~ "kategorii produktów."
+#~ msgid "Chart of Accounts"
+#~ msgstr "Plan kont"
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index fe41f93919d..3b70cc6cc22 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.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:14+0000\n"
-"PO-Revision-Date: 2011-01-22 00:46+0000\n"
-"Last-Translator: Tiago Baptista <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -519,8 +519,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -755,7 +753,7 @@ msgstr "Percentagem"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "Gráficos"
+msgstr "Planos de Contas"
 
 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
@@ -1172,6 +1170,7 @@ msgstr "# da transacção"
 
 #. 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
@@ -1359,6 +1358,16 @@ msgstr "Não pode usar esta conta geral neste diário"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Com saldo diferente de 0"
 
@@ -2101,7 +2110,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Pesquisar Modelos de Plano de Contas"
 
 #. module: account
@@ -2169,6 +2178,8 @@ msgstr "Propriedades contabilisticas"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Movimentoss ordenadas por"
 
@@ -2190,11 +2201,16 @@ msgstr "Modelo de produto"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2532,6 +2548,7 @@ msgstr "Desc.(%)"
 
 #. 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
@@ -2794,6 +2811,8 @@ msgstr "Contabilidade Financeira"
 #. 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
 msgid "Profit And Loss"
 msgstr "Lucro e prejuízo"
 
@@ -3081,7 +3100,6 @@ msgstr "Deixe em branco para usar a conta de custos"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3095,6 +3113,17 @@ msgstr "Deixe em branco para usar a conta de custos"
 #: 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 "Diários"
 
@@ -3311,6 +3340,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Contrapartida"
 
@@ -3369,6 +3399,16 @@ msgstr "IVA :"
 #: 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.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 "Chart of Accounts"
 msgstr "Plano de Contas"
 
@@ -3832,11 +3872,10 @@ msgid "Analytic Balance"
 msgstr "Saldo analítico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Prejuizo"
 
@@ -4537,7 +4576,7 @@ msgstr "Lançamentos do diário"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Balancete (Contas de Activo)"
 
 #. module: account
@@ -4684,7 +4723,6 @@ msgid "Analytic Balance -"
 msgstr "Balancete Analítico -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4697,10 +4735,8 @@ msgstr "Balancete 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.journal.period.print: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
@@ -4710,6 +4746,16 @@ msgstr "Balancete Analítico -"
 #: 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
 msgid "Target Moves"
 msgstr "Movimentos alvo"
 
@@ -4826,6 +4872,8 @@ msgstr "Resultado da reconciliação"
 #: 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
 msgid "Balance Sheet"
 msgstr "Balanço"
 
@@ -5575,6 +5623,19 @@ msgstr "Diário de Contas Geral"
 
 #. 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 "Sem filtro"
@@ -6537,6 +6598,7 @@ msgstr "Posição fiscal"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6799,7 +6861,7 @@ msgstr "Linhas analíticas"
 #: 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 "
+"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) "
@@ -7541,6 +7603,7 @@ msgstr "Montante (por extenso):"
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7806,6 +7869,19 @@ msgstr "Gestão financeira e contabilidade"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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"
@@ -7900,14 +7976,6 @@ msgstr "Telefone:"
 msgid "Company Currency"
 msgstr "Moeda da empresa"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Plano de contas"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -8024,6 +8092,12 @@ msgstr "Diário de notas de crédito"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8271,6 +8345,7 @@ msgstr "O valor expresso em divisas, se é um movimento em moeda estrangeira."
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8585,12 +8660,17 @@ msgstr "Gestão de Seguimento de dividas"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Início do período"
 
@@ -8715,7 +8795,12 @@ msgstr "Manter vazia para usar a conta a chegar"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8734,6 +8819,15 @@ msgstr "Introduzidos manualmente ou automaticamente no sistema"
 
 #. 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 conta"
 
@@ -8951,7 +9045,7 @@ msgstr "Julho"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Gráfico de contas"
 
 #. module: account
@@ -8968,12 +9062,17 @@ msgstr "Saldo da conta analítica"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Fim do período"
 
@@ -8993,7 +9092,7 @@ msgstr "Fim do período"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Plano de contas"
 
 #. module: account
@@ -9190,6 +9289,7 @@ msgstr "Validar movimento"
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -9276,6 +9376,18 @@ msgstr "Geral"
 #: selection:account.pl.report,filter: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
@@ -9494,13 +9606,10 @@ msgid "Tax Source"
 msgstr "Origem do câmbio"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Lucro líquido"
 
@@ -9524,8 +9633,8 @@ msgstr "Não há conta de proveitos definida para este artigo:\"%s\" (id:%d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "DIAR"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9738,6 +9847,7 @@ msgstr "Factura do fornecedor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9818,6 +9928,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Com movimentos"
 
@@ -10206,11 +10326,17 @@ msgstr ""
 "O montante residual num movimento de diário a receber ou a pagar, expresso "
 "na sua divisa (Poderá ser diferente da divisa da empresa)."
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Manter vazio para utilizar o periodo da data de validação"
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Erro! Você não pode criar uma conta recursiva."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #, python-format
 #~ msgid ""
@@ -10236,17 +10362,6 @@ msgstr ""
 #~ msgid "Debit Trans."
 #~ msgstr "Transferência de débitos"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Desc.(%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Se entretanto efectuou o pagamento, por favor não considere esta mensagem. "
-#~ "Não hesite em contactar o nosso departamento de contabilidade"
-
 #~ msgid "Supplier invoice"
 #~ msgstr "Factura de Fornecedor"
 
@@ -10352,9 +10467,6 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Mostrar contas "
 
-#~ msgid "Crédit"
-#~ msgstr "Crédito"
-
 #~ msgid "Income"
 #~ msgstr "Receita"
 
@@ -10440,10 +10552,6 @@ msgstr ""
 #~ msgid "Statements reconciliation"
 #~ msgstr "Reconciliação de Extractos"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Erro de configuração !"
-
 #~ 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 "
@@ -10453,9 +10561,6 @@ msgstr ""
 #~ "pagar, Por favor, tome as medidas adequadas para proceder ao pagamento nos "
 #~ "próximos 8 dias."
 
-#~ msgid "Débit"
-#~ msgstr "Debito"
-
 #~ msgid "Create subscription entries"
 #~ msgstr "Criar movimentos de subscrição"
 
@@ -10521,9 +10626,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Documento"
 
-#~ msgid "Move name"
-#~ msgstr "Mover nome"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Cancelar facturas seleccionadas"
 
@@ -10533,10 +10635,6 @@ msgstr ""
 #~ msgid "Financial Management"
 #~ msgstr "Gestão financeira"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "A conta não esta definida para ser reconciliada !"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Informação adicional"
 
@@ -10559,9 +10657,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Pagar e reconciliar"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldo transitado"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Novo reembolso do fornecedor"
 
@@ -10571,9 +10666,6 @@ msgstr ""
 #~ msgid "Credit Note"
 #~ msgstr "Nota de crédito"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Fechar período"
-
 #~ msgid "3 Months"
 #~ msgstr "3 Meses"
 
@@ -10632,15 +10724,15 @@ msgstr ""
 #~ msgid "Payment date"
 #~ msgstr "Data de pagamento"
 
-#~ msgid "Partner name"
-#~ msgstr "Nome do terceiro"
-
 #~ msgid "Canceled Invoice"
 #~ msgstr "Facturas canceladas"
 
 #~ msgid "Bank Payment"
 #~ msgstr "Pagamento bancário"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "Quantities"
 #~ msgstr "Quantidades"
 
@@ -10650,10 +10742,6 @@ msgstr ""
 #~ msgid "Modify Invoice"
 #~ msgstr "Modificar factura"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Você não pode desactivar uma conta que contem movimentos de contas."
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filtrar em parceiros"
 
@@ -10751,9 +10839,6 @@ msgstr ""
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. ou nome do movimento."
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
 
@@ -10761,10 +10846,6 @@ msgstr ""
 #~ msgid "No Data Available"
 #~ msgstr "Sem dados disponíveis"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Não pode validar um movimento não balanceado."
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "O saldo do extrato é incorrecto!\n"
@@ -10790,22 +10871,12 @@ msgstr ""
 #~ msgid "Period from :"
 #~ msgstr "Período de:"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "A conta bancária do parceiro para pagamentos\n"
-#~ "Deixe vazio para usar a predefinida."
-
 #~ msgid "to :"
 #~ msgstr "para:"
 
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Full Account Name"
 #~ msgstr "Nome completo da conta"
 
@@ -10889,9 +10960,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Lançamento por movimento"
 
-#~ msgid "All account entries"
-#~ msgstr "Todos os movimentos contabilísticos"
-
 #~ msgid "Entries of Open Analytic Journals"
 #~ msgstr "Movimentos de diários analíticos abertos"
 
@@ -10936,9 +11004,6 @@ msgstr ""
 #~ msgid "Partner Ref."
 #~ msgstr "Ref. do Parceiro"
 
-#~ msgid "Partner ID"
-#~ msgstr "Id do Parceiro"
-
 #~ msgid "Journal d'ouverture"
 #~ msgstr "Diário de abertura"
 
@@ -10985,120 +11050,6 @@ msgstr ""
 #~ msgid "Journal de frais"
 #~ msgstr "Diário dos portes"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Contas da contabilidade analítica para fechar"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Rascunho de facturas"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Contas a facturar"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Custos a facturar"
-
-#~ msgid "Aged receivables"
-#~ msgstr "A receber ente datas"
-
-#~ msgid "My indicators"
-#~ msgstr "Meus indicadores"
-
-#~ msgid "Aged income"
-#~ msgstr "Renda envelhecida"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Mostrar informação de debito / credito"
-
-#~ msgid "All accounts"
-#~ msgstr "Todas as Contas"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Selecções de entradas baseadas em"
-
-#~ msgid "Notification"
-#~ msgstr "Notificação"
-
-#~ msgid "Financial Period"
-#~ msgstr "Período Financeiro"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Selecçionar periodos"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Comparar ano selecçionados em termos de"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Seleccione o(s) ano(s) fiscais (no máximo três anos)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Selecçione conta de referençia (por % de comparção)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Balancete de contas - comparar anos"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Você tem de seleccionar a opção 'Landscape'. Por favor verifique-o."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Mostrar relatório em modo de paisagem"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Mostrar comparação em %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Não comparar"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Mostrar contas"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "Selecçionaste mais de 3 anos em qualquer caso."
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr ""
-#~ "Você pode seleccionar no máximo de 3 anos. por favor verifique de novo."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Você seleccionou a opção 'Percentagem' com mais de 2 anos, mas você não "
-#~ "seleccionou o formato Landscape"
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Você pode ter cometido os seguintes erros. Por favor corrija-os e tente de "
-#~ "novo."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Manter vazio para comparação com o seu ascendente"
-
-#~ msgid "Creation Date"
-#~ msgstr "Data de Criação"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Você não seleccionou a opção 'Percentagem', mas você seleccionou mais de "
-#~ "2 anos"
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Você pode ter seleccionado as opções de comparação com mais de 1 ano com as "
-#~ "colunas do crédito/débito e os % da opção. Isto pode levar a que os "
-#~ "conteúdos sejam  imprimidos para fora do papel. Por favor tente outra vez."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Você tem de seleccionar pelo menos 1 ano fiscal. Tente de novo."
-
-#~ msgid "Customize Report"
-#~ msgstr "Personalizar relatório"
-
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Facturas de Fornecedores por Pagar"
 
@@ -11746,97 +11697,24 @@ msgstr ""
 #~ "produto vendido. A quantidade não é um requisito legal mas é muito útil para "
 #~ "alguns relatórios."
 
-#~ msgid "supplier"
-#~ msgstr "fornecedor"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Fatura "
 
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo deve ser único !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "O objecto osv_memory não suporta regras!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Low Level"
-#~ msgstr "Baixo nível"
-
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Diário de caixa - (teste)"
-
 #~ msgid "Partner Other Ledger"
 #~ msgstr "Balancete de terceiros (outro)"
 
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Diário de Notas de Crédito de despesas"
-
-#~ msgid "End of Year"
-#~ msgstr "Fim de ano"
-
-#~ msgid ""
-#~ "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
-#~ "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
-#~ "o.journal_id.currency and o.journal_id.currency.symbol"
-#~ msgstr ""
-#~ "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
-#~ "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
-#~ "o.journal_id.currency and o.journal_id.currency.symbol"
-
-#~ msgid "Jahresabschlusskonten u. Statistik"
-#~ msgstr "Contas anuais e estatísticas"
-
-#~ msgid "Bilanzkonten - Passiva - Kapitalkonten"
-#~ msgstr "Contas do balanço - Passivo - Contas de Capital"
-
-#~ msgid "Bilanzkonten - Aktiva - Vermögenskonten"
-#~ msgstr "Balanço de Contas - Ativo - Contas financeiras"
-
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "está validado"
 
-#~ msgid "Default UoM"
-#~ msgstr "UdM Padrão"
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Esta conta será usada pelas faturas, para registar as vendas de artigos "
-#~ "desta categoria."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "Esta conta será usada nas faturas, para registar os custos desta categoria "
-#~ "de artigos"
-
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Faturas a clientes, permite criar e gerir as faturas emitidas aos clientes. "
-#~ "O OpenERP gera faturas em rascunho automaticamente, que só terá de confirmar."
+#~ msgid "Chart of Accounts"
+#~ msgstr "Plano de contas"
 
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)"
 
-#~ msgid "Ansicht"
-#~ msgstr "Vista"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balancete (Contas de Activo)"
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 12a1b35a98a..9963882d842 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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-02 18:53+0000\n"
-"Last-Translator: Nédio Batista Marques <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-03 04:46+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Nenhum Livro de Encerramento definido para o Ano Fiscal."
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +67,7 @@ msgid "Residual"
 msgstr "Residual"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Defina uma sequencia para o diário"
@@ -136,7 +136,7 @@ msgid "Accounting Entries-"
 msgstr "Lançamentos contábeis-"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Você não pode excluir o movimento postado: \"%s\"!"
@@ -182,7 +182,7 @@ msgstr ""
 "pagamento sem as remover."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -237,7 +237,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -270,7 +270,7 @@ msgstr ""
 "(IVA) relativos a este código de imposto apareçam nas faturas"
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, 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)"
@@ -286,7 +286,7 @@ msgid "Belgian Reports"
 msgstr "Relatórios belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, 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."
@@ -324,7 +324,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -518,8 +518,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -585,7 +583,7 @@ msgid "Not reconciled transactions"
 msgstr "Transação não conciliada"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Balanço de Caixa não confere com Balanço Calculado"
@@ -670,7 +668,7 @@ msgid "Tax Code Amount"
 msgstr "Valor do Código do Imposto"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -703,8 +701,8 @@ msgid "Journal Period"
 msgstr "Período do Diário"
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -767,7 +765,7 @@ msgid "Analytic Entries by line"
 msgstr "Entradas analíticas por linha"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "É permitido alterar a moeda apenas para Fatura Rascunho"
@@ -871,7 +869,7 @@ msgid "Next Partner to reconcile"
 msgstr "Próximo Parceiro a reconciliar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -998,11 +996,11 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1083,6 +1081,7 @@ msgstr "Lucros e Perdas (Conta de Despesas)"
 
 #. 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 "-"
@@ -1181,7 +1180,7 @@ msgid "Entry Label"
 msgstr "Aba de lançamento"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1320,6 +1319,7 @@ msgid "Journal Items Analysis"
 msgstr "Análise de Itens de Diário"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Parceiros"
@@ -1349,7 +1349,7 @@ msgid "Central Journal"
 msgstr "Diário Central"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Voce não pode usar esta conta geral neste diário !"
@@ -1361,6 +1361,16 @@ msgstr "Voce não pode usar esta conta geral neste diário !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Com saldo diferente de zero"
 
@@ -1446,7 +1456,7 @@ msgid ""
 msgstr "Exemplo: 2% em 14 dias, restante em 30 dias no fim do mês."
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1616,6 +1626,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"
@@ -1687,7 +1698,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Erro! Você não pode definir anos fiscais que se sobreponham."
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "A conta não está definida para ser reconciliada !"
@@ -1722,7 +1733,7 @@ msgid "Receivables & Payables"
 msgstr "Recebíveis & Pagáveis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Você tem que fornecer uma conta para o lançamento da baixa !"
@@ -1758,7 +1769,7 @@ msgid "Customer Ref:"
 msgstr "Ref.Cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, 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 !"
@@ -1779,7 +1790,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Declaração de Impostos: Observações de Crédito"
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1796,7 +1807,7 @@ msgid "You can not create move line on closed account."
 msgstr "Você não pode criar linhas de movimento em uma conta fechada."
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2079,7 +2090,7 @@ msgid " Journal"
 msgstr " Diário"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2107,7 +2118,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Pesquisar Modelos de Planos de Conta"
 
 #. module: account
@@ -2141,7 +2152,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2161,7 +2172,7 @@ msgid "Income Account"
 msgstr "Conta de Receita"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, 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!"
@@ -2172,9 +2183,10 @@ msgid "Accounting Properties"
 msgstr "Propriedades da Conta"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Lançamentos listados por"
 
@@ -2196,12 +2208,16 @@ msgstr "Modelo de produto"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2311,7 +2327,7 @@ msgid "Account Tax Code"
 msgstr "Código da conta de impostos"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2392,7 +2408,7 @@ msgid "Account Model Entries"
 msgstr "Modelo de entrada de contas"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2483,7 +2499,7 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
@@ -2495,12 +2511,13 @@ msgid "Average Price"
 msgstr "Preço médio"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Data:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2655,16 +2672,16 @@ 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:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Nenhuma seqüência definida no diário !"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2802,6 +2819,8 @@ msgstr "Contabilidade Financeira"
 #. 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
 msgid "Profit And Loss"
 msgstr "Lucros e Perdas"
 
@@ -2836,7 +2855,7 @@ msgid "Analytic Entries"
 msgstr "Lançamentos analíticos"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2968,7 +2987,7 @@ msgid "BNK%s"
 msgstr "BCO%s"
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3090,9 +3109,7 @@ msgstr "Deixe vazio para usar a conta de despesas"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3106,6 +3123,17 @@ msgstr "Deixe vazio para usar a conta de despesas"
 #: 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 "Diários"
 
@@ -3151,7 +3179,7 @@ msgid "Starting Balance"
 msgstr "Saldo Inicial"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Número do parceiro definido !"
@@ -3195,6 +3223,7 @@ msgstr "Diário"
 #: 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
@@ -3248,7 +3277,7 @@ msgstr ""
 "que você não poderá mais alterar seus campos."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Impossível excluir fatura(s) que já foram abertas ou pagas!"
@@ -3311,7 +3340,7 @@ msgstr ""
 "'Cancelado' ou 'Concluído'!"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3381,6 +3410,16 @@ msgstr "IVA (Imposto de Valor Agregado) :"
 #: 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.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 "Chart of Accounts"
 msgstr "Plano de contas"
 
@@ -3428,7 +3467,6 @@ 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
 #: view:account.move:0
@@ -3472,7 +3510,7 @@ msgid "Chart of Accounts Template"
 msgstr "Modelo de plano de contas"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3484,13 +3522,13 @@ msgstr ""
 "Por favor, defina o parceiro sobre ela!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Alguns lançamentos já estão conciliados !"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3618,7 +3656,7 @@ msgid "Analytic Items"
 msgstr "Itens Analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Não foi possível alterar o imposto!"
@@ -3629,14 +3667,14 @@ msgid "#Entries"
 msgstr "#Entradas"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "Você selecionou uma unidade que não é compatível com o produto."
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3848,11 +3886,10 @@ msgid "Analytic Balance"
 msgstr "Saldo Analítico"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Prejuízo Líquido"
 
@@ -3950,7 +3987,7 @@ msgid "Acc.Type"
 msgstr "Tipo de Conta"
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -4015,7 +4052,7 @@ msgstr ""
 "...) os quais já são gerados com status 'Postado'."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4194,7 +4231,7 @@ msgid "Credit Notes"
 msgstr "Notas de crédito"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4267,11 +4304,11 @@ msgid "Change"
 msgstr "Alterar"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4377,7 +4414,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Você tem que definir um diário analítico '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4449,7 +4486,7 @@ msgid "Invoices"
 msgstr "Faturas"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4554,7 +4591,7 @@ msgstr "Itens do Diário"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Planilha de Balanço (Ativos)"
 
 #. module: account
@@ -4563,24 +4600,25 @@ msgid "Third Party (Country)"
 msgstr "Terceiro (País)"
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4602,7 +4640,7 @@ msgid "Bank Details"
 msgstr "Detalhes bancários"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Impostos faltando!"
@@ -4661,7 +4699,7 @@ msgid "Check Date not in the Period"
 msgstr "Verificar Data fora do Período"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4683,7 +4721,7 @@ msgid "Child Tax Accounts"
 msgstr "Contas de impostos derivados (subcontas)"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Período Inicial deve ser anterior ao Período Final"
@@ -4699,7 +4737,6 @@ msgid "Analytic Balance -"
 msgstr "Balanço analítico -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4712,11 +4749,8 @@ msgstr "Balanço 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
 #: 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
@@ -4726,6 +4760,16 @@ msgstr "Balanço analítico -"
 #: 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
 msgid "Target Moves"
 msgstr "Movimentos de destino"
 
@@ -4796,7 +4840,7 @@ msgid "Line 1:"
 msgstr "Linha 1:"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Erro de integridade !"
@@ -4842,6 +4886,8 @@ msgstr "Resultado da conciliação"
 #: 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
 msgid "Balance Sheet"
 msgstr "Folha de Balanço"
 
@@ -4946,7 +4992,7 @@ msgstr ""
 "um parceiro"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -5021,7 +5067,7 @@ msgstr ""
 "28/02."
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -5049,7 +5095,7 @@ msgid "Start of period"
 msgstr "Início do período"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5107,12 +5153,12 @@ msgstr "Diário de lançamentos do fim do ano"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5192,7 +5238,7 @@ msgid "Sort By"
 msgstr "Ordenar Por"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5347,7 +5393,7 @@ msgid "Generate Opening Entries"
 msgstr "Gerar Lançamentos de Abertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Já Reconciliado"
@@ -5385,7 +5431,7 @@ msgstr "Sub-contas"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Baixa ou exclusão"
@@ -5537,7 +5583,7 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "A nova moeda não está configurada corretamente !"
@@ -5562,14 +5608,14 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Voce não pode usar uma conta inativa!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Lançamentos não são das mesmas contas ou já estão conciliados ! "
@@ -5588,6 +5634,19 @@ msgstr "Diário de Contas Gerais"
 
 #. 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 "Sem filtro"
@@ -5604,7 +5663,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação invalida !"
@@ -5824,7 +5883,7 @@ msgid "Companies"
 msgstr "Empresas"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6105,9 +6164,9 @@ msgid "Optional create"
 msgstr "Criação opcional"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -6260,8 +6319,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Estatísticas de Lançamentos Analíticos"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Lancamentos: "
@@ -6272,7 +6331,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Criar lançamentos recorrentes manuais no diário escolhido."
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Não foi possível criar movimentação entre empresas diferentes"
@@ -6319,7 +6378,7 @@ msgid "Total debit"
 msgstr "Débito Total"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Lançamento \"%s\" não é válido"
@@ -6389,31 +6448,30 @@ msgid "  valuation: percent"
 msgstr "  valorização: porcentagem"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6533,7 +6591,7 @@ msgid "Journal Select"
 msgstr "Selecionar Diário"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "A moeda atual não está configurada corretamente !"
@@ -6554,7 +6612,6 @@ msgstr "Posição Fiscal dos Impostos"
 #: 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 "Livro Razão"
@@ -6615,7 +6672,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6652,7 +6709,7 @@ msgid "Child Codes"
 msgstr "Códigos derivados (sub-contas)"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6816,7 +6873,7 @@ msgstr "Linhas analíticas"
 #: 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 "
+"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) "
@@ -6836,7 +6893,7 @@ msgid "Lines"
 msgstr "Linhas"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -7037,7 +7094,7 @@ msgstr ""
 "personalizado."
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, 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"
@@ -7151,7 +7208,7 @@ msgid "Sign on Reports"
 msgstr "Assinar relatórios"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "Você não pode ter dois registradores abertos para o mesmo diário"
@@ -7186,6 +7243,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "Pro-forma"
 
@@ -7217,7 +7275,6 @@ msgstr "Informação Opcional"
 
 #. 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
@@ -7245,13 +7302,13 @@ msgstr ""
 "Você pode colocar data limite para o pagamento desta linha."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Conta errada!"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7269,7 +7326,7 @@ msgid "Invoice Tax"
 msgstr "Taxa de fatura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "Nenhum número da parte!"
@@ -7516,17 +7573,17 @@ msgid "Fixed"
 msgstr "Fixo"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Atenção !"
@@ -7589,7 +7646,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Não pode %s provisório/proforma/cancelar fatura."
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Sem Linhas na Fatura !"
@@ -7638,7 +7695,7 @@ msgid "Deferral Method"
 msgstr "Método para deferimento"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "A Fatura '%s' está paga."
@@ -7703,7 +7760,7 @@ msgid "Associated Partner"
 msgstr "Parceiro Associado"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Voce precisa selecionar um parceiro primeiro !"
@@ -7773,7 +7830,7 @@ msgid "Choose Fiscal Year"
 msgstr "Escolha o Ano Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7811,7 +7868,6 @@ msgstr "Gestão Financeira e Contábil"
 #: 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
@@ -7824,6 +7880,19 @@ msgstr "Gestão Financeira e Contábil"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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"
@@ -7918,14 +7987,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Moeda da empresa"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Plano de Conta"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7991,7 +8052,7 @@ msgid "Account Types"
 msgstr "Tipos de Conta"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "Não é possível criar um movimento de fatura no diário centralizado"
@@ -8041,8 +8102,13 @@ msgstr "Diário de Devolução"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr "Filtrar Por"
 
@@ -8084,7 +8150,7 @@ msgid "Payment Term Line"
 msgstr "Linha da forma de pagamento"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -8256,8 +8322,8 @@ msgstr ""
 "O valor do recibo deve ser o mesmo valor da linha equivalente no extrato"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Conta inválida!"
@@ -8268,7 +8334,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:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "O movimento de conta (%s) para centralização foi confirmado!"
@@ -8489,14 +8555,14 @@ msgid "Period from"
 msgstr "Período de"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diário de Devolução de Vendas"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8547,7 +8613,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposto de Compra(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor, crie algumas linhas da fatura."
@@ -8563,7 +8629,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Configure sua Aplicação Contábil"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8606,18 +8672,22 @@ msgstr "Gestão de Acompanhamentos"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr "Período Inicial"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Impossível localizar o código da conta pai para o modelo de conta!"
@@ -8654,7 +8724,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr "O Contador valida os lançamentos contábeis vindos da fatura. "
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8684,7 +8754,7 @@ msgid "You can not create move line on view account."
 msgstr "Você não pode criar linhas de movimento em uma conta de exibição."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "A moeda atual não está configurada corretamente !"
@@ -8736,8 +8806,12 @@ msgstr "Manter vazio para usar a conta de receita"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8756,7 +8830,15 @@ msgstr "Entrada manual ou automática no sistema"
 
 #. 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 Conta"
 
@@ -8883,7 +8965,6 @@ msgstr "Lançamento manual"
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8891,7 +8972,7 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8972,7 +9053,7 @@ msgstr "Julho"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plano de contas"
 
 #. module: account
@@ -8989,13 +9070,17 @@ msgstr "Balanço de Conta Analítica"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr "Finalizar Período"
 
@@ -9015,7 +9100,7 @@ msgstr "Finalizar Período"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Plano de conta"
 
 #. module: account
@@ -9034,7 +9119,7 @@ msgid "Account Subscription"
 msgstr "Inscriçãoda conta"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -9063,7 +9148,6 @@ msgstr "Inscrição de Lançamento"
 #: 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
@@ -9092,7 +9176,7 @@ msgid "Unreconciled"
 msgstr "Não conciliado"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Total inválido!"
@@ -9150,13 +9234,13 @@ msgid "Active"
 msgstr "Ativo"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr "Erro Desconhecido"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9208,6 +9292,7 @@ msgstr "Validar Movimento de Conta"
 #: report:account.journal.period.print: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
@@ -9290,6 +9375,18 @@ msgstr "Geral"
 #: selection:account.pl.report,filter: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
@@ -9457,6 +9554,7 @@ msgstr "Selecione o período"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Postado"
 
@@ -9475,7 +9573,6 @@ msgstr "Postado"
 #: 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
@@ -9508,13 +9605,10 @@ msgid "Tax Source"
 msgstr "Origem da taxa"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Lucro Líquido"
 
@@ -9529,7 +9623,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Este é um modelo para lançamentos recorrentes de contabilização"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: 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)"
@@ -9538,8 +9632,8 @@ msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9684,8 +9778,8 @@ msgid "End period"
 msgstr "Período final"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9755,6 +9849,7 @@ msgstr "Fatura do fornecedor"
 #: report:account.journal.period.print: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
@@ -9791,7 +9886,7 @@ msgid "Recurring"
 msgstr "Recorrente"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Este lançamento já está conciliado"
@@ -9812,7 +9907,7 @@ msgid "Range"
 msgstr "Intervalo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9831,6 +9926,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Com movimentos"
 
@@ -9952,7 +10057,7 @@ msgid "Accounts Mapping"
 msgstr "Mapeando contas"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "A fatura '%s' está aguardando validação."
@@ -9977,7 +10082,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "A conta de receita ou despesa relacionada ao produto selecionado."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr "A data do seu Lançamento de Diário não está no período definido!"
@@ -10184,7 +10289,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "Você deve digitar um período que não seja 0 ou menor !"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Você não pode remover uma conta que contém lançamentos! "
@@ -10217,15 +10322,21 @@ msgstr ""
 "O valor residual de um recebimento ou pagamento em um lançamento de diário "
 "expresso na respectiva moeda (pode ser diferente da moeda da empresa)"
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Mantenha vazio pra usar o período na data de validação"
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #~ msgid "O_k"
 #~ msgstr "O_k"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Erro! voce não pode criar conta recursiva."
-
 #~ msgid "Supplier invoice"
 #~ msgstr "Fatura de fornecedor"
 
@@ -10392,9 +10503,6 @@ msgstr ""
 #~ msgid "Journal/Payment Mode"
 #~ msgstr "Modo Diário/Pagamento"
 
-#~ msgid "Partner name"
-#~ msgstr "Nome do parceiro"
-
 #~ msgid "Unpaid Customer Invoices"
 #~ msgstr "Faturas não pagas de clientes"
 
@@ -10419,9 +10527,8 @@ msgstr ""
 #~ msgid "Modify Invoice"
 #~ msgstr "Modificar fatura"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Você não pode desativar uma conta que contem lançamentos."
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
 
 #~ msgid "Crebit"
 #~ msgstr "Crédito"
@@ -10498,9 +10605,6 @@ msgstr ""
 #~ msgid "Write-Off journal"
 #~ msgstr "Diário de baixas"
 
-#~ msgid "All account entries"
-#~ msgstr "Todas as entradas de contas"
-
 #~ msgid "Date Filter"
 #~ msgstr "Filtrar data"
 
@@ -10627,17 +10731,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Total de lançamentos"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Desconto (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Caso seu pagamento já tenha sido efetuado, favor desconsiderar este "
-#~ "comunicado. Não hesite em contactar nosso departamento financeiro."
-
 #~ msgid "Contra"
 #~ msgstr "Contra"
 
@@ -10653,9 +10746,6 @@ msgstr ""
 #~ msgid "Journal Voucher"
 #~ msgstr "Comprovante diário"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Fatura analitica"
 
@@ -10719,9 +10809,6 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Exibir contas "
 
-#~ msgid "Crédit"
-#~ msgstr "Crédito"
-
 #~ msgid "Income"
 #~ msgstr "Receita"
 
@@ -10773,13 +10860,6 @@ msgstr ""
 #~ msgid "Payment Reconcile"
 #~ msgstr "Conciliar pagamento"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Erro de configuração !"
-
-#~ msgid "Débit"
-#~ msgstr "Débito"
-
 #~ msgid "Date Invoiced"
 #~ msgstr "Data da fatura"
 
@@ -10814,9 +10894,6 @@ msgstr ""
 #~ msgid "Analytic Chart of Accounts"
 #~ msgstr "Plano analítico de contas"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID do parceiro"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nova fatura de cliente"
 
@@ -10835,28 +10912,18 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Documento"
 
-#~ msgid "Move name"
-#~ msgstr "Mover nomes"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Cancelar faturas selecionadas"
 
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Fatura proposta pode ser marcada, validada ou impressa"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "By Date and Period"
 #~ msgstr "Por data e período"
 
 #~ msgid "Financial Management"
 #~ msgstr "Administração financeira"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "A conta nao foi definida para conciliação !"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "Informação adicional"
 
@@ -11050,13 +11117,6 @@ msgstr ""
 #~ msgid "Maximum Quantity"
 #~ msgstr "Quantidade máxima"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "A conta bancária do parceiro a pagar\n"
-#~ "Deixe em branco para usar a padrão"
-
 #~ msgid "Error ! The duration of the Fiscal Year is invalid. "
 #~ msgstr "Erro ! A duração do ano fiscal é inválida. "
 
@@ -11257,10 +11317,6 @@ msgstr ""
 #~ "Selecione para marcar a linha de lançamento como litígio com o parceiro "
 #~ "relacionado"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "O ano fiscal antigo não tem qualquer entrada para reconciliar !"
-
 #~ msgid "Entry Model Line"
 #~ msgstr "Linha Modelo de lançamento"
 
@@ -11328,15 +11384,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Lançamentos codificados por movimento"
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Se você usa formas de pagamento, o vencimento será calculado automaticamente "
-#~ "ao gerar os lançamentos contábeis. Se você deixar em branco a forma de "
-#~ "pagamento e o vencimento, significa pagamento à vista."
-
 #~ msgid "General Ledger -"
 #~ msgstr "Livro Razão -"
 
@@ -11379,9 +11426,6 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "O saldo do demonstrativo está incorreto\n"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Saldo transferido de para"
-
 #~ msgid ""
 #~ "Check this box if you want to print all entries when printing the General "
 #~ "Ledger, otherwise it will only print its balance."
@@ -11462,10 +11506,6 @@ msgstr ""
 #~ msgid "The sequence used for invoice numbers in this journal."
 #~ msgstr "A sequência utilizada para numeração das faturas neste diário."
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Você não pode validar um lançamento sem saldo !"
-
 #~ msgid "x Expenses Credit Notes Journal"
 #~ msgstr "x Diário de Notas de Crédito gastas"
 
@@ -11608,178 +11648,8 @@ msgstr ""
 #~ msgid "Statement encoding produces payment entries"
 #~ msgstr "Codificação de demonstrativos para lançamentos de pagamento"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Período de Baixa ou Exclusão"
-
-#~ msgid "My indicators"
-#~ msgstr "Meus indicadores"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Faturas provisórias"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Custos a faturar"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Recebíveis vencidos"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Mostrar comparação em %"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Mostrar relatório em formato de paisagem"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Você tem que selecionar a opção 'Paisagem'. Por favor marque-a."
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Selecione conta de referência (para comparação de %)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Selecione Ano(s) Fiscal(is) (máximo três anos)"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Não Comparar"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Você selecionou mais de 3 anos em qualquer caso."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Comparação de Contas de Contabilidade e gestão financeira,"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Você pode escolher no maximo 3 anos. Por favor tente novamente"
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Você selecionou a opção 'Porcentagem' com mais de 2 anos, mas não "
-#~ "escolheu o formato paisagem."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Você pode ter cometido os enganos a seguir. Por favor, corrija-os e tente "
-#~ "novamente."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Mantenha vazia para a comparação com sua matriz"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Mostrar Contas"
-
-#~ msgid "Creation Date"
-#~ msgstr "Data de criação"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Você não selecionou a Opção 'Porcentagem', mas você selecionou mais de 2 "
-#~ "anos."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Você tem que escolher pelo menos 1 ano fiscal. Tente novamente."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Você pode ter selecionado a opção de comparar com mais de 1 ano de colunas "
-#~ "crédito/débito e opção %. Isso pode gerar a impressão fora do papel. Por "
-#~ "favor tente novamente."
-
-#~ msgid "Customize Report"
-#~ msgstr "Personalizar relatório"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Um módulo que adiciona novos relatórios com base no módulo de conta."
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Contas a serem faturadas"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Painel de Contabilização"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Exibir Informações de Débito/Crédito"
-
-#~ msgid "Financial Period"
-#~ msgstr "Período Financeiro"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Relatório de Contas"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "O Módulo de Saldo da Conta é uma funcionalidade adicional ao Módulo de "
-#~ "Gestão Financeira.\n"
-#~ "\n"
-#~ "    Este módulo oferece diversas opções para impressão.\n"
-#~ "\n"
-#~ "    1. Você pode comparar o balanço de diferentes anos.\n"
-#~ "\n"
-#~ "    2. Você pode configurar uma comparação por dinheiro ou percentual para "
-#~ "comparação entre dois anos.\n"
-#~ "\n"
-#~ "    3. Você pode configurar a conta de referência para a comparação "
-#~ "percentual para os anos específicos.\n"
-#~ "\n"
-#~ "    4. Você pode selecionar períodos como data atual ou períodos por data de "
-#~ "criação.\n"
-#~ "\n"
-#~ "    5. Você tem a opção de imprimir o relatório desejado em formato "
-#~ "paisagem.\n"
-#~ "    "
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Balanço de Contas - Comparação Anual"
-
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Contas analíticas em aberto"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Lançamentos escolhidos com base em"
-
-#~ msgid "Notification"
-#~ msgstr "Alerta"
-
-#~ msgid "All accounts"
-#~ msgstr "Todas as contas"
-
-#~ msgid "Aged income"
-#~ msgstr "Receita vencida"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Comparar os Anos Escolhidos em Termos de"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Selecione o(s) Período(s)"
-
-#~ msgid "supplier"
-#~ msgstr "fornecedor"
-
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Diário de Notas de Crédito de despesas"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Plano de Conta"
 
 #, python-format
 #~ msgid "Invoice "
@@ -11789,6 +11659,9 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "está validada."
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Planilha de Balanço (Ativos)"
+
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "A data não está em um ano fiscal definido"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 8a1a09a7b39..f1e5208f243 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/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: 2011-04-29 05:09+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -498,8 +498,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1141,6 +1139,7 @@ msgstr "# tranzacţiei"
 
 #. 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
@@ -1329,6 +1328,16 @@ msgstr "Nu se poate folosi acest cont general în acest jurnal !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Cu sold diferit de zero"
 
@@ -2036,7 +2045,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2100,6 +2109,8 @@ msgstr "Proprietăţi contabilitate"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Înregistrări sortate după"
 
@@ -2121,11 +2132,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2449,6 +2465,7 @@ msgstr "Disc.(%)"
 
 #. 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
@@ -2694,6 +2711,8 @@ msgstr "Contabilitate financiară"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2969,7 +2988,6 @@ msgstr "Lasaţi necompletat dacă doriţi folosirea contului de cheltuieli"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2983,6 +3001,17 @@ msgstr "Lasaţi necompletat dacă doriţi folosirea contului de cheltuieli"
 #: 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 "Jurnale"
 
@@ -3192,6 +3221,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3250,6 +3280,16 @@ msgstr "TVA :"
 #: 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.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 "Chart of Accounts"
 msgstr "Plan de conturi"
 
@@ -3694,11 +3734,10 @@ msgid "Analytic Balance"
 msgstr "Balanţă analitică"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4375,7 +4414,7 @@ msgstr "Poziții jurnal"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4517,7 +4556,6 @@ msgid "Analytic Balance -"
 msgstr "Sold analitic -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4530,10 +4568,8 @@ msgstr "Sold analitic -"
 #: 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.journal.period.print: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
@@ -4543,6 +4579,16 @@ msgstr "Sold analitic -"
 #: 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
 msgid "Target Moves"
 msgstr "Miscări ţintă"
 
@@ -4659,6 +4705,8 @@ msgstr "Resultatul reconcilierii"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5377,6 +5425,19 @@ msgstr ""
 
 #. 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 "Fără filtre"
@@ -6290,6 +6351,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6521,7 +6583,7 @@ msgstr "Linii analitice"
 #: 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 "
+"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) "
@@ -7203,6 +7265,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7457,6 +7520,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Perioadă"
@@ -7541,14 +7617,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Moneda companiei"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7660,6 +7728,12 @@ msgstr "Jurnal restituiri"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7899,6 +7973,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8182,12 +8257,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8305,7 +8385,12 @@ msgstr "Păstraţi necompletat pentru a utiliza contul de venituri."
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8324,6 +8409,15 @@ 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 ""
 
@@ -8525,7 +8619,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan de conturi"
 
 #. module: account
@@ -8542,12 +8636,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8567,7 +8666,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8751,6 +8850,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8832,6 +8932,18 @@ msgstr "General"
 #: selection:account.pl.report,filter: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
@@ -9041,13 +9153,10 @@ msgid "Tax Source"
 msgstr "Sursa taxă"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9071,8 +9180,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JRNL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9279,6 +9388,7 @@ msgstr "Factură furnizor"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9356,6 +9466,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Cu mişcări"
 
@@ -9725,6 +9845,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "OK"
 #~ msgstr "OK"
 
@@ -9791,9 +9923,6 @@ msgstr ""
 #~ msgid "Contact"
 #~ msgstr "Contact"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Partner account"
 #~ msgstr "Cont partener"
 
@@ -9823,9 +9952,6 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Soldul final este incorect !\n"
 
-#~ msgid "Crédit"
-#~ msgstr "Credit"
-
 #~ msgid "Income"
 #~ msgstr "Venit"
 
@@ -9853,13 +9979,6 @@ msgstr ""
 #~ msgid "Account Manager"
 #~ msgstr "Manager financiar contabil"
 
-#~ msgid "Débit"
-#~ msgstr "Debit"
-
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Eroare de configurare !"
-
 #~ msgid "Create a Fiscal Year"
 #~ msgstr "Creare an fiscal"
 
@@ -9887,9 +10006,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Start"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID partener"
-
 #~ msgid "Open State"
 #~ msgstr "Stare deschis"
 
@@ -9905,9 +10021,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Document"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Financial Management"
 #~ msgstr "Management financiar"
 
@@ -9917,9 +10030,6 @@ msgstr ""
 #~ msgid "Journal code"
 #~ msgstr "Cod jurnal"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Perioada pentru ajustare"
-
 #~ msgid "3 Months"
 #~ msgstr "3 luni"
 
@@ -9932,9 +10042,6 @@ msgstr ""
 #~ msgid "The currency of the journal"
 #~ msgstr "Moneda jurnalului"
 
-#~ msgid "Partner name"
-#~ msgstr "Nume partener"
-
 #~ msgid "Date Start"
 #~ msgstr "Data de început"
 
@@ -10084,18 +10191,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Total înregistrări"
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "În cazul în care plata dumneavoastră a fost efectuată după trimiterea "
-#~ "acestui e-mail, vă rog să îl consideraţi nul. Nu ezitaţi să contactaţi "
-#~ "serviciul nostru de contabilitate la +32 81 81 37 00"
-
-#~ msgid "Disc. (%)"
-#~ msgstr "Disc. (%)"
-
 #~ msgid "Contra"
 #~ msgstr "Contra"
 
@@ -10114,9 +10209,6 @@ msgstr ""
 #~ msgid "Printing Date"
 #~ msgstr "Data tipăririi"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Eroare! Nu puteţi crea conturi recursive."
-
 #~ msgid "Fiscal Position Accounts Mapping"
 #~ msgstr "Corespondenţa conturilor de poziţie fiscală"
 
@@ -10194,10 +10286,6 @@ msgstr ""
 #~ msgid "Standard entry"
 #~ msgstr "Înregistrare standard"
 
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "Nu puteţi valida o înregistrare neechilibrată !"
-
 #~ msgid "New Analytic Account"
 #~ msgstr "Cont analitic nou"
 
@@ -10243,13 +10331,6 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Afişează conturile "
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Contul bancar al partenerului\n"
-#~ "Lăsaţi necompletat pentru a fi folosit contul implicit"
-
 #~ msgid "Print General Journal"
 #~ msgstr "Tipăreşte jurnalul general"
 
@@ -10404,10 +10485,6 @@ msgstr ""
 #~ "Nu este definită nici o perioadă pentru această dată !\n"
 #~ "Creaţi vă rog un an fiscal."
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr ""
-#~ "Pastrati necompletat pentru a utiliza perioada aferentă datei validării."
-
 #~ msgid "Automatic reconciliation"
 #~ msgstr "Compensare automată"
 
@@ -10491,9 +10568,6 @@ msgstr ""
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Până la (data trebuie stabilită între %s şi %s)"
 
-#~ msgid "Move name"
-#~ msgstr "Denumire mişcare"
-
 #~ msgid "Reconcilate the entries from payment"
 #~ msgstr "Compensaţi înregistrările din plăţi"
 
@@ -10516,10 +10590,6 @@ msgstr ""
 #~ msgid "Close Fiscal Year with new entries"
 #~ msgstr "Închide an fiscal cu noile intrări"
 
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Definiţia contului nu permite compensare !"
-
 #~ msgid "Statement encoding produces payment entries"
 #~ msgstr "Codarea situaţiei generează înregistrări de plăţi"
 
@@ -10554,9 +10624,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Impune ca toate mişcările acestui cont să aibă această monedă secundară."
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Balanţă înaintată"
-
 #~ msgid "Entry Model"
 #~ msgstr "Model înregistrare"
 
@@ -10591,10 +10658,6 @@ msgstr ""
 #~ msgid "Fiscal Position Template Tax Mapping"
 #~ msgstr "Corespondenţa taxelor pentru şablonul poziţiei fiscale"
 
-#, python-format
-#~ msgid "The old fiscal year does not have any entry to reconcile!"
-#~ msgstr "Anul fiscal precedent nu are înregistrări de compensat !"
-
 #, python-format
 #~ msgid "The journal must have centralised counterpart"
 #~ msgstr "Jurnalul trebuie să aibă un corespondent centralizat"
@@ -10773,10 +10836,6 @@ msgstr ""
 #~ msgid "Modify Invoice"
 #~ msgstr "Modificare factură"
 
-#, python-format
-#~ msgid "You can not deactivate an account that contains account moves."
-#~ msgstr "Nu puteţi dezactiva un cont care are mişcări."
-
 #~ msgid "Filter on Partners"
 #~ msgstr "Filtru după partener"
 
@@ -10900,9 +10959,6 @@ msgstr ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 #~ msgstr "Liniile selectate nu au mişcări de cont în ciornă înregistrate"
 
-#~ msgid "All account entries"
-#~ msgstr "Toate înregistrările contabile"
-
 #~ msgid "Accounting entries at statement's confirmation"
 #~ msgstr "Înregistrări contabile la confirmarea înregistrării din bancă"
 
@@ -11003,15 +11059,6 @@ msgstr ""
 #~ msgid "Name of the fiscal year as displayed on screens."
 #~ msgstr "Denumirea afişată pentru anul fiscal"
 
-#~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
-#~ msgstr ""
-#~ "Dacă utilizaţi termene de plată, data scandentă va fi calculată automat la "
-#~ "generarea înregistrărilor contabile. Dacă păstraţi termenul de plată şi data "
-#~ "scadentă necompletate, atunci plata este directă."
-
 #~ 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."
@@ -11126,186 +11173,9 @@ msgstr ""
 #~ msgid "asgfas"
 #~ msgstr "asgfas"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Conturi analitice de închis"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Facturi în ciornă"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Conturi de facturat"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Costuri de facturat"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Creanţe încasare învechite"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Panou pentru contabil"
-
-#~ msgid "My indicators"
-#~ msgstr "Indicatorii mei"
-
-#~ msgid "Aged income"
-#~ msgstr "Venit învechit"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Afişare informaţii debit/credit"
-
-#~ msgid "All accounts"
-#~ msgstr "Toate conturile"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Selectare înregistrări după"
-
-#~ msgid "Notification"
-#~ msgstr "Notificare"
-
-#~ msgid "Financial Period"
-#~ msgstr "Perioadă financiară"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Selectare perioadă(e)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Comparare ani selectaţi după"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Selectare an(i) fiscal(i) (maxim trei ani)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Selectare cont referinţă (pentru comparare %)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Sold conturi - compară ani"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Modulul Sold cont este o funcţionalitate adăugată la modulul Management "
-#~ "financiar.\n"
-#~ "\n"
-#~ "    Acest modul vă oferă opţiuni variate pentru tipărirea extraselor de "
-#~ "cont\n"
-#~ "\n"
-#~ "    1. Puteţi compara extrasele pentru diferiţi ani\n"
-#~ "\n"
-#~ "    2. Puteţi opta pentru comparare monetară sau procentuală între doi ani\n"
-#~ "\n"
-#~ "    3. Puteţi alege un cont de referinţă pentru comparare procentuală faţă "
-#~ "de un anumit an\n"
-#~ "\n"
-#~ "    4. Puteţi selecta perioade după data actuală sau după data creării\n"
-#~ "\n"
-#~ "    5. Aveţi opţiunea de a tipări rapoartele dorite în format vedere.\n"
-#~ "    "
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr ""
-#~ "Trebuie să selectaţi opţiunea 'landscape' (vedere). Verificaţi, vă rog."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Afişează raportul în format vedere"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Afişează comparaţia în %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Nu compara"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Afişează conturi"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Aţi selectat mai mult de 3 ani."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Management financiar contabil - Comparare conturi"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Puteţi selecta maxim 3 ani. Reîncercaţi."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Aţi selectat opţiunea 'Procentaj' pe mai mult de 2 ani, dar nu aţi ales "
-#~ "formatul vedere."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Poate aţi făcut vreuna din următoarele greşeli. Corectaţi şi reîncercaţi."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Lasaţi necompletat pentru comparare cu contul părinte"
-
-#~ msgid "Creation Date"
-#~ msgstr "Data creării"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Nu aţi selectat opţiunea 'procentaj', dar aţi selectat mai mult de 2 ani."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "S-ar putea să fi selectat opţiunile de comparare cu mai mult de 1 an, cu "
-#~ "coloanele debit/credit şi opţiunea %. Toate acestea ar putea genera un "
-#~ "raport ce nu se încadrează în pagină. Reîncercaţi."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Trebuie să selectaţi cel puţin 1 an fiscal. Reîncercaţi."
-
-#~ msgid "Customize Report"
-#~ msgstr "Raport personalizat"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Raportare contabilitate - Raportare"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr ""
-#~ "Un modul care adauga rapoarte noi bazate pe modulul de contabilitate."
-
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Corespondență fiscală taxe"
-
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "ȘCorespondență fiscală"
-
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "ȘCorespondență fiscală"
-
-#~ msgid "supplier"
-#~ msgstr "furnizor"
+#~ msgid "JNRL"
+#~ msgstr "JRNL"
 
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "Eroare necunoscută"
-
-#~ msgid "End of Year"
-#~ msgstr "Sfîrșitul anului"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 16b60927980..a8a40280642 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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-06-27 05:16+0000\n"
-"Last-Translator: Andrew Yashchuk <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12: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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Не определен журнал конца года для финансового года"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +67,7 @@ msgid "Residual"
 msgstr "Остаток"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Пожалуйста, определите нумерацию в журнале счетов"
@@ -136,7 +136,7 @@ msgid "Accounting Entries-"
 msgstr "Бухгалтерские проводки-"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Нельзя удалить проведенную операцию: \"%s\"!"
@@ -182,7 +182,7 @@ msgstr ""
 "не удаляя его."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -236,7 +236,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -269,7 +269,7 @@ msgstr ""
 "налога появился в счетах-фактурах"
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Счет '%s' оплачивается частично: %s%s из %s%s (%s%s остаток)"
@@ -285,7 +285,7 @@ msgid "Belgian Reports"
 msgstr "Бельгийские отчеты"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "В не можете добавить/исправить проводки в закрытом журнале"
@@ -323,7 +323,7 @@ msgid "St."
 msgstr "ул."
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -511,8 +511,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -578,7 +576,7 @@ msgid "Not reconciled transactions"
 msgstr "Не сверенные транзакции"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Баланс кассы не совпадает с рассчитанным балансом !"
@@ -662,7 +660,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -695,8 +693,8 @@ msgid "Journal Period"
 msgstr "Период журнала"
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -758,7 +756,7 @@ msgid "Analytic Entries by line"
 msgstr "Аналитические проводки по строкам"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Вы можете изменить валюту только в черновике счета !"
@@ -861,7 +859,7 @@ msgid "Next Partner to reconcile"
 msgstr "Следующий контрагент для сверки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -985,11 +983,11 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1070,6 +1068,7 @@ 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 "-"
@@ -1168,7 +1167,7 @@ msgid "Entry Label"
 msgstr "Метка проводки"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Вы не можете изменить/удалить журнал с записями за этот период !"
@@ -1306,6 +1305,7 @@ msgid "Journal Items Analysis"
 msgstr "Анализ элементов журнала"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Контрагенты"
@@ -1335,7 +1335,7 @@ msgid "Central Journal"
 msgstr "Центральный журнал"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Вы не можете использовать этот общий счет в этом журнале!"
@@ -1347,6 +1347,16 @@ msgstr "Вы не можете использовать этот общий сч
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "С балансом не равным 0"
 
@@ -1433,7 +1443,7 @@ msgstr ""
 "Пример: 2 процента через 14 дней, остаток через 30 дней после конца месяца."
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1601,6 +1611,7 @@ msgid "Separated Journal Sequences"
 msgstr "Раздельные нумерации журнала"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Ответственный"
@@ -1672,7 +1683,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Ошибка! Вы не можете определить перекрывающиеся отчетные года"
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "Счет не определен для сверки !"
@@ -1707,7 +1718,7 @@ msgid "Receivables & Payables"
 msgstr "Дебиторы и кредиторы"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "Вы должны указать счет для проводки списания!"
@@ -1743,7 +1754,7 @@ msgid "Customer Ref:"
 msgstr "Ссылка на клиента:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Пользователь %s не имеет прав доступа к журналу %s !"
@@ -1764,7 +1775,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "Вы не можете отключить счет, по которому есть операции."
@@ -1780,7 +1791,7 @@ msgid "You can not create move line on closed account."
 msgstr "Нельзя сделать операцию по закрытому счету."
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2064,7 +2075,7 @@ msgid " Journal"
 msgstr " журнал"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2091,7 +2102,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Искать шаблоны планов счетов"
 
 #. module: account
@@ -2125,7 +2136,7 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2145,7 +2156,7 @@ msgid "Income Account"
 msgstr "Cчёт доходов и расходов"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Не определен журнал покупок / продаж."
@@ -2156,9 +2167,10 @@ msgid "Accounting Properties"
 msgstr "Установки бухгалтерии"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Проводки отсортированы по"
 
@@ -2180,12 +2192,16 @@ msgstr "Шаблон продукта"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2295,7 +2311,7 @@ msgid "Account Tax Code"
 msgstr "Код налогового счёта"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2369,7 +2385,7 @@ msgid "Account Model Entries"
 msgstr "Проводки модели счета"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2445,7 +2461,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
@@ -2459,7 +2475,7 @@ msgid "Accounts"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "Ошибка конфигурации!"
@@ -2471,12 +2487,13 @@ msgid "Average Price"
 msgstr "Средняя цена"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Дата:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2629,16 +2646,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Этот мастер создаст повторяющиеся бухгалтерские проводки"
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Нумерация в журнале не определена !"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2772,6 +2789,8 @@ 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
 msgid "Profit And Loss"
 msgstr "Прибыль и убыток"
 
@@ -2806,7 +2825,7 @@ msgid "Analytic Entries"
 msgstr "Проводки аналитического учета"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2938,7 +2957,7 @@ msgid "BNK%s"
 msgstr "БНК%s"
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3049,9 +3068,7 @@ msgstr "Оставьте пустым для использования счет
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3065,6 +3082,17 @@ msgstr "Оставьте пустым для использования счет
 #: 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 "Журналы"
 
@@ -3110,7 +3138,7 @@ msgid "Starting Balance"
 msgstr "Начальный баланс"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Партнер не определен!"
@@ -3153,6 +3181,7 @@ msgstr "Журнал:"
 #: 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
@@ -3206,7 +3235,7 @@ msgstr ""
 "больше не сможете изменять их бухгалтерские поля."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Нельзя удалить открытый или оплаченный счет !"
@@ -3269,7 +3298,7 @@ msgstr ""
 "состоянии \"Отменено\" или \"Сделано\" !"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3338,6 +3367,16 @@ msgstr "НДС:"
 #: 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.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 "Chart of Accounts"
 msgstr "План счетов"
 
@@ -3385,7 +3424,6 @@ 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
 #: view:account.move:0
@@ -3429,7 +3467,7 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон плана счетов"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3440,13 +3478,13 @@ msgstr ""
 "условии оплаты контрагента."
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Некоторые записи уже сверены!"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3571,7 +3609,7 @@ msgid "Analytic Items"
 msgstr "Элементы аналитики"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Невозможно изменить налог !"
@@ -3582,14 +3620,14 @@ msgid "#Entries"
 msgstr "#Проводок"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "Вы выбрали единицу измерения не совместимую с ТМЦ."
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3791,11 +3829,10 @@ msgid "Analytic Balance"
 msgstr "Аналитический баланс"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Чистый убыток"
 
@@ -3893,7 +3930,7 @@ msgid "Acc.Type"
 msgstr "Тип счета"
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3957,7 +3994,7 @@ msgstr ""
 "\"Проведено\"."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: 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)"
@@ -4134,7 +4171,7 @@ msgid "Credit Notes"
 msgstr "Кредит-ноты"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4207,11 +4244,11 @@ msgid "Change"
 msgstr "Изменить"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4317,7 +4354,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "Вы должны определить журнал аналитики типа '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4387,7 +4424,7 @@ msgid "Invoices"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4422,7 +4459,7 @@ msgstr "Нет"
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "Налоговая база налоговой декларации"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4492,7 +4529,7 @@ msgstr "Элементы журнала"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Баланс (счета активов)"
 
 #. module: account
@@ -4501,24 +4538,25 @@ msgid "Third Party (Country)"
 msgstr "Третье лицо (Страна)"
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4540,7 +4578,7 @@ msgid "Bank Details"
 msgstr "Банковская информация"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Налоги отсутствуют !"
@@ -4595,7 +4633,7 @@ msgid "Check Date not in the Period"
 msgstr "Дата проверки не входит в период"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4614,10 +4652,10 @@ msgstr "Шаблоны"
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Счета субналогов"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Начало периода должно быть меньше, чем конец периода"
@@ -4633,7 +4671,6 @@ msgid "Analytic Balance -"
 msgstr "Остаток по аналитике"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4646,11 +4683,8 @@ msgstr "Остаток по аналитике"
 #: 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
 #: 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
@@ -4660,6 +4694,16 @@ msgstr "Остаток по аналитике"
 #: 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
 msgid "Target Moves"
 msgstr "Цель операции"
 
@@ -4730,7 +4774,7 @@ msgid "Line 1:"
 msgstr "Строка 1:"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Ошибка целостности!"
@@ -4776,6 +4820,8 @@ msgstr "Результат сверки"
 #: 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
 msgid "Balance Sheet"
 msgstr "Балансовая ведомость"
 
@@ -4879,7 +4925,7 @@ msgstr ""
 "Нельзя сделать действие по дебетовому/кредитовому счету без контрагента"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4953,7 +4999,7 @@ msgstr ""
 "дата=15/01, количество дней=22, день месяца=-1, то срок 28/02."
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -4981,7 +5027,7 @@ msgid "Start of period"
 msgstr "Начало периода"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5039,12 +5085,12 @@ msgstr "Журнал проводок конца года"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5121,7 +5167,7 @@ msgid "Sort By"
 msgstr "Сортировать по"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5180,6 +5226,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 ""
+"Ряд частичных сумм, которые могут быть объединены для нахождения баланса, "
+"могут быть выбраны в процессе автоматической сверки."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5271,7 +5319,7 @@ msgid "Generate Opening Entries"
 msgstr "Генерировать открывающие проводки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Уже сверено !"
@@ -5287,6 +5335,8 @@ msgid ""
 "This module will support the Anglo-Saxons accounting methodology by changing "
 "the accounting logic with stock transactions."
 msgstr ""
+"Этот модуль будет поддерживать англо-саксонский метод бухгалтерского учета "
+"путем изменения логики складских операций."
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5303,11 +5353,11 @@ msgstr "Журналы аналитики"
 #. module: account
 #: field:account.account,child_id:0
 msgid "Child Accounts"
-msgstr "Подчиненный счет"
+msgstr "Субсчета"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -5452,7 +5502,7 @@ msgid "# of Lines"
 msgstr "# строк"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "Новая валюта неправильно настроена !"
@@ -5477,14 +5527,14 @@ msgid "Filter by"
 msgstr "Фильтровать по"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Нельзя использовать неактивный счет !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Проводки не по одному счету и тому же счету или уже сверены! "
@@ -5503,6 +5553,19 @@ msgstr ""
 
 #. 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 "Без Фильтра"
@@ -5519,7 +5582,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "Invalid action !"
@@ -5739,7 +5802,7 @@ msgid "Companies"
 msgstr "Организации"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6018,9 +6081,9 @@ msgid "Optional create"
 msgstr "Создать дополнительно"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
@@ -6172,8 +6235,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Статистика аналитических проводок"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Проводки: "
@@ -6184,7 +6247,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Создать вручную повторяющиеся проводки в выбранном журнале"
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Нельзя создать перемещение между разными организациями"
@@ -6224,7 +6287,7 @@ msgid "Total debit"
 msgstr "Всего по дебету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Проводка \"%s\" не верна !"
@@ -6294,31 +6357,30 @@ msgid "  valuation: percent"
 msgstr "  оценка: процент"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6437,7 +6499,7 @@ msgid "Journal Select"
 msgstr "Выбор журнала"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Текущая валюта неправильно настроена !"
@@ -6458,7 +6520,6 @@ msgstr "Налоги системы налогообложения"
 #: 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 "Главная книга"
@@ -6476,6 +6537,8 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Этот отчет позволяет печатать или создавать PDF оборотно-сальдовой ведомости "
+"позволяющей быстро проверить баланс каждого из ваших счетов в одном отчете"
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6514,7 +6577,7 @@ msgid "Total:"
 msgstr "Всего:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6552,7 +6615,7 @@ msgid "Child Codes"
 msgstr "Субкоды"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6617,6 +6680,8 @@ msgid ""
 "reports, so that you can see positive figures instead of negative ones in "
 "expenses accounts."
 msgstr ""
+"Позволяет вам изменить знак суммы остатка в отчете, таким образом вы будите "
+"видеть положительные суммы вместо отрицательных на счетах расходов."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@@ -6662,6 +6727,10 @@ 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 ""
+"Касса позволяет вам управлять записями наличных денег в соответствующих "
+"журналах. Эта функция обеспечивает простой способ учета движения наличных "
+"денег на ежедневной основе. Вы можете ввести купюры находящиеся в кассе и "
+"затем записывать приход и расход денег."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -6695,7 +6764,7 @@ msgstr "Позиции аналитики"
 #: 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 "
+"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) "
@@ -6714,7 +6783,7 @@ msgid "Lines"
 msgstr "Строк"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6755,7 +6824,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
@@ -6890,7 +6959,7 @@ msgstr ""
 "домена."
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Вы должны выбрать периоды принадлежащие одной компании."
@@ -6973,6 +7042,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), Which is calculated from "
 "Profit & Loss Report"
 msgstr ""
+"Этот счет используется для движения по Прибыли/Убытку (если прибыль: сумма "
+"прибавляется, убыток: сумма вычитается). Который вычисляется из отчета по "
+"прибылям и убыткам."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -6996,7 +7068,7 @@ msgid "Sign on Reports"
 msgstr "Знак в отчётах"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "Вы не можете иметь два открытых регистра для одного журнала"
@@ -7025,6 +7097,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
@@ -7056,7 +7129,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
@@ -7080,15 +7152,17 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"Это поле используется для дебетовых и кредитовых записей журнала. Вы можете "
+"определить срок для оплаты этой строки."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Неверный счет !"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7106,7 +7180,7 @@ msgid "Invoice Tax"
 msgstr "Налог по счету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "Нет номера части !"
@@ -7349,17 +7423,17 @@ msgid "Fixed"
 msgstr "Фиксированный"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -7422,7 +7496,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Нельзя %s черновик/проформу/отмененный счет."
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нет позиций в счете !"
@@ -7472,7 +7546,7 @@ msgid "Deferral Method"
 msgstr "Метод отсрочки"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Счет '%s' оплачен."
@@ -7537,7 +7611,7 @@ msgid "Associated Partner"
 msgstr "Связанный контрагент"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Сначала вы должны выбрать партнера !"
@@ -7602,7 +7676,7 @@ msgid "Choose Fiscal Year"
 msgstr "Закрыть отчетный год"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7639,7 +7713,6 @@ msgstr "Бухучет и управление финансами"
 #: 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
@@ -7652,6 +7725,19 @@ msgstr "Бухучет и управление финансами"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Период"
@@ -7735,14 +7821,6 @@ msgstr "Тел. :"
 msgid "Company Currency"
 msgstr "Валюта организации"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "План счетов"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7756,6 +7834,9 @@ msgid ""
 "added, Loss: Amount will be duducted), which is calculated from Profilt & "
 "Loss Report"
 msgstr ""
+"Этот счет используется для движения по Прибыли/Убытку (если прибыль: сумма "
+"прибавляется, убыток: сумма вычитается). Который вычисляется из отчета по "
+"прибылям и убыткам."
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -7805,7 +7886,7 @@ msgid "Account Types"
 msgstr "Типы счетов"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7855,8 +7936,13 @@ msgstr "Журнал возвратов"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr "Фильтровать по"
 
@@ -7898,7 +7984,7 @@ msgid "Payment Term Line"
 msgstr "Позиция условий оплаты"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -7917,7 +8003,7 @@ msgstr "Подитог"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Печать налоговой декларации"
 
 #. module: account
 #: view:account.model.line:0
@@ -7963,6 +8049,7 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"Остаток по дебету или кредиту записи журнала выражен в валюте организации."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -8004,7 +8091,7 @@ msgstr "Сумма по дебету"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "Казна"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -8067,8 +8154,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Плохой счет!"
@@ -8079,7 +8166,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Оставьте пустым для всех открытых финансовых лет"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8206,6 +8293,9 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
+"Этот счет используется для движения по Прибыли/Убытку (если прибыль: сумма "
+"прибавляется, убыток: сумма вычитается). Который вычисляется из отчета по "
+"прибылям и убыткам."
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -8224,6 +8314,8 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Устанавливается, если расчет налога основан на вычислении субналогов, а не "
+"от общей суммы."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -8275,14 +8367,14 @@ msgid "Period from"
 msgstr "Период с"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Журнал возврата продаж"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8331,7 +8423,7 @@ msgid "Purchase Tax(%)"
 msgstr "Налог на покупку(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Пожалуйста, создайте позиции счета"
@@ -8347,7 +8439,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Настройка модуля бухучета"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8384,18 +8476,22 @@ msgstr "Управление напоминаниями"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr "Начало периода"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Не удается найти родительский код для шаблона счета!"
@@ -8432,7 +8528,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr "Бухгалтер утверждает проводки созданные по счет-фактуре. "
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8462,7 +8558,7 @@ msgid "You can not create move line on view account."
 msgstr "Нельзя создать операцию по счету с типом Вид."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Текущая валюта неправильно настроена !"
@@ -8510,8 +8606,12 @@ msgstr "Оставьте пустым для использования дохо
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8530,7 +8630,15 @@ 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 "Вывод счета"
 
@@ -8555,6 +8663,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
+"Отчет анализ по контрагентам . Это PDF отчет содержащий одну строку по "
+"контрагенту представляющую совокупный остаток кредита."
 
 #. module: account
 #: selection:account.account,type:0
@@ -8645,7 +8755,6 @@ msgstr "Проводка вручную"
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8653,7 +8762,7 @@ msgid "Move"
 msgstr "Операция"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8732,7 +8841,7 @@ msgstr "Июль"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "План счетов"
 
 #. module: account
@@ -8749,13 +8858,17 @@ msgstr "Аналитический баланс"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr "Конец периода"
 
@@ -8775,7 +8888,7 @@ msgstr "Конец периода"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "План счетов"
 
 #. module: account
@@ -8794,12 +8907,14 @@ msgid "Account Subscription"
 msgstr "Счет подписки"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
 "Click on compute to update tax base"
 msgstr ""
+"Налоговая база отличается!\n"
+"Вычислите новую базу налогообложения"
 
 #. module: account
 #: view:account.subscription:0
@@ -8821,7 +8936,6 @@ msgstr "Проводка подписки"
 #: 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
@@ -8850,7 +8964,7 @@ msgid "Unreconciled"
 msgstr "Не сверенные"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Плохой итог !"
@@ -8908,13 +9022,13 @@ msgid "Active"
 msgstr "Активен"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -8931,6 +9045,8 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
+"Этот счет будет использоваться, вместо счета по умолчанию, как кредитовый "
+"для текущего контрагента"
 
 #. module: account
 #: field:account.period,special:0
@@ -8964,6 +9080,7 @@ msgstr "Утвердить операцию по счету"
 #: report:account.journal.period.print: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
@@ -9044,6 +9161,18 @@ msgstr "Общий"
 #: selection:account.pl.report,filter: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
@@ -9063,7 +9192,7 @@ msgstr "Курс валюты"
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For Value percent enter % ratio between 0-1."
-msgstr ""
+msgstr "В качестве значения процента введите коэффициент от 0 до 1."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9207,6 +9336,7 @@ msgstr "Выберите период"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Проведено"
 
@@ -9225,7 +9355,6 @@ msgstr "Проведено"
 #: 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
@@ -9258,13 +9387,10 @@ msgid "Tax Source"
 msgstr "База налога"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Чистая прибыль"
 
@@ -9279,7 +9405,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Это модель для повторяющихся проводок"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: 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)"
@@ -9288,8 +9414,8 @@ msgstr "Не определен счет доходов для ТМЦ: \"%s\" (i
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr ""
+msgid "JRNL"
+msgstr "ЖРНЛ"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9376,6 +9502,8 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"Эта цифра показывает общее количество контрагентов которые сегодня прошли "
+"через процесс сверки. Текущий контрагент считается уже обработанным."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9390,7 +9518,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr "Балансовый отчет"
+msgstr "Оборотно-сальдовая ведомость"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9431,8 +9559,8 @@ msgid "End period"
 msgstr "Конец периода"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9504,6 +9632,7 @@ msgstr "Счет поставщика"
 #: report:account.journal.period.print: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
@@ -9537,7 +9666,7 @@ msgid "Recurring"
 msgstr "Повторение"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Проводка уже сверена"
@@ -9558,7 +9687,7 @@ msgid "Range"
 msgstr "Диапазон"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9566,6 +9695,9 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Нельзя создать автонумерацию для этой части !\n"
+"Для автонумерации, определите нумерацию в журнале или создайте её для этой "
+"части вручную."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -9573,6 +9705,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "С движением"
 
@@ -9620,7 +9762,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "Применимость"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -9692,10 +9834,10 @@ msgstr "Выполнение настройки"
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr ""
+msgstr "Отображение счетов"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Счет '%s' ожидает утверждения."
@@ -9717,10 +9859,10 @@ msgstr "account.installer.modules"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr ""
+msgstr "Счет доходов или расходов относящийся к ТМЦ."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr "Дата вашей записи в журнале вне определенного периода!"
@@ -9913,7 +10055,7 @@ msgstr "Шаблон счета финансового отображения"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Счет расходов по шаблону ТМЦ"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -9927,7 +10069,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "Вы должны ввести длину периода больше 0 !"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Нельзя удалить счет по которому есть проводки ! "
@@ -9950,13 +10092,24 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+"Остаток по дебету или кредиту записи журнала выражен в своей валюте (может "
+"отличаться от валюты организации)."
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "Активы"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Обязательства"
 
 #~ msgid "Partner account"
 #~ msgstr "Счет контрагента"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Ошибка! Вы не можете создать счетЮ который ссылается сам на себя."
-
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Неоплаченные счета поставщика"
 
@@ -9975,21 +10128,6 @@ msgstr ""
 #~ msgid "Account Entry Line"
 #~ msgstr "Проводка по счету"
 
-#~ msgid "Aged Trial Balance"
-#~ msgstr "Возрастной пробный баланс"
-
-#~ msgid "Disc. (%)"
-#~ msgstr "Скидка (%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Если ваш платеж был уже проведен, когда данное письмо было отослано, "
-#~ "пожалуйста игнорируйте это сообщение. При необходимости вы можете связаться "
-#~ "с нашей бухгалтерией по телефону +32 81 81 37 00."
-
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Невыплаченные возвраты средств от поставщика"
 
@@ -10162,9 +10300,6 @@ msgstr ""
 #~ msgid "Select Period and Journal for Validation"
 #~ msgstr "Выберите период и журнал для проверки"
 
-#~ msgid "Partner ID"
-#~ msgstr "ID партнера"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Новый счет клиенту"
 
@@ -10207,9 +10342,6 @@ msgstr ""
 #~ msgid "Entry encoding"
 #~ msgstr "Ввод проводки"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Период списания"
-
 #~ msgid "Other"
 #~ msgstr "Прочие"
 
@@ -10306,9 +10438,6 @@ msgstr ""
 #~ msgid "Full Payment"
 #~ msgstr "Полный платеж"
 
-#~ msgid "All account entries"
-#~ msgstr "Все проводки по счету"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Невыплаченные возвраты клиентам"
 
@@ -10581,9 +10710,6 @@ msgstr ""
 #~ msgid "Printing Date"
 #~ msgstr "Дата печати"
 
-#~ msgid "account.move.line"
-#~ msgstr "Строки финансового документа"
-
 #~ msgid "Move Lines"
 #~ msgstr "Строки финансового документа"
 
@@ -10605,13 +10731,6 @@ msgstr ""
 #~ msgid "analytic Invoice"
 #~ msgstr "aналитический счет"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Банковский счет партнера для оплаты\\n\n"
-#~ "Оставьте пустым для использования по умолчанию"
-
 #~ msgid "Message"
 #~ msgstr "Сообщение"
 
@@ -10823,24 +10942,13 @@ msgstr ""
 #~ msgid "Date/Period Filter"
 #~ msgstr "Фильтр даты/периода"
 
-#~ msgid "supplier"
-#~ msgstr "поставщик"
-
-#~ msgid "End of Year"
-#~ msgstr "Конец года"
+#~ msgid "Chart of Accounts"
+#~ msgstr "План счетов"
 
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Счет "
 
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Ошибка: Единицы продажи и единицы измерения должны принадлежать к разным "
-#~ "категориям."
-
-#~ msgid "Default UoM"
-#~ msgstr "Ед. изм. по умолчанию"
-
 #~ msgid "account.analytic.journal"
 #~ msgstr "account.analytic.journal"
 
@@ -10848,6 +10956,9 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "проверен."
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Баланс (счета активов)"
+
 #~ msgid "Accounting Statement"
 #~ msgstr "Бухгалтерская ведомость"
 
@@ -10868,3 +10979,9 @@ msgstr ""
 
 #~ msgid "From statement, create entries"
 #~ msgstr "Создать записи из выписки"
+
+#~ msgid "Aged Trial Balance"
+#~ msgstr "Оборотно-сальдовая ведомость с периодами"
+
+#~ msgid "Balance:"
+#~ msgstr "Баланс:"
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 9bd91fb9a7a..e3032177061 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: 2011-04-29 05:10+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid ""
 #~ "This account will be used to value incoming stock for the current product "
 #~ "category"
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 87eb22412fa..9b8609b71c0 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: 2011-04-29 05:10+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr "Nemôžete použiť tento všeobecný účet v tomto denníku!"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7122,6 +7184,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7374,6 +7437,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7456,14 +7532,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7575,6 +7643,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7812,6 +7886,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8093,12 +8168,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8216,7 +8296,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8235,6 +8320,15 @@ 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 ""
 
@@ -8432,7 +8526,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8449,12 +8543,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8474,7 +8573,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8655,6 +8754,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8736,6 +8836,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8945,13 +9057,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8975,7 +9084,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9183,6 +9292,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9256,6 +9366,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9625,6 +9745,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Aktíva"
 
@@ -9655,20 +9787,5 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Zatvoriť analytické účty"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Návrhy faktúr"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Účty na faktúre"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Náklady na faktúru"
-
-#~ msgid "My indicators"
-#~ msgstr "Moja ukazovatele"
-
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Neuhradené dodávateľské faktúry"
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 8fa17b54fc2..b04c0889716 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/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: 2011-04-29 05:10+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -489,8 +489,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1127,6 +1125,7 @@ msgstr "Številka transakcije"
 
 #. 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
@@ -1314,6 +1313,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "S stanjem različnim od 0"
 
@@ -2017,7 +2026,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2081,6 +2090,8 @@ msgstr "Lastnosti računovodstva"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Vnosi urejeni po"
 
@@ -2102,11 +2113,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2423,6 +2439,7 @@ msgstr "Popust (%)"
 
 #. 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
@@ -2669,6 +2686,8 @@ msgstr "Finačno računovodstvo"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2936,7 +2955,6 @@ msgstr "Pusti prazno v primeru stroškovnega konta"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2950,6 +2968,17 @@ msgstr "Pusti prazno v primeru stroškovnega konta"
 #: 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 "Dnevniki"
 
@@ -3159,6 +3188,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3217,6 +3247,16 @@ msgstr "DDV:"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontni načrti"
 
@@ -3655,11 +3695,10 @@ msgid "Analytic Balance"
 msgstr "Analitično stanje"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4332,7 +4371,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4471,7 +4510,6 @@ msgid "Analytic Balance -"
 msgstr "Analitično stanje -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4484,10 +4522,8 @@ msgstr "Analitično stanje -"
 #: 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.journal.period.print: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
@@ -4497,6 +4533,16 @@ msgstr "Analitično stanje -"
 #: 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
 msgid "Target Moves"
 msgstr "Ciljni premik"
 
@@ -4613,6 +4659,8 @@ msgstr "Izid usklajevanja"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5327,6 +5375,19 @@ msgstr ""
 
 #. 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 "Ni filtra"
@@ -6235,6 +6296,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6464,7 +6526,7 @@ msgstr "Analitične vrstice"
 #: 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 "
+"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) "
@@ -7139,6 +7201,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7391,6 +7454,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Obdobje"
@@ -7473,14 +7549,6 @@ msgstr "Tel.:"
 msgid "Company Currency"
 msgstr "Valute družba"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7592,6 +7660,12 @@ msgstr "Dnevnik vračil"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7830,6 +7904,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8113,12 +8188,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8236,7 +8316,12 @@ msgstr "Pustite prazno v primeru konta prihodkov"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8255,6 +8340,15 @@ 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 ""
 
@@ -8452,7 +8546,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni načrt"
 
 #. module: account
@@ -8469,12 +8563,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8494,7 +8593,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8675,6 +8774,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8756,6 +8856,18 @@ msgstr "Splošno"
 #: selection:account.pl.report,filter: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
@@ -8965,13 +9077,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8995,7 +9104,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9203,6 +9312,7 @@ msgstr "Račun dobavitelja"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9276,6 +9386,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "S premiki"
 
@@ -9645,11 +9765,17 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Pustite prazno v primeru obdobja veljavnosti"
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Napaka! Ni možno ustvariti rekurzivnega konta."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Neplačani računi dobaviteljem"
@@ -9678,9 +9804,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Vknjižbe skupaj"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Pop. (%)"
-
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Neplačani dobropisi dobaviteljev"
 
@@ -9693,9 +9816,6 @@ msgstr ""
 #~ msgid "Account Entry Reconcile"
 #~ msgstr "Uskladi vknjižbo"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Partial Payment"
 #~ msgstr "Delno plačilo"
 
@@ -9855,9 +9975,6 @@ msgstr ""
 #~ msgid "Select Period and Journal for Validation"
 #~ msgstr "Izberi obdobje in dnevnik za preverjanje"
 
-#~ msgid "Partner ID"
-#~ msgstr "Partnerjev ID"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nov izdani račun"
 
@@ -9876,9 +9993,6 @@ msgstr ""
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Storniraj izbrane račune"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Financial Management"
 #~ msgstr "Finance"
 
@@ -9916,9 +10030,6 @@ msgstr ""
 #~ msgid "Entry Name"
 #~ msgstr "Naziv vknjižbe"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Obdobje odpisa"
-
 #~ msgid "Other"
 #~ msgstr "Ostalo"
 
@@ -10035,9 +10146,6 @@ msgstr ""
 #~ msgid "Full Payment"
 #~ msgstr "Plačilo v celoti"
 
-#~ msgid "All account entries"
-#~ msgstr "Vse vknjižbe kontov"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Neplačani izdani dobropisi"
 
@@ -10140,10 +10248,6 @@ msgstr ""
 #~ msgid "Sort by:"
 #~ msgstr "Razvrsti po:"
 
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "Napaka pri konfiguraciji!"
-
 #~ msgid "From analytic accounts, Create invoice."
 #~ msgstr "Izdelava računa na podlagi analitičnih kontov."
 
@@ -10209,9 +10313,6 @@ msgstr ""
 #~ msgid "Invoice Sequence"
 #~ msgstr "Zaporedje računa"
 
-#~ msgid "Débit"
-#~ msgstr "breme"
-
 #~ msgid "Import Invoice"
 #~ msgstr "Uvozi račun"
 
@@ -10242,9 +10343,6 @@ msgstr ""
 #~ msgid "Date/Period Filter"
 #~ msgstr "Filter datum/obdobje"
 
-#~ msgid "Partner name"
-#~ msgstr "Ime stranke"
-
 #~ msgid "General Ledger -"
 #~ msgstr "Glavna knjiga -"
 
@@ -10412,13 +10510,6 @@ msgstr ""
 #~ msgid "Reconciliation of entries from invoice(s) and payment(s)"
 #~ msgstr "Zapiranje računov in plačil"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Partnerjev bančni račun\n"
-#~ "Pustite prazno za privzeti račun"
-
 #~ msgid ""
 #~ "The fiscal position will determine taxes and the accounts used for the the "
 #~ "partner."
@@ -10480,170 +10571,6 @@ msgstr ""
 #~ msgid "Account Manager"
 #~ msgstr "Odgovorni za stranko"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Analitični konti za zapiranje"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Osnutki računov"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Zaračunavanje po kontih"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Zaračunavanje stroškov"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Zastarane terjatve"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Odbor za računovodjo"
-
-#~ msgid "My indicators"
-#~ msgstr "Moji kazalci"
-
-#~ msgid "Aged income"
-#~ msgstr "Zastarani prihodki"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Prikaži oinformacijo breme/dobro"
-
-#~ msgid "All accounts"
-#~ msgstr "Vsi konti"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Izbira vnosov temelji na"
-
-#~ msgid "Notification"
-#~ msgstr "Obvestilo"
-
-#~ msgid "Financial Period"
-#~ msgstr "Finančno obdobje"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Izberi obdobje(a)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Primerjaj izbrana leta po"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Izberite poslovna leta (največ tri)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Izberite referenčni konto (za primerjavo v %)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Stanje konta - primerjaj med leti"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Modul \"Stanje konta\" je dodatek funkcionalnosti modula \"Finančno "
-#~ "upravljanje\".\n"
-#~ "\n"
-#~ "    Ta modul vam nudi različne možnosti za tiskanje bilance stanja.\n"
-#~ "\n"
-#~ "    1. Lahko primerjate bilance stanja za različna leta.\n"
-#~ "\n"
-#~ "    2. Nastavite lahko denarno ali odstotkovno primerjavo med dvema letoma.\n"
-#~ "\n"
-#~ "    3. Lahko nastavite referenčni konto za odstotekovno primerjavo za "
-#~ "posamezna leta.\n"
-#~ "\n"
-#~ "    4. Izberete lahko dobe kot dejanski datum ali obdobja kot datum "
-#~ "nastanka.\n"
-#~ "\n"
-#~ "    5. Imate možnost tiskanja želenega poročila v ležečem formatu.\n"
-#~ "    "
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Izbrati morate možnost \"Ležeče\". Prosim, reverite."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Prikaži poročilo v ležeči obliki"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Prikaži primerjavo v %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Ne primerjaj"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Prikaži konto"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. V vsakem primeru ste izbrali več kot 3 leta."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Računovodstvo in finančno upravljanje - primerjaj konte"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Izberete lahko največ tri leta. Prosim, preverite ponovno."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Izbrali ste možnost \"odstotki\" za več kot dve leti, vendar niste "
-#~ "izbrali ležečega formata."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Naredili ste naslednje napake. Prosim, popravite jih in poskusite znova."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Pustite prazno za primerjavo z nadrejenim."
-
-#~ msgid "Creation Date"
-#~ msgstr "Ustvarjeno dne"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "3. Niste izbrali možnosti \"odstotki\" , vendatr ste izbrali več kot dve "
-#~ "leti."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Najbrž ste izbrali možnost za primerjavo več kot enega leta s kolonami "
-#~ "breme/dobro  in možnostjo %. To lahko privede k temu, da se bo vsebina "
-#~ "izpisala izven papirja. Poskuste znova."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Izbrati morate vsaj eno poslovno leto. Poskusite znova."
-
-#~ msgid "Customize Report"
-#~ msgstr "Prilagodi poročilo"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Modul, ki doda nova poročila na osnovi modula konti."
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Poročanje po kontih - poročanje"
-
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr "Manjka dnevnik zaključnih vpisov za poslovno leto"
-
-#~ msgid "supplier"
-#~ msgstr "dobavitelj"
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index f3bf1eeff15..c29d7bee296 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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -79,7 +79,7 @@ msgstr "Gabim! Kohëzgjatja e periudhës është e pavlefshme "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Valutë të Llogarisë"
 
 #. module: account
 #: view:account.tax:0
@@ -128,7 +128,7 @@ msgstr ""
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr "Hyrjet e kontabilitetit-"
+msgstr "Shënimet e Kontabilitetit"
 
 #. module: account
 #: code:addons/account/account.py:1291
@@ -165,7 +165,7 @@ msgstr "Referenca"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Zgjidhni Vitin Fiskal "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -189,7 +189,7 @@ msgstr "Burimi i Llogarisë"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "Të gjitha hyrjet analitike"
+msgstr "Të Gjitha Shënimet Analitike"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -486,8 +486,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1122,6 +1120,7 @@ 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
@@ -1309,6 +1308,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2012,7 +2021,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2076,6 +2085,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2097,11 +2108,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2423,6 +2439,7 @@ msgstr "Disk.(%)"
 
 #. 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
@@ -2669,6 +2686,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2936,7 +2955,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2950,6 +2968,17 @@ msgstr ""
 #: 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 ""
 
@@ -3159,6 +3188,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3217,6 +3247,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3655,11 +3695,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4332,7 +4371,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4471,7 +4510,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4484,10 +4522,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4497,6 +4533,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr "Lëvizjet e Drejtuara"
 
@@ -4613,6 +4659,8 @@ msgstr "Rezultati i pajtimit"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5325,6 +5373,19 @@ msgstr ""
 
 #. 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 ""
@@ -6233,6 +6294,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6462,7 +6524,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7135,6 +7197,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7387,6 +7450,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7469,14 +7545,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7588,6 +7656,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7825,6 +7899,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8106,12 +8181,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8229,7 +8309,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8248,6 +8333,15 @@ 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 ""
 
@@ -8445,7 +8539,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8462,12 +8556,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8487,7 +8586,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8668,6 +8767,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8749,6 +8849,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8958,13 +9070,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8988,7 +9097,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9196,6 +9305,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9269,6 +9379,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9638,6 +9758,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Faturat e papaguara të Furnizuesit"
 
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index f9b7ce31715..7a5cd3ec30a 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: 2011-04-29 05:10+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -489,8 +489,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1127,6 +1125,7 @@ msgstr "# Broj transakcija"
 
 #. 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
@@ -1314,6 +1313,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Sa saldom različitim od 0"
 
@@ -2021,7 +2030,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2085,6 +2094,8 @@ msgstr "Računovodstveni podaci"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Stavke poredane po"
 
@@ -2106,11 +2117,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2433,6 +2449,7 @@ msgstr "Popust(%)"
 
 #. 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
@@ -2678,6 +2695,8 @@ msgstr "Financijsko računovodstvo"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2950,7 +2969,6 @@ msgstr "Zadrži prazno za korištenje konta troška"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2964,6 +2982,17 @@ msgstr "Zadrži prazno za korištenje konta troška"
 #: 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 "Dnevnici"
 
@@ -3173,6 +3202,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3231,6 +3261,16 @@ msgstr "PDV :"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontni plan"
 
@@ -3674,11 +3714,10 @@ msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4353,7 +4392,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4492,7 +4531,6 @@ msgid "Analytic Balance -"
 msgstr "Analitički saldo -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4505,10 +4543,8 @@ msgstr "Analitički saldo -"
 #: 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.journal.period.print: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
@@ -4518,6 +4554,16 @@ msgstr "Analitički saldo -"
 #: 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
 msgid "Target Moves"
 msgstr "Ciljna knjiženja"
 
@@ -4634,6 +4680,8 @@ msgstr "Rezultat zatvaranja"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5347,6 +5395,19 @@ msgstr ""
 
 #. 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 "Bez filtera"
@@ -6261,6 +6322,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6493,7 +6555,7 @@ msgstr "Redovi analitike"
 #: 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 "
+"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) "
@@ -7174,6 +7236,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7428,6 +7491,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Razdoblje"
@@ -7511,14 +7587,6 @@ msgstr "Tel.:"
 msgid "Company Currency"
 msgstr "Valuta preduzeca"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7630,6 +7698,12 @@ msgstr "Dnevnik povrata"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7869,6 +7943,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8152,12 +8227,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8275,7 +8355,12 @@ msgstr "Ostavite prazno za konto prihoda"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8294,6 +8379,15 @@ 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 ""
 
@@ -8491,7 +8585,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"
 
 #. module: account
@@ -8508,12 +8602,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8533,7 +8632,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8716,6 +8815,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8797,6 +8897,18 @@ msgstr "Opšte"
 #: selection:account.pl.report,filter: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
@@ -9006,13 +9118,10 @@ msgid "Tax Source"
 msgstr "Izvor poreza"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9036,8 +9145,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9244,6 +9353,7 @@ msgstr "Račun dobavljača"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9317,6 +9427,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Sa prijenosima"
 
@@ -9686,6 +9806,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Sredstvo"
 
@@ -9718,9 +9850,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Ukupno stavki"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Popust (%)"
-
 #~ msgid "Supplier invoice"
 #~ msgstr "Račun dobavljača"
 
@@ -9808,9 +9937,6 @@ msgstr ""
 #~ msgid "Reconcile Paid"
 #~ msgstr "Zatvori plaćene"
 
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Fiskalno mapiranje konta"
-
 #~ msgid "Keep empty if the fiscal year belongs to several companies."
 #~ msgstr "Ostavi prazno ako je fiskalna godina vlasništvo više firmi."
 
@@ -9887,9 +10013,6 @@ msgstr ""
 #~ msgid "New Supplier Invoice"
 #~ msgstr "Novi nabavni račun"
 
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Fiskalno mapiranje poreza"
-
 #~ msgid "Voucher Nb"
 #~ msgstr "Nbr Vaucera"
 
@@ -9902,9 +10025,6 @@ msgstr ""
 #~ msgid "Journal de vente"
 #~ msgstr "Dnevnik Prodaje"
 
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Predlozci poreskih mapiranja"
-
 #~ msgid "Period from :"
 #~ msgstr "Razdoblje od :"
 
@@ -9917,9 +10037,6 @@ msgstr ""
 #~ msgid "Tax Report"
 #~ msgstr "Porezki izvestaj"
 
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Predlozak poreskog mapiranja"
-
 #~ msgid "Are you sure you want to close the fiscal year ?"
 #~ msgstr "Da li ste sigurni da želite zatvoriti fiskalnu godinu ?"
 
@@ -9974,13 +10091,6 @@ msgstr ""
 #~ msgid "Statement reconcile line"
 #~ msgstr "Red zatvaranja izvoda"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Partnerov bankovni racun da plati\n"
-#~ "Ostavite prazno da koristite zadane vrednosti"
-
 #~ msgid "Invoice Movement"
 #~ msgstr "Knjiženja računa"
 
@@ -10056,11 +10166,6 @@ msgstr ""
 #~ msgid "Account Manager"
 #~ msgstr "Upravnik računovodstva"
 
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr "Fiskalno mapiranje ce odrediti poreze i konta koristena za partnera"
-
 #~ msgid "Pay invoice"
 #~ msgstr "Plati račun"
 
@@ -10115,9 +10220,6 @@ msgstr ""
 #~ msgid "Invoice Sequence"
 #~ msgstr "Sekvenca računa"
 
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Napomena Fiskalnog mapiranja:"
-
 #~ msgid "Payment Reconcile"
 #~ msgstr "Zatvaranje plaćanja"
 
@@ -10223,9 +10325,6 @@ msgstr ""
 #~ msgid "O_k"
 #~ msgstr "U _redu"
 
-#~ msgid "Partner ID"
-#~ msgstr "Šifra partnera"
-
 #~ msgid "_Go"
 #~ msgstr "_Kreni"
 
@@ -10291,9 +10390,6 @@ msgstr ""
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Predložena faktura da bude potvrđena i ispisana"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "selektovani.konto"
-
 #~ msgid ""
 #~ "The account moves of the invoice have been reconciled with account moves of "
 #~ "the payment(s)."
@@ -10355,9 +10451,6 @@ msgstr ""
 #~ msgid "Invoice line"
 #~ msgstr "Red računa"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Donešeni saldo"
-
 #~ msgid "Pay and reconcile"
 #~ msgstr "Plati i zatvori"
 
@@ -10376,9 +10469,6 @@ msgstr ""
 #~ msgid "Entry Name"
 #~ msgstr "Ime stavke"
 
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Predlozak za Fiskalno mapiranje"
-
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definisi fiskalne godine i odaberi kontne planove"
 
@@ -10389,9 +10479,6 @@ msgstr ""
 #~ "Označite ako želite stampati sve stavke kada ispisujete glavnu knjigu, u "
 #~ "supotnom će ispisati samo njen saldo."
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Period otpisa"
-
 #~ msgid "3 Months"
 #~ msgstr "3 meseca"
 
@@ -10407,9 +10494,6 @@ msgstr ""
 #~ msgid "Select Chart"
 #~ msgstr "Odaberi plan"
 
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Predlozak poreza fiskalnog mapiranja"
-
 #~ msgid "Overdue Payment Report Message"
 #~ msgstr "Poruka o dospecu zakasnelih placanja"
 
@@ -10747,9 +10831,6 @@ msgstr ""
 #~ msgid "Journal Purchase"
 #~ msgstr "Dnevnik nabavke"
 
-#~ msgid "All account entries"
-#~ msgstr "Sve stavke naloga"
-
 #~ msgid "Date Filter"
 #~ msgstr "Filter po datumu"
 
@@ -10862,164 +10943,12 @@ msgstr ""
 #~ msgid "Statement Process"
 #~ msgstr "Proces izvoda"
 
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Fiskalna mapiranja"
-
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Izračunaj datume stavki"
 
 #~ msgid "Statement reconcile"
 #~ msgstr "Zatvaranje izvoda"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Analitički računi za zatvaranje"
-
-#~ msgid "My indicators"
-#~ msgstr "Moji Indikatori"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Fakture u pripremi"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Troškovi za fakturiranje"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Računi za fakturisanje"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Dospela potraživanja"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Cela je selekcija bazirana na"
-
-#~ msgid "Notification"
-#~ msgstr "Obaveštenje"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Prikazi Dugovne/Kreditne Informacije"
-
-#~ msgid "All accounts"
-#~ msgstr "Svi nalozi"
-
-#~ msgid "Aged income"
-#~ msgstr "Dospeli Prihodi"
-
-#~ msgid "Financial Period"
-#~ msgstr "Finansijski period"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Uporedi odabrane godine pod uslovima da"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Odaberite razdoblje(a)"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Pokazi poredjenje u %"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Prikaži izvještaj u 'Landscape' formi"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Morate odabrati opciju 'Landscape'. Molimo označite je."
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Modul Salda Konta je dodao funkije mudulu Finansijskog Menadzmenta\n"
-#~ "    1.Ovaj vam moduk da razlicite opcije za stampu salda\n"
-#~ "    2.Mozete uporedjivati salde razlicitih godina\n"
-#~ "    3.Mozete postaviti gotovinsko ili procentualno poredjenje dve godine\n"
-#~ "    4.Mozete postaviti referentni nalog za procentualno poredjenje datih "
-#~ "godina\n"
-#~ "    5.Imate opciju da odstampate zeljeni izvestaj u  Landskape formatu\n"
-#~ "    "
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Saldo računa-Poredjenja godina"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Odaberite referentni račun(za poredjenje u u %)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Odaberite fiskalnu(ne) godine (a Maksimalno 3 godine)"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Ne uporedjuj"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Prikaži račune"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Kontni i Finansijski menadzersko-uporedni nalozi"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Mozes selektovati maksimalno 3 godine. Molim probaj ponovo."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Ti jesi selektovao opciju 'Procenat' sa vise od 2 godine, ali nisi "
-#~ "izabrao 'Landscape' format stampe."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Cini mi se da si napravio sledece greske. Molim ispravi ih, pa pokusaj "
-#~ "ponovo."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Ostavi prazno za poredjenje sa njegovim nadredjenim"
-
-#~ msgid "Creation Date"
-#~ msgstr "Datum kreiranja"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Niste odabrali opciju 'Procenat', ali ste odabrali više od 2 godine."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Postoji mogućnost da ste odabrali opcije poredjenja sa više od 1 godine sa "
-#~ "stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
-#~ "papira. Molimo pokušajte ponovno."
-
-#~ msgid "Customize Report"
-#~ msgstr "Prilagodi Izvestaj"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Modul koji dodaje nove izvještaje na osnovi ACCOUNT Modula"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Konto Izvestaja - Izvještavanje"
-
 #~ 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 "
@@ -11033,9 +10962,6 @@ msgstr ""
 #~ "Potraživanja: Salda konta partnera - kupci\n"
 #~ "Zatvoren: Za konta koja se više ne koriste"
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. ili pomeri ime"
 
@@ -11049,6 +10975,9 @@ msgstr ""
 #~ "Ako je dat podrazumevani porez partnera, on samo upisuje poreze iz naloga ( "
 #~ "ili proizvoda) iste grupe."
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid ""
 #~ "This account will be used instead of the default one to value outgoing stock "
 #~ "for the current product"
@@ -11056,9 +10985,6 @@ msgstr ""
 #~ "Ovaj nalog ce se koristiti umesto podrazumevanog da potvrdi izlazni magacin "
 #~ "za dati prozivod"
 
-#~ msgid "Board for accountant"
-#~ msgstr "Tabla Naloga"
-
 #~ 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 "
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index 6979420e19f..a15c08ba825 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -487,8 +487,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1125,6 +1123,7 @@ msgstr "# Broj transakcija"
 
 #. 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
@@ -1312,6 +1311,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Sa saldom različitim od 0"
 
@@ -2019,7 +2028,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2083,6 +2092,8 @@ msgstr "Računovodstveni podaci"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Stavke poredane po"
 
@@ -2104,11 +2115,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2431,6 +2447,7 @@ msgstr "Popust(%)"
 
 #. 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
@@ -2676,6 +2693,8 @@ msgstr "Financijsko računovodstvo"
 #. 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2948,7 +2967,6 @@ msgstr "Zadrži prazno za korištenje konta troška"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2962,6 +2980,17 @@ msgstr "Zadrži prazno za korištenje konta troška"
 #: 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 "Dnevnici"
 
@@ -3171,6 +3200,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3229,6 +3259,16 @@ msgstr "PDV :"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontni plan"
 
@@ -3672,11 +3712,10 @@ msgid "Analytic Balance"
 msgstr "Saldo analitike"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4351,7 +4390,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4490,7 +4529,6 @@ msgid "Analytic Balance -"
 msgstr "Analitički saldo -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4503,10 +4541,8 @@ msgstr "Analitički saldo -"
 #: 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.journal.period.print: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
@@ -4516,6 +4552,16 @@ msgstr "Analitički saldo -"
 #: 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
 msgid "Target Moves"
 msgstr "Ciljna knjiženja"
 
@@ -4632,6 +4678,8 @@ msgstr "Rezultat zatvaranja"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5345,6 +5393,19 @@ msgstr ""
 
 #. 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 "Bez filtera"
@@ -6259,6 +6320,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6491,7 +6553,7 @@ msgstr "Redovi analitike"
 #: 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 "
+"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) "
@@ -7172,6 +7234,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7426,6 +7489,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Razdoblje"
@@ -7509,14 +7585,6 @@ msgstr "Tel.:"
 msgid "Company Currency"
 msgstr "Valuta preduzeca"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7628,6 +7696,12 @@ msgstr "Dnevnik povrata"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7867,6 +7941,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8150,12 +8225,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8273,7 +8353,12 @@ msgstr "Ostavite prazno za konto prihoda"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8292,6 +8377,15 @@ 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 ""
 
@@ -8489,7 +8583,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"
 
 #. module: account
@@ -8506,12 +8600,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8531,7 +8630,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8714,6 +8813,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8795,6 +8895,18 @@ msgstr "Opšte"
 #: selection:account.pl.report,filter: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
@@ -9004,13 +9116,10 @@ msgid "Tax Source"
 msgstr "Izvor poreza"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -9034,8 +9143,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9242,6 +9351,7 @@ msgstr "Račun dobavljača"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9315,6 +9425,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "Sa prijenosima"
 
@@ -9684,6 +9804,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Neplaćeni računi dobavljaču"
 
@@ -9801,9 +9933,6 @@ msgstr ""
 #~ msgid "Mvt"
 #~ msgstr "Mvt"
 
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Fiskalno mapiranje konta"
-
 #~ msgid "Contact"
 #~ msgstr "Kontakt"
 
@@ -9813,9 +9942,6 @@ msgstr ""
 #~ msgid "Keep empty if the fiscal year belongs to several companies."
 #~ msgstr "Ostavi prazno ako je fiskalna godina vlasništvo više firmi."
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Analytic Invoice"
 #~ msgstr "Analitički račun"
 
@@ -9887,9 +10013,6 @@ msgstr ""
 #~ msgid "Grand total"
 #~ msgstr "Celokupni iznos"
 
-#~ msgid "Taxes Fiscal Mapping"
-#~ msgstr "Fiskalno mapiranje poreza"
-
 #~ msgid "New Supplier Invoice"
 #~ msgstr "Novi nabavni račun"
 
@@ -9905,18 +10028,12 @@ msgstr ""
 #~ msgid "New Analytic Account"
 #~ msgstr "Novi analitički račun"
 
-#~ msgid "Fiscal Mapping Templates"
-#~ msgstr "Predlozci poreskih mapiranja"
-
 #~ msgid "Period from :"
 #~ msgstr "Razdoblje od :"
 
 #~ msgid "Journal de vente"
 #~ msgstr "Dnevnik Prodaje"
 
-#~ msgid "Fiscal Mapping Template"
-#~ msgstr "Predlozak poreskog mapiranja"
-
 #~ msgid "Tax Report"
 #~ msgstr "Porezki izvestaj"
 
@@ -9968,13 +10085,6 @@ msgstr ""
 #~ msgid "Statement reconcile line"
 #~ msgstr "Red zatvaranja izvoda"
 
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "Partnerov bankovni racun da plati\n"
-#~ "Ostavite prazno da koristite zadane vrednosti"
-
 #~ msgid "Close states"
 #~ msgstr "Zatvori stanja"
 
@@ -10050,11 +10160,6 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Sledeće"
 
-#~ msgid ""
-#~ "The fiscal mapping will determine taxes and the accounts used for the "
-#~ "partner."
-#~ msgstr "Fiskalno mapiranje ce odrediti poreze i konta koristena za partnera"
-
 #~ msgid "Date or Code"
 #~ msgstr "Datum ili šifra"
 
@@ -10118,9 +10223,6 @@ msgstr ""
 #~ msgid "Customer Invoice Process"
 #~ msgstr "Proces izlacnog računa"
 
-#~ msgid "Fiscal Mapping Remark :"
-#~ msgstr "Napomena Fiskalnog mapiranja:"
-
 #~ msgid "Validate Account Moves"
 #~ msgstr "Potvrdi osnovice"
 
@@ -10242,9 +10344,6 @@ msgstr ""
 #~ msgid "_Go"
 #~ msgstr "_Kreni"
 
-#~ msgid "Partner ID"
-#~ msgstr "Šifra partnera"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Nova izlazna faktura"
 
@@ -10307,9 +10406,6 @@ msgstr ""
 #~ msgid "Proposed invoice to be checked, validated and printed"
 #~ msgstr "Predložena faktura da bude potvrđena i ispisana"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "selektovani.konto"
-
 #~ msgid "Journal de Banque CHF"
 #~ msgstr "Dnevnik CHF Banke"
 
@@ -10374,9 +10470,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Plati i zatvori"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Donešeni saldo"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Novi povrat dobavljaču"
 
@@ -10389,9 +10482,6 @@ msgstr ""
 #~ msgid "Entry Name"
 #~ msgstr "Ime stavke"
 
-#~ msgid "Template for Fiscal Mapping"
-#~ msgstr "Predlozak za Fiskalno mapiranje"
-
 #~ msgid "Entry encoding"
 #~ msgstr "Unos stavki"
 
@@ -10401,9 +10491,6 @@ msgstr ""
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definisi fiskalne godine i odaberi kontne planove"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Period otpisa"
-
 #~ msgid "3 Months"
 #~ msgstr "3 meseca"
 
@@ -10423,9 +10510,6 @@ msgstr ""
 #~ msgid "Select Chart"
 #~ msgstr "Odaberi plan"
 
-#~ msgid "Template Tax Fiscal Mapping"
-#~ msgstr "Predlozak poreza fiskalnog mapiranja"
-
 #~ msgid ""
 #~ "Financial and accounting module that covers:\n"
 #~ "    General accounting\n"
@@ -10613,6 +10697,9 @@ msgstr ""
 #~ msgid "Partner Other Ledger"
 #~ msgstr "Partnerova ostala skladista"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "General Ledger -"
 #~ msgstr "Glavna knjiga -"
 
@@ -10773,9 +10860,6 @@ msgstr ""
 #~ msgid "Accounting entries at statement's confirmation"
 #~ msgstr "Knjiženja prilikom potvrde izvoda"
 
-#~ msgid "All account entries"
-#~ msgstr "Sve stavke naloga"
-
 #~ msgid "Date Filter"
 #~ msgstr "Filter po datumu"
 
@@ -10894,9 +10978,6 @@ msgstr ""
 #~ msgid "Name of the fiscal year as displayed on screens."
 #~ msgstr "Naziv fiskalne godine kako je prikazano na ekranima"
 
-#~ msgid "Fiscal Mappings"
-#~ msgstr "Fiskalna mapiranja"
-
 #~ msgid "Statement Process"
 #~ msgstr "Proces izvoda"
 
@@ -10906,158 +10987,6 @@ msgstr ""
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Izračunaj datume stavki"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Analitički računi za zatvaranje"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Fakture u pripremi"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Računi za fakturisanje"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Troškovi za fakturiranje"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Dospela potraživanja"
-
-#~ msgid "Board for accountant"
-#~ msgstr "Tabla Naloga"
-
-#~ msgid "My indicators"
-#~ msgstr "Moji Indikatori"
-
-#~ msgid "Aged income"
-#~ msgstr "Dospeli Prihodi"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Prikazi Dugovne/Kreditne Informacije"
-
-#~ msgid "All accounts"
-#~ msgstr "Svi nalozi"
-
-#~ msgid "Entries Selection Based on"
-#~ msgstr "Cela je selekcija bazirana na"
-
-#~ msgid "Notification"
-#~ msgstr "Obaveštenje"
-
-#~ msgid "Financial Period"
-#~ msgstr "Finansijski period"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Odaberite razdoblje(a)"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "Uporedi odabrane godine pod uslovima da"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "Odaberite fiskalnu(ne) godine (a Maksimalno 3 godine)"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "Odaberite referentni račun(za poredjenje u u %)"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Saldo računa-Poredjenja godina"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Modul Salda Konta je dodao funkije mudulu Finansijskog Menadzmenta\n"
-#~ "    1.Ovaj vam moduk da razlicite opcije za stampu salda\n"
-#~ "    2.Mozete uporedjivati salde razlicitih godina\n"
-#~ "    3.Mozete postaviti gotovinsko ili procentualno poredjenje dve godine\n"
-#~ "    4.Mozete postaviti referentni nalog za procentualno poredjenje datih "
-#~ "godina\n"
-#~ "    5.Imate opciju da odstampate zeljeni izvestaj u  Landskape formatu\n"
-#~ "    "
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "Morate odabrati opciju 'Landscape'. Molimo označite je."
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "Prikaži izvještaj u 'Landscape' formi"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "Pokazi poredjenje u %"
-
-#~ msgid "Don't Compare"
-#~ msgstr "Ne uporedjuj"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Prikaži račune"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "Kontni i Finansijski menadzersko-uporedni nalozi"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "Mozes selektovati maksimalno 3 godine. Molim probaj ponovo."
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr ""
-#~ "3. Ti jesi selektovao opciju 'Procenat' sa vise od 2 godine, ali nisi "
-#~ "izabrao 'Landscape' format stampe."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Cini mi se da si napravio sledece greske. Molim ispravi ih, pa pokusaj "
-#~ "ponovo."
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "Ostavi prazno za poredjenje sa njegovim nadredjenim"
-
-#~ msgid "Creation Date"
-#~ msgstr "Datum kreiranja"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr ""
-#~ "2. Niste odabrali opciju 'Procenat', ali ste odabrali više od 2 godine."
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr ""
-#~ "Postoji mogućnost da ste odabrali opcije poredjenja sa više od 1 godine sa "
-#~ "stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
-#~ "papira. Molimo pokušajte ponovno."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
-
-#~ msgid "Customize Report"
-#~ msgstr "Prilagodi Izvestaj"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "Modul koji dodaje nove izvještaje na osnovi ACCOUNT Modula"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "Konto Izvestaja - Izvještavanje"
-
 #, python-format
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "Promena konta na liniji \"%s\" nije validna"
@@ -11065,6 +10994,3 @@ msgstr ""
 #, python-format
 #~ msgid "No analytic journal !"
 #~ msgstr "Nema analitike dnevnika!"
-
-#~ msgid "Disc. (%)"
-#~ msgstr "Popust (%)"
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 6f6b9ece95b..7bee287148f 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-24 13:10+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2011-11-07 12: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: 2011-04-29 05:11+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -74,7 +74,7 @@ msgstr "Vänligen definiera en nummerserie för fakturajournalen"
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Fel! Längden på perioden/perioderna är ogiltig. "
+msgstr "Fel. Längden på perioden/perioderna är ogiltig. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
@@ -136,7 +136,7 @@ msgstr "Bokföringstransaktioner-"
 #: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "You can not delete posted movement: \"%s\"!"
+msgstr "Du kan inte radera sparade affärshändelser: \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
@@ -499,8 +499,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -801,7 +799,7 @@ msgstr "Beräkna förfallodatum"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "J.C./Move name"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -935,7 +933,7 @@ msgstr "Kontoutdrag"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Move Line"
+msgstr "Affärshändelse"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1137,7 +1135,7 @@ msgstr "Utgående valutakurs"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "The move of this entry line."
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1146,6 +1144,7 @@ msgstr "# Transaktioner"
 
 #. 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
@@ -1333,6 +1332,16 @@ msgstr "You can not use this general account in this journal !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "With balance is not equal to 0"
 
@@ -1430,7 +1439,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Anglo-saxisk lagervärdering"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1743,7 +1752,7 @@ msgstr "Momsdeklaration: Kreditfakturor"
 #: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr "You cannot deactivate an account that contains account moves."
+msgstr "Du kan inte avaktivera ett konto där det finns affärshändelser."
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -2052,7 +2061,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Sök kontoplansmallar"
 
 #. module: account
@@ -2062,6 +2071,10 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Föreslagen kontoplan matchar valt land. Tänk på att det är olika kontoplaner "
+"för kontant respektive fakturametod. Det finns ytterligare moduler för K1, "
+"K2 och K3-företag. Saknas det kontoplan för ditt land kan du välja en "
+"generisk."
 
 #. module: account
 #: view:account.account.type:0
@@ -2116,6 +2129,8 @@ msgstr "Bokföringsegenskaper"
 #. 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
 msgid "Entries Sorted By"
 msgstr "Entries Sorted By"
 
@@ -2137,11 +2152,16 @@ msgstr "Produktmall"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2360,7 +2380,7 @@ msgstr "Kontoutdrag"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Move Name"
+msgstr "Affärshändelse"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -2466,6 +2486,7 @@ msgstr "Rabatt (%)"
 
 #. 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
@@ -2693,7 +2714,7 @@ msgstr "Baskodsbelopp"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "Standard moms"
+msgstr "Standardmoms"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2711,8 +2732,10 @@ msgstr "Finansiell bokföring"
 #. 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
 msgid "Profit And Loss"
-msgstr "Vinst och förlust"
+msgstr "Resultaträkning"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2927,6 +2950,7 @@ msgstr "Tax Declaration"
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
+"Tvingar alla affärshändelser för detta konto att anta denna sekundära valuta."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2985,7 +3009,6 @@ msgstr "Om blankt används kostnadskontot"
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2999,6 +3022,17 @@ msgstr "Om blankt används kostnadskontot"
 #: 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 "Journaler"
 
@@ -3030,7 +3064,7 @@ msgstr "Inköp"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Konfiguration av bokföringen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3176,7 +3210,7 @@ msgstr "Dina bank och kontantkonton"
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "Sök affärshändelse"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3212,6 +3246,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "Motpart"
 
@@ -3270,6 +3305,16 @@ msgstr "VAT :"
 #: 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.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 "Chart of Accounts"
 msgstr "Kontoplan"
 
@@ -3467,6 +3512,8 @@ msgstr "Account Payable"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Du kan inte skapa rader med skiftande perioder/journaler i samma "
+"affärshändelse"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3715,11 +3762,10 @@ msgid "Analytic Balance"
 msgstr "Objektbalans"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Nettoförlust"
 
@@ -3960,6 +4006,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 ""
+"Nya affärshändelserader skapas i statusen 'Förslag'.\n"
+"* När alla betalningar är gjorda så övergår statusen till 'Valid'."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4057,7 +4105,7 @@ msgstr "Unable to find a valid period !"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Voucher No"
-msgstr "Voucher No"
+msgstr "Verifikatnummer"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4090,8 +4138,9 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
-"This will automatically configure your chart of accounts, bank accounts, "
-"taxes and journals according to the selected template"
+"Dessa inställningar leder till att automatiskt skapa din kontoplan från den "
+"valda förlagan, lägga upp bankkonton, skatter och journaler knutna till vald "
+"förlaga."
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4399,7 +4448,7 @@ msgstr "Journalrader"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Balansräkning (Tillgångskonton)"
 
 #. module: account
@@ -4484,7 +4533,7 @@ msgstr "Stäng"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Moves"
+msgstr "Affärshändelse"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4541,7 +4590,6 @@ msgid "Analytic Balance -"
 msgstr "Analytic Balance -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4554,10 +4602,8 @@ msgstr "Analytic Balance -"
 #: 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.journal.period.print: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
@@ -4567,8 +4613,18 @@ msgstr "Analytic Balance -"
 #: 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
 msgid "Target Moves"
-msgstr "Target Moves"
+msgstr "Vald affärshändelse"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -4683,6 +4739,8 @@ msgstr "Avstämt resultat"
 #: 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
 msgid "Balance Sheet"
 msgstr "Balansräkning"
 
@@ -5046,8 +5104,7 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"Specified Journal does not have any account move entries in draft state for "
-"this period"
+"Urvalet av journaler i perioden saknar icke bekräftade affärshändelserader"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5072,7 +5129,7 @@ msgstr "Antal"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Nummer (Affärshändelse)"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5165,7 +5222,7 @@ msgstr "Journalpost"
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr "Flytta journal"
+msgstr "Journal med affärshändelser"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -5190,6 +5247,8 @@ msgid ""
 "This module will support the Anglo-Saxons accounting methodology by changing "
 "the accounting logic with stock transactions."
 msgstr ""
+"Denna modul inför anglo-saxisk metod för bokföringen med nya regler för "
+"lagerstransaktionerna."
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5259,6 +5318,8 @@ msgid ""
 "Streamlines invoice payment and creates hooks to plug automated payment "
 "systems in."
 msgstr ""
+"Strömlinjeformar betalningen av fakturor med öppningar för automatiska "
+"betalsystem."
 
 #. module: account
 #: field:account.payment.term.line,value:0
@@ -5398,6 +5459,19 @@ msgstr ""
 
 #. 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 "Inget filter"
@@ -5749,7 +5823,7 @@ msgstr "Default konto för kredit"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Välj kontoplan"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5939,7 +6013,7 @@ msgstr "Centralisering"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Skapa din kontoplan från en förlaga"
 
 #. module: account
 #: view:account.account:0
@@ -6068,7 +6142,7 @@ msgstr ""
 #: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr "Couldn't create move between different companies"
+msgstr "Kunde inte skapa affärshändelse som berör flera företag"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6264,6 +6338,7 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
+"Valda verifikatrader saknar motsvarande icke verifierade affärshändelserader."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6319,6 +6394,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6353,6 +6429,8 @@ msgid ""
 "Account Voucher module includes all the basic requirements of Voucher "
 "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
 msgstr ""
+"Verifikatmodulen inkluderar alla basala verifikattyper såsom bank, kontant, "
+"försäljning, inköp, utlägg etc... "
 
 #. module: account
 #: view:account.chart.template:0
@@ -6553,7 +6631,7 @@ msgstr "Objektrader"
 #: 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 "
+"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) "
@@ -6715,7 +6793,7 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Standardmoms för inköp"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6883,6 +6961,8 @@ msgid ""
 "Helps you generate reminder letters for unpaid invoices, including multiple "
 "levels of reminding and customized per-partner policies."
 msgstr ""
+"Hjälper dig att skapa påminnelsebrev för obetalda fakturor, inklusive "
+"policys för eskalering av ärenden per företag."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -7134,7 +7214,7 @@ msgstr "Överliggande"
 #. module: account
 #: field:account.installer.modules,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Parallella objektkontoplaner"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -7212,13 +7292,13 @@ msgstr "Warning !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Status för rad i affärshändelse"
 
 #. 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 ""
+msgstr "Avstäm affärshändelserader"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7236,6 +7316,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7296,7 +7377,7 @@ msgstr "Status"
 msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
-msgstr ""
+msgstr "Välj bokföringsår för vilket du önskar justera årsavslutjournalen"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7417,7 +7498,7 @@ msgstr ""
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr ""
+msgstr "Utöka med extra bokföringsfunktioner."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7490,6 +7571,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Period"
@@ -7574,14 +7668,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Företagets valuta"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Kontotabell"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7633,7 +7719,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Avstäm bankärenden"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -7645,7 +7731,7 @@ msgstr "Kontotyper"
 #: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
-msgstr "Cannot create invoice move on centralised journal"
+msgstr "Kan inte skapa affärshändelse för fakturan i huvudboken"
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -7693,6 +7779,12 @@ msgstr "Refund Journal"
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr "Selektera på"
 
@@ -7775,7 +7867,7 @@ msgstr "Leverantörer"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on centralized journal"
-msgstr ""
+msgstr "Du kan inte skapa mer än en affärshändelse per period i huvudboken"
 
 #. module: account
 #: view:account.journal:0
@@ -7857,7 +7949,7 @@ msgstr "Tillåtna konton (lämna blankt om ingen kontroll skall göras)"
 #: 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 "Analyskontotabell"
+msgstr "Kontoplan för objekt"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -7912,7 +8004,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr "The account move (%s) for centralisation has been confirmed!"
+msgstr "Affärshändelsen (%s) för huvudboken har bekräftats!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -7932,6 +8024,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8175,7 +8268,7 @@ msgstr "Dear Sir/Madam,"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Konfigurera ditt bokföringsprogram"
 
 #. module: account
 #: code:addons/account/account.py:2820
@@ -8217,12 +8310,17 @@ msgstr "Uppföljning"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr "Startperiod"
 
@@ -8342,7 +8440,12 @@ msgstr "Om blankt används intäktskontot"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8361,6 +8464,15 @@ msgstr "Transaktioner som skapats automatiskt eller manuellt"
 
 #. 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 "Vy-konton"
 
@@ -8479,13 +8591,14 @@ msgstr "Manuell registrering"
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Flytta"
+msgstr "Affärshändelse"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1128
 #, 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 !"
+msgstr ""
+"Du kan inte ändra momsen i efterhand, korrigera genom att återskapa raderna!"
 
 #. module: account
 #: report:account.central.journal:0
@@ -8562,8 +8675,8 @@ msgstr "juli"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
-msgstr "Chart of accounts"
+msgid "Chart of Accounts"
+msgstr "Chart of Accounts"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
@@ -8579,12 +8692,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr "Slutperiod"
 
@@ -8604,7 +8722,7 @@ msgstr "Slutperiod"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Kontoplan"
 
 #. module: account
@@ -8776,7 +8894,7 @@ msgstr "Valuta"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Verifiera affärshändelseraderna"
 
 #. module: account
 #: field:account.account,credit:0
@@ -8789,6 +8907,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8870,6 +8989,18 @@ msgstr "General"
 #: selection:account.pl.report,filter: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
@@ -8971,7 +9102,7 @@ msgstr "Account period"
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "Remove Lines"
+msgstr "Tag bort rader"
 
 #. module: account
 #: view:account.report.general.ledger:0
@@ -9079,13 +9210,10 @@ msgid "Tax Source"
 msgstr "Källskatt"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Nettovinst"
 
@@ -9109,8 +9237,8 @@ msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9279,7 +9407,7 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr "Write-Off Move"
+msgstr "Avskrivning"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -9317,6 +9445,7 @@ msgstr "Leverantörsfaktura"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9394,8 +9523,18 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
-msgstr "With movements"
+msgstr "Med affärshändelser"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9592,7 +9731,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Verifiera kontots affärshändelserader"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9744,7 +9883,7 @@ msgstr "You must enter a period length that cannot be 0 or below !"
 #: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
-msgstr "You cannot remove an account which has account entries!. "
+msgstr "Du kan inte radera ett konto med affärshändelser! "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -9765,6 +9904,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "Tillgång"
 
@@ -10175,18 +10326,12 @@ msgstr ""
 #~ msgid "Create a Fiscal Year"
 #~ msgstr "Skapa ett verksamhetsår"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Credit Note"
 #~ msgstr "Kreditnota"
 
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definiera verksamhetsåren och välj kontoplan"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Avskrivningsperiod"
-
 #~ msgid "3 Months"
 #~ msgstr "3 månader"
 
@@ -10272,9 +10417,6 @@ msgstr ""
 #~ msgid "Analytic Chart of Accounts"
 #~ msgstr "Kontoplan för objekt"
 
-#~ msgid "Partner ID"
-#~ msgstr "Företagsid"
-
 #~ msgid "Analytic account costs and revenues"
 #~ msgstr "Objektkonton kostander och intäkter"
 
@@ -10448,35 +10590,18 @@ msgstr ""
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "Kontoförflyttning av rad \"%s\" är inte giltig"
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Skulle din betalning har gjorts efter detta brev sändes, kan du ignorera "
-#~ "detta. Tveka inte att kontakta vår redovisningsavdelning på +32 81 81 37 00."
-
-#~ msgid "Disc. (%)"
-#~ msgstr "Rab. (%)"
-
 #~ msgid "Income"
 #~ msgstr "Intäkter"
 
 #~ msgid "Equity"
 #~ msgstr "Eget kapital"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Objektkonton att stänga"
-
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Obetalda leverantörsfakturor"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
-#~ msgid "There is no active invoice sequence defined for the journal !"
-#~ msgstr "There is no active invoice sequence defined for the journal !"
-
 #~ msgid "Account Entry Line"
 #~ msgstr "Account Entry Line"
 
@@ -10498,9 +10623,6 @@ msgstr ""
 #~ msgid "Mvt"
 #~ msgstr "Mvt"
 
-#~ msgid "Currency Profit/Loss"
-#~ msgstr "Currency Profit/Loss"
-
 #~ msgid "Tax Group"
 #~ msgstr "Tax Group"
 
@@ -10907,6 +11029,9 @@ msgstr ""
 #~ msgid "Partner Other Ledger"
 #~ msgstr "Partner Other Ledger"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "Number of entries are generated"
 #~ msgstr "Number of entries are generated"
 
@@ -11020,15 +11145,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 
-#~ 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 ""
-#~ "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."
-
 #~ msgid "Date Filter"
 #~ msgstr "Date Filter"
 
@@ -11060,9 +11176,6 @@ msgstr ""
 #~ msgid "Closing of fiscal year cancelled, please check the box !"
 #~ msgstr "Closing of fiscal year cancelled, please check the box !"
 
-#~ msgid "The bank account to pay to or to be paid from"
-#~ msgstr "The bank account to pay to or to be paid from"
-
 #~ msgid "Analytic Journal Definition"
 #~ msgstr "Analytic Journal Definition"
 
@@ -11127,17 +11240,8 @@ msgstr ""
 #~ "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."
 
-#~ msgid "supplier"
-#~ msgstr "leverantör"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "Ansicht"
-#~ msgstr "Visa"
-
-#~ msgid "End of Year"
-#~ msgstr "Årsavslut"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balansräkning (Tillgångskonton)"
 
 #, python-format
 #~ msgid "is validated."
@@ -11146,3 +11250,6 @@ msgstr ""
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Faktura "
+
+#~ msgid "Chart of Accounts"
+#~ msgstr "Kontoplan"
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index f07631912d4..1c1f0d854c2 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
-"Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
+"Last-Translator: ஆமாச்சு <ramadasan@amachu.net>\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: 2011-04-29 05:11+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "விநியோகிகளுக்கு பணப்பட்டுவாடா செய்யப்படாத விலைப்பட்டியல்கள்"
 
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index f73697441c6..b0af8377db2 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: 2011-04-29 05:11+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr "సమన్వయ ఫలితం"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "వ్యవధి"
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr "సాధారణ"
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "ఆస్థి"
 
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 4b5df3369ec..fde342090f7 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: 2011-04-29 05:11+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2012,7 +2021,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "ค้นหาตัวอย่างผังบัญชี"
 
 #. module: account
@@ -2076,6 +2085,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2097,11 +2108,16 @@ msgstr "รูปแบบสินค้า"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2418,6 +2434,7 @@ 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
@@ -2663,6 +2680,8 @@ 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
 msgid "Profit And Loss"
 msgstr "กำไรขาดทุน"
 
@@ -2928,7 +2947,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2942,6 +2960,17 @@ msgstr ""
 #: 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 "สมุดบัญชี"
 
@@ -3151,6 +3180,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3209,6 +3239,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3647,11 +3687,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4324,7 +4363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4463,7 +4502,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4476,10 +4514,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4489,6 +4525,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4605,6 +4651,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5314,6 +5362,19 @@ msgstr ""
 
 #. 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 ""
@@ -6222,6 +6283,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6451,7 +6513,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7121,6 +7183,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7373,6 +7436,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7455,14 +7531,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7574,6 +7642,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7811,6 +7885,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8092,12 +8167,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8215,7 +8295,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8234,6 +8319,15 @@ 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 ""
 
@@ -8431,7 +8525,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8448,12 +8542,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8473,7 +8572,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8654,6 +8753,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8735,6 +8835,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8944,13 +9056,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8974,7 +9083,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9182,6 +9291,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9255,6 +9365,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9624,6 +9744,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Entries Encoding"
 #~ msgstr "กรอกข้อมูล"
 
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 1865b0589bb..3fceb229c94 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: 2011-04-29 05:11+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -483,8 +483,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1119,6 +1117,7 @@ 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
@@ -1306,6 +1305,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2009,7 +2018,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2073,6 +2082,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2094,11 +2105,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2415,6 +2431,7 @@ 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
@@ -2660,6 +2677,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2925,7 +2944,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2939,6 +2957,17 @@ msgstr ""
 #: 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 ""
 
@@ -3148,6 +3177,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3206,6 +3236,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3644,11 +3684,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4321,7 +4360,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4460,7 +4499,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4473,10 +4511,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4486,6 +4522,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4602,6 +4648,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5311,6 +5359,19 @@ msgstr ""
 
 #. 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 ""
@@ -6219,6 +6280,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6448,7 +6510,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7118,6 +7180,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7370,6 +7433,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7452,14 +7528,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7571,6 +7639,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7808,6 +7882,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8089,12 +8164,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8212,7 +8292,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8231,6 +8316,15 @@ 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 ""
 
@@ -8428,7 +8522,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8445,12 +8539,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8470,7 +8569,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8651,6 +8750,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8732,6 +8832,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8941,13 +9053,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8971,7 +9080,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9179,6 +9288,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9252,6 +9362,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9620,3 +9740,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 779dbd5bfb5..e6d84cf5683 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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:14+0000\n"
-"PO-Revision-Date: 2011-05-20 15:30+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-21 05:02+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Mali yıl için yol sonu yevmiyesi tanımlanmamış"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +67,7 @@ msgid "Residual"
 msgstr "Bakiye"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "Lütfen fatura dizisi tanımlayınız"
@@ -136,7 +136,7 @@ msgid "Accounting Entries-"
 msgstr "Muhasebe Girdileri-"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "İşlenmiş hareketleri silemezsiniz: \"%s\"!"
@@ -180,7 +180,7 @@ msgid ""
 msgstr "Aktif seçeneği seçili değilse, Ödeme şartları silmeden gizlenir."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -235,7 +235,7 @@ msgid "account.tax"
 msgstr "muhasebe.vergi"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -268,7 +268,7 @@ msgstr ""
 "kutuyu işaretleyin."
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, 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)"
@@ -284,7 +284,7 @@ msgid "Belgian Reports"
 msgstr "Belçika Raporları"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Kapanmış bir yevmiyeye ekleme yapamaz ya da değiştiremezsiniz."
@@ -322,7 +322,7 @@ msgid "St."
 msgstr "Ara Toplam"
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Fatura kalemindeki hesap şirketi ile fatura şirketi eşleşmiyor."
@@ -516,8 +516,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -583,7 +581,7 @@ msgid "Not reconciled transactions"
 msgstr "Uzlaşısız hareketler"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "Kasa Bakiyesi ile Hesaplanan Bakiye eşleşmiyor !"
@@ -668,7 +666,7 @@ msgid "Tax Code Amount"
 msgstr "Vergi Kodu Değeri"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -701,8 +699,8 @@ msgid "Journal Period"
 msgstr "Yevmiye Dönemi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, 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ı"
@@ -763,7 +761,7 @@ msgid "Analytic Entries by line"
 msgstr "Kalemlere göre Analitik Girişler"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr "Sadece proforma faturaların para birimini değiştirebilirsiniz !"
@@ -867,7 +865,7 @@ msgid "Next Partner to reconcile"
 msgstr "Uzlaşılacak Sonraki Paydaş"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -994,11 +992,11 @@ msgid "Code"
 msgstr "Kod"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1079,6 +1077,7 @@ msgstr "Kar & Zarar(Gider Hesapları)"
 
 #. 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 "-"
@@ -1176,7 +1175,7 @@ msgid "Entry Label"
 msgstr "Giriş Etiketi"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, 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 !"
@@ -1314,6 +1313,7 @@ msgid "Journal Items Analysis"
 msgstr "Yevmiye Maddeleri Analizi"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Paydaşlar"
@@ -1343,7 +1343,7 @@ msgid "Central Journal"
 msgstr "Merkezi Yevmiye"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "Bu yevmiyede bu genel hesabı kullanamazsınız !"
@@ -1355,6 +1355,16 @@ msgstr "Bu yevmiyede bu genel hesabı kullanamazsınız !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "Bakiye 0 a eşit değil"
 
@@ -1439,7 +1449,7 @@ msgstr ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1608,6 +1618,7 @@ msgid "Separated Journal Sequences"
 msgstr "Ayrılmış Yevmiye Sıraları"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Sorumlu"
@@ -1679,7 +1690,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Hata! Biribiriyle çakışan mali yıllar tanımlayamazsınız"
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "Bu hesap uzlaşma yapılmak üzere tanımlanmamış !"
@@ -1714,7 +1725,7 @@ msgid "Receivables & Payables"
 msgstr "Borç & Alacak"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "You have to provide an account for the write off entry !"
@@ -1750,7 +1761,7 @@ msgid "Customer Ref:"
 msgstr "Customer Ref:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, 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 !"
@@ -1771,7 +1782,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Tax Declaration: Credit Notes"
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "You cannot deactivate an account that contains account moves."
@@ -1787,7 +1798,7 @@ msgid "You can not create move line on closed account."
 msgstr "Kapanmış bir hesap için hareket yaratamazsınız."
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2070,7 +2081,7 @@ msgid " Journal"
 msgstr " Yevmiye"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2098,8 +2109,8 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
-msgstr "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
+msgstr "Search Chart of Accounts Templates"
 
 #. module: account
 #: view:account.installer:0
@@ -2132,7 +2143,7 @@ msgid "Description"
 msgstr "Description"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2152,7 +2163,7 @@ msgid "Income Account"
 msgstr "Income Account"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Tanımlanan Satış/Satınalma tipli Muhasebe yevmiyesi yoktur!"
@@ -2163,9 +2174,10 @@ msgid "Accounting Properties"
 msgstr "Muhasebe Özellikleri"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Entries Sorted By"
 
@@ -2187,12 +2199,16 @@ msgstr "Ürün Şablonu"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2302,7 +2318,7 @@ msgid "Account Tax Code"
 msgstr "Account Tax Code"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2381,7 +2397,7 @@ msgid "Account Model Entries"
 msgstr "Model muhabebe kayıtları"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2471,7 +2487,7 @@ msgid "Accounts"
 msgstr "Accounts"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuration Error!"
@@ -2483,12 +2499,13 @@ msgid "Average Price"
 msgstr "Average Price"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Date:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2642,16 +2659,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Bu sihirbaz yinelenen muhasebe girişleri oluşturu"
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "No sequence defined on the journal !"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2787,6 +2804,8 @@ msgstr "Mali Muhasebe"
 #. 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
 msgid "Profit And Loss"
 msgstr "Profit And Loss"
 
@@ -2821,7 +2840,7 @@ msgid "Analytic Entries"
 msgstr "Kayıt Analizleri"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2953,7 +2972,7 @@ msgid "BNK%s"
 msgstr "BNK%s"
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3074,9 +3093,7 @@ msgstr "Masraf hesabında kullanmak için boş bırak"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3090,6 +3107,17 @@ msgstr "Masraf hesabında kullanmak için boş bırak"
 #: 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 "Journals"
 
@@ -3135,7 +3163,7 @@ msgid "Starting Balance"
 msgstr "Açılış Bakiyesi"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No Partner Defined !"
@@ -3179,6 +3207,7 @@ msgstr "Journal:"
 #: 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
@@ -3232,7 +3261,7 @@ msgstr ""
 "alanlarında bir daha değişiklik yapamayacağınız anlamına gelir."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Cannot delete invoice(s) that are already opened or paid !"
@@ -3295,7 +3324,7 @@ msgstr ""
 "or 'Done' state!"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3365,6 +3394,16 @@ msgstr "VAT :"
 #: 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.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 "Chart of Accounts"
 msgstr "Chart of Accounts"
 
@@ -3410,7 +3449,6 @@ 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
 #: view:account.move:0
@@ -3454,7 +3492,7 @@ msgid "Chart of Accounts Template"
 msgstr "Hesap Planı Kartları Şablonu"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3465,13 +3503,13 @@ msgstr ""
 "koşulu baz alınarak oluşturulur. Lütfen hangi paydaş olduğunu belirtiniz."
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Some entries are already reconciled !"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3596,7 +3634,7 @@ msgid "Analytic Items"
 msgstr "Çözümsel Kalemler"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Unable to change tax !"
@@ -3607,14 +3645,14 @@ msgid "#Entries"
 msgstr "#Entries"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "ürünle uyumlu olmayan bir Ölçü Birimi seçtiniz."
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3823,11 +3861,10 @@ msgid "Analytic Balance"
 msgstr "Bilanço Analizi"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Net Zarar"
 
@@ -3926,7 +3963,7 @@ msgid "Acc.Type"
 msgstr "Hes.Türü"
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr "Tanımlanan genel vergiler, ama fatura kalemlerinde görünmez !"
@@ -3990,7 +4027,7 @@ msgstr ""
 "created in 'Posted' state."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: 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)"
@@ -4167,7 +4204,7 @@ msgid "Credit Notes"
 msgstr "Alacak Dekontları"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4240,11 +4277,11 @@ msgid "Change"
 msgstr "Change"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4351,7 +4388,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "You must define an analytic journal of type '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4420,7 +4457,7 @@ msgid "Invoices"
 msgstr "Faturalar"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4525,8 +4562,8 @@ msgstr "Journal Items"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
+msgstr "Balance Sheet (Asset Accounts)"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -4534,24 +4571,25 @@ msgid "Third Party (Country)"
 msgstr "Third Party (Country)"
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4573,7 +4611,7 @@ msgid "Bank Details"
 msgstr "Banka Detayları"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Taxes missing !"
@@ -4631,7 +4669,7 @@ msgid "Check Date not in the Period"
 msgstr "Check Date not in the Period"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4653,7 +4691,7 @@ msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Start period should be smaller then End period"
@@ -4669,7 +4707,6 @@ msgid "Analytic Balance -"
 msgstr "Analytic Balance -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4682,11 +4719,8 @@ msgstr "Analytic Balance -"
 #: 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
 #: 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
@@ -4696,6 +4730,16 @@ msgstr "Analytic Balance -"
 #: 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
 msgid "Target Moves"
 msgstr "Target Moves"
 
@@ -4766,7 +4810,7 @@ msgid "Line 1:"
 msgstr "Line 1:"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integrity Error !"
@@ -4812,6 +4856,8 @@ msgstr "Reconciliation result"
 #: 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
 msgid "Balance Sheet"
 msgstr "Balance Sheet"
 
@@ -4915,7 +4961,7 @@ msgstr ""
 "Bir paydaş belirtmeden borç/alacak hesabı için hareket işlemi yapamazsınız."
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4989,7 +5035,7 @@ msgstr ""
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -5017,7 +5063,7 @@ msgid "Start of period"
 msgstr "Start of period"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5075,12 +5121,12 @@ msgstr "Yevmiye Kayıt Yılı Bitişi"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5162,7 +5208,7 @@ msgid "Sort By"
 msgstr "Sort By"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5320,7 +5366,7 @@ msgid "Generate Opening Entries"
 msgstr "Generate Opening Entries"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Already Reconciled!"
@@ -5358,7 +5404,7 @@ msgstr "Child Accounts"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Write-Off"
@@ -5508,7 +5554,7 @@ msgid "# of Lines"
 msgstr "# of Lines"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "New currency is not confirured properly !"
@@ -5533,14 +5579,14 @@ msgid "Filter by"
 msgstr "Filter by"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "You can not use an inactive account!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Entries are not of the same account or already reconciled ! "
@@ -5559,6 +5605,19 @@ msgstr "Account General Journal"
 
 #. 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 "Filtre Yok"
@@ -5575,7 +5634,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "Invalid action !"
@@ -5796,7 +5855,7 @@ msgid "Companies"
 msgstr "Companies"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6072,9 +6131,9 @@ msgid "Optional create"
 msgstr "Optional create"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 "Can not find account chart for this company, Please Create account."
@@ -6225,8 +6284,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Analytic Entries Statistics"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Entries: "
@@ -6238,7 +6297,7 @@ msgstr ""
 "Seçilen bir yevmiyede manuel olarak yinelen girişler yaratabilirsiniz."
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Couldn't create move between different companies"
@@ -6284,7 +6343,7 @@ msgid "Total debit"
 msgstr "Toplam Borç"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Entry \"%s\" is not valid !"
@@ -6353,31 +6412,30 @@ msgid "  valuation: percent"
 msgstr "  valuation: percent"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6495,7 +6553,7 @@ msgid "Journal Select"
 msgstr "Günlük Seçimi"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Mevcut para birimi doğru yapılandırılmamış !"
@@ -6516,7 +6574,6 @@ msgstr "Taxes Fiscal Position"
 #: 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 "General Ledger"
@@ -6577,7 +6634,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6615,7 +6672,7 @@ msgid "Child Codes"
 msgstr "Alt Kodlar"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6777,7 +6834,7 @@ msgstr "Analytic Lines"
 #: 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 "
+"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) "
@@ -6797,7 +6854,7 @@ msgid "Lines"
 msgstr "Satırlar"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -6994,7 +7051,7 @@ msgstr ""
 "to create specific taxes in a custom domain."
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, 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"
@@ -7106,7 +7163,7 @@ msgid "Sign on Reports"
 msgstr "Raporlara Giriş"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "You can not have two open register for the same journal"
@@ -7139,6 +7196,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -7170,7 +7228,6 @@ msgstr "Opsiyonel Bilgi"
 
 #. 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
@@ -7198,13 +7255,13 @@ msgstr ""
 "the limit date for the payment of this line."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Bad account !"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7222,7 +7279,7 @@ msgid "Invoice Tax"
 msgstr "Fatura Vergisi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7468,17 +7525,17 @@ msgid "Fixed"
 msgstr "Sabitlendi"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -7541,7 +7598,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Can not %s draft/proforma/cancel invoice."
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -7592,7 +7649,7 @@ msgid "Deferral Method"
 msgstr "Erteleme Yöntemi"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Invoice '%s' is paid."
@@ -7657,7 +7714,7 @@ msgid "Associated Partner"
 msgstr "Associated Partner"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -7725,7 +7782,7 @@ msgid "Choose Fiscal Year"
 msgstr "Choose Fiscal Year"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7762,7 +7819,6 @@ msgstr "Muhasebe ve Finansal Yönetim"
 #: 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
@@ -7775,6 +7831,19 @@ msgstr "Muhasebe ve Finansal Yönetim"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Period"
@@ -7869,14 +7938,6 @@ msgstr "Tel. :"
 msgid "Company Currency"
 msgstr "Firma Dövizi"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Chart of Account"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7941,7 +8002,7 @@ msgid "Account Types"
 msgstr "Hesap Tipleri"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "Cannot create invoice move on centralised journal"
@@ -7991,8 +8052,13 @@ msgstr "Refund Journal"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr "Filter By"
 
@@ -8034,7 +8100,7 @@ msgid "Payment Term Line"
 msgstr "Ödeme Vadesi Satırı"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -8207,8 +8273,8 @@ msgid ""
 msgstr "Fiş tutarı banka ekstresi tutarı ile aynı olmalı"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Bad account!"
@@ -8219,7 +8285,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:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Merkezileştirme için  (% s) hesap hareketi onaylandı!"
@@ -8438,14 +8504,14 @@ msgid "Period from"
 msgstr "Period from"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8496,7 +8562,7 @@ msgid "Purchase Tax(%)"
 msgstr "Purchase Tax(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
@@ -8512,7 +8578,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Muhasebe Uygulamanızı Yapılandırın"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8555,18 +8621,22 @@ msgstr "Followups Management"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr "Start Period"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Cannot locate parent code for template account!"
@@ -8603,7 +8673,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr "Muhasebeci faturalardan yapılan girişleri doğrular. "
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8633,7 +8703,7 @@ msgid "You can not create move line on view account."
 msgstr "Hesap Görünümünde hareket oluşturamazsınız."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Current currency is not confirured properly !"
@@ -8685,8 +8755,12 @@ msgstr "Keep empty to use the income account"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8705,7 +8779,15 @@ msgstr "Manually or automatically entered in the system"
 
 #. 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 "Display Account"
 
@@ -8832,7 +8914,6 @@ msgstr "Manual entry"
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8840,7 +8921,7 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, 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 !"
@@ -8921,7 +9002,7 @@ msgstr "July"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Hesap Planı Kartları"
 
 #. module: account
@@ -8938,13 +9019,17 @@ msgstr "Account Analytic Balance"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr "End Period"
 
@@ -8964,8 +9049,8 @@ msgstr "End Period"
 #: 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 "Chart of account"
+msgid "Chart of Accounts"
+msgstr "Chart of Accounts"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
@@ -8983,7 +9068,7 @@ msgid "Account Subscription"
 msgstr "Account Subscription"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -9012,7 +9097,6 @@ msgstr "Entry Subscription"
 #: 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
@@ -9041,7 +9125,7 @@ msgid "Unreconciled"
 msgstr "Mutabakatsız"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Bad total !"
@@ -9106,13 +9190,13 @@ msgid "Active"
 msgstr "Etkin"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr "Bilinmeyen Hata"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9164,6 +9248,7 @@ msgstr "Hesap Hareketini Doğrula"
 #: report:account.journal.period.print: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
@@ -9246,6 +9331,18 @@ msgstr "Genel"
 #: selection:account.pl.report,filter: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
@@ -9412,6 +9509,7 @@ msgstr "Dönem Seçin"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "İşlendi"
 
@@ -9430,7 +9528,6 @@ msgstr "İşlendi"
 #: 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
@@ -9463,13 +9560,10 @@ msgid "Tax Source"
 msgstr "Vergi Kaynağı"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Net Kar"
 
@@ -9484,7 +9578,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "Yinelenen muhasebe girişleri için bir modeldir"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: 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)"
@@ -9493,8 +9587,8 @@ msgstr "Bu ürün için tanımlanmış gelir hesabı bulunmuyor: \"%s\" (id:%d)"
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "JRNL"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9638,8 +9732,8 @@ msgid "End period"
 msgstr "Dönem Sonu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9711,6 +9805,7 @@ msgstr "Tedarikçi Faturası"
 #: report:account.journal.period.print: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
@@ -9747,7 +9842,7 @@ msgid "Recurring"
 msgstr "Yinelenen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Giriş zaten uzlaştırılmış"
@@ -9768,7 +9863,7 @@ msgid "Range"
 msgstr "Kapsam"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9787,6 +9882,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "With movements"
 
@@ -9909,7 +10014,7 @@ msgid "Accounts Mapping"
 msgstr "Hesap Eşleştirmesi"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Fatura '%s' doğrulanmak için bekliyor."
@@ -9934,7 +10039,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "Seçilen ürünle ilgili gelir ve gider hesabı."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!"
@@ -10141,7 +10246,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "0 Ya da daha az bir değerde dönem süresi giremezsiniz!"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "Hesap hareketleri olan bir hesabı kaldırmazsınız!. "
@@ -10173,20 +10278,24 @@ msgstr ""
 "Alıcılar ya da satıcılar hesabına ait bir yevmiyede bakiye tutarı, bakiye "
 "para cinsi ile belirtilir (firma para cinsinden belki farklı olabilir)."
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "New Customer Invoice"
 #~ msgstr "Yeni Müşteri Faturası"
 
 #~ msgid "Confirm draft invoices"
 #~ msgstr "Ön faturayı onayla"
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Bu postanın gönderilmesinden sonra ödemeniz yapılacaktır. Lütfen gerektiği "
-#~ "zaman muhasebe bölümümüzü arayınız."
-
 #~ msgid "Select Message"
 #~ msgstr "Mesaj Seç"
 
@@ -10202,9 +10311,6 @@ msgstr ""
 #~ msgid "Entry label"
 #~ msgstr "Giriş etiketi"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Disk (%)"
-
 #~ msgid "Contact"
 #~ msgstr "Kişi"
 
@@ -10727,9 +10833,6 @@ msgstr ""
 #~ msgid "Cash Receipt"
 #~ msgstr "Nakit Tahsilatı"
 
-#~ msgid "All account entries"
-#~ msgstr "Tüm Hesap Kayıtları"
-
 #~ msgid "Date Filter"
 #~ msgstr "Tarih Filtresi"
 
@@ -10799,1169 +10902,22 @@ msgstr ""
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Giriş Tarihlerini Hesapla"
 
-#~ msgid "x Sales Credit Note Journal"
-#~ msgstr "x Satış Alacak Dekontu Yevmiyesi"
-
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Çözümleyici hesabı kapat"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Taslak Faturlar"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Hesapları faturala"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Maliyetleri faturala"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Eski Alacaklar"
-
-#~ msgid "My indicators"
-#~ msgstr "Göstergelerim"
-
-#~ msgid "Aged income"
-#~ msgstr "Yaşlandırılmış Gelir"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "Borç/Kredi Bilgisini Göster"
-
-#~ msgid "All accounts"
-#~ msgstr "Tüm hesaplar"
-
-#~ msgid "Notification"
-#~ msgstr "Bildirim"
-
-#~ msgid "Financial Period"
-#~ msgstr "Mali Dönem"
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "Hesap Bakiyesi (Yıl Karşılaştırma)"
-
-#~ msgid "Show Accounts"
-#~ msgstr "Hsapları Göster"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "En fazla 3 yıl seçebilirsiniz. Lütfen tekrar kontrol edin."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr ""
-#~ "Aşağıdaki hataları yapmış olabilirsiniz. Lütfen bunları düzeltin ve tekrar "
-#~ "deneyin."
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "En az 1 Mali Yıl seçmelisiniz. Tekrar deneyin."
-
-#~ msgid "Customize Report"
-#~ msgstr "Raporu Yapılandır"
-
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
 
 #~ msgid "Journal de frais"
 #~ msgstr "Yevmiye defteri masrafları"
 
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Sen Helen"
-
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr "No journal for ending writing has been defined for the fiscal year"
 
-#~ msgid "%j - Day of the year as a decimal number [001,366]."
-#~ msgstr "%j - Onluk sistemde Yılın günleri [001,366]."
-
-#~ msgid ""
-#~ "Triggers an automatic procurement for all products that have a virtual stock "
-#~ "under 0. You should probably not use this option, we suggest using a MTO "
-#~ "configuration on products."
-#~ msgstr ""
-#~ "Triggers an automatic procurement for all products that have a virtual stock "
-#~ "under 0. You should probably not use this option, we suggest using a MTO "
-#~ "configuration on products."
-
-#~ msgid "DateTime"
-#~ msgstr "DateTime"
-
-#~ msgid ""
-#~ "Module for defining analytic accounting object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Module for defining analytic accounting object.\n"
-#~ "    "
-
-#~ msgid "Pallet"
-#~ msgstr "Palet"
-
-#~ msgid "Net Total :"
-#~ msgstr "Net Toplam :"
-
-#~ msgid "Allows you to compute delivery costs on your quotations."
-#~ msgstr "Allows you to compute delivery costs on your quotations."
-
-#~ msgid "Provide the quantities of the returned products."
-#~ msgstr "Provide the quantities of the returned products."
-
-#~ msgid "Number of modules updated"
-#~ msgstr "Number of modules updated"
-
-#~ msgid "Metadata"
-#~ msgstr "Metadata"
-
-#~ msgid "Code (eg:en__US)"
-#~ msgstr "Kod (Örn:tr_TR)"
-
-#~ msgid "Workflow"
-#~ msgstr "İş Akışı"
-
-#~ msgid ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-#~ msgstr ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-
-#~ msgid "Inventory Control"
-#~ msgstr "Stok Kontrolü"
-
-#~ msgid "SMS - Gateway: clickatell"
-#~ msgstr "SMS - Gateway: clickatell"
-
-#~ msgid "Latest Connections"
-#~ msgstr "Son Bağlantılar"
-
-#~ msgid "Hungarian / Magyar"
-#~ msgstr "Macar"
-
-#~ msgid "Current purchases"
-#~ msgstr "Mevcut satın alımlar"
-
-#~ msgid "Not Searchable"
-#~ msgstr "Aranabilir değil"
-
 #~ msgid "Unreconcile entries"
 #~ msgstr "Unreconcile entries"
 
-#~ msgid "China"
-#~ msgstr "Çin"
-
-#~ msgid "base.update.translations"
-#~ msgstr "base.update.translations"
-
-#~ msgid "Display Menu Tips"
-#~ msgstr "Menü Yardımlarını Kullan"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Exception occurred while computing procurement orders."
-#~ msgstr "Exception occurred while computing procurement orders."
-
-#~ msgid "Split into"
-#~ msgstr "Split into"
-
-#~ msgid "The tax amount"
-#~ msgstr "Vergi miktarı"
-
-#~ msgid "Other reference or serial number"
-#~ msgstr "Other reference or serial number"
-
-#~ msgid "Incoming Products"
-#~ msgstr "Gelen Ürünler"
-
-#~ msgid "Incoming Shipments"
-#~ msgstr "Gelen Nakliyeler"
-
-#~ msgid "Change My Preferences"
-#~ msgstr "Ayarlarımı değiştir"
-
-#~ msgid "Target Window"
-#~ msgstr "Hedef Pencere"
-
-#~ msgid "Configure Picking Policy for Sales Order"
-#~ msgstr "Configure Picking Policy for Sales Order"
-
-#~ msgid "To Fix"
-#~ msgstr "To Fix"
-
-#~ msgid "# of Qty"
-#~ msgstr "# of Qty"
-
-#~ msgid "Group by partner"
-#~ msgstr "Group by partner"
-
-#~ msgid "maintenance.contract.wizard"
-#~ msgstr "maintenance.contract.wizard"
-
-#~ msgid "Go"
-#~ msgstr "Git"
-
-#~ msgid "Paid Amount"
-#~ msgstr "Ödenmiş Miktar"
-
-#~ msgid "South Korea"
-#~ msgstr "Güney Kore"
-
-#~ msgid "Transitions"
-#~ msgstr "Geçişler"
-
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Accounting Voucher"
-#~ msgstr "Accounting Voucher"
-
-#~ msgid "Swaziland"
-#~ msgstr "Svaziland"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-
-#~ msgid "Date on which purchase order has been approved"
-#~ msgstr "Date on which purchase order has been approved"
-
-#~ msgid "STOCK_CANCEL"
-#~ msgstr "STOCK_CANCEL"
-
-#~ msgid "Other Conditions"
-#~ msgstr "Diğer Şartlar"
-
-#~ msgid "Increment Number"
-#~ msgstr "Artan"
-
-#~ msgid "Company's Structure"
-#~ msgstr "Şirketin Yapısı"
-
-#~ msgid "SMS Message"
-#~ msgstr "SMS Message"
-
-#~ msgid "Merge Purchase orders"
-#~ msgstr "Satın Alma Emirlerini Birleştir"
-
-#~ msgid "Product & Location"
-#~ msgstr "Product & Location"
-
-#~ msgid "Available"
-#~ msgstr "Müsait"
-
-#~ msgid "Expected Date"
-#~ msgstr "Beklenen Tarih"
-
-#~ msgid "Check the box to group the invoices for the same customers"
-#~ msgstr "Check the box to group the invoices for the same customers"
-
-#~ msgid "Select an Open Sale Order"
-#~ msgstr "Açık Bir Satış Emri Seçin"
-
-#~ msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-
-#~ 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 the current product, this stock location will be used, instead of the "
-#~ "default one, as the source location for stock moves generated by procurements"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Customers Packings"
-#~ msgstr "Customers Packings"
-
-#~ msgid "Search Partner"
-#~ msgstr "Ortak Ara"
-
-#~ msgid "\"smtp_server\" needs to be set to send mails to users"
-#~ msgstr "\"smtp_server\" needs to be set to send mails to users"
-
-#~ msgid "supplier"
-#~ msgstr "tedarikçi"
-
-#~ msgid "new"
-#~ msgstr "yeni"
-
-#~ msgid "STOCK_GOTO_TOP"
-#~ msgstr "STOCK_GOTO_TOP"
-
-#~ msgid "On multiple doc."
-#~ msgstr "Birden fazla belge üzerinde"
-
-#~ msgid "Number of Modules"
-#~ msgstr "Modül Sayısı"
-
-#~ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-#~ msgstr "  e.g: 1 * (this unit) = ratio * (reference unit)"
-
-#~ msgid "Max. Size"
-#~ msgstr "Azami Boyut"
-
-#~ msgid "Assigns the priority to the list of product supplier."
-#~ msgstr "Assigns the priority to the list of product supplier."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-
-#~ msgid "Contact Name"
-#~ msgstr "Kişi Adı"
-
-#~ msgid ""
-#~ "Save this document to a %s file and edit it with a specific software or a "
-#~ "text editor. The file encoding is UTF-8."
-#~ msgstr ""
-#~ "Save this document to a %s file and edit it with a specific software or a "
-#~ "text editor. The file encoding is UTF-8."
-
-#~ msgid "STOCK_DELETE"
-#~ msgstr "STOCK_DELETE"
-
-#~ msgid ""
-#~ "By unchecking the active field, you may hide an INCOTERM without deleting it."
-#~ msgstr ""
-#~ "By unchecking the active field, you may hide an INCOTERM without deleting it."
-
-#~ msgid "Approbation"
-#~ msgstr "Approbation"
-
-#~ msgid "Moves Statistics"
-#~ msgstr "Hareket İstatistikleri"
-
-#~ msgid "active"
-#~ msgstr "etkin"
-
-#~ msgid "%y - Year without century as a decimal number [00,99]."
-#~ msgstr "%y - Yıl, yüzyıl olmadan onluk sistemde [00,99]."
-
-#~ msgid "Note type"
-#~ msgstr "Not tipi"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauritus"
-
-#~ msgid "STOCK_GOTO_FIRST"
-#~ msgstr "STOCK_GOTO_FIRST"
-
-#~ msgid "Main Supplier"
-#~ msgstr "Ana Tedarikçi"
-
-#~ msgid "Income View"
-#~ msgstr "Gelir Görünümü"
-
-#~ msgid "Packaging"
-#~ msgstr "Sevkiyat Paketlemesi"
-
-#~ msgid "Credit Limit"
-#~ msgstr "Kredi Limiti"
-
-#~ msgid ""
-#~ "* Draft: not confirmed yet and will not be scheduled until confirmed\n"
-#~ "* Confirmed: still waiting for the availability of products\n"
-#~ "* Available: products reserved, simply waiting for confirmation.\n"
-#~ "* Waiting: waiting for another move to proceed before it becomes "
-#~ "automatically available (e.g. in Make-To-Order flows)\n"
-#~ "* Done: has been processed, can't be modified or cancelled anymore\n"
-#~ "* Cancelled: has been cancelled, can't be confirmed anymore"
-#~ msgstr ""
-#~ "* Draft: not confirmed yet and will not be scheduled until confirmed\n"
-#~ "* Confirmed: still waiting for the availability of products\n"
-#~ "* Available: products reserved, simply waiting for confirmation.\n"
-#~ "* Waiting: waiting for another move to proceed before it becomes "
-#~ "automatically available (e.g. in Make-To-Order flows)\n"
-#~ "* Done: has been processed, can't be modified or cancelled anymore\n"
-#~ "* Cancelled: has been cancelled, can't be confirmed anymore"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Malayalam / India"
-#~ msgstr "Malayalam / India"
-
-#~ msgid "Owner"
-#~ msgstr "Sahip"
-
-#~ msgid "Source Object"
-#~ msgstr "Kaynak Obje"
-
-#~ msgid "Shop Name"
-#~ msgstr "İş Yeri Adı"
-
-#~ msgid "Config Wizard Steps"
-#~ msgstr "Yapılandırma Sihirbazı Adımları"
-
-#~ msgid "ir.ui.view_sc"
-#~ msgstr "ir.ui.view_sc"
-
-#~ msgid "Group"
-#~ msgstr "Grupla"
-
-#~ msgid "Exceptions"
-#~ msgstr "İstisnalar"
-
-#~ msgid "Procurement Corrected"
-#~ msgstr "Düzeltilen Satınalma"
-
-#~ msgid "Currency:"
-#~ msgstr "Para Birimi:"
-
-#~ msgid "This wizard will schedule procurements."
-#~ msgstr "This wizard will schedule procurements."
-
-#~ 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 !"
-
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-
-#~ msgid "Select Action Type"
-#~ msgstr "İşlem Türünü Seçin"
-
-#~ msgid "Action Views"
-#~ msgstr "Action Views"
-
-#~ msgid "Using a relation field which uses an unknown object"
-#~ msgstr "Bilinmeyen bir nesne kullanan bir ilinti alanı kullanılıyor."
-
-#~ msgid "Qty. per product"
-#~ msgstr "Ürün başına miktar"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "This is minimum quantity to purchase from Main Supplier."
-#~ msgstr "This is minimum quantity to purchase from Main Supplier."
-
-#~ msgid "Date Format"
-#~ msgstr "Tarih Biçimi"
-
-#~ msgid "E-Mail"
-#~ msgstr "E-Posta"
-
-#~ msgid "Mongolia"
-#~ msgstr "Moğolistan"
-
-#~ msgid "Let this field empty if this location is shared between all companies"
-#~ msgstr ""
-#~ "Let this field empty if this location is shared between all companies"
-
-#~ msgid "Export Name"
-#~ msgstr "Dışa Aktarım Adı"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk Adası"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Hollanda Antilleri"
-
-#~ msgid "Romania"
-#~ msgstr "Romanya"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgaristan"
-
-#~ msgid "Merge inventories"
-#~ msgstr "Merge inventories"
-
-#~ msgid "Current Rate"
-#~ msgstr "Geçerli Kur"
-
-#~ msgid "French Guyana"
-#~ msgstr "Fransız Guyanası"
-
-#~ msgid "Process Picking"
-#~ msgstr "Process Picking"
-
-#~ msgid "Original View"
-#~ msgstr "Orijinal Görünüm"
-
-#~ msgid "Qty Multiple must be greater than zero."
-#~ msgstr "Qty Multiple must be greater than zero."
-
-#~ msgid "Bosnian / bosanski jezik"
-#~ msgstr "Bosnalı"
-
-#~ msgid ""
-#~ "If you check this, then the second time the user prints with same attachment "
-#~ "name, it returns the previous report."
-#~ msgstr ""
-#~ "Bunu seçerseniz kullanıcı ikinci defa aynı eklenti adı ile çıktı alırsa, bir "
-#~ "önceki rapor kullanılır."
-
-#~ msgid "Procurement '%s' is in exception: not enough stock."
-#~ msgstr "Procurement '%s' is in exception: not enough stock."
-
-#~ msgid "This ISO code is the name of po files to use for translations"
-#~ msgstr "Tercüme için kullanılan po dosyalarının ISO kod adı."
-
-#~ msgid "STOCK_MEDIA_REWIND"
-#~ msgstr "STOCK_MEDIA_REWIND"
-
-#~ msgid "Location Input"
-#~ msgstr "Lokasyon Girişi"
-
-#~ msgid "Your system will be updated."
-#~ msgstr "Sisteminiz güncellenecektir."
-
-#~ msgid "Periodical (manual)"
-#~ msgstr "Periyodik (el ile)"
-
-#~ msgid "Country Name"
-#~ msgstr "Ülke İsmi"
-
-#~ msgid ""
-#~ "Current quantities of products in selected locations or all internal if none "
-#~ "have been selected."
-#~ msgstr ""
-#~ "Current quantities of products in selected locations or all internal if none "
-#~ "have been selected."
-
-#~ msgid "Colombia"
-#~ msgstr "Kolombiya"
-
-#~ msgid "Schedule Upgrade"
-#~ msgstr "Güncelleme Zamanla"
-
-#~ msgid "Mongolian / Mongolia"
-#~ msgstr "Mongolian / Mongolia"
-
-#~ msgid "In Progress"
-#~ msgstr "İşlemde"
-
-#~ msgid ""
-#~ "The ISO country code in two chars.\n"
-#~ "You can use this field for quick search."
-#~ msgstr ""
-#~ "İki karakterlik ISO ülke kodu.\n"
-#~ "Hızlı arama için bu alanı kullanabilirsiniz."
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Make sure you have no users linked with the group(s)!"
-#~ msgstr "Make sure you have no users linked with the group(s)!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Satışlar & Alışlar"
-
-#~ msgid "Untranslated"
-#~ msgstr "Tercüme Edilmemiş"
-
-#~ msgid ""
-#~ "Context dictionary as Python expression, empty by default (Default: {})"
-#~ msgstr ""
-#~ "Context dictionary as Python expression, empty by default (Default: {})"
-
-#~ msgid "STOCK_CUT"
-#~ msgstr "STOCK_CUT"
-
-#~ msgid "Wizards"
-#~ msgstr "Sihirbazlar"
-
-#~ msgid "XML ID"
-#~ msgstr "XML ID"
-
-#~ msgid "Custom fields must have a name that starts with 'x_' !"
-#~ msgstr "Özel alanların 'x_' ile başlayan bir adı olmalıdır !"
-
-#~ msgid "Installed"
-#~ msgstr "Yüklenmiş"
-
-#~ msgid "Select the Action Window, Report, Wizard to be executed."
-#~ msgstr "Çalıştırılacak İşlem Penceresi, Rapor, Sihirbaz'ı seçiniz."
-
-#~ msgid "Number Packages"
-#~ msgstr "Number Packages"
-
-#~ msgid "Not used in computations, for information purpose only."
-#~ msgstr "Not used in computations, for information purpose only."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#~ msgid "Export done"
-#~ msgstr "Dışa aktarım tamamlandı"
-
-#~ msgid "The total amount"
-#~ msgstr "The total amount"
-
-#~ msgid "Model Description"
-#~ msgstr "Model Açıklaması"
-
-#~ msgid "Stock Invoice Onshipping"
-#~ msgstr "Stock Invoice Onshipping"
-
-#~ msgid ""
-#~ "Optional model name of the objects on which this action should be visible"
-#~ msgstr ""
-#~ "Optional model name of the objects on which this action should be visible"
-
-#~ msgid ""
-#~ "Can 't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration Financial Accounting Accounts Journals.' % "
-#~ "(context.get('journal_type"
-#~ msgstr ""
-#~ "Can 't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration Financial Accounting Accounts Journals.' % "
-#~ "(context.get('journal_type"
-
-#~ msgid "Korean / Korea, Democratic Peoples Republic of"
-#~ msgstr "Korean / Korea, Democratic Peoples Republic of"
-
-#~ msgid "Invoice state"
-#~ msgstr "Invoice state"
-
-#~ msgid "Jordan"
-#~ msgstr "Ürdün"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Bilgi Dağarcığı Yönetimi"
-
-#~ msgid "Stock"
-#~ msgstr "Stok"
-
-#~ msgid "Shipped Qty"
-#~ msgstr "Sevk Edilen Miktar"
-
-#~ msgid "Certified"
-#~ msgstr "Certified"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritre"
-
-#~ msgid "Rounding Precision"
-#~ msgstr "Yuvarlama Hassasiyeti"
-
-#~ msgid "Bulgarian / български"
-#~ msgstr "Bulgarian / български"
-
-#~ msgid "Iraq"
-#~ msgstr "Irak"
-
-#~ msgid "Compute Schedulers"
-#~ msgstr "Compute Schedulers"
-
-#~ msgid "Confirmation"
-#~ msgstr "Onaylama"
-
-#~ msgid "The width of the package"
-#~ msgstr "The width of the package"
-
-#~ msgid "Event Type"
-#~ msgstr "Etkinlik Tipi"
-
-#~ msgid "Enter at least one field !"
-#~ msgstr "En az bir alan girin !"
-
-#~ msgid "STOCK_DIALOG_ERROR"
-#~ msgstr "STOCK_DIALOG_ERROR"
-
-#~ msgid ""
-#~ "OpenERP translations (core, modules, clients) are managed through "
-#~ "Launchpad.net, our open source project management facility. We use their "
-#~ "online interface to synchronize all translations efforts."
-#~ msgstr ""
-#~ "OpenERP translations (core, modules, clients) are managed through "
-#~ "Launchpad.net, our open source project management facility. We use their "
-#~ "online interface to synchronize all translations efforts."
-
-#~ msgid "Partner Form"
-#~ msgstr "İş Ortağı Formu"
-
-#~ msgid "Purchase Order Line Make Invoice"
-#~ msgstr "Purchase Order Line Make Invoice"
-
-#~ msgid "STOCK_INDEX"
-#~ msgstr "STOCK_INDEX"
-
-#~ msgid "Serbia"
-#~ msgstr "Sırbistan"
-
-#~ msgid "Purchase Lines Not Invoiced"
-#~ msgstr "Purchase Lines Not Invoiced"
-
-#~ msgid "Cambodia, Kingdom of"
-#~ msgstr "Kamboçya"
-
-#~ msgid "Stock Moves"
-#~ msgstr "Stok Hareketi"
-
-#~ msgid "Language Import"
-#~ msgstr "Dili İçeri Aktar"
-
-#~ msgid "Price Type"
-#~ msgstr "Fiyat Tipi"
-
-#~ msgid "res.config.users"
-#~ msgstr "res.config.users"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldivler"
-
-#~ msgid "Bank Account Type"
-#~ msgstr "Banka Hesap Türü"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "The analytic account related to a sale order"
-
-#~ msgid "Supplier of this product"
-#~ msgstr "Bu ürününün tedarikçisi"
-
-#~ msgid "Open Customer Journal Entries"
-#~ msgstr "Open Customer Journal Entries"
-
-#~ msgid "base.language.export"
-#~ msgstr "base.language.export"
-
-#~ msgid "Open a Window"
-#~ msgstr "Pencere Aç"
-
-#~ msgid "STOCK_DIALOG_QUESTION"
-#~ msgstr "STOCK_DIALOG_QUESTION"
-
-#~ msgid "Allotment Partner"
-#~ msgstr "Allotment Partner"
-
-#~ msgid ""
-#~ "Provide the field name that the record id refers to for the write operation. "
-#~ "If it is empty it will refer to the active id of the object."
-#~ msgstr ""
-#~ "Kayıt belirtecinin yazma işlemi için kullandığı alan adını giriniz. Boş "
-#~ "bırakılırsa nesnenin etkin olan belirteci kullanılacaktır. Valla."
-
-#~ msgid "Object Identifiers"
-#~ msgstr "Object Identifiers"
-
-#~ msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
-#~ msgstr ""
-#~ "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
-
-#~ msgid "Select Report"
-#~ msgstr "Raporu Seçin"
-
-#~ msgid "From a Pick list"
-#~ msgstr "From a Pick list"
-
-#~ msgid "The name of the group can not start with \"-\""
-#~ msgstr "Grup adı \"=\" ile başlayamaz"
-
-#~ msgid ","
-#~ msgstr ","
-
-#~ msgid "My Partners"
-#~ msgstr "İş Ortaklarım"
-
-#~ msgid "The EAN code of the package unit."
-#~ msgstr "The EAN code of the package unit."
-
-#~ msgid "User Ref."
-#~ msgstr "Kullanıcı Referansı"
-
-#~ msgid "Purchase Description"
-#~ msgstr "Satın Alma Açıklaması"
-
-#~ msgid "XML Report"
-#~ msgstr "XML Report"
-
-#~ msgid "Spain"
-#~ msgstr "İspanya"
-
-#~ msgid ""
-#~ "Optional domain filtering of the destination data, as a Python expression"
-#~ msgstr ""
-#~ "Optional domain filtering of the destination data, as a Python expression"
-
-#~ msgid ""
-#~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
-#~ "procurement to bring the virtual stock to the Max Quantity."
-#~ msgstr ""
-#~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
-#~ "procurement to bring the virtual stock to the Max Quantity."
-
-#~ msgid "Module Upgrade"
-#~ msgstr "Modül Güncellemesi"
-
-#~ msgid "File Format"
-#~ msgstr "Dosya Tipi"
-
-#~ msgid ""
-#~ "Groups are used to define access rights on objects and the visibility of "
-#~ "screens and menus"
-#~ msgstr ""
-#~ "Groups are used to define access rights on objects and the visibility of "
-#~ "screens and menus"
-
-#~ msgid "Mobile"
-#~ msgstr "Mobil"
-
-#~ msgid "Administration"
-#~ msgstr "Yönetim"
-
-#~ msgid "Payment term"
-#~ msgstr "Ödeme şekli"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Price ="
-#~ msgstr "Yeni Fiyat ="
-
-#~ msgid "Work Days"
-#~ msgstr "İş Günü"
-
-#~ msgid "Other OSI Approved Licence"
-#~ msgstr "Other OSI Approved Licence"
-
-#~ msgid ""
-#~ "Sets the language for the user's user interface, when UI translations are "
-#~ "available"
-#~ msgstr ""
-#~ "Sets the language for the user's user interface, when UI translations are "
-#~ "available"
-
-#~ msgid "Search Uninvoiced Lines"
-#~ msgstr "Search Uninvoiced Lines"
-
-#~ msgid "Create Menu"
-#~ msgstr "Menü Oluştur"
-
-#~ msgid "Products to Process"
-#~ msgstr "İşlenecek Ürünler"
-
-#~ msgid "India"
-#~ msgstr "Hindistan"
-
-#~ msgid "maintenance contract modules"
-#~ msgstr "bakım sözleşmesi mödülleri"
-
-#~ msgid "Create Board Menu"
-#~ msgstr "Create Board Menu"
-
-#~ msgid "Request Reference Types"
-#~ msgstr "Request Reference Types"
-
-#~ msgid "is cancelled."
-#~ msgstr "is cancelled."
-
-#~ msgid "Account :"
-#~ msgstr "Hesap :"
-
-#~ msgid "Albanian / Shqipëri"
-#~ msgstr "Albanian / Shqipëri"
-
-#~ msgid "Total Value"
-#~ msgstr "Toplam Değer"
-
-#~ msgid "Mauritania"
-#~ msgstr "Moritanya"
-
-#~ msgid ""
-#~ "If checked, all product quantities will be set to zero to help ensure a real "
-#~ "physical inventory is done"
-#~ msgstr ""
-#~ "If checked, all product quantities will be set to zero to help ensure a real "
-#~ "physical inventory is done"
-
-#~ msgid "Production lot revisions"
-#~ msgstr "Üretim Lot Revizyonu"
-
-#~ msgid "client_action_multi, client_action_relate"
-#~ msgstr "client_action_multi, client_action_relate"
-
-#~ msgid "Child Categories"
-#~ msgstr "Alt Sınıflar"
-
-#~ msgid "Fax:"
-#~ msgstr "Faks:"
-
-#~ msgid "Search Stock Picking"
-#~ msgstr "Search Stock Picking"
-
 #~ msgid "logo"
 #~ msgstr "logo"
 
-#~ msgid "workflow.workitem"
-#~ msgstr "workflow.workitem"
-
-#~ msgid "STOCK_FILE"
-#~ msgstr "STOCK_FILE"
-
-#~ msgid "Guam (USA)"
-#~ msgstr "Guam"
-
-#~ msgid "Inventory Line Id"
-#~ msgstr "Envanter Kalem No"
-
-#~ msgid "STOCK_EDIT"
-#~ msgstr "STOCK_EDIT"
-
-#~ msgid "STOCK_GO_DOWN"
-#~ msgstr "STOCK_GO_DOWN"
-
-#~ msgid "Customer Location"
-#~ msgstr "Müşteri Lokasyonu"
-
-#~ msgid "You can only delete draft moves."
-#~ msgstr "Sadece taslak hareketleri silebilirsiniz."
-
-#~ msgid "STOCK_OK"
-#~ msgstr "STOCK_OK"
-
-#~ 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 sale 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 ""
-#~ "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 sale 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."
-
-#~ msgid ""
-#~ "Set a product if this rule only apply to one product. Keep empty for all "
-#~ "products"
-#~ msgstr ""
-#~ "Set a product if this rule only apply to one product. Keep empty for all "
-#~ "products"
-
-#~ msgid "Dummy"
-#~ msgstr "Kukla"
-
-#~ msgid "In Development"
-#~ msgstr "Geliştirilmekte"
-
-#~ msgid "terp-graph"
-#~ msgstr "terp-graph"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Cayman Adaları"
-
-#~ msgid "Total Package Weight"
-#~ msgstr "Toplam Paket Ağırlığı"
-
-#~ msgid "Order Date"
-#~ msgstr "Sipariş Tarihi"
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-
-#~ msgid "Chaining Lead Time"
-#~ msgstr "Chaining Lead Time"
-
-#~ msgid "Automatic orderpoint"
-#~ msgstr "Automatic orderpoint"
-
-#~ msgid "Counter-Part Locations Properties"
-#~ msgstr "Parça-Sayaç Lokasyon Tercihleri"
-
-#~ msgid "My Board"
-#~ msgstr "My Board"
-
-#~ msgid "invalid mode for test_state"
-#~ msgstr "invalid mode for test_state"
-
-#~ msgid "Latest Activities"
-#~ msgstr "Son Yapılanlar"
-
-#~ msgid "P&L Qty"
-#~ msgstr "P&L Qty"
-
-#~ msgid "Chad"
-#~ msgstr "Çad"
-
-#~ msgid "Min Quantity"
-#~ msgstr "En Az Miktar"
-
-#~ msgid "Spanish (AR) / Español (AR)"
-#~ msgstr "İspanyolca"
-
-#~ msgid "Delivered Qty"
-#~ msgstr "Gönderilen Miktar"
-
-#~ msgid "Delete Access"
-#~ msgstr "Delete Access"
-
-#~ msgid "Niger"
-#~ msgstr "Nijer"
-
-#~ msgid "Chinese (HK)"
-#~ msgstr "Çince (HK)"
-
-#~ msgid ""
-#~ "Maturity date of entry line generated by model line '%s' of model '%s' is "
-#~ "based on partner payment term! \\n                    \n"
-#~ "Please define partner on it!\"%(line.name, model.name)))\n"
-#~ "                    if line.partner_id.property_payment_term:\n"
-#~ "                        payment_term_id = "
-#~ "line.partner_id.property_payment_term.id\n"
-#~ "                        pterm_list = pt_obj.compute(cr, uid, "
-#~ "payment_term_id, value=1, date_ref=date_maturity)\n"
-#~ "                        if pterm_list:\n"
-#~ "                            pterm_list = [l[0] for l in pterm_list]\n"
-#~ "                            pterm_list.sort()\n"
-#~ "                            date_maturity = pterm_list[-1]\n"
-#~ "\n"
-#~ "                val.update({\n"
-#~ "                    'name': line.name,\n"
-#~ "                    'quantity': line.quantity,\n"
-#~ "                    'debit': line.debit,\n"
-#~ "                    'credit': line.credit,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'move_id': move_id,\n"
-#~ "                    'partner_id': line.partner_id.id,\n"
-#~ "                    'date': context.get('date',time.strftime('%Y-%m-%d"
-#~ msgstr ""
-#~ "Maturity date of entry line generated by model line '%s' of model '%s' is "
-#~ "based on partner payment term! \\n                    \n"
-#~ "Please define partner on it!\"%(line.name, model.name)))\n"
-#~ "                    if line.partner_id.property_payment_term:\n"
-#~ "                        payment_term_id = "
-#~ "line.partner_id.property_payment_term.id\n"
-#~ "                        pterm_list = pt_obj.compute(cr, uid, "
-#~ "payment_term_id, value=1, date_ref=date_maturity)\n"
-#~ "                        if pterm_list:\n"
-#~ "                            pterm_list = [l[0] for l in pterm_list]\n"
-#~ "                            pterm_list.sort()\n"
-#~ "                            date_maturity = pterm_list[-1]\n"
-#~ "\n"
-#~ "                val.update({\n"
-#~ "                    'name': line.name,\n"
-#~ "                    'quantity': line.quantity,\n"
-#~ "                    'debit': line.debit,\n"
-#~ "                    'credit': line.credit,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'move_id': move_id,\n"
-#~ "                    'partner_id': line.partner_id.id,\n"
-#~ "                    'date': context.get('date',time.strftime('%Y-%m-%d"
-
-#~ msgid "Wizard Field"
-#~ msgstr "Sihirbaz Alanı"
-
-#~ msgid ""
-#~ "To improve or expand the official translations, you should use directly "
-#~ "Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
-#~ "Launchpad also allows uploading full .po files at once"
-#~ msgstr ""
-#~ "To improve or expand the official translations, you should use directly "
-#~ "Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
-#~ "Launchpad also allows uploading full .po files at once"
-
-#~ msgid "Used to log into the system"
-#~ msgstr "Used to log into the system"
-
-#~ msgid ""
-#~ "%W - Week number of the year (Monday as the first day of the week) as a "
-#~ "decimal number [00,53]. All days in a new year preceding the first Monday "
-#~ "are considered to be in week 0."
-#~ msgstr ""
-#~ "%U - [00,53] arasında bir ondalık sayı olarak yılın kaçıncı haftası olduğu "
-#~ "(Pazartesi haftanın ilk günü olmak üzere). Yeni bir yıldaki ilk Pazartesiden "
-#~ "önceki bütün günler 0'ıncı hafta içinde kabul edilir."
-
 #~ 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 "
@@ -11971,3037 +10927,73 @@ msgstr ""
 #~ "stay unpaid. Please, take appropriate measures in order to carry out this "
 #~ "payment in the next 8 days."
 
-#~ msgid "is ready to process."
-#~ msgstr "is ready to process."
-
-#~ msgid "Procurement & Locations"
-#~ msgstr "Satınalma & Lokasyonlar"
-
-#~ msgid "Website"
-#~ msgstr "Web sitesi"
-
-#~ msgid "Synchronize Translation"
-#~ msgstr "Tercümeyi Senkronize Et"
-
-#~ msgid ""
-#~ "If you select the View Type, it means you won't allow to create journal "
-#~ "entries using that account."
-#~ msgstr ""
-#~ "If you select the View Type, it means you won't allow to create journal "
-#~ "entries using that account."
-
-#~ msgid "S. Georgia & S. Sandwich Isls."
-#~ msgstr "Güney Georgia ve Güney Sandwich Adaları"
-
-#~ msgid "Action URL"
-#~ msgstr "İşlem URLsi"
-
 #~ msgid "Liability"
 #~ msgstr "Liability"
 
-#~ msgid "STOCK_NEW"
-#~ msgstr "STOCK_NEW"
-
-#~ msgid "Module Name"
-#~ msgstr "Modül Adı"
-
-#~ msgid "STOCK_JUSTIFY_FILL"
-#~ msgstr "STOCK_JUSTIFY_FILL"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshall Adaları"
-
-#~ msgid "Variant Price Extra"
-#~ msgstr "Değişken Fiyat İlavesi"
-
-#~ msgid "draft"
-#~ msgstr "taslak"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Revision Number"
-#~ msgstr "Revizyon Numarası"
-
-#~ msgid "Downstream Traceability"
-#~ msgstr "Downstream Traceability"
-
-#~ msgid "Search"
-#~ msgstr "Ara"
-
-#~ msgid "Moves for this pack"
-#~ msgstr "Moves for this pack"
-
-#~ msgid "Case"
-#~ msgstr "Servis Talebi"
-
-#~ msgid ""
-#~ "2. Group-specific rules are combined together with a logical AND operator"
-#~ msgstr ""
-#~ "2. Group-specific rules are combined together with a logical AND operator"
-
-#~ msgid "You cannot have 2 pricelist versions that overlap!"
-#~ msgstr "You cannot have 2 pricelist versions that overlap!"
-
-#~ msgid "To export a new language, do not select a language."
-#~ msgstr "To export a new language, do not select a language."
-
-#~ msgid "Request Date"
-#~ msgstr "Talep Tarihi"
-
-#~ msgid "Shipping Policy"
-#~ msgstr "Sevkiyat Politikası"
-
-#~ msgid "Ireland"
-#~ msgstr "İrlanda"
-
-#~ msgid ""
-#~ "Please check the Quantity in Procurement Order(s), it should not be less "
-#~ "than 1!"
-#~ msgstr ""
-#~ "Please check the Quantity in Procurement Order(s), it should not be less "
-#~ "than 1!"
-
 #~ msgid "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 #~ msgstr "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 
-#~ msgid "Purchase order '%s' is confirmed."
-#~ msgstr "'%s' satın alma emri onaylandı."
-
-#~ msgid "Features"
-#~ msgstr "Özellikler"
-
-#~ msgid "Seq"
-#~ msgstr "Sıra No"
-
-#~ msgid "Inventory Properties"
-#~ msgstr "Stok Özellikleri"
-
-#~ msgid "Version"
-#~ msgstr "Versiyon"
-
-#~ msgid "Procurements"
-#~ msgstr "Procurements"
-
-#~ msgid "Read Access"
-#~ msgstr "Okuma Erişimi"
-
-#~ msgid "Unit"
-#~ msgstr "Adet"
-
-#~ msgid ""
-#~ "The current move line is already assigned to a pack, please remove it first "
-#~ "if you really want to change it ' \\n            #                        "
-#~ "'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "The current move line is already assigned to a pack, please remove it first "
-#~ "if you really want to change it ' \\n            #                        "
-#~ "'for this product: \"%s\" (id: %d)"
-
-#~ msgid "ir.exports"
-#~ msgstr "ir.exports"
-
-#~ msgid "STOCK_MISSING_IMAGE"
-#~ msgstr "STOCK_MISSING_IMAGE"
-
-#~ msgid "STOCK_REMOVE"
-#~ msgstr "STOCK_REMOVE"
-
-#~ msgid "No language with code \"%s\" exists"
-#~ msgstr "\"%s\" koduyla bir dil mevcut değil."
-
-#~ msgid "Export Translations"
-#~ msgstr "Tercümeleri Dışarı Aktar"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Banka Hesabı Numarası"
-
-#~ msgid ""
-#~ "Provides the fields that will be used to fetch the email address, e.g. when "
-#~ "you select the invoice, then `object.invoice_address_id.email` is the field "
-#~ "which gives the correct address"
-#~ msgstr ""
-#~ "E-posta adresini bulmak için kullanılacak alanları sağlar. Örneğin, faturayı "
-#~ "seçtiğinizde 'object.invoice_address_id.email' alanı doğru adresi verir."
-
-#~ msgid "Owner Address"
-#~ msgstr "Adres Sahibi"
-
-#~ msgid "Client Actions"
-#~ msgstr "Müşteri Hareketleri"
-
-#~ msgid "Production Lots"
-#~ msgstr "Üretim Lotları"
-
-#~ msgid "Planned Lead Time (Days)"
-#~ msgstr "Planned Lead Time (Days)"
-
-#~ msgid "Location Address"
-#~ msgstr "Lokasyon Adresi"
-
-#~ msgid "Stock Journal"
-#~ msgstr "Stock Journal"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Satış Siparişi Satırı"
-
-#~ msgid "Create _Menu"
-#~ msgstr "Create _Menu"
-
-#~ msgid "on order"
-#~ msgstr "on order"
-
-#~ msgid "Apply For Delete"
-#~ msgstr "Silinmesi İçin Başvur"
-
-#~ msgid "ir.exports.line"
-#~ msgstr "ir.exports.line"
-
-#~ msgid ""
-#~ "In case there is no supplier for this product, the buyer can fill the form "
-#~ "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
-#~ msgstr ""
-#~ "In case there is no supplier for this product, the buyer can fill the form "
-#~ "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
-
-#~ msgid ""
-#~ "If you check this box, your customized translations will be overwritten and "
-#~ "replaced by the official ones."
-#~ msgstr ""
-#~ "If you check this box, your customized translations will be overwritten and "
-#~ "replaced by the official ones."
-
-#~ msgid "Stocks"
-#~ msgstr "Stoklar"
-
-#~ msgid "Main report file path"
-#~ msgstr "Main report file path"
-
-#~ msgid ""
-#~ "If set to true, the action will not be displayed on the right toolbar of a "
-#~ "form view."
-#~ msgstr ""
-#~ "Eğer doğru seçeneği seçilirse, işlem form görünümlerinin sağ araç çubuğunda "
-#~ "gösterilmeyecektir."
-
-#~ msgid "On Create"
-#~ msgstr "Oluşturmada"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
-
-#~ msgid ""
-#~ "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'.              \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "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'.              \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-
-#~ msgid "STOCK_MEDIA_PAUSE"
-#~ msgstr "STOCK_MEDIA_PAUSE"
-
-#~ msgid "Login"
-#~ msgstr "Giriş"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-
-#~ msgid "Inventory Location"
-#~ msgstr "Envanter Lokasyonu"
-
-#~ msgid ""
-#~ "Access all the fields related to the current object using expressions, i.e. "
-#~ "object.partner_id.name "
-#~ msgstr ""
-#~ "Access all the fields related to the current object using expressions, i.e. "
-#~ "object.partner_id.name "
-
-#~ msgid ""
-#~ " * The 'Draft' state is set automatically when purchase order in draft "
-#~ "state.                                        \n"
-#~ "* The 'Confirmed' state is set automatically as confirm when purchase order "
-#~ "in confirm state.                                        \n"
-#~ "* The 'Done' state is set automatically when purchase order is set as done.  "
-#~ "                                      \n"
-#~ "* The 'Cancelled' state is set automatically when user cancel purchase order."
-#~ msgstr ""
-#~ " * The 'Draft' state is set automatically when purchase order in draft "
-#~ "state.                                        \n"
-#~ "* The 'Confirmed' state is set automatically as confirm when purchase order "
-#~ "in confirm state.                                        \n"
-#~ "* The 'Done' state is set automatically when purchase order is set as done.  "
-#~ "                                      \n"
-#~ "* The 'Cancelled' state is set automatically when user cancel purchase order."
-
-#~ msgid "Stock Replacement"
-#~ msgstr "Stok Yenilemesi"
-
 #, python-format
 #~ msgid "No records found for your selection!"
 #~ msgstr "No records found for your selection!"
 
-#~ msgid "Float"
-#~ msgstr "Float"
-
-#~ msgid "m"
-#~ msgstr "m"
-
-#~ msgid "Obsolete"
-#~ msgstr "Artık Kullanılmıyor (Demode Olmuş)"
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-
-#~ msgid "STOCK_COPY"
-#~ msgstr "STOCK_COPY"
-
-#~ msgid "Synchronize Translations"
-#~ msgstr "Tercümeleri Senkronize Et"
-
-#~ msgid ""
-#~ "You try to install the module '%s' that depends on the module:'%s'.\n"
-#~ "But this module is not available in your system."
-#~ msgstr ""
-#~ "You try to install the module '%s' that depends on the module:'%s'.\n"
-#~ "But this module is not available in your system."
-
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "The sale order '%s' has been set in draft state."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Ambar Yönetimi"
-
-#~ msgid "res.request.link"
-#~ msgstr "res.request.link"
-
-#~ msgid "Wizard Info"
-#~ msgstr "Sihirbaz Bilgisi"
-
-#~ msgid "Comoros"
-#~ msgstr "Komor Adaları"
-
-#~ msgid ""
-#~ "Do not display this log if it belongs to the same object the user is working "
-#~ "on"
-#~ msgstr ""
-#~ "Do not display this log if it belongs to the same object the user is working "
-#~ "on"
-
-#~ msgid "Decimal Separator"
-#~ msgstr "Ondalık Ayırıcı"
-
-#~ msgid "East Timor"
-#~ msgstr "Doğu Timor"
-
-#~ msgid "Confirm Quotation"
-#~ msgstr "Teklifi Onayla"
-
-#~ msgid "Stock Location Analysis"
-#~ msgstr "Stock Location Analysis"
-
-#~ msgid "Template"
-#~ msgstr "Şablon"
-
-#~ msgid "Base Language 'en_US' can not be deleted !"
-#~ msgstr "Base Language 'en_US' can not be deleted !"
-
-#~ 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 ""
-#~ "* 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'."
-
 #, python-format
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Date to must be set between %s and %s"
 
-#~ msgid "PriceList"
-#~ msgstr "FiyatListesi"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Bekleme Takvimi"
-
 #~ msgid "Printing Date"
 #~ msgstr "Printing Date"
 
-#~ msgid "Dashboard Definition"
-#~ msgstr "Kontrol Paneli Tanımı"
-
-#~ msgid "All Quotations"
-#~ msgstr "Tüm Teklifler"
-
-#~ msgid "wizard.ir.model.menu.create.line"
-#~ msgstr "wizard.ir.model.menu.create.lin"
-
-#~ msgid "Zip Code"
-#~ msgstr "Zip Code"
-
-#~ msgid "Supplier Reference"
-#~ msgstr "Supplier Reference"
-
-#~ msgid "Day: %(day)s"
-#~ msgstr "Gün: %(gün)"
-
-#~ msgid "Overwrite Existing Terms"
-#~ msgstr "Overwrite Existing Terms"
-
-#~ msgid "You can not read this document! (%s)"
-#~ msgstr "Bu belgeyi okuyamazsınız! (%s)"
-
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "UnknownError"
 
-#~ msgid "STOCK_FIND_AND_REPLACE"
-#~ msgstr "STOCK_FIND_AND_REPLACE"
-
-#~ msgid "Base Object"
-#~ msgstr "Taban Nesne"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-
-#~ msgid "Inventory Moves"
-#~ msgstr "Stok Hareketleri"
-
-#~ msgid "Advance Product"
-#~ msgstr "Advance Product"
-
-#~ msgid "terp-crm"
-#~ msgstr "terp-crm"
-
-#~ msgid "Keep 0 if the action must appear on all resources."
-#~ msgstr "İşlem bütün kaynaklarda görünecekse 0 olarak bırakınız."
-
-#~ msgid "ir.rule"
-#~ msgstr "ir.rule"
-
-#~ msgid "Days"
-#~ msgstr "Günler"
-
-#~ msgid "The record id this is attached to"
-#~ msgstr "The record id this is attached to"
-
-#~ msgid "If Other Pricelist"
-#~ msgstr "Diğer F. Listesi"
-
-#~ msgid "To Purchase"
-#~ msgstr "To Purchase"
-
-#~ msgid "Location where the system will stock the finished products."
-#~ msgstr "Location where the system will stock the finished products."
-
-#~ msgid "Clear IDs"
-#~ msgstr "Clear IDs"
-
-#~ msgid "terp-calendar"
-#~ msgstr "terp-calendar"
-
-#~ msgid "Width"
-#~ msgstr "Genişlik"
-
-#~ msgid "Search ProcessNode"
-#~ msgstr "Search ProcessNode"
-
 #~ msgid "<stroke color=\"darkblue\"/>"
 #~ msgstr "<stroke color=\"darkblue\"/>"
 
-#~ msgid "Enterprise Process"
-#~ msgstr "Enterprise Process"
-
-#~ msgid "Taxes :"
-#~ msgstr "Vergiler :"
-
-#~ msgid "Expected date for the picking to be processed"
-#~ msgstr "Expected date for the picking to be processed"
-
-#~ msgid "Products Value"
-#~ msgstr "Ürün Değeri"
-
-#~ msgid ""
-#~ "Condition that is to be tested before action is executed, e.g. "
-#~ "object.list_price > object.cost_price"
-#~ msgstr ""
-#~ "İşlem çalıştırılmadan önce sınanacak durum. Örneğin object.list_price > "
-#~ "object.cost_price"
-
-#~ msgid " (copy)"
-#~ msgstr " (kopya)"
-
-#~ msgid "Picking Policy"
-#~ msgstr "Aldırma Prosedürü"
-
-#~ msgid "7.  %H:%M:%S      ==> 18:25:20"
-#~ msgstr "7. %H:%M:%S ==> 18:25:20"
-
-#~ msgid ""
-#~ "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
-#~ "object.partner_id.name ]]`"
-#~ msgstr ""
-#~ "Mesajı belirtiniz. Nesneden değerler kullanabilirsiniz. Örneğin, `Sayın [[ "
-#~ "object.parner_id.name ]]`"
-
-#~ msgid ""
-#~ "Couldn't generate the next id because some partners have an alphabetic id !"
-#~ msgstr ""
-#~ "Bir sonraki sıra no oluşturulamadı çünkü bazı ortakların alfabetik sıra "
-#~ "noları var."
-
-#~ msgid "Domain Setup"
-#~ msgstr "Domain Setup"
-
-#~ msgid "End of Lifecycle"
-#~ msgstr "Yaşam Döngüsü Bitmiş"
-
-#~ msgid "Trigger Name"
-#~ msgstr "Tetik Adı"
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Ürün Kategorisine Göre Satışlar"
-
 #~ msgid "Import Invoice"
 #~ msgstr "Import Invoice"
 
-#~ msgid "Shipped Quantities"
-#~ msgstr "Gönderilen Miktar"
-
-#~ msgid "ir.model.access"
-#~ msgstr "ir.model.access"
-
-#~ msgid "Priority"
-#~ msgstr "Öncelik"
-
-#~ msgid "Latvian / Latvia"
-#~ msgstr "Latvian / Latvia"
-
-#~ msgid "Total Tax Excluded"
-#~ msgstr "Toplam Vergi Hariçtir"
-
-#~ msgid "Source Activity"
-#~ msgstr "Kaynak Etkinliği"
-
-#~ msgid "Best price (not yet active!)"
-#~ msgstr "Best price (not yet active!)"
-
-#~ msgid "Legend (for prefix, suffix)"
-#~ msgstr "Gösterge (Ön ve Son ekler için)"
-
-#~ msgid "Formula"
-#~ msgstr "Formül"
-
-#~ msgid "Can not remove root user!"
-#~ msgstr "Root kullanıcısı kaldırılamaz!"
-
-#~ msgid "Malawi"
-#~ msgstr "Malavi"
-
-#~ msgid "%s (copy)"
-#~ msgstr "%s (copy)"
-
-#~ msgid "Second UoM"
-#~ msgstr "İkinci Birim"
-
-#~ msgid "Address Type"
-#~ msgstr "Adres Türü"
-
-#~ msgid "waiting"
-#~ msgstr "bekleniyor"
-
-#~ msgid "Source Node"
-#~ msgstr "Kaynak Node"
-
-#~ msgid "Do you want to generate the supplier invoices ?"
-#~ msgstr "Tedarikçi faturalarını üretmek ister misiniz?"
-
-#~ msgid "Full Path"
-#~ msgstr "Full Path"
-
-#~ msgid "Make to Stock"
-#~ msgstr "Stoğa Üretim"
-
-#~ msgid "References"
-#~ msgstr "Kaynaklar"
-
-#~ msgid ""
-#~ "%U - Week number of the year (Sunday as the first day of the week) as a "
-#~ "decimal number [00,53]. All days in a new year preceding the first Sunday "
-#~ "are considered to be in week 0."
-#~ msgstr ""
-#~ "%U - [00,53] arasında bir ondalık sayı olarak yılın kaçıncı haftası olduğu "
-#~ "(Pazar haftanın ilk günü olmak üzere). Yeni bir yıldaki ilk Pazardan önceki "
-#~ "bütün günler 0'ıncı hafta içinde kabul edilir."
-
-#~ msgid ""
-#~ "Model %s Does not Exist !\" % vals['relation']))\n"
-#~ "\n"
-#~ "            if self.pool.get(vals['model']):\n"
-#~ "                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-#~ "                #Added context to _auto_init for special treatment to custom "
-#~ "field for select_level\n"
-#~ "                ctx = context.copy()\n"
-#~ "                "
-#~ "ctx.update({'field_name':vals['name'],'field_state':'manual','select':vals.ge"
-#~ "t('select_level','0"
-#~ msgstr ""
-#~ "Model %s Does not Exist !\" % vals['relation']))\n"
-#~ "\n"
-#~ "            if self.pool.get(vals['model']):\n"
-#~ "                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-#~ "                #Added context to _auto_init for special treatment to custom "
-#~ "field for select_level\n"
-#~ "                ctx = context.copy()\n"
-#~ "                "
-#~ "ctx.update({'field_name':vals['name'],'field_state':'manual','select':vals.ge"
-#~ "t('select_level','0"
-
-#~ msgid "Advanced"
-#~ msgstr "Advanced"
-
-#~ msgid "Integer Big"
-#~ msgstr "Integer Big"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Vendor Payment"
-
-#~ msgid "The height of the package"
-#~ msgstr "Paketin Yüksekliği"
-
-#~ msgid "Tree"
-#~ msgstr "Ağaç"
-
-#~ msgid ""
-#~ "Keep empty if you don't want the user to be able to connect on the system."
-#~ msgstr ""
-#~ "Keep empty if you don't want the user to be able to connect on the system."
-
-#~ msgid "Create / Write / Copy"
-#~ msgstr "Create / Write / Copy"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#~ msgid "Group the invoices"
-#~ msgstr "Faturaları grupla"
-
-#~ msgid "Destination Location"
-#~ msgstr "Sevk Adresi"
-
 #~ msgid "Entry encoding"
 #~ msgstr "Entry encoding"
 
-#~ msgid "Scrap Move"
-#~ msgstr "Scrap Move"
-
-#~ msgid ""
-#~ "When using CSV format, please also check that the first line of your file is "
-#~ "one of the following:"
-#~ msgstr ""
-#~ "When using CSV format, please also check that the first line of your file is "
-#~ "one of the following:"
-
-#~ msgid "Logs"
-#~ msgstr "Logs"
-
-#~ msgid "Spanish / Español"
-#~ msgstr "Spanish / Español"
-
-#~ msgid "Supply method"
-#~ msgstr "Tedarik Yöntemi"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-
-#~ msgid "Invoice address :"
-#~ msgstr "Fatura Adresi :"
-
-#~ msgid "Logo"
-#~ msgstr "Amblem"
-
-#~ msgid "To be reviewed by the accountant."
-#~ msgstr "Muhasebe tarafından kontrol edilecek."
-
-#~ msgid "STOCK_PROPERTIES"
-#~ msgstr "STOCK_PROPERTIES"
-
-#~ msgid "Create a Menu"
-#~ msgstr "Menü Oluştur"
-
-#~ msgid "Search Contact"
-#~ msgstr "Bağlantı Ara"
-
 #, python-format
 #~ msgid "The journal must have centralised counterpart"
 #~ msgstr "The journal must have centralised counterpart"
 
-#~ msgid "New Window"
-#~ msgstr "Yeni Pencere"
-
-#~ msgid "Create invoices"
-#~ msgstr "Fatura yarat"
-
-#~ msgid "Set NULL"
-#~ msgstr "Set NULL"
-
-#~ msgid "Symbol"
-#~ msgstr "Symbol"
-
-#~ msgid "Message !"
-#~ msgstr "Message !"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamalar"
-
-#~ msgid "Attachment"
-#~ msgstr "Ek"
-
-#~ msgid "Wizard Name"
-#~ msgstr "Sihirbaz Adı"
-
-#~ msgid "Unit of Measure Properties"
-#~ msgstr "Birim Özellikleri"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Miktar (2.Br.)"
-
-#~ msgid "Internal Moves"
-#~ msgstr "Dahili Hareketler"
-
-#~ msgid "Lot Inventory"
-#~ msgstr "Lot Inventory"
-
-#~ msgid "Workflow Activity"
-#~ msgstr "Workflow Activity"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slovenya"
-
-#~ msgid ""
-#~ "Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
-#~ "GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
-#~ msgstr ""
-#~ "Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND "
-#~ "GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "Smaller than the reference UoM"
-#~ msgstr "Smaller than the reference UoM"
-
-#~ msgid ""
-#~ "Gives the margin of profitability by calculating the difference between Unit "
-#~ "Price and Cost Price."
-#~ msgstr ""
-#~ "Gives the margin of profitability by calculating the difference between Unit "
-#~ "Price and Cost Price."
-
-#~ msgid "Procure Products"
-#~ msgstr "Procure Products"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Quotation"
-#~ msgstr "Teklif"
-
-#~ msgid "Pack Identification"
-#~ msgstr "Pack Identification"
-
-#~ msgid "Georgia"
-#~ msgstr "Gürcistan"
-
-#~ msgid ""
-#~ "You can generate invoices based on sales orders or based on shippings."
-#~ msgstr ""
-#~ "You can generate invoices based on sales orders or based on shippings."
-
-#~ msgid "Execution Lead Time (Days)"
-#~ msgstr "Execution Lead Time (Days)"
-
-#~ msgid ""
-#~ "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"
-#~ msgstr ""
-#~ "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"
-
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start"
-
-#~ msgid "Poland"
-#~ msgstr "Polonya"
-
-#~ msgid "Workflow Editor"
-#~ msgstr "Workflow Editor"
-
-#~ msgid "To be removed"
-#~ msgstr "Kaldırılacak"
-
-#~ msgid "Maintenance contract added !"
-#~ msgstr "Bakım sözleşmesi eklendi !"
-
-#~ msgid "Object Name"
-#~ msgstr "Nesne Adı"
-
-#~ msgid ""
-#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-#~ "Item!"
-#~ msgstr ""
-#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-#~ "Item!"
-
-#~ msgid ""
-#~ "Enter the field/expression that will return the list. E.g. select the sale "
-#~ "order in Object, and you can have loop on the sales order line. Expression = "
-#~ "`object.order_line`."
-#~ msgstr ""
-#~ "Bu listeyi gönderecek alan/ifade. Örneğin, Object'de satış emrini seçin,  ve "
-#~ "satış emri satırında döngü yapabilirsiniz. Expression = `object.order_line`."
-
-#~ msgid "Cannot delete Procurement Order(s) which are in %s State!"
-#~ msgstr "Cannot delete Procurement Order(s) which are in %s State!"
-
-#~ msgid "Update Module List"
-#~ msgstr "Update Module List"
-
-#~ msgid "Process"
-#~ msgstr "İşlem"
-
-#~ msgid "Groups (no group = global)"
-#~ msgstr "Groups (no group = global)"
-
-#~ msgid "Receipt"
-#~ msgstr "Receipt"
-
-#~ 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 ""
-#~ "(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)"
-
-#~ msgid "Location Stock"
-#~ msgstr "Lokasyon Stoğu"
-
-#~ msgid "STOCK_NO"
-#~ msgstr "STOCK_NO"
-
-#~ msgid "Cancel Uninstall"
-#~ msgstr "Kaldırmayı İptal et"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplified"
-
-#~ msgid "Saint Tome (Sao Tome) and Principe"
-#~ msgstr "São Tomé ve Príncipe"
-
-#~ msgid "Virtual Locations"
-#~ msgstr "Sanal Lokasyon"
-
-#~ msgid "STOCK_REDO"
-#~ msgstr "STOCK_REDO"
-
-#~ msgid "Want to remove accounting entries too ?"
-#~ msgstr "Want to remove accounting entries too ?"
-
-#~ msgid "Date done"
-#~ msgstr "Tamamlanan Tarih"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
 #~ 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 "Custom Object"
-#~ msgstr "Özel Nesne"
-
-#~ msgid "Menu"
-#~ msgstr "Menü"
-
-#~ msgid "Kyrgyz Republic (Kyrgyzstan)"
-#~ msgstr "Kırgızistan"
-
-#~ msgid "Greek / Ελληνικά"
-#~ msgstr "Greek / Ελληνικά"
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
-#~ msgid "Action To Launch"
-#~ msgstr "Başlatılacak İşlem"
-
-#~ msgid "Location Content"
-#~ msgstr "Location Content"
-
-#~ msgid "Action Target"
-#~ msgstr "İşlem Hedefi"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Incoterm"
-#~ msgstr "Teslim Sekli"
-
-#~ msgid "Payment Method"
-#~ msgstr "Payment Method"
-
-#~ msgid "Validate Journal Entries of a Journal"
-#~ msgstr "Validate Journal Entries of a Journal"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Information about your new database"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Shortcut Name"
-#~ msgstr "Kısayol Adı"
-
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr "You are moving %.2f products but only %.2f available in this lot."
-
-#~ msgid "Default limit for the list view"
-#~ msgstr "Listeleme görünümü için öntanımlı sınır"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Yeni Gine"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabve"
-
-#~ msgid "Updatable"
-#~ msgstr "Updatable"
-
-#~ msgid "Import / Export"
-#~ msgstr "Import / Export"
-
-#~ msgid "Cancel Assignation"
-#~ msgstr "Cancel Assignation"
-
-#~ msgid "This field is not used, it only helps you to select the right action."
-#~ msgstr ""
-#~ "Bu alan kullanılmamaktadır; sadece doğru işlemi seçmenize yardımcı olmak "
-#~ "içindir."
-
-#~ msgid "Process Transition"
-#~ msgstr "Process Transition"
-
-#~ msgid "Products by Category"
-#~ msgstr "Kategori Bazında Ürün"
-
-#~ msgid "Email Address"
-#~ msgstr "E-posta Adresi"
-
-#~ msgid "French (BE) / Français (BE)"
-#~ msgstr "French (BE) / Français (BE)"
-
-#~ msgid "You can not write in this document! (%s)"
-#~ msgstr "Bu belgeye yazamazsınız! (%s)"
-
-#~ msgid "Server Action"
-#~ msgstr "Sunucu İşlemi"
-
-#~ 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 ""
-#~ "Technical field used to record the product cost set by the user during a "
-#~ "picking confirmation (when average price costing method is used)"
-
-#~ msgid "Trinidad and Tobago"
-#~ msgstr "Trinidad Tobago"
-
-#~ msgid "Manual In Progress"
-#~ msgstr "Manuel İşlem Devam Ediyor"
-
-#~ msgid "Latvia"
-#~ msgstr "Letonya"
-
-#~ msgid "Dashboard View"
-#~ msgstr "Kontrol Paneli Göster"
-
-#~ msgid "Include children"
-#~ msgstr "Alt ürünleri dahil et"
-
-#~ msgid "Purchase Order"
-#~ msgstr "Satınalma Siparişi"
-
-#~ msgid "Field Mappings"
-#~ msgstr "Alan Eşleşmeleri"
-
-#~ msgid "Order(Origin)"
-#~ msgstr "Sipariş (Menşei)"
-
-#~ msgid "Error!"
-#~ msgstr "Hata!"
-
-#~ msgid "Are you sure you want to merge these orders ?"
-#~ msgstr "Bu siparişleri birleştirmek istediğinize emin misiniz?"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Mevcut satış siparişi için teslimat adresi"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Vendor Invoices and Outstanding transactions"
-
-#~ msgid "Customization"
-#~ msgstr "Customization"
-
-#~ msgid "Non Updatable"
-#~ msgstr "Güncellenemez"
-
-#~ msgid "Open Balance"
-#~ msgstr "Open Balance"
-
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
-
-#~ msgid "To Sell"
-#~ msgstr "To Sell"
-
-#~ msgid "Enable Related Account"
-#~ msgstr "Enable Related Account"
-
-#~ msgid "ir.actions.act_window_close"
-#~ msgstr "ir.actions.act_window_close"
-
-#~ msgid "Virtual Stock Value"
-#~ msgstr "Sanal Stok Değeri"
-
-#~ msgid "Lots"
-#~ msgstr "Lot Bilgisi"
-
-#~ msgid "Destination"
-#~ msgstr "Hedef"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litvanya"
-
-#~ msgid ""
-#~ "Name of object whose function will be called when this scheduler will run. "
-#~ "e.g. 'res.partener'"
-#~ msgstr ""
-#~ "Name of object whose function will be called when this scheduler will run. "
-#~ "e.g. 'res.partener'"
-
-#~ msgid "Make Invoices"
-#~ msgstr "Faturalandır"
-
-#~ msgid "Requests"
-#~ msgstr "Requests"
-
-#~ msgid ""
-#~ "You Can Not Load Translation For language Due To Invalid Language/Country "
-#~ "Code"
-#~ msgstr ""
-#~ "You Can Not Load Translation For language Due To Invalid Language/Country "
-#~ "Code"
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Sales By Partner"
-
-#~ msgid "STOCK_PRINT_PREVIEW"
-#~ msgstr "STOCK_PRINT_PREVIEW"
-
-#~ msgid "Moves for this production lot"
-#~ msgstr "Moves for this production lot"
-
-#~ msgid "Module %s: Invalid Quality Certificate"
-#~ msgstr "Modül %s: Geçersiz Kalite Belgesi"
-
-#~ msgid "Field Mapping"
-#~ msgstr "Alan Eşleşmeleri"
-
-#~ msgid "Invoice Exception"
-#~ msgstr "Fatura Muafiyeti"
-
-#~ msgid "Order to Max"
-#~ msgstr "Order to Max"
-
-#~ msgid "This picking list does not require invoicing."
-#~ msgstr "Bu aldırma listesi faturalama gerektirmiyor."
-
-#~ msgid "Name of this kind of price."
-#~ msgstr "Name of this kind of price."
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid ""
-#~ "Incoterms are series of sales terms.They are used to divide transaction "
-#~ "costs and responsibilities between buyer and seller and reflect state-of-the-"
-#~ "art transportation practices."
-#~ msgstr ""
-#~ "Incoterms are series of sales terms.They are used to divide transaction "
-#~ "costs and responsibilities between buyer and seller and reflect state-of-the-"
-#~ "art transportation practices."
-
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "Setup"
-#~ msgstr "Setup"
-
-#~ msgid "Length"
-#~ msgstr "Boy/Uzunluk"
-
-#~ msgid "%p - Equivalent of either AM or PM."
-#~ msgstr "%p - AM veya PM karşılığı"
-
-#~ msgid "Iteration Actions"
-#~ msgstr "Yineleme İşlemleri"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Company where the user is connected"
-
-#~ msgid "Supplier Vouchers"
-#~ msgstr "Supplier Vouchers"
-
-#~ msgid "New Zealand"
-#~ msgstr "Yeni Zelanda"
-
-#~ msgid "It specifies goods to be delivered all at once or by direct delivery"
-#~ msgstr "It specifies goods to be delivered all at once or by direct delivery"
-
-#~ msgid "Sales in Exception"
-#~ msgstr "İstisnai Satışlar"
-
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Date not in a defined fiscal year"
 
-#~ msgid "Posted Inventory"
-#~ msgstr "Posted Inventory"
-
-#~ msgid "Can be Sold"
-#~ msgstr "Satılabilir"
-
-#~ msgid "Getting Goods"
-#~ msgstr "Getting Goods"
-
-#~ msgid ""
-#~ "Incoterm which stands for 'International Commercial terms' implies its a "
-#~ "series of sales terms which are used in the commercial transaction"
-#~ msgstr ""
-#~ "Incoterm which stands for 'International Commercial terms' implies its a "
-#~ "series of sales terms which are used in the commercial transaction"
-
-#~ msgid "Italian / Italiano"
-#~ msgstr "Italian / Italiano"
-
-#~ msgid ""
-#~ "This is the filename of the attachment used to store the printing result. "
-#~ "Keep empty to not save the printed reports. You can use a python expression "
-#~ "with the object and time variables."
-#~ msgstr ""
-#~ "Bu baskı sonucunda oluşacak ekin saklanacağı dosyanın adıdır. Basılan "
-#~ "raporları kaydetmemek için boş bırakıniz. Nesne ve zaman değişkenleri ile "
-#~ "bir python ifadesi kullanabilirsiniz."
-
-#~ msgid "Based on"
-#~ msgstr "Based on"
-
-#~ msgid ""
-#~ "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
-#~ "[INT_REF]"
-#~ msgstr ""
-#~ "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
-#~ "[INT_REF]"
-
-#~ msgid "Code for Incoterms"
-#~ msgstr "Code for Incoterms"
-
-#~ msgid "This is use as task responsible"
-#~ msgstr "This is use as task responsible"
-
-#~ msgid "STOCK_OPEN"
-#~ msgstr "STOCK_OPEN"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladeş"
-
-#~ msgid "Pricelist Version"
-#~ msgstr "Fiyat Listesi Versiyonu"
-
-#~ msgid ""
-#~ "Reference of the document that created this Procurement.\n"
-#~ "This is automatically completed by OpenERP."
-#~ msgstr ""
-#~ "Reference of the document that created this Procurement.\n"
-#~ "This is automatically completed by OpenERP."
-
-#~ msgid "Sales Lines"
-#~ msgstr "Satış Satırları"
-
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
-#~ msgid ""
-#~ "Determines whether this location is chained to another location, i.e. any "
-#~ "incoming product in this location \n"
-#~ "should next go to the chained location. The chained location is determined "
-#~ "according to the type :\n"
-#~ "* None: No chaining at all\n"
-#~ "* Customer: The chained location will be taken from the Customer Location "
-#~ "field on the Partner form of the Partner that is specified in the Picking "
-#~ "list of the incoming products.\n"
-#~ "* Fixed Location: The chained location is taken from the next field: Chained "
-#~ "Location if Fixed."
-#~ msgstr ""
-#~ "Determines whether this location is chained to another location, i.e. any "
-#~ "incoming product in this location \n"
-#~ "should next go to the chained location. The chained location is determined "
-#~ "according to the type :\n"
-#~ "* None: No chaining at all\n"
-#~ "* Customer: The chained location will be taken from the Customer Location "
-#~ "field on the Partner form of the Partner that is specified in the Picking "
-#~ "list of the incoming products.\n"
-#~ "* Fixed Location: The chained location is taken from the next field: Chained "
-#~ "Location if Fixed."
-
-#~ msgid ""
-#~ "A Pick list generates a supplier invoice. Depending on the Invoicing control "
-#~ "of the purchase order, the invoice is based on received or on ordered "
-#~ "quantities."
-#~ msgstr ""
-#~ "A Pick list generates a supplier invoice. Depending on the Invoicing control "
-#~ "of the purchase order, the invoice is based on received or on ordered "
-#~ "quantities."
-
-#~ msgid "You can not delete this document! (%s)"
-#~ msgstr "Bu belgeyi silemezsiniz! (%s)"
-
-#~ msgid "No Partner!"
-#~ msgstr "No Partner!"
-
-#~ msgid "XSL"
-#~ msgstr "XSL"
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Faturalanacak"
-
-#~ msgid "STOCK_MEDIA_PLAY"
-#~ msgstr "STOCK_MEDIA_PLAY"
-
-#~ msgid "Purchase Unit of Measure"
-#~ msgstr "Purchase Unit of Measure"
-
-#~ msgid "Can not upgrade module '%s'. It is not installed."
-#~ msgstr "'%s' modülü güncellenemiyor. Kurulu değil"
-
-#~ msgid "Cuba"
-#~ msgstr "Küba"
-
-#~ msgid "%S - Second as a decimal number [00,61]."
-#~ msgstr "%S - Onluk sistemde saniye [00,61]."
-
-#~ msgid " for the "
-#~ msgstr " için "
-
-#~ msgid "Validate Journal Entries"
-#~ msgstr "Validate Journal Entries"
-
-#~ msgid "Starting Transitions"
-#~ msgstr "Starting Transitions"
-
-#~ msgid "Create Menu For Dashboard"
-#~ msgstr "Create Menu For Dashboard"
-
-#~ msgid "Reservation Destination"
-#~ msgstr "Rezervasyon Yeri"
-
-#~ msgid "Armenia"
-#~ msgstr "Ermenistan"
-
-#~ msgid "Bill Information"
-#~ msgstr "Bill Information"
-
-#~ msgid "Non Inv"
-#~ msgstr "Non Inv"
-
-#~ msgid "Existing Lots"
-#~ msgstr "Existing Lots"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Invalid arguments"
-
-#~ msgid "Please select one and only one inventory !"
-#~ msgstr "Sadece tek bir stok seçiniz !"
-
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-
-#~ msgid "Pie charts need exactly two fields"
-#~ msgstr "Dilimli grafiklerde tam iki alan olmalıdır"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "An invoice generated for a purchase order"
-
-#~ msgid "Sweden"
-#~ msgstr "İsveç"
-
-#~ msgid "STOCK_DND_MULTIPLE"
-#~ msgstr "STOCK_DND_MULTIPLE"
-
-#~ msgid "Stock Inventory Lines"
-#~ msgstr "Stok Envanter Kalemleri"
-
-#~ msgid "Gantt"
-#~ msgstr "Gantt"
-
-#~ msgid "This is a quantity which is converted into Default Uom."
-#~ msgstr "This is a quantity which is converted into Default Uom."
-
-#~ msgid "terp-project"
-#~ msgstr "terp-project"
-
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
 #, python-format
 #~ msgid "No Data Available"
 #~ msgstr "No Data Available"
 
-#~ msgid "Auto Validate"
-#~ msgstr "Auto Validate"
-
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
-#~ msgid "Transit Location for Inter-Companies Transfers"
-#~ msgstr "Transit Location for Inter-Companies Transfers"
-
-#~ msgid "Packs"
-#~ msgstr "Packs"
-
-#~ msgid "STOCK_UNINDENT"
-#~ msgstr "STOCK_UNINDENT"
-
-#~ msgid "Iteration Action Configuration"
-#~ msgstr "Silsile İşlemi Kurulumu"
-
-#~ msgid "Austria"
-#~ msgstr "Avusturya"
-
-#~ msgid "plus"
-#~ msgstr "plus"
-
-#~ msgid "done"
-#~ msgstr "done"
-
-#~ msgid "Calendar"
-#~ msgstr "Takvim"
-
-#~ msgid "Client Action"
-#~ msgstr "İstemci İşlemi"
-
-#~ msgid "Partner Name"
-#~ msgstr "Partner Name"
-
-#~ msgid "Type of Package"
-#~ msgstr "Paket Tipi"
-
 #, python-format
 #~ msgid ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 #~ msgstr ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 
-#~ msgid ""
-#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
-#~ "Invoice after delivery'."
-#~ msgstr ""
-#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
-#~ "Invoice after delivery'."
-
-#~ msgid "Signal (subflow.*)"
-#~ msgstr "Sinyal (subflow.*)"
-
-#~ msgid "Administration Dashboard"
-#~ msgstr "Administration Dashboard"
-
-#~ msgid "Module dependency"
-#~ msgstr "Modül bağımlılığı"
-
-#~ msgid "STOCK_JUSTIFY_CENTER"
-#~ msgstr "STOCK_JUSTIFY_CENTER"
-
-#~ msgid "Latest procurement"
-#~ msgstr "Latest procurement"
-
-#~ msgid "Existing Lot"
-#~ msgstr "Existing Lot"
-
-#~ msgid "Caution!"
-#~ msgstr "Caution!"
-
-#~ msgid "Extended"
-#~ msgstr "Extended"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rapor Altı 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Raport Altı 2"
-
-#~ msgid "Access Controls"
-#~ msgstr "Erişim Kontrolleri"
-
-#~ msgid "]"
-#~ msgstr "]"
-
-#~ msgid "* ( 1 + "
-#~ msgstr "* ( 1 + "
-
-#~ msgid "Dependencies"
-#~ msgstr "Bağımlılıklar"
-
-#~ msgid "Sale Pricelists"
-#~ msgstr "Satış Fiyat Listeleri"
-
-#~ msgid "Main Company"
-#~ msgstr "Main Company"
-
-#~ msgid "Procurement Reason"
-#~ msgstr "Procurement Reason"
-
-#~ msgid "None of these picking lists require invoicing."
-#~ msgstr "None of these picking lists require invoicing."
-
-#~ msgid "Invoicing journals"
-#~ msgstr "Invoicing journals"
-
-#~ msgid "Menu Items"
-#~ msgstr "Menu Items"
-
-#~ msgid "The procurement quantity will by rounded up to this multiple."
-#~ msgstr "The procurement quantity will by rounded up to this multiple."
-
-#~ msgid "Cost Price"
-#~ msgstr "Maliyet Fiyatı"
-
-#~ msgid "You invoice has been successfully created!"
-#~ msgstr "You invoice has been successfully created!"
-
-#~ msgid ""
-#~ "If you use a formula type, use a python expression using the variable "
-#~ "'object'."
-#~ msgstr ""
-#~ "Bir formül tipi kullanıyorsanız, 'object' değişkenini kullanan bir python "
-#~ "ifadesi kullanınız."
-
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-
-#~ msgid "Birthdate"
-#~ msgstr "Doğum günü"
-
-#~ msgid "Contact Titles"
-#~ msgstr "Bağlantı Ünvanları"
-
-#~ msgid "Move History (parent moves)"
-#~ msgstr "Move History (parent moves)"
-
-#~ msgid ""
-#~ "Please double-check that the file encoding is set to UTF-8 (sometimes called "
-#~ "Unicode) when the translator exports it."
-#~ msgstr ""
-#~ "Please double-check that the file encoding is set to UTF-8 (sometimes called "
-#~ "Unicode) when the translator exports it."
-
-#~ msgid "workflow.activity"
-#~ msgstr "workflow.activity"
-
-#~ msgid "Commitment Delay"
-#~ msgstr "Commitment Delay"
-
-#~ msgid "Left"
-#~ msgstr "Sol"
-
-#~ msgid ""
-#~ "You can not remove the admin user as it is used internally for resources "
-#~ "created by OpenERP (updates, module installation, ...)"
-#~ msgstr ""
-#~ "Admin kullanıcısını çıkaramazsınız, OpenERP tarafından oluşturulmuş "
-#~ "kaynaklar (güncellemeler, modül kurulumu, ...) bu kullanıcıya bağlıdır."
-
-#~ msgid "Searchable"
-#~ msgstr "Aranabilir"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguay"
-
-#~ msgid "Usage"
-#~ msgstr "Usage"
-
-#~ msgid "Locations"
-#~ msgstr "Locations"
-
-#~ msgid "Apply For Write"
-#~ msgstr "Apply For Write"
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-
-#~ msgid "Stock Replacement result"
-#~ msgstr "Stock Replacement result"
-
-#~ msgid "Prefix"
-#~ msgstr "Önek"
-
-#~ msgid "STOCK_DISCONNECT"
-#~ msgstr "STOCK_DISCONNECT"
-
-#~ msgid "Voucher"
-#~ msgstr "Fiş"
-
-#~ msgid "Select the Signal name that is to be used as the trigger."
-#~ msgstr "Tetik olarak kullanılacak Sinyal adını seçiniz."
-
-#~ msgid "Fields Mapping"
-#~ msgstr "Alan Eşleşmeleri"
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Müşteriye Göre Satışlar"
-
-#~ msgid "Dest. Location"
-#~ msgstr "Dest. Location"
-
-#~ msgid "Sir"
-#~ msgstr "Bay"
-
-#~ msgid "Select module package to import (.zip file):"
-#~ msgstr "Select module package to import (.zip file):"
-
-#~ msgid "ID Ref."
-#~ msgstr "Belirteç Referansı"
-
-#~ msgid "French / Français"
-#~ msgstr "French / Français"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Could not cancel sale order !"
-#~ msgstr "Could not cancel sale order !"
-
-#~ msgid "Sale Order Lines"
-#~ msgstr "Satış Sipariş Kalemleri"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid ""
-#~ "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
-#~ "becomes a confirmed Purchase Order."
-#~ msgstr ""
-#~ "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
-#~ "becomes a confirmed Purchase Order."
-
-#~ msgid "Products Price Search"
-#~ msgstr "Products Price Search"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Delivery Costs"
-
-#~ msgid "Stock Locations"
-#~ msgstr "Stok Yerleri"
-
-#~ msgid "Instances"
-#~ msgstr "Örnekler"
-
-#~ msgid "Check this box if the partner is an Employee."
-#~ msgstr "Check this box if the partner is an Employee."
-
-#~ msgid "Custom python parser"
-#~ msgstr "Custom python parser"
-
-#~ msgid "_Import"
-#~ msgstr "_Import"
-
-#~ msgid "Channel"
-#~ msgstr "Kanal"
-
-#~ msgid ""
-#~ "Standard Price: the cost price is fixed and recomputed periodically (usually "
-#~ "at the end of the year), Average Price: the cost price is recomputed at each "
-#~ "reception of products."
-#~ msgstr ""
-#~ "Standard Price: the cost price is fixed and recomputed periodically (usually "
-#~ "at the end of the year), Average Price: the cost price is recomputed at each "
-#~ "reception of products."
-
-#~ msgid "Default Unit of Measure used for all stock operation."
-#~ msgstr "Default Unit of Measure used for all stock operation."
-
-#~ msgid "Creation of the product"
-#~ msgstr "Creation of the product"
-
-#~ msgid "Unvalidated"
-#~ msgstr "Doğrulanmadı"
-
-#~ msgid "Url"
-#~ msgstr "Url"
-
-#~ msgid "Database Structure"
-#~ msgstr "Database Structure"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Hint Okyanusu İngiliz Bölgesi"
-
 #~ msgid "</drawString>"
 #~ msgstr "</drawString>"
 
-#~ msgid ""
-#~ "There is no inventory variation account defined on the product category: "
-#~ "\"%s\" (id: %d)"
-#~ msgstr ""
-#~ "There is no inventory variation account defined on the product category: "
-#~ "\"%s\" (id: %d)"
-
-#~ msgid "Unable to find a valid contract"
-#~ msgstr "Geçerli bir sözleşme bulunamadı"
-
-#~ msgid "Please specify an action to launch !"
-#~ msgstr "Lütfen başlatılacak bir işlem seçiniz !"
-
-#~ msgid "To Approve"
-#~ msgstr "To Approve"
-
-#~ msgid "STOCK_JUSTIFY_RIGHT"
-#~ msgstr "Copy text   \t STOCK_JUSTIFY_RIGHT"
-
-#~ msgid "Board View"
-#~ msgstr "Pano Görünümü"
-
-#~ msgid "Sale Price"
-#~ msgstr "Satış Fiyatı"
-
-#~ msgid "Create Pick List"
-#~ msgstr "Create Pick List"
-
-#~ msgid "Target Node"
-#~ msgstr "Hedef Node"
-
-#~ msgid "Right-to-Left"
-#~ msgstr "Sağdan Sola"
-
-#~ msgid "Physical Locations"
-#~ msgstr "Fiziksel Lokasyon"
-
-#~ msgid "Select recurring to create a manualy recurring accounting entries"
-#~ msgstr "Select recurring to create a manualy recurring accounting entries"
-
-#~ msgid "Price Discount"
-#~ msgstr "Fiyat İskontosu"
-
-#~ msgid "STOCK_STOP"
-#~ msgstr "STOCK_STOP"
-
-#~ msgid "Track Outgoing Lots"
-#~ msgstr "Track Outgoing Lots"
-
-#~ msgid "Title"
-#~ msgstr "Başlık"
-
-#~ msgid "Payment Ref"
-#~ msgstr "Payment Ref"
-
-#~ msgid "Serbian / Serbia"
-#~ msgstr "Serbian / Serbia"
-
-#~ msgid "If not set, acts as a default value for new resources"
-#~ msgstr "If not set, acts as a default value for new resources"
-
-#~ msgid "STOCK_SAVE"
-#~ msgstr "STOK_KAYDET"
-
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-
-#~ msgid "terp-account"
-#~ msgstr "Copy text   \t terp-account"
-
-#~ 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.\"\"\" % "
-#~ "(line.account_id.code, line.account_id.name)))\n"
-#~ "\n"
-#~ "            if abs(amount) < 10 ** -4:\n"
-#~ "                # If the move is balanced\n"
-#~ "                # Add to the list of valid moves\n"
-#~ "                # (analytic lines will be created later for valid moves)\n"
-#~ "                valid_moves.append(move)\n"
-#~ "\n"
-#~ "                # Check whether the move lines are confirmed\n"
-#~ "\n"
-#~ "                if not line_draft_ids:\n"
-#~ "                    continue\n"
-#~ "                # Update the move lines (set them as valid)\n"
-#~ "\n"
-#~ "                obj_move_line.write(cr, uid, line_draft_ids, {\n"
-#~ "                    'journal_id': move.journal_id.id,\n"
-#~ "                    'period_id': move.period_id.id,\n"
-#~ "                    'state': 'valid'\n"
-#~ "                }, context, check=False)\n"
-#~ "\n"
-#~ "                account = {}\n"
-#~ "                account2 = {}\n"
-#~ "\n"
-#~ "                if journal.type in ('purchase','sale"
-#~ msgstr ""
-#~ "\"\"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.\"\"\" % "
-#~ "(line.account_id.code, line.account_id.name)))\n"
-#~ "\n"
-#~ "            if abs(amount) < 10 ** -4:\n"
-#~ "                # If the move is balanced\n"
-#~ "                # Add to the list of valid moves\n"
-#~ "                # (analytic lines will be created later for valid moves)\n"
-#~ "                valid_moves.append(move)\n"
-#~ "\n"
-#~ "                # Check whether the move lines are confirmed\n"
-#~ "\n"
-#~ "                if not line_draft_ids:\n"
-#~ "                    continue\n"
-#~ "                # Update the move lines (set them as valid)\n"
-#~ "\n"
-#~ "                obj_move_line.write(cr, uid, line_draft_ids, {\n"
-#~ "                    'journal_id': move.journal_id.id,\n"
-#~ "                    'period_id': move.period_id.id,\n"
-#~ "                    'state': 'valid'\n"
-#~ "                }, context, check=False)\n"
-#~ "\n"
-#~ "                account = {}\n"
-#~ "                account2 = {}\n"
-#~ "\n"
-#~ "                if journal.type in ('purchase','sale"
-
-#~ msgid "Workflow Transitions"
-#~ msgstr "Workflow Transitions"
-
-#~ msgid "New picking invoices"
-#~ msgstr "New picking invoices"
-
-#~ msgid "Today"
-#~ msgstr "Bugün"
-
-#~ msgid "Recursion error in modules dependencies !"
-#~ msgstr "Modül bağımlılılklarında özyineleme hatası !"
-
-#~ msgid ""
-#~ "This wizard helps you add a new language to your OpenERP system. After "
-#~ "loading a new language it becomes available as default interface language "
-#~ "for users and partners."
-#~ msgstr ""
-#~ "This wizard helps you add a new language to your OpenERP system. After "
-#~ "loading a new language it becomes available as default interface language "
-#~ "for users and partners."
-
-#~ msgid "Wizard Button"
-#~ msgstr "Sihirbaz Düğmesi"
-
-#~ msgid "Search Procurement"
-#~ msgstr "Search Procurement"
-
-#~ msgid "Compute Stock Minimum Rules Only"
-#~ msgstr "Compute Stock Minimum Rules Only"
-
-#~ msgid ""
-#~ "Value Added Tax number. Check the box if the partner is subjected to the "
-#~ "VAT. Used by the VAT legal statement."
-#~ msgstr ""
-#~ "Katma Değer Vergisi numarası. Ortak KDV'ye tabi ise bu kutuyu seçiniz. KDV "
-#~ "hakkındaki yasal bildirimde kullanılır."
-
-#~ msgid ""
-#~ "Internal reference number in case it differs from the manufacturer's serial "
-#~ "number"
-#~ msgstr ""
-#~ "Internal reference number in case it differs from the manufacturer's serial "
-#~ "number"
-
-#~ msgid "Ukrainian / украї́нська мо́ва"
-#~ msgstr "Ukrainian / украї́нська мо́ва"
-
-#~ msgid "Default Purchase Pricelist"
-#~ msgstr "Varsayılan Alış Fiyat Listesi"
-
-#~ msgid "2.  %a ,%A         ==> Fri, Friday"
-#~ msgstr "2. %a ,%A ==> Cum, Cuma"
-
-#~ msgid "Picking list"
-#~ msgstr "Picking list"
-
-#~ msgid "Pricelist Versions"
-#~ msgstr "Fiyat Listesi Versiyonları"
-
-#~ msgid "Search Vouchers"
-#~ msgstr "Search Vouchers"
-
-#~ msgid "Stock journal"
-#~ msgstr "Stok Defteri"
-
-#~ msgid "Human Resources"
-#~ msgstr "Human Resources"
-
-#~ msgid "Required Groups"
-#~ msgstr "Required Groups"
-
-#~ msgid "RML  (deprecated - use Report)"
-#~ msgstr "RML  (deprecated - use Report)"
-
-#~ msgid "Supplier Product Code"
-#~ msgstr "Tedarikçi Ürün Kodu"
-
-#~ msgid "Ref #"
-#~ msgstr "Ref #"
-
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no income account defined ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-
-#~ msgid "Field Information"
-#~ msgstr "Field Information"
-
-#~ msgid "If no group is specified the rule is global and applied to everyone"
-#~ msgstr "If no group is specified the rule is global and applied to everyone"
-
-#~ msgid "Search Actions"
-#~ msgstr "Search Actions"
-
-#~ msgid "Configuration Parameters"
-#~ msgstr "Configuration Parameters"
-
-#~ msgid "Base Prices"
-#~ msgstr "Temel Fiyatlar"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Etiyopya"
-
-#~ msgid "12. %w              ==> 5 ( Friday is the 6th day)"
-#~ msgstr "12. %w ==> 5 ( Cuma 6'ncı gün)"
-
-#~ msgid "Global"
-#~ msgstr "Global"
-
-#~ msgid "Incoming Products Delay"
-#~ msgstr "Incoming Products Delay"
-
-#~ msgid "%x - Appropriate date representation."
-#~ msgstr "%x - Kabul edilen tarih sunumu."
-
-#~ msgid "Text"
-#~ msgstr "Metin"
-
-#~ msgid "Use Directly"
-#~ msgstr "Use Directly"
-
-#~ msgid "Process Later"
-#~ msgstr "Daha Sonra İşle"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tacikistan"
-
-#~ msgid "Reports"
-#~ msgstr "Reports"
-
-#~ msgid "No supplier defined for this product !"
-#~ msgstr "No supplier defined for this product !"
-
-#~ msgid "Purchase Orders Statistics"
-#~ msgstr "Purchase Orders Statistics"
-
-#~ msgid "GPL-2 or later version"
-#~ msgstr "GPL-2 veya sonraki sürümü"
-
-#~ msgid "Invoice on Order After Delivery"
-#~ msgstr "Sipariş Teslimatı Sonrası Fatura Çıkar"
-
-#~ msgid "Calendar View"
-#~ msgstr "Takvimi Göster"
-
-#~ msgid "Minimum Inventory Rule"
-#~ msgstr "Minimum Inventory Rule"
-
-#~ msgid "Internal Location"
-#~ msgstr "Internal Location"
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid "Real Stock Value"
-#~ msgstr "Fiili Stok Değeri"
-
-#~ msgid "Force Assignation"
-#~ msgstr "Force Assignation"
-
-#~ msgid "Associations"
-#~ msgstr "Associations"
-
-#~ msgid "ir.property"
-#~ msgstr "ir.property"
-
-#~ msgid ""
-#~ "Manages your Purchase Requisition and allows you to easily keep track and "
-#~ "manage all your purchase orders."
-#~ msgstr ""
-#~ "Manages your Purchase Requisition and allows you to easily keep track and "
-#~ "manage all your purchase orders."
-
-#~ msgid "Form"
-#~ msgstr "Form"
-
-#~ msgid "Company Website"
-#~ msgstr "Company Website"
-
-#~ msgid "    Month-1    "
-#~ msgstr "    Month-1    "
-
-#~ msgid "Montenegro"
-#~ msgstr "Karadağ"
-
-#~ msgid ""
-#~ "This is the average delay in days between the purchase order confirmation "
-#~ "and the reception of goods for this product and for the default supplier. It "
-#~ "is used by the scheduler to order requests based on reordering delays."
-#~ msgstr ""
-#~ "This is the average delay in days between the purchase order confirmation "
-#~ "and the reception of goods for this product and for the default supplier. It "
-#~ "is used by the scheduler to order requests based on reordering delays."
-
-#~ msgid "Default Public Pricelist Version"
-#~ msgstr "Varsayılan Genel Fiyat Listesi"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Values for Event Type"
-#~ msgstr "Etkinlik Türü için Değerler"
-
-#~ msgid "Working Time"
-#~ msgstr "Working Time"
-
-#~ msgid "Technical Data"
-#~ msgstr "Teknik Veri"
-
-#~ msgid "Categories"
-#~ msgstr "Sınıflandırmalar"
-
-#~ msgid "Send SMS"
-#~ msgstr "Send SMS"
-
-#~ msgid ""
-#~ "If you encode manually a Procurement, you probably want to use a make to "
-#~ "order method."
-#~ msgstr ""
-#~ "If you encode manually a Procurement, you probably want to use a make to "
-#~ "order method."
-
-#~ msgid "Libya"
-#~ msgstr "Libya"
-
-#~ msgid ""
-#~ "From Order: a draft invoice will be pre-generated based on the purchase "
-#~ "order. The accountant will just have to validate this invoice for control.\n"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-#~ msgstr ""
-#~ "From Order: a draft invoice will be pre-generated based on the purchase "
-#~ "order. The accountant will just have to validate this invoice for control.\n"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-
-#~ msgid "Pay Invoice"
-#~ msgstr "Pay Invoice"
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid ""
-#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
-#~ "pick' or 'Invoice on order after delivery'."
-#~ msgstr ""
-#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
-#~ "pick' or 'Invoice on order after delivery'."
-
-#~ msgid "Central African Republic"
-#~ msgstr "Orta Afrika Cumhuriyeti"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until re-"
-#~ "supplying. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Make to Stock': When needed, take from the stock or wait until re-"
-#~ "supplying. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Lihtenştayn"
-
-#~ msgid "Voucher Entry"
-#~ msgstr "Voucher Entry"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "Ltd"
-#~ msgstr "Ltd."
-
-#~ msgid ""
-#~ "You have to select a customer in the sale form !\n"
-#~ "Please set one customer before choosing a product."
-#~ msgstr ""
-#~ "You have to select a customer in the sale form !\n"
-#~ "Please set one customer before choosing a product."
-
-#~ msgid "["
-#~ msgstr "["
-
-#~ msgid "Hindi / India"
-#~ msgstr "Hindi / India"
-
-#~ msgid ""
-#~ "This is computed as the minimum scheduled date of all purchase order lines' "
-#~ "products."
-#~ msgstr ""
-#~ "This is computed as the minimum scheduled date of all purchase order lines' "
-#~ "products."
-
-#~ msgid "Pay Directly"
-#~ msgstr "Pay Directly"
-
-#~ msgid "EAN13"
-#~ msgstr "EAN13"
-
-#~ msgid "Food Industry"
-#~ msgstr "Food Industry"
-
-#~ msgid "Portugal"
-#~ msgstr "Portekiz"
-
-#~ msgid "Sales Manager Dashboard"
-#~ msgstr "Satış Müdürü Ana Ekranı"
-
-#~ msgid "Unvalid"
-#~ msgstr "Geçersiz"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
-#~ msgid "Quality Certificate"
-#~ msgstr "Kalite Belgesi"
-
-#~ msgid "6.  %d, %m         ==> 05, 12"
-#~ msgstr "6. %d, %m ==> 05, 12"
-
-#~ msgid "Last Connection"
-#~ msgstr "Last Connection"
-
-#~ msgid "Field %d should be a figure"
-#~ msgstr "%d alanı rakam olmalıdır"
-
-#~ msgid ""
-#~ "The rule only applies if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "The rule only applies if the partner buys/sells more than this quantity."
-
-#~ msgid "Action description"
-#~ msgstr "Action description"
-
-#~ msgid "Check this box if the partner is a customer."
-#~ msgstr "Ortak müşteri ise bu kutuyu işaretleyiniz."
-
-#~ msgid "Sales by Product Category"
-#~ msgstr "Sales by Product Category"
-
-#~ msgid "No Customer Defined !"
-#~ msgstr "No Customer Defined !"
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Invoice from Delivery"
-
-#~ msgid "Production Lot Revisions"
-#~ msgstr "Üretim Lot Revizyonu"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Satıcı Tarafından Satışlar"
-
-#~ msgid "Languages"
-#~ msgstr "Diller"
-
-#~ msgid "The number of packages by layer"
-#~ msgstr "The number of packages by layer"
-
-#~ msgid "Xor"
-#~ msgstr "Xor"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ekvador"
-
-#~ msgid "Node"
-#~ msgstr "Node"
-
-#~ msgid ""
-#~ "Save this document to a .CSV file and open it with your favourite "
-#~ "spreadsheet software. The file encoding is UTF-8. You have to translate the "
-#~ "latest column before reimporting it."
-#~ msgstr ""
-#~ "Save this document to a .CSV file and open it with your favourite "
-#~ "spreadsheet software. The file encoding is UTF-8. You have to translate the "
-#~ "latest column before reimporting it."
-
-#~ msgid "Reference UoM for this category"
-#~ msgstr "Reference UoM for this category"
-
-#~ msgid ""
-#~ "If the selected language is loaded in the system, all documents related to "
-#~ "this partner will be printed in this language. If not, it will be english."
-#~ msgstr ""
-#~ "Seçilen dil systemde yüklü ise bu ortağa ait bütün belgeler bu dilde "
-#~ "yazdırılacaktır. Aksi taktirde, İngilizce kullanılır."
-
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 
-#~ msgid "Base Field"
-#~ msgstr "Taban Alan"
-
-#~ msgid "mdx"
-#~ msgstr "mdx"
-
-#~ msgid "Procurement Location"
-#~ msgstr "Satınalma Lokasyonu"
-
-#~ msgid "Action ID"
-#~ msgstr "Action ID"
-
-#~ msgid "Reference of the document that generated this purchase order request."
-#~ msgstr ""
-#~ "Reference of the document that generated this purchase order request."
-
-#~ msgid "Restart"
-#~ msgstr "Restart"
-
-#~ msgid "SXW content"
-#~ msgstr "SXW İçeriği"
-
-#~ msgid "Action to Trigger"
-#~ msgstr "Tetiklenecek İşlem"
-
-#~ msgid ""
-#~ "\n"
-#~ "    The base module to manage quotations and sales orders.\n"
-#~ "\n"
-#~ "    * Workflow with validation steps:\n"
-#~ "        - Quotation -> Sale 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"
-#~ "    The base module to manage quotations and sales orders.\n"
-#~ "\n"
-#~ "    * Workflow with validation steps:\n"
-#~ "        - Quotation -> Sale 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"
-#~ "    "
-
-#~ msgid "Constraint"
-#~ msgstr "Kısıtlama"
-
-#~ msgid "Default"
-#~ msgstr "Öntanımlı"
-
-#~ msgid "Currency in which Unit Cost is expressed"
-#~ msgstr "Currency in which Unit Cost is expressed"
-
-#~ msgid "Default Filters"
-#~ msgstr "Default Filters"
-
-#~ msgid "Summary"
-#~ msgstr "Özet"
-
-#~ msgid "The net weight in Kg."
-#~ msgstr "The net weight in Kg."
-
-#~ msgid "Import current product inventory from the following location"
-#~ msgstr "Import current product inventory from the following location"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
-#~ msgid "Quotations"
-#~ msgstr "Quotations"
-
-#~ msgid "Expression"
-#~ msgstr "Expression"
-
-#~ msgid ""
-#~ "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
-#~ "object.partner_id.name ]]`"
-#~ msgstr ""
-#~ "Konuyu belirtiniz. Nesneden alanlar da kullanabilirsiniz. Örneğin, `Merhaba "
-#~ "[[ object.partner_id.name ]]`"
-
-#~ msgid "Header/Footer"
-#~ msgstr "Sayfa Üstü / Sayfa Altı"
-
-#~ msgid "Destination Move"
-#~ msgstr "Destination Move"
-
 #~ msgid "All periods if empty"
 #~ msgstr "All periods if empty"
 
-#~ msgid "Purchase order '%s' is cancelled."
-#~ msgstr "Purchase order '%s' is cancelled."
-
-#~ msgid "TVA :"
-#~ msgstr "TVA :"
-
-#~ msgid "Decimal Precision"
-#~ msgstr "Decimal Precision"
-
-#~ msgid "Lebanon"
-#~ msgstr "Lübnan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Vatikan"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Example: http://openerp.com"
-
-#~ msgid "Module .ZIP file"
-#~ msgstr "Module .ZIP file"
-
-#~ msgid "Purchase Order Lines"
-#~ msgstr "Purchase Order Lines"
-
-#~ msgid "Base Setup"
-#~ msgstr "Base Setup"
-
-#~ msgid "Additional Reference"
-#~ msgstr "Additional Reference"
-
-#~ msgid "Trigger Object"
-#~ msgstr "Tetik Nesnesi"
-
-#~ msgid "Digits"
-#~ msgstr "Digits"
-
-#~ msgid "Diagram"
-#~ msgstr "Diagram"
-
-#~ msgid "Current Activity"
-#~ msgstr "Current Activity"
-
-#~ msgid "Action traceability "
-#~ msgstr "Action traceability "
-
-#~ msgid "Incoming Transitions"
-#~ msgstr "Incoming Transitions"
-
-#~ msgid "Create Delivery Order"
-#~ msgstr "Create Delivery Order"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Properties composition"
-#~ msgstr "Properties composition"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid ""
-#~ "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
-#~ "may be uploaded to launchpad."
-#~ msgstr ""
-#~ "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
-#~ "may be uploaded to launchpad."
-
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Bad Lot Assignation !"
-
-#~ msgid "Procurement"
-#~ msgstr "Satınalma"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Inventory loss"
-#~ msgstr "Inventory loss"
-
-#~ msgid "Sequence Type"
-#~ msgstr "Silsile Çeşidi"
-
-#~ msgid "Products Moves"
-#~ msgstr "Products Moves"
-
-#~ msgid ""
-#~ "You try to upgrade a module that depends on the module: %s.\n"
-#~ "But this module is not available in your system."
-#~ msgstr ""
-#~ "You try to upgrade a module that depends on the module: %s.\n"
-#~ "But this module is not available in your system."
-
-#~ msgid "Create Procurement Order"
-#~ msgstr "Create Procurement Order"
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-
-#~ msgid "Invalid operation"
-#~ msgstr "Geçersiz işlem"
-
-#~ msgid "SQL Constraint"
-#~ msgstr "SQL Kısıtlaması"
-
-#~ msgid ""
-#~ "The selected language has been successfully installed. You must change the "
-#~ "preferences of the user and open a new menu to view the changes."
-#~ msgstr ""
-#~ "The selected language has been successfully installed. You must change the "
-#~ "preferences of the user and open a new menu to view the changes."
-
-#~ msgid "Warehouse board"
-#~ msgstr "Warehouse board"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Ekvatoral Gine"
-
-#~ msgid "STOCK_GOTO_LAST"
-#~ msgstr "STOCK_GOTO_LAST"
-
-#~ msgid "Effective date for accounting entries"
-#~ msgstr "Effective date for accounting entries"
-
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
-#~ msgid "Produce"
-#~ msgstr "Üret"
-
-#~ msgid "Back Order %s Assigned to this Packing."
-#~ msgstr "Back Order %s Assigned to this Packing."
-
-#~ msgid "Please change partner and try again !"
-#~ msgstr "Please change partner and try again !"
-
-#~ msgid "Purchase Lead Time"
-#~ msgstr "Purchase Lead Time"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Christmas Adası"
-
-#~ msgid "Untax Amount"
-#~ msgstr "Untax Amount"
-
-#~ msgid "Tells the user if he can use the product or not."
-#~ msgstr "Tells the user if he can use the product or not."
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Sale Advance Payment Invoice"
-
-#~ msgid "Max. Margin"
-#~ msgstr "En Fazla Kar"
-
-#~ msgid "To Do"
-#~ msgstr "To Do"
-
-#~ msgid "Other Actions Configuration"
-#~ msgstr "Diğer İşlemleri Yapılandırma"
-
-#~ msgid "Zip"
-#~ msgstr "Posta Kodu"
-
-#~ msgid "FYROM"
-#~ msgstr "FYROM"
-
-#~ msgid "STOCK_UNDELETE"
-#~ msgstr "STOCK_UNDELETE"
-
-#~ msgid "Set as Todo"
-#~ msgstr "Set as Todo"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Teslimat Emri"
-
-#~ msgid "%c - Appropriate date and time representation."
-#~ msgstr "%c - Kabul edilen tarih ve zaman sunumu."
-
-#~ msgid "Manual Operation"
-#~ msgstr "Manuel Operasyon"
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Helps you manage your marketing campaigns step by step."
-
-#~ msgid "Finland / Suomi"
-#~ msgstr "Finland / Suomi"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolivya"
-
-#~ msgid ""
-#~ "Account Voucher module includes all the basic requirements of\n"
-#~ "    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
-#~ "etc...\n"
-#~ "    * Voucher Entry\n"
-#~ "    * Voucher Receipt\n"
-#~ "    * Cheque Register\n"
-#~ "    "
-#~ msgstr ""
-#~ "Account Voucher module includes all the basic requirements of\n"
-#~ "    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
-#~ "etc...\n"
-#~ "    * Voucher Entry\n"
-#~ "    * Voucher Receipt\n"
-#~ "    * Cheque Register\n"
-#~ "    "
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Originial Amount"
-
-#~ msgid "Trigger Expression"
-#~ msgstr "Tetik Ifadesi"
-
-#~ msgid "Customer Invoices to Validate"
-#~ msgstr "Customer Invoices to Validate"
-
-#~ msgid "Split inventory lines"
-#~ msgstr "Split inventory lines"
-
-#~ msgid "Split lines"
-#~ msgstr "Split lines"
-
-#~ msgid "Views"
-#~ msgstr "Görünümler"
-
-#~ msgid "Rules"
-#~ msgstr "Kurallar"
-
-#~ msgid "Urdu / Pakistan"
-#~ msgstr "Urdu / Pakistan"
-
-#~ msgid "You try to remove a module that is installed or will be installed"
-#~ msgstr "Kurulu veya kurulacak bir modülü kaldırmaya çalışıyorsunuz."
-
-#~ msgid ""
-#~ "The kind of action or button in the client side that will trigger the action."
-#~ msgstr "İstemci tarafında işlemi tetikleyecek eylem veya tuş çeşidi."
-
-#~ msgid "STOCK_PASTE"
-#~ msgstr "STOCK_PASTE"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "The number of layers on a pallet or box"
-#~ msgstr "The number of layers on a pallet or box"
-
-#~ msgid "Workflows"
-#~ msgstr "İş Akışları"
-
-#~ msgid "res.partner.title"
-#~ msgstr "res.partner.title"
-
-#~ msgid "Sales Application Configuration"
-#~ msgstr "Sales Application Configuration"
-
-#~ msgid "Weigths"
-#~ msgstr "Ağırlık Bilgisi"
-
-#~ msgid ""
-#~ "This wizard will plan the procurement for this product. This procurement may "
-#~ "generate task, production orders or purchase orders."
-#~ msgstr ""
-#~ "This wizard will plan the procurement for this product. This procurement may "
-#~ "generate task, production orders or purchase orders."
-
-#~ msgid "tree_but_action, client_print_multi"
-#~ msgstr "tree_but_action, client_print_multi"
-
-#~ msgid "were scrapped"
-#~ msgstr "were scrapped"
-
-#~ msgid ""
-#~ "You have to configure account base code and account tax code on the '%s' tax!"
-#~ msgstr ""
-#~ "You have to configure account base code and account tax code on the '%s' tax!"
-
-#~ msgid ""
-#~ "0=Very Urgent\n"
-#~ "10=Not urgent"
-#~ msgstr ""
-#~ "0=Çok Acil\n"
-#~ "10=Acil Değil"
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Gives the sequence order when displaying a list of pricelist items."
-
-#~ msgid "Could not cancel purchase order !"
-#~ msgstr "Could not cancel purchase order !"
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-
-#~ msgid "Quotation / Order"
-#~ msgstr "Teklif / Sipariş"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesoto"
-
-#~ msgid ""
-#~ "Product's cost for accounting stock valuation. It is the base price for the "
-#~ "supplier price."
-#~ msgstr ""
-#~ "Product's cost for accounting stock valuation. It is the base price for the "
-#~ "supplier price."
-
-#~ msgid "Quantity per lot"
-#~ msgstr "Quantity per lot"
-
-#~ msgid "Additional Info"
-#~ msgstr "Additional Info"
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-
-#~ msgid ""
-#~ "How many times this UoM is bigger than the reference UoM in this category:\n"
-#~ "1 * (this unit) = ratio * (reference unit)"
-#~ msgstr ""
-#~ "How many times this UoM is bigger than the reference UoM in this category:\n"
-#~ "1 * (this unit) = ratio * (reference unit)"
-
-#~ msgid "System Configuration Done"
-#~ msgstr "System Configuration Done"
-
-#~ msgid "Tree can only be used in tabular reports"
-#~ msgstr "Ağaç sadece tablolanabilir raporlarda kullanılaibilir"
-
-#~ msgid "Generic"
-#~ msgstr "Generic"
-
-#~ msgid "Internal Picking List"
-#~ msgstr "Internal Picking List"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-
-#~ msgid "Split"
-#~ msgstr "Split"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "Company is not specified in Location"
-#~ msgstr "Company is not specified in Location"
-
-#~ msgid ""
-#~ "Quantities of products that are planned to leave in selected locations or "
-#~ "all internal if none have been selected."
-#~ msgstr ""
-#~ "Quantities of products that are planned to leave in selected locations or "
-#~ "all internal if none have been selected."
-
-#~ msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
-#~ msgstr "1. %c ==> Cum Ara 5 18:25:20 2008"
-
-#~ msgid "Pricelists"
-#~ msgstr "Fiyat Listeleri"
-
-#~ msgid "Channels"
-#~ msgstr "Kanallar"
-
-#~ msgid "Purchase Pricelist"
-#~ msgstr "Alış Fiyat Listesi"
-
-#~ msgid "Mexico"
-#~ msgstr "Meksika"
-
-#~ msgid "Shipping Unit"
-#~ msgstr "Shipping Unit"
-
-#~ msgid "ir.actions.actions"
-#~ msgstr "ir.actions.actions"
-
-#~ msgid ""
-#~ "If you have groups, the visibility of this menu will be based on these "
-#~ "groups. If this field is empty, OpenERP will compute visibility based on the "
-#~ "related object's read access."
-#~ msgstr ""
-#~ "If you have groups, the visibility of this menu will be based on these "
-#~ "groups. If this field is empty, OpenERP will compute visibility based on the "
-#~ "related object's read access."
-
-#~ msgid "STOCK_CONNECT"
-#~ msgstr "STOCK_CONNECT"
-
-#~ msgid "Uninvoiced and Delivered Lines"
-#~ msgstr "Faturalanmamış ve Teslimedilen Kalemler"
-
-#~ msgid "Key"
-#~ msgstr "Anahtar"
-
-#~ msgid "RML Header"
-#~ msgstr "RML Başlığı"
-
-#~ msgid "View Type"
-#~ msgstr "View Type"
-
-#~ msgid "Want to check Ean ? "
-#~ msgstr "Want to check Ean ? "
-
-#~ msgid "RFQ"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid ""
-#~ "Unable %s the module \"%s\" because an external dependencie is not met: %s' "
-#~ "% (newstate, module.name, e.args[0])))\n"
-#~ "            if not module.dependencies_id:\n"
-#~ "                mdemo = module.demo\n"
-#~ "            if module.state in states_to_update:\n"
-#~ "                self.write(cr, uid, [module.id], {'state': newstate, "
-#~ "'demo':mdemo})\n"
-#~ "            demo = demo or mdemo\n"
-#~ "        return demo\n"
-#~ "\n"
-#~ "    def button_install(self, cr, uid, ids, context={}):\n"
-#~ "        return self.state_update(cr, uid, ids, 'to install', "
-#~ "['uninstalled'], context)\n"
-#~ "\n"
-#~ "    def button_install_cancel(self, cr, uid, ids, context={}):\n"
-#~ "        self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def button_uninstall(self, cr, uid, ids, context={}):\n"
-#~ "        for module in self.browse(cr, uid, ids):\n"
-#~ "            cr.execute('''select m.state,m.name\n"
-#~ "                from\n"
-#~ "                    ir_module_module_dependency d\n"
-#~ "                join\n"
-#~ "                    ir_module_module m on (d.module_id=m.id)\n"
-#~ "                where\n"
-#~ "                    d.name=%s and\n"
-#~ "                    m.state not in ('uninstalled','uninstallable','to remove"
-#~ msgstr ""
-#~ "Unable %s the module \"%s\" because an external dependencie is not met: %s' "
-#~ "% (newstate, module.name, e.args[0])))\n"
-#~ "            if not module.dependencies_id:\n"
-#~ "                mdemo = module.demo\n"
-#~ "            if module.state in states_to_update:\n"
-#~ "                self.write(cr, uid, [module.id], {'state': newstate, "
-#~ "'demo':mdemo})\n"
-#~ "            demo = demo or mdemo\n"
-#~ "        return demo\n"
-#~ "\n"
-#~ "    def button_install(self, cr, uid, ids, context={}):\n"
-#~ "        return self.state_update(cr, uid, ids, 'to install', "
-#~ "['uninstalled'], context)\n"
-#~ "\n"
-#~ "    def button_install_cancel(self, cr, uid, ids, context={}):\n"
-#~ "        self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def button_uninstall(self, cr, uid, ids, context={}):\n"
-#~ "        for module in self.browse(cr, uid, ids):\n"
-#~ "            cr.execute('''select m.state,m.name\n"
-#~ "                from\n"
-#~ "                    ir_module_module_dependency d\n"
-#~ "                join\n"
-#~ "                    ir_module_module m on (d.module_id=m.id)\n"
-#~ "                where\n"
-#~ "                    d.name=%s and\n"
-#~ "                    m.state not in ('uninstalled','uninstallable','to remove"
-
-#~ msgid "Please specify at least one non-zero quantity!"
-#~ msgstr "Please specify at least one non-zero quantity!"
-
-#~ msgid "No Account Base Code and Account Tax Code!"
-#~ msgstr "No Account Base Code and Account Tax Code!"
-
-#~ msgid "Height"
-#~ msgstr "Yükseklik"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "Parent Location"
-#~ msgstr "Ana Lokasyon"
-
-#~ msgid "Full Access"
-#~ msgstr "Full Access"
-
-#~ msgid "Please provide a positive quantity to scrap!"
-#~ msgstr "Please provide a positive quantity to scrap!"
-
-#~ msgid ""
-#~ "Forces to specify a Production Lot for all moves containing this product and "
-#~ "going to a Customer Location"
-#~ msgstr ""
-#~ "Forces to specify a Production Lot for all moves containing this product and "
-#~ "going to a Customer Location"
-
-#~ msgid "Security"
-#~ msgstr "Güvenlik"
-
 #~ msgid "Options"
 #~ msgstr "Options"
 
-#~ msgid "from stock: products assigned."
-#~ msgstr "from stock: products assigned."
-
-#~ msgid "Ratio & Precision"
-#~ msgstr "Ratio & Precision"
-
-#~ msgid "Schedule for Installation"
-#~ msgstr "Kurulmak Üzere Sıraya Koy"
-
-#~ msgid "OpenERP Favorites"
-#~ msgstr "OpenERP Favorites"
-
-#~ msgid "South Africa"
-#~ msgstr "Güney Afrika"
-
-#~ msgid "Quotation Date"
-#~ msgstr "Quotation Date"
-
-#~ msgid "Currencies"
-#~ msgstr "Para Birimleri"
-
-#~ msgid ""
-#~ "Wizard checks all the stock minimum rules and generate procurement order."
-#~ msgstr ""
-#~ "Wizard checks all the stock minimum rules and generate procurement order."
-
-#~ msgid "Supplier Information"
-#~ msgstr "Supplier Information"
-
-#~ msgid "Advanced Search"
-#~ msgstr "Gelişmiş Arama"
-
-#~ msgid "Waiting Supplier Ack"
-#~ msgstr "Waiting Supplier Ack"
-
-#~ msgid "Translation Terms"
-#~ msgstr "Translation Terms"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Hungary"
-#~ msgstr "Macaristan"
-
-#~ msgid "res.groups"
-#~ msgstr "res.groups"
-
-#~ msgid ""
-#~ "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
-#~ "procurement to bring the virtual stock to the Max Quantity."
-#~ msgstr ""
-#~ "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
-#~ "procurement to bring the virtual stock to the Max Quantity."
-
-#~ msgid "Brazil"
-#~ msgstr "Brezilya"
-
-#~ msgid "  Year  "
-#~ msgstr "  Year  "
-
-#~ msgid "Affero GPL-3"
-#~ msgstr "Affero GPL-3"
-
-#~ msgid "Expression to be satisfied if we want the transition done."
-#~ msgstr "Expression to be satisfied if we want the transition done."
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "Created Moves"
-#~ msgstr "Oluşan Hareketler"
-
-#~ msgid "Rates"
-#~ msgstr "Oranlar"
-
-#~ msgid "Syria"
-#~ msgstr "Suriye"
-
-#~ msgid "======================================================"
-#~ msgstr "======================================================"
-
-#~ msgid ""
-#~ "Provides fields that be used to fetch the mobile number, e.g. you select the "
-#~ "invoice, then `object.invoice_address_id.mobile` is the field which gives "
-#~ "the correct mobile number"
-#~ msgstr ""
-#~ "Cep telefonu numarasının alınacağı alanı sağlar. Örneğin, Fatura nesnesini "
-#~ "seçtiğiniz zaman  `object.invoice_address_id.mobile` ifadesi doğru cep "
-#~ "telefonu numarasını verecektir."
-
-#~ msgid "System update completed"
-#~ msgstr "System update completed"
-
-#~ msgid "Procurement of sold material"
-#~ msgstr "Procurement of sold material"
-
-#~ msgid "Field Selection"
-#~ msgstr "Alan Seçimi"
-
-#~ msgid "Stock report by production lots"
-#~ msgstr "Üretim Lotlarına Göre Stok Raporu"
-
-#~ msgid "Localization"
-#~ msgstr "Localization"
-
-#~ msgid "Stock report by tracking lots"
-#~ msgstr "Stock report by tracking lots"
-
-#~ msgid ""
-#~ "Sets a location if you produce at a fixed location. This can be a partner "
-#~ "location if you subcontract the manufacturing operations."
-#~ msgstr ""
-#~ "Sets a location if you produce at a fixed location. This can be a partner "
-#~ "location if you subcontract the manufacturing operations."
-
-#~ msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-#~ msgstr "  e.g: 1 * (reference unit) = ratio * (this unit)"
-
-#~ msgid "Default multi company"
-#~ msgstr "Default multi company"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows to configure the price accuracy you need for different "
-#~ "kind\n"
-#~ "of usage: accounting, sales, purchases, ...\n"
-#~ "\n"
-#~ "The decimal precision is configured per company.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "This module allows to configure the price accuracy you need for different "
-#~ "kind\n"
-#~ "of usage: accounting, sales, purchases, ...\n"
-#~ "\n"
-#~ "The decimal precision is configured per company.\n"
-
-#~ msgid "Information about a product supplier"
-#~ msgstr "Ürün tedarikçisi hakkında Bilgi"
-
-#~ msgid "SXW path"
-#~ msgstr "SXW dosya yolu"
-
-#~ msgid "Post"
-#~ msgstr "Post"
-
-#~ msgid "Search Process Transition"
-#~ msgstr "Search Process Transition"
-
-#~ msgid "Parent Menu"
-#~ msgstr "Üst Menü"
-
-#~ msgid "Merging is only allowed on draft inventories."
-#~ msgstr "Merging is only allowed on draft inventories."
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
-#~ msgid "Attached To"
-#~ msgstr "Ekli Olduğu"
-
 #~ 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."
@@ -15009,6820 +11001,133 @@ msgstr ""
 #~ "All draft account entries in this journal and period will be validated. It "
 #~ "means you won't be able to modify their accouting fields."
 
-#~ msgid "Days to Validate"
-#~ msgstr "Days to Validate"
-
-#~ msgid "Warehouse Dashboard"
-#~ msgstr "Warehouse Dashboard"
-
-#~ msgid "Calculate Product Price per unit base on pricelist version."
-#~ msgstr "Calculate Product Price per unit base on pricelist version."
-
-#~ msgid "purchase.installer"
-#~ msgstr "purchase.installer"
-
-#~ msgid "Homepage Widgets"
-#~ msgstr "Homepage Widgets"
-
-#~ msgid ""
-#~ "The name and address of the contact who requested the order or quotation."
-#~ msgstr ""
-#~ "The name and address of the contact who requested the order or quotation."
-
-#~ msgid "Move/Entry label"
-#~ msgstr "Move/Entry label"
-
-#~ msgid "Swedish / svenska"
-#~ msgstr "Swedish / svenska"
-
-#~ msgid "Invoice Based on Sales Orders"
-#~ msgstr "Satış Siparişleri Bağlı Fatura"
-
-#~ msgid "You cannot remove the picking which is in %s state !"
-#~ msgstr "You cannot remove the picking which is in %s state !"
-
-#~ msgid "Child Companies"
-#~ msgstr "Alt Şirketler"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nikaragua"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Pricelist version for current sale order"
-
-#~ msgid "Inventory"
-#~ msgstr "Inventory"
-
-#~ msgid "General Description"
-#~ msgstr "Genel Tanım"
-
-#~ msgid "Customer Reference"
-#~ msgstr "Customer Reference"
-
-#~ msgid "Configure Your Interface"
-#~ msgstr "Configure Your Interface"
-
-#~ msgid "Chained Company"
-#~ msgstr "Chained Company"
-
-#~ msgid "Field"
-#~ msgstr "Field"
-
-#~ msgid "9.  %j              ==> 340"
-#~ msgstr "9. %j ==> 340"
-
-#~ msgid "Ordering Contact"
-#~ msgstr "Sipariş Adresi"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambiya"
-
-#~ msgid ""
-#~ "The internal user that is in charge of communicating with this partner if "
-#~ "any."
-#~ msgstr "Eğer varsa, bu ortak ile iletişimden sorumlu sistem kullanıcısı."
-
-#~ msgid "Parent Partner"
-#~ msgstr "Ana Ortak"
-
-#~ msgid "Norway"
-#~ msgstr "Norveç"
-
-#~ msgid "Attachment Name"
-#~ msgstr "Ek Adı"
-
-#~ msgid "Cancel Upgrade"
-#~ msgstr "Yükseltme İptal"
-
-#~ msgid ""
-#~ "There is no stock input account defined for this product or its category: "
-#~ "\"%s\" (id: %d)"
-#~ msgstr ""
-#~ "There is no stock input account defined for this product or its category: "
-#~ "\"%s\" (id: %d)"
-
-#~ msgid "Min. Quantity"
-#~ msgstr "Mil. Miktar"
-
-#~ msgid "Internal Reference"
-#~ msgstr "Internal Reference"
-
-#~ msgid "Ivory Coast (Cote D'Ivoire)"
-#~ msgstr "Fildişi Sahilleri"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazakistan"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed. Consumables are stockable "
-#~ "products with infinite stock, or for use when you have no inventory "
-#~ "management in the system."
-#~ msgstr ""
-#~ "Will change the way procurements are processed. Consumables are stockable "
-#~ "products with infinite stock, or for use when you have no inventory "
-#~ "management in the system."
-
-#~ msgid "Import Inventory"
-#~ msgstr "Import Inventory"
-
-#~ msgid ""
-#~ "If set to true, the action will not be displayed on the right toolbar of a "
-#~ "form view"
-#~ msgstr ""
-#~ "If set to true, the action will not be displayed on the right toolbar of a "
-#~ "form view"
-
-#~ msgid "Write Id"
-#~ msgstr "Yazma Belirteci"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Process Now"
-#~ msgstr "Process Now"
-
-#~ msgid "Logistical shipping unit: pallet, box, pack ..."
-#~ msgstr "Logistical shipping unit: pallet, box, pack ..."
-
-#~ msgid ""
-#~ "All selected journal entries will be validated and posted. It means you "
-#~ "won't be able to modify their accouting fields."
-#~ msgstr ""
-#~ "All selected journal entries will be validated and posted. It means you "
-#~ "won't be able to modify their accouting fields."
-
-#~ msgid "Decimal Precision Configuration"
-#~ msgstr "Decimal Precision Configuration"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Invoice address for current sale order"
-
-#~ msgid "Application Terms"
-#~ msgstr "Application Terms"
-
-#~ msgid "View Architecture"
-#~ msgstr "Görünüm Yapısı"
-
-#~ msgid ""
-#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
-#~ "The real stock is %.2f %s. (without reservations)"
-#~ msgstr ""
-#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
-#~ "The real stock is %.2f %s. (without reservations)"
-
-#~ msgid ""
-#~ "The user's timezone, used to perform timezone conversions between the server "
-#~ "and the client."
-#~ msgstr ""
-#~ "The user's timezone, used to perform timezone conversions between the server "
-#~ "and the client."
-
-#~ msgid "Demo data"
-#~ msgstr "Demo veri"
-
 #~ msgid "1cm 27.7cm 20cm 27.7cm"
 #~ msgstr "1cm 27.7cm 20cm 27.7cm"
 
-#~ msgid "English (UK)"
-#~ msgstr "English (UK)"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antartika"
-
-#~ msgid "Stock Output Account"
-#~ msgstr "Stok Çıkış Hes."
-
-#~ msgid "SCHEDULER"
-#~ msgstr "SCHEDULER"
-
-#~ msgid ""
-#~ "Source activity. When this activity is over, the condition is tested to "
-#~ "determine if we can start the ACT_TO activity."
-#~ msgstr ""
-#~ "Source activity. When this activity is over, the condition is tested to "
-#~ "determine if we can start the ACT_TO activity."
-
-#~ msgid "Publish a note"
-#~ msgstr "Bir Not Yayınla"
-
-#~ msgid "ir.actions.act_window.view"
-#~ msgstr "ir.actions.act_window.view"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Logonuz - Yaklaşık 450x150 pixel olmalıdır."
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "You may only return pickings that are Confirmed, Available or Done!"
-#~ msgstr "You may only return pickings that are Confirmed, Available or Done!"
-
-#~ msgid "Menu Create"
-#~ msgstr "Menu Create"
-
-#~ msgid "English (CA)"
-#~ msgstr "English (CA)"
-
-#~ msgid ""
-#~ "Move date: scheduled date until move is done, then date of actual move "
-#~ "processing"
-#~ msgstr ""
-#~ "Move date: scheduled date until move is done, then date of actual move "
-#~ "processing"
-
-#~ msgid "Process Node"
-#~ msgstr "Process Node"
-
-#~ msgid "Invoice is already created."
-#~ msgstr "Invoice is already created."
-
-#~ msgid "Base Price"
-#~ msgstr "Taban Fiyatı"
-
-#~ msgid "Date on which this document has been created"
-#~ msgstr "Date on which this document has been created"
-
-#~ msgid "Entry No"
-#~ msgstr "Entry No"
-
-#~ msgid "%H - Hour (24-hour clock) as a decimal number [00,23]."
-#~ msgstr "%H - Saat (24-saatlik) ondalık sayı olarak [00,23]."
-
-#~ msgid "%M - Minute as a decimal number [00,59]."
-#~ msgstr "%M - Dakika ondalık sayı olarak [00,59]."
-
-#~ msgid "Validated By"
-#~ msgstr "Validated By"
-
-#~ msgid "The state code in three chars.\n"
-#~ msgstr "Üç karakterden oluşan eyalet kodu.\n"
-
-#~ msgid "Svalbard and Jan Mayen Islands"
-#~ msgstr "Svalbard ve Jan Mayen"
-
-#~ msgid "ir.actions.wizard"
-#~ msgstr "ir.actions.wizard"
-
-#~ msgid "Nodes"
-#~ msgstr "Nodes"
-
 #~ msgid "Continue"
 #~ msgstr "Devam Et"
 
-#~ msgid "Input Picking List"
-#~ msgstr "Input Picking List"
-
-#~ msgid "Wallis and Futuna Islands"
-#~ msgstr "Wallis ve Futuna Adaları"
-
-#~ msgid "Hours"
-#~ msgstr "Saat"
-
-#~ msgid "Account voucher unreconcile"
-#~ msgstr "Account voucher unreconcile"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This is the base module for managing products and pricelists in "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "    Products support variants, different pricing methods, suppliers\n"
-#~ "    information, make to stock/order, different unit of measures,\n"
-#~ "    packaging and properties.\n"
-#~ "\n"
-#~ "    Pricelists support:\n"
-#~ "    * Multiple-level of discount (by product, category, quantities)\n"
-#~ "    * Compute price based on different criteria:\n"
-#~ "        * Other pricelist,\n"
-#~ "        * Cost price,\n"
-#~ "        * List price,\n"
-#~ "        * Supplier price, ...\n"
-#~ "    Pricelists preferences by product and/or partners.\n"
-#~ "\n"
-#~ "    Print product labels with barcode.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    This is the base module for managing products and pricelists in "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "    Products support variants, different pricing methods, suppliers\n"
-#~ "    information, make to stock/order, different unit of measures,\n"
-#~ "    packaging and properties.\n"
-#~ "\n"
-#~ "    Pricelists support:\n"
-#~ "    * Multiple-level of discount (by product, category, quantities)\n"
-#~ "    * Compute price based on different criteria:\n"
-#~ "        * Other pricelist,\n"
-#~ "        * Cost price,\n"
-#~ "        * List price,\n"
-#~ "        * Supplier price, ...\n"
-#~ "    Pricelists preferences by product and/or partners.\n"
-#~ "\n"
-#~ "    Print product labels with barcode.\n"
-#~ "    "
-
-#~ msgid "Process Transitions Actions"
-#~ msgstr "Process Transitions Actions"
-
-#~ msgid "Tracking a move"
-#~ msgstr "Tracking a move"
-
-#~ msgid "From Order"
-#~ msgstr "Siparişten"
-
-#~ msgid "Stock Journals"
-#~ msgstr "Stock Journals"
-
-#~ msgid "Document of the move to the output or to the customer."
-#~ msgstr "Document of the move to the output or to the customer."
-
-#~ msgid "Install Language"
-#~ msgstr "Install Language"
-
-#~ msgid "Main Supplier who has highest priority in Supplier List."
-#~ msgstr "Main Supplier who has highest priority in Supplier List."
-
-#~ msgid "Services"
-#~ msgstr "Services"
-
-#~ msgid "Customer ref"
-#~ msgstr "Müşteri ref."
-
-#~ msgid "STOCK_DIALOG_WARNING"
-#~ msgstr "STOCK_DIALOG_WARNING"
-
-#~ msgid "STOCK_ZOOM_IN"
-#~ msgstr "STOCK_ZOOM_IN"
-
-#~ msgid "Audit"
-#~ msgstr "Audit"
-
-#~ msgid "closed"
-#~ msgstr "closed"
-
-#~ msgid "get"
-#~ msgstr "get"
-
-#~ msgid "On delete property for many2one fields"
-#~ msgstr "many2one alanlarda silinmede gerçekleştirilecek özellik"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Accounting & Finance"
-
-#~ msgid "Products"
-#~ msgstr "Ürünler"
-
-#~ msgid "You can not remove the model '%s' !"
-#~ msgstr "Bu modeli kaldıramazsınız '%s' !"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominik Cumhuriyeti"
-
-#~ msgid "Reports :"
-#~ msgstr "Reports :"
-
-#~ msgid "Confirmation Date"
-#~ msgstr "Confirmation Date"
-
-#~ msgid "STOCK_ITALIC"
-#~ msgstr "STOCK_ITALIC"
-
-#~ msgid "Please be patient, as this operation may take a few seconds..."
-#~ msgstr "Please be patient, as this operation may take a few seconds..."
-
-#~ msgid "Operation forbidden"
-#~ msgstr "Operation forbidden"
-
-#~ msgid "SMS Configuration"
-#~ msgstr "SMS Yapılandırma"
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Gives the state of the quotation or sale 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'."
-
-#~ msgid "Pallet Dimension"
-#~ msgstr "Palet Boyutu"
-
-#~ msgid "Access Controls List"
-#~ msgstr "Erişim Kısıtlama Listesi"
-
-#~ msgid "USA Minor Outlying Islands"
-#~ msgstr "ABD Çevresi Adaları"
-
-#~ msgid "The gross weight in Kg."
-#~ msgstr "Kg Brüt ağırlığı"
-
-#~ msgid ""
-#~ "This wizard allows you to run all procurement, production and/or purchase "
-#~ "orders that should be processed based on their configuration. By default, "
-#~ "the scheduler is launched automatically every night by OpenERP. You can use "
-#~ "this menu to force it to be launched now. Note that it runs in the "
-#~ "background, you may have to wait for a few minutes until it has finished "
-#~ "computing."
-#~ msgstr ""
-#~ "This wizard allows you to run all procurement, production and/or purchase "
-#~ "orders that should be processed based on their configuration. By default, "
-#~ "the scheduler is launched automatically every night by OpenERP. You can use "
-#~ "this menu to force it to be launched now. Note that it runs in the "
-#~ "background, you may have to wait for a few minutes until it has finished "
-#~ "computing."
-
-#~ msgid "Search Inventory"
-#~ msgstr "Search Inventory"
-
-#~ msgid "Bank Type"
-#~ msgstr "Banka Türü"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
-
-#~ msgid "Init Date"
-#~ msgstr "Başlatma Tarihi"
-
-#~ msgid "STOCK_MEDIA_PREVIOUS"
-#~ msgstr "STOCK_MEDIA_PREVIOUS"
-
-#~ msgid "Location"
-#~ msgstr "Location"
-
-#~ msgid "Flow Start"
-#~ msgstr "Flow Start"
-
-#~ msgid "Bank Account Owner"
-#~ msgstr "Banka Hesabı Sahibi"
-
-#~ msgid "Client Actions Connections"
-#~ msgstr "İstemci İşlemleri Bağlantıları"
-
-#~ msgid "Sinhalese / Sri Lanka"
-#~ msgstr "Sinhalese / Sri Lanka"
-
-#~ msgid "Resource Name"
-#~ msgstr "Resource Name"
-
-#~ msgid ""
-#~ "Total quantity after split exceeds the quantity to split ' \\n               "
-#~ "                     'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Total quantity after split exceeds the quantity to split ' \\n               "
-#~ "                     'for this product: \"%s\" (id: %d)"
-
-#~ msgid "Memo"
-#~ msgstr "Memo"
-
-#~ msgid "Planned Date"
-#~ msgstr "Planned Date"
-
-#~ msgid "Group By"
-#~ msgstr "Group By"
-
-#~ msgid "Guadeloupe (French)"
-#~ msgstr "Guadeloupe (Fransız)"
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Draft state of sale order"
-
-#~ msgid "User Error"
-#~ msgstr "User Error"
-
-#~ msgid ""
-#~ "When the operation of transition comes from a button pressed in the client "
-#~ "form, signal tests the name of the pressed button. If signal is NULL, no "
-#~ "button is necessary to validate this transition."
-#~ msgstr ""
-#~ "When the operation of transition comes from a button pressed in the client "
-#~ "form, signal tests the name of the pressed button. If signal is NULL, no "
-#~ "button is necessary to validate this transition."
-
-#~ msgid "Price List Version"
-#~ msgstr "Fiyat Listesi Versiyonu"
-
-#~ msgid "No production sequence defined"
-#~ msgstr "No production sequence defined"
-
-#~ msgid "German / Deutsch"
-#~ msgstr "German / Deutsch"
-
-#~ msgid "tonne"
-#~ msgstr "tonne"
-
-#~ msgid "Stock Level Forecast"
-#~ msgstr "Stock Level Forecast"
-
-#~ msgid "Object affected by this rule"
-#~ msgstr "Object affected by this rule"
-
-#~ msgid "Max Quantity"
-#~ msgstr "Max Quantity"
-
-#~ msgid "Location Structure"
-#~ msgstr "Location Structure"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "Total incoming quantity"
-#~ msgstr "Total incoming quantity"
-
-#~ msgid "Directory"
-#~ msgstr "Directory"
-
-#~ msgid "Menu Name"
-#~ msgstr "Menü Adı"
-
-#~ msgid "Author Website"
-#~ msgstr "Author Website"
-
-#~ msgid "Bar charts need at least two fields"
-#~ msgstr "Kutu grafikleri için en az iki alan gereklidir"
-
-#~ msgid "View Stock of Products"
-#~ msgstr "View Stock of Products"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This is the module for computing Procurements.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    This is the module for computing Procurements.\n"
-#~ "    "
-
-#~ msgid "Malaysia"
-#~ msgstr "Malezya"
-
-#~ msgid "Load Official Translation"
-#~ msgstr "Load Official Translation"
-
-#~ msgid "Client Action Configuration"
-#~ msgstr "İstemci İşlemi Yapılandırması"
-
-#~ msgid "Partner Addresses"
-#~ msgstr "Ortak Adresleri"
-
-#~ msgid "United States"
-#~ msgstr "Amerika Birleşik Devletleri (A.B.D.)"
-
-#~ msgid "Domain Value"
-#~ msgstr "Alan Değeri"
-
-#~ msgid "Real Stock"
-#~ msgstr "Fiili Stok"
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Drives procurement orders for every sale order line."
-
-#~ msgid "Product Unit of Measure"
-#~ msgstr "Stok Birimi"
-
-#~ msgid "Indonesian / Bahasa Indonesia"
-#~ msgstr "Indonesian / Bahasa Indonesia"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Yeşil Burun Adaları"
-
-#~ msgid ""
-#~ "Some installed modules depend on the module you plan to Uninstall :\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Some installed modules depend on the module you plan to Uninstall :\n"
-#~ " %s"
-
-#~ msgid "Events"
-#~ msgstr "Etkinlikler"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "ir.actions.url"
-#~ msgstr "irc.actions.url"
-
-#~ msgid "STOCK_MEDIA_STOP"
-#~ msgstr "STOCK_MEDIA_STOP"
-
-#~ msgid "Buy"
-#~ msgstr "Satın Al"
-
-#~ msgid "Outgoing products to invoice"
-#~ msgstr "Outgoing products to invoice"
-
-#~ msgid "Contact Address :"
-#~ msgstr "Contact Address :"
-
-#~ msgid "Invoiced & Paid"
-#~ msgstr "Faturalanmış & Ödenmiş"
-
-#~ msgid "ir.ui.view.custom"
-#~ msgstr "ir.ui.view.custom"
-
-#~ msgid "Number of modules added"
-#~ msgstr "Number of modules added"
-
-#~ msgid "Price Accuracy"
-#~ msgstr "Price Accuracy"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Start Configuration"
-
-#~ msgid "Product "
-#~ msgstr "Product "
-
-#~ msgid "Created Menus"
-#~ msgstr "Menüler Oluşturuldu"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "Incoterms"
-#~ msgstr "Teslim Sekilleri"
-
-#~ msgid "Workitem"
-#~ msgstr "İş Unsuru"
-
-#~ 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 ""
-#~ "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'."
-
-#~ msgid "STOCK_DIALOG_AUTHENTICATION"
-#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
-
-#~ msgid "Extra Information"
-#~ msgstr "Extra Information"
-
-#~ msgid "STOCK_ZOOM_OUT"
-#~ msgstr "STOCK_ZOOM_OUT"
-
-#~ msgid "Tracking prefix"
-#~ msgstr "Tracking prefix"
-
-#~ msgid "Event Logs"
-#~ msgstr "Event Logs"
-
-#~ msgid "Action"
-#~ msgstr "İşlem"
-
-#~ msgid "Pricelists Types"
-#~ msgstr "Fiyat Listesi Tipleri"
-
-#~ msgid "Email Configuration"
-#~ msgstr "E-Posta Yapılandırma"
-
-#~ msgid "ir.cron"
-#~ msgstr "ir.cron"
-
-#~ msgid "System Configuration done"
-#~ msgstr "System Configuration done"
-
-#~ msgid "Combination of rules"
-#~ msgstr "Combination of rules"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Confirmed sale order to invoice."
-
-#~ msgid "Field Mappings."
-#~ msgstr "Alan Eşleşmeleri."
-
-#~ msgid "Current Year without Century: %(y)s"
-#~ msgstr "Current Year without Century: %(y)s"
-
-#~ msgid "terp-mrp"
-#~ msgstr "terp-mrp"
-
-#~ msgid "Trigger On"
-#~ msgstr "Tetik Açık"
-
-#~ msgid ""
-#~ "Set a category of product if this rule only apply to products of a category "
-#~ "and his childs. Keep empty for all products"
-#~ msgstr ""
-#~ "Set a category of product if this rule only apply to products of a category "
-#~ "and his childs. Keep empty for all products"
-
-#~ msgid "Months"
-#~ msgstr "Ay"
-
-#~ msgid "The supplier approves the Purchase Order."
-#~ msgstr "The supplier approves the Purchase Order."
-
-#~ msgid "Size"
-#~ msgstr "Boyut"
-
-#~ msgid "You can not remove a lot line !"
-#~ msgstr "You can not remove a lot line !"
-
-#~ msgid "Customer Payment"
-#~ msgstr "Customer Payment"
-
-#~ msgid "STOCK_CLOSE"
-#~ msgstr "STOCK_CLOSE"
-
-#~ msgid "Tél. :"
-#~ msgstr "Tél. :"
-
-#~ msgid "%m - Month as a decimal number [01,12]."
-#~ msgstr "%m - Ay ondalık sayı olarak [01,12]."
-
-#~ msgid "Default UOM"
-#~ msgstr "Default UOM"
-
-#~ msgid "Micronesia"
-#~ msgstr "Mikronezya"
-
-#~ msgid "Content"
-#~ msgstr "Content"
-
-#~ msgid "Menus"
-#~ msgstr "Menüler"
-
-#~ msgid "Document of the move to the customer."
-#~ msgstr "Document of the move to the customer."
-
-#~ msgid "Action on Multiple Doc."
-#~ msgstr "Action on Multiple Doc."
-
-#~ msgid "STOCK_SORT_DESCENDING"
-#~ msgstr "STOCK_SORT_DESCENDING"
-
-#~ msgid "Picking List"
-#~ msgstr "Picking List"
-
-#~ msgid "Purchase order per month"
-#~ msgstr "Purchase order per month"
-
-#~ msgid "Israel"
-#~ msgstr "İsrail"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
-#~ msgid "Maintenance Contracts"
-#~ msgstr "Maintenance Contracts"
-
-#~ msgid "Create Action"
-#~ msgstr "İşlem Oluştur"
-
-#~ msgid "Height (Z)"
-#~ msgstr "Yükseklik (Z)"
-
-#~ msgid "Objects"
-#~ msgstr "Nesneler"
-
-#~ msgid "Make to Order"
-#~ msgstr "Make to Order"
-
-#~ msgid "Oman"
-#~ msgstr "Umman"
-
-#~ msgid "Variants"
-#~ msgstr "Değişkenler"
-
-#~ msgid "The full name of the country."
-#~ msgstr "Ülkenin tam adı."
-
-#~ msgid "Delay between original move and chained move in days"
-#~ msgstr "Delay between original move and chained move in days"
-
-#~ msgid "Defined Reports"
-#~ msgstr "Tanımlı Raporlar"
-
-#~ msgid "terp-tools"
-#~ msgstr "terp-tools"
-
-#~ msgid "Procurement Exceptions"
-#~ msgstr "Procurement Exceptions"
-
-#~ msgid "Report xml"
-#~ msgstr "Rapor xml"
-
-#~ msgid "Modules"
-#~ msgstr "Modules"
-
-#~ msgid "Subflow"
-#~ msgstr "Subflow"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "This addon is already installed on your system"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "This addon is already installed on your system"
-
-#~ msgid "res.config"
-#~ msgstr "res.config"
-
-#~ msgid ""
-#~ "By unchecking the active field, you may hide a pack without deleting it."
-#~ msgstr ""
-#~ "By unchecking the active field, you may hide a pack without deleting it."
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Ortak Bağlantıları"
-
-#~ msgid "Associated Groups"
-#~ msgstr "Associated Groups"
-
-#~ msgid "STOCK_DIALOG_INFO"
-#~ msgstr "STOCK_DIALOG_INFO"
-
-#~ msgid "Signal (button Name)"
-#~ msgstr "Sinyal (Düğme adı)"
-
-#~ msgid "Banks"
-#~ msgstr "Banks"
-
-#~ msgid "Invoicing Control"
-#~ msgstr "Faturalama Kontrolü"
-
-#~ msgid "Unread"
-#~ msgstr "Unread"
-
-#~ msgid "terp-sale"
-#~ msgstr "terp-sale"
-
-#~ msgid "%d - Day of the month as a decimal number [01,31]."
-#~ msgstr "%d - Ondalık sayı olarak ayın günü [01,31]."
-
-#~ msgid "Romanian / limba română"
-#~ msgstr "Romanian / limba română"
-
-#~ msgid "STOCK_ADD"
-#~ msgstr "STOCK_ADD"
-
-#~ msgid "Repeat Missed"
-#~ msgstr "Kaçırılanları Tekrarla"
-
-#~ msgid "Can not create the module file: %s !"
-#~ msgstr "Can not create the module file: %s !"
-
-#~ msgid "Object Mapping"
-#~ msgstr "Nesne Eşlemesi"
-
-#~ msgid "EAN"
-#~ msgstr "Barkod"
-
-#~ msgid "The rate of the currency to the currency of rate 1"
-#~ msgstr "Döviz dönüşüm oranı (1'e göre)"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Birleşik Krallık (İngiltere)"
-
-#~ msgid "Expected Delivery address:"
-#~ msgstr "Expected Delivery address:"
-
-#~ msgid "Products Labels"
-#~ msgstr "Ürün Etiketleri"
-
-#~ msgid "terp-stock"
-#~ msgstr "terp-stock"
-
-#~ msgid "Object:"
-#~ msgstr "Object:"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Botswana"
-#~ msgstr "Botsvana"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Partner Titles"
-#~ msgstr "Ortak Ünvanları"
-
-#~ msgid "Service"
-#~ msgstr "Service"
-
-#~ msgid "Inventory Line"
-#~ msgstr "Inventory Line"
-
-#~ msgid "Validated"
-#~ msgstr "Onaylandı"
-
-#~ msgid "Add an auto-refresh on the view"
-#~ msgstr "Görünüme bir kendiliğinden ekran yenileme ekle"
-
-#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
-#~ msgstr "Adds commitment, requested and effective dates on Sales Orders."
-
-#~ msgid "Inventory Management"
-#~ msgstr "Envanter Yönetimi"
-
-#~ msgid "Return lines"
-#~ msgstr "Return lines"
-
-#~ msgid "Steps To Deliver a Sale Order"
-#~ msgstr "Satış Emri Teslimat Adımları"
-
-#~ msgid "Workitems"
-#~ msgstr "İş Unsurları"
-
-#~ msgid "Out Qty"
-#~ msgstr "Out Qty"
-
-#~ msgid "Advice"
-#~ msgstr "Advice"
-
-#~ msgid "The amount to be invoiced in advance."
-#~ msgstr "The amount to be invoiced in advance."
-
-#~ msgid "Selectable"
-#~ msgstr "Seçilebilir"
-
-#~ msgid "ir.attachment"
-#~ msgstr "ir.attachment"
-
-#~ msgid ""
-#~ "Base price for computing the customer price. Sometimes called the catalog "
-#~ "price."
-#~ msgstr ""
-#~ "Base price for computing the customer price. Sometimes called the catalog "
-#~ "price."
-
-#~ msgid "- module,type,name,res_id,src,value"
-#~ msgstr "- module,type,name,res_id,src,value"
-
-#~ msgid "Lithuanian / Lietuvių kalba"
-#~ msgstr "Lithuanian / Lietuvių kalba"
-
-#~ msgid "Separator Format"
-#~ msgstr "Ayırıcı Biçimi"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Inherited View"
-#~ msgstr "Devralınan Görünüm"
-
-#~ msgid "Source Term"
-#~ msgstr "Source Term"
-
-#~ msgid "Sales By Month"
-#~ msgstr "Aylara Göre Satışlar"
-
-#~ msgid "Invoice Based on Deliveries"
-#~ msgstr "Teslimatlara Bağlı Fatura"
-
-#~ msgid "Partial Picking"
-#~ msgstr "Partial Picking"
-
-#~ msgid "Module file successfully imported!"
-#~ msgstr "Module file successfully imported!"
-
 #~ msgid "Date payment"
 #~ msgstr "Date payment"
 
-#~ msgid "The total number of products you can put by pallet or box."
-#~ msgstr "The total number of products you can put by pallet or box."
-
-#~ 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."
-#~ msgstr ""
-#~ "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."
-
 #~ msgid "<fill color=\"darkblue\"/>"
 #~ msgstr "<fill color=\"darkblue\"/>"
 
-#~ msgid "   Month   "
-#~ msgstr "   Month   "
-
-#~ msgid "Characteristics"
-#~ msgstr "Characteristics"
-
-#~ msgid "Date Confirm"
-#~ msgstr "Date Confirm"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Supplier Pricelist"
-#~ msgstr "Tedarikçi Fiyat Listesi"
-
-#~ msgid "Net Price"
-#~ msgstr "Net Price"
-
-#~ msgid "Stock Input Account"
-#~ msgstr "Stok Giriş Hes."
-
-#~ msgid "Pay Later or Group Funds"
-#~ msgstr "Pay Later or Group Funds"
-
-#~ msgid "Low"
-#~ msgstr "Düşük"
-
-#~ msgid "STOCK_MEDIA_RECORD"
-#~ msgstr "STOCK_MEDIA_RECORD"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Saint Lucia"
-
-#~ msgid ""
-#~ "Check this box to allow using this location to put scrapped/damaged goods."
-#~ msgstr ""
-#~ "Check this box to allow using this location to put scrapped/damaged goods."
-
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr "You must first cancel all picking attached to this sale order."
-
-#~ msgid "Maintenance Contract"
-#~ msgstr "Bakım Sözleşmesi"
-
-#~ msgid "Select the object from the model on which the workflow will executed."
-#~ msgstr "Modelden, üzerinde iş akışı işletilecek nesneyi seçiniz."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the payment "
-#~ "term without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the payment "
-#~ "term without removing it."
-
-#~ msgid "Employee"
-#~ msgstr "Employee"
-
-#~ msgid "Purchase Requisition"
-#~ msgstr "Purchase Requisition"
-
-#~ msgid "Put in current pack"
-#~ msgstr "Put in current pack"
-
-#~ msgid "Create Access"
-#~ msgstr "Erişim Oluştur"
-
-#~ msgid "Address Contact Name"
-#~ msgstr "Address Contact Name"
-
-#~ msgid "Unit Cost for this product line"
-#~ msgstr "Unit Cost for this product line"
-
-#~ msgid "Payment Before Delivery"
-#~ msgstr "Ödeme Öncesi Teslimat"
-
-#~ msgid "Price List Name"
-#~ msgstr "Price List Name"
-
-#~ msgid "Fed. State"
-#~ msgstr "Federal Eyalet"
-
-#~ msgid "Copy Of"
-#~ msgstr "Copy Of"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Mass Mailing"
-
-#~ msgid "In-memory model"
-#~ msgstr "In-memory model"
-
-#~ msgid "Clear Ids"
-#~ msgstr "Clear Ids"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Supplier Lead Time"
-#~ msgstr "Tedarikçi Temin Süresi"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "No product in this location."
-#~ msgstr "No product in this location."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Invoice "
 
-#~ msgid "Field Type"
-#~ msgstr "Alan Türü"
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-
-#~ msgid "State Code"
-#~ msgstr "Eyalet Kodu"
-
-#~ msgid "On delete"
-#~ msgstr "Silindiğinde"
-
-#~ msgid "You can not confirm purchase order without Purchase Order Lines."
-#~ msgstr "You can not confirm purchase order without Purchase Order Lines."
-
-#~ msgid "Left-to-Right"
-#~ msgstr "Soldan sağa"
-
-#~ msgid "Translatable"
-#~ msgstr "Translatable"
-
-#~ msgid "Vietnam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Scrap Location"
-#~ msgstr "Scrap Location"
-
-#~ msgid "Signature"
-#~ msgstr "Signature"
-
-#~ msgid "Split in lots"
-#~ msgstr "Lotlara böl"
-
-#~ msgid "Assignment from Production or Purchase Order."
-#~ msgstr "Assignment from Production or Purchase Order."
-
-#~ msgid "Future Deliveries"
-#~ msgstr "Future Deliveries"
-
-#~ msgid "res.widget.user"
-#~ msgstr "res.widget.user"
-
-#~ msgid "Import Invoices"
-#~ msgstr "Import Invoices"
-
-#~ msgid "Supplier Product Name"
-#~ msgstr "Supplier Product Name"
-
-#~ msgid "Date Expected"
-#~ msgstr "Date Expected"
-
-#~ msgid "False means for every user"
-#~ msgstr "False means for every user"
-
-#~ msgid "Supplier of the product"
-#~ msgstr "Supplier of the product"
-
-#~ msgid "UoM Type"
-#~ msgstr "UoM Type"
-
-#~ msgid "Costing Method"
-#~ msgstr "Maliyet Yöntemi"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Install Specific Industry Applications"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
-
-#~ msgid ""
-#~ "The pricelist sets the currency used for this purchase order. It also "
-#~ "computes the supplier price for the selected products/quantities."
-#~ msgstr ""
-#~ "The pricelist sets the currency used for this purchase order. It also "
-#~ "computes the supplier price for the selected products/quantities."
-
-#~ msgid "Invoiced date"
-#~ msgstr "Invoiced date"
-
 #~ msgid "Message"
 #~ msgstr "İleti"
 
-#~ msgid "On Multiple Doc."
-#~ msgstr "Birden fazla belge üzerinde"
-
-#~ 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 ""
-#~ "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)."
-
-#~ msgid "Revision Date"
-#~ msgstr "Revizyon Tarihi"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Faroe Adaları"
-
-#~ msgid ""
-#~ "There is no expense account defined ' \\n                                    "
-#~ "        'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no expense account defined ' \\n                                    "
-#~ "        'for this product: \"%s\" (id:%d)"
-
-#~ msgid "The weight of the empty UL"
-#~ msgstr "The weight of the empty UL"
-
-#~ msgid "Apply Scheduled Upgrades"
-#~ msgstr "Apply Scheduled Upgrades"
-
-#~ msgid "Widgets"
-#~ msgstr "Widgets"
-
-#~ msgid ""
-#~ "If checked, products contained in child locations of selected location will "
-#~ "be included as well."
-#~ msgstr ""
-#~ "If checked, products contained in child locations of selected location will "
-#~ "be included as well."
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Product sales"
-#~ msgstr "Ürün Satışları"
-
-#~ msgid "Max. Price Margin"
-#~ msgstr "Max. Price Margin"
-
-#~ msgid "Reference of the document that produced this picking."
-#~ msgstr "Reference of the document that produced this picking."
-
-#~ msgid "Direct Delivery"
-#~ msgstr "Direk Teslimat"
-
-#~ msgid "Invoice Control"
-#~ msgstr "Invoice Control"
-
-#~ msgid "Integer"
-#~ msgstr "Integer"
-
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
-#~ msgid ""
-#~ "The path to the main report file (depending on Report Type) or NULL if the "
-#~ "content is in another data field"
-#~ msgstr ""
-#~ "The path to the main report file (depending on Report Type) or NULL if the "
-#~ "content is in another data field"
-
-#~ msgid "Product Field"
-#~ msgstr "Ürün Alanı"
-
-#~ msgid "vsep"
-#~ msgstr "vsep"
-
-#~ msgid "The company this user is currently working for."
-#~ msgstr "The company this user is currently working for."
-
-#~ msgid "Andorra, Principality of"
-#~ msgstr "Andorra"
-
-#~ msgid "Transition"
-#~ msgstr "Geçiş"
-
-#~ msgid "Picking"
-#~ msgstr "Picking"
-
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance Sheet (Assets Accounts)"
 
 #, python-format
 #~ msgid "The opening journal must not have any entry in the new fiscal year !"
 #~ msgstr "The opening journal must not have any entry in the new fiscal year !"
 
-#~ msgid "Partner Information"
-#~ msgstr "Cari Bilgisi"
-
-#~ msgid "Production Lot"
-#~ msgstr "Production Lot"
-
-#~ msgid "TGZ Archive"
-#~ msgstr "TGZ Archive"
-
-#~ msgid "Scheduler Parameters"
-#~ msgstr "Scheduler Parameters"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunus"
-
-#~ msgid "Street 2"
-#~ msgstr "Street 2"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "UOM -> UOS Coeff"
-#~ msgstr "Birim -> 2.Br. Dönüş Çarpanı"
-
-#~ msgid "My Logs"
-#~ msgstr "My Logs"
-
 #, python-format
 #~ msgid "Closing of states cancelled, please check the box !"
 #~ msgstr "Closing of states cancelled, please check the box !"
 
-#~ msgid "quantity."
-#~ msgstr "quantity."
-
-#~ msgid "Bhutan"
-#~ msgstr "Bütan"
-
-#~ msgid "Next number of this sequence"
-#~ msgstr "Next number of this sequence"
-
-#~ msgid "Category Type"
-#~ msgstr "Kategori Tipi"
-
-#~ msgid "%B - Full month name."
-#~ msgstr "%B - Tam ay adı."
-
-#~ msgid "This Window"
-#~ msgstr "Bu Pencere"
-
-#~ msgid "Close Move at end"
-#~ msgstr "Close Move at end"
-
-#~ msgid "The logging message."
-#~ msgstr "The logging message."
-
-#~ msgid "ISO code"
-#~ msgstr "ISO Kodur"
-
-#~ msgid "res.config.view"
-#~ msgstr "res.config.view"
-
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-
-#~ msgid "Read"
-#~ msgstr "Read"
-
-#~ msgid "STOCK_INDENT"
-#~ msgstr "STOCK_INDENT"
-
-#~ msgid ""
-#~ "Coefficient to convert UOM to UOS\n"
-#~ " uos = uom * coeff"
-#~ msgstr ""
-#~ "Coefficient to convert UOM to UOS\n"
-#~ " uos = uom * coeff"
-
-#~ msgid "Upstream traceability"
-#~ msgstr "Upstream traceability"
-
-#~ msgid "Workflow Workitems"
-#~ msgstr "İş Akışı İş Unsurları"
-
-#~ msgid "Password"
-#~ msgstr "Parola"
-
-#~ msgid "is done."
-#~ msgstr "is done."
-
-#~ msgid "Inventory Reference"
-#~ msgstr "Inventory Reference"
-
-#~ msgid "Purchase Analysis"
-#~ msgstr "Purchase Analysis"
-
-#~ msgid "Cannot deliver products which are already delivered !"
-#~ msgstr "Cannot deliver products which are already delivered !"
-
-#~ msgid "Country"
-#~ msgstr "Ülke"
-
-#~ msgid "Employees"
-#~ msgstr "Employees"
-
-#~ msgid "Picking Default Policy"
-#~ msgstr "Picking Default Policy"
-
-#~ msgid ""
-#~ "If this log item has been read, get() should not send it to the client"
-#~ msgstr ""
-#~ "If this log item has been read, get() should not send it to the client"
-
-#~ msgid "RML Internal Header"
-#~ msgstr "RML Dahili Başlık"
-
-#~ msgid "Search View Ref."
-#~ msgstr "Arama Görüntüsü Referansı"
-
-#~ msgid "Latest version"
-#~ msgstr "En Son Sürüm"
-
-#~ msgid "Product Type"
-#~ msgstr "Ürün Tipi"
-
-#~ msgid "Partial Move"
-#~ msgstr "Partial Move"
-
-#~ msgid "acc_number"
-#~ msgstr "acc_number"
-
-#~ msgid "Cost"
-#~ msgstr "Cost"
-
-#~ msgid ""
-#~ "Determines if the product can be visible in the list of product within a "
-#~ "selection from a sale order line."
-#~ msgstr ""
-#~ "Determines if the product can be visible in the list of product within a "
-#~ "selection from a sale order line."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-
-#~ msgid "Addresses"
-#~ msgstr "Addresses"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Quantity (UoM)"
-#~ msgstr "Miktar (Birim)"
-
-#~ msgid "Chinese (CN) / 简体中文"
-#~ msgstr "Chinese (CN) / 简体中文"
-
-#~ msgid "STOCK_MEDIA_NEXT"
-#~ msgstr "STOCK_MEDIA_NEXT"
-
-#~ msgid "Street"
-#~ msgstr "Cadde"
-
-#~ msgid "The volume in m3."
-#~ msgstr "Hacim m³"
-
-#~ msgid "XML Identifier"
-#~ msgstr "XML Belirteci"
-
-#~ msgid "Leads & Opportunities"
-#~ msgstr "Leads & Opportunities"
-
-#~ msgid "Scheduled Actions"
-#~ msgstr "Planlanmış işler"
-
-#~ msgid "Dashboard main module"
-#~ msgstr "Kontrol Paneli Ana Modülü"
-
-#~ msgid "Unknown"
-#~ msgstr "Bilinmeyen"
-
-#~ msgid "Location Name"
-#~ msgstr "Lokasyon Adı"
-
-#~ msgid ""
-#~ "Set a template if this rule only apply to a template of product. Keep empty "
-#~ "for all products"
-#~ msgstr ""
-#~ "Set a template if this rule only apply to a template of product. Keep empty "
-#~ "for all products"
-
-#~ msgid "Upstream Traceability"
-#~ msgstr "Upstream Traceability"
-
-#~ msgid "Cannot delete Voucher(s) which are already opened or paid !"
-#~ msgstr "Cannot delete Voucher(s) which are already opened or paid !"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "İşlem tanımlamasında geçersiz model adı."
 
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "Approved by Supplier"
-#~ msgstr "Approved by Supplier"
-
-#~ msgid "STOCK_MEDIA_FORWARD"
-#~ msgstr "STOCK_MEDIA_FORWARD"
-
-#~ msgid "Skipped"
-#~ msgstr "Atlandı"
-
-#~ msgid "Custom Field"
-#~ msgstr "Özel Alan"
-
-#~ msgid "Stock ups upload"
-#~ msgstr "Stock ups upload"
-
-#~ msgid "Has a web component"
-#~ msgstr "Has a web component"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokos (Keeling) Adaları"
-
-#~ msgid "init"
-#~ msgstr "init"
-
-#~ msgid "Lot number"
-#~ msgstr "Lot number"
-
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Outgoing Products delay"
-
-#~ msgid "Bank type fields"
-#~ msgstr "Banka türü alanları"
-
-#~ msgid "Scrap Products"
-#~ msgstr "Scrap Products"
-
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
-#~ msgid "base.module.configuration"
-#~ msgstr "base.module.configuration"
-
-#~ msgid "Dutch / Nederlands"
-#~ msgstr "Dutch / Nederlands"
-
-#~ msgid "Number padding"
-#~ msgstr "Numara dolgusu"
-
-#~ msgid "Total Orders Lines by User per month"
-#~ msgstr "Total Orders Lines by User per month"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Add a widget"
-#~ msgstr "Add a widget"
-
-#~ msgid "Report"
-#~ msgstr "Report"
-
-#~ msgid "Repeat every x."
-#~ msgstr "Repeat every x."
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Reference of the document that generated this sale order request."
-
-#~ msgid "Wizard"
-#~ msgstr "Sihirbaz"
-
-#~ msgid ""
-#~ "The state of the purchase order or the quotation request. A quotation is a "
-#~ "purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-#~ "user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-#~ "order to change the state to 'Approved'. When the purchase order is paid and "
-#~ "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-#~ "or in the reception of goods, the state becomes in exception."
-#~ msgstr ""
-#~ "The state of the purchase order or the quotation request. A quotation is a "
-#~ "purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-#~ "user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-#~ "order to change the state to 'Approved'. When the purchase order is paid and "
-#~ "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-#~ "or in the reception of goods, the state becomes in exception."
-
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr "You must first cancel stock moves attached to this sale order line."
-
-#~ msgid "Validated by"
-#~ msgstr "Onaylayan"
-
-#~ msgid "1cm 28cm 20cm 28cm"
-#~ msgstr "1cm 28cm 20cm 28cm"
-
-#~ msgid "Maintainer"
-#~ msgstr "Maintainer"
-
-#~ msgid "Suffix"
-#~ msgstr "SonEk"
-
-#~ msgid "Macau"
-#~ msgstr "Makau"
-
-#~ msgid "Australia"
-#~ msgstr "Avustralya"
-
-#~ msgid ""
-#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
-#~ "sale order, the invoice is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "A Pick list generates an invoice. Depending on the Invoicing control of the "
-#~ "sale order, the invoice is based on delivered or on ordered quantities."
-
-#~ msgid "Labels"
-#~ msgstr "Etiketler"
-
-#~ msgid "All at Once"
-#~ msgstr "Tek Seferde"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Company to store the current record"
-
-#~ msgid "Sender's email"
-#~ msgstr "Sender's email"
-
-#~ msgid "Object Field"
-#~ msgstr "Nesne Alanı"
-
-#~ msgid "French (CH) / Français (CH)"
-#~ msgstr "French (CH) / Français (CH)"
-
-#~ msgid "Revision Name"
-#~ msgstr "Revizyon Adı"
-
-#~ msgid "Order Line"
-#~ msgstr "Sipariş Kalemi"
-
-#~ msgid "Object Method"
-#~ msgstr "Object Method"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukrayna"
-
-#~ msgid "Production lot"
-#~ msgstr "Üretim Lotu"
-
-#~ msgid "Units of Measure Categories"
-#~ msgstr "Birim Kategorisi"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "STOCK_PRINT"
-#~ msgstr "STOCK_PRINT"
-
-#~ msgid "Supplier Voucher"
-#~ msgstr "Supplier Voucher"
-
-#~ msgid ""
-#~ "If specified, this action will be opened at logon for this user, in addition "
-#~ "to the standard menu."
-#~ msgstr ""
-#~ "If specified, this action will be opened at logon for this user, in addition "
-#~ "to the standard menu."
-
-#~ msgid "Accounting Stock Properties"
-#~ msgstr "Stok Muhasebe Tercihi"
-
-#~ msgid "sale.config.picking_policy"
-#~ msgstr "sale.config.picking_policy"
-
-#~ msgid "Extended filters..."
-#~ msgstr "Gelişmiş filtreleme..."
-
-#~ msgid "Destination Activity"
-#~ msgstr "Hedef Etkinlik"
-
-#~ msgid ""
-#~ "Can't set an ir.actions.todo's state to \"\n"
-#~ "                               \"nothingness"
-#~ msgstr ""
-#~ "Can't set an ir.actions.todo's state to \"\n"
-#~ "                               \"nothingness"
-
-#~ msgid "In Qty"
-#~ msgstr "In Qty"
-
-#~ msgid "Connect Events to Actions"
-#~ msgstr "Etkinlikleri İşlemlere Bağla"
-
-#~ msgid "STOCK_SORT_ASCENDING"
-#~ msgstr "STOCK_SORT_ASCENDING"
-
-#~ msgid "Order Reference"
-#~ msgstr "Sipariş Referansı"
-
-#~ msgid "Other Information"
-#~ msgstr "Other Information"
-
-#~ msgid "STOCK_ABOUT"
-#~ msgstr "STOCK_ABOUT"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Date on which sale order is created"
-
-#~ msgid "Change Standard Price"
-#~ msgstr "Change Standard Price"
-
-#~ msgid "Invoice cannot be created from Packing."
-#~ msgstr "Invoice cannot be created from Packing."
-
-#~ msgid "Supplier Invoices to Receive"
-#~ msgstr "Supplier Invoices to Receive"
-
-#~ msgid "Parent Category"
-#~ msgstr "Ana Sınıf"
-
-#~ msgid "Shipping type specify, goods coming in or going out."
-#~ msgstr "Shipping type specify, goods coming in or going out."
-
-#~ msgid "Finland"
-#~ msgstr "Finlandiya"
-
-#~ msgid "Item Labels"
-#~ msgstr "Item Labels"
-
-#~ msgid "Supplier name, price, product code, ..."
-#~ msgstr "Supplier name, price, product code, ..."
-
-#~ msgid "Purchase Accounts"
-#~ msgstr "Purchase Accounts"
-
-#~ msgid "Request for Quotations."
-#~ msgstr "Request for Quotations."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "ir.ui.menu"
-#~ msgstr "ir.ui.menu"
-
-#~ msgid ""
-#~ "Current quantity of products with this Production Lot Number available in "
-#~ "company warehouses"
-#~ msgstr ""
-#~ "Current quantity of products with this Production Lot Number available in "
-#~ "company warehouses"
-
-#~ msgid "Project Management"
-#~ msgstr "Project Management"
-
-#~ msgid "Asset View"
-#~ msgstr "Asset View"
-
-#~ msgid "Measure Type"
-#~ msgstr "Ölçü Tipi"
-
-#~ msgid "is scheduled"
-#~ msgstr "is scheduled"
-
-#~ msgid ""
-#~ "This is the days added to what you promise to customers for security purpose"
-#~ msgstr ""
-#~ "This is the days added to what you promise to customers for security purpose"
-
-#~ msgid "You can not process picking without stock moves"
-#~ msgstr "You can not process picking without stock moves"
-
-#~ msgid "Shipping Default Policy"
-#~ msgstr "Öntanımlı Nakliye Politikası"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-
-#~ msgid "Unit of Measure "
-#~ msgstr "Ölçü Birimi "
-
-#~ msgid "RML Report"
-#~ msgstr "RML Report"
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-
-#~ msgid "ir.server.object.lines"
-#~ msgstr "ir.server.object.lines"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Purchase Management"
-
-#~ msgid ""
-#~ "Please put a partner on the picking list if you want to generate invoice."
-#~ msgstr ""
-#~ "Please put a partner on the picking list if you want to generate invoice."
-
-#~ msgid "Moves Analysis"
-#~ msgstr "Moves Analysis"
-
-#~ msgid "If the stock of a product is under 0, it will act like an orderpoint"
-#~ msgstr "If the stock of a product is under 0, it will act like an orderpoint"
-
-#~ msgid "Delivery & Invoices"
-#~ msgstr "Teslimat & Faturalar"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuveyt"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "Instance"
-#~ msgstr "Örnek"
-
-#~ msgid "Treasory"
-#~ msgstr "Treasory"
-
-#~ msgid "Many2One"
-#~ msgstr "Many2One"
-
-#~ msgid ""
-#~ "Check this option to select existing lots in the list below, otherwise you "
-#~ "should enter new ones line by line."
-#~ msgstr ""
-#~ "Check this option to select existing lots in the list below, otherwise you "
-#~ "should enter new ones line by line."
-
-#~ msgid "Move Information"
-#~ msgstr "Hareket Bilgisi"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nijerya"
-
-#~ msgid "res.partner.event"
-#~ msgstr "res.partner.event"
-
-#~ msgid "SMS Send"
-#~ msgstr "SMS Send"
-
-#~ msgid "Accepted Users"
-#~ msgstr "Kabul Edilen Kullanıcılar"
-
-#~ msgid "Manual Reconcilication"
-#~ msgstr "Manual Reconcilication"
-
-#~ msgid "Days to Deliver"
-#~ msgstr "Days to Deliver"
-
 #~ msgid "Generate entries before:"
 #~ msgstr "Generate entries before:"
 
-#~ msgid "Supplier Location"
-#~ msgstr "Tedarikçi Yeri"
-
-#~ msgid "Always Searchable"
-#~ msgstr "Her Zaman Aranabilir"
-
-#~ msgid "Audit Complete ?"
-#~ msgstr "Audit Complete ?"
-
-#~ msgid ""
-#~ "You cannot delete the language which is Active !\n"
-#~ "Please de-activate the language first."
-#~ msgstr ""
-#~ "You cannot delete the language which is Active !\n"
-#~ "Please de-activate the language first."
-
-#~ msgid ""
-#~ "Can 't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration Financial Accounting Accounts Journals.' % (journal_type)))\n"
-#~ "            dom = {'journal_id':  [('id', 'in', journal_ids)]}\n"
-#~ "        else:\n"
-#~ "            journal_ids = obj_journal.search(cr, uid, [])\n"
-#~ "\n"
-#~ "        if currency_id and company_id:\n"
-#~ "            currency = self.pool.get('res.currency"
-#~ msgstr ""
-#~ "Can 't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration Financial Accounting Accounts Journals.' % (journal_type)))\n"
-#~ "            dom = {'journal_id':  [('id', 'in', journal_ids)]}\n"
-#~ "        else:\n"
-#~ "            journal_ids = obj_journal.search(cr, uid, [])\n"
-#~ "\n"
-#~ "        if currency_id and company_id:\n"
-#~ "            currency = self.pool.get('res.currency"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
-
-#~ msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
-#~ msgstr "İşlem adı. Örneğin, Bir Satış Emri (Sipariş) -> Birden Fazla Fatura"
-
-#~ msgid "Automatic OP: %s"
-#~ msgstr "Automatic OP: %s"
-
-#~ msgid "Scheduler"
-#~ msgstr "Scheduler"
-
-#~ msgid "STOCK_BOLD"
-#~ msgstr "STOCK_BOLD"
-
-#~ msgid "Sale Description"
-#~ msgstr "Satış Açıklaması"
-
-#~ msgid "Philippines"
-#~ msgstr "Filipinler"
-
-#~ msgid "Procurement name."
-#~ msgstr "Procurement name."
-
-#~ msgid "Morocco"
-#~ msgstr "Fas"
-
-#~ msgid "Please define a sequence on the journal !"
-#~ msgstr "Please define a sequence on the journal !"
-
-#~ msgid "Shipping address :"
-#~ msgstr "Shipping address :"
-
-#~ msgid "Open Dashboard"
-#~ msgstr "Kontrol Panelini Aç"
-
-#~ msgid "Physical Inventory"
-#~ msgstr "Physical Inventory"
-
-#~ msgid "Request History"
-#~ msgstr "İstek Tarihçesi"
-
-#~ msgid "is consumed with"
-#~ msgstr "is consumed with"
-
-#~ msgid "Production lot is used to put a serial number on the production"
-#~ msgstr "Production lot is used to put a serial number on the production"
-
-#~ msgid "Contributors"
-#~ msgstr "Contributors"
-
-#~ msgid "workflow.transition"
-#~ msgstr "workflow.transition"
-
-#~ msgid "%a - Abbreviated weekday name."
-#~ msgstr "%a - Günün kısaltması"
-
-#~ msgid "Date of Order"
-#~ msgstr "Date of Order"
-
-#~ msgid "Introspection report on objects"
-#~ msgstr "Introspection report on objects"
-
-#~ msgid "Polynesia (French)"
-#~ msgstr "Polinezya (Fransız)"
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Sale Open Invoice"
-
-#~ msgid "Company Name"
-#~ msgstr "Şirket Adı"
-
-#~ msgid "All products"
-#~ msgstr "Tüm Ürünler"
-
-#~ msgid "Next planned execution date for this scheduler"
-#~ msgstr "Next planned execution date for this scheduler"
-
-#~ msgid "Choose between the simplified interface and the extended one"
-#~ msgstr "Choose between the simplified interface and the extended one"
-
-#~ msgid "pricelist.partnerinfo"
-#~ msgstr "pricelist.partnerinfo"
-
-#~ msgid "Module Import"
-#~ msgstr "Module Import"
-
-#~ msgid "Quantity-2"
-#~ msgstr "Quantity-2"
-
-#~ msgid "Quantity-3"
-#~ msgstr "Quantity-3"
-
-#~ msgid "Codes"
-#~ msgstr "Kodlar"
-
-#~ msgid "Denmark"
-#~ msgstr "Danimarka"
-
-#~ msgid "Quantity-4"
-#~ msgstr "Quantity-4"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
-
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#~ msgid "Slovak / Slovenský jazyk"
-#~ msgstr "Slovak / Slovenský jazyk"
-
-#~ msgid "Minimum Stock Rules"
-#~ msgstr "Minimum Stock Rules"
-
-#~ msgid "Arguments to be passed to the method. e.g. (uid,)"
-#~ msgstr "Arguments to be passed to the method. e.g. (uid,)"
-
-#~ msgid "Voucher Entries"
-#~ msgstr "Voucher Entries"
-
-#~ msgid "Char"
-#~ msgstr "Char"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgent"
-
-#~ msgid "Bulk SMS send"
-#~ msgstr "Bulk SMS send"
-
-#~ msgid "Countries"
-#~ msgstr "Ülkeler"
-
-#~ msgid "User Interface"
-#~ msgstr "User Interface"
-
-#~ msgid "Seconde: %(sec)s"
-#~ msgstr "Saniye: %(sec)s"
-
-#~ msgid "Could not cancel this sale order !"
-#~ msgstr "Could not cancel this sale order !"
-
-#~ msgid ""
-#~ "Keep empty if you produce at the location where the finished products are "
-#~ "needed.Set a location if you produce at a fixed location. This can be a "
-#~ "partner location if you subcontract the manufacturing operations."
-#~ msgstr ""
-#~ "Keep empty if you produce at the location where the finished products are "
-#~ "needed.Set a location if you produce at a fixed location. This can be a "
-#~ "partner location if you subcontract the manufacturing operations."
-
-#~ msgid "Action Usage"
-#~ msgstr "İşlem Kullanımı"
-
-#~ msgid ""
-#~ "Can not create the module file:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Can not create the module file:\n"
-#~ " %s"
-
-#~ msgid "Update Modules List"
-#~ msgstr "Modül Listesini Güncelle"
-
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "Stock by Location"
-#~ msgstr "Lokasyona göre Stok"
-
-#~ msgid "Total price by product by state"
-#~ msgstr "Total price by product by state"
-
-#~ msgid "Purchase Control"
-#~ msgstr "Alış Kontrolü"
-
-#~ msgid ""
-#~ "This pricelist will be used, instead of the default one, for sales to the "
-#~ "current partner"
-#~ msgstr ""
-#~ "This pricelist will be used, instead of the default one, for sales to the "
-#~ "current partner"
-
-#~ msgid ""
-#~ "1 or several supplier(s) can be linked to a product. All information stands "
-#~ "in the product form."
-#~ msgstr ""
-#~ "1 or several supplier(s) can be linked to a product. All information stands "
-#~ "in the product form."
-
-#~ msgid "Thai / ภาษาไทย"
-#~ msgstr "Thai / ภาษาไทย"
-
-#~ msgid "Create Users"
-#~ msgstr "Create Users"
-
-#~ msgid "Slovenian / slovenščina"
-#~ msgstr "Slovenian / slovenščina"
-
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr "There is no sale journal defined for this company: \"%s\" (id:%d)"
-
-#~ msgid "Invoice Corrected"
-#~ msgstr "Invoice Corrected"
-
-#~ msgid "Reload from Attachment"
-#~ msgstr "Ekten yeniden yükle"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet Adası"
-
-#~ msgid "TVA :"
-#~ msgstr "TVA :"
-
-#~ msgid "Bosnia-Herzegovina"
-#~ msgstr "Bosna-Hersek"
-
-#~ msgid ""
-#~ "The invoice is created automatically if the Invoice control of the purchase "
-#~ "order is 'On order'. The invoice can also be generated manually by the "
-#~ "accountant (Invoice control = Manual)."
-#~ msgstr ""
-#~ "The invoice is created automatically if the Invoice control of the purchase "
-#~ "order is 'On order'. The invoice can also be generated manually by the "
-#~ "accountant (Invoice control = Manual)."
-
-#~ msgid "Prices Types"
-#~ msgstr "Fiyat Tipleri"
-
-#~ msgid "File"
-#~ msgstr "File"
-
-#~ msgid "Please provide Proper Quantity !"
-#~ msgstr "Please provide Proper Quantity !"
-
-#~ msgid "The selected modules have been updated / installed !"
-#~ msgstr "The selected modules have been updated / installed !"
-
-#~ msgid "Module Upgrade Install"
-#~ msgstr "Module Upgrade Install"
-
-#~ msgid "ir.actions.configuration.wizard"
-#~ msgstr "ir.actions.configuration.wizard"
-
-#~ msgid ""
-#~ "* Supplier Location: Virtual location representing the source location for "
-#~ "products coming from your suppliers\n"
-#~ "                       \n"
-#~ "* View: Virtual location used to create a hierarchical structures for your "
-#~ "warehouse, aggregating its child locations ; can't directly contain "
-#~ "products\n"
-#~ "                       \n"
-#~ "* Internal Location: Physical locations inside your own warehouses,\n"
-#~ "                       \n"
-#~ "* Customer Location: Virtual location representing the destination location "
-#~ "for products sent to your customers\n"
-#~ "                       \n"
-#~ "* Inventory: Virtual location serving as counterpart for inventory "
-#~ "operations used to correct stock levels (Physical inventories)\n"
-#~ "                       \n"
-#~ "* Procurement: Virtual location serving as temporary counterpart for "
-#~ "procurement operations when the source (supplier or production) is not known "
-#~ "yet. This location should be empty when the procurement scheduler has "
-#~ "finished running.\n"
-#~ "                       \n"
-#~ "* Production: Virtual counterpart location for production operations: this "
-#~ "location consumes the raw material and produces finished products\n"
-#~ "                      "
-#~ msgstr ""
-#~ "* Supplier Location: Virtual location representing the source location for "
-#~ "products coming from your suppliers\n"
-#~ "                       \n"
-#~ "* View: Virtual location used to create a hierarchical structures for your "
-#~ "warehouse, aggregating its child locations ; can't directly contain "
-#~ "products\n"
-#~ "                       \n"
-#~ "* Internal Location: Physical locations inside your own warehouses,\n"
-#~ "                       \n"
-#~ "* Customer Location: Virtual location representing the destination location "
-#~ "for products sent to your customers\n"
-#~ "                       \n"
-#~ "* Inventory: Virtual location serving as counterpart for inventory "
-#~ "operations used to correct stock levels (Physical inventories)\n"
-#~ "                       \n"
-#~ "* Procurement: Virtual location serving as temporary counterpart for "
-#~ "procurement operations when the source (supplier or production) is not known "
-#~ "yet. This location should be empty when the procurement scheduler has "
-#~ "finished running.\n"
-#~ "                       \n"
-#~ "* Production: Virtual counterpart location for production operations: this "
-#~ "location consumes the raw material and produces finished products\n"
-#~ "                      "
-
-#~ msgid "Sending Goods"
-#~ msgstr "Sending Goods"
-
-#~ msgid "%b - Abbreviated month name."
-#~ msgstr "%b - Kısaltılmış ay adı."
-
-#~ msgid "Not Installable"
-#~ msgstr "Kurulamaz"
-
-#~ msgid "No invoice were created"
-#~ msgstr "No invoice were created"
-
-#~ msgid "New Database"
-#~ msgstr "New Database"
-
 #~ msgid "Income"
 #~ msgstr "Income"
 
-#~ msgid "Order State"
-#~ msgstr "Sipariş Durumu"
-
-#~ msgid "System Update"
-#~ msgstr "System Update"
-
-#~ msgid "Multi Actions"
-#~ msgstr "Çoklu İşlemler"
-
-#~ msgid "_Close"
-#~ msgstr "_Close"
-
-#~ msgid "Expected Shipping Date"
-#~ msgstr "Expected Shipping Date"
-
-#~ msgid "You must first cancel all picking attached to this purchase order."
-#~ msgstr "You must first cancel all picking attached to this purchase order."
-
-#~ msgid "Full"
-#~ msgstr "Tüm"
-
-#~ msgid "Default Company"
-#~ msgstr "Default Company"
-
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "The statement balance is incorrect !\n"
 
-#~ msgid "ID of the view defined in xml file"
-#~ msgstr "ID of the view defined in xml file"
-
-#~ msgid "Import Module"
-#~ msgstr "Import Module"
-
-#~ msgid "American Samoa"
-#~ msgstr "Amerikan Samoası"
-
 #~ msgid "TITLE COMPANY"
 #~ msgstr "TITLE COMPANY"
 
-#~ msgid "Ean check"
-#~ msgstr "Ean check"
-
-#~ msgid ""
-#~ "--\n"
-#~ "%(name)s %(email)s\n"
-#~ msgstr ""
-#~ "--\n"
-#~ "%(name)s %(email)s\n"
-
-#~ msgid "View Auto-Load"
-#~ msgstr "Görünüm Kendiliğinden Yüklenmesi"
-
-#~ msgid "Model name of the object to open in the view window"
-#~ msgstr "Model name of the object to open in the view window"
-
-#~ msgid "Partner Locations"
-#~ msgstr "Cari Lokasyonu"
-
-#~ msgid "Secondary Log"
-#~ msgstr "Secondary Log"
-
-#~ msgid "STOCK_UNDERLINE"
-#~ msgstr "STOCK_UNDERLINE"
-
-#~ msgid "Request Link"
-#~ msgstr "Bağlantı İste"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "Consume Move"
-#~ msgstr "Consume Move"
-
-#~ msgid "Created Views"
-#~ msgstr "Oluşturulan Görünümler"
-
-#~ msgid "Time Format"
-#~ msgstr "Zaman Biçimi"
-
-#~ msgid "Iteration"
-#~ msgstr "Yineleme"
-
-#~ msgid ""
-#~ "Produce will generate production order or tasks, according to the product "
-#~ "type. Purchase will trigger purchase orders when requested."
-#~ msgstr ""
-#~ "Produce will generate production order or tasks, according to the product "
-#~ "type. Purchase will trigger purchase orders when requested."
-
-#~ msgid ""
-#~ "This is used only if you select 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 ""
-#~ "This is used only if you select 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."
-
-#~ msgid "Warranty (months)"
-#~ msgstr "Garanti (Ay)"
-
-#~ msgid "Packing List:"
-#~ msgstr "Packing List:"
-
-#~ msgid "You must first cancel all invoices attached to this purchase order."
-#~ msgstr "Önce bu satın alma siparişine ait tüm faturaları iptal etmelisiniz."
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Birleşik Arap Emirlikleri"
-
-#~ msgid ""
-#~ "There is no stock output account defined ' \\n                               "
-#~ "             'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "There is no stock output account defined ' \\n                               "
-#~ "             'for this product: \"%s\" (id: %d)"
-
-#~ msgid "STOCK_JUMP_TO"
-#~ msgstr "STOCK_JUMP_TO"
-
-#~ msgid "Occitan (post 1500) / France"
-#~ msgstr "Occitan (post 1500) / France"
-
-#~ msgid "Ready"
-#~ msgstr "Ready"
-
-#~ msgid "Reunion (French)"
-#~ msgstr "Reunion (Fransız)"
-
-#~ msgid "Lot"
-#~ msgstr "Lot"
-
-#~ msgid "Retry"
-#~ msgstr "Retry"
-
-#~ msgid "You must logout and login again after changing your password."
-#~ msgstr "You must logout and login again after changing your password."
-
-#~ msgid "Czech Republic"
-#~ msgstr "Çek Cumhuriyeti"
-
-#~ msgid "weight"
-#~ msgstr "weight"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomon Adaları"
-
-#~ msgid "General Settings"
-#~ msgstr "Genel Ayarlar"
-
-#~ msgid "Wizard View"
-#~ msgstr "Sihirbaz Görünüşü"
-
-#~ msgid "Waiting"
-#~ msgstr "Waiting"
-
-#~ msgid "Purchase order '%s' has been set in draft state."
-#~ msgstr "Purchase order '%s' has been set in draft state."
-
-#~ msgid "Process Nodes"
-#~ msgstr "Process Nodes"
-
-#~ msgid "Warehouse"
-#~ msgstr "Warehouse"
-
-#~ msgid "Resource"
-#~ msgstr "Kaynak"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-
-#~ msgid "Lines to Invoice"
-#~ msgstr "Lines to Invoice"
-
-#~ msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
-#~ msgstr "8. %I:%M:%S %p ==> 06:25:20 PM"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Customer Relationship Management"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-
-#~ msgid "Vouchers Entries"
-#~ msgstr "Vouchers Entries"
-
-#~ msgid "Translations"
-#~ msgstr "Çeviriler"
-
-#~ msgid "Packing"
-#~ msgstr "Packing"
-
-#~ msgid "Tracking lot"
-#~ msgstr "Tracking lot"
-
-#~ msgid ""
-#~ "The company the Picking List containing the chained move will belong to "
-#~ "(leave empty to use the default company determination rules"
-#~ msgstr ""
-#~ "The company the Picking List containing the chained move will belong to "
-#~ "(leave empty to use the default company determination rules"
-
-#~ msgid "Pricelist"
-#~ msgstr "Pricelist"
-
-#~ msgid ""
-#~ "There is no stock input account defined ' \\n                                "
-#~ "            'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "There is no stock input account defined ' \\n                                "
-#~ "            'for this product: \"%s\" (id: %d)"
-
-#~ msgid "Downstream traceability"
-#~ msgstr "Downstream traceability"
-
-#~ msgid "Hour"
-#~ msgstr "Hour"
-
-#~ msgid "Module Category"
-#~ msgstr "Modül Sınıđı"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignore"
-
-#~ msgid "Request"
-#~ msgstr "İstek"
-
-#~ msgid "Architecture"
-#~ msgstr "Architecture"
-
-#~ msgid "Reception"
-#~ msgstr "Reception"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid ""
-#~ "If an email is provided, the user will be sent a message welcoming him.\n"
-#~ "\n"
-#~ "Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
-#~ "be possible to email new users."
-#~ msgstr ""
-#~ "If an email is provided, the user will be sent a message welcoming him.\n"
-#~ "\n"
-#~ "Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
-#~ "be possible to email new users."
-
-#~ msgid "Japanese / Japan"
-#~ msgstr "Japanese / Japan"
-
-#~ msgid "Interval Number"
-#~ msgstr "Aralık Numarası"
-
-#~ msgid "%A - Full weekday name."
-#~ msgstr "%A - Kısaltmasız Gün Adı (Salı)"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-
-#~ msgid "Home Action"
-#~ msgstr "Home Action"
-
-#~ msgid "Requests for Quotation"
-#~ msgstr "Requests for Quotation"
-
-#~ msgid "XSL path"
-#~ msgstr "XSL yolu"
-
-#~ msgid ""
-#~ "If this picking was split this field links to the picking that contains the "
-#~ "other part that has been processed already."
-#~ msgstr ""
-#~ "If this picking was split this field links to the picking that contains the "
-#~ "other part that has been processed already."
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Sultanlığı"
-
-#~ msgid "Purchase-Standard Price"
-#~ msgstr "Purchase-Standard Price"
-
-#~ msgid "Request for Quotation :"
-#~ msgstr "Request for Quotation :"
-
-#~ msgid "%Y - Year with century as a decimal number."
-#~ msgstr "%Y - Ondalık sayı olarak yüzyıl ile yıl. (1993)"
-
-#~ msgid "No invoicing"
-#~ msgstr "No invoicing"
-
-#~ msgid ""
-#~ "Please select multiple physical inventories to merge in the list view."
-#~ msgstr ""
-#~ "Please select multiple physical inventories to merge in the list view."
-
-#~ msgid ""
-#~ "Variation Account is not specified for Product Category: %s' % "
-#~ "(product_obj.categ_id.name)))\n"
-#~ "        move_ids = []\n"
-#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-#~ msgstr ""
-#~ "Variation Account is not specified for Product Category: %s' % "
-#~ "(product_obj.categ_id.name)))\n"
-#~ "        move_ids = []\n"
-#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-
-#~ msgid "Shipping Address"
-#~ msgstr "Teslimat Adresi"
-
-#~ msgid "Incoming Product"
-#~ msgstr "Incoming Product"
-
-#~ msgid "STOCK_UNDO"
-#~ msgstr "STOCK_UNDO"
-
-#~ msgid ""
-#~ "You have to select a product UOM in the same category than the purchase UOM "
-#~ "of the product"
-#~ msgstr ""
-#~ "You have to select a product UOM in the same category than the purchase UOM "
-#~ "of the product"
-
-#~ msgid "Product Categories"
-#~ msgstr "Ürün Kategorisi"
-
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Cannot delete a sale order line which is %s !"
-
-#~ msgid "Cancel Availability"
-#~ msgstr "Kullanılırlığı İptal Et"
-
-#~ msgid "ir.actions.todo"
-#~ msgstr "ir.actions.todo"
-
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "is validated."
 
-#~ msgid "Couldn't find previous ir.actions.todo"
-#~ msgstr "Couldn't find previous ir.actions.todo"
-
-#~ msgid "The code of the transport unit."
-#~ msgstr "The code of the transport unit."
-
-#~ msgid "STOCK_GO_BACK"
-#~ msgstr "STOCK_GO_BACK"
-
-#~ msgid "AccessError"
-#~ msgstr "AccessError"
-
-#~ msgid "Custom Shortcuts"
-#~ msgstr "Custom Shortcuts"
-
-#~ msgid "Security Days"
-#~ msgstr "Security Days"
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "It indicates that an invoice has been paid"
-
 #, python-format
 #~ msgid "Your journal must have a default credit and debit account."
 #~ msgstr "Your journal must have a default credit and debit account."
 
-#~ msgid "Explicit rule name for this pricelist line."
-#~ msgstr "Explicit rule name for this pricelist line."
-
-#~ msgid "Algeria"
-#~ msgstr "Cezayir"
-
-#~ msgid "to be invoiced"
-#~ msgstr "to be invoiced"
-
-#~ msgid "Track Manufacturing Lots"
-#~ msgstr "Track Manufacturing Lots"
-
-#~ msgid "Date on which this document has been created."
-#~ msgstr "Date on which this document has been created."
-
-#~ msgid "Decimal Accuracy"
-#~ msgstr "Decimal Accuracy"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "From Picking"
-#~ msgstr "İrsaliyeden"
-
-#~ msgid "Treasory Analysis"
-#~ msgstr "Treasory Analysis"
-
-#~ msgid "Products Price Type"
-#~ msgstr "Ürün Fiyat Tipi"
-
-#~ msgid "Belgium"
-#~ msgstr "Belçika"
-
-#~ msgid "Public Pricelist"
-#~ msgstr "Genel Fiyat Listesi"
-
-#~ msgid "Total Qty and Amount by month"
-#~ msgstr "Total Qty and Amount by month"
-
-#~ msgid "M."
-#~ msgstr "M."
-
-#~ msgid "Inuktitut / Canada"
-#~ msgstr "Inuktitut / Canada"
-
-#~ msgid "Language"
-#~ msgstr "Language"
-
-#~ msgid "%I - Hour (12-hour clock) as a decimal number [01,12]."
-#~ msgstr "%I - Saat (12 saatlik), ondalık sayı olarak [01,12]."
-
-#~ msgid ""
-#~ "Lead time in days between the confirmation of the purchase order and the "
-#~ "reception of the products in your warehouse. Used by the scheduler for "
-#~ "automatic computation of the purchase order planning."
-#~ msgstr ""
-#~ "Lead time in days between the confirmation of the purchase order and the "
-#~ "reception of the products in your warehouse. Used by the scheduler for "
-#~ "automatic computation of the purchase order planning."
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Barlas Soğutma A.Ş."
-#~ msgstr "Barlas Soğutma A.Ş."
-
 #~ msgid "COL 1"
 #~ msgstr "COL 1"
 
-#~ msgid "res.widget"
-#~ msgstr "res.widget"
-
-#~ msgid "Lots Number"
-#~ msgstr "Lots Number"
-
-#~ msgid "You cannot delete the language which is User's Preferred Language !"
-#~ msgstr "You cannot delete the language which is User's Preferred Language !"
-
-#~ msgid "Norwegian Bokmål / Norway"
-#~ msgstr "Norwegian Bokmål / Norway"
-
-#~ msgid "Type of the Action that is to be executed"
-#~ msgstr "Çalıştırılacak İşlem Türü"
-
-#~ msgid "The kernel of OpenERP, needed for all installation."
-#~ msgstr "OpenERP'nin çekirdeği; bütün kurulumlar için gereklidir."
-
-#~ msgid "Source document"
-#~ msgstr "Source document"
-
-#~ msgid "Inventory (with child locations)"
-#~ msgstr "Inventory (with child locations)"
-
-#~ msgid "Merge Inventory"
-#~ msgstr "Merge Inventory"
-
-#~ msgid "Future Stock Moves"
-#~ msgstr "Gelecekteki Stok Hareketleri"
-
-#~ msgid "Products Listprices Items"
-#~ msgstr "Products Listprices Items"
-
-#~ msgid "PO File"
-#~ msgstr "PO File"
-
-#~ msgid "Sales Order Dates"
-#~ msgstr "Satış Emri Tarihleri"
-
-#~ msgid "Custom"
-#~ msgstr "Custom"
-
-#~ msgid "Error, no partner !"
-#~ msgstr "Error, no partner !"
-
-#~ msgid ""
-#~ "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
-#~ "Portable Objects)"
-#~ msgstr ""
-#~ "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
-#~ "Portable Objects)"
-
-#~ msgid "Margins in Sales Orders"
-#~ msgstr "Margins in Sales Orders"
-
 #~ msgid "Equity"
 #~ msgstr "Equity"
 
-#~ msgid "Not from Picking"
-#~ msgstr "Not from Picking"
-
-#~ msgid "Installed version"
-#~ msgstr "Yüklü sürüm"
-
-#~ msgid "Users"
-#~ msgstr "Kullanıcılar"
-
-#~ msgid "Published Version"
-#~ msgstr "Yayınlanmış Sürüm"
-
-#~ msgid "Window Actions"
-#~ msgstr "Pencere İşlemleri"
-
-#~ msgid "Germany"
-#~ msgstr "Almanya"
-
-#~ msgid "Total Price"
-#~ msgstr "Total Price"
-
-#~ msgid "Price Surcharge"
-#~ msgstr "Price Surcharge"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambiya"
-
-#~ msgid "Week of the year: %(woy)s"
-#~ msgstr "Yılın Haftası: %(woy)s"
-
-#~ msgid "PCE"
-#~ msgstr "AD"
-
-#~ msgid "STOCK_HARDDISK"
-#~ msgstr "STOCK_HARDDISK"
-
-#~ msgid "Logistical Units"
-#~ msgstr "Logistical Units"
-
-#~ msgid "STOCK_APPLY"
-#~ msgstr "STOCK_APPLY"
-
-#~ msgid "The active field allows you to hide the category without removing it."
-#~ msgstr "\"Etkin\" alanı sınıfı silmeden saklamanıza yarar."
-
-#~ msgid "Real Time (automated)"
-#~ msgstr "Real Time (automated)"
-
-#~ msgid "Outgoing Product"
-#~ msgstr "Outgoing Product"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Automatic Orderpoint"
-#~ msgstr "Automatic Orderpoint"
-
-#~ msgid "Volume"
-#~ msgstr "Hacim"
-
-#~ msgid "Create Id"
-#~ msgstr "Oluşturulma Belirteci"
-
-#~ msgid "Egypt"
-#~ msgstr "Mısır"
-
-#~ msgid "Creation"
-#~ msgstr "Creation"
-
-#~ msgid "Apply For Read"
-#~ msgstr "Apply For Read"
-
-#~ msgid ""
-#~ "Select the object on which the action will work (read, write, create)."
-#~ msgstr "İşlemin üzerinde çalışacağı (okuma, yazma, oluşturma) nesneyi seç."
-
-#~ msgid "Please specify server option --email-from !"
-#~ msgstr "Please specify server option --email-from !"
-
-#~ msgid "Language Name"
-#~ msgstr "Language Name"
-
-#~ msgid "Boolean"
-#~ msgstr "Boolean"
-
-#~ msgid ""
-#~ "When real-time inventory valuation is enabled on a product, this account "
-#~ "will hold the current value of the products."
-#~ msgstr ""
-#~ "When real-time inventory valuation is enabled on a product, this account "
-#~ "will hold the current value of the products."
-
-#~ msgid "Fields Description"
-#~ msgstr "Alan Açıklaması"
-
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "The sale order '%s' has been cancelled."
-
-#~ msgid "STOCK_YES"
-#~ msgstr "STOCK_YES"
-
-#~ msgid "Logistic"
-#~ msgstr "Logistic"
-
-#~ msgid "Ratio"
-#~ msgstr "Ratio"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-
-#~ msgid ""
-#~ "Determine if the product is visible in the list of products within a "
-#~ "selection from a purchase order line."
-#~ msgstr ""
-#~ "Determine if the product is visible in the list of products within a "
-#~ "selection from a purchase order line."
-
-#~ msgid "STOCK_CDROM"
-#~ msgstr "STOCK_CDROM"
-
-#~ msgid "STOCK_QUIT"
-#~ msgstr "STOCK_QUIT"
-
-#~ msgid "Procurement Method"
-#~ msgstr "Procurement Method"
-
-#~ msgid "Pick List"
-#~ msgstr "Pick List"
-
-#~ msgid "Pay Bill"
-#~ msgstr "Pay Bill"
-
-#~ msgid "To be installed"
-#~ msgstr "Yüklenecek"
-
-#~ msgid ""
-#~ "It gives the status if the tip has to be displayed or not when a user "
-#~ "executes an action"
-#~ msgstr ""
-#~ "It gives the status if the tip has to be displayed or not when a user "
-#~ "executes an action"
-
-#~ msgid "Order date"
-#~ msgstr "Order date"
-
-#~ msgid "Search Purchase Order"
-#~ msgstr "Search Purchase Order"
-
-#~ msgid "New pack"
-#~ msgstr "New pack"
-
-#~ msgid "Could not find any difference between standard price and new price!"
-#~ msgstr "Could not find any difference between standard price and new price!"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
-#~ msgid ""
-#~ "The combination of serial number and internal reference must be unique !"
-#~ msgstr ""
-#~ "The combination of serial number and internal reference must be unique !"
-
-#~ msgid "Confirm Order"
-#~ msgstr "Siparişi Onayla"
-
-#~ msgid "Liberia"
-#~ msgstr "Liberya"
-
-#~ msgid "Future Qty"
-#~ msgstr "Future Qty"
-
-#~ msgid "Standard Price"
-#~ msgstr "Standart Fiyat"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
 #~ msgid "Value"
 #~ msgstr "Value"
 
-#~ msgid "Shipping Type"
-#~ msgstr "Shipping Type"
-
-#~ msgid "Periods :"
-#~ msgstr "Periods :"
-
-#~ msgid ""
-#~ "There are no products to return (only lines in Done state and not fully "
-#~ "returned yet can be returned)!"
-#~ msgstr ""
-#~ "There are no products to return (only lines in Done state and not fully "
-#~ "returned yet can be returned)!"
-
-#~ msgid "Moldavia"
-#~ msgstr "Moldavya"
-
-#~ msgid "res.config.installer"
-#~ msgstr "res.config.installer"
-
-#~ msgid "Sets the higher limit of quantity of hours."
-#~ msgstr "Sets the higher limit of quantity of hours."
-
-#~ msgid "Minutes"
-#~ msgstr "Dakika"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-
-#~ msgid "Help"
-#~ msgstr "Yardım"
-
-#~ msgid "Create Invoices"
-#~ msgstr "Create Invoices"
-
-#~ msgid ""
-#~ "If specified, the action will replace the standard menu for this user."
-#~ msgstr ""
-#~ "If specified, the action will replace the standard menu for this user."
-
-#~ msgid "Property Group"
-#~ msgstr "Property Group"
-
-#~ msgid ""
-#~ " * 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."
-#~ msgstr ""
-#~ " * 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."
-
-#~ msgid "Abkhazian (RU)"
-#~ msgstr "Abkhazian (RU)"
-
-#~ msgid "terp-hr"
-#~ msgstr "terp-hr"
-
-#~ msgid ""
-#~ "All pending configuration wizards have been executed. You may restart "
-#~ "individual wizards via the list of configuration wizards."
-#~ msgstr ""
-#~ "All pending configuration wizards have been executed. You may restart "
-#~ "individual wizards via the list of configuration wizards."
-
-#~ msgid "Current Year with Century: %(year)s"
-#~ msgstr "Current Year with Century: %(year)s"
-
-#~ msgid "Location Type"
-#~ msgstr "Location Type"
-
-#~ msgid "France"
-#~ msgstr "Fransa"
-
-#~ msgid "res.log"
-#~ msgstr "res.log"
-
-#~ msgid "Could not cancel this purchase order !"
-#~ msgstr "Could not cancel this purchase order !"
-
-#~ msgid "Flow Stop"
-#~ msgstr "Flow Stop"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "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."
-
-#~ msgid "Weeks"
-#~ msgstr "Hafta"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Kuzey Mariana Adaları"
-
-#~ msgid "Afghanistan, Islamic State of"
-#~ msgstr "Afganistan"
-
-#~ msgid "Units of Measure"
-#~ msgstr "Birimi"
-
-#~ msgid "country_id"
-#~ msgstr "country_id"
-
-#~ msgid "Loop Expression"
-#~ msgstr "Döngü İfadesi"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "terp-purchase"
-#~ msgstr "Copy text   \t terp-purchase"
-
-#~ msgid "Interval Unit"
-#~ msgstr "Aralık Birimi"
-
-#~ msgid ""
-#~ "Refund invoice base on this type. You can not Modify and Cancel if the "
-#~ "invoice is already rencociled"
-#~ msgstr ""
-#~ "Refund invoice base on this type. You can not Modify and Cancel if the "
-#~ "invoice is already rencociled"
-
-#~ msgid "Regards,"
-#~ msgstr "Regards,"
-
-#~ msgid "Kind"
-#~ msgstr "Tür"
-
-#~ msgid "Sales Receipt"
-#~ msgstr "Sales Receipt"
-
-#~ msgid "Dates of Inventories"
-#~ msgstr "Envanter Tarihleri"
-
-#~ msgid "Thousands Separator"
-#~ msgstr "Binler Ayracı"
-
-#~ msgid "City"
-#~ msgstr "Şehir"
-
-#~ msgid "Quantity to leave in the current pack"
-#~ msgstr "Quantity to leave in the current pack"
-
-#~ msgid "UoM Category"
-#~ msgstr "Birim Kateorisi"
-
-#~ msgid ""
-#~ "When a version is duplicated it is set to non active, so that the dates do "
-#~ "not overlaps with original version. You should change the dates and "
-#~ "reactivate the pricelist"
-#~ msgstr ""
-#~ "When a version is duplicated it is set to non active, so that the dates do "
-#~ "not overlaps with original version. You should change the dates and "
-#~ "reactivate the pricelist"
-
-#~ msgid "Receptions"
-#~ msgstr "Receptions"
-
-#~ msgid "Procurement Request"
-#~ msgstr "Procurement Request"
-
-#~ msgid "Receive Products"
-#~ msgstr "Ürünleri Al"
-
-#~ msgid "Deliver Products"
-#~ msgstr "Ürünleri Gönder"
-
-#~ msgid "Shipping & Manual Invoice"
-#~ msgstr "İrsaliye & Manuel Fatura"
-
-#~ msgid "Chinese (TW) / 正體字"
-#~ msgstr "Chinese (TW) / 正體字"
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shipments or not?"
-#~ msgstr ""
-#~ "Bütün ürünleri bir kerede gönderecek kadar stok ürününüz yoksa kısmi "
-#~ "teslimatların kabul edilip edilmediği."
-
-#~ msgid "res.request"
-#~ msgstr "res.request"
-
-#~ msgid "Date of Completion"
-#~ msgstr "Tamamlanma Tarihi"
-
-#~ msgid "Split in production lots"
-#~ msgstr "Üretim Lotlarını Böl"
-
-#~ msgid " Quantity: "
-#~ msgstr " Miktar: "
-
-#~ msgid "Product Lots Filter"
-#~ msgstr "Product Lots Filter"
-
-#~ msgid "In Memory"
-#~ msgstr "Hafızada"
-
-#~ msgid "STOCK_FIND"
-#~ msgstr "STOCK_FIND"
-
-#~ msgid "Scheduled Date"
-#~ msgstr "Planlanan Tarih"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Shipping Address :"
-#~ msgstr "Teslimat Adresi :"
-
-#~ msgid ""
-#~ "The group that a user must have to be authorized to validate this transition."
-#~ msgstr ""
-#~ "The group that a user must have to be authorized to validate this transition."
-
-#~ msgid "List Price"
-#~ msgstr "Liste Fiyatı"
-
-#~ msgid "Please select at least two inventories."
-#~ msgstr "Lütfen en az iki ambar seçin."
-
-#~ msgid ""
-#~ "You have to select a partner in the purchase form !\n"
-#~ "Please set one partner before choosing a product."
-#~ msgstr ""
-#~ "You have to select a partner in the purchase form !\n"
-#~ "Please set one partner before choosing a product."
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "The chosen company is not in the allowed companies for this user"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Cebelitarık"
-
-#~ msgid "Service Name"
-#~ msgstr "Servis Adı"
-
-#~ msgid "Pitcairn Island"
-#~ msgstr "Pitcairn Adası"
-
-#~ msgid "Install Applications"
-#~ msgstr "Uygulamaları Yükle"
-
-#~ msgid "Set Available"
-#~ msgstr "Kullanılabilir Yap"
-
-#~ msgid "Units of Measure categories"
-#~ msgstr "Ölçü Birimi Kategorileri"
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-
-#~ msgid "Old Quotations"
-#~ msgstr "Eski Teklifler"
-
-#~ msgid "Portrait"
-#~ msgstr "Dikey"
-
-#~ msgid ""
-#~ "We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
-#~ msgstr ""
-#~ "We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
-
-#~ msgid "Record Rules"
-#~ msgstr "Kayıt Kuralları"
-
-#~ msgid "User Name"
-#~ msgstr "Kullanıcı Adı"
-
-#~ msgid "Day of the year: %(doy)s"
-#~ msgstr "Yılın günü: %(doy)s"
-
-#~ msgid "Neutral Zone"
-#~ msgstr "Tarafsız Bölge"
-
-#~ msgid "Compute Stock"
-#~ msgstr "Stoku Hesapla"
-
-#~ msgid "Compute all schedulers"
-#~ msgstr "Compute all schedulers"
-
-#~ msgid "Guinea Bissau"
-#~ msgstr "Gine Bissau"
-
-#~ msgid "Date Closed"
-#~ msgstr "Kapatma Tarihi"
-
-#~ msgid "Late"
-#~ msgstr "Geç"
-
-#~ msgid "Attachments"
-#~ msgstr "Eklentiler"
-
-#~ msgid "_Validate"
-#~ msgstr "_Validate"
-
-#~ msgid "Misc"
-#~ msgstr "Çeşitli"
-
-#~ msgid "Approved"
-#~ msgstr "Onaylanmış"
-
-#~ msgid "Other Actions"
-#~ msgstr "Diğer İşlemler"
-
-#~ msgid ""
-#~ "Provide the field name where the record id is stored after the create "
-#~ "operations. If it is empty, you can not track the new record."
-#~ msgstr ""
-#~ "Oluşturma işlemlerinden sonra kayıt belirtecinin saklandığı alan adını "
-#~ "veriniz. Boş ise, yeni kayıtları takip edemezsiniz."
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-
-#~ msgid "Date Approved"
-#~ msgstr "Onaylanmış Tarih"
-
-#~ msgid "Miss"
-#~ msgstr "Bayan"
-
-#~ msgid "Write Access"
-#~ msgstr "Yazma Erişimi"
-
-#~ msgid "Purchase Orders"
-#~ msgstr "Satın Alma Emirleri"
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid "Merge orders"
-#~ msgstr "Emirleri birleştir"
-
-#~ msgid "Italy"
-#~ msgstr "İtalya"
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Giden Teslimatlar"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#~ msgid "Estonian / Eesti keel"
-#~ msgstr "Estonian / Eesti keel"
-
-#~ msgid "E-mail"
-#~ msgstr "E-posta"
-
 #~ msgid "Total quantity"
 #~ msgstr "Toplam miktar"
 
-#~ msgid "Buttons"
-#~ msgstr "Düğmeler"
-
-#~ msgid "GPL-3 or later version"
-#~ msgstr "GPL-3 veya daha yeni sürümü"
-
-#~ msgid "Creation Date"
-#~ msgstr "Yaratım Tarihi"
-
-#~ msgid "Default Payment Term"
-#~ msgstr "Öntanımlı Ödeme Şartları"
-
-#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
-#~ msgstr "Cannot delete Sale Order(s) which are already confirmed !"
-
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr ""
-#~ "This is the list of picking list that have been generated for this invoice"
-
-#~ msgid "Python Action"
-#~ msgstr "Python İşlemi"
-
-#~ msgid "Total value"
-#~ msgstr "Toplam değer"
-
-#~ msgid "English (US)"
-#~ msgstr "İngilizce (US)"
-
-#~ msgid "Launch"
-#~ msgstr "Launch"
-
-#~ msgid "Product UOS"
-#~ msgstr "Stok 2. Birim"
-
-#~ msgid "To browse official translations, you can start with these links:"
-#~ msgstr "To browse official translations, you can start with these links:"
-
-#~ msgid "Address"
-#~ msgstr "Adres"
-
-#~ msgid "Products Categories"
-#~ msgstr "Ürün Kategorisi"
-
-#~ msgid "ir.translation"
-#~ msgstr "ir.translation"
-
-#~ msgid "Module update result"
-#~ msgstr "Module update result"
-
-#~ msgid "Activity"
-#~ msgstr "Etkinlik"
-
-#~ msgid "Default Unit Of Measure"
-#~ msgstr "Varsayılan Ölçü Birimi"
-
-#~ msgid "Grand Total:"
-#~ msgstr "Genel Toplam:"
-
-#~ msgid "Board"
-#~ msgstr "Board"
-
-#~ msgid "Postal Address"
-#~ msgstr "Posta Adresi"
-
-#~ msgid "Parent Company"
-#~ msgstr "Ana Firma"
-
-#~ msgid "Pack Reference"
-#~ msgstr "Paket Referansı"
-
-#~ msgid "Central Journals"
-#~ msgstr "Central Journals"
-
-#~ msgid "From a purchase order"
-#~ msgstr "Satın alma emrinden"
-
-#~ msgid "Rate"
-#~ msgstr "Oran"
-
-#~ msgid "Congo"
-#~ msgstr "Kongo"
-
-#~ msgid "Examples"
-#~ msgstr "Örnekler"
-
-#~ msgid "Iceland"
-#~ msgstr "İzlanda"
-
-#~ msgid "Default Value"
-#~ msgstr "Öntanımlı Değer"
-
-#~ msgid "Country state"
-#~ msgstr "Ülke eyaleti"
-
-#~ msgid ""
-#~ "unique number of the purchase order,computed automatically when the purchase "
-#~ "order is created"
-#~ msgstr ""
-#~ "unique number of the purchase order,computed automatically when the purchase "
-#~ "order is created"
-
-#~ msgid "Category"
-#~ msgstr "Kategori"
-
-#~ msgid "Package by layer"
-#~ msgstr "Tabakadaki Paket Sayısı"
-
-#~ msgid "Right"
-#~ msgstr "Sağ"
-
-#~ msgid "Schedulers"
-#~ msgstr "Schedulers"
-
-#~ msgid "Location / Product"
-#~ msgstr "Yer / Ürün"
-
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "Product Manager"
-#~ msgstr "Ürün Müdürü"
-
-#~ msgid ""
-#~ "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
-#~ "that have already been processed (except by the Administrator)"
-#~ msgstr ""
-#~ "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
-#~ "that have already been processed (except by the Administrator)"
-
-#~ msgid "Switzerland"
-#~ msgstr "İsviçre"
-
-#~ msgid "Planification"
-#~ msgstr "Planification"
-
-#~ msgid "Saint Kitts & Nevis Anguilla"
-#~ msgstr "Saint Kitts ve Nevis Federasyonu"
-
-#~ msgid "To Invoice"
-#~ msgstr "Faturalanacak"
-
-#~ msgid "NOte Type"
-#~ msgstr "Not Tipi"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Satış Noktaları"
-
-#~ msgid "Products Price List"
-#~ msgstr "Ürün Fiyat Listesi"
-
-#~ msgid "No address defined for the supplier"
-#~ msgstr "No address defined for the supplier"
-
-#~ msgid "Open Product"
-#~ msgstr "Ürünü Aç"
-
-#~ 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: "
-#~ msgstr ""
-#~ "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: "
-
-#~ msgid "STOCK_HOME"
-#~ msgstr "STOCK_HOME"
-
-#~ msgid "Deliveries to Invoice"
-#~ msgstr "Faturalanacak Gönderiler"
-
-#~ msgid "Serial Number"
-#~ msgstr "Seri Numarası"
-
-#~ msgid ""
-#~ "This pricelist will be used, instead of the default one, for purchases from "
-#~ "the current partner"
-#~ msgstr ""
-#~ "This pricelist will be used, instead of the default one, for purchases from "
-#~ "the current partner"
-
-#~ msgid "You must first cancel all invoices attached to this sale order."
-#~ msgstr "Önce bu satış emrine dair tüm faturaların iptal edilmesi gerekli."
-
-#~ msgid ""
-#~ "Object in which you want to create / write the object. If it is empty then "
-#~ "refer to the Object field."
-#~ msgstr ""
-#~ "Nesneyi oluşturmak ( oluşturma / yazma) istediğiniz nesnenin adı. Boş ise "
-#~ "Nesne alanı dikkate alınır."
-
-#~ msgid "Not Installed"
-#~ msgstr "Yüklenmemiş"
-
-#~ msgid "Default Purchase Pricelist Version"
-#~ msgstr "Varsayılan Alış Fiyat Listesi Vers."
-
-#~ msgid "Outgoing Transitions"
-#~ msgstr "Outgoing Transitions"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-
-#~ msgid "Shop"
-#~ msgstr "Mağaza"
-
-#~ msgid "Starting date for this pricelist version to be valid."
-#~ msgstr "Fiyat listesinin geçerli olacağı başlangıç tarihi."
-
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#~ msgid "Rack"
-#~ msgstr "Raf"
-
-#~ msgid "Martinique (French)"
-#~ msgstr "Martinique (Fransız)"
-
-#~ msgid "Minimum Stock Rules Search"
-#~ msgstr "Minimum Stok Kuralı Arama"
-
-#~ msgid "Sequences Type"
-#~ msgstr "Sequences Type"
-
-#~ msgid "Length / Distance"
-#~ msgstr "Uzunluk / Mesafe"
-
-#~ msgid "Do you want to merge theses inventories ?"
-#~ msgstr "Bu ambarları birleştirmek istediğinizden emin misiniz?"
-
-#~ msgid "Position"
-#~ msgstr "Pozisyon"
-
-#~ msgid "Yemen"
-#~ msgstr "Yemen"
-
-#~ msgid "Or"
-#~ msgstr "Veya"
-
-#~ msgid "Pricelist Type"
-#~ msgstr "Fiyat Listesi Tipi"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Albania"
-#~ msgstr "Arnavutluk"
-
-#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-#~ msgstr "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-
-#~ msgid ""
-#~ "Future stock for this product according to the selected locations or all "
-#~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
-#~ "Incoming."
-#~ msgstr ""
-#~ "Future stock for this product according to the selected locations or all "
-#~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
-#~ "Incoming."
-
-#~ msgid ""
-#~ "Please be patient, this operation may take a few minutes (depending on the "
-#~ "number of modules currently installed)..."
-#~ msgstr ""
-#~ "Please be patient, this operation may take a few minutes (depending on the "
-#~ "number of modules currently installed)..."
-
-#~ msgid "Default UoM"
-#~ msgstr "Varsayılan Ölçü Birimi"
-
-#~ msgid "Payment Term (short name)"
-#~ msgstr "Ödeme Şekli (kısa adı)"
-
-#~ msgid "Manufacturing Lead Time"
-#~ msgstr "Üretim Tedarik Süresi"
-
-#~ msgid "Child IDs"
-#~ msgstr "Alt Belirteçler"
-
-#~ msgid "Problem in configuration `Record Id` in Server Action!"
-#~ msgstr "Sunucu İşlemi Yapılandırma `Kayıt Belirteci` sorunu!"
-
-#~ msgid "Sales Order"
-#~ msgstr "Satış Emri"
-
-#~ msgid "Quantity (UoS)"
-#~ msgstr "Miktar (2.Br.)"
-
-#~ msgid ""
-#~ "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 UOM."
-#~ msgstr ""
-#~ "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 UOM."
-
-#~ msgid "Open Modules"
-#~ msgstr "Açık Modüller"
-
-#~ msgid "This error occurs on database %s"
-#~ msgstr "Bu hata %s veritabanında gerçekleşti"
-
-#~ msgid "Import module"
-#~ msgstr "Modülü İçeri Aktar"
-
-#~ msgid "Cyprus"
-#~ msgstr "Kıbrıs"
-
-#~ msgid "XML File"
-#~ msgstr "XML File"
-
-#~ msgid "Loop Action"
-#~ msgstr "Döngü İşlemi"
-
-#~ msgid ""
-#~ "The path to the main report file (depending on Report Type) or NULL if the "
-#~ "content is in another field"
-#~ msgstr ""
-#~ "The path to the main report file (depending on Report Type) or NULL if the "
-#~ "content is in another field"
-
-#~ msgid "Laos"
-#~ msgstr "Laos"
-
-#~ msgid "Total outgoing quantity"
-#~ msgstr "Toplam çıkan miktarı"
-
-#~ msgid "Email"
-#~ msgstr "E-Posta"
-
-#~ msgid "Tax Exempt"
-#~ msgstr "Vergi İstisnası"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-
-#~ msgid "Palletization"
-#~ msgstr "Paletleme"
-
-#~ msgid "Widget"
-#~ msgstr "Widget"
-
-#~ msgid "Want to Clear Ids ? "
-#~ msgstr "Id'leri temizlememi ister misiniz ? "
-
-#~ msgid "Sales Order Lines"
-#~ msgstr "Satış Emri Satırları"
-
-#~ msgid ""
-#~ "A purchase order generates a supplier invoice, as soon as it is confirmed by "
-#~ "the buyer. Depending on the Invoicing control of the purchase order, the "
-#~ "invoice is based on received or on ordered quantities."
-#~ msgstr ""
-#~ "A purchase order generates a supplier invoice, as soon as it is confirmed by "
-#~ "the buyer. Depending on the Invoicing control of the purchase order, the "
-#~ "invoice is based on received or on ordered quantities."
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Other Proprietary"
-#~ msgstr "Other Proprietary"
-
-#~ msgid "Real"
-#~ msgstr "Gerçek"
-
-#~ msgid "Invoice is not created"
-#~ msgstr "Fatura yaratılmadı"
-
-#~ msgid "Box"
-#~ msgstr "Kutu"
-
-#~ msgid "Stop All"
-#~ msgstr "Tümünü Durdur"
-
-#~ msgid "Qty Multiple"
-#~ msgstr "Qty Multiple"
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "MRP & Logistic Scheduler"
-
-#~ msgid "Select category for the current product"
-#~ msgstr "Select category for the current product"
-
-#~ msgid "Automatic Procurements"
-#~ msgstr "Automatic Procurements"
-
-#~ msgid "Not enough stock, unable to reserve the products."
-#~ msgstr "Not enough stock, unable to reserve the products."
-
-#~ msgid "Outgoing"
-#~ msgstr "Çıkan"
-
-#~ msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
-#~ msgstr "3. %x ,%X ==> 12/05/08, 18:25:20"
-
-#~ msgid "Cascade"
-#~ msgstr "Basamakla"
-
-#~ msgid "Group Required"
-#~ msgstr "Grup Gerekli"
-
-#~ msgid ""
-#~ "This wizard will definitelly close a fiscal year and its related periods. "
-#~ "That means that no one will be able to create or modify journal entries in "
-#~ "it."
-#~ msgstr ""
-#~ "This wizard will definitelly close a fiscal year and its related periods. "
-#~ "That means that no one will be able to create or modify journal entries in "
-#~ "it."
-
-#~ msgid "Process Document"
-#~ msgstr "Dökümanı İşle"
-
-#~ msgid "Monthly Purchase by Category"
-#~ msgstr "Kategorilere Göre Aylık Satın Alımlar"
-
-#~ msgid "Next Configuration Step"
-#~ msgstr "Sonraki Yapılandırma Adımı"
-
-#~ msgid "Pack"
-#~ msgstr "Pack"
-
-#~ msgid "STOCK_PREFERENCES"
-#~ msgstr "STOCK_PREFERENCES"
-
-#~ msgid ""
-#~ "Enable this if you want to execute missed occurences as soon as the server "
-#~ "restarts."
-#~ msgstr ""
-#~ "Enable this if you want to execute missed occurences as soon as the server "
-#~ "restarts."
-
-#~ msgid "Start update"
-#~ msgstr "Start update"
-
-#~ msgid "State Name"
-#~ msgstr "Eyalet Adı"
-
-#~ msgid "The amount without tax"
-#~ msgstr "The amount without tax"
-
-#~ msgid "Payable and Receivables"
-#~ msgstr "Payable and Receivables"
-
-#~ msgid "Uninvoiced"
-#~ msgstr "Uninvoiced"
-
-#~ msgid "Pricelist Name"
-#~ msgstr "Fiyat Listesi Adı"
-
-#~ msgid "Menu :"
-#~ msgstr "Menu :"
-
-#~ msgid "Join Mode"
-#~ msgstr "Katılma Kipi"
-
-#~ msgid "Timezone"
-#~ msgstr "Timezone"
-
-#~ msgid "ir.actions.report.xml"
-#~ msgstr "ir.actions.report.xml"
-
-#~ msgid "Row"
-#~ msgstr "Sıra"
-
-#~ msgid "Advance Invoice"
-#~ msgstr "Advance Invoice"
-
-#~ msgid "Netherlands"
-#~ msgstr "Hollanda"
-
-#~ msgid "Destination Address"
-#~ msgstr "Gönderilen Adres"
-
-#~ msgid ""
-#~ "'%s' contains too many dots. XML ids should not contain dots ! These are "
-#~ "used to refer to other modules data, as in module.reference_id"
-#~ msgstr ""
-#~ "'%s' çok fazla nokta içermektedir. XML belirteçlerinde nokta bulunmaz ! "
-#~ "Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, "
-#~ "module.reference_id ."
-
-#~ msgid "Order N°"
-#~ msgstr "Order N°"
-
-#~ msgid "User Error!"
-#~ msgstr "User Error!"
-
-#~ msgid "Mss"
-#~ msgstr "Mss"
-
-#~ msgid "ir.ui.view"
-#~ msgstr "ir.ui.view"
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Supplier Product UoM."
-
-#~ msgid "RML content"
-#~ msgstr "RML içerik"
-
-#~ msgid "Stock Inventory"
-#~ msgstr "Stock Inventory"
-
-#~ msgid "This field is used to set/get locales for user"
-#~ msgstr ""
-#~ "Bu alan kullanıcının yerel mahalini değiştirmek/almak için kulalnılır"
-
-#~ msgid "Search modules"
-#~ msgstr "Search modules"
-
-#~ msgid "Belarus"
-#~ msgstr "Beyaz Rusya"
-
-#~ msgid "Action Name"
-#~ msgstr "İşlem Adı"
-
-#~ msgid "Purchase Order Merge"
-#~ msgstr "Purchase Order Merge"
-
-#~ msgid "Gives the sequence order when displaying a list of packaging."
-#~ msgstr "Gives the sequence order when displaying a list of packaging."
-
-#~ msgid "Select FiscalYear(s)"
-#~ msgstr "Select FiscalYear(s)"
-
-#~ msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
-#~ msgstr "There is no journal defined on the product category: \"%s\" (id: %d)"
-
-#~ msgid "Street2"
-#~ msgstr "Sokak2"
-
-#~ msgid "Menu Information"
-#~ msgstr "Menu Information"
-
-#~ msgid "Module Update"
-#~ msgstr "Module Update"
-
-#~ msgid "Portugese (BR) / português (BR)"
-#~ msgstr "Portugese (BR) / português (BR)"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Purchases Orders"
-#~ msgstr "Purchases Orders"
-
-#~ msgid "Set to zero"
-#~ msgstr "Set to zero"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Porto Riko"
-
-#~ msgid "Variable"
-#~ msgstr "Variable"
-
-#~ msgid "Stock Variation Account"
-#~ msgstr "Stock Variation Account"
-
 #~ msgid "Amount reconciled"
 #~ msgstr "Amount reconciled"
 
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price. Always expressed in the company main currency."
-#~ msgstr ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price. Always expressed in the company main currency."
-
-#~ msgid "Can be Rent"
-#~ msgstr "Can be Rent"
-
-#~ msgid ""
-#~ "No rate found \n"
-#~ "' \\n                    'for the currency: %s \n"
-#~ "' \\n                    'at the date: %s"
-#~ msgstr ""
-#~ "No rate found \n"
-#~ "' \\n                    'for the currency: %s \n"
-#~ "' \\n                    'at the date: %s"
-
-#~ msgid "Icon show in  hierarchical tree view"
-#~ msgstr "Icon show in  hierarchical tree view"
-
-#~ msgid "Open Window"
-#~ msgstr "Pencere Aç"
-
-#~ msgid "Auto Search"
-#~ msgstr "Auto Search"
-
-#~ msgid "Journal Vouchers"
-#~ msgstr "Journal Vouchers"
-
 #, python-format
 #~ msgid "Closing of fiscal year cancelled, please check the box !"
 #~ msgstr "Closing of fiscal year cancelled, please check the box !"
 
-#~ msgid "Filter"
-#~ msgstr "Süzgeç"
-
-#~ msgid "Ms."
-#~ msgstr "Ms."
-
-#~ msgid "Extended options..."
-#~ msgstr "Extended options..."
-
-#~ msgid "Future Stock"
-#~ msgstr "Future Stock"
-
-#~ msgid "The weight of a full package, pallet or box."
-#~ msgstr "The weight of a full package, pallet or box."
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Trigger Configuration"
-#~ msgstr "Tetikleme Yapılandırması"
-
-#~ msgid "Open Report"
-#~ msgstr "Raporu Aç"
-
-#~ msgid "Rounding factor"
-#~ msgstr "Yuvarlama Değeri"
-
-#~ msgid "Load"
-#~ msgstr "Load"
-
-#~ msgid "Traceability"
-#~ msgstr "İzlenebilirlik / Takip Sistemi"
-
-#~ msgid "The new user's real name, used for searching and most listings"
-#~ msgstr "The new user's real name, used for searching and most listings"
-
-#~ msgid "Covered Modules"
-#~ msgstr "Kapalı Modüller"
-
-#~ msgid "Bill Date"
-#~ msgstr "Bill Date"
-
-#~ msgid "Track moves"
-#~ msgstr "Track moves"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Check out this box if you want to always display tips on each menu action"
-
-#~ msgid "Sales Information"
-#~ msgstr "Satış Bilgisi"
-
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Open Vendor Journal Entries"
-
-#~ msgid "Sale Shop"
-#~ msgstr "Satış Mağazası"
-
-#~ msgid "Latest error"
-#~ msgstr "Latest error"
-
-#~ msgid "res.request.history"
-#~ msgstr "res.request.history"
-
-#~ msgid "Hour 00->12: %(h12)s"
-#~ msgstr "Saat 00->12: %(h12)"
-
-#~ msgid "Partial Delivery"
-#~ msgstr "Kısmi Teslimat"
-
-#~ msgid "Help URL"
-#~ msgstr "Help URL"
-
-#~ msgid "Not enough stock !"
-#~ msgstr "Not enough stock !"
-
-#~ msgid "Processes"
-#~ msgstr "Processes"
-
-#~ msgid "Update Terms"
-#~ msgstr "Update Terms"
-
-#~ msgid "Uncheck the active field to hide the contact."
-#~ msgstr "Etkin kutucuğunu seçmeyerek bağlantıyı saklayınız."
-
-#~ msgid "Arguments"
-#~ msgstr "Arguments"
-
-#~ msgid "Back Order of"
-#~ msgstr "Back Order of"
-
-#~ msgid "Split in Production lots"
-#~ msgstr "Split in Production lots"
-
-#~ msgid "GPL Version 2"
-#~ msgstr "GPL Version 2"
-
-#~ msgid "GPL Version 3"
-#~ msgstr "GPL Version 3"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "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."
-
-#~ msgid ""
-#~ "User %s does not have rights to access %s journal !' % "
-#~ "(statement.user_id.name, statement.journal_id.name)))\n"
-#~ "\n"
-#~ "        if statement.name and statement.name == '/':\n"
-#~ "            number = self.pool.get('ir.sequence"
-#~ msgstr ""
-#~ "User %s does not have rights to access %s journal !' % "
-#~ "(statement.user_id.name, statement.journal_id.name)))\n"
-#~ "\n"
-#~ "        if statement.name and statement.name == '/':\n"
-#~ "            number = self.pool.get('ir.sequence"
-
-#~ msgid "Quantity Rules"
-#~ msgstr "Quantity Rules"
-
-#~ msgid ""
-#~ "Quantities of products that are planned to arrive in selected locations or "
-#~ "all internal if none have been selected."
-#~ msgstr ""
-#~ "Quantities of products that are planned to arrive in selected locations or "
-#~ "all internal if none have been selected."
-
-#~ msgid "Correct EAN13"
-#~ msgstr "Correct EAN13"
-
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#~ msgid "The way to procurement depends on the product type."
-#~ msgstr "The way to procurement depends on the product type."
-
-#~ msgid "Pick list generated"
-#~ msgstr "Pick list generated"
-
-#~ 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 ""
-#~ "When doing real-time inventory valuation, this is the Accounting Journal in "
-#~ "which entries will be automatically posted when stock moves are processed."
-
-#~ msgid "Production Lot Identification"
-#~ msgstr "Production Lot Identification"
-
-#~ msgid "Purchase by supplier"
-#~ msgstr "Purchase by supplier"
-
-#~ msgid "Product Variant"
-#~ msgstr "Ürün Değişkeni"
-
-#~ msgid "Your Order Reference"
-#~ msgstr "Your Order Reference"
-
-#~ msgid "Purchase Order Confirmation N°"
-#~ msgstr "Purchase Order Confirmation N°"
-
-#~ msgid "Short Description"
-#~ msgstr "Kısa açıklama"
-
-#~ msgid "Revisions"
-#~ msgstr "Revisions"
-
-#~ msgid "Context Value"
-#~ msgstr "Bağlam Değeri"
-
-#~ msgid "Hour 00->24: %(h24)s"
-#~ msgstr "Saat 00->24: %(h24)"
-
-#~ msgid "Workflow Trigger"
-#~ msgstr "Workflow Trigger"
-
-#~ msgid "Next Execution Date"
-#~ msgstr "Next Execution Date"
-
-#~ msgid "Total Tax Included"
-#~ msgstr "Toplam Vergi Dahildir"
-
-#~ msgid "Output"
-#~ msgstr "Çıkış"
-
-#~ msgid "Select field property"
-#~ msgstr "Alan özelliğini seçiniz"
-
-#~ msgid "Date sent"
-#~ msgstr "Gönderildiği tarih"
-
-#~ msgid "Month: %(month)s"
-#~ msgstr "Month: %(month)"
-
-#~ msgid "Cost Price:"
-#~ msgstr "Cost Price:"
-
-#~ msgid "Quantity-1"
-#~ msgstr "Quantity-1"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Manufacturing"
-
-#~ msgid "Export Translation"
-#~ msgstr "Export Translation"
-
-#~ msgid "Server Actions"
-#~ msgstr "Sunucu İşlemleri"
-
-#~ msgid "Scheduler Range Days"
-#~ msgstr "Scheduler Range Days"
-
-#~ msgid "Cancel Install"
-#~ msgstr "Yükleme İptal"
-
-#~ msgid "Purchase Dashboard"
-#~ msgstr "Purchase Dashboard"
-
-#~ msgid "Delivery Lead Time"
-#~ msgstr "Delivery Lead Time"
-
-#~ msgid "Legends for Date and Time Formats"
-#~ msgstr "Tarih ve Zaman şekilleri için gösterge"
-
-#~ msgid "Make Procurements"
-#~ msgstr "Make Procurements"
-
-#~ msgid "Copy Object"
-#~ msgstr "Copy Object"
-
-#~ msgid "Procurement Lines"
-#~ msgstr "Procurement Lines"
-
-#~ msgid "Number of Layers"
-#~ msgstr "Number of Layers"
-
-#~ msgid "Chained Location If Fixed"
-#~ msgstr "Zincirlenmiş Lokasyon Sabit ise"
-
-#~ msgid "Put in a new pack"
-#~ msgstr "Put in a new pack"
-
-#~ msgid "Left Parent"
-#~ msgstr "Left Parent"
-
-#~ msgid "Last Product Inventories"
-#~ msgstr "Last Product Inventories"
-
 #~ msgid "Asset"
 #~ msgstr "Asset"
 
-#~ msgid "Bigger than the reference UoM"
-#~ msgstr "Bigger than the reference UoM"
-
-#~ msgid "Fed. States"
-#~ msgstr "Federal Eyaletler"
-
-#~ msgid "Access Rules"
-#~ msgstr "Giriş Kuralları"
-
-#~ msgid ""
-#~ "By unchecking the active field you can disable a unit of measure without "
-#~ "deleting it."
-#~ msgstr ""
-#~ "By unchecking the active field you can disable a unit of measure without "
-#~ "deleting it."
-
-#~ msgid "Table Ref."
-#~ msgstr "Tablo Referansı"
-
-#~ msgid ""
-#~ "The invoice is created automatically if the Invoice control of the purchase "
-#~ "order is 'On picking'. The invoice can also be generated manually by the "
-#~ "accountant (Invoice control = Manual)."
-#~ msgstr ""
-#~ "The invoice is created automatically if the Invoice control of the purchase "
-#~ "order is 'On picking'. The invoice can also be generated manually by the "
-#~ "accountant (Invoice control = Manual)."
-
-#~ msgid "description"
-#~ msgstr "description"
-
-#~ msgid "Object"
-#~ msgstr "Nesne"
-
-#~ msgid "Purchase Order Waiting Approval"
-#~ msgstr "Purchase Order Waiting Approval"
-
-#~ msgid "Form view not available for Payment Lines"
-#~ msgstr "Form view not available for Payment Lines"
-
-#~ msgid "ir.default"
-#~ msgstr "ir.default"
-
-#~ msgid "Minute: %(min)s"
-#~ msgstr "Dakika: %(min)s"
-
-#~ msgid "Voucher Statistics"
-#~ msgstr "Voucher Statistics"
-
-#~ msgid "STOCK_ZOOM_100"
-#~ msgstr "STOCK_ZOOM_100"
-
-#~ msgid "STOCK_NETWORK"
-#~ msgstr "STOCK_NETWORK"
-
-#~ msgid "Virgin Islands (USA)"
-#~ msgstr "Virgin Adaları (ABD)"
-
-#~ msgid ""
-#~ "Number of time the function is called,\n"
-#~ "a negative number indicates no limit"
-#~ msgstr ""
-#~ "Number of time the function is called,\n"
-#~ "a negative number indicates no limit"
-
-#~ msgid "Incoming"
-#~ msgstr "Incoming"
-
-#~ msgid "Automatic No Step Added"
-#~ msgstr "Otomatik No Adımı Eklendi"
-
-#~ msgid ""
-#~ "Optional address where goods are to be delivered, specifically used for "
-#~ "allotment"
-#~ msgstr ""
-#~ "Optional address where goods are to be delivered, specifically used for "
-#~ "allotment"
-
-#~ msgid "You cannot delete any record!"
-#~ msgstr "You cannot delete any record!"
-
-#~ msgid "Supplier Quantity"
-#~ msgstr "Supplier Quantity"
-
 #~ msgid "Tax Report"
 #~ msgstr "Tax Report"
 
-#~ msgid "Quantity-5"
-#~ msgstr "Quantity-5"
-
-#~ msgid "Website of Partner"
-#~ msgstr "Website of Partner"
-
-#~ msgid "Scrapped"
-#~ msgstr "Scrapped"
-
-#~ msgid "decimal.precision"
-#~ msgstr "decimal.precision"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-
-#~ msgid "Reference Guide"
-#~ msgstr "Reference Guide"
-
-#~ msgid "Chained Locations"
-#~ msgstr "Zincirlenmiş Lokasyon Bilgisi"
-
-#~ msgid "Turkey"
-#~ msgstr "Türkiye"
-
-#~ msgid "Falkland Islands"
-#~ msgstr "Falkland Adaları"
-
-#~ msgid "Scheduled date for the processing of this move"
-#~ msgstr "Scheduled date for the processing of this move"
-
-#~ msgid "Production Lot Numbers"
-#~ msgstr "Production Lot Numbers"
-
-#~ msgid ""
-#~ "Optional help text for the users with a description of the target view, such "
-#~ "as its usage and purpose."
-#~ msgstr ""
-#~ "Optional help text for the users with a description of the target view, such "
-#~ "as its usage and purpose."
-
-#~ msgid "Computational Accuracy"
-#~ msgstr "Hesapsal Doğruluk"
-
-#~ msgid "Report Type"
-#~ msgstr "Report Type"
-
-#~ 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 ""
-#~ "This stock location will be used, instead of the default one, as the source "
-#~ "location for goods you receive from the current partner"
-
-#~ msgid "terp-administration"
-#~ msgstr "terp-administration"
-
-#~ msgid "Lag (Days)"
-#~ msgstr "Lag (Days)"
-
-#~ msgid "Galician / Galego"
-#~ msgstr "Galician / Galego"
-
 #~ msgid "Next"
 #~ msgstr "Next"
 
-#~ msgid "UOM"
-#~ msgstr "UOM"
-
-#~ msgid "4.  %b, %B         ==> Dec, December"
-#~ msgstr "4. %b, %B ==> Ara, Aralık"
-
-#~ msgid "Delivered"
-#~ msgstr "Delivered"
-
-#~ msgid "Load an Official Translation"
-#~ msgstr "Load an Official Translation"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Miscelleanous"
-
-#~ msgid "States Expression"
-#~ msgstr "İstisnai Durumlar"
-
-#~ msgid "Ask New Products"
-#~ msgstr "Ask New Products"
-
-#~ msgid "Ordered Quantities"
-#~ msgstr "Sipariş Alınan Miktara göre"
-
-#~ msgid "Run Procurement"
-#~ msgstr "Run Procurement"
-
-#~ msgid "Report file"
-#~ msgstr "Report file"
-
-#~ msgid "Not enough stock and no minimum orderpoint rule defined."
-#~ msgstr "Not enough stock and no minimum orderpoint rule defined."
-
-#~ msgid "STOCK_SELECT_COLOR"
-#~ msgstr "STOCK_SELECT_COLOR"
-
-#~ msgid "workflow.triggers"
-#~ msgstr "workflow.triggers"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-
-#~ msgid ""
-#~ "Used in the code to select specific prices based on the context. Keep "
-#~ "unchanged."
-#~ msgstr ""
-#~ "Used in the code to select specific prices based on the context. Keep "
-#~ "unchanged."
-
-#~ msgid "Created"
-#~ msgstr "Created"
-
-#~ msgid "Is Object"
-#~ msgstr "Is Object"
-
-#~ msgid "- type,name,res_id,src,value"
-#~ msgstr "- type,name,res_id,src,value"
-
-#~ msgid "STOCK_DND"
-#~ msgstr "STOCK_DN"
-
-#~ msgid "Heard and McDonald Islands"
-#~ msgstr "Heard ve McDonald Adaları"
-
-#~ msgid "View Ref."
-#~ msgstr "Görünüm Referansı"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Helps you handle your quotations, sale orders and invoicing."
-
-#~ msgid "Dutch (Belgium) / Nederlands (Belgïe)"
-#~ msgstr "Dutch (Belgium) / Nederlands (Belgïe)"
-
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
-#~ msgid "Selection"
-#~ msgstr "Seçim"
-
-#~ msgid "Invoice on"
-#~ msgstr "Fatura Şekli"
-
-#~ msgid "Report Header"
-#~ msgstr "Rapor Üst Bilgisi"
-
-#~ msgid "Fixed Location"
-#~ msgstr "Sabit Lokasyon"
-
-#~ msgid "Action Type"
-#~ msgstr "İşlem Türü"
-
-#~ msgid "Procurement Orders"
-#~ msgstr "Procurement Orders"
-
-#~ msgid "Import Translation"
-#~ msgstr "Import Translation"
-
-#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
-#~ msgstr "You cannot cancel a sale order line that has already been invoiced !"
-
-#~ msgid "Type fields"
-#~ msgstr "Tür alanları"
-
-#~ msgid "Binary"
-#~ msgstr "Binary"
-
-#~ msgid "STOCK_FLOPPY"
-#~ msgstr "STOCK_FLOPPY"
-
-#~ msgid "Order"
-#~ msgstr "Order"
-
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Kosta Rika"
-
-#~ msgid "Recipient"
-#~ msgstr "Recipient"
-
-#~ msgid "Your can't submit bug reports due to uncovered modules: %s"
-#~ msgstr ""
-#~ "Teminatsız modüllerden dolayı yazılım hatası raporu gönderemezsiniz: %s"
-
-#~ msgid "Fill Inventory"
-#~ msgstr "Fill Inventory"
-
-#~ msgid "Conditions"
-#~ msgstr "Conditions"
-
-#~ msgid "Other Partners"
-#~ msgstr "Diğer Ortaklar"
-
-#~ msgid "Future P&L"
-#~ msgstr "Future P&L"
-
 #~ msgid "Status"
 #~ msgstr "Status"
 
 #~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
 #~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
 
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid "Public Price"
-#~ msgstr "Public Price"
-
-#~ msgid "Our Salesman"
-#~ msgstr "Bizim Müşteri Temsilcimiz"
-
-#~ msgid "Ending date for this pricelist version to be valid."
-#~ msgstr "Ending date for this pricelist version to be valid."
-
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "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"
-#~ "    "
-
-#~ msgid "Full Name"
-#~ msgstr "Tam Ad"
-
-#~ msgid "Translation"
-#~ msgstr "Translation"
-
-#~ msgid "_Ok"
-#~ msgstr "_Ok"
-
-#~ msgid "Sales Orders Statistics"
-#~ msgstr "Satış Emri İstatistikleri"
-
-#~ msgid "Compute Procurements"
-#~ msgstr "Compute Procurements"
-
-#~ msgid "To invoice"
-#~ msgstr "To invoice"
-
-#~ msgid "Scrap"
-#~ msgstr "Scrap"
-
-#~ msgid "To be upgraded"
-#~ msgstr "To be upgraded"
-
-#~ msgid ""
-#~ "\n"
-#~ "    Purchase module is for generating a purchase order for purchase of goods "
-#~ "from a supplier.\n"
-#~ "    A supplier invoice is created for the particular order placed\n"
-#~ "    Dashboard for purchase management that includes:\n"
-#~ "    * Current Purchase Orders\n"
-#~ "    * Draft Purchase Orders\n"
-#~ "    * Graph for quantity and amount per month    \n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Purchase module is for generating a purchase order for purchase of goods "
-#~ "from a supplier.\n"
-#~ "    A supplier invoice is created for the particular order placed\n"
-#~ "    Dashboard for purchase management that includes:\n"
-#~ "    * Current Purchase Orders\n"
-#~ "    * Draft Purchase Orders\n"
-#~ "    * Graph for quantity and amount per month    \n"
-#~ "\n"
-#~ "    "
-
-#~ msgid "The length of the package"
-#~ msgstr "The length of the package"
-
-#~ msgid "Country Code"
-#~ msgstr "Ülke Kodu"
-
-#~ msgid "Cancel Purchase Order"
-#~ msgstr "Alış Siparişini İptal Et"
-
-#~ msgid "A pick list is generated to track the incoming products."
-#~ msgstr "A pick list is generated to track the incoming products."
-
-#~ msgid "Invalid Error !"
-#~ msgstr "Invalid Error !"
-
-#~ msgid "workflow.instance"
-#~ msgstr "workflow.instance"
-
-#~ msgid "Request for Quotation N°"
-#~ msgstr "Request for Quotation N°"
-
-#~ msgid "10. %S              ==> 20"
-#~ msgstr "10. %S ==> 20"
-
-#~ msgid "Future Receptions"
-#~ msgstr "Future Receptions"
-
-#~ msgid "It indicates that a picking has been done"
-#~ msgstr "It indicates that a picking has been done"
-
-#~ msgid "Madam"
-#~ msgstr "Bayan"
-
-#~ msgid "Sales Management"
-#~ msgstr "Satış Yönetimi"
-
-#~ msgid "Delivery Order Only"
-#~ msgstr "Sadece Teslimat Siparişi"
-
-#~ msgid "Estonia"
-#~ msgstr "Estonya"
-
-#~ msgid "Process Transitions"
-#~ msgstr "Proses Geçişleri"
-
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "The quotation '%s' has been converted to a sale order."
-
-#~ msgid "Products "
-#~ msgstr "Products "
-
 #~ msgid "</drawRightString>"
 #~ msgstr "</drawRightString>"
 
-#~ msgid "Purchases Application Configuration"
-#~ msgstr "Purchases Application Configuration"
-
-#~ msgid "Address of  customer or supplier."
-#~ msgstr "Address of  customer or supplier."
-
-#~ msgid "Track Incoming Lots"
-#~ msgstr "Track Incoming Lots"
-
-#~ msgid "Draft Physical Inventories"
-#~ msgstr "Draft Physical Inventories"
-
-#~ msgid "Product UoS"
-#~ msgstr "Product UoS"
-
-#~ msgid "Access Menu"
-#~ msgstr "Erişim Menüsü"
-
-#~ msgid "You can not create this kind of document! (%s)"
-#~ msgstr "Bu tip bir belge oluşturamazsınız! (%s)"
-
-#~ msgid "Binary File or external URL"
-#~ msgstr "Binary File or external URL"
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Unreconciled Amount"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "STOCK_REFRESH"
-#~ msgstr "STOCK_REFRESH"
-
-#~ msgid "From a sale order"
-#~ msgstr "From a sale order"
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
-#~ msgid "Debits"
-#~ msgstr "Debits"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Low Level Objects"
-#~ msgstr "Low Level Objects"
-
-#~ msgid "Exist Split lines"
-#~ msgstr "Exist Split lines"
-
-#~ msgid "Installed Users"
-#~ msgstr "Installed Users"
-
-#~ msgid ""
-#~ "Technical field used to record the currency chosen by the user during a "
-#~ "picking confirmation (when average price costing method is used)"
-#~ msgstr ""
-#~ "Technical field used to record the currency chosen by the user during a "
-#~ "picking confirmation (when average price costing method is used)"
-
-#~ msgid "Product uom categ"
-#~ msgstr "Ürün Birim Grubu"
-
-#~ msgid "ir.values"
-#~ msgstr "ir.values"
-
-#~ msgid "Request for Quotations"
-#~ msgstr "Request for Quotations"
-
-#~ msgid "STOCK_ZOOM_FIT"
-#~ msgstr "STOCK_ZOOM_FIT"
-
-#~ msgid "Reservation"
-#~ msgstr "Reservation"
-
-#~ msgid "Price Computation"
-#~ msgstr "Fiyat Hesaplaması"
-
-#~ msgid "Date Done"
-#~ msgstr "Tamamlanan Tarih"
-
-#~ msgid ""
-#~ "Maturity date of entry line generated by model line '%s' is based on partner "
-#~ "payment term! \\n                                                    \n"
-#~ "Please define partner on it!\"%(line.name)))\n"
-#~ "        pass\n"
-#~ "\n"
-#~ "    def create_entries(self, cr, uid, ids, context=None):\n"
-#~ "        account_model_obj = self.pool.get('account.model"
-#~ msgstr ""
-#~ "Maturity date of entry line generated by model line '%s' is based on partner "
-#~ "payment term! \\n                                                    \n"
-#~ "Please define partner on it!\"%(line.name)))\n"
-#~ "        pass\n"
-#~ "\n"
-#~ "    def create_entries(self, cr, uid, ids, context=None):\n"
-#~ "        account_model_obj = self.pool.get('account.model"
-
-#~ msgid "Purchase Pricelists"
-#~ msgstr "Alış Fiyat Listeleri"
-
-#~ msgid "Congo, The Democratic Republic of the"
-#~ msgstr "Demokratik Kongo Cumhuriyeti"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Auction Houses"
-
-#~ msgid "Rule Name"
-#~ msgstr "Kural Adı"
-
-#~ msgid "Partial"
-#~ msgstr "Kısmi"
-
-#~ msgid "Can be Purchased"
-#~ msgstr "Satın alınabilir"
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-
-#~ msgid "Pack Search"
-#~ msgstr "Pack Search"
-
-#~ msgid "Search Process"
-#~ msgstr "Search Process"
-
-#~ msgid ""
-#~ "Quantity conversions may happen automatically between Units of Measure in "
-#~ "the same category, according to their respective ratios."
-#~ msgstr ""
-#~ "Quantity conversions may happen automatically between Units of Measure in "
-#~ "the same category, according to their respective ratios."
-
-#~ msgid ""
-#~ "By unchecking the active field, you may hide a location without deleting it."
-#~ msgstr ""
-#~ "By unchecking the active field, you may hide a location without deleting it."
-
-#~ msgid ""
-#~ "This stock location will be used, instead of the default one, as the "
-#~ "destination location for goods you send to this partner"
-#~ msgstr ""
-#~ "This stock location will be used, instead of the default one, as the "
-#~ "destination location for goods you send to this partner"
-
-#~ msgid "Currency for average price"
-#~ msgstr "Currency for average price"
-
-#~ msgid "Number of Calls"
-#~ msgstr "Arama Sayısı"
-
-#~ msgid "Modules to update"
-#~ msgstr "Modules to update"
-
-#~ msgid "Update Date"
-#~ msgstr "Güncelleme Tarihi"
-
-#~ msgid "STOCK_GOTO_BOTTOM"
-#~ msgstr "STOCK_GOTO_BOTTOM"
-
-#~ msgid ""
-#~ "Important when you deal with multiple actions, the execution order will be "
-#~ "decided based on this, low number is higher priority."
-#~ msgstr ""
-#~ "Birden fazla ışlemle ilgilenirken önemlidir; düşük sayı daha öncelikli olmak "
-#~ "üzere işlem sırası buna göre karar verilecektir."
-
-#~ msgid "Add RML header"
-#~ msgstr "RML başlığı ekleyin."
-
-#~ msgid "Greece"
-#~ msgstr "Yunanistan"
-
-#~ msgid "Production Location"
-#~ msgstr "Üretim Lokasyonu"
-
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "The following users have been installed : \n"
-
-#~ msgid "Croatian / hrvatski jezik"
-#~ msgstr "Croatian / hrvatski jezik"
-
-#~ msgid "Latest Inventory Date"
-#~ msgstr "Latest Inventory Date"
-
-#~ msgid "Meta Datas"
-#~ msgstr "Meta Veriler"
-
-#~ msgid "Python code to be executed"
-#~ msgstr "Çalıştırılacak Python kodu"
-
-#~ msgid "Monaco"
-#~ msgstr "Monako"
-
-#~ msgid "Sale OrderLine Make_invoice"
-#~ msgstr "Sale OrderLine Make_invoice"
-
-#~ msgid "Uninstallable"
-#~ msgstr "Kaldırılamaz"
-
-#~ msgid "Partner Category"
-#~ msgstr "Ortak Sınıfı"
-
-#~ msgid "Trigger"
-#~ msgstr "Tetik"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-
-#~ msgid "Update Module"
-#~ msgstr "Update Module"
-
-#~ msgid "Voucher Print"
-#~ msgstr "Voucher Print"
-
-#~ msgid "Translate"
-#~ msgstr "Translate"
-
-#~ msgid "Body"
-#~ msgstr "Gövde"
-
-#~ msgid "Price Name"
-#~ msgstr "Fiyat Adı"
-
-#~ msgid "Send Email"
-#~ msgstr "Send Email"
-
-#~ msgid "Delivery Method"
-#~ msgstr "Teslimat Yöntemi"
-
-#~ msgid "STOCK_SELECT_FONT"
-#~ msgstr "STOCK_SELECT_FONT"
-
-#~ msgid "Contacts"
-#~ msgstr "Kişiler"
-
-#~ msgid "Menu Action"
-#~ msgstr "Menu Action"
-
-#~ msgid "choose"
-#~ msgstr "choose"
-
-#~ msgid "STOCK_DIRECTORY"
-#~ msgstr "STOCK_DIRECTORY"
-
-#~ msgid ""
-#~ "Indicates whether this object model lives in memory only, i.e. is not "
-#~ "persisted (osv.osv_memory)"
-#~ msgstr ""
-#~ "Indicates whether this object model lives in memory only, i.e. is not "
-#~ "persisted (osv.osv_memory)"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Chart of Accounts"
 
 #~ msgid "Partner Ref."
 #~ msgstr "Partner Ref."
 
-#~ msgid "Confirm Inventory"
-#~ msgstr "Envanteri Onayla"
-
-#~ msgid "Cancel Order"
-#~ msgstr "Sipariş İptal"
-
-#~ msgid "Document Ref 2"
-#~ msgstr "Belge Ref 2"
-
-#~ msgid "Document Ref 1"
-#~ msgstr "Belge Ref 1"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid ""
-#~ "There is no stock output account defined for this product or its category: "
-#~ "\"%s\" (id: %d)"
-#~ msgstr ""
-#~ "There is no stock output account defined for this product or its category: "
-#~ "\"%s\" (id: %d)"
-
-#~ msgid " Type of ul: "
-#~ msgstr " Type of ul: "
-
-#~ msgid "ir.model.data"
-#~ msgstr "ir.model.data"
-
-#~ 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 production "
-#~ "orders"
-#~ msgstr ""
-#~ "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"
-
-#~ msgid "Access Rights"
-#~ msgstr "Erişim Hakları"
-
-#~ msgid "Greenland"
-#~ msgstr "Grönland"
-
-#~ msgid "Manually Corrected"
-#~ msgstr "Manually Corrected"
-
-#~ msgid "is in draft state."
-#~ msgstr "is in draft state."
-
-#~ msgid "Cannot delete Purchase Order(s) which are in %s State!"
-#~ msgstr "Cannot delete Purchase Order(s) which are in %s State!"
-
-#~ msgid ""
-#~ "\"email_from\" needs to be set to send welcome mails '\n"
-#~ "                  'to users"
-#~ msgstr ""
-#~ "\"email_from\" needs to be set to send welcome mails '\n"
-#~ "                  'to users"
-
-#~ msgid "Return Picking"
-#~ msgstr "Return Picking"
-
-#~ msgid "New Caledonia (French)"
-#~ msgstr "Yeni Kaledonya"
-
-#~ msgid "Kind of Node"
-#~ msgstr "Kind of Node"
-
 #~ msgid "_Cancel"
 #~ msgstr "_Cancel"
 
-#~ msgid "Payment Information"
-#~ msgstr "Payment Information"
-
-#~ msgid "Category Name"
-#~ msgstr "Sınıf Adı"
-
-#~ msgid "Customer Lead Time"
-#~ msgstr "Müşteri Tedarik Süresi"
-
-#~ msgid ""
-#~ "This wizard helps you add a new language to you OpenERP system. After "
-#~ "loading a new language it becomes available as default interface language "
-#~ "for users and partners."
-#~ msgstr ""
-#~ "This wizard helps you add a new language to you OpenERP system. After "
-#~ "loading a new language it becomes available as default interface language "
-#~ "for users and partners."
-
-#~ msgid "Maintenance"
-#~ msgstr "Maintenance"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Extra Tools"
-
-#~ msgid "Min. Margin"
-#~ msgstr "Min. Margin"
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Sale Make Invoice"
-
-#~ msgid "Ean Check"
-#~ msgstr "Ean Check"
-
-#~ msgid "Based on the shipped or on the ordered quantities."
-#~ msgstr "Based on the shipped or on the ordered quantities."
-
-#~ msgid "terp-report"
-#~ msgstr "terp-report"
-
-#~ msgid "Order Lines"
-#~ msgstr "Sipariş Kalemleri"
-
-#~ msgid "You cannot cancel picking because stock move is in done state !"
-#~ msgstr "You cannot cancel picking because stock move is in done state !"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-
-#~ msgid "License"
-#~ msgstr "Lisans"
-
-#~ msgid "STOCK_SAVE_AS"
-#~ msgstr "STOCK_SAVE_AS"
-
-#~ msgid "UoS Quantity"
-#~ msgstr "UoS Quantity"
-
-#~ msgid "max"
-#~ msgstr "max"
-
-#~ msgid "Rules Test Match"
-#~ msgstr "Rules Test Match"
-
-#~ msgid "sale.installer"
-#~ msgstr "sale.installer"
-
-#~ msgid "Purchase Analytic Plans"
-#~ msgstr "Purchase Analytic Plans"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-
-#~ msgid "Western Sahara"
-#~ msgstr "Batı Sahra"
-
-#~ msgid "workflow"
-#~ msgstr "workflow"
-
-#~ msgid "Gives the sequence order when displaying a list of sale order lines."
-#~ msgstr "Gives the sequence order when displaying a list of sale order lines."
-
-#~ msgid "Indonesia"
-#~ msgstr "Endonezya"
-
-#~ msgid "Fax :"
-#~ msgstr "Fax :"
-
-#~ msgid "Shipped"
-#~ msgstr "Shipped"
-
-#~ msgid ""
-#~ "This wizard will detect new terms to translate in the application, so that "
-#~ "you can then add translations manually or perform a complete export (as a "
-#~ "template for a new language example)."
-#~ msgstr ""
-#~ "This wizard will detect new terms to translate in the application, so that "
-#~ "you can then add translations manually or perform a complete export (as a "
-#~ "template for a new language example)."
-
-#~ msgid "Negotiation by Supplier"
-#~ msgstr "Negotiation by Supplier"
-
-#~ msgid "Manages analytic distribution and purchase orders."
-#~ msgstr "Manages analytic distribution and purchase orders."
-
 #~ msgid "Expense"
 #~ msgstr "Expense"
 
-#~ msgid ""
-#~ "Expression, must be True to match\n"
-#~ "use context.get or user (browse)"
-#~ msgstr ""
-#~ "Expression, must be True to match\n"
-#~ "use context.get or user (browse)"
-
-#~ msgid "Sales Order Layout Improvement"
-#~ msgstr "Sales Order Layout Improvement"
-
-#~ msgid "Sequence Codes"
-#~ msgstr "Sequence Codes"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "French Southern Territories"
-
-#~ msgid "Property"
-#~ msgstr "Özellik"
-
-#~ msgid "STOCK_HELP"
-#~ msgstr "STOCK_HELP"
-
-#~ msgid "Price Rounding"
-#~ msgstr "Price Rounding"
-
-#~ msgid "Stock Statistics"
-#~ msgstr "Stock Statistics"
-
-#~ msgid "Channel Name"
-#~ msgstr "Kanal Adı"
-
-#~ msgid "5.  %y, %Y         ==> 08, 2008"
-#~ msgstr "5. %y, %Y ==> 08, 2008"
-
-#~ msgid "ltd"
-#~ msgstr "ltd"
-
-#~ msgid "Object ID"
-#~ msgstr "Nesne Belirteci"
-
-#~ msgid "Landscape"
-#~ msgstr "Landscape"
-
-#~ msgid "Advance Amount"
-#~ msgstr "Advance Amount"
-
-#~ msgid "Wrong Product UOM !"
-#~ msgstr "Yanlış Ürün Birimi !"
-
-#~ msgid ""
-#~ "Shipping Type of the Picking List that will contain the chained move (leave "
-#~ "empty to automatically detect the type based on the source and destination "
-#~ "locations)."
-#~ msgstr ""
-#~ "Shipping Type of the Picking List that will contain the chained move (leave "
-#~ "empty to automatically detect the type based on the source and destination "
-#~ "locations)."
-
-#~ msgid "My Sales"
-#~ msgstr "Benim Satışlarım"
-
-#~ msgid "STOCK_EXECUTE"
-#~ msgstr "STOCK_EXECUTE"
-
-#~ msgid "Do you really want to create the invoice(s) ?"
-#~ msgstr "Do you really want to create the invoice(s) ?"
-
-#~ msgid "Click on Update below to start the process..."
-#~ msgstr "Click on Update below to start the process..."
-
-#~ msgid "To Be Invoiced"
-#~ msgstr "Faturalanacak"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
-#~ msgid "Back Orders"
-#~ msgstr "Back Orders"
-
-#~ msgid "Iran"
-#~ msgstr "İran"
-
-#~ msgid "Widgets per User"
-#~ msgstr "Widgets per User"
-
-#~ msgid "Cr/Dr"
-#~ msgstr "Cr/Dr"
-
-#~ msgid "Resource Ref."
-#~ msgstr "Kaynak Referansı"
-
-#~ msgid "Virtual Stock"
-#~ msgstr "Sanal Stok"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Quantity by Package"
-#~ msgstr "Paket Miktarı"
-
-#~ msgid "Note Type"
-#~ msgstr "Note Type"
-
-#~ msgid "Inventory Valuation"
-#~ msgstr "Stok Değerlendirmesi"
-
-#~ msgid ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-#~ "& Loss Report"
-#~ msgstr ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-#~ "& Loss Report"
-
-#~ msgid "Exception"
-#~ msgstr "Exception"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Chile"
-#~ msgstr "Şili"
-
-#~ msgid "Product Templates"
-#~ msgstr "Product Templates"
-
-#~ msgid "Export ID"
-#~ msgstr "Dışa Aktarım Belirteci"
-
-#~ msgid "Address Book"
-#~ msgstr "Address Book"
-
-#~ msgid "Picking List & Delivery Order"
-#~ msgstr "Picking List & Delivery Order"
-
-#~ msgid "ir.sequence.type"
-#~ msgstr "ir.sequence.type"
-
-#~ msgid "CSV File"
-#~ msgstr "CSV File"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru Adası"
-
 #~ msgid "Account No."
 #~ msgstr "Account No."
 
-#~ msgid "kg"
-#~ msgstr "kg"
-
-#~ msgid "Stockable Product"
-#~ msgstr "Stoklanabilir Ürün"
-
-#~ msgid "Invoices and outstanding transactions"
-#~ msgstr "Invoices and outstanding transactions"
-
-#~ msgid "STOCK_STRIKETHROUGH"
-#~ msgstr "STOCK_STRIKETHROUGH"
-
-#~ msgid "Dependencies :"
-#~ msgstr "Dependencies :"
-
-#~ msgid "terp-partner"
-#~ msgstr "terp-partner"
-
-#~ msgid "Ending Transitions"
-#~ msgstr "Ending Transitions"
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Sale Order Requisition"
-
-#~ msgid "STOCK_GO_FORWARD"
-#~ msgstr "STOCK_GO_FORWARD"
-
-#~ msgid "Field Label"
-#~ msgstr "Alan Etiketi"
-
-#~ msgid "Complete Delivery"
-#~ msgstr "Tam Teslimat"
-
-#~ msgid "Djibouti"
-#~ msgstr "Cibuti"
-
-#~ msgid "Translation Value"
-#~ msgstr "Çeviri Değeri"
-
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Antigua ve Barbuda"
-
-#~ msgid "Received Qty"
-#~ msgstr "Received Qty"
-
-#~ msgid "Zaire"
-#~ msgstr "Zaire"
-
-#~ msgid "Data"
-#~ msgstr "Veri"
-
-#~ msgid "Resource ID"
-#~ msgstr "Kaynak Belirteci"
-
 #~ msgid "Import Invoices in Statement"
 #~ msgstr "Import Invoices in Statement"
 
-#~ msgid "Pay"
-#~ msgstr "Pay"
-
-#~ msgid "Price List Items"
-#~ msgstr "Fiyat Listesi Kalemleri"
-
-#~ msgid "User Widgets"
-#~ msgstr "User Widgets"
-
-#~ msgid "Stock ups final"
-#~ msgstr "Stock ups final"
-
-#~ msgid "Month-1"
-#~ msgstr "Month-1"
-
-#~ msgid "Reply"
-#~ msgstr "Cevapla"
-
-#~ msgid "Turkish / Türkçe"
-#~ msgstr "Turkish / Türkçe"
-
-#~ msgid "Right Parent"
-#~ msgstr "Right Parent"
-
-#~ msgid "Activities"
-#~ msgstr "Etkinlikler"
-
-#~ msgid "STOCK_JUSTIFY_LEFT"
-#~ msgstr "STOCK_JUSTIFY_LEFT"
-
-#~ msgid "Products & Pricelists"
-#~ msgstr "Ürünler & Fiyat Listeleri"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "Auto-Refresh"
-#~ msgstr "Kendiliğinden-Yenile"
-
-#~ msgid "Credits"
-#~ msgstr "Credits"
-
-#~ msgid "wizard.ir.model.menu.create"
-#~ msgstr "wizard.ir.model.menu.create"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-
-#~ msgid "Liability View"
-#~ msgstr "Liability View"
-
-#~ msgid "Variant Price Margin"
-#~ msgstr "Değişken Fiyat Marjı"
-
-#~ msgid ""
-#~ "Forces to specify a Production Lot for all moves containing this product and "
-#~ "coming from a Supplier Location"
-#~ msgstr ""
-#~ "Forces to specify a Production Lot for all moves containing this product and "
-#~ "coming from a Supplier Location"
-
-#~ msgid "Related Picking"
-#~ msgstr "Related Picking"
-
-#~ msgid "Optional: next stock move when chaining them"
-#~ msgstr "Optional: next stock move when chaining them"
-
-#~ msgid "Second field should be figures"
-#~ msgstr "İkinci alan rakamlardan oluşmalıdır."
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Name it to easily find a record"
-
-#~ msgid "Tracking serial"
-#~ msgstr "Tracking serial"
-
-#~ msgid "Stockable"
-#~ msgstr "Stockable"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
-#~ msgid "_Apply"
-#~ msgstr "_Apply"
-
-#~ msgid "Default Type"
-#~ msgstr "Default Type"
-
-#~ msgid "Entries by Statement from Invoices"
-#~ msgstr "Entries by Statement from Invoices"
-
-#~ 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 ""
-#~ "Inventory Journal in which the chained move will be written, if the Chaining "
-#~ "Type is not Transparent (no journal is used if left empty)"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules are not supported for osv_memory objects !"
-
-#~ msgid "Trigger Date"
-#~ msgstr "Tetiklenme Tarihi"
-
-#~ msgid "Actions"
-#~ msgstr "İşlemler"
-
-#~ msgid "High"
-#~ msgstr "Yüksek"
-
-#~ msgid "Export"
-#~ msgstr "Dışa Aktar"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibya"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Your database is now created."
-
-#~ msgid "Address of partner"
-#~ msgstr "Address of partner"
-
-#~ msgid ""
-#~ "Gives the sequence order when displaying a list of product categories."
-#~ msgstr ""
-#~ "Gives the sequence order when displaying a list of product categories."
-
-#~ msgid "Bank Identifier Code"
-#~ msgstr "Banka Tanımlıyıcı Kod"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Türkmenistan"
-
-#~ msgid "Net weight"
-#~ msgstr "Net ağırlık"
-
-#~ msgid "Record rules"
-#~ msgstr "Record rules"
-
-#~ msgid "Kind Of Node"
-#~ msgstr "Kind Of Node"
-
-#~ msgid "Add or not the coporate RML header"
-#~ msgstr "Şirket RML başlığının eklenip eklenmeyeceği"
-
-#~ msgid "The destination activity."
-#~ msgstr "The destination activity."
-
-#~ msgid ""
-#~ "Gives the sequence order                         when displaying a list of "
-#~ "board lines."
-#~ msgstr ""
-#~ "Gives the sequence order                         when displaying a list of "
-#~ "board lines."
-
-#~ msgid "Change Price"
-#~ msgstr "Change Price"
-
-#~ msgid "Associated field in the product form."
-#~ msgstr "Associated field in the product form."
-
 #~ msgid "Document"
 #~ msgstr "Document"
 
-#~ msgid "Bill Payment"
-#~ msgstr "Bill Payment"
-
-#~ msgid ""
-#~ "Forces to specify a Production Lot for all moves containing this product and "
-#~ "generated by a Manufacturing Order"
-#~ msgstr ""
-#~ "Forces to specify a Production Lot for all moves containing this product and "
-#~ "generated by a Manufacturing Order"
-
-#~ msgid "Unit of Sale"
-#~ msgstr "Satış Birimi"
-
-#~ msgid "No Pricelist !"
-#~ msgstr "No Pricelist !"
-
-#~ msgid "Author"
-#~ msgstr "Author"
-
-#~ msgid "Update"
-#~ msgstr "Update"
-
-#~ msgid "Assign"
-#~ msgstr "Assign"
-
-#~ 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 ""
-#~ "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.."
-
-#~ msgid "Corridor (X)"
-#~ msgstr "Koridor (X)"
-
-#~ msgid "Technical guide"
-#~ msgstr "Teknik klavuz"
-
-#~ msgid "STOCK_CONVERT"
-#~ msgstr "STOCK_CONVERT"
-
-#~ msgid "Tanzania"
-#~ msgstr "Tanzanya"
-
-#~ msgid "Danish / Dansk"
-#~ msgstr "Danish / Dansk"
-
-#~ msgid "Please Insert Dashboard View(s) !"
-#~ msgstr "Please Insert Dashboard View(s) !"
-
-#~ msgid ""
-#~ "When a procurement is created the state is set to 'Draft'.\n"
-#~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
-#~ " \n"
-#~ "After confirming the state is set to 'Running'.\n"
-#~ " If any exception arises in the order then the state is set to 'Exception'.\n"
-#~ " Once the exception is removed the state becomes 'Ready'.\n"
-#~ " It is in 'Waiting'. state when the procurement is waiting for another one "
-#~ "to finish."
-#~ msgstr ""
-#~ "When a procurement is created the state is set to 'Draft'.\n"
-#~ " If the procurement is confirmed, the state is set to 'Confirmed'.           "
-#~ " \n"
-#~ "After confirming the state is set to 'Running'.\n"
-#~ " If any exception arises in the order then the state is set to 'Exception'.\n"
-#~ " Once the exception is removed the state becomes 'Ready'.\n"
-#~ " It is in 'Waiting'. state when the procurement is waiting for another one "
-#~ "to finish."
-
-#~ msgid "Storage Localisation"
-#~ msgstr "Depolama Lokasyonu"
-
-#~ msgid "Consumable"
-#~ msgstr "Sarf Malzemesi"
-
-#~ msgid "Recreate Invoice"
-#~ msgstr "Faturayı Yeniden Oluştur"
-
-#~ msgid "Stock Move"
-#~ msgstr "Stok Hareketi"
-
-#~ msgid "Install Modules"
-#~ msgstr "Install Modules"
-
-#~ msgid "The mode for computing the price for this rule."
-#~ msgstr "The mode for computing the price for this rule."
-
-#~ msgid "Extra Info"
-#~ msgstr "Extra Info"
-
-#~ msgid "Client Events"
-#~ msgstr "Client Events"
-
-#~ msgid ""
-#~ "You have to define \\nthe bank account\n"
-#~ "in the journal definition for reconciliation."
-#~ msgstr ""
-#~ "You have to define \\nthe bank account\n"
-#~ "in the journal definition for reconciliation."
-
-#~ msgid ""
-#~ "If real-time valuation is enabled for a product, the system will "
-#~ "automatically write journal entries corresponding to stock moves.The "
-#~ "inventory variation account set on the product category will represent the "
-#~ "current inventory value, and the stock input and stock output account will "
-#~ "hold the counterpart moves for incoming and outgoing products."
-#~ msgstr ""
-#~ "If real-time valuation is enabled for a product, the system will "
-#~ "automatically write journal entries corresponding to stock moves.The "
-#~ "inventory variation account set on the product category will represent the "
-#~ "current inventory value, and the stock input and stock output account will "
-#~ "hold the counterpart moves for incoming and outgoing products."
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "You can not have two users with the same login !"
-
-#~ msgid ""
-#~ "Please keep in mind that data currently displayed may not be relevant after "
-#~ "switching to another company. If you have unsaved changes, please make sure "
-#~ "to save and close the forms before switching to a different company (you can "
-#~ "click on Cancel now)"
-#~ msgstr ""
-#~ "Please keep in mind that data currently displayed may not be relevant after "
-#~ "switching to another company. If you have unsaved changes, please make sure "
-#~ "to save and close the forms before switching to a different company (you can "
-#~ "click on Cancel now)"
-
-#~ msgid "The currency the field is expressed in."
-#~ msgstr "The currency the field is expressed in."
-
-#~ msgid "Specifies the amount of quantity to count."
-#~ msgstr "Specifies the amount of quantity to count."
-
-#~ msgid "km"
-#~ msgstr "km"
-
-#~ msgid "Send"
-#~ msgstr "Gönder"
-
-#~ msgid "Menu Tips"
-#~ msgstr "Menu Tips"
-
-#~ msgid "Source"
-#~ msgstr "Kaynak"
-
-#~ msgid "Keep empty for a private address, not related to partner."
-#~ msgstr ""
-#~ "Herhangi bir ortakla bağlantısı olmayan özel adresler için boş bırakınız."
-
-#~ msgid "Vanuatu"
-#~ msgstr "Yeni Hebridler"
-
-#~ msgid "Internal Header/Footer"
-#~ msgstr "Dahili Üstbilgi/Altbilgi"
-
-#~ msgid "Sale Pricelist"
-#~ msgstr "Satış Fiyat Listesi"
-
-#~ msgid "Stock ups"
-#~ msgstr "Stock ups"
-
-#~ msgid "Cancel Inventory"
-#~ msgstr "Envanter İptali"
-
-#~ msgid "Compute Procurement"
-#~ msgstr "Compute Procurement"
-
-#~ msgid "Uninstall (beta)"
-#~ msgstr "Kaldır (beta)"
-
-#~ msgid "Start configuration"
-#~ msgstr "Start configuration"
-
-#~ msgid "Minimal Quantity"
-#~ msgstr "Minimal Quantity"
-
-#~ msgid "_Export"
-#~ msgstr "_Export"
-
-#~ msgid "state"
-#~ msgstr "state"
-
-#~ msgid ""
-#~ "Put an address if you want to deliver directly from the supplier to the "
-#~ "customer.In this case, it will remove the warehouse link and set the "
-#~ "customer location."
-#~ msgstr ""
-#~ "Put an address if you want to deliver directly from the supplier to the "
-#~ "customer.In this case, it will remove the warehouse link and set the "
-#~ "customer location."
-
-#~ msgid ""
-#~ "This supplier's product code will be used when printing a request for "
-#~ "quotation. Keep empty to use the internal one."
-#~ msgstr ""
-#~ "This supplier's product code will be used when printing a request for "
-#~ "quotation. Keep empty to use the internal one."
-
-#~ msgid "Catalan / Català"
-#~ msgstr "Catalan / Català"
-
-#~ msgid "Split Move"
-#~ msgstr "Split Move"
-
-#~ msgid "Outgoing Products"
-#~ msgstr "Gönderilecek Ürünler"
-
-#~ msgid "STOCK_COLOR_PICKER"
-#~ msgstr "STOCK_COLOR_PICKER"
-
-#~ msgid "Normal Taxes"
-#~ msgstr "Normal Taxes"
-
-#~ msgid "Ghana"
-#~ msgstr "Gana"
-
-#~ msgid "Direction"
-#~ msgstr "Yön"
-
-#~ msgid "Could you check your contract information ?"
-#~ msgstr "Sözleşme bilgilerini kontrol eder misiniz?"
-
-#~ msgid "STOCK_CLEAR"
-#~ msgstr "STOCK_CLEAR"
-
-#~ msgid "Force Availability"
-#~ msgstr "Kullanılabilir Yap"
-
-#~ msgid ""
-#~ "Check this box if the partner is a supplier. If it's not checked, purchase "
-#~ "people will not see it when encoding a purchase order."
-#~ msgstr ""
-#~ "Ortak tedarikçi ise bu kutuyu seçiniz. Aksi taktirde satınalma personeli "
-#~ "alım emri girerken bu ortağı görmeyecektir."
-
-#~ msgid "Relation Field"
-#~ msgstr "İlişki Alanı"
-
-#~ msgid "Expense Lines"
-#~ msgstr "Expense Lines"
-
-#~ msgid "Created Date"
-#~ msgstr "Created Date"
-
-#~ msgid "Expense View"
-#~ msgstr "Expense View"
-
-#~ msgid "Automatic Order Point"
-#~ msgstr "Automatic Order Point"
-
-#~ msgid "Internal Picking list"
-#~ msgstr "Internal Picking list"
-
-#~ msgid "Destination Instance"
-#~ msgstr "Varış Yeri Oluşumu"
-
-#~ msgid "Voucher Lines"
-#~ msgstr "Fiş Kalemleri"
-
-#~ msgid "https://translations.launchpad.net/openobject"
-#~ msgstr "https://translations.launchpad.net/openobject"
-
-#~ msgid "This is the leads/security time for each purchase order."
-#~ msgstr "This is the leads/security time for each purchase order."
-
-#~ msgid "https://help.launchpad.net/Translations"
-#~ msgstr "https://help.launchpad.net/Translations"
-
-#~ msgid "Confirm Purchase Order"
-#~ msgstr "Alış Siparişini Onayla"
-
-#~ msgid "Base module for all dashboards."
-#~ msgstr "Tüm Kontrol Panelleri için Temel Modül"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-
-#~ msgid "XML path"
-#~ msgstr "XML dizin yolu"
-
-#~ msgid "Unit Of Measure"
-#~ msgstr "Unit Of Measure"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#~ msgid "State of the Purchase Order."
-#~ msgstr "State of the Purchase Order."
-
-#~ msgid "cm"
-#~ msgstr "cm"
-
-#~ msgid "On Skip"
-#~ msgstr "On Skip"
-
-#~ msgid "Guinea"
-#~ msgstr "Gine"
-
-#~ msgid "Shipping Exception"
-#~ msgstr "İstisnai Sevkiyat"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Lüksemburg"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! You can not create recursive Menu."
-
-#~ msgid "Production Lot Number"
-#~ msgstr "Production Lot Number"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid ""
-#~ "3. If user belongs to several groups, the results from step 2 are combined "
-#~ "with logical OR operator"
-#~ msgstr ""
-#~ "3. If user belongs to several groups, the results from step 2 are combined "
-#~ "with logical OR operator"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the analytic "
-#~ "journal without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the analytic "
-#~ "journal without removing it."
-
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
-
-#~ msgid "Drives procurement and invoicing"
-#~ msgstr "Drives procurement and invoicing"
-
-#~ msgid "STOCK_SPELL_CHECK"
-#~ msgstr "STOCK_SPELL_CHECK"
-
-#~ msgid "View Mode"
-#~ msgstr "Görüntüleme Kipi"
-
-#~ msgid "Sales Analysis"
-#~ msgstr "Satış Analizi"
-
-#~ msgid "Manual Invoices"
-#~ msgstr "Manual Invoices"
-
-#~ msgid "Thailand"
-#~ msgstr "Tayland"
-
-#~ msgid "Delays"
-#~ msgstr "Gecikmeler"
-
-#~ msgid "Scheduled date"
-#~ msgstr "Scheduled date"
-
-#~ msgid "TVA:"
-#~ msgstr "TVA:"
-
-#~ msgid "Board Line"
-#~ msgstr "Board Line"
-
-#~ msgid "Related Invoices"
-#~ msgstr "Related Invoices"
-
-#~ msgid ""
-#~ "How many times this UoM is smaller than the reference UoM in this category:\n"
-#~ "1 * (reference unit) = ratio * (this unit)"
-#~ msgstr ""
-#~ "How many times this UoM is smaller than the reference UoM in this category:\n"
-#~ "1 * (reference unit) = ratio * (this unit)"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Internal picking"
-#~ msgstr "Internal picking"
-
-#~ msgid "And"
-#~ msgstr "And"
-
-#~ msgid ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "                move_product_qty[move.id] = product_qty\n"
-#~ "                product_uom = partial_data.get('product_uom',False)\n"
-#~ "                product_price = partial_data.get('product_price',0.0)\n"
-#~ "                product_currency = "
-#~ "partial_data.get('product_currency',False)\n"
-#~ "                prodlot_id = partial_data.get('prodlot_id"
-#~ msgstr ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "                move_product_qty[move.id] = product_qty\n"
-#~ "                product_uom = partial_data.get('product_uom',False)\n"
-#~ "                product_price = partial_data.get('product_price',0.0)\n"
-#~ "                product_currency = "
-#~ "partial_data.get('product_currency',False)\n"
-#~ "                prodlot_id = partial_data.get('prodlot_id"
-
-#~ msgid "Object Relation"
-#~ msgstr "Nesne İlişkisi"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Özbekistan"
-
-#~ msgid ""
-#~ "Select the action that will be executed. Loop action will not be avaliable "
-#~ "inside loop."
-#~ msgstr ""
-#~ "Çalıştırılacak işlemi seçiniz. Döngü işlemi döngünün içinde kullanılamaz."
-
-#~ msgid "ir.actions.act_window"
-#~ msgstr "ir.actions.act_window"
-
-#~ msgid "Apply For Create"
-#~ msgstr "Apply For Create"
-
-#~ msgid "Voucher Items"
-#~ msgstr "Voucher Items"
-
-#~ msgid "Incoming products to control"
-#~ msgstr "Incoming products to control"
-
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Could not cancel sale order line!"
-
-#~ msgid "Taiwan"
-#~ msgstr "Tayvan"
-
-#~ msgid "Price List"
-#~ msgstr "Price List"
-
-#~ msgid "Reordering Mode"
-#~ msgstr "Reordering Mode"
-
-#~ msgid "Picking Information !"
-#~ msgstr "Picking Information !"
-
-#~ msgid "Not urgent"
-#~ msgstr "Not urgent"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-
-#~ msgid "Received"
-#~ msgstr "Alınan"
-
-#~ msgid "Date Req."
-#~ msgstr "Date Req."
-
-#~ msgid "Warehouses"
-#~ msgstr "Depolar"
-
-#~ msgid "Related Menu"
-#~ msgstr "Bağlı Menü"
-
-#~ msgid ""
-#~ "It specifies attributes of packaging like type, quantity of packaging,etc."
-#~ msgstr ""
-#~ "It specifies attributes of packaging like type, quantity of packaging,etc."
-
-#~ msgid "STOCK_GO_UP"
-#~ msgstr "STOCK_GO_UP"
-
-#~ msgid "Child Field"
-#~ msgstr "Alt Alan"
-
-#~ msgid "Chaining Type"
-#~ msgstr "Chaining Type"
-
-#~ msgid ""
-#~ "This wizard will scan all module repositories on the server side to detect "
-#~ "newly added modules as well as any change to existing modules."
-#~ msgstr ""
-#~ "This wizard will scan all module repositories on the server side to detect "
-#~ "newly added modules as well as any change to existing modules."
-
-#~ msgid "Destination Journal"
-#~ msgstr "Destination Journal"
-
-#~ msgid "Somalia"
-#~ msgstr "Somali"
-
-#~ 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' to be used at the time of stock input/output. Select "
-#~ "'Situation' to be used at the time of making vouchers."
-#~ msgstr ""
-#~ "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' to be used at the time of stock input/output. Select "
-#~ "'Situation' to be used at the time of making vouchers."
-
-#~ msgid "Group by..."
-#~ msgstr "Group by..."
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Date on which sale order is confirmed"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-
-#~ msgid "View :"
-#~ msgstr "View :"
-
-#~ msgid "Request for Quotation"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid "Lot weight"
-#~ msgstr "Lot weight"
-
-#~ msgid "Consume Products"
-#~ msgstr "Consume Products"
-
-#~ msgid "You cannot remove the field '%s' !"
-#~ msgstr "You cannot remove the field '%s' !"
-
-#~ msgid "Write Object"
-#~ msgstr "Nesne Yaz"
-
-#~ msgid "Recreate Procurement"
-#~ msgstr "Yeniden Satınalma Oluştur"
-
-#~ msgid "Gujarati / India"
-#~ msgstr "Gujarati / India"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Location Output"
-#~ msgstr "Lokasyon Çıkışı"
-
-#~ msgid "Date Ordered"
-#~ msgstr "Date Ordered"
-
-#~ msgid "Products by Location"
-#~ msgstr "Products by Location"
-
-#~ msgid "Contract ID"
-#~ msgstr "Sözleşme No"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Company Configuration"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Rusya Federasyonu"
-
-#~ msgid "Very Urgent"
-#~ msgstr "Very Urgent"
-
-#~ msgid ""
-#~ "\n"
-#~ "     This module shows the basic processes involved\n"
-#~ "     in the selected modules and in the sequence they\n"
-#~ "     occur\n"
-#~ "\n"
-#~ "     Note: This applies to the modules containing modulename_process_xml\n"
-#~ "     for e.g product/process/product_process_xml\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "     This module shows the basic processes involved\n"
-#~ "     in the selected modules and in the sequence they\n"
-#~ "     occur\n"
-#~ "\n"
-#~ "     Note: This applies to the modules containing modulename_process_xml\n"
-#~ "     for e.g product/process/product_process_xml\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid "Search Widget"
-#~ msgstr "Search Widget"
-
-#~ msgid "Persian / فارس"
-#~ msgstr "Persian / فارس"
-
-#~ msgid "Inventories"
-#~ msgstr "Envanterler"
-
-#~ msgid "View Ordering"
-#~ msgstr "View Ordering"
-
-#~ msgid "Products: "
-#~ msgstr "Ürünler: "
-
-#~ msgid "Todo"
-#~ msgstr "Todo"
-
-#~ msgid "API ID"
-#~ msgstr "API ID"
-
-#~ msgid "Product Description"
-#~ msgstr "Ürün Açıklaması"
-
-#~ msgid "Payment Options"
-#~ msgstr "Payment Options"
-
-#~ msgid "Rounding Method"
-#~ msgstr "Rounding Method"
-
-#~ msgid "Please select multiple order to merge in the list view."
-#~ msgstr "Please select multiple order to merge in the list view."
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
 
 #, python-format
 #~ msgid "Can not pay draft/proforma/cancel invoice."
 #~ msgstr "Can not pay draft/proforma/cancel invoice."
 
-#~ msgid " ) + "
-#~ msgstr " ) + "
-
-#~ msgid "Next Wizard"
-#~ msgstr "Next Wizard"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-
-#~ msgid "Physical Inventories"
-#~ msgstr "Physical Inventories"
-
-#~ msgid "All at once"
-#~ msgstr "Tümünü birden"
-
-#~ msgid "Sale Order"
-#~ msgstr "Satış Siparişi"
-
-#~ msgid "Filename"
-#~ msgstr "Filename"
-
-#~ msgid "Access"
-#~ msgstr "Erişim"
-
-#~ msgid "Slovak Republic"
-#~ msgstr "Slovak Cumhuriyeti"
-
-#~ msgid "Future Productions"
-#~ msgstr "Future Productions"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
-#~ msgstr ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
-
-#~ msgid "Portugese / português"
-#~ msgstr "Portugese / português"
-
-#~ msgid "Argentina"
-#~ msgstr "Arjantin"
-
-#~ msgid "Group Name"
-#~ msgstr "Grup Adı"
-
-#~ msgid "Yugoslavia"
-#~ msgstr "Yugoslavya"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahreyn"
-
-#~ msgid "Import Entries"
-#~ msgstr "Import Entries"
-
-#~ msgid "Fax"
-#~ msgstr "Faks"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "Email & Signature"
-#~ msgstr "Email & Signature"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Advanced Reporting"
-
-#~ msgid "Reason"
-#~ msgstr "Reason"
-
-#~ msgid "Partner section of the product form"
-#~ msgstr "Partner section of the product form"
-
-#~ msgid "Approve Purchase"
-#~ msgstr "Alış Onayla"
-
-#~ msgid "Add Maintenance Contract"
-#~ msgstr "Bakım Sözleşmesi Ekle"
-
-#~ msgid ""
-#~ "Default Unit of Measure used for purchase orders. It must be in the same "
-#~ "category than the default unit of measure."
-#~ msgstr ""
-#~ "Default Unit of Measure used for purchase orders. It must be in the same "
-#~ "category than the default unit of measure."
-
-#~ msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
-#~ msgstr "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Suudi Arabistan"
-
-#~ msgid "Limit"
-#~ msgstr "Sınır"
-
-#~ msgid "Workflow to be executed on this model."
-#~ msgstr "Bu model üzerinde çalışacak İş Akışı"
-
-#~ msgid "Workflow On"
-#~ msgstr "İş Akışı Açık"
-
-#~ msgid "Saint Vincent & Grenadines"
-#~ msgstr "Saint Vincent ve Grenadinler"
-
-#~ msgid "Active ID is not set in Context"
-#~ msgstr "Active ID is not set in Context"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamaika"
-
-#~ msgid "Corp."
-#~ msgstr "Corp."
-
-#~ msgid "Dest. Address Contact Name"
-#~ msgstr "Dest. Address Contact Name"
-
-#~ msgid " Please note that"
-#~ msgstr " Please note that"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbaycan"
-
-#~ msgid "Tel.:"
-#~ msgstr "Tel.:"
-
 #~ msgid "Skip"
 #~ msgstr "Skip"
 
-#~ msgid "Module"
-#~ msgstr "Modül"
-
-#~ msgid "Arabic / الْعَرَبيّة"
-#~ msgstr "Arabic / الْعَرَبيّة"
-
-#~ msgid "Korean / Korea, Republic of"
-#~ msgstr "Korean / Korea, Republic of"
-
 #~ msgid "account.analytic.journal"
 #~ msgstr "account.analytic.journal"
 
-#~ msgid "Purchase Order Line"
-#~ msgstr "Purchase Order Line"
-
-#~ msgid "Virgin Islands (British)"
-#~ msgstr "Virgin Adaları (İngiliz)"
-
-#~ msgid "Parameters"
-#~ msgstr "Parameters"
-
-#~ msgid "Saint Pierre and Miquelon"
-#~ msgstr "Sen Piyer ve Miquelon"
-
-#~ msgid "Check Availability"
-#~ msgstr "Kullanılırlığını Kontrol Et"
-
-#~ msgid "Czech / Čeština"
-#~ msgstr "Czech / Čeština"
-
-#~ msgid "ir.wizard.screen"
-#~ msgstr "ir.wizard.screen"
-
-#~ msgid "Rwanda"
-#~ msgstr "Ruanda"
-
-#~ msgid "To be refunded/invoiced"
-#~ msgstr "To be refunded/invoiced"
-
 #~ msgid "Validate Account Entries"
 #~ msgstr "Validate Account Entries"
 
-#~ msgid ""
-#~ "Allows you to group and invoice your delivery orders according to different "
-#~ "invoicing types: daily, weekly, etc."
-#~ msgstr ""
-#~ "Allows you to group and invoice your delivery orders according to different "
-#~ "invoicing types: daily, weekly, etc."
-
-#~ msgid "Day of the week (0:Monday): %(weekday)s"
-#~ msgstr "Haftanın günü (0:Pazartesi: %(weekday)"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cook Adaları"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-
-#~ msgid ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-
-#~ msgid "Klingon"
-#~ msgstr "Klingon"
-
-#~ msgid "Vendor"
-#~ msgstr "Vendor"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Current Window"
-#~ msgstr "Geçerli Pencere"
-
-#~ msgid "Action Source"
-#~ msgstr "İşlem Kaynağı"
-
-#~ msgid "Create invoice"
-#~ msgstr "Fatura Oluştur"
-
-#~ msgid "%w - Weekday as a decimal number [0(Sunday),6]."
-#~ msgstr "%w - Ondalık bir sayı olarak haftanın günü [0(Pazar),6]."
-
-#~ msgid "Location Overview"
-#~ msgstr "Location Overview"
-
-#~ msgid "Fields"
-#~ msgstr "Alanlar"
-
-#~ msgid "General Informations"
-#~ msgstr "Genel Bilgiler"
-
-#~ msgid "Telugu / India"
-#~ msgstr "Telugu / India"
-
-#~ msgid "Other Pricelist"
-#~ msgstr "Other Pricelist"
-
-#~ msgid "Complete Name"
-#~ msgstr "Tam Adı"
-
-#~ msgid "Stock Location"
-#~ msgstr "Stock Location"
-
-#~ msgid "Product UoM"
-#~ msgstr "Product UoM"
-
-#~ msgid ""
-#~ "If cost price is increased, stock variation account will be debited and "
-#~ "stock output account will be credited with the value = (difference of amount "
-#~ "* quantity available).\n"
-#~ "If cost price is decreased, stock variation account will be creadited and "
-#~ "stock input account will be debited."
-#~ msgstr ""
-#~ "If cost price is increased, stock variation account will be debited and "
-#~ "stock output account will be credited with the value = (difference of amount "
-#~ "* quantity available).\n"
-#~ "If cost price is decreased, stock variation account will be creadited and "
-#~ "stock input account will be debited."
-
-#~ msgid "The database object this attachment will be attached to"
-#~ msgstr "The database object this attachment will be attached to"
-
-#~ msgid "Chaining Journal"
-#~ msgstr "Chaining Journal"
-
-#~ msgid ""
-#~ "If set to true, the wizard will not be displayed on the right toolbar of a "
-#~ "form view."
-#~ msgstr ""
-#~ "Doğru olarak seçilirse sihirbaz form görünümünün sağ araç çubuğunda "
-#~ "görüntülenmeyecektir."
-
-#~ msgid ""
-#~ "1. Global rules are combined together with a logical AND operator, and with "
-#~ "the result of the following steps"
-#~ msgstr ""
-#~ "1. Global rules are combined together with a logical AND operator, and with "
-#~ "the result of the following steps"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-
-#~ msgid "Additional info"
-#~ msgstr "Additional info"
-
-#~ msgid ""
-#~ "You have to select a pricelist or a supplier in the purchase form !\n"
-#~ "Please set one before choosing a product."
-#~ msgstr ""
-#~ "You have to select a pricelist or a supplier in the purchase form !\n"
-#~ "Please set one before choosing a product."
-
-#~ msgid "Select Groups"
-#~ msgstr "Grupları Seç"
-
-#~ msgid "Weight"
-#~ msgstr "Ağırlık"
-
-#~ msgid "Automatic Move"
-#~ msgstr "Otomatik Hareket"
-
-#~ msgid "%X - Appropriate time representation."
-#~ msgstr "%X - Geçerli zaman sunumu."
-
-#~ msgid "Event"
-#~ msgstr "Event"
-
-#~ msgid ""
-#~ "The Separator Format should be like [,n] where 0 < n :starting from Unit "
-#~ "digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-#~ "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-#~ "106,500. Provided ',' as the thousand separator in each case."
-#~ msgstr ""
-#~ "(Ayraç düzeni yardım metni. İngilizcesi çok karışık olduğundan çevrilmedi)"
-
-#~ msgid "Source Location"
-#~ msgstr "Source Location"
-
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
-
-#~ msgid "Descriptions"
-#~ msgstr "Açıklamalar"
-
-#~ msgid "List of ordered products."
-#~ msgstr "List of ordered products."
-
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this purchase"
-#~ msgstr ""
-#~ "This is the list of picking list that have been generated for this purchase"
-
-#~ msgid "Japan"
-#~ msgstr "Japonya"
-
-#~ msgid "Subject"
-#~ msgstr "Konu"
-
-#~ msgid "Report/Template"
-#~ msgstr "Report/Template"
-
-#~ msgid "Back Order"
-#~ msgstr "Back Order"
-
-#~ msgid "Total Untaxed amount"
-#~ msgstr "Total Untaxed amount"
-
-#~ msgid "Graph"
-#~ msgstr "Grafik"
-
-#~ msgid "ir.actions.server"
-#~ msgstr "ir.actions.server"
-
-#~ msgid "Move History (child moves)"
-#~ msgstr "Move History (child moves)"
-
-#~ msgid "Max. Expected Date"
-#~ msgstr "Max. Expected Date"
-
-#~ msgid "Auto-Picking"
-#~ msgstr "Auto-Picking"
-
-#~ msgid "Internal"
-#~ msgstr "Internal"
-
-#~ msgid "Starting Flow"
-#~ msgstr "Starting Flow"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "Select Period(s)"
-
-#~ msgid "Confirmed purchase order to invoice"
-#~ msgstr "Confirmed purchase order to invoice"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferences"
-
-#~ msgid "Procurement Details"
-#~ msgstr "Procurement Details"
-
-#~ msgid "Configuration Wizards"
-#~ msgstr "Configuration Wizards"
-
-#~ msgid "Ordered Date"
-#~ msgstr "Ordered Date"
-
-#~ msgid "Locale Code"
-#~ msgstr "Yerel Mahal Kodu"
-
-#~ msgid "Split Mode"
-#~ msgstr "Bölük Kip"
-
-#~ msgid "Note that this operation might take a few minutes."
-#~ msgstr "Note that this operation might take a few minutes."
-
-#~ msgid "Sales Orders"
-#~ msgstr "Satış Siparişleri"
-
-#~ msgid "Localisation"
-#~ msgstr "Yerelleştirme"
-
-#~ msgid ""
-#~ "This supplier's product name will be used when printing a request for "
-#~ "quotation. Keep empty to use the internal one."
-#~ msgstr ""
-#~ "This supplier's product name will be used when printing a request for "
-#~ "quotation. Keep empty to use the internal one."
-
-#~ msgid "Shelves (Y)"
-#~ msgstr "Raflar (Y)"
-
-#~ msgid "Action to Launch"
-#~ msgstr "Başlatılacak İşlem"
-
-#~ msgid "Compute Tax"
-#~ msgstr "Compute Tax"
-
-#~ msgid "STOCK_REVERT_TO_SAVED"
-#~ msgstr "STOCK_REVERT_TO_SAVED"
-
-#~ msgid "Execution"
-#~ msgstr "Execution"
-
-#~ msgid "Unplanned Qty"
-#~ msgstr "Unplanned Qty"
-
-#~ msgid "Condition"
-#~ msgstr "Koşul"
-
-#~ msgid "This field is not used, it only helps you to select a good model."
-#~ msgstr ""
-#~ "Bu alan kullanılmamaktadır. Sadece düzgün bir model seçmenize yardımcı olur."
-
-#~ msgid "View Name"
-#~ msgstr "Görünüm Adı"
-
-#~ msgid "Our Order Reference"
-#~ msgstr "Our Order Reference"
-
-#~ msgid "Previous Payments ?"
-#~ msgstr "Previous Payments ?"
-
-#~ msgid "Save As Attachment Prefix"
-#~ msgstr "Ek Ön Adı Olarak Kaydet"
-
-#~ msgid ""
-#~ "Only one client action will be executed, last client action will be "
-#~ "considered in case of multiple client actions."
-#~ msgstr ""
-#~ "Only one client action will be executed, last client action will be "
-#~ "considered in case of multiple client actions."
-
-#~ msgid "Min. Price Margin"
-#~ msgstr "Min. Price Margin"
-
-#~ msgid "Sales Order in Progress"
-#~ msgstr "İşlemdeki Satış Siparişleri"
-
-#~ msgid "Gross weight"
-#~ msgstr "Bürüt ağırlık"
-
-#~ msgid "Croatia"
-#~ msgstr "Hırvatistan"
-
-#~ msgid "Mobile No"
-#~ msgstr "Cep Telefonu"
-
-#~ msgid "Partner Categories"
-#~ msgstr "Ortak Sınıfları"
-
-#~ msgid "Transaction reference number."
-#~ msgstr "Transaction reference number."
-
-#~ msgid "Prefix value of the record for the sequence"
-#~ msgstr "Prefix value of the record for the sequence"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seyşeller"
-
-#~ msgid "Keep in one lot"
-#~ msgstr "Keep in one lot"
-
-#~ msgid "Date Order"
-#~ msgstr "Date Order"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "from stock"
-#~ msgstr "from stock"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
-
-#~ msgid "terp-product"
-#~ msgstr "terp-product"
-
-#~ msgid "Pricelist item"
-#~ msgstr "Fiyat Listesi Ögesi"
-
-#~ msgid ""
-#~ "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
-#~ "get the required padding size."
-#~ msgstr ""
-#~ "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
-#~ "get the required padding size."
-
-#~ msgid "Turks and Caicos Islands"
-#~ msgstr "Türk ve Caicos Adaları"
-
-#~ msgid "Total Orders by User per month"
-#~ msgstr "Total Orders by User per month"
-
-#~ msgid "Account Owner"
-#~ msgstr "Hesap Sahibi"
-
-#~ msgid "Accounting Voucher Entries"
-#~ msgstr "Muhasebe Fiş Kayıtları"
-
-#~ msgid "Inventory Analysis"
-#~ msgstr "Inventory Analysis"
-
-#~ msgid "Expected"
-#~ msgstr "Expected"
-
-#~ msgid "Low Level"
-#~ msgstr "Low Level"
-
-#~ msgid "Resource Object"
-#~ msgstr "Kayna Nesne"
-
-#~ msgid "Contains"
-#~ msgstr "İçerir"
-
-#~ msgid "The next number of the sequence will be incremented by this number"
-#~ msgstr "The next number of the sequence will be incremented by this number"
-
-#~ msgid ""
-#~ "Before splitting the production lots,make sure this move has a Picking "
-#~ "attached !\n"
-#~ "You must save the move before performing this operation."
-#~ msgstr ""
-#~ "Before splitting the production lots,make sure this move has a Picking "
-#~ "attached !\n"
-#~ "You must save the move before performing this operation."
-
-#~ msgid "Function"
-#~ msgstr "Görev"
-
-#~ msgid "Temporary"
-#~ msgstr "Temporary"
-
-#~ msgid ""
-#~ "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
-#~ "views"
-#~ msgstr ""
-#~ "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
-#~ "views"
-
-#~ msgid "Never"
-#~ msgstr "Never"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Internal Notes"
-
-#~ msgid "Delivery"
-#~ msgstr "Teslimat"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Receptions Analysis"
-#~ msgstr "Receptions Analysis"
-
-#~ msgid ""
-#~ "Name of the method to be called on the object when this scheduler is "
-#~ "executed."
-#~ msgstr ""
-#~ "Name of the method to be called on the object when this scheduler is "
-#~ "executed."
-
-#~ msgid "Produced Qty"
-#~ msgstr "Produced Qty"
-
-#~ msgid "Chained Location Type"
-#~ msgstr "Zincirlenmiş Lokasyon Tipi"
-
-#~ msgid "Production"
-#~ msgstr "Production"
-
-#~ msgid "Procurement Order"
-#~ msgstr "Procurement Order"
-
-#~ msgid ""
-#~ "Comma-separated list of allowed view modes, such as 'form', 'tree', "
-#~ "'calendar', etc. (Default: tree,form)"
-#~ msgstr ""
-#~ "Comma-separated list of allowed view modes, such as 'form', 'tree', "
-#~ "'calendar', etc. (Default: tree,form)"
-
-#~ msgid "Workflow Instances"
-#~ msgstr "İş Akışı Oluşumları"
-
-#~ msgid "Partners: "
-#~ msgstr "Ortaklar: "
-
-#~ msgid "North Korea"
-#~ msgstr "Kuzey Kore"
-
-#~ msgid "Create Object"
-#~ msgstr "Nesne Oluştur"
-
-#~ msgid "Context"
-#~ msgstr "Context"
-
-#~ msgid "BIC/Swift code"
-#~ msgstr "BIC/Swift Kodu"
-
 #~ msgid "Page"
 #~ msgstr "Page"
-
-#~ msgid "Search Sales Order"
-#~ msgstr "Satış Emirlerini Ara"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Polish / Język polski"
-#~ msgstr "Polish / Język polski"
-
-#~ msgid "Next Number"
-#~ msgstr "Sonraki Sayı"
-
-#~ msgid "Empty Package Weight"
-#~ msgstr "Empty Package Weight"
-
-#~ msgid "11. %U or %W       ==> 48 (49th week)"
-#~ msgstr "11. %U or %W ==> 48 (49. hafta)"
-
-#~ msgid ""
-#~ "Used to select automatically the right address according to the context in "
-#~ "sales and purchases documents."
-#~ msgstr ""
-#~ "Satış ve Satınalma belgeleri bağlamında doğru adresi kendiliğinden seçmek "
-#~ "için kullanılır."
-
-#~ msgid "Suffix value of the record for the sequence"
-#~ msgstr "Suffix value of the record for the sequence"
-
-#~ msgid ""
-#~ "Provides some features to improve the layout of the Sales Order reports."
-#~ msgstr ""
-#~ "Provides some features to improve the layout of the Sales Order reports."
-
-#~ msgid "Quotation N°"
-#~ msgstr "Quotation N°"
-
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "Picked"
-#~ msgstr "Toplanma"
-
-#~ msgid "Search View"
-#~ msgstr "Arama Görünümü"
-
-#~ msgid "Russian / русский язык"
-#~ msgstr "Russian / русский язык"
-
-#~ msgid "Orders"
-#~ msgstr "Orders"
-
-#~ msgid "Optional localization details, for information purpose only"
-#~ msgstr "Optional localization details, for information purpose only"
-
-#~ msgid ""
-#~ "This Account is used for transferring Profit/Loss(If It is Profit: Amount "
-#~ "will be added, Loss : Amount will be duducted.), 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 duducted.), Which is calculated from "
-#~ "Profilt & Loss Report"
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index 5e9744ce8af..e35a5ff1f45 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: 2011-04-29 05:12+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr "ھېساباتنى توغىرىلاش نەتىجىسى"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "مەبلەخ"
 
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index aac0f88b6a8..bb2c14eba8b 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: 2011-04-29 05:12+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -483,8 +483,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1121,6 +1119,7 @@ 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
@@ -1308,6 +1307,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2011,7 +2020,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2075,6 +2084,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2096,11 +2107,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2417,6 +2433,7 @@ 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
@@ -2662,6 +2679,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2927,7 +2946,6 @@ msgstr "Залишити порожнім для використання рах
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2941,6 +2959,17 @@ msgstr "Залишити порожнім для використання рах
 #: 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 "Журнали"
 
@@ -3150,6 +3179,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3208,6 +3238,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr "План рахунків"
 
@@ -3646,11 +3686,10 @@ msgid "Analytic Balance"
 msgstr "Аналітичний баланс"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4323,7 +4362,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4462,7 +4501,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4475,10 +4513,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4488,6 +4524,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr "Цільові кроки"
 
@@ -4604,6 +4650,8 @@ msgstr "Результат звірки"
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5314,6 +5362,19 @@ msgstr ""
 
 #. 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 ""
@@ -6222,6 +6283,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6451,7 +6513,7 @@ msgstr "Рядки аналітики"
 #: 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 "
+"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) "
@@ -7124,6 +7186,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7376,6 +7439,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Період"
@@ -7458,14 +7534,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr "Валюта компанії"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7577,6 +7645,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7814,6 +7888,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8095,12 +8170,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8218,7 +8298,12 @@ msgstr "Залишити порожнім для використання рах
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8237,6 +8322,15 @@ 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 ""
 
@@ -8434,7 +8528,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "План Рахунків"
 
 #. module: account
@@ -8451,12 +8545,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8476,7 +8575,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8657,6 +8756,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8738,6 +8838,18 @@ msgstr "Загальний"
 #: selection:account.pl.report,filter: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
@@ -8947,13 +9059,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8977,7 +9086,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9185,6 +9294,7 @@ msgstr "Інвойс постачальника"
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9258,6 +9368,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9627,11 +9747,17 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
-#~ msgid "Keep empty to use the period of the validation date."
-#~ msgstr "Залиште порожнім, щоб використовувати період дати затвердження"
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Помилка! Ви не можете створити рекурсивний рахунок."
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
 
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Неоплачені інвойси постачальника"
@@ -9685,18 +9811,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "Разом записів"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "Знижка(%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Будь ласка, не беріть це до уваги, якщо Ваш платіж вже пройшов після того, "
-#~ "як Ви отримали це повідомлення. У разі виникнення питань зв'яжіться з нашою "
-#~ "бухгалтерією за тел. +32 81 81 37 00."
-
 #~ msgid "Unpaid Supplier Refunds"
 #~ msgstr "Неоплачені Повернення Постачальникові"
 
@@ -9715,9 +9829,6 @@ msgstr ""
 #~ msgid "Keep empty if the fiscal year belongs to several companies."
 #~ msgstr "Залишити пустим, якщо податковий рік належить кільком компаніям."
 
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Sign for parent"
 #~ msgstr "Ознака власника"
 
@@ -9910,9 +10021,6 @@ msgstr ""
 #~ msgid "Select Period and Journal for Validation"
 #~ msgstr "Виберіть Період та Журнал для Перевірки"
 
-#~ msgid "Partner ID"
-#~ msgstr "ІД партнера"
-
 #~ msgid "New Customer Invoice"
 #~ msgstr "Новий інвойс клієнту"
 
@@ -9943,15 +10051,9 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "Документ"
 
-#~ msgid "Move name"
-#~ msgstr "Назва переміщення"
-
 #~ msgid "Cancel selected invoices"
 #~ msgstr "Відмінити вибрані інвойси"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Financial Management"
 #~ msgstr "Фінанси"
 
@@ -9987,9 +10089,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Оплатити і звірити"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "Перенесене сальдо"
-
 #~ msgid "New Supplier Refund"
 #~ msgstr "Нове Повернення Постачальнику"
 
@@ -10005,9 +10104,6 @@ msgstr ""
 #~ msgid "Entry encoding"
 #~ msgstr "Кодування запису"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "Списання"
-
 #~ msgid "Other"
 #~ msgstr "Інший"
 
@@ -10149,9 +10245,6 @@ msgstr ""
 #~ msgid "Full Payment"
 #~ msgstr "Повна Оплата"
 
-#~ msgid "All account entries"
-#~ msgstr "Всі проводки рахунку"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Невиплачені повернення клієнтові"
 
@@ -10187,24 +10280,3 @@ msgstr ""
 
 #~ msgid "Statement reconcile"
 #~ msgstr "Вивірка виписки"
-
-#~ msgid "Analytic accounts to close"
-#~ msgstr "Аналітичні рахунки до закриття"
-
-#~ msgid "Draft invoices"
-#~ msgstr "Чорновики інвойсів"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "Рахунки для інвойсування"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "Кошти для інвойсування"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Застаріла дебіторська заборгованість"
-
-#~ msgid "My indicators"
-#~ msgstr "Мої індикатори"
-
-#~ msgid "Aged income"
-#~ msgstr "Застарілі доходи"
diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po
index 4235ca20a08..598f0575cc8 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: 2011-04-29 05:12+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9621,3 +9741,15 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index a61a2681916..5ec1c53f3fa 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-20 09:45+0000\n"
-"Last-Translator: lam nhut tien <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:57+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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -34,7 +34,7 @@ msgid "No End of year journal defined for the fiscal year"
 msgstr "Chưa xác định thời điểm kết thúc năm tài chính"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: code:addons/account/account.py:506
 #, python-format
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
@@ -70,7 +70,7 @@ msgid "Residual"
 msgstr "Còn lại"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr "làm ơn định nghĩa cấu hình đường đi và tần suất của hóa đơn"
@@ -139,7 +139,7 @@ msgid "Accounting Entries-"
 msgstr "Các bút toán Kế toán-"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "Bạn không thể xóa bút toán \"%s\" đã được ghi nhận trước đó!"
@@ -185,7 +185,7 @@ msgstr ""
 "thanh toán mà không cần loại bỏ nó."
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "Cảnh báo!"
@@ -240,7 +240,7 @@ msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -274,7 +274,7 @@ msgstr ""
 "on invoices"
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -291,7 +291,7 @@ msgid "Belgian Reports"
 msgstr "Báo cáo của Bỉ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "You can not add/modify entries in a closed journal."
@@ -329,7 +329,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Invoice line account company does not match with invoice company."
@@ -522,8 +522,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -589,7 +587,7 @@ msgid "Not reconciled transactions"
 msgstr "Các giao dịch chưa đối soát"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr "CashBox Balance is not matching with Calculated Balance !"
@@ -673,7 +671,7 @@ msgid "Tax Code Amount"
 msgstr "Tax Code Amount"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -706,8 +704,8 @@ msgid "Journal Period"
 msgstr "Chu kỳ của Sổ nhật ký"
 
 #. module: account
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, 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"
@@ -768,7 +766,7 @@ msgid "Analytic Entries by line"
 msgstr "Analytic Entries by line"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 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"
@@ -872,7 +870,7 @@ msgid "Next Partner to reconcile"
 msgstr "Đối tác tiếp theo cho đối soát"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "
@@ -999,11 +997,11 @@ msgid "Code"
 msgstr "Mã"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
@@ -1084,6 +1082,7 @@ msgstr "Profit & Loss (Expense Accounts)"
 
 #. 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 "-"
@@ -1181,7 +1180,7 @@ msgid "Entry Label"
 msgstr "Entry Label"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, 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 !"
@@ -1319,6 +1318,7 @@ msgid "Journal Items Analysis"
 msgstr "Journal Items Analysis"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Các đối tác"
@@ -1348,7 +1348,7 @@ msgid "Central Journal"
 msgstr "quy trình trung tâm"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr "You can not use this general account in this journal !"
@@ -1360,6 +1360,16 @@ msgstr "You can not use this general account in this journal !"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr "With balance is not equal to 0"
 
@@ -1446,7 +1456,7 @@ msgstr ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:815
 #, python-format
 msgid ""
 "Cannot create the invoice !\n"
@@ -1615,6 +1625,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"
@@ -1686,7 +1697,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "Lỗi! Bạn không thể định nghĩa các năm tài chính chồng nhau"
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr "Tài khoản không được định nghĩa để đối soát !"
@@ -1719,7 +1730,7 @@ msgid "Receivables & Payables"
 msgstr "Khoản phải thu & Khoản phải trả"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr "You have to provide an account for the write off entry !"
@@ -1755,7 +1766,7 @@ msgid "Customer Ref:"
 msgstr "Tham chiếu khách hàng:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "User %s does not have rights to access %s journal !"
@@ -1776,7 +1787,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "Tax Declaration: Credit Notes"
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "You cannot deactivate an account that contains account moves."
@@ -1792,7 +1803,7 @@ msgid "You can not create move line on closed account."
 msgstr "bạn không thể xóa hay di chuyển dòng này vì tài khoản đã đóng."
 
 #. module: account
-#: code:addons/account/account.py:529
+#: code:addons/account/account.py:519
 #, python-format
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
@@ -2074,7 +2085,7 @@ msgid " Journal"
 msgstr " Sổ nhật ký"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2100,8 +2111,8 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
-msgstr "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
+msgstr "Search Chart of Accounts Templates"
 
 #. module: account
 #: view:account.installer:0
@@ -2134,7 +2145,7 @@ msgid "Description"
 msgstr "Mô tả"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
@@ -2154,7 +2165,7 @@ msgid "Income Account"
 msgstr "Tài khoản thu nhập"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "There is no Accounting Journal of type Sale/Purchase defined!"
@@ -2165,9 +2176,10 @@ msgid "Accounting Properties"
 msgstr "Accounting Properties"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
 msgstr "Entries Sorted By"
 
@@ -2189,12 +2201,16 @@ msgstr "Product Template"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2304,7 +2320,7 @@ msgid "Account Tax Code"
 msgstr "Mã số thuế"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2380,7 +2396,7 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2471,7 +2487,7 @@ msgid "Accounts"
 msgstr "Các tài khoản"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "Lỗi cấu hình!"
@@ -2483,12 +2499,13 @@ msgid "Average Price"
 msgstr "Giá trung bình"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "Ngày:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: code:addons/account/account.py:640
 #, python-format
 msgid ""
 "You cannot modify company of this journal as its related record exist in "
@@ -2642,16 +2659,16 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "This wizard will create recurring accounting entries"
 
 #. module: account
-#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "No sequence defined on the journal !"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2787,6 +2804,8 @@ msgstr "Kế toán tài chính"
 #. 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
 msgid "Profit And Loss"
 msgstr "Kết quả kinh doanh"
 
@@ -2821,7 +2840,7 @@ msgid "Analytic Entries"
 msgstr "Analytic Entries"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2953,7 +2972,7 @@ msgid "BNK%s"
 msgstr "BNK%s"
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3073,9 +3092,7 @@ msgstr "Keep empty to use the expense account"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -3089,6 +3106,17 @@ msgstr "Keep empty to use the expense account"
 #: 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 "Các sổ nhật ký"
 
@@ -3134,7 +3162,7 @@ msgid "Starting Balance"
 msgstr "Số dư ban đầu"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Không có đối tác được định nghĩa"
@@ -3178,6 +3206,7 @@ msgstr "Sổ nhật ký:"
 #: 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
@@ -3231,7 +3260,7 @@ msgstr ""
 "won't be able to modify their accounting fields anymore."
 
 #. module: account
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Không thể xóa các hóa đơn đang mở hoặc đã thanh toán !"
@@ -3294,7 +3323,7 @@ msgstr ""
 "or 'Done' state!"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:522
 #, python-format
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3364,6 +3393,16 @@ msgstr "Thuế GTGT :"
 #: 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.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 "Chart of Accounts"
 msgstr "Hoạch đồ Kế toán"
 
@@ -3411,7 +3450,6 @@ 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
 #: view:account.move:0
@@ -3455,7 +3493,7 @@ msgid "Chart of Accounts Template"
 msgstr "Hoạch đồ Kế toán Mẫu"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3467,13 +3505,13 @@ msgstr ""
 "Hãy xác định đối tác trên nó"
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Một số bút toán đã được đối soát !"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1204
 #, python-format
 msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
@@ -3600,7 +3638,7 @@ msgid "Analytic Items"
 msgstr "phân tích mặt hàng"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Không thể thay đổi thuế !"
@@ -3611,14 +3649,14 @@ msgid "#Entries"
 msgstr "Số bút toán"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "Bạn chọn một Đơn vị đo lường mà không tương thích với sản phẩm"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3829,11 +3867,10 @@ msgid "Analytic Balance"
 msgstr "Analytic Balance"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr "Net Loss"
 
@@ -3931,7 +3968,7 @@ msgid "Acc.Type"
 msgstr "Loại tài khoản"
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr "Global taxes defined, but are not in invoice lines !"
@@ -3995,7 +4032,7 @@ msgstr ""
 "created in 'Posted' state."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4173,7 +4210,7 @@ msgid "Credit Notes"
 msgstr "Credit Notes"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -4246,11 +4283,11 @@ msgid "Change"
 msgstr "Thay đổi"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4354,7 +4391,7 @@ msgid "You must define an analytic journal of type '%s' !"
 msgstr "You must define an analytic journal of type '%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4425,7 +4462,7 @@ msgid "Invoices"
 msgstr "Các hóa đơn"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4530,7 +4567,7 @@ msgstr "Journal Items"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr "Bảng cân đối Kế toán (Các Tài khoản Tài sản)"
 
 #. module: account
@@ -4539,24 +4576,25 @@ msgid "Third Party (Country)"
 msgstr "Third Party (Country)"
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4578,7 +4616,7 @@ msgid "Bank Details"
 msgstr "Chi tiết ngân hàng"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "Taxes missing !"
@@ -4635,7 +4673,7 @@ msgid "Check Date not in the Period"
 msgstr "Kiểm tra Ngày có nằm trong Chu kỳ"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4657,7 +4695,7 @@ msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, 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"
@@ -4673,7 +4711,6 @@ msgid "Analytic Balance -"
 msgstr "Analytic Balance -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4686,11 +4723,8 @@ msgstr "Analytic Balance -"
 #: 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
 #: 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
@@ -4700,6 +4734,16 @@ msgstr "Analytic Balance -"
 #: 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
 msgid "Target Moves"
 msgstr "Target Moves"
 
@@ -4771,7 +4815,7 @@ msgid "Line 1:"
 msgstr "Dòng 1:"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "Lỗi toàn vẹn !"
@@ -4817,6 +4861,8 @@ msgstr "Kết quả đối soát"
 #: 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
 msgid "Balance Sheet"
 msgstr "Bảng cân đối kế toán"
 
@@ -4919,7 +4965,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
@@ -4993,7 +5039,7 @@ msgstr ""
 "Ngày = 22, Ngày trong Tháng =- 1, sau đó đúng hạn là 28/02"
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
@@ -5021,7 +5067,7 @@ msgid "Start of period"
 msgstr "Bắt đầu chu kỳ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/account_move_line.py:1193
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry ! Please note that "
@@ -5079,12 +5125,12 @@ msgstr "End of Year Entries Journal"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5166,7 +5212,7 @@ msgid "Sort By"
 msgstr "Sắp xếp theo"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -5325,7 +5371,7 @@ msgid "Generate Opening Entries"
 msgstr "Generate Opening Entries"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Đã được đối soát!"
@@ -5363,7 +5409,7 @@ msgstr "Tài khoản con"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "Miễn bỏ"
@@ -5513,7 +5559,7 @@ msgid "# of Lines"
 msgstr "Số dòng"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr "Loại tiền mới chưa được cấu hình đúng !"
@@ -5538,14 +5584,14 @@ msgid "Filter by"
 msgstr "Lọc theo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, 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!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Entries are not of the same account or already reconciled ! "
@@ -5564,6 +5610,19 @@ msgstr "Account General Journal"
 
 #. 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 "không có ô trống"
@@ -5580,7 +5639,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "Hành động không hợp lệ !"
@@ -5802,7 +5861,7 @@ msgid "Companies"
 msgstr "Các công ty"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
@@ -6082,9 +6141,9 @@ msgid "Optional create"
 msgstr "Optional create"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 "Can not find account chart for this company, Please Create account."
@@ -6235,8 +6294,8 @@ msgid "Analytic Entries Statistics"
 msgstr "Analytic Entries Statistics"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "Các bút toán: "
@@ -6247,7 +6306,7 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr "Tạo các mục hướng dẫn định kỳ trên quy trình lựa chọn"
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Couldn't create move between different companies"
@@ -6295,7 +6354,7 @@ msgid "Total debit"
 msgstr "Tổng nợ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Bút toán \"%s\" không hợp lệ !"
@@ -6364,31 +6423,30 @@ msgid "  valuation: percent"
 msgstr "  định giá: phần trăm"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6505,7 +6563,7 @@ msgid "Journal Select"
 msgstr "Journal Select"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr "Loại tiền hiện tại không được cấu hình đúng !"
@@ -6526,7 +6584,6 @@ msgstr "Taxes Fiscal Position"
 #: 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 "Sổ cái"
@@ -6587,7 +6644,7 @@ msgid "Total:"
 msgstr "Tổng cộng:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6625,7 +6682,7 @@ msgid "Child Codes"
 msgstr "Child Codes"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6788,14 +6845,14 @@ msgstr "Analytic Lines"
 #: 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 "
+"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 ""
 "The normal chart of accounts has a structure defined by the legal "
-"requirement of the country. The analytic chart of account structure should "
+"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) "
@@ -6808,7 +6865,7 @@ msgid "Lines"
 msgstr "Lines"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:521
 #, python-format
 msgid ""
 "Can not find account chart for this company in invoice line account, Please "
@@ -7008,7 +7065,7 @@ msgstr ""
 "to create specific taxes in a custom domain."
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, 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"
@@ -7122,7 +7179,7 @@ msgid "Sign on Reports"
 msgstr "Sign on Reports"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr "You can not have two open register for the same journal"
@@ -7157,6 +7214,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -7188,7 +7246,6 @@ msgstr "Thông tin tùy chọ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
@@ -7216,13 +7273,13 @@ msgstr ""
 "the limit date for the payment of this line."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "Tài khoản không đúng !"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
@@ -7240,7 +7297,7 @@ msgid "Invoice Tax"
 msgstr "Thuế Hóa đơn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7487,17 +7544,17 @@ msgid "Fixed"
 msgstr "Đã sửa"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "Cảnh báo !"
@@ -7560,7 +7617,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Can not %s draft/proforma/cancel invoice."
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -7611,7 +7668,7 @@ msgid "Deferral Method"
 msgstr "Phương pháp hoãn lại"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Hóa đơn '%s' đã được trả."
@@ -7676,7 +7733,7 @@ msgid "Associated Partner"
 msgstr "Đối tác Liên quan"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -7744,7 +7801,7 @@ msgid "Choose Fiscal Year"
 msgstr "Chọn năm tài chính"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
@@ -7781,7 +7838,6 @@ msgstr "Quản lý Kế toán và Tài chính"
 #: 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
@@ -7794,6 +7850,19 @@ msgstr "Quản lý Kế toán và Tài chính"
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "Chu kỳ"
@@ -7888,14 +7957,6 @@ msgstr "ĐT :"
 msgid "Company Currency"
 msgstr "Loại tiền của Công ty"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr "Hệ thống tài khoản"
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7960,7 +8021,7 @@ msgid "Account Types"
 msgstr "Loại tài khoản"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr "Cannot create invoice move on centralised journal"
@@ -8010,8 +8071,13 @@ msgstr "Sổ nhật ký Hoàn tiền"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
 msgstr "Lọc bởi"
 
@@ -8053,7 +8119,7 @@ msgid "Payment Term Line"
 msgstr "Payment Term Line"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
@@ -8227,8 +8293,8 @@ msgstr ""
 "Số tiền của chứng từ phải được cùng một số tiền như trên các dòng lệnh"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "Tài khoản không hợp lệ!"
@@ -8239,7 +8305,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:1062
+#: code:addons/account/account_move_line.py:1056
 #, 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!"
@@ -8459,14 +8525,14 @@ msgid "Period from"
 msgstr "Chu kỳ từ"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: code:addons/account/account.py:927
 #, python-format
 msgid ""
 "You cannot modify company of this period as its related record exist in "
@@ -8517,7 +8583,7 @@ msgid "Purchase Tax(%)"
 msgstr "Thuế mua hàng(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
@@ -8533,7 +8599,7 @@ msgid "Configure Your Accounting Application"
 msgstr "Cấu hình Ứng dụng Kế toán của bạn"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
@@ -8576,18 +8642,22 @@ msgstr "Followups Management"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
 msgstr "Bắt đầu chu kỳ"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr "Cannot locate parent code for template account!"
@@ -8625,7 +8695,7 @@ msgstr ""
 "Accountant validates the accounting entries coming from the invoice. "
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: code:addons/account/invoice.py:1008
 #, python-format
 msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8655,7 +8725,7 @@ msgid "You can not create move line on view account."
 msgstr "Bạn không thể tạo ra các dòng di chuyển vào tài khoản xem."
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr "Current currency is not confirured properly !"
@@ -8707,8 +8777,12 @@ msgstr "Để trống để sử dụng tài khoản thu nhập"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8727,7 +8801,15 @@ msgstr "Manually or automatically entered in the system"
 
 #. 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 "Hiển thị tài khoản"
 
@@ -8855,7 +8937,6 @@ msgstr "Manual entry"
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8863,7 +8944,7 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, 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 !"
@@ -8944,7 +9025,7 @@ msgstr "Tháng Bảy"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Hệ thống tài khoản"
 
 #. module: account
@@ -8961,13 +9042,17 @@ msgstr "Account Analytic Balance"
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
 msgstr "Kết thúc chu kỳ"
 
@@ -8987,7 +9072,7 @@ msgstr "Kết thúc chu kỳ"
 #: 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"
+msgid "Chart of Accounts"
 msgstr "Hệ thống tài khoản"
 
 #. module: account
@@ -9006,7 +9091,7 @@ msgid "Account Subscription"
 msgstr "Account Subscription"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -9035,7 +9120,6 @@ msgstr "Entry Subscription"
 #: 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
@@ -9064,7 +9148,7 @@ msgid "Unreconciled"
 msgstr "Chưa được đối soát"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "Tổng không hợp lệ !"
@@ -9129,13 +9213,13 @@ msgid "Active"
 msgstr "Đang hoạt động"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
 msgstr "Lỗi chưa biết"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry !\n"
@@ -9187,6 +9271,7 @@ msgstr "Validate Account Move"
 #: report:account.journal.period.print: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
@@ -9270,6 +9355,18 @@ msgstr "Tổng quát"
 #: selection:account.pl.report,filter: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
@@ -9436,6 +9533,7 @@ msgstr "Chọn chu kỳ"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "Posted"
 
@@ -9454,7 +9552,6 @@ msgstr "Posted"
 #: 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
@@ -9487,13 +9584,10 @@ msgid "Tax Source"
 msgstr "Tax Source"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr "Net Profit"
 
@@ -9508,7 +9602,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr "This is a model for recurring accounting entries"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9518,8 +9612,8 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "JRNL"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9663,8 +9757,8 @@ msgid "End period"
 msgstr "Chu kỳ kết thúc"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9736,6 +9830,7 @@ msgstr "Hóa đơn nhà cung cấp"
 #: report:account.journal.period.print: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
@@ -9769,7 +9864,7 @@ msgid "Recurring"
 msgstr "Recurring"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Entry is already reconciled"
@@ -9790,7 +9885,7 @@ msgid "Range"
 msgstr "Range"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece !\n"
@@ -9809,6 +9904,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr "With movements"
 
@@ -9931,7 +10036,7 @@ msgid "Accounts Mapping"
 msgstr "Accounts Mapping"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Hóa đơn '%s' đang chờ kiểm tra."
@@ -9956,7 +10061,7 @@ msgid "The income or expense account related to the selected product."
 msgstr "The income or expense account related to the selected product."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr "The date of your Journal Entry is not in the defined period!"
@@ -10163,7 +10268,7 @@ msgid "You must enter a period length that cannot be 0 or below !"
 msgstr "You must enter a period length that cannot be 0 or below !"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr "You cannot remove an account which has account entries!. "
@@ -10196,6 +10301,18 @@ msgstr ""
 "Số tiền còn dư trên phải thu hoặc phải trả của một mục tạp chí thể hiện bằng "
 "đồng tiền của mình (có thể khác nhau của các loại tiền tệ của công ty)."
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "Tài sản"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "Tài sản nợ"
+
 #~ msgid "Asset"
 #~ msgstr "Tài sản"
 
@@ -10223,18 +10340,6 @@ msgstr ""
 #~ msgid "Total entries"
 #~ msgstr "tổng đầu vào"
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "bạn sẽ trả tiền sau khi email này được gửi, hãy liên hệ với chúng tôi khi "
-#~ "bạn không nhận được mail.đừng ngại ngùng hãy liên hệ với chúng tôi, : + 84 "
-#~ "909 89 1986"
-
-#~ msgid "Disc. (%)"
-#~ msgstr "phân vùng  (%)"
-
 #~ msgid "Journal de frais"
 #~ msgstr "quy trình de frais"
 
@@ -10259,9 +10364,6 @@ msgstr ""
 #~ msgid "Mvt"
 #~ msgstr "Mvt"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "Lỗi! Bạn không thể tạo tài khoản nhiều lần lăp đi lặp lại"
-
 #~ msgid "Contact"
 #~ msgstr "Liên hệ"
 
@@ -10299,80 +10401,6 @@ msgstr ""
 #~ msgid "Account Num."
 #~ msgstr "Sỗ tài khoản"
 
-#~ msgid "Expenses Credit Notes Journal - (test)"
-#~ msgstr "Expenses Credit Notes Journal - (test)"
-
-#~ msgid ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-#~ msgstr ""
-#~ "A journal entry consists of several journal items, each of which is either a "
-#~ "debit or a credit. OpenERP creates automatically one journal entry per "
-#~ "accounting document: invoices, refund, supplier payment, bank statements, "
-#~ "etc."
-
-#~ msgid ""
-#~ "Can't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration/Financial Accounting/Accounts/Journals.' % "
-#~ "(context.get('journal_type"
-#~ msgstr ""
-#~ "Can't find any account journal of %s type for this company.\n"
-#~ "\n"
-#~ "You can create one in the menu: \n"
-#~ "Configuration/Financial Accounting/Accounts/Journals.' % "
-#~ "(context.get('journal_type"
-
-#~ msgid ""
-#~ "Maturity date of entry line generated by model line '%s' of model '%s' is "
-#~ "based on partner payment term! \\n                    \n"
-#~ "Please define partner on it!\"%(line.name, model.name)))\n"
-#~ "                    if line.partner_id.property_payment_term:\n"
-#~ "                        payment_term_id = "
-#~ "line.partner_id.property_payment_term.id\n"
-#~ "                        pterm_list = pt_obj.compute(cr, uid, "
-#~ "payment_term_id, value=1, date_ref=date_maturity)\n"
-#~ "                        if pterm_list:\n"
-#~ "                            pterm_list = [l[0] for l in pterm_list]\n"
-#~ "                            pterm_list.sort()\n"
-#~ "                            date_maturity = pterm_list[-1]\n"
-#~ "\n"
-#~ "                val.update({\n"
-#~ "                    'name': line.name,\n"
-#~ "                    'quantity': line.quantity,\n"
-#~ "                    'debit': line.debit,\n"
-#~ "                    'credit': line.credit,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'move_id': move_id,\n"
-#~ "                    'partner_id': line.partner_id.id,\n"
-#~ "                    'date': context.get('date',time.strftime('%Y-%m-%d"
-#~ msgstr ""
-#~ "Maturity date of entry line generated by model line '%s' of model '%s' is "
-#~ "based on partner payment term! \\n                    \n"
-#~ "Please define partner on it!\"%(line.name, model.name)))\n"
-#~ "                    if line.partner_id.property_payment_term:\n"
-#~ "                        payment_term_id = "
-#~ "line.partner_id.property_payment_term.id\n"
-#~ "                        pterm_list = pt_obj.compute(cr, uid, "
-#~ "payment_term_id, value=1, date_ref=date_maturity)\n"
-#~ "                        if pterm_list:\n"
-#~ "                            pterm_list = [l[0] for l in pterm_list]\n"
-#~ "                            pterm_list.sort()\n"
-#~ "                            date_maturity = pterm_list[-1]\n"
-#~ "\n"
-#~ "                val.update({\n"
-#~ "                    'name': line.name,\n"
-#~ "                    'quantity': line.quantity,\n"
-#~ "                    'debit': line.debit,\n"
-#~ "                    'credit': line.credit,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'move_id': move_id,\n"
-#~ "                    'partner_id': line.partner_id.id,\n"
-#~ "                    'date': context.get('date',time.strftime('%Y-%m-%d"
-
 #~ 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 "
@@ -10389,15 +10417,6 @@ msgstr ""
 #~ msgid "UnknownError"
 #~ msgstr "UnknownError"
 
-#~ msgid ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-#~ msgstr ""
-#~ "Customer Invoices allows you create and manage invoices issued to your "
-#~ "customers. OpenERP generates draft of invoices automatically so that you "
-#~ "only have to confirm them before sending them to your customers."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -10406,90 +10425,6 @@ msgstr ""
 #~ msgid "A/c No."
 #~ msgstr "A/c No."
 
-#~ msgid ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "A vendor refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-
-#~ msgid "Select recurring to create a manualy recurring accounting entries"
-#~ msgstr "Select recurring to create a manualy recurring accounting entries"
-
-#~ 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.\"\"\" % "
-#~ "(line.account_id.code, line.account_id.name)))\n"
-#~ "\n"
-#~ "            if abs(amount) < 10 ** -4:\n"
-#~ "                # If the move is balanced\n"
-#~ "                # Add to the list of valid moves\n"
-#~ "                # (analytic lines will be created later for valid moves)\n"
-#~ "                valid_moves.append(move)\n"
-#~ "\n"
-#~ "                # Check whether the move lines are confirmed\n"
-#~ "\n"
-#~ "                if not line_draft_ids:\n"
-#~ "                    continue\n"
-#~ "                # Update the move lines (set them as valid)\n"
-#~ "\n"
-#~ "                obj_move_line.write(cr, uid, line_draft_ids, {\n"
-#~ "                    'journal_id': move.journal_id.id,\n"
-#~ "                    'period_id': move.period_id.id,\n"
-#~ "                    'state': 'valid'\n"
-#~ "                }, context, check=False)\n"
-#~ "\n"
-#~ "                account = {}\n"
-#~ "                account2 = {}\n"
-#~ "\n"
-#~ "                if journal.type in ('purchase','sale"
-#~ msgstr ""
-#~ "\"\"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.\"\"\" % "
-#~ "(line.account_id.code, line.account_id.name)))\n"
-#~ "\n"
-#~ "            if abs(amount) < 10 ** -4:\n"
-#~ "                # If the move is balanced\n"
-#~ "                # Add to the list of valid moves\n"
-#~ "                # (analytic lines will be created later for valid moves)\n"
-#~ "                valid_moves.append(move)\n"
-#~ "\n"
-#~ "                # Check whether the move lines are confirmed\n"
-#~ "\n"
-#~ "                if not line_draft_ids:\n"
-#~ "                    continue\n"
-#~ "                # Update the move lines (set them as valid)\n"
-#~ "\n"
-#~ "                obj_move_line.write(cr, uid, line_draft_ids, {\n"
-#~ "                    'journal_id': move.journal_id.id,\n"
-#~ "                    'period_id': move.period_id.id,\n"
-#~ "                    'state': 'valid'\n"
-#~ "                }, context, check=False)\n"
-#~ "\n"
-#~ "                account = {}\n"
-#~ "                account2 = {}\n"
-#~ "\n"
-#~ "                if journal.type in ('purchase','sale"
-
-#~ msgid ""
-#~ "To get detailed information about a partner you can ask for the Partner "
-#~ "Ledgers."
-#~ msgstr ""
-#~ "To get detailed information about a partner you can ask for the Partner "
-#~ "Ledgers."
-
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no income account defined ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -10499,100 +10434,9 @@ msgstr ""
 #~ msgid "Options"
 #~ msgstr "Options"
 
-#~ msgid ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-#~ msgstr ""
-#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
-#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
-#~ "that you can control what you received from your supplier according to what "
-#~ "you purchased or received."
-
-#~ msgid "Move/Entry label"
-#~ msgstr "Move/Entry label"
-
-#~ msgid ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-#~ msgstr ""
-#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
-#~ "your customers. A refund invoice is a document that cancels an invoice or a "
-#~ "part of it. You can easily generate refunds and reconcile them from the "
-#~ "invoice form."
-
-#~ msgid "Entry No"
-#~ msgstr "Entry No"
-
-#~ msgid "Aged receivables"
-#~ msgstr "Aged receivables"
-
-#~ msgid ""
-#~ "A recurring entry is a payment related entry that occurs on a recurrent "
-#~ "basis from a specific date corresponding to the signature of a contract or "
-#~ "an agreement with a customer or a supplier. With Define Recurring Entries, "
-#~ "you can create them in the system in order to automate their entries in the "
-#~ "system."
-#~ msgstr ""
-#~ "A recurring entry is a payment related entry that occurs on a recurrent "
-#~ "basis from a specific date corresponding to the signature of a contract or "
-#~ "an agreement with a customer or a supplier. With Define Recurring Entries, "
-#~ "you can create them in the system in order to automate their entries in the "
-#~ "system."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the payment "
-#~ "term without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the payment "
-#~ "term without removing it."
-
-#~ msgid ""
-#~ "Define your company's fiscal year depending on the period you have chosen to "
-#~ "follow. A fiscal year is a 1 year period over which a company budgets its "
-#~ "spending. It may run over any period of 12 months. The fiscal year is "
-#~ "referred to by the date in which it ends. For example, if a company's fiscal "
-#~ "year ends November 30, 2011, then everything between December 1, 2010 and "
-#~ "November 30, 2011  would be referred to as FY 2011. Not using the actual "
-#~ "calendar year gives many companies an advantage, allowing them to close "
-#~ "their books at a time which is most convenient for them."
-#~ msgstr ""
-#~ "Define your company's fiscal year depending on the period you have chosen to "
-#~ "follow. A fiscal year is a 1 year period over which a company budgets its "
-#~ "spending. It may run over any period of 12 months. The fiscal year is "
-#~ "referred to by the date in which it ends. For example, if a company's fiscal "
-#~ "year ends November 30, 2011, then everything between December 1, 2010 and "
-#~ "November 30, 2011  would be referred to as FY 2011. Not using the actual "
-#~ "calendar year gives many companies an advantage, allowing them to close "
-#~ "their books at a time which is most convenient for them."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Rule must have at least one checked access right !"
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-#~ msgstr ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "expenses for the current product"
-
 #~ msgid "Generate entries before:"
 #~ msgstr "Generate entries before:"
 
-#~ msgid ""
-#~ "If no additional entries should be recorded on a fiscal year, you can close "
-#~ "it from here. It will close all opened periods in this year that will make "
-#~ "impossible any new entry record. Close a fiscal year when you need to "
-#~ "finalize your end of year results definitive."
-#~ msgstr ""
-#~ "If no additional entries should be recorded on a fiscal year, you can close "
-#~ "it from here. It will close all opened periods in this year that will make "
-#~ "impossible any new entry record. Close a fiscal year when you need to "
-#~ "finalize your end of year results definitive."
-
 #~ msgid "Income"
 #~ msgstr "Income"
 
@@ -10600,288 +10444,33 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "The statement balance is incorrect !\n"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the tax "
-#~ "without removing it."
-
-#~ msgid ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-#~ msgstr ""
-#~ "A bank statement is a summary of all financial transactions occurring over a "
-#~ "given period of time on a deposit account, a credit card, or any other type "
-#~ "of account. Start by encoding the starting and closing balance, then record "
-#~ "all lines of your statement. When you are in the Payment column of the a "
-#~ "line, you can press F1 to open the reconciliation form."
-
 #~ msgid "Statements reconciliation"
 #~ msgstr "Statements reconciliation"
 
 #~ msgid "Equity"
 #~ msgstr "Vốn chủ sở hữu"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the journal "
-#~ "period without removing it."
-
 #~ msgid "Select entries"
 #~ msgstr "Select entries"
 
-#~ msgid "Sales Credit Note Journal - (test)"
-#~ msgstr "Sales Credit Note Journal - (test)"
-
-#~ msgid "Cash Journal - (test)"
-#~ msgstr "Cash Journal - (test)"
-
-#~ msgid ""
-#~ "Here you can personalize and create each view of your financial journals by "
-#~ "selecting the fields you want to appear and the sequence they will appear."
-#~ msgstr ""
-#~ "Here you can personalize and create each view of your financial journals by "
-#~ "selecting the fields you want to appear and the sequence they will appear."
-
-#~ msgid ""
-#~ "Here, you can define a period, an interval of time between successive "
-#~ "closings of the books of your company. An accounting period typically is a "
-#~ "month or a quarter, corresponding to the tax year used by the business. "
-#~ "Create and manage them from here and decide whether a period should be left "
-#~ "open or closed depending on your company's activities over a specific period."
-#~ msgstr ""
-#~ "Here, you can define a period, an interval of time between successive "
-#~ "closings of the books of your company. An accounting period typically is a "
-#~ "month or a quarter, corresponding to the tax year used by the business. "
-#~ "Create and manage them from here and decide whether a period should be left "
-#~ "open or closed depending on your company's activities over a specific period."
-
-#~ msgid "Bank Journal - (test)"
-#~ msgstr "Bank Journal - (test)"
-
-#~ msgid "Central Journals"
-#~ msgstr "Central Journals"
-
-#~ msgid ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-#~ msgstr ""
-#~ "Cash Register allows you to manage cash entries in your cash journals."
-
-#~ msgid "Expenses Journal - (test)"
-#~ msgstr "Expenses Journal - (test)"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !"
-
-#~ msgid "Sales Journal - (test)"
-#~ msgstr "Sales Journal - (test)"
-
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Error! You can not create recursive analytic accounts."
 
-#~ msgid ""
-#~ "For an invoice to be considered as paid, the invoice entries must be "
-#~ "reconciled with counterparts, usually payments. With the automatic "
-#~ "reconciliation functionality, OpenERP make its own search for entries to "
-#~ "reconcile in a series of accounts. It tries to find entries for each partner "
-#~ "where the amounts correspond."
-#~ msgstr ""
-#~ "For an invoice to be considered as paid, the invoice entries must be "
-#~ "reconciled with counterparts, usually payments. With the automatic "
-#~ "reconciliation functionality, OpenERP make its own search for entries to "
-#~ "reconcile in a series of accounts. It tries to find entries for each partner "
-#~ "where the amounts correspond."
-
-#~ msgid ""
-#~ "Create and manage your company's financial journals from this menu. A "
-#~ "journal is a business diary in which all financial data related to the day "
-#~ "to day business transactions of your company is recorded using double-entry "
-#~ "book keeping system. Depending on the nature of its activities and number of "
-#~ "daily transactions, a company may keep several  types of specialized "
-#~ "journals such as a cash journal, purchases journal, and sales journal."
-#~ msgstr ""
-#~ "Create and manage your company's financial journals from this menu. A "
-#~ "journal is a business diary in which all financial data related to the day "
-#~ "to day business transactions of your company is recorded using double-entry "
-#~ "book keeping system. Depending on the nature of its activities and number of "
-#~ "daily transactions, a company may keep several  types of specialized "
-#~ "journals such as a cash journal, purchases journal, and sales journal."
-
-#~ msgid ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-#~ msgstr ""
-#~ "This account will be used for invoices instead of the default one to value "
-#~ "sales for the current product"
-
-#~ msgid ""
-#~ "This wizard will definitelly close a fiscal year and its related periods. "
-#~ "That means that no one will be able to create or modify journal entries in "
-#~ "it."
-#~ msgstr ""
-#~ "This wizard will definitelly close a fiscal year and its related periods. "
-#~ "That means that no one will be able to create or modify journal entries in "
-#~ "it."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Tên nhóm phải duy nhất !"
-
-#~ msgid ""
-#~ "Maturity date of entry line generated by model line '%s' is based on partner "
-#~ "payment term! \\n                                                    \n"
-#~ "Please define partner on it!\"%(line.name)))\n"
-#~ "        pass\n"
-#~ "\n"
-#~ "    def create_entries(self, cr, uid, ids, context=None):\n"
-#~ "        account_model_obj = self.pool.get('account.model"
-#~ msgstr ""
-#~ "Maturity date of entry line generated by model line '%s' is based on partner "
-#~ "payment term! \\n                                                    \n"
-#~ "Please define partner on it!\"%(line.name)))\n"
-#~ "        pass\n"
-#~ "\n"
-#~ "    def create_entries(self, cr, uid, ids, context=None):\n"
-#~ "        account_model_obj = self.pool.get('account.model"
-
-#~ msgid ""
-#~ "You can look up individual account entries by searching for useful "
-#~ "information. To search for account entries, open a journal, then select a "
-#~ "record line."
-#~ msgstr ""
-#~ "You can look up individual account entries by searching for useful "
-#~ "information. To search for account entries, open a journal, then select a "
-#~ "record line."
-
-#~ msgid ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "This account will be used for invoices to value sales for the current "
-#~ "product category"
-
 #~ msgid "Partner Ref."
 #~ msgstr "Partner Ref."
 
-#~ msgid ""
-#~ "An account type is a name or code given to an account that indicates its "
-#~ "purpose. For example, the account type could be linked to an asset account, "
-#~ "expense account or payable account. From this view, you can create and "
-#~ "manage the account types you need to be used for your company management."
-#~ msgstr ""
-#~ "An account type is a name or code given to an account that indicates its "
-#~ "purpose. For example, the account type could be linked to an asset account, "
-#~ "expense account or payable account. From this view, you can create and "
-#~ "manage the account types you need to be used for your company management."
-
 #~ msgid "Expense"
 #~ msgstr "Chi phí"
 
-#~ msgid ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-#~ "& Loss Report"
-#~ msgstr ""
-#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-#~ "& Loss Report"
-
-#~ msgid ""
-#~ "A tax code is a reference of a tax that will be taken out of a gross income "
-#~ "depending on the country and sometimes industry sector. OpenERP allows you "
-#~ "to define and manage them from this menu."
-#~ msgstr ""
-#~ "A tax code is a reference of a tax that will be taken out of a gross income "
-#~ "depending on the country and sometimes industry sector. OpenERP allows you "
-#~ "to define and manage them from this menu."
-
-#~ msgid ""
-#~ "Create and manage accounts you will need to record financial entries in. "
-#~ "Accounts are financial records of your company that register all financial "
-#~ "transactions. Companies present their annual accounts in two main parts: the "
-#~ "balance sheet and the income statement (profit and loss account). The annual "
-#~ "accounts of a company are required by law to disclose a certain amount of "
-#~ "information. They have to be certified by an external auditor yearly."
-#~ msgstr ""
-#~ "Create and manage accounts you will need to record financial entries in. "
-#~ "Accounts are financial records of your company that register all financial "
-#~ "transactions. Companies present their annual accounts in two main parts: the "
-#~ "balance sheet and the income statement (profit and loss account). The annual "
-#~ "accounts of a company are required by law to disclose a certain amount of "
-#~ "information. They have to be certified by an external auditor yearly."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules are not supported for osv_memory objects !"
-
-#~ msgid ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-#~ msgstr ""
-#~ "The chart of taxes is used to generate your periodic tax statement. You will "
-#~ "see here the taxes with codes related to your legal statement according to "
-#~ "your country."
-
-#~ msgid ""
-#~ "You have to define \\nthe bank account\n"
-#~ "in the journal definition for reconciliation."
-#~ msgstr ""
-#~ "You have to define \\nthe bank account\n"
-#~ "in the journal definition for reconciliation."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the analytic "
-#~ "journal without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the analytic "
-#~ "journal without removing it."
-
 #~ msgid "Partner Other Ledger"
 #~ msgstr "Partner Other Ledger"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-#~ msgstr ""
-#~ "If the active field is set to true, it will allow you to hide the account "
-#~ "without removing it."
-
-#~ msgid ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
-#~ msgstr ""
-#~ "The best practice here is to use a journal dedicated to contain the opening "
-#~ "entries of all fiscal years. Note that you should define it with default "
-#~ "debit/credit accounts and with a centralized counterpart."
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
 
 #~ msgid "account.analytic.journal"
 #~ msgstr "account.analytic.journal"
 
-#~ msgid ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-#~ msgstr ""
-#~ "This account will be used for invoices to value expenses for the current "
-#~ "product category"
-
-#~ msgid "Checks Journal - (test)"
-#~ msgstr "Checks Journal - (test)"
-
-#~ msgid "Low Level"
-#~ msgstr "Low Level"
-
-#~ msgid "account.move.line"
-#~ msgstr "account.move.line"
-
 #~ msgid "Print Taxes Report"
 #~ msgstr "In báo cáo thuế"
 
@@ -10903,9 +10492,6 @@ msgstr ""
 #~ msgid "Fiscal Position Accounts Mapping"
 #~ msgstr "Sơ đồ tài chính liên kết các tài khoản"
 
-#~ msgid "Accounts Fiscal Mapping"
-#~ msgstr "Sơ đồ liên kết các tài khoản tài chính"
-
 #~ msgid "Status"
 #~ msgstr "Trạng thái"
 
@@ -10954,56 +10540,37 @@ msgstr ""
 #~ msgid "Date Filter"
 #~ msgstr "Lọc theo ngày"
 
-#~ msgid "supplier"
-#~ msgstr "nhà cung cấp"
-
-#~ msgid "End of Year"
-#~ msgstr "Kết thúc năm"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Tên mô hình không hợp lệ khi định nghĩa hành động"
 
 #~ msgid "OK"
 #~ msgstr "Đồng ý"
 
-#~ msgid ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-#~ msgstr ""
-#~ "A supplier refund is a credit note from your supplier indicating that he "
-#~ "refunds part or totality of the invoice sent to you."
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Hóa đơn "
 
-#~ msgid "Default UoM"
-#~ msgstr "Đơn vị đo mặc định"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Hệ thống tài khoản"
 
 #~ msgid "Document"
 #~ msgstr "Tài liệu"
 
-#~ msgid ""
-#~ "This Account is used for transferring Profit/Loss(If It is Profit: Amount "
-#~ "will be added, Loss : Amount will be duducted.), 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 duducted.), Which is calculated from "
-#~ "Profilt & Loss Report"
-
 #~ msgid "Recurrent Entries"
 #~ msgstr "Các bút toán thường xuyên"
 
 #~ msgid "Entry encoding"
 #~ msgstr "Mã hóa bút toán"
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bảng cân đối Kế toán (Các Tài khoản Tài sản)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "đã được kiểm tra."
+
+#~ msgid "Balance:"
+#~ msgstr "Số dư:"
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index a76da12910a..816fc4d1587 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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-02 15:26+0000\n"
+"PO-Revision-Date: 2011-11-07 12:54+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: 2011-07-03 04:46+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -24,31 +24,31 @@ msgstr "系统支付"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "其他配置"
+msgstr "其它设置"
 
 #. 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 "此财务年度没有定义年终日记账"
+msgstr "此会计年度没有定义年终转结"
 
 #. module: account
-#: code:addons/account/account.py:516
+#: 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 "您不能删除或禁用一个已经设为任意业务伙伴属性的科目。"
+msgstr "您不能删除或禁用一个已经有业务伙伴属性的科目。"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "日记账分录对账"
+msgstr "凭证核销"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr "发票管理"
+msgstr "手工单据管理"
 
 #. module: account
 #: view:account.account:0
@@ -62,55 +62,55 @@ msgstr "科目统计"
 #: field:account.invoice,residual:0
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "剩余的"
+msgstr "余额"
 
 #. module: account
-#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr "请为发票日记账对应序列"
+msgstr "请定义发票账簿的序列号"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "错误!这会计期间无效 "
+msgstr "错误！此会计期间无效 "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "会计货币"
+msgstr "币种"
 
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr "子定义"
+msgstr "子项定义"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "直到今天的应收款"
+msgstr "应收账款账龄"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
 msgid "Include Reconciled Entries"
-msgstr "包括已核销凭证"
+msgstr "包括已核销分录"
 
 #. 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 "损益表报告给与你公司损失与收益的概况"
+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
 msgid "wizard.multi.charts.accounts"
-msgstr "多科目图表向导"
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: view:account.move:0
@@ -122,7 +122,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 disabled"
-msgstr "如果您用非关联交易，您还必须验证所有链接到这些交易行动，因为他们不会被禁用"
+msgstr "如果您反核销交易，您必须检查所有与这交易有关的操作，因为他们不会被关闭。"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -130,7 +130,7 @@ msgid "Accounting Entries-"
 msgstr "会计分录"
 
 #. module: account
-#: code:addons/account/account.py:1305
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr "不能删除已登账的凭证行：\"%s\"！"
@@ -159,7 +159,7 @@ msgstr "核销"
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
 msgid "Reference"
-msgstr "关联单号"
+msgstr "关联"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
@@ -174,7 +174,7 @@ msgid ""
 msgstr "如果设置为false，该付款条款将会被隐藏。"
 
 #. module: account
-#: code:addons/account/invoice.py:1436
+#: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -188,7 +188,7 @@ 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
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -198,13 +198,13 @@ msgstr "过去15天开的发票"
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr "负数"
+msgstr "红字"
 
 #. module: account
 #: 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
@@ -212,7 +212,7 @@ 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
@@ -223,22 +223,20 @@ msgstr "税模板"
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "税科目"
+msgstr "account.tax"
 
 #. module: account
-#: code:addons/account/account.py:915
+#: code:addons/account/account.py:901
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
-msgstr ""
-"没有为日期 %s 定义会计区间！\n"
-"请创建一个会计年度。"
+msgstr "没有为这日期  %s  定义会计期间！ 请创建一个会计年度。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "选择核销行"
+msgstr "选择凭证行核销"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -256,7 +254,7 @@ msgid ""
 msgstr "勾选此项使发票上不显示增值税"
 
 #. module: account
-#: code:addons/account/invoice.py:1224
+#: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "发票'%s'已部分支付了%s%s ，总金额为：%s%s, 尚余%s%s未付"
@@ -264,7 +262,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
@@ -272,10 +270,10 @@ msgid "Belgian Reports"
 msgstr "比利时报表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1176
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "不能添加/修改已结帐的凭证"
+msgstr "不能在已关闭的账簿添加或修改分录"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -287,7 +285,7 @@ msgstr "计算余额"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "手动定期"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -297,7 +295,7 @@ msgstr "年终处理"
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr "允许冲销"
+msgstr "允许补差额"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -307,10 +305,10 @@ msgstr "选择辅助核算的会计期间"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr "结单编码"
+msgstr "St."
 
 #. module: account
-#: code:addons/account/invoice.py:532
+#: code:addons/account/invoice.py:529
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "发票明细的科目公司与发票头的公司不匹配。"
@@ -335,7 +333,9 @@ msgid ""
 "\n"
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
-msgstr "无法找到针对该公司%s类型的分类账簿"
+msgstr ""
+"无法找到这公司的 %s 。\n"
+"您可以在菜单：设置 / 财务会计 / 账簿 里创建。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
@@ -361,7 +361,7 @@ msgstr "设置"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -369,8 +369,7 @@ 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 ""
-"本界面供财务人员在OpenERP中批量录入凭证之用。如果你在OpenERP使用银行对帐单，收银机，或者客户/供应商付款, 相应的分录会由系统自动产生。"
+msgstr "本视图供财务人员在系统中录入单据。如果您在系统里使用银行对账单，现金记录或者客户/供应商付款, 相应账簿的明细会由系统自创建。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -391,12 +390,12 @@ msgstr "建立日期"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "采购退款"
+msgstr "采购红字发票"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "开启/结束状态"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -413,7 +412,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
@@ -433,19 +432,19 @@ msgstr "正数"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "打开反核销"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "一览表模板"
+msgstr "科目一览表模板"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "这金额表示一个可选的其它货币"
+msgstr "备选币种所示金额"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -453,7 +452,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
@@ -463,7 +462,7 @@ 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
@@ -487,8 +486,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -497,7 +494,7 @@ msgstr ""
 #: field:validate.account.move,journal_id:0
 #, python-format
 msgid "Journal"
-msgstr "业务类型"
+msgstr "账簿"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -512,7 +509,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
@@ -531,7 +528,7 @@ msgstr "这个分类账簿上的科目"
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "选择科目表"
+msgstr "选择科目一览表"
 
 #. module: account
 #: view:product.product:0
@@ -541,7 +538,7 @@ msgstr "进项税"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "发票退款"
+msgstr "红字发票"
 
 #. module: account
 #: report:account.overdue:0
@@ -554,17 +551,17 @@ msgid "Not reconciled transactions"
 msgstr "没核销的交易"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr "出纳帐与现金不一致"
+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 "税一览"
+msgstr "税一览表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
@@ -575,7 +572,7 @@ msgstr "关闭一个会计年度"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "财务人员确认的报表"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -613,17 +610,17 @@ msgstr "   30 天   "
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr "序列"
+msgstr "序号"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr "税一览"
+msgstr "税一览表"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "汇总账簿"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -633,10 +630,10 @@ msgstr "序列号必须唯一"
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "税事务金额"
+msgstr "税金额"
 
 #. module: account
-#: code:addons/account/account.py:2823
+#: code:addons/account/account.py:2779
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
@@ -645,7 +642,7 @@ msgstr "SAJ"
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
 msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "钱箱结账余额由出纳输入"
 
 #. module: account
 #: view:account.period:0
@@ -656,24 +653,24 @@ 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
 msgid "Opening Entries Period"
-msgstr "会计期间的启用凭证"
+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:723
-#: code:addons/account/account_move_line.py:767
+#: code:addons/account/account_move_line.py:732
+#: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr ""
+msgstr "要核销这些凭证，这些凭证所属公司必须一致"
 
 #. module: account
 #: view:account.account:0
@@ -700,17 +697,17 @@ msgstr "重开"
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "你确定创建凭证?"
+msgstr "你确定创建分录?"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "核对"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr "今天合作伙伴不开心"
+msgstr "今天的与业务伙伴核销"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -728,13 +725,13 @@ msgstr "表"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "按行显示分析科目数据"
+msgstr "辅助核算明细"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "您只能更改发票草案金额！"
+msgstr "你只能对发票草稿修改币种"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -753,12 +750,12 @@ msgstr "类型"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "周期性凭证行的科目"
+msgstr "科目的周期性分录明细"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr "该业务伙伴关联的发票"
+msgstr "该发票对应的业务伙伴单号"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -771,12 +768,12 @@ msgstr "反核销"
 #. 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
 #: view:account.payment.term.line:0
@@ -786,7 +783,7 @@ msgstr "计算截止日期"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "成本业务类型/凭证名称"
+msgstr "J.C.(成本)凭证名称"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -795,7 +792,7 @@ msgstr "成本业务类型/凭证名称"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr "9月"
+msgstr "九月"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -806,7 +803,7 @@ msgstr "天"
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr "如果选中，这一点的新报表科目将不包含在默认情况下。"
+msgstr "如果选中，在新的科目表中默认将不包含此项。"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:102
@@ -814,12 +811,12 @@ 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
 msgid "New Subscription"
-msgstr "新周期性凭证"
+msgstr "新周期性分录"
 
 #. module: account
 #: view:account.payment.term:0
@@ -829,28 +826,28 @@ msgstr "计算"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr "与下一个合作伙伴对帐"
+msgstr "与下一个业务伙伴核销"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1197
+#: 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 "您不能修改已确认的凭证！您只能修改一些非重要字段！"
+msgstr "您不能修改已确认的分录！您只能修改一些非重要字段！"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr "延迟付款平均时间"
+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 "税表"
+msgstr "税一览表"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -866,7 +863,7 @@ msgstr "到期"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr "总税单（纳税合计）"
+msgstr "含税合计"
 
 #. module: account
 #: view:account.invoice:0
@@ -881,7 +878,7 @@ msgstr "核准"
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr "金额合计"
+msgstr "总金额"
 
 #. module: account
 #: selection:account.account,type:0
@@ -901,17 +898,17 @@ 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
@@ -924,12 +921,12 @@ msgid ""
 "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)."
-msgstr ""
+msgstr "如果这税科目是一个税编码科目，这字段金额要征税。如果这税科目是一个税基编码，这字段的金额不用征税。"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr "采购单列表"
+msgstr "采购"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -951,18 +948,18 @@ msgstr "模型项"
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr "代码"
+msgstr "编码"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
+#: code:addons/account/account_move_line.py:170
 #: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "无辅助核算类型！"
+msgstr "没辅助核算账簿！"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -999,12 +996,12 @@ msgstr "横向模式"
 #. module: account
 #: view:board.board:0
 msgid "Customer Invoices to Approve"
-msgstr "客户发票审核"
+msgstr "待审核销售发票"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr "关闭一个财政年度"
+msgstr "选择关闭一个会计年度"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -1012,23 +1009,23 @@ msgstr "关闭一个财政年度"
 msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
-msgstr "根据你的国家定义这些类型,该类型包含有关科目及其具体的信息。"
+msgstr "根据您国家定义这些类型,该类型包含有关科目及其具体的信息。"
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr "可选项"
+msgstr "适用选项"
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr "争议中"
+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 "出纳现金"
+msgstr "现金记录"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1037,6 +1034,7 @@ 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 "-"
@@ -1050,7 +1048,7 @@ msgstr "经理"
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "生成分录前："
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -1060,7 +1058,7 @@ msgstr "银行"
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "开始会计期间"
+msgstr "会计期间开始于"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1085,8 +1083,7 @@ msgid ""
 "suppliers. OpenERP can also generate draft invoices automatically from "
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
-msgstr ""
-"供应商发票，您可以输入和管理你的供应商发出的发票。 OpenERP还可以自动生成草案从采购订单发票或收据。这样，您就可以控制从供应商的发票."
+msgstr "供应商发票，您可以输入和管理你的供应商发出的发票。 OpenERP还可从采购订单或收据产生发票发票。这样，您就可以控制供应商的发票。"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1104,7 +1101,7 @@ msgstr "反核销处理"
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "税事务"
+msgstr "税编码"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -1114,7 +1111,7 @@ msgstr "兑出汇率"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "凭证行的变动"
+msgstr "分录明细的变动"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1128,13 +1125,13 @@ msgstr "# 处理"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "凭证标签"
+msgstr "分录标签"
 
 #. module: account
-#: code:addons/account/account.py:990
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr "您不能修改/删除这业务类型和在此会计期间的凭证！"
+msgstr "您不能修改/删除这账簿和在此会计期间的分录！"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1185,7 +1182,7 @@ msgstr "含基数"
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr "项目分析"
+msgstr "分录分析"
 
 #. module: account
 #: field:account.account,level:0
@@ -1211,7 +1208,7 @@ msgstr "税"
 #: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr "选择一个开始和结束时间"
+msgstr "选择会计期间的开始和结束时间"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1226,14 +1223,14 @@ msgstr "搜索税模板"
 #. module: account
 #: report:account.invoice:0
 msgid "Your Reference"
-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
@@ -1266,12 +1263,13 @@ msgstr "报表选项"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "日记帐明细分析"
+msgstr "账簿明细分析"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr "业务伙伴列表"
+msgstr "业务伙伴"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1285,23 +1283,23 @@ msgstr "银行对账单"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account owner"
-msgstr "银行账号所有者"
+msgstr "银行帐户所有者"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "应收账"
+msgstr "应收科目"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "主要的业务类型"
+msgstr "汇总账簿"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "You can not use this general account in this journal !"
-msgstr "在这业务类型您不能用这科目！"
+msgstr "在这账簿不能用这科目！"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1310,28 +1308,38 @@ msgstr "在这业务类型您不能用这科目！"
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 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
 msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "成本科目明细分析"
 
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr "创建凭证"
+msgstr "创建分录"
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "项目"
+msgstr "# 明细"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1346,7 +1354,7 @@ msgstr "计算税"
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "数字 #"
+msgstr "# 数字"
 
 #. module: account
 #: field:account.journal,entry_posted:0
@@ -1366,17 +1374,17 @@ 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
 msgid "# of Entries "
-msgstr "号分录 "
+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
@@ -1388,16 +1396,16 @@ msgstr "供应商红字发票"
 #: view:account.payment.term.line:0
 msgid ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
-msgstr "例如：在14天内付款减百分之2，30天则没有减。"
+msgstr "例如：在14天内付款减2%，30天则没有减。"
 
 #. module: account
-#: code:addons/account/invoice.py:823
+#: 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 ""
+msgstr "无法建立发票！"
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
@@ -1418,7 +1426,7 @@ msgstr "已关闭"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr "经常性项目"
+msgstr "定期分录"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1428,7 +1436,7 @@ msgstr "财务结构模板"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr "测试税代码"
+msgstr "税编码测试"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1448,7 +1456,7 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "和业务类型"
+msgstr "和账簿"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1464,12 +1472,12 @@ 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
 #: sql_constraint:account.model.line:0
@@ -1493,7 +1501,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
@@ -1504,7 +1512,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
@@ -1516,7 +1524,7 @@ msgstr "日期/代码"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr "科目"
+msgstr "一般科目"
 
 #. module: account
 #: field:res.partner,debit_limit:0
@@ -1547,9 +1555,10 @@ 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 "负责人"
@@ -1569,17 +1578,17 @@ msgstr "销售科目类型"
 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
 msgid "Invoicing"
-msgstr ""
+msgstr "开发票"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr "税事务的根"
+msgstr "税编码的根"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -1608,7 +1617,7 @@ msgid ""
 "Display your company chart of accounts per fiscal year and filter by period. "
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
-msgstr ""
+msgstr "显示您公司每个会计年度的科目表和过滤的会计周期。点击一个科目代码都有一个所有明细的完整的树状视图。"
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -1616,10 +1625,10 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr "错误！你不能重复定义会计年度"
 
 #. module: account
-#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr "科目未设定为可核销！"
+msgstr "科目没设定为可核销！"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -1631,7 +1640,7 @@ msgstr "值"
 msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
-msgstr "如果此字段设置为False，你可以让他隐藏而不删除它的报表。"
+msgstr "如果此字段设置为False，你可以让他隐藏而不删除它。"
 
 #. module: account
 #: view:res.partner:0
@@ -1649,10 +1658,10 @@ msgid "Receivables & Payables"
 msgstr "应收&应付"
 
 #. module: account
-#: code:addons/account/account_move_line.py:806
+#: code:addons/account/account_move_line.py:815
 #, python-format
 msgid "You have to provide an account for the write off entry !"
-msgstr "必须为差异凭证指定默认借贷方科目"
+msgstr "必须为补差额凭证指定科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -1662,7 +1671,7 @@ msgstr "科目常用报表"
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "所有合作伙伴"
+msgstr "所有业务伙伴"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1672,7 +1681,7 @@ msgstr "关联单号:"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "辅助核算项目一览表"
+msgstr "辅助核算项一览表"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1685,10 +1694,10 @@ msgid "Customer Ref:"
 msgstr "客户关联:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "用户 %s 没有权限访问 %s！"
 
 #. module: account
 #: help:account.period,special:0
@@ -1706,7 +1715,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr "纳税申报：欠款"
 
 #. module: account
-#: code:addons/account/account.py:509
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr "你不能停用这科目因为它有凭证"
@@ -1722,12 +1731,12 @@ msgid "You can not create move line on closed account."
 msgstr "您不能在关闭的科目上建立分录。"
 
 #. module: account
-#: code:addons/account/account.py:529
+#: 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 "你不能改变包含\"已关闭\"科目类型的凭证!"
+msgstr "您不能修改包含\"已关闭\"科目类型的分录!"
 
 #. module: account
 #: view:res.company:0
@@ -1744,7 +1753,7 @@ msgstr "错误的出纳会计分录"
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr "开票分析"
+msgstr "发票分析"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -1754,12 +1763,12 @@ msgstr "关闭一个会计期间"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr "配置会计年度"
+msgstr "设置会计年度"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr "进行中的项目"
+msgstr "按明细"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -1770,7 +1779,7 @@ msgstr "A/c编码"
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "分类账"
+msgstr "账簿的分录"
 
 #. module: account
 #: view:account.tax:0
@@ -1785,23 +1794,23 @@ msgstr "小计"
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr "出纳报表"
+msgstr "出纳分析"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "错误！您不能创建循环的公司。"
+msgstr "错误！您不能创建递归公司."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:332
 #, 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
@@ -1813,7 +1822,7 @@ 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
@@ -1833,13 +1842,13 @@ msgstr "损益类科目"
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Closing balance based on Starting Balance and Cash Transactions"
-msgstr "关闭现金交易，出纳对帐"
+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 "比较会计和支付项目"
+msgstr "比较会计和支付项"
 
 #. module: account
 #: view:account.tax:0
@@ -1852,7 +1861,7 @@ msgstr "税定义"
 msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
-msgstr "勾选此项, 如果你想每个新建的业务类型使用不同的序列. 否则将使用同一序列"
+msgstr "勾选此项, 如果您想每个新建的分录使用不同的序列， 否则将使用同一序列。"
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1860,19 +1869,19 @@ 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 ""
+msgstr "如果设为True当分录的日期不在会计周期内，将不接受这分录"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
 msgid "Account Profit And Loss"
-msgstr "帐户盈亏"
+msgstr "科目盈亏"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1897,7 +1906,7 @@ msgstr "未完税金额"
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr "如果此字段设置为False，你可以让他隐藏而不删除它的税表。"
+msgstr "如果此字段设为False，您可以隐藏而不删除这税。"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1905,19 +1914,19 @@ 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 ""
+msgstr "如果您指定其它名称，它创建的凭证或分录将用报表名相同的名称。这使得报表它自己关联相似的分录。"
 
 #. 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 "反核销凭证"
+msgstr "反核销分录"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "部分凭证行"
+msgstr "部分分录行"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -1928,7 +1937,7 @@ msgstr "会计年度"
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr "打开凭证"
+msgstr "打开分录"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -1938,12 +1947,12 @@ 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
 msgid "Import from invoice"
-msgstr "进口发票"
+msgstr "导入发票"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1952,17 +1961,17 @@ msgstr "进口发票"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "复核"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr "本财年"
+msgstr "本会计年度"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -1974,7 +1983,7 @@ msgstr "纳税明细表"
 msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
-msgstr "无效会计期间！一些会计期间重复或者会计期间不在这会计年度中 "
+msgstr "无效会计期间！会计期间重复或者会计期间不在这会计年度中 "
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -1988,15 +1997,15 @@ msgstr "形式发票"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr " 日记帐"
+msgstr " 账簿"
 
 #. module: account
-#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "在 \"%s\" 没设定默认借方的科目"
 
 #. module: account
 #: help:account.account,type:0
@@ -2008,12 +2017,12 @@ msgid ""
 "accounts for multi-company consolidations, payable/receivable are for "
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
-msgstr ""
+msgstr "这类型用来区分特殊结果：视图不能有分录，多公司合并的科目可以有子科目，应收/应付是业务伙伴的科目(计算借方/贷方)。关闭折旧科目。"
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
-msgstr "搜索图表科目模板"
+msgid "Search Chart of Accounts Templates"
+msgstr "搜索科目一览表模板"
 
 #. module: account
 #: view:account.installer:0
@@ -2021,7 +2030,7 @@ msgid ""
 "The default Chart of Accounts is matching your country selection. If no "
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
-msgstr ""
+msgstr "默认的会计科目表和您所选的国家匹配。 如果您所选的国家没有认证的会计科目表，系统默认会为您选择及安装一般的会计科目表。"
 
 #. module: account
 #: view:account.account.type:0
@@ -2043,30 +2052,30 @@ msgid "Description"
 msgstr "说明"
 
 #. module: account
-#: code:addons/account/account.py:2888
+#: code:addons/account/account.py:2844
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr "运行中"
+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 "收入科目"
+msgstr "收益科目"
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:352
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "没定义销售/采购业务类型!"
+msgstr "没定义销售/采购 的账簿!"
 
 #. module: account
 #: view:product.category:0
@@ -2074,11 +2083,12 @@ msgid "Accounting Properties"
 msgstr "会计属性"
 
 #. module: account
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Entries Sorted By"
-msgstr "凭证排序按"
+msgstr "分录排序按"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
@@ -2088,7 +2098,7 @@ msgstr "更改为"
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr "产品数量 "
+msgstr "# 产品数量 "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
@@ -2098,12 +2108,16 @@ msgstr "产品模板"
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal: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.partner.balance:0
@@ -2171,7 +2185,7 @@ msgstr "勾选此项"
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr "过滤"
+msgstr "筛选"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2186,7 +2200,7 @@ msgstr "过滤"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr "待处理"
+msgstr "打开"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -2198,7 +2212,7 @@ msgstr "草稿状态的发票"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr "勾选, 如果用户可以在这科目核销凭证."
+msgstr "勾选， 如果用户可以在这科目核销分录。"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2209,10 +2223,10 @@ msgstr "往来业务核销"
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "税事务科目"
+msgstr "税编码"
 
 #. module: account
-#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:545
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2220,17 +2234,20 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"无法找到这类型 %s  的账簿。\n"
+"\n"
+"您可以在 设置/财务会计/科目/账簿 里设置"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "基础税事务代码"
+msgstr "税基编码"
 
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr "按顺序显示发票税列表."
+msgstr "指定发票税列表的序列。"
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2238,7 +2255,7 @@ msgstr "按顺序显示发票税列表."
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "基础税事务符号"
+msgstr "税基符号"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2250,6 +2267,8 @@ 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 ""
+"这菜单打印发票或付款申报的增值税。选择这会计年度里的一个或几个会计周期。系统从发票(或付款)自动生成申报的税的信息。在一些国家这需要实时更新，这非常重要因"
+"为这使您可以在月底或月头看到您所欠的税。"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2260,7 +2279,7 @@ msgstr "借方汇总"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr "草案确认发票"
+msgstr "确认发票草稿"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2282,7 +2301,7 @@ msgid "Account Model Entries"
 msgstr "凭证模板"
 
 #. module: account
-#: code:addons/account/account.py:2840
+#: code:addons/account/account.py:2796
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
@@ -2302,7 +2321,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
@@ -2313,7 +2332,7 @@ msgstr "选择会计期间"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr "描述"
+msgstr "报表"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2325,13 +2344,13 @@ msgstr "凭证名称"
 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
 #: constraint:product.category:0
@@ -2343,7 +2362,7 @@ msgstr "错误!你不能创建递归的类型."
 #: 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
@@ -2354,7 +2373,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
@@ -2368,7 +2387,7 @@ msgid "Accounts"
 msgstr "科目"
 
 #. module: account
-#: code:addons/account/invoice.py:350
+#: code:addons/account/invoice.py:351
 #, python-format
 msgid "Configuration Error!"
 msgstr "设置错误!"
@@ -2380,17 +2399,18 @@ msgid "Average Price"
 msgstr "平均价格"
 
 #. module: account
+#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
 msgstr "日期:"
 
 #. module: account
-#: code:addons/account/account.py:654
+#: 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 ""
+msgstr "您不能修改这账簿与它相关的分录。"
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -2412,7 +2432,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
@@ -2427,12 +2447,12 @@ msgstr "折扣(%)"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr "关联单号"
+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 "该科目可以是一个基本的税法或税法帐户。（如营业税）"
+msgstr "这科目可以是一个税基编码或税编码的科目。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2448,19 +2468,19 @@ msgstr "已付/已核销"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-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
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr "真"
+msgstr "True"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2474,21 +2494,21 @@ msgstr "日期"
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "上级税科目"
+msgstr "父税科目"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
-msgstr "自动生成以这之前的预约项目."
+msgstr "系统在指定日期前自动生成分录。"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "账龄分析表"
+msgstr "业务伙伴以前的余额表"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -2510,6 +2530,8 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"勾选，如果您不想新的分录跳过“草稿”状态直接到“已登账”状态，中间无需手动审核。\n"
+"注意系统自动创建的分录总是跳过这状态。"
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -2527,30 +2549,30 @@ 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:1195
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr "在日记帐中没有定义的序列！"
+msgstr "没定义账簿的序列！"
 
 #. module: account
-#: code:addons/account/account.py:2097
+#: code:addons/account/account.py:2083
 #: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
+#: code:addons/account/account_move_line.py:170
+#: code:addons/account/invoice.py:670
 #: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "你必须定义这'%s' 辅助核算类型！"
+msgstr "您必须定义这 '%s' 的辅助核算账簿！"
 
 #. module: account
 #: view:account.invoice.tax:0
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr "税事务"
+msgstr "税编码"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -2572,7 +2594,7 @@ msgstr "会计期间到"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr "8月"
+msgstr "8"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:306
@@ -2585,7 +2607,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "核销的第二个输入项是付款分录"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2604,14 +2626,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
@@ -2633,23 +2655,23 @@ msgstr "费用科目"
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr "留空使用审核（发票）日期的会计期间"
+msgstr "留空使用复核(发票)日期的会计期间"
 
 #. module: account
 #: 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
 msgid "Base Code Amount"
-msgstr "基础税事务代码的金额"
+msgstr "税基金额"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "默认销项税"
+msgstr "默认销售税"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2657,7 +2679,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
@@ -2667,6 +2689,8 @@ 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
 msgid "Profit And Loss"
 msgstr "盈利或亏损"
 
@@ -2690,16 +2714,16 @@ msgstr "财务结构"
 msgid ""
 "It adds initial balance row on report which display previous sum amount of "
 "debit/credit/balance"
-msgstr ""
+msgstr "报表它增加期初余额(显示以前的借方/贷方/余额的合计金额)"
 
 #. module: account
 #: view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 msgid "Analytic Entries"
-msgstr "辅助核算凭证"
+msgstr "辅助核算记录"
 
 #. module: account
-#: code:addons/account/account.py:836
+#: code:addons/account/account.py:822
 #, python-format
 msgid ""
 "No fiscal year defined for this date !\n"
@@ -2721,22 +2745,22 @@ msgstr "客户发票"
 msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
-msgstr "如果这税额必须在计算下一个税的基础金额里, 请设置"
+msgstr "如果在计算未来的税前这税额必须包含在税基金额里，请设置"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "这用户负责这业务类型"
+msgstr "这用户负责这账簿"
 
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr "搜寻时期"
+msgstr "搜寻会计周期"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr "货币种类"
+msgstr "发票币别"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2787,12 +2811,12 @@ msgstr "搜索会计年度"
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "总是"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr "合计数量"
+msgstr "总数量"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -2825,16 +2849,16 @@ msgid "BNK%s"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2950
+#: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
-msgstr "银行"
+msgstr "BNK"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 msgid "Analytic lines"
-msgstr "辅助核算行"
+msgstr "辅助核算明细"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -2849,47 +2873,47 @@ msgstr "客户信用"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "税事务模板"
+msgstr "税编码模板"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr "开始"
+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
 msgid "Gives the sequence order to journal column."
-msgstr "给日记帐排序号"
+msgstr "指定账簿的序列"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr "税说明"
+msgstr "税申报单"
 
 #. module: account
 #: help:account.account,currency_id:0
 #: 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 "将此科目的所有发生都转移到他的二级科目。"
+msgstr "强制将这科目的所有凭证转为第二币别。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
 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
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr "科目表模板"
+msgstr "科目一览表模板"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -2914,12 +2938,17 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"在这设定科目年终结转时产生分录的方法\n"
+"    'None'  不做结转\n"
+"    'Balance'  年末余额转到下年\n"
+"    'Detail'  把该科目上年的所有分录明细带入下年，即使已对账\n"
+"    'Unreconciled'  把该科目未对账分录明细带入下年"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "为使用费用科目而留空"
+msgstr "留空使用这费用科目"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -2934,9 +2963,7 @@ msgstr "为使用费用科目而留空"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2950,19 +2977,30 @@ msgstr "为使用费用科目而留空"
 #: 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 "业务类型"
+msgstr "账簿"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr "剩下的合作伙伴"
+msgstr "业务伙伴剩余的"
 
 #. module: account
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr "周期性凭证明细"
+msgstr "周期性分录明细"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -2981,7 +3019,7 @@ msgstr "采购"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr "会计应用程序配置"
+msgstr "会计应用程序设置"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -2992,10 +3030,10 @@ msgstr "会计控制台"
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr "开始余额"
+msgstr "期初余额"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "No Partner Defined !"
 msgstr "未定义业务伙伴！"
@@ -3015,14 +3053,14 @@ msgstr "科目留空？ "
 #. module: account
 #: report:account.overdue:0
 msgid "VAT:"
-msgstr "增值税"
+msgstr "增值税:"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr "如果不是同一公司, 这金额表示相关项的货币"
+msgstr "如果不是同一公司, 这金额表示相关科目的币别。"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -3037,6 +3075,7 @@ msgstr "账簿："
 #: 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
@@ -3046,7 +3085,7 @@ msgstr "草稿"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr "会计图表配置"
+msgstr "科目一览表设置"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3058,12 +3097,12 @@ msgstr "不打印在发票上"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr "税表"
+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
@@ -3085,10 +3124,10 @@ msgstr "授权的签字人"
 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
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "无法删除未结或已付款的发票！"
@@ -3106,12 +3145,12 @@ msgstr "转移"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: n.a"
-msgstr ""
+msgstr "  金额：NA"
 
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3121,18 +3160,18 @@ msgstr "税金额"
 #. module: account
 #: view:account.installer:0
 msgid "Your bank and cash accounts"
-msgstr "你的科目和现金科目"
+msgstr "您银行和和现金科目"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr "移动搜索"
+msgstr "搜索凭证"
 
 #. module: account
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "税事务名称"
+msgstr "税名称"
 
 #. module: account
 #: report:account.invoice:0
@@ -3146,15 +3185,15 @@ msgstr "发票草稿"
 msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
-msgstr "选择的发票不能被取消，因为它们已“取消”或“完成”状态了！"
+msgstr "选择的发票不能被取消，因为它们已“取消”或“完成”！"
 
 #. module: account
-#: code:addons/account/account.py:532
+#: 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!"
-msgstr "你不能修改这会计类型从'%s'  到 '%s' 因为它含有凭证"
+msgstr "您不能修改这科目类型从'%s'  到 '%s' 因为它含有分录"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -3165,7 +3204,7 @@ msgstr "对方"
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr "进销存数据"
+msgstr "发票数据"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3205,7 +3244,7 @@ msgstr "详情"
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr "您的银行及现金帐户"
+msgstr "您的银行及现金科目"
 
 #. module: account
 #: report:account.invoice:0
@@ -3217,13 +3256,23 @@ msgstr "增值税 :"
 #: 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.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 "Chart of Accounts"
-msgstr "科目表"
+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
@@ -3233,7 +3282,7 @@ msgstr "汇总副本"
 #. 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
@@ -3243,7 +3292,7 @@ msgstr "2"
 #. module: account
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr "如果你不选择会计年度将使用所有开启的会计年度"
+msgstr "如果您不选择会计年度将使用所有开启的会计年度"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3261,7 +3310,6 @@ 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
 #: view:account.move:0
@@ -3297,35 +3345,37 @@ msgstr "反核销"
 #: code:addons/account/wizard/account_fiscalyear_close.py:79
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr "这业务类型必须要有默认贷方和借方科目"
+msgstr "这账簿必须要有默认贷方和借方科目"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "科目表模板"
+msgstr "科目一览表模板"
 
 #. module: account
-#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2095
 #, 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"
+"请在业务伙伴里定义它"
 
 #. module: account
-#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:810
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "部分凭证已核销！"
+msgstr "部分分录已核销！"
 
 #. module: account
-#: code:addons/account/account.py:1218
+#: 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 ""
+msgstr "您不能生效该账簿的分录，除非所有账簿的明细用用同一科目表。"
 
 #. module: account
 #: view:account.tax:0
@@ -3354,7 +3404,7 @@ msgstr "预算"
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr "无过滤器"
+msgstr "无筛选"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3364,7 +3414,7 @@ msgstr "状况"
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3372,7 +3422,7 @@ msgstr "历史记录"
 msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
-msgstr "如果不适用(计算是通过python代码), 税将不显示在发票上"
+msgstr "如果没适用的 (计算通过python代码)， 税将不显示在发票上。"
 
 #. module: account
 #: view:account.tax:0
@@ -3389,28 +3439,28 @@ msgstr "数量"
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "联系地址"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr "有争议"
+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
 #: constraint:account.move:0
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
-msgstr ""
+msgstr "您不能创建凭证的会计期间与账簿不同的分录"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3421,7 +3471,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
@@ -3437,10 +3487,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:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "Unable to change tax !"
 msgstr "无法更改税目!"
@@ -3448,17 +3498,17 @@ msgstr "无法更改税目!"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "# 项"
 
 #. module: account
-#: code:addons/account/invoice.py:1437
+#: code:addons/account/invoice.py:1422
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "您选择的计量单位不适合本产品。"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #, python-format
 msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3468,17 +3518,17 @@ msgstr "该供应商的 付款方式未定义（计算）付款方式明细！"
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr "打开发票"
+msgstr "未结发票"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "税率"
 
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "图表"
 
 #. module: account
 #: field:account.account,name:0
@@ -3496,7 +3546,7 @@ msgstr "名称"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr "账龄试算平衡表"
+msgstr "过期的试算表"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3512,7 +3562,7 @@ msgstr "标准编码"
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "辅助核算账簿"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -3532,12 +3582,12 @@ msgstr "会计"
 msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
-msgstr ""
+msgstr "如果打印货币与报表的货币是不同的,那么使用公司的货币"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "一般会计"
 
 #. module: account
 #: report:account.overdue:0
@@ -3551,14 +3601,14 @@ 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
 #: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: account
 #: view:account.invoice:0
@@ -3570,7 +3620,7 @@ msgstr "设为草稿"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "明细"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
@@ -3580,12 +3630,12 @@ msgstr "显示业务伙伴"
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr "审核"
+msgstr "使其生效"
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
-msgstr ""
+msgstr "错误的信用卡或借记卡模型 (信用卡或借记卡必须为\"0\")!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3593,12 +3643,12 @@ 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.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "确认发票"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3628,7 +3678,7 @@ msgstr "(如果你想打开它发票要反核销)"
 #: field:account.report.general.ledger,period_from:0
 #: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "开始期间"
 
 #. module: account
 #: field:account.tax,name:0
@@ -3656,30 +3706,29 @@ msgid "Analytic Balance"
 msgstr "辅助核算余额"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
-msgstr ""
+msgstr "净亏损"
 
 #. module: account
 #: help:account.account,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
-msgstr ""
+msgstr "如果活动字段设置为False，您将可以隐藏它而不在科目删除它。"
 
 #. 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
 msgid "Draft Entries"
-msgstr ""
+msgstr "草案项"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3708,12 +3757,12 @@ msgstr "类型"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "试算平衡"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "取消选定的发票"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3721,7 +3770,7 @@ msgstr ""
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
-msgstr ""
+msgstr "此科目将用当前产品分类的销售价格为出库价格"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3733,26 +3782,26 @@ msgstr "3"
 msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
-msgstr ""
+msgstr "（时间表，一些采购产品，... ...）分析成本来辅助核算项。用来产生供应商发票草稿。"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "关闭出纳账"
 
 #. module: account
 #: 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
 msgid "Acc.Type"
-msgstr ""
+msgstr "科目类型"
 
 #. module: account
-#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:714
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr "已定义通用税目， 但未在发票行中出现！"
@@ -3771,7 +3820,7 @@ msgstr "月份"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: account
 #: field:account.account,note:0
@@ -3782,7 +3831,7 @@ msgstr "备注"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "逾期科目"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -3798,7 +3847,7 @@ msgstr "税明细"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "税基编码"
 
 #. module: account
 #: help:account.move,state:0
@@ -3809,12 +3858,14 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"所有手工创建的分录一般都是“未过账”状态，但你可以在相应的账簿上设置跳过此状态。就像从其他单据（发票、银行单据）生成的会计分录一样，这个账簿中手工建立的分"
+"录也可以在新建时就是“已过账”状态。"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "未定义此产品“%s“ (id:%d)的费用科目"
 
 #. module: account
 #: view:res.partner:0
@@ -3854,12 +3905,12 @@ msgstr "所有已登账凭证"
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "银行对账单 %s 确认，创建账簿里的明细。"
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "错误！本年度的期间设置是无效的 "
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -3874,18 +3925,18 @@ msgstr "检查,如果你想显示平衡科目"
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "计算代码"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "默认税"
 
 #. module: account
 #: code:addons/account/invoice.py:88
 #, python-format
 msgid "Free Reference"
-msgstr "无限制的关联单号"
+msgstr "无限制的单号"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -3898,26 +3949,28 @@ 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"
+"当所有付款都完成了就是已审核状态"
 
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "显示模式"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "发票或付款清单"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month: 0"
-msgstr ""
+msgstr "  天数:0"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "科目一览表"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -3929,23 +3982,23 @@ 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
 msgid "Invoices Statistics"
-msgstr ""
+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
 #: field:account.model.line,date_maturity:0
@@ -3968,25 +4021,25 @@ msgstr "期终结余"
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "未实现"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "选择账簿"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "打印发票"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "退还"
+msgstr "欠款单据"
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
@@ -3995,22 +4048,22 @@ msgstr "无法找到有效的会计期间！"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Voucher No"
-msgstr "原始凭证编号"
+msgstr "手工单据编号"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "反核销业务"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr "按模型创建凭证"
+msgstr "按模型创建分录"
 
 #. module: account
 #: field:account.account.template,reconcile:0
@@ -4020,14 +4073,14 @@ msgstr "允许核销"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr "辅助核算项目统计"
+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"
-msgstr "将根据选择的模板自动设置你的科目一览表、银行账号、税和业务类型"
+msgstr "将根据选择的模板自动设置您的科目表、银行帐号、账簿"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4038,13 +4091,13 @@ 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
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "定期模型"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4057,11 +4110,11 @@ msgid "Change"
 msgstr "改变"
 
 #. module: account
-#: code:addons/account/account.py:1304
-#: code:addons/account/account.py:1332
-#: code:addons/account/account.py:1339
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/invoice.py:904
+#: 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
@@ -4080,12 +4133,12 @@ msgstr "类型控制"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "它将充当默认帐户的信贷数额"
 
 #. module: account
 #: help:account.partner.ledger,reconcil:0
 msgid "Consider reconciled entries"
-msgstr ""
+msgstr "作为核销分录"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4093,7 +4146,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
@@ -4105,13 +4158,13 @@ msgstr "已取消"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "钱箱额"
 
 #. module: account
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "错误!你不能创建递归的科目"
+msgstr "错误!您不能创建递归的科目"
 
 #. module: account
 #: constraint:account.account:0
@@ -4125,19 +4178,19 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "生成分录"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+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 "科目一览"
+msgstr "科目一览表"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -4151,27 +4204,27 @@ msgstr "客户"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "已确认"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "已取消的发票"
 
 #. module: account
 #: code:addons/account/invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s' !"
-msgstr "您必须定义这辅助核算类型'%s' !"
+msgstr "您必须定义这辅助核算账簿类型'%s' !"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1397
 #, 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 ""
+msgstr "凭证创建出错。当前货币与科目适用的外币\"%s - %s\"不一致。如果您希望该科目可以交易多种货币，请清空科目上的外币字段。"
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4182,14 +4235,14 @@ msgstr "操作日期"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "退税事务"
+msgstr "退税编码"
 
 #. module: account
 #: view:validate.account.move:0
 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
 #: report:account.account.balance.landscape:0
@@ -4199,7 +4252,7 @@ msgstr "科目余额 -"
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -4210,7 +4263,7 @@ msgstr "产品模板的收入科目"
 #: 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
@@ -4230,7 +4283,7 @@ msgid "Invoices"
 msgstr "发票列表"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4243,12 +4296,12 @@ msgstr "请验证发票金额！实际合计金额与计算金额不符。"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "销售人员"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "已开票"
 
 #. module: account
 #: view:account.use.model:0
@@ -4268,7 +4321,7 @@ msgstr "税说明中的税基"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "添加"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4278,7 +4331,7 @@ msgstr "留空使用当前日期"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr ""
+msgstr "银行和支票"
 
 #. module: account
 #: view:account.period.close:0
@@ -4293,7 +4346,7 @@ msgstr "这银行对账单用于对账"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "发票草稿已生效。 "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4329,37 +4382,38 @@ msgstr "税适用"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "账簿明细"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgid "Balance Sheet (Asset Accounts)"
+msgstr "资产负债表（资产科目）"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Third Party (Country)"
-msgstr ""
+msgstr "第三方（国家）"
 
 #. module: account
-#: code:addons/account/account.py:952
-#: code:addons/account/account.py:954
-#: code:addons/account/account.py:1195
-#: code:addons/account/account.py:1407
-#: code:addons/account/account.py:1411
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:771
-#: code:addons/account/account_move_line.py:794
-#: code:addons/account/account_move_line.py:796
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:801
-#: code:addons/account/account_move_line.py:1123
+#: 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/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_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_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
 #, python-format
@@ -4381,7 +4435,7 @@ msgid "Bank Details"
 msgstr "银行信息"
 
 #. module: account
-#: code:addons/account/invoice.py:728
+#: code:addons/account/invoice.py:720
 #, python-format
 msgid "Taxes missing !"
 msgstr "缺少税目！"
@@ -4391,22 +4445,22 @@ 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
 #: help:account.journal,refund_journal:0
 msgid "Fill this if the journal is to be used for refunds of invoices."
-msgstr ""
+msgstr "如果红字发票用这账簿 请填上。"
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "生成会计年度开账凭证"
+msgstr "生成会计年度开账分录"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "发票明细"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -4423,28 +4477,28 @@ msgstr "凭证"
 #: 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 ""
+msgstr "科目复原申明"
 
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "将关闭"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr ""
+msgstr "检查日期在不在会计期间内"
 
 #. module: account
-#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:1210
 #, 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
@@ -4457,10 +4511,10 @@ msgid "Child Tax Accounts"
 msgstr "子税科目"
 
 #. module: account
-#: code:addons/account/account.py:954
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "开始日期应小于会计期间的结束日期"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4473,7 +4527,6 @@ msgid "Analytic Balance -"
 msgstr "辅助核算余额 -"
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4486,11 +4539,8 @@ msgstr "辅助核算余额 -"
 #: 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
 #: 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
@@ -4500,6 +4550,16 @@ msgstr "辅助核算余额 -"
 #: 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
 msgid "Target Moves"
 msgstr "目标"
 
@@ -4518,7 +4578,7 @@ msgstr "付款"
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "逆向计算代码"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -4546,7 +4606,7 @@ msgstr "列名称"
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr ""
+msgstr "这份报表给出您生成的分录序时薄的概述"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4557,20 +4617,20 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "开启的钱箱"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr ""
+msgstr "第一行"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr "完整性错误！"
@@ -4589,7 +4649,7 @@ msgstr "月"
 #: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "账簿明细 \"%s\" 是无效的"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4599,7 +4659,7 @@ msgstr "发票说明"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "核销下一个业务伙伴"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4616,13 +4676,15 @@ msgstr "核销结果"
 #: 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
 msgid "Balance Sheet"
-msgstr ""
+msgstr "资产负债表"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "会计报表"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4635,7 +4697,7 @@ msgstr "凭证"
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "这个会计期间"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -4684,7 +4746,7 @@ msgstr "金额"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "会计年度结束凭证"
+msgstr "会计年度结账分录"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4694,14 +4756,14 @@ msgstr "会计年度结束凭证"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "复核"
 
 #. module: account
 #: help:account.invoice,reconciled:0
 msgid ""
 "The Journal Entry of the invoice have been totally reconciled with one or "
 "several Journal Entries of payment."
-msgstr ""
+msgstr "此发票的分录已被一个或几个付款项的分录完全核销。"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -4716,21 +4778,21 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2081
+#: code:addons/account/account.py:2067
 #: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
-msgstr "没找到期间!"
+msgstr "没找到会计期间!"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr "允许取消凭证"
+msgstr "允许取消分录"
 
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "父税的系数"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -4740,7 +4802,7 @@ msgstr "(业务伙伴/科目)名称"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "交易"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4757,28 +4819,28 @@ msgstr "申报增值税使用的代码"
 #. module: account
 #: view:account.move.line:0
 msgid "Debit/Credit"
-msgstr ""
+msgstr "借/贷"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr "辅助核算凭证统计"
+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 "税事务模板"
+msgstr "税编码模板"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr ""
+msgstr "account.installer"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "包含在基础金额里"
+msgstr "包含在税基的金额里"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -4788,17 +4850,17 @@ msgid ""
 msgstr "在计算前加入的天数, 如日期为01/15, 天数是22, 月天数为-1,则应付日期是02/28。"
 
 #. module: account
-#: code:addons/account/account.py:2940
+#: code:addons/account/account.py:2896
 #: code:addons/account/installer.py:283
 #: code:addons/account/installer.py:295
 #, python-format
 msgid "Bank Journal "
-msgstr "银行业务类型 "
+msgstr "银行日记账 "
 
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr "凭证控制"
+msgstr "分录控制"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -4813,25 +4875,25 @@ msgstr "(当前状态留空为待处理)"
 #: field:account.analytic.cost.ledger.journal.report,date1:0
 #: field:account.analytic.inverted.balance,date1:0
 msgid "Start of period"
-msgstr "开始会计期间"
+msgstr "期初日期"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1199
+#: 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 "您不能在已核销的凭证做此修改！您只能修改一些非重要字段！"
+msgstr "您不能在已核销的分录做此修改！您只能修改一些非重要字段！"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "科目合并的科目报表"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "沟通"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -4858,7 +4920,7 @@ msgstr "默认税"
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr "税事务的符号(1为正数)"
+msgstr "税编码符号(1为正数)"
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
@@ -4868,16 +4930,16 @@ msgstr "最近15天创建发票的报表"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "结束会计年度业务类型"
+msgstr "账簿的结账分录"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
+#: 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/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -4889,17 +4951,17 @@ 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
 msgid "Subscription lines"
-msgstr "周期性凭证行"
+msgstr "周期性分录明细"
 
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "产品数量"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4908,25 +4970,25 @@ msgstr ""
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr ""
+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 ""
+msgstr "更改币别"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr ""
+msgstr "会计分录。"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "付款日期"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4939,34 +5001,34 @@ msgstr "6"
 #: model:ir.actions.act_window,name:account.action_analytic_open
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. 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 ""
+msgstr "资产负债表损益表"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort By"
-msgstr ""
+msgstr "排序方式"
 
 #. module: account
-#: code:addons/account/account.py:1340
+#: code:addons/account/account.py:1326
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "\"%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 "外币金额"
+msgstr "金额"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -4974,12 +5036,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
@@ -4999,19 +5061,19 @@ msgstr "数量"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+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
@@ -5041,6 +5103,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
@@ -5055,7 +5118,7 @@ msgstr "币别"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr ""
+msgstr "打开钱箱"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5071,40 +5134,40 @@ msgstr "固定金额"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "有效期至"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+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
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr ""
+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
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "产生开启分录"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:738
 #, python-format
 msgid "Already Reconciled!"
-msgstr ""
+msgstr "已核销！"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5116,7 +5179,7 @@ msgstr "税金的计算方法"
 msgid ""
 "This module will support the Anglo-Saxons accounting methodology by changing "
 "the accounting logic with stock transactions."
-msgstr ""
+msgstr "此模块实现了英国会计方法，改变库存业务的过账规则。"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5128,7 +5191,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
@@ -5137,7 +5200,7 @@ msgstr "子科目"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:821
+#: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Write-Off"
 msgstr "补差额"
@@ -5168,7 +5231,7 @@ msgstr "供应商"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: view:account.account.template:0
@@ -5185,12 +5248,12 @@ msgstr "科目编码"
 msgid ""
 "Streamlines invoice payment and creates hooks to plug automated payment "
 "systems in."
-msgstr ""
+msgstr "简化发票的付款，并在系统里创建挂钩的自动付款。"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "定价"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5205,13 +5268,13 @@ msgstr "应收款与应付款科目"
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr ""
+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 ""
+msgstr "科目状态打开"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5234,7 +5297,7 @@ msgid ""
 "From this view, have an analysis of your different financial accounts. The "
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
-msgstr ""
+msgstr "在这个界面上，你可以对不同的科目做分析。按照您输入的条件出具报表显示这些科目的借贷方发生额。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5242,14 +5305,14 @@ msgid ""
 "The tax code definition depends on the tax declaration of your country. "
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
-msgstr ""
+msgstr "税编码基于你所在国家的税务制度定义。OpenERP允许用这个菜单定义税收结构和管理它。税编码可由含数字和字母组成。"
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
 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
@@ -5257,7 +5320,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
@@ -5271,13 +5334,13 @@ msgstr "强制会计期间"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# 明细"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "新币种配置不正确"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5296,20 +5359,20 @@ msgstr ""
 #: field:account.report.general.ledger,filter:0
 #: field:account.vat.declaration,filter:0
 msgid "Filter by"
-msgstr ""
+msgstr "筛选"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "您不能使用一个停用的科目！"
 
 #. module: account
-#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
-msgstr "不同科目或已核算的凭证！ "
+msgstr "不同科目或已核销的分录！ "
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -5321,13 +5384,26 @@ 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
 #: 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 "不过滤"
+msgstr "不筛选"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -5341,7 +5417,7 @@ msgstr "7"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "Invalid action !"
 msgstr "无效动作！"
@@ -5350,12 +5426,12 @@ msgstr "无效动作！"
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr ""
+msgstr "会计期间:%s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "税务的模板"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5378,7 +5454,7 @@ msgstr "无"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 日  "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -5389,28 +5465,28 @@ msgstr "客户红字发票"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "计算金额"
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "业务类型 - 会计期间名称"
+msgstr "账簿 - 会计期间名称"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr ""
+msgstr "税率"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "尚未实现"
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "公司设定的账簿"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5418,7 +5494,7 @@ msgstr ""
 msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
-msgstr ""
+msgstr "选定的发票不能被确认，因为它们是在“草稿”或“参考”状态！"
 
 #. module: account
 #: report:account.invoice:0
@@ -5430,7 +5506,7 @@ msgstr "财务状况备注:"
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "辅助核算分析"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -5440,7 +5516,7 @@ msgstr "过去"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "辅助核算凭证"
+msgstr "辅助核算记录"
 
 #. module: account
 #: view:res.company:0
@@ -5455,12 +5531,12 @@ 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 ""
+msgstr "这个界面用于会计快速输入凭证。如果需要记录供应商发票，先输入费用行，OpenERP会自动生成对应的税行和应付账款行。"
 
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "创建时间"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -5472,7 +5548,7 @@ msgstr "金额"
 msgid ""
 "The code will be used to generate the numbers of the journal entries of this "
 "journal."
-msgstr ""
+msgstr "该代码将用于在账簿里生成里分录的序号。"
 
 #. module: account
 #: view:account.invoice:0
@@ -5484,7 +5560,7 @@ msgstr "(留空使用当前会计期间)"
 msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
-msgstr ""
+msgstr "核销一旦完成，这发票的状态就马上改为“完成”。在系统里也就是已支付。"
 
 #. module: account
 #: code:addons/account/invoice.py:997
@@ -5501,12 +5577,12 @@ msgstr "根科目"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "最近的核销日期"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "辅助核算明细"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -5516,18 +5592,18 @@ msgstr "客户税"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "基于此模板创建科目"
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "报告设置"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "公司相关的科目必须和会计期间一致。"
 
 #. module: account
 #: field:account.tax,type:0
@@ -5544,30 +5620,30 @@ msgstr "科目模板"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "纳税申请表"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: account
-#: code:addons/account/account.py:546
+#: code:addons/account/account.py:532
 #, python-format
 msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
 "Lines"
-msgstr ""
+msgstr "您不能修改此科目，因为它现在还有分录"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "关闭一个会计年度"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 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
@@ -5602,7 +5678,7 @@ msgstr "会计年度"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr "部分核销凭证"
+msgstr "部分相关的核销分录"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5672,27 +5748,27 @@ msgstr "默认贷方科目"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "配置您的会计图表"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 30"
-msgstr ""
+msgstr "  天数:30"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "如果不是同一公司, 相关科目的币别"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr ""
+msgstr "钱箱"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -5702,7 +5778,7 @@ msgstr "百分比"
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "账簿 & 业务伙伴"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -5712,7 +5788,7 @@ msgstr "强制"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr ""
+msgstr "红字发票类型"
 
 #. module: account
 #: report:account.invoice:0
@@ -5727,7 +5803,7 @@ msgstr "辅助核算明细视图"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Liability Accounts)"
-msgstr ""
+msgstr "资产负债表（负债账户）"
 
 #. module: account
 #: field:account.invoice,internal_number:0
@@ -5740,12 +5816,12 @@ msgstr "发票号"
 msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
-msgstr ""
+msgstr "标识在计算上一层税的时候是否把本层已计算出来的税额加到税基里"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "核销：转到下一个业务伙伴"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -5762,7 +5838,7 @@ msgstr "适用类型"
 #: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr "发票关联"
+msgstr "发票"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -5777,13 +5853,13 @@ msgstr "序列字段用于税从低到高排序, 如果税中有子税这排序
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "流动资金"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "辅助核算明细"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -5791,12 +5867,12 @@ 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
 msgid "Bank and Cash"
-msgstr ""
+msgstr "银行和现金"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -5805,31 +5881,31 @@ msgid ""
 "following the analytic account you defined matching your business need. Use "
 "the tool search to analyse information about analytic entries generated in "
 "the system."
-msgstr ""
+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
 msgid "Optional create"
-msgstr ""
+msgstr "非强制创建"
 
 #. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
+#: 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 ""
+msgstr "无法找到这家公司的科目一览表，请创建科目。"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "输入开始日期"
 
 #. module: account
 #: report:account.invoice:0
@@ -5842,7 +5918,7 @@ msgstr "供应商红字发票"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
 msgid "Dashboard"
-msgstr ""
+msgstr "控制台"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -5857,7 +5933,7 @@ msgstr "汇总"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "从科目模版，生成您的科目一览表"
 
 #. module: account
 #: view:account.account:0
@@ -5879,7 +5955,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
@@ -5889,7 +5965,7 @@ msgstr "只读"
 #. module: account
 #: model:ir.model,name:account.model_account_pl_report
 msgid "Account Profit And Loss Report"
-msgstr ""
+msgstr "会计盈亏报表"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -5906,7 +5982,7 @@ msgstr "付款方式明细中百分比在0和1之间，如：2%为0.02 "
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr "科目.序列.会计年度"
+msgstr "account.sequence.fiscalyear"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -5917,12 +5993,12 @@ msgstr "科目.序列.会计年度"
 #: 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
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "已核销"
 
 #. module: account
 #: report:account.invoice:0
@@ -5943,7 +6019,7 @@ msgstr "费用类科目"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "现金交易"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
@@ -5966,11 +6042,11 @@ msgstr "备注"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "辅助核算统计"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:897
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:905
 #, python-format
 msgid "Entries: "
 msgstr "凭证： "
@@ -5978,10 +6054,10 @@ msgstr "凭证： "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "在选定的账簿手动创建定期分录。"
 
 #. module: account
-#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "无法创建公司之间的过帐"
@@ -5997,6 +6073,7 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
+"科目类型确定了科目在记账时如何使用。科目类型的结转方法确定年结时的流程。分类用于资产负债表和损益表。您可以在这里创建和管理贵公司的科目类型。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6004,12 +6081,12 @@ 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
 msgid "State is draft"
-msgstr ""
+msgstr "草稿状态"
 
 #. module: account
 #: view:account.move.line:0
@@ -6019,7 +6096,7 @@ msgid "Total debit"
 msgstr "借方合计"
 
 #. module: account
-#: code:addons/account/account_move_line.py:772
+#: code:addons/account/account_move_line.py:781
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "凭证\"%s\"无效！"
@@ -6033,7 +6110,7 @@ msgstr "传真:"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,based_on:0
 msgid "Based On"
-msgstr ""
+msgstr "基于"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6058,14 +6135,14 @@ msgstr "Python代码"
 #, python-format
 msgid ""
 "Please define the Reserve and Profit/Loss account for current user company !"
-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
@@ -6075,39 +6152,38 @@ msgstr "创建"
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "创建凭证"
+msgstr "创建分录"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: percent"
-msgstr ""
+msgstr "  定价：百分比"
 
 #. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:836
-#: code:addons/account/account.py:915
-#: code:addons/account/account.py:990
-#: code:addons/account/account.py:1218
-#: code:addons/account/account.py:1224
-#: code:addons/account/account.py:2109
-#: code:addons/account/account.py:2357
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
+#: 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_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:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1182
-#: code:addons/account/account_move_line.py:1197
-#: code:addons/account/account_move_line.py:1199
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
+#: 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/wizard/account_open_closed_fiscalyear.py:40
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6144,12 +6220,13 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"对发票涉及的如付款，这发票的条目必须有要核销对应的一方。通常付款有自动核销的功能。系统能搜索在每个业务伙伴的科目里找到一有相等金额的科目去核销。"
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "审查"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6158,12 +6235,12 @@ 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
 msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "一页一个业务伙伴的分类帐"
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6171,14 +6248,14 @@ msgstr ""
 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 ""
+msgstr "这个报表是每个业务伙伴的往来汇总。这个PDF报表的每一行列出一个业务伙伴及其余额。"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, 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
@@ -6209,18 +6286,18 @@ msgstr "所有凭证"
 #: 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
-#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "当前的货币没设置正确！"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6230,7 +6307,7 @@ msgstr "科目核销"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "税负"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6238,15 +6315,14 @@ msgstr ""
 #: 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 "按全部业务类型打印全部凭证"
+msgstr "总账"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "这付款单发给银行"
 
 #. module: account
 #: view:account.balance.report:0
@@ -6255,21 +6331,21 @@ 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 ""
+msgstr "此报表用于生成一个试算平衡表的PDF报表。这样你可以在一个报表上检查你所有科目的余额。"
 
 #. module: account
 #: help:account.move,to_check:0
 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
 #: 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... "
-msgstr ""
+msgstr "手工单据模块包括所有要输入单据：银行、现金、销售、采购、费用等 "
 
 #. module: account
 #: view:account.chart.template:0
@@ -6279,7 +6355,7 @@ msgstr "属性"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr ""
+msgstr "税科目图表"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6292,7 +6368,7 @@ msgid "Total:"
 msgstr "合计:"
 
 #. module: account
-#: code:addons/account/account.py:2064
+#: code:addons/account/account.py:2050
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6304,25 +6380,32 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
+"可以在凭证模版的名称上使用年月日变量\n"
+"\n"
+"%(year)s：本年\n"
+"%(month)s：本月\n"
+"%(date)s：本日\n"
+"\n"
+"例如：日期为 %(date)s 的定期发生凭证"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr "收入科目"
+msgstr "损益科目"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "相关单据生成此发票报表"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr "子代码"
+msgstr "子编码"
 
 #. module: account
-#: code:addons/account/invoice.py:476
+#: code:addons/account/invoice.py:473
 #: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
@@ -6342,13 +6425,13 @@ msgstr "补差额金额"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "销售"
 
 #. module: account
 #: 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
@@ -6361,7 +6444,7 @@ msgstr "完成"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "手工输入的发票是草稿状态"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6373,12 +6456,14 @@ 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会按期间计算应收账款余额"
+"。如果你输入了30天，OpenERP生成业务伙伴前一个月，再前一个月的金额。 "
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源单据"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -6391,12 +6476,12 @@ msgstr "允许你修改报表显示的余额的符号,所以你能看见正数
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "未核销分录"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr ""
+msgstr "对账报表"
 
 #. module: account
 #: report:account.invoice:0
@@ -6406,7 +6491,7 @@ msgstr "税:"
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "税类型的百分率，请输入0 - 1之间的值"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6415,14 +6500,14 @@ 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
 #: 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 ""
+msgstr "产品计量单位"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6431,7 +6516,7 @@ 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
 #: selection:account.automatic.reconcile,power:0
@@ -6453,7 +6538,7 @@ msgstr "会计期间长度(天数)"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "月营业额"
 
 #. module: account
 #: view:account.move:0
@@ -6465,12 +6550,14 @@ msgstr "辅助核算明细"
 #: 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 "
+"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 ""
+"科目一览表是根据贵公司所在国家的会计制度建立的。辅助核算项一览表是按贵公司管理需要或者需要查看成本/收益。一般用于管理合同、项目、产品或部门。很多Open"
+"ERP业务（发票、计工单、费用报销）都会生成相关辅助核算项的记录"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -6479,12 +6566,12 @@ msgid "Lines"
 msgstr "明细"
 
 #. module: account
-#: code:addons/account/invoice.py:524
+#: 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 ""
+msgstr "无法在科目一览表找到本公司发票明细的科目，请创建科目。"
 
 #. module: account
 #: view:account.tax.template:0
@@ -6494,7 +6581,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
@@ -6505,7 +6592,7 @@ msgstr "你确定要打开这发票?"
 #: code:addons/account/account_move_line.py:963
 #, python-format
 msgid "Accounting Entries"
-msgstr "会计凭证"
+msgstr "会计分录"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -6518,12 +6605,12 @@ 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
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "它将作为一个默认的借方科目"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6549,13 +6636,27 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"财务和会计模块包括：\n"
+"    一般会计\n"
+"    成本与分析会计\n"
+"    第三方会计\n"
+"    税务管理\n"
+"    预算\n"
+"    客户和供应商发票\n"
+"    银行报表\n"
+"    业务伙伴的核销处理\n"
+"    对财务人员建立的控制台包括：\n"
+"        * 未付款图表\n"
+"        * 应收款分析图表\n"
+"        * 应收应付分析表\n"
+"    "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
 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
 #: report:account.invoice:0
@@ -6574,12 +6675,12 @@ msgstr "客户欠款金额合计"
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr "icon"
+msgstr "图标"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -6591,12 +6692,12 @@ msgstr "确定"
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "未确定业务伙伴"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "期初余额"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -6604,12 +6705,12 @@ 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
 msgid "Closed On"
-msgstr ""
+msgstr "关闭在"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
@@ -6619,12 +6720,12 @@ msgstr "银行对账单明细"
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "默认进项税"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6636,7 +6737,7 @@ msgstr "确认"
 msgid ""
 "Bank Account Number, Company bank account if Invoice is customer or supplier "
 "refund, otherwise Partner bank account number."
-msgstr ""
+msgstr "银行账户号码，如果发票是客户或供应商红字发票它是公司的银行账户，否则是业务伙伴的银行账户。"
 
 #. module: account
 #: help:account.tax,domain:0
@@ -6644,13 +6745,13 @@ msgstr ""
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
-msgstr "这字段只用于如果你开发自己的模块允许开发者在自定义域创建特定的税"
+msgstr "这字段只用于，如果您开发自己的模块允许开发者在自定义域创建特定的税"
 
 #. module: account
-#: code:addons/account/account.py:952
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "同一家公司你应该选择一个会计期间"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -6660,27 +6761,27 @@ msgstr "新名称"
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries"
-msgstr "创建凭证"
+msgstr "创建"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报告"
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "每个公司的账簿编码必须唯一！"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr ""
+msgstr "关闭钱箱"
 
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr "业务类型"
+msgstr "账簿"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -6694,7 +6795,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "这字段显示被系统自动挑选要去进行核销处理的下一个业务伙伴，因为他最近进行过核销。"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -6710,7 +6811,7 @@ msgstr "隶属"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "使用模型"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -6719,7 +6820,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 ""
+msgstr "此界面用于会计人员正式的记录。当输入供应商发票时，请先输入明细的费用科目，OpenERP将为您自动生成相关的税和应付款"
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -6727,14 +6828,14 @@ 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 ""
+msgstr "此科目是为损益类科目（如果盈利它增加，损失则减少），是从损益表计算而来"
 
 #. 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 "发票行"
+msgstr "发票明细"
 
 #. module: account
 #: field:account.balance.report,display_account:0
@@ -6751,20 +6852,20 @@ msgid "Sign on Reports"
 msgstr "报表上的符号"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
-msgstr ""
+msgstr "同一账簿不能有两个"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month= -1"
-msgstr ""
+msgstr "  这个月还剩天数= -1"
 
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的相关业务伙伴。"
 
 #. module: account
 #: help:account.journal,type:0
@@ -6776,10 +6877,16 @@ msgid ""
 "Situation' to be used at the time of new fiscal year creation or end of year "
 "entries generation."
 msgstr ""
+"销售账簿用于销售发票\r\n"
+"采购账簿用于采购发票\r\n"
+"现金日记账用于收付款\r\n"
+"通用账簿用于其他情况\r\n"
+"年结账簿用于年终的结账或期初余额的录入"
 
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: report:account.move.voucher:0
 msgid "PRO-FORMA"
 msgstr "形式发票"
 
@@ -6788,7 +6895,7 @@ msgstr "形式发票"
 msgid ""
 "Helps you generate reminder letters for unpaid invoices, including multiple "
 "levels of reminding and customized per-partner policies."
-msgstr ""
+msgstr "帮助您生成未付发票的提醒邮件和制定每个业务伙伴的政策"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -6809,7 +6916,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
@@ -6832,26 +6938,26 @@ 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
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1271
 #, python-format
 msgid "Bad account !"
 msgstr "无效科目!"
 
 #. module: account
-#: code:addons/account/account.py:2821
+#: code:addons/account/account.py:2777
 #: code:addons/account/installer.py:432
 #, 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
@@ -6859,7 +6965,7 @@ msgid "Invoice Tax"
 msgstr "发票税"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: code:addons/account/account_move_line.py:1246
 #, python-format
 msgid "No piece number !"
 msgstr "没会计期间!"
@@ -6873,7 +6979,7 @@ msgstr "销售属性"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "手动核销"
 
 #. module: account
 #: report:account.overdue:0
@@ -6896,7 +7002,7 @@ msgstr "关闭会计年度"
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "取消选择的发票"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -6905,7 +7011,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "5"
 
 #. module: account
 #: view:account.account:0
@@ -6928,12 +7034,12 @@ msgstr "科目一览表模板"
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "事务代码"
+msgstr "事务编码"
 
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "账簿里的分录登账"
 
 #. module: account
 #: view:product.product:0
@@ -6957,7 +7063,7 @@ msgstr "目标科目"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "发票付款"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -6975,7 +7081,7 @@ msgstr "序列"
 #. module: account
 #: model:ir.model,name:account.model_account_bs_report
 msgid "Account Balance Sheet Report"
-msgstr ""
+msgstr "资产负债表的报表"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -6983,7 +7089,7 @@ msgstr ""
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "勾选, 如果你使用的产品和发票价格含税."
+msgstr "勾选, 如果您使用的产品和发票价格含税."
 
 #. module: account
 #: view:account.state.open:0
@@ -6993,17 +7099,17 @@ msgstr "是"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr ""
+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
 msgid "Monthly"
-msgstr ""
+msgstr "每月"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7014,21 +7120,22 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
+"在这里您可以修改一个账簿视图或建一个新的视图。账簿视图定义您输入分录。当您要创建一个新的视图，选择您要显示在视图上的字段并指定它们的序列。"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 14"
-msgstr ""
+msgstr "  天数:14"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 天    "
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "进度"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7039,7 +7146,7 @@ msgstr "上级科目"
 #. module: account
 #: field:account.installer.modules,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "多个辅助核算方案"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -7047,12 +7154,12 @@ msgid ""
 "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)."
-msgstr "月天数设为-1到当月最后一天.如果为+数为下月的天数.设为0为净天数(否则从月初开始算)"
+msgstr "月天数设为 -1 是当月的最后一天。如果为正数 为下月的天数。设为0为净天数(否则从月初开始算)"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "正式报表"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -7065,12 +7172,12 @@ msgid ""
 "The sequence field is used to order the tax lines from the lowest sequences "
 "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 "序列字段用于税从低到高排序. 如果税中有子税这排序很重要"
+msgstr "序列字段用于税从低到高排序.。如果税中有子税这排序很重要"
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "钱箱账明细"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7080,7 +7187,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
 #: report:account.account.balance.landscape:0
@@ -7093,17 +7200,17 @@ msgid "Fixed"
 msgstr "固定"
 
 #. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
+#: 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:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:941
-#: code:addons/account/account_move_line.py:723
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
+#: 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
 #, python-format
 msgid "Warning !"
 msgstr "警告 !"
@@ -7111,13 +7218,13 @@ msgstr "警告 !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+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 ""
+msgstr "核销凭证明细"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7157,7 +7264,7 @@ msgstr "业务伙伴"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "在发票上选择合适的币别"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:100
@@ -7166,10 +7273,10 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "不能注销 %s 草稿/形式/取消的发票"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "没有发票明细"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7196,7 +7303,7 @@ msgstr "状态"
 msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
-msgstr ""
+msgstr "请选择要删除年结分录的会计年度"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7207,7 +7314,7 @@ msgstr "税用在"
 #: code:addons/account/account_bank_statement.py:346
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr "这科目凭证行不是在有效的状态"
+msgstr "这分录明细不是在有效的状态"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7215,39 +7322,39 @@ msgid "Deferral Method"
 msgstr "递延方法"
 
 #. module: account
-#: code:addons/account/invoice.py:360
+#: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "发票 '%s' 已支付。"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "自动录入"
 
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "错误！您不能创建递归的税编码。"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr "行"
+msgstr "明细"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
-msgstr "如果勾选此项, 系统将试图在从发票生成凭证时分组"
+msgstr "如果勾选此项, 系统将试图对生成的发票分组"
 
 #. module: account
 #: help:account.period,state:0
 msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
-msgstr ""
+msgstr "每月创建时状态为“草稿”。每月结束时，它在“完成”状态。"
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -7276,7 +7383,7 @@ msgid "Associated Partner"
 msgstr "相关业务伙伴"
 
 #. module: account
-#: code:addons/account/invoice.py:1298
+#: code:addons/account/invoice.py:1284
 #, python-format
 msgid "You must first select a partner !"
 msgstr "你必须首先选择一个业务伙伴!"
@@ -7290,19 +7397,19 @@ msgstr "附加信息"
 #. module: account
 #: view:account.installer:0
 msgid "Bank and Cash Accounts"
-msgstr ""
+msgstr "银行和现金科目"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+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 ""
+msgstr "发票的状态是待处理"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7310,12 +7417,12 @@ msgid ""
 "The chart of taxes is used to generate your periodical tax statement. You "
 "will see the taxes with codes related to your legal statement according to "
 "your country."
-msgstr ""
+msgstr "税目一览表是用来生成您定期的税单。请您按照贵国的税法设置。"
 
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr ""
+msgstr "添加的额外会计功能已安装。"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7323,17 +7430,17 @@ 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
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "形式"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "J.C. /凭证名称"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -7341,16 +7448,16 @@ msgid "Choose Fiscal Year"
 msgstr "选择会计年度"
 
 #. module: account
-#: code:addons/account/account.py:2885
+#: code:addons/account/account.py:2841
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "采购红字发票账簿"
 
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr "税率%，比率在0 - 1之间"
+msgstr "税率%，在0 - 1之间"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -7362,12 +7469,12 @@ msgstr "8"
 msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
-msgstr ""
+msgstr "修改发票：取消当前的发票，并准备编辑创建一个新副本。"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and Financial Management"
-msgstr ""
+msgstr "会计与财务管理"
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -7376,7 +7483,6 @@ msgstr ""
 #: 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
@@ -7389,6 +7495,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 "会计期间"
@@ -7401,12 +7520,12 @@ 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
@@ -7423,7 +7542,7 @@ msgstr "含税价格计算代码"
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr "收入类科目"
+msgstr "损益类科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -7434,7 +7553,7 @@ msgstr "财务结构模板"
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr ""
+msgstr "Int.Type"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -7448,7 +7567,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
@@ -7459,7 +7578,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "此菜单基于发票和付款生成增值税申报表。可以选择多个会计期间和会计年度，数据实时更新，您可以随时查看每个会计期间的应税情况"
 
 #. module: account
 #: report:account.invoice:0
@@ -7471,19 +7590,11 @@ msgstr "电话:"
 msgid "Company Currency"
 msgstr "公司本位币"
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other: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 ""
+msgstr "付款"
 
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
@@ -7491,46 +7602,46 @@ 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"
-msgstr ""
+msgstr "此帐户是损益类科目（盈利为增加，亏损为减少），这是从损益表计算而来"
 
 #. module: account
 #: help:account.move.line,blocked:0
 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
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "辅助核算反向余额"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+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
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -7539,15 +7650,15 @@ msgid "Account Types"
 msgstr "科目类型"
 
 #. module: account
-#: code:addons/account/invoice.py:905
+#: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
-msgstr "你不能在汇总的副本里创建发票凭证"
+msgstr "您不能在汇总的账簿里创建发票凭证"
 
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "P＆L / BS分类"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7572,27 +7683,32 @@ msgstr "应收款科目"
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox Balance"
-msgstr ""
+msgstr "钱箱余额"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "关闭一个会计年度"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "退款(开红字发票)业务类型"
+msgstr "红字发票账簿"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger_landscape: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
 msgid "Filter By"
-msgstr ""
+msgstr "筛选"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -7601,14 +7717,14 @@ msgid ""
 "your customers. OpenERP can also generate draft invoices automatically from "
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
-msgstr ""
+msgstr "客户发票用于管理要发给客户的销售发票。OpenERP可以根据销售订单或发货单自动生成发票，你只需要在发给客户之前确认即可。"
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "公司的辅助核算"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -7628,31 +7744,31 @@ msgid "Payment Term Line"
 msgstr "付款条款明细"
 
 #. module: account
-#: code:addons/account/account.py:2838
+#: code:addons/account/account.py:2794
 #: code:addons/account/installer.py:452
 #, 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
 msgid "Subtotal"
-msgstr ""
+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
@@ -7667,13 +7783,13 @@ msgstr "到期日期"
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "供应商列表"
 
 #. module: account
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on centralized journal"
-msgstr ""
+msgstr "您不能在汇总的账簿里创建凭证"
 
 #. module: account
 #: view:account.journal:0
@@ -7690,17 +7806,17 @@ 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.payment.term.line:0
 msgid "  valuation: balance"
-msgstr ""
+msgstr "  定价：平衡"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "统计"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -7711,17 +7827,17 @@ msgstr "从"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "结束一个会计年度"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "该科目的代码，每家公司必须是唯一的！"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "未支付的发票"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -7732,7 +7848,7 @@ msgstr "借方金额"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "资金"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7755,30 +7871,30 @@ msgstr "允许科目(留空为不限制)"
 #: 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
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "其它"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr "欠供应商金额合计"
+msgstr "欠供应商的总金额"
 
 #. module: account
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "辅助核算成本"
 
 #. module: account
 #: field:account.analytic.journal,name:0
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "业务类型名称"
+msgstr "账簿名称"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -7792,11 +7908,11 @@ msgstr "发票创建时自动计算出唯一的发票编号"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "手工单据的金额必须和对账单明细上的金额一致"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1137
-#: code:addons/account/account_move_line.py:1220
+#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
 msgstr "无效科目！"
@@ -7804,13 +7920,13 @@ msgstr "无效科目！"
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "保留空为打开所有的会计年度"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1062
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "合并的凭证 (%s) 已确认！"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -7845,18 +7961,18 @@ msgstr "如果它是一个多货币凭证,这金额表示一个可选的其它
 #: field:report.account_type.sales,currency_id:0
 #: field:report.invoice.created,currency_id:0
 msgid "Currency"
-msgstr "外币"
+msgstr "币别"
 
 #. module: account
 #: 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
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr ""
+msgstr "会计使该发票的分录生效"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -7868,12 +7984,12 @@ msgid ""
 "30, 2011, then everything between December 1, 2010 and November 30, 2011  "
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
-msgstr ""
+msgstr "根据您的需要定义公司的会计年度。每个会计年度会计都要做年度结转。会计年度通常有12个月，但不一定和日历年度一致。"
 
 #. module: account
 #: 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
@@ -7892,6 +8008,11 @@ msgid ""
 "* The 'Paid' state is set automatically when invoice is paid.            \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" 输入的新发票的状态是草稿\n"
+"点击形式发票按钮后的发票状态是形式发票，此时的发票没有发票号\n"
+"已过账的发票状态为未付款\n"
+"已付款并核销的发票状态是已支付\n"
+"点击作废按钮后发票状态是已作废"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -7901,29 +8022,29 @@ msgstr "强制会计期间"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "打印业务伙伴余额"
 
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "合同列表"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 msgid "unknown"
-msgstr ""
+msgstr "未知的"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 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
@@ -7931,7 +8052,7 @@ 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 "
 "Profilt & Loss Report"
-msgstr ""
+msgstr "这科目用于损益(如果是利润：金额就加，损失：金额就减)用作计算损益报表"
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -7941,7 +8062,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
@@ -7949,17 +8070,17 @@ msgstr ""
 msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
-msgstr "如果税计算是基于子税而不是总金额, 设置它"
+msgstr "设定，如果税计算是基于子税而不是总金额"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Python代码"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "业务类型代码"
+msgstr "账簿编码"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -7967,26 +8088,26 @@ msgid ""
 "You can specify here the coefficient that will be used when consolidating "
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
-msgstr ""
+msgstr "您可以在这里输入一个将用于在合并父税事务金额时系数，例如：1为加，-1为减。"
 
 #. 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 ""
+msgstr "余额"
 
 #. module: account
 #: 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_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
@@ -8001,19 +8122,19 @@ msgid "Period from"
 msgstr "会计期间从"
 
 #. module: account
-#: code:addons/account/account.py:2861
+#: code:addons/account/account.py:2817
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "销售红字发票账簿"
 
 #. module: account
-#: code:addons/account/account.py:941
+#: 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 ""
+msgstr "您不能修改这个公司的会计期间，因为它有相关的分录。"
 
 #. module: account
 #: view:account.move:0
@@ -8025,17 +8146,17 @@ msgstr "信息"
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "现金付款"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "会计年度和会计期间为关闭状态"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "产品信息"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8054,13 +8175,13 @@ msgstr "创建发票"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "进项税(%)"
 
 #. module: account
-#: code:addons/account/invoice.py:795
+#: code:addons/account/invoice.py:787
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "请创建发票明细。"
 
 #. module: account
 #: report:account.overdue:0
@@ -8070,21 +8191,21 @@ msgstr "尊敬的先生/女士"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "配置您的会计应用"
 
 #. module: account
-#: code:addons/account/account.py:2864
+#: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 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
@@ -8094,6 +8215,7 @@ 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
@@ -8104,27 +8226,31 @@ msgstr "结束会计期间"
 #. module: account
 #: field:account.installer.modules,account_followup:0
 msgid "Followups Management"
-msgstr ""
+msgstr "催款管理"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "Start Period"
-msgstr ""
+msgstr "开始会计期间"
 
 #. module: account
-#: code:addons/account/account.py:2357
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
-msgstr ""
+msgstr "无法找到上一级科目！"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
@@ -8143,7 +8269,7 @@ 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
@@ -8155,15 +8281,15 @@ msgstr "贷方合计"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr ""
+msgstr "经会计师生效的发票分录 "
 
 #. module: account
-#: code:addons/account/invoice.py:1014
+#: 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 "你不可以取消这已部分支付的发票！你需要去反核销相关的付款凭证！"
+msgstr "您不能取消这已部分支付的发票！您需要反核销相关的付款分录！"
 
 #. module: account
 #: report:account.overdue:0
@@ -8173,7 +8299,7 @@ msgstr "最好的祝愿"
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "未付"
 
 #. module: account
 #: report:account.overdue:0
@@ -8183,13 +8309,13 @@ msgstr "文档:客户科目报表"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "您不能在内部类型是视图里创建凭证明细"
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "当前的货币设置不正确！"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8199,11 +8325,12 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"在供应商红字发票里您能管理您从供应商收到的欠款单据。红字发票是一个单据是发票里的全部或部分项。您能直接在发票窗口轻松生成红字发票和核对它们。"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "应收款科目"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8213,13 +8340,13 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Income Accounts)"
-msgstr ""
+msgstr "损益表（利润科目）"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr "留空为使用收入科目"
+msgstr "留空为使用利润科目"
 
 #. module: account
 #: field:account.account,balance:0
@@ -8234,8 +8361,12 @@ msgstr "留空为使用收入科目"
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8250,13 +8381,21 @@ msgstr "余额"
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+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 ""
+msgstr "显示科目"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8266,19 +8405,19 @@ msgstr "("
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify"
-msgstr ""
+msgstr "修改"
 
 #. module: account
 #: view:account.account.type:0
 msgid "Closing Method"
-msgstr ""
+msgstr "关闭方法"
 
 #. 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 ""
+msgstr "这份报表是关于业务伙伴的分析。其中包含每个业务伙伴累计的欠款余额。"
 
 #. module: account
 #: selection:account.account,type:0
@@ -8292,12 +8431,12 @@ msgstr "应付的"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "本年"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "科目面板"
+msgstr "控制台"
 
 #. module: account
 #: view:account.model:0
@@ -8314,28 +8453,29 @@ 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/account_bank_statement.py:391
 #, python-format
 msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
+msgstr "无法删除已确认的银行对账单"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr "你必须选择核销科目"
+msgstr "您必须选择核销科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-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
@@ -8347,6 +8487,8 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"这里定义一个会计期间，把会计年度分成更小的时间区间。会计期间通常是按月或者按季度分期。一般按照税务申报表定义期间。根据贵公司需求用期间的打开和关闭控制在一"
+"定时间段内是否允许过账"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8359,17 +8501,16 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "筛选"
 
 #. module: account
 #: 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
-#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
@@ -8377,7 +8518,7 @@ msgid "Move"
 msgstr "凭证"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1134
+#: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "您不能更改此税目，请移除并重新创建凭证！"
@@ -8385,7 +8526,7 @@ msgstr "您不能更改此税目，请移除并重新创建凭证！"
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "A/C 号"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8396,7 +8537,7 @@ msgstr "银行对账单"
 #: 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
@@ -8409,7 +8550,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
@@ -8419,13 +8560,13 @@ msgstr "核销交易"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "合并报表"
 
 #. module: account
 #: view:account.account:0
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "合并的子科目"
+msgstr "合并子科目"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:82
@@ -8433,14 +8574,14 @@ msgstr "合并的子科目"
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
-msgstr ""
+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 ""
+msgstr "付款分录"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8449,36 +8590,40 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "科目一览表"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
 msgid "Subscription"
-msgstr "周期性凭证"
+msgstr "周期性"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "辅助核算余额"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal: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.partner.balance: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
 msgid "End Period"
-msgstr ""
+msgstr "结束会计期间"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8496,18 +8641,18 @@ msgstr ""
 #: 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 ""
+msgid "Chart of Accounts"
+msgstr "科目一览表"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "到期日期"
 
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard entries"
-msgstr "普通凭证"
+msgstr "普通分录"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -8515,7 +8660,7 @@ msgid "Account Subscription"
 msgstr "周期性凭证科目"
 
 #. module: account
-#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:717
 #, python-format
 msgid ""
 "Tax base different !\n"
@@ -8544,7 +8689,6 @@ msgstr "周期性凭证"
 #: 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
@@ -8573,7 +8717,7 @@ msgid "Unreconciled"
 msgstr "反核销"
 
 #. module: account
-#: code:addons/account/invoice.py:812
+#: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
 msgstr "坏的合计!"
@@ -8581,7 +8725,7 @@ msgstr "坏的合计!"
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "凭证序列"
+msgstr "分录序列"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -8594,22 +8738,24 @@ 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
 msgid "Pending"
-msgstr "未决"
+msgstr "等待中"
 
 #. module: account
 #: 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.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "供应商付款管理"
 
 #. module: account
 #: field:account.period,name:0
@@ -8631,19 +8777,22 @@ msgid "Active"
 msgstr "启用"
 
 #. module: account
-#: code:addons/account/invoice.py:353
+#: code:addons/account/invoice.py:354
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "未知错误"
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: 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 ""
+"不平的分录不能生效！\n"
+"请确认您的付款条款设置正确！\n"
+"每个付款条款都必须有一个“余额” 类型的行！"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -8667,7 +8816,7 @@ msgstr "外币"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "使凭证生效"
 
 #. module: account
 #: field:account.account,credit:0
@@ -8684,6 +8833,7 @@ msgstr ""
 #: report:account.journal.period.print: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
@@ -8699,7 +8849,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
 #: report:account.move.voucher:0
@@ -8710,12 +8860,12 @@ msgstr ""
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr ""
+msgstr "一般账簿"
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "账簿分录模型"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -8724,7 +8874,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 ""
+msgstr "周期性凭证行 '%s'生成的生效日期基于业务伙伴的付款条件。请输入业务伙伴！"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -8761,6 +8911,18 @@ msgstr "一般"
 #: selection:account.pl.report,filter: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
@@ -8775,7 +8937,7 @@ msgstr "会计期间"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "汇率"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -8789,12 +8951,12 @@ msgstr "输入的值是百分比，范围在0和1之间。"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "打开核销"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -8806,18 +8968,18 @@ msgstr "上级左"
 msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
-msgstr ""
+msgstr "红字发票基于这个类型，如果这发票已经核销您不能修改或取消它。"
 
 #. module: account
 #: help:account.installer.modules,account_analytic_plans:0
 msgid ""
 "Allows invoice lines to impact multiple analytic accounts simultaneously."
-msgstr ""
+msgstr "允许发票明细，同时影响多个辅助核算项。"
 
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr ""
+msgstr "销项税(%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -8847,7 +9009,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
 #: report:account.tax.code.entries:0
@@ -8869,14 +9031,14 @@ msgstr "删除行"
 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
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "定期"
 
 #. module: account
 #: view:account.account:0
@@ -8919,6 +9081,7 @@ msgstr "选择会计期间"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
+#: report:account.move.voucher:0
 msgid "Posted"
 msgstr "已登账"
 
@@ -8937,7 +9100,6 @@ msgstr "已登账"
 #: 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
@@ -8956,7 +9118,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
@@ -8970,15 +9132,12 @@ msgid "Tax Source"
 msgstr "税源自"
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
-msgstr ""
+msgstr "净利润"
 
 #. module: account
 #: view:ir.sequence:0
@@ -8988,25 +9147,25 @@ msgstr "会计年度序列"
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr "这是一个循环凭证模型"
+msgstr "这是一个定期分录模型"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "没有为此产品  \"%s\" (id:%d)：定义利润科目"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
+msgid "JRNL"
+msgstr "JRNL"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: 0.02"
-msgstr ""
+msgstr "  金额: 0.02"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9034,7 +9193,7 @@ 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
@@ -9069,17 +9228,17 @@ msgstr "公司"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "定义定期分录"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "到期日"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr ""
+msgstr "现金交易总额"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -9087,7 +9246,7 @@ msgid ""
 "This figure depicts the total number of partners that have gone throught the "
 "reconciliation process today. The current partner is counted as already "
 "processed."
-msgstr ""
+msgstr "这数字描述了该业务伙伴到今天为止进行的核销处理的总数，当前业务伙伴算是已处理完。"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9097,28 +9256,28 @@ 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
 msgid "Trial Balance Report"
-msgstr ""
+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
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
-msgstr ""
+msgstr "手动或自动创建一个付款分录到这表单"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr "发票行"
+msgstr "发票明细"
 
 #. module: account
 #: field:account.aged.trial.balance,period_to:0
@@ -9138,11 +9297,11 @@ msgstr "发票行"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "结束会计期间"
 
 #. module: account
-#: code:addons/account/account_move_line.py:729
-#: code:addons/account/account_move_line.py:806
+#: 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
@@ -9159,7 +9318,7 @@ msgstr "警告"
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
-msgstr ""
+msgstr "这科目将被用于当前产品分类的出库价用成本价。"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9175,17 +9334,17 @@ msgstr "补差额凭证"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "发票的状态已完成"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "销售科目的报表"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "财务结构"
 
 #. module: account
 #: report:account.invoice:0
@@ -9212,6 +9371,7 @@ msgstr "供应商发票"
 #: report:account.journal.period.print: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
@@ -9224,12 +9384,12 @@ msgstr "借方"
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "发票行"
+msgstr "发票明细"
 
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "错误！您不能创建递归的科目模板。"
 
 #. module: account
 #: constraint:account.account.template:0
@@ -9242,13 +9402,13 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "定期"
 
 #. module: account
-#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:805
 #, python-format
 msgid "Entry is already reconciled"
-msgstr "凭证已经核销"
+msgstr "分录已核销"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
@@ -9266,14 +9426,16 @@ msgid "Range"
 msgstr "范围"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1252
+#: 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 "无法自动创建序列.为自动编号,请在业务类型设定中建一个序列或者手动创建一个序列."
+msgstr ""
+"无法自动创建序列。\n"
+"请在账簿里定一个序列."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -9281,18 +9443,28 @@ msgstr "无法自动创建序列.为自动编号,请在业务类型设定中建
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 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
@@ -9306,18 +9478,18 @@ msgstr "手动"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+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.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.Account"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -9328,7 +9500,7 @@ msgstr "旧的应收款"
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "适用范围"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -9345,17 +9517,17 @@ msgstr "如果是一个多货币凭证可选其它货币"
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr "供应商或客户发票在系统中的入口"
+msgstr "为表单导入供应商或客户发票"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr "发票"
+msgstr "开单"
 
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
-msgstr "父科目"
+msgstr "上级科目"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9367,11 +9539,13 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 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
@@ -9381,14 +9555,14 @@ msgstr "剩余的欠款"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr "统计报告"
+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 "配置进度"
+msgstr "设置进度"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -9396,10 +9570,10 @@ msgid "Accounts Mapping"
 msgstr "科目一览"
 
 #. module: account
-#: code:addons/account/invoice.py:345
+#: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "发票'%s'是等待复核。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9408,39 +9582,39 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "11"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer_modules
 msgid "account.installer.modules"
-msgstr ""
+msgstr "account.installer.modules"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr "和选择的产品相关的收入或费用科目"
+msgstr "选择的产品相关的利润或费用科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "您的分录日期不是在指定的会计期间！"
 
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr "会计期间数"
+msgstr "周期次数"
 
 #. module: account
 #: 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
 msgid "Search Invoice"
-msgstr ""
+msgstr "搜索发票"
 
 #. module: account
 #: report:account.invoice:0
@@ -9474,12 +9648,12 @@ msgstr "普通信息"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "会计凭证"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "使凭证行生效"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9490,22 +9664,22 @@ msgstr "成本分类账(只有数量)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+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
 msgid "Manual Invoice Taxes"
-msgstr "上门纳税(非主营业务纳税)"
+msgstr "手动的发票税(非主营业务纳税)"
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -9515,7 +9689,7 @@ msgstr "上级右"
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -9526,7 +9700,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -9540,12 +9714,12 @@ 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
 msgid "Ref."
-msgstr "关联单号"
+msgstr "单号"
 
 #. module: account
 #: field:account.use.model,model:0
@@ -9560,7 +9734,7 @@ msgstr "科目模型"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9575,7 +9749,7 @@ msgstr "银行账号"
 #: 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
@@ -9590,7 +9764,7 @@ msgstr "前景"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "搜索分录"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9607,7 +9781,7 @@ msgstr "通常用 1或-1"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr "以这个会计科目为模版制图"
+msgstr "科目一览模版"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
@@ -9623,13 +9797,13 @@ msgstr "金额"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
-msgstr "您必须输入的期间长度不能为0或以下 !"
+msgstr "您必须输入的会计期间长度不能为0或以下 !"
 
 #. module: account
-#: code:addons/account/account.py:511
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
-msgstr "你不能删除这科目因为它已有凭证! "
+msgstr "您不能删除这科目因为它已有分录! "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -9642,13 +9816,27 @@ 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
 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 "基于当前币别的应收或应付款的余额"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr "资产"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr "负债"
 
 #~ msgid "Select Message"
 #~ msgstr "选择消息"
@@ -9671,9 +9859,6 @@ msgstr ""
 #~ msgid "All Months"
 #~ msgstr "所有月份"
 
-#~ msgid "Error! You can not create recursive account."
-#~ msgstr "错误！您不可以创建一个递归科目"
-
 #~ msgid "Account Number"
 #~ msgstr "科目编号"
 
@@ -9791,9 +9976,6 @@ msgstr ""
 #~ msgid "Document"
 #~ msgstr "单据"
 
-#~ msgid "account.move.line.select"
-#~ msgstr "account.move.line.select"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "附加信息"
 
@@ -9836,6 +10018,9 @@ msgstr ""
 #~ msgid "Quantities"
 #~ msgstr "数量"
 
+#~ msgid "JNRL"
+#~ msgstr "JNRL"
+
 #~ msgid "Modify Invoice"
 #~ msgstr "修改发票"
 
@@ -10130,12 +10315,6 @@ msgstr ""
 #~ msgid "Recurrent Entries"
 #~ msgstr "周期性凭证"
 
-#~ msgid "x Sales Journal"
-#~ msgstr "x 销售分类帐"
-
-#~ msgid "account.move.line"
-#~ msgstr "科目.凭证.明细"
-
 #~ msgid "Total write-off"
 #~ msgstr "补差额金额合计"
 
@@ -10169,9 +10348,6 @@ msgstr ""
 #~ msgid "Date Invoiced"
 #~ msgstr "开票日期"
 
-#~ msgid "x Sales Credit Note Journal"
-#~ msgstr "x 销售贷项票据分类帐"
-
 #~ msgid "Account Analytic Lines Analysis"
 #~ msgstr "辅助核算明细分析"
 
@@ -10181,9 +10357,6 @@ msgstr ""
 #~ msgid "Analytic Debit"
 #~ msgstr "辅助核算借方"
 
-#~ msgid "Write-Off Period"
-#~ msgstr "补差额会计期间"
-
 #~ msgid "Import from your bank statements"
 #~ msgstr "从你的银行对账单导入"
 
@@ -10193,15 +10366,9 @@ msgstr ""
 #~ msgid "Analytic Check"
 #~ msgstr "辅助核算检查"
 
-#~ msgid "x Bank Journal"
-#~ msgstr "x银行分类帐"
-
 #~ msgid "Analytic Check -"
 #~ msgstr "辅助核算检查 -"
 
-#~ msgid "x Expenses Journal"
-#~ msgstr "x费用分类帐"
-
 #~ msgid "Subscription Entries"
 #~ msgstr "周期性凭证"
 
@@ -10219,42 +10386,9 @@ msgstr ""
 #~ "category"
 #~ msgstr "这科目将用于当前产品分类的默认进仓"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "折扣(%)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr "您付款后是否已经通知我们, 现在显示这款项仍然未付, 如果您有任何问题请立即联系我们的会计部."
-
-#, python-format
-#~ msgid "You can not validate a non-balanced entry !"
-#~ msgstr "您能使不平衡分录不生效"
-
-#~ msgid ""
-#~ "The partner bank account to pay\n"
-#~ "Keep empty to use the default"
-#~ msgstr ""
-#~ "付款时业务伙伴的银行帐号\n"
-#~ "留空使用默认值"
-
-#~ msgid "Débit"
-#~ msgstr "借方"
-
-#, python-format
-#~ msgid "Configration Error !"
-#~ msgstr "设置错误!"
-
-#~ msgid "Partner ID"
-#~ msgstr "业务伙伴ID"
-
 #~ msgid "Import invoice"
 #~ msgstr "导入发票"
 
-#~ msgid "Balance brought forward"
-#~ msgstr "余额结转"
-
 #~ msgid "Account Move"
 #~ msgstr "凭证"
 
@@ -10278,148 +10412,6 @@ msgstr ""
 #~ msgid "Receivable and Payable"
 #~ msgstr "应收和应付"
 
-#~ msgid "Analytic accounts to close"
-#~ msgstr "关闭辅助核算项"
-
-#~ msgid "My indicators"
-#~ msgstr "我的指标"
-
-#~ msgid "Draft invoices"
-#~ msgstr "发票草稿"
-
-#~ msgid "Costs to invoice"
-#~ msgstr "成本开发票"
-
-#~ msgid "Accounts to invoice"
-#~ msgstr "科目开发票"
-
-#~ msgid "Board for accountant"
-#~ msgstr "会计面板"
-
-#~ msgid "Aged receivables"
-#~ msgstr "以前应收款"
-
-#~ msgid "Notification"
-#~ msgstr "通知"
-
-#~ msgid "Show Debit/Credit Information"
-#~ msgstr "显示借方/贷方信息"
-
-#~ msgid "All accounts"
-#~ msgstr "所有科目"
-
-#~ msgid "Aged income"
-#~ msgstr "以前收入"
-
-#~ msgid "Financial Period"
-#~ msgstr "财务会计期间"
-
-#~ msgid "Compare Selected Years In Terms Of"
-#~ msgstr "比较选择的会计年度"
-
-#~ msgid "Select Period(s)"
-#~ msgstr "选择会计期间"
-
-#~ msgid "Show Comparision in %"
-#~ msgstr "显示对比 %"
-
-#~ msgid "Show Report in Landscape Form"
-#~ msgstr "显示固定格式的报表"
-
-#~ msgid "You have to select 'Landscape' option. Please Check it."
-#~ msgstr "请勾选此项你能选择‘规定格式’选项"
-
-#~ msgid ""
-#~ "Account Balance Module is an added functionality to the Financial Management "
-#~ "module.\n"
-#~ "\n"
-#~ "    This module gives you the various options for printing balance sheet.\n"
-#~ "\n"
-#~ "    1. You can compare the balance sheet for different years.\n"
-#~ "\n"
-#~ "    2. You can set the cash or percentage comparison between two years.\n"
-#~ "\n"
-#~ "    3. You can set the referential account for the percentage comparison for "
-#~ "particular years.\n"
-#~ "\n"
-#~ "    4. You can select periods as an actual date or periods as creation "
-#~ "date.\n"
-#~ "\n"
-#~ "    5. You have an option to print the desired report in Landscape format.\n"
-#~ "    "
-#~ msgstr ""
-#~ "科目结余模块是一附加的财务管理模块\n"
-#~ "    \n"
-#~ "\t该模块为你提供各种可选择打印的资产负债表\n"
-#~ "\t1.你能比较资产负债表的不同年份.\n"
-#~ "\t2.你能设置两年的现金或百分比比较\n"
-#~ "\t3.你能设置特别年份的参考科目的百分比比较\n"
-#~ "\t4.你能选择会计期间的实际日期或在会计期间创建日期\n"
-#~ "\t5.你可以选择打印要求的报表\n"
-#~ "    "
-
-#~ msgid "Account balance-Compare Years"
-#~ msgstr "科目结余会计年度比较"
-
-#~ msgid "Select Reference Account(for  % comparision)"
-#~ msgstr "选择参考科目(比较%)"
-
-#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
-#~ msgstr "选择会计年度(最大值为三年)"
-
-#~ msgid "Keep empty for comparision to its parent"
-#~ msgstr "留空为比较母公司"
-
-#~ msgid "Don't Compare"
-#~ msgstr "不比较"
-
-#~ msgid "Show Accounts"
-#~ msgstr "显示科目"
-
-#~ msgid "1. You have selected more than 3 years in any case."
-#~ msgstr "你必须要选择多于3年."
-
-#~ msgid "Accounting and financial management-Compare Accounts"
-#~ msgstr "会计和财务管理-科目比较"
-
-#~ msgid "You can select maximum 3 years. Please check again."
-#~ msgstr "请勾选此项你最多能选择3年"
-
-#~ msgid ""
-#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
-#~ "have not selected landscape format."
-#~ msgstr "你已经选择‘百分比’选项这要2年以上. 但你没选择规定格式."
-
-#~ msgid ""
-#~ "You might have done following mistakes. Please correct them and try again."
-#~ msgstr "你可能存在以下错误. 请纠正后再试."
-
-#~ msgid "Creation Date"
-#~ msgstr "创建日期"
-
-#~ msgid ""
-#~ "2. You have not selected 'Percentage' option, but you have selected more "
-#~ "than 2 years."
-#~ msgstr "你选择2年以上, 但未选‘百分比’选项"
-
-#~ msgid "You have to select at least 1 Fiscal Year. Try again."
-#~ msgstr "你至少要选择一个会计年度再试"
-
-#~ msgid ""
-#~ "You may have selected the compare options with more than 1 year with "
-#~ "credit/debit columns and % option.This can lead contents to be printed out "
-#~ "of the paper.Please try again."
-#~ msgstr "你必须要选择比较选项一年以上的借方/贷方栏和%选项, 这才能产生打印的内容请再试."
-
-#~ msgid "Customize Report"
-#~ msgstr "自定义报表"
-
-#~ msgid "A module that adds new reports based on the account module."
-#~ msgstr "新的报表模块"
-
-#~ msgid "Account Reporting - Reporting"
-#~ msgstr "科目报表-报表"
-
 #~ msgid ""
 #~ "Indicate if the tax computation is based on the value computed for the "
 #~ "computation of child taxes or based on the total amount."
@@ -10481,12 +10473,6 @@ msgstr ""
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "凭证"
 
-#~ msgid "Entries Selection Based on"
-#~ msgstr "选择基于"
-
-#~ msgid "All account entries"
-#~ msgstr "所有"
-
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "错误：无效的Bvr号(校验错误)"
 
@@ -11116,9 +11102,6 @@ msgstr ""
 #~ msgid "Amount paid"
 #~ msgstr "支付金额"
 
-#~ msgid "supplier"
-#~ msgstr "供应商"
-
 #~ msgid "COL 2"
 #~ msgstr "COL 2"
 
@@ -11142,3 +11125,20 @@ msgstr ""
 
 #~ msgid "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 #~ msgstr "<drawString x=\"4.6cm\" y=\"28.7cm\">"
+
+#, python-format
+#~ msgid "Invoice "
+#~ msgstr "发票 "
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "资产负债表（资产科目）"
+
+#~ msgid "Chart of Accounts"
+#~ msgstr "科目一览表"
+
+#, python-format
+#~ msgid "is validated."
+#~ msgstr "已生效"
+
+#~ msgid "Balance:"
+#~ msgstr "余额:"
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index c72db903c39..05f15f4855c 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: 2011-04-29 05:12+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -484,8 +484,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1120,6 +1118,7 @@ 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
@@ -1307,6 +1306,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2010,7 +2019,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2074,6 +2083,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2095,11 +2106,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2416,6 +2432,7 @@ 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
@@ -2661,6 +2678,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2926,7 +2945,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2940,6 +2958,17 @@ msgstr ""
 #: 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 ""
 
@@ -3149,6 +3178,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3207,6 +3237,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3645,11 +3685,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4322,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4461,7 +4500,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4474,10 +4512,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4487,6 +4523,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4603,6 +4649,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5312,6 +5360,19 @@ msgstr ""
 
 #. 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 ""
@@ -6220,6 +6281,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6449,7 +6511,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -7119,6 +7181,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7371,6 +7434,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7453,14 +7529,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7572,6 +7640,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7809,6 +7883,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8090,12 +8165,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8213,7 +8293,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8232,6 +8317,15 @@ 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 ""
 
@@ -8429,7 +8523,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8446,12 +8540,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8471,7 +8570,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8652,6 +8751,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8733,6 +8833,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8942,13 +9054,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8972,7 +9081,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9180,6 +9289,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9253,6 +9363,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9622,6 +9742,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "資產"
 
@@ -9637,9 +9769,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "確定"
 
-#~ msgid "Disc. (%)"
-#~ msgstr "折扣(%)"
-
 #~ msgid "Contra"
 #~ msgstr "沖消"
 
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index eb1384f734d..73f10df6e75 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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-11 23:34+0000\n"
-"Last-Translator: BlueT - Matthew Lien - 練喆明 <bluet@ubuntu-tw.org>\n"
+"PO-Revision-Date: 2011-09-27 10:01+0000\n"
+"Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 05:13+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "換票券管理"
 
 #. module: account
 #: view:account.account:0
@@ -483,8 +483,6 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 #: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
@@ -1119,6 +1117,7 @@ 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
@@ -1306,6 +1305,16 @@ msgstr ""
 #: 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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
 msgstr ""
 
@@ -2009,7 +2018,7 @@ msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr ""
 
 #. module: account
@@ -2073,6 +2082,8 @@ 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
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -2094,11 +2105,16 @@ msgstr ""
 #. module: account
 #: report:account.account.balance: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
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance:0
@@ -2415,6 +2431,7 @@ 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
@@ -2660,6 +2677,8 @@ 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
 msgid "Profit And Loss"
 msgstr ""
 
@@ -2925,7 +2944,6 @@ msgstr ""
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids: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
@@ -2939,6 +2957,17 @@ msgstr ""
 #: 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 ""
 
@@ -3148,6 +3177,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr ""
 
@@ -3206,6 +3236,16 @@ msgstr ""
 #: 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.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 "Chart of Accounts"
 msgstr ""
 
@@ -3510,7 +3550,7 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr "账号"
+msgstr "會計"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3644,11 +3684,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:76
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:76
-#: code:addons/account/report/account_profit_loss.py:124
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Loss"
 msgstr ""
 
@@ -4321,7 +4360,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
@@ -4460,7 +4499,6 @@ msgid "Analytic Balance -"
 msgstr ""
 
 #. module: account
-#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
 #: field:account.balance.report,target_move:0
 #: field:account.bs.report,target_move:0
@@ -4473,10 +4511,8 @@ msgstr ""
 #: 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.journal.period.print: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
@@ -4486,6 +4522,16 @@ msgstr ""
 #: 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
 msgid "Target Moves"
 msgstr ""
 
@@ -4602,6 +4648,8 @@ msgstr ""
 #: 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
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5311,6 +5359,19 @@ msgstr ""
 
 #. 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 ""
@@ -6219,6 +6280,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: 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
@@ -6448,7 +6510,7 @@ msgstr ""
 #: 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 "
+"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) "
@@ -6717,7 +6779,7 @@ msgstr ""
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "发票行"
+msgstr "發票明細"
 
 #. module: account
 #: field:account.balance.report,display_account:0
@@ -6726,7 +6788,7 @@ msgstr "发票行"
 #: field:account.pl.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display accounts"
-msgstr ""
+msgstr "顯示帳號"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -7118,6 +7180,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: field:account.invoice,partner_id:0
 #: field:account.invoice.line,partner_id:0
@@ -7370,6 +7433,19 @@ msgstr ""
 #: field:account.tax.chart,period_id:0
 #: code:addons/account/account_move_line.py:982
 #: 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 ""
@@ -7452,14 +7528,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Account"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -7571,6 +7639,12 @@ msgstr ""
 #: report:account.central.journal: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
 msgid "Filter By"
 msgstr ""
 
@@ -7808,6 +7882,7 @@ msgstr ""
 #: field:account.entries.report,currency_id:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice,currency_id:0
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
@@ -8089,12 +8164,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "Start Period"
 msgstr ""
 
@@ -8212,7 +8292,12 @@ msgstr ""
 #: report:account.central.journal:0
 #: field:account.entries.report,balance: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.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8231,6 +8316,15 @@ 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 ""
 
@@ -8428,7 +8522,7 @@ msgstr ""
 
 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8445,12 +8539,17 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: report:account.partner.balance: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
 msgid "End Period"
 msgstr ""
 
@@ -8470,7 +8569,7 @@ msgstr ""
 #: 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"
+msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8651,6 +8750,7 @@ msgstr ""
 #: field:account.entries.report,credit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
@@ -8732,6 +8832,18 @@ msgstr ""
 #: selection:account.pl.report,filter: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
@@ -8941,13 +9053,10 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:71
-#: code:addons/account/report/account_balance_sheet.py:116
-#: code:addons/account/report/account_balance_sheet.py:119
-#: code:addons/account/report/account_balance_sheet.py:120
-#: code:addons/account/report/account_profit_loss.py:71
-#: code:addons/account/report/account_profit_loss.py:127
-#, python-format
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "Net Profit"
 msgstr ""
 
@@ -8971,7 +9080,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-msgid "JNRL"
+msgid "JRNL"
 msgstr ""
 
 #. module: account
@@ -9179,6 +9288,7 @@ msgstr ""
 #: field:account.entries.report,debit:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
@@ -9195,7 +9305,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "发票行"
+msgstr "發票明細"
 
 #. module: account
 #: constraint:account.account.template:0
@@ -9252,6 +9362,16 @@ msgstr ""
 #: selection:account.common.account.report,display_account: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
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
 msgid "With movements"
 msgstr ""
 
@@ -9621,6 +9741,18 @@ msgid ""
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+msgid "Liabilities"
+msgstr ""
+
 #~ msgid "Asset"
 #~ msgstr "資產"
 
@@ -9630,9 +9762,6 @@ msgstr ""
 #~ msgid "Date Invoiced"
 #~ msgstr "发票日期"
 
-#~ msgid "Partner ID"
-#~ msgstr "伙伴ID"
-
 #~ msgid "Additionnal Information"
 #~ msgstr "附加信息"
 
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 00d906c8121..cfd434833ae 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -37,12 +37,14 @@ class account_installer(osv.osv_memory):
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
-        ids = modules.search(cr, uid, [('name', 'like', 'l10n_')], context=context)
+        # Looking for the module with the 'Account Charts' category
+        category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts')
+        ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context)
         charts = list(
             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 Account'))
+        charts.insert(0, ('configurable', 'Generic Chart Of Accounts'))
         return charts
 
     _columns = {
@@ -56,33 +58,24 @@ class account_installer(osv.osv_memory):
         'date_stop': fields.date('End Date', required=True),
         'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
+        'has_default_company' : fields.boolean('Has Default Company', readonly=True),
     }
 
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.company_id and user.company_id.id or False
 
-    def _get_default_charts(self, cr, uid, context=None):
-        module_name = False
-        company_id = self._default_company(cr, uid, context=context)
-        company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
-        address_id = self.pool.get('res.partner').address_get(cr, uid, [company.partner_id.id])
-        if address_id['default']:
-            address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'], context=context)
-            code = address.country_id.code
-            module_name = (code and 'l10n_' + code.lower()) or False
-        if module_name:
-            module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)], context=context)
-            if module_id:
-                return module_name
-        return 'configurable'
+    def _default_has_default_company(self, cr, uid, context=None):
+        count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
+        return bool(count == 1)
 
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
         'period': 'month',
         'company_id': _default_company,
-        'charts': _get_default_charts
+        'has_default_company': _default_has_default_company,
+        'charts': 'configurable'
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -95,7 +88,7 @@ class account_installer(osv.osv_memory):
         unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
         for field in res['fields']:
             if field == 'company_id':
-                res['fields'][field]['domain'] = unconfigured_cmp
+                res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
                 res['fields'][field]['selection'] = [('', '')]
                 if unconfigured_cmp:
                     cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
@@ -110,6 +103,10 @@ class account_installer(osv.osv_memory):
         return {}
 
     def execute(self, cr, uid, ids, context=None):
+        self.execute_simple(cr, uid, ids, context)
+        super(account_installer, self).execute(cr, uid, ids, context=context)
+
+    def execute_simple(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         fy_obj = self.pool.get('account.fiscalyear')
@@ -133,7 +130,6 @@ class account_installer(osv.osv_memory):
                         fy_obj.create_period(cr, uid, [fiscal_id])
                     elif res['period'] == '3months':
                         fy_obj.create_period3(cr, uid, [fiscal_id])
-        super(account_installer, self).execute(cr, uid, ids, context=context)
 
     def modules_to_install(self, cr, uid, ids, context=None):
         modules = super(account_installer, self).modules_to_install(
@@ -145,26 +141,4 @@ class account_installer(osv.osv_memory):
 
 account_installer()
 
-class account_installer_modules(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
-            help="Allows invoice lines to impact multiple analytic accounts "
-                 "simultaneously."),
-        'account_payment': fields.boolean('Suppliers Payment Management',
-            help="Streamlines invoice payment and creates hooks to plug "
-                 "automated payment systems in."),
-        'account_followup': fields.boolean('Followups Management',
-            help="Helps you generate reminder letters for unpaid invoices, "
-                 "including multiple levels of reminding and customized "
-                 "per-partner policies."),
-        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
-            help="This module will support the Anglo-Saxons accounting methodology by "
-                "changing the accounting logic with stock transactions."),
-        'account_asset': fields.boolean('Assets Management',
-            help="Helps you to manage your assets and their depreciation entries."),
-    }
-
-account_installer_modules()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/sequence.py b/addons/account/ir_sequence.py
similarity index 70%
rename from addons/account/sequence.py
rename to addons/account/ir_sequence.py
index 1683e5feb06..5c9039e43c3 100644
--- a/addons/account/sequence.py
+++ b/addons/account/ir_sequence.py
@@ -46,23 +46,14 @@ class ir_sequence(osv.osv):
         'fiscal_ids': fields.one2many('account.sequence.fiscalyear',
             'sequence_main_id', 'Sequences')
     }
-    def get_id(self, cr, uid, sequence_id, test='id', context=None):
-        if context is None:
-            context = {}
-        cr.execute('select id from ir_sequence where '
-                   + test + '=%s and active=%s', (sequence_id, True,))
-        res = cr.dictfetchone()
-        if res:
-            for line in self.browse(cr, uid, res['id'],
-                                    context=context).fiscal_ids:
-                if line.fiscalyear_id.id == context.get('fiscalyear_id', False):
-                    return super(ir_sequence, self).get_id(cr, uid,
-                                                           line.sequence_id.id,
-                                                           test="id",
-                                                           context=context)
-        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test,
-                                               context=context)
+
+    def _next(self, cr, uid, seq_ids, context=None):
+        for seq in self.browse(cr, uid, seq_ids, context):
+            for line in seq.fiscal_ids:
+                if line.fiscalyear_id.id == context.get('fiscalyear_id'):
+                    return super(ir_sequence, self)._next(cr, uid, [line.sequence_id.id], context)
+        return super(ir_sequence, self)._next(cr, uid, seq_ids, context)
 
 ir_sequence()
 
-# 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_view.xml b/addons/account/ir_sequence_view.xml
similarity index 100%
rename from addons/account/sequence_view.xml
rename to addons/account/ir_sequence_view.xml
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 6ff3879889c..36fd88183f2 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -28,12 +28,17 @@ class account_fiscal_position(osv.osv):
     _description = 'Fiscal Position'
     _columns = {
         'name': fields.char('Fiscal Position', size=64, required=True),
+        'active': fields.boolean('Active', help="By unchecking the active field, you may hide a fiscal position without deleting it."),
         'company_id': fields.many2one('res.company', 'Company'),
         'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
         'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
         'note': fields.text('Notes', translate=True),
     }
 
+    _defaults = {
+        'active': True,
+    }
+
     def map_tax(self, cr, uid, fposition_id, taxes, context=None):
         if not taxes:
             return []
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index fbee97875ae..706fa4683cb 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -8,8 +8,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
-                    <field name="name" select="1"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="active" groups="base.group_extended"/>
+                    </group>
                     <separator string="Mapping" colspan="4"/>
                     <newline/>
                     <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 08a2b4507ca..cc05092688b 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -28,15 +28,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Account">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
                         <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Overdue Account" domain="[('date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts with a past deadline."/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="partner_id" select="1"/>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="partner_id"/>
                         <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -44,8 +44,8 @@
                         <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'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="State" icon="terp-folder-green" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -57,7 +57,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree colors="blue:type in ('view');red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
+                <tree colors="blue:type == 'view';red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="quantity"/>
@@ -65,6 +65,7 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
+                    <field name="state" invisible="1"/>
                     <field name="currency_id" groups="base.group_extended"/>
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
@@ -90,15 +91,18 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Account Data">
-                            <field name="partner_id"/>
-                            <field name="contact_id"/>
-                            <field name="currency_id"/>
-                            <newline/>
-                            <field name="date_start"/>
-                            <field name="date"/>
-                            <newline/>
-                            <field name="quantity_max"/>
-                            <field name="user_id"/>
+                            <group colspan="2" col="2">
+                                <separator colspan="2" string="Contacts"/>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id)"/>
+                                <field name="contact_id"/>
+                                <field name="user_id"/>
+                            </group>
+                            <group colspan="2" col="2" name="contract">
+                                <separator colspan="2" string="Contract Data"/>
+                                <field name="date_start"/>
+                                <field name="date"/>
+                                <field name="quantity_max"/>
+                            </group>
                         </page>
                         <page string="Description">
                             <field colspan="4" name="description" nolabel="1"/>
@@ -137,7 +141,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
-            <field name="help">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.</field>
+            <field name="help">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.</field>
         </record>
 
         <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
@@ -204,7 +208,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
-                    <group col='6' colspan='4'>
+                    <group>
                         <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"/>
@@ -254,7 +258,6 @@
             <field eval="'account.analytic.account'" name="model"/>
             <field name="name">Open Account Tree</field>
             <field eval="'ir.actions.act_window,%d'%action_account_tree1" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <record id="account_analytic_line_extended_form" model="ir.ui.view">
@@ -430,13 +433,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
                            <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                           <field name="month" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="name"/>
+                           <field name="month"/>
+                        <field name="account_id"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml
index 5144ba8647a..7cfe43cd0f9 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -35,7 +35,6 @@
 
 		<record model="ir.values" id="account_analytic_balance_values">
             <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="object" eval="1" />
             <field name="name">Account Analytic Balance</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_balance'))" />
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index 93208532e45..186d39c4859 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -29,7 +29,7 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
     _columns = {
         'date1': fields.date('Start of period', required=True),
         'date2': fields.date('End of period', required=True),
-        'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'Journal_id', 'Journals'),
+        'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'journal_id', 'Journals'),
     }
 
     _defaults = {
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index 3bf5d54e8a6..128ea963982 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -34,7 +34,6 @@
 
 		<record model="ir.values" id="account_analytic_cost_ledger_journal_values">
 			<field name="model_id" ref="analytic.model_account_analytic_account" />
-			<field name="object" eval="1" />
 			<field name="name">Account Analytic Cost Ledger Journal</field>
 			<field name="key2">client_print_multi</field>
 			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost_ledger_journal'))" />
@@ -43,4 +42,4 @@
 		</record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
index a45eda32275..7695ccd3696 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -33,7 +33,6 @@
 
 		<record model="ir.values" id="account_analytic_cost_values">
             <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="object" eval="1" />
             <field name="name">Account Analytic Cost</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost'))" />
@@ -42,4 +41,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index 114c75f40af..c8e4762a132 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -33,7 +33,6 @@
 
         <record model="ir.values" id="account_analytic_invert_balance_values">
             <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="object" eval="1" />
             <field name="name">Account Analytic Inverted Balance</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
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 20777401da0..d924ceb2a7b 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -33,7 +33,6 @@
 
 		<record model="ir.values" id="account_analytic_journal_values">
 			<field name="model_id" ref="account.model_account_analytic_journal" />
-			<field name="object" eval="1" />
 			<field name="name">Account Analytic Journal</field>
 			<field name="key2">client_print_multi</field>
 			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_journal'))" />
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 7c09027f3ca..90254c53bda 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -33,7 +33,6 @@ import account_print_overdue
 import account_aged_partner_balance
 #import tax_report
 import account_tax_report
-import account_tax_code
 import account_balance_landscape
 import account_invoice_report
 import account_report
@@ -42,6 +41,7 @@ import account_analytic_entries_report
 import account_balance_sheet
 import account_profit_loss
 import account_treasury_report
+import account_financial_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index c76aba31763..fb79ab0d199 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -112,7 +112,7 @@
     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Chart of Account</para>
+          <para style="terp_tblheader_General_Centre">Chart of Accounts</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
@@ -196,25 +196,25 @@
           <para style="Total">Account Total</para>
         </td>
         <td>
-          <para style="Total_right">[[ formatLang(get_direction('6')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="Total_right">[[ formatLang(get_direction('6'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="Total_right">[[ formatLang(get_for_period('4')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('4'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="Total_right">[[ formatLang(get_for_period('3')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('3'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="Total_right">[[ formatLang(get_for_period('2')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('2'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="Total_right">[[ formatLang(get_for_period('1')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('1'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="Total_right">[[ formatLang(get_for_period('0')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="Total_right">[[ formatLang(get_for_period('0'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="Total_right">[[ formatLang(get_total('5')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="Total_right">[[ formatLang(get_total('5'), currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
 
@@ -224,25 +224,25 @@
           <para style="P2_content">[[ partner['name'] ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['direction']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(partner['direction'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['4'])]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(partner['4'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['3'])]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(partner['3'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['2']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(partner['2'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['1'])  ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(partner['1'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['0']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(partner['0'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(partner['total']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(partner['total'], currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -251,25 +251,25 @@
           <para style="P2_content">[[ not_partner['name'] ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['direction']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(not_partner['direction'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['4'])]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(not_partner['4'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['3'])]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(not_partner['3'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['2']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(not_partner['2'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['1'])  ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(not_partner['1'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['0']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(not_partner['0'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="content">[[ formatLang(not_partner['total']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="content">[[ formatLang(not_partner['total'], currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index a53e19721dd..1b7e7f9a84b 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -55,10 +55,10 @@ class analytic_entries_report(osv.osv):
                  select
                      min(a.id) as id,
                      count(distinct a.id) as nbr,
-                     a.create_date as date,
-                     to_char(a.create_date, 'YYYY') as year,
-                     to_char(a.create_date, 'MM') as month,
-                     to_char(a.create_date, 'YYYY-MM-DD') as day,
+                     a.date as date,
+                     to_char(a.date, 'YYYY') as year,
+                     to_char(a.date, 'MM') as month,
+                     to_char(a.date, 'YYYY-MM-DD') as day,
                      a.user_id as user_id,
                      a.name as name,
                      analytic.partner_id as partner_id,
@@ -76,9 +76,11 @@ class analytic_entries_report(osv.osv):
                      account_analytic_line a, account_analytic_account analytic
                  where analytic.id = a.account_id
                  group by
-                     a.create_date, a.user_id,a.name,analytic.partner_id,a.company_id,a.currency_id,
+                     a.date, a.user_id,a.name,analytic.partner_id,a.company_id,a.currency_id,
                      a.account_id,a.general_account_id,a.journal_id,
                      a.move_id,a.product_id,a.product_uom_id
             )
         """)
 analytic_entries_report()
+
+# 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 a9b781d21a9..4e8f708b62e 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -34,7 +34,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
-              <group col="10" colspan="12">
+              <group>
+                    <filter icon="terp-go-year" string="Year" 
+                            name="year"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="year"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="Month"
+                            name="month"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="current month"/>
+                    <filter icon="terp-go-month" string="Month-1"
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="last month"/>
+                    <separator orientation="vertical"/>               	
                     <filter icon="terp-go-year" string="  365 Days  "
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Entries of last 365 days"/>
@@ -44,11 +57,9 @@
                             help="Analytic Entries of last 30 days"/>
                     <filter icon="terp-go-week"
                             string="    7 Days    "
-                            separator="1"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Entries during last 7 days"/>
                     <separator orientation="vertical"/>
-                    <field name="date" />
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
                     <field name="user_id">
@@ -93,7 +104,7 @@
         <field name="res_model">analytic.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1, 'group_by_no_leaf':1, 'search_default_Account':1, 'search_default_Month':1, 'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1, 'group_by_no_leaf':1, 'search_default_Account':1, 'search_default_Month':1, 'group_by':[]}</field>
         <field name="search_view_id" ref="view_analytic_entries_report_search"/>
         <field name="help">From this view, have an analysis of your different analytic entries following the analytic account you defined matching your business need. Use the tool search to analyse information about analytic entries generated in the system.</field>
     </record>
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 3d971862bdc..0c4e633ec15 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -212,7 +212,7 @@
     <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
       <tr>
         <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
-        <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
+        <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -220,7 +220,7 @@
           <para style="terp_tblheader_General_Centre">Display Account</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and get_filter(data) ]]</font> </para>
+          <para style="terp_tblheader_General_Centre">Filter By <font>[[ data['form']['filter']!='filter_no' and get_filter(data) ]]</font> </para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Target Moves</para>
@@ -234,8 +234,8 @@
           <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
           <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-        <td>  <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="60.0,60.0" style="Table5">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td>  <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+          <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Date</para>
@@ -253,7 +253,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="60.0,60.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Period</para>
@@ -296,7 +296,7 @@
         <td><para style="P14"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td>
         <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
         <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font> </para></td>
-        <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
+        <td><para style="P3"><font>[[ (a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font> </para></td>
       </tr>
     </blockTable>
     <para style="P11">
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index b1e51e6fc46..ce9e3c51f06 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -136,7 +136,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                         'code': account.code,
                         'name': account.name,
                         'level': account.level,
-                        'balance':account.balance,
+                        'balance': account.balance != 0 and account.balance * account.user_type.sign or account.balance,
                         'type': account.type,
                     }
                     currency = account.currency_id and account.currency_id or account.company_id.currency_id
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 205bfff497b..620ec05b16a 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -172,17 +172,17 @@
     </para>
       <blockTable colWidths="120.0,100.0,140.0,90.0,90.0" style="Table2_header" >
       <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+        <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 <font>[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font></para></td>
+        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
     <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</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>
-          <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+          <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
         <tr>
                  <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
               <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@@ -192,7 +192,7 @@
               <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
             </tr>
           </blockTable>
-          <blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
         <tr>
               <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
               <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
@@ -236,12 +236,12 @@
         </td>
       </tr>
       <tr style="Table3">
-          [[ repeatIn(get_lines_another('asset'),'a' ) ]]  
+          [[ repeatIn(get_lines_another('asset'),'a' ) ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
         <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
         <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
-        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</para></td>
-        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</u></para></td>
+        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
+        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@@ -250,7 +250,7 @@
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj = company.currency_id) ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -278,12 +278,12 @@
         </td>
       </tr>
       <tr style="Table3">
-          [[ repeatIn(get_lines_another('liability'),'a' ) ]]  
+          [[ repeatIn(get_lines_another('liability'),'a' ) ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
         <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
         <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
-        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</para></td>
-        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</u></para></td>
+        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
+        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@@ -292,7 +292,7 @@
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj = company.currency_id) ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index 7e4f9f844a5..b2d54e33466 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -132,17 +132,17 @@
 
       <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header" >
       <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+        <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  [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
     <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</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>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
         <tr>
                  <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
               <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@@ -152,7 +152,7 @@
               <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
             </tr>
           </blockTable>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
         <tr>
               <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
               <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
@@ -196,40 +196,52 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code1'] ]]</font></para>
+          <para style="terp_default_9">
+            <font>[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code1'] ]]<font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
+          </para>
         </td>
         <td>
-          <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name1'] ]]</font></para>
+          <para style="terp_default_9">
+            <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
+          </para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance1']) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9">
+          <font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance1'], currency_obj=company.currency_id) ]]</font>
+          </para>
         </td>
         <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
+          <para style="terp_default_9">
+            [[ a['code'] ]]<font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
+          </para>
         </td>
         <td>
-          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
+          <para style="terp_default_9">
+            <font color="white">[[ '. '*(a['level']-1) ]]</font>
+            <font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font>
+          </para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
-<font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
-<font> [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9">
+            <font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
+            <font>[[(a['code'] and a['name']) and formatLang(a['balance'], currency_obj=company.currency_id) or removeParentNode('font')]]</font>
+          </para>
         </td>
-     </tr>
-     </blockTable>
-     <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
+      </tr>
+    </blockTable>
+    <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Balance:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 33566083652..8150871a6ef 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -235,19 +235,18 @@
     </blockTable>
 	<blockTable colWidths="130.0,80.0,100.0,130.0,100.0" style="Table2">
 		<tr>
-		<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
-      	 <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
+		<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">Journal</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  [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Target Moves</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">[[o.journal_id.name  ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@@ -257,7 +256,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
-        	<blockTable colWidths="65.0,65.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="65.0,65.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
@@ -299,7 +298,7 @@
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] </para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] </para></td>
-		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
+		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id ) ]]</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
@@ -308,7 +307,7 @@
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td>
-		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
+		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id ) ]]</para></td>
 		 <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
@@ -320,7 +319,7 @@
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para></td>
- 		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+ 		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'], currency_obj=company.currency_id ) ]]</para></td>
         </tr>
       </blockTable>
       <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
@@ -329,7 +328,7 @@
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para></td>
-  		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+  		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'], currency_obj=company.currency_id ) ]]</para></td>
 		  <td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
         </tr>
       </blockTable>
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 266b4a056d7..29e40c7d5ad 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -153,3 +153,5 @@ class account_entries_report(osv.osv):
             )
         """)
 account_entries_report()
+
+# 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 baa9e15182b..1ceb3b3bbbe 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.entries.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:move_state in ('draft');black:move_state in ('posted')" string="Entries Analysis">
+            <tree colors="blue:move_state == 'draft';black:move_state == 'posted'" string="Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
@@ -67,7 +67,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Entries Analysis">
-                <group colspan="10" col="12">
+                <group>
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
                             context="{'year':'current_year'}"
diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py
new file mode 100644
index 00000000000..e9da0a1cd7b
--- /dev/null
+++ b/addons/account/report/account_financial_report.py
@@ -0,0 +1,96 @@
+##############################################################################
+#
+#    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
+from common_report_header import common_report_header
+from tools.translate import _
+
+class report_account_common(report_sxw.rml_parse, common_report_header):
+
+    def __init__(self, cr, uid, name, context=None):
+        super(report_account_common, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'get_lines': self.get_lines,
+            'time': time,
+            'get_fiscalyear': self._get_fiscalyear,
+            'get_account': self._get_account,
+            'get_start_period': self.get_start_period,
+            'get_end_period': self.get_end_period,
+            'get_filter': self._get_filter,
+            'get_start_date':self._get_start_date,
+            'get_end_date':self._get_end_date,
+        })
+        self.context = context
+
+    def set_context(self, objects, data, ids, report_type=None):
+        new_ids = ids
+        if (data['model'] == 'ir.ui.menu'):
+            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        return super(report_account_common, self).set_context(objects, data, new_ids, report_type=report_type)
+
+    def get_lines(self, data):
+        lines = []
+        account_obj = self.pool.get('account.account')
+        currency_obj = self.pool.get('res.currency')
+        ids2 = self.pool.get('account.financial.report')._get_children_by_order(self.cr, self.uid, [data['form']['account_report_id'][0]], context=data['form']['used_context'])
+        for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=data['form']['used_context']):
+            vals = {
+                'name': report.name,
+                'balance': report.balance,
+                'type': 'report',
+                'level': report.level,
+            }
+            if data['form']['enable_filter']:
+                vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance
+            lines.append(vals)
+            account_ids = []
+            if report.type == 'accounts' and report.display_detail and report.account_ids:
+                account_ids = account_obj._get_children_and_consol(self.cr, self.uid, [x.id for x in report.account_ids])
+            elif report.type == 'account_type' and report.account_type_ids:
+                account_ids = account_obj.search(self.cr, self.uid, [('user_type','in', [x.id for x in report.account_type_ids])])
+            if account_ids:
+                for account in account_obj.browse(self.cr, self.uid, account_ids, context=data['form']['used_context']):
+                    if account.type != 'view':
+                        flag = False
+                        vals = {
+                            'name': account.code + ' ' + account.name,
+                            'balance':  account.balance != 0 and account.balance * account.user_type.sign or account.balance,
+                            'type': 'account',
+                            'level': 6,
+                            'account_type': account.type,
+                        }
+                        if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
+                            flag = True
+                        if data['form']['enable_filter']:
+                            vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
+                            if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
+                                flag = True
+                        if flag:
+                            lines.append(vals)
+        return lines
+
+report_sxw.report_sxw('report.account.financial.report', 'account.financial.report',
+    'addons/account/report/account_financial_report.rml', parser=report_account_common, header='internal')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_financial_report.rml b/addons/account/report/account_financial_report.rml
new file mode 100644
index 00000000000..6a94f02c719
--- /dev/null
+++ b/addons/account/report/account_financial_report.rml
@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<document filename="Financial Report.pdf">
+  <template pageSize="(595.0,842.0)" title="Financial Report" author="OpenERP S.A. (sales@openerp.com)" 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="Table_Heading">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Company_Name">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Date_from_To">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Account_Line_Title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="MIDDLE"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+    </blockTableStyle>
+     <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Net_Profit_Loss">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Final_Result">
+      <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="Table2_header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
+      <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="LINEAFTER" 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"/>
+      <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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <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="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+
+    <paraStyle name="terp_level_0_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_0_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_4_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_5_name" fontName="Helvetica" fontSize="8.0" leftIndent="40.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_5_balance" fontName="Helvetica-Oblique" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_6_name" fontName="Helvetica" fontSize="8.0" leftIndent="50.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_6_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+
+    <blockTableStyle id="Table1">
+      <blockTopPadding start="0,0" stop="-1,0" length="15"/>
+      <blockFont name="Helvetica-Bold" size="10.0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,1" thickness="1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockTopPadding start="0,0" stop="-1,0" length="10"/>
+      <blockAlignment value="LEFT"/>
+      <lineStyle kind="LINEBELOW" colorName="#666666" start="1,1" stop="1,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table2_Report">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="#cccccc"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table1_main">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+
+
+</stylesheet>
+  <images/>
+  <story>
+    <blockTable colWidths="539.0" style="Table_Company_Name">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">[[ data['form']['account_report_id'][1] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+      <blockTable colWidths="163.0,163.0,163.0" style="Table2_header">
+      <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>
+      </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>
+            <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>
+                    <td><para style="terp_tblheader_General_Centre">End Date</para></td>
+                </tr>
+                <tr>
+                    <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+                    <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+                </tr>
+            </blockTable>
+            <blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+                <tr>
+                    <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
+                    <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+                </tr>
+                <tr>
+                    <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+                    <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+                </tr>
+             </blockTable>
+            </td>
+    </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+        <font color="white"> </font>
+    </para>
+    <blockTable colWidths="390.0,100.0" style="Table_Account_Line_Title">
+      [[ data['form']['enable_filter'] == 0 or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+      <tr style="Table1">
+          [[ repeatIn(get_lines(data), 'a') ]]
+          [[ (a.get('level') &lt;&gt; 0) or removeParentNode('tr') ]]
+          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]]
+          <td><para style="terp_level_1_name">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_name'}) ]] [[ a.get('name') ]]</para></td>
+          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</u></para></td>
+          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</para></td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="263.0,100.0,100" style="Table_Account_Line_Title">
+      [[ data['form']['enable_filter'] == 1 or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['label_filter'] ]]</para>
+        </td>
+      </tr>
+      <tr style="Table3">
+          [[ repeatIn(get_lines(data), 'a') ]]
+          [[ (a.get('level') &lt;&gt; 0) or removeParentNode('tr') ]]
+          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]]
+          <td><para style="terp_level_1_name">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_name'}) ]] [[ a.get('name') ]]</para></td>
+          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</u></para></td>
+          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</para></td>
+          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'))]] [[company.currency_id.symbol]]</u></para></td>
+          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'))]] [[company.currency_id.symbol]]</para></td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index f4cc13069c8..61140331612 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -221,18 +221,18 @@
       <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
       <tr>
       	<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
+      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
     	<td><para style="terp_tblheader_General_Centre">Journals</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 [[ data['form']['filter']!='filter_no' and  get_filter(data) ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</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">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@@ -242,7 +242,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
@@ -273,7 +273,7 @@
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]] </para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>
- 		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit()- sum_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
+ 		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit()- sum_credit(), currency_obj=company.currency_id) ]]</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="100.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Title" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
@@ -290,7 +290,7 @@
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>
-		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()- sum_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
+		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()- sum_debit(), currency_obj=company.currency_id) ]]</para></td>
       </tr>
     </blockTable>
 
@@ -311,7 +311,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]]</para>
           </td>
           <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id), currency_obj=company.currency_id) ]] </para>
 
           </td>
      		<td>
@@ -337,7 +337,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)) ]] </para>
           </td>
           <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id)-sum_debit_period(o.id), currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -358,7 +358,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para>
           </td>
       		<td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'], currency_obj=company.currency_id ) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -371,7 +371,7 @@
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
-		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]]</para></td>
+		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'], currency_obj=company.currency_id ) ]]</para></td>
           <td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
         </tr>
       </blockTable>
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 15614444822..7a6e2d485ca 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -270,7 +270,7 @@
 	          <para style="terp_tblheader_Details">Date</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details">JNRL</para>
+	          <para style="terp_tblheader_Details">JRNL</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details">Partner</para>
@@ -304,7 +304,7 @@
 	          <para style="terp_tblheader_Details">Date</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details">JNRL</para>
+	          <para style="terp_tblheader_Details">JRNL</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details">Partner</para>
@@ -344,16 +344,16 @@
     <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Chart of Account</para>
+          <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">Journal</para>
+          <para style="terp_tblheader_General_Centre">Journals</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Target Moves</para>
@@ -372,8 +372,8 @@
           <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table2">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
+          <blockTable colWidths="58.0,58.0" style="Table2">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Date</para>
@@ -383,7 +383,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
@@ -393,7 +393,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Period</para>
@@ -403,7 +403,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
@@ -431,7 +431,7 @@
           <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_tblheader_Details">JRNL</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
@@ -476,10 +476,10 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -515,7 +515,7 @@
               <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]] </para>
             </td>
             <td>
               <para style="terp_default_Right_8"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
@@ -530,7 +530,7 @@
           <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_tblheader_Details">JRNL</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
@@ -572,7 +572,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -608,7 +608,7 @@
               <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index ac100c3ecd0..79003c5aaa6 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -361,7 +361,7 @@
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
@@ -373,7 +373,7 @@
           <para style="terp_tblheader_General_Centre">Display Account</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Entries Sorted By</para>
@@ -398,8 +398,8 @@
           <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_7">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
+          <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Date</para>
@@ -409,7 +409,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_7">[[ formatLang(get_start_date(data),date=True) ]]</para>
@@ -419,7 +419,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Period</para>
@@ -429,7 +429,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table6">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table6">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_7">[[ get_start_period(data) or removeParentNode('para') ]]</para>
@@ -505,10 +505,10 @@
             <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency = company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -547,7 +547,7 @@
               <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_7">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</para>
@@ -607,7 +607,7 @@
             <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -646,7 +646,7 @@
               <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]] </para>
             </td>
           </tr>
         </blockTable>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 963c41b0a0f..598f6c40278 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.invoice.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('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')"  string="Invoices Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -57,7 +57,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
-              <group col="10" colspan="12">
+              <group>
+                    <filter icon="terp-go-year" string="Year" 
+                            name="year"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="year"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="Month"
+                            name="month"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="current month"/>
+                    <filter icon="terp-go-month" string="Month-1"
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="last month"/>
+                    <separator orientation="vertical"/>              	
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -78,7 +91,6 @@
                             help="Customer Invoices And Refunds"/>
                     <filter icon="terp-personal"
                             string="Supplier"
-                            separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
                             help="Supplier Invoices And Refunds"/>
                    <separator orientation="vertical"/>
@@ -87,28 +99,14 @@
                             help="Customer And Supplier Invoices"/>
                    <filter icon="terp-dolar_ok!"
                             string="Refund"
-                            separator="1"
                             domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
                             help="Customer And Supplier Refunds"/>
                    <separator orientation="vertical"/>
                    <field name="partner_id"/>
                    <field name="user_id" />
-                   <field name="date" string="Invoice Date"/>
                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="product_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="account_id"/>
-                    <field name="account_line_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -140,7 +138,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_current':1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">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.</field>
 
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 9b0ac55bb56..2ebdc29047d 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -186,7 +186,7 @@
       <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
       <tr>
           <td><para style="terp_tblheader_General_Centre">  [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
+          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Journal</para></td>
         <td><para style="terp_tblheader_General_Centre">Filters By </para></td>
@@ -197,8 +197,8 @@
        <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
         <td><para style="terp_default_Centre_8">[[o.journal_id.name  ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-            <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+            <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
                 <tr>
                    <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
                     <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@@ -208,7 +208,7 @@
                     <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
                 </tr>
             </blockTable>
-            <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+            <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
                 <tr>
                     <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
                     <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
@@ -247,8 +247,8 @@
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
-        <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td>
+        <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td>
       </tr>
       <para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]</font></para>
       <tr>
@@ -258,8 +258,8 @@
         <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
         <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,17) ]]</para></td>
         <td><para style="terp_default_8">[[ strip_name(line.name,27) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit, currency_obj=company.currency_id) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit, currency_obj=company.currency_id) ]]</para></td>
       </tr>
     </blockTable>
 
@@ -282,8 +282,8 @@
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
-        <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td>
+        <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id), currency_obj=company.currency_id) ]]</para></td>
         <!-- given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it-->
         <td><para style="P12"> <!--o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol --></para></td>
       </tr>
@@ -295,9 +295,9 @@
         <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
         <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,15) ]]</para></td>
         <td><para style="terp_default_8">[[ strip_name(line.name,17) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit, currency_obj=company.currency_id) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit, currency_obj=company.currency_id) ]]</para></td>
+        <td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency, currency_obj=line.currency_id) or '' ]]</para></td>
       </tr>
     </blockTable>
   </story>
diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index 6425d6a4db6..cb3bbeb0921 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -184,10 +184,10 @@
     </para>
         <blockTable colWidths="90.0,80.0,80.0,130.0,80.0,80.0" style="Table2_header">
       <tr>
-      	 <td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
+      	 <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">Journals</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 [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Partner's</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
@@ -196,8 +196,8 @@
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
 		<td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
 
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@@ -207,7 +207,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
@@ -241,16 +241,16 @@
         <td><para style="P8"></para></td>
         <td><para style="P8"><u>[[ formatLang(sum_debit()) ]]</u></para></td>
         <td><para style="P8"><u>[[ formatLang(sum_credit()) ]]</u></para></td>
-        <td><para style="P8"><u>[[ formatLang((sum_debit()-sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para></td>
-        <td><para style="P8"><u>[[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang((sum_debit()-sum_credit()), currency_obj=company.currency_id) ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_litige(), currency_obj=company.currency_id) ]]</u></para></td>
       </tr>
       <tr>
         <td><para style="P3">[[ repeatIn(lines(), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
         <td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td>
         <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]]</para></td>
         <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]]</para></td>
-        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</para></td>
-        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.0) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.0, currency_obj=company.currency_id) ]]</para></td>
       </tr>
     </blockTable>
   </story>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index c1ef9b22502..b81f6436a12 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -280,7 +280,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -308,7 +308,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -346,13 +346,13 @@
     <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Chart of Account</para>
+          <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">Journal</para>
+          <para style="terp_tblheader_General_Centre">Journals</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
@@ -378,7 +378,7 @@
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Date</para>
@@ -388,7 +388,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table9">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table9">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
@@ -398,7 +398,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table10">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Period</para>
@@ -408,7 +408,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table11">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table11">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
@@ -443,7 +443,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -477,7 +477,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -497,7 +497,7 @@
               <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2], currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -528,7 +528,7 @@
               <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress']), currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -544,7 +544,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -581,7 +581,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]] </para>
           </td>
           <td>
             <para style="terp_default_Bold_9_Right">
@@ -604,7 +604,7 @@
               <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2], currency_obj=company.currency_id) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_9">
@@ -640,7 +640,7 @@
               <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress']), currency_obj=company.currency_id) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 2f58fc8ec95..ff68c083087 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -281,7 +281,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -310,7 +310,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -347,13 +347,13 @@
     <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Chart of Account</para>
+          <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">Journal</para>
+          <para style="terp_tblheader_General_Centre">Journals</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
@@ -379,7 +379,7 @@
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Date</para>
@@ -389,7 +389,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table9">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table9">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
@@ -399,7 +399,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table10">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_tblheader_General_Centre">Start Period</para>
@@ -409,7 +409,7 @@
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table11">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table11">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
             <tr>
               <td>
                 <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
@@ -441,7 +441,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -482,7 +482,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -502,7 +502,7 @@
               <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2], currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -533,7 +533,7 @@
               <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress']), currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -546,7 +546,7 @@
             <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">JNRL</para>
+            <para style="terp_tblheader_Details">JRNL</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Ref</para>
@@ -590,7 +590,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p)), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_9_Right">
@@ -613,7 +613,7 @@
               <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2], currency_obj=company.currency_id) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">
@@ -649,7 +649,7 @@
               <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress']), currency_obj=company.currency_id) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 0350fbf7379..db8f752a56d 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -263,7 +263,7 @@
             <para style="terp_default_Centre_9">[[ formatLang(l.discount, dp='Account') ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Account', currency_obj=o.currency_id) ]]</para>
           </td>
         </tr>
         <tr>
@@ -309,7 +309,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -322,7 +322,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -335,7 +335,7 @@
           <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -368,10 +368,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, 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/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 0797d544f9b..25ccad25377 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -219,7 +219,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">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) 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>
@@ -244,7 +244,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">
@@ -264,7 +264,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">
@@ -279,10 +279,10 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]].</para>
+    <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0)), currency_obj=company.currency_id) ]].</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index 6c70bb47310..0918dcb2699 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -149,17 +149,17 @@
  		<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
       <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+      	<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 [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</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>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@@ -169,7 +169,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
@@ -193,7 +193,7 @@
           <para style="terp_default_Bold_9">Code</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Particular</para>
+          <para style="terp_default_Bold_9">Expenses</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Balance</para>
@@ -202,7 +202,7 @@
           <para style="terp_default_Bold_9">Code</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Particular</para>
+          <para style="terp_default_Bold_9">Income</para>
         </td>
         <td>
           <para style="P1">Balance</para>
@@ -212,7 +212,7 @@
           <td>
             <para style="terp_default_9">
 
-              <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
+              <font>[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
             </para>
           </td>
           <td>
@@ -221,7 +221,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance']), currency_obj=company.currency_id) ]]</font></para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -234,7 +234,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1']), currency_obj=company.currency_id) or removeParentNode('font') ]]</font></para>
           </td>
         </tr>
       </blockTable>
@@ -247,7 +247,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance']), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9"></para>
@@ -256,7 +256,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance']), currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -267,13 +267,13 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr()), currency_obj=company.currency_id) ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr()), currency_obj=company.currency_id) ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 4c8896ee630..27182cdbd21 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -141,11 +141,15 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
                           'code': cal_list['expense'][i].code,
                           'name': cal_list['expense'][i].name,
                           'level': cal_list['expense'][i].level,
-                          'balance':cal_list['expense'][i].balance,
+                          'balance': cal_list['expense'][i].balance != 0 and \
+                                    cal_list['expense'][i].balance * cal_list['expense'][i].user_type.sign or \
+                                    cal_list['expense'][i].balance,
                           'code1': cal_list['income'][i].code,
                           'name1': cal_list['income'][i].name,
                           'level1': cal_list['income'][i].level,
-                          'balance1':cal_list['income'][i].balance,
+                          'balance1': cal_list['income'][i].balance != 0 and \
+                                        cal_list['income'][i].balance * cal_list['income'][i].user_type.sign or \
+                                        cal_list['income'][i].balance,
                           }
                     self.result_temp.append(temp)
                 else:
@@ -158,7 +162,9 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
                               'code1': cal_list['income'][i].code,
                               'name1': cal_list['income'][i].name,
                               'level1': cal_list['income'][i].level,
-                              'balance1':cal_list['income'][i].balance,
+                              'balance1': cal_list['income'][i].balance != 0 and \
+                                            cal_list['income'][i].balance * cal_list['income'][i].user_type.sign \
+                                            or cal_list['income'][i].balance,
                               }
                         self.result_temp.append(temp)
                     if  i < len(cal_list['expense']):
@@ -166,7 +172,9 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
                               'code': cal_list['expense'][i].code,
                               'name': cal_list['expense'][i].name,
                               'level': cal_list['expense'][i].level,
-                              'balance':cal_list['expense'][i].balance,
+                              'balance': cal_list['expense'][i].balance != 0 and \
+                                            cal_list['expense'][i].balance * cal_list['expense'][i].user_type.sign \
+                                            or cal_list['expense'][i].balance,
                               'code1': '',
                               'name1': '',
                               'level1': False,
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 2b29f479478..28fe167aef5 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -172,17 +172,17 @@
     </para>
       <blockTable colWidths="125.0,100.0,140.0,80.0,90.0" style="Table2_header">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+      	<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 [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</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>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@@ -192,7 +192,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
         	</blockTable>
-        	<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
@@ -224,12 +224,12 @@
         </td>
       </tr>
       <tr style="Table3">
-          [[ repeatIn(get_lines_another('expense'),'a' ) ]]  
+          [[ repeatIn(get_lines_another('expense'),'a' ) ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
         <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
         <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
-        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</para></td>
-        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
+        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</para></td>
+        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="100.0,326.0,113.0" style="Table_Net_Profit_Loss">
@@ -241,7 +241,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(final_result()['balance']) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(final_result()['balance'], currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -251,7 +251,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -273,12 +273,12 @@
         </td>
       </tr>
       <tr style="Table3">
-          [[ repeatIn(get_lines_another('income'),'a' ) ]]  
+          [[ repeatIn(get_lines_another('income'),'a' ) ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
         <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
         <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
-        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</para></td>
-        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance) ]] [[company.currency_id.symbol ]]</u></para></td>
+        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</para></td>
+        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="100.0,326.0,113.0" style="Table4">
@@ -290,7 +290,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(final_result()['balance']) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(final_result()['balance'], currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -300,7 +300,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index a0cee804992..c581f19c17b 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -88,7 +88,7 @@
             <field name="model">report.invoice.created</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
+                <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
                    	<field name="create_date" select="1"/>
                     <field name="name" select="1"/>
                     <field name="type"/>
@@ -152,8 +152,8 @@
 					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
 					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
 					<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
+					<field name="name"/>
+					<field name="month"/>
                </search>
             </field>
         </record>
@@ -218,8 +218,8 @@
 					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
 					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
 					<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
+					<field name="name"/>
+					<field name="month"/>
                </search>
             </field>
         </record>
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
deleted file mode 100644
index 56895987b45..00000000000
--- a/addons/account/report/account_tax_code.py
+++ /dev/null
@@ -1,63 +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 report import report_sxw
-
-def _get_country(record):
-    if record.partner_id \
-            and record.partner_id.address \
-            and record.partner_id.address[0].country_id:
-        return record.partner_id.address[0].country_id.code
-    else:
-        return ''
-
-def _record_to_report_line(record):
-    return {'date': record.date,
-            'ref': record.ref,
-            'acode': record.account_id.code,
-            'name': record.name,
-            'debit': record.debit,
-            'credit': record.credit,
-            'pname': record.partner_id and record.partner_id.name or '',
-            'country': _get_country(record)
-            }
-
-class account_tax_code_report(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'time': time,
-            'get_line':self.get_line,
-        })
-
-    def get_line(self, obj):
-        line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
-        if not line_ids: return []
-
-        return map(_record_to_report_line,
-                   self.pool.get('account.move.line')\
-                       .browse(self.cr, self.uid, line_ids))
-
-report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
-    'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header="internal")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
deleted file mode 100644
index 7489ac72a39..00000000000
--- a/addons/account/report/account_tax_code.rml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Accounting Entries.pdf">
-  <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Line_Title">
-      <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Line_Content_Detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.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_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_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_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
-    <blockTable colWidths="539.0" repeatRows="1" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Accounting Entries-[[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="52.0,68.0,55.0,110.0,130.0,64.0,60.0" repeatRows="1" style="Table_Line_Title">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Voucher No</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">A/c Code</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Third Party (Country)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(get_line(o),'line') ]]</para>
-      <blockTable colWidths="52.0,68.0,54.0,110.0,131.0,63.0,60.0" style="Table_Line_Content_Detail">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ not line and removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['ref'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['acode'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['pname'] ]] ([[ line['country'] ]] )</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-    </section>
-  </story>
-</document>
\ No newline at end of file
diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index de4aa415fef..f489ee1143e 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -153,7 +153,7 @@
 	       <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'], data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])&lt;5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]]  [[ o['name'] ]] </font></para></td>
            <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td>
            <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td>
-           <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
+           <td><para style="P6"><font>[[ len(o['level'])&lt;5 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount'], currency_obj=company.currency_id) ]]</font> </para></td>
 	  </tr>
 	  </blockTable>
   </story>
diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py
index fce3661b4c4..40d9364981f 100644
--- a/addons/account/report/account_treasury_report.py
+++ b/addons/account/report/account_treasury_report.py
@@ -79,3 +79,5 @@ class account_treasury_report(osv.osv):
             )
         """)
 account_treasury_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index 48e26e839d3..c0365875bdc 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 'Date'
             elif data['form']['filter'] == 'filter_period':
-                return _('Periods')
-        return _('No Filter')
+                return 'Periods'
+        return 'No Filter'
 
     def _sum_debit_period(self, period_id, journal_id=None):
         journals = journal_id or self.journal_ids
@@ -141,3 +141,5 @@ class common_report_header(object):
         return ''
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index cd945a2248d..79e4dbb0c03 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -67,6 +67,7 @@
 "access_account_fiscalyear_employee","account.fiscalyear employee","model_account_fiscalyear","base.group_user",1,0,0,0
 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
+"access_res_currency_rate_type_account_manager","res.currency.rate.type account manager","base.model_res_currency_rate_type","group_account_manager",1,1,1,1
 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
 "access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
 "access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
@@ -127,4 +128,7 @@
 "access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
 "access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
 "access_account_treasury_report_manager","account.treasury.report.manager","model_account_treasury_report","account.group_account_manager",1,0,0,0
+"access_account_financial_report","account.financial.report","model_account_financial_report","account.group_account_user",1,1,1,1
+"access_account_financial_report_invoice","account.financial.report invoice","model_account_financial_report","account.group_account_invoice",1,0,0,0
+"access_account_financial_report_manager","account.financial.report","model_account_financial_report","account.group_account_manager",1,1,1,1
 
diff --git a/addons/account/test/account_bank_statement.yml b/addons/account/test/account_bank_statement.yml
index 6b66dd9029c..37789f3ad66 100644
--- a/addons/account/test/account_bank_statement.yml
+++ b/addons/account/test/account_bank_statement.yml
@@ -1,5 +1,13 @@
 -
   In order to test Bank Statement feature of account I create a bank statement line and confirm it and check it's move created
+-
+  I select the period and journal for the bank statement
+-
+  !python {model: account.bank.statement}: |
+    import time
+    journal = self._default_journal_id(cr, uid, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
+      'journal_type': 'bank', 'period_id': time.strftime('%m'), 'active_ids': [ref('menu_bank_statement_tree')], 'active_id': ref('menu_bank_statement_tree')})
+    assert journal, _('Journal has not been selected')
 -
   I create a bank statement with Opening and Closing balance 0.
 -
@@ -8,29 +16,26 @@
     balance_start: 0.0
     date: !eval time.strftime('%Y-%m-%d')
     journal_id: account.bank_journal
-    name: /
-    period_id: account.period_10
-    line_ids:
-      - account_id: account.a_recv
-        amount: 1000.0
-        date: !eval time.strftime('%Y-%m-%d')
-        name: a
-        partner_id: base.res_partner_4
-        sequence: 0.0
-        type: general
 -
-  I check that Initially bank statement is in the "Draft" state
+  I create bank statement line
 -
-  !assert {model: account.bank.statement, id: account_bank_statement_0}:
-    - state == 'draft'
+  !python {model: account.bank.statement.line}: |
+    partner = self.onchange_partner_id(cr, uid, [], ref('base.res_partner_4'), context=None)
+    vals = {
+        'account_id': partner['value']['account_id'],
+        'amount': 1000.0,
+        'partner_id': ref('base.res_partner_4'),
+        'statement_id': ref('account_bank_statement_0'),
+        'name': 'EXT001'
+    }
+    vals.update(partner.get('value',{}))
+    line_id = self.create(cr, uid, vals)
+    assert line_id, "Account bank statement line has not been created"
 -
   I compute bank statement using Compute button
 -
   !python {model: account.bank.statement}: |
-    self.button_dummy(cr, uid, [ref("account_bank_statement_0")], {"lang": "en_US",
-      "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank", "section_id":
-      False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")],
-      "active_id": ref("account.menu_bank_statement_tree"), })
+    self.button_dummy(cr, uid, [ref("account_bank_statement_0")])
 
 -
   I modify the bank statement and set the Closing Balance.
@@ -42,10 +47,7 @@
   I confirm the bank statement using Confirm button
 -
   !python {model: account.bank.statement}: |
-    self.button_confirm_bank(cr, uid, [ref("account_bank_statement_0")], {"lang":
-      "en_US", "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank",
-      "section_id": False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")],
-      "active_id": ref("account.menu_bank_statement_tree"), })
+    self.button_confirm_bank(cr, uid, [ref("account_bank_statement_0")])
 -
   I check that bank statement state is now "Closed"
 -
@@ -61,3 +63,11 @@
     assert bank_data.move_line_ids, "Move lines not created for bank statement"
     for line in bank_data.move_line_ids:
       assert line.move_id.state == 'posted', "Move state is not posted"
+-
+  Then I cancel Bank Statements and verifies that it raises a warning
+-
+  !python {model: account.bank.statement}: |
+    try:
+      self.button_cancel(cr, uid, [ref("account_bank_statement_0")])
+    except Exception, e:
+      assert e[0]=='UserError', 'Another exception has been raised!'
diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml
index 479afd2f2e2..5ec7405d719 100644
--- a/addons/account/test/account_change_currency.yml
+++ b/addons/account/test/account_change_currency.yml
@@ -33,11 +33,11 @@
 -
   !python {model: account.change.currency}: |
     self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      "active_model": "account.invoice", "tz": False, "active_ids":
       [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
     })
     self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      "active_model": "account.invoice", "tz": False, "active_ids":
       [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
     })
 -
@@ -71,7 +71,7 @@
 -
   !python {model: account.change.currency}: |
     self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      "active_model": "account.invoice", "tz": False, "active_ids":
       [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
       })
 -
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index d14bf6f3cc1..a980823590d 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -1,23 +1,46 @@
 -
   In order to test account invoice I create a new customer invoice
 -
-  !record {model: account.invoice, id: account_invoice_customer0}:
-    account_id: account.a_recv
-    address_contact_id: base.res_partner_address_zen
-    address_invoice_id: base.res_partner_address_zen
+  I will create bank detail
+-
+  !record {model: res.partner.bank, id: res_partner_bank_0}:
+    state: bank
     company_id: base.main_company
-    currency_id: base.EUR
-    date_invoice: !eval time.strftime('%Y-%m-%d')
-    invoice_line:
-      - account_id: account.a_sale
-        name: '[PC3] Medium PC'
-        price_unit: 900.0
-        quantity: 10.0
-        product_id: product.product_product_pc3
-        uos_id: product.product_uom_unit
+    partner_id: base.main_partner
+    acc_number: 123456789
+    footer: True
+    bank: base.res_bank_1
+    bank_name: Reserve
+-
+  I create a customer invoice
+-
+  !record {model: account.invoice, id: account_invoice_customer0, view: invoice_form}:
+    payment_term: account.account_payment_term_advance
+    partner_bank_id: res_partner_bank_0
     journal_id: account.sales_journal
     partner_id: base.res_partner_3
     reference_type: none
+    name: 'Test Customer Invoice'
+    invoice_line:
+      - product_id: product.product_product_pc3
+        quantity: 10.0
+-
+  I manually assign tax on invoice
+-
+  !python {model: account.invoice.tax}: |
+    amt = self.amount_change(cr, uid, [], 50.0, ref('base.EUR'), ref('base.main_company'), False)
+    base_amt = self.base_change(cr, uid, [], 9000.0, ref('base.EUR'), ref('base.main_company'), False)
+    invoice_tax_line = {
+        'name':  'Test Tax for Customer Invoice',
+        'manual': 1,
+        'base': base_amt['value']['base_amount'],
+        'amount': amt['value']['tax_amount'],
+        'account_id': ref('account.ova'),
+        'invoice_id': ref("account_invoice_customer0"),
+        }
+    tax = self.create(cr, uid, invoice_tax_line)
+    assert tax, "Tax has not been assigned correctly"
+
 -
   I check that Initially customer invoice is in the "Draft" state
 -
@@ -54,6 +77,23 @@
   !python {model: account.invoice}: |
     acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
     assert acc_id.move_id, "Move not created for open invoice"
+-
+  I pay the Invoice
+-
+  !python {model: account.invoice}: |
+    import time
+    pay = self.pay_and_reconcile(cr, uid, [ref('account_invoice_customer0')],
+        9050.0, ref('cash'), ref('account.period_10'),
+        ref('bank_journal'), ref('cash'),
+        ref('account.period_10'), ref('bank_journal'),
+        name='Payment for test customer invoice')
+    assert (pay == True), "Incorrect Payment"
+-
+  I verify that invoice is now in Paid state
+-
+  !python {model: account.invoice}: |
+    inv = self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert (inv.state == 'paid'), "Invoice is not in Paid state"
 -
   I refund the invoice Using Refund Button
 -
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 109b098d6a7..1e24d2ca0e7 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -26,7 +26,6 @@
     code: NEW
     type: situation
     analytic_journal_id: sit
-    sequence_id: sequence_journal
     default_debit_account_id: cash
     default_credit_account_id: cash
     company_id: base.main_company
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index d5bb6bada65..40ba7ea7127 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -147,7 +147,7 @@
   !python {model: account.account}: |
     ctx={}
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False,'target_move': 'all'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
@@ -156,7 +156,7 @@
   !python {model: account.account}: |
     ctx={}
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True,'target_move': 'all'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index 7d1a54cffd6..3683a3e44c9 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -1,5 +1,25 @@
 -
   In order to test account invoice I create a new supplier invoice
+-
+  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 a supplier invoice
 -
   !record {model: account.invoice, id: account_invoice_supplier0}:
     account_id: account.a_pay
@@ -15,6 +35,8 @@
         product_id: product.product_product_pc1
         quantity: 10.0
         uos_id: product.product_uom_unit
+        invoice_line_tax_id:
+                  - tax10
     journal_id: account.expenses_journal
     partner_id: base.res_partner_desertic_hispafuentes
     reference_type: none
@@ -32,4 +54,38 @@
   I check that the invoice state is now "Open"
 -
   !assert {model: account.invoice, id: account_invoice_supplier0}:
-    - state == 'open'
\ No newline at end of file
+    - state == 'open'
+-
+  I verify that account move is created
+-
+  !python {model: account.invoice}: |
+    move_obj = self.pool.get('account.move')
+    inv = self.browse(cr, uid, ref('account_invoice_supplier0'))
+    move = inv.move_id
+    get_period = move_obj._get_period(cr, uid, {'lang': u'en_US', 'active_model': 'ir.ui.menu',
+      'active_ids': [ref('menu_action_move_journal_line_form')], 'tz': False, 'active_id': ref('menu_action_move_journal_line_form')})
+    amt = move_obj._search_amount(cr, uid, move_obj, 'amount', [('amount', '=', 3100.0)], {'lang': u'en_US', 'active_model': 'ir.ui.menu',
+      'active_ids': [ref('menu_action_move_journal_line_form')], 'tz': False, 'active_id': ref('menu_action_move_journal_line_form')})
+    ids = amt[0][2]
+    amt_compute = move_obj._amount_compute(cr, uid, list(ids), 'amount', None, {'lang': u'en_US', 'active_model': 'ir.ui.menu',
+      'active_ids': [ref('menu_action_move_journal_line_form')], 'tz': False, 'active_id': ref('menu_action_move_journal_line_form')}, where ='')
+    move_amount = amt_compute.values()
+    assert(inv.move_id and move.period_id.id == get_period and move_amount[0] == 3100.0), ('Journal Entries has not been created')
+-
+  I cancel the account move which is in posted state and verifies that it gives warning message
+-
+  !python {model: account.move}: |
+    inv_obj = self.pool.get('account.invoice')
+    inv = inv_obj.browse(cr, uid, ref('account_invoice_supplier0'))
+    try:
+      mov_cancel = self.button_cancel(cr, uid, [inv.move_id.id], {'lang': u'en_US', 'tz': False,
+        'active_model': 'ir.ui.menu', 'journal_type': 'purchase', 'active_ids': [ref('menu_action_invoice_tree2')],
+        'type': 'in_invoice', 'active_id': ref('menu_action_invoice_tree2')})
+    except Exception, e:
+      assert e, 'Warning message has not been raised'
+-
+  I verify that 'Period Sum' and 'Year sum' of the tax code are the expected values 
+-
+  !python {model: account.tax.code}: |
+    tax_code = self.browse(cr, uid, ref('tax_case'))
+    assert(tax_code.sum_period == 100.0 and tax_code.sum == 100.0), "Incorrect 'Period Sum' / 'Year sum' expected twice 100.0, got period=%r and year=%r)" % (tax_code.sum_period,tax_code.sum)
diff --git a/addons/account/test/account_use_model.yml b/addons/account/test/account_use_model.yml
index ddb18c1a7d4..ab69b251919 100644
--- a/addons/account/test/account_use_model.yml
+++ b/addons/account/test/account_use_model.yml
@@ -6,20 +6,24 @@
     lines_id:
       - account_id: account.a_recv
         credit: 0.0
+        debit: 100.0
+        name: model_line_db
+        sequence: 0.0
+        quantity: 0.0
+        partner_id: base.res_partner_3
+      - account_id: account.a_pay
+        credit: 100.0
         debit: 0.0
-        name: test1
+        name: model_line_cr
         sequence: 0.0
         quantity: 0.0
         partner_id: base.res_partner_3
     name: My Test Model
-
 -
   I create an account use model record
-
 -
   !record {model: account.use.model, id: account_use_model_0}:
     {}
-
 -
   I create entries.
 -
@@ -29,4 +33,41 @@
       False, "active_id": ref("account_model_mymodelonyears0"), })
     move_obj = self.pool.get('account.move')
     ids = move_obj.search(cr, uid, [('ref', '=', 'My Test Model')])
-    assert len(ids), "Error:moves not created for model 'My Test Model'"
\ No newline at end of file
+    assert len(ids), "Error:moves not created for model 'My Test Model'"
+-
+  Then I click on the 'Post' button of Journal Entries
+-
+  !python {model: account.move}: |
+    ids = self.search(cr, uid, [('ref', '=', 'My Test Model')])
+    self.button_validate(cr, uid, ids, {})
+    moves = self.browse(cr, uid, ids)[0]
+    assert(moves.state == 'posted'), _('Journal Entries are not in posted state')
+-
+  Then I create Recurring Lines
+-
+  !record {model: account.subscription, id: test_recurring_lines }:
+    name: Test Recurring Lines
+    model_id: account_model_mymodelonyears0
+    period_type: 'day'
+-
+  Then I click on the 'Compute' button of Recurring lines
+-
+  !python {model: account.subscription}: |
+    subscription_line_obj = self.pool.get('account.subscription.line')
+    self.compute(cr, uid, [ref('test_recurring_lines')], {'lang': u'en_US', 'active_model': 'ir.ui.menu',
+      'active_ids': [ref('menu_action_subscription_form')], 'tz': False, 'active_id': ref('menu_action_subscription_form')})
+    subscription_lines = subscription_line_obj.search(cr, uid, [('subscription_id', '=', ref('test_recurring_lines'))])
+    assert subscription_lines, _('Subscription lines has not been created')
+-
+  I provide date in 'Generate Entries' wizard
+-
+  !record {model: account.subscription.generate, id: account_subscription_generate}:
+    date: !eval time.strftime('%Y-%m-%d')
+-
+  Then I generate entries through wizard
+-
+  !python {model: account.subscription.generate}: |
+    res = self.action_generate(cr, uid, [ref('account_subscription_generate')], {'lang': u'en_US', 'active_model': 'ir.ui.menu',
+      'active_ids': [ref('menu_generate_subscription')], 'tz': False, 'active_id': ref('menu_generate_subscription')})
+    assert res, _('Move for subscription lines has not been created')
+
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 650057646c3..e612d7cc0f0 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -1,5 +1,7 @@
 -
-  Demo data for Account tax code
+  In order to test the account move lines in OpenERP, I create account move 
+-
+  I create a Account tax code
 -
   !record {model: account.tax.code, id: account_tax_code_0}:
     name : Tax Code Test
@@ -22,24 +24,53 @@
         period_id: account.period_6
         ref: '2011010'
         tax_amount: 0.0
-      - journal_id: account.bank_journal
-        period_id: account.period_6
-        ref: '2011010'
-        tax_code_id: account_tax_code_0      
-        tax_amount: 0.0
-        account_id: account.a_recv
-        amount_currency: 0.0
-        credit: 0.0
-        date: !eval time.strftime('%Y-%m-%d')
-        debit: 2000.0
-        name: Basic Computer
-        partner_id: base.res_partner_desertic_hispafuentes
-        quantity: 0.0
     name: /
     period_id: account.period_6
     ref: '2011010'
     state: draft
-
+-
+  I create another move line
+-
+  !python {model: account.move.line}: |
+    import time
+    date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
+      'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
+      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')],
+      'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+    partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_desertic_hispafuentes'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
+    account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_desertic_hispafuentes'))
+    vals = {
+        'journal_id': ref('account.bank_journal'),
+        'period_id': ref('account.period_6'),
+        'ref': '2011010',
+        'tax_code_id': ref('account_tax_code_0'),
+        'tax_amount': 0.0,
+        'account_id': ref('account.a_recv'),
+        'amount_currency': 0.0,
+        'credit': 0.0,
+        'date': time.strftime('%Y-%m-%d'),
+        'debit': 2000.0,
+        'name': 'Basic Computer',
+        'partner_id': ref('base.res_partner_desertic_hispafuentes'),
+        'quantity': 0.0,
+        'move_id': ref('account_move_0'),
+        'date_maturity': partner['value']['date_maturity'],
+        'account_tax_id': account['value']['account_tax_id']
+    }
+    line_id = self.create(cr, uid, vals)
+    assert line_id, "Account move line has not been created"
+-
+  I check the balance in Journal Items
+-
+  !python {model: account.move.line}: |
+    ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
+    'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
+    'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+    bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
+      'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
+      'visible_id': 1, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0,
+      'active_id': ref('menu_eaction_account_moves_sale')})
+    assert bal, 'Balance has not been computed correctly'
 -
   I check that Initially account move state is "Draft"
 -
@@ -55,9 +86,28 @@
   I click on validate Button
 -
   !python {model: validate.account.move}: |
-      self.validate_move(cr, uid, [ref("validate_account_move_0")], {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_validate_account_moves")], "tz": False, "active_id": ref("account.menu_validate_account_moves"), })
+    self.validate_move(cr, uid, [ref("validate_account_move_0")], {"lang": "en_US", "active_model": "ir.ui.menu",
+      "active_ids": [ref("account.menu_validate_account_moves")], "tz": False, "active_id": ref("account.menu_validate_account_moves"), })
 -
-  I check that the invoice state is now "Posted"
+  I check that the move state is now "Posted"
 -
   !assert {model: account.move, id: account_move_0, string: moveincorrect}:
     - state == 'posted'
+-
+  I reconcile the entries partially through "Reconcile Entries" wizard
+-
+  !record {model: account.move.line.reconcile, id: account_move_line_reconcile0}:
+    trans_nbr: 1
+    credit: 0.0
+    debit: 2000.0
+    writeoff: 2000.0
+-
+  Then I click on the 'Partial Reconcile' button
+-
+  !python {model: account.move.line.reconcile}: |
+    move_line_obj = self.pool.get('account.move.line')
+    ids = move_line_obj.search(cr, uid, [('move_id', '=', ref('account_move_0')),('credit', '=', 2000)])
+    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
diff --git a/addons/account/test/chart_of_account.yml b/addons/account/test/chart_of_account.yml
index 1cb83c4298f..69a05a1f777 100644
--- a/addons/account/test/chart_of_account.yml
+++ b/addons/account/test/chart_of_account.yml
@@ -13,7 +13,7 @@
       "tz": False, "active_id": ref("account.menu_action_account_tree2"), })
 
 -
-  I create chart of account with target move set as posted
+  I create chart of accounts with target move set as posted
 -
   !record {model: account.chart, id: account_chart_0}:
     target_move: posted
diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml
new file mode 100644
index 00000000000..b1e73140581
--- /dev/null
+++ b/addons/account/test/test_edi_invoice.yml
@@ -0,0 +1,152 @@
+-
+  In order to test the EDI export features of Invoices
+-
+  First I create a draft customer invoice
+-
+  !record {model: account.invoice, id: invoice_edi_1}:
+    journal_id: 1
+    partner_id: base.res_partner_agrolait
+    currency_id: base.EUR
+    address_invoice_id: base.res_partner_address_8invoice
+    company_id: 1
+    account_id: account.a_pay
+    date_invoice: '2011-06-22'
+    name: selling product
+    type: 'out_invoice'
+    invoice_line:
+      - product_id: product.product_product_pc1
+        uos_id: 1
+        quantity: 1.0
+        price_unit: 10.0
+        name: 'basic pc'
+        account_id: account.a_pay
+    invoice_line:
+      - product_id: product.product_product_pc3
+        uos_id: 1
+        quantity: 5.0
+        price_unit: 100.0
+        name: 'Medium PC'
+        account_id: account.a_pay
+    tax_line:
+      - name: sale tax
+        account_id: account.a_pay
+        manual: True
+        amount: 1000.00
+-
+  I confirm and open the invoice
+-
+  !workflow {model: account.invoice, ref: invoice_edi_1, action: invoice_open}
+-
+  Then I export the customer invoice
+-
+  !python {model: edi.document}: |
+    invoice_pool = self.pool.get('account.invoice')
+    invoice = invoice_pool.browse(cr, uid, ref("invoice_edi_1"))
+    token = self.export_edi(cr, uid, [invoice])
+    assert token, 'Invalid EDI Token'
+-
+  Then I import a sample EDI document of another customer invoice
+-
+  !python {model: account.invoice}: |
+    edi_document = {
+        "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.random_invoice_763jsms", 
+        "__module": "account", 
+        "__model": "account.invoice", 
+        "__version": [6,1,0], 
+        "internal_number": "SAJ/2011/002", 
+        "company_address": {
+                "__id": "base:b22acf7a-ddcd-11e0-a4db-701a04e25543.main_address",
+                "__module": "base",
+                "__model": "res.partner.address", 
+                "city": "Gerompont", 
+                "zip": "1367", 
+                "country_id": ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.be", "Belgium"], 
+                "phone": "(+32).81.81.37.00", 
+                "street": "Chaussee de Namur 40",
+                "bank_ids": [
+                    ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.res_partner_bank-ZrTWzesfsdDJzGbp","Sample bank: 123465789-156113"]
+                ],
+        }, 
+        "company_id": ["account:b22acf7a-ddcd-11e0-a4db-701a04e25543.res_company_test11", "Thomson pvt. ltd."], 
+        "currency": {
+            "__id": "base:b22acf7a-ddcd-11e0-a4db-701a04e25543.EUR",
+            "__module": "base",
+            "__model": "res.currency",
+            "code": "EUR",
+            "symbol": "€",
+        }, 
+        "partner_id": ["account:b22acf7a-ddcd-11e0-a4db-701a04e25543.res_partner_test20", "Junjun wala"],
+        "partner_address": {
+                "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh",
+                "__module": "base",
+                "__model": "res.partner.address",
+                "phone": "(+32).81.81.37.00", 
+                "street": "Chaussee de Namur 40", 
+                "city": "Gerompont", 
+                "zip": "1367", 
+                "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"], 
+        },
+        "date_invoice": "2011-06-22", 
+        "name": "sample invoice", 
+        "tax_line": [{
+                "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_tax-4g4EutbiEMVl", 
+                "__module": "account",
+                "__model": "account.invoice.tax", 
+                "amount": 1000.0, 
+                "manual": True, 
+                "name": "sale tax", 
+        }], 
+        "type": "out_invoice", 
+        "invoice_line": [{
+                "__module": "account",
+                "__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", "PCE"], 
+                "name": "Basic PC", 
+                "price_unit": 10.0, 
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_pc1", "[PC1] Basic PC"], 
+                "quantity": 1.0
+        },
+        {
+                "__module": "account",
+                "__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", "PCE"], 
+                "name": "Medium PC", 
+                "price_unit": 100.0, 
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_pc3", "[PC3] Medium PC"], 
+                "quantity": 5.0
+        }]
+    }
+    invoice_id = self.edi_import(cr, uid, edi_document, context=context)
+    assert invoice_id, 'EDI import failed'
+    invoice_new = self.browse(cr, uid, invoice_id)
+
+    # check bank info on partner
+    assert len(invoice_new.partner_id.bank_ids) == 1, "Expected 1 bank entry related to partner"
+    bank_info = invoice_new.partner_id.bank_ids[0]
+    assert bank_info.acc_number == "Sample bank: 123465789-156113", 'Expected "Sample bank: 123465789-156113", got %s' % bank_info.acc_number
+
+    assert invoice_new.partner_id.supplier, 'Imported Partner is not marked as supplier'
+    assert invoice_new.reference == "SAJ/2011/002", "internal number is not stored in reference"
+    assert invoice_new.reference_type == 'none', "reference type is not set to 'none'"
+    assert invoice_new.internal_number == False, "internal number is not reset"
+    assert invoice_new.journal_id.id, "journal id is not selected"
+    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':
+            assert inv_line.uos_id.name == "PCE" , "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':
+            assert inv_line.uos_id.name == "PCE" , "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"
+            assert inv_line.price_subtotal == 500, "price sub total is not same"
+        else:
+            raise AssertionError('unknown invoice line: %s' % inv_line)
+    for inv_tax in invoice_new.tax_line:
+        assert inv_tax.manual, "tax line not set to manual"
+        assert inv_tax.account_id, "missing tax line account"
diff --git a/addons/account/test/test_parent_structure.py b/addons/account/test/test_parent_structure.py
index 9c3dd2b4c47..99795af311a 100644
--- a/addons/account/test/test_parent_structure.py
+++ b/addons/account/test/test_parent_structure.py
@@ -47,3 +47,5 @@ for a in account_lists:
             (a2['parent_right']<a['parent_right']))
         if a2['parent_id']==a['id']:
             assert (a2['parent_left']>a['parent_left']) and (a2['parent_right']<a['parent_right'])
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index d7a66186c1e..5b7302da00a 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -47,6 +47,7 @@ import account_open_closed_fiscalyear
 import account_invoice_state
 import account_chart
 import account_tax_chart
+import account_financial_report
 #TODO: remove this file no moe used
 # also remove related view fiel
 
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index a18adaa0320..a2fe0b3c689 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -42,7 +42,7 @@
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="view_id" ref="account_automatic_reconcile_view"/>
-             <field name="context">{'record_id':active_id}</field>
+             <field name="context">{}</field>
              <field name="target">new</field>
        </record>
 
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 336766a2f42..4504f064a1d 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -25,7 +25,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_change_currency"/>
-            <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{}</field>
             <field name="target">new</field>
         </record>
     </data>
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 3bfdff40b57..a9d3739103f 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -38,9 +38,12 @@ class account_chart(osv.osv_memory):
                                         ], 'Target Moves', required=True),
     }
 
+    def _get_fiscalyear(self, cr, uid, context=None):
+        """Return default Fiscalyear value"""
+        return self.pool.get('account.fiscalyear').find(cr, uid, context=context)
+
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
         res = {}
-        res['value'] = {}
         if fiscalyear_id:
             start_period = end_period = False
             cr.execute('''
@@ -50,7 +53,7 @@ class account_chart(osv.osv_memory):
                                WHERE f.id = %s
                                ORDER BY p.date_start ASC
                                LIMIT 1) AS period_start
-                UNION
+                UNION ALL
                 SELECT * FROM (SELECT p.id
                                FROM account_period p
                                LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
@@ -63,6 +66,8 @@ class account_chart(osv.osv_memory):
                 start_period = periods[0]
                 end_period = periods[1]
             res['value'] = {'period_from': start_period, 'period_to': end_period}
+        else:
+            res['value'] = {'period_from': False, 'period_to': False}
         return res
 
     def account_chart_open_window(self, cr, uid, ids, context=None):
@@ -96,7 +101,8 @@ class account_chart(osv.osv_memory):
         return result
 
     _defaults = {
-        'target_move': 'posted'
+        'target_move': 'posted',
+        'fiscalyear': _get_fiscalyear,
     }
 
 account_chart()
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
new file mode 100644
index 00000000000..de9cae3a00c
--- /dev/null
+++ b/addons/account/wizard/account_financial_report.py
@@ -0,0 +1,86 @@
+# -*- 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 accounting_report(osv.osv_memory):
+    _name = "accounting.report"
+    _inherit = "account.common.report"
+    _description = "Accounting Report"
+
+    _columns = {
+        'enable_filter': fields.boolean('Enable Comparison'),
+        'account_report_id': fields.many2one('account.financial.report', 'Account Reports', required=True),
+        'label_filter': fields.char('Column Label', size=32, help="This label will be displayed on report to show the balance computed for the given comparison filter."),
+        'fiscalyear_id_cmp': fields.many2one('account.fiscalyear', 'Fiscal Year', help='Keep empty for all open fiscal year'),
+        'filter_cmp': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
+        'period_from_cmp': fields.many2one('account.period', 'Start Period'),
+        'period_to_cmp': fields.many2one('account.period', 'End Period'),
+        'date_from_cmp': fields.date("Start Date"),
+        'date_to_cmp': fields.date("End Date"),
+    }
+
+    _defaults = {
+            'filter_cmp': 'filter_no',
+            'target_move': 'posted',
+    }
+
+    def _build_comparison_context(self, cr, uid, ids, data, context=None):
+        if context is None:
+            context = {}
+        result = {}
+        result['fiscalyear'] = 'fiscalyear_id_cmp' in data['form'] and data['form']['fiscalyear_id_cmp'] or False
+        result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
+        result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False
+        if data['form']['filter_cmp'] == 'filter_date':
+            result['date_from'] = data['form']['date_from_cmp']
+            result['date_to'] = data['form']['date_to_cmp']
+        elif data['form']['filter_cmp'] == 'filter_period':
+            if not data['form']['period_from_cmp'] or not data['form']['period_to_cmp']:
+                raise osv.except_osv(_('Error'),_('Select a starting and an ending period'))
+            result['period_from'] = data['form']['period_from_cmp']
+            result['period_to'] = data['form']['period_to_cmp']
+        return result
+
+    def check_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        res = super(accounting_report, self).check_report(cr, uid, ids, context=context)
+        data = {}
+        data['form'] = self.read(cr, uid, ids, ['account_report_id', 'date_from_cmp',  'date_to_cmp',  'fiscalyear_id_cmp', 'journal_ids', 'period_from_cmp', 'period_to_cmp',  'filter_cmp',  'chart_account_id', 'target_move'], context=context)[0]
+        for field in ['fiscalyear_id_cmp', 'chart_account_id', 'period_from_cmp', 'period_to_cmp', 'account_report_id']:
+            if isinstance(data['form'][field], tuple):
+                data['form'][field] = data['form'][field][0]
+        comparison_context = self._build_comparison_context(cr, uid, ids, data, context=context)
+        res['datas']['form']['comparison_context'] = comparison_context
+        return res
+
+    def _print_report(self, cr, uid, ids, data, context=None):
+        data['form'].update(self.read(cr, uid, ids, ['date_from_cmp',  'date_to_cmp',  'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp',  'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter'], context=context)[0])
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.financial.report',
+            'datas': data,
+        }
+
+accounting_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
new file mode 100644
index 00000000000..1472da4ba87
--- /dev/null
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+
+        <record id="accounting_report_view" model="ir.ui.view">
+            <field name="name">Accounting Report</field>
+            <field name="model">accounting.report</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.account_common_report_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='target_move']" position="after">
+                    <field name="account_report_id" domain="[('parent_id','=',False)]"/>
+                    <field name="enable_filter"/>
+                </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"/>
+                   </page>
+                </xpath>
+                <xpath expr="//notebook/page[@string='Journals']" position="replace">
+                </xpath>
+            </field>
+        </record>
+
+        <record id="action_account_report" model="ir.actions.act_window">
+             <field name="name">Financial Reports</field>
+             <field name="res_model">accounting.report</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">form</field>
+             <field name="view_id" ref="accounting_report_view"/>
+             <field name="target">new</field>
+       </record>
+
+       <menuitem icon="STOCK_PRINT"
+            name="Financial Report"
+            action="action_account_report"
+            groups="group_account_user,group_account_manager"
+            id="menu_account_report"
+            parent="final_accounting_reports"
+            sequence="100"/>
+
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 927f895bb3b..d2295b5bbf2 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -52,9 +52,11 @@ class account_fiscalyear_close(osv.osv_memory):
         obj_acc_period = self.pool.get('account.period')
         obj_acc_fiscalyear = self.pool.get('account.fiscalyear')
         obj_acc_journal = self.pool.get('account.journal')
+        obj_acc_move = self.pool.get('account.move')
         obj_acc_move_line = self.pool.get('account.move.line')
         obj_acc_account = self.pool.get('account.account')
         obj_acc_journal_period = self.pool.get('account.journal.period')
+        currency_obj = self.pool.get('res.currency')
 
         data = self.browse(cr, uid, ids, context=context)
 
@@ -67,6 +69,9 @@ class account_fiscalyear_close(osv.osv_memory):
         cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),))
         fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
 
+        if not fy_period_set or not fy2_period_set:
+            raise osv.except_osv(_('UserError'), _('The periods to generate opening entries were not found'))
+
         period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context)
         new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context)
         old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context)
@@ -81,150 +86,178 @@ class account_fiscalyear_close(osv.osv_memory):
             raise osv.except_osv(_('UserError'),
                     _('The journal must have centralised counterpart without the Skipping draft state option checked!'))
 
-        move_ids = obj_acc_move_line.search(cr, uid, [
-            ('journal_id', '=', new_journal.id), ('period_id.fiscalyear_id', '=', new_fyear.id)])
-
+        #delete existing move and move lines if any
+        move_ids = obj_acc_move.search(cr, uid, [
+            ('journal_id', '=', new_journal.id), ('period_id', '=', period.id)])
         if move_ids:
-            obj_acc_move_line._remove_move_reconcile(cr, uid, move_ids, context=context)
-            obj_acc_move_line.unlink(cr, uid, move_ids, context=context)
+            move_line_ids = obj_acc_move_line.search(cr, uid, [('move_id', 'in', move_ids)])
+            obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, context=context)
+            obj_acc_move_line.unlink(cr, uid, move_line_ids, context=context)
+            obj_acc_move.unlink(cr, uid, move_ids, context=context)
 
         cr.execute("SELECT id FROM account_fiscalyear WHERE date_stop < %s", (str(new_fyear.date_start),))
         result = cr.dictfetchall()
         fy_ids = ','.join([str(x['id']) for x in result])
         query_line = obj_acc_move_line._query_get(cr, uid,
                 obj='account_move_line', context={'fiscalyear': fy_ids})
-        cr.execute('select id from account_account WHERE active AND company_id = %s', (old_fyear.company_id.id,))
-        ids = map(lambda x: x[0], cr.fetchall())
-        for account in obj_acc_account.browse(cr, uid, ids,
-            context={'fiscalyear': fy_id}):
-            accnt_type_data = account.user_type
-            if not accnt_type_data:
-                continue
-            if accnt_type_data.close_method=='none' or account.type == 'view':
-                continue
-            if accnt_type_data.close_method=='balance':
-                balance_in_currency = 0.0
-                if account.currency_id:
-                    cr.execute('SELECT sum(amount_currency) 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)) 
-                    balance_in_currency = cr.dictfetchone()['balance_in_currency']
+        #create the opening move
+        vals = {
+            'name': '/',
+            'ref': '',
+            'period_id': period.id,
+            'journal_id': new_journal.id,
+        }
+        move_id = obj_acc_move.create(cr, uid, vals, context=context)
 
-                if abs(account.balance)>0.0001:
-                    obj_acc_move_line.create(cr, uid, {
-                        'debit': account.balance>0 and account.balance,
-                        'credit': account.balance<0 and -account.balance,
-                        'name': data[0].report_name,
-                        'date': period.date_start,
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                        'account_id': account.id,
-                        'currency_id': account.currency_id and account.currency_id.id or False,
-                        'amount_currency': balance_in_currency,
-                    }, {'journal_id': new_journal.id, 'period_id':period.id})
-            if accnt_type_data.close_method == 'unreconciled':
-                offset = 0
-                limit = 100
-                while True:
-                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
-                                'amount_currency, currency_id, blocked, partner_id, ' \
-                                'date_maturity, date_created ' \
-                            'FROM account_move_line ' \
-                            'WHERE account_id = %s ' \
-                                'AND ' + query_line + ' ' \
-                                'AND reconcile_id is NULL ' \
-                            'ORDER BY id ' \
-                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
-                    result = cr.dictfetchall()
-                    if not result:
-                        break
-                    for move in result:
-                        move.pop('id')
-                        move.update({
-                            'date': period.date_start,
-                            'journal_id': new_journal.id,
-                            'period_id': period.id,
-                        })
-                        obj_acc_move_line.create(cr, uid, move, {
-                            'journal_id': new_journal.id,
-                            'period_id': period.id,
-                            })
-                    offset += limit
+        #1. report of the accounts with defferal method == 'unreconciled'
+        cr.execute('''
+            SELECT a.id
+            FROM account_account a
+            LEFT JOIN account_account_type t ON (a.user_type = t.id)
+            WHERE a.active
+              AND a.type != 'view'
+              AND t.close_method = %s''', ('unreconciled', ))
+        account_ids = map(lambda x: x[0], cr.fetchall())
 
-                #We have also to consider all move_lines that were reconciled
-                #on another fiscal year, and report them too
-                offset = 0
-                limit = 100
-                while True:
-                    cr.execute('SELECT  DISTINCT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \
-                                'b.amount_currency, b.currency_id, b.blocked, b.partner_id, ' \
-                                'b.date_maturity, b.date_created ' \
-                            'FROM account_move_line a, account_move_line b ' \
-                            'WHERE b.account_id = %s ' \
-                                'AND b.reconcile_id is NOT NULL ' \
-                                'AND a.reconcile_id = b.reconcile_id ' \
-                                'AND b.period_id IN ('+fy_period_set+') ' \
-                                'AND a.period_id IN ('+fy2_period_set+') ' \
-                            'ORDER BY id ' \
-                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
-                    result = cr.dictfetchall()
-                    if not result:
-                        break
-                    for move in result:
-                        move.pop('id')
-                        move.update({
-                            'date': period.date_start,
-                            'journal_id': new_journal.id,
-                            'period_id': period.id,
-                        })
-                        obj_acc_move_line.create(cr, uid, move, {
-                            'journal_id': new_journal.id,
-                            'period_id': period.id,
-                            })
-                    offset += limit
-            if accnt_type_data.close_method=='detail':
-                offset = 0
-                limit = 100
-                while True:
-                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
-                                'amount_currency, currency_id, blocked, partner_id, ' \
-                                'date_maturity, date_created ' \
-                            'FROM account_move_line ' \
-                            'WHERE account_id = %s ' \
-                                'AND ' + query_line + ' ' \
-                            'ORDER BY id ' \
-                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
+        if account_ids:
+            cr.execute('''
+                INSERT INTO account_move_line (
+                     name, create_uid, create_date, write_uid, write_date,
+                     statement_id, journal_id, currency_id, date_maturity,
+                     partner_id, blocked, credit, state, debit,
+                     ref, account_id, period_id, date, move_id, amount_currency,
+                     quantity, product_id, company_id)
+                  (SELECT name, create_uid, create_date, write_uid, write_date,
+                     statement_id, %s,currency_id, date_maturity, partner_id,
+                     blocked, credit, 'draft', debit, ref, account_id,
+                     %s, date, %s, amount_currency, quantity, product_id, company_id
+                   FROM account_move_line
+                   WHERE account_id IN %s
+                     AND ''' + query_line + '''
+                     AND reconcile_id IS NULL)''', (new_journal.id, period.id, move_id, tuple(account_ids),))
 
-                    result = cr.dictfetchall()
-                    if not result:
-                        break
-                    for move in result:
-                        move.pop('id')
-                        move.update({
-                            'date': period.date_start,
-                            'journal_id': new_journal.id,
-                            'period_id': period.id,
-                        })
-                        obj_acc_move_line.create(cr, uid, move)
-                    offset += limit
-        ids = obj_acc_move_line.search(cr, uid, [('journal_id','=',new_journal.id),
+            #We have also to consider all move_lines that were reconciled
+            #on another fiscal year, and report them too
+            cr.execute('''
+                INSERT INTO account_move_line (
+                     name, create_uid, create_date, write_uid, write_date,
+                     statement_id, journal_id, currency_id, date_maturity,
+                     partner_id, blocked, credit, state, debit,
+                     ref, account_id, period_id, date, move_id, amount_currency,
+                     quantity, product_id, company_id)
+                  (SELECT
+                     b.name, b.create_uid, b.create_date, b.write_uid, b.write_date,
+                     b.statement_id, %s, b.currency_id, b.date_maturity,
+                     b.partner_id, b.blocked, b.credit, 'draft', b.debit,
+                     b.ref, b.account_id, %s, b.date, %s, b.amount_currency,
+                     b.quantity, b.product_id, b.company_id
+                     FROM account_move_line b
+                     WHERE b.account_id IN %s
+                       AND b.reconcile_id IS NOT NULL
+                       AND b.period_id IN ('''+fy_period_set+''')
+                       AND b.reconcile_id IN (SELECT DISTINCT(reconcile_id)
+                                          FROM account_move_line a
+                                          WHERE a.period_id IN ('''+fy2_period_set+''')))''', (new_journal.id, period.id, move_id, tuple(account_ids),))
+
+        #2. report of the accounts with defferal method == 'detail'
+        cr.execute('''
+            SELECT a.id
+            FROM account_account a
+            LEFT JOIN account_account_type t ON (a.user_type = t.id)
+            WHERE a.active
+              AND a.type != 'view'
+              AND t.close_method = %s''', ('detail', ))
+        account_ids = map(lambda x: x[0], cr.fetchall())
+
+        if account_ids:
+            cr.execute('''
+                INSERT INTO account_move_line (
+                     name, create_uid, create_date, write_uid, write_date,
+                     statement_id, journal_id, currency_id, date_maturity,
+                     partner_id, blocked, credit, state, debit,
+                     ref, account_id, period_id, date, move_id, amount_currency,
+                     quantity, product_id, company_id)
+                  (SELECT name, create_uid, create_date, write_uid, write_date,
+                     statement_id, %s,currency_id, date_maturity, partner_id,
+                     blocked, credit, 'draft', debit, ref, account_id,
+                     %s, date, %s, amount_currency, quantity, product_id, company_id
+                   FROM account_move_line
+                   WHERE account_id IN %s
+                     AND ''' + query_line + ''')
+                     ''', (new_journal.id, period.id, move_id, tuple(account_ids),))
+
+
+        #3. report of the accounts with defferal method == 'balance'
+        cr.execute('''
+            SELECT a.id
+            FROM account_account a
+            LEFT JOIN account_account_type t ON (a.user_type = t.id)
+            WHERE a.active
+              AND a.type != 'view'
+              AND t.close_method = %s''', ('balance', ))
+        account_ids = map(lambda x: x[0], cr.fetchall())
+
+        query_1st_part = """
+                INSERT INTO account_move_line (
+                     debit, credit, name, date, move_id, journal_id, period_id,
+                     account_id, currency_id, amount_currency, company_id, state) VALUES
+        """
+        query_2nd_part = ""
+        query_2nd_part_args = []
+        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 ' \
+                        'WHERE account_id = %s ' \
+                            'AND ' + query_line + ' ' \
+                            'AND currency_id = %s', (account.id, account.currency_id.id))
+                balance_in_currency = cr.dictfetchone()['balance_in_currency']
+
+            company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id
+            if not currency_obj.is_zero(cr, uid, company_currency_id, abs(account.balance)):
+                if query_2nd_part:
+                    query_2nd_part += ','
+                query_2nd_part += "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"
+                query_2nd_part_args += (account.balance > 0 and account.balance or 0.0,
+                       account.balance < 0 and -account.balance or 0.0,
+                       data[0].report_name,
+                       period.date_start,
+                       move_id,
+                       new_journal.id,
+                       period.id,
+                       account.id,
+                       account.currency_id and account.currency_id.id or None,
+                       balance_in_currency,
+                       account.company_id.id,
+                       'draft')
+        if query_2nd_part:
+            cr.execute(query_1st_part + query_2nd_part, tuple(query_2nd_part_args))
+
+        #validate and centralize the opening move
+        obj_acc_move.validate(cr, uid, [move_id], context=context)
+
+        #reconcile all the move.line of the opening move
+        ids = obj_acc_move_line.search(cr, uid, [('journal_id', '=', new_journal.id),
             ('period_id.fiscalyear_id','=',new_fyear.id)])
         context['fy_closing'] = True
-
         if ids:
-            obj_acc_move_line.reconcile(cr, uid, ids, context=context)
+            reconcile_id = obj_acc_move_line.reconcile(cr, uid, ids, context=context)
+            #set the creation date of the reconcilation at the first day of the new fiscalyear, in order to have good figures in the aged trial balance
+            self.pool.get('account.move.reconcile').write(cr, uid, [reconcile_id], {'create_date': new_fyear.date_start}, context=context)
+
+        #create the journal.period object and link it to the old fiscalyear
         new_period = data[0].period_id.id
-        ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
+        ids = obj_acc_journal_period.search(cr, uid, [('journal_id', '=', new_journal.id), ('period_id', '=', new_period)])
         if not ids:
             ids = [obj_acc_journal_period.create(cr, uid, {
-                   'name': (new_journal.name or '')+':'+(period.code or ''),
+                   'name': (new_journal.name or '') + ':' + (period.code or ''),
                    'journal_id': new_journal.id,
                    'period_id': period.id
                })]
         cr.execute('UPDATE account_fiscalyear ' \
                     'SET end_journal_period_id = %s ' \
                     'WHERE id = %s', (ids[0], old_fyear.id))
+
         return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close()
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 74feaca27be..436ea20a3c2 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -36,17 +36,21 @@ class account_invoice_refund(osv.osv_memory):
        '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 refund invoice 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', 'Refund'), ('cancel', 'Cancel'),('modify', 'Modify')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
+       'filter_refund': fields.selection([('refund', 'Create a draft Refund'), ('cancel', 'Cancel: refund invoice and reconcile'),('modify', 'Modify: refund invoice, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
     }
 
     def _get_journal(self, cr, uid, context=None):
         obj_journal = self.pool.get('account.journal')
+        user_obj = self.pool.get('res.users')
         if context is None:
             context = {}
-        journal = obj_journal.search(cr, uid, [('type', '=', 'sale_refund')])
-        if context.get('type', False):
-            if context['type'] in ('in_invoice', 'in_refund'):
-                journal = obj_journal.search(cr, uid, [('type', '=', 'purchase_refund')])
+        inv_type = context.get('type', 'out_invoice')
+        company_id = user_obj.browse(cr, uid, uid, context=context).company_id.id
+        type = (inv_type == 'out_invoice') and 'sale_refund' or \
+               (inv_type == 'out_refund') and 'sale' or \
+               (inv_type == 'in_invoice') and 'purchase_refund' or \
+               (inv_type == 'in_refund') and 'purchase'
+        journal = obj_journal.search(cr, uid, [('type', '=', type), ('company_id','=',company_id)], limit=1, context=context)
         return journal and journal[0] or False
 
     _defaults = {
@@ -57,15 +61,17 @@ class account_invoice_refund(osv.osv_memory):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         journal_obj = self.pool.get('account.journal')
+        user_obj = self.pool.get('res.users')
         res = super(account_invoice_refund,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        type = context.get('journal_type', 'sale_refund')
-        if type in ('sale', 'sale_refund'):
-            type = 'sale_refund'
-        else:
-            type = 'purchase_refund'
+        type = context.get('type', 'out_invoice')
+        company_id = user_obj.browse(cr, uid, uid, context=context).company_id.id
+        journal_type = (type == 'out_invoice') and 'sale_refund' or \
+                       (type == 'out_refund') and 'sale' or \
+                       (type == 'in_invoice') and 'purchase_refund' or \
+                       (type == 'in_refund') and 'purchase'
         for field in res['fields']:
             if field == 'journal_id':
-                journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
+                journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', journal_type), ('company_id','child_of',[company_id])], context=context)
                 res['fields'][field]['selection'] = journal_select
         return res
 
@@ -198,10 +204,10 @@ class account_invoice_refund(osv.osv_memory):
                             if 'value' in data and data['value']:
                                 inv_obj.write(cr, uid, [inv_id], data['value'])
                         created_inv.append(inv_id)
-            if inv.type in ('out_invoice', 'out_refund'):
-                xml_id = 'action_invoice_tree3'
-            else:
-                xml_id = 'action_invoice_tree4'
+            xml_id = (inv.type == 'out_refund') and 'action_invoice_tree1' or \
+                     (inv.type == 'in_refund') and 'action_invoice_tree2' or \
+                     (inv.type == 'out_invoice') and 'action_invoice_tree3' or \
+                     (inv.type == 'in_invoice') and 'action_invoice_tree4'
             result = mod_obj.get_object_reference(cr, uid, 'account', xml_id)
             id = result and result[1] or False
             result = act_obj.read(cr, uid, id, context=context)
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 348218dd04d..abd596c2f24 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -32,7 +32,6 @@
             <field name="model">account.journal.period</field>
             <field name="name">Open Journal</field>
             <field eval="'ir.actions.act_window,%d'%action_open_journal_button" name="value"/>
-            <field eval="True" name="object"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 99aa83826df..6756e0d06c6 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -188,7 +188,7 @@ class account_move_journal(osv.osv_memory):
             'view_mode': 'tree,graph,form',
             'res_model': 'account.move.line',
             'view_id': False,
-            'context': "{'search_default_posted': %d, 'visible_id':%s, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move, journal_id, journal_id, period_id),
+            'context': "{'search_default_posted': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move, journal_id, period_id),
             'type': 'ir.actions.act_window',
             'search_view_id': res_id
         }
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 5d3351246a3..a353cf883ba 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -33,7 +33,6 @@
 
         <record id="action_idea_post_vote_values" model="ir.values">
             <field name="model_id" ref="model_account_period" />
-            <field name="object" eval="1" />
             <field name="name">Close a Period</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 30bac2ae1fd..729792e2222 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -110,7 +110,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
     It opens the write off wizard form, in that user can define the journal, account, analytic account for reconcile
     """
     _name = 'account.move.line.reconcile.writeoff'
-    _description = 'Account move line reconcile'
+    _description = 'Account move line reconcile (writeoff)'
     _columns = {
         'journal_id': fields.many2one('account.journal','Write-Off Journal', required=True),
         'writeoff_acc_id': fields.many2one('account.account','Write-Off account', required=True),
@@ -158,7 +158,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         journal_id = data['journal_id'][0]
         context['comment'] = data['comment']
         if data['analytic_id']:
-            context['analytic_id'] = data['analytic_id']
+            context['analytic_id'] = data['analytic_id'][0]
         if context['date_p']:
             date = context['date_p']
 
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 457e144e4ab..6360100a309 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -28,12 +28,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="account_partner_reconcile_view"/>
-            <field name="context">{'record_id':active_id}</field>
+            <field name="context">{}</field>
             <field name="target">new</field>
        </record>
             <record model="ir.values" id="action_partner_reconcile_actino">
             <field name="model_id" ref="account.model_account_move_line" />
-            <field name="object" eval="1" />
             <field name="name">Partner reconciliation</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_partner_reconcile'))" />
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 7c7ed520b48..8f001f40694 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -37,7 +37,6 @@
 
         <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">
             <field name="model_id" ref="account.model_account_move_line" />
-            <field name="object" eval="1" />
             <field name="name">Reconcile Entries</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile'))" />
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index a72d58dd904..4e52066b49e 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -19,13 +19,17 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 
 class account_balance_report(osv.osv_memory):
     _inherit = "account.common.account.report"
     _name = 'account.balance.report'
     _description = 'Trial Balance Report'
 
+    _columns = {
+        'journal_ids': fields.many2many('account.journal', 'account_balance_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+    }
+
     _defaults = {
         'journal_ids': [],
     }
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 38f456f7d15..b700ab8a736 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -45,7 +45,6 @@
 
         <record model="ir.values" id="action_account_balance_report_values1">
             <field name="model_id" ref="account.model_account_account" />
-            <field name="object" eval="1" />
             <field name="name">Trial Balance</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_menu'))" />
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 4e6c6dea752..9b89b30c93b 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -35,6 +35,7 @@ class account_aged_trial_balance(osv.osv_memory):
         'direction_selection': fields.selection([('past','Past'),
                                                  ('future','Future')],
                                                  'Analysis Direction', required=True),
+        'journal_ids': fields.many2many('account.journal', 'account_aged_trial_balance_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }
     _defaults = {
         'period_length': 30,
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index fb0952e4614..bd54b925eea 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -37,7 +37,7 @@
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="view_id" ref="account_aged_balance_view"/>
-             <field name="context">{'record_id':active_id}</field>
+             <field name="context">{}</field>
              <field name="target">new</field>
        </record>
 
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 873ede3832c..01a89168a43 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -40,11 +40,9 @@ class account_bs_report(osv.osv_memory):
     _columns = {
         'display_type': fields.boolean("Landscape Mode"),
         'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',
-                                      required=True,
-                                      help='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',
+                                      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',
                                       domain = [('type','=','other')]),
+        'journal_ids': fields.many2many('account.journal', 'account_bs_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }
 
     _defaults={
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index 22a6e0608b2..faac52388a1 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -21,7 +21,7 @@
             </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
-                <field name="reserve_account_id" required="1"/>
+                <field name="reserve_account_id"/>
                 <field name="display_type"/>
                 <newline/>
             </xpath>
diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index d66be0a70e4..046aec4690d 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -19,13 +19,17 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 
 class account_central_journal(osv.osv_memory):
     _name = 'account.central.journal'
     _description = 'Account Central Journal'
     _inherit = "account.common.journal.report"
 
+    _columns = {
+        'journal_ids': fields.many2many('account.journal', 'account_central_journal_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+    }
+
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {
@@ -37,3 +41,5 @@ class account_central_journal(osv.osv_memory):
 account_central_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 7aa4c465e0d..8ae425e0b15 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -35,7 +35,7 @@ class account_common_report(osv.osv_memory):
         'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
         'period_from': fields.many2one('account.period', 'Start Period'),
         'period_to': fields.many2one('account.period', 'End Period'),
-        'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+        'journal_ids': fields.many2many('account.journal', string='Journals', required=True),
         'date_from': fields.date("Start Date"),
         'date_to': fields.date("End Date"),
         'target_move': fields.selection([('posted', 'All Posted Entries'),
@@ -68,14 +68,16 @@ class account_common_report(osv.osv_memory):
                                FROM account_period p
                                LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
                                WHERE f.id = %s
+                               AND p.special = false
                                ORDER BY p.date_start ASC, p.special ASC
                                LIMIT 1) AS period_start
-                UNION
+                UNION ALL
                 SELECT * FROM (SELECT p.id
                                FROM account_period p
                                LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
                                WHERE f.id = %s
                                AND p.date_start < NOW()
+                               AND p.special = false
                                ORDER BY p.date_stop DESC
                                LIMIT 1) AS period_stop''', (fiscalyear_id, fiscalyear_id))
             periods =  [i[0] for i in cr.fetchall()]
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 4e0fe2d6c66..a27241a37ff 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -44,3 +44,5 @@ class account_common_account_report(osv.osv_memory):
 account_common_account_report()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index 8e9db058d31..e71d380e837 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -49,4 +49,4 @@ class account_common_journal_report(osv.osv_memory):
 
 account_common_journal_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/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index 05003041eeb..a2acdc4b988 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -44,4 +44,5 @@ class account_common_partner_report(osv.osv_memory):
 
 account_common_partner_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:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_journal.py b/addons/account/wizard/account_report_general_journal.py
index af091d9bc08..631de5f1260 100644
--- a/addons/account/wizard/account_report_general_journal.py
+++ b/addons/account/wizard/account_report_general_journal.py
@@ -19,17 +19,23 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 
 class account_general_journal(osv.osv_memory):
     _inherit = "account.common.journal.report"
     _name = 'account.general.journal'
     _description = 'Account General Journal'
 
+    _columns = {
+        'journal_ids': fields.many2many('account.journal', 'account_general_journal_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+    }
+
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal', 'datas': data}
 
 account_general_journal()
 
-#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index ed75b3c1dce..d0b3c0fa3d3 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -32,6 +32,7 @@ class account_report_general_ledger(osv.osv_memory):
                                     help='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.'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
         'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True),
+        'journal_ids': fields.many2many('account.journal', 'account_report_general_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }
     _defaults = {
         'landscape': True,
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index b4203134fd6..20b6ab0f042 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -51,7 +51,6 @@
 
         <record model="ir.values" id="action_account_general_ledger_values">
             <field name="model_id" ref="account.model_account_account" />
-            <field name="object" eval="1" />
             <field name="name">General Ledger</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_general_ledger_menu'))" />
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index eff9e71cb72..80ee455456c 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -31,6 +31,7 @@ class account_partner_balance(osv.osv_memory):
     _columns = {
         'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
                                     ,'Display Partners'),
+        'journal_ids': fields.many2many('account.journal', 'account_partner_balance_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }
 
     _defaults = {
@@ -51,4 +52,4 @@ class account_partner_balance(osv.osv_memory):
 
 account_partner_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/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index 679ef1aa456..6dbe6d7b77b 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -29,7 +29,7 @@
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="view_id" ref="account_partner_balance_view"/>
-             <field name="context">{'record_id':active_id}</field>
+             <field name="context">{}</field>
              <field name="target">new</field>
              <field name="help">This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance.</field>
        </record>
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 8a2b6c7bacb..7a3f3932f1b 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -35,6 +35,7 @@ class account_partner_ledger(osv.osv_memory):
         'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods'), ('unreconciled', 'Unreconciled Entries')], "Filter by", required=True),
         'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
+        'journal_ids': fields.many2many('account.journal', 'account_partner_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }
     _defaults = {
        'initial_balance': False,
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 97dcdf8d3f2..c3c731c1954 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -34,7 +34,7 @@
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="view_id" ref="account_partner_ledger_view"/>
-             <field name="context">{'record_id':active_id}</field>
+             <field name="context">{}</field>
              <field name="target">new</field>
        </record>
 
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index f4a5fcaf9f9..1fe350349b6 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -30,6 +30,7 @@ class account_print_journal(osv.osv_memory):
         'sort_selection': fields.selection([('date', 'Date'),
                                             ('ref', 'Reference Number'),],
                                             'Entries Sorted by', required=True),
+        'journal_ids': fields.many2many('account.journal', 'account_print_journal_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }
     _defaults = {
         'sort_selection': 'date',
@@ -44,4 +45,6 @@ class account_print_journal(osv.osv_memory):
 
 account_print_journal()
 
-#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index 6372539c056..f4c2897bfe0 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -28,14 +28,15 @@ class account_pl_report(osv.osv_memory):
     _inherit = "account.common.account.report"
     _name = "account.pl.report"
     _description = "Account Profit And Loss Report"
+
     _columns = {
         'display_type': fields.boolean("Landscape Mode"),
+        'journal_ids': fields.many2many('account.journal', 'account_pl_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }
 
     _defaults = {
         'display_type': False,
         'journal_ids': [],
-        'target_move': False
     }
 
     def _print_report(self, cr, uid, ids, data, context=None):
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
index d9876f57454..75b6766ff87 100644
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@@ -9,9 +9,6 @@
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="//field[@name='target_move']" position="replace">
-                <field name="target_move" required="0" readonly="1"/>
-            </xpath>
             <xpath expr="//field[@name='journal_ids']" position="replace">
                 <field name="journal_ids" required="0" colspan="4" nolabel="1" readonly="1"/>
             </xpath>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 563a15bff73..d3b68cb5186 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -27,7 +27,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_state_open"/>
-            <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{}</field>
             <field name="target">new</field>
         </record>
 
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 714d64fb400..5cdbbb6775f 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -31,7 +31,6 @@
 
         <record model="ir.values" id="account_unreconcile_values">
             <field name="model_id" ref="account.model_account_move_line" />
-            <field name="object" eval="1" />
             <field name="name">Unreconcile Entries</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_unreconcile'))" />
@@ -64,13 +63,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="account_unreconcile_reconcile_view"/>
-            <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{}</field>
             <field name="target">new</field>
         </record>
 
         <record model="ir.values" id="account_unreconcile_reconcile_values">
             <field name="model_id" ref="account.model_account_move_reconcile" />
-            <field name="object" eval="1" />
             <field name="name">Unreconcile Entries</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_unreconcile_reconcile'))" />
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 6e444b8b4e6..4fb77cb3397 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -47,67 +47,16 @@ class account_use_model(osv.osv_memory):
 
     def create_entries(self, cr, uid, ids, context=None):
         account_model_obj = self.pool.get('account.model')
-        account_period_obj = self.pool.get('account.period')
-        account_move_obj = self.pool.get('account.move')
-        account_move_line_obj = self.pool.get('account.move.line')
-        pt_obj = self.pool.get('account.payment.term')
         mod_obj = self.pool.get('ir.model.data')
         if context is None:
             context = {}
-        move_ids = []
-        entry = {}
         data =  self.read(cr, uid, ids, context=context)[0]
         record_id = context and context.get('model_line', False) or False
         if record_id:
-            data_model = account_model_obj.browse(cr, uid, data['model'], context=context)
+            model_ids = data['model']
         else:
-            data_model = account_model_obj.browse(cr, uid, context['active_ids'], context=context)
-        for model in data_model:
-            entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')}
-            period_id = account_period_obj.find(cr, uid, context=context)
-            if not period_id:
-                raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
-            period_id = period_id[0]
-            move_id = account_move_obj.create(cr, uid, {
-                'ref': entry['name'],
-                'period_id': period_id,
-                'journal_id': model.journal_id.id,
-            })
-            move_ids.append(move_id)
-            for line in model.lines_id:
-                analytic_account_id = False
-                if line.analytic_account_id:
-                    if not model.journal_id.analytic_journal_id:
-                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
-                    analytic_account_id = line.analytic_account_id.id
-                val = {
-                    'move_id': move_id,
-                    'journal_id': model.journal_id.id,
-                    'period_id': period_id,
-                    'analytic_account_id': analytic_account_id
-                }
-                date_maturity = time.strftime('%Y-%m-%d')
-                if line.date_maturity == 'partner' and line.partner_id and line.partner_id.property_payment_term:
-                    payment_term_id = line.partner_id.property_payment_term.id
-                    pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
-                    if pterm_list:
-                        pterm_list = [l[0] for l in pterm_list]
-                        pterm_list.sort()
-                        date_maturity = pterm_list[-1]
-                val.update({
-                    'name': line.name,
-                    'quantity': line.quantity,
-                    'debit': line.debit,
-                    'credit': line.credit,
-                    'account_id': line.account_id.id,
-                    'move_id': move_id,
-                    'partner_id': line.partner_id.id,
-                    'date': time.strftime('%Y-%m-%d'),
-                    'date_maturity': date_maturity
-                })
-                c = context.copy()
-                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
-                account_move_line_obj.create(cr, uid, val, context=c)
+            model_ids = context['active_ids']
+        move_ids = account_model_obj.generate(cr, uid, model_ids, context=context)
 
         context.update({'move_ids':move_ids})
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context)
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index fa3a2774a77..31984596000 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -66,14 +66,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="validate_account_move_line_view"/>
-            <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{}</field>
             <field name="target">new</field>
             <field name="help">This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore.</field>
         </record>
 
         <record model="ir.values" id="validate_account_move_line_values">
             <field name="model_id" ref="account.model_account_move_line" />
-            <field name="object" eval="1" />
             <field name="name">Post Journal Entries</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_validate_account_move_line'))" />
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 186f79cad6d..cbdf18d314a 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -59,4 +59,4 @@ class account_vat_declaration(osv.osv_memory):
 
 account_vat_declaration()
 
-#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_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 359add59a83..5cb68563352 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -13,7 +13,7 @@
                 <newline/>
                 <field name="chart_tax_id" widget='selection'/>
                 <field name="fiscalyear_id"/>
-                <field name="based_on"/>
+                <!--- <field name="based_on"/>--> <!-- the option based_on 'payment' is probably not fully compliant with what the users understand with that term. So, currently, it's seems better to remove it from the view to avoid further problems -->
                 <separator string="Periods"  colspan="4"/>
                 <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" />
                 <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" />
@@ -43,4 +43,4 @@
             icon="STOCK_PRINT"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index c018d277d46..d808a38fa18 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Accountant Access",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Hidden',
     'complexity': "normal",
     "description": """
 Accounting Access Rights.
diff --git a/addons/account_accountant/i18n/ar.po b/addons/account_accountant/i18n/ar.po
index e9866d5fb7e..aaac8e73996 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/bg.po b/addons/account_accountant/i18n/bg.po
index 23963e8bd9e..517e3a3e823 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/bn.po b/addons/account_accountant/i18n/bn.po
new file mode 100644
index 00000000000..9b62c14de4e
--- /dev/null
+++ b/addons/account_accountant/i18n/bn.po
@@ -0,0 +1,36 @@
+# Bengali 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-11-21 12:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"এই মডিউল admin ব্যবহারকারীকে সকল হিসাবরক্ষন এর সুবিধা দিবে\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "হিসাবরক্ষনকারী"
diff --git a/addons/account_accountant/i18n/bs.po b/addons/account_accountant/i18n/bs.po
index d29961ecb9d..00a99bf942c 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: 2011-05-09 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/ca.po b/addons/account_accountant/i18n/ca.po
index c8d50366b5f..41b0b34aee4 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/cs.po b/addons/account_accountant/i18n/cs.po
index fbc368f2745..afb0ccdf59d 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po
index 051b6162563..5b199bb2909 100644
--- a/addons/account_accountant/i18n/da.po
+++ b/addons/account_accountant/i18n/da.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:14+0000\n"
-"PO-Revision-Date: 2010-11-17 08:53+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-08 10:35+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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,6 +26,10 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Dette modul giver brugeren  admin adgang til alle regnskabsfunktioner som "
+"bogføringsjournaler og kontoplaner.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/de.po b/addons/account_accountant/i18n/de.po
index 753b54f4075..11e68ee46d8 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
index 6a6b67d6224..c1031654604 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/en_GB.po b/addons/account_accountant/i18n/en_GB.po
new file mode 100644
index 00000000000..01b28c5add1
--- /dev/null
+++ b/addons/account_accountant/i18n/en_GB.po
@@ -0,0 +1,38 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 11:46+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: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"This module gives the admin user access to all accounting features such as "
+"the journal\n"
+"items and the chart of accounts.\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Accountant"
diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po
index 25e04bad80e..413a4ffa586 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -37,9 +37,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Contable"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/account_accountant/i18n/es_EC.po b/addons/account_accountant/i18n/es_EC.po
index 64039245800..9bfa2f7f1e8 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Contador"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "El nombre del módulo debe ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "El ID del certificado del módulo debe ser único !"
diff --git a/addons/account_accountant/i18n/es_MX.po b/addons/account_accountant/i18n/es_MX.po
new file mode 100644
index 00000000000..f7a849fa097
--- /dev/null
+++ b/addons/account_accountant/i18n/es_MX.po
@@ -0,0 +1,39 @@
+# 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: 2010-12-26 08:18+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo proporciona al usuario admin el acceso a todas las "
+"funcionalidades de contabilidad como\n"
+"los asientos y el plan contable.\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Contable"
diff --git a/addons/account_accountant/i18n/es_PY.po b/addons/account_accountant/i18n/es_PY.po
index 64ce512d926..bfcfb68215d 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/es_VE.po b/addons/account_accountant/i18n/es_VE.po
new file mode 100644
index 00000000000..f7a849fa097
--- /dev/null
+++ b/addons/account_accountant/i18n/es_VE.po
@@ -0,0 +1,39 @@
+# 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: 2010-12-26 08:18+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo proporciona al usuario admin el acceso a todas las "
+"funcionalidades de contabilidad como\n"
+"los asientos y el plan contable.\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Contable"
diff --git a/addons/account_accountant/i18n/fa.po b/addons/account_accountant/i18n/fa.po
index 14365ced061..0bb010167ce 100644
--- a/addons/account_accountant/i18n/fa.po
+++ b/addons/account_accountant/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/fi.po b/addons/account_accountant/i18n/fi.po
index 1e1c0a25072..d2ba2442473 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: 2011-06-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/fr.po b/addons/account_accountant/i18n/fr.po
index 08456b3bd04..acd72e2022f 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Comptable"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat pour un module doit être unique !"
diff --git a/addons/account_accountant/i18n/gl.po b/addons/account_accountant/i18n/gl.po
index 9e8b572054f..315442a6de0 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/he.po b/addons/account_accountant/i18n/he.po
new file mode 100644
index 00000000000..de5181d6440
--- /dev/null
+++ b/addons/account_accountant/i18n/he.po
@@ -0,0 +1,33 @@
+# Hebrew 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-11-18 17:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.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-11-19 05:13+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr ""
diff --git a/addons/account_accountant/i18n/hi.po b/addons/account_accountant/i18n/hi.po
index a50ccb03d2d..2e64ea36cd4 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/hr.po b/addons/account_accountant/i18n/hr.po
index f3b2d0299e7..2678da88a7a 100644
--- a/addons/account_accountant/i18n/hr.po
+++ b/addons/account_accountant/i18n/hr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-17 00:02+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/hu.po b/addons/account_accountant/i18n/hu.po
index ebcc99aa5bd..eeb8ce4a3fd 100644
--- a/addons/account_accountant/i18n/hu.po
+++ b/addons/account_accountant/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-19 15:57+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/id.po b/addons/account_accountant/i18n/id.po
index ef5c51609d1..358e2a4000d 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index 10eee073116..84a73cbd530 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Contabile"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_accountant/i18n/ko.po b/addons/account_accountant/i18n/ko.po
index 80aa266f435..f196fd41839 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/lo.po b/addons/account_accountant/i18n/lo.po
index ceb0685de9b..8a42b06d9d8 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/lt.po b/addons/account_accountant/i18n/lt.po
index 19c7592a351..51062f2f98e 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/lv.po b/addons/account_accountant/i18n/lv.po
index 5d3aa3f3a94..4cdfb57a110 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Šis modulis nodrošina administratoram pieeju grāmatvedības funkcijām, "
+"piemēram, krājumu\n"
+"žurnālam un kontu plānam.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/mk.po b/addons/account_accountant/i18n/mk.po
index d9204b642f3..8928990af07 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: 2011-05-07 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,8 +26,12 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Овој модул на администраторот му дава пристап до сите конговодствени опции, "
+"како што се главната книга и графиците на сметките.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
-msgstr "Сметководител"
+msgstr "Кноговодител"
diff --git a/addons/account_accountant/i18n/mn.po b/addons/account_accountant/i18n/mn.po
index f9eb6d1dfcb..27bede1d696 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/nb.po b/addons/account_accountant/i18n/nb.po
index dd28539e8e7..fef8fa4a14f 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/nl.po b/addons/account_accountant/i18n/nl.po
index 69aab766916..97e2d41ea35 100644
--- a/addons/account_accountant/i18n/nl.po
+++ b/addons/account_accountant/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 17:55+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"Last-Translator: Jan Verlaan @ Veritos <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Accountant"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
index 54c01638f8f..f7b196f174f 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,6 +26,10 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Deze module geeft de administrator toegang tot alle boekhoudfuncties, zoals "
+"de journaalposten en het boekhoudplan.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/oc.po b/addons/account_accountant/i18n/oc.po
new file mode 100644
index 00000000000..d88b40aa957
--- /dev/null
+++ b/addons/account_accountant/i18n/oc.po
@@ -0,0 +1,38 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-20 09:14+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"Aqueste modul balha a l'administrator los accèsses a totas las "
+"foncionalitats comptablas talas coma las linhas\n"
+"d'escritura e lo plan comptable.\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Comptable"
diff --git a/addons/account_accountant/i18n/pl.po b/addons/account_accountant/i18n/pl.po
index 606f7e58472..6454073667c 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,8 +26,13 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Moduł umożliwiający użytkownikowi ze statusem administratora dostęp do "
+"wszystkich funkcjonalności związanych z księgowością, np. dzienniki lub plan "
+"kont.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
-msgstr "Ksiągowy"
+msgstr "Księgowy"
diff --git a/addons/account_accountant/i18n/pt.po b/addons/account_accountant/i18n/pt.po
index 6f1cd330895..618f902bf9b 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Contabilista"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
diff --git a/addons/account_accountant/i18n/pt_BR.po b/addons/account_accountant/i18n/pt_BR.po
index b1ba8003170..c5111f6a349 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Contador"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/account_accountant/i18n/ro.po b/addons/account_accountant/i18n/ro.po
index 1b86caa2c83..861f4622ea7 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -31,9 +31,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Contabil"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
diff --git a/addons/account_accountant/i18n/ru.po b/addons/account_accountant/i18n/ru.po
index 4af82e7b7ab..360d735b57c 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -35,9 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Бухгалтер"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/account_accountant/i18n/sk.po b/addons/account_accountant/i18n/sk.po
index 68eb9651b7f..2e20bd5c0a9 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/sl.po b/addons/account_accountant/i18n/sl.po
index 8671c55f2b1..7b624cc1bce 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Računovodja"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
diff --git a/addons/account_accountant/i18n/sq.po b/addons/account_accountant/i18n/sq.po
index 2d7e79fc1dd..7d93fa0fda8 100644
--- a/addons/account_accountant/i18n/sq.po
+++ b/addons/account_accountant/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/sr.po b/addons/account_accountant/i18n/sr.po
index b40f4e5559f..98179cc29af 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/sr@latin.po b/addons/account_accountant/i18n/sr@latin.po
index bb363405923..0ae32e231f6 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: 2011-05-19 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/sv.po b/addons/account_accountant/i18n/sv.po
index 6aa540bce15..93f06dc380d 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Revisor"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
diff --git a/addons/account_accountant/i18n/ta.po b/addons/account_accountant/i18n/ta.po
index 20102d8bc4f..5835d7eac1e 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/th.po b/addons/account_accountant/i18n/th.po
index 8f89935e33f..40976e5af90 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/tr.po b/addons/account_accountant/i18n/tr.po
index a638762094a..202ad091f44 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -35,9 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Accountant"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Modülün adı benzersiz olmalıdır!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Modülünün sertifika numarası benzersiz olmalıdır!"
diff --git a/addons/account_accountant/i18n/uk.po b/addons/account_accountant/i18n/uk.po
index f88d7f40119..e722ec6c193 100644
--- a/addons/account_accountant/i18n/uk.po
+++ b/addons/account_accountant/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/vi.po b/addons/account_accountant/i18n/vi.po
index 83304fffb57..d2992e25494 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -36,9 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
 msgstr "Kế toán viên"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
diff --git a/addons/account_accountant/i18n/zh_CN.po b/addons/account_accountant/i18n/zh_CN.po
index fb35663a253..d46841ea9e1 100644
--- a/addons/account_accountant/i18n/zh_CN.po
+++ b/addons/account_accountant/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-04-12 03:56+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -27,7 +27,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"这模块给管理员设定所有的会计要素如：凭证簿项科目表\n"
+"这模块给管理员设定所有的会计要素如：账簿的科目表\n"
 "    "
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/zh_TW.po b/addons/account_accountant/i18n/zh_TW.po
new file mode 100644
index 00000000000..3ec61bdf54f
--- /dev/null
+++ b/addons/account_accountant/i18n/zh_TW.po
@@ -0,0 +1,33 @@
+# Chinese (Traditional) 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-09-27 09:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "會計師"
diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py
index a7bdb11ad67..429aa011f31 100644
--- a/addons/account_analytic_analysis/__init__.py
+++ b/addons/account_analytic_analysis/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import account_analytic_analysis
+import cron_account_analytic_account
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 5e93307865c..32642caf49c 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name'      : 'Analytic Account View',
+    'name'      : 'Sales Contract Management',
     'version'   : '1.1',
-    'category'  : 'Finance',
+    'category'  : 'Sales Management',
     'complexity': "normal",
     'description': """
 This module is for modifying account analytic view to show important data to project manager of services companies.
@@ -42,6 +42,7 @@ user-wise as well as month wise.
                     "security/ir.model.access.csv",
                     "account_analytic_analysis_view.xml",
                     "account_analytic_analysis_menu.xml",
+                    "account_analytic_analysis_cron.xml",
                     ],
     'demo_xml'  : [],
     'installable': True,
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 22eb9401ad7..36d62e32e63 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -61,7 +61,7 @@ class account_analytic_account(osv.osv):
                     res[id][f] = [int(id * 1000000 + int(x[0])) for x in result]
             elif f == 'last_worked_invoiced_date':
                 for id in ids:
-                    res[id][f] = 0.0
+                    res[id][f] = False
                 if parent_ids:
                     cr.execute("SELECT account_analytic_line.account_id, MAX(date) \
                             FROM account_analytic_line \
@@ -74,8 +74,8 @@ class account_analytic_account(osv.osv):
                         res[account_id][f] = sum
                 for account in accounts:
                     for child in account.child_ids:
-                        if res[account.id].get(f, '') < res.get(child.id, {}).get(f, ''):
-                            res[account.id][f] = res.get(child.id, {}).get(f, '')
+                        if res[account.id][f] < res.get(child.id, {}).get(f):
+                            res[account.id][f] = res.get(child.id, {}).get(f, False)
             elif f == 'ca_to_invoice':
                 for id in ids:
                     res[id][f] = 0.0
@@ -123,7 +123,7 @@ class account_analytic_account(osv.osv):
                     res[id][f] = round(res.get(id, {}).get(f, 0.0), dp) + round(res2.get(id, 0.0), 2)
             elif f == 'last_invoice_date':
                 for id in ids:
-                    res[id][f] = ''
+                    res[id][f] = False
                 if parent_ids:
                     cr.execute ("SELECT account_analytic_line.account_id, \
                                 DATE(MAX(account_invoice.date_invoice)) \
@@ -137,11 +137,11 @@ class account_analytic_account(osv.osv):
                         res[account_id][f] = lid
                 for account in accounts:
                     for child in account.child_ids:
-                        if res[account.id][f] < res.get(child.id, {}).get(f, ''):
-                            res[account.id][f] = res.get(child.id, {}).get(f, '')
+                        if res[account.id][f] < res.get(child.id, {}).get(f):
+                            res[account.id][f] = res.get(child.id, {}).get(f, False)
             elif f == 'last_worked_date':
                 for id in ids:
-                    res[id][f] = ''
+                    res[id][f] = False
                 if parent_ids:
                     cr.execute("SELECT account_analytic_line.account_id, MAX(date) \
                             FROM account_analytic_line \
@@ -154,8 +154,8 @@ class account_analytic_account(osv.osv):
                         res[account_id][f] = lwd
                 for account in accounts:
                     for child in account.child_ids:
-                        if res[account.id][f] < res.get(child.id, {}).get(f, ''):
-                            res[account.id][f] = res.get(child.id, {}).get(f, '')
+                        if res[account.id][f] < res.get(child.id, {}).get(f):
+                            res[account.id][f] = res.get(child.id, {}).get(f, False)
             elif f == 'hours_qtt_non_invoiced':
                 for id in ids:
                     res[id][f] = 0.0
@@ -374,7 +374,26 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    _columns ={
+    def _is_overdue_quantity(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict.fromkeys(ids, 0)
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.quantity_max > 0.0:
+                result[record.id] = int(record.quantity >= record.quantity_max)
+            else:
+                result[record.id] = 0
+        return result
+
+    def _get_analytic_account(self, cr, uid, ids, context=None):
+        result = set()
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
+            result.add(line.account_id.id)
+        return list(result)
+
+    _columns = {
+        'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity',
+                                                store={
+                                                    'account.analytic.line' : (_get_analytic_account, None, 20),
+                                                }),
         'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount',
             help="Total customer invoiced amount for this account.",
             digits_compute=dp.get_precision('Account')),
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
new file mode 100644
index 00000000000..8564b1606eb
--- /dev/null
+++ b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<openerp>
+    <data>
+        <record model="ir.cron" id="account_analytic_cron">
+            <field name="name">Analytic Account Report for Sales</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">weeks</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'account.analytic.account'" name="model"/>
+            <field eval="'cron_account_analytic_account'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 4ee4693abcb..19271cb4af2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,7 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4" groups="base.group_extended"/>
+        <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">All Uninvoiced Entries</field>
@@ -11,15 +10,92 @@
             <field name="domain">[('invoice_id','=',False)]</field>
             <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
         </record>
-        <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing" groups="base.group_extended"/>
+        <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced"/>
 
-        <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
-            <field name="name">Overpassed Accounts</field>
+        <record id="view_account_analytic_account_overdue_search" model="ir.ui.view">
+            <field name="name">account.analytic.account.search</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Account">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
+                        <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
+                            name="renew"
+                            help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
+                        <filter icon="terp-go-month"
+                             string=" +1 Month"
+                             domain="[('date','&lt;=', (datetime.date.today() + relativedelta(months=1)).strftime('%%Y-%%m-%%d')),('date','>=', time.strftime('%%Y-%%m-%%d'))]"
+                             help="Analytic Accounts with a past deadline in one month." />
+
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="partner_id" select="1">
+                            <filter string="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                        </field>
+                        <field name="user_id">
+                            <filter string="My Accounts" domain="[('user_id','=',uid)]" icon="terp-personal" name="my_accounts" />
+                            <filter string="No Account Manager" domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                        </field>
+
+                    </group>
+                    <newline/>
+                    <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'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <!--
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date_start'}" />
+                        -->
+                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+
+        <record id="action_account_analytic_overdue" model="ir.actions.act_window">
+            <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="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
+            <field name="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
+            <field name="domain">[('type','=','normal')]</field>
+            <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+            <field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field>
         </record>
-        <menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing" groups="base.group_extended"/>
+        <menuitem action="action_account_analytic_overdue" id="menu_action_account_analytic_overdue" sequence="50" parent="base.menu_invoiced"/>
+
+        <record id="action_account_analytic_overdue" model="ir.actions.act_window">
+            <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="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
+            <field name="domain">[('type','=','normal')]</field>
+            <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+            <field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field>
+        </record>
+        <menuitem action="action_account_analytic_overdue" id="menu_action_account_analytic_overdue" sequence="50" parent="base.menu_invoiced"/>
+
+        <record id="action_account_analytic_overdue_all" model="ir.actions.act_window">
+            <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">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field>
+            <field name="domain">[('type','=','normal')]</field>
+            <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+        </record>
+        <menuitem id="base.menu_sales" name="Sales"
+            parent="base.menu_base_partner"
+            sequence="1"/>
+        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="50" parent="base.menu_sales"/>
+
+
     </data>
 </openerp>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index a82f3b1b5c9..c59717e8ad4 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -8,6 +8,27 @@
         Remove information on Account data => because they move on analysis sheet
         create a page with invoicing informations
         -->
+        <record id="account_analytic_account_invoice_stat_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.invoice.stat.form.inherit</field> 
+            <field name="model">account.analytic.account</field> 
+            <field name="type">form</field> 
+            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <group name="invoice_stats" position="inside">
+                    <field name="hours_qtt_non_invoiced"/>
+                    <field name="ca_to_invoice"/>
+                    <label string="" colspan="1"/>
+                    <button
+                        name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
+                        string="Create Invoice"
+                        type="action"
+                        attrs="{'readonly':[('ca_to_invoice','=',0.0)]}"
+                        icon="gtk-go-forward"/>
+                </group>
+            </field>
+        </record>
+
         <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field> 
             <field name="model">account.analytic.account</field> 
@@ -16,7 +37,7 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Analysis summary">
+                    <page string="Invoice Analysis">
                         <separator colspan="4" string="Work done stats"/>
 
                         <field name="total_cost"/>
@@ -39,10 +60,6 @@
                         <field name="last_invoice_date"/>
                         <field name="last_worked_invoiced_date"/>
                         <field name="last_worked_date"/>
-                        <separator colspan="4" string="To be invoiced"/>
-                        
-                        <field name="hours_qtt_non_invoiced"/>
-                        <field name="ca_to_invoice"/>
                     </page>
                     <page string="Stats by month">
                         <field colspan="4" name="month_ids" nolabel="1">
diff --git a/addons/account_analytic_analysis/cron_account_analytic_account.py b/addons/account_analytic_analysis/cron_account_analytic_account.py
new file mode 100644
index 00000000000..df022cbd6bd
--- /dev/null
+++ b/addons/account_analytic_analysis/cron_account_analytic_account.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+from osv import osv
+from mako.template import Template
+import time
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
+
+import tools
+
+MAKO_TEMPLATE = u"""Hello ${user.name},
+
+Here is a list of contracts that have to be renewed for two
+possible reasons:
+  - the end of contract date is passed
+  - the customer consumed more hours than expected
+
+Can you contact the customer in order to sell a new or renew its contract.
+The contract has been set with a pending state, can you update the status
+of the analytic account following this rule:
+  - Set Done: if the customer does not want to renew
+  - Set Open: if the customer purchased an extra contract
+
+Here is the list of contracts to renew:
+% for partner, accounts in partners.iteritems():
+  * ${partner.name}
+  % for account in accounts:
+    - Name: ${account.name}
+      % if account.quantity_max != 0.0:
+      - Quantity: ${account.quantity}/${account.quantity_max} hours
+      % endif
+      - Dates: ${account.date_start} to ${account.date and account.date or '???'}
+      - Contacts:
+        % for address in account.partner_id.address:
+        . ${address.name}, ${address.phone}, ${address.email}
+        % endfor
+
+  % endfor
+% endfor
+
+You can use the report in the menu: Sales > Invoicing > Overdue Accounts
+
+Regards,
+
+--
+OpenERP
+"""
+
+class analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+
+    def cron_account_analytic_account(self, cr, uid, context=None):
+        domain = [
+            ('name', 'not ilike', 'maintenance'),
+            ('partner_id', '!=', False),
+            ('user_id', '!=', False),
+            ('user_id.user_email', '!=', False),
+            ('state', 'in', ('draft', 'open')),
+            '|', ('date',  '<', time.strftime('%Y-%m-%d')), ('date', '=', False),
+        ]
+
+        account_ids = self.search(cr, uid, domain, context=context, order='name asc')
+        accounts = self.browse(cr, uid, account_ids, context=context)
+
+        users = dict()
+        for account in accounts:
+            users.setdefault(account.user_id, dict()).setdefault(account.partner_id, []).append(account)
+
+            account.write({'state' : 'pending'}, context=context)
+
+        for user, data in users.iteritems():
+            subject = '[OPENERP] Reporting: Analytic Accounts'
+            body = Template(MAKO_TEMPLATE).render_unicode(user=user, partners=data)
+            tools.email_send('noreply@openerp.com', [user.user_email, ], subject, body)
+
+        return True
+
+analytic_account()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_analysis/i18n/ar.po b/addons/account_analytic_analysis/i18n/ar.po
index 6b6e7a669e7..a809aa2cd5c 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index b0c110e5bab..b4e4f50d8bb 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index 623953d6ee5..450dd68f6fc 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: 2011-05-09 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/ca.po b/addons/account_analytic_analysis/i18n/ca.po
index 6604c06c078..f2897203815 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/cs.po b/addons/account_analytic_analysis/i18n/cs.po
index d02006b4792..aafec97990a 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po
index 37745f96eeb..95f24a21b1f 100644
--- a/addons/account_analytic_analysis/i18n/da.po
+++ b/addons/account_analytic_analysis/i18n/da.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:14+0000\n"
-"PO-Revision-Date: 2010-11-22 07:38+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-08 21:41+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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -134,7 +134,7 @@ msgstr "Bruger"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr ""
+msgstr "Ufaktureret beløb"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -295,19 +295,10 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ugyldigt modelnavn i handlingsdefinitionen"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Modulets navn skal være unikt"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Objektnavnet skal starte med x_ og må ikke indeholde specialkarakterer!"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Modulets certifikat-ID skal være unikt"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for View Architecture!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Feltets størrelse kan aldrig være mindre end 1 !"
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index e5d61cd2c4f..2435fbcc94e 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -377,8 +377,5 @@ msgstr ""
 #~ "Projektmanager von Service Firmen\n"
 #~ "Menü für die Service Manager"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index 9b3f0957c88..00d0ac01928 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -378,9 +378,6 @@ msgstr ""
 #~ "υπηρεσιών.\n"
 #~ "Προσθέστε μενού για να δείξετε σχετικές πληροφορίες για κάθε διαχειριστή."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος. Δεν μπορείτε να δημιουργήσετε αναδρομικό μενού"
-
 #~ msgid "Theorical Revenue"
 #~ msgstr "Δυνητικά Έσοδα"
 
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index 44ac4a67300..bedd5393172 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -378,15 +378,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/account_analytic_analysis/i18n/es_AR.po b/addons/account_analytic_analysis/i18n/es_AR.po
index a5045735f03..d9470420a3b 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/es_EC.po b/addons/account_analytic_analysis/i18n/es_EC.po
index 76903774ec4..31bf78b7a85 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -378,6 +378,3 @@ msgstr ""
 
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "Cuentas analíticas pendientes"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos"
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
new file mode 100644
index 00000000000..ba7a0cc051d
--- /dev/null
+++ b/addons/account_analytic_analysis/i18n/es_MX.po
@@ -0,0 +1,380 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_analysis
+#
+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:14+0000\n"
+"PO-Revision-Date: 2011-01-13 09:42+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:25+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+"Número de horas que pueden ser facturadas más aquellas que ya han sido "
+"facturadas."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
+#, python-format
+msgid "AccessError"
+msgstr "Error de acceso"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Fecha de la última factura creada para esta cuenta analítica."
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+msgstr ""
+"\n"
+"Este módulo modifica la vista de cuenta analítica para mostrar\n"
+"datos importantes para el director de proyectos en empresas de servicios.\n"
+"Añade menú para mostrar información relevante para cada director.\n"
+"\n"
+"También puede ver el informe del resumen contable analítico\n"
+"a nivel de usuario, así como a nivel mensual.\n"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Fecha última factura"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr "Tasa de margen real (%)"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr "Ingresos teóricos"
+
+#. 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 ""
+"Si factura a partir de los costes, ésta es la fecha del último trabajo o "
+"coste que se ha facturado."
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Billing"
+msgstr "Facturación"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr "Fecha del último coste/trabajo"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr "Costes totales"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+"Cantidad de horas que dedica a la cuenta analítica (desde horarios). Calcula "
+"en todos los diarios del tipo 'general'."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr "Márgen teórico"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+"Basado en los costes que tenía en el proyecto, lo que habría sido el "
+"ingreso si todos estos costes se hubieran facturado con el precio de venta "
+"normal proporcionado por la tarifa."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Importe no facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr "Horas no facturadas"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Fecha del último trabajo realizado en esta cuenta."
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr "Informes contabilidad analítica"
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Resumen de horas por usuario"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr "Importe facturado"
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr "Fecha del último coste facturado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr "Horas facturadas"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr "Margen real"
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr "Importe total facturado al cliente para esta cuenta."
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr "Resumen de horas por mes"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+"Número de horas (desde diario de tipo 'general') que pueden ser facturadas "
+"si factura basado en contabilidad analítica."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr "Cuentas analíticas"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+msgstr "Ingreso restante"
+
+#. 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 ""
+"Si factura basado en contabilidad analítica, el importe restante que puede "
+"facturar al cliente basado en los costes totales."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr "Calculado utilizando la fórmula: Importe facturado / Horas totales."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr "Ingresos por horas (real)"
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr "Cuentas caducadas"
+
+#. 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 "Todas las entradas no facturadas"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Horas totales"
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. 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 ""
+"Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
+"costes indirectos, como el tiempo empleado en hojas de servicio (horarios)."
+
+#~ msgid "Hours summary by user"
+#~ msgstr "Resumen de horas por usuario"
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Todas las cuentas analíticas"
+
+#~ msgid "My Current Accounts"
+#~ msgstr "Mis cuentas actuales"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Theorical Revenue"
+#~ msgstr "Ingresos teóricos"
+
+#~ 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 "New Analytic Account"
+#~ msgstr "Nueva cuenta analítica"
+
+#~ msgid "Theorical Margin"
+#~ msgstr "Margen teórico"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Cuentas analíticas actuales"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Mis cuentas pendientes"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Mis entradas no facturadas"
+
+#~ msgid "My Accounts"
+#~ msgstr "Mis cuentas"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Cuentas analíticas"
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Gestión de proyectos financieros"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Cuentas analíticas pendientes"
+
+#~ msgid ""
+#~ "Modify account analytic view to show\n"
+#~ "important data for project manager of services companies.\n"
+#~ "Add menu to show relevant information for each manager."
+#~ msgstr ""
+#~ "Modifica la vista de cuenta analítica para mostrar\n"
+#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
+#~ "Añade menú para mostrar información relevante para cada director."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/account_analytic_analysis/i18n/es_PY.po b/addons/account_analytic_analysis/i18n/es_PY.po
index 7d7715707fa..2ac6c9c53a2 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/es_VE.po b/addons/account_analytic_analysis/i18n/es_VE.po
new file mode 100644
index 00000000000..ba7a0cc051d
--- /dev/null
+++ b/addons/account_analytic_analysis/i18n/es_VE.po
@@ -0,0 +1,380 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_analysis
+#
+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:14+0000\n"
+"PO-Revision-Date: 2011-01-13 09:42+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:25+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+"Número de horas que pueden ser facturadas más aquellas que ya han sido "
+"facturadas."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
+#, python-format
+msgid "AccessError"
+msgstr "Error de acceso"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Fecha de la última factura creada para esta cuenta analítica."
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+msgstr ""
+"\n"
+"Este módulo modifica la vista de cuenta analítica para mostrar\n"
+"datos importantes para el director de proyectos en empresas de servicios.\n"
+"Añade menú para mostrar información relevante para cada director.\n"
+"\n"
+"También puede ver el informe del resumen contable analítico\n"
+"a nivel de usuario, así como a nivel mensual.\n"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Fecha última factura"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr "Tasa de margen real (%)"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr "Ingresos teóricos"
+
+#. 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 ""
+"Si factura a partir de los costes, ésta es la fecha del último trabajo o "
+"coste que se ha facturado."
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Billing"
+msgstr "Facturación"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr "Fecha del último coste/trabajo"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr "Costes totales"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+"Cantidad de horas que dedica a la cuenta analítica (desde horarios). Calcula "
+"en todos los diarios del tipo 'general'."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr "Márgen teórico"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+"Basado en los costes que tenía en el proyecto, lo que habría sido el "
+"ingreso si todos estos costes se hubieran facturado con el precio de venta "
+"normal proporcionado por la tarifa."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Importe no facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr "Horas no facturadas"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Fecha del último trabajo realizado en esta cuenta."
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr "Informes contabilidad analítica"
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Resumen de horas por usuario"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr "Importe facturado"
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr "Fecha del último coste facturado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr "Horas facturadas"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr "Margen real"
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr "Importe total facturado al cliente para esta cuenta."
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr "Resumen de horas por mes"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+"Número de horas (desde diario de tipo 'general') que pueden ser facturadas "
+"si factura basado en contabilidad analítica."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr "Cuentas analíticas"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+msgstr "Ingreso restante"
+
+#. 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 ""
+"Si factura basado en contabilidad analítica, el importe restante que puede "
+"facturar al cliente basado en los costes totales."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr "Calculado utilizando la fórmula: Importe facturado / Horas totales."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr "Ingresos por horas (real)"
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr "Cuentas caducadas"
+
+#. 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 "Todas las entradas no facturadas"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Horas totales"
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. 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 ""
+"Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
+"costes indirectos, como el tiempo empleado en hojas de servicio (horarios)."
+
+#~ msgid "Hours summary by user"
+#~ msgstr "Resumen de horas por usuario"
+
+#~ msgid "All Analytic Accounts"
+#~ msgstr "Todas las cuentas analíticas"
+
+#~ msgid "My Current Accounts"
+#~ msgstr "Mis cuentas actuales"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Theorical Revenue"
+#~ msgstr "Ingresos teóricos"
+
+#~ 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 "New Analytic Account"
+#~ msgstr "Nueva cuenta analítica"
+
+#~ msgid "Theorical Margin"
+#~ msgstr "Margen teórico"
+
+#~ msgid "Current Analytic Accounts"
+#~ msgstr "Cuentas analíticas actuales"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid "My Pending Accounts"
+#~ msgstr "Mis cuentas pendientes"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Mis entradas no facturadas"
+
+#~ msgid "My Accounts"
+#~ msgstr "Mis cuentas"
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Cuentas analíticas"
+
+#~ msgid "Financial Project Management"
+#~ msgstr "Gestión de proyectos financieros"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Cuentas analíticas pendientes"
+
+#~ msgid ""
+#~ "Modify account analytic view to show\n"
+#~ "important data for project manager of services companies.\n"
+#~ "Add menu to show relevant information for each manager."
+#~ msgstr ""
+#~ "Modifica la vista de cuenta analítica para mostrar\n"
+#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
+#~ "Añade menú para mostrar información relevante para cada director."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index 12038d88215..a1d1bb32a02 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index f94fdbd1fff..58fe82a919b 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -40,7 +40,7 @@ msgstr "Laskettu kaavalla: Enimmäismäärä - Tunteja yhteensä"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Käyttöoikeusvirhe"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -77,7 +77,7 @@ msgstr "Toteutunut kate (%)"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "Teoreettinen liikevaihto"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -85,11 +85,13 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
+"Jos laskutetaan kuluista, tämä on päivä jolloin viimeisimmät työt tai kulut "
+"on laskutettu."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Billing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -107,6 +109,8 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
+"Tuntien määrä jonka käytit analyyttisillä tileillä (tuntilistasta). Laskee "
+"kaikki 'yleinen tyyppiset merkinnät."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
@@ -116,7 +120,7 @@ msgstr "Jäljellä olevat tunnit"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "Teoreettinen kate"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -162,7 +166,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours Summary by User"
-msgstr ""
+msgstr "Tuntiyhteenveto käyttäjittäin"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -174,12 +178,12 @@ msgstr "Laskutetut määrä"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
-msgstr ""
+msgstr "Yrität ohittaa pääsysääntöjä (dokumentin tyyppi: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr ""
+msgstr "Viimeisimmän laskutetun kulun päiväys"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -196,7 +200,7 @@ msgstr "Todellinen kate"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -212,6 +216,7 @@ msgstr "Kuukauden tuntiyhteenveto"
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgstr ""
+"Lasketaan käyttäen kaavaa: (Todellinen kate / todelliset kulut) * 100"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -219,6 +224,8 @@ msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
 msgstr ""
+"Tuntien määrä (päiväkirjan tyyppi 'yleinen') jotka voidaan laskuttaa jos "
+"lasku perustuu analyyttiseen tiliin."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -228,7 +235,7 @@ msgstr "Analyyttiset tilit"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "Jäljelläoleva liikevaihto"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -236,16 +243,18 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
+"Jos laskutetaan analyyttisiltä tileiltä, jäljelläoleva määrä jonka voit "
+"veloittaa asiakkaala määräytyy kokonaiskuluista."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr ""
+msgstr "Lasketaan käyttäen kaavaa: laskutettu määrä / kokonaistunnit"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "Liikevaihto per tunti (todellinen)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -270,7 +279,7 @@ msgstr "Analyyttinen tili"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr ""
+msgstr "Ylitetyt tilit"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -286,7 +295,7 @@ msgstr "Kokonaistunnit"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -294,6 +303,8 @@ msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
+"Kokonaiskulut tälle tilille. Sisältää todelliset kulut (laskuilta) ja "
+"epäsuorat kulut, kuten tuntilistoista tulevat tunnit."
 
 #~ msgid "Invoicing"
 #~ msgstr "Laskutus"
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index f3fdeb7ba0d..2e296038094 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -377,20 +377,8 @@ msgstr ""
 #~ "service.\n"
 #~ "Ajoute un menu pour montrer les informations utiles à chaque gestionnaire."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer un Menu récursif."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
 #~ "spécial !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne peut jamais être inférieure à 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'identifiant du certificat du module doit être unique !"
diff --git a/addons/account_analytic_analysis/i18n/gl.po b/addons/account_analytic_analysis/i18n/gl.po
index fafd44d0463..f0349bdcac7 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -24,7 +24,7 @@ msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
 msgstr ""
-"Número de horas que poden ser facturadas máis aquelas que xa foron "
+"Número de horas que poden ser facturadas mais aquelas que xa foron "
 "facturadas."
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 6cd44e832e3..7467f5c21c1 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index 1fefd7bd2ec..4e8b932ab1a 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-30 15:04+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/id.po b/addons/account_analytic_analysis/i18n/id.po
index 3982aeb3271..b4857152f6e 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index 346ee4dff3f..2c9c7d3937e 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -298,7 +298,7 @@ msgstr "Conti oltrepassati"
 #: 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 "Tutte le voci fatturate"
+msgstr "Voci da Fatturare"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
@@ -382,15 +382,3 @@ msgstr ""
 #~ "dati importanti per il Responsabile dei Progetti di una Compagnia di "
 #~ "servizi.\n"
 #~ "Aggiunge un menù per mostrare informazioni di nota per ogni Responsabile."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index d6045e1c677..513e7020445 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 4f207bc9039..65feca53c15 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/lv.po b/addons/account_analytic_analysis/i18n/lv.po
index 81dfb138355..01337f272dc 100644
--- a/addons/account_analytic_analysis/i18n/lv.po
+++ b/addons/account_analytic_analysis/i18n/lv.po
@@ -14,37 +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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr ""
+msgstr "Apmaksai piestādāmo un jau piestādīto darba stundu summa."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
+"Aprēķināts izmantojot formulu: Maksimālā Rēķina Cena - Piestādītā Summa."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
+"Aprēķināts izmantojot formulu: Maksimālais Daudzums - Kopējais Stundu Skaits."
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Piekļuves Kļūda"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "Šim analītiskajam kontam pēdējā izrakstītā rēķina datums."
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -57,26 +59,33 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Šis modulis ir paredzēts kontu analītisko skatu lai parādītu\n"
+"svarīgus datus servisa uzņēmumu projektu vadītājiem.\n"
+"Pievieno izvēlni lai parādītu saistīto informāciju katram menedžerim.\n"
+"\n"
+"Jūs varat arī apskatīt konta analītikas kopskata pārskatu\n"
+"pa lietotājiem vai pa mēnešiem.\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "Pēdējā Rēķina Datums"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
+msgstr "Aprēķināts izmantojot formulu: Teorētiskā Peļņa - Kopējās Izmaksas."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "Patiesais Uzcenojums (%)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "Teorētiskā Peļņa"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -84,16 +93,18 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
+"Rēķins par izmaksām, šis ir pēdējo darbu vai piestādīto izmaksu rēķina "
+"datums."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Billing"
-msgstr ""
+msgstr "Rēķinu izrakstīšana"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr ""
+msgstr "Pēdējo Darbu/Izmaksu Datums"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -106,16 +117,18 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
+"Uz analītiskā konta patērēto stundu skaits (pēc laika tabeles). Tiek "
+"aprēķināts no visiem 'vispārējā' tipa žurnāliem."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "Atlikušas Stundas"
+msgstr "Atlikušās Stundas"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "Teorētiskais Uzcenojums"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -124,6 +137,8 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
+"Balstoties uz jūsu izmaksām strādājot pie projekta, iespējamā peļņa ja visas "
+"izmaksas piestādītu pēc normālas cenas no parastās cenu lapas."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -134,81 +149,83 @@ msgstr "Lietotājs"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr ""
+msgstr "Nepiestādītais Apjoms"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr ""
+msgstr "Aprēķināts izmantojot formulu: Piestādītā Summa - Kopējās Izmaksas."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr ""
+msgstr "Apmaksai Nepiestādītās Stundas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "Pēdējo darbu datums šajā kontā."
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr ""
+msgstr "report_account_analytic"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours Summary by User"
-msgstr ""
+msgstr "Kopējās Stundas pēc Lietotājiem"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Apmaksai Piestādītais Apjoms"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
-msgstr ""
+msgstr "Jūs mēģināt apiet piekļuves noteikumus (Dokumenta tips: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr ""
+msgstr "Pēdējo Piestādīto Izmaksu Datums"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
-msgstr ""
+msgstr "Apmaksai Piestādītās Stundas"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr ""
+msgstr "Patiesais Uzcenojums"
 
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Kļūda! Valūtai jāsakrīt ar izvēlētā uzņēmuma valūtu."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "Kopējā klientam piestādītā summa no šā konta"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr ""
+msgstr "Kopējās Stundas pēc mēnešiem"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgstr ""
+"Aprēķināts izmantojot formulu: (Patiesais Uzcenojums / Kopējās Izmaksas) * "
+"100"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -216,6 +233,8 @@ msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
 msgstr ""
+"Stundu kopskaits (no žurnāliem ar tipu 'vispārējais') ko iespējams piestādīt "
+"apmaksai balstoties uz analītisko kontu."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -225,7 +244,7 @@ msgstr "Analītiskie konti"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "Atlikusī Peļņa"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -233,16 +252,18 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
+"Ja piestāda rēķinu no analītiskā konta, atlikušo summu jūs variet klientam "
+"piestādīt balstoties uz kopējām izmaksām."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr ""
+msgstr "Aprēķināts izmantojot formulu: Piestādītā Summa / Kopējās Stundas"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "Peļņa pēc Stundām (patiesā)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -267,23 +288,23 @@ msgstr "Analītiskais Konts"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr ""
+msgstr "Caurskatītie Konti"
 
 #. 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 "Visi Apmaksai Nepiestādītie Ieraksti"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Hours Tot"
-msgstr ""
+msgstr "Kopējās Stundas"
 
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Kļūda! Jūs nedrīkstat veidot rekursīvus analītiskos kontus."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -291,6 +312,8 @@ msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
+"Kopējās šā konta izmaksas. Ieskaitot reālās izmaksas (no rēķiniem) un "
+"netiešās izmaksas, kā patērētais laiks no laika tabelēm."
 
 #~ msgid "All Analytic Accounts"
 #~ msgstr "Visi Analītiskie Konti"
diff --git a/addons/account_analytic_analysis/i18n/mk.po b/addons/account_analytic_analysis/i18n/mk.po
new file mode 100644
index 00000000000..9ddcb9c4404
--- /dev/null
+++ b/addons/account_analytic_analysis/i18n/mk.po
@@ -0,0 +1,296 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-14 08:10+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: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+"Број на часови кои можат да бидат фактурирани, плус часови кои веќе се "
+"фактурирани."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+"Пресметано според формулата: Максимална фактурирана цена - Фактурирана цена."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr "Пресметано според формулата: Максимална количина - Вкупно часови"
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
+#, python-format
+msgid "AccessError"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+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 ""
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Billing"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+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 ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr ""
+
+#. 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 ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+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 ""
diff --git a/addons/account_analytic_analysis/i18n/mn.po b/addons/account_analytic_analysis/i18n/mn.po
index e326e36d504..c957ca8fe77 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -322,9 +322,6 @@ msgstr ""
 #~ msgid "Theorical Revenue"
 #~ msgstr "Хийсвэр орлого"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та цикл хэлбэрийн данс үүсгэх боломжгүй."
-
 #~ msgid "Theorical Margin"
 #~ msgstr "Хийсвэр зөрүү"
 
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index d87530e248d..3aab473f22e 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -8,21 +8,22 @@ 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-08-02 21:56+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-08-23 11:12+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr "Antall timer som faktureres plus de som allerede har blitt fakturert"
+msgstr ""
+"Antall timer som kan faktureres pluss de som allerede har blitt fakturert"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index 68f44153979..c147ba3eafa 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: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 18:39+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"Last-Translator: Jan Verlaan @ Veritos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -377,15 +377,3 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/account_analytic_analysis/i18n/nl_BE.po b/addons/account_analytic_analysis/i18n/nl_BE.po
index 45b80a81873..58b41835a0f 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
index cbc1f315336..31fd866180a 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index 84a01d91486..bb56ba6adeb 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-10-30 10:27+0000\n"
-"Last-Translator: Stanisław Chmiela <chmiela.st@gmail.com>\n"
+"Last-Translator: Stanisław Chmiela <schmiela@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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index d2525107b7a..c2c00a94cad 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -368,18 +368,6 @@ msgstr ""
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "Contas Analítica Pendentes"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
 
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index fecbd8d2102..9dcee681cfd 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -374,15 +374,3 @@ msgstr ""
 
 #~ msgid "My Uninvoiced Entries"
 #~ msgstr "Minhas Entradas não Faturadas"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/account_analytic_analysis/i18n/ro.po b/addons/account_analytic_analysis/i18n/ro.po
index 468fee9d887..6df53592861 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 3f68f79dad5..de731457bad 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -238,7 +238,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "Аналитические счета"
+msgstr "Счета аналитики"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -281,7 +281,7 @@ 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_managed_overpassed
@@ -365,18 +365,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #~ msgid "My Uninvoiced Entries"
 #~ msgstr "Мои неотфактурованные записи"
 
diff --git a/addons/account_analytic_analysis/i18n/sl.po b/addons/account_analytic_analysis/i18n/sl.po
index 73a92d4142f..57191ea5c4b 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/sq.po b/addons/account_analytic_analysis/i18n/sq.po
index e1d2deb26b6..9ba3c730f93 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index d7775d3a215..25ebc32f0dd 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -368,6 +368,3 @@ msgstr ""
 
 #~ msgid "Analytic Accounts"
 #~ msgstr "Analitička konta"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
diff --git a/addons/account_analytic_analysis/i18n/sr@latin.po b/addons/account_analytic_analysis/i18n/sr@latin.po
index d4bc5adcd82..6c3cfb69bf5 100644
--- a/addons/account_analytic_analysis/i18n/sr@latin.po
+++ b/addons/account_analytic_analysis/i18n/sr@latin.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:14+0000\n"
-"PO-Revision-Date: 2011-05-19 16:47+0000\n"
+"PO-Revision-Date: 2011-11-03 22:52+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: 2011-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -45,7 +45,7 @@ msgstr "Greška u pristupu"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum poslednjeg obračuna napravljenoh za ovaj analitički nalog."
+msgstr "Datum poslednjeg obračuna napravljenih za ovaj analitički nalog."
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -320,9 +320,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #~ msgid "Theorical Margin"
 #~ msgstr "Teoretska margina"
 
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index b50aa1bc494..77b8282fa86 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -367,15 +367,3 @@ msgstr ""
 
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "Pending Analytic Accounts"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
diff --git a/addons/account_analytic_analysis/i18n/tlh.po b/addons/account_analytic_analysis/i18n/tlh.po
index 8084d70412b..16adb5336f7 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index d04b1607428..75e72939dd2 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: 2011-05-23 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -39,7 +39,7 @@ msgstr "Hesaplamada kullanılan formül: Enfazla Miktar -  Saatler Toplamı"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
-msgstr "Erişim Hatası"
+msgstr "ErişimHatası"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -83,7 +83,7 @@ msgstr "Gerçek Kar Oranı (%)"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr "Teorik Gelir"
+msgstr "Teorik Ciro"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -347,9 +347,6 @@ msgstr ""
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "Bekleyen Analiz Hesaplarım"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Hata! Yinelenen Menü oluşturamazsınız."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Eylem tanımlamasında geçersiz model adı."
 
diff --git a/addons/account_analytic_analysis/i18n/uk.po b/addons/account_analytic_analysis/i18n/uk.po
index 575716ebee8..470f301f601 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/vi.po b/addons/account_analytic_analysis/i18n/vi.po
index 604c2cfb7ff..2c895c9c1e8 100644
--- a/addons/account_analytic_analysis/i18n/vi.po
+++ b/addons/account_analytic_analysis/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 22:52+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 5097c541ee4..8d93edc82fa 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-04-12 18:24+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -108,7 +108,7 @@ msgstr "总成本"
 msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
-msgstr "在分析会计中你花费的小时数(根据时间表). 它在计算所有类型为'普通的'凭证簿."
+msgstr "在分析会计中你花费的小时数(根据时间表). 它在计算所有类型为'普通的'账簿."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
@@ -196,7 +196,7 @@ msgstr "实际利润"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "错误！货币必须是所选公司的本位币"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -218,12 +218,12 @@ msgstr "计算公式为:(实际利润/总成本×100)"
 msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
-msgstr "如果你的发票基于这辅助核算项, 小时数(从记录集合类型是\"普通\")可以开发票"
+msgstr "如果您的发票基于这辅助核算项, 小时数(账簿类型是\"普通\")可以开发票"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -264,7 +264,7 @@ 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_managed_overpassed
diff --git a/addons/account_analytic_analysis/i18n/zh_TW.po b/addons/account_analytic_analysis/i18n/zh_TW.po
index adf2eb43d94..feb0cf3d29d 100644
--- a/addons/account_analytic_analysis/i18n/zh_TW.po
+++ b/addons/account_analytic_analysis/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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -26,19 +26,19 @@ 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,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr ""
+msgstr "使用以下公式計算: 最大數量 - 總時間(小時)"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "存取錯誤"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -60,7 +60,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "最近發票日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -75,7 +75,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "理論營業額"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -97,7 +97,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
 msgid "Total Costs"
-msgstr ""
+msgstr "總成本"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -128,7 +128,7 @@ msgstr ""
 #: field:account.analytic.account,user_ids:0
 #: field:account_analytic_analysis.summary.user,user:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -253,7 +253,7 @@ msgstr ""
 #: field:account.analytic.account,month_ids:0
 #: field:account_analytic_analysis.summary.month,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index c2bea6783df..e46f285d9c6 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name'      : 'Account Analytic Defaults',
     'version'   : '1.0',
-    'category'  : 'Finance',
+    'category'  : 'Hidden',
     'complexity': "normal",
     'description': """Set default values for your analytic accounts
 Allows to automatically select analytic accounts based on criterions:
@@ -39,7 +39,11 @@ Allows to automatically select analytic accounts based on criterions:
     'images'   : ['images/analytic_defaults.jpeg'],
     'depends'   : ['sale'],
     'init_xml'  : [],
-    'update_xml': ['security/ir.model.access.csv', 'account_analytic_default_view.xml'],
+    'update_xml': [
+        'security/ir.model.access.csv', 
+        'security/account_analytic_default_security.xml', 
+        'account_analytic_default_view.xml'
+    ],
     'demo_xml'  : [],
     'installable': True,
     'active': False,
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index b41c9b9e5d2..2c4fdd4e421 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -73,8 +73,8 @@ class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
     _description = "Invoice Line"
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context, company_id=company_id)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec:
             res_prod['value'].update({'account_analytic_id': rec.analytic_id.id})
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index f078ba09c22..753765019f6 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -44,7 +44,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <group col="10" colspan="4">
+                    <group>
                     <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
                     <separator orientation="vertical"/>
                     <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index 6d8d16248f3..37b7c21b18e 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/bg.po b/addons/account_analytic_default/i18n/bg.po
index f2b3bbf4c40..10e0bde49b3 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/bs.po b/addons/account_analytic_default/i18n/bs.po
index cff193e7fcf..ffaaa1ebde5 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po
index 14ba329da70..4d14492911f 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/cs.po b/addons/account_analytic_default/i18n/cs.po
index 0d735718b8c..9d8042da41f 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po
index a48b6c81409..7e1a64488e0 100644
--- a/addons/account_analytic_default/i18n/da.po
+++ b/addons/account_analytic_default/i18n/da.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:14+0000\n"
-"PO-Revision-Date: 2011-04-29 12:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-11-08 22:24+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: 2011-04-30 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -65,7 +65,7 @@ msgstr "Plukseddel"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr ""
+msgstr "Betingelser"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,company_id:0
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index 0faf32267b3..099a269e1e5 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -222,375 +222,11 @@ msgstr "Auftragsposition"
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analyse Verteilung"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Auftragsposition"
-
-#~ msgid "Account4 Id"
-#~ msgstr "Konto4 ID"
-
 #~ 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 "Crossovered Analytic"
-#~ msgstr "Quervergleich Analyse"
-
-#~ msgid "Account5 Id"
-#~ msgstr "Konto5 ID"
-
-#~ msgid "Account3 Id"
-#~ msgstr "Konto3 ID"
-
-#~ msgid "Rate (%)"
-#~ msgstr "Anteil (%)"
-
-#~ msgid "Analytic Plan"
-#~ msgstr "Analytische Verrechnung"
-
-#~ msgid ""
-#~ "This distribution model has been saved.You will be able to reuse it later."
-#~ msgstr "Die Verrechnungsvorlage wurde gesichert und ist nunmehr verwendbar."
-
-#~ msgid "Please put a name and a code before saving the model !"
-#~ msgstr "Bezeichnung und Kurzbezeichnung vor Speichern eingeben"
-
-#~ msgid "Analytic Instance Line"
-#~ msgstr "Analyt. Buchungspsoitionen"
-
-#~ msgid "Analytic Distribution Lines"
-#~ msgstr "Analyt. Verrechnungspositionen"
-
-#~ msgid "Print"
-#~ msgstr "Drucke"
-
-#~ msgid "To Date"
-#~ msgstr "Bis Datum"
-
-#~ msgid "Plan Id"
-#~ msgstr "Plan ID"
-
-#~ msgid "Analytic Distribution's Models"
-#~ msgstr "Analyt. Verrechnungsvorlagen"
-
-#~ msgid "Account Name"
-#~ msgstr "Konto Bez."
-
-#~ msgid "Analytic Distribution Line"
-#~ msgstr "Analyt. Verrechnungsvorlage"
-
-#~ msgid "Distribution Code"
-#~ msgstr "Kurzbezeichnung"
-
-#~ msgid "Printing date"
-#~ msgstr "Datum Druck"
-
-#~ msgid "Percentage"
-#~ msgstr "Prozent"
-
-#~ msgid "Dont show empty lines"
-#~ msgstr "Zeige keine leeren Zeilen"
-
-#~ msgid "A model having this name and code already exists !"
-#~ msgstr "Ein Modul mit diesem Namen eixistiert bereits"
-
-#~ msgid "Analytic Journal"
-#~ msgstr "Analytisches Journal"
-
-#~ msgid "100.00%"
-#~ msgstr "100,00 %"
-
-#~ msgid "Currency"
-#~ msgstr "Währung"
-
-#~ msgid "Analytic Account :"
-#~ msgstr "Analytisches Konto"
-
-#~ msgid "Analytic Plan Line"
-#~ msgstr "Analyt. Verrechnungspositionen"
-
-#~ msgid "No analytic plan defined !"
-#~ msgstr "Kein Kontenplan für analytische Konten definiert"
-
-#~ msgid "Analytic Account Reference:"
-#~ msgstr "Analyt. Konto Referenz:"
-
-#~ msgid "Plan Name"
-#~ msgstr "Verrechnungsposition"
-
-#~ msgid "Default Entries"
-#~ msgstr "Vorlage Verrechnung"
-
-#~ msgid "Error"
-#~ msgstr "Fehler"
-
-#~ msgid "Analytic Plans"
-#~ msgstr "Analyt. Verrechnung"
-
-#~ msgid "User Error"
-#~ msgstr "Benutzerfehler"
-
-#~ msgid "Journal Items"
-#~ msgstr "Journal Einträge"
-
-#~ msgid "Account1 Id"
-#~ msgstr "Konto1 ID"
-
-#~ msgid "Maximum Allowed (%)"
-#~ msgstr "Max. Erlaubt (100%)"
-
-#~ msgid "Root Account"
-#~ msgstr "Oberstes Konto"
-
-#~ msgid "Distribution Model Saved"
-#~ msgstr "Verrechnungsvorlage gespeichert"
-
-#~ msgid "Analytic Plan Instance"
-#~ msgstr "Analyt. Verrechnungsvorgang"
-
-#~ msgid "Distribution Models"
-#~ msgstr "Vorlage Verrechnung"
-
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "Multiple-plans management in Analytic Accounting"
-#~ msgstr "Mehrstufige Verrechnung auf analytische Konten"
-
-#~ msgid "Analytic Plan Lines"
-#~ msgstr "Analyt. Verrechnung Positionen"
-
-#~ msgid "Minimum Allowed (%)"
-#~ msgstr "Min. Erlaubt (100%)"
-
-#~ msgid "Model's Plan"
-#~ msgstr "Vorgabe Verrechnung"
-
-#~ msgid "Account2 Id"
-#~ msgstr "Konto2 ID"
-
-#~ msgid "The Total Should be Between %s and %s"
-#~ msgstr "Der Wert sollte zwischen %s  und %s sein."
-
-#~ msgid "Bank Statement Line"
-#~ msgstr "Bankauszug Buchungen"
-
-#~ msgid "Amount"
-#~ msgstr "Wert"
-
-#~ msgid "Print Crossovered Analytic"
-#~ msgstr "Druck Kreuzanalyse"
-
-#~ msgid "Account6 Id"
-#~ msgstr "Konto6 Id"
-
-#~ msgid ""
-#~ "This module allows to use several analytic plans, according to the general "
-#~ "journal,\n"
-#~ "so that multiple analytic lines are created when the invoice or the entries\n"
-#~ "are confirmed.\n"
-#~ "\n"
-#~ "For example, you can define the following analytic structure:\n"
-#~ "  Projects\n"
-#~ "      Project 1\n"
-#~ "          SubProj 1.1\n"
-#~ "          SubProj 1.2\n"
-#~ "      Project 2\n"
-#~ "  Salesman\n"
-#~ "      Eric\n"
-#~ "      Fabien\n"
-#~ "\n"
-#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
-#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-#~ "Fabien. The amount can also be split. The following example is for\n"
-#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ "    SubProject 1.1 : 50%\n"
-#~ "    SubProject 1.2 : 50%\n"
-#~ "Plan2:\n"
-#~ "    Eric: 100%\n"
-#~ "\n"
-#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
-#~ "lines,\n"
-#~ "for one account entry.\n"
-#~ "The analytic plan validates the minimum and maximum percentage at the time "
-#~ "of creation\n"
-#~ "of distribution models.\n"
-#~ "        "
-#~ msgstr ""
-#~ "Das Modul ermöglicht die Definition von Verrechnungsvorlagen für Buchungen "
-#~ "aus der Fibu,\n"
-#~ "um gegebenenfalls automatische Buchungen auf mehrere Analyt. Konten "
-#~ "vorzunehmen,\n"
-#~ "z.B. bei der Erstellung einer Rechnung.\n"
-#~ "Zum Beispiel ist auch folgendes Verrechnungsschema denkbar:\n"
-#~ "  Projekte\n"
-#~ "      Projekt 1\n"
-#~ "          Teilprojekt 1.1\n"
-#~ "          Teilprojekt 1.2\n"
-#~ "      Projekt 2\n"
-#~ "  Verkäufer\n"
-#~ "      Eric\n"
-#~ "      Fabien\n"
-#~ "\n"
-#~ "In diesem Beispiel haben wir zwei Verrechnungen zu buchen: Projekte und "
-#~ "Verkäufer. Eine Rechnungszeile\n"
-#~ "soll anal. Buchungen auf diesen zwei Konten erstellen: Teilprojekt 1.1 und\n"
-#~ "Fabien. Der verrechnete Betrag kann dann nochmals weiter aufgeteilt werden. "
-#~ "Das folgende Beispiel\n"
-#~ "ist für eine Abrechnung von zwei Teilprojekten mit einem zugewiesenen "
-#~ "Verkäufer:\n"
-#~ "\n"
-#~ "Verrechnung1:\n"
-#~ "    SubProject 1.1 : 50%\n"
-#~ "    SubProject 1.2 : 50%\n"
-#~ "Verrechnung:\n"
-#~ "    Eric: 100%\n"
-#~ "\n"
-#~ "Wenn diese Rechnungsposition jetzt gebucht werden, entstehen 3 "
-#~ "Buchungszeilen auf Analyt. Konten,\n"
-#~ "für jeweils einenBuchungssatz aus der Fibu.\n"
-#~ "Die Analyt. Verrechnung prüft ausserdem  dei min. und max. Prozentwerte zum "
-#~ "Zeitpunkt der Erstellung \n"
-#~ " von Verrechnungsvorlagen.\n"
-#~ "        "
-
-#~ msgid "Save This Distribution as a Model"
-#~ msgstr "Speichere Verrechnung als Vorlage"
-
-#~ msgid "Quantity"
-#~ msgstr "Menge"
-
-#~ msgid "Multi Plans"
-#~ msgstr "Analytische Verrechnung"
-
-#~ msgid "Account Id"
-#~ msgstr "Konto ID"
-
-#~ msgid "Code"
-#~ msgstr "Kurzbez."
-
-#~ msgid "Journal"
-#~ msgstr "Journal"
-
-#~ msgid "You have to define an analytic journal on the '%s' journal!"
-#~ msgstr ""
-#~ "Sie müssen noch ein anal. Journal für das %s Journal der Fibu erzeugen."
-
-#~ msgid "No Analytic Journal !"
-#~ msgstr "Kein Analytisches Journal !"
-
-#~ msgid "Bank Statement"
-#~ msgstr "Bank Auszug"
-
-#~ msgid "Value Error"
-#~ msgstr "Wertefehler"
-
-#~ msgid "Root account of this plan."
-#~ msgstr "Basiskonto der Verrechnung"
-
-#~ msgid "Analytic Account Reference"
-#~ msgstr "Analyt. Konto Referenz"
-
-#~ msgid "Invoice"
-#~ msgstr "Rechnung"
-
-#~ msgid "Cancel"
-#~ msgstr "Abbruch"
-
-#~ msgid "at"
-#~ msgstr "bei"
-
-#~ msgid "From Date"
-#~ msgstr "Von Datum"
-
-#~ msgid "Select Information"
-#~ msgstr "Wähle Information"
-
-#~ msgid "Analytic Account Ref."
-#~ msgstr "Analyt. Konto Ref."
-
-#~ msgid "Create Model"
-#~ msgstr "Erzeuge Model"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Analytic Distribution's models"
-#~ msgstr "Kostnerechnung Umlage Modell"
-
-#~ msgid ""
-#~ "This distribution model has been saved. You will be able to reuse it later."
-#~ msgstr "Das Umlagemodel wurde gesichert, es ist nunmehr verwendbar."
-
-#~ msgid ""
-#~ "This module allows to use several analytic plans, according to the general "
-#~ "journal,\n"
-#~ "so that multiple analytic lines are created when the invoice or the entries\n"
-#~ "are confirmed.\n"
-#~ "\n"
-#~ "For example, you can define the following analytic structure:\n"
-#~ "  Projects\n"
-#~ "      Project 1\n"
-#~ "          SubProj 1.1\n"
-#~ "          SubProj 1.2\n"
-#~ "      Project 2\n"
-#~ "  Salesman\n"
-#~ "      Eric\n"
-#~ "      Fabien\n"
-#~ "\n"
-#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
-#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-#~ "Fabien. The amount can also be split. The following example is for\n"
-#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ "    SubProject 1.1 : 50%\n"
-#~ "    SubProject 1.2 : 50%\n"
-#~ "Plan2:\n"
-#~ "    Eric: 100%\n"
-#~ "\n"
-#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
-#~ "lines,\n"
-#~ "for one account entry.\n"
-#~ "        "
-#~ msgstr ""
-#~ "Dieses Modul erlaubt verschiedene analytische Kontenpläne, etnsprechend dem "
-#~ "Haupt Journal.\n"
-#~ "Damit können mehrere analytische Buchungszeilen generiert werden, wenn die "
-#~ "Rechnungen bestätigt werden\n"
-#~ "\n"
-#~ "So kann etwa eine Struktur aussehen\n"
-#~ "  Projekte\n"
-#~ "      Projekt 1\n"
-#~ "          SubProj 1.1\n"
-#~ "          SubProj 1.2\n"
-#~ "      Projekt 2\n"
-#~ "  Verkäufer\n"
-#~ "      Eric\n"
-#~ "      Fabien\n"
-#~ "\n"
-#~ "Hier gibt es 2 Pläne; Projekte und Verkäufer: Eine Rechungszeile muss "
-#~ "Buchungen in 2 Plänen machen können:\n"
-#~ "SubProj 1.1 and Fabien. \n"
-#~ "Der Betrag muss geteilt werden. Das folgende Beispiel betrifft 2 Sub-Prokete "
-#~ "und einen Verkäufer\n"
-#~ "Plan1:\n"
-#~ "    SubProjekt 1.1 : 50%\n"
-#~ "    SubProjekt 1.2 : 50%\n"
-#~ "Plan2:\n"
-#~ "    Eric: 100%\n"
-#~ "\n"
-#~ "Wenn die Rechnung verbucht wird, werden 3 analytische Buchungen erstellt\n"
-#~ "        "
-
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Matrix Analyse"
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 367f1704cac..85b9e71577b 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -207,9 +207,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Γραμμή Παραγγελίας Πώλησης"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος δεν μπορείς να δημιουργήσεις κενό Μενού."
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index 3a50b9a1d82..12710a82eba 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -232,18 +232,3 @@ 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 acción."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Línea pedido de venta"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/account_analytic_default/i18n/es_AR.po b/addons/account_analytic_default/i18n/es_AR.po
index e5fed509c42..8c4a3c307a7 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/es_EC.po b/addons/account_analytic_default/i18n/es_EC.po
index 4b57b602566..ba655a8c644 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -231,6 +231,3 @@ 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 acción."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Línea de pedido"
diff --git a/addons/account_analytic_default/i18n/es_MX.po b/addons/account_analytic_default/i18n/es_MX.po
new file mode 100644
index 00000000000..2de02ed6c80
--- /dev/null
+++ b/addons/account_analytic_default/i18n/es_MX.po
@@ -0,0 +1,234 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_default
+#
+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-26 08:03+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:29+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_analytic_default
+#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
+msgid "Account Analytic Default"
+msgstr "Cuenta analítica por defecto"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
+"Seleccione una empresa que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona esta empresa, automáticamente se "
+"utilizará esta cuenta analítica)."
+
+#. 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 "Reglas analíticas"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr "Fecha final por defecto para esta cuenta analítica."
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+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 ""
+"Seleccione una compañía que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona esta compañía, automáticamente se "
+"utilizará esta cuenta analítica)."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr "Fecha inicial por defecto para esta cuenta analítica."
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Asientos"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+"Seleccione un usuario que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto."
+
+#. 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 "Análisis: Valores por defecto"
+
+#. module: account_analytic_default
+#: model:ir.module.module,description:account_analytic_default.module_meta_information
+msgid ""
+"\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"* Product\n"
+"* Partner\n"
+"* User\n"
+"* Company\n"
+"* Date\n"
+"    "
+msgstr ""
+"\n"
+"Permite seleccionar automáticamente cuentas analíticas según estos "
+"criterios:\n"
+"* Producto\n"
+"* Empresa\n"
+"* Usuario\n"
+"* Compañía\n"
+"* Fecha\n"
+"    "
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+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 ""
+"Seleccione un producto que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona este producto, automáticamente se "
+"utilizará esta cuenta analítica)."
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr ""
+"Indica el orden de la secuencia cuando se muestra una lista de distribución "
+"analítica."
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Seq"
+#~ msgstr "Secuencia"
+
+#~ msgid "Analytic Distributions"
+#~ msgstr "Distribuciones analíticas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/account_analytic_default/i18n/es_PY.po b/addons/account_analytic_default/i18n/es_PY.po
index 6a461ee40e1..b8167912c65 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/es_VE.po b/addons/account_analytic_default/i18n/es_VE.po
new file mode 100644
index 00000000000..2de02ed6c80
--- /dev/null
+++ b/addons/account_analytic_default/i18n/es_VE.po
@@ -0,0 +1,234 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_default
+#
+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-26 08:03+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:29+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_analytic_default
+#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
+msgid "Account Analytic Default"
+msgstr "Cuenta analítica por defecto"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
+"Seleccione una empresa que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona esta empresa, automáticamente se "
+"utilizará esta cuenta analítica)."
+
+#. 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 "Reglas analíticas"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr "Fecha final por defecto para esta cuenta analítica."
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+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 ""
+"Seleccione una compañía que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona esta compañía, automáticamente se "
+"utilizará esta cuenta analítica)."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr "Fecha inicial por defecto para esta cuenta analítica."
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Asientos"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+"Seleccione un usuario que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto."
+
+#. 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 "Análisis: Valores por defecto"
+
+#. module: account_analytic_default
+#: model:ir.module.module,description:account_analytic_default.module_meta_information
+msgid ""
+"\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"* Product\n"
+"* Partner\n"
+"* User\n"
+"* Company\n"
+"* Date\n"
+"    "
+msgstr ""
+"\n"
+"Permite seleccionar automáticamente cuentas analíticas según estos "
+"criterios:\n"
+"* Producto\n"
+"* Empresa\n"
+"* Usuario\n"
+"* Compañía\n"
+"* Fecha\n"
+"    "
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+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 ""
+"Seleccione un producto que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona este producto, automáticamente se "
+"utilizará esta cuenta analítica)."
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr ""
+"Indica el orden de la secuencia cuando se muestra una lista de distribución "
+"analítica."
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Seq"
+#~ msgstr "Secuencia"
+
+#~ msgid "Analytic Distributions"
+#~ msgstr "Distribuciones analíticas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index c3d5e7d6107..b40688c8148 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -206,6 +206,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Viga! Te ei saa luua rekursiivset menüüd."
diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po
index 367d2eb0c8d..97fc3df4ef2 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -40,27 +40,27 @@ msgstr "Analyyttiset säännöt"
 #. module: account_analytic_default
 #: help:account.analytic.default,analytic_id:0
 msgid "Analytical Account"
-msgstr ""
+msgstr "Analyyttinen tili"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
+msgstr "Oletusarvoinen sulkemispäivä tälle analyyttiselle tilille"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Keräilylista"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -78,7 +78,7 @@ msgstr ""
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "Oletusarvoinen avauspäivä tälle analyyttiselle tilille"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -89,7 +89,7 @@ msgstr "Tuote"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Analyyttinen jakelu"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -155,7 +155,7 @@ msgstr "Sarja"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Laskun rivi"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -166,7 +166,7 @@ msgstr "Analyyttinen tili"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr ""
+msgstr "Tilit"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -188,7 +188,7 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Myyntitilausrivi"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Analyyttiset levitykset"
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index e00d106e7ce..4a9abfc1fac 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -230,6 +230,3 @@ msgstr "Ligne de commande de ventes"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom du Modèle non valide dans la définition de l'action."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Ligne de commande de vente"
diff --git a/addons/account_analytic_default/i18n/gl.po b/addons/account_analytic_default/i18n/gl.po
index 2533b4ff586..7caf68c50eb 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index 86df5e6849b..88376676f6d 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index b28dbc79499..b48c78a51f0 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-01 18:11+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -211,34 +212,3 @@ msgstr "Megadja az analitikus felosztások listázási sorrendjét."
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "Vevői megrendelés sor"
-
-#~ msgid ""
-#~ "\n"
-#~ "\"\n"
-#~ "\"Allows to automatically select analytic accounts based on criterions:\n"
-#~ "\"\n"
-#~ "\"* Product\n"
-#~ "\"\n"
-#~ "\"* Partner\n"
-#~ "\"\n"
-#~ "\"* User\n"
-#~ "\"\n"
-#~ "\"* Company\n"
-#~ "\"\n"
-#~ "\"* Date\n"
-#~ "\"\n"
-#~ "\"    "
-#~ msgstr ""
-#~ "\n"
-#~ "Ez a modul a gyűjtőkódok automatikus kiválasztást teszi lehetővé az alábbi "
-#~ "feltételek alapján:\n"
-#~ "\"\n"
-#~ "\"* Termék\n"
-#~ "\"\n"
-#~ "\"* Partner\n"
-#~ "\"\n"
-#~ "\"* Felhasználó\n"
-#~ "\"\n"
-#~ "\"* Vállalat\n"
-#~ "\"\n"
-#~ "\"* Dátum    "
diff --git a/addons/account_analytic_default/i18n/id.po b/addons/account_analytic_default/i18n/id.po
index ea0d96a010b..f8cd5614118 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index 8619b8a3f5a..f4a915fa47e 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -210,18 +210,3 @@ msgstr ""
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribuzione conto analitico"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Riga Ordine di Vendita"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_analytic_default/i18n/ko.po b/addons/account_analytic_default/i18n/ko.po
index 2109b0f243b..78996bc9a5f 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 77abd91d981..a67652666e1 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/lv.po b/addons/account_analytic_default/i18n/lv.po
index 54cad97a3f8..27d51b7d57a 100644
--- a/addons/account_analytic_default/i18n/lv.po
+++ b/addons/account_analytic_default/i18n/lv.po
@@ -8,19 +8,19 @@ 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: 2009-09-08 15:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-09-01 12:50+0000\n"
+"Last-Translator: Nauris Sedlers <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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
-msgstr "Analītiskais Konts pēc Noklusējuma"
+msgstr "Noklusētais Analītiskais Konts"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -29,16 +29,16 @@ 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 ""
-"Izvēlieties partneri, kurš tiks izmantots analītiskajā kontā pēc "
-"noklusējuma. Piemēram, veidojot jaunu klienta rēķinu, izvēloties klientu, "
-"automātiski tiks izvēlēts attiecīgais analītiskais konts."
+"Izvēlieties partneri, kurš tiks izmantots noklusētajā analītiskajā kontā. "
+"Piemēram, veidojot jaunu klienta rēķinu, izvēloties klientu, automātiski "
+"tiks izvēlēts attiecīgais analītiskais konts."
 
 #. 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 "Noteikumi Analītiskajiem aprēķiniem"
+msgstr "Noteikumi Analītiskajiem Aprēķiniem"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,analytic_id:0
@@ -48,7 +48,7 @@ msgstr "Analītiskais Konts"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr "Pašreizējais"
+msgstr "Tekošais"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -63,7 +63,7 @@ msgstr "Noklusētais beigu datums Analītiskajam Kontam"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr "Iepakošanas Saraksts"
+msgstr "Izvades Saraksts"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -132,7 +132,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 "Analītikas Noklusētie uzstādījumi"
+msgstr "Analītikas Noklusētie Iestatījumi"
 
 #. module: account_analytic_default
 #: model:ir.module.module,description:account_analytic_default.module_meta_information
@@ -153,7 +153,7 @@ msgstr ""
 "* Partnera\n"
 "* Lietotāja\n"
 "* Uzņēmuma\n"
-"* Datuma.\n"
+"* Datuma\n"
 "    "
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/mn.po b/addons/account_analytic_default/i18n/mn.po
index c05a12b1cb2..9b713bd9921 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/nb.po b/addons/account_analytic_default/i18n/nb.po
index fead7d53ff1..1b85b4c5e22 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 9ccdc857035..13fc185e3fd 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: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 05:42+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"Last-Translator: Jan Verlaan @ Veritos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -224,18 +224,3 @@ msgstr "Verkooporderregel"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Verkooporderregel"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index 585ca4fd8fe..b5ea100932c 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
index 0c5dcccdf2b..7cdd6515ad5 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index 0c842df6fce..113b7af7e08 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index 14755ff55f8..0aca45aa50b 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -28,6 +28,9 @@ 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 ""
+"seleccione o parceiro que ira utilizar a conta analítica especificada (e.g. "
+"ao criar uma nova factura, se este parceiro for seleccionado, será "
+"automaticamente utilizada esta conta analítica)"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -73,6 +76,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
 msgstr ""
+"seleccione a empresa que irá utilizar a conta analítica especificada (eg. ao "
+"criar uma nova factura, se for seleccionada esta empresa, a conta analítica "
+"especificada será utilizada automaticamente)"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
@@ -117,6 +123,7 @@ msgstr "Data Final"
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
+"seleccione um utilizador que irá utilizar a conta analítica especificada"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -137,6 +144,14 @@ msgid ""
 "* Date\n"
 "    "
 msgstr ""
+"\n"
+"Permite a selecção automática de contas analíticas com base em critérios:\n"
+"* Produto\n"
+"* Parceiro\n"
+"* Utilizador\n"
+"* Empresa\n"
+"* Data\n"
+"    "
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -145,6 +160,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
 msgstr ""
+"seleccione o produto que irá utilizar a conta analítica especificada (eg. ao "
+"criar uma nova factura, se for seleccionado este produto, a conta analítica "
+"especificada será utilizada automaticamente)"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
@@ -187,7 +205,7 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linha da ordem de venda"
 
 #~ msgid "Seq"
 #~ msgstr "Seq"
@@ -201,21 +219,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definição da acção"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Linha de ordem de venda"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index b2fc8be9950..b44f7453b0f 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -228,18 +228,3 @@ msgstr "Item de Pedido de Vendas"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Itens de Pedidos"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/account_analytic_default/i18n/ro.po b/addons/account_analytic_default/i18n/ro.po
index 13238cf577c..ea2582f5e98 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index 9a3fff7f4c1..d7321e6001a 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -28,6 +28,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 ""
+"выбор партнера, который будет использовать счет аналитики, указанный в "
+"аналитике по умолчанию (при создании нового счет заказчику или заказа на "
+"продажу, если вы выберете этого партнера, он будет автоматически "
+"использовать это как счет аналитики)"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -54,7 +58,7 @@ 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
@@ -73,11 +77,15 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
 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
@@ -117,6 +125,8 @@ msgstr "Дата окончания"
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
+"выберите пользователя, который будет использовать счет аналитики, указанный "
+"в аналитике по умолчанию"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -137,6 +147,14 @@ msgid ""
 "* Date\n"
 "    "
 msgstr ""
+"\n"
+"Позволяет автоматически выбирать счета аналитики на основе критериев:\n"
+"* ТМЦ\n"
+"* Контрагент\n"
+"* Пользователь\n"
+"* Компания\n"
+"* Дата\n"
+"    "
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -145,6 +163,10 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
 msgstr ""
+"выбор товара, который будет использовать счет аналитики, указанный в "
+"аналитике по умолчанию (при создании нового счет заказчику или заказа на "
+"продажу, если вы выберете этот товар, он будет автоматически использовать "
+"это как счет аналитики)"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
@@ -182,7 +204,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
@@ -206,18 +228,3 @@ msgstr "Позиция заказа на продажу"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Позиция заказа на продажу"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index 83b62f7fd49..f74acf01c59 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/sl.po b/addons/account_analytic_default/i18n/sl.po
index 46eb32603f8..4754ff96c9e 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/sq.po b/addons/account_analytic_default/i18n/sq.po
index ab293028bd6..d52c637dcaf 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index 6634cfe14b8..e063c132db5 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -219,9 +219,3 @@ msgstr ""
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribucije analitike"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Stavke naloga za prodaju"
diff --git a/addons/account_analytic_default/i18n/sr@latin.po b/addons/account_analytic_default/i18n/sr@latin.po
index fb334b46579..7ae86c1310c 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: 2011-06-05 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -217,15 +217,9 @@ msgstr "Redosled narudžbina"
 #~ msgstr ""
 #~ "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Stavke naloga za prodaju"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 0766de70893..935aec52c5b 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -204,20 +204,5 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Säljorderrad"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unikt!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
diff --git a/addons/account_analytic_default/i18n/tlh.po b/addons/account_analytic_default/i18n/tlh.po
index f6b488d8180..9399ea67fbe 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index 95a39ab616c..385bb240a7b 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
-msgstr "Varsayılan Analiz Hes."
+msgstr "Varsayılan Analiz Hesabı"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -47,12 +47,12 @@ msgstr "Analitik Hesap"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr "Güncel"
+msgstr "Geçerli"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "Grupla..."
+msgstr "Gruplandır..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
@@ -62,7 +62,7 @@ msgstr "Bu analitik hesap için varsayılan bitiş tarihi"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr "Paketleme Listesi"
+msgstr "Toplama Listesi"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/uk.po b/addons/account_analytic_default/i18n/uk.po
index 0e44c3a9798..3e5510abd8c 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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
diff --git a/addons/account_analytic_default/i18n/vi.po b/addons/account_analytic_default/i18n/vi.po
index 2fde515c41d..d3a10b69b73 100644
--- a/addons/account_analytic_default/i18n/vi.po
+++ b/addons/account_analytic_default/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-05-18 23:54+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -89,7 +89,7 @@ msgstr "Sản phẩm"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Phân tích Phân phối"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -106,7 +106,7 @@ msgstr "Người sử dụng"
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr ""
+msgstr "Mục nhập"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index f6cc673966d..45193d69c6a 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: 2011-07-02 05:06+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -27,24 +27,24 @@ msgid ""
 "select a partner which will use analytical account specified in analytic "
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
-msgstr ""
+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
@@ -54,12 +54,12 @@ 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
@@ -72,12 +72,12 @@ 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
@@ -88,7 +88,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
@@ -105,7 +105,7 @@ msgstr "用户"
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr "凭证"
+msgstr "条目"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
@@ -116,14 +116,14 @@ 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
 #: model:ir.module.module,description:account_analytic_default.module_meta_information
@@ -137,6 +137,14 @@ msgid ""
 "* Date\n"
 "    "
 msgstr ""
+"\n"
+"允许根据准则自动选辅助核算项：\n"
+"  *产品\n"
+"  *业务伙伴\n"
+"  *用户\n"
+"  *公司\n"
+"  *日期\n"
+"    "
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -144,7 +152,7 @@ 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
@@ -154,18 +162,18 @@ msgstr "序列"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "发票行"
 
 #. module: account_analytic_default
 #: 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
@@ -182,12 +190,12 @@ 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
 msgid "Sales Order Line"
-msgstr ""
+msgstr "销售订单明细"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "辅助核算分配"
diff --git a/addons/account_analytic_default/i18n/zh_TW.po b/addons/account_analytic_default/i18n/zh_TW.po
index 5942de86218..8ea067fd075 100644
--- a/addons/account_analytic_default/i18n/zh_TW.po
+++ b/addons/account_analytic_default/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -83,7 +83,7 @@ msgstr ""
 #: 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
@@ -94,23 +94,23 @@ msgstr ""
 #: view:account.analytic.default:0
 #: field:account.analytic.default,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr ""
+msgstr "項目"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "結束日期"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
@@ -154,29 +154,29 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "發票明細"
 
 #. module: account_analytic_default
 #: 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
 msgid "Start Date"
-msgstr ""
+msgstr "開始日期"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,sequence:0
@@ -187,4 +187,4 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "銷貨單明㚼"
diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml
new file mode 100644
index 00000000000..7ff68c7d849
--- /dev/null
+++ b/addons/account_analytic_default/security/account_analytic_default_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <record id="analytic_default_comp_rule" model="ir.rule">
+        <field name="name">Analytic Default multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_account_analytic_default"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+     
+    </data>
+</openerp>
diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv
index 112fe2fcbf4..f92a9fd4dfa 100644
--- a/addons/account_analytic_default/security/ir.model.access.csv
+++ b/addons/account_analytic_default/security/ir.model.access.csv
@@ -2,3 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
 access_account_analytic_default_manager,account.analytic.default.manager,model_account_analytic_default,account.group_account_manager,1,1,1,1
 access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
+access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index d6a5834517e..ffb20ffe3e8 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name'      : 'Manage multiple plans in Analytic Accounting',
+    'name'      : 'Multiple Analytic Plans',
     'version'   : '1.0',
-    'category'  : 'Finance',
+    'category'  : 'Accounting & Finance',
     'complexity': "normal",
     'description': """
 This module allows to use several analytic plans, according to the general journal.
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index c8ab5334d8a..881a7ebc7d4 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -307,8 +307,8 @@ class account_invoice_line(osv.osv):
         res ['analytics_id'] = line.analytics_id and line.analytics_id.id or False
         return res
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context, company_id=company_id)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec and rec.analytics_id:
             res_prod['value'].update({'analytics_id': rec.analytics_id.id})
@@ -366,7 +366,7 @@ class account_move_line(osv.osv):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if context is None:
             context = {}
-        result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         return result
 
 account_move_line()
@@ -462,7 +462,7 @@ sale_order_line()
 class account_bank_statement(osv.osv):
     _inherit = "account.bank.statement"
     _name = "account.bank.statement"
-    
+
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
         account_move_line_pool = self.pool.get('account.move.line')
         account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
@@ -484,7 +484,7 @@ class account_bank_statement(osv.osv):
                 if not st_line.amount:
                     continue
         return True
-    
+
 account_bank_statement()
 
 
@@ -496,4 +496,4 @@ class account_bank_statement_line(osv.osv):
     }
 account_bank_statement_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_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
index fa40ef1e618..c6879774078 100644
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
@@ -2,19 +2,20 @@
   <data>
 
     <record model="ir.actions.act_window" id="account_analytic_plan_form_action_installer">
-        <field name="name">Account Analytic Plans</field>
+        <field name="name">Define your Analytic Plans</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">account.analytic.plan</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="account_analytic_plans.account_analytic_plan_form"/>
+        <field name="view_id" eval="False"/>
+        <field name="help">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.</field>
+    </record>
+
+    <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
+        <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
+        <field name="category_id" ref="account.category_accounting_configuration"/>
+        <field name="sequence">15</field>
     </record>
-        
-   <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
-      <field name="category_id" ref="account.category_accounting_configuration"/>
-      <field name="sequence">15</field>
-  </record>
 
   </data>
 </openerp>
diff --git a/addons/account_analytic_plans/i18n/ar.po b/addons/account_analytic_plans/i18n/ar.po
index 67666827e3d..57d893217db 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9c5aaec9f73..6054614d27c 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9102a2d1bff..baed8176586 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2db68d4f1b8..b169a223b99 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -7,21 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-10-30 10:22+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 20:37+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Aquest model de distribució s'ha desat. El podreu reutilitzar més tard."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -31,7 +31,7 @@ msgstr "Id pla"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "Des de la data"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -83,12 +83,12 @@ msgstr "Instància de pla analític"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "D'acord"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "No podeu crear una anotació en un compte tancat."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
@@ -118,7 +118,7 @@ msgstr "Codi"
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valor erroni al deure o a l'haver de l'assentament comptable!"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -128,12 +128,12 @@ msgstr "Id compte6"
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr ""
+msgstr "Multi plans"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Línia d'extracte bancari"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -143,23 +143,24 @@ msgstr "Compte analític"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "El codi del diari ha de ser únic per companyia!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "Referencia del compte analític"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"No podeu crear una anotació en un compte a cobrar/a pagar sense una empresa."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línia de comanda de venda"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
@@ -210,7 +211,7 @@ msgstr "Plans analítics"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Perc(%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -220,7 +221,7 @@ msgstr "Màxim permès (%)"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "Data d'impressió"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -233,16 +234,18 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"L'import del rebut ha de ser del mateix import que el de la línia del "
+"extracte"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Línia de factura"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "Divises"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
@@ -252,7 +255,7 @@ msgstr "Data inicial"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
@@ -272,14 +275,14 @@ msgstr "Compte principal"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "Fins la data"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Heu de definir un diari analític al diari '%s'!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -289,12 +292,12 @@ msgstr "No mostrar líneas buides"
 #. 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 "analítica.pla.crea.model.acció"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Compte analític :"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -333,6 +336,38 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"Aquest mòdul permet utilitzar diversos plans analítics, d'acord amb el diari "
+"general,\n"
+"per crear múltiples línies analítiques quan la factura o els assentaments\n"
+"siguin confirmats.\n"
+"\n"
+"Per exemple, podeu definir la següent estructura analítica:\n"
+"Projectes\n"
+"Projecte 1\n"
+"Subprojecte 1,1\n"
+"Subprojecte 1,2\n"
+"Projecte 2\n"
+"Comercials\n"
+"Eduard\n"
+"Marta\n"
+"\n"
+"Aquí, tenim dos plans: Projectes i Comercials. Una línia de factura ha de\n"
+"ser capaç d'escriure les entrades analítiques en els 2 plans: Subprojecte "
+"1.1 i\n"
+"Eduard. La quantitat també es pot dividir. El següent exemple és per a\n"
+"una factura que implica als dos subprojectes i assignada a un comercial:\n"
+"\n"
+"Pla1:\n"
+"Subprojecte 1.1: 50%\n"
+"Subprojecte 1.2: 50%\n"
+"Pla2:\n"
+"Eduard: 100%\n"
+"\n"
+"Així, quan aquesta línia de la factura sigui confirmada, generarà 3 línies "
+"analítiques per a un assentament comptable.\n"
+"El pla analític valida el percentatge mínim i màxim en el moment de creació "
+"dels models de distribució.\n"
+"        "
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -352,7 +387,7 @@ msgstr "Assentaments per defecte"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Anotacions comptables"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
@@ -362,7 +397,7 @@ msgstr "Id compte1"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "L'empresa ha de ser la mateixa per al compte i període relacionats."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -385,7 +420,7 @@ msgstr "Error"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "Desa aquesta distribució com un model"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -401,19 +436,19 @@ msgstr "Introduïu un nom i un codi abans de desar el model!"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
 msgid "Print Crossovered Analytic"
-msgstr ""
+msgstr "Imprimeix analítica creuada"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Sense diari analític!"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracte bancari"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -423,7 +458,7 @@ msgstr "Id compte3"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -470,7 +505,7 @@ msgstr "Codi de distribució"
 #. 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
@@ -491,12 +526,12 @@ msgstr "Distribució analítica"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Diari"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
-msgstr ""
+msgstr "analítica.pla.crea.model"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date2:0
@@ -516,7 +551,7 @@ msgstr "Seqüència"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "El nom del diari ha de ser únic per companyia!"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
@@ -527,7 +562,7 @@ msgstr "Valor erroni"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No podeu crear una anotació en un compte de tipus vista."
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index ff78c76f5b2..3f6a40c8776 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c5bc5feefac..978ff543cd6 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -668,12 +668,6 @@ msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 #~ "Wenn die Rechnung verbucht wird, werden 3 analytische Buchungen erstellt\n"
 #~ "        "
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Matrix Analyse"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -682,15 +676,3 @@ msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Auftragsposition"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index ace2704c2d8..14034818bae 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -674,14 +674,5 @@ msgstr ""
 #~ msgid "Printing date:"
 #~ msgstr "Ημερομηνία εκτύπωσης:"
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Διαστάυρωση Αναλυτικής -"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Γραμμή Παραγγελίας Πώλησης"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού"
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index fd7b269330f..af57060b768 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -673,27 +673,3 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 #~ "Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
 #~ "analíticas para un asiento contable.\n"
 #~ "        "
-
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Analítico Entrecruzado -"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Línea pedido de venta"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Error: Número BVR no válido (checksum erróneo)."
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Error: La referencia BVR es necesaria."
diff --git a/addons/account_analytic_plans/i18n/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index c0c5dffa5fb..2606dd2891b 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_EC.po b/addons/account_analytic_plans/i18n/es_EC.po
index 6a4ae3ced4d..ebae4660eb0 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -31,7 +31,7 @@ msgstr "Id plan"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr "Desde la fecha"
+msgstr "Desde fecha"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -651,9 +651,6 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 #~ "analíticas para un asiento contable.\n"
 #~ "        "
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Analítico Entrecruzado -"
-
 #~ msgid "OK"
 #~ msgstr "Aceptar"
 
diff --git a/addons/account_analytic_plans/i18n/es_MX.po b/addons/account_analytic_plans/i18n/es_MX.po
new file mode 100644
index 00000000000..2838f67fb03
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/es_MX.po
@@ -0,0 +1,675 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_plans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-12 18:12+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:25+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"Este modelo de distribución ha sido guardado. Lo podrá reutilizar más tarde."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Id plan"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Desde la fecha"
+
+#. 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 "Analítica cruzada"
+
+#. 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 "Plan analítico"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr "Gestión de múltiples planes en contabilidad analítica"
+
+#. 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 "Diario analítico"
+
+#. 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 "Línea de plan analítico"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
+#, python-format
+msgid "User Error"
+msgstr "Error de usuario"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Instancia de plan analítico"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Plan del modelo"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Id cuenta2"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr "Id cuenta"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_analytic_plans
+#: 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!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Id cuenta6"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi planes"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "Referencia cuenta analítica"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. 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 "Modelo de distribución guardado"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Modelos de distribución analítica"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr "¡Ya existe un modelo con este nombre y código!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr "¡No se ha definido un plan analítico!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Tasa (%)"
+
+#. 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 "Planes analíticos"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr "Porc(%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Máximo permitido (%)"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Fecha de impresión"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr "Líneas de plan analítico"
+
+#. 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 ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Id cuenta5"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr "Línea de instancia analítica"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Cuenta principal"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Hasta fecha"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, 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'!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr "No mostrar líneas vacías"
+
+#. 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 "analitica.plan.crear.modelo.accion"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Cuenta analítica:"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation\n"
+"of distribution models.\n"
+"        "
+msgstr ""
+"Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
+"diario general,\n"
+"para crear múltiples líneas analíticas cuando la factura o los asientos\n"
+"sean confirmados.\n"
+"\n"
+"Por ejemplo, puede definir la siguiente estructura de analítica:\n"
+"  Proyectos\n"
+"      Proyecto 1\n"
+"          Subproyecto 1,1\n"
+"          Subproyecto 1,2\n"
+"      Proyecto 2\n"
+"  Comerciales\n"
+"      Eduardo\n"
+"      Marta\n"
+"\n"
+"Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
+"debe\n"
+"ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
+"1.1 y\n"
+"Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
+"una factura que implica a los dos subproyectos y asignada a un comercial:\n"
+"\n"
+"Plan1:\n"
+"    Subproyecto 1.1: 50%\n"
+"    Subproyecto 1.2: 50%\n"
+"Plan2:\n"
+"    Eduardo: 100%\n"
+"\n"
+"Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
+"analíticas para un asiento contable.\n"
+"El plan analítico valida el porcentaje mínimo y máximo en el momento de "
+"creación de los modelos de distribución.\n"
+"        "
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr "Referencia cuenta analítica:"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Nombre de plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr "Asientos por defecto"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr "Id cuenta1"
+
+#. module: account_analytic_plans
+#: 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."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Mínimo permitido (%)"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Cuenta principal de este plan."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: 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 "Error"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr "Guardar esta distribución como un modelo"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. 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 "¡Introduzca un nombre y un código antes de guardar el modelo!"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr "Imprimir analítica cruzada"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "¡No diario analítico!"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Id cuenta3"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr "Id cuenta4"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr "Líneas de distribución analítica"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr "El total debería estar entre %s y %s"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "a las"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Nombre de cuenta"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr "Línea de distribución analítica"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr "Código de distribución"
+
+#. 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 "Distribución analítica"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr "analitica.plan.crear.modelo"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr "Modelos distribución"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "Value Error"
+msgstr "Valor erróneo"
+
+#. module: account_analytic_plans
+#: 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."
+
+#~ 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 "Currency:"
+#~ msgstr "Moneda:"
+
+#~ msgid "Select Information"
+#~ msgstr "Seleccionar información"
+
+#~ msgid "Analytic Account Ref."
+#~ msgstr "Ref. cuenta analítica"
+
+#~ msgid "Create Model"
+#~ msgstr "Crear modelo"
+
+#~ msgid "to"
+#~ msgstr "hasta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#~ msgid "Period from"
+#~ msgstr "Período desde"
+
+#~ msgid "Printing date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Analytic Distribution's models"
+#~ msgstr "Modelos de distribución analítica"
+
+#~ msgid ""
+#~ "This distribution model has been saved. You will be able to reuse it later."
+#~ msgstr ""
+#~ "Este modelo de distribución ha sido guardado. Más tarde podrá reutilizarlo."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "This module allows to use several analytic plans, according to the general "
+#~ "journal,\n"
+#~ "so that multiple analytic lines are created when the invoice or the entries\n"
+#~ "are confirmed.\n"
+#~ "\n"
+#~ "For example, you can define the following analytic structure:\n"
+#~ "  Projects\n"
+#~ "      Project 1\n"
+#~ "          SubProj 1.1\n"
+#~ "          SubProj 1.2\n"
+#~ "      Project 2\n"
+#~ "  Salesman\n"
+#~ "      Eric\n"
+#~ "      Fabien\n"
+#~ "\n"
+#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
+#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+#~ "Fabien. The amount can also be split. The following example is for\n"
+#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    SubProject 1.1 : 50%\n"
+#~ "    SubProject 1.2 : 50%\n"
+#~ "Plan2:\n"
+#~ "    Eric: 100%\n"
+#~ "\n"
+#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
+#~ "lines,\n"
+#~ "for one account entry.\n"
+#~ "        "
+#~ msgstr ""
+#~ "Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
+#~ "diario general,\n"
+#~ "para que crea múltiples líneas analíticas cuando la factura o los asientos\n"
+#~ "sean confirmados.\n"
+#~ "\n"
+#~ "Por ejemplo, puede definir la siguiente estructura de analítica:\n"
+#~ "  Proyectos\n"
+#~ "      Proyecto 1\n"
+#~ "          Subproyecto 1,1\n"
+#~ "          Subproyecto 1,2\n"
+#~ "      Proyecto 2\n"
+#~ "  Comerciales\n"
+#~ "      Eduardo\n"
+#~ "      Marta\n"
+#~ "\n"
+#~ "Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
+#~ "debe\n"
+#~ "ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
+#~ "1.1 y\n"
+#~ "Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
+#~ "una factura que implica a los dos subproyectos y asignada a un comercial:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    Subproyecto 1.1: 50%\n"
+#~ "    Subproyecto 1.2: 50%\n"
+#~ "Plan2:\n"
+#~ "    Eduardo: 100%\n"
+#~ "\n"
+#~ "Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
+#~ "analíticas para un asiento contable.\n"
+#~ "        "
diff --git a/addons/account_analytic_plans/i18n/es_PY.po b/addons/account_analytic_plans/i18n/es_PY.po
index 1febeb4d302..a418915eac7 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_VE.po b/addons/account_analytic_plans/i18n/es_VE.po
new file mode 100644
index 00000000000..2838f67fb03
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/es_VE.po
@@ -0,0 +1,675 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_plans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-12 18:12+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:25+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"Este modelo de distribución ha sido guardado. Lo podrá reutilizar más tarde."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Id plan"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Desde la fecha"
+
+#. 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 "Analítica cruzada"
+
+#. 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 "Plan analítico"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr "Gestión de múltiples planes en contabilidad analítica"
+
+#. 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 "Diario analítico"
+
+#. 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 "Línea de plan analítico"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
+#, python-format
+msgid "User Error"
+msgstr "Error de usuario"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Instancia de plan analítico"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Plan del modelo"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Id cuenta2"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr "Id cuenta"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_analytic_plans
+#: 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!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Id cuenta6"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi planes"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "Referencia cuenta analítica"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. 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 "Modelo de distribución guardado"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Modelos de distribución analítica"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr "¡Ya existe un modelo con este nombre y código!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr "¡No se ha definido un plan analítico!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Tasa (%)"
+
+#. 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 "Planes analíticos"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr "Porc(%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Máximo permitido (%)"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Fecha de impresión"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr "Líneas de plan analítico"
+
+#. 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 ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Id cuenta5"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr "Línea de instancia analítica"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Cuenta principal"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Hasta fecha"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, 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'!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr "No mostrar líneas vacías"
+
+#. 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 "analitica.plan.crear.modelo.accion"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Cuenta analítica:"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation\n"
+"of distribution models.\n"
+"        "
+msgstr ""
+"Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
+"diario general,\n"
+"para crear múltiples líneas analíticas cuando la factura o los asientos\n"
+"sean confirmados.\n"
+"\n"
+"Por ejemplo, puede definir la siguiente estructura de analítica:\n"
+"  Proyectos\n"
+"      Proyecto 1\n"
+"          Subproyecto 1,1\n"
+"          Subproyecto 1,2\n"
+"      Proyecto 2\n"
+"  Comerciales\n"
+"      Eduardo\n"
+"      Marta\n"
+"\n"
+"Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
+"debe\n"
+"ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
+"1.1 y\n"
+"Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
+"una factura que implica a los dos subproyectos y asignada a un comercial:\n"
+"\n"
+"Plan1:\n"
+"    Subproyecto 1.1: 50%\n"
+"    Subproyecto 1.2: 50%\n"
+"Plan2:\n"
+"    Eduardo: 100%\n"
+"\n"
+"Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
+"analíticas para un asiento contable.\n"
+"El plan analítico valida el porcentaje mínimo y máximo en el momento de "
+"creación de los modelos de distribución.\n"
+"        "
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr "Referencia cuenta analítica:"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Nombre de plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr "Asientos por defecto"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr "Id cuenta1"
+
+#. module: account_analytic_plans
+#: 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."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Mínimo permitido (%)"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Cuenta principal de este plan."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: 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 "Error"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr "Guardar esta distribución como un modelo"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. 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 "¡Introduzca un nombre y un código antes de guardar el modelo!"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr "Imprimir analítica cruzada"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "¡No diario analítico!"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Id cuenta3"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr "Id cuenta4"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr "Líneas de distribución analítica"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr "El total debería estar entre %s y %s"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "a las"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Nombre de cuenta"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr "Línea de distribución analítica"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr "Código de distribución"
+
+#. 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 "Distribución analítica"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr "analitica.plan.crear.modelo"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr "Modelos distribución"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "Value Error"
+msgstr "Valor erróneo"
+
+#. module: account_analytic_plans
+#: 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."
+
+#~ 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 "Currency:"
+#~ msgstr "Moneda:"
+
+#~ msgid "Select Information"
+#~ msgstr "Seleccionar información"
+
+#~ msgid "Analytic Account Ref."
+#~ msgstr "Ref. cuenta analítica"
+
+#~ msgid "Create Model"
+#~ msgstr "Crear modelo"
+
+#~ msgid "to"
+#~ msgstr "hasta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#~ msgid "Period from"
+#~ msgstr "Período desde"
+
+#~ msgid "Printing date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Analytic Distribution's models"
+#~ msgstr "Modelos de distribución analítica"
+
+#~ msgid ""
+#~ "This distribution model has been saved. You will be able to reuse it later."
+#~ msgstr ""
+#~ "Este modelo de distribución ha sido guardado. Más tarde podrá reutilizarlo."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "This module allows to use several analytic plans, according to the general "
+#~ "journal,\n"
+#~ "so that multiple analytic lines are created when the invoice or the entries\n"
+#~ "are confirmed.\n"
+#~ "\n"
+#~ "For example, you can define the following analytic structure:\n"
+#~ "  Projects\n"
+#~ "      Project 1\n"
+#~ "          SubProj 1.1\n"
+#~ "          SubProj 1.2\n"
+#~ "      Project 2\n"
+#~ "  Salesman\n"
+#~ "      Eric\n"
+#~ "      Fabien\n"
+#~ "\n"
+#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
+#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+#~ "Fabien. The amount can also be split. The following example is for\n"
+#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    SubProject 1.1 : 50%\n"
+#~ "    SubProject 1.2 : 50%\n"
+#~ "Plan2:\n"
+#~ "    Eric: 100%\n"
+#~ "\n"
+#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
+#~ "lines,\n"
+#~ "for one account entry.\n"
+#~ "        "
+#~ msgstr ""
+#~ "Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
+#~ "diario general,\n"
+#~ "para que crea múltiples líneas analíticas cuando la factura o los asientos\n"
+#~ "sean confirmados.\n"
+#~ "\n"
+#~ "Por ejemplo, puede definir la siguiente estructura de analítica:\n"
+#~ "  Proyectos\n"
+#~ "      Proyecto 1\n"
+#~ "          Subproyecto 1,1\n"
+#~ "          Subproyecto 1,2\n"
+#~ "      Proyecto 2\n"
+#~ "  Comerciales\n"
+#~ "      Eduardo\n"
+#~ "      Marta\n"
+#~ "\n"
+#~ "Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
+#~ "debe\n"
+#~ "ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
+#~ "1.1 y\n"
+#~ "Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
+#~ "una factura que implica a los dos subproyectos y asignada a un comercial:\n"
+#~ "\n"
+#~ "Plan1:\n"
+#~ "    Subproyecto 1.1: 50%\n"
+#~ "    Subproyecto 1.2: 50%\n"
+#~ "Plan2:\n"
+#~ "    Eduardo: 100%\n"
+#~ "\n"
+#~ "Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
+#~ "analíticas para un asiento contable.\n"
+#~ "        "
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index 2ef9d541ab3..cfbf8db6062 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #~ msgid "Printing date:"
 #~ msgstr "Trükkimise kuupäev:"
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index eba1eac9320..36b38279d84 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.po
@@ -14,14 +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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Tämä jakelumalli on tallennettu. Voit uudellenkäyttää sitä myöhemmin."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -31,7 +32,7 @@ msgstr "Suunnitelma id"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "Alkaen pvm"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -39,7 +40,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 "Ristianalyysi"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -54,7 +55,7 @@ msgstr "Analyyttinen suunnitelma"
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "Useampien suunnitelmien hallinta analyyttisessä kirjanpidossa"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
@@ -67,7 +68,7 @@ msgstr "Analyyttinen loki"
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
-msgstr ""
+msgstr "Analyyttisen suunnitelman rivi"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
@@ -83,17 +84,17 @@ msgstr ""
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä suljetulle tilille."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr ""
+msgstr "Mallin suunnitelma"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
@@ -118,7 +119,7 @@ msgstr "Koodi"
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Väärä kredit tai debet arvo tiliviennissä"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -128,12 +129,12 @@ msgstr "Tili6 tunnus"
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr ""
+msgstr "Monisuunnitelmat"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Pankin tiliotteen rivi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -143,12 +144,12 @@ msgstr "Analyyttinen tili"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Päiväkirjan koodi tulee olla joka yrityksellä uniikki!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "Analyyttisen tilin viite"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -159,19 +160,19 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Myyntitilausrivi"
 
 #. 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 "Jakelumalli talletettu"
 
 #. 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 "Analyyttiset jakelumallit"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -181,7 +182,7 @@ msgstr "Tulosta"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
-msgstr ""
+msgstr "Prosenttiosuus"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -193,12 +194,12 @@ msgstr "Malli,jolla on tämä nimi ja koodi on jo olemassa"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "No analytic plan defined !"
-msgstr ""
+msgstr "Analyyttistä suunnitelmaa ei määritelty!"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "Osuus (%)"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -210,7 +211,7 @@ msgstr "Analyyttiset suunnitelmat"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Prosenttosuus (%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -220,7 +221,7 @@ msgstr "Suurin sallittu (%)"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "Tulostuspäivä"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -232,17 +233,17 @@ msgstr "Analyyttiset suunnitelmarivit"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Kupongin määrä tulee olla sama kuin tiliotteen rivillä"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Laskun rivi"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuutta"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
@@ -252,7 +253,7 @@ msgstr "Aloituspäivämäärä"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
@@ -262,7 +263,7 @@ msgstr "Tili5 tunnus"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr ""
+msgstr "Analyyttisen instanssin rivi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
@@ -272,14 +273,14 @@ msgstr "Juuritili"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "Tähän pävään mennessä"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Päiväkirjaan '%s' täytyy määritellä analyyttinen päiväkirja!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -294,7 +295,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Analyyttinen tili :"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -337,7 +338,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "Analyyttisen tilin viite"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
@@ -347,12 +348,12 @@ msgstr "Suunnitelman nimi"
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "Oletusviennit"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Päiväkirjan tapahtumat"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
@@ -362,17 +363,17 @@ msgstr "Tili1 tunnus"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Yrityksen tulee olla sama liittyvälle tilille ja jaksolle."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "Minimi sallittu (%)"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr ""
+msgstr "Päätili tälle suunnitelmalle"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -385,35 +386,35 @@ msgstr "Virhe"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "Talleta tämä jakelu malliksi"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "Määrä"
 
 #. 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 ""
+msgstr "Ole hyvä ja anna nimi ja koodi ennenkuin talletat mallin !"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
 msgid "Print Crossovered Analytic"
-msgstr ""
+msgstr "Tulosta ristikkäisanalyysit"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Ei analyyttistä päiväkirjaa!"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Pankin tiliote"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -423,7 +424,7 @@ msgstr "Tili3 tunnus"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Lasku"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -439,18 +440,18 @@ msgstr "Tili4 tunnus"
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
-msgstr ""
+msgstr "Analyyttinen jakelurivi"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "The Total Should be Between %s and %s"
-msgstr ""
+msgstr "Kokonaismäärän tulisi olla välillä %s ja %s"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr ""
+msgstr "sijainnissa"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -460,12 +461,12 @@ msgstr "Tilin nimi"
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "Analyyttinen jakelurivi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr ""
+msgstr "Jakelukoodi"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -486,12 +487,12 @@ msgstr "100.00%"
 #: field:account.move.line,analytics_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Analyyttinen jakelu"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Päiväkirja"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
@@ -506,17 +507,17 @@ msgstr "Loppupäiväys"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "Jakelumallit"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Päiväkirjan nimen tulee olla uniikki yrityskohtaisesti !"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
@@ -527,7 +528,7 @@ msgstr "Arvovirhe"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä näkymätilille."
 
 #~ msgid "Select Information"
 #~ msgstr "Valitse tieto"
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 8606670338d..de7342ce1f3 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -676,15 +676,6 @@ msgstr ""
 #~ "pour une entrée de compte.\n"
 #~ "        "
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Ligne de commande de vente"
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Erreur: la référence BVR est requise."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/account_analytic_plans/i18n/gl.po b/addons/account_analytic_plans/i18n/gl.po
index 879644ed458..d68bf89eb41 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bf32ce82b12..f34ae4e36d3 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/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: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2009-11-17 09:37+0000\n"
-"Last-Translator: dzuvela <drazen@radez.hr>\n"
+"PO-Revision-Date: 2011-10-17 21:05+0000\n"
+"Last-Translator: Ivan Marijanović <Unknown>\n"
 "Language-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-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -60,7 +60,7 @@ msgstr ""
 #: view:account.crossovered.analytic:0
 #: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analitički Dnevnik"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -97,12 +97,12 @@ msgstr "Plan modela"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "Šifra računa 2"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "Šifra računa"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -122,7 +122,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "Šifra računa 6"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
@@ -137,7 +137,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Račun analitike"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
@@ -256,7 +256,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr ""
+msgstr "Šifra računa 5"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -336,7 +336,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "Veza analitičkog računa:"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
@@ -346,7 +346,7 @@ msgstr "Naziv plana"
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "Zadani unosi"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
@@ -356,7 +356,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "Šifra računa 1"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -371,7 +371,7 @@ msgstr "Minimalno dozvoljeno (%)"
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr ""
+msgstr "Korijenski račun ovog plana."
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -417,7 +417,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "Šifra računa 3"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
@@ -433,7 +433,7 @@ msgstr "Poništi"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr ""
+msgstr "Šifra računa 4"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -449,7 +449,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr ""
+msgstr "na"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index 747fa084e8c..7a4f9a44d20 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2011-02-09 11:58+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a9fdb8ca6a8..6e59be1d3d0 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b8f0e9cea4f..8b5ef7763c8 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -13,14 +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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Il modello di questa distribuzione è stato salvato. Puoi riusarlo più tardi."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -209,7 +210,7 @@ msgstr "Piani analitici"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Perc(%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -470,7 +471,7 @@ msgstr "Codice di distribuzione"
 #. 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
@@ -522,7 +523,7 @@ msgstr ""
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "Value Error"
-msgstr ""
+msgstr "Valore Errato"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -631,18 +632,6 @@ msgstr ""
 #~ "generate 3 linee di conto analitico per una voce di conto.\n"
 #~ "        "
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Riga Ordine di Vendita"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
 #~ msgid "to"
 #~ msgstr "a"
 
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index dffb2eeef68..58bdf044e15 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f327cd97c7e..657e01e84b0 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..4f8db695ee9
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/lv.po
@@ -0,0 +1,566 @@
+# 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: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-09-01 12:44+0000\n"
+"Last-Translator: Nauris Sedlers <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: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Šo sadalījuma modelis ir saglabāts. Jūs varēsiet to atkārtoti izmantot vēlāk."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Plāna Id"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "No Datuma"
+
+#. 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 "Šķērsanalīze"
+
+#. 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 "Analītiskais Plāns"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr "Vairāku plānu apstrāde Analītiskajā Grāmatvedībā"
+
+#. 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 "Analītskais Žurnāls"
+
+#. 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 "Analītiskā Plāna Rinda"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
+#, python-format
+msgid "User Error"
+msgstr "Lietotāja Kļūda"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Analītiskākā Plāna Instance"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Labi"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Nav iespējams veikt grāmatojumus slēgtā kontā."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Modeļa Plāns"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Konta2 Id"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr "Konta Id"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Summa"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Kods"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Kļūdaina kredīta vai debeta vērtība grāmatojumā!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Konta6 Id"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi Plāni"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Konta Izraksta Rinda"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analītiskais Konts"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Žurnāla kodam ir jābūt unikālam katram uzņēmumam!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "Analītiskā Konta Reference"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"Tu nevari izveidot grāmatojumu izejošam/ienākošam kontam bez partnera"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pasūtījuma Rinda"
+
+#. 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 "Sadalījuma Modelis Saglabāts"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Analītiskā Sadalījuma Modeļi"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Drukāt"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Procenti"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr "Modelis ar šo vārdu un kodu jau eksistē!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr "Nav nodefinēts analītiskais plāns!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Likme (%)"
+
+#. 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 "Analītiskie Plāni"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr "Proc(%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Maksimāli Pieļaujamie (%)"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Izdrukas datums"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr "Analītiskā Plāna Rindas"
+
+#. 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 "Rēķina summai ir jāsakrīt ar konta izraksta rindā esošo"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Rēķina Rinda"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "Valūta"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Sākuma Datums"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr "Uzņēmums"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Konts5 Id"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr "Analītiskās Instances Rinda"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Pamata Konts"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Līdz Datumam"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "Žurnālam '%s'  ir jādefinē atbilstošs analītiskais žurnāls!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr "Nerādīt tukšās rindas"
+
+#. 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 "analytic.plan.create.model.action"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Analītiskais Konts:"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation\n"
+"of distribution models.\n"
+"        "
+msgstr ""
+"Šis modulis ļauj izmantot vairākus analītiskos plānus, atbilstoši galvenajam "
+"žurnālam,\n"
+"tādejādi apstiprinot rēķinus vai ievades rindas, tiek izveidotas vairākas "
+"analītisko\n"
+"kontu rindas.\n"
+"\n"
+"Piemēram, jūs varat nodefinēt sekojošu analītisko struktūru:\n"
+"  Projekts\n"
+"      Projekts 1\n"
+"          Apakš Projekts 1.1\n"
+"          Apakš Projekts 1.2\n"
+"      Projekts 2\n"
+"  Pārdevēji\n"
+"      Ēriks\n"
+"      Gatis\n"
+"\n"
+"Šeit mums ir redzami divi plāni: Projekti un Pārdevēji. Rēķina rindā ir "
+"jāievada\n"
+"divas analītiskās pazīmes: Apakš Projekts 1.1 un Gatis.\n"
+"Arī kopējo summu var sadalīt. Sekojošais piemērs ir rēķiniem\n"
+"kas saistīti ar viena pārdevēja diviem apakš projektiem:\n"
+"\n"
+"Plāns1:\n"
+"    Apakš Projekts 1.1: 50%\n"
+"    Apakš Projekts 1.2: 50%\n"
+"Plāns2:\n"
+"    Gatis: 100%\n"
+"\n"
+"Tādejādi grāmatojot šo rēķina rindiņu, tā izveidos 3 analītiskās rindiņas,\n"
+"katram konta ierakstam.\n"
+"Analītiskais plāns sadalījuma modeļa izveides brīdi pārbauda noteikto "
+"minimālo\n"
+"un maksimālo procentuālo sadalījumu.\n"
+"        "
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr "Analītiskā Konta Reference"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Plāna Nosaukums"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr "Noklusētās Vērtības"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr "Žurnāla Vienumi"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr "Konts1 Id"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "Uzņēmumam ir jāsakrīt ar saistīto kontu un periodu."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimāli Atļautie (%)"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Šā plāna pamata konts."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: 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 "Kļūda"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr "Saglabāt šo Sadalījumu kā Modeli"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Daudzums"
+
+#. 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 "Lūdzu, norādiet nosaukumu un kodu, pirms saglabāt modeli!"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr "Izdrukāt Šķērssaistīto Analītiku"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Nav norādīts analītiskais žurnāls!"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bankas Konta Izraksts"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Konts3 Id"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "Rēķins"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr "Konts4 Id"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr "Analītiskā Sadaklījuma Rindas"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr "Kopsummai ir jābūt starp %s un %s"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "uz"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Konta Nosaukums"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr "Analītiskā Sadaklījuma Rinda"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr "Sadalījuma Kods"
+
+#. 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 "Analītiskais Sadalījums"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr "Žurnāls"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr "analytic.plan.create.model"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr "Beigu Datums"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr "Sadalījuma Modeļi"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Secība"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Žurnāla nosaukumam katrai kompānijai ir jābūt unikālam!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "Value Error"
+msgstr "Vērtības Kļūda"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "Jūs nevarat izveidor grāmatojumu pārskata kontam."
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index 26d2514c0a6..653dd383bf0 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -566,9 +566,6 @@ msgstr "Value Error"
 msgid "You can not create move line on view account."
 msgstr "Дансны харагдац дээр шилжих мөр үүсгэж болохгүй."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та цикл хэлбэрийн Цэс үүсгэх боломжгүй."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -578,8 +575,5 @@ msgstr "Дансны харагдац дээр шилжих мөр үүсгэж
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Борлуулалтын захиалгын мөр"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 570b8378409..6fa8f9285c6 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: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2011-01-19 13:58+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"Last-Translator: Jan Verlaan @ Veritos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -664,9 +664,6 @@ msgstr "U kunt geen boekingsregel creëren op een zichtrekening"
 #~ "kostenplaatsboekingen voor één normale boeking.\n"
 #~ "        "
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Overgevelde kostenplaats -"
-
 #~ msgid "Analytic Distribution's models"
 #~ msgstr "Kostenverdelingsmodellen"
 
@@ -674,18 +671,3 @@ msgstr "U kunt geen boekingsregel creëren op een zichtrekening"
 #~ "This distribution model has been saved. You will be able to reuse it later."
 #~ msgstr ""
 #~ "Dit kostenverdelingsmodel is opgeslagen. U kunt het later opnieuw gebruiken."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Verkooporderregel"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index db58523c84d..f0f89d01d10 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 153ab76bcb9..1d650cd5157 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 747f1f09187..f9f89888044 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9d6962fa113..12d1aae028b 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -30,7 +30,7 @@ msgstr "Identificação do Plano"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "Desde"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -82,12 +82,12 @@ msgstr "Instância do Plano Analítico"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "Aceitar"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Não pode criar linhas de movimentos em contas fechadas."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
@@ -117,7 +117,7 @@ msgstr "Código"
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valor de crédito ou débito errado no movimento contabilístico !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -132,7 +132,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Linha de Extracto Bancário"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -158,7 +158,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linha da ordem de venda"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
@@ -209,7 +209,7 @@ msgstr "Planos Analítico"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Perc. (%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -271,7 +271,7 @@ msgstr "Conta Raiz"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "Até"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
@@ -351,7 +351,7 @@ msgstr "Movimentos Padrão"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Lançamentos do diário"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
@@ -361,7 +361,7 @@ msgstr "Identificação da Conta 1"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "A empresa tem que ser a mesma para a conta e período relacionados."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -412,7 +412,7 @@ msgstr "Não existe diário analítico!"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracto Bancário"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -469,7 +469,7 @@ msgstr "Código de Distribuição"
 #. 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
@@ -635,21 +635,3 @@ msgstr ""
 #~ "This distribution model has been saved. You will be able to reuse it later."
 #~ msgstr ""
 #~ "Este modelo de distribuição foi gravado. Poderá reutilizá-lo mais tarde."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Erro: É necessária a referência BVR."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Erro! Número Bvr inválido (soma de controlo errada)"
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index a1d2cf2fe6b..8288e17ff3b 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -656,6 +656,3 @@ msgstr "Você não pode criar linhas de movimento em uma conta de exibição."
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Cruzamento Analítico"
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index 0d3428b10c4..e742127369c 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -634,8 +634,5 @@ msgstr ""
 #~ msgid "Printing date:"
 #~ msgstr "Data tipăririi:"
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Analitic încrucişat -"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nume invalid de model în definirea acţiunii"
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index e624222442c..05369d8ba0d 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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
@@ -60,7 +60,7 @@ msgstr "Управление несколькими планами аналит
 #: 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
@@ -87,12 +87,12 @@ msgstr "OK"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-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
@@ -127,7 +127,7 @@ msgstr "счет 6 уровня"
 #. 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
@@ -147,7 +147,7 @@ msgstr "Код журнала должен быть уникальным для
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "Ссылка на счет аналитики"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -166,12 +166,12 @@ msgstr "Позиция заказа на продажу"
 #: 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
@@ -181,7 +181,7 @@ msgstr "Печать"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
-msgstr "Процентное отношение"
+msgstr "В процентах"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -232,7 +232,7 @@ msgstr "Строки плана аналитики"
 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
@@ -262,7 +262,7 @@ 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
@@ -333,6 +333,39 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"Этот модуль позволяет использовать несколько планов счетов аналитики, в "
+"соответствии \n"
+"с общим журналом, так что несколько аналитических проводок создаются, при\n"
+"подтверждении счета или бухгалтерской проводки.\n"
+"\n"
+"Например, можно определить такую структуру аналитики:\n"
+"  Проекты\n"
+"      Проект 1\n"
+"          Подпроект 1.1\n"
+"          Подпроект 1.2\n"
+"      Проект 2\n"
+"  Продавец\n"
+"      Юрий\n"
+"      Николай\n"
+"\n"
+"Здесь, у нас есть два плана: Проекты и Продавец. Позиция счета должна "
+"создавать\n"
+"проводки аналитики в 2 планах: Подпроект 1.1 и Николай. Сумма может быть \n"
+"разделена. Следующий пример для счета, который затрагивает два подпроекта и "
+"\n"
+"отнесен к одному продавцу:\n"
+"План1:\n"
+"    Подпроект 1.1 : 50%\n"
+"    Подпроект 1.2 : 50%\n"
+"План2:\n"
+"    Юрий: 100%\n"
+"\n"
+"Поэтому, когда эта позиция счета будет подтверждена, будет генерироваться 3 "
+"\n"
+"аналитических проводки,  для одной бухгалтерской.\n"
+"План аналитики утверждает минимальный и максимальный процент в момент \n"
+"создания шаблона разнесения.\n"
+"        "
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -385,7 +418,7 @@ msgstr "Ошибка"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "Сохранить это разнесение как шаблон"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -401,7 +434,7 @@ 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:321
@@ -439,13 +472,13 @@ msgstr "Счет 4 уровня"
 #. 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:214
 #, 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
@@ -460,12 +493,12 @@ 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
@@ -486,7 +519,7 @@ msgstr "100.00%"
 #: 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
@@ -506,7 +539,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
 #: field:account.analytic.plan.line,sequence:0
@@ -571,18 +604,3 @@ msgstr "Нельзя создать проводку по счету с типо
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Позиция заказа на продажу"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index fc837c8e0a6..fae92cd4fd1 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9de820e1153..257e7ebb3c6 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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 06fe4de8496..9d177486e4b 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -645,9 +645,6 @@ msgstr ""
 #~ "analiticke linije za jednu stavku racuna.\n"
 #~ "        "
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Unakrsna Analitika-"
-
 #~ msgid "Analytic Distribution's models"
 #~ msgstr "Modeli Analitičkih Distribucija"
 
@@ -657,9 +654,3 @@ msgstr ""
 
 #~ msgid "OK"
 #~ msgstr "U redu"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Stavke naloga za prodaju"
diff --git a/addons/account_analytic_plans/i18n/sr@latin.po b/addons/account_analytic_plans/i18n/sr@latin.po
index ef67acb0eb3..ef2fa3e7968 100644
--- a/addons/account_analytic_plans/i18n/sr@latin.po
+++ b/addons/account_analytic_plans/i18n/sr@latin.po
@@ -8,21 +8,22 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-12-23 14:28+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-03 22:56+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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
-"Distribucioni model je sacuvan. Bicete u mogucnosti da ga kasnije koristite."
+"Ovaj distribucioni model je sačuvan. Bićete u mogućnosti da ga ponovo "
+"koristite kasnije."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -50,31 +51,31 @@ msgstr "Unakrsna analitika"
 #: 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 "Analiticki Plan"
+msgstr "Analitički plan"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr "Visestruki-planovi menadzmenta u Analitickom racunovodstvu"
+msgstr "Višestruki-planovi uređivanja u Analitičkom računovodstvu"
 
 #. 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 "Analiticki Dnevnik"
+msgstr "Analitički dnevnik"
 
 #. 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 "Red Analitickog Plana"
+msgstr "Red Analitičkog plana"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
 #, python-format
 msgid "User Error"
-msgstr "Korisnicka Greska"
+msgstr "Korisnička greška"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
@@ -84,12 +85,12 @@ msgstr "Instanca analitičkog plana"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr "U redu"
+msgstr "OK"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Ne možete da napravite poteznu liniju na zatvorenim računima."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
@@ -99,12 +100,12 @@ msgstr "Plan modela"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr "Šifra računa2"
+msgstr "ID računa2"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr "Šifra konta"
+msgstr "ID računa"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -119,22 +120,22 @@ msgstr "Kod"
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Pogrešna vrednost kredita ili debita u ulazu računa !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr "Šifra računa6"
+msgstr "ID računa6"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr "Multi-Planovi"
+msgstr "Višestruki-Planovi"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Red bankovnog izvoda"
+msgstr "Red izveštaja banke"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -144,30 +145,31 @@ msgstr "Analitički nalog"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Kod dnevnika mora biti jedinstven po preduzeću !"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr "referenca Analitickjog naloga"
+msgstr "Referenca analitičkog naloga"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Ne možete napraviti poteznu liniju na primaćem/platežnom računu bez partnera"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Redosled narudžbina"
 
 #. 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 "Distribucioni model je sacuvan"
+msgstr "Distribucioni model je sačuvan"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
@@ -188,13 +190,13 @@ msgstr "Procenat"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
 #, python-format
 msgid "A model having this name and code already exists !"
-msgstr "Model sa ovim imenom i sadrzajem vec postoji !"
+msgstr "Model sa ovim imenom i kodom već postoji !"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "No analytic plan defined !"
-msgstr "Analiticki plan nije definisan !"
+msgstr "Analitički plan nije definisan !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
@@ -211,7 +213,7 @@ msgstr "Analitički planovi"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Proc(%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -221,7 +223,7 @@ msgstr "Maksimalno dozvoljeno (%)"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr "Datum stampe"
+msgstr "Datum štampanja"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -233,12 +235,12 @@ msgstr "Redovi analitičkog plana"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Iznos vaučera mora biti isti kao onaj na izvodu računa :-)"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Faktura"
+msgstr "Redak računa"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -248,7 +250,7 @@ msgstr "Valuta"
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
-msgstr "Početni datum"
+msgstr "Datum početka"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -258,12 +260,12 @@ msgstr "Preduzeće"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr "Šifra računa5"
+msgstr "ID računa5"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr "Red Analiticke Instance"
+msgstr "Redak analitičke instance"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
@@ -280,7 +282,7 @@ msgstr "Do datuma"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "TReba da definises analiticki dnevnik u '%s' dnevnika!"
+msgstr "Treba definisati analitički dnevnik u '%s' dnevnika!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -295,7 +297,7 @@ msgstr "analytic.plan.create.model.action"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr "Analiticki konto :"
+msgstr "Analitički račun :"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -334,36 +336,35 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
-"Ovaj ti modul omogucava da koristis nekoliko analitickih planova, u odnosu "
-"na Osnovni Dnevnik,\n"
-"tako da visestruke analiticke linije su kreirane kada i fakture ili je "
-"sadrzaj potvrdjen.\n"
+"Ovaj modul omogućava da korišćenje nekoliko analitičkih planova, u odnosu na "
+"opšti dnevnik,\n"
+"tako da su višestruke analiticče linije su napravljene kada su fakture ili "
+"je sadržaj potvrđeni.\n"
 "\n"
-"Na primer , mozes definisati sledecu analiticku strukturu:\n"
+"Na primer , možete definisati sledeću analiticku strukturu:\n"
 "  Projekat:\n"
 "       Projekat 1\n"
-"               SubProj 1.1\n"
-"               SubProj 1.2\n"
+"               PotProj 1.1\n"
+"               PotProj 1.2\n"
 "      Projekat 2\n"
 "  Prodavac\n"
 "                 Janko\n"
 "                 Marko\n"
 "\n"
-"Ovde imamo dva plana: Projekat i Prodavac. Linija fakture mora\n"
-"da bude sposobna da upise analiticki sadrzaj u dva plana: SubProj 1.1 i\n"
-"MArko. IZnos se takodje moze podeliti. Sledeci primer je za fakturu koja ima "
-"dodira sa dva sub projekta i dodeljena je jednom prodavcu:\n"
+"Ovde imamo dva plana: Projekat i Prodavci. Linija fakture mora\n"
+"biti u mogućnosti da upiše analitički sadržaj u dva plana: PotProj 1.1 i\n"
+"Marko. Iznos se takođe moze podeliti. Sledeći primer je za fakturu koja ima "
+"dodira sa dva potprojekta i dodeljena je jednom prodavcu:\n"
 "\n"
 "Plan1\"\n"
 "    SubProjekat 1.1 : 50%\n"
 "    SubProjekat 1.2 : 50%\n"
-"PLan2\n"
+"Plan2\n"
 "    Janko: 100%\n"
 "\n"
-"Tako da ovaj red fakture bude bio potvrdjen on ce generisati 3 Analiticke "
-"stavke, \n"
-"za jedan sadrzaj naloga,\n"
-"Analiticki plan potvrdjuje minimum i maksimum procenata u vreme kada je "
+"Tako da kada je ovaj red fakture potvrđen, generisaće 3 analitičke stavke, \n"
+"za jedan sadržaj naloga,\n"
+"Analiticki plan potvrđuje minimum i maksimum procenata u vreme kada je "
 "generisan\n"
 "distribucioni model.\n"
 "        "
@@ -371,22 +372,22 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr "Veza analitičkog konta:"
+msgstr "Referenca analitičkog računa:"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr "Ime Plana"
+msgstr "Ime plana"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr "Podrazumevane Stavke"
+msgstr "Podrazumevane stavke"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr "Sadrzaj Dnevnika"
+msgstr "Sadržaj dnevnika"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
@@ -396,7 +397,7 @@ msgstr "Šifra računa1"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Preduzeće mora biti isto za sve vezane račune i periode."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -406,7 +407,7 @@ msgstr "Minimalno dozvoljeno (%)"
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr "Osnovni konto ovog plana."
+msgstr "Osnovni račun ovog plana."
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -419,7 +420,7 @@ msgstr "Greška"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr "Sacuvaj Ovu Distribuciju kao Model"
+msgstr "Sacuvaj ovu distribuciju kao model"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -430,24 +431,24 @@ msgstr "Količina"
 #: 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 "Molim postavite Ime i sadrzaj pre nego sacuvate model !"
+msgstr "Molim unesite  naziv i sadržaj pre nego što sačuvate model !"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
 msgid "Print Crossovered Analytic"
-msgstr "Stampa Unakrsne Analitike"
+msgstr "Štampa unakrsne analitike"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Nema Analitickog Dnevnika"
+msgstr "Nema analitičkog dnevnika"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr "Izvod banke"
+msgstr "Izveštaj Banke"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -457,7 +458,7 @@ msgstr "Šifra računa3"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr "Račun"
+msgstr "Faktura"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -479,7 +480,7 @@ msgstr "Red Analiticke Distribucije"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "The Total Should be Between %s and %s"
-msgstr "Ukupni iznos bi trebalo da se nalazi izmedju %s  i  %s"
+msgstr "Ukupni iznos bi trebalo da bude između %s  i  %s"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -489,12 +490,12 @@ msgstr "u"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "Naziv Naloga"
+msgstr "Naziv naloga"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr "Red analitičke distribucije"
+msgstr "Redak analitičke distribucije"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
@@ -504,7 +505,7 @@ msgstr "Šifra distribucije"
 #. 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
@@ -520,7 +521,7 @@ msgstr "100.00%"
 #: field:account.move.line,analytics_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr "Analitička Distribucija"
+msgstr "Analitička distribucija"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
@@ -535,12 +536,12 @@ msgstr "analytic.plan.create.model"
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date2:0
 msgid "End Date"
-msgstr "Završni Datum"
+msgstr "Datum završetka"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr "Dsitribucioni Modeli"
+msgstr "Dsitribucioni modeli"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -550,21 +551,18 @@ msgstr "Sekvenca"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Naziv dnevnika mora biti jedinstven po preduzeću"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "Value Error"
-msgstr "Pogresna Vrednost"
+msgstr "Pogrešna vrednost"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
+msgstr "Ne možete napraviti poteznu liniju na računu po viđenju"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -574,9 +572,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Stavke naloga za prodaju"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
@@ -651,9 +646,6 @@ msgstr ""
 #~ "analiticke linije za jednu stavku racuna.\n"
 #~ "        "
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "Unakrsna Analitika-"
-
 #~ msgid "Analytic Distribution's models"
 #~ msgstr "Modeli Analitičkih Distribucija"
 
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index 2f32d0b7d50..4fadd1637e5 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -601,17 +601,5 @@ msgstr "Du kan inte skapa transaktioner på visa-konton."
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Säljorderrad"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index 185a0c580fa..c02fd4f3722 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 521bce4e18a..7bc87c8f90b 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: 2011-05-23 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 748afe99c02..80b6a95d467 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 89bfa450ae2..205f697980c 100644
--- a/addons/account_analytic_plans/i18n/vi.po
+++ b/addons/account_analytic_plans/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2011-05-19 13:54+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -491,7 +491,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr "Nhật ký"
+msgstr "Sổ nhật ký"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index bc49d544676..4647fc68213 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-10-30 13:46+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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
@@ -60,7 +60,7 @@ msgstr "辅助核算会计的多方案管理"
 #: 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
@@ -82,12 +82,12 @@ msgstr "辅助核算方案实例"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "确定"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "您不能在关闭的科目上建立分录。"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
@@ -97,12 +97,12 @@ msgstr "模型方案"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr "项目2ID"
+msgstr "项2 ID"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr "项目ID"
+msgstr "项 ID"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -117,37 +117,37 @@ 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 "项目6ID"
+msgstr "项6 ID"
 
 #. 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
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-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
 #: constraint:account.move.line:0
@@ -158,19 +158,19 @@ 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
@@ -186,13 +186,13 @@ msgstr "百分比"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
 #, 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
@@ -209,7 +209,7 @@ 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
@@ -231,17 +231,17 @@ msgstr "辅助核算方案明细"
 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
 msgid "Invoice Line"
-msgstr ""
+msgstr "发票明细"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "币别"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
@@ -251,17 +251,17 @@ msgstr "开始日期"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr "项目5ID"
+msgstr "项5 ID"
 
 #. 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
@@ -278,7 +278,7 @@ msgstr "日期到"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, 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
@@ -288,7 +288,7 @@ 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
 #: report:account.analytic.account.crossovered.analytic:0
@@ -332,11 +332,36 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"此模块允许使用几个辅助核算方案生成账簿，以便在凭证或发票过账时生成多个辅助核算凭证行。\n"
+"例如，你有以下辅助核算结构：\n"
+"\n"
+"  项目\n"
+"    项目1\n"
+"      子项目1.1\n"
+"      子项目1.2\n"
+"  项目2\n"
+"  销售员\n"
+"    Eric\n"
+"    Fabien\n"
+"\n"
+"这里我们有两个方案：  项目和销售员。\n"
+"一个发票行需要根据两个方案相应辅助核算项生成明细：发票金额在项目间和销售员间分摊。\n"
+"\n"
+"分摊模型这样定义：\n"
+"方案1：\n"
+"  子项目1.1：50%\n"
+"  子项目1.2：50%\n"
+"方案2：\n"
+"  Eric：100%\n"
+"\n"
+"这样当这张发票过账后，会生成属于一个会计凭证行的3个辅助核算凭证行。\n"
+"在创建分摊模型时可以验证最大或最小分摊百分比。\n"
+"        "
 
 #. 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
@@ -346,22 +371,22 @@ 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 "项目1ID"
+msgstr "项1 ID"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "公司相关的科目必须和会计期间一致。"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -371,7 +396,7 @@ 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:201
@@ -384,7 +409,7 @@ msgstr "错误"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "保存此分摊模型"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -395,34 +420,34 @@ 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:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "No Analytic Journal !"
-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 "项目3ID"
+msgstr "项3 ID"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -433,12 +458,12 @@ msgstr "取消"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr "项目4ID"
+msgstr "项4 ID"
 
 #. 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:214
@@ -454,22 +479,22 @@ 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
@@ -485,17 +510,17 @@ msgstr "100.00%"
 #: 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
 #: 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
@@ -505,7 +530,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
 #: field:account.analytic.plan.line,sequence:0
@@ -515,18 +540,18 @@ 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:214
 #, python-format
 msgid "Value Error"
-msgstr ""
+msgstr "错误的值"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "不能针对内部类型是视图的科目记账"
 
 #~ msgid "Select Information"
 #~ msgstr "选择信息"
@@ -541,9 +566,6 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
 
-#~ msgid "Crossovered Analytic -"
-#~ msgstr "交叉辅助核算-"
-
 #~ msgid "OK"
 #~ msgstr "确定"
 
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index 41b983133fa..141fe9a1cf3 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -158,7 +158,7 @@ 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
@@ -180,7 +180,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -236,22 +236,22 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "發票明細"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "貨幣"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日期"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
@@ -389,7 +389,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "數量"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
@@ -422,13 +422,13 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "發票"
 
 #. module: account_analytic_plans
 #: 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
@@ -449,12 +449,12 @@ msgstr ""
 #. 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
@@ -500,7 +500,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date2:0
 msgid "End Date"
-msgstr ""
+msgstr "結束日期"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 6e331ed1b83..f374aa5a2c2 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -240,7 +240,7 @@
             <para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['ref_amt']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">100.00%</para>
@@ -288,7 +288,7 @@
             <para style="terp_default_Right_9">[[formatLang(a['qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['amt']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(a['amt'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(a['perc']) ]]%</para>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 81e5d33fbda..60c1bf67463 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -36,7 +36,6 @@
 
 		<record model="ir.values" id="account_crossovered_analytic_values">
             <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="object" eval="1" />
             <field name="name">Crossovered Analytic</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_crossovered_analytic'))" />
@@ -45,4 +44,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 79afb26ab26..52ec0588e88 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name"      : "Stock Accounting for Anglo-Saxon countries",
+    "name"      : "Anglo-Saxon Accounting",
     "version"   : "1.2",
     "author"    : "OpenERP SA, Veritos",
     "website"   : "http://tinyerp.com - http://veritos.nl",
@@ -36,7 +36,7 @@ when the invoice is created to transfer this amount to the debtor or creditor ac
 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"  : "Warehouse",
+    "category"  : "Accounting & Finance",
     "init_xml"  : [],
     "demo_xml"  : [],
     "update_xml" : ["product_view.xml",],
diff --git a/addons/account_anglo_saxon/i18n/ar.po b/addons/account_anglo_saxon/i18n/ar.po
index 1a131032ba5..db1c6656550 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/bg.po b/addons/account_anglo_saxon/i18n/bg.po
index 61bd8ef5657..95d92200461 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/ca.po b/addons/account_anglo_saxon/i18n/ca.po
index 243795ba4e6..b8dce57c2b3 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/da.po b/addons/account_anglo_saxon/i18n/da.po
new file mode 100644
index 00000000000..bf144945725
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/da.po
@@ -0,0 +1,107 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-09 21:36+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordre reference skal være unik !"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Fejl ! Du kan ikke oprette rekusive katagorier."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinie"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Indkøbsordre"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Produkt katagori"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: 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 "Plukliste"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po
index 7c197fba4cb..e973b5381e6 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -162,18 +162,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehler in XML Quellen für diese Ansicht"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-#~ "haben !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/account_anglo_saxon/i18n/el.po b/addons/account_anglo_saxon/i18n/el.po
index 088295a670b..e4a243e8079 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -142,9 +142,3 @@ msgstr ""
 #~ "και θα χρησιμοποιήσει αυτό τον ενδιάμεσο λογαριασμό \n"
 #~ "    όταν δημιουργηθεί το τιμολόγιο για να μεταφέρει αυτό το ποσό στο "
 #~ "λογαριασμό χρέωσης ή πίστωσης."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με _x και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες !"
diff --git a/addons/account_anglo_saxon/i18n/en_GB.po b/addons/account_anglo_saxon/i18n/en_GB.po
new file mode 100644
index 00000000000..181e9649537
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/en_GB.po
@@ -0,0 +1,124 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 11:47+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: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Accounting Property"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Order Reference must be unique !"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Error ! You can not create recursive categories."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Invoice Line"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Purchase Order"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Product Template"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Product Category"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Stock Accounting for Anglo Saxon countries"
+
+#. 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 "Price Difference Account"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Picking List"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting takes the cost when sales invoice is created, "
+"Continental accounting will take the cost at the moment the goods are "
+"shipped.\n"
+"    This module adds this functionality by using a interim account, to store "
+"the value of shipped goods and will contra book this interim account\n"
+"    When the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+
+#. 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 ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
index a429f75f46d..40192952f5a 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -160,21 +160,3 @@ msgstr ""
 #~ "provisional \n"
 #~ "    cuando la factura sea creada para transferir esta cantidad al deudor o "
 #~ "acreedor de la cuenta."
-
-#~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ 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."
diff --git a/addons/account_anglo_saxon/i18n/es_EC.po b/addons/account_anglo_saxon/i18n/es_EC.po
index d3eb25a4f29..f33cdea23e4 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/es_MX.po b/addons/account_anglo_saxon/i18n/es_MX.po
new file mode 100644
index 00000000000..def75b4c77c
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/es_MX.po
@@ -0,0 +1,162 @@
+# 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-12 11:29+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Propiedades de contabilidad"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: account_anglo_saxon
+#: 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_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Contabilidad de stocks para países anglo-sajones"
+
+#. 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 "Cuenta diferencia de precio"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+"Este módulo soporta la metodología de la contabilidad anglo-sajona mediante\n"
+"    el cambio de la lógica contable con las transacciones de inventario. La "
+"diferencia entre contabilidad de países anglo-sajones\n"
+"    y el RHINE o también llamada contabilidad de países continentales es el "
+"momento de considerar los costes de las mercancías vendidas respecto al "
+"coste de las ventas.\n"
+"    La contabilidad anglosajona tiene en cuenta el coste cuando se crea la "
+"factura de venta, la contabilidad continental tiene en cuenta ese coste en "
+"el momento de que las mercancías son enviadas.\n"
+"    Este modulo añade esta funcionalidad usando una cuenta provisional, para "
+"guardar el valor de la mercancía enviada y anota un contra asiento a esta "
+"cuenta provisional\n"
+"    cuando se crea la factura para transferir este importe a la cuenta "
+"deudora o acreedora.\n"
+"    Secundariamente, las diferencias de precios entre el actual precio de "
+"compra y el precio estándar fijo del producto son registrados en cuentas "
+"separadas."
+
+#. 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 ""
+"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
+"precio de compra y precio de coste."
+
+#~ msgid "Stock Account"
+#~ msgstr "Cuenta de Valores"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
+
+#~ msgid ""
+#~ "This module will support the Anglo-Saxons accounting methodology by \n"
+#~ "    changing the accounting logic with stock transactions. The difference "
+#~ "between the Anglo-Saxon accounting countries \n"
+#~ "    and the Rhine or also called Continental accounting countries is the "
+#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
+#~ "created, Continental accounting will take the cost at he moment the goods "
+#~ "are shipped.\n"
+#~ "    This module will add this functionality by using a interim account, to "
+#~ "store the value of shipped goods and will contra book this interim account \n"
+#~ "    when the invoice is created to transfer this amount to the debtor or "
+#~ "creditor account."
+#~ msgstr ""
+#~ "Éste módulo soportará la metodología de contabilización Anglosajona \n"
+#~ "    cambiando la lógica de contabilización con transacciones de acciones. La "
+#~ "diferencia entre los países de contabilización Anglosajona \n"
+#~ "    y el Rin o también llamados países de contabilización Continental es el "
+#~ "momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
+#~ "    La contabilización Anglosajona toma el costo cuando la factura de ventas "
+#~ "es creada, la contabilización Continental tomará el costo en el momento en "
+#~ "que los bienes son enviados.\n"
+#~ "    Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
+#~ "para almacenar el valor de los bienes enviados y devolverá esta cuenta "
+#~ "provisional \n"
+#~ "    cuando la factura sea creada para transferir esta cantidad al deudor o "
+#~ "acreedor de la cuenta."
diff --git a/addons/account_anglo_saxon/i18n/es_PY.po b/addons/account_anglo_saxon/i18n/es_PY.po
index 6ddf8d3e993..27c89e20c88 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/es_VE.po b/addons/account_anglo_saxon/i18n/es_VE.po
new file mode 100644
index 00000000000..def75b4c77c
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/es_VE.po
@@ -0,0 +1,162 @@
+# 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-12 11:29+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Propiedades de contabilidad"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: account_anglo_saxon
+#: 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_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Contabilidad de stocks para países anglo-sajones"
+
+#. 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 "Cuenta diferencia de precio"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+"Este módulo soporta la metodología de la contabilidad anglo-sajona mediante\n"
+"    el cambio de la lógica contable con las transacciones de inventario. La "
+"diferencia entre contabilidad de países anglo-sajones\n"
+"    y el RHINE o también llamada contabilidad de países continentales es el "
+"momento de considerar los costes de las mercancías vendidas respecto al "
+"coste de las ventas.\n"
+"    La contabilidad anglosajona tiene en cuenta el coste cuando se crea la "
+"factura de venta, la contabilidad continental tiene en cuenta ese coste en "
+"el momento de que las mercancías son enviadas.\n"
+"    Este modulo añade esta funcionalidad usando una cuenta provisional, para "
+"guardar el valor de la mercancía enviada y anota un contra asiento a esta "
+"cuenta provisional\n"
+"    cuando se crea la factura para transferir este importe a la cuenta "
+"deudora o acreedora.\n"
+"    Secundariamente, las diferencias de precios entre el actual precio de "
+"compra y el precio estándar fijo del producto son registrados en cuentas "
+"separadas."
+
+#. 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 ""
+"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
+"precio de compra y precio de coste."
+
+#~ msgid "Stock Account"
+#~ msgstr "Cuenta de Valores"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
+
+#~ msgid ""
+#~ "This module will support the Anglo-Saxons accounting methodology by \n"
+#~ "    changing the accounting logic with stock transactions. The difference "
+#~ "between the Anglo-Saxon accounting countries \n"
+#~ "    and the Rhine or also called Continental accounting countries is the "
+#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
+#~ "created, Continental accounting will take the cost at he moment the goods "
+#~ "are shipped.\n"
+#~ "    This module will add this functionality by using a interim account, to "
+#~ "store the value of shipped goods and will contra book this interim account \n"
+#~ "    when the invoice is created to transfer this amount to the debtor or "
+#~ "creditor account."
+#~ msgstr ""
+#~ "Éste módulo soportará la metodología de contabilización Anglosajona \n"
+#~ "    cambiando la lógica de contabilización con transacciones de acciones. La "
+#~ "diferencia entre los países de contabilización Anglosajona \n"
+#~ "    y el Rin o también llamados países de contabilización Continental es el "
+#~ "momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
+#~ "    La contabilización Anglosajona toma el costo cuando la factura de ventas "
+#~ "es creada, la contabilización Continental tomará el costo en el momento en "
+#~ "que los bienes son enviados.\n"
+#~ "    Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
+#~ "para almacenar el valor de los bienes enviados y devolverá esta cuenta "
+#~ "provisional \n"
+#~ "    cuando la factura sea creada para transferir esta cantidad al deudor o "
+#~ "acreedor de la cuenta."
diff --git a/addons/account_anglo_saxon/i18n/et.po b/addons/account_anglo_saxon/i18n/et.po
index 5b95e08a7da..b3714dd16b4 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/fi.po b/addons/account_anglo_saxon/i18n/fi.po
index 4806d363e98..cf46d58b7c0 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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index a46a50d92b7..977311e5e0e 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -128,12 +128,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalide pour l'architecture de la vue !"
-
-#~ 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 "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/account_anglo_saxon/i18n/gl.po b/addons/account_anglo_saxon/i18n/gl.po
index 3956169be3a..878981a9681 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index 31e1949a374..a0a6aaa23e8 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -109,6 +109,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "संरचना देखने के लिए अमान्य XML!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "त्रुटि: UOS UOM से एक अलग श्रेणी में होना चाहिए"
diff --git a/addons/account_anglo_saxon/i18n/hu.po b/addons/account_anglo_saxon/i18n/hu.po
index f0cd876a271..5c75aa9710d 100644
--- a/addons/account_anglo_saxon/i18n/hu.po
+++ b/addons/account_anglo_saxon/i18n/hu.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-30 16:21+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po
index 05d8837c275..baa9ff21642 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index eb1d673b2c7..24f4c85fd73 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 22:40+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@domsense.com>\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -115,18 +115,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per visualizzare l'Achitettura!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/account_anglo_saxon/i18n/lv.po b/addons/account_anglo_saxon/i18n/lv.po
new file mode 100644
index 00000000000..b17594de091
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/lv.po
@@ -0,0 +1,124 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-01 19:23+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: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Grāmatvedības Veids"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Pasūtījuma referencei ir jābūt unikālai!"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Kļūda! Jūs nevarat veidot rekursīvas kategorijas."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Kļūda: Noklusētajām vienībām ir jāsakrīt ar iepirktajām vienībām (UOM)."
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Rēķina Rinda"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Iepirkuma Rīkojums"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Produkta Veidne"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Produkta Kategorija"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Krājumu Grāmatvedība Anglo Sakšu valstīm"
+
+#. 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 "Ceny Starpības Konts"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Rēķins"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Izvades Saraksts"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+"Šis modulis atbalstīs Anglo-Sakšu grāmatvedības metodoloģiju\n"
+"    mainot uzskaites loģiku pie krājumu transakcijām. Starpība starp Anglo-"
+"Sakšu grāmatvedības zemēm\n"
+"    un Kontinentālās grāmatvedības zemēm ir mirklī, kad Pārdoto Preču "
+"Izmaksas tiek attiecinātas pret Pārdošanas Izmaksām.\n"
+"    Anglo-Sakšu grāmatvedība uzskaita izmaksas uz pārdošanas rēķina "
+"izveidošanas brīdi, Kontinentālā grāmatvedība izmaksas attiecinās preču "
+"nosūtīšanas brīdī.\n"
+"    Šis modulis pievienos šo funkcionalitāti ar starpkonta palīdzību "
+"nosūtīto preču vērtības uzglabāšanai un reversi iegrāmatos šo kontu\n"
+"    kad tiks izveidots rēķins, lai šo summu pārvestu uz debitora vai "
+"kreditora kontu.\n"
+"    Otrkārt, cenas starpība starp patieso iegādes cenu un fiksēto preces "
+"pārdošanas cenu tiek iegrāmatota atsevišķā kontā."
+
+#. 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 ""
+"Šis konts tiks izmantots cenu starpības uzskaitei starp iepirkuma cenu un "
+"izmaksu cenu."
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
index e20ca8fec41..84cb7b59950 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -114,6 +114,3 @@ msgstr ""
 
 #~ msgid "Stock Account"
 #~ msgstr "Агуулахын данс"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Алдаа: Борлуулалтын нэгж нь хэмжих нэгжээс өөр ангилалд байх ёстой"
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
index e613b108ac3..ff7cea3f984 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -154,23 +154,5 @@ msgstr ""
 #~ "    voor het tegenboeken wanneer de factuur wordt gemaakt om het over te "
 #~ "boeken naar de klant of leverancier."
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Fout: Verkoopeenheid moet in een andere categorie staan dan de maateenheid"
diff --git a/addons/account_anglo_saxon/i18n/oc.po b/addons/account_anglo_saxon/i18n/oc.po
index 37fa1f0b98d..23418145fb5 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index 2c003e604c9..f7ce557a19e 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/pt.po b/addons/account_anglo_saxon/i18n/pt.po
index 23207db563b..c4f4574c97a 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/pt_BR.po b/addons/account_anglo_saxon/i18n/pt_BR.po
index b4f9e3b2ec5..7606beff93b 100644
--- a/addons/account_anglo_saxon/i18n/pt_BR.po
+++ b/addons/account_anglo_saxon/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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -123,7 +123,3 @@ msgid ""
 msgstr ""
 "Essa conta será usada para valorizar a diferença de preço entre preço de "
 "compra e o preço de custo."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Erro: Unidade de venda deve ser de categoria diferente da unidade de medida"
diff --git a/addons/account_anglo_saxon/i18n/ro.po b/addons/account_anglo_saxon/i18n/ro.po
index 7e90eb1d2ad..a5fe041b5f0 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/ru.po b/addons/account_anglo_saxon/i18n/ru.po
index 9f1b8eded53..151466b8ed8 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -25,38 +25,40 @@ msgstr ""
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Номер заказа должен быть уникальным!"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Ошибка! Нельзя создать рекурсивные категории."
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Ошибка. ед. изм. по умолчанию и закупочные ед. изм. должны иметь одинаковую "
+"категорию."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+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
 msgid "Product Template"
-msgstr ""
+msgstr "Шаблон ТМЦ"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Категория ТМЦ"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
@@ -72,7 +74,7 @@ msgstr ""
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Счет"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
diff --git a/addons/account_anglo_saxon/i18n/sl.po b/addons/account_anglo_saxon/i18n/sl.po
index 07575e9eb1c..03ce50e520d 100644
--- a/addons/account_anglo_saxon/i18n/sl.po
+++ b/addons/account_anglo_saxon/i18n/sl.po
@@ -14,49 +14,49 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr ""
+msgstr " Lastnosti računovodstva"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Sklic naročila mora biti enoličen!"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Napaka! Rekurzivnih kategorij ne morete ustvariti."
 
 #. 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 "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Postavka računa"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Nabavni nalog"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Predloga proizvoda"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Kategorija proizvodov"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
@@ -67,17 +67,17 @@ 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 "Konto razlik v ceni"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Prevzemni list"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,description:account_anglo_saxon.module_meta_information
diff --git a/addons/account_anglo_saxon/i18n/sq.po b/addons/account_anglo_saxon/i18n/sq.po
index 36e90818b56..9e2538c4c48 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/sr@latin.po b/addons/account_anglo_saxon/i18n/sr@latin.po
index 10b3a8cbb89..769ac9e16f5 100644
--- a/addons/account_anglo_saxon/i18n/sr@latin.po
+++ b/addons/account_anglo_saxon/i18n/sr@latin.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:14+0000\n"
-"PO-Revision-Date: 2011-06-04 19:30+0000\n"
+"PO-Revision-Date: 2011-11-02 15: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: 2011-06-05 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -73,7 +73,7 @@ msgstr "Odnos u razlici cena"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr "Račun"
+msgstr "Faktura"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
@@ -98,6 +98,21 @@ msgid ""
 "    Secondly, price differences between actual purchase price and fixed "
 "product standard price are booked on a separate account"
 msgstr ""
+"Ovaj će modul podržati anglo-saksonsku obračunsku metodologiju\n"
+"    menjajući obračunsku logiku sa transakcijama lagera. Razlika između "
+"anglo-saksonskih\n"
+"država\n"
+"    i Rajne ili takozvanih država kontinentalnog obračunavanja je momenat "
+"uzimanja troška prodatih dobara\n"
+"naspram troška prodaja.\n"
+"    Anglo-saksonsko obračunavanje uzima u obzir cenu kad se fakture prodaje "
+"pravi, dok kontinentalno obračunavanje uzima cenu u obzir pri prispeću "
+"dobara.\n"
+"    Ovaj modul dodaće ovu funkcije posredstvom međuračuna, da bi se vrednost "
+"prispelih dobara sačuvala i da bi se prenela ta vrednost sa tog međuračuna\n"
+"    kad faktura bude napravljena na račune dužnika ili poverioca.\n"
+"    Drugo, razlike u ceni između stvarne kupovne cene i fiksnog standarda "
+"dobra označene su na odvojenom nalogu."
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_anglo_saxon/i18n/sv.po b/addons/account_anglo_saxon/i18n/sv.po
index a739c5fa2ba..12589b9d519 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -124,23 +124,5 @@ msgstr ""
 "Detta konto kommer att användas för att värdera prisskillnaden mellan "
 "inköpspris och självkostnadspris."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid ""
-#~ "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 "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Fel: Säljmåttenheten måste tillhöra en annan kategori än standardmåttenheten"
diff --git a/addons/account_anglo_saxon/i18n/ta.po b/addons/account_anglo_saxon/i18n/ta.po
index 23b768346f3..3bb09100e94 100644
--- a/addons/account_anglo_saxon/i18n/ta.po
+++ b/addons/account_anglo_saxon/i18n/ta.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
-"Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
+"Last-Translator: ஆமாச்சு <ramadasan@amachu.net>\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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po
index 396c8ab8ab6..df8ed65f834 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: 2011-06-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index 82973cb0a29..024ca760164 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-04-12 17:30+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -30,7 +30,7 @@ msgstr "单号必须唯一！"
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr "错误!你不能创建递归的类型."
+msgstr "错误!你不能创建递归的分类"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
@@ -56,7 +56,7 @@ msgstr "产品模板"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr "产品类型"
+msgstr "产品分类"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
@@ -77,7 +77,7 @@ msgstr "发票"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,description:account_anglo_saxon.module_meta_information
diff --git a/addons/account_anglo_saxon/i18n/zh_TW.po b/addons/account_anglo_saxon/i18n/zh_TW.po
new file mode 100644
index 00000000000..874884ed488
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/zh_TW.po
@@ -0,0 +1,107 @@
+# Chinese (Traditional) 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-09-27 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "訂單參考不能重覆！"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "發票明細"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "購貨單"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "產品範本"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "產品分類"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "發票"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "提貨清單"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index c37a93b4be4..dcd04c1e27e 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -25,7 +25,7 @@ from osv import osv
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
-    
+
     def move_line_get(self, cr, uid, invoice_id, context=None):
         res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context=context)
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
@@ -33,9 +33,9 @@ class account_invoice_line(osv.osv):
         def get_price(cr, uid, inv, company_currency,i_line):
             cur_obj = self.pool.get('res.currency')
             if inv.currency_id.id != company_currency:
-                price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, i_line.product_id.product_tmpl_id.standard_price * i_line.quantity, context={'date': inv.date_invoice})
+                price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, i_line.product_id.standard_price * i_line.quantity, context={'date': inv.date_invoice})
             else:
-                price = i_line.product_id.product_tmpl_id.standard_price * i_line.quantity
+                price = i_line.product_id.standard_price * i_line.quantity
             return price
 
         if inv.type in ('out_invoice','out_refund'):
@@ -43,27 +43,27 @@ class account_invoice_line(osv.osv):
                 if i_line.product_id:
                     if inv.type == 'out_invoice':
                         # debit account dacc will be the output account
-                        # first check the product, if empty check the category                        
-                        dacc = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id
+                        # first check the product, if empty check the category
+                        dacc = i_line.product_id.property_stock_account_output and i_line.product_id.property_stock_account_output.id
                         if not dacc:
                             dacc = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id
                     else:
                         # = out_refund
                         # debit account dacc will be the input account
-                        # first check the product, if empty check the category                        
-                        dacc = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id
+                        # first check the product, if empty check the category
+                        dacc = i_line.product_id.property_stock_account_input and i_line.product_id.property_stock_account_input.id
                         if not dacc:
                             dacc = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id
                     # in both cases the credit account cacc will be the expense account
-                    # first check the product, if empty check the category                                    
-                    cacc = i_line.product_id.product_tmpl_id.property_account_expense and i_line.product_id.product_tmpl_id.property_account_expense.id
+                    # first check the product, if empty check the category
+                    cacc = i_line.product_id.property_account_expense and i_line.product_id.property_account_expense.id
                     if not cacc:
                         cacc = i_line.product_id.categ_id.property_account_expense_categ and i_line.product_id.categ_id.property_account_expense_categ.id
                     if dacc and cacc:
                         res.append({
                             'type':'src',
                             'name': i_line.name[:64],
-                            'price_unit':i_line.product_id.product_tmpl_id.standard_price,
+                            'price_unit':i_line.product_id.standard_price,
                             'quantity':i_line.quantity,
                             'price':get_price(cr, uid, inv, company_currency, i_line),
                             'account_id':dacc,
@@ -72,11 +72,11 @@ class account_invoice_line(osv.osv):
                             'account_analytic_id':i_line.account_analytic_id.id,
                             'taxes':i_line.invoice_line_tax_id,
                             })
-                        
+
                         res.append({
                             'type':'src',
                             'name': i_line.name[:64],
-                            'price_unit':i_line.product_id.product_tmpl_id.standard_price,
+                            'price_unit':i_line.product_id.standard_price,
                             'quantity':i_line.quantity,
                             'price': -1 * get_price(cr, uid, inv, company_currency, i_line),
                             'account_id':cacc,
@@ -88,36 +88,36 @@ 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.product_tmpl_id.type != 'service':
-                        # get the price difference account at the product                        
-                        acc = i_line.product_id.product_tmpl_id.property_account_creditor_price_difference and i_line.product_id.product_tmpl_id.property_account_creditor_price_difference.id
+                    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
                         if not acc:
-                            # if not found on the product get the price difference account at the category                            
+                            # if not found on the product get the price difference account at the category
                             acc = i_line.product_id.categ_id.property_account_creditor_price_difference_categ and i_line.product_id.categ_id.property_account_creditor_price_difference_categ.id
                         a = None
                         if inv.type == 'in_invoice':
                             # oa will be the stock input account
-                            # first check the product, if empty check the category                             
-                            oa = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id
+                            # first check the product, if empty check the category
+                            oa = i_line.product_id.property_stock_account_input and i_line.product_id.property_stock_account_input.id
                             if not oa:
                                 oa = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id
                         else:
                             # = in_refund
                             # oa will be the stock output account
-                            # first check the product, if empty check the category                            
-                            oa = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id
+                            # first check the product, if empty check the category
+                            oa = i_line.product_id.property_stock_account_output and i_line.product_id.property_stock_account_output.id
                             if not oa:
                                 oa = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id
                         if oa:
-                            # get the fiscal position                            
+                            # get the fiscal position
                             fpos = i_line.invoice_id.fiscal_position or False
                             a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
                         diff_res = []
-                        # calculate and write down the possible price difference between invoice price and product price                        
+                        # calculate and write down the possible price difference between invoice price and product price
                         for line in res:
                             if a == line['account_id'] and i_line.product_id.id == line['product_id']:
                                 uom = i_line.product_id.uos_id or i_line.product_id.uom_id
-                                standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.product_tmpl_id.standard_price, i_line.uos_id.id)
+                                standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)
                                 if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
                                     price_diff = i_line.price_unit - standard_price
                                     line.update({'price':standard_price * line['quantity']})
@@ -134,30 +134,29 @@ class account_invoice_line(osv.osv):
                                         'taxes':line.get('taxes',[]),
                                         })
                         res += diff_res
-        return res   
-    
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        if not product:
-            return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
-        else:
-            res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+        return res
 
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
+        fiscal_pool = self.pool.get('account.fiscal.position')
+        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context, company_id)
+        if not product:
+            return res
         if type in ('in_invoice','in_refund'):
             product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
             if type == 'in_invoice':
-                oa = product_obj.product_tmpl_id.property_stock_account_input and product_obj.product_tmpl_id.property_stock_account_input.id
+                oa = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id
                 if not oa:
                     oa = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id
             else:
-                oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id
+                oa = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id
                 if not oa:
                     oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
             if oa:
-                fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id, context=context) or False
-                a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
-                res['value'].update({'account_id':a})            
+                fpos = fposition_id and fiscal_pool.browse(cr, uid, fposition_id, context=context) or False
+                a = fiscal_pool.map_account(cr, uid, fpos, oa)
+                res['value'].update({'account_id':a})
         return res
-         
+
 account_invoice_line()
 
 class account_invoice(osv.osv):
@@ -170,7 +169,7 @@ class account_invoice(osv.osv):
             if inv_obj.type == 'in_invoice':
                 if line.get('product_id',False):
                     product_obj = self.pool.get('product.product').browse(cr, uid, line['product_id'][0])
-                    oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id
+                    oa = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id
                     if not oa:
                         oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
                     if oa:
@@ -180,6 +179,6 @@ class account_invoice(osv.osv):
                         line.update({'account_id': (account_data['id'],account_data['name'])})
         res = super(account_invoice,self)._refund_cleanup_lines(cr, uid, lines)
         return res
-    
+
 account_invoice()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 63c21407b69..8697631c394 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -8,6 +8,7 @@
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/group/field[@name='property_account_expense']" position="after">
+                    <label string="" colspan="2"/>
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
                 </xpath>
@@ -36,7 +37,7 @@
                 <form position="inside">
                     <group col="2" colspan="2">
                         <separator string=" Accounting Property" colspan="2"/>
-                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />                        
+                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     </group>
                 </form>
             </field>
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
index ac2dffbfd22..30d196a84ec 100644
--- a/addons/account_anglo_saxon/purchase.py
+++ b/addons/account_anglo_saxon/purchase.py
@@ -26,15 +26,17 @@ class purchase_order(osv.osv):
     _inherit = "purchase.order"
     _description = "Purchase Order"
 
-    def inv_line_create(self, cr, uid, a, ol):
-        line = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
-        if ol.product_id:
-            oa = ol.product_id.product_tmpl_id.property_stock_account_input and ol.product_id.product_tmpl_id.property_stock_account_input.id
-            if not oa:
-                oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id
-            if oa:
-                fpos = ol.order_id.fiscal_position or False
-                a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
-                line[2].update({'account_id': a})
+    def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
+        line = super(purchase_order, self)._prepare_inv_line(cr, uid, account_id, order_line, context=context)
+        if order_line.product_id and not order_line.product_id.type == 'service':
+            acc_id = order_line.product_id.property_stock_account_input and order_line.product_id.property_stock_account_input.id
+            if not acc_id:
+                acc_id = order_line.product_id.categ_id.property_stock_account_input_categ and order_line.product_id.categ_id.property_stock_account_input_categ.id
+            if acc_id:
+                fpos = order_line.order_id.fiscal_position or False
+                new_account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
+                line.update({'account_id': new_account_id})
         return line
 purchase_order()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/__init__.py b/addons/account_asset/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
old mode 100755
new mode 100644
index 4cad6f74af3..f3d00b08893
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,21 +15,21 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
-    "name" : "Asset management",
+    "name" : "Assets Management",
     "version" : "1.0",
     "depends" : ["account"],
-    "author" : "Tiny",
+    "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 
+    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" : "Generic Modules/Accounting",
+    "category" : "Accounting & Finance",
     "init_xml" : [
     ],
     "demo_xml" : [ 'account_asset_demo.xml'
@@ -45,7 +45,7 @@
         "account_asset_view.xml",
         "account_asset_invoice_view.xml",
         "report/account_asset_report_view.xml",
-	
+
     ],
     "active": False,
     "installable": True,
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 3a4e10740ec..894c22b46dc 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -112,6 +112,12 @@ class account_asset_asset(osv.osv):
                         amount = (amount_to_depr / asset.method_number) / total_days * (total_days - days)
             elif asset.method == 'degressive':
                 amount = residual_amount * asset.method_progress_factor
+                if asset.prorata:
+                    days = total_days - float(depreciation_date.strftime('%j'))
+                    if i == 1:
+                        amount = (residual_amount * asset.method_progress_factor) / total_days * days
+                    elif i == undone_dotation_number:
+                        amount = (residual_amount * asset.method_progress_factor) / total_days * (total_days - days)
         return amount
 
     def _compute_board_undone_dotation_nb(self, cr, uid, asset, depreciation_date, total_days, context=None):
@@ -137,8 +143,12 @@ class account_asset_asset(osv.osv):
                 depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
             
             amount_to_depr = residual_amount = asset.value_residual
-
-            depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
+            if asset.prorata:
+                depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
+            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)
             day = depreciation_date.day
             month = depreciation_date.month
             year = depreciation_date.year
@@ -191,7 +201,7 @@ class account_asset_asset(osv.osv):
     _columns = {
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Asset', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'code': fields.char('Reference ', size=16, readonly=True, states={'draft':[('readonly',False)]}),
+        'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
         'purchase_value': fields.float('Gross value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -242,13 +252,13 @@ class account_asset_asset(osv.osv):
 
     def _check_prorata(self, cr, uid, ids, context=None):
         for asset in self.browse(cr, uid, ids, context=context):
-            if asset.prorata and (asset.method != 'linear' or asset.method_time != 'number'):
+            if asset.prorata and asset.method_time != 'number':
                 return False
         return True
 
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']),
-        (_check_prorata, 'Prorata temporis can be applied only for computation method "linear" and time method "number of depreciations".', ['prorata']),
+        (_check_prorata, 'Prorata temporis can be applied only for time method "number of depreciations".', ['prorata']),
     ]
 
     def onchange_category_id(self, cr, uid, ids, category_id, context=None):
@@ -267,9 +277,9 @@ class account_asset_asset(osv.osv):
             }
         return res
 
-    def onchange_method_time(self, cr, uid, ids, method='linear', method_time='number', context=None):
+    def onchange_method_time(self, cr, uid, ids, method_time='number', context=None):
         res = {'value': {}}
-        if method != 'linear' or method_time != 'number':
+        if method_time != 'number':
             res['value'] = {'prorata': False}
         return res
 
diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml
index 004526b1022..77185081848 100644
--- a/addons/account_asset/account_asset_demo.xml
+++ b/addons/account_asset/account_asset_demo.xml
@@ -4,13 +4,33 @@
         <!-- 
             Asset Category Demo
         -->
-        
+
         <record id="account_asset_category_fixedassets0" model="account.asset.category">
             <field name="account_expense_depreciation_id" ref="account.a_expense"/>
             <field name="account_asset_id" ref="account.xfa"/>
             <field name="account_depreciation_id" ref="account.xfa"/>
             <field name="journal_id" ref="account.expenses_journal"/>
-            <field name="name">Fixed Assets</field>
+            <field name="name">Hardware - 3 Years</field>
+            <field name="method_number">3</field>
+        </record>
+
+        <record id="account_asset_category_sale" model="account.asset.category">
+            <field name="account_expense_depreciation_id" ref="account.a_expense"/>
+            <field name="account_asset_id" ref="account.xfa"/>
+            <field name="account_depreciation_id" ref="account.xfa"/>
+            <field name="journal_id" ref="account.expenses_journal"/>
+            <field name="name">Cars - 5 Years</field>
+            <field name="method_number">5</field>
+        </record>
+
+
+        <record id="account_asset_category_sale" model="account.asset.category">
+            <field name="account_expense_depreciation_id" ref="account.a_sale"/>
+            <field name="account_asset_id" ref="account.xfa"/>
+            <field name="account_depreciation_id" ref="account.xfa"/>
+            <field name="journal_id" ref="account.expenses_journal"/>
+            <field name="name">Revenue Recognition Maintenance Contract - 3 Years</field>
+            <field name="method_number">3</field>
         </record>
 
         <!-- 
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
old mode 100755
new mode 100644
index 167502cb09f..700832881c4
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -24,6 +24,12 @@ from osv import osv, fields
 class account_invoice(osv.osv):
 
     _inherit = 'account.invoice'
+    def action_number(self, cr, uid, ids, *args):
+        result = super(account_invoice, self).action_number(cr, uid, ids, *args)
+        for inv in self.browse(cr, uid, ids):
+            self.pool.get('account.invoice.line').asset_create(cr, uid, inv.invoice_line)
+        return result
+
     def line_get_convert(self, cr, uid, x, part, date, context=None):
         res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context=context)
         res['asset_id'] = x.get('asset_id', False)
@@ -37,13 +43,14 @@ class account_invoice_line(osv.osv):
     _columns = {
         'asset_category_id': fields.many2one('account.asset.category', 'Asset Category'),
     }
-
-    def move_line_get_item(self, cr, uid, line, context=None):
+    def asset_create(self, cr, uid, lines, context=None):
+        context = context or {}
         asset_obj = self.pool.get('account.asset.asset')
-        res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context=context)
-        if line.invoice_id and line.invoice_id.type not in ('out_invoice', 'out_refund') and line.asset_category_id:
+        for line in lines:
+            if line.asset_category_id:
                 vals = {
-                    'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name,
+                    'name': line.name,
+                    'code': line.invoice_id.number or False,
                     'category_id': line.asset_category_id.id,
                     'purchase_value': line.price_subtotal,
                     'period_id': line.invoice_id.period_id.id,
@@ -51,10 +58,12 @@ class account_invoice_line(osv.osv):
                     'company_id': line.invoice_id.company_id.id,
                     'currency_id': line.invoice_id.currency_id.id,
                 }
+                changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
+                vals.update(changed_vals['value'])
                 asset_id = asset_obj.create(cr, uid, vals, context=context)
                 if line.asset_category_id.open_asset:
                     asset_obj.validate(cr, uid, [asset_id], context=context)
-        return res
+        return True
 
 account_invoice_line()
 
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
old mode 100755
new mode 100644
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index f9bbf551330..d28579a6c1a 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -29,7 +29,7 @@
                     <separator string="Depreciation Method" colspan="2"/>
                     <field name="method"/>
                     <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                    <field name="prorata" attrs="{'invisible':[('method','&lt;&gt;','linear')]}"/>
+                    <field name="prorata"/>
                     <field name="open_asset"/>
                 </group>
         	<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
@@ -109,9 +109,9 @@
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Method" colspan="2"/>
-                        <field name="method" on_change="onchange_method_time(method)"/>
+                        <field name="method"/>
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                        <field name="prorata" attrs="{'invisible': ['|',('method_time','=','end'),('method','!=','linear')]}"/>
+                        <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                     </group>
                     <newline/>
                     <separator string="" colspan="4"/>
@@ -314,7 +314,7 @@
     <menuitem parent="menu_finance_config_assets" id="menu_action_account_asset_asset_list_normal" action="action_account_asset_asset_list_normal"/>
     
     <record model="ir.actions.act_window" id="action_account_asset_asset_form_normal">
-        <field name="name">Asset Categories</field>
+        <field name="name">Review Asset Categories</field>
         <field name="res_model">account.asset.category</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
diff --git a/addons/account_asset/account_asset_wizard.xml b/addons/account_asset/account_asset_wizard.xml
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
index 221100a8d25..c0f57ba432b 100755
--- a/addons/account_asset/i18n/ca.po
+++ b/addons/account_asset/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: 2009-11-24 12:54+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 21:30+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
@@ -65,7 +65,7 @@ msgstr "Canvi de durada"
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Child assets"
-msgstr ""
+msgstr "Actius fills"
 
 #. module: account_asset
 #: field:account.asset.board,value_asset:0
diff --git a/addons/account_asset/i18n/cs.po b/addons/account_asset/i18n/cs.po
new file mode 100644
index 00000000000..51c2f16eaac
--- /dev/null
+++ b/addons/account_asset/i18n/cs.po
@@ -0,0 +1,536 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_asset
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-09-04 12:15+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
+
+#. 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 "Open Assets"
+msgstr "Otevřít majetky"
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr "Datum ukončení"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr "Nástěnka odpisování"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.model,name:account_asset.model_account_asset_asset
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+msgid "Asset"
+msgstr "Majetek"
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neplatné jméno modelu v definici akce."
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr "Lineární"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr "Změnit trvání"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr "Podřízené majetky"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr "Hodnota majetku"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr "Důvod"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr "Položky"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr "Generované položky"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr "Počet rozmezí"
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr "Otevřít položky"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+msgid "Assets"
+msgstr "Majetky"
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr "Postupný"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr "Návrhy majetku"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr "Poznámky"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr "Historie změn"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr "Odpisované položky"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr "Metody"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr "Vlastnosti majetku k úpravě"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr "Společník"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr "Období pro rozmezí"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr "Trvání odpisu"
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analytický účet"
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr "Stav"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr "Odpisové metody"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr "Jiné informace"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr "Souhrnná hodnota"
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr "Metody majetků"
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neplatné XML pro zobrazení architektury!"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr "Vlastnosti majetku"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
+msgid "Compute assets"
+msgstr "Spočítat majetky"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_button:account.asset.modify,init,asset_modify:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Upravit majetek"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr "Potvrdit majetek"
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr "Historie majetku"
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr "Datum vytvoření"
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+"    Allows to define\n"
+"    * Asset category. \n"
+"    * Assets.\n"
+"    *Asset usage period and property.\n"
+"    "
+msgstr ""
+"Finanční a účetní správa majetku.\n"
+"    Umožňuje určit\n"
+"    * Kategorie majetku. \n"
+"    * Majetky.\n"
+"    * Období užití majetku a jeho vlastnosti.\n"
+"    "
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr "Hrubá hodnota"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr "Konečné období"
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr "Jméno majetku"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr "Informace účtů"
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr "Poznámka"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr "Návrh"
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr "Typ odpisové metody"
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr "Účet majetku"
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr "Metoda"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr "Obyčejný"
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr "Činitel růstu"
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr "Lokalizace"
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr "Metoda výpočtu"
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr "Časová metoda"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktivní"
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr "Uživatel"
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr "Jméno metody majetku"
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr "Čistá hodnota"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Uzavřít majetek"
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr "Historie"
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr "Odpisový účet"
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr "Období"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+msgid "Asset Category"
+msgstr "Kategorie majetku"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,end:0
+#: wizard_button:account.asset.compute,init,end:0
+#: wizard_button:account.asset.modify,init,end:0
+msgid "Cancel"
+msgstr "Zrušit"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: wizard_button:account.asset.compute,asset_compute,end:0
+#: selection:account.asset.property,state:0
+msgid "Close"
+msgstr "Zavřít"
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr "Otevřít"
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Jméno objektu musí začínat s x_ a nesmí obsahovat žádný speciální znak !"
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr "Správa majetku"
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr "Nástěnka majetku"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr "Globální stav"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr "Zpoždění"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr "Obecné informace"
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr "Analytický deník"
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr "Jméno metody"
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr "Deník"
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr "Jméno historie"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr "Uzavírací metoda"
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr "Položky majetku"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Kategorie majetku"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr "Odpisvoání"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr "Kód majetku"
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr "Celková cena"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr "Pohled"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr "Obecné info"
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr "Pořadí"
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr "Zbytková cena"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr "Konec majetku"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr "Přímý"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr "Nepřímý"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent asset"
+msgstr "Nadřazený majetek"
+
+#. 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 "Hierarchie majetku"
diff --git a/addons/account_asset/i18n/da.po b/addons/account_asset/i18n/da.po
new file mode 100644
index 00000000000..d7cd179dbc0
--- /dev/null
+++ b/addons/account_asset/i18n/da.po
@@ -0,0 +1,529 @@
+# 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: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-11-01 12:06+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. 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 "Open Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr "Slut dato"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.model,name:account_asset.model_account_asset_asset
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: 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
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_button:account.asset.modify,init,asset_modify:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+"    Allows to define\n"
+"    * Asset category. \n"
+"    * Assets.\n"
+"    *Asset usage period and property.\n"
+"    "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,end:0
+#: wizard_button:account.asset.compute,init,end:0
+#: wizard_button:account.asset.modify,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: wizard_button:account.asset.compute,asset_compute,end:0
+#: selection:account.asset.property,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent 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 ""
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 3b661604428..41ca6dd0fbe 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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
index 242f16b5bee..681cfdd005c 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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
@@ -235,7 +235,7 @@ msgstr "Histórico del activo"
 #. module: account_asset
 #: field:account.asset.property,date:0
 msgid "Date created"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: account_asset
 #: model:ir.module.module,description:account_asset.module_meta_information
diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po
new file mode 100644
index 00000000000..66cedb8b82c
--- /dev/null
+++ b/addons/account_asset/i18n/es_MX.po
@@ -0,0 +1,537 @@
+# 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: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-07-12 12:04+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. 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 "Open Assets"
+msgstr "Activos abiertos"
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr "Fecha final"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr "cuadro de drepeciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.model,name:account_asset.model_account_asset_asset
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+msgid "Asset"
+msgstr "Activo"
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo inválido en la definición de acción."
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr "Lineal"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr "Cambiar duración"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr "Activos hijos"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr "valor de activos"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr "Razón"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr "Asientos"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr "Asientos generados"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr "Numero de intervalo"
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr "Abrir asientos"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+msgid "Assets"
+msgstr "Activos"
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr "Progresivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr "Activos en estado borrador"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr "Cambio histórico"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr "Asiento de dotación a la amortización"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr "Métodos"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr "Propiedades de activos para modificar"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr "Período por intervalo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr "Plazo de amortización"
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr "Metodos de drepreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr "Otra información"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr "Valor acumulado"
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr "metodos activos"
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la estructura de la vista!"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr "Propiedad del activo"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
+msgid "Compute assets"
+msgstr "Calcular activos"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_button:account.asset.modify,init,asset_modify:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Modificar activo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr "Confirmar activo"
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr "Fecha de creación"
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+"    Allows to define\n"
+"    * Asset category. \n"
+"    * Assets.\n"
+"    *Asset usage period and property.\n"
+"    "
+msgstr ""
+"Gestión financiera y contable de activos.\n"
+"  Permite definir\n"
+"  * Categorías de activo. \n"
+"  * Activos.\n"
+"  * Período y propiedades del activo usado.\n"
+"    "
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr "Valor bruto"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr "Período final"
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr "nombre de activos"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr "información de cuentas"
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr "Tipo de método de amortización"
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr "cuenta de activos"
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr "Método"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr "Factor de progresión"
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr "Localización"
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr "metodo de computación"
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr "Método temporal"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr "Nombre de método de asiento"
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr "Valor neto"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Activo cerrado"
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr "Historia"
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr "Cuenta de amortización"
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+msgid "Asset Category"
+msgstr "Categoría de activo"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,end:0
+#: wizard_button:account.asset.compute,init,end:0
+#: wizard_button:account.asset.modify,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: wizard_button:account.asset.compute,asset_compute,end:0
+#: selection:account.asset.property,state:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr "Gestión del activo"
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr "Tablero de activos"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr "Estado global"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr "Retrasar"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr "Información general"
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr "Diario analítico"
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr "Nombre del método"
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr "Nombre histórico"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr "Método cerrado"
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr "Asientos de activo"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Categoría de activo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr "Amortización"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr "Código de activo"
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr "Valor total"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr "Vista"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr "Información general"
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr "Valor residual"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr "Final de activo"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr "Directo"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr "Indirecto"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent asset"
+msgstr "Activo padre"
+
+#. 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 "Jerarquía de activos"
diff --git a/addons/account_asset/i18n/es_VE.po b/addons/account_asset/i18n/es_VE.po
new file mode 100644
index 00000000000..66cedb8b82c
--- /dev/null
+++ b/addons/account_asset/i18n/es_VE.po
@@ -0,0 +1,537 @@
+# 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: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-07-12 12:04+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. 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 "Open Assets"
+msgstr "Activos abiertos"
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr "Fecha final"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr "cuadro de drepeciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.model,name:account_asset.model_account_asset_asset
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+msgid "Asset"
+msgstr "Activo"
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo inválido en la definición de acción."
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr "Lineal"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr "Cambiar duración"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr "Activos hijos"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr "valor de activos"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr "Razón"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr "Asientos"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr "Asientos generados"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr "Numero de intervalo"
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr "Abrir asientos"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+msgid "Assets"
+msgstr "Activos"
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr "Progresivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr "Activos en estado borrador"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr "Cambio histórico"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr "Asiento de dotación a la amortización"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr "Métodos"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr "Propiedades de activos para modificar"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr "Período por intervalo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr "Plazo de amortización"
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr "Metodos de drepreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr "Otra información"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr "Valor acumulado"
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr "metodos activos"
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la estructura de la vista!"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr "Propiedad del activo"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
+msgid "Compute assets"
+msgstr "Calcular activos"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_button:account.asset.modify,init,asset_modify:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Modificar activo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr "Confirmar activo"
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr "Fecha de creación"
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+"    Allows to define\n"
+"    * Asset category. \n"
+"    * Assets.\n"
+"    *Asset usage period and property.\n"
+"    "
+msgstr ""
+"Gestión financiera y contable de activos.\n"
+"  Permite definir\n"
+"  * Categorías de activo. \n"
+"  * Activos.\n"
+"  * Período y propiedades del activo usado.\n"
+"    "
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr "Valor bruto"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr "Período final"
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr "nombre de activos"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr "información de cuentas"
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr "Tipo de método de amortización"
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr "cuenta de activos"
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr "Método"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr "Factor de progresión"
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr "Localización"
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr "metodo de computación"
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr "Método temporal"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr "Nombre de método de asiento"
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr "Valor neto"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Activo cerrado"
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr "Historia"
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr "Cuenta de amortización"
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+msgid "Asset Category"
+msgstr "Categoría de activo"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,end:0
+#: wizard_button:account.asset.compute,init,end:0
+#: wizard_button:account.asset.modify,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: wizard_button:account.asset.compute,asset_compute,end:0
+#: selection:account.asset.property,state:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr "Gestión del activo"
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr "Tablero de activos"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr "Estado global"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr "Retrasar"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr "Información general"
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr "Diario analítico"
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr "Nombre del método"
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr "Nombre histórico"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr "Método cerrado"
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr "Asientos de activo"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Categoría de activo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr "Amortización"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr "Código de activo"
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr "Valor total"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr "Vista"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr "Información general"
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr "Valor residual"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr "Final de activo"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr "Directo"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr "Indirecto"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent asset"
+msgstr "Activo padre"
+
+#. 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 "Jerarquía de activos"
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index 470139e0958..70c5d5003cf 100755
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:54+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-09-26 12:09+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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
@@ -27,7 +27,7 @@ msgstr ""
 #: field:account.asset.property,method_end:0
 #: field:account.asset.property.history,method_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Date de Fin"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -50,17 +50,17 @@ msgstr ""
 #. module: account_asset
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action."
 
 #. module: account_asset
 #: selection:account.asset.property,method:0
 msgid "Linear"
-msgstr ""
+msgstr "Linéaire"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change duration"
-msgstr ""
+msgstr "Changer la durée"
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
@@ -75,26 +75,26 @@ msgstr ""
 #. module: account_asset
 #: wizard_field:account.asset.modify,init,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Motif"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 #: field:account.asset.asset,entry_ids:0
 #: wizard_field:account.asset.compute,asset_compute,move_ids:0
 msgid "Entries"
-msgstr ""
+msgstr "Ecritures"
 
 #. module: account_asset
 #: wizard_view:account.asset.compute,asset_compute:0
 msgid "Generated entries"
-msgstr ""
+msgstr "Écritures générées"
 
 #. module: account_asset
 #: wizard_field:account.asset.modify,init,method_delay:0
 #: field:account.asset.property,method_delay:0
 #: field:account.asset.property.history,method_delay:0
 msgid "Number of interval"
-msgstr ""
+msgstr "Période"
 
 #. module: account_asset
 #: wizard_button:account.asset.compute,asset_compute,asset_open:0
@@ -113,7 +113,7 @@ msgstr ""
 #. module: account_asset
 #: selection:account.asset.property,method:0
 msgid "Progressive"
-msgstr ""
+msgstr "Progressif"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
@@ -126,17 +126,17 @@ msgstr ""
 #: wizard_field:account.asset.modify,init,note:0
 #: view:account.asset.property.history:0
 msgid "Notes"
-msgstr ""
+msgstr "Commentaires"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change history"
-msgstr ""
+msgstr "Historique des modifications"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation entries"
-msgstr ""
+msgstr "Écritures d'amortissement"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -151,7 +151,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: account_asset
 #: wizard_field:account.asset.modify,init,method_period:0
@@ -163,32 +163,32 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation duration"
-msgstr ""
+msgstr "Durée de l'amortissement"
 
 #. module: account_asset
 #: field:account.asset.property,account_analytic_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Compte Analytique"
 
 #. module: account_asset
 #: field:account.asset.property,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation methods"
-msgstr ""
+msgstr "Méthodes d'amortissement"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Other information"
-msgstr ""
+msgstr "Autre information"
 
 #. module: account_asset
 #: field:account.asset.board,value_asset_cumul:0
 msgid "Cumul. value"
-msgstr ""
+msgstr "Valeur cumulée"
 
 #. module: account_asset
 #: view:account.asset.property:0
@@ -203,7 +203,7 @@ msgstr ""
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_property
 msgid "Asset property"
-msgstr ""
+msgstr "Propriété de l'immobilisation"
 
 #. module: account_asset
 #: wizard_view:account.asset.compute,asset_compute:0
@@ -212,30 +212,30 @@ msgstr ""
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
 #: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
 msgid "Compute assets"
-msgstr ""
+msgstr "Calculer les immobilisations"
 
 #. module: account_asset
 #: wizard_view:account.asset.modify,init:0
 #: wizard_button:account.asset.modify,init,asset_modify:0
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
 msgid "Modify asset"
-msgstr ""
+msgstr "Modifier l'immobilisation"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Confirm asset"
-msgstr ""
+msgstr "Confirmer l'immobilisation"
 
 #. module: account_asset
 #: view:account.asset.property.history:0
 #: model:ir.model,name:account_asset.model_account_asset_property_history
 msgid "Asset history"
-msgstr ""
+msgstr "Historique de l'immobilisation"
 
 #. module: account_asset
 #: field:account.asset.property,date:0
 msgid "Date created"
-msgstr ""
+msgstr "Date de création"
 
 #. module: account_asset
 #: model:ir.module.module,description:account_asset.module_meta_information
@@ -252,7 +252,7 @@ msgstr ""
 #: field:account.asset.board,value_gross:0
 #: field:account.asset.property,value_total:0
 msgid "Gross value"
-msgstr ""
+msgstr "Valeur brute"
 
 #. module: account_asset
 #: selection:account.asset.property,method_time:0
@@ -274,48 +274,48 @@ msgstr ""
 #: field:account.asset.category,note:0
 #: field:account.asset.property.history,note:0
 msgid "Note"
-msgstr ""
+msgstr "Remarque"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: selection:account.asset.property,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouilon"
 
 #. module: account_asset
 #: field:account.asset.property,type:0
 msgid "Depr. method type"
-msgstr ""
+msgstr "Type de méthode d'immobilisation"
 
 #. module: account_asset
 #: field:account.asset.property,account_asset_id:0
 msgid "Asset account"
-msgstr ""
+msgstr "Compte d'immobilisation"
 
 #. module: account_asset
 #: field:account.asset.property.history,asset_property_id:0
 msgid "Method"
-msgstr ""
+msgstr "Méthode"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 msgid "Normal"
-msgstr ""
+msgstr "Standard"
 
 #. module: account_asset
 #: field:account.asset.property,method_progress_factor:0
 msgid "Progressif factor"
-msgstr ""
+msgstr "Facteur progressif"
 
 #. module: account_asset
 #: field:account.asset.asset,localisation:0
 msgid "Localisation"
-msgstr ""
+msgstr "Emplacement"
 
 #. module: account_asset
 #: field:account.asset.property,method:0
 msgid "Computation method"
-msgstr ""
+msgstr "Méthode de calcul"
 
 #. module: account_asset
 #: field:account.asset.property,method_time:0
@@ -325,12 +325,12 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #. module: account_asset
 #: field:account.asset.property.history,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: account_asset
 #: field:account.asset.asset,property_ids:0
@@ -341,12 +341,12 @@ msgstr ""
 #: field:account.asset.asset,date:0
 #: field:account.asset.property.history,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: account_asset
 #: field:account.asset.board,value_net:0
 msgid "Net value"
-msgstr ""
+msgstr "Valeur nette"
 
 #. module: account_asset
 #: wizard_view:account.asset.close,init:0
@@ -357,12 +357,12 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.property,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Hstorique"
 
 #. module: account_asset
 #: field:account.asset.property,account_actif_id:0
 msgid "Depreciation account"
-msgstr ""
+msgstr "Comte d'amortissement"
 
 #. module: account_asset
 #: field:account.asset.asset,period_id:0
@@ -381,19 +381,19 @@ msgstr ""
 #: wizard_button:account.asset.compute,init,end:0
 #: wizard_button:account.asset.modify,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: wizard_button:account.asset.compute,asset_compute,end:0
 #: selection:account.asset.property,state:0
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #. module: account_asset
 #: selection:account.asset.property,state:0
 msgid "Open"
-msgstr ""
+msgstr "Ouvrir"
 
 #. module: account_asset
 #: constraint:ir.model:0
@@ -416,7 +416,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,state:0
 msgid "Global state"
-msgstr ""
+msgstr "État global"
 
 #. module: account_asset
 #: selection:account.asset.property,method_time:0
@@ -431,7 +431,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.property,journal_analytic_id:0
 msgid "Analytic journal"
-msgstr ""
+msgstr "Journal analytique"
 
 #. module: account_asset
 #: field:account.asset.property,name:0
@@ -441,7 +441,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.property,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #. module: account_asset
 #: field:account.asset.property.history,name:0
@@ -464,12 +464,12 @@ msgstr ""
 #: field:account.asset.category,name:0
 #: model:ir.model,name:account_asset.model_account_asset_category
 msgid "Asset category"
-msgstr ""
+msgstr "Catégorie d'immobilisation"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation"
-msgstr ""
+msgstr "Amortissement"
 
 #. module: account_asset
 #: field:account.asset.asset,code:0
@@ -480,12 +480,12 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,value_total:0
 msgid "Total value"
-msgstr ""
+msgstr "Valeur totale"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 msgid "View"
-msgstr ""
+msgstr "Vue"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -495,17 +495,17 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
 
 #. module: account_asset
 #: field:account.asset.property,value_residual:0
 msgid "Residual value"
-msgstr ""
+msgstr "Valeur résiduelle"
 
 #. module: account_asset
 #: wizard_button:account.asset.close,init,asset_close:0
 msgid "End of asset"
-msgstr ""
+msgstr "Fin de l'immobilisation"
 
 #. module: account_asset
 #: selection:account.asset.property,type:0
@@ -515,7 +515,7 @@ msgstr ""
 #. module: account_asset
 #: selection:account.asset.property,type:0
 msgid "Indirect"
-msgstr ""
+msgstr "Indirect"
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
@@ -526,4 +526,4 @@ msgstr ""
 #: 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 "Hiérarchie des immobilisations"
diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po
new file mode 100644
index 00000000000..28b856aa75f
--- /dev/null
+++ b/addons/account_asset/i18n/hr.po
@@ -0,0 +1,529 @@
+# 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: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-10-17 21:09+0000\n"
+"Last-Translator: Ivan Marijanović <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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. 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 "Open Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.model,name:account_asset.model_account_asset_asset
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+msgid "Asset"
+msgstr "Imovina"
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešan naziv modela u definiciji akcije."
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr "Linearno"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr "Vrijednost imovine"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr "Razlog"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr "Stavke"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr "Broj razdoblja"
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr "Otvorene stavke"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+msgid "Assets"
+msgstr "Imovina"
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr "Progresivno"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_button:account.asset.modify,init,asset_modify:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+"    Allows to define\n"
+"    * Asset category. \n"
+"    * Assets.\n"
+"    *Asset usage period and property.\n"
+"    "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,end:0
+#: wizard_button:account.asset.compute,init,end:0
+#: wizard_button:account.asset.modify,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: wizard_button:account.asset.compute,asset_compute,end:0
+#: selection:account.asset.property,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent 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 ""
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
index 6783d6f0429..35c18828eea 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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index 39dfcc6ed55..126515e07a9 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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po
new file mode 100644
index 00000000000..34b41e54b2b
--- /dev/null
+++ b/addons/account_asset/i18n/pt_BR.po
@@ -0,0 +1,529 @@
+# 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: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-09-30 14:07+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: 2011-11-05 05:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. 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 "Open Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.model,name:account_asset.model_account_asset_asset
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: 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
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_button:account.asset.modify,init,asset_modify:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+"    Allows to define\n"
+"    * Asset category. \n"
+"    * Assets.\n"
+"    *Asset usage period and property.\n"
+"    "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,end:0
+#: wizard_button:account.asset.compute,init,end:0
+#: wizard_button:account.asset.modify,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: wizard_button:account.asset.compute,asset_compute,end:0
+#: selection:account.asset.property,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr ""
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr ""
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent 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 ""
diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po
index 70a3a1b2af5..f145ee77bf9 100644
--- a/addons/account_asset/i18n/ru.po
+++ b/addons/account_asset/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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
diff --git a/addons/account_asset/i18n/sr@latin.po b/addons/account_asset/i18n/sr@latin.po
new file mode 100644
index 00000000000..1b4d07213d3
--- /dev/null
+++ b/addons/account_asset/i18n/sr@latin.po
@@ -0,0 +1,536 @@
+# Serbian Latin 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: 2009-11-24 12:54+0000\n"
+"PO-Revision-Date: 2011-11-10 16:33+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: 2011-11-11 04:53+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
+
+#. 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 "Open Assets"
+msgstr "Slobodna sredstva"
+
+#. module: account_asset
+#: field:account.asset.property,method_end:0
+#: field:account.asset.property.history,method_end:0
+msgid "Ending date"
+msgstr "Datum završetka"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation board"
+msgstr "Odbor za amortizaciju"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,name:0
+#: field:account.asset.board,asset_id:0
+#: field:account.asset.property,asset_id:0
+#: field:account.invoice.line,asset_id:0
+#: field:account.move.line,asset_id:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.model,name:account_asset.model_account_asset_asset
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+msgid "Asset"
+msgstr "Sredstvo"
+
+#. module: account_asset
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Linear"
+msgstr "Linearno"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change duration"
+msgstr "Izmeni trajanje"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Child assets"
+msgstr "Dečja sredstva"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset:0
+msgid "Asset Value"
+msgstr "Vrednost sredstva"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,name:0
+msgid "Reason"
+msgstr "Razlog"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,entry_ids:0
+#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+msgid "Entries"
+msgstr "Stavke"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+msgid "Generated entries"
+msgstr "Generisane stavke"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_delay:0
+#: field:account.asset.property,method_delay:0
+#: field:account.asset.property.history,method_delay:0
+msgid "Number of interval"
+msgstr "Broj intervalâ"
+
+#. module: account_asset
+#: wizard_button:account.asset.compute,asset_compute,asset_open:0
+msgid "Open entries"
+msgstr "Otvorene stavke"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
+#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+msgid "Assets"
+msgstr "Sredstva"
+
+#. module: account_asset
+#: selection:account.asset.property,method:0
+msgid "Progressive"
+msgstr "Progresivno"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
+msgid "Draft Assets"
+msgstr "Sredstva kao zabeleške"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_field:account.asset.modify,init,note:0
+#: view:account.asset.property.history:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change history"
+msgstr "Izmeni istoriju"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation entries"
+msgstr "Stavke amortizacije"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Methods"
+msgstr "Metode"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+msgid "Asset properties to modify"
+msgstr "Osobine sredstava za izmenu"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_asset
+#: wizard_field:account.asset.modify,init,method_period:0
+#: field:account.asset.property,method_period:0
+#: field:account.asset.property.history,method_period:0
+msgid "Period per interval"
+msgstr "Period po intervalu"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation duration"
+msgstr "Trajanje amortizacije"
+
+#. module: account_asset
+#: field:account.asset.property,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analitički konto"
+
+#. module: account_asset
+#: field:account.asset.property,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation methods"
+msgstr "Metodi amortizacije"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other information"
+msgstr "Ostale Informacije"
+
+#. module: account_asset
+#: field:account.asset.board,value_asset_cumul:0
+msgid "Cumul. value"
+msgstr "Kumul. vrednost"
+
+#. module: account_asset
+#: view:account.asset.property:0
+msgid "Assets methods"
+msgstr "Metodi sredstava"
+
+#. module: account_asset
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nepravilan XML format za pregled ''Architecture''!"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_property
+msgid "Asset property"
+msgstr "Osobina sredstva"
+
+#. module: account_asset
+#: wizard_view:account.asset.compute,asset_compute:0
+#: wizard_view:account.asset.compute,init:0
+#: wizard_button:account.asset.compute,init,asset_compute:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
+msgid "Compute assets"
+msgstr "Izračunaj sredstva"
+
+#. module: account_asset
+#: wizard_view:account.asset.modify,init:0
+#: wizard_button:account.asset.modify,init,asset_modify:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Izmeni sredstvo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm asset"
+msgstr "Potvrdi sredstvo"
+
+#. module: account_asset
+#: view:account.asset.property.history:0
+#: model:ir.model,name:account_asset.model_account_asset_property_history
+msgid "Asset history"
+msgstr "Istorija sredstava"
+
+#. module: account_asset
+#: field:account.asset.property,date:0
+msgid "Date created"
+msgstr "Datum pravljenja"
+
+#. module: account_asset
+#: model:ir.module.module,description:account_asset.module_meta_information
+msgid ""
+"Financial and accounting asset management.\n"
+"    Allows to define\n"
+"    * Asset category. \n"
+"    * Assets.\n"
+"    *Asset usage period and property.\n"
+"    "
+msgstr ""
+"Uređivanje finansijskih i obračunskih sredstava.\n"
+"    Omogućava definisanje\n"
+"    *Kategorije sredstva. \n"
+"    *Sredstva.\n"
+"    *Osobinu i trajanje upotrebe sredstva.\n"
+"    "
+
+#. module: account_asset
+#: field:account.asset.board,value_gross:0
+#: field:account.asset.property,value_total:0
+msgid "Gross value"
+msgstr "Bruto vrednost"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Ending period"
+msgstr "Datum završetka"
+
+#. module: account_asset
+#: field:account.asset.board,name:0
+msgid "Asset name"
+msgstr "Naziv sredstva"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Accounts information"
+msgstr "Informacije o računu"
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.property.history,note:0
+msgid "Note"
+msgstr "Napomena"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:account.asset.property,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: account_asset
+#: field:account.asset.property,type:0
+msgid "Depr. method type"
+msgstr "Tip metode amort."
+
+#. module: account_asset
+#: field:account.asset.property,account_asset_id:0
+msgid "Asset account"
+msgstr "Račun sredstva"
+
+#. module: account_asset
+#: field:account.asset.property.history,asset_property_id:0
+msgid "Method"
+msgstr "Metod"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "Normal"
+msgstr "Normalno"
+
+#. module: account_asset
+#: field:account.asset.property,method_progress_factor:0
+msgid "Progressif factor"
+msgstr "Progresivni faktor"
+
+#. module: account_asset
+#: field:account.asset.asset,localisation:0
+msgid "Localisation"
+msgstr "Lokalizacija"
+
+#. module: account_asset
+#: field:account.asset.property,method:0
+msgid "Computation method"
+msgstr "Metod obračuna"
+
+#. module: account_asset
+#: field:account.asset.property,method_time:0
+msgid "Time method"
+msgstr "Metod vremena"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktivno"
+
+#. module: account_asset
+#: field:account.asset.property.history,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: account_asset
+#: field:account.asset.asset,property_ids:0
+msgid "Asset method name"
+msgstr "Naziv metoda sredstva"
+
+#. module: account_asset
+#: field:account.asset.asset,date:0
+#: field:account.asset.property.history,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_asset
+#: field:account.asset.board,value_net:0
+msgid "Net value"
+msgstr "Neto vrednost"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Zatvoreno sredstvo"
+
+#. module: account_asset
+#: field:account.asset.property,history_ids:0
+msgid "History"
+msgstr "Istorijat"
+
+#. module: account_asset
+#: field:account.asset.property,account_actif_id:0
+msgid "Depreciation account"
+msgstr "Račun za amortizaciju"
+
+#. module: account_asset
+#: field:account.asset.asset,period_id:0
+#: wizard_field:account.asset.compute,init,period_id:0
+msgid "Period"
+msgstr "Period"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+msgid "Asset Category"
+msgstr "Kategorija sredstva"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,end:0
+#: wizard_button:account.asset.compute,init,end:0
+#: wizard_button:account.asset.modify,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: wizard_button:account.asset.compute,asset_compute,end:0
+#: selection:account.asset.property,state:0
+msgid "Close"
+msgstr "Zatvori"
+
+#. module: account_asset
+#: selection:account.asset.property,state:0
+msgid "Open"
+msgstr "Otvori"
+
+#. module: account_asset
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime stavke mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_asset
+#: model:ir.module.module,shortdesc:account_asset.module_meta_information
+msgid "Asset management"
+msgstr "Uređivanje sredstava"
+
+#. module: account_asset
+#: view:account.asset.board:0
+#: field:account.asset.property,board_ids:0
+#: model:ir.model,name:account_asset.model_account_asset_board
+msgid "Asset board"
+msgstr "Odbor za sredstva"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+msgid "Global state"
+msgstr "Globalno stanje"
+
+#. module: account_asset
+#: selection:account.asset.property,method_time:0
+msgid "Delay"
+msgstr "Kašnjenje"
+
+#. module: account_asset
+#: wizard_view:account.asset.close,init:0
+msgid "General information"
+msgstr "Opšti podaci"
+
+#. module: account_asset
+#: field:account.asset.property,journal_analytic_id:0
+msgid "Analytic journal"
+msgstr "Analitički dnevnik"
+
+#. module: account_asset
+#: field:account.asset.property,name:0
+msgid "Method name"
+msgstr "Naziv metode"
+
+#. module: account_asset
+#: field:account.asset.property,journal_id:0
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. module: account_asset
+#: field:account.asset.property.history,name:0
+msgid "History name"
+msgstr "Naziv istorijata"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Close method"
+msgstr "Zatvorena metoda"
+
+#. module: account_asset
+#: field:account.asset.property,entry_asset_ids:0
+msgid "Asset Entries"
+msgstr "Stavke sredstava"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.asset.category,name:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Kategorija sredstva"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation"
+msgstr "Amortizacija"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+#: field:account.asset.category,code:0
+msgid "Asset code"
+msgstr "Kod sredstva"
+
+#. module: account_asset
+#: field:account.asset.asset,value_total:0
+msgid "Total value"
+msgstr "Ukupna vrednost"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+msgid "View"
+msgstr "Pregled"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General info"
+msgstr "Opšti podaci"
+
+#. module: account_asset
+#: field:account.asset.asset,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_asset
+#: field:account.asset.property,value_residual:0
+msgid "Residual value"
+msgstr "Rezidualna vrednost"
+
+#. module: account_asset
+#: wizard_button:account.asset.close,init,asset_close:0
+msgid "End of asset"
+msgstr "Kraj sredstva"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Direct"
+msgstr "Direktno"
+
+#. module: account_asset
+#: selection:account.asset.property,type:0
+msgid "Indirect"
+msgstr "Indirektno"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent asset"
+msgstr "Glavno sredstvo"
+
+#. 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 "Hijerarhija sredstava"
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index 1146496a9c4..b533d2fa5bc 100755
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
diff --git a/addons/account_asset/i18n/vi.po b/addons/account_asset/i18n/vi.po
index aa81b3aa272..28e378dded3 100644
--- a/addons/account_asset/i18n/vi.po
+++ b/addons/account_asset/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:54+0000\n"
 "PO-Revision-Date: 2011-07-20 07:54+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index b781e1cab3f..1e794eceead 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -44,13 +44,14 @@
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <group col="10" colspan="12">
-                    <filter string="This Year" icon="terp-go-year"
+                    <filter string="Year" icon="terp-go-year" name="year"
                         domain="[('purchase_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Assets purchased in current year"/>
-                    <filter string="This Month" icon="terp-go-month" name="this_month"
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-go-month" name="this_month"
                         domain="[('purchase_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Assets purchased in current month"/>
-                    <filter icon="terp-go-month" string="Previous Month" separator="1"
+                    <filter icon="terp-go-month" string="Month-1" separator="1"
                         domain="[('purchase_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Assets purchased in last month"/>
                     <separator orientation="vertical"/>
@@ -93,7 +94,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_asset_asset_report_search"/>
-        <field name="context">{'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">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;</field>
     </record>
     
diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py
index 0d2ce9879ad..45d83921a69 100755
--- a/addons/account_asset/wizard/__init__.py
+++ b/addons/account_asset/wizard/__init__.py
@@ -18,9 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+
 import account_asset_change_duration
 import wizard_asset_compute
-import wizard_asset_close
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 9ff5964637a..e4782ee0d2a 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Budget Management',
+    'name': 'Budgets',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Project Management',
     'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
diff --git a/addons/account_budget/account_budget_demo.xml b/addons/account_budget/account_budget_demo.xml
index 487c7b9eb93..d93e78e3448 100644
--- a/addons/account_budget/account_budget_demo.xml
+++ b/addons/account_budget/account_budget_demo.xml
@@ -47,15 +47,15 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-500.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_1" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-02-01'" name="date_from"/>
             <field eval="-250.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-02-28'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_2" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
@@ -63,124 +63,124 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="500.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-01-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_3" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-07'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-02-07'" name="date_from"/>
             <field eval="900.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-02-28'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_4" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-03-01'" name="date_from"/>
             <field eval="300.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-06'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-03-15'" name="date_to"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_5" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-03-16'" name="date_from"/>
             <field eval="375.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-12-03'" name="paid_date"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-03-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_6" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-04-01'" name="date_from"/>
             <field eval="-150.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-04-30'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_7" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-05-01'" name="date_from"/>
             <field eval="375.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-12-03'" name="paid_date"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-05-31'" name="date_to"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_8" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-06-01'" name="date_from"/>
             <field eval="-7500.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-06-15'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_9" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-06-16'" name="date_from"/>
             <field eval="-5000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-06-30'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_10" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-07-01'" name="date_from"/>
             <field eval="-2000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-07-15'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_11" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-07-16'" name="date_from"/>
             <field eval="20000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-07-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_12" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-08-01'" name="date_from"/>
             <field eval="20000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-08-15'" name="date_to"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_13" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-08-16'" name="date_from"/>
             <field eval="-3000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-08-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_14" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
             <field eval="-1000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-09-15'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_15" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-09-16'" name="date_from"/>
             <field eval="10000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-09-30'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_16" model="crossovered.budget.lines">
             <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
-            <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
+            <field eval="str(time.localtime(time.time())[0]+1)+'-10-01'" name="date_from"/>
             <field eval="10000.0" name="planned_amount"/>
             <field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 321014ea859..9ea8c819984 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -152,7 +152,7 @@
             <field name="model">crossovered.budget</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree colors="blue:state in ('draft');gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
+               <tree colors="blue:state == 'draft';gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
                     <field name="name" colspan="1"/>
                     <field name="code" colspan="1"/>
                     <field name="date_from"/>
@@ -170,12 +170,12 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Budget">
-                   <group col="20" colspan="4">
+                   <group>
                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
                        <separator orientation="vertical"/>
-                       <field name="name" select="1"/>
-                       <field name="code" select="1" />
+                       <field name="name"/>
+                       <field name="code" />
                        <field name="state"/>
                        <field name="date_from"/>
                        <field name="date_to"/>
@@ -204,12 +204,13 @@
             <field name="arch" type="xml">
                 <tree string="Budget Lines">
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="crossovered_budget_id" invisible="1"/>
                     <field name="general_budget_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="paid_date"/>
                     <field name="planned_amount"/>
-                    <field name="practical_amount" select="1"/>
+                    <field name="practical_amount"/>
                     <field name="theoritical_amount"/>
                     <field name="percentage"/>
                 </tree>
@@ -222,13 +223,13 @@
             <field name="arch" type="xml">
                 <form string="Budget Lines">
                     <field name="crossovered_budget_id"/>
-                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="general_budget_id" select="1"/>
+                    <field name="analytic_account_id"/>
+                    <field name="general_budget_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="paid_date" select="1"/>
-                    <field name="planned_amount" select="1"/>
-                    <field name="practical_amount" select="1"/>
+                    <field name="paid_date"/>
+                    <field name="planned_amount"/>
+                    <field name="practical_amount"/>
                     <field name="theoritical_amount"/>
                     <field name="percentage"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po
index 18071975c71..2f36348ae0c 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index e83698c6817..13288eae260 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -231,9 +231,6 @@ msgstr "Бюджетна справка за аналитична сметка"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Теоритично количество"
 
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index 684e9178784..cbd56685475 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Teoretski iznos"
 
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index 43933bf3ff7..38fcff1ab76 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -56,7 +56,7 @@ msgstr "Usuari validat"
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "Imprimeix un resum"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
@@ -97,7 +97,7 @@ msgstr "Moneda:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "Informe creuat pressupost comptable"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -131,11 +131,20 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"Un pressupost és una previsió dels ingressos i despeses esperats per la "
+"vostra companyia en un període futur. Amb un pressupost, una companyia és "
+"capaç d'observar minuciosament quants diners està ingressant en un període "
+"determinat, i pensar en la millor manera de dividir-lo entre diverses "
+"categories. En fer el seguiment dels moviments dels diners, tindreu menys "
+"tendència a una sobre-despesa, i us aproximareu més a les vostres metes "
+"financeres. Feu una previsió d'un pressupost detallant l'ingrés esperat per "
+"compte analític i monitoritzeu l'avaluació basant-vos en els valors actuals "
+"durant aquest període."
 
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "Aquest assistent s'utilitza per imprimir el resum dels pressupostos"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -152,7 +161,7 @@ msgstr "Descripció"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Divises"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -164,17 +173,17 @@ msgstr "Total :"
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "Per aprovar"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Canvia a esborrany"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -199,7 +208,7 @@ msgstr "Finalitzat"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Import pràctic"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -219,13 +228,10 @@ 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 ""
+msgstr "Informe pressupost comptable per a la comptabilitat analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Import teòric"
 
@@ -238,7 +244,7 @@ msgstr "Nom"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Línia de pressupost"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -272,7 +278,7 @@ msgstr "Codi"
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "Aquest assistent és utilitzat per imprimir el pressupost"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -292,6 +298,8 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"Error! La moneda ha de ser la mateixa que la moneda de la companyia "
+"seleccionada"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -301,7 +309,7 @@ msgstr "Cancel·lat"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprova"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -327,13 +335,13 @@ msgstr "Inici del període"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "Informe creuat resumit del pressupost comptable"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Import teòric"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -379,6 +387,35 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"Aquest mòdul permet als comptables gestionar pressupostos analítics (costos) "
+"i creuats.\n"
+"\n"
+"Una vegada que s'han definit els pressupostos principals i els pressupostos "
+"(en Comptabilitat/Pressupostats/),\n"
+"els gestors de projectes poden establir l'import previst en cada compte "
+"analític.\n"
+"\n"
+"El comptable té la possibilitat de veure el total de l'import previst per a "
+"cada\n"
+"pressupost i pressupost principal a fi de garantir que el total previst no "
+"és\n"
+"major/menor que el que havia previst per a aquest pressupost / pressupost "
+"principal.\n"
+"Cada llista de dades també pot canviar-se a una vista gràfica de la "
+"mateixa.\n"
+"\n"
+"Estan disponibles tres informes:\n"
+"1. El primer està disponible des d'una llista de pressupostos. Proporciona "
+"la difusió, per a aquests pressupostos, dels comptes analítics per "
+"pressupostos principals.\n"
+"\n"
+"2. El segon és un resum de l'anterior. Només indica la difusió, per als "
+"pressupostos seleccionats, dels comptes analítics.\n"
+"\n"
+"3. L'últim està disponible des del pla de comptes analític. Indica la "
+"difusió, per als comptes analítics seleccionats, dels pressupostos "
+"principals per pressupostos.\n"
+"\n"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -395,7 +432,7 @@ msgstr "Pressupost :"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Import previst"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -434,7 +471,7 @@ msgstr "Gestió de pressupostos"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! No podeu crear comptes analítiques recursives."
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index b5fdae822b4..e3efef5d688 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po
new file mode 100644
index 00000000000..90ba071a726
--- /dev/null
+++ b/addons/account_budget/i18n/da.po
@@ -0,0 +1,441 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-08 22:25+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Bekræftet"
+
+#. 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 ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Printed at:"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr "Godkend"
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "at"
+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 ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Currency:"
+msgstr "Valuta:"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Procentdel"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"A budget is a forecast of your company's income and expenses expected for a "
+"period in the future. With a budget, a company is able to carefully look at "
+"how much money they are taking in during a given period, and figure out the "
+"best way to divide it among various categories. By keeping track of where "
+"your money goes, you may be less likely to overspend, and more likely to "
+"meet your financial goals. Forecast a budget by detailing the expected "
+"revenue per analytic account and monitor its evolution based on the actuals "
+"realised during that period."
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_budget
+#: 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 ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Linier"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Budget"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr ""
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+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 ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Budget :"
+msgstr "Budget:"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr "Budget linier"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+#: view:crossovered.budget:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr "Budget administration"
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr ""
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index e66089607df..c7ff7c3056b 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -230,9 +230,6 @@ msgstr "Budget Auswertung Analyt. Konto"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Planwert"
 
@@ -621,40 +618,3 @@ msgstr "Analyse vom"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht unterstützt für osv_memory Objekte"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "A budget is a forecast of your company's income and expenses expected for a "
-#~ "period in the future. With a budget, a company is able to carefully look at "
-#~ "how much money they are taking in during a given period, and figure out the "
-#~ "best way to divide it among various categories. By keeping  track of where "
-#~ "your money goes, you may be less likely to overspend, and more likely to "
-#~ "meet your financial goals. Forecast a budget by detailing the expected "
-#~ "revenue per analytic account and monitor its evolution based on the actuals "
-#~ "realised during that period."
-#~ msgstr ""
-#~ "Ein Budget repräsentiert die Planung für Umsatzerlöse und Aufwendungen einer "
-#~ "zukünftigen Periode. Durch ein Budget kann das Unternehmen Kosten und "
-#~ "Umsätze insgesamt planen und auf bestimmte Kategorien verteilen. Durch eine "
-#~ "Kontrolle mit tatsächlichen Kosten und Aufwendungen kann dann verglichen "
-#~ "werden, inwieweit die Kosten und Erlöse Ihrer Planung entsprechen und dabei "
-#~ "so zeitnahe wie möglich Hinweise für erforderliche Anpassungen geben."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index a2be0f5ae5d..757187f6acc 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Θεωρητικό Ποσό"
 
@@ -596,6 +593,3 @@ msgstr "Ανάλυση απο"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος!Δεν μπορείς να δημιουργήσεις κενό Μενού"
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 9efbb55837c..6ae0f5d4d77 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -233,9 +233,6 @@ msgstr "Informe presupuesto contable para contabilidad analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Importe teórico"
 
@@ -643,41 +640,3 @@ msgstr "Análisis desde"
 #~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
 #~ "principales por presupuestos.\n"
 #~ "\n"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "A budget is a forecast of your company's income and expenses expected for a "
-#~ "period in the future. With a budget, a company is able to carefully look at "
-#~ "how much money they are taking in during a given period, and figure out the "
-#~ "best way to divide it among various categories. By keeping  track of where "
-#~ "your money goes, you may be less likely to overspend, and more likely to "
-#~ "meet your financial goals. Forecast a budget by detailing the expected "
-#~ "revenue per analytic account and monitor its evolution based on the actuals "
-#~ "realised during that period."
-#~ msgstr ""
-#~ "Un presupuesto es una previsión de ingresos y gastos esperados de su empresa "
-#~ "durante un período futuro. Con un presupuesto, una empresa es capaz de mirar "
-#~ "cuidadosamente la cantidad de dinero que manejará durante un período "
-#~ "determinado, y decidir la mejor manera de dividirlo entre diferentes "
-#~ "categorías. Llevando el seguimiento de dónde va su dinero, usted puede ser "
-#~ "menos propenso a gastar en exceso, y tiene más probabilidades de alcanzar "
-#~ "sus metas financieras. Programe un presupuesto detallando los ingresos "
-#~ "previstos por cuenta analítica y controle su evolución sobre la base de los "
-#~ "datos reales ejecutados durante ese período."
diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po
index d760e38e939..e943e9773d1 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Importe teórico"
 
diff --git a/addons/account_budget/i18n/es_EC.po b/addons/account_budget/i18n/es_EC.po
index 8ef80297e09..a60b51206cd 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -233,9 +233,6 @@ msgstr "Informe presupuesto contable para contabilidad analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Importe teórico"
 
diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po
new file mode 100644
index 00000000000..46c361de1ea
--- /dev/null
+++ b/addons/account_budget/i18n/es_MX.po
@@ -0,0 +1,642 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_budget
+#
+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-01-13 20:28+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:40+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. 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 "Posiciones presupuestarias"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr "¡El presupuesto general '%s' no tiene cuentas!"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Printed at:"
+msgstr "Impreso el:"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr "Validar usuario"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Imprimir resumen"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Fecha de pago"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "at"
+msgstr "a las"
+
+#. 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 "Imprimir presupuestos"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Currency:"
+msgstr "Moneda:"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr "Informe cruzado presupuesto contable"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "hasta"
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"A budget is a forecast of your company's income and expenses expected for a "
+"period in the future. With a budget, a company is able to carefully look at "
+"how much money they are taking in during a given period, and figure out the "
+"best way to divide it among various categories. By keeping track of where "
+"your money goes, you may be less likely to overspend, and more likely to "
+"meet your financial goals. Forecast a budget by detailing the expected "
+"revenue per analytic account and monitor its evolution based on the actuals "
+"realised during that period."
+msgstr ""
+"Un presupuesto es una previsión de los ingresos y gastos esperados por su "
+"compañía en un periodo futuro. Con un presupuesto, una compañía es capaz de "
+"observar minuciosamente cuánto dinero están ingresando en un período "
+"determinado, y pensar en la mejor manera de dividirlo entre varias "
+"categorías. Haciendo el seguimiento de los movimientos de su dinero, tendrá "
+"menos tendencia a un sobregasto, y se aproximará más a sus metas "
+"financieras. Haga una previsión de un presupuesto detallando el ingreso "
+"esperado por cuenta analítica y monitorice su evaluación basándose en los "
+"valores actuales durante ese período."
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Importe previsto"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Porc(%)"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr "Importe práctico"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr "Importe real"
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_budget
+#: 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 "Informe presupuesto contable para contabilidad analítica"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+msgid "Theoritical Amount"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr "Línea de presupuesto"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Presupuesto"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr "Este asistente es utilizado para imprimir el presupuesto"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Posición presupuestaria"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr "Inicio del período"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr "Informe cruzado resumido presupuesto contable"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Seleccione fechas del período"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+"Este módulo permite a los contables gestionar presupuestos analíticos "
+"(costes) y cruzados.\n"
+"\n"
+"Una vez que se han definido los presupuestos principales y los presupuestos "
+"(en Contabilidad/Presupuestos/),\n"
+"los gestores de proyectos pueden establecer el importe previsto en cada "
+"cuenta analítica.\n"
+"\n"
+"El contable tiene la posibilidad de ver el total del importe previsto para "
+"cada\n"
+"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
+"es\n"
+"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
+"principal.\n"
+"Cada lista de datos también puede cambiarse a una vista gráfica de la "
+"misma.\n"
+"\n"
+"Están disponibles tres informes:\n"
+"    1. El primero está disponible desde una lista de presupuestos. "
+"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
+"por presupuestos principales.\n"
+"\n"
+"    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
+"los presupuestos seleccionados, de las cuentas analíticas.\n"
+"\n"
+"    3. El último está disponible desde el plan de cuentas analítico. Indica "
+"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
+"principales por presupuestos.\n"
+"\n"
+
+#. 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 "Cuenta analítica"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Budget :"
+msgstr "Presupuesto :"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr "Importe previsto"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr "Líneas de presupuesto"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+#: view:crossovered.budget:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr "Gestión presupuestaria"
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr "Análisis desde"
+
+#~ msgid "% performance"
+#~ msgstr "% rendimiento"
+
+#~ 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 "Period"
+#~ msgstr "Período"
+
+#~ msgid "Printing date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Dotations"
+#~ msgstr "Dotaciones"
+
+#~ msgid "Performance"
+#~ msgstr "Rendimiento"
+
+#~ msgid "From"
+#~ msgstr "Desde"
+
+#~ msgid "Results"
+#~ msgstr "Resultados"
+
+#~ msgid "A/c No."
+#~ msgstr "Núm. de cuenta"
+
+#~ msgid "Period Budget"
+#~ msgstr "Período del presupuesto"
+
+#~ msgid "Budget Analysis"
+#~ msgstr "Análisis presupuestario"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Select Options"
+#~ msgstr "Seleccionar opciones"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Print Summary of Budgets"
+#~ msgstr "Imprimir resumen de presupuestos"
+
+#~ msgid "Spread amount"
+#~ msgstr "Cantidad Extendida"
+
+#~ msgid "Amount"
+#~ msgstr "Importe"
+
+#~ msgid "Total Planned Amount"
+#~ msgstr "Importe total previsto"
+
+#~ msgid "Item"
+#~ msgstr "Item"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Importe teórico"
+
+#~ msgid "Fiscal Year"
+#~ msgstr "Ejercicio fiscal"
+
+#~ msgid "Spread"
+#~ msgstr "Extensión"
+
+#~ msgid "Select period"
+#~ msgstr "Seleccionar período"
+
+#~ msgid "Analytic Account :"
+#~ msgstr "Cuenta analítica:"
+
+#, python-format
+#~ msgid "Insufficient Data!"
+#~ msgstr "¡Datos Insuficientes!"
+
+#~ msgid "Print Budget"
+#~ msgstr "Imprimir presupuestos"
+
+#~ msgid "Spreading"
+#~ msgstr "Difusión"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Budget Dotation"
+#~ msgstr "Dotación presupuestaria"
+
+#~ msgid "Budget Dotations"
+#~ msgstr "Dotaciones presupuestarias"
+
+#~ msgid "Budget Item Detail"
+#~ msgstr "Detalle de elemento presupuestario"
+
+#, python-format
+#~ msgid "No Dotations or Master Budget Expenses Found on Budget %s!"
+#~ msgstr ""
+#~ "¡No se han encontrado dotaciones o presupuestos principales de gasto en el "
+#~ "presupuesto %s!"
+
+#~ msgid ""
+#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
+#~ "\n"
+#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
+#~ "Management/Budgets/), the Project Managers can set the planned amount on "
+#~ "each\n"
+#~ "Analytic Account.\n"
+#~ "\n"
+#~ "The accountant has the possibility to see the total of amount planned for "
+#~ "each\n"
+#~ "Budget and Master Budget in order to ensure the total planned is not\n"
+#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
+#~ "of\n"
+#~ "record can also be switched to a graphical view of it.\n"
+#~ "\n"
+#~ "Three reports are available:\n"
+#~ "    1. The first is available from a list of Budgets. It gives the "
+#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+#~ "\n"
+#~ "    2. The second is a summary of the previous one, it only gives the "
+#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
+#~ "\n"
+#~ "    3. The last one is available from the Analytic Chart of Accounts. It "
+#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
+#~ "Budgets per Budgets.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
+#~ "(costes) y cruzados.\n"
+#~ "\n"
+#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
+#~ "(en Gestión\n"
+#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
+#~ "importe previsto en\n"
+#~ "cada cuenta analítica.\n"
+#~ "\n"
+#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
+#~ "cada\n"
+#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
+#~ "es\n"
+#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
+#~ "principal.\n"
+#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
+#~ "misma.\n"
+#~ "\n"
+#~ "Están disponibles tres informes:\n"
+#~ "    1. El primero está disponible desde una lista de presupuestos. "
+#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
+#~ "por presupuestos principales.\n"
+#~ "\n"
+#~ "    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
+#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
+#~ "\n"
+#~ "    3. El último está disponible desde un plan de cuentas analítico. Indica "
+#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
+#~ "principales por presupuestos.\n"
+#~ "\n"
diff --git a/addons/account_budget/i18n/es_PY.po b/addons/account_budget/i18n/es_PY.po
index 3cbd1b375e0..14ddbd1afdd 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -234,9 +234,6 @@ msgstr "Informe presupuesto contable para contabilidad analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Importe teórico"
 
diff --git a/addons/account_budget/i18n/es_VE.po b/addons/account_budget/i18n/es_VE.po
new file mode 100644
index 00000000000..46c361de1ea
--- /dev/null
+++ b/addons/account_budget/i18n/es_VE.po
@@ -0,0 +1,642 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_budget
+#
+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-01-13 20:28+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:40+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. 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 "Posiciones presupuestarias"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr "¡El presupuesto general '%s' no tiene cuentas!"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Printed at:"
+msgstr "Impreso el:"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr "Validar usuario"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Imprimir resumen"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Fecha de pago"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "at"
+msgstr "a las"
+
+#. 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 "Imprimir presupuestos"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Currency:"
+msgstr "Moneda:"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr "Informe cruzado presupuesto contable"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "hasta"
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"A budget is a forecast of your company's income and expenses expected for a "
+"period in the future. With a budget, a company is able to carefully look at "
+"how much money they are taking in during a given period, and figure out the "
+"best way to divide it among various categories. By keeping track of where "
+"your money goes, you may be less likely to overspend, and more likely to "
+"meet your financial goals. Forecast a budget by detailing the expected "
+"revenue per analytic account and monitor its evolution based on the actuals "
+"realised during that period."
+msgstr ""
+"Un presupuesto es una previsión de los ingresos y gastos esperados por su "
+"compañía en un periodo futuro. Con un presupuesto, una compañía es capaz de "
+"observar minuciosamente cuánto dinero están ingresando en un período "
+"determinado, y pensar en la mejor manera de dividirlo entre varias "
+"categorías. Haciendo el seguimiento de los movimientos de su dinero, tendrá "
+"menos tendencia a un sobregasto, y se aproximará más a sus metas "
+"financieras. Haga una previsión de un presupuesto detallando el ingreso "
+"esperado por cuenta analítica y monitorice su evaluación basándose en los "
+"valores actuales durante ese período."
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Importe previsto"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Porc(%)"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr "Importe práctico"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr "Importe real"
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_budget
+#: 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 "Informe presupuesto contable para contabilidad analítica"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+msgid "Theoritical Amount"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr "Línea de presupuesto"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Presupuesto"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr "Este asistente es utilizado para imprimir el presupuesto"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Posición presupuestaria"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr "Inicio del período"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr "Informe cruzado resumido presupuesto contable"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Seleccione fechas del período"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+"Este módulo permite a los contables gestionar presupuestos analíticos "
+"(costes) y cruzados.\n"
+"\n"
+"Una vez que se han definido los presupuestos principales y los presupuestos "
+"(en Contabilidad/Presupuestos/),\n"
+"los gestores de proyectos pueden establecer el importe previsto en cada "
+"cuenta analítica.\n"
+"\n"
+"El contable tiene la posibilidad de ver el total del importe previsto para "
+"cada\n"
+"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
+"es\n"
+"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
+"principal.\n"
+"Cada lista de datos también puede cambiarse a una vista gráfica de la "
+"misma.\n"
+"\n"
+"Están disponibles tres informes:\n"
+"    1. El primero está disponible desde una lista de presupuestos. "
+"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
+"por presupuestos principales.\n"
+"\n"
+"    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
+"los presupuestos seleccionados, de las cuentas analíticas.\n"
+"\n"
+"    3. El último está disponible desde el plan de cuentas analítico. Indica "
+"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
+"principales por presupuestos.\n"
+"\n"
+
+#. 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 "Cuenta analítica"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Budget :"
+msgstr "Presupuesto :"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr "Importe previsto"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr "Líneas de presupuesto"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+#: view:crossovered.budget:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr "Gestión presupuestaria"
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr "Análisis desde"
+
+#~ msgid "% performance"
+#~ msgstr "% rendimiento"
+
+#~ 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 "Period"
+#~ msgstr "Período"
+
+#~ msgid "Printing date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Dotations"
+#~ msgstr "Dotaciones"
+
+#~ msgid "Performance"
+#~ msgstr "Rendimiento"
+
+#~ msgid "From"
+#~ msgstr "Desde"
+
+#~ msgid "Results"
+#~ msgstr "Resultados"
+
+#~ msgid "A/c No."
+#~ msgstr "Núm. de cuenta"
+
+#~ msgid "Period Budget"
+#~ msgstr "Período del presupuesto"
+
+#~ msgid "Budget Analysis"
+#~ msgstr "Análisis presupuestario"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Select Options"
+#~ msgstr "Seleccionar opciones"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Print Summary of Budgets"
+#~ msgstr "Imprimir resumen de presupuestos"
+
+#~ msgid "Spread amount"
+#~ msgstr "Cantidad Extendida"
+
+#~ msgid "Amount"
+#~ msgstr "Importe"
+
+#~ msgid "Total Planned Amount"
+#~ msgstr "Importe total previsto"
+
+#~ msgid "Item"
+#~ msgstr "Item"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Importe teórico"
+
+#~ msgid "Fiscal Year"
+#~ msgstr "Ejercicio fiscal"
+
+#~ msgid "Spread"
+#~ msgstr "Extensión"
+
+#~ msgid "Select period"
+#~ msgstr "Seleccionar período"
+
+#~ msgid "Analytic Account :"
+#~ msgstr "Cuenta analítica:"
+
+#, python-format
+#~ msgid "Insufficient Data!"
+#~ msgstr "¡Datos Insuficientes!"
+
+#~ msgid "Print Budget"
+#~ msgstr "Imprimir presupuestos"
+
+#~ msgid "Spreading"
+#~ msgstr "Difusión"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Budget Dotation"
+#~ msgstr "Dotación presupuestaria"
+
+#~ msgid "Budget Dotations"
+#~ msgstr "Dotaciones presupuestarias"
+
+#~ msgid "Budget Item Detail"
+#~ msgstr "Detalle de elemento presupuestario"
+
+#, python-format
+#~ msgid "No Dotations or Master Budget Expenses Found on Budget %s!"
+#~ msgstr ""
+#~ "¡No se han encontrado dotaciones o presupuestos principales de gasto en el "
+#~ "presupuesto %s!"
+
+#~ msgid ""
+#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
+#~ "\n"
+#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
+#~ "Management/Budgets/), the Project Managers can set the planned amount on "
+#~ "each\n"
+#~ "Analytic Account.\n"
+#~ "\n"
+#~ "The accountant has the possibility to see the total of amount planned for "
+#~ "each\n"
+#~ "Budget and Master Budget in order to ensure the total planned is not\n"
+#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
+#~ "of\n"
+#~ "record can also be switched to a graphical view of it.\n"
+#~ "\n"
+#~ "Three reports are available:\n"
+#~ "    1. The first is available from a list of Budgets. It gives the "
+#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+#~ "\n"
+#~ "    2. The second is a summary of the previous one, it only gives the "
+#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
+#~ "\n"
+#~ "    3. The last one is available from the Analytic Chart of Accounts. It "
+#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
+#~ "Budgets per Budgets.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
+#~ "(costes) y cruzados.\n"
+#~ "\n"
+#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
+#~ "(en Gestión\n"
+#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
+#~ "importe previsto en\n"
+#~ "cada cuenta analítica.\n"
+#~ "\n"
+#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
+#~ "cada\n"
+#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
+#~ "es\n"
+#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
+#~ "principal.\n"
+#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
+#~ "misma.\n"
+#~ "\n"
+#~ "Están disponibles tres informes:\n"
+#~ "    1. El primero está disponible desde una lista de presupuestos. "
+#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
+#~ "por presupuestos principales.\n"
+#~ "\n"
+#~ "    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
+#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
+#~ "\n"
+#~ "    3. El último está disponible desde un plan de cuentas analítico. Indica "
+#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
+#~ "principales por presupuestos.\n"
+#~ "\n"
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index e75065e23e0..0808926c74d 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Teoreetiline summa"
 
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index da875c23be8..f85f7c39863 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -26,12 +26,12 @@ msgstr "Käyttäjätilit"
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Vastuukäyttäjä"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -43,12 +43,12 @@ msgstr ""
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The General Budget '%s' has no Accounts!"
-msgstr ""
+msgstr "Yleisbudjetilla '%s' ei ole tilejä!"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Tulostettu:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -58,17 +58,17 @@ msgstr "Vahvista"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "Vahvista käyttäjä"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "Tulosta yhteenveto"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "Maksupäivä"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_to:0
@@ -87,7 +87,7 @@ msgstr "Luonnos"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr ""
+msgstr "sijainnissa"
 
 #. module: account_budget
 #: view:account.budget.report:0
@@ -104,22 +104,22 @@ msgstr "Valuutta:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "Tilibudjetin ristiinvertaus raportti"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "Prosenttiosuus"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "to"
-msgstr ""
+msgstr "Kohteelle"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
@@ -142,7 +142,7 @@ msgstr ""
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "Tätä velhoa käytetään tulostamaa budjettien yhteenveto"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -159,7 +159,7 @@ msgstr "Kuvaus"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuutta"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -171,30 +171,30 @@ msgstr "Yhteensä:"
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "Hyväksyttävät"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Palauta luonnokseksi"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "Suunniteltu määrä"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Prosenttosuus (%)"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -206,7 +206,7 @@ msgstr "Valmis"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Käytännön määrä"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -214,7 +214,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "Käytännön määrä"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
@@ -226,15 +226,12 @@ msgstr "Loppupvm"
 #: 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 "Tilibudjetti raportti analyyttiselle tilille"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "Teoreettinen määrä"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -245,13 +242,13 @@ msgstr "Nimi"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Budjettirivi"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 #: view:account.budget.post:0
 msgid "Lines"
-msgstr ""
+msgstr "Rivit"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -298,7 +295,7 @@ msgstr "Budjetit"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -308,7 +305,7 @@ msgstr "Peruutettu"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -340,7 +337,7 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Teoreettinen määrä"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -348,7 +345,7 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Select Dates Period"
-msgstr ""
+msgstr "Valittu aikajakso"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -402,7 +399,7 @@ msgstr "Budjetti :"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Suunniteltu määrä"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -435,13 +432,13 @@ msgstr "Budjetointi"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "Analyysi kohteesta"
 
 #~ msgid "Performance"
 #~ msgstr "Tehokkuus"
@@ -469,3 +466,6 @@ msgstr ""
 
 #~ msgid "Select period"
 #~ msgstr "Valitse jakso"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Teoreettinen määrä"
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 20badf49ca5..c87f0069f8d 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -232,9 +232,6 @@ msgstr "Rapport de compte budgétaire pour le compte analytique"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Montant Théorique"
 
@@ -556,23 +553,3 @@ msgstr "Analyse de"
 
 #~ msgid "Print Budget"
 #~ msgstr "Impression du Budget"
-
-#~ msgid ""
-#~ "A budget is a forecast of your company's income and expenses expected for a "
-#~ "period in the future. With a budget, a company is able to carefully look at "
-#~ "how much money they are taking in during a given period, and figure out the "
-#~ "best way to divide it among various categories. By keeping  track of where "
-#~ "your money goes, you may be less likely to overspend, and more likely to "
-#~ "meet your financial goals. Forecast a budget by detailing the expected "
-#~ "revenue per analytic account and monitor its evolution based on the actuals "
-#~ "realised during that period."
-#~ msgstr ""
-#~ "Un budget est une prévision des revenus et des dépenses de l'entreprise sur "
-#~ "une période dans le futur. Avec un budget, une société est capable de voir "
-#~ "attentivement sur combien d'argent elle peut compter pendant une période "
-#~ "donnée, et trouver la meilleure façon de le partager sur plusieurs "
-#~ "catégories. En gardant une trace d'où l'argent va, vous serez probablement "
-#~ "en mesure de réduire les dépassements et également d'atteindre vos objectifs "
-#~ "financiers. Prévoyez un budget en détaillant les revenus espérés par comptes "
-#~ "analytiques et surveillez leur évolution en se basant sur les dépenses "
-#~ "réelles au cours de cette période."
diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po
index 5a3833ef847..28601915199 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -234,9 +234,6 @@ msgstr "Informe contable dos Presupostos por conta analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Importe teórico"
 
diff --git a/addons/account_budget/i18n/he.po b/addons/account_budget/i18n/he.po
index 9b3fa91ee30..5002f618e1d 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: 2011-07-09 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a7200190160..89e92d81c7d 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Theoritical राशि"
 
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index 067d45449ef..c8c6be45eaf 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-08-02 21:04+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Teoretski iznos"
 
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index a579edc7244..eea72c6cffe 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-30 16:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -230,9 +231,6 @@ msgstr "Terv a gyűjtőkódokra"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Elméleti összeg"
 
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index dd40c9b6efc..a0ba53b86a5 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index c7bc5d78de9..1fdf9a8b8a3 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Importo teorico"
 
@@ -533,21 +530,3 @@ msgstr "Maschera Analisi"
 
 #~ msgid "Budget Dotations"
 #~ msgstr "Dotazione di bilancio"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate per gli oggetti: osv_memory!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index 3e15ce216eb..cecb1b841ab 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "이론적 금액"
 
diff --git a/addons/account_budget/i18n/lo.po b/addons/account_budget/i18n/lo.po
index c7ecc6325c0..307088dd384 100644
--- a/addons/account_budget/i18n/lo.po
+++ b/addons/account_budget/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 3c2974118f5..acd3f2ce1b7 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/lv.po b/addons/account_budget/i18n/lv.po
index 371c6a1eefc..d06876ea7c1 100644
--- a/addons/account_budget/i18n/lv.po
+++ b/addons/account_budget/i18n/lv.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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "Atbildīgais lietotājs"
+msgstr "Atbildīgais Lietotājs"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -31,13 +31,13 @@ msgstr "Apstiprināts"
 #: 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 "Budžeta Stāvoklis"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The General Budget '%s' has no Accounts!"
-msgstr "Vispārīgajam budžetam '%s' nav kontu!"
+msgstr "Kopējam budžetam '%s' nav Kontu!"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -52,17 +52,17 @@ msgstr "Apstiprināt"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr "Pārbaudīt lietotāju"
+msgstr "Pārbaudīt Lietotāju"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr "Drukāt kopsavilkumu"
+msgstr "Drukāt Kopsavilkumu"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr "Apmaksas datums"
+msgstr "Apmaksas Datums"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_to:0
@@ -81,14 +81,14 @@ msgstr "Melnraksts"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr ""
+msgstr "uz"
 
 #. 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 "Drukāt budžetus"
+msgstr "Drukāt Budžetus"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -98,17 +98,17 @@ msgstr "Valūta:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "Konta Budžeta krusteniskā atskaite"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr "Pārbaudīts"
+msgstr "Apstiprināts"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr "Procenti"
+msgstr "Procentuālā attiecība"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -132,6 +132,13 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"Budžets ir uzņēmuma ienākumu un izdevumu prognoze nākamajam periodam. Ar "
+"budžeta palīdzību uzņēmums var rūpīgi sekot cik daudz naudas tā noteiktā "
+"laika posmā ieņem un izdomāt labāko veidu, kā sadalīt to starp dažādām "
+"izdevumu kategorijām. Sekojot līdzi šai naudas izdošanai ir iespējams "
+"mazināt iespēja pārtērēt un sekmīgāk sasniegt uzņēmuma finanšu mērķus. "
+"Prognozēt detalizētus budžeta ienākumus par katru analītisko kontu un sekot "
+"līdzi tā izpildei pamatojoties uz reālo realizāciju šajā laikā."
 
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
@@ -175,14 +182,14 @@ msgstr "Jāapstiprina"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr "Atstatīt uz melnrakstu"
+msgstr "Atstatīt uz Melnrakstu"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 msgid "Planned Amount"
-msgstr "Plānotais apjoms"
+msgstr "Plānotais Apjoms"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -200,7 +207,7 @@ msgstr "Pabeigts"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr "Praktiskais apj."
+msgstr "Praktiskais Apj."
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -208,27 +215,24 @@ msgstr "Praktiskais apj."
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr "Praktiskais apjoms"
+msgstr "Praktiskais Apjoms"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr "Beigu datums"
+msgstr "Beigu Datums"
 
 #. module: account_budget
 #: 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 "Konta budžeta atskaite analītiskam kontam"
+msgstr "Konta Budžeta atskaite analītiskam kontam"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr "Teorētiskais apjoms"
+msgstr "Teorētiskais Apjoms"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -239,7 +243,7 @@ msgstr "Nosaukums"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr "Budžeta rinda"
+msgstr "Budžeta Rinda"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -308,14 +312,14 @@ msgstr "Apstiprināt"
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr "Sākuma datums"
+msgstr "Sākuma Datums"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr ""
+msgstr "Budžeta stāvoklis"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_from:0
@@ -328,13 +332,13 @@ msgstr "Perioda sākums"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "Konta Budžeta krustiskā kopsavilkuma atskaite"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr "Teorētiskais apj."
+msgstr "Teorētiskais Apj."
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -342,7 +346,7 @@ msgstr "Teorētiskais apj."
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Select Dates Period"
-msgstr "Izvēlēties datumu periodu"
+msgstr "Izvēlēties Datumu Periodu"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -380,6 +384,26 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"Šis modulis atļauj grāmatvežiem vadīt analītiskos un krustiskos budžetus.\n"
+"\n"
+"Pēc tam, kad ir izveidoti Pamatbudžeti un Budžeti (Grāmatvedība/Budžeti/),\n"
+"Projektu Vadītāji var uzstatīt katram Analītiskajam Kontam plānoto summu.\n"
+"\n"
+"Grāmatvedim ir iespēja redzēt kopējo plānoto apjomu katram\n"
+"Budžetam un Virsbudžetam, lai pārliecinātos, ka kopējais plānotais apjoms\n"
+"nav lielāks/mazāks par viņa plānoto Budžetā/Virsbudžetā. Katru ierakstu\n"
+"sarakstu ir arī iespējams pārslēgt grafiskajā atēlojumā.\n"
+"\n"
+"Pieejamas ir trīs veidu atskaites:\n"
+"    1. Pirmā ir pieejama no Budžetu saraksta. Tā sniedz detalizētu pārskatu "
+"par šiem Budžetiem, Analītiskajiem Kontiem un Virsbudžetiem.\n"
+"\n"
+"    2. Otrā ir iepriekšējās kopsavilkums, tā tikai parāda izvēlēto Budžetu "
+"un Analītisko Kontu izvērsumu.\n"
+"\n"
+"    3. Pēdējā ir pieejama no Kontu Analītiskā Pārskata. Tā parāda izvēlēto "
+"Virsbudžeta Analītisko Kontu izvērsumu par Budžetiem.\n"
+"\n"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -396,7 +420,7 @@ msgstr "Budžets:"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr "Plānotais apj."
+msgstr "Plānotais Apj."
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -416,7 +440,7 @@ msgstr "Konti"
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr "Budžeta rindas"
+msgstr "Budžeta Rindas"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -430,7 +454,7 @@ msgstr "Atcelt"
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
 msgid "Budget Management"
-msgstr "Budžeta pārvaldība"
+msgstr "Budžeta Pārvaldība"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
@@ -442,3 +466,6 @@ msgstr "Kļūda! Nedrīkst veidot rekursīvus analītiskos kontus"
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr "Analīze no"
+
+#~ msgid "Theoretical Amount"
+#~ msgstr "Teorētiskais Apjoms"
diff --git a/addons/account_budget/i18n/mn.po b/addons/account_budget/i18n/mn.po
index 17167de904a..5e246662000 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/nb.po b/addons/account_budget/i18n/nb.po
index fa8a1ca2e91..921bdfd6176 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -232,9 +232,6 @@ msgstr "Kontobudsjett for analytisk konto"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Teoretisk Beløp"
 
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 20759e72e90..56a3847e797 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -233,9 +233,6 @@ msgstr "Begrotingsrekening rapport voor kostenrekening."
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Theoretisch bedrag"
 
@@ -602,40 +599,3 @@ msgstr "Analyse vanaf"
 
 #~ msgid "Select period"
 #~ msgstr "Kies periode"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "A budget is a forecast of your company's income and expenses expected for a "
-#~ "period in the future. With a budget, a company is able to carefully look at "
-#~ "how much money they are taking in during a given period, and figure out the "
-#~ "best way to divide it among various categories. By keeping  track of where "
-#~ "your money goes, you may be less likely to overspend, and more likely to "
-#~ "meet your financial goals. Forecast a budget by detailing the expected "
-#~ "revenue per analytic account and monitor its evolution based on the actuals "
-#~ "realised during that period."
-#~ msgstr ""
-#~ "Een budget is een prognose van de inkomsten en uitgaven van uw bedrijf over "
-#~ "een toekomstige periode. Met een budget kan een bedrijf nauwkeurig kijken "
-#~ "hoeveel geld er binnenkomt in ene periode en de beste manier bepalen om het "
-#~ "te verdelen over de verschillende categorieën. Door te volgen waar uw geld "
-#~ "heen gaat, geeft u minder snel teveel uit en bereikt u eerder uw financiële "
-#~ "doelen. Prognotiseer een budget door de verwachte omzet per kostenplaats te "
-#~ "bepalen en hun voortgang te controleren op basis van de actuele realisatie "
-#~ "in die periode."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index 601f405e4b1..72dca38afd8 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
index 27f1003f74e..5ab29078c20 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index 25df6e4a289..6ee025bbd24 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Kwota teoretyczna"
 
@@ -592,9 +589,3 @@ msgstr "Analiza od"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index e7f5cfefeea..6837a511393 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -152,7 +152,7 @@ msgstr "Descrição"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Divisa"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -164,12 +164,12 @@ msgstr "Total :"
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "Por aprovar"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Montante Teórico"
 
@@ -291,7 +288,7 @@ msgstr "Orçamentos"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Erro! A divisa tem que ser a mesma que a da empresa seleccionada"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -301,7 +298,7 @@ msgstr "Cancelado"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprovar"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -434,7 +431,7 @@ msgstr "Gestão do Orçamento"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erro! Não pode criar contas analíticas recursivas."
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index f93d6ea517e..3ad2f35f148 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -231,9 +231,6 @@ msgstr "Relatório de orçamento conta analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Valor Estimado"
 
@@ -620,41 +617,3 @@ msgstr "Análise de"
 
 #~ msgid "Select period"
 #~ msgstr "Selecione período"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regras não são suportadas por objetos osv_memory !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regra precisa ter ao menos um direito de acesso marcado."
-
-#~ msgid ""
-#~ "A budget is a forecast of your company's income and expenses expected for a "
-#~ "period in the future. With a budget, a company is able to carefully look at "
-#~ "how much money they are taking in during a given period, and figure out the "
-#~ "best way to divide it among various categories. By keeping  track of where "
-#~ "your money goes, you may be less likely to overspend, and more likely to "
-#~ "meet your financial goals. Forecast a budget by detailing the expected "
-#~ "revenue per analytic account and monitor its evolution based on the actuals "
-#~ "realised during that period."
-#~ msgstr ""
-#~ "Um orçamento é uma previsão das receitas e despesas esperadas para um "
-#~ "período no futuro da sua empresa. Com um orçamento, uma empresa é capaz de "
-#~ "examinar cuidadosamente quanto dinheiro eles estão arrecadando durante um "
-#~ "determinado período e descobrir a melhor maneira de dividi-lo entre várias "
-#~ "categorias. Para manter o controle para onde seu dinheiro vai, você pode "
-#~ "estar menos propensos a gastar mais e mais provável a atender aos seus "
-#~ "objetivos financeiros. A previsão de um orçamento detalhando a receita "
-#~ "esperada por conta analítica e monitorarar sua evolução baseada nos dados "
-#~ "efetivos realizados durante esse período."
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index 8cee83998fc..85f2e66a2b3 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Suma teoretică"
 
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index d294e609c05..4722ffed47a 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -36,7 +36,7 @@ msgstr "Бюджетные статьи"
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The General Budget '%s' has no Accounts!"
-msgstr ""
+msgstr "Основной бюджет '%s' не имеет счетов!"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -56,7 +56,7 @@ 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
@@ -97,7 +97,7 @@ 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
@@ -131,11 +131,18 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 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
 #: report:account.budget:0
@@ -152,7 +159,7 @@ msgstr "Описание"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Валюта"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -164,17 +171,17 @@ msgstr "Всего :"
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+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
@@ -199,7 +206,7 @@ msgstr "Выполнено"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Факт. сумма"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -207,7 +214,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
@@ -219,13 +226,10 @@ 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
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Теоретическая сумма"
 
@@ -238,7 +242,7 @@ msgstr "Имя"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Строка бюджета"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -272,7 +276,7 @@ msgstr "Код"
 #: 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
@@ -301,7 +305,7 @@ msgstr "Отменено"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Одобрить"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -327,13 +331,13 @@ 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
@@ -395,7 +399,7 @@ msgstr "Бюджет:"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Планируемая сумма"
 
 #. module: account_budget
 #: view:account.budget.post:0
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index ac65c6d9f34..8780f2503a7 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Teoretični znesek"
 
diff --git a/addons/account_budget/i18n/sq.po b/addons/account_budget/i18n/sq.po
index bfd1df182d0..bcf91ae6dcd 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index bf655f2da72..a6680ca7640 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -224,9 +224,6 @@ msgstr "Izvestaj Budzeta Naloga za Analiticki Konto"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Teoretski Iznos"
 
@@ -549,9 +546,3 @@ msgstr "Analiza od"
 
 #~ msgid "Select period"
 #~ msgstr "Izaberi period"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po
index 3fb411ac85a..55a5cf35391 100644
--- a/addons/account_budget/i18n/sr@latin.po
+++ b/addons/account_budget/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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-12-23 16:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-10 16:52+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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-11 04:53+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "Odgovorni Korisnik"
+msgstr "Odgovorni korisnik"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -57,7 +57,7 @@ msgstr "Potvrdi korisnika"
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr "Stampa Suamrnog"
+msgstr "Ištampaj rezime"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
@@ -76,7 +76,7 @@ msgstr "Završetak perioda"
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Draft"
-msgstr "Priprema"
+msgstr "Nacrt"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -88,7 +88,7 @@ msgstr "u"
 #: 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 "Stampa Budzeta"
+msgstr "Ištampaj Budžete"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -98,7 +98,7 @@ msgstr "Valuta:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr "Izvestaj Unakrsnog budzeta Naloga"
+msgstr "Izveštaj unakrsnog naloga budžeta"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -118,7 +118,7 @@ msgstr "do"
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr "Status"
+msgstr "Stanje"
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -132,11 +132,19 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"Budžet je predviđanje očekivanih dohodaka i  rashoda Vašeg preduzeća za "
+"jedan period u budućnosti. Sa budžetom, preduzeće može da ima uvid u to "
+"koliko novca uzima za jedan dati period, i da odredi najbolji mogući način "
+"za njegovu podelu na razne kategorije. Uz praćenje gde novac ide, biće manje "
+"izgleda za njegovo suvišno trošenje, kao i za postizanje Vaših finansijskih "
+"ciljeva. Predvidite budžet detaljisanjem očekivanog dohotka po analitičkom "
+"kontu i pratite mu razvoj baziran na aktuelnostima za vreme trajanja tog "
+"perioda."
 
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr "Ovaj carobnjak je koriscen za prikaz sumarnog budzeta"
+msgstr "Ovaj wizard se upotrebljava za štampanje rezimee budžeta"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -153,7 +161,7 @@ msgstr "Opis"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -170,12 +178,12 @@ msgstr "Preduzeće"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr "Za Odobravanje"
+msgstr "Za odobravanje"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr "Vrati na Pripremu"
+msgstr "Vrati na pripremu"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -214,38 +222,35 @@ msgstr "Stvarni iznos"
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr "Završni Datum"
+msgstr "Datum završetka"
 
 #. module: account_budget
 #: 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 "Izvestaj Budzeta Naloga za Analiticki Konto"
+msgstr "Izveštaj budžeta za nalog analitičkog konta"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr "Teoretski Iznos"
+msgstr "Teoretski iznos"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr "Lnija Budzeta"
+msgstr "Linija budžeta"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 #: view:account.budget.post:0
 msgid "Lines"
-msgstr "redova"
+msgstr "Redovi"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -255,13 +260,13 @@ msgstr "redova"
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget
 msgid "Budget"
-msgstr "Budzet"
+msgstr "Budžet"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "Error!"
-msgstr "Greška"
+msgstr "Greška!"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -273,7 +278,7 @@ msgstr "Kod"
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr "Ovaj carobnjak je koristen za prikaz budzeta"
+msgstr "Ovaj wizard se upotrebljava za štampanje budžeta"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -285,19 +290,19 @@ msgstr "Ovaj carobnjak je koristen za prikaz budzeta"
 #: model:ir.ui.menu,name:account_budget.next_id_31
 #: model:ir.ui.menu,name:account_budget.next_id_pos
 msgid "Budgets"
-msgstr "Budzeti"
+msgstr "Budžeti"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr "Отказано"
+msgstr "Otkazano"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -308,14 +313,14 @@ msgstr "Odobri"
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr "Početni datum"
+msgstr "Datum početka"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr "Budzetska pozicija"
+msgstr "Budžetska pozicija"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_from:0
@@ -323,12 +328,12 @@ msgstr "Budzetska pozicija"
 #: field:account.budget.crossvered.summary.report,date_from:0
 #: field:account.budget.report,date_from:0
 msgid "Start of period"
-msgstr "Početak razdoblja"
+msgstr "Početak perioda"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr "Izvestaj unakrsnog budzeta naloga"
+msgstr "Izvestaj rezimea budžeta za unakrsni konto"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -342,7 +347,7 @@ msgstr "Teoretska zarada"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Select Dates Period"
-msgstr "Selektuj Datume razdoblja"
+msgstr "Izaberi periode datuma"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -380,38 +385,39 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
-"Ovaj modul omogucava knjigovodjama da obradjuju analize i unakrsne budzete.\n"
+"Ovaj modul omogucava knjigovodjama da obradjuju analitičke i unakrsne "
+"budžete.\n"
 "\n"
-"Kada je jedno definisan Master Budzet i budzeti ( U knjigovodstvo/Budzeti),\n"
-"Menadzer Projekta moze da postavi planirani iznos za svaki analiticki "
+"Jednom kad se definišu Master Budžet i budžeti ( U knjigovodstvo/Budžeti),\n"
+"Menadžer projekta može da postavi planirani iznos za svaki analitički "
 "konto.\n"
 "\n"
-"Knjigovodja ima mogucnost da vidi ukupni planirani iznos za svaki\n"
-"Budzet i Master Budzet da bi osigurao da ukupno planirani iznos nije manji "
-"/veci od \n"
-"planiranog Budzeta/Master Budzeta. Svaka lista\n"
-"zapisa moze da se prebaci i u grafikon za laksi pregled iste.\n"
+"Knjigovodja ima mogućnost da vidi ukupni planirani iznos za svaki\n"
+"Budžet i Master Budžet da bi osigurao da ukupni planirani iznos nije manji "
+"/veći od \n"
+"planiranog Budžeta/Master Budžeta. Svaka lista\n"
+"zapisa može da se prebaci i u grafikon.\n"
 "\n"
-"Dostupna su TRI Izvestaja:\n"
-"    1. Prvi je dostupan iz liste Budzeta. I on daje rasipanje za te budzete, "
-"analitickog konta u odnosu na Master Budzet.\n"
-"    2.Drugi je sumarni predhodnog izvestaja, on samo daje rasispanje za "
-"selektovani Budzet analitickog konta.\n"
-"    3.Poslednji je dostupan iz Analitickog Grafikona naloga ( konta). On "
-"daje rasipanje za slektovani analiticki konto, MAster Budzeta po \n"
-"Budzetu.\n"
+"Dostupna su TRI izveštaja:\n"
+"    1. Prvi je dostupan iz liste Budžeta. Za te budžete daje rasipanje "
+"analitickog konta u odnosu na Master Budžet.\n"
+"    2.Drugi je rezime predhodnog izveštaja, daje rasipanje samo za izabrani "
+"Budžet analitičkog konta.\n"
+"    3.Poslednji je dostupan iz analitičkog grafikona naloga ( konta). On "
+"daje rasipanje za izabrani analitički konto, Master Budžeta po \n"
+"Budžetu.\n"
 "\n"
 
 #. 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 "Analitički nalog"
+msgstr "Analitički konto"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Budget :"
-msgstr "Budzet"
+msgstr "Budžet"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -437,7 +443,7 @@ msgstr "Nalozi"
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr "Budzetski Redovi"
+msgstr "Budžetske linije"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -451,12 +457,12 @@ msgstr "Otkaži"
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
 msgid "Budget Management"
-msgstr "Budzetski Menadzment"
+msgstr "Uređivanje budžeta"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
 
 #. module: account_budget
 #: report:account.budget:0
@@ -467,9 +473,6 @@ msgstr "Analiza od"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -478,9 +481,6 @@ msgstr "Analiza od"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
 #~ msgid "% performance"
 #~ msgstr "% performansa"
 
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index 9d752caaf5c..ad79f1f2bfa 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr "Bokföringsbudgetrapport för analyskonto"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Teoretisk summa"
 
@@ -503,11 +500,5 @@ msgstr "Analyser från"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Felaktig XML för Vyarkitektur!"
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index b505a6eca18..79ee2125f4a 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 3d65741bdcc..71c82944501 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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -131,6 +131,13 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"Bütçe, ileri bir dönemde firmanızın beklenilen gelir ve giderlerinin bir "
+"öngörüsüdür. Bütçe ile bir firma belirli bir dönemde firmaya ne kadar para "
+"girişi olduğunu dikkatlice izleyebilir ve bu geliri en iyi şekilde "
+"kategorilere ayırmayı yapabilir. Paranızın nereye gittiğini izleyerek daha "
+"çok para harcamanızın önüne geçebilir ve mali hedeflerinize ulaşabilirsiniz. "
+"Her analitik hesap için umulan geliri ayrıntılayarak öngörürsünüz ve dönem "
+"içindeki gerçekleşmelerini izlersiniz."
 
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
@@ -324,7 +331,7 @@ msgstr "Dönem Başlangıcı"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "Bütçe Aşımı Hesabı Raporu"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -376,6 +383,25 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"Bu modül ile muhasebeciler analitik ve aşılan bütçeleri yönetebilir.\n"
+"\n"
+"Ana Bütçe ve Büçe (Muhasebe/Bütçe de) tanımlandığında Proje Yöneticisi her\n"
+"Analitik Hesap için planlanan tutarı ayarlayabilir.\n"
+"\n"
+"Muhasebeci, planlanan toplamın planladığı Bütçe/Ana Bütçe den çok/az olup\n"
+"olmadığından emin olma imkanına sahiptir. Her kayıt listesi grafiğe de "
+"dönüştürülebilir.\n"
+"\n"
+"Üç rapor mevcuttur:\n"
+"    1. İlki, Bütçe listesinden elde edilir. Ana Bütçe başına Analitik "
+"Hesapların bu bütçe için dağılımını verir.\n"
+"\n"
+"    2. İkincisi öncekinin bir özetidir, sadece Analitik Hesapların seçilen "
+"Bütçeler için dağılımını verir.\n"
+"\n"
+"    3. Sonuncusu Analitik Hesap Planından elde edilir. Ana Bütçenin seçilen "
+"Analitik Hesaplarının her bütçe için dağılımını verir.\n"
+"\n"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index 0b21bc4003e..c9094139328 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
diff --git a/addons/account_budget/i18n/vi.po b/addons/account_budget/i18n/vi.po
index e89f6143d50..9365ede93ef 100644
--- a/addons/account_budget/i18n/vi.po
+++ b/addons/account_budget/i18n/vi.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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Người chịu trách nhiệm"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Đã được xác nhận"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -47,7 +47,7 @@ msgstr ""
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
@@ -62,7 +62,7 @@ msgstr ""
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "Ngày đã thanh toán"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_to:0
@@ -70,30 +70,30 @@ msgstr ""
 #: field:account.budget.crossvered.summary.report,date_to:0
 #: field:account.budget.report,date_to:0
 msgid "End of period"
-msgstr ""
+msgstr "Kết thúc chu kỳ"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nháp"
 
 #. 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 "In các Ngân sách"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Currency:"
-msgstr ""
+msgstr "Loại tiền:"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
@@ -108,17 +108,17 @@ msgstr ""
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "Phần trăm"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "to"
-msgstr ""
+msgstr "đến"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr ""
+msgstr "Tình trạng"
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -142,30 +142,30 @@ msgstr ""
 #: 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 "Mô tả"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Loại tiền tệ"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Total :"
-msgstr ""
+msgstr "Tổng :"
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Công ty"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -175,7 +175,7 @@ msgstr ""
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Đặt lại về Nháp"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -194,7 +194,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hoàn tất"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -214,7 +214,7 @@ msgstr ""
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Ngày kết thúc"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_analytic
@@ -224,9 +224,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
@@ -234,7 +231,7 @@ msgstr ""
 #: field:account.budget.post,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
-msgstr ""
+msgstr "Tên"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
@@ -255,19 +252,19 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget
 msgid "Budget"
-msgstr ""
+msgstr "Ngân sách"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Lỗi!"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
 #: field:crossovered.budget,code:0
 msgid "Code"
-msgstr ""
+msgstr "Mã"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -285,7 +282,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account_budget.next_id_31
 #: model:ir.ui.menu,name:account_budget.next_id_pos
 msgid "Budgets"
-msgstr ""
+msgstr "Các ngân sách"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
@@ -297,18 +294,18 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Bị hủy bỏ"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Chấp thuận"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Ngày bắt đầu"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -323,7 +320,7 @@ msgstr ""
 #: field:account.budget.crossvered.summary.report,date_from:0
 #: field:account.budget.report,date_from:0
 msgid "Start of period"
-msgstr ""
+msgstr "Bắt đầu chu kỳ"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
@@ -350,7 +347,7 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Print"
-msgstr ""
+msgstr "In"
 
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
@@ -385,12 +382,12 @@ msgstr ""
 #: field:crossovered.budget.lines,analytic_account_id:0
 #: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Tài khoản KTQT"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Budget :"
-msgstr ""
+msgstr "Ngân sức :"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -402,7 +399,7 @@ msgstr ""
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr ""
+msgstr "Các tài khoản"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -425,7 +422,7 @@ msgstr ""
 #: view:account.budget.report:0
 #: view:crossovered.budget:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
@@ -435,7 +432,7 @@ msgstr ""
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Lỗi! Bạn không thể tạo các tài khoản phân tích đệ quy."
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 1176d41b7a8..95e7a4c00a1 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "负责用户"
+msgstr "负责人"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -36,7 +36,7 @@ msgstr "预算状况"
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The General Budget '%s' has no Accounts!"
-msgstr "总预算’%s‘未设定科目！"
+msgstr "总预算“%s”没设定项！"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -51,7 +51,7 @@ 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
@@ -69,7 +69,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
@@ -92,17 +92,17 @@ msgstr "打印预算"
 #. module: account_budget
 #: report:account.budget:0
 msgid "Currency:"
-msgstr "货币:"
+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
@@ -131,6 +131,8 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"预算是针对将来的一个期间内期望的收入和费用的预测。有了预算，公司就能小心地分析在给定期间赚了多少钱，找出最佳的投资策略。跟踪你资金的去向，可以避免超支，而"
+"且最接近你的财务目标。预算的方式是细化每个辅助核算项目的预期收入，并跟踪在那个期间这些收入是否实现了。"
 
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
@@ -152,7 +154,7 @@ msgstr "说明"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr "币种"
+msgstr "币别"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -169,7 +171,7 @@ msgstr "公司"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr "待批准"
+msgstr "待审批"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -219,13 +221,10 @@ 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
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "理论金额"
 
@@ -291,7 +290,7 @@ msgstr "预算"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr "错误！此币种同选定公司的默认币种相同。"
+msgstr "错误！此币别必须是选定公司的默认币别。"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -301,7 +300,7 @@ msgstr "已取消"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr "批准"
+msgstr "审批"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -322,12 +321,12 @@ 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
@@ -379,12 +378,22 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"此模块使得会计可以管理预算。\n"
+"\n"
+"一旦输入了主预算和预算，管理层可以设置每个辅助核算项的计划金额。\n"
+"会计可以看到主预算和预算合计的金额，以避免预算合计超出主预算金额。预算列表可以以图表方式查看。\n"
+"\n"
+"有三个报表：\n"
+"1.第一个报表挂在预算列表上。此报表列出此预算在每个主预算上的辅助核算项金额。\n"
+"2.第二个报表挂在预算列表上，作为第一个报表的汇总。列出此预算上的辅助核算项金额（跨主预算）。\n"
+"3.第三个报表挂在辅助核算项树上。此报表列出此辅助核算项在每个预算上的主预算金额。\n"
+"\n"
 
 #. 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
@@ -434,7 +443,7 @@ 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
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index 8d935543c79..cc2cf55097f 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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
@@ -46,7 +46,7 @@ msgstr ""
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
@@ -61,7 +61,7 @@ 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
@@ -75,12 +75,12 @@ msgstr ""
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr ""
+msgstr "於"
 
 #. module: account_budget
 #: view:account.budget.report:0
@@ -92,7 +92,7 @@ msgstr ""
 #. module: account_budget
 #: report:account.budget:0
 msgid "Currency:"
-msgstr ""
+msgstr "貨幣:"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
@@ -102,22 +102,22 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "已驗證"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "to"
-msgstr ""
+msgstr "至"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -147,24 +147,24 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "貨幣"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Total :"
-msgstr ""
+msgstr "總計 :"
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -174,7 +174,7 @@ msgstr ""
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "退回至草案"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -193,7 +193,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -213,7 +213,7 @@ msgstr ""
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "結束日期"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_analytic
@@ -223,9 +223,6 @@ msgstr ""
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr ""
 
@@ -233,18 +230,18 @@ msgstr ""
 #: field:account.budget.post,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
-msgstr "名称"
+msgstr "名稱"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "預算明細"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 #: view:account.budget.post:0
 msgid "Lines"
-msgstr ""
+msgstr "明細"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -254,13 +251,13 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget
 msgid "Budget"
-msgstr ""
+msgstr "預算"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "錯誤!"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -284,7 +281,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account_budget.next_id_31
 #: model:ir.ui.menu,name:account_budget.next_id_pos
 msgid "Budgets"
-msgstr ""
+msgstr "預算"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
@@ -296,7 +293,7 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "取消"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -307,7 +304,7 @@ msgstr ""
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日期"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -384,12 +381,12 @@ msgstr ""
 #: 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
 msgid "Budget :"
-msgstr ""
+msgstr "預算 :"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -415,7 +412,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr ""
+msgstr "預算明細"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -424,12 +421,12 @@ msgstr ""
 #: view:account.budget.report:0
 #: view:crossovered.budget:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
 msgid "Budget Management"
-msgstr ""
+msgstr "預算管理"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
diff --git a/addons/account_budget/report/analytic_account_budget_report.rml b/addons/account_budget/report/analytic_account_budget_report.rml
index a8b957f52a5..ba89c7ed1ea 100644
--- a/addons/account_budget/report/analytic_account_budget_report.rml
+++ b/addons/account_budget/report/analytic_account_budget_report.rml
@@ -185,13 +185,13 @@
             <para style="terp_default_9"><font face="Helvetica" size="9.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc']) ]]%</para>
@@ -205,13 +205,13 @@
           <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc']) ]]%</para>
@@ -223,4 +223,4 @@
     </para>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account_budget/report/budget_report.rml b/addons/account_budget/report/budget_report.rml
index 0533042822a..4d82e8d8c1d 100644
--- a/addons/account_budget/report/budget_report.rml
+++ b/addons/account_budget/report/budget_report.rml
@@ -148,13 +148,13 @@
             <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para>
@@ -168,13 +168,13 @@
           <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font>Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]] </para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc'], digits=2) ]]%</para>
diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml
index 63db53ab5ce..b4e8e963b7d 100644
--- a/addons/account_budget/report/crossovered_budget_report.rml
+++ b/addons/account_budget/report/crossovered_budget_report.rml
@@ -163,13 +163,13 @@
             <para style="terp_default_9"><font face="Helvetica" size="10.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Account', currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], dp='Account', currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], dp='Account', currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc'],digits=2) ]]%</para>
@@ -183,13 +183,13 @@
           <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], dp='Account', currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], dp='Account', currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], dp='Account', currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc'],digits=2) ]]%</para>
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 95f3fe4a6bb..4081026b911 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -32,7 +32,6 @@
 
 		<record model="ir.values" id="account_budget_analytic_values">
 			<field name="model_id" ref="analytic.model_account_analytic_account" />
-			<field name="object" eval="1" />
 			<field name="name">Print Budgets</field>
 			<field name="key2">client_print_multi</field>
 			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_analytic'))" />
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index feaf208a351..35cf353ccde 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -31,7 +31,6 @@
 		</record>
 		<record model="ir.values" id="account_budget_crossvered_report_values">
 			<field name="model_id" ref="account_budget.model_crossovered_budget" />
-			<field name="object" eval="1" />
 			<field name="name">Print Budgets</field>
 			<field name="key2">client_print_multi</field>
 			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_report'))" />
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index 8ddcc16b01c..70f5eef38f7 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -32,7 +32,6 @@
 
 		<record model="ir.values" id="account_budget_crossvered_summary_report_values">
 			<field name="model_id" ref="account_budget.model_crossovered_budget" />
-			<field name="object" eval="1" />
 			<field name="name">Print Summary</field>
 			<field name="key2">client_print_multi</field>
 			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" />
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index 3821bfb74b2..bfa61240b3b 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -32,7 +32,6 @@
 
     <record model="ir.values" id="account_budget_report_values">
       <field name="model_id" ref="account_budget.model_account_budget_post" />
-      <field name="object" eval="1" />
       <field name="name">Budgets</field>
       <field name="key2">client_print_multi</field>
       <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_report'))" />
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index 469033ac56e..ac73a2b8c31 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Cancel Entries",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Hidden',
     'complexity': "normal",
     "description": """
 Allows cancelling accounting entries.
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 9e8b532e931..72517c9d090 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -12,5 +12,30 @@
                 </field>
             </field>
         </record>
+
+        <record id="invoice_form_cancel_inherit" model="ir.ui.view">
+            <field name="name">invoice.form.cancel.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="invoice_supplier_cancel_form_inherit" model="ir.ui.view">
+            <field name="name">invoice.supplier.cancel.form.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/account_cancel/i18n/ar.po b/addons/account_cancel/i18n/ar.po
index dce69d5fda8..d69dd7f8600 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/bg.po b/addons/account_cancel/i18n/bg.po
index 049620a069c..4e15c3acd9a 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/bn.po b/addons/account_cancel/i18n/bn.po
new file mode 100644
index 00000000000..3ba41e3969f
--- /dev/null
+++ b/addons/account_cancel/i18n/bn.po
@@ -0,0 +1,36 @@
+# Bengali 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-11-21 12:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14299)\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"
+"    মডিউলটি  'Allow cancelling entries' ফিল্ড যুক্ত করবে যা দিয়ে জাবেদা "
+"অন্তর্ভুক্তি বাতিল করা যাবে।\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "হিসাব বাতিল"
diff --git a/addons/account_cancel/i18n/br.po b/addons/account_cancel/i18n/br.po
index 486b5798e1c..8e72240b979 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/bs.po b/addons/account_cancel/i18n/bs.po
index 703a5375901..69ef52fd00f 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,6 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Računovodstvo - povrat"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za arhitekturu prikaza!"
diff --git a/addons/account_cancel/i18n/ca.po b/addons/account_cancel/i18n/ca.po
index 33211839389..b7001e84a6d 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po
index 7847dda7889..8fa64b04a48 100644
--- a/addons/account_cancel/i18n/da.po
+++ b/addons/account_cancel/i18n/da.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:14+0000\n"
-"PO-Revision-Date: 2010-11-20 07:57+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-08 10:42+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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -25,17 +25,13 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Modulet tilføjer feltet \"Tillad annullering af poster\" til formular "
+"visning af bogføringsjournalen. Hvis feltet er afkrydset tillader det "
+"brugeren at annullere poster og fakturaer.\n"
+"    "
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
-msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Modulets navn skal være unikt"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ugyldig XML for View Architecture!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Modulets certifikat-ID skal være unikt"
+msgstr "Annuller post"
diff --git a/addons/account_cancel/i18n/de.po b/addons/account_cancel/i18n/de.po
index 0fd3541b1ce..598abd8dc20 100644
--- a/addons/account_cancel/i18n/de.po
+++ b/addons/account_cancel/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,12 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Konto Storno"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po
index 5b78bb9ee73..c42844aa79f 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,13 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Ακύρωση Λογαριασμού"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr ""
-#~ "Το αναγνωριστικό πιστοποιητικό της ενότητας πρέπει να είναι μοναδικό!"
diff --git a/addons/account_cancel/i18n/en_GB.po b/addons/account_cancel/i18n/en_GB.po
new file mode 100644
index 00000000000..015e36e990f
--- /dev/null
+++ b/addons/account_cancel/i18n/en_GB.po
@@ -0,0 +1,36 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 11:46+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: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\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"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Account Cancel"
diff --git a/addons/account_cancel/i18n/es.po b/addons/account_cancel/i18n/es.po
index 1563b4eedba..6d639f1b5f5 100644
--- a/addons/account_cancel/i18n/es.po
+++ b/addons/account_cancel/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -36,12 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Cancelar asientos/facturas"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
diff --git a/addons/account_cancel/i18n/es_EC.po b/addons/account_cancel/i18n/es_EC.po
index db1c66b288d..c485f011b11 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -34,6 +34,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Cancelacion Contable"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
diff --git a/addons/account_cancel/i18n/es_MX.po b/addons/account_cancel/i18n/es_MX.po
new file mode 100644
index 00000000000..c3029cd8d53
--- /dev/null
+++ b/addons/account_cancel/i18n/es_MX.po
@@ -0,0 +1,38 @@
+# 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: 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"
+"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"
+
+#. 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"
diff --git a/addons/account_cancel/i18n/es_PY.po b/addons/account_cancel/i18n/es_PY.po
index 0ac2fc40f6b..6c0ad66b7e3 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/es_VE.po b/addons/account_cancel/i18n/es_VE.po
new file mode 100644
index 00000000000..c3029cd8d53
--- /dev/null
+++ b/addons/account_cancel/i18n/es_VE.po
@@ -0,0 +1,38 @@
+# 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: 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"
+"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"
+
+#. 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"
diff --git a/addons/account_cancel/i18n/fr.po b/addons/account_cancel/i18n/fr.po
index 2b62fd84075..859a877886b 100644
--- a/addons/account_cancel/i18n/fr.po
+++ b/addons/account_cancel/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-02 07:14+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -34,6 +34,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Annulation comptable"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/account_cancel/i18n/gl.po b/addons/account_cancel/i18n/gl.po
index 619bafae100..c7839d1da78 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/hi.po b/addons/account_cancel/i18n/hi.po
index ee691a086f3..6bcba105380 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/hr.po b/addons/account_cancel/i18n/hr.po
index bdc6b45b062..e64a2743ae6 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/hu.po b/addons/account_cancel/i18n/hu.po
index 1093c132ebf..4172fa6495a 100644
--- a/addons/account_cancel/i18n/hu.po
+++ b/addons/account_cancel/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-30 16:46+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/id.po b/addons/account_cancel/i18n/id.po
index be38b554939..e9de011cb32 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/it.po b/addons/account_cancel/i18n/it.po
index 892972f8540..c62756264eb 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,12 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Account Cancel"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzare l'architettura!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
diff --git a/addons/account_cancel/i18n/lo.po b/addons/account_cancel/i18n/lo.po
index b925f81af6a..0dc0a58e828 100644
--- a/addons/account_cancel/i18n/lo.po
+++ b/addons/account_cancel/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/lv.po b/addons/account_cancel/i18n/lv.po
new file mode 100644
index 00000000000..ecccc3fc28c
--- /dev/null
+++ b/addons/account_cancel/i18n/lv.po
@@ -0,0 +1,37 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-30 20:56+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: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\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"
+"    Modulis pievieno 'Atļaut anulējošus uzskaites žurnāla ierakstus' lauku "
+"kontu plāna formas skatā. Ja tā ir aktivēta, tā ļauj lietotājam atcelt "
+"ierakstus un rēķinus.\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Atcelt Kontu"
diff --git a/addons/account_cancel/i18n/mk.po b/addons/account_cancel/i18n/mk.po
index d2911076191..d55c4fad737 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: 2011-05-07 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -25,8 +25,13 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Модулот додава „Дозволи откажувања“ поле во формата на главаната книга. "
+"Доколку се постави на „точно“ му овозможува на корисникот да ги откажува "
+"записите и фактурите.\n"
+"    "
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
-msgstr "Откажи сметка"
+msgstr "Откажување на сметка"
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
index 5559d5778c7..ed5393e0517 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,6 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Данс цуцлах"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
diff --git a/addons/account_cancel/i18n/nb.po b/addons/account_cancel/i18n/nb.po
index e5239cd46c1..9a1b4e25f68 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/nl.po b/addons/account_cancel/i18n/nl.po
index 051ac0a28fa..2f7d7381038 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,12 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Boekingen annuleren"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/account_cancel/i18n/nl_BE.po b/addons/account_cancel/i18n/nl_BE.po
index ef298f77f0a..f213da1c87f 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: 2011-07-12 04:38+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/oc.po b/addons/account_cancel/i18n/oc.po
new file mode 100644
index 00000000000..b1f4beeb05a
--- /dev/null
+++ b/addons/account_cancel/i18n/oc.po
@@ -0,0 +1,37 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-20 09:15+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\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"
+"    Lo modul apond lo camp 'Permetre l'anullacion de las entradas' dins la "
+"vista formulari del jornal. S'es egal a Verai, aquò permet a l'utilizaire "
+"d'anullar l'entrada e la factura.\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Anullacion comptabla"
diff --git a/addons/account_cancel/i18n/pl.po b/addons/account_cancel/i18n/pl.po
index 417e0e3dd46..b0a4eb711e1 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -30,6 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Anulowanie konta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/account_cancel/i18n/pt.po b/addons/account_cancel/i18n/pt.po
index f07fa8ccd13..13783e9cd7d 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -34,12 +34,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Cancelar conta"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitectura da vista"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
diff --git a/addons/account_cancel/i18n/pt_BR.po b/addons/account_cancel/i18n/pt_BR.po
index 0351d48e242..e0bcbb5a76f 100644
--- a/addons/account_cancel/i18n/pt_BR.po
+++ b/addons/account_cancel/i18n/pt_BR.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 03:21+0000\n"
-"Last-Translator: Vinicius Dittgen - Proge.com.br <vinicius@gnucode.com>\n"
+"Last-Translator: Vinicius Dittgen - Proge.com.br <vinicius@proge.com.br>\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-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,12 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Cancelar Conta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/account_cancel/i18n/ro.po b/addons/account_cancel/i18n/ro.po
index 9bce69181ab..c2e7f11d583 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
diff --git a/addons/account_cancel/i18n/ru.po b/addons/account_cancel/i18n/ru.po
index efe4b113439..9ebff46e544 100644
--- a/addons/account_cancel/i18n/ru.po
+++ b/addons/account_cancel/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,12 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Отмена проводки"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для структуры вида!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/account_cancel/i18n/sl.po b/addons/account_cancel/i18n/sl.po
index 9a0ca91151c..c41ec1ad01d 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -25,17 +25,13 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul dodaja polje \"Dovoli preklic vnosov\" na pogled obrazca dnevnika "
+"kontov. Če je nastavljeno naOmogočeno, potem omogoča uporabniku, da prekliče "
+"vnose & račune.\n"
+"    "
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Prekliči konto"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
diff --git a/addons/account_cancel/i18n/sq.po b/addons/account_cancel/i18n/sq.po
index 2ab5fa64d02..c1c0e5109d3 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/sr.po b/addons/account_cancel/i18n/sr.po
index 8c6f649055c..f7f8850b315 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,6 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Otkazi Nalog"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
diff --git a/addons/account_cancel/i18n/sr@latin.po b/addons/account_cancel/i18n/sr@latin.po
index e067bc9d59e..fb33910c001 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: 2011-06-05 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,6 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Poništi Nalog"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
diff --git a/addons/account_cancel/i18n/sv.po b/addons/account_cancel/i18n/sv.po
index bfcb0a95084..d5c21fe9a69 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: 2011-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,12 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Avbryt konto"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
diff --git a/addons/account_cancel/i18n/ta.po b/addons/account_cancel/i18n/ta.po
index b62328792b6..e4353fab643 100644
--- a/addons/account_cancel/i18n/ta.po
+++ b/addons/account_cancel/i18n/ta.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
-"Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
+"Last-Translator: ஆமாச்சு <ramadasan@amachu.net>\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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,6 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "கணக்கை இரத்து செய்க"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "காட்சி கட்டமைப்பிற்கு ஒவ்வாத XML"
diff --git a/addons/account_cancel/i18n/tr.po b/addons/account_cancel/i18n/tr.po
index b684f17be3e..4714f55b843 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -35,6 +35,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
 msgstr "Hesabı iptal et"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/account_cancel/i18n/vi.po b/addons/account_cancel/i18n/vi.po
index 4b361b57c58..f4a40c354f5 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -25,6 +25,10 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Module thêm 'Cho phép hủy bỏ mục'trên xem mẫu của tạp chí tài khoản. Nếu "
+"thiết lập là đúng nó cho phép người dùng để hủy bỏ các mục và hoá đơn\n"
+"    "
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
diff --git a/addons/account_cancel/i18n/zh_CN.po b/addons/account_cancel/i18n/zh_CN.po
index 7dff774e4ec..1e347ad5ec6 100644
--- a/addons/account_cancel/i18n/zh_CN.po
+++ b/addons/account_cancel/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-04-12 12:51+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -26,7 +26,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    此模块在凭证簿界面增加了一个“允许作废”的字段。如勾选了此选项，这个凭证簿的会计凭证或发票允许作废。\n"
+"    此模块在账簿界面增加了一个“允许作废”的字段。如勾选了此选项，这个账簿的凭证或发票允许作废。\n"
 "    "
 
 #. module: account_cancel
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index 2b958c4a943..948f13b5dcb 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Charts of Accounts',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Hidden',
     'description': """
 Remove minimal account chart.
 =============================
diff --git a/addons/account_chart/i18n/ar.po b/addons/account_chart/i18n/ar.po
index bcf56e255fd..67be0483587 100644
--- a/addons/account_chart/i18n/ar.po
+++ b/addons/account_chart/i18n/ar.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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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_chart/i18n/bg.po b/addons/account_chart/i18n/bg.po
index d81a1f6790c..30cc40855ea 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e036d98037d..cf93513fae4 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b62ab7e1074..c119f58656d 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 85d4a81cbcb..3162f7f81b9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c5f9e563af4..21f9528cfe6 100644
--- a/addons/account_chart/i18n/da.po
+++ b/addons/account_chart/i18n/da.po
@@ -8,27 +8,21 @@ 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-20 07:54+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-08 22:06+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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "Fjern minimal kontokort"
+msgstr "Fjern kontoplan"
 
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Modulets certifikat-ID skal være unikt"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Modulets navn skal være unikt"
+msgstr "Kontoplan"
diff --git a/addons/account_chart/i18n/de.po b/addons/account_chart/i18n/de.po
index 5690faecab5..254438226f3 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -26,9 +26,3 @@ msgstr "Minimalen Kontenplan entfernen"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Kontenpläne"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index 20356011a1a..90c447b58dd 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..9e0d1cb7c0b
--- /dev/null
+++ b/addons/account_chart/i18n/en_GB.po
@@ -0,0 +1,28 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 11:47+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: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Remove minimal account chart"
+
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr "Charts of Accounts"
diff --git a/addons/account_chart/i18n/es.po b/addons/account_chart/i18n/es.po
index a578f7dade0..6ba8514426a 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -26,9 +26,3 @@ msgstr "Elimina plan contable mínimo"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Planes contables"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/account_chart/i18n/es_AR.po b/addons/account_chart/i18n/es_AR.po
index 49101b8ee2d..0401cf1be5b 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e685ec5faa9..0f7d23a7d70 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_EC.po b/addons/account_chart/i18n/es_EC.po
index a439fc50905..3e64c710e70 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_MX.po b/addons/account_chart/i18n/es_MX.po
new file mode 100644
index 00000000000..756487edb46
--- /dev/null
+++ b/addons/account_chart/i18n/es_MX.po
@@ -0,0 +1,28 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_chart
+#
+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-26 07:52+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Elimina plan contable mínimo"
+
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr "Planes contables"
diff --git a/addons/account_chart/i18n/es_PY.po b/addons/account_chart/i18n/es_PY.po
index 60e5ddf59bf..48373254cc4 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_VE.po b/addons/account_chart/i18n/es_VE.po
new file mode 100644
index 00000000000..756487edb46
--- /dev/null
+++ b/addons/account_chart/i18n/es_VE.po
@@ -0,0 +1,28 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_chart
+#
+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-26 07:52+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Elimina plan contable mínimo"
+
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr "Planes contables"
diff --git a/addons/account_chart/i18n/et.po b/addons/account_chart/i18n/et.po
index d8f01c7a8de..8ba6c4eb64f 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e13be2825c7..d52be514346 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d0ee85d8253..249e3ef0819 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 553f5b19804..9f5df331ed7 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d35758536bb..85193ae6cdb 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1a5401df9f7..0b7414470fe 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e98c52ddd2e..4a06b29b6ed 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: 2011-07-11 04:51+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f83a31f9e16..8de017ade81 100644
--- a/addons/account_chart/i18n/hu.po
+++ b/addons/account_chart/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 23:12+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4949b4d2d24..0fa9ec54061 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 62bc9127477..7341cab53e2 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Rimuove il piano dei conti minimale"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Piani dei conti"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_chart/i18n/ko.po b/addons/account_chart/i18n/ko.po
index 6a015a6fe28..f0bcbc6f8b9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b3cbd192a17..954661718e5 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a13c4d64f40..9e3b011ce1d 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/lv.po b/addons/account_chart/i18n/lv.po
index 57f3446e15e..0346d44b831 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,4 +25,4 @@ msgstr "Dzēst minimālo kontu plānu"
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr "Kontu Plāns"
+msgstr "Kontu Plāni"
diff --git a/addons/account_chart/i18n/mk.po b/addons/account_chart/i18n/mk.po
index 1d60fce3d7a..1c7e8ec5e85 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: 2011-05-08 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fb5d90ce171..6dec760ec11 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2c6627413e9..bfac5ded023 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 39f1af4cd77..9f0832e83c0 100644
--- a/addons/account_chart/i18n/nl.po
+++ b/addons/account_chart/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 04:33+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"Last-Translator: Jan Verlaan @ Veritos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Verwijder 'minimaal rekeningschema'"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Grootboekschema"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/account_chart/i18n/nl_BE.po b/addons/account_chart/i18n/nl_BE.po
index fd570ee69c0..4ff6f06a672 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 57c7454ac2b..b32dc6156bb 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 62757b7b84a..741362dd100 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5f749f74eb2..1cb4f792e8f 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Remover Plano de Contas minimo"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Plano de Contas"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "A identificação do certificado do módulo deve ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po
index c9780c31de2..acd6207948c 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Remover plano de contas mínimo"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Plano de Contas"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/account_chart/i18n/ro.po b/addons/account_chart/i18n/ro.po
index 54dd579f53d..9e9d8be29ef 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Şterge planul de conturi minimal"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr ""
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
diff --git a/addons/account_chart/i18n/ru.po b/addons/account_chart/i18n/ru.po
index 0a426a7eaac..f4759389d88 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Удалите минимальный план счетов"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Планы счетов"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/account_chart/i18n/sk.po b/addons/account_chart/i18n/sk.po
index a7a0061caca..ed505af4ea5 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 11dc00b6264..2c977381d0a 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Odstrani minimalni kontni načrt"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Kontni načrt"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
diff --git a/addons/account_chart/i18n/sq.po b/addons/account_chart/i18n/sq.po
index ae6e1e2eee1..b111e2fafd9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f6718eb483f..43fe755fdaa 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fbd53d83c42..d8a00e89a0d 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: 2011-06-05 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2c040976f24..e0a46a69395 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -25,9 +25,3 @@ msgstr "Ta bort minimal kontoplan"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Kontoplan"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/account_chart/i18n/ta.po b/addons/account_chart/i18n/ta.po
index c4785b8beb4..2e6494714d3 100644
--- a/addons/account_chart/i18n/ta.po
+++ b/addons/account_chart/i18n/ta.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-07-08 14:52+0000\n"
-"Last-Translator: aalunga <Unknown>\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: 2011-07-09 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f0fd9997c95..dd573af98a8 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2e0655fa2c7..eff41ecc59a 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: 2011-05-17 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 32525fbd8e2..1d1cf96fd7e 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b8a510458c5..d137eb2d824 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -26,9 +26,3 @@ msgstr "Xóa bỏ hệ thống tài khoản tối thiểu"
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
 msgstr "Hệ thống tài khoản kế toán"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
diff --git a/addons/account_chart/i18n/zh_CN.po b/addons/account_chart/i18n/zh_CN.po
index 0ffa35386ad..88a6b3e8cb2 100644
--- a/addons/account_chart/i18n/zh_CN.po
+++ b/addons/account_chart/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-03-20 07:00+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4838f41d750..8fcea5974b9 100644
--- a/addons/account_chart/i18n/zh_TW.po
+++ b/addons/account_chart/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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index fb39bc4c5ba..dd604e41aca 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -23,7 +23,7 @@
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
     "author"    : "OpenERP SA",
-    "category"  : "Finance",
+    "category"  : "Hidden",
     'complexity': "normal",
     "description": """
 Module provides functionality to import bank statements from coda files.
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index a16e68d5ee0..c369cf7b921 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -45,7 +45,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Coda">
-                   <group col="10" colspan="4">
+                   <group>
                         <field name="journal_id" widget='selection'/>
                         <field name="date"/>
                         <field name="user_id" widget='selection'/>
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 80435de6637..481e75a526b 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/bg.po b/addons/account_coda/i18n/bg.po
index c824d1d6c2a..306feea4cdc 100644
--- a/addons/account_coda/i18n/bg.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/ca.po b/addons/account_coda/i18n/ca.po
index 49968d31ab1..6c8aeffe610 100644
--- a/addons/account_coda/i18n/ca.po
+++ b/addons/account_coda/i18n/ca.po
@@ -14,66 +14,66 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
 #: field:account.coda.import,journal_id:0
 msgid "Bank Journal"
-msgstr ""
+msgstr "Diari bancari"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda.import,note:0
 msgid "Log"
-msgstr ""
+msgstr "Registre"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
 msgid "Account Coda Import"
-msgstr ""
+msgstr "Importació comptabilitat Coda"
 
 #. module: account_coda
 #: field:account.coda,name:0
 msgid "Coda file"
-msgstr ""
+msgstr "Fitxer Coda"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: account_coda
 #: field:account.coda.import,awaiting_account:0
 msgid "Default Account for Unrecognized Movement"
-msgstr ""
+msgstr "Compte per defecte per a moviments no reconeguts"
 
 #. module: account_coda
 #: help:account.coda,date:0
 msgid "Import Date"
-msgstr ""
+msgstr "Data de l'importació"
 
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
-msgstr ""
+msgstr "Registre de la importació"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Import"
-msgstr ""
+msgstr "Importa"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda import"
-msgstr ""
+msgstr "Importa Coda"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:51
 #, python-format
 msgid "Coda file not found for bank statement !!"
-msgstr ""
+msgstr "No s'ha trobat el fitxer Coda per a l'extracte bancari!"
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -81,12 +81,14 @@ msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
 msgstr ""
+"Indiqueu aquí el compte per defecte que s'utilitzarà, si es troba l'empresa "
+"però no té el compte bancari, o si està domiciliat."
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: account_coda
 #: help:account.coda.import,def_payable:0
@@ -94,70 +96,72 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
+"Indiqueu aquí el compte a pagar que s'utilitzarà per defecte, si no es troba "
+"l'empresa."
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Search Coda"
-msgstr ""
+msgstr "Cerca Coda"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
 msgid "Coda Import Logs"
-msgstr ""
+msgstr "Històric de la importació Coda"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
-msgstr ""
+msgstr "Coda per a un compte"
 
 #. module: account_coda
 #: field:account.coda.import,def_payable:0
 msgid "Default Payable Account"
-msgstr ""
+msgstr "Compte a pagar per defecte"
 
 #. module: account_coda
 #: help:account.coda,name:0
 msgid "Store the detail of bank statements"
-msgstr ""
+msgstr "Desa el detall d'extractes bancaris."
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Obre extractes"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:167
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
+msgstr "El compte bancari %s no està definit per a l'empresa %s.\n"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
-msgstr ""
+msgstr "Importa els extractes Coda"
 
 #. module: account_coda
 #: view:account.coda.import:0
 #: model:ir.actions.act_window,name:account_coda.action_account_coda_import
 msgid "Import Coda Statement"
-msgstr ""
+msgstr "Importa l'extracte Coda"
 
 #. module: account_coda
 #: model:ir.module.module,description:account_coda.module_meta_information
@@ -167,26 +171,30 @@ msgid ""
 "    bank statements from coda files.\n"
 "    "
 msgstr ""
+"\n"
+"    El mòdul proporciona la funcionalitat per importar\n"
+"    extractes bancaris des de fitxers coda.\n"
+"    "
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Statements"
-msgstr ""
+msgstr "Extractes"
 
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
-msgstr ""
+msgstr "Coda"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Results :"
-msgstr ""
+msgstr "Resultats :"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Result of Imported Coda Statements"
-msgstr ""
+msgstr "Resultat dels extractes Coda importats"
 
 #. module: account_coda
 #: help:account.coda.import,def_receivable:0
@@ -194,66 +202,68 @@ msgid ""
 "Set here the receivable account that will be used, by default, if the "
 "partner is not found"
 msgstr ""
+"Indiqueu aquí el compte a cobrar que s'utilitzarà per defecte, si no es "
+"troba l'empresa."
 
 #. module: account_coda
 #: field:account.coda.import,coda:0
 #: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
-msgstr ""
+msgstr "Fitxer Coda"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracte bancari"
 
 #. module: account_coda
 #: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda Logs"
-msgstr ""
+msgstr "Històric Coda"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:311
 #, python-format
 msgid "Result"
-msgstr ""
+msgstr "Resultat"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Click on 'New' to select your file :"
-msgstr ""
+msgstr "Feu clic en 'Nou' per seleccionar el fitxer :"
 
 #. module: account_coda
 #: field:account.coda.import,def_receivable:0
 msgid "Default Receivable Account"
-msgstr ""
+msgstr "Compte a cobrar per defecte"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
 msgid "Generated Bank Statements"
-msgstr ""
+msgstr "Extractes bancaris generats"
 
 #. module: account_coda
 #: model:ir.module.module,shortdesc:account_coda.module_meta_information
 msgid "Account CODA - import bank statements from coda file"
-msgstr ""
+msgstr "Comptabilitat CODA - importa extractes bancaris des de fitxer Coda"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr ""
+msgstr "Configureu el diari i compte :"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda Import"
-msgstr ""
+msgstr "Importació Coda"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Diari"
diff --git a/addons/account_coda/i18n/de.po b/addons/account_coda/i18n/de.po
index f982612e961..33d2bed40a4 100644
--- a/addons/account_coda/i18n/de.po
+++ b/addons/account_coda/i18n/de.po
@@ -7,15 +7,15 @@ 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-01-13 17:16+0000\n"
+"PO-Revision-Date: 2011-08-30 17:18+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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -319,23 +319,3 @@ msgstr "Journal"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Wähle Bank Journal :"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regeln werden nur unterstützt für osv_memory Objekte !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/account_coda/i18n/el.po b/addons/account_coda/i18n/el.po
index efe6f72647c..c9e01e72a71 100644
--- a/addons/account_coda/i18n/el.po
+++ b/addons/account_coda/i18n/el.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:14+0000\n"
-"PO-Revision-Date: 2010-11-14 08:11+0000\n"
+"PO-Revision-Date: 2011-08-30 17: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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -311,6 +311,3 @@ msgstr "Ημερολόγιο"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Επιλέξτε το ημερολόγιο τράπεζά σας :"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού"
diff --git a/addons/account_coda/i18n/es.po b/addons/account_coda/i18n/es.po
index 2c157224053..d8f6e516826 100644
--- a/addons/account_coda/i18n/es.po
+++ b/addons/account_coda/i18n/es.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:14+0000\n"
-"PO-Revision-Date: 2010-12-26 07:57+0000\n"
+"PO-Revision-Date: 2011-08-30 17:18+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-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -294,21 +294,3 @@ msgstr "Diario"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Seleccione su diario bancario :"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/account_coda/i18n/es_EC.po b/addons/account_coda/i18n/es_EC.po
index 6a8208ad7eb..4a3ce3863d0 100644
--- a/addons/account_coda/i18n/es_EC.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -32,22 +32,22 @@ msgstr "Registro"
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
 msgid "Account Coda Import"
-msgstr ""
+msgstr "Contabilidad Importación Coda"
 
 #. module: account_coda
 #: field:account.coda,name:0
 msgid "Coda file"
-msgstr ""
+msgstr "Fichero Coda"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: account_coda
 #: field:account.coda.import,awaiting_account:0
 msgid "Default Account for Unrecognized Movement"
-msgstr ""
+msgstr "Cuenta por defecto para movimientos no reconocidos"
 
 #. module: account_coda
 #: help:account.coda,date:0
@@ -62,18 +62,18 @@ msgstr "Registro de importación"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda import"
-msgstr ""
+msgstr "Importar Coda"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:51
 #, python-format
 msgid "Coda file not found for bank statement !!"
-msgstr ""
+msgstr "¡No se ha encontrado el archivo Coda para el extracto bancario!"
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -81,12 +81,14 @@ msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
 msgstr ""
+"Indique aquí la cuenta por defecto que se utilizará, si se encuentra la "
+"empresa pero no tiene la cuenta bancaria, o si está domiciliado."
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: account_coda
 #: help:account.coda.import,def_payable:0
@@ -94,6 +96,8 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
+"Indique aquí la cuenta a pagar que se utilizará por defecto, si no se "
+"encuentra la empresa."
 
 #. module: account_coda
 #: view:account.coda:0
diff --git a/addons/account_coda/i18n/es_MX.po b/addons/account_coda/i18n/es_MX.po
new file mode 100644
index 00000000000..a51a1ea4036
--- /dev/null
+++ b/addons/account_coda/i18n/es_MX.po
@@ -0,0 +1,296 @@
+# 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-08-30 17:18+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Diario bancario"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Registro"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr "Contabilidad Importación Coda"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "Fichero Coda"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr "Cuenta por defecto para movimientos no reconocidos"
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Fecha de importación"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Registro de importación"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr "Importar Coda"
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr "¡No se ha encontrado el archivo Coda para el extracto bancario!"
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+"Indique aquí la cuenta por defecto que se utilizará, si se encuentra la "
+"empresa pero no tiene la cuenta bancaria, o si está domiciliado."
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+"Indique aquí la cuenta a pagar que se utilizará por defecto, si no se "
+"encuentra la empresa."
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr "Buscar Coda"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr "Historial importación Code"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr "Coda para una cuenta"
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr "Cuenta a pagar por defecto"
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "Guarda el detalle de extractos bancarios."
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr "Abrir extractos"
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr "La cuenta bancaria %s no está definida para la empresa %s.\n"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr "Importar extractos Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr "Importar extracto Coda"
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo que proporciona la funcionalidad para importar\n"
+"    extractos bancarios desde ficheros coda.\n"
+"    "
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr "Extractos"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr "Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "Resultados :"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr "Resultado de los extractos Coda importados"
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+"Indique aquí la cuenta a cobrar que se utilizará por defecto, si no se "
+"encuentra la empresa."
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr "Fichero Coda"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr "Historial Coda"
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr "Resultado"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr "Haga clic en 'Nuevo' para seleccionar su fichero :"
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr "Cuenta a cobrar por defecto"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr "Extractos bancarios generados"
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr "Contabilidad CODA - importa extractos bancarios desde fichero Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr "Configure su diario y cuenta :"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr "Importación Coda"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la estructura de la vista!"
+
+#~ msgid "Default receivable Account"
+#~ msgstr "Cuenta a recibir por defecto"
+
+#~ msgid "_Close"
+#~ msgstr "_Cerrar"
+
+#~ msgid "Generated Bank Statement"
+#~ msgstr "Extracto bancario generado"
+
+#~ msgid "_Ok"
+#~ msgstr "_Aceptar"
+
+#~ msgid "Select your bank journal :"
+#~ msgstr "Seleccione su diario bancario :"
diff --git a/addons/account_coda/i18n/es_PY.po b/addons/account_coda/i18n/es_PY.po
index 914cf2a9b17..6ef446b0b40 100644
--- a/addons/account_coda/i18n/es_PY.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/es_VE.po b/addons/account_coda/i18n/es_VE.po
new file mode 100644
index 00000000000..a51a1ea4036
--- /dev/null
+++ b/addons/account_coda/i18n/es_VE.po
@@ -0,0 +1,296 @@
+# 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-08-30 17:18+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Diario bancario"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Registro"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr "Contabilidad Importación Coda"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "Fichero Coda"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr "Cuenta por defecto para movimientos no reconocidos"
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Fecha de importación"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Registro de importación"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr "Importar Coda"
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr "¡No se ha encontrado el archivo Coda para el extracto bancario!"
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+"Indique aquí la cuenta por defecto que se utilizará, si se encuentra la "
+"empresa pero no tiene la cuenta bancaria, o si está domiciliado."
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+"Indique aquí la cuenta a pagar que se utilizará por defecto, si no se "
+"encuentra la empresa."
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr "Buscar Coda"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr "Historial importación Code"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr "Coda para una cuenta"
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr "Cuenta a pagar por defecto"
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "Guarda el detalle de extractos bancarios."
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr "Abrir extractos"
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr "La cuenta bancaria %s no está definida para la empresa %s.\n"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr "Importar extractos Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr "Importar extracto Coda"
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo que proporciona la funcionalidad para importar\n"
+"    extractos bancarios desde ficheros coda.\n"
+"    "
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr "Extractos"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr "Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "Resultados :"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr "Resultado de los extractos Coda importados"
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+"Indique aquí la cuenta a cobrar que se utilizará por defecto, si no se "
+"encuentra la empresa."
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr "Fichero Coda"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr "Historial Coda"
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr "Resultado"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr "Haga clic en 'Nuevo' para seleccionar su fichero :"
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr "Cuenta a cobrar por defecto"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr "Extractos bancarios generados"
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr "Contabilidad CODA - importa extractos bancarios desde fichero Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr "Configure su diario y cuenta :"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr "Importación Coda"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la estructura de la vista!"
+
+#~ msgid "Default receivable Account"
+#~ msgstr "Cuenta a recibir por defecto"
+
+#~ msgid "_Close"
+#~ msgstr "_Cerrar"
+
+#~ msgid "Generated Bank Statement"
+#~ msgstr "Extracto bancario generado"
+
+#~ msgid "_Ok"
+#~ msgstr "_Aceptar"
+
+#~ msgid "Select your bank journal :"
+#~ msgstr "Seleccione su diario bancario :"
diff --git a/addons/account_coda/i18n/et.po b/addons/account_coda/i18n/et.po
index c9a37fd526a..4e17c9e04a8 100644
--- a/addons/account_coda/i18n/et.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/fi.po b/addons/account_coda/i18n/fi.po
index 8daf08f08c8..3b761db8cb0 100644
--- a/addons/account_coda/i18n/fi.po
+++ b/addons/account_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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -81,6 +81,8 @@ msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
 msgstr ""
+"Aseta tähän tili jota käytetään oletuksena, jos kumppani löytyy mutta "
+"pankkitiliä ei ole määriteltynä"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -94,6 +96,7 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
+"Aseta tähän maksutili jota käytetään oletuksena, jos kumppania ei löydy"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -146,7 +149,7 @@ msgstr "Avaa tiliotteet"
 #: code:addons/account_coda/wizard/account_coda_import.py:167
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
+msgstr "Pankkitiliä %s ei ole määritelty kumppanille %s.\n"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
@@ -242,20 +245,20 @@ msgstr "Luodut tiliotteet"
 #. module: account_coda
 #: model:ir.module.module,shortdesc:account_coda.module_meta_information
 msgid "Account CODA - import bank statements from coda file"
-msgstr ""
+msgstr "CODA tili - tuo pankkitiliotteet coda tiedostosta"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr ""
+msgstr "Konfiguroi päiväkirja ja tili :"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda Import"
-msgstr ""
+msgstr "Coda tuonti"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Päiväkirja"
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
index 95d35961980..b0ca7bf37a5 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-12-31 10:33+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/gl.po b/addons/account_coda/i18n/gl.po
index 2afe72f294c..8498566d2c7 100644
--- a/addons/account_coda/i18n/gl.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po
index 76944f9dd50..f18ad9a000f 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/hu.po b/addons/account_coda/i18n/hu.po
index 7e3bbaf9957..f238def51ad 100644
--- a/addons/account_coda/i18n/hu.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/it.po b/addons/account_coda/i18n/it.po
index ab6a2cf668e..62ef473d4c9 100644
--- a/addons/account_coda/i18n/it.po
+++ b/addons/account_coda/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:14+0000\n"
-"PO-Revision-Date: 2011-01-13 08:19+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-08-30 17:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -303,18 +303,3 @@ msgstr ""
 
 #~ msgid "Coda Statements"
 #~ msgstr "Dichiarazione CODA"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate per gli oggetti: osv_memory!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almeno un diritto di accesso spuntato!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/account_coda/i18n/lv.po b/addons/account_coda/i18n/lv.po
new file mode 100644
index 00000000000..23d966ee3a0
--- /dev/null
+++ b/addons/account_coda/i18n/lv.po
@@ -0,0 +1,269 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-12 13:54+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: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Banku žurnāls"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Reģistrs"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr "Konta Pārskata Imports"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "Pārskata fails"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Grupēt pēc..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr "Noklusētais Konts Neatpazītām Kustībām"
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Importa Datums"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Importa žurnāls"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "Importēt"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr "Pārskata Imports"
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr "Bankas konta pārskata fails nav atrasts!"
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+"Iestatiet noklusējuma kontu, kas tiks izmantots, ja partneris ir atrasts, "
+"bet tam nav bankas konta vai adreses"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Uzņēmums"
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+"Uzstatiet kontu maksājumiem, kas tiks izmantots pēc noklusējuma, ja "
+"partneris nav atrasts"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr "Meklēt Pārskatā"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Lietotājs"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr "Pārskata Importa Žurnāls"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr "Konta Pārskats"
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr "Noklusētais Maksājumu Konts"
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "Saglabāt bankas pārskata detaļas"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr "Atvērtie Pārskati"
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr "Bankas konts %s partnerim %s nav definēts.\n"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr "Importēt Bankas Pārskatus"
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr "Importēt Bankas Pārskatu"
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+"\n"
+"    Modulis nodrošina iespēju importēt\n"
+"    banku pārskatus no coda failiem.\n"
+"    "
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr "Izraksti"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr "Coda"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "Rezultāti:"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr "Importēto Pārskatu Rezultāti"
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+"Uzstatiet kontu ieņēmumiem, kas tiks izmantots pēc noklusējuma, ja partneris "
+"nav atrasts"
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr "Coda Fails"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bankas Konta Izraksts"
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr "Coda Žurnāls"
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr "Rezultāts"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr "Uzspiest uz 'Jauns' lai izvēlētos savu failu:"
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr "Noklusētais Ieņēmumu Konts"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Aizvērt"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr "Ģenerētais Bankas Pārskats"
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr "Konta CODA - bankas kontu pārskatu imports no coda faila"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr "Konfigurēt Savu Žurnālu un Kontu:"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr "Pārskata Imports"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr "Žurnāls"
diff --git a/addons/account_coda/i18n/nb.po b/addons/account_coda/i18n/nb.po
index 4efcfb97fd3..e516b07fcac 100644
--- a/addons/account_coda/i18n/nb.po
+++ b/addons/account_coda/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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/nl.po b/addons/account_coda/i18n/nl.po
index b940ab8d5a5..7fb26078ec4 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/account_coda/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 06:02+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2011-08-30 17:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -317,21 +317,3 @@ msgstr "Dagboek"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Selecteer bank dagboek :"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kan geen herhalend Menu maken"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/account_coda/i18n/pl.po b/addons/account_coda/i18n/pl.po
new file mode 100644
index 00000000000..007b9e7f581
--- /dev/null
+++ b/addons/account_coda/i18n/pl.po
@@ -0,0 +1,259 @@
+# Polish 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-08-25 12:34+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: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Dziennik bankowy"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Dziennik"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Grupuj wg"
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Data importu"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_coda
+#: help:account.coda.import,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
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "Wyniki"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,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
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr ""
diff --git a/addons/account_coda/i18n/pt.po b/addons/account_coda/i18n/pt.po
index f70d84abe7c..f8a67777aa9 100644
--- a/addons/account_coda/i18n/pt.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/pt_BR.po b/addons/account_coda/i18n/pt_BR.po
index 747470302d8..ac8d0fd6c13 100644
--- a/addons/account_coda/i18n/pt_BR.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/ro.po b/addons/account_coda/i18n/ro.po
index 9a13a2d27cd..d16802c8943 100644
--- a/addons/account_coda/i18n/ro.po
+++ b/addons/account_coda/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-20 20:13+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/ru.po b/addons/account_coda/i18n/ru.po
index 837231db165..800b8204448 100644
--- a/addons/account_coda/i18n/ru.po
+++ b/addons/account_coda/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:14+0000\n"
-"PO-Revision-Date: 2010-11-29 07:47+0000\n"
+"PO-Revision-Date: 2011-08-30 17:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -37,7 +37,7 @@ msgstr ""
 #. module: account_coda
 #: field:account.coda,name:0
 msgid "Coda file"
-msgstr ""
+msgstr "Coda файл"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -67,13 +67,13 @@ msgstr "Импорт"
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda import"
-msgstr ""
+msgstr "Импорт coda"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:51
 #, python-format
 msgid "Coda file not found for bank statement !!"
-msgstr ""
+msgstr "Не найден coda файл для банковской выписки!"
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -81,6 +81,8 @@ msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
 msgstr ""
+"Установите счет, который будет использоваться, если у партнера не имеется "
+"банковского счета или он домицилирован"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -94,11 +96,13 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
+"Установите расчетный счет для использования по-умолчанию, если партнер не "
+"найден."
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Search Coda"
-msgstr ""
+msgstr "Искать Coda файл"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -115,22 +119,22 @@ msgstr "Дата"
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
 msgid "Coda Import Logs"
-msgstr ""
+msgstr "Журналы импорта Coda"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
-msgstr ""
+msgstr "coda для счета"
 
 #. module: account_coda
 #: field:account.coda.import,def_payable:0
 msgid "Default Payable Account"
-msgstr ""
+msgstr "Расчетный счет по-умолчанию"
 
 #. module: account_coda
 #: help:account.coda,name:0
 msgid "Store the detail of bank statements"
-msgstr ""
+msgstr "Сохранить детали банковской выписки"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -146,18 +150,18 @@ msgstr ""
 #: code:addons/account_coda/wizard/account_coda_import.py:167
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
+msgstr "Банковский счет %s не установлен для контрагента %s.\n"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
-msgstr ""
+msgstr "Импортировать Coda выписки"
 
 #. module: account_coda
 #: view:account.coda.import:0
 #: model:ir.actions.act_window,name:account_coda.action_account_coda_import
 msgid "Import Coda Statement"
-msgstr ""
+msgstr "Импортировать Coda выписку"
 
 #. module: account_coda
 #: model:ir.module.module,description:account_coda.module_meta_information
@@ -167,6 +171,10 @@ msgid ""
 "    bank statements from coda files.\n"
 "    "
 msgstr ""
+"\n"
+"    Модуль предоставляет функции импорта\n"
+"    банковских выписок из Coda файлов.\n"
+"    "
 
 #. module: account_coda
 #: view:account.coda:0
@@ -186,7 +194,7 @@ msgstr "Результаты:"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Result of Imported Coda Statements"
-msgstr ""
+msgstr "Результат импортированных из Coda выписок"
 
 #. module: account_coda
 #: help:account.coda.import,def_receivable:0
@@ -199,7 +207,7 @@ msgstr ""
 #: field:account.coda.import,coda:0
 #: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
-msgstr ""
+msgstr "Coda файл"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement
@@ -245,12 +253,12 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr ""
+msgstr "Настройте журнал и счет:"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda Import"
-msgstr ""
+msgstr "Импорт Coda файла"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -275,21 +283,3 @@ msgstr "Журнал"
 
 #~ msgid "_Ok"
 #~ msgstr "_Далее"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Правила не поддерживаются в объектах osv_memory !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/account_coda/i18n/sl.po b/addons/account_coda/i18n/sl.po
new file mode 100644
index 00000000000..a84148b86a4
--- /dev/null
+++ b/addons/account_coda/i18n/sl.po
@@ -0,0 +1,259 @@
+# Slovenian 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-09-14 11:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Bančni dnevnik"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Dnevnik"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Združi po ..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Datum uvoza"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Dnevnik uvoza"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "Uvozi"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Podjetje"
+
+#. module: account_coda
+#: help:account.coda.import,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
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr "Izpiski"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "Rezultat"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,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
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bančni izpisek"
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr "Rezultat"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr "Kliknite na \"Novo\" za izbiro vaše datoteke:"
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Zapri"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr "Generirani bačni izpiski"
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr "Dnevnik"
diff --git a/addons/account_coda/i18n/sq.po b/addons/account_coda/i18n/sq.po
index f4372f095e6..d5941abe838 100644
--- a/addons/account_coda/i18n/sq.po
+++ b/addons/account_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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po
index 8e6038f5a69..b4fdc805381 100644
--- a/addons/account_coda/i18n/sr.po
+++ b/addons/account_coda/i18n/sr.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:14+0000\n"
-"PO-Revision-Date: 2010-11-14 08:09+0000\n"
+"PO-Revision-Date: 2011-08-30 17:18+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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -313,9 +313,3 @@ msgstr "Dnevnik"
 
 #~ msgid "Select your bank journal :"
 #~ msgstr "Izaberi svoj bancin dnevnik"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
diff --git a/addons/account_coda/i18n/sr@latin.po b/addons/account_coda/i18n/sr@latin.po
index 9a7601d4e26..c841d250d6c 100644
--- a/addons/account_coda/i18n/sr@latin.po
+++ b/addons/account_coda/i18n/sr@latin.po
@@ -8,72 +8,72 @@ 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-12-23 15:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-03 23:12+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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
 #: field:account.coda.import,journal_id:0
 msgid "Bank Journal"
-msgstr "Dnevnik Banke"
+msgstr "Dnevnik banke"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda.import,note:0
 msgid "Log"
-msgstr "Log"
+msgstr "Dnevnik"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
 msgid "Account Coda Import"
-msgstr "Uvezi Nalog Coda"
+msgstr "Uvezi nalog Coda"
 
 #. module: account_coda
 #: field:account.coda,name:0
 msgid "Coda file"
-msgstr "Coda Fajl"
+msgstr "Coda datoteka"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Group By..."
-msgstr "Grupisano po"
+msgstr "Grupiši po..."
 
 #. module: account_coda
 #: field:account.coda.import,awaiting_account:0
 msgid "Default Account for Unrecognized Movement"
-msgstr "Podrazumevani Nalog za neprepoznati pokret"
+msgstr "Podrazumevani nalog za neprepoznati pokret"
 
 #. module: account_coda
 #: help:account.coda,date:0
 msgid "Import Date"
-msgstr "Datum Unosa"
+msgstr "Datum unosa"
 
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import log"
-msgstr "Uvezi log"
+msgstr "Uvezi dnevnik"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Import"
-msgstr "Uvezi"
+msgstr "Uvoz"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda import"
-msgstr "Coda Uvoz"
+msgstr "Coda uvoz"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:51
 #, python-format
 msgid "Coda file not found for bank statement !!"
-msgstr ""
+msgstr "Coda datoteka nije pronađena za dati izveštaj banke !!"
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -81,14 +81,14 @@ msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
 msgstr ""
-"Postavi ovde podrazumevani nalog koji ce se koristiti, ukoliko je pronadjen "
-"partner ali nema Racum u banci ili je stranac."
+"Postavi ovde podrazumevani nalog koji će biti korišćen, ako je pronađen "
+"partner ali nema računu  banci ili je stranac."
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,company_id:0
 msgid "Company"
-msgstr "Preduzece"
+msgstr "Preduzeće"
 
 #. module: account_coda
 #: help:account.coda.import,def_payable:0
@@ -96,13 +96,13 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
-"POstavi ovde platni nalog koji ce biti podrazumevano koriscen, ukoliko nie "
-"pronadjen partner"
+"Postavi ovde platni račun koji ce se koristiti kao podrazumevan, ako nije "
+"pronađen partner"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Search Coda"
-msgstr "Pretrazi Coda"
+msgstr "Pretraži Coda"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -119,7 +119,7 @@ msgstr "Datum"
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
 msgid "Coda Import Logs"
-msgstr "Logovi Uvoza Coda"
+msgstr "Dnevnici uvoza Coda"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
@@ -129,22 +129,22 @@ msgstr "coda za jedan nalog"
 #. module: account_coda
 #: field:account.coda.import,def_payable:0
 msgid "Default Payable Account"
-msgstr "Osnovni platni konto"
+msgstr "Osnovni platni račun"
 
 #. module: account_coda
 #: help:account.coda,name:0
 msgid "Store the detail of bank statements"
-msgstr "Sacuvaj detalje Izvoda banke"
+msgstr "Sačuvaj detalje Izveštaja banke"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Cancel"
-msgstr "Otkazi"
+msgstr "Otkaži"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Open Statements"
-msgstr "Otvori Izvode"
+msgstr "Otvorene Izjave"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:167
@@ -171,6 +171,10 @@ msgid ""
 "    bank statements from coda files.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul omogućava funkciju uvoza\n"
+"    bankovnih izvoda iz coda datoteka.\n"
+"    "
 
 #. module: account_coda
 #: view:account.coda:0
@@ -190,7 +194,7 @@ msgstr "Rezultati :"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Result of Imported Coda Statements"
-msgstr "Rezultat uvezenih Coda izjava"
+msgstr "Rezultat uvezenih Coda izvoda"
 
 #. module: account_coda
 #: help:account.coda.import,def_receivable:0
@@ -198,24 +202,24 @@ msgid ""
 "Set here the receivable account that will be used, by default, if the "
 "partner is not found"
 msgstr ""
-"POstavi ovde racun potrazivanja koji ce se podrazumevano koristiti, ukoliko "
-"partner nije pronadjen"
+"Postavi ovde račun potraživanja koji će se koristiti kao podrazumevan, ako "
+"partner nije pronađen"
 
 #. module: account_coda
 #: field:account.coda.import,coda:0
 #: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
-msgstr "Coda Fajl"
+msgstr "Coda datoteka"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement
 msgid "Bank Statement"
-msgstr "Izvod Iz Banke"
+msgstr "Izvod banke"
 
 #. module: account_coda
 #: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda Logs"
-msgstr "Coda Logovi"
+msgstr "Coda Dnevnici"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:311
@@ -226,12 +230,12 @@ msgstr "Rezultat"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Click on 'New' to select your file :"
-msgstr "Klikni na \"Novo\" da selektujes svoj fajl :"
+msgstr "Kliknite na \"Novo\" izaberete svoju datoteku :"
 
 #. module: account_coda
 #: field:account.coda.import,def_receivable:0
 msgid "Default Receivable Account"
-msgstr "Podrzumaveni racun potrazivanja"
+msgstr "Podrzumevani račun potraživanja"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -241,17 +245,17 @@ msgstr "Zatvori"
 #. module: account_coda
 #: field:account.coda,statement_ids:0
 msgid "Generated Bank Statements"
-msgstr "Generisani Izvodi Banke"
+msgstr "Generisani izvodi banke"
 
 #. module: account_coda
 #: model:ir.module.module,shortdesc:account_coda.module_meta_information
 msgid "Account CODA - import bank statements from coda file"
-msgstr "Nalog CODA- uvezi izvode banke iz CODA fajla"
+msgstr "Nalog CODA- uvezi izvode banke iz CODA datoteke"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr "POdesi svoj Dnevnik i Nalog"
+msgstr "Podesi svoj Dnevnik i Nalog"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -272,15 +276,9 @@ msgstr "Dnevnik"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
-
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "Klikni na 'Novi' da izaberes svoj fajl"
 
diff --git a/addons/account_coda/i18n/sv.po b/addons/account_coda/i18n/sv.po
index 317835039c5..22f16f24f4f 100644
--- a/addons/account_coda/i18n/sv.po
+++ b/addons/account_coda/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:14+0000\n"
-"PO-Revision-Date: 2011-01-26 07:01+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2011-08-30 17:18+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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -266,14 +266,5 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/account_coda/i18n/tr.po b/addons/account_coda/i18n/tr.po
index 26be8e7e3a1..fd6ac1e11f1 100644
--- a/addons/account_coda/i18n/tr.po
+++ b/addons/account_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: 2011-05-16 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
@@ -81,6 +81,8 @@ msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
 msgstr ""
+"Eğer bir paydaş var ama banka hesabı yok ise ya da ikametgahlı ise burada "
+"kullanılacak varsayılan hesabı ayarlayın"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -94,6 +96,8 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
+"Eğer bir paydaş yok ise burada kullanılacak varsayılan alıcı hesabını "
+"ayarlayın"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -104,60 +108,60 @@ msgstr "Coda Araştır"
 #: view:account.coda:0
 #: field:account.coda,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
 msgid "Coda Import Logs"
-msgstr ""
+msgstr "Coda içeaktarım günlüğü"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
-msgstr ""
+msgstr "Bir hesap için Coda"
 
 #. module: account_coda
 #: field:account.coda.import,def_payable:0
 msgid "Default Payable Account"
-msgstr ""
+msgstr "Varsayılan Satıcılar Hesabı"
 
 #. module: account_coda
 #: help:account.coda,name:0
 msgid "Store the detail of bank statements"
-msgstr ""
+msgstr "Banka ekstreleri ayrıntılarını saklayın"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Ekstreleri Aç"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:167
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
+msgstr "%s Paydaşı için %s banka hesabı tanımlanmamıştır.\n"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
-msgstr ""
+msgstr "Coda Ekstrelerini İçeaktar"
 
 #. module: account_coda
 #: view:account.coda.import:0
 #: model:ir.actions.act_window,name:account_coda.action_account_coda_import
 msgid "Import Coda Statement"
-msgstr ""
+msgstr "Coda Ekstresini İçeaktar"
 
 #. module: account_coda
 #: model:ir.module.module,description:account_coda.module_meta_information
@@ -167,26 +171,30 @@ msgid ""
 "    bank statements from coda files.\n"
 "    "
 msgstr ""
+"\n"
+"    Modül banka ekstrelerinin coda\n"
+"    dosyalarından içeaktarımını sağlar.\n"
+"    "
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Statements"
-msgstr ""
+msgstr "Ekstreler"
 
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
-msgstr ""
+msgstr "Coda"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Results :"
-msgstr ""
+msgstr "Sonuçlar :"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Result of Imported Coda Statements"
-msgstr ""
+msgstr "İçeaktarılmış Coda Ekstreleri Sonucu"
 
 #. module: account_coda
 #: help:account.coda.import,def_receivable:0
@@ -194,66 +202,68 @@ msgid ""
 "Set here the receivable account that will be used, by default, if the "
 "partner is not found"
 msgstr ""
+"Eğer bir paydaş yoksa, burada kullanılacak varsayılan alıcılar hesabını "
+"ayarlayın"
 
 #. module: account_coda
 #: field:account.coda.import,coda:0
 #: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
-msgstr ""
+msgstr "Coda Dosyası"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Banka Ekstresi"
 
 #. module: account_coda
 #: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda Logs"
-msgstr ""
+msgstr "Coda Günlükleri"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:311
 #, python-format
 msgid "Result"
-msgstr ""
+msgstr "Sonuç"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Click on 'New' to select your file :"
-msgstr ""
+msgstr "Dosyanızı seçmek için 'Yeni' ye tıklayın :"
 
 #. module: account_coda
 #: field:account.coda.import,def_receivable:0
 msgid "Default Receivable Account"
-msgstr ""
+msgstr "Varsayılan Alıcı Hesabı"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
 msgid "Generated Bank Statements"
-msgstr ""
+msgstr "Oluşturulan Banka Ekstreleri"
 
 #. module: account_coda
 #: model:ir.module.module,shortdesc:account_coda.module_meta_information
 msgid "Account CODA - import bank statements from coda file"
-msgstr ""
+msgstr "CODA Hesabı - coda dosyalarından banka ekstrelerini içe aktar"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr ""
+msgstr "Yevmiye ve Hesaplarınızı Yapılandırın"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda Import"
-msgstr ""
+msgstr "Coda İçeaktar"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Yevmiye"
diff --git a/addons/account_coda/i18n/vi.po b/addons/account_coda/i18n/vi.po
index c81c4dd2dfd..56313b23856 100644
--- a/addons/account_coda/i18n/vi.po
+++ b/addons/account_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: 2011-06-06 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/account_coda/i18n/zh_CN.po
index 87cf5b0f5d7..99bf34c391e 100644
--- a/addons/account_coda/i18n/zh_CN.po
+++ b/addons/account_coda/i18n/zh_CN.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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_coda
 #: help:account.coda,journal_id:0
 #: field:account.coda.import,journal_id:0
 msgid "Bank Journal"
-msgstr "银行记录集合"
+msgstr "银行日记账"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -32,12 +32,12 @@ msgstr "日志"
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
 msgid "Account Coda Import"
-msgstr ""
+msgstr "结帐科目录入"
 
 #. module: account_coda
 #: field:account.coda,name:0
 msgid "Coda file"
-msgstr "Coda 文件"
+msgstr "归档结帐"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -47,7 +47,7 @@ msgstr "分组..."
 #. module: account_coda
 #: field:account.coda.import,awaiting_account:0
 msgid "Default Account for Unrecognized Movement"
-msgstr ""
+msgstr "默认科目无法识别的记帐"
 
 #. module: account_coda
 #: help:account.coda,date:0
@@ -67,38 +67,38 @@ msgstr "导入"
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda import"
-msgstr "Coda 导入"
+msgstr "结帐录入"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:51
 #, python-format
 msgid "Coda file not found for bank statement !!"
-msgstr ""
+msgstr "结账文件未找到银行对帐单"
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
 msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
-msgstr ""
+msgstr "针对没有银行帐号或指定支付地点的业务伙伴，这里设置要使用的默认银行帐号。"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_coda
 #: help:account.coda.import,def_payable:0
 msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
-msgstr ""
+msgstr "如果没有找到合作伙伴,那么在这里设置默认支付帐户."
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Search Coda"
-msgstr ""
+msgstr "结账搜索"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -110,17 +110,17 @@ msgstr "用户"
 #: view:account.coda:0
 #: field:account.coda,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
 msgid "Coda Import Logs"
-msgstr ""
+msgstr "导入结账日志"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "coda for an Account"
-msgstr "帐号的CODA"
+msgstr "科目结账"
 
 #. module: account_coda
 #: field:account.coda.import,def_payable:0
@@ -130,34 +130,34 @@ msgstr "默认应付帐款科目"
 #. module: account_coda
 #: help:account.coda,name:0
 msgid "Store the detail of bank statements"
-msgstr ""
+msgstr "银行对账单的详细"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Open Statements"
-msgstr ""
+msgstr "打开报表"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:167
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
+msgstr "银行帐户%s没有定义合作伙伴%s\n"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
-msgstr "导入CODA"
+msgstr "导入结账"
 
 #. module: account_coda
 #: view:account.coda.import:0
 #: model:ir.actions.act_window,name:account_coda.action_account_coda_import
 msgid "Import Coda Statement"
-msgstr "导入CODA"
+msgstr "导入结账报表"
 
 #. module: account_coda
 #: model:ir.module.module,description:account_coda.module_meta_information
@@ -167,11 +167,14 @@ msgid ""
 "    bank statements from coda files.\n"
 "    "
 msgstr ""
+"\n"
+"    模块提供了导入结账报表功能\n"
+"    "
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Statements"
-msgstr ""
+msgstr "报表"
 
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
@@ -186,77 +189,77 @@ msgstr "结果:"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Result of Imported Coda Statements"
-msgstr ""
+msgstr "导入结账报表"
 
 #. module: account_coda
 #: help:account.coda.import,def_receivable:0
 msgid ""
 "Set here the receivable account that will be used, by default, if the "
 "partner is not found"
-msgstr ""
+msgstr "如果没找到业务伙伴，在这里设置应收账款科目"
 
 #. module: account_coda
 #: field:account.coda.import,coda:0
 #: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
-msgstr "CODA文件"
+msgstr "结账文件"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "银行对账单"
 
 #. module: account_coda
 #: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda Logs"
-msgstr ""
+msgstr "结账日志"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:311
 #, python-format
 msgid "Result"
-msgstr ""
+msgstr "结果"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Click on 'New' to select your file :"
-msgstr ""
+msgstr "点击“新建”，选择您的文件"
 
 #. module: account_coda
 #: field:account.coda.import,def_receivable:0
 msgid "Default Receivable Account"
-msgstr ""
+msgstr "默认的应收账款"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
 msgid "Generated Bank Statements"
-msgstr ""
+msgstr "生成银行对账单"
 
 #. module: account_coda
 #: model:ir.module.module,shortdesc:account_coda.module_meta_information
 msgid "Account CODA - import bank statements from coda file"
-msgstr ""
+msgstr "科目结账 -  导入结账的银行对账单"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr ""
+msgstr "设置你的账簿和科目"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda Import"
-msgstr ""
+msgstr "导入结账"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "账簿"
 
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "点击\"新\"去选择你的文件:"
diff --git a/addons/account_coda/i18n/zh_TW.po b/addons/account_coda/i18n/zh_TW.po
new file mode 100644
index 00000000000..aade4741326
--- /dev/null
+++ b/addons/account_coda/i18n/zh_TW.po
@@ -0,0 +1,259 @@
+# Chinese (Traditional) 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-09-27 10:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "匯入日期"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "匯入"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: account_coda
+#: help:account.coda.import,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
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,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
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr ""
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index fd5cc859646..3fe52186f03 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    'name': 'Reminders',
+    'name': 'Followup Management',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Accounting & Finance',
     'complexity': "normal",
     'description': """
-Modules to automate letters for unpaid invoices, with multi-level recalls.
+Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================
 
 You can define your multiple levels of recall through the menu:
@@ -45,16 +45,18 @@ Note that if you want to check the followup level for a given partner/account en
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'],
-    'depends': ['account'],
+    'depends': ['account_accountant', 'mail'],
     'init_xml': [],
     'update_xml': [
+        'security/account_followup_security.xml',
         'security/ir.model.access.csv',
         'wizard/account_followup_print_view.xml',
         'report/account_followup_report.xml',
+        'account_followup_demo.xml',   # Defined by default
         'account_followup_view.xml',
-        'account_followup_data.xml'
+        'account_followup_data.xml',
     ],
-    'demo_xml': ['account_followup_demo.xml'],
+    'demo_xml': [],
     'test': ['test/account_followup.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 06a53bb9548..a81535ad70c 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -28,7 +28,7 @@ class followup(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
         'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-Up'),
-        'company_id': fields.many2one('res.company', 'Company'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
@@ -45,7 +45,7 @@ class followup(osv.osv):
                 company.append(l.company_id.id)
         return True
     _constraints = [
-        (check_company_uniq, 'Only One Folllowup by Company.',['company_id'] )
+        (check_company_uniq, 'Only One Followup by Company.',['company_id'] )
         ]
 
 followup()
@@ -63,7 +63,20 @@ class followup_line(osv.osv):
     }
     _defaults = {
         'start': 'days',
+
     }
+    def _check_description(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.description:
+                try:
+                    line.description % {'partner_name': '', 'date':'', 'user_signature': '', 'company_name': ''}
+                except:
+                    return False
+        return True
+
+    _constraints = [
+        (_check_description, 'Your description is invalid, use the right legend or %% if you want to use the percent character.', ['description']),
+    ]
 
 followup_line()
 
@@ -72,7 +85,7 @@ class account_move_line(osv.osv):
     _columns = {
         'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'),
         'followup_date': fields.date('Latest Follow-up', select=True),
-                }
+    }
 
 account_move_line()
 
@@ -101,4 +114,4 @@ Thanks,
 
 res_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/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 2bf627de9b7..4c3d84fb642 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="demo_followup1" model="account_followup.followup">
-            <field name="name">Default follow-up</field>
+            <field name="name">Default Follow-Up</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="description">First letter after 15 net days, 30 net days and 45 days end of month levels.</field>
         </record>
@@ -17,9 +17,9 @@
             <field name="description">
 Dear %(partner_name)s,
 
-Exception made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
+Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
 
-Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).10.68.94.39.
+Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department at (+32).10.68.94.39.
 
 Best Regards,
 </field>
@@ -37,7 +37,7 @@ Dear %(partner_name)s,
 We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.
 
 It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services).
-Please, take appropriate measures in order to carry out this payment in the next 8 days
+Please, take appropriate measures in order to carry out this payment in the next 8 days.
 
 If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly.
 
@@ -58,7 +58,7 @@ Dear %(partner_name)s,
 
 Despite several reminders, your account is still not settled.
 
-Unless full payment is made in next 8 days , then legal action for the recovery of the debt, will be taken without further notice.
+Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice.
 
 I trust that this action will prove unnecessary and details of due payments is printed below.
 
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 5264071040c..e6aee02ffdc 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up Lines">
+                <tree string="Follow-Up Steps">
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="start" groups="base.group_extended"/>
@@ -19,7 +19,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up Lines">
+                <form string="Follow-Up Steps">
                   <group col="6" colspan="4">
                      <field name="name"/>
                      <field name="delay"/>
@@ -45,7 +45,7 @@
                 <form string="Follow-Up">
                     <field name="name"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string=""/>
+                    <newline/>
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -69,14 +69,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Followup">
-                   <group col="10" colspan="4">
+                   <group>
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   </group>
                </search>
             </field>
         </record>
@@ -99,7 +95,7 @@
             <field name="type">tree</field>
             <field eval="32" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('draft');black:state in ('validate')" editable="bottom" string="Partner entries">
+                <tree colors="red:state == 'draft';black:state == 'validate'" editable="bottom" string="Partner entries">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="ref"/>
@@ -164,11 +160,12 @@
         <!--   Configure Follow-Ups  Wizard    -->
         
           <record id="action_view_account_followup_followup_form" model="ir.actions.act_window">
-            <field name="name">Configure Follow-Ups</field>
+            <field name="name">Review Invoicing Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account_followup.followup</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
+            <field name="context" eval="'{\'res_id\': %s}' % (ref('demo_followup1'),)"/>
             <field name="view_id" ref="view_account_followup_followup_form"/>
         </record>
         
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index ea2f84c6ed3..4e51d25143d 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -18,7 +18,7 @@ msgstr ""
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/ar.po b/addons/account_followup/i18n/ar.po
index 2b671474936..526869f6e00 100644
--- a/addons/account_followup/i18n/ar.po
+++ b/addons/account_followup/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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po
index 41f1b81c52b..784733b3fef 100644
--- a/addons/account_followup/i18n/bg.po
+++ b/addons/account_followup/i18n/bg.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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index 9a2ab506513..08384173e8b 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index 62757a3b0e0..1e41b5ce4e4 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-29 13:34+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15: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: 2011-07-30 05:00+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:298
+#: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Informe de seguiment"
 
 #. module: account_followup
@@ -90,6 +90,11 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"Correu electrònic enviat a les empreses amb èxit!\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -337,6 +342,7 @@ msgstr "Envia correu en l'idioma de l'empresa"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"No podeu crear una anotació en un compte a cobrar/a pagar sense una empresa."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -541,6 +547,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Tots els correus electronics han estat enviats amb èxit a les empreses:.\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -731,6 +740,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"El correu electrònic no enviat a les empreses, no es disposa de correu "
+"electrònic!\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -1000,13 +1013,6 @@ msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
 #~ "Tots els correus han estat enviats a les empreses correctament:.\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "Do not change message text, if you want to send email in partner language, "
-#~ "or configre from company"
-#~ msgstr ""
-#~ "No canvieu el text del missatge si voleu enviar el correu en l'idioma de "
-#~ "l'empresa o configurar-lo des de la companyia."
-
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -1018,3 +1024,7 @@ msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
 #~ "\n"
 #~ "Correu enviat a les següents empreses correctament.\n"
 #~ "\n"
+
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Informe de seguiment"
diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po
index 2b671474936..20f23669033 100644
--- a/addons/account_followup/i18n/cs.po
+++ b/addons/account_followup/i18n/cs.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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
@@ -715,3 +715,6 @@ msgstr ""
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
 msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 2c5f377e88b..1da7dceb0d5 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-03 09:25+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:21+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Mahnverfolgung Zusammenfassung"
 
 #. module: account_followup
@@ -997,21 +997,9 @@ msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 #~ "Alle EMails wurden erfolgreich versendet an folgende Partner:\n"
 #~ "\n"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können kein rekursives Menü erstellen."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#~ msgid ""
-#~ "\n"
-#~ "E-Mail not sent to following Partners, Email not available !\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "EMail die noch nicht versendet wurden z.B. an Partner, EMails, Konten\n"
-#~ "\n"
-
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -1024,15 +1012,6 @@ msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 #~ "Email, wurde erfolgreich an Partnern versendet.\n"
 #~ "\n"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #, python-format
 #~ msgid ""
 #~ "E-Mail not sent to following Partners, Email not available !\n"
@@ -1041,3 +1020,7 @@ msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 #~ "E-Mail konnte nicht an folgende Partner gesendet werden. Die EMail Adresse "
 #~ "ist nicht vorhanden !\n"
 #~ "\n"
+
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Mahnverfolgung Zusammenfassung"
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index cbf1e746b56..a70828c866c 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
@@ -914,6 +914,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Όλα τα E-mails έχουν αποσταλεί στους Συνεργάτες:.\n"
 #~ "\n"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος ! Δεν μπορείτε να δημιουργήσετε κενό Μενού"
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 351d7fe715f..2d35dd7744d 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-20 13:02+0000\n"
+"PO-Revision-Date: 2011-11-11 15:21+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Informe de seguimiento"
 
 #. module: account_followup
@@ -1002,13 +1002,6 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 #~ "Todos los correos han sido enviados a las empresas correctamente:.\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "Do not change message text, if you want to send email in partner language, "
-#~ "or configre from company"
-#~ msgstr ""
-#~ "No cambie el texto del mensaje si quiere enviar el correo en el idioma de la "
-#~ "empresa o configurarlo desde la compañía."
-
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -1021,14 +1014,6 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 #~ "Correo enviado a las siguientes empresas correctamente.\n"
 #~ "\n"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Informe de seguimiento"
diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po
index ad9cd5495f9..2e45aaf07d5 100644
--- a/addons/account_followup/i18n/es_AR.po
+++ b/addons/account_followup/i18n/es_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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/es_EC.po b/addons/account_followup/i18n/es_EC.po
index 32f51dcbdbc..e91e5d96761 100644
--- a/addons/account_followup/i18n/es_EC.po
+++ b/addons/account_followup/i18n/es_EC.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/es_MX.po b/addons/account_followup/i18n/es_MX.po
new file mode 100644
index 00000000000..a21c63bc72b
--- /dev/null
+++ b/addons/account_followup/i18n/es_MX.po
@@ -0,0 +1,1015 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_followup
+#
+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-20 13:02+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: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:298
+#, python-format
+msgid "Follwoup Summary"
+msgstr "Informe de seguimiento"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Search Followup"
+msgstr "Buscar seguimiento"
+
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+"\n"
+"    Módulos para automatizar cartas para facturas impagadas, con "
+"recordatorios multi-nivel.\n"
+"\n"
+"    Puede definir sus múltiples niveles de recordatorios a través del menú:\n"
+"        Contabilidad/Configuración/Misceláneos/Recordatorios\n"
+"\n"
+"    Una vez definido, puede automatizar la impresión de recordatorios cada "
+"día\n"
+"    simplemente haciendo clic en el menú:\n"
+"        Contabilidad/Procesos periódicos/Facturación/Enviar recordatorios\n"
+"\n"
+"    Se generará un PDF con todas las cartas en función de \n"
+"    los diferentes niveles de recordatorios definidos. Puede definir "
+"diferentes reglas\n"
+"    para diferentes empresas. Puede también enviar un correo electrónico al "
+"cliente.\n"
+"\n"
+"    Tenga en cuenta que si quiere modificar los niveles de recordatorios "
+"para una empresa/apunte contable, lo puede hacer desde el menú:\n"
+"        Contabilidad/Informes/Informes genéricos/Cuentas "
+"empresas/Recordatorios enviados\n"
+"\n"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:290
+#, python-format
+msgid ""
+"\n"
+"\n"
+"E-Mail sent to following Partners successfully. !\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,followup_line:0
+msgid "Follow-Up"
+msgstr "Seguimiento"
+
+#. module: account_followup
+#: field:account_followup.followup,company_id:0
+#: view:account_followup.stat:0
+#: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: account_followup
+#: field:account.followup.print.all,email_subject:0
+msgid "Email Subject"
+msgstr "Asunto correo electrónico"
+
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+"Seguimiento de los recordatorios enviados a sus clientes por facturas no "
+"pagadas."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr "Seleccionar empresas a recordar"
+
+#. module: account_followup
+#: 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_followup
+#: field:account.followup.print,date:0
+msgid "Follow-up Sending Date"
+msgstr "Fecha envío del seguimiento"
+
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr "Días naturales"
+
+#. 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 "Seguimientos"
+
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr "Balance > 0"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Total debe"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(heading)s: Move line header"
+msgstr "%(heading)s: Cabecera línea movimiento"
+
+#. module: account_followup
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
+msgstr "Mensaje de seguimiento"
+
+#. module: account_followup
+#: field:account.followup.print,followup_id:0
+msgid "Follow-up"
+msgstr "Seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "CIF/NIF:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Date :"
+msgstr "Fecha :"
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_ids:0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:138
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Recordatorio facturas"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup
+msgid "Account Follow Up"
+msgstr "Seguimiento contable"
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "End of Month"
+msgstr "Fin de mes"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Not Litigation"
+msgstr "No litigio"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(user_signature)s: User name"
+msgstr "%(user_signature)s: Nombre de usuario"
+
+#. module: account_followup
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
+"Esta funcionalidad le permite enviar recordatorios a las empresas con "
+"facturas pendientes. Puede enviarles el mensaje por defecto para facturas "
+"impagadas o introducir manualmente un mensaje si necesita recordarles alguna "
+"información específica."
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Ref"
+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 ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"seguimiento."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,email_body:0
+msgid "Email body"
+msgstr "Texto correo electrónico"
+
+#. module: account_followup
+#: field:account.move.line,followup_line_id:0
+msgid "Follow-up Level"
+msgstr "Nivel seguimiento"
+
+#. module: account_followup
+#: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
+msgid "Latest followup"
+msgstr "Último seguimiento"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"Estamos preocupados de ver que, a pesar de enviar un recordatorio, los pagos "
+"de su cuenta están ahora muy atrasados.\n"
+"\n"
+"Es esencial que realice el pago de forma inmediata, de lo contrario tendrá "
+"que considerar la suspensión de su cuenta, lo que significa que no seremos "
+"capaces de suministrar productos/servicios a su empresa.\n"
+"Por favor, tome las medidas oportunas para llevar a cabo este pago en los "
+"próximos 8 días.\n"
+"\n"
+"Si hay un problema con el pago de la(s) factura(s) que desconocemos, no dude "
+"en ponerse en contacto con nuestro departamento de contabilidad de manera "
+"que podamos resolver el asunto lo más rápido posible.\n"
+"\n"
+"Los detalles de los pagos pendientes se listan a continuación.\n"
+"\n"
+"Saludos cordiales,\n"
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_lang:0
+msgid "Send Email in Partner Language"
+msgstr "Enviar correo en el idioma de la empresa"
+
+#. module: account_followup
+#: 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_followup
+#: view:account.followup.print.all:0
+msgid "Partner Selection"
+msgstr "Selección empresa"
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr "Mensaje impreso"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
+#: 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 seguimientos"
+
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr "Empresa a recordar"
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr "Seguimientos"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"Salvo si hubiera un error por parte nuestra, parece que los siguientes "
+"importes están pendientes de pago. Por favor, tome las medidas oportunas "
+"para llevar a cabo este pago en los próximos 8 días.\n"
+"\n"
+"Si el pago hubiera sido realizado después de enviar este correo, por favor "
+"no lo tenga en cuenta. No dude en ponerse en contacto con nuestro "
+"departamento de contabilidad.\n"
+"\n"
+"Saludos cordiales,\n"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"A pesar de varios recordatorios, la deuda de su cuenta todavía no está "
+"resuelta.\n"
+"\n"
+"A menos que el pago total se realice en los próximos 8 días, las acciones "
+"legales para el cobro de la deuda se tomarán sin más aviso.\n"
+"\n"
+"Confiamos en que esta medida será innecesaria. Los detalles de los pagos "
+"pendientes se listan a continuación.\n"
+"\n"
+"Para cualquier consulta relativa a este asunto, no dude en ponerse en "
+"contacto con nuestro departamento de contabilidad.\n"
+"\n"
+"Saludos cordiales,\n"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Send Mails"
+msgstr "Enviar emails"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr "Estadísticas seguimiento por empresa"
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr "Gestión de los seguimientos/avisos contables"
+
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#. 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 ""
+"Este campo le permite seleccionar una fecha de previsión para planificar sus "
+"seguimientos"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Due"
+msgstr "Debido"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:56
+#, python-format
+msgid "Select Partners"
+msgstr "Seleccionar empresas"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Email Settings"
+msgstr "Configuración de correo electrónico"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Print Follow Ups"
+msgstr "Imprimir seguimientos"
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr "Último seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr "Subtotal:"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Balance:"
+msgstr "Saldo pendiente:"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup Statistics"
+msgstr "Estadísticas de seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s: User Name"
+msgstr "%(user_signature)s: Nombre del usuario"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. module: account_followup
+#: 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."
+
+#. module: account_followup
+#: field:account.followup.print.all,email_conf:0
+msgid "Send email confirmation"
+msgstr "Enviar correo electrónico de confirmación"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:287
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_name)s: User's Company name"
+msgstr "%(company_name): Nombre de la compañía del usuario"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Followup Lines"
+msgstr "Líneas de seguimiento"
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fecha vencimiento"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(partner_name)s: Partner Name"
+msgstr "%(partner_name)s: Nombre de empresa"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr "Líneas de seguimiento"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr "%(company_currency)s: Divisa de la compañía del usuario"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr "Tipo de plazo"
+
+#. 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 "Imprimir seguimiento y enviar correo a clientes"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
+msgstr "Último movimiento"
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr "Informe de seguimientos"
+
+#. module: account_followup
+#: field:account_followup.stat,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "Follow-Up Lines"
+msgstr "Líneas de seguimiento"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Litigation"
+msgstr "Litigio"
+
+#. module: account_followup
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
+msgstr "Nivel superior seguimiento máx."
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+msgid "Payable Items"
+msgstr "Registros a pagar"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr "%(followup_amount)s: Total importe debido"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "%(date)s: Current Date"
+msgstr "%(date)s: Fecha actual"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Followup Level"
+msgstr "Nivel de seguimiento"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: report:account_followup.followup.print:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "This Fiscal year"
+msgstr "Este ejercicio fiscal"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr "Asientos de empresa"
+
+#. 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 ""
+"No cambie el texto del mensaje si quiere enviar correos en el idioma de la "
+"empresa o configurarlo desde la compañía."
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+msgid "Receivable Items"
+msgstr "Registros a cobrar"
+
+#. 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 "Seguimientos enviados"
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
+msgid "First move"
+msgstr "Primer movimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity"
+msgstr "Vencimiento"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:289
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid "Continue"
+msgstr "Continuar"
+
+#. module: account_followup
+#: field:account_followup.followup.line,delay:0
+msgid "Days of delay"
+msgstr "Días de demora"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr "Documento: Estado contable del cliente"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Total haber"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(line)s: Ledger Posting lines"
+msgstr "%(line)s: Líneas incluídas en el libro mayor"
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(company_name)s: User's Company Name"
+msgstr "%(company_name)s: Nombre de la compañía del usuario"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr "Ref. cliente :"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(partner_name)s: Partner name"
+msgstr "%(partner_name)s: Nombre empresa"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Latest Followup Date"
+msgstr "Fecha último seguimiento"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Up Criteria"
+msgstr "Criterios seguimiento"
+
+#. module: account_followup
+#: 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."
+
+#~ msgid "All payable entries"
+#~ msgstr "Todas los asientos cuentas a pagar"
+
+#~ msgid "Select partners"
+#~ msgstr "Seleccionar empresas"
+
+#~ msgid "Account Type"
+#~ msgstr "Tipo de cuenta"
+
+#~ msgid "%(line)s: Account Move lines"
+#~ msgstr "%(line)s: Líneas de movimientos contables"
+
+#~ msgid "Follow-Ups Criteria"
+#~ msgstr "Criterios de seguimientos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Seleccionar empresas para recordar"
+
+#~ 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 "All receivable entries"
+#~ msgstr "Todos los asientos cuentas a cobrar"
+
+#~ msgid "Lines"
+#~ msgstr "Líneas"
+
+#~ msgid "Followup statistics"
+#~ msgstr "Estadísticas de seguimiento"
+
+#~ msgid "Follow-up and Date Selection"
+#~ msgstr "Selección seguimiento y fecha"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Mail sent to following Partners successfully, !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "¡Correo electrónico enviado correctamente a las siguientes empresas!\n"
+#~ "\n"
+
+#~ msgid "Amount In Currency"
+#~ msgstr "Importe en divisa"
+
+#, python-format
+#~ msgid ""
+#~ "Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "¡No se ha enviado correo electrónico a las siguientes empresas, su email no "
+#~ "está disponible!\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "All emails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Todos los correos electrónicos han sido enviados correctamente a las "
+#~ "empresas:\n"
+#~ "\n"
+
+#~ msgid "Print Follow Ups & Send Mails"
+#~ msgstr "Imprimir seguimientos & Enviar correos"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount staid unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "Salvo si hubiera un error por parte nuestra, parece que los siguientes "
+#~ "importes están pendientes de pago. Por favor, tome las medidas apropiadas "
+#~ "para llevar a cabo este pago en los próximos 8 días.\n"
+#~ "\n"
+#~ "Si el pago hubiera sido realizado después de enviar este correo, por favor "
+#~ "no lo tenga en cuenta. No dude en ponerse en contacto con nuestro "
+#~ "departamento de contabilidad.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Despite several reminders, your account is still not settled.\n"
+#~ "\n"
+#~ "Unless full payment is made in next 8 days , then legal action for the "
+#~ "recovery of the debt, will be taken without further notice.\n"
+#~ "\n"
+#~ "I trust that this action will prove unnecessary and details of due payments "
+#~ "is printed below.\n"
+#~ "\n"
+#~ "In case of any queries concerning this matter, do not hesitate to contact "
+#~ "our accounting department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "A pesar de varios recordatorios, la deuda de su cuenta todavía no está "
+#~ "resuelta.\n"
+#~ "\n"
+#~ "A menos que el pago total se realice en los próximos 8 días, las acciones "
+#~ "legales para el cobro de la deuda se tomarán sin más aviso.\n"
+#~ "\n"
+#~ "Confiamos en que esta medida será innecesaria y los detalles de los pagos "
+#~ "pendientes se listan a continuación.\n"
+#~ "\n"
+#~ "En caso de cualquier consulta relativa a este asunto, no dude en ponerse en "
+#~ "contacto con nuestro departamento de contabilidad.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "We are disappointed to see that despite sending a reminder, that your "
+#~ "account is now seriously overdue.\n"
+#~ "\n"
+#~ "It is essential that immediate payment is made, otherwise we will have to "
+#~ "consider placing a stop on your account which means that we will no longer "
+#~ "be able to supply your company with (goods/services).\n"
+#~ "Please, take appropriate measures in order to carry out this payment in the "
+#~ "next 8 days\n"
+#~ "\n"
+#~ "If there is a problem with paying invoice that we are not aware of, do not "
+#~ "hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+#~ "we can resolve the matter quickly.\n"
+#~ "\n"
+#~ "Details of due payments is printed below.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "Estamos preocupados de ver que, a pesar de enviar un recordatorio, los pagos "
+#~ "de su cuenta están ahora muy atrasados.\n"
+#~ "\n"
+#~ "Es esencial que realice el pago de forma inmediata, de lo contrario tendrá "
+#~ "que considerar la suspensión de su cuenta, lo que significa que no seremos "
+#~ "capaces de suministrar productos/servicios a su empresa.\n"
+#~ "Por favor, tome las medidas apropiadas para llevar a cabo este pago en los "
+#~ "próximos 8 días.\n"
+#~ "\n"
+#~ "Si hay un problema con el pago de la(s) factura(s) que desconocemos, no dude "
+#~ "en ponerse en contacto con nuestro departamento de contabilidad de manera "
+#~ "que podamos resolver el asunto lo más rápido posible.\n"
+#~ "\n"
+#~ "Los detalles de los pagos pendientes se listan a continuación.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ 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 ""
+#~ "E-Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Correo no enviado a las empresas siguientes, su email no estaba disponible.\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "All E-mails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Todos los correos han sido enviados a las empresas correctamente:.\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "E-Mail sent to following Partners successfully. !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Correo enviado a las siguientes empresas correctamente.\n"
+#~ "\n"
diff --git a/addons/account_followup/i18n/es_PY.po b/addons/account_followup/i18n/es_PY.po
index 71f275bcb5c..49ce2223022 100644
--- a/addons/account_followup/i18n/es_PY.po
+++ b/addons/account_followup/i18n/es_PY.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
-msgstr "Informe de seguimiento"
+msgid "Followup Summary"
+msgstr ""
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -800,6 +800,10 @@ msgstr "Criterios seguimiento"
 msgid "You can not create move line on view account."
 msgstr "No puede crear un movimiento en una cuenta de tipo vista."
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Informe de seguimiento"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_followup/i18n/es_VE.po b/addons/account_followup/i18n/es_VE.po
new file mode 100644
index 00000000000..a21c63bc72b
--- /dev/null
+++ b/addons/account_followup/i18n/es_VE.po
@@ -0,0 +1,1015 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_followup
+#
+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-20 13:02+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: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:298
+#, python-format
+msgid "Follwoup Summary"
+msgstr "Informe de seguimiento"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Search Followup"
+msgstr "Buscar seguimiento"
+
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+"\n"
+"    Módulos para automatizar cartas para facturas impagadas, con "
+"recordatorios multi-nivel.\n"
+"\n"
+"    Puede definir sus múltiples niveles de recordatorios a través del menú:\n"
+"        Contabilidad/Configuración/Misceláneos/Recordatorios\n"
+"\n"
+"    Una vez definido, puede automatizar la impresión de recordatorios cada "
+"día\n"
+"    simplemente haciendo clic en el menú:\n"
+"        Contabilidad/Procesos periódicos/Facturación/Enviar recordatorios\n"
+"\n"
+"    Se generará un PDF con todas las cartas en función de \n"
+"    los diferentes niveles de recordatorios definidos. Puede definir "
+"diferentes reglas\n"
+"    para diferentes empresas. Puede también enviar un correo electrónico al "
+"cliente.\n"
+"\n"
+"    Tenga en cuenta que si quiere modificar los niveles de recordatorios "
+"para una empresa/apunte contable, lo puede hacer desde el menú:\n"
+"        Contabilidad/Informes/Informes genéricos/Cuentas "
+"empresas/Recordatorios enviados\n"
+"\n"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:290
+#, python-format
+msgid ""
+"\n"
+"\n"
+"E-Mail sent to following Partners successfully. !\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,followup_line:0
+msgid "Follow-Up"
+msgstr "Seguimiento"
+
+#. module: account_followup
+#: field:account_followup.followup,company_id:0
+#: view:account_followup.stat:0
+#: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: account_followup
+#: field:account.followup.print.all,email_subject:0
+msgid "Email Subject"
+msgstr "Asunto correo electrónico"
+
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+"Seguimiento de los recordatorios enviados a sus clientes por facturas no "
+"pagadas."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr "Seleccionar empresas a recordar"
+
+#. module: account_followup
+#: 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_followup
+#: field:account.followup.print,date:0
+msgid "Follow-up Sending Date"
+msgstr "Fecha envío del seguimiento"
+
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr "Días naturales"
+
+#. 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 "Seguimientos"
+
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr "Balance > 0"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Total debe"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(heading)s: Move line header"
+msgstr "%(heading)s: Cabecera línea movimiento"
+
+#. module: account_followup
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
+msgstr "Mensaje de seguimiento"
+
+#. module: account_followup
+#: field:account.followup.print,followup_id:0
+msgid "Follow-up"
+msgstr "Seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "CIF/NIF:"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Date :"
+msgstr "Fecha :"
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_ids:0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:138
+#, python-format
+msgid "Invoices Reminder"
+msgstr "Recordatorio facturas"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup
+msgid "Account Follow Up"
+msgstr "Seguimiento contable"
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "End of Month"
+msgstr "Fin de mes"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Not Litigation"
+msgstr "No litigio"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(user_signature)s: User name"
+msgstr "%(user_signature)s: Nombre de usuario"
+
+#. module: account_followup
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
+"Esta funcionalidad le permite enviar recordatorios a las empresas con "
+"facturas pendientes. Puede enviarles el mensaje por defecto para facturas "
+"impagadas o introducir manualmente un mensaje si necesita recordarles alguna "
+"información específica."
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Ref"
+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 ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"seguimiento."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,email_body:0
+msgid "Email body"
+msgstr "Texto correo electrónico"
+
+#. module: account_followup
+#: field:account.move.line,followup_line_id:0
+msgid "Follow-up Level"
+msgstr "Nivel seguimiento"
+
+#. module: account_followup
+#: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
+msgid "Latest followup"
+msgstr "Último seguimiento"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"Estamos preocupados de ver que, a pesar de enviar un recordatorio, los pagos "
+"de su cuenta están ahora muy atrasados.\n"
+"\n"
+"Es esencial que realice el pago de forma inmediata, de lo contrario tendrá "
+"que considerar la suspensión de su cuenta, lo que significa que no seremos "
+"capaces de suministrar productos/servicios a su empresa.\n"
+"Por favor, tome las medidas oportunas para llevar a cabo este pago en los "
+"próximos 8 días.\n"
+"\n"
+"Si hay un problema con el pago de la(s) factura(s) que desconocemos, no dude "
+"en ponerse en contacto con nuestro departamento de contabilidad de manera "
+"que podamos resolver el asunto lo más rápido posible.\n"
+"\n"
+"Los detalles de los pagos pendientes se listan a continuación.\n"
+"\n"
+"Saludos cordiales,\n"
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_lang:0
+msgid "Send Email in Partner Language"
+msgstr "Enviar correo en el idioma de la empresa"
+
+#. module: account_followup
+#: 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_followup
+#: view:account.followup.print.all:0
+msgid "Partner Selection"
+msgstr "Selección empresa"
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr "Mensaje impreso"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
+#: 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 seguimientos"
+
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr "Empresa a recordar"
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr "Seguimientos"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"Salvo si hubiera un error por parte nuestra, parece que los siguientes "
+"importes están pendientes de pago. Por favor, tome las medidas oportunas "
+"para llevar a cabo este pago en los próximos 8 días.\n"
+"\n"
+"Si el pago hubiera sido realizado después de enviar este correo, por favor "
+"no lo tenga en cuenta. No dude en ponerse en contacto con nuestro "
+"departamento de contabilidad.\n"
+"\n"
+"Saludos cordiales,\n"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"A pesar de varios recordatorios, la deuda de su cuenta todavía no está "
+"resuelta.\n"
+"\n"
+"A menos que el pago total se realice en los próximos 8 días, las acciones "
+"legales para el cobro de la deuda se tomarán sin más aviso.\n"
+"\n"
+"Confiamos en que esta medida será innecesaria. Los detalles de los pagos "
+"pendientes se listan a continuación.\n"
+"\n"
+"Para cualquier consulta relativa a este asunto, no dude en ponerse en "
+"contacto con nuestro departamento de contabilidad.\n"
+"\n"
+"Saludos cordiales,\n"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Send Mails"
+msgstr "Enviar emails"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr "Estadísticas seguimiento por empresa"
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr "Gestión de los seguimientos/avisos contables"
+
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#. 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 ""
+"Este campo le permite seleccionar una fecha de previsión para planificar sus "
+"seguimientos"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Due"
+msgstr "Debido"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:56
+#, python-format
+msgid "Select Partners"
+msgstr "Seleccionar empresas"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Email Settings"
+msgstr "Configuración de correo electrónico"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Print Follow Ups"
+msgstr "Imprimir seguimientos"
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr "Último seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr "Subtotal:"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Balance:"
+msgstr "Saldo pendiente:"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup Statistics"
+msgstr "Estadísticas de seguimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s: User Name"
+msgstr "%(user_signature)s: Nombre del usuario"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. module: account_followup
+#: 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."
+
+#. module: account_followup
+#: field:account.followup.print.all,email_conf:0
+msgid "Send email confirmation"
+msgstr "Enviar correo electrónico de confirmación"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:287
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_name)s: User's Company name"
+msgstr "%(company_name): Nombre de la compañía del usuario"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Followup Lines"
+msgstr "Líneas de seguimiento"
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Fecha vencimiento"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(partner_name)s: Partner Name"
+msgstr "%(partner_name)s: Nombre de empresa"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr "Líneas de seguimiento"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr "%(company_currency)s: Divisa de la compañía del usuario"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr "Tipo de plazo"
+
+#. 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 "Imprimir seguimiento y enviar correo a clientes"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
+msgstr "Último movimiento"
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr "Informe de seguimientos"
+
+#. module: account_followup
+#: field:account_followup.stat,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "Follow-Up Lines"
+msgstr "Líneas de seguimiento"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Litigation"
+msgstr "Litigio"
+
+#. module: account_followup
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
+msgstr "Nivel superior seguimiento máx."
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+msgid "Payable Items"
+msgstr "Registros a pagar"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr "%(followup_amount)s: Total importe debido"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "%(date)s: Current Date"
+msgstr "%(date)s: Fecha actual"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Followup Level"
+msgstr "Nivel de seguimiento"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: report:account_followup.followup.print:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "This Fiscal year"
+msgstr "Este ejercicio fiscal"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr "Asientos de empresa"
+
+#. 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 ""
+"No cambie el texto del mensaje si quiere enviar correos en el idioma de la "
+"empresa o configurarlo desde la compañía."
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+msgid "Receivable Items"
+msgstr "Registros a cobrar"
+
+#. 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 "Seguimientos enviados"
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
+msgid "First move"
+msgstr "Primer movimiento"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity"
+msgstr "Vencimiento"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:289
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid "Continue"
+msgstr "Continuar"
+
+#. module: account_followup
+#: field:account_followup.followup.line,delay:0
+msgid "Days of delay"
+msgstr "Días de demora"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr "Documento: Estado contable del cliente"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Total haber"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(line)s: Ledger Posting lines"
+msgstr "%(line)s: Líneas incluídas en el libro mayor"
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(company_name)s: User's Company Name"
+msgstr "%(company_name)s: Nombre de la compañía del usuario"
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr "Ref. cliente :"
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(partner_name)s: Partner name"
+msgstr "%(partner_name)s: Nombre empresa"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Latest Followup Date"
+msgstr "Fecha último seguimiento"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Up Criteria"
+msgstr "Criterios seguimiento"
+
+#. module: account_followup
+#: 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."
+
+#~ msgid "All payable entries"
+#~ msgstr "Todas los asientos cuentas a pagar"
+
+#~ msgid "Select partners"
+#~ msgstr "Seleccionar empresas"
+
+#~ msgid "Account Type"
+#~ msgstr "Tipo de cuenta"
+
+#~ msgid "%(line)s: Account Move lines"
+#~ msgstr "%(line)s: Líneas de movimientos contables"
+
+#~ msgid "Follow-Ups Criteria"
+#~ msgstr "Criterios de seguimientos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Select partners to remind"
+#~ msgstr "Seleccionar empresas para recordar"
+
+#~ 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 "All receivable entries"
+#~ msgstr "Todos los asientos cuentas a cobrar"
+
+#~ msgid "Lines"
+#~ msgstr "Líneas"
+
+#~ msgid "Followup statistics"
+#~ msgstr "Estadísticas de seguimiento"
+
+#~ msgid "Follow-up and Date Selection"
+#~ msgstr "Selección seguimiento y fecha"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Mail sent to following Partners successfully, !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "¡Correo electrónico enviado correctamente a las siguientes empresas!\n"
+#~ "\n"
+
+#~ msgid "Amount In Currency"
+#~ msgstr "Importe en divisa"
+
+#, python-format
+#~ msgid ""
+#~ "Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "¡No se ha enviado correo electrónico a las siguientes empresas, su email no "
+#~ "está disponible!\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "All emails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Todos los correos electrónicos han sido enviados correctamente a las "
+#~ "empresas:\n"
+#~ "\n"
+
+#~ msgid "Print Follow Ups & Send Mails"
+#~ msgstr "Imprimir seguimientos & Enviar correos"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Exception made if there was a mistake of ours, it seems that the following "
+#~ "amount staid unpaid. Please, take appropriate measures in order to carry out "
+#~ "this payment in the next 8 days.\n"
+#~ "\n"
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "Salvo si hubiera un error por parte nuestra, parece que los siguientes "
+#~ "importes están pendientes de pago. Por favor, tome las medidas apropiadas "
+#~ "para llevar a cabo este pago en los próximos 8 días.\n"
+#~ "\n"
+#~ "Si el pago hubiera sido realizado después de enviar este correo, por favor "
+#~ "no lo tenga en cuenta. No dude en ponerse en contacto con nuestro "
+#~ "departamento de contabilidad.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "Despite several reminders, your account is still not settled.\n"
+#~ "\n"
+#~ "Unless full payment is made in next 8 days , then legal action for the "
+#~ "recovery of the debt, will be taken without further notice.\n"
+#~ "\n"
+#~ "I trust that this action will prove unnecessary and details of due payments "
+#~ "is printed below.\n"
+#~ "\n"
+#~ "In case of any queries concerning this matter, do not hesitate to contact "
+#~ "our accounting department at (+32).10.68.94.39.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "A pesar de varios recordatorios, la deuda de su cuenta todavía no está "
+#~ "resuelta.\n"
+#~ "\n"
+#~ "A menos que el pago total se realice en los próximos 8 días, las acciones "
+#~ "legales para el cobro de la deuda se tomarán sin más aviso.\n"
+#~ "\n"
+#~ "Confiamos en que esta medida será innecesaria y los detalles de los pagos "
+#~ "pendientes se listan a continuación.\n"
+#~ "\n"
+#~ "En caso de cualquier consulta relativa a este asunto, no dude en ponerse en "
+#~ "contacto con nuestro departamento de contabilidad.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Dear %(partner_name)s,\n"
+#~ "\n"
+#~ "We are disappointed to see that despite sending a reminder, that your "
+#~ "account is now seriously overdue.\n"
+#~ "\n"
+#~ "It is essential that immediate payment is made, otherwise we will have to "
+#~ "consider placing a stop on your account which means that we will no longer "
+#~ "be able to supply your company with (goods/services).\n"
+#~ "Please, take appropriate measures in order to carry out this payment in the "
+#~ "next 8 days\n"
+#~ "\n"
+#~ "If there is a problem with paying invoice that we are not aware of, do not "
+#~ "hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+#~ "we can resolve the matter quickly.\n"
+#~ "\n"
+#~ "Details of due payments is printed below.\n"
+#~ "\n"
+#~ "Best Regards,\n"
+#~ "\t\t\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Estimado %(partner_name)s,\n"
+#~ "\n"
+#~ "Estamos preocupados de ver que, a pesar de enviar un recordatorio, los pagos "
+#~ "de su cuenta están ahora muy atrasados.\n"
+#~ "\n"
+#~ "Es esencial que realice el pago de forma inmediata, de lo contrario tendrá "
+#~ "que considerar la suspensión de su cuenta, lo que significa que no seremos "
+#~ "capaces de suministrar productos/servicios a su empresa.\n"
+#~ "Por favor, tome las medidas apropiadas para llevar a cabo este pago en los "
+#~ "próximos 8 días.\n"
+#~ "\n"
+#~ "Si hay un problema con el pago de la(s) factura(s) que desconocemos, no dude "
+#~ "en ponerse en contacto con nuestro departamento de contabilidad de manera "
+#~ "que podamos resolver el asunto lo más rápido posible.\n"
+#~ "\n"
+#~ "Los detalles de los pagos pendientes se listan a continuación.\n"
+#~ "\n"
+#~ "Saludos cordiales,\n"
+#~ "\t\t\t"
+
+#~ 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 ""
+#~ "E-Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Correo no enviado a las empresas siguientes, su email no estaba disponible.\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "All E-mails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Todos los correos han sido enviados a las empresas correctamente:.\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "E-Mail sent to following Partners successfully. !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Correo enviado a las siguientes empresas correctamente.\n"
+#~ "\n"
diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po
index 4468412dcdd..e7b708a50af 100644
--- a/addons/account_followup/i18n/et.po
+++ b/addons/account_followup/i18n/et.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index 9f21cb9a375..54f526e547b 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.po
@@ -8,25 +8,25 @@ 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-08-02 21:31+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:21+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
-msgstr ""
+msgid "Followup Summary"
+msgstr "Muistutuksen yhteenveto"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "Hae muistutusta"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -56,7 +56,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:290
@@ -73,7 +73,7 @@ msgstr ""
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "Seuranta"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -98,12 +98,13 @@ msgstr "Sähköpostin aihe"
 msgid ""
 "Follow up on the reminders sent over to your partners for unpaid invoices."
 msgstr ""
+"Seuraa muistutuksia joita on lähetetty kumppanien maksamattomista laskuista"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "Legend"
-msgstr ""
+msgstr "Selite"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -113,38 +114,38 @@ msgstr "OK"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "Valitse muistutettavat kumppanit"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä suljetulle tilille."
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "Seurannan lähetyspäivä"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Väärä kredit tai debet arvo tiliviennissä"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr ""
+msgstr "Nettopäivät"
 
 #. 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 "Muistutukset"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Saldo > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -154,23 +155,23 @@ msgstr "Kokonais debet"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "%(heading)s: Siirtorivin otsiko"
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr ""
+msgstr "Seurantaviesti"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr ""
+msgstr "Seuranta"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "VAT:"
-msgstr ""
+msgstr "ALV:"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -193,12 +194,12 @@ msgstr "Kumppanit"
 #: code:addons/account_followup/wizard/account_followup_print.py:138
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "Laskumuistutus"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr ""
+msgstr "Tilin muistutus"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -208,12 +209,12 @@ msgstr "Kuukauden loppu"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "Ei peirttävä"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: käyttäjän nimi"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -227,16 +228,19 @@ msgid ""
 "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 ""
+"Ominaisuus mahdollistaa muistutusten lähettämisen kumppaneille joilla on "
+"odottavia laskuja. Voit lähettää oletusviestin maksamattomista laskuista tai "
+"syöttää viestin käsin jos haluat muistuttaa heitä erityisistä asioista."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr ""
+msgstr "Viite"
 
 #. 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 "Antaa järjestyksen näytettäessä muistutusrivejä."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -247,13 +251,13 @@ msgstr "Sähköposti runko"
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr ""
+msgstr "Muistutuksen taso"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
-msgstr ""
+msgstr "Viimeisin muistutus"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -278,11 +282,29 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Hyvä yhteistyökumppanimme %(partner_name)s,\n"
+"\n"
+"Olemme pettyneitä että muistutuksesta huolimatta laskunne ovat pahasti "
+"myöhässä.\n"
+"\n"
+"On tärkeää että maksu suoritetaan välittömästi, muuten meiden on harkitttava "
+"toimitusten keskeyttämistä\n"
+"jollloin emme voi enään toimittaa tuotteita tai palveluita teille.\n"
+"Olkaa hyvä ja suorittakaa maksu seuraavien 8 päivän aikana.\n"
+"\n"
+"Jos laskun maksamisessa on ongelmia joista emme ole tietoisia, olkaa hyvä ja "
+"ottakaa yhteyttä talousosastollemme, jotta ongelma voidaan ratkaista "
+"nopeasti.\n"
+"\n"
+"Erääntyneiden maksujen yksityiskohdat näkyvät alla.\n"
+"\n"
+"Ystävällisin terveisin.\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr ""
+msgstr "Lähetä sähköpostia kumppanin kielellä"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -307,18 +329,18 @@ msgstr "Tulostettu viesti"
 #: 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 "Lähetä muistutukset"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "Muistutettava kumppani"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr ""
+msgstr "Muistutukset"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -336,6 +358,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Hyvä yhteistyökumppanimme %(partner_name)s,\n"
+"\n"
+"Järjestelmämme tietojen mukaan yrityksellänne on seuraavat laskut myöhässä.\n"
+"Olkaa hyvä ja suorittakaa maksu seuraavien 8 päivän aikana.\n"
+"\n"
+"Mikäli laskunne on jo maksettu tämän ilmoituksen jälkeen, tämä ilmoitus on "
+"aiheeton.\n"
+"Tarvittaessa voitte ottaa yhteyttä talousosastollemme asioiden "
+"selvittämiseksi.\n"
+"\n"
+"Ystävällisin terveisin,\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -356,31 +390,45 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Hyvä yhteistyökumppanimme %(partner_name)s,\n"
+"\n"
+"Useista muistutuksista huolimatta, laskunne ovat yhä maksamatta.\n"
+"\n"
+"Jos maksua ei suoriteta seuraavien 8 päivän aikana, käynnistämme "
+"perintätoimet ilman erillistä ilmoitusta.\n"
+"\n"
+"Toivomme että perintätoimia ei tarvita ja maksatte allaolevat laskunne "
+"välittömästi.\n"
+"\n"
+"Tarvittaessa voitte ottaa yhteyttä talousosastollemme lisätietoja varten.\n"
+"\n"
+"Ystävällisin terveisin,\n"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Lähetä viestit"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuutta"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "Muistutustilastot kumppaneittain"
 
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Maksumuistutusten hallinta"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "Estetty"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -391,13 +439,13 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Due"
-msgstr ""
+msgstr "Erääntyy"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "Valitse kumppanit"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -407,17 +455,17 @@ msgstr "Sähköpostin asetukset"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr ""
+msgstr "Tulosta muistutukset"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr ""
+msgstr "Viimeisin muistutus"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Sub-Total:"
-msgstr ""
+msgstr "Alasumma:"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -427,7 +475,7 @@ msgstr "Balanssi"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "Maksumuistutusten tilastot"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -437,17 +485,17 @@ msgstr "Maksettu"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr ""
+msgstr "%(user_signature)s: käyttäjän nimi"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Päiväkirjan tapahtumat"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Yrityksen tulee olla sama liittyvälle tilille ja jaksolle."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
@@ -466,22 +514,22 @@ msgstr ""
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: Käyttäjän yrityksen nimi"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Yritykset"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr ""
+msgstr "Muistutusrivit"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -491,22 +539,22 @@ msgstr "Luotto"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Eräpäivä"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(partner_name)s: Kumppanin nimi"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr ""
+msgstr "Muistutusrivit"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "%(company_currency)s: Käyttäjän yrityksen valuutta"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -524,23 +572,23 @@ msgstr "Termin tyyppi"
 #: 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 "Tulosta muistutus ja lähetä sähköpostia asiakkaalle"
 
 #. 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 "Viimeisin siirto"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr ""
+msgstr "Muistutus raportti"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Jakso"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -551,38 +599,38 @@ msgstr "Peruuta"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr ""
+msgstr "Muistutusrivit"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr ""
+msgstr "Oikeudenkäynti"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr ""
+msgstr "Suurin muistutustaso"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "Maksettavat rivit"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "%(followup_amount)s: Maksettava kokonaissumma"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(date)s: Nykyinen päiväys"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr ""
+msgstr "Muistutuksen taso"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -594,12 +642,12 @@ msgstr "Kuvaus"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "Kuluva tilivuosi"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr ""
+msgstr "Kumppaniviennit"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
@@ -607,18 +655,20 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Älä vaihda viestin tekstiä, jos haluat lähettää sähköpostia kumppanin "
+"kielellä tai konfiguroida yrityksestä"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr ""
+msgstr "Saatavat rivit"
 
 #. 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 "Maksumuistutukset lähetetty"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -640,7 +690,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity"
-msgstr ""
+msgstr "Erääntyneet"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:289
@@ -664,13 +714,13 @@ msgstr "Viivästyspäivä"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Dokumentti : Asiakkaan tiliote"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Yhteenveto"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -685,37 +735,37 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s: Käyttäjän yrityksen nimi"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "Asiakkaan viite"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr ""
+msgstr "%(partner_name)s: Kumppanin nimi"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr ""
+msgstr "Viimeisimmän muistutuksen nimi"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr ""
+msgstr "Muistutuksen kriteeri"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä näkymätilille."
 
 #~ msgid "Select partners"
 #~ msgstr "Valitse kumppanit"
@@ -747,3 +797,36 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Muistutuksen yhteenveto"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "E-Mail sent to following Partners successfully. !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Sähköposti lähetetty onnistuneesti seuraaville kumppaneille !\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "All E-mails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kaikki sähköpostit on lähetetty onnistuneesti kumppaneille:.\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "E-Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sähköpostia ei lähetetty seuraaville kumppaneille. Sähköpostisosoitetta ei "
+#~ "löydy !\n"
+#~ "\n"
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index cad7d19fcdf..06fb9e56e6b 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 19:07+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-11-25 14:47+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Sommaire des suivis"
 
 #. module: account_followup
@@ -89,6 +89,11 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"Courriel envoyé vers les Partenaires suivants :\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -118,7 +123,7 @@ msgstr "Sujet du Message"
 #: 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 "Suivi des  rappels pour impayés envoyés aux partenaires."
+msgstr "Suivi des  relances pour impayés envoyées aux partenaires."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -181,7 +186,7 @@ msgstr "%(heading)s: entête de la ligne de Mouvement"
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "Message de suivi"
+msgstr "Message de relance"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
@@ -263,7 +268,7 @@ msgstr "Réf"
 msgid "Gives the sequence order when displaying a list of follow-up lines."
 msgstr ""
 "Donne l'ordre de la séquence quand vous affichez une liste des lignes de "
-"suivi."
+"relance."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -538,6 +543,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Tous les courriels ont été envoyés correctement vers les Partenaires :\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -728,6 +736,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Courriel non envoyé vers les Partenaires suivants (courriel indisponible) !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -844,6 +855,10 @@ msgstr ""
 #~ msgid "Follow-up and Date Selection"
 #~ msgstr "Sélection de la Relance et de la Date"
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Sommaire des suivis"
+
 #, python-format
 #~ msgid ""
 #~ "E-Mail not sent to following Partners, Email not available !\n"
diff --git a/addons/account_followup/i18n/gl.po b/addons/account_followup/i18n/gl.po
index 1b80e769385..961d940b9f8 100644
--- a/addons/account_followup/i18n/gl.po
+++ b/addons/account_followup/i18n/gl.po
@@ -8,19 +8,19 @@ 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-04 17:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-11-11 15:21+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Informe de seguimento"
 
 #. module: account_followup
@@ -770,6 +770,10 @@ msgstr "Criterios seguimento"
 msgid "You can not create move line on view account."
 msgstr "Non pode crear unha liña de movemento nunha conta de tipo vista."
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Informe de seguimento"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 2653801ca1b..949e2a81f10 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -8,18 +8,18 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-04 09:03+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po
index 5ea39cea504..eb819bd2cc2 100644
--- a/addons/account_followup/i18n/hu.po
+++ b/addons/account_followup/i18n/hu.po
@@ -7,19 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-18 11:24+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2011-11-11 15: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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Fizetési emlékeztető összesítő"
 
 #. module: account_followup
@@ -809,27 +810,9 @@ msgstr "Fizetési emlékeztető kritériumok"
 msgid "You can not create move line on view account."
 msgstr "Nem könyvelhet gyűjtő típusú számlára."
 
-#~ msgid ""
-#~ "All E-mails have been successfully sent to Partners:.\n"
-#~ "\"\n"
-#~ "\"\n"
-#~ "\"\n"
-#~ "\""
-#~ msgstr "Minden e-mail sikeresen kiküldésre került a partnereknek."
-
-#~ msgid ""
-#~ "E-Mail not sent to following Partners, Email not available !\n"
-#~ "\"\n"
-#~ "\"\n"
-#~ "\"\n"
-#~ "\""
-#~ msgstr ""
-#~ "E-mail a következő partnereknek nem került kiküldésre, mert az e-mail cím "
-#~ "nem érhető el!\n"
-#~ "\"\n"
-#~ "\"\n"
-#~ "\"\n"
-#~ "\""
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Fizetési emlékeztető összesítő"
 
 #, python-format
 #~ msgid ""
diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po
index c54639f4df1..d3bc65eeba9 100644
--- a/addons/account_followup/i18n/id.po
+++ b/addons/account_followup/i18n/id.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index f6f1ff931ad..b359fe17eb8 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-23 10:45+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:22+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Riepilogo Follow up"
 
 #. module: account_followup
@@ -789,8 +789,9 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Riepilogo Follow up"
 
 #, python-format
 #~ msgid ""
diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po
index 9c2dd6afab2..7a01f5b0e8b 100644
--- a/addons/account_followup/i18n/ko.po
+++ b/addons/account_followup/i18n/ko.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index bc197da3025..3469dd1c4f2 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/mn.po b/addons/account_followup/i18n/mn.po
index f9d585aad4c..a825beb3dd2 100644
--- a/addons/account_followup/i18n/mn.po
+++ b/addons/account_followup/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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po
index 7327ffc6da7..47397003eb4 100644
--- a/addons/account_followup/i18n/nb.po
+++ b/addons/account_followup/i18n/nb.po
@@ -8,19 +8,19 @@ 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-30 21:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-11-11 15:21+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Oppfølging Oppsummering"
 
 #. module: account_followup
@@ -747,6 +747,10 @@ msgstr "Oppfølgings kriterie"
 msgid "You can not create move line on view account."
 msgstr ""
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Oppfølging Oppsummering"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 42b47ea1ad0..cecfe969bbc 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 06:41+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:21+0000\n"
+"Last-Translator: Janverlaan <Unknown>\n"
 "Language-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-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Samenvatting aanmaningen"
 
 #. module: account_followup
@@ -1005,13 +1005,6 @@ msgstr "U kunt geen boekingsregel creëren op een zichtaccount"
 #~ "!\n"
 #~ "\n"
 
-#~ msgid ""
-#~ "Do not change message text, if you want to send email in partner language, "
-#~ "or configre from company"
-#~ msgstr ""
-#~ "Wijzig de berichttekst niet als u email wilt versturen in de taal van de "
-#~ "relatie of in wilt stellen vanaf het bedrijf."
-
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -1024,14 +1017,6 @@ msgstr "U kunt geen boekingsregel creëren op een zichtaccount"
 #~ "E-mail met succes verstuurd naar de volgende relaties:\n"
 #~ "\n"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Samenvatting aanmaningen"
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 7e62c539e9e..db85e04eb88 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
-msgstr "Samenvatting aanmaningen"
+msgid "Followup Summary"
+msgstr ""
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -810,6 +810,10 @@ msgstr ""
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Samenvatting aanmaningen"
+
 #, python-format
 #~ msgid ""
 #~ "All E-mails have been successfully sent to Partners:.\n"
diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po
index e62192f3f39..45cb9e71cd5 100644
--- a/addons/account_followup/i18n/oc.po
+++ b/addons/account_followup/i18n/oc.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index 0b74bcb19c5..d325bb542dc 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index fe8d775c6c9..a46c58fcacf 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index ae51c31b32d..a505b9e84b9 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-03 09:58+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:22+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Resumo de Acompanhamento"
 
 #. module: account_followup
@@ -752,6 +752,10 @@ msgstr "Você não pode criar linhas de movimento em uma conta de exibição."
 #~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
 #~ "especial!"
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Resumo de Acompanhamento"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po
index 450f68e9b99..e15f7e613d3 100644
--- a/addons/account_followup/i18n/ro.po
+++ b/addons/account_followup/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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index a94e6614d0f..892b009e954 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-02 21:37+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15: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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
-msgstr ""
+msgid "Followup Summary"
+msgstr "Напоминание кратко"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "Искать напоминание"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -97,6 +97,8 @@ msgstr "Тема эл.письма"
 msgid ""
 "Follow up on the reminders sent over to your partners for unpaid invoices."
 msgstr ""
+"Сопроводительное письмо, в дополнение к напоминаниям об оплате, отправляемым "
+"партнёрам."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -112,27 +114,27 @@ msgstr "OK"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "Выберите контрагентов для напоминания"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Нельзя сделать действие по закрытому счету."
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-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
@@ -143,7 +145,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
@@ -153,18 +155,18 @@ msgstr "Всего по дебету"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "%(heading)s: заголовок операции"
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr ""
+msgstr "Сообщение напоминания"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr ""
+msgstr "Напоминание"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -192,12 +194,12 @@ msgstr "Контрагенты"
 #: code:addons/account_followup/wizard/account_followup_print.py:138
 #, 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
@@ -207,7 +209,7 @@ msgstr "Конец месяца"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "Не судебное"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -226,6 +228,10 @@ msgid ""
 "You can send them the default message for unpaid invoices or manually enter "
 "a message should you need to remind them of a specific information."
 msgstr ""
+"Эта функция позволяет отправлять напоминания партнерам о рассматриваемых "
+"счетах. Вы можете отправить им сообщение по умолчанию для неоплаченного "
+"счета или ввести сообщение вручную, если необходима дополнительная "
+"информация."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -235,7 +241,7 @@ 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
@@ -277,17 +283,35 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Уважаемый %(partner_name)s,\n"
+"\n"
+"Мы разочарованы, что несмотря на напоминания, ваш долг всё ещё не погашен.\n"
+"\n"
+"Крайне важно немедленно совершить платёж, иначе мы будем вынуждены "
+"остановить операции по вашему счёту, что означает прекращение отгрузки "
+"товаров (оказания услуг) вашей компании.\n"
+"Пожалуйста, предпримите соответствующие действия в ближайшие 8 дней.\n"
+"\n"
+"Если есть какие-то проблемы с оплатой счёта, о которых мы не знаем, не "
+"стесняйтесь связаться с нашей бухгалтерией по телефону +7(495)2128506, чтобы "
+"мы могли совместно решить эту проблему.\n"
+"\n"
+"Подробности о задержанных платежах находятся ниже.\n"
+"\n"
+"Всего наилучшего,\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr ""
+msgstr "Послать эл. письмо на языке контрагента"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Нельзя сделать действие по дебетовому/кредитовому счету без контрагента"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -311,7 +335,7 @@ 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
@@ -359,33 +383,33 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Отправить письма"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+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
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Управление бухгалтерскими напоминаниями"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "Блокировано"
 
 #. 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
 #: report:account_followup.followup.print:0
@@ -396,7 +420,7 @@ 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
@@ -406,7 +430,7 @@ 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
@@ -426,7 +450,7 @@ msgstr "Баланс:"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "Статистика напоминаний"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -436,17 +460,17 @@ 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 "Company must be same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
@@ -465,7 +489,7 @@ 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
@@ -475,12 +499,12 @@ msgstr "%(company_name)s: Название компании пользовате
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Организации"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr ""
+msgstr "Строки напоминания"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -495,17 +519,17 @@ 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
@@ -523,13 +547,13 @@ msgstr "Тип термина"
 #: 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
@@ -539,7 +563,7 @@ msgstr "Отчет о дальнейших действиях"
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Период"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -550,22 +574,22 @@ msgstr "Отменить"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr ""
+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.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "Позиции к оплате"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -593,7 +617,7 @@ msgstr "Описание"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "Этот финансовый год"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -606,6 +630,8 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Не изменять текст сообщения, если вы хотите отослать письмо на языке "
+"контрагента, или настройте компанию"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -617,7 +643,7 @@ msgstr ""
 #: 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
 #: field:account_followup.followup,name:0
@@ -629,7 +655,7 @@ 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
@@ -663,7 +689,7 @@ msgstr "Дней задержки"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Документ: ведомость по счету заказчика"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -689,12 +715,12 @@ 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
 #: view:account.followup.print.all:0
@@ -714,7 +740,7 @@ msgstr ""
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Нельзя создать операцию по счету с типом Вид."
 
 #~ msgid "All payable entries"
 #~ msgstr "Все проводки к оплате"
@@ -748,3 +774,35 @@ msgstr ""
 
 #~ msgid "Lines"
 #~ msgstr "Линии"
+
+#, python-format
+#~ msgid ""
+#~ "All E-mails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Все эл. письма были отправлены контрагентам:.\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "E-Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Нет эл. адресов, эл. письма не отосланы следующим контрагентам !\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "E-Mail sent to following Partners successfully. !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Электронная почта отправлена контрагенту !\n"
+#~ "\n"
+
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Напоминание кратко"
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index f1e9c73ee08..6af57931c79 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/sq.po b/addons/account_followup/i18n/sq.po
index 4efb53bfbac..1c612e4b4f1 100644
--- a/addons/account_followup/i18n/sq.po
+++ b/addons/account_followup/i18n/sq.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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
index 226136b11c9..c90b1c2de39 100644
--- a/addons/account_followup/i18n/sr.po
+++ b/addons/account_followup/i18n/sr.po
@@ -8,19 +8,19 @@ 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-10-27 08:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:21+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Sumarno Pracenje"
 
 #. module: account_followup
@@ -921,6 +921,10 @@ msgstr ""
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "Odstampaj Pracenja & Posalji Meilove"
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Sumarno Pracenje"
+
 #, python-format
 #~ msgid ""
 #~ "All E-mails have been successfully sent to Partners:.\n"
@@ -929,9 +933,6 @@ msgstr ""
 #~ "Svi Email-ovi su uspeno poslati vasim partnerima:.\n"
 #~ "\n"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #, python-format
 #~ msgid ""
 #~ "E-Mail not sent to following Partners, Email not available !\n"
diff --git a/addons/account_followup/i18n/sr@latin.po b/addons/account_followup/i18n/sr@latin.po
index 82697117744..a02336e9bc9 100644
--- a/addons/account_followup/i18n/sr@latin.po
+++ b/addons/account_followup/i18n/sr@latin.po
@@ -8,25 +8,25 @@ 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-12-24 13:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-22 19:07+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-23 05:20+0000\n"
+"X-Generator: Launchpad (build 14336)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
-msgstr "Sumarno Pracenje"
+msgid "Followup Summary"
+msgstr "Sumarno praćenje"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr "Pretrazi Pracenja"
+msgstr "Pretraži praćenja"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -52,11 +52,31 @@ msgid ""
 "Sent\n"
 "\n"
 msgstr ""
+"\n"
+"    Moduli za automatizovana pisma za neplaćenbe fakture, sa podsećanjem na "
+"više nivoa.\n"
+"\n"
+"    Možete definisati višestruke nivoe podsećanja kroz meni:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Jednom kad budu definisani, možete štampati podsećanja svakodnevno\n"
+"    prostim klikom na meni:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    Generisaće se PDF datoteka sa svim pismima shodno\n"
+"    različitim nivoima podsećanja. Možete definisati različite načine\n"
+"    za različita preduzeća. Možete takođe poslati el.poštu stranci.\n"
+"\n"
+"    Zapazite da ako želite da izmenite nivo praćenja za datog "
+"partnera/stavku naloga, možete to uraditi iz menija:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr "Grupirano po"
+msgstr "Grupiši po..."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:290
@@ -68,12 +88,17 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"El.pošta uspešno poslata sledećim partnerim. !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr "Следи"
+msgstr "Sledi"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -86,7 +111,7 @@ msgstr "Preduzeće"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr "Datum računa"
+msgstr "Datum fakture"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
@@ -108,27 +133,27 @@ msgstr "Legenda"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Ok"
-msgstr "U redu"
+msgstr "OK"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "Izaberite partnere koje biste hteli podsetiti"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Ne možete da napravite poteznu liniju na zatvorenim računima."
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr "Datum Slanja Pracenja"
+msgstr "Datum slanja praćenja"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Pogrešna vrednost kredita ili debita u ulazu računa !"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -139,12 +164,12 @@ msgstr "Neto dana"
 #: 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 "Pracenja"
+msgstr "Praćenja"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Balans > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -154,18 +179,18 @@ msgstr "Ukupno duguje"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr "%(heading): Zaglavlje reda prijenosa"
+msgstr "%(heading): Zaglavlje reda prenosa"
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "Poruka Pracenja"
+msgstr "Poruka praćenja"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr "Pracenje"
+msgstr "Praćenje"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -198,17 +223,17 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr "Nalog Pracenja"
+msgstr "Nalog praćenja"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr "Kraj Meseca"
+msgstr "Kraj meseca"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr "Nije Sporno"
+msgstr "Nije sporno"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -227,22 +252,26 @@ msgid ""
 "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 ""
+"Ova funkcija omogućava Vam slanje podsetnika partnerima sa fakturama na "
+"čekanju. Možete im poslati podrazumevanu poruku za neplaćene fakture ili "
+"ručno uneti poruku, u slučaju da Vam treba da ih podsetite na neku "
+"specifičnu informaciju."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr "Referenca"
+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 "Daje redosled sekvenci pri prikazivanju linija pracenja"
+msgstr "Daje redosled sekvenci pri prikazivanju linija praćenja"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr "Sadrzaj Email-a"
+msgstr "Sadržaj E-mail-a"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -279,44 +308,46 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 "\n"
-"Postovani %(partner_name)\n"
-"Razocarani smo sto vam se moramo obracati ovako, saljuci vam opomenu, ali "
-"vas nalog je u ozbiljnom prekoracenju.\n"
+"Poštovani %(partner_name)\n"
+"Razočarani smo što je Vaš nalog u ozbiljnom prekoracenju, uprkos poslatom "
+"podsetniku.\n"
 "\n"
-"Vrlo je vazno da ispunite vase obaveze ka nama, inace ce mo biti prisiljeni "
-"da obustavimo vas nalog, sto u stvari znaci da necemo vise biti\n"
-"u mogucnosti da vase preduzece nadalje snabdevamo ( robom / servisiranjem).\n"
-"Molimo vas da preduzmete mere kako bi regulisali vasa dugovanja u sledecih 8 "
-"dana.\n"
+" Vrlo je važno da ispunite svoje obaveze ka nama, inače ćemo biti prisiljeni "
+"da obustavimo Vaš nalog, što u stvari znači da nećemo više biti\n"
+" u mogućnosti da Vaše preduzeće nadalje snabdevamo ( robom / "
+"servisiranjem).\n"
+" Molimo vas da preduzmete mere kako biste regulisali svoja dugovanja u "
+"sledećih 8 dana.\n"
 "\n"
-"Ukoliko postoji problem, vezan za fakturu, sa kojim nismo upoznati, ne "
-"ustrucavajte se da kontaktirate nase racunovodstvo na broj (+32) 20 555 666 "
-"kako bi smo razmotrili problem sto je hitnije moguce.\n"
+" Ukoliko postoji problem, vezan za fakturu, sa kojim nismo upoznati, ne "
+"ustručavajte se da kontaktirate naše računovodstvo na broj (+32) 20 555 666 "
+"kako bismo razmotrili problem što je hitnije moguće.\n"
 "\n"
-"Detalji vase fakture su prikazani ispod.\n"
+" Detalji Vaše fakture su prikazani ispod.\n"
 "\n"
-"Uz svo postovanje.\n"
+" Uz svo poštovanje.\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr "Posalji Email na jeziku Partnera"
+msgstr "Pošalji E-mail na jeziku partnera"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Ne možete napraviti poteznu liniju na primaćem/platežnom računu bez partnera"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr "Selekcija Partnera"
+msgstr "Izbor partnera"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr "Ispisana Poruka"
+msgstr "Ištampana poruka"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -330,7 +361,7 @@ msgstr "Pošalji praćenja"
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "Partner za podsećanje"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -355,17 +386,17 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 "\n"
-"postovani %(partner_name)\n"
+"Poštovani %(partner_name)\n"
 "\n"
-"Nacinjen je izuzetak ukoliko je ovo nasa greska, ali , cini se da je sledeci "
-"iznos ostao neplacen. Molimo vas da preduzmete odgovarajuce mere kako bi se "
-"ovo resilo u sledecih 8 dana.\n"
+"Načinjen je izuzetak ukoliko je ovo naša greška, ali , čini se da je sledeći "
+"iznos ostao neplaćen. Molimo Vas da preduzmete odgovarajuće mere kako bi se "
+"ovo rešilo u sledećih 8 dana.\n"
 "\n"
-"Ukoliko ste izvrsili uplatu u medjuvremenu, pre ovog Emaila, molimo "
-"smatrajte ga nebitnim. Ne ustrucavajte se da kontaktirate nase racunovodstvo "
+" Ukoliko ste izvršili uplatu u međuvremenu, pre ove el.pošte, molimo "
+"smatrajte ga nebitnim. Ne ustručavajte se da kontaktirate naše računovodstvo "
 "na broj (+32) 555 666.\n"
 "\n"
-"Svo Postovanje.\n"
+" Svo poštovanje.\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -405,7 +436,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr "Slanje Emailova"
+msgstr "Pošalji el.poštu"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -415,25 +446,24 @@ msgstr "Valuta"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "Statistike praćenja po partneru"
 
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr "Menadzment naloga Praćenja"
+msgstr "Uređivanje naloga praćenja"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr "Blokiran"
+msgstr "Blokirano"
 
 #. 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 ""
-"Ovo polje vam omogucava da selektujete udaljeni datum za planiranje vaseg "
-"pracenja"
+"Ovo polje Vam omogućava izbor udaljenog datuma za planiranje Vaših praćenja"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -444,17 +474,17 @@ msgstr "Dospeće"
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr "Selektuj Partnere"
+msgstr "Izaberi partnere"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr "Email Postavke"
+msgstr "Postavke el.pošte"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr "Stampaj Pracenja"
+msgstr "Odštampaj praćenja"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -464,17 +494,17 @@ msgstr "Poslednje praćenje"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Sub-Total:"
-msgstr "Subtotal"
+msgstr "Pod-total"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Balance:"
-msgstr "Saldo"
+msgstr "Balans:"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr "Statistika Pracenja"
+msgstr "Statistika praćenja"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -484,22 +514,22 @@ msgstr "Plaćeno"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr "%(user_signature): Korisnicko Ime"
+msgstr "%(user_signature): Korisničko Ime"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr "Sadrzaj Dnevnika"
+msgstr "Stavke dnevnika"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Preduzeće mora biti isto za sve vezane račune i periode."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr "Pošalji Email potvrdu"
+msgstr "Pošalji E-mail potvrdu"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:287
@@ -509,26 +539,29 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Sva el-pošta uspešno poslata partnerima:.\n"
+"\n"
+" %s"
 
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Greška! Ne možete da napravite rekurzivna preduzeća."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr "%(company_name)s: Ime preduzeca Korisnika"
+msgstr "%(company_name)s: Ime preduzeća korisnika"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr "Kompanije"
+msgstr "Preduzeća"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr "Linije Pracenja"
+msgstr "Linije praćenja"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -538,7 +571,7 @@ msgstr "Kredit"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr "Datum Dospeća"
+msgstr "Datum dospeća"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -548,30 +581,30 @@ msgstr "%(partner_name): Partnerovo Ime"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr "Redovi Praćenja"
+msgstr "Linije praćenja"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency)s: Valuta Preduzeca Korisnika"
+msgstr "%(company_currency)s: Valuta preduzeća korisnika"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
 #: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
-msgstr "Saldo"
+msgstr "Balans"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr "Tip Uslova"
+msgstr "Tip uslova"
 
 #. 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 "Stampaj Pracenje & Posalji Emailove Strankama"
+msgstr "Ištampaj praćenje & pošalji E-mailove strankama"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -582,12 +615,12 @@ msgstr "Poslednji potez"
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "Izvestaj Pracenja"
+msgstr "Izveštaj praćenja"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr "Razdoblje"
+msgstr "Period"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -598,7 +631,7 @@ msgstr "Otkaži"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr "Redovi Praćenja"
+msgstr "Linije praćenja"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -608,12 +641,12 @@ msgstr "Sporno"
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr ""
+msgstr "Maksimalan nivo praćenja"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr "Stavke Placanja"
+msgstr "Plative stavke"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -629,7 +662,7 @@ msgstr "%(datum)i: Trenutni Datum"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr "Nivo Pracenja"
+msgstr "Nivo praćenja"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -641,12 +674,12 @@ msgstr "Opis"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr "Fiskalna Godina"
+msgstr "Ova fiskalna godina"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr "Stavke Partnera"
+msgstr "Stavke partnera"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
@@ -654,26 +687,26 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
-"Ne menjajte ovaj text ukoliko zelite da posaljete Email na jeziku Partnera, "
-"ili ga konfigurisete po Preduzecu."
+"Ne menjajte ovaj tekst, ukoliko želite da posaljete el-poštu na jeziku "
+"partnera, ili ga konfigurišete po preduzecu."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr "Prijemne Stavke"
+msgstr "Prijemljive stavke"
 
 #. 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 "Pracenja Poslata"
+msgstr "Praćenja poslata"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
@@ -699,6 +732,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"El.pošta nije poslata sledećim partnerima, el.pošta nije dostupna !\n"
+"\n"
+" %s"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -713,13 +749,13 @@ msgstr "Dana kašnjenja"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr "Dokument:Korisnicka stavka naloga"
+msgstr "Dokument: Izjava korisničkog naloga"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,summary:0
 msgid "Summary"
-msgstr "Sumarno"
+msgstr "Sažetak"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -729,7 +765,7 @@ msgstr "Ukupno potražuje"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(line)s: Ledger Posting lines"
-msgstr "%(line): Ledger Posting lines"
+msgstr "%(linija)e: poslate iz glavnine"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
@@ -739,7 +775,7 @@ msgstr "Sekvenca"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr "%(company_name): Strankino Ime Preduzeca"
+msgstr "%(company_name): Naziv preduzeća korisnika"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -754,17 +790,21 @@ msgstr "%(partner_name)s: Partnerovo Ime"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr "Datum poslednjeg Pracenja"
+msgstr "Datum poslednjeg praćenja"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr "Kriterijum Pracenja"
+msgstr "Kriterijum praćenja"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Ne možete napraviti poteznu liniju na računu po viđenju"
+
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Sumarno Pracenje"
 
 #~ msgid "Account Type"
 #~ msgstr "Vrsta konta"
@@ -783,9 +823,6 @@ msgstr ""
 #~ "Svi Email-ovi su uspeno poslati vasim partnerima:.\n"
 #~ "\n"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index f2d3c61d05a..2f72407719f 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-20 07:09+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15: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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "Uppföljningssammanfattning"
 
 #. module: account_followup
@@ -721,11 +721,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "Uppföljningssammanfattning"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ogiltig XML för Vy-arkitektur!"
diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po
index da0d9cf240b..f21f6c69f75 100644
--- a/addons/account_followup/i18n/tlh.po
+++ b/addons/account_followup/i18n/tlh.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 4e4ce7e1db9..21ffd760e01 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-06-02 17:04+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:22+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:298
+#: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr "İzleme Özeti"
 
 #. module: account_followup
@@ -908,6 +908,10 @@ msgstr "Hesap Görünümünde hareket oluşturamazsınız."
 #~ msgid "Print Follow Ups & Send Mails"
 #~ msgstr "İş Takibini Yazdır ve Mail Gönder"
 
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "İzleme Özeti"
+
 #, python-format
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po
index f8aafaeba80..a1408c84682 100644
--- a/addons/account_followup/i18n/uk.po
+++ b/addons/account_followup/i18n/uk.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/vi.po b/addons/account_followup/i18n/vi.po
index e3ff74ab9ce..b0246b7f181 100644
--- a/addons/account_followup/i18n/vi.po
+++ b/addons/account_followup/i18n/vi.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
@@ -56,7 +56,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:290
@@ -73,7 +73,7 @@ msgstr ""
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "Theo dõi tiếp"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -81,17 +81,17 @@ msgstr ""
 #: field:account_followup.stat,company_id:0
 #: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Công ty"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Ngày Hóa đơn"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
-msgstr ""
+msgstr "Tiêu đề Thư điện tử"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_followup_stat
@@ -103,12 +103,12 @@ msgstr ""
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "Legend"
-msgstr ""
+msgstr "Chú giải"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Ok"
-msgstr ""
+msgstr "Đồng ý"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -149,7 +149,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Tổng nợ"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -170,24 +170,24 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "VAT:"
-msgstr ""
+msgstr "Thuế GTGT:"
 
 #. 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 "Đối tác"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+msgstr "Ngày :"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Các đối tác"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:138
@@ -203,7 +203,7 @@ msgstr ""
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr ""
+msgstr "Kết thúc Tháng"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -218,7 +218,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Nợ"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -231,7 +231,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr ""
+msgstr "Tham chiếu"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
@@ -365,7 +365,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+msgstr "Loại tiền tệ"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
@@ -380,7 +380,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bị phong toả"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -391,18 +391,18 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Due"
-msgstr ""
+msgstr "Đến hạn"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "Lựa chọn các Đối tác"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr ""
+msgstr "Thiết lập thư điện tử"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -422,7 +422,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Balance:"
-msgstr ""
+msgstr "Số dư:"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
@@ -432,7 +432,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Paid"
-msgstr ""
+msgstr "Đã thanh toán"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -466,7 +466,7 @@ msgstr ""
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -476,7 +476,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Các công ty"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -486,7 +486,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Bên có"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -496,7 +496,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(partner_name)s: Tên Đối tác"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -513,7 +513,7 @@ msgstr ""
 #: field:account_followup.stat,balance:0
 #: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Số dư"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
@@ -540,13 +540,13 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Chu kỳ"
 
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -571,13 +571,13 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "%(followup_amount)s: Tổng Giá trị tới hạn"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(date)s: Ngày Hiện tại"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -589,12 +589,12 @@ msgstr ""
 #: field:account_followup.followup,description:0
 #: report:account_followup.followup.print:0
 msgid "Description"
-msgstr ""
+msgstr "Mô tả"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "Năm tài chính này"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -624,7 +624,7 @@ msgstr ""
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr ""
+msgstr "Tên"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
@@ -654,7 +654,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
-msgstr ""
+msgstr "Tiếp tục"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
@@ -670,7 +670,7 @@ msgstr ""
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Tóm tắt"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -685,22 +685,22 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Trình tự"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s: Tên Công ty của Người sử dụng"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "Tham chiếu khách hàng :"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr ""
+msgstr "%(partner_name)s: Tên đối tác"
 
 #. module: account_followup
 #: view:account_followup.stat:0
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index d84a5ae4ddb..4f30093293d 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 10:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-11 15:22+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
-msgstr ""
+msgid "Followup Summary"
+msgstr "催款摘要"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "催款搜索"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -51,11 +51,25 @@ msgid ""
 "Sent\n"
 "\n"
 msgstr ""
+"\n"
+"    此模块会针对未付款的发票自动生成信件。\n"
+"可以定义多层催款层次。菜单是：\n"
+"  会计/设置/杂项/催款\n"
+"\n"
+"  定义好以后，你可以每天点击一下按钮自动生成和发送催款函\n"
+"  会计/定期处理/发票/发送催款函\n"
+"\n"
+"  它会根据催款层次自动生成PDF格式的催款函。\n"
+"  不同的公司策略也可以不同。还可以发邮件给客户。\n"
+"\n"
+"  如果想要改变某个客户或科目的催款层级，使用菜单：\n"
+"    会计/报告/通用报告/业务伙伴账户/发送催款函\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:290
@@ -72,7 +86,7 @@ msgstr ""
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr "跟进"
+msgstr "催款"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -96,7 +110,7 @@ msgstr "电子邮件主题"
 #: 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
@@ -112,22 +126,22 @@ msgstr "确定"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "选择合作伙伴，以提醒"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "您不能在关闭的科目上建立分录。"
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-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
@@ -138,12 +152,12 @@ msgstr "净天数"
 #: 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
@@ -159,12 +173,12 @@ msgstr "%(heading):凭证明细的头"
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "跟进消息"
+msgstr "催款消息"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr "跟进"
+msgstr "催款"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -186,18 +200,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:138
 #, 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
@@ -207,7 +221,7 @@ msgstr "月末"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "没争议"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -225,17 +239,17 @@ 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
@@ -246,13 +260,13 @@ 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
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -277,6 +291,27 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Copy text \t\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
@@ -306,18 +341,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
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -335,6 +370,20 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Copy text \t\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -355,48 +404,63 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+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
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr "会计跟进管理"
+msgstr "会计催款管理"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "已封锁"
 
 #. 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
 #: report:account_followup.followup.print:0
 msgid "Due"
-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
@@ -406,12 +470,12 @@ 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
 #: report:account_followup.followup.print:0
@@ -426,7 +490,7 @@ msgstr "余额:"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "催款统计"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -436,17 +500,17 @@ 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 "Company must be same for its related account and period."
-msgstr ""
+msgstr "相关帐户和会计期限必须相同。"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
@@ -465,22 +529,22 @@ 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 "用户公司名称:%(company_currency)s"
+msgstr "公司名称:%(company_currency)s"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr ""
+msgstr "催款明细"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -495,12 +559,12 @@ 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
@@ -523,23 +587,23 @@ msgstr "条件类型"
 #: 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
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "会计期间"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -550,22 +614,22 @@ msgstr "取消"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr "跟进明细"
+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.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "应付项"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -581,7 +645,7 @@ msgstr "当前日期:%(date)s"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr ""
+msgstr "催款等级"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -593,7 +657,7 @@ msgstr "说明"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "本会计年度"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -605,19 +669,19 @@ msgstr "业务伙伴凭证"
 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
 #: field:account_followup.followup,name:0
@@ -653,7 +717,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
-msgstr "继续"
+msgstr "下一步"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
@@ -663,7 +727,7 @@ msgstr "拖延天数"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr "文档: 客户科目对帐单"
+msgstr "文档: 客户帐户对帐单"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -679,7 +743,7 @@ 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
@@ -689,12 +753,12 @@ 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
 #: view:account.followup.print.all:0
@@ -704,17 +768,17 @@ 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 "催款标准"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "不能针对内部类型是视图的科目记账"
 
 #~ msgid "Amount In Currency"
 #~ msgstr "金额"
@@ -725,47 +789,6 @@ msgstr ""
 #~ msgid "Account Type"
 #~ msgstr "科目类型"
 
-#~ msgid ""
-#~ "\n"
-#~ "    Modules to automate letters for unpaid invoices, with multi-level "
-#~ "recalls.\n"
-#~ "\n"
-#~ "    You can define your multiple levels of recall through the menu:\n"
-#~ "        Financial Management/Configuration/Payment Terms/Follow-Ups\n"
-#~ "\n"
-#~ "    Once it's defined, you can automatically prints recall every days\n"
-#~ "    through simply clicking on the menu:\n"
-#~ "        Financial_Management/Periodical_Processing/Print_Follow-Ups\n"
-#~ "\n"
-#~ "    It will generate a PDF with all the letters according the the\n"
-#~ "    different levels of recall defined. You can define different policies\n"
-#~ "    for different companies.\n"
-#~ "\n"
-#~ "\n"
-#~ "    Note that if you want to change the followup level for a given "
-#~ "partner/account entry, you can do it in the menu:\n"
-#~ "        Financial_Management/Reporting/Follow-Ups/All Receivable Entries\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    模块能自动发送未支付的发票和多次跟进\n"
-#~ "\n"
-#~ "你能在菜单定义的多层重复提醒:\n"
-#~ "财务管理/设置/付款条件/跟进\n"
-#~ "\n"
-#~ "一旦确定,你就能自动地打印每日的重复提醒事件,\n"
-#~ "通过简单点击菜单:\n"
-#~ "          财务管理/期间处理/打印跟进\n"
-#~ "\n"
-#~ "它将产生一定义的不同级别自动提醒的财务信函的PDF.\n"
-#~ "你能定义不同公司的不同格式\n"
-#~ "针对不同公司\n"
-#~ "\n"
-#~ "\n"
-#~ "注意:如果你想要变更一业务伙伴/凭证的跟进级别,你可以在菜单:\n"
-#~ "          财务管理/报表/跟进/所有应收账款凭证\n"
-#~ "\n"
-
 #~ msgid "%(line)s: Account Move lines"
 #~ msgstr "凭证明细:%(line)s"
 
@@ -895,3 +918,35 @@ msgstr ""
 #~ msgstr ""
 #~ "电子邮件不发送到下列业务伙伴,电子邮箱无效!\n"
 #~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "All E-mails have been successfully sent to Partners:.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "所有邮件已成功发送到业务伙伴：\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "E-Mail sent to following Partners successfully. !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "成功发送邮件到下列业务伙伴\n"
+#~ "\n"
+
+#, python-format
+#~ msgid "Follwoup Summary"
+#~ msgstr "催款摘要"
+
+#, python-format
+#~ msgid ""
+#~ "E-Mail not sent to following Partners, Email not available !\n"
+#~ "\n"
+#~ msgstr ""
+#~ "电子邮件发送到下面业务伙伴，电子邮件无效!\n"
+#~ "\n"
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index 28feac44164..9e74a64a1f2 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
-msgid "Follwoup Summary"
+msgid "Followup Summary"
 msgstr ""
 
 #. module: account_followup
@@ -72,7 +72,7 @@ msgstr ""
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "跟進"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -80,17 +80,17 @@ msgstr ""
 #: field:account_followup.stat,company_id:0
 #: field:account_followup.stat.by.partner,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr ""
+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
@@ -132,13 +132,13 @@ 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
@@ -159,34 +159,34 @@ msgstr ""
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr ""
+msgstr "跟進訊息"
 
 #. 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 ""
+msgstr "增埴稅(VAT):"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,partner_id:0
 #: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "伙伴"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+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:138
@@ -202,12 +202,12 @@ msgstr ""
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr ""
+msgstr "月底"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "非訴訟"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -230,7 +230,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr ""
+msgstr "參考"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
@@ -241,18 +241,18 @@ msgstr ""
 #: 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
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -317,7 +317,7 @@ msgstr ""
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr ""
+msgstr "跟進"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -359,12 +359,12 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "發送郵件"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+msgstr "貨幣"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
@@ -379,7 +379,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "封鎖"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -390,7 +390,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Due"
-msgstr ""
+msgstr "到期"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:56
@@ -401,7 +401,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr ""
+msgstr "電郵設定"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -411,7 +411,7 @@ msgstr ""
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr ""
+msgstr "最新跟進"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -421,17 +421,17 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Balance:"
-msgstr ""
+msgstr "結餘:"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "跟進統計"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Paid"
-msgstr ""
+msgstr "已付"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr ""
+msgstr "發送電郵確認"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:287
@@ -475,12 +475,12 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr ""
+msgstr "跟進明細"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -500,7 +500,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr ""
+msgstr "跟進明細"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -512,12 +512,12 @@ msgstr ""
 #: 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
@@ -529,12 +529,12 @@ msgstr ""
 #: 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
 #: field:account_followup.stat,period_id:0
@@ -545,22 +545,22 @@ msgstr ""
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr ""
+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.act_account_partner_account_move_payable_all
@@ -576,24 +576,24 @@ msgstr ""
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(date)s: 當前日期"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr ""
+msgstr "跟進層次"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,description:0
 #: report:account_followup.followup.print:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "本財政年度"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -623,18 +623,18 @@ msgstr ""
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr ""
+msgstr "名稱"
 
 #. module: account_followup
 #: 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 "訴訟"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -653,12 +653,12 @@ msgstr ""
 #. 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
@@ -669,7 +669,7 @@ msgstr ""
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -684,7 +684,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "次序"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -694,17 +694,17 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "客戶參考 :"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr ""
+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
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 9081e862cfe..f2cf476e674 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -27,53 +27,52 @@ from report import report_sxw
 class report_rappel(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_rappel, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
+        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
-                                })
+        })
 
-    def _ids_to_objects(self, partner_ids):
+    def _ids_to_objects(self, ids):
         pool = pooler.get_pool(self.cr.dbname)
-        all_partners = []
-        for partner in pool.get('res.partner').browse(self.cr, self.uid, partner_ids):
-            if partner not in all_partners:
-                all_partners.append(partner)
-        return all_partners
+        all_lines = []
+        for line in pool.get('account_followup.stat.by.partner').browse(self.cr, self.uid, ids):
+            if line not in all_lines:
+                all_lines.append(line)
+        return all_lines
 
-    def _adr_get(self, partner, type):
+    def _adr_get(self, stat_line, type):
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
         res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
-        adr = res_partner.address_get(self.cr, self.uid, [partner.id], [type])[type]
+        adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
         return adr and res_partner_address.read(self.cr, self.uid, [adr]) or [{}]
 
-    def _lines_get(self, partner):
+    def _lines_get(self, stat_by_partner_line):
         pool = pooler.get_pool(self.cr.dbname)
         moveline_obj = pool.get('account.move.line')
         company_obj = pool.get('res.company')
         obj_currency =  pool.get('res.currency')
-        #FIXME: search on company accounting entries only
         movelines = moveline_obj.search(self.cr, self.uid,
-                [('partner_id', '=', partner.id),
+                [('partner_id', '=', stat_by_partner_line.partner_id.id),
                     ('account_id.type', '=', 'receivable'),
-                    ('reconcile_id', '=', False), ('state', '<>', 'draft')])
+                    ('reconcile_id', '=', False), ('state', '<>', 'draft'),('company_id','=', stat_by_partner_line.company_id.id)])
         movelines = moveline_obj.browse(self.cr, self.uid, movelines)
         base_currency = movelines[0].company_id.currency_id
         final_res = []
         line_cur = {base_currency.id: {'line': []}}
 
         for line in movelines:
-            if line.currency_id and (not line.currency_id.id in line_cur):
-                line_cur[line.currency_id.id] = {'line': []}
-            currency = line.currency_id or line.company_id.currency_id
+            if line.account_id.currency_id and (not line.account_id.currency_id.id in line_cur):
+                line_cur[line.account_id.currency_id.id] = {'line': []}
+            currency = line.account_id.currency_id or line.company_id.currency_id
             line_data = {
                          'name': line.move_id.name,
                          'ref': line.ref,
                          'date':line.date,
                          'date_maturity': line.date_maturity,
-                         'balance': line.currency_id and line.amount_currency or (line.debit - line.credit),
+                         'balance': currency.id <> line.company_id.currency_id.id and line.amount_currency or (line.debit - line.credit),
                          'blocked': line.blocked,
                          'currency_id': currency.symbol or currency.name,
                          }
@@ -85,7 +84,9 @@ class report_rappel(report_sxw.rml_parse):
         return final_res
 
 
-    def _get_text(self, partner, followup_id, context=None):
+    def _get_text(self, stat_line, followup_id, context=None):
+        if context is None:
+            context = {}
         fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup')
         fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line
         li_delay = []
@@ -94,11 +95,10 @@ class report_rappel(report_sxw.rml_parse):
         li_delay.sort(reverse=True)
         text = ""
         a = {}
-        partner_line = pooler.get_pool(self.cr.dbname).get('account.move.line').search(self.cr, self.uid, [('partner_id','=',partner.id),('reconcile_id','=',False)])
+        partner_line_ids = pooler.get_pool(self.cr.dbname).get('account.move.line').search(self.cr, self.uid, [('partner_id','=',stat_line.partner_id.id),('reconcile_id','=',False),('company_id','=',stat_line.company_id.id)])
         partner_delay = []
-        context={}
-        context.update({'lang': partner.lang})
-        for i in pooler.get_pool(self.cr.dbname).get('account.move.line').browse(self.cr, self.uid, partner_line, context):
+        context.update({'lang': stat_line.partner_id.lang})
+        for i in pooler.get_pool(self.cr.dbname).get('account.move.line').browse(self.cr, self.uid, partner_line_ids, context):
             for delay in li_delay:
                 if  i.followup_line_id and str(i.followup_line_id.delay)==str(delay):
                     text = i.followup_line_id.description
@@ -107,16 +107,16 @@ class report_rappel(report_sxw.rml_parse):
         text = partner_delay and a[max(partner_delay)] or ''
         if text:
             text = text % {
-                'partner_name': partner.name,
+                'partner_name': stat_line.partner_id.name,
                 'date': time.strftime('%Y-%m-%d'),
-                'company_name': fp_obj.browse(self.cr, self.uid, followup_id).company_id.name,
-                'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature,
+                'company_name': stat_line.company_id.name,
+                'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '',
             }
 
         return text
 
 report_sxw.report_sxw('report.account_followup.followup.print',
-        'res.partner', 'addons/account_followup/report/account_followup_print.rml',
+        'account_followup.stat.by.partner', 'addons/account_followup/report/account_followup_print.rml',
         parser=report_rappel)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 812f0aa0e50..92eda92e9ee 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -124,7 +124,7 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[ repeatIn(ids_to_objects(data['form']['partner_ids']),'o') ]] </para>
-    <para style="terp_default_8">[[ setLang(o.lang) ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     
     <blockTable colWidths="298.0,234.0" style="Tableau2">
       <tr>
@@ -132,7 +132,7 @@
           <para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.name or '' ]]</para>
+          <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>
@@ -141,7 +141,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">VAT: [[ o.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -150,7 +150,7 @@
     </para>
     <para style="terp_default_9">Document : Customer account statement</para>
     <para style="terp_default_9">Date : [[ formatLang(data['form']['date'],date=True) ]]</para>
-    <para style="terp_default_9">Customer Ref : [[ o.ref or '' ]]</para>
+    <para style="terp_default_9">Customer Ref : [[ o.partner_id.ref or '' ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index 8d4b914ffa6..c2a842cfd4c 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -45,30 +45,30 @@ class account_followup_stat(osv.osv):
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
                 context=None, count=False):
-            for arg in args:
-                if arg[0] == 'period_id' and arg[2] == 'current_year':
-                    current_year = self.pool.get('account.fiscalyear').find(cr, uid)
-                    ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
-                    args.append(['period_id','in',ids])
-                    args.remove(arg)
-            return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
-                context=context, count=count)
+        for arg in args:
+            if arg[0] == 'period_id' and arg[2] == 'current_year':
+                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
+                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                args.append(['period_id','in',ids])
+                args.remove(arg)
+        return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
+            context=context, count=count)
 
     def read_group(self, cr, uid, domain, *args, **kwargs):
-            for arg in domain:
-                if arg[0] == 'period_id' and arg[2] == 'current_year':
-                    current_year = self.pool.get('account.fiscalyear').find(cr, uid)
-                    ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
-                    domain.append(['period_id','in',ids])
-                    domain.remove(arg)
-            return super(account_followup_stat, self).read_group(cr, uid, domain, *args, **kwargs)
+        for arg in domain:
+            if arg[0] == 'period_id' and arg[2] == 'current_year':
+                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
+                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                domain.append(['period_id','in',ids])
+                domain.remove(arg)
+        return super(account_followup_stat, self).read_group(cr, uid, domain, *args, **kwargs)
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_followup_stat')
         cr.execute("""
             create or replace view account_followup_stat as (
                 SELECT
-                    l.partner_id as id,
+                    l.id as id,
                     l.partner_id AS partner_id,
                     min(l.date) AS date_move,
                     max(l.date) AS date_move_last,
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 55691cd9397..3f5d95a4fa6 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -41,7 +41,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Follow-ups Sent">
-              <group col="10" colspan="12">
+              <group>
               <filter icon="terp-go-year" string="This Fiscal year"
 			              name="fiscalyear"
 			              domain="[('period_id','in','current_year')]"
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
new file mode 100644
index 00000000000..f21c21e2367
--- /dev/null
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <record id="account_followup_comp_rule" model="ir.rule">
+        <field name="name">Account Followup multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_account_followup_followup"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+     
+    <record id="account_followup_stat_by_partner_comp_rule" model="ir.rule">
+        <field name="name">Account Followup Statistics by Partner Rule</field>
+        <field ref="model_account_followup_stat_by_partner" name="model_id"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+     
+    </data>
+</openerp>
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index b43ca32d200..2650a40a7ad 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -105,4 +105,5 @@
     self.do_print(cr, uid, [ref("account_followup_print_all_0")], {"lang": 'en_US',
       "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")],
       "tz": False, "date": time.strftime('%Y-%m-%d'), "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"),
+      "company_id": ref('base.main_company'),
       })
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 18b0fc1b874..ea1083f26ff 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -31,8 +31,8 @@ class account_followup_print(osv.osv_memory):
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
         'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
-        'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True)
-                }
+        'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
+    }
 
     def _get_followup(self, cr, uid, context=None):
         if context is None:
@@ -51,7 +51,7 @@ class account_followup_print(osv.osv_memory):
         data = self.browse(cr, uid, ids, context=context)[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        context.update({'followup_id': data.followup_id.id, 'date':data.date})
+        context.update({'followup_id': data.followup_id.id, 'date': data.date, 'company_id': data.followup_id.company_id.id})
         return {
             'name': _('Select Partners'),
             'view_type': 'form',
@@ -87,10 +87,13 @@ class account_followup_stat_by_partner(osv.osv):
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_followup_stat_by_partner')
+        # Here we don't have other choice but to create a virtual ID based on the concatenation
+        # of the partner_id and the company_id. An assumption that the number of companies will
+        # not reach 10 000 records is made, what should be enough for a time.
         cr.execute("""
             create or replace view account_followup_stat_by_partner as (
                 SELECT
-                    l.partner_id AS id,
+                    l.partner_id * 10000 + l.company_id as id,
                     l.partner_id AS partner_id,
                     min(l.date) AS date_move,
                     max(l.date) AS date_move_last,
@@ -115,12 +118,13 @@ class account_followup_print_all(osv.osv_memory):
     _name = 'account.followup.print.all'
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
-        'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True, domain="[('account_id.type', '=', 'receivable'), ('account_id.reconcile', '=', True), ('reconcile_id','=', False), ('state', '!=', 'draft'), ('account_id.active', '=', True), ('debit', '>', 0)]"),
+        'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
         'email_conf': fields.boolean('Send email confirmation'),
         'email_subject': fields.char('Email Subject', size=64),
         'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
         'email_body': fields.text('Email body'),
-        'summary': fields.text('Summary', required=True, readonly=True)
+        'summary': fields.text('Summary', required=True, readonly=True),
+        'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
     }
     def _get_summary(self, cr, uid, context=None):
         if context is None:
@@ -147,6 +151,8 @@ class account_followup_print_all(osv.osv_memory):
             context = {}
         if ids:
             data = self.browse(cr, uid, ids, context=context)[0]
+        company_id = 'company_id' in context and context['company_id'] or data.company_id.id
+
         cr.execute(
             "SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
             "FROM account_move_line AS l "\
@@ -158,7 +164,8 @@ class account_followup_print_all(osv.osv_memory):
                 "AND (l.partner_id is NOT NULL) "\
                 "AND (a.active) "\
                 "AND (l.debit > 0) "\
-            "ORDER BY l.date")
+                "AND (l.company_id = %s) "\
+            "ORDER BY l.date", (company_id,))
         move_lines = cr.fetchall()
         old = None
         fups = {}
@@ -188,16 +195,16 @@ class account_followup_print_all(osv.osv_memory):
                 continue
             if followup_line_id not in fups:
                 continue
+            stat_line_id = partner_id * 10000 + company_id
             if date_maturity:
                 if date_maturity <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
                     if partner_id not in partner_list:
-                        partner_list.append(partner_id)
+                        partner_list.append(stat_line_id)
                     to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': partner_id}
             elif date and date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
                 if partner_id not in partner_list:
-                    partner_list.append(partner_id)
-                to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': partner_id}
-
+                    partner_list.append(stat_line_id)
+                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):
@@ -205,6 +212,7 @@ class account_followup_print_all(osv.osv_memory):
         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 = {}
@@ -223,7 +231,7 @@ class account_followup_print_all(osv.osv_memory):
                 partners.append(line.partner_id)
                 dict_lines[line.partner_id.id] =line
             for partner in partners:
-                ids_lines = move_obj.search(cr,uid,[('partner_id','=',partner.id),('reconcile_id','=',False),('account_id.type','in',['receivable'])])
+                ids_lines = move_obj.search(cr,uid,[('partner_id','=',partner.id),('reconcile_id','=',False),('account_id.type','in',['receivable']),('company_id','=',context.get('company_id', False))])
                 data_lines = move_obj.browse(cr, uid, ids_lines, context=context)
                 followup_data = dict_lines[partner.id]
                 dest = False
@@ -277,7 +285,7 @@ class account_followup_print_all(osv.osv_memory):
                 msg = ''
                 if dest:
                     try:
-                        tools.email_send(src, dest, sub, body)
+                        mail_message.schedule_with_attach(cr, uid, src, dest, sub, body, context=context)
                         msg_sent += partner.name + '\n'
                     except Exception, e:
                         raise osv.except_osv('Error !', e )
@@ -287,7 +295,7 @@ class account_followup_print_all(osv.osv_memory):
             if not msg_unsent:
                 summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent
             else:
-                msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n%s") % msg_unsent
+                msg_unsent = _("E-Mail not sent to following Partners, E-mail not available !\n\n%s") % msg_unsent
                 msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent
                 line = '=========================================================================='
                 summary = msg_unsent + line + msg_sent
@@ -296,7 +304,7 @@ class account_followup_print_all(osv.osv_memory):
             context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
 
         return {
-            'name': _('Follwoup Summary'),
+            'name': _('Followup Summary'),
             'view_type': 'form',
             'context': context,
             'view_mode': 'tree,form',
@@ -315,14 +323,15 @@ class account_followup_print_all(osv.osv_memory):
         to_update = res
         data['followup_id'] = 'followup_id' in context and context['followup_id'] or False
         date = 'date' in context and context['date'] or data['date']
-        for id in to_update.keys():
-            if to_update[id]['partner_id'] in data['partner_ids']:
-                cr.execute(
-                    "UPDATE account_move_line "\
-                    "SET followup_line_id=%s, followup_date=%s "\
-                    "WHERE id=%s",
-                    (to_update[id]['level'],
-                    date, int(id),))
+        if not data['test_print']:
+            for id in to_update.keys():
+                if to_update[id]['partner_id'] in data['partner_ids']:
+                    cr.execute(
+                        "UPDATE account_move_line "\
+                        "SET followup_line_id=%s, followup_date=%s "\
+                        "WHERE id=%s",
+                        (to_update[id]['level'],
+                        date, int(id),))
         data.update({'date': context['date']})
         datas = {
              'ids': [],
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index af105b17c55..ce178d9fa24 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -13,7 +13,6 @@
                 <group col="4" colspan="6">
                     <field name="followup_id"/>
                     <field name="date"/>
-                    <newline/>
                 </group>
                 <separator colspan="4"/>
                 <group col="2" colspan="4">
@@ -81,11 +80,12 @@
                         <notebook>
                             <page string="Partner Selection">
                                 <separator string="Select Partners to Remind" colspan="4"/>
-                                <field name="partner_ids" colspan="4" nolabel="1" context="{'search_default_balance_positive': 1}"/>
+                                <field name="partner_ids" colspan="4" nolabel="1" context="{'search_default_balance_positive': 1}" domain="[('company_id','=',context.get('company_id',False))]"/>
                             </page>
                             <page string="Email Settings">
                                 <field name="email_conf" colspan="4"/>
                                 <field name="partner_lang" colspan="4"/>
+                                <field name="test_print" colspan="4"/>
                                 <field name="email_subject" colspan="4"/>
                                 <separator string="Email body" colspan="4" />
                                 <field name="email_body" colspan="4" nolabel="1"/>
@@ -136,7 +136,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
-
     </data>
 </openerp>
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index b045b7b0b5d..557f3c2e02c 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Improve Invoice Layout',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module provides some features to improve the layout of the invoices.
diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
index ba7f44f0661..d5148b41cd3 100644
--- a/addons/account_invoice_layout/account_invoice_layout_report.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-	<report id="account_invoices_1"
-			string="Invoices with Layout"
-			model="account.invoice"
-			name="account.invoice.layout"
-			rml="account_invoice_layout/report/report_account_invoice_layout.rml"
-			auto="False"/>
-	
-	<report id="account_invoices_layout_message"
-			menu="False"
-			string="Invoices with Layout and Message"
-			model="account.invoice"
-			name="notify_account.invoice"
-			rml="account_invoice_layout/report/special_message_invoice.rml"
-			auto="False"/>
+    <report id="account_invoices_1"
+            string="Invoices"
+            model="account.invoice"
+            name="account.invoice.layout"
+            rml="account_invoice_layout/report/report_account_invoice_layout.rml"
+            auto="False"/>
+    
+    <report id="account_invoices_layout_message"
+            menu="False"
+            string="Invoices and Message"
+            model="account.invoice"
+            name="notify_account.invoice"
+            rml="account_invoice_layout/report/special_message_invoice.rml"
+            auto="False"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index c8bb5e84031..062349f7716 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="name" position="before">
-                    <field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
+                    <field name="state" on_change="onchange_invoice_line_view(state)" />
                     <field name="sequence"/>
             	</field>
             </field>
@@ -23,6 +23,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <xpath expr="/tree/field[@name='name']" position="before">
+                    <field name="state" invisible="1"/>
                     <field name="sequence" string="Seq."/>
                 </xpath>
             </field>
@@ -54,6 +55,18 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="account_invoice_supplier_form_layout">
+          <field name="name">account.invoice.supplier.form.layout</field>
+          <field name="model">account.invoice</field>
+          <field name="inherit_id" ref="account.invoice_supplier_form"/>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+            <xpath expr="//field[@name='invoice_line']/tree/*[1]" position="before">
+              <field name="state" invisible="1"/>
+            </xpath>
+          </field>
+        </record>
+
 <!-- notification message views -->
     <record model="ir.ui.view" id="view_notify_message_search">
         <field name="name">notify.message.search</field>
diff --git a/addons/account_invoice_layout/i18n/ar.po b/addons/account_invoice_layout/i18n/ar.po
index ee93c8f0fa5..f8f2f7c9406 100644
--- a/addons/account_invoice_layout/i18n/ar.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/bg.po b/addons/account_invoice_layout/i18n/bg.po
index 4e3bc9b0b2b..9bba1a03f54 100644
--- a/addons/account_invoice_layout/i18n/bg.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -366,12 +366,6 @@ msgstr "Данъци :"
 msgid "All Notification Messages"
 msgstr "Всички съобщения за исвестяване"
 
-#~ msgid "Document"
-#~ msgstr "Документ"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Дата на фактура:"
 
diff --git a/addons/account_invoice_layout/i18n/bs.po b/addons/account_invoice_layout/i18n/bs.po
index 62853cbb6ff..824674b7ab2 100644
--- a/addons/account_invoice_layout/i18n/bs.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -370,9 +370,6 @@ msgstr "Sve napomene"
 #~ msgid "VAT :"
 #~ msgstr "PDV :"
 
-#~ msgid "Description/Taxes"
-#~ msgstr "Opis/Porezi"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Datum Fakture:"
 
@@ -381,18 +378,9 @@ msgstr "Sve napomene"
 #~ msgstr ""
 #~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Uklj. porez):"
-
-#~ msgid ")"
-#~ msgstr ")"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
 
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
@@ -402,12 +390,6 @@ msgstr "Sve napomene"
 #~ msgid "Tel. :"
 #~ msgstr "Tel. :"
 
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Ukupno (bez poreza):"
-
-#~ msgid "Note :"
-#~ msgstr "Napomena :"
-
 #~ msgid "Total"
 #~ msgstr "Ukupno"
 
diff --git a/addons/account_invoice_layout/i18n/ca.po b/addons/account_invoice_layout/i18n/ca.po
index 720bc1271a4..517626154eb 100644
--- a/addons/account_invoice_layout/i18n/ca.po
+++ b/addons/account_invoice_layout/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: 2011-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/cs.po b/addons/account_invoice_layout/i18n/cs.po
index bdc71735c1b..c1d6d2da3bf 100644
--- a/addons/account_invoice_layout/i18n/cs.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -384,3 +384,6 @@ msgstr "Všechna oznámení"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/account_invoice_layout/i18n/da.po b/addons/account_invoice_layout/i18n/da.po
new file mode 100644
index 00000000000..a7321fbf92c
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/da.po
@@ -0,0 +1,366 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-08 22:26+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr "Sub total"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices with Layout and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.module.module,description:account_invoice_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides some features to improve the layout of the "
+"invoices.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an invoice\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    Moreover, there is one option which allows you to print all the selected "
+"invoices with a given special message at the bottom of it. This feature can "
+"be very useful for printing your invoices with end-of-year wishes, special "
+"punctual conditions...\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices with Layout"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "Invoices Layout Improvement"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""
diff --git a/addons/account_invoice_layout/i18n/de.po b/addons/account_invoice_layout/i18n/de.po
index 89b46664c82..f8862068985 100644
--- a/addons/account_invoice_layout/i18n/de.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -380,12 +380,6 @@ msgstr "Umsatzsteuer:"
 msgid "All Notification Messages"
 msgstr "Zeige alle Meldungen an"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Rechnungsdatum:"
 
@@ -431,41 +425,5 @@ msgstr "Zeige alle Meldungen an"
 #~ msgid "Document:"
 #~ msgstr "Dokument:"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(inkl. Steuer)"
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
-#~ msgid "Note :"
-#~ msgstr "Anmerkung:"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Beschreibung / Steuer"
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Gesamt (Ohne Steuer)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Partner Ref."
-#~ msgstr "Partner Ref."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Wir machen Sie zum Experten"
diff --git a/addons/account_invoice_layout/i18n/el.po b/addons/account_invoice_layout/i18n/el.po
index 2b326f167a1..d96997e8fc9 100644
--- a/addons/account_invoice_layout/i18n/el.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -393,9 +393,6 @@ msgstr "Όλα τα μηνύματα ειδοποίησης"
 #~ msgid "Customer Ref:"
 #~ msgstr "Σχετ. Πελάτης:"
 
-#~ msgid "Document"
-#~ msgstr "Έγγραφο"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "account_invoice_layout"
 
@@ -405,9 +402,6 @@ msgstr "Όλα τα μηνύματα ειδοποίησης"
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Taxes"
 #~ msgstr "Φόροι"
 
@@ -432,32 +426,5 @@ msgstr "Όλα τα μηνύματα ειδοποίησης"
 #~ msgid "Document:"
 #~ msgstr "Έγγραφο:"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(με φόρους)"
-
-#~ msgid "Note :"
-#~ msgstr "Σημείωση :"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Περιγραφή/Φόροι"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Σύνολο (Χωρίς φόρους)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Γίνε Ειδικός με τους Ειδικούς..."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος! Δεν μπορείς να δημηιουργήσεις κενό Μενού!"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Αναφορά Συνεργάτη"
diff --git a/addons/account_invoice_layout/i18n/es.po b/addons/account_invoice_layout/i18n/es.po
index 2da709a377f..7491f5eb009 100644
--- a/addons/account_invoice_layout/i18n/es.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -383,12 +383,6 @@ msgstr "Impuestos :"
 msgid "All Notification Messages"
 msgstr "Todos los mensajes de notificación"
 
-#~ msgid "Document"
-#~ msgstr "Documento"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Fecha factura:"
 
@@ -436,39 +430,3 @@ msgstr "Todos los mensajes de notificación"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Note :"
-#~ msgstr "Nota :"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Total (Imp. excl.)"
-
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Imp. incl.)"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Descripción/Imp."
-
-#~ msgid "Partner Ref."
-#~ msgstr "Ref. empresa"
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Sea experto con los expertos..."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/account_invoice_layout/i18n/es_AR.po b/addons/account_invoice_layout/i18n/es_AR.po
index 1c08d3636b8..1cc92b71ed9 100644
--- a/addons/account_invoice_layout/i18n/es_AR.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -378,18 +378,12 @@ msgstr "Todos los mensajes de notificación"
 #~ msgid "Customer Ref:"
 #~ msgstr "Ref. cliente:"
 
-#~ msgid "Document"
-#~ msgstr "Documento"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "contabilidad_factura_plantilla"
 
 #~ msgid "Canceled Invoice"
 #~ msgstr "Factura cancelada"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
diff --git a/addons/account_invoice_layout/i18n/es_EC.po b/addons/account_invoice_layout/i18n/es_EC.po
index 9293f38de23..2f9db766de1 100644
--- a/addons/account_invoice_layout/i18n/es_EC.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -392,21 +392,12 @@ msgstr "Todos los mensajes de notificación"
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 #~ "especial!"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Imp. incl.)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
 #~ msgid "Customer Ref:"
 #~ msgstr "Ref. cliente:"
 
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
@@ -419,20 +410,11 @@ msgstr "Todos los mensajes de notificación"
 #~ msgid "Document:"
 #~ msgstr "Documento:"
 
-#~ msgid "Description/Taxes"
-#~ msgstr "Descripción/Imp."
-
 #~ msgid "VAT :"
 #~ msgstr "IVA :"
 
-#~ msgid "Note :"
-#~ msgstr "Nota :"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "contabilidad_factura_plantilla"
 
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Total (Imp. excl.)"
-
 #~ msgid "Total"
 #~ msgstr "Total"
diff --git a/addons/account_invoice_layout/i18n/es_MX.po b/addons/account_invoice_layout/i18n/es_MX.po
new file mode 100644
index 00000000000..5446a54a4f4
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/es_MX.po
@@ -0,0 +1,432 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_layout
+#
+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-01-13 17:11+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:27+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr "Observación:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices with Layout and Message"
+msgstr "Facturas con plantilla y mensaje"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr "Notificar mediante mensajes"
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+"Esta notificación aparecerá en la parte inferior de las facturas cuando sean "
+"impresas."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: account_invoice_layout
+#: model:ir.module.module,description:account_invoice_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides some features to improve the layout of the "
+"invoices.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an invoice\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    Moreover, there is one option which allows you to print all the selected "
+"invoices with a given special message at the bottom of it. This feature can "
+"be very useful for printing your invoices with end-of-year wishes, special "
+"punctual conditions...\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona varias funcionalidades para mejorar la "
+"presentación de las facturas.\n"
+"\n"
+"    Permite la posibilidad de:\n"
+"        * ordenar todas las líneas de una factura\n"
+"        * añadir títulos, líneas de comentario, líneas con subtotales\n"
+"        * dibujar líneas horizontales y poner saltos de página\n"
+"\n"
+"    Además existe una opción que permite imprimir todas las facturas "
+"seleccionadas con un mensaje especial en la parte inferior. Esta "
+"característica puede ser muy útil para imprimir sus facturas con "
+"felicitaciones de fin de año, condiciones especiales puntuales, ...\n"
+"\n"
+"    "
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr "Mensaje notificación"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"factura."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr "Cuenta origen"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr "Escribir mensajes"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr "Base"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr "Salto de página"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr "Mensaje especial"
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr "Mensaje a imprimir en el pie del informe."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr "Factura de abono"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr "Seleccionar mensaje"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices with Layout"
+msgstr "Facturas con plantilla"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr "Descripción/Imp."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr "Soluciones ERP & CRM..."
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr "Número de secuencia"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr "Mensaje especial factura contable"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr "Línea de separación"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: account_invoice_layout
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "Invoices Layout Improvement"
+msgstr "Mejora de la plantilla de las facturas"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr "Base:"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr "Escriba una notificación o un mensaje de felicitación"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr "Factura de abono de proveedor"
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr "Todos los mensajes de notificación"
+
+#~ msgid "Invoice Date:"
+#~ msgstr "Fecha factura:"
+
+#~ 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 "Customer Ref:"
+#~ msgstr "Ref. cliente:"
+
+#~ msgid "account_invoice_layout"
+#~ msgstr "contabilidad_factura_plantilla"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "Fax :"
+#~ msgstr "Fax :"
+
+#~ msgid "Tel. :"
+#~ msgstr "Tel. :"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Total (excl. taxes):"
+#~ msgstr "Total (sin impuestos):"
+
+#~ msgid "Taxes"
+#~ msgstr "Impuestos"
+
+#~ msgid "VAT :"
+#~ msgstr "IVA :"
+
+#~ msgid "(incl. taxes):"
+#~ msgstr "(con impuestos):"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Document:"
+#~ msgstr "Documento:"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/account_invoice_layout/i18n/es_PY.po b/addons/account_invoice_layout/i18n/es_PY.po
index 82aa82c870b..b7cacc7433e 100644
--- a/addons/account_invoice_layout/i18n/es_PY.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/es_VE.po b/addons/account_invoice_layout/i18n/es_VE.po
new file mode 100644
index 00000000000..5446a54a4f4
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/es_VE.po
@@ -0,0 +1,432 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_layout
+#
+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-01-13 17:11+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:27+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr "Observación:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices with Layout and Message"
+msgstr "Facturas con plantilla y mensaje"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr "Notificar mediante mensajes"
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+"Esta notificación aparecerá en la parte inferior de las facturas cuando sean "
+"impresas."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: account_invoice_layout
+#: model:ir.module.module,description:account_invoice_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides some features to improve the layout of the "
+"invoices.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an invoice\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    Moreover, there is one option which allows you to print all the selected "
+"invoices with a given special message at the bottom of it. This feature can "
+"be very useful for printing your invoices with end-of-year wishes, special "
+"punctual conditions...\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona varias funcionalidades para mejorar la "
+"presentación de las facturas.\n"
+"\n"
+"    Permite la posibilidad de:\n"
+"        * ordenar todas las líneas de una factura\n"
+"        * añadir títulos, líneas de comentario, líneas con subtotales\n"
+"        * dibujar líneas horizontales y poner saltos de página\n"
+"\n"
+"    Además existe una opción que permite imprimir todas las facturas "
+"seleccionadas con un mensaje especial en la parte inferior. Esta "
+"característica puede ser muy útil para imprimir sus facturas con "
+"felicitaciones de fin de año, condiciones especiales puntuales, ...\n"
+"\n"
+"    "
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr "Mensaje notificación"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"factura."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr "Cuenta origen"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr "Escribir mensajes"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr "Base"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr "Salto de página"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr "Mensaje especial"
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr "Mensaje a imprimir en el pie del informe."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr "Factura de abono"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr "Seleccionar mensaje"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices with Layout"
+msgstr "Facturas con plantilla"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr "Descripción/Imp."
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr "Soluciones ERP & CRM..."
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr "Número de secuencia"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr "Mensaje especial factura contable"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr "Línea de separación"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: account_invoice_layout
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "Invoices Layout Improvement"
+msgstr "Mejora de la plantilla de las facturas"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr "Base:"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr "Escriba una notificación o un mensaje de felicitación"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr "Factura de abono de proveedor"
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr "Todos los mensajes de notificación"
+
+#~ msgid "Invoice Date:"
+#~ msgstr "Fecha factura:"
+
+#~ 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 "Customer Ref:"
+#~ msgstr "Ref. cliente:"
+
+#~ msgid "account_invoice_layout"
+#~ msgstr "contabilidad_factura_plantilla"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "Fax :"
+#~ msgstr "Fax :"
+
+#~ msgid "Tel. :"
+#~ msgstr "Tel. :"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Total (excl. taxes):"
+#~ msgstr "Total (sin impuestos):"
+
+#~ msgid "Taxes"
+#~ msgstr "Impuestos"
+
+#~ msgid "VAT :"
+#~ msgstr "IVA :"
+
+#~ msgid "(incl. taxes):"
+#~ msgstr "(con impuestos):"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Document:"
+#~ msgstr "Documento:"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/account_invoice_layout/i18n/et.po b/addons/account_invoice_layout/i18n/et.po
index c796bea5d45..579a8d2dae7 100644
--- a/addons/account_invoice_layout/i18n/et.po
+++ b/addons/account_invoice_layout/i18n/et.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:14+0000\n"
-"PO-Revision-Date: 2010-08-02 21:42+0000\n"
-"Last-Translator: lyyser <Unknown>\n"
+"PO-Revision-Date: 2011-10-10 19:40+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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -25,7 +25,7 @@ msgstr "Vahesumma"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr ""
+msgstr "Märkus:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -97,13 +97,13 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "Käibemaks :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -152,7 +152,7 @@ msgstr "Hind"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Arve kuupäev"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -207,12 +207,12 @@ msgstr "Tagasimakse"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faks :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Total:"
-msgstr ""
+msgstr "Kokku:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -249,12 +249,12 @@ msgstr ""
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Netosumma:"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "Kokku :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -276,7 +276,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Päritolu"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -292,7 +292,7 @@ msgstr "Eraldusjoon"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Teie viide"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
@@ -319,12 +319,12 @@ msgstr "Maks"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Arve rida"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Netosumma:"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -357,7 +357,7 @@ msgstr "Teade"
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Maksud :"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
@@ -410,12 +410,3 @@ msgstr "Kõik teavitussõnumid"
 
 #~ msgid "VAT :"
 #~ msgstr "KM :"
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Note :"
-#~ msgstr "Märge :"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
diff --git a/addons/account_invoice_layout/i18n/eu.po b/addons/account_invoice_layout/i18n/eu.po
index cc302da9a6b..6ecbfd77cfd 100644
--- a/addons/account_invoice_layout/i18n/eu.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -373,9 +373,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objetuaren izena x_ -z hasi behar da eta ezin ditu karaktere berezirik izan!"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Barne Zerga):"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "Bezero Erref."
 
diff --git a/addons/account_invoice_layout/i18n/fi.po b/addons/account_invoice_layout/i18n/fi.po
index 1a8aff86330..e9446c049f9 100644
--- a/addons/account_invoice_layout/i18n/fi.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -26,13 +26,13 @@ msgstr "Välisumma"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr ""
+msgstr "Muistiinpano:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Peruutettu lasku"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -98,13 +98,13 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "ALV:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Puh.:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -141,7 +141,7 @@ msgstr "Kuvaus"
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä laskurivejä."
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -153,7 +153,7 @@ msgstr "Hinta"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Laskun päivämäärä"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -190,7 +190,7 @@ msgstr "Erikoisviesti"
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
 msgid "Message to Print at the bottom of report"
-msgstr ""
+msgstr "Viesti tulostettavaksi raportin alaosaan"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -208,12 +208,12 @@ msgstr "Hyvitys"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faksi:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Total:"
-msgstr ""
+msgstr "Summa:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -234,7 +234,7 @@ msgstr "Laskut joissa sommittelu"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "Kuvaus / verot"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -245,17 +245,17 @@ msgstr "Summa"
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
 msgid "ERP & CRM Solutions..."
-msgstr ""
+msgstr "ERP ja CRM ratkaisut..."
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Yhteensä veroton"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "Yhteensä:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -271,13 +271,13 @@ msgstr "Sarjan numero"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
 msgid "Account Invoice Special Message"
-msgstr ""
+msgstr "Tiliveloituksen erityisviesti"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Lähde"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -293,12 +293,12 @@ msgstr "Erotinrivi"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Viitteenne"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "Invoices Layout Improvement"
-msgstr ""
+msgstr "Laskujen asettelun parannukset"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -320,12 +320,12 @@ msgstr "Vero"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Laskun rivi"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Yhteensä netto:"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -358,7 +358,7 @@ msgstr "Viesti"
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Verot:"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
@@ -372,9 +372,6 @@ msgstr "Kaikki huomautuksien viestit"
 #~ "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 "Document"
-#~ msgstr "Dokumentti"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 
diff --git a/addons/account_invoice_layout/i18n/fr.po b/addons/account_invoice_layout/i18n/fr.po
index 685c0826fa4..2b9e73e63db 100644
--- a/addons/account_invoice_layout/i18n/fr.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -382,12 +382,6 @@ msgstr "Taxes :"
 msgid "All Notification Messages"
 msgstr "Tous les Messages de Notification"
 
-#~ msgid "Document"
-#~ msgstr "Document"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Date de Facture :"
 
@@ -435,9 +429,3 @@ msgstr "Tous les Messages de Notification"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
 #~ "spécial !"
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Être expert avec les experts..."
-
-#~ msgid "Partner Ref."
-#~ msgstr "Réf. partenaire"
diff --git a/addons/account_invoice_layout/i18n/gl.po b/addons/account_invoice_layout/i18n/gl.po
index aae3cdc9030..8511441ab5f 100644
--- a/addons/account_invoice_layout/i18n/gl.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/hi.po b/addons/account_invoice_layout/i18n/hi.po
index a8d74382a1c..7f937d67cac 100644
--- a/addons/account_invoice_layout/i18n/hi.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -368,8 +368,5 @@ msgstr ""
 #~ msgid "Invoice Date:"
 #~ msgstr "चालान दिनांक"
 
-#~ msgid "Document"
-#~ msgstr "दस्तावेज़"
-
 #~ msgid "Canceled Invoice"
 #~ msgstr "रद्द चालान"
diff --git a/addons/account_invoice_layout/i18n/hr.po b/addons/account_invoice_layout/i18n/hr.po
index 75c18988ac3..8c006706eaa 100644
--- a/addons/account_invoice_layout/i18n/hr.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/hu.po b/addons/account_invoice_layout/i18n/hu.po
index 58d4dab46fc..bf10c2d5243 100644
--- a/addons/account_invoice_layout/i18n/hu.po
+++ b/addons/account_invoice_layout/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-10 13:27+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -377,9 +378,3 @@ msgstr "Adók :"
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"
 msgstr "Összes figyelmeztető üzenet"
-
-#~ msgid "Document"
-#~ msgstr "Dokumentum"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Partner hiv."
diff --git a/addons/account_invoice_layout/i18n/id.po b/addons/account_invoice_layout/i18n/id.po
index 0315b609ad2..e7fb3c230f3 100644
--- a/addons/account_invoice_layout/i18n/id.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -367,9 +367,6 @@ msgstr "Semua Pesan"
 #~ msgid "Invoice Date:"
 #~ msgstr "Tanggal Invoice:"
 
-#~ msgid "Document"
-#~ msgstr "Dokumen"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "Ref. Pelanggan"
 
@@ -379,9 +376,6 @@ msgstr "Semua Pesan"
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Tel. :"
 #~ msgstr "Tel."
 
@@ -400,20 +394,5 @@ msgstr "Semua Pesan"
 #~ msgid "Total"
 #~ msgstr "Total"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Termasuk pajak):"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
-#~ msgid "Note :"
-#~ msgstr "Catatan :"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Penjelasan/Pajak"
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Jumlah (Tidak termasuk pajak):"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "Tatanan_tagihan_akun"
diff --git a/addons/account_invoice_layout/i18n/it.po b/addons/account_invoice_layout/i18n/it.po
index ebf35518f0e..0f9a0a139d4 100644
--- a/addons/account_invoice_layout/i18n/it.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -383,12 +383,6 @@ msgstr "Tasse :"
 msgid "All Notification Messages"
 msgstr "Tutte le notifiche messaggi"
 
-#~ msgid "Document"
-#~ msgstr "Documento"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Data Fattura:"
 
@@ -431,44 +425,8 @@ msgstr "Tutte le notifiche messaggi"
 #~ msgid "Document:"
 #~ msgstr "Documento:"
 
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome modello non valido nella definizione dell'azione."
 
-#~ msgid "Note :"
-#~ msgstr "Annotazioni:"
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Totale (Tasse Escluse)"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Descrizione / Tasse"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "account_invoice_layout"
-
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Tasse Incluse):"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Rif. Partner"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Sii un esperto con gli esperti"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere inferiore ad 1!"
diff --git a/addons/account_invoice_layout/i18n/iu.po b/addons/account_invoice_layout/i18n/iu.po
index 9c750dd0b00..f32ff22df4f 100644
--- a/addons/account_invoice_layout/i18n/iu.po
+++ b/addons/account_invoice_layout/i18n/iu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/ko.po b/addons/account_invoice_layout/i18n/ko.po
index 68941fb08b6..3fed5a5f843 100644
--- a/addons/account_invoice_layout/i18n/ko.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -371,9 +371,6 @@ msgstr "모든 알림 메시지"
 #~ msgid "Customer Ref:"
 #~ msgstr "고객 참조:"
 
-#~ msgid "Document"
-#~ msgstr "문서"
-
 #~ msgid "Canceled Invoice"
 #~ msgstr "취소된 인보이스"
 
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index 1b06b440645..a38bafdf0d0 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/nb.po b/addons/account_invoice_layout/i18n/nb.po
index c66daeb4d58..e4603786476 100644
--- a/addons/account_invoice_layout/i18n/nb.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -372,9 +372,6 @@ msgstr "Alle varsel meldinger"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Objektets navn må starte med x_ og ikke inneholde spesialkarakterer!"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "Kundereferanse:"
 
@@ -384,9 +381,6 @@ msgstr "Alle varsel meldinger"
 #~ msgid "Fax :"
 #~ msgstr "Telefaks :"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Total (excl. taxes):"
 #~ msgstr "Total (eks. MVA):"
 
@@ -402,15 +396,6 @@ msgstr "Alle varsel meldinger"
 #~ msgid "Total"
 #~ msgstr "Total"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(ink. mva)"
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "/ ("
-#~ msgstr "/("
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ugyldig modulnavn i handlingsdefinisjonen."
 
@@ -420,17 +405,8 @@ msgstr "Alle varsel meldinger"
 #~ msgid "Tel. :"
 #~ msgstr "Tlf. :"
 
-#~ msgid "Description/Taxes"
-#~ msgstr "Beskrivelse/avgifter"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for visningsarkitektur!"
 
-#~ msgid "Note :"
-#~ msgstr "Notat :"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "konto_faktura_oppsett"
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Total (Eks. MVA)"
diff --git a/addons/account_invoice_layout/i18n/nl.po b/addons/account_invoice_layout/i18n/nl.po
index b60e260281f..470ffe710e5 100644
--- a/addons/account_invoice_layout/i18n/nl.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -380,12 +380,6 @@ msgstr "Belastingen :"
 msgid "All Notification Messages"
 msgstr "Alle berichten"
 
-#~ msgid "Document"
-#~ msgstr "Document"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Factuurdatum:"
 
@@ -419,30 +413,9 @@ msgstr "Alle berichten"
 #~ msgid "Total"
 #~ msgstr "Totaal"
 
-#~ msgid "Partner Ref."
-#~ msgstr "Ref. relatie"
-
 #~ msgid "Document:"
 #~ msgstr "Document:"
 
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Note :"
-#~ msgstr "Notitie"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Incl. belastingen)"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Omschrijving/belastingen"
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Totaal (ex. belastingen)"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 
@@ -453,18 +426,3 @@ msgstr "Alle berichten"
 #~ "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 "Be Expert with the Experts..."
-#~ msgstr "Wees expert onder de experts..."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/account_invoice_layout/i18n/nl_BE.po b/addons/account_invoice_layout/i18n/nl_BE.po
index 9ec45c71ac6..2c187c41f2e 100644
--- a/addons/account_invoice_layout/i18n/nl_BE.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/oc.po b/addons/account_invoice_layout/i18n/oc.po
index b08bbf4ee98..2b6fe9535e3 100644
--- a/addons/account_invoice_layout/i18n/oc.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -374,15 +374,9 @@ msgstr ""
 #~ msgid "Customer Ref:"
 #~ msgstr "Referéncia Client :"
 
-#~ msgid ")"
-#~ msgstr ")"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom del Modèl invalid per la definicion de l'accion."
 
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid per l'arquitectura de la vista"
 
diff --git a/addons/account_invoice_layout/i18n/pl.po b/addons/account_invoice_layout/i18n/pl.po
index 3963c3b499f..b958c9e5f49 100644
--- a/addons/account_invoice_layout/i18n/pl.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -364,12 +364,6 @@ msgstr ""
 msgid "All Notification Messages"
 msgstr "Wszystkie wiadomości powiadomienia"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po
index c8ea444a77e..480140f8fef 100644
--- a/addons/account_invoice_layout/i18n/pt.po
+++ b/addons/account_invoice_layout/i18n/pt.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:14+0000\n"
-"PO-Revision-Date: 2010-12-09 11:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-23 12:19+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-24 05:00+0000\n"
+"X-Generator: Launchpad (build 14336)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -92,6 +92,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo disponibiliza algumas melhorias na apresentação das faturas\n"
+"\n"
+"    Dá a possibilidade de\n"
+"        * pedir todas as linhas de uma fatura\n"
+"        * adicionar títulos, linhas de comentário, linhas de sub-total\n"
+"        * desenhar linhas horizontais e colocar quebras de página\n"
+"\n"
+"    Além do mais, existe uma opção que permite imprimir todas as facturas "
+"seleccionadas com uma mensagem especial em baixo. Esta capacidade pode ser "
+"muito útil para imprimir facturas com desejos feliz ano novo, condições "
+"pontuais especiais, etc...\n"
+"\n"
+"    "
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -365,12 +379,6 @@ msgstr "Impostos :"
 msgid "All Notification Messages"
 msgstr "Todas as Mensagens de Notificação"
 
-#~ msgid "Document"
-#~ msgstr "Documento"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
@@ -389,27 +397,9 @@ msgstr "Todas as Mensagens de Notificação"
 #~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
 #~ "especial !"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(IVA Incl.):"
-
 #~ msgid "Document:"
 #~ msgstr "Documento:"
 
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Descrição/Impostos"
-
-#~ msgid "/ ("
-#~ msgstr "/("
-
-#~ msgid "Note :"
-#~ msgstr "Nota:"
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Total (Antes de Impostos):"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "account_invoice_layout"
 
@@ -436,18 +426,3 @@ msgstr "Todas as Mensagens de Notificação"
 
 #~ msgid "(incl. taxes):"
 #~ msgstr "(impostos incluidos):"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Ref. de Terceiro"
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Torne-se um especialista com os especialistas..."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
diff --git a/addons/account_invoice_layout/i18n/pt_BR.po b/addons/account_invoice_layout/i18n/pt_BR.po
index 5c1292182e0..b64af4f31fa 100644
--- a/addons/account_invoice_layout/i18n/pt_BR.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -389,6 +389,3 @@ msgstr "Todas Mensagens de Notificação"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "O nome do Objeto deve começar com x_ e não deve conter carcateres especiais !"
-
-#~ msgid "(Incl. taxes):"
-#~ msgstr "Impostos Inclusos"
diff --git a/addons/account_invoice_layout/i18n/ro.po b/addons/account_invoice_layout/i18n/ro.po
index 7ceb0f40eae..db20ec7ba13 100644
--- a/addons/account_invoice_layout/i18n/ro.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -383,9 +383,6 @@ msgstr "Toate mesajele de notificare"
 #~ msgid "Total"
 #~ msgstr "Total"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(inclusiv taxe):"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -395,26 +392,11 @@ msgstr "Toate mesajele de notificare"
 #~ msgid "Customer Ref:"
 #~ msgstr "Referinţă client:"
 
-#~ msgid ")"
-#~ msgstr ")"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nume invalid de model în definirea acţiunii"
 
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
 #~ msgid "Document:"
 #~ msgstr "Document:"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid "Note :"
-#~ msgstr "Notă:"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Descriere/Taxe"
-
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Total (fără taxe):"
diff --git a/addons/account_invoice_layout/i18n/ru.po b/addons/account_invoice_layout/i18n/ru.po
index 97732f68b4d..228ac675b20 100644
--- a/addons/account_invoice_layout/i18n/ru.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -92,6 +92,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Этот модуль предоставляет возможности по улучшению шаблона счетов.\n"
+"\n"
+"    Он позволяет:\n"
+"        * упорядочить позиции счета\n"
+"        * добавлять заголовки, комментарии, подитоги\n"
+"        * чертить горизонтальные линии и добавлять разделители страниц\n"
+"\n"
+"    Кроме того, есть вариант, который позволяет печатать все выбранные счета "
+"с особым сообщением в их нижней части. Эта функция может быть очень полезной "
+"при печати счета с новогодними пожеланиями, специальными условиями "
+"оплаты...\n"
+"\n"
+"    "
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -270,7 +284,7 @@ msgstr "Последовательный номер"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
 msgid "Account Invoice Special Message"
-msgstr ""
+msgstr "Специальное сообщение в счете"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -364,12 +378,6 @@ msgstr "Налоги :"
 msgid "All Notification Messages"
 msgstr "Все уведомления"
 
-#~ msgid "Document"
-#~ msgstr "Документ"
-
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Invoice Date:"
 #~ msgstr "Дата счета:"
 
@@ -417,18 +425,3 @@ msgstr "Все уведомления"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Ссылка на партнера"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
diff --git a/addons/account_invoice_layout/i18n/sk.po b/addons/account_invoice_layout/i18n/sk.po
index 8ae7a89370e..ac0489ee930 100644
--- a/addons/account_invoice_layout/i18n/sk.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/sl.po b/addons/account_invoice_layout/i18n/sl.po
index f154056e936..0e05925c574 100644
--- a/addons/account_invoice_layout/i18n/sl.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -25,7 +25,7 @@ msgstr "Vmesna vsota"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr "Zaznamek:"
+msgstr "Opomba:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -37,7 +37,7 @@ msgstr "Prekilcani račun"
 #: selection:account.invoice.line,state:0
 #: field:notify.message,name:0
 msgid "Title"
-msgstr "Naslov"
+msgstr "Naziv"
 
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
@@ -49,7 +49,7 @@ msgstr "Računi z obliko in sporočilom"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Disc. (%)"
-msgstr "Popust (%)"
+msgstr "Pop. (%)"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -109,7 +109,7 @@ msgstr "Tel.:"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
+msgstr "Predračun"
 
 #. module: account_invoice_layout
 #: field:account.invoice,abstract_line_ids:0
@@ -239,7 +239,7 @@ msgstr "Opis/davki"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Amount"
-msgstr "Znesek"
+msgstr "Količina"
 
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
@@ -249,18 +249,18 @@ msgstr ""
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Skupaj neto:"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "Skupaj:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Draft Invoice"
-msgstr "Pripravljen račun"
+msgstr "Osnutek računa"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,sequence:0
@@ -276,7 +276,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Izvor"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -357,7 +357,7 @@ msgstr "Sporočilo"
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Davki:"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
@@ -375,9 +375,6 @@ msgstr "Vsa sporočila o obvestilih"
 #~ msgid "Invoice Date:"
 #~ msgstr "Datum računa:"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "Sklic kupca"
 
@@ -387,9 +384,6 @@ msgstr "Vsa sporočila o obvestilih"
 #~ msgid "Tel. :"
 #~ msgstr "Tel. :"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Fax :"
 #~ msgstr "Faks :"
 
@@ -411,29 +405,8 @@ msgstr "Vsa sporočila o obvestilih"
 #~ msgid "Document:"
 #~ msgstr "Dokument:"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(z davki):"
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Napačno ime modela v definiciji dejanja."
 
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Skupaj (brez davkov):"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "account_invoice_layout"
-
-#~ msgid "Note :"
-#~ msgstr "Opomba:"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Opis/davki"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Sklic partnerja"
diff --git a/addons/account_invoice_layout/i18n/sq.po b/addons/account_invoice_layout/i18n/sq.po
index 58d38474651..0119ec7e485 100644
--- a/addons/account_invoice_layout/i18n/sq.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/sr.po b/addons/account_invoice_layout/i18n/sr.po
index f17fd355053..af4a08ef699 100644
--- a/addons/account_invoice_layout/i18n/sr.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -373,21 +373,12 @@ msgstr "Све поруке напомене"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "Urac.porezi"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "Referenca kupca:"
 
-#~ msgid ")"
-#~ msgstr ")"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "/ ("
-#~ msgstr "/("
-
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
@@ -403,29 +394,8 @@ msgstr "Све поруке напомене"
 #~ msgid "VAT :"
 #~ msgstr "PDV :"
 
-#~ msgid "Note :"
-#~ msgstr "Napomena :"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Opis/Porezi"
-
 #~ msgid "Total"
 #~ msgstr "Ukupno"
 
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Ukupno (bez poreza):"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "izgled_fakture_naloga"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Vezani partner"
-
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Budite Expert sa Expertima..."
diff --git a/addons/account_invoice_layout/i18n/sr@latin.po b/addons/account_invoice_layout/i18n/sr@latin.po
index 26b2db91f99..bc921ebf179 100644
--- a/addons/account_invoice_layout/i18n/sr@latin.po
+++ b/addons/account_invoice_layout/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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-12-23 15:39+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-24 20:33+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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Sub Total"
-msgstr "Subtotal"
+msgstr "Podtotal"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -32,7 +32,7 @@ msgstr "Napomena:"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Cancelled Invoice"
-msgstr "Otkazane Fakture"
+msgstr "Otkazana faktura"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -44,7 +44,7 @@ msgstr "Naslov"
 #: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
 msgid "Invoices with Layout and Message"
-msgstr "Formatirana Faktura sa Porukom"
+msgstr "Formatirana faktura sa porukom"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -60,19 +60,19 @@ msgstr "Napomena"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
 msgid "Notify By Messages"
-msgstr "Napomena po porukama"
+msgstr "Obaveštenje putem poruke"
 
 #. module: account_invoice_layout
 #: help:notify.message,msg:0
 msgid ""
 "This notification will appear at the bottom of the Invoices when printed."
-msgstr "Ova napomena ce se pojaviti na dnu fakture pri stampi"
+msgstr "Ova napomena će se pojaviti na dnu faktura kad se odštampa"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Unit Price"
-msgstr "Jedinična cijena"
+msgstr "Pojedinačna cena"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,description:account_invoice_layout.module_meta_information
@@ -93,6 +93,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj modul dodaje funkcije za poboljšanje prikaza faktura.\n"
+"\n"
+"    Daje Vam mogućnost da\n"
+"        *poređate sve linije jedne fakture\n"
+"        *dodajete naslove, linije komentara, linije podtotala\n"
+"        *dodajete vodoravne linije i odvajate stranice\n"
+"\n"
+"    Povrh toga, postoji opcija koja Vam omogućava štampu svih faktura sa "
+"datom specijalnom porukom\n"
+"na dnu. Ova funkcija je veoma korisna za štampu faktura sa čestitkama za "
+"Novu godinu, specijalnim uslovima...\n"
+"\n"
+"    "
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -115,7 +129,7 @@ msgstr "Predračun"
 #. module: account_invoice_layout
 #: field:account.invoice,abstract_line_ids:0
 msgid "Invoice Lines"
-msgstr "Stavke računa"
+msgstr "Linije računa"
 
 #. module: account_invoice_layout
 #: view:account.invoice.line:0
@@ -125,7 +139,7 @@ msgstr "Sekv."
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
 msgid "Notification Message"
-msgstr "Poruka Napomene"
+msgstr "Poruka obaveštenja"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -136,12 +150,12 @@ msgstr "Proizvod"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
-msgstr "poredja sekvence pri prikazu liste faktura."
+msgstr "Daje redosled sekvenci pri prikazu spiska linija fakture"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -153,7 +167,7 @@ msgstr "Cena"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr "Datum Fakture"
+msgstr "Datum fakture"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -163,12 +177,12 @@ msgstr "Porezi:"
 #. module: account_invoice_layout
 #: field:account.invoice.line,functional_field:0
 msgid "Source Account"
-msgstr "Изворни налог"
+msgstr "Izvorni nalog"
 
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr "Napisi Poruke"
+msgstr "Napiši poruke"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -179,18 +193,18 @@ msgstr "Osnova"
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Page Break"
-msgstr "Прелом стране"
+msgstr "Kraj stranice"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
 #: field:notify.message,msg:0
 msgid "Special Message"
-msgstr "Specijalna Poruka"
+msgstr "Specijalna poruka"
 
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
 msgid "Message to Print at the bottom of report"
-msgstr "Poruka koja se stampa pri dnu izvestaja"
+msgstr "Poruka za štampu pri dnu izveštaja"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -202,7 +216,7 @@ msgstr "Količina"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Refund"
-msgstr "Refundiraj"
+msgstr "Refundiranje"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -228,7 +242,7 @@ msgstr "Poruke"
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
 msgid "Invoices with Layout"
-msgstr "Formatirana Faktura"
+msgstr "Formatirane Fakture"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -240,33 +254,33 @@ msgstr "Opis / Porezi"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Amount"
-msgstr "Iznos"
+msgstr "Količina"
 
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
 msgid "ERP & CRM Solutions..."
-msgstr ""
+msgstr "ERP & CRM Rešenja..."
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Ukupno neto :"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Draft Invoice"
-msgstr "Neodobreni računi"
+msgstr "Fakture u pripremi"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,sequence:0
 msgid "Sequence Number"
-msgstr "Broj Sekvence"
+msgstr "Broj sekvence"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
@@ -277,7 +291,7 @@ msgstr "Specijalna poruka naloga fakture"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Poreklo"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -293,18 +307,18 @@ msgstr "Linija za odvajanje"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Vaš poziv na broj"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "Invoices Layout Improvement"
-msgstr "Unapredjenje izgleda fakture"
+msgstr "Unapređenje izgleda fakture"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Supplier Invoice"
-msgstr "Račun dobavljača"
+msgstr "Faktura dobavljača"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -320,7 +334,7 @@ msgstr "Porez"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Redak računa"
+msgstr "Red fakture"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -330,14 +344,14 @@ msgstr "Neto Ukupno"
 #. module: account_invoice_layout
 #: view:notify.message:0
 msgid "Write a notification or a wishful message."
-msgstr "Napisi napomenu ili celu poruku"
+msgstr "Napiši obaveštenje ili neku lepu želju"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: model:ir.model,name:account_invoice_layout.model_account_invoice
 #: report:notify_account.invoice:0
 msgid "Invoice"
-msgstr "Račun"
+msgstr "Faktura"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -348,7 +362,7 @@ msgstr "Otkaži"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Supplier Refund"
-msgstr "Povrat Dobavljaču"
+msgstr "Povraćaj dobavljača"
 
 #. module: account_invoice_layout
 #: field:account.invoice.special.msg,message:0
@@ -358,51 +372,30 @@ msgstr "Poruka"
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Porezi :"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"
-msgstr "Sve Napomene"
+msgstr "Sve poruke obaveštenja"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Be Expert with the Experts..."
-#~ msgstr "Budite Expert sa Expertima..."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Vezani partner"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
 #~ msgid "Invoice Date:"
 #~ msgstr "Datum fakture:"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "Urac.porezi"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "Referenca kupca:"
 
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "/ ("
-#~ msgstr "/("
-
 #~ msgid "Fax :"
 #~ msgstr "Fax :"
 
@@ -415,17 +408,8 @@ msgstr "Sve Napomene"
 #~ msgid "VAT :"
 #~ msgstr "PDV :"
 
-#~ msgid "Note :"
-#~ msgstr "Napomena :"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Opis/Porezi"
-
 #~ msgid "Total"
 #~ msgstr "Ukupno"
 
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Ukupno (bez poreza):"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "izgled_fakture_naloga"
diff --git a/addons/account_invoice_layout/i18n/sv.po b/addons/account_invoice_layout/i18n/sv.po
index 7c86da8bf2b..98242b26850 100644
--- a/addons/account_invoice_layout/i18n/sv.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -372,9 +372,6 @@ msgstr ""
 #~ msgid "Invoice Date:"
 #~ msgstr "Fakturadatum:"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "(Inkl moms):"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "Kundreferens:"
 
@@ -384,41 +381,14 @@ msgstr ""
 #~ msgid "VAT :"
 #~ msgstr "Moms :"
 
-#~ msgid "Note :"
-#~ msgstr "Notering :"
-
-#~ msgid "Description/Taxes"
-#~ msgstr "Beskrivning/moms"
-
 #~ msgid "Total"
 #~ msgstr "Total"
 
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "Total (ex moms)"
-
 #~ msgid "account_invoice_layout"
 #~ msgstr "account_invoice_layout"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Företagsreference"
-
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Fel: Ej godkänt Bvr nummer (fel checksumma)"
diff --git a/addons/account_invoice_layout/i18n/tlh.po b/addons/account_invoice_layout/i18n/tlh.po
index f745ad479ce..262a10a1818 100644
--- a/addons/account_invoice_layout/i18n/tlh.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index e20213b0de0..ca3692efe76 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/uk.po b/addons/account_invoice_layout/i18n/uk.po
index 83515eabcbb..da3eb657354 100644
--- a/addons/account_invoice_layout/i18n/uk.po
+++ b/addons/account_invoice_layout/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/vi.po b/addons/account_invoice_layout/i18n/vi.po
index 83f860cfbbd..c183a4781aa 100644
--- a/addons/account_invoice_layout/i18n/vi.po
+++ b/addons/account_invoice_layout/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-07-31 06:17+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-08-01 04:39+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
diff --git a/addons/account_invoice_layout/i18n/zh_CN.po b/addons/account_invoice_layout/i18n/zh_CN.po
index 076155a6cb0..3e66e06638d 100644
--- a/addons/account_invoice_layout/i18n/zh_CN.po
+++ b/addons/account_invoice_layout/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-29 11:14+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -25,7 +25,7 @@ msgstr "小计"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr ""
+msgstr "备注："
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -92,18 +92,27 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    此模块增加了一些发票格式增强的功能。\n"
+"可以：\n"
+"- 对发票的所有行排序\n"
+"- 增加标题、说明、小计行\n"
+"- 划横线或分页\n"
+"而且，你可以选中多个发票并在打印时在发票下方输出一段特殊的话。常用于年底的祝福或者提醒客户及时付款。\n"
+"\n"
+"    "
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "增值税:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "电话："
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -140,7 +149,7 @@ msgstr "描述"
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
-msgstr ""
+msgstr "按序列显示发票明细"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -152,7 +161,7 @@ msgstr "价格"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "发票日期"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -173,7 +182,7 @@ msgstr "写信息"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Base"
-msgstr "基于"
+msgstr "基数"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -184,12 +193,12 @@ msgstr "分页符"
 #: view:notify.message:0
 #: field:notify.message,msg:0
 msgid "Special Message"
-msgstr "特别消息"
+msgstr "指定消息"
 
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
 msgid "Message to Print at the bottom of report"
-msgstr ""
+msgstr "信息打印在报表底部"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -207,12 +216,12 @@ msgstr "红字发票"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "传真："
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Total:"
-msgstr ""
+msgstr "合计:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -244,17 +253,17 @@ msgstr "金额"
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
 msgid "ERP & CRM Solutions..."
-msgstr ""
+msgstr "ERP & CRM 解决非方案..."
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "净合计:"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "合计:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -265,18 +274,18 @@ msgstr "发票草稿"
 #. module: account_invoice_layout
 #: field:account.invoice.line,sequence:0
 msgid "Sequence Number"
-msgstr "序列号码"
+msgstr "序列号"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
 msgid "Account Invoice Special Message"
-msgstr ""
+msgstr "发票科目的特别消息"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "源"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -292,12 +301,12 @@ msgstr "分隔线"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "您的单号"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "Invoices Layout Improvement"
-msgstr ""
+msgstr "改善发票布局"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -319,12 +328,12 @@ msgstr "税"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "发票明细"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Net Total:"
-msgstr ""
+msgstr "不含税合计:"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -357,7 +366,7 @@ msgstr "信息"
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Taxes :"
-msgstr ""
+msgstr "税："
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
@@ -367,9 +376,6 @@ msgstr "所有通知信息"
 #~ msgid "Invoice Date:"
 #~ msgstr "发票日期:"
 
-#~ msgid "(Incl. taxes):"
-#~ msgstr "含税:"
-
 #~ msgid "Fax :"
 #~ msgstr "传真:"
 
@@ -379,44 +385,9 @@ msgstr "所有通知信息"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
 
-#~ msgid "Description/Taxes"
-#~ msgstr "说明 / 税"
-
 #~ msgid "VAT :"
 #~ msgstr "增值税"
 
-#~ msgid "Note :"
-#~ msgstr "备注:"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module provides some features to improve the layout of the "
-#~ "invoices.\n"
-#~ "\n"
-#~ "    It gives you the possibility to\n"
-#~ "        * order all the lines of an invoice\n"
-#~ "        * add titles, comment lines, sub total lines\n"
-#~ "        * draw horizontal lines and put page breaks\n"
-#~ "\n"
-#~ "    Moreover, there is one option which allow you to print all the selected "
-#~ "invoices with a given special message at the bottom of it. This feature can "
-#~ "be very useful for printing your invoices with end-of-year wishes, special "
-#~ "punctual conditions...\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这模块允许你改进发票的格式\n"
-#~ "\n"
-#~ "    它给出以下的可能:\n"
-#~ "\t    * 所有的发票明细\n"
-#~ "\t    * 增加标题,注释行,子行标题\n"
-#~ "\t    * 画水平线和加入分页符\n"
-#~ "\t\n"
-#~ "此外,还有一个选择项,让你打印所有选择发票时在底部有一个提别的信息,这功能对年终发票特别是要求准时支付提醒时有用\n"
-#~ "\n"
-#~ "    "
-
 #~ msgid "Total"
 #~ msgstr "合计"
 
@@ -433,21 +404,12 @@ msgstr "所有通知信息"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "/ ("
-#~ msgstr "/ ("
-
 #~ msgid "Document:"
 #~ msgstr "文档："
 
 #~ msgid "account_invoice_layout"
 #~ msgstr "发票式样"
 
-#~ msgid "Total (Excl. taxes):"
-#~ msgstr "合计(不含税):"
-
 #~ msgid "Customer Ref:"
 #~ msgstr "关联客户:"
 
diff --git a/addons/account_invoice_layout/i18n/zh_TW.po b/addons/account_invoice_layout/i18n/zh_TW.po
index d87ffc135dd..deb23dc6cbe 100644
--- a/addons/account_invoice_layout/i18n/zh_TW.po
+++ b/addons/account_invoice_layout/i18n/zh_TW.po
@@ -13,31 +13,31 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Sub Total"
-msgstr ""
+msgstr "小計"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr ""
+msgstr "備註:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "已取消發票"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 #: field:notify.message,name:0
 msgid "Title"
-msgstr ""
+msgstr "標題"
 
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
@@ -49,12 +49,12 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "碟 (%)"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Note"
-msgstr ""
+msgstr "備註"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
@@ -71,7 +71,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Unit Price"
-msgstr ""
+msgstr "單價"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,description:account_invoice_layout.module_meta_information
@@ -97,13 +97,13 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "增埴稅(VAT) :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "電話 :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -114,12 +114,12 @@ msgstr ""
 #. module: account_invoice_layout
 #: field:account.invoice,abstract_line_ids:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "發票明細"
 
 #. module: account_invoice_layout
 #: view:account.invoice.line:0
 msgid "Seq."
-msgstr ""
+msgstr "次序"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
@@ -129,13 +129,13 @@ msgstr ""
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Product"
-msgstr ""
+msgstr "產品"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
@@ -146,45 +146,45 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "價格"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "發票日期"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Taxes:"
-msgstr ""
+msgstr "稅:"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,functional_field:0
 msgid "Source Account"
-msgstr ""
+msgstr "來源帳號"
 
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "寫訊息"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Base"
-msgstr ""
+msgstr "基礎"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Page Break"
-msgstr ""
+msgstr "分頁符號"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
 #: field:notify.message,msg:0
 msgid "Special Message"
-msgstr ""
+msgstr "特別訊息"
 
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
@@ -195,34 +195,34 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Quantity"
-msgstr ""
+msgstr "數量"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Refund"
-msgstr ""
+msgstr "退款"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "傳真 :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Total:"
-msgstr ""
+msgstr "總計:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
 msgid "Select Message"
-msgstr ""
+msgstr "選擇訊息"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
 msgid "Messages"
-msgstr ""
+msgstr "訊息"
 
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
@@ -233,34 +233,34 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "說明 / 稅"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Amount"
-msgstr ""
+msgstr "總計"
 
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
 msgid "ERP & CRM Solutions..."
-msgstr ""
+msgstr "ERP & CRM 解決方案..."
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "淨計 :"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "總計 :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "發票草稿"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,sequence:0
@@ -276,23 +276,23 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "來源地"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Separator Line"
-msgstr ""
+msgstr "分隔線"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "您的參考"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
@@ -303,28 +303,28 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "供應商發票"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
 msgid "Print"
-msgstr ""
+msgstr "列印"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tax"
-msgstr ""
+msgstr "稅"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "發票明細"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 msgid "Net Total:"
-msgstr ""
+msgstr "淨計:"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -336,30 +336,30 @@ msgstr ""
 #: model:ir.model,name:account_invoice_layout.model_account_invoice
 #: report:notify_account.invoice:0
 msgid "Invoice"
-msgstr ""
+msgstr "發票"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "供應商退款"
 
 #. module: account_invoice_layout
 #: field:account.invoice.special.msg,message:0
 msgid "Message"
-msgstr ""
+msgstr "訊息"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Taxes :"
-msgstr ""
+msgstr "稅 :"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"
-msgstr ""
+msgstr "全部通知訊息"
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 4e6bdfd0aa0..c2dc0e036bb 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -182,28 +182,6 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description / Taxes</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="302.0,237.0" style="Tableau2">
@@ -505,6 +483,5 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-  </pto>
   </story>
 </document>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index eabb8efe9c2..c6fc9d236fc 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -186,28 +186,6 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description / Taxes</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="302.0,237.0" style="Tableau2">
@@ -523,6 +501,5 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-  </pto>
   </story>
 </document>
diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
index 91967358a3d..61ca39c654b 100644
--- a/addons/account_invoice_layout/test/account_invoice_layout_report.yml
+++ b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
@@ -1,22 +1,9 @@
--
-  In order to Print the Invoice layout report in Normal Mode, we will create a invoice record
--
-  !record {model: account.invoice, id: test_invoice_1}:
-    currency_id: base.EUR
-    company_id: base.main_company
-    address_invoice_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-    state: draft
-    type: out_invoice
-    account_id: account.a_recv
-    name: Test invoice 1
-    address_contact_id: base.res_partner_address_tang
 -
   Print the Invoice layout report in Normal Mode
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('account.demo_invoice_0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data)
 
@@ -25,7 +12,7 @@
 -
   !python {model: account.invoice}: |
     ctx={}
-    ctx.update({'model': 'account.invoice','active_ids': [ref('test_invoice_1')]})
+    ctx.update({'model': 'account.invoice','active_ids': [ref('account.demo_invoice_0')]})
     data_dict = {'message':ref('account_invoice_layout.demo_message1')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_invoice_special_msg',wiz_data=data_dict, context=ctx, our_module='account_invoice_layout')
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index b1cf7357241..5bf1e480d1e 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -2,43 +2,42 @@
 <openerp>
     <data>
 
-		<record id="account_invoice_special_msg_view" model="ir.ui.view">
-			<field name="name">Account Invioce Special Message</field>
-			<field name="model">account.invoice.special.msg</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Select Message">
-					<group colspan="4" col="6">
-						<field name="message"/>
-					</group>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        <record id="account_invoice_special_msg_view" model="ir.ui.view">
+            <field name="name">Account Invioce Special Message</field>
+            <field name="model">account.invoice.special.msg</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Message">
+                    <group colspan="4" col="6">
+                        <field name="message"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_invoice_special_msg" model="ir.actions.act_window">
-			<field name="name">Invoices with Layout and Message</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.invoice.special.msg</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_invoice_special_msg_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_invoice_special_msg" model="ir.actions.act_window">
+            <field name="name">Invoices and Message</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.special.msg</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_invoice_special_msg_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_invoice_special_msg_values">
-			<field name="model_id" ref="account.model_account_invoice" />
-			<field name="object" eval="1" />
-			<field name="name">Account Invioce Special Message</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_invoice_special_msg'))" />
-			<field name="key">action</field>
-			<field name="model">account.invoice</field>
-		</record>
+        <record model="ir.values" id="account_invoice_special_msg_values">
+            <field name="model_id" ref="account.model_account_invoice" />
+            <field name="name">Account Invioce Special Message</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_invoice_special_msg'))" />
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 8a90a140558..1912dfa5198 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    "name": "Payment Management",
+    "name": "Suppliers Payment Management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Finance",
+    "category": "Accounting & Finance",
     'complexity': "easy",
     "description": """
 Module to manage invoice payment.
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 9858d536d17..ba98c71fc3e 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -374,7 +374,7 @@ class payment_line(osv.osv):
         data = {}
         move_line_obj = self.pool.get('account.move.line')
 
-        data['amount_currency'] = data['communication'] = data['partner_id'] = data['reference'] = data['date_created'] = data['bank_id'] = data['amount'] = False
+        data['amount_currency'] = data['communication'] = data['partner_id'] = data['bank_id'] = data['amount'] = False
 
         if move_line_id:
             line = move_line_obj.browse(cr, uid, move_line_id, context=context)
@@ -396,8 +396,6 @@ class payment_line(osv.osv):
             temp_dict = self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type)
             data.update(temp_dict['value'])
 
-            data['reference'] = line.ref
-            data['date_created'] = line.date_created
             data['communication'] = line.ref
 
             if date_prefered == 'now':
diff --git a/addons/account_payment/account_payment_demo.xml b/addons/account_payment/account_payment_demo.xml
index 65a8d341da4..02170c38fea 100644
--- a/addons/account_payment/account_payment_demo.xml
+++ b/addons/account_payment/account_payment_demo.xml
@@ -10,7 +10,7 @@
         </record>
     	<record id="payment_mode_1" model="payment.mode">
             <field name="name">Direct Payment</field>
-            <field name="journal" ref="account.sales_journal"/>
+            <field name="journal" ref="account.bank_journal"/>
             <field name="bank_id" ref="account_payment.partner_bank_1"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 76197140b49..3fc2d716e66 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -46,7 +46,7 @@
             <field name="model">payment.mode</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <form string="Payment Mode">
+                <search string="Payment Mode">
                     <field name="name"/>
                     <field name="journal" widget='selection'/>
                     <field name="company_id" widget='selection' groups="base.group_multi_company"/>
@@ -54,7 +54,7 @@
                     <group expand="0" string="Group By...">
                       <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
                     </group>
-                </form>
+                </search>
             </field>
         </record>
 
@@ -179,7 +179,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
+                <tree colors="blue:state == 'draft';gray:state in ('cancel','done');black:state == 'open'" string="Payment order">
                     <field name="reference"/>
                     <field name="mode"/>
                     <field name="user_id"/>
@@ -201,7 +201,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
                         <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
@@ -251,7 +251,7 @@
                             <separator colspan="4" string="Transaction Information"/>
                             <field name="date"/>
                             <group colspan="2">
-                                <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,comapny_currency)"/>
+                                <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
                                 <field name="currency" nolabel="1"/>
                             </group>
                             <field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
@@ -322,7 +322,5 @@
             </field>
         </record>
 
-        <act_window domain="[('move_line_id.move_id.id', '=', move_id)]" id="act_account_invoice_2_payment_line" name="Payment Lines" res_model="payment.line" src_model="account.invoice"/>
-
     </data>
 </openerp>
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index 7547c516a8d..adef3982a92 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b209b436259..327253dfa40 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c6973194d90..a48f576ed7c 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 afbc7932a12..9595306212d 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.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:14+0000\n"
-"PO-Revision-Date: 2010-10-30 15:26+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-08-17 20:38+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -40,7 +40,7 @@ msgstr "Seleccioneu la forma de pagament a aplicar."
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: account_payment
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -51,6 +51,12 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul proporciona:\n"
+"* Una forma més eficient per gestionar el pagament de les factures.\n"
+"* Un mecanisme bàsic per connectar fàcilment diversos pagaments "
+"automatitzats.\n"
+"    "
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -71,6 +77,9 @@ msgid ""
 " Once the bank is confirmed the state is set to 'Confirmed'.\n"
 " Then the order is paid the state is 'Done'."
 msgstr ""
+"Quan es fa una ordre, l'estat és 'Esborrany'.\n"
+" Una vegada es confirma el banc, l'estat és \"Confirmat\".\n"
+" Quan l'ordre es paga, l'estat és 'Realitzat'."
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -84,7 +93,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
@@ -104,7 +113,7 @@ msgstr "Assentaments"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "Compte utilitzat"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
@@ -115,7 +124,7 @@ msgstr "Data venciment"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "No podeu crear una anotació en un compte tancat."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -131,7 +140,7 @@ msgstr "_Afegeix a l'ordre de pagament"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr ""
+msgstr "Genera extracte de pagament"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -142,7 +151,7 @@ msgstr "Import"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valor del deure o haver erroni en l'assentament comptable!"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -168,7 +177,7 @@ msgstr "Referència"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "El nom de la línia de pagament ha de ser únic!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -208,7 +217,7 @@ msgstr "Data venciment factura"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "Tipus d'execució"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -276,7 +285,7 @@ msgstr "Data execució"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Diari de banc o caixa per la forma de pagament."
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -297,13 +306,14 @@ msgstr "Compte de destí"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Cerca ordres de pagament"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"No podeu crear una anotació en un compte a cobrar/a pagar sense una empresa."
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -338,7 +348,7 @@ msgstr "Gestió de pagaments"
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "Línia de l'extracte bancari"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -353,12 +363,12 @@ msgstr "Import a pagar"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Divises"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
@@ -377,7 +387,7 @@ msgstr ""
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr ""
+msgstr "Genera extracte de pagamanet de comptes"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -387,7 +397,7 @@ msgstr "Forma de pagament"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Data valor"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -424,7 +434,7 @@ msgstr "Direcció del client que ordena."
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr ""
+msgstr "Genera extracte:"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -451,12 +461,13 @@ msgstr "Línies de pagament"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Apunts comptables"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
 msgstr ""
+"La companyia ha de ser la mateixa per al compte i període relacionats."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -469,7 +480,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
@@ -485,7 +496,7 @@ msgstr "Data de pagament"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -495,7 +506,7 @@ msgstr "Data creació"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "Afegeix"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -520,12 +531,12 @@ msgstr "El client que ordena"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "Compte del pagament a realitzar"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Ref. factura"
 
 #. module: account_payment
 #: field:payment.line,name:0
@@ -557,7 +568,7 @@ msgstr "Realitzat"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: account_payment
 #: field:payment.line,communication:0
@@ -586,6 +597,11 @@ msgid ""
 "that should be done, keep track of all payment orders and mention the "
 "invoice reference and the partner the payment should be done for."
 msgstr ""
+"Una ordre de pagament és una petició de pagament que realitza la seva "
+"companyia per pagar una factura de proveïdor o una anotació de crèdit d'un "
+"client. Aquí podeu registrar totes les ordres de pagament pendents i fer "
+"seguiment de les ordres i indicar la referència de factura i l'entitat a la "
+"qual pagar."
 
 #. module: account_payment
 #: help:payment.line,amount:0
@@ -615,7 +631,7 @@ msgstr "Compte bancari destí"
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "Esteu segur que voleu realitzar el pagament?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -649,7 +665,7 @@ msgstr "Pagaments/Cobraments"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "Ordre de pagament / Pagament"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -673,7 +689,7 @@ msgstr "Nom"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Compte bancari"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -684,7 +700,7 @@ msgstr "Informació de l'assentament"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
 msgid "payment.order.create"
-msgstr ""
+msgstr "pagament.ordre.crea"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
@@ -700,7 +716,7 @@ msgstr "Total"
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "Realitza pagament"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -711,7 +727,7 @@ msgstr "Empresa"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr ""
+msgstr "Genera pagament"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -721,7 +737,7 @@ msgstr "Compte bancari per la forma de pagament"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
 
 #~ msgid "Execution date:"
 #~ msgstr "Data d'execució:"
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 89c26280de1..e4b58679537 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e7545c36ac4..abcfb116ee4 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -808,37 +808,3 @@ msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid ""
-#~ "A payment order is a payment request that your company does in order to pay "
-#~ "a supplier invoice or a customer credit note. Here you can register all "
-#~ "payment orders that should be done, keep track of all payment orders and "
-#~ "mention the invoice reference and the partner the payment should be done for."
-#~ msgstr ""
-#~ "Ein Zahlungsvorschlag ist eine Anweisung an Ihre Bank für die Bezahlung von "
-#~ "Eingangsrechnungen oder zur Rückzahlung von Kundengutschriften. Hier können "
-#~ "Sie alle einzelnen zu überweisenden Zahlungspositionen bestätigen und diese "
-#~ "über die Rechnung und den Partner rückverfolgen."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index 83dc6731584..e8be8fe8773 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -809,6 +809,3 @@ msgstr "Δεν μπορείς να δημιουργήσεις γραμμή κί
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος! Δεν μπορείτε να δημιουργήσετε κενό Μενού."
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index 5f8694afc40..5383275854b 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -808,36 +808,3 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 
 #~ msgid "Populate Statement with Payment lines"
 #~ msgstr "Llenar un extracto con líneas de pago"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "A payment order is a payment request that your company does in order to pay "
-#~ "a supplier invoice or a customer credit note. Here you can register all "
-#~ "payment orders that should be done, keep track of all payment orders and "
-#~ "mention the invoice reference and the partner the payment should be done for."
-#~ msgstr ""
-#~ "Una orden de pago es una solicitud de pago que su compañía hace para pagar "
-#~ "una factura de proveedor o una factura de abono de un cliente. Aquí puede "
-#~ "registrar todas las órdenes de pago a realizar, llevar un control de las "
-#~ "mismas y hacer referencia a la factura y empresa a la que se debe hacer el "
-#~ "pago."
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index 5574a029b4c..c9ab814147b 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..633d3240602
--- /dev/null
+++ b/addons/account_payment/i18n/es_CL.po
@@ -0,0 +1,714 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-26 23:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid ""
+"\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"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'."
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_payment/i18n/es_EC.po b/addons/account_payment/i18n/es_EC.po
index ceb5658a124..3b4d2b7aabf 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -803,27 +803,3 @@ msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 
 #~ msgid "Select the Payment Type for the Payment Mode."
 #~ msgstr "Seleccione el tipo de pago para el modo de pago."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! No puede crear menus recursivos"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reglas no son soportadas por objetos osv_memory !"
-
-#~ msgid ""
-#~ "A payment order is a payment request that your company does in order to pay "
-#~ "a supplier invoice or a customer credit note. Here you can register all "
-#~ "payment orders that should be done, keep track of all payment orders and "
-#~ "mention the invoice reference and the partner the payment should be done for."
-#~ msgstr ""
-#~ "Una orden de pago es una solicitud de pago que su compañía hace para pagar "
-#~ "una factura de proveedor o una factura de abono de un cliente. Aquí puede "
-#~ "registrar todas las órdenes de pago a realizar, llevar un control de las "
-#~ "mismas y hacer referencia a la factura y empresa a la que se debe hacer el "
-#~ "pago."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Error: Número BVR inválido (checksum erróneo)."
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Error: La referencia BVR es necesaria."
diff --git a/addons/account_payment/i18n/es_MX.po b/addons/account_payment/i18n/es_MX.po
new file mode 100644
index 00000000000..f7f051ca3da
--- /dev/null
+++ b/addons/account_payment/i18n/es_MX.po
@@ -0,0 +1,810 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_payment
+#
+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-01-12 13:13+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: 2011-09-05 05:26+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr "Fecha planificada si es fija"
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr "Moneda de la empresa"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr "Seleccione el modo de pago a aplicar."
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid ""
+"\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo proporciona:\n"
+"* Una forma más eficiente para gestionar el pago de las facturas.\n"
+"* Un mecanismo básico para conectar fácilmente varios pagos automatizados.\n"
+"    "
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Líneas de pago"
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr "Cuenta propietario"
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"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'."
+msgstr ""
+"Cuando se hace una orden, el estado es 'Borrador'.\n"
+" Una vez se confirma el banco, el estado es \"Confirmada\".\n"
+" Cuando la orden se paga, el estado es 'Realizada'."
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+"El importe que se debería haber pagado en la fecha actual\n"
+"menos el importe que ya está en la orden de pago"
+
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr "Fecha preferida"
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: account_payment
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr "Asientos"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr "Cuenta utilizada"
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr "Fecha de vencimiento"
+
+#. module: account_payment
+#: 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_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr "Línea del asiento contable"
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr "_Añadir a la orden de pago"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr "Extracto generar pago"
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_payment
+#: 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!"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr "Total en moneda de la compañía"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr "Nueva orden de pago"
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr "¡El nombre de la línea de pago debe ser única!"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr "Órdenes de pago"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr "Directamente"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr "Línea de pago"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr "Importe total"
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr "Fecha vencimiento factura"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr "Tipo ejecución"
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr "Estructurado"
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr "Información de transacción"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr "Modo de pago"
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr "Fecha vencimiento"
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr "Ref. factura"
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+"Seleccione una opción para la orden de pago: 'Fecha fija' para una fecha "
+"especificada por usted. 'Directamente' para la ejecución directa. 'Fecha "
+"vencimiento' para la fecha programada de ejecución."
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Total debe"
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr "Fecha ejecución"
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr "Diario de banco o caja para el modo de pago."
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr "Fecha fija"
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr "Cuenta de destino"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr "Cuenta de destino"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr "Buscar órdenes de pago"
+
+#. module: account_payment
+#: 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_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr "Creado"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr "Seleccionar facturas a pagar"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr "Importe total monetario"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr "Realizar pagos"
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr "Tipo de comunicación"
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr "Gestión de pagos"
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr "Línea extracto bancario"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr "Fecha vencimiento"
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr "Importe a pagar"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr "Dirección de la empresa principal"
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+"Si no se indica fecha de pago, el banco procesará esta línea de pago "
+"directamente"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr "Contabilidad extracto generar pago"
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr "Modo de pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr "Fecha valor"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr "Tipo de Pago"
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr "Importe pagado en la moneda de la empresa"
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr "El mensaje de pago realizado a comunicar."
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr "No se ha definido la empresa en la línea de entrada"
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr "Dirección del cliente que ordena."
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr "Generar extracto:"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Total haber"
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+"Seleccione una fecha si ha seleccionado que la fecha preferida sea fija."
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+msgid "Payment Lines"
+msgstr "Líneas de pago"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. module: account_payment
+#: 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."
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+"Esta línea se usará como referencia para la información del cliente que "
+"ordena."
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr "Orden de pago"
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr "Fecha de pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr "Fecha de creación"
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr "Añadir"
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr "Importar líneas de pago"
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr "Importe a pagar"
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr "Importe en la moneda de la compañía"
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr "El cliente que ordena"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr "Contabilidad realizar pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr "Ref. factura"
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr "Modo de pago"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr "Órdenes de pago"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr "Información General"
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr "Información"
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+"Una órden de pago es una petición de pago que realiza su compañía para pagar "
+"una factura de proveedor o un apunte de crédito de un cliente. Aquí puede "
+"registrar todas las órdenes de pago pendientes y hacer seguimiento de las "
+"órdenes e indicar la referencia de factura y la entidad a la cual pagar."
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr "Importe pagado en la moneda de la compañía"
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr "Buscar líneas de pago"
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr "Importe en la moneda de la empresa"
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr "Comunicación 2"
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr "Cuenta bancaria destino"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr "¿Está seguro que quiere realizar el pago?"
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr "Cuenta bancaria"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr "Confirmar pagos"
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr "Moneda de la compañía"
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr "Orden de pago / Pago"
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr "Línea del asiento"
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+"Se utiliza como mensaje entre el cliente que hace el pedido y la compañía "
+"actual. Describe '¿Qué quiere decir al receptor sobre este pedido?'"
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr "Información del asiento"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr "pago.orden.crear"
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr "Realizar pago"
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr "Generar pago"
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr "Cuenta bancaria para el modo de pago"
+
+#. module: account_payment
+#: 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."
+
+#~ msgid "Execution date:"
+#~ msgstr "Fecha de ejecución:"
+
+#~ msgid "Suitable bank types"
+#~ msgstr "Tipos de banco adecuados"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "_Cancel"
+#~ msgstr "_Cancelar"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Reference:"
+#~ msgstr "Referencia:"
+
+#~ msgid "Maturity Date"
+#~ msgstr "Fecha vencimiento"
+
+#~ msgid "Specify the Code for Payment Type"
+#~ msgstr "Indique el código para el tipo de pago"
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ 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 "Pay"
+#~ msgstr "Pagar"
+
+#~ msgid "Draft Payment Order"
+#~ msgstr "Orden de pago borrador"
+
+#~ msgid "Cash Journal for the Payment Mode"
+#~ msgstr "Diario de caja para el modo de pago"
+
+#~ msgid "_Search"
+#~ msgstr "_Buscar"
+
+#, python-format
+#~ msgid "Partner '+ line.partner_id.name+ ' has no bank account defined"
+#~ msgstr ""
+#~ "Empresa '+ line.partner_id.name+ ' no tiene una cuenta bancaria definida"
+
+#~ msgid "Payment Orders to Validate"
+#~ msgstr "Órdenes de pago a validar"
+
+#~ msgid "Payment type"
+#~ msgstr "Tipo de pago"
+
+#~ msgid "_Add"
+#~ msgstr "_Añadir"
+
+#~ msgid "Select the Payment Type for the Payment Mode."
+#~ msgstr "Seleccione el tipo de pago para el modo de pago."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Populate payment"
+#~ msgstr "Rellenar la orden"
+
+#~ msgid "Populate Statement with Payment lines"
+#~ msgstr "Llenar un extracto con líneas de pago"
diff --git a/addons/account_payment/i18n/es_PY.po b/addons/account_payment/i18n/es_PY.po
index aff9ac3142f..e410be9709d 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_VE.po b/addons/account_payment/i18n/es_VE.po
new file mode 100644
index 00000000000..f7f051ca3da
--- /dev/null
+++ b/addons/account_payment/i18n/es_VE.po
@@ -0,0 +1,810 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_payment
+#
+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-01-12 13:13+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: 2011-09-05 05:26+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr "Fecha planificada si es fija"
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr "Moneda de la empresa"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr "Seleccione el modo de pago a aplicar."
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid ""
+"\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo proporciona:\n"
+"* Una forma más eficiente para gestionar el pago de las facturas.\n"
+"* Un mecanismo básico para conectar fácilmente varios pagos automatizados.\n"
+"    "
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Líneas de pago"
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr "Cuenta propietario"
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"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'."
+msgstr ""
+"Cuando se hace una orden, el estado es 'Borrador'.\n"
+" Una vez se confirma el banco, el estado es \"Confirmada\".\n"
+" Cuando la orden se paga, el estado es 'Realizada'."
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+"El importe que se debería haber pagado en la fecha actual\n"
+"menos el importe que ya está en la orden de pago"
+
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr "Fecha preferida"
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: account_payment
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr "Asientos"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr "Cuenta utilizada"
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr "Fecha de vencimiento"
+
+#. module: account_payment
+#: 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_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr "Línea del asiento contable"
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr "_Añadir a la orden de pago"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr "Extracto generar pago"
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_payment
+#: 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!"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr "Total en moneda de la compañía"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr "Nueva orden de pago"
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr "¡El nombre de la línea de pago debe ser única!"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr "Órdenes de pago"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr "Directamente"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr "Línea de pago"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr "Importe total"
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr "Fecha vencimiento factura"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr "Tipo ejecución"
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr "Estructurado"
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr "Información de transacción"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr "Modo de pago"
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr "Fecha vencimiento"
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr "Ref. factura"
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+"Seleccione una opción para la orden de pago: 'Fecha fija' para una fecha "
+"especificada por usted. 'Directamente' para la ejecución directa. 'Fecha "
+"vencimiento' para la fecha programada de ejecución."
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Total debe"
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr "Fecha ejecución"
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr "Diario de banco o caja para el modo de pago."
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr "Fecha fija"
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr "Cuenta de destino"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr "Cuenta de destino"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr "Buscar órdenes de pago"
+
+#. module: account_payment
+#: 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_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr "Creado"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr "Seleccionar facturas a pagar"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr "Importe total monetario"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr "Realizar pagos"
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr "Tipo de comunicación"
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr "Gestión de pagos"
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr "Línea extracto bancario"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr "Fecha vencimiento"
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr "Importe a pagar"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr "Dirección de la empresa principal"
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+"Si no se indica fecha de pago, el banco procesará esta línea de pago "
+"directamente"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr "Contabilidad extracto generar pago"
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr "Modo de pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr "Fecha valor"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr "Tipo de Pago"
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr "Importe pagado en la moneda de la empresa"
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr "El mensaje de pago realizado a comunicar."
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr "No se ha definido la empresa en la línea de entrada"
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr "Dirección del cliente que ordena."
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr "Generar extracto:"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Total haber"
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+"Seleccione una fecha si ha seleccionado que la fecha preferida sea fija."
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+msgid "Payment Lines"
+msgstr "Líneas de pago"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. module: account_payment
+#: 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."
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+"Esta línea se usará como referencia para la información del cliente que "
+"ordena."
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr "Orden de pago"
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr "Fecha de pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr "Fecha de creación"
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr "Añadir"
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr "Importar líneas de pago"
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr "Importe a pagar"
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr "Importe en la moneda de la compañía"
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr "El cliente que ordena"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr "Contabilidad realizar pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr "Ref. factura"
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr "Modo de pago"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr "Órdenes de pago"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr "Información General"
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr "Información"
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+"Una órden de pago es una petición de pago que realiza su compañía para pagar "
+"una factura de proveedor o un apunte de crédito de un cliente. Aquí puede "
+"registrar todas las órdenes de pago pendientes y hacer seguimiento de las "
+"órdenes e indicar la referencia de factura y la entidad a la cual pagar."
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr "Importe pagado en la moneda de la compañía"
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr "Buscar líneas de pago"
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr "Importe en la moneda de la empresa"
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr "Comunicación 2"
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr "Cuenta bancaria destino"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr "¿Está seguro que quiere realizar el pago?"
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr "Cuenta bancaria"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr "Confirmar pagos"
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr "Moneda de la compañía"
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr "Orden de pago / Pago"
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr "Línea del asiento"
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+"Se utiliza como mensaje entre el cliente que hace el pedido y la compañía "
+"actual. Describe '¿Qué quiere decir al receptor sobre este pedido?'"
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr "Información del asiento"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr "pago.orden.crear"
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr "Realizar pago"
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr "Generar pago"
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr "Cuenta bancaria para el modo de pago"
+
+#. module: account_payment
+#: 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."
+
+#~ msgid "Execution date:"
+#~ msgstr "Fecha de ejecución:"
+
+#~ msgid "Suitable bank types"
+#~ msgstr "Tipos de banco adecuados"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "_Cancel"
+#~ msgstr "_Cancelar"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Reference:"
+#~ msgstr "Referencia:"
+
+#~ msgid "Maturity Date"
+#~ msgstr "Fecha vencimiento"
+
+#~ msgid "Specify the Code for Payment Type"
+#~ msgstr "Indique el código para el tipo de pago"
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ 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 "Pay"
+#~ msgstr "Pagar"
+
+#~ msgid "Draft Payment Order"
+#~ msgstr "Orden de pago borrador"
+
+#~ msgid "Cash Journal for the Payment Mode"
+#~ msgstr "Diario de caja para el modo de pago"
+
+#~ msgid "_Search"
+#~ msgstr "_Buscar"
+
+#, python-format
+#~ msgid "Partner '+ line.partner_id.name+ ' has no bank account defined"
+#~ msgstr ""
+#~ "Empresa '+ line.partner_id.name+ ' no tiene una cuenta bancaria definida"
+
+#~ msgid "Payment Orders to Validate"
+#~ msgstr "Órdenes de pago a validar"
+
+#~ msgid "Payment type"
+#~ msgstr "Tipo de pago"
+
+#~ msgid "_Add"
+#~ msgstr "_Añadir"
+
+#~ msgid "Select the Payment Type for the Payment Mode."
+#~ msgstr "Seleccione el tipo de pago para el modo de pago."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Populate payment"
+#~ msgstr "Rellenar la orden"
+
+#~ msgid "Populate Statement with Payment lines"
+#~ msgstr "Llenar un extracto con líneas de pago"
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index ab99edfd367..cd30a46f60f 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.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:14+0000\n"
-"PO-Revision-Date: 2010-10-30 09:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-10 19:42+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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -353,12 +353,12 @@ msgstr "Makstav summa"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuuta"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Jah"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
@@ -466,7 +466,7 @@ msgstr "See kirje rida viitab telliva kliendi infole."
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "Otsing"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
@@ -482,7 +482,7 @@ msgstr "Maksekuupäev"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "Kokku:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -554,7 +554,7 @@ msgstr "Tehtud"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Arve"
 
 #. module: account_payment
 #: field:payment.line,communication:0
@@ -668,7 +668,7 @@ msgstr "Nimi"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Pangakonto"
 
 #. module: account_payment
 #: view:payment.line:0
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index f49d977a151..9d8c7cfb76f 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -41,7 +41,7 @@ msgstr "Valitse käytettävä maksutapa."
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: account_payment
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -85,7 +85,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
@@ -105,7 +105,7 @@ msgstr "Merkinnät"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "Käytetty tili"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
@@ -116,7 +116,7 @@ msgstr "Eräpäivä"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä suljetulle tilille."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -143,7 +143,7 @@ msgstr "Summa"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Väärä kredit tai debet arvo tiliviennissä"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -169,7 +169,7 @@ msgstr "Viite"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Maksurivin nimen pitää olla uniikki"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -209,7 +209,7 @@ msgstr "Laskun voimaantulopäivä"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "Suorituksen tyyppi"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -277,7 +277,7 @@ msgstr "Toimeenpanopäivä"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Pankki tai käteis päiväkirja maksujen tilalle"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -298,7 +298,7 @@ msgstr "Kohdetili"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Hae maksumääräyksiä"
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -339,7 +339,7 @@ msgstr "Maksunhallinta"
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "Pankkitiliotteen rivi"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -354,12 +354,12 @@ msgstr "Maksettava summa"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuutta"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Kyllä"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
@@ -388,7 +388,7 @@ msgstr "Maksumuoto"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Arvopäivä"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -452,12 +452,12 @@ msgstr "Maksurivit"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Päiväkirjan tapahtumat"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Yrityksen tulee olla sama liittyvälle tilille ja jaksolle."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -469,7 +469,7 @@ msgstr "Tätä riviä käytetään viittaamaan tilaavan asiakkaan tietoihin."
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "Hae"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
@@ -485,7 +485,7 @@ msgstr "Maksupäivämäärä"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "Summa:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -495,7 +495,7 @@ msgstr "Luomispäivämäärä"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "LISÄÄ"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -520,12 +520,12 @@ msgstr "Tilaava asiakas"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "Tee tilitämaksu"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Laskun viite"
 
 #. module: account_payment
 #: field:payment.line,name:0
@@ -557,7 +557,7 @@ msgstr "Valmis"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Lasku"
 
 #. module: account_payment
 #: field:payment.line,communication:0
@@ -615,7 +615,7 @@ msgstr "Kohde pankkitili"
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "Oletko varma että haluat tehdä maksun"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -649,7 +649,7 @@ msgstr "Maksu"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "Maksujärjestys / maksu"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -673,7 +673,7 @@ msgstr "Nimi"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Pankkitilinumero"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -700,7 +700,7 @@ msgstr "Yhteensä"
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "Tee maksu"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -721,7 +721,7 @@ msgstr "Pankkitili tälle maksutavalle"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Et voi luoda siirtoriviä näkymätilille."
 
 #~ msgid "Maturity Date"
 #~ msgstr "Eräpäivä"
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 28dfdd9a371..6eed65f00be 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-12 03:48+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -812,15 +812,3 @@ msgstr ""
 
 #~ msgid "Select the Payment Type for the Payment Mode."
 #~ msgstr "Choisissez le type de paiement pour le mode de paiement."
-
-#~ msgid ""
-#~ "A payment order is a payment request that your company does in order to pay "
-#~ "a supplier invoice or a customer credit note. Here you can register all "
-#~ "payment orders that should be done, keep track of all payment orders and "
-#~ "mention the invoice reference and the partner the payment should be done for."
-#~ msgstr ""
-#~ "Un ordre de paiement est une demande de paiement passée par votre société "
-#~ "pour payer une facture de fournisseur ou une note de crédit d'un client. "
-#~ "Ici, vous pouvez enregistrer tous les ordres de paiement à faire, garder une "
-#~ "trace de tous les ordres de paiement,  mentionner la référence de la facture "
-#~ "et le partenaire en faveur de qui sera fait le paiement."
diff --git a/addons/account_payment/i18n/gl.po b/addons/account_payment/i18n/gl.po
index 6d8515591b3..13fcdce9385 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4e9bbf5b959..227f75dabe2 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ecbb3098163..fbb8a4251ac 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-17 01:09+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c4a18e7b017..c215737681a 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-30 18:36+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -734,21 +735,3 @@ msgstr "A fizetési módhoz kapcsolódó bankszámlaszám"
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
 msgstr "Nem könyvelhet gyűjtő típusú számlára."
-
-#~ msgid ""
-#~ "When an order is placed the state is 'Draft'.\n"
-#~ "\"\n"
-#~ "\" Once the bank is confirmed the state is set to 'Confirmed'.\n"
-#~ "\"\n"
-#~ "\" Then the order is paid the state is 'Done'."
-#~ msgstr ""
-#~ "Az átutalási megbízás berögzítéskor 'Tervezet' állapotba kerül. Miután a "
-#~ "bank jóváhagyja, állapota 'Jóváhagyott'-ra változik. Ha az átutalás "
-#~ "megtörténik, az állapota 'Kész' lesz."
-
-#~ msgid ""
-#~ "The amount which should be paid at the current date\n"
-#~ "\"\n"
-#~ "\"minus the amount which is already in payment order"
-#~ msgstr ""
-#~ "Jelenleg fizetendő összeg mínusz az átutalási megbízáson szereplő összeg"
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index 915a66a5752..2ce8e2b13f3 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 32f6eeab877..4edd6b7c95c 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -767,24 +767,3 @@ msgstr ""
 
 #~ msgid "Payment Orders to Validate"
 #~ msgstr "Ordini di pagamento da convalidare"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare menu ricorsivi."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Il nome del gruppo deve essere univoco !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1 !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate dagli oggetti osv_memory !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index e8cbafbb70c..e2501a55fbf 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7835f02063d..ef4c43a8a97 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index 2cbd02da445..2649d3396b1 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
index 34bc2527ab6..f8f6cd8975e 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr ""
+msgstr "Leverandørs valuta"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
@@ -109,7 +109,7 @@ msgstr ""
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr ""
+msgstr "Forfallsdato"
 
 #. module: account_payment
 #: constraint:account.move.line:0
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 98d5c3e21ed..78a5bea646e 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -705,7 +705,7 @@ msgstr "payment.order.create"
 #. module: account_payment
 #: field:payment.line,order_id:0
 msgid "Order"
-msgstr "Volgorde"
+msgstr "Opdracht"
 
 #. module: account_payment
 #: field:payment.order,total:0
@@ -807,35 +807,3 @@ msgstr "U kunt geen boekingsregel creëren op een zichtrekening"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "De groepsnaam moet uniek zijn !"
-
-#~ msgid ""
-#~ "A payment order is a payment request that your company does in order to pay "
-#~ "a supplier invoice or a customer credit note. Here you can register all "
-#~ "payment orders that should be done, keep track of all payment orders and "
-#~ "mention the invoice reference and the partner the payment should be done for."
-#~ msgstr ""
-#~ "Een betalingsopdracht is een betalingsaanvraag die uw bedrijf doet om een "
-#~ "leverancier factuur of klant credit-nota te betalen. U kunt hier alle "
-#~ "betaalopdrachten invoeren, alle opdrachten volgen en de factuur referentie "
-#~ "en de relatie vermelden waarvoor de betaling gedaan moet worden."
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index 8c5f2569bc2..26e1a3e9664 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3ae4c5763fe..0ceba96b297 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cab0cdacca2..854ba26cb3f 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 58cdb41a076..ffda6c12653 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0c3220f0481..977e1b4811c 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -808,21 +808,3 @@ msgstr "Você não pode criar linhas de movimento em uma conta de exibição."
 
 #~ msgid "Populate Statement with Payment lines"
 #~ msgstr "Preencha a declaração com as linhas de pagamento"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regra precisa ter ao menos um direito de acesso marcado."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo precisa ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 6000cc87f44..f60390d3939 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fa553be0cfe..65298b2f3c4 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -24,17 +24,17 @@ msgstr "Дата по плану, если задана"
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr "Валюта партнера"
+msgstr "Валюта контрагента"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr "Установить в 'Черновик'"
+msgstr "Установить в \"Черновик\""
 
 #. module: account_payment
 #: help:payment.order,mode:0
 msgid "Select the Payment Mode to be applied."
-msgstr "Выберите режим платежа для применения"
+msgstr "Выберите способ оплаты для применения"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "Этот модуль обеспечивает :\n"
 "* более эффективный способ управления оплатой счетов.\n"
-"* постой механизм для разных автоматических платежей.\n"
+"* простой механизм для разных автоматических платежей.\n"
 "    "
 
 #. module: account_payment
@@ -76,7 +76,7 @@ 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"
 " После оплаты, состояние \"Готово\""
 
@@ -118,7 +118,7 @@ msgstr "Используемый счет"
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr "Срок"
+msgstr "Дата исполнения"
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -171,7 +171,7 @@ msgstr "Новое платежное поручение"
 #: report:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
-msgstr "Ссылка"
+msgstr "Обозначение"
 
 #. module: account_payment
 #: sql_constraint:payment.line:0
@@ -242,12 +242,12 @@ msgstr "Информация транзакции"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Payment Mode"
-msgstr "Режим оплаты"
+msgstr "Способ оплаты"
 
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr "Действительно до"
+msgstr "Дата вступления в силу"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
@@ -262,7 +262,8 @@ msgid ""
 "scheduled date of execution."
 msgstr ""
 "Выберите опцию для платежного поручения: 'Заданная'' - дата установлена "
-"вами. 'Немедленно' - выполнить сразу. 'Срок' - выполнить в определенную дату."
+"вами. 'Немедленно' - выполнить сразу. 'Дата исполнения' - выполнить в "
+"определенную дату."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
@@ -283,7 +284,7 @@ msgstr "Дата исполнения"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr "Банковский или кассовый журнал для формы оплаты"
+msgstr "Банковский или кассовый журнал для способа оплаты"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -294,12 +295,12 @@ msgstr "Заданная дата"
 #: field:payment.line,info_partner:0
 #: view:payment.order:0
 msgid "Destination Account"
-msgstr "Счет назначения"
+msgstr "Р/с получателя"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Desitination Account"
-msgstr "Счет назначения"
+msgstr "Р/с получателя"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -335,7 +336,7 @@ msgstr "Произвести платежи"
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr "Тип коммуникации"
+msgstr "Тип назначения платежа"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
@@ -350,7 +351,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
@@ -370,7 +371,7 @@ msgstr "Да"
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
-msgstr "Адрес основного партнера"
+msgstr "Адрес основного контрагента"
 
 #. module: account_payment
 #: help:payment.line,date:0
@@ -387,7 +388,7 @@ msgstr "Заполнение платежного поручения"
 #. module: account_payment
 #: help:payment.mode,name:0
 msgid "Mode of Payment"
-msgstr "Режим платежа"
+msgstr "Способ оплаты"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -413,13 +414,13 @@ msgstr "Черновик"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr "Приемник сообщения коммуникации"
+msgstr "Продолжение назначения платежа"
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr "Не определен партнер в проводке"
+msgstr "Не определен контрагент в проводке"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
@@ -467,7 +468,7 @@ msgstr "Для счета и периода должна быть одна ко
 msgid ""
 "This Entry Line will be referred for the information of the ordering "
 "customer."
-msgstr "Эта проводка будет использована для информации о плательщике."
+msgstr "Эта проводка будет использована для информации о заказчике."
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -518,7 +519,7 @@ msgstr "Сумма в валюте компании"
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr "Заказчик"
+msgstr "Плательщик"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
@@ -533,12 +534,12 @@ msgstr "Ссылка на счет"
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr "Ваша ссылка"
+msgstr "Ссылка"
 
 #. module: account_payment
 #: field:payment.order,mode:0
 msgid "Payment mode"
-msgstr "Режим платежа"
+msgstr "Способ оплаты"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -555,7 +556,7 @@ msgstr "Общая информация"
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Done"
-msgstr "Готово"
+msgstr "Сделано"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
@@ -565,7 +566,7 @@ msgstr "Счет"
 #. module: account_payment
 #: field:payment.line,communication:0
 msgid "Communication"
-msgstr "Связь"
+msgstr "Назначение"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -589,7 +590,7 @@ msgid ""
 "that should be done, keep track of all payment orders and mention the "
 "invoice reference and the partner the payment should be done for."
 msgstr ""
-"Платежное поручение это платежное требование от вышей компании на оплату "
+"Платежное поручение это платежное требование от вашей компании на оплату "
 "счета поставщика. Здесь вы заносите все платежные поручения которые должны "
 "быть исполнены, отслеживаете все платежные поручения, ссылки на счета и "
 "партнеров по которым должны быть сделаны платежи."
@@ -612,12 +613,12 @@ msgstr "Сумма в валюте партнера"
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr "Коммуникации 2"
+msgstr "Назначение 2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr "Банковский счет назначения"
+msgstr "Р/с получателя"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -628,7 +629,7 @@ msgstr "Вы уверены, что хотите сделать платеж ?"
 #: view:payment.mode:0
 #: field:payment.mode,journal:0
 msgid "Journal"
-msgstr "Книга"
+msgstr "Журнал"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
@@ -670,7 +671,7 @@ msgid ""
 "'What do you want to say to the recipient about this order ?'"
 msgstr ""
 "Используется как сообщение между плательщиком и текущей компанией. "
-"Обозначает \"Что вы хотите сказать получателю об этом распоряжение ?'"
+"Обозначает \"Что вы хотите сказать получателю в этом распоряжении ?'"
 
 #. module: account_payment
 #: field:payment.mode,name:0
@@ -680,13 +681,13 @@ msgstr "Название"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr "Счет банка"
+msgstr "Банковский счет"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr "Информация проводки"
+msgstr "Информация записи"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
@@ -696,7 +697,7 @@ msgstr "payment.order.create"
 #. module: account_payment
 #: field:payment.line,order_id:0
 msgid "Order"
-msgstr "Заказ"
+msgstr "Распоряжение"
 
 #. module: account_payment
 #: field:payment.order,total:0
@@ -713,7 +714,7 @@ msgstr "Оплатить"
 #: field:payment.line,partner_id:0
 #: report:payment.order:0
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Контрагент"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
@@ -723,7 +724,7 @@ msgstr "Заполнить платежку"
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr "Банковский счет для режима платежа"
+msgstr "Банковский счет для способа оплаты"
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -796,27 +797,6 @@ msgstr "Нельзя создать проводку по счету с типо
 #~ msgid "Cash Journal for the Payment Mode"
 #~ msgstr "Кассовая книга для режима платежа"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Правила не поддерживаются для объектов osv_memory !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Название группы должно быть уникальным !"
-
 #, python-format
 #~ msgid "Partner '+ line.partner_id.name+ ' has no bank account defined"
 #~ msgstr ""
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index 31b42c59d9e..b8a7179e28e 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 acc2a74e392..1a1ed35e7f6 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 60e7748bde8..9876f8f85c8 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -789,9 +789,3 @@ msgstr ""
 
 #~ msgid "Select the Payment Type for the Payment Mode."
 #~ msgstr "Odaberite tip plaćanja za način plaćanja"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index afc9505fcb7..6efe331146d 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -731,9 +731,6 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -742,9 +739,6 @@ msgstr ""
 #~ msgid "Cash Journal for the Payment Mode"
 #~ msgstr "Gotovisnki Dnevnik za način plaćanja"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
 #~ msgid "Execution date:"
 #~ msgstr "Datum izvršenja:"
 
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index f8701bb7c30..5ea98f99510 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -746,15 +746,9 @@ msgstr "Du kan inte skapa transaktioner på visa-konton."
 #~ msgid "Select the Payment Type for the Payment Mode."
 #~ msgstr "Select the Payment Type for the Payment Mode."
 
-#~ msgid "Value date"
-#~ msgstr "Value date"
-
 #~ msgid "Suitable bank types"
 #~ msgstr "Suitable bank types"
 
-#~ msgid "Amount in currency"
-#~ msgstr "Amount in currency"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
@@ -801,8 +795,5 @@ msgstr "Du kan inte skapa transaktioner på visa-konton."
 #~ msgid "Payment type"
 #~ msgstr "Payment type"
 
-#~ msgid "Invoice reference"
-#~ msgstr "Invoice reference"
-
 #~ msgid "_Add"
 #~ msgstr "_Add"
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index 3cddb7c82ed..3b1e30568f4 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e3f782b3d7d..2f16fec8593 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: 2011-05-30 04:58+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c996b745b7b..d569217a6ab 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ce9038a0c16..10afe03af89 100644
--- a/addons/account_payment/i18n/vi.po
+++ b/addons/account_payment/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-06-04 22:07+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-06-05 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8d085b988d8..8af6911e7ea 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -8,23 +8,23 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-10-30 14:52+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
-msgstr "指定日期(如果是固定)"
+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
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -51,6 +51,11 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"此模块提供以下功能：\n"
+"- 更高效地管理发票的付款\n"
+"- 基本的机制用于简单地管理各种自动付款\n"
+"    "
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -62,7 +67,7 @@ msgstr "付款明细"
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr "所有者科目"
+msgstr "所有者描述"
 
 #. module: account_payment
 #: help:payment.order,state:0
@@ -71,6 +76,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"
+"银行已付款则申请状态是完成"
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -84,17 +92,17 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr "首选日期"
+msgstr "优先日期"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr "免费"
+msgstr "自由"
 
 #. module: account_payment
 #: field:payment.order.create,entries:0
@@ -104,7 +112,7 @@ msgstr "凭证"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "使用的帐号"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
@@ -115,12 +123,12 @@ msgstr "到期日期"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "您不能在关闭的科目上建立分录。"
 
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr "凭证行"
+msgstr "凭证明细"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -131,7 +139,7 @@ msgstr "增加到付款单"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr ""
+msgstr "填充付款声明"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -142,12 +150,12 @@ msgstr "金额"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "错误的分录"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr "公司货币的合计"
+msgstr "公司币别的合计"
 
 #. module: account_payment
 #: selection:payment.order,state:0
@@ -163,12 +171,12 @@ msgstr "新付款单"
 #: report:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
-msgstr "关联单号"
+msgstr "单号"
 
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "付款明细名称必须是唯一的！"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -198,7 +206,7 @@ msgstr "金额合计"
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr "确认"
+msgstr "已确认"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
@@ -208,7 +216,7 @@ msgstr "发票有效日期"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "执行类型"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -244,7 +252,7 @@ msgstr "有效日期"
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
 msgid "Invoice Ref."
-msgstr "发票关联单号"
+msgstr "发票单号"
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
@@ -252,7 +260,7 @@ msgid ""
 "Choose an option for the Payment Order:'Fixed' stands for a date specified "
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
-msgstr "选择付款单选项‘固定’由你指定一个指定的日期. ‘直接’表示直接执行. ‘到期日期’指定一个时间表的日期执行."
+msgstr "选择付款单选项“固定”由你指定一个指定的日期，“直接”表示直接执行。“到期日期”指定一个日程表日期执行。"
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
@@ -273,7 +281,7 @@ msgstr "执行日期"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "这付款方式的银行或现金日记账"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -284,17 +292,17 @@ msgstr "固定日期"
 #: field:payment.line,info_partner:0
 #: view:payment.order:0
 msgid "Destination Account"
-msgstr "目标科目"
+msgstr "目标描述"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Desitination Account"
-msgstr "目标科目"
+msgstr "目标描述"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "搜索付款单"
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -315,7 +323,7 @@ msgstr "选择发票支付"
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
-msgstr "当前金额合计"
+msgstr "金额合计"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -325,7 +333,7 @@ msgstr "建立付款"
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr "沟通类型"
+msgstr "讯息类型"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
@@ -335,7 +343,7 @@ 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
@@ -350,12 +358,12 @@ msgstr "应支付金额"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "币别"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
@@ -372,7 +380,7 @@ msgstr "如果没有指定付款日期将直接由银行付款"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr ""
+msgstr "付款帐户填充声明"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -382,7 +390,7 @@ msgstr "付款方式"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "重要的日子"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -392,7 +400,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
@@ -403,13 +411,13 @@ msgstr "草稿"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr "沟通的消息"
+msgstr "讯息的跟进消息"
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr "在凭证行没定义业务伙伴"
+msgstr "凭证明细定义业务伙伴"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
@@ -419,7 +427,7 @@ msgstr "客户订单地址"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr ""
+msgstr "填充声明："
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -445,24 +453,24 @@ msgstr "付款明细"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "账簿项"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "公司帐户和会计期限必须相同。"
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
 msgid ""
 "This Entry Line will be referred for the information of the ordering "
 "customer."
-msgstr "这凭证行将在这客户订单作为关联单号"
+msgstr "这凭证明细将与客户订单关联"
 
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "搜索"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
@@ -478,7 +486,7 @@ msgstr "付款日期"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "合计:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -488,12 +496,12 @@ msgstr "创建日期"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "增加"
 
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import payment lines"
-msgstr "进项付款明细"
+msgstr "导入付款明细"
 
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
@@ -503,7 +511,7 @@ msgstr "支付金额"
 #. module: account_payment
 #: field:payment.line,amount:0
 msgid "Amount in Company Currency"
-msgstr "公司使用货币的金额"
+msgstr "公司币别的金额"
 
 #. module: account_payment
 #: help:payment.line,partner_id:0
@@ -513,17 +521,17 @@ msgstr "客户订单"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "帐户支付"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "发票单号"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr "你的关联单号"
+msgstr "您的单号"
 
 #. module: account_payment
 #: field:payment.order,mode:0
@@ -550,12 +558,12 @@ msgstr "完成"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: account_payment
 #: field:payment.line,communication:0
 msgid "Communication"
-msgstr "沟通"
+msgstr "讯息"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -578,12 +586,12 @@ msgid ""
 "invoice or a customer credit note. Here you can register all payment orders "
 "that should be done, keep track of all payment orders and mention the "
 "invoice reference and the partner the payment should be done for."
-msgstr ""
+msgstr "付款申请是你的公司为支付供应商发票或客户红字发票建立的申请。这里你可以输入所有需要付款的申请，跟踪申请状态并通知业务伙伴你将付款。"
 
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
-msgstr "在公司货币的付款金额"
+msgstr "公司币别的付款金额"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -593,12 +601,12 @@ msgstr "查询付款明细"
 #. module: account_payment
 #: field:payment.line,amount_currency:0
 msgid "Amount in Partner Currency"
-msgstr "业务伙伴使用货币的金额"
+msgstr "业务伙伴币别的金额"
 
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr "沟通2"
+msgstr "讯息2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
@@ -608,13 +616,13 @@ msgstr "目标银行账号"
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "你确定你要付款吗？"
 
 #. module: account_payment
 #: view:payment.mode:0
 #: field:payment.mode,journal:0
 msgid "Journal"
-msgstr "业务类型"
+msgstr "账簿"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
@@ -630,7 +638,7 @@ msgstr "确认付款"
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr "公司货币"
+msgstr "公司币别"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
@@ -642,19 +650,19 @@ msgstr "付款"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "预付款/付款"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
-msgstr "凭证行"
+msgstr "凭证明细"
 
 #. module: account_payment
 #: help:payment.line,communication:0
 msgid ""
 "Used as the message between ordering customer and current company. Depicts "
 "'What do you want to say to the recipient about this order ?'"
-msgstr "用作订购客户和当前公司之间的消息.描述你在这订单想要说的?"
+msgstr "用与客户订单和公司之间的消息。描述你在这单据想要说的?"
 
 #. module: account_payment
 #: field:payment.mode,name:0
@@ -664,7 +672,7 @@ msgstr "名称"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "银行账户"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -675,7 +683,7 @@ msgstr "信息"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
 msgid "payment.order.create"
-msgstr ""
+msgstr "payment.order.create"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
@@ -691,7 +699,7 @@ msgstr "合计"
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "建立付款"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -702,7 +710,7 @@ msgstr "业务伙伴"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr ""
+msgstr "填写付款单"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -712,7 +720,7 @@ msgstr "这付款方式的银行账号"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "不能针对内部类型是视图的科目记账"
 
 #~ msgid "_Cancel"
 #~ msgstr "取消(_C)"
@@ -720,19 +728,6 @@ msgstr ""
 #~ msgid "Execution date:"
 #~ msgstr "执行日期:"
 
-#~ msgid ""
-#~ "\n"
-#~ "    This module provide :\n"
-#~ "    * a more efficient way to manage invoice payment.\n"
-#~ "    * a basic mechanism to easily plug various automated payment.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这模块提供:\n"
-#~ "    * 更有效的方式来管理发票的付款.\n"
-#~ "    * 一个基本机制来自动支付\n"
-#~ "    "
-
 #~ msgid "Suitable bank types"
 #~ msgstr "合适的银行类型"
 
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 291d2cfd4ac..02f5d777158 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:21+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -24,23 +24,23 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr ""
+msgstr "伙伴貨幣"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr ""
+msgstr "設為草稿"
 
 #. module: account_payment
 #: help:payment.order,mode:0
 msgid "Select the Payment Mode to be applied."
-msgstr ""
+msgstr "選取要應用之付款模式。"
 
 #. module: account_payment
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "分組根據..."
 
 #. module: account_payment
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -55,14 +55,14 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,line_ids:0
 msgid "Payment lines"
-msgstr ""
+msgstr "付款明細"
 
 #. module: account_payment
 #: view:payment.line:0
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr ""
+msgstr "擁有者帳號"
 
 #. module: account_payment
 #: help:payment.order,state:0
@@ -82,12 +82,12 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr ""
+msgstr "首選日期"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -97,7 +97,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order.create,entries:0
 msgid "Entries"
-msgstr ""
+msgstr "項目"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -108,7 +108,7 @@ msgstr ""
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr ""
+msgstr "到期日"
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -135,7 +135,7 @@ msgstr ""
 #: report:payment.order:0
 #: view:payment.order:0
 msgid "Amount"
-msgstr ""
+msgstr "總額"
 
 #. module: account_payment
 #: sql_constraint:account.move.line:0
@@ -150,7 +150,7 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "取消"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
@@ -161,7 +161,7 @@ msgstr ""
 #: report:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "參考"
 
 #. module: account_payment
 #: sql_constraint:payment.line:0
@@ -185,28 +185,28 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment Line"
-msgstr ""
+msgstr "付款明細"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Amount Total"
-msgstr ""
+msgstr "總計"
 
 #. module: account_payment
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "確認"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
 msgid "Invoice Effective Date"
-msgstr ""
+msgstr "發票有效日期"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "執行類型"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -223,7 +223,7 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr ""
+msgstr "交易資訊"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -232,17 +232,17 @@ msgstr ""
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "付款模式"
 
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr ""
+msgstr "有效日期"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
 msgid "Invoice Ref."
-msgstr ""
+msgstr "發票參考"
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
@@ -266,7 +266,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "執行日期"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
@@ -282,12 +282,12 @@ msgstr ""
 #: field:payment.line,info_partner:0
 #: view:payment.order:0
 msgid "Destination Account"
-msgstr ""
+msgstr "目的帳號"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Desitination Account"
-msgstr ""
+msgstr "目的帳號"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -313,22 +313,22 @@ msgstr ""
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
-msgstr ""
+msgstr "貨幣總計"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr ""
+msgstr "付款"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr ""
+msgstr "通訊類型"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
 msgid "Payment Management"
-msgstr ""
+msgstr "付款管理"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -338,27 +338,27 @@ 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
 msgid "Amount to be paid"
-msgstr ""
+msgstr "要付總額"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "貨幣"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
-msgstr ""
+msgstr "主要伙伴地址"
 
 #. module: account_payment
 #: help:payment.line,date:0
@@ -375,7 +375,7 @@ msgstr ""
 #. module: account_payment
 #: help:payment.mode,name:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "付款模式"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -385,18 +385,18 @@ msgstr ""
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Type"
-msgstr ""
+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
 #: selection:payment.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -412,7 +412,7 @@ msgstr ""
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr ""
+msgstr "訂單客戶地址。"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -438,7 +438,7 @@ msgstr ""
 #: field:account.payment.populate.statement,lines:0
 #: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
 msgid "Payment Lines"
-msgstr ""
+msgstr "付款明細"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
@@ -460,7 +460,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "搜尋"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
@@ -471,17 +471,17 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,date:0
 msgid "Payment Date"
-msgstr ""
+msgstr "付款日期"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "總計:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -491,22 +491,22 @@ msgstr ""
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import payment lines"
-msgstr ""
+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
 msgid "Amount in Company Currency"
-msgstr ""
+msgstr "以公司貨幣計算之總額"
 
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr ""
+msgstr "下訂客戶"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
@@ -516,17 +516,17 @@ msgstr ""
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "發票參考"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr ""
+msgstr "您的參考"
 
 #. module: account_payment
 #: field:payment.order,mode:0
 msgid "Payment mode"
-msgstr ""
+msgstr "付款模式"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -537,23 +537,23 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "General Information"
-msgstr ""
+msgstr "一般資訊"
 
 #. module: account_payment
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "發票"
 
 #. module: account_payment
 #: field:payment.line,communication:0
 msgid "Communication"
-msgstr ""
+msgstr "通訊"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -561,13 +561,13 @@ msgstr ""
 #: view:payment.order:0
 #: view:payment.order.create:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Information"
-msgstr ""
+msgstr "資訊"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -581,32 +581,32 @@ msgstr ""
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
-msgstr ""
+msgstr "以公司貨幣計算之付款總額"
 
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search Payment lines"
-msgstr ""
+msgstr "搜尋付款明細"
 
 #. module: account_payment
 #: field:payment.line,amount_currency:0
 msgid "Amount in Partner Currency"
-msgstr ""
+msgstr "以伙伴貨幣計算之總額"
 
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr ""
+msgstr "通訊 2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr ""
+msgstr "目的銀行帳號"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "是否進行付款?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -617,25 +617,25 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,bank_id:0
 msgid "Bank account"
-msgstr ""
+msgstr "銀行帳號"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Confirm Payments"
-msgstr ""
+msgstr "確認付款"
 
 #. module: account_payment
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr ""
+msgstr "公司貨幣"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -657,12 +657,12 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,name:0
 msgid "Name"
-msgstr ""
+msgstr "名稱"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "銀行帳戶"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -683,19 +683,19 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,total:0
 msgid "Total"
-msgstr ""
+msgstr "總計"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
 #: report:payment.order:0
 msgid "Partner"
-msgstr ""
+msgstr "伙伴"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
@@ -705,7 +705,7 @@ msgstr ""
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr ""
+msgstr "用於該付款模式的銀行帳號"
 
 #. module: account_payment
 #: constraint:account.move.line:0
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 905baf7e118..c454a84bffd 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Search Payment lines">
-			    <group col="4" colspan="6">
-					<field name="duedate" />
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
-				</group>
-			</form>
+                <group col="4" colspan="6">
+                    <field name="duedate" />
+                </group>
+                <separator colspan="4"/>
+                <group col="2" colspan="4">
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -25,15 +25,16 @@
             <field name="model">payment.order.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Search Payment lines">
-			    <group col="4" colspan="6">
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
-				</group>
-			</form>
+                <form string="Search Payment lines">
+                    <group col="4" colspan="6">
+                        <field name="entries"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group col="2" colspan="4">
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
+                    </group>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index d1137078c32..613b049a412 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -29,7 +29,7 @@ class payment_order_create(osv.osv_memory):
     Create a payment object with lines corresponding to the account move line
     to pay according to the date and the mode provided by the user.
     Hypothesis:
-    - Small number of non-reconcilied move line, payment mode and bank account type,
+    - Small number of non-reconciled move line, payment mode and bank account type,
     - Big number of partner and bank account.
 
     If a type is given, unsuitable account Entry lines are ignored.
@@ -48,12 +48,11 @@ class payment_order_create(osv.osv_memory):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(payment_order_create, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         if context and 'line_ids' in context:
-            view_obj = etree.XML(res['arch'])
-            child = view_obj.getchildren()[0]
-            domain = '[("id", "in", '+ str(context['line_ids'])+')]'
-            field = etree.Element('field', attrib={'domain': domain, 'name':'entries', 'colspan':'4', 'height':'300', 'width':'800', 'nolabel':"1"})
-            child.addprevious(field)
-            res['arch'] = etree.tostring(view_obj)
+            doc = etree.XML(res['arch'])
+            nodes = doc.xpath("//field[@name='entries']")
+            for node in nodes:
+                node.set('domain', '[("id", "in", '+ str(context['line_ids'])+')]')
+            res['arch'] = etree.tostring(doc)
         return res
 
     def create_payment(self, cr, uid, ids, context=None):
@@ -81,14 +80,14 @@ class payment_order_create(osv.osv_memory):
             elif payment.date_prefered == 'fixed':
                 date_to_pay = payment.date_scheduled
             payment_obj.create(cr, uid,{
-                'move_line_id': line.id,
-                'amount_currency': line.amount_to_pay,
-                'bank_id': line2bank.get(line.id),
-                'order_id': payment.id,
-                '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,
+                    'move_line_id': line.id,
+                    'amount_currency': line.amount_to_pay,
+                    'bank_id': line2bank.get(line.id),
+                    'order_id': payment.id,
+                    '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,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 16d8dc5a7e4..1ef6339d2f3 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -76,7 +76,7 @@ class account_payment_populate_statement(osv.osv_memory):
                     statement.currency.id, line.amount_currency, context=ctx)
 
             context.update({'move_line_ids': [line.move_line_id.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', date=line.ml_maturity_date, context=context)
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), voucher_currency_id= statement.currency.id, ttype='payment', date=line.ml_maturity_date, context=context)
 
             if line.move_line_id:
                 voucher_res = {
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index f7ab18f3e7e..31d4f373e2f 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': 'Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module maintains internal sequence number for accounting entries.
diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py
index 1649a8890fa..8b87b3f40ae 100644
--- a/addons/account_sequence/account_sequence.py
+++ b/addons/account_sequence/account_sequence.py
@@ -35,7 +35,7 @@ class account_move(osv.osv):
         seq_no = False
         for move in self.browse(cr, uid, ids, context=context):
             if move.journal_id.internal_sequence_id:
-                seq_no = obj_sequence.get_id(cr, uid, move.journal_id.internal_sequence_id.id, context=context)
+                seq_no = obj_sequence.next_by_id(cr, uid, move.journal_id.internal_sequence_id.id, context=context)
             if seq_no:
                 self.write(cr, uid, [move.id], {'internal_sequence_number': seq_no})
         return res
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index 6b9e2c94402..ba97025bae7 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -70,7 +70,7 @@
             <field name="inherit_id" ref="account.view_account_move_line_filter"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='ref']" position="after">
+                <xpath expr="//field[@name='move_id']" position="after">
                     <field name="internal_sequence_number"/>
                 </xpath>
             </data>
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 540dc437b56..97158e50c12 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -20,7 +20,7 @@
             <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">You can enhance the Account Sequence Application by installing .</attribute>
             </xpath>
-          <group colspan="8">
+          <group colspan="8" position="inside">
             <field name="name" colspan="4"/>
             <field name="prefix"/>
             <field name="suffix"/>
diff --git a/addons/account_sequence/i18n/bg.po b/addons/account_sequence/i18n/bg.po
index d5ba4f5b964..93cdd52119d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2b80f1900e3..2cea25d3960 100644
--- a/addons/account_sequence/i18n/ca.po
+++ b/addons/account_sequence/i18n/ca.po
@@ -8,47 +8,48 @@ 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-04-02 18:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 20:38+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Configuració de la seqüència d'aplicació del compte"
 
 #. module: account_sequence
 #: constraint:account.move:0
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"No podeu crear apunts en diferents períodes/diaris en el mateix assentament"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
 #: help:account.move.line,internal_sequence_number:0
 msgid "Internal Sequence Number"
-msgstr ""
+msgstr "Número intern de seqüència"
 
 #. module: account_sequence
 #: help:account.sequence.installer,number_next:0
 msgid "Next number of this sequence"
-msgstr ""
+msgstr "Pròxim número d'aquesta seqüència"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_next:0
 msgid "Next Number"
-msgstr ""
+msgstr "Pròxim número"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Increment del número"
 
 #. module: account_sequence
 #: model:ir.module.module,description:account_sequence.module_meta_information
@@ -57,36 +58,41 @@ msgid ""
 "    This module maintains internal sequence number for accounting entries.\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul gestiona el número intern de seqüència per als assentaments "
+"comptables\n"
+"    "
 
 #. module: account_sequence
 #: model:ir.module.module,shortdesc:account_sequence.module_meta_information
 msgid "Entries Sequence Numbering"
-msgstr ""
+msgstr "Numeració de la seqüència dels assentaments"
 
 #. 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òxim número d'aquesta seqüència serà incrementat per aquest número."
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure Your Account Sequence Application"
-msgstr ""
+msgstr "Configura la seva seqüència d'aplicació del compte"
 
 #. module: account_sequence
 #: field:account.sequence.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: account_sequence
 #: help:account.sequence.installer,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "Valor del sufix del registre per a la seqüència."
 
 #. module: account_sequence
 #: field:account.sequence.installer,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: account_sequence
 #: help:account.journal,internal_sequence_id:0
@@ -94,27 +100,30 @@ msgid ""
 "This sequence will be used to maintain the internal number for the journal "
 "entries related to this journal."
 msgstr ""
+"Aquesta seqüència s'utilitzarà per gestionar el número intern dels "
+"assentaments relacionats amb aquest diari."
 
 #. module: account_sequence
 #: field:account.sequence.installer,padding:0
 msgid "Number padding"
-msgstr ""
+msgstr "Omplenat del número"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Apunts comptables"
 
 #. module: account_sequence
 #: field:account.move,internal_sequence_number:0
 #: field:account.move.line,internal_sequence_number:0
 msgid "Internal Number"
-msgstr ""
+msgstr "Número intern"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
 msgstr ""
+"La companyia ha de ser la mateixa per al compte i període relacionats."
 
 #. module: account_sequence
 #: help:account.sequence.installer,padding:0
@@ -122,100 +131,106 @@ msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
+"Automàticament, OpenERP, afegirà alguns '0 'a l'esquerra del 'Pròxim número' "
+"per obtenir la mida necessària."
 
 #. module: account_sequence
 #: field:account.sequence.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "No podeu crear un apunt en un compte tancat."
 
 #. module: account_sequence
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on centralized journal"
-msgstr ""
+msgstr "No podeu crear més d'un apunt per període a un diari centralitzat."
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valor del deure o haver erroni en l'assentament comptable!"
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
 msgid "Internal Sequence"
-msgstr ""
+msgstr "Seqüència interna"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_sequence_installer
 msgid "account.sequence.installer"
-msgstr ""
+msgstr "comptabilitat.seqüència.instal·lador"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "Valor del prefix del registre per a la seqüència."
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Assentament comptable"
 
 #. module: account_sequence
 #: field:account.sequence.installer,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "Sufix"
 
 #. module: account_sequence
 #: field:account.sequence.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "El nom del diari ha de ser únic per companyia!"
 
 #. module: account_sequence
 #: field:account.sequence.installer,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Prefix"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "El codi del diari ha de ser únic per companyia!"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"No podeu crear una línia de moviment en un compte a cobrar/a pagar sense una "
+"empresa."
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Diari"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "You can enhance the Account Sequence Application by installing ."
 msgstr ""
+"Podeu realitzar l'aplicació de la seqüència del compte mitjançant la "
+"instal·lació ."
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
diff --git a/addons/account_sequence/i18n/da.po b/addons/account_sequence/i18n/da.po
new file mode 100644
index 00000000000..d7604035633
--- /dev/null
+++ b/addons/account_sequence/i18n/da.po
@@ -0,0 +1,221 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-09 21:40+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\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 cannot create entries on different periods/journals in the same move"
+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 "Næste nummer"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+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
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurationsfremgang"
+
+#. 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 "Firma"
+
+#. 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 "Company must be same for its related account and period."
+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 "Navn"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Forkert kredit eller debet værdi i posteringerne!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. 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 "Suffiks"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+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
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_sequence/i18n/de.po b/addons/account_sequence/i18n/de.po
index 366da26d9a7..47cde962ed2 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es.po b/addons/account_sequence/i18n/es.po
index c446b7daad4..68c7bec3ded 100644
--- a/addons/account_sequence/i18n/es.po
+++ b/addons/account_sequence/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es_MX.po b/addons/account_sequence/i18n/es_MX.po
new file mode 100644
index 00000000000..ce8b81c73c9
--- /dev/null
+++ b/addons/account_sequence/i18n/es_MX.po
@@ -0,0 +1,235 @@
+# Spanish 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-27 19:32+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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 Aplicación de Secuencia de Cuenta"
+
+#. module: account_sequence
+#: 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_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 "Proximo numero"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Incremento del número"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo gestiona el número de secuencia interno para los asientos "
+"contables\n"
+"    "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Numeración de la secuencia de asientos"
+
+#. 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 número siguiente de esta secuencia será incrementado por este número."
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Configurar su Aplicación de Secuencia de la Cuenta"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Valor del sufijo del registro para 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 para 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 "Registros del diario"
+
+#. 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 "Company must be same for its related account and period."
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+
+#. 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ñadirá algunos '0' a la izquierda del 'Número "
+"siguiente' 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 move line on closed account."
+msgstr "No puede crear un apunte en una cuenta cerrada."
+
+#. module: account_sequence
+#: 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 apunte por periodo en un diario centralizado"
+
+#. module: account_sequence
+#: 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!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Secuencia interna"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "contabilidad.secuencia.instalador"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. 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 "Entrada 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 "Imagen"
+
+#. 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 diaro debe ser único por compañía!"
+
+#. 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
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear un movimiento en una cuenta a cobrar/a pagar sin una empresa."
+
+#. 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 ."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "No puede crear un movimiento en una cuenta de tipo vista."
diff --git a/addons/account_sequence/i18n/es_PY.po b/addons/account_sequence/i18n/es_PY.po
index 1e718f69cf6..55437afa781 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es_VE.po b/addons/account_sequence/i18n/es_VE.po
new file mode 100644
index 00000000000..ce8b81c73c9
--- /dev/null
+++ b/addons/account_sequence/i18n/es_VE.po
@@ -0,0 +1,235 @@
+# Spanish 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-27 19:32+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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 Aplicación de Secuencia de Cuenta"
+
+#. module: account_sequence
+#: 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_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 "Proximo numero"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Incremento del número"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo gestiona el número de secuencia interno para los asientos "
+"contables\n"
+"    "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Numeración de la secuencia de asientos"
+
+#. 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 número siguiente de esta secuencia será incrementado por este número."
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Configurar su Aplicación de Secuencia de la Cuenta"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Valor del sufijo del registro para 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 para 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 "Registros del diario"
+
+#. 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 "Company must be same for its related account and period."
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+
+#. 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ñadirá algunos '0' a la izquierda del 'Número "
+"siguiente' 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 move line on closed account."
+msgstr "No puede crear un apunte en una cuenta cerrada."
+
+#. module: account_sequence
+#: 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 apunte por periodo en un diario centralizado"
+
+#. module: account_sequence
+#: 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!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Secuencia interna"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "contabilidad.secuencia.instalador"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. 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 "Entrada 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 "Imagen"
+
+#. 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 diaro debe ser único por compañía!"
+
+#. 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
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear un movimiento en una cuenta a cobrar/a pagar sin una empresa."
+
+#. 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 ."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "No puede crear un movimiento en una cuenta de tipo vista."
diff --git a/addons/account_sequence/i18n/fr.po b/addons/account_sequence/i18n/fr.po
index ccc529b9614..3703fc7a462 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -105,7 +105,7 @@ msgstr ""
 #. module: account_sequence
 #: field:account.sequence.installer,padding:0
 msgid "Number padding"
-msgstr ""
+msgstr "Réserve de numéros"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move_line
diff --git a/addons/account_sequence/i18n/gl.po b/addons/account_sequence/i18n/gl.po
index 6826f8f2783..4f9dad7a52f 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b33097ede5b..a1a9607250e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 47915f1e38c..cc06120c38e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1459a117520..2234e873f23 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -50,7 +50,7 @@ msgstr "Numero Successivo"
 #. module: account_sequence
 #: field:account.sequence.installer,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Incrementa Numero"
 
 #. module: account_sequence
 #: model:ir.module.module,description:account_sequence.module_meta_information
diff --git a/addons/account_sequence/i18n/lv.po b/addons/account_sequence/i18n/lv.po
new file mode 100644
index 00000000000..2e30fafaf72
--- /dev/null
+++ b/addons/account_sequence/i18n/lv.po
@@ -0,0 +1,230 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-12 20:40+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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Kontu Secības Aplikācijas Iestatījumi"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr "Jūs vienlaicīgi nevarat izveidot ierakstus dažādos periodos/žurnālos"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Iekšējais kārtas numurs"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Šīs secības nākamais numurs"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Nākamais Numurs"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Soļa Numurs"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+"\n"
+"    Šis modulis nodrošina iekšējo kārtas numuru grāmatošanas ierakstiem.\n"
+"    "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Ierakstu Kārtas Numerācija"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Sekvences nākamais numurs tiks palielināts par šo skaitli"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Konfigurēt Tavu Konta Sesības Aplikāciju"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurācijas Progress"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Sekvences ieraksta piedēkļa vērtiba"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Uzņēmums"
+
+#. 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 ""
+"Šo secību izmantos, lai izveidotu ar šo žurnālu saistīto žurnāla ierakstu "
+"iekšējo numerāciju"
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Numerācijas garums"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Žurnāla Vienumi"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Iekšējā Numerācija"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "Uzņēmumam ir jāsakrīt ar saistīto kontu un periodu."
+
+#. 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ātiski pievienos kādu '0' iedaļas 'Nākamais Numurs' kreisajā "
+"pusē lai iegūtu nepieciešamo numerācijas garumu."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Nosaukums"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Nav iespējams veikt grāmatojumus slēgtā kontā."
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+"Jūs nevarat centralizētā žurnālā izveidot vairāk par vienu pārvietošanu "
+"vienā periodā"
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Kļūdaina kredīta vai debeta vērtība grāmatojumā!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Iekšējā Sekvence"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "account.sequence.installer"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Konfigurēt"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Piedēkļa vērtība sekvences ierakstiem"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Kontējums"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Priedēklis"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Attēls"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "nosaukums"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Žurnāla nosaukumam katrai kompānijai ir jābūt unikālam!"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Priedēklis"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Žurnāla kodam ir jābūt unikālam katram uzņēmumam!"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Žurnāls"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr "Ar šo moduli jūs varat uzlabot Konta Sekvences Aplikāciju."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "Jūs nevarat izveidor grāmatojumu pārskata kontam."
diff --git a/addons/account_sequence/i18n/nb.po b/addons/account_sequence/i18n/nb.po
index f77793fcb3e..0ff4d82248a 100644
--- a/addons/account_sequence/i18n/nb.po
+++ b/addons/account_sequence/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: 2011-06-25 04:59+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/nl.po b/addons/account_sequence/i18n/nl.po
index 746ae22659c..f003421ba75 100644
--- a/addons/account_sequence/i18n/nl.po
+++ b/addons/account_sequence/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 840d2a43526..98a4908b7a2 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 08bfd2c7011..84c22715b25 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0c507f3bfbe..6db095a71b1 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ro.po b/addons/account_sequence/i18n/ro.po
index cda2e4948a3..36206242e7a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 19d874d2e5e..756be89931b 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -28,8 +28,8 @@ msgstr "Настройка нумерации по счету"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
-"Вы не можете создавать проводки по разным периодам / журналам в одном "
-"действии."
+"Вы не можете создавать проводки по разным периодам / журналам в одной "
+"операции."
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
@@ -40,7 +40,7 @@ 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
@@ -71,7 +71,7 @@ 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
@@ -86,7 +86,7 @@ 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
@@ -147,8 +147,7 @@ msgstr "Нельзя сделать проводку по закрытому с
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
-"Вы не можете создать больше одного действия за период по централизованному "
-"журналу."
+"Нельзя сделать больше одной операции за период по централизованному журналу."
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
@@ -173,7 +172,7 @@ 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
@@ -198,7 +197,7 @@ msgstr "title"
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "Название журнала должно быть уникальным по компании !"
+msgstr "Название журнала должно быть уникальным внутри организации!"
 
 #. module: account_sequence
 #: field:account.sequence.installer,prefix:0
@@ -208,7 +207,7 @@ 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
 #: constraint:account.move.line:0
@@ -224,7 +223,7 @@ msgstr "Журнал"
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "You can enhance the Account Sequence Application by installing ."
-msgstr ""
+msgstr "Можно улучшить модуль нумерации счетов, установив ."
 
 #. module: account_sequence
 #: constraint:account.move.line:0
diff --git a/addons/account_sequence/i18n/sq.po b/addons/account_sequence/i18n/sq.po
index 697eac67fbb..c3ef1e8720e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..5bd9511ee9f
--- /dev/null
+++ b/addons/account_sequence/i18n/sr@latin.po
@@ -0,0 +1,233 @@
+# Serbian Latin 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-11-24 21:01+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: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\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 "Podešavanje aplikacije nizova naloga"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+"Ne možete napraviti ulaze za različite periode/dnevnike u jednom potezu"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Broj unutrašnjeg niza"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Sledeći broj ovog niza"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Sledeći broj"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Inkrementalni broj"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+"\n"
+"    Ovaj modul održava unutrašnji niz brojeva za odgovarajuće naloge.\n"
+"    "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Dodeljivanje brojeva nizovima ulaza"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Sledeći broj ovog niza biće povećan ovim brojem"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Podesi svoju aplikaciju za niz brojeva"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak podešavanja"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Sufiksalna vrednost zapisa za niz"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. 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 ""
+"Ovaj niz će biti iskorišćen za održavanje unutrašnjeg broja za ulaze "
+"dnevnika vezane za dnevnik."
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Ispunjavanje brojeva"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Stavke dnevnika"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Unutrašnji broj"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "Preduzeće mora biti isto za sve vezane račune i periode."
+
+#. 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 će automatski dodati nekoliko '0' levo od 'Sledećeg broja' za "
+"dobijanje tražene veličine ispunjavanja."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Ne možete da napravite poteznu liniju na zatvorenim računima."
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+"Ne možete napraviti više od jednog pomeranja po periodu u centralizovanom "
+"dnevniku"
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Pogrešna vrednost kredita ili debita u ulazu računa !"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Unutrašnji niz"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "account.sequence.installer"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Podešavanje"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Prefiksalna vrednost zapisa za niz"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Ulaz naloga"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Sufiks"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "naslov"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Naziv dnevnika mora biti jedinstven po preduzeću"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefiks"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Kod dnevnika mora biti jedinstven po preduzeću !"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"Ne možete napraviti poteznu liniju na primaćem/platežnom računu bez partnera"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+"Ne možete poboljšati Aplikaciju za nizanje naloga instaliranjem iste."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "Ne možete napraviti poteznu liniju na računu po viđenju"
diff --git a/addons/account_sequence/i18n/tr.po b/addons/account_sequence/i18n/tr.po
index 2c9c5ff733d..ce9700eae91 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: 2011-05-30 04:59+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 45e64e186ea..62e8976d5c6 100644
--- a/addons/account_sequence/i18n/vi.po
+++ b/addons/account_sequence/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-05-25 14:15+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 40fcd0a6517..d5b90a889b4 100644
--- a/addons/account_sequence/i18n/zh_CN.po
+++ b/addons/account_sequence/i18n/zh_CN.po
@@ -14,41 +14,41 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-10 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cannot create entries on different periods/journals in the same move"
-msgstr "您不能创建和确认在不同的时期报表/明细"
+msgstr "您不能创建凭证的会计期间与账簿不同的分录"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
 #: help:account.move.line,internal_sequence_number:0
 msgid "Internal Sequence Number"
-msgstr ""
+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
 msgid "Increment Number"
-msgstr ""
+msgstr "编号增量"
 
 #. module: account_sequence
 #: model:ir.module.module,description:account_sequence.module_meta_information
@@ -57,147 +57,150 @@ msgid ""
 "    This module maintains internal sequence number for accounting entries.\n"
 "    "
 msgstr ""
+"\n"
+"    此模块管理会计凭证的序列\n"
+"    "
 
 #. module: account_sequence
 #: model:ir.module.module,shortdesc:account_sequence.module_meta_information
 msgid "Entries Sequence Numbering"
-msgstr ""
+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
 #: field:account.sequence.installer,progress:0
 msgid "Configuration Progress"
-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
 msgid "Company"
-msgstr ""
+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 ""
+msgstr "此序列用于当前账簿的所有会计凭证"
 
 #. module: account_sequence
 #: field:account.sequence.installer,padding:0
 msgid "Number padding"
-msgstr ""
+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 "Company must be same for its related account and period."
-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
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "您不能在关闭的科目上建立分录。"
 
 #. module: account_sequence
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on centralized journal"
-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
 msgid "Internal Sequence"
-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
 #: view:account.sequence.installer:0
 msgid "Configure"
-msgstr ""
+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
 #: 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
 #: constraint:account.move.line:0
@@ -208,14 +211,14 @@ msgstr ""
 #. 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 "你可以自定义安装模块的序列"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "不能针对内部类型是视图的科目记账"
diff --git a/addons/account_sequence/i18n/zh_TW.po b/addons/account_sequence/i18n/zh_TW.po
new file mode 100644
index 00000000000..b5d70e99793
--- /dev/null
+++ b/addons/account_sequence/i18n/zh_TW.po
@@ -0,0 +1,221 @@
+# Chinese (Traditional) 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-09-27 11:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cannot create entries on different periods/journals in the same move"
+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
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+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
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+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 "Company must be same for its related account and period."
+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 move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+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
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+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
+#: 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
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+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 ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 7da2b2da99c..5e6e6ab0513 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -32,7 +32,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
     * Voucher Receipt
     * Cheque Register
     """,
-    "category" : "Finance",
+    "category" : "Hidden",
     "website" : "http://tinyerp.com",
     "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
     "depends" : ["account"],
@@ -59,7 +59,12 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
         "test/account_voucher.yml",
         "test/sales_receipt.yml",
         "test/sales_payment.yml",
-        "test/account_voucher_report.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",
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 0e85904dcd7..fd6dac9f90d 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -29,6 +29,15 @@ from tools.translate import _
 
 
 class account_voucher(osv.osv):
+    def _check_paid(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for voucher in self.browse(cr, uid, ids, context=context):
+            ok = True
+            for line in voucher.move_ids:
+                if (line.account_id.type, 'in', ('receivable', 'payable')) and not line.reconcile_id:
+                    ok = False
+            res[voucher.id] = ok
+        return res
 
     def _get_type(self, cr, uid, context=None):
         if context is None:
@@ -87,7 +96,6 @@ class account_voucher(osv.osv):
         journal_id = context.get('journal_id', False)
         if journal_id:
             journal = journal_pool.browse(cr, uid, journal_id, context=context)
-#            currency_id = journal.company_id.currency_id.id
             if journal.currency:
                 return journal.currency.id
         return False
@@ -171,6 +179,14 @@ class account_voucher(osv.osv):
             res[voucher.id] =  abs(voucher.amount - abs(credit - debit))
         return res
 
+    def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
+        if not ids: return {}
+        res = {}
+        debit = credit = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            res[voucher.id] =  voucher.amount / voucher.payment_rate
+        return res
+
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -193,8 +209,8 @@ class account_voucher(osv.osv):
             domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
-        'currency_id':fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-#        'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', store=True, readonly=True, states={'draft':[('readonly',False)]}),
+#        'currency_id':fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state':fields.selection(
             [('draft','Draft'),
@@ -214,21 +230,26 @@ class account_voucher(osv.osv):
         'move_ids': fields.related('move_id','line_id', type='one2many', relation='account.move.line', string='Journal Items', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', change_default=1, readonly=True, states={'draft':[('readonly',False)]}),
         'audit': fields.related('move_id','to_check', type='boolean', 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.', relation='account.move', string='To Review'),
+        'paid': fields.function(_check_paid, string='Paid', type='boolean', help="The Voucher has been totally paid."),
         'pay_now':fields.selection([
             ('pay_now','Pay Directly'),
             ('pay_later','Pay Later or Group Funds'),
         ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_id': fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}, domain=[('price_include','=', False)], help="Only for tax excluded from price"),
         'pre_line':fields.boolean('Previous Payments ?', required=False),
         'date_due': fields.date('Due Date', readonly=True, select=True, states={'draft':[('readonly',False)]}),
         'payment_option':fields.selection([
                                            ('without_writeoff', 'Keep Open'),
-                                           ('with_writeoff', 'Reconcile with Write-Off'),
+                                           ('with_writeoff', 'Reconcile Payment Balance'),
                                            ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}),
-        'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'exchange_acc_id': fields.many2one('account.account', 'Exchange Diff. Account', readonly=True, states={'draft': [('readonly', False)]}),
+        'writeoff_acc_id': fields.many2one('account.account', 'Counterpart Account', readonly=True, states={'draft': [('readonly', False)]}),
+        'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_amount': fields.function(_get_writeoff_amount, string='Write-Off Amount', type='float', readonly=True),
+        'writeoff_amount': fields.function(_get_writeoff_amount, string='Reconcile Amount', type='float', readonly=True),
+        'payment_rate': fields.float('Payment Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
+            help='The rate between the journal currency and the company currency for this particular payment.'),
+        'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
     }
     _defaults = {
         'period_id': _get_period,
@@ -247,6 +268,7 @@ class account_voucher(osv.osv):
         'tax_id': _get_tax,
         'payment_option': 'without_writeoff',
         'comment': _('Write-Off'),
+        'payment_rate': 1.0,
     }
 
     def compute_tax(self, cr, uid, ids, context=None):
@@ -396,8 +418,21 @@ class account_voucher(osv.osv):
 
         return default
 
+    def onchange_rate(self, cr, uid, ids, rate, amount, context=None):
+        res =  {'value': {'paid_amount_in_company_currency': 0.0}}
+        if rate and amount:
+            res['value']['paid_amount_in_company_currency'] = amount / rate
+        return res
+
+    def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, context=None):
+        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
+        vals = self.onchange_rate(cr, uid, ids, rate, amount, context=context)
+        for key in vals.keys():
+            res[key].update(vals[key])
+        return res
+
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
-        """price
+        """
         Returns a dict that contains new values and context
 
         @param partner_id: latest value from user input for field partner_id
@@ -408,40 +443,32 @@ class account_voucher(osv.osv):
         """
         if context is None:
             context = {}
-        if not journal_id:
-            return {}
         context_multi_currency = context.copy()
         if date:
             context_multi_currency.update({'date': date})
 
-        line_pool = self.pool.get('account.voucher.line')
-        line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False
-        if line_ids:
-            line_pool.unlink(cr, uid, line_ids)
-
         currency_pool = self.pool.get('res.currency')
         move_line_pool = self.pool.get('account.move.line')
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
+        line_pool = self.pool.get('account.voucher.line')
 
-        vals = self.onchange_journal(cr, uid, ids, journal_id, [], False, partner_id, context)
-        vals = vals.get('value')
-        currency_id = vals.get('currency_id', currency_id)
+        #set default values
         default = {
-            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False, 'currency_id':currency_id},
+            'value': {'line_ids': [] ,'line_dr_ids': [] ,'line_cr_ids': [] ,'pre_line': False,},
         }
 
-        if not partner_id:
-            return default
+        #drop existing lines
+        line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False
+        if line_ids:
+            line_pool.unlink(cr, uid, line_ids)
 
-        if not partner_id and ids:
-            line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])])
-            if line_ids:
-                line_pool.unlink(cr, uid, line_ids)
+        if not partner_id or not journal_id:
             return default
 
         journal = journal_pool.browse(cr, uid, journal_id, context=context)
         partner = partner_pool.browse(cr, uid, partner_id, context=context)
+        currency_id = currency_id or journal.company_id.currency_id.id
         account_id = False
         if journal.type in ('sale','sale_refund'):
             account_id = partner.property_account_receivable.id
@@ -469,49 +496,78 @@ class account_voucher(osv.osv):
             ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
         else:
             ids = context['move_line_ids']
+        invoice_id = context.get('invoice_id', False)
+        company_currency = journal.company_id.currency_id.id
+        move_line_found = False
+
+        #order the lines by most old first
         ids.reverse()
         moves = move_line_pool.browse(cr, uid, ids, context=context)
 
-        company_currency = journal.company_id.currency_id.id
-        if company_currency != currency_id and ttype == 'payment':
-            total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency)
-        elif company_currency != currency_id and ttype == 'receipt':
-            total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit, context=context_multi_currency)
+        for line in moves:
+            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
+                continue
+            if line.debit and line.reconcile_partial_id and ttype == 'payment':
+                continue
+            if invoice_id:
+                if line.invoice.id == invoice_id:
+                    #if the invoice linked to the voucher line is equal to the invoice_id in context
+                    #then we assign the amount on that line, whatever the other voucher lines
+                    move_line_found = line.id
+                    break
+            elif currency_id == company_currency:
+                #otherwise treatments is the same but with other field names
+                if line.amount_residual == price:
+                    #if the amount residual is equal the amount voucher, we assign it to that voucher
+                    #line, whatever the other voucher lines
+                    move_line_found = line.id
+                    break
+                #otherwise we will split the voucher amount on each line (by most old first)
+                total_credit += line.credit or 0.0
+                total_debit += line.debit or 0.0
+            elif currency_id == line.currency_id.id:
+                if line.amount_residual_currency == price:
+                    move_line_found = line.id
+                    break
+                total_credit += line.credit and line.amount_currency or 0.0
+                total_debit += line.debit and line.amount_currency or 0.0
 
+        #voucher line creation
         for line in moves:
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
                 continue
-            total_credit += line.credit or 0.0
-            total_debit += line.debit or 0.0
-        for line in moves:
-            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
-                continue
-            if line.debit and line.reconcile_partial_id and ttype == 'payment':
-                continue
-            original_amount = line.credit or line.debit or 0.0
-            amount_unreconciled = currency_pool.compute(cr, uid, line.currency_id and line.currency_id.id or company_currency, currency_id, abs(line.amount_residual_currency), context=context_multi_currency)
+            if line.currency_id and currency_id==line.currency_id.id:
+                amount_original = abs(line.amount_currency)
+                amount_unreconciled = abs(line.amount_residual_currency)
+            else:
+                amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
+                amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
             rs = {
                 'name':line.move_id.name,
                 'type': line.credit and 'dr' or 'cr',
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
-                'amount_original': currency_pool.compute(cr, uid, line.currency_id and line.currency_id.id or company_currency, currency_id, line.currency_id and abs(line.amount_currency) or original_amount, context=context_multi_currency),
+                'amount_original': amount_original,
+                'amount': (move_line_found == line.id) and min(price, amount_unreconciled) or 0.0,
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled': amount_unreconciled,
-
             }
 
-            if line.credit:
-                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_debit), context=context_multi_currency))
-                rs['amount'] = amount
-                total_debit -= amount
-            else:
-                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_credit), context=context_multi_currency))
-                rs['amount'] = amount
-                total_credit -= amount
+            #split voucher amount by most old first, but only for lines in the same currency
+            if not move_line_found:
+                line_currency_id = line.currency_id and line.currency_id.id or company_currency
+                if currency_id == line_currency_id:
+                    if line.credit:
+                        amount = min(amount_unreconciled, abs(total_debit))
+                        rs['amount'] = amount
+                        total_debit -= amount
+                    else:
+                        amount = min(amount_unreconciled, abs(total_credit))
+                        rs['amount'] = amount
+                        total_credit -= amount
 
             default['value']['line_ids'].append(rs)
             if rs['type'] == 'cr':
@@ -526,23 +582,30 @@ class account_voucher(osv.osv):
             default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
         return default
 
-    def onchange_date(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
+    def onchange_date(self, cr, uid, ids, date, currency_id, amount, context=None):
         """
         @param date: latest value from user input for field date
         @param args: other arguments
         @param context: context arguments, like lang, time zone
         @return: Returns a dict which contains new values, and context
         """
+        res = {'value': {}}
+        #set the period of the voucher
         period_pool = self.pool.get('account.period')
-        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=context)
         pids = period_pool.search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)])
         if pids:
-            if not 'value' in res:
-                res['value'] = {}
             res['value'].update({'period_id':pids[0]})
+        #set the default payment rate of the voucher and compute the paid amount in company currency
+        payment_rate = 1.0
+        if currency_id:
+            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
+        res['value'].update({'payment_rate': payment_rate})
+        vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
+        for key in vals.keys():
+            res[key].update(vals[key])
         return res
 
-    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context=None):
+    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, context=None):
         if not journal_id:
             return False
         journal_pool = self.pool.get('account.journal')
@@ -553,11 +616,19 @@ class account_voucher(osv.osv):
             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})
-        currency_id = journal.company_id.currency_id.id
+        vals['value'].update({'tax_id':tax_id,'amount': amount})
+        currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
-        vals['value'].update({'currency_id':currency_id})
+            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
+            vals['value'].update({'payment_rate': payment_rate})
+            res = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
+            for key in res.keys():
+                vals[key].update(res[key])
+        vals['value'].update({'currency_id': currency_id})
+        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
+        for key in res.keys():
+            vals[key].update(res[key])
         return vals
 
     def proforma_voucher(self, cr, uid, ids, context=None):
@@ -601,7 +672,6 @@ class account_voucher(osv.osv):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid !'))
         return super(account_voucher, self).unlink(cr, uid, ids, context=context)
 
-    # TODO: may be we can remove this method if not used anyware
     def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype='sale'):
         res = {}
         if not partner_id:
@@ -621,14 +691,302 @@ class account_voucher(osv.osv):
             res['account_id'] = account_id
         return {'value':res}
 
-    def action_move_line_create(self, cr, uid, ids, 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.
 
-        def _get_payment_term_lines(term_id, amount):
-            term_pool = self.pool.get('account.payment.term')
-            if term_id and amount:
-                terms = term_pool.compute(cr, uid, term_id, amount)
-                return terms
-            return False
+        :param voucher_id: Id of the actual voucher
+        :return: The returned context will be the same as given in parameter if the voucher currency is the same
+                 than the company currency, otherwise it's a copy of the parameter with an extra key 'date' containing
+                 the date of the voucher.
+        :rtype: dict
+        """
+        company_currency = self._get_company_currency(cr, uid, voucher_id, context)
+        current_currency = self._get_current_currency(cr, uid, voucher_id, context)
+        if current_currency <> company_currency:
+            context_multi_currency = context.copy()
+            voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+            context_multi_currency.update({'date': voucher_brw.date})
+            return context_multi_currency
+        return context
+
+    def first_move_line_get(self, cr, uid, voucher_id, move_id, company_currency, current_currency, context=None):
+        '''
+        Return a dict to be use to create the first account move line of given voucher.
+
+        :param voucher_id: Id of voucher what we are creating account_move.
+        :param move_id: Id of account move where this line will be added.
+        :param company_currency: id of currency of the company to which the voucher belong
+        :param current_currency: id of currency of the voucher
+        :return: mapping between fieldname and value of account move line to create
+        :rtype: dict
+        '''
+        move_line_obj = self.pool.get('account.move.line')
+        currency_obj = self.pool.get('res.currency')
+        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        debit = credit = 0.0
+        # TODO: is there any other alternative then the voucher type ??
+        # ANSWER: We can have payment and receipt "In Advance".
+        # TODO: Make this logic available.
+        # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
+        if voucher_brw.type in ('purchase', 'payment'):
+            credit = voucher_brw.amount / voucher_brw.payment_rate
+        elif voucher_brw.type in ('sale', 'receipt'):
+            debit = voucher_brw.amount / voucher_brw.payment_rate
+        if debit < 0: credit = -debit; debit = 0.0
+        if credit < 0: debit = -credit; credit = 0.0
+        sign = debit - credit < 0 and -1 or 1
+        #set the first line of the voucher
+        move_line = {
+                'name': voucher_brw.name or '/',
+                'debit': debit,
+                'credit': credit,
+                'account_id': voucher_brw.account_id.id,
+                'move_id': move_id,
+                'journal_id': voucher_brw.journal_id.id,
+                'period_id': voucher_brw.period_id.id,
+                'partner_id': voucher_brw.partner_id.id,
+                'currency_id': company_currency <> current_currency and  current_currency or False,
+                'amount_currency': company_currency <> current_currency and sign * voucher_brw.amount or 0.0,
+                'date': voucher_brw.date,
+                'date_maturity': voucher_brw.date_due
+            }
+        return move_line
+
+    def account_move_get(self, cr, uid, voucher_id, context=None):
+        '''
+        This method prepare the creation of the account move related to the given voucher.
+
+        :param voucher_id: Id of voucher for which we are creating account_move.
+        :return: mapping between fieldname and value of account move to create
+        :rtype: dict
+        '''
+        move_obj = self.pool.get('account.move')
+        seq_obj = self.pool.get('ir.sequence')
+        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        if voucher_brw.number:
+            name = voucher_brw.number
+        elif voucher_brw.journal_id.sequence_id:
+            name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id)
+        else:
+            raise osv.except_osv(_('Error !'),
+                        _('Please define a sequence on the journal !'))
+        if not voucher_brw.reference:
+            ref = name.replace('/','')
+        else:
+            ref = voucher_brw.reference
+
+        move = {
+            'name': name,
+            'journal_id': voucher_brw.journal_id.id,
+            'narration': voucher_brw.narration,
+            'date': voucher_brw.date,
+            'ref': ref,
+            'period_id': voucher_brw.period_id and voucher_brw.period_id.id or False
+        }
+        return move
+
+    def _get_exchange_lines(self, cr, uid, line, move_id, amount_residual, company_currency, current_currency, context=None):
+        '''
+        Prepare the two lines due to currency rate difference.
+
+        :param line: browse record of the voucher.line for which we want to create currency rate difference accounting entries
+        :param move_id: Account move wher the move lines will be.
+        :param amount_residual: Amount to be posted.
+        :param company_currency: id of currency of the company to which the voucher belong
+        :param current_currency: id of currency of the voucher
+        :return: the account move line and its counterpart to create, depicted as mapping between fieldname and value
+        :rtype: tuple of dict
+        '''
+        if not line.voucher_id.exchange_acc_id.id:
+            raise osv.except_osv(_('Error!'), _('You must provide an account for the exchange difference.'))
+
+        move_line = {
+            'journal_id': line.voucher_id.journal_id.id,
+            'period_id': line.voucher_id.period_id.id,
+            'name': _('change')+': '+(line.name or '/'),
+            'account_id': line.account_id.id,
+            'move_id': move_id,
+            'partner_id': line.voucher_id.partner_id.id,
+            'currency_id': company_currency <> current_currency and current_currency or False,
+            'amount_currency': 0.0,
+            'quantity': 1,
+            'credit': amount_residual > 0 and amount_residual or 0.0,
+            'debit': amount_residual < 0 and -amount_residual or 0.0,
+            'date': line.voucher_id.date,
+        }
+        move_line_counterpart = {
+            'journal_id': line.voucher_id.journal_id.id,
+            'period_id': line.voucher_id.period_id.id,
+            'name': _('change')+': '+(line.name or '/'),
+            'account_id': line.voucher_id.exchange_acc_id.id,
+            'move_id': move_id,
+            'amount_currency': 0.0,
+            'partner_id': line.voucher_id.partner_id.id,
+            'currency_id': company_currency <> current_currency and current_currency or False,
+            'quantity': 1,
+            'debit': amount_residual > 0 and amount_residual or 0.0,
+            'credit': amount_residual < 0 and -amount_residual or 0.0,
+            'date': line.voucher_id.date,
+        }
+        return (move_line, move_line_counterpart)
+
+    def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
+        '''
+        Create one account move line, on the given account move, per voucher line where amount is not 0.0.
+        It returns Tuple with tot_line what is total of difference between debit and credit and
+        a list of lists with ids to be reconciled with this format (total_deb_cred,list_of_lists).
+
+        :param voucher_id: Voucher id what we are working with
+        :param line_total: Amount of the first line, which correspond to the amount we should totally split among all voucher lines.
+        :param move_id: Account move wher those lines will be joined.
+        :param company_currency: id of currency of the company to which the voucher belong
+        :param current_currency: id of currency of the voucher
+        :return: Tuple build as (remaining amount not allocated on voucher lines, list of account_move_line created in this method)
+        :rtype: tuple(int, list of int)
+        '''
+        move_line_obj = self.pool.get('account.move.line')
+        currency_obj = self.pool.get('res.currency')
+        tot_line = line_total
+        rec_lst_ids = []
+
+        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        for line in voucher_brw.line_ids:
+            #create one move line per voucher line where amount is not 0.0
+            if not line.amount:
+                continue
+            #we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
+            if line.amount == line.amount_unreconciled:
+                amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate
+                amount_residual = line.move_line_id.amount_residual - amount #residual amount in company currency
+            else:
+                amount = (line.untax_amount or line.amount)  / voucher_brw.payment_rate
+                amount_residual = 0.0
+            move_line = {
+                'journal_id': voucher_brw.journal_id.id,
+                'period_id': voucher_brw.period_id.id,
+                'name': line.name or '/',
+                'account_id': line.account_id.id,
+                'move_id': move_id,
+                'partner_id': voucher_brw.partner_id.id,
+                'currency_id': company_currency <> current_currency and current_currency or False,
+                'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
+                'quantity': 1,
+                'credit': 0.0,
+                'debit': 0.0,
+                'date': voucher_brw.date
+            }
+            if amount < 0:
+                amount = -amount
+                if line.type == 'dr':
+                    line.type = 'cr'
+                else:
+                    line.type = 'dr'
+
+            if (line.type=='dr'):
+                tot_line += amount
+                move_line['debit'] = amount
+            else:
+                tot_line -= amount
+                move_line['credit'] = amount
+
+            if voucher_brw.tax_id and voucher_brw.type in ('sale', 'purchase'):
+                move_line.update({
+                    'account_tax_id': voucher_brw.tax_id.id,
+                })
+
+            if move_line.get('account_tax_id', False):
+                tax_data = tax_obj.browse(cr, uid, [move_line['account_tax_id']], context=context)[0]
+                if not (tax_data.base_code_id and tax_data.tax_code_id):
+                    raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
+
+            sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
+            move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or False
+            voucher_line = move_line_obj.create(cr, uid, move_line)
+            rec_ids = [voucher_line, line.move_line_id.id]
+
+            if amount_residual:
+                # Change difference entry
+                exch_lines = self._get_exchange_lines(cr, uid, line, move_id, amount_residual, company_currency, current_currency, context=context)
+                new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
+                move_line_obj.create(cr, uid, exch_lines[1], context)
+                rec_ids.append(new_id)
+
+            if line.move_line_id.id:
+                rec_lst_ids.append(rec_ids)
+
+        return (tot_line, rec_lst_ids)
+
+    def writeoff_move_line_get(self, cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=None):
+        '''
+        Set a dict to be use to create the writeoff move line.
+
+        :param voucher_id: Id of voucher what we are creating account_move.
+        :param line_total: Amount remaining to be allocated on lines.
+        :param move_id: Id of account move where this line will be added.
+        :param name: Description of account move line.
+        :param company_currency: id of currency of the company to which the voucher belong
+        :param current_currency: id of currency of the voucher
+        :return: mapping between fieldname and value of account move line to create
+        :rtype: dict
+        '''
+        move_line_obj = self.pool.get('account.move.line')
+        currency_obj = self.pool.get('res.currency')
+        move_line = {}
+
+        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        current_currency_obj = voucher_brw.currency_id or voucher_brw.journal_id.company_id.currency_id
+
+        if not currency_obj.is_zero(cr, uid, current_currency_obj, line_total):
+            diff = line_total
+            account_id = False
+            write_off_name = ''
+            if voucher_brw.payment_option == 'with_writeoff':
+                account_id = voucher_brw.writeoff_acc_id.id
+                write_off_name = voucher_brw.comment
+            elif voucher_brw.type in ('sale', 'receipt'):
+                account_id = voucher_brw.partner_id.property_account_receivable.id
+            else:
+                account_id = voucher_brw.partner_id.property_account_payable.id
+            move_line = {
+                'name': write_off_name or name,
+                'account_id': account_id,
+                'move_id': move_id,
+                'partner_id': voucher_brw.partner_id.id,
+                '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,
+                'currency_id': company_currency <> current_currency and current_currency or False,
+            }
+
+        return move_line
+
+    def _get_company_currency(self, cr, uid, voucher_id, context=None):
+        '''
+        Get the currency of the actual company.
+
+        :param voucher_id: Id of the voucher what i want to obtain company currency.
+        :return: currency id of the company of the voucher
+        :rtype: int
+        '''
+        return self.pool.get('account.voucher').browse(cr,uid,voucher_id,context).journal_id.company_id.currency_id.id
+
+    def _get_current_currency(self, cr, uid, voucher_id, context=None):
+        '''
+        Get the currency of the voucher.
+
+        :param voucher_id: Id of the voucher what i want to obtain current currency.
+        :return: currency id of the voucher
+        :rtype: int
+        '''
+        voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        return voucher.currency_id.id or self._get_company_currency(cr,uid,voucher.id,context)
+
+    def action_move_line_create(self, cr, uid, ids, context=None):
+        '''
+        Confirm the vouchers given in ids and create the journal entries for each of them
+        '''
         if context is None:
             context = {}
         move_pool = self.pool.get('account.move')
@@ -636,158 +994,44 @@ class account_voucher(osv.osv):
         currency_pool = self.pool.get('res.currency')
         tax_obj = self.pool.get('account.tax')
         seq_obj = self.pool.get('ir.sequence')
-        for inv in self.browse(cr, uid, ids, context=context):
-            if inv.move_id:
+        for voucher in self.browse(cr, uid, ids, context=context):
+            if voucher.move_id:
                 continue
-            context_multi_currency = context.copy()
-            context_multi_currency.update({'date': inv.date})
-
-            if inv.number:
-                name = inv.number
-            elif inv.journal_id.sequence_id:
-                name = seq_obj.get_id(cr, uid, inv.journal_id.sequence_id.id)
-            else:
-                raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
-            if not inv.reference:
-                ref = name.replace('/','')
-            else:
-                ref = inv.reference
-
-            move = {
-                'name': name,
-                'journal_id': inv.journal_id.id,
-                'narration': inv.narration,
-                'date': inv.date,
-                'ref': ref,
-                'period_id': inv.period_id and inv.period_id.id or False
-            }
-            move_id = move_pool.create(cr, uid, move)
-
-            #create the first line manually
-            company_currency = inv.journal_id.company_id.currency_id.id
-            current_currency = inv.currency_id.id
-            debit = 0.0
-            credit = 0.0
-            # TODO: is there any other alternative then the voucher type ??
-            # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
-            if inv.type in ('purchase', 'payment'):
-                credit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount, context=context_multi_currency)
-            elif inv.type in ('sale', 'receipt'):
-                debit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount, context=context_multi_currency)
-            if debit < 0:
-                credit = -debit
-                debit = 0.0
-            if credit < 0:
-                debit = -credit
-                credit = 0.0
-            sign = debit - credit < 0 and -1 or 1
-            #create the first line of the voucher
-            move_line = {
-                'name': inv.name or '/',
-                'debit': debit,
-                'credit': credit,
-                'account_id': inv.account_id.id,
-                'move_id': move_id,
-                'journal_id': inv.journal_id.id,
-                'period_id': inv.period_id.id,
-                'partner_id': inv.partner_id.id,
-                'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and sign * inv.amount or 0.0,
-                'date': inv.date,
-                'date_maturity': inv.date_due
-            }
-            move_line_pool.create(cr, uid, move_line)
+            company_currency = self._get_company_currency(cr, uid, voucher.id, context)
+            current_currency = self._get_current_currency(cr, uid, voucher.id, context)
+            context = self._sel_context(cr, uid, voucher.id, context)
+            #Create the account move record.
+            move_id = move_pool.create(cr, uid, self.account_move_get(cr, uid, voucher.id, context=context), context=context)
+            # Get the name of the account_move just created
+            name = move_pool.browse(cr, uid, move_id, context=context).name
+            #Create the first line of the voucher
+            move_line_id = move_line_pool.create(cr, uid, self.first_move_line_get(cr,uid,voucher.id, move_id, company_currency, current_currency, context), context)
+            move_line_brw = move_line_pool.browse(cr, uid, move_line_id, context=context)
+            line_total = move_line_brw.debit - move_line_brw.credit
             rec_list_ids = []
-            line_total = debit - credit
-            if inv.type == 'sale':
-                line_total = line_total - currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount, context=context_multi_currency)
-            elif inv.type == 'purchase':
-                line_total = line_total + currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount, context=context_multi_currency)
+            if voucher.type == 'sale':
+                line_total = line_total - (voucher.tax_amount / voucher.payment_rate)
+            elif voucher.type == 'purchase':
+                line_total = line_total + (voucher.tax_amount / voucher.payment_rate)
+            #create one move line per voucher line where amount is not 0.0
+            line_total, rec_list_ids = self.voucher_move_line_create(cr, uid, voucher.id, line_total, move_id, company_currency, current_currency, context)
 
-            for line in inv.line_ids:
-                #create one move line per voucher line where amount is not 0.0
-                if not line.amount:
-                    continue
-                #we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
-                if line.amount == line.amount_unreconciled:
-                    amount = line.move_line_id.amount_residual #residual amount in company currency
-                else:
-                    amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context_multi_currency)
-                move_line = {
-                    'journal_id': inv.journal_id.id,
-                    'period_id': inv.period_id.id,
-                    'name': line.name or '/',
-                    'account_id': line.account_id.id,
-                    'move_id': move_id,
-                    'partner_id': inv.partner_id.id,
-                    'currency_id': company_currency <> current_currency and current_currency or False,
-                    'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
-                    'quantity': 1,
-                    'credit': 0.0,
-                    'debit': 0.0,
-                    'date': inv.date
-                }
-                if amount < 0:
-                    amount = -amount
-                    if line.type == 'dr':
-                        line.type = 'cr'
-                    else:
-                        line.type = 'dr'
-                if (line.type=='dr'):
-                    line_total += amount
-                    move_line['debit'] = amount
-                else:
-                    line_total -= amount
-                    move_line['credit'] = amount
-
-                if inv.tax_id and inv.type in ('sale', 'purchase'):
-                    move_line.update({
-                        'account_tax_id': inv.tax_id.id,
-                    })
-                if move_line.get('account_tax_id', False):
-                    tax_data = tax_obj.browse(cr, uid, [move_line['account_tax_id']], context=context)[0]
-                    if not (tax_data.base_code_id and tax_data.tax_code_id):
-                        raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
-                sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
-                move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or 0.0
-                voucher_line = move_line_pool.create(cr, uid, move_line)
-                if line.move_line_id.id:
-                    rec_ids = [voucher_line, line.move_line_id.id]
-                    rec_list_ids.append(rec_ids)
-
-            if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total):
-                diff = line_total
-                account_id = False
-                write_off_name = ''
-                if inv.payment_option == 'with_writeoff':
-                    account_id = inv.writeoff_acc_id.id
-                    write_off_name = inv.comment
-                elif inv.type in ('sale', 'receipt'):
-                    account_id = inv.partner_id.property_account_receivable.id
-                else:
-                    account_id = inv.partner_id.property_account_payable.id
-                move_line = {
-                    'name': write_off_name or name,
-                    'account_id': account_id,
-                    'move_id': move_id,
-                    'partner_id': inv.partner_id.id,
-                    'date': inv.date,
-                    'credit': diff > 0 and diff or 0.0,
-                    'debit': diff < 0 and -diff or 0.0,
-                    #'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
-                    #'currency_id': company_currency <> current_currency and current_currency or False,
-                }
-                move_line_pool.create(cr, uid, move_line)
-            self.write(cr, uid, [inv.id], {
+            #create the writeoff line if needed
+            ml_writeoff = self.writeoff_move_line_get(cr, uid, voucher.id, line_total, move_id, name, company_currency, current_currency, context)
+            if ml_writeoff:
+                ml_writeoff_id = move_line_pool.create(cr, uid, ml_writeoff, context)
+            #We post the voucher.
+            self.write(cr, uid, [voucher.id], {
                 'move_id': move_id,
                 'state': 'posted',
                 'number': name,
             })
-            if inv.journal_id.entry_posted:
+            if voucher.journal_id.entry_posted:
                 move_pool.post(cr, uid, [move_id], context={})
+            #We automatically reconcile the account move lines.
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
-                    move_line_pool.reconcile_partial(cr, uid, rec_ids)
+                    move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.exchange_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -810,6 +1054,8 @@ class account_voucher_line(osv.osv):
     _description = 'Voucher Lines'
     _order = "move_line_id"
 
+    # If the payment is in the same currency than the invoice, we keep the same amount
+    # Otherwise, we compute from company currency to payment currency
     def _compute_balance(self, cr, uid, ids, name, args, context=None):
         currency_pool = self.pool.get('res.currency')
         rs_data = {}
@@ -818,22 +1064,22 @@ class account_voucher_line(osv.osv):
             ctx.update({'date': line.voucher_id.date})
             res = {}
             company_currency = line.voucher_id.journal_id.company_id.currency_id.id
-            voucher_currency = line.voucher_id.currency_id.id
+            voucher_currency = line.voucher_id.currency_id and line.voucher_id.currency_id.id or company_currency
             move_line = line.move_line_id or False
 
             if not move_line:
                 res['amount_original'] = 0.0
                 res['amount_unreconciled'] = 0.0
-
-            elif move_line.currency_id:
-                res['amount_original'] = currency_pool.compute(cr, uid, move_line.currency_id.id, voucher_currency, move_line.amount_currency, context=ctx)
+            elif move_line.currency_id and voucher_currency==move_line.currency_id.id:
+                res['amount_original'] = currency_pool.compute(cr, uid, move_line.currency_id.id, voucher_currency, abs(move_line.amount_currency), context=ctx)
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, move_line.currency_id and move_line.currency_id.id or company_currency, voucher_currency, abs(move_line.amount_residual_currency), context=ctx)
             elif move_line and move_line.credit > 0:
                 res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit, context=ctx)
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
             else:
                 res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit, context=ctx)
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
 
-            if move_line:
-                res['amount_unreconciled'] = currency_pool.compute(cr, uid, move_line.currency_id and move_line.currency_id.id or company_currency, voucher_currency, abs(move_line.amount_residual_currency), context=ctx)
             rs_data[line.id] = res
         return rs_data
 
@@ -966,17 +1212,10 @@ class account_bank_statement_line(osv.osv):
     def _amount_reconciled(self, cursor, user, ids, name, args, context=None):
         if not ids:
             return {}
-
         res = {}
-#        company_currency_id = False
         for line in self.browse(cursor, user, ids, context=context):
-#            if not company_currency_id:
-#                company_currency_id = line.company_id.id
             if line.voucher_id:
                 res[line.id] = line.voucher_id.amount#
-#                        res_currency_obj.compute(cursor, user,
-#                        company_currency_id, line.statement_id.currency.id,
-#                        line.voucher_id.amount, context=context)
             else:
                 res[line.id] = 0.0
         return res
@@ -985,7 +1224,7 @@ class account_bank_statement_line(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.voucher_id:
                 diff = abs(obj.amount) - obj.voucher_id.amount
-                if not self.pool.get('res.currency').is_zero(cr, uid, obj.voucher_id.currency_id, diff):
+                if not self.pool.get('res.currency').is_zero(cr, uid, obj.statement_id.currency, diff):
                     return False
         return True
 
@@ -997,7 +1236,6 @@ class account_bank_statement_line(osv.osv):
         'amount_reconciled': fields.function(_amount_reconciled,
             string='Amount reconciled', type='float'),
         'voucher_id': fields.many2one('account.voucher', 'Payment'),
-
     }
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index fc3ddd96cae..345241cb4ee 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-	    <record id="view_invoice_customer" model="ir.ui.view">
-	       <field name="name">account.invoice.customer.pay</field>
-	       <field name="model">account.invoice</field>
-	       <field name="type">form</field>
-	       <field name="inherit_id" ref="account.invoice_form"/>
-	       <field name="arch" type="xml">
-	       <button name="invoice_open" position="after">
-	           <button name="invoice_pay_customer" type="object" string="Payment" states="open" icon="gtk-go-forward"/>
-	       </button>
-	       </field>
-	    </record>
-	
-	    <record id="view_invoice_supplier" model="ir.ui.view">
-	        <field name="name">account.invoice.supplier.pay</field>
-	        <field name="model">account.invoice</field>
-	        <field name="type">form</field>
-	        <field name="inherit_id" ref="account.invoice_supplier_form"/>
-	        <field name="arch" type="xml">
-	            <button name="invoice_open" position="after">
-	                <button name="invoice_pay_customer" type="object" string="Pay Invoice" states="open" icon="gtk-go-forward"/>
-	            </button>
-	        </field>
-	    </record>
+        <record id="view_invoice_customer" model="ir.ui.view">
+           <field name="name">account.invoice.customer.pay</field>
+           <field name="model">account.invoice</field>
+           <field name="type">form</field>
+           <field name="inherit_id" ref="account.invoice_form"/>
+           <field name="arch" type="xml">
+           <button name="invoice_open" position="after">
+               <button name="invoice_pay_customer" type="object" string="Payment" states="open" icon="gtk-go-forward"/>
+           </button>
+           </field>
+        </record>
+        <record id="view_invoice_supplier" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.pay</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <button name="invoice_open" position="after">
+                    <button name="invoice_pay_customer" type="object" string="Pay Invoice" states="open" icon="gtk-go-forward"/>
+                </button>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 1f59e12cd6a..4e218e04714 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account.voucher</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('cancel');red:audit" string="Voucher Entries">
+                <tree colors="blue:state == 'draft';gray:state == 'cancel';red:audit" string="Voucher Entries">
                     <field name="date"/>
                     <field name="number"/>
                     <field name="reference"/>
@@ -43,7 +43,7 @@
                 <form string="Accounting Voucher">
                     <group col="6" 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="date" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, amount)"/>
                         <field name="journal_id" widget="selection" select="1" 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"/>
@@ -102,7 +102,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
@@ -119,7 +119,7 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -130,12 +130,12 @@
                         <field name="partner_id"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <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'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index 1fb9aa554b0..4a1fe78892b 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index 8f43871d01f..f4097e47423 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Транзакции за връщане на приравняване"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Отписване"
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Групиране по..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Грешка!"
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Невалидно действие !"
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr "Плащане на фактура"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr "Декември"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr "Кредит"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 9f576721df7..b57b1781c3f 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index 51ee202e41b..07ef9533a90 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -14,34 +14,34 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Transaccions no conciliades"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Desajust"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr ""
+msgstr "Ref. pagament"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Obre els assentaments en el diari de client"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Voucher Date"
-msgstr ""
+msgstr "Data del comprovant"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -52,23 +52,23 @@ msgstr "Particulars"
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr ""
+msgstr "No es pot eliminar comprovant(s) que estiguin oberts o pagats!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier"
-msgstr ""
+msgstr "Proveïdor"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
 msgid "Voucher Print"
-msgstr ""
+msgstr "Imprimeix comprovant"
 
 #. module: account_voucher
 #: model:ir.module.module,description:account_voucher.module_meta_information
@@ -81,19 +81,28 @@ msgid ""
 "    * Cheque Register\n"
 "    "
 msgstr ""
+"Mòdul de comprovants comptables, inclou tots els requisits bàsics de\n"
+"    comprovants per a banc, caixa, vendes, compres, despeses, "
+"contracomprovants, ...\n"
+"    * Entrada de comprovants\n"
+"    * Rebuts de comprovants\n"
+"    * Registre de xecs\n"
+"    "
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+msgstr "Pagament factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
+"Heu de configurar el codi de la base comptable i el codi de l'impost "
+"comptable de l'impost '%s'!"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -101,17 +110,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
-msgstr ""
+msgstr "Importa entrades"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
 msgid "Account voucher unreconcile"
-msgstr ""
+msgstr "Comprovant comptable no conciliat"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -121,11 +130,14 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
+"Quan ven productes a un client, podeu lliurar-li un rebut de venda o una "
+"factura. Quan el rebut és confirmat, es crea automàticament el assentament i "
+"podeu registrar pagament del client relacionat amb aquest rebut de venda."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay Bill"
-msgstr ""
+msgstr "Paga la factura"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -143,39 +155,39 @@ msgstr "Canvia a esborrany"
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
-msgstr ""
+msgstr "Número de referència de la transacció"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Trenca conciliació dels assentaments"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Statistics"
-msgstr ""
+msgstr "Estadístiques de comprovants"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "Validada"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr ""
+msgstr "Cerca comprovants"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Purchase"
-msgstr ""
+msgstr "Compres"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -187,12 +199,12 @@ msgstr "Compte"
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
 msgid "Debits"
-msgstr ""
+msgstr "Dèbits"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Ok"
-msgstr ""
+msgstr "Accepta"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
@@ -201,6 +213,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 d'aquest informe, podeu tenir una visió general de l'import "
+"facturat als seus clients, així com els retards en els pagaments. L'eina de "
+"recerca també es pot utilitzar per personalitzar els informes de les "
+"factures i per tant, adaptar aquest anàlisi a les seves necessitats."
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0
@@ -208,12 +224,12 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Data de venciment"
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "Anotacions"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -224,22 +240,27 @@ msgid ""
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
 msgstr ""
+"Els pagaments de venda permeten registrar els pagaments rebuts dels seus "
+"clients. Per registrar un pagament, heu de seleccionar el client, el mètode "
+"de pagament(= el diari) i l'import del pagament. Automàticament, OpenERP li "
+"proposarà la reconciliació d'aquest pagament amb les factures o rebuts de "
+"vendes pendents."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Sale"
-msgstr ""
+msgstr "Venda"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Anotació comptable"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "Ref. núm."
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -250,45 +271,45 @@ msgstr "Import"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "Opcions de pagament"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "Altres informacions"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: selection:sale.receipt.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Data de pagament"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Línia d'extracte bancari"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Supplier Vouchers"
-msgstr ""
+msgstr "Comprovants de proveïdors"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Trenca conciliació"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Impost"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -299,7 +320,7 @@ msgstr "Import (en paraules):"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "Nº de línies de comprovants"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -309,22 +330,22 @@ msgstr "Compte analític"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "Informació del pagament"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 msgid "Go"
-msgstr ""
+msgstr "Vés"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "Import pagat"
 
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "Importa les factures"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -335,7 +356,7 @@ msgstr "Compte :"
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "Rebut"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -345,17 +366,17 @@ msgstr "En compte de:"
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Import del desajustament"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Línies de vendes"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Date:"
-msgstr ""
+msgstr "Data:"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -384,7 +405,7 @@ msgstr "Tipus"
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "També desitgeu eliminar els assentaments comptables?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -393,35 +414,35 @@ msgid "Voucher Entries"
 msgstr "Comprovants"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Error !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr ""
+msgstr "Comprovant del proveïdor"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "Comprovants"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "Anotació"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: 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 "Rebut de vendes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Acció no vàlida!"
@@ -429,46 +450,46 @@ msgstr "Acció no vàlida!"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "Informació de la factura"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Trenca conciliació"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Retard mig del deute"
 
 #. module: account_voucher
 #: view:account.invoice:0
 #: code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Paga factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "No codi base comptable i codi d'impost comptable!"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Import impostos"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "Comprovant"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -482,7 +503,7 @@ msgstr "Empresa"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Diferència del pagament"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
@@ -490,30 +511,33 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"L'import del rebut ha de ser del mateix import que el de la línia del "
+"extracte"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "To Review"
-msgstr ""
+msgstr "Per revisa"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
-msgstr ""
+msgstr "Línies de despeses"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Factures"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Línies de comprovant"
@@ -522,7 +546,7 @@ msgstr "Línies de comprovant"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
@@ -533,25 +557,25 @@ msgstr "Divisa"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "A pagar i a cobrar"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Paga tard o agrupar fons"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Retard mitjà per a pagar"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -565,18 +589,18 @@ msgstr "Esborrany"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Compte de desajustament"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
-msgstr ""
+msgstr "Divisa:"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Total amb impostos"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -586,7 +610,7 @@ msgstr "PRO-FORMA"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -596,36 +620,40 @@ msgid ""
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
 msgstr ""
+"El formulari de pagament de proveïdor li permet gestionar els pagaments que "
+"fa als seus proveïdors. Quan seleccioneu un proveïdor, un mètode de pagament "
+"i un import a pagar, OpenERP li proposarà la reconciliació del seu pagament "
+"amb les factures de proveïdor o rebuts pendents."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Import total"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Cr/Dr"
-msgstr ""
+msgstr "Deure/Haver"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
 msgid "Audit Complete ?"
-msgstr ""
+msgstr "Auditoria completa?"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Terminis de pagament"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record ?"
-msgstr ""
+msgstr "Segur que desitgeu trencar la conciliació d'aquest registre?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
@@ -637,60 +665,60 @@ msgstr "Data"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Number:"
-msgstr ""
+msgstr "Número:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Import conciliat"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Compte analític del desajustament"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "Paga directament"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "Pagaments previs?"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "Diaris de comprovants"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Compute Tax"
-msgstr ""
+msgstr "Calcula impostos"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -698,15 +726,15 @@ msgid "Credit"
 msgstr "Haver"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "Defineix una seqüència en el diari!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Obre assentaments de proveïdor"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -717,28 +745,28 @@ msgstr "A través de:"
 #: 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 "Pagament del proveïdor"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "Missatge"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "Factures i transaccions de sortida"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Base imposable"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "Data factura"
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -752,6 +780,14 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" * L'estat 'Esborrany' s'utilitza quan un usuari codifica un rebut nou sense "
+"confirmar.                         \n"
+"* L'estat 'Pro-forma' quan el rebut no té un número de rebut.                "
+"         \n"
+"* L'estat \"Fixat\" s'utilitza quan l'usuari crea el rebut, es genera un "
+"número de rebut i es creen els assentaments en la comptabilitat.             "
+"            \n"
+"* L'estat \"Cancel·lat\" s'utilitza quan l'usuari cancel·la el rebut."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -767,24 +803,24 @@ msgstr "Número"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracte bancari"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "Informació de vendes"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipt Analysis"
-msgstr ""
+msgstr "Anàlisi de cobraments de vendes"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
@@ -795,12 +831,12 @@ msgstr "Comprovant"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "Elements del comprovant"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -821,7 +857,7 @@ msgstr "Pro-forma"
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr ""
+msgstr "Apunts comptables"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -829,18 +865,18 @@ 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 "Pagament del client"
 
 #. module: account_voucher
 #: 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 "Importa factures en extracte"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "Pagar"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -850,17 +886,17 @@ msgstr "Deure"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "Desitgeu confirmar aquest registre?"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Concilia amb desajustament"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "Mètode de pagament"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
@@ -875,7 +911,7 @@ msgstr "Cancel·lat"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
@@ -889,23 +925,23 @@ msgstr "Diari"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notes internes"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "Crèdits"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Original Amount"
-msgstr ""
+msgstr "Import original"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "State:"
-msgstr ""
+msgstr "Estat:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -916,7 +952,7 @@ msgstr ""
 #: field:sale.receipt.report,pay_now:0
 #: selection:sale.receipt.report,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Pagament"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -930,38 +966,38 @@ msgstr "Fixat"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Factures de proveïdor i transaccions de sortida"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Comentari del desajustament"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "Tipus per defecte"
 
 #. module: account_voucher
 #: 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 "Entrades per extracte des de factures"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
@@ -971,17 +1007,17 @@ msgstr "Assentament comptable"
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher State"
-msgstr ""
+msgstr "Estat del comprovant"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "Data efectiva per entrades comptables."
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "Mantingueu obert"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -989,34 +1025,37 @@ 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 trenqueu la conciliació de transaccions, també heu de comprovar totes les "
+"accions que estan relacionades amb aquestes transaccions ja que no seran "
+"eliminades"
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
-msgstr ""
+msgstr "Import base"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr ""
+msgstr "Estadístiques de rebuts de vendes"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Obre balanç"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invàlid per a la definició de la vista!"
@@ -1057,22 +1096,12 @@ msgstr ""
 #~ msgid "Bank Payments"
 #~ msgstr "Pagaments bancaris"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr "No es pot eliminar factura(s) obertes o pagades!"
-
 #~ msgid "Receiver's Signature"
 #~ msgstr "Vaig rebre"
 
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "Pro-forma rebut de caixa"
-
 #~ msgid "New Cash Receipt"
 #~ msgstr "Nou rebut de caixa"
 
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "Cancel·la rebut de caixa"
-
 #~ msgid "Contra Voucher"
 #~ msgstr "Contra comprovant"
 
@@ -1085,9 +1114,6 @@ msgstr ""
 #~ msgid "Authorised Signatory"
 #~ msgstr "Signant autoritzat"
 
-#~ msgid "Accounting - Voucher Management"
-#~ msgstr "Comptabilitat - Gestió de comprovants"
-
 #~ msgid "Closing Balance"
 #~ msgstr "Saldo de tancament"
 
@@ -1118,24 +1144,12 @@ msgstr ""
 #~ msgid "Voucher Line"
 #~ msgstr "Línia de comprovant"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Rebut de caixa fixat"
-
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Diferència de saldo d'obertura"
-
 #~ msgid "Voucher Reference"
 #~ msgstr "Referència comprovant"
 
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Rebut de caixa esborrany"
-
 #~ msgid "Cash Receipts"
 #~ msgstr "Rebuts de caixa"
 
-#~ msgid "Entry"
-#~ msgstr "Entrada"
-
 #~ msgid "None"
 #~ msgstr "Cap"
 
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index 1fb9aa554b0..4a1fe78892b 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index bb5c4091541..ec680c25893 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Storno Rechnungsausgleich"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Abschreibung"
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Gruppierung..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -97,7 +97,7 @@ msgid "Bill Payment"
 msgstr "Rechnungsbezahlung"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -417,7 +417,7 @@ msgid "Voucher Entries"
 msgstr "Zahlungsbeleg Buchungen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Fehler !"
@@ -445,7 +445,7 @@ msgid "Sales Receipt"
 msgstr "Buchen von Einnahmen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Fehlerhafte Aktion"
@@ -479,7 +479,7 @@ msgid "Pay Invoice"
 msgstr "Zahle Rechnung"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Kein Steuerfinanzkonto und Steuerkonto definiert!"
@@ -540,6 +540,7 @@ msgstr "Dezember"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Zahlungspositionen"
@@ -729,7 +730,7 @@ msgid "Credit"
 msgstr "Konto entlasten (Haben)"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Definieren Sie bitte eine Reihenfolge für das Journal !"
@@ -1059,18 +1060,12 @@ msgstr "Offener Saldo"
 msgid "Total"
 msgstr "Summe"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Versendeter Zahlungsbeleg"
-
 #~ msgid "State :"
 #~ msgstr "Status"
 
 #~ msgid "Ref. :"
 #~ msgstr "Bez. :"
 
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "Abbrechen Belegausgabe"
-
 #~ msgid "-"
 #~ msgstr "-"
 
@@ -1080,27 +1075,12 @@ msgstr "Summe"
 #~ msgid "Dated :"
 #~ msgstr "Datiert am :"
 
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "Pro-forma Zahlungsbeleg"
-
 #~ msgid "No."
 #~ msgstr "Nr."
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Differenz Anfangssaldo"
-
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Entwurf Zahlungsbeleg"
-
-#~ msgid "Entry"
-#~ msgstr "Eingabe"
-
 #~ msgid "Authorised Signatory"
 #~ msgstr "Autorisierte Signatur"
 
-#~ msgid "Accounting - Voucher Management"
-#~ msgstr "Buchhaltung - Belegverwaltung"
-
 #~ msgid "Bank Receipts"
 #~ msgstr "Bankauszug"
 
@@ -1230,10 +1210,6 @@ msgstr "Summe"
 #~ msgid "General Information"
 #~ msgstr "Grundinformation"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr "Kann offene oder bezahlte Rechnungen nicht löschen"
-
 #~ msgid "Journal Voucher"
 #~ msgstr "Journal Beleg"
 
@@ -1279,92 +1255,5 @@ msgstr "Summe"
 #~ msgid "Entry Lines"
 #~ msgstr "Buchungen"
 
-#~ msgid "Journal:"
-#~ msgstr "Journal:"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Extended options..."
-#~ msgstr "Erweiterte Optionen.."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regeln werden für osv_memory Objekt nicht unterstützt"
-
-#~ msgid "Form view not available for Payment Lines"
-#~ msgstr "Formular Ansicht nicht verfügbar für Zahlungspositionen"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Nicht ausgeglichene Beträge"
-
-#~ msgid "Vendor"
-#~ msgstr "Lieferant"
-
-#, python-format
-#~ msgid "Please change partner and try again !"
-#~ msgstr "Bitte ändern Sie den Partner und versuchen Sie es dann nochmals !"
-
-#, python-format
-#~ msgid "Invalid Error !"
-#~ msgstr "Invalid !Fehler"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Rechnungsbetrag"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Buchen von Auszahlungen"
-
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Offene Posten Lieferanten"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Eingangsrechnungen und andere offene Posten"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "supplier Payment"
-#~ msgstr "Buchen von Auszahlungen"
-
-#~ msgid "supplier"
-#~ msgstr "Lieferant"
-
-#~ msgid "Open supplier Journal Entries"
-#~ msgstr "Offene Posten Lieferanten"
-
-#~ msgid "supplier Invoices and Outstanding transactions"
-#~ msgstr "Eingangsrechnungen und andere offene Posten"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "Sie können keine Buchung auf Forderungs- oder Verbindlichkeitskonten "
-#~ "erstellen, ohne vorher einen Partner erstellt zu haben."
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "Falscher Buchungsbetrag in Soll oder Haben"
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr ""
-#~ "Sie können keine Buchung auf einem bereits abgeschlossenen Konto vornehmen."
-
-#~ msgid "You can not create move line on view account."
-#~ msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
-
-#~ msgid "Company must be same for its related account and period."
-#~ msgstr ""
-#~ "Das Unternehmen muss für zugehörige Konten und Perioden identisch sein."
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index 1526ab78559..def87ad5501 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Ασυμβίβαστες συναλλαγές"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Παραγραφή"
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "Ομαδοποίηση Κατά..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -89,7 +89,7 @@ msgid "Bill Payment"
 msgstr "Πληρωμή Λογαριασμού"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -393,7 +393,7 @@ msgid "Voucher Entries"
 msgstr "Εγγραφές Παραστατικών"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Λάθος !"
@@ -421,7 +421,7 @@ msgid "Sales Receipt"
 msgstr "Απόδειξη Πώλησης"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Άκυρη Ενέργεια!"
@@ -455,7 +455,7 @@ msgid "Pay Invoice"
 msgstr "Τιμολόγιο Πληρωμής"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -514,6 +514,7 @@ msgstr "Δεκέμβριος"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Γραμμές Παραστατικού"
@@ -698,7 +699,7 @@ msgid "Credit"
 msgstr "Πίστωση"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1048,23 +1049,12 @@ msgstr "Σύνολο"
 #~ msgid "Receiver's Signature"
 #~ msgstr "Υπογραφή Παραλήπτη"
 
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "Απόδειξη Μετρητών Προ-Φόρμας"
-
 #~ msgid "New Cash Receipt"
 #~ msgstr "Νέα Απόδειξη Μετρητών"
 
 #~ msgid "Bank Payments"
 #~ msgstr "Πληρωμές Τράπεζας"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr ""
-#~ "Δεν μπορείτε να διαγράψετε τιμολόγιο(α) που έχουν ήδη ανοιχτεί ή πληρωθεί!"
-
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "Ακύρωση Απόδειξης Μετρητών"
-
 #~ msgid "Contra Voucher"
 #~ msgstr "Contra Voucher"
 
@@ -1077,9 +1067,6 @@ msgstr "Σύνολο"
 #~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
 #~ "ειδικούς χαρακτήρες!"
 
-#~ msgid "Accounting - Voucher Management"
-#~ msgstr "Λογιστική - Διαχείριση Παραστατικών"
-
 #~ msgid "Authorised Signatory"
 #~ msgstr "Αναγνωρισμένη Υπογραφή"
 
@@ -1128,36 +1115,24 @@ msgstr "Σύνολο"
 #~ msgid "Cash Receipts"
 #~ msgstr "Αποδείξεις Μετρητών"
 
-#~ msgid "Entry"
-#~ msgstr "Εγγραφή"
-
 #~ msgid "Narration"
 #~ msgstr "Περιγραφή"
 
 #~ msgid "Dated :"
 #~ msgstr "Ημερομηνία :"
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Διαφορά Ισοζυγίου Ανοίγματος"
-
 #~ msgid "Reference Type"
 #~ msgstr "Σχετικός Τύπος"
 
 #~ msgid "None"
 #~ msgstr "Κανένα"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Posted Cash Receipt"
-
 #~ msgid "No."
 #~ msgstr "Αρ."
 
 #~ msgid "New Bank Receipt"
 #~ msgstr "Νέα Απόδειξη Τράπεζας"
 
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Draf Cash Receipt"
-
 #~ msgid "Cash Payments"
 #~ msgstr "Πληρωμές Μετρητών"
 
@@ -1241,12 +1216,3 @@ msgstr "Σύνολο"
 
 #~ msgid "Open Voucher Entries"
 #~ msgstr "Άνοιγμα Εγγραφών Παραστατικού"
-
-#~ msgid "Journal:"
-#~ msgstr "Ημερολόγιο:"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Πληρωμή Πωλητή"
-
-#~ msgid "Vendor"
-#~ msgstr "Πωλητής"
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 5361c3c716c..7f11fcda13a 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Transacciones no conciliadas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -96,7 +96,7 @@ msgid "Bill Payment"
 msgstr "Pago factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -414,7 +414,7 @@ msgid "Voucher Entries"
 msgstr "Comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -442,7 +442,7 @@ msgid "Sales Receipt"
 msgstr "Recibo de ventas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "¡ Acción invalida !"
@@ -476,7 +476,7 @@ msgid "Pay Invoice"
 msgstr "Pagar factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "¡No código base contable y código impuesto contable!"
@@ -537,6 +537,7 @@ msgstr "Diciembre"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Líneas de comprobante"
@@ -725,7 +726,7 @@ msgid "Credit"
 msgstr "Haber"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "¡Defina una secuencia en el diario!"
@@ -1070,9 +1071,6 @@ msgstr "Total"
 #~ msgid "Dated :"
 #~ msgstr "Fechado :"
 
-#~ msgid "Entry"
-#~ msgstr "Entrada"
-
 #~ msgid "Create"
 #~ msgstr "Crear"
 
@@ -1121,13 +1119,6 @@ msgstr "Total"
 #~ msgid "Bank Payments"
 #~ msgstr "Pagos bancarios"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr "¡ No es posible borrar factura(s) abiertas o pagadas !"
-
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "Cancelar recibo de caja"
-
 #~ msgid "Contra Voucher"
 #~ msgstr "Contra comprobante"
 
@@ -1179,24 +1170,12 @@ msgstr "Total"
 #~ msgid "Voucher Report"
 #~ msgstr "Informe de comprobantes"
 
-#~ msgid "Accounting - Voucher Management"
-#~ msgstr "Contabilidad - Gestión de comprobantes"
-
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "Pro-forma recibo en efectivo"
-
 #~ msgid "Closing Balance"
 #~ msgstr "Saldo de cierre"
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Diferencia de saldo de apertura"
-
 #~ msgid "No."
 #~ msgstr "Nº"
 
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Recibo de caja borrador"
-
 #~ msgid "Opening Balance"
 #~ msgstr "Saldo de apertura"
 
@@ -1230,9 +1209,6 @@ msgstr "Total"
 #~ msgid "Sub Currency"
 #~ msgstr "Sub moneda"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Recibo de caja emitido"
-
 #~ msgid "Cash Payments"
 #~ msgstr "Pagos en efectivo"
 
@@ -1275,94 +1251,5 @@ msgstr "Total"
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Comprobante de cobro bancario"
 
-#~ msgid "Form view not available for Payment Lines"
-#~ msgstr "Vista formulario no disponible para líneas de pago"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Importe original"
-
-#~ msgid "Journal:"
-#~ msgstr "Diario:"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Pago del vendedor"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Importe no conciliado"
-
-#~ msgid "Vendor"
-#~ msgstr "Vendedor"
-
-#~ msgid "Extended options..."
-#~ msgstr "Opciones extras..."
-
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Abrir entradas diario de vendedores"
-
-#, python-format
-#~ msgid "Invalid Error !"
-#~ msgstr "¡Error no válido!"
-
-#, python-format
-#~ msgid "Please change partner and try again !"
-#~ msgstr "¡Cambie la empresa y pruebe de nuevo!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Facturas de vendedor y transacciones de salida"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #~ msgid "Authorised Signatory"
 #~ msgstr "Firma autorizada"
-
-#~ 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."
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
-
-#~ msgid "Write-Off journal"
-#~ msgstr "Diario de desajuste"
-
-#~ 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."
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
-
-#~ msgid "Payment Option"
-#~ msgstr "Opción de pago"
-
-#~ msgid "Comment"
-#~ msgstr "Comentario"
-
-#~ msgid "Without Write-off"
-#~ msgstr "Sin desajuste"
-
-#~ 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."
-
-#~ msgid "Writeoff Amount"
-#~ msgstr "Importe desajuste"
-
-#~ msgid "With Write-off"
-#~ msgstr "Con desajuste"
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index a53709e0dce..76351c8b1bd 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr "Asientos de vouchers"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Lineas del voucher"
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr "Haber"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1038,19 +1039,9 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para la definición de la vista!"
 
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "Recibo por pago en efectivo Pro-forma"
-
 #~ msgid "New Cash Receipt"
 #~ msgstr "Nuevo recibo de pago en efectivo"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr "No puede eliminar facturas abiertas o ya pagas"
-
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "Cancelar recibo de pago en efectivo"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1081,18 +1072,12 @@ msgstr ""
 #~ msgid "Name"
 #~ msgstr "Nombre"
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Diferencia de saldo inicial"
-
 #~ msgid "Cash Receipts"
 #~ msgstr "Recibos de pago en efectivo"
 
 #~ msgid "Reference Type"
 #~ msgstr "Tipo de referencia"
 
-#~ msgid "Entry"
-#~ msgstr "Asiento"
-
 #~ msgid "Narration"
 #~ msgstr "Narración"
 
@@ -1102,18 +1087,12 @@ msgstr ""
 #~ msgid "None"
 #~ msgstr "Ninguno"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Recibos de pago en efectivo publicados"
-
 #~ msgid "No."
 #~ msgstr "Núm."
 
 #~ msgid "New Bank Receipt"
 #~ msgstr "Nuevo recibo bancario"
 
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Recibos de pago en efectivo en borrador"
-
 #~ msgid "Cash Payments"
 #~ msgstr "Pagos en efectivo"
 
@@ -1141,9 +1120,6 @@ msgstr ""
 #~ msgid "Bank Payments"
 #~ msgstr "Pagos en banco"
 
-#~ msgid "Accounting - Voucher Management"
-#~ msgstr "Contabilidad - Gestión de vouchers"
-
 #~ msgid "Receipt Vouchers"
 #~ msgstr "Vouchers del recibo"
 
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index 700a0c9ba4e..76746f7d600 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Transacciones sin conciliar"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Ajuste"
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "No puede borrar pagos que están ya cerrados"
@@ -94,7 +94,7 @@ msgid "Bill Payment"
 msgstr "Pago de Facturas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -413,7 +413,7 @@ msgid "Voucher Entries"
 msgstr "Comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -441,7 +441,7 @@ msgid "Sales Receipt"
 msgstr "Recibo de Venta"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Acción Inválida !"
@@ -475,7 +475,7 @@ msgid "Pay Invoice"
 msgstr "Pagar Factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "No hay cuenta base ni cuenta de impuesto"
@@ -536,6 +536,7 @@ msgstr "Diciembre"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Líneas de comprobante"
@@ -724,7 +725,7 @@ msgid "Credit"
 msgstr "Haber"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Por favor defina una secuencia en el diario !"
@@ -1250,86 +1251,3 @@ msgstr "Total"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Comprobante de cobro bancario"
-
-#~ msgid "Form view not available for Payment Lines"
-#~ msgstr "Vista de formulario no disponible en detalle de pago"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Monto original"
-
-#~ msgid "Journal:"
-#~ msgstr "Diario:"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Pago a Proveedor"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! No puede crear menús recursivos"
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Monto no conciliado"
-
-#~ msgid "Vendor"
-#~ msgstr "Proveedor"
-
-#~ msgid "Extended options..."
-#~ msgstr "Opciones Extendidas"
-
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Abrir asientos de diario de proveedor"
-
-#, python-format
-#~ msgid "Please change partner and try again !"
-#~ msgstr "Por favor cambiar la empresa e intentar de nuevo!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reglas no son soportadas para objetos osv_menory !"
-
-#, python-format
-#~ msgid "Invalid Error !"
-#~ msgstr "Inválido !"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Facturas de Proveedor y transacciones pendientes"
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "¡Valor crédito o débito erróneo en apunte contable!"
-
-#~ msgid "Write-Off journal"
-#~ msgstr "Diario de desajuste"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "Usted no puede crear la línea de pasar por cobrar / cuentas por pagar sin "
-#~ "empresa relacionada"
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "Usted no puede crear la línea de avanzar en cuenta cerrada."
-
-#~ msgid "Payment Option"
-#~ msgstr "Opción de pago"
-
-#~ msgid "Comment"
-#~ msgstr "Comentario"
-
-#~ msgid "Without Write-off"
-#~ msgstr "Sin desajuste"
-
-#~ 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."
-
-#~ msgid "Writeoff Amount"
-#~ msgstr "Importe desajuste"
-
-#~ msgid "With Write-off"
-#~ msgstr "Con desajuste"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Error: La referencia BVR es necesaria."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Error: Número BVR inválido (checksum erróneo)."
-
-#~ 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."
diff --git a/addons/account_voucher/i18n/es_MX.po b/addons/account_voucher/i18n/es_MX.po
new file mode 100644
index 00000000000..998896a13f6
--- /dev/null
+++ b/addons/account_voucher/i18n/es_MX.po
@@ -0,0 +1,1255 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher
+#
+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-01-18 00:20+0000\n"
+"Last-Translator: José Pastor <Unknown>\n"
+"Language-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:37+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Transacciones no conciliadas"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:247
+#, python-format
+msgid "Write-Off"
+msgstr "Desajuste"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr "Ref. pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Customer Journal Entries"
+msgstr "Abrir asientos diario cliente"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Voucher Date"
+msgstr "Fecha comprobante"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Particulars"
+msgstr "Particulares"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:596
+#, python-format
+msgid "Cannot delete Voucher(s) which are already opened or paid !"
+msgstr ""
+"¡No se puede eliminar comprobante(s) que ya estén abiertos o pagados!"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
+msgid "Voucher Print"
+msgstr "Imprimir comprobante"
+
+#. module: account_voucher
+#: model:ir.module.module,description:account_voucher.module_meta_information
+msgid ""
+"Account Voucher module includes all the basic requirements of\n"
+"    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
+"etc...\n"
+"    * Voucher Entry\n"
+"    * Voucher Receipt\n"
+"    * Cheque Register\n"
+"    "
+msgstr ""
+"Módulo de comprobantes contables, incluye todos los requisitos básicos de\n"
+"comprobantes para banco, caja, ventas, compras, gastos, contracomprobantes, "
+"...\n"
+"    * Entrada de comprobantes\n"
+"    * Recibo de comprobantes\n"
+"    * Registro de cheques\n"
+"    "
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
+msgid "Bill Payment"
+msgstr "Pago factura"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:746
+#, python-format
+msgid ""
+"You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+"¡Debe configurar código de la base contable y código del impuesto contable "
+"del impuesto '%s'!"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:182
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
+#, python-format
+msgid "Import Entries"
+msgstr "Importar entradas"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
+msgid "Account voucher unreconcile"
+msgstr "Comprobante contable no conciliado"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
+msgid ""
+"When you sell products to a customer, you can give him a sales receipt or an "
+"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 ""
+"Cuando vende productos a un cliente, puede entregarle un recibo de venta o "
+"una factura. Cuando el recibo es confirmado, se crea automáticamente el "
+"asiento y puede registrar pago del cliente relacionado con este recibo de "
+"venta."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay Bill"
+msgstr "Pagar factura"
+
+#. module: account_voucher
+#: field:account.voucher,company_id:0
+#: field:account.voucher.line,company_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_voucher
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
+msgstr "Número referencia transacción."
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
+msgid "Unreconcile entries"
+msgstr "Entradas no conciliadas"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Statistics"
+msgstr "Estadísticas de comprobantes"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Search Vouchers"
+msgstr "Buscar comprobantes"
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Purchase"
+msgstr "Compra"
+
+#. module: account_voucher
+#: field:account.voucher,account_id:0
+#: field:account.voucher.line,account_id:0
+#: field:sale.receipt.report,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account_voucher
+#: field:account.voucher,line_dr_ids:0
+msgid "Debits"
+msgstr "Débitos"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_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 ""
+"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_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 "Fecha vencimiento"
+
+#. module: account_voucher
+#: field:account.voucher,narration:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
+msgid ""
+"Sales payment allows you to register the payments you receive from your "
+"customers. In order to record a payment, you must enter the customer, the "
+"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 ""
+"Los pagos de venta permiten registrar los pagos recibidos de sus clientes. "
+"Para registrar un pago, debe seleccionar el cliente, el método de pago(= el "
+"diario) y el importe del pago. OpenERP le propondrá automáticamente la "
+"reconciliación de este pago con las facturas o recibos de ventas pendientes."
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venta"
+
+#. module: account_voucher
+#: field:account.voucher.line,move_line_id:0
+msgid "Journal Item"
+msgstr "Apunte contable"
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr "Ref. #"
+
+#. module: account_voucher
+#: field:account.voucher.line,amount:0
+#: report:voucher.print:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Options"
+msgstr "Opciones de pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:sale.receipt.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,date:0
+msgid "Date payment"
+msgstr "Fecha pago"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Supplier Vouchers"
+msgstr "Comprobantes proveedores"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
+#. module: account_voucher
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Amount (in words) :"
+msgstr "Importe (en palabras):"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr "Nº de líneas de comprobantes"
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Information"
+msgstr "Información de pago"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+msgid "Go"
+msgstr "Ir"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Paid Amount"
+msgstr "Importe pagado"
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr "Importar facturas"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Account :"
+msgstr "Cuenta :"
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Receipt"
+msgstr "Recibo"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "On Account of :"
+msgstr "En cuenta de :"
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Write-Off Amount"
+msgstr "Importe del desajuste"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr "Líneas ventas"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,state:0
+#: view:sale.receipt.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_voucher
+#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
+msgid "Accounting Voucher Entries"
+msgstr "Comprobantes contables"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_voucher
+#: field:account.voucher.unreconcile,remove:0
+msgid "Want to remove accounting entries too ?"
+msgstr "¿También desea eliminar asientos contables?"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
+msgid "Voucher Entries"
+msgstr "Comprobantes"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:645
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr "Comprobante proveedor"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr "Comprobantes"
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Memo"
+msgstr "Memoria"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: 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 "Recibo de ventas"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:596
+#, python-format
+msgid "Invalid action !"
+msgstr "¡ Acción invalida !"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr "Información factura"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation"
+msgstr "Romper conciliación"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr "Retraso promedio deuda"
+
+#. module: account_voucher
+#: view:account.invoice:0
+#: code:addons/account_voucher/invoice.py:32
+#, python-format
+msgid "Pay Invoice"
+msgstr "Pagar factura"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:746
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr "¡No código base contable y código impuesto contable!"
+
+#. module: account_voucher
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr "Importe impuesto"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Entry"
+msgstr "Comprobante"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Difference"
+msgstr "Diferencia del pago"
+
+#. 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 ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "To Review"
+msgstr "A revisar"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
+msgstr "Líneas de gastos"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,line_ids:0
+#: field:account.statement.from.invoice.lines,line_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: account_voucher
+#: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Lines"
+msgstr "Líneas de comprobante"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_voucher
+#: field:account.voucher,currency_id:0
+#: field:sale.receipt.report,currency_id:0
+msgid "Currency"
+msgstr "Dinero corriente"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Payable and Receivables"
+msgstr "A pagar y a cobrar"
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr "Pagar tarde o agrupar fondos"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr "Retraso medio para pagar"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+#: report:voucher.print:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr "Cuenta de desajuste"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Currency:"
+msgstr "Moneda:"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Total con impuestos"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"The supplier payment form allows you to track the payment you do to your "
+"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 ""
+"El formulario de pago de proveedor le permite gestionar los pagos que hace a "
+"sus proveedores. Cuando selecciona un proveedor, el método de pago y el "
+"importe a pagar, OpenERP propondrá la reconciliación de su pago con las "
+"facturas de proveedor o recibos pendientes."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: account_voucher
+#: field:account.voucher.line,type:0
+msgid "Cr/Dr"
+msgstr "Haber/Debe"
+
+#. module: account_voucher
+#: field:account.voucher,audit:0
+msgid "Audit Complete ?"
+msgstr "¿Auditoría completa?"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Terms"
+msgstr "Plazos de pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to unreconcile this record ?"
+msgstr "¿Seguro que desea romper la conciliación de este registro?"
+
+#. module: account_voucher
+#: field:account.voucher,date:0
+#: field:account.voucher.line,date_original:0
+#: field:sale.receipt.report,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Number:"
+msgstr "Número:"
+
+#. module: account_voucher
+#: field:account.bank.statement.line,amount_reconciled:0
+msgid "Amount reconciled"
+msgstr "Importe conciliado"
+
+#. module: account_voucher
+#: field:account.voucher,analytic_id:0
+msgid "Write-Off Analytic Account"
+msgstr "Cuenta analítica del desajuste"
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Directly"
+msgstr "Pagar directamente"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: account_voucher
+#: field:account.voucher,pre_line:0
+msgid "Previous Payments ?"
+msgstr "¿Pagos previos?"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
+msgid "Journal Vouchers"
+msgstr "Diarios de comprobantes"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr "Calcular impuestos"
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:645
+#, python-format
+msgid "Please define a sequence on the journal !"
+msgstr "¡Defina una secuencia en el diario!"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr "Abrir asientos de proveedor"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Through :"
+msgstr "A través de :"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payment"
+msgstr "Pago del proveedor"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Post"
+msgstr "Entrega"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Invoices and outstanding transactions"
+msgstr "Facturas y transacciones de salida"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total:0
+msgid "Total Without Tax"
+msgstr "Total base"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Date"
+msgstr "Fecha factura"
+
+#. module: account_voucher
+#: help:account.voucher,state:0
+msgid ""
+" * 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."
+msgstr ""
+" * El estado 'Borrador' se utiliza cuando un usuario codifica un recibo "
+"nuevo sin confirmar.\n"
+"* El estado 'Pro-forma' cuando el recibo no tiene un número de recibo.\n"
+"* El estado \"Fijado\" se utiliza cuando el usuario crea el recibo, se "
+"genera un número de recibo y se crean los asientos del recibo en la "
+"contabilidad.\n"
+"* El estado \"Cancelado\" se utiliza cuando el usuario cancela el recibo."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobantes contables"
+
+#. module: account_voucher
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr "Número"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Information"
+msgstr "Información de ventas"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipt Analysis"
+msgstr "Análisis cobros de ventas"
+
+#. module: account_voucher
+#: field:account.voucher.line,voucher_id:0
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr "Comprobante"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr "Elementos comprobante"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,move_ids:0
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: 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 "Pago cliente"
+
+#. module: account_voucher
+#: 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 "Importar facturas en extracto"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay"
+msgstr "Pagar"
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to confirm this record ?"
+msgstr "¿Desea confirmar este registro?"
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Reconcile with Write-Off"
+msgstr "Conciliar con desajuste"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr "Método de pago"
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,journal_ids:0
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr "Haber"
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr "Importe original"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "State:"
+msgstr "Estado:"
+
+#. module: account_voucher
+#: field:account.bank.statement.line,voucher_id:0
+#: view:account.invoice:0
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
+#: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+#: report:voucher.print:0
+msgid "Posted"
+msgstr "Contabilizado"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr "Facturas de proveedor y transiciones de salida"
+
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Write-Off Comment"
+msgstr "Comentario del desajuste"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr "Tipo por defecto"
+
+#. module: account_voucher
+#: 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 "Entradas por extracto desde facturas"
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr "Entrada contable"
+
+#. module: account_voucher
+#: field:sale.receipt.report,state:0
+msgid "Voucher State"
+msgstr "Estado comprobante"
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr "Fecha efectiva para entradas contables."
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr "Mantener abierto"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"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_voucher
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
+msgstr "Importe base"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr "Estadísticas de recibos de ventas"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
+msgstr "Abrir balance"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
+msgstr "Total"
+
+#~ msgid "State :"
+#~ msgstr "Estado :"
+
+#~ msgid "Ref. :"
+#~ msgstr "Ref. :"
+
+#~ msgid "Real Entry"
+#~ msgstr "Entrada real"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Dated :"
+#~ msgstr "Fechado :"
+
+#~ msgid "Create"
+#~ msgstr "Crear"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Reference Type"
+#~ msgstr "Tipo de referencia"
+
+#~ 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 "Other Info"
+#~ msgstr "Otra información"
+
+#~ msgid "Ref."
+#~ msgstr "Ref."
+
+#~ msgid "Name"
+#~ msgstr "Nombre:"
+
+#~ msgid "Payment Vouchers"
+#~ msgstr "Comprobantes de pago"
+
+#~ msgid "Bank Receipts"
+#~ msgstr "Recibos bancarios"
+
+#~ msgid "Other Vouchers"
+#~ msgstr "Otros comprobantes"
+
+#~ msgid "Journal Sale Voucher"
+#~ msgstr "Comprobante de diario de ventas"
+
+#~ msgid "New Cash Receipt"
+#~ msgstr "Nuevo recibo de caja"
+
+#~ msgid "Receiver's Signature"
+#~ msgstr "Recibí"
+
+#~ msgid "Bank Payments"
+#~ msgstr "Pagos bancarios"
+
+#~ msgid "Contra Voucher"
+#~ msgstr "Contra comprobante"
+
+#~ msgid "Cash Receipt"
+#~ msgstr "Recibo de caja"
+
+#~ msgid "Vouchers"
+#~ msgstr "Comprobantes"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "New Cash Payment"
+#~ msgstr "Nuevo pago de caja"
+
+#~ msgid "New Bank Payment"
+#~ msgstr "Nuevo pago bancario"
+
+#~ msgid "Dr/Cr"
+#~ msgstr "Dr/Cr"
+
+#~ msgid "Voucher Line"
+#~ msgstr "Línea de comprobante"
+
+#~ msgid "Cash Receipts"
+#~ msgstr "Recibos de caja"
+
+#~ msgid "Narration"
+#~ msgstr "Notas"
+
+#~ msgid "New Bank Receipt"
+#~ msgstr "Nuevo recibo bancario"
+
+#~ msgid "Bank Payment Voucher"
+#~ msgstr "Comprobante de pago bancario"
+
+#~ msgid "Bank Receipt"
+#~ msgstr "Recibo bancario"
+
+#~ msgid "Journal Purchase Voucher"
+#~ msgstr "Comprobantes de diario de compras"
+
+#~ msgid "Voucher Reference"
+#~ msgstr "Referencia comprobante"
+
+#~ msgid "Cash Payment Voucher"
+#~ msgstr "Comprobante de pago en efectivo"
+
+#~ msgid "Voucher Report"
+#~ msgstr "Informe de comprobantes"
+
+#~ msgid "Closing Balance"
+#~ msgstr "Saldo de cierre"
+
+#~ msgid "No."
+#~ msgstr "Nº"
+
+#~ msgid "Opening Balance"
+#~ msgstr "Saldo de apertura"
+
+#~ msgid "Total Credit"
+#~ msgstr "Total crédito"
+
+#~ msgid "Total Debit"
+#~ msgstr "Total debe"
+
+#~ msgid "Optional Information"
+#~ msgstr "Información opcional"
+
+#~ msgid "General Information"
+#~ msgstr "Información general"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "Level"
+#~ msgstr "Nivel"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Entry Lines"
+#~ msgstr "Líneas de asiento"
+
+#~ msgid "Periods"
+#~ msgstr "Periodos"
+
+#~ msgid "Sub Currency"
+#~ msgstr "Sub moneda"
+
+#~ msgid "Cash Payments"
+#~ msgstr "Pagos en efectivo"
+
+#~ msgid "Opening Balance Entry"
+#~ msgstr "Saldo inicial de entrada"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "General Entries"
+#~ msgstr "Entradas generales"
+
+#~ msgid "Voucher Type"
+#~ msgstr "Tipo de comprobante"
+
+#~ msgid "Open a Voucher Entry"
+#~ msgstr "Abrir un comprobante"
+
+#~ msgid "Open Vouchers"
+#~ msgstr "Comprobantes abiertos"
+
+#~ msgid "Open Voucher Entries"
+#~ msgstr "Abrir comprobantes"
+
+#~ msgid "Account Entry Line"
+#~ msgstr "Apunte"
+
+#~ msgid "Journal Voucher"
+#~ msgstr "Diario de comprobantes"
+
+#~ msgid "Receipt Vouchers"
+#~ msgstr "Comprobantes de cobro"
+
+#~ msgid "Voucher Report (Cr/Dr)"
+#~ msgstr "Informe de comprobantes (Haber/Debe)"
+
+#~ msgid "Cash Receipt Voucher"
+#~ msgstr "Comprobante de cobro en efectivo"
+
+#~ msgid "Bank Receipt Voucher"
+#~ msgstr "Comprobante de cobro bancario"
+
+#~ msgid "Authorised Signatory"
+#~ msgstr "Firma autorizada"
diff --git a/addons/account_voucher/i18n/es_PY.po b/addons/account_voucher/i18n/es_PY.po
index 7753b095d64..a70236f2071 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Transacciones no conciliadas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Cancelar Dividas"
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -97,7 +97,7 @@ msgid "Bill Payment"
 msgstr "Pago factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -415,7 +415,7 @@ msgid "Voucher Entries"
 msgstr "Comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -443,7 +443,7 @@ msgid "Sales Receipt"
 msgstr "Recibo de ventas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "¡ Acción invalida !"
@@ -477,7 +477,7 @@ msgid "Pay Invoice"
 msgstr "Pagar factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "¡No código base contable y código impuesto contable!"
@@ -538,6 +538,7 @@ msgstr "Diciembre"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Líneas de comprobante"
@@ -726,7 +727,7 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "¡Defina una secuencia en el diario!"
diff --git a/addons/account_voucher/i18n/es_VE.po b/addons/account_voucher/i18n/es_VE.po
new file mode 100644
index 00000000000..998896a13f6
--- /dev/null
+++ b/addons/account_voucher/i18n/es_VE.po
@@ -0,0 +1,1255 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher
+#
+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-01-18 00:20+0000\n"
+"Last-Translator: José Pastor <Unknown>\n"
+"Language-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:37+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Transacciones no conciliadas"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:247
+#, python-format
+msgid "Write-Off"
+msgstr "Desajuste"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr "Ref. pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Customer Journal Entries"
+msgstr "Abrir asientos diario cliente"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Voucher Date"
+msgstr "Fecha comprobante"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Particulars"
+msgstr "Particulares"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:596
+#, python-format
+msgid "Cannot delete Voucher(s) which are already opened or paid !"
+msgstr ""
+"¡No se puede eliminar comprobante(s) que ya estén abiertos o pagados!"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
+msgid "Voucher Print"
+msgstr "Imprimir comprobante"
+
+#. module: account_voucher
+#: model:ir.module.module,description:account_voucher.module_meta_information
+msgid ""
+"Account Voucher module includes all the basic requirements of\n"
+"    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
+"etc...\n"
+"    * Voucher Entry\n"
+"    * Voucher Receipt\n"
+"    * Cheque Register\n"
+"    "
+msgstr ""
+"Módulo de comprobantes contables, incluye todos los requisitos básicos de\n"
+"comprobantes para banco, caja, ventas, compras, gastos, contracomprobantes, "
+"...\n"
+"    * Entrada de comprobantes\n"
+"    * Recibo de comprobantes\n"
+"    * Registro de cheques\n"
+"    "
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
+msgid "Bill Payment"
+msgstr "Pago factura"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:746
+#, python-format
+msgid ""
+"You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+"¡Debe configurar código de la base contable y código del impuesto contable "
+"del impuesto '%s'!"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:182
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
+#, python-format
+msgid "Import Entries"
+msgstr "Importar entradas"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
+msgid "Account voucher unreconcile"
+msgstr "Comprobante contable no conciliado"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
+msgid ""
+"When you sell products to a customer, you can give him a sales receipt or an "
+"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 ""
+"Cuando vende productos a un cliente, puede entregarle un recibo de venta o "
+"una factura. Cuando el recibo es confirmado, se crea automáticamente el "
+"asiento y puede registrar pago del cliente relacionado con este recibo de "
+"venta."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay Bill"
+msgstr "Pagar factura"
+
+#. module: account_voucher
+#: field:account.voucher,company_id:0
+#: field:account.voucher.line,company_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_voucher
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
+msgstr "Número referencia transacción."
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
+msgid "Unreconcile entries"
+msgstr "Entradas no conciliadas"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Statistics"
+msgstr "Estadísticas de comprobantes"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Search Vouchers"
+msgstr "Buscar comprobantes"
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Purchase"
+msgstr "Compra"
+
+#. module: account_voucher
+#: field:account.voucher,account_id:0
+#: field:account.voucher.line,account_id:0
+#: field:sale.receipt.report,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account_voucher
+#: field:account.voucher,line_dr_ids:0
+msgid "Debits"
+msgstr "Débitos"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_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 ""
+"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_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 "Fecha vencimiento"
+
+#. module: account_voucher
+#: field:account.voucher,narration:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
+msgid ""
+"Sales payment allows you to register the payments you receive from your "
+"customers. In order to record a payment, you must enter the customer, the "
+"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 ""
+"Los pagos de venta permiten registrar los pagos recibidos de sus clientes. "
+"Para registrar un pago, debe seleccionar el cliente, el método de pago(= el "
+"diario) y el importe del pago. OpenERP le propondrá automáticamente la "
+"reconciliación de este pago con las facturas o recibos de ventas pendientes."
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Venta"
+
+#. module: account_voucher
+#: field:account.voucher.line,move_line_id:0
+msgid "Journal Item"
+msgstr "Apunte contable"
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr "Ref. #"
+
+#. module: account_voucher
+#: field:account.voucher.line,amount:0
+#: report:voucher.print:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Options"
+msgstr "Opciones de pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:sale.receipt.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,date:0
+msgid "Date payment"
+msgstr "Fecha pago"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Supplier Vouchers"
+msgstr "Comprobantes proveedores"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
+#. module: account_voucher
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Amount (in words) :"
+msgstr "Importe (en palabras):"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr "Nº de líneas de comprobantes"
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Information"
+msgstr "Información de pago"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+msgid "Go"
+msgstr "Ir"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Paid Amount"
+msgstr "Importe pagado"
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr "Importar facturas"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Account :"
+msgstr "Cuenta :"
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Receipt"
+msgstr "Recibo"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "On Account of :"
+msgstr "En cuenta de :"
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Write-Off Amount"
+msgstr "Importe del desajuste"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr "Líneas ventas"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,state:0
+#: view:sale.receipt.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_voucher
+#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
+msgid "Accounting Voucher Entries"
+msgstr "Comprobantes contables"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_voucher
+#: field:account.voucher.unreconcile,remove:0
+msgid "Want to remove accounting entries too ?"
+msgstr "¿También desea eliminar asientos contables?"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
+msgid "Voucher Entries"
+msgstr "Comprobantes"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:645
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr "Comprobante proveedor"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr "Comprobantes"
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Memo"
+msgstr "Memoria"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: 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 "Recibo de ventas"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:596
+#, python-format
+msgid "Invalid action !"
+msgstr "¡ Acción invalida !"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr "Información factura"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation"
+msgstr "Romper conciliación"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr "Retraso promedio deuda"
+
+#. module: account_voucher
+#: view:account.invoice:0
+#: code:addons/account_voucher/invoice.py:32
+#, python-format
+msgid "Pay Invoice"
+msgstr "Pagar factura"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:746
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr "¡No código base contable y código impuesto contable!"
+
+#. module: account_voucher
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr "Importe impuesto"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Entry"
+msgstr "Comprobante"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Difference"
+msgstr "Diferencia del pago"
+
+#. 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 ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "To Review"
+msgstr "A revisar"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
+msgstr "Líneas de gastos"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,line_ids:0
+#: field:account.statement.from.invoice.lines,line_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: account_voucher
+#: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Lines"
+msgstr "Líneas de comprobante"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_voucher
+#: field:account.voucher,currency_id:0
+#: field:sale.receipt.report,currency_id:0
+msgid "Currency"
+msgstr "Dinero corriente"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Payable and Receivables"
+msgstr "A pagar y a cobrar"
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr "Pagar tarde o agrupar fondos"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr "Retraso medio para pagar"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+#: report:voucher.print:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr "Cuenta de desajuste"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Currency:"
+msgstr "Moneda:"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Total con impuestos"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"The supplier payment form allows you to track the payment you do to your "
+"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 ""
+"El formulario de pago de proveedor le permite gestionar los pagos que hace a "
+"sus proveedores. Cuando selecciona un proveedor, el método de pago y el "
+"importe a pagar, OpenERP propondrá la reconciliación de su pago con las "
+"facturas de proveedor o recibos pendientes."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: account_voucher
+#: field:account.voucher.line,type:0
+msgid "Cr/Dr"
+msgstr "Haber/Debe"
+
+#. module: account_voucher
+#: field:account.voucher,audit:0
+msgid "Audit Complete ?"
+msgstr "¿Auditoría completa?"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Terms"
+msgstr "Plazos de pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to unreconcile this record ?"
+msgstr "¿Seguro que desea romper la conciliación de este registro?"
+
+#. module: account_voucher
+#: field:account.voucher,date:0
+#: field:account.voucher.line,date_original:0
+#: field:sale.receipt.report,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Number:"
+msgstr "Número:"
+
+#. module: account_voucher
+#: field:account.bank.statement.line,amount_reconciled:0
+msgid "Amount reconciled"
+msgstr "Importe conciliado"
+
+#. module: account_voucher
+#: field:account.voucher,analytic_id:0
+msgid "Write-Off Analytic Account"
+msgstr "Cuenta analítica del desajuste"
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Directly"
+msgstr "Pagar directamente"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: account_voucher
+#: field:account.voucher,pre_line:0
+msgid "Previous Payments ?"
+msgstr "¿Pagos previos?"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
+msgid "Journal Vouchers"
+msgstr "Diarios de comprobantes"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr "Calcular impuestos"
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:645
+#, python-format
+msgid "Please define a sequence on the journal !"
+msgstr "¡Defina una secuencia en el diario!"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr "Abrir asientos de proveedor"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Through :"
+msgstr "A través de :"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payment"
+msgstr "Pago del proveedor"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Post"
+msgstr "Entrega"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Invoices and outstanding transactions"
+msgstr "Facturas y transacciones de salida"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total:0
+msgid "Total Without Tax"
+msgstr "Total base"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Date"
+msgstr "Fecha factura"
+
+#. module: account_voucher
+#: help:account.voucher,state:0
+msgid ""
+" * 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."
+msgstr ""
+" * El estado 'Borrador' se utiliza cuando un usuario codifica un recibo "
+"nuevo sin confirmar.\n"
+"* El estado 'Pro-forma' cuando el recibo no tiene un número de recibo.\n"
+"* El estado \"Fijado\" se utiliza cuando el usuario crea el recibo, se "
+"genera un número de recibo y se crean los asientos del recibo en la "
+"contabilidad.\n"
+"* El estado \"Cancelado\" se utiliza cuando el usuario cancela el recibo."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobantes contables"
+
+#. module: account_voucher
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr "Número"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Information"
+msgstr "Información de ventas"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipt Analysis"
+msgstr "Análisis cobros de ventas"
+
+#. module: account_voucher
+#: field:account.voucher.line,voucher_id:0
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr "Comprobante"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr "Elementos comprobante"
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,move_ids:0
+msgid "Journal Items"
+msgstr "Apuntes contables"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: 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 "Pago cliente"
+
+#. module: account_voucher
+#: 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 "Importar facturas en extracto"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay"
+msgstr "Pagar"
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to confirm this record ?"
+msgstr "¿Desea confirmar este registro?"
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Reconcile with Write-Off"
+msgstr "Conciliar con desajuste"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr "Método de pago"
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,journal_ids:0
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr "Haber"
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr "Importe original"
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "State:"
+msgstr "Estado:"
+
+#. module: account_voucher
+#: field:account.bank.statement.line,voucher_id:0
+#: view:account.invoice:0
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
+#: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+#: report:voucher.print:0
+msgid "Posted"
+msgstr "Contabilizado"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr "Facturas de proveedor y transiciones de salida"
+
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Write-Off Comment"
+msgstr "Comentario del desajuste"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr "Tipo por defecto"
+
+#. module: account_voucher
+#: 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 "Entradas por extracto desde facturas"
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr "Entrada contable"
+
+#. module: account_voucher
+#: field:sale.receipt.report,state:0
+msgid "Voucher State"
+msgstr "Estado comprobante"
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr "Fecha efectiva para entradas contables."
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr "Mantener abierto"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"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_voucher
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
+msgstr "Importe base"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr "Estadísticas de recibos de ventas"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
+msgstr "Abrir balance"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
+msgstr "Total"
+
+#~ msgid "State :"
+#~ msgstr "Estado :"
+
+#~ msgid "Ref. :"
+#~ msgstr "Ref. :"
+
+#~ msgid "Real Entry"
+#~ msgstr "Entrada real"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Dated :"
+#~ msgstr "Fechado :"
+
+#~ msgid "Create"
+#~ msgstr "Crear"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Reference Type"
+#~ msgstr "Tipo de referencia"
+
+#~ 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 "Other Info"
+#~ msgstr "Otra información"
+
+#~ msgid "Ref."
+#~ msgstr "Ref."
+
+#~ msgid "Name"
+#~ msgstr "Nombre:"
+
+#~ msgid "Payment Vouchers"
+#~ msgstr "Comprobantes de pago"
+
+#~ msgid "Bank Receipts"
+#~ msgstr "Recibos bancarios"
+
+#~ msgid "Other Vouchers"
+#~ msgstr "Otros comprobantes"
+
+#~ msgid "Journal Sale Voucher"
+#~ msgstr "Comprobante de diario de ventas"
+
+#~ msgid "New Cash Receipt"
+#~ msgstr "Nuevo recibo de caja"
+
+#~ msgid "Receiver's Signature"
+#~ msgstr "Recibí"
+
+#~ msgid "Bank Payments"
+#~ msgstr "Pagos bancarios"
+
+#~ msgid "Contra Voucher"
+#~ msgstr "Contra comprobante"
+
+#~ msgid "Cash Receipt"
+#~ msgstr "Recibo de caja"
+
+#~ msgid "Vouchers"
+#~ msgstr "Comprobantes"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "New Cash Payment"
+#~ msgstr "Nuevo pago de caja"
+
+#~ msgid "New Bank Payment"
+#~ msgstr "Nuevo pago bancario"
+
+#~ msgid "Dr/Cr"
+#~ msgstr "Dr/Cr"
+
+#~ msgid "Voucher Line"
+#~ msgstr "Línea de comprobante"
+
+#~ msgid "Cash Receipts"
+#~ msgstr "Recibos de caja"
+
+#~ msgid "Narration"
+#~ msgstr "Notas"
+
+#~ msgid "New Bank Receipt"
+#~ msgstr "Nuevo recibo bancario"
+
+#~ msgid "Bank Payment Voucher"
+#~ msgstr "Comprobante de pago bancario"
+
+#~ msgid "Bank Receipt"
+#~ msgstr "Recibo bancario"
+
+#~ msgid "Journal Purchase Voucher"
+#~ msgstr "Comprobantes de diario de compras"
+
+#~ msgid "Voucher Reference"
+#~ msgstr "Referencia comprobante"
+
+#~ msgid "Cash Payment Voucher"
+#~ msgstr "Comprobante de pago en efectivo"
+
+#~ msgid "Voucher Report"
+#~ msgstr "Informe de comprobantes"
+
+#~ msgid "Closing Balance"
+#~ msgstr "Saldo de cierre"
+
+#~ msgid "No."
+#~ msgstr "Nº"
+
+#~ msgid "Opening Balance"
+#~ msgstr "Saldo de apertura"
+
+#~ msgid "Total Credit"
+#~ msgstr "Total crédito"
+
+#~ msgid "Total Debit"
+#~ msgstr "Total debe"
+
+#~ msgid "Optional Information"
+#~ msgstr "Información opcional"
+
+#~ msgid "General Information"
+#~ msgstr "Información general"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "Level"
+#~ msgstr "Nivel"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Entry Lines"
+#~ msgstr "Líneas de asiento"
+
+#~ msgid "Periods"
+#~ msgstr "Periodos"
+
+#~ msgid "Sub Currency"
+#~ msgstr "Sub moneda"
+
+#~ msgid "Cash Payments"
+#~ msgstr "Pagos en efectivo"
+
+#~ msgid "Opening Balance Entry"
+#~ msgstr "Saldo inicial de entrada"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "General Entries"
+#~ msgstr "Entradas generales"
+
+#~ msgid "Voucher Type"
+#~ msgstr "Tipo de comprobante"
+
+#~ msgid "Open a Voucher Entry"
+#~ msgstr "Abrir un comprobante"
+
+#~ msgid "Open Vouchers"
+#~ msgstr "Comprobantes abiertos"
+
+#~ msgid "Open Voucher Entries"
+#~ msgstr "Abrir comprobantes"
+
+#~ msgid "Account Entry Line"
+#~ msgstr "Apunte"
+
+#~ msgid "Journal Voucher"
+#~ msgstr "Diario de comprobantes"
+
+#~ msgid "Receipt Vouchers"
+#~ msgstr "Comprobantes de cobro"
+
+#~ msgid "Voucher Report (Cr/Dr)"
+#~ msgstr "Informe de comprobantes (Haber/Debe)"
+
+#~ msgid "Cash Receipt Voucher"
+#~ msgstr "Comprobante de cobro en efectivo"
+
+#~ msgid "Bank Receipt Voucher"
+#~ msgstr "Comprobante de cobro bancario"
+
+#~ msgid "Authorised Signatory"
+#~ msgstr "Firma autorizada"
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 7a51b1d1c11..61c8d4672d2 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Panga sissetulekuorder"
@@ -37,7 +37,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -69,7 +69,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -103,7 +103,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -407,7 +407,7 @@ msgid "Voucher Entries"
 msgstr "Tähiku kirjed"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -469,7 +469,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -528,6 +528,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Tähiku read"
@@ -712,7 +713,7 @@ msgid "Credit"
 msgstr "Krediit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1032,18 +1033,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "Loobu kassakviitungist"
-
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Postitatud kassakviitung"
-
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Kassakviitungi mustand"
-
-#~ msgid "Entry"
-#~ msgstr "Kirje"
-
 #~ msgid "Bank Receipts"
 #~ msgstr "Pangakviitungid"
 
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 2800194d47a..6e3b389e916 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Transactions non rapprochées"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustement"
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Regrouper par..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -97,7 +97,7 @@ msgid "Bill Payment"
 msgstr "Paiement de la note"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -415,7 +415,7 @@ msgid "Voucher Entries"
 msgstr "Saisie de pièces"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -443,7 +443,7 @@ msgid "Sales Receipt"
 msgstr "Reçu de ventes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Action incorrecte !"
@@ -477,7 +477,7 @@ msgid "Pay Invoice"
 msgstr "Payer la facture"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Aucun code comptable de base et aucun code comptable de taxe !"
@@ -538,6 +538,7 @@ msgstr "Décembre"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Lignes de Souches"
@@ -726,7 +727,7 @@ msgid "Credit"
 msgstr "Crédit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Veuillez définir une séquence pour ce journal !"
@@ -1175,28 +1176,3 @@ msgstr "Total"
 
 #~ msgid "Receiver's Signature"
 #~ msgstr "Signature du destinataire"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Total originel"
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "Impossible de créer une ligne d'écriture sur un compte clôturé"
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "montant non réconcilié"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "Vous ne pouvez pas créer de lignes d'écriture sur un compte client "
-#~ "débiteur/fournisseur créditeur sans partenaire"
-
-#~ msgid "Company must be same for its related account and period."
-#~ msgstr "La société doit être la même pour les comptes et périodes liées."
-
-#~ msgid "You can not create move line on view account."
-#~ msgstr ""
-#~ "Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"."
diff --git a/addons/account_voucher/i18n/gl.po b/addons/account_voucher/i18n/gl.po
index ba1e6a38d2b..b5035563149 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Transaccións non conciliadas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Desaxuste"
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Non se pode eliminar comprobante(s) que xa estean abertos ou pagos!"
@@ -93,7 +93,7 @@ msgid "Bill Payment"
 msgstr "Pagamento factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -412,7 +412,7 @@ msgid "Voucher Entries"
 msgstr "Comprobantes"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -440,7 +440,7 @@ msgid "Sales Receipt"
 msgstr "Recibo de vendas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Acción non válida!"
@@ -474,7 +474,7 @@ msgid "Pay Invoice"
 msgstr "Pagar factura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Non código base contable nin código imposto contable!"
@@ -533,6 +533,7 @@ msgstr "Decembro"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Liñas de comprobante"
@@ -721,7 +722,7 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Defina unha secuencia no diario!"
diff --git a/addons/account_voucher/i18n/hi.po b/addons/account_voucher/i18n/hi.po
index 2f01de213b5..d07028f054c 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "द्वारा वर्गीकृत करें"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "भुगतान किया हुआ या खुला वाउचर रद नही किया जा सकता"
@@ -89,7 +89,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -393,7 +393,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -514,6 +514,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -698,7 +699,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 4f44f2cc29f..3b1a5db220d 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-03-03 13:20+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Otvorena ili plaćena plaćanja se ne mogu brisati!"
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 9f0786733d1..4f3db71e0e3 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-31 11:11+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Párosítás visszavonása"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Különbözet leírása"
@@ -54,7 +55,7 @@ msgid "Group By..."
 msgstr "Csoportosítás"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Nyitott vagy rendezett nyugtá(ka)t nem lehet törölni!"
@@ -94,7 +95,7 @@ msgid "Bill Payment"
 msgstr "Számla kifizetése"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -410,7 +411,7 @@ msgid "Voucher Entries"
 msgstr "Nyugta tételek"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Hiba!"
@@ -438,7 +439,7 @@ msgid "Sales Receipt"
 msgstr "Nyugta"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Érvénytelen művelet!"
@@ -472,7 +473,7 @@ msgid "Pay Invoice"
 msgstr "Számla kifizetése"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Nincs adóalapgyűjtő kód és adógyűjtő kód!"
@@ -532,6 +533,7 @@ msgstr "December"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Nyugtasorok"
@@ -720,7 +722,7 @@ msgid "Credit"
 msgstr "Követel"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Kérem, határozza meg a sorszámozást a naplóra!"
@@ -1048,41 +1050,3 @@ msgstr "Nyitott egyenleg"
 #: field:account.voucher,amount:0
 msgid "Total"
 msgstr "Összesen"
-
-#~ msgid ""
-#~ "Account Voucher module includes all the basic requirements of\n"
-#~ "\"\n"
-#~ "\"    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
-#~ "etc...\n"
-#~ "\"\n"
-#~ "\"    * Voucher Entry\n"
-#~ "\"\n"
-#~ "\"    * Voucher Receipt\n"
-#~ "\"\n"
-#~ "\"    * Cheque Register\n"
-#~ "\"\n"
-#~ "\"    "
-#~ msgstr "Nyugta modul    "
-
-#~ msgid ""
-#~ " * The 'Draft' state is used when a user is encoding a new and unconfirmed "
-#~ "Voucher.                         \n"
-#~ "\"\n"
-#~ "\"* The 'Pro-forma' when voucher is in Pro-forma state,voucher does not have "
-#~ "an voucher number.                         \n"
-#~ "\"\n"
-#~ "\"* The 'Posted' state is used when user create voucher,a voucher number is "
-#~ "generated and voucher entries are created in account                         "
-#~ "\n"
-#~ "\"\n"
-#~ "\"* The 'Cancelled' state is used when user cancel voucher."
-#~ msgstr ""
-#~ " * 'Tervezet' állapotban van a nyugta, amikor a felhasználó berögzíti azt, "
-#~ "és még nem hagyja jóvá.\n"
-#~ "\"\n"
-#~ "\"* 'Pro forma' állapotban még nincs nyugtaszáma.\n"
-#~ "\"\n"
-#~ "\"* Amikor a felhasználó jóváhagyja a nyugtát, az nyugtaszámot kap, "
-#~ "létrejönnek a könyvelési tételei és 'Könyvelt' állapotba kerül.\n"
-#~ "\"\n"
-#~ "\"* 'Törölt' az állapot, ha a felhasználó törli a nyugtát."
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 368b016b779..525770ae51f 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1041,9 +1042,6 @@ msgstr ""
 #~ msgid "Other Vouchers"
 #~ msgstr "Voucer lain-lain"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Penerimaan Tunai terposting"
-
 #~ msgid "Cash Payments"
 #~ msgstr "Pembayaran Tunai"
 
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index d9817f7b23a..24aad084a9e 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: 2011-05-02 04:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Transazioni non riconciliate"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Storno"
@@ -30,17 +30,17 @@ msgstr "Storno"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr "Riferimento pagamento"
+msgstr "Pagamento rif."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr "Voci giornale aperte per cliente"
+msgstr "Voci sezionale aperte per cliente"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Voucher Date"
-msgstr ""
+msgstr "Data del voucher"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Raggruppa per..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Non è possibile eliminare voucher che sono già aperti o pagati!"
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr "Pagamento Importo"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -120,6 +120,11 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
+"Quando vengono venduti dei prodotti ad un cliente, è possibile emettere sia "
+"una ricevuta di pagamento che una fattura. Quando la ricevuta di pagamento è "
+"confermata, vengono creati automaticamente i movimenti sul sezionale ed è "
+"possibile registrare i pagamenti del cliente relativi alla ricevuta di "
+"pagamento."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -226,6 +231,10 @@ msgid ""
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
 msgstr ""
+"Gli incassi permettono di registrare i pagamenti ricevuti dai clienti. Per "
+"registrare un pagamento, è necessario selezionare il cliente, il metodo di "
+"pagamento (= il sezionale) e l'importo. OpenERP proporrà automaticamente la "
+"riconciliazione del pagamento con le fatture o le ricevute di vendita aperte."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -236,7 +245,7 @@ msgstr "Vendita"
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr "Voce registro"
+msgstr "Voce sezionale"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
@@ -285,7 +294,7 @@ msgstr "Voucher Fornitori"
 #: view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Annulla riconciliazione"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
@@ -326,7 +335,7 @@ msgstr "Importo pagato"
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr "Importo fatture"
+msgstr "Importa fatture"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -337,7 +346,7 @@ msgstr "Conto :"
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "Ricevuta"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -347,12 +356,12 @@ msgstr "Sul conto:"
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Importo storno"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Righe di vendita"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -386,16 +395,16 @@ msgstr "Tipo"
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "Rimuovere anche le registrazioni contabili?"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr "Movimenti contabili"
+msgstr "Registrazioni Voucher"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Errore!"
@@ -403,12 +412,12 @@ msgstr "Errore!"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr "Ricevuta contabile fornitore"
+msgstr "Voucher fornitore"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr "Movimenti contabili"
+msgstr "Registrazioni Voucher"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
@@ -423,7 +432,7 @@ msgid "Sales Receipt"
 msgstr "Ricevute di vendita"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Azione non valida!"
@@ -441,13 +450,13 @@ msgstr "Luglio"
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Annullamento riconciliazione"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Tempo medio dilazione"
 
 #. module: account_voucher
 #: view:account.invoice:0
@@ -457,10 +466,10 @@ msgid "Pay Invoice"
 msgstr "Paga fattura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "Mancano Codici di conto di mastro e Codici di conto imposta!"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
@@ -470,7 +479,7 @@ msgstr "Importo tasse"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr "Movimento contabile"
+msgstr "Registrazione voucher"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -484,14 +493,14 @@ msgstr "Partner"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Sbilancio 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 ""
+msgstr "L'importo del voucher deve essere uguale a quello sulla riga"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -516,9 +525,10 @@ msgstr "Dicembre"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr "Righe ricevuta contabile"
+msgstr "Righe voucher"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -535,13 +545,13 @@ msgstr "Valuta"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "Debiti/Crediti"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Salda successivamente o raggruppa pagamenti"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -553,7 +563,7 @@ msgstr "Commerciale"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Tempo medio di dilazione"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -578,7 +588,7 @@ msgstr "Valuta:"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Totale con imposte"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -598,6 +608,10 @@ msgid ""
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
 msgstr ""
+"Il modulo di pagamento fornitore permette di registrare il pagamento fatto "
+"ai fornitori. Quando viene selezionato un fornitore, il metodo di pagamento "
+"e l'ammontare, OpenERP proporrà di riconciliare il pagamento con le fatture "
+"o ricevute aperte del fornitore."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -612,12 +626,12 @@ msgstr "Giugno"
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Cr/Dr"
-msgstr ""
+msgstr "D/A"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
 msgid "Audit Complete ?"
-msgstr ""
+msgstr "Audit Completo?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -627,7 +641,7 @@ msgstr "Termini di pagamento"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record ?"
-msgstr ""
+msgstr "Annullare la conciliazione di questo record ?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
@@ -650,23 +664,23 @@ msgstr "Filtri estesi..."
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Number:"
-msgstr ""
+msgstr "Numero:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr "Importo riconcigliato"
+msgstr "Importo riconciliato"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Conto analitico degli storni"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "Salda direttamente"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -676,7 +690,7 @@ msgstr "Ottobre"
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "Pagamenti precedenti ?"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -687,7 +701,7 @@ msgstr "Gennaio"
 #: 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 "Movimenti contabili"
+msgstr "Vouchers"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -700,15 +714,15 @@ msgid "Credit"
 msgstr "Credito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr "Per favore definire una sequenza nel giornale!"
+msgstr "Per favore definire una sequenza nel sezionale!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Apri i movimenti del sezionale Acquisti"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -724,12 +738,12 @@ msgstr "Pagamenti Fornitori"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "Emetti"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "Fatture e transazioni in sospeso"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -754,12 +768,20 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" * Lo stato 'Bozza' è usato quanto un utente sta codificando un voucher "
+"nuovo e non confermato.                         \n"
+"* Lo stato 'Pro-forma' quando il Voucher è un Pro-forma (il voucher non ha "
+"un numero di registrazione).                         \n"
+"* Lo stato 'Emesso' è usato quando l'utente crea un voucher, viene generato "
+"un numero di voucher e i movimenti contabili sono creati nel conto           "
+"              \n"
+"* Lo stato 'Annullato' è usato quando l'utente annulla un pagamento."
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr "Ricevuta contabile"
+msgstr "Voucher contabile"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
@@ -769,7 +791,7 @@ msgstr "Numero"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Conto bancario"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -779,20 +801,20 @@ msgstr "Settembre"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "Informazioni vendite"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipt Analysis"
-msgstr ""
+msgstr "Analisi delle ricevute di vendita"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
-msgstr "Ricevuta contabile"
+msgstr "Voucher"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
@@ -802,7 +824,7 @@ msgstr "Fattura"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr "Voci della ricevuta contabile"
+msgstr "Voci del voucher"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -823,7 +845,7 @@ msgstr "Proforma"
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr "Voci registro"
+msgstr "Voci sezionale"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -842,7 +864,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "Paga"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -852,12 +874,12 @@ msgstr "Debito"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr "Volete confermare questo record?"
+msgstr "Confermare questo record?"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Riconcilia con storno"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -886,7 +908,7 @@ msgstr "Maggio"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,journal_id:0
 msgid "Journal"
-msgstr "Registro"
+msgstr "Sezionale"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -902,7 +924,7 @@ msgstr "Crediti"
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Original Amount"
-msgstr ""
+msgstr "Importo originario"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -942,12 +964,12 @@ msgstr "Febbraio"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Fatture e transazioni fornitori in sospeso"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Commento storno"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -973,7 +995,7 @@ msgstr "Registrazione Contabile"
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher State"
-msgstr ""
+msgstr "Stato del voucher"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
@@ -991,6 +1013,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Se viene stornata la riconciliazione è necessario verificare tutte le azioni "
+"collegate, in quanto non verranno disabilitate."
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
@@ -1000,19 +1024,19 @@ msgstr "Importo non tassato"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr ""
+msgstr "Statistiche Ricevute di vendita"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Residuo"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1217,22 +1241,3 @@ msgstr "Totale"
 
 #~ msgid "Contra Voucher"
 #~ msgstr "Ricevuta di deposito"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Pagamenti fornitori"
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Importo non riconcigliato"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Importo originale"
-
-#~ msgid "Journal:"
-#~ msgstr "Registro:"
-
-#~ msgid "Company must be same for its related account and period."
-#~ msgstr ""
-#~ "L'azienda deve essere la stessa per il periodo ed il conto ad essa correlato."
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "Non è possibile registrare movimenti su conti chiusi."
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 14fa9e40d16..767df707b61 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -89,7 +89,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -393,7 +393,7 @@ msgid "Voucher Entries"
 msgstr "전표 엔트리"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "무효한 액션!"
@@ -455,7 +455,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -514,6 +514,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "전표 라인"
@@ -698,7 +699,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1048,31 +1049,18 @@ msgstr ""
 #~ msgid "Receiver's Signature"
 #~ msgstr "영수인 서명"
 
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "프로포마 현금 영수증"
-
 #~ msgid "New Cash Receipt"
 #~ msgstr "새 현금 영수증"
 
 #~ msgid "Bank Payments"
 #~ msgstr "은행 결제"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr "이미 오픈되거나 결제된 인보이스는 삭제할 수 없습니다 !"
-
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "현금 영수증 취소"
-
 #~ msgid "Contra Voucher"
 #~ msgstr "반대 전표"
 
 #~ msgid "Real Entry"
 #~ msgstr "실제 엔트리"
 
-#~ msgid "Accounting - Voucher Management"
-#~ msgstr "회계 - 전표 관리"
-
 #~ msgid "Cash Receipt"
 #~ msgstr "현금 영수증"
 
@@ -1100,18 +1088,12 @@ msgstr ""
 #~ msgid "Voucher Line"
 #~ msgstr "전표 라인"
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "개시 밸런스의 차이"
-
 #~ msgid "Voucher Reference"
 #~ msgstr "전표 참조"
 
 #~ msgid "Cash Receipts"
 #~ msgstr "현금 영수증"
 
-#~ msgid "Entry"
-#~ msgstr "엔트리"
-
 #~ msgid "Receipt Vouchers"
 #~ msgstr "영수 전표"
 
@@ -1127,18 +1109,12 @@ msgstr ""
 #~ msgid "None"
 #~ msgstr "없음"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "기장된 현금 영수증"
-
 #~ msgid "No."
 #~ msgstr "번호"
 
 #~ msgid "New Bank Receipt"
 #~ msgstr "새 은행 영수증"
 
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "현금 영수증 초안"
-
 #~ msgid "Cash Payments"
 #~ msgstr "현금 결제"
 
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 14972333117..1e18401f296 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr "Kvito eilutės"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Kvito eilutės"
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr "Kreditas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/mn.po b/addons/account_voucher/i18n/mn.po
index add5c302c6b..5a1efbe49fb 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Тулгагдаагүй гүйлгээнүүд"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Зөрүү"
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "Бүлэглэх..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Нэгэнт нээсэн болон төлсөн ямар ч эрхийн бичгийг устгаж болохгүй !"
@@ -89,7 +89,7 @@ msgid "Bill Payment"
 msgstr "Төлбөр тооцоо"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -393,7 +393,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Алдаа !"
@@ -421,7 +421,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Алдаатай үйлдэл !"
@@ -455,7 +455,7 @@ msgid "Pay Invoice"
 msgstr "Төлбрийн нэхэмжлэл"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -514,6 +514,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -698,7 +699,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1017,18 +1018,3 @@ msgstr ""
 #: field:account.voucher,amount:0
 msgid "Total"
 msgstr ""
-
-#~ msgid "Originial Amount"
-#~ msgstr "Жинхэнэ дүн"
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "Хаагдсан дансан дээр шилжих мөр үүсгэж болохгүй."
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "Дансруу буруу кредит эсвэл дебит утга орсон байна !"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "Харилцагчгүйгээр хүлээн авах / төлбөрийн дансан дээр шилжих мөр үүсгэж "
-#~ "болохгүй."
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 37d1790c648..88141959b43 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Niet-afgeletterde transacties"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Boek af"
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Groepeer op.."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -98,7 +98,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -402,7 +402,7 @@ msgid "Voucher Entries"
 msgstr "Boekingen bonnen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Fout!"
@@ -430,7 +430,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Ongeldige actie!"
@@ -464,7 +464,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -523,6 +523,7 @@ msgstr "december"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Bonregels"
@@ -707,7 +708,7 @@ msgid "Credit"
 msgstr "Credit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1033,11 +1034,6 @@ msgstr "Totaal"
 #~ msgid "Other Info"
 #~ msgstr "Overige informatie"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr ""
-#~ "Facturen die geopend of al betaald zijn kunnen niet worden verwijderd!"
-
 #~ msgid "Cash Receipt"
 #~ msgstr "Kassabon"
 
@@ -1056,9 +1052,6 @@ msgstr "Totaal"
 #~ msgid "Name"
 #~ msgstr "Naam"
 
-#~ msgid "Entry"
-#~ msgstr "Boeking"
-
 #~ msgid "None"
 #~ msgstr "Geen"
 
@@ -1128,27 +1121,18 @@ msgstr "Totaal"
 #~ msgid "Authorised Signatory"
 #~ msgstr "Geautoriseerde ondertekening"
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Verschil in openingsbalans"
-
 #~ msgid "Journal Purchase Voucher"
 #~ msgstr "Inkoopdagboek bonnen"
 
 #~ msgid "Dr/Cr"
 #~ msgstr "Db/Cr"
 
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Concept kassabon"
-
 #~ msgid "Payment Vouchers"
 #~ msgstr "Betalingsbonnen"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor weergave!"
 
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "Pro forma ontvangstbewijs"
-
 #~ msgid "New Cash Receipt"
 #~ msgstr "Nieuw ontvangstbewijs"
 
@@ -1166,9 +1150,6 @@ msgstr "Totaal"
 #~ msgid "Reference Type"
 #~ msgstr "Soort referentie"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Geboekte kassabon"
-
 #~ msgid "New Bank Receipt"
 #~ msgstr "Nieuw bankafschrift"
 
@@ -1228,21 +1209,3 @@ msgstr "Totaal"
 
 #~ msgid "Cash Receipt Voucher"
 #~ msgstr "Contante ontvangstbon"
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "U kunt geen boekingsregel creëren op een gesloten rekening"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "U kunt geen boekingsregel creëren op een debiteuren/crediteuren account "
-#~ "zonder een relatie aan te geven."
-
-#~ msgid "Company must be same for its related account and period."
-#~ msgstr "Bedrijf moet hetzelfde zijn voor de betreffende account en periode."
-
-#~ msgid "You can not create move line on view account."
-#~ msgstr "U kunt geen boekingsregel creëren op een zichtaccount"
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "Verkeerde debet of credit waarde in boekingsregel!"
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index a8e3f225967..916913db1c2 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index 72b9f9ab481..38c04812b8b 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -89,7 +89,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -393,7 +393,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -514,6 +514,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -698,7 +699,7 @@ msgid "Credit"
 msgstr "Credit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 6dd4931ad8e..7a46a471ab3 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr "Płatność rachunku"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -397,7 +397,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Błąd !"
@@ -425,7 +425,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Niedozwolona akcja !"
@@ -459,7 +459,7 @@ msgid "Pay Invoice"
 msgstr "Zapłać fakturę"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Brak rejestru podstawy i rejestru podatku !"
@@ -518,6 +518,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Pozycje polecenia"
@@ -705,7 +706,7 @@ msgid "Credit"
 msgstr "Ma"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Zdefiniuj numerację dla dziennika !"
@@ -1134,23 +1135,3 @@ msgstr ""
 
 #~ msgid "Name"
 #~ msgstr "Nazwa"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Wartość oryginalna"
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "Nie możesz tworzyć zapisu dla zamkniętego konta."
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "Niepoprawna wartość Winien lub Ma w zapisie !"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "Nie możesz tworzyć zapisów bez partnera na kontach należności/płatności."
-
-#~ msgid "Company must be same for its related account and period."
-#~ msgstr "Firma musi odpowiednia do konta i okresu."
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Kowta nieuzgodniona"
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index e7bea1d85b8..b433c2f16ab 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Transações não reconciliadas"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr "Movimentos Voucher"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr "Recibo de venda"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação inválida!"
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr "Pagar fatura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Linhas Voucher"
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr "Crédito"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1026,12 +1027,6 @@ msgstr "Total"
 #~ msgid ":"
 #~ msgstr ":"
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Diferença do balaço inicial"
-
-#~ msgid "Entry"
-#~ msgstr "Entrada"
-
 #~ msgid "Dated :"
 #~ msgstr "Datado :"
 
@@ -1220,15 +1215,3 @@ msgstr "Total"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Recibo do Banco Voucher"
-
-#~ msgid "Journal:"
-#~ msgstr "Diário:"
-
-#~ msgid "Vendor"
-#~ msgstr "Vendedor"
-
-#~ msgid "Payment Option"
-#~ msgstr "Opção de pagamento"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Montante original"
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 28940ce2349..fe7583b034f 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/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: 2011-06-05 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index e8e47addc20..d8abb2c8c05 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr "Tranzacții necompensate"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr "Grupează după..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr "Înregistrări bonuri valorice"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Eroare !"
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Acţiune invalidă !"
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr "Plată factură"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr "Decembrie"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Înregistrări bonuri valorice"
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr "Credit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1040,9 +1041,6 @@ msgstr "Total"
 #~ msgid "Bank Receipts"
 #~ msgstr "Chitanţe bancare"
 
-#~ msgid "Pro-forma Cash Receipt"
-#~ msgstr "Proformă de încasare"
-
 #~ msgid "Journal Sale Voucher"
 #~ msgstr "Jurnal bonuri valorice de vânzare"
 
@@ -1058,13 +1056,6 @@ msgstr "Total"
 #~ msgid "Bank Payments"
 #~ msgstr "Plăţi bancare"
 
-#, python-format
-#~ msgid "Cannot delete invoice(s) which are already opened or paid !"
-#~ msgstr "Nu se pot şterge facturile deschise sau plătite !"
-
-#~ msgid "Cancel Cash Receipt"
-#~ msgstr "Anulare chitanţă numerar"
-
 #~ msgid "Real Entry"
 #~ msgstr "Înregistrare reală"
 
@@ -1074,9 +1065,6 @@ msgstr "Total"
 #~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
 #~ "special !"
 
-#~ msgid "Accounting - Voucher Management"
-#~ msgstr "Contabilitate - gestiune bonuri valorice"
-
 #~ msgid "Authorised Signatory"
 #~ msgstr "Semnatar autorizat"
 
@@ -1110,18 +1098,12 @@ msgstr "Total"
 #~ msgid "Receipt Vouchers"
 #~ msgstr "Chitanţă bonuri valorice"
 
-#~ msgid "Difference of Opening Bal."
-#~ msgstr "Diferenţă sold la deschidere"
-
 #~ msgid "Voucher Reference"
 #~ msgstr "Referinţă bon valoric"
 
 #~ msgid "Cash Receipts"
 #~ msgstr "Chitanţe numerar"
 
-#~ msgid "Entry"
-#~ msgstr "Înregistrare"
-
 #~ msgid "Narration"
 #~ msgstr "Explicaţie"
 
@@ -1131,15 +1113,9 @@ msgstr "Total"
 #~ msgid "None"
 #~ msgstr "Lipsă"
 
-#~ msgid "Posted Cash Receipt"
-#~ msgstr "Chitanţă numerar publicată"
-
 #~ msgid "New Bank Receipt"
 #~ msgstr "Chitanţă bancară nouă"
 
-#~ msgid "Draf Cash Receipt"
-#~ msgstr "Ciornă chitanţă numerar"
-
 #~ msgid "No."
 #~ msgstr "Nr."
 
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 9a7ef897117..4dfc807cd9d 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -13,16 +13,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr "Неподтвержденные транзакции"
+msgstr "Не сверенные транзакции"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -45,7 +45,7 @@ msgstr ""
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Particulars"
-msgstr ""
+msgstr "Детали"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -54,10 +54,10 @@ msgid "Group By..."
 msgstr "Группировать по ..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr ""
+msgstr "Нельзя удалить открытые или оплаченные ваучеры !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -67,7 +67,7 @@ msgstr "Поставщик"
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
 msgid "Voucher Print"
-msgstr ""
+msgstr "Печатать ваучер"
 
 #. module: account_voucher
 #: model:ir.module.module,description:account_voucher.module_meta_information
@@ -85,10 +85,10 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+msgstr "Оплата счетов"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -100,7 +100,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
-msgstr "Импорт записей"
+msgstr "Импорт проводок"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
@@ -110,7 +110,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -163,7 +163,7 @@ msgstr "Утвердить"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -186,7 +186,7 @@ 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
@@ -207,7 +207,7 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,date_due:0
 msgid "Due Date"
-msgstr "Срок"
+msgstr "Срок оплаты"
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
@@ -233,7 +233,7 @@ msgstr "Продажа"
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Элемент журнала"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
@@ -244,7 +244,7 @@ msgstr ""
 #: field:account.voucher.line,amount:0
 #: report:voucher.print:0
 msgid "Amount"
-msgstr "Количество"
+msgstr "Суммма"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -292,18 +292,18 @@ msgstr "Налог"
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Amount (in words) :"
-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
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "Счет аналитического учета"
+msgstr "Счет аналитики"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -328,7 +328,7 @@ msgstr "Импорт счетов"
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Account :"
-msgstr "Счет:"
+msgstr "Счет :"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -339,17 +339,17 @@ msgstr "Приход"
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "On Account of :"
-msgstr ""
+msgstr "По счету :"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Сумма списания"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Позиции продаж"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -389,10 +389,10 @@ msgstr "Хотите удалить проводки ?"
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr ""
+msgstr "Проводки ваучера"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Ошибка !"
@@ -405,12 +405,12 @@ msgstr "Ваучер поставщика"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "Проводки ваучеров"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "Памятка"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -420,10 +420,10 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
-msgstr "Invalid action !"
+msgstr "Неверное действие !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -433,7 +433,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr "Оплата счета"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -476,7 +476,7 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,partner_id:0
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Контрагент"
 
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
@@ -488,7 +488,7 @@ msgstr ""
 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
@@ -509,19 +509,20 @@ msgstr "Счета"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "December"
-msgstr ""
+msgstr "декабрём"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr ""
+msgstr "Позиции ваучера"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "&#1052;&#1077;&#1089;&#1103;&#1094;"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
@@ -532,7 +533,7 @@ msgstr "Валюта"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "Кредит и дебет"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -544,13 +545,13 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Менеджер продаж"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Средн. задержка платежа"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -575,7 +576,7 @@ msgstr "Валюта:"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "Всего с налогом"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -585,7 +586,7 @@ msgstr "Проформа"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -595,6 +596,9 @@ msgid ""
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
 msgstr ""
+"Форма \"Оплаты поставщикам\" позволяет отслеживать оплаты которые вы делаете "
+"вашим поставщикам. При выборе поставщика, способа оплаты и суммы для оплаты, "
+"OpenERP предложит связать ваш платеж с открытым счетом поставщика."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -604,7 +608,7 @@ msgstr "Общая сумма"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
@@ -624,7 +628,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
@@ -636,7 +640,7 @@ msgstr "Дата"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -657,18 +661,18 @@ 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
 msgid "Pay Directly"
-msgstr ""
+msgstr "Прямой платеж"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
@@ -678,13 +682,13 @@ msgstr "Предыдущие платежи ?"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "Журнал ваучеров"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -697,10 +701,10 @@ msgid "Credit"
 msgstr "Кредит"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "Пожалуйста, задайте нумерацию журнала !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -710,13 +714,13 @@ msgstr ""
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Through :"
-msgstr ""
+msgstr "Через :"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payment"
-msgstr ""
+msgstr "Оплаты поставщикам"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -726,13 +730,13 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "Счета и незавершенные операции"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Всего без налога"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -771,7 +775,7 @@ msgstr "Банковская выписка"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -834,7 +838,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
 #: view:account.voucher:0
@@ -849,12 +853,12 @@ msgstr "Дебет"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "Вы уверены, что подтверждаете эту записи ?"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Сверка со списанием"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -874,7 +878,7 @@ msgstr "Отменено"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
@@ -888,18 +892,18 @@ msgstr "Журнал"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+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
 #: report:voucher.print:0
@@ -934,27 +938,27 @@ msgstr "Заказчик"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Счета поставщиков и незавершенные операции"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Комментарий списания"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "Тип по умолчанию"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
@@ -975,12 +979,12 @@ 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
 msgid "Keep Open"
-msgstr ""
+msgstr "Оставить открытым"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -988,6 +992,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Если вы отменили сверку операций, вы должны также проверить все действия, "
+"которые связаны с этими операциями, потому что они не будут отключены."
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
@@ -1003,13 +1009,13 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Открытый баланс"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1092,32 +1098,5 @@ msgstr "Всего"
 #~ msgid "Name"
 #~ msgstr "Название"
 
-#~ msgid "Extended options..."
-#~ msgstr "Расширенные опции..."
-
 #~ msgid "Ref. :"
 #~ msgstr "Ссылка:"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Journal:"
-#~ msgstr "Журнал:"
-
-#~ msgid "Write-Off journal"
-#~ msgstr "Журнал списаний"
-
-#~ msgid "Comment"
-#~ msgstr "Комментарий"
-
-#~ msgid "Without Write-off"
-#~ msgstr "Без списания"
-
-#~ msgid "Writeoff Amount"
-#~ msgstr "Сумма списания"
-
-#~ msgid "With Write-off"
-#~ msgstr "Со списанием"
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index c13e38b8f65..68aec5dc433 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Nepravilno dejanje!"
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr "Zasluge"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1058,9 +1059,6 @@ msgstr ""
 #~ msgid "Name"
 #~ msgstr "Ime"
 
-#~ msgid "Entry"
-#~ msgstr "Vnos"
-
 #~ msgid "None"
 #~ msgstr "Brez"
 
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index 6ff532237f1..39c0ae2e2c5 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -89,7 +89,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -393,7 +393,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -514,6 +514,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -698,7 +699,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 2050087f138..02dd73406eb 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Neponistene transakcije"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "Grupirano po"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Ne mozes obrisati vaucer(e) koji su vec otvoreni ili placeni !"
@@ -95,7 +95,7 @@ msgid "Bill Payment"
 msgstr "Isplate racuna"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -399,7 +399,7 @@ msgid "Voucher Entries"
 msgstr "Sadrzaj Vaucera"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Greška !"
@@ -427,7 +427,7 @@ msgid "Sales Receipt"
 msgstr "Racun Prodaje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Neispravna akcija!"
@@ -461,7 +461,7 @@ msgid "Pay Invoice"
 msgstr "Racun"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Nema bazne postavke naloga kao ni poreza za isti."
@@ -520,6 +520,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Linije Vaucera"
@@ -704,7 +705,7 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Molim definisite sekvencu Knjige"
@@ -1089,36 +1090,12 @@ msgstr "Ukupno"
 #~ msgid "Payment Vouchers"
 #~ msgstr "Priznanice plaćanja"
 
-#~ msgid "Form view not available for Payment Lines"
-#~ msgstr "Pregled Forme nije dostupan za linije Placanja"
-
-#~ msgid "Originial Amount"
-#~ msgstr "Originalna Suma"
-
 #~ msgid "Authorised Signatory"
 #~ msgstr "Autorizovanj Potpis"
 
-#~ msgid "Vendor Payment"
-#~ msgstr "Placanja Proizvodjaca"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Stornirana Suma"
-
-#~ msgid "Vendor"
-#~ msgstr "proizvođač"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Extended options..."
-#~ msgstr "Dodatne Opcije"
-
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Otvori Dnevnik Proizvodjaca"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1126,20 +1103,3 @@ msgstr "Ukupno"
 
 #~ msgid "-"
 #~ msgstr "-"
-
-#, python-format
-#~ msgid "Please change partner and try again !"
-#~ msgstr "Molim p;romenite partnera i probajte ponovo !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
-#, python-format
-#~ msgid "Invalid Error !"
-#~ msgstr "Nedefinisana Greska !"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Proizvodjacevi racuni i neobradjene transakcije"
-
-#~ msgid "Journal:"
-#~ msgstr "Dnevnik:"
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index 170424e7314..0a1d9961f41 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Neponistene transakcije"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "Grupirano po"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Ne mozes obrisati vaucer(e) koji su vec otvoreni ili placeni !"
@@ -95,7 +95,7 @@ msgid "Bill Payment"
 msgstr "Isplate racuna"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -399,7 +399,7 @@ msgid "Voucher Entries"
 msgstr "Sadrzaj Vaucera"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Greška !"
@@ -427,7 +427,7 @@ msgid "Sales Receipt"
 msgstr "Racun Prodaje"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Neispravna akcija!"
@@ -461,7 +461,7 @@ msgid "Pay Invoice"
 msgstr "Racun"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Nema bazne postavke naloga kao ni poreza za isti."
@@ -520,6 +520,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Linije Vaucera"
@@ -704,7 +705,7 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Molim definisite sekvencu Knjige"
@@ -1026,70 +1027,29 @@ msgstr "Otvori Stanje"
 msgid "Total"
 msgstr "Ukupno"
 
-#~ msgid "Form view not available for Payment Lines"
-#~ msgstr "Pregled Forme nije dostupan za linije Placanja"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
 #~ msgid "Ref. :"
 #~ msgstr "Ref. :"
 
-#~ msgid "Originial Amount"
-#~ msgstr "Originalna Suma"
-
 #~ msgid "Receiver's Signature"
 #~ msgstr "Potpis Primaoca"
 
-#~ msgid "Journal:"
-#~ msgstr "Dnevnik:"
-
 #~ msgid "Authorised Signatory"
 #~ msgstr "Autorizovanj Potpis"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Vendor Payment"
-#~ msgstr "Placanja Proizvodjaca"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Stornirana Suma"
-
-#~ msgid "Vendor"
-#~ msgstr "proizvođač"
-
-#~ msgid "Extended options..."
-#~ msgstr "Dodatne Opcije"
-
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Otvori Dnevnik Proizvodjaca"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#, python-format
-#~ msgid "Please change partner and try again !"
-#~ msgstr "Molim p;romenite partnera i probajte ponovo !"
-
 #~ msgid "-"
 #~ msgstr "-"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
-#, python-format
-#~ msgid "Invalid Error !"
-#~ msgstr "Nedefinisana Greska !"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Proizvodjacevi racuni i neobradjene transakcije"
-
 #~ msgid "Journal Voucher"
 #~ msgstr "Nalog za knjiženje"
 
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 2f599829fe1..5c5ec3213be 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Icke avstämda transaktioner"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Avskrivning"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -40,7 +40,7 @@ msgstr "Öppna kundjournal transaktioner"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Voucher Date"
-msgstr ""
+msgstr "Verifikatdatum"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -51,10 +51,10 @@ msgstr "Uppgifter"
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Group By..."
-msgstr "Gruppera efter"
+msgstr "Gruppera på..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "Kan inte ta bort verifikation som redan är öppnade eller betalda !"
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr "Fakturabetalning"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -110,7 +110,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "March"
-msgstr ""
+msgstr "mars"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -127,7 +127,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay Bill"
-msgstr "Betala räkning"
+msgstr "Betala faktura"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -140,7 +140,7 @@ msgstr "Företag"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr "Sätt till utkast"
+msgstr "Sätt till preliminär"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
@@ -304,7 +304,7 @@ msgstr "Belopp (verbalt):"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "Antal verifikatrader"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -350,7 +350,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Avskrivet belopp"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -398,7 +398,7 @@ msgid "Voucher Entries"
 msgstr "Verifikattransaktioner"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Fel !"
@@ -426,7 +426,7 @@ msgid "Sales Receipt"
 msgstr "Försäljningskvitto"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Felaktig åtgärd!"
@@ -460,7 +460,7 @@ msgid "Pay Invoice"
 msgstr "Betala faktura"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Ingen kontokod och skattekod"
@@ -519,6 +519,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr "Verifikatstransaktioner"
@@ -703,7 +704,7 @@ msgid "Credit"
 msgstr "Kredit"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr "Definiera en sekvens för denna journal !"
@@ -1075,56 +1076,3 @@ msgstr "Total"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "Du kan inte skapa transaktioner för ett avslutat konto."
-
-#~ msgid "Originial Amount"
-#~ msgstr "Ursprungligt belopp"
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "Fel kredit- eller debitvärde i bokföringstransaktionerna."
-
-#~ msgid "Write-Off journal"
-#~ msgstr "Avskrivningsjournal"
-
-#~ msgid "Journal:"
-#~ msgstr "Journal:"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "Du kan inte skapa en transaktion på en ett konto utan en kund/leverantör"
-
-#~ msgid "Vendor Payment"
-#~ msgstr "Leverantörsbetalning"
-
-#~ msgid "Vendor"
-#~ msgstr "Leverantör"
-
-#~ msgid "Company must be same for its related account and period."
-#~ msgstr "Företaget måste vara samma för relaterat konto och period."
-
-#~ msgid "Without Write-off"
-#~ msgstr "Utan avskrivning"
-
-#~ msgid "Comment"
-#~ msgstr "Kommentar"
-
-#~ msgid "Open Vendor Journal Entries"
-#~ msgstr "Öppna leverantörjournalstransaktioner"
-
-#~ msgid "Vendor Invoices and Outstanding transactions"
-#~ msgstr "Leverantörsfakturor och utestående transaktioner"
-
-#~ msgid "Payment Option"
-#~ msgstr "Betalningsalternativ"
-
-#~ msgid "Writeoff Amount"
-#~ msgstr "Avskrivningsbelopp"
-
-#~ msgid "With Write-off"
-#~ msgstr "Med avskrivning"
-
-#~ msgid "You can not create move line on view account."
-#~ msgstr "Du kan inte skapa en transaktion för ett vykonto"
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index c0a9557a606..adc8ca60927 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 9e1e7c0e8cb..f717ccfa7cf 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: 2011-05-30 04:58+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -1202,14 +1202,3 @@ msgstr "Toplam"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Banka Tahsilat Fişi"
-
-#~ msgid "You can not create move line on closed account."
-#~ msgstr "Kapanmış bir hesap için hareket işlemleri yapılamaz."
-
-#~ msgid "Wrong credit or debit value in accounting entry !"
-#~ msgstr "Muhasebe hesabındaki borç / alacak değeri hatalı !"
-
-#~ msgid ""
-#~ "You can not create move line on receivable/payable account without partner"
-#~ msgstr ""
-#~ "Bir cari belirtmeden borç/alacak hesabı için hareket işlemi yapamazsınız."
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index fdb3fb2c8a6..4f5740cfdb0 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,7 +22,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -88,7 +88,7 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -392,7 +392,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -513,6 +513,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index 702125ffc6f..83b6059757e 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 01:47+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -23,7 +23,7 @@ msgid "Unreconciliation transactions"
 msgstr "Các giao dịch chưa đối soát"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, python-format
 msgid "Write-Off"
 msgstr "Miễn bỏ"
@@ -55,7 +55,7 @@ msgid "Group By..."
 msgstr "Nhóm theo..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -89,7 +89,7 @@ msgid "Bill Payment"
 msgstr "Thanh toán hóa đơn"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -329,7 +329,7 @@ msgstr ""
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Account :"
-msgstr "Số tiền :"
+msgstr "Tài khoản :"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -340,7 +340,7 @@ msgstr "Phiếu thu"
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "On Account of :"
-msgstr "Trên tài khoản của :"
+msgstr "Trên Tài khoản của :"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
@@ -393,7 +393,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr "Lỗi !"
@@ -421,7 +421,7 @@ msgid "Sales Receipt"
 msgstr "Phiếu thu bán hàng"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr "Hành động không hợp lệ !"
@@ -455,7 +455,7 @@ msgid "Pay Invoice"
 msgstr "Thanh toán hóa đơn"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -514,6 +514,7 @@ msgstr "Tháng Mười hai"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
 msgstr ""
@@ -674,7 +675,7 @@ msgstr "Tháng Mười"
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "Các thanh toán trước đây ?"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -698,7 +699,7 @@ msgid "Credit"
 msgstr "Bên có"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -1018,9 +1019,6 @@ msgstr "Số dư đầu"
 msgid "Total"
 msgstr "Tổng"
 
-#~ msgid "Unreconciled Amount"
-#~ msgstr "Giá trị chưa đối soát"
-
 #~ msgid ","
 #~ msgstr ","
 
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 99c07047976..ae2ee94ee48 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -8,39 +8,39 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-29 11:37+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "取消对账交易"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, 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
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "未对账客户凭证"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Voucher Date"
-msgstr ""
+msgstr "凭证日期"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -51,23 +51,23 @@ msgstr "细节"
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr ""
+msgstr "不能删除已经过账或对账的凭证"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier"
-msgstr ""
+msgstr "供应商"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
 msgid "Voucher Print"
-msgstr ""
+msgstr "手工凭证打印"
 
 #. module: account_voucher
 #: model:ir.module.module,description:account_voucher.module_meta_information
@@ -80,19 +80,24 @@ msgid ""
 "    * Cheque Register\n"
 "    "
 msgstr ""
+"会计凭证模块包括所有满足银行、现金、销售、采购、费用等凭证输入的需求。\n"
+"- 转账凭证\n"
+"- 收款凭证\n"
+"- 付款凭证\n"
+"    "
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, 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.statement.from.invoice.lines:0
@@ -100,17 +105,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
-msgstr ""
+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
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -119,12 +124,12 @@ 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
 msgid "Pay Bill"
-msgstr ""
+msgstr "付款"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -142,39 +147,39 @@ msgstr "设为草稿"
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
-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
 msgid "Voucher Statistics"
-msgstr ""
+msgstr "凭证统计"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "记账"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr ""
+msgstr "搜索手工凭证"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Purchase"
-msgstr ""
+msgstr "采购"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -186,12 +191,12 @@ 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
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
@@ -199,7 +204,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_voucher
 #: field:account.voucher,date_due:0
@@ -207,12 +212,12 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "到期日期"
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -222,23 +227,23 @@ 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
 msgid "Sale"
-msgstr ""
+msgstr "销售"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "会计凭证行"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "单号"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -249,45 +254,45 @@ msgstr "金额"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "付款选项"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "其它信息"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: selection:sale.receipt.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "付款日期"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "银行对账单明细"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Supplier Vouchers"
-msgstr ""
+msgstr "供应商手工凭证"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "未对账"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "税"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -298,32 +303,32 @@ msgstr "金额(口头上):"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "凭证明细"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "付款信息"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 msgid "Go"
-msgstr ""
+msgstr "转到"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "已付金额"
 
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "导入发票"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -334,7 +339,7 @@ msgstr "科目:"
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "收据"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -344,17 +349,17 @@ msgstr "在科目:"
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "补差金额"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "销售明细"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Date:"
-msgstr ""
+msgstr "日期:"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -372,7 +377,7 @@ msgstr "状态"
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
 msgid "Accounting Voucher Entries"
-msgstr "原始凭证记录"
+msgstr "手工凭证"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -383,91 +388,91 @@ msgstr "类型"
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "要删除会计凭证么？"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr "手工凭证记录"
+msgstr "手工凭证"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr ""
+msgstr "供应商手工凭证"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "凭证行"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "备注"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: 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:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "无效操作！"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "发票信息"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "取消对账"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "平均延误"
 
 #. module: account_voucher
 #: view:account.invoice:0
 #: code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "支付发票"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "没有科目和税码！"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "税额"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "凭证行"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -481,76 +486,77 @@ 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
 msgid "To Review"
-msgstr ""
+msgstr "待审查"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
-msgstr ""
+msgstr "费用明细"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "发票"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr "手工凭证行"
+msgstr "手工凭证明细"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
-msgstr "货币"
+msgstr "币别"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+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
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "业务员"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "延迟付款平均时间"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -564,18 +570,18 @@ msgstr "草稿"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "补差额科目"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
-msgstr ""
+msgstr "币别："
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "含税总计"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -585,7 +591,7 @@ msgstr "形式发票"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -594,37 +600,37 @@ 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:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "总金额"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Cr/Dr"
-msgstr ""
+msgstr "贷 / 借"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
 msgid "Audit Complete ?"
-msgstr ""
+msgstr "审计结束？"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr ""
+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
@@ -636,60 +642,60 @@ msgstr "日期"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Number:"
-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
 msgid "Pay Directly"
-msgstr ""
+msgstr "直接支付"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "预付款？"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "手工凭证账簿"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Compute Tax"
-msgstr ""
+msgstr "计算税"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -697,15 +703,15 @@ msgid "Credit"
 msgstr "贷方"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, 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
 #: report:voucher.print:0
@@ -716,28 +722,28 @@ msgstr "通过:"
 #: 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 "供应商付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "过账"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "发票和未付清的交易"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "不含税总金额"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "单据日期"
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -751,6 +757,10 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" 新建的凭证是草稿状态\n"
+"当凭证没有编号的时候是形式放票状态\n"
+"当凭证有了编号并生成了会计凭证时是已过帐状态\n"
+"当用户作废了凭证后是作废状态"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -766,24 +776,24 @@ 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
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "销售信息"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: 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
@@ -794,12 +804,12 @@ msgstr "手工凭证"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "凭证项"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -820,7 +830,7 @@ msgstr "形式发票"
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr ""
+msgstr "账簿明细"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -828,18 +838,18 @@ 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
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "在银行单据里导入发票"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "付款"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -849,17 +859,17 @@ msgstr "借方"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "你要确认这条纪录吗？"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "对账补差额"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "付款方式"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
@@ -874,7 +884,7 @@ msgstr "已取消"
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
@@ -883,28 +893,28 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,journal_id:0
 msgid "Journal"
-msgstr "业务类型"
+msgstr "账簿"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+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
 #: report:voucher.print:0
 msgid "State:"
-msgstr ""
+msgstr "状态："
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -915,7 +925,7 @@ msgstr ""
 #: field:sale.receipt.report,pay_now:0
 #: selection:sale.receipt.report,type:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -929,93 +939,93 @@ msgstr "已登账"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "客户"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "供应商发票和未付清的交易"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "补差额意见"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "默认类型"
 
 #. module: account_voucher
 #: 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:sale.receipt.report,state:0
 msgid "Voucher State"
-msgstr ""
+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
 msgid "Keep Open"
-msgstr ""
+msgstr "保持打开"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr ""
+msgstr "如果进行取消对账处理你必须检验处理的所有操作.因为他们不会被禁止."
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
-msgstr ""
+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
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "期初余额"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "总计"
 
 #~ msgid "State :"
 #~ msgstr "状态:"
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index f898bd18f2d..434c940df57 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -22,15 +22,15 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:242
+#: code:addons/account_voucher/account_voucher.py:247
 #, 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
@@ -40,7 +40,7 @@ msgstr ""
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Voucher Date"
-msgstr ""
+msgstr "換領券日期"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -51,10 +51,10 @@ msgstr ""
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分組根據..."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier"
-msgstr ""
+msgstr "供應商"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
@@ -85,10 +85,10 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+msgstr "賬單付款"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -100,7 +100,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
-msgstr ""
+msgstr "匯入項目"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
@@ -110,7 +110,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -124,7 +124,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay Bill"
-msgstr ""
+msgstr "付賬"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -132,17 +132,17 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "設為草稿"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
-msgstr ""
+msgstr "交易參考號碼。"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
@@ -152,36 +152,36 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Statistics"
-msgstr ""
+msgstr "換領券統計"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "驗證"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr ""
+msgstr "搜尋換領券"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Purchase"
-msgstr ""
+msgstr "購買"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
 #: field:account.voucher.line,account_id:0
 #: field:sale.receipt.report,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "帳號"
 
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
@@ -207,12 +207,12 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "到期日"
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -228,7 +228,7 @@ msgstr ""
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Sale"
-msgstr ""
+msgstr "減價"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -238,34 +238,34 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "參考編號"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
 #: report:voucher.print:0
 msgid "Amount"
-msgstr ""
+msgstr "總額"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "付款選項"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "其他資訊"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: selection:sale.receipt.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "取消"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "日期付款"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -276,7 +276,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 "Supplier Vouchers"
-msgstr ""
+msgstr "供應商換領券"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -287,12 +287,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "稅"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "繙額（以文字表示） :"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -308,33 +308,33 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "付款資料"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 msgid "Go"
-msgstr ""
+msgstr "前往"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "已付金額"
 
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "匯入發票"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Account :"
-msgstr ""
+msgstr "總額 :"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: selection:sale.receipt.report,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "收據"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -344,17 +344,17 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "注銷總額"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "銷售明細"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Date:"
-msgstr ""
+msgstr "日期:"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -378,7 +378,7 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,type:0
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
@@ -389,10 +389,10 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr ""
+msgstr "換領券項目"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -400,27 +400,27 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr ""
+msgstr "供應商換領券"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "換領券項目"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "備忘錄"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: 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:591
+#: code:addons/account_voucher/account_voucher.py:596
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -428,12 +428,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "賬單資料"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -444,17 +444,17 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "平均到期延誤"
 
 #. module: account_voucher
 #: view:account.invoice:0
 #: code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "付發票"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:741
+#: code:addons/account_voucher/account_voucher.py:746
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -462,12 +462,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "稅金總額"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "換領券項目"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -476,7 +476,7 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "伙伴"
 
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
@@ -498,36 +498,37 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
-msgstr ""
+msgstr "支出明細"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "發票"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr ""
+msgstr "換領券明細"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "貨幣"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -544,13 +545,13 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "業務員"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "平均付款延誤"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -559,23 +560,23 @@ msgstr ""
 #: selection:sale.receipt.report,state:0
 #: report:voucher.print:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "注銷帳號"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
-msgstr ""
+msgstr "貨幣:"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "連稅總額"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -585,7 +586,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -599,12 +600,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "總額"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
@@ -614,12 +615,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,audit:0
 msgid "Audit Complete ?"
-msgstr ""
+msgstr "審計已完成 ?"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "付款條件"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -631,12 +632,12 @@ msgstr ""
 #: field:account.voucher.line,date_original:0
 #: field:sale.receipt.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -647,7 +648,7 @@ msgstr ""
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Number:"
-msgstr ""
+msgstr "編號:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@@ -663,12 +664,12 @@ msgstr ""
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "直接付款"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
@@ -678,7 +679,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
@@ -689,7 +690,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Compute Tax"
-msgstr ""
+msgstr "計算稅項"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -697,7 +698,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:640
+#: code:addons/account_voucher/account_voucher.py:645
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
@@ -710,13 +711,13 @@ msgstr ""
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Through :"
-msgstr ""
+msgstr "透過:"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payment"
-msgstr ""
+msgstr "供應商付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -726,18 +727,18 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "發票及未完成交易"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "不連稅總額"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "賬單日期"
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -761,7 +762,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr ""
+msgstr "編號"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
@@ -771,35 +772,35 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "銷售資料"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: 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
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
-msgstr ""
+msgstr "換領券"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "發票"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "換領券項目"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -807,7 +808,7 @@ msgstr ""
 #: view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -828,7 +829,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
@@ -839,7 +840,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "付款"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -859,22 +860,22 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "付款方法"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Canceled"
-msgstr ""
+msgstr "取消"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
@@ -888,7 +889,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "內部備註"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -899,7 +900,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Original Amount"
-msgstr ""
+msgstr "原總額"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -915,7 +916,7 @@ msgstr ""
 #: field:sale.receipt.report,pay_now:0
 #: selection:sale.receipt.report,type:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -929,32 +930,32 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "客戶"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "供應商發票及未完成交易"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "注銷評語"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "預設類型"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
@@ -970,7 +971,7 @@ msgstr ""
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher State"
-msgstr ""
+msgstr "換領券狀態"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
@@ -980,7 +981,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "保持開啟"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -992,18 +993,18 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
-msgstr ""
+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
 msgid "Year"
-msgstr ""
+msgstr "年份"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1015,4 +1016,4 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "總計"
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 0230cac1009..b108bc14fe3 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -45,10 +45,11 @@ class invoice(osv.osv):
                 'close_after_process': True,
                 'invoice_type':inv.type,
                 'invoice_id':inv.id,
-                'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
+                '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()
 
-# 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_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
index 06511c9a118..b31dedc8aa1 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt.py
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -73,7 +73,7 @@ class sale_receipt_report(osv.osv):
                     to_char(av.date, 'MM') as month,
                     to_char(av.date, 'YYYY-MM-DD') as day,
                     av.partner_id as partner_id,
-                    av.currency_id as currency_id,
+                    aj.currency as currency_id,
                     av.journal_id as journal_id,
                     rp.user_id as user_id,
                     av.company_id as company_id,
@@ -111,7 +111,7 @@ class sale_receipt_report(osv.osv):
                     to_char(av.date, 'MM'),
                     to_char(av.date, 'YYYY-MM-DD'),
                     av.partner_id,
-                    av.currency_id,
+                    aj.currency,
                     av.journal_id,
                     rp.user_id,
                     av.company_id,
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 ad32978ddd8..3acf522cb66 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -7,7 +7,7 @@
         <field name="model">sale.receipt.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('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')"  string="Sales Receipt Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -48,7 +48,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
-              <group col="10" colspan="12">
+              <group>
+                    <filter icon="terp-go-year" string="Year" 
+                            name="year"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="year"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="Month"
+                            name="month"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="current month"/>
+                    <filter icon="terp-go-month" string="Month-1"
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="last month"/>
+                    <separator orientation="vertical"/>              	
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -64,7 +77,6 @@
                            help = "Validated Vouchers"/>
                    <separator orientation="vertical"/>
                    <field name="partner_id"/>
-                   <field name="date" string="Voucher Date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -103,7 +115,7 @@
         <field name="res_model">sale.receipt.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_sale_receipt_report_search"/>
         <field name="help">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.</field>
 
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index ce34733dda7..33ae609e3f3 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -48,7 +48,7 @@
 -
   Now I create a Vendor Voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0, view: False}:
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index 39e9c2144a2..b41c33e4470 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -4,7 +4,6 @@
   !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
     account_id: account.cash
     company_id: base.main_company
-    currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher Axelor
     narration: Basic PC
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
new file mode 100644
index 00000000000..e19e7e3ee46
--- /dev/null
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -0,0 +1,344 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create 2 Invoices in USD and make 2 Payments in USD based on the currency rating on that particular date
+-
+  I create currency USD in OpenERP for January of 1.333333 Rate
+-
+  !python {model: res.currency.rate}: |
+    from datetime import datetime
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    date = '%s-01-01' %(datetime.now().year)
+    ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)])
+    self.write(cr, uid, ids, {'rate': 1.333333})
+-
+  I create currency USD in OpenERP for February of 1.250000 Rate
+-
+  !record {model: res.currency.rate, id: feb_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-02-01' %(datetime.now().year)"
+    rate: 1.250000
+
+-
+  I create currency USD in OpenERP for March of 1.111111 Rate
+-
+  !record {model: res.currency.rate, id: mar_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-03-01' %(datetime.now().year)"
+    rate: 1.111111
+
+-
+  I create currency USD in OpenERP for April of 1.052632 Rate
+-
+  !record {model: res.currency.rate, id: apr_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-04-01' %(datetime.now().year)"
+    rate: 1.052632
+
+-
+  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.account_type_cash_moves"
+
+-
+  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 create the first invoice on 1st January  for 200 USD
+-
+  !record {model: account.invoice, id: account_invoice_jan}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 200.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_jan}
+-
+  I check that first invoice move is correct for debtor account (debit - credit == 150.0)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_jan"))
+    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 == 150.0), "Invoice move is not correct for debtors account"
+-
+  I create the second invoice on 1st February for 100 USD
+-
+  !record {model: account.invoice, id: account_invoice_feb}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+    period_id: account.period_2
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 100.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_feb}
+-
+  I check that second invoice move is correct for debtor account (debit - credit == 80)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_feb"))
+    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 == 80), "Invoice move is not correct for debtors account"
+
+-
+  I create the first voucher of payment
+  <create with values 240 USD, journal USD, and fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 240.00, 2, ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 240.00,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.USD'),
+        'journal_id': ref('bank_journal_USD'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-%m-%d"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'First payment: Case 1 USD/USD',
+    }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.USD'), 240)['value'])
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 200.00:
+            item['amount'] = 180.00
+        else:
+            item['amount'] = 70.00
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is 10.0
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.writeoff_amount == 10.0), "Writeoff amount is not 10.0"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my first voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with -180 and -70 as amount_currency columns and that their credit columns are respectively 162 and 63
+-
+  I check that my write-off is correct. 9 debit and 10 amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -180.00:
+            assert move_line.credit == 162.00, "Debtor account has wrong entry."
+        elif move_line.amount_currency == -70.00:
+            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."
+-
+  I check the residual amount of Invoice1, should be 20 in amount_currency
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_jan"))
+    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 == 20.0) , "Residual amount is not correct for first Invoice"
+-
+  I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_feb"))
+    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 == 30.0) , "Residual amount is not correct for first Invoice"
+-
+  I create the second voucher of payment
+  <create with values 45 USD, journal USD, and fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
+  
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 45.00, 2, ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 45.00,
+        'exchange_acc_id': ref('account.o_expense'),
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.USD'),
+        'journal_id': ref('bank_journal_USD'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-%m-%d"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'Second payment: Case 1',
+    }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 20.00:
+            item['amount'] = 20.00
+        else:
+            item['amount'] = 30.00
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is 5.0
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.writeoff_amount == 5.0), "Writeoff amount is not 5.0"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my second voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with -20 and -30 as amount_currency columns and their credit columns are respectively 19 and 28.5
+-
+  I check that my currency rate difference is correct. 8.5 in credit with no amount_currency
+-
+  I  check that the total reconcilation created entries as expected
+-
+  I check that my writeoff is correct. 4.75 debit and 5 amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    reconcile_a = reconcile_b = False
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -20.00:
+            assert move_line.reconcile_id.id, "The invoice of 200$ is not fully reconciled"
+            reconcile_b = move_line.reconcile_id.id
+        elif move_line.amount_currency == -30.00:
+            assert move_line.reconcile_id.id, "The invoice of 100$ is not fully reconciled"
+            reconcile_a = move_line.reconcile_id.id
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -20.00:
+            assert move_line.credit == 19.00, "Debtor account has wrong entry."
+        elif move_line.amount_currency == -30.00:
+            assert move_line.credit == 28.50, "Debtor account has wrong entry."
+        elif move_line.amount_currency == 5.00:
+            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.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"
+-
+  I check the residual amount of Invoice1, 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_invoice_jan"))
+    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 first Invoice"
+-
+  I check the residual amuont of Invoice2, 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_invoice_feb"))
+    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 second Invoice"
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
new file mode 100644
index 00000000000..23f11d28803
--- /dev/null
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -0,0 +1,317 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+-
+  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
+    currency: base.EUR
+    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
+    default_credit_account_id: account.cash
+    currency: base.USD
+    company_id: base.main_company
+    view_id: account.account_journal_bank_view
+-
+  I create the first invoice on 1st January for 200 USD
+-
+  !record {model: account.invoice, id: account_first_invoice_jan_suppl}:
+    account_id: account.a_pay
+    type : in_invoice
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PC1] Basic PC'
+        price_unit: 200.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+    check_total : 200
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan_suppl}
+-
+  I check that first invoice move is correct for debtor account(debit - credit == -150)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_suppl"))
+    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 == -150.00), "Invoice move is incorrect for debtors account"
+-
+  I create the second invoice on 1st February for 100 USD
+-
+  !record {model: account.invoice, id: account_second_invoice_feb_suppl}:
+    account_id: account.a_pay
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+    period_id: account.period_2
+    type : in_invoice
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PC1] Basic PC'
+        price_unit: 100.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+    check_total : 100.0
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_second_invoice_feb_suppl}
+-
+  I check that second invoice move is correct for debtor account (debit - credit == -80)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_suppl"))
+    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 == -80), "Invoice move is incorrect for debtors account"
+-
+  I create the first voucher of payment
+  <create with values 240 EUR, journal EUR, and fills amount 180 for the invoice of 200$ and 70 for the invoice of 100$>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 240.0, 2, ttype='payment', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 240.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.EUR'),
+        'journal_id': ref('bank_journal_EUR'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'payment',
+        'date': time.strftime("%Y-03-01"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'First payment: Case 2 SUPPL USD/EUR',
+    }
+    if not res['value']['line_dr_ids']:
+      res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
+    for item in res['value']['line_dr_ids']:
+        if item['amount_unreconciled'] == 200.00:
+            item['amount'] = 180.00
+        else:
+            item['amount'] = 70.00
+    vals['line_dr_ids'] = [(0,0,i) for i in res['value']['line_dr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is -15.0
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.writeoff_amount == -15.0), "Writeoff amount is not -15.0"
+-
+  I check that currency rate difference is 34.0
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.currency_rate_difference == 34.0), "Currency rate difference is not 34.0"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my creditor account is correct
+-
+  I check that the creditor account has 2 new lines with 180 and 70 in amount_currency columns and their debit columns are respectively 135 and 56 and currency is USD($).
+-
+  I check that my currency rate difference is correct. -34 in credit with no amount_currency
+-
+  I check that my writeoff is correct. -15 in credit with no amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == 180.00:
+            assert move_line.debit == 135.00, "Creditor account has wrong entry."
+        elif move_line.amount_currency == 70.00:
+            assert move_line.debit == 56.00, "Debtor account has wrong entry."
+        elif move_line.debit == 34.00:
+            assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
+        elif move_line.debit == 15.00:
+            assert move_line.amount_currency == 0.00, "Writeoff amount is wrong."
+-
+  I check the residual amount of Invoice1, should be 20 in residual currency and 15 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_suppl"))
+    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 == 20.0 and move_line.amount_residual == 15) , "Residual amount is not correct for first Invoice"
+-    
+  I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
+-
+   !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_suppl"))
+    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 == 30 and move_line.amount_residual == 24) , "Residual amount is not correct for second Invoice"
+-  
+  I create the second voucher of payment
+  <create with values 45 USD, journal USD, and fill amounts 20 for the invoice of 200$ and 30 for the invoice of 100$>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 45.0, 2, ttype='payment', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 45.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.USD'),
+        'journal_id': ref('bank_journal_USD'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'payment',
+        'date': time.strftime("%Y-%m-%d"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'Second payment: Case 2 SUPPL USD/EUR',
+    }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
+    if not res['value']['line_dr_ids']:
+      res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
+    for item in res['value']['line_dr_ids']:
+        if item['amount_unreconciled'] == 20.00:
+            item['amount'] = 20.00
+        else:
+            item['amount'] = 30.00
+    vals['line_dr_ids'] = [(0,0,i) for i in res['value']['line_dr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is -5.0
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.writeoff_amount == 5.0), "Writeoff amount is not 5.0"
+-
+  I check that currency rate difference is 8.50
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.currency_rate_difference == 8.50), "Currency rate difference is not 8.50"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that my voucher state is posted
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert voucher_id.state == 'posted', "Voucher state is not posted"
+-
+  I check that my creditor account is correct
+-
+  I check that the creditor account has 2 new lines with 20 and 30 in amount_currency columns and their debit columns are respectively 15 and 24 and currency is USD($).
+-
+  I check that my currency rate difference is correct. 8.50 in debit with no amount_currency
+-
+  I check that my writeoff is correct. 4.75 in credit and 5 in amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == 20.00:
+            assert move_line.debit == 15.00, "Debtor account has wrong entry."
+        elif move_line.amount_currency == 30.00:
+            assert move_line.debit == 24.00, "Debtor account has wrong entry."
+        elif move_line.debit == 8.50:
+            assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
+        elif move_line.amount_currency == -5.00:
+            assert move_line.credit == 4.75, "Writeoff amount is wrong."
+-
+  I check the residual amount of invoice 1, 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_first_invoice_jan_suppl"))
+    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 first Invoice"
+-    
+  I check the residual amount of invoice 2, 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_second_invoice_feb_suppl"))
+    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 second Invoice"
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
new file mode 100644
index 00000000000..67287591778
--- /dev/null
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -0,0 +1,328 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+-
+  I modify the debtor account in order to make sure there is no currency_id linked
+-
+  !python {model: account.account}: |
+    from datetime import datetime
+    ids = self.search(cr, uid, [('name', 'ilike', 'debtor')])
+    self.write(cr, uid, ids, {'currency_id': False})
+-
+  I create currency USD in OpenERP for January of 1.333333 Rate
+-
+  !python {model: res.currency.rate}: |
+    from datetime import datetime
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    date = '%s-01-01' %(datetime.now().year)
+    ids = self.search(cr, uid, [('currency_id', '=', curr_id), ('name', '=', date)])
+    self.write(cr, uid, ids, {'rate': 1.333333})
+-
+  I create currency USD in OpenERP for February of 1.250000 Rate
+-
+  !record {model: res.currency.rate, id: febr_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-02-01' %(datetime.now().year)"
+    rate: 1.250000
+-
+  I create currency USD in OpenERP for March of 1.111111 Rate
+-
+  !record {model: res.currency.rate, id: marc_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-03-01' %(datetime.now().year)"
+    rate: 1.111111
+-
+  I create currency USD in OpenERP for April of 1.052632 Rate
+-
+  !record {model: res.currency.rate, id: apri_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-04-01' %(datetime.now().year)"
+    rate: 1.052632
+-
+  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 create the first invoice on 1st January for 200 USD
+-
+  !record {model: account.invoice, id: account_first_invoice_jan}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 200.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan}
+-
+  I check that first invoice move is correct for debtor account(debit - credit == 150)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan"))
+    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 == 150.00), "Invoice move is incorrect for debtors account"
+-
+  I create the second invoice on 1st February for 100 USD
+-
+  !record {model: account.invoice, id: account_second_invoice_feb}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+    period_id: account.period_2
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 100.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_second_invoice_feb}
+-
+  I check that second invoice move is correct for debtor account (debit - credit == 80)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb"))
+    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 == 80), "Invoice move is incorrect for debtors account"
+-
+  I create the first voucher of payment
+  <create with values 200 EUR, journal EUR, and fills amount 130 EUR for the invoice of 200 USD and 70 EUR for the invoice of 100 USD>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 240.0, False, ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 200.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': False,
+        'journal_id': ref('bank_journal_EUR'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-03-01"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'First payment: Case 2 USD/EUR DR EUR',
+    }
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 150.00:
+            item['amount'] = 130.00
+        else:
+            item['amount'] = 70.00
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with 0 in amount_currency columns and their credit columns are 130 and 70
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.amount_currency == 0.00, "A line has the 'amount_currency' column filled"
+-
+  I check the residual amount of Invoice1, should be 55.56 in residual currency and 20 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan"))
+    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 == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
+-
+  I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
+-
+   !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb"))
+    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 == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
+-  
+  I create the second voucher of payment
+  <create with values 80 USD, journal USD, and fully reconcile the 2 invoices>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 80.0, 2, ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 80.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.USD'),
+        'journal_id': ref('bank_journal_USD'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-%m-%d"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'exchange_acc_id': ref('account.o_expense'),
+        'comment': 'Write Off',
+        'name': 'Second payment: Case 2 SUPPL USD/EUR DR EUR',
+    }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 55.56:
+            item['amount'] = 55.56
+        else:
+            item['amount'] = 22.22
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is 2.22
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (round(voucher_id.writeoff_amount, 2) == 2.22), "Writeoff amount is not 2.22$"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that my voucher state is posted
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert voucher_id.state == 'posted', "Voucher state is not posted"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with -55.56 and -22.22 in amount_currency columns and their credit columns are respectively 52.78 and 21.11 and currency is USD($).
+-
+  I check that my currency rate difference is correct.
+-
+  I check that my writeoff is correct. 2.11 in credit and 2.22 in amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    reconcile_a = reconcile_b = False
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -22.22:
+            assert move_line.reconcile_id.id, "The invoice of 200$ is not fully reconciled"
+            reconcile_b = move_line.reconcile_id.id
+        elif move_line.amount_currency == -55.56:
+            assert move_line.reconcile_id.id, "The invoice of 100$ is not fully reconciled"
+            reconcile_a = move_line.reconcile_id.id
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -55.56:
+            assert move_line.credit == 52.78, "Debtor account has wrong entry."
+        elif move_line.amount_currency == -22.22:
+            assert move_line.credit == 21.11, "Debtor account has wrong entry."
+        elif move_line.credit == 11.11 and move_line.account_id.reconcile:
+            assert move_line.amount_currency == 0.00 and move_line.reconcile_id.id == reconcile_b, "Incorrect Currency Difference."
+        elif move_line.credit == 32.78 and move_line.account_id.reconcile:
+            assert move_line.amount_currency == 0.00 and move_line.reconcile_id.id == reconcile_a, "Incorrect Currency Difference."
+        elif move_line.amount_currency == 2.22:
+            assert move_line.credit == 2.11, "Writeoff amount is wrong."
+-
+  I check the residual amount of invoice 1, 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_first_invoice_jan"))
+    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 first Invoice"
+-    
+  I check the residual amuont of invoice 2, 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_second_invoice_feb"))
+    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 second Invoice"
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
new file mode 100644
index 00000000000..ec4d653c8ab
--- /dev/null
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -0,0 +1,331 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+-
+  I modify the debtor account in order to set the currency_id = USD
+-
+  !python {model: account.account}: |
+    from datetime import datetime
+    ids = self.search(cr, uid, [('name', 'ilike', 'debtor')])
+    self.write(cr, uid, ids, {'currency_id': ref('base.USD')})
+-
+  I create currency USD in OpenERP for January of 1.333333 Rate
+-
+  !python {model: res.currency.rate}: |
+    from datetime import datetime
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    date = '%s-01-01' %(datetime.now().year)
+    ids = self.search(cr, uid, [('currency_id', '=', curr_id), ('name', '=', date)])
+    self.write(cr, uid, ids, {'rate': 1.333333})
+-
+  I create currency USD in OpenERP for February of 1.250000 Rate
+-
+  !record {model: res.currency.rate, id: febr_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-02-01' %(datetime.now().year)"
+    rate: 1.250000
+-
+  I create currency USD in OpenERP for March of 1.111111 Rate
+-
+  !record {model: res.currency.rate, id: marc_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-03-01' %(datetime.now().year)"
+    rate: 1.111111
+-
+  I create currency USD in OpenERP for April of 1.052632 Rate
+-
+  !record {model: res.currency.rate, id: apri_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-04-01' %(datetime.now().year)"
+    rate: 1.052632
+-
+  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 create the first invoice on 1st January for 200 USD
+-
+  !record {model: account.invoice, id: account_first_invoice_jan_michal}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 200.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan_michal}
+-
+  I check that first invoice move is correct for debtor account(debit - credit == 150)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_michal"))
+    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 == 150.00), "Invoice move is incorrect for debtors account"
+-
+  I create the second invoice on 1st February for 100 USD
+-
+  !record {model: account.invoice, id: account_second_invoice_feb_michal}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+    period_id: account.period_2
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 100.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_second_invoice_feb_michal}
+-
+  I check that second invoice move is correct for debtor account (debit - credit == 80)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))
+    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 == 80), "Invoice move is incorrect for debtors account"
+-
+  I create the first voucher of payment
+  <create with values 200 EUR (€), journal EUR, and fills amount 130€ for the invoice of 200$ and 70€ for the invoice of 100$>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 200.0, False, ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 200.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.EUR'),
+        'journal_id': ref('bank_journal_EUR'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-03-01"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'First payment: Case 2 USD/EUR DR USD',
+    }
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 150.00:
+            item['amount'] = 130.00
+        else:
+            item['amount'] = 70.00
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with 144.44 and 77.78 in amount_currency columns and their credit columns are 130 and 70
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.credit == 70.0:
+            assert move_line.amount_currency == -77.78, "Wrong debtor entry"
+        if move_line.credit == 130.0:
+            assert move_line.amount_currency == -144.44, "Wrong debtor entry"
+-
+  I check the residual amount of Invoice1, should be 55.56 in residual currency and 20 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_michal"))
+    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 == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
+-    toto
+  I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
+-
+   !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))
+    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 == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
+-  
+  I create the second voucher of payment
+  <create with values 80 USD, journal USD, and fully reconcile the 2 invoices>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_USD'), 80.0, ref('base.USD'), ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 80.0,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.USD'),
+        'journal_id': ref('bank_journal_USD'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-%m-%d"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'exchange_acc_id': ref('account.o_expense'),
+        'comment': 'Write Off',
+        'name': 'Second payment: Case 2 SUPPL USD/EUR DR USD',
+    }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 55.56:
+            item['amount'] = 55.56
+        else:
+            item['amount'] = 22.22
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is 2.22
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (round(voucher_id.writeoff_amount, 2) == 2.22), "Writeoff amount is not 2.22$"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that my voucher state is posted
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert voucher_id.state == 'posted', "Voucher state is not posted"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with -55.56 and -22.22 in amount_currency columns and their credit columns are respectively 52.78 and 21.11 and currency is USD($).
+-
+  I check that my currency rate difference is correct.
+-
+  I check that my writeoff is correct. 2.11 in credit and 2.22 in amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    reconcile_a = reconcile_b = False
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -22.22:
+            assert move_line.reconcile_id.id, "The invoice of 200$ is not fully reconciled"
+            reconcile_b = move_line.reconcile_id.id
+        elif move_line.amount_currency == -55.56:
+            assert move_line.reconcile_id.id, "The invoice of 100$ is not fully reconciled"
+            reconcile_a = move_line.reconcile_id.id
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -55.56:
+            assert move_line.credit == 52.78, "Debtor account has wrong entry."
+        elif move_line.amount_currency == -22.22:
+            assert move_line.credit == 21.11, "Debtor account has wrong entry."
+        elif move_line.credit == 11.11 and move_line.account_id.reconcile:
+            assert move_line.amount_currency == 0.00 and move_line.reconcile_id.id == reconcile_b, "Incorrect Currency Difference."
+        elif move_line.credit == 32.78 and move_line.account_id.reconcile:
+            assert move_line.amount_currency == 0.00 and move_line.reconcile_id.id == reconcile_a, "Incorrect Currency Difference."
+        elif move_line.amount_currency == 2.22:
+            assert move_line.credit == 2.11, "Writeoff amount is wrong."
+-
+  I check the residual amount of invoice 1, 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_first_invoice_jan_michal"))
+    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 first Invoice"
+-    
+  I check the residual amuont of invoice 2, 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_second_invoice_feb_michal"))
+    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 second Invoice"
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
new file mode 100644
index 00000000000..09034fadf51
--- /dev/null
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -0,0 +1,284 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create 2 Invoices in EUR and make 2 Payments in EUR based on the currency rating on that particular date.
+-
+  I create currency EUR in OpenERP for January of 1.000000 Rate
+-
+  !record {model: res.currency.rate, id: jan_eur}:
+    currency_id: base.EUR
+    name: !eval "'%s-01-01' %(datetime.now().year)"
+    rate: 1.000000
+-
+  I modify the debtor account in order to make sure there is no currency_id linked
+-
+  !python {model: account.account}: |
+    from datetime import datetime
+    ids = self.search(cr, uid, [('name', 'ilike', 'debtor')])
+    self.write(cr, uid, ids, {'currency_id': False})
+-
+  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 the first invoice on 1st January for 150 EUR
+-
+  !record {model: account.invoice, id: account_first_invoice_jan_eur}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 150.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan_eur}
+-
+  I check that first invoice move is correct for debtor account(debit - credit == 150)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_eur"))
+    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 == 150.00), "Invoice move is incorrect for debtors account"
+-
+  I create the second invoice on 1st February for 80 EUR
+-
+  !record {model: account.invoice, id: account_second_invoice_feb_eur}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 80.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_second_invoice_feb_eur}
+-
+  I check that second invoice move is correct for debtor account (debit - credit == 80)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_eur"))
+    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 == 80.00), "Invoice move is incorrect for debtors account"
+-
+  I create the first voucher of payment
+  <create with values 120 EUR, journal EUR, and fill amounts 100 for the invoice of 150 EUR and 20 for the invoice of 80 EUR>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 120.00,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.EUR'),
+        'journal_id': ref('bank_journal_EUR'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-03-01"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'First payment: Case 3',
+    }
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 150.00:
+            item['amount'] = 100.00
+        else:
+            item['amount'] = 20.00
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is 0.00
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.writeoff_amount == 0.00), "Writeoff amount is not 0.00"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my first voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with 0.00 and 0.00 in amount_currency columns and their credit are 20 and 100 respectively
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.credit == 20.00:
+            assert move_line.amount_currency == 0.00, "Debtor account has wrong entry."
+        elif move_line.credit == 100.00:
+            assert move_line.amount_currency == 0.00, "Debtor account has wrong entry."
+-
+  I check the residual amount of Invoice1 is 50
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_eur"))
+    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 == 50.0 and move_line.amount_residual == 50.0) , "Residual amount is not correct for first Invoice"
+-    
+  I check the residual amuont of Invoice2 is 60
+-
+   !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_eur"))
+    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 == 60.0 and move_line.amount_residual == 60.0) , "Residual amount is not correct for second Invoice"
+-
+  I create the second voucher of payment and check to let open the debtor overpaid amount.
+  <create with values 120 EUR, journal EUR, and fill amounts 50 for the invoice of 150 EUR and 70 for the invoice of 80 EUR>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 120.00,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.EUR'),
+        'journal_id': ref('bank_journal_EUR'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-04-01"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'comment': 'Write Off',
+        'name': 'Second payment: Case 3',
+    }
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 50.00:
+            item['amount'] = 50.00
+        elif item['amount_unreconciled'] == 60.00:
+            item['amount'] = 70.00
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is 0.00
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'),('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (voucher_id.writeoff_amount == 0.00), "Writeoff amount is not 0"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my second voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with 0.00 and 0.00 in amount_currency columns and their credit are 70 and 50
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 3'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.credit == 70.00:
+            assert move_line.amount_currency == 0.00, "Debtor account has wrong entry."
+        elif move_line.credit == 50.00:
+            assert move_line.amount_currency == 0.00, "Debtor account has wrong entry."
+-
+  I check the residual amount of Invoice1 is 0
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_eur"))
+    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 and move_line.amount_residual == 0) , "Residual amount is not correct for first Invoice"
+-    
+  I check the residual amuont of Invoice2 is -10
+-
+   !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_eur"))
+    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 == -10.0 and move_line.amount_residual == -10.0) , "Residual amount is not correct for second Invoice"
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
new file mode 100644
index 00000000000..b3abbb25e01
--- /dev/null
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -0,0 +1,184 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP,
+  I create an invoice in CAD and make its Payment in CHF based on the currency rating on that particular date.
+-
+  I create currency CAD in OpenERP for January of 1.338800 Rate
+-
+  !record {model: res.currency.rate, id: jan_cad}:
+    currency_id: base.CAD
+    name: !eval "'%s-01-01' %(datetime.now().year)"
+    rate: 1.338800
+-
+  I create currency CAD in OpenERP for March of 2.000000 Rate
+-
+  !record {model: res.currency.rate, id: mar_cad}:
+    currency_id: base.CAD
+    name: !eval "'%s-03-01' %(datetime.now().year)"
+    rate: 2.000000
+-
+  I create currency CHF in OpenERP for January of 1.308600 Rate
+-
+  !record {model: res.currency.rate, id: jan_chf}:
+    currency_id: base.CHF
+    name: !eval "'%s-01-01' %(datetime.now().year)"
+    rate: 1.308600
+-
+  I create currency CHF in OpenERP for March of 1.250000 Rate
+-
+  !record {model: res.currency.rate, id: mar_chf}:
+    currency_id: base.CHF
+    name: !eval "'%s-03-01' %(datetime.now().year)"
+    rate: 1.25000
+-
+  I create a cash account with currency CHF
+-
+  !record {model: account.account, id: account_cash_chf_id}:
+    currency_id: base.CHF
+    name: "cash account in chf"
+    code: "Xcash chf"
+    type: 'liquidity'
+    user_type: "account.account_type_cash_moves"
+
+-
+  I create a bank journal with CHF as currency
+-
+  !record {model: account.journal, id: bank_journal_CHF}:
+    name: Bank Journal(CHF)
+    code: BCHF
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account_cash_chf_id
+    default_credit_account_id: account_cash_chf_id
+    currency: base.CHF
+    company_id: base.main_company
+    view_id: account.account_journal_bank_view
+-
+  I create the first invoice on 1st January for 200 CAD
+-
+  !record {model: account.invoice, id: account_first_invoice_jan_cad}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.CAD
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 200.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_seagate
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan_cad}
+-
+  I check that first invoice move is correct for debtor account (debit - credit == 149.39)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_cad"))
+    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 == 149.39), "Invoice move is incorrect for debtors account"
+-
+  I create the first voucher of payment
+  <create with values 200 CHF, journal CHF, and completly pat the invoice of 200 CAD>
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), ref('bank_journal_CHF'), 200.00, ref('base.CHF'), ttype='receipt', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 200.00,
+        'company_id': ref('base.main_company'),
+        'currency_id': ref('base.CHF'),
+        'journal_id': ref('bank_journal_CHF'),
+        'partner_id': ref('base.res_partner_seagate'),
+        'period_id': ref('account.period_3'),
+        'type': 'receipt',
+        'date': time.strftime("%Y-%m-%d"),
+        'payment_option': 'with_writeoff',
+        'writeoff_acc_id': ref('account.a_expense'),
+        'exchange_acc_id': ref('account.o_expense'),
+        'comment': 'Write Off',
+        'name': 'First payment: Case 4',
+    }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.CHF'), 200.0)['value'])
+    if not res['value']['line_cr_ids']:
+      res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    for item in res['value']['line_cr_ids']:
+        if item['amount_unreconciled'] == 186.74:
+            item['amount'] = 186.74
+    vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is 13.26
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    assert (round(voucher_id.writeoff_amount,2) == 13.26), "Writeoff amount is not 13.26 CHF"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher[0], 'proforma_voucher', cr)
+-
+  I check that the move of my voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+    assert voucher_id.state == 'posted', "Voucher state is not posted"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 1 new line with -186.74 as amount_currency columns and 149.39 of credit and currency is CHF.
+-
+  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
+-
+  !python {model: account.voucher}: |
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_seagate'))])
+    voucher_id = self.browse(cr, uid, voucher[0])
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == 200:
+            assert move_line.debit == 160.00, "Bank account has wrong entry."
+        elif move_line.amount_currency == -186.74:
+            assert move_line.credit == 149.39, "Debtor account has wrong entry."
+        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."
+        else:
+            assert False, "Wrong entry"
+-
+  I check the residual amount of Invoice1, 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_first_invoice_jan_cad"))
+    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 first Invoice"
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 52360407242..46720b2732c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -8,7 +8,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -19,12 +19,12 @@
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
@@ -41,7 +41,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -52,12 +52,12 @@
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
@@ -74,14 +74,14 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
+                        <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
@@ -92,8 +92,8 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'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)">
-                                <tree string="Open Supplier Journal Entries" editable="bottom">
+                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'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, 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}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -106,8 +106,8 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
-                                <tree string="Open Customer Journal Entries" editable="bottom">
+                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
+                                <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id"/>
                                     <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
                                     <field name="date_original"/>
@@ -122,6 +122,8 @@
                             <group col="2" colspan="1">
                                 <separator string="Other Information" colspan="2"/>
                                 <field name="currency_id"/>
+                                <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
+                                <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
                                 <field name="number"/>
                             </group>
                         </page>
@@ -137,15 +139,15 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" 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}" string="Supplier"/>
+                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -158,12 +160,13 @@
                     <notebook colspan="4">
                         <page string="Payment Information">
                             <field name="line_dr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
-                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom">
+                                <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}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"
                                         />
-                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','payable')]"/>
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
@@ -172,7 +175,7 @@
                                 </tree>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
-                                <tree string="Credits" editable="bottom">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id"/>
                                     <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
                                     <field name="date_original"/>
@@ -185,6 +188,13 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
+                                <group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                    <separator string="Currency Options" colspan="2"/>
+                                    <field name="exchange_acc_id"
+                                           domain="[('type','=','other')]"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
+                                </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="payment_option" required="1"/>
@@ -196,13 +206,12 @@
                                     <field name="comment"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
-                                <separator string="Other Information" colspan="2"/>
-                                <group col="4" colspan="1">
-                                  <field name="currency_id"/>
-                                  <field name="number"/>
+                                <group col="4" colspan="2">
+                                    <separator string="Other Information" colspan="4"/>
+                                    <field name="number" colspan="4"/>
+                                    <field name="currency_id" invisible="1" colspan="4"/>
                                 </group>
                             </group>
                         </page>
@@ -231,7 +240,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
@@ -275,18 +284,19 @@
             <field name="arch" type="xml">
                 <form string="Customer Payment">
                     <group col="6" colspan="4">
-                        <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)" string="Customer"/>
+                        <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)" string="Customer"/>
+                        <field name="currency_id" invisible="1"/>
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                            on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -298,13 +308,14 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_cr_ids" default_get="{'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)">
-                                <tree string="Invoices and outstanding transactions" editable="bottom">
+                            <field name="line_cr_ids" default_get="{'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, 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"
                                         />
-                                    <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
+                                    <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"/>
@@ -312,8 +323,8 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
-                                <tree string="Credits" editable="bottom">
+                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id"/>
                                     <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
                                     <field name="date_original"/>
@@ -326,6 +337,13 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
+                                <group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                    <separator string="Currency Options" colspan="2"/>
+                                    <field name="exchange_acc_id"
+                                           domain="[('type','=','other')]"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
+                                </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="payment_option" required="1"/>
@@ -337,13 +355,11 @@
                                     <field name="comment"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
-                                <separator string="Other Information" colspan="2"/>
-                                <group col="4" colspan="1">
-                                    <field name="currency_id"/>
-                                    <field name="number"/>
+                                <group col="4" colspan="2">
+                                    <separator string="Other Information" colspan="4"/>
+                                    <field name="number" colspan="4"/>
                                 </group>
                             </group>
                         </page>
@@ -372,7 +388,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 9d1f9c76c13..dfd535f29bc 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -7,7 +7,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -18,12 +18,12 @@
                         <field name="partner_id" string="Supplier"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
@@ -39,7 +39,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
@@ -50,12 +50,12 @@
                         <field name="partner_id" string="Customer"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='4'>
+                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
@@ -82,9 +82,9 @@
             <field name="arch" type="xml">
                 <form string="Sales Receipt">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
-                        <field name="date" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id)"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, amount, context)"/>
+                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
@@ -117,6 +117,7 @@
                                          attrs="{'invisible':[('pay_now','!=','pay_now')]}"
                                     />
                                     <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                                    <field name="paid" invisible="1"/>
                                 </group>
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
@@ -148,11 +149,11 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':[('state','!=','posted')]}">
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
                            <button icon="terp-dolar_ok!" 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')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
@@ -167,7 +168,7 @@
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type','in',['sale','sale_refund']), ('type','=','sale')]</field>
-            <field name="context">{'type':'sale'}</field>
+            <field name="context">{'default_type': 'sale', 'type': 'sale'}</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_sale"/>
             <field name="target">current</field>
@@ -197,7 +198,7 @@
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment'), ('partner_id','=',partner_id)]</field>
-            <field name="context">{'type':'payment', 'partner_id': partner_id, 'default_reference':reference}</field>
+            <field name="context">{'default_type':'payment', 'type':'payment', 'default_partner_id': partner_id, 'partner_id': partner_id, 'default_reference':reference}</field>
             <field name="view_id" ref="view_vendor_payment_form"/>
             <field name="target">current</field>
         </record>
@@ -208,9 +209,9 @@
             <field name="arch" type="xml">
                 <form string="Supplier Voucher">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="date" string="Bill Date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"/>
+                        <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
+                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="reference" select="1"/>
@@ -237,6 +238,7 @@
                                 <group col="2" colspan="1">
                                     <separator string="Payment Terms" colspan="2"/>
                                     <field name="date_due"/>
+                                    <field name="paid" invisible="1"/>
                                 </group>
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
@@ -268,10 +270,10 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <group attrs="{'invisible':[('state','!=','posted')]}">
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
                             <button icon="terp-dolar_ok!" 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')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
@@ -285,7 +287,7 @@
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field>
-            <field name="context">{'type':'purchase'}</field>
+            <field name="context">{'default_type': 'purchase', 'type': 'purchase'}</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" eval="view_voucher_filter_vendor"/>
             <field name="target">current</field>
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 30712a78167..65f6588a1e3 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -24,7 +24,7 @@
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Finance",
+    "category" : "Hidden",
     "depends" : ["base", "decimal_precision"],
     "description": """
 Module for defining analytic accounting object.
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index a155352adf8..114653d473e 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -30,22 +30,22 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
 
     def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
-        def recursive_computation(account_id, res):
-            currency_obj = self.pool.get('res.currency')
-            account = self.browse(cr, uid, account_id)
+        currency_obj = self.pool.get('res.currency')
+        recres = {}
+        def recursive_computation(account):
+            result2 = res[account.id].copy()
             for son in account.child_ids:
-                res = recursive_computation(son.id, res)
+                result = recursive_computation(son)
                 for field in field_names:
-                    if account.currency_id.id == son.currency_id.id or field=='quantity':
-                        res[account.id][field] += res[son.id][field]
-                    else:
-                        res[account.id][field] += currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, res[son.id][field], context=context)
-            return res
+                    if (account.currency_id.id != son.currency_id.id) and (field!='quantity'):
+                        result[field] = currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, result[field], context=context)
+                    result2[field] += result[field]
+            return result2
         for account in self.browse(cr, uid, ids, context=context):
             if account.id not in child_ids:
                 continue
-            res = recursive_computation(account.id, res)
-        return res
+            recres[account.id] = recursive_computation(account)
+        return recres
 
     def _debit_credit_bal_qtty(self, cr, uid, ids, name, arg, context=None):
         res = {}
@@ -150,7 +150,7 @@ class account_analytic_account(osv.osv):
     _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('Account Code', size=24, select=True),
+        'code': fields.char('Code/Reference', size=24, select=True),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
@@ -168,7 +168,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         '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([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'State', required=True,
                                   help='* 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\'. \
@@ -217,6 +217,12 @@ class account_analytic_account(osv.osv):
         default['line_ids'] = []
         return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
 
+    def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
+        if not partner_id:
+            return {'value': {'contact_id': False}}
+        addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice'])
+        return {'value': {'contact_id': addr.get('invoice', False)}}
+
     def on_change_company(self, cr, uid, id, company_id):
         if not company_id:
             return {}
diff --git a/addons/analytic/i18n/ar.po b/addons/analytic/i18n/ar.po
new file mode 100644
index 00000000000..8fe3a3bf60c
--- /dev/null
+++ b/addons/analytic/i18n/ar.po
@@ -0,0 +1,259 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-22 02:41+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@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: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+"وحدة لتعريف كائن تحليل المحاسبة.\n"
+"    "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "المحافظة / الولاية"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "مدير المحاسبة"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "مغلق"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "مدين"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "نوع الحساب"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "قالب"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "إنتظار"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "خط بياني"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "وصف"
+
+#. module: analytic
+#: 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
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "الكمية القصوى"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "مستخدِم"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "حساب التحليل الأعلى"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "تاريخ"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+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
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "تحديد الحد الأعلى للمقدار بالساعات"
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "دائن"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "المقدار"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "جهة الإتصال"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "خطأ! العملة لابد و أن تكون مثل العملة للشركة المختارة"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "أُلغيت"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "رصيد"
+
+#. module: analytic
+#: 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,code:0
+msgid "Account Code"
+msgstr "رمز الحساب"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "اسم الحساب الكامل"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "حساب تحليلي"
+
+#. module: analytic
+#: 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/i18n/bg.po b/addons/analytic/i18n/bg.po
index 3616d7fbd30..45f182dcedc 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 45f6b084c8c..1e3efc46727 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -255,32 +255,3 @@ msgstr "Otvoren"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Analitičke stavke"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr ""
-#~ "Količina izražena u valuti vezanog konta, ukoliko se razlikuje od valute "
-#~ "poduzeća."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "Valuta vezanog konta se razlikuje od valute poduzeća."
-
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr "Izračunava se množenjem količine i cijene date kao trošak proizvoda."
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Vezani partner"
-
-#~ msgid "Amount currency"
-#~ msgstr "Valuta iznosa"
diff --git a/addons/analytic/i18n/ca.po b/addons/analytic/i18n/ca.po
index 581ed97baf7..f30bea2a6fb 100644
--- a/addons/analytic/i18n/ca.po
+++ b/addons/analytic/i18n/ca.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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Comptes fills"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
-msgstr ""
+msgstr "Nom del compte"
 
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Especifica el valor de les quantitats a comptar."
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,31 +38,33 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Mòdul per definir objectes comptables analítics.\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Gestor comptable"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancat"
 
 #. module: analytic
 #: field:account.analytic.account,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Dèbit"
 
 #. module: analytic
 #: help:account.analytic.account,state:0
@@ -82,74 +84,89 @@ 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 ""
+"* Quan es crea un compte, està en estat 'Esborrany'.                         "
+"          \n"
+"* Si s'associa a qualsevol empresa, pot estar en estat 'Obert'.              "
+"                     \n"
+"* Si existeix un saldo pendent, pot estar en 'Pendent'.                      "
+"             \n"
+"* I finalment, quan totes les transaccions estan realitzades, pot estar en "
+"estat de 'Tancat'.                                   \n"
+"* El projecte pot estar en els estats 'Plantilla' i 'En procés.              "
+"                     \n"
+" Si és una plantilla, podeu fer projectes basats en els projectes plantilla. "
+"Si està en estat 'En procés', és un projecte normal.                         "
+"          \n"
+" Si s'ha d'examinar, l'estat és 'Pendent'.\n"
+" Quan el projecte s'ha completat, l'estat s'estableix en 'Realitzat'."
 
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Tipus de compte"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línia analítica"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
 #: field:account.analytic.line,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
-msgstr ""
+msgstr "Quantitat màxima"
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari/a"
 
 #. module: analytic
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Compte analítica pare"
 
 #. module: analytic
 #: field:account.analytic.line,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Moneda comptable"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
 #: field:account.analytic.line,unit_amount:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: analytic
 #: help:account.analytic.line,amount:0
@@ -157,26 +174,28 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
+"Calculat multiplicant la quantitat i el preu obtingut del preu de cost del "
+"producte. Sempre s'expressa en la moneda principal de la companyia."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Fixa el límit superior de quantitat d'hores."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Haver"
 
 #. module: analytic
 #: field:account.analytic.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: analytic
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
@@ -184,21 +203,23 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"Error! La moneda ha de ser la mateixa que la moneda de la companyia "
+"seleccionada."
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Balanç"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! No podeu crear comptes analítiques recursives."
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -206,50 +227,52 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Si seleccioneu el tipus de vista, significa que no li permetrà la creació "
+"d'assentaments de diari amb aquest compte."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Data final"
 
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr ""
+msgstr "Codi del compte"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr ""
+msgstr "Nom complet del compte"
 
 #. module: analytic
 #: field:account.analytic.line,account_id:0
 #: model:ir.model,name:analytic.model_account_analytic_account
 #: model:ir.module.module,shortdesc:analytic.module_meta_information
 msgid "Analytic Account"
-msgstr ""
+msgstr "Compte analític"
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "View"
-msgstr ""
+msgstr "Visualització"
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Entrades analítiques"
diff --git a/addons/analytic/i18n/cs.po b/addons/analytic/i18n/cs.po
new file mode 100644
index 00000000000..a3c4d65028a
--- /dev/null
+++ b/addons/analytic/i18n/cs.po
@@ -0,0 +1,275 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-06 06:48+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: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: czech\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Podřízené účty"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Jméno účtu"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Určuje částku množství ke spočtení."
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+"Modul pro definici objektu analyzického účtování.\n"
+"    "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Stav"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Správce účtu"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Koncept"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Uzavřeno"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Má dáti"
+
+#. 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 ""
+"* Když je účet vytvořen je ve stavu 'Koncept'.                               "
+"   \n"
+"* Pokud je zde nějaký přidružený partner, může být ve stavu 'Otevřený'.      "
+"                            \n"
+"* Pokud je zde nějaký čekající zůstatek, může být ve stavu 'Čekající'.       "
+"                            \n"
+"* A nakonec, když jsou všechny transakce dokončeny, může být ve stavu "
+"'Zavřený'.                                   \n"
+"* Projekt může být ve stavu 'Šablona' nebo 'Běžící'.\n"
+" Pokud je šablona, tak můžeme vytvářet projekty založené na šablonách "
+"projektů. Pokud je ve stavu 'Běžící' tak je to normální projekt.             "
+"                    \n"
+" Pokud potřebuje překontrolovat, tak je ve stavu 'Čekající'.\n"
+" Když je projekt dokončen, je stav nastaven na 'Dokončený'."
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Typ účtu"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Šablona"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Čekající"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analytický řádek"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Popis"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Běžný"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Společnost"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Maximální množstvi"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Uživatel"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadřazený analytický účet"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr "Měna účtu"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Množství"
+
+#. 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 ""
+"Vypočteno jako násobek množství a ceny dané cenou Výrobku. Vždy vyjádřeno v "
+"hlavní měně společnosti."
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "Nastavuje horní omezení množství hodin."
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Dal"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Částka"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "Chyba! Měna musí být stejná jako měna vybrané společnosti"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Zrušeno"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Zůstatek"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Chyba! Nemůžete vytvořit rekurzivní analytické účty."
+
+#. 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 ""
+"Pokud vyberete Typ pohledu, znamená to, že nebudete moci vytvářet položky "
+"deníku použitím tohoto účtu."
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Datum ukončení"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Kód účtu"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Plné jméno účtu"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analytický účet"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Pohled"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Počáteční datum"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Otevřít"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analytické položky"
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 9c09cef390c..bb1bc6ce718 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -279,51 +279,3 @@ msgstr "Offen"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Analytische Buchungen"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr "Der Betrag in Fremdwährung, wenn diese von der Hauptwährung abweicht"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr "Ergebnis aus Menge * Produkt Einstandspreis"
-
-#~ msgid "Currency"
-#~ msgstr "Währung"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Zugehöriger Partner"
-
-#~ msgid "Amount currency"
-#~ msgstr "Betrag in Währung"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "Die zugeöhrige Währung, wenn abweichend von der Wirmenwährung."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regeln werden für osv_memory Objekt nicht unterstützt"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index 423227e879b..88c55c58e2c 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -260,9 +260,3 @@ msgstr "Άνοιγμα"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Εγγραφές Αναλυτικής"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
-#~ "ειδικούς χαρακτήρες!"
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 730fe2f155b..c3602dd386e 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -271,27 +271,3 @@ msgstr "Abrir"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Entradas analíticas"
-
-#~ 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 "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
diff --git a/addons/analytic/i18n/es_EC.po b/addons/analytic/i18n/es_EC.po
index 417031fa95a..3aa1518bcac 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -263,50 +263,3 @@ msgstr "Abierto"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Detalle Analitico"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr "El monto en la moneda por relacionada no es igual al de la compania"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nombre del objeto debe empezar con x_ y no debe contener caracteres "
-#~ "especiales !"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "La moneda relacionada no es igual al de la compania"
-
-#~ msgid "Currency"
-#~ msgstr "Moneda"
-
-#~ msgid "Amount currency"
-#~ msgstr "Monto moneda"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Partner Asociado"
-
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr ""
-#~ "Calculado multiplicando la cantidad y el precio dado en el costo del Producto"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son compatibles con los objetos osv_memory!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "El ID del certificado del módulo debe ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "El nombre del módulo debe ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Tamaño del campo nunca puede ser menor que 1 !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
diff --git a/addons/analytic/i18n/es_MX.po b/addons/analytic/i18n/es_MX.po
new file mode 100644
index 00000000000..96ef6f91814
--- /dev/null
+++ b/addons/analytic/i18n/es_MX.po
@@ -0,0 +1,273 @@
+# 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-13 04:57+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Cuentas hijas"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Nombre cuenta"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Especifica el valor de las cantidades a contar."
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+"Módulo para definir objetos contables analíticos.\n"
+"    "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Gestor contable"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. 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 ""
+"* Cuando se crea una cuenta, está en estado 'Borrador'.\n"
+"* Si se asocia a cualquier empresa, puede estar en estado 'Abierta'.\n"
+"* Si existe un saldo pendiente, puede estar en 'Pendiente'.\n"
+"* Y finalmente, cuando todas las transacciones están realizadas, puede estar "
+"en estado de 'Cerrada'.\n"
+"* El proyecto puede estar en los estados 'Plantilla' y 'En proceso.\n"
+"Si es una plantilla, podemos hacer proyectos basados en los proyectos "
+"plantilla. Si está en estado 'En proceso', es un proyecto normal.\n"
+"Si se debe examinar, el estado es 'Pendiente'.\n"
+"Cuando el proyecto se ha completado, el estado se establece en 'Realizado'."
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Tipo cuenta"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Cantidad máxima"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Cuenta analítica padre"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr "Moneda contable"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. 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 ""
+"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
+"del producto. Siempre se expresa en la moneda principal de la compañía."
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "Fija el límite superior de cantidad de horas."
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Balance"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. 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 ""
+"Si selecciona el tipo de vista, significa que no permitirá la creación de "
+"asientos de diario con esa cuenta."
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Fecha final"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Código cuenta"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Nombre cuenta completo"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Vista"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Fecha inicial"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Entradas analíticas"
diff --git a/addons/analytic/i18n/es_PY.po b/addons/analytic/i18n/es_PY.po
index 481bc44e4a7..c7176d997bb 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/es_VE.po b/addons/analytic/i18n/es_VE.po
new file mode 100644
index 00000000000..96ef6f91814
--- /dev/null
+++ b/addons/analytic/i18n/es_VE.po
@@ -0,0 +1,273 @@
+# 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-13 04:57+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Cuentas hijas"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Nombre cuenta"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Especifica el valor de las cantidades a contar."
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+"Módulo para definir objetos contables analíticos.\n"
+"    "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Gestor contable"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debe"
+
+#. 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 ""
+"* Cuando se crea una cuenta, está en estado 'Borrador'.\n"
+"* Si se asocia a cualquier empresa, puede estar en estado 'Abierta'.\n"
+"* Si existe un saldo pendiente, puede estar en 'Pendiente'.\n"
+"* Y finalmente, cuando todas las transacciones están realizadas, puede estar "
+"en estado de 'Cerrada'.\n"
+"* El proyecto puede estar en los estados 'Plantilla' y 'En proceso.\n"
+"Si es una plantilla, podemos hacer proyectos basados en los proyectos "
+"plantilla. Si está en estado 'En proceso', es un proyecto normal.\n"
+"Si se debe examinar, el estado es 'Pendiente'.\n"
+"Cuando el proyecto se ha completado, el estado se establece en 'Realizado'."
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Tipo cuenta"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Cantidad máxima"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Cuenta analítica padre"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr "Moneda contable"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. 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 ""
+"Calculado multiplicando la cantidad y el precio obtenido del precio de coste "
+"del producto. Siempre se expresa en la moneda principal de la compañía."
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "Fija el límite superior de cantidad de horas."
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Balance"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. 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 ""
+"Si selecciona el tipo de vista, significa que no permitirá la creación de "
+"asientos de diario con esa cuenta."
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Fecha final"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Código cuenta"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Nombre cuenta completo"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Vista"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Fecha inicial"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Entradas analíticas"
diff --git a/addons/analytic/i18n/et.po b/addons/analytic/i18n/et.po
index f3191914800..806c4d4a412 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -253,14 +253,3 @@ msgstr "Ava"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Analüütilised kirjed"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Currency"
-#~ msgstr "Rahaühik"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Seotud partner"
diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po
index 5822cb824d2..b4826c02175 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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -49,7 +49,7 @@ msgstr "Tila"
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr "Asiakas päällikkö"
+msgstr "Asiakasvastaava"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index ebd06e60ae2..63d2a2d55e7 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-12 13:04+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b9c11235c69..66715c13a3a 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 065ff5ef1f9..a8eb9613be4 100644
--- a/addons/analytic/i18n/hu.po
+++ b/addons/analytic/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-30 18:54+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4f8303050b2..7edab913646 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -234,7 +234,7 @@ msgstr "Data Fine"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr "Codifica Conto"
+msgstr "Codice Conto"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -272,53 +272,3 @@ msgstr "Aperto"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Voci Conto Analitico"
-
-#~ 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 ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr ""
-#~ "Calcolato multiplicando la quantità e il prezzo dato nel campo "
-#~ "\"costo/prezzo del prodotto\""
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Partner associato"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr ""
-#~ "L'importo espresso nella valuta del conto non è uguale a quella della "
-#~ "Compagnia"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "La relativa valuta del conto non è uguale a quella della Compagnia"
-
-#~ msgid "Amount currency"
-#~ msgstr "Importo valuta"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate per oggetti osv_memory !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Il nome del gruppo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
diff --git a/addons/analytic/i18n/lv.po b/addons/analytic/i18n/lv.po
index 27fd658a3e0..ad4b5153eb6 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -30,7 +30,7 @@ msgstr "Konta Nosaukums"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr "Nosaka kādu daudzumu uzskaitīt."
+msgstr "Norāda uzskaitāmo daudzumu."
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,13 +38,13 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
-"Analītiskās uzskaites objektu definēšanas modulis.\n"
+"Analītiskās uzskaites modulis objektu definēšanai.\n"
 "    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
-msgstr "Statuss"
+msgstr "Stāvoklis"
 
 #. module: analytic
 #: field:account.analytic.account,user_id:0
@@ -84,13 +84,19 @@ 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 ""
-"Izveidojot kontu, tas pēc noklusējuma ir statusā \"Neapstiprināts\".\n"
-"Pievienojot partneri, tam var norādīt statusu \"Atvērts\"\n"
-"Ja nav noslēgta bilance, tad konta statuss var būt \"Gaida\"\n"
-"Projekta skatījumā kontam ir papildus statusi \"Veidne\" un \"Palaists\".\n"
-"Projektus iespējams veidot izmantojot projektu \"Veidnes\". Standarta "
-"projekti ir statusā \"Palaists\".\n"
-"Slēdzot Projektu vai analītisko kontu, tā statuss ir \"Pabeigts\"."
+"* Izveidojot kontu, tas pēc noklusējuma ir statusā 'Neapstiprināts'.         "
+"                         \n"
+"* Pievienojot partneri, tam var norādīt statusu 'Atvērts'.                   "
+"               \n"
+"* Ja nav noslēgta bilance, tad konta statuss var būt 'Gaida'.                "
+"                  \n"
+"* Pēc visu transakciju pabeigšanas, statuss var būt 'Pabeigts'.              "
+"                    \n"
+"* Projekta skatījumā kontam ir papildus statusi 'Veidne' un 'Palaists'.\n"
+" Projektus iespējams veidot izmantojot projektu veidnes. Parasti projekti ir "
+"statusā 'Palaists'.                                  \n"
+" Ja to ir jāpārskata, tad statuss ir 'Gaida'.\n"
+" Projektu vai analītisko kontu slēdzot, tā statuss ir 'Pabeigts'."
 
 #. module: analytic
 #: field:account.analytic.account,type:0
@@ -132,7 +138,7 @@ msgstr "Uzņēmums"
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
-msgstr "Maksimālais daudzums"
+msgstr "Maksimālais Daudzums"
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
@@ -166,13 +172,13 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
-"Tiek aprēķināts reizinot skaitu un cenu, kas ir Produkta pašizmaksas cena. "
-"Tā tiek attēlota uzņēmuma galvenajā valūtā."
+"Aprēķina produkta pašizmaksas cenu reizinot ar daudzumu. Vienmēr izsaka "
+"uzņēmuma galvenajā valūtā."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr "Stundu skaita augšējā robeža."
+msgstr "Nosaka maksimālo stundu skaita ierobežojumu."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -182,7 +188,7 @@ msgstr "Kredīts"
 #. module: analytic
 #: field:account.analytic.line,amount:0
 msgid "Amount"
-msgstr "Daudzums"
+msgstr "Summa"
 
 #. module: analytic
 #: field:account.analytic.account,contact_id:0
@@ -217,8 +223,8 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
-"Ņemiet vērā! Izvēloties tipu \"Skatījums\" tiks bloķēta iespēja veidot "
-"ierakstus attiecīgajā analītiskajā kontā."
+"Izvēloties tipu \"Skatījums\", jums tiks bloķēta iespēja veidot ierakstus "
+"attiecīgajā analītiskajā kontā."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
diff --git a/addons/analytic/i18n/mn.po b/addons/analytic/i18n/mn.po
index dc1a8641f8a..61c16e6141c 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -259,18 +259,3 @@ msgstr "Нээх"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Аналитик бичилт"
-
-#~ msgid "Currency"
-#~ msgstr "Валют"
-
-#~ msgid "Amount currency"
-#~ msgstr "Валютын хэмжээ"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Холбогдох харилцагч"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
index 4ff914824d8..26662f9c2ff 100644
--- a/addons/analytic/i18n/nb.po
+++ b/addons/analytic/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/nl.po b/addons/analytic/i18n/nl.po
index 8255102261c..931276f9d5a 100644
--- a/addons/analytic/i18n/nl.po
+++ b/addons/analytic/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -275,52 +275,3 @@ msgstr "Open"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Kostenplaatsboekingen"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr ""
-#~ "Het bedrag in de valuta van de gekoppelde rekening als deze afwijkt van die "
-#~ "van het bedrijf"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr ""
-#~ "De valuta van de gekoppelde rekening wijkt af van die van het bedrijf."
-
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr ""
-#~ "Berekend door het aantal en de product kostprijs te vermenigvuldigen."
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Gekoppelde relatie"
-
-#~ msgid "Amount currency"
-#~ msgstr "Bedrag in valuta"
-
-#~ 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 "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "De groepsnaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
diff --git a/addons/analytic/i18n/pl.po b/addons/analytic/i18n/pl.po
index fd0124a4099..0c64599313a 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -255,27 +255,3 @@ msgstr "Otwarte"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Zapisy analityczne"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr ""
-#~ "Kwota wyrażona w walucie konta, jeśli waluta jest inna niż waluta firmy."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "Waluta konta, jeśli waluta jest inna niż firmy."
-
-#~ msgid "Currency"
-#~ msgstr "Waluta"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Przypisany partner"
-
-#~ msgid "Amount currency"
-#~ msgstr "Waluta kwoty"
diff --git a/addons/analytic/i18n/pt.po b/addons/analytic/i18n/pt.po
index 8aca93b0ff4..bf67464ea18 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -255,27 +255,3 @@ msgstr "Abrir"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo deve ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "O objecto osv_memory não suporta regras!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po
index acdde6a7d82..97e0499db6c 100644
--- a/addons/analytic/i18n/pt_BR.po
+++ b/addons/analytic/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -273,27 +273,3 @@ msgstr "Abrir"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Lançamentos analíticos"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo precisa ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regras não são suportadas por objetos osv_memory !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regra precisa ter ao menos um direito de acesso marcado."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/analytic/i18n/ru.po b/addons/analytic/i18n/ru.po
index 9b7f8b1c37a..f34c4fefc22 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -84,6 +84,20 @@ 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"
+"* Если присутствует хотя бы один связанный партнёр, счёт может быть в "
+"состоянии \"Открыт\".                                  \n"
+"* Если присутствует хотя бы один ожидающий баланс, счёт может быть в "
+"состоянии \"В ожидании\".                                   \n"
+"* И наконец, при завершении всех транзакций, счёт может быть в состоянии "
+"\"Закрыт\".                                   \n"
+"* Проект может быть в сотояниях \"Шаблон\" или \"Выполняется\".\n"
+" Если он в состоянии \"Шаблон\", на его основе можно составлять другие "
+"проекты. Если он в состоянии \"Выполняется\" — это нормальный проект.        "
+"                         \n"
+" Если он требует рассмотрения, он находится в состоянии \"В ожидании\".\n"
+" При завершении проекта, состояние устанавливается в \"Выполнен\"."
 
 #. module: analytic
 #: field:account.analytic.account,type:0
@@ -243,7 +257,7 @@ msgstr "Вид"
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Контрагент"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
diff --git a/addons/analytic/i18n/sl.po b/addons/analytic/i18n/sl.po
index a1243b3e4e1..f4177143d80 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -30,7 +30,7 @@ msgstr "Naziv konta"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Določa vrednost količine za štetje."
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,16 +38,18 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Modul objekta za definiranje analitičnega konta\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr "Odgovorni za stranko"
+msgstr "Računovodja"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -118,7 +120,7 @@ msgstr "Običajno"
 #: field:account.analytic.account,company_id:0
 #: field:account.analytic.line,company_id:0
 msgid "Company"
-msgstr "Družba"
+msgstr "Podjetje"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
@@ -157,11 +159,13 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
+"Izračunano z množenjem količine in cene podane v ceni vrednosti Izdelka. "
+"Vedno izraženo v glavni valuti podjetja."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Nastavi višjo omejitev količine ur."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -176,14 +180,14 @@ msgstr "Znesek"
 #. module: analytic
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr "Stik"
+msgstr "Kontakt"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Napaka! Valuta mora biti enaka kot valuta izbranega podjetja"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -206,6 +210,8 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Če izberete Tip pogleda, to pomeni, da ne boste dovolili ustvarjanje vnosov "
+"v dnevnik s tem kontom."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
@@ -215,7 +221,7 @@ msgstr "Datum konca"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr ""
+msgstr "Šifra konta"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -253,14 +259,3 @@ msgstr "Odpri"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Analitične vknjižbe"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Pridružen partner"
diff --git a/addons/analytic/i18n/sq.po b/addons/analytic/i18n/sq.po
index d7dce86743b..39bde17a218 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a95df602cbb..1870b5dcb57 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -274,35 +274,3 @@ msgstr "Otvori"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Analitičke stavke"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr ""
-#~ "Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "Dati iznos valute ako nije jednaka valuti preduzeca"
-
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr ""
-#~ "Izracunato mnozenjem kolicine i cene dobijene iz Proizvodove cene kostanja"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Povezani partner"
-
-#~ msgid "Amount currency"
-#~ msgstr "Iznos valute"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/analytic/i18n/sr@latin.po b/addons/analytic/i18n/sr@latin.po
index 1e228faa43d..7ec5ad0beb2 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -274,35 +274,3 @@ msgstr "Otvori"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Analitičke stavke"
-
-#~ 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 "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr ""
-#~ "Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "Dati iznos valute ako nije jednaka valuti preduzeca"
-
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr ""
-#~ "Izracunato mnozenjem kolicine i cene dobijene iz Proizvodove cene kostanja"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Associated Partner"
-#~ msgstr "Povezani partner"
-
-#~ msgid "Amount currency"
-#~ msgstr "Iznos valute"
diff --git a/addons/analytic/i18n/sv.po b/addons/analytic/i18n/sv.po
index 8d9591d4ac0..700a8770f44 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -253,17 +253,3 @@ msgstr ""
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Namnet på gruppen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unikt!"
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
index 2b31cc9428a..2ae0b054587 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: 2011-05-30 04:59+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e620f18db0c..37810f19c26 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8b383aecd5a..ffa9c55212d 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-08-03 00:16+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -106,7 +106,7 @@ msgstr "模板"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr "悬而未决"
+msgstr "待处理"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
@@ -122,7 +122,7 @@ msgstr "说明"
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Normal"
-msgstr "正常"
+msgstr "一般"
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
@@ -153,7 +153,7 @@ msgstr "日期"
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Account currency"
-msgstr "辅助核算项货币"
+msgstr "币别"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -166,7 +166,7 @@ msgstr "数量"
 msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
-msgstr ""
+msgstr "计算公式是数量乘以产品成本价。币别是公司本位币。"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -186,14 +186,14 @@ msgstr "金额"
 #. module: analytic
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr "联系方式"
+msgstr "联系"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "错误！此币别必须是选定公司的默认币别。"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -208,14 +208,14 @@ msgstr "差额"
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+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 ""
+msgstr "如果选择了 视图 类型，则你不能在这个辅助核算项上创建辅助核算凭证"
 
 #. module: analytic
 #: field:account.analytic.account,date:0
@@ -230,7 +230,7 @@ msgstr "辅助核算项代码"
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr "所有项目名称"
+msgstr "所有项名称"
 
 #. module: analytic
 #: field:account.analytic.line,account_id:0
@@ -247,7 +247,7 @@ msgstr "视图"
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
@@ -262,30 +262,4 @@ msgstr "待处理"
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
-msgstr "辅助核算记录"
-
-#~ msgid ""
-#~ "The amount expressed in the related account currency if not equal to the "
-#~ "company one."
-#~ msgstr "如果不是同一公司, 这金额表示相关项的货币"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须以x_开头并且不能包含特殊字符"
-
-#~ msgid "The related account currency if not equal to the company one."
-#~ msgstr "如果不是同一公司, 这相关项的货币"
-
-#~ msgid ""
-#~ "Calculated by multiplying the quantity and the price given in the Product's "
-#~ "cost price."
-#~ msgstr "乘与数量和价格, 提供产品的成本价格"
-
-#~ msgid "Currency"
-#~ msgstr "货币"
-
-#~ msgid "Associated Partner"
-#~ msgstr "相关业务伙伴"
-
-#~ msgid "Amount currency"
-#~ msgstr "货币金额"
+msgstr "辅助核算条目"
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index dfa8c840bb6..165bb92f6b9 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -7,6 +7,14 @@
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
+     
+    <record id="analytic_line_comp_rule" model="ir.rule">
+        <field name="name">Analytic line multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_account_analytic_line"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    
     <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
         <field name="name">Useability / Analytic Accounting</field>
     </record>
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
index a9241213251..059e85d9367 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_journal_billing_rate/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Analytic Journal Billing Rate, Define the default invoicing rate for a specific journal',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden',
     'description': """
 This module allows you to define what is the default invoicing rate for a specific journal on a given account.
 ==============================================================================================================
diff --git a/addons/analytic_journal_billing_rate/i18n/ar.po b/addons/analytic_journal_billing_rate/i18n/ar.po
index 4a8278941b2..bd8c216214f 100644
--- a/addons/analytic_journal_billing_rate/i18n/ar.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/bg.po b/addons/analytic_journal_billing_rate/i18n/bg.po
index b537a22aa94..e3cae859451 100644
--- a/addons/analytic_journal_billing_rate/i18n/bg.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/bs.po b/addons/analytic_journal_billing_rate/i18n/bs.po
index 64560cb9c67..db9609001d4 100644
--- a/addons/analytic_journal_billing_rate/i18n/bs.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/ca.po b/addons/analytic_journal_billing_rate/i18n/ca.po
index 549a2e3ae4f..0af788c798a 100644
--- a/addons/analytic_journal_billing_rate/i18n/ca.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/cs.po b/addons/analytic_journal_billing_rate/i18n/cs.po
index 4a8278941b2..bd8c216214f 100644
--- a/addons/analytic_journal_billing_rate/i18n/cs.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/da.po b/addons/analytic_journal_billing_rate/i18n/da.po
new file mode 100644
index 00000000000..3ad40b63e32
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/da.po
@@ -0,0 +1,95 @@
+# 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: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-11-09 21:41+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default invoicing rate for "
+"a specific journal 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the account data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/de.po b/addons/analytic_journal_billing_rate/i18n/de.po
index 21404016240..08ffb92e582 100644
--- a/addons/analytic_journal_billing_rate/i18n/de.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -122,12 +122,3 @@ msgstr "Zeiterfassung Positionen"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Analytisches Journal Verrechnungssatz"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
index 403a01e31c8..0be9a928a83 100644
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/en_GB.po b/addons/analytic_journal_billing_rate/i18n/en_GB.po
new file mode 100644
index 00000000000..7e92b99c4c3
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/en_GB.po
@@ -0,0 +1,121 @@
+# 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: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-08-25 11:50+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: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default invoicing rate for "
+"a specific journal 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the account data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    This module allows you to define the default invoicing rate for a "
+"specific journal on a given account. This is mostly used when a user encodes "
+"their timesheet: the values are retrieved and the fields are auto-filled... "
+"but the possibility to change these values is still available.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given by the account data so that this module is perfectly "
+"compatible with older configurations.\n"
+"\n"
+"    "
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Analytic Journal"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr "Billing Rate per Journal for this Analytic Account"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytic Account"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr "Relation table between journals and billing rates"
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr "Invoicing Rate per Journal"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"Error! The currency has to be the same as that of the selected company"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr "Invoicing Rate"
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Error! You can not create recursive analytic accounts."
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timesheet Line"
+
+#~ msgid "Analytic Journal Billing Rate"
+#~ msgstr "Analytic Journal Billing Rate"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "The Object name must start with x_ and not contain any special characters!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
index 9b519f458c7..4387aa93132 100644
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -122,12 +122,3 @@ msgstr "Línea hoja de servicios"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/analytic_journal_billing_rate/i18n/es_AR.po b/addons/analytic_journal_billing_rate/i18n/es_AR.po
index 1b00c2fff3f..728476e8ae0 100644
--- a/addons/analytic_journal_billing_rate/i18n/es_AR.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/es_EC.po b/addons/analytic_journal_billing_rate/i18n/es_EC.po
index bad6999c8fc..590ccfe2c30 100644
--- a/addons/analytic_journal_billing_rate/i18n/es_EC.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/es_MX.po b/addons/analytic_journal_billing_rate/i18n/es_MX.po
new file mode 100644
index 00000000000..be708d5fbe7
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/es_MX.po
@@ -0,0 +1,124 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic_journal_billing_rate
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-11 10:47+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: 2011-09-05 05:37+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default invoicing rate for "
+"a specific journal 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the account data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir el porcentaje de facturación para un "
+"cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
+"usuario codifica su hoja de servicios: los valores son recuperados y los "
+"campos son auto rellenados aunque la posibilidad de cambiar estos valores "
+"está todavía disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos de la cuenta como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr "Tasa de facturación por diario para esta cuenta analítica"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr "Tabla de relación entre diarios y tasas de facturación"
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr "Tasa de facturación por diario"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+"Tasa de facturación de un diario analítico. Define la tasa de facturación "
+"por defecto para un diario en concreto."
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr "Tasa de facturación"
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#~ 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 "Analytic Journal Billing Rate"
+#~ msgstr "Tasa facturación diario analítico"
diff --git a/addons/analytic_journal_billing_rate/i18n/es_PY.po b/addons/analytic_journal_billing_rate/i18n/es_PY.po
index bca50e0f48c..e08e060b00c 100644
--- a/addons/analytic_journal_billing_rate/i18n/es_PY.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/es_VE.po b/addons/analytic_journal_billing_rate/i18n/es_VE.po
new file mode 100644
index 00000000000..be708d5fbe7
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/es_VE.po
@@ -0,0 +1,124 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic_journal_billing_rate
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-11 10:47+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: 2011-09-05 05:37+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default invoicing rate for "
+"a specific journal 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the account data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir el porcentaje de facturación para un "
+"cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
+"usuario codifica su hoja de servicios: los valores son recuperados y los "
+"campos son auto rellenados aunque la posibilidad de cambiar estos valores "
+"está todavía disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos de la cuenta como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr "Tasa de facturación por diario para esta cuenta analítica"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr "Tabla de relación entre diarios y tasas de facturación"
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr "Tasa de facturación por diario"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+"Tasa de facturación de un diario analítico. Define la tasa de facturación "
+"por defecto para un diario en concreto."
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr "Tasa de facturación"
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#~ 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 "Analytic Journal Billing Rate"
+#~ msgstr "Tasa facturación diario analítico"
diff --git a/addons/analytic_journal_billing_rate/i18n/et.po b/addons/analytic_journal_billing_rate/i18n/et.po
index 515bc2c12b0..d6e4720b118 100644
--- a/addons/analytic_journal_billing_rate/i18n/et.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/fi.po b/addons/analytic_journal_billing_rate/i18n/fi.po
index 7f276c6408b..82542bdd060 100644
--- a/addons/analytic_journal_billing_rate/i18n/fi.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 13628)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/fr.po b/addons/analytic_journal_billing_rate/i18n/fr.po
index cad3b5085d1..c1aaac77315 100644
--- a/addons/analytic_journal_billing_rate/i18n/fr.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -122,9 +122,3 @@ msgstr "Ligne de prestation"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Taux de Facturation des Journaux Analytiques"
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Erreur : la référence BVR est requise."
diff --git a/addons/analytic_journal_billing_rate/i18n/gl.po b/addons/analytic_journal_billing_rate/i18n/gl.po
index ed4b98f608a..8928d34f502 100644
--- a/addons/analytic_journal_billing_rate/i18n/gl.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/hr.po b/addons/analytic_journal_billing_rate/i18n/hr.po
index 3c8e826853f..f4074f5bcf3 100644
--- a/addons/analytic_journal_billing_rate/i18n/hr.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/hu.po b/addons/analytic_journal_billing_rate/i18n/hu.po
index 810c3d5eccc..d80587f95bc 100644
--- a/addons/analytic_journal_billing_rate/i18n/hu.po
+++ b/addons/analytic_journal_billing_rate/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2011-01-30 18:59+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
index d900f83c375..f9b34384bb4 100644
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po
index b90e7292517..ee5bda959fb 100644
--- a/addons/analytic_journal_billing_rate/i18n/it.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -106,12 +106,3 @@ msgstr "Linea del Timesheet"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Giornale Conti Analitici Tasso di fatturazione"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/analytic_journal_billing_rate/i18n/ko.po b/addons/analytic_journal_billing_rate/i18n/ko.po
index fb2008c5c0d..2f2694a6721 100644
--- a/addons/analytic_journal_billing_rate/i18n/ko.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/lt.po b/addons/analytic_journal_billing_rate/i18n/lt.po
index 50f2ead78fd..92ebd272559 100644
--- a/addons/analytic_journal_billing_rate/i18n/lt.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/mn.po b/addons/analytic_journal_billing_rate/i18n/mn.po
index a94f2693397..941500d6e4d 100644
--- a/addons/analytic_journal_billing_rate/i18n/mn.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/nl.po b/addons/analytic_journal_billing_rate/i18n/nl.po
index 4a61ee0a5b1..b83d9d1138d 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -119,12 +119,3 @@ msgstr "Urenstaatregel"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/analytic_journal_billing_rate/i18n/nl_BE.po b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
index f97ab635b8c..fab54fa18fd 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl_BE.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/oc.po b/addons/analytic_journal_billing_rate/i18n/oc.po
index dc42697fd20..467c216b147 100644
--- a/addons/analytic_journal_billing_rate/i18n/oc.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/pl.po b/addons/analytic_journal_billing_rate/i18n/pl.po
index d18df5984d4..9a416e4d633 100644
--- a/addons/analytic_journal_billing_rate/i18n/pl.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/pt.po b/addons/analytic_journal_billing_rate/i18n/pt.po
index f673481bf2e..3b66863d5a1 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -104,18 +104,3 @@ msgstr ""
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Diário Analítico da Taxa de Faturação"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Erro! Número BVR inválido (soma de controlo errada)"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Erro: É necessária a referência BVR."
diff --git a/addons/analytic_journal_billing_rate/i18n/pt_BR.po b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
index 46b07945b3d..20fd755524e 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt_BR.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/ro.po b/addons/analytic_journal_billing_rate/i18n/ro.po
index 82f41e37afc..a0a0bd9099a 100644
--- a/addons/analytic_journal_billing_rate/i18n/ro.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po
index 6dd3db13ddd..7390b2681a1 100644
--- a/addons/analytic_journal_billing_rate/i18n/ru.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -41,7 +41,7 @@ msgstr "Книга аналитики"
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Счет"
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
@@ -76,22 +76,22 @@ msgstr ""
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Ошибка! Валюта должна совпадать с валютой выбранной компании"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
 msgid "Invoicing Rate"
-msgstr ""
+msgstr "Скорость выставления счета"
 
 #. module: analytic_journal_billing_rate
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные аналитический счета."
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Строка табеля"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/analytic_journal_billing_rate/i18n/sl.po b/addons/analytic_journal_billing_rate/i18n/sl.po
index a1fefeae8de..aaf67e369eb 100644
--- a/addons/analytic_journal_billing_rate/i18n/sl.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -76,7 +76,7 @@ msgstr ""
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Napaka! Valuta mora biti enaka kot valuta izbranega podjetja"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
@@ -101,14 +101,5 @@ msgstr "Postavka časovnice"
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Tarifa zaračunavanja analitičnega dnevnika"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
diff --git a/addons/analytic_journal_billing_rate/i18n/sq.po b/addons/analytic_journal_billing_rate/i18n/sq.po
index 361d72d4059..ae5586560b8 100644
--- a/addons/analytic_journal_billing_rate/i18n/sq.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po
index 14e85dd3f56..ee70f69fdbc 100644
--- a/addons/analytic_journal_billing_rate/i18n/sr.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/sr@latin.po b/addons/analytic_journal_billing_rate/i18n/sr@latin.po
index 17767530c8a..fc9079c82f2 100644
--- a/addons/analytic_journal_billing_rate/i18n/sr@latin.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/sv.po b/addons/analytic_journal_billing_rate/i18n/sv.po
index fafbd02b5d7..f3db44e268c 100644
--- a/addons/analytic_journal_billing_rate/i18n/sv.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -103,9 +103,3 @@ msgstr "Tidrapportrad"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Analytic Journal Billing Rate"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unikt!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/analytic_journal_billing_rate/i18n/tlh.po b/addons/analytic_journal_billing_rate/i18n/tlh.po
index 99853c32448..b7f1ff82198 100644
--- a/addons/analytic_journal_billing_rate/i18n/tlh.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index c3bbfc61a82..c45c825cdcb 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -32,6 +32,18 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Bu modül verilen bir hesapta belirli bir yevmiye için varsayılan "
+"faturalama oranını tanımlar. Bu ençok bir kullanıcı zaman çizelgesi "
+"kodlarken kullanılır: Değerler alınır ve alanlar otomatik doldurulur... ama "
+"bu değerleri değiştirebilme olanağı henüz yoktur.\n"
+"\n"
+"    Açıkçası geçerli hesap için bilgi kayıt edilmemişse, varsayılan değer "
+"olağan şekilde hesap verisi tarafından verilir ki; bu da mbu modülün eski "
+"yapılandırmayla uyumlu olduğunu gösterir.\n"
+"\n"
+"    "
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
@@ -41,12 +53,12 @@ msgstr "Yevmiye Analizi"
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
+msgstr "Bu Analiz Hesabına ait her yevmiyenin Ödem Oranı"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,account_id:0
@@ -57,12 +69,12 @@ msgstr "Analiz Hesabı"
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
 msgid "Relation table between journals and billing rates"
-msgstr ""
+msgstr "Ödeme oranı ve yevmiyeler arası ilişki tablosu"
 
 #. module: analytic_journal_billing_rate
 #: field:account.analytic.account,journal_rate_ids:0
 msgid "Invoicing Rate per Journal"
-msgstr ""
+msgstr "Her yevmiye için faturalama oranı"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
@@ -70,28 +82,30 @@ msgid ""
 "Analytic Journal Billing Rate, Define the default invoicing rate for a "
 "specific journal"
 msgstr ""
+"Analitik Yevmiye Ödeme Oranı, belirli bir yevmiye için varsayılan faturalama "
+"oranı tanımlayın."
 
 #. module: analytic_journal_billing_rate
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Hata! Para birimi seçilen firmanın para birimiyle aynı olmalı"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
 msgid "Invoicing Rate"
-msgstr ""
+msgstr "Faturalama Oranı"
 
 #. module: analytic_journal_billing_rate
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Yinelenen analiz hesabı oluşturamazsınız."
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Zaman Çizelgesi Satırı"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/analytic_journal_billing_rate/i18n/uk.po b/addons/analytic_journal_billing_rate/i18n/uk.po
index 22e40d63ec2..1c1d2008c41 100644
--- a/addons/analytic_journal_billing_rate/i18n/uk.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/vi.po b/addons/analytic_journal_billing_rate/i18n/vi.po
index d08dd2509ae..ce0544b3b63 100644
--- a/addons/analytic_journal_billing_rate/i18n/vi.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
index 66bdc9f3d2a..b87086b7ccb 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-08-03 00:37+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
@@ -32,21 +32,26 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    这模块允许您定义辅助核算项目的指定账簿的默认开票税率，这主要用在用户记工单：这值自动检索和填上。。但可以修改。\n"
+"\n"
+"    "
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
 msgid "Analytic Journal"
-msgstr "辅助核算记录集合"
+msgstr "辅助核算账薄"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "辅助核算记录集合中每个记录集合的开单税率"
+msgstr "这辅助核算项每个账簿的开单税率"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,account_id:0
@@ -57,26 +62,26 @@ msgstr "辅助核算项"
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
 msgid "Relation table between journals and billing rates"
-msgstr "记录集合和开票税率的关系表"
+msgstr "账簿和开票税率的关系表"
 
 #. module: analytic_journal_billing_rate
 #: field:account.analytic.account,journal_rate_ids:0
 msgid "Invoicing Rate per Journal"
-msgstr "每个记录集合的的开票税率"
+msgstr "每个账簿的开票税率"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
 msgid ""
 "Analytic Journal Billing Rate, Define the default invoicing rate for a "
 "specific journal"
-msgstr ""
+msgstr "辅助核算账簿的开票税率，为特定辅助核算账簿定义默认开票税率。"
 
 #. module: analytic_journal_billing_rate
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "错误！此币别必须是选定公司的默认币别。"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
@@ -86,34 +91,12 @@ msgstr "开票税率"
 #. module: analytic_journal_billing_rate
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "错误! 你不能创建递归的辅助核算项"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encode his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    这模块允许你定义指定分类帐里规定科目的默认开发票价格.这主要用于在时间表的用户代码:这值是自动计算和自动填写的字段,但可以修改这值.  \n"
-#~ "    \n"
-#~ "    显然,如果当前的科目没有记录的数据,默认的值是作为正常科目数据,所以这模块是完全兼容旧的设置\n"
-#~ "\n"
-#~ "    "
+msgstr "计工单明细"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_TW.po b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
index 3ff5b964355..053b1fc9556 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_TW.po
+++ b/addons/analytic_journal_billing_rate/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 9716495aabc..bb3ca084be7 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Hidden',
     'description': """
 This module allows you to define what is the default function of a specific user on a given account.
 ====================================================================================================
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index ca3e9ef80c7..cfb1aba10d1 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -24,7 +24,7 @@ from tools.translate import _
 
 class analytic_user_funct_grid(osv.osv):
 
-    _name="analytic_user_funct_grid"
+    _name="analytic.user.funct.grid"
     _description= "Relation table between users and products on a analytic account"
     _columns={
         'user_id': fields.many2one("res.users", "User", required=True,),
@@ -39,7 +39,7 @@ 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.'),
+        'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
     }
 
 account_analytic_account()
@@ -54,7 +54,7 @@ class hr_analytic_timesheet(osv.osv):
     # 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) ])
+        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:
             return temp
@@ -81,7 +81,7 @@ class hr_analytic_timesheet(osv.osv):
             return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
         else:
             #get the old values from super and add the value from the new relation analytic_user_funct_grid
-            r = self.pool.get('analytic_user_funct_grid').browse(cr, uid, temp)[0]
+            r = self.pool.get('analytic.user.funct.grid').browse(cr, uid, temp)[0]
             res.setdefault('value',{})
             res['value']= super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)['value']
             res['value']['product_id'] = r.product_id.id
@@ -119,7 +119,7 @@ class hr_analytic_timesheet(osv.osv):
             temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
             if temp:
                 #add the value from the new relation analytic_user_funct_grid
-                r = self.pool.get('analytic_user_funct_grid').browse(cr, uid, temp)[0]
+                r = self.pool.get('analytic.user.funct.grid').browse(cr, uid, temp)[0]
                 res['value']['product_id'] = r.product_id.id
 
                 #the change of product has to impact the amount, uom and general_account_id
@@ -143,3 +143,5 @@ class hr_analytic_timesheet(osv.osv):
 
 hr_analytic_timesheet()
 
+
+# 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 1863dd42fb5..763b3115814 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -5,7 +5,7 @@
         <!-- analytic_user_funct_grid views -->
         <record model="ir.ui.view" id="analytic_user_funct_grid_tree">
             <field name="name">analytic_user_funct_grid.tree</field>
-            <field name="model">analytic_user_funct_grid</field>
+            <field name="model">analytic.user.funct.grid</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="User's Product for this Analytic Account" editable="bottom">
@@ -17,7 +17,7 @@
 
         <record model="ir.ui.view" id="analytic_user_funct_grid_form">
             <field name="name">analytic_user_funct_grid.form</field>
-            <field name="model">analytic_user_funct_grid</field>
+            <field name="model">analytic.user.funct.grid</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User's Product for this Analytic Account">
@@ -55,7 +55,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <!-- hr_timesheet_sheet.sheet inherited view -->
         <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit1">
             <field name="name">hr.timesheet.sheet.form.form</field>
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index 56d0a44d2b5..d273a44629c 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1e67d1b0aef..496017babe7 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6ec1f6475fd..9a4887b60f9 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e4c81c1600d..6a820bdf3c0 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -125,19 +125,3 @@ msgstr "Producte de l'usuari per aquesta compte analític"
 #~ msgstr ""
 #~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 #~ "especial!"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No s'ha definit un compte de despeses \r\n"
-#~ "per aquest producte: \"%s\" (id:%d)"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                    "
-#~ "'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No s'ha definit un compte de despeses \r\n"
-#~ "per aquest producte: \"%s\" (id:%d)"
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index 82c076d25c7..2337999a02f 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 01bfd6f5b36..b72181f5c62 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -126,12 +126,3 @@ msgstr "Produkte des Benutzers"
 #~ msgstr ""
 #~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
 #~ "beinhalten"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 7130ecbcb53..0a7a67f2da6 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..77a9bc58d96
--- /dev/null
+++ b/addons/analytic_user_function/i18n/en_GB.po
@@ -0,0 +1,124 @@
+# 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: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-08-25 17:43+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: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. 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 "Error !"
+msgstr "Error !"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timesheet Line"
+
+#. 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 "Analytic Account"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Users/Products Rel."
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr "User"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"Error! The currency has to be the same as that of the selected company"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "There is no expense account define for this product: \"%s\" (id:%d)"
+
+#. 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 "Relation table between users and products on a analytic account"
+
+#. module: analytic_user_function
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    This module allows you to define 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr "Analytic User Function"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Error! You can not create recursive analytic accounts."
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "User's Product for this Analytic Account"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "The Object name must start with x_ and not contain any special characters!"
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index cb1c41836f1..dadce7452c9 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -127,28 +127,3 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 #~ "especial!"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de gastos \r\n"
-#~ "para este producto: \"%s\" (id:%d)"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                    "
-#~ "'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de gastos \r\n"
-#~ "para este producto: \"%s\" (id:%d)"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index a24ad3c9e9b..872e141ade0 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po
index 1f86facb764..d394b5105ba 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -121,26 +121,8 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
 
-#~ msgid "Analytic Journal"
-#~ msgstr "Diario analítico"
-
 #~ 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 "Billing Rate per Journal for this Analytic Account"
-#~ msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#~ msgid "Relation table between journals and billing rates"
-#~ msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#~ msgid "Invoicing Rate per Journal"
-#~ msgstr "Tasa de facturación por diario"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid "Invoicing Rate"
-#~ msgstr "Tasa de facturación"
diff --git a/addons/analytic_user_function/i18n/es_MX.po b/addons/analytic_user_function/i18n/es_MX.po
new file mode 100644
index 00000000000..fbe16517d0d
--- /dev/null
+++ b/addons/analytic_user_function/i18n/es_MX.po
@@ -0,0 +1,129 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic_user_function
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-16 18:03+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:39+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Rel. usuarios/productos"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#. module: analytic_user_function
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir la función por defecto para un cierto "
+"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+"codifica su hoja de servicios: los valores son recuperados y los campos son "
+"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+"disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos del empleado como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr "Función analítica de usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
diff --git a/addons/analytic_user_function/i18n/es_PY.po b/addons/analytic_user_function/i18n/es_PY.po
index 73bb60685f2..9b50c9e9ba3 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_VE.po b/addons/analytic_user_function/i18n/es_VE.po
new file mode 100644
index 00000000000..fbe16517d0d
--- /dev/null
+++ b/addons/analytic_user_function/i18n/es_VE.po
@@ -0,0 +1,129 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic_user_function
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-16 18:03+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:39+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Rel. usuarios/productos"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#. module: analytic_user_function
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module 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.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir la función por defecto para un cierto "
+"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+"codifica su hoja de servicios: los valores son recuperados y los campos son "
+"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+"disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos del empleado como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr "Función analítica de usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index 292105df993..76b241bf0ae 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 78387b7f6bd..28e761315b6 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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6dde85fe53b..76bcc77f418 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -122,12 +122,3 @@ msgstr "Produit de l'Utilisateur pour ce Compte Analytique"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne peut jamais être inférieure à 1 !"
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index 980e9e056fa..4ffe7c81adc 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 13622a897fb..8f795e66fcc 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 deb8017e7ec..10e8f5f3dd9 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2011-02-09 13:28+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6896aeca47a..17f6be398c5 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b675107041f..68947443ca9 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -126,12 +126,3 @@ msgstr "Prodotto di utente per questo conto analitico"
 #~ msgstr ""
 #~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 #~ "speciali!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index 4ed87b01d49..0a863e52b1f 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c91b417bfa2..d82d1f833f3 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2638feb6d61..a2491f5cd74 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 81181139d76..92838aa2b41 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -111,12 +111,3 @@ msgstr "Product van gebruiker voor deze kostenplaats"
 #~ "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 "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index dc78caf03de..86ae6f63505 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0e0b1788688..4eec5cc7a86 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 497b0e60846..a7e53ed040d 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -111,12 +111,3 @@ msgstr "Produto do Utilizador para esta Conta Analítica"
 #~ msgstr ""
 #~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
 #~ "especial !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index ccf56ea3ab3..f5c700b9b08 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index d97e36c957e..4dc941f8720 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ca1159a8739..29331b330a6 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -26,12 +26,12 @@ msgstr "Продукт"
 #: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "Error !"
-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
 #: field:analytic_user_funct_grid,account_id:0
@@ -55,14 +55,14 @@ msgstr "Пользователь"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Ошибка! Валюта должна совпадать с валютой выбранной компании"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:97
 #: code:addons/analytic_user_function/analytic_user_function.py:132
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -85,6 +85,18 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Этот модуль позволяет определить функцию пользователя по-умолчанию для "
+"данной учётной записи. Чаще всего это используется при заполнении "
+"пользователем табеля: значения получаются и поля заполняются "
+"автоматически... но сохраняется возможность изменить эти значения.\n"
+"\n"
+"    Очевидно, если для данной учётной записи никаких данных записано не "
+"было, значение по-умолчанию предоставляется данными сотрудника, так что этот "
+"модуль прекрасно совместим с более старыми конфигурациями.\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -94,7 +106,7 @@ 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
 #: view:analytic_user_funct_grid:0
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 6f6741184f2..2c9e5c562b5 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a753efe517e..61750c30d25 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
 msgid "Product"
-msgstr "Proizvod"
+msgstr "Izdelek"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:96
@@ -55,14 +55,14 @@ msgstr "Uporabnik"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Napaka! Valuta mora biti enaka kot valuta izbranega podjetja"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:97
 #: code:addons/analytic_user_function/analytic_user_function.py:132
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Ni definiranega konta stroškov za ta izdelek: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -85,6 +85,18 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Ta modul vam omogoča, da določite, kaj je privzeta funkcija določenega "
+"uporabnika za določen račun. To se večinoma uporablja, ko uporabnik definira "
+"svoje opravljene ure: vrednosti so pridobljene in polja so avtomatsko "
+"vnešena ... ampak možnost spremembe teh vrednosti so še vedno na voljo.\n"
+"\n"
+"Seveda, če podatki niso bili  zapisani za trenutni račun, je privzeta "
+"vrednost, ki je ponavadi pridobljena iz podatkov zaposlenih, tako da je ta "
+"modul popolnoma združljiv s starejšimi konfiguracijami.\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -108,12 +120,3 @@ msgstr "Uporabniški proizvodi za ta analitični konto"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po
index 3621d97d480..1ccf4e2e7de 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f98adc95b99..9c317cee7c9 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -109,17 +109,3 @@ msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                    "
-#~ "'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index 3d41f1d347b..944c1d071f1 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -109,17 +109,3 @@ msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                    "
-#~ "'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
-
-#, python-format
-#~ msgid ""
-#~ "There is no expense account define ' \\n                                'for "
-#~ "this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)"
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index d8f9bd79315..066e9c69cf3 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 97c8723eb42..11efa1c967c 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 27907e602d7..fa0210c5bce 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: 2011-05-09 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -62,7 +62,7 @@ msgstr "Hata! Para birim seçilen şirketin para birimiyle aynı olmalı"
 #: code:addons/analytic_user_function/analytic_user_function.py:132
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Bu ürün için tanımlı masraf hesabı yok: \"%s\" (id:%d)"
+msgstr "Bu ürün için tanımlı gider hesabı yok: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 031bf8fea80..e8c6bbc51a3 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1b15a4c05f1..f0b98d60137 100644
--- a/addons/analytic_user_function/i18n/vi.po
+++ b/addons/analytic_user_function/i18n/vi.po
@@ -14,42 +14,42 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. 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 "Error !"
-msgstr ""
+msgstr "Lỗi !"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Dòng chấm công"
 
 #. 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 "Tài khoản KTQT"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Liên kết Người sử dụng/Sản phẩm"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Người sử dụng"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -95,7 +95,7 @@ msgstr ""
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Lỗi! Bạn không thể tạo các tài khoản phân tích đệ quy."
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 04645408267..9513b2ed776 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-09-29 09:18+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -31,13 +31,13 @@ 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
 #: 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
@@ -55,14 +55,14 @@ msgstr "用户"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "错误！此币别必须是选定公司的默认币别。"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:97
 #: code:addons/analytic_user_function/analytic_user_function.py:132
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "此产品 \"%s\" （id：%d）没有定义辅助核算项"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -85,6 +85,12 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    此模块允许你定义给定的用户默认的职能。常用于用户输入计工单：这些预定义的值默认填充了字段，当然可以修改。\n"
+"当然，如果当前用户没有默认的数据，这些默认值会从员工记录去取。所以此模块与之前的配置是兼容的。\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -94,34 +100,12 @@ 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
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr "用户的产品辅助核算项目"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default function of a "
-#~ "specific user on a given account. This is mostly used when a user encode his "
-#~ "timesheet: the values are retrieved and the fields are auto-filled... but "
-#~ "the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the employee data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    这模块允许你定义在特定科目的默认功能.这主要用于在时间表的用户代码:这值是自动计算和自动填写的字段,但可以修改这值.\n"
-#~ "    \n"
-#~ "    显然,如果当前的科目没有记录的数据,默认的值是作为正常科目数据,所以这模块是完全兼容旧的设置\n"
-#~ "\n"
-#~ "    "
+msgstr "用户产品的辅助核算项"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index e52e5dae7cd..adf25d7dae9 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
diff --git a/addons/anonymization/__init__.py b/addons/anonymization/__init__.py
index 7be1a934c5a..4ddf3009947 100644
--- a/addons/anonymization/__init__.py
+++ b/addons/anonymization/__init__.py
@@ -22,3 +22,5 @@
 
 import anonymization
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index 842b774eb9c..ed22530c6bc 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -24,7 +24,7 @@
 {
     'name': 'Database Anonymization',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module allows you to anonymize a database.
@@ -57,3 +57,5 @@ anonymization process to recover your previous data.
     'images': ['images/anonymization1.jpeg','images/anonymization2.jpeg','images/anonymization3.jpeg'],
 }
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index c4a2d9f0488..39fb415e9e1 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -52,7 +52,7 @@ class ir_model_fields_anonymization(osv.osv):
     }
 
     _sql_constraints = [
-        ('model_id_field_id_uniq', 'unique (model_name, field_name)', _("You cannot have two records having the same model and the same field")),
+        ('model_id_field_id_uniq', 'unique (model_name, field_name)', _("You cannot have two fields with the same name on the same object!")),
     ]
 
     def _get_global_state(self, cr, uid, context=None):
@@ -239,7 +239,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         return res
 
     _columns = {
-        'name': fields.char(size='64', string='File Name'),
+        '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'),
@@ -578,3 +578,5 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
 
 ir_model_fields_anonymize_wizard()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/anonymization/i18n/bg.po b/addons/anonymization/i18n/bg.po
index 6728a57f89a..34c5c8272c2 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 447b07682f7..969531ec13a 100644
--- a/addons/anonymization/i18n/ca.po
+++ b/addons/anonymization/i18n/ca.po
@@ -14,61 +14,61 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
 msgid "ir.model.fields.anonymize.wizard"
-msgstr ""
+msgstr "ir.model.fields.anonymize.wizard"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
-msgstr ""
+msgstr "Nom del camp"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "Camp"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
 msgid "Import"
-msgstr ""
+msgstr "Importa"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
 msgid "ir.model.fields.anonymization"
-msgstr ""
+msgstr "ir.model.fields.anonymization"
 
 #. module: anonymization
 #: model:ir.module.module,shortdesc:anonymization.module_meta_information
 msgid "Database anonymization module"
-msgstr ""
+msgstr "Mòdul per fer anònima la base de dades"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,direction:0
 msgid "Direction"
-msgstr ""
+msgstr "Direcció"
 
 #. 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 ""
+msgstr "Camps fets anònims"
 
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
 msgid "Database anonymization"
-msgstr ""
+msgstr "Fes anònima la base de dades"
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:55
@@ -76,80 +76,81 @@ msgstr ""
 #, python-format
 msgid "You cannot have two records having the same model and the same field"
 msgstr ""
+"No podeu tenir dos registres que tinguin el mateix model i el mateix camp"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Anonymized"
-msgstr ""
+msgstr "Fet anònim"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,state:0
 msgid "unknown"
-msgstr ""
+msgstr "desconegut"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,model_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objecte"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
 msgid "File path"
-msgstr ""
+msgstr "Ruta del fitxer"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_export:0
 msgid "Export"
-msgstr ""
+msgstr "Exporta"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Reverse the Database Anonymization"
-msgstr ""
+msgstr "Reverteix l'anonimat de la base de dades"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
-msgstr ""
+msgstr "Base de dades anònima"
 
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
 msgid "Anonymize database"
-msgstr ""
+msgstr "fes anònima la base de dades"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
 #: field:ir.model.fields.anonymization.history,field_ids:0
 msgid "Fields"
-msgstr ""
+msgstr "Camps"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Clear"
-msgstr ""
+msgstr "Neteja"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
 msgid "clear -> anonymized"
-msgstr ""
+msgstr "A la vista -> anònim"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 #: field:ir.model.fields.anonymize.wizard,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resum"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization:0
 msgid "Anonymized Field"
-msgstr ""
+msgstr "Camp anònim"
 
 #. module: anonymization
 #: model:ir.module.module,description:anonymization.module_meta_information
@@ -158,69 +159,72 @@ msgid ""
 "This module allows you to anonymize a database.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul li permet fer anònima una base de dades\n"
+"    "
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Unstable"
-msgstr ""
+msgstr "Inestable"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Exception occured"
-msgstr ""
+msgstr "S'ha produït una excepció"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Not Existing"
-msgstr ""
+msgstr "No existeix"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,model_name:0
 msgid "Object Name"
-msgstr ""
+msgstr "Nom de l'objecte"
 
 #. 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 ""
+msgstr "Històric de fer anònima"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
 msgid "ir.model.fields.anonymization.history"
-msgstr ""
+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 ""
+msgstr "Fes anònima la base de dades"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,name:0
 msgid "File Name"
-msgstr ""
+msgstr "Nom del fitxer"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
 msgid "anonymized -> clear"
-msgstr ""
+msgstr "Anònim --> A la vista"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Started"
-msgstr ""
+msgstr "Iniciat"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. 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 ""
+msgstr "Missatge"
diff --git a/addons/anonymization/i18n/de.po b/addons/anonymization/i18n/de.po
index 1857b1cc5bc..b931d5d3901 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1d37cec37fd..96705146bd8 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es_EC.po b/addons/anonymization/i18n/es_EC.po
index 2bdcd68a654..2ce9a0fda64 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es_MX.po b/addons/anonymization/i18n/es_MX.po
new file mode 100644
index 00000000000..9e3efabb524
--- /dev/null
+++ b/addons/anonymization/i18n/es_MX.po
@@ -0,0 +1,230 @@
+# Spanish 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-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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 "Nombre de campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr "Módulo para hacer anónima la base de datos"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Dirección"
+
+#. 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 "Campos hechos anónimos"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Hacer anónima la base de datos"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+"No puede tener dos registros que tengan el mismo modelo y el mismo campo"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Hecho anónimo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Ruta de archivo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Exportar"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Revertir el hacer anónima la base de datos"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Hacer anónima la base de datos"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Hacer anónima la base de datos"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "A la vista"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "A la vista -> anónimo"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Campo anónimo"
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le permite hacer anónima una base de datos\n"
+"    "
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Inestable"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Se ha producido una anomalía"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "No existente"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Nombre de objeto"
+
+#. 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 "Histórico de hacer anónima"
+
+#. 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 "Hace anónima la base de datos"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Nombre de archivo"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anónimo --> A la vista"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Iniciado"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. 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 "Mensaje"
diff --git a/addons/anonymization/i18n/es_PY.po b/addons/anonymization/i18n/es_PY.po
index 465845ecc81..855bc40bb4e 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es_VE.po b/addons/anonymization/i18n/es_VE.po
new file mode 100644
index 00000000000..9e3efabb524
--- /dev/null
+++ b/addons/anonymization/i18n/es_VE.po
@@ -0,0 +1,230 @@
+# Spanish 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-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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 "Nombre de campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr "Módulo para hacer anónima la base de datos"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Dirección"
+
+#. 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 "Campos hechos anónimos"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Hacer anónima la base de datos"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+"No puede tener dos registros que tengan el mismo modelo y el mismo campo"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Hecho anónimo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Ruta de archivo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Exportar"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Revertir el hacer anónima la base de datos"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Hacer anónima la base de datos"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Hacer anónima la base de datos"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "A la vista"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "A la vista -> anónimo"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Campo anónimo"
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le permite hacer anónima una base de datos\n"
+"    "
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Inestable"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Se ha producido una anomalía"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "No existente"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Nombre de objeto"
+
+#. 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 "Histórico de hacer anónima"
+
+#. 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 "Hace anónima la base de datos"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Nombre de archivo"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anónimo --> A la vista"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Iniciado"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. 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 "Mensaje"
diff --git a/addons/anonymization/i18n/et.po b/addons/anonymization/i18n/et.po
new file mode 100644
index 00000000000..d56f256b218
--- /dev/null
+++ b/addons/anonymization/i18n/et.po
@@ -0,0 +1,226 @@
+# Estonian 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-10-11 18:09+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Välja Nimi:"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Väli"
+
+#. 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 "Import"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Suund"
+
+#. 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
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+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 "Objekt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Faili asukoht"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Kuupäev"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Eksport"
+
+#. 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 "Väljad"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Kokkuvõte"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+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 "Objekti nimi"
+
+#. 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 ""
diff --git a/addons/anonymization/i18n/fi.po b/addons/anonymization/i18n/fi.po
index 9526b2a0f71..33a50699ccc 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: 2011-07-01 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 efda37b62ca..99a1e7f2e5a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -159,6 +159,9 @@ msgid ""
 "This module allows you to anonymize a database.\n"
 "    "
 msgstr ""
+"\n"
+"Ce module sert à masquer les données d'une base de données.\n"
+"    "
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
diff --git a/addons/anonymization/i18n/gl.po b/addons/anonymization/i18n/gl.po
index 102b20d7adc..2cf72df9347 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 103094a3b01..c9fa2f37f30 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/nl.po b/addons/anonymization/i18n/nl.po
index df5f1707613..df0f6b47414 100644
--- a/addons/anonymization/i18n/nl.po
+++ b/addons/anonymization/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/pl.po b/addons/anonymization/i18n/pl.po
index 7daceb550f1..b85075b0492 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 00f32c21c99..f5372c56bde 100644
--- a/addons/anonymization/i18n/pt_BR.po
+++ b/addons/anonymization/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: 2011-07-03 04:47+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 950dd4db662..df16f662e94 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 883ba86d8af..7667caf2106 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/tr.po b/addons/anonymization/i18n/tr.po
index c793e949cc8..f6c5c32c8d7 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: 2011-05-29 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 091abc283af..c352a16c71f 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: 2011-07-15 04:51+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -25,7 +25,7 @@ msgstr "ir.model.fields.anonymize.wizard"
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
 msgid "Field Name"
-msgstr "字段名"
+msgstr "字段名称"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_id:0
@@ -51,7 +51,7 @@ msgstr "ir.model.fields.anonymization"
 #. module: anonymization
 #: model:ir.module.module,shortdesc:anonymization.module_meta_information
 msgid "Database anonymization module"
-msgstr "Database anonymization module"
+msgstr "数据库隐藏模块"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,direction:0
@@ -68,14 +68,14 @@ msgstr "隐藏的字段"
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
 msgid "Database anonymization"
-msgstr "隐藏数据库"
+msgstr "数据库隐藏"
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:55
 #: sql_constraint:ir.model.fields.anonymization:0
 #, python-format
 msgid "You cannot have two records having the same model and the same field"
-msgstr "同一模型同一字段不能有有两个相同的字段"
+msgstr "同一模块同一字段不能有两个相同的记录"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
@@ -86,7 +86,7 @@ msgstr "隐藏"
 #. module: anonymization
 #: field:ir.model.fields.anonymization,state:0
 msgid "unknown"
-msgstr "未知的"
+msgstr "状态"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,model_id:0
@@ -138,7 +138,7 @@ msgstr "无隐藏"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
 msgid "clear -> anonymized"
-msgstr "无隐藏->隐藏"
+msgstr "无隐藏 -> 隐藏"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
@@ -159,7 +159,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"这个字段允许你隐藏一个数据库\n"
+"这模块允许你隐藏一个数据库\n"
 "    "
 
 #. module: anonymization
@@ -188,7 +188,7 @@ msgstr "对象名"
 #: view:ir.model.fields.anonymization.history:0
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
 msgid "Anonymization History"
-msgstr "隐藏历史"
+msgstr "隐藏日志"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
@@ -204,7 +204,7 @@ msgstr "隐藏数据库"
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,name:0
 msgid "File Name"
-msgstr "文件的名称"
+msgstr "文件名"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
@@ -219,7 +219,7 @@ msgstr "已开始"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
 msgid "Done"
-msgstr "已完成"
+msgstr "完成"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
diff --git a/addons/association/__init__.py b/addons/association/__init__.py
index 5b34f17fec9..4716d0d109b 100644
--- a/addons/association/__init__.py
+++ b/addons/association/__init__.py
@@ -18,6 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import profile_association
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 51d44bf681d..3dc6c03f94e 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Association profile',
     'version': '0.1',
-    'category': 'General',
-    'category': 'Profile',
+    'category': 'Specific Industry Applications',
     'complexity': "normal",
     'description': """
 This module is to configure modules related to an association.
diff --git a/addons/association/i18n/ar.po b/addons/association/i18n/ar.po
index bf2b7594a92..9951ce3dd25 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3fc4378e822..8acdd17500f 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -143,12 +143,3 @@ msgstr "Управление на проект"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Настройване"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
diff --git a/addons/association/i18n/bs.po b/addons/association/i18n/bs.po
index ae79f87068f..4d13f668cd7 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -132,38 +132,3 @@ msgstr "Upravljanje Projektom"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 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 "Relationship Management"
-#~ msgstr "Upravljanje Odnosima"
-
-#~ msgid "Segmentation"
-#~ msgstr "Segmentacija"
-
-#~ msgid "Document Management"
-#~ msgstr "Upravljanje Dokumentacijom"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr "Profil Društva : Instaliraj Dodatne Module"
-
-#~ msgid "Profile for Associates"
-#~ msgstr "Profil za Članove"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#~ msgid "Partner Relation & Calendars"
-#~ msgstr "Odnosi Partnera i Kalendari"
-
-#~ msgid "Install"
-#~ msgstr "Instaliraj"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "Instaliraj Dodatne Module"
-
-#~ msgid "Cancel"
-#~ msgstr "Poništi"
diff --git a/addons/association/i18n/ca.po b/addons/association/i18n/ca.po
index ba98b87b3fa..c87dd752ff4 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -25,7 +25,7 @@ msgstr "Wiki"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "Gestió d'esdeveniments"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
@@ -35,12 +35,12 @@ msgstr "Aconsegueix les coses acabades (GTD)"
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "Aquest mòdul serveix per crear perfils per als associats"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. 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 ""
+"Aquí es mostren aplicacions específiques en relació amb el perfil de "
+"l'associació que heu seleccionat."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "Li ajuda a gestionar i organitzar els seus esdeveniments."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@@ -70,6 +72,9 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Controla i gestiona les despeses dels empleats i podeu re-facturar-les als "
+"clients de forma automàtica si les despeses estan relacionades amb un "
+"projecte."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -100,7 +105,7 @@ msgstr "Seguiment de despeses"
 #: 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 "Configuració de l'aplicació per a associacions"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -108,6 +113,9 @@ 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 ""
+"Li permet crear pàgines wiki i els grups de pàgines amb la finalitat de "
+"gestionar el coneixement del negoci i compartir-ho amb i entre els seus "
+"treballadors."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@@ -115,6 +123,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Li ajuda a gestionar els seus projectes i tasques realitzant un seguiment "
+"dels mateixos, generant planificacions, ..."
 
 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
@@ -124,7 +134,7 @@ msgstr "perfil.associacio.config.assistent_instal_moduls"
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "Esdeveniments"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -135,73 +145,4 @@ msgstr "Gestió de projectes"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Relationship Management"
-#~ msgstr "Gestió de relacions"
-
-#~ msgid ""
-#~ "The Document Management System of Open ERP allows you to store, browse, "
-#~ "automatically index, search and preview all kind of documents (internal "
-#~ "documents, printed reports, calendar system). It opens an FTP access for the "
-#~ "users to easily browse association's document."
-#~ msgstr ""
-#~ "El sistema de gestió de documentació d'OpenERP us permet emmagatzemar, "
-#~ "navegar, classificar automàticament, buscar i visualitzar tot tipus de "
-#~ "documents (documents interns, informes impresos, sistema de calendari). Obre "
-#~ "un accés de FTP per a que els usuaris naveguin fàcilment pels documents "
-#~ "associats."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#~ msgid "Segmentation"
-#~ msgstr "Segmentació"
-
-#~ msgid "Document Management"
-#~ msgstr "Gestió documental"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr "Perfil associació : Instal·la mòduls extra"
-
-#~ msgid "Profile for Associates"
-#~ msgstr "Perfil per associacions"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ msgid "Partner Relation & Calendars"
-#~ msgstr "Relacions amb empreses & Calendaris"
-
-#~ msgid "Install"
-#~ msgstr "Instal·la"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "Instal·la mòdul extra"
-
-#~ msgid ""
-#~ "Tracks the personal expenses process, from the employee expense encoding, to "
-#~ "the reimbursement of the employee up to the reinvoicing to the final "
-#~ "customer."
-#~ msgstr ""
-#~ "Realitza el seguiment de despeses personals, des de la codificació de la "
-#~ "despesa de l'empleat i el reembossament de l'empleat fins la seva facturació "
-#~ "al client final."
-
-#~ msgid ""
-#~ "Install more modules. A few modules are proposed according to the "
-#~ "association profile you selected. You will be able to install them based on "
-#~ "our requirements."
-#~ msgstr ""
-#~ "Instal·leu més mòduls. Es proposen uns quants mòduls relacionats amb el "
-#~ "perfil d'associació que heu seleccionat. Els podreu instal·lar a partir dels "
-#~ "nostres requisits."
-
-#~ msgid "Cancel"
-#~ msgstr "Cancel·la"
+msgstr "Configura"
diff --git a/addons/association/i18n/cs.po b/addons/association/i18n/cs.po
index c7dcf2540c4..08431ed8d93 100644
--- a/addons/association/i18n/cs.po
+++ b/addons/association/i18n/cs.po
@@ -4,17 +4,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: openobject-addons\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:51+0000\n"
-"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-11-25 12:34+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:50+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -24,22 +25,22 @@ msgstr "Wiki"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "Správa událostí"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Mít vše hotovo (GTD)"
 
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "Tento modul je k vytváření profilů asociací."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Proces nastavení"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -47,21 +48,22 @@ msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
 msgstr ""
+"Zde jsou specifické aplikace vztažené k vámi vybraným profilům asociací."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "titulek"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "Pomůže vám spravovat a organizovat vaše události."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obrázek"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@@ -69,6 +71,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Sleduje a spravuje útraty zaměstnanců a může automaticky znovu fakturovat "
+"klientům, pokud útraty jsou vztažené k projektu."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -76,27 +80,29 @@ 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 je metodologie k efektivní organizaci váš a vašich úkolů. Tento modul "
+"plně integruje principy GTD se správou projektů OpenERP."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "Správa zdrojů"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr ""
+msgstr "Profil asociací"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr ""
+msgstr "Sledování útrat"
 
 #. 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 "Nastavení aplikace asociací"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -104,6 +110,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 ""
+"Umožní vám vytvářet wiki stránky a skupiny stránek pro udržení přehledu o "
+"obchodních znalostích a sdílet je s a mezi vašimi zaměstnanci."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@@ -111,16 +119,18 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Pomůže vám spravovat vaše projekty a úkoly pomocí jejich sledování, "
+"generování plánování, atd..."
 
 #. 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 "Události"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -131,18 +141,4 @@ msgstr "Správa projektů"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-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 "Install"
-#~ msgstr "Instalovat"
-
-#~ msgid "Cancel"
-#~ msgstr "Ukončení"
+msgstr "Nastavit"
diff --git a/addons/association/i18n/de.po b/addons/association/i18n/de.po
index 2e6ef634313..0e500c22f72 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -147,80 +147,3 @@ msgstr "Projektmanagement"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Konfigurieren"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "Relationship Management"
-#~ msgstr "Beziehungsmanagement"
-
-#~ msgid ""
-#~ "The Document Management System of Open ERP allows you to store, browse, "
-#~ "automatically index, search and preview all kind of documents (internal "
-#~ "documents, printed reports, calendar system). It opens an FTP access for the "
-#~ "users to easily browse association's document."
-#~ msgstr ""
-#~ "Das Dokumentenmanagement erlaubt Ihnen das Speichern, Browsen, Indexieren, "
-#~ "Suchen und die Ansicht aller Arten von Dokumente (interne Dokumente, Bilder, "
-#~ "Reports, Kalender). Es erlaubt einen FTP Zugang für die Benutzer um einfach "
-#~ "im Dokumentenpool zu surfen."
-
-#~ msgid "Segmentation"
-#~ msgstr "Segmentierung"
-
-#~ msgid "Document Management"
-#~ msgstr "Dokumenten Management"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr "Vereins Profile: Installiere Extra Module"
-
-#~ msgid "Profile for Associates"
-#~ msgstr "Profile für Vereinigungen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "Partner Relation & Calendars"
-#~ msgstr "Partner Verbindungen & Kalender"
-
-#~ msgid "Install"
-#~ msgstr "Installiere"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "Installiere Extra Module"
-
-#~ msgid ""
-#~ "Tracks the personal expenses process, from the employee expense encoding, to "
-#~ "the reimbursement of the employee up to the reinvoicing to the final "
-#~ "customer."
-#~ msgstr ""
-#~ "Erlaubt eine Erfassung und Kontrolle der Ausgaben, z.B. von Nebenkosten der "
-#~ "Mitarbeiter (Spesen, Reisekosten), Auszahlungen von Nebenkosten sowie der "
-#~ "Weiterberechnung an Kunden."
-
-#~ msgid ""
-#~ "Install more modules. A few modules are proposed according to the "
-#~ "association profile you selected. You will be able to install them based on "
-#~ "our requirements."
-#~ msgstr ""
-#~ "Weitere Module installieren. Einige Module werden aufgrund des "
-#~ "Mitgliedschafstprofiles zur INstllation vorgeschlagen. Sie können dies je "
-#~ "nach Bedarf installieren"
-
-#~ msgid "Cancel"
-#~ msgstr "Abbrechen"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/association/i18n/el.po b/addons/association/i18n/el.po
index 835106cccc0..2d1afd15a3e 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -136,24 +136,3 @@ msgstr "Διαχείριση Έργων"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Παραμετροποίηση"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Το πιστοποιητικό ταυτότητας του στοιχείου πρέπει να είναι μοναδικό"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Το μέγεθος του πεδίου δε μπορεί ποτέ να είναι μικρότερο από 1!"
diff --git a/addons/association/i18n/en_GB.po b/addons/association/i18n/en_GB.po
new file mode 100644
index 00000000000..dae61913de7
--- /dev/null
+++ b/addons/association/i18n/en_GB.po
@@ -0,0 +1,145 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 17:44+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: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Event Management"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Getting Things Done"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "This module is to create Profile for Associates"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Configuration Progress"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "title"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Helps you to manage and organise your events."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Image"
+
+#. 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 ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Resources Management"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Association profile"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Expenses Tracking"
+
+#. 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 "Association Application Configuration"
+
+#. 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 ""
+"Lets you create wiki pages and page groups to keep track of business "
+"knowledge and share it with and between your employees."
+
+#. 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 ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Events"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Project Management"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Configure"
diff --git a/addons/association/i18n/es.po b/addons/association/i18n/es.po
index e75148d845c..d5fc54f2ebc 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -145,81 +145,3 @@ msgstr "Gestión de proyectos"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Configurar"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Relationship Management"
-#~ msgstr "Gestión de relaciones"
-
-#~ msgid ""
-#~ "The Document Management System of Open ERP allows you to store, browse, "
-#~ "automatically index, search and preview all kind of documents (internal "
-#~ "documents, printed reports, calendar system). It opens an FTP access for the "
-#~ "users to easily browse association's document."
-#~ msgstr ""
-#~ "El sistema de gestión documental de OpenERP le permite almacenar, navegar, "
-#~ "clasificar automáticamente, buscar y visualizar todo tipo de documentos "
-#~ "(documentos internos, informes impresos, sistema de calendario). Abre un "
-#~ "acceso de FTP para que los usuarios naveguen fácilmente en los documentos "
-#~ "asociados."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Segmentation"
-#~ msgstr "Segmentación"
-
-#~ msgid "Document Management"
-#~ msgstr "Gestión documental"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr "Perfil asociación : Instalar módulos extra"
-
-#~ msgid "Profile for Associates"
-#~ msgstr "Perfil para asociados"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Partner Relation & Calendars"
-#~ msgstr "Relaciones de empresa y calendarios"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "Instalar módulo extra"
-
-#~ msgid ""
-#~ "Tracks the personal expenses process, from the employee expense encoding, to "
-#~ "the reimbursement of the employee up to the reinvoicing to the final "
-#~ "customer."
-#~ msgstr ""
-#~ "Realiza el seguimiento de gastos personales, desde la codificación del gasto "
-#~ "del empleado, pasando por el reembolso del empleado hasta su facturación al "
-#~ "cliente final."
-
-#~ msgid ""
-#~ "Install more modules. A few modules are proposed according to the "
-#~ "association profile you selected. You will be able to install them based on "
-#~ "our requirements."
-#~ msgstr ""
-#~ "Instalar más módulos. Se proponen unos cuantos módulos relacionados con el "
-#~ "perfil de asociación que ha seleccionado. Podrá instalarlos en base a "
-#~ "nuestros requisitos."
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/association/i18n/es_EC.po b/addons/association/i18n/es_EC.po
index 37d0b35e3f6..61b38edd810 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es_MX.po b/addons/association/i18n/es_MX.po
new file mode 100644
index 00000000000..03cb6e5fa40
--- /dev/null
+++ b/addons/association/i18n/es_MX.po
@@ -0,0 +1,147 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* profile_association
+#
+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-01-13 22:59+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\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 "Gestión de eventos"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Conseguir Hacer el Trabajo"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Este módulo sirve para crear perfiles para asociados"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Aquí se muestran aplicaciones específicas relacionadas con el perfil para "
+"asociaciones seleccionado."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "título"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Le ayuda a gestionar y organizar sus eventos."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Controla y gestiona los gastos de los empleados y puede re-facturarlos a los "
+"clientes de forma automática si los gastos están relacionados con un "
+"proyecto."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD (consigue hacer el trabajo) es una metodología para organizarse "
+"eficazmente usted mismo y sus tareas. Este módulo integra completamente el "
+"principio GTD con la gestión de proyectos de OpenERP."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Gestión de recursos"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Perfil asociación"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Seguimiento de gastos"
+
+#. 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 "Configuración de la aplicación para asociaciones"
+
+#. 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 ""
+"Le permite crear páginas wiki y grupos de páginas para no perder de vista el "
+"conocimiento del negocio y compartirlo con y entre sus empleados."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Le ayuda a gestionar sus proyectos y tareas realizando un seguimiento de los "
+"mismos, generando planificaciones, ..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "perfil.asociacion.config.asistente_instal_modulos"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Eventos"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Gestión de proyectos"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Configurar"
diff --git a/addons/association/i18n/es_PY.po b/addons/association/i18n/es_PY.po
index 142ebefa452..67aa87c4691 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es_VE.po b/addons/association/i18n/es_VE.po
new file mode 100644
index 00000000000..03cb6e5fa40
--- /dev/null
+++ b/addons/association/i18n/es_VE.po
@@ -0,0 +1,147 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* profile_association
+#
+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-01-13 22:59+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\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 "Gestión de eventos"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Conseguir Hacer el Trabajo"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Este módulo sirve para crear perfiles para asociados"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Aquí se muestran aplicaciones específicas relacionadas con el perfil para "
+"asociaciones seleccionado."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "título"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Le ayuda a gestionar y organizar sus eventos."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Controla y gestiona los gastos de los empleados y puede re-facturarlos a los "
+"clientes de forma automática si los gastos están relacionados con un "
+"proyecto."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD (consigue hacer el trabajo) es una metodología para organizarse "
+"eficazmente usted mismo y sus tareas. Este módulo integra completamente el "
+"principio GTD con la gestión de proyectos de OpenERP."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Gestión de recursos"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Perfil asociación"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Seguimiento de gastos"
+
+#. 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 "Configuración de la aplicación para asociaciones"
+
+#. 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 ""
+"Le permite crear páginas wiki y grupos de páginas para no perder de vista el "
+"conocimiento del negocio y compartirlo con y entre sus empleados."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Le ayuda a gestionar sus proyectos y tareas realizando un seguimiento de los "
+"mismos, generando planificaciones, ..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "perfil.asociacion.config.asistente_instal_modulos"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Eventos"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Gestión de proyectos"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Configurar"
diff --git a/addons/association/i18n/et.po b/addons/association/i18n/et.po
index c48a3588b47..356e90eca17 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -134,69 +134,3 @@ msgstr "Projektihaldus"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Relationship Management"
-#~ msgstr "Suhete haldus"
-
-#~ msgid ""
-#~ "The Document Management System of Open ERP allows you to store, browse, "
-#~ "automatically index, search and preview all kind of documents (internal "
-#~ "documents, printed reports, calendar system). It opens an FTP access for the "
-#~ "users to easily browse association's document."
-#~ msgstr ""
-#~ "Open ERP dokumendihaldussüsteem võimaldab sul säilitada, sirvida, "
-#~ "automaatselt indekseerida, otsida ja eelvaadata kõiki dokumendiliike "
-#~ "(sisemised dokumendid, prinditud aruandeid, kalendrisüsteemi). See avab "
-#~ "kasutajatele FTP ligipääsu, et lihtsalt sirvida ühingu dokumente."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid "Segmentation"
-#~ msgstr "Segmenteerimine"
-
-#~ msgid "Document Management"
-#~ msgstr "Dokumendihaldus"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr "Ühingu profiil : Paigalda lisamooduleid"
-
-#~ msgid "Profile for Associates"
-#~ msgstr "Profiil ühingutele"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Partner Relation & Calendars"
-#~ msgstr "Partneri seos ja kalendrid"
-
-#~ msgid "Install"
-#~ msgstr "Paigalda"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "Paigalda lisamoodul"
-
-#~ msgid ""
-#~ "Tracks the personal expenses process, from the employee expense encoding, to "
-#~ "the reimbursement of the employee up to the reinvoicing to the final "
-#~ "customer."
-#~ msgstr ""
-#~ "Jälgib isiklike kulude protsessi alustades töötaja kuludest ja töötaja "
-#~ "kulude hüvitamisest kuni lõppkliendile esitatud arveni."
-
-#~ msgid ""
-#~ "Install more modules. A few modules are proposed according to the "
-#~ "association profile you selected. You will be able to install them based on "
-#~ "our requirements."
-#~ msgstr ""
-#~ "Paigalda veel mooduleid. Mõned moodulid soovitatakse vastavalt sinu poolt "
-#~ "valitud assotsiatsiooni profiilile. Sa saad neid paigaldada vastavalt meie "
-#~ "vajadustele."
-
-#~ msgid "Cancel"
-#~ msgstr "Tühista"
diff --git a/addons/association/i18n/fi.po b/addons/association/i18n/fi.po
index 9a1eae464cb..2668857bd58 100644
--- a/addons/association/i18n/fi.po
+++ b/addons/association/i18n/fi.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:14+0000\n"
-"PO-Revision-Date: 2011-06-27 10:43+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-10-25 11:10+0000\n"
+"Last-Translator: Jussi Mikkola <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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -72,8 +72,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
-"Seuraa ja hallitsee työntekijäkuluja ja voi automaattisesti laskuttaa "
-"asiakasta, jos kulut liittyvät projektiin."
+"Seuraa ja hallinnoi työntekijöiden matkalaskuja ja osaa myös automaattisesti "
+"(kautta)laskuttaa projekteihin liittyvät kulut asiakkaalta."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -81,11 +81,14 @@ msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
+"Kerralla valmista (Getting things Done, GTD) on menetelmä tehokkaaseen "
+"ajanhallintaan.  Moduuli integroi saumattomasti GTD:n periaatteet OpenERPin "
+"projektihallintaan."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr "Resurssienhallinta"
+msgstr "Resurssien hallinta"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
@@ -95,7 +98,7 @@ msgstr "Yhdistysprofiili"
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr "Kulujenseuranta"
+msgstr "Kulujen seuranta"
 
 #. module: association
 #: model:ir.actions.act_window,name:association.action_config_install_module
@@ -109,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 ""
+"Mahdollistaa Wiki-sivujen luonnin ja sivujen kokoamisen ryhmiksi, mikä "
+"tehostaa  työntekijöiden välistä liiketoiminnan tietämyksen hallintaa."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
diff --git a/addons/association/i18n/fr.po b/addons/association/i18n/fr.po
index 693c709170c..732b419a3e6 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -144,76 +144,3 @@ msgstr "Gestion de projets"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Configurer"
-
-#~ msgid "Relationship Management"
-#~ msgstr "Gestion de la relation"
-
-#~ msgid ""
-#~ "The Document Management System of Open ERP allows you to store, browse, "
-#~ "automatically index, search and preview all kind of documents (internal "
-#~ "documents, printed reports, calendar system). It opens an FTP access for the "
-#~ "users to easily browse association's document."
-#~ msgstr ""
-#~ "Le système de gestion documentaire d'OpenERP vous permet de stocker, "
-#~ "parcourir, indexer automatiquement, rechercher et pré-visualiser tout type "
-#~ "de documents : documents internes ; rapports imprimés ; calendrier. Il "
-#~ "permet un accès FTP pour que les utilisateurs puissent facilement parcourir "
-#~ "les documents associés."
-
-#~ msgid "Segmentation"
-#~ msgstr "Segmentation"
-
-#~ msgid "Document Management"
-#~ msgstr "Gestion documentaire"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr ""
-#~ "Profil pour les associations : installation de modules supplémentaires"
-
-#~ msgid "Profile for Associates"
-#~ msgstr "Profil pour associés"
-
-#~ msgid "Partner Relation & Calendars"
-#~ msgstr "Relations entre Partenaires et Calendriers"
-
-#~ msgid "Install"
-#~ msgstr "Installer"
-
-#~ msgid ""
-#~ "Tracks the personal expenses process, from the employee expense encoding, to "
-#~ "the reimbursement of the employee up to the reinvoicing to the final "
-#~ "customer."
-#~ msgstr ""
-#~ "Permet le suivi du processus des dépenses du personnel, de la saisie des "
-#~ "dépenses de l'employé, au remboursement de l'employé, jusqu'à la facturation "
-#~ "au client final."
-
-#~ msgid ""
-#~ "Install more modules. A few modules are proposed according to the "
-#~ "association profile you selected. You will be able to install them based on "
-#~ "our requirements."
-#~ msgstr ""
-#~ "Installez d'autres modules. Quelques modules sont proposés pour compléter le "
-#~ "profile pour les associations que vous avez choisi. Vous pourrez les "
-#~ "installer selon vos besoins."
-
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
-#~ "spécial !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML incorrect pour l'architecture de la vue !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne peut jamais être inférieure à 1 !"
diff --git a/addons/association/i18n/gl.po b/addons/association/i18n/gl.po
index adbf0d9878e..7e7287dbc2b 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bf2b7594a92..9951ce3dd25 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1a0ddade485..ad711789896 100644
--- a/addons/association/i18n/hu.po
+++ b/addons/association/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-02 16:47+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bf2b7594a92..9951ce3dd25 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a9b19923073..4f1e7f90874 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -137,63 +137,3 @@ msgstr "Gestione progetti"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Configura"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Relationship Management"
-#~ msgstr "Gestione deile Relazioni"
-
-#~ msgid ""
-#~ "The Document Management System of Open ERP allows you to store, browse, "
-#~ "automatically index, search and preview all kind of documents (internal "
-#~ "documents, printed reports, calendar system). It opens an FTP access for the "
-#~ "users to easily browse association's document."
-#~ msgstr ""
-#~ "Il Sistema di Gestione Documentale di OpenERP permette di salvare, "
-#~ "sfogliare, di indicizzare automaticamente, ricercare e visualizzare tutti i "
-#~ "tipi di documenti (documenti interni, report stampati, calendari di "
-#~ "sistema). Esso apre un accesso FTP per gli utenti per meglio sfogliare i "
-#~ "documenti associati."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome di modulo non valido nella definizione dell'azione."
-
-#~ msgid "Segmentation"
-#~ msgstr "Segmentazione"
-
-#~ msgid "Document Management"
-#~ msgstr "Gestione documenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid "Install"
-#~ msgstr "Installa"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "Installa modulo aggiuntivo"
-
-#~ msgid ""
-#~ "Tracks the personal expenses process, from the employee expense encoding, to "
-#~ "the reimbursement of the employee up to the reinvoicing to the final "
-#~ "customer."
-#~ msgstr ""
-#~ "Traccia il processo di gestione delle spese personali, dalla richiesta di "
-#~ "rimborso del dipendente al liquidazione delle spese, fino alla "
-#~ "rifatturazione sul cliente finale."
-
-#~ msgid "Cancel"
-#~ msgstr "Annulla"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/association/i18n/ko.po b/addons/association/i18n/ko.po
index 35fd5f2f0c9..7b4b9e0e74f 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -134,39 +134,3 @@ msgstr "프로젝트 관리"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid "Relationship Management"
-#~ msgstr "관계 관리"
-
-#~ msgid "Segmentation"
-#~ msgstr "세그먼테이션"
-
-#~ msgid "Document Management"
-#~ msgstr "문서 관리"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr "협회 프로파일: 추가 모듈 설치"
-
-#~ msgid "Partner Relation & Calendars"
-#~ msgstr "파트너 관계 % 카렌더"
-
-#~ msgid "Install"
-#~ msgstr "설치"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "추가 모듈 설치"
-
-#~ msgid ""
-#~ "Tracks the personal expenses process, from the employee expense encoding, to "
-#~ "the reimbursement of the employee up to the reinvoicing to the final "
-#~ "customer."
-#~ msgstr "직원 비용 인코딩으로부터 직원 환급과 최종 고객에 대한 재 인보이싱에 이르기까지 개인 비용 프로세스를 추적합니다."
-
-#~ msgid ""
-#~ "Install more modules. A few modules are proposed according to the "
-#~ "association profile you selected. You will be able to install them based on "
-#~ "our requirements."
-#~ msgstr "추가 모듈 설치. 귀하가 선택한 협회 프로파일에 따라 몇몇 모듈이 추가 설치됩니다."
-
-#~ msgid "Cancel"
-#~ msgstr "취소"
diff --git a/addons/association/i18n/lo.po b/addons/association/i18n/lo.po
index cb9727fd310..8b9d882957d 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b485afda2d0..6677d22d562 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 65bae7ab8a9..7409034a5e5 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/nl.po b/addons/association/i18n/nl.po
index 4dbdc4c13fe..bd989d0da08 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -143,26 +143,3 @@ msgstr "Projectmanagement"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Configureren"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
-
-#~ msgid "Profile for Associates"
-#~ msgstr "Profiel voor verenigingen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor overzicht"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/association/i18n/pl.po b/addons/association/i18n/pl.po
index 90bde961dbb..9c4d4ee399c 100644
--- a/addons/association/i18n/pl.po
+++ b/addons/association/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -132,12 +132,3 @@ msgstr ""
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
diff --git a/addons/association/i18n/pt.po b/addons/association/i18n/pt.po
index 07e97081bc2..a383b069358 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -142,24 +142,3 @@ msgstr "Gestão de projetos"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura de vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/association/i18n/pt_BR.po b/addons/association/i18n/pt_BR.po
index dcca4bc361c..c6839a7aecf 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -143,24 +143,3 @@ msgstr "Gestão de Projetos"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr "Configurar"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/association/i18n/ro.po b/addons/association/i18n/ro.po
index 81713759321..e1379b6b2c8 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7313cf47abf..9f5367d9017 100644
--- a/addons/association/i18n/ru.po
+++ b/addons/association/i18n/ru.po
@@ -13,23 +13,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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
@@ -39,7 +39,7 @@ 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
@@ -56,12 +56,12 @@ msgstr "title"
 #. 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
@@ -69,6 +69,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
@@ -83,7 +85,7 @@ msgstr ""
 #. 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
@@ -93,7 +95,7 @@ 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
@@ -107,6 +109,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 ""
+"Позволяет создавать wiki-страницы и группы страниц, чтобы отслеживать бизнес-"
+"знания и делиться ими с сотрудниками."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@@ -114,6 +118,8 @@ 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
@@ -123,24 +129,15 @@ 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 "Настроить"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/association/i18n/sl.po b/addons/association/i18n/sl.po
index 9a5cd389023..112e49c3e70 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -132,32 +132,3 @@ msgstr "Upravljanje projektov"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Relationship Management"
-#~ msgstr "Upravljanje povezav"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid "Segmentation"
-#~ msgstr "Razčlenjenost"
-
-#~ msgid "Document Management"
-#~ msgstr "Upravljanje dokumentov"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid "Install"
-#~ msgstr "Namesti"
-
-#~ msgid "Install Extra Module"
-#~ msgstr "Namesti dodatni modul"
-
-#~ msgid "Cancel"
-#~ msgstr "Prekliči"
diff --git a/addons/association/i18n/sq.po b/addons/association/i18n/sq.po
index 427324a45ac..78cc3b55024 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b7ac2770f8d..078f5351f83 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -141,14 +141,3 @@ msgstr "Upravljanje Projektima"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
diff --git a/addons/association/i18n/sr@latin.po b/addons/association/i18n/sr@latin.po
index c3f815afd65..ccfd9cd68f3 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -141,14 +141,3 @@ msgstr "Upravljanje Projektima"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime u definiciji akcije."
diff --git a/addons/association/i18n/sv.po b/addons/association/i18n/sv.po
index 3077049bcaf..a1c4a14557b 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: 2011-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -135,20 +135,3 @@ msgstr "Projekthantering"
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
diff --git a/addons/association/i18n/tlh.po b/addons/association/i18n/tlh.po
index b485afda2d0..6677d22d562 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 801e03fac5f..8f318c31d3a 100644
--- a/addons/association/i18n/tr.po
+++ b/addons/association/i18n/tr.po
@@ -13,55 +13,55 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Olay Yönetimi"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "İşleri Tamamlama"
 
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "Bu modül Topluluklar için Profil oluşturur"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Yapılandırma Gelişimi"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
-msgstr ""
+msgstr "Seçmiş olduğunuz Topluluk Profilleriyle ilgili özel uygulamalar."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "unvan"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "Olaylarınızı organize etmenize ve yönetmenize yardım eder."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Resim"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@@ -69,6 +69,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Personel harcamalarını izler ve yönetir, ve eğer harcamalar projeyle ilgili "
+"ise müşteriler otomatik olarak yeniden faturalandırılabilir."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -76,27 +78,30 @@ 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, kendinizi ve görevlerinizi verimli bir şekilde organize etmeniz için "
+"bir yöntemdir. Bu modül GTD ilkelerini OpenERP proje yönetimi ile tam olarak "
+"entegre eder."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "Kaynak Yönetimi"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr "Şirket Profili"
+msgstr "Kurum Profili"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr ""
+msgstr "Giderleri İzleme"
 
 #. 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 "Kurum uygulama Yapılandırması"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -104,6 +109,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 ""
+"Şirket bilgi birikiminizi tutmak ve çalışanlar arasında paylaşmak için wiki "
+"sayfaları ve sayfa grupları oluşturmanızı sağlar."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@@ -111,16 +118,18 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Projelerinizi ve görevlerinizi yönetmenize yardımcı olur (planlamalar "
+"oluşturarak, görev ve projeleri takip ederek, vb...)"
 
 #. 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 "Olaylar"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -131,16 +140,4 @@ msgstr "Proje Yönetimi"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
-
-#~ msgid "Document Management"
-#~ msgstr "Döküman Yönetimi"
-
-#~ msgid "Association Profile : Install Extra Modules"
-#~ msgstr "Şirket Profili : Install Extra Modules"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#~ msgid "Cancel"
-#~ msgstr "İptal"
+msgstr "Yapılandırma"
diff --git a/addons/association/i18n/uk.po b/addons/association/i18n/uk.po
index 9a73f14fb0e..16862a7bf67 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -132,11 +132,3 @@ msgstr ""
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
diff --git a/addons/association/i18n/vi.po b/addons/association/i18n/vi.po
index 010d909694e..20e5dad34d3 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "Quản lý Sự kiện"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Tiến trình Cấu hình"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -52,17 +52,17 @@ msgstr ""
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "danh xưng"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "Giúp bạn quản lý và tổ chức các sự kiện."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Hình ảnh"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@@ -70,6 +70,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Theo dõi và quản lý chi phí nhân viên, và có thể ra hóa đơn tự động cho các "
+"khách hàng nếu các chi phí liên quan đến dự án."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -81,7 +83,7 @@ msgstr ""
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "Quản lý Nguồn lực"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
@@ -91,7 +93,7 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr ""
+msgstr "Theo dõi Chi phí"
 
 #. module: association
 #: model:ir.actions.act_window,name:association.action_config_install_module
@@ -116,20 +118,20 @@ 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 "Các sự kiện"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Quản lý Dự án"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Cấu hình"
diff --git a/addons/association/i18n/zh_CN.po b/addons/association/i18n/zh_CN.po
index 82e3f2906a6..050b386e137 100644
--- a/addons/association/i18n/zh_CN.po
+++ b/addons/association/i18n/zh_CN.po
@@ -13,69 +13,69 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
-msgstr "Wiki"
+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 "GTD"
 
 #. 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
@@ -85,42 +85,42 @@ 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
@@ -131,35 +131,4 @@ msgstr "项目管理"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
-
-#~ msgid ""
-#~ "The Document Management System of Open ERP allows you to store, browse, "
-#~ "automatically index, search and preview all kind of documents (internal "
-#~ "documents, printed reports, calendar system). It opens an FTP access for the "
-#~ "users to easily browse association's document."
-#~ msgstr ""
-#~ "Open ERP的单据管理系统，运行你保存、浏览、自动索引、搜索和预览所有单据（包括内部单据、打印报表、日历系统）。It opens an FTP "
-#~ "access for the users to easily browse association's document."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "操作定义中使用了无效的模式名称。"
-
-#~ msgid "Segmentation"
-#~ msgstr "细分"
-
-#~ msgid "Document Management"
-#~ msgstr "文档管理"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效XML视图结构!"
-
-#~ msgid "Install"
-#~ msgstr "安装"
-
-#~ msgid "Cancel"
-#~ msgstr "取消"
+msgstr "设置"
diff --git a/addons/association/i18n/zh_TW.po b/addons/association/i18n/zh_TW.po
index 9e67074ce19..fdc622ef4cc 100644
--- a/addons/association/i18n/zh_TW.po
+++ b/addons/association/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
deleted file mode 100644
index 0e66af14a1d..00000000000
--- a/addons/association/profile_association.py
+++ /dev/null
@@ -1,53 +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 lxml import etree
-from osv import fields, osv
-
-class profile_association_config_install_modules_wizard(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
-        'project_gtd':fields.boolean('Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-    }
-
-    # Will be removed when rd-v61-al-config-depends will be done
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(profile_association_config_install_modules_wizard, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        doc = etree.XML(res['arch'])
-        for module in ['project_gtd','hr_expense']:
-            count = 0
-            for node in doc.xpath("//field[@name='%s']" % (module)):
-                count = count + 1
-                if count > 1:
-                    node.set('invisible', '1')
-        res['arch'] = etree.tostring(doc)
-        return res
-   
-profile_association_config_install_modules_wizard()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 12222ecbd90..8ce97cb2e43 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -1,24 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_confirm_install_module_form" model="ir.ui.view">
-            <field name="name">Association Application Configuration</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-              <data>
-                <xpath expr="//group[@name='association']" position="replace">
-                    <newline/>
-                    <separator  string="Associations Features" colspan="4" />
-                    <field name="project_gtd" />
-                    <field name="wiki" />
-                    <field name="event_project" />
-                    <field name="hr_expense" />
-                </xpath>
-              </data>
-            </field>
-        </record>
         <menuitem
             name="Association"
             id="base.menu_association"
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index e1ceaf9921c..3f6c6c35e31 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Auction Management',
     'version': '1.0',
-    'category': 'General',
+    'category': 'Specific Industry Applications',
     'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 685b6ee3368..c97cf6f2ded 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -415,7 +415,7 @@ class auction_lots(osv.osv):
         result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name', 'obj_num'])]
         return result
 
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None):
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []
         ids = []
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 7f34eb6697c..e93cc3ea04d 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -39,7 +39,7 @@
         <field name="name">Auction Adjudications</field>
         <field name="code">A7x*</field>
         <field name="user_type" ref="account.account_type_income"/> 
-        <field name="type">receivable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
     </record>
@@ -48,7 +48,7 @@
         <field name="name">Auction Adjudication Expenses</field>
         <field name="code">A6x*</field>
         <field name="user_type" ref="account.account_type_expense"/>
-        <field name="type">payable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
     </record>
@@ -56,7 +56,7 @@
     <record model="account.account" id="auction_income_costs">
         <field name="name">Auction Buyer Costs</field>
         <field name="code">A8x*</field>
-        <field name="type">payable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
         <field name="user_type" ref="account.account_type_tax"/>
@@ -64,7 +64,7 @@
     <record model="account.account" id="auction_expense_costs">
         <field name="name">Auction Seller Costs</field>
         <field name="code">A9x*</field>
-        <field name="type">receivable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
         <field name="user_type" ref="account.account_type_tax"/>
@@ -251,7 +251,7 @@
     </record>
 
     <record id="auction_tax20" model="account.tax">
-       <field name="name">Frais de vente</field>
+       <field name="name">Frais de vente0</field>
        <field name="amount">0</field>
        <field name="domain">auction</field>
        <field name="base_code_id" ref="account_tax_code_id2"/>
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 66cc9b3f743..abcf53490a5 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -160,7 +160,7 @@
                                 <separator string="Buyer Invoices" colspan="2"/>
                                 <field name="buyer_invoice_history" nolabel="1" widget="one2many_list"
                                         height="400">
-                                    <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
+                                    <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
                                         <field name="date_invoice"/>
                                         <field name="number"/>
                                         <field name="partner_id" groups="base.group_user"/>
@@ -177,7 +177,7 @@
                                 <separator string="Seller Invoices" colspan="2"/>
                                 <field name="seller_invoice_history" nolabel="1" widget="one2many_list"
                                         height="400">
-                                    <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
+                                    <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
                                         <field name="date_invoice"/>
                                         <field name="number"/>
                                         <field name="partner_id" groups="base.group_user"/>
@@ -218,7 +218,7 @@
                 <field name="auction1" string="First Auction Date"/>
                 <field name="auction2" string="Last Auction Date"/>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="16">
+                <group expand="0" string="Group By...">
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical" />
                     <filter string="Auction Date"
@@ -272,7 +272,7 @@
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('unsold','draft');black:state in ('sold','taken_away');gray:state in ('paid') " string="Objects">
+            <tree colors="blue:state in ('unsold','draft');black:state in ('sold','taken_away');gray:state == 'paid' " string="Objects">
                 <field name="obj_num" string="Ref" select="1"/>
                 <field name="name" select="1"/>
                 <field name="ach_uid"/>
@@ -448,7 +448,7 @@
                  <field name="bord_vnd_id"/>
                  <field name="state"/>
                  <newline/>
-                 <group expand="0" string="Group By..." colspan="16">
+                 <group expand="0" string="Group By...">
                      <filter string="Buyer"
                          icon="terp-personal"
                          help="Buyer" domain="[]"
@@ -612,7 +612,7 @@
                  <field name="method"/>
                  <field name="date_dep"/>
                  <newline/>
-                 <group expand="0" string="Group By..." colspan="16">
+                 <group expand="0" string="Group By...">
                      <filter string="Seller"
                          icon="terp-personal"
                          help="Seller" domain="[]"
@@ -745,7 +745,7 @@
                  <field name="partner_id"/>
                  <field name="contact_tel"/>
                  <newline/>
-                 <group expand="0" string="Group By..." colspan="16">
+                 <group expand="0" string="Group By...">
                      <filter string="Buyer"
                          icon="terp-personal"
                          help="Buyer" domain="[]"
diff --git a/addons/auction/board_auction_manager_view.xml b/addons/auction/board_auction_manager_view.xml
index 67ad8334967..099909694f3 100644
--- a/addons/auction/board_auction_manager_view.xml
+++ b/addons/auction/board_auction_manager_view.xml
@@ -7,26 +7,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Auction manager ">
-                    <hpaned position="100">
-                        <child1>
-                            <action
-                                string="Latest objects"
-                                name="%(auction.action_report_latest_objects_manager_tree)d"
-                                height="200"
-                                width="510"    />
+                    <board style="2-1">
+                        <column>
+                            <action string="Latest objects"
+                                name="%(auction.action_report_latest_objects_manager_tree)d"/>
                             <action string="Latest deposits"
                                 name="%(auction.action_report_latest_doposit_manager_tree)d"/>
-                            <action
-                                string="Summary pointing by user"
+                            <action string="Summary pointing by user"
                                 name="%(auction.action_report_auction_sign_in_out_manager_tree1)d"
-                                view_mode="tree,graph"
-                            />
+                                view_mode="tree,graph"/>
                             <action string="Objects statistics"
-                                name="%(auction.action_report_object_encoded_manager_tree)d"
-                                />
-                        </child1>
+                                name="%(auction.action_report_object_encoded_manager_tree)d"/>
+                        </column>
 
-                        <child2>
+                        <column>
                             <button
                                 string="My board"
                                 name="%(open_board_auction)d"
@@ -34,22 +28,18 @@
                                 type="action"
                                 colspan="4"
                                 />
-                            <action
-                                string="Total Adjudications"
+                            <action string="Total Adjudications"
                                 name="%(auction.action_report_auction_adjudication_tree)d"
-                                view_mode="graph,tree"
-                                colspan="4"/>
-                            <action
-                                string="Min/Adj/Max"
+                                view_mode="graph,tree"/>
+                            <action string="Min/Adj/Max"
                                 name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
-                                view_mode="graph,tree" colspan="4" />
+                                view_mode="graph,tree"/>
 
-                            <action
-                                string="Objects by day"
+                            <action string="Objects by day"
                                 name="%(auction.action_report_auction_object_date_tree)d"
-                                view_mode="graph,tree" colspan="4" />
-                        </child2>
-                    </hpaned>
+                                view_mode="graph,tree"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index cc784c93be2..668c5d4352b 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -58,36 +58,28 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Auction manager ">
-                    <hpaned position="100">
-                        <child1>
-                            <action
-                                string="Latest objects"
-                                name="%(auction.action_report_latest_objects_tree)d"
-                                height="200"
-                                width="510"    />
+                    <board style="2-1">
+                        <column>
+                            <action string="Latest objects"
+                                name="%(auction.action_report_latest_objects_tree)d"/>
                             <action string="Latest deposits"
                                 name="%(auction.action_report_latest_doposit_tree)d"/>
                             <action string="Objects statistics"
-                                name="%(auction.action_report_object_encoded_tree)d"
-                                />
-                        </child1>
+                                name="%(auction.action_report_object_encoded_tree)d"/>
+                        </column>
 
-                        <child2>
-                            <action
-                                string="Total Adjudications"
+                        <column>
+                            <action string="Total Adjudications"
                                 name="%(auction.action_report_auction_adjudication_tree)d"
-                                view_mode="graph,tree"
-                                colspan="4"/>
-                            <action
-                                string="Min/Adj/Max"
+                                view_mode="graph,tree"/>
+                            <action string="Min/Adj/Max"
                                 name="%(auction.action_report_auction_lots_estimation_adj_category_tree)d"
-                                view_mode="graph,tree" colspan="4" />
-                            <action
-                                string="Objects by day"
+                                view_mode="graph,tree"/>
+                            <action string="Objects by day"
                                 name="%(auction.action_report_auction_object_date_tree)d"
-                                view_mode="graph,tree" colspan="4" />
-                        </child2>
-                    </hpaned>
+                                view_mode="graph,tree"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/auction/i18n/ar.po b/addons/auction/i18n/ar.po
index 5b897cf80d1..161b64a48aa 100644
--- a/addons/auction/i18n/ar.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index 75e6da33f6e..013ebbd11ef 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -250,7 +250,7 @@ msgstr "Непродаден"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Search Auction deposit"
-msgstr ""
+msgstr "Търсене в депозитите за търга"
 
 #. module: auction
 #: help:auction.lots,lot_num:0
@@ -266,7 +266,7 @@ msgstr "Артикули"
 #: model:account.tax,name:auction.auction_tax5
 #: field:auction.dates,seller_costs:0
 msgid "Seller Costs"
-msgstr ""
+msgstr "Разходи на продавача"
 
 #. module: auction
 #: view:auction.bid:0
@@ -423,7 +423,7 @@ msgstr "Линия 1"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
 msgid "Make Invoice for Buyer"
-msgstr ""
+msgstr "Генериране на фактура за купувач"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -750,7 +750,7 @@ msgstr "Залог ID"
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Min Estimate:"
-msgstr ""
+msgstr "Мин. оценка"
 
 #. module: auction
 #: selection:report.auction,month:0
@@ -2309,9 +2309,6 @@ msgstr ""
 #~ msgid "Bids line"
 #~ msgstr "Ред от наддаване"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Форма за депозит"
-
 #~ msgid "Adjudication by Auction"
 #~ msgstr "Решение чрез действие"
 
@@ -2330,18 +2327,9 @@ msgstr ""
 #~ msgid "Mark as taken away"
 #~ msgstr "Отбелязване като взето"
 
-#~ msgid "Inv."
-#~ msgstr "Факт."
-
-#~ msgid "VAT"
-#~ msgstr "ДДС"
-
 #~ msgid "Statements"
 #~ msgstr "Отчети"
 
-#~ msgid "Adjudication"
-#~ msgstr "Решение"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Невалиден XML за преглед на архитектурата"
 
diff --git a/addons/auction/i18n/bs.po b/addons/auction/i18n/bs.po
index 6800a1a45b5..7aec7a051ea 100644
--- a/addons/auction/i18n/bs.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/ca.po b/addons/auction/i18n/ca.po
index 0e1e8023fe7..2aa4be04d2b 100644
--- a/addons/auction/i18n/ca.po
+++ b/addons/auction/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: 2011-08-07 04:37+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/cs.po b/addons/auction/i18n/cs.po
index b94c334f40c..835fb756278 100644
--- a/addons/auction/i18n/cs.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2301,12 +2301,6 @@ msgstr ""
 #~ msgid "Definitive (ordre catalogue)"
 #~ msgstr "Definitivní (řádný katalog)"
 
-#~ msgid "Adjudication"
-#~ msgstr "Adjudikace"
-
-#~ msgid "VAT"
-#~ msgstr "DPH"
-
 #~ msgid "Object Type"
 #~ msgstr "Typ objektu"
 
diff --git a/addons/auction/i18n/da.po b/addons/auction/i18n/da.po
new file mode 100644
index 00000000000..8ff7a76f6fc
--- /dev/null
+++ b/addons/auction/i18n/da.po
@@ -0,0 +1,2294 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-08 22:27+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "Rapportering"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr "Sælger"
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr "SMS besked"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "Køber"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "Dato:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr "SMS sendt"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "August"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr "Solgt"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr "Send SMS"
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr "Købere"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr "Betaling"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr "Antal købere"
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Auction Management"
+msgstr "Auktions administration"
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr ""
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr "Auktion"
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "September"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr ""
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr ""
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr "Kort "
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "Oversigt"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "November"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr "Nr."
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Cancel"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr "Fakturanummer"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr "Bud"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "Sælgere"
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr "SMS sendt "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr "Telefon"
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ")"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr "Betalt:"
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "Error!"
+msgstr "Fejl!"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid ""
+"\n"
+"     This module manages the records of the artists,\n"
+"     the articles to be put up for auction,the buyers and\n"
+"     sellers.\n"
+"\n"
+"     It completely manages an auction such as managing bids,\n"
+"     keeping track of the sold articles along with the paid\n"
+"     and unpaid objects including delivery of the articles.\n"
+"     Dashboards for auction that includes:\n"
+"       * My Latest Objects (list)\n"
+"       * My Latest Deposits (list)\n"
+"       * Objects Statistics (list)\n"
+"       * My Objects By Day (list)\n"
+"    "
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr "OK"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr ""
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr "December"
+
+#. module: auction
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+msgid "Open Bids"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "Fejl"
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr ""
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr "April"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr ""
diff --git a/addons/auction/i18n/de.po b/addons/auction/i18n/de.po
index 92932f3efde..57964fe74a0 100644
--- a/addons/auction/i18n/de.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -459,7 +459,7 @@ msgstr "Käufer"
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id4
 msgid "VAT 12%"
-msgstr ""
+msgstr "USt. 12%"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1449,7 +1449,7 @@ msgstr "Erzeuge Rechnungen"
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id5
 msgid "VAT 5%"
-msgstr ""
+msgstr "USt. 5%"
 
 #. module: auction
 #: field:auction.dates,expo1:0
@@ -1764,7 +1764,7 @@ msgstr "Kosten des Verkaufes"
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id1
 msgid "VAT 1%"
-msgstr ""
+msgstr "USt. 1%"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax
@@ -1967,7 +1967,7 @@ msgstr ""
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id3
 msgid "VAT 10%"
-msgstr ""
+msgstr "USt. 10%"
 
 #. module: auction
 #: field:auction.artists,name:0
@@ -1998,7 +1998,7 @@ msgstr ""
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id2
 msgid "VAT 20%"
-msgstr ""
+msgstr "USt. 20%"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_payer_sel
@@ -2220,7 +2220,7 @@ msgstr "Ertragskonto"
 #. module: auction
 #: field:auction.lots.sms.send,password:0
 msgid "Password"
-msgstr "Password"
+msgstr "Passwort"
 
 #. module: auction
 #: selection:report.auction,month:0
@@ -2314,9 +2314,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Bids line"
 #~ msgstr "Gebote Positionen"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Zuschlag Formular"
-
 #~ msgid "Adjudication by Auction"
 #~ msgstr "Zuschläge nach Auktionen"
 
@@ -2335,18 +2332,9 @@ msgstr "Auktionen Historie"
 #~ msgid "Mark as taken away"
 #~ msgstr "Markiere als Mitgenommen"
 
-#~ msgid "Inv."
-#~ msgstr "Rechn."
-
-#~ msgid "VAT"
-#~ msgstr "USt."
-
 #~ msgid "Statements"
 #~ msgstr "Auszug"
 
-#~ msgid "Adjudication"
-#~ msgstr "Zuschlag"
-
 #~ msgid "Unclassifieds"
 #~ msgstr "Unklassifiziert"
 
@@ -2469,9 +2457,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Continue"
 #~ msgstr "Fortfahren"
 
-#~ msgid "List N."
-#~ msgstr "Liste N."
-
 #~ msgid "Avg. Est"
 #~ msgstr "Durch. Schätzwerte"
 
@@ -2507,15 +2492,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Antique/Toys"
 #~ msgstr "Antik/Spielzeug"
 
-#~ msgid "Buyer form"
-#~ msgstr "Käufer Formular"
-
-#~ msgid "Estimate"
-#~ msgstr "Schätzung"
-
-#~ msgid "Cat"
-#~ msgstr "Kat."
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Fehler ! Die Anlage von rekursiven Konten ist nicht möglich."
 
@@ -2549,9 +2525,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Limit Zuschlag"
 
-#~ msgid "Document type"
-#~ msgstr "Dokumenten Typ"
-
 #~ msgid "comparaison estimate/adjudication "
 #~ msgstr "Vergleich Schätzung/Zuschlag "
 
@@ -2561,9 +2534,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Cont. Art/Other Media"
 #~ msgstr "Zeitg. Kunst/Andere Medien"
 
-#~ msgid "Cat. N."
-#~ msgstr "Kategorie Neu"
-
 #~ msgid "Send Image also ?"
 #~ msgstr "Sende auch Photo?"
 
@@ -2612,15 +2582,9 @@ msgstr "Auktionen Historie"
 #~ msgid "Seller's Revenues"
 #~ msgstr "Einlieferer Erträge"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Zwischensumme"
-
 #~ msgid "Buyer's Summary"
 #~ msgstr "Käufer Zusammenfassung"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Referenz des Käufers"
-
 #~ msgid "Depositer's Statistics"
 #~ msgstr "Statistik des Kreditgebers"
 
@@ -2654,12 +2618,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Payment's history"
 #~ msgstr "Historie Zahlungen"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
-#~ msgid ", TEL:"
-#~ msgstr "Tel.:"
-
 #~ msgid "Auction results"
 #~ msgstr "Ergebnisse Auktion"
 
@@ -2732,15 +2690,9 @@ msgstr "Auktionen Historie"
 #~ msgid "Antique/Sculpture, bronze, eso."
 #~ msgstr "Antik/Skulpturen, Bronze"
 
-#~ msgid "Document Number"
-#~ msgstr "Dokumentennummer"
-
 #~ msgid "Numerotate"
 #~ msgstr "Laufende Nummer"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Käufer, Preis"
-
 #~ msgid "Listing Huissiers"
 #~ msgstr "Verzeichnis Auktionsbeamter"
 
@@ -2780,9 +2732,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Antique/Porcelain, Ceramics, Glassmaking, ..."
 #~ msgstr "Antik/Porzellan, Keramik, Glas"
 
-#~ msgid "Plate Number:"
-#~ msgstr "Tafel Nummer:"
-
 #~ msgid "Object Reference"
 #~ msgstr "Objektreferenz"
 
@@ -2846,15 +2795,9 @@ msgstr "Auktionen Historie"
 #~ msgid "Bid information"
 #~ msgstr "Information Gebot"
 
-#~ msgid "TEL:"
-#~ msgstr "Tel.:"
-
 #~ msgid "Objects to sell"
 #~ msgstr "Angebot Auktionsobjekte"
 
-#~ msgid "Limit"
-#~ msgstr "Limit"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "Letzte Anzahlungen"
 
@@ -2882,12 +2825,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Employee"
 #~ msgstr "Mitarbeiter"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Zuschlag (EUR)"
-
-#~ msgid "Est."
-#~ msgstr "Gesch."
-
 #~ msgid "Report deposit border"
 #~ msgstr "Report Anzahlungslimits"
 
@@ -2900,30 +2837,15 @@ msgstr "Auktionen Historie"
 #~ msgid "Antique/Collectible & art objects"
 #~ msgstr "Antik/Sammlungen & Kunstobjekte"
 
-#~ msgid "BID:"
-#~ msgstr "Gebot:"
-
 #~ msgid "Buyer's auction"
 #~ msgstr "Auktionen des Käufers"
 
 #~ msgid "Auction reporting2 tree view"
 #~ msgstr "Report Nr. 2 Auktion (Baum)"
 
-#~ msgid "Buyer Cost:"
-#~ msgstr "Käufer Kosten:"
-
-#~ msgid "NET"
-#~ msgstr "Netto"
-
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Antik/Möbel"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Kontakt Käufer"
-
-#~ msgid "Inv, Name"
-#~ msgstr "Rechn. Name"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "Ungeplante Objekte"
 
@@ -2948,9 +2870,6 @@ msgstr "Auktionen Historie"
 #~ msgid "Cont. Art/Arts"
 #~ msgstr "Zeitg. Kunst/Kunst"
 
-#~ msgid "Ref."
-#~ msgstr "Ref."
-
 #~ msgid "Short Description"
 #~ msgstr "Kurzbeschreibung"
 
@@ -2978,48 +2897,12 @@ msgstr "Auktionen Historie"
 #~ msgid "Antique/Posters"
 #~ msgstr "Antik/Poster"
 
-#~ msgid "Orders"
-#~ msgstr "Aufträge"
-
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
 
-#~ msgid "Auction Manager"
-#~ msgstr "Auktionen Manager"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "Summierung nach Benutzern"
-
-#~ msgid "Auction Member"
-#~ msgstr "Auktionen Teilnehmer"
-
-#~ msgid "Auction member board"
-#~ msgstr "Auktion Mitglieder Tafel"
-
-#~ msgid "Board for Auction"
-#~ msgstr "Tafel für Auktion"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Erwartungen/Schätzwerte"
-
-#~ msgid "Menu"
-#~ msgstr "Menü"
-
-#~ msgid "My objects By Day"
-#~ msgstr "Meine Objekte nach Tagen"
-
-#~ msgid "My board"
-#~ msgstr "Mein Dashboard"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Auktionen Manager Dashboard"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "Meine letzten Objekte"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Fehler: Verkaufseinheit sollte in einer anderen Kategorie sein als "
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index c477abde864..49bda4d2466 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2326,27 +2326,15 @@ msgstr ""
 #~ msgid "Bids line"
 #~ msgstr "Γραμμή προσφορών"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Φόρμα κατάθεσης"
-
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "Διασταύρωση τιμολογίων αγορών"
 
 #~ msgid "Antique/Tin / Copper wares"
 #~ msgstr "Αντίκες / τσίγκινα / χάλκινα σκεύη"
 
-#~ msgid "Inv."
-#~ msgstr "Τιμ."
-
 #~ msgid "Mark as taken away"
 #~ msgstr "Σημαδέψτε καθώς αφαιρείται"
 
-#~ msgid "Adjudication"
-#~ msgstr "Δικαστική απόφαση"
-
-#~ msgid "VAT"
-#~ msgstr "ΦΠΑ"
-
 #~ msgid "Contemporary Art"
 #~ msgstr "Σύγχρονη Τέχνη"
 
@@ -2496,9 +2484,6 @@ msgstr ""
 #~ msgid "Continue"
 #~ msgstr "Συνεχίστε"
 
-#~ msgid "List N."
-#~ msgstr "Λίστα Ν."
-
 #~ msgid "Mark as paid for seller"
 #~ msgstr "Σημειώστε το ως πληρωμένο για τον πωλητή"
 
@@ -2511,19 +2496,10 @@ msgstr ""
 #~ msgid "Antique/Verreries"
 #~ msgstr "Αντίκες/Υαλικά"
 
-#~ msgid "Buyer form"
-#~ msgstr "Φόρμα αγοραστή"
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr ""
 #~ "Σφάλμα! Δεν μπορείτε να χρησιμοποιήσετε επαναλαμβανόμενους λογαριασμούς."
 
-#~ msgid "Cat"
-#~ msgstr "Cat"
-
-#~ msgid "Estimate"
-#~ msgstr "Εκτιμώ"
-
 #~ msgid "Antique/Toys"
 #~ msgstr "Αντίκες/Παιχνίδια"
 
@@ -2548,9 +2524,6 @@ msgstr ""
 #~ msgid "Birth / Death dates"
 #~ msgstr "Δημιουργία / κλείσιμο ημερομηνιών"
 
-#~ msgid "Cat. N."
-#~ msgstr "Cat. N."
-
 #~ msgid "comparaison estimate/adjudication "
 #~ msgstr "εκτίμηση σύγκριση / προσφορών "
 
@@ -2566,9 +2539,6 @@ msgstr ""
 #~ msgid "Unclassified objects "
 #~ msgstr "Αντικείμενα μη ταξινομημένα "
 
-#~ msgid "Document type"
-#~ msgstr "Τύπος εγγράφου"
-
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Φύλλο κατάθεσης"
 
@@ -2620,15 +2590,9 @@ msgstr ""
 #~ msgid "Send results to Auction-in-europe.com"
 #~ msgstr "Αποστολή αποτελεσμάτων στο Auction-in-europe.com"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Μερικό σύνολο:"
-
 #~ msgid "Buyer's Summary"
 #~ msgstr "Σύνοψη Αγοραστή"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Αναφορά πελάτη"
-
 #~ msgid "Depositer's Statistics"
 #~ msgstr "Στατιστικά στοιχεία αποταμιευτών"
 
@@ -2656,18 +2620,12 @@ msgstr ""
 #~ msgid "Encoded Objects Per Day"
 #~ msgstr "Κωδικοποιημένα Αντικείμενα ανά ημέρα"
 
-#~ msgid "Document"
-#~ msgstr "Έγγραφο"
-
 #~ msgid "Auction Reporting on buyer view"
 #~ msgstr "Υποβολή έκθεσης δημοπρασίας στη θέση του πωλητή"
 
 #~ msgid "Payment's history"
 #~ msgstr "Ιστορικό πληρωμών"
 
-#~ msgid ", TEL:"
-#~ msgstr ", Τηλέφωνο:"
-
 #~ msgid "de"
 #~ msgstr "de"
 
@@ -2739,36 +2697,3 @@ msgstr ""
 
 #~ msgid "Antique/Argenterie"
 #~ msgstr "Αντίκες / Ασημικά"
-
-#~ msgid "Auction Manager"
-#~ msgstr "Υπεύθυνος Δημοπρασίας"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "Περίληψη χτυπημάτων ανά χρήστη"
-
-#~ msgid "Auction Member"
-#~ msgstr "Μέλος Δημοπρασίας"
-
-#~ msgid "Auction member board"
-#~ msgstr "Πίνακας μέλους δημοπρασίας"
-
-#~ msgid "Board for Auction"
-#~ msgstr "Πίνακας Δημοπρασίας"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Εκτιμήσεις/Κατακυρώσεις"
-
-#~ msgid "Menu"
-#~ msgstr "Μενού"
-
-#~ msgid "My objects By Day"
-#~ msgstr "Τα Ανικείμενά μου ανά Ημέρα"
-
-#~ msgid "My board"
-#~ msgstr "Ο Πίνακάς μου"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Πίνακας Υπεύθυνου Δημοπρασίας"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "Τα Τελευταία μου Αντικείμενα"
diff --git a/addons/auction/i18n/es.po b/addons/auction/i18n/es.po
index 19838285257..ba76de5023b 100644
--- a/addons/auction/i18n/es.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2348,9 +2348,6 @@ msgstr "Historial subasta"
 #~ msgid "Bids line"
 #~ msgstr "Línea de apuestas"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Formulario de depósito"
-
 #~ msgid "Adjudication by Auction"
 #~ msgstr "Adjudicación por subasta"
 
@@ -2369,18 +2366,9 @@ msgstr "Historial subasta"
 #~ msgid "Mark as taken away"
 #~ msgstr "Marcar como para llevar"
 
-#~ msgid "Inv."
-#~ msgstr "Fact."
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
-
 #~ msgid "Statements"
 #~ msgstr "Extractos"
 
-#~ msgid "Adjudication"
-#~ msgstr "Adjudicación"
-
 #~ msgid "Unclassifieds"
 #~ msgstr "No clasificados"
 
@@ -2506,9 +2494,6 @@ msgstr "Historial subasta"
 #~ msgid "Continue"
 #~ msgstr "Continuar"
 
-#~ msgid "List N."
-#~ msgstr "N. lista"
-
 #~ msgid "Avg. Est"
 #~ msgstr "Est. promedio"
 
@@ -2543,15 +2528,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Toys"
 #~ msgstr "Antigüedades / Juguetes"
 
-#~ msgid "Buyer form"
-#~ msgstr "Formulario comprador"
-
-#~ msgid "Estimate"
-#~ msgstr "Estimado"
-
-#~ msgid "Cat"
-#~ msgstr "Cat."
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "¡Error! No se pueden crear cuentas recursivas."
 
@@ -2585,9 +2561,6 @@ msgstr "Historial subasta"
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Justificante de depósito"
 
-#~ msgid "Document type"
-#~ msgstr "Tipo de documento"
-
 #~ msgid "comparaison estimate/adjudication "
 #~ msgstr "comparación estimado/adjudicado "
 
@@ -2597,9 +2570,6 @@ msgstr "Historial subasta"
 #~ msgid "Cont. Art/Other Media"
 #~ msgstr "Arte cont. / Otro media"
 
-#~ msgid "Cat. N."
-#~ msgstr "Cat. N."
-
 #~ msgid "Send Image also ?"
 #~ msgstr "¿Enviar imagen también?"
 
@@ -2645,15 +2615,9 @@ msgstr "Historial subasta"
 #~ msgid "Seller's Revenues"
 #~ msgstr "Ingresos del vendedor"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Subtotal:"
-
 #~ msgid "Buyer's Summary"
 #~ msgstr "Resumen del comprador"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Referencia cliente"
-
 #~ msgid "Depositer's Statistics"
 #~ msgstr "Estadísticas del depositario"
 
@@ -2687,12 +2651,6 @@ msgstr "Historial subasta"
 #~ msgid "Payment's history"
 #~ msgstr "Historial de pagos"
 
-#~ msgid "Document"
-#~ msgstr "Documento"
-
-#~ msgid ", TEL:"
-#~ msgstr ", TEL:"
-
 #~ msgid "Auction results"
 #~ msgstr "Resultados de subastas"
 
@@ -2771,15 +2729,9 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Sculpture, bronze, eso."
 #~ msgstr "Antigüedades / Escultura, bronze, etc."
 
-#~ msgid "Document Number"
-#~ msgstr "Número documento"
-
 #~ msgid "Numerotate"
 #~ msgstr "Enumeración"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Comprador, Precio"
-
 #~ msgid "All objects are assigned to buyers !"
 #~ msgstr "¡Todos los objetos han sido asignados a compradores!"
 
@@ -2816,9 +2768,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Porcelain, Ceramics, Glassmaking, ..."
 #~ msgstr "Antigüedades / Porcelana, cerámica, vidrio, ..."
 
-#~ msgid "Plate Number:"
-#~ msgstr "Número placa:"
-
 #~ msgid "Object Reference"
 #~ msgstr "Referencia objeto"
 
@@ -2882,15 +2831,9 @@ msgstr "Historial subasta"
 #~ msgid "Bid information"
 #~ msgstr "Información apuesta"
 
-#~ msgid "TEL:"
-#~ msgstr "TEL:"
-
 #~ msgid "Objects to sell"
 #~ msgstr "Objetos para vender"
 
-#~ msgid "Limit"
-#~ msgstr "Límite"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "Últimos depósitos"
 
@@ -2918,12 +2861,6 @@ msgstr "Historial subasta"
 #~ msgid "Employee"
 #~ msgstr "Empleado"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Adj.(EUR)"
-
-#~ msgid "Est."
-#~ msgstr "Est."
-
 #~ msgid "Report deposit border"
 #~ msgstr "Informe justificante de depósito"
 
@@ -2936,30 +2873,15 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Collectible & art objects"
 #~ msgstr "Antigüedades / Coleccionables y objetos de arte"
 
-#~ msgid "BID:"
-#~ msgstr "APUESTA:"
-
 #~ msgid "Buyer's auction"
 #~ msgstr "Subasta del comprador"
 
 #~ msgid "Auction reporting2 tree view"
 #~ msgstr "Informe2 subastas vista árbol"
 
-#~ msgid "Buyer Cost:"
-#~ msgstr "Coste comprador:"
-
-#~ msgid "NET"
-#~ msgstr "NETO"
-
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Antigüedades / Muebles"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Contacto cliente"
-
-#~ msgid "Inv, Name"
-#~ msgstr "Inv, Nombre"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "Objetos no planificados"
 
@@ -2984,9 +2906,6 @@ msgstr "Historial subasta"
 #~ msgid "Cont. Art/Arts"
 #~ msgstr "Arte cont. / Artes"
 
-#~ msgid "Ref."
-#~ msgstr "Ref."
-
 #~ msgid "Short Description"
 #~ msgstr "Descripción breve"
 
@@ -3014,9 +2933,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Posters"
 #~ msgstr "Antigüedades / Posters"
 
-#~ msgid "Orders"
-#~ msgstr "Pedidos"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
@@ -3028,36 +2944,3 @@ msgstr "Historial subasta"
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
-
-#~ msgid "Auction Manager"
-#~ msgstr "Gestor de subastas"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "Resumen aportado por el usuario"
-
-#~ msgid "Auction Member"
-#~ msgstr "Miembro de subastas"
-
-#~ msgid "Auction member board"
-#~ msgstr "Tablero miembro subastas"
-
-#~ msgid "Board for Auction"
-#~ msgstr "Tablero para subastas"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Estimaciones/Adjudicación"
-
-#~ msgid "Menu"
-#~ msgstr "Menú"
-
-#~ msgid "My objects By Day"
-#~ msgstr "Mis objetos por día"
-
-#~ msgid "My board"
-#~ msgstr "Mi tablero"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Tablero gestor de subastas"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "Mis últimos objetos"
diff --git a/addons/auction/i18n/es_AR.po b/addons/auction/i18n/es_AR.po
index 0938ce97d7a..7ac3aff3a95 100644
--- a/addons/auction/i18n/es_AR.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2322,27 +2322,15 @@ msgstr "Historial subasta"
 #~ msgid "Bids line"
 #~ msgstr "Línea de apuestas"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Formulario de depósito"
-
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "Factura comprador conciliada"
 
 #~ msgid "Antique/Tin / Copper wares"
 #~ msgstr "Antigüedades / Metal / Objetos de cobre"
 
-#~ msgid "Inv."
-#~ msgstr "Fact."
-
 #~ msgid "Mark as taken away"
 #~ msgstr "Marcar como para llevar"
 
-#~ msgid "Adjudication"
-#~ msgstr "Adjudicación"
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
-
 #~ msgid "Statements"
 #~ msgstr "Extractos"
 
@@ -2474,9 +2462,6 @@ msgstr "Historial subasta"
 #~ msgid "Confirmation set taken away"
 #~ msgstr "Fijar confirmación para llevar"
 
-#~ msgid "List N."
-#~ msgstr "N. lista"
-
 #~ msgid "Avg. Est"
 #~ msgstr "Est. promedio"
 
@@ -2502,18 +2487,9 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Verreries"
 #~ msgstr "Antigüedades / Vidrierías"
 
-#~ msgid "Buyer form"
-#~ msgstr "Formulario comprador"
-
-#~ msgid "Cat"
-#~ msgstr "Cat."
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Error! No se pueden crear cuentas recursivas."
 
-#~ msgid "Estimate"
-#~ msgstr "Estimado"
-
 #~ msgid "Antique/Toys"
 #~ msgstr "Antigüedades / Juguetes"
 
@@ -2541,9 +2517,6 @@ msgstr "Historial subasta"
 #~ msgid "Birth / Death dates"
 #~ msgstr "Fechas nacimiento / defunción"
 
-#~ msgid "Cat. N."
-#~ msgstr "Cat. N."
-
 #~ msgid "comparaison estimate/adjudication "
 #~ msgstr "comparación estimado/adjudicado "
 
@@ -2556,9 +2529,6 @@ msgstr "Historial subasta"
 #~ msgid "Numerotation"
 #~ msgstr "Numeración"
 
-#~ msgid "Document type"
-#~ msgstr "Tipo de documento"
-
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Comprobate de depósito"
 
@@ -2616,9 +2586,6 @@ msgstr "Historial subasta"
 #~ msgid "Buyer's Summary"
 #~ msgstr "Resumen del comprador"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Referencia del cliente"
-
 #~ msgid "Depositer's Statistics"
 #~ msgstr "Estadísticas del depositario"
 
@@ -2646,12 +2613,6 @@ msgstr "Historial subasta"
 #~ msgid "Encoded Objects Per Day"
 #~ msgstr "Objetos codificados por día"
 
-#~ msgid ", TEL:"
-#~ msgstr ", TEL:"
-
-#~ msgid "Document"
-#~ msgstr "Documento"
-
 #~ msgid "Payment's history"
 #~ msgstr "Historial de pagos"
 
@@ -2730,9 +2691,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Argenterie"
 #~ msgstr "Antigüedades / Monedas"
 
-#~ msgid "Document Number"
-#~ msgstr "Número de  documento"
-
 #~ msgid "Numerotate"
 #~ msgstr "Enumeración"
 
@@ -2748,9 +2706,6 @@ msgstr "Historial subasta"
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
 #~ "especial!"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Comprador, Precio"
-
 #~ msgid "Listing Huissiers"
 #~ msgstr "Listar acomododadores"
 
@@ -2775,9 +2730,6 @@ msgstr "Historial subasta"
 #~ msgid "Auction Reporting on view1"
 #~ msgstr "Informe subastas según vista1"
 
-#~ msgid "Plate Number:"
-#~ msgstr "Número placa:"
-
 #~ msgid "Object Reference"
 #~ msgstr "Referencia objeto"
 
@@ -2853,12 +2805,6 @@ msgstr "Historial subasta"
 #~ msgid "Bid information"
 #~ msgstr "Información de apuestas"
 
-#~ msgid "Limit"
-#~ msgstr "Límite"
-
-#~ msgid "TEL:"
-#~ msgstr "TEL:"
-
 #~ msgid "Objects to sell"
 #~ msgstr "Objetos para vender"
 
@@ -2880,18 +2826,12 @@ msgstr "Historial subasta"
 #~ msgid "Report deposit border"
 #~ msgstr "Informe justificante de depósito"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Adj.(EUR)"
-
 #~ msgid "Employee"
 #~ msgstr "Empleado"
 
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "El CUIT no parece ser correcto"
 
-#~ msgid "Est."
-#~ msgstr "Est."
-
 #~ msgid "Auction report"
 #~ msgstr "Informe subasta"
 
@@ -2901,15 +2841,6 @@ msgstr "Historial subasta"
 #~ msgid "auction.lot.category"
 #~ msgstr "subasta.lote.categoría"
 
-#~ msgid "BID:"
-#~ msgstr "APUESTA:"
-
-#~ msgid "NET"
-#~ msgstr "NETO"
-
-#~ msgid "Buyer Cost:"
-#~ msgstr "Costo comprador:"
-
 #~ msgid "Buyer's auction"
 #~ msgstr "Subasta del comprador"
 
@@ -2922,12 +2853,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Antigüedades / Muebles"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Contacto cliente"
-
-#~ msgid "Inv, Name"
-#~ msgstr "Inv, Nombre"
-
 #~ msgid "Numerotation (automatic)"
 #~ msgstr "Enumeración (automático)"
 
@@ -2961,9 +2886,6 @@ msgstr "Historial subasta"
 #~ msgid "Cont. Art/Arts"
 #~ msgstr "Arte cont. / Artes"
 
-#~ msgid "Ref."
-#~ msgstr "Ref."
-
 #~ msgid "Antique/Wine"
 #~ msgstr "Antigüedades / Vino"
 
@@ -2973,9 +2895,6 @@ msgstr "Historial subasta"
 #~ msgid "Sum of adjustication"
 #~ msgstr "Suma de adjudicación"
 
-#~ msgid "Orders"
-#~ msgstr "Pedidos"
-
 #~ msgid "Antique/Posters"
 #~ msgstr "Antigüedades / Posters"
 
@@ -2985,8 +2904,5 @@ msgstr "Historial subasta"
 #~ msgid "Simplified lots for adjudication"
 #~ msgstr "Lotes simplificados para adjudicación"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Subtotal:"
-
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
diff --git a/addons/auction/i18n/es_EC.po b/addons/auction/i18n/es_EC.po
index 5aa69f06e3b..763d252831a 100644
--- a/addons/auction/i18n/es_EC.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2317,9 +2317,6 @@ msgstr "Historial subasta"
 #~ msgid "Bids line"
 #~ msgstr "Línea de apuestas"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Formulario de depósito"
-
 #~ msgid "Adjudication by Auction"
 #~ msgstr "Adjudicación por subasta"
 
@@ -2338,18 +2335,9 @@ msgstr "Historial subasta"
 #~ msgid "Mark as taken away"
 #~ msgstr "Marcar como para llevar"
 
-#~ msgid "Inv."
-#~ msgstr "Fact."
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
-
 #~ msgid "Statements"
 #~ msgstr "Extractos"
 
-#~ msgid "Adjudication"
-#~ msgstr "Adjudicación"
-
 #~ msgid "Unclassifieds"
 #~ msgstr "No clasificados"
 
@@ -2475,9 +2463,6 @@ msgstr "Historial subasta"
 #~ msgid "Continue"
 #~ msgstr "Continuar"
 
-#~ msgid "List N."
-#~ msgstr "N. lista"
-
 #~ msgid "Avg. Est"
 #~ msgstr "Est. promedio"
 
@@ -2512,15 +2497,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Toys"
 #~ msgstr "Antigüedades / Juguetes"
 
-#~ msgid "Buyer form"
-#~ msgstr "Formulario comprador"
-
-#~ msgid "Estimate"
-#~ msgstr "Estimado"
-
-#~ msgid "Cat"
-#~ msgstr "Cat."
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "¡Error! No se pueden crear cuentas recursivas."
 
@@ -2554,9 +2530,6 @@ msgstr "Historial subasta"
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Justificante de depósito"
 
-#~ msgid "Document type"
-#~ msgstr "Tipo de documento"
-
 #~ msgid "comparaison estimate/adjudication "
 #~ msgstr "comparación estimado/adjudicado "
 
@@ -2566,9 +2539,6 @@ msgstr "Historial subasta"
 #~ msgid "Cont. Art/Other Media"
 #~ msgstr "Arte cont. / Otro media"
 
-#~ msgid "Cat. N."
-#~ msgstr "Cat. N."
-
 #~ msgid "Send Image also ?"
 #~ msgstr "¿Enviar imagen también?"
 
@@ -2617,15 +2587,9 @@ msgstr "Historial subasta"
 #~ msgid "Seller's Revenues"
 #~ msgstr "Ingresos del vendedor"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Subtotal:"
-
 #~ msgid "Buyer's Summary"
 #~ msgstr "Resumen del comprador"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Referencia cliente"
-
 #~ msgid "Depositer's Statistics"
 #~ msgstr "Estadísticas del depositario"
 
@@ -2659,12 +2623,6 @@ msgstr "Historial subasta"
 #~ msgid "Payment's history"
 #~ msgstr "Historial de pagos"
 
-#~ msgid "Document"
-#~ msgstr "Documento"
-
-#~ msgid ", TEL:"
-#~ msgstr ", TEL:"
-
 #~ msgid "Auction results"
 #~ msgstr "Resultados de subastas"
 
@@ -2743,15 +2701,9 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Sculpture, bronze, eso."
 #~ msgstr "Antigüedades / Escultura, bronze, etc."
 
-#~ msgid "Document Number"
-#~ msgstr "Número documento"
-
 #~ msgid "Numerotate"
 #~ msgstr "Enumeración"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Comprador, Precio"
-
 #~ msgid "Listing Huissiers"
 #~ msgstr "Listado"
 
@@ -2791,9 +2743,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Porcelain, Ceramics, Glassmaking, ..."
 #~ msgstr "Antigüedades / Porcelana, cerámica, vidrio, ..."
 
-#~ msgid "Plate Number:"
-#~ msgstr "Número placa:"
-
 #~ msgid "Object Reference"
 #~ msgstr "Referencia objeto"
 
@@ -2857,12 +2806,6 @@ msgstr "Historial subasta"
 #~ msgid "Bid information"
 #~ msgstr "Información apuesta"
 
-#~ msgid "TEL:"
-#~ msgstr "TEL:"
-
-#~ msgid "Limit"
-#~ msgstr "Límite"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "Últimos depósitos"
 
@@ -2890,12 +2833,6 @@ msgstr "Historial subasta"
 #~ msgid "Employee"
 #~ msgstr "Empleado"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Adj.(EUR)"
-
-#~ msgid "Est."
-#~ msgstr "Est."
-
 #~ msgid "Report deposit border"
 #~ msgstr "Informe justificante de depósito"
 
@@ -2908,9 +2845,6 @@ msgstr "Historial subasta"
 #~ msgid "Antique/Collectible & art objects"
 #~ msgstr "Antigüedades / Coleccionables y objetos de arte"
 
-#~ msgid "BID:"
-#~ msgstr "APUESTA:"
-
 #~ msgid "Buyer's auction"
 #~ msgstr "Subasta del comprador"
 
@@ -2920,21 +2854,9 @@ msgstr "Historial subasta"
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
-#~ msgid "Buyer Cost:"
-#~ msgstr "Coste comprador:"
-
-#~ msgid "NET"
-#~ msgstr "NETO"
-
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Antigüedades / Muebles"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Contacto cliente"
-
-#~ msgid "Inv, Name"
-#~ msgstr "Inv, Nombre"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "Objetos no planificados"
 
@@ -2962,9 +2884,6 @@ msgstr "Historial subasta"
 #~ msgid "Objects to sell"
 #~ msgstr "Objetos para vender"
 
-#~ msgid "Ref."
-#~ msgstr "Ref."
-
 #~ msgid "Short Description"
 #~ msgstr "Descripción breve"
 
@@ -2991,39 +2910,3 @@ msgstr "Historial subasta"
 
 #~ msgid "Antique/Posters"
 #~ msgstr "Antigüedades / Posters"
-
-#~ msgid "Orders"
-#~ msgstr "Pedidos"
-
-#~ msgid "Auction Manager"
-#~ msgstr "Gestor de subastas"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "Resumen aportado por el usuario"
-
-#~ msgid "Auction Member"
-#~ msgstr "Miembro de subastas"
-
-#~ msgid "Auction member board"
-#~ msgstr "Tablero miembro subastas"
-
-#~ msgid "Board for Auction"
-#~ msgstr "Tablero para subastas"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Estimaciones/Adjudicación"
-
-#~ msgid "Menu"
-#~ msgstr "Menú"
-
-#~ msgid "My objects By Day"
-#~ msgstr "Mis objetos por día"
-
-#~ msgid "My board"
-#~ msgstr "Mi tablero"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Tablero gestor de subastas"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "Mis últimos objetos"
diff --git a/addons/auction/i18n/es_MX.po b/addons/auction/i18n/es_MX.po
new file mode 100644
index 00000000000..21b9a5abb7d
--- /dev/null
+++ b/addons/auction/i18n/es_MX.po
@@ -0,0 +1,2946 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* auction
+#
+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-02-03 18:07+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:30+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr "Subasta realizada"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr "Vendedor"
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr "Mensaje SMS"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr "Aviso, ¡borra el precio de adjudicación de objetos y su comprador!"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr "Primer extracto bancario para el comprador"
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr "Nº de objetos"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr "Autores"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "Comprador"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr "Núm. de objetos"
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+"Cuando el estado de factura del vendedor es 'Pagado', este campo está "
+"seleccionado como Verdadero."
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr "Nº de artículos pagados (basado en facturas)"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr "Justificante de depósito"
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr "Importe facturado"
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr "Nombre objeto subastado"
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr "aie.category"
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr "Justificante de depósito"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+"Cuando la subasta se inicia el estado es 'Borrador'.\n"
+" Al final de la subasta, el estado se convierte en 'Cerrada'."
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr "Cantidad del tercer extracto bancario"
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr "Núm. de lista"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr "Nombre del coste"
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr "Primera fecha subasta"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+"Si el campo activo se establece a Falso, le permitirá ocultar la categoría "
+"del lote subastado sin eliminarlo."
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr "Ref."
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr "Total adj."
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr "SMS - Pasarela: clickatell','Envío masivo de SMS"
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr "Coste depósito"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr "No vendido"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr "Buscar depósito de subasta"
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr "Número de lista en el inventario depositante"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr "Artículos"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr "Costes del vendedor"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr "Apuestas"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr "Mapa compradores"
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr "Nº obj ret"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr "Pujar subastas"
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr "Imagen del objeto"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr "No hay comprador para este lote."
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr "El comprador \"%s\" no tiene dirección de factura."
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr "Comisiones"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr "Coste del depósito de la subasta"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr "Formulario justificante de depósito"
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr "Línea extracto bancario para el comprador dado"
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr "Asociar nombre de comprador a empresas"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr "Buscar lotes subastados"
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr "Ingreso neto"
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr "Enviar SMS"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr "Vendido"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr "Ningún lote pertenece a esta fecha de subasta"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr "Fecha de la apuesta"
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr "Cuenta de gastos"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr "Gestión de las entregas"
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr "Descripción del objeto"
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr "Artist/Autor2"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr "Línea1"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr "Crear factura para el comprador"
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr "Ingreso bruto"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr "Pagar objetos del comprador"
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr "Fecha fin de la subasta"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr "Enviar SMS"
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr "Descripción breve (2)"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr "Compradores"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr "IVA 12%"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr "Facturas comprador"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr "Resultados con comprador"
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr "Precio máximo"
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr "Fecha inicio de la subasta"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr "Movimiento subasta"
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr "Cuenta impuestos para el comprador"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr "Siguiente subasta"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr "Seleccione lotes que estén vendidos"
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr "El objeto \"%s\" no tiene comprador asignado."
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr "Guardar hasta la venta"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr "Fecha última subasta"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr "Costes vendedor (12%)"
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr "Vendedor pagado"
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr "Estadísticas objetos"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr "Nº de vendedores:"
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr "Nº de artículos para llevar:"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr "Resumen de la subasta"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr "%)"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr "Información comprador"
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr "Precio comprador - Precio vendedor"
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr "Nº de objetos"
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr "Estimación máxima"
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr "Precio comprador"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr "Detalles de la puja"
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr "Pago del comprador"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr "Fin de subasta"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr "Catálogo de subastas"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr "Costes de vendedor1"
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr "Nº de compradores"
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr "Costes indirectos"
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr "Cuenta impuesto para el vendedor"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Auction Management"
+msgstr "Gestión de subastas"
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr "Diario del vendedor"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+" * El estado 'Borrador' se utiliza cuando un objeto se codifica como un "
+"objeto nuevo.                 \n"
+"* El estado 'Sin vender' se utiliza cuando el objeto no se ha vendido por "
+"mucho tiempo, el usuario también puede establecer el estado borrador después "
+"del estado sin vender.                 \n"
+"* El estado 'Pagado' se utiliza cuando el usuario paga por el objeto.        "
+"         \n"
+"* El estado 'Vendido' se utiliza cuando el usuario compra el objeto."
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr "Categoría hijo de aie"
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr "Cuando el estado es 'Retirado', este campo se marca como verdadero."
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr "Gestión salida objetos"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr "Subasta"
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr "Categorías de objetos"
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr "ID API"
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr "ID apuesta"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr "Estimación mín.:"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr "Margen neto"
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr "¿Límite neto?"
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr "Nº de comisiones:"
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr "Nombre subasta"
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr "Nº de obj. codificados"
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr "Categoría padre de aie"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr "Resumen subasta"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr "(dejar vacío para número automático)"
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr "No existe dirección de factura"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr "Listado cobradores de deudas"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr "¡ Este registro no existe !"
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr "Importe para el primer extracto bancario"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr "Cuenta impuesto para la comisión del autor"
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr "Obras al 21%"
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr "Adj."
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr "Precio retirado"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr "Costes extra"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr "Mapa "
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr "Factura comprador reconciliada"
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr "Fecha depósito"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr "Depósitos"
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr "Costes específicos"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr "A pagar ("
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr "Costes comprador (20%)"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "Cuadro de mandos"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr "Subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Total adjudicaciones"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr "Crear factura"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr "Historial"
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr "Núm."
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr "Lote código de barras"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr "Núm."
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr "Historial de pagos del comprador"
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr "Biografía"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr "Pagar"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr "Crear facturas para el vendedor"
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr "Margen neto"
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr "Ubicación de la subasta"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr "Analítico"
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+"Cuando el estado de la factura del comprador es 'Pagada', este campo se pone "
+"a verdadero."
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr "Cat.N"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr "Decrementar límite de 10%"
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr "Total adjudicación"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr "Facturar objetos comprador"
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr "Mi subasta"
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr "(Ingresos brutos*100.0)/ Precio objeto"
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr "Número de contacto"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr "-"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr "Fotos"
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr "Número factura"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr "No se encontraron IDs activos"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr "¡La conexión a WWW.Auction-in-Europe.com ha fallado!"
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr "Ingreso bruto"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr "Tablero subasta"
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr "Inventario depositador"
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr "El comprador no tiene dirección de factura."
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr "Total adj."
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr "Entrar"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr "informe_subasta_adjudicación"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr "Formulario vendedor"
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr "Categoría objeto"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr "Marcar lotes"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr "Objeto subastado"
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr "Número de catálogo"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr "Teléfonos apuestas"
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr "Estimación promedio"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr "Debe:"
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr "Derechos de autor"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr "Diario contable para comprador"
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr "Apuesta"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr "Total ing. neto"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr "Actualizar"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "Vendedores"
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr "Precio máximo estimado"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr "Mover hasta fecha de subasta"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr "Nº de artículos no vendidos:"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr "Fecha subasta"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ", ID"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr "Adj.("
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr "Lista de lotes - Horizontal"
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr "Autor/Artista"
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr "Nombre usuario comprador"
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Últimos objetos"
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr "Lugar"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr "Cuando el comprador paga por extracto bancario', se marca este campo"
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr "Para llevar"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr "Total ing. bruto"
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr "Precio mínimo estimado"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr "Fecha depósito"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr "¡Este lote no existe!"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr "Para ser llamado"
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr "Mín est/Adj/Máx est"
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr "Estimación mínima"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr "Mandar sms "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr "Cambiar fecha subasta"
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr "Período de vida"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr "Método de retirada"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr "Comisiones comprador"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr "Análisis subastas"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr "¡ Pago abortado !"
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr "Precio retirado"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr "Inicio de la subasta"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr "Tercer extracto bancario para el comprador"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr "Estimación máxima:"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr "Estadística"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr "Depósito límite de subasta"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr "Estadísticas de objeto"
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr "(Ingreso neto * 100)/ Precio del objeto"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr "Historial de lote"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr "IVA 5%"
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr "Primer día exposición"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr "Lote"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr "subasta.artistas"
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr "Precio prom."
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr "Segundo extracto bancario para el comprador"
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr "Diario comprador"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr "Activa"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr "Fechas exposición"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr "IVA"
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr "Para enfatizar"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr "IVA1"
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr "Factura del vendedor"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr "Última fecha de exposición para la subasta"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr "¡Falta comprador!"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr "Flagey"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Gestor de subastas "
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+"Dos compradores diferentes para la misma factura !\n"
+"Por favor, corrija este problema antes de facturar"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr "Límite vendedor"
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr "Transferencia"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr "Línea3"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr "Línea2"
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr "Objeto retirado"
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr "Total adjudicación"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr "Contactar con el vendedor"
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr "Lotes que se han llevado"
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr "Margen neto (%)"
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ")"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr "Información vendedor"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr "Objetos"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr "Facturas vendedor"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr "Pagado:"
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr "Permitir importe negativo"
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr "Importe para el segundo extracto bancario"
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr "Fecha subasta"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr "Texto SMS"
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr "Primer día subasta"
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr "Crear facturas para el comprador"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr "Nombres"
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr "Artistas"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr "Pagar objetos"
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr "Fecha inicio exposición para la subasta"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr "Lotes abiertos"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr "Ficha de depósito"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr "Activar lotes"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr "Lotes"
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr "Precio vendedor"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr "Lista comprador"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr "Costes comprador("
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr "Extracto"
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr "Precio vendedor"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr "Gastos de venta"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr "IVA 1%"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr "Derechos de autor"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr "Mapa comprador"
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr "Fecha creación"
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+"Proporciona información del depósito: vendedor, método de retirada, objeto, "
+"costes del depósito"
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr "Ingreso neto"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr "Nº de artículos:"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr "Derechos de autor (4%)"
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr "Estimación"
+
+#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid ""
+"\n"
+"     This module manages the records of the artists,\n"
+"     the articles to be put up for auction,the buyers and\n"
+"     sellers.\n"
+"\n"
+"     It completely manages an auction such as managing bids,\n"
+"     keeping track of the sold articles along with the paid\n"
+"     and unpaid objects including delivery of the articles.\n"
+"     Dashboards for auction that includes:\n"
+"       * My Latest Objects (list)\n"
+"       * My Latest Deposits (list)\n"
+"       * Objects Statistics (list)\n"
+"       * My Objects By Day (list)\n"
+"    "
+msgstr ""
+"\n"
+"     Este módulo gestiona los registros de los artistas,\n"
+"     los artículos que se ponen a subasta, los compradores y\n"
+"     los vendedores.\n"
+"\n"
+"     Gestiona completamente una subasta como la gestión de las ofertas,\n"
+"     el seguimiento de los artículos que se venden junto con el pago\n"
+"     y los objetos pendientes de pago, incluida la entrega de los "
+"artículos.\n"
+"     Tableros para la subasta, que incluye:\n"
+"       * Mis últimos objetos (la lista)\n"
+"       * Mis últimos depósitos (lista)\n"
+"       * Estadística de objetos (lista)\n"
+"       * Mis objetos por día (lista)\n"
+"    "
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr "Aceptar"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr "Formulario comprador"
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr "Nombre comprador"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr "Factura objetos vendedor"
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr "Margen bruto (%)"
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr "Buscar fechas siguiente subasta"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr "Imprimir informe sobre catalogo de subasta"
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr "Avance del comprador"
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr "Comisión"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Mín/Adj/Máx"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr "Informe de Catálogo Flagey"
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr "Precio objeto"
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr "Líneas pujas"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr "Catálogo"
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr "Subasta para objeto"
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr "Cuenta de destino"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr "Debe pagar todo el total: Faltan \"%.2f\" para liquidar el pago."
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr "Pagar compra"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr "Herramientas códigos de barras"
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr "Depósito"
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr "Último día de exposición"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr "Lotes disponibles"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr "IVA 10%"
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr "Artista / Nombre autor"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: auction
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr "Precio comprador"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr "Categoría lotes subasta"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr "IVA 20%"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr "Pago subasta para vendedor"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr "Para llevar"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr "Lista vendedor"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr "Costes de depósito"
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr "Nombre de categoría"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr "........."
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr "Vista resumen de subasta en árbol"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr "Adj"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr "Fechas subasta"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr "Panel de mandos de subasta"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr "Líneas de pago"
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr "¡Falta dirección!"
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr "Precio comprador - Precio vendedor - Coste indirecto"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+msgid "Open Bids"
+msgstr "Pujas abiertas"
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr "Pseudo"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr "No vendido"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr "Costes comprador"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr "Fecha subasta:"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr "Factura comprador"
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr "Tel"
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr "Artista / Autor"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr "Totales subasta con listas"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr "Objeto codificado"
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr "Buscar puja subasta"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr "Est"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr "Comisiones vendedor"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr "Estadística objeto"
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr "Diario contable para vendedor"
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr "Último día de subasta"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr "Descripción de objetos"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr "No hay fecha de la subasta para \"%s\": Por favor seleccione una."
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr "Precio adjudicación"
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr "Cuenta de ingresos"
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr "Pagar objetos"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr "Nº objetos"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr "Adjudicación:"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr "Apuestas por lote (teléfono)"
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr "Entrada comprador"
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr "Gastos"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr "Pagador de la subasta"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr "Nombre subasta:"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Últimos depósitos"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr "Biografía artistas"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr "Historial subasta"
+
+#~ msgid "Total margin"
+#~ msgstr "Margen total"
+
+#~ msgid "SMS - Gateway: clickatell"
+#~ msgstr "Puerta de enlace SMS vía clickatell"
+
+#~ msgid "Provisoire"
+#~ msgstr "Provisional"
+
+#~ msgid "Definitive (ordre catalogue)"
+#~ msgstr "Definitivo (orden catálogo)"
+
+#~ msgid "My Encoded Objects Per Day"
+#~ msgstr "Mis objetos codificados por día"
+
+#~ msgid "Lot history"
+#~ msgstr "Historial de lotes"
+
+#~ msgid "Bids line"
+#~ msgstr "Línea de apuestas"
+
+#~ msgid "Adjudication by Auction"
+#~ msgstr "Adjudicación por subasta"
+
+#~ msgid "Numerotation (per lot)"
+#~ msgstr "Numeración (por lote)"
+
+#~ msgid "Antique/Books, manuscripts, eso."
+#~ msgstr "Antigüedades / Libros, manuscritos, etc."
+
+#~ msgid "Antique/Tin / Copper wares"
+#~ msgstr "Antigüedades / Metal / Objetos de cobre"
+
+#~ msgid "Buyer invoice reconciled"
+#~ msgstr "Factura comprador reconciliada"
+
+#~ msgid "Mark as taken away"
+#~ msgstr "Marcar como para llevar"
+
+#~ msgid "Statements"
+#~ msgstr "Extractos"
+
+#~ msgid "Unclassifieds"
+#~ msgstr "No clasificados"
+
+#~ msgid "Objects by Auction"
+#~ msgstr "Objetos por subasta"
+
+#~ msgid "Antiques"
+#~ msgstr "Antigüedades"
+
+#~ msgid "Object Type"
+#~ msgstr "Tipo de objeto"
+
+#~ msgid "Contemporary Art"
+#~ msgstr "Arte contemporáneo"
+
+#~ msgid "No of sellers"
+#~ msgstr "Núm. de vendedores"
+
+#~ msgid "ned"
+#~ msgstr "Holandés"
+
+#~ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+#~ msgstr ""
+#~ "Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+#~ "Registro de salida (resp. Registro de entrada)"
+
+#~ msgid "Net margin (%)"
+#~ msgstr "Margen neto (%)"
+
+#~ msgid "Dates"
+#~ msgstr "Fechas"
+
+#~ 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 "All objects"
+#~ msgstr "Todos los objetos"
+
+#~ msgid "Buyer's auction for all months"
+#~ msgstr "Subasta del comprador para todos los meses"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "Cont. Art/Painting"
+#~ msgstr "Arte cont. / Pintura"
+
+#~ msgid "Back"
+#~ msgstr "Anterior"
+
+#~ msgid "Unsold objects"
+#~ msgstr "Objetos sin vender"
+
+#~ msgid "Sold Objects"
+#~ msgstr "Objetos vendidos"
+
+#~ msgid "Sum net margin"
+#~ msgstr "Suma margen neto"
+
+#~ msgid "Langage"
+#~ msgstr "Idioma"
+
+#~ msgid "Inventory Number"
+#~ msgstr "Número de inventario"
+
+#~ msgid "Exit"
+#~ msgstr "Salir"
+
+#~ msgid "Auction buyer reporting form view"
+#~ msgstr "Informe comprador de subastas vista formulario"
+
+#~ msgid "Antique/Cartoons"
+#~ msgstr "Antigüedades / Tebeos"
+
+#~ msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#~ msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
+
+#~ msgid "Auction Objects"
+#~ msgstr "Objetos de subasta"
+
+#~ msgid "Auction reporting2 form view"
+#~ msgstr "Informe2 subastas vista formulario"
+
+#~ msgid "Depositer's statistics"
+#~ msgstr "Estadísticas del depositario"
+
+#~ msgid "Buyer information"
+#~ msgstr "Información del comprador"
+
+#~ msgid "Auction Reporting on seller view"
+#~ msgstr "Informe subastas según vista vendedor"
+
+#~ msgid "auction.dates"
+#~ msgstr "subasta.fechas"
+
+#~ msgid "Amount paid"
+#~ msgstr "Importe pagado"
+
+#~ msgid "My Latest Deposits"
+#~ msgstr "Mis últimos depósitos"
+
+#~ msgid "Buyer's Revenues"
+#~ msgstr "Ingresos del comprador"
+
+#~ msgid "eng"
+#~ msgstr "Inglés"
+
+#~ msgid "Auction buyer reporting tree view2"
+#~ msgstr "Informe comprador de subastas vista2 árbol"
+
+#~ msgid "Bulk SMS send"
+#~ msgstr "SMS enviado"
+
+#~ msgid "fr"
+#~ msgstr "Francés"
+
+#~ msgid "Antique/Old weapons and militaria"
+#~ msgstr "Antigüedades / Armas antiguas y militares"
+
+#~ msgid "Antique/Oriental Arts/Chineese furnitures"
+#~ msgstr "Antigüedades / Arte oriental / Muebles chinos"
+
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
+#~ msgid "Avg. Est"
+#~ msgstr "Est. promedio"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid ""
+#~ "This module provides functionality to \n"
+#~ "     manage artists, articles, sellers, buyers and auction.\n"
+#~ "     Manage bids, track of sold, paid and unpaid objects.\n"
+#~ "     Delivery Management. \n"
+#~ "    "
+#~ msgstr ""
+#~ "Este módulo proporciona funcionalidad para \n"
+#~ "     gestionar artistas, artículos, vendedores, compradores y subastas.\n"
+#~ "     Gestionar pujas, rastreo de ventas y objetos pagados y no pagados.\n"
+#~ "     Gestión de la distribución. \n"
+#~ "    "
+
+#~ msgid "Confirmation set taken away"
+#~ msgstr "Fijar confirmación para llevar"
+
+#~ msgid "Mark as paid for seller"
+#~ msgstr "Marcar como pagado para vendedor"
+
+#~ msgid "Close + Create all invoices"
+#~ msgstr "Cerrar + Crear todas las facturas"
+
+#~ msgid "Antique/Verreries"
+#~ msgstr "Antigüedades / Vidrierías"
+
+#~ msgid "Antique/Toys"
+#~ msgstr "Antigüedades / Juguetes"
+
+#~ msgid "Error ! You can not create recursive accounts."
+#~ msgstr "¡Error! No se pueden crear cuentas recursivas."
+
+#~ msgid "Auction buyer reporting tree view"
+#~ msgstr "Informe comprador de subastas vista árbol"
+
+#~ msgid "Define Artists"
+#~ msgstr "Definir artistas"
+
+#~ msgid "Comparison of estimations"
+#~ msgstr "Comparación de estimaciones"
+
+#~ msgid "Code barres du lot"
+#~ msgstr "Código de barras del lote"
+
+#~ msgid "Retry"
+#~ msgstr "Reintentar"
+
+#~ msgid "Birth / Death dates"
+#~ msgstr "Fechas nacimiento / defunción"
+
+#~ msgid "Antique/Jewelry"
+#~ msgstr "Antigüedades / Joyas"
+
+#~ msgid "Unclassified objects "
+#~ msgstr "Objetos no clasificados "
+
+#~ msgid "Numerotation"
+#~ msgstr "Numeración"
+
+#~ msgid "Bordereau de dépôt"
+#~ msgstr "Justificante de depósito"
+
+#~ msgid "comparaison estimate/adjudication "
+#~ msgstr "comparación estimado/adjudicado "
+
+#~ msgid "Adj(EUR)"
+#~ msgstr "Adj(EUR)"
+
+#~ msgid "Cont. Art/Other Media"
+#~ msgstr "Arte cont. / Otro media"
+
+#~ msgid "Send Image also ?"
+#~ msgstr "¿Enviar imagen también?"
+
+#~ msgid "General Informations"
+#~ msgstr "Información general"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Auctions results"
+#~ msgstr "Resultados subastas"
+
+#~ msgid "Unclassified objects"
+#~ msgstr "Objetos sin clasificar"
+
+#~ msgid "Antique/Carpet and textilles"
+#~ msgstr "Antigüedades / Alfombras y textiles"
+
+#~ msgid "New Auction Dates"
+#~ msgstr "Nuevas fechas de subasta"
+
+#~ msgid "Sum adj"
+#~ msgstr "Suma adj"
+
+#~ msgid "No of Objects"
+#~ msgstr "Núm. de objetos"
+
+#~ msgid "Antique/Painting"
+#~ msgstr "Antigüedades / Pinturas"
+
+#~ msgid "Check payment for seller"
+#~ msgstr "Comprobar pago para vendedor"
+
+#~ msgid "Detailed lots"
+#~ msgstr "Lotes detallados"
+
+#~ msgid "Send results to Auction-in-europe.com"
+#~ msgstr "Enviar resultados a Auction-in-europe.com"
+
+#~ msgid "Seller's auction"
+#~ msgstr "Subasta del vendedor"
+
+#~ msgid "Seller's Revenues"
+#~ msgstr "Ingresos del vendedor"
+
+#~ msgid "Buyer's Summary"
+#~ msgstr "Resumen del comprador"
+
+#~ msgid "Depositer's Statistics"
+#~ msgstr "Estadísticas del depositario"
+
+#~ msgid "To pay"
+#~ msgstr "Para pagar"
+
+#~ msgid "Enable Taken away"
+#~ msgstr "Activar para llevar"
+
+#~ msgid "Antique/Others"
+#~ msgstr "Antigüedades / Otros"
+
+#~ msgid "Auction Reporting tree view2"
+#~ msgstr "Informe subastas vista2 árbol"
+
+#~ msgid "Auction buyer reporting form view2"
+#~ msgstr "Informe comprador de subastas vista2 formulario"
+
+#~ msgid "Auction dates"
+#~ msgstr "Fechas subastas"
+
+#~ msgid "Auction seller reporting2 graph view"
+#~ msgstr "Informe2 vendedor de subastas vista gráfico"
+
+#~ msgid "Encoded Objects Per Day"
+#~ msgstr "Objetos codificados por día"
+
+#~ msgid "Auction Reporting on buyer view"
+#~ msgstr "Informe subastas según vista comprador"
+
+#~ msgid "Payment's history"
+#~ msgstr "Historial de pagos"
+
+#~ msgid "Auction results"
+#~ msgstr "Resultados de subastas"
+
+#~ msgid "Auction's Revenues"
+#~ msgstr "Ingresos de la subasta"
+
+#~ msgid "Antique/Metal Ware"
+#~ msgstr "Antigüedades / Objetos de metal"
+
+#~ msgid "de"
+#~ msgstr "Alemán"
+
+#~ msgid "Old Auctions"
+#~ msgstr "Subastas anteriores"
+
+#~ msgid "Cont. Art/Curiosa"
+#~ msgstr "Arte cont. / Curiosidades"
+
+#~ msgid "Auction module"
+#~ msgstr "Módulo de subastas"
+
+#~ msgid "Attendance"
+#~ msgstr "Servicio"
+
+#~ msgid "Seller information"
+#~ msgstr "Información vendedor"
+
+#~ msgid "Cont. Art/Jewelry"
+#~ msgstr "Arte cont. / Joyas"
+
+#~ msgid "Next Auctions"
+#~ msgstr "Próximas subastas"
+
+#~ msgid "#"
+#~ msgstr "Nº"
+
+#~ msgid "Antique/Miniatures / Collections"
+#~ msgstr "Antigüedades / Miniaturas / Colecciones"
+
+#~ msgid "Auction reporting tree view"
+#~ msgstr "Informe subastas vista árbol"
+
+#~ msgid "Cont. Art/Photo"
+#~ msgstr "Arte cont. / Fotografía"
+
+#~ msgid "Bid auctions"
+#~ msgstr "Apuesta subastas"
+
+#~ msgid "Avg margin"
+#~ msgstr "Margen promedio"
+
+#~ msgid "Antique/Art from the Ivory Coast"
+#~ msgstr "Antigüedades / Arte de la Costa de Marfil"
+
+#~ msgid "Antique/Religiosa"
+#~ msgstr "Antigüedades / Religioso"
+
+#~ 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 "Unplanned objects"
+#~ msgstr "Objetos no planificados"
+
+#~ msgid "Cont. Art/Sculpture"
+#~ msgstr "Arte cont. / Escultura"
+
+#~ msgid "Antique/Argenterie"
+#~ msgstr "Antigüedades / Monedas"
+
+#~ msgid "Antique/Lightings"
+#~ msgstr "Antigüedades / Lámparas"
+
+#~ msgid "Antique/Sculpture, bronze, eso."
+#~ msgstr "Antigüedades / Escultura, bronze, etc."
+
+#~ msgid "Numerotate"
+#~ msgstr "Enumeración"
+
+#~ msgid "All objects are assigned to buyers !"
+#~ msgstr "¡Todos los objetos han sido asignados a compradores!"
+
+#~ msgid "Able Taken away"
+#~ msgstr "Habilitar para llevar"
+
+#~ 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 "Artist/Author 2"
+#~ msgstr "Artista / Autor 2"
+
+#~ msgid "Seller's Summary"
+#~ msgstr "Resumen del vendedor"
+
+#~ msgid "Auction reporting graph view"
+#~ msgstr "Informe subastas vista gráfico"
+
+#~ msgid "Send on your website"
+#~ msgstr "Enviar a su sitio web"
+
+#~ msgid "Simplified lots for adjudication"
+#~ msgstr "Lotes simplificados para adjudicación"
+
+#~ msgid "Auction Reporting on view1"
+#~ msgstr "Informe subastas según vista1"
+
+#~ msgid "Sum Adjustication"
+#~ msgstr "Suma adjudicación"
+
+#~ msgid "Antique/Porcelain, Ceramics, Glassmaking, ..."
+#~ msgstr "Antigüedades / Porcelana, cerámica, vidrio, ..."
+
+#~ msgid "Object Reference"
+#~ msgstr "Referencia objeto"
+
+#~ msgid "Cont. Art/Shows"
+#~ msgstr "Arte cont. / Espectáculos"
+
+#~ msgid "Unsold Objects"
+#~ msgstr "Objetos no vendidos"
+
+#~ msgid "Avg Adj."
+#~ msgstr "Adj. promedio"
+
+#~ msgid "auction.deposit.cost"
+#~ msgstr "subasta.depósito.coste"
+
+#~ msgid "Object Inventory"
+#~ msgstr "Inventario de objetos"
+
+#~ msgid "Antique/Art from the Ivory Coast/African Arts"
+#~ msgstr "Antigüedades / Arte de la Costa de Marfil / Arte africano"
+
+#~ msgid "User's pointing"
+#~ msgstr "Puntuación del usuario"
+
+#~ msgid "Lot Category"
+#~ msgstr "Categoría lote"
+
+#~ msgid "Manager"
+#~ msgstr "Responsable"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Auction reporting form view"
+#~ msgstr "Informe subastas vista formulario"
+
+#~ msgid "Send to website"
+#~ msgstr "Enviar al sitio web"
+
+#~ msgid "Old Auction Dates"
+#~ msgstr "Fechas subastas anteriores"
+
+#~ msgid "Auction Reporting on seller view2"
+#~ msgstr "Informe subastas según vista2 vendedor"
+
+#~ msgid "Antique/Engravings"
+#~ msgstr "Antigüedades / Grabados"
+
+#~ msgid "First Number"
+#~ msgstr "Primer número"
+
+#~ msgid "Auction Reporting on  view2"
+#~ msgstr "Informe subastas según vista2"
+
+#~ msgid ""
+#~ "Warning, this will erase the object adjudication price and its buyer !"
+#~ msgstr ""
+#~ "¡Atención, ésto eliminará el precio de adjudicación del objeto y su "
+#~ "comprador!"
+
+#~ msgid "Bid information"
+#~ msgstr "Información apuesta"
+
+#~ msgid "Objects to sell"
+#~ msgstr "Objetos para vender"
+
+#~ msgid "Latest Deposits"
+#~ msgstr "Últimos depósitos"
+
+#~ msgid "Antique/Musical Instruments"
+#~ msgstr "Antigüedades / Instrumentos musicales"
+
+#~ msgid "Antique/Graphic Arts"
+#~ msgstr "Antigüedades / Arte gráfico"
+
+#~ msgid "Antique/Oriental Arts"
+#~ msgstr "Antigüedades / Arte oriental"
+
+#~ msgid "Sum of adjudication"
+#~ msgstr "Suma de adjudicación"
+
+#~ msgid "Unmark as taken away"
+#~ msgstr "Desmarcar como para llevar"
+
+#~ msgid "Lot Number"
+#~ msgstr "Número de lote"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "El CIF/NIF no parece estar correcto."
+
+#~ msgid "Employee"
+#~ msgstr "Empleado"
+
+#~ msgid "Report deposit border"
+#~ msgstr "Informe justificante de depósito"
+
+#~ msgid "Auction report"
+#~ msgstr "Informe subasta"
+
+#~ msgid "auction.lot.category"
+#~ msgstr "subasta.lote.categoría"
+
+#~ msgid "Antique/Collectible & art objects"
+#~ msgstr "Antigüedades / Coleccionables y objetos de arte"
+
+#~ msgid "Buyer's auction"
+#~ msgstr "Subasta del comprador"
+
+#~ msgid "Auction reporting2 tree view"
+#~ msgstr "Informe2 subastas vista árbol"
+
+#~ msgid "Antique/Furnitures"
+#~ msgstr "Antigüedades / Muebles"
+
+#~ msgid "Unplanned Objects"
+#~ msgstr "Objetos no planificados"
+
+#~ msgid "Numerotation (automatic)"
+#~ msgstr "Enumeración (automático)"
+
+#~ msgid "Amount to paid"
+#~ msgstr "Importe a pagar"
+
+#~ msgid "No of buyers"
+#~ msgstr "Nº de compradores"
+
+#~ msgid "Avg adjudication"
+#~ msgstr "Adjudicación promedio"
+
+#~ msgid "Next Auction Dates"
+#~ msgstr "Próximas fechas de subasta"
+
+#~ msgid "Report Sign In/Out"
+#~ msgstr "Informe registro entrada/salida"
+
+#~ msgid "Cont. Art/Arts"
+#~ msgstr "Arte cont. / Artes"
+
+#~ msgid "Short Description"
+#~ msgstr "Descripción breve"
+
+#~ msgid "Employees"
+#~ msgstr "Empleados"
+
+#~ msgid "Antique/Clocks and watches"
+#~ msgstr "Antigüedades / Relojes"
+
+#~ msgid "Antique/Scientific Instruments"
+#~ msgstr "Antigüedades / Instrumentos científicos"
+
+#~ msgid "Confirmation enable taken away"
+#~ msgstr "Habilitar confirmación para llevar"
+
+#~ msgid "Sum of adjustication"
+#~ msgstr "Suma de adjudicación"
+
+#~ msgid "Antique/Wine"
+#~ msgstr "Antigüedades / Vino"
+
+#~ msgid "Antique/African Arts"
+#~ msgstr "Antigüedades / Arte africano"
+
+#~ msgid "Antique/Posters"
+#~ msgstr "Antigüedades / Posters"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Listing Huissiers"
+#~ msgstr "Listado"
+
+#~ msgid "Aie Category"
+#~ msgstr "Categoria encontrada"
+
+#~ msgid "Error ! You can not create recursive associated members."
+#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
diff --git a/addons/auction/i18n/es_PY.po b/addons/auction/i18n/es_PY.po
index dd79d89b685..22e9598e0ee 100644
--- a/addons/auction/i18n/es_PY.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/es_VE.po b/addons/auction/i18n/es_VE.po
new file mode 100644
index 00000000000..21b9a5abb7d
--- /dev/null
+++ b/addons/auction/i18n/es_VE.po
@@ -0,0 +1,2946 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* auction
+#
+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-02-03 18:07+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:30+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr "Subasta realizada"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr "Vendedor"
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr "Mensaje SMS"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr "Aviso, ¡borra el precio de adjudicación de objetos y su comprador!"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr "Primer extracto bancario para el comprador"
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr "Nº de objetos"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr "Autores"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "Comprador"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr "Núm. de objetos"
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+"Cuando el estado de factura del vendedor es 'Pagado', este campo está "
+"seleccionado como Verdadero."
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr "Nº de artículos pagados (basado en facturas)"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr "Justificante de depósito"
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr "Importe facturado"
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr "Nombre objeto subastado"
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr "aie.category"
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr "Justificante de depósito"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+"Cuando la subasta se inicia el estado es 'Borrador'.\n"
+" Al final de la subasta, el estado se convierte en 'Cerrada'."
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr "Cantidad del tercer extracto bancario"
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr "Núm. de lista"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr "Nombre del coste"
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr "Primera fecha subasta"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+"Si el campo activo se establece a Falso, le permitirá ocultar la categoría "
+"del lote subastado sin eliminarlo."
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr "Ref."
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr "Total adj."
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr "SMS - Pasarela: clickatell','Envío masivo de SMS"
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr "Coste depósito"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr "No vendido"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr "Buscar depósito de subasta"
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr "Número de lista en el inventario depositante"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr "Artículos"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr "Costes del vendedor"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr "Apuestas"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr "Mapa compradores"
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr "Nº obj ret"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr "Pujar subastas"
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr "Imagen del objeto"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr "No hay comprador para este lote."
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr "El comprador \"%s\" no tiene dirección de factura."
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr "Comisiones"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr "Coste del depósito de la subasta"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr "Formulario justificante de depósito"
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr "Línea extracto bancario para el comprador dado"
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr "Asociar nombre de comprador a empresas"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr "Buscar lotes subastados"
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr "Ingreso neto"
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr "Enviar SMS"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr "Vendido"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr "Ningún lote pertenece a esta fecha de subasta"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr "Fecha de la apuesta"
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr "Cuenta de gastos"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr "Gestión de las entregas"
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr "Descripción del objeto"
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr "Artist/Autor2"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr "Línea1"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr "Crear factura para el comprador"
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr "Ingreso bruto"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr "Pagar objetos del comprador"
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr "Fecha fin de la subasta"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr "Enviar SMS"
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr "Descripción breve (2)"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr "Compradores"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr "IVA 12%"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr "Facturas comprador"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr "Resultados con comprador"
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr "Precio máximo"
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr "Fecha inicio de la subasta"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr "Movimiento subasta"
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr "Cuenta impuestos para el comprador"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr "Siguiente subasta"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr "Seleccione lotes que estén vendidos"
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr "El objeto \"%s\" no tiene comprador asignado."
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr "Guardar hasta la venta"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr "Fecha última subasta"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr "Costes vendedor (12%)"
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr "Vendedor pagado"
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr "Estadísticas objetos"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr "Nº de vendedores:"
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr "Nº de artículos para llevar:"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr "Resumen de la subasta"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr "%)"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr "Información comprador"
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr "Precio comprador - Precio vendedor"
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr "Nº de objetos"
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr "Estimación máxima"
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr "Precio comprador"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr "Detalles de la puja"
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr "Pago del comprador"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr "Fin de subasta"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr "Catálogo de subastas"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr "Costes de vendedor1"
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr "Nº de compradores"
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr "Costes indirectos"
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr "Cuenta impuesto para el vendedor"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Auction Management"
+msgstr "Gestión de subastas"
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr "Diario del vendedor"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+" * El estado 'Borrador' se utiliza cuando un objeto se codifica como un "
+"objeto nuevo.                 \n"
+"* El estado 'Sin vender' se utiliza cuando el objeto no se ha vendido por "
+"mucho tiempo, el usuario también puede establecer el estado borrador después "
+"del estado sin vender.                 \n"
+"* El estado 'Pagado' se utiliza cuando el usuario paga por el objeto.        "
+"         \n"
+"* El estado 'Vendido' se utiliza cuando el usuario compra el objeto."
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr "Categoría hijo de aie"
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr "Cuando el estado es 'Retirado', este campo se marca como verdadero."
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr "Gestión salida objetos"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr "Subasta"
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr "Categorías de objetos"
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr "ID API"
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr "ID apuesta"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr "Estimación mín.:"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr "Margen neto"
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr "¿Límite neto?"
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr "Nº de comisiones:"
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr "Nombre subasta"
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr "Nº de obj. codificados"
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr "Categoría padre de aie"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr "Resumen subasta"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr "(dejar vacío para número automático)"
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr "No existe dirección de factura"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr "Listado cobradores de deudas"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr "¡ Este registro no existe !"
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr "Importe para el primer extracto bancario"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr "Cuenta impuesto para la comisión del autor"
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr "Obras al 21%"
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr "Adj."
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr "Precio retirado"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr "Costes extra"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr "Mapa "
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr "Factura comprador reconciliada"
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr "Fecha depósito"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr "Depósitos"
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr "Costes específicos"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr "A pagar ("
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr "Costes comprador (20%)"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "Cuadro de mandos"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr "Subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Total adjudicaciones"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr "Crear factura"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr "Historial"
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr "Núm."
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr "Lote código de barras"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr "Núm."
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr "Historial de pagos del comprador"
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr "Biografía"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr "Pagar"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr "Crear facturas para el vendedor"
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr "Margen neto"
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr "Ubicación de la subasta"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr "Analítico"
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+"Cuando el estado de la factura del comprador es 'Pagada', este campo se pone "
+"a verdadero."
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr "Cat.N"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr "Decrementar límite de 10%"
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr "Total adjudicación"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr "Facturar objetos comprador"
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr "Mi subasta"
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr "(Ingresos brutos*100.0)/ Precio objeto"
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr "Número de contacto"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr "-"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr "Fotos"
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr "Número factura"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr "No se encontraron IDs activos"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr "¡La conexión a WWW.Auction-in-Europe.com ha fallado!"
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr "Ingreso bruto"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr "Tablero subasta"
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr "Inventario depositador"
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr "El comprador no tiene dirección de factura."
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr "Total adj."
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr "Entrar"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr "informe_subasta_adjudicación"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr "Formulario vendedor"
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr "Categoría objeto"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr "Marcar lotes"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr "Objeto subastado"
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr "Número de catálogo"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr "Teléfonos apuestas"
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr "Estimación promedio"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr "Debe:"
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr "Derechos de autor"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr "Diario contable para comprador"
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr "Apuesta"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr "Total ing. neto"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr "Actualizar"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "Vendedores"
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr "Precio máximo estimado"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr "Mover hasta fecha de subasta"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr "Nº de artículos no vendidos:"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr "Fecha subasta"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ", ID"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr "Adj.("
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr "Lista de lotes - Horizontal"
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr "Autor/Artista"
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr "Nombre usuario comprador"
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Últimos objetos"
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr "Lugar"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr "Cuando el comprador paga por extracto bancario', se marca este campo"
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr "Para llevar"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr "Total ing. bruto"
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr "Precio mínimo estimado"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr "Fecha depósito"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr "¡Este lote no existe!"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr "Para ser llamado"
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr "Mín est/Adj/Máx est"
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr "Estimación mínima"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr "Mandar sms "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr "Cambiar fecha subasta"
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr "Período de vida"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr "Método de retirada"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr "Comisiones comprador"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr "Análisis subastas"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr "¡ Pago abortado !"
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr "Precio retirado"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr "Inicio de la subasta"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr "Tercer extracto bancario para el comprador"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr "Estimación máxima:"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr "Estadística"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr "Depósito límite de subasta"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr "Estadísticas de objeto"
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr "(Ingreso neto * 100)/ Precio del objeto"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr "Historial de lote"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr "IVA 5%"
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr "Primer día exposición"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr "Lote"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr "subasta.artistas"
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr "Precio prom."
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr "Segundo extracto bancario para el comprador"
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr "Diario comprador"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr "Activa"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr "Fechas exposición"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr "IVA"
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr "Para enfatizar"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr "IVA1"
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr "Factura del vendedor"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr "Última fecha de exposición para la subasta"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr "¡Falta comprador!"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr "Flagey"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Gestor de subastas "
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+"Dos compradores diferentes para la misma factura !\n"
+"Por favor, corrija este problema antes de facturar"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr "Límite vendedor"
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr "Transferencia"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr "Línea3"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr "Línea2"
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr "Objeto retirado"
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr "Total adjudicación"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr "Contactar con el vendedor"
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr "Lotes que se han llevado"
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr "Margen neto (%)"
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ")"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr "Información vendedor"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr "Objetos"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr "Facturas vendedor"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr "Pagado:"
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr "Permitir importe negativo"
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr "Importe para el segundo extracto bancario"
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr "Fecha subasta"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr "Texto SMS"
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr "Primer día subasta"
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr "Crear facturas para el comprador"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr "Nombres"
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr "Artistas"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr "Pagar objetos"
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr "Fecha inicio exposición para la subasta"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr "Lotes abiertos"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr "Ficha de depósito"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr "Activar lotes"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr "Lotes"
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr "Precio vendedor"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr "Lista comprador"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr "Costes comprador("
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr "Extracto"
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr "Precio vendedor"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr "Gastos de venta"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr "IVA 1%"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr "Derechos de autor"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr "Mapa comprador"
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr "Fecha creación"
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+"Proporciona información del depósito: vendedor, método de retirada, objeto, "
+"costes del depósito"
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr "Ingreso neto"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr "Nº de artículos:"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr "Derechos de autor (4%)"
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr "Estimación"
+
+#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid ""
+"\n"
+"     This module manages the records of the artists,\n"
+"     the articles to be put up for auction,the buyers and\n"
+"     sellers.\n"
+"\n"
+"     It completely manages an auction such as managing bids,\n"
+"     keeping track of the sold articles along with the paid\n"
+"     and unpaid objects including delivery of the articles.\n"
+"     Dashboards for auction that includes:\n"
+"       * My Latest Objects (list)\n"
+"       * My Latest Deposits (list)\n"
+"       * Objects Statistics (list)\n"
+"       * My Objects By Day (list)\n"
+"    "
+msgstr ""
+"\n"
+"     Este módulo gestiona los registros de los artistas,\n"
+"     los artículos que se ponen a subasta, los compradores y\n"
+"     los vendedores.\n"
+"\n"
+"     Gestiona completamente una subasta como la gestión de las ofertas,\n"
+"     el seguimiento de los artículos que se venden junto con el pago\n"
+"     y los objetos pendientes de pago, incluida la entrega de los "
+"artículos.\n"
+"     Tableros para la subasta, que incluye:\n"
+"       * Mis últimos objetos (la lista)\n"
+"       * Mis últimos depósitos (lista)\n"
+"       * Estadística de objetos (lista)\n"
+"       * Mis objetos por día (lista)\n"
+"    "
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr "Aceptar"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr "Formulario comprador"
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr "Nombre comprador"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr "Factura objetos vendedor"
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr "Margen bruto (%)"
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr "Buscar fechas siguiente subasta"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr "Imprimir informe sobre catalogo de subasta"
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr "Avance del comprador"
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr "Comisión"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Mín/Adj/Máx"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr "Informe de Catálogo Flagey"
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr "Precio objeto"
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr "Líneas pujas"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr "Catálogo"
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr "Subasta para objeto"
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr "Cuenta de destino"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr "Debe pagar todo el total: Faltan \"%.2f\" para liquidar el pago."
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr "Pagar compra"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr "Herramientas códigos de barras"
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr "Depósito"
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr "Último día de exposición"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr "Lotes disponibles"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr "IVA 10%"
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr "Artista / Nombre autor"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: auction
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr "Precio comprador"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr "Categoría lotes subasta"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr "IVA 20%"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr "Pago subasta para vendedor"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr "Para llevar"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr "Lista vendedor"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr "Costes de depósito"
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr "Nombre de categoría"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr "........."
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr "Vista resumen de subasta en árbol"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr "Adj"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr "Fechas subasta"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr "Panel de mandos de subasta"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr "Líneas de pago"
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr "¡Falta dirección!"
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr "Precio comprador - Precio vendedor - Coste indirecto"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+msgid "Open Bids"
+msgstr "Pujas abiertas"
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr "Pseudo"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr "No vendido"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr "Costes comprador"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr "Fecha subasta:"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr "Factura comprador"
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr "Tel"
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr "Artista / Autor"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr "Totales subasta con listas"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr "Objeto codificado"
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr "Buscar puja subasta"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr "Est"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr "Comisiones vendedor"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr "Estadística objeto"
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr "Diario contable para vendedor"
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr "Último día de subasta"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr "Descripción de objetos"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr "No hay fecha de la subasta para \"%s\": Por favor seleccione una."
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr "Precio adjudicación"
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr "Cuenta de ingresos"
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr "Pagar objetos"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr "Nº objetos"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr "Adjudicación:"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr "Apuestas por lote (teléfono)"
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr "Entrada comprador"
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr "Gastos"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr "Pagador de la subasta"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr "Nombre subasta:"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Últimos depósitos"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr "Biografía artistas"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr "Historial subasta"
+
+#~ msgid "Total margin"
+#~ msgstr "Margen total"
+
+#~ msgid "SMS - Gateway: clickatell"
+#~ msgstr "Puerta de enlace SMS vía clickatell"
+
+#~ msgid "Provisoire"
+#~ msgstr "Provisional"
+
+#~ msgid "Definitive (ordre catalogue)"
+#~ msgstr "Definitivo (orden catálogo)"
+
+#~ msgid "My Encoded Objects Per Day"
+#~ msgstr "Mis objetos codificados por día"
+
+#~ msgid "Lot history"
+#~ msgstr "Historial de lotes"
+
+#~ msgid "Bids line"
+#~ msgstr "Línea de apuestas"
+
+#~ msgid "Adjudication by Auction"
+#~ msgstr "Adjudicación por subasta"
+
+#~ msgid "Numerotation (per lot)"
+#~ msgstr "Numeración (por lote)"
+
+#~ msgid "Antique/Books, manuscripts, eso."
+#~ msgstr "Antigüedades / Libros, manuscritos, etc."
+
+#~ msgid "Antique/Tin / Copper wares"
+#~ msgstr "Antigüedades / Metal / Objetos de cobre"
+
+#~ msgid "Buyer invoice reconciled"
+#~ msgstr "Factura comprador reconciliada"
+
+#~ msgid "Mark as taken away"
+#~ msgstr "Marcar como para llevar"
+
+#~ msgid "Statements"
+#~ msgstr "Extractos"
+
+#~ msgid "Unclassifieds"
+#~ msgstr "No clasificados"
+
+#~ msgid "Objects by Auction"
+#~ msgstr "Objetos por subasta"
+
+#~ msgid "Antiques"
+#~ msgstr "Antigüedades"
+
+#~ msgid "Object Type"
+#~ msgstr "Tipo de objeto"
+
+#~ msgid "Contemporary Art"
+#~ msgstr "Arte contemporáneo"
+
+#~ msgid "No of sellers"
+#~ msgstr "Núm. de vendedores"
+
+#~ msgid "ned"
+#~ msgstr "Holandés"
+
+#~ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+#~ msgstr ""
+#~ "Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+#~ "Registro de salida (resp. Registro de entrada)"
+
+#~ msgid "Net margin (%)"
+#~ msgstr "Margen neto (%)"
+
+#~ msgid "Dates"
+#~ msgstr "Fechas"
+
+#~ 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 "All objects"
+#~ msgstr "Todos los objetos"
+
+#~ msgid "Buyer's auction for all months"
+#~ msgstr "Subasta del comprador para todos los meses"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "Cont. Art/Painting"
+#~ msgstr "Arte cont. / Pintura"
+
+#~ msgid "Back"
+#~ msgstr "Anterior"
+
+#~ msgid "Unsold objects"
+#~ msgstr "Objetos sin vender"
+
+#~ msgid "Sold Objects"
+#~ msgstr "Objetos vendidos"
+
+#~ msgid "Sum net margin"
+#~ msgstr "Suma margen neto"
+
+#~ msgid "Langage"
+#~ msgstr "Idioma"
+
+#~ msgid "Inventory Number"
+#~ msgstr "Número de inventario"
+
+#~ msgid "Exit"
+#~ msgstr "Salir"
+
+#~ msgid "Auction buyer reporting form view"
+#~ msgstr "Informe comprador de subastas vista formulario"
+
+#~ msgid "Antique/Cartoons"
+#~ msgstr "Antigüedades / Tebeos"
+
+#~ msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#~ msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
+
+#~ msgid "Auction Objects"
+#~ msgstr "Objetos de subasta"
+
+#~ msgid "Auction reporting2 form view"
+#~ msgstr "Informe2 subastas vista formulario"
+
+#~ msgid "Depositer's statistics"
+#~ msgstr "Estadísticas del depositario"
+
+#~ msgid "Buyer information"
+#~ msgstr "Información del comprador"
+
+#~ msgid "Auction Reporting on seller view"
+#~ msgstr "Informe subastas según vista vendedor"
+
+#~ msgid "auction.dates"
+#~ msgstr "subasta.fechas"
+
+#~ msgid "Amount paid"
+#~ msgstr "Importe pagado"
+
+#~ msgid "My Latest Deposits"
+#~ msgstr "Mis últimos depósitos"
+
+#~ msgid "Buyer's Revenues"
+#~ msgstr "Ingresos del comprador"
+
+#~ msgid "eng"
+#~ msgstr "Inglés"
+
+#~ msgid "Auction buyer reporting tree view2"
+#~ msgstr "Informe comprador de subastas vista2 árbol"
+
+#~ msgid "Bulk SMS send"
+#~ msgstr "SMS enviado"
+
+#~ msgid "fr"
+#~ msgstr "Francés"
+
+#~ msgid "Antique/Old weapons and militaria"
+#~ msgstr "Antigüedades / Armas antiguas y militares"
+
+#~ msgid "Antique/Oriental Arts/Chineese furnitures"
+#~ msgstr "Antigüedades / Arte oriental / Muebles chinos"
+
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
+#~ msgid "Avg. Est"
+#~ msgstr "Est. promedio"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid ""
+#~ "This module provides functionality to \n"
+#~ "     manage artists, articles, sellers, buyers and auction.\n"
+#~ "     Manage bids, track of sold, paid and unpaid objects.\n"
+#~ "     Delivery Management. \n"
+#~ "    "
+#~ msgstr ""
+#~ "Este módulo proporciona funcionalidad para \n"
+#~ "     gestionar artistas, artículos, vendedores, compradores y subastas.\n"
+#~ "     Gestionar pujas, rastreo de ventas y objetos pagados y no pagados.\n"
+#~ "     Gestión de la distribución. \n"
+#~ "    "
+
+#~ msgid "Confirmation set taken away"
+#~ msgstr "Fijar confirmación para llevar"
+
+#~ msgid "Mark as paid for seller"
+#~ msgstr "Marcar como pagado para vendedor"
+
+#~ msgid "Close + Create all invoices"
+#~ msgstr "Cerrar + Crear todas las facturas"
+
+#~ msgid "Antique/Verreries"
+#~ msgstr "Antigüedades / Vidrierías"
+
+#~ msgid "Antique/Toys"
+#~ msgstr "Antigüedades / Juguetes"
+
+#~ msgid "Error ! You can not create recursive accounts."
+#~ msgstr "¡Error! No se pueden crear cuentas recursivas."
+
+#~ msgid "Auction buyer reporting tree view"
+#~ msgstr "Informe comprador de subastas vista árbol"
+
+#~ msgid "Define Artists"
+#~ msgstr "Definir artistas"
+
+#~ msgid "Comparison of estimations"
+#~ msgstr "Comparación de estimaciones"
+
+#~ msgid "Code barres du lot"
+#~ msgstr "Código de barras del lote"
+
+#~ msgid "Retry"
+#~ msgstr "Reintentar"
+
+#~ msgid "Birth / Death dates"
+#~ msgstr "Fechas nacimiento / defunción"
+
+#~ msgid "Antique/Jewelry"
+#~ msgstr "Antigüedades / Joyas"
+
+#~ msgid "Unclassified objects "
+#~ msgstr "Objetos no clasificados "
+
+#~ msgid "Numerotation"
+#~ msgstr "Numeración"
+
+#~ msgid "Bordereau de dépôt"
+#~ msgstr "Justificante de depósito"
+
+#~ msgid "comparaison estimate/adjudication "
+#~ msgstr "comparación estimado/adjudicado "
+
+#~ msgid "Adj(EUR)"
+#~ msgstr "Adj(EUR)"
+
+#~ msgid "Cont. Art/Other Media"
+#~ msgstr "Arte cont. / Otro media"
+
+#~ msgid "Send Image also ?"
+#~ msgstr "¿Enviar imagen también?"
+
+#~ msgid "General Informations"
+#~ msgstr "Información general"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Auctions results"
+#~ msgstr "Resultados subastas"
+
+#~ msgid "Unclassified objects"
+#~ msgstr "Objetos sin clasificar"
+
+#~ msgid "Antique/Carpet and textilles"
+#~ msgstr "Antigüedades / Alfombras y textiles"
+
+#~ msgid "New Auction Dates"
+#~ msgstr "Nuevas fechas de subasta"
+
+#~ msgid "Sum adj"
+#~ msgstr "Suma adj"
+
+#~ msgid "No of Objects"
+#~ msgstr "Núm. de objetos"
+
+#~ msgid "Antique/Painting"
+#~ msgstr "Antigüedades / Pinturas"
+
+#~ msgid "Check payment for seller"
+#~ msgstr "Comprobar pago para vendedor"
+
+#~ msgid "Detailed lots"
+#~ msgstr "Lotes detallados"
+
+#~ msgid "Send results to Auction-in-europe.com"
+#~ msgstr "Enviar resultados a Auction-in-europe.com"
+
+#~ msgid "Seller's auction"
+#~ msgstr "Subasta del vendedor"
+
+#~ msgid "Seller's Revenues"
+#~ msgstr "Ingresos del vendedor"
+
+#~ msgid "Buyer's Summary"
+#~ msgstr "Resumen del comprador"
+
+#~ msgid "Depositer's Statistics"
+#~ msgstr "Estadísticas del depositario"
+
+#~ msgid "To pay"
+#~ msgstr "Para pagar"
+
+#~ msgid "Enable Taken away"
+#~ msgstr "Activar para llevar"
+
+#~ msgid "Antique/Others"
+#~ msgstr "Antigüedades / Otros"
+
+#~ msgid "Auction Reporting tree view2"
+#~ msgstr "Informe subastas vista2 árbol"
+
+#~ msgid "Auction buyer reporting form view2"
+#~ msgstr "Informe comprador de subastas vista2 formulario"
+
+#~ msgid "Auction dates"
+#~ msgstr "Fechas subastas"
+
+#~ msgid "Auction seller reporting2 graph view"
+#~ msgstr "Informe2 vendedor de subastas vista gráfico"
+
+#~ msgid "Encoded Objects Per Day"
+#~ msgstr "Objetos codificados por día"
+
+#~ msgid "Auction Reporting on buyer view"
+#~ msgstr "Informe subastas según vista comprador"
+
+#~ msgid "Payment's history"
+#~ msgstr "Historial de pagos"
+
+#~ msgid "Auction results"
+#~ msgstr "Resultados de subastas"
+
+#~ msgid "Auction's Revenues"
+#~ msgstr "Ingresos de la subasta"
+
+#~ msgid "Antique/Metal Ware"
+#~ msgstr "Antigüedades / Objetos de metal"
+
+#~ msgid "de"
+#~ msgstr "Alemán"
+
+#~ msgid "Old Auctions"
+#~ msgstr "Subastas anteriores"
+
+#~ msgid "Cont. Art/Curiosa"
+#~ msgstr "Arte cont. / Curiosidades"
+
+#~ msgid "Auction module"
+#~ msgstr "Módulo de subastas"
+
+#~ msgid "Attendance"
+#~ msgstr "Servicio"
+
+#~ msgid "Seller information"
+#~ msgstr "Información vendedor"
+
+#~ msgid "Cont. Art/Jewelry"
+#~ msgstr "Arte cont. / Joyas"
+
+#~ msgid "Next Auctions"
+#~ msgstr "Próximas subastas"
+
+#~ msgid "#"
+#~ msgstr "Nº"
+
+#~ msgid "Antique/Miniatures / Collections"
+#~ msgstr "Antigüedades / Miniaturas / Colecciones"
+
+#~ msgid "Auction reporting tree view"
+#~ msgstr "Informe subastas vista árbol"
+
+#~ msgid "Cont. Art/Photo"
+#~ msgstr "Arte cont. / Fotografía"
+
+#~ msgid "Bid auctions"
+#~ msgstr "Apuesta subastas"
+
+#~ msgid "Avg margin"
+#~ msgstr "Margen promedio"
+
+#~ msgid "Antique/Art from the Ivory Coast"
+#~ msgstr "Antigüedades / Arte de la Costa de Marfil"
+
+#~ msgid "Antique/Religiosa"
+#~ msgstr "Antigüedades / Religioso"
+
+#~ 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 "Unplanned objects"
+#~ msgstr "Objetos no planificados"
+
+#~ msgid "Cont. Art/Sculpture"
+#~ msgstr "Arte cont. / Escultura"
+
+#~ msgid "Antique/Argenterie"
+#~ msgstr "Antigüedades / Monedas"
+
+#~ msgid "Antique/Lightings"
+#~ msgstr "Antigüedades / Lámparas"
+
+#~ msgid "Antique/Sculpture, bronze, eso."
+#~ msgstr "Antigüedades / Escultura, bronze, etc."
+
+#~ msgid "Numerotate"
+#~ msgstr "Enumeración"
+
+#~ msgid "All objects are assigned to buyers !"
+#~ msgstr "¡Todos los objetos han sido asignados a compradores!"
+
+#~ msgid "Able Taken away"
+#~ msgstr "Habilitar para llevar"
+
+#~ 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 "Artist/Author 2"
+#~ msgstr "Artista / Autor 2"
+
+#~ msgid "Seller's Summary"
+#~ msgstr "Resumen del vendedor"
+
+#~ msgid "Auction reporting graph view"
+#~ msgstr "Informe subastas vista gráfico"
+
+#~ msgid "Send on your website"
+#~ msgstr "Enviar a su sitio web"
+
+#~ msgid "Simplified lots for adjudication"
+#~ msgstr "Lotes simplificados para adjudicación"
+
+#~ msgid "Auction Reporting on view1"
+#~ msgstr "Informe subastas según vista1"
+
+#~ msgid "Sum Adjustication"
+#~ msgstr "Suma adjudicación"
+
+#~ msgid "Antique/Porcelain, Ceramics, Glassmaking, ..."
+#~ msgstr "Antigüedades / Porcelana, cerámica, vidrio, ..."
+
+#~ msgid "Object Reference"
+#~ msgstr "Referencia objeto"
+
+#~ msgid "Cont. Art/Shows"
+#~ msgstr "Arte cont. / Espectáculos"
+
+#~ msgid "Unsold Objects"
+#~ msgstr "Objetos no vendidos"
+
+#~ msgid "Avg Adj."
+#~ msgstr "Adj. promedio"
+
+#~ msgid "auction.deposit.cost"
+#~ msgstr "subasta.depósito.coste"
+
+#~ msgid "Object Inventory"
+#~ msgstr "Inventario de objetos"
+
+#~ msgid "Antique/Art from the Ivory Coast/African Arts"
+#~ msgstr "Antigüedades / Arte de la Costa de Marfil / Arte africano"
+
+#~ msgid "User's pointing"
+#~ msgstr "Puntuación del usuario"
+
+#~ msgid "Lot Category"
+#~ msgstr "Categoría lote"
+
+#~ msgid "Manager"
+#~ msgstr "Responsable"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Auction reporting form view"
+#~ msgstr "Informe subastas vista formulario"
+
+#~ msgid "Send to website"
+#~ msgstr "Enviar al sitio web"
+
+#~ msgid "Old Auction Dates"
+#~ msgstr "Fechas subastas anteriores"
+
+#~ msgid "Auction Reporting on seller view2"
+#~ msgstr "Informe subastas según vista2 vendedor"
+
+#~ msgid "Antique/Engravings"
+#~ msgstr "Antigüedades / Grabados"
+
+#~ msgid "First Number"
+#~ msgstr "Primer número"
+
+#~ msgid "Auction Reporting on  view2"
+#~ msgstr "Informe subastas según vista2"
+
+#~ msgid ""
+#~ "Warning, this will erase the object adjudication price and its buyer !"
+#~ msgstr ""
+#~ "¡Atención, ésto eliminará el precio de adjudicación del objeto y su "
+#~ "comprador!"
+
+#~ msgid "Bid information"
+#~ msgstr "Información apuesta"
+
+#~ msgid "Objects to sell"
+#~ msgstr "Objetos para vender"
+
+#~ msgid "Latest Deposits"
+#~ msgstr "Últimos depósitos"
+
+#~ msgid "Antique/Musical Instruments"
+#~ msgstr "Antigüedades / Instrumentos musicales"
+
+#~ msgid "Antique/Graphic Arts"
+#~ msgstr "Antigüedades / Arte gráfico"
+
+#~ msgid "Antique/Oriental Arts"
+#~ msgstr "Antigüedades / Arte oriental"
+
+#~ msgid "Sum of adjudication"
+#~ msgstr "Suma de adjudicación"
+
+#~ msgid "Unmark as taken away"
+#~ msgstr "Desmarcar como para llevar"
+
+#~ msgid "Lot Number"
+#~ msgstr "Número de lote"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "El CIF/NIF no parece estar correcto."
+
+#~ msgid "Employee"
+#~ msgstr "Empleado"
+
+#~ msgid "Report deposit border"
+#~ msgstr "Informe justificante de depósito"
+
+#~ msgid "Auction report"
+#~ msgstr "Informe subasta"
+
+#~ msgid "auction.lot.category"
+#~ msgstr "subasta.lote.categoría"
+
+#~ msgid "Antique/Collectible & art objects"
+#~ msgstr "Antigüedades / Coleccionables y objetos de arte"
+
+#~ msgid "Buyer's auction"
+#~ msgstr "Subasta del comprador"
+
+#~ msgid "Auction reporting2 tree view"
+#~ msgstr "Informe2 subastas vista árbol"
+
+#~ msgid "Antique/Furnitures"
+#~ msgstr "Antigüedades / Muebles"
+
+#~ msgid "Unplanned Objects"
+#~ msgstr "Objetos no planificados"
+
+#~ msgid "Numerotation (automatic)"
+#~ msgstr "Enumeración (automático)"
+
+#~ msgid "Amount to paid"
+#~ msgstr "Importe a pagar"
+
+#~ msgid "No of buyers"
+#~ msgstr "Nº de compradores"
+
+#~ msgid "Avg adjudication"
+#~ msgstr "Adjudicación promedio"
+
+#~ msgid "Next Auction Dates"
+#~ msgstr "Próximas fechas de subasta"
+
+#~ msgid "Report Sign In/Out"
+#~ msgstr "Informe registro entrada/salida"
+
+#~ msgid "Cont. Art/Arts"
+#~ msgstr "Arte cont. / Artes"
+
+#~ msgid "Short Description"
+#~ msgstr "Descripción breve"
+
+#~ msgid "Employees"
+#~ msgstr "Empleados"
+
+#~ msgid "Antique/Clocks and watches"
+#~ msgstr "Antigüedades / Relojes"
+
+#~ msgid "Antique/Scientific Instruments"
+#~ msgstr "Antigüedades / Instrumentos científicos"
+
+#~ msgid "Confirmation enable taken away"
+#~ msgstr "Habilitar confirmación para llevar"
+
+#~ msgid "Sum of adjustication"
+#~ msgstr "Suma de adjudicación"
+
+#~ msgid "Antique/Wine"
+#~ msgstr "Antigüedades / Vino"
+
+#~ msgid "Antique/African Arts"
+#~ msgstr "Antigüedades / Arte africano"
+
+#~ msgid "Antique/Posters"
+#~ msgstr "Antigüedades / Posters"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Listing Huissiers"
+#~ msgstr "Listado"
+
+#~ msgid "Aie Category"
+#~ msgstr "Categoria encontrada"
+
+#~ msgid "Error ! You can not create recursive associated members."
+#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
diff --git a/addons/auction/i18n/et.po b/addons/auction/i18n/et.po
index ab23cd93d27..5aaef28b5c2 100644
--- a/addons/auction/i18n/et.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2335,9 +2335,6 @@ msgstr "Oksjoni ajalugu"
 #~ msgid "Antique/Tin / Copper wares"
 #~ msgstr "Antiik/Tina- ja vaskesemed"
 
-#~ msgid "VAT"
-#~ msgstr "KM"
-
 #~ msgid "Unclassifieds"
 #~ msgstr "Klassifitseerimata"
 
@@ -2421,9 +2418,6 @@ msgstr "Oksjoni ajalugu"
 #~ msgid "Retry"
 #~ msgstr "Korda"
 
-#~ msgid "Document type"
-#~ msgstr "Dokumendi tüüp"
-
 #~ msgid "Unclassified objects "
 #~ msgstr "Klassifitseerimata objektid "
 
@@ -2502,27 +2496,15 @@ msgstr "Oksjoni ajalugu"
 #~ msgid "Buyer's Summary"
 #~ msgstr "Ostja kokkuvõte"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Vahesumma:"
-
 #~ msgid "Seller's Revenues"
 #~ msgstr "Müüja tulud"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Kliendi viide"
-
 #~ msgid "To pay"
 #~ msgstr "Tasuda"
 
 #~ msgid "Antique/Others"
 #~ msgstr "Antiik/Muud"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
-#~ msgid ", TEL:"
-#~ msgstr ", TEL:"
-
 #~ msgid "Payment's history"
 #~ msgstr "Makseajalugu"
 
@@ -2568,18 +2550,12 @@ msgstr "Oksjoni ajalugu"
 #~ msgid "Unplanned objects"
 #~ msgstr "Planeerimata objektid"
 
-#~ msgid "Document Number"
-#~ msgstr "Dokumendi number"
-
 #~ msgid "Antique/Sculpture, bronze, eso."
 #~ msgstr "Antiik/Skulptuurid, pronks jms"
 
 #~ msgid "Antique/Lightings"
 #~ msgstr "Antiik/Valgustid"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Ostja, hind"
-
 #~ msgid "Seller's Summary"
 #~ msgstr "Müüja kokkuvõte"
 
@@ -2616,9 +2592,6 @@ msgstr "Oksjoni ajalugu"
 #~ msgid "Objects to sell"
 #~ msgstr "Objektid müüa"
 
-#~ msgid "TEL:"
-#~ msgstr "TEL:"
-
 #~ msgid "First Number"
 #~ msgstr "Esimene number"
 
@@ -2646,18 +2619,9 @@ msgstr "Oksjoni ajalugu"
 #~ msgid "Buyer's auction"
 #~ msgstr "Ostja oksjon"
 
-#~ msgid "Buyer Cost:"
-#~ msgstr "Ostja kulud:"
-
-#~ msgid "BID:"
-#~ msgstr "PAKKUMINE:"
-
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Antiik/Mööbel"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Kliendi kontakt"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "Planeerimata objektid"
 
@@ -2670,9 +2634,6 @@ msgstr "Oksjoni ajalugu"
 #~ msgid "Short Description"
 #~ msgstr "Lühikirjeldus"
 
-#~ msgid "Ref."
-#~ msgstr "Viide"
-
 #~ msgid "Antique/Scientific Instruments"
 #~ msgstr "Antiik/Teadusinstrumendid"
 
diff --git a/addons/auction/i18n/fi.po b/addons/auction/i18n/fi.po
index 817e3c33281..e2ff0236ace 100644
--- a/addons/auction/i18n/fi.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2295,6 +2295,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
-#~ msgid "VAT"
-#~ msgstr "ALV"
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index 6d4c7577897..2e259430f70 100644
--- a/addons/auction/i18n/fr.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2378,12 +2378,6 @@ msgstr "Historique de la vente"
 #~ msgid "Mark as taken away"
 #~ msgstr "Marquer comme emporté"
 
-#~ msgid "VAT"
-#~ msgstr "TVA"
-
-#~ msgid "Adjudication"
-#~ msgstr "Adjudication"
-
 #~ msgid "Unclassifieds"
 #~ msgstr "Non Classés"
 
@@ -2481,12 +2475,6 @@ msgstr "Historique de la vente"
 #~ msgid "Antique/Toys"
 #~ msgstr "Antiquités/Jouets"
 
-#~ msgid "Buyer form"
-#~ msgstr "Formulaire de l'Acheteur"
-
-#~ msgid "Estimate"
-#~ msgstr "Estimez"
-
 #~ msgid "Define Artists"
 #~ msgstr "Ajouter un artiste"
 
@@ -2514,9 +2502,6 @@ msgstr "Historique de la vente"
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Bordereau de dépôt"
 
-#~ msgid "Document type"
-#~ msgstr "Type de  document"
-
 #~ msgid "Adj(EUR)"
 #~ msgstr "Adj (EUR)"
 
@@ -2559,12 +2544,6 @@ msgstr "Historique de la vente"
 #~ msgid "Seller's auction"
 #~ msgstr "Ventes/Vendeurs"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Sous-total :"
-
-#~ msgid "Customer Reference"
-#~ msgstr "Référence Client"
-
 #~ msgid "To pay"
 #~ msgstr "À Payer"
 
@@ -2580,12 +2559,6 @@ msgstr "Historique de la vente"
 #~ msgid "Payment's history"
 #~ msgstr "Historique du paiement"
 
-#~ msgid "Document"
-#~ msgstr "Document"
-
-#~ msgid ", TEL:"
-#~ msgstr ", TEL:"
-
 #~ msgid "Auction results"
 #~ msgstr "Résultats de l'Enchère"
 
@@ -2622,15 +2595,9 @@ msgstr "Historique de la vente"
 #~ msgid "Antique/Sculpture, bronze, eso."
 #~ msgstr "Antiquiés/Sculpture, bronze, etc, ..."
 
-#~ msgid "Document Number"
-#~ msgstr "Numéro du Document"
-
 #~ msgid "Numerotate"
 #~ msgstr "Numéroter"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Prix de l'Acheteur"
-
 #~ msgid "All objects are assigned to buyers !"
 #~ msgstr "Tous les objets sont assignés aux acheteurs !"
 
@@ -2689,15 +2656,9 @@ msgstr "Historique de la vente"
 #~ "Warning, this will erase the object adjudication price and its buyer !"
 #~ msgstr "Attention, cela effacera l'adjudication de l'objet et son acheteur !"
 
-#~ msgid "TEL:"
-#~ msgstr "TÉL :"
-
 #~ msgid "Objects to sell"
 #~ msgstr "Objets à vendre"
 
-#~ msgid "Limit"
-#~ msgstr "Limite"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "Derniers dépôts"
 
@@ -2725,9 +2686,6 @@ msgstr "Historique de la vente"
 #~ msgid "Employee"
 #~ msgstr "Employé"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Adj. (EUR)"
-
 #~ msgid "Auction report"
 #~ msgstr "Rapport de l'auction"
 
@@ -2737,9 +2695,6 @@ msgstr "Historique de la vente"
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Antiquiés/Meubles"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Contact Client"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "Objets Non Prévus"
 
@@ -2758,9 +2713,6 @@ msgstr "Historique de la vente"
 #~ msgid "Next Auction Dates"
 #~ msgstr "Prochaines ventes"
 
-#~ msgid "Ref."
-#~ msgstr "Réf."
-
 #~ msgid "Short Description"
 #~ msgstr "Courte description"
 
@@ -2785,9 +2737,6 @@ msgstr "Historique de la vente"
 #~ msgid "Antique/Posters"
 #~ msgstr "Antiquités/Affiches"
 
-#~ msgid "Orders"
-#~ msgstr "Commandes"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -2802,27 +2751,3 @@ msgstr "Historique de la vente"
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr ""
 #~ "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
-
-#~ msgid "Auction Manager"
-#~ msgstr "Gestionnaire des Enchères"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Estimations/Adjudication"
-
-#~ msgid "Menu"
-#~ msgstr "Menu"
-
-#~ msgid "My objects By Day"
-#~ msgstr "Mes Objets par Jour"
-
-#~ msgid "My board"
-#~ msgstr "Mon tableau"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Tableau du Gestionnaire des Enchères"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "Mes Derniers Objets"
-
-#~ msgid "Childs aie category"
-#~ msgstr "Sous-categorie aie"
diff --git a/addons/auction/i18n/gl.po b/addons/auction/i18n/gl.po
index 70ddc564834..a768d53db87 100644
--- a/addons/auction/i18n/gl.po
+++ b/addons/auction/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: 2011-05-10 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/hi.po b/addons/auction/i18n/hi.po
index bb72535c49b..0cde17d9330 100644
--- a/addons/auction/i18n/hi.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2308,9 +2308,6 @@ msgstr ""
 #~ msgid "Bids line"
 #~ msgstr "बोली लाइन"
 
-#~ msgid "Deposit Form"
-#~ msgstr "जमा फार्म"
-
 #~ msgid "Antique/Tin / Copper wares"
 #~ msgstr "प्राचीन / टिन / कॉपर माल"
 
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index 1aaef7baed1..378e9b72a77 100644
--- a/addons/auction/i18n/hr.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2325,12 +2325,6 @@ msgstr "Historique de la vente"
 #~ msgid "Mark as taken away"
 #~ msgstr "Marquer comme emporté"
 
-#~ msgid "VAT"
-#~ msgstr "TVA"
-
-#~ msgid "Adjudication"
-#~ msgstr "Adjudication"
-
 #~ msgid "Unclassifieds"
 #~ msgstr "Non Classés"
 
@@ -2436,12 +2430,6 @@ msgstr "Historique de la vente"
 #~ msgid "Antique/Toys"
 #~ msgstr "Antiquités/Jouets"
 
-#~ msgid "Buyer form"
-#~ msgstr "Formulaire de l'Acheteur"
-
-#~ msgid "Estimate"
-#~ msgstr "Estimez"
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Erreur ! Vous ne pouvez pas créer des comptes récursifs."
 
@@ -2472,9 +2460,6 @@ msgstr "Historique de la vente"
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Bordereau de dépôt"
 
-#~ msgid "Document type"
-#~ msgstr "Type de  document"
-
 #~ msgid "Adj(EUR)"
 #~ msgstr "Adj (EUR)"
 
@@ -2520,15 +2505,9 @@ msgstr "Historique de la vente"
 #~ msgid "Seller's Revenues"
 #~ msgstr "Chiffre d'affaires des vendeurs"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Sous-total :"
-
 #~ msgid "Buyer's Summary"
 #~ msgstr "Résumé des acheteurs"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Référence Client"
-
 #~ msgid "Depositer's Statistics"
 #~ msgstr "Statistiques du dépositaire"
 
@@ -2547,12 +2526,6 @@ msgstr "Historique de la vente"
 #~ msgid "Payment's history"
 #~ msgstr "Historique du paiement"
 
-#~ msgid "Document"
-#~ msgstr "Document"
-
-#~ msgid ", TEL:"
-#~ msgstr ", TEL:"
-
 #~ msgid "Auction results"
 #~ msgstr "Résultats de l'Enchère"
 
@@ -2598,15 +2571,9 @@ msgstr "Historique de la vente"
 #~ msgid "Antique/Sculpture, bronze, eso."
 #~ msgstr "Antiquiés/Sculpture, bronze, etc, ..."
 
-#~ msgid "Document Number"
-#~ msgstr "Numéro du Document"
-
 #~ msgid "Numerotate"
 #~ msgstr "Numéroter"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Prix de l'Acheteur"
-
 #~ msgid "All objects are assigned to buyers !"
 #~ msgstr "Tous les objets sont assignés aux acheteurs !"
 
@@ -2668,12 +2635,6 @@ msgstr "Historique de la vente"
 #~ "Warning, this will erase the object adjudication price and its buyer !"
 #~ msgstr "Attention, cela effacera l'adjudication de l'objet et son acheteur !"
 
-#~ msgid "TEL:"
-#~ msgstr "TÉL :"
-
-#~ msgid "Limit"
-#~ msgstr "Limite"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "Derniers dépôts"
 
@@ -2701,9 +2662,6 @@ msgstr "Historique de la vente"
 #~ msgid "Employee"
 #~ msgstr "Employé"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Adj. (EUR)"
-
 #~ msgid "Auction report"
 #~ msgstr "Rapport de l'auction"
 
@@ -2717,9 +2675,6 @@ msgstr "Historique de la vente"
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Antiquiés/Meubles"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Contact Client"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "Objets Non Prévus"
 
@@ -2741,9 +2696,6 @@ msgstr "Historique de la vente"
 #~ msgid "Objects to sell"
 #~ msgstr "Objets à vendre"
 
-#~ msgid "Ref."
-#~ msgstr "Réf."
-
 #~ msgid "Short Description"
 #~ msgstr "Courte description"
 
@@ -2767,6 +2719,3 @@ msgstr "Historique de la vente"
 
 #~ msgid "Antique/Posters"
 #~ msgstr "Antiquités/Affiches"
-
-#~ msgid "Orders"
-#~ msgstr "Commandes"
diff --git a/addons/auction/i18n/hu.po b/addons/auction/i18n/hu.po
index 15e836b265a..55ec3b7aadd 100644
--- a/addons/auction/i18n/hu.po
+++ b/addons/auction/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-10 13:02+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/id.po b/addons/auction/i18n/id.po
index 503fad68958..613a314fee2 100644
--- a/addons/auction/i18n/id.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index 243ac4520e6..50884f03cfc 100644
--- a/addons/auction/i18n/it.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -280,7 +280,7 @@ msgstr "Costi venditore"
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
 msgid "Bids"
-msgstr ""
+msgstr "Offerte"
 
 #. module: auction
 #: view:auction.lots.buyer_map:0
@@ -2307,12 +2307,6 @@ msgstr ""
 #~ msgid "Lot history"
 #~ msgstr "Storico Lotti"
 
-#~ msgid "Inv."
-#~ msgstr "Inv."
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
-
 #~ msgid "Object Type"
 #~ msgstr "Tipo di Oggetto"
 
@@ -2372,9 +2366,6 @@ msgstr ""
 #~ msgid "Continue"
 #~ msgstr "Continua"
 
-#~ msgid "List N."
-#~ msgstr "Lista N."
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Errore: codice EAN non valido"
 
@@ -2390,9 +2381,6 @@ msgstr ""
 #~ msgid "Unclassified objects "
 #~ msgstr "Oggetti non classificati "
 
-#~ msgid "Document type"
-#~ msgstr "Tipo documento"
-
 #~ msgid "Send Image also ?"
 #~ msgstr "Invia anche immagine?"
 
@@ -2423,33 +2411,6 @@ msgstr ""
 #~ msgid "My Latest Deposits"
 #~ msgstr "I Miei Depositi recenti"
 
-#~ msgid "Auction Manager"
-#~ msgstr "Responsabile Asta"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "Riepilogo collegato a Utente"
-
-#~ msgid "Auction Member"
-#~ msgstr "Membro Asta"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Stimato / Aggiudicato"
-
-#~ msgid "Menu"
-#~ msgstr "Menu"
-
-#~ msgid "My objects By Day"
-#~ msgstr "I Miei Oggetti per Giorno"
-
-#~ msgid "My board"
-#~ msgstr "Il Mio Dashboard"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Dashboard Responsabile Asta"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "I Miei Oggetti recenti"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome modello non valido nella definizione dell'azione."
 
diff --git a/addons/auction/i18n/ko.po b/addons/auction/i18n/ko.po
index af4cfeaf8bb..7651459f764 100644
--- a/addons/auction/i18n/ko.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2311,9 +2311,6 @@ msgstr ""
 #~ msgid "Bids line"
 #~ msgstr "비드 라인"
 
-#~ msgid "Deposit Form"
-#~ msgstr "적립 폼"
-
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "조정된 구매자 인보이스"
 
@@ -2425,9 +2422,6 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "에러: 유효하지 않은 EAN 코드"
 
-#~ msgid "List N."
-#~ msgstr "리스트 N"
-
 #~ msgid "Avg. Est"
 #~ msgstr "평균 추정"
 
@@ -2450,15 +2444,9 @@ msgstr ""
 #~ msgid "Close + Create all invoices"
 #~ msgstr "모든 인보이스 닫기 + 만들기"
 
-#~ msgid "Buyer form"
-#~ msgstr "구매자 폼"
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "에러! 재귀 계정을 만들 수는 없습니다."
 
-#~ msgid "Estimate"
-#~ msgstr "추정"
-
 #~ msgid "Antique/Toys"
 #~ msgstr "골동품/장난감"
 
@@ -2486,9 +2474,6 @@ msgstr ""
 #~ msgid "Adj(EUR)"
 #~ msgstr "조정 (유로)"
 
-#~ msgid "Document type"
-#~ msgstr "문서 타입"
-
 #~ msgid "Send Image also ?"
 #~ msgstr "이미지도 같이 보낼까요?"
 
@@ -2525,15 +2510,9 @@ msgstr ""
 #~ msgid "Seller's Revenues"
 #~ msgstr "판매자 수입"
 
-#~ msgid "Subtotal:"
-#~ msgstr "소계:"
-
 #~ msgid "Buyer's Summary"
 #~ msgstr "구매자 요약"
 
-#~ msgid "Customer Reference"
-#~ msgstr "고객 참조"
-
 #~ msgid "Depositer's Statistics"
 #~ msgstr "적립자 통계"
 
@@ -2564,12 +2543,6 @@ msgstr ""
 #~ msgid "Auction results"
 #~ msgstr "옥션 결과"
 
-#~ msgid ", TEL:"
-#~ msgstr "전화"
-
-#~ msgid "Document"
-#~ msgstr "문서"
-
 #~ msgid "Auction's Revenues"
 #~ msgstr "옥션 수입"
 
@@ -2609,12 +2582,6 @@ msgstr ""
 #~ msgid "Avg margin"
 #~ msgstr "평균 마진"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "구매자, 가격"
-
-#~ msgid "Document Number"
-#~ msgstr "문서 번호"
-
 #~ msgid "All objects are assigned to buyers !"
 #~ msgstr "모든 오브젝트들이 구매자에게 할당되었습니다 !"
 
@@ -2636,9 +2603,6 @@ msgstr ""
 #~ msgid "Object Reference"
 #~ msgstr "오브젝트 참조"
 
-#~ msgid "Plate Number:"
-#~ msgstr "플레이트 번호:"
-
 #~ msgid "User's pointing"
 #~ msgstr "유저의 포인팅"
 
@@ -2681,12 +2645,6 @@ msgstr ""
 #~ msgid "Bid information"
 #~ msgstr "비드 정보"
 
-#~ msgid "Limit"
-#~ msgstr "한계"
-
-#~ msgid "TEL:"
-#~ msgstr "전화:"
-
 #~ msgid "Objects to sell"
 #~ msgstr "판매할 오브젝트"
 
@@ -2699,12 +2657,6 @@ msgstr ""
 #~ msgid "Antique/Oriental Arts"
 #~ msgstr "골동품/오리엔탈 아트"
 
-#~ msgid "Est."
-#~ msgstr "추정"
-
-#~ msgid "Adj.(EUR)"
-#~ msgstr "조정 (유로)"
-
 #~ msgid "Employee"
 #~ msgstr "직원"
 
@@ -2717,56 +2669,14 @@ msgstr ""
 #~ msgid "Auction report"
 #~ msgstr "옥션 리포트"
 
-#~ msgid "Buyer Cost:"
-#~ msgstr "구매자 비용:"
-
 #~ msgid "Buyer's auction"
 #~ msgstr "구매자의 옥션"
 
-#~ msgid "BID:"
-#~ msgstr "비드:"
-
 #~ msgid "Auction reporting2 tree view"
 #~ msgstr "옥션 리포팅2 트리 뷰"
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "에러! 재귀적 관련 멤버를 만들 수는 없습니다."
 
-#~ msgid "NET"
-#~ msgstr "순"
-
 #~ msgid "Antique/Furnitures"
 #~ msgstr "골동품?가구류"
-
-#~ msgid "Auction Manager"
-#~ msgstr "옥션 매니저"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "사용자별 포인팅 요약"
-
-#~ msgid "Auction Member"
-#~ msgstr "옥션 멤버"
-
-#~ msgid "Auction member board"
-#~ msgstr "옥션 멤버 위원회"
-
-#~ msgid "Board for Auction"
-#~ msgstr "옥션 위원회"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "추정/조정"
-
-#~ msgid "Menu"
-#~ msgstr "메뉴"
-
-#~ msgid "My objects By Day"
-#~ msgstr "일별 내 오브젝트"
-
-#~ msgid "My board"
-#~ msgstr "내 보드"
-
-#~ msgid "Auction manager board"
-#~ msgstr "옥션 매니저 위원회"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "내 최종 오브젝트"
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index a500b401b92..76b9d93ee3e 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/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: 2011-07-08 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 359da9806ab..be1e5d9f5b6 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -306,7 +306,7 @@ msgstr ""
 #: code:addons/auction/auction.py:578
 #, python-format
 msgid "The Buyer \"%s\" has no Invoice Address."
-msgstr ""
+msgstr "De koper \"%s\"heeft geen factuuradres"
 
 #. module: auction
 #: view:auction.dates:0
@@ -553,7 +553,7 @@ msgstr "Aanmaakdatum"
 #: view:auction.dates:0
 #: selection:report.object.encoded,state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Gefactureerd"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -610,7 +610,7 @@ msgstr "Betaling koper"
 #. module: auction
 #: view:auction.dates:0
 msgid "End of auction"
-msgstr ""
+msgstr "Einde van de veiling"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
@@ -677,7 +677,7 @@ msgstr "Verkopersdagboek"
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. module: auction
 #: help:auction.lots,state:0
@@ -726,7 +726,7 @@ msgstr ""
 #: model:ir.ui.menu,name:auction.auction_menu_root
 #: view:report.auction:0
 msgid "Auction"
-msgstr ""
+msgstr "Veiling"
 
 #. module: auction
 #: view:auction.lot.category:0
@@ -779,7 +779,7 @@ msgstr "# commisies:"
 #: field:auction.bid_line,auction:0
 #: field:auction.dates,name:0
 msgid "Auction Name"
-msgstr ""
+msgstr "Veilingnaam"
 
 #. module: auction
 #: field:report.object.encoded,obj_num:0
@@ -806,7 +806,7 @@ msgstr "(laat leeg voor automatische nummering)"
 #: code:addons/auction/auction.py:578
 #, python-format
 msgid "No Invoice Address"
-msgstr ""
+msgstr "Geen factuur adress"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_huissier
@@ -975,12 +975,12 @@ msgstr "Biografie"
 #. module: auction
 #: view:auction.lots:0
 msgid "Inventory"
-msgstr ""
+msgstr "Voorraad"
 
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Pay"
-msgstr ""
+msgstr "Betalen"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -990,7 +990,7 @@ msgstr ""
 #. module: auction
 #: field:report.object.encoded,obj_margin:0
 msgid "Net margin"
-msgstr ""
+msgstr "Netto marge"
 
 #. module: auction
 #: help:auction.lots,lot_local:0
@@ -1082,12 +1082,12 @@ msgstr ""
 #: code:addons/auction/wizard/auction_aie_send_result.py:117
 #, python-format
 msgid "Connection to WWW.Auction-in-Europe.com failed !"
-msgstr ""
+msgstr "Verbinden met www.auction-in-europe.com mislukt!"
 
 #. module: auction
 #: field:report.auction,gross_revenue:0
 msgid "Gross Revenue"
-msgstr ""
+msgstr "Bruto opbrengst"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction
@@ -1111,7 +1111,7 @@ msgstr ""
 #: code:addons/auction/auction.py:692
 #, python-format
 msgid "The Buyer has no Invoice Address."
-msgstr ""
+msgstr "De koper heeft geen fatuuradres"
 
 #. module: auction
 #: view:report.object.encoded:0
@@ -1236,7 +1236,7 @@ msgstr ""
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of unsold items:"
-msgstr ""
+msgstr "# niet verkochte items:"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1248,12 +1248,12 @@ msgstr ""
 #: view:auction.dates:0
 #: field:auction.lots.auction.move,auction_id:0
 msgid "Auction Date"
-msgstr ""
+msgstr "Veilingdatum"
 
 #. module: auction
 #: report:auction.code_bar_lot:0
 msgid ", ID"
-msgstr ""
+msgstr ", ID"
 
 #. module: auction
 #: report:buyer.list:0
@@ -1263,7 +1263,7 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.lot_list_inv
 msgid "Lots List - Landscape"
-msgstr ""
+msgstr "Kavellijst- Liggend"
 
 #. module: auction
 #: view:auction.artists:0
@@ -1274,7 +1274,7 @@ msgstr ""
 #: field:auction.lots,ach_login:0
 #: field:auction.lots.buyer_map,ach_login:0
 msgid "Buyer Username"
-msgstr ""
+msgstr "Gebruikersnaam koper"
 
 #. module: auction
 #: field:auction.lot.category,priority:0
@@ -1304,12 +1304,12 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,ach_emp:0
 msgid "Taken Away"
-msgstr ""
+msgstr "Weghalen"
 
 #. module: auction
 #: view:report.object.encoded:0
 msgid "Total gross rev."
-msgstr ""
+msgstr "Totaal bruto opbrengst"
 
 #. module: auction
 #: help:auction.lots,lot_est1:0
@@ -1325,7 +1325,7 @@ msgstr ""
 #: code:addons/auction/wizard/auction_lots_numerotate.py:145
 #, python-format
 msgid "This lot does not exist !"
-msgstr ""
+msgstr "Deze kavel bestaat niet!"
 
 #. module: auction
 #: selection:report.auction,month:0
@@ -1335,13 +1335,13 @@ msgstr ""
 #. module: auction
 #: field:auction.bid_line,call:0
 msgid "To be Called"
-msgstr ""
+msgstr "Nog te bellen"
 
 #. module: auction
 #: view:auction.lots:0
 #: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
 msgid "Min est/Adj/Max est"
-msgstr ""
+msgstr "Minimale schatting/wijziging/maximale schatting"
 
 #. module: auction
 #: field:auction.lots,lot_est1:0
@@ -1357,7 +1357,7 @@ msgstr ""
 #: view:auction.lots.auction.move:0
 #: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
 msgid "Change Auction Date"
-msgstr ""
+msgstr "Wijzig veilingdatum"
 
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
@@ -1407,12 +1407,12 @@ msgstr ""
 #: field:report.auction,month:0
 #: field:report.auction.object.date,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Max Estimate:"
-msgstr ""
+msgstr "Max schatting"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1443,7 +1443,7 @@ msgstr ""
 #: view:auction.lots.make.invoice:0
 #: view:auction.lots.make.invoice.buyer:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Facturen aanmaken"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id5
@@ -1453,12 +1453,12 @@ msgstr ""
 #. module: auction
 #: field:auction.dates,expo1:0
 msgid "First Exposition Day"
-msgstr ""
+msgstr "Eerste dag van expositie"
 
 #. module: auction
 #: report:buyer.list:0
 msgid "Lot"
-msgstr ""
+msgstr "Kavel"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_artists
@@ -1490,12 +1490,12 @@ msgstr ""
 #: report:bids.lots:0
 #: report:bids.phones.details:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
 
 #. module: auction
 #: field:auction.lot.category,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1505,17 +1505,17 @@ msgstr ""
 #. module: auction
 #: model:account.tax,name:auction.auction_tax1
 msgid "TVA"
-msgstr ""
+msgstr "BTW"
 
 #. module: auction
 #: field:auction.lots,important:0
 msgid "To be Emphatized"
-msgstr ""
+msgstr "Te benadrukken"
 
 #. module: auction
 #: report:buyer.list:0
 msgid "Total:"
-msgstr ""
+msgstr "Totaal:"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax2
@@ -1525,7 +1525,7 @@ msgstr ""
 #. module: auction
 #: view:report.auction.object.date:0
 msgid "Objects per Day"
-msgstr ""
+msgstr "Kavels per dag"
 
 #. module: auction
 #: field:auction.dates,seller_invoice_history:0
@@ -1549,7 +1549,7 @@ msgstr ""
 #: code:addons/auction/auction.py:686
 #, python-format
 msgid "Missed buyer !"
-msgstr ""
+msgstr "Gemiste koper!"
 
 #. module: auction
 #: report:auction.code_bar_lot:0
@@ -1577,12 +1577,12 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,vnd_lim:0
 msgid "Seller limit"
-msgstr ""
+msgstr "Verkopers limiet"
 
 #. module: auction
 #: field:auction.deposit,transfer:0
 msgid "Transfer"
-msgstr ""
+msgstr "Overboeking"
 
 #. module: auction
 #: view:auction.pay.buy:0
@@ -1602,7 +1602,7 @@ msgstr ""
 #. module: auction
 #: view:report.auction.adjudication:0
 msgid "Total adjudication"
-msgstr ""
+msgstr "Totale toewijzingen"
 
 #. module: auction
 #: selection:auction.deposit,method:0
@@ -1617,12 +1617,12 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,net_margin:0
 msgid "Net Margin (%)"
-msgstr ""
+msgstr "Netto marge(%)"
 
 #. module: auction
 #: field:auction.lots,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: auction
 #: report:buyer.list:0
@@ -1641,7 +1641,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:auction.action_all_objects
 #: model:ir.ui.menu,name:auction.auction_all_objects_menu
 msgid "Objects"
-msgstr "Objecten"
+msgstr "Kavels"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1651,7 +1651,7 @@ msgstr ""
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Paid:"
-msgstr ""
+msgstr "Betaald:"
 
 #. module: auction
 #: field:auction.deposit,total_neg:0
@@ -2299,9 +2299,6 @@ msgstr ""
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Fout, ongeldige EAN-code"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor overzicht"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -2322,9 +2319,6 @@ msgstr ""
 #~ msgid "Total margin"
 #~ msgstr "Totale marge"
 
-#~ msgid "VAT"
-#~ msgstr "BTW"
-
 #~ msgid "Net margin (%)"
 #~ msgstr "Netto marge (%)"
 
@@ -2364,9 +2358,6 @@ msgstr ""
 #~ msgid "Depositer's statistics"
 #~ msgstr "Storters statistieken"
 
-#~ msgid "Estimate"
-#~ msgstr "Schatting"
-
 #~ msgid "Comparison of estimations"
 #~ msgstr "Vergelijking van schattingen"
 
@@ -2376,27 +2367,21 @@ msgstr ""
 #~ msgid "Antique/Painting"
 #~ msgstr "Antiek/schilderijen"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Subtotaal:"
-
 #~ msgid "To pay"
 #~ msgstr "Te betalen"
 
 #~ msgid "Antique/Others"
 #~ msgstr "Antiek/overig"
 
-#~ msgid "Document"
-#~ msgstr "Document"
-
-#~ msgid "Inv."
-#~ msgstr "Inv."
-
 #~ msgid "Mark as taken away"
 #~ msgstr "Markeren als weggehaald"
 
 #~ msgid "Unclassifieds"
 #~ msgstr "Niet geclassificeerd"
 
+#~ msgid "fr"
+#~ msgstr "fr"
+
 #~ msgid "Antique/Oriental Arts/Chineese furnitures"
 #~ msgstr "Antiek/Oosterse kunst/Chinese meubels"
 
@@ -2409,12 +2394,6 @@ msgstr ""
 #~ msgid "General Informations"
 #~ msgstr "Algemene informatie"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Klantreferentie"
-
-#~ msgid ", TEL:"
-#~ msgstr ", TEL:"
-
 #~ msgid "Payment's history"
 #~ msgstr "Betalingsgeschiedenis"
 
@@ -2460,9 +2439,6 @@ msgstr ""
 #~ msgid "Contemporary Art"
 #~ msgstr "Hedendaagse kunst"
 
-#~ msgid "Adjudication"
-#~ msgstr "Verklaring"
-
 #~ msgid "ned"
 #~ msgstr "Nodig"
 
@@ -2478,18 +2454,15 @@ msgstr ""
 #~ msgid "Detailed lots"
 #~ msgstr "Gedetailleerde percelen"
 
+#~ msgid "Artist/Author 2"
+#~ msgstr "Artiest/auteur 2"
+
 #~ msgid "Numerotation"
 #~ msgstr "Nummering"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
 #~ msgid "Antique/Books, manuscripts, eso."
 #~ msgstr "Antiek/boeken, manuscripten, enz."
 
-#~ msgid "Deposit Form"
-#~ msgstr "Stortingsformulier"
-
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "Kopersfactuur afgeletterd"
 
@@ -2546,9 +2519,6 @@ msgstr ""
 #~ msgid "Continue"
 #~ msgstr "Ga door"
 
-#~ msgid "List N."
-#~ msgstr "Lijstnr."
-
 #~ msgid "Confirmation set taken away"
 #~ msgstr "Bevestiging set meegenomen"
 
@@ -2569,18 +2539,12 @@ msgstr ""
 #~ msgid "Antique/Verreries"
 #~ msgstr "Antiek/Verreries"
 
-#~ msgid "Buyer form"
-#~ msgstr "Kopersformulier"
-
 #~ msgid "Antique/Toys"
 #~ msgstr "Antiek/speelgoed"
 
 #~ msgid "Close + Create all invoices"
 #~ msgstr "Sluiten en maak alle facturen"
 
-#~ msgid "Cat"
-#~ msgstr "Cat"
-
 #~ msgid "Adj(EUR)"
 #~ msgstr "Schikking(EUR)"
 
@@ -2593,12 +2557,6 @@ msgstr ""
 #~ msgid "Birth / Death dates"
 #~ msgstr "Geboorte-/overlijdensdatum"
 
-#~ msgid "Document type"
-#~ msgstr "Soort document"
-
-#~ msgid "Cat. N."
-#~ msgstr "Cat.nr."
-
 #~ msgid "Send Image also ?"
 #~ msgstr "Afbeelding meeverzenden?"
 
@@ -2637,3 +2595,12 @@ msgstr ""
 
 #~ msgid "Antique/Metal Ware"
 #~ msgstr "Antiek/metaalwaren"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave opbouw"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige naam in actie-definitie."
+
+#~ msgid "Statements"
+#~ msgstr "Afschriften"
diff --git a/addons/auction/i18n/nl_BE.po b/addons/auction/i18n/nl_BE.po
index 99a339459a0..acf1b342216 100644
--- a/addons/auction/i18n/nl_BE.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index 3d90d815e4e..7cbd6df7e10 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2292,9 +2292,6 @@ msgstr ""
 msgid "Auction history"
 msgstr ""
 
-#~ msgid "VAT"
-#~ msgstr "VAT"
-
 #~ msgid "Antiques"
 #~ msgstr "Antyki"
 
@@ -2322,9 +2319,6 @@ msgstr ""
 #~ msgid "Retry"
 #~ msgstr "Ponów"
 
-#~ msgid "Document type"
-#~ msgstr "Typ dokumentu"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
@@ -2349,6 +2343,3 @@ msgstr ""
 
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "VAT wygląda na niepoprawny"
-
-#~ msgid "Menu"
-#~ msgstr "Menu"
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index fb253195722..147ad84d132 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2300,9 +2300,6 @@ msgstr "Histórico do Leilão"
 #~ msgid "Provisoire"
 #~ msgstr "Provisório"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Formulário do depósito"
-
 #~ msgid "Adjudication by Auction"
 #~ msgstr "Adjudicação por Leilão"
 
@@ -2315,15 +2312,6 @@ msgstr "Histórico do Leilão"
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "Factura do comprador reconciliada"
 
-#~ msgid "Inv."
-#~ msgstr "Inv."
-
-#~ msgid "VAT"
-#~ msgstr "VAT"
-
-#~ msgid "Adjudication"
-#~ msgstr "Adjudicação"
-
 #~ msgid "Objects by Auction"
 #~ msgstr "Objetos por Leilão"
 
@@ -2357,51 +2345,15 @@ msgstr "Histórico do Leilão"
 #~ msgid "Continue"
 #~ msgstr "Continuar"
 
-#~ msgid "Estimate"
-#~ msgstr "Estimar"
-
 #~ msgid "Retry"
 #~ msgstr "Repetir"
 
-#~ msgid "Document type"
-#~ msgstr "Tipo de documento"
-
-#~ msgid "Subtotal:"
-#~ msgstr "Sub total:"
-
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "O IVA não parece estar correcto."
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Erro! Não pode criar membros associados recursivamente."
 
-#~ msgid "Auction Manager"
-#~ msgstr "Gerir Leilão"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "Sumário apontando por utilizador"
-
-#~ msgid "Auction Member"
-#~ msgstr "Membro do leilão"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Estimação/Adjudicação"
-
-#~ msgid "Menu"
-#~ msgstr "Menu"
-
-#~ msgid "My objects By Day"
-#~ msgstr "Meus objectos por dia"
-
-#~ msgid "My board"
-#~ msgstr "Meu quadro"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Quadro de gestão de leilão"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "Meus ultimos objectos"
-
 #~ msgid "Total margin"
 #~ msgstr "Margem Total"
 
@@ -2887,23 +2839,6 @@ msgstr "Histórico do Leilão"
 #~ msgid "Antique/Posters"
 #~ msgstr "Antiguidade/Cartazes"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo deve ser único !"
-
-#~ msgid "The code of the account must be unique per company !"
-#~ msgstr "O código da conta tem de ser único, por empresa!"
-
-#~ msgid ""
-#~ "Error ! You cannot select a department for which the employee is the manager."
-#~ msgstr ""
-#~ "Erro ! Não pode selecionar um departamento cujo empregado é o gestor."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
 
@@ -2924,9 +2859,3 @@ msgstr "Histórico do Leilão"
 #~ msgstr ""
 #~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
 #~ "especial !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 19799e0b7fd..f58bb8c767b 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/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: 2011-05-01 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2398,15 +2398,9 @@ msgstr "Histórico do leilão"
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código EAN inválido"
 
-#~ msgid "List N."
-#~ msgstr "Lista N."
-
 #~ msgid "Close + Create all invoices"
 #~ msgstr "Fechar + Criar todas as Faturas"
 
-#~ msgid "Estimate"
-#~ msgstr "Estimativa"
-
 #~ msgid "Antique/Toys"
 #~ msgstr "Antiguidade/Briquedos"
 
@@ -2434,15 +2428,9 @@ msgstr "Histórico do leilão"
 #~ msgid "Bids line"
 #~ msgstr "Linha de Lances"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Formulário de Depósitos"
-
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "Fatura do comprador foi reconciliada"
 
-#~ msgid "Inv."
-#~ msgstr "Inv."
-
 #~ msgid "Langage"
 #~ msgstr "Idioma"
 
@@ -2498,12 +2486,6 @@ msgstr "Histórico do leilão"
 #~ msgid "Definitive (ordre catalogue)"
 #~ msgstr "Definitivo (catálogo do ordre)"
 
-#~ msgid "Adjudication"
-#~ msgstr "Conceder"
-
-#~ msgid "VAT"
-#~ msgstr "Imposto sobre Valor Agregado"
-
 #~ msgid "No of sellers"
 #~ msgstr "Nenhum vendedor"
 
@@ -2528,9 +2510,6 @@ msgstr "Histórico do leilão"
 #~ msgid "Auction buyer reporting tree view"
 #~ msgstr "Relatório de compra do leilão exibição em árvore"
 
-#~ msgid "Buyer form"
-#~ msgstr "Formulário do comprador"
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Erro ! Você não pode criar contas repetidas."
 
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index 32b533b4448..ffc661575a7 100644
--- a/addons/auction/i18n/ro.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2325,27 +2325,15 @@ msgstr "Istoric licitaţie"
 #~ msgid "Bids line"
 #~ msgstr "Rând licitaţie"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Formular de depozit"
-
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "Factură cumpărător reconciliată"
 
 #~ msgid "Antique/Tin / Copper wares"
 #~ msgstr "Antichităţi/obiecte din cositor/cupru"
 
-#~ msgid "Inv."
-#~ msgstr "Inv."
-
 #~ msgid "Mark as taken away"
 #~ msgstr "Marcare ca ridicat"
 
-#~ msgid "Adjudication"
-#~ msgstr "Adjudecare"
-
-#~ msgid "VAT"
-#~ msgstr "TVA"
-
 #~ msgid "Statements"
 #~ msgstr "Declaraţii"
 
@@ -2479,9 +2467,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Confirmation set taken away"
 #~ msgstr "Ridicare confirmată"
 
-#~ msgid "List N."
-#~ msgstr "Borderou"
-
 #~ msgid "Avg. Est"
 #~ msgstr "Medie est."
 
@@ -2508,18 +2493,9 @@ msgstr "Istoric licitaţie"
 #~ msgid "Antique/Verreries"
 #~ msgstr "Antichităţi / Sticlărie"
 
-#~ msgid "Buyer form"
-#~ msgstr "Formular cumpărător"
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Eroare ! Nu puteţi crea conturi recursive."
 
-#~ msgid "Cat"
-#~ msgstr "Cat"
-
-#~ msgid "Estimate"
-#~ msgstr "Estimare"
-
 #~ msgid "Antique/Toys"
 #~ msgstr "Antichităţi / Jucării"
 
@@ -2547,9 +2523,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Birth / Death dates"
 #~ msgstr "Date naştere / deces"
 
-#~ msgid "Cat. N."
-#~ msgstr "Cat. N."
-
 #~ msgid "Send Image also ?"
 #~ msgstr "Trimitere imagini deasemenea?"
 
@@ -2565,9 +2538,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Numerotation"
 #~ msgstr "Numerotare"
 
-#~ msgid "Document type"
-#~ msgstr "Tip document"
-
 #~ msgid "Bordereau de dépôt"
 #~ msgstr "Borderou de depunere"
 
@@ -2607,9 +2577,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Detailed lots"
 #~ msgstr "Loturi detaliate"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Subtotal:"
-
 #~ msgid "Seller's auction"
 #~ msgstr "Licitaţia vânzătorului"
 
@@ -2619,9 +2586,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Send results to Auction-in-europe.com"
 #~ msgstr "Trimitere rezultate la Auction-in-europe.com"
 
-#~ msgid "Customer Reference"
-#~ msgstr "Referinţă client"
-
 #~ msgid "Buyer's Summary"
 #~ msgstr "Rezumat cumpărător"
 
@@ -2658,12 +2622,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Auction results"
 #~ msgstr "Rezultate licitaţie"
 
-#~ msgid ", TEL:"
-#~ msgstr ", Tel:"
-
-#~ msgid "Document"
-#~ msgstr "Document"
-
 #~ msgid "Payment's history"
 #~ msgstr "Istoric plăţi"
 
@@ -2733,12 +2691,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Antique/Argenterie"
 #~ msgstr "Antichităţi/Argintărie"
 
-#~ msgid "Buyer, Price"
-#~ msgstr "Cumpărător, preţ"
-
-#~ msgid "Document Number"
-#~ msgstr "Număr document"
-
 #~ msgid "Numerotate"
 #~ msgstr "Numerotare"
 
@@ -2790,9 +2742,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Object Reference"
 #~ msgstr "Referinţă obiect"
 
-#~ msgid "Plate Number:"
-#~ msgstr "Număr de identificare"
-
 #~ msgid "Avg Adj."
 #~ msgstr "Adjudecare medie"
 
@@ -2835,9 +2784,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Send to website"
 #~ msgstr "Trimite pe website"
 
-#~ msgid "TEL:"
-#~ msgstr "Tel:"
-
 #~ msgid "First Number"
 #~ msgstr "Primul număr"
 
@@ -2862,9 +2808,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Antique/Graphic Arts"
 #~ msgstr "Antichităţi/Arte grafice"
 
-#~ msgid "Limit"
-#~ msgstr "Limită"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "Ultimele depuneri"
 
@@ -2889,12 +2832,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Report deposit border"
 #~ msgstr "Borderou raportare depozite"
 
-#~ msgid "Est."
-#~ msgstr "Est."
-
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Adj.(EUR)"
-
 #~ msgid "Auction report"
 #~ msgstr "Raport licitaţie"
 
@@ -2907,18 +2844,9 @@ msgstr "Istoric licitaţie"
 #~ msgid "Antique/Metal Ware"
 #~ msgstr "Antichităţi/Feronerie"
 
-#~ msgid "NET"
-#~ msgstr "NET"
-
-#~ msgid "Buyer Cost:"
-#~ msgstr "Cost cumpărător"
-
 #~ msgid "Buyer's auction"
 #~ msgstr "Licitaţie cumpărător"
 
-#~ msgid "BID:"
-#~ msgstr "Licitare:"
-
 #~ msgid "Auction reporting2 tree view"
 #~ msgstr "Vedere arbore raport2 licitaţie"
 
@@ -2931,12 +2859,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Unplanned Objects"
 #~ msgstr "Obiecte neplanificate"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Contact client"
-
-#~ msgid "Inv, Name"
-#~ msgstr "Inv, Nume"
-
 #~ msgid "Numerotation (automatic)"
 #~ msgstr "Numerotare (automat)"
 
@@ -2973,9 +2895,6 @@ msgstr "Istoric licitaţie"
 #~ msgid "Employees"
 #~ msgstr "Angajați"
 
-#~ msgid "Ref."
-#~ msgstr "Ref."
-
 #~ msgid "Objects to sell"
 #~ msgstr "Obiecte de vândut"
 
@@ -2990,39 +2909,3 @@ msgstr "Istoric licitaţie"
 
 #~ msgid "Antique/Posters"
 #~ msgstr "Antichităţi/Postere"
-
-#~ msgid "Orders"
-#~ msgstr "Comenzi"
-
-#~ msgid "Auction Manager"
-#~ msgstr "Manager licitaţii"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "Indicare rezumat pe utilizatori"
-
-#~ msgid "Auction Member"
-#~ msgstr "Membru licitaţie"
-
-#~ msgid "Auction member board"
-#~ msgstr "Panou membru licitaţie"
-
-#~ msgid "Board for Auction"
-#~ msgstr "Panou pentru licitaţie"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "Estimări/Adjudecări"
-
-#~ msgid "Menu"
-#~ msgstr "Meniu"
-
-#~ msgid "My objects By Day"
-#~ msgstr "Obiectele mele pe zile"
-
-#~ msgid "My board"
-#~ msgstr "Panoul meu"
-
-#~ msgid "Auction manager board"
-#~ msgstr "Panou manager licitaţie"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "Ultimele mele obiecte"
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index 6cef7d721b3..9e63531c840 100644
--- a/addons/auction/i18n/ru.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2307,9 +2307,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Bids line"
 #~ msgstr "Позиция заявки"
 
-#~ msgid "Deposit Form"
-#~ msgstr "Форма депозита"
-
 #~ msgid "Adjudication by Auction"
 #~ msgstr "Решения по аукционам"
 
@@ -2322,18 +2319,9 @@ msgstr "Журнал аукциона"
 #~ msgid "Mark as taken away"
 #~ msgstr "Отметить как забранное"
 
-#~ msgid "Inv."
-#~ msgstr "Счет"
-
-#~ msgid "VAT"
-#~ msgstr "НДС"
-
 #~ msgid "Statements"
 #~ msgstr "Выписки"
 
-#~ msgid "Adjudication"
-#~ msgstr "Результаты"
-
 #~ msgid "Antiques"
 #~ msgstr "Антиквариат"
 
@@ -2418,9 +2406,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Continue"
 #~ msgstr "Далее"
 
-#~ msgid "List N."
-#~ msgstr "№ по списку"
-
 #~ msgid "Avg. Est"
 #~ msgstr "Ср.оценка"
 
@@ -2439,12 +2424,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Antique/Toys"
 #~ msgstr "Антиквариат/ Игрушки"
 
-#~ msgid "Buyer form"
-#~ msgstr "Форма покупателя"
-
-#~ msgid "Estimate"
-#~ msgstr "Оценить"
-
 #~ msgid "Auction buyer reporting tree view"
 #~ msgstr "Древовидная форма отчетносит покупателя аукциона"
 
@@ -2466,9 +2445,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Unclassified objects "
 #~ msgstr "Не классифицированные объекты "
 
-#~ msgid "Document type"
-#~ msgstr "Тип документа"
-
 #~ msgid "comparaison estimate/adjudication "
 #~ msgstr "сравнение оценка / результат "
 
@@ -2511,12 +2487,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Send results to Auction-in-europe.com"
 #~ msgstr "Отправить результаты на Auction-in-europe.com"
 
-#~ msgid "Subtotal:"
-#~ msgstr "Подитог"
-
-#~ msgid "Customer Reference"
-#~ msgstr "Ссылка не клиента"
-
 #~ msgid "To pay"
 #~ msgstr "К оплате"
 
@@ -2538,12 +2508,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Payment's history"
 #~ msgstr "Журнал платежей"
 
-#~ msgid "Document"
-#~ msgstr "Документ"
-
-#~ msgid ", TEL:"
-#~ msgstr ", Тел:"
-
 #~ msgid "Auction results"
 #~ msgstr "Результаты аукциона"
 
@@ -2607,9 +2571,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Antique/Sculpture, bronze, eso."
 #~ msgstr "Антиквариат/ Скульптура, бронза и т.п."
 
-#~ msgid "Document Number"
-#~ msgstr "Номер документа"
-
 #~ msgid "Able Taken away"
 #~ msgstr "Можно забрать"
 
@@ -2674,15 +2635,9 @@ msgstr "Журнал аукциона"
 #~ msgid "Bid information"
 #~ msgstr "информация заявки"
 
-#~ msgid "TEL:"
-#~ msgstr "Тел.:"
-
 #~ msgid "Objects to sell"
 #~ msgstr "Объекты к продаже"
 
-#~ msgid "Limit"
-#~ msgstr "Лимит"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "Последние депозиты"
 
@@ -2710,9 +2665,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Employee"
 #~ msgstr "Сотрудник"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "Рез-т(EUR)"
-
 #~ msgid "Report deposit border"
 #~ msgstr "Отчет границы депозита"
 
@@ -2722,15 +2674,9 @@ msgstr "Журнал аукциона"
 #~ msgid "Antique/Collectible & art objects"
 #~ msgstr "Антиквариат/ Объекты коллекционирования и искусства"
 
-#~ msgid "BID:"
-#~ msgstr "Заявка:"
-
 #~ msgid "Antique/Furnitures"
 #~ msgstr "Антиквариат/ Мебель"
 
-#~ msgid "Customer Contact"
-#~ msgstr "Контакт клиента"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "Незапланир. объекты"
 
@@ -2749,9 +2695,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Cont. Art/Arts"
 #~ msgstr "Совр. искусство/ Ремесла"
 
-#~ msgid "Ref."
-#~ msgstr "Ссылка"
-
 #~ msgid "Short Description"
 #~ msgstr "Краткое описание"
 
@@ -2779,9 +2722,6 @@ msgstr "Журнал аукциона"
 #~ msgid "Antique/Posters"
 #~ msgstr "Антиквариат/ Афиши"
 
-#~ msgid "Orders"
-#~ msgstr "Заказы"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия."
 
diff --git a/addons/auction/i18n/sl.po b/addons/auction/i18n/sl.po
index c08c9b08559..aedd78cb47b 100644
--- a/addons/auction/i18n/sl.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2316,9 +2316,6 @@ msgstr ""
 #~ msgid "SMS - Gateway: clickatell"
 #~ msgstr "SMS Prehod: clickatell"
 
-#~ msgid "VAT"
-#~ msgstr "DDV"
-
 #~ msgid "Contemporary Art"
 #~ msgstr "Sodobna umetnost"
 
@@ -2351,6 +2348,3 @@ msgstr ""
 
 #~ msgid "Continue"
 #~ msgstr "Nadaljuj"
-
-#~ msgid "Auction Manager"
-#~ msgstr "Vodja dražbe"
diff --git a/addons/auction/i18n/sq.po b/addons/auction/i18n/sq.po
index 0f6cb13717e..0e337692d51 100644
--- a/addons/auction/i18n/sq.po
+++ b/addons/auction/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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/sr.po b/addons/auction/i18n/sr.po
index 5875a9c823a..ae095a4ebd7 100644
--- a/addons/auction/i18n/sr.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/sr@latin.po b/addons/auction/i18n/sr@latin.po
index 1db24cce0b5..7c923286797 100644
--- a/addons/auction/i18n/sr@latin.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index bdf91df2ce0..3fcbaaefb8b 100644
--- a/addons/auction/i18n/sv.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2297,9 +2297,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#~ msgid "VAT"
-#~ msgstr "Moms"
-
 #~ msgid "Object Type"
 #~ msgstr "Objekttyp"
 
@@ -2339,9 +2336,6 @@ msgstr ""
 #~ msgid "Send Image also ?"
 #~ msgstr "Skicka även bild?"
 
-#~ msgid "Document type"
-#~ msgstr "Dokumenttyp"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Felaktig XML för Vyarkitektur!"
 
@@ -2363,9 +2357,6 @@ msgstr ""
 #~ msgid "Auction results"
 #~ msgstr "Auktionsresultat"
 
-#~ msgid "Document"
-#~ msgstr "Dokument"
-
 #~ msgid "Antique/Metal Ware"
 #~ msgstr "Antikviteter/Metallvaror"
 
@@ -2438,3 +2429,6 @@ msgstr ""
 #~ "     Manage bids, track of sold, paid and unpaid objects.\n"
 #~ "     Delivery Management. \n"
 #~ "    "
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "Momsen verkar inte vara korrekt."
diff --git a/addons/auction/i18n/tlh.po b/addons/auction/i18n/tlh.po
index 09c09d2401d..7cc97bac145 100644
--- a/addons/auction/i18n/tlh.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 4ee7de0b2fe..593ff642a04 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -2417,345 +2417,3 @@ msgstr ""
 
 #~ msgid "Employees"
 #~ msgstr "Personeller"
-
-#~ msgid "Invoiced & Paid"
-#~ msgstr "Faturalanmış & Ödenmiş"
-
-#~ msgid "Destination"
-#~ msgstr "Hedef"
-
-#~ msgid "From Picking"
-#~ msgstr "İrsaliyeden"
-
-#~ msgid "Validated By"
-#~ msgstr "Onaylayan"
-
-#~ msgid "Supplier"
-#~ msgstr "Tedarikçi"
-
-#~ msgid "Delivery"
-#~ msgstr "Teslimat"
-
-#~ msgid "Quantity"
-#~ msgstr "Miktar"
-
-#~ msgid "From Order"
-#~ msgstr "Siparişten"
-
-#~ msgid "Confirmed Purchase"
-#~ msgstr "Onaylanan Alış"
-
-#~ msgid "Invoice Exception"
-#~ msgstr "Fatura Muafiyeti"
-
-#~ msgid "Default Purchase Pricelist"
-#~ msgstr "Varsayılan Alış Fiyat Listesi"
-
-#~ msgid "Create invoice"
-#~ msgstr "Fatura Oluştur"
-
-#~ msgid "Create invoice from product recept"
-#~ msgstr "Alış İrsaliyesinden Fatura Oluştur"
-
-#~ msgid "Purchase Process"
-#~ msgstr "Alış Prosesi"
-
-#~ msgid "Invoice from Packing list"
-#~ msgstr "Çeki Listesinden Fatura"
-
-#~ msgid "Approve Purchase"
-#~ msgstr "Alış Onayla"
-
-#~ msgid "Approved"
-#~ msgstr "Onaylanmış"
-
-#~ msgid "Purchase Orders in Progress"
-#~ msgstr "İşlemdeki Alış Siparişleri"
-
-#~ msgid "Untaxed Amount"
-#~ msgstr "Tutar"
-
-#~ msgid "Taxes"
-#~ msgstr "Vergi"
-
-#~ msgid "Purchase Order"
-#~ msgstr "Satınalma Siparişi"
-
-#~ msgid "Net Total :"
-#~ msgstr "Net Toplam :"
-
-#~ msgid "Cancelled"
-#~ msgstr "İptal Edildi"
-
-#~ msgid "Origin"
-#~ msgstr "Menşei"
-
-#~ msgid "Incoming Products"
-#~ msgstr "Gelen Ürünler"
-
-#~ msgid "Qty"
-#~ msgstr "Mik."
-
-#~ msgid "Purchase Order lines"
-#~ msgstr "Alış Siparişi Kalemleri"
-
-#~ msgid "Validated by"
-#~ msgstr "Onaylayan"
-
-#~ msgid "Invoice based on deliveries"
-#~ msgstr "Teslimata Bağlı Faturalandır"
-
-#~ msgid "Net Price"
-#~ msgstr "Net Fiyat"
-
-#~ msgid "Order Line"
-#~ msgstr "Sipariş Kalemi"
-
-#~ msgid "Confirmed"
-#~ msgstr "Onaylandı"
-
-#~ msgid "Confirm"
-#~ msgstr "Onayla"
-
-#~ msgid "Invoice Control"
-#~ msgstr "Fatura Kontrolü"
-
-#~ msgid "RFQ"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid "Waiting"
-#~ msgstr "Bekliyor"
-
-#~ msgid "Picking List"
-#~ msgstr "Hazırlık Listesi"
-
-#~ msgid "Warehouse"
-#~ msgstr "Depo"
-
-#~ msgid "Order Lines"
-#~ msgstr "Sipariş Kalemleri"
-
-#~ msgid "Fax:"
-#~ msgstr "Fax:"
-
-#~ msgid "Untaxed amount"
-#~ msgstr "Tutar"
-
-#~ msgid "Expected Date"
-#~ msgstr "Tahmini Tarih"
-
-#~ msgid "Shipping address :"
-#~ msgstr "Sevk Adresi :"
-
-#~ msgid "Purchase Pricelist"
-#~ msgstr "Alış Fiyat Listesi"
-
-#~ msgid "Planned Date"
-#~ msgstr "Planlama Tarihi"
-
-#~ msgid "Packing"
-#~ msgstr "Sevkiyat Paketlemesi"
-
-#~ msgid "Merge purchases"
-#~ msgstr "Alışları Birleştir"
-
-#~ msgid "Reservation Destination"
-#~ msgstr "Rezervasyon Yeri"
-
-#~ msgid "Order Reference"
-#~ msgstr "Sipariş Referansı"
-
-#~ msgid "Done"
-#~ msgstr "Bitti"
-
-#~ msgid "Pricelist"
-#~ msgstr "Fiyat Listesi"
-
-#~ msgid "Invoice from Purchase"
-#~ msgstr "Satınalmadan Faturaya"
-
-#~ msgid "Manual"
-#~ msgstr "Manuel"
-
-#~ msgid "Confirming Purchase"
-#~ msgstr "Alışı Onaylayan"
-
-#~ msgid "Shipping Exception"
-#~ msgstr "İstisnai Sevkiyat"
-
-#~ msgid "Purchase orders"
-#~ msgstr "Alış Siparişleri"
-
-#~ msgid "Request for Quotation :"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid "Confirm Purchase Order"
-#~ msgstr "Alış Siparişini Onayla"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Satınalma Yönetimi"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Cari Kart"
-
-#~ msgid "Taxes :"
-#~ msgstr "Vergi :"
-
-#~ msgid "Destination Address"
-#~ msgstr "Gönderilen Adres"
-
-#~ msgid "Purchase Order Line"
-#~ msgstr "Alış Sipariş Kalemi"
-
-#~ msgid "Calendar View"
-#~ msgstr "Takvimi Göster"
-
-#~ msgid "Set to Draft"
-#~ msgstr "Taslak olarak Ayarla"
-
-#~ msgid "Purchase order is approved by supplier."
-#~ msgstr "Tedarikçinin Onayladığı Alış Siparişleri"
-
-#~ msgid "Draft Invoice"
-#~ msgstr "Taslak Fatura"
-
-#~ msgid "Purchase order"
-#~ msgstr "Alış Siparişi"
-
-#~ msgid "Packing Invoice"
-#~ msgstr "Paketleme Sevkiyat Faturası"
-
-#~ msgid "Delivery & Invoices"
-#~ msgstr "Teslimat & Faturalar"
-
-#~ msgid "After Purchase order , Create invoice."
-#~ msgstr "Alış Siparişinden Sonra Fatura Yarat."
-
-#~ msgid "Scheduled date"
-#~ msgstr "Planlanan Tarih"
-
-#~ msgid "Our Order Reference"
-#~ msgstr "Bizim Sipariş Referansımız"
-
-#~ msgid "Compute"
-#~ msgstr "Hesapla"
-
-#~ msgid "Cancel Purchase Order"
-#~ msgstr "Alış Siparişini İptal Et"
-
-#~ msgid "Create Packing list"
-#~ msgstr "Çeki Listesi Oluştur"
-
-#~ msgid "Total :"
-#~ msgstr "Toplam :"
-
-#~ msgid "Order Status"
-#~ msgstr "Sipariş Durumu"
-
-#~ msgid "Subtotal"
-#~ msgstr "Alt Toplam"
-
-#~ msgid "Default Purchase Pricelist Version"
-#~ msgstr "Varsayılan Alış Fiyat Listesi Vers."
-
-#~ msgid "Unit Price"
-#~ msgstr "Birim Fiyat"
-
-#~ msgid "Fiscal Position"
-#~ msgstr "Mali Durum"
-
-#~ msgid "Request for Quotation N°"
-#~ msgstr "Teklif İsteği No"
-
-#~ msgid "Purchases Properties"
-#~ msgstr "Alış Özellikleri"
-
-#~ msgid "Order Ref"
-#~ msgstr "Sipariş Ref."
-
-#~ msgid "Purchase Orders"
-#~ msgstr "Alış Siparişleri"
-
-#~ msgid "New Purchase Order"
-#~ msgstr "Yeni Alış Siparişi Oluştur"
-
-#~ msgid "Received"
-#~ msgstr "Alınan"
-
-#~ msgid "Request for Quotation"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid "Out Packing"
-#~ msgstr "İrsaliyesiz (Paketlemesiz)"
-
-#~ msgid "Date Approved"
-#~ msgstr "Onaylanmış Tarih"
-
-#~ msgid "Product recept invoice"
-#~ msgstr "Ürün İrsaliye Faturası"
-
-#~ msgid "Expected Delivery address:"
-#~ msgstr "Tahmini Teslimat Adresi"
-
-#~ msgid "Purchase Order Waiting Approval"
-#~ msgstr "Onay Bekleyen Alış Siparişi"
-
-#~ msgid "Confirming Purchase Order"
-#~ msgstr "Alış Siparişini Onaylayan"
-
-#~ msgid "Product UOM"
-#~ msgstr "Birim"
-
-#~ msgid "Reservation"
-#~ msgstr "Rezervasyon"
-
-#~ msgid "Purchase order is confirmed by the user."
-#~ msgstr "Kulanıcının Onayladığı Alış Siparişleri"
-
-#~ msgid "Purchase Invoice"
-#~ msgstr "Alış Faturası"
-
-#~ msgid "Your Order Reference"
-#~ msgstr "Sizin Sipariş Referansınız"
-
-#~ msgid "Purchase Order Confirmation N°"
-#~ msgstr "Alış Siparişi Onay N°"
-
-#~ msgid "Total amount"
-#~ msgstr "Toplam Tutar"
-
-#~ msgid "Date Ordered"
-#~ msgstr "Sipariş Tarihi"
-
-#~ msgid "Purchase Control"
-#~ msgstr "Alış Kontrolü"
-
-#~ msgid "Request For Quotations"
-#~ msgstr "Teklif İstekleri"
-
-#~ msgid "Invoicing Control"
-#~ msgstr "Faturalama Kontrolü"
-
-#~ msgid "Approve"
-#~ msgstr "Onayla"
-
-#~ msgid "Approved Purchase"
-#~ msgstr "Onaylanmış Alış"
-
-#~ msgid "From Packing list, Create invoice."
-#~ msgstr "Çeki Listesinden Fatura Oluştur."
-
-#~ msgid "Approving Purchase Order"
-#~ msgstr "Alış Sipariş Onaylaması"
-
-#~ msgid "Stock Moves"
-#~ msgstr "Stok Hareketi"
-
-#~ msgid "Purchase Order Lines"
-#~ msgstr "Alış Sipariş Kalemleri"
-
-#~ msgid "Invoicing"
-#~ msgstr "Faturalama"
-
-#~ msgid "Menu"
-#~ msgstr "Menü"
diff --git a/addons/auction/i18n/uk.po b/addons/auction/i18n/uk.po
index bc05535e5cc..ba5aabdf040 100644
--- a/addons/auction/i18n/uk.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/vi.po b/addons/auction/i18n/vi.po
index aeaf86564b7..222e5e4fe76 100644
--- a/addons/auction/i18n/vi.po
+++ b/addons/auction/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-20 22:08+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index e76763aac41..2d5ea701473 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -8,23 +8,23 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-08-03 03:11+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
 msgid "Reporting"
-msgstr "报表"
+msgstr "报告"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_taken
 msgid "Auction taken"
-msgstr ""
+msgstr "历史拍卖"
 
 #. module: auction
 #: view:auction.lots:0
@@ -43,7 +43,7 @@ msgstr "卖方"
 #. module: auction
 #: field:auction.lots,name:0
 msgid "Title"
-msgstr ""
+msgstr "标题"
 
 #. module: auction
 #: field:auction.lots.sms.send,text:0
@@ -55,17 +55,17 @@ msgstr "SMS消息"
 #: view:auction.lots.auction.move:0
 #: view:auction.lots.make.invoice.buyer:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
 msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
-msgstr ""
+msgstr "警告， 将删除竞价及其买家！"
 
 #. module: auction
 #: help:auction.pay.buy,statement_id1:0
 msgid "First Bank Statement For Buyer"
-msgstr ""
+msgstr "买家的首选银行账号"
 
 #. module: auction
 #: field:auction.bid_line,lot_id:0
@@ -81,7 +81,7 @@ msgstr "物品#"
 #. module: auction
 #: view:auction.lots:0
 msgid "Authors"
-msgstr ""
+msgstr "作者"
 
 #. module: auction
 #: view:auction.bid:0
@@ -107,7 +107,7 @@ msgstr "没有物品"
 #: help:auction.lots,paid_vnd:0
 msgid ""
 "When state of Seller Invoice is 'Paid', this field is selected as True."
-msgstr ""
+msgstr "如果卖家的发票状态是已付款，这个字段值为真。"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -128,12 +128,12 @@ msgstr "已开票金额"
 #. module: auction
 #: help:auction.lots,name:0
 msgid "Auction object name"
-msgstr ""
+msgstr "拍卖物品名称"
 
 #. module: auction
 #: model:ir.model,name:auction.model_aie_category
 msgid "aie.category"
-msgstr ""
+msgstr "aie.category"
 
 #. module: auction
 #: field:auction.deposit.cost,amount:0
@@ -152,7 +152,7 @@ msgstr "押金最少"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Reference"
-msgstr ""
+msgstr "关联单号"
 
 #. module: auction
 #: help:auction.dates,state:0
@@ -160,6 +160,8 @@ msgid ""
 "When auction starts the state is 'Draft'.\n"
 " At the end of auction, the state becomes 'Closed'."
 msgstr ""
+"拍卖开始则状态为草稿\n"
+"拍卖结束则状态为结束"
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
@@ -169,7 +171,7 @@ msgstr "辅助核算项"
 #. module: auction
 #: help:auction.pay.buy,amount3:0
 msgid "Amount For Third Bank Statement"
-msgstr ""
+msgstr "第三方银行金额"
 
 #. module: auction
 #: field:auction.lots,lot_num:0
@@ -179,7 +181,7 @@ msgstr "表编号"
 #. module: auction
 #: report:buyer.list:0
 msgid "Date:"
-msgstr ""
+msgstr "日期:"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
@@ -199,19 +201,19 @@ msgstr "状态"
 #. module: auction
 #: view:auction.dates:0
 msgid "First Auction Date"
-msgstr ""
+msgstr "拍卖首日"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: auction
 #: help:auction.lot.category,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the auction "
 "lot category without removing it."
-msgstr ""
+msgstr "如果把这个字段设置为空，可以不必删除就隐藏物品类别。"
 
 #. module: auction
 #: view:auction.lots:0
@@ -221,7 +223,7 @@ msgstr "参考"
 #. module: auction
 #: field:report.auction,total_price:0
 msgid "Total Price"
-msgstr ""
+msgstr "总价"
 
 #. module: auction
 #: view:auction.lots:0
@@ -231,12 +233,12 @@ msgstr "合计"
 #. module: auction
 #: view:auction.lots.sms.send:0
 msgid "SMS - Gateway: clickatell','Bulk SMS send"
-msgstr ""
+msgstr "短消息网关：clicktell','批量发送短信"
 
 #. module: auction
 #: help:auction.lots,costs:0
 msgid "Deposit cost"
-msgstr ""
+msgstr "寄存费"
 
 #. module: auction
 #: selection:auction.lots,state:0
@@ -248,12 +250,12 @@ msgstr "未出售的"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Search Auction deposit"
-msgstr ""
+msgstr "寄卖物品列表"
 
 #. module: auction
 #: help:auction.lots,lot_num:0
 msgid "List number in depositer inventory"
-msgstr ""
+msgstr "寄卖物品编号"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -279,7 +281,7 @@ msgstr "出价"
 #. module: auction
 #: view:auction.lots.buyer_map:0
 msgid "Buyer Map"
-msgstr ""
+msgstr "买家地图"
 
 #. module: auction
 #: field:report.object.encoded,obj_ret:0
@@ -289,18 +291,18 @@ msgstr "物品#"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_bid
 msgid "Bid Auctions"
-msgstr ""
+msgstr "竞价"
 
 #. module: auction
 #: help:auction.lots,image:0
 msgid "Object Image"
-msgstr ""
+msgstr "物品图片"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_buyer_map.py:70
 #, python-format
 msgid "No buyer is set for this lot."
-msgstr ""
+msgstr "这个物品没有买家"
 
 #. module: auction
 #: code:addons/auction/auction.py:578
@@ -316,7 +318,7 @@ msgstr "佣金"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_deposit_cost
 msgid "Auction Deposit Cost"
-msgstr ""
+msgstr "寄卖成本"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -326,12 +328,12 @@ msgstr "最少押金单"
 #. module: auction
 #: help:auction.lots,statement_id:0
 msgid "Bank statement line for given buyer"
-msgstr ""
+msgstr "指定买家的付款记录"
 
 #. module: auction
 #: field:auction.lot.category,aie_categ:0
 msgid "Category"
-msgstr ""
+msgstr "类别"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
@@ -341,7 +343,7 @@ msgstr "从买家到业务伙伴"
 #. module: auction
 #: view:auction.lots:0
 msgid "Search Auction Lots"
-msgstr ""
+msgstr "物品列表"
 
 #. module: auction
 #: field:report.auction,net_revenue:0
@@ -362,7 +364,7 @@ msgstr "发送SMS"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: auction
 #: view:auction.lots:0
@@ -375,18 +377,18 @@ msgstr "销售"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
 #, python-format
 msgid "No Lots belong to this Auction Date"
-msgstr ""
+msgstr "此日期没有拍品"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: auction
 #: field:auction.bid_line,name:0
@@ -411,17 +413,17 @@ msgstr "物品描述"
 #. module: auction
 #: field:auction.lots,artist2_id:0
 msgid "Artist/Author2"
-msgstr ""
+msgstr "第二作者"
 
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line1"
-msgstr ""
+msgstr "线路1"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
 msgid "Make Invoice for Buyer"
-msgstr ""
+msgstr "开发票给买家"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -437,7 +439,7 @@ msgstr "买家支付的物品"
 #. module: auction
 #: help:auction.dates,auction2:0
 msgid "End date of auction"
-msgstr ""
+msgstr "拍卖截止日期"
 
 #. module: auction
 #: view:auction.lots.sms.send:0
@@ -458,12 +460,12 @@ msgstr "买家"
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id4
 msgid "VAT 12%"
-msgstr ""
+msgstr "VAT 12%"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Invoices"
-msgstr ""
+msgstr "买家发票"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.res_w_buyer
@@ -478,22 +480,22 @@ msgstr "最高价格"
 #. module: auction
 #: help:auction.dates,auction1:0
 msgid "Start date of auction"
-msgstr ""
+msgstr "拍卖开始日期"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_auction_move
 msgid "Auction Move"
-msgstr ""
+msgstr "拍卖记录"
 
 #. module: auction
 #: help:auction.dates,buyer_costs:0
 msgid "Account tax for buyer"
-msgstr ""
+msgstr "买家税"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Next Auction"
-msgstr ""
+msgstr "未开始的拍卖"
 
 #. module: auction
 #: view:auction.taken:0
@@ -510,7 +512,7 @@ msgstr "付款"
 #: code:addons/auction/auction.py:686
 #, python-format
 msgid "The object \"%s\" has no buyer assigned."
-msgstr ""
+msgstr "这个拍品 \"%s\" 没有指定买家"
 
 #. module: auction
 #: selection:auction.deposit,method:0
@@ -520,12 +522,12 @@ msgstr "保留直到售出"
 #. module: auction
 #: view:auction.dates:0
 msgid "Last Auction Date"
-msgstr ""
+msgstr "拍卖截止日期"
 
 #. module: auction
 #: model:account.tax,name:auction.tax_seller
 msgid "Seller Costs (12%)"
-msgstr ""
+msgstr "卖家税（12%）"
 
 #. module: auction
 #: field:auction.lots,paid_vnd:0
@@ -574,12 +576,12 @@ msgstr "%)"
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer Information"
-msgstr ""
+msgstr "买家信息"
 
 #. module: auction
 #: help:auction.lots,gross_revenue:0
 msgid "Buyer Price - Seller Price"
-msgstr ""
+msgstr "买家价格 - 卖家价格"
 
 #. module: auction
 #: field:auction.lots.make.invoice,objects:0
@@ -600,7 +602,7 @@ msgstr "买家价格"
 #. module: auction
 #: view:auction.lots:0
 msgid "Bids Details"
-msgstr ""
+msgstr "拍卖记录"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
@@ -621,7 +623,7 @@ msgstr "拍卖目录Flagey"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
@@ -647,7 +649,7 @@ msgstr "间接成本"
 #. module: auction
 #: help:auction.dates,seller_costs:0
 msgid "Account tax for seller"
-msgstr ""
+msgstr "卖家税"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_invoice.py:68
@@ -655,7 +657,7 @@ msgstr ""
 #: code:addons/auction/wizard/auction_lots_numerotate.py:129
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "用户错误"
 
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
@@ -665,7 +667,7 @@ msgstr "拍卖管理"
 #. module: auction
 #: field:auction.dates,journal_seller_id:0
 msgid "Seller Journal"
-msgstr "卖家记录集合"
+msgstr "卖家账簿"
 
 #. module: auction
 #: view:auction.dates:0
@@ -689,32 +691,36 @@ msgid ""
 "* The 'Paid' state is used when user pay for the object                 \n"
 "* The 'Sold' state is used when user buy the object."
 msgstr ""
+" 输入的新拍品是草稿状态\n"
+"如果长期没有卖出则是滞销状态，用户可以把滞销状态的拍品设置为草稿状态\n"
+"已经付款的拍品是已付款状态\n"
+"已经有人购买是已售状态"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: auction
 #: view:auction.lots:0
 #: view:report.auction:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: auction
 #: help:aie.category,child_ids:0
 msgid "children aie category"
-msgstr ""
+msgstr "儿童不宜类别"
 
 #. module: auction
 #: help:auction.lots,ach_emp:0
 msgid "When state is Taken Away, this field is marked as True"
-msgstr ""
+msgstr "如果状态是被取走，这个字段的值是真"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_taken
 msgid "Gestion emporte"
-msgstr ""
+msgstr "出库确认"
 
 #. module: auction
 #: view:auction.bid:0
@@ -743,17 +749,17 @@ msgstr "API ID"
 #: field:auction.bid,name:0
 #: field:auction.bid_line,bid_id:0
 msgid "Bid ID"
-msgstr ""
+msgstr "出价记录编号"
 
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Min Estimate:"
-msgstr ""
+msgstr "最低价"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #. module: auction
 #: field:report.auction,net_margin:0
@@ -768,7 +774,7 @@ msgstr "净极限?"
 #. module: auction
 #: field:aie.category,child_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "未知的"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -789,12 +795,12 @@ msgstr "# 物品编码"
 #. module: auction
 #: field:aie.category,parent_id:0
 msgid "Parent aie Category"
-msgstr ""
+msgstr "父类别"
 
 #. module: auction
 #: view:report.auction:0
 msgid "Auction Summary"
-msgstr ""
+msgstr "拍卖一览"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -806,29 +812,29 @@ msgstr "(空为自动编号)"
 #: code:addons/auction/auction.py:578
 #, python-format
 msgid "No Invoice Address"
-msgstr ""
+msgstr "无发票地址"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_huissier
 msgid "Bailiffs Listing"
-msgstr ""
+msgstr "拍品列表"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_numerotate.py:103
 #: code:addons/auction/wizard/auction_lots_numerotate.py:129
 #, python-format
 msgid "This record does not exist !"
-msgstr ""
+msgstr "记录不存在"
 
 #. module: auction
 #: field:auction.pay.buy,total:0
 msgid "Total Amount"
-msgstr ""
+msgstr "总金额"
 
 #. module: auction
 #: help:auction.pay.buy,amount:0
 msgid "Amount For First Bank Statement"
-msgstr ""
+msgstr "第一次付款金额"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_object_date
@@ -839,7 +845,7 @@ msgstr "每天物品"
 #. module: auction
 #: help:auction.lots,author_right:0
 msgid "Account tax for author commission"
-msgstr ""
+msgstr "版权税"
 
 #. module: auction
 #: model:product.template,name:auction.monproduit_product_template
@@ -870,12 +876,12 @@ msgstr "额外费用"
 #. module: auction
 #: view:auction.lots.buyer_map:0
 msgid "Map "
-msgstr ""
+msgstr "地图 "
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer Invoice Reconciled"
-msgstr ""
+msgstr "买家发票核销"
 
 #. module: auction
 #: field:auction.deposit,date_dep:0
@@ -895,17 +901,17 @@ msgstr "特别费用"
 #. module: auction
 #: report:buyer.list:0
 msgid "To pay ("
-msgstr ""
+msgstr "应付款 （"
 
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer
 msgid "Buyer Costs (20%)"
-msgstr ""
+msgstr "买家税（20%）"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction
 msgid "Dashboard"
-msgstr ""
+msgstr "控制台"
 
 #. module: auction
 #: view:auction.dates:0
@@ -923,12 +929,12 @@ msgstr "最终结果合计"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_make_invoice
 msgid "Make invoice"
-msgstr ""
+msgstr "开发票"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: auction
 #: view:auction.dates:0
@@ -939,7 +945,7 @@ msgstr "日志"
 #. module: auction
 #: field:aie.category,code:0
 msgid "Code"
-msgstr ""
+msgstr "编号"
 
 #. module: auction
 #: report:auction.code_bar_lot:0
@@ -949,7 +955,7 @@ msgstr "Nr."
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
 msgid "Barcode batch"
-msgstr ""
+msgstr "批量条码"
 
 #. module: auction
 #: report:report.auction.buyer.result:0
@@ -964,7 +970,7 @@ msgstr "取消"
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer's Payment History"
-msgstr ""
+msgstr "买家付款记录"
 
 #. module: auction
 #: view:auction.artists:0
@@ -985,7 +991,7 @@ msgstr "支付"
 #. module: auction
 #: view:auction.lots.make.invoice:0
 msgid "Create Invoices For Seller"
-msgstr ""
+msgstr "为买家开发票"
 
 #. module: auction
 #: field:report.object.encoded,obj_margin:0
@@ -995,7 +1001,7 @@ msgstr "净利润"
 #. module: auction
 #: help:auction.lots,lot_local:0
 msgid "Auction Location"
-msgstr ""
+msgstr "拍卖地点"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1006,13 +1012,13 @@ msgstr "分析"
 #: help:auction.lots,paid_ach:0
 msgid ""
 "When state of Buyer Invoice is 'Paid', this field is selected as True."
-msgstr ""
+msgstr "如果买家发票状态为已付款，这个字段的值为真"
 
 #. module: auction
 #: report:bids.lots:0
 #: report:bids.phones.details:0
 msgid "Cat.N"
-msgstr ""
+msgstr "类别编号"
 
 #. module: auction
 #: selection:auction.deposit,method:0
@@ -1033,17 +1039,17 @@ msgstr "买家物品发票"
 #. module: auction
 #: view:report.auction:0
 msgid "My Auction"
-msgstr ""
+msgstr "我的拍卖"
 
 #. module: auction
 #: help:auction.lots,gross_margin:0
 msgid "(Gross Revenue*100.0)/ Object Price"
-msgstr ""
+msgstr "（净收入*100）/ 拍品价格"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
 msgid "Contact Number"
-msgstr ""
+msgstr "合同号"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1075,14 +1081,14 @@ msgstr "发票编号"
 #: code:addons/auction/wizard/auction_lots_numerotate.py:173
 #, python-format
 msgid "Active IDs not Found"
-msgstr ""
+msgstr "没有活动的记录"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_aie_send.py:167
 #: code:addons/auction/wizard/auction_aie_send_result.py:117
 #, python-format
 msgid "Connection to WWW.Auction-in-Europe.com failed !"
-msgstr ""
+msgstr "连接 WWW.Auction-in-Europe.com 失败"
 
 #. module: auction
 #: field:report.auction,gross_revenue:0
@@ -1092,7 +1098,7 @@ msgstr "总收入"
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction
 msgid "Auction board"
-msgstr ""
+msgstr "拍卖控制台"
 
 #. module: auction
 #: field:aie.category,name:0
@@ -1111,12 +1117,12 @@ msgstr "押金目录"
 #: code:addons/auction/auction.py:692
 #, python-format
 msgid "The Buyer has no Invoice Address."
-msgstr ""
+msgstr "买家没有发票地址"
 
 #. module: auction
 #: view:report.object.encoded:0
 msgid "Total adj."
-msgstr ""
+msgstr "报价合计"
 
 #. module: auction
 #: field:auction.lots.sms.send,user:0
@@ -1147,7 +1153,7 @@ msgstr "建立批"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots
 msgid "Auction Object"
-msgstr ""
+msgstr "拍品"
 
 #. module: auction
 #: field:auction.lots,obj_num:0
@@ -1187,12 +1193,12 @@ msgstr "作者"
 #: view:auction.lots:0
 #: view:report.auction:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: auction
 #: help:auction.dates,journal_id:0
 msgid "Account journal for buyer"
-msgstr ""
+msgstr "买家账簿"
 
 #. module: auction
 #: field:auction.bid,bid_lines:0
@@ -1221,12 +1227,12 @@ msgstr "卖家"
 #. module: auction
 #: help:auction.lots,lot_est2:0
 msgid "Maximum Estimate Price"
-msgstr ""
+msgstr "最高价"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Notes"
-msgstr ""
+msgstr "注释"
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -1241,7 +1247,7 @@ msgstr "# 未售出项"
 #. module: auction
 #: view:auction.dates:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "创建发票"
 
 #. module: auction
 #: field:auction.bid,auction_id:0
@@ -1253,12 +1259,12 @@ msgstr "拍卖日期"
 #. module: auction
 #: report:auction.code_bar_lot:0
 msgid ", ID"
-msgstr ""
+msgstr ", ID"
 
 #. module: auction
 #: report:buyer.list:0
 msgid "Adj.("
-msgstr ""
+msgstr "报价("
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.lot_list_inv
@@ -1268,7 +1274,7 @@ msgstr "批列表 - Landscape"
 #. module: auction
 #: view:auction.artists:0
 msgid "Author/Artist"
-msgstr ""
+msgstr "作者"
 
 #. module: auction
 #: field:auction.lots,ach_login:0
@@ -1294,12 +1300,12 @@ msgstr "位置"
 #. module: auction
 #: view:report.auction:0
 msgid "Month -1"
-msgstr ""
+msgstr "上个月"
 
 #. module: auction
 #: help:auction.lots,is_ok:0
 msgid "When buyer pay for bank statement', this field is marked"
-msgstr ""
+msgstr "如果买家支付了这笔货款，此字段为真"
 
 #. module: auction
 #: field:auction.lots,ach_emp:0
@@ -1314,12 +1320,12 @@ msgstr "未打折收入合计"
 #. module: auction
 #: help:auction.lots,lot_est1:0
 msgid "Minimum Estimate Price"
-msgstr ""
+msgstr "最低价"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Date"
-msgstr ""
+msgstr "寄卖日期"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_numerotate.py:145
@@ -1330,7 +1336,7 @@ msgstr "这批不存在!"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: auction
 #: field:auction.bid_line,call:0
@@ -1351,7 +1357,7 @@ msgstr "最低估价"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_sms_send
 msgid "Sms send "
-msgstr ""
+msgstr "发送短信 "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -1362,30 +1368,30 @@ msgstr "修改拍卖日期"
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
 msgid "Lifespan"
-msgstr ""
+msgstr "生命周期"
 
 #. module: auction
 #: view:auction.deposit:0
 #: field:auction.deposit,method:0
 msgid "Withdrawned method"
-msgstr ""
+msgstr "下架方式"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Commissions"
-msgstr ""
+msgstr "买家佣金"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_auction
 #: model:ir.ui.menu,name:auction.menu_report_auction
 msgid "Auction Analysis"
-msgstr ""
+msgstr "拍卖分析"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_pay_buy.py:80
 #, python-format
 msgid "Payment aborted !"
-msgstr ""
+msgstr "付款取消！"
 
 #. module: auction
 #: field:auction.lot.history,price:0
@@ -1400,7 +1406,7 @@ msgstr "开始拍卖"
 #. module: auction
 #: help:auction.pay.buy,statement_id3:0
 msgid "Third Bank Statement For Buyer"
-msgstr ""
+msgstr "买家第三笔付款"
 
 #. module: auction
 #: view:report.auction:0
@@ -1417,27 +1423,27 @@ msgstr "最高估计"
 #. module: auction
 #: view:auction.lots:0
 msgid "Statistical"
-msgstr ""
+msgstr "统计"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_deposit
 msgid "Auction Deposit Border"
-msgstr ""
+msgstr "寄卖拍品列表"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
 msgid "Object statistics"
-msgstr ""
+msgstr "拍品统计"
 
 #. module: auction
 #: help:auction.lots,net_margin:0
 msgid "(Net Revenue * 100)/ Object Price"
-msgstr ""
+msgstr "（净收入*100）/ 拍品价格"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot History"
-msgstr ""
+msgstr "拍品历史记录"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -1448,7 +1454,7 @@ msgstr "创建发票"
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id5
 msgid "VAT 5%"
-msgstr ""
+msgstr "VAT 5%"
 
 #. module: auction
 #: field:auction.dates,expo1:0
@@ -1468,17 +1474,17 @@ msgstr "拍卖.艺术家"
 #. module: auction
 #: field:report.auction,avg_price:0
 msgid "Avg Price."
-msgstr ""
+msgstr "平均价"
 
 #. module: auction
 #: help:auction.pay.buy,statement_id2:0
 msgid "Second Bank Statement For Buyer"
-msgstr ""
+msgstr "买家第二次付款"
 
 #. module: auction
 #: field:auction.dates,journal_id:0
 msgid "Buyer Journal"
-msgstr "买家记录集合"
+msgstr "买家账簿"
 
 #. module: auction
 #: selection:auction.lots,state:0
@@ -1500,12 +1506,12 @@ msgstr "有效"
 #. module: auction
 #: view:auction.dates:0
 msgid "Exposition Dates"
-msgstr ""
+msgstr "报名日期"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax1
 msgid "TVA"
-msgstr ""
+msgstr "TVA"
 
 #. module: auction
 #: field:auction.lots,important:0
@@ -1542,19 +1548,19 @@ msgstr "每天物品"
 #. module: auction
 #: help:auction.dates,expo2:0
 msgid "Last exposition date for auction"
-msgstr ""
+msgstr "截止报名日期"
 
 #. module: auction
 #: code:addons/auction/auction.py:571
 #: code:addons/auction/auction.py:686
 #, python-format
 msgid "Missed buyer !"
-msgstr ""
+msgstr "未输入买家"
 
 #. module: auction
 #: report:auction.code_bar_lot:0
 msgid "Flagey"
-msgstr ""
+msgstr "拍品"
 
 #. module: auction
 #: view:board.board:0
@@ -1567,12 +1573,12 @@ msgstr "拍卖管理 "
 msgid ""
 "Two different buyers for the same invoice !\n"
 "Please correct this problem before invoicing"
-msgstr ""
+msgstr "一张发票有两个买家，请开票前纠正此错误"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Invoice"
-msgstr ""
+msgstr "开发票"
 
 #. module: auction
 #: field:auction.lots,vnd_lim:0
@@ -1587,17 +1593,17 @@ msgstr "转移"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line3"
-msgstr ""
+msgstr "线路3"
 
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line2"
-msgstr ""
+msgstr "线路2"
 
 #. module: auction
 #: help:auction.lots,obj_ret:0
 msgid "Object Ret"
-msgstr ""
+msgstr "拍品利润"
 
 #. module: auction
 #: view:report.auction.adjudication:0
@@ -1612,7 +1618,7 @@ msgstr "联系卖家"
 #. module: auction
 #: field:auction.taken,lot_ids:0
 msgid "Lots Emportes"
-msgstr ""
+msgstr "拍品列表"
 
 #. module: auction
 #: field:auction.lots,net_margin:0
@@ -1627,12 +1633,12 @@ msgstr "产品"
 #. module: auction
 #: report:buyer.list:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Seller Information"
-msgstr ""
+msgstr "卖家信息"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -1646,7 +1652,7 @@ msgstr "物品"
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Invoices"
-msgstr ""
+msgstr "卖家发票"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -1661,7 +1667,7 @@ msgstr "允许负数金额"
 #. module: auction
 #: help:auction.pay.buy,amount2:0
 msgid "Amount For Second Bank Statement"
-msgstr ""
+msgstr "第二次付款金额"
 
 #. module: auction
 #: field:auction.lot.history,auction_id:0
@@ -1673,7 +1679,7 @@ msgstr "拍卖日期"
 #. module: auction
 #: view:auction.lots.sms.send:0
 msgid "SMS Text"
-msgstr ""
+msgstr "短信内容"
 
 #. module: auction
 #: field:auction.dates,auction1:0
@@ -1683,7 +1689,7 @@ msgstr "首日拍卖"
 #. module: auction
 #: view:auction.lots.make.invoice.buyer:0
 msgid "Create Invoices For Buyer"
-msgstr ""
+msgstr "为买家新建发票"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1699,12 +1705,12 @@ msgstr "艺术家"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Pay Objects"
-msgstr ""
+msgstr "付款"
 
 #. module: auction
 #: help:auction.dates,expo1:0
 msgid "Beginning exposition date for auction"
-msgstr ""
+msgstr "注册开始日期"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
@@ -1714,12 +1720,12 @@ msgstr "打开批"
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
 msgid "Deposit slip"
-msgstr ""
+msgstr "寄卖合同"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_enable
 msgid "Lots Enable"
-msgstr ""
+msgstr "可以出价的拍品"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1739,7 +1745,7 @@ msgstr "买家列表"
 #. module: auction
 #: report:buyer.list:0
 msgid "Buyer costs("
-msgstr ""
+msgstr "买家费用"
 
 #. module: auction
 #: field:auction.pay.buy,statement_id1:0
@@ -1752,28 +1758,28 @@ msgstr "对帐单"
 #: help:auction.lots,seller_price:0
 #: help:auction.lots.make.invoice,amount:0
 msgid "Seller Price"
-msgstr ""
+msgstr "买家价格"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax20
 #: model:account.tax,name:auction.auction_tax6
 msgid "Frais de vente"
-msgstr ""
+msgstr "Frais de vente"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id1
 msgid "VAT 1%"
-msgstr ""
+msgstr "VAT 1%"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax
 msgid "Droit d'auteur"
-msgstr ""
+msgstr "Droit d'auteur"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_buyer_map
 msgid "Map Buyer"
-msgstr ""
+msgstr "买家地图"
 
 #. module: auction
 #: field:report.auction.object.date,name:0
@@ -1785,7 +1791,7 @@ msgstr "创建日期"
 msgid ""
 "Provide deposit information: seller, Withdrawned Method, Object, Deposit "
 "Costs"
-msgstr ""
+msgstr "输入寄卖信息：卖家，下架方式，拍品，寄卖费"
 
 #. module: auction
 #: field:auction.lots,net_revenue:0
@@ -1798,7 +1804,7 @@ msgstr "净收入"
 #: code:addons/auction/wizard/auction_pay_buy.py:87
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -1808,7 +1814,7 @@ msgstr "# 项"
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer_author
 msgid "Author rights (4%)"
-msgstr ""
+msgstr "版权税（4%）"
 
 #. module: auction
 #: field:report.object.encoded,estimation:0
@@ -1833,11 +1839,22 @@ msgid ""
 "       * My Objects By Day (list)\n"
 "    "
 msgstr ""
+"\n"
+"     此模块管理作者、拍品、拍卖、买家和卖家信息。\n"
+"\n"
+"模块提供了完整的拍卖管理功能，包括管理竞价、跟踪已售拍品的付款状态和发货状态。\n"
+"\n"
+"拍卖控制台包括：\n"
+"我的最新拍卖\n"
+"我的最新寄卖\n"
+"拍品分析\n"
+"每日拍品\n"
+"    "
 
 #. module: auction
 #: view:auction.taken:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buyer_form_id
@@ -1853,7 +1870,7 @@ msgstr "买家姓名"
 #: view:report.auction:0
 #: field:report.auction,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
@@ -1874,12 +1891,12 @@ msgstr "关闭"
 #. module: auction
 #: view:auction.dates:0
 msgid "Search Next Auction Dates"
-msgstr ""
+msgstr "未开始的拍卖"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
 msgid "Print Auction Catalog Flagey Report..."
-msgstr ""
+msgstr "打印拍卖报表"
 
 #. module: auction
 #: field:auction.lots,ach_avance:0
@@ -1899,17 +1916,17 @@ msgstr "最少/ 最终结果/ 最大"
 #. module: auction
 #: view:auction.catalog.flagey:0
 msgid "Catalog Flagey Report"
-msgstr ""
+msgstr "拍卖报表"
 
 #. module: auction
 #: help:auction.lots,obj_price:0
 msgid "Object Price"
-msgstr ""
+msgstr "拍品价格"
 
 #. module: auction
 #: view:auction.bid:0
 msgid "Bids Lines"
-msgstr ""
+msgstr "竞价记录"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1919,7 +1936,7 @@ msgstr "目录"
 #. module: auction
 #: help:auction.lots,auction_id:0
 msgid "Auction for object"
-msgstr ""
+msgstr "拍品拍卖历史"
 
 #. module: auction
 #: field:auction.deposit.cost,account:0
@@ -1936,17 +1953,17 @@ msgstr "设置"
 #, python-format
 msgid ""
 "You should pay all the total: \"%.2f\" are missing to accomplish the payment."
-msgstr ""
+msgstr "你需要总计支付 \"%.2f\" 已完成付款"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_pay_buy
 msgid "Pay buy"
-msgstr ""
+msgstr "买家付款"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_outils_menu
 msgid "Tools Bar Codes"
-msgstr ""
+msgstr "条码工具"
 
 #. module: auction
 #: field:auction.deposit.cost,deposit_id:0
@@ -1961,12 +1978,12 @@ msgstr "最后展览会日期"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_able
 msgid "Lots able"
-msgstr ""
+msgstr "可以出售的拍品"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id3
 msgid "VAT 10%"
-msgstr ""
+msgstr "VAT 10%"
 
 #. module: auction
 #: field:auction.artists,name:0
@@ -1976,7 +1993,7 @@ msgstr "艺术家/ 作者姓名"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: auction
 #: field:auction.lots,image:0
@@ -1987,22 +2004,22 @@ msgstr "图像"
 #: help:auction.lots,buyer_price:0
 #: help:auction.lots.make.invoice.buyer,amount:0
 msgid "Buyer Price"
-msgstr ""
+msgstr "买家出价"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_category
 msgid "Auction Lots Category"
-msgstr ""
+msgstr "拍品类别"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id2
 msgid "VAT 20%"
-msgstr ""
+msgstr "VAT 20%"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_payer_sel
 msgid "Auction payment for seller"
-msgstr ""
+msgstr "付款给卖家"
 
 #. module: auction
 #: view:auction.lots:0
@@ -2028,12 +2045,12 @@ msgstr "类别名称"
 #. module: auction
 #: report:buyer.list:0
 msgid "........."
-msgstr ""
+msgstr "........."
 
 #. module: auction
 #: view:report.auction:0
 msgid "Auction Summary tree view"
-msgstr ""
+msgstr "拍卖情况一览"
 
 #. module: auction
 #: report:report.auction.buyer.result:0
@@ -2049,7 +2066,7 @@ msgstr "拍卖日期"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction_open
 msgid "Auction DashBoard"
-msgstr ""
+msgstr "拍卖控制台"
 
 #. module: auction
 #: view:report.auction:0
@@ -2063,23 +2080,23 @@ msgstr "用户"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "付款明细"
 
 #. module: auction
 #: code:addons/auction/auction.py:692
 #, python-format
 msgid "Missed Address !"
-msgstr ""
+msgstr "没有地址信息！"
 
 #. module: auction
 #: help:auction.lots,net_revenue:0
 msgid "Buyer Price - Seller Price - Indirect Cost"
-msgstr ""
+msgstr "买家价格 - 卖家价格 - 间接费用"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
 msgid "Open Bids"
-msgstr ""
+msgstr "未开票竞价"
 
 #. module: auction
 #: field:auction.artists,pseudo:0
@@ -2109,7 +2126,7 @@ msgstr "拍卖日期:"
 #: code:addons/auction/wizard/auction_lots_numerotate.py:145
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: auction
 #: field:auction.dates,buyer_invoice_history:0
@@ -2136,7 +2153,7 @@ msgstr "拍卖列表合计"
 #. module: auction
 #: view:auction.deposit:0
 msgid "General Information"
-msgstr ""
+msgstr "通用信息"
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -2151,22 +2168,22 @@ msgstr "关闭"
 #. module: auction
 #: model:ir.model,name:auction.model_report_object_encoded
 msgid "Object encoded"
-msgstr ""
+msgstr "输入的拍品"
 
 #. module: auction
 #: view:auction.bid:0
 msgid "Search Auction Bid"
-msgstr ""
+msgstr "竞价列表"
 
 #. module: auction
 #: report:bids.phones.details:0
 msgid "Est"
-msgstr ""
+msgstr "区号"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Commissions"
-msgstr ""
+msgstr "卖家佣金"
 
 #. module: auction
 #: view:report.object.encoded:0
@@ -2176,7 +2193,7 @@ msgstr "物品统计"
 #. module: auction
 #: help:auction.dates,journal_seller_id:0
 msgid "Account journal for seller"
-msgstr ""
+msgstr "卖家账簿"
 
 #. module: auction
 #: field:auction.dates,auction2:0
@@ -2186,13 +2203,13 @@ msgstr "最后拍卖日"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Objects Description"
-msgstr ""
+msgstr "拍品描述"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_pay_buy.py:87
 #, python-format
 msgid "No auction date for \"%s\": Please set one."
-msgstr ""
+msgstr "拍卖 \"%s\" 未指定日期"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -2204,7 +2221,7 @@ msgstr "说明"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: auction
 #: field:auction.lots,obj_price:0
@@ -2224,12 +2241,12 @@ msgstr "密码"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: auction
 #: view:auction.pay.buy:0
@@ -2264,7 +2281,7 @@ msgstr "费用"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_payer
 msgid "Auction payer"
-msgstr ""
+msgstr "拍卖付款人"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -2285,7 +2302,7 @@ msgstr "艺术家简历"
 #: view:report.auction:0
 #: field:report.auction,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: auction
 #: field:auction.lots,history_ids:0
@@ -2319,15 +2336,9 @@ msgstr "拍卖日志"
 #~ msgid "Mark as taken away"
 #~ msgstr "标记为带走"
 
-#~ msgid "VAT"
-#~ msgstr "增值税"
-
 #~ msgid "Statements"
 #~ msgstr "描述"
 
-#~ msgid "Adjudication"
-#~ msgstr "最终结果"
-
 #~ msgid "Unclassifieds"
 #~ msgstr "不分类"
 
@@ -2425,15 +2436,9 @@ msgstr "拍卖日志"
 #~ msgid "Bids line"
 #~ msgstr "投标线"
 
-#~ msgid "Deposit Form"
-#~ msgstr "押金单"
-
 #~ msgid "Buyer invoice reconciled"
 #~ msgstr "买家发票已核销"
 
-#~ msgid "Inv."
-#~ msgstr "发票"
-
 #~ msgid "Back"
 #~ msgstr "后退"
 
@@ -2473,9 +2478,6 @@ msgstr "拍卖日志"
 #~ msgid "Continue"
 #~ msgstr "继续"
 
-#~ msgid "List N."
-#~ msgstr "列表 N"
-
 #~ msgid "Confirmation set taken away"
 #~ msgstr "确认设为带走"
 
@@ -2504,12 +2506,6 @@ msgstr "拍卖日志"
 #~ msgid "Antique/Verreries"
 #~ msgstr "古董/玻璃器皿"
 
-#~ msgid "Buyer form"
-#~ msgstr "买家"
-
-#~ msgid "Estimate"
-#~ msgstr "预计"
-
 #~ msgid "Antique/Toys"
 #~ msgstr "古董/玩具"
 
@@ -2549,9 +2545,6 @@ msgstr "拍卖日志"
 #~ msgid "Cont. Art/Other Media"
 #~ msgstr "艺术品/ 其它媒体"
 
-#~ msgid "Document type"
-#~ msgstr "文档类型"
-
 #~ msgid "Unclassified objects"
 #~ msgstr "无类别物品"
 
@@ -2597,9 +2590,6 @@ msgstr "拍卖日志"
 #~ msgid "Depositer's Statistics"
 #~ msgstr "押金统计"
 
-#~ msgid "Customer Reference"
-#~ msgstr "客户参考"
-
 #~ msgid "Auction buyer reporting form view2"
 #~ msgstr "拍卖买家报表视图2"
 
@@ -2630,9 +2620,6 @@ msgstr "拍卖日志"
 #~ msgid "Auction results"
 #~ msgstr "拍卖结果"
 
-#~ msgid "Document"
-#~ msgstr "文档"
-
 #~ msgid "Payment's history"
 #~ msgstr "付款日志"
 
@@ -2697,12 +2684,6 @@ msgstr "拍卖日志"
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr "错误:默认的计量单位和采购的计量单位必须是同一类型."
 
-#~ msgid "Buyer, Price"
-#~ msgstr "买家, 价格"
-
-#~ msgid "Document Number"
-#~ msgstr "文档编号"
-
 #~ msgid "Antique/Lightings"
 #~ msgstr "古董/ 灯饰"
 
@@ -2739,9 +2720,6 @@ msgstr "拍卖日志"
 #~ msgid "Object Reference"
 #~ msgstr "物品参考"
 
-#~ msgid "Plate Number:"
-#~ msgstr "版号:"
-
 #~ msgid "Avg Adj."
 #~ msgstr "平均最终结果"
 
@@ -2800,9 +2778,6 @@ msgstr "拍卖日志"
 #~ msgid "Antique/Graphic Arts"
 #~ msgstr "古董/ 印艺"
 
-#~ msgid "Limit"
-#~ msgstr "极限"
-
 #~ msgid "Latest Deposits"
 #~ msgstr "最近押金"
 
@@ -2824,9 +2799,6 @@ msgstr "拍卖日志"
 #~ msgid "Report deposit border"
 #~ msgstr "报告押金边界"
 
-#~ msgid "Adj.(EUR)"
-#~ msgstr "最终结果(EUR)"
-
 #~ msgid "Auction report"
 #~ msgstr "拍卖报表"
 
@@ -2836,30 +2808,15 @@ msgstr "拍卖日志"
 #~ msgid "Buyer's auction"
 #~ msgstr "买家拍卖"
 
-#~ msgid "BID:"
-#~ msgstr "出价:"
-
 #~ msgid "Auction reporting2 tree view"
 #~ msgstr "拍卖报表2树视图"
 
-#~ msgid "NET"
-#~ msgstr "净值"
-
-#~ msgid "Buyer Cost:"
-#~ msgstr "买家费用:"
-
 #~ msgid "Antique/Furnitures"
 #~ msgstr "古董/ 家具"
 
-#~ msgid "Customer Contact"
-#~ msgstr "客户联系"
-
 #~ msgid "Unplanned Objects"
 #~ msgstr "无计划的物品"
 
-#~ msgid "Inv, Name"
-#~ msgstr "发票名称"
-
 #~ msgid "Amount to paid"
 #~ msgstr "支付金额"
 
@@ -2869,9 +2826,6 @@ msgstr "拍卖日志"
 #~ msgid "Objects to sell"
 #~ msgstr "物品销售"
 
-#~ msgid "Ref."
-#~ msgstr "参考"
-
 #~ msgid "Cont. Art/Arts"
 #~ msgstr "艺术品/ 艺术家"
 
@@ -2910,39 +2864,3 @@ msgstr "拍卖日志"
 
 #~ msgid "Antique/Posters"
 #~ msgstr "古董/ 海报"
-
-#~ msgid "Auction member board"
-#~ msgstr "拍卖会员控制台"
-
-#~ msgid "Board for Auction"
-#~ msgstr "拍卖控制台"
-
-#~ msgid "Estimations/Adjudication"
-#~ msgstr "估价/ 最终结果"
-
-#~ msgid "Orders"
-#~ msgstr "订单"
-
-#~ msgid "Summary pointing by user"
-#~ msgstr "用户摘要"
-
-#~ msgid "Auction Member"
-#~ msgstr "拍卖会员"
-
-#~ msgid "Auction Manager"
-#~ msgstr "拍卖管理"
-
-#~ msgid "My Latest Objects"
-#~ msgstr "我最近的物品"
-
-#~ msgid "Auction manager board"
-#~ msgstr "拍卖管理控制台"
-
-#~ msgid "My board"
-#~ msgstr "我的控制台"
-
-#~ msgid "My objects By Day"
-#~ msgstr "每天我的物品"
-
-#~ msgid "Menu"
-#~ msgstr "菜单"
diff --git a/addons/auction/i18n/zh_TW.po b/addons/auction/i18n/zh_TW.po
index 2135d09472d..1aa6c440c03 100644
--- a/addons/auction/i18n/zh_TW.po
+++ b/addons/auction/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
diff --git a/addons/auction/report/artists_lots.py b/addons/auction/report/artists_lots.py
index 981440dac53..6c9344c88db 100644
--- a/addons/auction/report/artists_lots.py
+++ b/addons/auction/report/artists_lots.py
@@ -21,14 +21,15 @@
 
 from report.interface import report_int
 import netsvc
+import openerp.pooler
 
 class report_artistlot(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
 
     def create(self, cr, uid, ids, datas, context):
-        service = netsvc.LocalService("object_proxy")
-        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', ids, ['artist_id'])
+        pool = pooler.get_pool(cr.dbname)
+        lots = pool.get('auction.lots').read(cr, uid, ids, ['artist_id'])
         artists = []
         for lot in lots:
             if lot['artist_id'] and lot['artist_id'] not in artists:
diff --git a/addons/auction/report/photo_shadow.py b/addons/auction/report/photo_shadow.py
index 4aea8e31ba6..919fa701e23 100644
--- a/addons/auction/report/photo_shadow.py
+++ b/addons/auction/report/photo_shadow.py
@@ -27,7 +27,7 @@ def convert(from_file, to_file):
     __convert(from_file, to_file, size=95)
 
 def __convert(from_file, to_file, size=95):
-    import Image, ImageDraw, ImageFilter
+    from PIL import Image, ImageDraw, ImageFilter
     im = Image.open(from_file)
     if float(im.size[1]/im.size[0])>2:
         im = im.resize((im.size[0]*size/im.size[1], size))
diff --git a/addons/auction/report/report_auction.py b/addons/auction/report/report_auction.py
index 012ea3c891e..af5d76b6076 100644
--- a/addons/auction/report/report_auction.py
+++ b/addons/auction/report/report_auction.py
@@ -209,3 +209,5 @@ class report_object_encoded(osv.osv):
 
 report_object_encoded()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/report/report_auction_view.xml b/addons/auction/report/report_auction_view.xml
index 4f5c50912d9..18f454bf3bb 100644
--- a/addons/auction/report/report_auction_view.xml
+++ b/addons/auction/report/report_auction_view.xml
@@ -37,16 +37,16 @@
         <field name="arch" type="xml">
             <search string="Auction Summary">
                 <group>
-                    <filter icon="terp-go-year" string="Year"
+                    <filter icon="terp-go-year" string="Year" name="year"
                         domain="[('year','=',time.strftime('%%Y'))]"
                         help="Auction during current year."/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-month" string="Month"
                         name="month"
                         domain="[('month','=',time.strftime('%%m'))]"
                         help="Auction during current month."/>
                     <filter icon="terp-go-week"
                          string="Month -1"
-                         separator="1"
                          domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
                          help="Auction during last month."/>
                     <separator orientation="vertical"/>
@@ -70,7 +70,7 @@
                     <field name="lot_type"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Buyer" icon="terp-personal" name="buyer" context="{'group_by':'buyer'}"/>
                     <filter string="Seller" icon="terp-personal" name="seller" context="{'group_by':'seller'}"/>
@@ -114,7 +114,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_report_auction_search"/>
-        <field name="context">{'search_default_month':1,'search_default_sold':1,'search_default_auction_date':1, 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_sold':1,'search_default_auction_date':1, 'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
 
     <menuitem name="Auction Analysis" action="action_report_auction" id="menu_report_auction" parent="auction.auction_report_menu"/>
diff --git a/addons/auction/report/seller_address.py b/addons/auction/report/seller_address.py
index 315533e99f4..7a7c10cb4aa 100644
--- a/addons/auction/report/seller_address.py
+++ b/addons/auction/report/seller_address.py
@@ -20,15 +20,15 @@
 ##############################################################################
 
 from report.interface import report_int
-import netsvc
+import openerp.pooler
 
 class auction_seller(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
 
     def create(self, cr, uid, ids, datas, context):
-        service = netsvc.LocalService("object_proxy")
-        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', ids, ['bord_vnd_id'])
+        pool = openerp.pooler.get_pool(cr.dbname)
+        lots = pool.get('auction.lots').read(cr, uid, ids, ['bord_vnd_id'])
 
         bords = {}
         for l in lots:
@@ -37,7 +37,7 @@ class auction_seller(report_int):
         new_ids = bords.keys()
 
         parts = {}
-        partners = service.execute(cr.dbname, uid, 'auction.deposit', 'read', new_ids, ['partner_id'])
+        partners = pool.get('auction.deposit').read(cr, uid, new_ids, ['partner_id'])
         for l in partners:
             if l['partner_id']:
                 parts[l['partner_id'][0]]=True
diff --git a/addons/auction/report/total.py b/addons/auction/report/total.py
index e878001c2e4..609a1ad3a48 100644
--- a/addons/auction/report/total.py
+++ b/addons/auction/report/total.py
@@ -32,10 +32,8 @@ class report_custom(report_rml):
         report_rml.__init__(self, name, table, tmpl, xsl)
 
     def create_xml(self, cr, uid, ids, datas, context=None):
-        service = netsvc.LocalService("object_proxy")
-
-        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', ids, ['obj_price','ach_login','obj_comm','lot_est1','lot_est2','bord_vnd_id','ach_emp','auction_id'])
-        auction = service.execute(cr.dbname, uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
+        lots = self.pool.get('auction.lots').read(cr, uid , ids, ['obj_price','ach_login','obj_comm','lot_est1','lot_est2','bord_vnd_id','ach_emp','auction_id'])
+        auction = self.pool.get('auction.dates').read(cr, uid, [lots[0]['auction_id'][0]])[0]
 
         unsold = comm = emp = paid = unpaid = 0
         est1 = est2 = adj = 0
@@ -75,7 +73,7 @@ class report_custom(report_rml):
 
 
         debit = adj
-        costs = service.execute(cr.dbname, uid, 'auction.lots', 'compute_seller_costs', ids)
+        costs = self.pool.get('auction.lots').compute_seller_costs(cr, uid, ids)
         for cost in costs:
             debit += cost['amount']
 
diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml
index 72014f985ef..f970ffe86dd 100644
--- a/addons/auction/test/auction.yml
+++ b/addons/auction/test/auction.yml
@@ -34,21 +34,8 @@
 - 
   !record {model: account.journal, id: account.sales_journal}:
     analytic_journal_id: account.cose_journal_sale    
--
-  I'm creating new Seller "Mr. Pinakin" with him email "info@mycustomer.com".
-- 
-  !record {model: res.partner, id: res_partner_mrpinakin0}:
-    address:
-        - city: Namur
-          country_id: base.be
-          phone: (+32).10.45.18.77
-          street: 23, street ways
-          type: default
-          zip: '2324324'
-          email: 'info@mycustomer.com'
-    name: Mr. Pinakin
 
--      
+-
   I'm creating new Buyer "Mr. Patel" with his email "info@myinfobid.com".
 - 
   !record {model: res.partner, id: res_partner_mrpatel0}:
@@ -61,21 +48,7 @@
         email: 'info@myinfobid.com'
     name: Mr. Patel
         
--      
-  I'm creating new Buyer "Mr. Johnson" with his email "info@mrkjohnson.com".
-- 
-  !record {model: res.partner, id: res_partner_mrkjohnson0}:
-    address:
-      - city: paris
-        country_id: base.fr
-        name: Mark Johnson
-        street: 1 rue Rockfeller
-        type: invoice
-        zip: '75016'
-        email: 'info@mrkjohnson.com'
-    name: Mr. Mark Johnson
-        
--      
+-
   I'm creating new Buyer "Mr. Rahi" with his email "info@poalrahi.com".
 - 
   !record {model: res.partner, id: res_partner_poalrahi0}:
@@ -140,7 +113,7 @@
     date_dep: !eval "'%s-08-01' %(datetime.now().year)"
     method: keep
     name: AD/006
-    partner_id: res_partner_mrpinakin0
+    partner_id: base.res_partner_maxtor
     specific_cost_ids:
       - account: auction.auction_expense
         amount: 200.0
@@ -149,7 +122,7 @@
   I create a new object wooden-chair which is to be auctioned.
 -
   !record {model: auction.lots, id: auction_lots_woodenchair0}:
-    ach_uid: res_partner_mrkjohnson0
+    ach_uid: base.res_partner_seagate
     artist_id: auction_artists_vincentvangogh0
     auction_id: auction_dates_antiquefurnitureexhibition0
     bord_vnd_id: auction_deposit_ad0
@@ -199,12 +172,12 @@
     price: 3200.0
  
 -
-  I create another bid for an object "wooden-chair" bid by a Mr.Johnson
+  I create another bid for an object "wooden-chair" bid by a Mr.Seagate
 -  
   !record {model: auction.bid, id: auction_bid_bid2}:
     auction_id: auction_dates_antiquefurnitureexhibition0
     name: bid/003
-    partner_id: res_partner_mrkjohnson0
+    partner_id: base.res_partner_seagate
 -
   I create a bid line.
 -
@@ -215,7 +188,7 @@
     lot_id: auction.auction_lots_woodenchair0
     price: 4000.0
 -
-  Mr. MarkJohnson bid are selected as the Finalist Bid with 4000 Euro
+  Mr. Seagate bids are selected as the Finalist Bid with 4000 Euro
 -
   I check that buyer price and seller price gets bound with the value
 -
@@ -250,7 +223,7 @@
 -
   !record {model: auction.lots.make.invoice.buyer, id: auction_lots_make_invoice_buyer_0}:
     amount: 3090.0
-    buyer_id: res_partner_mrkjohnson0
+    buyer_id: base.res_partner_seagate
     number: !eval "'%s/003' %(datetime.now().year)"
     objects: 1
 -
diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py
index 1caec13b852..563230c0d1f 100644
--- a/addons/auction/wizard/auction_aie_send.py
+++ b/addons/auction/wizard/auction_aie_send.py
@@ -141,9 +141,8 @@ class auction_lots_send_aie(osv.osv_memory):
     
     
     def _photos_send(cr, uid, uname, passwd, did, ids):
-        service = netsvc.LocalService("object_proxy")
         for (ref,id) in ids:
-            datas = service.execute(cr.db_name, uid, 'auction.lots', 'read', [id], ['name','image'])
+            datas = self.pool.get('auction.lots').read(cr, uid, [id], ['name','image'])
             if len(datas):
                 bin = base64.decodestring(datas[0]['image'])
                 fname = datas[0]['name']
@@ -186,8 +185,7 @@ class auction_lots_send_aie(osv.osv_memory):
         if context is None: 
             context = {}
     
-        service = netsvc.LocalService("object_proxy")
-        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context.get('active_ids',[]),  ['obj_num','lot_num','obj_desc','bord_vnd_id','lot_est1','lot_est2','artist_id','lot_type','aie_categ'])
+        lots = self.pool.get('auction.lots').read(cr, uid, context.get('active_ids',[]), ['obj_num','lot_num','obj_desc','bord_vnd_id','lot_est1','lot_est2','artist_id','lot_type','aie_categ'])
         lots_ids = []
         datas = self.read(cr, uid, ids[0],['uname','login','lang','numerotation','dates'])
         for l in lots:
diff --git a/addons/auction/wizard/auction_aie_send_result.py b/addons/auction/wizard/auction_aie_send_result.py
index d6102dd0522..24489fda441 100644
--- a/addons/auction/wizard/auction_aie_send_result.py
+++ b/addons/auction/wizard/auction_aie_send_result.py
@@ -132,9 +132,8 @@ class auction_lots_pay(osv.osv_memory):
         if context is None: 
             context = {}
         import pickle
-        service = netsvc.LocalService("object_proxy")
         datas = self.read(cr, uid, ids[0],['uname','password','dates'])
-        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'],  ['obj_num','obj_price'])
+        lots = self.pool.get('auction.lots').read(cr, uid, context['active_ids'],  ['obj_num','obj_price'])
         args = pickle.dumps(lots)
         self._catalog_send(datas['uname'], datas['password'], datas['dates'], args)
         return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
index 8604d691456..37d8374aad4 100644
--- a/addons/auction/wizard/auction_lots_able.py
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -44,3 +44,5 @@ class auction_lots_able(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_able()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
index 3974241a071..7157ac8abea 100644
--- a/addons/auction/wizard/auction_lots_cancel.py
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -53,4 +53,5 @@ class auction_lots_cancel(osv.osv):
                 
         _columns = {
         }
-auction_lots_cancel()
\ No newline at end of file
+auction_lots_cancel()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
index 290664ba697..c4c8792f76a 100644
--- a/addons/auction/wizard/auction_lots_enable.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -41,3 +41,5 @@ class auction_lots_enable(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_enable()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_lots_invoice.py b/addons/auction/wizard/auction_lots_invoice.py
index 66bb5e42f2b..3994aa6ff91 100644
--- a/addons/auction/wizard/auction_lots_invoice.py
+++ b/addons/auction/wizard/auction_lots_invoice.py
@@ -49,9 +49,8 @@ class auction_lots_invoice(osv.osv_memory):
         if context is None: 
             context = {}
         res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
-        service = netsvc.LocalService("object_proxy")
-        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context.get('active_ids', []))
-        auction = service.execute(cr.dbname, uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
+        lots = self.pool.get('auction.lots').read(cr, uid, context.get('active_ids', []))
+        auction = self.pool.get('auction.dates').read(cr, uid, [lots[0]['auction_id'][0]])[0]
 
         price = 0.0
         price_topay = 0.0
@@ -59,7 +58,7 @@ class auction_lots_invoice(osv.osv_memory):
         for lot in lots:
             price_lot = lot['obj_price'] or 0.0
 
-            costs = service.execute(cr.dbname, uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
+            costs = self.pool.get('auction.lots').compute_buyer_costs(cr, uid, [lot['id']])
             price_lot += costs['amount']
             price += price_lot
 
@@ -68,7 +67,7 @@ class auction_lots_invoice(osv.osv_memory):
                     raise osv.except_osv(_('UserError'), _('Two different buyers for the same invoice !\nPlease correct this problem before invoicing'))
                 uid = lot['ach_uid'][0]
             elif lot['ach_login']:
-                refs = service.execute(uid, 'res.partner', 'search', [('ref','=',lot['ach_login'])])
+                refs = self.pool.get('res.partner').search(cr, uid, [('ref','=',lot['ach_login'])])
                 if len(refs):
                     uid = refs[-1]
             if 'ach_pay_id' in lot and lot['ach_pay_id']:
@@ -105,7 +104,6 @@ class auction_lots_invoice(osv.osv_memory):
         """
         if context is None: 
             context = {}
-        service = netsvc.LocalService("object_proxy")
         datas = {'ids' : context.get('active_ids',[])}
         res = self.read(cr, uid, ids, ['number','ach_uid'])
         res = res and res[0] or {}
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 3a87a202b74..19c39dc2c04 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -89,3 +89,5 @@ class auction_lots_make_invoice(osv.osv_memory):
         }
             
 auction_lots_make_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index dc39ccbb717..253a5b317ff 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -89,3 +89,5 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
             }
 
 auction_lots_make_invoice_buyer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index b914dd1c643..f73552aa69f 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -82,12 +82,15 @@ class auction_pay_buy(osv.osv_memory):
             lots = lot_obj.browse(cr, uid, context.get('active_ids', []), context=context)
             for lot in lots:
                 if datas['buyer_id']:
+                    if isinstance(datas['buyer_id'], (tuple, list)):
+                        datas['buyer_id'] = datas['buyer_id'][0]
                     lot_obj.write(cr, uid, [lot.id], {'ach_uid': datas['buyer_id']})
                 if not lot.auction_id:
                     raise osv.except_osv(_('Error!'), _('No auction date for "%s": Please set one.') % (lot.name))
                 lot_obj.write(cr, uid, [lot.id], {'is_ok':True})
-    
             for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]:
+                if isinstance(datas[st], tuple):
+                        datas[st] = datas[st][0]
                 if datas[st]:
                     new_id = bank_statement_line_obj.create(cr, uid, {
                         'name':'Buyer:'+ str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name, 
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 77484bbe988..42ea08e8094 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -55,3 +55,5 @@ class auction_pay_sel(osv.osv_memory):
             return {'type': 'ir.actions.act_window_close'}
 
 auction_pay_sel()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
index 8ada436ae5d..38ac6dca2fe 100644
--- a/addons/auction/wizard/auction_taken.py
+++ b/addons/auction/wizard/auction_taken.py
@@ -51,3 +51,5 @@ class auction_taken(osv.osv_memory):
               return {'lot_ids': []}
 
 auction_taken()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
index f593a36de2e..0e52199e566 100644
--- a/addons/auction/wizard/auction_transfer_unsold_object.py
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -84,4 +84,5 @@ class auction_transfer_unsold_object(osv.osv):
                                                                                                 'state':'draft'})
             return {'type': 'ir.actions.act_window_close'}    
         
-auction_transfer_unsold_object()
\ No newline at end of file
+auction_transfer_unsold_object()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 5bfd023ac39..7d2a5955ac0 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Audit Trail',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module lets administrator track every user operation on all the objects of the system.
 ===========================================================================================
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index bfa6bca8f34..302d6e146bd 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -43,22 +43,17 @@ class audittrail_rule(osv.osv):
         "log_create": fields.boolean("Log Creates",help="Select this if you want to keep track of creation on any record of the object of this rule"),
         "log_action": fields.boolean("Log Action",help="Select this if you want to keep track of actions on the object of this rule"),
         "log_workflow": fields.boolean("Log Workflow",help="Select this if you want to keep track of workflow on any record of the object of this rule"),
-        "state": fields.selection((("draft", "Draft"),
-                                   ("subscribed", "Subscribed")),
-                                   "State", required=True),
+        "state": fields.selection((("draft", "Draft"), ("subscribed", "Subscribed")), "State", required=True),
         "action_id": fields.many2one('ir.actions.act_window', "Action ID"),
-
     }
-
     _defaults = {
-        'state': lambda *a: 'draft',
-        'log_create': lambda *a: 1,
-        'log_unlink': lambda *a: 1,
-        'log_write': lambda *a: 1,
+        'state': 'draft',
+        'log_create': 1,
+        'log_unlink': 1,
+        'log_write': 1,
     }
-
     _sql_constraints = [
-        ('model_uniq', 'unique (object_id)', """There is a rule defined on this object\n You can not define other on the same!""")
+        ('model_uniq', 'unique (object_id)', """There is already a rule defined on this object\n You cannot define another: please edit the existing one.""")
     ]
     __functions = {}
 
@@ -123,9 +118,6 @@ class audittrail_rule(osv.osv):
         #End Loop
         return True
 
-audittrail_rule()
-
-
 class audittrail_log(osv.osv):
     """
     For Audittrail Log
@@ -161,9 +153,6 @@ class audittrail_log(osv.osv):
     }
     _order = "timestamp desc"
 
-audittrail_log()
-
-
 class audittrail_log_line(osv.osv):
     """
     Audittrail Log Line.
@@ -181,60 +170,36 @@ class audittrail_log_line(osv.osv):
           'field_description': fields.char('Field Description', size=64),
         }
 
-audittrail_log_line()
-
-
 class audittrail_objects_proxy(object_proxy):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
 
-    def get_value_text(self, cr, uid, field_name, values, model, context=None):
+    def get_value_text(self, cr, uid, pool, resource_pool, method, field, value):
+        """
+        Gets textual values for the fields.
+            If the field is a many2one, it returns the name.
+            If it's a one2many or a many2many, it returns a list of name.
+            In other cases, it just returns the value.
+        :param cr: the current row, from the database cursor,
+        :param uid: the current user’s ID for security checks,
+        :param pool: current db's pooler object.
+        :param resource_pool: pooler object of the model which values are being changed.
+        :param field: for which the text value is to be returned.
+        :param value: value of the field.
+        :param recursive: True or False, True will repeat the process recursively
+        :return: string value or a list of values(for O2M/M2M)
         """
-        Gets textual values for the fields
-        e.g.: For field of type many2one it gives its name value instead of id
 
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param field_name: List of fields for text values
-        @param values: Values for field to be converted into textual values
-        @return: values: List of textual values for given fields
-        """
-        if not context:
-            context = {}
-        if field_name in('__last_update','id'):
-            return values
-        pool = pooler.get_pool(cr.dbname)
-        field_pool = pool.get('ir.model.fields')
-        model_pool = pool.get('ir.model')
-        obj_pool = pool.get(model.model)
-        if obj_pool._inherits:
-            inherits_ids = model_pool.search(cr, uid, [('model', '=', obj_pool._inherits.keys()[0])])
-            field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', 'in', (model.id, inherits_ids[0]))])
+        field_obj = (resource_pool._all_columns.get(field)).column
+        if field_obj._type in ('one2many','many2many'):
+            data = pool.get(field_obj._obj).name_get(cr, uid, value)
+            #return the modifications on x2many fields as a list of names
+            res = map(lambda x:x[1], data)
+        elif field_obj._type == 'many2one':
+            #return the modifications on a many2one field as its value returned by name_get()
+            res = value and value[1] or value
         else:
-            field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', '=', model.id)])
-        field_id = field_ids and field_ids[0] or False
-        assert field_id, _("'%s' field does not exist in '%s' model" %(field_name, model.model))
-
-        field = field_pool.read(cr, uid, field_id)
-        relation_model = field['relation']
-        relation_model_pool = relation_model and pool.get(relation_model) or False
-
-        if field['ttype'] == 'many2one':
-            res = False
-            relation_id = False
-            if values and type(values) == tuple:
-                relation_id = values[0]
-                if relation_id and relation_model_pool:
-                    relation_model_object = relation_model_pool.read(cr, uid, relation_id, [relation_model_pool._rec_name])
-                    res = relation_model_object[relation_model_pool._rec_name]
-            return res
-
-        elif field['ttype'] in ('many2many','one2many'):
-            res = []
-            for relation_model_object in relation_model_pool.read(cr, uid, values, [relation_model_pool._rec_name]):
-                res.append(relation_model_object[relation_model_pool._rec_name])
-            return res
-
-        return values
+            res = value
+        return res
 
     def create_log_line(self, cr, uid, log_id, model, lines=[]):
         """
@@ -242,7 +207,7 @@ class audittrail_objects_proxy(object_proxy):
 
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param model: Object who's values are being changed
+        @param model: Object which values are being changed
         @param lines: List of values for line is to be created
         """
         pool = pooler.get_pool(cr.dbname)
@@ -250,314 +215,290 @@ class audittrail_objects_proxy(object_proxy):
         model_pool = pool.get('ir.model')
         field_pool = pool.get('ir.model.fields')
         log_line_pool = pool.get('audittrail.log.line')
-        #start Loop
         for line in lines:
-            if line['name'] in('__last_update','id'):
-                continue
+            field_obj = obj_pool._all_columns.get(line['name'])
+            assert field_obj, _("'%s' field does not exist in '%s' model" %(line['name'], model.model))
+            field_obj = field_obj.column
+            old_value = line.get('old_value', '')
+            new_value = line.get('new_value', '')
+            search_models = [model.id]
             if obj_pool._inherits:
-                inherits_ids = model_pool.search(cr, uid, [('model', '=', obj_pool._inherits.keys()[0])])
-                field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (model.id, inherits_ids[0]))])
-            else:
-                field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', '=', model.id)])
-            field_id = field_ids and field_ids[0] or False
-            assert field_id, _("'%s' field does not exist in '%s' model" %(line['name'], model.model))
-
-            field = field_pool.read(cr, uid, field_id)
-            old_value = 'old_value' in line and  line['old_value'] or ''
-            new_value = 'new_value' in line and  line['new_value'] or ''
-            old_value_text = 'old_value_text' in line and  line['old_value_text'] or ''
-            new_value_text = 'new_value_text' in line and  line['new_value_text'] or ''
-
-            if old_value_text == new_value_text:
-                continue
-            if field['ttype'] == 'many2one':
-                if type(old_value) == tuple:
-                    old_value = old_value[0]
-                if type(new_value) == tuple:
-                    new_value = new_value[0]
+                search_models += model_pool.search(cr, uid, [('model', 'in', obj_pool._inherits.keys())])
+            field_id = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', search_models)])
+            if field_obj._type == 'many2one':
+                old_value = old_value and old_value[0] or old_value
+                new_value = new_value and new_value[0] or new_value
             vals = {
                     "log_id": log_id,
-                    "field_id": field_id,
+                    "field_id": field_id and field_id[0] or False,
                     "old_value": old_value,
                     "new_value": new_value,
-                    "old_value_text": old_value_text,
-                    "new_value_text": new_value_text,
-                    "field_description": field['field_description']
+                    "old_value_text": line.get('old_value_text', ''),
+                    "new_value_text": line.get('new_value_text', ''),
+                    "field_description": field_obj.string
                     }
             line_id = log_line_pool.create(cr, uid, vals)
-            cr.commit()
-        #End Loop
         return True
 
-
-    def log_fct(self, db, uid, model, method, fct_src, *args):
+    def log_fct(self, cr, uid_orig, model, method, fct_src, *args):
         """
-        Logging function: This function is performs logging oprations according to method
-        @param db: the current database
-        @param uid: the current user’s ID for security checks,
-        @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink
+        Logging function: This function is performing the logging operation
+        @param model: Object whose values are being changed
+        @param method: method to log: create, read, write, unlink, action or workflow action
         @param fct_src: execute method of Object proxy
 
         @return: Returns result as per method of Object proxy
         """
-        uid_orig = uid
-        uid = 1
-        res2 = args
-        pool = pooler.get_pool(db)
-        cr = pooler.get_db(db).cursor()
+        pool = pooler.get_pool(cr.dbname)
         resource_pool = pool.get(model)
-        log_pool = pool.get('audittrail.log')
         model_pool = pool.get('ir.model')
-
-        model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+        model_ids = model_pool.search(cr, 1, [('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, uid, model_id)
+        model = model_pool.browse(cr, 1, model_id)
 
-        if method in ('create'):
-            res_id = fct_src(db, uid_orig, model.model, method, *args)
-            cr.commit()
-            resource = resource_pool.read(cr, uid, res_id, args[0].keys())
-            vals = {
-                    "method": method,
-                    "object_id": model.id,
-                    "user_id": uid_orig,
-                    "res_id": resource['id'],
-            }
-            if 'id' in resource:
-                del resource['id']
-            log_id = log_pool.create(cr, uid, vals)
-            lines = []
-            for field in resource:
-                line = {
-                      'name': field,
-                      'new_value': resource[field],
-                      'new_value_text': self.get_value_text(cr, uid, field, resource[field], model)
-                      }
-                lines.append(line)
-            self.create_log_line(cr, uid, log_id, model, lines)
+        # fields to log. currently only used by log on read()
+        field_list = []
+        old_values = new_values = {}
 
-            cr.commit()
-            cr.close()
-            return res_id
-
-        elif method in ('read'):
-            res_ids = args[0]
-            old_values = {}
-            res = fct_src(db, uid_orig, model.model, method, *args)
-            if type(res) == list:
-                for v in res:
-                    old_values[v['id']] = v
-            else:
-                old_values[res['id']] = res
-            for res_id in old_values:
-                vals = {
-                    "method": method,
-                    "object_id": model.id,
-                    "user_id": uid_orig,
-                    "res_id": res_id,
-
-                }
-                log_id = log_pool.create(cr, uid, vals)
-                lines = []
-                for field in old_values[res_id]:
-                    line = {
-                              'name': field,
-                              'old_value': old_values[res_id][field],
-                              'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model)
-                              }
-                    lines.append(line)
-
-                self.create_log_line(cr, uid, log_id, model, lines)
-            cr.commit()
-            cr.close()
-            return res
-
-        elif method in ('unlink'):
-            res_ids = args[0]
-            old_values = {}
-            for res_id in res_ids:
-                old_values[res_id] = resource_pool.read(cr, uid, res_id)
-
-            for res_id in res_ids:
-                vals = {
-                    "method": method,
-                    "object_id": model.id,
-                    "user_id": uid_orig,
-                    "res_id": res_id,
-
-                }
-                log_id = log_pool.create(cr, uid, vals)
-                lines = []
-                for field in old_values[res_id]:
-                    if field in ('id'):
-                        continue
-                    line = {
-                          'name': field,
-                          'old_value': old_values[res_id][field],
-                          'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model)
-                          }
-                    lines.append(line)
-
-                self.create_log_line(cr, uid, log_id, model, lines)
-            res = fct_src(db, uid_orig, model.model, method, *args)
-            cr.commit()
-            cr.close()
-            return res
-        else:
+        if method == 'create':
+            res = fct_src(cr, uid_orig, model.model, method, *args)
+            if res:
+                res_ids = [res]
+                new_values = self.get_data(cr, uid_orig, pool, res_ids, model, method)
+        elif method == 'read':
+            res = fct_src(cr, uid_orig, model.model, method, *args)
+            # build the res_ids and the old_values dict. Here we don't use get_data() to
+            # avoid performing an additional read()
+            res_ids = []
+            for record in res:
+                res_ids.append(record['id'])
+                old_values[(model.id, record['id'])] = {'value': record, 'text': record}
+            # log only the fields read
+            field_list = args[1]
+        elif method == 'unlink':
+            res_ids = args[0]
+            old_values = self.get_data(cr, uid_orig, pool, res_ids, model, method)
+            res = fct_src(cr, uid_orig, model.model, method, *args)
+        else: # method is write, action or workflow action
             res_ids = []
-            res = True
             if args:
                 res_ids = args[0]
-                old_values = {}
-                fields = []
-                if len(args)>1 and type(args[1]) == dict:
-                    fields = args[1].keys()
-                if type(res_ids) in (long, int):
+                if isinstance(res_ids, (long, int)):
                     res_ids = [res_ids]
             if res_ids:
-                for resource in resource_pool.read(cr, uid, res_ids):
-                    resource_id = resource['id']
-                    if 'id' in resource:
-                        del resource['id']
-                    old_values_text = {}
-                    old_value = {}
-                    for field in resource.keys():
-                        old_value[field] = resource[field]
-                        old_values_text[field] = self.get_value_text(cr, uid, field, resource[field], model)
-                    old_values[resource_id] = {'text':old_values_text, 'value': old_value}
-
-            res = fct_src(db, uid_orig, model.model, method, *args)
-            cr.commit()
-
+                # store the old values into a dictionary
+                old_values = self.get_data(cr, uid_orig, pool, res_ids, model, method)
+            # process the original function, workflow trigger...
+            res = fct_src(cr, uid_orig, model.model, method, *args)
+            if method == 'copy':
+                res_ids = [res]
             if res_ids:
-                for resource in resource_pool.read(cr, uid, res_ids):
-                    resource_id = resource['id']
-                    if 'id' in resource:
-                        del resource['id']
-                    vals = {
-                        "method": method,
-                        "object_id": model.id,
-                        "user_id": uid_orig,
-                        "res_id": resource_id,
-                    }
+                # check the new values and store them into a dictionary
+                new_values = self.get_data(cr, uid_orig, pool, res_ids, model, method)
+        # compare the old and new values and create audittrail log if needed
+        self.process_data(cr, uid_orig, pool, res_ids, model, method, old_values, new_values, field_list)
+        return res
 
+    def get_data(self, cr, uid, pool, res_ids, model, method):
+        """
+        This function simply read all the fields of the given res_ids, and also recurisvely on
+        all records of a x2m fields read that need to be logged. Then it returns the result in
+        convenient structure that will be used as comparison basis.
 
-                    log_id = log_pool.create(cr, uid, vals)
-                    lines = []
-                    for field in resource.keys():
-                        line = {
-                              'name': field,
-                              'new_value': resource[field],
-                              'old_value': old_values[resource_id]['value'][field],
-                              'new_value_text': self.get_value_text(cr, uid, field, resource[field], model),
-                              'old_value_text': old_values[resource_id]['text'][field]
-                              }
-                        lines.append(line)
+            :param cr: the current row, from the database cursor,
+            :param uid: the current user’s ID. This parameter is currently not used as every
+                operation to get data is made as super admin. Though, it could be usefull later.
+            :param pool: current db's pooler object.
+            :param res_ids: Id's of resource to be logged/compared.
+            :param model: Object whose values are being changed
+            :param method: method to log: create, read, unlink, write, actions, workflow actions
+            :return: dict mapping a tuple (model_id, resource_id) with its value and textual value
+                { (model_id, resource_id): { 'value': ...
+                                             'textual_value': ...
+                                           },
+                }
+        """
+        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):
+            values = {}
+            values_text = {}
+            resource_id = resource['id']
+            # loop on each field on the res_ids we just have read
+            for field in resource:
+                if field in ('__last_update', 'id'):
+                    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])
 
-                    self.create_log_line(cr, uid, log_id, model, lines)
-                cr.commit()
-            cr.close()
-            return res
+                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):
+                        # 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_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))
+            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=[]):
+        """
+        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.
+
+        :param cr: the current row, from the database cursor,
+        :param uid: the current user’s ID. This parameter is currently not used as every
+            operation to get data is made as super admin. Though, it could be usefull later.
+        :param pool: current db's pooler object.
+        :param model: model object which values are being changed
+        :param resource_id: ID of record to which values are being changed
+        :param method: method to log: create, read, unlink, write, actions, workflow actions
+        :param old_values: dict of values read before execution of the method
+        :param new_values: dict of values read after execution of the method
+        :param field_list: optional argument containing the list of fields to log. Currently only
+            used when performing a read, it could be usefull later on if we want to log the write
+            on specific fields only.
+
+        :return: dictionary with
+            * keys: tuples build as ID of model object to log and ID of resource to log
+            * values: list of all the changes in field values for this couple (model, resource)
+              return {
+                (model.id, resource_id): []
+              }
+
+        The reason why the structure returned is build as above is because when modifying an existing 
+        record (res.partner, for example), we may have to log a change done in a x2many field (on 
+        res.partner.address, for example)
+        """
+        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 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):
+                    # 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_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)
+                    # 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))
+                    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))
+            # 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 = {
+                      'name': field_name,
+                      'new_value': key in new_values and new_values[key]['value'].get(field_name),
+                      'old_value': key in old_values and old_values[key]['value'].get(field_name),
+                      'new_value_text': key in new_values and new_values[key]['text'].get(field_name),
+                      'old_value_text': key in old_values and old_values[key]['text'].get(field_name)
+                }
+                lines[key].append(data)
+        return lines
+
+    def process_data(self, cr, uid, pool, res_ids, model, method, old_values={}, new_values={}, field_list=[]):
+        """
+        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
+        accordingly.
+
+        :param cr: the current row, from the database cursor,
+        :param uid: the current user’s ID,
+        :param pool: current db's pooler object.
+        :param res_ids: Id's of resource to be logged/compared.
+        :param model: model object which values are being changed
+        :param method: method to log: create, read, unlink, write, actions, workflow actions
+        :param old_values: dict of values read before execution of the method
+        :param new_values: dict of values read after execution of the method
+        :param field_list: optional argument containing the list of fields to log. Currently only
+            used when performing a read, it could be usefull later on if we want to log the write
+            on specific fields only.
+        :return: True
+        """
+        # loop on all the given ids
+        for res_id in res_ids:
+            # compare old and new values and get audittrail log lines accordingly
+            lines = self.prepare_audittrail_log_line(cr, uid, pool, model, res_id, method, old_values, new_values, field_list)
+
+            # if at least one modification has been found
+            for model_id, resource_id in lines:
+                vals = {
+                    'method': method,
+                    'object_id': model_id,
+                    'user_id': uid,
+                    'res_id': resource_id,
+                }
+                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'
+                    # (because it could also come with the value 'write' if we are creating
+                    #  new record through a one2many field)
+                    vals.update({'method': 'create'})
+                if (model_id, resource_id) not in new_values and method not in ('copy', 'read'):
+                    # the resource is not existing anymore so we are forcing the method to 'unlink'
+                    # (because it could also come with the value 'write' if we are deleting the
+                    #  record through a one2many field)
+                    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)
+                    model = pool.get('ir.model').browse(cr, uid, model_id)
+                    self.create_log_line(cr, 1, log_id, model, lines[(model_id, resource_id)])
         return True
 
-
-
-    def execute(self, db, uid, model, method, *args, **kw):
+    def check_rules(self, cr, uid, model, method):
         """
-        Overrides Object Proxy execute method
-        @param db: the current database
-        @param uid: the current user's ID for security checks,
-        @param object: Object who's values are being changed
-        @param method: get any method and create log
-
-        @return: Returns result as per method of Object proxy
+        Checks if auditrails is installed for that db and then if one rule match
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID,
+        @param model: value of _name of the object which values are being changed
+        @param method: method to log: create, read, unlink,write,actions,workflow actions
+        @return: True or False
         """
-        uid_orig = uid
-        uid = 1
-        pool = pooler.get_pool(db)
-        model_pool = pool.get('ir.model')
-        rule_pool = pool.get('audittrail.rule')
-        cr = pooler.get_db(db).cursor()
-        cr.autocommit(True)
-        logged_uids = []
-        fct_src = super(audittrail_objects_proxy, self).execute
-
-        def my_fct(db, uid, model, method, *args):
-            rule = False
-            model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+        pool = pooler.get_pool(cr.dbname)
+        if 'audittrail.rule' in pool.models:
+            model_ids = pool.get('ir.model').search(cr, 1, [('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']):
+                    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'):
+                            if rule['log_action']:
+                                return True
 
-            for model_name in pool.obj_list():
-                if model_name == 'audittrail.rule':
-                    rule = True
-            if not rule:
-                return fct_src(db, uid_orig, model, method, *args)
-            if not model_id:
-                return fct_src(db, uid_orig, model, method, *args)
+    def execute_cr(self, cr, uid, model, method, *args, **kw):
+        fct_src = super(audittrail_objects_proxy, self).execute_cr
+        if self.check_rules(cr,uid,model,method):
+            return self.log_fct(cr, uid, model, method, fct_src, *args)
+        return fct_src(cr, uid, model, method, *args)
 
-            rule_ids = rule_pool.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
-            if not rule_ids:
-                return fct_src(db, uid_orig, model, method, *args)
-
-            for thisrule in rule_pool.browse(cr, uid, rule_ids):
-                for user in thisrule.user_id:
-                    logged_uids.append(user.id)
-                if not logged_uids or uid in logged_uids:
-                    if method in ('read', 'write', 'create', 'unlink'):
-                        if getattr(thisrule, 'log_' + method):
-                            return self.log_fct(db, uid_orig, model, method, fct_src, *args)
-
-                    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'):
-                        if thisrule.log_action:
-                            return self.log_fct(db, uid_orig, model, method, fct_src, *args)
-
-                return fct_src(db, uid_orig, model, method, *args)
-        try:
-            res = my_fct(db, uid, model, method, *args)
-            return res
-        finally:
-            cr.close()
-
-    def exec_workflow(self, db, uid, model, method, *args, **argv):
-        uid_orig = uid
-        uid = 1
-
-        pool = pooler.get_pool(db)
-        logged_uids = []
-        fct_src = super(audittrail_objects_proxy, self).exec_workflow
-        field = method
-        rule = False
-        model_pool = pool.get('ir.model')
-        rule_pool = pool.get('audittrail.rule')
-        cr = pooler.get_db(db).cursor()
-        cr.autocommit(True)
-        try:
-            model_ids = model_pool.search(cr, uid, [('model', '=', model)])
-            for obj_name in pool.obj_list():
-                if obj_name == 'audittrail.rule':
-                    rule = True
-            if not rule:
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
-            if not model_ids:
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
-
-            rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')])
-            if not rule_ids:
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
-
-            for thisrule in rule_pool.browse(cr, uid, rule_ids):
-                for user in thisrule.user_id:
-                    logged_uids.append(user.id)
-                if not logged_uids or uid in logged_uids:
-                    if thisrule.log_workflow:
-                        return self.log_fct(db, uid_orig, model, method, fct_src, *args)
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
-
-            return True
-        finally:
-            cr.close()
+    def exec_workflow_cr(self, cr, uid, model, method, *args, **argv):
+        fct_src = super(audittrail_objects_proxy, self).exec_workflow_cr
+        if self.check_rules(cr,uid,model,'workflow'):
+            return self.log_fct(cr, uid, model, method, fct_src, *args)
+        return fct_src(cr, uid, model, method, *args)
 
 audittrail_objects_proxy()
 
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 6f6b461d1a6..debe4d54c1a 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -37,7 +37,7 @@
             <field name="model">audittrail.rule</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('subscribed')" string="AuditTrail Rules">
+                <tree colors="blue:state == 'draft';black:state == 'subscribed'" string="AuditTrail Rules">
                     <field name="name" />
                     <field name="object_id"/>
                     <field name="log_read" />
@@ -56,7 +56,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                   <group col="8" colspan="4">
+                   <group>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
                     <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
                     <separator orientation="vertical"/>
@@ -64,7 +64,7 @@
                     <field name="object_id"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                  <group expand="0" string="Group By..." groups="base.group_extended">
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                 </group>
                 </search>
@@ -158,13 +158,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                 <group col="8" colspan="4">
+                 <group>
                     <field name="name"/>
                     <field name="object_id"/>
                     <field name="user_id"  widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                  <group expand="0" string="Group By..." groups="base.group_extended">
                     <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
    					<separator orientation="vertical"/>                    
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
diff --git a/addons/audittrail/i18n/ar.po b/addons/audittrail/i18n/ar.po
index 6e5f07bee6b..7f3e72b67be 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/bg.po b/addons/audittrail/i18n/bg.po
index 14f8aaf63b3..14524f2412e 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/bs.po b/addons/audittrail/i18n/bs.po
index 9fff5a7a21c..8793ee3a4a8 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/ca.po b/addons/audittrail/i18n/ca.po
index e47f41e3388..a789e519832 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -26,7 +26,7 @@ msgstr "Auditoria"
 #: code:addons/audittrail/audittrail.py:81
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "Avís: Auditoria no forma part del pool"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
@@ -42,7 +42,7 @@ msgstr "Subscrit"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "Regla d'auditoria"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -55,7 +55,7 @@ msgstr "Audita registres"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -66,7 +66,7 @@ msgstr "Estat"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subscriviu-vos"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -90,6 +90,8 @@ msgid ""
 "Select this if you want to keep track of read/open on any record of the "
 "object of this rule"
 msgstr ""
+"Seleccioneu aquesta opció si desitgeu realitzar el seguiment de la "
+"lectura/obertura de qualsevol registre de l'objecte d'aquesta regla."
 
 #. module: audittrail
 #: field:audittrail.log,method:0
@@ -114,7 +116,7 @@ msgstr "Id recurs"
 #. module: audittrail
 #: help:audittrail.rule,user_id:0
 msgid "if  User is not added then it will applicable for all users"
-msgstr ""
+msgstr "Si no s'afegeix usuari llavors s'aplicarà a tots els usuaris."
 
 #. module: audittrail
 #: help:audittrail.rule,log_workflow:0
@@ -122,6 +124,8 @@ msgid ""
 "Select this if you want to keep track of workflow on any record of the "
 "object of this rule"
 msgstr ""
+"Seleccioneu aquesta opció si desitgeu realitzar el seguiment del flux de "
+"treball de qualsevol registre de l'objecte d'aquesta regla."
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
@@ -158,13 +162,13 @@ msgstr "Text valor nou: "
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "Cerca regla d'auditoria"
 
 #. 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 "Regles d'auditoria"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -174,7 +178,7 @@ msgstr "Valor anterior : "
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Nom del recurs"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -188,16 +192,18 @@ msgid ""
 "Select this if you want to keep track of modification on any record of the "
 "object of this rule"
 msgstr ""
+"Seleccioneu aquesta opció si desitgeu realitzar el seguiment de la "
+"modificació de qualsevol registre de l'objecte d'aquesta regla."
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log Creates"
-msgstr ""
+msgstr "Registres de creació"
 
 #. module: audittrail
 #: help:audittrail.rule,object_id:0
 msgid "Select object for which you want to generate log."
-msgstr ""
+msgstr "Seleccioneu l'objecte sobre el qual voleu generar l'historial."
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -207,7 +213,7 @@ msgstr "Text valor anterior: "
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "Registres flux de treball"
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -221,11 +227,19 @@ msgid ""
 "    delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul permet a l'administrador realitzar\n"
+"    un seguiment de totes les operacions dels\n"
+"    usuaris de tots els objectes del sistema.\n"
+"\n"
+"    L'administrador pot definir regles per llegir, escriure\n"
+"    i eliminar objectes i comprovar els registres.\n"
+"    "
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "Registres de lectures"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:82
@@ -254,6 +268,8 @@ msgid ""
 "Select this if you want to keep track of deletion on any record of the "
 "object of this rule"
 msgstr ""
+"Seleccioneu aquesta opció si desitgeu realitzar el seguiment de l'eliminació "
+"de qualsevol registre de l'objecte d'aquesta regla."
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -264,12 +280,12 @@ msgstr "Usuari"
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "ID de l'acció"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Users (if User is not added then it will applicable for all users)"
-msgstr ""
+msgstr "Usuaris (si no s'afegeixen usuaris, s'aplicarà a tots els usuaris)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -279,7 +295,7 @@ msgstr "Des-subscriure"
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "Registres d'eliminacions"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -289,12 +305,12 @@ msgstr "Descripció camp"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Search Audittrail Log"
-msgstr ""
+msgstr "Cerca registre auditoria"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
-msgstr ""
+msgstr "Registres d'escriptures"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -324,13 +340,15 @@ msgstr "Registres auditoria"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "Audittrail Log"
-msgstr ""
+msgstr "Historial d'auditoria"
 
 #. 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 ""
+"Seleccioneu aquesta opció si desitgeu realitzar el seguiment de les accions "
+"de l'objecte d'aquesta regla."
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -343,6 +361,8 @@ msgid ""
 "There is a rule defined on this object\n"
 " You can not define other on the same!"
 msgstr ""
+"Existeix una regla definida en aquest objecte.\n"
+" No podeu definir una altra en el mateix objecte!"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
@@ -357,17 +377,17 @@ msgstr "Cancel·la"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_view_log
 msgid "View Log"
-msgstr ""
+msgstr "Visualitza el registre"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "Log Line"
-msgstr ""
+msgstr "Línia de registre"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
 msgid "Log Action"
-msgstr ""
+msgstr "Registres d'accions"
 
 #. module: audittrail
 #: help:audittrail.rule,log_create:0
@@ -375,6 +395,8 @@ msgid ""
 "Select this if you want to keep track of creation on any record of the "
 "object of this rule"
 msgstr ""
+"Seleccioneu aquesta opció si desitgeu realitzar el seguiment de la creació "
+"de qualsevol registre de l'objecte d'aquesta regla."
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/audittrail/i18n/cs.po b/addons/audittrail/i18n/cs.po
index 6e5f07bee6b..5330230f837 100644
--- a/addons/audittrail/i18n/cs.po
+++ b/addons/audittrail/i18n/cs.po
@@ -4,84 +4,85 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-06 06:48+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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Prověřovací záznam"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:81
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "VAROVÁNÍ: přověřovací záznam není částí fondu"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Záznam"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Upsaný"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "Pravidlo prověřovacího záznamu"
 
 #. 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 "Prověřovací záznamy"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Upsat se"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Koncept"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "Stará hodnota"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
-msgstr ""
+msgstr "Zobrazit záznam"
 
 #. module: audittrail
 #: help:audittrail.rule,log_read:0
@@ -93,22 +94,22 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "Metoda"
 
 #. module: audittrail
 #: field:audittrail.view.log,from:0
 msgid "Log From"
-msgstr ""
+msgstr "Záznam formulářů"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "ID záznamu"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "ID zdroje"
 
 #. module: audittrail
 #: help:audittrail.rule,user_id:0
@@ -125,61 +126,61 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "Řádky záznamu"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Pravidlo prověřovacích záznamů"
 
 #. module: audittrail
 #: field:audittrail.view.log,to:0
 msgid "Log To"
-msgstr ""
+msgstr "Zaznamenat do"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "Nová textová hodnota: "
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "Hledat pravidlo prověřovacích záznamů"
 
 #. 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 "Pravidla ověření"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "Stará hodnota : "
 
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Název zdroje"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: audittrail
 #: help:audittrail.rule,log_write:0
@@ -187,26 +188,28 @@ msgid ""
 "Select this if you want to keep track of modification on any record of the "
 "object of this rule"
 msgstr ""
+"Vyberte toto, pokud chcete udržovat sled úprav na jakémkoliv záznamu objektu "
+"tohoto pravidla"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log Creates"
-msgstr ""
+msgstr "Záznam vytvoření"
 
 #. module: audittrail
 #: help:audittrail.rule,object_id:0
 msgid "Select object for which you want to generate log."
-msgstr ""
+msgstr "Vyberte objekt, pro který chcete generovat záznam."
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "Stará textová hodnota : "
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "Záznam Pracovních postupů"
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -220,11 +223,19 @@ msgid ""
 "    delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"    Tento modul dává správcům práva\n"
+"    ke sledování každé uživatelské operace na všech objektech\n"
+"    systému.\n"
+"\n"
+"    Správce může zapsat pravidla pro čtení, zápis a \n"
+"    mazání nad objekty a může kontrolovat záznamy.\n"
+"    "
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "Záznam čtení"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:82
@@ -235,17 +246,17 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "Řádky záznamu"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "Pole"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "Pravidla prověřovacícho záznamu"
 
 #. module: audittrail
 #: help:audittrail.rule,log_unlink:0
@@ -253,88 +264,93 @@ msgid ""
 "Select this if you want to keep track of deletion on any record of the "
 "object of this rule"
 msgstr ""
+"Vyberte toto, pokud chcete udržovat přehled o mazání jakéhokoliv záznamu "
+"objektu tohoto pravidla"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Uživatel"
 
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "ID akce"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Users (if User is not added then it will applicable for all users)"
 msgstr ""
+"Uživatelé (pokud není uživatel přidán, bude platné pro všechny uživatele)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "Zrušit úpis"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "Záznam mazání"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "Popis pole"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Search Audittrail Log"
-msgstr ""
+msgstr "Hledat záznam Prověřovacího záznamu"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
-msgstr ""
+msgstr "Záznam zápisů"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Open Logs"
-msgstr ""
+msgstr "Tevřít záznamy"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "Nová textová hodnota"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Název pravidla"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "Nová hodnota"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "Záznamy Prověřovacícho záznamu"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "Audittrail Log"
-msgstr ""
+msgstr "Záznam Prověřovacího záznamu"
 
 #. 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 ""
+"Vyberte toto, pokud chcete udržovat přehled o akcích nad objekty tohoto "
+"pravidla"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "Nová hodnota : "
 
 #. module: audittrail
 #: sql_constraint:audittrail.rule:0
@@ -342,31 +358,33 @@ msgid ""
 "There is a rule defined on this object\n"
 " You can not define other on the same!"
 msgstr ""
+"Je zadáno pravidlo nad tímto objektem\n"
+" Na stejném nemůžete zadávat jiné!"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "Stará textová hodnota"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_view_log
 msgid "View Log"
-msgstr ""
+msgstr "Zobrazit záznam"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "Log Line"
-msgstr ""
+msgstr "Řádek záznamu"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
 msgid "Log Action"
-msgstr ""
+msgstr "Akce záznamu"
 
 #. module: audittrail
 #: help:audittrail.rule,log_create:0
@@ -374,3 +392,5 @@ msgid ""
 "Select this if you want to keep track of creation on any record of the "
 "object of this rule"
 msgstr ""
+"Vyberte toto, pokud chcete udržovat přehled o vytváření nad tímto záznamem "
+"objektu tohoto pravidla"
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index fad110f408d..811cdaea28c 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -476,15 +476,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index bc91f48eede..854f5b4013e 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index d21546d498d..8d40b0eaeb9 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -482,15 +482,3 @@ msgstr ""
 #, python-format
 #~ msgid "WARNING:audittrail is not part of the pool"
 #~ msgstr "AVISO: El rastro de auditoría no es parte del banco de recursos"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/audittrail/i18n/es_AR.po b/addons/audittrail/i18n/es_AR.po
index e1f20fd54b7..2440d0507b2 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/es_EC.po b/addons/audittrail/i18n/es_EC.po
index c39db37e419..be5030b86b5 100644
--- a/addons/audittrail/i18n/es_EC.po
+++ b/addons/audittrail/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/es_MX.po b/addons/audittrail/i18n/es_MX.po
new file mode 100644
index 00000000000..db28133ff1f
--- /dev/null
+++ b/addons/audittrail/i18n/es_MX.po
@@ -0,0 +1,484 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* audittrail
+#
+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-27 09:26+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:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: audittrail
+#: model:ir.module.module,shortdesc:audittrail.module_meta_information
+msgid "Audit Trail"
+msgstr "Rastro de Auditoría"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:81
+#, python-format
+msgid "WARNING: audittrail is not part of the pool"
+msgstr "Aviso: Auditoría no forma parte del pool"
+
+#. module: audittrail
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Registro"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Subscribed"
+msgstr "Suscrito"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "Audittrail Rule"
+msgstr "Regla de auditoría"
+
+#. 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 "Auditar registros"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: view:audittrail.rule:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: field:audittrail.rule,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "_Subscribe"
+msgstr "_Suscribir"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value:0
+msgid "Old Value"
+msgstr "Valor anterior"
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
+msgid "View log"
+msgstr "Ver registro"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la "
+"lectura/apertura de cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: field:audittrail.log,method:0
+msgid "Method"
+msgstr "Método"
+
+#. module: audittrail
+#: field:audittrail.view.log,from:0
+msgid "Log From"
+msgstr "Registrar desde"
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr "ID registro"
+
+#. module: audittrail
+#: field:audittrail.log,res_id:0
+msgid "Resource Id"
+msgstr "Id recurso"
+
+#. module: audittrail
+#: help:audittrail.rule,user_id:0
+msgid "if  User is not added then it will applicable for all users"
+msgstr "Si no se añade usuario entonces se aplicará a todos los usuarios."
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento del flujo de trabajo "
+"de cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Log Lines"
+msgstr "Líneas de registro"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,object_id:0
+#: field:audittrail.rule,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rule"
+msgstr "Regla auditoría"
+
+#. module: audittrail
+#: field:audittrail.view.log,to:0
+msgid "Log To"
+msgstr "Registrar hasta"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value Text: "
+msgstr "Texto valor nuevo: "
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Search Audittrail Rule"
+msgstr "Buscar regla auditoría"
+
+#. 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 "Reglas de auditoría"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr "Valor anterior : "
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Resource Name"
+msgstr "Nombre recurso"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,timestamp:0
+msgid "Date"
+msgstr "Fecha"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la modificación "
+"de cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log Creates"
+msgstr "Registros creación"
+
+#. module: audittrail
+#: help:audittrail.rule,object_id:0
+msgid "Select object for which you want to generate log."
+msgstr "Seleccione el objeto sobre el cuál quiere generar el historial."
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value Text : "
+msgstr "Texto valor anterior: "
+
+#. module: audittrail
+#: field:audittrail.rule,log_workflow:0
+msgid "Log Workflow"
+msgstr "Registros flujo de trabajo"
+
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid ""
+"\n"
+"    This module gives the administrator the rights\n"
+"    to track every user operation on all the objects\n"
+"    of the system.\n"
+"\n"
+"    Administrator can subscribe rules for read,write and\n"
+"    delete on objects and can check logs.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite al administrador realizar\n"
+"    un seguimiento de todas las operaciones de los\n"
+"    usuarios de todos los objetos del sistema.\n"
+"\n"
+"    El administrador puede definir reglas para leer, escribir\n"
+"    y eliminar objetos y comprobar los registros.\n"
+"    "
+
+#. module: audittrail
+#: field:audittrail.rule,log_read:0
+msgid "Log Reads"
+msgstr "Registros lecturas"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:82
+#, python-format
+msgid "Change audittrail depends -- Setting rule as DRAFT"
+msgstr ""
+"Cambiar dependencias de rastro de auditoría - Estableciendo regla como "
+"BORRADOR"
+
+#. module: audittrail
+#: field:audittrail.log,line_ids:0
+msgid "Log lines"
+msgstr "Líneas de registro"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_id:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
+msgstr "Reglas de auditoría"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la eliminación de "
+"cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: audittrail
+#: field:audittrail.rule,action_id:0
+msgid "Action ID"
+msgstr "ID acción"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Users (if User is not added then it will applicable for all users)"
+msgstr ""
+"Usuarios (si no se añaden usuarios entonces se aplicará para todos los "
+"usuarios)"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "UnSubscribe"
+msgstr "Des-suscribir"
+
+#. module: audittrail
+#: field:audittrail.rule,log_unlink:0
+msgid "Log Deletes"
+msgstr "Registros eliminaciones"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_description:0
+msgid "Field Description"
+msgstr "Descripción campo"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Search Audittrail Log"
+msgstr "Buscar registro auditoría"
+
+#. module: audittrail
+#: field:audittrail.rule,log_write:0
+msgid "Log Writes"
+msgstr "Registros escrituras"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Open Logs"
+msgstr "Abrir registros"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value_text:0
+msgid "New value Text"
+msgstr "Texto valor nuevo"
+
+#. module: audittrail
+#: field:audittrail.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value:0
+msgid "New Value"
+msgstr "Valor nuevo"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "AuditTrail Logs"
+msgstr "Registros auditoría"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "Audittrail Log"
+msgstr "Historial auditoría"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de las acciones del "
+"objeto de esta regla."
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value : "
+msgstr "Valor nuevo : "
+
+#. module: audittrail
+#: sql_constraint:audittrail.rule:0
+msgid ""
+"There is a rule defined on this object\n"
+" You can not define other on the same!"
+msgstr ""
+"Existe una regla definida en este objeto.\n"
+" ¡No puede definir otra en el mismo objeto!"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value_text:0
+msgid "Old value Text"
+msgstr "Texto valor anterior"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_view_log
+msgid "View Log"
+msgstr "Historial vista"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "Log Line"
+msgstr "Línea de registro"
+
+#. module: audittrail
+#: field:audittrail.rule,log_action:0
+msgid "Log Action"
+msgstr "Registros acciones"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la creación de "
+"cualquier registro del objeto de esta regla."
+
+#~ 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 "Create"
+#~ msgstr "Creación"
+
+#~ msgid "Write"
+#~ msgstr "Escritura"
+
+#~ msgid "Audittrails"
+#~ msgstr "Auditorías"
+
+#~ msgid "Subscribe"
+#~ msgstr "Suscribir"
+
+#~ msgid "Read"
+#~ msgstr "Lectura"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Subscribed Rules"
+#~ msgstr "Reglas suscritas"
+
+#~ msgid "Log writes"
+#~ msgstr "Registrar escrituras"
+
+#~ msgid "Delete"
+#~ msgstr "Borrado"
+
+#~ msgid "Log reads"
+#~ msgstr "Registrar lecturas"
+
+#~ msgid "Logs"
+#~ msgstr "Registros"
+
+#~ msgid "View Logs"
+#~ msgstr "Ver registros"
+
+#~ msgid "Log creates"
+#~ msgstr "Registrar creación"
+
+#~ msgid "Rules"
+#~ msgstr "Reglas"
+
+#~ msgid "Log deletes"
+#~ msgstr "Registrar borrados"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid ""
+#~ "Allows the administrator to track every user operations on all objects of "
+#~ "the system.\n"
+#~ "    Subscribe Rules for read, write, create and delete on objects and check "
+#~ "logs"
+#~ msgstr ""
+#~ "Permite al administrador realizar un seguimiento de todas las operaciones de "
+#~ "los usuarios de todos los objetos del sistema.\n"
+#~ "    Configurar reglas para leer, escribir, crear y eliminar objetos y "
+#~ "comprobar los registros"
+
+#~ msgid "audittrail.rule"
+#~ msgstr "auditoria.regla"
+
+#~ msgid "audittrail.log"
+#~ msgstr "auditoria.registro"
+
+#~ msgid "audittrail.log.line"
+#~ msgstr "auditoria.registro.linea"
+
+#~ 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 "WARNING:audittrail is not part of the pool"
+#~ msgstr "AVISO: El rastro de auditoría no es parte del banco de recursos"
diff --git a/addons/audittrail/i18n/es_PY.po b/addons/audittrail/i18n/es_PY.po
index 635dc70af83..a2eac7f520f 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/es_VE.po b/addons/audittrail/i18n/es_VE.po
new file mode 100644
index 00000000000..db28133ff1f
--- /dev/null
+++ b/addons/audittrail/i18n/es_VE.po
@@ -0,0 +1,484 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* audittrail
+#
+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-27 09:26+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:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: audittrail
+#: model:ir.module.module,shortdesc:audittrail.module_meta_information
+msgid "Audit Trail"
+msgstr "Rastro de Auditoría"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:81
+#, python-format
+msgid "WARNING: audittrail is not part of the pool"
+msgstr "Aviso: Auditoría no forma parte del pool"
+
+#. module: audittrail
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Registro"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Subscribed"
+msgstr "Suscrito"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "Audittrail Rule"
+msgstr "Regla de auditoría"
+
+#. 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 "Auditar registros"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: view:audittrail.rule:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: field:audittrail.rule,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "_Subscribe"
+msgstr "_Suscribir"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value:0
+msgid "Old Value"
+msgstr "Valor anterior"
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
+msgid "View log"
+msgstr "Ver registro"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la "
+"lectura/apertura de cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: field:audittrail.log,method:0
+msgid "Method"
+msgstr "Método"
+
+#. module: audittrail
+#: field:audittrail.view.log,from:0
+msgid "Log From"
+msgstr "Registrar desde"
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr "ID registro"
+
+#. module: audittrail
+#: field:audittrail.log,res_id:0
+msgid "Resource Id"
+msgstr "Id recurso"
+
+#. module: audittrail
+#: help:audittrail.rule,user_id:0
+msgid "if  User is not added then it will applicable for all users"
+msgstr "Si no se añade usuario entonces se aplicará a todos los usuarios."
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento del flujo de trabajo "
+"de cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Log Lines"
+msgstr "Líneas de registro"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,object_id:0
+#: field:audittrail.rule,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rule"
+msgstr "Regla auditoría"
+
+#. module: audittrail
+#: field:audittrail.view.log,to:0
+msgid "Log To"
+msgstr "Registrar hasta"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value Text: "
+msgstr "Texto valor nuevo: "
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Search Audittrail Rule"
+msgstr "Buscar regla auditoría"
+
+#. 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 "Reglas de auditoría"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr "Valor anterior : "
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Resource Name"
+msgstr "Nombre recurso"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,timestamp:0
+msgid "Date"
+msgstr "Fecha"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la modificación "
+"de cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log Creates"
+msgstr "Registros creación"
+
+#. module: audittrail
+#: help:audittrail.rule,object_id:0
+msgid "Select object for which you want to generate log."
+msgstr "Seleccione el objeto sobre el cuál quiere generar el historial."
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value Text : "
+msgstr "Texto valor anterior: "
+
+#. module: audittrail
+#: field:audittrail.rule,log_workflow:0
+msgid "Log Workflow"
+msgstr "Registros flujo de trabajo"
+
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid ""
+"\n"
+"    This module gives the administrator the rights\n"
+"    to track every user operation on all the objects\n"
+"    of the system.\n"
+"\n"
+"    Administrator can subscribe rules for read,write and\n"
+"    delete on objects and can check logs.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite al administrador realizar\n"
+"    un seguimiento de todas las operaciones de los\n"
+"    usuarios de todos los objetos del sistema.\n"
+"\n"
+"    El administrador puede definir reglas para leer, escribir\n"
+"    y eliminar objetos y comprobar los registros.\n"
+"    "
+
+#. module: audittrail
+#: field:audittrail.rule,log_read:0
+msgid "Log Reads"
+msgstr "Registros lecturas"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:82
+#, python-format
+msgid "Change audittrail depends -- Setting rule as DRAFT"
+msgstr ""
+"Cambiar dependencias de rastro de auditoría - Estableciendo regla como "
+"BORRADOR"
+
+#. module: audittrail
+#: field:audittrail.log,line_ids:0
+msgid "Log lines"
+msgstr "Líneas de registro"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_id:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
+msgstr "Reglas de auditoría"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la eliminación de "
+"cualquier registro del objeto de esta regla."
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: audittrail
+#: field:audittrail.rule,action_id:0
+msgid "Action ID"
+msgstr "ID acción"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Users (if User is not added then it will applicable for all users)"
+msgstr ""
+"Usuarios (si no se añaden usuarios entonces se aplicará para todos los "
+"usuarios)"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "UnSubscribe"
+msgstr "Des-suscribir"
+
+#. module: audittrail
+#: field:audittrail.rule,log_unlink:0
+msgid "Log Deletes"
+msgstr "Registros eliminaciones"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_description:0
+msgid "Field Description"
+msgstr "Descripción campo"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Search Audittrail Log"
+msgstr "Buscar registro auditoría"
+
+#. module: audittrail
+#: field:audittrail.rule,log_write:0
+msgid "Log Writes"
+msgstr "Registros escrituras"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Open Logs"
+msgstr "Abrir registros"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value_text:0
+msgid "New value Text"
+msgstr "Texto valor nuevo"
+
+#. module: audittrail
+#: field:audittrail.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value:0
+msgid "New Value"
+msgstr "Valor nuevo"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "AuditTrail Logs"
+msgstr "Registros auditoría"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "Audittrail Log"
+msgstr "Historial auditoría"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de las acciones del "
+"objeto de esta regla."
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value : "
+msgstr "Valor nuevo : "
+
+#. module: audittrail
+#: sql_constraint:audittrail.rule:0
+msgid ""
+"There is a rule defined on this object\n"
+" You can not define other on the same!"
+msgstr ""
+"Existe una regla definida en este objeto.\n"
+" ¡No puede definir otra en el mismo objeto!"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value_text:0
+msgid "Old value Text"
+msgstr "Texto valor anterior"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_view_log
+msgid "View Log"
+msgstr "Historial vista"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "Log Line"
+msgstr "Línea de registro"
+
+#. module: audittrail
+#: field:audittrail.rule,log_action:0
+msgid "Log Action"
+msgstr "Registros acciones"
+
+#. 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 ""
+"Seleccione esta opción si desea realizar el seguimiento de la creación de "
+"cualquier registro del objeto de esta regla."
+
+#~ 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 "Create"
+#~ msgstr "Creación"
+
+#~ msgid "Write"
+#~ msgstr "Escritura"
+
+#~ msgid "Audittrails"
+#~ msgstr "Auditorías"
+
+#~ msgid "Subscribe"
+#~ msgstr "Suscribir"
+
+#~ msgid "Read"
+#~ msgstr "Lectura"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Subscribed Rules"
+#~ msgstr "Reglas suscritas"
+
+#~ msgid "Log writes"
+#~ msgstr "Registrar escrituras"
+
+#~ msgid "Delete"
+#~ msgstr "Borrado"
+
+#~ msgid "Log reads"
+#~ msgstr "Registrar lecturas"
+
+#~ msgid "Logs"
+#~ msgstr "Registros"
+
+#~ msgid "View Logs"
+#~ msgstr "Ver registros"
+
+#~ msgid "Log creates"
+#~ msgstr "Registrar creación"
+
+#~ msgid "Rules"
+#~ msgstr "Reglas"
+
+#~ msgid "Log deletes"
+#~ msgstr "Registrar borrados"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid ""
+#~ "Allows the administrator to track every user operations on all objects of "
+#~ "the system.\n"
+#~ "    Subscribe Rules for read, write, create and delete on objects and check "
+#~ "logs"
+#~ msgstr ""
+#~ "Permite al administrador realizar un seguimiento de todas las operaciones de "
+#~ "los usuarios de todos los objetos del sistema.\n"
+#~ "    Configurar reglas para leer, escribir, crear y eliminar objetos y "
+#~ "comprobar los registros"
+
+#~ msgid "audittrail.rule"
+#~ msgstr "auditoria.regla"
+
+#~ msgid "audittrail.log"
+#~ msgstr "auditoria.registro"
+
+#~ msgid "audittrail.log.line"
+#~ msgstr "auditoria.registro.linea"
+
+#~ 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 "WARNING:audittrail is not part of the pool"
+#~ msgstr "AVISO: El rastro de auditoría no es parte del banco de recursos"
diff --git a/addons/audittrail/i18n/et.po b/addons/audittrail/i18n/et.po
index 7c44a49426d..2b6b499e4c7 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/fi.po b/addons/audittrail/i18n/fi.po
index 6d8e1952636..fef17c5afd7 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: 2011-07-28 04:33+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 4e362186a5a..f876d03ced7 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/gl.po b/addons/audittrail/i18n/gl.po
index 9fdeb22b5fc..fb5a2707047 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index e114dbb798f..ce60dcea9cc 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/hu.po b/addons/audittrail/i18n/hu.po
index cbd21e2d954..c983789e4e1 100644
--- a/addons/audittrail/i18n/hu.po
+++ b/addons/audittrail/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-31 12:50+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/id.po b/addons/audittrail/i18n/id.po
index a185d74120a..1167891e6d9 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 1ae7185a820..9f54e04da78 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/ko.po b/addons/audittrail/i18n/ko.po
index 87b852eeddf..0f3ad138af0 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 509e4870a24..7af473cec56 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/lv.po b/addons/audittrail/i18n/lv.po
index 176215e2795..5128b22ce98 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/mn.po b/addons/audittrail/i18n/mn.po
index 2ef793cf06e..00fbe28ac0f 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -451,6 +451,3 @@ msgstr ""
 
 #~ msgid "Subscribed Rules"
 #~ msgstr "Захиалсан дүрмүүд"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
diff --git a/addons/audittrail/i18n/nb.po b/addons/audittrail/i18n/nb.po
index 2f463771368..8e285538ef7 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -444,3 +444,9 @@ msgstr ""
 
 #~ msgid "Name"
 #~ msgstr "Navn"
+
+#~ msgid "Subscribe"
+#~ msgstr "Abonner"
+
+#~ msgid "View Logs"
+#~ msgstr "Vis logger"
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index bba74175ccd..6d10806294c 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -473,171 +473,3 @@ msgstr ""
 
 #~ msgid "View Logs"
 #~ msgstr "Bekijk logs"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#, python-format
-#~ msgid ""
-#~ "'%s' Model does not exist...\" %(model))\n"
-#~ "        model = model_pool.browse(cr, uid, model_id)\n"
-#~ "\n"
-#~ "        if method in ('create"
-#~ msgstr ""
-#~ "'%s' Model bestaat niet...\" %(model))\n"
-#~ "        model = model_pool.browse(cr, uid, model_id)\n"
-#~ "\n"
-#~ "        if method in ('create"
-
-#, python-format
-#~ msgid ""
-#~ "'%s' field does not exist in '%s' model\" %(field_name, model.model))\n"
-#~ "\n"
-#~ "        field = field_pool.read(cr, uid, field_id)\n"
-#~ "        relation_model = field['relation']\n"
-#~ "        relation_model_pool = relation_model and pool.get(relation_model) or "
-#~ "False\n"
-#~ "\n"
-#~ "        if field['ttype'] == 'many2one':\n"
-#~ "            res = False\n"
-#~ "            relation_id = False\n"
-#~ "            if values and type(values) == tuple:\n"
-#~ "                relation_id = values[0]\n"
-#~ "                if relation_id and relation_model_pool:\n"
-#~ "                    relation_model_object = relation_model_pool.read(cr, "
-#~ "uid, relation_id, [relation_model_pool._rec_name])\n"
-#~ "                    res = "
-#~ "relation_model_object[relation_model_pool._rec_name]\n"
-#~ "            return res\n"
-#~ "\n"
-#~ "        elif field['ttype'] in ('many2many','one2many"
-#~ msgstr ""
-#~ "'%s' veld bestaat niet in '%s' model\" %(field_name, model.model))\n"
-#~ "\n"
-#~ "        field = field_pool.read(cr, uid, field_id)\n"
-#~ "        relation_model = field['relation']\n"
-#~ "        relation_model_pool = relation_model and pool.get(relation_model) or "
-#~ "False\n"
-#~ "\n"
-#~ "        if field['ttype'] == 'many2one':\n"
-#~ "            res = False\n"
-#~ "            relation_id = False\n"
-#~ "            if values and type(values) == tuple:\n"
-#~ "                relation_id = values[0]\n"
-#~ "                if relation_id and relation_model_pool:\n"
-#~ "                    relation_model_object = relation_model_pool.read(cr, "
-#~ "uid, relation_id, [relation_model_pool._rec_name])\n"
-#~ "                    res = "
-#~ "relation_model_object[relation_model_pool._rec_name]\n"
-#~ "            return res\n"
-#~ "\n"
-#~ "        elif field['ttype'] in ('many2many','one2many"
-
-#, python-format
-#~ msgid ""
-#~ "'%s' field does not exist in '%s' model\" %(line['name'], model.model))\n"
-#~ "\n"
-#~ "            field = field_pool.read(cr, uid, field_id)\n"
-#~ "            old_value = 'old_value' in line and  line['old_value'] or ''\n"
-#~ "            new_value = 'new_value' in line and  line['new_value'] or ''\n"
-#~ "            old_value_text = 'old_value_text' in line and  "
-#~ "line['old_value_text'] or ''\n"
-#~ "            new_value_text = 'new_value_text' in line and  "
-#~ "line['new_value_text'] or ''\n"
-#~ "\n"
-#~ "            if old_value_text == new_value_text:\n"
-#~ "                continue\n"
-#~ "            if field['ttype'] == 'many2one':\n"
-#~ "                if type(old_value) == tuple:\n"
-#~ "                    old_value = old_value[0]\n"
-#~ "                if type(new_value) == tuple:\n"
-#~ "                    new_value = new_value[0]\n"
-#~ "            vals = {\n"
-#~ "                    \"log_id\": log_id,\n"
-#~ "                    \"field_id\": field_id,\n"
-#~ "                    \"old_value\": old_value,\n"
-#~ "                    \"new_value\": new_value,\n"
-#~ "                    \"old_value_text\": old_value_text,\n"
-#~ "                    \"new_value_text\": new_value_text,\n"
-#~ "                    \"field_description\": field['field_description']\n"
-#~ "                    }\n"
-#~ "            line_id = log_line_pool.create(cr, uid, vals)\n"
-#~ "        #End Loop\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "\n"
-#~ "    def log_fct(self, db, uid, model, method, fct_src, *args):\n"
-#~ "        \"\"\"\n"
-#~ "        Logging function: This function is performs logging oprations "
-#~ "according to method\n"
-#~ "        @param db: the current database\n"
-#~ "        @param uid: the current user’s ID for security checks,\n"
-#~ "        @param object: Object who's values are being changed\n"
-#~ "        @param method: method to log: create, read, write, unlink\n"
-#~ "        @param fct_src: execute method of Object proxy\n"
-#~ "\n"
-#~ "        @return: Returns result as per method of Object proxy\n"
-#~ "        \"\"\"\n"
-#~ "        res2 = args\n"
-#~ "        pool = pooler.get_pool(db)\n"
-#~ "        cr = pooler.get_db(db).cursor()\n"
-#~ "        resource_pool = pool.get(model)\n"
-#~ "        log_pool = pool.get('audittrail.log"
-#~ msgstr ""
-#~ "'%s' veld bestaat niet in '%s' model\" %(line['name'], model.model))\n"
-#~ "\n"
-#~ "            field = field_pool.read(cr, uid, field_id)\n"
-#~ "            old_value = 'old_value' in line and  line['old_value'] or ''\n"
-#~ "            new_value = 'new_value' in line and  line['new_value'] or ''\n"
-#~ "            old_value_text = 'old_value_text' in line and  "
-#~ "line['old_value_text'] or ''\n"
-#~ "            new_value_text = 'new_value_text' in line and  "
-#~ "line['new_value_text'] or ''\n"
-#~ "\n"
-#~ "            if old_value_text == new_value_text:\n"
-#~ "                continue\n"
-#~ "            if field['ttype'] == 'many2one':\n"
-#~ "                if type(old_value) == tuple:\n"
-#~ "                    old_value = old_value[0]\n"
-#~ "                if type(new_value) == tuple:\n"
-#~ "                    new_value = new_value[0]\n"
-#~ "            vals = {\n"
-#~ "                    \"log_id\": log_id,\n"
-#~ "                    \"field_id\": field_id,\n"
-#~ "                    \"old_value\": old_value,\n"
-#~ "                    \"new_value\": new_value,\n"
-#~ "                    \"old_value_text\": old_value_text,\n"
-#~ "                    \"new_value_text\": new_value_text,\n"
-#~ "                    \"field_description\": field['field_description']\n"
-#~ "                    }\n"
-#~ "            line_id = log_line_pool.create(cr, uid, vals)\n"
-#~ "        #End Loop\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "\n"
-#~ "    def log_fct(self, db, uid, model, method, fct_src, *args):\n"
-#~ "        \"\"\"\n"
-#~ "        Logging function: This function is performs logging oprations "
-#~ "according to method\n"
-#~ "        @param db: the current database\n"
-#~ "        @param uid: the current user’s ID for security checks,\n"
-#~ "        @param object: Object who's values are being changed\n"
-#~ "        @param method: method to log: create, read, write, unlink\n"
-#~ "        @param fct_src: execute method of Object proxy\n"
-#~ "\n"
-#~ "        @return: Returns result as per method of Object proxy\n"
-#~ "        \"\"\"\n"
-#~ "        res2 = args\n"
-#~ "        pool = pooler.get_pool(db)\n"
-#~ "        cr = pooler.get_db(db).cursor()\n"
-#~ "        resource_pool = pool.get(model)\n"
-#~ "        log_pool = pool.get('audittrail.log"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/audittrail/i18n/nl_BE.po b/addons/audittrail/i18n/nl_BE.po
index e321476bdec..567c5108968 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/oc.po b/addons/audittrail/i18n/oc.po
index 926a933dafb..0fc99d87d28 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/pl.po b/addons/audittrail/i18n/pl.po
index c38fd799f83..160a203d446 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index 4bd266c51e8..3b051b4f62d 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -456,15 +456,3 @@ msgstr ""
 
 #~ msgid "Log deletes"
 #~ msgstr "Apagar Registos"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index 489e1062a1e..c92cd1b7598 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index df019304dfe..9b239016da4 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index f8648693046..939e17a94ef 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -54,7 +54,7 @@ msgstr "Логи аудита"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -65,7 +65,7 @@ msgstr "Состояние"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Подписаться"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -89,6 +89,8 @@ msgid ""
 "Select this if you want to keep track of read/open on any record of the "
 "object of this rule"
 msgstr ""
+"Выберите это, если вы хотите отслеживать чтение и открытие любого объекта по "
+"этому правилу"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
@@ -114,6 +116,7 @@ msgstr "Идентификатор записи"
 #: help:audittrail.rule,user_id:0
 msgid "if  User is not added then it will applicable for all users"
 msgstr ""
+"Если пользователь не добавлен, то будет применяться для всех пользователей"
 
 #. module: audittrail
 #: help:audittrail.rule,log_workflow:0
@@ -121,6 +124,8 @@ msgid ""
 "Select this if you want to keep track of workflow on any record of the "
 "object of this rule"
 msgstr ""
+"Выберите, если требуется отслеживать обработку любой записи объекта по этому "
+"правилу."
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
@@ -157,13 +162,13 @@ 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
@@ -175,7 +180,7 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Название ресурса"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -189,16 +194,18 @@ msgid ""
 "Select this if you want to keep track of modification on any record of the "
 "object of this rule"
 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
@@ -208,7 +215,7 @@ msgstr "Старое значение текста: "
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "Журналировать процессы"
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -222,11 +229,20 @@ msgid ""
 "    delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"    Этот модуль позволяет администратору\n"
+"    отслеживать каждую операцию пользователя\n"
+"    с любым объектом в системе.\n"
+"\n"
+"    Администратор может написать правила для\n"
+"    чтения, записи и удаления объектов и смотреть \n"
+"    протокол.\n"
+"    "
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "Журналировать чтение"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:82
@@ -255,6 +271,8 @@ msgid ""
 "Select this if you want to keep track of deletion on any record of the "
 "object of this rule"
 msgstr ""
+"Выберите это, если вы хотите отслеживать удаление любого объекта по этому "
+"правилу"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -265,12 +283,14 @@ msgstr "Пользователь"
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "Идентификатор действия"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Users (if User is not added then it will applicable for all users)"
 msgstr ""
+"Пользователи (если пользователь не добавлен, то будет применяться для всех "
+"пользователей)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -280,7 +300,7 @@ msgstr "Отписаться"
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "Журналировать удаление"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -290,12 +310,12 @@ 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
@@ -325,13 +345,14 @@ 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 ""
+"Выберите это, если вы хотите отслеживать действия с объектом по этому правилу"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -344,6 +365,8 @@ msgid ""
 "There is a rule defined on this object\n"
 " You can not define other on the same!"
 msgstr ""
+"Уже есть правила, определенные для объекта\n"
+" Вы не можете определить другие !"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
@@ -358,17 +381,17 @@ 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
@@ -376,6 +399,7 @@ msgid ""
 "Select this if you want to keep track of creation on any record of the "
 "object of this rule"
 msgstr ""
+"Выберите это, если вы хотите отслеживать создание объектов по этому правилу"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index 4cb1a127083..bbae765a0bb 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/sq.po b/addons/audittrail/i18n/sq.po
index d00af23716f..b5717eb119c 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/sr@latin.po b/addons/audittrail/i18n/sr@latin.po
index bac54cc7dc2..0d32485a9a6 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index daaa5a63422..0e240be59c3 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -383,8 +383,5 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
 #~ msgid "Rules"
 #~ msgstr "Regler"
diff --git a/addons/audittrail/i18n/tlh.po b/addons/audittrail/i18n/tlh.po
index 81d5b5a75c8..d31be9bd2a4 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 834c9e46927..cc79c8c7111 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Denetim Yolu"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:81
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "UYARI: denetimyolu havuzun bir parçası değildir"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Günlük"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Üye olunmuş"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "Denetimyolu Kuralı"
 
 #. 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 "Denetim Günlüğü"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -65,7 +65,7 @@ msgstr "Durum"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Üye Ol"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -76,12 +76,12 @@ msgstr "Taslak"
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "Eski Değer"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
-msgstr ""
+msgstr "Günlüğü görüntüle"
 
 #. module: audittrail
 #: help:audittrail.rule,log_read:0
diff --git a/addons/audittrail/i18n/uk.po b/addons/audittrail/i18n/uk.po
index f60c1f681d8..c5b0c5db9cf 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/i18n/vi.po b/addons/audittrail/i18n/vi.po
index 829df536040..8eac17830d9 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -31,7 +31,7 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Ghi nhận"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -55,7 +55,7 @@ msgstr ""
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -82,7 +82,7 @@ msgstr "Giá trị cũ"
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
-msgstr ""
+msgstr "Xem ghi nhận"
 
 #. module: audittrail
 #: help:audittrail.rule,log_read:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "Mã Tài nguyên"
 
 #. module: audittrail
 #: help:audittrail.rule,user_id:0
@@ -126,7 +126,7 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr "Người dùng"
+msgstr "Người sử dụng"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -174,7 +174,7 @@ msgstr "Giá trị cũ "
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Tên Tài nguyên"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 30594a12ce8..056863fb4b5 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -8,24 +8,24 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-10-30 13:31+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr "审计线索"
+msgstr "审计跟踪"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:81
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "警告：审计跟踪不属于这"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
@@ -41,7 +41,7 @@ msgstr "已订阅"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "审计跟踪规则"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -54,7 +54,7 @@ msgstr "审计日志"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -65,7 +65,7 @@ msgstr "状态"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "订阅(_S)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -88,7 +88,7 @@ msgstr "查看日志"
 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
@@ -103,7 +103,7 @@ msgstr "日志格式"
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "日志ID"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
@@ -113,14 +113,14 @@ msgstr "资源ID"
 #. 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
@@ -142,7 +142,7 @@ msgstr "对象"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr "审计线索规则"
+msgstr "审计跟踪规则"
 
 #. module: audittrail
 #: field:audittrail.view.log,to:0
@@ -157,13 +157,13 @@ 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
@@ -173,7 +173,7 @@ msgstr "旧值: "
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "资源名称"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -186,17 +186,17 @@ msgstr "日期"
 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
@@ -206,7 +206,7 @@ msgstr "旧值正文: "
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "工作流日志"
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -220,11 +220,15 @@ msgid ""
 "    delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"    此模块帮助管理员跟踪所有用户在所有对象上的操作。\n"
+"管理员可以订阅和查看读写和删除某个对象记录的日志。\n"
+"    "
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "读日志"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:82
@@ -245,30 +249,30 @@ 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
@@ -278,7 +282,7 @@ msgstr "取消订阅"
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "删除日志"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -288,12 +292,12 @@ 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
@@ -318,18 +322,18 @@ msgstr "新值"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-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
@@ -341,7 +345,7 @@ msgstr "新值: "
 msgid ""
 "There is a rule defined on this object\n"
 " You can not define other on the same!"
-msgstr ""
+msgstr "此对象已经有一条规则，不能重复定义。"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
@@ -356,24 +360,24 @@ 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 "如果你想跟踪此对象所有记录的创建请选择此项"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index c709cf757f2..f0091cc78b1 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index 65165c1d2d8..76284e75511 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -62,3 +62,5 @@ class audittrail_view_log(osv.osv_memory):
         return result
 
 audittrail_view_log()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_openid/__init__.py b/addons/auth_openid/__init__.py
new file mode 100644
index 00000000000..42a28a1b35a
--- /dev/null
+++ b/addons/auth_openid/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 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 res_users
+import controllers
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
new file mode 100644
index 00000000000..040a96a3995
--- /dev/null
+++ b/addons/auth_openid/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'OpenID',
+    'version': '2.0',
+    'category': 'Hidden',
+    'description': """Allow users to login through OpenID.""",
+    'author': 'OpenERP s.a.',
+    'maintainer': 'OpenERP s.a.',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'data': [
+        'res_users.xml',
+    ],
+    'js': [
+        'static/src/js/auth_openid.js',
+    ],
+    'css': [
+        'static/src/css/openid.css',
+    ],
+    'external_dependencies': {
+        'python' : ['openid'],
+    },
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_openid/controllers/__init__.py b/addons/auth_openid/controllers/__init__.py
new file mode 100644
index 00000000000..c5f359681b9
--- /dev/null
+++ b/addons/auth_openid/controllers/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 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 License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import main
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
new file mode 100644
index 00000000000..0c1274ba05a
--- /dev/null
+++ b/addons/auth_openid/controllers/main.py
@@ -0,0 +1,227 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 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 os
+import sys
+import urllib
+
+import werkzeug.urls
+import werkzeug.exceptions
+
+from openerp.modules.registry import RegistryManager
+import web.common.http as openerpweb
+
+from openid import oidutil
+from openid.store import memstore
+#from openid.store import filestore
+from openid.consumer import consumer
+from openid.cryptutil import randomString
+from openid.extensions import ax, sreg
+
+from .. import utils
+
+
+
+_logger = logging.getLogger('web.auth_openid')
+oidutil.log = logging.getLogger('openid').debug
+
+
+class GoogleAppsAwareConsumer(consumer.GenericConsumer):
+    def complete(self, message, endpoint, return_to):
+        if message.getOpenIDNamespace() == consumer.OPENID2_NS:
+            server_url = message.getArg(consumer.OPENID2_NS, 'op_endpoint', consumer.no_default)
+            if server_url.startswith('https://www.google.com/a/'):
+                # update fields
+                for attr in ['claimed_id', 'identity']:
+                    value = message.getArg(consumer.OPENID2_NS, attr)
+                    value = 'https://www.google.com/accounts/o8/user-xrds?uri=%s' % urllib.quote_plus(value)
+                    message.setArg(consumer.OPENID2_NS, attr, value)
+
+                # now, resign the message
+                assoc_handle = message.getArg(consumer.OPENID_NS, 'assoc_handle')
+                assoc = self.store.getAssociation(server_url, assoc_handle)
+                message.delArg(consumer.OPENID2_NS, 'sig')
+                message.delArg(consumer.OPENID2_NS, 'signed')
+                message = assoc.signMessage(message)
+
+        return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to) 
+
+
+class OpenIDController(openerpweb.Controller):
+    _cp_path = '/auth_openid/login'
+
+    _store = memstore.MemoryStore()  # TODO use a filestore
+
+    _REQUIRED_ATTRIBUTES = ['email']
+    _OPTIONAL_ATTRIBUTES = 'nickname fullname postcode country language timezone'.split()
+
+
+    def _add_extensions(self, request):
+        """Add extensions to the request"""
+
+        sreg_request = sreg.SRegRequest(required=self._REQUIRED_ATTRIBUTES,
+                                        optional=self._OPTIONAL_ATTRIBUTES)
+        request.addExtension(sreg_request)
+
+        ax_request = ax.FetchRequest()
+        for alias in self._REQUIRED_ATTRIBUTES:
+            uri = utils.SREG2AX[alias]
+            ax_request.add(ax.AttrInfo(uri, required=True, alias=alias))
+        for alias in self._OPTIONAL_ATTRIBUTES:
+            uri = utils.SREG2AX[alias]
+            ax_request.add(ax.AttrInfo(uri, required=False, alias=alias))
+
+        request.addExtension(ax_request)
+
+    def _get_attributes_from_success_response(self, success_response):
+        attrs = {}
+
+        all_attrs = self._REQUIRED_ATTRIBUTES + self._OPTIONAL_ATTRIBUTES
+
+        sreg_resp = sreg.SRegResponse.fromSuccessResponse(success_response)
+        if sreg_resp:
+            for attr in all_attrs:
+                value = sreg_resp.get(attr)
+                if value is not None:
+                    attrs[attr] = value
+
+        ax_resp = ax.FetchResponse.fromSuccessResponse(success_response)
+        if ax_resp:
+            for attr in all_attrs:
+                value = ax_resp.getSingle(utils.SREG2AX[attr])
+                if value is not None:
+                    attrs[attr] = value
+        return attrs
+
+    def _get_realm(self, req):
+        return req.httprequest.host_url
+
+    @openerpweb.jsonrequest
+    def verify(self, req, db, url):
+        redirect_to = werkzeug.urls.Href(req.httprequest.host_url + 'auth_openid/login/process')(session_id=req.session_id)
+        realm = self._get_realm(req)
+
+        session = dict(dbname=db, openid_url=url)       # TODO add origin page ?
+        oidconsumer = consumer.Consumer(session, self._store)
+
+        try:
+            request = oidconsumer.begin(url)
+        except consumer.DiscoveryFailure, exc:
+            fetch_error_string = 'Error in discovery: %s' % (str(exc[0]),)
+            return {'error': fetch_error_string, 'title': 'OpenID Error'}
+
+        if request is None:
+            return {'error': 'No OpenID services found', 'title': 'OpenID Error'}
+
+        req.session.openid_session = session
+        self._add_extensions(request)
+
+        if request.shouldSendRedirect():
+            redirect_url = request.redirectURL(realm, redirect_to)
+            return {'action': 'redirect', 'value': redirect_url, 'session_id': req.session_id}
+        else:
+            form_html = request.htmlMarkup(realm, redirect_to)
+            return {'action': 'post', 'value': form_html, 'session_id': req.session_id}
+
+    
+    @openerpweb.httprequest
+    def process(self, req, **kw):
+        session = getattr(req.session, 'openid_session', None)
+        if not session:
+            return werkzeug.utils.redirect('/')
+
+        oidconsumer = consumer.Consumer(session, self._store, consumer_class=GoogleAppsAwareConsumer)
+
+        query = req.httprequest.args
+        info = oidconsumer.complete(query, req.httprequest.base_url)
+        display_identifier = info.getDisplayIdentifier()
+
+        session['status'] = info.status
+        user_id = None
+
+        if info.status == consumer.SUCCESS:
+            dbname = session['dbname']
+            with utils.cursor(dbname) as cr:
+                registry = RegistryManager.get(dbname)
+                Modules = registry.get('ir.module.module')
+
+                installed = Modules.search_count(cr, 1, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
+                if installed:
+
+                    Users = registry.get('res.users')
+
+                    #openid_url = info.endpoint.canonicalID or display_identifier
+                    openid_url = session['openid_url']
+
+                    attrs = self._get_attributes_from_success_response(info)
+                    attrs['openid_url'] = openid_url
+                    session['attributes'] = attrs
+                    openid_email = attrs.get('email', False)
+
+                    domain = []
+                    if openid_email:
+                        domain += ['|', ('openid_email', '=', False)]
+                    domain += [('openid_email', '=', openid_email)]
+
+                    domain += [
+                               ('openid_url', '=', openid_url),
+                               ('active', '=', True),
+                              ]
+                    ids = Users.search(cr, 1, domain)
+                    assert len(ids) < 2
+                    if ids:
+                        user_id = ids[0]
+                        login = Users.browse(cr, 1, user_id).login
+                        key = randomString(utils.KEY_LENGTH, '0123456789abcdef')
+                        Users.write(cr, 1, [user_id], {'openid_key': key})
+                        # TODO fill empty fields with the ones from sreg/ax
+                        cr.commit()
+
+                        u = req.session.login(dbname, login, key)
+
+            if not user_id:
+                session['message'] = 'This OpenID identifier is not associated to any active users'
+
+                
+        elif info.status == consumer.SETUP_NEEDED:
+            session['message'] = info.setup_url
+        elif info.status == consumer.FAILURE and display_identifier:
+            fmt = "Verification of %s failed: %s"
+            session['message'] = fmt % (display_identifier, info.message)
+        else:   # FAILURE
+            # Either we don't understand the code or there is no
+            # openid_url included with the error. Give a generic
+            # failure message. The library should supply debug
+            # information in a log.
+            session['message'] = 'Verification failed.'
+
+
+        fragment = '#loginerror' if not user_id else ''
+        return werkzeug.utils.redirect('/web/webclient/home?debug=1'+fragment)
+
+    @openerpweb.jsonrequest
+    def status(self, req):
+        session = getattr(req.session, 'openid_session', {})
+        return {'status': session.get('status'), 'message': session.get('message')}
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py
new file mode 100644
index 00000000000..c9b5bfc7b26
--- /dev/null
+++ b/addons/auth_openid/res_users.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 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.osv import osv, fields
+import openerp.exceptions
+import tools
+
+import utils
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+
+    # TODO create helper fields for autofill openid_url and openid_email -> http://pad.openerp.com/web-openid
+
+    _columns = {
+        'openid_url': fields.char('OpenID URL', size=1024),
+        'openid_email': fields.char('OpenID Email', size=256,
+                                    help="Used for disambiguation in case of a shared OpenID URL"),
+        'openid_key': fields.char('OpenID Key', size=utils.KEY_LENGTH,
+                                  readonly=True),
+    }
+
+    def _check_openid_url_email(self, cr, uid, ids, context=None):
+        return all(self.search_count(cr, uid, [('active', '=', True), ('openid_url', '=', u.openid_url), ('openid_email', '=', u.openid_email)]) == 1 \
+                   for u in self.browse(cr, uid, ids, context) if u.active and u.openid_url)
+
+    def _check_openid_url_email_msg(self, cr, uid, ids, context):
+        return "There is already an active user with this OpenID Email for this OpenID URL"
+
+    _constraints = [
+        (_check_openid_url_email, lambda self, *a, **kw: self._check_openid_url_email_msg(*a, **kw), ['active', 'openid_url', 'openid_email']),
+    ]
+
+    def copy(self, cr, uid, rid, defaults=None, context=None):
+        reset_fields = 'openid_url openid_email'.split()
+        reset_values = dict.fromkeys(reset_fields, False)
+        if defaults is None:
+            defaults = reset_values
+        else:
+            defaults = dict(reset_values, **defaults)
+
+        defaults['openid_key'] = False
+        return super(res_users, self).copy(cr, uid, rid, defaults, context)
+
+    def login(self, db, login, password):
+        result = super(res_users, self).login(db, login, password)
+        if result:
+            return result
+        else:
+            with utils.cursor(db) as cr:
+                cr.execute('UPDATE res_users SET date=now() WHERE login=%s AND openid_key=%s AND active=%s RETURNING id',
+                        (tools.ustr(login), tools.ustr(password), True))
+                res = cr.fetchone()
+                cr.commit()
+                return res[0] if res else False
+
+
+    def check(self, db, uid, passwd):
+        try:
+            return super(res_users, self).check(db, uid, passwd)
+        except openerp.exceptions.AccessDenied:
+            if not passwd:
+                raise
+            with utils.cursor(db) as cr:
+                cr.execute('''SELECT COUNT(1)
+                                FROM res_users
+                               WHERE id=%s
+                                 AND openid_key=%s
+                                 AND active=%s''',
+                            (int(uid), passwd, True))
+                if not cr.fetchone()[0]:
+                    raise
+                self._uid_cache.setdefault(db, {})[uid] = passwd
+
+res_users()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_openid/res_users.xml b/addons/auth_openid/res_users.xml
new file mode 100644
index 00000000000..e32c2df26c8
--- /dev/null
+++ b/addons/auth_openid/res_users.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>   
+        <record id="view_users_form" model="ir.ui.view">
+            <field name="name">res.users.form</field>
+            <field name="model">res.users</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <notebook colspan="4" position="inside">
+                    <page string="OpenID">
+                        <field name="openid_url"/>
+                        <field name="openid_email"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+    </data>
+</openerp>
+
diff --git a/addons/auth_openid/static/src/css/openid.css b/addons/auth_openid/static/src/css/openid.css
new file mode 100644
index 00000000000..8763ec31685
--- /dev/null
+++ b/addons/auth_openid/static/src/css/openid.css
@@ -0,0 +1,64 @@
+input[name='openid_url'] {
+    background: #fff url(../img/login-bg.gif) no-repeat 1px;
+    padding-left: 20px;
+}
+
+.auth_choice {
+    position: static;
+    display: none;
+}
+
+.openerp .login .oe_forms .oe_box2 td input[name="db"], .oe_forms .oe_box2 td select[name="db"] {
+    width: 50%;
+    float: left;
+    margin-top: 15px;
+}
+
+.openerp .login .oe_login_right_pane {
+    margin-left: 525px;
+}
+.openerp .login form {
+    width: 475px;
+}
+
+.openid_providers {
+    padding: 0;
+    list-style: none;
+    float: right;
+}
+
+.openid_providers li {
+    display: block;
+    float: left;
+    margin: 0 1px 3px 2px;
+}
+
+.openid_providers a {
+    display: block;
+    width: 24px;
+    height: 24px;
+    border: 1px solid #ddd;
+    background: #fff url(../img/openid_16.png) no-repeat 50%;
+    text-indent: -9999px;
+    overflow: hidden;
+    text-align: left; 
+}
+
+.openid_providers a.selected {
+    border-color: #9A0404;
+}
+
+.openid_providers a[title="Password"]    { background-image: url(../img/textfield_key.png); }
+.openid_providers a[title="AOL"]         { background-image: url(../img/aol.png); }
+.openid_providers a[title="ClaimID"]     { background-image: url(../img/claimid.png); }
+.openid_providers a[title="Google"]      { background-image: url(../img/googlefav.png); }
+.openid_providers a[title="Google Apps"] { background-image: url(../img/marketplace.gif); }
+.openid_providers a[title="MyOpenID"]    { background-image: url(../img/myopenid.png); }
+.openid_providers a[title="VeriSign"]    { background-image: url(../img/verisign.png); }
+.openid_providers a[title="Yahoo!"]      { background-image: url(../img/yahoo.png); }
+.openid_providers a[title="Launchpad"]   { background-image: url(../img/launchpad.png); }
+
+
+tr.auth_choice.selected {
+    display: table-row;
+}
diff --git a/addons/auth_openid/static/src/img/aol.png b/addons/auth_openid/static/src/img/aol.png
new file mode 100644
index 00000000000..93584e56749
Binary files /dev/null and b/addons/auth_openid/static/src/img/aol.png differ
diff --git a/addons/auth_openid/static/src/img/claimid.png b/addons/auth_openid/static/src/img/claimid.png
new file mode 100644
index 00000000000..41be7fc8f9e
Binary files /dev/null and b/addons/auth_openid/static/src/img/claimid.png differ
diff --git a/addons/auth_openid/static/src/img/google.png b/addons/auth_openid/static/src/img/google.png
new file mode 100644
index 00000000000..d8b8b2a7abb
Binary files /dev/null and b/addons/auth_openid/static/src/img/google.png differ
diff --git a/addons/auth_openid/static/src/img/googleapps.gif b/addons/auth_openid/static/src/img/googleapps.gif
new file mode 100644
index 00000000000..f86bc8956d2
Binary files /dev/null and b/addons/auth_openid/static/src/img/googleapps.gif differ
diff --git a/addons/auth_openid/static/src/img/googlefav.png b/addons/auth_openid/static/src/img/googlefav.png
new file mode 100644
index 00000000000..1604ac0baa5
Binary files /dev/null and b/addons/auth_openid/static/src/img/googlefav.png differ
diff --git a/addons/auth_openid/static/src/img/launchpad.gif b/addons/auth_openid/static/src/img/launchpad.gif
new file mode 100644
index 00000000000..48e7ba4f5b0
Binary files /dev/null and b/addons/auth_openid/static/src/img/launchpad.gif differ
diff --git a/addons/auth_openid/static/src/img/launchpad.png b/addons/auth_openid/static/src/img/launchpad.png
new file mode 100644
index 00000000000..7db6e67f8b5
Binary files /dev/null and b/addons/auth_openid/static/src/img/launchpad.png differ
diff --git a/addons/auth_openid/static/src/img/login-bg.gif b/addons/auth_openid/static/src/img/login-bg.gif
new file mode 100644
index 00000000000..e2d8377db02
Binary files /dev/null and b/addons/auth_openid/static/src/img/login-bg.gif differ
diff --git a/addons/auth_openid/static/src/img/marketplace.gif b/addons/auth_openid/static/src/img/marketplace.gif
new file mode 100644
index 00000000000..a3e4d2cd606
Binary files /dev/null and b/addons/auth_openid/static/src/img/marketplace.gif differ
diff --git a/addons/auth_openid/static/src/img/myopenid.png b/addons/auth_openid/static/src/img/myopenid.png
new file mode 100644
index 00000000000..d00ca76543b
Binary files /dev/null and b/addons/auth_openid/static/src/img/myopenid.png differ
diff --git a/addons/auth_openid/static/src/img/openid.png b/addons/auth_openid/static/src/img/openid.png
new file mode 100644
index 00000000000..280ee6ce3b7
Binary files /dev/null and b/addons/auth_openid/static/src/img/openid.png differ
diff --git a/addons/auth_openid/static/src/img/openid_16.png b/addons/auth_openid/static/src/img/openid_16.png
new file mode 100644
index 00000000000..eadf8e8577f
Binary files /dev/null and b/addons/auth_openid/static/src/img/openid_16.png differ
diff --git a/addons/auth_openid/static/src/img/textfield_key.png b/addons/auth_openid/static/src/img/textfield_key.png
new file mode 100644
index 00000000000..a9d5e4f8cc7
Binary files /dev/null and b/addons/auth_openid/static/src/img/textfield_key.png differ
diff --git a/addons/auth_openid/static/src/img/verisign.png b/addons/auth_openid/static/src/img/verisign.png
new file mode 100644
index 00000000000..fe890ca7aeb
Binary files /dev/null and b/addons/auth_openid/static/src/img/verisign.png differ
diff --git a/addons/auth_openid/static/src/img/yahoo.png b/addons/auth_openid/static/src/img/yahoo.png
new file mode 100644
index 00000000000..5fbf752d9b5
Binary files /dev/null and b/addons/auth_openid/static/src/img/yahoo.png differ
diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js
new file mode 100644
index 00000000000..bc067d8824d
--- /dev/null
+++ b/addons/auth_openid/static/src/js/auth_openid.js
@@ -0,0 +1,135 @@
+
+openerp.auth_openid = function(instance) {
+
+var QWeb = instance.web.qweb;
+QWeb.add_template('/auth_openid/static/src/xml/auth_openid.xml');
+
+instance.web.Login = instance.web.Login.extend({
+    start: function() {
+        this._super.apply(this, arguments);
+        var self = this;
+
+        this.$openid_selected_button = $();
+        this.$openid_selected_input = $();
+        this.$openid_selected_provider = null;
+
+
+        var openIdProvider = null;
+        if (this.has_local_storage && this.remember_credentials) {
+            openIdProvider = localStorage.getItem('openid-provider');
+        }
+
+        if (openIdProvider) {
+            $openid_selected_provider = openIdProvider;
+            this.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true);
+
+            if (this.has_local_storage && this.remember_credentials) {
+                this.$openid_selected_input.find('input').val(localStorage.getItem('openid-login'));
+            }
+        }
+        else {
+            this.do_openid_select('a[data-url=""]', 'login,password', true);
+        }
+
+        this.$element.find('a[data-url]').click(function (event) {
+            event.preventDefault();
+            var selected_oidh = $(this).attr('href').substr(1);
+            if (selected_oidh != self.$openid_selected_provider) {
+                self.do_openid_select(this, selected_oidh);
+            }
+        });
+
+    },
+
+
+    do_openid_select: function (button, provider, noautosubmit) {
+        var self = this;
+
+            self.$openid_selected_button.add(self.$openid_selected_input).removeClass('selected');
+            self.$openid_selected_button = self.$element.find(button).addClass('selected');
+
+            var input = _(provider.split(',')).map(function(p) { return 'tr[data-provider="'+p+'"]'; }).join(',');
+            self.$openid_selected_input = self.$element.find(input).addClass('selected');
+
+            self.$openid_selected_input.find('input:first').focus();
+            self.$openid_selected_provider = (self.$openid_selected_button.attr('href') || '').substr(1);
+
+            if (self.has_local_storage && self.remember_credentials) {
+                localStorage.setItem('openid-provider', self.$openid_selected_provider);
+            }
+
+            if (!noautosubmit && self.$openid_selected_input.length == 0) {
+                self.$element.find('form').submit();
+            }
+
+    },
+
+    on_login_invalid: function() {
+        var self = this;
+        var fragment = jQuery.deparam.fragment();
+        if (fragment.loginerror != undefined) {
+            this.rpc('/auth_openid/login/status', {}, function(result) {
+                if (_.contains(['success', 'failure'], result.status) && result.message) {
+                    self.notification.warn('Invalid OpenID Login', result.message);
+                }
+                if (result.status === 'setup_needed' && result.message) {
+                    window.location.replace(result.message);
+                }
+            });
+        }
+        return this._super();
+    },
+
+    on_submit: function(ev) {
+
+        var dataurl = this.$openid_selected_button.attr('data-url');
+
+        if(!dataurl) {
+            // login-password submitted
+            this._super(ev);
+        } else {
+            ev.preventDefault();
+
+            var id = this.$openid_selected_input.find('input').val();
+            if (this.has_local_storage && this.remember_credentials) {
+                localStorage.setItem('openid-login', id);
+            }
+
+            var db = this.$element.find("form [name=db]").val();
+            var openid_url = dataurl.replace('{id}', id);
+
+            this.do_openid_login(db, openid_url);
+
+        }
+    },
+
+    do_openid_login: function(db, openid_url) {
+        var self = this;
+        this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}, function(result) {
+            if (result.error) {
+                self.notification.warn(result.title, result.error);
+                self.on_login_invalid();
+                return;
+            }
+            if (result.session_id) {
+                self.session.session_id = result.session_id;
+                self.session.session_save();
+            }
+            if (result.action === 'post') {
+                document.open();
+                document.write(result.value);
+                document.close();
+            } else if (result.action === 'redirect') {
+                window.location.replace(result.value);
+            } else {
+                // XXX display error ?
+            }
+
+        });
+    },
+
+
+});
+
+
+};
diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
new file mode 100644
index 00000000000..6fbab72e831
--- /dev/null
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1: -->
+<templates id="template" xml:space="preserve">
+
+    <t t-extend="Login">
+        <t t-jquery=".oe_box2 tr:first td:nth-child(2)" t-operation="append">
+            <ul class="openid_providers">
+                <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>
+                <li><a href="#launchpad" title="Launchpad" data-url="https://launchpad.net/~{id}">Launchpad</a></li>
+                <li><a href="#openid_url" title="OpenID" data-url="{id}">OpenID</a></li>
+            </ul>
+        </t>
+    </t>
+
+    <t t-extend="Login">
+        <t t-jquery=".oe_box2 tr:first" t-operation="after">
+            <tr>
+                <td><label for="googleapps">Google Apps Domain:</label></td>
+                <td><input type="text" name="googleapps" /></td>
+            </tr>
+            <tr>
+                <td><label for="launchpad">Username:</label></td>
+                <td><input type="text" name="launchpad" /></td>
+            </tr>
+            <tr>
+                <td><label for="openid_url">OpenID URL:</label></td>
+                <td><input type="text" name="openid_url" /></td>
+            </tr>
+        </t>
+    </t>
+
+    <t t-extend="Login">
+        <t t-jquery=".oe_box2 tr:has(input[name!='db'])">
+            //this.addClass('auth_choice');     // XXX for some reason, not all tr tags are HTMLElement's and thus, jQuery decide to not change the class...
+            this.attr('class', 'auth_choice');
+            this.each(function() {
+                var $i = $(this);
+                $i.attr('data-provider', $i.find('input').attr('name'));
+            });
+        </t>
+    </t>
+
+</templates>
diff --git a/addons/stock/report/ups.py b/addons/auth_openid/utils.py
similarity index 52%
rename from addons/stock/report/ups.py
rename to addons/auth_openid/utils.py
index fb8483341ec..444b5eeaa05 100644
--- a/addons/stock/report/ups.py
+++ b/addons/auth_openid/utils.py
@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2011 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,22 +18,31 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+from contextlib import contextmanager
+from openerp.modules.registry import RegistryManager
 
-from report.interface import report_rml
+KEY_LENGTH = 16
 
-class report_custom(report_rml):
-    def create(self, uid, ids, datas, context):
-        datas.setdefault('form', {})
-        datas['form'].setdefault('weight', 3.0)
+SREG2AX = {     # from http://www.axschema.org/types/#sreg
+    'nickname': 'http://axschema.org/namePerson/friendly',
+    'email': 'http://axschema.org/contact/email',
+    'fullname': 'http://axschema.org/namePerson',
+    'dob': 'http://axschema.org/birthDate',
+    'gender': 'http://axschema.org/person/gender',
+    'postcode': 'http://axschema.org/contact/postalCode/home',
+    'country': 'http://axschema.org/contact/country/home',
+    'language': 'http://axschema.org/pref/language',
+    'timezone': 'http://axschema.org/pref/timezone',
+}
 
-        datas['model'] = 'stock.move.lot'
-        datas['ids'] = ids
-        del datas['id']
 
-        return (super(report_custom, self).create(uid, ids, datas, context), 'pdf')
-
-report_custom('report.stock.move.lot.ups_xml', 'stock.move.lot', 'addons/stock/report/UPS.xml', None)
+@contextmanager
+def cursor(db):
+    cr = RegistryManager.get(db).db.cursor()
+    try:
+        yield cr
+    finally:
+        cr.close()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index b6796f8958d..18af8d09459 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -22,9 +22,7 @@
 {
     'name': 'Action Rule',
     'version': '1.0',
-    'category': 'Tools',
-    'complexity': "expert",
-    'category': 'Generic Modules/Others',
+    'category': 'Hidden',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
@@ -37,7 +35,7 @@ trigger an automatic reminder email.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
+    'depends': ['base', 'mail'],
     'init_xml': [
         'base_action_rule_data.xml'
     ],
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 2db23e75893..2d239adada2 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -24,7 +24,7 @@ from tools.translate import _
 from datetime import datetime
 from datetime import timedelta
 from tools.safe_eval import safe_eval
-import pooler 
+import pooler
 import re
 import time
 import tools
@@ -39,7 +39,7 @@ class base_action_rule(osv.osv):
 
     _name = 'base.action.rule'
     _description = 'Action Rules'
-    
+
     def _state_get(self, cr, uid, context=None):
         """ Get State
             @param self: The object pointer
@@ -55,7 +55,7 @@ class base_action_rule(osv.osv):
             @param uid: the current user’s ID for security checks,
             @param context: A standard dictionary for contextual values """
         return [('', '')]
-  
+
     def priority_get(self, cr, uid, context=None):
         """ Get Priority
             @param self: The object pointer
@@ -65,57 +65,57 @@ class base_action_rule(osv.osv):
         return [('', '')]
 
     _columns = {
-        'name':  fields.char('Rule Name', size=64, required=True), 
-        'model_id': fields.many2one('ir.model', 'Object', required=True), 
-        'create_date': fields.datetime('Create Date', readonly=1), 
+        'name':  fields.char('Rule Name', size=64, required=True),
+        'model_id': fields.many2one('ir.model', 'Object', required=True),
+        'create_date': fields.datetime('Create Date', readonly=1),
         'active': fields.boolean('Active', help="If the active field is set to False,\
- it will allow you to hide the rule without removing it."), 
+ it will allow you to hide the rule without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order \
-when displaying a list of rules."), 
+when displaying a list of rules."),
         'trg_date_type':  fields.selection([
-            ('none', 'None'), 
-            ('create', 'Creation Date'), 
-            ('action_last', 'Last Action Date'), 
-            ('date', 'Date'), 
-            ('deadline', 'Deadline'), 
-            ], 'Trigger Date', size=16), 
+            ('none', 'None'),
+            ('create', 'Creation Date'),
+            ('action_last', 'Last Action Date'),
+            ('date', 'Date'),
+            ('deadline', 'Deadline'),
+            ], 'Trigger Date', size=16),
         'trg_date_range': fields.integer('Delay after trigger date', \
                                          help="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."), 
+trigger date, like sending a reminder 15 minutes before a meeting."),
         'trg_date_range_type': fields.selection([('minutes', 'Minutes'), ('hour', 'Hours'), \
-                                ('day', 'Days'), ('month', 'Months')], 'Delay type'), 
-        'trg_user_id':  fields.many2one('res.users', 'Responsible'), 
-        'trg_partner_id': fields.many2one('res.partner', 'Partner'), 
-        'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'), 
-        'trg_state_from': fields.selection(_state_get, 'State', size=16), 
-        'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), 
+                                ('day', 'Days'), ('month', 'Months')], 'Delay type'),
+        'trg_user_id':  fields.many2one('res.users', 'Responsible'),
+        'trg_partner_id': fields.many2one('res.partner', 'Partner'),
+        'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'),
+        'trg_state_from': fields.selection(_state_get, 'State', 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_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"), 
+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."), 
+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."), 
+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)', 
+ 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)."), 
+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"), 
+        help="Email-id of the persons whom mail is to be sent"),
+        'act_mail_body': fields.text('Mail body', help="Content of mail"),
         '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), 
+\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,
@@ -124,17 +124,17 @@ the rule to mark CC(mail to any other person defined in actions)."),
     }
 
     _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': 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,
     }
-    
+
     _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':[]}}
@@ -147,7 +147,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
             res['value'] = {'filter_id':False}
         return res
 
-    def pre_action(self, cr, uid, ids, model, context=None):
+    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) \
@@ -156,7 +156,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         # Check if any rule matching with current object
         for obj_name, rule_id in res:
             if not (model == obj_name):
-                continue
+                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
@@ -166,31 +166,36 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return True
 
     def _create(self, old_create, model, context=None):
-        if context is None:
-            context  = {}
-        def make_call_old(cr, uid, vals, context=context):
+        """
+        Return a wrapper around `old_create` calling both `old_create` and
+        `post_action`, in that order.
+        """
+        def wrapper(cr, uid, vals, context=context):
             new_id = old_create(cr, uid, vals, context=context)
             if not context.get('action'):
-                self.pre_action(cr, uid, [new_id], model, context=context)
+                self.post_action(cr, uid, [new_id], model, context=context)
             return new_id
-        return make_call_old
+        return wrapper
     
     def _write(self, old_write, model, context=None):
-        if context is None:
-            context  = {}
-        def make_call_old(cr, uid, ids, vals, context=context):
-            if context is None:
-               context = {}
+        """
+        Return a wrapper around `old_write` calling both `old_write` and
+        `post_action`, in that order.
+        """
+        def wrapper(cr, uid, ids, vals, context=context):
             if isinstance(ids, (str, int, long)):
                 ids = [ids]
+            old_write(cr, uid, ids, vals, context=context)
             if not context.get('action'):
-                self.pre_action(cr, uid, ids, model, context=context)
-            return old_write(cr, uid, ids, vals, context=context)
-        return make_call_old
+                self.post_action(cr, uid, ids, model, context=context)
+            return True
+        return wrapper
 
     def _register_hook(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
+        """
+        Wrap every `create` and `write` methods of the models specified by
+        the rules (given by `ids`).
+        """
         for action_rule in self.browse(cr, uid, ids, context=context):
             model = action_rule.model_id.model
             obj_pool = self.pool.get(model)
@@ -200,15 +205,16 @@ the rule to mark CC(mail to any other person defined in actions)."),
                 obj_pool.base_action_ruled = True
 
         return True
+
     def create(self, cr, uid, vals, context=None):
         res_id = super(base_action_rule, self).create(cr, uid, vals, context=context)
-        self._register_hook(cr, uid, [res_id], context=context)        
+        self._register_hook(cr, uid, [res_id], context=context)
         return res_id
-    
+
     def write(self, cr, uid, ids, vals, context=None):
-        res = super(base_action_rule, self).write(cr, uid, ids, vals, context=context)
+        super(base_action_rule, self).write(cr, uid, ids, vals, context=context)
         self._register_hook(cr, uid, ids, context=context)
-        return res
+        return True
 
     def _check(self, cr, uid, automatic=False, use_new_cursor=False, \
                        context=None):
@@ -268,22 +274,19 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return body and tools.ustr(body) or ''
 
     def format_mail(self, obj, body):
-        """ Foramat Mail
-            @param self: The object pointer """
-
         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_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.user_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': 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 '/', 
+                                         obj.partner_address_id.email) or '/',
         }
         return self.format_body(body % data)
 
@@ -302,6 +305,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         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.user_email:
@@ -311,9 +315,9 @@ the rule to mark CC(mail to any other person defined in actions)."),
         emailfrom = tools.ustr(emailfrom)
         reply_to = emailfrom
         if not emailfrom:
-            raise osv.except_osv(_('Error!'), 
+            raise osv.except_osv(_('Error!'),
                     _("No E-Mail ID Found for your Company address!"))
-        return tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, openobject_id=str(obj.id))
+        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
 
 
     def do_check(self, cr, uid, action, obj, context=None):
@@ -324,7 +328,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
             @param context: A standard dictionary for contextual values """
         if context is None:
             context = {}
-        ok = True 
+        ok = True
         if action.filter_id:
             if action.model_id.model == action.filter_id.model_id:
                 context.update(eval(action.filter_id.context))
@@ -448,15 +452,11 @@ the rule to mark CC(mail to any other person defined in actions)."),
             scrit = []
 
         for action in self.browse(cr, uid, ids, context=context):
-            model_obj = self.pool.get(action.model_id.model)
             for obj in objects:
-                ok = self.do_check(cr, uid, action, obj, context=context)
-                if not ok:
-                    continue
+                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)
 
-                if ok:
-                    self.do_action(cr, uid, action, model_obj, obj, context)
-                    break
         context.update({'action': False})
         return True
 
@@ -479,7 +479,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return True
 
     _constraints = [
-        (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']), 
+        (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']),
     ]
 
 base_action_rule()
diff --git a/addons/base_action_rule/i18n/bg.po b/addons/base_action_rule/i18n/bg.po
index 2a910e021a0..d2cee1352d6 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4fdb3ea581f..4a38c2ab384 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -518,17 +518,3 @@ msgstr "Uvjeti stanja"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Datum okidanja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravan naziv modela u definiciji zadatka."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za arhitekturu prikaza!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greška ! Ne možete kreirati rekurzivan meni."
-
-#~ 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!"
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
index 54f3396d79a..5207d5021c6 100644
--- a/addons/base_action_rule/i18n/ca.po
+++ b/addons/base_action_rule/i18n/ca.po
@@ -14,80 +14,82 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Seleccioneu aquesta opció si desitgeu que la regla enviï un correu "
+"electrònic a la persona responsable."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_partner:0
 msgid "Remind Partner"
-msgstr ""
+msgstr "Recorda empresa"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Categoria de l'empresa"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
 msgid "Mail to Watchers (CC)"
-msgstr ""
+msgstr "Envia correu als observadors (CC)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr ""
+msgstr "Botó pressionat"
 
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objecte"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr ""
+msgstr "Envia correu a aquests emails"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Fixa estat a"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_from:0
 msgid "Email From"
-msgstr ""
+msgstr "Email de"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
-msgstr ""
+msgstr "Missatje del email"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
-msgstr ""
+msgstr "Dies"
 
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Última execució"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:313
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Respondre a"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_cc:0
@@ -95,57 +97,61 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Aquesta gent rebrà una còpia de les comunicacions futures entre l'empresa i "
+"els usuaris per correu electrònic."
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minuts"
 
 #. module: base_action_rule
 #: field:base.action.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Nom de la regla"
 
 #. 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 ""
+"Marqueu aquesta opció si voleu que la regla enviï un recordatori per correu "
+"electrònic a l'empresa."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
-msgstr ""
+msgstr "Condicions en el model empresa"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data límit"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_subject)s = Object subject"
-msgstr ""
+msgstr "%(object_subject)s = Assumpte objecte"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Reminders"
-msgstr ""
+msgstr "Recordatoris email"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr ""
+msgstr "Paraules clau especials per ser utilitzades en el missatge"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
@@ -155,67 +161,74 @@ msgid ""
 "specific sales team, or an opportunity which still has status pending after "
 "14 days might trigger an automatic reminder email."
 msgstr ""
+"Utilitzeu les accions automàtiques per llançar automàticament accions en "
+"diverses pantalles. Per exemple: una iniciativa creada per un usuari concret "
+"pot ser assignada automàticament a un equip de vendes en concret, o una "
+"oportunitat que encara estigui pendent després de 14 dies podeu llançar un e-"
+"mail recordatori automàticament."
 
 #. 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 ""
+"ID de l'email de les persones a els qui el correu electrònic ha de ser "
+"enviat."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 #: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
 msgid "Action Rule"
-msgstr ""
+msgstr "Regla d'acció"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
-msgstr ""
+msgstr "Camps a canviar"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Last Action Date"
-msgstr ""
+msgstr "Data última acció"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Hores"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_id)s = Object ID"
-msgstr ""
+msgstr "%(object_id)s = ID objete"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Delay After Trigger Date"
-msgstr ""
+msgstr "Retard després de la data de llançament"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
 msgid "Remind with Attachment"
-msgstr ""
+msgstr "Recorda amb adjunt"
 
 #. module: base_action_rule
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Arguments invàlids"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible to"
-msgstr ""
+msgstr "Fixa responsable a"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Sense"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_to:0
@@ -223,11 +236,14 @@ 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 ""
+"Utilitzeu una expressió Python per especificar el camp apropiat, el "
+"contingut del qual, s'utilitzarà per al camp \"Per\" de la capçalera del "
+"correu."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_phone)s = Responsible phone"
-msgstr ""
+msgstr "%(object_user_phone)s = Telèfon responsable"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -235,11 +251,14 @@ 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 ""
+"La regla utilitza l'operador AND. El model ha de coincidir amb tots els "
+"camps no-buits perquè la regla executi l'acció descrita en la pestanya "
+"\"Accions\"."
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Tipus de retard"
 
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
@@ -249,16 +268,20 @@ msgid ""
 "string 'urgent'\n"
 "Note: This is case sensitive search."
 msgstr ""
+"Expressió regular per concordar amb el nom del recurs.\n"
+"Per exemple: 'urgent.' cercarà els registres que el seu nom comencin amb el "
+"text 'urgent'\n"
+"Nota: Aquesta recerca distingeix majúscules de minúscules."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
 msgid "Call Object Method"
-msgstr ""
+msgstr "Mètode per cridar l'objecte"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_to:0
 msgid "Email To"
-msgstr ""
+msgstr "Per"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_watchers:0
@@ -266,16 +289,18 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Marqueu aquesta opció si desitgeu que la regla utilitzi CC (envieu correu a "
+"altres persones definides en les accions)."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(partner)s = Nom empresa"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_from:0
@@ -283,16 +308,19 @@ 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 ""
+"Utilitzeu una expressió Python per especificar el camp apropiat, el "
+"contingut del qual, s'utilitzarà per al camp \"Des de\" de la capçalera del "
+"correu."
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Retard després de la data d'activació"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Condicions"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -301,47 +329,51 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Retard després data de llançament. Podeu posar un número negatiu si "
+"necessiteu un retard abans de la data de llançament, com enviar un "
+"recordatori 15 minuts abans d'una reunió."
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:314
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
 msgid "Remind Responsible"
-msgstr ""
+msgstr "Recorda responsable"
 
 #. module: base_action_rule
 #: model:ir.module.module,description:base_action_rule.module_meta_information
 msgid "This module allows to implement action rules for any object."
 msgstr ""
+"Aquest mòdul permet implementar regles d'accions per a qualsevol objecte."
 
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
-msgstr ""
+msgstr "Indiqueu l'ordre de seqüència quan es mostra una llista de regles."
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Months"
-msgstr ""
+msgstr "Mesos"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtre"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: base_action_rule
 #: help:base.action.rule,server_action_id:0
@@ -349,108 +381,113 @@ msgid ""
 "Describes the action name.\n"
 "eg:on which object which action to be taken on basis of which condition"
 msgstr ""
+"Descriu el nom de l'acció.\n"
+"Per exemple: Sobre quin objecte quina acció ha d'executar-se sobre la base "
+"de quina condició."
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_cron
 msgid "ir.cron"
-msgstr ""
+msgstr "ir.cron"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_description)s = Object description"
-msgstr ""
+msgstr "%(object_description)s = Descripció objecte"
 
 #. module: base_action_rule
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Error: L'email no està ben formatat"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Actions"
-msgstr ""
+msgstr "Accions email"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Information"
-msgstr ""
+msgstr "Informació email"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Regles d'acció"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Contingut del correu."
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner_email)s = Partner Email"
-msgstr ""
+msgstr "%(partner_email)s = Email empresa"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_date)s = Creation date"
-msgstr ""
+msgstr "%(object_date)s= Data de creació"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_email)s = Responsible Email"
-msgstr ""
+msgstr "%(object_user_email)s = Email responsable"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_body:0
 msgid "Mail body"
-msgstr ""
+msgstr "Missatge del email"
 
 #. 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 ""
+"Marqueu aquesta opció si voleu que la regla enviï un recordatori per correu "
+"electrònic al usuari."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Acció del servidor a ser executada"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_user:0
 msgid "Mail to Responsible"
-msgstr ""
+msgstr "Envia correu a responsable"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_cc:0
 msgid "Add Watchers (Cc)"
-msgstr ""
+msgstr "Afegeix observadors (CC)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Fields"
-msgstr ""
+msgstr "Condicions en els camps del model"
 
 #. 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 ""
+msgstr "Accions automatitzades"
 
 #. module: base_action_rule
 #: field:base.action.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Acció servidor"
 
 #. module: base_action_rule
 #: field:base.action.rule,regex_name:0
 msgid "Regex on Resource Name"
-msgstr ""
+msgstr "Regex sobre nom del recurs"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_attach:0
@@ -458,21 +495,23 @@ msgid ""
 "Check this if you want that all documents attached to the object be attached "
 "to the reminder email sent."
 msgstr ""
+"Marqueu aquesta opció si desitgeu que tots els documents adjunts a l'objecte "
+"siguin adjuntats al correu de recordatori enviat."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Timing"
-msgstr ""
+msgstr "Condicions sobre temporització"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
-msgstr ""
+msgstr "Accions"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -480,23 +519,24 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the rule "
 "without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar la regla sense eliminar-la."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user)s = Responsible name"
-msgstr ""
+msgstr "%(object_user)s = Nom del responsable"
 
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on States"
-msgstr ""
+msgstr "Condicions sobre els estats"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Data d'activació"
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
new file mode 100644
index 00000000000..06244915efc
--- /dev/null
+++ b/addons/base_action_rule/i18n/da.po
@@ -0,0 +1,502 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-08 22:29+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "E-mail fra"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Email indhold"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Dage"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr "Fejl!"
+
+#. 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 ""
+
+#. 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 "Regel Navn"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Deadline"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. 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 ""
+
+#. 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:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. 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 "Filter"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr ""
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index 5b9650a13ff..4be530a966a 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -535,38 +535,3 @@ msgstr "Bedingungen zu Status"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Auslösetermin"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode bei dieser Ansicht"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen"
-
-#~ 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 haben!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modulbezeichnung für diese Aktion"
-
-#~ msgid ""
-#~ "Create actions automatically triggered based on a user activity in the "
-#~ "system.E.g.: an opportunity created by a specific user can be automatically "
-#~ "maintained with a specific sales team, or an opportunity which still has "
-#~ "status pending after 14 days triggers an automatic reminder email."
-#~ msgstr ""
-#~ "Definition von  Aktionen, die durch bestimmte Vorgänge eines Benutzers "
-#~ "automatisch ausgelöst werden. Z.B. eine neue Verkaufschance kann dazu "
-#~ "führen, dass automatisch ein bestimmtes Vertriebsteam zugewiesen wird, oder "
-#~ "eine Verkaufschance, die nach 14 Tagen immer noch offen ist, löst "
-#~ "automatisch eine neue Email aus."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
index 942110f310f..da2c1a44de8 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cd1174b160c..af6e0c5ae61 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -540,39 +540,3 @@ msgstr "Condiciones en estados"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Fecha activación"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Create actions automatically triggered based on a user activity in the "
-#~ "system.E.g.: an opportunity created by a specific user can be automatically "
-#~ "maintained with a specific sales team, or an opportunity which still has "
-#~ "status pending after 14 days triggers an automatic reminder email."
-#~ msgstr ""
-#~ "Crear acciones lanzadas automáticamente a partir de una actividad de un "
-#~ "usuario en el sistema. P.ej: una oportunidad creada por un usuario "
-#~ "específico puede ser automáticamente mantenida por un equipo de ventas "
-#~ "específico, o una oportunidad que sigue teniendo el estado pendiente después "
-#~ "de 14 días lanza un recordatorio automático por email."
diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_action_rule/i18n/es_EC.po
index daf8a42d0b8..4d825b6c38e 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/es_MX.po b/addons/base_action_rule/i18n/es_MX.po
new file mode 100644
index 00000000000..013a944fede
--- /dev/null
+++ b/addons/base_action_rule/i18n/es_MX.po
@@ -0,0 +1,542 @@
+# 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-16 21:11+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:53+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"Seleccione esta opción si desea que la regla envíe un correo electrónico a "
+"la persona responsable."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Recordar empresa"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Categoría empresa"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "Enviar correo a observadores (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Botón pulsado"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Enviar correo a estos emails"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Fijar estado a"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Mensaje email"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Días"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Última ejecución"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. 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 ""
+"Esta gente recibirá una copia de las comunicaciones futuras entre empresa y "
+"usuarios por correo electrónico."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minutos"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre regla"
+
+#. 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 ""
+"Seleccione esta opción si desea que la regla envíe un recordatorio por "
+"correo electrónico a la empresa."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Condiciones en el modelo empresa"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Asunto objeto"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Recordatorios email"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr "Palabras especiales a usar en el mensaje"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Estado"
+
+#. 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 ""
+"Utilice las acciones automáticas para lanzar automáticamente acciones en "
+"varias pantallas. Por ejemplo: una iniciativa creada por un usuario concreto "
+"puede ser asignada automáticamente a un equipo de ventas en concreto, o una "
+"oportunidad que todaviía esté pendiente tras 14 días puede lanzar un e-mail "
+"recordatorio automáticamente."
+
+#. 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 ""
+"ID del email de las personas a quienes el correo electrónico debe ser "
+"enviado."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Regla acción"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Campos a cambiar"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Fecha última acción"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_id)s = ID objeto"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Retraso después fecha de disparo"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Recordar con adjunto"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Argumentos no válidos"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Fijar responsable a"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. 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 ""
+"Utilice una expresión Python para especificar el campo apropiado cuyo "
+"contenido se utilizará para el campo \"Para\" de la cabecera del correo."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "%(object_user_phone)s = Teléfono responsable"
+
+#. 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 ""
+"La regla utiliza el operador AND. El modelo debe coincidir con todos los "
+"campos no-vacíos para que la regla ejecute la acción descrita en la pestaña "
+"\"Acciones\"."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Tipo retraso"
+
+#. 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 ""
+"Expresión regular para concordar con el nombre del recurso.\n"
+"Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
+"texto 'urgente'\n"
+"Nota: Esta búsqueda distingue mayúsculas de minúsculas."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Llamar método objeto"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Para"
+
+#. 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 ""
+"Marque esta opción si desea que la regla use CC (envíe correo a otras "
+"personas definidas en las acciones)."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(partner)s = Nombre empresa"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Nota"
+
+#. 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 ""
+"Utilice una expresión Python para especificar el campo apropiado cuyo "
+"contenido se utilizará para el campo \"Desde\" de la cabecera del correo."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Retraso después fecha de disparo"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. 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 ""
+"Retraso después fecha de disparo. Puede poner un número negativo si necesita "
+"un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
+"minutos antes de una reunión."
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+"¡No se ha encontrado un ID de email para su dirección de la compañía!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Recordar responsable"
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+"Este módulo permite implementar reglas de acciones para cualquier objeto."
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr "Indica el orden de secuencia cuando se muestra una lista de reglas."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Filtro"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Fecha"
+
+#. 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 ""
+"Describe el nombre de la acción.\n"
+"Por ejemplo: Sobre que objeto que acción debe ejecutarse en base a que "
+"condición."
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr "ir.cron"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr "%(object_description)s = Descripción objeto"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Error: El email no está bien formateado"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "Acciones email"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "Información email"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Reglas acción"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "Contenido del correo."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "%(partner_email)s = Email empresa"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(object_date)s = Fecha de creación"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "%(object_user_email)s = Email responsable"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Mensaje correo"
+
+#. 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 ""
+"Seleccione esta opción si desea que la regla envíe un recordatorio por "
+"correo electrónico al usuario."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Acción de servidor a disparar"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "Enviar correo a responsable"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "Añadir observadores (CC)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr "Condiciones en campos de modelo"
+
+#. 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 "Acciones automatizadas"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Acción servidor"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr "Regex sobre nombre recurso"
+
+#. 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 ""
+"Marque esta opción si desea que todos los documentos adjuntos al objeto sean "
+"adjuntados al correo de recordatorio enviado."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Condiciones en tiempo"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. 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 ""
+"Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr "%(object_user)s = Nombre responsable"
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Condiciones en estados"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Fecha activación"
diff --git a/addons/base_action_rule/i18n/es_PY.po b/addons/base_action_rule/i18n/es_PY.po
index 5085af093e2..8cb3fdc7395 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/es_VE.po b/addons/base_action_rule/i18n/es_VE.po
new file mode 100644
index 00000000000..013a944fede
--- /dev/null
+++ b/addons/base_action_rule/i18n/es_VE.po
@@ -0,0 +1,542 @@
+# 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-16 21:11+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:53+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"Seleccione esta opción si desea que la regla envíe un correo electrónico a "
+"la persona responsable."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Recordar empresa"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Categoría empresa"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "Enviar correo a observadores (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Botón pulsado"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Enviar correo a estos emails"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Fijar estado a"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Mensaje email"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Días"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Última ejecución"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. 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 ""
+"Esta gente recibirá una copia de las comunicaciones futuras entre empresa y "
+"usuarios por correo electrónico."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minutos"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Nombre regla"
+
+#. 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 ""
+"Seleccione esta opción si desea que la regla envíe un recordatorio por "
+"correo electrónico a la empresa."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Condiciones en el modelo empresa"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Asunto objeto"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Recordatorios email"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr "Palabras especiales a usar en el mensaje"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Estado"
+
+#. 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 ""
+"Utilice las acciones automáticas para lanzar automáticamente acciones en "
+"varias pantallas. Por ejemplo: una iniciativa creada por un usuario concreto "
+"puede ser asignada automáticamente a un equipo de ventas en concreto, o una "
+"oportunidad que todaviía esté pendiente tras 14 días puede lanzar un e-mail "
+"recordatorio automáticamente."
+
+#. 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 ""
+"ID del email de las personas a quienes el correo electrónico debe ser "
+"enviado."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Regla acción"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Campos a cambiar"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Fecha última acción"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_id)s = ID objeto"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Retraso después fecha de disparo"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Recordar con adjunto"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Argumentos no válidos"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Fijar responsable a"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. 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 ""
+"Utilice una expresión Python para especificar el campo apropiado cuyo "
+"contenido se utilizará para el campo \"Para\" de la cabecera del correo."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "%(object_user_phone)s = Teléfono responsable"
+
+#. 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 ""
+"La regla utiliza el operador AND. El modelo debe coincidir con todos los "
+"campos no-vacíos para que la regla ejecute la acción descrita en la pestaña "
+"\"Acciones\"."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Tipo retraso"
+
+#. 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 ""
+"Expresión regular para concordar con el nombre del recurso.\n"
+"Por ejemplo: 'urgente.*' buscará los registros que su nombre empiecen con el "
+"texto 'urgente'\n"
+"Nota: Esta búsqueda distingue mayúsculas de minúsculas."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Llamar método objeto"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Para"
+
+#. 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 ""
+"Marque esta opción si desea que la regla use CC (envíe correo a otras "
+"personas definidas en las acciones)."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(partner)s = Nombre empresa"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Nota"
+
+#. 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 ""
+"Utilice una expresión Python para especificar el campo apropiado cuyo "
+"contenido se utilizará para el campo \"Desde\" de la cabecera del correo."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Retraso después fecha de disparo"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. 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 ""
+"Retraso después fecha de disparo. Puede poner un número negativo si necesita "
+"un retraso antes de la fecha de disparo, como enviar un recordatorio 15 "
+"minutos antes de una reunión."
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+"¡No se ha encontrado un ID de email para su dirección de la compañía!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Recordar responsable"
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+"Este módulo permite implementar reglas de acciones para cualquier objeto."
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr "Indica el orden de secuencia cuando se muestra una lista de reglas."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Filtro"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Fecha"
+
+#. 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 ""
+"Describe el nombre de la acción.\n"
+"Por ejemplo: Sobre que objeto que acción debe ejecutarse en base a que "
+"condición."
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr "ir.cron"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr "%(object_description)s = Descripción objeto"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Error: El email no está bien formateado"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "Acciones email"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "Información email"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Reglas acción"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "Contenido del correo."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "%(partner_email)s = Email empresa"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(object_date)s = Fecha de creación"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "%(object_user_email)s = Email responsable"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Mensaje correo"
+
+#. 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 ""
+"Seleccione esta opción si desea que la regla envíe un recordatorio por "
+"correo electrónico al usuario."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Acción de servidor a disparar"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "Enviar correo a responsable"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "Añadir observadores (CC)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr "Condiciones en campos de modelo"
+
+#. 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 "Acciones automatizadas"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Acción servidor"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr "Regex sobre nombre recurso"
+
+#. 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 ""
+"Marque esta opción si desea que todos los documentos adjuntos al objeto sean "
+"adjuntados al correo de recordatorio enviado."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Condiciones en tiempo"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. 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 ""
+"Si el campo activo se desmarca, permite ocultar la regla sin eliminarla."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr "%(object_user)s = Nombre responsable"
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Condiciones en estados"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Fecha activación"
diff --git a/addons/base_action_rule/i18n/fi.po b/addons/base_action_rule/i18n/fi.po
index bc2a3bb5cf9..736805ae4ed 100644
--- a/addons/base_action_rule/i18n/fi.po
+++ b/addons/base_action_rule/i18n/fi.po
@@ -14,14 +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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Valitse tämä jos haluat säännön lähettävän sähköpostia vastuuhenkilölle."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_partner:0
@@ -31,12 +32,12 @@ msgstr "Muistuta Kumppania"
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Kumppanin katerogia"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
 msgid "Mail to Watchers (CC)"
-msgstr ""
+msgstr "Lähetä sähköpostia seuraajille (CC)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
@@ -46,37 +47,37 @@ msgstr "Painiketta painettu"
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objekti"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr ""
+msgstr "Lähetä sähköpostia näihin osoitteisiin"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Aseta tilaksi"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_from:0
 msgid "Email From"
-msgstr ""
+msgstr "Sähköposti lähettäjältä"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
-msgstr ""
+msgstr "Sähköpostin runko"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
-msgstr ""
+msgstr "Päivät"
 
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Viimeisin suoritus"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:313
@@ -87,19 +88,19 @@ msgstr "Virhe!"
 #. module: base_action_rule
 #: field:base.action.rule,act_reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Vastausosoite"
 
 #. 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 ""
+msgstr "Nämä henkilöt vastaanottavat kopion tulevista viesteistä"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minuutit"
 
 #. module: base_action_rule
 #: field:base.action.rule,name:0
@@ -117,7 +118,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
-msgstr ""
+msgstr "Mallikumppanin ehdot"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -137,17 +138,17 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Reminders"
-msgstr ""
+msgstr "Sähköposti muistuttimiet"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr ""
+msgstr "Avainsanat joita käytetään viestirungossa"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
@@ -157,17 +158,21 @@ msgid ""
 "specific sales team, or an opportunity which still has status pending after "
 "14 days might trigger an automatic reminder email."
 msgstr ""
+"Käytä automaattisia toimintoja liipaistaksesi toimintoja eri ruuduissa. "
+"Esim: käyttäjän luoma mahdollisuus voidaan automaattisesti ohjata tietylle "
+"myyntitiimille, tai mahdolisuus joka odottaa 14 päivää voi liipaista "
+"automaattisen muistutussähköpostin."
 
 #. 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 ""
+msgstr "Vastaanottavien henkilöiden sähköpostiosoitteet"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 #: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
 msgid "Action Rule"
-msgstr ""
+msgstr "Toimintosääntö"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -182,12 +187,12 @@ msgstr "Luontipäivämäärä"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Last Action Date"
-msgstr ""
+msgstr "Viimeisen toiminnon päivämäärä"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Tunnit"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -197,27 +202,27 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Delay After Trigger Date"
-msgstr ""
+msgstr "Viive liipaisupäivän jälkeen"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
 msgid "Remind with Attachment"
-msgstr ""
+msgstr "Muistuta liitteen kanssa"
 
 #. module: base_action_rule
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Virheelliset argumentit"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible to"
-msgstr ""
+msgstr "Aseta vastuuhenkilöksi"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_to:0
@@ -237,11 +242,14 @@ 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 ""
+"Tämä sääntö käyttää JA (and) operaattoria. Mallin tulee vastata kaikkia ei-"
+"tyhjiä kenttiä jolloin sääntö suorittaa 'toiminnot' välilehdellä määritellyt "
+"toiminnot."
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Viivästyksen tyyppi"
 
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
@@ -255,12 +263,12 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
 msgid "Call Object Method"
-msgstr ""
+msgstr "Kutsu objektia"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_to:0
 msgid "Email To"
-msgstr ""
+msgstr "Viestin vastaanottaja"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_watchers:0
@@ -268,11 +276,13 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Valitse tämä jos haluat säännön merkkaavan CC (sähköpostia kenelle tahansa "
+"toiminnossa määritellylle henkilölle)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(kumppani)t = Kumppanin nimi"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -289,7 +299,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Viive ajastetun päivämäärän jälkeen"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -313,37 +323,38 @@ msgstr "Aktiivinen"
 #: code:addons/base_action_rule/base_action_rule.py:314
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Sähköpostiosoitetta ei löytynyt yrityksen tiedoista!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
 msgid "Remind Responsible"
-msgstr ""
+msgstr "Muistuta vastuuhenkilöä"
 
 #. module: base_action_rule
 #: model:ir.module.module,description:base_action_rule.module_meta_information
 msgid "This module allows to implement action rules for any object."
 msgstr ""
+"Tämä moduuli mahdolistaa toimintosääntöjen luomisen mille tahansa objektille."
 
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
-msgstr ""
+msgstr "Antaa järjestyksen sääntölistaa näytettäessä."
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Months"
-msgstr ""
+msgstr "Kuukaudet"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Suodin"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Date"
-msgstr ""
+msgstr "Päiväys"
 
 #. module: base_action_rule
 #: help:base.action.rule,server_action_id:0
@@ -365,32 +376,32 @@ msgstr ""
 #. module: base_action_rule
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Virhe: sähköposti ei ole oikein muotoiltu"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Actions"
-msgstr ""
+msgstr "Sähköpostitoiminnot"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Information"
-msgstr ""
+msgstr "Sähköpostin tiedot"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Toimintosäännöt"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Sähköpostin sisältö"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -410,7 +421,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_body:0
 msgid "Mail body"
-msgstr ""
+msgstr "Viestirunko"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_user:0
@@ -423,17 +434,17 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Liipaistava palvelintoiminto"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_user:0
 msgid "Mail to Responsible"
-msgstr ""
+msgstr "Lähetä sähköpostia vastuuhenkilölle"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_cc:0
 msgid "Add Watchers (Cc)"
-msgstr ""
+msgstr "Lisää seuraajia (Cc)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -444,12 +455,12 @@ msgstr ""
 #: 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 ""
+msgstr "Automatisoidut Toiminnot"
 
 #. module: base_action_rule
 #: field:base.action.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Palvelintoiminto"
 
 #. module: base_action_rule
 #: field:base.action.rule,regex_name:0
@@ -466,17 +477,17 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Timing"
-msgstr ""
+msgstr "Ajastuksen tilat"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
-msgstr ""
+msgstr "Toiminnot"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -484,6 +495,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the rule "
 "without removing it."
 msgstr ""
+"Jos aktiivisen kentän tilaksi asetetaan epätosi (false), se mahdollistaa "
+"säännön piilottamisen poistamatta sitä."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -493,14 +506,14 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on States"
-msgstr ""
+msgstr "Tilojen asemat"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Liipaisupäivämäärä"
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 165a7e2c2b5..a87b1b73a35 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -538,15 +538,3 @@ msgstr "Conditions sur les états"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Date de déclenchement"
-
-#~ msgid ""
-#~ "Create actions automatically triggered based on a user activity in the "
-#~ "system.E.g.: an opportunity created by a specific user can be automatically "
-#~ "maintained with a specific sales team, or an opportunity which still has "
-#~ "status pending after 14 days triggers an automatic reminder email."
-#~ msgstr ""
-#~ "Créer des actions déclenchées automatiquement en fonction des activités de "
-#~ "l'utilisateur dans le système. Ex : une opportunité créée par un utilisateur "
-#~ "donné peut être automatiquement maintenue avec une équipe de vente donnée, "
-#~ "ou encore : une opportunité  avec un status toujours \"en attente\" après 14 "
-#~ "jours déclenche automatiquement un courriel de rappel."
diff --git a/addons/base_action_rule/i18n/gl.po b/addons/base_action_rule/i18n/gl.po
index e6e4785d897..d4f2085022a 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e0b56b827fc..615e951c020 100644
--- a/addons/base_action_rule/i18n/hu.po
+++ b/addons/base_action_rule/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-31 11:48+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -532,63 +533,3 @@ msgstr "Állapotok feltételei"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Indítás dátuma"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Érvénytelen modell név a művelet meghatározásában."
-
-#~ msgid ""
-#~ "Create actions automatically triggered based on a user activity in the "
-#~ "system.E.g.: an opportunity created by a specific user can be automatically "
-#~ "maintained with a specific sales team, or an opportunity which still has "
-#~ "status pending after 14 days triggers an automatic reminder email."
-#~ msgstr ""
-#~ "Automatikusan elinduló műveletek létrehozása egy felhasználó aktivitása "
-#~ "alapján a rendszerben. Pl.: egy alkalom létrehozása egy speciális "
-#~ "felhasználó által, amit automatikusan fenntarthatnak egy speciális "
-#~ "értékesítési csoporttal, vagy egy alkalom, amely még folyamatos státuszban "
-#~ "van, 14 nap után egy automatikus emlékeztető emailt küld."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "A modul nevének egyedinek kell lennie!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "A modul tanusítvány ID-jének egyedinek kell lennie !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Érvénytelen XML a nézet architektúrában!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Hiba ! Nem hozhat létre rekurzív Menüt."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "A mező mérete soha nem lehet kevesebb, mint 1 !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Az objektum nevének x_ -sal kell kezdődnie és nem tartalmazhat speciális "
-#~ "karaktereket"
-
-#~ msgid ""
-#~ "Regular expression for matching name of the resource\n"
-#~ "\"\n"
-#~ "\"e.g.: 'urgent.*' will search for records having name starting with the "
-#~ "string 'urgent'\n"
-#~ "\"\n"
-#~ "\"Note: This is case sensitive search."
-#~ msgstr ""
-#~ "Szabályos kifejezések az erőforrás nevének összehasonlításához\n"
-#~ "\"\n"
-#~ "\"pl.: 'sürgős.*' megkeresi azokat a rekordokat, amelyeknek a neve a "
-#~ "'sürgős' sztringgel kezdődik\n"
-#~ "\"\n"
-#~ "\"Megjegyzés: Ez kis- és nagybetűket megkülönböztető keresés."
-
-#~ msgid ""
-#~ "Describes the action name.\n"
-#~ "\"\n"
-#~ "\"eg:on which object which action to be taken on basis of which condition"
-#~ msgstr ""
-#~ "Leírja a művelet nevét.\n"
-#~ "\"\n"
-#~ "\"pl: melyik objektumon melyik alkalmazás melyik feltétel alapján történik"
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index 85dad3b1786..f05c9bda090 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-04-25 09:02+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -529,27 +529,3 @@ msgstr "Condizioni sugli stati"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Data Programmata"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non puoi creare un menù ricorsivo"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/base_action_rule/i18n/lt.po b/addons/base_action_rule/i18n/lt.po
index 6011aaf8e7f..936992c0350 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f1beaacf9bc..8183d873cd9 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c649acc9259..38a2a5bb1e0 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -511,27 +511,3 @@ msgstr "Нөхцөл байдал"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Гарааны огноо"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж болохгүй!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index 889a3239659..1b8db285b73 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -535,38 +535,3 @@ msgstr "Voorwaarden op status"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Activeerdatum"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige naam van het model in de actie definitie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "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 "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "Create actions automatically triggered based on a user activity in the "
-#~ "system.E.g.: an opportunity created by a specific user can be automatically "
-#~ "maintained with a specific sales team, or an opportunity which still has "
-#~ "status pending after 14 days triggers an automatic reminder email."
-#~ msgstr ""
-#~ "Maakt automatisch acties die worden geactiveerd op basis van "
-#~ "gebruikersactiviteit in het systeem. Bijv.: een verkoopkans door een "
-#~ "specifieke gebruiker gemaakt kan automatisch worden onderhouden door een "
-#~ "specifiek verkooptea, of een verkoopkans die na 14 dagen nog steeds status "
-#~ "wachtend heeft activeert automatisch een herinnering email."
diff --git a/addons/base_action_rule/i18n/pl.po b/addons/base_action_rule/i18n/pl.po
index 3950d6eba98..d1de19d0998 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index 242edaaf928..d894a6b799b 100644
--- a/addons/base_action_rule/i18n/pt.po
+++ b/addons/base_action_rule/i18n/pt.po
@@ -8,25 +8,26 @@ 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-12-15 20:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-23 12:16+0000\n"
+"Last-Translator: Paulino Ascenção <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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-24 05:00+0000\n"
+"X-Generator: Launchpad (build 14336)\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 ""
+"Assinale aqui se pretender que a regra envie um e-mail à pessoa responsável."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_partner:0
 msgid "Remind Partner"
-msgstr "Alertar parceiro"
+msgstr "Relembrar parceiro"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
@@ -36,12 +37,12 @@ msgstr "Categoria de parceiros"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
 msgid "Mail to Watchers (CC)"
-msgstr ""
+msgstr "E-mail para observadores (CC)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr ""
+msgstr "Botão pressionado"
 
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
@@ -76,7 +77,7 @@ msgstr "Dias"
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Última execução"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:313
@@ -87,7 +88,7 @@ msgstr "Erro!"
 #. module: base_action_rule
 #: field:base.action.rule,act_reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder para"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_cc:0
@@ -104,13 +105,14 @@ msgstr "Minutos"
 #. module: base_action_rule
 #: field:base.action.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Nome da regra"
 
 #. 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 ""
+"Assinale  se quer que a regra envie um lembrete por email ao parceiro"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -140,7 +142,7 @@ msgstr "Lembretes por correio eletrónico"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr ""
+msgstr "Palavras chave especiais a serem usadas no conteúdo"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
@@ -215,7 +217,7 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Nenhum"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_to:0
@@ -258,7 +260,7 @@ msgstr "Chamar o método do objeto"
 #. module: base_action_rule
 #: field:base.action.rule,act_email_to:0
 msgid "Email To"
-msgstr ""
+msgstr "E-mail para"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_watchers:0
@@ -305,7 +307,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:314
@@ -336,7 +338,7 @@ msgstr "Meses"
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -368,12 +370,12 @@ msgstr "Erro: A mensagem não está bem formatada"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Actions"
-msgstr ""
+msgstr "Ações do e-mail"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Information"
-msgstr ""
+msgstr "Informação sobre o e-mail"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -415,6 +417,8 @@ msgstr "Corpo da mensagem"
 msgid ""
 "Check this if you want the rule to send a reminder by email to the user."
 msgstr ""
+"Assinale aqui se quiser que a regra envie um lembrete para o e-mail do "
+"utilizador."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -429,7 +433,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_email_cc:0
 msgid "Add Watchers (Cc)"
-msgstr ""
+msgstr "Acdicionar observadores (CC)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -499,4 +503,4 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Data de ativação"
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po
index ed808e75f90..4dac6cbcdd6 100644
--- a/addons/base_action_rule/i18n/pt_BR.po
+++ b/addons/base_action_rule/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ro.po b/addons/base_action_rule/i18n/ro.po
index bd3e28db6c3..5935e6f66e1 100644
--- a/addons/base_action_rule/i18n/ro.po
+++ b/addons/base_action_rule/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-19 19:19+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 11e016aa3cb..25eeaafc8e3 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -130,7 +130,7 @@ msgstr "Срок"
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_id:0
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Контрагент"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -535,24 +535,3 @@ msgstr "Условия по продажам"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Дата активации"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_action_rule/i18n/sl.po
new file mode 100644
index 00000000000..6410052ab38
--- /dev/null
+++ b/addons/base_action_rule/i18n/sl.po
@@ -0,0 +1,505 @@
+# Slovenian 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-09-15 06:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Opomni partnerja"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Kategorija partnerja"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Pritisnjeni gumb"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Predmet"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Sporočila na te e-pošte"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Nastavi stanje na"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "E-pošta od"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Vsebina e-pošte"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Dnevi"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Zadnji zagon"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr "Napaka!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Odgovori-na"
+
+#. 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 ""
+"Ti ljudje bodo prejeli kopijo bodočih komunikacij med partnerjem in "
+"uporabniki po e-pošti"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minute"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Ime pravila"
+
+#. 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 ""
+"Označite to, če želite da pravilo pošlje opomnik po e-pošti partnerju."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Rok"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Stranka"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Ustvarjeno dne"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr ""
diff --git a/addons/base_action_rule/i18n/sq.po b/addons/base_action_rule/i18n/sq.po
index be2cb202dca..5ffd3e82be1 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 08623ec3325..f06d55ed021 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -524,17 +524,3 @@ msgstr "Uslovi vezani za Stanja"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Datum Okidanja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere"
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_action_rule/i18n/sr@latin.po
index b263903025a..becf7777310 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -524,17 +524,3 @@ msgstr "Uslovi vezani za Stanja"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Datum Okidanja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere"
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index c50d4d381d0..af96a46e984 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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -500,6 +500,3 @@ msgstr ""
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_action_rule/i18n/tr.po
index c7120a9b549..435985d4137 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: 2011-06-01 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ad3bf205f9b..ce0dd93e79c 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -31,7 +31,7 @@ msgstr "提醒业务伙伴"
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
 msgid "Partner Category"
-msgstr "供应商分类"
+msgstr "业务伙伴分类"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
@@ -71,7 +71,7 @@ msgstr "电子邮件正文"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
-msgstr "日数"
+msgstr "天数"
 
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
@@ -94,7 +94,7 @@ msgstr "回复到"
 msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
-msgstr ""
+msgstr "这些人将收到将来用户与业务伙伴通信的电子邮件副本"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -115,7 +115,7 @@ msgstr "如果您希望该规则发送提醒邮件给业务伙伴的话请选中
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
-msgstr ""
+msgstr "业务伙伴模型的条件"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -130,7 +130,7 @@ msgstr "业务伙伴"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_subject)s = Object subject"
-msgstr ""
+msgstr "%(object_subject)s = 对象主题"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -155,11 +155,13 @@ msgid ""
 "specific sales team, or an opportunity which still has status pending after "
 "14 days might trigger an automatic reminder email."
 msgstr ""
+"使用自动操作，自动触发各种屏幕的行动。例：一个特定的用户创建了一个线索可能被自动归为一个特定的销售队伍，或商机仍然保持状态，可能待14天之后会触发自动电子"
+"邮件提醒。"
 
 #. 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 ""
+msgstr "要发送邮件的人的电子邮件 ID"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -200,7 +202,7 @@ msgstr "触发日期后的延迟"
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
 msgid "Remind with Attachment"
-msgstr ""
+msgstr "附件提醒"
 
 #. module: base_action_rule
 #: constraint:ir.cron:0
@@ -210,7 +212,7 @@ msgstr "无效的参数"
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible to"
-msgstr ""
+msgstr "设置负责人"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -222,7 +224,7 @@ msgstr "无"
 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 ""
+msgstr "使用Python表达式指定了正确的字段作为收信人地址"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -234,7 +236,7 @@ msgstr "%(object_user_phone)s = 责任人电话"
 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 ""
+msgstr "这个规则适用 AND 运算。这个模型必须匹配所有非空的字段，以便执行该规则在“操作”标签中所描述的行动。"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
@@ -249,6 +251,9 @@ msgid ""
 "string 'urgent'\n"
 "Note: This is case sensitive search."
 msgstr ""
+"正则表达式匹配的资源名称\n"
+"如：“紧急.*'将搜索字符串”紧急“的名称开始记录\n"
+"注：这是区分大小写的搜索。"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
@@ -265,7 +270,7 @@ msgstr "邮件至"
 msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
-msgstr ""
+msgstr "勾选，如果你想设定一个规则来抄送邮件（按照已定义的动作发邮件给别人）"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -282,7 +287,7 @@ msgstr "备注"
 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 ""
+msgstr "使用Python表达式指定了正确的字段作为寄信人地址"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
@@ -300,7 +305,7 @@ msgid ""
 "Delay After Trigger Date,specifies you can put a negative number. If you "
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
-msgstr ""
+msgstr "你可以填一个负数来推迟触发日期，例如你在开会前要推迟15分钟触发"
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
@@ -321,12 +326,12 @@ msgstr "提醒责任人"
 #. module: base_action_rule
 #: model:ir.module.module,description:base_action_rule.module_meta_information
 msgid "This module allows to implement action rules for any object."
-msgstr ""
+msgstr "这个模块允许任何对象实现的行动规则。"
 
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
-msgstr ""
+msgstr "为规则列表添加序号"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -336,7 +341,7 @@ msgstr "月"
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "Filter"
-msgstr "过滤器"
+msgstr "筛选"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -349,21 +354,23 @@ msgid ""
 "Describes the action name.\n"
 "eg:on which object which action to be taken on basis of which condition"
 msgstr ""
+"描述动作的名称。\n"
+"例如：哪些对象在哪些条件的基础上应采取的行动"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_cron
 msgid "ir.cron"
-msgstr ""
+msgstr "ir.cron"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_description)s = Object description"
-msgstr ""
+msgstr "%(object_description)s = 对象描述"
 
 #. module: base_action_rule
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "错误:邮件没有正确的格式"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -383,7 +390,7 @@ msgstr "动作规则"
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "邮件内容"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
@@ -450,14 +457,14 @@ msgstr "服务器动作"
 #. module: base_action_rule
 #: field:base.action.rule,regex_name:0
 msgid "Regex on Resource Name"
-msgstr ""
+msgstr "正则表达式对资源名称"
 
 #. 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 ""
+msgstr "如果你想作为附件添加对象的所有文件到一个提醒邮件，勾选这"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -479,12 +486,12 @@ msgstr "动作"
 msgid ""
 "If the active field is set to False, it will allow you to hide the rule "
 "without removing it."
-msgstr ""
+msgstr "如果有效不勾选，你可以不需删除这个规则而隐藏它"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user)s = Responsible name"
-msgstr ""
+msgstr "%(object_user)s = 负责人姓名"
 
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
diff --git a/addons/base_action_rule/i18n/zh_TW.po b/addons/base_action_rule/i18n/zh_TW.po
new file mode 100644
index 00000000000..b35e9a2c107
--- /dev/null
+++ b/addons/base_action_rule/i18n/zh_TW.po
@@ -0,0 +1,502 @@
+# Chinese (Traditional) 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-09-27 12:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "伙伴分類"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "物件"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "日"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "分鐘"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "規則名稱"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "最後限期"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "伙伴"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "動作規則"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "要變更欄位"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "最後動作日期"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "小時"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "無"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "延遲類型"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "電郵至"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "備註"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "條件"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "活躍"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "月"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "日期"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "電郵動作"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "電郵資料"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "動作規則"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "郵件內容"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(object_date)s = 建立日期"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "郵件內文"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. 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 "自動化動作"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "伺服器動作"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "動作"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr ""
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 4281ec08d90..0dd72a17038 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Basic Calendar Functionality",
     "version" : "1.0",
-    "depends" : ["base"],
+    "depends" : ["base", "mail"],
     'complexity': "easy",
     'description': """
 This is a full-featured calendar system.
@@ -34,7 +34,7 @@ It supports:
     - Recurring events
     - Invitations to people""",
     "author" : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden',
     'website': 'http://www.openerp.com',
     "init_xml" : [
         'base_calendar_data.xml'
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a128e18fcc1..45624a280f1 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -386,7 +386,7 @@ property or property parameter."),
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
-        raise osv.except_osv(_('Warning!'), _('Can not Duplicate'))
+        raise osv.except_osv(_('Warning!'), _('You cannot duplicate a calendar attendee.'))
 
     def get_ics_file(self, cr, uid, event_obj, context=None):
         """
@@ -484,6 +484,7 @@ property or property parameter."),
             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 [])
@@ -510,14 +511,15 @@ 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)
-                    tools.email_send(
+                    mail_message.schedule_with_attach(cr, uid,
                         email_from,
                         mail_to,
                         sub,
                         body,
-                        attach=attach and [('invitation.ics', attach)] or None,
+                        attachments=attach and {'invitation.ics': attach} or None,
                         subtype='html',
-                        reply_to=email_from
+                        reply_to=email_from,
+                        context=context
                     )
             return True
 
@@ -812,6 +814,7 @@ class calendar_alarm(osv.osv):
         """
         if context is None:
             context = {}
+        mail_message = self.pool.get('mail.message')
         current_datetime = datetime.now()
         request_obj = self.pool.get('res.request')
         alarm_ids = self.search(cr, uid, [('state', '!=', 'done')], context=context)
@@ -893,11 +896,12 @@ From:
                     for att in alarm.attendee_ids:
                         mail_to.append(att.user_id.user_email)
                     if mail_to:
-                        tools.email_send(
+                        mail_message.schedule_with_attach(cr, uid,
                             tools.config.get('email_from', False),
                             mail_to,
                             sub,
-                            body
+                            body,
+                            context=context
                         )
             if next_trigger_date:
                 update_vals.update({'trigger_date': next_trigger_date})
@@ -991,17 +995,26 @@ class calendar_event(osv.osv):
         """
         
         result = {}
+        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:
-                raise osv.except_osv(_('Warning!'), _('Interval can not be Negative'))
+                raise osv.except_osv(_('Warning!'), _('Interval cannot be negative'))
             if datas.get('count', 0) < 0:
-                raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
-            result[event] = self.compute_rule_string(datas)
+                raise osv.except_osv(_('Warning!'), _('Count cannot be negative'))
+            if datas['recurrency']:
+                result[event] = self.compute_rule_string(datas)
+            else:
+                result[event] = ""
         return result
-
+    
+      
+    
+    
     _columns = {
-        'id': fields.integer('ID'),
+        '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)]}),
@@ -1038,7 +1051,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         '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_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
-        'end_type' : fields.selection([('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'),
+        '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)"),
         'count': fields.integer('Repeat', help="Repeat x times"),
         'mo': fields.boolean('Mon'),
@@ -1068,6 +1081,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"),
         'edit_all': fields.boolean('Edit All', help="Edit all Occurrences  of recurrent Meeting."),
     }
+    
     def default_organizer(self, cr, uid, context=None):
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
@@ -1173,7 +1187,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         @param self: the object pointer
         @param datas: dictionary of freq and interval value.
         """
-        
         def get_week_string(freq, datas):
             weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
             if freq == 'weekly':
@@ -1199,16 +1212,96 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             
             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 '')
-       
+
         freq=datas.get('rrule_type')
         if freq == 'none':
             return ''
-        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)
 
+        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)
+    
+    def _get_empty_rrule_data(self):
+        return  {
+            'byday' : False,
+            'recurrency' : False,
+            'end_date' : False, 
+            'rrule_type' : False, 
+            'select1' : False, 
+            'interval' : 0, 
+            'count' : False, 
+            'end_type' : False, 
+            'mo' : False, 
+            'tu' : False, 
+            'we' : False, 
+            'th' : False, 
+            'fr' : False, 
+            'sa' : False, 
+            'su' : False, 
+            'exrule' : False, 
+            'day' : False, 
+            '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']
+        r = rrule.rrulestr(rule, dtstart=datetime.strptime(date_start, "%Y-%m-%d %H:%M:%S"))
+        
+        if r._freq > 0 and r._freq < 4:
+            data['rrule_type'] = rrule_type[r._freq]
+            
+        data['count'] = r._count
+        data['interval'] = r._interval
+        data['end_date'] = r._until and r._until.strftime("%Y-%m-%d %H:%M:%S")
+        #repeat weekly
+        if r._byweekday:
+            for i in xrange(0,7):
+                if i in r._byweekday:
+                    data[day_list[i]] = True
+            data['rrule_type'] = 'weekly'
+        #repeat monthly bynweekday ((weekday, weeknumber), )
+        if r._bynweekday: 
+            data['week_list'] = day_list[r._bynweekday[0][0]].upper()
+            data['byday'] = r._bynweekday[0][1]
+            data['select1'] = 'day'
+            data['rrule_type'] = 'monthly' 
+           
+        if r._bymonthday:
+            data['day'] = r._bymonthday[0]
+            data['select1'] = 'date'
+            data['rrule_type'] = 'monthly'
+            
+        #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
+            
+        #FIXEME handle forever case
+        #end of recurrence    
+        #in case of repeat for ever that we do not support right now
+        if not (data.get('count') or data.get('end_date')):
+            data['count'] = 100
+        if data.get('count'):
+            data['end_type'] = 'count'
+        else:
+            data['end_type'] = 'end_date'  
+        return data  
 
     def remove_virtual_id(self, ids):
-        if isinstance(ids, (str, int)):
+        if isinstance(ids, (str, int, long)):
             return base_calendar_id2real_id(ids)
             
         if isinstance(ids, (list, tuple)):
@@ -1216,9 +1309,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             for id in ids:
                 res.append(base_calendar_id2real_id(id))
             return res
-                
-    def search(self, cr, uid, args, offset=0, limit=0, order=None,
-            context=None, count=False):
+
+    def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
         args_without_date = []
         start_date = False
         until_date = False
@@ -1239,7 +1331,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                     if until_date:
                         continue
                     until_date = arg[2]
-        
         res = super(calendar_event, self).search(cr, uid, args_without_date, \
                                  0, 0, order, context, count=False)
         res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit, context=context)
@@ -1250,7 +1341,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         else:
             return res
 
-
     def get_edit_all(self, cr, uid, id, vals=None):
         """
             return true if we have to edit all meeting from the same recurrent
@@ -1277,7 +1367,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                 return date_start == split_id[1]
             except Exception:
                 return True
-  
+
+
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         if context is None:
             context = {}
@@ -1285,11 +1376,13 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             select = [ids]
         else:
             select = ids
+            
+       
+            
         new_ids = []
         res = False
         for event_id in select:
             real_event_id = base_calendar_id2real_id(event_id)
-            
             edit_all = self.get_edit_all(cr, uid, event_id, vals=vals)
             if edit_all:
                 if self.need_to_update(event_id, vals):
@@ -1336,6 +1429,13 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             context=context)
         vals.update(updated_vals.get('value', {}))
         if new_ids:
+            if 'rrule' in vals.keys():
+                if 'date' in vals.keys():
+                    date_to_write = vals['date']
+                else:
+                    date_to_write = False
+                self._write_rrule(cr, uid, new_ids, vals['rrule'], date_to_write, context)
+                
             res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
 
         if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
@@ -1393,13 +1493,13 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         if fields and 'duration' not in fields:
             fields.append('duration')
 
+        real_data = super(calendar_event, self).read(cr, uid,
+                    [real_id for base_calendar_id, real_id in select],
+                    fields=fields, context=context, load=load)
+        real_data = dict(zip([x['id'] for x in real_data], real_data))
 
         for base_calendar_id, real_id in select:                
-            #REVET: Revision ID: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn
-            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
-           
-            if not res :
-                continue
+            res = real_data[real_id].copy()
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
             if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
                 res['date'] = ls[1]
@@ -1462,6 +1562,11 @@ 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:]
+        
+        if 'date' in vals and 'rrule' in vals and vals['rrule']:
+            update_datas = self._parse_rrule(vals['rrule'], self._get_empty_rrule_data(), vals['date'])
+            update_datas['recurrency'] = True
+            vals.update(update_datas)
 
         updated_vals = self.onchange_dates(cr, uid, [],
             vals.get('date', False),
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 451152b2b58..3ce934b4ded 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -78,6 +78,7 @@
                     <field name="sent_by_uid" string="Invitation From" />
                     <field name="role" string="My Role"/>
                     <field name="user_id" invisible="1"/>
+                    <field name="partner_address_id" invisible="1"/>
                     <field name="cutype" string="Invitation type"/>
                     <field name="state" />
                     <field name="rsvp" string="Required to Join"/>
@@ -110,22 +111,22 @@
                 <search string="Search Invitations">
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
-                       separator="1" help="Invitations To Review" />
+                       help="Invitations To Review" />
                    <filter icon="terp-check" string="Accepted"
                        domain="[('state','=', 'accepted')]"
-                       separator="1" help="Accepted Invitations" />
+                       help="Accepted Invitations" />
                    <filter icon="terp-dialog-close" string="Declined"
                        domain="[('state','=', 'declined')]"
-                       separator="1" help="Declined Invitations" />
+                       help="Declined Invitations" />
                    <filter icon="gtk-sort-descending" string="Delegated"
                        domain="[('state','=', 'delegated')]"
-                       separator="1" help="Delegated Invitations" />
+                       help="Delegated Invitations" />
                    <separator orientation="vertical"/>
-                   <field name="email" select='1'/>
-                   <field name="user_id" select="1" string="Responsible"/>
+                   <field name="email"/>
+                   <field name="user_id" string="Responsible"/>
                    <separator orientation="vertical"/>
-                   <field name="cutype" string="Invitation type" select="1"/>
-                   <field name="event_date" select="1"/>
+                   <field name="cutype" string="Invitation type"/>
+                   <field name="event_date"/>
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
@@ -447,7 +448,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Events">
-                       <group col="12" colspan="4">
+                       <group>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
@@ -456,13 +457,13 @@
                                domain="[('state','=','confirmed')]"
                                help="Confirmed Events" />
                            <separator orientation="vertical"/>
-                           <field name="name" select="1" string="Summary"/>
-                           <field name="location" select="1" string="Location"/>
+                           <field name="name" string="Summary"/>
+                           <field name="location" string="Location"/>
                            <separator orientation="vertical"/>
-                           <field name="user_id" select="1"/>
+                           <field name="user_id"/>
                            <separator orientation="vertical"/>
-                           <field name="show_as" select="1"/>
-                           <field name="class" select="1" string="Privacy"/>
+                           <field name="show_as"/>
+                           <field name="class" string="Privacy"/>
                        </group>
                        <newline/>
                         <group expand="0" string="Group By...">
diff --git a/addons/base_calendar/i18n/af.po b/addons/base_calendar/i18n/af.po
index 8e2ce64d32b..ab1862d146b 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Maart"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Uitnodiging besonderhede"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -375,8 +376,8 @@ msgstr "Sperdatum"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Waarskuwing!"
@@ -838,7 +839,7 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -888,7 +889,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1070,7 +1070,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/ar.po b/addons/base_calendar/i18n/ar.po
new file mode 100644
index 00000000000..bf7e3d0748a
--- /dev/null
+++ b/addons/base_calendar/i18n/ar.po
@@ -0,0 +1,1665 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-10 06:06+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: 2011-11-11 04:53+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "بداية الحدث"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "كل ساعة"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+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.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "عرض كـ"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "تحذير !"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,select1:0
+#: 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
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+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
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "الأربعاء"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr "اعرض الوقت كـ"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "الثلاثاء"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "سنوياً"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "نهاية الحدث"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "الأخير"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "غرفة"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "الأيام"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "تفاصيل الدعوة"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, 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
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+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.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr "نوع الدعوة"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr "ثانياً"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+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
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+"نظام تقويم متميز يوفر ويدعم:\n"
+"    - جدولاً زمنياً للأحداث\n"
+"    - منبهات (إنشاء طلبات)\n"
+"    - الأحداث الدورية\n"
+"    - توجيه الدعوات"
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr "حدد نوع الدعوة"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+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:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, 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
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+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
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+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
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+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
+#: 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:base.calendar.set.exrule,su:0
+#: 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
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+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:base.calendar.set.exrule,select1:0
+#: 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.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+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
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr "سرّي"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: 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
+#: 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
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "معرّف التكرار"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "يوليو/تموز"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "تم القبول"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: 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.attendee:0
+msgid "Required Reply"
+msgstr "الرد مطلوب"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr "إلى الأبد"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr "المشاركة مطلوبة"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr "ال_غاء"
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "تمّ الإنشاء"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "خاص"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "يومياً"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+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
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "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
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+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
+#: field:calendar.event.edit.all,date: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.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+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:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+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
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+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
+#: 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
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+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:base.calendar.set.exrule,freq:0
+#: 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
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+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.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: 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
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+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
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+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:base.calendar.set.exrule,month_list:0
+#: 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_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: 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
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+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
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+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
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: 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
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,byday:0
+#: 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.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/bg.po b/addons/base_calendar/i18n/bg.po
index be5ff214f9e..d853cc0e91a 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Март"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Детайли за поканата"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -369,8 +370,8 @@ msgstr "Краен срок"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -832,7 +833,7 @@ msgid "Hours"
 msgstr "Часове"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Броят не може да бъде отрицателен"
@@ -882,7 +883,6 @@ msgstr "Напомняне"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgid "Wednesday"
 msgstr "Сряда"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "Интервалът не може да бъде отрицтелен"
diff --git a/addons/base_calendar/i18n/bn.po b/addons/base_calendar/i18n/bn.po
new file mode 100644
index 00000000000..e0d0b9c7cca
--- /dev/null
+++ b/addons/base_calendar/i18n/bn.po
@@ -0,0 +1,1658 @@
+# Bengali 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-11-21 12:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+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.edit.all,name:0
+msgid "Title"
+msgstr "শিরোনাম"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,select1:0
+#: 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
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+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
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "বুধ"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "মঙ্গল"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "বাৎসরিক"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "শেষ"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "রুম"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "দিন"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, 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
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+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.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+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
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+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:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, 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
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+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
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+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
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+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
+#: 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:base.calendar.set.exrule,su:0
+#: 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
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+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:base.calendar.set.exrule,select1:0
+#: 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.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+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
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr "গুপ্ত"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: 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
+#: 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
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "জুলাই"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "গৃহীত"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: 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.attendee:0
+msgid "Required Reply"
+msgstr "উত্তর প্রয়োজন"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr "চিরকাল"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr "অংশগ্রহণ প্রয়োজন"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "তৈরী হয়েছে"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "ব্যক্তিগত"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "দৈনিক"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+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
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr "ঠিক আছে(_O)"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr "সেপ্টেম্বর"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "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
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr "সংরক্ষণ (_S)"
+
+#. 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
+#: field:calendar.event.edit.all,date: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.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+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:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+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
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+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
+#: 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
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+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:base.calendar.set.exrule,freq:0
+#: 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
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+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.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: 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
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+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
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+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:base.calendar.set.exrule,month_list:0
+#: 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_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: 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
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+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
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+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
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: 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
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,byday:0
+#: 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.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/bs.po b/addons/base_calendar/i18n/bs.po
index 32441b52525..3c6979be37a 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: BOSNIA AND HERZEGOVINA\n"
 "Language: hr\n"
 "X-Poedit-Language: Bosnian\n"
@@ -143,6 +143,7 @@ msgid "March"
 msgstr ""
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -369,8 +370,8 @@ msgstr ""
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -830,7 +831,7 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -880,7 +881,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1062,7 +1062,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1658,179 +1658,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr ""
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. Osobe"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkcija Partnera"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partner Seq."
-
-#~ msgid "Current"
-#~ msgstr "Tekući"
-
-#~ msgid "First Name"
-#~ msgstr "Ime osobe"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funkcija Osobe Partnera - Contact Partner Function"
-
-#~ msgid "Other"
-#~ msgstr "Drugi"
-
-#~ msgid "Contact to function"
-#~ msgstr "Osoba na Funkciju - Contact to Function"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nepravilno ime modela u definiciji radnje."
-
-#~ msgid "Partner to address"
-#~ msgstr "Partner na Adresu"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# Osoba"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Dodatno polje za tel. broj"
-
-#~ msgid "Function"
-#~ msgstr "Funkcija"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Određuje Osobe i Funkcije"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funkcije Osoba"
-
-#~ msgid "Base Contact"
-#~ msgstr "Osnovna Osoba"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "redoslijed važnosti ovog naziva Posla-Radnog mjesta u listi naziva Poslova-"
-#~ "Radnih mjesta povezanog Partnera"
-
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
-#~ msgid "Date Stop"
-#~ msgstr "Datum Završetka"
-
-#~ msgid "Address"
-#~ msgstr "Adresa"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Poslovi Osobe"
-
-#~ msgid "Nationality"
-#~ msgstr "Državljanstvo"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "redoslijed važnosti ove Adrese u listi Adresa povezanog Partnera"
-
-#~ msgid "Main Job"
-#~ msgstr "Glavni Posao"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorije"
-
-#~ msgid "Main Function"
-#~ msgstr "Glavna funkcija"
-
-#~ msgid "Define partners and their addresses."
-#~ msgstr "Definiraj Partnere i njihove Adrese"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proces Osnovne Osobe za kontakt"
-
-#~ msgid "Seq."
-#~ msgstr "Seq."
-
-#~ msgid "Extension"
-#~ msgstr "Ekstenzija"
-
-#~ msgid "Mobile"
-#~ msgstr "Mobitel"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Unutarnja/Vanjska Ekstenzija Tel. broja"
-
-#~ msgid "People you work with."
-#~ msgstr "Ljudi s kojima radite."
-
-#~ msgid "Extra Information"
-#~ msgstr "Dodatni Podaci"
-
-#~ msgid "Functions and Addresses"
-#~ msgstr "Funkcije i Adrese"
-
-#~ msgid "Companies you work with."
-#~ msgstr "Tvrtke s kojima radite."
-
-#~ msgid "Main Employer"
-#~ msgstr "Glavni Poslodavac."
-
-#~ msgid "Function to address"
-#~ msgstr "Funkcija na Adresu - Function to address"
-
-#~ msgid "Partner Contact"
-#~ msgstr "Osoba kod Partnera"
-
-#~ msgid "Partners"
-#~ msgstr "Partneri"
-
-#~ msgid "Addresses"
-#~ msgstr "Adrese"
-
-#~ msgid "Working and private addresses."
-#~ msgstr "Poslovne i Privatne Adrese"
-
-#~ msgid "Last Name"
-#~ msgstr "Prezime osobe"
-
-#~ msgid "General"
-#~ msgstr "Općenit"
-
-#~ msgid "Past"
-#~ msgstr "Prošli"
-
-#~ msgid "General Information"
-#~ msgstr "Opća Informacija"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Poslovi na istoj Adresi Partnera"
-
-#~ msgid "Date Start"
-#~ msgstr "Datum Početka"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definiraj Funkcije i Adrese"
-
-#~ msgid "Website"
-#~ msgstr "Web stranica"
-
-#~ msgid "Birth Date"
-#~ msgstr "Datum rođenja"
diff --git a/addons/base_calendar/i18n/ca.po b/addons/base_calendar/i18n/ca.po
index d904a82050c..131e823ac67 100644
--- a/addons/base_calendar/i18n/ca.po
+++ b/addons/base_calendar/i18n/ca.po
@@ -14,24 +14,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr ""
+msgstr "L'esdeveniment comença"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Hourly"
-msgstr ""
+msgstr "Cada hora"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required to Join"
-msgstr ""
+msgstr "Obligatori per unir-se"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -40,77 +40,81 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Aquesta propietat defineix la llista d'excepcions de data/hora per a un "
+"esdeveniment de calendari recurrent."
 
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La companyia seleccionada no està en les companyies permeses per aquest "
+"usuari"
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
 msgid "Title"
-msgstr ""
+msgstr "Títol"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensualment"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invited User"
-msgstr ""
+msgstr "Usuari invitat"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation"
-msgstr ""
+msgstr "Invitació"
 
 #. module: base_calendar
 #: help:calendar.event,recurrency:0
 #: help:calendar.todo,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Reunió periòdica"
 
 #. 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 ""
+msgstr "Alarmes"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Diumenge"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr ""
+msgstr "Càrrec"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Detalls de la invitació"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Quart"
 
 #. module: base_calendar
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Mostra com"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,day:0
@@ -120,51 +124,52 @@ msgstr ""
 #: field:calendar.todo,day:0
 #: selection:calendar.todo,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Dia del mes"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Public"
-msgstr ""
+msgstr "Públic"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avís!"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Divendres"
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Tot el dia"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,select1:0
 #: field:calendar.event,select1:0
 #: field:calendar.todo,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Opció"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -172,76 +177,76 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Free"
-msgstr ""
+msgstr "Lliure"
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr ""
+msgstr "Indica si és obligatoria la confirmació d'una resposta."
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.adjunt"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr ""
+msgstr "Els usuaris als quals els va ser delegat la petició original"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Ref. esdeveniment"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,we:0
 #: field:calendar.event,we:0
 #: field:calendar.todo,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Dc"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Show time as"
-msgstr ""
+msgstr "Mostra temps com"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,tu:0
 #: field:calendar.event,tu:0
 #: field:calendar.todo,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Dt"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Anualment"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr ""
+msgstr "L'esdeveniment finalitza"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Darrer"
 
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr ""
+msgstr "Estat de la participació dels assistents"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Room"
-msgstr ""
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -249,83 +254,85 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr ""
+msgstr "Dies"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Detall de la invitació"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr ""
+msgstr "President"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "Procediment"
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minuts"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr ""
+msgstr "Mostra"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "Edit all Occurrences"
-msgstr ""
+msgstr "Edita totes les ocurrències"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation type"
-msgstr ""
+msgstr "Tipus d'invitació"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Secondly"
-msgstr ""
+msgstr "En segon lloc"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr ""
+msgstr "Data esdeveniment"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
 msgstr ""
+"Proporcioneu les adreces de correu externes d'els qui rebran aquesta "
+"invitació."
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -336,42 +343,47 @@ msgid ""
 "    - Recurring events\n"
 "    - Invitations to people"
 msgstr ""
+"Sistema complet de calendari que suporta:\n"
+"    - Calendari d'esdeveniments\n"
+"    - Alertes (crea peticions)\n"
+"    - Esdeveniments recursius\n"
+"    - Invitació de persones"
 
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "Especifiqueu el tipus d'invitació"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Anys"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "Data final de l'esdeveniment"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr ""
+msgstr "Participació opcional"
 
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data límit"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avís!"
 
 #. module: base_calendar
 #: help:calendar.event,active:0
@@ -380,11 +392,13 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Si el camp actiu s'estableix en veridader, s'ometrà l'alarma de "
+"l'esdeveniment, no obstant això no s'eliminarà."
 
 #. module: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
 msgid "Basic Calendar Functionality"
-msgstr ""
+msgstr "Funcionalitat bàsica del calendari"
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
@@ -392,7 +406,7 @@ msgstr ""
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organitzador"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -400,88 +414,88 @@ msgstr ""
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:res.request.link,name:base_calendar.request_link_meeting
 msgid "Event"
-msgstr ""
+msgstr "Esdeveniment"
 
 #. module: base_calendar
 #: help:calendar.event,edit_all:0
 #: help:calendar.todo,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Edita totes les ocurrències de la reunió recurrent."
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr ""
+msgstr "Abans de"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmat"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
 msgid "Edit all events"
-msgstr ""
+msgstr "Edita tots els esdeveniments"
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
 #: field:calendar.event,attendee_ids:0
 #: field:calendar.todo,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Assistents"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirma"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr ""
+msgstr "Calendari de tasques"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,su:0
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Dg"
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr ""
+msgstr "Tipus d'invitació"
 
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
-msgstr ""
+msgstr "Empresa relacionada amb el contacte"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr ""
+msgstr "Detalls del recordatori"
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr ""
+msgstr "Delegat des de"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,select1:0
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Dia del mes"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -489,48 +503,48 @@ msgstr ""
 #: field:calendar.event.edit.all,location:0
 #: field:calendar.todo,location:0
 msgid "Location"
-msgstr ""
+msgstr "Ubicació"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr ""
+msgstr "Envia email?"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
 #: selection:calendar.alarm,action:0
 #: field:calendar.attendee,email:0
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr ""
+msgstr "Detalls de l'esdeveniment"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
-msgstr ""
+msgstr "Executa"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Data/hores d'excepció"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Confidencial"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,end_date:0
 #: field:calendar.event,end_date:0
 #: field:calendar.todo,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Repeteix fins"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -538,286 +552,289 @@ msgid ""
 "Create specific calendar alarms that may be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Crea alarmes específiques que puguin ser assignades a esdeveniments de "
+"calendari o reunions."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
-msgstr ""
+msgstr "Visibilitat"
 
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "Resposta obligatoria?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
 #: field:calendar.todo,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "URL de caldav"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "Select range to Exclude"
-msgstr ""
+msgstr "Trieu el rang a excloure"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "ID recurrent"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Acceptada"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,th:0
 #: field:calendar.event,th:0
 #: field:calendar.todo,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Dj"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
 msgid "Delegrated To"
-msgstr ""
+msgstr "Delegada en"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "Resposta obligatoria"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Per sempre"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "Participació obligatòria"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel·la"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Creat"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Diàriament"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "No podeu duplicar"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
 #: field:calendar.todo,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Marca com a"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #. 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 ""
+"Permet que l'esdeveniment es repeteixi automàticament en aquest interval"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegat"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Contactes de l'empresa"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Accepta"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "Primer"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacitat"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
 #: field:calendar.todo,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Zona horària"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Assumpte"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. 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 ""
+msgstr "Marqueu aquí si voleu enviar un correu a la persona convidada"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Disponibilitat"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "_Save"
-msgstr ""
+msgstr "_Desa"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "Individual"
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Repeteix x vegades"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Propietari"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "Informació delegació"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "Nom de pila"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "Rebutjat"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "El meu rol"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "Els meus esdeveniments"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "Rebutja"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Setmanes"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "Grup"
 
 #. module: base_calendar
 #: field:calendar.event,edit_all:0
 #: field:calendar.todo,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "Edita tot"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactes"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Informació sobre l'alarma bàsica"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Dv"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -825,81 +842,80 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
-msgstr ""
+msgstr "Hores"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "El compte no pot ser negatiu"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "Membre"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Localització de l'esdeveniment"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Regla recurrent"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "Fitxer adjunt"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Invitació des de"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Finalització de recurrència"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "Recordatori"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
-msgstr ""
+msgstr "Estableix Exregla"
 
 #. 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 ""
+msgstr "Esdeveniments"
 
 #. 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 ""
+msgstr "Convida assistents"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "Email del convidat"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -907,7 +923,7 @@ msgstr ""
 #: field:calendar.todo,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Repeteix"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -915,161 +931,163 @@ msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
 msgstr ""
+"Referència de la URI que apunta a la informació del directori corresponent "
+"al participant."
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Dilluns"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Tercer"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "Alarma bàsica"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "El/La"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "Delegat de"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Indiqueu els grups als quals pertany l'assistent"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "Dades"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Dll"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 msgid "Count"
-msgstr ""
+msgstr "Compte"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "No repeteix"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Incert"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "Llengua"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Disparadors"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "Relacionat amb"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Interval"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Dimecres"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "L'interval no pot ser negatiu"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "Resum"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1077,22 +1095,22 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "Trieu el dia del mes en què es repetirà la reunió"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "Acció"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "Seleccioneu a qui voleu convidar"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1101,50 +1119,52 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"'Durada' i 'Repeteix' són tots dos opcionals, però si un està actiu també ha "
+"d'estar-ho l'altre"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Edita tots els esdeveniments del calendari"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "Rol de participació per a l'usuari del calendari."
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Delegat a"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "Defineix l'acció a invocar quan surti l'alarma"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Cerca esdeveniments"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Opció de recurrencia"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Setmanal"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1153,17 +1173,19 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Si el camp actiu és verdader, li permetrà ocultar la notificació d'avís de "
+"l'esdeveniment sense eliminar-la."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "ID data recurrent"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "No podeu tenir dos usuaris amb el mateix identificador d'usuari!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1173,65 +1195,65 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "Detalls del recordatori"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "Per revisa"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Freqüència"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Repeteix cada (dies/setmana/mes/any)"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Usuaris"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuaris"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Dimarts"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1240,11 +1262,13 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
+"Facilita una descripció més completa del component del calendari que la "
+"facilitada per la propietat \"RESUM\""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Usuari responsable"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1252,73 +1276,75 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "Ocupat"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "Esdeveniment de calendari"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "Provisional"
 
 #. module: base_calendar
 #: field:calendar.event,interval:0
 #: field:calendar.todo,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Repeteix cada"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Quantitat fixa de vegades"
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Recurrent"
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Recurrència"
 
 #. 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 ""
+msgstr "Invitacions a l'esdeveniment"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Dijous"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Regla d'excepció"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
 msgstr ""
+"Per indicar l'idioma dels valors de text en una propietat o paràmetre de "
+"propietat."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1327,19 +1353,21 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Defineix una regla o patró de repetició de temps a excloure de la regla "
+"recurrent."
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Convida persones"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1349,11 +1377,14 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Definiu una regla o patró repetitiu per a esdeveniments recurrents.\n"
+"Per exemple: Per 10 ocurrències cada últim diumenge de cada dos mesos : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1EL SEU"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr ""
+msgstr "Referència URI"
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1363,108 +1394,108 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Search Invitations"
-msgstr ""
+msgstr "Cerca invitacions"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "Després"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "Atura"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.valors"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "Objectes"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Delegat"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Ds"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Tria el dia en què repetir la cita"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Cada minut"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "Indiqueu l'usuari que està actuant en nom de l'usuari del calendari."
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Mesos"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Recursos"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr ""
+msgstr "Informació de l'avís de l'esdeveniment"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1472,6 +1503,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Conté el text que s'utilitzarà com a assumpte del missatge del correu "
+"electrònic o conté el text que s'utilitzarà per mostrar"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1479,144 +1512,146 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Please Apply Recurrency before applying Exception Rule."
 msgstr ""
+"Si us plau, apliqueu la repetició abans d'aplicar l'excepció de la regla"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "Enviat per l'usuari"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Període de recurrència"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Dia de la setmana"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Per dia"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Àudio"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "Amb propòsit informatiu"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "Convida"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Información asistentes"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID del recurs"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Es necessita una acció"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "Enviat per"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. 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 ""
+"Configureu una alarma en aquest moment, abans que succeeixi l'esdeveniment"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "Usuari intern"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Accepta"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Dissabte"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Invitació a"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Segon"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Lliure/Ocupat"
 
 #. module: base_calendar
 #: field:calendar.event,end_type:0
 #: field:calendar.todo,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "Forma d'acabar recurrència"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1627,17 +1662,17 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durada"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "Email extern"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Data d'activació"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1649,10 +1684,18 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
+"* Apunta a un recurs de so, que s'escolta quan l'alarma s'activa per àudio.\n"
+"                    * L'arxiu que està intentant ser enviat com a adjunt en "
+"el correu electrònic.\n"
+"                    * Apunta a un recurs de procediment, que s'invoca quan "
+"l'alarma s'activa per procediment."
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Cinquè"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "Fixa el rang d'exclusió"
diff --git a/addons/base_calendar/i18n/cs.po b/addons/base_calendar/i18n/cs.po
index cb55774e41f..cc160531cbe 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -671,7 +671,7 @@ msgstr "Delegovat"
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
 msgid "Partner"
-msgstr "Společník"
+msgstr "Partner"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
diff --git a/addons/base_calendar/i18n/da.po b/addons/base_calendar/i18n/da.po
new file mode 100644
index 00000000000..95d2308bd88
--- /dev/null
+++ b/addons/base_calendar/i18n/da.po
@@ -0,0 +1,1658 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-01 20:11+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: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "Hver time"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+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.edit.all,name:0
+msgid "Title"
+msgstr "Titel"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Månedligt"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Invitation"
+
+#. 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 "Alarmer"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Søndag"
+
+#. 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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Marts"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel !"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Fredag"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Hele dagen"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: 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 "Ledig"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. 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
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Ons."
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Tir."
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Årligt"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "Sidste"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Rum"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Dage"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr "Fejl!"
+
+#. 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
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minutter"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+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
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "År"
+
+#. 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:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Warning!"
+msgstr "Advarsel!"
+
+#. 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
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+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
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr "Før"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+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
+#: 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:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Søn."
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+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:base.calendar.set.exrule,select1:0
+#: 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.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+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
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: 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
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr "Synlighed"
+
+#. 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
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "Juli"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "Accepteret"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "Tor."
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr "For altid"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "Oprettet"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "Privat"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "Dagligt"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+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
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "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
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+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
+#: field:calendar.event.edit.all,date: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.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+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:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+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
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+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
+#: 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
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+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:base.calendar.set.exrule,freq:0
+#: 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
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+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.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: 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
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+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
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+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:base.calendar.set.exrule,month_list:0
+#: 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_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: 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
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+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
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+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
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: 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
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,byday:0
+#: 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.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index 4783a65476b..a78981a6a64 100644
--- a/addons/base_calendar/i18n/de.po
+++ b/addons/base_calendar/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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -145,6 +145,7 @@ msgid "March"
 msgstr "März"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -262,7 +263,7 @@ msgid "Invitation Detail"
 msgstr "Details Einladung"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -376,8 +377,8 @@ msgstr "Letzter Termin"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Warnung!"
@@ -841,7 +842,7 @@ msgid "Hours"
 msgstr "Stunden"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Zahl kann nicht negativ sein"
@@ -891,7 +892,6 @@ msgstr "Termin Erinnerung"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Definiere Ausnahme"
@@ -1075,7 +1075,7 @@ msgid "Wednesday"
 msgstr "Mittwoch"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "Intervall kann nicht negativ sein"
@@ -1692,68 +1692,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "5ter"
 
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Wähle Daten für Regel"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern for an exception to a recurrence set"
-#~ msgstr "definiert Regel für Ausschluss von wiederkehrenden Ereignissen"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehler in Datenmodell der definierten Aktion"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Einträge"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht"
-
-#~ msgid "Select data for ExRule"
-#~ msgstr "Wähle Daten f. Ausschluss"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Einträge im Menü vornehmen"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
-#~ msgid "ExRule"
-#~ msgstr "Regel f. Aussch."
-
-#~ msgid "Custom"
-#~ msgstr "Individuell"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Wiederholung alle x"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunden"
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Erstelle einen spezifschen Kalenderalarm der zu Veranstaltungen oder "
-#~ "Meetings hinzugefügt werden kann."
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Max. Wiederholungen"
-
-#~ msgid "Exclude range"
-#~ msgstr "Zurücknahme Datumsbereich"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Definiere Ausnahmezeiten"
-
-#~ msgid "Repeat interval"
-#~ msgstr "Wiederholungsintervall"
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index 83fd4c7740c..80066e2a1f5 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -145,6 +145,7 @@ msgid "March"
 msgstr "Μάρτιος"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -262,7 +263,7 @@ msgid "Invitation Detail"
 msgstr "Λεπτομέρειες Πρόσκλησης"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -373,8 +374,8 @@ msgstr "Προσθεσμία"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Προειδοποίηση"
@@ -835,7 +836,7 @@ msgid "Hours"
 msgstr "Ώρες"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -885,7 +886,6 @@ msgstr "Υπενθύμιση"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1067,7 +1067,7 @@ msgid "Wednesday"
 msgstr "Τετάρτη"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1667,49 +1667,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "Πέμπτος"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Επιλογή δεδομένων για προσαρμοσμένο κανόνα"
-
-#~ msgid "Exclude range"
-#~ msgstr "Αποκλεισμός έκτασης"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Επανάληψη κάθε x"
-
-#~ msgid "Seconds"
-#~ msgstr "Δευτερόλεπτα"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Μη έγκυρο XML για προβολή Αρχιτεκτονικής"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Επανάληψη μέγιστο τόσες φορές"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Το όνομα της υπομονάδας πρέπει να είναι μοναδικό!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Μη έγκυροι παράμετροι"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος! Δεν μπορείτε να δημιουργήσετε κενό Μενού."
-
-#~ msgid "Custom"
-#~ msgstr "Προσαρμοσμένος"
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Δημιουργεία συγκεκριμένων υπενθυμήσεων ημερολογίου που μπορούν να ανατεθούνε "
-#~ "σε γεγονότα ημερολογίου ή συναντήσεις."
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index cc75abab724..194b27bff56 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -146,6 +146,7 @@ msgid "March"
 msgstr "Marzo"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -263,7 +264,7 @@ msgid "Invitation Detail"
 msgstr "Detalle de la invitación"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -379,8 +380,8 @@ msgstr "Fecha límite"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
@@ -844,7 +845,7 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "La cuenta no puede ser negativa"
@@ -894,7 +895,6 @@ msgstr "Recordatorio"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Establecer Exregla"
@@ -1078,7 +1078,7 @@ msgid "Wednesday"
 msgstr "Miércoles"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "El intervalo no puede ser negativo"
@@ -1698,33 +1698,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Quinto"
 
-#~ msgid "Repeat max that times"
-#~ msgstr "Repetir max. estas veces"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Seleccione datos para la regla personalizada"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Fijar el rango de exclusión"
-
-#~ msgid "Exclude range"
-#~ msgstr "Excluir rango"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir cada x"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizado"
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Cree alarmas específicas del calendario que se puede asignar a los eventos "
-#~ "del calendario o reuniones."
-
-#~ msgid "Repeat interval"
-#~ msgstr "Intervalo de repetición"
diff --git a/addons/base_calendar/i18n/es_EC.po b/addons/base_calendar/i18n/es_EC.po
index 3cc4e4aa6b3..ce9b33a1794 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -145,6 +145,7 @@ msgid "March"
 msgstr "Marzo"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -262,7 +263,7 @@ msgid "Invitation Detail"
 msgstr "Detalle de la invitación"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -378,8 +379,8 @@ msgstr "Fecha límite"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "¡Advertencia!"
@@ -839,7 +840,7 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -889,7 +890,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1071,7 +1071,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/es_MX.po b/addons/base_calendar/i18n/es_MX.po
new file mode 100644
index 00000000000..d195b7c66f6
--- /dev/null
+++ b/addons/base_calendar/i18n/es_MX.po
@@ -0,0 +1,1702 @@
+# 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 01:17+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:52+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "El evento comienza"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "Cada hora"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr "Requerido para unirse"
+
+#. 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 ""
+"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
+"de calendario recurrente."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Usuario invitado"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Invitación"
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Reunión periódica"
+
+#. 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 "Alarmas"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Rol"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr "Detalles de la invitación"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: 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 "Día del mes"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr "Público"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. 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 "Libre"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr "Indica si es requerida la confirmación de una respuesta."
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr "Los usuarios a los que les fue delegado la petición original"
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr "Ref. evento"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Mié"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr "Mostrar hora como"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Anualmente"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "El evento finaliza"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "Última"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr "Estado de la participación de los asistentes"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Días"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Detalle de la invitación"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr "Presidente"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr "Procedimiento"
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minutos"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr "Mostrar"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr "Editar todas las ocurrencias"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr "Tipo de invitación"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr "En segundo lugar"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Fecha evento"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+"Proporcione las direcciones de correo externas de quienes recibiran esta "
+"invitacion."
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+"Completo sistema de calendario que soporta:\n"
+"    - Calendario de eventos\n"
+"    - Alertas (crea peticiones)\n"
+"    - Eventos recursivos\n"
+"    - Invitación de personas"
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr "Especifique el tipo de invitación"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr "Fecha del final del evento"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr "Participación opcional"
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. 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 ""
+"Si el campo activo se establece a verdadero, se omitirá la alarma del "
+"evento, sin embargo no se eliminará."
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr "Funcionalidad básica del calendario"
+
+#. 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 "Organizador"
+
+#. 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 "Responsable"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr "Evento"
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr "Editar todas las ocurrencias de la reunión recurrente."
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr "Antes de"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr "Editar todos los eventos"
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr "Asistentes"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr "Calendario de tareas"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr "Tipo de invitación"
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr "Partner relacionado con el contacto"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr "Detalles del recordatorio"
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr "Delegado desde"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr "Lugar"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr "¿Enviar email?"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr "Detalles del evento"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr "Ejecutar"
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. 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 ""
+"Crear alarmas específicas que puedan ser asignadas a eventos de calendario o "
+"reuniones."
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr "Visibilidad"
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr "¿Respuesta requerida?"
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr "Elija el rango a excluir"
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "Julio"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "Aceptada"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr "Delegada en"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr "Respuesta requerida"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr "Siempre"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr "Participación  requerida"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "Creada"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "Privada"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "Diariamente"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr "No se puede duplicar"
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. 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 "Permite que el evento se repita automáticamente en ese intervalo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr "Contactos de la empresa"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr "Primera"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr "Privacidad"
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr "Diciembre"
+
+#. 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 "Marque aquí si quiere enviar un correo a la persona invitada"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr "Disponibilidad"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr "_Guardar"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr "Individual"
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr "Repetir x veces"
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr "Dueño"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr "Información delegación"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr "Nombre común"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr "Rechazada"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr "Mi rol"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr "Mis eventos"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr "Rechazar"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr "Grupo"
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr "Información sobre la alarma básica"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr "La cuenta no puede ser negativa"
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr "Miembro"
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr "Ubicación del evento"
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr "Adjunto"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr "Invitación desde"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr "Fin de recurrencia"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr "Establecer Exregla"
+
+#. 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 "Eventos"
+
+#. 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 "Invitar asistentes"
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr "Email del invitado"
+
+#. 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 "Repetir"
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+"La referencia a la URI que apunta a la información del directorio "
+"correspondiente al participante."
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr "Junio"
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr "Alarma básica"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr "El"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr "Delegado desde"
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr "Indicar los grupos a los que pertenece el asistente"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr "Datos"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr "Total"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr "Incierto"
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr "Disparadores"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr "Enero"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr "Relacionado con"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr "Intervalo"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+msgstr "El intervalo no puede ser negativo"
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. 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 "Activo"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr "Elija el día del mes en que se repetirá la reunión"
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr "Seleccione a quien quiere invitar"
+
+#. 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 ""
+"Duración' y 'Repetir' son ambos opcionales, pero si uno está activo también "
+"debe estarlo el otro"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr "Editar todos los eventos del calendario"
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr "Rol de participación para el usuario del calendario."
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr "Define la acción a invocar cuando salte la alarma"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr "Buscar eventos"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr "Opción de recurrencia"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr "Semanal"
+
+#. 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 ""
+"Si el campo activo es verdadero, le permitirá ocultar la notificación de "
+"aviso del evento sin eliminarlo."
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: base_calendar
+#: 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 de usuario!"
+
+#. 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 "Estado"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr "Detalles del recordatorio"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr "A revisar"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr "de"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. 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 ""
+"Facilita una descripción más completa del componente del calendario que la "
+"facilitada por la propiedad \"RESUMEN\""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. 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 "Busy"
+msgstr "Ocupado"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr "Evento de calendario"
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr "Provisional"
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr "Repetir cada"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr "Cantidad fija de veces"
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr "Recurrente"
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. 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 "Invitaciones al evento"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr "Regla de excepción"
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+"Para indicar el idioma de los valores de texto en una propiedad o parámetro "
+"de propiedad."
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr "Detalles"
+
+#. 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 ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Invitar personas"
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr "Referencia URI"
+
+#. 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 "Descripción"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr "Buscar invitaciones"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr "Después de"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr "Parar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr "ir.valores"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr "Objetos"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr "Delegada"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr "Eligir día en el que repetir la cita"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr "Cada minuto"
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+"Indique el usuario que está actuando en nombre del usuario del calendario."
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr "Información del aviso del evento"
+
+#. 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 ""
+"Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
+"o contiene el texto a mostrar"
+
+#. 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 "Alarma"
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+"Por favor, aplique la repetición antes de aplicar la excepción de la regla"
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr "Enviado por usuario"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr "Abril"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr "Periodo de recurrencia"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr "Audio"
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr "Con propósito informativo"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr "Invitar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr "Información asistentes"
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr "Necesita acción"
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr "Enviado por"
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. 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 "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr "Usuario interno"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr "Invitación a"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr "Libre/Ocupado"
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr "Forma de terminar recurrencia"
+
+#. 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 "Duración"
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr "Email externo"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr "Fecha activación"
+
+#. 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 ""
+"* Apunta a un recurso de sonido, que se escucha cuando la alarma se activa "
+"por audio.\n"
+"* El archivo que está intentando ser enviado como adjunto en el correo "
+"electrónico.\n"
+"* Apunta a un recurso de procedimiento, que se invoca cuando la alarma se "
+"activa por procedimiento."
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr "Quinto"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "Fijar el rango de exclusión"
diff --git a/addons/base_calendar/i18n/es_PY.po b/addons/base_calendar/i18n/es_PY.po
index ce342f81689..7dcf2632454 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -145,6 +145,7 @@ msgid "March"
 msgstr "Marzo"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -262,7 +263,7 @@ msgid "Invitation Detail"
 msgstr "Detalle de la invitación"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -378,8 +379,8 @@ msgstr "Fecha límite"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "¡Cuidado!"
@@ -843,7 +844,7 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "La cuenta no puede ser negativa"
@@ -893,7 +894,6 @@ msgstr "Recordatorio"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Establecer Exregla"
@@ -1077,7 +1077,7 @@ msgid "Wednesday"
 msgstr "Miércoles"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "El intervalo no puede ser negativo"
diff --git a/addons/base_calendar/i18n/es_VE.po b/addons/base_calendar/i18n/es_VE.po
new file mode 100644
index 00000000000..d195b7c66f6
--- /dev/null
+++ b/addons/base_calendar/i18n/es_VE.po
@@ -0,0 +1,1702 @@
+# 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 01:17+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:52+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "El evento comienza"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "Cada hora"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr "Requerido para unirse"
+
+#. 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 ""
+"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
+"de calendario recurrente."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Usuario invitado"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Invitación"
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Reunión periódica"
+
+#. 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 "Alarmas"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Rol"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr "Detalles de la invitación"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: 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 "Día del mes"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr "Público"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. 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 "Libre"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr "Indica si es requerida la confirmación de una respuesta."
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr "Los usuarios a los que les fue delegado la petición original"
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr "Ref. evento"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Mié"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr "Mostrar hora como"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Anualmente"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "El evento finaliza"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "Última"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr "Estado de la participación de los asistentes"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Sala"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Días"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Detalle de la invitación"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr "Presidente"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr "Procedimiento"
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minutos"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr "Mostrar"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr "Editar todas las ocurrencias"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr "Tipo de invitación"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr "En segundo lugar"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Fecha evento"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+"Proporcione las direcciones de correo externas de quienes recibiran esta "
+"invitacion."
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+"Completo sistema de calendario que soporta:\n"
+"    - Calendario de eventos\n"
+"    - Alertas (crea peticiones)\n"
+"    - Eventos recursivos\n"
+"    - Invitación de personas"
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr "Especifique el tipo de invitación"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr "Fecha del final del evento"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr "Participación opcional"
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. 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 ""
+"Si el campo activo se establece a verdadero, se omitirá la alarma del "
+"evento, sin embargo no se eliminará."
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr "Funcionalidad básica del calendario"
+
+#. 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 "Organizador"
+
+#. 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 "Responsable"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr "Evento"
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr "Editar todas las ocurrencias de la reunión recurrente."
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr "Antes de"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr "Editar todos los eventos"
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr "Asistentes"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr "Calendario de tareas"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr "Tipo de invitación"
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr "Partner relacionado con el contacto"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr "Detalles del recordatorio"
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr "Delegado desde"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr "Lugar"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr "¿Enviar email?"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr "Detalles del evento"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr "Ejecutar"
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. 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 ""
+"Crear alarmas específicas que puedan ser asignadas a eventos de calendario o "
+"reuniones."
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr "Visibilidad"
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr "¿Respuesta requerida?"
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr "Elija el rango a excluir"
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "Julio"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "Aceptada"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr "Delegada en"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr "Respuesta requerida"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr "Siempre"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr "Participación  requerida"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "Creada"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "Privada"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "Diariamente"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr "No se puede duplicar"
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. 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 "Permite que el evento se repita automáticamente en ese intervalo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr "Contactos de la empresa"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr "Primera"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr "Privacidad"
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr "Diciembre"
+
+#. 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 "Marque aquí si quiere enviar un correo a la persona invitada"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr "Disponibilidad"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr "_Guardar"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr "Individual"
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr "Repetir x veces"
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr "Dueño"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr "Información delegación"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr "Nombre común"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr "Rechazada"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr "Mi rol"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr "Mis eventos"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr "Rechazar"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr "Grupo"
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr "Información sobre la alarma básica"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr "La cuenta no puede ser negativa"
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr "Miembro"
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr "Ubicación del evento"
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr "Adjunto"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr "Invitación desde"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr "Fin de recurrencia"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr "Establecer Exregla"
+
+#. 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 "Eventos"
+
+#. 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 "Invitar asistentes"
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr "Email del invitado"
+
+#. 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 "Repetir"
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+"La referencia a la URI que apunta a la información del directorio "
+"correspondiente al participante."
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr "Junio"
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr "Alarma básica"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr "El"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr "Delegado desde"
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr "Indicar los grupos a los que pertenece el asistente"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr "Datos"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr "Total"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr "Incierto"
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr "Disparadores"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr "Enero"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr "Relacionado con"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr "Intervalo"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+msgstr "El intervalo no puede ser negativo"
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. 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 "Activo"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr "Elija el día del mes en que se repetirá la reunión"
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr "Seleccione a quien quiere invitar"
+
+#. 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 ""
+"Duración' y 'Repetir' son ambos opcionales, pero si uno está activo también "
+"debe estarlo el otro"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr "Editar todos los eventos del calendario"
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr "Rol de participación para el usuario del calendario."
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr "Define la acción a invocar cuando salte la alarma"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr "Buscar eventos"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr "Opción de recurrencia"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr "Semanal"
+
+#. 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 ""
+"Si el campo activo es verdadero, le permitirá ocultar la notificación de "
+"aviso del evento sin eliminarlo."
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: base_calendar
+#: 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 de usuario!"
+
+#. 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 "Estado"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr "Detalles del recordatorio"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr "A revisar"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr "de"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. 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 ""
+"Facilita una descripción más completa del componente del calendario que la "
+"facilitada por la propiedad \"RESUMEN\""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. 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 "Busy"
+msgstr "Ocupado"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr "Evento de calendario"
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr "Provisional"
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr "Repetir cada"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr "Cantidad fija de veces"
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr "Recurrente"
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. 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 "Invitaciones al evento"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr "Regla de excepción"
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+"Para indicar el idioma de los valores de texto en una propiedad o parámetro "
+"de propiedad."
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr "Detalles"
+
+#. 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 ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Invitar personas"
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr "Referencia URI"
+
+#. 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 "Descripción"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr "Buscar invitaciones"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr "Después de"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr "Parar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr "ir.valores"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr "Objetos"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr "Delegada"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr "Eligir día en el que repetir la cita"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr "Cada minuto"
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+"Indique el usuario que está actuando en nombre del usuario del calendario."
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr "Información del aviso del evento"
+
+#. 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 ""
+"Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
+"o contiene el texto a mostrar"
+
+#. 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 "Alarma"
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+"Por favor, aplique la repetición antes de aplicar la excepción de la regla"
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr "Enviado por usuario"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr "Abril"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr "Periodo de recurrencia"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr "Audio"
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr "Con propósito informativo"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr "Invitar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr "Información asistentes"
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr "Necesita acción"
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr "Enviado por"
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. 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 "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr "Usuario interno"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr "Invitación a"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr "Libre/Ocupado"
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr "Forma de terminar recurrencia"
+
+#. 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 "Duración"
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr "Email externo"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr "Fecha activación"
+
+#. 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 ""
+"* Apunta a un recurso de sonido, que se escucha cuando la alarma se activa "
+"por audio.\n"
+"* El archivo que está intentando ser enviado como adjunto en el correo "
+"electrónico.\n"
+"* Apunta a un recurso de procedimiento, que se invoca cuando la alarma se "
+"activa por procedimiento."
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr "Quinto"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "Fijar el rango de exclusión"
diff --git a/addons/base_calendar/i18n/et.po b/addons/base_calendar/i18n/et.po
new file mode 100644
index 00000000000..c602abdbdc7
--- /dev/null
+++ b/addons/base_calendar/i18n/et.po
@@ -0,0 +1,1658 @@
+# Estonian 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-10-11 18:08+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "Kord tunnis"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+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.edit.all,name:0
+msgid "Title"
+msgstr "Pealkiri"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Igakuine"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Kutsutud kasutaja"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Kutse"
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Korduv kohtumine"
+
+#. 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:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Pühapäev"
+
+#. 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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "Neljas"
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: 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 "Avalik"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Märts"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "Hoiatus!"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Reede"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Kogu päev"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr "Valik"
+
+#. 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 "Vaba"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. 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
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Ruum"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr "Viga!"
+
+#. 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
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+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.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+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
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+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:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, 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
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+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
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+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
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+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
+#: 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:base.calendar.set.exrule,su:0
+#: 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
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+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:base.calendar.set.exrule,select1:0
+#: 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.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+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
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: 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
+#: 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
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: 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.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+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
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "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
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+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
+#: field:calendar.event.edit.all,date: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.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+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:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+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
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+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
+#: 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
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+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:base.calendar.set.exrule,freq:0
+#: 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
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+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.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: 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
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+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
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,month_list:0
+#: 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
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+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:base.calendar.set.exrule,month_list:0
+#: 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_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: 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
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+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
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+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
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: 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
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+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:base.calendar.set.exrule,week_list:0
+#: 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:base.calendar.set.exrule,byday:0
+#: 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.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/fa.po b/addons/base_calendar/i18n/fa.po
index 40ecc0bdb3a..dbe6d1b4511 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr ""
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -367,8 +368,8 @@ msgstr ""
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -828,7 +829,7 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -878,7 +879,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1060,7 +1060,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/fi.po b/addons/base_calendar/i18n/fi.po
index 2170a8b62c2..bb4eb4844f8 100644
--- a/addons/base_calendar/i18n/fi.po
+++ b/addons/base_calendar/i18n/fi.po
@@ -14,24 +14,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr ""
+msgstr "Tapahtuma alkaa"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Hourly"
-msgstr ""
+msgstr "Tunneittain"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required to Join"
-msgstr ""
+msgstr "Vaaditaan liityttäessä"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -40,6 +40,8 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Tämä ominaisuus määrittelee poikkeusajankohdat toistuville "
+"kalenterikomponenteille."
 
 #. module: base_calendar
 #: constraint:res.users:0
@@ -49,7 +51,7 @@ msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
 msgid "Title"
-msgstr ""
+msgstr "Otsikko"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -61,7 +63,7 @@ msgstr "Kuukausittain"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invited User"
-msgstr ""
+msgstr "Kutsuttu käyttäjä"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -91,13 +93,13 @@ msgstr "Sunnuntai"
 #: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr ""
+msgstr "Rooli"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Kutsun yksityiskohdat"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -110,7 +112,7 @@ msgstr "Neljäs"
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Näytä muodossa"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,day:0
@@ -120,13 +122,13 @@ msgstr ""
 #: field:calendar.todo,day:0
 #: selection:calendar.todo,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Kuukauden päivä"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Public"
-msgstr ""
+msgstr "Julkinen"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -141,6 +143,7 @@ msgid "March"
 msgstr "Maaliskuu"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -157,14 +160,14 @@ msgstr "Perjantai"
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "koko päivän"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,select1:0
 #: field:calendar.event,select1:0
 #: field:calendar.todo,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Valinta"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -172,12 +175,12 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Free"
-msgstr ""
+msgstr "Vapaa"
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr ""
+msgstr "Merkitsee pyydetäänkö vastausta"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
@@ -187,12 +190,12 @@ msgstr ""
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr ""
+msgstr "Käyttäjät joille alkuperäinen pyyntö delegoitiin"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Tapahtuman viite"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,we:0
@@ -204,7 +207,7 @@ msgstr "Ke"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Show time as"
-msgstr ""
+msgstr "Näytä aika muodossa"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,tu:0
@@ -224,24 +227,24 @@ msgstr "Vuosittain"
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr ""
+msgstr "Tapahtuma päättyy"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Viimeinen"
 
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr ""
+msgstr "Osallistujan osallistumisen tila"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Room"
-msgstr ""
+msgstr "Huone"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -249,16 +252,16 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr ""
+msgstr "Päivät"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Kutsun yksityiskohdat"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -270,44 +273,44 @@ msgstr "Virhe!"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr ""
+msgstr "Puheenjohtaja"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "Toimintosarja"
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr "Peruttu"
+msgstr "Peruutettu"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minuutit"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr ""
+msgstr "Näytä"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "Edit all Occurrences"
-msgstr ""
+msgstr "Muokkaa kaikkia kertoja"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation type"
-msgstr ""
+msgstr "Kutsun tyyppi"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Secondly"
-msgstr ""
+msgstr "Sekunneittain"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
@@ -320,12 +323,12 @@ msgstr "Tapahtuman päivä"
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
-msgstr ""
+msgstr "Syötä ulkoinen sähköpostiosoite johon kutsu lähetetään"
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -340,13 +343,13 @@ msgstr ""
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "Määrittele kutsun tyyppi"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Vuodet"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
@@ -357,7 +360,7 @@ msgstr "Tapahtuman päättymispäivä"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr ""
+msgstr "Mahdollinen osallistuminen"
 
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
@@ -367,8 +370,8 @@ msgstr "Määräaika"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Varoitus!"
@@ -380,11 +383,13 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Jos aktiivisen kentän tila on tosi (true), se sallii tapahtuman "
+"hälytystiedon piilottamisen ilman sen poistamista."
 
 #. module: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
 msgid "Basic Calendar Functionality"
-msgstr ""
+msgstr "Kalenterin perustoiminnallisuus"
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
@@ -400,7 +405,7 @@ msgstr "Järjestäjä"
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr "Vastuullinen"
+msgstr "Vastuuhenkilö"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -412,7 +417,7 @@ msgstr "Tapahtuma"
 #: help:calendar.event,edit_all:0
 #: help:calendar.todo,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Muokkaa kaikkia toistuvan kokouksen tapahtumakertoja"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
@@ -430,24 +435,24 @@ msgstr "Vahvistettu"
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
 msgid "Edit all events"
-msgstr ""
+msgstr "Muokkaa kaikkia tapahtumia"
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
 #: field:calendar.event,attendee_ids:0
 #: field:calendar.todo,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Osallistujat"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr ""
+msgstr "Vahvista"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr ""
+msgstr "Kalenteritehtävä"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,su:0
@@ -459,29 +464,29 @@ msgstr "Su"
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr ""
+msgstr "Kutsun tyyppi"
 
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
-msgstr ""
+msgstr "Partneri joka liittyy yhteyshenkilöön"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr ""
+msgstr "Muistutuksen yksityiskohdat"
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr ""
+msgstr "Kuka delegoi"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,select1:0
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Kuukauden päivä"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -494,7 +499,7 @@ msgstr "Sijainti"
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr ""
+msgstr "Lähetä sähköpostia"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
@@ -506,18 +511,18 @@ msgstr "Sähköposti"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr ""
+msgstr "Tapahtuman yksityiskohdat"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
-msgstr ""
+msgstr "Suorita"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Poikkeus päivät/ajankohdat"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
@@ -530,7 +535,7 @@ msgstr "Luottamuksellinen"
 #: field:calendar.event,end_date:0
 #: field:calendar.todo,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Toista kunnes"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -538,16 +543,18 @@ msgid ""
 "Create specific calendar alarms that may be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Luo erityisiä kalenterihälytyiksi jotka voidaan yhdistää kalenteritapahtuiin "
+"tai kokouksiin"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
-msgstr ""
+msgstr "Näkyvyys"
 
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "Vastaus vaaditaan?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
@@ -558,13 +565,13 @@ msgstr ""
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "Select range to Exclude"
-msgstr ""
+msgstr "Valitse poissuljettava alue"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Toiston ID"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -589,23 +596,23 @@ msgstr "To"
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
 msgid "Delegrated To"
-msgstr ""
+msgstr "Delegoitu"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "Vaadittu vastaus"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Ikuisesti"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "Osallistuminen vaaditaan"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -616,13 +623,13 @@ msgstr ""
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Luotu"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr "Henkilökohtainen"
+msgstr "Yksityinen"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -635,31 +642,31 @@ msgstr "Päivittäin"
 #: code:addons/base_calendar/base_calendar.py:385
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "Ei voi kopioida"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
 #: field:calendar.todo,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Merkitse"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Yhteyshenkilö"
 
 #. 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 ""
+msgstr "Anna tapahtuman toistua säännöllisin väliajoin"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegoi"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
@@ -672,7 +679,7 @@ msgstr "Kumppani"
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Partnerin yhteystiedot"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -684,12 +691,12 @@ msgstr ""
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "Ensimmäinen"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "Yksityisyys"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
@@ -700,7 +707,7 @@ msgstr "Aikavyöhyke"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Aihe"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -724,7 +731,7 @@ msgstr "Valitse tämä, jos haluat lähettää sähköpostia kutsutulle henkilö
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Saatavuus"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
@@ -734,13 +741,13 @@ msgstr ""
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "Yksittäinen"
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Toista x kertaa"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
@@ -750,7 +757,7 @@ msgstr "Omistaja"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "Delegointitiedot"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -761,56 +768,56 @@ msgstr "Alkupäivä"
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "Yleinen nimi"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "Hylätty"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "Roolini"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "Omat tapahtumat"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "Kieltäydy"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Viikot"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "Ryhmä"
 
 #. module: base_calendar
 #: field:calendar.event,edit_all:0
 #: field:calendar.todo,edit_all:0
 msgid "Edit All"
-msgstr "Korjaa kaikki"
+msgstr "Muokkaa kaikkia"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Yhteystiedot"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Perus hälytyksen tiedot"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
@@ -825,13 +832,13 @@ msgstr "Pe"
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
-msgstr ""
+msgstr "Tunnit"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "Laskuri ei voi olla negatiivinen"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -848,7 +855,7 @@ msgstr "Tapahtuman paikka"
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Toistosääntä"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -863,22 +870,21 @@ msgstr "Liite"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Kutsun lähetti"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Toiston loppu"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "Muistutus"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -894,12 +900,12 @@ msgstr "Tapahtumat"
 #: 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 ""
+msgstr "Kutsu osallistujia"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "Kutsutun henkilön sähköposti"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -907,7 +913,7 @@ msgstr ""
 #: field:calendar.todo,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Toista"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -947,7 +953,7 @@ msgstr "Kesäkuu"
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "Perus hälyytys"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -959,7 +965,7 @@ msgstr ""
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "Delegoinut"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
@@ -970,7 +976,7 @@ msgstr "Käyttäjä"
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "Päivämäärä"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -982,12 +988,12 @@ msgstr "Marraskuu"
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Mihin ryhmiin osallistuja kuulluu"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "Tiedot"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
@@ -999,14 +1005,14 @@ msgstr "Ma"
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 msgid "Count"
-msgstr ""
+msgstr "Määrä"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Ei toistoa"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -1019,7 +1025,7 @@ msgstr "Lokakuu"
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Epävarma"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
@@ -1030,7 +1036,7 @@ msgstr "Kieli"
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Liipaisimet"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -1043,14 +1049,14 @@ msgstr "Tammikuu"
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "Liittyy"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Aikaväli"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1060,16 +1066,16 @@ msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "Väli ei voi olla negatiivinen"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "Yhteenveto"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1077,22 +1083,22 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "Valitse kuukauden päivä koska kokous toistetaan"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "Valitse ketä haluat kutsua"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1101,50 +1107,52 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"Kesto ja toisto ovat valinnaisia, mutta jos toinen on käytössä pitää "
+"toinenkin olla!"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Kalenterin muokkaus koko tapahtuma"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "Osallistumisrooli kalenterikäyttäjälle"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Delegoitu"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "Määrittelee toimenpiteen joka käynnistään kun hälytys laukaistaan"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Päättymispäivä"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Hae tapahtumia"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Toiston asetukset"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Viikoittainen"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1153,17 +1161,19 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Jos aktiivinen kenttä asetetaan arvoon tosi (true) se sallii hälytystiedon "
+"piilottamisen ilman sen poistamista."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Toistuvan ID:n päiväys"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1173,53 +1183,53 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "Muistutuksen yksityiskohdat"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "Tarkastettavaksi"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Tiheys"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Toista joka (päivä/viikko/kuukausi/vuosi)"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "of"
-msgstr ""
+msgstr "/"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
@@ -1231,7 +1241,7 @@ msgstr ""
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Tiistai"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1240,11 +1250,13 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
+"Antaa täydellisemmän kuvauksen kalenterikomponentista kuin yhteenveto "
+"(summary) kohdassa mainittu."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Vastuukäyttäjä"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1252,73 +1264,75 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "Kiireinen"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "Kalenteritapahtuma"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "Ehdollinen"
 
 #. module: base_calendar
 #: field:calendar.event,interval:0
 #: field:calendar.todo,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Toistuu joka"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Korjaa aikojen määrät"
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Toistuva"
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Toistuvuus"
 
 #. 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 ""
+msgstr "Tapahtumakutsut"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Torstai"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Poikkeussääntö"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
 msgstr ""
+"Määritelläksesi kielen tekstikentille ominiasuuksissa tai ominaisuuksien "
+"parametreissa"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Yksityiskohdat"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1326,20 +1340,20 @@ msgstr ""
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "Määrittelee säännön toiston poikkeukset kuvaavan määrittelyn"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Kutsu ihmisisä"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1349,11 +1363,15 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Määrittelee säännön tai toistuvan määrityksen uudelleen toistuville "
+"tapahtumille\n"
+"esim. Joka toinen kuukausi kuukauden viimeisenä sunnuntaina 10 kertaa: "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr ""
+msgstr "URI viite"
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1363,36 +1381,36 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Search Invitations"
-msgstr ""
+msgstr "Hae kutsuja"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "Jälkeen"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "Pysäytä"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
@@ -1402,69 +1420,69 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "Objektit"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Delegoitu"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "La"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Valitse päivä jolloin kokous toistuu"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Minuuteittain"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "Määrittele käyttäjä joka toimii kalenterikäyttäjän puolesta"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Kuukaudet"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurssi"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr ""
+msgstr "Tapahtuman hälytystiedot"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1472,6 +1490,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Sisältää tekstin jota käytetään viestin otsikkona sähköposteissa tai "
+"näytöissä"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1479,144 +1499,144 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Hälytys"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Please Apply Recurrency before applying Exception Rule."
-msgstr ""
+msgstr "Ole hyvä ja määrittele toisto ennenkuin määrittelet poikkeussäännöt"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "Lähettänyt käyttäjä"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Toiston jakso"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Arkipäivä"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Päivittäin"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Malli"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Ääni"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "Tunniste (ID)"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "Vain tiedoksi"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "Kutsu"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Osallistujan tiedot"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Resurssi ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Vaatii toimia"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "Lähettäjä"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. 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 ""
+msgstr "Aseta hälytys tähän ajankohtaan, ennen tapahtumaa"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "Sisäinen käyttäjä"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Lauantai"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Kutsuttu"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Sekunti"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Vapaa/Varattu"
 
 #. module: base_calendar
 #: field:calendar.event,end_type:0
 #: field:calendar.todo,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "Toiston lopettaminen"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1627,17 +1647,17 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Kesto"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "Ulkoinen sähköposti"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Liipaisupäivämäärä"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1655,4 +1675,7 @@ msgstr ""
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Viides"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "Aseta poissuljettava alue"
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index c74c36aa97b..3f601e1d6f1 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Mars"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Détail de l'invitation"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -374,8 +375,8 @@ msgstr "Echéance"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Avertissement!"
@@ -837,7 +838,7 @@ msgid "Hours"
 msgstr "Heures"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Le décompte ne peut pas être négatif"
@@ -887,7 +888,6 @@ msgstr "Rappel"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Appliquer la règle d'exception"
@@ -1070,7 +1070,7 @@ msgid "Wednesday"
 msgstr "Mercredi"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "L'intervalle ne peut pas être négatif"
@@ -1688,41 +1688,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Cinquième"
 
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Sélectionner les données pour la règle personnalisée"
-
-#~ msgid "Exclude range"
-#~ msgstr "Plage à exclure"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Nombre de répétitions maximales"
-
-#~ msgid "Seconds"
-#~ msgstr "Secondes"
-
-#~ msgid "Custom"
-#~ msgstr "Personnalisé"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Répéter tous les x"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle incorrect dans la définition de l'action"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML incorrect pour l'architecture de la vue !"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Définir une plage exclue"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Créer des alarmes associées à des événements de l'agenda ou à des réunions."
-
-#~ msgid "Repeat interval"
-#~ msgstr "Interval de répétition"
diff --git a/addons/base_calendar/i18n/gl.po b/addons/base_calendar/i18n/gl.po
index 69be1cf3037..6f1b4e3247e 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -144,6 +144,7 @@ msgid "March"
 msgstr "Marzo"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -261,7 +262,7 @@ msgid "Invitation Detail"
 msgstr "Detalle da invitación"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -373,8 +374,8 @@ msgstr "Data límite"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -838,7 +839,7 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "A conta non pode ser negativa"
@@ -888,7 +889,6 @@ msgstr "Recordatorio"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Establecer Exregra"
@@ -1072,7 +1072,7 @@ msgid "Wednesday"
 msgstr "Mércores"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "O intervalo non pode ser negativo"
@@ -1689,3 +1689,6 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "Quinto"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "Fixar o rango de exclusión"
diff --git a/addons/base_calendar/i18n/hr.po b/addons/base_calendar/i18n/hr.po
index 50ead3bc7bb..4dc73d4540d 100644
--- a/addons/base_calendar/i18n/hr.po
+++ b/addons/base_calendar/i18n/hr.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:14+0000\n"
-"PO-Revision-Date: 2010-09-09 07:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-17 21:12+0000\n"
+"Last-Translator: Ivan Marijanović <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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -46,7 +46,7 @@ msgstr ""
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Odabrana tvrtka nije među dozvoljenim tvrtkama za ovog korisnika"
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -133,7 +133,7 @@ msgstr "Javni"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Ožujak"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Detalji poziva"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -327,7 +328,7 @@ msgstr "Grupiraj prema..."
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
-msgstr ""
+msgstr "Unesite vanjski email osobe koja će primiti ovaj poziv."
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -353,7 +354,7 @@ msgstr "Odredite tip poziva"
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Godine"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
@@ -374,8 +375,8 @@ msgstr "Završni rok"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -419,7 +420,7 @@ msgstr "Događaj"
 #: help:calendar.event,edit_all:0
 #: help:calendar.todo,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Uređivanje svih pojava ponavljajućeg sastanka."
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
@@ -607,7 +608,7 @@ msgstr "Očekivan odgovor"
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Zauvijek"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -835,7 +836,7 @@ msgid "Hours"
 msgstr "Sati"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -885,7 +886,6 @@ msgstr "Podsjetnik"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Postavi pravilo iznimke"
@@ -1067,7 +1067,7 @@ msgid "Wednesday"
 msgstr "Srijeda"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1679,37 +1679,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "Peti"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Odaberite podatke za korisničko pravilo"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern for an exception to a recurrence set"
-#~ msgstr ""
-#~ "Definira pravilo ili ponavljajući uzorak za iznimku u skupu ponavljanja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravan naziv modela u definiciji akcije"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za arhitekturu View-a"
-
-#~ msgid "Select data for ExRule"
-#~ msgstr "Odaberi podatke za pravilo iznimke"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Pogreška ! Ne možete kreirati rekurzivne izbornike."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta mora počinjati s x_ i ne smije sadržavati posebne znakove !"
-
-#~ msgid "ExRule"
-#~ msgstr "Pravilo iznimke"
-
-#~ msgid "Custom"
-#~ msgstr "Korisnički definirano"
diff --git a/addons/base_calendar/i18n/hu.po b/addons/base_calendar/i18n/hu.po
index d980e9ae536..e35c748b849 100644
--- a/addons/base_calendar/i18n/hu.po
+++ b/addons/base_calendar/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-01 13:17+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -140,6 +141,7 @@ msgid "March"
 msgstr "Március"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -257,7 +259,7 @@ msgid "Invitation Detail"
 msgstr "Meghívó részlete"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -366,8 +368,8 @@ msgstr "Határidő"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Vigyázat!"
@@ -827,7 +829,7 @@ msgid "Hours"
 msgstr "Órák"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -877,7 +879,6 @@ msgstr "Emlékeztető"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1059,7 +1060,7 @@ msgid "Wednesday"
 msgstr "Szerda"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "Az intervallum nem lehet negatív"
diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po
index 0e3c3a950c4..1eaf9125893 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Marzo"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Dettagli Invito"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -374,8 +375,8 @@ msgstr "Scadenza"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
@@ -836,7 +837,7 @@ msgid "Hours"
 msgstr "Ore"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Il conteggio non può essere negativo"
@@ -886,7 +887,6 @@ msgstr "Promemoria"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Set Exrule"
@@ -1070,7 +1070,7 @@ msgid "Wednesday"
 msgstr "mercoledì"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "L'intervallo non può essere negativo"
@@ -1684,63 +1684,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Quinto"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argomenti non validi"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la Vista Struttura!"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern for an exception to a recurrence set"
-#~ msgstr ""
-#~ "definisce una regola o ripete un campione per una eccezione ad un set di "
-#~ "ricorrenze"
-
-#~ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non puoi creare un menù ricorsivo"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizza"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Ripeti ogni X"
-
-#~ msgid "Seconds"
-#~ msgstr "Secondi"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Imposta l'intervallo di esclusione"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Exclude range"
-#~ msgstr "Intervallo di esclusione"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Ripetere al massimo n volte"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Seleziona i dati per la regola personalizzata"
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Crea avvisi specifici per il calendario che possono essere assegnati ad "
-#~ "eventi o riunioni."
diff --git a/addons/base_calendar/i18n/ln.po b/addons/base_calendar/i18n/ln.po
index 5be9e36cbeb..5080001a87b 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: 2011-05-31 04:47+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
diff --git a/addons/base_calendar/i18n/lt.po b/addons/base_calendar/i18n/lt.po
index 2b63a5e9a1b..3cd53e91493 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr "Kovas"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -367,8 +368,8 @@ msgstr "Galutinis terminas"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Įspėjimas!"
@@ -828,7 +829,7 @@ msgid "Hours"
 msgstr "Valandos"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -878,7 +879,6 @@ msgstr "Priminimas"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1060,7 +1060,7 @@ msgid "Wednesday"
 msgstr "Trečiadienis"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/lv.po b/addons/base_calendar/i18n/lv.po
index b2f9b02c83c..f8fdeecf20d 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Marts"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Sīkāka informācija par ielūgumu"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -369,8 +370,8 @@ msgstr "Termiņš"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Uzmanību!"
@@ -830,7 +831,7 @@ msgid "Hours"
 msgstr "Stundas"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -880,7 +881,6 @@ msgstr "Atgādinājums"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1062,7 +1062,7 @@ msgid "Wednesday"
 msgstr "Trešdiena"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1660,18 +1660,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr ""
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Atkārtot maksimums tik reižu"
-
-#~ msgid "Exclude range"
-#~ msgstr "Izņemot periodu"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Atkārtot katru"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekundes"
-
-#~ msgid "Custom"
-#~ msgstr "Pielāgots"
diff --git a/addons/base_calendar/i18n/mn.po b/addons/base_calendar/i18n/mn.po
index 4cba24cec63..5eb98c2287c 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr "3 сар"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr "Урилгын мэдээлэл"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -367,8 +368,8 @@ msgstr "Товлосон хугацаа"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Сануулга!"
@@ -828,7 +829,7 @@ msgid "Hours"
 msgstr "Хугацаа"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -878,7 +879,6 @@ msgstr "Сануулга"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1060,7 +1060,7 @@ msgid "Wednesday"
 msgstr "Лхагва"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1658,30 +1658,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "5 дахь"
-
-#~ msgid "Custom"
-#~ msgstr "Харилцагч"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Үйлчлүүлэгчийн үүрэгт зориулсан өгөгдөл сонгох"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Seconds"
-#~ msgstr "Секунд"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Алдаатай аргумент"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
diff --git a/addons/base_calendar/i18n/nb.po b/addons/base_calendar/i18n/nb.po
index 30275c4b246..24074a612df 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr "Mars"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -367,8 +368,8 @@ msgstr ""
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -828,7 +829,7 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -878,7 +879,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1060,7 +1060,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 755072213fb..1324a8f9400 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "maart"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Detail uitnodiging"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -374,8 +375,8 @@ msgstr "Uiterste datum"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
@@ -839,7 +840,7 @@ msgid "Hours"
 msgstr "Uren"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Aantal kan niet negatief zijn"
@@ -889,7 +890,6 @@ msgstr "Herinnering"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Stel uitzondering regel in"
@@ -1073,7 +1073,7 @@ msgid "Wednesday"
 msgstr "Woensdag"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "Interval kan niet negatief zijn"
@@ -1691,71 +1691,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Vijfde"
 
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Selecteer gegevens voor aangepaste regel"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern for an exception to a recurrence set"
-#~ msgstr ""
-#~ "definieert een regel of herhalingspatroon voor een uitzondering op een "
-#~ "herhaling"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Ongeldige argumenten"
-
-#~ msgid "Select data for ExRule"
-#~ msgstr "Selecteer gegevens voor uitzondering regel"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief Menu maken."
-
-#~ msgid "ExRule"
-#~ msgstr "UitzRegel"
-
-#~ msgid "Custom"
-#~ msgstr "Aangepast"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie-definiëring."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Herhaal max aantal keren"
-
-#~ msgid "Exclude range"
-#~ msgstr "Uitsluit bereik"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Herhaal elke x"
-
-#~ msgid "Seconds"
-#~ msgstr "Seconden"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Stel uitsluit bereik in"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Maakt specifieke agenda alarmen die kunnen worden toegewezen aan agenda "
-#~ "gebeurtenissen of afspraken."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Repeat interval"
-#~ msgstr "Herhalingsinterval"
diff --git a/addons/base_calendar/i18n/pl.po b/addons/base_calendar/i18n/pl.po
index 4960751ae00..2f07bd265d3 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Marzec"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Szczegóły zaproszenia"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -374,8 +375,8 @@ msgstr "Termin"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Uwaga!"
@@ -837,7 +838,7 @@ msgid "Hours"
 msgstr "Godziny"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Liczba nie może być ujemna"
@@ -887,7 +888,6 @@ msgstr "Przypomnienie"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Ustaw regułę wyj."
@@ -1069,7 +1069,7 @@ msgid "Wednesday"
 msgstr "Środa"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "Interwał nie może być ujemny"
@@ -1677,41 +1677,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Piąty"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Nieprawidłowe parametry"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Custom"
-#~ msgstr "Własne"
-
-#~ msgid "Exclude range"
-#~ msgstr "Wyłączony zakres"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Powtórz maksymalnie tyle razy"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Wybierz dane dla własnej reguły"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Powtarzaj co x"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekund"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Ustaw zakres wyłączeń"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
diff --git a/addons/base_calendar/i18n/pt.po b/addons/base_calendar/i18n/pt.po
index c4841bfecd4..4ac3a0ded0d 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Março"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Detalhe do convite"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -369,8 +370,8 @@ msgstr "Prazo limite"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Atenção!"
@@ -830,7 +831,7 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -880,7 +881,6 @@ msgstr "Lembrete"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1062,7 +1062,7 @@ msgid "Wednesday"
 msgstr "Quarta-Feira"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1660,12 +1660,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr ""
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Criar alertas que podem ser associados a eventos de calendário ou reuniões."
diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po
index 317a215f29f..f8e2a0e59f0 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -144,6 +144,7 @@ msgid "March"
 msgstr "Março"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -261,7 +262,7 @@ msgid "Invitation Detail"
 msgstr "Detalhes do Convite"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -375,8 +376,8 @@ msgstr "Prazo Final"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
@@ -840,7 +841,7 @@ msgid "Hours"
 msgstr "Horas"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Contador não pode ser Negativo"
@@ -890,7 +891,6 @@ msgstr "Lembrete"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Definir Regra Externa"
@@ -1074,7 +1074,7 @@ msgid "Wednesday"
 msgstr "Quarta"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "Intervalo não pode ser Negativo"
@@ -1686,57 +1686,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Quinta"
 
-#~ msgid "Repeat max that times"
-#~ msgstr "Máximo de repetições"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Selecionar dados para a Regra de Customização"
-
-#~ msgid "Exclude range"
-#~ msgstr "Intervalo de exclusão"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir a cada x"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argumentos Inválidos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Definir intervalo de exclusão"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizar"
-
-#~ msgid ""
-#~ "Create specific calendar alarms that can be assigned to calendar events or "
-#~ "meetings."
-#~ msgstr ""
-#~ "Cria alarmes de calendário específicos, que pode ser associados a eventos de "
-#~ "calendário ou reuniões."
diff --git a/addons/base_calendar/i18n/ro.po b/addons/base_calendar/i18n/ro.po
index 9c8a629eea5..d093e2338ef 100644
--- a/addons/base_calendar/i18n/ro.po
+++ b/addons/base_calendar/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-19 20:34+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr "Martie"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -367,8 +368,8 @@ msgstr "Termen-limită"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Atenţie!"
@@ -828,7 +829,7 @@ msgid "Hours"
 msgstr "Ore"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -878,7 +879,6 @@ msgstr "Memento"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1060,7 +1060,7 @@ msgid "Wednesday"
 msgstr "Miercuri"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/ru.po b/addons/base_calendar/i18n/ru.po
index d9c98eb8dc7..a9378de9aaf 100644
--- a/addons/base_calendar/i18n/ru.po
+++ b/addons/base_calendar/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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -144,6 +144,7 @@ msgid "March"
 msgstr "Март"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -261,7 +262,7 @@ msgid "Invitation Detail"
 msgstr "Детали приглашения"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -372,12 +373,12 @@ msgstr "Необязательное участие"
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
 msgid "Deadline"
-msgstr "Крайний срок"
+msgstr "Последний срок"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
@@ -841,7 +842,7 @@ msgid "Hours"
 msgstr "Часы"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "Счетчик не может быть отрицательным"
@@ -891,7 +892,6 @@ msgstr "Напоминание"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Установить правило"
@@ -1074,7 +1074,7 @@ msgid "Wednesday"
 msgstr "Среда"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "Интервал не может быть отрицательным"
@@ -1688,3 +1688,6 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "Пятый"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "Задать исключаемый интервал"
diff --git a/addons/base_calendar/i18n/sk.po b/addons/base_calendar/i18n/sk.po
index d6b391efbcc..a4e245ebd74 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr "Marec"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -367,8 +368,8 @@ msgstr "Konečný termín"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Varovanie !"
@@ -828,7 +829,7 @@ msgid "Hours"
 msgstr "Hodín"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -878,7 +879,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1060,7 +1060,7 @@ msgid "Wednesday"
 msgstr "Streda"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1656,21 +1656,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr ""
-
-#~ msgid "Repeat every x"
-#~ msgstr "Opakovať každých x"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neplatný názov modelu v definícii akcie."
-
-#~ msgid "Seconds"
-#~ msgstr "Sekundy"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certifikát modulu musí byť jedinečný!"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neplatné argumenty"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neplatné XML pre zobrazenie architektúry!"
diff --git a/addons/base_calendar/i18n/sl.po b/addons/base_calendar/i18n/sl.po
new file mode 100644
index 00000000000..91209212e60
--- /dev/null
+++ b/addons/base_calendar/i18n/sl.po
@@ -0,0 +1,1658 @@
+# Slovenian 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-11-13 19:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-14 05:16+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "Ta dogodek se začne"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "Urno"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+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 "Izbrano podjetje ni v dovoljenih podjetjih za tega uporabnika"
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr "Naziv"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Mesečno"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Povabljen Uporabnik"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Povabilo"
+
+#. 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 "Alarmi"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Nedelja"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Vloga"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "Četrti"
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Prikaži kot"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: 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 "Javno"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Marec"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "Opozorilo!"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Petek"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Celi dan"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr "Možnost"
+
+#. 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 "Prosto"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. 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
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Sre"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr "Prikaži čas kot"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Tor"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Letno"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "Dogodek se konča"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Soba"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Dnevi"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1355
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr "Napaka!"
+
+#. 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
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minute"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr "Prikaži"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr "Drugi"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Datum Dogotka"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr "Združi po ..."
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "Leta"
+
+#. 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 "Rok"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Warning!"
+msgstr "Opozorilo!"
+
+#. 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
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+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 "Organizator"
+
+#. 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 "Odgovoren"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr "Dogodek"
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr "Prej"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr "Potrjeno"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr "Uredi vse dogotke"
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr "Udeleženci"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr "Naloga v koledarju"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Ned"
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+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:base.calendar.set.exrule,select1:0
+#: 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.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr "Lokacija"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr "Pošlji e-pošto?"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr "E-pošta"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr "Podrobnosti Dogotka"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr "Zaženi"
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr "Zaupno"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr "Ponovi do"
+
+#. 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
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr "Vidljivost"
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr "Zahtevan Odgovor?"
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "Julij"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "Sprejeto"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "Čet"
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr "Zahtevan Odgovor"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr "Trajno"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr "_Prekliči"
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "Ustvarjeno"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "Zasebno"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "Dnevno"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr "Označi kot"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. 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 "Delegiraj"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr "Stranka"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr "Kontakti partnerja"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr "Prva"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr "Zasebno"
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Časovni pas"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr "Zadeva"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr "September"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr "December"
+
+#. 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 "Razpoložljivost"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr "_Shrani"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr "Posamezno"
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr "Ponovi x krat"
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr "lastnik"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr "Začetni daum"
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr "Skupno ime"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr "Zavrnjeno"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr "Moji Dogotki"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr "Zavrni"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr "Tedni"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr "Skupina"
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr "Uredi Vse"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr "Stiki"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr "Pet"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr "Ure"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Count can not be Negative"
+msgstr "Vrednost ne more biti Negativna"
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr "Član(ica)"
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr "Lokacija Dogodka"
+
+#. 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 "Osnutek"
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr "Priponka"
+
+#. 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
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr "Opomnik"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+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 "Dogodki"
+
+#. 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 "Ponovi"
+
+#. 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:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr "Avgust"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr "Ponedeljek"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr "Tretji"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr "Junij"
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr "Osnovno Opozorilo"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr "Pooblastil"
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr "November"
+
+#. 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 "Podatek"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr "Pon"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr "Število"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Brez ponovitve"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr "Negotov"
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr "Jezik"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr "Sprožilci"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr "Januar"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr "Sreda"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1088
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr "Povzetek"
+
+#. 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 "Aktiven"
+
+#. 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
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+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:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr "Tedensko"
+
+#. 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 "Stanje"
+
+#. 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
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr "Pogostost"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr "Narejeno"
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Ponovi vsak (Dan/Teden/Mesec/Leto)"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr "Uporabniki"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr "od"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr "Torek"
+
+#. 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 "Odgovorni uporabnik"
+
+#. 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 "Busy"
+msgstr "Zaseden"
+
+#. 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 "Ponovi vsakih"
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+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:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr "Četrtek"
+
+#. 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 "Podrobnosti"
+
+#. 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:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Povabi Ljudi"
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+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 "Opis"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr "Maj"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr "Tip"
+
+#. 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 "Zaustavi"
+
+#. 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_model
+msgid "Objects"
+msgstr "Objekti"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr "Sob"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr "Minutno"
+
+#. 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
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr "Februar"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr "Meseci"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. 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 "Opozorilo"
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr "April"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr "Delovni dan"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr "Po dnevih"
+
+#. 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 "ID"
+
+#. 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 "Povabi"
+
+#. 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
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr "Zahteva dejanje"
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr "Poslanmo Od"
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#. 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 "Sprejmi"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Sobota"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr "Sekunda"
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr "Prost/Zaseden"
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+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 "Trajanje"
+
+#. 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 "Sproženo dne"
+
+#. 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:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr "Peti"
diff --git a/addons/base_calendar/i18n/sq.po b/addons/base_calendar/i18n/sq.po
index f6d79971ef6..ad8e1978a70 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr ""
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -367,8 +368,8 @@ msgstr ""
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -828,7 +829,7 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -878,7 +879,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1060,7 +1060,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po
index 3a05aac8db0..67f7fc1ed6c 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Mart"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Detalji Poziva"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -374,8 +375,8 @@ msgstr "Krajnji Rok"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -835,7 +836,7 @@ msgid "Hours"
 msgstr "Sati"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -885,7 +886,6 @@ msgstr "Podsetnik"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Postavi pravilo izuzetka"
@@ -1067,7 +1067,7 @@ msgid "Wednesday"
 msgstr "Sreda"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1682,51 +1682,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Peti"
 
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Odaberite podatke za korisničko pravilo"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern for an exception to a recurrence set"
-#~ msgstr ""
-#~ "Definise pravilo ili ponavljajući uzorak za eksepciju u skupu ponavljanja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Select data for ExRule"
-#~ msgstr "Odaberi podatke za pravilo iznimke"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "ExRule"
-#~ msgstr "Pravilo Izuzetka"
-
-#~ msgid "Custom"
-#~ msgstr "Prilagodjeno"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Ponoviti maximalni broj puta"
-
-#~ msgid "Exclude range"
-#~ msgstr "Iskljuci opseg"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Ponovi svaki x"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunde"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Postavi opseg za iskljucenje"
diff --git a/addons/base_calendar/i18n/sr@latin.po b/addons/base_calendar/i18n/sr@latin.po
index c490638e732..04a37c970ae 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -143,6 +143,7 @@ msgid "March"
 msgstr "Mart"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -260,7 +261,7 @@ msgid "Invitation Detail"
 msgstr "Detalji Poziva"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -374,8 +375,8 @@ msgstr "Krajnji Rok"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
@@ -835,7 +836,7 @@ msgid "Hours"
 msgstr "Sati"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -885,7 +886,6 @@ msgstr "Podsetnik"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Postavi pravilo izuzetka"
@@ -1067,7 +1067,7 @@ msgid "Wednesday"
 msgstr "Sreda"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1682,51 +1682,5 @@ msgstr ""
 msgid "Fifth"
 msgstr "Peti"
 
-#~ msgid "Repeat max that times"
-#~ msgstr "Ponoviti maximalni broj puta"
-
-#~ msgid "Exclude range"
-#~ msgstr "Iskljuci opseg"
-
-#~ msgid "Select data for Custom Rule"
-#~ msgstr "Odaberite podatke za korisničko pravilo"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Ponovi svaki x"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunde"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
 #~ msgid "Set Exclude range"
 #~ msgstr "Postavi opseg za iskljucenje"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ 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 "Custom"
-#~ msgstr "Prilagodjeno"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern for an exception to a recurrence set"
-#~ msgstr ""
-#~ "Definise pravilo ili ponavljajući uzorak za eksepciju u skupu ponavljanja"
-
-#~ msgid "Select data for ExRule"
-#~ msgstr "Odaberi podatke za pravilo iznimke"
-
-#~ msgid "ExRule"
-#~ msgstr "Pravilo Izuzetka"
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index 18c3a5f897c..6a344189b2e 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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -1656,9 +1656,3 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr ""
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunder"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetera varje x"
diff --git a/addons/base_calendar/i18n/th.po b/addons/base_calendar/i18n/th.po
index 87dbd3c5afc..f10d15aecf8 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -142,6 +142,7 @@ msgid "March"
 msgstr "มีนาคม"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -259,7 +260,7 @@ msgid "Invitation Detail"
 msgstr "รายละเอียดการเชิญ"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -368,8 +369,8 @@ msgstr "เส้นตาย"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "คำเตือน!"
@@ -829,7 +830,7 @@ msgid "Hours"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -879,7 +880,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -1061,7 +1061,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
index ba228085c56..d7b406092b9 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: 2011-06-24 05:00+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index 519614a68b0..8713028c8b9 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/i18n/zh_CN.po
@@ -14,24 +14,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr ""
+msgstr "事件开始时"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Hourly"
-msgstr ""
+msgstr "每小时"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required to Join"
-msgstr ""
+msgstr "应加入"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -39,78 +39,78 @@ msgstr ""
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
-msgstr ""
+msgstr "这属性定义循环日程的日期/时间异常列表。"
 
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "用户无权操作所选择公司数据"
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
 msgid "Title"
-msgstr ""
+msgstr "事件摘要"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Monthly"
-msgstr ""
+msgstr "每月"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invited User"
-msgstr ""
+msgstr "受邀用户"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation"
-msgstr ""
+msgstr "邀请"
 
 #. module: base_calendar
 #: help:calendar.event,recurrency:0
 #: help:calendar.todo,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+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 ""
+msgstr "提醒"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "周日"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr ""
+msgstr "角色"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation details"
-msgstr ""
+msgstr "邀请详情"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "第四"
 
 #. module: base_calendar
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "显示为"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,day:0
@@ -120,51 +120,52 @@ msgstr ""
 #: field:calendar.todo,day:0
 #: selection:calendar.todo,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "每月的指定日期"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Public"
-msgstr ""
+msgstr "公开"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid " "
-msgstr ""
+msgstr "base_calendar "
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "周五"
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "全天"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,select1:0
 #: field:calendar.event,select1:0
 #: field:calendar.todo,select1:0
 msgid "Option"
-msgstr ""
+msgstr "选项"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -172,76 +173,76 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Free"
-msgstr ""
+msgstr "空闲"
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr ""
+msgstr "标明是否要求答复赞成"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr ""
+msgstr "原来请求委派给的用户"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "事件"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,we:0
 #: field:calendar.event,we:0
 #: field:calendar.todo,we:0
 msgid "Wed"
-msgstr ""
+msgstr "周三"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Show time as"
-msgstr ""
+msgstr "显示时间为"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,tu:0
 #: field:calendar.event,tu:0
 #: field:calendar.todo,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "周二"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "每年"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr ""
+msgstr "这事件结束时"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Last"
-msgstr ""
+msgstr "最近"
 
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr ""
+msgstr "与会者的参与状况"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Room"
-msgstr ""
+msgstr "室"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -249,83 +250,83 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr ""
+msgstr "天"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "邀请内容"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr ""
+msgstr "主席"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "程序"
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr ""
+msgstr "每分钟"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr ""
+msgstr "显示"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "Edit all Occurrences"
-msgstr ""
+msgstr "编辑所有事件"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation type"
-msgstr ""
+msgstr "邀请类型"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Secondly"
-msgstr ""
+msgstr "第二"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr ""
+msgstr "事件日期"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
-msgstr ""
+msgstr "提供外部的电子邮件地址将得到这个邀请。"
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -336,42 +337,47 @@ msgid ""
 "    - Recurring events\n"
 "    - Invitations to people"
 msgstr ""
+"完整功能的日历系统，支持：\n"
+"    - 日历事件\n"
+"    - 提醒（创建请求）\n"
+"    - 周期性事件\n"
+"    - 邀请人"
 
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "指定类型的邀请"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Years"
-msgstr ""
+msgstr "年"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "事件结束日期"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr ""
+msgstr "可参与"
 
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "截止日期"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: base_calendar
 #: help:calendar.event,active:0
@@ -379,12 +385,12 @@ msgstr ""
 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: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
 msgid "Basic Calendar Functionality"
-msgstr ""
+msgstr "Basic Calendar Functionality"
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
@@ -392,7 +398,7 @@ msgstr ""
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "组织者"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -400,88 +406,88 @@ msgstr ""
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:res.request.link,name:base_calendar.request_link_meeting
 msgid "Event"
-msgstr ""
+msgstr "事件"
 
 #. module: base_calendar
 #: help:calendar.event,edit_all:0
 #: help:calendar.todo,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "编辑定期会议事件"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr ""
+msgstr "之前"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "已确认"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
 msgid "Edit all events"
-msgstr ""
+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 ""
+msgstr "与会者"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr ""
+msgstr "确认"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr ""
+msgstr "日程安排"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,su:0
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
 msgid "Sun"
-msgstr ""
+msgstr "周日"
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr ""
+msgstr "邀请类型"
 
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
-msgstr ""
+msgstr "业务伙伴联系关系"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr ""
+msgstr "细节提醒"
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr ""
+msgstr "参加者"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,select1:0
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "日期"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -489,335 +495,335 @@ msgstr ""
 #: field:calendar.event.edit.all,location:0
 #: field:calendar.todo,location:0
 msgid "Location"
-msgstr ""
+msgstr "地点"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr ""
+msgstr "发邮件？"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
 #: selection:calendar.alarm,action:0
 #: field:calendar.attendee,email:0
 msgid "Email"
-msgstr ""
+msgstr "电子邮箱"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr ""
+msgstr "事件详情"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
-msgstr ""
+msgstr "运行中"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "例外的日期/ 时间"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "机密"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,end_date:0
 #: field:calendar.event,end_date:0
 #: field:calendar.todo,end_date:0
 msgid "Repeat Until"
-msgstr ""
+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 ""
+msgstr "创建特殊日历提醒分配到日历事件或者会议"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
-msgstr ""
+msgstr "可见"
 
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "要求恢复吗？"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
 #: field:calendar.todo,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav 服务的URL"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "Select range to Exclude"
-msgstr ""
+msgstr "选择范围以排除"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "循环ID"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Accepted"
-msgstr ""
+msgstr "已接受"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,th:0
 #: field:calendar.event,th:0
 #: field:calendar.todo,th:0
 msgid "Thu"
-msgstr ""
+msgstr "周四"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
 msgid "Delegrated To"
-msgstr ""
+msgstr "代表人"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "要求回复"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "永远"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "参加要求"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Cancel"
-msgstr ""
+msgstr "取消(_C)"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "已创建"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr ""
+msgstr "私有"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "每天"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "不能复制"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
 #: field:calendar.todo,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "标记为"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+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 ""
+msgstr "让事件在该时间间隔自动重复"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+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 ""
+msgstr "业务伙伴"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "业务伙伴联系人"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "确定(_O)"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "第一个"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "隐私的"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
 #: field:calendar.todo,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "时区"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "主题"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. 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 ""
+msgstr "如果你向邀请的人发送电子邮件勾选这"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "可用"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "_Save"
-msgstr ""
+msgstr "保存(_S)"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "个人"
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "重复 N 次"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "所有者"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "委派信息"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "通用名称"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "已拒绝"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "我的角色"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "我的事件"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "拒绝"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "周"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "群组"
 
 #. module: base_calendar
 #: field:calendar.event,edit_all:0
 #: field:calendar.todo,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "编辑所有"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "联系人"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "基本提醒信息"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "周五"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -825,81 +831,80 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
-msgstr ""
+msgstr "小时"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "次数不能是负数"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "成员"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "地点"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "重复规则"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "附件"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "邀请函"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "结束循环"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "提醒"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
-msgstr ""
+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 ""
+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 ""
+msgstr "邀请与会者"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "被邀请人的电子邮件"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -907,169 +912,169 @@ msgstr ""
 #: field:calendar.todo,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "重复"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
 msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
-msgstr ""
+msgstr "URI引用/指向与会者相应的目录中的信息。"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "周一"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Third"
-msgstr ""
+msgstr "第三个"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "基本提醒"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "此"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "委派来自"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "与会者属于指定的组"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "資料"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "周一"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 msgid "Count"
-msgstr ""
+msgstr "次数"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "不重复"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "不确定"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "语言"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "触发"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "关联到"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "间隔"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "周三"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "间隔不能负数的"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "概要"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1077,22 +1082,22 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "选择在一个月里重复会议的日子"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "操作"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "选择你想邀请的人"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1100,51 +1105,51 @@ msgstr ""
 msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
-msgstr ""
+msgstr "时间段\"和”重复“都是可选的，但如果输入了一个，就必须输入另一个"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "编辑所有的日历事件"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "日历用户参与的角色"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr ""
+msgstr "委派給"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "定义触发报警时要调用的行动"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "搜索事件"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "重复选项"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "每周"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1152,18 +1157,18 @@ msgstr ""
 msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
-msgstr ""
+msgstr "如果有效字段设为True，它将允许你隐藏提醒信息而不需要删除它"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "循环日期"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "你不能同时登录两个用户！"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1173,65 +1178,65 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "提醒详情"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "待审查"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "重复频率"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "重复间隔（日/周/月/年）"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "of"
-msgstr ""
+msgstr "属于"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "周二"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1239,12 +1244,12 @@ msgid ""
 "Provides a more complete                             description of the "
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
-msgstr ""
+msgstr "提供比“摘要”更完整的描述日历的组件"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "负责人"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1252,73 +1257,73 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "忙碌"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "日历事件"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "暂定"
 
 #. module: base_calendar
 #: field:calendar.event,interval:0
 #: field:calendar.todo,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "重复周期"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "修改次数"
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "循环"
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+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 ""
+msgstr "事件邀请"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "周四"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "例外规则"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
-msgstr ""
+msgstr "要指定文本的属性或属性参数值的语言。"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "详细信息"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1326,20 +1331,20 @@ msgstr ""
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "定义一个规则或时间重复模式以排除循环性规则"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "邀请他人"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1349,11 +1354,13 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"为循环事件定义一个规则或重复模式。\n"
+"如：在每隔一个月在这个月的最后一个星期天出现10次； FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr ""
+msgstr "URI引用"
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1363,115 +1370,115 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Search Invitations"
-msgstr ""
+msgstr "搜索邀请"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "之后"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "停止"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.values"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "对象"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "委派"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "周六"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "选择重复会议的日子"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "每分钟"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "指定代表日历用户的用户"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "月份"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "资源"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr ""
+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 ""
+msgstr "包含电子邮件主题中使用的文本或包含了用于显示的文本"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1479,144 +1486,144 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "提醒"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Please Apply Recurrency before applying Exception Rule."
-msgstr ""
+msgstr "请在确认重复前确认里外规则"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "用户发送"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "循环周期"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "工作日"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "按天"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "音频"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "仅供参考"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "邀请"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "与会人员信息"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "资源ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "待处理"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "发送者"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+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 ""
+msgstr "设置事件发生前的提醒时间"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "内部用户"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "同意"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "周六"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "邀请"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "第二个"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "空闲/忙碌"
 
 #. module: base_calendar
 #: field:calendar.event,end_type:0
 #: field:calendar.todo,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "结束循环的方式"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1627,17 +1634,17 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "外部电子邮件"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "触发日期"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1649,10 +1656,16 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
+"*指向一个音频文件，当触发提醒的时候会播放它\n"
+"                    *文件用于作为附件发动\n"
+"                    *只想一个程序，当触发提醒的时候会被调用"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "第五个"
+
+#~ msgid "Set Exclude range"
+#~ msgstr "设置排除范围"
diff --git a/addons/base_calendar/i18n/zh_TW.po b/addons/base_calendar/i18n/zh_TW.po
index 505fbd69a94..f1e5cff65d1 100644
--- a/addons/base_calendar/i18n/zh_TW.po
+++ b/addons/base_calendar/i18n/zh_TW.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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "事件開始"
+msgstr "活動開始"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -141,6 +141,7 @@ msgid "March"
 msgstr "三月"
 
 #. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:414
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
@@ -192,7 +193,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr "事件參照"
+msgstr "活動參考"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,we:0
@@ -224,7 +225,7 @@ msgstr "每年"
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "事件結束"
+msgstr "活動結束"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -258,7 +259,7 @@ msgid "Invitation Detail"
 msgstr "邀約詳情"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/base_calendar.py:1355
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
@@ -314,7 +315,7 @@ msgstr "第二"
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr "事件日期"
+msgstr "活動日期"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -336,10 +337,10 @@ msgid ""
 "    - Recurring events\n"
 "    - Invitations to people"
 msgstr ""
-"支援以下功能之全能行事歷系統：\n"
-"    - 事件行事曆\n"
+"支援以下功能之全能行事曆系統：\n"
+"    - 活動行事曆\n"
 "    - 警示（建立請求）\n"
-"    - 定期事件\n"
+"    - 定期活動\n"
 "    - 發出邀請"
 
 #. module: base_calendar
@@ -357,7 +358,7 @@ msgstr "年"
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "事件結束日期"
+msgstr "活動結束日期"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -372,8 +373,8 @@ msgstr "截止日期"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1088
 #: code:addons/base_calendar/base_calendar.py:1090
-#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -411,7 +412,7 @@ msgstr ""
 #: view:calendar.event:0
 #: model:res.request.link,name:base_calendar.request_link_meeting
 msgid "Event"
-msgstr "事件"
+msgstr "活動"
 
 #. module: base_calendar
 #: help:calendar.event,edit_all:0
@@ -435,7 +436,7 @@ msgstr "確認"
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
 msgid "Edit all events"
-msgstr "編輯所有事件"
+msgstr "編輯所有活動"
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
@@ -511,7 +512,7 @@ msgstr "電郵"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr "事件詳情"
+msgstr "活動詳情"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -658,7 +659,7 @@ msgstr "聯絡人"
 #: help:calendar.event,rrule_type:0
 #: help:calendar.todo,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr "事情自動以此區間重覆"
+msgstr "活動自動以此區間重覆"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -782,7 +783,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr "我的事件"
+msgstr "我的活動"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -833,7 +834,7 @@ msgid "Hours"
 msgstr "小時"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1092
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Count can not be Negative"
 msgstr "次數不能為負"
@@ -847,7 +848,7 @@ msgstr "成員"
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr "事件地點"
+msgstr "活動地點"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
@@ -883,7 +884,6 @@ msgstr "提示"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "設定例外規則"
@@ -893,7 +893,7 @@ msgstr "設定例外規則"
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr "事件"
+msgstr "活動"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
@@ -1065,7 +1065,7 @@ msgid "Wednesday"
 msgstr "星期三"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1088
 #, python-format
 msgid "Interval can not be Negative"
 msgstr "區間不能為負"
@@ -1110,7 +1110,7 @@ msgstr "持續時間」與「重覆」兩項可有可無；但一項有，另一
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr "行事曆編輯所有事件"
+msgstr "行事曆編輯所有活動"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
@@ -1137,7 +1137,7 @@ msgstr "結束日期"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr "搜尋事件"
+msgstr "搜尋活動"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1262,7 +1262,7 @@ msgstr "忙碌"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr "行事曆事件"
+msgstr "行事曆活動"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
@@ -1299,7 +1299,7 @@ msgstr "定期重覆"
 #: 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 "事件邀請"
+msgstr "活動邀請"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1469,7 +1469,7 @@ msgstr "名稱"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr "事件警示資訊"
+msgstr "活動警示資訊"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1579,7 +1579,7 @@ msgstr ""
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "將警示設於活動開始前此時間"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml
index 5512839e635..e9a0f21e26e 100644
--- a/addons/base_calendar/test/base_calendar_test.yml
+++ b/addons/base_calendar/test/base_calendar_test.yml
@@ -15,7 +15,7 @@
     Now I will set recurrence for this event to occur monday and friday of week
 -
     !python {model: calendar.event}: |
-     data = {'fr': 1, 'mo': 1, 'interval': 1, 'rrule_type': 'weekly', 'end_type': 'end_date', 'end_date': '2011-05-31 00:00:00'}
+     data = {'fr': 1, 'mo': 1, 'interval': 1, 'rrule_type': 'weekly', 'end_type': 'end_date', 'end_date': '2011-05-31 00:00:00', 'recurrency' : True}
      self.write(cr, uid, [ref("calendar_event_technicalpresentation0")], data)
 -   |
     In order to check that recurrent events are views successfully in calendar view,
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 17e7d3a69c8..5537d6f91eb 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base Contact',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "expert",
     'description': """
 This module allows you to manage your contacts entirely.
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index cf0bc610be8..9a4b0eace6b 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -143,6 +143,17 @@ class res_partner_address(osv.osv):
                 res.append((r['id'], addr.strip() or '/'))
         return res
 
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args=[]
+        ids = self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
+        jobs = self.pool.get('res.partner.job')
+        if name:
+            job_ids = jobs.search(cr, user, [('contact_id', operator, name)] + args, limit=limit, context=context)
+            for job in jobs.browse(cr, user, job_ids):
+                ids += [job.address_id.id]
+        return self.name_get(cr, user, ids, context)
+
     _name = 'res.partner.address'
     _inherit = 'res.partner.address'
     _description ='Partner Address'
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 8029084b7c3..1dc73f16f72 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -108,9 +108,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Partner Contact">
-                <field name="name" select="1"/>
-                <field name="first_name" select="1"/>
-                <field name="partner_id" select="1" string="Partner"/>
+                <field name="name"/>
+                <field name="first_name"/>
+                <field name="partner_id" string="Partner"/>
             </search>
         </field>
     </record>
@@ -344,7 +344,7 @@
         <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
         <field name="arch" type="xml">
             <search string="Search Contact">
-                   <field name="job_ids" select='1'/>
+                   <field name="job_ids"/>
             </search>
         </field>
     </record>
diff --git a/addons/base_contact/i18n/ar.po b/addons/base_contact/i18n/ar.po
index 7ebf682ba6d..6264b1aa32d 100644
--- a/addons/base_contact/i18n/ar.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/bg.po b/addons/base_contact/i18n/bg.po
index df79d0b9148..e9c5e12d976 100644
--- a/addons/base_contact/i18n/bg.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/bs.po b/addons/base_contact/i18n/bs.po
index 63db55e5f0c..b53c5e91d06 100644
--- a/addons/base_contact/i18n/bs.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/ca.po b/addons/base_contact/i18n/ca.po
index d3089d27479..10153aa9be2 100644
--- a/addons/base_contact/i18n/ca.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -34,27 +34,27 @@ msgstr "Fax"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Data inicial del treball (data d'unió)."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Seleccioneu l'opció per a la migració d'adreces"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Funció d'aquest contacte amb aquesta empresa."
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Estat de l'adreça"
 
 #. module: base_contact
 #: help:res.partner.job,name:0
@@ -62,11 +62,13 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Podeu introduir primer una adreça, es relacionarà automàticament amb "
+"l'empresa si n'hi ha."
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "Número del fax del treball."
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -77,7 +79,7 @@ msgstr "Mòbil"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
@@ -92,13 +94,13 @@ msgstr "Defineix càrrecs i adreces."
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "Data final del treball"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Migra"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -127,6 +129,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el contacte de l'empresa sense "
+"eliminar-lo."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -151,6 +155,25 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Aquest mòdul us permet gestionar els contactes de forma completa.\n"
+"\n"
+"    Us permet definir:\n"
+"        contactes sense cap relació amb una empresa,\n"
+"        contactes que treballen en diverses adreces (probablement per a "
+"diferents empreses),\n"
+"        contactes amb diverses funcions per a cadascuna de les seves adreces "
+"de treball\n"
+"\n"
+"    També afegeix noves entrades de menús localitzades en:\n"
+"        Empreses \\ Contactes\n"
+"        Empreses \\ Funcions\n"
+"\n"
+"    Aneu amb compte que aquest mòdul converteix les adreces existents en "
+"\"adreces + contactes\". Això significa que alguns camps de les adreces "
+"desapareixeran (com ara el nom del contacte), ja que se suposa que estaran "
+"definides en un altre objecte.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -179,6 +202,8 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Ordre d'importància d'aquest títol de treball en la llista de títols de "
+"treballs de l'empresa relacionada."
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -193,7 +218,7 @@ msgstr "Número d'extensió telefònica interior / exterior"
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "Número de telèfon del treball."
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -210,7 +235,7 @@ msgstr "Contacte"
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Correu electrònic del treball"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -225,7 +250,7 @@ msgstr "Càrrec a adreça"
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -236,13 +261,13 @@ msgstr "Cognoms"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicació"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -252,12 +277,12 @@ msgstr "Anterior"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Adreces de l'empresa"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Migració d'adreces a contactes"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -267,7 +292,7 @@ msgstr "Seq. contacte"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Cerca contacte"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -285,6 +310,8 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"A causa dels canvis en la relació entre Adreces i Empreses, alguns dels "
+"detalls de les adreces cal migrar-los a la informació de contactes."
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
@@ -294,7 +321,7 @@ msgstr "Adreces de treball i privades."
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Adreça que està relacionada amb l'empresa"
 
 #. module: base_contact
 #: field:res.partner.job,function:0
@@ -314,12 +341,12 @@ msgstr "Lloc web"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "Si no aquests detalls no seran visibles des d'adreces/contactes."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -330,7 +357,7 @@ msgstr "Email"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contacte.instal·lador"
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -345,7 +372,7 @@ msgstr "Telèfon"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "Voleu migrar les dades de les adreces a les dades de contacte?"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -395,7 +422,7 @@ msgstr "General"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Fotografia"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -405,7 +432,7 @@ msgstr "Data naixement"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "Si seleccioneu aquesta opció, totes les adreces es migraran."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -462,17 +489,17 @@ msgstr "Nacionalitat"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Treballs oberts"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "Podeu migrar les adreces actuals de l'empresa al contacte."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -482,12 +509,12 @@ msgstr "Empleat principal"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Migració d'adreces"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Adreça postal"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -511,6 +538,8 @@ msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
 msgstr ""
+"Ordre d'importància d'aquesta adreça en la llista d'adreces del contacte "
+"relacionat"
 
 #~ msgid "res.partner.contact"
 #~ msgstr "res.partner.contacte"
diff --git a/addons/base_contact/i18n/cs.po b/addons/base_contact/i18n/cs.po
index 6da0d7be51e..2e4b8e18e42 100644
--- a/addons/base_contact/i18n/cs.po
+++ b/addons/base_contact/i18n/cs.po
@@ -4,17 +4,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-03 00:58+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-11-25 12:34+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -24,7 +25,7 @@ msgstr "Název"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# z kontaktů"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
@@ -34,27 +35,27 @@ msgstr "Fax"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "nadpis"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Datum zahájení práce (datum připojení)"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Vyberte volbu pro přesun adres"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Funkce tohoto kontaktu s tímto partnerem"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Stav adresy"
 
 #. module: base_contact
 #: help:res.partner.job,name:0
@@ -62,64 +63,66 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Můžete                       zadat nejdříve adresu. Pokud je nějaký partner, "
+"bude napojen automaticky."
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "Číslo FAXu do práce"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Poznámky"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Lidé, s kterými pracujete."
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Určit funkce a adresu."
 
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "Poslední datum práce"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Přesunout"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Pracovní pozice u stejné adresy partnera."
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Partneři"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
 #. module: base_contact
 #: help:res.partner.contact,active:0
@@ -127,6 +130,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Pokud je aktivní pole nastaveno na Nepravda,               umožní vám to "
+"skrýt kontakt partnera bez jeho odstranění."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -151,22 +156,40 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Tento modul umožňuje úplně spravovat vaše kontakty.\n"
+"\n"
+"    Nechá vás určit\n"
+"        *kontakty nevztažené k partnerovi,\n"
+"        *kontakty pracující na několika adresách (případně i pro různé "
+"partnery),\n"
+"        *kontakty s možnými různými funkcemi pro každou jeho pracovní "
+"adresu\n"
+"\n"
+"    Také přidává nové položky nabídky umístěné v\n"
+"        Partneři \\ Kontakty\n"
+"        Partneři \\ Funkce\n"
+"\n"
+"    Berte na vědomí, že tento modul převádí existující adresy na \"adresy + "
+"kontakty\". To znamená, že některé pole adres budou chybět (jako jméno "
+"kontaktu), protože ty jsou definovány v jiném objektu.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact"
-msgstr ""
+msgstr "Základní kontakt"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr ""
+msgstr "Datum zastavení"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Pozice kontaktu"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -179,95 +202,97 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Pořadí důležitosti                     této pracovní pozice v seznamu titulů "
+"pozic napojeného partnera"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Rozšíření"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Vnitřní/vnější telefoní číslo klapky"
 
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "Telefoní číslo do práce."
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Funkce a adresy"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Pracovní E-Mail"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Poř. parnera"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Funkce na adresu"
 
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Průběh nastavení"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
 msgid "Last Name"
-msgstr ""
+msgstr "Příjmení"
 
 #. module: base_contact
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Komunikace"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Obrázek"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Minulý"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Adresy partnerů"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Stěhování adresy na kontakty"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Poř. kontaktu"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Hledat kontakt"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -277,7 +302,7 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "Kotakty"
+msgstr "Kontakty"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -285,52 +310,54 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"Kvůli změnám v adrese a vztahu partnera, některé podrobnosti adresy jsou "
+"potřebné, aby byly přesunuty do informací účtu."
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Pracovní a soukromé adresy."
 
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Adresa, která je napojena na partnera"
 
 #. module: base_contact
 #: field:res.partner.job,function:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Funkce partnera"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Doplňující pole telefonu"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
 msgid "Website"
-msgstr ""
+msgstr "Webová stránka"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "Jinak tyto podrobnosti nebudou viditelné z adresy/kontaktu."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Nastavit"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contact.installer"
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -345,27 +372,27 @@ msgstr "Telefon"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "Chcete stěhovat vaše data adresy v datech kontaktu?"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivní"
 
 #. module: base_contact
 #: field:res.partner.contact,function:0
 msgid "Main Function"
-msgstr ""
+msgstr "Hlavní funkce"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Určuje partnery a jejich adresy."
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Poř."
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
@@ -375,37 +402,37 @@ msgstr "Jazyk"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Speciální informace"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Společnosti, se kterými pracujete."
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Kontakt partnera"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General"
-msgstr ""
+msgstr "Obecný"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Fotka"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
 msgid "Birth Date"
-msgstr ""
+msgstr "Datum narození"
 
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "Pokud toto vyberete, všechny adresy budou přesunuty."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -420,12 +447,12 @@ msgstr "Křestní jméno"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Kontakt funkce partnera"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Jiné"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
@@ -436,17 +463,17 @@ msgstr "Funkce"
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Hlavní práce"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Určuje kontakty a funkce."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Kontakt na funkci"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -457,53 +484,53 @@ msgstr "Adresa"
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Národnost"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Otevřené pozice"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Jméno"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "Můžete stěhovat partnerovu aktuální adresu do kontaktu."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Hlavní zaměstnavatel"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Stěhování adresy"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Poštovní adresa"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
 #: view:res.partner:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adresy"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Partner na adresu"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
@@ -511,6 +538,8 @@ msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
 msgstr ""
+"Pořadí podle             důležitosti této adresy v seznamu adres napojeného "
+"kontaktu"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalidní XML pro zobrazení architektury!"
diff --git a/addons/base_contact/i18n/da.po b/addons/base_contact/i18n/da.po
index 16b30a00ba3..da5f890c185 100644
--- a/addons/base_contact/i18n/da.po
+++ b/addons/base_contact/i18n/da.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:14+0000\n"
-"PO-Revision-Date: 2011-04-29 12:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-11-08 22:31+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: 2011-04-30 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -25,7 +25,7 @@ msgstr "Titel"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# kontakter"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
index 8893dfb8564..486b010da1c 100644
--- a/addons/base_contact/i18n/de.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -577,22 +577,3 @@ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "Wenn Feld de-aktiviert wird,                        ist es möglich die "
-#~ "Partner Kontaktdaten zu verbergen, ohne die Daten zu entfernen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po
index 03357dd7128..11e07419a2e 100644
--- a/addons/base_contact/i18n/el.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_contact/i18n/es.po b/addons/base_contact/i18n/es.po
index 09d552e6f22..a298e35f8ca 100644
--- a/addons/base_contact/i18n/es.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -343,7 +343,7 @@ msgstr "Sitio web"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr "Sino estos detalles no serán visibles desde direcciones/contactos."
+msgstr "Si no estos detalles no serán visibles desde direcciones/contactos."
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -580,22 +580,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "Si el campo Activo está marcado, permitirá ocultar el contacto de la empresa "
-#~ "sin eliminarlo."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/base_contact/i18n/es_AR.po b/addons/base_contact/i18n/es_AR.po
index b4f586666f7..6036a15812e 100644
--- a/addons/base_contact/i18n/es_AR.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/es_EC.po b/addons/base_contact/i18n/es_EC.po
index d646ae7d1a9..d70416008c8 100644
--- a/addons/base_contact/i18n/es_EC.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -34,27 +34,27 @@ msgstr "Fax"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Fecha inicial del trabajo (fecha de unión)."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Seleccione la opción para la migración de direcciones"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Función de este contacto con esta empresa."
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Estado de la dirección."
 
 #. module: base_contact
 #: help:res.partner.job,name:0
@@ -62,11 +62,13 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Puede introducir primero una dirección, se relacionará automáticamente con "
+"la empresa si hay una."
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "Número del Fax del trabajo."
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -77,7 +79,7 @@ msgstr "Móvil"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
@@ -92,13 +94,13 @@ msgstr "Definir cargos y direcciones."
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "Fecha final del trabajo."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Migrar"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -127,6 +129,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
+"sin eliminarlo."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -151,6 +155,25 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Este módulo le permite gestionar sus contactos de forma completa.\n"
+"\n"
+"    Le permite definir:\n"
+"        *contactos sin ninguna relación con una empresa,\n"
+"        *contactos que trabajan en varias direcciones (probablemente para "
+"distintas empresas),\n"
+"        *contactos con varias funciones para cada una de sus direcciones de "
+"trabajo\n"
+"\n"
+"    También añade nuevas entradas de menús localizadas en:\n"
+"        Empresas \\ Contactos\n"
+"        Empresas \\ Funciones\n"
+"\n"
+"    Tenga cuidado que este módulo convierte las direcciones existentes en "
+"\"direcciones + contactos\". Esto significa que algunos campos de las "
+"direcciones desaparecerán (como el nombre del contacto), ya que se supone "
+"que estarán definidos en otro objeto.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -179,6 +202,8 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Orden de importancia de este título de trabajo en la lista de títulos de "
+"trabajo de la empresa relacionada."
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -193,7 +218,7 @@ msgstr "Número de extensión telefónica interior/exterior"
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "Número de teléfono del trabajo."
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -210,7 +235,7 @@ msgstr "Contacto"
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Correo electrónico del trabajo."
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -225,7 +250,7 @@ msgstr "Cargo a dirección"
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso de configuración"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -236,13 +261,13 @@ msgstr "Apellido"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicación"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -252,12 +277,12 @@ msgstr "Anterior"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Direcciones de empresa"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Migración de direcciones a contactos"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -267,7 +292,7 @@ msgstr "Sec. contacto"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Buscar contacto"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -285,6 +310,9 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
+"los detalles de las direcciones son necesarios migrarlos a la información de "
+"contactos."
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
@@ -294,7 +322,7 @@ msgstr "Direcciones de trabajo y privadas."
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Dirección que está relacionada con la empresa."
 
 #. module: base_contact
 #: field:res.partner.job,function:0
@@ -314,12 +342,12 @@ msgstr "Sitio web"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "Sino estos detalles no serán visibles desde direcciones/contactos."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -330,7 +358,7 @@ msgstr "Correo electrónico"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "Instalador de Módulo de Contactos"
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -345,7 +373,7 @@ msgstr "Teléfono"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -395,7 +423,7 @@ msgstr "General"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -405,7 +433,7 @@ msgstr "Fecha nacimiento"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -462,17 +490,17 @@ msgstr "Nacionalidad"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Abrir trabajos"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -482,12 +510,12 @@ msgstr "Empleado principal"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Migración direcciones"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Dirección postal"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -511,6 +539,8 @@ msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
 msgstr ""
+"Orden de importancia de esta dirección en la lista de direcciones del "
+"contacto relacionado."
 
 #~ msgid "res.partner.contact"
 #~ msgstr "res.partner.contact"
diff --git a/addons/base_contact/i18n/es_MX.po b/addons/base_contact/i18n/es_MX.po
new file mode 100644
index 00000000000..b52490050ce
--- /dev/null
+++ b/addons/base_contact/i18n/es_MX.po
@@ -0,0 +1,582 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_contact
+#
+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-28 08:39+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:09+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "Número de Contactos"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr "Fecha inicial del trabajo (fecha de unión)."
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Select the Option for Addresses Migration"
+msgstr "Seleccione la opción para la migración de direcciones"
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr "Función de este contacto con esta empresa."
+
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr "Estado de la dirección."
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+"Puede introducir primero una dirección, se relacionará automáticamente con "
+"la empresa si hay una."
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr "Número del Fax del trabajo."
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "Gente con la que trabaja."
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Definir cargos y direcciones."
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr "Fecha final del trabajo."
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr "Migrar"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr "Trabajos en la misma dirección de empresa."
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
+"sin eliminarlo."
+
+#. module: base_contact
+#: model:ir.module.module,description:base_contact.module_meta_information
+msgid ""
+"\n"
+"        This module allows you to manage your contacts entirely.\n"
+"\n"
+"    It lets you define\n"
+"        *contacts unrelated to a partner,\n"
+"        *contacts working at several addresses (possibly for different "
+"partners),\n"
+"        *contacts with possibly different functions for each of its job's "
+"addresses\n"
+"\n"
+"    It also adds new menu items located in\n"
+"        Partners \\ Contacts\n"
+"        Partners \\ Functions\n"
+"\n"
+"    Pay attention that this module converts the existing addresses into "
+"\"addresses + contacts\". It means that some fields of the addresses will be "
+"missing (like the contact name), since these are supposed to be defined in "
+"an other object.\n"
+"    "
+msgstr ""
+"\n"
+"        Este módulo le permite gestionar sus contactos de forma completa.\n"
+"\n"
+"    Le permite definir:\n"
+"        *contactos sin ninguna relación con una empresa,\n"
+"        *contactos que trabajan en varias direcciones (probablemente para "
+"distintas empresas),\n"
+"        *contactos con varias funciones para cada una de sus direcciones de "
+"trabajo\n"
+"\n"
+"    También añade nuevas entradas de menús localizadas en:\n"
+"        Empresas \\ Contactos\n"
+"        Empresas \\ Funciones\n"
+"\n"
+"    Tenga cuidado que este módulo convierte las direcciones existentes en "
+"\"direcciones + contactos\". Esto significa que algunos campos de las "
+"direcciones desaparecerán (como el nombre del contacto), ya que se supone "
+"que estarán definidos en otro objeto.\n"
+"    "
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Contacto base"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Fecha finalización"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Trabajos del contacto"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+"Orden de importancia de este título de trabajo en la lista de títulos de "
+"trabajo de la empresa relacionada."
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Extensión"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Número de extensión telefónica interior/exterior"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr "Número de teléfono del trabajo."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Cargos y direcciones"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr "Correo electrónico del trabajo."
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Sec. empresa"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Cargo a dirección"
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Apellido"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Anterior"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Direcciones de empresa"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Address's Migration to Contacts"
+msgstr "Migración de direcciones a contactos"
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
+msgstr "Sec. contacto"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "Search Contact"
+msgstr "Buscar contacto"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+"Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
+"los detalles de las direcciones son necesarios migrarlos a la información de "
+"contactos."
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Direcciones de trabajo y privadas."
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr "Dirección que está relacionada con la empresa."
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Función en empresa"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Campo para teléfono adicional"
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Sitio web"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr "Si no estos detalles no serán visibles desde direcciones/contactos."
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr "base.contacto.instalador"
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Funciones contacto"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Función principal"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "Definir empresas y sus direcciones."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Información extra"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Empresas en las que trabaja."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "General"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr "Foto"
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Fecha nacimiento"
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: base_contact
+#: field:res.partner.contact,first_name:0
+msgid "First Name"
+msgstr "Nombre"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_job
+msgid "Contact Partner Function"
+msgstr "Función contacto en empresa"
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_function0
+msgid "Function"
+msgstr "Cargo"
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Trabajo principal"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr "Define contactos y cargos."
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Contacto a cargo"
+
+#. module: base_contact
+#: view:res.partner:0
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: base_contact
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr "Nacionalidad"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr "Abrir trabajos"
+
+#. module: base_contact
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "You can migrate Partner's current addresses to the contact."
+msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr "Empleado principal"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr "Migración direcciones"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr "Dirección postal"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_addresses0
+#: view:res.partner:0
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Empresa a dirección"
+
+#. module: base_contact
+#: field:res.partner.job,date_start:0
+msgid "Date Start"
+msgstr "Fecha inicio"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of                     importance of this address in the list of "
+"addresses of the linked contact"
+msgstr ""
+"Orden de importancia de esta dirección en la lista de direcciones del "
+"contacto relacionado."
+
+#~ msgid "res.partner.contact"
+#~ msgstr "res.partner.contact"
+
+#~ 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 ""
+#~ "Order of importance of this job title in the list of job title of the linked "
+#~ "partner"
+#~ msgstr ""
+#~ "Orden de importancia de este empleo en la lista de empleos de la empresa "
+#~ "relacionada"
+
+#~ msgid ""
+#~ "Order of importance of this address in the list of addresses of the linked "
+#~ "contact"
+#~ msgstr ""
+#~ "Orden de importancia de esta dirección en la lista de direcciones del "
+#~ "contacto relacionado"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Base Contact Process"
+#~ msgstr "Proceso contacto base"
+
+#~ msgid "Partner Contacts"
+#~ msgstr "Contactos de la empresa"
+
+#~ msgid "General Information"
+#~ msgstr "Información general"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/base_contact/i18n/es_PY.po b/addons/base_contact/i18n/es_PY.po
index e5316198de0..3bb30a2c267 100644
--- a/addons/base_contact/i18n/es_PY.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/es_VE.po b/addons/base_contact/i18n/es_VE.po
new file mode 100644
index 00000000000..b52490050ce
--- /dev/null
+++ b/addons/base_contact/i18n/es_VE.po
@@ -0,0 +1,582 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_contact
+#
+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-28 08:39+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:09+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "Número de Contactos"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr "Fecha inicial del trabajo (fecha de unión)."
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Select the Option for Addresses Migration"
+msgstr "Seleccione la opción para la migración de direcciones"
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr "Función de este contacto con esta empresa."
+
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr "Estado de la dirección."
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+"Puede introducir primero una dirección, se relacionará automáticamente con "
+"la empresa si hay una."
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr "Número del Fax del trabajo."
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "Gente con la que trabaja."
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Definir cargos y direcciones."
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr "Fecha final del trabajo."
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr "Migrar"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr "Trabajos en la misma dirección de empresa."
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
+"sin eliminarlo."
+
+#. module: base_contact
+#: model:ir.module.module,description:base_contact.module_meta_information
+msgid ""
+"\n"
+"        This module allows you to manage your contacts entirely.\n"
+"\n"
+"    It lets you define\n"
+"        *contacts unrelated to a partner,\n"
+"        *contacts working at several addresses (possibly for different "
+"partners),\n"
+"        *contacts with possibly different functions for each of its job's "
+"addresses\n"
+"\n"
+"    It also adds new menu items located in\n"
+"        Partners \\ Contacts\n"
+"        Partners \\ Functions\n"
+"\n"
+"    Pay attention that this module converts the existing addresses into "
+"\"addresses + contacts\". It means that some fields of the addresses will be "
+"missing (like the contact name), since these are supposed to be defined in "
+"an other object.\n"
+"    "
+msgstr ""
+"\n"
+"        Este módulo le permite gestionar sus contactos de forma completa.\n"
+"\n"
+"    Le permite definir:\n"
+"        *contactos sin ninguna relación con una empresa,\n"
+"        *contactos que trabajan en varias direcciones (probablemente para "
+"distintas empresas),\n"
+"        *contactos con varias funciones para cada una de sus direcciones de "
+"trabajo\n"
+"\n"
+"    También añade nuevas entradas de menús localizadas en:\n"
+"        Empresas \\ Contactos\n"
+"        Empresas \\ Funciones\n"
+"\n"
+"    Tenga cuidado que este módulo convierte las direcciones existentes en "
+"\"direcciones + contactos\". Esto significa que algunos campos de las "
+"direcciones desaparecerán (como el nombre del contacto), ya que se supone "
+"que estarán definidos en otro objeto.\n"
+"    "
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Contacto base"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Fecha finalización"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Trabajos del contacto"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+"Orden de importancia de este título de trabajo en la lista de títulos de "
+"trabajo de la empresa relacionada."
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Extensión"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Número de extensión telefónica interior/exterior"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr "Número de teléfono del trabajo."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Cargos y direcciones"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr "Correo electrónico del trabajo."
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Sec. empresa"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Cargo a dirección"
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Apellido"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Anterior"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Direcciones de empresa"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Address's Migration to Contacts"
+msgstr "Migración de direcciones a contactos"
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
+msgstr "Sec. contacto"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "Search Contact"
+msgstr "Buscar contacto"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+"Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
+"los detalles de las direcciones son necesarios migrarlos a la información de "
+"contactos."
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Direcciones de trabajo y privadas."
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr "Dirección que está relacionada con la empresa."
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Función en empresa"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Campo para teléfono adicional"
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Sitio web"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr "Si no estos detalles no serán visibles desde direcciones/contactos."
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr "base.contacto.instalador"
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Funciones contacto"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Función principal"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "Definir empresas y sus direcciones."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Información extra"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Empresas en las que trabaja."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "General"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr "Foto"
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Fecha nacimiento"
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: base_contact
+#: field:res.partner.contact,first_name:0
+msgid "First Name"
+msgstr "Nombre"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_job
+msgid "Contact Partner Function"
+msgstr "Función contacto en empresa"
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_function0
+msgid "Function"
+msgstr "Cargo"
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Trabajo principal"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr "Define contactos y cargos."
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Contacto a cargo"
+
+#. module: base_contact
+#: view:res.partner:0
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: base_contact
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr "Nacionalidad"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr "Abrir trabajos"
+
+#. module: base_contact
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "You can migrate Partner's current addresses to the contact."
+msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr "Empleado principal"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr "Migración direcciones"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr "Dirección postal"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_addresses0
+#: view:res.partner:0
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Empresa a dirección"
+
+#. module: base_contact
+#: field:res.partner.job,date_start:0
+msgid "Date Start"
+msgstr "Fecha inicio"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of                     importance of this address in the list of "
+"addresses of the linked contact"
+msgstr ""
+"Orden de importancia de esta dirección en la lista de direcciones del "
+"contacto relacionado."
+
+#~ msgid "res.partner.contact"
+#~ msgstr "res.partner.contact"
+
+#~ 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 ""
+#~ "Order of importance of this job title in the list of job title of the linked "
+#~ "partner"
+#~ msgstr ""
+#~ "Orden de importancia de este empleo en la lista de empleos de la empresa "
+#~ "relacionada"
+
+#~ msgid ""
+#~ "Order of importance of this address in the list of addresses of the linked "
+#~ "contact"
+#~ msgstr ""
+#~ "Orden de importancia de esta dirección en la lista de direcciones del "
+#~ "contacto relacionado"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Base Contact Process"
+#~ msgstr "Proceso contacto base"
+
+#~ msgid "Partner Contacts"
+#~ msgstr "Contactos de la empresa"
+
+#~ msgid "General Information"
+#~ msgstr "Información general"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/base_contact/i18n/et.po b/addons/base_contact/i18n/et.po
index 2103f4aa4f1..9ffc335e102 100644
--- a/addons/base_contact/i18n/et.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/fi.po b/addons/base_contact/i18n/fi.po
index b83ada5810b..3bed3eab36e 100644
--- a/addons/base_contact/i18n/fi.po
+++ b/addons/base_contact/i18n/fi.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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Otsikko"
 
 #. module: base_contact
 #: view:res.partner.address:0
@@ -35,27 +35,27 @@ msgstr "Faksi"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Työn aloituspäivä"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Valitse vaihtoehto osoitteiden yhdistämiselle"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Tämän yhteystiedon toimi tämän yhteistyökumppanin yhteydessä"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Osoitteen tila"
 
 #. module: base_contact
 #: help:res.partner.job,name:0
@@ -63,11 +63,13 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Voit lisätä osoitteen ensin. Yhteistyökumppani linkitetään siihen "
+"automaattisesti (jos on)"
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "Työ FAX numero"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -78,7 +80,7 @@ msgstr "Matkapuhelin"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
@@ -88,18 +90,18 @@ msgstr "Ihmiset joiden kanssa teet töitä"
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Määrittele toiminnot ja osoitteet"
 
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "Viimeinen työpäivä"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Siirrä"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -110,7 +112,7 @@ msgstr "Kumppani"
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "työt samassa yhteistyökumppanin osoitteessa"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
@@ -120,7 +122,7 @@ msgstr "Kumppanit"
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: base_contact
 #: help:res.partner.contact,active:0
@@ -128,6 +130,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Jos aktiivisuus tila on asetettu ei-voimassa (false) se sallii sinun "
+"piilottaa kontaktin poistamatta sitä."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -157,7 +161,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact"
-msgstr ""
+msgstr "Pääkontakti"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
@@ -180,6 +184,7 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Tämän tehtävän tärkeysjärjestys linkitetyn yhteistyökumppanin hierarkiassa"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -189,12 +194,12 @@ msgstr "Laajennus"
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Sisäinen/Ulkoinen alaliittymänumero"
 
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "Työpuhelinnumero"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -211,22 +216,22 @@ msgstr "Kontakti"
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Työsähköposti"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Yhteistyökumppanin järjestysnumero"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Osoitteen toimi"
 
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -237,38 +242,38 @@ msgstr "Sukunimi"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Viestintä"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Mennyt"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Kumppanien osoitteet"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Osoitteiden yhdistäminen kontakteihin"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Kontaktin numero"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Etsi Yhteystiedoista"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -286,6 +291,8 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"Koska yhteistyökumppanin yhteydet tai osoitteet ovat muuttuneet, tietoja "
+"pitää yhdistää kontaktitietoihin"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
@@ -295,12 +302,12 @@ msgstr "Työ -ja yksityisosoitteet"
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Osoite joka on linkitetty yhteistyökumppaniin"
 
 #. module: base_contact
 #: field:res.partner.job,function:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Partnerin toiminto"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
@@ -316,11 +323,12 @@ msgstr "Websivu"
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
 msgstr ""
+"Muuten nämä yksityiskohdat eivät ole näkyvissä osoitteessa/kontaktissa."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -346,7 +354,7 @@ msgstr "Puhelin"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "Haluatko yhdistää osoitetiedot kontaktitiedoissa?"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -366,7 +374,7 @@ msgstr "Määrittää kumppanit ja heidän osoitteet"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Sarja"
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
@@ -396,7 +404,7 @@ msgstr "Yleiset"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Kuva"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -406,7 +414,7 @@ msgstr "Syntymäaika"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "Jos valitset tämän, kaikki osoitteet siirretään"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -421,7 +429,7 @@ msgstr "Etunimi"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Yhteistyöpartnerin toiminto"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
@@ -447,7 +455,7 @@ msgstr "Määrittää kontaktit ja toiminnot"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Ota yhteyttä toimintoon"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -463,32 +471,32 @@ msgstr "Kansallisuus"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Avoimet työpaikat"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "Voit päivittää yhteistyökumppanin nykyiset osoitteet kontaktille."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Päätyönantaja"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Osoitteiden yhdistely"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Postiosoite"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -499,7 +507,7 @@ msgstr "Osoitteet"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Yhteistyökumppanin osoite"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
@@ -511,7 +519,7 @@ msgstr "Aloituspäivämäärä"
 msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
-msgstr ""
+msgstr "Tämän osoitteen tärkeys kontaktin osoitelistalla"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/base_contact/i18n/fr.po b/addons/base_contact/i18n/fr.po
index 66e5a19a427..d42d255fb5c 100644
--- a/addons/base_contact/i18n/fr.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -575,9 +575,6 @@ msgstr ""
 #~ msgid "General Information"
 #~ msgstr "Informations générales"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de menu récursif."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/base_contact/i18n/gl.po b/addons/base_contact/i18n/gl.po
index a53ba14c7f6..b52c21d5e80 100644
--- a/addons/base_contact/i18n/gl.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/hr.po b/addons/base_contact/i18n/hr.po
index b45cd11ce56..2293b1b95f5 100644
--- a/addons/base_contact/i18n/hr.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/hu.po b/addons/base_contact/i18n/hu.po
index 1ccdb4354ee..7959f857af6 100644
--- a/addons/base_contact/i18n/hu.po
+++ b/addons/base_contact/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-31 13:18+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/id.po b/addons/base_contact/i18n/id.po
index 07e87bba9b0..f4ac9fef69e 100644
--- a/addons/base_contact/i18n/id.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
index e90510a0acd..c79b9566c0e 100644
--- a/addons/base_contact/i18n/it.po
+++ b/addons/base_contact/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 22:45+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@domsense.com>\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -580,22 +580,3 @@ msgstr ""
 
 #~ msgid "Base Contact Process"
 #~ msgstr "Processo Contatto base"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare menù ricorsivi."
-
-#~ msgid ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "Se il campo attivo è imposato a Vero, verrà nascosto il contatto del partner "
-#~ "senza rimuoverlo."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index 525a64ded2e..ee52c1a1b82 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/lo.po b/addons/base_contact/i18n/lo.po
index 2bdd08b39a1..a50eaecd361 100644
--- a/addons/base_contact/i18n/lo.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -342,7 +342,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "ໂທລະສັບ"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -372,7 +372,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
-msgstr ""
+msgstr "ພາສາ"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -412,12 +412,12 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "ປະຈຸບັນ"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "ຊື່"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
@@ -427,7 +427,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "ອື່ນ ໆ"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 0f367852893..f801903b9ec 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: lt\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/lv.po b/addons/base_contact/i18n/lv.po
index 710c15f3c1a..b1d32d81cc9 100644
--- a/addons/base_contact/i18n/lv.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/mn.po b/addons/base_contact/i18n/mn.po
index 070cc4580e9..3a8ff17fc6d 100644
--- a/addons/base_contact/i18n/mn.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/nb.po b/addons/base_contact/i18n/nb.po
index 2386cb76d39..e0b2cb2ef8a 100644
--- a/addons/base_contact/i18n/nb.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index 2ef7064acea..35cc58d55bf 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -578,22 +578,3 @@ msgstr ""
 
 #~ msgid "Partner Contacts"
 #~ msgstr "Contactpersonen relatie"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "Als het actief veld is aangezet, kunt u de relatie verbergen zonder deze te "
-#~ "verwijderen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/base_contact/i18n/nl_BE.po b/addons/base_contact/i18n/nl_BE.po
index 26cac1bdb10..7c1fa6f4ac0 100644
--- a/addons/base_contact/i18n/nl_BE.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/oc.po b/addons/base_contact/i18n/oc.po
index f5242a11b71..414e4799305 100644
--- a/addons/base_contact/i18n/oc.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/pl.po b/addons/base_contact/i18n/pl.po
index 03574e7ab3a..bbc492eeb59 100644
--- a/addons/base_contact/i18n/pl.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/pt.po b/addons/base_contact/i18n/pt.po
index 053235247e2..dacf6bfa66a 100644
--- a/addons/base_contact/i18n/pt.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -538,18 +538,6 @@ msgstr ""
 #~ msgid "General Information"
 #~ msgstr "Informação Geral"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/base_contact/i18n/pt_BR.po b/addons/base_contact/i18n/pt_BR.po
index fa7dfdf59d4..a186561297e 100644
--- a/addons/base_contact/i18n/pt_BR.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -573,26 +573,7 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "O nome do objeto deve iniciar com x_ e não conter nenhum caracter especial."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "Se o campo ativo for configurado para verdadeiro será permitido ocultar o "
-#~ "contato do parceiro sem removê-lo"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/base_contact/i18n/ro.po b/addons/base_contact/i18n/ro.po
index eb01f105ac0..35a6e2991d5 100644
--- a/addons/base_contact/i18n/ro.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index f680fad10e4..7010535ecfd 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -34,7 +34,7 @@ msgstr "Факс"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr "Обращение"
+msgstr "title"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
@@ -569,22 +569,3 @@ msgstr "Порядок важности этого адреса в списке
 #~ "Order of importance of this address in the list of addresses of the linked "
 #~ "contact"
 #~ msgstr "Уровень важности этого адреса в списке адресов связанного контакта"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
-#~ "контакт партнера без его удаления."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/base_contact/i18n/sk.po b/addons/base_contact/i18n/sk.po
index 48f955a94a6..3de9d5fb093 100644
--- a/addons/base_contact/i18n/sk.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/sl.po b/addons/base_contact/i18n/sl.po
index 5e6d5497a87..96ef414f15e 100644
--- a/addons/base_contact/i18n/sl.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -44,12 +44,12 @@ msgstr "Začetek zaposlitve"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Izberi možnost za migracijo naslovov"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Funkcija tega stika s tem partnerjem"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
@@ -62,6 +62,7 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Lahko vnesete najprej naslov, partner bo samodejno povezan, če sploh."
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
@@ -82,7 +83,7 @@ msgstr "Opombe"
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr "S kareimi ljudmi poslujete"
+msgstr "S katerimi ljudmi poslujete"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
@@ -127,6 +128,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Če je aktivno polje nastavljeno na False, vam bo dovoljeno skrivanje "
+"kontakta partnerja brez, da bi ga odstranili."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -151,6 +154,23 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Ta modul vam omogoča, da upravljate svoje stike v celoti.\n"
+"\n"
+"    Dovoli vam definirati\n"
+"        * stiki, ki niso povezani s partnerjem,\n"
+"        * stiki , ki delajo na več naslovih (lahko za različne partnerje),\n"
+"        * stiki z morda različnimi funkcijami za vsak od naslovov kjer "
+"delajo\n"
+"\n"
+"    Prav tako dodaja nove elemente menija, ki se nahajajo v\n"
+"        Partnerji \\ Kontakti\n"
+"        Partners \\ Funkcije\n"
+"\n"
+"    Bodite pozorni, da ta modul pretvarja obstoječe naslovov v \"naslovi + "
+"stikov\". To pomeni, da bodo nekatera področja naslovov manjkala (kot je ime "
+"stika), saj naj bi bila opredeljena v drug predmetu.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -179,11 +199,13 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Vrstni red pomembnosti tega naziva delovnega mesta na seznamu nazivov od "
+"povezanega partnerja"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr "Končnica"
+msgstr "Razširitev"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
@@ -205,7 +227,7 @@ msgstr "Funkcije in naslovi"
 #: model:ir.model,name:base_contact.model_res_partner_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr "Stik"
+msgstr "Kontakt"
 
 #. module: base_contact
 #: help:res.partner.job,email:0
@@ -236,7 +258,7 @@ msgstr "Priimek"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr "Sporočanje"
+msgstr "Komunikacija"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
@@ -257,7 +279,7 @@ msgstr "Naslovi stranke"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Migracija naslovov kontaktov"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -285,6 +307,8 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"Zaradi sprememb v  zvezi Naslov in Partner, so nekatere podrobnosti iz "
+"naslova je bilo treba selili v kontaktne podatke."
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
@@ -314,12 +338,12 @@ msgstr "Spletno mesto"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "V nasprotnem primeru ti podatki ne bodo videni iz naslova / kontakt."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Nastavitve"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -472,7 +496,7 @@ msgstr "Ime"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "Lahko migrirate trenutni naslov partnerja k kontatku."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -511,6 +535,7 @@ msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
 msgstr ""
+"Vrstni red pomembnosti tega naslova na seznamu naslovov povezanih kontaktov"
 
 #~ msgid "res.partner.contact"
 #~ msgstr "res.partner.contact"
diff --git a/addons/base_contact/i18n/sq.po b/addons/base_contact/i18n/sq.po
index b188dad0478..dc434f5f783 100644
--- a/addons/base_contact/i18n/sq.po
+++ b/addons/base_contact/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po
index 3c1b01115f6..2f2dec85eb9 100644
--- a/addons/base_contact/i18n/sr.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -551,13 +551,3 @@ msgstr "Redosled vaznosti ovih adresa u listi adresa linkovanog kontakta"
 
 #~ msgid "General Information"
 #~ msgstr "Opšte informacije"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes da kreiras rekursivni meni."
-
-#~ msgid ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno da ISTINA, omogucice da sakrijes kontakt "
-#~ "partnera bez uklanjanja."
diff --git a/addons/base_contact/i18n/sr@latin.po b/addons/base_contact/i18n/sr@latin.po
index c32e529f2ee..0e963d08050 100644
--- a/addons/base_contact/i18n/sr@latin.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -523,21 +523,11 @@ msgstr "Redosled vaznosti ovih adresa u listi adresa linkovanog kontakta"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes da kreiras rekursivni meni."
-
 #~ 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 ""
-#~ "If the active field is set to true,                 it will allow you to "
-#~ "hide the partner contact without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno da ISTINA, omogucice da sakrijes kontakt "
-#~ "partnera bez uklanjanja."
-
 #~ msgid "res.partner.contact"
 #~ msgstr "es.partner.contact"
 
diff --git a/addons/base_contact/i18n/sv.po b/addons/base_contact/i18n/sv.po
index 4c68685a3d8..4ded25b78b0 100644
--- a/addons/base_contact/i18n/sv.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/th.po b/addons/base_contact/i18n/th.po
index 8c15091b25a..af6d63000ba 100644
--- a/addons/base_contact/i18n/th.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/tlh.po b/addons/base_contact/i18n/tlh.po
index 0e9305ad5aa..b550411b04c 100644
--- a/addons/base_contact/i18n/tlh.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index 81936f78a47..87b37ae0962 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/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: 2011-05-29 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/uk.po b/addons/base_contact/i18n/uk.po
index c130e0a16b5..83b4b8c329d 100644
--- a/addons/base_contact/i18n/uk.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_contact/i18n/vi.po b/addons/base_contact/i18n/vi.po
index ecc62719814..9a0819a9fa4 100644
--- a/addons/base_contact/i18n/vi.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -320,7 +320,7 @@ msgstr ""
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Cấu hình"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -521,46 +521,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Tên đối tượng phải bắt đầu với x_ và không chứa bất kỳ ký tự đặc biệt nào!"
 
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage entirely your contacts.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also add new menu items located in\n"
-#~ "        Partners / Contacts\n"
-#~ "        Partners / Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Mô đun này cho phép bạn quản lý toàn bộ thông tin liên hệ của bạn.\n"
-#~ "\n"
-#~ "    Mô đun này cho phép bạn định nghĩa\n"
-#~ "        *các thông tin liên hệ không liên quan đến một đối tác,\n"
-#~ "        *thông tin liên hệ tại nhiều địa chỉ khác nhau (có thể cho nhiều đối "
-#~ "tác khác nhau),\n"
-#~ "        *thông tin liên hệ với nhiều chức năng khác nhau đối với mỗi địa "
-#~ "chỉ\n"
-#~ "\n"
-#~ "    Mô đun này còn thêm các mục menu mới đặt tại\n"
-#~ "        Đối tác / Liên hệ\n"
-#~ "        Đối tác / Chức năng\n"
-#~ "\n"
-#~ "    Lưu ý rằng mô đun này chuyển đổi các địa chỉ hiện tại vào \"địa chỉ + "
-#~ "liên hệ\". Có nghĩa là một số thông tin của địa chỉ sẽ bị mất (như tên đối "
-#~ "tác), do các thông tin này đã được định nghĩa ở các đối tượng khác.\n"
-#~ "    "
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
 
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index f3780c50ecb..d4dd563eec5 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -34,7 +34,7 @@ msgstr "传真"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "职位"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
@@ -92,7 +92,7 @@ msgstr "定义职能与地址。"
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "工作的最后日期"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -126,7 +126,7 @@ msgstr "省/ 州"
 msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
-msgstr ""
+msgstr "如果有效性字段是假值，它可以允许你隐藏业务伙伴联系人不用删除它"
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -151,6 +151,20 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        这个模块允许您完整地管理您的联系人。\n"
+"\n"
+"    它可以让你定义\n"
+"        *联系人不关联合作伙伴，\n"
+"        *联系人工作在几个地址（这些地址可能是几个业务伙伴）\n"
+"        *联系人几个地址可能是不同职务\n"
+"\n"
+"    它还增加了新的菜单位于\n"
+"        合作伙伴\\联系人\n"
+"        合作伙伴\\职位\n"
+"\n"
+"    注意，此模块转换成“地址+联系人”的现有地址。这意味着一些地址字段将会丢失（如联系人的姓名），因为这些都应该是在其他对象中定义的。\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -178,7 +192,7 @@ msgstr "分类"
 msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
-msgstr ""
+msgstr "在业务伙伴职位列表里按照职位重要性排列"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -225,7 +239,7 @@ msgstr "职能到地址"
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -236,7 +250,7 @@ msgstr "姓"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "沟通"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
@@ -257,7 +271,7 @@ msgstr "业务伙伴地址列表"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "地址的迁移到通讯录"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -284,7 +298,7 @@ msgstr "联系"
 msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
-msgstr ""
+msgstr "由于地址和合作伙伴的关系的变化，一些细节需要迁移到联系信息。"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
@@ -314,12 +328,12 @@ msgstr "网站"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "否则这些细节在地址/联系人处不可见"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr "配置"
+msgstr "设置"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -330,7 +344,7 @@ msgstr "电子邮件"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contact.installer"
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -365,7 +379,7 @@ msgstr "定义业务伙伴和地址"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr "序号"
+msgstr "序列"
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
@@ -405,7 +419,7 @@ msgstr "生日"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "如果你选择这个,所有地址将被迁移。"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -467,12 +481,12 @@ msgstr "开放的职位"
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr "姓名"
+msgstr "名称"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "你可以迁移业务伙伴的当前地址到联系人上"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -482,12 +496,12 @@ msgstr "主要雇主"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "地址迁移"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "邮政地址"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -510,7 +524,7 @@ msgstr "开始日期"
 msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
-msgstr ""
+msgstr "按照重要性列表这些联系人的地址"
 
 #~ msgid "Base Contact Process"
 #~ msgstr "基本联系人流程"
diff --git a/addons/base_contact/i18n/zh_TW.po b/addons/base_contact/i18n/zh_TW.po
index 432a72a3efc..69186198d9d 100644
--- a/addons/base_contact/i18n/zh_TW.po
+++ b/addons/base_contact/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
diff --git a/addons/base_crypt/__init__.py b/addons/base_crypt/__init__.py
index a8b9a6b0740..921c536b575 100644
--- a/addons/base_crypt/__init__.py
+++ b/addons/base_crypt/__init__.py
@@ -21,3 +21,5 @@
 from service import security
 import crypt
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index 05f8b2762c0..23e29420036 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -24,14 +24,13 @@
     "author" : ['OpenERP SA', "FS3"],
     "maintainer" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "description": """
 Replaces cleartext passwords in the database with a secure hash
 ===============================================================
 For your existing user base, the removal of the cleartext
-passwords occurs the first time a user logs into the database,
-after installing base_crypt.
+passwords occurs immediately when you instal base_crypt.
 
 All passwords will be replaced by a secure, salted, cryptographic
 hash, preventing anyone from reading the original password in
@@ -45,7 +44,7 @@ Security Warning
 ++++++++++++++++
 Installing this module does not mean you can ignore other security measures,
 as the password is still transmitted unencrypted on the network, unless you
-are using a secure protocol such as XML-RPCS.
+are using a secure protocol such as XML-RPCS or HTTPS.
 It also does not protect the rest of the content of the database, which may
 contain critical data. Appropriate security measures need to be implemented
 by the system administrator in all areas, such as: protection of database
@@ -63,3 +62,5 @@ will disable LDAP authentication completely if installed at the same time.
     "installable": True,
     "certificate" : "00721290471310299725",
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 5a55c02269d..c2fd0a25ef8 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -70,6 +70,8 @@ def gen_salt( length=8, symbols=ascii_letters + digits ):
 import hashlib
 
 def encrypt_md5( raw_pw, salt, magic=magic_md5 ):
+    raw_pw = raw_pw.encode('utf-8')
+    salt = salt.encode('utf-8')
     hash = hashlib.md5()
     hash.update( raw_pw + magic + salt )
     st = hashlib.md5()
diff --git a/addons/base_crypt/i18n/ar.po b/addons/base_crypt/i18n/ar.po
new file mode 100644
index 00000000000..6ade5100d28
--- /dev/null
+++ b/addons/base_crypt/i18n/ar.po
@@ -0,0 +1,71 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-05 23:08+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "لا يمكن ان يكون هناك اثنين مستخدمين بنفس اسم الدخول!"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموحة لهذا المستخدم"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "يرجى تحديد كلمة السر!"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "قاعدة - تشفير كلمة المرور"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
diff --git a/addons/base_crypt/i18n/bg.po b/addons/base_crypt/i18n/bg.po
index 415ba96b19a..0d004ee7fbf 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/ca.po b/addons/base_crypt/i18n/ca.po
index 2af90ba160a..decc9805424 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/de.po b/addons/base_crypt/i18n/de.po
index ec21671de52..c2f830019d2 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/el.po b/addons/base_crypt/i18n/el.po
index 6485993c66e..19ad26f974f 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/en_GB.po b/addons/base_crypt/i18n/en_GB.po
new file mode 100644
index 00000000000..889cbb0842f
--- /dev/null
+++ b/addons/base_crypt/i18n/en_GB.po
@@ -0,0 +1,86 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 11:52+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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "You can not have two users with the same login !"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "The chosen company is not in the allowed companies for this user"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Please specify the password !"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Base - Password Encryption"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it is impossible to recover a forgotten user\n"
+"password, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
diff --git a/addons/base_crypt/i18n/es.po b/addons/base_crypt/i18n/es.po
index 48165e51abe..c9d08c6afad 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/es_CL.po b/addons/base_crypt/i18n/es_CL.po
index 2892c5fe0ba..7f33bbe3451 100644
--- a/addons/base_crypt/i18n/es_CL.po
+++ b/addons/base_crypt/i18n/es_CL.po
@@ -8,19 +8,19 @@ 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-06-06 18:09+0000\n"
-"Last-Translator: doingit.cl <Unknown>\n"
+"PO-Revision-Date: 2011-10-03 17:17+0000\n"
+"Last-Translator: David Acevedo Toledo <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: 2011-06-07 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "¡No puede tener dos usuarios con el mismo nombre!"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
@@ -31,18 +31,19 @@ msgstr "res.users"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"La compañía seleccionada no está autorizada como compañía para este usuario"
+"La compañía seleccionada no está dentro de las compañías autorizadas para "
+"este usuario"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
 #, python-format
 msgid "Please specify the password !"
-msgstr ""
+msgstr "¡Por favor, escriba una contraseña!"
 
 #. module: base_crypt
 #: model:ir.module.module,shortdesc:base_crypt.module_meta_information
 msgid "Base - Password Encryption"
-msgstr ""
+msgstr "Base - Encriptación de la Contraseña"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
@@ -70,3 +71,19 @@ msgid ""
 "unless you are using a secure protocol such as XML-RPCS.\n"
 "                    "
 msgstr ""
+"Este módulo sustituye la contraseña escrita en texto plano por una "
+"codificada,\n"
+"previniendo que alguien pueda leer la contraseña original.\n"
+"Para un usuario existente, el sustitución de la contraseña en texto plano se "
+"realiza la primera vez\n"
+"que el usuario se conecte después de instalar base_crypt.\n"
+"Después de instalar este módulo los usuarios no podrán recuperar su "
+"contraseña olvidada,\n"
+"un administrador tendrá que cambiarla por una nueva.\n"
+"\n"
+"Nota: instalar este módulo no significa que pueda ignorar las medidas "
+"básicas de seguridad,\n"
+"como la contraseña que es enviada por el cliente que sigue sin ser "
+"codificada en la red,\n"
+"a menos que utilice un protocolo seguro como XML-RPCS.\n"
+"                    "
diff --git a/addons/base_crypt/i18n/es_MX.po b/addons/base_crypt/i18n/es_MX.po
new file mode 100644
index 00000000000..be7c1499288
--- /dev/null
+++ b/addons/base_crypt/i18n/es_MX.po
@@ -0,0 +1,86 @@
+# Spanish 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-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_crypt
+#: 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 de usuario!"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está autorizada como compañía para este usuario"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "¡Por favor, escriba una contraseña!"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Base - Encriptación de la Contraseña"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"Este módulo sustituye la contraseña en texto plano por un hash codificado,\n"
+"previniendo que alguien pueda leer la contraseña original.\n"
+"Para un usuario existente, el borrado de la contraseña en texto plano se "
+"realiza la primera vez\n"
+"que el usuario se conecte después de instalar base_crypt.\n"
+"Después de instalar este módulo los usuarios no podrán recuperar su "
+"contraseña,\n"
+"un administrador tendrá que introducir una nueva contraseña.\n"
+"\n"
+"Nota: instalar este módulo no significa que pueda ignorar las medidas "
+"básicas de seguridad,\n"
+"porque la contraseña es enviada sin codificar por el cliente,\n"
+"a menos que utilice un protocolo seguro como XML-RPCS.\n"
+"                    "
diff --git a/addons/base_crypt/i18n/es_PY.po b/addons/base_crypt/i18n/es_PY.po
index 4b38660339f..c5660da4cc4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/es_VE.po b/addons/base_crypt/i18n/es_VE.po
new file mode 100644
index 00000000000..be7c1499288
--- /dev/null
+++ b/addons/base_crypt/i18n/es_VE.po
@@ -0,0 +1,86 @@
+# Spanish 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-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_crypt
+#: 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 de usuario!"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está autorizada como compañía para este usuario"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "¡Por favor, escriba una contraseña!"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Base - Encriptación de la Contraseña"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"Este módulo sustituye la contraseña en texto plano por un hash codificado,\n"
+"previniendo que alguien pueda leer la contraseña original.\n"
+"Para un usuario existente, el borrado de la contraseña en texto plano se "
+"realiza la primera vez\n"
+"que el usuario se conecte después de instalar base_crypt.\n"
+"Después de instalar este módulo los usuarios no podrán recuperar su "
+"contraseña,\n"
+"un administrador tendrá que introducir una nueva contraseña.\n"
+"\n"
+"Nota: instalar este módulo no significa que pueda ignorar las medidas "
+"básicas de seguridad,\n"
+"porque la contraseña es enviada sin codificar por el cliente,\n"
+"a menos que utilice un protocolo seguro como XML-RPCS.\n"
+"                    "
diff --git a/addons/base_crypt/i18n/et.po b/addons/base_crypt/i18n/et.po
new file mode 100644
index 00000000000..b74dcce8054
--- /dev/null
+++ b/addons/base_crypt/i18n/et.po
@@ -0,0 +1,71 @@
+# Estonian 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-10-10 19:33+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Viga"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
diff --git a/addons/base_crypt/i18n/fi.po b/addons/base_crypt/i18n/fi.po
index 57b350a204f..a8ddc061dc9 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/fr.po b/addons/base_crypt/i18n/fr.po
index 6972de378f3..3830a006203 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
@@ -39,12 +39,12 @@ msgstr ""
 #: code:addons/base_crypt/crypt.py:132
 #, python-format
 msgid "Please specify the password !"
-msgstr ""
+msgstr "Veuillez entrer un mot de passe"
 
 #. module: base_crypt
 #: model:ir.module.module,shortdesc:base_crypt.module_meta_information
 msgid "Base - Password Encryption"
-msgstr ""
+msgstr "Base - Chiffrage du mot de passe"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
@@ -72,3 +72,19 @@ msgid ""
 "unless you are using a secure protocol such as XML-RPCS.\n"
 "                    "
 msgstr ""
+"Ce module remplace les mots de passe stockés dans la base par des mots de "
+"passe chiffrés,\n"
+"empêchant quiconque d'accéder aux mots de passe.\n"
+"Pour les utilisateurs existants dans la base, le retrait du mot de passe en "
+"clair survient à la première connexion\n"
+"de l'utilisateur suivant l'installation de \"base_crypt\".\n"
+"Ce module rend impossible la recherche d'un mot de passe oublié par un "
+"utilisateur,\n"
+"la seule solution est alors l'attribution d'un nouveau mot de passe par "
+"l'administrateur.\n"
+"\n"
+"Note: installer ce module ne dispense pas de respecter les règles de base de "
+"la sécurité,\n"
+"comme ne pas laisser circuler de mots de passe en clair sur le réseau,\n"
+"sauf à utiliser un protocole sécurisé tel que  XML-RPCS.\n"
+"                    "
diff --git a/addons/base_crypt/i18n/gl.po b/addons/base_crypt/i18n/gl.po
index d12d29618ab..a2bd11bd1f9 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/it.po b/addons/base_crypt/i18n/it.po
index 81dd14cf1f5..67b23fdc869 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/nb.po b/addons/base_crypt/i18n/nb.po
index ce85f3b3625..331b48df254 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/nl.po b/addons/base_crypt/i18n/nl.po
index 0afc3855938..49d3fc808cc 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/oc.po b/addons/base_crypt/i18n/oc.po
new file mode 100644
index 00000000000..ef234e97cb7
--- /dev/null
+++ b/addons/base_crypt/i18n/oc.po
@@ -0,0 +1,73 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-20 09:17+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Podètz pas aver dos utilizaires amb lo meteis identificant !"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La societat causida fa pas partida de las societats autorizadas per aqueste "
+"utilizaire"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Entratz un senhal"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Basa - Chifratge del senhal"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
diff --git a/addons/base_crypt/i18n/pt.po b/addons/base_crypt/i18n/pt.po
index 258d3f44ab0..8b2dc31465a 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: 2011-06-07 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
@@ -30,18 +30,20 @@ msgstr "res.users"
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "A companhia escolhida não está entre permitidas para este utilizador"
+msgstr ""
+"A empresa escolhida não faz parte das possíveis de serem selecionadas para "
+"este utilizador"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
 #, python-format
 msgid "Please specify the password !"
-msgstr "Por favor escolha uma password!"
+msgstr "Por favor escolha uma senha !"
 
 #. module: base_crypt
 #: model:ir.module.module,shortdesc:base_crypt.module_meta_information
 msgid "Base - Password Encryption"
-msgstr ""
+msgstr "Base - Encriptação de senhas"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
diff --git a/addons/base_crypt/i18n/pt_BR.po b/addons/base_crypt/i18n/pt_BR.po
index a601e99f7f8..103e5b7e35d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/ru.po b/addons/base_crypt/i18n/ru.po
index 5126f01e994..cc0e6a16895 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/sk.po b/addons/base_crypt/i18n/sk.po
index 7dffbe7377d..44f6402ec57 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/sl.po b/addons/base_crypt/i18n/sl.po
new file mode 100644
index 00000000000..aa1ae56f1ff
--- /dev/null
+++ b/addons/base_crypt/i18n/sl.po
@@ -0,0 +1,84 @@
+# Slovenian 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-09-14 11:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne morete imeti dva uporabnika z istim prijavnim imenom!"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Izbrano podjetje ni v dovoljenih podjetjih za tega uporabnika"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Prosim, navedite geslo !"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Osnovno - enkripcija gesla"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Napaka"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"Ta modul nadomešča obliko besedilnega geslo v bazi podatkov z hash geslom,\n"
+"ki preprečuje komurkoli branje izvirnega gesla.\n"
+"Za vašo obstoječo bazo uporabnikov, odstranitev gesla v obliki besedila se "
+"pojavi pri\n"
+"prvi prijavi uporabnika v bazo podatkov, po namestitvi base_crypt.\n"
+"Po namestitvi tega modula ne bo mogoče obnoviti pozabiljenega gesla za vaše\n"
+"uporabnike, edina rešitev je, da admin nastavi novo geslo.\n"
+"\n"
+"Opomba: namestitev tega modula ne pomeni ignoriranja osnovnih varnostnih "
+"ukrepov,\n"
+"ker se geslo še vedno prenaša nešifrirano v omrežju (preko klienta),\n"
+"razen če ne uporabljate varni protokol kot je XML-RPCS.\n"
+"                    "
diff --git a/addons/base_crypt/i18n/sq.po b/addons/base_crypt/i18n/sq.po
index a52f3358530..b9215f65a1c 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/sr@latin.po b/addons/base_crypt/i18n/sr@latin.po
new file mode 100644
index 00000000000..fb65eba35c7
--- /dev/null
+++ b/addons/base_crypt/i18n/sr@latin.po
@@ -0,0 +1,85 @@
+# Serbian Latin 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-10-05 13:25+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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne možete imati dva korisnika sa istom prijavom!"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Odabrana firma nije u dozvoljena firmama za ovog korisnika"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Molimo odredite lozinku"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Baza - Šifrovanje lozinke"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Greška"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"Ovaj modul zamenjuje vidljivu lozinku u bazi podataka znacima,\n"
+"što onemogućava bilo koga da pročita originalnu lozinku.\n"
+"Što se tiče Vaše baze podataka, ukidanje vidljive lozinke dešava se prvi put "
+"pošto se korisnik prijavi u bazu podataka, po instalaciji base_crypt.\n"
+"Po instalaciji ovog modula neće biti moguće izmeniti zaboravljenu lozinku za "
+"Vaše korisnike, jedino rešenje će biti da im administrator postavi novu "
+"lozinku.\n"
+"\n"
+"Beleška: Instaliranje ovog modula ne znači da možete ignorisati osnovne "
+"sigurnosne mere,\n"
+"budući da se lozinka i dalje prenosi nešifrovana u mreži (od strane "
+"klijenta),\n"
+"ukoliko ne koristite siguran protokol kao XML-RPCS.\n"
+"                    "
diff --git a/addons/base_crypt/i18n/sv.po b/addons/base_crypt/i18n/sv.po
index 810840d739e..69cea0f79cd 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/tr.po b/addons/base_crypt/i18n/tr.po
index 6a6cc464e6e..20e868d2ba5 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/vi.po b/addons/base_crypt/i18n/vi.po
index ae37ca3f9b1..3e373830305 100644
--- a/addons/base_crypt/i18n/vi.po
+++ b/addons/base_crypt/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-07-20 09:55+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po
index ee8bd3df6f4..0dfd20cfa65 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: 2011-06-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/zh_TW.po b/addons/base_crypt/i18n/zh_TW.po
new file mode 100644
index 00000000000..760f7a02598
--- /dev/null
+++ b/addons/base_crypt/i18n/zh_TW.po
@@ -0,0 +1,71 @@
+# Chinese (Traditional) 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-09-27 13:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "請指定密碼 !"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "基礎 - 密碼加密"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 4cbef04a204..c9bc3866b4f 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Create IBAN bank accounts',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
@@ -31,7 +31,7 @@ The ability to extract the correctly represented local accounts from IBAN accoun
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['account'],
+    'depends': ['base'],
     'init_xml': ['base_iban_data.xml'],
     'update_xml': ['base_iban_view.xml'],
     'installable': True,
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index 9f37558d759..6ddf2e82541 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -128,6 +128,12 @@ class res_partner_bank(osv.osv):
             return _('The IBAN does not seem to be correct. You should have entered something like this %s'), (iban_example)
         return _('The IBAN is invalid, it should begin with the country code'), ()
 
+    def _check_bank(self, cr, uid, ids, context=None):
+        for partner_bank in self.browse(cr, uid, ids, context=context):
+            if partner_bank.state == 'iban' and not partner_bank.bank.bic:
+                return False
+        return True
+
     def get_bban_from_iban(self, cr, uid, ids, context=None):
         '''
         This function returns the bank account number computed from the iban account number, thanks to the mapping_list dictionary that contains the rules associated to its country.
@@ -157,7 +163,10 @@ class res_partner_bank(osv.osv):
         # to not break community modules.
         'iban': fields.related('acc_number', string='IBAN', size=34, readonly=True, help="International Bank Account Number", type="char"),
     }
-    _constraints = [(check_iban, _construct_constraint_msg, ["acc_number"])]
+    _constraints = [
+        (check_iban, _construct_constraint_msg, ["iban"]),
+        (_check_bank, '\nPlease define BIC/Swift code on bank for bank type IBAN Account to make valid payments', ['bic'])
+    ]
 
 res_partner_bank()
 
diff --git a/addons/base_iban/i18n/ar.po b/addons/base_iban/i18n/ar.po
index 3694caebd64..84204c185a2 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/bg.po b/addons/base_iban/i18n/bg.po
index 4ffc0fe9d19..7196167bd24 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/bs.po b/addons/base_iban/i18n/bs.po
index 114d52056c6..2abbb729990 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/ca.po b/addons/base_iban/i18n/ca.po
index 09b3437f7a3..fdd00ceb877 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/cs.po b/addons/base_iban/i18n/cs.po
index fff326a27b3..9a7de8219fe 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/da.po b/addons/base_iban/i18n/da.po
new file mode 100644
index 00000000000..bd41136c434
--- /dev/null
+++ b/addons/base_iban/i18n/da.po
@@ -0,0 +1,92 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-09-23 16:04+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: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr ""
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:120
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr ""
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr ""
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkonti"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr ""
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:121
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr ""
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr ""
+
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr ""
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index 21b437167fb..f2c574cfc48 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -101,32 +101,3 @@ msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-#~ "haben !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module installs the base for IBAN (International Bank Account Number) "
-#~ "bank accounts and checks for its validity\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Dieses Modul bietet die Grundlage für die Verwaltung von IBAN (International "
-#~ "Bank Account Number) Bankkonten inklusive Überprüfung auf Richtigkeit der "
-#~ "Daten.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index de0a29b133c..1fb85b75186 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -93,16 +93,3 @@ msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Μη έγκυρη XML Προβολή Αρχιτεκτονικής!"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module installs the base for IBAN (International Bank Account Number) "
-#~ "bank accounts and checks for its validity\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Αυτό το άρθρωμα κάνει εγκατάσταση την βάση για το IBAN (International Bank "
-#~ "Account Number) λογαριασμού τράπεζας και ελέγχει για την ορθότητά του\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/base_iban/i18n/en_GB.po b/addons/base_iban/i18n/en_GB.po
new file mode 100644
index 00000000000..fba7e7174cc
--- /dev/null
+++ b/addons/base_iban/i18n/en_GB.po
@@ -0,0 +1,102 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 17:41+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: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr "Create IBAN bank accounts"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:120
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+"The IBAN appears to be incorrect. You should have entered something like "
+"this %s"
+
+#. 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 "International Bank Account Number"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bank Accounts"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr "bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr "iban"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:121
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr "The IBAN is invalid, It should begin with the country code"
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "IBAN Account"
+
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"\n"
+"    "
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr "acc_number"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index 152e8ed6048..3925a17e1e7 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -100,34 +100,3 @@ msgstr "Número cuenta"
 
 #~ 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 "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The BVR adherent number must be unique !"
-#~ msgstr "¡El número de adherente BVR debe ser único!"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module installs the base for IBAN (International Bank Account Number) "
-#~ "bank accounts and checks for its validity\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo instala la base para cuentas bancarias IBAN (International Bank "
-#~ "Account Number) y comprueba su validez.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/base_iban/i18n/es_AR.po b/addons/base_iban/i18n/es_AR.po
index ad05cbffb3a..a84bb2f5ead 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/es_EC.po b/addons/base_iban/i18n/es_EC.po
index f0ef6bccef1..3850d755469 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/es_MX.po b/addons/base_iban/i18n/es_MX.po
new file mode 100644
index 00000000000..bc5a79c61d1
--- /dev/null
+++ b/addons/base_iban/i18n/es_MX.po
@@ -0,0 +1,102 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_iban
+#
+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-01-11 17:50+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: 2011-09-05 04:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr "Crear cuentas banco IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:120
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+"El IBAN no parece que sea correcto. Debería haber introducido algo como esto "
+"%s"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "Código postal"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Núm. cuenta bancaria internacional IBAN"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "País"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr "BIC"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr "IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:121
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr "El IBAN no es válido, debería empezar con el código del país"
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "Cuenta IBAN"
+
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo instala la base para las cuentas bancarias IBAN (International "
+"Bank Account Number; o Número de Cuenta Bancaria Internacional) y comprueba "
+"su validez.\n"
+"\n"
+"    "
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr "Número cuenta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/base_iban/i18n/es_PY.po b/addons/base_iban/i18n/es_PY.po
index 73cfe7a641c..a738559b063 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/es_VE.po b/addons/base_iban/i18n/es_VE.po
new file mode 100644
index 00000000000..bc5a79c61d1
--- /dev/null
+++ b/addons/base_iban/i18n/es_VE.po
@@ -0,0 +1,102 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_iban
+#
+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-01-11 17:50+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: 2011-09-05 04:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr "Crear cuentas banco IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:120
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+"El IBAN no parece que sea correcto. Debería haber introducido algo como esto "
+"%s"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "Código postal"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Núm. cuenta bancaria internacional IBAN"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "País"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr "BIC"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr "IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:121
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr "El IBAN no es válido, debería empezar con el código del país"
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "Cuenta IBAN"
+
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo instala la base para las cuentas bancarias IBAN (International "
+"Bank Account Number; o Número de Cuenta Bancaria Internacional) y comprueba "
+"su validez.\n"
+"\n"
+"    "
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr "Número cuenta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index 129d0e1a3ea..53a6a62ecda 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -93,7 +93,3 @@ msgstr "acc_number"
 
 #~ 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_ ja ei tohi sisaldada erimärke!"
diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po
index 476c5fd563f..04670267c90 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/fi.po b/addons/base_iban/i18n/fi.po
index c10178c118b..b1e4e1af8af 100644
--- a/addons/base_iban/i18n/fi.po
+++ b/addons/base_iban/i18n/fi.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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "Luo IBAN-pankkitilit"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:120
@@ -28,7 +28,7 @@ msgstr ""
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr ""
+msgstr "IBAN-tilinumero on virheellinen. Esimerkki oikeasta: %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -38,7 +38,7 @@ msgstr "postinumero"
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr "Kansainvälinen tilinumero"
+msgstr "Kansainvälinen pankkitilinumero"
 
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
@@ -48,23 +48,24 @@ msgstr "Pankkitilit"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr "country_id"
+msgstr "Maakoodi"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bic"
-msgstr "bic"
+msgstr "BIC"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
-msgstr "iban"
+msgstr "IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
 msgstr ""
+"IBAN-pankkitili on virheellinen, alusta puuttuu kaksikirjaiminen maakoodi"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -74,7 +75,7 @@ msgstr "IBAN"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "IBAN -tili"
+msgstr "IBAN-pankkitili"
 
 #. module: base_iban
 #: model:ir.module.module,description:base_iban.module_meta_information
@@ -85,6 +86,11 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Tämä moduli asentaa kansainvälisten IBAN-pankkitilien perustan ja tarkistaa "
+"sen oikeellisuuden.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 0b297fdf698..aa2d1673c23 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -100,6 +100,3 @@ msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "The BVR adherent number must be unique !"
-#~ msgstr "Le numéro d'adhérent BVR doit être unique !"
diff --git a/addons/base_iban/i18n/gl.po b/addons/base_iban/i18n/gl.po
index d54596a886b..1bfe6f3c9e4 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index 5347b2490a4..7cfe604a6a5 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/hu.po b/addons/base_iban/i18n/hu.po
index 7039792d06a..07a2914ae7c 100644
--- a/addons/base_iban/i18n/hu.po
+++ b/addons/base_iban/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-20 13:10+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/id.po b/addons/base_iban/i18n/id.po
index 5df37f9600f..fd6199ea61e 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index fb1a7825d2d..81f7aef88e2 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -97,31 +97,3 @@ msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non contenere caratteri speciali!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module installs the base for IBAN (International Bank Account Number) "
-#~ "bank accounts and checks for its validity\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Questo moduli installa la gestione base per l'IBAN (International Bank "
-#~ "Account Number) il valore del conto è controllato per verificarne la sua "
-#~ "validità\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/base_iban/i18n/ko.po b/addons/base_iban/i18n/ko.po
index 152004c1a32..b7575d4b40f 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/lt.po b/addons/base_iban/i18n/lt.po
index 0c388eb318b..c61e9ef0490 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index 1f465cd0d7c..a0ccfb652ad 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -28,7 +28,7 @@ msgstr "Izveidot IBAN banku kontus"
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr "IBAN nešķiet pareizs. Jūs ievadījāt kaut ko līdzīgu šim '%s'"
+msgstr "IBAN nešķiet pareizs. Jums bija jāievada kaut ko līdzīgu šim %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -64,7 +64,7 @@ msgstr "iban"
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr "IBAN nepareizs, tam jāsākās ar valsts kodu"
+msgstr "IBAN ir nepareizs, tam jāsākās ar valsts kodu"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -85,6 +85,11 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Šis modulis aktivizē IBAN (International Bank Account Number) bankas kontu "
+"lietošanas iespēju un pārbauda to derīgumu.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
diff --git a/addons/base_iban/i18n/mn.po b/addons/base_iban/i18n/mn.po
index dba933167c8..9c81bc8a637 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -90,6 +90,3 @@ msgstr ""
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
 msgstr "acc_number"
-
-#~ msgid "The BVR adherent number must be unique !"
-#~ msgstr "BVR дугаар дахин давтагдахгүй байх ёстой !"
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index 2883ce18cc1..43ee77a2d71 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -98,17 +98,3 @@ msgstr "rekeningnummer"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor weergave!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/base_iban/i18n/nl_BE.po b/addons/base_iban/i18n/nl_BE.po
index 40e30168e9c..19f3322e398 100644
--- a/addons/base_iban/i18n/nl_BE.po
+++ b/addons/base_iban/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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/oc.po b/addons/base_iban/i18n/oc.po
index 7d539b3504d..657f0ae97ac 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/pl.po b/addons/base_iban/i18n/pl.po
index f1f65cd8082..f3c73b315cf 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index 7785ae3901a..6c71e708f16 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -93,21 +93,3 @@ msgstr "Número_acc"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "The BVR adherent number must be unique !"
-#~ msgstr "O número de aderente ao BVR deve ser único!"
diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index 502ae5cfa95..248fcf8f756 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -98,31 +98,3 @@ msgstr "numero_conta"
 
 #~ 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 pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module installs the base for IBAN (International Bank Account Number) "
-#~ "bank accounts and checks for its validity\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo instala a base para contas IBAN (International Bank Account "
-#~ "Number) contas bancárias e verifica sua validade\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index 31b3e29ae38..9c94bd364a5 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -99,18 +99,3 @@ msgstr "Număr cont"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index c92a987c853..edcad2652de 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/sk.po b/addons/base_iban/i18n/sk.po
index ab5c4883343..f6edcfc4cdf 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -93,17 +93,3 @@ msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatné XML pre zobrazenie architektúry!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Názov modulu musí byť jedinečný!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certifikát modulu musí byť jedinečný!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Veľkosť poľa nemôže byť nikdy menšia ako 1 !"
-
-#~ 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!"
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index ff00b75038a..1bbc36ec223 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -97,16 +97,3 @@ msgstr "številka računa"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid ""
-#~ "\n"
-#~ "This module installs the base for IBAN (International Bank Account Number) "
-#~ "bank accounts and checks for its validity\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Ta modul namesti osnovo za delo z bančnimi računi oblike IBAN (International "
-#~ "Bank Account Number) in preverja njihovo pravilnost\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/base_iban/i18n/sq.po b/addons/base_iban/i18n/sq.po
index 4e87e5eb747..ee6256d5b9f 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 59f490573ca..7f213064cf2 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
@@ -93,8 +93,3 @@ msgstr "Broj konta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po
index 17692a807e5..07fff2e6465 100644
--- a/addons/base_iban/i18n/sr@latin.po
+++ b/addons/base_iban/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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-12-23 15:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-05 13:32+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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr "Kreiraj IBAN nalog banke"
+msgstr "Napravi IBAN nalog banke"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:120
@@ -28,7 +28,7 @@ msgstr "Kreiraj IBAN nalog banke"
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr "IBAN izgleda da nije ispravan. TRebas uneti nesto nalik na %s"
+msgstr "IBAN izgleda da nije ispravan. Trebalo je uneti nešto kao %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -43,7 +43,7 @@ msgstr "Međunarodni broj Bankovnog računa"
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "Bankovni Računi"
+msgstr "Bankovni računi"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -64,7 +64,7 @@ msgstr "iban"
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr "IBAN je neispravan, trebalo bi da pocinje sa kodom zemlje"
+msgstr "IBAN je neispravan, trebalo bi da počinje sa kodom zemlje"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -74,7 +74,7 @@ msgstr "IBAN"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "IBAN konto"
+msgstr "IBAN račun"
 
 #. module: base_iban
 #: model:ir.module.module,description:base_iban.module_meta_information
@@ -85,16 +85,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul instalira bazu za IBAN (Međunarodni broj bankovnog računa) "
+"bankovne račune i proverava im validnost.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr "Broj konta"
+msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index 90eef5b1235..a0dead95f1d 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/ta.po b/addons/base_iban/i18n/ta.po
index 858db0ff382..e6047c87950 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/tlh.po b/addons/base_iban/i18n/tlh.po
index b2f8757ed56..1d192ac346d 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 2f5d5f35f95..4da5bdbf8ab 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: 2011-05-11 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/uk.po b/addons/base_iban/i18n/uk.po
index 2ea0c5e0524..846da7752dc 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/vi.po b/addons/base_iban/i18n/vi.po
index a3e83ca8be6..8657e7997f2 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index c69f7418fc5..435ef14ddfd 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -8,18 +8,18 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-08-03 03:38+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "创建 IBAN 银行账户"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:120
@@ -27,7 +27,7 @@ msgstr ""
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr ""
+msgstr "这个IBAN似乎是错误的。你应该输入类似这样的%s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -37,12 +37,12 @@ msgstr "邮政编码"
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr "银行帐号"
+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
@@ -52,28 +52,28 @@ msgstr "country_id"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bic"
-msgstr "银行识别码(BIC)"
+msgstr "bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
-msgstr "国际银行帐号(IBAN)"
+msgstr "国际银行账号(IBAN)"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr ""
+msgstr "这个IBAN是无效的，应该以国家代码作为开头"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr "国际银行帐号(IBAN)"
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "IBAN帐号"
+msgstr "IBAN账号"
 
 #. module: base_iban
 #: model:ir.module.module,description:base_iban.module_meta_information
@@ -84,22 +84,15 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"这个是安装是IBAN（国际银行账户号码）并检查其有效性的基础模块\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
 msgstr "acc_number"
 
-#~ msgid ""
-#~ "\n"
-#~ "This module install the base for IBAN bank accounts. \n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "这模块安装银行账号的IBAN . \n"
-#~ "\n"
-#~ "    "
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件"
diff --git a/addons/base_iban/i18n/zh_TW.po b/addons/base_iban/i18n/zh_TW.po
index 2db67395ea8..86a8197141f 100644
--- a/addons/base_iban/i18n/zh_TW.po
+++ b/addons/base_iban/i18n/zh_TW.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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "建立 IBAN 銀行帳號"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:120
@@ -27,7 +27,7 @@ msgstr ""
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr ""
+msgstr "IBAN 看來不對。您輸入的應類似 %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -37,12 +37,12 @@ msgstr ""
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr ""
+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
@@ -63,7 +63,7 @@ msgstr ""
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr ""
+msgstr "IBAN 無效，其應以地區碼開首"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr ""
+msgstr "IBAN 帳號"
 
 #. module: base_iban
 #: model:ir.module.module,description:base_iban.module_meta_information
diff --git a/addons/base_module_doc_rst/__init__.py b/addons/base_module_doc_rst/__init__.py
index f306de84dba..87582ff4c7c 100644
--- a/addons/base_module_doc_rst/__init__.py
+++ b/addons/base_module_doc_rst/__init__.py
@@ -21,3 +21,5 @@
 import base_module_doc_rst
 import wizard
 import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index c2c5ca30a91..22a3b39028b 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Module Technical Guide in Restructured Text ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module generates the Technical Guides of selected modules in Restructured Text format (RST).
 =================================================================================================
@@ -42,3 +42,5 @@ This module generates the Technical Guides of selected modules in Restructured T
     'images': ['images/base_module_doc_rst1.jpeg'],
 }
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/i18n/es_MX.po b/addons/base_module_doc_rst/i18n/es_MX.po
new file mode 100644
index 00000000000..90e3c2c0710
--- /dev/null
+++ b/addons/base_module_doc_rst/i18n/es_MX.po
@@ -0,0 +1,116 @@
+# 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_VE.po b/addons/base_module_doc_rst/i18n/es_VE.po
new file mode 100644
index 00000000000..90e3c2c0710
--- /dev/null
+++ b/addons/base_module_doc_rst/i18n/es_VE.po
@@ -0,0 +1,116 @@
+# 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/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
index d14d709f501..b17d4bb517f 100644
--- a/addons/base_module_doc_rst/report/report_proximity_graph.py
+++ b/addons/base_module_doc_rst/report/report_proximity_graph.py
@@ -78,4 +78,5 @@ class report_graph(report.interface.report_int):
         pdf_string = self.get_proximity_graph(cr, uid, data['id'])
         return (pdf_string, 'pdf')
 
-report_graph('report.proximity.graph', 'ir.module.module')
\ No newline at end of file
+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/__init__.py b/addons/base_module_doc_rst/wizard/__init__.py
index 6f6e62e8767..c6614aacbc1 100644
--- a/addons/base_module_doc_rst/wizard/__init__.py
+++ b/addons/base_module_doc_rst/wizard/__init__.py
@@ -22,3 +22,5 @@
 import wizard_tech_guide_rst
 import generate_relation_graph
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
index b7a5d6da397..bb02d7c33d2 100644
--- a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
+++ b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
@@ -507,3 +507,5 @@ class wizard_tech_guide_rst(wizard.interface):
 
 wizard_tech_guide_rst('tech.guide.rst')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index ec9ec1191d2..02d09e0919d 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base module quality - To check the quality of other modules' ,
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 The aim of this module is to check the quality of other modules.
 ================================================================
@@ -42,7 +42,7 @@ using it, otherwise it may crash.
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['base_module_quality_wizard.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'],
+    'update_xml': ['wizard/module_quality_check_view.xml', 'wizard/quality_save_report_view.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
index d7ac2f77700..bbe20bc0b4f 100644
--- a/addons/base_module_quality/base_module_quality.py
+++ b/addons/base_module_quality/base_module_quality.py
@@ -296,7 +296,7 @@ class module_quality_detail(osv.osv):
         'summary': fields.text('Summary'),
         'detail': fields.text('Details'),
         'message': fields.char('Message', size=64),
-        'state': fields.selection([('done','Done'),('skipped','Skipped'),], 'State', size=6, help='The test will be completed only if the module is installed or if the test may be processed on uninstalled module.'),
+        'state': fields.selection([('done','Done'),('skipped','Skipped'),], 'State', size=24, help='The test will be completed only if the module is installed or if the test may be processed on uninstalled module.'),
     }
 
 module_quality_detail()
diff --git a/addons/base_module_quality/base_module_quality_view.xml b/addons/base_module_quality/base_module_quality_view.xml
index 6b56eb41a5d..21e84c27c43 100644
--- a/addons/base_module_quality/base_module_quality_view.xml
+++ b/addons/base_module_quality/base_module_quality_view.xml
@@ -44,7 +44,7 @@
                             <field name="state" readonly="1"/>
                         </page>
                         <page string="Detail">
-	                        <button name="%(quality_detail_save)d" string="Save Report" type="action"/>
+	                        <button name="%(action_view_quality_save_report)d" string="Save Report" type="action"/>
                             <field name="detail" widget="text_html" nolabel="1" colspan="4" readonly="1"/>
                         </page>
                     </notebook>
diff --git a/addons/base_module_quality/base_module_quality_wizard.xml b/addons/base_module_quality/base_module_quality_wizard.xml
deleted file mode 100644
index fe5c7ef5aa0..00000000000
--- a/addons/base_module_quality/base_module_quality_wizard.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-		<wizard id="quality_detail_save" model="ir.module.module" name="quality_detail_save" string="Report Save" menu="False"/>
-
-      	<wizard string="Quality Check"
-            model="ir.module.module"
-            name="create_quality_check_wiz"
-            id="create_quality_check_id"
-            menu="True"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/base_module_quality/i18n/ab.po b/addons/base_module_quality/i18n/ab.po
index dc9a14cca02..9b491c9ec0c 100644
--- a/addons/base_module_quality/i18n/ab.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/ar.po b/addons/base_module_quality/i18n/ar.po
index 291e6657d42..24b1c4fd972 100644
--- a/addons/base_module_quality/i18n/ar.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/bg.po b/addons/base_module_quality/i18n/bg.po
index e4352bcc83c..9d069ffc23d 100644
--- a/addons/base_module_quality/i18n/bg.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/bs.po b/addons/base_module_quality/i18n/bs.po
index b7714bb6c4f..f7dae77978f 100644
--- a/addons/base_module_quality/i18n/bs.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/ca.po b/addons/base_module_quality/i18n/ca.po
index e60990e576b..ed8dad45b88 100644
--- a/addons/base_module_quality/i18n/ca.po
+++ b/addons/base_module_quality/i18n/ca.po
@@ -8,15 +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:14+0000\n"
-"PO-Revision-Date: 2010-09-29 09:27+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 21:31+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -24,24 +23,24 @@ msgstr ""
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Suggestion"
-msgstr ""
+msgstr "Suggeriment"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Programming Error"
-msgstr ""
+msgstr "Error de programació"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:31
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "Test del mètode"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality - To check the quality of other modules"
-msgstr ""
+msgstr "Mòdul base de qualitat - Per comprovar la qualitat d'altres mòduls"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:34
@@ -50,35 +49,38 @@ msgid ""
 "\n"
 "Test checks for fields, views, security rules, dependancy level\n"
 msgstr ""
+"\n"
+"Test per comprovar els camps, vistes, regles de seguretat i nivells de "
+"dependència\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:127
 #, python-format
 msgid "O(n) or worst"
-msgstr ""
+msgstr "O(n) o pitjor"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Omès"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:46
 #, python-format
 msgid "Module has no objects"
-msgstr ""
+msgstr "El mòdul no té objectes"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:49
 #, python-format
 msgid "Speed Test"
-msgstr ""
+msgstr "Test de velocitat"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:54
 #, python-format
 msgid "The module does not contain the __openerp__.py file"
-msgstr ""
+msgstr "El mòdul no conté l'arxiu __openerp__.py"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:82
@@ -91,7 +93,7 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Object Name"
-msgstr ""
+msgstr "Nom de l'objecte"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:54
@@ -99,7 +101,7 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:68
 #, python-format
 msgid "Ok"
-msgstr ""
+msgstr "D'acord"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:34
@@ -108,18 +110,20 @@ msgid ""
 "This test checks if the module satisfies the current coding standard used by "
 "OpenERP."
 msgstr ""
+"Aquest test comprova si el mòdul satisfà els estàndards de codi actuals "
+"d'OpenERP."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "No report to save!"
-msgstr ""
+msgstr "No hi ha informe a desar!"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of dependancy in %"
-msgstr ""
+msgstr "Resultat de la dependència en %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -127,88 +131,90 @@ msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
 msgstr ""
+"El test només es podrà completar si el mòdul està instal·lat o si es pot "
+"provar amb el mòdul desinstal·lat."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:99
 #, python-format
 msgid "Result (/10)"
-msgstr ""
+msgstr "Resultat (/10)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:33
 #, python-format
 msgid "Terp Test"
-msgstr ""
+msgstr "Test terp"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:33
 #, python-format
 msgid "Object Test"
-msgstr ""
+msgstr "Test objete"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Desa l'informe"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/module_quality_check.py:46
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 #, python-format
 msgid "Quality Check"
-msgstr ""
+msgstr "Comprovar la qualitat"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:128
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "No és eficient"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Avís"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:35
 #, python-format
 msgid "Unit Test"
-msgstr ""
+msgstr "Test unitari"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "Reading Complexity"
-msgstr ""
+msgstr "Complexitat de lectura"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:267
 #, python-format
 msgid "Result of pep8_test in %"
-msgstr ""
+msgstr "Resultat del pep8_test en %"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:50
 #, python-format
 msgid "Module does not have 'unit_test/test.py' file"
-msgstr ""
+msgstr "El mòdul no té un fitxer 'unit_test/test.py'"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "Ponderació"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of Security in %"
-msgstr ""
+msgstr "Resultat de seguretat en %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -216,40 +222,42 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
+"Algunes proves són més crítiques que unes altres, per la qual cosa tenen un "
+"major pes en el càlcul de la valoració final."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:120
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "No hi ha dades suficients"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:132
 #, python-format
 msgid "Result (/1)"
-msgstr ""
+msgstr "Resultat (/1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N (Number of Records)"
-msgstr ""
+msgstr "N (Número de registres)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:133
 #, python-format
 msgid "No data"
-msgstr ""
+msgstr "No hi ha dades"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr ""
+msgstr "mòdul.qualitat.detall"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Desa informe"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:34
@@ -258,24 +266,27 @@ msgid ""
 "This test checks where object has workflow or not on it if there is a state "
 "field and several buttons on it and also checks validity of workflow xml file"
 msgstr ""
+"Aquest test comprova si l'objecte té un flux de treball, si hi ha un camp "
+"d'estat i diversos botons i també comprova la validesa del fitxer xml del "
+"flux de treball"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:151
 #, python-format
 msgid "Result in %"
-msgstr ""
+msgstr "Resultat en %"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Entrades estàndard"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:58
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:88
 #, python-format
 msgid "No python file found"
-msgstr ""
+msgstr "No s'ha trobat un fitxer Python"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:144
@@ -288,7 +299,7 @@ msgstr "Resultat"
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -298,7 +309,7 @@ msgstr "Detall"
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:85
@@ -309,24 +320,28 @@ msgid ""
 "wished.\n"
 "</html>"
 msgstr ""
+"<html>O(1) significa que el número de peticions SQL per llegir l'objecte no "
+"depèn del número d'objectes que esteu llegint. Aquesta característica seria "
+"la més desitjable.\n"
+"<html>"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:120
 #, python-format
 msgid "__openerp__.py file"
-msgstr ""
+msgstr "fitxer __openerp__.py"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:70
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "Estat"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "Tests"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:50
@@ -337,12 +352,16 @@ msgid ""
 "needed in order to run it.\n"
 "\n"
 msgstr ""
+"\n"
+"Aquest test comprova la velocitat del mòdul. Observeu que es necessiten "
+"almenys 5 dades de demostració per poder executar-l'ho.\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:71
 #, python-format
 msgid "Unable to parse the result. Check the details."
-msgstr ""
+msgstr "No es pot analitzar el resultat. Reviseu els detalls."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:33
@@ -351,37 +370,39 @@ msgid ""
 "\n"
 "This test checks if the module satisfy tiny structure\n"
 msgstr ""
+"\n"
+"Aquest test comprova si el mòdul satisfà l'estructura de tiny.\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:151
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "Nom del mòdul"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:56
 #, python-format
 msgid "Error! Module is not properly loaded/installed"
-msgstr ""
+msgstr "Error! El mòdul no està carregat/instal·lat correctament"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:116
 #, python-format
 msgid "Error in Read method: %s"
-msgstr ""
+msgstr "Error en el mètode de lectura:% s"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:138
 #, python-format
 msgid "Score is below than minimal score(%s%%)"
-msgstr ""
+msgstr "La puntuació està per sota de la mínima(%s%%)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N/2"
-msgstr ""
+msgstr "N/2"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:57
@@ -389,30 +410,30 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:71
 #, python-format
 msgid "Exception"
-msgstr ""
+msgstr "Excepció"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Test Is Not Implemented"
-msgstr ""
+msgstr "El test no està implementat"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "Desa informe"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "Feedback about structure of module"
-msgstr ""
+msgstr "Informació sobre l'estructura del mòdul"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:73
@@ -421,6 +442,8 @@ msgid ""
 "Given module has no objects.Speed test can work only when new objects are "
 "created in the module along with demo data"
 msgstr ""
+"El mòdul no té objectes. El test de velocitat només pot executar-se quan es "
+"creen nous objectes en el mòdul juntament amb dades de demostració"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:32
@@ -430,28 +453,32 @@ msgid ""
 "of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
 " "
 msgstr ""
+"Aquest test utilitza Pylint i comprova si el mòdul satisfà els estàndards de "
+"codi Python. Consulteu http://www.logilab.org/project/name/pylint per a més "
+"informació.\n"
+" "
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Feed back About Workflow of Module"
-msgstr ""
+msgstr "Informació sobre el flux de treball del mòdul"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:129
 #, python-format
 msgid "No Workflow define"
-msgstr ""
+msgstr "No s'ha definit flux de treball"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:32
@@ -460,11 +487,14 @@ msgid ""
 "\n"
 "PEP-8 Test , copyright of py files check, method can not call from loops\n"
 msgstr ""
+"\n"
+"Test PEP-8, comprovació del copyright dels fitxers .py i que els mètodes no "
+"siguin cridats des de bucles\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "Puntuació final (%)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:61
@@ -472,23 +502,25 @@ msgstr ""
 msgid ""
 "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
 msgstr ""
+"Error. Està pylint correctament instal·lat? "
+"(http://pypi.python.org/pypi/pylint)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:125
 #, python-format
 msgid "Efficient"
-msgstr ""
+msgstr "Eficient"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
 msgid "Rated Module"
-msgstr ""
+msgstr "Mòdul avaluat"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:33
 #, python-format
 msgid "Workflow Test"
-msgstr ""
+msgstr "Test del flux de treball"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:36
@@ -499,6 +531,10 @@ msgid ""
 "'unit_test/test.py' is needed in module.\n"
 "\n"
 msgstr ""
+"\n"
+"Aquest test comprova els casos del test unitari (PyUnit) del mòdul. Observeu "
+"que és necessari definir 'unit_test/test.py' en el mòdul.\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:32
@@ -508,58 +544,61 @@ msgid ""
 "This test checks if the module classes are raising exception when calling "
 "basic methods or not.\n"
 msgstr ""
+"\n"
+"Aquest test comprova si les classes del mòdul estan llançant una excepció o "
+"no, quan es crida als mètodes bàsics.\n"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:119
 #, python-format
 msgid "Warning! Not enough demo data"
-msgstr ""
+msgstr "Avís! No hi ha suficients dades de demostració."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:31
 #, python-format
 msgid "Pylint Test"
-msgstr ""
+msgstr "Test Pylint"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:31
 #, python-format
 msgid "PEP-8 Test"
-msgstr ""
+msgstr "Test PEP-8"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
 #, python-format
 msgid "Field name"
-msgstr ""
+msgstr "Nom del camp"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:132
 #, python-format
 msgid "Warning! Object has no demo data"
-msgstr ""
+msgstr "Avís! L'objecte no té dades de demostració"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:140
 #, python-format
 msgid "Tag Name"
-msgstr ""
+msgstr "Nom de l'etiqueta"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nom del fitxer"
 
 #. module: base_module_quality
 #: model:ir.module.module,description:base_module_quality.module_meta_information
@@ -580,51 +619,68 @@ msgid ""
 "using it, otherwise it may crash.\n"
 "    "
 msgstr ""
+"\n"
+"El propòsit d'aquest mòdul és el de comprovar la qualitat d'altres mòduls.\n"
+"\n"
+"Proporciona un assistent en la llista de mòduls d'OpenERP, el qual li "
+"permetrà\n"
+"avaluar-los baix diferents criteris com: la conformitat als estàndards\n"
+"de codi d'OpenERP, l'eficiència en velocitat, ...\n"
+"\n"
+"El mòdul també proporciona una plataforma genèrica per definir els seus "
+"propis tests de qualitat.\n"
+"Per a més informació, els programadors poden mirar "
+"base_modul_qualityREADME.txt\n"
+"\n"
+"AVÍS: Aquest mòdul no pot treballar com a fitxer ZIP, heu de descomprimir-"
+"l'ho abans\n"
+"d'utilitzar-l'ho, en cas contrari pot fallar.\n"
+"    "
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
 msgid "module.quality.check"
-msgstr ""
+msgstr "mòdul.qualitat.comprovació"
 
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Result of views in %"
-msgstr ""
+msgstr "Resultat de les vistes en %"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "Puntuació (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Desa l'informe com a fitxer en format .html"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:269
 #, python-format
 msgid "The module has to be installed before running this test."
-msgstr ""
+msgstr "El mòdul ha d'estar instal·lat abans d'executar aquest test."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:123
 #, python-format
 msgid "O(1)"
-msgstr ""
+msgstr "O(1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of fields in %"
-msgstr ""
+msgstr "Resultat dels camps en %"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:70
@@ -639,19 +695,19 @@ msgstr "Resum"
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "Nom del fitxer"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Line number"
-msgstr ""
+msgstr "Número de línia"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:32
 #, python-format
 msgid "Structure Test"
-msgstr ""
+msgstr "Test d'estructura"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
@@ -662,13 +718,7 @@ msgstr "Qualitat"
 #: code:addons/base_module_quality/terp_test/terp_test.py:140
 #, python-format
 msgid "Feed back About terp file of Module"
-msgstr ""
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "assistent.qualitat.comprovar"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Detall exhaustiu"
+msgstr "Informació sobre el fitxer terp del mòdul"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -676,14 +726,9 @@ msgstr ""
 #~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 #~ "especial!"
 
-#~ msgid "General Info"
-#~ msgstr "Informació general"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "qualitat.comprovar.detall"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Detall exhaustiu"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invàlid per a la definició de la vista!"
+
+#, python-format
+#~ msgid "Error in Read method"
+#~ msgstr "Error en el mètode de lectura"
diff --git a/addons/base_module_quality/i18n/cs.po b/addons/base_module_quality/i18n/cs.po
index b2899b48246..bf53227102e 100644
--- a/addons/base_module_quality/i18n/cs.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/de.po b/addons/base_module_quality/i18n/de.po
index 29c69438ac3..3e5c4a741bb 100644
--- a/addons/base_module_quality/i18n/de.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -162,7 +162,7 @@ msgstr "Bericht speichern"
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 #, python-format
 msgid "Quality Check"
-msgstr "Qulaitätsprüfung"
+msgstr "Qualitätsprüfung"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:128
@@ -717,27 +717,12 @@ msgstr "Qualität"
 msgid "Feed back About terp file of Module"
 msgstr "Feedback über terp Datei des Moduls"
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Wortreiches Detail"
-
 #~ 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 "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
-#~ msgid "General Info"
-#~ msgstr "Allgemeine Informationen"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "wortreiches Detail"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
@@ -788,20 +773,6 @@ msgstr "Feedback über terp Datei des Moduls"
 #~ "\"\""
 #~ msgstr "Dieser test prüft Felder, Views, Rules sowie Moduleabhängigkeiten"
 
-#, python-format
-#~ msgid ""
-#~ "\"\"\n"
-#~ "This test checks the Unit Test(PyUnit) Cases of the module. Note that "
-#~ "'unit_test/test.py' is needed in module.\n"
-#~ "\n"
-#~ "\"\""
-#~ msgstr ""
-#~ "\"\"\n"
-#~ "Dieser Test prüft die Funktionen und Prozeduren (PyUnit) des Moduls . "
-#~ "Bedenken Sie dass 'unit_test/test.py' in diesem Modul gebraucht wird.\n"
-#~ "\n"
-#~ "\"\""
-
 #, python-format
 #~ msgid ""
 #~ "\"\"\n"
@@ -828,9 +799,3 @@ msgstr "Feedback über terp Datei des Moduls"
 #~ "Vergleichen Sie http://www.logilab.org/project/name/pylint für weitere "
 #~ "Details.\n"
 #~ " \"\""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/base_module_quality/i18n/el.po b/addons/base_module_quality/i18n/el.po
index 692f6e3d427..a38e25b9cec 100644
--- a/addons/base_module_quality/i18n/el.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index 1566a26991d..32db95355f9 100644
--- a/addons/base_module_quality/i18n/es.po
+++ b/addons/base_module_quality/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-27 09:16+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-10-16 22:58+0000\n"
+"Last-Translator: David Acevedo Toledo <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-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -391,7 +390,7 @@ msgstr "¡Error! El módulo no está cargado/instalado correctamente"
 #: code:addons/base_module_quality/speed_test/speed_test.py:116
 #, python-format
 msgid "Error in Read method: %s"
-msgstr ""
+msgstr "Error en el metodo de entrada %s"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:138
@@ -721,21 +720,6 @@ msgstr "Calidad"
 msgid "Feed back About terp file of Module"
 msgstr "Información sobre el archivo terp del módulo"
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "asistente.calidad.comprobar"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Detalle exhaustivo"
-
-#~ msgid "General Info"
-#~ msgstr "Información general"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "calidad.comprobar.detalle"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Detalle exhaustivo"
-
 #~ msgid "Base module quality"
 #~ msgstr "Calidad del módulo base"
 
diff --git a/addons/base_module_quality/i18n/es_AR.po b/addons/base_module_quality/i18n/es_AR.po
index 1ab4ad11a9b..fccddf9e87c 100644
--- a/addons/base_module_quality/i18n/es_AR.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -663,12 +663,6 @@ msgstr "Calidad"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "asistente.calidad.control"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Detalle ordenado"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para la definición de la vista!"
 
@@ -677,12 +671,3 @@ msgstr ""
 #~ msgstr ""
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
 #~ "especial!"
-
-#~ msgid "General Info"
-#~ msgstr "Información general"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "calidad.control.detalle"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Detalle ordenado"
diff --git a/addons/base_module_quality/i18n/es_EC.po b/addons/base_module_quality/i18n/es_EC.po
index c0a69ee74ac..e8bb30cdae1 100644
--- a/addons/base_module_quality/i18n/es_EC.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -668,21 +668,6 @@ msgstr "Calidad"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "asistente.calidad.comprobar"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Detalle exhaustivo"
-
-#~ msgid "General Info"
-#~ msgstr "Información general"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "calidad.comprobar.detalle"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Detalle exhaustivo"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/base_module_quality/i18n/es_MX.po b/addons/base_module_quality/i18n/es_MX.po
new file mode 100644
index 00000000000..69500f23540
--- /dev/null
+++ b/addons/base_module_quality/i18n/es_MX.po
@@ -0,0 +1,738 @@
+# 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: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2010-12-27 09:16+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:42+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Suggestion"
+msgstr "Sugerencia"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Programming Error"
+msgstr "Error de programación"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:31
+#, python-format
+msgid "Method Test"
+msgstr "Test del método"
+
+#. module: base_module_quality
+#: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
+msgid "Base module quality - To check the quality of other modules"
+msgstr "Módulo base de calidad - Para comprobar la calidad de otros módulos"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:34
+#, python-format
+msgid ""
+"\n"
+"Test checks for fields, views, security rules, dependancy level\n"
+msgstr ""
+"\n"
+"Test para comprobar los campos, vistas, reglas de seguridad y niveles de "
+"dependencia\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:127
+#, python-format
+msgid "O(n) or worst"
+msgstr "O(n) o peor"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Skipped"
+msgstr "Omitido"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:46
+#, python-format
+msgid "Module has no objects"
+msgstr "El módulo no tiene objetos"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:49
+#, python-format
+msgid "Speed Test"
+msgstr "Test de velocidad"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:54
+#, python-format
+msgid "The module does not contain the __openerp__.py file"
+msgstr "El módulo no contiene el archivo __openerp__.py"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:82
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:54
+#: code:addons/base_module_quality/method_test/method_test.py:61
+#: code:addons/base_module_quality/method_test/method_test.py:68
+#, python-format
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:34
+#, python-format
+msgid ""
+"This test checks if the module satisfies the current coding standard used by "
+"OpenERP."
+msgstr ""
+"Este test comprueba si el módulo satisface los estándares de código actuales "
+"de OpenERP."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
+#, python-format
+msgid "No report to save!"
+msgstr "¡No hay informe a guardar!"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of dependancy in %"
+msgstr "Resultado de la dependencia en %"
+
+#. module: base_module_quality
+#: help:module.quality.detail,state:0
+msgid ""
+"The test will be completed only if the module is installed or if the test "
+"may be processed on uninstalled module."
+msgstr ""
+"El test sólo se podrá completar si el módulo está instalado o si se puede "
+"probar con el módulo desinstalado."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#, python-format
+msgid "Result (/10)"
+msgstr "Resultado (/10)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:33
+#, python-format
+msgid "Terp Test"
+msgstr "Test terp"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:33
+#, python-format
+msgid "Object Test"
+msgstr "Test objeto"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Save Report"
+msgstr "Guardar informe"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/module_quality_check.py:46
+#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
+#, python-format
+msgid "Quality Check"
+msgstr "Comprobar la calidad"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:128
+#, python-format
+msgid "Not Efficient"
+msgstr "No es eficiente"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:35
+#, python-format
+msgid "Unit Test"
+msgstr "Test unitario"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "Reading Complexity"
+msgstr "Complejidad de lectura"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:267
+#, python-format
+msgid "Result of pep8_test in %"
+msgstr "Resultado del test pep8 en %"
+
+#. module: base_module_quality
+#: field:module.quality.detail,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:50
+#, python-format
+msgid "Module does not have 'unit_test/test.py' file"
+msgstr "El módulo no tiene un archivo 'unit_test/test.py'"
+
+#. module: base_module_quality
+#: field:module.quality.detail,ponderation:0
+msgid "Ponderation"
+msgstr "Ponderación"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of Security in %"
+msgstr "Resultado de seguridad en %"
+
+#. module: base_module_quality
+#: help:module.quality.detail,ponderation:0
+msgid ""
+"Some tests are more critical than others, so they have a bigger weight in "
+"the computation of final rating"
+msgstr ""
+"Algunas pruebas son más críticas que otras, por lo que tienen un mayor peso "
+"en el cálculo de la valoración final."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:120
+#, python-format
+msgid "No enough data"
+msgstr "No hay datos suficientes"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#, python-format
+msgid "Result (/1)"
+msgstr "Resultado (/1)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N (Number of Records)"
+msgstr "N (Número de registros)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:133
+#, python-format
+msgid "No data"
+msgstr "Sin datos"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_detail
+msgid "module.quality.detail"
+msgstr "módulo.calidad.detalle"
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,module_file:0
+msgid "Save report"
+msgstr "Guardar informe"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:34
+#, python-format
+msgid ""
+"This test checks where object has workflow or not on it if there is a state "
+"field and several buttons on it and also checks validity of workflow xml file"
+msgstr ""
+"Este test comprueba si el objeto tiene un flujo de trabajo, si hay un campo "
+"de estado y varios botones y también comprueba la validez del archivo xml "
+"del flujo de trabajo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#, python-format
+msgid "Result in %"
+msgstr "Resultado en %"
+
+#. module: base_module_quality
+#: wizard_view:quality_detail_save,init:0
+msgid "Standard entries"
+msgstr "Entradas estándar"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:58
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:88
+#, python-format
+msgid "No python file found"
+msgstr "No se ha encontrado un archivo Python"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: view:module.quality.check:0
+#: view:module.quality.detail:0
+#, python-format
+msgid "Result"
+msgstr "Resultado"
+
+#. module: base_module_quality
+#: field:module.quality.detail,message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Detail"
+msgstr "Detalle"
+
+#. module: base_module_quality
+#: field:module.quality.detail,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:85
+#, python-format
+msgid ""
+"<html>O(1) means that the number of SQL requests to read the object does not "
+"depand on the number of objects we are reading. This feature is mostly "
+"wished.\n"
+"</html>"
+msgstr ""
+"<html>O(1) significa que el número de peticiones SQL para leer el objeto no "
+"depende el número de objetos que estamos leyendo. Esta característica sería "
+"la más deseable.\n"
+"</html>"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:120
+#, python-format
+msgid "__openerp__.py file"
+msgstr "archivo __openerp__.py"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#, python-format
+msgid "Status"
+msgstr "Estado"
+
+#. module: base_module_quality
+#: view:module.quality.check:0
+#: field:module.quality.check,check_detail_ids:0
+msgid "Tests"
+msgstr "Pruebas"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:50
+#, python-format
+msgid ""
+"\n"
+"This test checks the speed of the module. Note that at least 5 demo data is "
+"needed in order to run it.\n"
+"\n"
+msgstr ""
+"\n"
+"Este test comprueba la velocidad del módulo. Observe que se necesitan por lo "
+"menos 5 datos de demostración para poder ejecutarlo.\n"
+"\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:71
+#, python-format
+msgid "Unable to parse the result. Check the details."
+msgstr "No se pudo parsear el resultado. Compruebe los detalles."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:33
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module satisfy tiny structure\n"
+msgstr ""
+"\n"
+"Este test comprueba si el módulo satisface la estructura de tiny.\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Module Name"
+msgstr "Nombre del módulo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:56
+#, python-format
+msgid "Error! Module is not properly loaded/installed"
+msgstr "¡Error! El módulo no está cargado/instalado correctamente"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:116
+#, python-format
+msgid "Error in Read method: %s"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:138
+#, python-format
+msgid "Score is below than minimal score(%s%%)"
+msgstr "La puntuación está por debajo de la mínima(%s%%)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N/2"
+msgstr "N/2"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:57
+#: code:addons/base_module_quality/method_test/method_test.py:64
+#: code:addons/base_module_quality/method_test/method_test.py:71
+#, python-format
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Test Is Not Implemented"
+msgstr "El test no está implementado"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N"
+msgstr "N"
+
+#. module: base_module_quality
+#: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
+msgid "Report Save"
+msgstr "Guardar informe"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#, python-format
+msgid "Feedback about structure of module"
+msgstr "Información sobre la estructura del módulo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:73
+#, python-format
+msgid ""
+"Given module has no objects.Speed test can work only when new objects are "
+"created in the module along with demo data"
+msgstr ""
+"El módulo no tiene objetos. El test de velocidad sólo puede ejecutarse "
+"cuando se crean nuevos objetos en el módulo junto con datos de demostración"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:32
+#, python-format
+msgid ""
+"This test uses Pylint and checks if the module satisfies the coding standard "
+"of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
+" "
+msgstr ""
+"Este test utiliza Pylint y comprueba si el módulo satisface los estándares "
+"de código Python. Consulte http://www.logilab.org/project/name/pylint para "
+"más información.\n"
+" "
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Feed back About Workflow of Module"
+msgstr "Información sobre el flujo de trabajo del módulo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:129
+#, python-format
+msgid "No Workflow define"
+msgstr "No se ha definido flujo de trabajo"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Done"
+msgstr "Listo"
+
+#. module: base_module_quality
+#: wizard_button:quality_detail_save,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:32
+#, python-format
+msgid ""
+"\n"
+"PEP-8 Test , copyright of py files check, method can not call from loops\n"
+msgstr ""
+"\n"
+"Test PEP-8, comprobación del copyright de los ficheros py y que los métodos "
+"no sean llamados desde bucles\n"
+
+#. module: base_module_quality
+#: field:module.quality.check,final_score:0
+msgid "Final Score (%)"
+msgstr "Puntuación final (%)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:61
+#, python-format
+msgid ""
+"Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
+msgstr ""
+"Error. ¿Está pylint correctamente instalado? "
+"(http://pypi.python.org/pypi/pylint)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:125
+#, python-format
+msgid "Efficient"
+msgstr "Eficiente"
+
+#. module: base_module_quality
+#: field:module.quality.check,name:0
+msgid "Rated Module"
+msgstr "Módulo evaluado"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:33
+#, python-format
+msgid "Workflow Test"
+msgstr "Test del flujo de trabajo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:36
+#, python-format
+msgid ""
+"\n"
+"This test checks the Unit Test(PyUnit) Cases of the module. Note that "
+"'unit_test/test.py' is needed in module.\n"
+"\n"
+msgstr ""
+"\n"
+"Este test comprueba los casos del test unitario (PyUnit) del módulo. Observe "
+"que es necesario definir 'unit_test/test.py' en el módulo.\n"
+"\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:32
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module classes are raising exception when calling "
+"basic methods or not.\n"
+msgstr ""
+"\n"
+"Este test comprueba si las clases del módulo están lanzando una excepción o "
+"no cuando se llaman a los métodos básicos.\n"
+
+#. module: base_module_quality
+#: field:module.quality.detail,detail:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:119
+#, python-format
+msgid "Warning! Not enough demo data"
+msgstr "¡Aviso! No hay suficientes datos de demostración."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:31
+#, python-format
+msgid "Pylint Test"
+msgstr "Test Pylint"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:31
+#, python-format
+msgid "PEP-8 Test"
+msgstr "Test PEP-8"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#, python-format
+msgid "Field name"
+msgstr "Nombre del campo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "1"
+msgstr "1"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:132
+#, python-format
+msgid "Warning! Object has no demo data"
+msgstr "¡Aviso! El objeto no tiene datos de demostración"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Tag Name"
+msgstr "Nombre de etiqueta"
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,name:0
+msgid "File name"
+msgstr "Nombre del archivo"
+
+#. module: base_module_quality
+#: model:ir.module.module,description:base_module_quality.module_meta_information
+msgid ""
+"\n"
+"The aim of this module is to check the quality of other modules.\n"
+"\n"
+"It defines a wizard on the list of modules in OpenERP, which allows you to\n"
+"evaluate them on different criteria such as: the respect of OpenERP coding\n"
+"standards, the speed efficiency...\n"
+"\n"
+"This module also provides generic framework to define your own quality "
+"test.\n"
+"For further info, coders may take a look into base_module_quality\\"
+"README.txt\n"
+"\n"
+"WARNING: This module can not work as a ZIP file, you must unzip it before\n"
+"using it, otherwise it may crash.\n"
+"    "
+msgstr ""
+"\n"
+"El propósito de este módulo es el de comprobar la calidad de otros módulos.\n"
+"\n"
+"Proporciona un asistente en la lista de módulos de OpenERP, el cual le "
+"permitirá\n"
+"evaluarlos bajo diferentes criterios como: la conformidad a los estándares\n"
+"de código OpenERP, la eficiencia en velocidad, ...\n"
+"\n"
+"El módulo también proporciona una plataforma genérica para definir sus "
+"propios tests de calidad.\n"
+"Para más información, los programadores pueden mirar base_module_quality\\"
+"README.txt\n"
+"\n"
+"AVISO: Este módulo no puede trabajar como archivo ZIP, debe descomprimirlo "
+"antes\n"
+"de utilizarlo, en caso contrario puede fallar.\n"
+"    "
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_check
+msgid "module.quality.check"
+msgstr "módulo.calidad.comprobación"
+
+#. module: base_module_quality
+#: field:module.quality.detail,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Result of views in %"
+msgstr "Resultado de las vistas en %"
+
+#. module: base_module_quality
+#: field:module.quality.detail,score:0
+msgid "Score (%)"
+msgstr "Puntuación (%)"
+
+#. module: base_module_quality
+#: help:quality_detail_save,init,name:0
+msgid "Save report as .html format"
+msgstr "Guardar el informe como archivo con formato .html"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:269
+#, python-format
+msgid "The module has to be installed before running this test."
+msgstr "El módulo tiene que estar instalado antes de ejecutar este test."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:123
+#, python-format
+msgid "O(1)"
+msgstr "O(1)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of fields in %"
+msgstr "Resultado de los campos en %"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#: view:module.quality.detail:0
+#: field:module.quality.detail,summary:0
+#, python-format
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#, python-format
+msgid "File Name"
+msgstr "Nombre del archivo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Line number"
+msgstr "Número de línea"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:32
+#, python-format
+msgid "Structure Test"
+msgstr "Test de estructura"
+
+#. module: base_module_quality
+#: field:module.quality.detail,quality_check_id:0
+msgid "Quality"
+msgstr "Calidad"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Feed back About terp file of Module"
+msgstr "Información sobre el archivo terp del módulo"
+
+#~ msgid "Base module quality"
+#~ msgstr "Calidad del módulo base"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML no válido para ver arquitectura"
+
+#~ 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"
+
+#, python-format
+#~ msgid "Error in Read method"
+#~ msgstr "Error en el método de lectura"
diff --git a/addons/base_module_quality/i18n/es_PY.po b/addons/base_module_quality/i18n/es_PY.po
index 234aac42c0d..27fc658932b 100644
--- a/addons/base_module_quality/i18n/es_PY.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/es_VE.po b/addons/base_module_quality/i18n/es_VE.po
new file mode 100644
index 00000000000..69500f23540
--- /dev/null
+++ b/addons/base_module_quality/i18n/es_VE.po
@@ -0,0 +1,738 @@
+# 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: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2010-12-27 09:16+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:42+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Suggestion"
+msgstr "Sugerencia"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Programming Error"
+msgstr "Error de programación"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:31
+#, python-format
+msgid "Method Test"
+msgstr "Test del método"
+
+#. module: base_module_quality
+#: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
+msgid "Base module quality - To check the quality of other modules"
+msgstr "Módulo base de calidad - Para comprobar la calidad de otros módulos"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:34
+#, python-format
+msgid ""
+"\n"
+"Test checks for fields, views, security rules, dependancy level\n"
+msgstr ""
+"\n"
+"Test para comprobar los campos, vistas, reglas de seguridad y niveles de "
+"dependencia\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:127
+#, python-format
+msgid "O(n) or worst"
+msgstr "O(n) o peor"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Skipped"
+msgstr "Omitido"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:46
+#, python-format
+msgid "Module has no objects"
+msgstr "El módulo no tiene objetos"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:49
+#, python-format
+msgid "Speed Test"
+msgstr "Test de velocidad"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:54
+#, python-format
+msgid "The module does not contain the __openerp__.py file"
+msgstr "El módulo no contiene el archivo __openerp__.py"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:82
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:54
+#: code:addons/base_module_quality/method_test/method_test.py:61
+#: code:addons/base_module_quality/method_test/method_test.py:68
+#, python-format
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:34
+#, python-format
+msgid ""
+"This test checks if the module satisfies the current coding standard used by "
+"OpenERP."
+msgstr ""
+"Este test comprueba si el módulo satisface los estándares de código actuales "
+"de OpenERP."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
+#, python-format
+msgid "No report to save!"
+msgstr "¡No hay informe a guardar!"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of dependancy in %"
+msgstr "Resultado de la dependencia en %"
+
+#. module: base_module_quality
+#: help:module.quality.detail,state:0
+msgid ""
+"The test will be completed only if the module is installed or if the test "
+"may be processed on uninstalled module."
+msgstr ""
+"El test sólo se podrá completar si el módulo está instalado o si se puede "
+"probar con el módulo desinstalado."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#, python-format
+msgid "Result (/10)"
+msgstr "Resultado (/10)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:33
+#, python-format
+msgid "Terp Test"
+msgstr "Test terp"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:33
+#, python-format
+msgid "Object Test"
+msgstr "Test objeto"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Save Report"
+msgstr "Guardar informe"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/module_quality_check.py:46
+#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
+#, python-format
+msgid "Quality Check"
+msgstr "Comprobar la calidad"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:128
+#, python-format
+msgid "Not Efficient"
+msgstr "No es eficiente"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:35
+#, python-format
+msgid "Unit Test"
+msgstr "Test unitario"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "Reading Complexity"
+msgstr "Complejidad de lectura"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:267
+#, python-format
+msgid "Result of pep8_test in %"
+msgstr "Resultado del test pep8 en %"
+
+#. module: base_module_quality
+#: field:module.quality.detail,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:50
+#, python-format
+msgid "Module does not have 'unit_test/test.py' file"
+msgstr "El módulo no tiene un archivo 'unit_test/test.py'"
+
+#. module: base_module_quality
+#: field:module.quality.detail,ponderation:0
+msgid "Ponderation"
+msgstr "Ponderación"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of Security in %"
+msgstr "Resultado de seguridad en %"
+
+#. module: base_module_quality
+#: help:module.quality.detail,ponderation:0
+msgid ""
+"Some tests are more critical than others, so they have a bigger weight in "
+"the computation of final rating"
+msgstr ""
+"Algunas pruebas son más críticas que otras, por lo que tienen un mayor peso "
+"en el cálculo de la valoración final."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:120
+#, python-format
+msgid "No enough data"
+msgstr "No hay datos suficientes"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#, python-format
+msgid "Result (/1)"
+msgstr "Resultado (/1)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N (Number of Records)"
+msgstr "N (Número de registros)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:133
+#, python-format
+msgid "No data"
+msgstr "Sin datos"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_detail
+msgid "module.quality.detail"
+msgstr "módulo.calidad.detalle"
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,module_file:0
+msgid "Save report"
+msgstr "Guardar informe"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:34
+#, python-format
+msgid ""
+"This test checks where object has workflow or not on it if there is a state "
+"field and several buttons on it and also checks validity of workflow xml file"
+msgstr ""
+"Este test comprueba si el objeto tiene un flujo de trabajo, si hay un campo "
+"de estado y varios botones y también comprueba la validez del archivo xml "
+"del flujo de trabajo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#, python-format
+msgid "Result in %"
+msgstr "Resultado en %"
+
+#. module: base_module_quality
+#: wizard_view:quality_detail_save,init:0
+msgid "Standard entries"
+msgstr "Entradas estándar"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:58
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:88
+#, python-format
+msgid "No python file found"
+msgstr "No se ha encontrado un archivo Python"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: view:module.quality.check:0
+#: view:module.quality.detail:0
+#, python-format
+msgid "Result"
+msgstr "Resultado"
+
+#. module: base_module_quality
+#: field:module.quality.detail,message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Detail"
+msgstr "Detalle"
+
+#. module: base_module_quality
+#: field:module.quality.detail,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:85
+#, python-format
+msgid ""
+"<html>O(1) means that the number of SQL requests to read the object does not "
+"depand on the number of objects we are reading. This feature is mostly "
+"wished.\n"
+"</html>"
+msgstr ""
+"<html>O(1) significa que el número de peticiones SQL para leer el objeto no "
+"depende el número de objetos que estamos leyendo. Esta característica sería "
+"la más deseable.\n"
+"</html>"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:120
+#, python-format
+msgid "__openerp__.py file"
+msgstr "archivo __openerp__.py"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#, python-format
+msgid "Status"
+msgstr "Estado"
+
+#. module: base_module_quality
+#: view:module.quality.check:0
+#: field:module.quality.check,check_detail_ids:0
+msgid "Tests"
+msgstr "Pruebas"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:50
+#, python-format
+msgid ""
+"\n"
+"This test checks the speed of the module. Note that at least 5 demo data is "
+"needed in order to run it.\n"
+"\n"
+msgstr ""
+"\n"
+"Este test comprueba la velocidad del módulo. Observe que se necesitan por lo "
+"menos 5 datos de demostración para poder ejecutarlo.\n"
+"\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:71
+#, python-format
+msgid "Unable to parse the result. Check the details."
+msgstr "No se pudo parsear el resultado. Compruebe los detalles."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:33
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module satisfy tiny structure\n"
+msgstr ""
+"\n"
+"Este test comprueba si el módulo satisface la estructura de tiny.\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Module Name"
+msgstr "Nombre del módulo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:56
+#, python-format
+msgid "Error! Module is not properly loaded/installed"
+msgstr "¡Error! El módulo no está cargado/instalado correctamente"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:116
+#, python-format
+msgid "Error in Read method: %s"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:138
+#, python-format
+msgid "Score is below than minimal score(%s%%)"
+msgstr "La puntuación está por debajo de la mínima(%s%%)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N/2"
+msgstr "N/2"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:57
+#: code:addons/base_module_quality/method_test/method_test.py:64
+#: code:addons/base_module_quality/method_test/method_test.py:71
+#, python-format
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Test Is Not Implemented"
+msgstr "El test no está implementado"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N"
+msgstr "N"
+
+#. module: base_module_quality
+#: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
+msgid "Report Save"
+msgstr "Guardar informe"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#, python-format
+msgid "Feedback about structure of module"
+msgstr "Información sobre la estructura del módulo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:73
+#, python-format
+msgid ""
+"Given module has no objects.Speed test can work only when new objects are "
+"created in the module along with demo data"
+msgstr ""
+"El módulo no tiene objetos. El test de velocidad sólo puede ejecutarse "
+"cuando se crean nuevos objetos en el módulo junto con datos de demostración"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:32
+#, python-format
+msgid ""
+"This test uses Pylint and checks if the module satisfies the coding standard "
+"of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
+" "
+msgstr ""
+"Este test utiliza Pylint y comprueba si el módulo satisface los estándares "
+"de código Python. Consulte http://www.logilab.org/project/name/pylint para "
+"más información.\n"
+" "
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Feed back About Workflow of Module"
+msgstr "Información sobre el flujo de trabajo del módulo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:129
+#, python-format
+msgid "No Workflow define"
+msgstr "No se ha definido flujo de trabajo"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Done"
+msgstr "Listo"
+
+#. module: base_module_quality
+#: wizard_button:quality_detail_save,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:32
+#, python-format
+msgid ""
+"\n"
+"PEP-8 Test , copyright of py files check, method can not call from loops\n"
+msgstr ""
+"\n"
+"Test PEP-8, comprobación del copyright de los ficheros py y que los métodos "
+"no sean llamados desde bucles\n"
+
+#. module: base_module_quality
+#: field:module.quality.check,final_score:0
+msgid "Final Score (%)"
+msgstr "Puntuación final (%)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:61
+#, python-format
+msgid ""
+"Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
+msgstr ""
+"Error. ¿Está pylint correctamente instalado? "
+"(http://pypi.python.org/pypi/pylint)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:125
+#, python-format
+msgid "Efficient"
+msgstr "Eficiente"
+
+#. module: base_module_quality
+#: field:module.quality.check,name:0
+msgid "Rated Module"
+msgstr "Módulo evaluado"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:33
+#, python-format
+msgid "Workflow Test"
+msgstr "Test del flujo de trabajo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:36
+#, python-format
+msgid ""
+"\n"
+"This test checks the Unit Test(PyUnit) Cases of the module. Note that "
+"'unit_test/test.py' is needed in module.\n"
+"\n"
+msgstr ""
+"\n"
+"Este test comprueba los casos del test unitario (PyUnit) del módulo. Observe "
+"que es necesario definir 'unit_test/test.py' en el módulo.\n"
+"\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:32
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module classes are raising exception when calling "
+"basic methods or not.\n"
+msgstr ""
+"\n"
+"Este test comprueba si las clases del módulo están lanzando una excepción o "
+"no cuando se llaman a los métodos básicos.\n"
+
+#. module: base_module_quality
+#: field:module.quality.detail,detail:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:119
+#, python-format
+msgid "Warning! Not enough demo data"
+msgstr "¡Aviso! No hay suficientes datos de demostración."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:31
+#, python-format
+msgid "Pylint Test"
+msgstr "Test Pylint"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:31
+#, python-format
+msgid "PEP-8 Test"
+msgstr "Test PEP-8"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#, python-format
+msgid "Field name"
+msgstr "Nombre del campo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "1"
+msgstr "1"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:132
+#, python-format
+msgid "Warning! Object has no demo data"
+msgstr "¡Aviso! El objeto no tiene datos de demostración"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Tag Name"
+msgstr "Nombre de etiqueta"
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,name:0
+msgid "File name"
+msgstr "Nombre del archivo"
+
+#. module: base_module_quality
+#: model:ir.module.module,description:base_module_quality.module_meta_information
+msgid ""
+"\n"
+"The aim of this module is to check the quality of other modules.\n"
+"\n"
+"It defines a wizard on the list of modules in OpenERP, which allows you to\n"
+"evaluate them on different criteria such as: the respect of OpenERP coding\n"
+"standards, the speed efficiency...\n"
+"\n"
+"This module also provides generic framework to define your own quality "
+"test.\n"
+"For further info, coders may take a look into base_module_quality\\"
+"README.txt\n"
+"\n"
+"WARNING: This module can not work as a ZIP file, you must unzip it before\n"
+"using it, otherwise it may crash.\n"
+"    "
+msgstr ""
+"\n"
+"El propósito de este módulo es el de comprobar la calidad de otros módulos.\n"
+"\n"
+"Proporciona un asistente en la lista de módulos de OpenERP, el cual le "
+"permitirá\n"
+"evaluarlos bajo diferentes criterios como: la conformidad a los estándares\n"
+"de código OpenERP, la eficiencia en velocidad, ...\n"
+"\n"
+"El módulo también proporciona una plataforma genérica para definir sus "
+"propios tests de calidad.\n"
+"Para más información, los programadores pueden mirar base_module_quality\\"
+"README.txt\n"
+"\n"
+"AVISO: Este módulo no puede trabajar como archivo ZIP, debe descomprimirlo "
+"antes\n"
+"de utilizarlo, en caso contrario puede fallar.\n"
+"    "
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_check
+msgid "module.quality.check"
+msgstr "módulo.calidad.comprobación"
+
+#. module: base_module_quality
+#: field:module.quality.detail,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Result of views in %"
+msgstr "Resultado de las vistas en %"
+
+#. module: base_module_quality
+#: field:module.quality.detail,score:0
+msgid "Score (%)"
+msgstr "Puntuación (%)"
+
+#. module: base_module_quality
+#: help:quality_detail_save,init,name:0
+msgid "Save report as .html format"
+msgstr "Guardar el informe como archivo con formato .html"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:269
+#, python-format
+msgid "The module has to be installed before running this test."
+msgstr "El módulo tiene que estar instalado antes de ejecutar este test."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:123
+#, python-format
+msgid "O(1)"
+msgstr "O(1)"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of fields in %"
+msgstr "Resultado de los campos en %"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#: view:module.quality.detail:0
+#: field:module.quality.detail,summary:0
+#, python-format
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#, python-format
+msgid "File Name"
+msgstr "Nombre del archivo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Line number"
+msgstr "Número de línea"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:32
+#, python-format
+msgid "Structure Test"
+msgstr "Test de estructura"
+
+#. module: base_module_quality
+#: field:module.quality.detail,quality_check_id:0
+msgid "Quality"
+msgstr "Calidad"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Feed back About terp file of Module"
+msgstr "Información sobre el archivo terp del módulo"
+
+#~ msgid "Base module quality"
+#~ msgstr "Calidad del módulo base"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML no válido para ver arquitectura"
+
+#~ 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"
+
+#, python-format
+#~ msgid "Error in Read method"
+#~ msgstr "Error en el método de lectura"
diff --git a/addons/base_module_quality/i18n/et.po b/addons/base_module_quality/i18n/et.po
index 4f675de7998..87af32b1972 100644
--- a/addons/base_module_quality/i18n/et.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -663,9 +663,6 @@ msgstr "Kvaliteet"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Vigane XML vaate arhitektuurile!"
 
@@ -673,6 +670,3 @@ msgstr ""
 #~ "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 "quality.check.detail"
-#~ msgstr "quality.check.detail"
diff --git a/addons/base_module_quality/i18n/fi.po b/addons/base_module_quality/i18n/fi.po
index 731bf3bf68a..11c882abfe6 100644
--- a/addons/base_module_quality/i18n/fi.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -35,12 +35,12 @@ msgstr "Ohjelmointivirhe"
 #: code:addons/base_module_quality/method_test/method_test.py:31
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "Metodi testi"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality - To check the quality of other modules"
-msgstr ""
+msgstr "Päämoduulien laatu - Toisten moduulien laadun tarkistamiseen"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:34
@@ -49,12 +49,14 @@ msgid ""
 "\n"
 "Test checks for fields, views, security rules, dependancy level\n"
 msgstr ""
+"\n"
+"Testi tarkistaa kentät, näkymät, turvasäännöt, riippuvuustasot\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:127
 #, python-format
 msgid "O(n) or worst"
-msgstr ""
+msgstr "0(n) tai huonoin"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
@@ -65,7 +67,7 @@ msgstr "Ohitettu"
 #: code:addons/base_module_quality/method_test/method_test.py:46
 #, python-format
 msgid "Module has no objects"
-msgstr ""
+msgstr "Moduulissa ei ole objekteja"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:49
@@ -77,7 +79,7 @@ msgstr "Nopeustesti"
 #: code:addons/base_module_quality/terp_test/terp_test.py:54
 #, python-format
 msgid "The module does not contain the __openerp__.py file"
-msgstr ""
+msgstr "Moduuli ei sisällä __openerp__.py tiedostoa"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:82
@@ -98,7 +100,7 @@ msgstr "Objektin nimi"
 #: code:addons/base_module_quality/method_test/method_test.py:68
 #, python-format
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:34
@@ -107,18 +109,20 @@ msgid ""
 "This test checks if the module satisfies the current coding standard used by "
 "OpenERP."
 msgstr ""
+"Tämä testi tarkistaa, täyttääkö moduuli nykyiset OpenERP:in käyttämät "
+"koodausstandardit."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "No report to save!"
-msgstr ""
+msgstr "Ei talletettavaa raporttia!"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of dependancy in %"
-msgstr ""
+msgstr "Riippuvuustulos %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -133,19 +137,19 @@ msgstr ""
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:99
 #, python-format
 msgid "Result (/10)"
-msgstr ""
+msgstr "Tulos (/10)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:33
 #, python-format
 msgid "Terp Test"
-msgstr ""
+msgstr "Terp testi"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:33
 #, python-format
 msgid "Object Test"
-msgstr ""
+msgstr "Objekti testi"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -163,7 +167,7 @@ msgstr "Laaduntarkistus"
 #: code:addons/base_module_quality/speed_test/speed_test.py:128
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "Ei tehokas"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:46
@@ -181,13 +185,13 @@ msgstr "Yksikkötesti"
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "Reading Complexity"
-msgstr ""
+msgstr "Lukemisen monimutkaisuus"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:267
 #, python-format
 msgid "Result of pep8_test in %"
-msgstr ""
+msgstr "pep8_test tulos %"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
@@ -198,7 +202,7 @@ msgstr "Tila"
 #: code:addons/base_module_quality/unit_test/unit_test.py:50
 #, python-format
 msgid "Module does not have 'unit_test/test.py' file"
-msgstr ""
+msgstr "Monduuli ei sisällä 'unit_test/test.py' tiedostoa"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
@@ -209,7 +213,7 @@ msgstr "Punnitseminen (arviointi)"
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of Security in %"
-msgstr ""
+msgstr "Tulos turvallisuuden osalta %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -224,25 +228,25 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:120
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "Ei tarpeeksi tietoja"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:132
 #, python-format
 msgid "Result (/1)"
-msgstr ""
+msgstr "Tulos (/1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N (Number of Records)"
-msgstr ""
+msgstr "N (tietueiden määrä)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:133
 #, python-format
 msgid "No data"
-msgstr ""
+msgstr "Ei tietoja"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
@@ -261,12 +265,15 @@ msgid ""
 "This test checks where object has workflow or not on it if there is a state "
 "field and several buttons on it and also checks validity of workflow xml file"
 msgstr ""
+"Tämä testi tarkistaa onko objektilla työnkulkua vai ei jos objektilla on "
+"tilakenttä ja useita nappeja sekä tarkistaa myös työnkulun xml tiedoston "
+"kelpoisuuden."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:151
 #, python-format
 msgid "Result in %"
-msgstr ""
+msgstr "Tulos %"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
@@ -278,7 +285,7 @@ msgstr "Normikohdat"
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:88
 #, python-format
 msgid "No python file found"
-msgstr ""
+msgstr "Python tiedostoa ei löytynyt"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:144
@@ -323,7 +330,7 @@ msgstr ""
 #: code:addons/base_module_quality/unit_test/unit_test.py:70
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -340,12 +347,16 @@ msgid ""
 "needed in order to run it.\n"
 "\n"
 msgstr ""
+"\n"
+"Tämä testi testaa moduulin nopeuden. Huomaa että ainakin 5 esimerkkitietoa "
+"tarvitaan tämän ajamiseen.\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:71
 #, python-format
 msgid "Unable to parse the result. Check the details."
-msgstr ""
+msgstr "Ei voi tulkita tuloksia. Tarkista yksityiskohdat"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:33
@@ -354,19 +365,21 @@ msgid ""
 "\n"
 "This test checks if the module satisfy tiny structure\n"
 msgstr ""
+"\n"
+"Testi tarkistaa täyttääkö moduuli tiny -rakenteen vaatimukset\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:151
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "Moduulin nimi"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:56
 #, python-format
 msgid "Error! Module is not properly loaded/installed"
-msgstr ""
+msgstr "Virhe! Moduulia ei ole kunnolla ladattu/asennettu"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:116
@@ -378,7 +391,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:138
 #, python-format
 msgid "Score is below than minimal score(%s%%)"
-msgstr ""
+msgstr "Tulos on alle minimin (%s%%)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
@@ -392,13 +405,13 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:71
 #, python-format
 msgid "Exception"
-msgstr ""
+msgstr "Poikkeus"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Test Is Not Implemented"
-msgstr ""
+msgstr "Testiä ei ole toteutettu"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
@@ -415,7 +428,7 @@ msgstr "Raportin Tallennus"
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "Feedback about structure of module"
-msgstr ""
+msgstr "Palautetta moduulin rakenteesta"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:73
@@ -424,6 +437,8 @@ msgid ""
 "Given module has no objects.Speed test can work only when new objects are "
 "created in the module along with demo data"
 msgstr ""
+"Annetulla moduulilla ei ole objekteja. Nopeustesti voi toimia vain jos uusia "
+"objekteja on luotu moduuliin demo tietojen kanssa."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:32
@@ -433,12 +448,15 @@ msgid ""
 "of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
 " "
 msgstr ""
+"Tämä testi käyttää Pylint:iä ja tarkistaa täyttääkö moduuli Python koodaus "
+"standardit.\n"
+" "
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Feed back About Workflow of Module"
-msgstr ""
+msgstr "Palautetta moduulin työnkulusta"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:129
@@ -480,7 +498,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:125
 #, python-format
 msgid "Efficient"
-msgstr ""
+msgstr "Tehokas"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
@@ -491,7 +509,7 @@ msgstr "Arvosteltu moduuli"
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:33
 #, python-format
 msgid "Workflow Test"
-msgstr ""
+msgstr "Työnkulun testi"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:36
@@ -511,6 +529,9 @@ msgid ""
 "This test checks if the module classes are raising exception when calling "
 "basic methods or not.\n"
 msgstr ""
+"\n"
+"Testi tarkistaa suorittavatko moduulien luokat keskeytyksen kun kutsutaan "
+"peru metodeita vai ei.\n"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
@@ -521,7 +542,7 @@ msgstr "Yksityiskohdat"
 #: code:addons/base_module_quality/speed_test/speed_test.py:119
 #, python-format
 msgid "Warning! Not enough demo data"
-msgstr ""
+msgstr "Varoitus! Ei riittävästi esimerkkitietoja"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:31
@@ -539,7 +560,7 @@ msgstr ""
 #: code:addons/base_module_quality/object_test/object_test.py:187
 #, python-format
 msgid "Field name"
-msgstr ""
+msgstr "Kentän nimi"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
@@ -551,7 +572,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:132
 #, python-format
 msgid "Warning! Object has no demo data"
-msgstr ""
+msgstr "Varoitus! Objekti ei sisällä esimerkkitietoja"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:140
@@ -615,7 +636,7 @@ msgstr "Tallenna raportti .html -muotoon"
 #: code:addons/base_module_quality/base_module_quality.py:269
 #, python-format
 msgid "The module has to be installed before running this test."
-msgstr ""
+msgstr "Moduuli pitää asentaa ennenkuin tämä testi voidaan ajaa."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:123
@@ -627,7 +648,7 @@ msgstr ""
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of fields in %"
-msgstr ""
+msgstr "Kenttätestin tulos %"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:70
@@ -642,19 +663,19 @@ msgstr "Yhteenveto"
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "Tiedostonimi"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Line number"
-msgstr ""
+msgstr "Rivin numero"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:32
 #, python-format
 msgid "Structure Test"
-msgstr ""
+msgstr "Rakennetesti"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
@@ -667,9 +688,6 @@ msgstr "Laatu"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "General Info"
-#~ msgstr "Yleistiedot"
-
 #~ msgid "Base module quality"
 #~ msgstr "Ydinmoduulin laatu"
 
@@ -679,3 +697,7 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+
+#, python-format
+#~ msgid "Error in Read method"
+#~ msgstr "Virhe lukumenetelmässä"
diff --git a/addons/base_module_quality/i18n/fr.po b/addons/base_module_quality/i18n/fr.po
index 5f9f83940d8..dc56e0ba1f5 100644
--- a/addons/base_module_quality/i18n/fr.po
+++ b/addons/base_module_quality/i18n/fr.po
@@ -8,14 +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:14+0000\n"
-"PO-Revision-Date: 2011-01-12 20:19+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-09-26 12:09+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-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -390,7 +391,7 @@ msgstr "Erreur ! Le module n'est pas correctement chargé/installé."
 #: code:addons/base_module_quality/speed_test/speed_test.py:116
 #, python-format
 msgid "Error in Read method: %s"
-msgstr ""
+msgstr "Erreur dans la méthode Read : %s"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:138
@@ -722,25 +723,10 @@ msgstr "Qualité"
 msgid "Feed back About terp file of Module"
 msgstr "Retour d'information sur le fichier terp du module"
 
-#~ msgid "General Info"
-#~ msgstr "Information générale"
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Verbose Detail"
-
 #, python-format
 #~ msgid "Error in Read method"
 #~ msgstr "Erreur dans la méthode Read"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML incorrect dans l'architecture de la vue !"
 
@@ -749,6 +735,3 @@ msgstr "Retour d'information sur le fichier terp du module"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer par x_ et ne doit contenir aucun caractère "
 #~ "spécial !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/base_module_quality/i18n/gl.po b/addons/base_module_quality/i18n/gl.po
index 20f8e9bf44b..6da1672a78f 100644
--- a/addons/base_module_quality/i18n/gl.po
+++ b/addons/base_module_quality/i18n/gl.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -665,9 +665,6 @@ msgstr "Calidade"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "General Info"
-#~ msgstr "Información xeral"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML non válido para a definición da vista!"
 
@@ -675,15 +672,3 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "¡O nome do obxecto debe comezar con x_ y non conter ningún carácter especial!"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Detalle exhaustivo"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "calidade.comprobar.detalle"
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "asistente.calidade.comprobar"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Detalle exhaustivo"
diff --git a/addons/base_module_quality/i18n/hr.po b/addons/base_module_quality/i18n/hr.po
index 0694dae3ed2..96cf304fc00 100644
--- a/addons/base_module_quality/i18n/hr.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: base_module_quality
@@ -668,12 +668,6 @@ msgstr "Kvaliteta"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/base_module_quality/i18n/hu.po b/addons/base_module_quality/i18n/hu.po
index 27374a123ec..b6e38d03096 100644
--- a/addons/base_module_quality/i18n/hu.po
+++ b/addons/base_module_quality/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-03 08:55+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/id.po b/addons/base_module_quality/i18n/id.po
index 92cc355b616..df94cbc5913 100644
--- a/addons/base_module_quality/i18n/id.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 2be9297ac6b..ed375a65bbe 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -676,18 +676,12 @@ msgstr "Qualità"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
 #~ 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 "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
 
diff --git a/addons/base_module_quality/i18n/iu.po b/addons/base_module_quality/i18n/iu.po
index dd1ca4a92a1..3311dd19711 100644
--- a/addons/base_module_quality/i18n/iu.po
+++ b/addons/base_module_quality/i18n/iu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/ko.po b/addons/base_module_quality/i18n/ko.po
index 1656d7157ab..d4560f4db14 100644
--- a/addons/base_module_quality/i18n/ko.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -662,6 +662,3 @@ msgstr "품질"
 #, python-format
 msgid "Feed back About terp file of Module"
 msgstr ""
-
-#~ msgid "General Info"
-#~ msgstr "일반 정보"
diff --git a/addons/base_module_quality/i18n/lt.po b/addons/base_module_quality/i18n/lt.po
index ddbb63b83ca..3bbe5c0e1ef 100644
--- a/addons/base_module_quality/i18n/lt.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/mn.po b/addons/base_module_quality/i18n/mn.po
index 6eb4ad6a3de..737246b1f71 100644
--- a/addons/base_module_quality/i18n/mn.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -677,9 +677,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po
index 6b05b47db0f..8159639b730 100644
--- a/addons/base_module_quality/i18n/nl.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -721,12 +721,6 @@ msgstr "Kwaliteit"
 msgid "Feed back About terp file of Module"
 msgstr "Terugkoppeling over terp bestand van de module"
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -799,20 +793,6 @@ msgstr "Terugkoppeling over terp bestand van de module"
 #~ "                        speed_list = [obj, size, code_base_complexity, "
 #~ "code_half_complexity, code_size_complexity, _(\"Warning! Not enough demo data"
 
-#, python-format
-#~ msgid ""
-#~ "\"\"\n"
-#~ "This test checks the Unit Test(PyUnit) Cases of the module. Note that "
-#~ "'unit_test/test.py' is needed in module.\n"
-#~ "\n"
-#~ "\"\""
-#~ msgstr ""
-#~ "\"\"\n"
-#~ "Deze test controleert de Unit test(PyUnit) gevallen van de module. Merk op "
-#~ "dat 'unit_test/test.py' nodig is in de module.\n"
-#~ "\n"
-#~ "\"\""
-
 #, python-format
 #~ msgid ""
 #~ "\"\"\n"
@@ -839,12 +819,3 @@ msgstr "Terugkoppeling over terp bestand van de module"
 #~ "codeer standaard van Python. See http://www.logilab.org/project/name/pylint "
 #~ "voor meer info.\n"
 #~ " \"\""
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/base_module_quality/i18n/pl.po b/addons/base_module_quality/i18n/pl.po
index 98b2ba55819..f744062a11a 100644
--- a/addons/base_module_quality/i18n/pl.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index c6d19e4ddad..67eebfb18bb 100644
--- a/addons/base_module_quality/i18n/pt.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -677,15 +677,6 @@ msgstr "Qualidade"
 msgid "Feed back About terp file of Module"
 msgstr "resposta sobre o ficheiro terp do Módulo"
 
-#~ msgid "General Info"
-#~ msgstr "Informação Geral"
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #, python-format
 #~ msgid ""
 #~ "\"\"\n"
diff --git a/addons/base_module_quality/i18n/pt_BR.po b/addons/base_module_quality/i18n/pt_BR.po
index 96c86c83153..c4413ac744b 100644
--- a/addons/base_module_quality/i18n/pt_BR.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -714,12 +714,6 @@ msgstr "Qualidade"
 msgid "Feed back About terp file of Module"
 msgstr "Feedback sobre o arquivo do módulo"
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
 
@@ -732,15 +726,6 @@ msgstr "Feedback sobre o arquivo do módulo"
 #~ msgid "Base module quality"
 #~ msgstr "Módulo base da qualidade"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
 #, python-format
 #~ msgid "Error in Read method"
 #~ msgstr "Erro no método de Leitura"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/base_module_quality/i18n/ro.po b/addons/base_module_quality/i18n/ro.po
index bcb0f5a82d8..c08796e5979 100644
--- a/addons/base_module_quality/i18n/ro.po
+++ b/addons/base_module_quality/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-19 20:48+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -667,12 +667,6 @@ msgstr "Calitate"
 msgid "Feed back About terp file of Module"
 msgstr ""
 
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po
index 27030f13cf5..b8a571910a4 100644
--- a/addons/base_module_quality/i18n/ru.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -719,15 +719,6 @@ msgstr "Отклик о файле terp модуля"
 #~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
 #~ "символов !"
 
-#~ msgid "General Info"
-#~ msgstr "Общая информация"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Подробности"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Подробности"
-
 #~ msgid "Base module quality"
 #~ msgstr "Базисный модуль контроля качества"
 
diff --git a/addons/base_module_quality/i18n/sk.po b/addons/base_module_quality/i18n/sk.po
index ca1503b7069..c7bdb1a8bb0 100644
--- a/addons/base_module_quality/i18n/sk.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/sl.po b/addons/base_module_quality/i18n/sl.po
index ea9e061d4e2..2c587659f48 100644
--- a/addons/base_module_quality/i18n/sl.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -674,14 +674,5 @@ msgstr ""
 #~ msgstr ""
 #~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
-#~ msgid "General Info"
-#~ msgstr "Splošne informacije"
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid "Base module quality"
 #~ msgstr "Osnovna kakovost modula"
diff --git a/addons/base_module_quality/i18n/sq.po b/addons/base_module_quality/i18n/sq.po
index c21d71fe638..552f31c16d5 100644
--- a/addons/base_module_quality/i18n/sq.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po
index 99c95a4a1e5..7f9b0e5f0c9 100644
--- a/addons/base_module_quality/i18n/sr.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -685,21 +685,6 @@ msgstr "Povratni info o terp fajlu Modula"
 #~ "Ime Objekta mora da počne sa x_ i ne sme da sadrži ne jedan specijalni "
 #~ "karakter"
 
-#~ msgid "General Info"
-#~ msgstr "Opšte informacije"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Opširniji detalji"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Opsirniji podaci"
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid "Base module quality"
 #~ msgstr "Kvalitet osnovnog Modula"
 
@@ -779,20 +764,6 @@ msgstr "Povratni info o terp fajlu Modula"
 #~ "PEP-8 Test copyright of py files check, metod se ne moze pozivati iz petlji\n"
 #~ "\"\""
 
-#, python-format
-#~ msgid ""
-#~ "\"\"\n"
-#~ "This test checks the Unit Test(PyUnit) Cases of the module. Note that "
-#~ "'unit_test/test.py' is needed in module.\n"
-#~ "\n"
-#~ "\"\""
-#~ msgstr ""
-#~ "\"\n"
-#~ "Ovo proverava Test Jedinice(PyUnit) vrste modula. Upamtite da je "
-#~ "'unit_test/test.py' potreban modulu.\n"
-#~ "\n"
-#~ "\"\""
-
 #, python-format
 #~ msgid ""
 #~ "\"\"This test uses Pylint and checks if the module satisfies the coding "
diff --git a/addons/base_module_quality/i18n/sr@latin.po b/addons/base_module_quality/i18n/sr@latin.po
index 9b13cea807e..aa365dc5048 100644
--- a/addons/base_module_quality/i18n/sr@latin.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -742,20 +742,6 @@ msgstr "Povratni info o terp fajlu Modula"
 #~ "code_half_complexity, code_size_complexity, _(\"Upozorenje! Nedovoljno demo "
 #~ "podataka"
 
-#, python-format
-#~ msgid ""
-#~ "\"\"\n"
-#~ "This test checks the Unit Test(PyUnit) Cases of the module. Note that "
-#~ "'unit_test/test.py' is needed in module.\n"
-#~ "\n"
-#~ "\"\""
-#~ msgstr ""
-#~ "\"\n"
-#~ "Ovo proverava Test Jedinice(PyUnit) vrste modula. Upamtite da je "
-#~ "'unit_test/test.py' potreban modulu.\n"
-#~ "\n"
-#~ "\"\""
-
 #, python-format
 #~ msgid ""
 #~ "\"\"\n"
@@ -791,20 +777,5 @@ msgstr "Povratni info o terp fajlu Modula"
 #~ "Ime Objekta mora da počne sa x_ i ne sme da sadrži ne jedan specijalni "
 #~ "karakter"
 
-#~ msgid "General Info"
-#~ msgstr "Opšte informacije"
-
-#~ msgid "Verbose Detail"
-#~ msgstr "Opširniji detalji"
-
-#~ msgid "Verbose detail"
-#~ msgstr "Opsirniji podaci"
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
-
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid "Base module quality"
 #~ msgstr "Kvalitet osnovnog Modula"
diff --git a/addons/base_module_quality/i18n/sv.po b/addons/base_module_quality/i18n/sv.po
index 1d55d1a4b9d..fa158c3fdc8 100644
--- a/addons/base_module_quality/i18n/sv.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index ebc8d57409c..be0793e81b0 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/uk.po b/addons/base_module_quality/i18n/uk.po
index 44bae488315..722da4936c1 100644
--- a/addons/base_module_quality/i18n/uk.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/vi.po b/addons/base_module_quality/i18n/vi.po
index f29e402c482..e3933328a65 100644
--- a/addons/base_module_quality/i18n/vi.po
+++ b/addons/base_module_quality/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-07-20 17:02+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po
index 52ed0dd090e..0b710cd5dcc 100644
--- a/addons/base_module_quality/i18n/zh_CN.po
+++ b/addons/base_module_quality/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-08-03 03:43+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -23,24 +23,24 @@ msgstr ""
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Suggestion"
-msgstr ""
+msgstr "建议"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Programming Error"
-msgstr ""
+msgstr "程序错误"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:31
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "测试方法"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality - To check the quality of other modules"
-msgstr ""
+msgstr "简单测试模块 - 去检测其它模块的质量"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:34
@@ -49,12 +49,14 @@ msgid ""
 "\n"
 "Test checks for fields, views, security rules, dependancy level\n"
 msgstr ""
+"\n"
+"测试检查字段，视图，权限规则，依赖\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:127
 #, python-format
 msgid "O(n) or worst"
-msgstr ""
+msgstr "O(n) 或最坏"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
@@ -65,19 +67,19 @@ msgstr "已跳过"
 #: code:addons/base_module_quality/method_test/method_test.py:46
 #, python-format
 msgid "Module has no objects"
-msgstr ""
+msgstr "模块没有对象"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:49
 #, python-format
 msgid "Speed Test"
-msgstr ""
+msgstr "测试速度"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:54
 #, python-format
 msgid "The module does not contain the __openerp__.py file"
-msgstr ""
+msgstr "这个模块没包含__openerp__.py文件"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:82
@@ -90,7 +92,7 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Object Name"
-msgstr ""
+msgstr "对象名"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:54
@@ -98,7 +100,7 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:68
 #, python-format
 msgid "Ok"
-msgstr ""
+msgstr "确定"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:34
@@ -106,44 +108,44 @@ msgstr ""
 msgid ""
 "This test checks if the module satisfies the current coding standard used by "
 "OpenERP."
-msgstr ""
+msgstr "此测试检查该模块是否满足OpenERP目前的代码标准。"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "No report to save!"
-msgstr ""
+msgstr "没有保存的报告！"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of dependancy in %"
-msgstr ""
+msgstr "依赖的结果在 %s"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
 msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
-msgstr "只有模块已安装或如果测试能在已卸载的模块上运行, 测试才能完成."
+msgstr "如果模块已安装这测试才能完成或者这测试在已卸载的模块上运行。"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:99
 #, python-format
 msgid "Result (/10)"
-msgstr ""
+msgstr "结果(/10)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:33
 #, python-format
 msgid "Terp Test"
-msgstr ""
+msgstr "Terp测试"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:33
 #, python-format
 msgid "Object Test"
-msgstr ""
+msgstr "对象测试"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -161,31 +163,31 @@ msgstr "质量检查"
 #: code:addons/base_module_quality/speed_test/speed_test.py:128
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "无效"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:35
 #, python-format
 msgid "Unit Test"
-msgstr ""
+msgstr "单元测试"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "Reading Complexity"
-msgstr ""
+msgstr "复杂度"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:267
 #, python-format
 msgid "Result of pep8_test in %"
-msgstr ""
+msgstr "pep8_test测试的结果%s"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
@@ -196,18 +198,18 @@ msgstr "状态"
 #: code:addons/base_module_quality/unit_test/unit_test.py:50
 #, python-format
 msgid "Module does not have 'unit_test/test.py' file"
-msgstr ""
+msgstr "模块没有'unit_test/test.py'文件"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr "考虑"
+msgstr "估量"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of Security in %"
-msgstr ""
+msgstr "安全性结果%s"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -220,30 +222,30 @@ msgstr "一些测试比其他更重要, 所以它们在计算最终等级时占
 #: code:addons/base_module_quality/speed_test/speed_test.py:120
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "数据不足"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:132
 #, python-format
 msgid "Result (/1)"
-msgstr ""
+msgstr "结果(/1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N (Number of Records)"
-msgstr ""
+msgstr "N （记录的数量）"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:133
 #, python-format
 msgid "No data"
-msgstr ""
+msgstr "没有数据"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr ""
+msgstr "module.quality.detail"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
@@ -256,13 +258,13 @@ msgstr "保存报告"
 msgid ""
 "This test checks where object has workflow or not on it if there is a state "
 "field and several buttons on it and also checks validity of workflow xml file"
-msgstr ""
+msgstr "这个测试是检查对象的工作流是否出现一个状态字段几个按钮还检查工作流xml文件的有效性"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:151
 #, python-format
 msgid "Result in %"
-msgstr ""
+msgstr "结果%s"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
@@ -274,7 +276,7 @@ msgstr "普通记录"
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:88
 #, python-format
 msgid "No python file found"
-msgstr ""
+msgstr "找不到python文件"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:144
@@ -308,18 +310,20 @@ msgid ""
 "wished.\n"
 "</html>"
 msgstr ""
+"<html>O(1) 是指SQL请求数量不是依赖所看到的对象的数量。这是个希望有的特点\n"
+"</html>"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:120
 #, python-format
 msgid "__openerp__.py file"
-msgstr ""
+msgstr "__openerp__.py 文件"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:70
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -336,12 +340,15 @@ msgid ""
 "needed in order to run it.\n"
 "\n"
 msgstr ""
+"\n"
+"这个测试是检查模块的速度。注意至少5演示数据才能运行它。\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:71
 #, python-format
 msgid "Unable to parse the result. Check the details."
-msgstr ""
+msgstr "无法解析结果。请检查详情。"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:33
@@ -350,19 +357,21 @@ msgid ""
 "\n"
 "This test checks if the module satisfy tiny structure\n"
 msgstr ""
+"\n"
+"这个测试检查是否满足tiny模块结构\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:151
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "模块名"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:56
 #, python-format
 msgid "Error! Module is not properly loaded/installed"
-msgstr ""
+msgstr "错误！模块没有正确地加载/安装"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:116
@@ -374,13 +383,13 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:138
 #, python-format
 msgid "Score is below than minimal score(%s%%)"
-msgstr ""
+msgstr "分数低于最小值(%s%%)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N/2"
-msgstr ""
+msgstr "N/2"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:57
@@ -388,19 +397,19 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:71
 #, python-format
 msgid "Exception"
-msgstr ""
+msgstr "异常"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Test Is Not Implemented"
-msgstr ""
+msgstr "测试没有实现"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
@@ -411,7 +420,7 @@ msgstr "保存报告"
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "Feedback about structure of module"
-msgstr ""
+msgstr "关于模块结构的反馈"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:73
@@ -419,7 +428,7 @@ msgstr ""
 msgid ""
 "Given module has no objects.Speed test can work only when new objects are "
 "created in the module along with demo data"
-msgstr ""
+msgstr "所给的模块没有对象，速度测试只能在有测试数据下创建新对象实例的时候才能工作"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:32
@@ -429,18 +438,21 @@ msgid ""
 "of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
 " "
 msgstr ""
+"这个测试运用了Pylint来测试模块是否满足Python代码标准。详情请看http://www.logilab.org/project/name/pyli"
+"nt for further info.\n"
+" "
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Feed back About Workflow of Module"
-msgstr ""
+msgstr "关于模块工作流反馈"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:129
 #, python-format
 msgid "No Workflow define"
-msgstr ""
+msgstr "没有工作流定义"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
@@ -459,6 +471,8 @@ msgid ""
 "\n"
 "PEP-8 Test , copyright of py files check, method can not call from loops\n"
 msgstr ""
+"\n"
+"PEP- 8测试，检查py文件的版权，方法不能从循环中调用\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
@@ -470,13 +484,13 @@ msgstr "最终评分（%）"
 #, python-format
 msgid ""
 "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
-msgstr ""
+msgstr "错误。 pylint已正确安装？ （http://pypi.python.org/pypi/pylint）"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:125
 #, python-format
 msgid "Efficient"
-msgstr ""
+msgstr "高效"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
@@ -487,7 +501,7 @@ msgstr "相关模块"
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:33
 #, python-format
 msgid "Workflow Test"
-msgstr ""
+msgstr "工作流测试"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:36
@@ -498,6 +512,9 @@ msgid ""
 "'unit_test/test.py' is needed in module.\n"
 "\n"
 msgstr ""
+"\n"
+"这个测试检查模块的单元测试案例。注意模块里需要有'unit_test/test.py'\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:32
@@ -507,6 +524,8 @@ msgid ""
 "This test checks if the module classes are raising exception when calling "
 "basic methods or not.\n"
 msgstr ""
+"\n"
+"这个测试检查模块调用基本方法的时候是否提高几率触发异常\n"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
@@ -517,43 +536,43 @@ msgstr "详细信息"
 #: code:addons/base_module_quality/speed_test/speed_test.py:119
 #, python-format
 msgid "Warning! Not enough demo data"
-msgstr ""
+msgstr "警告！测试数据不足"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:31
 #, python-format
 msgid "Pylint Test"
-msgstr ""
+msgstr "Pylint测试"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:31
 #, python-format
 msgid "PEP-8 Test"
-msgstr ""
+msgstr "PEP-8测试"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
 #, python-format
 msgid "Field name"
-msgstr ""
+msgstr "字段名"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:132
 #, python-format
 msgid "Warning! Object has no demo data"
-msgstr ""
+msgstr "警告！对象没有测试数据"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:140
 #, python-format
 msgid "Tag Name"
-msgstr ""
+msgstr "标签名"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
@@ -579,11 +598,21 @@ msgid ""
 "using it, otherwise it may crash.\n"
 "    "
 msgstr ""
+"\n"
+"此模块用于对其他模块的编写质量提供一系列检查。\n"
+"\n"
+"此模块在模块界面山加了一个向导，打开此向导即可对选中的模块在编程规范、运行效率方面进行评估。\n"
+"\n"
+"此模块还为你定义自己的编程规范和质量标准提供了一个框架。\n"
+"更多信息，请参照本模块目录下的\\README.txt文件\n"
+"\n"
+"注意：该模块无法在zip包内运行，必须解压后才能使用，否则模块会崩溃。\n"
+"    "
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
 msgid "module.quality.check"
-msgstr ""
+msgstr "module.quality.check"
 
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
@@ -595,7 +624,7 @@ msgstr "名称"
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Result of views in %"
-msgstr ""
+msgstr "视图结果在%"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
@@ -611,19 +640,19 @@ msgstr "保存报告为 .HTML 格式"
 #: code:addons/base_module_quality/base_module_quality.py:269
 #, python-format
 msgid "The module has to be installed before running this test."
-msgstr ""
+msgstr "这个模块在运行测试前必须安装。"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:123
 #, python-format
 msgid "O(1)"
-msgstr ""
+msgstr "O(1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of fields in %"
-msgstr ""
+msgstr "字段结果在%"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:70
@@ -638,19 +667,19 @@ msgstr "概要"
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "文件的名称"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Line number"
-msgstr ""
+msgstr "行号"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:32
 #, python-format
 msgid "Structure Test"
-msgstr ""
+msgstr "结构测试"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
@@ -661,20 +690,18 @@ msgstr "质量"
 #: code:addons/base_module_quality/terp_test/terp_test.py:140
 #, python-format
 msgid "Feed back About terp file of Module"
-msgstr ""
-
-#~ msgid "wizard.quality.check"
-#~ msgstr "wizard.quality.check"
+msgstr "关于模块的terp文件反馈"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
 
-#~ msgid "quality.check.detail"
-#~ msgstr "quality.check.detail"
-
 #~ msgid "Base module quality"
 #~ msgstr "基本模块质量"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件!"
+
+#, python-format
+#~ msgid "Error in Read method"
+#~ msgstr "方法读取错误"
diff --git a/addons/base_module_quality/i18n/zh_TW.po b/addons/base_module_quality/i18n/zh_TW.po
index 95dbef2756d..83b04a1e63b 100644
--- a/addons/base_module_quality/i18n/zh_TW.po
+++ b/addons/base_module_quality/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -22,24 +22,24 @@ msgstr ""
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Suggestion"
-msgstr ""
+msgstr "建議"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Programming Error"
-msgstr ""
+msgstr "程式錯誤"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:31
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "方法測試"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality - To check the quality of other modules"
-msgstr ""
+msgstr "基礎模組品質 - 檢查其他模組之品質"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:34
@@ -53,30 +53,30 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:127
 #, python-format
 msgid "O(n) or worst"
-msgstr ""
+msgstr "O(n) 或 最差"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "略過"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:46
 #, python-format
 msgid "Module has no objects"
-msgstr ""
+msgstr "模組無物件"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:49
 #, python-format
 msgid "Speed Test"
-msgstr ""
+msgstr "速度測試"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:54
 #, python-format
 msgid "The module does not contain the __openerp__.py file"
-msgstr ""
+msgstr "模組未包含 __openerp__.py 檔"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:82
@@ -89,7 +89,7 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Object Name"
-msgstr ""
+msgstr "物件名稱"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:54
@@ -130,49 +130,49 @@ msgstr ""
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:99
 #, python-format
 msgid "Result (/10)"
-msgstr ""
+msgstr "結果 (/10)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:33
 #, python-format
 msgid "Terp Test"
-msgstr ""
+msgstr "Terp 測試"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:33
 #, python-format
 msgid "Object Test"
-msgstr ""
+msgstr "物件測試"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "儲存報告"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/module_quality_check.py:46
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 #, python-format
 msgid "Quality Check"
-msgstr ""
+msgstr "品質檢查"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:128
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "無效率"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:35
 #, python-format
 msgid "Unit Test"
-msgstr ""
+msgstr "單元測試"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
@@ -195,7 +195,7 @@ msgstr ""
 #: code:addons/base_module_quality/unit_test/unit_test.py:50
 #, python-format
 msgid "Module does not have 'unit_test/test.py' file"
-msgstr ""
+msgstr "模組無 'unit_test/test.py' 檔"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
@@ -219,25 +219,25 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:120
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "資料不足"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:132
 #, python-format
 msgid "Result (/1)"
-msgstr ""
+msgstr "結果 (/1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N (Number of Records)"
-msgstr ""
+msgstr "N (紀錄數量)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:133
 #, python-format
 msgid "No data"
-msgstr ""
+msgstr "無資料"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
@@ -247,7 +247,7 @@ msgstr ""
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "儲存報告"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:34
@@ -266,14 +266,14 @@ msgstr ""
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "標準項目"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:58
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:88
 #, python-format
 msgid "No python file found"
-msgstr ""
+msgstr "找不到 python 檔"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:144
@@ -281,22 +281,22 @@ msgstr ""
 #: view:module.quality.detail:0
 #, python-format
 msgid "Result"
-msgstr ""
+msgstr "結果"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "訊息"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Detail"
-msgstr ""
+msgstr "詳情"
 
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "備註"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:85
@@ -312,19 +312,19 @@ msgstr ""
 #: code:addons/base_module_quality/terp_test/terp_test.py:120
 #, python-format
 msgid "__openerp__.py file"
-msgstr ""
+msgstr "__openerp__.py 檔"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:70
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "狀態"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "測試"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:50
@@ -355,7 +355,7 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "模組名稱"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:56
@@ -387,7 +387,7 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:71
 #, python-format
 msgid "Exception"
-msgstr ""
+msgstr "異常情況"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:100
@@ -404,7 +404,7 @@ msgstr ""
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "報告儲存"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
@@ -439,17 +439,17 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:129
 #, python-format
 msgid "No Workflow define"
-msgstr ""
+msgstr "未定義流程"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:32
@@ -462,7 +462,7 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "最後分數 (%)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:61
@@ -475,7 +475,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:125
 #, python-format
 msgid "Efficient"
-msgstr ""
+msgstr "有效率"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
@@ -486,7 +486,7 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:33
 #, python-format
 msgid "Workflow Test"
-msgstr ""
+msgstr "流程測試"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:36
@@ -510,31 +510,31 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "詳情"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:119
 #, python-format
 msgid "Warning! Not enough demo data"
-msgstr ""
+msgstr "警告! 演示資料不足"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:31
 #, python-format
 msgid "Pylint Test"
-msgstr ""
+msgstr "Pylint 測試"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:31
 #, python-format
 msgid "PEP-8 Test"
-msgstr ""
+msgstr "PEP-8 測試"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
 #, python-format
 msgid "Field name"
-msgstr ""
+msgstr "欄位名稱"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:151
@@ -546,18 +546,18 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:132
 #, python-format
 msgid "Warning! Object has no demo data"
-msgstr ""
+msgstr "警告! 物件無演示資料"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:140
 #, python-format
 msgid "Tag Name"
-msgstr ""
+msgstr "標記名稱"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "檔案名稱"
 
 #. module: base_module_quality
 #: model:ir.module.module,description:base_module_quality.module_meta_information
@@ -587,7 +587,7 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "名稱"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:177
@@ -599,12 +599,12 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "分數 (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "將報告存為 .html 格式"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:269
@@ -630,14 +630,14 @@ msgstr ""
 #: field:module.quality.detail,summary:0
 #, python-format
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:99
 #: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "檔案名稱"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:274
@@ -649,12 +649,12 @@ msgstr ""
 #: code:addons/base_module_quality/structure_test/structure_test.py:32
 #, python-format
 msgid "Structure Test"
-msgstr ""
+msgstr "結構測試"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
 msgid "Quality"
-msgstr ""
+msgstr "品質"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:140
diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index 9e836ec9d0e..8b6f1157a29 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -19,28 +19,25 @@
 #
 ##############################################################################
 
-import os
-
-import wizard
 from tools.translate import _
-import pooler
 from osv import osv, fields
 
-class quality_check(wizard.interface):
+class quality_check(osv.osv_memory):
+    _name = "quality.check"
+    _description = "Module Quality Check"
 
-    def _create_quality_check(self, cr, uid, data, context=None):
-        pool = pooler.get_pool(cr.dbname)
-        obj_quality = pool.get('module.quality.check')
-        objs = []
-        for id in data['ids']:
-            module_data = pool.get('ir.module.module').browse(cr, uid, id)
-            data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
-            obj = obj_quality.create(cr, uid, data, context)
-            objs.append(obj)
-        return objs
+    def _create_quality_check(self, cr, uid, ids, context=None):
+        obj_quality = self.pool.get('module.quality.check')
+        objs_ids = []
+        module_id = context.get('active_id', False)
+        module_data = self.pool.get('ir.module.module').browse(cr, uid, module_id, context=context)
+        data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
+        obj = obj_quality.create(cr, uid, data, context=context)
+        objs_ids.append(obj)
+        return objs_ids
 
-    def _open_quality_check(self, cr, uid, data, context):
-        obj_ids = self._create_quality_check(cr, uid, data, context)
+    def open_quality_check(self, cr, uid, ids, context=None):
+        obj_ids = self._create_quality_check(cr, uid, ids, context=context)
         return {
             'domain': "[('id','in', ["+','.join(map(str,obj_ids))+"])]",
             'name': _('Quality Check'),
@@ -49,14 +46,7 @@ class quality_check(wizard.interface):
             'res_model': 'module.quality.check',
             'type': 'ir.actions.act_window'
             }
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result': {'type':'action', 'action':_open_quality_check, 'state':'end'}
-        }
-    }
-
-quality_check("create_quality_check_wiz")
+        
+quality_check()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/wizard/module_quality_check_view.xml b/addons/base_module_quality/wizard/module_quality_check_view.xml
new file mode 100644
index 00000000000..d5ce83d9612
--- /dev/null
+++ b/addons/base_module_quality/wizard/module_quality_check_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_base_module_quality" model="ir.ui.view">
+            <field name="name">view_base_module_quality_form</field>
+            <field name="model">quality.check</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Quality Check">
+                    <group colspan="4">
+                        <separator string = "This wizard will check module(s) quality" colspan="4"/>
+                        <newline/>
+                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
+                        <button name="open_quality_check" icon="terp-camera_test" string="Check" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <act_window
+            name="Quality Check"
+            id="act_base_module_quality"
+            res_model="quality.check"
+            src_model="ir.module.module"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            />
+    </data>
+</openerp>
diff --git a/addons/base_module_quality/wizard/quality_save_report.py b/addons/base_module_quality/wizard/quality_save_report.py
index 7d03338e623..e4286e92237 100644
--- a/addons/base_module_quality/wizard/quality_save_report.py
+++ b/addons/base_module_quality/wizard/quality_save_report.py
@@ -22,40 +22,31 @@
 import base64
 import cStringIO
 
-import wizard
 from osv import osv
-import pooler
 from tools.translate import _
+from osv import osv, fields
 
-form_rep = '''<?xml version="1.0"?>
-<form string="Standard entries">
-    <field name="name"/>
-    <newline/>
-    <field name="module_file"/>
-</form>'''
+class quality_save_report(osv.osv_memory):
 
+    _name = "save.report"
+    _description = "Save Report of Quality"
 
-fields_rep = {
-  'name': {'string': 'File name', 'type': 'char', 'required': True, 'help': 'Save report as .html format', 'size':64},
-  'module_file': {'string': 'Save report', 'type': 'binary', 'required': True},
-}
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(quality_save_report, self).default_get(cr, uid, fields, context=context)
+        active_ids = context.get('active_ids')
+        data = self.pool.get('module.quality.detail').browse(cr, uid, active_ids, context=context)[0]
+        if not data.detail:
+            raise osv.except_osv(_('Warning'), _('No report to save!'))
+        buf = cStringIO.StringIO(data.detail)
+        out = base64.encodestring(buf.getvalue())
+        buf.close()
+        return {'module_file': out, 'name': data.name + '.html'}
 
-def get_detail(self, cr, uid, datas, context=None):
-    data = pooler.get_pool(cr.dbname).get('module.quality.detail').browse(cr, uid, datas['id'])
-    if not data.detail:
-        raise wizard.except_wizard(_('Warning'), _('No report to save!'))
-    buf = cStringIO.StringIO(data.detail)
-    out = base64.encodestring(buf.getvalue())
-    buf.close()
-    return {'module_file': out, 'name': data.name + '.html'}
-
-class save_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [get_detail],
-            'result': {'type': 'form', 'arch': form_rep, 'fields':fields_rep, 'state': [('end','Cancel')]}
-        },
+    _columns = {
+        'name': fields.char('File Name', required=True, size=32, help="Save report as .html format"),
+        'module_file': fields.binary('Save report', required=True),
     }
-save_report('quality_detail_save')
+
+quality_save_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/wizard/quality_save_report_view.xml b/addons/base_module_quality/wizard/quality_save_report_view.xml
new file mode 100644
index 00000000000..89593b68742
--- /dev/null
+++ b/addons/base_module_quality/wizard/quality_save_report_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_quality_save_report" model="ir.ui.view">
+            <field name="name">view_quality_save_report</field>
+            <field name="model">save.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Standard Entries">
+                    <field name="name"/>
+                    <newline/>
+                    <field name="module_file"/>
+                    <separator colspan="4"/>
+                    <label string=" " colspan="2"/>
+                    <button special="cancel" string="Close" icon="gtk-close"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_view_quality_save_report">
+            <field name="name">Standard Entries</field>
+            <field name="res_model">save.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="target">new</field>
+            <field name="view_id" ref="view_quality_save_report"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index fdb576e0ddd..3e1cf79792a 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Module Record',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module allows you to create a new module without any development.
 ======================================================================
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 0208e6cdc37..af63a0cf369 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -104,7 +104,8 @@ class base_module_record(osv.osv):
         for key,val in data.items():
             if not (val or (fields[key]['type']=='boolean')):
                 continue
-            if fields[key]['type'] in ('integer','float'):
+            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' )
diff --git a/addons/base_module_record/i18n/ar.po b/addons/base_module_record/i18n/ar.po
index 44ea36ccc9b..97255f43892 100644
--- a/addons/base_module_record/i18n/ar.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/bg.po b/addons/base_module_record/i18n/bg.po
index 5981efcada2..6410545b8f9 100644
--- a/addons/base_module_record/i18n/bg.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/bs.po b/addons/base_module_record/i18n/bs.po
index 44ea36ccc9b..97255f43892 100644
--- a/addons/base_module_record/i18n/bs.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/ca.po b/addons/base_module_record/i18n/ca.po
index fbd34fe48a9..fea46983b8a 100644
--- a/addons/base_module_record/i18n/ca.po
+++ b/addons/base_module_record/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: 2011-05-27 04:46+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/cs.po b/addons/base_module_record/i18n/cs.po
index 44ea36ccc9b..270ce30a85a 100644
--- a/addons/base_module_record/i18n/cs.po
+++ b/addons/base_module_record/i18n/cs.po
@@ -4,27 +4,28 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-09 10:24+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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Information"
-msgstr ""
+msgstr "Informace"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -33,54 +34,57 @@ msgid ""
 "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'."
 
 #. 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 ""
+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 ""
+msgstr "Vyberte objekt pro zaznamenání"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+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 ""
+msgstr "Piouze záznam"
 
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Ukázková data"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "Jméno souboru"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Verze"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,info:0
@@ -88,13 +92,13 @@ msgstr ""
 #: 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 ""
+msgstr "Zaznamenávání objektů"
 
 #. 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 ""
+msgstr "Záznam od data"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,end:0
@@ -103,170 +107,170 @@ msgstr ""
 #: 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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "Plný popis"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,name:0
 msgid "Module Name"
-msgstr ""
+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 ""
+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 ""
+msgstr ".ZIP soubor modulu"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Module successfully created !"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "Zaznamenávat"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 msgid "Module Record"
-msgstr ""
+msgstr "Záznam modulu"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,info,save:0
 msgid "Continue"
-msgstr ""
+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 ""
+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 ""
+msgstr "Chyba"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+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 ""
+msgstr "OK"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+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 ""
+msgstr "Typ dat"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,info:0
 msgid "Module Information"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "Vytvořeno & upraveno"
 
 #. module: base_module_record
 #: model:ir.module.module,description:base_module_record.module_meta_information
@@ -292,3 +296,25 @@ msgid ""
 "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/de.po b/addons/base_module_record/i18n/de.po
index 22f0ad0936e..db5299b77df 100644
--- a/addons/base_module_record/i18n/de.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -397,12 +397,3 @@ msgstr ""
 
 #~ msgid "Stop Recording"
 #~ msgstr "Aufnahme stoppen"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
index 8853c625d99..212e0a5797f 100644
--- a/addons/base_module_record/i18n/el.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
index 38117db8f04..983e97c93a6 100644
--- a/addons/base_module_record/i18n/es.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -391,12 +391,3 @@ msgstr ""
 
 #~ msgid "Stop Recording"
 #~ msgstr "Detener la grabación"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/base_module_record/i18n/es_AR.po b/addons/base_module_record/i18n/es_AR.po
index e79e3cbe8af..efe88ba05a8 100644
--- a/addons/base_module_record/i18n/es_AR.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/es_EC.po b/addons/base_module_record/i18n/es_EC.po
index 01ce5e38884..301d549292e 100644
--- a/addons/base_module_record/i18n/es_EC.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/es_MX.po b/addons/base_module_record/i18n/es_MX.po
new file mode 100644
index 00000000000..96a06c0aaa4
--- /dev/null
+++ b/addons/base_module_record/i18n/es_MX.po
@@ -0,0 +1,393 @@
+# 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
index 9c84db9ee8a..ad442303aa0 100644
--- a/addons/base_module_record/i18n/es_PY.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/es_VE.po b/addons/base_module_record/i18n/es_VE.po
new file mode 100644
index 00000000000..96a06c0aaa4
--- /dev/null
+++ b/addons/base_module_record/i18n/es_VE.po
@@ -0,0 +1,393 @@
+# 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
index fd7970893fd..69286c19197 100644
--- a/addons/base_module_record/i18n/et.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/fi.po b/addons/base_module_record/i18n/fi.po
index 7f73683b5d3..903c757c160 100644
--- a/addons/base_module_record/i18n/fi.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -39,7 +39,7 @@ msgstr ""
 #: 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 ""
+msgstr "Loppu"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,init:0
@@ -153,13 +153,13 @@ 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 ""
+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 ""
+msgstr "Tulos, liitä tämä moduulisi xml:ään!"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_data,init,filter_cond:0
@@ -204,13 +204,13 @@ msgstr "Jatka"
 #: 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 ""
+msgstr "Vie kustomoinnin datatiedostona"
 
 #. module: base_module_record
 #: code:addons/base_module_record/wizard/base_module_save.py:129
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
@@ -248,7 +248,7 @@ msgstr ""
 #: 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 ""
+msgstr "Tulos"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,init,end:0
diff --git a/addons/base_module_record/i18n/fr.po b/addons/base_module_record/i18n/fr.po
index c08ef983776..66527897cbb 100644
--- a/addons/base_module_record/i18n/fr.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/gl.po b/addons/base_module_record/i18n/gl.po
index 5394531c00a..a37fbf79dfc 100644
--- a/addons/base_module_record/i18n/gl.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/hr.po b/addons/base_module_record/i18n/hr.po
index f2ebfa31bb4..e3f34e9003d 100644
--- a/addons/base_module_record/i18n/hr.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/hu.po b/addons/base_module_record/i18n/hu.po
index 8343830487d..3794b1d0f52 100644
--- a/addons/base_module_record/i18n/hu.po
+++ b/addons/base_module_record/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-31 13:25+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/id.po b/addons/base_module_record/i18n/id.po
index 6c0a67a1d58..999ccd88194 100644
--- a/addons/base_module_record/i18n/id.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/it.po b/addons/base_module_record/i18n/it.po
index 9fd3e3686bb..3ad0ad091a4 100644
--- a/addons/base_module_record/i18n/it.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -394,12 +394,3 @@ msgstr ""
 
 #~ msgid "Stop Recording"
 #~ msgstr "Ferma Registrazione"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non puoi creare un Menu ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/base_module_record/i18n/ko.po b/addons/base_module_record/i18n/ko.po
index a0325b814a1..698099b588c 100644
--- a/addons/base_module_record/i18n/ko.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/lt.po b/addons/base_module_record/i18n/lt.po
index 8b2fe864286..51dce30829d 100644
--- a/addons/base_module_record/i18n/lt.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po
index ccf60e0a337..2139226fe39 100644
--- a/addons/base_module_record/i18n/nl.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -389,12 +389,3 @@ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Fout! U kunt geen recursief menu maken."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/base_module_record/i18n/nl_BE.po b/addons/base_module_record/i18n/nl_BE.po
index 85fbc6edfc5..c46f8cdc377 100644
--- a/addons/base_module_record/i18n/nl_BE.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/pl.po b/addons/base_module_record/i18n/pl.po
index 5cee641fd26..f4a09a03eb2 100644
--- a/addons/base_module_record/i18n/pl.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/pt.po b/addons/base_module_record/i18n/pt.po
index 90592ce56b2..a686211e101 100644
--- a/addons/base_module_record/i18n/pt.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -369,12 +369,3 @@ msgstr ""
 
 #~ msgid "Stop Recording"
 #~ msgstr "Parar Gravação"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/base_module_record/i18n/pt_BR.po b/addons/base_module_record/i18n/pt_BR.po
index 350836b7344..dc7cd033dd5 100644
--- a/addons/base_module_record/i18n/pt_BR.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -388,12 +388,3 @@ msgstr ""
 
 #~ msgid "Stop Recording"
 #~ msgstr "Parar gravação"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/base_module_record/i18n/ro.po b/addons/base_module_record/i18n/ro.po
index 29250c0b5ab..4f7fa0adbd4 100644
--- a/addons/base_module_record/i18n/ro.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -370,12 +370,3 @@ msgstr ""
 
 #~ msgid "Module Recorder"
 #~ msgstr "Modul înregistrator"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Eroare ! Nu este posibilă crearea unui meniu recursiv."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index d1973b78aeb..e82198cf74a 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sk.po b/addons/base_module_record/i18n/sk.po
index ab8e7d3ca05..a2c535c21b6 100644
--- a/addons/base_module_record/i18n/sk.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sl.po b/addons/base_module_record/i18n/sl.po
index 708754d0a4c..f3a608479f2 100644
--- a/addons/base_module_record/i18n/sl.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sq.po b/addons/base_module_record/i18n/sq.po
index 4674f9a04b7..5461f5db373 100644
--- a/addons/base_module_record/i18n/sq.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
index 427a5529fee..22e43959ff0 100644
--- a/addons/base_module_record/i18n/sr.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -367,6 +367,3 @@ msgstr ""
 
 #~ msgid "Stop Recording"
 #~ msgstr "Zaustavi Snimanje"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/base_module_record/i18n/sr@latin.po b/addons/base_module_record/i18n/sr@latin.po
index 9f4531b2b14..5f8f765a1d5 100644
--- a/addons/base_module_record/i18n/sr@latin.po
+++ b/addons/base_module_record/i18n/sr@latin.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-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 10:53+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-05 13:53+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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
 msgid "Category"
-msgstr "Категорија"
+msgstr "Kategorija"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Information"
-msgstr "Informacija"
+msgstr "Informacije"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -34,9 +34,9 @@ msgid ""
 "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' ."
+"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' ."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,info,end:0
@@ -48,7 +48,7 @@ msgstr "Kraj"
 #: 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"
+msgstr "Izaberi stavke za čuvanje"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,author:0
@@ -58,13 +58,13 @@ msgstr "Autor"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,directory_name:0
 msgid "Directory Name"
-msgstr "Ime Direktorijuma"
+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"
+msgstr "Samo zapisi"
 
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
@@ -74,12 +74,12 @@ msgstr "ir.module.record"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Demo Data"
-msgstr "Demo Podaci"
+msgstr "Demo podaci"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 msgid "Filename"
-msgstr "Ime Fajla"
+msgstr "Ime datoteke"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,version:0
@@ -92,7 +92,7 @@ msgstr "Verzija"
 #: 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"
+msgstr "Zapisi stavki"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,check_date:0
@@ -107,29 +107,29 @@ msgstr "Zapis od Datuma"
 #: 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"
+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 Podesavanja kao Modul"
+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 unaprijed na Vašem Doprinosu"
+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 "Lista Objekata za zapis"
+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"
+msgstr "Puni opis"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,name:0
@@ -140,63 +140,63 @@ msgstr "Naziv Modula"
 #: 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"
+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"
+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 !"
+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 fajl je uspesno kreiran !"
+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,  zalepi ovo u tvoj xml modul"
+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 "Kreirano"
+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 Snimač Modula"
+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 Dokumentacije"
+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 "Izmenjen"
+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 "Snima"
+msgstr "Zapis"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 msgid "Module Record"
-msgstr "Snimanje Modula"
+msgstr "Zapisivanje modula"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,info,save:0
@@ -207,13 +207,13 @@ msgstr "Nastavi"
 #: 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"
+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 "Greska"
+msgstr "Greška"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
@@ -224,12 +224,12 @@ msgstr "Obični podaci"
 #: 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"
+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"
+msgstr "Pravljenje Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,data_kind:0
@@ -239,7 +239,7 @@ msgstr "Tip Podataka"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,info:0
 msgid "Module Information"
-msgstr "Informacija o Modulu"
+msgstr "Informacija o modulu"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,info_yaml:0
@@ -296,9 +296,26 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+"\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"
+"    "
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/base_module_record/i18n/sv.po b/addons/base_module_record/i18n/sv.po
index 51577a94987..12e85bad088 100644
--- a/addons/base_module_record/i18n/sv.po
+++ b/addons/base_module_record/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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -303,12 +303,3 @@ msgstr ""
 
 #~ msgid "Module Recorder"
 #~ msgstr "Module Recorder"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/base_module_record/i18n/tlh.po b/addons/base_module_record/i18n/tlh.po
index 8cf03099ca0..c14b7092c5b 100644
--- a/addons/base_module_record/i18n/tlh.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 8f26d2fc81d..1b2ec6608c4 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/uk.po b/addons/base_module_record/i18n/uk.po
index 7ebd7f898e6..90e558830dd 100644
--- a/addons/base_module_record/i18n/uk.po
+++ b/addons/base_module_record/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
diff --git a/addons/base_module_record/i18n/vi.po b/addons/base_module_record/i18n/vi.po
index ae40f98892c..1c8beb7d1d0 100644
--- a/addons/base_module_record/i18n/vi.po
+++ b/addons/base_module_record/i18n/vi.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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Phân loại"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Information"
-msgstr ""
+msgstr "Thông tin"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -39,7 +39,7 @@ msgstr ""
 #: 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 ""
+msgstr "Kết thúc"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,init:0
@@ -50,12 +50,12 @@ msgstr ""
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Tác giả"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "Tên thư mục"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,filter_cond:0
@@ -66,22 +66,22 @@ msgstr ""
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+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 ""
+msgstr "Tên tập tin"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Phiên bản"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,info:0
@@ -95,7 +95,7 @@ msgstr ""
 #: 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 ""
+msgstr "Bản ghi từ Ngày"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,end:0
@@ -126,29 +126,29 @@ msgstr ""
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "Mô tả đầy đủ"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,name:0
 msgid "Module Name"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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
@@ -165,7 +165,7 @@ msgstr ""
 #: 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 ""
+msgstr "Đã tạo"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,end:0
@@ -182,13 +182,13 @@ msgstr ""
 #: 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 ""
+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 ""
+msgstr "Ghi"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
@@ -198,7 +198,7 @@ msgstr ""
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,info,save:0
 msgid "Continue"
-msgstr ""
+msgstr "Tiếp tục"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
@@ -210,18 +210,18 @@ msgstr ""
 #: code:addons/base_module_record/wizard/base_module_save.py:129
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Lỗi"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+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 ""
+msgstr "Đồng ý"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
@@ -231,18 +231,18 @@ msgstr ""
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "Loại dữ liệu"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,info:0
 msgid "Module Information"
-msgstr ""
+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 ""
+msgstr "YAML"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,info,res_text:0
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
index 18b479b71c8..03cf9e2b972 100644
--- a/addons/base_module_record/i18n/zh_CN.po
+++ b/addons/base_module_record/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-08-03 02:29+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
@@ -33,12 +33,14 @@ msgid ""
 "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这"
+"个模块来发布"
 
 #. 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 ""
+msgstr "结束"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,init:0
@@ -65,7 +67,7 @@ msgstr "只记录"
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
@@ -152,13 +154,13 @@ msgstr "模块已成功创建！"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save_yaml:0
 msgid "YAML file successfully created !"
-msgstr ""
+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 ""
+msgstr "结果，粘贴这个到你的模块的xml文件里面"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_data,init,filter_cond:0
@@ -192,29 +194,29 @@ msgstr "记录"
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 msgid "Module Record"
-msgstr ""
+msgstr "Module Record"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,info,save:0
 msgid "Continue"
-msgstr "继续"
+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 ""
+msgstr "导出自定义配置到数据文件"
 
 #. module: base_module_record
 #: code:addons/base_module_record/wizard/base_module_save.py:129
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Normal Data"
-msgstr "一般数据"
+msgstr "普通数据"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,end,end:0
@@ -241,13 +243,13 @@ msgstr "模块信息"
 #: 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 ""
+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 ""
+msgstr "结果"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,init,end:0
@@ -292,6 +294,16 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"这个模块可以让你不通过代码开发就创建一个新模块。\n"
+"它会记录你在操作中对象的所有的操作和变量的产生\n"
+"并生成一个.ZIP模块文件。所以你可以直接用OpenERP\n"
+"客户端来创建模块。\n"
+"\n"
+"如何使用它：\n"
+"运行管理/自定义/创建模块/把自定义设置导出为模块向导。\n"
+"选择录制和被录制的对象和记录模块中的日期时间标准。\n"
+"    "
 
 #~ msgid "Status"
 #~ msgstr "状态"
@@ -309,48 +321,6 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
-#~ 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 Open ERP 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"
-#~ "1. Start the recording\n"
-#~ "2. Do stuff in your Open ERP client\n"
-#~ "3. Stop the recording session\n"
-#~ "4. Export to a reusable module\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "这模块允许你创建你的模块和发展\n"
-#~ "    它记录在会话周期的所有对象操作\n"
-#~ "和产生一个zip模块\n"
-#~ "所以你可以在系统的客户端创建自己的模块.\n"
-#~ "    \n"
-#~ "版本的创建和更新时重新计算的\n"
-#~ "依赖关系和所有关系类型(many2one, many2many, ...).\n"
-#~ "它也支持工作流和demo和测试数据.\n"
-#~ "\n"
-#~ "    这有助你简化创建可再重用和发布自定义模块\n"
-#~ "自定义配置和示范或测试数据.\n"
-#~ "    \n"
-#~ "    如何使用?\n"
-#~ "    1.开始记录\n"
-#~ "    2.在你的客户端完成操作\n"
-#~ "    3.停止记录会话\n"
-#~ "    4.导出一个可重用的模块\n"
-#~ "    "
-
 #~ msgid "Start Recording"
 #~ msgstr "开始记录"
 
diff --git a/addons/base_module_record/i18n/zh_TW.po b/addons/base_module_record/i18n/zh_TW.po
index 7cb612343bc..06329f83037 100644
--- a/addons/base_module_record/i18n/zh_TW.po
+++ b/addons/base_module_record/i18n/zh_TW.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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 msgid "Information"
-msgstr ""
+msgstr "資訊"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -38,7 +38,7 @@ msgstr ""
 #: 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 ""
+msgstr "結束"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,init:0
@@ -49,12 +49,12 @@ msgstr ""
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "目錄名稱"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,filter_cond:0
@@ -70,17 +70,17 @@ msgstr ""
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "演示資料"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "檔案名稱"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "版本"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,info:0
@@ -125,24 +125,24 @@ msgstr ""
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "完整說明"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,name:0
 msgid "Module Name"
-msgstr ""
+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 ""
+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 ""
+msgstr "模組 .zip 檔"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -181,7 +181,7 @@ msgstr ""
 #: 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 ""
+msgstr "已修改"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,init,record:0
@@ -197,7 +197,7 @@ msgstr ""
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,info,save:0
 msgid "Continue"
-msgstr ""
+msgstr "繼續"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
@@ -214,7 +214,7 @@ msgstr ""
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "正常資料"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,end,end:0
@@ -230,12 +230,12 @@ msgstr ""
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "資料類型"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,info:0
 msgid "Module Information"
-msgstr ""
+msgstr "模組資訊"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,info_yaml:0
@@ -247,20 +247,20 @@ msgstr ""
 #: 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 ""
+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 ""
+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 ""
+msgstr "關閉"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_data,init,filter_cond:0
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 6c0a01f78fd..5e8bed72d03 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Statistical Report Creator',
+    'name': 'Query Builder',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "expert",
     'description': """
 This module allows you to create any statistic report on several objects.
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 29699b9000d..75bd149186a 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -247,7 +247,10 @@ class report_creator(osv.osv):
             #End Loop
         return {'datas': final_datas}
 
-
+    def unlink(self, cr, uid, ids, context=None):
+        menu_ids = [report.menu_id.id for report in self.browse(cr, uid, ids, context) if report.menu_id]
+        self.pool.get('ir.ui.menu').unlink(cr, uid, menu_ids, context=context)
+        return super(report_creator, self).unlink(cr, uid, ids, context=context)
     def _path_get(self, cr, uid, models, filter_ids=[]):
         """
         @param cr: the current row, from the database cursor,
@@ -529,7 +532,7 @@ class report_creator(osv.osv):
 
 
     _constraints = [
-        (_function_field, 'You can not display field which are not stored in Database.', ['field_ids']),
+        (_function_field, 'You can not display field which are not stored in database.', ['field_ids']),
         (_aggregation_error, 'You can apply aggregate function to the non calculated field.', ['field_ids']),
         (_calander_view_error, "You must have to give calendar view's color,start date and delay.", ['field_ids']),
     ]
diff --git a/addons/base_report_creator/i18n/ar.po b/addons/base_report_creator/i18n/ar.po
index ed67a94e781..a05033a899a 100644
--- a/addons/base_report_creator/i18n/ar.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/bg.po b/addons/base_report_creator/i18n/bg.po
index 8f8eeb4d545..a00e3500c73 100644
--- a/addons/base_report_creator/i18n/bg.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Справка"
 
diff --git a/addons/base_report_creator/i18n/bs.po b/addons/base_report_creator/i18n/bs.po
index 42e88a4ced9..72003cac91e 100644
--- a/addons/base_report_creator/i18n/bs.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/ca.po b/addons/base_report_creator/i18n/ca.po
index f9d450187f6..cdced797d13 100644
--- a/addons/base_report_creator/i18n/ca.po
+++ b/addons/base_report_creator/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: 2011-05-27 04:46+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
diff --git a/addons/base_report_creator/i18n/cs.po b/addons/base_report_creator/i18n/cs.po
index ed67a94e781..a05033a899a 100644
--- a/addons/base_report_creator/i18n/cs.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/de.po b/addons/base_report_creator/i18n/de.po
index 933fa0c7119..cea29095f31 100644
--- a/addons/base_report_creator/i18n/de.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Graphikmodus"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Individuelle Reports"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Nicht verbundene Module"
@@ -192,6 +192,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Bericht"
 
@@ -574,19 +575,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Durch De-Aktivierung können Sie diese Auswertung verbergen, ohne den Report "
-#~ "zu löschen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_report_creator/i18n/el.po b/addons/base_report_creator/i18n/el.po
index 5eb6a7164bb..15aa2ce2c79 100644
--- a/addons/base_report_creator/i18n/el.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -56,7 +56,7 @@ msgid "Graph Mode"
 msgstr "Mode Γραφήματος"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -127,7 +127,7 @@ msgid "Custom Reports"
 msgstr "Ειδικές Αναφορές"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Δεν υπάρχουν Σχετικά Μοντέλα!!"
@@ -194,6 +194,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Αναφορά"
 
diff --git a/addons/base_report_creator/i18n/es.po b/addons/base_report_creator/i18n/es.po
index 013b799e49c..21bbb105f69 100644
--- a/addons/base_report_creator/i18n/es.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -54,7 +54,7 @@ msgid "Graph Mode"
 msgstr "Modo de gráfico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -127,7 +127,7 @@ msgid "Custom Reports"
 msgstr "Informes personalizados"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "¡No existen modelos relacionados!"
@@ -192,6 +192,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Informe"
 
@@ -573,18 +574,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el informe sin eliminarlo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/base_report_creator/i18n/es_AR.po b/addons/base_report_creator/i18n/es_AR.po
index 239d681d8cb..c5811817bdf 100644
--- a/addons/base_report_creator/i18n/es_AR.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr "Modo de gráfico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -123,7 +123,7 @@ msgid "Custom Reports"
 msgstr "Reportes personalizados"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "¡No existen modelos relacionados!"
@@ -188,6 +188,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Reporte"
 
diff --git a/addons/base_report_creator/i18n/es_EC.po b/addons/base_report_creator/i18n/es_EC.po
index cd81fb83b71..b85a20fdffc 100644
--- a/addons/base_report_creator/i18n/es_EC.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -54,7 +54,7 @@ msgid "Graph Mode"
 msgstr "Modo gráfico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -125,7 +125,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -190,6 +190,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/es_MX.po b/addons/base_report_creator/i18n/es_MX.po
new file mode 100644
index 00000000000..4aa569539b1
--- /dev/null
+++ b/addons/base_report_creator/i18n/es_MX.po
@@ -0,0 +1,576 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_report_creator
+#
+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-09 10:47+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:34+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.filter,expression:0
+msgid ""
+"Provide an expression for the field based on which you want to filter the "
+"records.\n"
+" e.g. res_partner.id=3"
+msgstr ""
+"Introduzca una expresión para el campo basada en como desea filtrar los "
+"registros.\n"
+" Por ejemplo res_partner.id=3"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_report_menu_create
+msgid "Menu Create"
+msgstr "Crear menú"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_type:0
+msgid "Graph Type"
+msgstr "Tipo gráfico"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Used View"
+msgstr "Vista utilizada"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Filter Values"
+msgstr "Valores filtro"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,graph_mode:0
+msgid "Graph Mode"
+msgstr "Modo de gráfico"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
+msgstr ""
+"Hay modelo(s) (%s) en la selección que no están relacionados con ningún otro "
+"modelo"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Graph View"
+msgstr "Vista gráfico"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,expression:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: base_report_creator
+#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
+msgid "Set Filter Fields"
+msgstr "Fijar campos de filtrado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
+msgid "Report Filters"
+msgstr "Filtros informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,sql_query:0
+msgid "SQL Query"
+msgstr "Interrogación SQL"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: view:report.menu.create:0
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Minimum"
+msgstr "Mínimo"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "OR"
+msgstr "O"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
+msgid "Custom Reports"
+msgstr "Informes personalizados"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid "No Related Models!!"
+msgstr "¡No existen modelos relacionados!"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Sum"
+msgstr "Suma"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr "Debe indicar color, fecha inicial y retraso de la vista calendario."
+
+#. module: base_report_creator
+#: field:base_report_creator.report,model_ids:0
+msgid "Reported Objects"
+msgstr "Objectos de informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Field List"
+msgstr "Lista de campos"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,type:0
+msgid "Report Type"
+msgstr "Tipo de informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Add filter"
+msgstr "Añadir filtro"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
+msgid "Create Menu for Report"
+msgstr "Crear menú para el informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Form"
+msgstr "Formulario"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+#: selection:base_report_creator.report.fields,calendar_mode:0
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "/"
+msgstr "/"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report.fields,report_id:0
+#: field:base_report_creator.report.filter,report_id:0
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
+msgid "Report"
+msgstr "Informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtros en campos"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,group_ids:0
+msgid "Authorized Groups"
+msgstr "Grupos autorizados"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Tree"
+msgstr "Árbol"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_orientation:0
+msgid "Graph Orientation"
+msgstr "Orientación gráfico"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Authorized Groups (empty for all)"
+msgstr "Grupos autorizados (vacío para todos)"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Security"
+msgstr "Seguridad"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "AND"
+msgstr "Y"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+"No puede mostrar un campo que no esté almacenado en la base de datos."
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,calendar_mode:0
+msgid "Calendar Mode"
+msgstr "Modo calendario"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
+msgid "Display Fields"
+msgstr "Campos a mostrar"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "Y Axis"
+msgstr "Eje Y"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Calendar"
+msgstr "Calendario"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Graph"
+msgstr "Gráfico"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
+msgid "Field Name"
+msgstr "Nombre campo"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Set Filter Values"
+msgstr "Fijar valores filtrado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Vertical"
+msgstr "Vertical"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,type:0
+msgid "Rows And Columns Report"
+msgstr "Informe de filas y columnas"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "General Configuration"
+msgstr "Configuración general"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.fields,sequence:0
+msgid "Gives the sequence order when displaying a list of fields."
+msgstr "Indica el orden de secuencia cuando se muestra una lista de campos."
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,init:0
+msgid "Select Field to filter"
+msgstr "Seleccione campo a filtrar"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,group_method:0
+msgid "Grouping Method"
+msgstr "Método agrupación"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,condition:0
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Count"
+msgstr "Contar"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "X Axis"
+msgstr "Eje X"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
+msgid "Confirm Filter"
+msgstr "Confirmar filtro"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,name:0
+msgid "Filter Name"
+msgstr "Nombre filtro"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Open Report"
+msgstr "Abrir informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
+msgid "Report Creator"
+msgstr "Creador de informes"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,end:0
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
+#: view:report.menu.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr "Puede aplicar la función de agregado para el campo no calculado."
+
+#. module: base_report_creator
+#: field:base_report_creator.report,menu_id:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type1:0
+msgid "First View"
+msgstr "Primera vista"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Delay"
+msgstr "Retraso"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,field_id:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Unique Colors"
+msgstr "Colores únicos"
+
+#. module: base_report_creator
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el informe sin eliminarlo."
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Pie Chart"
+msgstr "Gráfico tipo pastel"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type3:0
+msgid "Third View"
+msgstr "Tercera vista"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,name:0
+msgid "Report Name"
+msgstr "Nombre informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Average"
+msgstr "Promedio"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Use %(uid)s to filter by the connected user"
+msgstr "Use %(uid)s para filtrar por el usuario conectado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Maximum"
+msgstr "Máximo"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
+msgid "Continue"
+msgstr "Continuar"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
+msgid "Values"
+msgstr "Valores"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Bar Chart"
+msgstr "Gráfico de barras"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type2:0
+msgid "Second View"
+msgstr "Segunda vista"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Create Menu For This Report"
+msgstr "Crear menú para este informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "View parameters"
+msgstr "Parámetros de vista"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
+msgid "Filter Field"
+msgstr "Campo de filtrado"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,field_ids:0
+msgid "Fields to Display"
+msgstr "Campos a mostrar"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,filter_ids:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: base_report_creator
+#: model:ir.module.module,description:base_report_creator.module_meta_information
+msgid ""
+"This module allows you to create any statistic\n"
+"report on several objects. It's a SQL query builder and browser\n"
+"for and users.\n"
+"\n"
+"After installing the module, it adds a menu to define custom report in\n"
+"the \"Dashboard\" menu.\n"
+msgstr ""
+"Este módulo permite crear cualquier informe estadístico sobre\n"
+"varios objetos. Es un generador de consultas SQL y navegador\n"
+"para cualquier usuario.\n"
+"\n"
+"Después de instalar el módulo, se añade un menú para definir\n"
+"informes personalizados en el menú \"Tablero\".\n"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Valid"
+#~ msgstr "Válido"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ 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 "Uniq Colors"
+#~ msgstr "Colores únicos"
+
+#~ msgid "Reports"
+#~ msgstr "Informes"
+
+#~ msgid ""
+#~ "This modules allows you to create any statistic\n"
+#~ "report on several object. It's a SQL query builder and browser\n"
+#~ "for and users.\n"
+#~ "\n"
+#~ "After installing the module, it adds a menu to define custom report in\n"
+#~ "the \"Dashboard\" menu.\n"
+#~ msgstr ""
+#~ "Este módulo permite crear cualquier informe estadístico sobre\n"
+#~ "varios objetos. Es un constructor de consultas SQL y visualizador\n"
+#~ "para cualquier usuario.\n"
+#~ "\n"
+#~ "Después de instalar el módulo se añade un menú para definir informes\n"
+#~ "personalizados dentro del menú \"Tableros\".\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/base_report_creator/i18n/es_PY.po b/addons/base_report_creator/i18n/es_PY.po
index d4beb012f9b..80c579ae86b 100644
--- a/addons/base_report_creator/i18n/es_PY.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -54,7 +54,7 @@ msgid "Graph Mode"
 msgstr "Modo de Gráfico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -127,7 +127,7 @@ msgid "Custom Reports"
 msgstr "Personalizar Informes"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "¡No existen modelos relacionados!"
@@ -192,6 +192,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Reporte"
 
diff --git a/addons/base_report_creator/i18n/es_VE.po b/addons/base_report_creator/i18n/es_VE.po
new file mode 100644
index 00000000000..4aa569539b1
--- /dev/null
+++ b/addons/base_report_creator/i18n/es_VE.po
@@ -0,0 +1,576 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_report_creator
+#
+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-09 10:47+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:34+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.filter,expression:0
+msgid ""
+"Provide an expression for the field based on which you want to filter the "
+"records.\n"
+" e.g. res_partner.id=3"
+msgstr ""
+"Introduzca una expresión para el campo basada en como desea filtrar los "
+"registros.\n"
+" Por ejemplo res_partner.id=3"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_report_menu_create
+msgid "Menu Create"
+msgstr "Crear menú"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_type:0
+msgid "Graph Type"
+msgstr "Tipo gráfico"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Used View"
+msgstr "Vista utilizada"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Filter Values"
+msgstr "Valores filtro"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,graph_mode:0
+msgid "Graph Mode"
+msgstr "Modo de gráfico"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
+msgstr ""
+"Hay modelo(s) (%s) en la selección que no están relacionados con ningún otro "
+"modelo"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Graph View"
+msgstr "Vista gráfico"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,expression:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: base_report_creator
+#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
+msgid "Set Filter Fields"
+msgstr "Fijar campos de filtrado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
+msgid "Report Filters"
+msgstr "Filtros informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,sql_query:0
+msgid "SQL Query"
+msgstr "Interrogación SQL"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: view:report.menu.create:0
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Minimum"
+msgstr "Mínimo"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "OR"
+msgstr "O"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
+msgid "Custom Reports"
+msgstr "Informes personalizados"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid "No Related Models!!"
+msgstr "¡No existen modelos relacionados!"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Sum"
+msgstr "Suma"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr "Debe indicar color, fecha inicial y retraso de la vista calendario."
+
+#. module: base_report_creator
+#: field:base_report_creator.report,model_ids:0
+msgid "Reported Objects"
+msgstr "Objectos de informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Field List"
+msgstr "Lista de campos"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,type:0
+msgid "Report Type"
+msgstr "Tipo de informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Add filter"
+msgstr "Añadir filtro"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
+msgid "Create Menu for Report"
+msgstr "Crear menú para el informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Form"
+msgstr "Formulario"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+#: selection:base_report_creator.report.fields,calendar_mode:0
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "/"
+msgstr "/"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report.fields,report_id:0
+#: field:base_report_creator.report.filter,report_id:0
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
+msgid "Report"
+msgstr "Informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtros en campos"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,group_ids:0
+msgid "Authorized Groups"
+msgstr "Grupos autorizados"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Tree"
+msgstr "Árbol"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_orientation:0
+msgid "Graph Orientation"
+msgstr "Orientación gráfico"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Authorized Groups (empty for all)"
+msgstr "Grupos autorizados (vacío para todos)"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Security"
+msgstr "Seguridad"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "AND"
+msgstr "Y"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+"No puede mostrar un campo que no esté almacenado en la base de datos."
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,calendar_mode:0
+msgid "Calendar Mode"
+msgstr "Modo calendario"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
+msgid "Display Fields"
+msgstr "Campos a mostrar"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "Y Axis"
+msgstr "Eje Y"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Calendar"
+msgstr "Calendario"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Graph"
+msgstr "Gráfico"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
+msgid "Field Name"
+msgstr "Nombre campo"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Set Filter Values"
+msgstr "Fijar valores filtrado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Vertical"
+msgstr "Vertical"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,type:0
+msgid "Rows And Columns Report"
+msgstr "Informe de filas y columnas"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "General Configuration"
+msgstr "Configuración general"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.fields,sequence:0
+msgid "Gives the sequence order when displaying a list of fields."
+msgstr "Indica el orden de secuencia cuando se muestra una lista de campos."
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,init:0
+msgid "Select Field to filter"
+msgstr "Seleccione campo a filtrar"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,group_method:0
+msgid "Grouping Method"
+msgstr "Método agrupación"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,condition:0
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Count"
+msgstr "Contar"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "X Axis"
+msgstr "Eje X"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
+msgid "Confirm Filter"
+msgstr "Confirmar filtro"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,name:0
+msgid "Filter Name"
+msgstr "Nombre filtro"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Open Report"
+msgstr "Abrir informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
+msgid "Report Creator"
+msgstr "Creador de informes"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,end:0
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
+#: view:report.menu.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr "Puede aplicar la función de agregado para el campo no calculado."
+
+#. module: base_report_creator
+#: field:base_report_creator.report,menu_id:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type1:0
+msgid "First View"
+msgstr "Primera vista"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Delay"
+msgstr "Retraso"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,field_id:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Unique Colors"
+msgstr "Colores únicos"
+
+#. module: base_report_creator
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el informe sin eliminarlo."
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Pie Chart"
+msgstr "Gráfico tipo pastel"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type3:0
+msgid "Third View"
+msgstr "Tercera vista"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,name:0
+msgid "Report Name"
+msgstr "Nombre informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Average"
+msgstr "Promedio"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Use %(uid)s to filter by the connected user"
+msgstr "Use %(uid)s para filtrar por el usuario conectado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Maximum"
+msgstr "Máximo"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
+msgid "Continue"
+msgstr "Continuar"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
+msgid "Values"
+msgstr "Valores"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Bar Chart"
+msgstr "Gráfico de barras"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type2:0
+msgid "Second View"
+msgstr "Segunda vista"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Create Menu For This Report"
+msgstr "Crear menú para este informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "View parameters"
+msgstr "Parámetros de vista"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
+msgid "Filter Field"
+msgstr "Campo de filtrado"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,field_ids:0
+msgid "Fields to Display"
+msgstr "Campos a mostrar"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,filter_ids:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: base_report_creator
+#: model:ir.module.module,description:base_report_creator.module_meta_information
+msgid ""
+"This module allows you to create any statistic\n"
+"report on several objects. It's a SQL query builder and browser\n"
+"for and users.\n"
+"\n"
+"After installing the module, it adds a menu to define custom report in\n"
+"the \"Dashboard\" menu.\n"
+msgstr ""
+"Este módulo permite crear cualquier informe estadístico sobre\n"
+"varios objetos. Es un generador de consultas SQL y navegador\n"
+"para cualquier usuario.\n"
+"\n"
+"Después de instalar el módulo, se añade un menú para definir\n"
+"informes personalizados en el menú \"Tablero\".\n"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Valid"
+#~ msgstr "Válido"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ 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 "Uniq Colors"
+#~ msgstr "Colores únicos"
+
+#~ msgid "Reports"
+#~ msgstr "Informes"
+
+#~ msgid ""
+#~ "This modules allows you to create any statistic\n"
+#~ "report on several object. It's a SQL query builder and browser\n"
+#~ "for and users.\n"
+#~ "\n"
+#~ "After installing the module, it adds a menu to define custom report in\n"
+#~ "the \"Dashboard\" menu.\n"
+#~ msgstr ""
+#~ "Este módulo permite crear cualquier informe estadístico sobre\n"
+#~ "varios objetos. Es un constructor de consultas SQL y visualizador\n"
+#~ "para cualquier usuario.\n"
+#~ "\n"
+#~ "Después de instalar el módulo se añade un menú para definir informes\n"
+#~ "personalizados dentro del menú \"Tableros\".\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/base_report_creator/i18n/et.po b/addons/base_report_creator/i18n/et.po
index 782131005a7..fa3faee2153 100644
--- a/addons/base_report_creator/i18n/et.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr "Graafiku laad"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr "Kohandatud aruanded"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Aruanne"
 
diff --git a/addons/base_report_creator/i18n/fi.po b/addons/base_report_creator/i18n/fi.po
index 53670402442..cc5a4afbe9f 100644
--- a/addons/base_report_creator/i18n/fi.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_report_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Luo valikko"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -53,17 +53,18 @@ msgid "Graph Mode"
 msgstr "Kaavion tila"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
 "other model"
 msgstr ""
+"Nämä ovat maalit (%s) valinnassa jotka eiväli liity mihinkään muihin mallehin"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Legend"
-msgstr ""
+msgstr "Selite"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -124,10 +125,10 @@ msgid "Custom Reports"
 msgstr "Tilausraportit"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
-msgstr ""
+msgstr "Ei liittyviä malleja!!"
 
 #. module: base_report_creator
 #: view:report.menu.create:0
@@ -142,7 +143,7 @@ msgstr "Summa"
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
 msgid "You must have to give calendar view's color,start date and delay."
-msgstr ""
+msgstr "Sinun täytyy antaa kalenterinäkymän väri, alkupäivä ja viive"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
@@ -189,6 +190,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Raportti"
 
@@ -243,7 +245,7 @@ msgstr "JA"
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
 msgid "You can not display field which are not stored in Database."
-msgstr ""
+msgstr "Et voi näyttää kenttää jota ei ole tallennettu tietokantaan"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -302,7 +304,7 @@ msgstr "Yleinen määritys"
 #. module: base_report_creator
 #: help:base_report_creator.report.fields,sequence:0
 msgid "Gives the sequence order when displaying a list of fields."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä kenttäluetteloa"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
@@ -386,7 +388,7 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "Valikko"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
@@ -406,7 +408,7 @@ msgstr "Kenttä"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Unique Colors"
-msgstr ""
+msgstr "Uniikit värit"
 
 #. module: base_report_creator
 #: help:base_report_creator.report,active:0
@@ -414,6 +416,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the report "
 "without removing it."
 msgstr ""
+"Jos aktiivisen kentän tilaksi on asetettu epätosi (false), voit piilottaa "
+"raportin poistamatta sitä."
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -428,7 +432,7 @@ msgstr "Kolmas näkymä"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
@@ -448,7 +452,7 @@ msgstr "Keskiarvo"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Use %(uid)s to filter by the connected user"
-msgstr ""
+msgstr "Käytä %(uid) suodattaaksesi liittyvän käyttäjän mukaan"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
diff --git a/addons/base_report_creator/i18n/fr.po b/addons/base_report_creator/i18n/fr.po
index 461a361258e..77b8ff11e5e 100644
--- a/addons/base_report_creator/i18n/fr.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -54,7 +54,7 @@ msgid "Graph Mode"
 msgstr "Mode Graphe"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -127,7 +127,7 @@ msgid "Custom Reports"
 msgstr "Rapports personalisés"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Pas de modèle lié !"
@@ -194,6 +194,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Rapport"
 
diff --git a/addons/base_report_creator/i18n/gl.po b/addons/base_report_creator/i18n/gl.po
index 46701845fcb..fe81900e2c0 100644
--- a/addons/base_report_creator/i18n/gl.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Modo de gráfico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Informes personalizados"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Non existen modelos relacionados!"
@@ -191,6 +191,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Informe"
 
diff --git a/addons/base_report_creator/i18n/hr.po b/addons/base_report_creator/i18n/hr.po
index 833d5b79a22..8de7e2c92b1 100644
--- a/addons/base_report_creator/i18n/hr.po
+++ b/addons/base_report_creator/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-10-30 12:22+0000\n"
-"Last-Translator: goranc <goranc@gmail.com>\n"
+"Last-Translator: Goran Cvijanović <goranc@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -52,7 +52,7 @@ msgid "Graph Mode"
 msgstr "Grafički"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -125,7 +125,7 @@ msgid "Custom Reports"
 msgstr "Prilagođeni izvještaji"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Nema srodnih modela!!"
@@ -190,6 +190,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Izvještaj"
 
diff --git a/addons/base_report_creator/i18n/hu.po b/addons/base_report_creator/i18n/hu.po
index d7c8a7ec6d2..b1e367458f2 100644
--- a/addons/base_report_creator/i18n/hu.po
+++ b/addons/base_report_creator/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-02 18:09+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +54,7 @@ msgid "Graph Mode"
 msgstr "Grafikon üzemmód"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -124,7 +125,7 @@ msgid "Custom Reports"
 msgstr "Egyéni jelentések"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -189,6 +190,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Jelentés"
 
diff --git a/addons/base_report_creator/i18n/id.po b/addons/base_report_creator/i18n/id.po
index 443732f324d..01c3bc12a6a 100644
--- a/addons/base_report_creator/i18n/id.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/it.po b/addons/base_report_creator/i18n/it.po
index 73dec68f289..88e2077a2fc 100644
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Modo Grafico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Report Personalizzati"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Nessun modello correlato!!"
@@ -193,6 +193,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Report"
 
@@ -577,19 +578,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Se il campo attivo è impostato a Vero, permetterà di nascondere il report "
-#~ "senza rimuoverlo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/base_report_creator/i18n/ko.po b/addons/base_report_creator/i18n/ko.po
index 3ee47403c0e..60b5a8c4f97 100644
--- a/addons/base_report_creator/i18n/ko.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -51,7 +51,7 @@ msgid "Graph Mode"
 msgstr "그래프 모드"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -122,7 +122,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "관련된 모듈이 없음!"
@@ -187,6 +187,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "리포트"
 
diff --git a/addons/base_report_creator/i18n/lt.po b/addons/base_report_creator/i18n/lt.po
index a2ad2032f8b..a05033a899a 100644
--- a/addons/base_report_creator/i18n/lt.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/nb.po b/addons/base_report_creator/i18n/nb.po
index 8a746f0a398..74d0c4547e0 100644
--- a/addons/base_report_creator/i18n/nb.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -51,7 +51,7 @@ msgid "Graph Mode"
 msgstr "Grafmodus"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -122,7 +122,7 @@ msgid "Custom Reports"
 msgstr "Tilpasset rapport"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Ingen relaterte modeller!"
@@ -187,6 +187,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Rapport"
 
@@ -526,9 +527,6 @@ msgstr ""
 "tilpassede rapporter\n"
 "i  \"Dashboard\" menyen.\n"
 
-#~ msgid "UserError"
-#~ msgstr "Brukerfeil"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ugyldig modellnavn i aksjonsdefinisjonen."
 
@@ -538,12 +536,6 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Gyldig"
 
-#~ msgid "Custom Report"
-#~ msgstr "Tilpasset rapport"
-
-#~ msgid "No Wizards available for this object!"
-#~ msgstr "Ingen veivisere tilgjengelig for dette objektet!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for visningsarkitektur"
 
diff --git a/addons/base_report_creator/i18n/nl.po b/addons/base_report_creator/i18n/nl.po
index 86c9775230c..fa7a9b9facc 100644
--- a/addons/base_report_creator/i18n/nl.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Diagram-modus"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Eigen overzichten"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Geen gerelateerde modellen"
@@ -191,6 +191,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Overzicht"
 
@@ -573,19 +574,3 @@ msgstr ""
 #~ "\n"
 #~ "Na installatie voegt het een menu toe om eigen overzichten te maken in\n"
 #~ "het 'Dashboard'-menu.\n"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Als het actief veld aanstaat, kunt u het overzicht verbergen zonder het te "
-#~ "verwijderen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/base_report_creator/i18n/nl_BE.po b/addons/base_report_creator/i18n/nl_BE.po
index dd556f49333..f2723b7697a 100644
--- a/addons/base_report_creator/i18n/nl_BE.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/pl.po b/addons/base_report_creator/i18n/pl.po
index 6d46abc357d..97c2f0e86d5 100644
--- a/addons/base_report_creator/i18n/pl.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Raport"
 
diff --git a/addons/base_report_creator/i18n/pt.po b/addons/base_report_creator/i18n/pt.po
index 1335090dfc9..3133dbbf187 100644
--- a/addons/base_report_creator/i18n/pt.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Modo Gráfico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Relatórios Personalizáveis"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Sem Modelos Relacionados !!"
@@ -191,6 +191,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Relatório"
 
@@ -560,12 +561,3 @@ msgstr ""
 
 #~ msgid "Uniq Colors"
 #~ msgstr "Cores Únicas"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/base_report_creator/i18n/pt_BR.po b/addons/base_report_creator/i18n/pt_BR.po
index 79878aa1f33..b3a55809ad0 100644
--- a/addons/base_report_creator/i18n/pt_BR.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -52,7 +52,7 @@ msgid "Graph Mode"
 msgstr "Modo Gráfico"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -125,7 +125,7 @@ msgid "Custom Reports"
 msgstr "Relatórios Customizados"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Nenhum Modelo Relacionado!!"
@@ -190,6 +190,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Relatório"
 
@@ -573,19 +574,3 @@ msgstr ""
 #~ "\n"
 #~ "Após instalar o módulo, ele adiciona um menu para definir\n"
 #~ "relatórios customizados no menu \"Dashboard\".\n"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Se o campo ativo é definido como verdadeiro, permite esconder o relatório "
-#~ "sem removê-lo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/base_report_creator/i18n/ro.po b/addons/base_report_creator/i18n/ro.po
index b089bb70cb2..564209aa0ae 100644
--- a/addons/base_report_creator/i18n/ro.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Mod grafic"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Rapoarte personalizate"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Nu există modele asociate !"
@@ -193,6 +193,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Raport"
 
@@ -577,19 +578,3 @@ msgstr ""
 #~ "După instalare, modulul adaugă un meniu pentru definirea de rapoarte "
 #~ "personalizate\n"
 #~ "în meniul \"Panou\".\n"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "În cazul în care cîmpul activ este setat 'true' , va fi permisă ascunderea "
-#~ "raportului fără a-l șterge."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index 58c83f55328..4fcbeaa68bc 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -52,7 +52,7 @@ msgid "Graph Mode"
 msgstr "Графический вид"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -124,7 +124,7 @@ msgid "Custom Reports"
 msgstr "Пользовательские отчеты"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Нет связанной модели!!"
@@ -191,6 +191,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Отчет"
 
diff --git a/addons/base_report_creator/i18n/sk.po b/addons/base_report_creator/i18n/sk.po
index a6ccdb2ca73..d7e90b57aec 100644
--- a/addons/base_report_creator/i18n/sk.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -51,7 +51,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -122,7 +122,7 @@ msgid "Custom Reports"
 msgstr "Vlastné reporty"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -187,6 +187,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Výkaz"
 
diff --git a/addons/base_report_creator/i18n/sl.po b/addons/base_report_creator/i18n/sl.po
index fd2b5a25a21..a1d49a2b2e6 100644
--- a/addons/base_report_creator/i18n/sl.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Način grafa"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -125,7 +125,7 @@ msgid "Custom Reports"
 msgstr "Lastna poročila"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Ni povezanih modelov!"
@@ -190,6 +190,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Poročilo"
 
diff --git a/addons/base_report_creator/i18n/sq.po b/addons/base_report_creator/i18n/sq.po
index 283e2ec9ad7..f244484a51a 100644
--- a/addons/base_report_creator/i18n/sq.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -51,7 +51,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -122,7 +122,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -187,6 +187,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index 1b11b03d53c..3517b83a5e3 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Grafički"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Prilagođeni izvještaji"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Nema srodnih modela!!"
@@ -191,6 +191,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Izveštaj"
 
@@ -570,10 +571,3 @@ msgstr ""
 
 #~ msgid "Reports"
 #~ msgstr "Izveštaji"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "ako je aktivno polje postavljeno na 'istina', ono ti omogucava da sakrijes "
-#~ "izvetaj bez uklanjanja."
diff --git a/addons/base_report_creator/i18n/sr@latin.po b/addons/base_report_creator/i18n/sr@latin.po
index 5cfa46ef275..0a00ee06fb1 100644
--- a/addons/base_report_creator/i18n/sr@latin.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Grafički"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Prilagođeni izvještaji"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "Nema srodnih modela!!"
@@ -191,6 +191,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Izveštaj"
 
@@ -533,13 +534,6 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the report "
-#~ "without removing it."
-#~ msgstr ""
-#~ "ako je aktivno polje postavljeno na 'istina', ono ti omogucava da sakrijes "
-#~ "izvetaj bez uklanjanja."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/base_report_creator/i18n/sv.po b/addons/base_report_creator/i18n/sv.po
index ea7daf6a718..937e02f1d1f 100644
--- a/addons/base_report_creator/i18n/sv.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -53,7 +53,7 @@ msgid "Graph Mode"
 msgstr "Graph Mode"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -126,7 +126,7 @@ msgid "Custom Reports"
 msgstr "Custom Reports"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "No Related Models!!"
@@ -191,6 +191,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Report"
 
@@ -525,9 +526,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#~ msgid "UserError"
-#~ msgstr "UserError"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
@@ -537,12 +535,6 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Valid"
 
-#~ msgid "Custom Report"
-#~ msgstr "Custom Report"
-
-#~ msgid "No Wizards available for this object!"
-#~ msgstr "No Wizards available for this object!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
diff --git a/addons/base_report_creator/i18n/tlh.po b/addons/base_report_creator/i18n/tlh.po
index d3b1d20337c..508c232abfe 100644
--- a/addons/base_report_creator/i18n/tlh.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index f78746a5a92..2eadeb05914 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -52,7 +52,7 @@ msgid "Graph Mode"
 msgstr "Grafik Modu"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -123,7 +123,7 @@ msgid "Custom Reports"
 msgstr "Özel Raporlar"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "İlişkili Model Yok!!"
@@ -189,6 +189,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "Rapor"
 
diff --git a/addons/base_report_creator/i18n/uk.po b/addons/base_report_creator/i18n/uk.po
index 1f90bb31e43..646e8f52bde 100644
--- a/addons/base_report_creator/i18n/uk.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -186,6 +186,7 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr ""
 
diff --git a/addons/base_report_creator/i18n/vi.po b/addons/base_report_creator/i18n/vi.po
index c0def74a752..998a64c4186 100644
--- a/addons/base_report_creator/i18n/vi.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -28,12 +28,12 @@ msgstr ""
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_report_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Trình đơn Tạo"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
 msgid "Graph Type"
-msgstr ""
+msgstr "Loại Biểu đồ"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -43,7 +43,7 @@ msgstr ""
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Filter Values"
-msgstr ""
+msgstr "Các giá trị của Bộ lọc"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,graph_mode:0
@@ -51,7 +51,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -61,7 +61,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Legend"
-msgstr ""
+msgstr "Chú giải"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,expression:0
 msgid "Value"
-msgstr ""
+msgstr "Giá trị"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
@@ -81,48 +81,48 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Ngày Kết thúc"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
 msgid "Report Filters"
-msgstr ""
+msgstr "Các Bộ lọc Báo cáo"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,sql_query:0
 msgid "SQL Query"
-msgstr ""
+msgstr "Truy vấn SQL"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: view:report.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Tạo Trình đơn"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Minimum"
-msgstr ""
+msgstr "Tối thiểu"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Toán tử"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "OR"
-msgstr ""
+msgstr "HOẶC"
 
 #. module: base_report_creator
 #: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
 msgid "Custom Reports"
-msgstr ""
+msgstr "Báo cáo Tùy chỉnh"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -130,12 +130,12 @@ msgstr ""
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Thông tin Trình đơn"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Sum"
-msgstr ""
+msgstr "Tổng"
 
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
@@ -155,24 +155,24 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report,type:0
 msgid "Report Type"
-msgstr ""
+msgstr "Loại Báo cáo"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
-msgstr ""
+msgstr "Thêm bộ lọc"
 
 #. module: base_report_creator
 #: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
 msgid "Create Menu for Report"
-msgstr ""
+msgstr "Tạo Trình đơn cho Báo cáo"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "Biểu mẫu"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type2:0
@@ -187,8 +187,9 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
-msgstr ""
+msgstr "Báo cáo"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
@@ -198,7 +199,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Filters on Fields"
-msgstr ""
+msgstr "Các Bộ lọc trên Các trường"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -225,18 +226,18 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr ""
+msgstr "Bảo mật"
 
 #. module: base_report_creator
 #: field:report.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Tên Trình đơn"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "AND"
-msgstr ""
+msgstr "VÀ"
 
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
@@ -246,7 +247,7 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
-msgstr ""
+msgstr "Dạng Lịch"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
@@ -263,7 +264,7 @@ msgstr ""
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr ""
+msgstr "Lịch"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -275,12 +276,12 @@ msgstr ""
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
 msgid "Field Name"
-msgstr ""
+msgstr "Tên Trường"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Set Filter Values"
-msgstr ""
+msgstr "Đặt Các giá trị của Bộ lọc"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
@@ -295,7 +296,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "General Configuration"
-msgstr ""
+msgstr "Cấu hình Tổng quát"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.fields,sequence:0
@@ -315,18 +316,18 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr ""
+msgstr "Theo chiều ngang"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
 msgid "Grouping Method"
-msgstr ""
+msgstr "Phương thức Nhóm dữ liệu"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,condition:0
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Điều kiện"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -341,22 +342,22 @@ msgstr ""
 #. module: base_report_creator
 #: field:report.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Trình đơn Cha"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
 msgid "Confirm Filter"
-msgstr ""
+msgstr "Xác nhận Bộ lọc"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Tên Bộ lọc"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Open Report"
-msgstr ""
+msgstr "Mở Báo cáo"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -367,14 +368,14 @@ msgstr ""
 #: view:base_report_creator.report:0
 #: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
 msgid "Report Creator"
-msgstr ""
+msgstr "Người tạo Báo cáo"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,end:0
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
 #: view:report.menu.create:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
@@ -384,7 +385,7 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "Trình đơn"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
@@ -399,7 +400,7 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "Trường"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
@@ -436,12 +437,12 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Fields"
-msgstr ""
+msgstr "Các trường"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Average"
-msgstr ""
+msgstr "Trung bình"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -451,17 +452,17 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Maximum"
-msgstr ""
+msgstr "Tối đa"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
 msgid "Continue"
-msgstr ""
+msgstr "Tiếp tục"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
 msgid "Values"
-msgstr ""
+msgstr "Các giá trị"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -476,7 +477,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Create Menu For This Report"
-msgstr ""
+msgstr "Tạo Trình đơn Cho Báo cáo Này"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -491,19 +492,19 @@ msgstr ""
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
 msgid "Filter Field"
-msgstr ""
+msgstr "Trường Lọc"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,field_ids:0
 msgid "Fields to Display"
-msgstr ""
+msgstr "Các Trường Hiển thị"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
-msgstr ""
+msgstr "Các bộ lọc"
 
 #. module: base_report_creator
 #: model:ir.module.module,description:base_report_creator.module_meta_information
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 0d3253976a9..8e3f1e485ab 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -22,7 +22,7 @@ msgid ""
 "Provide an expression for the field based on which you want to filter the "
 "records.\n"
 " e.g. res_partner.id=3"
-msgstr "提供一个基于字段过滤记录的表达式. 例如: res_partner.id=3"
+msgstr "提供一个基于字段筛选记录的表达式. 例如: res_partner.id=3"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_report_menu_create
@@ -32,25 +32,25 @@ msgstr "菜单创建"
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
 msgid "Graph Type"
-msgstr "图形类型"
+msgstr "图表类型"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Used View"
-msgstr "用户视图"
+msgstr "使用的视图"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Filter Values"
-msgstr "过滤值"
+msgstr "筛选值"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,graph_mode:0
 msgid "Graph Mode"
-msgstr "图形模式"
+msgstr "图表模式"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -65,7 +65,7 @@ msgstr "图例"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Graph View"
-msgstr "图形视图"
+msgstr "图表视图"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,expression:0
@@ -75,7 +75,7 @@ msgstr "值"
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
 msgid "Set Filter Fields"
-msgstr "设置过滤字段"
+msgstr "设置筛选字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
@@ -85,7 +85,7 @@ msgstr "结束日期"
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
 msgid "Report Filters"
-msgstr "报表过滤"
+msgstr "筛选报表"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -121,7 +121,7 @@ msgid "Custom Reports"
 msgstr "自定义报表"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr "无相关模型！！"
@@ -159,7 +159,7 @@ msgstr "报表类型"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
-msgstr "增加过滤"
+msgstr "增加筛选"
 
 #. module: base_report_creator
 #: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
@@ -186,6 +186,7 @@ msgstr "/"
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
 msgstr "报表"
 
@@ -197,7 +198,7 @@ msgstr "开始日期"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Filters on Fields"
-msgstr "过滤字段"
+msgstr "筛选字段"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -214,7 +215,7 @@ msgstr "树"
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_orientation:0
 msgid "Graph Orientation"
-msgstr "图方向"
+msgstr "图表方向"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -245,7 +246,7 @@ msgstr "您无法显示数据库中没有的字段。"
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
-msgstr "日程表模式"
+msgstr "日历模式"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
@@ -269,7 +270,7 @@ msgstr "日历"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Graph"
-msgstr "图形"
+msgstr "图表"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
@@ -279,7 +280,7 @@ msgstr "字段名"
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Set Filter Values"
-msgstr "设置过滤值"
+msgstr "设置筛选的值"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
@@ -299,12 +300,12 @@ msgstr "一般设置"
 #. module: base_report_creator
 #: help:base_report_creator.report.fields,sequence:0
 msgid "Gives the sequence order when displaying a list of fields."
-msgstr ""
+msgstr "给定序列显示字段列表"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
 msgid "Select Field to filter"
-msgstr "选择过滤字段"
+msgstr "选择筛选字段"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,active:0
@@ -345,12 +346,12 @@ msgstr "上级菜单"
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
 msgid "Confirm Filter"
-msgstr "确定过滤"
+msgstr "确认筛选"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,name:0
 msgid "Filter Name"
-msgstr "过滤名称"
+msgstr "筛选名称"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -378,7 +379,7 @@ msgstr "取消"
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
 msgid "You can apply aggregate function to the non calculated field."
-msgstr ""
+msgstr "你只能添加聚合函数到没有计算的字段上"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -435,7 +436,7 @@ msgstr "报表名称"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Fields"
-msgstr "域"
+msgstr "字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -445,7 +446,7 @@ msgstr "平均"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Use %(uid)s to filter by the connected user"
-msgstr ""
+msgstr "使用%(uid)s去过筛选连接的用户"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -455,7 +456,7 @@ msgstr "最大"
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
 msgid "Continue"
-msgstr "继续"
+msgstr "下一步"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
@@ -465,7 +466,7 @@ msgstr "值"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr "柱状图表"
+msgstr "柱状图"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0
@@ -490,7 +491,7 @@ msgstr "序列"
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
 msgid "Filter Field"
-msgstr "过滤字段"
+msgstr "筛选字段"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -502,7 +503,7 @@ msgstr "显示字段"
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
-msgstr "过滤"
+msgstr "筛选"
 
 #. module: base_report_creator
 #: model:ir.module.module,description:base_report_creator.module_meta_information
@@ -514,6 +515,11 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+"这个模块允许你创建基于几个对象的统计报表.\n"
+"是一个SQL查询生成器和用户的浏览器。\n"
+"\n"
+"当安装这个模块后，它会增加一个用于定义客户报表的菜单到\n"
+"“控制台”的菜单上\n"
 
 #~ msgid "Draft"
 #~ msgstr "草稿"
diff --git a/addons/base_report_creator/i18n/zh_HK.po b/addons/base_report_creator/i18n/zh_HK.po
new file mode 100644
index 00000000000..623f7546635
--- /dev/null
+++ b/addons/base_report_creator/i18n/zh_HK.po
@@ -0,0 +1,518 @@
+# Chinese (Hong Kong) 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-09-27 13:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.filter,expression:0
+msgid ""
+"Provide an expression for the field based on which you want to filter the "
+"records.\n"
+" e.g. res_partner.id=3"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_report_menu_create
+msgid "Menu Create"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_type:0
+msgid "Graph Type"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Used View"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Filter Values"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,graph_mode:0
+msgid "Graph Mode"
+msgstr ""
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Legend"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Graph View"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,expression:0
+msgid "Value"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
+msgid "Set Filter Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
+msgid "Report Filters"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,sql_query:0
+msgid "SQL Query"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: view:report.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Minimum"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "OR"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
+msgid "Custom Reports"
+msgstr ""
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid "No Related Models!!"
+msgstr ""
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Sum"
+msgstr ""
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,model_ids:0
+msgid "Reported Objects"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Field List"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Add filter"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
+msgid "Create Menu for Report"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Form"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+#: selection:base_report_creator.report.fields,calendar_mode:0
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "/"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report.fields,report_id:0
+#: field:base_report_creator.report.filter,report_id:0
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
+msgid "Report"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,group_ids:0
+msgid "Authorized Groups"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Tree"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_orientation:0
+msgid "Graph Orientation"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Authorized Groups (empty for all)"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Security"
+msgstr "保安"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "AND"
+msgstr ""
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,calendar_mode:0
+msgid "Calendar Mode"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
+msgid "Display Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "Y Axis"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Calendar"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Graph"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Set Filter Values"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Vertical"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,type:0
+msgid "Rows And Columns Report"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "General Configuration"
+msgstr ""
+
+#. module: base_report_creator
+#: help:base_report_creator.report.fields,sequence:0
+msgid "Gives the sequence order when displaying a list of fields."
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,init:0
+msgid "Select Field to filter"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Horizontal"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,group_method:0
+msgid "Grouping Method"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,condition:0
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Count"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "X Axis"
+msgstr ""
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
+msgid "Confirm Filter"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,name:0
+msgid "Filter Name"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Open Report"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Grouped"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
+msgid "Report Creator"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,end:0
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
+#: view:report.menu.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,menu_id:0
+msgid "Menu"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type1:0
+msgid "First View"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Delay"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Unique Colors"
+msgstr ""
+
+#. module: base_report_creator
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Pie Chart"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type3:0
+msgid "Third View"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Average"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Use %(uid)s to filter by the connected user"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Maximum"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
+msgid "Continue"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
+msgid "Values"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Bar Chart"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type2:0
+msgid "Second View"
+msgstr ""
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Create Menu For This Report"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "View parameters"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
+msgid "Filter Field"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,field_ids:0
+msgid "Fields to Display"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,filter_ids:0
+msgid "Filters"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.module.module,description:base_report_creator.module_meta_information
+msgid ""
+"This module allows you to create any statistic\n"
+"report on several objects. It's a SQL query builder and browser\n"
+"for and users.\n"
+"\n"
+"After installing the module, it adds a menu to define custom report in\n"
+"the \"Dashboard\" menu.\n"
+msgstr ""
diff --git a/addons/base_report_creator/i18n/zh_TW.po b/addons/base_report_creator/i18n/zh_TW.po
index 7c4a9c90d72..8798458ca62 100644
--- a/addons/base_report_creator/i18n/zh_TW.po
+++ b/addons/base_report_creator/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
@@ -50,7 +50,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid ""
 "These is/are model(s) (%s) in selection which is/are not related to any "
@@ -60,7 +60,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Legend"
-msgstr ""
+msgstr "圖例"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -70,7 +70,7 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,expression:0
 msgid "Value"
-msgstr ""
+msgstr "值"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
@@ -80,7 +80,7 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Ending Date"
-msgstr ""
+msgstr "結束日期"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
@@ -91,7 +91,7 @@ msgstr ""
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,sql_query:0
 msgid "SQL Query"
-msgstr ""
+msgstr "SQL 查詢"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -118,10 +118,10 @@ msgstr ""
 #. module: base_report_creator
 #: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
 msgid "Custom Reports"
-msgstr ""
+msgstr "自訂報表"
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:320
+#: code:addons/base_report_creator/base_report_creator.py:310
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
@@ -129,12 +129,12 @@ msgstr ""
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
-msgstr ""
+msgstr "選單資訊"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Sum"
-msgstr ""
+msgstr "總和"
 
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
@@ -149,12 +149,12 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Field List"
-msgstr ""
+msgstr "欄位清單"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,type:0
 msgid "Report Type"
-msgstr ""
+msgstr "報表類型"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -171,7 +171,7 @@ msgstr ""
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "表單"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type2:0
@@ -186,13 +186,14 @@ msgstr ""
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
 msgid "Report"
-msgstr ""
+msgstr "報表"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Starting Date"
-msgstr ""
+msgstr "開始日期"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -224,12 +225,12 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr ""
+msgstr "安全"
 
 #. module: base_report_creator
 #: field:report.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "選單名稱"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
@@ -245,24 +246,24 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
-msgstr ""
+msgstr "行事曆模式"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
 msgid "Display Fields"
-msgstr ""
+msgstr "顯示欄位"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "Y Axis"
-msgstr ""
+msgstr "Y 軸"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr ""
+msgstr "行事曆"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -274,7 +275,7 @@ msgstr ""
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
 msgid "Field Name"
-msgstr ""
+msgstr "欄位名稱"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
@@ -284,7 +285,7 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
-msgstr ""
+msgstr "垂直"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,type:0
@@ -294,7 +295,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "General Configuration"
-msgstr ""
+msgstr "一般配置"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.fields,sequence:0
@@ -309,12 +310,12 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report,active:0
 msgid "Active"
-msgstr ""
+msgstr "作用中"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr ""
+msgstr "水平"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
@@ -325,7 +326,7 @@ msgstr ""
 #: field:base_report_creator.report.filter,condition:0
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "條件"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -335,7 +336,7 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "X Axis"
-msgstr ""
+msgstr "X 軸"
 
 #. module: base_report_creator
 #: field:report.menu.create,menu_parent_id:0
@@ -355,7 +356,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Open Report"
-msgstr ""
+msgstr "開啟報表"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -373,7 +374,7 @@ msgstr ""
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
 #: view:report.menu.create:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: base_report_creator
 #: constraint:base_report_creator.report:0
@@ -383,7 +384,7 @@ msgstr ""
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "選單"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
@@ -393,12 +394,12 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Delay"
-msgstr ""
+msgstr "延遲"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "欄位"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
@@ -425,22 +426,22 @@ msgstr ""
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "End Date"
-msgstr ""
+msgstr "結束日期"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "報表名稱"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Fields"
-msgstr ""
+msgstr "欄位"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Average"
-msgstr ""
+msgstr "平均"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -455,17 +456,17 @@ msgstr ""
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
 msgid "Continue"
-msgstr ""
+msgstr "繼續"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
 msgid "Values"
-msgstr ""
+msgstr "值"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "棒形圖"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0
@@ -480,7 +481,7 @@ msgstr ""
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "View parameters"
-msgstr ""
+msgstr "檢視參數"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,sequence:0
@@ -496,7 +497,7 @@ msgstr ""
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,field_ids:0
 msgid "Fields to Display"
-msgstr ""
+msgstr "要顯示欄位"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index c5bbbbd34ec..a95235d8017 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'OpenOffice Report Designer Interface',
+    'name': 'OpenOffice Report Designer',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "normal",
     'description': """
 This module is used along with OpenERP OpenOffice Plugin.
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index b943c35c2ef..2774767af26 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -22,8 +22,8 @@
                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
                 <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
-              <xpath expr="//button[@string='Skip']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              <xpath expr="//button[@string='Cancel']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
               <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
diff --git a/addons/base_report_designer/i18n/ar.po b/addons/base_report_designer/i18n/ar.po
index 5f0a6f62ea3..bc75fd5cc59 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a57a5c094a5..de931664777 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 44a0c29d61a..362daf8fede 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 213cbb0ce06..fa863255cae 100644
--- a/addons/base_report_designer/i18n/ca.po
+++ b/addons/base_report_designer/i18n/ca.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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
 msgid "base.report.sxw"
-msgstr ""
+msgstr "base.informe.sxw"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr ""
+msgstr "Configurador del dissenyador d'informes d'OpenERP"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
 "Writer."
 msgstr ""
+"Aquest complement li permet crear/modificar els informes d'OpenERP en "
+"OpenOffice Writer."
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -56,6 +58,14 @@ msgid ""
 "you can modify in OpenOffice.Once you have modified it you can\n"
 "upload the report using the same wizard.\n"
 msgstr ""
+"\n"
+"Aquest mòdul s'utilitza juntament amb l'extensió OpenERP d'OpenOffice.\n"
+"Primer ha d'instal·lar l'extensió que es troba disponible en\n"
+"http://www.openerp.com\n"
+"\n"
+"Aquest mòdul afegeix assistents per importar/exportar informes .sxw que\n"
+"podeu modificar en OpenOffice. Una vegada ho hagueu modificat, podeu\n"
+"carregar l'informe amb el mateix assistent.\n"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -65,32 +75,32 @@ msgstr "L'informe .SXW"
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
-msgstr ""
+msgstr "base_informe_dissenyador.instal·lador"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Tanca"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "The RML report"
-msgstr ""
+msgstr "L'informe RML"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
@@ -101,7 +111,7 @@ msgstr "Informe"
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_rml_save
 msgid "base.report.rml.save"
-msgstr ""
+msgstr "base.informe.rml.desa"
 
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
@@ -111,7 +121,7 @@ msgstr "Dissenyador d'informes"
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nom del fitxer"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -123,7 +133,7 @@ msgstr "Obté un informe"
 #: view:base_report_designer.installer:0
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
-msgstr ""
+msgstr "Dissenyador d'informes OpenERP"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -133,7 +143,7 @@ msgstr "Continua"
 #. module: base_report_designer
 #: field:base.report.rml.save,file_rml:0
 msgid "Save As"
-msgstr ""
+msgstr "Anomena i desa"
 
 #. module: base_report_designer
 #: help:base_report_designer.installer,plugin_file:0
@@ -141,11 +151,13 @@ msgid ""
 "OpenObject Report Designer plug-in file. Save as this file and install this "
 "plug-in in OpenOffice."
 msgstr ""
+"Fitxer del plug-in dissenyador d'informes OpenObject. Deseu aquest fitxer i "
+"instal·leu aquest plug-in en OpenOffice."
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "Save RML FIle"
-msgstr ""
+msgstr "Desa fitxer RML"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,file_sxw:0
@@ -156,12 +168,12 @@ msgstr "El seu arxiu .SXW"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Passos d'instal·lació i configuració"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -171,36 +183,42 @@ msgid ""
 "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 ""
+"Aquesta és la plantilla de l'informe sol·licitat.\n"
+"Guardeu-ho com un fitxer .SXW i obriu-ho amb OpenOffice.\n"
+"No oblideu d'instal·lar el paquet d'OpenOffice d'OpenERP SA per modificar-"
+"ho.\n"
+"Una vegada que es modifica, torneu-ho a carregar en OpenERP amb aquest "
+"assistent."
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Salta"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
 msgid "Base Report sxw"
-msgstr ""
+msgstr "Base informe sxw"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_file_sxw
 msgid "base.report.file.sxw"
-msgstr ""
+msgstr "base.informe.fitxer.sxw"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
 msgid "OpenObject Report Designer Plug-in"
-msgstr ""
+msgstr "Plug-in dissenyador d'informe d'OpenObject"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
-msgstr ""
+msgstr "Instal·lació del dissenyador d'informe OpenERP"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -212,7 +230,7 @@ msgstr "Cancel·la"
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.accions.informe.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
index d5f9be4eb8c..23cec125980 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 02f702bb683..883a852bf3c 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -290,29 +290,3 @@ msgstr "Wählen Sie Ihren Report"
 #~ ".SXW Datei und öffnen diesen mit OpenOffice. Vergessen Sie nicht das OpenERP "
 #~ "OpenOffice Paket zu installieren. Nach der Änderung verwenden Sie diesen "
 #~ "Assistenten um den Bericht in OpenERP zu laden."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen haben!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index 37585e6c24a..f62dba69591 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 15baee642ca..82c7333a737 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -290,30 +290,3 @@ msgstr "Selecciona su informe"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introducción al diseñador de informes"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
index 8df47cded6d..4b0a1b15caf 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\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_EC.po b/addons/base_report_designer/i18n/es_EC.po
index 0762814f738..46d7259829d 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\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_MX.po b/addons/base_report_designer/i18n/es_MX.po
new file mode 100644
index 00000000000..71fa718dd2b
--- /dev/null
+++ b/addons/base_report_designer/i18n/es_MX.po
@@ -0,0 +1,292 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_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:14+0000\n"
+"PO-Revision-Date: 2010-12-27 09:08+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:28+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr "base.informe.sxw"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "Configurador del diseñador de reportes de OpenERP"
+
+#. module: base_report_designer
+#: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
+msgid "Report designer interface module"
+msgstr "Módulo que proporciona una interfaz para el diseñador de informes"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+"Este complemento le permite crear/modificar reportes de OpenERP en "
+"OpenOffice Writer."
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Subir el informe modificado"
+
+#. module: base_report_designer
+#: model:ir.module.module,description:base_report_designer.module_meta_information
+msgid ""
+"\n"
+"This module is used along with OpenERP OpenOffice plugin.\n"
+"You have to first install the plugin which is available at\n"
+"http://www.openerp.com\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that\n"
+"you can modify in OpenOffice.Once you have modified it you can\n"
+"upload the report using the same wizard.\n"
+msgstr ""
+"\n"
+"Este módulo se utiliza junto con la extensión OpenERP de OpenOffice.\n"
+"Primero debe instalar la extensión que se encuentra disponible en\n"
+"http://www.openerp.com\n"
+"\n"
+"Este módulo añade asistentes para importar/exportar informes .sxw que\n"
+"puede modificar en OpenOffice. Una vez lo haya modificado, puede\n"
+"cargar el informe con el mismo asistente.\n"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr "El informe .SXW"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr "base_informe_diseñador.instalador"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML report"
+msgstr "El informe RML"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr "base.informe.rml.guardar"
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "Diseñador de informes"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr "Obtener un informe"
+
+#. 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 "Diseñador informes OpenERP"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "Continuar"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "Guardar como"
+
+#. 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 ""
+"Fichero del plug-in diseñador de informes OpenObject. Guarde este fichero y "
+"instale este plug-in en OpenOffice."
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "Guardar fichero RML"
+
+#. 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 "Su archivo .SXW"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. 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 ""
+"Esta es la plantilla del informe solicitado.\n"
+"Guárdelo como un fichero .SXW y abralo con OpenOffice.\n"
+"No se olvide de instalar el paquete de OpenOffice de OpenERP SA para "
+"modificarlo.\n"
+"Una vez que se modifica, volverlo a cargar en OpenERP con este asistente."
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Skip"
+msgstr "Saltar"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr "Base informe sxw"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr "base.informe.fichero.sxw"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr "Plug-in diseñador informe OpenObject"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "Instalación diseñador informe OpenERP"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "Selecciona su informe"
+
+#~ msgid "Introduction"
+#~ msgstr "Introducción"
+
+#~ msgid "Upload your modified report"
+#~ msgstr "Subir su informe modificado"
+
+#~ msgid "Report modified"
+#~ msgstr "Informe modificado"
+
+#~ msgid "Modify a report"
+#~ msgstr "Modificar un informe"
+
+#~ msgid "Your report has been modified."
+#~ msgstr "Su informe ha sido modificado."
+
+#, python-format
+#~ msgid "Report does not contain the sxw content!"
+#~ msgstr "¡El informe no contiene contenido sxw!"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Report designer"
+#~ msgstr "Diseñador de informes"
+
+#~ msgid ""
+#~ "This is the template of your requested report. Save it as a .SXW file and "
+#~ "open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
+#~ "to modify it. Once it is modified, re-upload it in Open ERP using this "
+#~ "wizard."
+#~ msgstr ""
+#~ "Ésta es la plantilla del informe solicitado. Guárdela como archivo .SXW y "
+#~ "ábrela con OpenOffice. No olvide instalar el paquete de Tiny OpenOffice para "
+#~ "modificarla. Cuando esté modificada, súbala a OpenERP utilizando este "
+#~ "asistente."
+
+#~ msgid "Update the report"
+#~ msgstr "Actualizar informe"
+
+#~ msgid "Create a new report"
+#~ msgstr "Crear un nuevo informe"
+
+#~ msgid "Modify an existing report"
+#~ msgstr "Modificar un informe existente"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "Operation"
+#~ msgstr "Operación"
+
+#~ msgid "Report designer introduction"
+#~ msgstr "Introducción al diseñador de informes"
diff --git a/addons/base_report_designer/i18n/es_PY.po b/addons/base_report_designer/i18n/es_PY.po
index 23ad106e624..f603b82412b 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\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_VE.po b/addons/base_report_designer/i18n/es_VE.po
new file mode 100644
index 00000000000..71fa718dd2b
--- /dev/null
+++ b/addons/base_report_designer/i18n/es_VE.po
@@ -0,0 +1,292 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_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:14+0000\n"
+"PO-Revision-Date: 2010-12-27 09:08+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:28+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr "base.informe.sxw"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "Configurador del diseñador de reportes de OpenERP"
+
+#. module: base_report_designer
+#: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
+msgid "Report designer interface module"
+msgstr "Módulo que proporciona una interfaz para el diseñador de informes"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+"Este complemento le permite crear/modificar reportes de OpenERP en "
+"OpenOffice Writer."
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Subir el informe modificado"
+
+#. module: base_report_designer
+#: model:ir.module.module,description:base_report_designer.module_meta_information
+msgid ""
+"\n"
+"This module is used along with OpenERP OpenOffice plugin.\n"
+"You have to first install the plugin which is available at\n"
+"http://www.openerp.com\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that\n"
+"you can modify in OpenOffice.Once you have modified it you can\n"
+"upload the report using the same wizard.\n"
+msgstr ""
+"\n"
+"Este módulo se utiliza junto con la extensión OpenERP de OpenOffice.\n"
+"Primero debe instalar la extensión que se encuentra disponible en\n"
+"http://www.openerp.com\n"
+"\n"
+"Este módulo añade asistentes para importar/exportar informes .sxw que\n"
+"puede modificar en OpenOffice. Una vez lo haya modificado, puede\n"
+"cargar el informe con el mismo asistente.\n"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr "El informe .SXW"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr "base_informe_diseñador.instalador"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML report"
+msgstr "El informe RML"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr "base.informe.rml.guardar"
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "Diseñador de informes"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr "Obtener un informe"
+
+#. 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 "Diseñador informes OpenERP"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "Continuar"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "Guardar como"
+
+#. 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 ""
+"Fichero del plug-in diseñador de informes OpenObject. Guarde este fichero y "
+"instale este plug-in en OpenOffice."
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "Guardar fichero RML"
+
+#. 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 "Su archivo .SXW"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. 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 ""
+"Esta es la plantilla del informe solicitado.\n"
+"Guárdelo como un fichero .SXW y abralo con OpenOffice.\n"
+"No se olvide de instalar el paquete de OpenOffice de OpenERP SA para "
+"modificarlo.\n"
+"Una vez que se modifica, volverlo a cargar en OpenERP con este asistente."
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Skip"
+msgstr "Saltar"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr "Base informe sxw"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr "base.informe.fichero.sxw"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr "Plug-in diseñador informe OpenObject"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "Instalación diseñador informe OpenERP"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "Selecciona su informe"
+
+#~ msgid "Introduction"
+#~ msgstr "Introducción"
+
+#~ msgid "Upload your modified report"
+#~ msgstr "Subir su informe modificado"
+
+#~ msgid "Report modified"
+#~ msgstr "Informe modificado"
+
+#~ msgid "Modify a report"
+#~ msgstr "Modificar un informe"
+
+#~ msgid "Your report has been modified."
+#~ msgstr "Su informe ha sido modificado."
+
+#, python-format
+#~ msgid "Report does not contain the sxw content!"
+#~ msgstr "¡El informe no contiene contenido sxw!"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Report designer"
+#~ msgstr "Diseñador de informes"
+
+#~ msgid ""
+#~ "This is the template of your requested report. Save it as a .SXW file and "
+#~ "open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
+#~ "to modify it. Once it is modified, re-upload it in Open ERP using this "
+#~ "wizard."
+#~ msgstr ""
+#~ "Ésta es la plantilla del informe solicitado. Guárdela como archivo .SXW y "
+#~ "ábrela con OpenOffice. No olvide instalar el paquete de Tiny OpenOffice para "
+#~ "modificarla. Cuando esté modificada, súbala a OpenERP utilizando este "
+#~ "asistente."
+
+#~ msgid "Update the report"
+#~ msgstr "Actualizar informe"
+
+#~ msgid "Create a new report"
+#~ msgstr "Crear un nuevo informe"
+
+#~ msgid "Modify an existing report"
+#~ msgstr "Modificar un informe existente"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "Operation"
+#~ msgstr "Operación"
+
+#~ msgid "Report designer introduction"
+#~ msgstr "Introducción al diseñador de informes"
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
index 5f9dbbd59c8..49b57645037 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 66ea05efdba..a7531081024 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -25,7 +25,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr ""
+msgstr "OpenERP raporttisuunnitelutyökalun asetukset"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
 "Writer."
 msgstr ""
+"Tämä laajennus mahdollistaa OpenERP raporttien luomisen/muokkaamisen "
+"OpenOffice Writerissä"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -70,27 +72,27 @@ msgstr ""
 #. module: base_report_designer
 #: field:base_report_designer.installer,description:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Sulje"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "The RML report"
-msgstr ""
+msgstr "RML raportti"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
@@ -111,7 +113,7 @@ msgstr "Raportin muotoilija"
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "Tiedostonimi"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -123,7 +125,7 @@ msgstr "Hanki raportti"
 #: view:base_report_designer.installer:0
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
-msgstr ""
+msgstr "OpenERP raporttien suunnittelu"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -133,7 +135,7 @@ msgstr "Jatka"
 #. module: base_report_designer
 #: field:base.report.rml.save,file_rml:0
 msgid "Save As"
-msgstr ""
+msgstr "Tallenna nimellä..."
 
 #. module: base_report_designer
 #: help:base_report_designer.installer,plugin_file:0
@@ -141,11 +143,13 @@ msgid ""
 "OpenObject Report Designer plug-in file. Save as this file and install this "
 "plug-in in OpenOffice."
 msgstr ""
+"OpenObject raporttisuunnittelun lisäosa (plug-in). Tallenna tämä tiedosto ja "
+"asenna se OpenOfficeen."
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "Save RML FIle"
-msgstr ""
+msgstr "Tallenna RML tiedosto"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,file_sxw:0
@@ -156,12 +160,12 @@ msgstr "Sinun .SXW-tiedosto"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Asennus ja konfigurointivaiheet"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -171,16 +175,20 @@ msgid ""
 "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 ""
+"Tämä on pohja pyydetylle raportillesi.\n"
+"Tallenna se .SXW tiedostona ja avaa OpenOfficessa.\n"
+"Älä unohda asentaa OpenERP SA OpenOffice pakettia muokataksesi sitä.\n"
+"Kun se on muutettu, imuroi se takaisin OpenERP:iin käyttämällä tätä velhoa."
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Ohita"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
@@ -195,12 +203,12 @@ msgstr ""
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
 msgid "OpenObject Report Designer Plug-in"
-msgstr ""
+msgstr "OpenObject raporttisuunnittelun laajennus"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
-msgstr ""
+msgstr "OpenERP raporttisuunnittelun asennus"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index 2a2695a59e3..2fee1756ab2 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-13 11:02+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 156bca58962..42f28c7f7ce 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -123,7 +123,7 @@ msgstr "Deseñador de informes"
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr "Nome de arquivo"
+msgstr "Nome do ficheiro"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -153,13 +153,13 @@ msgid ""
 "OpenObject Report Designer plug-in file. Save as this file and install this "
 "plug-in in OpenOffice."
 msgstr ""
-"Arquivo plug-in de Deseñador de Informes de OpenObject. Garda como este "
-"arquivo e instala este plug-in en OpenOffice."
+"Ficheiro do engadido  do deseñador de informes de OpenObject. Garda como "
+"este ficheiro e instala este engadido en OpenOffice."
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "Save RML FIle"
-msgstr "Gardar Arquivo RML"
+msgstr "Gardar o focheiro RML"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,file_sxw:0
@@ -185,10 +185,11 @@ msgid ""
 "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 ""
-"Este é a plantilla do seu informe solicitado.\n"
-"Sálvao como un arquivo .SXW e ábrao co OpenOffice.\n"
+"Este é o modelo do seu informe solicitado.\n"
+"Gárdeo como un ficheiro .SXW e ábrao co OpenOffice.\n"
 "Non esqueza instalar o paquete OpenOffice de OpenERP SA para modificalo.\n"
-"Unha vez que está modificado, volve subilo a OpenERP usando este asistente."
+"Unha vez que estea modificado, volva a cargalo en OpenERP usando este "
+"asistente."
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index a506cccaf31..d108c5e73d7 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ae454b5501e..81985cdbe7e 100644
--- a/addons/base_report_designer/i18n/hu.po
+++ b/addons/base_report_designer/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-02 18:18+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a59862aff3e..7eed77e6e45 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3f3a70b3b03..a26474cf3f7 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -290,30 +290,3 @@ msgstr "Seleziona il tuo Report"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introduzione a Report Designer"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per \"x_\" e non contenere alcun "
-#~ "carattere speciale!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Il nome del gruppo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
index 2db425fadcd..ab556d7f2e8 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 44a0c29d61a..362daf8fede 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 203186e87bc..e523de8e512 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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.po b/addons/base_report_designer/i18n/nl.po
index 4940c2d902d..d9c3df2a228 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -291,29 +291,3 @@ msgstr "Selecteer rapport"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introductie rapport ontwerpen"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in actie definitie."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "De groepsnaam moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
index 5a3f0ebba30..48c5b1a6d46 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cd70ef4f7df..14597ee6059 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a40cb7406f5..22b7653a16b 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cddd58c79ec..ba18f510e78 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -288,30 +288,3 @@ msgstr "Escolha seu relatório"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Introdução ao editor de relatórios"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo precisa ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index 2fdabd739e2..2bf10c81e79 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -266,27 +266,3 @@ msgstr "Selectare raport"
 
 #~ msgid "Operation"
 #~ msgstr "Operație"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nume invalid de model în definirea acțiunii."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Eroare ! Nu este posibilă crearea unui meniu recursiv."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Numele grupuiui trebuie să fie unic !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index 616e4d9013c..f2683a01a89 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -286,24 +286,6 @@ msgstr "Выберите ваш отчет"
 #~ msgid "Error"
 #~ msgstr "Ошибка"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для структуры вида!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создавать рекурсивные меню"
-
 #, python-format
 #~ msgid "Report does not contain the sxw content!"
 #~ msgstr "Содержимое документов формата *.sxw  в отчете не найдено!"
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
index ae0af2332a3..096594262d5 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 12886a70b4a..11d98d5ffbc 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c2d39713134..2ecc887b08d 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b9cf7b7c5cb..27cda06b993 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -272,17 +272,3 @@ msgstr "Odaberite izvještaj"
 
 #~ msgid "Operation"
 #~ msgstr "Postupak"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/base_report_designer/i18n/sr@latin.po b/addons/base_report_designer/i18n/sr@latin.po
index 0f5bc7c0128..b4a3d5ce5d0 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -226,20 +226,6 @@ msgstr "ir.actions.report.xml"
 msgid "Select your report"
 msgstr "Odaberite izvještaj"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #~ msgid "Your report has been modified."
 #~ msgstr "Vaš je Izveštaj izmenjen"
 
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index 866160f46f0..33930eb3162 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -272,17 +272,3 @@ msgstr "Select your report"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Report designer introduction"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Namnet på gruppen måste vara unikt!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
index a875a2cb60c..121c65cb124 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3c9e720d5a8..7ec67729392 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\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 244cc8eca89..331f0cb2fbf 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80ade4e7ca6..b3bb7f3560e 100644
--- a/addons/base_report_designer/i18n/vi.po
+++ b/addons/base_report_designer/i18n/vi.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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
 msgid "base.report.sxw"
-msgstr ""
+msgstr "base.report.sxw"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
@@ -60,17 +60,17 @@ msgstr ""
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
-msgstr ""
+msgstr "Báo cáo .SXW"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
-msgstr ""
+msgstr "base_report_designer.installer"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,description:0
 msgid "Description"
-msgstr ""
+msgstr "Mô tả"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
@@ -80,12 +80,12 @@ msgstr ""
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "The RML report"
-msgstr ""
+msgstr "Báo cáo RML"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Cấu hình"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
@@ -96,44 +96,44 @@ msgstr ""
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Báo cáo"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_rml_save
 msgid "base.report.rml.save"
-msgstr ""
+msgstr "base.report.rml.save"
 
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
-msgstr ""
+msgstr "Trình Thiết kế Báo cáo"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "Tên tập tin"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 #: view:base.report.sxw:0
 msgid "Get a report"
-msgstr ""
+msgstr "Lấy báo cáo"
 
 #. 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 ""
+msgstr "Trình Thiết kế Báo cáo OpenERP"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "Continue"
-msgstr ""
+msgstr "Tiếp tục"
 
 #. module: base_report_designer
 #: field:base.report.rml.save,file_rml:0
 msgid "Save As"
-msgstr ""
+msgstr "Lưu dạng"
 
 #. module: base_report_designer
 #: help:base_report_designer.installer,plugin_file:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "Save RML FIle"
-msgstr ""
+msgstr "Lưu Tập tin RML"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,file_sxw:0
@@ -156,7 +156,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Các bước Cài đặt và Cấu hình"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
@@ -175,12 +175,12 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Bỏ qua"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Hình ảnh"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
@@ -190,7 +190,7 @@ msgstr ""
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_file_sxw
 msgid "base.report.file.sxw"
-msgstr ""
+msgstr "base.report.file.sxw"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
@@ -200,21 +200,21 @@ msgstr ""
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
-msgstr ""
+msgstr "Cài đặt Trình Thiết kế Báo cáo OpenERP"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 #: view:base.report.rml.save:0
 #: view:base.report.sxw:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "Select your report"
-msgstr ""
+msgstr "Chọn báo cáo của bạn"
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 44d98990cb4..418363a46bc 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -24,7 +24,7 @@ msgstr "base.report.sxw"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr "OpenERP 报表设计器配置"
+msgstr "OpenERP 报表设计器设置"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -90,12 +90,12 @@ msgstr "RML 报表"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr "配置"
+msgstr "设置"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
-msgstr "title"
+msgstr "标题"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
@@ -111,7 +111,7 @@ msgstr "base.report.rml.save"
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
-msgstr "报表设计者"
+msgstr "报表设计器"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
@@ -133,7 +133,7 @@ msgstr "OpenERP 报表设计器"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "Continue"
-msgstr "继续"
+msgstr "下一步"
 
 #. module: base_report_designer
 #: field:base.report.rml.save,file_rml:0
@@ -161,12 +161,12 @@ msgstr "你的.SXW文件"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr "安装和配置步骤"
+msgstr "安装和设置步骤"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -189,7 +189,7 @@ msgstr "跳过"
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr "图片"
+msgstr "图像"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
@@ -252,15 +252,6 @@ msgstr "选择你的报表"
 #~ msgid "Your report has been modified."
 #~ msgstr "你的报表已经修改"
 
-#~ msgid ""
-#~ "\n"
-#~ "This module adds wizards to import/export documents to be edited in\n"
-#~ "OpenOffice.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "这模块增加一个向导来导入和导出文档在\n"
-#~ "OpenOffice编辑\n"
-
 #~ msgid "Report designer"
 #~ msgstr "报表设计者"
 
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
index 647f74c4d1d..3b0a846183d 100644
--- a/addons/base_report_designer/i18n/zh_TW.po
+++ b/addons/base_report_designer/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-09-27 14:38+0000\n"
+"Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -24,12 +24,12 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr ""
+msgstr "OpenERP 報表設計師配置"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
-msgstr ""
+msgstr "報表設計師介面模組"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
@@ -41,7 +41,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "Upload the modified report"
-msgstr ""
+msgstr "上載已修改報表"
 
 #. module: base_report_designer
 #: model:ir.module.module,description:base_report_designer.module_meta_information
@@ -59,7 +59,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
-msgstr ""
+msgstr ".SXW 報表"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
@@ -69,33 +69,33 @@ msgstr ""
 #. module: base_report_designer
 #: field:base_report_designer.installer,description:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "關閉(_C)"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "The RML report"
-msgstr ""
+msgstr "RML 報表"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "配置"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
-msgstr ""
+msgstr "標題"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "報表"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_rml_save
@@ -105,62 +105,62 @@ msgstr ""
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
-msgstr ""
+msgstr "報表設計師"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "檔案名稱"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 #: view:base.report.sxw:0
 msgid "Get a report"
-msgstr ""
+msgstr "取得報表"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
-msgstr ""
+msgstr "OpenERP 報表設計師"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "Continue"
-msgstr ""
+msgstr "繼續"
 
 #. module: base_report_designer
 #: field:base.report.rml.save,file_rml:0
 msgid "Save As"
-msgstr ""
+msgstr "另存為..."
 
 #. 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 ""
+msgstr "OpenObject 報表設計師插件檔。儲存此檔並於 OpenOffice 安裝此插件。"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "Save RML FIle"
-msgstr ""
+msgstr "儲存 RML 檔案"
 
 #. 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 ""
+msgstr "您的 .SXW 檔案"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "安裝及配置步驟"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "配置進度"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -174,17 +174,17 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "略過"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "圖像"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
 msgid "Base Report sxw"
-msgstr ""
+msgstr "基礎報表 sxw"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_file_sxw
@@ -194,19 +194,19 @@ msgstr ""
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
 msgid "OpenObject Report Designer Plug-in"
-msgstr ""
+msgstr "OpenObject 報表設計師插件"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
-msgstr ""
+msgstr "OpenERP 報表設計師安裝"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 #: view:base.report.rml.save:0
 #: view:base.report.sxw:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
@@ -216,4 +216,4 @@ msgstr ""
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "Select your report"
-msgstr ""
+msgstr "選取您的報表"
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 b31065ce37e..401cf88b418 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
@@ -109,3 +109,5 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.about", ("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/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index 4dbb28a30c0..c65ba32e6bf 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
@@ -275,3 +275,5 @@ if __name__<>"package" and __name__=="__main__":
     AddAttachment(None)
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( AddAttachment, "org.openoffice.openerp.report.addattachment", ("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/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index 0b68ab10b01..cdc5c7553b1 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
@@ -137,3 +137,5 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( Change, "org.openoffice.openerp.report.change", ("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/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index 59b7d32b529..bb80c3ecd61 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
@@ -283,3 +283,5 @@ if __name__<>"package":
 else:
     g_ImplementationHelper.addImplementation( ConvertBracesToField, "org.openoffice.openerp.report.convertBF", ("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/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index d804405c990..892061c56b4 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
@@ -83,3 +83,5 @@ if __name__<>"package":
 else:
     g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("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/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index e2720c1e803..dd00f1719e1 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
@@ -130,3 +130,5 @@ if __name__<>"package" and __name__=="__main__":
     ExportToRML(None)
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( ExportToRML, "org.openoffice.openerp.report.exporttorml", ("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/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index 074a3bd020e..ecdf13454dc 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
@@ -113,3 +113,5 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( Expression, "org.openoffice.openerp.report.expression", ("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/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index cfe65d61022..92044f78fe1 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
@@ -289,3 +289,5 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( Fields, "org.openoffice.openerp.report.fields", ("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/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index 012c6f896a2..85059d7712c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -53,3 +53,5 @@ class LoginTest:
         if not loginstatus:
             Change(None)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 138513475bb..2ccd8358c97 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
@@ -211,3 +211,5 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( ModifyExistingReport, "org.openoffice.openerp.report.modifyreport", ("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/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index 0e4a18c3b10..6022e44df7a 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
@@ -117,3 +117,5 @@ elif __name__=="package":
             NewReport,
             "org.openoffice.openerp.report.opennewreport",
             ("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/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index d8458be027d..0eab6d1710c 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
@@ -298,3 +298,5 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper = unohelper.ImplementationHelper()
     g_ImplementationHelper.addImplementation( RepeatIn, "org.openoffice.openerp.report.repeatln", ("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/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index 896f3cfcac2..3a6d799f8a5 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
@@ -239,3 +239,5 @@ if __name__<>"package" and __name__=="__main__":
     SendtoServer(None)
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( SendtoServer, "org.openoffice.openerp.report.sendtoserver", ("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/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index 245cd1dc7ce..9b69e4a5c15 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
@@ -172,3 +172,5 @@ 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 54343d02d7f..73146f1b68a 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
@@ -272,3 +272,5 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( AddLang, "org.openoffice.openerp.report.langtag", ("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/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
index d2192cd5ddd..0ccd1c9d011 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -59,3 +59,5 @@ import ConvertBracesToField
 import ConvertFieldsToBraces
 import ExportToRML
 import SendtoServer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
index acafd5f549e..4740c61b178 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -47,3 +47,5 @@
 import compileall
 
 compileall.compile_dir('package')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
index 2a732da8226..a60ae586303 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
@@ -26,3 +26,5 @@ import gui
 import logreport
 import rpc
 import tiny_socket
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
index 56a83159e4a..8511bb8343d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
@@ -109,3 +109,5 @@ class TextListenerProcAdapter( unohelper.Base, XTextListener ):
             apply( self.oProcToCall, (oTextEvent,) + self.tParams )
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 a6cfe9215a3..c0a3e5b5d63 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
@@ -58,3 +58,5 @@ class ErrorDialog:
     def btnOkOrCancel_clicked( self, oActionEvent ):
         self.win.endExecute()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 db1f15b1fc5..29f1cd87e46 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
@@ -262,3 +262,5 @@ def GetAFileName():
     return sPath
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
index 79f2ae370de..975aa387193 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -820,3 +820,5 @@ class DBModalDialog:
         """
         self.oDialogControl.endExecute()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 dfcc78374c9..2aab8596862 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
@@ -46,3 +46,5 @@ class Logger(object):
     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 f211c6309f4..f7c7f636485 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
@@ -202,3 +202,5 @@ class NETRPCGateway(RPCGateway):
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
index 415e4b3c91e..30a2079433a 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
@@ -91,3 +91,5 @@ class mysocket:
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 8c9a8c9a1a8..ef22a3a0d51 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
@@ -38,3 +38,5 @@ def write_data_to_file( filename, data ):
 	fp.write( data )
 	fp.close()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 fa7874cff45..fc3d6672b79 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
@@ -136,3 +136,5 @@ if __name__<>"package":
 else:
     g_ImplementationHelper.addImplementation( modify, "org.openoffice.openerp.report.modify", ("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/test/test_fields.py b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
index 8afd773b3fb..8954aa8d7a8 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
@@ -30,3 +30,5 @@ print
 print 'Field selection for a repeatIn', '='*40
 get('account.invoice', level=0, ending=['one2many','many2many'], recur=['many2one'])
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index d0790cdc0ad..03d1ac19d7e 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -148,3 +148,5 @@ class base_report_rml_save(osv.osv_memory):
          }
 
 base_report_rml_save()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 2dab90b90b2..82fe6ca3601 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 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
@@ -19,84 +19,6 @@
 #
 ##############################################################################
 
-import installer
-import wizard
-import os
-import base64
-import random
-import tools
-from osv import fields, osv
-import netsvc
-from tools.translate import _
-
-class base_setup_config_choice(osv.osv_memory):
-    """
-    """
-    _name = 'base.setup.config'
-    logger = netsvc.Logger()
-
-    def _get_image(self, cr, uid, context=None):
-        file_no = str(random.randint(1,3))
-        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
-        file_data = tools.file_open(path,'rb').read()
-        return base64.encodestring(file_data)
-
-    def get_users(self, cr, uid, context=None):
-        user_obj = self.pool.get('res.users')
-        user_ids = user_obj.search(cr, uid, [])
-        user_list = []
-        user_tmpl_nopass = _('    - %s :\n\t\tLogin : %s')
-        user_tmpl_pass =   _('    - %s :\n\t\tLogin : %s \n\t\tPassword : %s')
-        for user in user_obj.browse(cr, uid, user_ids, context=context):
-            if user.password and not user.password.startswith('$'):
-                user_list.append(user_tmpl_pass % (user.name, user.login, user.password))
-            else:
-                user_list.append(user_tmpl_nopass % (user.name, user.login))
-        return _('The following users have been installed : \n')+ '\n'.join(user_list)
-
-    _columns = {
-        'installed_users':fields.text('Installed Users', readonly=True),
-        'config_logo' : fields.binary('Image', readonly=True),
-        }
-
-    _defaults = {
-        'installed_users':get_users,
-         'config_logo' : _get_image
-        }
-
-    def reset_menu(self, cr, uid, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        menu_id = user._get_menu()
-        user.write({'action_id': False,
-                    'menu_id': menu_id})
-        return self.pool.get('ir.actions.act_window').browse(cr, uid, menu_id, context=context)
-
-    def menu(self, cr, uid, ids, context=None):
-        menu = self.reset_menu(cr, uid, context=context)
-
-        if menu.view_id.id:
-            view_id = (menu.view_id.id, menu.view_id.name)
-        else:
-            view_id = False
-
-        return {
-            'name': menu.name,
-            'type': menu.type,
-            'view_id': view_id,
-            'domain': menu.domain,
-            'res_model': menu.res_model,
-            'src_model': menu.src_model,
-            'view_type': menu.view_type,
-            'view_mode': menu.view_mode,
-            'views': menu.views,
-        }
-
-    def config(self, cr, uid, ids, context=None):
-        self.reset_menu(cr, uid, context=context)
-        return self.pool.get('res.config').next(cr, uid, [], context=context)
-
-base_setup_config_choice()
-
+import base_setup
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 0c3385b4dab..4417ebf2439 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -23,25 +23,21 @@
 {
     'name': 'Base Setup',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
 ================================================================================
 
-It allows you to choose the type of interface and select from a list of applications to install.
+Shows you a list of applications features to install from.
 
-It also helps to easily configure your company.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['base_setup_data.xml'],
-    'update_xml': ['security/ir.model.access.csv',
-                   'wizard/res_company_logo_view.xml',
-                   'base_setup_installer.xml',
-                   ],
-    'demo_xml': ['base_setup_demo.xml'],
+    'init_xml': [],
+    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml' ],
+    'demo_xml': [],
     'installable': True,
     'active': True,
     'certificate': '0086711085869',
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
new file mode 100644
index 00000000000..ecb9b5bf3c4
--- /dev/null
+++ b/addons/base_setup/base_setup.py
@@ -0,0 +1,488 @@
+# -*- 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 pytz
+
+import simplejson
+import cgi
+import pooler
+import tools
+from osv import fields, osv
+from tools.translate import _
+from lxml import etree
+
+#Application and feature chooser, this could be done by introspecting ir.modules
+DEFAULT_MODULES = {
+    'Customer Relationship Management' : ['crm',],
+    'Sales Management' : ['sale',],
+    'Project Management' : ['project',],
+    'Knowledge Management' : ['document',],
+    'Warehouse Management' : ['stock',],
+    'Manufacturing' : ['mrp'],
+    'Accounting & Finance' : ['account'],
+    'Purchase Management' : ['purchase'],
+    'Human Resources' : ['hr',],
+    'Point of Sale' : ['point_of_sale',],
+    'Marketing' : ['marketing',],
+}
+
+class base_setup_installer(osv.osv_memory):
+    _name = 'base.setup.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        'selection' : fields.text('Selection'),
+    }
+
+    def fields_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
+
+        fields = {}
+        category_proxy = self.pool.get('ir.module.category')
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
+        category_ids = category_proxy.search(cr, uid, domain, context=context)
+        for category in category_proxy.browse(cr, uid, category_ids, context=context):
+            category_name = 'category_%d' % (category.id,)
+            fields[category_name] = {
+                'type' : 'boolean',
+                'string' : category.name,
+                'name' : category_name,
+                'help' : category.description,
+            }
+
+        module_proxy = self.pool.get('ir.module.module')
+        module_ids = module_proxy.search(cr, uid, [], context=context)
+        for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            module_name = 'module_%d' % (module.id,)
+            module_is_installed = module.state == 'installed'
+
+            fields[module_name] = {
+                'type' : 'boolean',
+                'string' : module.shortdesc,
+                'name' : module_name,
+                'help' : module.description,
+            }
+
+        return fields
+
+    def default_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
+
+        result = {}
+
+        if 'dont_compute_virtual_attributes' not in context:
+            module_proxy = self.pool.get('ir.module.module')
+            module_ids = module_proxy.search(cr, uid, [], context=context)
+            for module in module_proxy.browse(cr, uid, module_ids, context=context):
+                result['module_%d' % (module.id,)] = module.state == 'installed'
+
+            cat_proxy = self.pool.get('ir.module.category')
+            cat_ids = cat_proxy.search(cr, uid, [], context=context)
+            for cat in cat_proxy.browse(cr, uid, cat_ids, context=context):
+                m = DEFAULT_MODULES.get(cat.name,[])
+                r = module_proxy.search(cr, uid, [('state','=','installed'),('name','in',m)])
+
+                result['category_%d' % (cat.id,)] = bool(r) and (len(r) == len(m))
+
+        return result
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
+        def in_extended_view_group(cr, uid, context=None):
+            try:
+                model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_extended')
+            except ValueError:
+                return False
+            return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
+
+        result = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+
+        module_category_proxy = self.pool.get('ir.module.category')
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
+        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
+
+        arch = ['<form string="%s">' % _('Automatic Base Setup')]
+        arch.append('<separator string="%s" colspan="4" />' % _('Install Applications'))
+        module_proxy = self.pool.get('ir.module.module')
+
+        extended_view = in_extended_view_group(cr, uid, context=context)
+
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            domain = [('category_id', '=', module_category.id)]
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+            if not modules:
+                continue
+
+            m = DEFAULT_MODULES.get(module_category.name, [])
+            r = module_proxy.search(cr, uid, [('state', '=', 'installed'),('name', 'in', m)], context=context)
+            readonly = bool(r)
+
+            attributes = {
+                'name' : 'category_%d' % (module_category.id,),
+                'on_change' : 'on_change_%s_%d(category_%d)' % ('category', module_category.id, module_category.id,),
+            }
+            if readonly:
+                attributes['modifiers'] = simplejson.dumps({'readonly' : True})
+
+            arch.append("""<field %s />""" % (" ".join(["%s='%s'" % (key, value,)
+                                                        for key, value in attributes.iteritems()]),))
+
+        # Compute the modules to show
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            domain = [('category_id', '=', module_category.id)]
+
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            default_modules = DEFAULT_MODULES.get(module_category.name, False)
+            if default_modules:
+                domain.append(('name', 'not in', default_modules))
+
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+
+            if not modules:
+                continue
+
+            modifiers = {
+                'invisible' : [('category_%d' % (module_category.id), '=', False)],
+            }
+            module_modifiers = dict(modifiers)
+
+            arch.append("""<separator string="%s Features" colspan="4" modifiers='%s'/>""" % (
+                cgi.escape(module_category.name),
+                simplejson.dumps(modifiers))
+            )
+
+            for module in modules:
+                #module_modifiers['readonly'] = module.state == 'installed'
+
+                arch.append("""<field name="module_%d" modifiers='%s' />""" % (
+                    module.id,
+                    simplejson.dumps(module_modifiers))
+                )
+
+        arch.append(
+            '<separator colspan="4" />'
+            '<group colspan="4" col="2">'
+            '<button special="cancel" string="Cancel" icon="gtk-cancel" />'
+            '<button string="Install Modules" type="object" name="apply_cb" icon="gtk-apply" />'
+            '</group>'
+        )
+
+        arch.append('</form>')
+
+        result['arch'] = ''.join(arch)
+        return result
+
+    def __getattr__(self, name):
+        if name.startswith('on_change_category_'):
+            def proxy(cr, uid, ids, value, context=None):
+                item = 'category_%s' % name[len('on_change_category_'):]
+                return self._on_change_selection(cr, uid, ids, item, value, context=context)
+            return proxy
+        return getattr(super(base_setup_installer, self), name)
+
+    def _on_change_selection(self, cr, uid, ids, item, value, context=None):
+        if not isinstance(item, basestring) or not value:
+            return {}
+
+        if item.startswith('category_') or item.startswith('module_'):
+            object_name, identifier = item.split('_')
+        else:
+            return {}
+
+        values = {
+        }
+
+        #if object_name == 'category':
+        #    module_ids = self.pool.get('ir.module.module').search(cr, uid, [('category_id', '=', int(identifier))], context=context)
+        #    for module_id in module_ids:
+        #        values['module_%d' % module_id] = 1
+
+        return {'value': values}
+
+    def create(self, cr, uid, values, context=None):
+        to_install = {'categories' : [], 'modules' : []}
+
+        for key, value in values.iteritems():
+            if value == 1 and (key.startswith('module_') or key.startswith('category_')):
+                kind, identifier = key.split('_')
+                if kind == 'category':
+                    to_install['categories'].append(long(identifier))
+                if kind == 'module':
+                    to_install['modules'].append(long(identifier))
+
+        values = {
+            'selection' : simplejson.dumps(to_install),
+        }
+        context.update(dont_compute_virtual_attributes=True)
+        return super(base_setup_installer, self).create(cr, uid, values, context=context)
+
+    def apply_cb(self, cr, uid, ids, context=None):
+        category_proxy = self.pool.get('ir.module.category')
+        for installer in self.browse(cr, uid, ids, context=context):
+            to_install = simplejson.loads(installer.selection)
+
+            proxy = self.pool.get('ir.module.module')
+
+            module_ids = proxy.search(cr, uid, [('id', 'in', to_install['modules'])], context=context)
+            modules = set(record['name']
+                          for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
+
+            category_ids = category_proxy.search(cr, uid, [('id', 'in', to_install['categories'])], context=context)
+            selected_categories = set(record['name']
+                                      for record in category_proxy.read(cr, uid, category_ids, ['name'], context=context))
+
+            # FIXME: Use a workaround, but can do better
+            for category_name, default_modules in DEFAULT_MODULES.iteritems():
+                if category_name in selected_categories:
+                    modules.update(default_modules)
+
+            # Special Cases:
+            # * project_mrp: the dependencies are sale, project, procurement, mrp_jit
+            if 'sale' in modules and 'project' in modules:
+                modules.add('project_mrp')
+
+            need_update = False
+            module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
+            if module_ids:
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
+                need_update = True
+
+            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_hidden_link')
+            while True and category_id:
+                cr.execute("select id, name from ir_module_module m where category_id = %s \
+                           and (select count(d.id) from ir_module_module_dependency d \
+                           where d.module_id = m.id) = (select count(d.id) from \
+                           ir_module_module_dependency d inner join ir_module_module m2 on d.name = m2.name \
+                           where d.module_id=m.id and m2.state in %s ) and state = %s",
+                          (category_id[1], ('installed', 'to install', 'to upgrade', ), 'uninstalled',))
+                inner_modules = [name for _, name in cr.fetchall()]
+
+                module_ids = proxy.search(cr, uid, [('name', 'in', inner_modules)], context=context)
+                if not module_ids:
+                    break
+
+                modules.update(inner_modules)
+
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
+                need_update = True
+
+
+            domain = [('name', 'in', list(modules)),
+                      ('state', '=', 'installed')]
+            for module in proxy.browse(cr, uid, proxy.search(cr, uid, domain, context=context), context):
+                cr.execute("update ir_actions_todo set state='open' \
+                           from ir_model_data as data where data.res_id = ir_actions_todo.id \
+                           and ir_actions_todo.type='special'\
+                           and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+
+            if need_update:
+                cr.commit()
+                self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+
+        return self.pool.get('res.config').next(cr, uid, [], context=context)
+
+#Migrate data from another application Conf wiz
+
+class migrade_application_installer_modules(osv.osv_memory):
+    _name = 'migrade.application.installer.modules'
+    _inherit = 'res.config.installer'
+    _columns = {
+        'import_saleforce': fields.boolean('Import Saleforce',
+            help="For Import Saleforce"),
+        'import_sugarcrm': fields.boolean('Import Sugarcrm',
+            help="For Import Sugarcrm"),
+        'sync_google_contact': fields.boolean('Sync Google Contact',
+            help="For Sync Google Contact"),
+        'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
+            help="For Quickbooks Ippids"),
+    }
+
+class product_installer(osv.osv_memory):
+    _name = 'product.installer'
+    _inherit = 'res.config'
+    _columns = {
+        'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
+    }
+    _defaults = {
+        'customers': 'create',
+    }
+
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        data_obj = self.pool.get('ir.model.data')
+        val = self.browse(cr, uid, ids, context=context)[0]
+        if val.customers == 'create':
+            id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            return {
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'res.partner',
+                    'views': [(id2, 'form')],
+                    'type': 'ir.actions.act_window',
+                    'target': 'current',
+                    'nodestroy':False,
+                }
+        if val.customers == 'import':
+            return {'type': 'ir.actions.act_window'}
+
+# Define users preferences for new users (ir.values)
+
+def _lang_get(self, cr, uid, context=None):
+    obj = self.pool.get('res.lang')
+    ids = obj.search(cr, uid, [('translatable','=',True)])
+    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
+    res = [(r['code'], r['name']) for r in res]
+    return res
+
+def _tz_get(self,cr,uid, context=None):
+    return [(x, x) for x in pytz.all_timezones]
+
+class user_preferences_config(osv.osv_memory):
+    _name = 'user.preferences.config'
+    _inherit = 'res.config'
+    _columns = {
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
+            help="Set default for new user's timezone, used to perform timezone conversions "
+                 "between the server and the client."),
+        'context_lang': fields.selection(_lang_get, 'Language', required=True,
+            help="Sets default language for the all user interface, when UI "
+                "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
+        'view': fields.selection([('simple','Simplified'),
+                                  ('extended','Extended')],
+                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
+        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
+
+    }
+    _defaults={
+               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
+               'context_lang' : 'en_US',
+               'menu_tips' : True
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
+        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
+        for id, field, value in res_default:
+            res.update({field: value})
+        return res
+
+    def execute(self, cr, uid, ids, context=None):
+        user_obj = self.pool.get('res.users')
+        user_ids = user_obj.search(cr, uid, [], context=context)
+        for o in self.browse(cr, uid, ids, context=context):
+            user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
+            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
+            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
+            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
+        return {}
+
+# Specify Your Terminology
+
+class specify_partner_terminology(osv.osv_memory):
+    _name = 'base.setup.terminology'
+    _inherit = 'res.config'
+    _columns = {
+        'partner': fields.selection([
+            ('Customer','Customer'),
+            ('Client','Client'),
+            ('Member','Member'),
+            ('Patient','Patient'),
+            ('Partner','Partner'),
+            ('Donor','Donor'),
+            ('Guest','Guest'),
+            ('Tenant','Tenant')
+        ], 'How do you call a Customer', required=True ),
+    }
+    _defaults={
+        'partner' :'Customer',
+    }
+
+    def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
+        trans_obj = self.pool.get('ir.translation')
+        user_obj = self.pool.get('res.users')
+        context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
+        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)])
+        if existing_trans_ids:
+            trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
+        else:
+            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
+        return {}
+
+    def execute(self, cr, uid, ids, context=None):
+        def _case_insensitive_replace(ref_string, src, value):
+            import re
+            pattern = re.compile(src, re.IGNORECASE)
+            return pattern.sub(_(value), _(ref_string))
+        trans_obj = self.pool.get('ir.translation')
+        fields_obj = self.pool.get('ir.model.fields')
+        menu_obj = self.pool.get('ir.ui.menu')
+        act_window_obj = self.pool.get('ir.actions.act_window')
+        for o in self.browse(cr, uid, ids, context=context):
+            #translate label of field
+            field_ids = fields_obj.search(cr, uid, [('field_description','ilike','Customer')])
+            for f_id in fields_obj.browse(cr ,uid, field_ids, context=context):
+                field_ref = f_id.model_id.model + ',' + f_id.name
+                self.make_translations(cr, uid, ids, field_ref, 'field', f_id.field_description, _case_insensitive_replace(f_id.field_description,'Customer',o.partner), context=context)
+            #translate help tooltip of field
+            for obj in self.pool.models.values():
+                for field_name, field_rec in obj._columns.items():
+                    if field_rec.help.lower().count('customer'):
+                        field_ref = obj._name + ',' + field_name
+                        self.make_translations(cr, uid, ids, field_ref, 'help', field_rec.help, _case_insensitive_replace(field_rec.help,'Customer',o.partner), context=context)
+            #translate menuitems
+            menu_ids = menu_obj.search(cr,uid, [('name','ilike','Customer')])
+            for m_id in menu_obj.browse(cr, uid, menu_ids, context=context):
+                menu_name = m_id.name
+                menu_ref = 'ir.ui.menu' + ',' + 'name'
+                self.make_translations(cr, uid, ids, menu_ref, 'model', menu_name, _case_insensitive_replace(menu_name,'Customer',o.partner), res_id=m_id.id, context=context)
+            #translate act window name
+            act_window_ids = act_window_obj.search(cr, uid, [('name','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'name'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.name, _case_insensitive_replace(act_id.name,'Customer',o.partner), res_id=act_id.id, context=context)
+            #translate act window tooltips
+            act_window_ids = act_window_obj.search(cr, uid, [('help','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'help'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
+        return {}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
deleted file mode 100644
index 2c4f8f46323..00000000000
--- a/addons/base_setup/base_setup_data.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data noupdate="1">
-    <record id="view_base_setup" model="ir.ui.view">
-      <field name="name">Setup</field>
-      <field name="model">base.setup.config</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-      <form string="Information about your new database">
-        <group colspan="4" col="8">
-          <group colspan="3" width="220">
-            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-            <newline/>
-            <label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/>
-          </group>
-          <separator string="" orientation="vertical" colspan="1" rowspan="8"/>
-          <group colspan="4" width="400">
-            <separator string="New Database" colspan="4"/>
-            <label align="0.0" string="Your database is now created." colspan="4"/>
-            <field name="installed_users" nolabel= "1" colspan="4"/>
-          </group>
-        </group>
-        <group colspan="8" col="8">
-          <separator string="" colspan="8"/>
-          <label string="" colspan="6"/>
-          <button name="menu" icon="gtk-ok" type="object" string="Skip Configuration Wizards" help="Only for experimented users" colspan="1"/>
-          <button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
-        </group>
-    </form>
-   </field>
-  </record>
-
-    <record id="action_base_setup" model="ir.actions.act_window">
-      <field name="name">Setup</field>
-      <field name="res_model">base.setup.config</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="view_id" ref="view_base_setup"/>
-      <field name="target">new</field>
-    </record>
-
-    <record id="base.user_root" model="res.users">
-      <field name="action_id" ref="action_base_setup"/>
-      <field name="menu_id" ref="action_base_setup"/>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/base_setup/base_setup_demo.xml b/addons/base_setup/base_setup_demo.xml
deleted file mode 100644
index 39f923a895b..00000000000
--- a/addons/base_setup/base_setup_demo.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-    </data>
-</openerp>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
deleted file mode 100644
index 91963737e12..00000000000
--- a/addons/base_setup/base_setup_installer.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<openerp>
-  <data>
-
-    <record id="view_base_setup_installer" model="ir.ui.view">
-      <field name="name">base.setup.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
-          </xpath>
-          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                    <attribute name="string"/>
-                    <attribute name="rowspan">15</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Install</attribute>
-          </xpath>
-          <separator string="title" position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </separator>
-
-          <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account_voucher" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account_accountant" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="marketing" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <group name="crm"/> 
-            <group name="sale"/> 
-            <group name="project"/> 
-            <group name="knowledge"/> 
-            <group name="mrp"/> 
-            <group name="account_accountant"/>
-            <group name="purchase"/>
-            <group name="hr"/>
-            <group name="profile_tools"/>
-            <group name="marketing"/>
-            <group name="report_designer"/>
-            <group name="association"/>
-          </group>
-        </data>
-      </field>
-    </record>
-
-    <record id="action_base_setup_installer" model="ir.actions.act_window">
-      <field name="name">Install Applications</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.setup.installer</field>
-      <field name="view_id" ref="view_base_setup_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="base_setup_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_installer"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">2</field>
-    </record>
-
-    <record id="action_start_configurator" model="ir.actions.server">
-      <field name="name">Start Configuration</field>
-      <field name="model_id" ref="base.model_ir_actions_todo"/>
-      <field name="state">code</field>
-      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = obj.pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
-    </record>
-    
-    <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
-    <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
-      <field name="name">Add More Features</field>
-      <field name="resource">ir.ui.menu</field>
-      <field name="user_id" ref="base.user_root"/>
-      <field name="res_id" ref="menu_view_base_module_configuration"/>
-    </record>
-<!--     Migrate data from another application Conf Wiz-->
-
-    <record id="view_migrade_application_installer_modules" model="ir.ui.view">
-        <field name="name">migrade.application.installer.modules.form</field>
-        <field name="model">migrade.application.installer.modules</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="base.res_config_installer"/>
-        <field name="arch" type="xml">
-            <data>
-                <form position="attributes">
-                    <attribute name="string">Migrate data from another application</attribute>
-                </form>
-                <separator string="title" position="attributes">
-                     <attribute name="string">Migrate data from another application</attribute>
-                </separator>
-                <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">Import data from other applications. Following the selected application, you can import more or less type of data matching to OpenERP objects. Choose the application and then the data you want to import in OpenERP</attribute>
-                </xpath>
-                <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                </xpath>
-                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                    <attribute name="string"/>
-                </xpath>
-                <group colspan="8">
-                    <field name="import_saleforce"/>
-                    <field name="import_sugarcrm"/>
-                    <field name="sync_google_contact"/>
-                    <field name="quickbooks_ippids"/>
-                </group>
-            </data>
-        </field>
-    </record>
-
-    <record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
-	     <field name="name">Migrate data from another application</field>
-	     <field name="type">ir.actions.act_window</field>
-	     <field name="res_model">migrade.application.installer.modules</field>
-	     <field name="view_id" ref="view_migrade_application_installer_modules"/>
-	     <field name="view_type">form</field>
-	     <field name="view_mode">form</field>
-	     <field name="target">new</field>
-   </record>
-
-   <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_migrade_application_installer_modules"/>
-      <field name="category_id" ref="base.category_administration_config"/>
-  </record>
-
-          <!-- Import or create customers configartion view  -->
-
-	 <record id="action_import_create_installer" model="ir.actions.act_window">
-	     <field name="name">Import or Create Customers</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">tree,form</field>
-	     <field name="view_id" ref="base.view_partner_tree"/>
-	     <field name="help">Create some Customers, Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
-	 </record>
-
-    <!--          register configuration wizard -->
-	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
-	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="category_id" ref="base.category_administration_config"/>
-    </record>
-
-	<!--        Define default users preferences-->
-
-     <record id="view_user_preferences_config_form" model="ir.ui.view">
-          <field name="name">Define default users preferences</field>
-          <field name="model">user.preferences.config</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.res_config_view_base"/>
-          <field name="arch" type="xml">
-            <data>
-              <form position="attributes">
-                <attribute name="string">Define default users preferences</attribute>
-              </form>
-            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                  <attribute name="string">Define default users preferences</attribute>
-            </xpath>
-            <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
-            </xpath>
-            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                  <attribute name="string"/>
-                  <attribute name="rowspan">12</attribute>
-            </xpath>
-             <group string="res_config_contents" position="replace">
-                    <group colspan="4">
-                        <field colspan="4" name="view"/>
-                        <field colspan="4" name="context_lang"/>
-                        <field colspan="4" name="context_tz"/>
-                        <field colspan="4" name="menu_tips"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-
-      <record id="action_user_preferences_config_form" model="ir.actions.act_window">
-          <field name="name">Define default users preferences</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">user.preferences.config</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="view_user_preferences_config_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
-
-      <!--   Register configuration wizard -->
-
-      <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
-          <field name="action_id" ref="action_user_preferences_config_form"/>
-          <field name="category_id" ref="base.category_administration_config"/>
-      </record>
-
-      <!--     Config Wiz   Create New User's Login   -->
-
-      <record id="action_config_access_other_user" model="ir.actions.act_window">
-          <field name="name">Create New User's Login</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">res.users</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="base.view_users_form"/>
-      </record>
-
-      <!--   register configuration wizard  -->
-
-      <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
-          <field name="action_id" ref="action_config_access_other_user"/>
-          <field name="category_id" ref="base.category_administration_config"/>
-          <field name="sequence">1000</field>
-          <field name="state">done</field>
-      </record>
-
-      <!--   register Upload Logo configuration wizard  -->
-
-      <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
-          <field name="action_id" ref="action_res_company_logo"/>
-          <field name="category_id" ref="base.category_administration_config"/>
-          <field name="state">done</field>
-      </record>
-
-            <!--        Specify Your Terminology Config Wiz-->
-
-     <record id="view_partner_terminology_config_form" model="ir.ui.view">
-          <field name="name">Specify Your Terminology</field>
-          <field name="model">specify.partner.terminology</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.res_config_view_base"/>
-         <field name="arch" type="xml">
-            <data>
-              <form position="attributes">
-                <attribute name="string">Specify Your Terminology</attribute>
-              </form>
-            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                  <attribute name="string">Specify Your Terminology</attribute>
-            </xpath>
-            <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Based on the industry needs you can use this wizard to change the terminologies for Partners. </attribute>
-            </xpath>
-            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                  <attribute name="string"/>
-                 <attribute name="rowspan">12</attribute>
-            </xpath>
-             <group string="res_config_contents" position="replace">
-                    <group colspan="4">
-                        <field colspan="4" name="partner"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-
-      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
-          <field name="name">Customer / Partner / Patient ?</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">specify.partner.terminology</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="view_partner_terminology_config_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
-
-      <!--   Register configuration wizard -->
-
-      <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
-          <field name="action_id" ref="action_partner_terminology_config_form"/>
-          <field name="category_id" ref="base.category_administration_config"/>
-      </record>
-
-
-    <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Company Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">res.company</field>
-      <field name="view_id" ref="base.view_company_form"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="context">{'res_id': user.company_id.id}</field>
-    </record>
-
-    <record id="base_setup_company_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_company"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">1</field>
-    </record>
-
-  </data>
-</openerp>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
new file mode 100644
index 00000000000..35d0c647892
--- /dev/null
+++ b/addons/base_setup/base_setup_views.xml
@@ -0,0 +1,173 @@
+<openerp>
+  <data>
+
+      <record model="ir.actions.act_window" id="action_base_setup_installer_beta">
+          <field name="name">Install Applications</field>
+          <field name="res_model">base.setup.installer</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+
+
+      <record id="base_setup_installer_todo" model="ir.actions.todo">
+          <field name="action_id" ref="action_base_setup_installer_beta" />
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="sequence">2</field>
+      </record>
+
+      <record id="action_start_configurator" model="ir.actions.server">
+          <field name="name">Start Configuration</field>
+          <field name="model_id" ref="base.model_ir_actions_todo"/>
+          <field name="state">code</field>
+          <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
+      </record>
+
+      <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
+      <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
+          <field name="name">Add More Features</field>
+          <field name="resource">ir.ui.menu</field>
+          <field name="user_id" ref="base.user_root"/>
+          <field name="res_id" ref="menu_view_base_module_configuration" />
+      </record>
+
+     <!-- Import or create customers configartion view  -->
+     <record id="action_import_create_installer" model="ir.actions.act_window">
+         <field name="name">Create or Import Customers</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">tree,form</field>
+         <field name="view_id" ref="base.view_partner_tree"/>
+         <field name="help">Create or Import Customers  and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
+     </record>
+     <record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
+         <field name="action_id" ref="action_import_create_installer"/>
+         <field name="category_id" ref="base.category_sales_management_config"/>
+    </record>
+
+     <!-- Define default users preferences-->
+     <record id="view_user_preferences_config_form" model="ir.ui.view">
+          <field name="name">Set default users preferences</field>
+          <field name="model">user.preferences.config</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.res_config_view_base"/>
+          <field name="arch" type="xml">
+            <data>
+              <form position="attributes">
+                <attribute name="string">Define Users's Preferences</attribute>
+              </form>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Define Users's Preferences</attribute>
+            </xpath>
+            <xpath expr="//label[@string='description']" position="attributes">
+              <attribute name="string">This will set the default preferences for new users and update all existing ones. Afterwards, users are free to change those values on their own user preference form.</attribute>
+            </xpath>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">12</attribute>
+            </xpath>
+             <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" name="view"/>
+                        <field colspan="4" name="context_lang"/>
+                        <field colspan="4" name="context_tz"/>
+                        <field colspan="4" name="menu_tips"/>
+                  </group>
+              </group>
+            </data>
+          </field>
+      </record>
+      <record id="action_user_preferences_config_form" model="ir.actions.act_window">
+          <field name="name">Define default users preferences</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">user.preferences.config</field>
+          <field name="view_type">form</field>
+          <field name="view_id" ref="view_user_preferences_config_form"/>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+      <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_user_preferences_config_form"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">once</field>
+      </record>
+
+      <!-- Create Additional Users  -->
+      <record id="action_config_access_other_user" model="ir.actions.act_window">
+          <field name="name">Create Additional Users</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">res.users</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,form</field>
+          <field name="view_id" eval="False"/>
+      </record>
+      <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_config_access_other_user"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="sequence">1000</field>
+      </record>
+
+
+      <!--   Specify Your Terminology Config Wiz-->
+     <record id="base_setup_terminology_form" model="ir.ui.view">
+          <field name="name">Specify Your Terminology</field>
+          <field name="model">base.setup.terminology</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.res_config_view_base"/>
+         <field name="arch" type="xml">
+            <data>
+              <form position="attributes">
+                <attribute name="string">Specify Your Terminology</attribute>
+              </form>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Specify Your Terminology</attribute>
+            </xpath>
+            <xpath expr="//label[@string='description']" position="attributes">
+              <attribute name="string">You can use this wizard to change the terminologies for customers in the whole application.</attribute>
+            </xpath>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                 <attribute name="rowspan">12</attribute>
+            </xpath>
+             <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" name="partner"/>
+                  </group>
+              </group>
+            </data>
+          </field>
+      </record>
+      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
+          <field name="name">Use another word to say "Customer"</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">base.setup.terminology</field>
+          <field name="view_type">form</field>
+          <field name="view_id" ref="base_setup_terminology_form"/>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+      <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_partner_terminology_config_form"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">once</field>
+      </record>
+
+    <!-- Company config -->
+    <record id="action_base_setup_company" model="ir.actions.act_window">
+      <field name="name">Set Company Header and Footer</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">res.company</field>
+      <field name="view_id" ref="base.view_company_form"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="context">{'res_id': user.company_id.id}</field>
+    </record>
+    <record id="base_setup_company_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_company"/>
+        <field name="category_id" ref="base.category_administration_config"/>
+        <field name="sequence">1</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index a2d59e2876e..5dc55269b8b 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -7,81 +7,81 @@ 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-11-14 11:20+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-15 05:06+0000\n"
+"X-Generator: Launchpad (build 14291)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
 msgid "City"
-msgstr ""
+msgstr "المدينة"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install"
-msgstr ""
+msgstr "تثبيت"
 
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "الفواتير"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "الموارد البشرية"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "البريد الإلكتروني"
 
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "رقم الحساب المصرفي"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "أدوات إضافية"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "تذييل تقرير 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
 msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
-msgstr ""
+msgstr "يساعدك على إدارة عمليات التصنيع وإصدار تقارير عن هذه العمليات."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "يساعدك على إدارة حملاتك التسويقية خطوة بخطوة."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "تم إنشاء قاعدة البيانات"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr ""
+msgid "Point of Sale"
+msgstr "نقاط البيع"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "الجمعيات"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -89,49 +89,51 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"يساعدك على التعامل مع احتياجاتك المحاسبية. إذا لم تكن محاسباً، نقترح تثبيت "
+"\"الفواتير\" فقط "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "تمت إضافة المستخدمين التالين: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "تقدم الإعدادات"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "تذييل تقرير 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
 #: model:ir.model,name:base_setup.model_res_currency
 msgid "Currency"
-msgstr ""
+msgstr "العملة"
 
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "المحافظة / الولاية"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "التسويق"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "الشركة"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "إدارة المبيعات"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -139,28 +141,30 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"يمكّنك من تثبيت عدد من الأدوات المفيدة ولكن غير الضرورية، مثل الاستبانات "
+"والوجبات وصندوق الأفكار."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
-msgstr ""
+msgstr "يمكنك الشروع في إعداد النظام أو استخدام النظام مباشرة كمدير."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "تقارير متقدمة"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "هاتف"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -168,16 +172,18 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"سيتمّ استخدام معلومات شركتك لتخصيص المستندات التي يصدرها OpenERP مثل "
+"الفواتير وأوامر المبيعات وغير ذلك الكثير."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "العنوان"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "إدارة المعارف"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -197,6 +203,19 @@ msgid ""
 "    footer, the account chart to install and the language.\n"
 "    "
 msgstr ""
+"\n"
+"    هذا البرنامج يشمل إعدادات النظام ليساعد المستخدم\n"
+"    لإعداد النظام أثناء إنشاءه قاعدة بيانات جديدة.\n"
+"\n"
+"    سيسمح لك بإختيار من قائمة معرفة لتنصيب:\n"
+"    * الحد الأدني للنظام\n"
+"    * برامج المحاسبة فقط\n"
+"    * برامج القطاع الخدمي\n"
+"    * برامج القطاع التصنيعي\n"
+"\n"
+"    بالإضافة إلي مساعدتك علي تحديد نوع شركتك، اسمها\n"
+"    و تعريف نوع الدليل المحاسبي و اللغة.\n"
+"    "
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -204,6 +223,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً تساعدك على إدارة نوع "
+"الصناعة الخاص بك."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -211,16 +232,17 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"يساعدك على إدارة مشاريعك ومهامك عن طريق متابعتهم وإصدار الخطط وما إلى ذلك."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "اسم الشركة"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "تجاوز معالجات الإعدادات"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -228,6 +250,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"يساعدك على إدارة مواردك البشرية عن طريق فهم هيكل الموظفين وإصدار أوراق العمل "
+"ومتابعة الحضور وغير ذلك."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -235,11 +259,13 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"يمكّنك من إصدار الفواتير و متابعة المدفوعات.  يعدّ نسخة مبسطة من "
+"\"المحاسبة\" مناسبة للمدراء غير المحاسِبين."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -247,6 +273,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"يساعدك على إدارة العمليات المتعلقة بالشراء مثل طلبات التسعير وفواتير "
+"الموردين وما إلى ذلك."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -255,31 +283,34 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"ستظهر هذه الجملة أسفل التقارير.\n"
+"نقترح عليك وضع معلوماتك المصرفية هنا:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "العنوان 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "الدولة"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "إعداد"
 
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "الحسابات و المالية"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -289,19 +320,19 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "الرمز البريدي"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "بدء الإعداد"
 
 #. module: base_setup
 #: help:base.setup.installer,knowledge:0
 msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
-msgstr ""
+msgstr "يمكّنك من تثبيت إضافات غرضها نشر ومشاركة المعارف بين موظفيك."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -309,17 +340,19 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"اختر التطبيقات الي تريد أن يتضمنها النظام. إذا لم تكن متأكداً من احتياجاتك "
+"بدقة في هذه المرحلة، يمكنك تثبيت أي من التطبيقات بسهولة لاحقاً."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "إعدادات الشركة"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "الشعار"
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -328,41 +361,43 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"يساعدك على تشغيل نقاط البيع بكفاءة عن طريق تسجيل عمليات البيع بسرعة وتوفير "
+"وضع مبسط للدفع وإصدار تلقائي لقوائم الالتقاط وغير ذلك."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "إدارة المشتريات"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "يساعدك على التعامل مع التسعيرات وأوامر المبيعات والفواتير."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "إدارة المخازن و المستودعات"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "إدارة المشاريع"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "المستخدمون المعرّفون"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "قاعدة بيانات جديدة"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "إدارة علاقات العملاء"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -370,6 +405,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً لتساعدك على إدارة "
+"المزادات والعمليات المتعلقة بها."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -378,45 +415,48 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"ستظهر هذه الجملة في الزاوية اليمنى في رأس كل تقرير.\n"
+"نقترح عليك وضع شعار هنا:\n"
+"\"حلول أعمال مفتوحة المصدر\"."
 
 #. module: base_setup
 #: help:base.setup.installer,report_designer:0
 msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
-msgstr ""
+msgstr "يمكّنك من تثبيت عدة أدوات تسهل وتحسن إنشاء التقارير."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "رأس التقرير"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "معلومات عن قاعدة البيانات الجديدة"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "صورة"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "الصناعات الغذائية"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "التصنيع"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "الشعار - استخدم صورة بحجم 150x450 نقطة"
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -425,37 +465,40 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"ستظهر هذه الجملة في أسفل التقارير.\n"
+"نقترح عليك كتابة معلومات قانونية هنا:\n"
+"موقع: http://openerp.com - فاكس: +32.81.73.35.01 - بنك فوتيس: 126-2013269-07"
 
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "الموقع الإلكتروني للشركة"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "ثبّت تطبيقات صناعات معينة"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
 msgid "Street"
-msgstr ""
+msgstr "العنوان"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "إعداد البيانات الخاصة بشركتكم"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "مثال: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "تثبيت تطبيقات"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -464,6 +507,9 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"يساعدك على متابعة وإدارة علاقات العملاء مثل الفرص والطلبات والشكاوى. يوفر "
+"إمكانيات تلقائية لإرسال رسائل تذكير، وتصعيد طلبات، وابتداء إجراءات مخصصة "
+"بناء على أحداث قياسية."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
@@ -471,11 +517,13 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"يساعدك على إدارة العمليات المتعلقة بكميات المخزون مثل أوامر التسليم "
+"والاستلام وما إلى ذلك."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "الإعدادات الأساسية"
 
 #. module: base_setup
 #: help:base.setup.installer,association:0
@@ -483,8 +531,13 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً لتساعدك على إدارة جمعيتك "
+"بكفاءة أعلى."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
+
+#~ msgid "Point of Sales"
+#~ msgstr "نقاط البيع"
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index f96155ea246..2f76a49f27c 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -72,7 +72,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 2e8d6b321d5..e00d8c838da 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.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:14+0000\n"
-"PO-Revision-Date: 2009-09-08 14:09+0000\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +77,7 @@ msgstr "Базата данни е създадена"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "POS продажби"
 
 #. module: base_setup
@@ -601,3 +601,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Предишен"
+
+#~ msgid "Point of Sales"
+#~ msgstr "POS продажби"
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index 64d08bb16d8..d16261f722b 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -75,7 +75,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 9b56268acb7..fec53e21170 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -7,15 +7,15 @@ 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: 2009-09-30 08:29+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+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-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -30,12 +30,12 @@ msgstr "Instal·la"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos humans"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -45,12 +45,12 @@ msgstr "Correu electrònic"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Núm. compte bancari"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Eines extres"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -63,26 +63,28 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"L'ajuda a gestionar els seus processos de fabricació i generar informes "
+"sobre aquests processos."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "L'ajuda a gestionar les seves campanyes de màrqueting pas a pas."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "La seva base de dades ja està creada."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr ""
+msgid "Point of Sale"
+msgstr "Terminal punt de venda"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Associacions"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -90,18 +92,20 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"L'ajuda a gestionar les seves necessitats comptables. Si no és comptable, li "
+"suggerim instal·lar només la facturació. "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Els següents usuaris han estat instal·lats : \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -117,22 +121,22 @@ msgstr "Moneda"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Província"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Màrqueting"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Gestió de vendes"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -140,6 +144,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Permet instal·lar diverses eines interessants però no essencials com a "
+"Informes, menjars i caixa d'Idees."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -147,11 +153,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Podeu començar configurant el sistema o connectant directament a la base de "
+"dades com un administrador."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Informes avançats"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -161,7 +169,7 @@ msgstr "Telèfon"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_continguts"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -169,16 +177,18 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"La informació de la seva companyia s'utilitzarà per personalitzar els "
+"documents expedits amb OpenERP, com les factures, comandes i molt més."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Gestió del coneixement"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -198,6 +208,21 @@ msgid ""
 "    footer, the account chart to install and the language.\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul implementa un sistema de configuració que ajuda a l'usuari\n"
+"    a configurar el sistema durant la instal·lació d'una nova base de "
+"dades.\n"
+"\n"
+"    Li permet seleccionar entre una llista de perfils a instal·lar:\n"
+"    * Perfil mínim\n"
+"    * Només comptabilitat\n"
+"    * Companyies de serveis\n"
+"    * Companyies de fabricació\n"
+"\n"
+"    També proporciona pantalles per ajudar-vos a configurar fàcilment la "
+"seva companyia, la capçalera i \n"
+"    el peu de pàgina, el pla comptable a instal·lar i l'idioma.\n"
+"    "
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -205,6 +230,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Instal·la un conjunt preseleccionat d'aplicacions d'OpenERP que poden ajudar-"
+"vos a gestionar la seva indústria."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -212,6 +239,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Li ajuda a gestionar els seus projectes i tasques realitzant un seguiment "
+"dels mateixos, generant planificacions, ..."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -221,7 +250,7 @@ msgstr "Nom de la companyia"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Omet assistents de configuració"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -229,6 +258,9 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Li ajuda a gestionar els seus recursos humans mitjançant la codificació de "
+"l'estructura de treballadors, la generació de fulls de treball, seguiment de "
+"l'assistència, ..."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -236,11 +268,13 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Li permet crear les seves factures i controlar els pagaments. És una versió "
+"més fàcil del mòdul de comptabilitat per a gestors que no siguin comptables."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.companyia"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -248,6 +282,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Li ajuda a gestionar els seus processos relacionats amb les compres com "
+"peticions de pressupostos, factures de proveïdor, ..."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -263,12 +299,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Carrer 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.instal·lador"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -283,17 +319,17 @@ msgstr "Instal·lació"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Comptabilitat i finances"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Cases de subhastes"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Codi postal"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -306,6 +342,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Li permet instal·lar addons orientats a compartir el coneixement amb i entre "
+"els seus treballadors."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -313,12 +351,15 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Escolliu les aplicacions que desitgeu cobrir amb el seus sistema. Si no "
+"esteu segurs sobre les seves necessitats exactes en aquest punt, podeu "
+"instal·lar-les fàcilment més tard."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Configuració de la compañía"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -332,41 +373,45 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Li ajuda a treure profit dels seus terminals punt de venda amb la "
+"codificació ràpida de les vendes, codificació de maneres de pagament "
+"simplificada, generació automàtica d'albarans, ..."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Gestió de compres"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
 msgstr ""
+"Li ajuda a gestionar els seus pressupostos, comandes de venda i facturació."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Gestió de magatzems"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Gestió de projectes"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Usuaris instal·lats"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nova base de dades"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Gestió de les relacions amb el client (CRM)"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -374,6 +419,9 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"Instal·la un conjunt preseleccionat d'aplicacions d'OpenERP per ajudar-vos a "
+"gestionar les seves subhastes com també els processos de negoci al voltant "
+"d'elles."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -392,6 +440,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Li permet instal·lar diverses eines per simplificar i millorar la creació "
+"d'informes en OpenERP."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -401,24 +451,24 @@ msgstr "Capçalera dels informes"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informació sobre la seva nova base de dades"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Indústria alimentària"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Producció"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -440,12 +490,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Pàgina web de la companyia"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Instal·la aplicacions específiques per a la indústria"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -455,18 +505,18 @@ msgstr "Carrer"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Configura la informació de la seva companyia"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Exemple: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Instal·la aplicacions"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -475,6 +525,10 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"L'ajuda a controlar i administrar les relacions amb els clients, tals com "
+"les iniciatives, peticions o qüestions. Podeu enviar automàticament "
+"recordatoris, escalar les peticions o activar accions específiques del "
+"negoci basat en esdeveniments estàndard."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
@@ -482,6 +536,8 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"Li ajuda a gestionar el seu inventari i les operacions principals d'estoc: "
+"les ordres de lliurament, recepcions, ..."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -494,11 +550,13 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Instal·la un conjunt preseleccionat d'aplicacions en OpenERP que li ajudarà "
+"a administrar la seva associació de manera més eficient."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
 
 #~ msgid "Select a Profile"
 #~ msgstr "Seleccioneu un perfil"
@@ -569,3 +627,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Podeu iniciar la configuració del sistema o connectar-vos directament a la "
 #~ "base de dades utilitzant la instal·lació per defecte."
+
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punt de venda"
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index 8d7140bf5fd..595a3cd5c33 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_setup
+# * base_setup
 #
 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: 2009-11-17 08:51+0000\n"
-"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -29,12 +30,12 @@ msgstr "Instalovat"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturace"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Lidské zdroje"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,17 +45,17 @@ msgstr "E-mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Číslo bankovního účtu"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Další nástroje"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr "Patička výpisu 1"
+msgstr "Zápatí výpisu 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -62,26 +63,28 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Pomůže vám spravovat vaše výrobní procesy a generovat výkazy nad těmito "
+"procesy."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Pomáhá vámkrok za krokem spravovat vaše marketingové kampaně."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Vaše databáze je nyní vytvořena."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr ""
+msgid "Point of Sale"
+msgstr "Prodejní místo"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Přidružení"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -89,23 +92,25 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Pomůže vám zvládnout vaše účetní potřeby. Pokud nejste účetní, doporučujeme "
+"vám instalovat pouze Fakturaci. "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Byli instalováni následující uživatelů : \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Průběh nastavení"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr "Patička výpisu 2"
+msgstr "Zápatí výpisu 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
@@ -116,22 +121,22 @@ msgstr "Měna"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Fed. stát"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Společnost"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Řízení prodeje"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -139,6 +144,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Umožní vám instalovat různé zajímavé, ale ne nutně potřebné nástroje jako "
+"Průzkumy, Obědy a Krabice nápadů."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -146,11 +153,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Můžete začít s nastavením systému nebo se přímo připojit k databázi jako "
+"správce."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Pokročilé vykazování"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -160,7 +169,7 @@ msgstr "Telefon"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -168,16 +177,18 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Vaše informace o společnosti budou použity pro přizpůsobení dokumentů "
+"vytvářených OpenERP jako faktury, prodejní objednávky a mnoho dalších."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "název"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Správa znalostí"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -204,6 +215,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Instalovat předvybranou sadu aplikací OpenERP, která vám pomůže spravovat "
+"vaše odvětví."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -211,6 +224,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Pomůže vám spravovat projekty a úkoly jejich sledováním, generováním plánů, "
+"aj."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -220,7 +235,7 @@ msgstr "Název společnosti"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Přeskočit průvodce nastavení"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -228,6 +243,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Pomůže vám spravovat vaše lidské zdroje pomocí nakódování struktury "
+"zaměstnanců, generování pracovních listů, sledování docházky a další."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -235,11 +252,13 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Umožní vám vytvořit faktury a sledovat platby. Jedná se o jednodušší "
+"variantu účetního modulu pro vedoucí, kteří nejsou účetními."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -247,6 +266,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Pomůže vám spravovat vaše nákupní procesy jako požadavky na ocenění, faktury "
+"dodavatelů, aj."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -255,16 +276,19 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Tato věta se objeví dole ve vašich výkazech.\n"
+"Doporučujeme vám dát zde bankovní informace:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Ulice 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -279,17 +303,17 @@ msgstr "Nastavení"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Účetnictví & peněžnictví"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Aukční domy"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "PSČ"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -302,6 +326,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Umožní vám instalovat doplňky zaměřené na sdílení znalostí s a mezi vašimi "
+"zaměstnanci."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -309,12 +335,15 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Vyberte aplikace, které chcete, aby zahrnoval váš systém. Můžete je "
+"instalovat snadno později, pokud si nejste v této fázi jisti svými přesnými "
+"požadavky."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Nastavení společnosti"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -328,41 +357,45 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Pomůže vám s většinou vašich prodejních míst díky rychlému kódování prodeje, "
+"zjednodušenému kódování režimu plateb, automatickému generování naváděcích "
+"seznamu a další."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Řízení nákupu"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
 msgstr ""
+"Pomáhá vám spravovat vaše cenové nabídky, prodejní příkazy a fakturaci."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Správa skladů"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektové řízení"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Instalováni uživatelé"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nová databáze"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Řízení vztahů se zákazníky"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -370,6 +403,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"Instaluje předvybranou sadu aplikací OpenERP, která je vybraná, aby vám "
+"pomohla spravovat vaše aukce stejně tak jako obchodní procesy kolem."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -378,6 +413,9 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Tato věta se objeví v pravém horním roku vašich výkazů.\n"
+"Doporučujeme vám umístit zde slogan:\n"
+"\"Otevřené obchodní řešení\"."
 
 #. module: base_setup
 #: help:base.setup.installer,report_designer:0
@@ -385,38 +423,40 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Umožní vám instalovat rozličné nástroje ke zjednodušení a vylepšení "
+"vytváření výkazů OpenERP."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
 msgid "Report Header"
-msgstr "Hlavička výpisu"
+msgstr "Záhlaví výpisu"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informace o vaší nové databázi"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obrázek"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Potravinářský průmysl"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Výroba"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaše logo - Použijte velikost 450x150 obrazových bodů."
+msgstr "Vaše logo - Použijte velikost okolo 450x150 obrazových bodů."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -425,16 +465,19 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"Tato věta se objeví na spodu vašich výkazů.\n"
+"Navrhujeme vám napsat zde právní věty:\n"
+"Web: http://openerp.com - Fax: +420 123456789 - Bankovní účet: 123456789/1234"
 
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Stránky společnosti"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Instalovat určité průmyslové aplikace"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -444,18 +487,18 @@ msgstr "Ulice"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Nastavit informace vaší společnosti"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Příklad: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Instalovat aplikace"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -464,6 +507,9 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"Pomůže vám sledovat a spravovat vztahy se zákazníky jako vedení, požadavky "
+"nebo problémy. Může automaticky zasílat upozornění, stupňování požadavků "
+"nebo vyvolat obchodně vztažené akce založené na standardních událostech."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
@@ -471,11 +517,13 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"Pomůže vám spravovat váš inventář a hlavní skladové operace: doručovací "
+"příkazy, příjmy, aj."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Základní nastavení"
 
 #. module: base_setup
 #: help:base.setup.installer,association:0
@@ -483,6 +531,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Instalovat předvybranou sadu aplikací OpenERP, které vám pomůžou spravovat "
+"efektivněji vaše asociace."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
@@ -527,3 +577,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Installation Done"
 #~ msgstr "Instalace dokončena"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Prodejní místo"
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index f93d2fd83e5..e6c165e4cf3 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.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:14+0000\n"
-"PO-Revision-Date: 2011-04-12 08:42+0000\n"
-"Last-Translator: Lars Dige <Unknown>\n"
+"PO-Revision-Date: 2011-11-08 10:30+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -35,7 +35,7 @@ msgstr "Fakturering"
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr "Human Resources"
+msgstr "Personale (HR)"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -45,7 +45,7 @@ msgstr "E-mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr "Bank konto nr."
+msgstr "Bankkonto nr."
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -55,7 +55,7 @@ msgstr "Ekstra værktøjer"
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Rapport sidefod 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -63,26 +63,27 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Hjælper med at styre produktionsprocesser og lave rapporter over disse."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Hjælper dig med din maketingskampagne skridt for skridt"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr "Din database er ny oprettet"
+msgstr "Din database er nu oprettet"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr "Point of sales"
+msgid "Point of Sale"
+msgstr "Salgssted"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr "Foreninger"
+msgstr "Organisationer"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -90,23 +91,25 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Hjælper dig med at håndtere dine regnskabsmæssige behov. Hvis du ikke er "
+"revisor, foreslår vi dig kun at installere faktureringsmodulet "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr "Følgende brugere er installeret \n"
+msgstr "Følgende brugere er installeret: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Konfigurations fremskridt"
+msgstr "Konfigurationsfremgang"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr "Rapport sidefod"
+msgstr "Rapport sidefod 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
@@ -117,7 +120,7 @@ msgstr "Valuta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Delstat"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
@@ -127,12 +130,12 @@ msgstr "Markedsføring"
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr "Virksomhed"
+msgstr "Firma"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr "Salgsledelse"
+msgstr "Salgsstyring"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -140,8 +143,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
-"Lader dig installere forskellige interessante, men ikke-væsentlige værktøjer "
-"som f.eks. idé boks."
+"Du kan installere forskellige interessante, men ikke afgørende værktøjer som "
+"meningsmåling, frokost og idéer."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -150,7 +153,7 @@ msgid ""
 "an administrator."
 msgstr ""
 "Du kan starte med at konfigurere systemet eller tilslutte dig direkte til "
-"databasen som en administrator."
+"databasen som administrator."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
@@ -160,12 +163,12 @@ msgstr "Avanceret rapportering"
 #. module: base_setup
 #: field:base.setup.company,phone:0
 msgid "Phone"
-msgstr "Tlf. nr."
+msgstr "Telefon"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -173,8 +176,8 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
-"Dine virksomheds oplysninger vil blive brugt til at personliggøre dokumenter "
-"udstedt med OpenERP såsom fakturaer, salgsordrer og meget mere."
+"Dine virksomhedsoplysninger vil blive brugt til at individualisere "
+"dokumenter fra OpenERP som fakturaer, salgsordrer m.m."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -184,7 +187,7 @@ msgstr "titel"
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr "Knowledge Management"
+msgstr "Videnstyring"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -204,6 +207,19 @@ msgid ""
 "    footer, the account chart to install and the language.\n"
 "    "
 msgstr ""
+"\n"
+"    Dette modul implementerer et konfigurationssystem, der hjælper brugeren\n"
+"    med at konfigurere systemet ved installation af en ny database.\n"
+"\n"
+"    Det giver dig mulighed for at installere forskellige profiler:\n"
+"    * Minimal profil\n"
+"    * Kun regnskab\n"
+"    * Servicevirksomhed\n"
+"    * Produktionsvirksomhed\n"
+"\n"
+"    Modulet hjælper dig også med at oprette dit firma, sidehoved,\n"
+"    sidefod, kontoplan og sprog.\n"
+"    "
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -211,8 +227,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
-"Installerer en forudvalgt sæt OpenERP applikationer, der vil hjælpe dig med "
-"at administrere din branche."
+"Installerer en sæt OpenERP moduler, der vil hjælpe dig med at administrere "
+"din branche."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -220,8 +236,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
-"Hjælper dig med at administrere dine projekter og opgaver ved at spore dem, "
-"generere planlægning, osv. .."
+"Hjælper dig med at styre dine projekter og opgaver ved at spore dem, lave "
+"planlægning, osv. .."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -231,7 +247,7 @@ msgstr "Firmanavn"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr "Spring over konfigurations wizard"
+msgstr "Spring konfigurationsguide over"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -239,6 +255,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Hjælper dig med at styre dit personale ved at indkode dine medarbejderes "
+"struktur, opret arbejdsplaner, checke fremmøde og m.m."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -246,6 +264,8 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Lader dig oprette fakturaer og spore betalinger. Det er en lettere udgave af "
+"regnskabsmodulet for ledere, der ikke er regnskabskyndige.."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
@@ -258,7 +278,7 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
-"Hjælper dig med at styre dit køb-relaterede processer såsom anmodninger om "
+"Hjælper dig med at styre dine indkøbsrelaterede processer som anmodninger om "
 "tilbud, leverandørfakturaer, osv. .."
 
 #. module: base_setup
@@ -268,6 +288,9 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Denne sætning vises nederst i dine rapporter.\n"
+"Vi forslår at vise bankoplysninger her:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - Moms: BE0477.472.701"
 
 #. module: base_setup
 #: field:base.setup.company,street2:0
@@ -287,12 +310,12 @@ msgstr "Land"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup
 msgid "Setup"
-msgstr "Setup"
+msgstr "Opsætning"
 
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr "Regnskab & Finans"
+msgstr "Regnskab & finans"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -307,7 +330,7 @@ msgstr "Postnr"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Start Configuration"
-msgstr "Start konfiguration"
+msgstr "Startkonfiguration"
 
 #. module: base_setup
 #: help:base.setup.installer,knowledge:0
@@ -315,8 +338,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
-"Lader dig installere addons rettet mod at dele viden med og mellem dine "
-"medarbejdere."
+"Lader dig installere tillægsmodul beregnet til at dele viden med og mellem "
+"dine medarbejdere."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -324,20 +347,19 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
-"Vælg de programmer, du ønsker dit system skal indeholde. Hvis du ikke er "
-"sikker på netop dine behov på nuvræendetidspunkt, kan du nemt installere dem "
-"senere."
+"Vælg de moduler, som dit system skal indeholde. Hvis du ikke er sikker dine "
+"præcise behov på nuværende tidspunkt, kan du nemt installere dem senere."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Firmaopsætning"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -346,41 +368,43 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Hjælper dig med at få det bedste ud af dit detailhandelssystem med hurtigt "
+"salg, enkel betaling, automatisk plukliste m.m."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Indkøbsstyring"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "Hjælper dig med dina tilbud, salgsordre och fakturer."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Lagerstyrning"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektstyring"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Installerede brugere"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Ny database"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Kundestyring (CRM)"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -388,6 +412,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"Installerer et sæt OpenERP moduler, som hjælper med at styre auktioner og "
+"tilhørende forretningsprocesserne."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -396,6 +422,9 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Denne sætning vises i øverste højre hjørne af dine rapporter.\n"
+"Vi foreslår at indsætte et slogan her:\n"
+"\"Open Source fimaløsninger\"."
 
 #. module: base_setup
 #: help:base.setup.installer,report_designer:0
@@ -403,38 +432,40 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Lader dig installere diverse værktøjer til forenkle og forbedre udvikling af "
+"rapporter i OpenERP."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Rapporthoved"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Information om din nye database"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Billede"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Fødevareindustri"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Produktion"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Dit Logo - Brug en størrelse på ca. 450x150 pixels."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -443,37 +474,40 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"Denne sætning vises nederst i dine rapporter.\n"
+"Vi forslår at vise kontaktoplysninger her:\n"
+"Web: http://openerp.com - Fax: +32 81 733 501 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Firmaets hjemmeside"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Installerer specifikke branchemoduler"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
 msgid "Street"
-msgstr ""
+msgstr "Gade"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Opsætter dit firmaoplysninger"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Eksempel: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Installer moduler"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -482,18 +516,21 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"Hjælper med at spore og styre kunderelationer, som potentielle kunder, "
+"forespørgsler eller emner. Kan automatisk sende rykkere, fremme tilbud eller "
+"udløse forretningsspecifikke handlinger baseret på standard begivenheder."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
 msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
-msgstr ""
+msgstr "Hjælper med lageroperationer: Levering, modtagelse osv."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Basal opsætning"
 
 #. module: base_setup
 #: help:base.setup.installer,association:0
@@ -501,8 +538,13 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Installerer OpwnERP moduler, som hjælper med styring af forbindelser mere "
+"effektivt."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Point of sales"
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 27c093cf732..942bc9a5dd6 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 12:54+0000\n"
-"Last-Translator: silas <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12: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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr "Ihre Datenbank ist jetzt vollständig installiert"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "POS & Kasse"
 
 #. module: base_setup
@@ -623,26 +623,8 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Vorherig"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#~ msgid "Point of Sales"
+#~ msgstr "POS & Kasse"
 
 #~ msgid "Use Directly"
 #~ msgstr "Sofort beginnen"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index e2ebf50c8c5..8837d6d223e 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.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:14+0000\n"
-"PO-Revision-Date: 2010-12-15 03:01+0000\n"
+"PO-Revision-Date: 2011-11-07 12:51+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -78,7 +78,7 @@ msgstr "Η βάση σου έχει δημιουργηθεί"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Σημείο πώλησης"
 
 #. module: base_setup
@@ -627,8 +627,5 @@ msgstr "base.setup.config"
 #~ msgid "Cancel"
 #~ msgstr "Άκυρο"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου(Object) θα πρέπει να ξεκινά με x_ και δεν θα "
-#~ "πρέπει να περιέχει ειδικούς χαρακτήρες."
+#~ msgid "Point of Sales"
+#~ msgstr "Σημείο πώλησης"
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 204b13b59a9..a71e2900e12 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -7,15 +7,15 @@ 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-27 08:23+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+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-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -78,7 +78,7 @@ msgstr "Su base de datos ya está creada."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Terminal punto de venta"
 
 #. module: base_setup
@@ -628,23 +628,5 @@ msgstr "base.setup.config"
 #~ msgid "Define Main Company"
 #~ msgstr "Defina la compañia principal"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no vá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 no válido para la estructura de la vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 351d8a5943f..c646a7145ac 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -75,7 +75,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index bd400464b49..011ed071d89 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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr "Terminal punto de venta"
+msgid "Point of Sale"
+msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -558,6 +558,9 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
+
 #~ msgid "Select a Profile"
 #~ msgstr "Seleccione un perfil"
 
@@ -627,24 +630,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Define Main Company"
 #~ msgstr "Defina la compañia principal"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no vá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 no válido para la estructura de la vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 378e64b4566..9c4a446168b 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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr "Terminal punto de venta"
+msgid "Point of Sale"
+msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -627,3 +627,6 @@ msgstr "Configuración"
 
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "Su nueva base de datos ha sido instalada completamente."
+
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
diff --git a/addons/base_setup/i18n/es_MX.po b/addons/base_setup/i18n/es_MX.po
new file mode 100644
index 00000000000..b41004e6a10
--- /dev/null
+++ b/addons/base_setup/i18n/es_MX.po
@@ -0,0 +1,629 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_setup
+#
+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-27 08:23+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:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_setup
+#: field:base.setup.company,city:0
+msgid "City"
+msgstr "Ciudad"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install"
+msgstr "Instalar"
+
+#. module: base_setup
+#: field:base.setup.installer,account_voucher:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: base_setup
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
+msgstr "Recursos humanos"
+
+#. module: base_setup
+#: field:base.setup.company,email:0
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#. module: base_setup
+#: field:base.setup.company,account_no:0
+msgid "Bank Account No"
+msgstr "Nº cuenta bancaria"
+
+#. module: base_setup
+#: field:base.setup.installer,profile_tools:0
+msgid "Extra Tools"
+msgstr "Herramientas extras"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "Pie de página 1 de los informes"
+
+#. module: base_setup
+#: help:base.setup.installer,mrp:0
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+"Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
+"estos procesos."
+
+#. module: base_setup
+#: help:base.setup.installer,marketing:0
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Your database is now created."
+msgstr "Su base de datos ya está creada."
+
+#. module: base_setup
+#: field:base.setup.installer,point_of_sale:0
+msgid "Point of Sales"
+msgstr "Terminal punto de venta"
+
+#. module: base_setup
+#: field:base.setup.installer,association:0
+msgid "Associations"
+msgstr "Asociaciones"
+
+#. module: base_setup
+#: help:base.setup.installer,account_accountant:0
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing "
+msgstr ""
+"Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
+"sugerimos instalar sólo la facturación. "
+
+#. module: base_setup
+#: code:addons/base_setup/__init__.py:56
+#, python-format
+msgid "The following users have been installed : \n"
+msgstr "Los siguientes usuarios han sido instalados : \n"
+
+#. module: base_setup
+#: field:base.setup.company,progress:0
+#: field:base.setup.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "Pie de página 2 de los informes"
+
+#. module: base_setup
+#: field:base.setup.company,currency:0
+#: model:ir.model,name:base_setup.model_res_currency
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: base_setup
+#: field:base.setup.company,state_id:0
+msgid "Fed. State"
+msgstr "Provincia"
+
+#. module: base_setup
+#: field:base.setup.installer,marketing:0
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: base_setup
+#: field:base.setup.company,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: base_setup
+#: field:base.setup.installer,sale:0
+msgid "Sales Management"
+msgstr "Gestión ventas"
+
+#. module: base_setup
+#: help:base.setup.installer,profile_tools:0
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+"Permite instalar varias herramientas interesantes pero no esenciales como "
+"Informes, Comidas y caja de Ideas."
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid ""
+"You can start configuring the system or connect directly to the database as "
+"an administrator."
+msgstr ""
+"Puede empezar configurando el sistema o conectando directamente a la base de "
+"datos como un administrador."
+
+#. module: base_setup
+#: field:base.setup.installer,report_designer:0
+msgid "Advanced Reporting"
+msgstr "Informes avanzados"
+
+#. module: base_setup
+#: field:base.setup.company,phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid ""
+"Your company information will be used to personalize documents issued with "
+"OpenERP such as invoices, sales orders and much more."
+msgstr ""
+"La información de su compañía se usará para personalizar los documentos "
+"emitidos con OpenERP, como las facturas, pedidos y mucho más."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_setup
+#: field:base.setup.installer,knowledge:0
+msgid "Knowledge Management"
+msgstr "Gestión conocimiento"
+
+#. module: base_setup
+#: model:ir.module.module,description:base_setup.module_meta_information
+msgid ""
+"\n"
+"    This module implements a configuration system that helps user\n"
+"    to configure the system at the installation of a new database.\n"
+"\n"
+"    It allows you to select between a list of profiles to install:\n"
+"    * Minimal profile\n"
+"    * Accounting only\n"
+"    * Services companies\n"
+"    * Manufacturing companies\n"
+"\n"
+"    It also asks screens to help easily configure your company, the header "
+"and\n"
+"    footer, the account chart to install and the language.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
+"    a configurar el sistema durante la instalación de una nueva base de "
+"datos.\n"
+"\n"
+"    Le permite seleccionar entre una lista de perfiles a instalar:\n"
+"    * Perfil mínimo\n"
+"    * Sólo contabilidad\n"
+"    * Compañías de servicios\n"
+"    * Compañías de fabricación\n"
+"\n"
+"    También proporciona pantallas para ayudarle a configurar fácilmente su "
+"compañía, la cabecera y el pie de página, el plan contable a instalar y el "
+"idioma.\n"
+"    "
+
+#. module: base_setup
+#: help:base.setup.installer,product_expiry:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your industry."
+msgstr ""
+"Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
+"ayudarle a gestionar su industria."
+
+#. module: base_setup
+#: help:base.setup.installer,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
+"ellas, generando planificaciones, ..."
+
+#. module: base_setup
+#: field:base.setup.company,name:0
+msgid "Company Name"
+msgstr "Nombre de la compañía"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Skip Configuration Wizards"
+msgstr "Omitir asistentes configuración"
+
+#. module: base_setup
+#: help:base.setup.installer,hr:0
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+"Le ayuda a gestionar sus recursos humanos mediante la codificación de la "
+"estructura de los empleados, la generación de hojas de trabajo, seguimiento "
+"de la asistencia, ..."
+
+#. module: base_setup
+#: help:base.setup.installer,account_voucher:0
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+"Le permite crear sus facturas y controlar los pagos. Es una versión más "
+"fácil del módulo de contabilidad para gestores que no sean contables."
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
+msgstr "base.setup.compañía"
+
+#. module: base_setup
+#: help:base.setup.installer,purchase:0
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+"Le ayuda a gestionar sus procesos relacionados con las compras como "
+"peticiones de presupuestos, facturas de proveedor, ..."
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+"Esta frase aparecerá en la parte inferior de sus informes.\n"
+"Le sugerimos poner información bancaria, por ejemplo:\n"
+"IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
+
+#. module: base_setup
+#: field:base.setup.company,street2:0
+msgid "Street 2"
+msgstr "Calle 2"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_installer
+msgid "base.setup.installer"
+msgstr "base.setup.instalador"
+
+#. module: base_setup
+#: field:base.setup.company,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup
+msgid "Setup"
+msgstr "Instalación"
+
+#. module: base_setup
+#: field:base.setup.installer,account_accountant:0
+msgid "Accounting & Finance"
+msgstr "Contabilidad y finanzas"
+
+#. module: base_setup
+#: field:base.setup.installer,auction:0
+msgid "Auction Houses"
+msgstr "Casas de subastas"
+
+#. module: base_setup
+#: field:base.setup.company,zip:0
+msgid "Zip Code"
+msgstr "Código postal"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Start Configuration"
+msgstr "Empezar configuración"
+
+#. module: base_setup
+#: help:base.setup.installer,knowledge:0
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+"Le permite instalar addons orientados a compartir el conocimiento con y "
+"entre sus empleados."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid ""
+"Select the Applications you want your system to cover. If you are not sure "
+"about your exact needs at this stage, you can easily install them later."
+msgstr ""
+"Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
+"acerca de sus necesidades exactas en este punto, puede instalarlas "
+"fácilmente más tarde."
+
+#. module: base_setup
+#: view:base.setup.company:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Company Configuration"
+msgstr "Configuración compañía"
+
+#. module: base_setup
+#: field:base.setup.company,logo:0
+msgid "Logo"
+msgstr "Logo"
+
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+"Le ayuda sacar provecho de sus terminales punto de venta con la codificación "
+"rápida de las ventas, codificación de modos de pago simplificada, generación "
+"automática de albaranes, ..."
+
+#. module: base_setup
+#: field:base.setup.installer,purchase:0
+msgid "Purchase Management"
+msgstr "Gestión de compras"
+
+#. module: base_setup
+#: help:base.setup.installer,sale:0
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+"Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
+
+#. module: base_setup
+#: field:base.setup.installer,stock:0
+msgid "Warehouse Management"
+msgstr "Gestión de almacenes"
+
+#. module: base_setup
+#: field:base.setup.installer,project:0
+msgid "Project Management"
+msgstr "Gestión de proyectos"
+
+#. module: base_setup
+#: field:base.setup.config,installed_users:0
+msgid "Installed Users"
+msgstr "Usuarios instalados"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "New Database"
+msgstr "Nueva base de datos"
+
+#. module: base_setup
+#: field:base.setup.installer,crm:0
+msgid "Customer Relationship Management"
+msgstr "Gestión relaciones con el cliente (CRM)"
+
+#. module: base_setup
+#: help:base.setup.installer,auction:0
+msgid ""
+"Installs a preselected set of OpenERP applications selected to help you "
+"manage your auctions as well as the business processes around them."
+msgstr ""
+"Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
+"gestionar sus subastas como también los procesos de negocio alrededor de "
+"ellas."
+
+#. module: base_setup
+#: help:base.setup.company,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+"Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
+"Le sugerimos poner un eslogan, por ejemplo:\n"
+"\"Soluciones de empresa de código abierto\"."
+
+#. module: base_setup
+#: help:base.setup.installer,report_designer:0
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+"Le permite instalar varias herramientas para simplificar y mejorar la "
+"creación de informes OpenERP."
+
+#. module: base_setup
+#: field:base.setup.company,rml_header1:0
+msgid "Report Header"
+msgstr "Cabecera de los informes"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Information about your new database"
+msgstr "Información sobre su nueva base de datos"
+
+#. module: base_setup
+#: field:base.setup.company,config_logo:0
+#: field:base.setup.config,config_logo:0
+#: field:base.setup.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: base_setup
+#: field:base.setup.installer,product_expiry:0
+msgid "Food Industry"
+msgstr "Industria alimentaria"
+
+#. module: base_setup
+#: field:base.setup.installer,mrp:0
+msgid "Manufacturing"
+msgstr "Fabricación"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"Esta frase aparecerá en la parte inferior de sus informes.\n"
+"Le sugerimos que aquí escriba frases legales del tipo:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
+"2013269-07"
+
+#. module: base_setup
+#: field:base.setup.company,website:0
+msgid "Company Website"
+msgstr "Sitio web compañía"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install Specific Industry Applications"
+msgstr "Instala aplicaciones específicas para la industria"
+
+#. module: base_setup
+#: field:base.setup.company,street:0
+msgid "Street"
+msgstr "Calle"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Configure Your Company Information"
+msgstr "Configurar la información de su compañía"
+
+#. module: base_setup
+#: help:base.setup.company,website:0
+msgid "Example: http://openerp.com"
+msgstr "Ejemplo: http://openerp.com"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
+msgid "Install Applications"
+msgstr "Instala aplicaciones"
+
+#. module: base_setup
+#: help:base.setup.installer,crm:0
+msgid ""
+"Helps you track and manage relations with customers such as leads, requests "
+"or issues. Can automatically send reminders, escalate requests or trigger "
+"business-specific actions based on standard events."
+msgstr ""
+"Le ayuda a controlar y administrar las relaciones con los clientes, tales "
+"como las iniciativas, peticiones o cuestiones. Puede enviar automáticamente "
+"recordatorios, escalar las peticiones o activar acciones específicas del "
+"negocio basado en eventos estándar."
+
+#. module: base_setup
+#: help:base.setup.installer,stock:0
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+"Le ayuda a gestionar su inventario y las operaciones principales de stock: "
+"las órdenes de entrega, recepciones, ..."
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr "Configuración básica"
+
+#. module: base_setup
+#: help:base.setup.installer,association:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your association more efficiently."
+msgstr ""
+"Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
+"administrar su asociación de manera más eficiente."
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_config
+msgid "base.setup.config"
+msgstr "base.setup.config"
+
+#~ msgid "Select a Profile"
+#~ msgstr "Seleccione un perfil"
+
+#~ msgid ""
+#~ "You can start configuring the system or connect directly to the database "
+#~ "using the default setup."
+#~ msgstr ""
+#~ "Puede empezar configurando el sistema o conectarse directamente a la base de "
+#~ "datos usando la configuración por defecto."
+
+#~ msgid "Zip code"
+#~ msgstr "Código postal"
+
+#~ msgid "Report header"
+#~ msgstr "Cabecera de los informes"
+
+#~ msgid ""
+#~ "You'll be able to install more modules later through the Administration menu."
+#~ msgstr ""
+#~ "Posteriormente podrá instalar más módulos desde el menú Administración."
+
+#~ msgid ""
+#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
+#~ "have been setup to help you discover the different aspects of OpenERP. This "
+#~ "is just an overview, we have 300+ available modules."
+#~ msgstr ""
+#~ "Un perfil instala una preselección de módulos para una necesidad específica. "
+#~ "Estos perfiles han sido creados para ayudarle a descubrir los diferentes "
+#~ "aspectos de OpenERP. Esto es sólo un punto de partida, OpenERP dispone de "
+#~ "300+ módulos."
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Your new database is now fully installed."
+#~ msgstr "Su nueva base de datos ha sido instalada completamente."
+
+#~ msgid "Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "General Information"
+#~ msgstr "Información general"
+
+#~ msgid "Street2"
+#~ msgstr "Calle 2"
+
+#~ msgid "Report Information"
+#~ msgstr "Información de los informes"
+
+#~ msgid "Summary"
+#~ msgstr "Resumen"
+
+#~ msgid "Installation Done"
+#~ msgstr "Instalación realizada"
+
+#~ msgid "Use Directly"
+#~ msgstr "Usar directamente"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "Define Main Company"
+#~ msgstr "Defina la compañia principal"
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index 7918e3a5def..2db06e83fb4 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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr "Terminal punto de venta"
+msgid "Point of Sale"
+msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -557,3 +557,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.setup.config"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
diff --git a/addons/base_setup/i18n/es_VE.po b/addons/base_setup/i18n/es_VE.po
new file mode 100644
index 00000000000..b41004e6a10
--- /dev/null
+++ b/addons/base_setup/i18n/es_VE.po
@@ -0,0 +1,629 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_setup
+#
+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-27 08:23+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:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_setup
+#: field:base.setup.company,city:0
+msgid "City"
+msgstr "Ciudad"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install"
+msgstr "Instalar"
+
+#. module: base_setup
+#: field:base.setup.installer,account_voucher:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: base_setup
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
+msgstr "Recursos humanos"
+
+#. module: base_setup
+#: field:base.setup.company,email:0
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#. module: base_setup
+#: field:base.setup.company,account_no:0
+msgid "Bank Account No"
+msgstr "Nº cuenta bancaria"
+
+#. module: base_setup
+#: field:base.setup.installer,profile_tools:0
+msgid "Extra Tools"
+msgstr "Herramientas extras"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "Pie de página 1 de los informes"
+
+#. module: base_setup
+#: help:base.setup.installer,mrp:0
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+"Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
+"estos procesos."
+
+#. module: base_setup
+#: help:base.setup.installer,marketing:0
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Your database is now created."
+msgstr "Su base de datos ya está creada."
+
+#. module: base_setup
+#: field:base.setup.installer,point_of_sale:0
+msgid "Point of Sales"
+msgstr "Terminal punto de venta"
+
+#. module: base_setup
+#: field:base.setup.installer,association:0
+msgid "Associations"
+msgstr "Asociaciones"
+
+#. module: base_setup
+#: help:base.setup.installer,account_accountant:0
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing "
+msgstr ""
+"Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
+"sugerimos instalar sólo la facturación. "
+
+#. module: base_setup
+#: code:addons/base_setup/__init__.py:56
+#, python-format
+msgid "The following users have been installed : \n"
+msgstr "Los siguientes usuarios han sido instalados : \n"
+
+#. module: base_setup
+#: field:base.setup.company,progress:0
+#: field:base.setup.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "Pie de página 2 de los informes"
+
+#. module: base_setup
+#: field:base.setup.company,currency:0
+#: model:ir.model,name:base_setup.model_res_currency
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: base_setup
+#: field:base.setup.company,state_id:0
+msgid "Fed. State"
+msgstr "Provincia"
+
+#. module: base_setup
+#: field:base.setup.installer,marketing:0
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: base_setup
+#: field:base.setup.company,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: base_setup
+#: field:base.setup.installer,sale:0
+msgid "Sales Management"
+msgstr "Gestión ventas"
+
+#. module: base_setup
+#: help:base.setup.installer,profile_tools:0
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+"Permite instalar varias herramientas interesantes pero no esenciales como "
+"Informes, Comidas y caja de Ideas."
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid ""
+"You can start configuring the system or connect directly to the database as "
+"an administrator."
+msgstr ""
+"Puede empezar configurando el sistema o conectando directamente a la base de "
+"datos como un administrador."
+
+#. module: base_setup
+#: field:base.setup.installer,report_designer:0
+msgid "Advanced Reporting"
+msgstr "Informes avanzados"
+
+#. module: base_setup
+#: field:base.setup.company,phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid ""
+"Your company information will be used to personalize documents issued with "
+"OpenERP such as invoices, sales orders and much more."
+msgstr ""
+"La información de su compañía se usará para personalizar los documentos "
+"emitidos con OpenERP, como las facturas, pedidos y mucho más."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_setup
+#: field:base.setup.installer,knowledge:0
+msgid "Knowledge Management"
+msgstr "Gestión conocimiento"
+
+#. module: base_setup
+#: model:ir.module.module,description:base_setup.module_meta_information
+msgid ""
+"\n"
+"    This module implements a configuration system that helps user\n"
+"    to configure the system at the installation of a new database.\n"
+"\n"
+"    It allows you to select between a list of profiles to install:\n"
+"    * Minimal profile\n"
+"    * Accounting only\n"
+"    * Services companies\n"
+"    * Manufacturing companies\n"
+"\n"
+"    It also asks screens to help easily configure your company, the header "
+"and\n"
+"    footer, the account chart to install and the language.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
+"    a configurar el sistema durante la instalación de una nueva base de "
+"datos.\n"
+"\n"
+"    Le permite seleccionar entre una lista de perfiles a instalar:\n"
+"    * Perfil mínimo\n"
+"    * Sólo contabilidad\n"
+"    * Compañías de servicios\n"
+"    * Compañías de fabricación\n"
+"\n"
+"    También proporciona pantallas para ayudarle a configurar fácilmente su "
+"compañía, la cabecera y el pie de página, el plan contable a instalar y el "
+"idioma.\n"
+"    "
+
+#. module: base_setup
+#: help:base.setup.installer,product_expiry:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your industry."
+msgstr ""
+"Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
+"ayudarle a gestionar su industria."
+
+#. module: base_setup
+#: help:base.setup.installer,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
+"ellas, generando planificaciones, ..."
+
+#. module: base_setup
+#: field:base.setup.company,name:0
+msgid "Company Name"
+msgstr "Nombre de la compañía"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Skip Configuration Wizards"
+msgstr "Omitir asistentes configuración"
+
+#. module: base_setup
+#: help:base.setup.installer,hr:0
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+"Le ayuda a gestionar sus recursos humanos mediante la codificación de la "
+"estructura de los empleados, la generación de hojas de trabajo, seguimiento "
+"de la asistencia, ..."
+
+#. module: base_setup
+#: help:base.setup.installer,account_voucher:0
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+"Le permite crear sus facturas y controlar los pagos. Es una versión más "
+"fácil del módulo de contabilidad para gestores que no sean contables."
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
+msgstr "base.setup.compañía"
+
+#. module: base_setup
+#: help:base.setup.installer,purchase:0
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+"Le ayuda a gestionar sus procesos relacionados con las compras como "
+"peticiones de presupuestos, facturas de proveedor, ..."
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+"Esta frase aparecerá en la parte inferior de sus informes.\n"
+"Le sugerimos poner información bancaria, por ejemplo:\n"
+"IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
+
+#. module: base_setup
+#: field:base.setup.company,street2:0
+msgid "Street 2"
+msgstr "Calle 2"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_installer
+msgid "base.setup.installer"
+msgstr "base.setup.instalador"
+
+#. module: base_setup
+#: field:base.setup.company,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup
+msgid "Setup"
+msgstr "Instalación"
+
+#. module: base_setup
+#: field:base.setup.installer,account_accountant:0
+msgid "Accounting & Finance"
+msgstr "Contabilidad y finanzas"
+
+#. module: base_setup
+#: field:base.setup.installer,auction:0
+msgid "Auction Houses"
+msgstr "Casas de subastas"
+
+#. module: base_setup
+#: field:base.setup.company,zip:0
+msgid "Zip Code"
+msgstr "Código postal"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Start Configuration"
+msgstr "Empezar configuración"
+
+#. module: base_setup
+#: help:base.setup.installer,knowledge:0
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+"Le permite instalar addons orientados a compartir el conocimiento con y "
+"entre sus empleados."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid ""
+"Select the Applications you want your system to cover. If you are not sure "
+"about your exact needs at this stage, you can easily install them later."
+msgstr ""
+"Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
+"acerca de sus necesidades exactas en este punto, puede instalarlas "
+"fácilmente más tarde."
+
+#. module: base_setup
+#: view:base.setup.company:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Company Configuration"
+msgstr "Configuración compañía"
+
+#. module: base_setup
+#: field:base.setup.company,logo:0
+msgid "Logo"
+msgstr "Logo"
+
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+"Le ayuda sacar provecho de sus terminales punto de venta con la codificación "
+"rápida de las ventas, codificación de modos de pago simplificada, generación "
+"automática de albaranes, ..."
+
+#. module: base_setup
+#: field:base.setup.installer,purchase:0
+msgid "Purchase Management"
+msgstr "Gestión de compras"
+
+#. module: base_setup
+#: help:base.setup.installer,sale:0
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+"Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
+
+#. module: base_setup
+#: field:base.setup.installer,stock:0
+msgid "Warehouse Management"
+msgstr "Gestión de almacenes"
+
+#. module: base_setup
+#: field:base.setup.installer,project:0
+msgid "Project Management"
+msgstr "Gestión de proyectos"
+
+#. module: base_setup
+#: field:base.setup.config,installed_users:0
+msgid "Installed Users"
+msgstr "Usuarios instalados"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "New Database"
+msgstr "Nueva base de datos"
+
+#. module: base_setup
+#: field:base.setup.installer,crm:0
+msgid "Customer Relationship Management"
+msgstr "Gestión relaciones con el cliente (CRM)"
+
+#. module: base_setup
+#: help:base.setup.installer,auction:0
+msgid ""
+"Installs a preselected set of OpenERP applications selected to help you "
+"manage your auctions as well as the business processes around them."
+msgstr ""
+"Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
+"gestionar sus subastas como también los procesos de negocio alrededor de "
+"ellas."
+
+#. module: base_setup
+#: help:base.setup.company,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+"Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
+"Le sugerimos poner un eslogan, por ejemplo:\n"
+"\"Soluciones de empresa de código abierto\"."
+
+#. module: base_setup
+#: help:base.setup.installer,report_designer:0
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+"Le permite instalar varias herramientas para simplificar y mejorar la "
+"creación de informes OpenERP."
+
+#. module: base_setup
+#: field:base.setup.company,rml_header1:0
+msgid "Report Header"
+msgstr "Cabecera de los informes"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Information about your new database"
+msgstr "Información sobre su nueva base de datos"
+
+#. module: base_setup
+#: field:base.setup.company,config_logo:0
+#: field:base.setup.config,config_logo:0
+#: field:base.setup.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: base_setup
+#: field:base.setup.installer,product_expiry:0
+msgid "Food Industry"
+msgstr "Industria alimentaria"
+
+#. module: base_setup
+#: field:base.setup.installer,mrp:0
+msgid "Manufacturing"
+msgstr "Fabricación"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"Esta frase aparecerá en la parte inferior de sus informes.\n"
+"Le sugerimos que aquí escriba frases legales del tipo:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
+"2013269-07"
+
+#. module: base_setup
+#: field:base.setup.company,website:0
+msgid "Company Website"
+msgstr "Sitio web compañía"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install Specific Industry Applications"
+msgstr "Instala aplicaciones específicas para la industria"
+
+#. module: base_setup
+#: field:base.setup.company,street:0
+msgid "Street"
+msgstr "Calle"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Configure Your Company Information"
+msgstr "Configurar la información de su compañía"
+
+#. module: base_setup
+#: help:base.setup.company,website:0
+msgid "Example: http://openerp.com"
+msgstr "Ejemplo: http://openerp.com"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
+msgid "Install Applications"
+msgstr "Instala aplicaciones"
+
+#. module: base_setup
+#: help:base.setup.installer,crm:0
+msgid ""
+"Helps you track and manage relations with customers such as leads, requests "
+"or issues. Can automatically send reminders, escalate requests or trigger "
+"business-specific actions based on standard events."
+msgstr ""
+"Le ayuda a controlar y administrar las relaciones con los clientes, tales "
+"como las iniciativas, peticiones o cuestiones. Puede enviar automáticamente "
+"recordatorios, escalar las peticiones o activar acciones específicas del "
+"negocio basado en eventos estándar."
+
+#. module: base_setup
+#: help:base.setup.installer,stock:0
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+"Le ayuda a gestionar su inventario y las operaciones principales de stock: "
+"las órdenes de entrega, recepciones, ..."
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr "Configuración básica"
+
+#. module: base_setup
+#: help:base.setup.installer,association:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your association more efficiently."
+msgstr ""
+"Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
+"administrar su asociación de manera más eficiente."
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_config
+msgid "base.setup.config"
+msgstr "base.setup.config"
+
+#~ msgid "Select a Profile"
+#~ msgstr "Seleccione un perfil"
+
+#~ msgid ""
+#~ "You can start configuring the system or connect directly to the database "
+#~ "using the default setup."
+#~ msgstr ""
+#~ "Puede empezar configurando el sistema o conectarse directamente a la base de "
+#~ "datos usando la configuración por defecto."
+
+#~ msgid "Zip code"
+#~ msgstr "Código postal"
+
+#~ msgid "Report header"
+#~ msgstr "Cabecera de los informes"
+
+#~ msgid ""
+#~ "You'll be able to install more modules later through the Administration menu."
+#~ msgstr ""
+#~ "Posteriormente podrá instalar más módulos desde el menú Administración."
+
+#~ msgid ""
+#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
+#~ "have been setup to help you discover the different aspects of OpenERP. This "
+#~ "is just an overview, we have 300+ available modules."
+#~ msgstr ""
+#~ "Un perfil instala una preselección de módulos para una necesidad específica. "
+#~ "Estos perfiles han sido creados para ayudarle a descubrir los diferentes "
+#~ "aspectos de OpenERP. Esto es sólo un punto de partida, OpenERP dispone de "
+#~ "300+ módulos."
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Your new database is now fully installed."
+#~ msgstr "Su nueva base de datos ha sido instalada completamente."
+
+#~ msgid "Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "General Information"
+#~ msgstr "Información general"
+
+#~ msgid "Street2"
+#~ msgstr "Calle 2"
+
+#~ msgid "Report Information"
+#~ msgstr "Información de los informes"
+
+#~ msgid "Summary"
+#~ msgstr "Resumen"
+
+#~ msgid "Installation Done"
+#~ msgstr "Instalación realizada"
+
+#~ msgid "Use Directly"
+#~ msgstr "Usar directamente"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "Define Main Company"
+#~ msgstr "Defina la compañia principal"
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index 3f71facf680..178eceacde7 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.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:14+0000\n"
-"PO-Revision-Date: 2009-09-16 14:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -29,12 +29,12 @@ msgstr "Paigalda"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Arveldamine"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Inimressursid"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,7 +44,7 @@ msgstr "E-post"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Pangakonto number"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -75,7 +75,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
@@ -100,7 +100,7 @@ msgstr ""
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Seadistamise edenemine"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -116,12 +116,12 @@ msgstr "Valuuta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Maakond"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Turundus"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
@@ -131,7 +131,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Müügihaldus"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -172,7 +172,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "pealkiri"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
@@ -292,7 +292,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postiindeks"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -335,7 +335,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Ostuhaldus"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
@@ -345,12 +345,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Laohaldus"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektihaldus"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
@@ -360,12 +360,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Uus andmebaas"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Kliendisuhete haldus"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -407,17 +407,17 @@ msgstr ""
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Pilt"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Toidutööstus"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Tootmine"
 
 #. module: base_setup
 #: view:base.setup.company:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 8ebc657c05a..9f902b1a90e 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index 0e0d22e42dc..967797046a5 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.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:14+0000\n"
-"PO-Revision-Date: 2010-08-03 03:47+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -30,12 +30,12 @@ msgstr "Asenna"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Henkilöstön hallinta"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -45,12 +45,12 @@ msgstr "Sähköposti"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Pankkitilin numero"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Lisätyökalut"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -63,26 +63,28 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Auttaa sinua hallitsemaan valmistusprosessia ja luomaan raportteja näistä "
+"prosesseista."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Auttaa sinua hallitsemaan markkinointikampanjoita vaihe vaiheelta."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Tietokantasi on nyt luotu."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr ""
+msgid "Point of Sale"
+msgstr "Myyntipiste"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Assosiaatiot"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -90,18 +92,20 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Auttaa sinua hoitamaan kirjanpidolliset tarpeet, jos et ole kirjanpitäjä, "
+"suosittelemme että asennat vain laskutuksen "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Seuraavat käyttäjät on asennettu: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -117,22 +121,22 @@ msgstr "Valuutta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Osavaltio"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Markkinointi"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Myynninhallinta"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -140,6 +144,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Antaa sinun asentaa monia kiinnostavia mutta ei välttämättömiä työkaluja "
+"kuten kysely, lounas, idealaatikko."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -147,11 +153,12 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Voit aloittaa järjestelmän konfiguroinnin suoraan tietokantaan pääkäyttäjänä."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Kehittynyt raportointi"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -169,16 +176,18 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Yritystietojasi käytetään personoimaan OpenERP dokumenttejä kuten laskuja, "
+"myyntitilauksia yms."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Osaamisenhallinta"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -205,6 +214,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Asentaa esivalitun sarjan OpenERP ohjelmia, joka auttaa sinua hallitsemaan "
+"teollisuudenalaasi."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -212,6 +223,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Auttaa sinua hallitsemaan projektejasi ja tehtäviäsi seuraamalla niitä, "
+"luomalla suunnitelmia yms."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -221,7 +234,7 @@ msgstr "Yrityksen nimi"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Ohita asetusvelhot"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -229,6 +242,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Auttaa sinua hallitsemaan henkilöstöresurssejasi määrittelemällä "
+"henkilöstörakenteen, luomalla työlistat, seuraamalla läsnäoloa jne."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -236,6 +251,8 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Mahdollistaa laskujen laadinnan ja maksujen seurannan. On helpompi versio "
+"kirjanpitomoduulista päälliköille jotka eivät ole kirjanpitäjiä."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
@@ -248,6 +265,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Auttaa sinua hallitsemaan ostoon liittyviä prosesseja kuten esim. "
+"tarjouspyyntöjä, toimittajien laskuja yms."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -263,7 +282,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Katuosoite 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
@@ -283,17 +302,17 @@ msgstr "Asetukset"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Kirjanpito ja talous"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Huutokauppatalot"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postinumero"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -306,6 +325,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Mahdollistaa lisäosien asentamisen, näiden tarkoituksena on tiedonjako "
+"henkilöstön kanssa ja henkilöstön kesken."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -313,12 +334,14 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Valitse ohjelmat jotka haluat kuuluvan järjestelmääsi. Jos et ole varma "
+"tarpeistasi vielä, voit lisätä niitä helposti myöhemminkin."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Yrityksen konfigurointi"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -332,41 +355,44 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Auttaa sinua saamaan mahdollisimman paljon tulosta myyntipisteestäsi "
+"käyttäen nopeaa myynnin kirjausta, yksinkertaistettua maksunkoodausta, "
+"automaattista keräilylistan luontia jne."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Ostojen hallinta"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "Auttaa sinua hallitsemaan tarjouksia, myyntitilauksia ja laskuja"
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Varastonhallinta"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektinhallinta"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Asennetut käyttäjät"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Uusi tietokanta"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Asiakkuuden hallinta"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -374,6 +400,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"Asentaa esivalitun ryhmän OpenERP ohjelmia auttaakseen hallitsemaan "
+"huutokauppojasi ja niihin liittyviä bisnes prosesseja."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -392,6 +420,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Mahdollistaa lisätyökalujen asentamiksen OpenERP raporttien luomisen "
+"helpottamiseksi."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -401,24 +431,24 @@ msgstr "Raportin ylätunniste"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Tietoja uudesta tietokannastasi"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Ruokateollisuus"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Valmistava"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -439,12 +469,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Yrityksen nettisivut"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Asenna tietyn toimialan ohjelmistot"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -454,18 +484,18 @@ msgstr "Katuosoite"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Määrittele yrityksesi tiedot"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "esim. http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Asenna ohjelmat"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -474,6 +504,10 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"Hauttaa sinua seuraamaan ja hallitsemaan asiakaskontakteja kuten tarpeita, "
+"pyyntöjä ja tapauksia. Voi lähettää automaattisesti muistututksia, "
+"eskalointipyyntöjä tai käynnistää yrityskohtaisia toimintoja "
+"vakiotapahtumien pohjalta."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
@@ -481,6 +515,8 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"Auttaa sinua hallitsemaan varastoa ja varaston päätoimenpiteitä, "
+"toimitusmääräyksiä, vastaanottoja yms."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -493,6 +529,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Asentaa perussarjan OpenERP ohjelmia jotka auttavat sinua hallitsemaan "
+"yhdistystäsi tehokkaammin."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
@@ -567,3 +605,6 @@ msgstr ""
 
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "Uusi tietokanta on nyt kokonaan asennettu."
+
+#~ msgid "Point of Sales"
+#~ msgstr "Myyntipiste"
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 31b8f853cb2..92e683590f3 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 16:45+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-11-07 12:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +77,7 @@ msgstr "Votre base de données est maintenant créée."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Point de vente"
 
 #. module: base_setup
@@ -626,14 +626,5 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Précédent"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
-#~ "spécial !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle incorrect dans la définition de l'action"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML incorrect dans l'architecture de la vue !"
+#~ msgid "Point of Sales"
+#~ msgstr "Point de vente"
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index e6af0f12d0e..a92e4b42916 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 2c24027fbe9..e65d8d9141c 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: base_setup
@@ -76,7 +76,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index 9f5178dce3a..de41cc5a5b4 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-02 16:23+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2011-11-07 12:54+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +78,7 @@ msgstr "Az Ön adatbázisa létrejött."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Pénztárgép működés"
 
 #. module: base_setup
@@ -555,73 +556,5 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Az objektum nevének x_ -sal kell kezdődnie és nem tartalmazhat speciális "
-#~ "karaktereket"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Érvénytelen modell név a művelet meghatározásában."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "A modul tanúsítvány ID-jének egyedinek kell lennie !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "A modul névnek egyedinek kell lennie !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Érvénytelen XML a nézet architektúrában!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "A mező mérete soha nem lehet kevesebb, mint 1 !"
-
-#~ msgid ""
-#~ "The following users have been installed : \n"
-#~ "\"\n"
-#~ "\""
-#~ msgstr ""
-#~ "A következő felhasználók lettek telepítve : \n"
-#~ "\"\n"
-#~ "\""
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "\"\n"
-#~ "\"We suggest you to put bank information here:\n"
-#~ "\"\n"
-#~ "\"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ez a mondat jelenik meg a jelentések alján.\n"
-#~ "\"\n"
-#~ "\"Javasoljuk, hogy a banki információk jelenlenek meg itt:\n"
-#~ "\"\n"
-#~ "\"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "\"\n"
-#~ "\"We suggest you to put a slogan here:\n"
-#~ "\"\n"
-#~ "\"\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ez a mondat jelenik meg a jelentés jobb felső sarkában.\n"
-#~ "\"\n"
-#~ "\"Javasoljuk, hogy adja meg szlogenjét itt:\n"
-#~ "\"\n"
-#~ "\"\"Nyílt Forráskódú Üzleti Megoldás.\""
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "\"\n"
-#~ "\"We suggest you to write legal sentences here:\n"
-#~ "\"\n"
-#~ "\"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-"
-#~ "07"
-#~ msgstr ""
-#~ "Ez a mondat jelenik meg a jelentések alján.\n"
-#~ "\"\n"
-#~ "\"Javasoljuk, hogy írjon ide hivatalos mondatot:\n"
-#~ "\"\n"
-#~ "\"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-"
-#~ "07"
+#~ msgid "Point of Sales"
+#~ msgstr "Pénztárgép működés"
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 347a20b486a..660100f151c 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -24,17 +24,17 @@ msgstr "Kota"
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install"
-msgstr "Pasang"
+msgstr "Instal"
 
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Penagihan"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Sumber Daya Manusia"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,17 +44,17 @@ msgstr "E-mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "No Rekening Bank"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Tools Extra"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Judul Bawah 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -62,11 +62,13 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Membantu Anda dalam mengelola proses produksi sekaligus menghasilkan "
+"berbagai laporan atas berbagai proses tersebut."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Untuk memandu Anda langkah demi langkah dalam kampanye pemasaran."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -75,7 +77,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 49a6338c933..61b01d6a487 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-16 09:42+0000\n"
-"Last-Translator: Loris Turchetti <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +77,7 @@ msgstr "Il nuovo database è creato."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Punto vendita"
 
 #. module: base_setup
@@ -627,23 +627,5 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Indietro"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valida nella definizione dell'azione"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
+#~ msgid "Point of Sales"
+#~ msgstr "Punto vendita"
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index d51d05a6a4d..f708a4785e8 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index 269c1a98c66..73e3011abea 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -75,7 +75,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index 052fc512eaf..003c661d82a 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 2d12f5b1288..3c15f553bf2 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-20 16:18+0000\n"
-"Last-Translator: badralb <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -78,7 +78,7 @@ msgstr "Таний өгөгдлийн сан үүсгэгдсэн."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Борлуулалтын цэг"
 
 #. module: base_setup
@@ -571,26 +571,8 @@ msgstr "base.setup.config"
 #~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж "
 #~ "нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
+#~ msgid "Point of Sales"
+#~ msgstr "Борлуулалтын цэг"
 
 #~ msgid "Use Directly"
 #~ msgstr "Хэрэглэх заавар"
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index c94fa94f2c0..550fb9d10c3 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.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:14+0000\n"
-"PO-Revision-Date: 2011-01-30 19:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-11-07 12:48+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -79,7 +79,7 @@ msgstr "Din database er nå opprettet."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Utsalgssted"
 
 #. module: base_setup
@@ -552,3 +552,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.oppsett.konfig"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Utsalgssted"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index e726d1e5bee..3fefd2f2fb5 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-16 17:03+0000\n"
-"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +77,7 @@ msgstr "Uw database is nu gemaakt."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Kassa's"
 
 #. module: base_setup
@@ -621,22 +621,5 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Vorige"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+#~ msgid "Point of Sales"
+#~ msgstr "Kassa's"
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index cfbade8ecb8..301a65a5673 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
 msgid "City"
-msgstr ""
+msgstr "Plaats"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -44,7 +44,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Bankrekeningnr."
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Rapportvoettekst 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -75,13 +75,13 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Verenigingen"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -89,6 +89,8 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Helpt u om uw boekhouding te voeren. Als u geen boekhouder bent, raden wij u "
+"aan om enkel Facturatie te installeren. "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:50
@@ -100,38 +102,38 @@ msgstr ""
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Configuratie Voortgang"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Rapportvoettekst 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
 #: model:ir.model,name:base_setup.model_res_currency
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Staat/Provincie"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Verkoopbeheer"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -139,6 +141,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Hiermee kunt u verschillende interessante modules installeren, zoals "
+"Enquêtes, Lunch en Ideeënbus."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -146,6 +150,8 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"U kunt beginnen met de configuratie van het systeem of u onmiddellijk als "
+"beheerder aanmelden op de database."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
@@ -155,12 +161,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -168,11 +174,13 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Met uw bedrijfsinformatie kunt u OpenERP-documenten zoals facturen, "
+"verkooporders, e.d. personaliseren."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "Titel"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
@@ -215,12 +223,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Bedrijfsnaam"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Configuratieassistenten overslaan"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -239,7 +247,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -259,42 +267,42 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Straat 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "Instellingen"
 
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Boekhouding & financiën"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Veilinghuizen"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postcode"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "Beginnen met de configuratie"
 
 #. module: base_setup
 #: help:base.setup.installer,knowledge:0
@@ -309,17 +317,20 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Selecteer de applicaties die u wilt gebruiken. U kunt later makkelijk extra "
+"modules installeren, wat ook handig is als u op dit moment nog geen "
+"duidelijk zicht heeft op wat u allemaal nodig heeft."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Bedrijfsconfiguratie"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -332,37 +343,37 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Aankoopbeheer"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "Hiermee kunt u offertes, verkooporders en facturen maken."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Magazijnbeheer"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projectbeheer"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Geïnstalleerde gebruikers"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nieuwe database"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Klantenrelatiebeheer"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -389,34 +400,34 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Rapporthoofding"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informatie over uw nieuwe database"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Afbeelding"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Voedingsindustrie"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Productie"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -439,17 +450,17 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street:0
 msgid "Street"
-msgstr ""
+msgstr "Straat"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Uw bedrijfsinformatie configureren"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Voorbeeld: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -487,4 +498,25 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
+
+#~ msgid "Installation Done"
+#~ msgstr "Installatie gereed"
+
+#~ msgid "Summary"
+#~ msgstr "Samenvatting"
+
+#~ msgid "Cancel"
+#~ msgstr "Afbreken"
+
+#~ msgid "Street2"
+#~ msgstr "Adres 2"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "General Information"
+#~ msgstr "Algemene Informatie"
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index ca864e985fb..18c0f19159f 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-14 13:45+0000\n"
+"PO-Revision-Date: 2011-11-07 12:47+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -75,7 +75,7 @@ msgstr "Baza danych została utworzaona"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Punkt sprzedaży"
 
 #. module: base_setup
@@ -608,3 +608,6 @@ msgstr ""
 
 #~ msgid "Use Directly"
 #~ msgstr "Użyj bezpośrednio"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Punkt sprzedaży"
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index eded1ec76d7..0f7395bc92b 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.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-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 10:06+0000\n"
-"Last-Translator: Tiago Baptista <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +77,7 @@ msgstr "A sua base de dados foi criada"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Ponto de Venda"
 
 #. module: base_setup
@@ -600,3 +600,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Use Directly"
 #~ msgstr "Usar Directamente"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Ponto de Venda"
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 805c31c37e8..0c0e036c6f5 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 09:49+0000\n"
-"Last-Translator: Guilherme Santos <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +77,7 @@ msgstr "O banco de dados foi criado."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Ponto de Vendas"
 
 #. module: base_setup
@@ -622,22 +622,5 @@ msgstr "base.setup.config"
 #~ msgid "Summary"
 #~ msgstr "Resumo"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto deve iniciar com x_ e não conter nenhum caracter especial."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
+#~ msgid "Point of Sales"
+#~ msgstr "Ponto de Vendas"
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index b49368f0c4c..015eb620e8e 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-12 01:45+0000\n"
+"PO-Revision-Date: 2011-11-07 12:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -77,7 +77,7 @@ msgstr "Baza de date a fost creată."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Punct de vînzare"
 
 #. module: base_setup
@@ -600,23 +600,5 @@ msgstr "base.setup.config"
 #~ msgid "Use Directly"
 #~ msgstr "Folosire directă"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nume invalid de model în definirea acțiunii."
-
-#~ 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 "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid in afisarea interfetei!"
+#~ msgid "Point of Sales"
+#~ msgstr "Punct de vînzare"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index a1f21a37fbf..0080ba636f1 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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-25 11:19+0000\n"
-"Last-Translator: Treefeed Xavier <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -78,7 +78,7 @@ msgstr "Ваша база данных создана."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Кассовый терминал"
 
 #. module: base_setup
@@ -625,14 +625,5 @@ msgstr "base.setup.config"
 #~ msgid "State"
 #~ msgstr "Область/штат"
 
-#~ msgid "Invalid model name in the action definition."
-#~ 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 "Point of Sales"
+#~ msgstr "Кассовый терминал"
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index ee7420f836c..cd4ffd266ae 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 153f9195248..42c245534a7 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -29,12 +29,12 @@ msgstr "Namesti"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Izdajanje računov"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Človeški viri"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,12 +44,12 @@ msgstr "E-pošta"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Številka bančnega računa"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Dodatna orodja"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -62,6 +62,8 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Pomaga vam upravljati proizvodne procese in ustvarjanje poročil o teh "
+"procesih."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
@@ -71,11 +73,11 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Vaša baza je bila ustvarjena."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
@@ -94,13 +96,13 @@ msgstr ""
 #: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Naslednji uporabniki so bili nameščeni: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Potek konfiguracije"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -116,22 +118,22 @@ msgstr "Valuta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Zvezna država"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Podjetje"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Upravljanje prodaje"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -160,7 +162,7 @@ msgstr "Telefon"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -172,12 +174,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "naslov"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Upravljanje znanja"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -215,12 +217,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,name:0
 msgid "Company Name"
-msgstr "Ime družbe"
+msgstr "Ime podjetja"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Preskoči čarovnike konfiguracije"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -239,7 +241,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -262,12 +264,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Naslov 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -282,17 +284,17 @@ msgstr "Namestitev"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Računovodstvo & Finance"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Avkcijska hiša"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Poštna številka"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -317,7 +319,7 @@ msgstr ""
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Konfiguracija podjetja"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -335,7 +337,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Upravljanje nabave"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
@@ -345,22 +347,22 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Upravljanje skladišča"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Upravljanje projektov"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Nameščeni uporabniki"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nova zbirka podatkov"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
@@ -400,24 +402,24 @@ msgstr "Glava izpisa"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informacije o vaši novi zbirki podatkov"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Prehrambena industrija"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -438,7 +440,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Spletna stran podjetja"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -448,23 +450,23 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street:0
 msgid "Street"
-msgstr "Naslov"
+msgstr "Ulica"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Konfigurirajte informacije vašega podjetja"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Primer: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Namesti aplikacije"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -496,7 +498,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 18d2bc35ead..9e3df647985 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 9dc884c595c..a95a53dfc00 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.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:14+0000\n"
-"PO-Revision-Date: 2010-10-30 12:59+0000\n"
+"PO-Revision-Date: 2011-11-07 12:51+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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -79,7 +79,7 @@ msgstr "Tvoja databaza je kreirana."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "POS"
 
 #. module: base_setup
@@ -603,13 +603,5 @@ msgstr "base.setup.config"
 #~ msgid "Cancel"
 #~ msgstr "Otkaži"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime Objekta mora poceti sa x_ i ne  sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture !"
+#~ msgid "Point of Sales"
+#~ msgstr "POS"
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 68831220143..25fa7984891 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.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:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:28+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:59+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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -79,7 +79,7 @@ msgstr "Tvoja databaza je kreirana."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "POS"
 
 #. module: base_setup
@@ -535,20 +535,12 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime Objekta mora poceti sa x_ i ne  sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
+#~ msgid "Point of Sales"
+#~ msgstr "POS"
 
 #~ msgid "Use Directly"
 #~ msgstr "Koristi Direktno"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture !"
-
 #~ msgid ""
 #~ "A profile sets a pre-selection of modules for specific needs. These profiles "
 #~ "have been setup to help you discover the different aspects of OpenERP. This "
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index eddd1cce92d..0dfabca49da 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-13 07:19+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-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-05-14 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -44,7 +44,7 @@ msgstr "E-post"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr "Bankkontonr"
+msgstr "Bankkonto"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -77,7 +77,7 @@ msgstr "Din databas är nu skapad"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Kassa"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "redovisning rekommenderar vi dig att enbart installera faktureringsmodulen "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Följande användere har nu blivit installerade \n"
@@ -120,7 +120,7 @@ msgstr "Valuta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr "Amerikansk stat"
+msgstr "Amerikansk delstat"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
@@ -174,6 +174,8 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Dina företagsuppgifter används för att personalisera dokument som OpenERP "
+"skapar, exempelvis fakturor, ordrar och många fler."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -335,6 +337,9 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Välj de grundläggande funktioner som du vill konfigurera ditt system med. Är "
+"du osäker på vad du behöver i detta läge så är det inte några problem att "
+"komplettera senare."
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -368,7 +373,7 @@ msgstr "Hjälper dig att hantera dina offerter, ordrar och fakturor."
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Lagerstyrning"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
@@ -447,7 +452,7 @@ msgstr "Tillverkning"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Din logga, välj en storlek kring 450x150 pixlar."
+msgstr "Företagets logotyp - använd en storlek kring 450x150 bildpunkter."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -463,7 +468,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr "Företagets hemsida"
+msgstr "Företagets webbplats"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -560,18 +565,12 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Nästa"
 
-#~ msgid "State"
-#~ msgstr "Område"
-
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "Din nya databas är klar."
 
 #~ msgid "Profile"
 #~ msgstr "Profil"
 
-#~ msgid "General Information"
-#~ msgstr "Generell information"
-
 #~ msgid "Street2"
 #~ msgstr "Gata 2"
 
@@ -596,16 +595,11 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Föregårende"
 
-#~ 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 "General Information"
+#~ msgstr "Allmän information"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
+#~ msgid "Point of Sales"
+#~ msgstr "Kassa"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
+#~ msgid "State"
+#~ msgstr "Län"
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index ce8506c4def..eacc77db53d 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -76,7 +76,7 @@ msgstr "กำลังสร้างฐานข้อมูลของคุ
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 83323df80e8..6f8b89d6cd8 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -75,7 +75,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index add2cc50bb1..0f279bc80c0 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.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:14+0000\n"
-"PO-Revision-Date: 2011-05-10 18:46+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12: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: 2011-05-11 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -24,7 +24,7 @@ msgstr "Şehir"
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install"
-msgstr "kurulum"
+msgstr "Kur"
 
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
@@ -39,7 +39,7 @@ msgstr "İnsan Kaynakları"
 #. module: base_setup
 #: field:base.setup.company,email:0
 msgid "E-mail"
-msgstr "E-Posta"
+msgstr "E-posta:"
 
 #. module: base_setup
 #: field:base.setup.company,account_no:0
@@ -76,7 +76,7 @@ msgstr "Veritabanınız Oluşturuldu"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Hızlı Satış Noktası"
 
 #. module: base_setup
@@ -94,7 +94,7 @@ msgstr ""
 "sadece Faturalama modülünü kurmanızı tavsiye ederiz. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Aşağıdaki kullanıcılar kuruldu: \n"
@@ -571,3 +571,6 @@ msgstr "temel.kurulum.ayar"
 
 #~ msgid "Previous"
 #~ msgstr "Önceki"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Hızlı Satış Noktası"
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index ed8b0045493..ae7cb912e4e 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: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -75,7 +75,7 @@ msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 5c7aacdebce..2d63ca2d0fc 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.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:14+0000\n"
-"PO-Revision-Date: 2011-05-04 16:45+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:42+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: 2011-05-05 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -35,7 +35,7 @@ msgstr "Hóa đơn"
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr "Quản trị Nguồn nhân lực"
+msgstr "Nguồn nhân lực"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -76,7 +76,7 @@ msgstr "CSDL của bạn đã được tạo"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "Điểm bán hàng"
 
 #. module: base_setup
@@ -348,7 +348,7 @@ msgstr "Quản lý Kho hàng"
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr "Quản lý dự án"
+msgstr "Quản lý Dự án"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
@@ -490,16 +490,5 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Tên đối tượng phải bắt đầu với x_ và không chứa bất kỳ ký tự đặc biệt nào!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
+#~ msgid "Point of Sales"
+#~ msgstr "Điểm bán hàng"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 7b34624465b..670a9f6ed58 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-31 10:59+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -34,7 +34,7 @@ msgstr "发票"
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr "人事管理"
+msgstr "人力资源"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,7 +44,7 @@ msgstr "电子邮件"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr "银行账户"
+msgstr "银行账号"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -54,19 +54,19 @@ msgstr "额外工具"
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr "报表脚注1"
+msgstr "报表页脚1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
 msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
-msgstr ""
+msgstr "帮助您管理您的生产和其生成的报表。"
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr "逐步帮助管理您的市场营销。"
+msgstr "帮助您管理市场营销。"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -75,13 +75,13 @@ msgstr "您的帐套（数据库）已经创建。"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "销售点"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr "协会"
+msgstr "商会"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -94,24 +94,24 @@ msgstr "帮助您掌控您的会计需求，如果您不是一个会计人员，
 #: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "下列用户已经安装 \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr "报表脚注2"
+msgstr "报表页脚 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
 #: model:ir.model,name:base_setup.model_res_currency
 msgid "Currency"
-msgstr "货币"
+msgstr "币别"
 
 #. module: base_setup
 #: field:base.setup.company,state_id:0
@@ -138,19 +138,19 @@ msgstr "销售管理"
 msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
-msgstr ""
+msgstr "让你安装各种有趣的但非必需的工具如： 调查, 午餐 和 创意"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
-msgstr "您可以选择开始配置系统或者直接作为管理员连接到数据库。"
+msgstr "您可以开始设置系统或者直接作为管理员连接到数据库。"
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr "高级报表"
+msgstr "高级报告"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -167,12 +167,12 @@ msgstr "res_config_contents"
 msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
-msgstr ""
+msgstr "你公司的信息会出现在OprnERP的各种文档上，例如发票，销售订单，和其他"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr "title"
+msgstr "标题"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
@@ -198,16 +198,13 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    这模块实现一个配置的系统帮助用户\n"
-"在一个新数据库配置系统\n"
-"\n"
-"    它允许在配置列表中选择安装:\n"
-"   *最小配置\n"
+"    这模块实现一个设置向导系统帮助用户在一个新数据库配置系统\n"
+"  它允许在设置列表中选择安装:\n"
+"    *最小设置\n"
 "    *只有会计\n"
+"    *服务公司\n"
 "    *制造公司\n"
-"\n"
-"    它还询问以帮助简单设置你的公司:\n"
-"                  报表头,注脚,所用的会计表和要安装的语言\n"
+"  它还通过界面对话框来帮助您轻松设置您的公司: 报页头，页脚,所用的会计表和要安装的语言\n"
 "    "
 
 #. module: base_setup
@@ -215,14 +212,14 @@ msgstr ""
 msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
-msgstr ""
+msgstr "安装这个OpenERP预设模块，帮助你管理你的企业"
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "帮助你管理项目，跟踪任务，生成计划等"
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -232,21 +229,21 @@ msgstr "公司名称"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr "跳过配置向导"
+msgstr "跳过设置向导"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
 msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
-msgstr ""
+msgstr "帮助你管理你的人力资源员员工架构，生成工作计工单，考勤等"
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
 msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
-msgstr ""
+msgstr "允许你创建发票并跟踪付款,这是一个面向没有会计知识的管理人员的简化版会计模块"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
@@ -266,7 +263,9 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-msgstr "这将显示在报表底部.建议你输入银行的信息"
+msgstr ""
+"这将显示在报表底部。\n"
+"建议你在这输入银行信息："
 
 #. module: base_setup
 #: field:base.setup.company,street2:0
@@ -291,7 +290,7 @@ msgstr "设置"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr "会计与财务"
+msgstr "会计 & 财务"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -313,25 +312,25 @@ msgstr "开始设置"
 msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
-msgstr "让您安装附加的模块使您可以与您的雇员分享知识。"
+msgstr "让您安装模块使您的员工可以分享知识。"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
-msgstr ""
+msgstr "选择你系统所包含的模块。如果你当前还不确定，你可以在以后再安装它们"
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr "单位配置"
+msgstr "公司设置"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
 msgid "Logo"
-msgstr "标识"
+msgstr "Logo"
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -339,7 +338,7 @@ msgid ""
 "Helps you get the most out of your points of sales with fast sale encoding, "
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
-msgstr ""
+msgstr "帮助你快速设定你的销售点，简化付款方式，自动装箱单等"
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
@@ -381,7 +380,7 @@ msgstr "客户关系管理"
 msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
-msgstr ""
+msgstr "安装这个OpenERP预设模块，帮助你管理拍卖以及相关的业务流程。"
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -389,7 +388,9 @@ msgid ""
 "This sentence will appear at the top right corner of your reports.\n"
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
-msgstr "这将显示在报表的右上角,建议你放一个标语."
+msgstr ""
+"这将显示在报表的右上角。\n"
+"建议你在这放一个标语："
 
 #. module: base_setup
 #: help:base.setup.installer,report_designer:0
@@ -423,12 +424,12 @@ msgstr "食品工业"
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr "生产管理"
+msgstr "生产"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "你的标识使用尺寸为450×150像素"
+msgstr "你的Logo使用的尺寸为450×150像素"
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -436,7 +437,9 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-msgstr "这将显示在报表底部,建议你放入正式的公司信息."
+msgstr ""
+"这将显示在报表底部。\n"
+"建议你在这放入正式的公司信息和联系方式："
 
 #. module: base_setup
 #: field:base.setup.company,website:0
@@ -446,17 +449,17 @@ msgstr "公司网站"
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr "安装特定行业应用"
+msgstr "安装特定的行业模块"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
 msgid "Street"
-msgstr "街区"
+msgstr "街道"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr "配置您的单位信息"
+msgstr "设置您的公司信息"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
@@ -467,7 +470,7 @@ msgstr "例如：http://openerp.com"
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr "安装应用"
+msgstr "安装模块"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -475,14 +478,14 @@ msgid ""
 "Helps you track and manage relations with customers such as leads, requests "
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
-msgstr ""
+msgstr "帮助您跟踪和管理与客户的线索，请求或问题。能自动发送提醒，提升请求等级，基于标准的事件触发指定的商业动作。"
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
 msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
-msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等等"
+msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -494,7 +497,7 @@ msgstr "基础安装"
 msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
-msgstr ""
+msgstr "安装这个OpenERP预设模块，帮助你管理你的商会。"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
@@ -563,3 +566,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "新帐套已安装完毕."
+
+#~ msgid "Point of Sales"
+#~ msgstr "销售点"
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index ffb4074b8d3..e56ace16d84 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-26 04:32+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -61,34 +61,34 @@ msgstr "報表頁尾1"
 msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
-msgstr ""
+msgstr "助您管理生產工序及為這些工序製作報告。"
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "助您逐步進行行銷活動。"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr "已建立資料庫"
+msgstr "已建立資料庫。"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
+msgid "Point of Sale"
 msgstr "鎖售點 (POS)"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "關聯"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
 msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
-msgstr ""
+msgstr "助您處理會計事情；如閣下非會計師，建議只安裝發票 "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:50
@@ -100,7 +100,7 @@ msgstr "已安裝以下用戶： \n"
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr "設置進度"
+msgstr "配置進度"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -138,19 +138,19 @@ msgstr "業務管理"
 msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
-msgstr ""
+msgstr "讓您安裝各種非必要但有趣的工作，如問卷調查、午膳管理、點子收集等等。"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
-msgstr ""
+msgstr "您可立即配置系統或以管理員身份直接連接資料庫。"
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr "進階報告"
+msgstr "進階報告功能"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -167,7 +167,7 @@ msgstr ""
 msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
-msgstr ""
+msgstr "您的公司資料會用於設置 OpenERP 發出之各種文件，如發票、銷貨單等等。"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -200,13 +200,13 @@ msgstr ""
 "\n"
 "    此模組在系統管理內幫助使用者在新增資料庫後作設定\n"
 "\n"
-"\t它的功能設定如下:\n"
+"\t其功能設定如下:\n"
 "\t* 最小規模\n"
 "\t* 會計單位\n"
 "\t* 服務體系\n"
 "\t* 製造業\n"
 "\n"
-"\t它能在畫面上更容易設定您的公司,頁首和頁尾,會計科目表安裝和語言設置\n"
+"\t其能在畫面上更容易設定您的公司、頁首和頁尾、會計科目表安裝和語言設置\n"
 "    "
 
 #. module: base_setup
@@ -214,14 +214,14 @@ msgstr ""
 msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
-msgstr ""
+msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理廠房及生產工序。"
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "助您管理專案及任務，追蹤、製作報告等等。"
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -238,7 +238,7 @@ msgstr "略過配置精靈"
 msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
-msgstr ""
+msgstr "助您管理人力資源，記錄員工架構、製作工作表、進行考勤等等。"
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -257,7 +257,7 @@ msgstr "基礎.設置.公司"
 msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
-msgstr ""
+msgstr "助您管理採購相關事項，比如邀請報價、開立供應商發票等等。"
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -340,7 +340,7 @@ msgid ""
 "Helps you get the most out of your points of sales with fast sale encoding, "
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
-msgstr ""
+msgstr "助您善用銷售渠道，加快工作流程、簡化付款工序、提貨清單自動化等等。"
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
@@ -350,7 +350,7 @@ msgstr "採購管理"
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "讓您處理報價單、銷售單及發票。"
+msgstr "助您處理報價單、銷貨單及發票。"
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
@@ -382,7 +382,7 @@ msgstr "客戶關係管理 (CRM)"
 msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
-msgstr ""
+msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理拍賣及相關商業事務。"
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -478,14 +478,14 @@ msgid ""
 "Helps you track and manage relations with customers such as leads, requests "
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
-msgstr ""
+msgstr "助您追蹤及管理客戶關係，比如潛在客戶、客戶要求、客戶問題等等。也可自動發送提醒，根據標準事件提升要求注意層級、啟動各種商業行動。"
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
 msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
-msgstr ""
+msgstr "助您管理存貨及主要庫存作業: 交貨單、接待等等。"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -497,7 +497,7 @@ msgstr "基礎設置"
 msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
-msgstr ""
+msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理相關事務更有效率。"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
@@ -566,3 +566,6 @@ msgstr "基礎.設置.配置"
 
 #~ msgid "Previous"
 #~ msgstr "上一個"
+
+#~ msgid "Point of Sales"
+#~ msgstr "鎖售點 (POS)"
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
deleted file mode 100644
index fed316eb39e..00000000000
--- a/addons/base_setup/installer.py
+++ /dev/null
@@ -1,324 +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 osv import fields, osv
-import pooler
-import pytz
-from tools.translate import _
-import tools
-
-class base_setup_installer(osv.osv_memory):
-    _name = 'base.setup.installer'
-    _inherit = 'res.config.installer'
-
-    _install_if = {
-        ('sale','crm'): ['sale_crm'],
-        ('sale','project'): ['project_mrp'],
-    }
-    _columns = {
-        # Generic modules
-        'crm':fields.boolean('Customer Relationship Management',
-            help="Helps you track and manage relations with customers such as"
-                 " leads, requests or issues. Can automatically send "
-                 "reminders, escalate requests or trigger business-specific "
-                 "actions based on standard events."),
-        'sale':fields.boolean('Sales Management',
-            help="Helps you handle your quotations, sale orders and invoicing"
-                 "."),
-        'project':fields.boolean('Project Management',
-            help="Helps you manage your projects and tasks by tracking them, "
-                 "generating plannings, etc..."),
-        'knowledge':fields.boolean('Knowledge Management',
-            help="Lets you install addons geared towards sharing knowledge "
-                 "with and between your employees."),
-        'stock':fields.boolean('Warehouse Management',
-            help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
-        'mrp':fields.boolean('Manufacturing',
-            help="Helps you manage your manufacturing processes and generate "
-                 "reports on those processes."),
-        'account_voucher':fields.boolean('Invoicing & Payments',
-            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
-        'account_accountant':fields.boolean('Accounting & Finance',
-            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
-        'purchase':fields.boolean('Purchase Management',
-            help="Helps you manage your purchase-related processes such as "
-                 "requests for quotations, supplier invoices, etc..."),
-        'hr':fields.boolean('Human Resources',
-            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."),
-        'point_of_sale':fields.boolean('Point of Sales',
-            help="Helps you get the most out of your points of sales with "
-                 "fast sale encoding, simplified payment mode encoding, "
-                 "automatic picking lists generation and more."),
-        'marketing':fields.boolean('Marketing',
-            help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Extra Tools',
-            help="Lets you install various interesting but non-essential tools "
-                "like Survey, Lunch and Ideas box."),
-        'report_designer':fields.boolean('Advanced Reporting',
-            help="Lets you install various tools to simplify and enhance "
-                 "OpenERP's report creation."),
-        # Vertical modules
-        'product_expiry':fields.boolean('Food Industry',
-            help="Installs a preselected set of OpenERP applications "
-                "which will help you manage your industry."),
-        'association':fields.boolean('Associations',
-            help="Installs a preselected set of OpenERP "
-                 "applications which will help you manage your association "
-                 "more efficiently."),
-        'auction':fields.boolean('Auction Houses',
-            help="Installs a preselected set of OpenERP "
-                 "applications selected to help you manage your auctions "
-                 "as well as the business processes around them."),
-        }
-
-    def _if_knowledge(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['document_ftp']
-        return None
-
-    def _if_misc_tools(self, cr, uid, ids, context=None):
-        return ['profile_tools']
-
-    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
-        value = {}
-        # Calculate progress
-        closed, total = self.get_current_progress(cr, uid)
-        progress = round(100. * closed / (total + len(filter(None, args))))
-        value.update({'progress':progress})
-        if progress < 10.:
-            progress = 10.
-        
-        return {'value':value}
-
-
-    def execute(self, cr, uid, ids, context=None):
-        module_pool = self.pool.get('ir.module.module')
-        modules_selected = []
-        datas = self.read(cr, uid, ids, context=context)[0]
-        for mod in datas.keys():
-            if mod in ('id', 'progress'):
-                continue
-            if datas[mod] == 1:
-                modules_selected.append(mod)
-
-        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
-        need_install = False
-        for module in module_pool.browse(cr, uid, module_ids, context=context):
-            if module.state == 'uninstalled':
-                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-                need_install = True
-                cr.commit()
-            elif module.state == 'installed':
-                cr.execute("update ir_actions_todo set state='open' \
-                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
-                                    and ir_actions_todo.type='special'\
-                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
-        if need_install:
-            self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
-        return
-    
-base_setup_installer()
-
-#Migrate data from another application Conf wiz
-
-class migrade_application_installer_modules(osv.osv_memory):
-    _name = 'migrade.application.installer.modules'
-    _inherit = 'res.config.installer'
-    _columns = {
-        'import_saleforce': fields.boolean('Import Saleforce',
-            help="For Import Saleforce"),
-        'import_sugarcrm': fields.boolean('Import Sugarcrm',
-            help="For Import Sugarcrm"),
-        'sync_google_contact': fields.boolean('Sync Google Contact',
-            help="For Sync Google Contact"),
-        'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
-            help="For Quickbooks Ippids"),
-    }
-    
-migrade_application_installer_modules()
-
-class product_installer(osv.osv_memory):
-    _name = 'product.installer'
-    _inherit = 'res.config'
-    _columns = {
-                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
-
-    }
-    _defaults = {
-                 'customers': 'create',
-    }
-    
-    def execute(self, cr, uid, ids, context=None):
-        if context is None:
-             context = {}
-        data_obj = self.pool.get('ir.model.data')
-        val = self.browse(cr, uid, ids, context=context)[0]
-        if val.customers == 'create':
-            id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            return {
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'res.partner',
-                    'views': [(id2, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'current',
-                    'nodestroy':False,
-                }
-        if val.customers == 'import':
-            return {'type': 'ir.actions.act_window'}
-
-product_installer()
-
-
-#       Define default users preferences config wiz
-
-def _lang_get(self, cr, uid, context=None):
-    obj = self.pool.get('res.lang')
-    ids = obj.search(cr, uid, [('translatable','=',True)])
-    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
-    res = [(r['code'], r['name']) for r in res]
-    return res
-
-def _tz_get(self,cr,uid, context=None):
-    return [(x, x) for x in pytz.all_timezones]
-
-class user_preferences_config(osv.osv_memory):
-    _name = 'user.preferences.config'
-    _inherit = 'res.config'
-    _columns = {
-        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
-            help="Set default for new user's timezone, used to perform timezone conversions "
-                 "between the server and the client."),
-        'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Sets default language for the all user interface, when UI "
-                "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
-        'view': fields.selection([('simple','Simplified'),
-                                  ('extended','Extended')],
-                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
-        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
-                                 
-    }
-    _defaults={
-               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
-               'context_lang' : 'en_US',
-               'menu_tips' : True
-    }
-    
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
-        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
-        for id, field, value in res_default:
-            res.update({field: value})
-        return res
-
-    def execute(self, cr, uid, ids, context=None):
-        user_obj = self.pool.get('res.users')
-        user_ids = user_obj.search(cr, uid, [], context=context)
-        for o in self.browse(cr, uid, ids, context=context):
-            user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
-            ir_values_obj = self.pool.get('ir.values')
-            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
-            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
-            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
-            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
-        return {}
-
-user_preferences_config()
-
-# Specify Your Terminology
-
-class specify_partner_terminology(osv.osv_memory):
-    _name = 'specify.partner.terminology'
-    _inherit = 'res.config'
-    _columns = {
-        'partner': fields.selection([('Customer','Customer'),
-                                  ('Client','Client'),
-                                  ('Member','Member'),
-                                  ('Patient','Patient'),
-                                  ('Partner','Partner'),
-                                  ('Donor','Donor'),
-                                  ('Guest','Guest'),
-                                  ('Tenant','Tenant')
-                                  ],
-                                 'Choose how to call a Customer', required=True ),
-    }
-    _defaults={
-               'partner' :'Partner',
-    }
-    
-    def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
-        trans_obj = self.pool.get('ir.translation')
-        user_obj = self.pool.get('res.users')
-        context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
-        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)])
-        if existing_trans_ids:
-            trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
-        else:
-            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
-        return {}
-    
-    def execute(self, cr, uid, ids, context=None):
-        def _case_insensitive_replace(ref_string, src, value):
-            import re
-            pattern = re.compile(src, re.IGNORECASE)
-            return pattern.sub(_(value), _(ref_string))
-        trans_obj = self.pool.get('ir.translation')
-        fields_obj = self.pool.get('ir.model.fields')
-        menu_obj = self.pool.get('ir.ui.menu')
-        act_window_obj = self.pool.get('ir.actions.act_window')
-        for o in self.browse(cr, uid, ids, context=context):
-            #translate label of field
-            field_ids = fields_obj.search(cr, uid, [('field_description','ilike','Customer')])
-            for f_id in fields_obj.browse(cr ,uid, field_ids, context=context):
-                field_ref = f_id.model_id.model + ',' + f_id.name
-                self.make_translations(cr, uid, ids, field_ref, 'field', f_id.field_description, _case_insensitive_replace(f_id.field_description,'Customer',o.partner), context=context)
-            #translate help tooltip of field
-            for obj in self.pool.obj_pool.values():
-                for field_name, field_rec in obj._columns.items():
-                    if field_rec.help.lower().count('customer'):
-                        field_ref = obj._name + ',' + field_name
-                        self.make_translations(cr, uid, ids, field_ref, 'help', field_rec.help, _case_insensitive_replace(field_rec.help,'Customer',o.partner), context=context)
-            #translate menuitems
-            menu_ids = menu_obj.search(cr,uid, [('name','ilike','Customer')])
-            for m_id in menu_obj.browse(cr, uid, menu_ids, context=context):
-                menu_name = m_id.name
-                menu_ref = 'ir.ui.menu' + ',' + 'name'
-                self.make_translations(cr, uid, ids, menu_ref, 'model', menu_name, _case_insensitive_replace(menu_name,'Customer',o.partner), res_id=m_id.id, context=context)
-            #translate act window name
-            act_window_ids = act_window_obj.search(cr, uid, [('name','ilike','Customer')])
-            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
-                act_ref = 'ir.actions.act_window' + ',' + 'name'
-                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.name, _case_insensitive_replace(act_id.name,'Customer',o.partner), res_id=act_id.id, context=context)
-            #translate act window tooltips
-            act_window_ids = act_window_obj.search(cr, uid, [('help','ilike','Customer')])
-            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
-                act_ref = 'ir.actions.act_window' + ',' + 'help'
-                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
-        return {}
-    
-specify_partner_terminology()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
deleted file mode 100644
index 255b0e89408..00000000000
--- a/addons/base_setup/wizard/res_company_logo.py
+++ /dev/null
@@ -1,49 +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 os
-import tools
-from tools.translate import _
-
-
-class res_company_logo(osv.osv_memory):
-    _name = 'res.company.logo'
-    _inherit = 'res.config'
-    _columns = {
-        'logo' : fields.binary('Logo'),
-    }
-    _defaults={
-               'logo':lambda self,cr,uid,c: self.pool.get('res.company').browse(cr, uid, uid,c).logo,
-     }
-
-    def execute(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        user_comp = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-        get_val = self.browse(cr, uid, ids)[0]
-        user_comp.write({'logo': get_val.logo}, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-    
-res_company_logo()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml
deleted file mode 100644
index a21fd261dd8..00000000000
--- a/addons/base_setup/wizard/res_company_logo_view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <record id="view_res_company_logo" model="ir.ui.view">
-            <field name="name">res.company.logo.form</field>
-            <field name="model">res.company.logo</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
-            <field name="arch" type="xml">
-            <data>
-                <form position="attributes">
-                     <attribute name="string">Upload Your Company Logo</attribute>
-                </form>
-                <xpath expr='//separator[@string="title"]' position='attributes'>
-                   <attribute name='string'> </attribute>
-                </xpath>
-                <xpath expr="//label[@string='description']"
-                      position="attributes">
-                      <attribute name="string">Upload your company logo in JPG or PNG with a format similar to 450*150 pixels </attribute>
-                </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                     <attribute name='string'> </attribute>
-                     <attribute name='rowspan'>12</attribute>
-                 </xpath>
-                 <xpath expr="//button[@string='Next']" position="replace">
-                      <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
-                  </xpath>
-                 <group string="res_config_contents" position="replace">
-                    <group colspan="4">
-                        <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
-                  </group>
-                </group>
-             </data>
-            </field>
-        </record>
-
-        <record id="action_res_company_logo" model="ir.actions.act_window">
-            <field name="name">Upload Your Company Logo</field>
-            <field name="res_model">res.company.logo</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_res_company_logo"/>
-            <field name="target">new</field>
-        </record>
-        
-    </data>
-</openerp>
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index a95dcff71da..fba793e0473 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -23,7 +23,7 @@
         "name":"Server Object Synchronization",
         "version":"0.1",
         "author":"OpenERP SA",
-        "category":"Tools",
+        "category":"Hidden",
         "description": """
 Synchronization with all objects.
 =================================
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index f161d6c31ea..07f71539bb7 100644
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -36,12 +36,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Transfered Ids Details">
-                    <group colspan="4" col="10">
+                    <group>
                       <field name="name"/>
                       <field name="obj_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4">
+                    <group expand="0" string="Group By">
                       <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'obj_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'name'}"/>
@@ -118,12 +118,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Synchronized objects">
-                    <group colspan="4" col="10">
+                    <group>
                       <field name="model_id"/>
                       <field name="synchronize_date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4">
+                    <group expand="0" string="Group By">
                       <filter string="Object to synchronize" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Latest synchronization" icon="terp-go-month" domain="[]" context="{'group_by':'synchronize_date'}"/>
diff --git a/addons/base_synchro/i18n/bg.po b/addons/base_synchro/i18n/bg.po
index 2846b945013..1cf82a74cd9 100644
--- a/addons/base_synchro/i18n/bg.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/ca.po b/addons/base_synchro/i18n/ca.po
index 54a6515ecaa..979d953de0f 100644
--- a/addons/base_synchro/i18n/ca.po
+++ b/addons/base_synchro/i18n/ca.po
@@ -14,276 +14,276 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
 msgid "Base Synchronization"
-msgstr ""
+msgstr "Sincronització"
 
 #. module: base_synchro
 #: field:base.synchro.server,server_db:0
 msgid "Server Database"
-msgstr ""
+msgstr "Servidor de la base de dades"
 
 #. module: base_synchro
 #: view:base.synchro.server:0
 #: model:ir.model,name:base_synchro.model_base_synchro_server
 msgid "Synchronized server"
-msgstr ""
+msgstr "Servidor sincronitzat"
 
 #. module: base_synchro
 #: field:base.synchro.obj.avoid,name:0
 msgid "Field Name"
-msgstr ""
+msgstr "Nom del camp"
 
 #. module: base_synchro
 #: field:base.synchro.obj,synchronize_date:0
 msgid "Latest Synchronization"
-msgstr ""
+msgstr "Última sincronització"
 
 #. module: base_synchro
 #: field:base.synchro,user_id:0
 msgid "Send Result To"
-msgstr ""
+msgstr "Envia resultats a"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
 msgid "Fields to not synchronize"
-msgstr ""
+msgstr "Camps per no sincronitzar"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "_Close"
-msgstr ""
+msgstr "_Tanca"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "Transfer Data To Server"
-msgstr ""
+msgstr "Transfereix dades al servidor"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj
 msgid "Register Class"
-msgstr ""
+msgstr "Registra classe"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
 #: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
 #: model:ir.ui.menu,name:base_synchro.transfer_menu_id
 msgid "Synchronized objects"
-msgstr ""
+msgstr "Objectes sincronitzats"
 
 #. module: base_synchro
 #: field:base.synchro.server,obj_ids:0
 msgid "Models"
-msgstr ""
+msgstr "Models"
 
 #. module: base_synchro
 #: field:base.synchro.obj.avoid,obj_id:0
 #: view:base.synchro.obj.line:0
 #: field:base.synchro.obj.line,obj_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objecte"
 
 #. module: base_synchro
 #: field:base.synchro.server,login:0
 msgid "User Name"
-msgstr ""
+msgstr "Nom usuari"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
 #: view:base.synchro.obj.line:0
 msgid "Group By"
-msgstr ""
+msgstr "Agrupa per"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
 msgid "Upload"
-msgstr ""
+msgstr "Puja"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Latest synchronization"
-msgstr ""
+msgstr "Última sincronització"
 
 #. module: base_synchro
 #: model:ir.module.module,description:base_synchro.module_meta_information
 msgid "Synchronization with all objects."
-msgstr ""
+msgstr "Sincronització amb tots els objectes."
 
 #. module: base_synchro
 #: view:base.synchro.obj.line:0
 #: field:base.synchro.obj.line,name:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: base_synchro
 #: field:base.synchro.server,password:0
 msgid "Password"
-msgstr ""
+msgstr "Contrasenya"
 
 #. module: base_synchro
 #: field:base.synchro.obj,avoid_ids:0
 msgid "Fields Not Sync."
-msgstr ""
+msgstr "Camps no sincro."
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
 msgid "Both"
-msgstr ""
+msgstr "Tots dos"
 
 #. module: base_synchro
 #: field:base.synchro.obj,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Fields"
-msgstr ""
+msgstr "Camps"
 
 #. module: base_synchro
 #: view:base.synchro.obj.line:0
 msgid "Transfered Ids Details"
-msgstr ""
+msgstr "Detalls de lds transferits"
 
 #. module: base_synchro
 #: field:base.synchro.obj,action:0
 msgid "Synchronisation direction"
-msgstr ""
+msgstr "Direcció de la sincronització"
 
 #. module: base_synchro
 #: field:base.synchro.obj,server_id:0
 msgid "Server"
-msgstr ""
+msgstr "Servidor"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
 #: model:ir.model,name:base_synchro.model_base_synchro_obj_line
 #: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
 msgid "Synchronized instances"
-msgstr ""
+msgstr "Instàncies de sincronització"
 
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
 #: field:base.synchro.obj,model_id:0
 msgid "Object to synchronize"
-msgstr ""
+msgstr "Objecte a sincronitzar"
 
 #. module: base_synchro
 #: model:ir.module.module,shortdesc:base_synchro.module_meta_information
 msgid "Base Synchro"
-msgstr ""
+msgstr "Base sincro"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
 #: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
 msgid "Servers to be synchronized"
-msgstr ""
+msgstr "Servidors per ser sincronitzats"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Transfer Details"
-msgstr ""
+msgstr "Detalls de la transferència"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,remote_id:0
 msgid "Remote Id"
-msgstr ""
+msgstr "ID remot"
 
 #. module: base_synchro
 #: field:base.synchro.obj,line_id:0
 msgid "Ids Affected"
-msgstr ""
+msgstr "Ids afectats"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_63
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_62
 #: model:ir.ui.menu,name:base_synchro.synch_config
 msgid "Synchronization"
-msgstr ""
+msgstr "Sincronització"
 
 #. module: base_synchro
 #: field:base.synchro.obj,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Domini"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "_Synchronize"
-msgstr ""
+msgstr "_Sincronitza"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "OK"
-msgstr ""
+msgstr "D'acord"
 
 #. module: base_synchro
 #: field:base.synchro.server,name:0
 msgid "Server name"
-msgstr ""
+msgstr "Nom del servidor"
 
 #. module: base_synchro
 #: field:base.synchro.obj,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid ""
 "The synchronisation has been started.You will receive a request when it's "
 "done."
-msgstr ""
+msgstr "La sincronització ha començat. Rebreu un avís quan finalitzi."
 
 #. module: base_synchro
 #: field:base.synchro.server,server_port:0
 msgid "Server Port"
-msgstr ""
+msgstr "Port del servidor"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
 msgid "Synchronize objects"
-msgstr ""
+msgstr "Sincronitza objectes"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "Synchronization Complited!"
-msgstr ""
+msgstr "Sincronització finalitzada!"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro
 msgid "base.synchro"
-msgstr ""
+msgstr "base.synchro"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,local_id:0
 msgid "Local Id"
-msgstr ""
+msgstr "Id local"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
 #: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
 msgid "Filters"
-msgstr ""
+msgstr "Filtres"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
 msgid "Download"
-msgstr ""
+msgstr "Descàrrega"
 
 #. module: base_synchro
 #: field:base.synchro,server_url:0
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
-msgstr ""
+msgstr "URL del servidor"
diff --git a/addons/base_synchro/i18n/de.po b/addons/base_synchro/i18n/de.po
index 8c541fe9f06..83d1625a504 100644
--- a/addons/base_synchro/i18n/de.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -290,28 +290,3 @@ msgstr "Download"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "Server URL"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
-
-#~ msgid "Synchronized Servers"
-#~ msgstr "Synchronisierte Server"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_synchro/i18n/el.po b/addons/base_synchro/i18n/el.po
index 073efb3f5cb..c6b0c410e7d 100644
--- a/addons/base_synchro/i18n/el.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -287,6 +287,3 @@ msgstr "Λήψη"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr ""
-
-#~ msgid "Synchronized Servers"
-#~ msgstr "Συγχρονισμένοι Διακομιστές"
diff --git a/addons/base_synchro/i18n/es.po b/addons/base_synchro/i18n/es.po
index ed1e980e9ef..3071286e531 100644
--- a/addons/base_synchro/i18n/es.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -288,24 +288,3 @@ msgstr "Descargar"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "URL Servidor"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar por x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
diff --git a/addons/base_synchro/i18n/es_MX.po b/addons/base_synchro/i18n/es_MX.po
new file mode 100644
index 00000000000..220bdd119f2
--- /dev/null
+++ b/addons/base_synchro/i18n/es_MX.po
@@ -0,0 +1,290 @@
+# 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: 2010-12-27 09:15+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr "Sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "Servidor de base de datos"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "Servidor sincronizado"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "Nombre del campo"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "Última sincronización"
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "Enviar resultados a"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "Campos a no sincronizar"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "Transferir datos al servidor"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr "Registrar clase"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr "Objetos sincronizados"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "Modelos"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "Cargar"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "Última sincronización"
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr "Sincronización con todos los objetos."
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr "Campos no sincro."
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "Ambos"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr "Detalles de lds transferidos"
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "Sentido de la sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr "Instancias de sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "Objeto a sincronizar"
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr "Base sincro"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr "Servidores a ser sincronizados"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "Detalles de transferencia"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr "Id remoto"
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr "Ids afectados"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "Historial"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "_Sincronizar"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr "Aceptar"
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "Nombre del servidor"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr "La sincronización ha comenzado. Recibirá un aviso cuando finalice."
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "Puerto servidor"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr "Sincronizar objetos"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr "Sincronización finalizada!"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr "base.synchro"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr "Id local"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "Descargar"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "URL Servidor"
diff --git a/addons/base_synchro/i18n/es_PY.po b/addons/base_synchro/i18n/es_PY.po
index d783506e475..6bdad6229e7 100644
--- a/addons/base_synchro/i18n/es_PY.po
+++ b/addons/base_synchro/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/es_VE.po b/addons/base_synchro/i18n/es_VE.po
new file mode 100644
index 00000000000..220bdd119f2
--- /dev/null
+++ b/addons/base_synchro/i18n/es_VE.po
@@ -0,0 +1,290 @@
+# 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: 2010-12-27 09:15+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr "Sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "Servidor de base de datos"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "Servidor sincronizado"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "Nombre del campo"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "Última sincronización"
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "Enviar resultados a"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "Campos a no sincronizar"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "Transferir datos al servidor"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr "Registrar clase"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr "Objetos sincronizados"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "Modelos"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "Cargar"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "Última sincronización"
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr "Sincronización con todos los objetos."
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr "Campos no sincro."
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "Ambos"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr "Detalles de lds transferidos"
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "Sentido de la sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr "Instancias de sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "Objeto a sincronizar"
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr "Base sincro"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr "Servidores a ser sincronizados"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "Detalles de transferencia"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr "Id remoto"
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr "Ids afectados"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "Historial"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "_Sincronizar"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr "Aceptar"
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "Nombre del servidor"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr "La sincronización ha comenzado. Recibirá un aviso cuando finalice."
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "Puerto servidor"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr "Sincronizar objetos"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr "Sincronización finalizada!"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr "base.synchro"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr "Id local"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "Descargar"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "URL Servidor"
diff --git a/addons/base_synchro/i18n/et.po b/addons/base_synchro/i18n/et.po
new file mode 100644
index 00000000000..596f3c6937b
--- /dev/null
+++ b/addons/base_synchro/i18n/et.po
@@ -0,0 +1,289 @@
+# Estonian 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-10-11 17:56+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "Serveri andmebaas"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "Välja Nimi:"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "Viimane sünkroniseerimine"
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "_Sulge"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "Kasutajanimi"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "Rühmitamise alus"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "Lae üles"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "Kuupäev"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "Salasõna"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "Mõlemad"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "Väljad"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "Server"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "Ajalugu"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr "Sünkroniseerimine"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "Domeen"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "_Sünkroniseeri"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr "OK"
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "Serveri nimi"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "Järgnevus"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "Serveri port"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr "base.synchro"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr "Filtrid"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "Lae alla"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr ""
diff --git a/addons/base_synchro/i18n/fi.po b/addons/base_synchro/i18n/fi.po
index 3d6f0a35015..fc504ce839f 100644
--- a/addons/base_synchro/i18n/fi.po
+++ b/addons/base_synchro/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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/fr.po b/addons/base_synchro/i18n/fr.po
index df830d39c65..22f7e3abcda 100644
--- a/addons/base_synchro/i18n/fr.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/gl.po b/addons/base_synchro/i18n/gl.po
index 5384f47e533..63dc0fcb49f 100644
--- a/addons/base_synchro/i18n/gl.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/hu.po b/addons/base_synchro/i18n/hu.po
index 37c49645f42..37c43b17805 100644
--- a/addons/base_synchro/i18n/hu.po
+++ b/addons/base_synchro/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-17 11:40+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/it.po b/addons/base_synchro/i18n/it.po
index eed0a5761eb..cf295932674 100644
--- a/addons/base_synchro/i18n/it.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -288,30 +288,3 @@ msgstr "Download"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "URL server"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Synchronized Servers"
-#~ msgstr "Server Sincronizzati"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/base_synchro/i18n/nl.po b/addons/base_synchro/i18n/nl.po
index 46d0fba8db9..a681a76f59a 100644
--- a/addons/base_synchro/i18n/nl.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -287,26 +287,3 @@ msgstr "Downloaden"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "Server URL"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/base_synchro/i18n/pl.po b/addons/base_synchro/i18n/pl.po
index 49f9a3455f7..ad873919d08 100644
--- a/addons/base_synchro/i18n/pl.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/pt.po b/addons/base_synchro/i18n/pt.po
index 958ede17307..5b57297af10 100644
--- a/addons/base_synchro/i18n/pt.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/pt_BR.po b/addons/base_synchro/i18n/pt_BR.po
index 5b88ecf10e7..589d17992e5 100644
--- a/addons/base_synchro/i18n/pt_BR.po
+++ b/addons/base_synchro/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -289,27 +289,3 @@ msgstr "Baixar"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "URL do servidor"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/base_synchro/i18n/ro.po b/addons/base_synchro/i18n/ro.po
index 92de5e51ec8..3006d75e4cc 100644
--- a/addons/base_synchro/i18n/ro.po
+++ b/addons/base_synchro/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-19 20:57+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/ru.po b/addons/base_synchro/i18n/ru.po
index 158abf9eec9..cc182d12be8 100644
--- a/addons/base_synchro/i18n/ru.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -288,24 +288,3 @@ msgstr "Загрузить"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "Адрес сервера"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/base_synchro/i18n/sq.po b/addons/base_synchro/i18n/sq.po
index 4acc723e9b8..f8c72eaa144 100644
--- a/addons/base_synchro/i18n/sq.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/sr.po b/addons/base_synchro/i18n/sr.po
index 9c1b861ab8c..337fc35e69c 100644
--- a/addons/base_synchro/i18n/sr.po
+++ b/addons/base_synchro/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -287,20 +287,3 @@ msgstr "Download"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "URL Servera"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Gredka ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za Pregled arhitekture"
-
-#~ msgid "Synchronized Servers"
-#~ msgstr "Sinhronizovani Serveri"
diff --git a/addons/base_synchro/i18n/sr@latin.po b/addons/base_synchro/i18n/sr@latin.po
index 8aa06d1e245..36f5c594a2b 100644
--- a/addons/base_synchro/i18n/sr@latin.po
+++ b/addons/base_synchro/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -287,20 +287,3 @@ msgstr "Download"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "URL Servera"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Gredka ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za Pregled arhitekture"
-
-#~ msgid "Synchronized Servers"
-#~ msgstr "Sinhronizovani Serveri"
diff --git a/addons/base_synchro/i18n/sv.po b/addons/base_synchro/i18n/sv.po
index ea04be4b0d0..47f5be9b4a0 100644
--- a/addons/base_synchro/i18n/sv.po
+++ b/addons/base_synchro/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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
@@ -287,23 +287,3 @@ msgstr ""
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
diff --git a/addons/base_synchro/i18n/tr.po b/addons/base_synchro/i18n/tr.po
index 324f28f1ce0..36cdf8bdff1 100644
--- a/addons/base_synchro/i18n/tr.po
+++ b/addons/base_synchro/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/vi.po b/addons/base_synchro/i18n/vi.po
index d7e4baa6385..388ee23a743 100644
--- a/addons/base_synchro/i18n/vi.po
+++ b/addons/base_synchro/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: 2011-07-07 04:41+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
diff --git a/addons/base_synchro/i18n/zh_CN.po b/addons/base_synchro/i18n/zh_CN.po
index 4ddbd7d3a54..b1264badf9c 100644
--- a/addons/base_synchro/i18n/zh_CN.po
+++ b/addons/base_synchro/i18n/zh_CN.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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
 msgid "Base Synchronization"
-msgstr ""
+msgstr "Base Synchronization"
 
 #. module: base_synchro
 #: field:base.synchro.server,server_db:0
@@ -31,27 +31,27 @@ msgstr "服务器数据库"
 #: view:base.synchro.server:0
 #: model:ir.model,name:base_synchro.model_base_synchro_server
 msgid "Synchronized server"
-msgstr "已同步的服务器"
+msgstr "同步服务器"
 
 #. module: base_synchro
 #: field:base.synchro.obj.avoid,name:0
 msgid "Field Name"
-msgstr ""
+msgstr "字段名"
 
 #. module: base_synchro
 #: field:base.synchro.obj,synchronize_date:0
 msgid "Latest Synchronization"
-msgstr "最后一次同步"
+msgstr "最新同步"
 
 #. module: base_synchro
 #: field:base.synchro,user_id:0
 msgid "Send Result To"
-msgstr "将结果发送到"
+msgstr "结果发送到"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
 msgid "Fields to not synchronize"
-msgstr ""
+msgstr "不需同步的字段"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -66,7 +66,7 @@ msgstr "将数据上传至服务器"
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj
 msgid "Register Class"
-msgstr ""
+msgstr "注册同步类"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
@@ -78,14 +78,14 @@ msgstr "已同步的对象"
 #. module: base_synchro
 #: field:base.synchro.server,obj_ids:0
 msgid "Models"
-msgstr ""
+msgstr "模式"
 
 #. module: base_synchro
 #: field:base.synchro.obj.avoid,obj_id:0
 #: view:base.synchro.obj.line:0
 #: field:base.synchro.obj.line,obj_id:0
 msgid "Object"
-msgstr ""
+msgstr "对象"
 
 #. module: base_synchro
 #: field:base.synchro.server,login:0
@@ -96,7 +96,7 @@ msgstr "用户名"
 #: view:base.synchro.obj:0
 #: view:base.synchro.obj.line:0
 msgid "Group By"
-msgstr "分组方式"
+msgstr "分组"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
@@ -106,12 +106,12 @@ msgstr "上传"
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Latest synchronization"
-msgstr "最后一次上传"
+msgstr "最新的同步"
 
 #. module: base_synchro
 #: model:ir.module.module,description:base_synchro.module_meta_information
 msgid "Synchronization with all objects."
-msgstr ""
+msgstr "同步所有对象"
 
 #. module: base_synchro
 #: view:base.synchro.obj.line:0
@@ -127,12 +127,12 @@ msgstr "密码"
 #. module: base_synchro
 #: field:base.synchro.obj,avoid_ids:0
 msgid "Fields Not Sync."
-msgstr ""
+msgstr "不需同步的字段"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
 msgid "Both"
-msgstr ""
+msgstr "双向"
 
 #. module: base_synchro
 #: field:base.synchro.obj,name:0
@@ -142,12 +142,12 @@ msgstr "名称"
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Fields"
-msgstr ""
+msgstr "字段"
 
 #. module: base_synchro
 #: view:base.synchro.obj.line:0
 msgid "Transfered Ids Details"
-msgstr ""
+msgstr "同步细节"
 
 #. module: base_synchro
 #: field:base.synchro.obj,action:0
@@ -169,7 +169,7 @@ msgstr "已同步的实例"
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
@@ -180,33 +180,33 @@ msgstr "要同步的对象"
 #. module: base_synchro
 #: model:ir.module.module,shortdesc:base_synchro.module_meta_information
 msgid "Base Synchro"
-msgstr ""
+msgstr "Base Synchro"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
 #: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
 msgid "Servers to be synchronized"
-msgstr ""
+msgstr "要同步的服务器"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Transfer Details"
-msgstr "传输细节"
+msgstr "同步细节"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,remote_id:0
 msgid "Remote Id"
-msgstr ""
+msgstr "远程 ID"
 
 #. module: base_synchro
 #: field:base.synchro.obj,line_id:0
 msgid "Ids Affected"
-msgstr ""
+msgstr "影响的实例行"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_63
 msgid "History"
-msgstr "历史"
+msgstr "日志"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_62
@@ -217,7 +217,7 @@ msgstr "同步"
 #. module: base_synchro
 #: field:base.synchro.obj,domain:0
 msgid "Domain"
-msgstr "主机"
+msgstr "域"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -244,7 +244,7 @@ msgstr "序列"
 msgid ""
 "The synchronisation has been started.You will receive a request when it's "
 "done."
-msgstr ""
+msgstr "同步已经开始，结束的时候你会收到请求"
 
 #. module: base_synchro
 #: field:base.synchro.server,server_port:0
@@ -254,28 +254,28 @@ msgstr "服务器端口"
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
 msgid "Synchronize objects"
-msgstr ""
+msgstr "同步对象"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "Synchronization Complited!"
-msgstr ""
+msgstr "同步完成！"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro
 msgid "base.synchro"
-msgstr ""
+msgstr "base.synchro"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,local_id:0
 msgid "Local Id"
-msgstr ""
+msgstr "本地 id"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
 #: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
 msgid "Filters"
-msgstr ""
+msgstr "筛选"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
@@ -287,13 +287,3 @@ msgstr "下载"
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
 msgstr "服务器 URL"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须以 x_ 且不包含任何特殊字符！"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "错误！无法创建递归菜单。"
-
-#~ msgid "Synchronized Servers"
-#~ msgstr "已同步的服务器"
diff --git a/addons/base_synchro/i18n/zh_TW.po b/addons/base_synchro/i18n/zh_TW.po
new file mode 100644
index 00000000000..3113f39312b
--- /dev/null
+++ b/addons/base_synchro/i18n/zh_TW.po
@@ -0,0 +1,289 @@
+# Chinese (Traditional) 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-09-27 14:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr "基礎同步化"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "伺服器資料庫"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "同步化伺服器"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "欄位名稱"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "最新同步化"
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "將結果發送至"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "不同步化之欄位"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "將資料轉至伺服器"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr "同步化物件"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "模型"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "物件"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "上載"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "最新同步化"
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr "與所有物件同步化。"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "日期"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "密碼"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr "無同步化欄位"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "兩者"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "欄位"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr "已傳送 Ids 詳情"
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "同步化方向"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "伺服器"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr "作用中"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "要同步化物件"
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr "要同步化伺服器"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "傳送詳情"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr "遠端 Id"
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr "受影響 Ids"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "歷史紀錄"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr "同步化"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "領域"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "同步化(_S)"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "伺服器名稱"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "次序"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr "同步化已開始。完成時會收到要求。"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "伺服器連接埠"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr "同步化物件"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr "同步化完成!"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr "本機 Id"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "下載"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "伺服器 URL"
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py
index 1a593684b59..bc16b558ce5 100644
--- a/addons/base_synchro/wizard/base_synchro.py
+++ b/addons/base_synchro/wizard/base_synchro.py
@@ -170,7 +170,7 @@ class base_synchro(osv.osv_memory):
             #
             # If not synchronized, try to find it with name_get/name_search
             #
-            names = pool_src.get(object).name_get(cr, uid, [id], context)[0][1]
+            names = pool_src.get(object).name_get(cr, uid, [id])[0][1]
             res = pool_dest.get(object).name_search(cr, uid, names, [], 'like')
             if res:
                 result = res[0][0]
@@ -189,7 +189,7 @@ class base_synchro(osv.osv_memory):
     def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context=None):
         self.meta.setdefault(pool_src, {})
         if not object in self.meta[pool_src]:
-            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context)
+            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid)
         fields = self.meta[pool_src][object]
 
         for f in fields:
diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml
index 231fc7b055f..ccebb6145c2 100644
--- a/addons/base_synchro/wizard/base_synchro_view.xml
+++ b/addons/base_synchro/wizard/base_synchro_view.xml
@@ -7,6 +7,7 @@
             <field name="name">Base Synchronization</field>
             <field name="model">base.synchro</field>
             <field name="type">form</field>
+            <field name="priority">1</field>
             <field name="arch" type="xml">
             <form string="Transfer Data To Server">
                 <field name="server_url" colspan="4"/>
@@ -29,19 +30,18 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/>
         <record id="view_base_synchro_finish" model="ir.ui.view">
             <field name="name">Base Synchronization</field>
             <field name="model">base.synchro</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Synchronization Complited!">
+            <form string="Synchronization Completed!">
             <label string="The synchronisation has been started.You will receive a request when it's done." colspan="4"/>
                  <separator string="" colspan="4"/>
                     <button special="cancel" string="OK" icon="gtk-ok"/>
             </form>
             </field>
-       </record>
+        </record>
 
         <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/>
 
diff --git a/addons/base_tools/__init__.py b/addons/base_tools/__init__.py
index 50a14119520..4c241b72be9 100644
--- a/addons/base_tools/__init__.py
+++ b/addons/base_tools/__init__.py
@@ -1 +1,3 @@
 # 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
index aade7664041..6fff6c3c207 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -4,7 +4,7 @@
     "author": "OpenERP SA",
     "version": "1.0",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     'description': """
 Common base for tools modules.
@@ -19,3 +19,5 @@ Creates menu link for Tools from where tools like survey, lunch, idea, etc. are
     "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
new file mode 100644
index 00000000000..2c0a7cc9574
--- /dev/null
+++ b/addons/base_tools/i18n/ar.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-23 01: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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/bg.po b/addons/base_tools/i18n/bg.po
index cade5ea0617..0ab386cf139 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 23af064ab51..bd449e53dc5 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..017d4b51952
--- /dev/null
+++ b/addons/base_tools/i18n/da.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-08 10:44+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Fælles grundlag for værktøjsmoduler"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/de.po b/addons/base_tools/i18n/de.po
index 3783e3eef90..8e875e7728a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..b1b45a790cb
--- /dev/null
+++ b/addons/base_tools/i18n/en_GB.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 11:52+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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Common base for tools modules"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/es.po b/addons/base_tools/i18n/es.po
index a92af3cbd69..f0a2f352595 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..7370e2314eb
--- /dev/null
+++ b/addons/base_tools/i18n/es_CL.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-10-03 16:53+0000\n"
+"Last-Translator: David Acevedo Toledo <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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 de herramientas"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/es_MX.po b/addons/base_tools/i18n/es_MX.po
new file mode 100644
index 00000000000..fdf326b3f0e
--- /dev/null
+++ b/addons/base_tools/i18n/es_MX.po
@@ -0,0 +1,32 @@
+# Spanish 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-02-15 15:36+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/es_PY.po b/addons/base_tools/i18n/es_PY.po
index d92fe6988d3..84570ef8931 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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/es_VE.po
new file mode 100644
index 00000000000..fdf326b3f0e
--- /dev/null
+++ b/addons/base_tools/i18n/es_VE.po
@@ -0,0 +1,32 @@
+# Spanish 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-02-15 15:36+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/fi.po b/addons/base_tools/i18n/fi.po
index 938bedff7ec..2b83eb21328 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d16e092fc0b..958ac2e82b4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d68bf558fad..3dd2ec8715a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a33c0c95f72..e9fc1039f29 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/id.po b/addons/base_tools/i18n/id.po
index ca40be8ed41..c2afae4ca4a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 93fe09d1881..dfc9392e8e4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d4fd022017a..41018570850 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f42bccd8d75..7f044ce222d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..47c934ff404
--- /dev/null
+++ b/addons/base_tools/i18n/oc.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-20 09:19+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Basa comuna pels moduls utilitaris"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/pt.po b/addons/base_tools/i18n/pt.po
index 18eeaecfca1..69b6b9c4459 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: 2011-05-18 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 70904e2f89d..d6fd29d17aa 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f793bcb37db..a47966ccc13 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0d3cf5a1678..6b1c2587e14 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 26344987e1e..992948b2c6f 100644
--- a/addons/base_tools/i18n/sl.po
+++ b/addons/base_tools/i18n/sl.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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
 msgid "Common base for tools modules"
-msgstr "Osnova ua modul orodja"
+msgstr "Skupna osnova za module orodij"
 
 #. module: base_tools
 #: model:ir.module.module,description:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sq.po b/addons/base_tools/i18n/sq.po
index 03ad1c851b4..cef93f9b175 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f63539dd53f..b4a028f4ebd 100644
--- a/addons/base_tools/i18n/sr@latin.po
+++ b/addons/base_tools/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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-04-05 04:40+0000\n"
-"Last-Translator: kaneolopa <Unknown>\n"
+"PO-Revision-Date: 2011-10-06 13:41+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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
 msgid "Common base for tools modules"
-msgstr "Česti moduli za osnovne alate"
+msgstr "Uobičajena osnova za alatne module"
 
 #. module: base_tools
 #: model:ir.module.module,description:base_tools.module_meta_information
@@ -28,5 +28,5 @@ msgid ""
 "\n"
 "    "
 msgstr ""
-"modul: osnovni_alati\n"
+"modul: base_tools\n"
 "    "
diff --git a/addons/base_tools/i18n/sv.po b/addons/base_tools/i18n/sv.po
new file mode 100644
index 00000000000..135f6134c11
--- /dev/null
+++ b/addons/base_tools/i18n/sv.po
@@ -0,0 +1,30 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-10 15:12+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-11-11 04:53+0000\n"
+"X-Generator: Launchpad (build 14277)\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/tr.po b/addons/base_tools/i18n/tr.po
index f37dc94d0f3..851ef949c38 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 790e4f9515e..4acecb04c79 100644
--- a/addons/base_tools/i18n/vi.po
+++ b/addons/base_tools/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-05-04 18:47+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-05 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4dd9285396e..c5dfb8a5c5b 100644
--- a/addons/base_tools/i18n/zh_CN.po
+++ b/addons/base_tools/i18n/zh_CN.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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
 msgid "Common base for tools modules"
-msgstr "base_tools"
+msgstr "常见的基础工具模块"
 
 #. module: base_tools
 #: model:ir.module.module,description:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/zh_TW.po b/addons/base_tools/i18n/zh_TW.po
new file mode 100644
index 00000000000..cfb1a3e32a6
--- /dev/null
+++ b/addons/base_tools/i18n/zh_TW.po
@@ -0,0 +1,32 @@
+# Chinese (Traditional) 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-09-27 14:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"\n"
+"    "
diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index e1999d38b87..43dbd0c1418 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -21,5 +21,4 @@
 
 import base_vat
 
-# 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/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 92af5664336..5f7c1d2d86d 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -18,26 +18,34 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 {
-    'name': 'Base VAT',
+    'name': 'VAT Number Validation',
     'version': '1.0',
-    'category': 'Tools',
-    'category': 'Generic Modules/Base',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
-Enable VAT Number for a partner and check its validity.
-=======================================================
+VAT validation for Partners' VAT numbers
+========================================
+
+After installing this module, values entered in the VAT field of Partners will
+be validated for all supported countries. The country is inferred from the
+2-letter country code that prefixes the VAT number, e.g. ``BE0477472701``
+will be validated using the Belgian rules.
+
+Supported countries currently include EU countries, and a few non-EU countries
+such as Chile, Colombia, Mexico, Norway or Russia. For unsupported countries,
+only the country code will be validated.
 
-This module follows the methods stated at http://sima-pc.com/nif.php for
-checking the validity of VAT Number assigned to partners in European countries.
     """,
     'author': 'OpenERP SA',
     'depends': ['account'],
     'website': 'http://www.openerp.com',
-    'update_xml': ['base_vat_view.xml'],
+    'data': ['base_vat_view.xml'],
     'installable': True,
     'active': False,
     'certificate': '0084849360989',
     'images': ['images/1_partner_vat.jpeg'],
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 6393c0a6182..ba858d10e64 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -2,8 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (C) 2008-2009 B2CK, Cedric Krier, Bertrand Chenal (the methods "check_vat_[a-z]{2}"
+#    Copyright (C) 2004-2011 OpenERP SA (<http://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
@@ -19,13 +18,22 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
+import logging
 import string
+import datetime
+import re
+
+try:
+    import vatnumber
+except ImportError:
+    logging.getLogger('base_vat').warning("VAT validation partially unavailable because the `vatnumber` Python library cannot be found. "
+                                          "Install it to support more countries, for example with `easy_install vatnumber`.")
+    vatnumber = None
 
 from osv import osv, fields
-from tools.translate import _
 from tools.misc import ustr
-import re
-import datetime
+from tools.translate import _
 
 _ref_vat = {
     'be': 'BE0477472701', 'at': 'ATU12345675',
@@ -42,13 +50,9 @@ _ref_vat = {
     'pt': 'PT123456789', 'ro': 'RO1234567897',
     'se': 'SE123456789701', 'si': 'SI12345679',
     'sk': 'SK0012345675', 'el': 'EL12345670',
-    'mx': 'MXABCD831230T1B',
-
-            }
-
-def mult_add(i, j):
-    """Sum each digits of the multiplication of i and j."""
-    return reduce(lambda x, y: x + int(y), str(i*j), 0)
+    'mx': 'MXABC123456T1B', 'no': 'NO123456785',
+    'hr': 'HR01234567896', # Croatia, contributed by Milan Tribuson 
+}
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
@@ -67,16 +71,17 @@ class res_partner(osv.osv):
             if not partner.vat:
                 continue
             vat_country, vat_number = self._split_vat(partner.vat)
-            if not hasattr(self, 'check_vat_' + vat_country):
-                #We didn't find the validation method for the country code. If that country code can be found in openerp, this means that it is a valid country code 
-                #and we simply didn't have implemented that function. In that case we continue.
+            check_func_name = 'check_vat_' + vat_country
+            check_func = getattr(self, check_func_name, None) or \
+                            getattr(vatnumber, check_func_name, None)
+            if not check_func:
+                # No VAT validation available, default to check that the country code
+                # exists.
                 if country_obj.search(cr, uid, [('code', 'ilike', vat_country)], context=context):
                     continue
-                #Otherwise, it means that the country code isn't valid and we return False.
-                return False
-            check = getattr(self, 'check_vat_' + vat_country)
-            if not check(vat_number):
+                # Country code not found, considered invalid
                 return False
+            return check_func(vat_number)
         return True
 
     def vat_change(self, cr, uid, ids, value, context=None):
@@ -93,997 +98,24 @@ class res_partner(osv.osv):
             #  has more than 3 characters
             return cn[0] in string.ascii_lowercase and cn[1] in string.ascii_lowercase
         vat_country, vat_number = self._split_vat(self.browse(cr, uid, ids)[0].vat)
+        vat_no = "'CC##' (CC=Country Code, ##=VAT Number)"
         if default_vat_check(vat_country, vat_number):
-            vat_no = vat_country in _ref_vat and _ref_vat[vat_country] or 'Country Code + Vat Number'
-            return _('The Vat does not seems to be correct. You should have entered something like this %s'), (vat_no)
-        return _('The VAT is invalid, It should begin with the country code'), ()
+            vat_no = _ref_vat[vat_country] if vat_country in _ref_vat else vat_no
+        return '\n' + _('This VAT number does not seem to be valid.\nNote: the expected format is %s') % vat_no
 
     _constraints = [(check_vat, _construct_constraint_msg, ["vat"])]
 
-    # code from the following methods come from Tryton (B2CK)
-    # http://www.tryton.org/hgwebdir.cgi/modules/relationship/file/544d1de586d9/party.py
-    def check_vat_at(self, vat):
-        '''
-        Check Austria VAT number.
-        '''
-        if len(vat) != 9:
-            return False
-        if vat[0] != 'U':
-            return False
-        num = vat[1:]
-        try:
-            int(num)
-        except:
-            return False
-        sum = int(num[0]) + mult_add(2, int(num[1])) + \
-                int(num[2]) + mult_add(2, int(num[3])) + \
-                int(num[4]) + mult_add(2, int(num[5])) + \
-                int(num[6])
-        check = 10 - ((sum + 4) % 10)
-        if check == 10:
-            check = 0
-        if int(vat[-1:]) != check:
-            return False
-        return True
-
-    def check_vat_be(self, vat):
-        '''
-        Check Belgium VAT number.
-        '''
-        if len(vat) != 10:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[-2:]) != \
-                97 - (int(vat[:8]) % 97):
-            return False
-        return True
-
-    def check_vat_bg(self, vat):
-        '''
-        Check Bulgaria VAT number.
-        '''
-        if len(vat) not in [9,10]:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0]) in (2, 3) and \
-                int(vat[1:2]) != 22:
-            return False
-        sum = 4 * int(vat[0]) + 3 * int(vat[1]) + 2 * int(vat[2]) + \
-                7 * int(vat[3]) + 6 * int(vat[4]) + 5 * int(vat[5]) + \
-                4 * int(vat[6]) + 3 * int(vat[7]) + 2 * int(vat[8])
-        check = 11 - (sum % 11)
-        if check == 11:
-            check = 0
-        return True
-
-    def check_vat_cy(self, vat):
-        '''
-        Check Cyprus VAT number.
-        '''
-        if len(vat) != 9:
-            return False
-        try:
-            int(vat[:8])
-        except:
-            return False
-        n0 = int(vat[0])
-        n1 = int(vat[1])
-        n2 = int(vat[2])
-        n3 = int(vat[3])
-        n4 = int(vat[4])
-        n5 = int(vat[5])
-        n6 = int(vat[6])
-        n7 = int(vat[7])
-
-        def conv(x):
-            if x == 0:
-                return 1
-            elif x == 1:
-                return 0
-            elif x == 2:
-                return 5
-            elif x == 3:
-                return 7
-            elif x == 4:
-                return 9
-            elif x == 5:
-                return 13
-            elif x == 6:
-                return 15
-            elif x == 7:
-                return 17
-            elif x == 8:
-                return 19
-            elif x == 9:
-                return 21
-            return x
-        n0 = conv(n0)
-        n2 = conv(n2)
-        n4 = conv(n4)
-        n6 = conv(n6)
-
-        sum = n0 + n1 + n2 + n3 + n4 + n5 + n6 + n7
-        check = chr(sum % 26 + 65)
-        if check != vat[8]:
-            return False
-        return True
-
-    def check_vat_cz(self, vat):
-        '''
-        Check Czech Republic VAT number.
-        '''
-        if len(vat) not in (8, 9, 10):
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-
-        if len(vat) == 8:
-            if int(vat[0]) not in (0, 1, 2, 3, 4, 5, 6, 7, 8):
-                return False
-            sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
-                    5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
-                    2 * int(vat[6])
-            check = 11 - (sum % 11)
-            if check == 10:
-                check = 0
-            if check == 11:
-                check = 1
-            if check != int(vat[7]):
-                return False
-        elif len(vat) == 9 and int(vat[0]) == 6:
-            sum = 8 * int(vat[1]) + 7 * int(vat[2]) + 6 * int(vat[3]) + \
-                    5 * int(vat[4]) + 4 * int(vat[5]) + 3 * int(vat[6]) + \
-                    2 * int(vat[7])
-            check = 9 - ((11 - (sum % 11)) % 10)
-            if check != int(vat[8]):
-                return False
-        elif len(vat) == 9:
-            if int(vat[0:2]) > 53 and int(vat[0:2]) < 80:
-                return False
-            if int(vat[2:4]) < 1:
-                return False
-            if int(vat[2:4]) > 12 and int(vat[2:4]) < 51:
-                return False
-            if int(vat[2:4]) > 62:
-                return False
-            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 > 0:
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 28:
-                    return False
-            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 == 0:
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 29:
-                    return False
-            if int(vat[2:4]) in (4, 6, 9, 11, 54, 56, 59, 61):
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 30:
-                    return False
-            if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12, 51,
-                    53, 55, 57, 58, 60, 62):
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 31:
-                    return False
-        elif len(vat) == 10:
-            if int(vat[0:2]) < 54:
-                return False
-            if int(vat[2:4]) < 1:
-                return False
-            if int(vat[2:4]) > 12 and int(vat[2:4]) < 51:
-                return False
-            if int(vat[2:4]) > 62:
-                return False
-            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 > 0:
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 28:
-                    return False
-            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 == 0:
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 29:
-                    return False
-            if int(vat[2:4]) in (4, 6, 9, 11, 54, 56, 59, 61):
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 30:
-                    return False
-            if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12, 51,
-                    53, 55, 57, 58, 60, 62):
-                if int(vat[4:6]) < 1:
-                    return False
-                if int(vat[4:6]) > 31:
-                    return False
-            if (int(vat[0:2]) + int(vat[2:4]) + int(vat[4:6]) + int(vat[6:8]) +
-                    int(vat[8:10])) % 11 != 0:
-                return False
-            if int(vat[0:10]) % 11 != 0:
-                return False
-        return True
-
-    def check_vat_de(self, vat):
-        '''
-        Check Germany VAT number.
-        '''
-        if len(vat) != 9:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0:7]) <= 0:
-            return False
-        sum = 0
-        for i in range(8):
-            sum = (2 * ((int(vat[i]) + sum + 9) % 10 + 1)) % 11
-        check = 11 - sum
-        if check == 10:
-            check = 0
-        if int(vat[8]) != check:
-            return False
-        return True
-
-    def check_vat_dk(self, vat):
-        '''
-        Check Denmark VAT number.
-        '''
-        if len(vat) != 8:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0]) <= 0:
-            return False
-        sum = 2 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
-                5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
-                2 * int(vat[6]) + int(vat[7])
-        if sum % 11 != 0:
-            return False
-        return True
-
-    def check_vat_ee(self, vat):
-        '''
-        Check Estonia VAT number.
-        '''
-        if len(vat) != 9:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        sum = 3 * int(vat[0]) + 7 * int(vat[1]) + 1 * int(vat[2]) + \
-                3 * int(vat[3]) + 7 * int(vat[4]) + 1 * int(vat[5]) + \
-                3 * int(vat[6]) + 7 * int(vat[7])
-        check = 10 - (sum % 10)
-        if check == 10:
-            check = 0
-        if check != int(vat[8]):
-            return False
-        return True
-
-    def check_vat_es(self, vat):
-        '''
-        Check Spain VAT number.
-        '''
-        if len(vat) != 9:
-            return False
-
-        conv = {
-            1: 'T',
-            2: 'R',
-            3: 'W',
-            4: 'A',
-            5: 'G',
-            6: 'M',
-            7: 'Y',
-            8: 'F',
-            9: 'P',
-            10: 'D',
-            11: 'X',
-            12: 'B',
-            13: 'N',
-            14: 'J',
-            15: 'Z',
-            16: 'S',
-            17: 'Q',
-            18: 'V',
-            19: 'H',
-            20: 'L',
-            21: 'C',
-            22: 'K',
-            23: 'E',
-        }
-        #Legal persons with profit aim
-        if vat[0] in ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'U', 'V'):
-            try:
-                int(vat[1:8])
-            except:
-                return False
-            sum = mult_add(2, int(vat[1])) + int(vat[2]) + \
-                    mult_add(2, int(vat[3])) + int(vat[4]) + \
-                    mult_add(2, int(vat[5])) + int(vat[6]) + \
-                    mult_add(2, int(vat[7]))
-            check = 10 - (sum % 10)
-            if check == 10:
-                check = 0
-            return True
-        #Legal persons with non-profit aim
-        elif vat[0] in ('N', 'P', 'Q', 'R', 'S', 'W'):
-            try:
-                int(vat[1:8])
-            except:
-                return False
-            sum = mult_add(2, int(vat[1])) + int(vat[2]) + \
-                    mult_add(2, int(vat[3])) + int(vat[4]) + \
-                    mult_add(2, int(vat[5])) + int(vat[6]) + \
-                    mult_add(2, int(vat[7]))
-            check = 10 - (sum % 10)
-            check = chr(check + 64)
-            if check != vat[8]:
-                return False
-            return True
-        #Foreign natural persons, under age 14 or non-residents
-        elif vat[0] in ('K', 'L', 'M', 'X', 'Y', 'Z'):
-            if vat[0] == 'Y':
-                check_value = '1' + vat[1:8]
-            elif vat[0] == 'Z':
-                check_value = '2' + vat[1:8]
-            else:
-                check_value = vat[1:8]
-
-            try:
-                int(check_value)
-            except:
-                return False
-            check = 1 + (int(check_value) % 23)
-
-            check = conv[check]
-            if check != vat[8]:
-                return False
-            return True
-        #Spanish natural persons
-        else:
-            try:
-                int(vat[:8])
-            except:
-                return False
-            check = 1 + (int(vat[:8]) % 23)
-
-            check = conv[check]
-            if check != vat[8]:
-                return False
-            return True
-
-    def check_vat_fi(self, vat):
-        '''
-        Check Finland VAT number.
-        '''
-        if len(vat) != 8:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        sum = 7 * int(vat[0]) + 9 * int(vat[1]) + 10 * int(vat[2]) + \
-                5 * int(vat[3]) + 8 * int(vat[4]) + 4 * int(vat[5]) + \
-                2 * int(vat[6])
-        check = 11 - (sum % 11)
-        if check == 11:
-            check = 0
-        if check == 10:
-            return False
-        if check != int(vat[7]):
-            return False
-        return True
-
-    def check_vat_fr(self, vat):
-        '''
-        Check France VAT number.
-        '''
-        if len(vat) != 11:
-            return False
-
-        try:
-            int(vat[2:11])
-        except:
-            return False
-
-        system = None
-        try:
-            int(vat[0:2])
-            system = 'old'
-        except:
-            system = 'new'
-
-        if system == 'old':
-            check = ((int(vat[2:11]) * 100) + 12) % 97
-            if check != int(vat[0:2]):
-                return False
-            return True
-        else:
-            conv = ['0', '1', '2', '3', '4', '5', '6', '7',
-                '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-                'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T',
-                'U', 'V', 'W', 'X', 'Y', 'Z']
-            if vat[0] not in conv \
-                    or vat[1] not in conv:
-                return False
-            c1 = conv.index(vat[0])
-            c2 = conv.index(vat[1])
-
-            if c1 < 10:
-                sum = c1 * 24 + c2 - 10
-            else:
-                sum = c1 * 34 + c2 - 100
-
-            x = sum % 11
-            sum = (int(sum) / 11) + 1
-            y = (int(vat[2:11]) + sum) % 11
-            if x != y:
-                return False
-            return True
-
-    def check_vat_gb(self, vat):
-        '''
-        Check United Kingdom VAT number.
-        '''
-
-        if len(vat) == 5:
-            try:
-                int(vat[2:5])
-            except:
-                return False
-
-            if vat[0:2] == 'GD':
-                if int(vat[2:5]) >= 500:
-                    return False
-                return True
-            if vat[0:2] == 'HA':
-                if int(vat[2:5]) < 500:
-                    return False
-                return True
-            return False
-        elif len(vat) in (9, 10):
-            try:
-                int(vat)
-            except:
-                return False
-
-            if int(vat[0:7]) < 1:
-                return False
-            if int(vat[0:7]) > 19999 and int(vat[0:7]) < 1000000:
-                return False
-            if int(vat[7:9]) > 97:
-                return False
-            if len(vat) == 10 and int(vat[9]) != 3:
-                return False
-
-            sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
-                    5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
-                    2 * int(vat[6]) + 10 * int(vat[7]) + int(vat[8])
-            if int(vat[0:3]) > 100:
-                if sum % 97 not in (0, 55, 42):
-                    return False
-            else:
-                if sum % 97 != 0:
-                    return False
-            return True
-        elif len(vat) in (12, 13):
-            try:
-                int(vat)
-            except:
-                return False
-
-            if int(vat[0:3]) not in (0, 1):
-                return False
-
-            if int(vat[3:10]) < 1:
-                return False
-            if int(vat[3:10]) > 19999 and int(vat[3:10]) < 1000000:
-                return False
-            if int(vat[10:12]) > 97:
-                return False
-            if len(vat) == 13 and int(vat[12]) != 3:
-                return False
-
-            sum = 8 * int(vat[3]) + 7 * int(vat[4]) + 6 * int(vat[5]) + \
-                    5 * int(vat[6]) + 4 * int(vat[7]) + 3 * int(vat[8]) + \
-                    2 * int(vat[9]) + 10 * int(vat[10]) + int(vat[11])
-            if sum % 97 != 0:
-                return False
-            return True
-        return False
-
-    def check_vat_gr(self, vat):
-        '''
-        Check Greece VAT number.
-        '''
-        try:
-            int(vat)
-        except:
-            return False
-        if len(vat) == 8:
-            sum = 128 * int(vat[0]) + 64 * int(vat[1]) + 32 * int(vat[2]) + \
-                    16 * int(vat[3]) + 8 * int(vat[4]) + 4 * int(vat[5]) + \
-                    2 * int(vat[6])
-            check = sum % 11
-            if check == 10:
-                check = 0
-            if check != int(vat[7]):
-                return False
-            return True
-        elif len(vat) == 9:
-            sum = 256 * int(vat[0]) + 128 * int(vat[1]) + 64 * int(vat[2]) + \
-                    32 * int(vat[3]) + 16 * int(vat[4]) + 8 * int(vat[5]) + \
-                    4 * int(vat[6]) + 2 * int(vat[7])
-            check = sum % 11
-            if check == 10:
-                check = 0
-            if check != int(vat[8]):
-                return False
-            return True
-        return False
-
-    def check_vat_el(self, vat):
-        return self.check_vat_gr(vat)
-
-    def check_vat_hu(self, vat):
-        '''
-        Check Hungary VAT number.
-        '''
-        if len(vat) != 8:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0]) <= 0:
-            return False
-        sum = 9 * int(vat[0]) + 7 * int(vat[1]) + 3 * int(vat[2]) + \
-                1 * int(vat[3]) + 9 * int(vat[4]) + 7 * int(vat[5]) + \
-                3 * int(vat[6])
-        check = 10 - (sum % 10)
-        if check == 10:
-            check = 0
-        if check != int(vat[7]):
-            return False
-        return True
-
-    def check_vat_ie(self, vat):
-        '''
-        Check Ireland VAT number.
-        '''
-        if len(vat) != 8:
-            return False
-        if (ord(vat[1]) >= 65 and ord(vat[1]) <= 90) \
-                or vat[1] in ('+', '*'):
-            try:
-                int(vat[0])
-                int(vat[2:7])
-            except:
-                return False
-
-            if int(vat[0]) <= 6:
-                return False
-
-            sum = 7 * int(vat[2]) + 6 * int(vat[3]) + 5 * int(vat[4]) + \
-                    4 * int(vat[5]) + 3 * int(vat[6]) + 2 * int(vat[0])
-            check = sum % 23
-            if check == 0:
-                check = 'W'
-            else:
-                check = chr(check + 64)
-            if check != vat[7]:
-                return False
-            return True
-        else:
-            try:
-                int(vat[0:7])
-            except:
-                return False
-
-            sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
-                    5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
-                    2 * int(vat[6])
-            check = sum % 23
-            if check == 0:
-                check = 'W'
-            else:
-                check = chr(check + 64)
-            if check != vat[7]:
-                return False
-            return True
-
-    def check_vat_it(self, vat):
-        '''
-        Check Italy VAT number.
-        '''
-        if len(vat) != 11:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0:7]) <= 0:
-            return False
-        if int(vat[7:10]) <= 0:
-            return False
-        if int(vat[7:10]) > 100 and int(vat[7:10]) < 120:
-            return False
-
-        sum = int(vat[0]) + mult_add(2, int(vat[1])) + int(vat[2]) + \
-                mult_add(2, int(vat[3])) + int(vat[4]) + \
-                mult_add(2, int(vat[5])) + int(vat[6]) + \
-                mult_add(2, int(vat[7])) + int(vat[8]) + \
-                mult_add(2, int(vat[9]))
-        check = 10 - (sum % 10)
-        if check == 10:
-            check = 0
-        if check != int(vat[10]):
-            return False
-        return True
-
-    def check_vat_lt(self, vat):
-        '''
-        Check Lithuania VAT number.
-        '''
-        try:
-            int(vat)
-        except:
-            return False
-
-        if len(vat) == 9:
-            if int(vat[7]) != 1:
-                return False
-            sum = 1 * int(vat[0]) + 2 * int(vat[1]) + 3 * int(vat[2]) + \
-                    4 * int(vat[3]) + 5 * int(vat[4]) + 6 * int(vat[5]) + \
-                    7 * int(vat[6]) + 8 * int(vat[7])
-            if sum % 11 == 10:
-                sum = 3 * int(vat[0]) + 4 * int(vat[1]) + 5 * int(vat[2]) + \
-                        6 * int(vat[3]) + 7 * int(vat[4]) + 8 * int(vat[5]) + \
-                        9 * int(vat[6]) + 1 * int(vat[7])
-            check = sum % 11
-            if check == 10:
-                check = 0
-            if check != int(vat[8]):
-                return False
-            return True
-        elif len(vat) == 12:
-            if int(vat[10]) != 1:
-                return False
-            sum = 1 * int(vat[0]) + 2 * int(vat[1]) + 3 * int(vat[2]) + \
-                    4 * int(vat[3]) + 5 * int(vat[4]) + 6 * int(vat[5]) + \
-                    7 * int(vat[6]) + 8 * int(vat[7]) + 9 * int(vat[8]) + \
-                    1 * int(vat[9]) + 2 * int(vat[10])
-            if sum % 11 == 10:
-                sum = 3 * int(vat[0]) + 4 * int(vat[1]) + 5 * int(vat[2]) + \
-                        6 * int(vat[3]) + 7 * int(vat[4]) + 8 * int(vat[5]) + \
-                        9 * int(vat[6]) + 1 * int(vat[7]) + 2 * int(vat[8]) + \
-                        3 * int(vat[9]) + 4 * int(vat[10])
-            check = sum % 11
-            if check == 10:
-                check = 0
-            if check != int(vat[11]):
-                return False
-            return True
-        return False
-
-    def check_vat_lu(self, vat):
-        '''
-        Check Luxembourg VAT number.
-        '''
-        if len(vat) != 8:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0:6]) <= 0:
-            return False
-        check = int(vat[0:6]) % 89
-        if check != int(vat[6:8]):
-            return False
-        return True
-
-    def check_vat_lv(self, vat):
-        '''
-        Check Latvia VAT number.
-        '''
-        if len(vat) != 11:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0]) >= 4:
-            sum = 9 * int(vat[0]) + 1 * int(vat[1]) + 4 * int(vat[2]) + \
-                    8 * int(vat[3]) + 3 * int(vat[4]) + 10 * int(vat[5]) + \
-                    2 * int(vat[6]) + 5 * int(vat[7]) + 7 * int(vat[8]) + \
-                    6 * int(vat[9])
-            if sum % 11 == 4 and int(vat[0]) == 9:
-                sum = sum - 45
-            if sum % 11 == 4:
-                check = 4 - (sum % 11)
-            elif sum % 11 > 4:
-                check = 14 - (sum % 11)
-            elif sum % 11 < 4:
-                check = 3 - (sum % 11)
-            if check != int(vat[10]):
-                return False
-            return True
-        else:
-            if int(vat[2:4]) == 2 and int(vat[4:6]) % 4 > 0:
-                if int(vat[0:2]) < 1 or int(vat[0:2]) > 28:
-                    return False
-            if int(vat[2:4]) == 2 and int(vat[4:6]) % 4 == 0:
-                if int(vat[0:2]) < 1 or int(vat[0:2]) > 29:
-                    return False
-            if int(vat[2:4]) in (4, 6, 9, 11):
-                if int(vat[0:2]) < 1 or int(vat[0:2]) > 30:
-                    return False
-            if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12):
-                if int(vat[0:2]) < 1 or int(vat[0:2]) > 31:
-                    return False
-            if int(vat[2:4]) < 1 or int(vat[2:4]) > 12:
-                return False
-            return True
-
-    def check_vat_mt(self, vat):
-        '''
-        Check Malta VAT number.
-        '''
-        if len(vat) != 8:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-
-        if int(vat[0:6]) < 100000:
-            return False
-
-        sum = 3 * int(vat[0]) + 4 * int(vat[1]) + 6 * int(vat[2]) + \
-                7 * int(vat[3]) + 8 * int(vat[4]) + 9 * int(vat[5])
-        check = 37 - (sum % 37)
-        if check != int(vat[6:8]):
-            return False
-        return True
-
-    def check_vat_nl(self, vat):
-        '''
-        Check Netherlands VAT number.
-        '''
-        if len(vat) != 12:
-            return False
-        try:
-            int(vat[0:9])
-            int(vat[10:12])
-        except:
-            return False
-        if int(vat[0:8]) <= 0:
-            return False
-        if vat[9] != 'B':
-            return False
-
-        sum = 9 * int(vat[0]) + 8 * int(vat[1]) + 7 * int(vat[2]) + \
-                6 * int(vat[3]) + 5 * int(vat[4]) + 4 * int(vat[5]) + \
-                3 * int(vat[6]) + 2 * int(vat[7])
-
-        check = sum % 11
-        if check == 10:
-            return False
-        if check != int(vat[8]):
-            return False
-        return True
-
-    def check_vat_pl(self, vat):
-        '''
-        Check Poland VAT number.
-        '''
-        if len(vat) != 10:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-
-        sum = 6 * int(vat[0]) + 5 * int(vat[1]) + 7 * int(vat[2]) + \
-                2 * int(vat[3]) + 3 * int(vat[4]) + 4 * int(vat[5]) + \
-                5 * int(vat[6]) + 6 * int(vat[7]) + 7 * int(vat[8])
-        check = sum % 11
-        if check == 10:
-            return False
-        if check != int(vat[9]):
-            return False
-        return True
-
-    def check_vat_pt(self, vat):
-        '''
-        Check Portugal VAT number.
-        '''
-        if len(vat) != 9:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-
-        if int(vat[0]) <= 0:
-            return False
-
-        sum = 9 * int(vat[0]) + 8 * int(vat[1]) + 7 * int(vat[2]) + \
-                6 * int(vat[3]) + 5 * int(vat[4]) + 4 * int(vat[5]) + \
-                3 * int(vat[6]) + 2 * int(vat[7])
-        check = 11 - (sum % 11)
-        if check == 10 or check == 11:
-            check = 0
-        return True
-
-    def check_vat_ro(self, vat):
-        '''
-        Check Romania VAT number.
-        '''
-        try:
-            int(vat)
-        except:
-            return False
-
-        if len(vat) >= 2 and len(vat) <= 10:
-            vat = (10 - len(vat)) * '0' + vat
-            sum = 7 * int(vat[0]) + 5 * int(vat[1]) + 3 * int(vat[2]) + \
-                    2 * int(vat[3]) + 1 * int(vat[4]) + 7 * int(vat[5]) + \
-                    5 * int(vat[6]) + 3 * int(vat[7]) + 2 * int(vat[8])
-            check = (sum * 10) % 11
-            if check == 10:
-                check = 0
-            if check != int(vat[9]):
-                return False
-            return True
-        elif len(vat) == 13:
-            if int(vat[0]) not in (1, 2, 3, 4, 6):
-                return False
-            if int(vat[3:5]) < 1 or int(vat[3:5]) > 12:
-                return False
-            if int(vat[3:5]) == 2 and int(vat[1:3]) % 4 > 0:
-                if int(vat[5:7]) < 1 or int(vat[5:7]) > 28:
-                    return False
-            if int(vat[3:5]) == 2 and int(vat[1:3]) % 4 == 0:
-                if int(vat[5:7]) < 1 or int(vat[5:7]) > 29:
-                    return False
-            if int(vat[3:5]) in (4, 6, 9, 11):
-                if int(vat[5:7]) < 1 or int(vat[5:7]) > 30:
-                    return False
-            if int(vat[3:5]) in (1, 3, 5, 7, 8, 10, 12):
-                if int(vat[5:7]) < 1 or int(vat[5:7]) > 31:
-                    return False
-
-            sum = 2 * int(vat[0]) + 7 * int(vat[1]) + 9 * int(vat[2]) + \
-                    1 * int(vat[3]) + 4 * int(vat[4]) + 6 * int(vat[5]) + \
-                    3 * int(vat[6]) + 5 * int(vat[7]) + 8 * int(vat[8]) + \
-                    2 * int(vat[9]) + 7 * int(vat[10]) + 9 * int(vat[11])
-            check = sum % 11
-            if check == 10:
-                check = 1
-            if check != int(vat[12]):
-                return False
-            return True
-        return False
-
-    def check_vat_se(self, vat):
-        '''
-        Check Sweden VAT number.
-        '''
-        if len(vat) != 12:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-
-        if int(vat[9:11]) < 0:
-            return False
-
-        sum = mult_add(2, int(vat[0])) + int(vat[1]) + \
-                mult_add(2, int(vat[2])) + int(vat[3]) + \
-                mult_add(2, int(vat[4])) + int(vat[5]) + \
-                mult_add(2, int(vat[6])) + int(vat[7]) + \
-                mult_add(2, int(vat[8]))
-        check = 10 - (sum % 10)
-        if check == 10:
-            check = 0
-        if check != int(vat[9]):
-            return False
-        return True
-
-    def check_vat_si(self, vat):
-        '''
-        Check Slovenia VAT number.
-        '''
-        if len(vat) != 8:
-            return False
-        try:
-            int(vat)
-        except:
-            return False
-        if int(vat[0:7]) <= 999999:
-            return False
-
-        sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
-                5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
-                2 * int(vat[6])
-        check = 11 - (sum % 11)
-        if check == 10:
-            check = 0
-        if check == 11:
-            check = 1
-        if check != int(vat[7]):
-            return False
-        return True
-
-    def check_vat_sk(self, vat):
-        '''
-        Check Slovakia VAT number.
-        '''
-        try:
-            int(vat)
-        except:
-            return False
-        if len(vat) not in(9, 10):
-            return False
-
-        if int(vat[0:2]) in (0, 10, 20) and len(vat) == 10:
-            return True
-
-        if len(vat) == 10:
-            if int(vat[0:2]) < 54 or int(vat[0:2]) > 99:
-                return False
-
-        if len(vat) == 9:
-            if int(vat[0:2]) > 53 :
-                return False
-
-        if int(vat[2:4]) < 1:
-            return False
-        if int(vat[2:4]) > 12 and int(vat[2:4]) < 51:
-            return False
-        if int(vat[2:4]) > 62:
-            return False
-        if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 > 0:
-            if int(vat[4:6]) < 1 or int(vat[4:6]) > 28:
-                return False
-        if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 == 0:
-            if int(vat[4:6]) < 1 or int(vat[4:6]) > 29:
-                return False
-        if int(vat[2:4]) in (4, 6, 9, 11, 54, 56, 59, 61):
-            if int(vat[4:6]) < 1 or int(vat[4:6]) > 30:
-                return False
-        if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12,
-                51, 53, 55, 57, 58, 60, 62):
-            if int(vat[4:6]) < 1 or int(vat[4:6]) > 31:
-                return False
-        return True
 
+    # Mexican VAT verification, contributed by <moylop260@hotmail.com>
+    # and Panos Christeas <p_christ@hol.gr>
     __check_vat_mx_re = re.compile(r"(?P<primeras>[A-Za-z\xd1\xf1&]{3,4})" \
                                     r"[ \-_]?" \
                                     r"(?P<ano>[0-9]{2})(?P<mes>[01][0-9])(?P<dia>[0-3][0-9])" \
                                     r"[ \-_]?" \
                                     r"(?P<code>[A-Za-z0-9&\xd1\xf1]{3})$")
-    
     def check_vat_mx(self, vat):
         ''' Mexican VAT verification
-        
+
         Verificar RFC México
         '''
         # we convert to 8-bit encoding, to help the regex parse only bytes
@@ -1101,10 +133,36 @@ class res_partner(osv.osv):
             datetime.date(ano, int(m.group('mes')), int(m.group('dia')))
         except ValueError:
             return False
-        
+
         #Valid format and valid date
         return True
-        
+
+
+    # Norway VAT validation, contributed by Rolv Råen (adEgo) <rora@adego.no>
+    def check_vat_no(self, vat):
+        '''
+        Check Norway VAT number.See http://www.brreg.no/english/coordination/number.html
+        '''
+        if len(vat) != 9:
+            return False
+        try:
+            int(vat)
+        except ValueError:
+            return False
+
+        sum = (3 * int(vat[0])) + (2 * int(vat[1])) + \
+            (7 * int(vat[2])) + (6 * int(vat[3])) + \
+            (5 * int(vat[4])) + (4 * int(vat[5])) + \
+            (3 * int(vat[6])) + (2 * int(vat[7]))
+
+        check = 11 -(sum % 11)
+        if check == 11:
+            check = 0
+        if check == 10:
+            # 10 is not a valid check digit for an organization number
+            return False
+        return check == int(vat[8])
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index 6e00fc61ae0..69a1870ea72 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data>
+    <data>
 
-    <record id="view_partner_form" model="ir.ui.view">
-      <field name="name">res.partner.vat.inherit</field>
-      <field name="model">res.partner</field>
-      <field name="inherit_id" ref="account.view_partner_property_form"/>
-      <field name="arch" type="xml">
-        <field name="property_account_payable" position="after">
-            <group colspan="2" col="6">
-              <field name="vat" on_change="vat_change(vat)" colspan="4" />
-              <field groups="base.group_extended" name="vat_subjected" colspan="1"/>
-            </group>
-        </field>
-      </field>
-    </record>
+        <record id="view_partner_form" model="ir.ui.view">
+            <field name="name">res.partner.vat.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+            <field name="property_account_payable" position="after">
+                <group colspan="2" col="6">
+                    <field name="vat" on_change="vat_change(vat)" colspan="4" />
+                    <field name="vat_subjected" colspan="1" groups="base.group_extended" />
+                </group>
+            </field>
+            </field>
+        </record>
 
-  </data>
+    </data>
 </openerp>
 
diff --git a/addons/base_vat/i18n/ar.po b/addons/base_vat/i18n/ar.po
index 92b3d2590ea..70f1d072811 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/bg.po b/addons/base_vat/i18n/bg.po
index 763d5539de3..ff5f1143308 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/bs.po b/addons/base_vat/i18n/bs.po
index c89756f31af..09d4ad8c760 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po
index 8e9d4792d8c..be8568b3ad2 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/cs.po b/addons/base_vat/i18n/cs.po
index a40df315d04..0405944bb17 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: 2011-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 407255e15be..4941d1a3065 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.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:14+0000\n"
-"PO-Revision-Date: 2009-11-17 08:50+0000\n"
-"Last-Translator: SmartWi <kurt@smartwi.net>\n"
+"PO-Revision-Date: 2011-11-08 10:58+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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -24,6 +24,8 @@ msgid ""
 "The Vat does not seems to be correct. You should have entered something like "
 "this %s"
 msgstr ""
+"Momsen ser ikke ud til at være korrekt. Der skulle være indtastet noget "
+"svarende til dette %s"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
@@ -38,22 +40,31 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Aktiverer CVR-nr. (momsnr.) for kontakten. Checker gyldigheden af CVR-"
+"nr. (momsnr.)\n"
+"\n"
+"    Dette modul bruger metoder beskrevet på http://sima-pc.com/nif.php for "
+"at\n"
+"    checke gyldigheden af CVR-nr. (momsnr.) tilknyttet kontakter i EU-"
+"landene.\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
-msgstr ""
+msgstr "Moms grundlag - Til at checke CVR-nr. (momsnr.)  gyldighed"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fejl! Man kan ikke oprette rekursuve associerede medlemmer."
 
 #. 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 ""
+msgstr "CVR-nr. (momsnr.) er ugyldigt. Det skal starte med landekode."
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -61,16 +72,18 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Afkryds dette felt, hvis kontakten er momsregistreret. Det bruges til "
+"momsbestemmelser."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "Moms bestemmelser"
+msgstr "Momsbestemmelser"
 
 #~ msgid "VAT"
 #~ msgstr "Moms"
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 332a5d4d1eb..f6b87c4125d 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -100,18 +100,3 @@ msgstr "Umsatzsteuermeldung"
 
 #~ msgid "VAT"
 #~ msgstr "UID"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/base_vat/i18n/el.po b/addons/base_vat/i18n/el.po
index 82297841311..f6e876eee56 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -93,18 +93,3 @@ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "Το μέγεθος του πεδίου δε μπορεί ποτέ να είναι μικρότερο από 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Το όνομα του στοιχείου πρέπει να είναι μοναδικό !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Το πιστοποιητικό ταυτότητας του στοιχείου πρέπει να είναι μοναδικό !"
diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po
index 233d1d7e163..d01131f748b 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/en_GB.po b/addons/base_vat/i18n/en_GB.po
new file mode 100644
index 00000000000..63b1b6f42ab
--- /dev/null
+++ b/addons/base_vat/i18n/en_GB.po
@@ -0,0 +1,86 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 17:34+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: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:87
+#, python-format
+msgid ""
+"The Vat does not seems to be correct. You should have entered something like "
+"this %s"
+msgstr ""
+"The VAT does appear to be incorrect. You should have entered something like "
+"this %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"
+"    "
+msgstr ""
+"\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"
+"    "
+
+#. module: base_vat
+#: model:ir.module.module,shortdesc:base_vat.module_meta_information
+msgid "Base VAT - To check VAT number validity"
+msgstr "Base VAT - To check VAT number validity"
+
+#. module: base_vat
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Error ! You can not create recursive associated members."
+
+#. 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 "The VAT is invalid, It should begin with the country code"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+"Check this box if the partner is subject to VAT. It will be used for the VAT "
+"legal statement."
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "VAT Legal Statement"
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index 386057f2927..69b566d4724 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -96,18 +96,3 @@ msgstr "Sujeto a IVA"
 
 #~ msgid "VAT"
 #~ msgstr "IVA"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/base_vat/i18n/es_AR.po b/addons/base_vat/i18n/es_AR.po
index 6bec79f733f..d4cda2ea4d9 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/es_EC.po b/addons/base_vat/i18n/es_EC.po
index 4316d6d86e7..f11dadffdda 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/es_MX.po b/addons/base_vat/i18n/es_MX.po
new file mode 100644
index 00000000000..57d269be72d
--- /dev/null
+++ b/addons/base_vat/i18n/es_MX.po
@@ -0,0 +1,98 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_vat
+#
+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"
+"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_vat
+#: code:addons/base_vat/base_vat.py:87
+#, 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"
+
+#. 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"
+"    "
+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."
+
+#. 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"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+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"
+
+#. 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"
diff --git a/addons/base_vat/i18n/es_PY.po b/addons/base_vat/i18n/es_PY.po
index c650e0dbe02..c29c9739a2a 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/es_VE.po b/addons/base_vat/i18n/es_VE.po
new file mode 100644
index 00000000000..57d269be72d
--- /dev/null
+++ b/addons/base_vat/i18n/es_VE.po
@@ -0,0 +1,98 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_vat
+#
+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"
+"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_vat
+#: code:addons/base_vat/base_vat.py:87
+#, 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"
+
+#. 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"
+"    "
+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."
+
+#. 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"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+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"
+
+#. 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"
diff --git a/addons/base_vat/i18n/et.po b/addons/base_vat/i18n/et.po
index 2aaea91b1af..7fdf76cefd0 100644
--- a/addons/base_vat/i18n/et.po
+++ b/addons/base_vat/i18n/et.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:14+0000\n"
-"PO-Revision-Date: 2010-08-03 03:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-10 18:08+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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -64,7 +64,7 @@ msgstr ""
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po
index 086d496599f..348add6012c 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/fi.po b/addons/base_vat/i18n/fi.po
index 642cbaaa1ea..c85c661a1dd 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -23,7 +23,7 @@ msgstr ""
 msgid ""
 "The Vat does not seems to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "Alv ei näytä olevan oikein. Sinun olisi tullut syöttää esim. %s"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
@@ -38,22 +38,29 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Aseta partnerin ALV numero. Tarkista ALV numeron oikeellisuus.\n"
+"\n"
+"    Tämä moduuli seuraa toimintatapaa joka onmääritelty http://sima-"
+"pc.com/nif.php\n"
+"    EU:n alueen alv numeroiden tarkistamiseksi\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
-msgstr ""
+msgstr "Perus ALV - ALV numeron tarkistamiseksi"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. 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 ""
+msgstr "ALV (VAT) numero on virheellinen, sen tulisi alkaa maakoodilla"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -61,11 +68,13 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Valitse tämä jos kumppani on alv velvollinen. Tätä käytetään ALV laillisissa "
+"lausekkeissa"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Kumppani"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 6f4bf9b2eb6..741e57b2938 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-12 12:29+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -94,14 +94,5 @@ msgstr "Déclaration de TVA"
 #~ "Active le numéro de TVA sur la fiche partenaire. Vérifie la validité du "
 #~ "numéro de TVA."
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
-#~ "spécial !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML incorrect pour l'architecture de la vue !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/base_vat/i18n/gl.po b/addons/base_vat/i18n/gl.po
index fb7f64d74fb..61e5b64bc74 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index 25cbd416175..d9c4bb205ec 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -22,7 +22,7 @@ msgstr ""
 msgid ""
 "The Vat does not seems to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "OIB je neispravan. Primjer pravilnog OIB-a je %s"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
@@ -41,7 +41,7 @@ msgstr ""
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
-msgstr ""
+msgstr "OIB - provjera valjanosti OIB-a"
 
 #. module: base_vat
 #: constraint:res.partner:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index d942af30ca0..111226c00d1 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-02 18:32+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index 909cb5003d3..1137a6ab603 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index de3d5e62d16..2c400307cca 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -93,18 +93,3 @@ msgstr "Soggetto a dichiarazione IVA"
 
 #~ msgid "VAT"
 #~ msgstr "Partita IVA"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominbiare per \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po
index e704cea6a5d..454f325ec6a 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/lt.po b/addons/base_vat/i18n/lt.po
index 27d1780a423..a071bf733a5 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/lv.po b/addons/base_vat/i18n/lv.po
index b65c83bd5f3..3af64d681c9 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/mn.po b/addons/base_vat/i18n/mn.po
index 40b1c3782c1..2e6495ed2c4 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -83,18 +83,3 @@ 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 "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index 3acb5ded821..d1d0ba98eac 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index fdd944594d1..9e659f11cce 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -92,17 +92,3 @@ msgstr "BTW-plichtig"
 #~ msgstr ""
 #~ "Activeer het BTW-nummer voor de relatie. Controleer of het BTW-nummer geldig "
 #~ "is."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De Object naam moet beginnen met x_ en mag geen speciaal teken bevatten !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index 8e4e2429e74..9e473e6d915 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/oc.po b/addons/base_vat/i18n/oc.po
index fbe9d65b75c..1dcfb8c53a6 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/pl.po b/addons/base_vat/i18n/pl.po
index fb9c3f46382..5850c5b73e3 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -86,18 +86,3 @@ msgstr "Notka prawna o NIP i VAT"
 #~ msgid ""
 #~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
 #~ msgstr "Włącz numer NIP dla partnera. Sprawdź poprawność numeru NIP."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index a800d28301b..619a4fcff1f 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -92,18 +92,3 @@ msgstr "Declaração Legal do IVA"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 0ed5072af41..fc74e27a381 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -92,18 +92,3 @@ msgstr "VAT Legal Statement"
 
 #~ msgid "VAT"
 #~ msgstr "VAT (imposto europeu)"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index 9c0ea0e0c80..5ac119e7425 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-21 19:12+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -94,18 +94,3 @@ msgstr "Declaraţie de TVA"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index 0fd4f8b6669..b3e791c3c2c 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -92,18 +92,3 @@ msgstr "Заявление НДС"
 #~ msgstr ""
 #~ "Разрешить использование кода налога для партнера. Проверьте правильность "
 #~ "кода налога."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/base_vat/i18n/sk.po b/addons/base_vat/i18n/sk.po
index c0c70f83c50..614b74b99b7 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/sl.po b/addons/base_vat/i18n/sl.po
index 1d1d7321c1e..49c48761696 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -22,7 +22,7 @@ msgstr ""
 msgid ""
 "The Vat does not seems to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "DDV ni pravilen. Vnesti morate podobno kot je to%s"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
@@ -37,22 +37,30 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Omoogčite DDV številko za vaše stranke. Preverite veljavnost DDV "
+"številk.\n"
+"\n"
+"    Ta modul upošteva metodo opisano na http://sima-pc.com/nif.php za\n"
+"    preverjanje veljavnosti VAT številk dodeljenih strankam iz evropskih "
+"držav.\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
-msgstr ""
+msgstr "Osnovni DDV - za preverjanje veljavnosti DDV številk"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Napaka! Ni mogoče rekurzivno kreirati pridruženih članov"
 
 #. module: 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 ""
+msgstr "DDV številka je napačna. Začeti se mora s kodo države"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -60,16 +68,18 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Označite to polje, če je stranka predmet DDV-ja. Uporabljal se bo za izkaz "
+"DDV-ja."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Stranka"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "Proavno obvestilo za DDV"
+msgstr "Izkaz DDV-ja"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
diff --git a/addons/base_vat/i18n/sq.po b/addons/base_vat/i18n/sq.po
index cc4a52b0999..bb42bd3b4c7 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: 2011-07-07 04:41+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index e7148acf27e..c790e66f13c 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -84,8 +84,3 @@ msgstr "PDV zakonska izjava"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/base_vat/i18n/sr@latin.po b/addons/base_vat/i18n/sr@latin.po
index 97ac9bb70bb..51f84fc4dc4 100644
--- a/addons/base_vat/i18n/sr@latin.po
+++ b/addons/base_vat/i18n/sr@latin.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:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:36+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-10-06 13:45+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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -23,7 +23,7 @@ msgstr ""
 msgid ""
 "The Vat does not seems to be correct. You should have entered something like "
 "this %s"
-msgstr "PDV izgleda da nije korektan. Trebas upisati nesto kao %s"
+msgstr "PDV izgleda da nije korektan. Trebalo je uneti nešto kao %s"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
@@ -38,22 +38,28 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Omogući PDV brojeve za partnera. Proverite validnost tog PDV broja.\n"
+"\n"
+"    Ovaj modul prati metode opisane na http://sima-pc.com/nif.php  za\n"
+"    proveru validnosti PDV broja pripisane partnerima u evropskim zemljama.\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
-msgstr "Osnovni PDV - Za Proveru validnosti PDV cifre"
+msgstr "Osnovni PDV - Za Proveru validnosti PDV broja"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Greška ! Ne možete da pravite rekurzivne povezane članove."
 
 #. 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 "PDV je neispravan, trebalo bi da zapocne sa kodom zemlje"
+msgstr "PDV je neispravan, trebalo bi da počinje kodom zemlje"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -61,7 +67,7 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
-"Cekiraj ovu kucicu ukoliko je PDV naslovljen na partnera. On ce koristiti "
+"Označi ovu kućicu ukoliko je PDV naslovljen na partnera. Biće korišćen za "
 "zakonsku PDV izjavu."
 
 #. module: base_vat
@@ -77,11 +83,6 @@ msgstr "PDV zakonska izjava"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #~ msgid "VAT"
 #~ msgstr "PDV"
 
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index d872d2c3f5b..423ee97597a 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -83,11 +83,6 @@ msgstr "Företag"
 msgid "VAT Legal Statement"
 msgstr "Momsbestämmelser"
 
-#~ 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 "Ogiltig XML för Vy-arkitektur!"
 
@@ -98,12 +93,3 @@ msgstr "Momsbestämmelser"
 
 #~ msgid "VAT"
 #~ msgstr "VAT"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
diff --git a/addons/base_vat/i18n/th.po b/addons/base_vat/i18n/th.po
index 867069d43c8..3e4c916114b 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/tlh.po b/addons/base_vat/i18n/tlh.po
index 543727d8fc0..c3d7e4c7899 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 98f879c928e..5850b301a6f 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/uk.po b/addons/base_vat/i18n/uk.po
index 989f132579d..66cf499893e 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/vi.po b/addons/base_vat/i18n/vi.po
index 19cae05fe2b..71fe235e347 100644
--- a/addons/base_vat/i18n/vi.po
+++ b/addons/base_vat/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-05-25 14:58+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index 8698225c5ef..5b6bcc50ca3 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -22,7 +22,7 @@ msgstr ""
 msgid ""
 "The Vat does not seems to be correct. You should have entered something like "
 "this %s"
-msgstr "增值税似乎不正确。您的输入应类似于此：%s"
+msgstr "增值税似乎不正确。您的输入应类似于：%s"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
@@ -37,16 +37,22 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    为业务伙伴启用增值税号码。检查增值税号码的有效性\n"
+"\n"
+"    此模块按照http://sima-pc.com/nif.php 上所列的方法 \n"
+"    检查分配给欧洲国家的合作伙伴增值税号码的有效性。\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
-msgstr "基本增值税模块——检查增值税号有效性"
+msgstr "基础增值税 - 检查增值税数字的有效性"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建循环的关联成员。"
+msgstr "错误！您不能创建递归的商会会员。"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:88
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index 6b002e8b717..f225327dfad 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index f4de253c4f5..6cb0e3ecce7 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Dashboard Creator',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "normal",
     'description': """
 Lets the user create a custom dashboard.
@@ -34,10 +34,18 @@ The user can also publish notes.
     """,
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],
-    'demo_xml': ['board_demo.xml'],
+    'update_xml': [
+        'security/ir.model.access.csv',
+        'wizard/board_menu_create_view.xml', 
+        'board_view.xml',
+        'board_data_admin.xml',
+        'board_data_home.xml',
+    ],
+    'demo_xml': [
+        'board_demo.xml'
+    ],
     'installable': True,
-    'active': False,
+    'active': True,
     'certificate': '0076912305725',
     'images': ['images/1_dashboard_definition.jpeg','images/2_publish_note.jpeg','images/3_admin_dashboard.jpeg',],
 }
diff --git a/addons/board/board.py b/addons/board/board.py
index d215981953a..dd3d75e1dca 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -56,14 +56,14 @@ class board_board(osv.osv):
         #End Loop
         arch = """<?xml version="1.0"?>
             <form string="My Board">
-            <hpaned>
-                <child1>
+            <board style="1-1">
+                <column>
                     %s
-                </child1>
-                <child2>
+                </column>
+                <column>
                     %s
-                </child2>
-            </hpaned>
+                </column>
+            </board>
             </form>""" % ('\n'.join(left), '\n'.join(right))
 
         return arch
@@ -134,10 +134,10 @@ class board_board(osv.osv):
         res['arch'] = self._arch_preprocessing(cr, user, res['arch'], context=context)
         res['toolbar'] = {'print': [], 'action': [], 'relate': []}
         return res
-    
-    
-    def _arch_preprocessing(self, cr, user, arch, context=None): 
-        from lxml import etree                               
+
+
+    def _arch_preprocessing(self, cr, user, arch, context=None):
+        from lxml import etree
         def remove_unauthorized_children(node):
             for child in node.iterchildren():
                 if child.tag=='action' and child.get('invisible'):
@@ -145,17 +145,17 @@ class board_board(osv.osv):
                 else:
                     child=remove_unauthorized_children(child)
             return node
-        
+
         def encode(s):
             if isinstance(s, unicode):
                 return s.encode('utf8')
             return s
-            
-        archnode = etree.fromstring(encode(arch))        
+
+        archnode = etree.fromstring(encode(arch))
         return etree.tostring(remove_unauthorized_children(archnode),pretty_print=True)
-        
-        
-    
+
+
+
 
     _columns = {
         'name': fields.char('Dashboard', size=64, required=True),
@@ -168,9 +168,6 @@ class board_board(osv.osv):
         'name':lambda *args:  'Dashboard'
     }
 
-board_board()
-
-
 class board_line(osv.osv):
     """
     Board Line
@@ -193,8 +190,6 @@ class board_line(osv.osv):
         'position': lambda *args: 'left'
     }
 
-board_line()
-
 class res_log_report(osv.osv):
     """ Log Report """
     _name = "res.log.report"
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_data_admin.xml
similarity index 84%
rename from addons/board/board_administration_view.xml
rename to addons/board/board_data_admin.xml
index 210a7dfd83f..c43b2cd9602 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_data_admin.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
+<data>
         <!-- User Connection -->
         <record model="ir.ui.view" id="view_user_connection_tree">
             <field name="name">user.connection.tree</field>
@@ -37,7 +36,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Log Analysis">
-                    <group col="20" colspan="8">
+                    <group>
                     <filter icon="terp-go-year" string="  Year  "
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Log created in current year"/>
@@ -47,7 +46,6 @@
                         help="Log created in current month"/>
                     <filter icon="terp-go-month"
                          string="    Month-1    "
-                         separator="1"
                          domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Log created in last month"/>
                    </group>
@@ -138,17 +136,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Administration Dashboard">
-                    <hpaned position="100">
-                        <child1>
-                            <action width="510" name="%(action_user_connection_tree)d" string="User Connections" />
-                            <action width="510" name="%(action_latest_activities_tree)d" string="Latest Activities" />
-                        </child1>
-                        <child2>
-                          <action name="%(board_config_overview)d" string="Configuration Overview"/>
-                            <action  name="%(board_monthly_res_log_report_action)d" string="Monthly Activity per Document"/>
-                            <action  name="%(board_weekly_res_log_report_action)d" string="Weekly Global Activity" />
-                        </child2>
-                    </hpaned>
+                    <board style="2-1">
+                        <column>
+                            <action name="%(board_config_overview)d" string="Configuration Overview"/>
+                            <action name="%(action_latest_activities_tree)d" string="Latest Activities" />
+                        </column>
+                        <column>
+                            <action name="%(action_user_connection_tree)d" string="Users" />
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
@@ -161,23 +157,13 @@
             <field name="view_id" ref="board_administration_form"/>
         </record>
 
-        <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
-            groups="base.group_extended"/>
-        <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
-        <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
-        <menuitem icon="terp-administration" id="base.menu_administration" name="Administration" sequence="50" action="open_board_administration_form"/>
+        <!-- bind adminitration dashboard to the root administration -->
+        <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/>
 
-    </data>
+        <!-- add a menu item in adminitration/reporting/dashboards -->
+        <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
+        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting" sequence="0"/>
+        <menuitem id="base.menu_dashboard_admin" action="open_board_administration_form" parent="base.menu_dashboard" icon="terp-graph"/>
+
+</data>
 </openerp>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
new file mode 100644
index 00000000000..8a0f150d5be
--- /dev/null
+++ b/addons/board/board_data_home.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <!-- neat client actions that can be used in dashboards to display res_widgets -->
+    <record id="action_application_tiles" model="ir.actions.client">
+      <field name="name">Applications Tiles</field>
+      <field name="tag">board.home.applications</field>
+    </record>
+    <record id="action_res_widgets_tweets" model="ir.actions.client">
+      <field name="name">Tweets Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.openerp_favorites_twitter_widget')}"/>
+    </record>
+    <record id="action_res_widgets_events" model="ir.actions.client">
+      <field name="name">Events Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.events_widget')}"/>
+    </record>
+    <record id="action_res_widgets_facebook" model="ir.actions.client">
+      <field name="name">Facebook Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.facebook_widget')}"/>
+    </record>
+    <record id="action_res_widgets_note" model="ir.actions.client">
+      <field name="name">Note Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.note_widget')}"/>
+    </record>
+    <record id="action_res_widgets_map" model="ir.actions.client">
+      <field name="name">Google Maps Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.google_maps_widget')}"/>
+    </record>
+    <record id="action_res_widgets_currency_converter" model="ir.actions.client">
+      <field name="name">Currency Converter Widget</field>
+      <field name="tag">board.home.widgets</field>
+      <field name="params" eval="{'widget_id': ref('base.currency_converter_widget')}"/>
+    </record>
+
+    <!-- default homepage definition -->
+    <record id="board_homepage_view" model="ir.ui.view">
+      <field name="name">Homepage Board</field>
+      <field name="model">board.board</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="">
+          <board style="1">
+            <column>
+              <action name="%(action_application_tiles)d"/>
+            </column>
+          </board>
+        </form>
+      </field>
+    </record>
+    <record id="board_homepage_action" model="ir.actions.act_window">
+      <field name="name">Home Page</field>
+      <field name="res_model">board.board</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="view_id" ref="board_homepage_view"/>
+    </record>
+
+    <!-- set the default homepage of admin -->
+    <record id="base.user_admin" model="res.users">
+        <field name="action_id" ref="board_homepage_action"/>
+    </record>
+
+    <!-- and of every new users -->
+    <function eval="('default',False,'action_id', [('res.users', False)], board_homepage_action, True, False, False, False, True)" id="ir_default_home" model="ir.values" name="set"/>
+
+</data>
+</openerp>
diff --git a/addons/board/board_demo.xml b/addons/board/board_demo.xml
index 2f704e640bc..384e29abdf2 100644
--- a/addons/board/board_demo.xml
+++ b/addons/board/board_demo.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
+<data>
+    <!-- set the default homepage of demo -->
+    <record id="base.user_demo" model="res.users">
+        <field name="action_id" ref="board_homepage_action"/>
+    </record>
+</data>
+</openerp>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index decfc825b95..36d75002476 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,120 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
+    <!-- Board Search View  -->
+    <record id="view_board_search" model="ir.ui.view">
+        <field name="name">board.board.search</field>
+        <field name="model">board.board</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Dashboard">
+                <field name="name"/>
+                <field name="line_ids"/>
+            </search>
+        </field>
+    </record>
 
-      <record id="action_application_tiles" model="ir.actions.client">
-        <field name="name">Applications Tiles</field>
-        <field name="tag">board.home.applications</field>
-      </record>
-      <record id="action_res_widgets_display" model="ir.actions.client">
-        <field name="name">Homepage Widgets</field>
-        <field name="tag">board.home.widgets</field>
-      </record>
-      <record id="view_board_homepage" model="ir.ui.view">
-        <field name="name">Homepage Board</field>
+    <!-- Board Tree View  -->
+    <record id="view_board_tree" model="ir.ui.view">
+        <field name="name">board.board.tree</field>
+        <field name="model">board.board</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Dashboard">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- Board Form View  -->
+    <record id="view_board_form" model="ir.ui.view">
+        <field name="name">board.board.form</field>
         <field name="model">board.board</field>
         <field name="type">form</field>
+        <field eval="1" name="priority"/>
         <field name="arch" type="xml">
-          <form string="">
-            <hpaned>
-              <child1>
-                <action name="%(action_application_tiles)d"/>
-              </child1>
-              <child2>
-                <action name="%(action_res_widgets_display)d"/>
-              </child2>
-            </hpaned>
-          </form>
-        </field>
-      </record>
-      <record id="homepage_action" model="ir.actions.act_window">
-        <field name="name">Home Page</field>
-        <field name="res_model">board.board</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="view_board_homepage"/>
-      </record>
-
-<!--  Board Tree View  -->
-
-        <record id="view_board_tree" model="ir.ui.view">
-            <field name="name">board.board.tree</field>
-            <field name="model">board.board</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Dashboard">
+            <form string="Dashboard">
+                <group col="6" colspan="4">
                     <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-<!-- Dashboard Definition Form View  -->
-
-        <record id="view_board_form" model="ir.ui.view">
-            <field name="name">board.board.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field eval="1" name="priority"/>
-            <field name="arch" type="xml">
-                <form string="Dashboard">
-                    <group col="6" colspan="4">
+                    <field name="view_id"/>
+                    <button colspan="2" name="%(action_board_menu_create)d" string="Create Menu" type="action" icon="gtk-justify-fill" />
+                </group>
+                <field colspan="4" name="line_ids" nolabel="1">
+                    <tree string="Dashboard View">
                         <field name="name"/>
-                        <field name="view_id"/>
-                        <button colspan="2"
-                            name="%(action_board_menu_create)d"
-                            string="Create Menu" type="action"
-                            icon="gtk-justify-fill" />
-                    </group>
-                    <field colspan="4" name="line_ids" nolabel="1">
-                        <tree string="Dashboard View">
-                            <field name="name"/>
-                            <field name="sequence"/>
-                            <field name="action_id"/>
-                            <field name="position"/>
-                        </tree>
-                        <form string="Dashboard View">
-                            <field name="name"/>
-                            <field name="sequence"/>
-                            <field name="width"/>
-                            <field name="height"/>
-                            <field name="action_id"
-                                domain="[('view_type','!=','tree')]" />
-                            <field name="position"/>
-                        </form>
-                    </field>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_board_search" model="ir.ui.view">
-            <field name="name">board.board.search</field>
-            <field name="model">board.board</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Dashboard">
-                    <field name="name"/>
-                    <field name="line_ids"/>
-                </search>
-            </field>
-        </record>
+                        <field name="sequence"/>
+                        <field name="action_id"/>
+                        <field name="position"/>
+                    </tree>
+                    <form string="Dashboard View">
+                        <field name="name"/>
+                        <field name="sequence"/>
+                        <field name="width"/>
+                        <field name="height"/>
+                        <field name="action_id" domain="[('view_type','!=','tree')]" />
+                        <field name="position"/>
+                    </form>
+                </field>
+            </form>
+        </field>
+    </record>
 
     <!-- Action for DashBoard Definition form -->
+    <record id="action_view_board_list_form" model="ir.actions.act_window">
+        <field name="name">Dashboard Definition</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_board_search"/>
+    </record>
 
-        <record id="action_view_board_list_form" model="ir.actions.act_window">
-            <field name="name">Dashboard Definition</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_board_search"/>
-        </record>
+    <menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
 
-        <menuitem
-            action="action_view_board_list_form"
-            id="menu_view_board_form" parent="base.reporting_menu" groups="base.group_no_one" sequence="1"/>
-
-        <act_window context="{'view': active_id}" id="dashboard_open"
-            multi="True" name="Open Dashboard" res_model="board.board"
-            src_model="board.board" />
-
-    </data>
+</data>
 </openerp>
diff --git a/addons/board/i18n/ar.po b/addons/board/i18n/ar.po
index 356b0d4eb4e..515e65a8eba 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/bg.po b/addons/board/i18n/bg.po
index d5c6313ddeb..61abca8b9d1 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/br.po b/addons/board/i18n/br.po
index 78439adf04d..88f915fe5e5 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/bs.po b/addons/board/i18n/bs.po
index ae9879f82a8..a37a70ae4da 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ca.po b/addons/board/i18n/ca.po
index 61bb3cd6bc7..76393ece4b4 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/cs.po b/addons/board/i18n/cs.po
index 87aa80f6e7a..86c9e9544e4 100644
--- a/addons/board/i18n/cs.po
+++ b/addons/board/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* board
+# * board
 #
 msgid ""
 msgstr ""
@@ -13,160 +13,161 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Rok  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Vytvořit nabídku"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note.type,name:0
 #: model:ir.model,name:board.model_board_note_type
 msgid "Note Type"
-msgstr ""
+msgstr "Typ poznámky"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr "Tvůrce"
+msgstr "Autor"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "Hlavní modul nástěnky"
 
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Poslední spojení"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:45
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Chyba uživatele!"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Správa nástěnky"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,note:0
 #: model:ir.model,name:board.model_board_note
 msgid "Note"
-msgstr ""
+msgstr "Poznámka"
 
 #. module: board
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Tabule"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Týdenní celkové činnosti"
 
 #. module: board
 #: field:board.board.line,name:0
 msgid "Title"
-msgstr ""
+msgstr "Titulek"
 
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# z položek"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Měsíc"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr ""
+msgstr "Otevřít nástěnku"
 
 #. module: board
 #: view:board.board:0
 #: 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 "Měsíční činnosti dle dokumentu"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Analýza záznamu"
 
 #. 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 "Definice nástěnky"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Spojení uživatele"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "DAtum vytvoření"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr "Publikovat poznámku"
+msgstr "Zveřejnit poznámku"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Informace nabídky"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
 #. module: board
 #: field:board.note,type:0
 msgid "Note type"
-msgstr ""
+msgstr "Typ poznámky"
 
 #. module: board
 #: field:board.board,line_ids:0
@@ -176,74 +177,74 @@ msgstr "Zobrazení akcí"
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Výkaz záznamu"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšířené filtry..."
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Den"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "Vytvořit nabídku pro nástěnku"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Řádek tabule"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Nadřazená nabídka"
 
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Měsíc-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr ""
+msgstr "Poznámky"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -251,11 +252,13 @@ msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
 msgstr ""
+"Dává pořadí posloupnosti                         , když zobrazuje řádky "
+"tabule."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
 #. module: board
 #: view:board.board:0
@@ -264,17 +267,17 @@ msgstr ""
 #: model:ir.ui.menu,name:board.admin_menu_dasboard
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Nástěnka"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr ""
+msgstr "Základní modul pro nástěnky."
 
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Akce"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -284,28 +287,28 @@ msgstr "Pozice"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Jméno nabídky"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Poslední aktivity"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr ""
+msgstr "Vlevo"
 
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "Zobrazení tabule"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -315,59 +318,59 @@ msgstr "Vpravo"
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "Šířka"
 
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Měsíc   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Posloupnost"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Září"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr "Vytvořit menu"
+msgstr "Vytvořit nabídku"
 
 #. module: board
 #: field:board.board.line,height:0
 msgid "Height"
-msgstr ""
+msgstr "Výška"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr ""
+msgstr "Vytvořit nabídku tabule"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: board
 #: view:board.menu.create:0
@@ -377,19 +380,22 @@ msgstr "Zrušit"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "Zobrazení nástěnky"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "Prosíme vložte zobrazení nástěnky !"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Předmět"
 
 #~ msgid "Configuration"
 #~ msgstr "Konfigurace"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index 1b6037b7795..9ddb38f9e20 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -419,20 +419,5 @@ msgstr "Thema"
 #~ msgid "board.board.line"
 #~ msgstr "board.board.line"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "NOte Type"
-#~ msgstr "Mitteilung Art"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index 3647f037e96..a88a2adfe73 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\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 55ad97eabe3..e4019978ccc 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -423,9 +423,3 @@ msgstr "Asunto"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "NOte Type"
-#~ msgstr "Tipo nota"
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index b3935bf0ea7..0d558ba1f7f 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_CL.po b/addons/board/i18n/es_CL.po
new file mode 100644
index 00000000000..3d6aca4897f
--- /dev/null
+++ b/addons/board/i18n/es_CL.po
@@ -0,0 +1,395 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-10-03 16:58+0000\n"
+"Last-Translator: David Acevedo Toledo <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: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "Crear menú"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr "Módulo principal de tableros"
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "Últimas conexiones"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr "¡Error de usuario!"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr "Tablero de Administración"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "Tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "Actividad global semanal"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "Nº de entradas"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr "Abrir tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "Actividad mensual por documento"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "Análisis de registro"
+
+#. 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 "Definición de tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "Conexiones de usuario"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha de Creación"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr "Publicar una nota"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Vistas de acciones"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "Informe de registro"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Dia"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr "Crear menú para tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr "Línea tablero"
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"tablero."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr "Módulo base para todos los tableros."
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Acción."
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Posición"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre del menú"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr "Últimas actividades"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Izquieda"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Vista de tablero"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Derecha"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Ancho"
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr "Crear Menú"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Alto"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr "Crear menú del tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Vista de tablero"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "¡Por favor inserte alguna vista de tablero!"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Asunto"
diff --git a/addons/board/i18n/es_EC.po b/addons/board/i18n/es_EC.po
index 0fabea1f484..9a75579d09b 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_MX.po b/addons/board/i18n/es_MX.po
new file mode 100644
index 00000000000..4fd421e2c91
--- /dev/null
+++ b/addons/board/i18n/es_MX.po
@@ -0,0 +1,425 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board
+#
+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-27 09: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-09-05 05:33+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "Crear menú"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr "Módulo principal de tableros"
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "Últimas conexiones"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr "¡Error de usuario!"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr "Tablero administración"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "Tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "Actividad global semanal"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "Nº de entradas"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr "Abrir tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "Actividad mensual por documento"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "Análisis de registros"
+
+#. 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 "Definición tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "Conexiones de usuario"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr "Publicar una nota"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Vistas de acciones"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "Informe registro"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr "Crear menú para tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr "Línea tablero"
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"tablero."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr "Módulo base para todos los tableros."
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Posición"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr "Últimas actividades"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Izquierda"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Vista tablero"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Derecha"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Ancho"
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Alto"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr "Crear menú del tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Vista tablero"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "¡Por favor inserte vista(s) de tablero!"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Asunto"
+
+#~ 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 "board.board"
+#~ msgstr "board.board"
+
+#~ msgid "board.note"
+#~ msgstr "board.nota"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "board.note.type"
+#~ msgstr "board.nota.tipo"
+
+#~ msgid "Dashboards"
+#~ msgstr "Tableros"
+
+#~ msgid "board.board.line"
+#~ msgstr "board.board.line"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/board/i18n/es_PY.po b/addons/board/i18n/es_PY.po
index e60524898e7..e0ac57c4568 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_VE.po b/addons/board/i18n/es_VE.po
new file mode 100644
index 00000000000..4fd421e2c91
--- /dev/null
+++ b/addons/board/i18n/es_VE.po
@@ -0,0 +1,425 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board
+#
+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-27 09: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-09-05 05:33+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "Crear menú"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr "Módulo principal de tableros"
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "Últimas conexiones"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr "¡Error de usuario!"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr "Tablero administración"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "Tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "Actividad global semanal"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "Nº de entradas"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr "Abrir tablero"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "Actividad mensual por documento"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "Análisis de registros"
+
+#. 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 "Definición tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "Conexiones de usuario"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr "Publicar una nota"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr "Tipo de nota"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Vistas de acciones"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "Informe registro"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr "Crear menú para tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr "Línea tablero"
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"tablero."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr "Módulo base para todos los tableros."
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Posición"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr "Últimas actividades"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Izquierda"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Vista tablero"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Derecha"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Ancho"
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Alto"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr "Crear menú del tablero"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Vista tablero"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "¡Por favor inserte vista(s) de tablero!"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Asunto"
+
+#~ 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 "board.board"
+#~ msgstr "board.board"
+
+#~ msgid "board.note"
+#~ msgstr "board.nota"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "board.note.type"
+#~ msgstr "board.nota.tipo"
+
+#~ msgid "Dashboards"
+#~ msgstr "Tableros"
+
+#~ msgid "board.board.line"
+#~ msgstr "board.board.line"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/board/i18n/et.po b/addons/board/i18n/et.po
index 6e9b9cedf26..21588fdc4c2 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
index db0ae35ed92..4128bef20f4 100644
--- a/addons/board/i18n/fi.po
+++ b/addons/board/i18n/fi.po
@@ -14,25 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Vuosi  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Luo valikko"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note.type,name:0
 #: model:ir.model,name:board.model_board_note_type
 msgid "Note Type"
-msgstr ""
+msgstr "Muistiinpanon tyyppi"
 
 #. module: board
 #: view:board.note:0
@@ -43,25 +43,25 @@ msgstr "Laatija"
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "Työpöydän päämoduuli"
 
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Viimeisimmät yhteydet"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:45
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Käyttäjän virhe!"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Hallintatyöpöytä"
 
 #. module: board
 #: view:board.note:0
@@ -74,19 +74,19 @@ msgstr "Huomautus"
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Työtila"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Viikottainen yhteinen aktiviteetti"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -96,63 +96,63 @@ msgstr "Otsikko"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "tapahtumien määrä"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr ""
+msgstr "Avaa työpöytä"
 
 #. module: board
 #: view:board.board:0
 #: 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 "Kuukaisittainen aktiviteetti dokumenteittain"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Login analyysi"
 
 #. 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 "Työpöydän määrittely"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Käyttäjän yhteydet"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr ""
+msgstr "Julkaise muistiinpano"
 
 #. module: board
 #: view:board.menu.create:0
@@ -162,22 +162,22 @@ msgstr "Valikon tiedot"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: board
 #: field:board.note,type:0
 msgid "Note type"
-msgstr ""
+msgstr "Muistiinpanon tyyppi"
 
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr ""
+msgstr "Toimintonäkymät"
 
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Lokiraportti"
 
 #. module: board
 #: view:board.note:0
@@ -188,38 +188,38 @@ msgstr "Päiväys"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "Luo valikko työpöydälle"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Työpöydän rivi"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -229,12 +229,12 @@ msgstr "Päävalikko"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Kuukausi-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: board
 #: view:board.note:0
@@ -244,19 +244,19 @@ msgstr "Huomautukset"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: board
 #: help:board.board.line,sequence:0
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr ""
+msgstr "Antaa järjestyksen kun näytetään luettelo työpöydän riveistä."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: board
 #: view:board.board:0
@@ -265,17 +265,17 @@ msgstr ""
 #: model:ir.ui.menu,name:board.admin_menu_dasboard
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Työpöytä"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr ""
+msgstr "Perusmoduuli kaikille työpöydille"
 
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -285,7 +285,7 @@ msgstr "Sijainti"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Malli"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -296,7 +296,7 @@ msgstr "Valikon nimi"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Viimeisimmät toiminnot"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -306,7 +306,7 @@ msgstr "Vasen"
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "Työtilan näkymä"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -321,22 +321,22 @@ msgstr "Leveys"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Kuukausi   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: board
 #: view:board.board:0
@@ -352,23 +352,23 @@ msgstr "Korkeus"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr ""
+msgstr "Luo työtilan valikko"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Objekti"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: board
 #: view:board.menu.create:0
@@ -378,13 +378,13 @@ msgstr "Peruuta"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "Työtilan näkymä"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "Ole hyvä ja lisää työtilan näkymät !"
 
 #. module: board
 #: view:board.note:0
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index c3d14c28377..e9f8a3bbabf 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -417,9 +417,6 @@ msgstr "Sujet"
 #~ msgid "board.board"
 #~ msgstr "board.board"
 
-#~ msgid "NOte Type"
-#~ msgstr "Type de note"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/board/i18n/gl.po b/addons/board/i18n/gl.po
index 788866ba57d..c840a5215f1 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index e5b47db9fe3..2c7dc9b837c 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po
index d2282765cc0..4d3ca3b08c8 100644
--- a/addons/board/i18n/hu.po
+++ b/addons/board/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-02 18:41+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index ff63519d5ab..0882798c679 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index 23636b79ba9..8344ba034be 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -422,18 +422,3 @@ msgstr "Oggetto"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "NOte Type"
-#~ msgstr "Tipo di nota"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/board/i18n/ko.po b/addons/board/i18n/ko.po
index aeee5ea04c9..000c71bb78d 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ln.po b/addons/board/i18n/ln.po
index 0ff83bd56f6..80b44a6d15a 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index dc8a4fff380..f16fc562850 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/lv.po b/addons/board/i18n/lv.po
index 5d92600ced9..27052c2d31e 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/mn.po b/addons/board/i18n/mn.po
index 0d6188f25a8..d8de47c1c01 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -420,11 +420,5 @@ msgstr "Сэдэв"
 #~ msgid "Dashboards"
 #~ msgstr "Хянах самбар"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid "NOte Type"
-#~ msgstr "Тэмдэглэлийн төрөл"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index 62b8716a263..8e7ef0c8021 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -419,18 +419,3 @@ msgstr "Onderwerp"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de actie-definitie."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "NOte Type"
-#~ msgstr "Soort opmerking"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 009ee0a685e..5ebee049426 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pl.po b/addons/board/i18n/pl.po
index b3559a6bb12..11f43fe2e94 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index 874bf45729a..18c6e346133 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7011d5e1e2b..800681ca8cc 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -419,18 +419,3 @@ msgstr "Assunto"
 #~ "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 conter caracteres especiais!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "NOte Type"
-#~ msgstr "Tipo de Nota"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index 557a8601693..c179feb9fe9 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index 236702e399a..05e70911726 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -73,7 +73,7 @@ msgstr "Примечание"
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr "Объединять по..."
+msgstr "Группировать по ..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -176,7 +176,7 @@ msgstr "Виды действия"
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Журнал отчета"
 
 #. module: board
 #: view:board.note:0
@@ -208,17 +208,17 @@ msgstr "Создать меню для панели аналитики"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Строки панели"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -228,12 +228,12 @@ msgstr "Родительское меню"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: board
 #: view:board.note:0
@@ -243,19 +243,19 @@ msgstr "Примечания"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: board
 #: help:board.board.line,sequence:0
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr ""
+msgstr "Определяет порядок следования строк списка"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: board
 #: view:board.board:0
@@ -274,7 +274,7 @@ msgstr "Главный модуль для всех панелей аналит
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -284,7 +284,7 @@ msgstr "Позиция"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Модель"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -295,7 +295,7 @@ msgstr "Название меню"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Последнее мероприятие"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -320,7 +320,7 @@ msgstr "Ширина"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Месяц   "
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -330,12 +330,12 @@ msgstr "Последовательность"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: board
 #: view:board.board:0
@@ -356,18 +356,18 @@ msgstr "Создать меню панели"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Объект"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: board
 #: view:board.menu.create:0
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index e5536060fb6..6fbfc6ecdeb 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sl.po b/addons/board/i18n/sl.po
index 22e46023136..7a68037ded8 100644
--- a/addons/board/i18n/sl.po
+++ b/addons/board/i18n/sl.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Leto  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Ustvari meni"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note.type,name:0
 #: model:ir.model,name:board.model_board_note_type
 msgid "Note Type"
-msgstr ""
+msgstr "Tip opombe"
 
 #. module: board
 #: view:board.note:0
@@ -42,12 +42,12 @@ msgstr "Avtor"
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "Osnovni modul nadzorne plošče"
 
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Zadnje povezave"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:45
@@ -60,7 +60,7 @@ msgstr "Napaka uporabnika!"
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Nadzorna plošča administracije"
 
 #. module: board
 #: view:board.note:0
@@ -73,19 +73,19 @@ msgstr "Opomba"
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Združi po ..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Plošča"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Tedenske globalne aktivnosti"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -95,63 +95,63 @@ msgstr "Naslov"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# vnosov"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mesec"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr "Odpi pregledno plošča"
+msgstr "Odpri nadzorno ploščo"
 
 #. module: board
 #: view:board.board:0
 #: 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 "Mesečne aktivnosti na dokument"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Analiza dnevnika"
 
 #. 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 "Opredelitev nadzorne plošče"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "marec"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "avgust"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Povezave uporabnika"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Ustvarjeno dne"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr ""
+msgstr "Objavi opombo"
 
 #. module: board
 #: view:board.menu.create:0
@@ -161,22 +161,22 @@ msgstr "Informacije o meniju"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "junij"
 
 #. module: board
 #: field:board.note,type:0
 msgid "Note type"
-msgstr ""
+msgstr "Tip opombe"
 
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr ""
+msgstr "Pregled dejanj"
 
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Poročilo dnevnika"
 
 #. module: board
 #: view:board.note:0
@@ -187,38 +187,38 @@ msgstr "Datum"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "julij"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Razširjeni filtri..."
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "Ustvari meni za nadzorno ploščo"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "februar"
 
 #. 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 "Vrstica plošče"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -228,12 +228,12 @@ msgstr "Nadmenu"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mesec-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "januar"
 
 #. module: board
 #: view:board.note:0
@@ -243,19 +243,19 @@ msgstr "Opombe"
 #. 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 "Daje zaporedje ob prikazovanju seznama vrstic plošče."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: board
 #: view:board.board:0
@@ -264,17 +264,17 @@ msgstr ""
 #: model:ir.ui.menu,name:board.admin_menu_dasboard
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr "Pregledna plošča"
+msgstr "Nadzorna plošča"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr ""
+msgstr "Osnovni modul za vse nadzorne plošče"
 
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Dejanje"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -284,18 +284,18 @@ msgstr "Položaj"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr "Naziv menuja"
+msgstr "Ime Menija"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Zadnje aktivnosti"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -305,7 +305,7 @@ msgstr "Levo"
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "Pogled plošče"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -320,7 +320,7 @@ msgstr "Širina"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mesec   "
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -330,18 +330,18 @@ msgstr "Zaporedje"
 #. 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 "december"
 
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr "Ustvari menu"
+msgstr "Ustvari Meni"
 
 #. module: board
 #: field:board.board.line,height:0
@@ -351,23 +351,23 @@ msgstr "Višina"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr ""
+msgstr "Ustvari meni plošče"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Predmet"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Leto"
 
 #. module: board
 #: view:board.menu.create:0
@@ -377,13 +377,13 @@ msgstr "Prekliči"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "Pogled nadzorne plošče"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "Prosim vnesite poglede nadzorne plošče!"
 
 #. module: board
 #: view:board.note:0
diff --git a/addons/board/i18n/sq.po b/addons/board/i18n/sq.po
index 625a98afa4c..f0a9f7fa696 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sr.po b/addons/board/i18n/sr.po
index aa4751d02e4..3c589a079f2 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -420,9 +420,3 @@ msgstr "Tema"
 
 #~ msgid "Dashboards"
 #~ msgstr "Glavna Tabla"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "NOte Type"
-#~ msgstr "Tip Napomene"
diff --git a/addons/board/i18n/sr@latin.po b/addons/board/i18n/sr@latin.po
index a62cef86fef..ea784ec389f 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -395,17 +395,11 @@ msgstr "Tema"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#~ msgid "NOte Type"
-#~ msgstr "Tip Napomene"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index 7c1e663e23f..1ecfcf3ac95 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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/th.po b/addons/board/i18n/th.po
index 4ffc38ecdc0..eb1f0298975 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/tlh.po b/addons/board/i18n/tlh.po
index ae0a1932cd9..0609fe1d077 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 76ab056e70c..8ab7afab664 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: 2011-05-16 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -60,7 +60,7 @@ msgstr "Kullanıcı Hatası!"
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr "Yönetici Kontrol Paneli"
+msgstr "Yönetim Paneli"
 
 #. module: board
 #: view:board.note:0
@@ -95,7 +95,7 @@ msgstr "Unvan"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr "Giriş Sayısı"
+msgstr "Kayıt Sayısı"
 
 #. module: board
 #: view:res.log.report:0
@@ -113,12 +113,12 @@ msgstr "Kontrol Panelini Aç"
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr "Her Belge için Aylık Etkinlik"
+msgstr "Belge Başına aylık faaliyet"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr "Günlük Analizi"
+msgstr "Log Analizi"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -171,7 +171,7 @@ msgstr "Not tipi"
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr "Hareket Görünümleri"
+msgstr "Hareket Ekranları"
 
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
@@ -274,7 +274,7 @@ msgstr "Tüm Kontrol Panelleri için Temel Modül"
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr "Eylem"
+msgstr "Hareket"
 
 #. module: board
 #: field:board.board.line,position:0
diff --git a/addons/board/i18n/uk.po b/addons/board/i18n/uk.po
index b23f931b2ec..0456e3b006d 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/vi.po b/addons/board/i18n/vi.po
index de624c11309..9f32a572ff7 100644
--- a/addons/board/i18n/vi.po
+++ b/addons/board/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-05-25 15:06+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2c465458943..ae94a729502 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-04-11 14:24+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -78,7 +78,7 @@ msgstr "分组..."
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr "仪表盘"
+msgstr "控制台"
 
 #. module: board
 #: view:board.board:0
@@ -106,7 +106,7 @@ msgstr "月"
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr "打开仪表盘"
+msgstr "打开控制台"
 
 #. module: board
 #: view:board.board:0
@@ -124,17 +124,17 @@ msgstr "日志分析"
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr "仪表盘定义"
+msgstr "控制台定义"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: board
 #: view:board.board:0
@@ -161,7 +161,7 @@ msgstr "菜单信息"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: board
 #: field:board.note,type:0
@@ -187,38 +187,38 @@ msgstr "日期"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr "扩展过滤..."
+msgstr "增加筛选条件"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr "日"
+msgstr "天"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr "为仪表盘创建菜单"
+msgstr "为控制台创建菜单"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr "仪表板明细"
+msgstr "控制台明细"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -233,7 +233,7 @@ msgstr "    上月    "
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: board
 #: view:board.note:0
@@ -243,19 +243,19 @@ msgstr "备注"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: board
 #: help:board.board.line,sequence:0
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr "指定显示仪表板明细的顺序号"
+msgstr "指定显示控制台明细的序列"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: board
 #: view:board.board:0
@@ -264,12 +264,12 @@ msgstr "四月"
 #: model:ir.ui.menu,name:board.admin_menu_dasboard
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr "仪表盘"
+msgstr "控制台"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr "所有仪表盘的基础模块"
+msgstr "所有控制台的基础模块"
 
 #. module: board
 #: field:board.board.line,action_id:0
@@ -320,22 +320,22 @@ msgstr "宽度"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr "   月   "
+msgstr "   月份   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: board
 #: view:board.board:0
@@ -356,7 +356,7 @@ msgstr "创建控制台菜单"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: board
 #: field:res.log.report,res_model:0
@@ -377,13 +377,13 @@ msgstr "取消"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "仪表盘视图"
+msgstr "控制台视图"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr "请插入看板视图！"
+msgstr "请安装控制台视图！"
 
 #. module: board
 #: view:board.note:0
diff --git a/addons/board/i18n/zh_TW.po b/addons/board/i18n/zh_TW.po
index 5eb1b7f184e..d9de0bd95aa 100644
--- a/addons/board/i18n/zh_TW.po
+++ b/addons/board/i18n/zh_TW.po
@@ -13,181 +13,181 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年份  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "選單建立"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note.type,name:0
 #: model:ir.model,name:board.model_board_note_type
 msgid "Note Type"
-msgstr ""
+msgstr "告示類型"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "儀錶板主模組"
 
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "最新連線"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:45
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "使用者錯誤！"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "行政儀錶板"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,note:0
 #: model:ir.model,name:board.model_board_note
 msgid "Note"
-msgstr ""
+msgstr "告示"
 
 #. module: board
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分組根據..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "告示板"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "每週動態"
 
 #. module: board
 #: field:board.board.line,name:0
 msgid "Title"
-msgstr ""
+msgstr "標題"
 
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "項目數"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr ""
+msgstr "開啟儀錶板"
 
 #. module: board
 #: view:board.board:0
 #: 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 "每份文件每月動態"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "日誌分析"
 
 #. 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 "儀錶板定義"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "使用者連線"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr ""
+msgstr "張貼告示"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Menu Information"
-msgstr ""
+msgstr "選單資訊"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: board
 #: field:board.note,type:0
 msgid "Note type"
-msgstr ""
+msgstr "告示類型"
 
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr ""
+msgstr "動作檢視"
 
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "日誌報告"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: board
 #: view:res.log.report:0
@@ -198,22 +198,22 @@ msgstr ""
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "為儀錶板建立選單"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -223,27 +223,27 @@ msgstr ""
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "上級選單"
 
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    月份-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr ""
+msgstr "告示"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -255,7 +255,7 @@ msgstr ""
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: board
 #: view:board.board:0
@@ -264,17 +264,17 @@ msgstr ""
 #: model:ir.ui.menu,name:board.admin_menu_dasboard
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr ""
+msgstr "儀錶板"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr ""
+msgstr "所有儀錶板的基礎模組。"
 
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "動作"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -289,104 +289,104 @@ msgstr ""
 #. module: board
 #: field:board.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "選單名稱"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "最新動態"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr ""
+msgstr "左"
 
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "告示板檢視"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr ""
+msgstr "右"
 
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "寬"
 
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月份   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "次序"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "建立選單"
 
 #. module: board
 #: field:board.board.line,height:0
 msgid "Height"
-msgstr ""
+msgstr "高"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr ""
+msgstr "建立告示板選單"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "物件"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年份"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "儀錶板檢視"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "請插入儀錶板檢視！"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,name:0
 msgid "Subject"
-msgstr ""
+msgstr "主旨"
diff --git a/addons/board/security/board_security.xml b/addons/board/security/board_security.xml
deleted file mode 100644
index ee544e098cc..00000000000
--- a/addons/board/security/board_security.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index e16104a0acc..34bc2169016 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -1,7 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_board_board","board.board","model_board_board","base.group_user",1,1,1,1
-"access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
-"access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
-"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
-"access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0
-"access_res_log_report_erp_manager","res.log.report erp_manager","model_res_log_report",base.group_erp_manager,1,0,0,0
+"access_board_board all","board.board","model_board_board",,1,0,0,0
+"access_board_board_line all","board.board.line","model_board_board_line",,1,0,0,0
+"access_board_board system","board.board system","model_board_board",base.group_system,1,1,1,1
+"access_board_board_line system","board.board.line system","model_board_board_line",base.group_system,1,1,1,1
+"access_res_log_report all","res.log.report","model_res_log_report",,1,0,0,0
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index edf852e4d5e..53bee3d0e94 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -49,7 +49,7 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
 """, 
-    'category': 'Tools', 
+    'category': 'Hidden', 
     "author" : "OpenERP SA",
     'website': 'http://www.openerp.com',
     "init_xml" : ["caldav_data.xml"],
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 2517f88f789..0f0f5ddd762 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -25,3 +25,5 @@ urlparse.uses_netloc.append('caldav')
 urlparse.uses_netloc.append('caldavs')
 
 #EOF
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 5272d0fc1fd..71e9bdc2468 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -324,7 +324,6 @@ class node_calendar(nodes.node_class):
         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,
@@ -332,6 +331,7 @@ class node_calendar(nodes.node_class):
             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')
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 4e0c6218bf6..72e88a6c7b4 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -45,6 +45,7 @@
             <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">
@@ -158,7 +159,7 @@
                     <field name="user_id" widget="selection">
                         <filter icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)" string="MY"/>
                     </field>
-                    <field name="collection_id" required="1"/>
+                    <field name="collection_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index a70a31bc017..94d28e4ad37 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -121,10 +121,10 @@ def str2mailto(emailstr, multi=False):
     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)
+            #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):
@@ -189,6 +189,9 @@ def map_data(cr, uid, obj, context=None):
         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
@@ -299,7 +302,6 @@ class CalDAV(object):
         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],
@@ -552,7 +554,7 @@ class CalDAV(object):
             @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)
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 1258ba5bf18..1abbf573ef0 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -86,3 +86,5 @@ class calendar_collection(osv.osv):
         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/Path discovery.rst b/addons/caldav/doc/path_discovery.rst
similarity index 100%
rename from addons/caldav/doc/Path discovery.rst
rename to addons/caldav/doc/path_discovery.rst
diff --git a/addons/caldav/i18n/bg.po b/addons/caldav/i18n/bg.po
index a888c052e0d..d689664de19 100644
--- a/addons/caldav/i18n/bg.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Грешка!"
@@ -466,7 +466,7 @@ msgid "Calendar Collections"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -740,7 +740,7 @@ msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr ""
diff --git a/addons/caldav/i18n/ca.po b/addons/caldav/i18n/ca.po
index b5a51d6a63e..a6c2e984324 100644
--- a/addons/caldav/i18n/ca.po
+++ b/addons/caldav/i18n/ca.po
@@ -8,136 +8,136 @@ 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-04-15 16:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 20:39+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Value Mapping"
-msgstr ""
+msgstr "Relacions entre valors"
 
 #. module: caldav
 #: help:caldav.browse,url:0
 msgid "Url of the caldav server, use for synchronization"
-msgstr ""
+msgstr "URL del servidor CalDAV, utilitzat per a sincronització."
 
 #. module: caldav
 #: field:basic.calendar.alias,name:0
 msgid "Filename"
-msgstr ""
+msgstr "Fitxer"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_export
 msgid "Event Export"
-msgstr ""
+msgstr "Exporta esdeveniment"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Provide path for Remote Calendar"
-msgstr ""
+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 ""
+msgstr "Importa fitxer .ics"
 
 #. module: caldav
 #: view:calendar.event.export:0
 msgid "_Close"
-msgstr ""
+msgstr "_Tanca"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Attendee"
-msgstr ""
+msgstr "Assistent"
 
 #. module: caldav
 #: sql_constraint:basic.calendar.fields:0
 msgid "Can not map a field more than once"
-msgstr ""
+msgstr "No es pot relacionar un camp més d'una vegada"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 ""
+msgstr "Avís!"
 
 #. module: caldav
 #: field:basic.calendar.lines,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objecte"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Todo"
-msgstr ""
+msgstr "Pendents"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_user_preference
 msgid "User preference Form"
-msgstr ""
+msgstr "Formulari de preferències de l'usuari"
 
 #. module: caldav
 #: field:user.preference,service:0
 msgid "Services"
-msgstr ""
+msgstr "Serveis"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Expression as constant"
-msgstr ""
+msgstr "Expressió com a constant"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Evolution"
-msgstr ""
+msgstr "Evolució"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 msgid "Ok"
-msgstr ""
+msgstr "D'acord"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
+msgstr "Indiqueu una configuració correcta de \"%s\" en línies de calendari"
 
 #. module: caldav
 #: field:calendar.event.export,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nom fitxer"
 
 #. module: caldav
 #: field:caldav.browse,url:0
 msgid "Caldav Server"
-msgstr ""
+msgstr "Servidor CalDAV"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:59
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: caldav
 #: help:caldav.browse,caldav_doc_file:0
 msgid "download full caldav Documentation."
-msgstr ""
+msgstr "Descarregueu tota la documentació CalDAV."
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "iPhone"
-msgstr ""
+msgstr "iPhone"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:32
@@ -166,6 +166,31 @@ msgid ""
 "        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"
+"     "
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:147
@@ -199,58 +224,88 @@ msgid ""
 "\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"
 
 #. module: caldav
 #: selection:basic.calendar,type:0
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "TODO"
-msgstr ""
+msgstr "PENDENT"
 
 #. module: caldav
 #: view:calendar.event.export:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Exporta ICS"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "Utilitza el camp"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
-msgstr ""
+msgstr "No es pot crear la línia \"%s\" més d'una vegada"
 
 #. 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 ""
+msgstr "Línies de calendari"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_subscribe
 msgid "Event subscribe"
-msgstr ""
+msgstr "Subscriure esdeveniment"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Importa un ICS"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 #: view:user.preference:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_event
 msgid "basic.calendar.event"
-msgstr ""
+msgstr "base.calendari.esdeveniment"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -258,23 +313,23 @@ msgstr ""
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Event"
-msgstr ""
+msgstr "Esdeveniment"
 
 #. module: caldav
 #: field:document.directory,calendar_collection:0
 #: field:user.preference,collection:0
 msgid "Calendar Collection"
-msgstr ""
+msgstr "Col·lecció del calendari"
 
 #. module: caldav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Error! No podeu crear directoris recursius."
 
 #. module: caldav
 #: view:user.preference:0
 msgid "_Open"
-msgstr ""
+msgstr "_Obre"
 
 #. module: caldav
 #: field:basic.calendar,type:0
@@ -282,18 +337,18 @@ msgstr ""
 #: field:basic.calendar.fields,type_id:0
 #: field:basic.calendar.lines,name:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Desa en format .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Error !"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:128
@@ -322,16 +377,38 @@ msgid ""
 "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"
+"     "
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attributes
 msgid "Calendar attributes"
-msgstr ""
+msgstr "Atributs del calendari"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_caldav_browse
 msgid "Caldav Browse"
-msgstr ""
+msgstr "Exploració de CalDav"
 
 #. module: caldav
 #: model:ir.module.module,description:caldav.module_meta_information
@@ -359,51 +436,75 @@ msgid ""
 "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"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Android based device"
-msgstr ""
+msgstr "Dispositiu basat en Android"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Attributes Mapping"
-msgstr ""
+msgstr "Relacions entre atributs"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Directori"
 
 #. module: caldav
 #: field:calendar.event.subscribe,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Indica ruta del calendari remot"
 
 #. module: caldav
 #: view:caldav.browse:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Accepta"
 
 #. module: caldav
 #: field:basic.calendar.lines,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Domini"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subscriure"
 
 #. module: caldav
 #: field:basic.calendar,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Propietari"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -412,7 +513,7 @@ msgstr ""
 #: model:ir.ui.menu,name:caldav.menu_calendar
 #: field:user.preference,calendar:0
 msgid "Calendar"
-msgstr ""
+msgstr "Calendari"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:41
@@ -420,62 +521,63 @@ msgstr ""
 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 ""
+msgstr "Format de ics incorrecte, el fitxer no es pot importar"
 
 #. module: caldav
 #: selection:user.preference,service:0
 msgid "CalDAV"
-msgstr ""
+msgstr "CalDAV"
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
 msgid "OpenObject Field"
-msgstr ""
+msgstr "Camp d'OpenObject"
 
 #. module: caldav
 #: field:basic.calendar.alias,res_id:0
 msgid "Res. ID"
-msgstr ""
+msgstr "ID recurs"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Message..."
-msgstr ""
+msgstr "Missatge..."
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Other"
-msgstr ""
+msgstr "Altres"
 
 #. module: caldav
 #: view:basic.calendar:0
 #: field:basic.calendar,has_webcal:0
 msgid "WebCal"
-msgstr ""
+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 ""
+msgstr "Col·leccions de calendari"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
-msgstr ""
+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 ""
+msgstr "El directori, no pot ser el seu propi pare!"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -483,17 +585,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:caldav.action_caldav_form
 #: model:ir.ui.menu,name:caldav.menu_caldav_directories
 msgid "Calendars"
-msgstr ""
+msgstr "Calendaris"
 
 #. module: caldav
 #: field:basic.calendar,collection_id:0
 msgid "Collection"
-msgstr ""
+msgstr "Col·lecció"
 
 #. module: caldav
 #: field:basic.calendar,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Data d'escriptura"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:104
@@ -525,6 +627,31 @@ msgid ""
 "    \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"
+"    "
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:53
@@ -587,78 +714,137 @@ msgid ""
 "      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"
+"    "
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "El nom del directori ha de ser únic!"
 
 #. module: caldav
 #: view:user.preference:0
 msgid "User Preference"
-msgstr ""
+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 ""
+msgstr "Introduïu una URL correcta!"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_timezone
 msgid "basic.calendar.timezone"
-msgstr ""
+msgstr "base.calendari.timezone"
 
 #. module: caldav
 #: field:basic.calendar.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Expressió"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attendee
 msgid "basic.calendar.attendee"
-msgstr ""
+msgstr "base.calendari.assistència"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alias
 msgid "basic.calendar.alias"
-msgstr ""
+msgstr "base.calendari.àlies"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: field:calendar.event.import,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Selecciona fitxer ICS"
 
 #. module: caldav
 #: field:caldav.browse,caldav_doc_file:0
 msgid "Caldav Document"
-msgstr ""
+msgstr "Document CalDAV"
 
 #. module: caldav
 #: field:basic.calendar.lines,mapping_ids:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "Mapa de camps"
 
 #. module: caldav
 #: view:caldav.browse:0
 msgid "Browse caldav"
-msgstr ""
+msgstr "Mostra CalDAV"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar
 msgid "basic.calendar"
-msgstr ""
+msgstr "base.calendari"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Other Info"
-msgstr ""
+msgstr "Altra info."
 
 #. module: caldav
 #: field:user.preference,device:0
 msgid "Software/Devices"
-msgstr ""
+msgstr "Software/Dispositius"
 
 #. module: caldav
 #: help:basic.calendar,has_webcal:0
@@ -666,11 +852,13 @@ 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 ""
+msgstr "Funció"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -678,141 +866,144 @@ msgstr ""
 #: view:caldav.browse:0
 #: field:caldav.browse,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
 msgid "The calendar/line this mapping applies to"
-msgstr ""
+msgstr "El calendari/línia a la qual aquesta relació es refereix."
 
 #. module: caldav
 #: field:basic.calendar.fields,mapping:0
 msgid "Mapping"
-msgstr ""
+msgstr "Relacions"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:86
 #, python-format
 msgid "Import Sucessful"
-msgstr ""
+msgstr "Importació satisfactòria"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importa"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_import
 msgid "Event Import"
-msgstr ""
+msgstr "Importa esdeveniment"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "Interval en hores"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Subscribe to Remote Calendar"
-msgstr ""
+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 ""
+msgstr "Nom"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alarm
 msgid "basic.calendar.alarm"
-msgstr ""
+msgstr "base.calendari.alarma"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
-msgstr ""
+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 ""
+msgstr "Exporta fitxer .ics"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:41
 #, python-format
 msgid "vobject Import Error!"
-msgstr ""
+msgstr "Error d'importació vobject!"
 
 #. module: caldav
 #: field:calendar.event.export,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Desa fitxer ICS"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Sunbird/Thunderbird"
-msgstr ""
+msgstr "Sunbird/Thunderbird"
 
 #. module: caldav
 #: field:basic.calendar,calendar_order:0
 msgid "Order"
-msgstr ""
+msgstr "Ordre"
 
 #. module: caldav
 #: model:ir.module.module,shortdesc:caldav.module_meta_information
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "Comparteix calendari utilitzant CalDAV"
 
 #. module: caldav
 #: field:basic.calendar,calendar_color:0
 msgid "Color"
-msgstr ""
+msgstr "Color"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "MY"
-msgstr ""
+msgstr "EL MEU"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_fields
 msgid "Calendar fields"
-msgstr ""
+msgstr "Camps del calendari"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import Message"
-msgstr ""
+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 ""
+msgstr "Subscriure"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+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 ""
+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."
diff --git a/addons/caldav/i18n/de.po b/addons/caldav/i18n/de.po
index a49c054c863..854fb63e2d5 100644
--- a/addons/caldav/i18n/de.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -65,8 +65,8 @@ msgid "Can not map a field more than once"
 msgstr "Das Feld kann nur einmal zugewiesen werden."
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -109,7 +109,7 @@ msgid "Ok"
 msgstr "OK"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -270,7 +270,7 @@ msgid "Use the field"
 msgstr "Benutze dieses Feld"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr "Kann die Position \"%s\" nicht mehr als einmal erzeugen"
@@ -342,7 +342,7 @@ msgid "Save in .ics format"
 msgstr "Speichern in .ics Format"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Fehler !"
@@ -568,7 +568,7 @@ msgid "Calendar Collections"
 msgstr "Gemeinsame Kalender"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -945,7 +945,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Teilnehmer muss EMail Addresse haben"
@@ -1030,27 +1030,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
 #~ "beinhalten !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Modifided Date"
-#~ msgstr "Geändertes Datum"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
-
-#~ msgid "description"
-#~ msgstr "Beschreibung"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/caldav/i18n/el.po b/addons/caldav/i18n/el.po
index b262664c33c..d34c3f0d457 100644
--- a/addons/caldav/i18n/el.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "ΟΚ"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr "Χρησιμοποίησε το πεδίο"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr "Αποθήκευση σε .ics μορφή"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Σφάλμα!"
@@ -466,7 +466,7 @@ msgid "Calendar Collections"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -740,7 +740,7 @@ msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr ""
@@ -816,6 +816,3 @@ msgstr ""
 #: help:basic.calendar,calendar_order:0
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
-
-#~ msgid "description"
-#~ msgstr "περιγραφή"
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
index 503cdcf8648..b49114dee71 100644
--- a/addons/caldav/i18n/es.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ 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:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Aceptar"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: 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"
@@ -272,7 +272,7 @@ msgid "Use the field"
 msgstr "Usar el campo"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: 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"
@@ -344,7 +344,7 @@ msgid "Save in .ics format"
 msgstr "Guardar en formato .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -568,7 +568,7 @@ msgid "Calendar Collections"
 msgstr "Colecciones de calendario"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -931,7 +931,7 @@ msgid "basic.calendar.alarm"
 msgstr "base.calendario.alarma"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: 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"
@@ -1009,9 +1009,3 @@ 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 "description"
-#~ msgstr "descripción"
-
-#~ msgid "Modifided Date"
-#~ msgstr "Fecha de modificación"
diff --git a/addons/caldav/i18n/es_EC.po b/addons/caldav/i18n/es_EC.po
index 6b7edc6e3b0..11c3c60dc77 100644
--- a/addons/caldav/i18n/es_EC.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ 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:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: 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"
@@ -272,7 +272,7 @@ msgid "Use the field"
 msgstr "Usar el campo"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: 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"
@@ -344,7 +344,7 @@ msgid "Save in .ics format"
 msgstr "Guardar en formato .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -568,7 +568,7 @@ msgid "Calendar Collections"
 msgstr "Colecciones de calendario"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -931,7 +931,7 @@ msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: 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"
diff --git a/addons/caldav/i18n/es_MX.po b/addons/caldav/i18n/es_MX.po
new file mode 100644
index 00000000000..978f9450ce3
--- /dev/null
+++ b/addons/caldav/i18n/es_MX.po
@@ -0,0 +1,1011 @@
+# 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
index 91197cb13bb..24a9d9f3f69 100644
--- a/addons/caldav/i18n/es_PY.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ 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:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Aceptar"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: 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"
@@ -272,7 +272,7 @@ msgid "Use the field"
 msgstr "Usar el campo"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: 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"
@@ -344,7 +344,7 @@ msgid "Save in .ics format"
 msgstr "Guardar en formato .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -568,7 +568,7 @@ msgid "Calendar Collections"
 msgstr "Colecciones de calendario"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -931,7 +931,7 @@ msgid "basic.calendar.alarm"
 msgstr "base.calendario.alarma"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: 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"
diff --git a/addons/caldav/i18n/es_VE.po b/addons/caldav/i18n/es_VE.po
new file mode 100644
index 00000000000..978f9450ce3
--- /dev/null
+++ b/addons/caldav/i18n/es_VE.po
@@ -0,0 +1,1011 @@
+# 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/fi.po b/addons/caldav/i18n/fi.po
index 445d25ee8c1..b995bcf9b6f 100644
--- a/addons/caldav/i18n/fi.po
+++ b/addons/caldav/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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/fr.po b/addons/caldav/i18n/fr.po
index ccd7a8f538d..4d620f512fb 100644
--- a/addons/caldav/i18n/fr.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr "Un champ ne peut avoir plus d'une correspondance"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -276,7 +276,7 @@ msgid "Use the field"
 msgstr "Utiliser le champ"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr "Impossible de créer la ligne \"%s\" plus d'une fois"
@@ -348,7 +348,7 @@ msgid "Save in .ics format"
 msgstr "Sauvegarder au format .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -573,7 +573,7 @@ msgid "Calendar Collections"
 msgstr "Collections de calendrier"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -931,7 +931,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Le participant doit avoir un identifiant de courriel"
@@ -1009,9 +1009,3 @@ 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 "description"
-#~ msgstr "description"
-
-#~ msgid "Modifided Date"
-#~ msgstr "Date de modification"
diff --git a/addons/caldav/i18n/gl.po b/addons/caldav/i18n/gl.po
index ab2f403ebd3..6fe2f3d80b7 100644
--- a/addons/caldav/i18n/gl.po
+++ b/addons/caldav/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: 2011-05-13 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/hu.po b/addons/caldav/i18n/hu.po
index 098ffc8617b..4c059447b82 100644
--- a/addons/caldav/i18n/hu.po
+++ b/addons/caldav/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-17 13:28+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -63,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -107,7 +108,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -217,7 +218,7 @@ msgid "Use the field"
 msgstr "Használja a mezőt"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -289,7 +290,7 @@ msgid "Save in .ics format"
 msgstr "Mentse .ics formátumban"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Hiba !"
@@ -465,7 +466,7 @@ msgid "Calendar Collections"
 msgstr "Naptárgyűjtemények"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -739,7 +740,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr ""
diff --git a/addons/caldav/i18n/it.po b/addons/caldav/i18n/it.po
index 8c57ca230af..29e762d31e9 100644
--- a/addons/caldav/i18n/it.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr "Non è possibile mappare un campo più di una volta"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -272,7 +272,7 @@ msgid "Use the field"
 msgstr "Usa il campo"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr "Non è possibile creare più di una volta linee: \"%s\""
@@ -344,7 +344,7 @@ msgid "Save in .ics format"
 msgstr "Salva nel formato .ICS"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Errore !"
@@ -568,7 +568,7 @@ msgid "Calendar Collections"
 msgstr "Collezioni calendario"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -871,7 +871,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Il partecipante deve avere un ID email"
@@ -948,32 +948,8 @@ msgstr "basic.calendar.todo"
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "description"
-#~ msgstr "descrizione"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
 #~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "Modifided Date"
-#~ msgstr "Data modificata"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per l'Architettura di Visualizzazione!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un Menù ricorsivo."
diff --git a/addons/caldav/i18n/lv.po b/addons/caldav/i18n/lv.po
index cc7025c6f42..aad37af7fb8 100644
--- a/addons/caldav/i18n/lv.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr "Nevar kartēt lauku vairāk par vienu reizi"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Labi"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr "Lietot šo lauku"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr "Nevar izveidot irndu \"%s\" vairāk par vienu reizi"
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr "Saglabāt .ics formātā"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Kļūda!"
@@ -466,7 +466,7 @@ msgid "Calendar Collections"
 msgstr "Kalendāru kolekcijas"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -740,7 +740,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Dalībniekam jābūt e-pasta ID"
@@ -816,9 +816,3 @@ msgstr "basic.calendar.todo"
 #: help:basic.calendar,calendar_order:0
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
-
-#~ msgid "description"
-#~ msgstr "apraksts"
-
-#~ msgid "Modifided Date"
-#~ msgstr "Izmaiņu datums"
diff --git a/addons/caldav/i18n/nl.po b/addons/caldav/i18n/nl.po
index b77115104f8..1a7583d2277 100644
--- a/addons/caldav/i18n/nl.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr "Kan een veld niet meer dan één keer indelen"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr "Vul aub juiste configuratie van \"%s\" in bij agendaregels"
@@ -267,7 +267,7 @@ msgid "Use the field"
 msgstr "Het veld gebruiken"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr "Kan regel \"%s\" niet meer dan eens maken"
@@ -339,7 +339,7 @@ msgid "Save in .ics format"
 msgstr "Opslaan in .ics indeling"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Fout !"
@@ -559,7 +559,7 @@ msgid "Calendar Collections"
 msgstr "Agenda mappen"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -916,7 +916,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Deelnemer moet een emailadres hebben"
@@ -998,27 +998,3 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in actie definitie."
-
-#~ msgid "Modifided Date"
-#~ msgstr "Datum gewijzigd"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "description"
-#~ msgstr "omschrijving"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/caldav/i18n/pl.po b/addons/caldav/i18n/pl.po
index c78a4fddded..4b83b750f22 100644
--- a/addons/caldav/i18n/pl.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr "Podaj poprawną konfigurację \"%s\" w pozycjach kalendarza"
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr "Zastosuj pole"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr "Nie można tworzyć pozycji \"%s\" więcej niż raz"
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr "Zapisz w formacie .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Błąd !"
@@ -466,7 +466,7 @@ msgid "Calendar Collections"
 msgstr "Kolekcje kalendarzy"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -742,7 +742,7 @@ msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Uczestnik musi mieć id email"
@@ -825,27 +825,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 #~ "specjalnych !"
-
-#~ msgid "description"
-#~ msgstr "opis"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
-#~ msgid "Modifided Date"
-#~ msgstr "Data modyfikacji"
diff --git a/addons/caldav/i18n/pt.po b/addons/caldav/i18n/pt.po
index 5fbeda9be76..ceab0af2d5f 100644
--- a/addons/caldav/i18n/pt.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr "use o campo"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr "Guardar no formato ICS"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -468,7 +468,7 @@ msgid "Calendar Collections"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -742,7 +742,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr ""
@@ -818,9 +818,3 @@ msgstr "basic.calendar.todo"
 #: help:basic.calendar,calendar_order:0
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
-
-#~ msgid "description"
-#~ msgstr "descrição"
-
-#~ msgid "Modifided Date"
-#~ msgstr "Data de modificação"
diff --git a/addons/caldav/i18n/pt_BR.po b/addons/caldav/i18n/pt_BR.po
index 303b634b7e7..700cbb801f7 100644
--- a/addons/caldav/i18n/pt_BR.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr "Não é possível mapear um campo mais de uma vez"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -220,7 +220,7 @@ msgid "Use the field"
 msgstr "Usar o campo"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr "Não é possível criar a linha \"%s\" mais de uma vez"
@@ -292,7 +292,7 @@ msgid "Save in .ics format"
 msgstr "Salvar em formato .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -492,7 +492,7 @@ msgid "Calendar Collections"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -766,7 +766,7 @@ msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Participante deve ter um ID de E-mail"
diff --git a/addons/caldav/i18n/ru.po b/addons/caldav/i18n/ru.po
index 0e512c1a96c..4c8ec703fa6 100644
--- a/addons/caldav/i18n/ru.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Value Mapping"
-msgstr ""
+msgstr "Отображение значения"
 
 #. module: caldav
 #: help:caldav.browse,url:0
@@ -35,7 +35,7 @@ msgstr "Имя файла"
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_export
 msgid "Event Export"
-msgstr "Экспрот события"
+msgstr "Экспорт события"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
@@ -56,7 +56,7 @@ msgstr "_Закрыть"
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Attendee"
-msgstr ""
+msgstr "Участник"
 
 #. module: caldav
 #: sql_constraint:basic.calendar.fields:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr "Невозможно переназначить поле более одного раза"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -74,60 +74,60 @@ msgstr "Внимание!"
 #. module: caldav
 #: field:basic.calendar.lines,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Объект"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Todo"
-msgstr ""
+msgstr "Список задач"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_user_preference
 msgid "User preference Form"
-msgstr ""
+msgstr "Форма настроек пользователя"
 
 #. module: caldav
 #: field:user.preference,service:0
 msgid "Services"
-msgstr ""
+msgstr "Сервисы"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Expression as constant"
-msgstr ""
+msgstr "Выражение как константа"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 msgid "Ok"
-msgstr ""
+msgstr "ОК"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
+msgstr "Пожалуйста, настройте \"%s\" правильным образом."
 
 #. module: caldav
 #: field:calendar.event.export,name:0
 msgid "File name"
-msgstr ""
+msgstr "Имя файла"
 
 #. module: caldav
 #: field:caldav.browse,url:0
 msgid "Caldav Server"
-msgstr ""
+msgstr "Сервер Caldav"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:59
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: caldav
 #: help:caldav.browse,caldav_doc_file:0
@@ -137,7 +137,7 @@ msgstr ""
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "iPhone"
-msgstr ""
+msgstr "iPhone"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:32
@@ -166,6 +166,28 @@ msgid ""
 "        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"
+"     "
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:147
@@ -199,53 +221,80 @@ msgid ""
 "\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
 #: selection:basic.calendar,type:0
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "TODO"
-msgstr ""
+msgstr "TODO"
 
 #. module: caldav
 #: view:calendar.event.export:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Экспортировать ICS"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "Используйте поле"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
-msgstr ""
+msgstr "Нельзя создать запись \"%s\" более одного раза"
 
 #. 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 ""
+msgstr "Записи календаря"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_subscribe
 msgid "Event subscribe"
-msgstr ""
+msgstr "Подписка на событие"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Импортировать ICS"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 #: view:user.preference:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отменить"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_event
@@ -258,23 +307,23 @@ msgstr "basic.calendar.event"
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Event"
-msgstr ""
+msgstr "Событие"
 
 #. module: caldav
 #: field:document.directory,calendar_collection:0
 #: field:user.preference,collection:0
 msgid "Calendar Collection"
-msgstr ""
+msgstr "Коллекция календаря"
 
 #. module: caldav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Ошибка! Нельзя создавать вложенные директории."
 
 #. module: caldav
 #: view:user.preference:0
 msgid "_Open"
-msgstr ""
+msgstr "_Открыть"
 
 #. module: caldav
 #: field:basic.calendar,type:0
@@ -282,18 +331,18 @@ msgstr ""
 #: field:basic.calendar.fields,type_id:0
 #: field:basic.calendar.lines,name:0
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Сохранить в формате .ics"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:128
@@ -322,16 +371,38 @@ msgid ""
 "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"
+"     "
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attributes
 msgid "Calendar attributes"
-msgstr ""
+msgstr "Атрибуты календаря"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_caldav_browse
 msgid "Caldav Browse"
-msgstr ""
+msgstr "Обзор Caldav"
 
 #. module: caldav
 #: model:ir.module.module,description:caldav.module_meta_information
@@ -359,31 +430,51 @@ msgid ""
 "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"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Android based device"
-msgstr ""
+msgstr "Android устройство"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Attributes Mapping"
-msgstr ""
+msgstr "Отображение атрибутов"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Каталог"
 
 #. module: caldav
 #: field:calendar.event.subscribe,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Введите путь к удаленному календарю"
 
 #. module: caldav
 #: view:caldav.browse:0
@@ -393,17 +484,17 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.lines,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Домен"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Подписаться"
 
 #. module: caldav
 #: field:basic.calendar,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Владелец"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -412,7 +503,7 @@ msgstr ""
 #: model:ir.ui.menu,name:caldav.menu_calendar
 #: field:user.preference,calendar:0
 msgid "Calendar"
-msgstr ""
+msgstr "Календарь"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:41
@@ -420,62 +511,64 @@ msgstr ""
 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 ""
+msgstr "Неверный формат ics файла, импортирование не возможно"
 
 #. module: caldav
 #: selection:user.preference,service:0
 msgid "CalDAV"
-msgstr ""
+msgstr "CalDAV"
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
 msgid "OpenObject Field"
-msgstr ""
+msgstr "Поле OpenObject"
 
 #. module: caldav
 #: field:basic.calendar.alias,res_id:0
 msgid "Res. ID"
-msgstr ""
+msgstr "ID Ресурса"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Message..."
-msgstr ""
+msgstr "Сообщение..."
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Other"
-msgstr ""
+msgstr "Прочие"
 
 #. module: caldav
 #: view:basic.calendar:0
 #: field:basic.calendar,has_webcal:0
 msgid "WebCal"
-msgstr ""
+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 ""
+msgstr "Коллекции календаря"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
-msgstr ""
+msgstr "Нелья применять одинаковое название файла к двум записям!"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Каталог не может быть родительским для самого себя!"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -483,17 +576,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:caldav.action_caldav_form
 #: model:ir.ui.menu,name:caldav.menu_caldav_directories
 msgid "Calendars"
-msgstr ""
+msgstr "Календари"
 
 #. module: caldav
 #: field:basic.calendar,collection_id:0
 msgid "Collection"
-msgstr ""
+msgstr "Коллекция"
 
 #. module: caldav
 #: field:basic.calendar,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Дата записи"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:104
@@ -525,6 +618,32 @@ msgid ""
 "    \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"
+"    "
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:53
@@ -587,22 +706,78 @@ msgid ""
 "      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"
+"    "
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Имя каталога должно быть уникальным!"
 
 #. module: caldav
 #: view:user.preference:0
 msgid "User Preference"
-msgstr ""
+msgstr "Настройки пользователя"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:59
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Введите верный URL!"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_timezone
@@ -612,7 +787,7 @@ msgstr "basic.calendar.timezone"
 #. module: caldav
 #: field:basic.calendar.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Выражение"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attendee
@@ -628,7 +803,7 @@ msgstr "basic.calendar.alias"
 #: view:calendar.event.import:0
 #: field:calendar.event.import,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Выберит ICS файл"
 
 #. module: caldav
 #: field:caldav.browse,caldav_doc_file:0
@@ -638,12 +813,12 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.lines,mapping_ids:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "Соответствие полей"
 
 #. module: caldav
 #: view:caldav.browse:0
 msgid "Browse caldav"
-msgstr ""
+msgstr "Обзор caldav"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar
@@ -653,12 +828,12 @@ msgstr "basic.calendar"
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Other Info"
-msgstr ""
+msgstr "Прочая информация"
 
 #. module: caldav
 #: field:user.preference,device:0
 msgid "Software/Devices"
-msgstr ""
+msgstr "Программы/Устройства"
 
 #. module: caldav
 #: help:basic.calendar,has_webcal:0
@@ -666,11 +841,13 @@ 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 ""
+msgstr "Функция"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -678,61 +855,61 @@ msgstr ""
 #: view:caldav.browse:0
 #: field:caldav.browse,description:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
 msgid "The calendar/line this mapping applies to"
-msgstr ""
+msgstr "Календарь/строка, к которым применяется это соответствие"
 
 #. module: caldav
 #: field:basic.calendar.fields,mapping:0
 msgid "Mapping"
-msgstr ""
+msgstr "Соответствие"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:86
 #, python-format
 msgid "Import Sucessful"
-msgstr ""
+msgstr "Импортировано успешно"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "_Import"
-msgstr ""
+msgstr "_Импорт"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_import
 msgid "Event Import"
-msgstr ""
+msgstr "Импорт события"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "Интервал в часах"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Subscribe to Remote Calendar"
-msgstr ""
+msgstr "Подписаться на удаленный календарь"
 
 #. module: caldav
 #: help:basic.calendar,calendar_color:0
 msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
+msgstr "Для поддерживающих клиентов: цвет записи в календаре"
 
 #. module: caldav
 #: field:basic.calendar,name:0
 #: field:basic.calendar.attributes,name:0
 #: field:basic.calendar.fields,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Alarm"
-msgstr ""
+msgstr "Уведомление"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alarm
@@ -740,72 +917,72 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
-msgstr ""
+msgstr "Участник должен иметь Email"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
 msgid "Export .ics File"
-msgstr ""
+msgstr "Экспортировать .ics файл"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:41
 #, python-format
 msgid "vobject Import Error!"
-msgstr ""
+msgstr "Ошибка импорта vobject!"
 
 #. module: caldav
 #: field:calendar.event.export,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Сохранить ICS файл"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Sunbird/Thunderbird"
-msgstr ""
+msgstr "Sunbird/Thunderbird"
 
 #. module: caldav
 #: field:basic.calendar,calendar_order:0
 msgid "Order"
-msgstr ""
+msgstr "Порядок"
 
 #. module: caldav
 #: model:ir.module.module,shortdesc:caldav.module_meta_information
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "Открыть доступ к календарю через Caldav"
 
 #. module: caldav
 #: field:basic.calendar,calendar_color:0
 msgid "Color"
-msgstr ""
+msgstr "Цвет"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "MY"
-msgstr ""
+msgstr "MY"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_fields
 msgid "Calendar fields"
-msgstr ""
+msgstr "Поля календаря"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import Message"
-msgstr ""
+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 ""
+msgstr "Подписаться"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Каталог должен иметь родителя или хранилище"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_todo
@@ -816,3 +993,5 @@ msgstr "basic.calendar.todo"
 #: 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/sq.po b/addons/caldav/i18n/sq.po
index b9e524f0582..c9d415c27ad 100644
--- a/addons/caldav/i18n/sq.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -466,7 +466,7 @@ msgid "Calendar Collections"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -740,7 +740,7 @@ msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr ""
diff --git a/addons/caldav/i18n/sr.po b/addons/caldav/i18n/sr.po
index d9b3a484a43..13ab58d0bec 100644
--- a/addons/caldav/i18n/sr.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "OK"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr "Koristite polje"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr "sacuvaj u .ics formatu"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -466,7 +466,7 @@ msgid "Calendar Collections"
 msgstr "Kolekcija Kalendara"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -742,7 +742,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Ucesnik mora imati Licni Email"
@@ -823,23 +823,3 @@ msgstr "Za podrsku klijentima, redosled foldera izmedju kalendara"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Modifided Date"
-#~ msgstr "Datuma modifikovano"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture"
-
-#, python-format
-#~ msgid "Can not create \\nline \"%s\" more than once' % (vals.get('name"
-#~ msgstr ""
-#~ "Ne mogu da kreira, \\nliniju \"%s\" vise nego jednom' % (vals.get('name"
-
-#~ msgid "description"
-#~ msgstr "Opis"
diff --git a/addons/caldav/i18n/sr@latin.po b/addons/caldav/i18n/sr@latin.po
index 227d398f81e..cd26ae95e29 100644
--- a/addons/caldav/i18n/sr@latin.po
+++ b/addons/caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -64,8 +64,8 @@ msgid "Can not map a field more than once"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
-#: code:addons/caldav/calendar.py:861
+#: 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 !"
@@ -108,7 +108,7 @@ msgid "Ok"
 msgstr "OK"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/calendar.py:877
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "Use the field"
 msgstr "Koristite polje"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -290,7 +290,7 @@ msgid "Save in .ics format"
 msgstr "sacuvaj u .ics formatu"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -466,7 +466,7 @@ msgid "Calendar Collections"
 msgstr "Kolekcija Kalendara"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:798
+#: code:addons/caldav/calendar.py:813
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -742,7 +742,7 @@ msgid "basic.calendar.alarm"
 msgstr "basic.calendar.alarm"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:1275
+#: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr "Ucesnik mora imati Licni Email"
@@ -823,23 +823,3 @@ msgstr "Za podrsku klijentima, redosled foldera izmedju kalendara"
 #~ "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 "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije"
-
-#~ msgid "Modifided Date"
-#~ msgstr "Datuma modifikovano"
-
-#, python-format
-#~ msgid "Can not create \\nline \"%s\" more than once' % (vals.get('name"
-#~ msgstr ""
-#~ "Ne mogu da kreira, \\nliniju \"%s\" vise nego jednom' % (vals.get('name"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture"
-
-#~ msgid "description"
-#~ msgstr "Opis"
diff --git a/addons/caldav/i18n/sv.po b/addons/caldav/i18n/sv.po
index 9f896de1354..2eda823294d 100644
--- a/addons/caldav/i18n/sv.po
+++ b/addons/caldav/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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -816,21 +816,3 @@ msgstr ""
 #: help:basic.calendar,calendar_order:0
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
-
-#~ msgid "description"
-#~ msgstr "beskrivning"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unikt!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
diff --git a/addons/caldav/i18n/tr.po b/addons/caldav/i18n/tr.po
index 54e72a958c6..902cdde57d7 100644
--- a/addons/caldav/i18n/tr.po
+++ b/addons/caldav/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: 2011-06-21 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/zh_CN.po b/addons/caldav/i18n/zh_CN.po
index 8cdf821ca45..84aded2b3e3 100644
--- a/addons/caldav/i18n/zh_CN.po
+++ b/addons/caldav/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: 2011-07-05 04:33+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -40,7 +40,7 @@ msgstr "事件导出"
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Provide path for Remote Calendar"
-msgstr "提供远程日历路径"
+msgstr "提供远程日程表路径"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
@@ -94,7 +94,7 @@ msgstr "服务"
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Expression as constant"
-msgstr "表现像常量"
+msgstr "表达式常量"
 
 #. module: caldav
 #: selection:user.preference,device:0
@@ -121,13 +121,13 @@ msgstr "文件名"
 #. module: caldav
 #: field:caldav.browse,url:0
 msgid "Caldav Server"
-msgstr ""
+msgstr "Caldav 服务器"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:59
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: caldav
 #: help:caldav.browse,caldav_doc_file:0
@@ -137,7 +137,7 @@ msgstr ""
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "iPhone"
-msgstr ""
+msgstr "iPhone"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:32
@@ -166,6 +166,24 @@ msgid ""
 "        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"
+"     "
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:147
@@ -199,58 +217,71 @@ msgid ""
 "\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"
 
 #. module: caldav
 #: selection:basic.calendar,type:0
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "TODO"
-msgstr ""
+msgstr "待办"
 
 #. module: caldav
 #: view:calendar.event.export:0
 msgid "Export ICS"
-msgstr ""
+msgstr "导出ics格式日程表"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "用这个字段"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:787
 #, python-format
 msgid "Can not create line \"%s\" more than once"
-msgstr ""
+msgstr "不能重复创建行 \"%s\""
 
 #. 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 ""
+msgstr "日程记录"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_subscribe
 msgid "Event subscribe"
-msgstr ""
+msgstr "订阅事件"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import ICS"
-msgstr ""
+msgstr "导入ics日程文件"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 #: view:user.preference:0
 msgid "_Cancel"
-msgstr ""
+msgstr "取消(_C)"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_event
 msgid "basic.calendar.event"
-msgstr ""
+msgstr "basic.calendar.event"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -258,23 +289,23 @@ msgstr ""
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Event"
-msgstr ""
+msgstr "事件"
 
 #. module: caldav
 #: field:document.directory,calendar_collection:0
 #: field:user.preference,collection:0
 msgid "Calendar Collection"
-msgstr ""
+msgstr "日程集"
 
 #. module: caldav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "错误:你无法建立递归的目录"
 
 #. module: caldav
 #: view:user.preference:0
 msgid "_Open"
-msgstr ""
+msgstr "打开(_O)"
 
 #. module: caldav
 #: field:basic.calendar,type:0
@@ -282,18 +313,18 @@ msgstr ""
 #: field:basic.calendar.fields,type_id:0
 #: field:basic.calendar.lines,name:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "保存为ics格式"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:128
@@ -322,16 +353,29 @@ msgid ""
 "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"
+"     "
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attributes
 msgid "Calendar attributes"
-msgstr ""
+msgstr "日程表属性"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_caldav_browse
 msgid "Caldav Browse"
-msgstr ""
+msgstr "Caldav 浏览"
 
 #. module: caldav
 #: model:ir.module.module,description:caldav.module_meta_information
@@ -359,31 +403,49 @@ msgid ""
 "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"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Android based device"
-msgstr ""
+msgstr "基于安卓的设备"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Attributes Mapping"
-msgstr ""
+msgstr "属性匹配"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "目录"
 
 #. module: caldav
 #: field:calendar.event.subscribe,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "输入远程日程表的路径"
 
 #. module: caldav
 #: view:caldav.browse:0
@@ -393,17 +455,17 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.lines,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "过滤条件"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "订阅(_S)"
 
 #. module: caldav
 #: field:basic.calendar,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "所有者"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -412,7 +474,7 @@ msgstr ""
 #: model:ir.ui.menu,name:caldav.menu_calendar
 #: field:user.preference,calendar:0
 msgid "Calendar"
-msgstr ""
+msgstr "日程表"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:41
@@ -420,62 +482,64 @@ msgstr ""
 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 ""
+msgstr "ics文件格式错误，无法导入"
 
 #. module: caldav
 #: selection:user.preference,service:0
 msgid "CalDAV"
-msgstr ""
+msgstr "CalDAV"
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
 msgid "OpenObject Field"
-msgstr ""
+msgstr "对象字段"
 
 #. module: caldav
 #: field:basic.calendar.alias,res_id:0
 msgid "Res. ID"
-msgstr ""
+msgstr "资源ID"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Message..."
-msgstr ""
+msgstr "消息"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #. module: caldav
 #: view:basic.calendar:0
 #: field:basic.calendar,has_webcal:0
 msgid "WebCal"
-msgstr ""
+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 ""
+msgstr "日程集"
 
 #. 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 ""
+msgstr "两条记录不能用同一个文件名"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目录不能设为自己的上级目录。"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -483,17 +547,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:caldav.action_caldav_form
 #: model:ir.ui.menu,name:caldav.menu_caldav_directories
 msgid "Calendars"
-msgstr ""
+msgstr "日程表"
 
 #. module: caldav
 #: field:basic.calendar,collection_id:0
 msgid "Collection"
-msgstr ""
+msgstr "集合"
 
 #. module: caldav
 #: field:basic.calendar,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "修改日期"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:104
@@ -525,6 +589,20 @@ msgid ""
 "    \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"
+"    "
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:53
@@ -587,48 +665,68 @@ msgid ""
 "      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"
+"    "
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "目录名必须唯一！"
 
 #. module: caldav
 #: view:user.preference:0
 msgid "User Preference"
-msgstr ""
+msgstr "用户首选项"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:59
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "请输入正确的地址"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_timezone
 msgid "basic.calendar.timezone"
-msgstr ""
+msgstr "basic.calendar.timezone"
 
 #. module: caldav
 #: field:basic.calendar.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "表达式"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attendee
 msgid "basic.calendar.attendee"
-msgstr ""
+msgstr "basic.calendar.attendee"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alias
 msgid "basic.calendar.alias"
-msgstr ""
+msgstr "basic.calendar.alias"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: field:calendar.event.import,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "选择ics文件"
 
 #. module: caldav
 #: field:caldav.browse,caldav_doc_file:0
@@ -638,39 +736,39 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.lines,mapping_ids:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "字段映射"
 
 #. module: caldav
 #: view:caldav.browse:0
 msgid "Browse caldav"
-msgstr ""
+msgstr "浏览caldav"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar
 msgid "basic.calendar"
-msgstr ""
+msgstr "basic.calendar"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Other Info"
-msgstr ""
+msgstr "其它信息"
 
 #. module: caldav
 #: field:user.preference,device:0
 msgid "Software/Devices"
-msgstr ""
+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 ""
+msgstr "并且在日程表目录后生成一个 日程表名称.ics文件"
 
 #. module: caldav
 #: field:basic.calendar.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "功能"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -678,141 +776,141 @@ msgstr ""
 #: view:caldav.browse:0
 #: field:caldav.browse,description:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
 msgid "The calendar/line this mapping applies to"
-msgstr ""
+msgstr "日程表对应于"
 
 #. module: caldav
 #: field:basic.calendar.fields,mapping:0
 msgid "Mapping"
-msgstr ""
+msgstr "映射"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:86
 #, python-format
 msgid "Import Sucessful"
-msgstr ""
+msgstr "导入成功"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "_Import"
-msgstr ""
+msgstr "导入(_I)"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_import
 msgid "Event Import"
-msgstr ""
+msgstr "导入事件"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "间隔小时数"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Subscribe to Remote Calendar"
-msgstr ""
+msgstr "订阅远程日程表"
 
 #. module: caldav
 #: help:basic.calendar,calendar_color:0
 msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
+msgstr "为支持彩色的客户端指定此日程表颜色"
 
 #. module: caldav
 #: field:basic.calendar,name:0
 #: field:basic.calendar.attributes,name:0
 #: field:basic.calendar.fields,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Alarm"
-msgstr ""
+msgstr "提醒"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alarm
 msgid "basic.calendar.alarm"
-msgstr ""
+msgstr "basic.calendar.alarm"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:1291
 #, python-format
 msgid "Attendee must have an Email Id"
-msgstr ""
+msgstr "参与者必须有邮件地址"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
 msgid "Export .ics File"
-msgstr ""
+msgstr "导出 .ics 文件"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:41
 #, python-format
 msgid "vobject Import Error!"
-msgstr ""
+msgstr "vobject导入出错"
 
 #. module: caldav
 #: field:calendar.event.export,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "保存ics文件"
 
 #. module: caldav
 #: selection:user.preference,device:0
 msgid "Sunbird/Thunderbird"
-msgstr ""
+msgstr "Sunbird/Thunderbird"
 
 #. module: caldav
 #: field:basic.calendar,calendar_order:0
 msgid "Order"
-msgstr ""
+msgstr "顺序"
 
 #. module: caldav
 #: model:ir.module.module,shortdesc:caldav.module_meta_information
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "和Caldav共享日程"
 
 #. module: caldav
 #: field:basic.calendar,calendar_color:0
 msgid "Color"
-msgstr ""
+msgstr "颜色"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "MY"
-msgstr ""
+msgstr "我的"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_fields
 msgid "Calendar fields"
-msgstr ""
+msgstr "日程表字段"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import Message"
-msgstr ""
+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 ""
+msgstr "订阅"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目录必须具有上级目录或一个存储区"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_todo
 msgid "basic.calendar.todo"
-msgstr ""
+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 ""
+msgstr "针对支持排序的客户端，此日程表所在的位置"
diff --git a/addons/caldav/orm_utils.py b/addons/caldav/orm_utils.py
index ab0b4bbb8db..b154d54d1aa 100644
--- a/addons/caldav/orm_utils.py
+++ b/addons/caldav/orm_utils.py
@@ -31,7 +31,7 @@ if True: # we need this indentation level ;)
         """
         if context is None:
             context = {}
-        self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=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)
@@ -46,3 +46,5 @@ if True: # we need this indentation level ;)
         return res[0][0]
 
 #eof
+
+# 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
index f6ecc5dccd5..f4bb8aeaabc 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -24,6 +24,7 @@ from tools import config
 import base64
 import addons
 from tools.translate import _
+import tools
 
 class caldav_browse(osv.osv_memory):
 
@@ -176,16 +177,6 @@ configuration
         pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
         res = {}
         host = context.get('host')
-        port = ''
-        prefix = 'http://'
-        if not config.get('xmlrpc'):
-            if not config.get('netrpc'):
-                prefix = 'https://'
-                port = config.get('xmlrpcs_port', 8071)
-            else:
-                port = config.get('netrpc_port',8070)
-        else:
-            port = config.get('xmlrpc_port',8069)
         if not config.get_misc('webdav','enable',True):
             raise Exception("WebDAV is disabled, cannot continue")
         user_pool = self.pool.get('res.users')
@@ -195,16 +186,16 @@ configuration
         if pref_ids:
             pref_ids = pref_ids[0]
             if pref_ids.device == 'iphone':
-                url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'
+                url = host + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'
             else :
-                url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'+ 'users/'+ current_user.login + '/'+ pref_ids.collection.name+ '/'+ pref_ids.calendar.name
+                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'] = prefix+url
+        res['url'] = url
         return res
 
     def browse_caldav(self, cr, uid, ids, context):
@@ -239,12 +230,8 @@ class user_preference(osv.osv_memory):
         return ids[0]
     
     def _get_default_host(self, cr, uid, context):
-        ids=self.search(cr,uid,[])
-        host_name = ''
-        if ids:
-            ids = len(ids)> 1 and len(ids)-1 or ids[0] # Use len(ids)-1 for taking the value of last id 
-            host_name = self.browse(cr, uid,[ids],context=context)[0].host_name
-        return host_name
+
+        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
 
     _defaults={
               'service': 'webdav',
@@ -288,3 +275,5 @@ class user_preference(osv.osv_memory):
         }
 
 user_preference()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 2e694008226..c3eec37a229 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Claim from Delivery",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Hidden",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/claim_from_delivery/i18n/bg.po b/addons/claim_from_delivery/i18n/bg.po
index 3c7d364da45..e8752c8270d 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 378214909c5..d6fe9957e3a 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ec38900c5b0..16b5a04aa5c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,20 +31,3 @@ msgstr "Erzeuge Reklamation von Lieferauftrag\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Reklamation von Lieferung"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehler in Modul für Aktion"
-
-#~ msgid "Picking List"
-#~ msgstr "Packliste"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ 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 haben !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehler in xml Ansicht."
diff --git a/addons/claim_from_delivery/i18n/en_GB.po b/addons/claim_from_delivery/i18n/en_GB.po
new file mode 100644
index 00000000000..877ab7885d6
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/en_GB.po
@@ -0,0 +1,33 @@
+# 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: 2011-01-11 11:14+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: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Claim"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Create Claim from delivery order:\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Claim from delivery"
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
index fa0fdc5f66f..415a21937f6 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -32,21 +32,3 @@ msgstr "Crear reclamación a partir del albarán de entrega:\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Reclamación desde el albarán de entrega"
-
-#~ msgid "Picking List"
-#~ msgstr "Albarán"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/claim_from_delivery/i18n/es_EC.po b/addons/claim_from_delivery/i18n/es_EC.po
index 3681e005007..4b571ffb79e 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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_MX.po b/addons/claim_from_delivery/i18n/es_MX.po
new file mode 100644
index 00000000000..f9a90ab69a9
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/es_MX.po
@@ -0,0 +1,34 @@
+# 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: 2010-12-27 08:36+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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Reclamación"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Crear reclamación a partir del albarán de entrega:\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Reclamación desde el albarán de entrega"
diff --git a/addons/claim_from_delivery/i18n/es_PY.po b/addons/claim_from_delivery/i18n/es_PY.po
index ddf891567f4..1b87061ad10 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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_VE.po b/addons/claim_from_delivery/i18n/es_VE.po
new file mode 100644
index 00000000000..f9a90ab69a9
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/es_VE.po
@@ -0,0 +1,34 @@
+# 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: 2010-12-27 08:36+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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Reclamación"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Crear reclamación a partir del albarán de entrega:\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Reclamación desde el albarán de entrega"
diff --git a/addons/claim_from_delivery/i18n/fi.po b/addons/claim_from_delivery/i18n/fi.po
index 84fd929478a..82f12e5819a 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: 2011-06-21 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 261b8a9e3ca..01907eea39d 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -30,18 +30,3 @@ msgstr "Créer une réclamation sur un bon de livraison :\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Réclamation sur la livraison"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ 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 "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle incorrect dans la définition de l'action"
-
-#~ msgid "Picking List"
-#~ msgstr "Opération de manutention"
diff --git a/addons/claim_from_delivery/i18n/gl.po b/addons/claim_from_delivery/i18n/gl.po
index ed1461b1c11..2709483594c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 be5d6dbaaf0..0292f11ef00 100644
--- a/addons/claim_from_delivery/i18n/hu.po
+++ b/addons/claim_from_delivery/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-17 13:47+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 855fa1c5737..7cbd1fa9c4a 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 35e89beb6a9..b9a8b804e1b 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,21 +31,3 @@ msgstr "Crea il reclamo dall'ordine di consegna:\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Reclamo da consegna"
-
-#~ msgid "Picking List"
-#~ msgstr "Picking List"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ 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 "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/claim_from_delivery/i18n/mn.po b/addons/claim_from_delivery/i18n/mn.po
index c7e40f5811c..9918b840ddb 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3e147f09dde..b9f295d6eff 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bd662e28954..6b600a0e2b0 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,26 +31,3 @@ msgstr "Maak klacht over levering:\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Klacht over levering"
-
-#~ msgid "Partner"
-#~ msgstr "Relatie"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ 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 "Picking List"
-#~ msgstr "Pakbon"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/claim_from_delivery/i18n/oc.po b/addons/claim_from_delivery/i18n/oc.po
new file mode 100644
index 00000000000..e7670a75613
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/oc.po
@@ -0,0 +1,33 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-11-20 09:19+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Reclamacion"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Crear una reclamacion sus un bon de liurason :\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Reclamacion sus la liurason"
diff --git a/addons/claim_from_delivery/i18n/pt.po b/addons/claim_from_delivery/i18n/pt.po
index 4a013f6a1aa..bc5e04dd6b5 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,15 +31,3 @@ msgstr "Criar reclamação a partir de uma guia de transporte:\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Reclamação a partir de entrega"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
diff --git a/addons/claim_from_delivery/i18n/pt_BR.po b/addons/claim_from_delivery/i18n/pt_BR.po
index 8424588bf96..899ebfcc724 100644
--- a/addons/claim_from_delivery/i18n/pt_BR.po
+++ b/addons/claim_from_delivery/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,21 +31,3 @@ msgstr "Criar reinvindicação da ordem de entrega:\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Reinvindicação da entrega"
-
-#~ msgid "Picking List"
-#~ msgstr "Lista de Separação"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
index b30a373d447..ba278006177 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,21 +31,3 @@ msgstr "Создать претензию из заказа на доставк
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Претензия из доставки"
-
-#~ msgid "Picking List"
-#~ msgstr "Отборочный лист"
-
-#~ msgid "Partner"
-#~ msgstr "Партнер"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
diff --git a/addons/claim_from_delivery/i18n/sl.po b/addons/claim_from_delivery/i18n/sl.po
index 939f2e401af..3ee641caa52 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,20 +31,3 @@ msgstr "Ustvari zahtevek na podlagi dobavnice:\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Zahtevek iz dobave"
-
-#~ msgid "Picking List"
-#~ msgstr "Prevzemni list"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
diff --git a/addons/claim_from_delivery/i18n/sq.po b/addons/claim_from_delivery/i18n/sq.po
index 108bd5b0166..9c5d63b954c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fdccdead4ce..21cf9f94967 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,20 +31,3 @@ msgstr "Kreiraj Zahtev iz Naloga Isporuke\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Zahtev od Isporuke"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Picking List"
-#~ msgstr "Izborna Lista"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ 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"
diff --git a/addons/claim_from_delivery/i18n/sr@latin.po b/addons/claim_from_delivery/i18n/sr@latin.po
index ed6f48a1a50..3287996bd46 100644
--- a/addons/claim_from_delivery/i18n/sr@latin.po
+++ b/addons/claim_from_delivery/i18n/sr@latin.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:14+0000\n"
-"PO-Revision-Date: 2010-12-24 13:20+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-06 14:05+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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -25,26 +25,9 @@ msgstr "Zahtev"
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
 msgid "Create Claim from delivery order:\n"
-msgstr "Kreiraj Zahtev iz Naloga Isporuke\n"
+msgstr "Napravi zahtev iz naloga isporuke\n"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
-msgstr "Zatraži od isporuke"
-
-#~ msgid "Picking List"
-#~ msgstr "Izborna Lista"
-
-#~ 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 model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
+msgstr "Zahtev od isporuke"
diff --git a/addons/claim_from_delivery/i18n/sv.po b/addons/claim_from_delivery/i18n/sv.po
index 61a4ef61a9c..10771688d62 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -31,20 +31,3 @@ msgstr "Skapa fodran ifrån leveransorder:\n"
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Fodran från leverans"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Picking List"
-#~ msgstr "Plocklista"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
diff --git a/addons/claim_from_delivery/i18n/ta.po b/addons/claim_from_delivery/i18n/ta.po
index 8b70fc91b12..e03f4c45153 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7b7ec42af47..f2c20a08948 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
@@ -25,15 +25,9 @@ msgstr "Şikayet"
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
 msgid "Create Claim from delivery order:\n"
-msgstr "Teslimattan Şikayet Oluştur\n"
+msgstr "Teslimat emrinden Şikayet Oluştur\n"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
 msgstr "Teslimattan Şikayet oluştur"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Eylem tanımında geçersiz model adı."
-
-#~ msgid "Picking List"
-#~ msgstr "Liste Seç"
diff --git a/addons/claim_from_delivery/i18n/zh_CN.po b/addons/claim_from_delivery/i18n/zh_CN.po
index 9d6c10ac3bf..ec10fe03648 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: 2011-07-05 04:33+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index e56ed80af30..214c5c3d450 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -24,17 +24,10 @@ import crm_action_rule
 import crm_segmentation
 import crm_meeting
 import crm_lead
-import crm_opportunity
-
 import crm_phonecall
-
-import crm_installer
 import report
 import wizard
-
 import res_partner
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index d1751618506..54dfc335a2b 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Customer & Supplier Relationship Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 The generic OpenERP Customer Relationship Management.
@@ -55,11 +55,10 @@ Creates a dashboard for CRM that includes:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
-        'base',
         'base_action_rule',
         'base_setup',
         'process',
-        'mail_gateway',
+        'mail',
         'base_calendar',
         'resource',
         'board'
@@ -69,7 +68,6 @@ Creates a dashboard for CRM that includes:
         'crm_meeting_data.xml',
         'crm_lead_data.xml',
         'crm_meeting_data.xml',
-        'crm_opportunity_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -86,7 +84,6 @@ Creates a dashboard for CRM that includes:
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'wizard/crm_partner_to_opportunity_view.xml',
 
-        'wizard/crm_send_email_view.xml',
         'wizard/crm_add_note_view.xml',
         'wizard/crm_merge_opportunities_view.xml',
 
@@ -103,9 +100,6 @@ Creates a dashboard for CRM that includes:
         'crm_phonecall_view.xml',
         'crm_phonecall_menu.xml',
 
-        'crm_opportunity_view.xml',
-        'crm_opportunity_menu.xml',
-
         'report/crm_lead_report_view.xml',
         'report/crm_phonecall_report_view.xml',
 
@@ -113,15 +107,14 @@ Creates a dashboard for CRM that includes:
         'crm_installer_view.xml',
 
         'res_partner_view.xml',
-        'board_crm_view.xml',
         'board_crm_statistical_view.xml',
+        'board_crm_view.xml',
 
     ],
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
         'crm_meeting_demo.xml',
-        'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
@@ -132,6 +125,11 @@ Creates a dashboard for CRM that includes:
             'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
+            'test/test_crm_lead_case2.yml',
+            'test/test_crm_opportunity_case2.yml',
+            'test/test_crm_phonecall_case2.yml',
+            'test/test_crm_partner2opportunity.yml',
+            'test/test_crm_segmentation.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 607d4497c37..5ea3844e896 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -78,31 +78,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Statistics Dashboard">
-                    <hpaned>
-                        <child1>
-                            <action
-                                string="Opportunities by Categories"
-                                name="%(act_oppor_categ)d"
-                                colspan="4"
-                                height="200"
-                                width="250"/>
+                    <board style="1-1">
+                        <column>
+                            <action string="Opportunities by Categories"
+                                name="%(act_oppor_categ)d"/>
 
-                            <action
-                                string="Opportunities by Stage"
-                                name="%(act_opportunity_stage)d"
-                                height="200"
-                                colspan="4"/>
+                            <action string="Opportunities by Stage"
+                                name="%(act_opportunity_stage)d"/>
 
-                        </child1>
-                        <child2>
+                        </column>
+                        <column>
 
-                            <action
-                                string="Planned Revenue by Stage and User"
-                                name="%(act_oppor_stage_user)d"
-                                colspan="4"/>
+                            <action string="Planned Revenue by Stage and User"
+                                name="%(act_oppor_stage_user)d"/>
 
-                        </child2>
-                    </hpaned>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 53e0207fc5a..7b80feffd30 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -62,10 +62,11 @@
 
           <record model="ir.actions.act_window" id="act_my_oppor">
               <field name="name">My Open Opportunities</field>
-               <field name="res_model">crm.lead</field>
-               <field name="view_type">form</field>
-               <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
+              <field name="res_model">crm.lead</field>
+              <field name="view_type">form</field>
+              <field name="view_mode">tree,form</field>
+              <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
+              <field name="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
           </record>
 
         <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
@@ -88,7 +89,8 @@
                <field name="view_type">form</field>
                <field name="view_mode">tree,form</field>
                <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+               <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+               <field name="context">{'default_user_id': uid}</field>
           </record>
 
           <record model="ir.actions.act_window" id="act_my_oppor_stage">
@@ -116,53 +118,33 @@
                <field name="type">form</field>
                <field name="arch" type="xml">
                     <form string="Sales Dashboard">
-                         <hpaned>
-                              <child1>
-                                   <action
-                                        string="My Open Opportunities"
-                                        name="%(act_my_oppor)d"
-                                        colspan="4"
-                                        height="150"
-                                        groups="base.group_sale_salesman,base.group_sale_manager"
-                                        width="510"/>
-                                   <action
-                                        string="My Meetings"
-                                        name="%(act_my_meetings)d"
-                                        height="150"
-                                        colspan="4"/>
-                              </child1>
-                              <child2>
-                                   <action
-                                string="My Planned Revenues by Stage"
-                                name="%(act_my_oppor_stage)d"
-                                groups="base.group_sale_salesman,base.group_sale_manager"
-                                colspan="4"/>
-                            <action
-                                string="My Win/Lost Ratio for the Last Year"
-                                name="%(act_sales_pipeline)d"
-                                groups="base.group_sale_salesman,base.group_sale_manager"
-                                colspan="4"/>
-                        </child2>
-                    </hpaned>
+                         <board style="1-1">
+                            <column>
+                                <action string="My Open Opportunities"
+                                    name="%(act_my_oppor)d"/>
+                                <action
+                                    string="My Meetings"
+                                    name="%(act_my_meetings)d"/>
+                            </column>
+                            <column>
+                                <action string="My Planned Revenues by Stage"
+                                    name="%(act_my_oppor_stage)d"/>
+                                <action string="My Win/Lost Ratio"
+                                    name="%(act_sales_pipeline)d"/>
+                            </column>
+                    </board>
                 </form>
             </field>
         </record>
         <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">Sales Dashboard</field>
+            <field name="name">Sales</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_crm_form"/>
         </record>
-        <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
-        <menuitem
-            name="Sales Dashboard" parent="board.menu_dasboard"
-            action="open_board_crm"
-            sequence="1"
-            id="menu_board_crm" icon="terp-graph"
-            groups="base.group_sale_salesman"/>
-
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_crm"/>
+        <menuitem id="base.menu_base_partner"
+            action="open_board_crm"/>
     </data>
 </openerp>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f6d3964cf0b..03cdb31832d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -29,8 +29,8 @@ from tools.translate import _
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
-    ('draft', 'Draft'),
-    ('open', 'Open'),
+    ('draft', 'New'),
+    ('open', 'In Progress'),
     ('cancel', 'Cancelled'),
     ('done', 'Closed'),
     ('pending', 'Pending'),
@@ -44,583 +44,17 @@ AVAILABLE_PRIORITIES = [
     ('5', 'Lowest'),
 ]
 
-class crm_base(object):
-    """
-        Base classe for crm object,
-        Object that inherit from this class should have
-            date_open
-            date_closed
-            user_id
-            partner_id
-            partner_address_id
-        as field to be compatible with this class
-        
-    """
-    def _get_default_partner_address(self, cr, uid, context=None):
-        """Gives id of default address for current user
-        :param context: if portal in context is false return false anyway
-        """
-        if context is None:
-            context = {}
-        if not context.get('portal'):
-            return False
-        # was user.address_id.id, but address_id has been removed
-        return False
-
-    def _get_default_partner(self, cr, uid, context=None):
-        """Gives id of partner for current user
-        :param context: if portal in context is false return false anyway
-        """
-        if context is None:
-            context = {}
-        if not context.get('portal', False):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.company_id.partner_id.id
-    
-    def _get_default_email(self, cr, uid, context=None):
-        """Gives default email address for current user
-        :param context: if portal in context is false return false anyway
-        """
-        if not context.get('portal', False):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.user_email
-    
-    def _get_default_user(self, cr, uid, context=None):
-        """Gives current user id
-       :param context: if portal in context is false return false anyway
-        """
-        if context and context.get('portal', False):
-            return False
-        return uid
-
-    def _get_section(self, cr, uid, context=None):
-        """Gives section id for current User
-        """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.context_section_id.id or False
-    
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """This function returns value of partner email based on Partner Address
-        @param ids: List of case IDs
-        @param add: Id of Partner's address
-        @email: Partner's email ID
-        """
-        if not add:
-            return {'value': {'email_from': False}}
-        address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        if address.email:
-            return {'value': {'email_from': address.email, 'phone': address.phone}}
-        else:
-            return {'value': {'phone': address.phone}}
-        
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """This function returns value of partner address based on partner
-        @param ids: List of case IDs
-        @param part: Partner's id
-        @email: Partner's email ID
-        """
-        data={}
-        if  part:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-            data = {'partner_address_id': addr['contact']}
-            data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
-    
-    
-    def case_open(self, cr, uid, ids, *args):
-        """Opens Case
-        @param ids: List of case Ids
-        """
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            self.write(cr, uid, case.id, data)
-
-
-        self._action(cr, uid, cases, 'open')
-        return True
-
-    def case_close(self, cr, uid, ids, *args):
-        """Closes Case
-        @param ids: List of case Ids
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.write(cr, uid, ids, {'state': 'done',
-                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
-                                  })
-        #
-        # We use the cache of cases to keep the old case state
-        #
-        self._action(cr, uid, cases, 'done')
-        return True
-
-    def case_cancel(self, cr, uid, ids, *args):
-        """Cancels Case
-        @param ids: List of case Ids
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.write(cr, uid, ids, {'state': 'cancel',
-                                  'active': True})
-        self._action(cr, uid, cases, 'cancel')
-        for case in cases:
-            message = _("The case '%s' has been cancelled.") % (case.name,)
-            self.log(cr, uid, case.id, message)
-        return True
-
-    def case_pending(self, cr, uid, ids, *args):
-        """Marks case as pending
-        @param ids: List of case Ids
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
-        self._action(cr, uid, cases, 'pending')
-        return True
-
-    def case_reset(self, cr, uid, ids, *args):
-        """Resets case as draft
-        @param ids: List of case Ids
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
-        self._action(cr, uid, cases, 'draft')
-        return True
-    
-    def _action(self, cr, uid, cases, state_to, scrit=None, context=None):
-        if context is None:
-            context = {}
-        context['state_to'] = state_to
-        rule_obj = self.pool.get('base.action.rule')
-        model_obj = self.pool.get('ir.model')
-        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
-        rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])])
-        return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
-
-class crm_case(crm_base):
-    """
-        A simple python class to be used for common functions 
-        Object that inherit from this class should inherit from mailgate.thread
-        And need a stage_id field
-        
-        And object that inherit (orm inheritance) from a class the overwrite copy 
-    """
-
-    def _find_lost_stage(self, cr, uid, type, section_id):
-        return self._find_percent_stage(cr, uid, 0.0, type, section_id)
-
-    def _find_won_stage(self, cr, uid, type, section_id):
-        return self._find_percent_stage(cr, uid, 100.0, type, section_id)
-
-    def _find_percent_stage(self, cr, uid, percent, type, section_id):
-        """
-            Return the first stage with a probability == percent
-        """
-        stage_pool = self.pool.get('crm.case.stage')
-        if section_id :
-            ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type), ("section_ids", 'in', [section_id])])
-        else :
-            ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type)])
-
-        if ids:
-            return ids[0]
-        return False
-
-
-    def _find_first_stage(self, cr, uid, type, section_id):
-        """
-            return the first stage that has a sequence number equal or higher than sequence
-        """
-        stage_pool = self.pool.get('crm.case.stage')
-        if section_id :
-            ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type), ("section_ids", 'in', [section_id])])
-        else :
-            ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type)])
-
-        if ids:
-            stages = stage_pool.browse(cr, uid, ids)
-            stage_min = stages[0]
-            for stage in stages:
-                if stage_min.sequence > stage.sequence:
-                    stage_min = stage
-            return stage_min.id
-        else :
-            return False
-
-    def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of stage’s IDs
-            @stage_id: change state id on run time """
-
-        if not stage_id:
-            return {'value':{}}
-
-        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
-
-        if not stage.on_change:
-            return {'value':{}}
-        return {'value':{'probability': stage.probability}}
-
-    
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        """
-        Overrides orm copy 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 id: Id of mailgate thread
-        @param default: Dictionary of default values for copy.
-        @param context: A standard dictionary for contextual values
-        """
-        
-        if context is None:
-            context = {}
-        if default is None:
-            default = {}
-
-        default.update({
-                    'message_ids': [],
-                })
-        if hasattr(self, '_columns'):
-            if self._columns.get('date_closed'):
-                default.update({
-                    'date_closed': False,
-                })
-            if self._columns.get('date_open'):
-                default.update({
-                    'date_open': False
-                })
-        return super(osv.osv, self).copy(cr, uid, id, default, context=context)
-
-    
-
-    
-
-    def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
-        if index + 1 == len(stage_list):
-            return False
-        next_stage_id = stage_list[index + 1]
-        next_stage = stage_pool.browse(cr, uid, next_stage_id, context=context)
-        if not next_stage:
-            return False
-        next_seq = next_stage.sequence
-        if not current_seq :
-            current_seq = 0
-
-        if (abs(next_seq - current_seq)) >= 1:
-            return next_stage
-        else :
-            return self._find_next_stage(cr, uid, stage_list, index + 1, current_seq, stage_pool)
-
-    def stage_change(self, cr, uid, ids, context=None, order='sequence'):
-        if context is None:
-            context = {}
-
-        stage_pool = self.pool.get('crm.case.stage')
-        stage_type = context and context.get('stage_type','')
-        current_seq = False
-        next_stage_id = False
-
-        for case in self.browse(cr, uid, ids, context=context):
-
-            next_stage = False
-            value = {}
-            if case.section_id.id :
-                domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
-            else :
-                domain = [('type', '=', stage_type)]
-
-
-            stages = stage_pool.search(cr, uid, domain, order=order)
-            current_seq = case.stage_id.sequence
-            index = -1
-            if case.stage_id and case.stage_id.id in stages:
-                index = stages.index(case.stage_id.id)
-
-            next_stage = self._find_next_stage(cr, uid, stages, index, current_seq, stage_pool, context=context)
-
-            if next_stage:
-                next_stage_id = next_stage.id
-                value.update({'stage_id': next_stage.id})
-                if next_stage.on_change:
-                    value.update({'probability': next_stage.probability})
-            self.write(cr, uid, [case.id], value, context=context)
-
-
-        return next_stage_id #FIXME should return a list of all id
-
-
-    def stage_next(self, cr, uid, ids, context=None):
-        """This function computes next stage for case from its current stage
-             using available stage for that case type
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-
-        return self.stage_change(cr, uid, ids, context=context, order='sequence')
-
-    def stage_previous(self, cr, uid, ids, context=None):
-        """This function computes previous stage for case from its current stage
-             using available stage for that case type
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-        return self.stage_change(cr, uid, ids, context=context, order='sequence desc')
-
-    
-
-    
-
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
-        mailgate_pool = self.pool.get('mailgate.thread')
-        return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
-                                       subject=subject, email=email, \
-                                       details=details, email_from=email_from,\
-                                       message_id=message_id, attach=attach, \
-                                       context=context)
-
-    def case_open(self, cr, uid, ids, *args):
-        """Opens Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-
-        cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Open'))
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            self.write(cr, uid, case.id, data)
-        self._action(cr, uid, cases, 'open')
-        return True
-
-    def case_close(self, cr, uid, ids, *args):
-        """Closes Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Close'))
-        self.write(cr, uid, ids, {'state': 'done',
-                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
-                                  })
-        #
-        # We use the cache of cases to keep the old case state
-        #
-        self._action(cr, uid, cases, 'done')
-        return True
-
-    def case_escalate(self, cr, uid, ids, *args):
-        """Escalates case to top level
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            data = {'active': True}
-
-            if case.section_id.parent_id:
-                data['section_id'] = case.section_id.parent_id.id
-                if case.section_id.parent_id.change_responsible:
-                    if case.section_id.parent_id.user_id:
-                        data['user_id'] = case.section_id.parent_id.user_id.id
-            else:
-                raise osv.except_osv(_('Error !'), _('You can not escalate, You are already at the top level regarding your sales-team category.'))
-            self.write(cr, uid, [case.id], data)
-        cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Escalate'))
-        self._action(cr, uid, cases, 'escalate')
-        return True
-
-    def case_cancel(self, cr, uid, ids, *args):
-        """Cancels Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Cancel'))
-        self.write(cr, uid, ids, {'state': 'cancel',
-                                  'active': True})
-        self._action(cr, uid, cases, 'cancel')
-        for case in cases:
-            message = _("The case '%s' has been cancelled.") % (case.name,)
-            self.log(cr, uid, case.id, message)
-        return True
-
-    def case_pending(self, cr, uid, ids, *args):
-        """Marks case as pending
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Pending'))
-        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
-        self._action(cr, uid, cases, 'pending')
-        return True
-
-    def case_reset(self, cr, uid, ids, *args):
-        """Resets case as draft
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        state = 'draft' 
-        if 'crm.phonecall' in args:
-            state = 'open' 
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Draft'))
-        self.write(cr, uid, ids, {'state': state, 'active': True})
-        self._action(cr, uid, cases, state)
-        return True
-
-    def remind_partner(self, cr, uid, ids, context=None, attach=False):
-
-        """
-        @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 Remind Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        """
-
-        return self.remind_user(cr, uid, ids, context, attach,
-                destination=False)
-
-    def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's IDs to remind
-        @param context: A standard dictionary for contextual values
-        """
-        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.user_email:
-                return False
-            
-            if destination and case.section_id.user_id:
-                case_email = case.section_id.user_id.user_email
-            else:
-                case_email = case.user_id.user_email
-
-            src = case_email
-            dest = case.user_id
-            body = case.description or ""
-            if case.message_ids:
-                body = case.message_ids[0].description or ""
-            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 = None
-
-            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 = 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,)
-            tools.email_send(
-                src,
-                [dest],
-                subject,
-                body,
-                reply_to=case.section_id.reply_to or '',
-                openobject_id=str(case.id),
-                attach=attach_to_send
-            )
-            self._history(cr, uid, [case], _('Send'), history=True, subject=subject, email=dest, details=body, email_from=src)
-
-        return True
-
-    def _check(self, cr, uid, ids=False, context=None):
-        """
-        Function called by the scheduler to process cases for date actions
-        Only works on not done and cancelled cases
-
-        @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
-        """
-        cr.execute('select * from crm_case \
-                where (date_action_last<%s or date_action_last is null) \
-                and (date_action_next<=%s or date_action_next is null) \
-                and state not in (\'cancel\',\'done\')',
-                (time.strftime("%Y-%m-%d %H:%M:%S"),
-                    time.strftime('%Y-%m-%d %H:%M:%S')))
-
-        ids2 = map(lambda x: x[0], cr.fetchall() or [])
-        cases = self.browse(cr, uid, ids2, context=context)
-        return self._action(cr, uid, cases, False, context=context)
-
-    
-
-    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_followers(self, cr, uid, ids, context=None):
-        """ Get a list of emails of the people following this thread
-        """
-        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.user_email:
-                l.append(case.user_id.user_email)
-            res[case.id] = l
-        return res
-
+class crm_case_channel(osv.osv):
+    _name = "crm.case.channel"
+    _description = "Channels"
+    _order = 'name'
+    _columns = {
+        'name': fields.char('Channel Name', size=64, required=True),
+        'active': fields.boolean('Active'),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+    }
 
 class crm_case_stage(osv.osv):
     """ Stage of case """
@@ -630,42 +64,21 @@ class crm_case_stage(osv.osv):
     _rec_name = 'name'
     _order = "sequence"
 
-
-
-    def _get_type_value(self, cr, user, context):
-        return [('lead','Lead'),('opportunity','Opportunity')]
-
-
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
+        'sequence': fields.integer('Sequence', help="Used to order stages."),
         'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
-        'on_change': fields.boolean('Change Probability Automatically', \
-                         help="Change Probability on next and previous stages."),
+        'on_change': fields.boolean('Change Probability Automatically', help="Setting this stage will change the probability automatically on the opportunity."),
         'requirements': fields.text('Requirements'),
-        'type': fields.selection(_get_type_value, 'Type', required=True),
+        'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
+        '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."),
     }
 
-
-    def _find_stage_type(self, cr, uid, context=None):
-        """Finds type of stage according to object.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        type = context and context.get('type', '') or ''
-        return type
-
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'type': _find_stage_type,
     }
 
-crm_case_stage()
-
-
 class crm_case_section(osv.osv):
     """Sales Team"""
 
@@ -683,60 +96,37 @@ class crm_case_section(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to "\
                         "true, it will allow you to hide the sales team without removing it."),
         'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
-        'change_responsible': fields.boolean('Change Responsible', help="Thick this box if you want that on escalation, the responsible of this sale team automatically becomes responsible of the lead/opportunity escaladed"),
-        'user_id': fields.many2one('res.users', 'Responsible User'),
+        'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the saleman 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'),
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
-        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time"),
+        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
         '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'),
     }
+    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': lambda *a: 1,
         'allow_unlink': lambda *a: 1,
+        'stage_ids': _get_stage_common
     }
 
     _sql_constraints = [
         ('code_uniq', 'unique (code)', 'The code of the sales team must be unique !')
     ]
 
-    def _check_recursion(self, cr, uid, ids, context=None):
-
-        """
-        Checks for recursion level for sales team
-        @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 Sales team ids
-        """
-        level = 100
-
-        while len(ids):
-            cr.execute('select distinct parent_id from crm_case_section where id IN %s', (tuple(ids),))
-            ids = filter(None, map(lambda x: x[0], cr.fetchall()))
-            if not level:
-                return False
-            level -= 1
-
-        return True
-
     _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive Sales team.', ['parent_id'])
+        (osv.osv._check_recursion, 'Error ! You cannot create recursive Sales team.', ['parent_id'])
     ]
 
     def name_get(self, cr, uid, ids, context=None):
-        """Overrides orm name_get 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 sales team ids
-        """
-        if context is None:
-            context = {}
+        """Overrides orm name_get method"""
         if not isinstance(ids, list) : 
             ids = [ids]
         res = []
@@ -751,9 +141,6 @@ class crm_case_section(osv.osv):
             res.append((record['id'], name))
         return res
 
-crm_case_section()
-
-
 class crm_case_categ(osv.osv):
     """ Category of Case """
     _name = "crm.case.categ"
@@ -765,32 +152,14 @@ class crm_case_categ(osv.osv):
     }
 
     def _find_object_id(self, cr, uid, context=None):
-        """Finds id for case object
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-
+        """Finds id for case object"""
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]
+        return ids and ids[0] or False
 
     _defaults = {
         'object_id' : _find_object_id
-
     }
-crm_case_categ()
-
-
-class crm_case_stage(osv.osv):
-    _inherit = "crm.case.stage"
-    _columns = {
-        'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
-    }
-
-crm_case_stage()
-
 
 class crm_case_resource_type(osv.osv):
     """ Resource Type of case """
@@ -801,16 +170,394 @@ class crm_case_resource_type(osv.osv):
         'name': fields.char('Campaign Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
-crm_case_resource_type()
 
+class crm_base(object):
+    """ Base utility mixin class for crm objects,
+    Object subclassing this should define colums:
+        date_open
+        date_closed
+        user_id
+        partner_id
+        partner_address_id
+    """
+    def _get_default_partner_address(self, cr, uid, context=None):
+        """Gives id of default address for current user
+        :param context: if portal in context is false return false anyway
+        """
+        if context is None:
+            context = {}
+        if not context.get('portal'):
+            return False
+        # was user.address_id.id, but address_id has been removed
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if hasattr(user, 'partner_address_id') and user.partner_address_id:
+            return user.partner_address_id
+        return False
+
+    def _get_default_partner(self, cr, uid, context=None):
+        """Gives id of partner for current user
+        :param context: if portal in context is false return false anyway
+        """
+        if context is None:
+            context = {}
+        if not context.get('portal', False):
+            return False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if hasattr(user, 'partner_address_id') and user.partner_address_id:
+            return user.partner_address_id
+        return user.company_id.partner_id.id
+
+    def _get_default_email(self, cr, uid, context=None):
+        """Gives default email address for current user
+        :param context: if portal in context is false return false anyway
+        """
+        if not context.get('portal', False):
+            return False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.user_email
+
+    def _get_default_user(self, cr, uid, context=None):
+        """Gives current user id
+       :param context: if portal in context is false return false anyway
+        """
+        if context and context.get('portal', False):
+            return False
+        return uid
+
+    def _get_section(self, cr, uid, context=None):
+        """Gives section id for current User
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.context_section_id.id or False
+
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        """This function returns value of partner email based on Partner Address
+        :param ids: List of case IDs
+        :param add: Id of Partner's address
+        :param email: Partner's email ID
+        """
+        data = {'value': {'email_from': False, 'phone':False}}
+        if add:
+            address = self.pool.get('res.partner.address').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']
+        return data
+
+    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+        """This function returns value of partner address based on partner
+        :param ids: List of case IDs
+        :param part: Partner's id
+        :param email: Partner's email ID
+        """
+        data={}
+        if  part:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
+            data = {'partner_address_id': addr['contact']}
+            data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+        return {'value': data}
+
+    def case_open(self, cr, uid, ids, *args):
+        """Opens Case
+        :param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            self.write(cr, uid, case.id, data)
+
+        self._action(cr, uid, cases, 'open')
+        return True
+
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case
+        :param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), })
+        # We use the cache of cases to keep the old case state
+        self._action(cr, uid, cases, 'done')
+        return True
+
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case
+        :param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'cancel', 'active': True})
+        # We use the cache of cases to keep the old case state
+        self._action(cr, uid, cases, 'cancel')
+        return True
+
+    def case_pending(self, cr, uid, ids, *args):
+        """Marks case as pending
+        :param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._action(cr, uid, cases, 'pending')
+        return True
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft
+        :param ids: List of case Ids
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
+        self._action(cr, uid, cases, 'draft')
+        return True
+
+    def _action(self, cr, uid, cases, state_to, scrit=None, context=None):
+        if context is None:
+            context = {}
+        context['state_to'] = state_to
+        rule_obj = self.pool.get('base.action.rule')
+        model_obj = self.pool.get('ir.model')
+        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
+        rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])])
+        return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
+
+class crm_case(crm_base):
+    """ A simple python class to be used for common functions 
+    Object that inherit from this class should inherit from mailgate.thread
+    And need a stage_id field
+    And object that inherit (orm inheritance) from a class the overwrite copy 
+    """
+
+    def stage_find(self, cr, uid, section_id, domain=[], order='sequence'):
+        domain = list(domain)
+        if section_id:
+            domain.append(('section_ids', '=', section_id))
+        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, domain, order=order)
+        if stage_ids:
+            return stage_ids[0]
+        return False
+
+    def stage_set(self, cr, uid, ids, stage_id, context=None):
+        value = {}
+        if hasattr(self,'onchange_stage_id'):
+            value = self.onchange_stage_id(cr, uid, ids, stage_id)['value']
+        value['stage_id'] = stage_id
+        return self.write(cr, uid, ids, value, context=context)
+
+    def stage_change(self, cr, uid, ids, op, order, context=None):
+        if context is None:
+            context = {}
+        for case in self.browse(cr, uid, ids, context=context):
+            seq = 0
+            if case.stage_id:
+                seq = case.stage_id.sequence
+            section_id = None
+            if case.section_id:
+                section_id = case.section_id.id
+            next_stage_id = self.stage_find(cr, uid, section_id, [('sequence',op,seq)],order)
+            if next_stage_id:
+                return self.stage_set(cr, uid, [case.id], next_stage_id, context=context)
+        return False
+
+    def stage_next(self, cr, uid, ids, context=None):
+        """This function computes next stage for case from its current stage
+        using available stage for that case type
+        """
+        return self.stage_change(cr, uid, ids, '>','sequence', context)
+
+    def stage_previous(self, cr, uid, ids, context=None):
+        """This function computes previous stage for case from its current
+        stage using available stage for that case type
+        """
+        return self.stage_change(cr, uid, ids, '<', 'sequence desc', context)
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        """Overrides orm copy method to avoid copying messages,
+           as well as date_closed and date_open columns if they
+           exist."""
+        if default is None:
+            default = {}
+
+        default.update({ 'message_ids': [], })
+        if hasattr(self, '_columns'):
+            if self._columns.get('date_closed'):
+                default.update({ 'date_closed': False, })
+            if self._columns.get('date_open'):
+                default.update({ 'date_open': False })
+        return super(crm_case, self).copy(cr, uid, id, default, context=context)
+
+
+    def case_open(self, cr, uid, ids, *args):
+        """Opens Case"""
+        cases = self.browse(cr, uid, ids)
+        self.message_append(cr, uid, cases, _('Open'))
+        for case in cases:
+            data = {'state': 'open', 'active': True }
+            if not case.user_id:
+                data['user_id'] = uid
+            self.write(cr, uid, case.id, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case"""
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.message_append(cr, uid, cases, _('Close'))
+        self.write(cr, uid, ids, {'state': 'done',
+                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                  })
+        #
+        # We use the cache of cases to keep the old case state
+        #
+        self._action(cr, uid, cases, 'done')
+        return True
+
+    def case_escalate(self, cr, uid, ids, *args):
+        """Escalates case to parent level"""
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'active': True}
+            if case.section_id.parent_id:
+                data['section_id'] = case.section_id.parent_id.id
+                if case.section_id.parent_id.change_responsible:
+                    if case.section_id.parent_id.user_id:
+                        data['user_id'] = case.section_id.parent_id.user_id.id
+            else:
+                raise osv.except_osv(_('Error !'), _('You can not escalate, You are already at the top level regarding your sales-team category.'))
+            self.write(cr, uid, [case.id], data)
+        cases = self.browse(cr, uid, ids)
+        self.message_append(cr, uid, cases, _('Escalate'))
+        self._action(cr, uid, cases, 'escalate')
+        return True
+
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case"""
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.message_append(cr, uid, cases, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel',
+                                  'active': True})
+        self._action(cr, uid, cases, 'cancel')
+        for case in cases:
+            message = _("The case '%s' has been cancelled.") % (case.name,)
+            self.log(cr, uid, case.id, message)
+        return True
+
+    def case_pending(self, cr, uid, ids, *args):
+        """Marks case as pending"""
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.message_append(cr, uid, cases, _('Pending'))
+        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._action(cr, uid, cases, 'pending')
+        return True
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft"""
+        state = 'draft'
+        if 'crm.phonecall' in args:
+            state = 'open'
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self.message_append(cr, uid, cases, _('Draft'))
+        self.write(cr, uid, ids, {'state': state, 'active': True})
+        self._action(cr, uid, cases, state)
+        return True
+
+    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.user_email:
+                return False
+            if destination and case.section_id.user_id:
+                case_email = case.section_id.user_id.user_email
+            else:
+                case_email = case.user_id.user_email
+
+            src = case_email
+            dest = case.user_id.user_email or ""
+            body = case.description or ""
+            for message in case.message_ids:
+                if message.email_from:
+                    body = message.description
+                    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='crm.case',
+                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
+           Only works on not done and cancelled cases
+        """
+        cr.execute('select * from crm_case \
+                where (date_action_last<%s or date_action_last is null) \
+                and (date_action_next<=%s or date_action_next is null) \
+                and state not in (\'cancel\',\'done\')',
+                (time.strftime("%Y-%m-%d %H:%M:%S"),
+                    time.strftime('%Y-%m-%d %H:%M:%S')))
+
+        ids2 = map(lambda x: x[0], cr.fetchall() or [])
+        cases = self.browse(cr, uid, ids2, context=context)
+        return self._action(cr, uid, cases, False, context=context)
+
+    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.user_email:
+                l.append(case.user_id.user_email)
+            res[case.id] = l
+        return res
 
 def _links_get(self, cr, uid, context=None):
-    """Gets links value for reference field
-    @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
-    """
+    """Gets links value for reference field"""
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
@@ -826,17 +573,10 @@ class users(osv.osv):
     def create(self, cr, uid, vals, context=None):
         res = super(users, self).create(cr, uid, vals, context=context)
         section_obj=self.pool.get('crm.case.section')
-
-        if vals.get('context_section_id', False):
+        if vals.get('context_section_id'):
             section_obj.write(cr, uid, [vals['context_section_id']], {'member_ids':[(4, res)]}, context)
         return res
+
 users()
 
-
-class res_partner(osv.osv):
-    _inherit = 'res.partner'
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-    }
-res_partner()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 31dcc0be56a..3947eb58156 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -40,12 +40,12 @@ 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."),
+        '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.user_email:
@@ -58,15 +58,10 @@ this if you want the rule to send an email to the partner."),
         else:
             reply_to = emailfrom
         if not emailfrom:
-            raise osv.except_osv(_('Error!'),
-                    _("No E-Mail ID Found for your Company address!"))
-        return tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, openobject_id=str(obj.id))
+            raise osv.except_osv(_('Error!'), _("No E-Mail 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)
 
     def do_check(self, cr, uid, action, obj, context=None):
-        """ @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values"""
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
 
         if hasattr(obj, 'section_id'):
@@ -74,9 +69,8 @@ this if you want the rule to send an email to the partner."),
         if hasattr(obj, 'categ_id'):
             ok = ok and (not action.trg_categ_id or action.trg_categ_id.id == obj.categ_id.id)
 
-        #Cheking for history 
+        #Cheking for history
         regex = action.regex_history
-        result_history = True
         if regex:
             res = False
             ptrn = re.compile(str(regex))
@@ -85,26 +79,19 @@ this if you want the rule to send an email to the partner."),
                 if _result:
                     res = True
                     break
-            result_history = res
-        ok = ok and (not regex or result_history)
+            ok = ok and res
 
-        res_count = True
         if action.trg_max_history:
             res_count = False
-            history_ids = filter(lambda x: x.history, obj.message_ids)
+            history_ids = filter(lambda x: x.email_from, obj.message_ids)
             if len(history_ids) <= action.trg_max_history:
                 res_count = True
-        ok = ok and res_count
+            ok = ok and res_count
         return ok
 
     def do_action(self, cr, uid, action, model_obj, obj, context=None):
-        """ @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values """
         res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
         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
@@ -118,10 +105,11 @@ this if you want the rule to send an email to the partner."),
                 write['email_cc'] = obj.act_email_cc
 
         # Put state change by rule in communication history
-        if hasattr(obj, 'state') and action.act_state:
-            model_obj._history(cr, uid, [obj], _(action.act_state))
+        if hasattr(obj, 'state') and hasattr(obj, 'message_append') and action.act_state:
+            model_obj.message_append(cr, uid, [obj], _(action.act_state))
 
         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:
@@ -134,22 +122,12 @@ this if you want the rule to send an email to the partner."),
 
 
     def state_get(self, cr, uid, context=None):
-        """Gets available states for crm
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values """
+        """Gets available states for crm"""
         res = super(base_action_rule, self).state_get(cr, uid, context=context)
         return res + crm.AVAILABLE_STATES
 
     def priority_get(self, cr, uid, context=None):
-        """@param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values """
         res = super(base_action_rule, self).priority_get(cr, uid, context=context)
         return res + crm.AVAILABLE_PRIORITIES
 
-base_action_rule()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index e494db325e5..bab3e4bca5f 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="crm.case.channel">
+            <field name="name">website</field>
+        </record>
+        <record model="crm.case.channel">
+            <field name="name">phone</field>
+        </record>
+        <record model="crm.case.channel">
+            <field name="name">direct</field>
+        </record>
+        <record model="crm.case.channel">
+            <field name="name">e-mail</field>
+        </record>
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
             <field name="code">Sales</field>
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
deleted file mode 100644
index 595cfbc2382..00000000000
--- a/addons/crm/crm_installer.py
+++ /dev/null
@@ -1,57 +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 lxml import etree
-from osv import fields, osv
-
-class crm_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
-        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird Plug-In', help="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."),
-        'outlook': fields.boolean('MS-Outlook Plug-In', help="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."),
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
-        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(crm_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        #Checking sale module is installed or not
-        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
-        count = cr.fetchall()
-        if count:
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='sale_crm']")
-            for node in nodes:
-                node.set('invisible', '0')
-            res['arch'] = etree.tostring(doc)
-        return res
-
-crm_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 9e820075aa7..ecaec91cef6 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -1,31 +1,8 @@
 <openerp>
   <data>
-    <record id="view_crm_installer" model="ir.ui.view">
-      <field name="name">crm.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='crm']" position="replace">
-            <newline/>
-            <separator string="Customer Relationship Management Features" colspan="4"/>
-            <field name="crm_claim" groups="base.group_extended"/>
-            <field name="crm_helpdesk" groups="base.group_extended"/>
-            <field name="crm_fundraising" groups="base.group_extended"/>
-            <field name="wiki_sale_faq" groups="base.group_extended"/>
-            <field name="sale_crm" invisible="1" groups="base.group_extended"/>
-            <field name="crm_caldav"/>
-            <field name="fetchmail"/>
-            <field name="thunderbird"/>
-            <field name="outlook"/>
-          </xpath>
-        </data>
-      </field>
-    </record>
     
     <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
-        <field name="name">Create Sales Team</field>
+        <field name="name">Define Sales Team</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">crm.case.section</field>
         <field name="view_type">form</field>
@@ -38,6 +15,7 @@
         <field name="action_id" ref="crm_case_section_view_form_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
         <field name="sequence">10</field>
+        <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
     </record>
 
     <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
@@ -46,6 +24,7 @@
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{'default_case_default': 1}</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
         <field name="help">Stages will allow salesmen to easily track how a specific opportunity is positioned in the sales cycle. In order to efficiently manage your sales pipeline, it's important to define conditions to go to the next step. Example: to set an opportunity as 'Qualified', you must set the "Expected Revenue" and the "Expected Closing Date." You should also have a look at the tooltip of the field "Change Probability Automatically".</field>
     </record>
@@ -53,8 +32,8 @@
     <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="crm_case_stage_form_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
-        <field name="sequence">10</field>
+        <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
+        <field name="sequence">9</field>
     </record>
-
   </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 294c5dfbf56..e74ce00d728 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -39,8 +39,35 @@ class crm_lead(crm_case, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead/Opportunity"
-    _order = "date_action, priority, id desc"
-    _inherit = ['mailgate.thread','res.partner.address']
+    _order = "priority,date_action,id desc"
+    _inherit = ['mail.thread','res.partner.address']
+
+    def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+        access_rights_uid = access_rights_uid or uid
+        stage_obj = self.pool.get('crm.case.stage')
+        order = stage_obj._order
+        if read_group_order == 'stage_id desc':
+            # lame hack to allow reverting search, should just work in the trivial case
+            order = "%s desc" % order
+        stage_ids = stage_obj._search(cr, uid, ['|', ('id','in',ids),('case_default','=',1)], 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
+
+    _group_by_full = {
+        'stage_id': _read_group_stage_ids
+    }
+
+    # overridden because res.partner.address has an inconvenient name_get,
+    # especially if base_contact is installed.
+    def name_get(self, cr, user, ids, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        return [(r['id'], tools.ustr(r[self._rec_name]))
+                    for r in self.read(cr, user, ids, [self._rec_name], context)]
+
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
         @param cr: the current row, from the database cursor,
@@ -100,8 +127,8 @@ class crm_lead(crm_case, osv.osv):
 
     def _history_search(self, cr, uid, obj, name, args, context=None):
         res = []
-        msg_obj = self.pool.get('mailgate.message')
-        message_ids = msg_obj.search(cr, uid, [('history','=',True), ('name', args[0][1], args[0][2])], context=context)
+        msg_obj = self.pool.get('mail.message')
+        message_ids = msg_obj.search(cr, uid, [('email_from','!=',False), ('subject', args[0][1], args[0][2])], context=context)
         lead_ids = self.search(cr, uid, [('message_ids', 'in', message_ids)], context=context)
 
         if lead_ids:
@@ -114,8 +141,8 @@ class crm_lead(crm_case, osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = ''
             for msg in obj.message_ids:
-                if msg.history:
-                    res[obj.id] = msg.name
+                if msg.email_from:
+                    res[obj.id] = msg.subject
                     break
         return res
 
@@ -124,38 +151,32 @@ class crm_lead(crm_case, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null',
             select=True, help="Optional linked partner, usually after conversion of the lead"),
 
-        # From crm.case
-        'id': fields.integer('ID'),
-        'name': fields.char('Name', size=64),
+        'id': fields.integer('ID', readonly=True),
+        'name': fields.char('Name', size=64, select=1),
         'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
-        'email_from': fields.char('Email', size=128, help="E-mail address of the contact"),
+        'email_from': fields.char('Email', size=128, help="E-mail address of the contact", select=1),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                        select=True, help='Sales team to which this case belongs to. Defines responsible user and e-mail address for the mail gateway.'),
+                        select=True, help='When sending mails, the default email address is taken from the sales team.'),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'email_cc': fields.text('Global CC', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'description': fields.text('Notes'),
         'write_date': fields.datetime('Update Date' , readonly=True),
 
-        # Lead fields
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
             domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"),
-        'channel_id': fields.many2one('res.partner.canal', 'Channel', help="From which channel (mail, direct, phone, ...) did this contact reach you?"),
+        'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
         'contact_name': fields.char('Contact Name', size=64),
-        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity'),
+        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity', select=1),
         'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
         'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
-        'type':fields.selection([
-            ('lead','Lead'),
-            ('opportunity','Opportunity'),
-
-        ],'Type', help="Type is used to separate Leads and Opportunities"),
+        'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','lead')]"),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
         'user_id': fields.many2one('res.users', 'Salesman'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -168,11 +189,29 @@ class crm_lead(crm_case, osv.osv):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
-    }
 
 
+        # Only used for type opportunity
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"), 
+        'probability': fields.float('Probability (%)',group_operator="avg"),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'ref': fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'phone': fields.char("Phone", size=64),
+        'date_deadline': fields.date('Expected Closing'),
+        'date_action': fields.date('Next Action Date'),
+        'title_action': fields.char('Next Action', size=64),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
+        'color': fields.integer('Color Index'),
+        'partner_address_name': fields.related('partner_address_id', 'name', type='char', string='Partner Contact Name', readonly=True),
+        'company_currency': fields.related('company_id', 'currency_id', 'symbol', type='char', string='Company Currency', readonly=True),
+        'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
+        'user_login': fields.related('user_id', 'login', type='char', string='User Login', readonly=True),
+
+    }
+
     _defaults = {
         'active': lambda *a: 1,
         'user_id': crm_case._get_default_user,
@@ -182,85 +221,138 @@ class crm_lead(crm_case, osv.osv):
         'section_id': crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-        #'stage_id': _get_stage_id,
+        'color': 0,
     }
 
-
-
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         """This function returns value of partner email based on Partner Address
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param add: Id of Partner's address
-        @email: Partner's email ID
         """
         if not add:
             return {'value': {'email_from': False, 'country_id': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
         return {'value': {'email_from': address.email, 'phone': address.phone, 'country_id': address.country_id.id}}
 
-    def case_open(self, cr, uid, ids, *args):
-        """Overrides cancel for crm_case for setting Open Date
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+    def on_change_optin(self, cr, uid, ids, optin):
+        return {'value':{'optin':optin,'optout':False}}
+
+    def on_change_optout(self, cr, uid, ids, optout):
+        return {'value':{'optout':optout,'optin':False}}
+
+    def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+        if not stage_id:
+            return {'value':{}}
+        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
+        if not stage.on_change:
+            return {'value':{}}
+        return {'value':{'probability': stage.probability}}
+
+    def stage_find_percent(self, cr, uid, percent, section_id):
+        """ Return the first stage with a probability == percent
         """
-        leads = self.browse(cr, uid, ids)
+        stage_pool = self.pool.get('crm.case.stage')
+        if section_id :
+            ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("section_ids", 'in', [section_id])])
+        else :
+            ids = stage_pool.search(cr, uid, [("probability", '=', percent)])
 
+        if ids:
+            return ids[0]
+        return False
 
+    def stage_find_lost(self, cr, uid, section_id):
+        return self.stage_find_percent(cr, uid, 0.0, section_id)
 
-        for i in xrange(0, len(ids)):
-            if leads[i].state == 'draft':
-                value = {}
-                if not leads[i].stage_id :
-                    stage_id = self._find_first_stage(cr, uid, leads[i].type, leads[i].section_id.id or False)
-                    value.update({'stage_id' : stage_id})
-                value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
-                self.write(cr, uid, [ids[i]], value)
-            self.log_open( cr, uid, leads[i])
+    def stage_find_won(self, cr, uid, section_id):
+        return self.stage_find_percent(cr, uid, 100.0, section_id)
+
+    def case_open(self, cr, uid, ids, *args):
+        for l in self.browse(cr, uid, ids):
+            # When coming from draft override date and stage otherwise just set state
+            if l.state == 'draft':
+                if l.type == 'lead':
+                    message = _("The lead '%s' has been opened.") % l.name
+                elif l.type == 'opportunity':
+                    message = _("The opportunity '%s' has been opened.") % l.name
+                else:
+                    message = _("The case '%s' has been opened.") % l.name
+                self.log(cr, uid, l.id, message)
+                value = {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')}
+                self.write(cr, uid, [l.id], value)
+                if l.type == 'opportunity' and not l.stage_id:
+                    stage_id = self.stage_find(cr, uid, l.section_id.id or False, [('sequence','>',0)])
+                    if stage_id:
+                        self.stage_set(cr, uid, [l.id], stage_id)
         res = super(crm_lead, self).case_open(cr, uid, ids, *args)
         return res
 
-    def log_open(self, cr, uid, case):
-        if case.type == 'lead':
-            message = _("The lead '%s' has been opened.") % case.name
-        elif case.type == 'opportunity':
-            message = _("The opportunity '%s' has been opened.") % case.name
-        else:
-            message = _("The case '%s' has been opened.") % case.name
-        self.log(cr, uid, case.id, message)
-
     def case_close(self, cr, uid, ids, *args):
-        """Overrides close for crm_case for setting close 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 ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
         res = super(crm_lead, self).case_close(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         for case in self.browse(cr, uid, ids):
             if case.type == 'lead':
                 message = _("The lead '%s' has been closed.") % case.name
-            elif case.type == 'opportunity':
-                message = _("The opportunity '%s' has been closed.") % case.name
             else:
                 message = _("The case '%s' has been closed.") % case.name
             self.log(cr, uid, case.id, message)
         return res
 
+    def case_cancel(self, cr, uid, ids, *args):
+        """Overrides cancel for crm_case for setting probability
+        """
+        res = super(crm_lead, self).case_cancel(cr, uid, ids, args)
+        self.write(cr, uid, ids, {'probability' : 0.0})
+        return res
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Overrides reset as draft in order to set the stage field as empty
+        """
+        res = super(crm_lead, self).case_reset(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'stage_id': False, 'probability': 0.0})
+        return res
+
+    def case_mark_lost(self, cr, uid, ids, *args):
+        """Mark the case as lost: state = done and probability = 0%
+        """
+        res = super(crm_lead, self).case_close(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'probability' : 0.0})
+        for l in self.browse(cr, uid, ids):
+            stage_id = self.stage_find_lost(cr, uid, l.section_id.id or False)
+            if stage_id:
+                self.stage_set(cr, uid, [l.id], stage_id)
+            message = _("The opportunity '%s' has been marked as lost.") % l.name
+            self.log(cr, uid, l.id, message)
+        return res
+
+    def case_mark_won(self, cr, uid, ids, *args):
+        """Mark the case as lost: state = done and probability = 0%
+        """
+        res = super(crm_lead, self).case_close(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'probability' : 100.0})
+        for l in self.browse(cr, uid, ids):
+            stage_id = self.stage_find_won(cr, uid, l.section_id.id or False)
+            if stage_id:
+                self.stage_set(cr, uid, [l.id], stage_id)
+            message = _("The opportunity '%s' has been been won.") % l.name
+            self.log(cr, uid, l.id, message)
+        return res
+
+    def set_priority(self, cr, uid, ids, priority):
+        """Set lead priority
+        """
+        return self.write(cr, uid, ids, {'priority' : priority})
+
+    def set_high_priority(self, cr, uid, ids, *args):
+        """Set lead priority to high
+        """
+        return self.set_priority(cr, uid, ids, '1')
+
+    def set_normal_priority(self, cr, uid, ids, *args):
+        """Set lead priority to normal
+        """
+        return self.set_priority(cr, uid, ids, '3')
+
     def convert_opportunity(self, cr, uid, ids, context=None):
         """ Precomputation for converting lead to opportunity
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of closeday’s IDs
-        @param context: A standard dictionary for contextual values
-        @return: Value of action in dict
         """
         if context is None:
             context = {}
@@ -290,65 +382,14 @@ class crm_lead(crm_case, osv.osv):
             }
         return value
 
-    def write(self, cr, uid, ids, vals, context=None):
-        if not context:
-            context = {}
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """Automatically calls when new email message arrives"""
+        res_id = super(crm_lead, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
+        subject = msg.get('subject')  or _("No Subject")
+        body = msg.get('body_text')
 
-        if 'date_closed' in vals:
-            return super(crm_lead,self).write(cr, uid, ids, vals, context=context)
-
-        if 'stage_id' in vals and vals['stage_id']:
-            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
-            self.history(cr, uid, ids, _("Changed Stage to: %s") % stage_obj.name, details=_("Changed Stage to: %s") % stage_obj.name)
-            message=''
-            for case in self.browse(cr, uid, ids, context=context):
-                if case.type == 'lead' or  context.get('stage_type',False)=='lead':
-                    message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
-                elif case.type == 'opportunity':
-                    message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
-                self.log(cr, uid, case.id, message)
-        return super(crm_lead,self).write(cr, uid, ids, vals, context)
-
-    def stage_next(self, cr, uid, ids, context=None):
-        stage = super(crm_lead, self).stage_next(cr, uid, ids, context=context)
-        if stage:
-            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-            if stage_obj.on_change:
-                data = {'probability': stage_obj.probability}
-                self.write(cr, uid, ids, data)
-        return stage
-
-    def stage_previous(self, cr, uid, ids, context=None):
-        stage = super(crm_lead, self).stage_previous(cr, uid, ids, context=context)
-        if stage:
-            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-            if stage_obj.on_change:
-                data = {'probability': stage_obj.probability}
-                self.write(cr, uid, ids, data)
-        return stage
-
-    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(_('Warning !'),
-                    _('You can not delete this lead. You should better cancel it.'))
-        return super(crm_lead, self).unlink(cr, uid, ids, context)
-
-    def message_new(self, cr, uid, msg, context=None):
-        """
-        Automatically calls when new email message arrives
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        """
-        mailgate_pool = self.pool.get('email.server.tools')
-
-        subject = msg.get('subject') or _("No Subject")
-        body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -356,48 +397,27 @@ class crm_lead(crm_case, osv.osv):
             'description': body,
             'user_id': False,
         }
-        if msg.get('priority', False):
+        if priority:
             vals['priority'] = priority
+        vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
+        self.write(cr, uid, [res_id], vals, context)
+        return res_id
 
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from') or msg.get_unixfrom())
-        if res:
-            vals.update(res)
-
-        res = self.create(cr, uid, vals, context)
-        attachents = msg.get('attachments', [])
-        for attactment in attachents or []:
-            data_attach = {
-                'name': attactment,
-                'datas':binascii.b2a_base64(str(attachents.get(attactment))),
-                'datas_fname': attactment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
-
-        return res
-
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs
-        """
+    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
 
+        super(crm_lead, self).message_update(cr, uid, ids, msg, context=context)
+
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             vals['priority'] = msg.get('priority')
-
         maps = {
             'cost':'planned_cost',
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
         vls = {}
-        for line in msg['body'].split('\n'):
+        for line in msg['body_text'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
@@ -415,23 +435,79 @@ class crm_lead(crm_case, osv.osv):
             res = self.write(cr, uid, [case.id], values, context=context)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-
-        """ Send The Message
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param *args: Return Tuple Value
-            @param **args: Return Dictionary of Keyword Value
+    def action_makeMeeting(self, cr, uid, ids, context=None):
         """
-        return True
+        This opens Meeting's calendar view to schedule meeting on current Opportunity
+        @return : Dictionary value for created Meeting view
+        """
+        value = {}
+        for opp in self.browse(cr, uid, ids, context=context):
+            data_obj = self.pool.get('ir.model.data')
 
-    def on_change_optin(self, cr, uid, ids, optin):
-        return {'value':{'optin':optin,'optout':False}}
+            # Get meeting views
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-    def on_change_optout(self, cr, uid, ids, optout):
-        return {'value':{'optout':optout,'optin':False}}
+            context = {
+                'default_opportunity_id': opp.id,
+                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
+                'default_user_id': uid, 
+                'default_section_id': opp.section_id and opp.section_id.id or False,
+                'default_email_from': opp.email_from,
+                'default_state': 'open',  
+                'default_name': opp.name
+            }
+            value = {
+                'name': _('Meetings'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'],
+                'nodestroy': True
+            }
+        return value
+
+
+    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(_('Warning !'),
+                    _('You can not delete this lead. You should better cancel it.'))
+        return super(crm_lead, self).unlink(cr, uid, ids, context)
+
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if not context:
+            context = {}
+
+        if 'date_closed' in vals:
+            return super(crm_lead,self).write(cr, uid, ids, vals, context=context)
+
+        if 'stage_id' in vals and vals['stage_id']:
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
+            text = _("Changed Stage to: %s") % stage_obj.name
+            self.message_append(cr, uid, ids, text, body_text=text, context=context)
+            message=''
+            for case in self.browse(cr, uid, ids, context=context):
+                if case.type == 'lead' or  context.get('stage_type',False)=='lead':
+                    message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+                elif case.type == 'opportunity':
+                    message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+                self.log(cr, uid, case.id, message)
+        return super(crm_lead,self).write(cr, uid, ids, vals, context)
 
 crm_lead()
 
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 3cb34c49299..aaa00307bfe 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -2,97 +2,125 @@
 <openerp>
     <data noupdate="1">
 
-	<record model="crm.case.stage" id="stage_lead6">
+        <!-- Crm stages -->
+        <record model="crm.case.stage" id="stage_lead6">
             <field name="name">Lost</field>
+            <field eval="1" name="case_default"/>
             <field eval="'0'" name="probability"/>
             <field eval="'0'" name="sequence"/>
-            <field name="type">lead</field>
         </record>
-        <!--        CASE STATUS(stage_id)        -->
         <record model="crm.case.stage" id="stage_lead1">
             <field name="name">New</field>
+            <field eval="1" name="case_default"/>
             <field eval="'10'" name="probability"/>
-            <field eval="'1'" name="sequence"/>
-            <field name="type">lead</field>
+            <field eval="'11'" name="sequence"/>
         </record>
-
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Qualification</field>
+            <field eval="1" name="case_default"/>
             <field eval="'20'" name="probability"/>
-            <field eval="'2'" name="sequence"/>
-            <field name="type">lead</field>
+            <field eval="'12'" name="sequence"/>
         </record>
-
         <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Proposition</field>
+            <field eval="1" name="case_default"/>
             <field eval="'40'" name="probability"/>
-            <field eval="'3'" name="sequence"/>
-            <field name="type">lead</field>
+            <field eval="'13'" name="sequence"/>
         </record>
-
         <record model="crm.case.stage" id="stage_lead4">
             <field name="name">Negotiation</field>
+            <field eval="1" name="case_default"/>
             <field eval="'60'" name="probability"/>
-            <field eval="'4'" name="sequence"/>
-            <field name="type">lead</field>
+            <field eval="'14'" name="sequence"/>
         </record>
-
         <record model="crm.case.stage" id="stage_lead5">
             <field name="name">Won</field>
+            <field eval="1" name="case_default"/>
             <field eval="'100'" name="probability"/>
-            <field eval="'5'" name="sequence"/>
+            <field eval="'15'" name="sequence"/>
             <field eval="1" name="on_change"/>
-            <field name="type">lead</field>
         </record>
-
-        
-
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
             <field name="code">Sales</field>
             <field name="stage_ids" eval="[(4, ref('stage_lead1')), (4, ref('stage_lead2')), (4, ref('stage_lead3')), (4, ref('stage_lead4')), (4, ref('stage_lead5')), (4, ref('stage_lead6'))]"/>
         </record>
 
-    <!--        CASE CATEGORY2(category2_id)        -->
+        <!-- Crm campain -->
         <record model="crm.case.resource.type" id="type_lead1">
             <field name="name">Telesales</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
-
         <record model="crm.case.resource.type" id="type_lead2">
             <field name="name">Mail Campaign 1</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
-
         <record model="crm.case.resource.type" id="type_lead3">
             <field name="name">Mail Campaign 2</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
-
         <record model="crm.case.resource.type" id="type_lead4">
             <field name="name">Twitter Ads</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
-
         <record model="crm.case.resource.type" id="type_lead5">
             <field name="name">Google Adwords</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
-
         <record model="crm.case.resource.type" id="type_lead6">
             <field name="name">Google Adwords 2</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
-
         <record model="crm.case.resource.type" id="type_lead7">
             <field name="name">Television</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
-
         <record model="crm.case.resource.type" id="type_lead8">
             <field name="name">Newsletter</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
 
+        <!--  crm categories -->
+        <record model="crm.case.categ" id="categ_oppor1">
+            <field name="name">Interest in Computer</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+        <record model="crm.case.categ" id="categ_oppor2">
+            <field name="name">Interest in Accessories</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+        <record model="crm.case.categ" id="categ_oppor3">
+            <field name="name">Need Services</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+        <record model="crm.case.categ" id="categ_oppor4">
+            <field name="name">Need Information</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+        <record model="crm.case.categ" id="categ_oppor5">
+            <field name="name">Need a Website Design</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+        <record model="crm.case.categ" id="categ_oppor6">
+            <field name="name">Potential Reseller</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+        <record model="crm.case.categ" id="categ_oppor7">
+            <field name="name">Need Consulting</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+        <record model="crm.case.categ" id="categ_oppor8">
+            <field name="name">Other</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 0051ac7b44a..576f258facc 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-    <!-- 
-        ((((((((((( Demo Cases ))))))))))) 
-    -->
-
-    <!--For Leads-->
+        <!-- Demo Leads -->
         <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead1"/>
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Luc Latour'" name="partner_name"/>
+            <field eval="'The Oil Company'" name="partner_name"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'(726) 782-0636'" name="mobile"/>
+        <field eval="'Luc Latour'" name="contact_name"/>
+            <field name="title" ref="base.res_partner_title_sir"/>
+        <field eval="'Training Manager'" name="function"/>
+        <field eval="'Paris'" name="city"/>
+        <field name="country_id" ref="base.fr"/>
+        <field eval="'luc.latour@oilcompany.fr'" name="email_from"/>
+            <field eval="'0033 621 782-0636'" name="mobile"/>
             <field eval="1" name="active"/>
-            <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="'The Oil Company'" name="name"/>
-            <field eval="'(769) 703-274'" name="phone"/>
+            <field eval="'Plan to Attend a Training'" name="name"/>
+            <field eval="'0033 769 703-274'" name="phone"/>
         </record>
 
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
@@ -27,47 +28,57 @@
             <field eval="'4'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Marc Dufour'" name="partner_name"/>
+            <field eval="'Le Club SARL'" name="partner_name"/>
+        <field eval="'Marc Dufour'" name="contact_name"/>
+            <field name="title" ref="base.res_partner_title_sir"/>
+        <field eval="'Purchase Manager'" name="function"/>
+        <field eval="'Bordeaux'" name="city"/>
+        <field name="country_id" ref="base.fr"/>
+        <field eval="'md@leclub.fr'" name="email_from"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(392) 895-7917'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
-            <field eval="'Le Club SARL'" name="name"/>
+            <field eval="'Interest in Your New Product'" name="name"/>
             <field eval="'(956) 293-2595'" name="phone"/>
         </record>
-        
         <record id="crm_case_developingwebapplications0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead5"/>
             <field eval="'2'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="'Fabien Pinckaers'" name="partner_name"/>
+            <field eval="'The Kompany'" name="partner_name"/>
+        <field eval="'John Miller'" name="contact_name"/>
+        <field eval="'New-York'" name="city"/>
+        <field name="country_id" ref="base.us"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(820) 167-3208'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
-            <field name="stage_id" ref="crm.stage_lead4"/>
-            <field eval="'TheKompany'" name="name"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Need Info about Web Design'" name="name"/>
             <field eval="'(079) 681-2139'" name="phone"/>
-            <field eval="'contact@tecsas.fr'" name="email_from"/>
+            <field eval="'contact@thkompany.com'" name="email_from"/>
         </record>
         <record id="crm_case_qrecorp0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead8"/>
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="'Henry Mc Coy'" name="partner_name"/>
+            <field eval="'The Gas Company'" name="partner_name"/>
+        <field eval="'Henry Mc Coy'" name="contact_name"/>
+        <field eval="'London'" name="city"/>
+        <field name="country_id" ref="base.uk"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(077) 582-4035'" name="mobile"/>
             <field eval="1" name="active"/>
-            <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="'The Gas Company'" name="name"/>
+            <field eval="'Need a New Website'" name="name"/>
             <field eval="'(514) 698-4118'" name="phone"/>
+            <field eval="'hmc@thgascompany.com'" name="email_from"/>
         </record>
 
         <record id="crm_case_itdeveloper0" model="crm.lead">
@@ -75,15 +86,20 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Carrie Helle'" name="partner_name"/>
+            <field eval="'Stonage IT'" name="partner_name"/>
+        <field eval="'Carrie Helle'" name="contact_name"/>
+        <field eval="'Purchase Manager'" name="function"/>
+        <field eval="'Bruxelles'" name="city"/>
+        <field name="country_id" ref="base.be"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
-            <field name="categ_id" ref="crm.categ_oppor6"/>
-            <field name="stage_id" ref="crm.stage_lead3"/>
-            <field eval="'Stonage IT'" name="name"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Need a Quotation for PC1'" name="name"/>
             <field eval="'(855) 924-4364'" name="phone"/>
+            <field eval="'helle@stonageit.be'" name="email_from"/>
         </record>
         
         <record id="crm_case_mgroperations0" model="crm.lead">
@@ -94,13 +110,17 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Tina Pinero'" name="partner_name"/>
+            <field eval="'Opensides'" name="partner_name"/>
+        <field eval="'Tina Pinero'" name="contact_name"/>
+        <field eval="'Consultant'" name="function"/>
+        <field eval="'Roma'" name="city"/>
+        <field name="country_id" ref="base.it"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(468) 017-2684'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor8"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
-            <field eval="'Opensides SPRL'" name="name"/>
+            <field eval="'Need Info about your Services'" name="name"/>
             <field eval="'(373) 907-1009'" name="phone"/>
             <field eval="'info@opensides.be'" name="email_from"/>
         </record>
@@ -109,103 +129,397 @@
             <field name="type_id" ref="crm.type_lead8"/>
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="'Wendi Baltz'" name="partner_name"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="'Gardner Group'" name="partner_name"/>
+        <field eval="'Wendi Baltz'" name="contact_name"/>
+        <field eval="'Journalist'" name="function"/>
+        <field eval="'Kiev'" name="city"/>
+        <field name="country_id" ref="base.ua"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(463) 014-1208'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
-            <field name="stage_id" ref="crm.stage_lead4"/>
-            <field eval="'Gardner Group'" name="name"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Info about Your Company ?'" name="name"/>
             <field eval="'(282) 603-7489'" name="phone"/>
         </record>
         <record id="crm_case_webvisitor0" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type_id" ref="crm.type_lead5"/>
-            <field eval="&quot;1&quot;" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="&quot;Questionnaire&quot;" name="name"/>
-            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="'Survey'" name="name"/>
+            <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="&quot;Website Visitor&quot;" name="partner_name"/>
-            <field eval="&quot;smith_john@gmail.com&quot;" name="email_from"/>
+            <field eval="'Survey Expert'" name="partner_name"/>
+        <field eval="'John Smith'" name="contact_name"/>
+        <field eval="'Sales'" name="function"/>
+        <field eval="'Cambridge'" name="city"/>
+        <field name="country_id" ref="base.uk"/>
+            <field eval="'smith_john@gmail.com'" name="email_from"/>
+        <field eval="'(282) 596-8584'" name="phone"/>
         </record>
         <record id="crm_case_business_card0" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type_id" ref="crm.type_lead3"/>
-            <field eval="&quot;2&quot;" name="priority"/>
+            <field eval="'2'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="&quot;Marketing Products&quot;" name="name"/>
-            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="'Partnership'" name="name"/>
+            <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="&quot;Business Card&quot;" name="partner_name"/>
+            <field eval="'Marketing Business'" name="partner_name"/>
+        <field eval="'Laure Smith'" name="contact_name"/>
+        <field eval="'Sales'" name="function"/>
+        <field eval="'Oxford'" name="city"/>
+        <field name="country_id" ref="base.uk"/>
+            <field eval="'l.smith@marketing-business.com'" name="email_from"/>
+        <field eval="'(252) 578-7894'" name="phone"/>
         </record>
         <record id="crm_case_imported_contact0" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type_id" ref="crm.type_lead8"/>
-            <field eval="&quot;2&quot;" name="priority"/>
+            <field eval="'2'" name="priority"/>
             <field name="type">lead</field>
-            <field name="user_id" ref="base.user_demo"/>
-            <field eval="&quot;Business Group&quot;" name="name"/>
-            <field eval="&quot;cancel&quot;" name="state"/>
+            <field eval="'Info'" name="name"/>
+            <field eval="'cancel'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
-            <field eval="&quot;Imported Contact&quot;" name="partner_name"/>
+            <field eval="'Business Group'" name="partner_name"/>
         </record>
         <record id="crm_case_employee0" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type_id" ref="crm.type_lead3"/>
-            <field eval="&quot;3&quot;" name="priority"/>
+            <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="&quot;OpenERP Campaining&quot;" name="name"/>
-            <field eval="&quot;draft&quot;" name="state"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="'Need Info about Onsite Intervention'" name="name"/>
+            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor3"/>
-            <field name="stage_id" ref="crm.stage_lead3"/>
-            <field eval="&quot;Campaining&quot;" name="partner_name"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Agrolait'" name="partner_name"/>
+        <field eval="'Sylvie Lelitre'" name="contact_name"/>
         </record>
         <record id="crm_case_company_partnership0" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type_id" ref="crm.type_lead3"/>
-            <field eval="&quot;3&quot;" name="priority"/>
+            <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="&quot;Offer&quot;" name="name"/>
-            <field eval="&quot;done&quot;" name="state"/>
+            <field eval="'Need Quotation for 100 PC and 100 Keyboards'" name="name"/>
+            <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="categ_id" ref="crm.categ_oppor7"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="&quot;Partnership Offer&quot;" name="partner_name"/>
+            <field eval="'Centrale d\'achats 1'" name="partner_name"/>
        </record>
 
-       
-       <!--        Call Function to Open the leads-->
+        <!--        Call Function to Open the leads-->
         <function model="crm.lead" name="case_open">
-            <value eval="[ref('crm_case_itisatelesalescampaign0'), ref('crm_case_electonicgoodsdealer0'), ref('crm_case_company_partnership0'), ref('crm_case_webvisitor0'), ref('crm_case_business_card0')]"/>
+            <value eval="[ref('crm_case_electonicgoodsdealer0'), ref('crm_case_company_partnership0'), ref('crm_case_webvisitor0'), ref('crm_case_business_card0'), ref('crm.crm_case_employee0')]"/>
         </function>
-        
         <!--        Call Function to mark the lead as Pending-->
         <function model="crm.lead" name="case_pending">
             <value eval="[ref('crm_case_itdeveloper0')]"/>
         </function>
-
         <!--        Call Function to Close the leads-->
         <function model="crm.lead" name="case_close">
             <value eval="[ref('crm_case_vpoperations0'), ref('crm_case_developingwebapplications0'), ref('crm_case_webvisitor0')]"/>
         </function>
-    
         <!--        Call Function to Cancel the leads-->
         <function model="crm.lead" name="case_cancel">
             <value eval="[ref('crm_case_mgroperations0'), ref('crm_case_imported_contact0')]"/>
         </function>
 
+        <!-- Demo Opportunities -->
+        <record id="crm_case_construstazunits0" model="crm.lead">
+            <field eval="60" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead1"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'open'" name="state"/>
+            <field eval="'150000'" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field eval="'Plan to buy 200 PC2'" name="name"/>
+            <field eval="'Conf call with purchase manager'" name="title_action"/>
+        </record>
+        <record id="crm_case_rdroundfundingunits0" model="crm.lead">
+            <field name="partner_address_id" ref="base.res_partner_address_1"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead2"/>
+            <field name="partner_id" ref="base.res_partner_9"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="'draft'" name="state"/>
+            <field eval="45000.0" name="planned_revenue"/>
+            <field eval="35" name="probability"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor3"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Pricing Information of Onsite Intervention'" name="name"/>
+            <field eval="'Send price list regarding our interventions'" name="title_action"/>
+            <field eval="time.strftime('%Y-%m-03')" name="date_action"/>
+            <field eval="time.strftime('%Y-%m-08')" name="date_deadline"/>
+            <field name="partner_name">BalmerInc S.A.</field>
+            <field name="street">Rue des Palais 51, bte 33</field>
+            <field name="city">Bruxelles</field>
+            <field eval="1000" name="zip"/>
+            <field name="country_id" ref="base.be"/>
+        </record>
+        <record id="crm_case_rdroundfundingunits25" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead2"/>
+            <field name="partner_id" ref="base.res_partner_lucievonck0"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="'draft'" name="state"/>
+            <field eval="30000.0" name="planned_revenue"/>
+            <field eval="30" name="probability"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor3"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Interest in your Kitchen Design Project'" name="name"/>
+            <field eval="'Send Catalogue by E-Mail'" name="title_action"/>
+            <field eval="time.strftime('%Y-01-10')" name="date_action"/>
+            <field eval="time.strftime('%Y-02-23')" name="date_deadline"/>
+            <field name="partner_name">Lucie Vonck</field>
+            <field name="street">Chaussée de Namur</field>
+            <field name="city">Grand-Rosière</field>
+            <field eval="1367" name="zip"/>
+            <field name="country_id" ref="base.be"/>
+        </record>
+       <record id="crm_case_unifliege" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead2"/>
+            <field name="partner_id" ref="base.res_partner_accent"/>
+            <field name="partner_address_id" ref="base.res_partner_address_accent"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'open'" name="state"/>
+            <field eval="2500.0" name="planned_revenue"/>
+            <field eval="25" name="probability"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Plan train our students on your product'" name="name"/>
+            <field eval="'Call to define real needs about training'" name="title_action"/>
+            <field eval="time.strftime('%Y-%m-04')" name="date_action"/>
+            <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
+            <field eval="4000" name="zip"/>
+            <field name="partner_name">Université de Liège</field>
+            <field name="street">Place du 20Août</field>
+            <field name="city">Liège</field>
+            <field eval="75016" name="zip"/>
+            <field name="country_id" ref="base.be"/>
+        </record>
+       <record id="crm_case_bankwealthy2" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead2"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="partner_address_id" ref="base.res_partner_address_9"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'open'" name="state"/>
+            <field eval="462.0" name="planned_revenue"/>
+            <field eval="40" name="probability"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor2"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Plan to buy 66 keyboards and 66 mouses'" name="name"/>
+            <field eval="'Propose the kit keyboard+mouse'" name="title_action"/>
+            <field eval="time.strftime('%Y-04-12')" name="date_action"/>
+            <field eval="time.strftime('%Y-04-25')" name="date_deadline"/>
+            <field name="partner_name">Bank Wealthy and sons</field>
+            <field name="street">1 rue Rockfeller</field>
+            <field name="city">Paris</field>
+            <field eval="75016" name="zip"/>
+            <field name="country_id" ref="base.fr"/>
+        </record>
+        <record id="crm_case_mediapoleunits0" model="crm.lead">
+            <field eval="100" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_3"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead1"/>
+            <field name="partner_id" ref="base.res_partner_8"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'done'" name="state"/>
+            <field eval="55000.0" name="planned_revenue"/>
+            <field eval="90" name="probability"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor7"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
+            <field eval="'Need 20 Days of Consultancy'" name="name"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_deadline"/>
+            <field eval="'info@mycompany.net'" name="email_from"/>
+        </record>
+        <record id="crm_case_abcfuelcounits0" model="crm.lead">
+            <field eval="80" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_marcdubois0"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead1"/>
+            <field name="partner_id" ref="base.res_partner_duboissprl0"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="'open'" name="state"/>
+            <field eval="45000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor5"/>
+            <field name="stage_id" ref="crm.stage_lead4"/>
+            <field eval="'Need new design for my website'" name="name"/>
+            <field eval="time.strftime('%Y-05-01')" name="date_action"/>
+            <field eval="time.strftime('%Y-06-30')" name="date_deadline"/>
+            <field eval="'info@opensides.be'" name="email_from"/>
+            <field eval="'Convert to quote'" name="title_action"/>
+            <field name="partner_name">Dubois sprl</field>
+            <field name="street">Avenue de la Liberté 56</field>
+            <field name="city">Brussels</field>
+            <field eval="1000" name="zip"/>
+            <field name="country_id" ref="base.be"/>
+        </record>
+        <record id="crm_case_dirtminingltdunits25" model="crm.lead">
+            <field eval="30" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_wong"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="partner_id" ref="base.res_partner_maxtor"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="'done'" name="state"/>
+            <field eval="42000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor2"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
+            <field eval="'Want to subscribe to your online solution'" name="name"/>
+        </record>
+    <record id="crm_case_dirtminingltdunits0" model="crm.lead">
+            <field eval="30" name="probability"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="partner_id" ref="base.res_partner_tinyatwork"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'done'" name="state"/>
+            <field eval="25000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
+            <field eval="'Interest in your Partnership Contract'" name="name"/>
+        </record>
+     <record id="crm_case_dirtminingltdunits10" model="crm.lead">
+            <field eval="30" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_3000"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'open'" name="state"/>
+            <field eval="5000" name="planned_revenue"/>
+            <field eval="30" name="probability"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor2"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="'Plan to attend a training'" name="name"/>
+            <field eval="time.strftime('%Y-04-10')" name="date_action"/>
+            <field eval="time.strftime('%Y-06-12')" name="date_deadline"/>
+            <field eval="'Call to give info about next training session'" name="title_action"/>
+            <field name="partner_name">Axelor</field>
+            <field name="street">12 rue Albert Einstein</field>
+            <field name="city">Champs sur Marne</field>
+            <field eval="77420" name="zip"/>
+            <field name="country_id" ref="base.fr"/>
+        </record>
+       <record id="crm_case_construstazunits0" model="crm.lead">
+            <field eval="60" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_thymbra"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead1"/>
+            <field name="partner_id" ref="base.res_partner_thymbra"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'open'" name="state"/>
+            <field eval="'150000'" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field eval="'Need customize the solution'" name="name"/>
+            <field eval="'Conf call with technical service'" name="title_action"/>
+            <field name="partner_name">Thymbra</field>
+            <field name="street">Palermo, Capital Federal</field>
+            <field name="street2">C1414CMS Capital Federal</field>
+            <field name="city">Buenos Aires</field>
+            <field eval="1659" name="zip"/>
+            <field name="country_id" ref="base.ar"/>
+        </record>
+       <record id="crm_case_ericdubois4" model="crm.lead">
+            <field eval="65" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_ericdubois0"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead1"/>
+            <field name="partner_id" ref="base.res_partner_ericdubois0"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'open'" name="state"/>
+            <field eval="'1200'" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field eval="'Interest in your customizable PC'" name="name"/>
+            <field eval="time.strftime('%Y-08-05')" name="date_action"/>
+            <field eval="time.strftime('%Y-10-10')" name="date_deadline"/>
+            <field eval="'Ask for the good receprion of the proposition'" name="title_action"/>
+            <field name="partner_name">Eric Dubois</field>
+            <field name="street">Chaussée de Binche, 27</field>
+            <field name="city">Mons</field>
+            <field eval="7000" name="zip"/>
+            <field name="country_id" ref="base.be"/>
+        </record>
+       <record id="crm_case_fabiendupont" model="crm.lead">
+            <field name="partner_address_id" ref="base.res_partner_address_fabiendupont0"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead1"/>
+            <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="'draft'" name="state"/>
+            <field name="categ_id" ref="crm.categ_oppor4"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="'Need more info about the onsite intervention'" name="name"/>
+        </record>
+       <record id="crm_case_shelvehouse" model="crm.lead">
+            <field name="partner_address_id" ref="base.res_partner_address_henrychard1"/>
+            <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
+            <field name="type_id" ref="crm.type_lead1"/>
+            <field name="partner_id" ref="base.res_partner_theshelvehouse0"/>
+            <field eval="'3'" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="'draft'" name="state"/>
+            <field name="categ_id" ref="crm.categ_oppor4"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="'Need more info about your pc2'" name="name"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 2bd20f1c7ca..9b0581844a5 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,7 +9,7 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
+        <field name="context">{'search_default_new':1, 'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
         <field name="help">Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect.</field>
     </record>
 
@@ -35,5 +35,68 @@
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 
+
+     <act_window
+            id="act_crm_opportunity_crm_phonecall_new"
+            name="Phone calls"
+            groups="base.group_extended"
+            res_model="crm.phonecall"
+            src_model="crm.lead"
+            view_mode="tree,calendar,form"
+            context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
+            domain="[('opportunity_id', '=', active_id)]"
+            view_type="form"/>
+
+    <act_window
+            id="act_crm_opportunity_crm_meeting_new"
+            name="Meetings"
+            res_model="crm.meeting"
+            src_model="crm.lead"
+            view_mode="tree,form,calendar,"
+            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+            domain="[('opportunity_id', '=', active_id)]"
+            view_type="form"/>
+
+     <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
+          <field name="name">Opportunities</field>
+          <field name="res_model">crm.lead</field>
+          <field name="view_mode">tree,form,graph,calendar,kanban</field>
+          <field name="domain">[('type','=','opportunity')]</field>
+          <field name="context">{'search_default_user_id':uid,'search_default_new':1, 'search_default_open':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+          <field name="view_id" ref="crm_case_tree_view_oppor"/>
+          <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
+          <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
+
+You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.</field>
+     </record>
+
+     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
+          <field name="sequence" eval="1"/>
+          <field name="view_mode">tree</field>
+          <field name="view_id" ref="crm_case_tree_view_oppor"/>
+          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+     </record>
+
+     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
+          <field name="sequence" eval="2"/>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="crm_case_form_view_oppor"/>
+          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+     </record>
+
+     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
+          <field name="sequence" eval="4"/>
+          <field name="view_mode">graph</field>
+          <field name="view_id" ref="crm_case_graph_view_opportunity"/>
+          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+     </record>
+
+     <menuitem id="base.menu_sales" name="Sales"
+         parent="base.menu_base_partner" sequence="1" />
+
+     <menuitem name="Opportunities" id="menu_crm_case_opp"
+         parent="base.menu_sales" action="crm_case_category_act_oppor11"
+         sequence="2" />
+
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index cc0297c16f4..bed2e110b3e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -3,31 +3,23 @@
 <data>
 
     <!-- Stage Search view -->
-
-     <record id="crm_lead_stage_search" model="ir.ui.view">
+    <record id="crm_lead_stage_search" model="ir.ui.view">
         <field name="name">Stage - Search</field>
         <field name="model">crm.case.stage</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Stage Search">
-                <filter icon="terp-personal" name="lead"
-                    string="Lead" domain="[('type', '=', 'lead')]" context="{'type' : 'lead'}"/>
-                <filter icon="terp-personal+" name="opportunity"
-                    string="Opportunity" domain="[('type', '=', 'opportunity')]" context="{'type' : 'opportunity'}"/>
                 <field name="name"/>
             </search>
         </field>
     </record>
 
     <!--Lead Stage Form view -->
-
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
         <field name="name">Stages</field>
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="context">{'search_default_opportunity':1}</field>
-        <field name="search_view_id" ref="crm_lead_stage_search"/>
         <field name="help">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.</field>
     </record>
 
@@ -43,7 +35,7 @@
             <field name="res_model">crm.case.categ</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
-            <field name="context">{'object_id': 'crm.lead'}</field>
+            <field name="context" eval="{'object_id': ref('model_crm_lead')}"/>
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
             <field name="help">Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do.</field>
         </record>
@@ -74,7 +66,7 @@
                     <newline />
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
-                    <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" />
+                    <field name="stage_id" domain="[('section_ids', '=', section_id)]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string=""
                             states="open,pending,draft" type="object"
@@ -105,10 +97,10 @@
                     </group>
                     <group colspan="2" col="3">
                         <separator string="Communication" colspan="4" col="3"/>
-                        <field name="email_from" widget="email"/><button string="Mail"
-                        name="%(crm.action_crm_send_mail)d"
-                        context="{'mail':'new', 'model': 'crm.lead'}"
-                        icon="terp-mail-message-new" type="action" colspan="1"/>
+                        <field name="email_from" widget="email"/>
+                        <button string="Mail"
+                            name="%(mail.action_email_compose_message_wizard)d"
+                            icon="terp-mail-message-new" type="action" colspan="1"/>
                         <newline/>
                         <field name="phone"/>
                         <newline/>
@@ -128,7 +120,7 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                         <button name="case_cancel" string="Cancel"
                             states="draft,open,pending" type="object"
                             icon="gtk-cancel" />
@@ -182,52 +174,53 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                         <tree string="History">
                             <field name="display_text" string="History Information"/>
-                            <field name="history" invisible="1"/>
+                            <field name="email_from" invisible="1"/>
                             <button
-                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                 icon="terp-mail-replied" type="action" />
                         </tree>
-                            <form string="History">
-                                <group col="4" colspan="4">
+                        <form string="History">
+                            <group col="4" colspan="4">
+                                <group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
                                     <field name="email_from"/>
-                                    <field name="date"/>
                                     <field name="email_to" size="512"/>
-                                    <field name="email_cc" size="512"/>
-                                    <field name="name" colspan="4" widget="char" attrs="{'invisible': [('history', '=', False)]}" size="512"/>
-                                    <field name="display_text" colspan="4"   attrs="{'invisible': [('history', '=', True)]}"/>
-                                    <field name="history" invisible="1"/>
                                 </group>
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <field name="description" colspan="4" nolabel="1"/>
-                                        <group attrs="{'invisible': [('history', '!=', True)]}">
-                                            <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
-                                            </group>
+                                <group col="2" colspan="2">
+                                    <field name="date"/>
+                                    <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
+                                </group>
+                                <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
+                                <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
+                            </group>
+                            <notebook colspan="4">
+                                <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
+                                    <field name="body_text" colspan="4" nolabel="1"/>
+                                    <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                        <button colspan="4" string="Reply"
+                                            name="%(mail.action_email_compose_message_wizard)d"
+                                            context="{'mail.compose.message.mode':'reply'}"
+                                            icon="terp-mail-replied" type="action"/>
+                                        </group>
 
-                                    </page>
-                                    <page string="Attachments">
-                                        <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                    </page>
-                                    </notebook>
-                                </form>
+                                </page>
+                                <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
+                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                </page>
+                                </notebook>
+                        </form>
                     </field>
                     <button string="Add Internal Note"
                         name="%(crm.action_crm_add_note)d"
                         context="{'model': 'crm.lead' }"
                         icon="terp-document-new" type="action" />
                     <button string="Send New Email"
-                        name="%(crm.action_crm_send_mail)d"
-                        context="{'mail':'new', 'model': 'crm.lead'}"
-                        icon="terp-mail-message-new" type="action" />
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action"/>
                  </page>
                 </notebook>
             </form>
@@ -291,7 +284,7 @@
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
             <calendar string="Leads Generation"
-                date_start="create_date" color="user_id">
+                date_start="date_action" color="user_id">
                 <field name="name" />
                 <field name="partner_name" />
                 <field name="partner_address_id" />
@@ -299,6 +292,76 @@
         </field>
     </record>
 
+    <!-- CRM Lead Kanban View  -->
+    <record model="ir.ui.view" id="crm_case_kanban_view_leads">
+        <field name="name">CRM - Leads Kanban</field>
+        <field name="model">crm.lead</field>
+        <field name="type">kanban</field>
+        <field name="arch" type="xml">
+            <kanban default_group_by="stage_id">
+                <field name="state"/>
+                <field name="color"/>
+                <field name="priority"/>
+                <field name="planned_revenue" sum="Expected Revenues"/>
+                <field name="user_email"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
+                        <div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                            <div class="oe_kanban_box oe_kanban_color_border">
+                                <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
+                                <tr>
+                                    <td class="oe_kanban_title3" align="left" valign="middle">
+                                        <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
+                                        <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                        <field name="partner_id"/>
+                                    </td>
+                                    <td class="oe_kanban_title2" align="right" valign="middle" t-if="record.planned_revenue.raw_value" nowrap="nowrap">
+                                        <t t-esc="Math.round(record.planned_revenue.value)"/> <field name="company_currency"/>
+                                    </td>
+                                    <td valign="top" width="22"><img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar"/></td>
+                                </tr>
+                                </table>
+
+                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+                                    <div class="oe_kanban_right oe_kanban_small">
+                                        <field name="user_login"/>
+                                    </div>
+                                    <div>
+                                        <b><field name="partner_address_name"/></b>
+                                    </div>
+                                    <div>
+                                        <field name="name"/>
+                                    </div>
+                                    <div style="padding-left: 0.5em">
+                                        <i><field name="date_action"/><t t-if="record.date_action.raw_value"> : </t><field name="title_action"/></i>
+                                    </div>
+                                </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"/>
+                                        <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
+                                        <a string="Schedule/Log Call" name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/>
+                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
+                                        <a string="Schedule Meeting" name="action_makeMeeting" type="object" icon="stock_calendar"/>
+                                    </div>
+                                    <div class="oe_kanban_right">
+                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
+                                        <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
+                                        <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
+                                    </div>
+                                    <br class="oe_kanban_clear"/>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
     <!-- CRM Lead Search View -->
 
     <record id="view_crm_case_leads_filter" model="ir.ui.view">
@@ -308,14 +371,16 @@
         <field name="arch" type="xml">
             <search string="Search Leads">
                 <filter icon="terp-check"
-                    string="Current"
-                    name="current" help="Draft, Open and Pending Leads"
-                    domain="[('state','in',('draft','open','pending'))]"/>
+                    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-gtk-media-pause"
                     string="Pending"
+                    name="pending"
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
@@ -328,7 +393,7 @@
                 />
                 <separator orientation="vertical"/>
                 <field name="name" string="Lead / Customer"
-                    domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
@@ -348,7 +413,7 @@
                 </field>
                 <separator orientation="vertical"/>
                 <field name="country_id" context="{'invisible_country': False}">
-                	<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                 </field>
                 <newline/>
                 <group expand="0" string="Group By...">
@@ -371,5 +436,310 @@
            </search>
         </field>
     </record>
+
+
+    <!-- Opportunities Form View -->
+    <record model="ir.ui.view" id="crm_case_form_view_oppor">
+        <field name="name">Opportunities</field>
+        <field name="model">crm.lead</field>
+        <field name="type">form</field>
+        <field name="priority">10</field>
+        <field name="arch" type="xml">
+            <form string="Opportunities">
+                <group colspan="4" col="7">
+                    <field name="name"  required="1" string="Opportunity"/>
+                    <label string="Stage:" align="1.0"/>
+                    <group colspan="1" col="4">
+                        <field name="stage_id" nolabel="1"
+                            on_change="onchange_stage_id(stage_id)"
+                            domain="[('section_ids', '=', section_id)]"/>
+                        <button name="stage_previous"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
+                        <button name="stage_next" states="draft,open,pending"
+                            type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
+                    </group>
+                    <field name="user_id"/>
+
+                    <button string="Schedule/Log Call"
+                    name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/>
+
+                    <field name="planned_revenue"/>
+                    <field name="probability"/>
+                    <field name="date_deadline"/>
+
+                    <button name="action_makeMeeting" type="object"
+                    string="Schedule Meeting" icon="gtk-redo" />
+                    <newline/>
+                    <field name="date_action"/>
+                    <field name="title_action"/>
+                    <field name="priority" string="Priority"/>
+                    <newline/>
+                    <field name="type" invisible="1"/>
+                </group>
+                <notebook colspan="4">
+                <page string="Opportunity">
+                    <group col="4" colspan="2">
+                        <separator colspan="4" string="Contacts"/>
+                        <group colspan="2">
+                            <field name="partner_id" select="1"
+                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
+                                colspan="2" />
+                            <button name="%(action_crm_lead2partner)d"
+                                icon="terp-partner" type="action"
+                                string="Create"
+                                attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                        </group>
+                        <field name="partner_address_id"
+                            string="Contact"
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                            colspan="1" />
+                        <group col="3" colspan="2">
+                            <field name="email_from" string="Email" />
+                            <button string="Mail"
+                            name="%(mail.action_email_compose_message_wizard)d"
+                            context="{'mail':'new', 'model': 'crm.lead'}"
+                            icon="terp-mail-message-new" type="action" />
+                        </group>
+                            <field name="phone"/>
+
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Categorization"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="categ_id" select="1"
+                        string="Category" widget="selection"
+                        domain="[('object_id.model', '=', 'crm.lead')]" />
+                    </group>
+
+                    <separator colspan="4" string="Details"/>
+                    <field name="description" nolabel="1" colspan="4"/>
+
+                    <separator colspan="4"/>
+                    <group col="10" colspan="4">
+                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                        <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
+                        <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
+                        <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
+                        <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    </group>
+                </page>
+                <page string="Lead">
+                    <group colspan="2" col="4">
+                        <separator string="Contact" colspan="4" col="4"/>
+                        <field name="partner_name" string="Customer Name" colspan="4"/>
+                        <newline/>
+                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
+                        <field name="function" />
+                        <field name="street" colspan="4"/>
+                        <field name="street2" colspan="4"/>
+                        <field name="zip"/>
+                        <field name="city"/>
+                        <field name="country_id"/>
+                        <field name="state_id"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Communication" colspan="2"/>
+                        <field name="fax"/>
+                        <field name="mobile"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Categorization" colspan="2"/>
+                        <field name="type_id" widget="selection" groups="base.group_extended"/>
+                        <field name="channel_id" widget="selection"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Mailings" colspan="2"/>
+                        <field name="optin" on_change="on_change_optin(optin)"/>
+                        <field name="optout" on_change="on_change_optout(optout)"/>
+                    </group>
+                </page>
+                <page string="Communication &amp; History" groups="base.group_extended">
+                  <group colspan="4">
+                      <field colspan="4" name="email_cc" widget="char" size="512"/>
+                  </group>
+                   <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                       <tree string="History">
+                           <field name="display_text" string="History Information"/>
+                           <field name="email_from" invisible="1"/>
+                           <button
+                               string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                               name="%(mail.action_email_compose_message_wizard)d"
+                               context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                               icon="terp-mail-replied" type="action" />
+                       </tree>
+                       <form string="History">
+                           <group col="4" colspan="4">
+                               <group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
+                                   <field name="email_from"/>
+                                   <field name="email_to" size="512"/>
+                               </group>
+                               <group col="2" colspan="2">
+                                   <field name="date"/>
+                                   <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
+                               </group>
+                               <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
+                               <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
+                           </group>
+                           <notebook colspan="4">
+                               <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
+                                   <field name="body_text" colspan="4" nolabel="1"/>
+                                   <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                       <button colspan="4" string="Reply"
+                                           name="%(mail.action_email_compose_message_wizard)d"
+                                           context="{'mail.compose.message.mode':'reply'}"
+                                           icon="terp-mail-replied" type="action"/>
+                                       </group>
+                                </page>
+                               <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
+                                   <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                               </page>
+                               </notebook>
+                       </form>
+                   </field>
+                   <button string="Add Internal Note"
+                       name="%(crm.action_crm_add_note)d"
+                       context="{'model': 'crm.lead' }"
+                       icon="terp-document-new" type="action" />
+                   <button string="Send New Email"
+                       name="%(mail.action_email_compose_message_wizard)d"
+                       icon="terp-mail-message-new" type="action"/>
+                </page>
+                <page string="Extra Info" groups="base.group_extended">
+                    <group col="2" colspan="2">
+                        <separator string="Dates" colspan="2"/>
+                        <field name="create_date"/>
+                        <field name="write_date"/>
+                        <field name="date_closed"/>
+                        <field name="date_open"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Misc" colspan="2"/>
+                        <field name="active"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
+                        <field name="referred"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref"/>
+                    <field name="ref2"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+
+    <!-- Opportunities Tree View -->
+    <record model="ir.ui.view" id="crm_case_tree_view_oppor">
+        <field name="name">Opportunities Tree</field>
+        <field name="model">crm.lead</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Opportunities" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                <field name="date_deadline" invisible="1"/>
+                <field name="create_date"/>
+                <field name="name" string="Opportunity"/>
+                <field name="partner_id" string="Customer"/>
+                <field name="country_id" invisible="context.get('invisible_country', True)" />
+                <field name="date_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"/>
+                <button name="stage_previous" string="Previous Stage" states="open,pending" type="object" icon="gtk-go-back" />
+                <button name="stage_next" string="Next Stage" states="open,pending" type="object" icon="gtk-go-forward" />
+                <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="user_id"/>
+                <field name="priority" invisible="1"/>
+                <field name="categ_id" invisible="1"/>
+                <field name="state"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                <button name="case_pending" string="Pending" states="open,draft" type="object" icon="gtk-media-pause" />
+                <button name="case_mark_lost" string="Lost" states="open,pending" type="object" icon="gtk-cancel" />
+                <button name="case_mark_won" string="Won" states="open,pending" type="object" icon="gtk-apply" />
+            </tree>
+        </field>
+    </record>
+
+
+    <!-- Opportunities Search View -->
+    <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
+        <field name="name">CRM - Opportunities Search</field>
+        <field name="model">crm.lead</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Opportunities">
+                <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-gtk-media-pause"
+                    string="Pending"  help="Pending Opportunities"
+                    name="pending"
+                    domain="[('state','=','pending')]"/>
+                <separator orientation="vertical"/>
+                <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="user_id">
+                    <filter icon="terp-personal-"
+                        domain="[('user_id','=', False)]"
+                        help="Unassigned Opportunities" />
+                </field>
+                <field name="section_id"
+                    context="{'invisible_section': False}"
+                    widget="selection">
+                    <filter icon="terp-personal+" groups="base.group_extended"
+                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        context="{'invisible_section': False}"
+                        help="My Sales Team(s)" />
+                    <filter icon="terp-personal+" groups="base.group_extended"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </field>
+
+                <newline/>
+                <group expand="0" string="Group By..." colspan="16">
+                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                    <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical" />
+                    <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="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" groups="base.group_extended"/>
+                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical" />
+                    <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" />
+                    <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- crm.lead Opportunities Graph View -->
+    <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
+        <field name="name">CRM - Opportunity Graph</field>
+        <field name="model">crm.lead</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
+                <field name="categ_id"/>
+                <field name="planned_revenue" operator="+"/>
+                <field name="state" group="True"/>
+            </graph>
+        </field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 4e329ddc6d4..40ba8662f13 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -45,14 +45,14 @@ class crm_meeting(crm_base, osv.osv):
     _inherit = "calendar.event"
     _columns = {
         # From crm.case
-        'name': fields.char('Summary', size=124, required=True, states={'done': [('readonly', True)]}), 
-        'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}), 
+        'name': fields.char('Summary', size=124, required=True, states={'done': [('readonly', True)]}),
+        'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]", states={'done': [('readonly', True)]}), 
+                                 domain="[('partner_id','=',partner_id)]", states={'done': [('readonly', True)]}),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]}, \
-                        select=True, help='Sales team to which Case belongs to.'), 
+                        select=True, help='Sales team to which Case belongs to.'),
         'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
-        'id': fields.integer('ID'),
+        'id': fields.integer('ID', readonly=True),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'write_date': fields.datetime('Write Date' , readonly=True),
         'date_action_last': fields.datetime('Last Action', readonly=1),
@@ -67,7 +67,7 @@ class crm_meeting(crm_base, osv.osv):
                                  'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
         'date_closed': fields.datetime('Closed', readonly=True),
         'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'state': fields.selection([('open', 'Confirmed'),
                                     ('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
@@ -75,7 +75,7 @@ class crm_meeting(crm_base, osv.osv):
                                     size=16, readonly=True),
     }
     _defaults = {
-        'state': 'draft', 
+        'state': 'draft',
         'active': 1,
         'user_id': lambda self, cr, uid, ctx: uid,
     }
@@ -138,7 +138,7 @@ class res_users(osv.osv):
 
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
-        
+
         # add shortcut unless 'noshortcut' is True in context
         if not(context and context.get('noshortcut', False)):
             data_obj = self.pool.get('ir.model.data')
@@ -150,7 +150,6 @@ class res_users(osv.osv):
             except:
                 # Tolerate a missing shortcut. See product/product.py for similar code.
                 logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
-        
         return user_id
 
 res_users()
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index aabd4e8592f..19ca9266332 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -13,8 +13,8 @@
     />
 
     <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
-        <field name="name">Create Partner For Meeting</field>
-        <field name="context" eval="{'default_state':'draft'}"/>
+        <field name="name">Schedule a Meeting</field>
+        <field name="context">{'default_partner_id': active_id}</field>
     </record>
 
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 0d8a79812f1..d35300b62b5 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -10,7 +10,7 @@
         <field name="view_type">form</field>
         <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
         <field name="domain">[('object_id.model', '=', 'crm.meeting')]</field>
-        <field name="context">{'object_id':'crm.meeting'}</field>
+        <field name="context" eval="{'object_id': ref('model_crm_meeting')}"/>
         <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
     </record>
 
@@ -58,7 +58,7 @@
                             <field name="section_id" widget="selection"
                                 groups="base.group_extended"/>
                         </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contact"/>
+                            <separator colspan="2" string="Contacts"/>
                             <field name="partner_id" string="Partner"
                                 on_change="onchange_partner_id(partner_id)" />
                             <field name="partner_address_id"
@@ -293,45 +293,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
                 <search string="Search Meetings">
-                       <group col="12" colspan="4">
-                           <filter icon="terp-check" name="current" string="Current"
-                                domain="[('state','in',('draft', 'open'))]"
-                groups="base.group_extended"
-                                help="Current Meetings"/>
-                           <separator orientation="vertical"/>
-                           <field name="name" select="1" string="Subject"/>
-                           <field name="categ_id" select="1"
-                               string="Meeting Type" widget="selection"
-                               domain="[('object_id.model', '=', 'crm.meeting')]" />
-                           <separator orientation="vertical"/>
-                           <field name="partner_id" select="1" />
-                           <field name="section_id" select="1" widget="selection">
+                       <group>
+                           <field name="name" string="Subject"/>
+                           <field name="partner_id"/>
+                           <field name="section_id" widget="selection">
                                <filter icon="terp-personal+" groups="base.group_extended"
                                    domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sales Team(s)" />
                            </field>
-                           <field name="user_id" select="1"/>
+                           <field name="user_id"/>
                        </group>
-                       <newline/>
-                       <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'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Type" help="Meeting Type"
-                                icon="terp-stock_symbol-selection" domain="[]"
-                                context="{'group_by':'categ_id'}" />
-                            <filter string="Privacy" icon="terp-locked"
-                                domain="[]" context="{'group_by':'class'}" />
-                            <filter string="Show time as" icon="terp-project"
-                                domain="[]" context="{'group_by':'show_as'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Date" icon="terp-go-month" help="Meeting date"
-                                domain="[]" context="{'group_by':'date'}" />
-                        </group>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
deleted file mode 100644
index 3c845478392..00000000000
--- a/addons/crm/crm_opportunity.py
+++ /dev/null
@@ -1,223 +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 crm
-
-
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Lost'),
-    ('done', 'Converted'),
-    ('pending','Pending')
-]
-
-class crm_opportunity(osv.osv):
-    """ Opportunity Cases """
-    _order = "priority,date_action,id desc"
-    _inherit = 'crm.lead'
-    _columns = {
-        # From crm.case
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"), 
-
-        # Opportunity fields
-        'probability': fields.float('Probability (%)',group_operator="avg"),
-        'planned_revenue': fields.float('Expected Revenue'),
-        'ref': fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'phone': fields.char("Phone", size=64),
-        'date_deadline': fields.date('Expected Closing'),
-        'date_action': fields.date('Next Action Date'),
-        'title_action': fields.char('Next Action', size=64),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','opportunity')]"),
-     }
-    
-    def _case_close_generic(self, cr, uid, ids, find_stage, *args):
-        res = super(crm_opportunity, self).case_close(cr, uid, ids, *args)
-        for case in self.browse(cr, uid, ids):
-            #if the case is not an opportunity close won't change the stage
-            if not case.type == 'opportunity':
-                return res
-                
-            value = {}
-            stage_id = find_stage(cr, uid, 'opportunity', case.section_id.id or False)
-            if stage_id:
-                stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage_id)
-                value.update({'stage_id': stage_id})
-                if stage_obj.on_change:
-                    value.update({'probability': stage_obj.probability})
-                
-            #Done un crm.case
-            #value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
-            
-
-            self.write(cr, uid, ids, value)
-        return res
-    
-    def case_close(self, cr, uid, ids, *args):
-        """Overrides close for crm_case for setting probability and close 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 ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        res = self._case_close_generic(cr, uid, ids, self._find_won_stage, *args)
-        
-        for (id, name) in self.name_get(cr, uid, ids):
-            opp = self.browse(cr, uid, id)
-            if opp.type == 'opportunity':
-                message = _("The opportunity '%s' has been won.") % name
-                self.log(cr, uid, id, message)
-        return res
-
-    def case_mark_lost(self, cr, uid, ids, *args):
-        """Mark the case as lost: state = done and probability = 0%
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        res = self._case_close_generic(cr, uid, ids, self._find_lost_stage, *args)
-        
-        for (id, name) in self.name_get(cr, uid, ids):
-            opp = self.browse(cr, uid, id)
-            if opp.type == 'opportunity':
-                message = _("The opportunity '%s' has been marked as lost.") % name
-                self.log(cr, uid, id, message)
-        return res
-    
-    def case_cancel(self, cr, uid, ids, *args):
-        """Overrides cancel for crm_case for setting probability
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        res = super(crm_opportunity, self).case_cancel(cr, uid, ids, args)
-        self.write(cr, uid, ids, {'probability' : 0.0})
-        return res
-
-    def case_reset(self, cr, uid, ids, *args):
-        """Overrides reset as draft in order to set the stage field as empty
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        res = super(crm_opportunity, self).case_reset(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'stage_id': False, 'probability': 0.0})
-        return res
-   
- 
-    def case_open(self, cr, uid, ids, *args):
-        """Overrides open for crm_case for setting Open 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 ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        res = super(crm_opportunity, self).case_open(cr, uid, ids, *args)
-        
-        return res
-
-    def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of stage’s IDs
-            @stage_id: change state id on run time """
-        if not stage_id:
-            return {'value':{}}
-        
-        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context=context)
-
-        if not stage.on_change:
-            return {'value':{}}
-        return {'value':{'probability': stage.probability}}
-
-    _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
-        'priority': crm.AVAILABLE_PRIORITIES[2][0],
-    }
-
-    def action_makeMeeting(self, cr, uid, ids, context=None):
-        """
-        This opens Meeting's calendar view to schedule meeting on current Opportunity
-        @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 Opportunity to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Meeting view
-        """
-        value = {}
-        for opp in self.browse(cr, uid, ids, context=context):
-            data_obj = self.pool.get('ir.model.data')
-
-            # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            context = {
-                'default_opportunity_id': opp.id,
-                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
-                'default_user_id': uid, 
-                'default_section_id': opp.section_id and opp.section_id.id or False,
-                'default_email_from': opp.email_from,
-                'default_state': 'open',  
-                'default_name': opp.name
-            }
-            value = {
-                'name': _('Meetings'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
-                'nodestroy': True
-            }
-        return value
-
-crm_opportunity()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
deleted file mode 100644
index a20cbc5e344..00000000000
--- a/addons/crm/crm_opportunity_data.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">
-
-     <!--        CASE STATUS(stage_id)        -->
-     
-        <record model="crm.case.stage" id="stage_opportunity6">
-            <field name="name">Lost</field>
-            <field eval="'0'" name="probability"/>
-            <field eval="'0'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-        
-        <record model="crm.case.stage" id="stage_opportunity1">
-            <field name="name">New</field>
-            <field eval="'10'" name="probability"/>
-            <field eval="'1'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity2">
-            <field name="name">Qualification</field>
-            <field eval="'20'" name="probability"/>
-            <field eval="'2'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity3">
-            <field name="name">Proposition</field>
-            <field eval="'40'" name="probability"/>
-            <field eval="'3'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity4">
-            <field name="name">Negotiation</field>
-            <field eval="'60'" name="probability"/>
-            <field eval="'4'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity5">
-            <field name="name">Won</field>
-            <field eval="'100'" name="probability"/>
-            <field eval="'5'" name="sequence"/>
-            <field eval="1" name="on_change"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.section" id="section_sales_department">
-            <field name="name">Sales Department</field>
-            <field name="code">Sales</field>
-            <field name="stage_ids" eval="[(4, ref('stage_opportunity1')), (4, ref('stage_opportunity2')), (4, ref('stage_opportunity3')), (4, ref('stage_opportunity4')), (4, ref('stage_opportunity5')), (4, ref('stage_opportunity6'))]"/>
-        </record>
-
-    <!--        CASE CATEGORY(categ_id)        -->
-	    <record model="crm.case.categ" id="categ_oppor1">
-	        <field name="name">Interest in Computer</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-	    <record model="crm.case.categ" id="categ_oppor2">
-	        <field name="name">Interest in Accessories</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-	    <record model="crm.case.categ" id="categ_oppor3">
-	        <field name="name">Need Services</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-	    <record model="crm.case.categ" id="categ_oppor4">
-	        <field name="name">Need Information</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-	    <record model="crm.case.categ" id="categ_oppor5">
-	        <field name="name">Need a Website Design</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-	    <record model="crm.case.categ" id="categ_oppor6">
-	        <field name="name">Potential Reseller</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-	    <record model="crm.case.categ" id="categ_oppor7">
-	        <field name="name">Need Consulting</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-	    <record model="crm.case.categ" id="categ_oppor8">
-	        <field name="name">Other</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-	    </record>
-
-<!--        Case Resource(type_id)        -->
-	    <record model="crm.case.resource.type" id="type_oppor1">
-	        <field name="name">Campaign 2</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	    </record>
-	    <record model="crm.case.resource.type" id="type_oppor2">
-	        <field name="name">Campaign 1</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	    </record>
-
-</data>
-</openerp>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
deleted file mode 100644
index 8dda7436b64..00000000000
--- a/addons/crm/crm_opportunity_demo.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-    <!-- 
-        ((((((((((( Demo Cases ))))))))))) 
-    -->
-
-    <!--For Opportunity-->
-
-        <record id="crm_case_construstazunits0" model="crm.lead">
-            <field eval="60" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
-            <field eval="1" name="active"/>
-            <field name="type">opportunity</field>
-            <field name="type_id" ref="crm.type_oppor1"/>
-            <field name="partner_id" ref="base.res_partner_3"/>
-            <field eval="&quot;3&quot;" name="priority"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="&quot;open&quot;" name="state"/>
-            <field eval="85000.0" name="planned_revenue"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="categ_id" ref="crm.categ_oppor1"/>
-            <field name="stage_id" ref="crm.stage_opportunity3"/>
-            <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
-        </record>
-        <record id="crm_case_rdroundfundingunits0" model="crm.lead">
-            <field name="partner_address_id" ref="base.res_partner_address_15"/>
-            <field eval="1" name="active"/>
-            <field name="type">opportunity</field>
-            <field name="type_id" ref="crm.type_oppor2"/>
-            <field name="partner_id" ref="base.res_partner_11"/>
-            <field eval="&quot;3&quot;" name="priority"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="&quot;draft&quot;" name="state"/>
-            <field eval="45000.0" name="planned_revenue"/>
-            <field eval="50" name="probability"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_opportunity1"/>
-            <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
-        </record>
-        <record id="crm_case_mediapoleunits0" model="crm.lead">
-            <field eval="10" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_3"/>
-            <field eval="1" name="active"/>
-            <field name="type">opportunity</field>
-            <field name="type_id" ref="crm.type_oppor1"/>
-            <field name="partner_id" ref="base.res_partner_8"/>
-            <field eval="&quot;3&quot;" name="priority"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="&quot;pending&quot;" name="state"/>
-            <field eval="55000.0" name="planned_revenue"/>
-            <field eval="70" name="probability"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="categ_id" ref="crm.categ_oppor7"/>
-            <field name="stage_id" ref="crm.stage_opportunity5"/>
-            <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
-            <field eval="&quot;info@mycompany.net&quot;" name="email_from"/>
-        </record>
-        <record id="crm_case_abcfuelcounits0" model="crm.lead">
-            <field eval="40" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_1"/>
-            <field eval="1" name="active"/>
-            <field name="type">opportunity</field>
-            <field name="type_id" ref="crm.type_oppor1"/>
-            <field name="partner_id" ref="base.res_partner_9"/>
-            <field eval="&quot;3&quot;" name="priority"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field eval="&quot;open&quot;" name="state"/>
-            <field eval="45000.0" name="planned_revenue"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_opportunity4"/>
-            <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
-            <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-        </record>
-        <record id="crm_case_dirtminingltdunits0" model="crm.lead">
-            <field eval="80" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_wong"/>
-            <field eval="1" name="active"/>
-            <field name="type">opportunity</field>
-            <field name="partner_id" ref="base.res_partner_maxtor"/>
-            <field eval="&quot;3&quot;" name="priority"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="&quot;done&quot;" name="state"/>
-            <field eval="42000.0" name="planned_revenue"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="categ_id" ref="crm.categ_oppor2"/>
-            <field name="stage_id" ref="crm.stage_opportunity6"/>
-            <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
deleted file mode 100644
index 53730b218db..00000000000
--- a/addons/crm/crm_opportunity_menu.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-     <act_window
-            id="act_crm_opportunity_crm_phonecall_new"
-            name="Phone calls"
-            groups="base.group_extended"
-            res_model="crm.phonecall"
-            src_model="crm.lead"
-            view_mode="tree,calendar,form"
-            context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
-    <act_window
-            id="act_crm_opportunity_crm_meeting_new"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="crm.lead"
-            view_mode="tree,form,calendar,"
-            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
-     <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">Opportunities</field>
-          <field name="res_model">crm.lead</field>
-          <field name="view_mode">tree,form,graph,calendar</field>
-          <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity'}</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
-          <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
-
-You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.</field>
-     </record>
-
-     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">tree</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
-     </record>
-
-     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
-          <field name="sequence" eval="2"/>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
-     </record>
-
-     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
-          <field name="sequence" eval="4"/>
-          <field name="view_mode">graph</field>
-          <field name="view_id" ref="crm_case_graph_view_opportunity"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
-     </record>
-
-     <menuitem id="base.menu_sales" name="Sales"
-         parent="base.menu_base_partner" sequence="1" />
-
-     <menuitem name="Opportunities" id="menu_crm_case_opp"
-         parent="base.menu_sales" action="crm_case_category_act_oppor11"
-         sequence="2" />
-
-</data>
-</openerp>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
deleted file mode 100644
index 21e2414c603..00000000000
--- a/addons/crm/crm_opportunity_view.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- Opportunities Form View -->
-            <record model="ir.ui.view" id="crm_case_form_view_oppor">
-                <field name="name">Opportunities</field>
-                <field name="model">crm.lead</field>
-                <field name="type">form</field>
-                <field name="priority">10</field>
-                <field name="arch" type="xml">
-                    <form string="Opportunities">
-                        <group colspan="4" col="7">
-                            <field name="name"  required="1" string="Opportunity"/>
-                            <label string="Stage:" align="1.0"/>
-                            <group colspan="1" col="4">
-                                <field name="stage_id" nolabel="1"
-                                    on_change="onchange_stage_id(stage_id)"
-                                    domain="[('type','=','opportunity'),('section_ids', '=', section_id)]"/>
-                                <button name="stage_previous"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
-                                <button name="stage_next" states="draft,open,pending"
-                                    type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
-                            </group>
-                            <field name="user_id"/>
-
-                            <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
-
-                            <field name="planned_revenue"/>
-                            <field name="probability"/>
-                            <field name="date_deadline"/>
-
-                            <button name="action_makeMeeting" type="object"
-                            string="Schedule Meeting" icon="gtk-redo" />
-                            <newline/>
-                            <field name="date_action"/>
-                            <field name="title_action"/>
-                            <field name="priority" string="Priority"/>
-                            <newline/>
-                            <field name="type" invisible="1"/>
-                        </group>
-                        <notebook colspan="4">
-                        <page string="Opportunity">
-                            <group col="4" colspan="2">
-                                <separator colspan="4" string="Contacts"/>
-                                <group colspan="2">
-                                    <field name="partner_id" select="1"
-                                        on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
-                                        colspan="2" />
-                                    <button name="%(action_crm_lead2partner)d"
-                                        icon="terp-partner" type="action"
-                                        string="Create"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                                </group>
-                                <field name="partner_address_id"
-                                    string="Contact"
-                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                    colspan="1" />
-                                <group col="3" colspan="2">
-                                    <field name="email_from" string="Email" />
-                                    <button string="Mail"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'new', 'model': 'crm.lead'}"
-                                    icon="terp-mail-message-new" type="action" />
-                                </group>
-                                    <field name="phone"/>
-
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Categorization"/>
-                                <field name="section_id" colspan="1" widget="selection"/>
-                                <field name="categ_id" select="1"
-                                string="Category" widget="selection"
-                                domain="[('object_id.model', '=', 'crm.lead')]" />
-                            </group>
-
-                            <separator colspan="4" string="Details"/>
-                            <field name="description" nolabel="1" colspan="4"/>
-
-                            <separator colspan="4"/>
-                            <group col="10" colspan="4">
-                                <field name="state"/>
-                                <button name="case_cancel" string="Cancel"
-                                    states="draft" type="object"
-                                    icon="gtk-cancel" />
-                                <button name="case_mark_lost" string="Mark Lost"
-                                    states="open,pending" type="object"
-                                    icon="gtk-cancel" />
-                                <button name="case_reset" string="Reset to Draft"
-                                    states="done,cancel" type="object"
-                                    icon="gtk-convert" />
-                                <button name="case_open" string="Open"
-                                    states="draft,pending" type="object"
-                                    icon="gtk-go-forward" />
-                                <button name="case_pending" string="Pending"
-                                    states="draft,open" type="object"
-                                    icon="gtk-media-pause" />
-                                <button name="case_escalate" string="Escalate"
-                                    states="open,pending" type="object"
-                                    groups="base.group_extended"
-                                    icon="gtk-go-up" />
-                                <button name="case_close" string="Mark Won"
-                                    states="open,pending" type="object"
-                                    icon="gtk-apply" />
-                            </group>
-                        </page>
-                        <page string="Lead">
-                            <group colspan="2" col="4">
-                                <separator string="Contact" colspan="4" col="4"/>
-                                <field name="partner_name" string="Customer Name" colspan="4"/>
-                                <newline/>
-                                <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                                <field name="function" />
-                                <field name="street" colspan="4"/>
-                                <field name="street2" colspan="4"/>
-                                <field name="zip"/>
-                                <field name="city"/>
-                                <field name="country_id"/>
-                                <field name="state_id"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Communication" colspan="2"/>
-                                <field name="fax"/>
-                                <field name="mobile"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Categorization" colspan="2"/>
-                                <field name="type_id" widget="selection" groups="base.group_extended"/>
-                                <field name="channel_id" widget="selection"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Mailings" colspan="2"/>
-                                <field name="optin" on_change="on_change_optin(optin)"/>
-                                <field name="optout" on_change="on_change_optout(optout)"/>
-                            </group>
-                        </page>
-
-                        <page string="Communication &amp; History" groups="base.group_extended">
-                            <group colspan="4">
-                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
-                            </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="History">
-                                    <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                                <form string="History">
-                                    <group col="4" colspan="4">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" size="512"/>
-                                        <field name="email_cc" size="512"/>
-                                        <field name="name" colspan="4" widget="char" attrs="{'invisible': [('history', '=', False)]}" size="512"/>
-                                        <field name="display_text" colspan="4"   attrs="{'invisible': [('history', '=', True)]}"/>
-                                        <field name="history" invisible="1"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-
-                                                <field name="description" colspan="4" nolabel="1"/>
-                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
-                                            </group>
-
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
-                            </field>
-                            <button string="Add Internal Note"
-                                name="%(crm.action_crm_add_note)d"
-                                context="{'model': 'crm.lead' }"
-                                icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="terp-mail-message-new" type="action" />
-                        </page>
-                        <page string="Extra Info" groups="base.group_extended">
-                            <group col="2" colspan="2">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                                <field name="date_open"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Misc" colspan="2"/>
-                                <field name="active"/>
-                                <field name="day_open"/>
-                                <field name="day_close"/>
-                                <field name="referred"/>
-                            </group>
-                            <separator colspan="4" string="References"/>
-                            <field name="ref"/>
-                            <field name="ref2"/>
-                        </page>
-                        </notebook>
-                    </form>
-                </field>
-            </record>
-
-        <!-- Opportunities Tree View -->
-
-            <record model="ir.ui.view" id="crm_case_tree_view_oppor">
-                <field name="name">Opportunities Tree</field>
-                <field name="model">crm.lead</field>
-                <field name="type">tree</field>
-                <field name="arch" type="xml">
-                    <tree string="Opportunities" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
-                        <field name="date_deadline" invisible="1"/>
-                        <field name="create_date"/>
-                        <field name="name" string="Opportunity"/>
-                        <field name="partner_id" string="Customer"/>
-                        <field name="country_id" invisible="context.get('invisible_country', True)" />
-                        <field name="date_action"/>
-                        <field name="title_action" />
-                        <field name="stage_id"/>
-                        <field name="channel_id" invisible="1"/>
-                        <field name="type_id" invisible="1"/>
-                        <field name="subjects" invisible="1"/>
-                        <button name="stage_previous" string="Previous Stage"
-                            states="open,pending" type="object" icon="gtk-go-back" />
-                        <button name="stage_next" string="Next Stage"
-                            states="open,pending" type="object"
-                            icon="gtk-go-forward" />
-                        <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="user_id"/>
-                        <field name="priority" invisible="1"/>
-                        <field name="categ_id" invisible="1"/>
-                        <field name="state"/>
-                        <button name="case_open" string="Open"
-                            states="draft,pending" type="object"
-                            icon="gtk-go-forward" />
-                        <button name="case_pending" string="Pending"
-                            states="open,draft" type="object"
-                            icon="gtk-media-pause" />
-                        <button name="case_close" string="Won"
-                            states="open,draft,pending" type="object"
-                            icon="gtk-apply" />
-                    </tree>
-                </field>
-            </record>
-
-        <!-- Opportunities Graph View -->
-
-            <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
-                <field name="name">CRM - Opportunity Graph</field>
-                <field name="model">crm.lead</field>
-                <field name="type">graph</field>
-                <field name="arch" type="xml">
-                    <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                        <field name="categ_id"/>
-                        <field name="planned_revenue" operator="+"/>
-                        <field name="state" group="True"/>
-                    </graph>
-                </field>
-            </record>
-
-        <!-- Opportunities Search View -->
-
-            <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
-                <field name="name">CRM - Opportunities Search</field>
-                <field name="model">crm.lead</field>
-                <field name="type">search</field>
-                <field name="arch" type="xml">
-                    <search string="Search Opportunities">
-                        <filter icon="terp-check"
-                            string="Current"  help="Draft, Open and Pending Opportunities"
-                            name="current"
-                            domain="[('state','in',('draft','open','pending'))]"/>
-                        <filter icon="terp-camera_test"
-                            string="Open"  help="Open Opportunities"
-                            domain="[('state','=','open')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Pending"  help="Pending Opportunities"
-                            domain="[('state','=','pending')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name" string="Opportunity"/>
-                        <field name="partner_id" string="Customer"/>
-                        <field name="user_id">
-                            <filter icon="terp-personal-"
-                                domain="[('user_id','=', False)]"
-                                help="Unassigned Opportunities" />
-                        </field>
-                        <field name="section_id"
-                            context="{'invisible_section': False}"
-                            widget="selection">
-                            <filter icon="terp-personal+" groups="base.group_extended"
-                                domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                context="{'invisible_section': False}"
-                                help="My Sales Team(s)" />
-                            <filter icon="terp-personal+" groups="base.group_extended"
-                                context="{'invisible_section': False}"
-                                domain="[]"
-                                help="Show Sales Team"/>
-                        </field>
-
-                        <newline/>
-                        <group expand="0" string="Group By..." colspan="16">
-                            <filter string="Salesman" icon="terp-personal"
-                                domain="[]" context="{'group_by':'user_id'}" />
-                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                            <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                            <separator orientation="vertical" />
-                            <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="Category" icon="terp-stock_symbol-selection"
-                                domain="[]" context="{'group_by':'categ_id'}" />
-                            <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
-                                domain="[]" context="{'group_by':'type_id'}" groups="base.group_extended"/>
-                            <filter string="Channel" icon="terp-call-start"
-                                domain="[]" context="{'group_by':'channel_id'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                            <separator orientation="vertical" />
-                            <filter string="Creation" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'create_date'}" />
-                            <filter string="Exp.Closing"
-                                icon="terp-go-month"
-                                help="Expected Closing" domain="[]"
-                                context="{'group_by':'date_deadline'}" />
-                        </group>
-                    </search>
-                </field>
-            </record>
-
-
-        <!-- Opportunities Graph View -->
-
-            <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
-                <field name="name">CRM - Opportunity Graph</field>
-                <field name="model">crm.lead</field>
-                <field name="type">graph</field>
-                <field name="arch" type="xml">
-                    <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                        <field name="categ_id"/>
-                        <field name="planned_revenue" operator="+"/>
-                        <field name="state" group="True"/>
-                    </graph>
-                </field>
-            </record>
-
-
-
-</data>
-</openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index ecae065beac..9cfdddf159c 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -34,20 +34,20 @@ class crm_phonecall(crm_base, osv.osv):
     _order = "id desc"
     _columns = {
         # From crm.case
-        'id': fields.integer('ID'),
-        'name': fields.char('Call Summary', size=64),
-        'active': fields.boolean('Active', required=False), 
+        'id': fields.integer('ID', readonly=True),
+        'name': fields.char('Call Summary', size=64, required=True),
+        'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
-        'date_action_next': fields.datetime('Next Action', readonly=1), 
+        'date_action_next': fields.datetime('Next Action', readonly=1),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                        select=True, help='Sales team to which Case belongs to.'), 
-        'user_id': fields.many2one('res.users', 'Responsible'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
+                        select=True, help='Sales team to which Case belongs to.'),
+        'user_id': fields.many2one('res.users', 'Responsible'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"), 
-        'company_id': fields.many2one('res.company', 'Company'), 
-        'description': fields.text('Description'), 
+                                 domain="[('partner_id','=',partner_id)]"),
+        'company_id': fields.many2one('res.company', 'Company'),
+        'description': fields.text('Description'),
         'state': fields.selection([
                                     ('draft', 'Draft'), 
                                     ('open', 'Todo'), 
@@ -57,29 +57,24 @@ class crm_phonecall(crm_base, osv.osv):
                                 ], 'State', size=16, readonly=True, 
                                   help='The state is set to \'Todo\', 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\'.'), 
-        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+                                  \nWhen the call is over, the state is set to \'Held\'.\
+                                  \nIf the call needs to be done then the state 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
-        'duration': fields.float('Duration', help="Duration in Minutes"), 
+        'duration': fields.float('Duration', help="Duration in Minutes"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="['|',('section_id','=',section_id),('section_id','=',False),\
-                        ('object_id.model', '=', 'crm.phonecall')]"), 
-        'partner_phone': fields.char('Phone', size=32), 
+                        ('object_id.model', '=', 'crm.phonecall')]"),
+        'partner_phone': fields.char('Phone', size=32),
         'partner_contact': fields.related('partner_address_id', 'name', \
-                                 type="char", string="Contact", size=128), 
-        'partner_mobile': fields.char('Mobile', size=32), 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
-        'canal_id': fields.many2one('res.partner.canal', 'Channel', \
-                        help="The channels represent the different communication\
-                         modes available with the customer." \
-                        " With each commercial opportunity, you can indicate\
-                         the canall which is this opportunity source."), 
+                                 type="char", string="Contact", size=128),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True), 
         'date': fields.datetime('Date'), 
         'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
 
     def _get_default_state(self, cr, uid, context=None):
@@ -88,17 +83,14 @@ class crm_phonecall(crm_base, osv.osv):
         return 'open'
 
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'priority': crm.AVAILABLE_PRIORITIES[2][0], 
         'state':  _get_default_state, 
         'user_id': lambda self,cr,uid,ctx: uid,
-        'active': 1, 
+        'active': 1,
     }
-    
-    
-    
-    # From crm.case
 
+    # From crm.case
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         res = super(crm_phonecall, self).onchange_partner_address_id(cr, uid, ids, add, email)
         res.setdefault('value', {})
@@ -181,23 +173,23 @@ class crm_phonecall(crm_base, osv.osv):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
             context = {
-                        'default_phonecall_id': phonecall.id, 
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, 
-                        'default_email': phonecall.email_from , 
+                        'default_phonecall_id': phonecall.id,
+                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+                        'default_email': phonecall.email_from ,
                         'default_name': phonecall.name
                     }
 
             value = {
-                'name': _('Meetings'), 
-                'domain' : "[('user_id','=',%s)]" % (uid), 
-                'context': context, 
-                'view_type': 'form', 
-                'view_mode': 'calendar,form,tree', 
-                'res_model': 'crm.meeting', 
-                'view_id': False, 
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
-                'type': 'ir.actions.act_window', 
-                'search_view_id': res['res_id'], 
+                'name': _('Meetings'),
+                'domain' : "[('user_id','=',%s)]" % (uid),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'],
                 'nodestroy': True
                 }
 
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 55e7657ec05..0531736572c 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -106,7 +106,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
         <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1}'"/>
-        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 878f9a2e5d8..23f871d1581 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -10,7 +10,7 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
         <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
-        <field name="context">{'object_id':'crm.phonecall'}</field>
+        <field name="context" eval="{'object_id': ref('model_crm_phonecall')}"/>
         <field name="help">Create specific phone call categories to better define the type of calls tracked in the system.</field>
     </record>
 
@@ -107,7 +107,7 @@
                 <field name="description" nolabel="1" colspan="4" />
                 <separator colspan="4" />
                 <group col="8" colspan="4">
-                    <field name="state" select="1" />
+                	<field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
                     <button name="case_cancel" string="Cancel"
                         states="open,pending" type="object"
                         icon="gtk-cancel" />
@@ -182,9 +182,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-check" string="Current"
-                   name="current"
-                   domain="[('state','in', ('open','pending'))]"/>
                <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'))]"
@@ -206,13 +203,13 @@
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
-                   select="1" widget="selection" string="Sales Team">
+                   widget="selection" string="Sales Team">
                    <filter icon="terp-personal+" groups="base.group_extended"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
                <newline/>
-               <group expand="0" string="Group By..." colspan="4">
+               <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-personal"
@@ -226,6 +223,56 @@
            </search>
         </field>
     </record>
+    <!-- Scheduled a phonecall search view-->
+    <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
+        <field name="name">CRM - Scheduled Calls Search</field>
+        <field name="model">crm.phonecall</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Scheduled Phonecalls">
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>    
+               <separator orientation="vertical"/>
+               <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'))]"
+                   name="today"
+                   help="Todays's Phonecalls"
+               />
+               <filter icon="terp-go-week"
+                   string="7 Days"
+                   help="Phonecalls during last 7 days"
+                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+               />
+
+               <separator orientation="vertical"/>
+               <field name="name"/>
+               <field name="partner_id"/>
+               <field name="user_id">
+                   <filter icon="terp-personal-"
+                       domain="[('user_id','=',False)]"
+                       help="Unassigned Phonecalls" />
+               </field>
+               <field name="section_id"
+                   widget="selection" string="Sales Team">
+                   <filter icon="terp-personal+" groups="base.group_extended"
+                       domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       help="My Sales Team(s)" />
+               </field>
+               <newline/>
+               <group expand="0" string="Group By...">
+                   <filter string="Partner" icon="terp-partner" domain="[]"
+                       context="{'group_by':'partner_id'}" />
+                   <filter string="Responsible" icon="terp-personal"
+                       domain="[]" context="{'group_by':'user_id'}" />
+                   <separator orientation="vertical" />
+                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
+                       domain="[]" context="{'group_by':'create_date'}" />
+                   <filter string="Date" icon="terp-go-month" domain="[]"
+                       context="{'group_by':'date'}" help="Date of Call" />
+               </group>
+           </search>
+        </field>
+    </record>   
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 6a8a0438a25..e89e0c1a8d8 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,7 +69,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                   <group col="10" colspan="4">
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Type for this year" />
@@ -78,10 +78,10 @@
                                help="Cases by Team and Type for this month" />
                            <separator orientation="vertical"/>
                            <field name="section_id"
-                               select="1" widget="selection" />
-                           <field name="category2_id" select="1"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                               widget="selection" />
+                           <field name="category2_id"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
                    </group>
                </search>
             </field>
@@ -162,7 +162,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
-                   <group col="8" colspan="4">
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Stage for this year" />
@@ -170,9 +170,9 @@
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Stage for this month" />
                            <separator orientation="vertical"/>
-                        <field name="section_id" select="1" widget="selection"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="section_id" widget="selection"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
                    </group>
                </search>
             </field>
@@ -238,7 +238,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                   <group col='8' colspan='4'>
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Section, Category and Stage for this year" />
@@ -246,9 +246,9 @@
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Section, Category and Stage for this month" />
                            <separator orientation="vertical"/>
-                        <field name="section_id" select="1" widget="selection"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="section_id" widget="selection"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
 
                    </group>
                </search>
@@ -332,7 +332,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                   <group col='12' colspan='4'>
+                   <group>
                            <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by User for this year" />
@@ -340,9 +340,9 @@
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by User for this month" />
                            <separator orientation="vertical"/>
-                        <field name="section_id" select="1" widget="selection"/>
-                        <field name="nbr" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="section_id" widget="selection"/>
+                        <field name="nbr"/>
+                        <field name="state"/>
                    </group>
                </search>
             </field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5b8abc77461..fc01cfd5a05 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -7,7 +7,7 @@
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
-        
+
         <menuitem id="base.menu_crm_config_opportunity" name="Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
 
@@ -21,6 +21,39 @@
             parent="base.menu_base_partner" sequence="11" />
 
 
+        <!-- crm.case.channel -->
+        <record id="crm_case_channel_view_tree" model="ir.ui.view">
+            <field name="name">crm.case.channel.tree</field>
+            <field name="model">crm.case.channel</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Channels">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                </tree>
+            </field>
+        </record>
+        <record id="crm_case_channel_view_form" model="ir.ui.view">
+            <field name="name">crm.case.channel.form</field>
+            <field name="model">crm.case.channel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Channel">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                </form>
+            </field>
+        </record>
+        <record id="crm_case_channel_action" model="ir.actions.act_window">
+            <field name="name">Channels</field>
+            <field name="res_model">crm.case.channel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">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.</field>
+        </record>
+
+        <menuitem action="crm_case_channel_action" id="menu_crm_case_channel" parent="base.menu_crm_config_lead" sequence="4"/>
+
         <!-- Case Sections Form View -->
 
         <record id="crm_case_section_view_form" model="ir.ui.view">
@@ -31,17 +64,17 @@
                 <form string="Sales Team">
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="2"/>
-                        <field name="parent_id" select="2" widget="selection"/>
+                        <field name="parent_id" select="2"/>
                         <field name="code" select="1"/>
                         <newline/>
                         <field name="user_id" select="2"/>
-                        <field name="resource_calendar_id" select="2" widget="selection"/>
+                        <field name="resource_calendar_id" select="2"/>
                         <field name="active" select="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Team">
                             <group col="2" colspan="1">
-                                <separator string="Mailgateway" colspan="2"/>
+                                <separator string="Mail Gateway" colspan="2"/>
                                 <field name="reply_to" select="2"/>
                             </group>
                             <group col="2" colspan="1">
@@ -108,7 +141,6 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="probability"/>
-                    <field name="type" />
                 </tree>
             </field>
         </record>
@@ -122,18 +154,16 @@
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <form string="Stage">
-                    <separator string="Stage Definition" colspan="4"/>
-                    <field name="name" select="1"/>
-                    <field name="type" groups="base.group_extended" />
-                     
-                    <field name="sequence"/>
-                    <field name="probability"/>
-                    <group colspan="4" col="2" >
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="probability"/>
                         <field name="on_change"/>
+                        <field name="case_default"/>
+                        <field name="sequence"/>
                     </group>
                     <separator string="Requirements" colspan="4"/>
                     <field name="requirements" nolabel="1" colspan="4"/>
-            <field name="section_ids" invisible="1" />
+                    <field name="section_ids" invisible="1" colspan="4"/>
                 </form>
             </field>
         </record>
@@ -146,9 +176,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_stage_tree"/>
         </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>
@@ -200,7 +230,7 @@
             <field name="arch" type="xml">
                 <form string="Campaign">
                     <field name="name" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
+                    <field name="section_id"/>
                 </form>
             </field>
         </record>
@@ -352,8 +382,6 @@
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
                     <field name="context_section_id" completion="1"
-                        widget="selection"
-                        context="{'user_prefence':True}"
                         readonly="0"/>
                 </group>
             </field>
@@ -367,54 +395,11 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <group name="default_filters" position="inside">
-                        <field name="context_section_id" completion="1" widget="selection"/>
+                        <field name="context_section_id" completion="1"/>
                     </group>
                 </field>
         </record>
 
-        <!-- Inherit View From Partner  -->
-
-        <record id="view_partners_form_crm1" model="ir.ui.view">
-                <field name="name">view.res.partner.form.crm.inherited1</field>
-                <field name="model">res.partner</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="base.view_partner_form"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <field name="user_id" position="after">
-                        <field name="section_id" completion="1" widget="selection"
-                            groups="base.group_extended"/>
-                    </field>
-                </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="type">tree</field>
-                <field name="inherit_id" ref="base.view_partner_tree"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <field name="country" position="after">
-                        <field name="section_id" completion="1" widget="selection"
-                            groups="base.group_extended"/>
-                    </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="type">search</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" widget="selection"
-                            groups="base.group_extended"/>
-                    </field>
-                </field>
-        </record>
         <!-- 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"/>
 
diff --git a/addons/crm/i18n/ar.po b/addons/crm/i18n/ar.po
index b0dcbe29ab3..fbf4ae5473b 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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1080,7 +1080,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2582,7 +2582,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3092,8 +3092,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/bg.po b/addons/crm/i18n/bg.po
index 31361a7718f..b9909e1330e 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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Кодът на екипа по продажби трябва да са уникален!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Без повторение"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1082,7 +1082,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2584,7 +2584,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3094,8 +3094,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3841,6 +3841,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 #~ "символи!"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Дни    "
diff --git a/addons/crm/i18n/bs.po b/addons/crm/i18n/bs.po
index 54b705f42c8..fdb16697e18 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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1080,7 +1080,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2582,7 +2582,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3092,8 +3092,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index 3c71b71b4ce..20430ff529e 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.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: 2011-08-06 11:01+0000\n"
+"PO-Revision-Date: 2011-08-17 21:32+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-08-07 04:37+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -527,12 +527,12 @@ msgstr "Regla recurrent"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Version 4.2"
-msgstr ""
+msgstr "Versió 4.2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Version 4.4"
-msgstr ""
+msgstr "Versió 4.4"
 
 #. module: crm
 #: help:crm.installer,fetchmail:0
@@ -959,6 +959,36 @@ msgid ""
 "    * My Cases (list)\n"
 "    * Jobs Tracking (graph)\n"
 msgstr ""
+"El sistema genèric de gestió de relacions amb el client d'OpenERP\n"
+"permet a un grup de gent controlar de forma intel·ligent i eficient\n"
+"iniciatives, oportunitats, reunions, trucades, etc.\n"
+"Maneja tasques clau com la comunicació, identificació, priorització,\n"
+"assignació, resolució i notificació.\n"
+"\n"
+"OpenERP s'assegura que tots els casos són seguits pels usuaris, clients i\n"
+"proveïdors. Podeu enviar automàticament recordatoris, escalar la petició, "
+"disparar\n"
+"mètodes específics i moltes altres accions basades en les regles de la seva "
+"empresa.\n"
+"\n"
+"El millor d'aquest sistema és que els usuaris no necessiten fer res\n"
+"especial. Tan sols han d'enviar un correu electrònic al gestor de "
+"seguiments.\n"
+"OpenERP li agrairà el seu missatge, encaminar automàticament a la\n"
+"persona adequada, assegurant-se que tota la correspondència futura arribi "
+"al\n"
+"lloc correcte.\n"
+"\n"
+"El mòdul CRM té una passarel·la de correu per a l'interfície de "
+"sincronització\n"
+"entre correus electrònics i OpenERP.\n"
+"Creeu taulells pel CRM que incloguin:\n"
+"    *Les meves iniciatives(llista)\n"
+"    *Iniciatives per etapa (gràfic)\n"
+"    *Les meves reunions (llista)\n"
+"    *Procés de vendes per etapa (gràfic)\n"
+"    *Els meus casos (llista)\n"
+"    *Seguiment de treballs (gràfic)\n"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -2019,6 +2049,10 @@ msgid ""
 "opportunities. You can also synchronize meetings with your mobile phone "
 "using the caldav interface."
 msgstr ""
+"El calendari de reunions és compartit entre els equips de vendes i integrat "
+"per complet amb altres aplicacions com les vacances de treballadors o les "
+"oportunitats de negoci. Podeu sincronitzar reunions amb el seu telèfon mòbil "
+"utilitzant l'interfície caldav."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
@@ -2471,7 +2505,7 @@ msgstr "La fase de l'oportunitat '%s' ha canviat a '%s'."
 #: code:addons/crm/crm_lead.py:282
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "Estat canviat en:% s"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -4595,3 +4629,9 @@ msgstr "Butlletí de notícies"
 
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Descripció del cas"
+
+#~ msgid "Telesales"
+#~ msgstr "Vendes a distància"
+
+#~ msgid "Mail Campaign 1"
+#~ msgstr "Campanya mail 1"
diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po
index 2554a090162..8ab4a5c3573 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/i18n/cs.po
@@ -4,17 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"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: 2011-07-15 02:26+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\n"
+"PO-Revision-Date: 2011-10-10 21:31+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: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: crm
@@ -32,7 +32,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr ""
+msgstr "Vyžaduje služby"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -173,12 +173,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr ""
+msgstr "Nevytvářet partnera"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Hledat příležitosti"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@@ -199,7 +199,7 @@ msgstr "Varování!"
 #: 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 "Analýza příležitosti"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -234,7 +234,7 @@ msgstr "Organizátor"
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 #: view:res.partner:0
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Naplánovat jiný hovor"
 
 #. module: crm
 #: help:crm.meeting,edit_all:0
@@ -250,7 +250,7 @@ msgstr "Upravit všechny výskyty opakovaného setkání."
 #: view:res.partner:0
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefonní hovor"
 
 #. module: crm
 #: field:crm.lead,optout:0
@@ -275,12 +275,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Poslat nový email"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "Kritérium"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -458,7 +458,7 @@ msgstr "Datum aktualizace"
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Vybrat akci"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -496,7 +496,7 @@ msgstr "Soukromí"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Analýza příležitostí"
 
 #. module: crm
 #: help:crm.meeting,location:0
@@ -511,12 +511,12 @@ msgstr "Pravidlo opakování"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Version 4.2"
-msgstr ""
+msgstr "Verze 4.2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Version 4.4"
-msgstr ""
+msgstr "Verze 4.4"
 
 #. module: crm
 #: help:crm.installer,fetchmail:0
@@ -545,7 +545,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 #, python-format
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Vytvořit příležitost"
 
 #. module: crm
 #: view:crm.installer:0
@@ -596,7 +596,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
 msgid "crm.send.mail.attachment"
-msgstr ""
+msgstr "crm.send.mail.attachment"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -614,7 +614,7 @@ msgstr ""
 #: help:crm.meeting,email_from:0
 #: help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Tito lidé obdrží email."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -645,7 +645,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "Kategorie případu"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -662,7 +662,7 @@ msgstr "Datum ukončení"
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Chyba: Mail není správně formátován"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -680,11 +680,13 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
+"Kategorie partnera, která bude přidána k partnerům, kteří odpovídají "
+"kritériu členění po vypočtení."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
-msgstr ""
+msgstr "Historie komunikace"
 
 #. module: crm
 #: help:crm.phonecall,canal_id:0
@@ -709,7 +711,7 @@ msgstr "Zodpovědný uživatel"
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Partner je již určen u tohoto hovoru."
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -738,7 +740,7 @@ msgstr "Pracovní čas"
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr ""
+msgstr "Řádky členění partnerů"
 
 #. module: crm
 #: view:crm.lead:0
@@ -774,12 +776,12 @@ msgstr ""
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "Členění partnerů"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Pravděpodobný výnos"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -956,7 +958,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Převést na příležitost "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -996,17 +998,17 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Označit jako vítězné"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "Nákupní ástka"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Označit jako ztracené"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1019,7 +1021,7 @@ msgstr "Březen"
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "Byla uzavřena příležitost '%s'."
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -1036,7 +1038,7 @@ msgstr "Ukázat čas jako"
 #: view:crm.phonecall2partner:0
 #, python-format
 msgid "Create Partner"
-msgstr ""
+msgstr "Vytvořit partnera"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1179,7 +1181,7 @@ msgstr "Fáze:"
 #: model:crm.case.stage,name:crm.stage_opportunity5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Vyhrál"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
@@ -1189,12 +1191,12 @@ msgstr "Překročený krajní termín"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Oddělení prodeje"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "Formátování HTML?"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -1218,7 +1220,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Nejnižší"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -1247,7 +1249,7 @@ msgstr "Datum vytvoření"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Potřebuje návrh webu"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
@@ -1281,12 +1283,12 @@ msgstr "Fáze"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "Informace historie"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Pošta partnerovi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1311,7 +1313,7 @@ msgstr "Nechat automaticky opakovat události v intervalu"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Pole podmíněného případu"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1331,7 +1333,7 @@ msgstr "Fáze"
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Očekávaný výnos"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -1356,28 +1358,28 @@ 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 ""
+msgstr "Analýza telefonních hovorů"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Datum otevření"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Trvání v minutách"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
-msgstr ""
+msgstr "Spravuje službu technické podpory."
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Jméno příležitosti"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1405,12 +1407,12 @@ msgstr "Pá"
 #. 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 "Datum zápisu"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1438,12 +1440,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 #: view:res.partner:0
 msgid "Create a Partner"
-msgstr ""
+msgstr "Vytvořit partnera"
 
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr ""
+msgstr "Stav vykonání"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1472,7 +1474,7 @@ msgstr "ID"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Partner k příležitosti"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1496,7 +1498,7 @@ msgstr "Rozšířené filtry..."
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Souhrn příležitosti"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1506,7 +1508,7 @@ msgstr "Hledat"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Příležitosti podle kategorií"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1540,7 +1542,7 @@ msgstr "Kód"
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Podřízené týmy"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1587,7 +1589,7 @@ msgstr "res.users"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "Sloučit dvě příležitosti"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -1610,11 +1612,12 @@ msgstr "Pravidlo výjimky"
 #: 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 ""
+"Zaškrtněte toto pokud chcete pravidlo pro odeslání emailu partnerovi."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Kategorie hovorů"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1624,17 +1627,17 @@ msgstr "Pozvat lidi"
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní prodejní týmy."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Hledat setkání"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr ""
+msgstr "Prodejní množství"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:141
@@ -1645,12 +1648,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Nepotvrzené"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1689,7 +1692,7 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Moje případy"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
@@ -1735,7 +1738,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Převést"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1758,12 +1761,12 @@ msgstr "Pátý"
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "_Schedule"
-msgstr ""
+msgstr "_Naplánovat"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Prodleva do ukončení"
 
 #. module: crm
 #: field:crm.meeting,we:0
@@ -1773,12 +1776,12 @@ msgstr "St"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Případný přeprodejce"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Plánovaný výnos"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1802,12 +1805,12 @@ msgstr "Podrobnosti pozvání"
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Nadřazený tým"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Datum další akce"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1828,7 +1831,7 @@ msgstr "Zip"
 #: code:addons/crm/crm_lead.py:213
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "Byl otevřen případ '%s'."
 
 #. module: crm
 #: view:crm.installer:0
@@ -1840,7 +1843,7 @@ msgstr "nadpis"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Příchozí"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -1853,12 +1856,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Telefonní hovory"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication  History"
-msgstr ""
+msgstr "Historie komunikace"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
@@ -1868,12 +1871,12 @@ msgstr "Volný"
 #. module: crm
 #: view:crm.installer:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Synchronizace"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
 msgid "Allow Delete"
-msgstr ""
+msgstr "Umožnit smazání"
 
 #. module: crm
 #: field:crm.meeting,mo:0
@@ -1923,13 +1926,13 @@ msgstr "Hodnota"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Příležitost podle kategorií"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Jméno zákazníka"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -1948,7 +1951,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odpovědět-komu"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1975,14 +1978,14 @@ msgstr ""
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Převést na příležitost"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "Drženo"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2001,17 +2004,17 @@ msgstr "Další informace"
 #: 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 "Sloučit příležitosti"
 
 #. 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
@@ -2107,12 +2110,12 @@ msgstr "URL Caldav"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Očekávané výnosy"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: help:crm.lead,type:0
@@ -2152,7 +2155,7 @@ msgstr "Opakovat x-krát"
 #: 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 "Prodejní tým"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
@@ -2169,24 +2172,24 @@ msgstr "Členění"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Tým"
 
 #. module: crm
 #: field:crm.installer,outlook:0
 msgid "MS-Outlook"
-msgstr ""
+msgstr "MS-Outlook"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "Nedrženo"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "qPravděpodobnost"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2224,7 +2227,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Vytvořit nového partnera"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2256,7 +2259,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Nulovat na nepotvrzené"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:40
@@ -2300,7 +2303,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Vnitřní setkání"
 
 #. module: crm
 #: code:addons/crm/crm.py:411
@@ -2320,13 +2323,13 @@ msgstr "Čekající"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Setkání se zákazníkem"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Celkové CC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2334,13 +2337,13 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: view:res.partner:0
 msgid "Phone Calls"
-msgstr ""
+msgstr "Telefonní hovory"
 
 #. 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 "Počet dní do otevření případu"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2367,17 +2370,17 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:282
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "Fáze změněna na: %s"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "Povinný výraz"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2387,7 +2390,7 @@ msgstr "Nejistý"
 #. module: crm
 #: field:crm.send.mail,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -2422,12 +2425,12 @@ msgstr "Akce"
 #. module: crm
 #: field:crm.installer,crm_claim:0
 msgid "Claims"
-msgstr ""
+msgstr "Nároky"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr ""
+msgstr "Pokles (0>1)"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -2447,7 +2450,7 @@ msgstr "Týdně"
 #: code:addons/crm/wizard/crm_send_email.py:270
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "Nelze odeslat poštu!"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2475,7 +2478,7 @@ msgstr "Opakovat každých (Dny/Týden/Měsíc/Rok)"
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr ""
+msgstr "Max. rozmezí"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
@@ -2520,7 +2523,7 @@ msgstr "Opakovat každých"
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Technická podpora"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
@@ -2531,28 +2534,28 @@ msgstr "Opakovaný"
 #: code:addons/crm/crm.py:397
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "Byl zrušen případ '%s'."
 
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Příležitosti podle ocenění"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
 msgid "Send new email"
-msgstr ""
+msgstr "Poslat nový email"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Moje otevřené příležitosti"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "CRM - Statistická nástěnka"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2565,7 +2568,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Hlavní zaměstnání"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2582,13 +2585,13 @@ msgstr ""
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Typ setkání"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr ""
+msgstr "Sloučit s existující příležitostí"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2629,7 +2632,7 @@ msgstr ""
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2646,7 +2649,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Prodleva do otevření"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2661,7 +2664,7 @@ msgstr "Den v týdnu"
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Odkazující"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
@@ -2681,7 +2684,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "Pokračovat v postupu"
 
 #. module: crm
 #: view:crm.installer:0
@@ -2691,7 +2694,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Telefonní hovor partnerovi"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -2710,14 +2713,14 @@ msgstr "Přiřadit k"
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Nastav nový stav na"
 
 #. 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 "Poslední akce"
 
 #. module: crm
 #: field:crm.meeting,duration:0
@@ -2729,14 +2732,14 @@ msgstr "Trvání"
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Odpovědět komu"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Nástěnka obchodu"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:56
@@ -2748,13 +2751,13 @@ msgstr ""
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# z případů"
 
 #. module: crm
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Prodejní tým, ke kterému patří případ."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2771,7 +2774,7 @@ msgstr "Čtvrtý"
 #: selection:crm.merge.opportunity,state:0
 #: selection:crm.send.mail,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Nezměněno"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
@@ -2803,7 +2806,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Přiřazení"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2828,13 +2831,13 @@ msgstr "Celý den"
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "Povinné / Volitelné"
 
 #. 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 "Pozvání na setkání"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2844,18 +2847,18 @@ msgstr "Jméno objektu"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "E-mailová adresa kontaktu"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Odkazováno podle"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Přidat vnitřní poznámku"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
@@ -2893,7 +2896,7 @@ msgstr "Chyba!"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Souhrn hovoru"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2910,18 +2913,18 @@ msgstr "Zrušeno"
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Tělo poznámky"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Moje plánované výnosy podle fáze"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Datum uzavření"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2932,7 +2935,7 @@ msgstr "   Měsíc   "
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Odkazy"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2984,7 +2987,7 @@ msgstr "Varování"
 #: field:crm.phonecall,name:0
 #: view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Souhrn hovoru"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2994,12 +2997,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Hovor k hovoru"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Plánovat/Zaznamenat hovor"
 
 #. module: crm
 #: field:crm.installer,fetchmail:0
@@ -3031,12 +3034,12 @@ msgstr "Ne"
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Sekce"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Celkem z plánovaných výnosů"
 
 #. module: crm
 #: code:addons/crm/crm.py:375
@@ -3049,7 +3052,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr ""
+msgstr "Volitelný výraz"
 
 #. module: crm
 #: selection:crm.meeting,select1:0
@@ -3059,7 +3062,7 @@ msgstr "Den v měsíci"
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Úspěšnost (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3092,7 +3095,7 @@ msgstr "Kanál"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule Call"
-msgstr ""
+msgstr "Plánovaný hovor"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
@@ -3150,7 +3153,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Potřebuje informace"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3161,12 +3164,12 @@ msgstr ""
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "Nastavení aplikace CRM"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Nastavit kategorii na"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3198,7 +3201,7 @@ msgstr "    Měsíc-1    "
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr ""
+msgstr "Vztažené prodeje tohoto modulu z případů příležitostí v CRM"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -3283,22 +3286,22 @@ msgstr "Obchodník"
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Očekávané ukončení"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Příležitosti podle hovorů"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "Umožňuje odstranit případy, které nejsou koncept"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Naplánovat setkání"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3310,19 +3313,19 @@ msgstr "Jméno partnera"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Odchozí"
 
 #. module: crm
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Otevřené"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Členové týmu"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3336,7 +3339,7 @@ msgstr "Kontakty"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Zájem v počítačích"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3346,7 +3349,7 @@ msgstr "Podrobnosti pozvání"
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "Výchozí (0=Žádné)"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3355,6 +3358,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Tyto emailové adresy budou přidány do pole CC všech příchozích a odchozích "
+"emailů pro tento záznam před odesláním. Oddělte více emailových adres pomocí "
+"čárky"
 
 #. module: crm
 #: constraint:res.partner:0
@@ -3365,7 +3371,7 @@ msgstr "Chyba ! Nemůžete vytvořit rekurzivní asociované členy."
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Pravděpodobnost úspěchu"
 
 #. module: crm
 #: code:addons/crm/crm.py:426
@@ -3383,7 +3389,7 @@ msgstr "Koncept"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Případy podle obchodních týmů"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
@@ -3402,7 +3408,7 @@ msgstr "Setkání"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Kategorie případů"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3413,12 +3419,12 @@ msgstr "7 dnů"
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Plánovaný výnos podle fáze a uživatele"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Komunikace & historie"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -3447,19 +3453,19 @@ msgstr "Ulice 2"
 #: 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 "Kategorie setkání"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Měli byste ověřit, že tento partner již neexistuje."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Prodleva do otevření"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -3478,7 +3484,7 @@ msgstr "Listopad"
 #: code:addons/crm/crm_action_rule.py:67
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Pro vaši adresu společnosti nebylo nalezeno ID e-mailu!"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3488,7 +3494,7 @@ msgstr "Příležitosti podle fáze"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Naplánovat hovor"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3509,7 +3515,7 @@ msgstr ""
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Smlouva"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
@@ -3528,30 +3534,30 @@ msgstr "Chyba"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Plánované výnosy"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Potřebuje konzultaci"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní profily."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:232
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "Byl uzavřen případ '%s'."
 
 #. 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 "Kontakt partnera"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
@@ -3567,7 +3573,7 @@ msgstr "Nemůžete mít dva uživatele se stejným přihlašovacím jménem !"
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr ""
+msgstr "Sloučeno do Příležitosti: %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:347
@@ -3582,12 +3588,12 @@ msgstr "Uzavřít"
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Categorization"
-msgstr ""
+msgstr "Kategorizace"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Pravidla akcí"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
@@ -3597,7 +3603,7 @@ msgstr "Opakování"
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Telefonní hovor"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -3628,7 +3634,7 @@ msgstr "_Přidat"
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Stav mysli"
 
 #. module: crm
 #: field:crm.case.section,note:0
@@ -3671,13 +3677,13 @@ msgstr "Květen"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Zájem v příslušenství"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "Byla otevřena příležitost '%s'."
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3692,7 +3698,7 @@ msgstr "Ulice"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Příležitosti podle uživatele a týmu"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3717,7 +3723,7 @@ msgstr "Únor"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 #: view:res.partner:0
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Naplánovat setkání"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -3761,12 +3767,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Hovory podle uživatele a sekce"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Sloučit s existující příležitostí"
 
 #. module: crm
 #: field:crm.meeting,select1:0
@@ -3782,7 +3788,7 @@ msgstr "Vyjednávání"
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Oček.uzavření"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3814,12 +3820,12 @@ msgstr "Druhý"
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Návrh"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Telefonní hovory"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3848,3 +3854,6 @@ msgstr "Zpravodaj"
 
 #~ msgid "CRM & SRM"
 #~ msgstr "CRM & SRM"
+
+#~ msgid "Action Information"
+#~ msgstr "Action Information"
diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po
new file mode 100644
index 00000000000..f7b7feadb2a
--- /dev/null
+++ b/addons/crm/i18n/da.po
@@ -0,0 +1,3833 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-08 21:47+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: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Leads"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor3
+msgid "Need Services"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Monthly"
+msgstr "Månedligt"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "Schedule a PhoneCall"
+msgstr "Planlæg et telefon kald"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_stage
+msgid "Stage of case"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Visibility"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,title:0
+msgid "Title"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Select Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid " "
+msgstr " "
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.phonecall.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Previous Stage"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#, python-format
+msgid "Can not add note!"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,day:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: crm
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:228
+#, python-format
+msgid "The lead '%s' has been closed."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#: code:addons/crm/wizard/crm_lead_to_partner.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel!"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Yearly"
+msgstr "Årligt"
+
+#. module: crm
+#: field:crm.segmentation.line,name:0
+msgid "Rule Name"
+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 "Kampagne"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+msgid "Do not create a partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Opportunities"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#, python-format
+msgid ""
+"Opportunity must have Partner assigned before merging with other Opportunity."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid "Warning!"
+msgstr "Advarsel!"
+
+#. 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 ""
+
+#. module: crm
+#: field:crm.lead,partner_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,partner_id:0
+#: field:crm.lead2opportunity,partner_id:0
+#: field:crm.lead2opportunity.partner,partner_id:0
+#: field:crm.lead2partner,partner_id:0
+#: view:crm.meeting:0
+#: field:crm.meeting,partner_id:0
+#: field:crm.partner2opportunity,partner_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,partner_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,partner_id:0
+#: field:crm.phonecall2opportunity,partner_id:0
+#: field:crm.phonecall2partner,partner_id:0
+#: model:ir.model,name:crm.model_res_partner
+#: model:process.node,name:crm.process_node_partner0
+msgid "Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall2phonecall:0
+#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+#: view:res.partner:0
+msgid "Schedule Other Call"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
+#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:89
+#: model:crm.case.categ,name:crm.categ_meet3
+#: view:crm.phonecall:0
+#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
+#: view:res.partner:0
+#, python-format
+msgid "Phone Call"
+msgstr "Telefonopkald"
+
+#. module: crm
+#: field:crm.lead,optout:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:108
+#, python-format
+msgid "The opportunity '%s' has been marked as lost."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Send New Email"
+msgstr "Send ny email"
+
+#. module: crm
+#: field:crm.segmentation,segmentation_line:0
+msgid "Criteria"
+msgstr "Kriterier"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Excluded Answers :"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "_Merge"
+msgstr ""
+
+#. 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 ""
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+msgid ""
+"If you select Merge with existing Opportunity, the lead details(with the "
+"communication history) will be merged with existing Opportunity of Selected "
+"partner."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Public"
+msgstr "Offentlig"
+
+#. 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 "Kampagner"
+
+#. 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 "Kategorier"
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Forever"
+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 ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadpartner0
+msgid "Prospect Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,contact_name:0
+msgid "Contact Name"
+msgstr "Kontaktnavn"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Link to an existing partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.phonecall,partner_contact:0
+msgid "Contact"
+msgstr "Kontaktperson"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Enhance your core CRM Application with additional functionalities."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,on_change:0
+msgid "Change Probability Automatically"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,regex_history:0
+msgid "Regular Expression on Case History"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:209
+#, python-format
+msgid "The lead '%s' has been opened."
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_opportunitymeeting0
+msgid "Opportunity Meeting"
+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 ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_opportunities0
+msgid "When a real project/opportunity is detected"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,crm_fundraising:0
+msgid "Fundraising"
+msgstr ""
+
+#. module: crm
+#: view:res.partner:0
+#: field:res.partner,opportunity_ids:0
+msgid "Leads and Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send"
+msgstr "_Send"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication"
+msgstr "Kommunikation"
+
+#. module: crm
+#: field:crm.case.section,change_responsible:0
+msgid "Change Responsible"
+msgstr ""
+
+#. module: crm
+#: field:crm.merge.opportunity,state:0
+msgid "Set State To"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls list all the calls to be done by your sales team. A salesman "
+"can record the information about the call in the form view. This information "
+"will be stored in the partner form to trace every contact you have with a "
+"customer. You can also import a .CSV file with a list of calls to be done by "
+"your sales team."
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_action
+msgid "Convert/Merge Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,write_date:0
+msgid "Update Date"
+msgstr "Opdater dato"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: field:crm.lead2opportunity.action,name:0
+msgid "Select Action"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_categ_id:0
+#: view:crm.lead:0
+#: field:crm.lead,categ_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,categ_id:0
+#: field:crm.opportunity2phonecall,categ_id:0
+#: field:crm.phonecall,categ_id:0
+#: field:crm.phonecall.report,categ_id:0
+#: field:crm.phonecall2phonecall,categ_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "#Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor2
+msgid "Campaign 1"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor1
+msgid "Campaign 2"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Privacy"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunity Analysis"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead1
+msgid "Version 4.2"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead2
+msgid "Version 4.4"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,fetchmail:0
+msgid "Allows you to receive E-Mails from POP/IMAP server."
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_opportunitymeeting0
+msgid "Normal or phone meeting for opportunity"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_leads0
+msgid "Very first contact with new prospect"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:278
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
+#: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
+#: model:ir.actions.act_window,name:crm.crm_partner2opportunity
+#, python-format
+msgid "Create Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:378
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Escalate"
+msgstr ""
+
+#. module: crm
+#: model:ir.module.module,shortdesc:crm.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Not Running"
+msgstr ""
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_reply_mail
+msgid "Reply to last Mail"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,email:0
+msgid "E-Mail"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,wiki_sale_faq:0
+msgid "Sale FAQ"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail_attachment
+msgid "crm.send.mail.attachment"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Included Answers :"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,email_from:0
+#: help:crm.phonecall,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "State of Mind Computation"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,change_responsible:0
+msgid ""
+"Thick this box if you want that on escalation, the responsible of this sale "
+"team automatically becomes responsible of the lead/opportunity escaladed"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,outlook:0
+#: help:crm.installer,thunderbird:0
+msgid ""
+"Allows you to link your e-mail to OpenERP's documents. You can attach it to "
+"any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: crm
+#: view:crm.case.categ:0
+msgid "Case Category"
+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 ""
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling Options"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "#Phone calls"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication history"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,canal_id:0
+msgid ""
+"The channels represent the different communication                         "
+"modes available with the customer. With each commercial opportunity, you can "
+"indicate                         the canall which is this opportunity source."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_meeting.py:93
+#, python-format
+msgid "The meeting '%s' has been confirmed."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
+#, python-format
+msgid "A partner is already defined on this phonecall."
+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 ""
+
+#. module: crm
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation.line:0
+msgid "Partner Segmentation Lines"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+msgid "Details"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,crm_caldav:0
+msgid ""
+"Helps you to synchronize the meetings with other calendar clients and "
+"mobiles."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,crm_claim:0
+msgid ""
+"Manages the suppliers and customers claims, including your corrective or "
+"preventive actions."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Form"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,probable_revenue:0
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,name:0
+msgid "The name of the segmentation."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,probability:0
+#: field:crm.lead,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Generation"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
+msgid "Statistics Dashboard"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
+#: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+#: field:crm.lead2opportunity,name:0
+#: field:crm.meeting,opportunity_id:0
+#: field:crm.phonecall,opportunity_id:0
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead7
+msgid "Television"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,crm_caldav:0
+msgid "Calendar Synchronizing"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Stop Process"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Search Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,act_section_id:0
+msgid "Set Team to"
+msgstr ""
+
+#. module: crm
+#: view:calendar.attendee:0
+#: field:calendar.attendee,categ_id:0
+msgid "Event Type"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_installer
+msgid "crm.installer"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,exclusif:0
+msgid "Exclusive"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:91
+#, python-format
+msgid "The opportunity '%s' has been won."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: crm
+#: model:ir.module.module,description:crm.module_meta_information
+msgid ""
+"The generic OpenERP Customer Relationship Management\n"
+"system enables a group of people to intelligently and efficiently manage\n"
+"leads, opportunities, meeting, phonecall etc.\n"
+"It manages key tasks such as communication, identification, prioritization,\n"
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and\n"
+"suppliers. It can automatically send reminders, escalate the request, "
+"trigger\n"
+"specific methods and lots of other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do "
+"anything\n"
+"special. They can just send email to the request tracker. OpenERP will take\n"
+"care of thanking them for their message, automatically routing it to the\n"
+"appropriate staff, and make sure all future correspondence gets to the "
+"right\n"
+"place.\n"
+"\n"
+"The CRM module has a email gateway for the synchronisation interface\n"
+"between mails and OpenERP. \n"
+"Create dashboard for CRM that includes:\n"
+"    * My Leads (list)\n"
+"    * Leads by Stage (graph)\n"
+"    * My Meetings (list)\n"
+"    * Sales Pipeline by Stage (graph)\n"
+"    * My Cases (list)\n"
+"    * Jobs Tracking (graph)\n"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,create_date:0
+#: field:crm.phonecall.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Sales Purchase"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0
+#: field:crm.case.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "Convert To Opportunity "
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of case stages."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.merge.opportunity,opportunity_ids:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
+#: model:ir.ui.menu,name:crm.menu_crm_case_opp
+#: model:process.node,name:crm.process_node_opportunities0
+msgid "Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,categ_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0
+#: model:ir.actions.act_window,name:crm.action_crm_add_note
+msgid "Add Note"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,is_supplier_add:0
+msgid "Supplier"
+msgstr ""
+
+#. module: crm
+#: help:crm.send.mail,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Won"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Purchase Amount"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Lost"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:230
+#, python-format
+msgid "The opportunity '%s' has been closed."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Show time as"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:264
+#: view:crm.phonecall2partner:0
+#, python-format
+msgid "Create Partner"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "<"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,mobile:0
+#: field:crm.phonecall,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Next Stage"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "My Meetings"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,optin:0
+msgid "Opt-In"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:208
+#: code:addons/crm/crm_phonecall.py:185
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
+#: view:crm.meeting:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_meeting_sale
+#: view:res.partner:0
+#: field:res.partner,meeting_ids:0
+#, python-format
+msgid "Meetings"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,date_deadline:0
+msgid "Deadline"
+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 ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,user_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+#: view:res.partner:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm
+#: view:res.partner:0
+msgid "Previous"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Statistics"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: view:res.partner:0
+msgid "Next"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Stage:"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead5
+#: model:crm.case.stage,name:crm.stage_opportunity5
+#: view:crm.lead:0
+msgid "Won"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.section_sales_department
+msgid "Sales Department"
+msgstr ""
+
+#. module: crm
+#: field:crm.send.mail,html:0
+msgid "HTML formatting?"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,type:0
+#: field:crm.lead,type:0
+#: field:crm.lead.report,type:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Type"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Compute Segmentation"
+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 "Lowest"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.send.mail:0
+#: field:crm.send.mail.attachment,binary:0
+msgid "Attachment"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,create_date:0
+#: field:crm.lead.report,creation_date:0
+#: field:crm.meeting,create_date:0
+#: field:crm.phonecall,create_date:0
+#: field:crm.phonecall.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor5
+msgid "Need a Website Design"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.send.mail,subject:0
+#: view:res.partner:0
+msgid "Subject"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:300
+#: view:crm.case.stage:0
+#: view:crm.lead:0
+#: field:crm.lead,stage_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,stage_id:0
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,act_mail_to_partner:0
+msgid "Mail to Partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mailings"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Repeat"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition Case Fields"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,stage_ids:0
+#: view:crm.case.stage:0
+#: model:ir.actions.act_window,name:crm.crm_case_stage_act
+#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.actions.act_window,name:crm.crm_opportunity_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,planned_revenue:0
+#: field:crm.lead2opportunity,planned_revenue:0
+#: field:crm.partner2opportunity,planned_revenue:0
+#: field:crm.phonecall2opportunity,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better define the type of calls "
+"tracked in the system."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,partner_id:0
+msgid "Max Partner ID processed"
+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 ""
+
+#. module: crm
+#: field:crm.lead.report,opening_date:0
+#: field:crm.phonecall.report,opening_date:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,crm_helpdesk:0
+msgid "Manages a Helpdesk service."
+msgstr ""
+
+#. module: crm
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reminder"
+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 ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
+#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+#: view:res.partner:0
+msgid "Create a Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,state:0
+msgid "Execution Status"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: crm
+#: field:crm.add.note,attachment_ids:0
+#: field:crm.case.section,complete_name:0
+#: field:crm.send.mail,attachment_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,id:0
+#: field:crm.meeting,id:0
+#: field:crm.phonecall,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner2opportunity
+msgid "Partner To Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: 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 ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+#: view:crm.meeting:0
+#: view:crm.phonecall.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Description"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+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 ""
+
+#. module: crm
+#: field:crm.case.section,code:0
+msgid "Code"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,child_ids:0
+msgid "Child Teams"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,state:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,state:0
+#: view:crm.meeting:0
+#: field:crm.meeting,state:0
+#: field:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "References"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:392
+#: view:crm.lead:0
+#: view:crm.lead2opportunity:0
+#: view:crm.lead2opportunity.action:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: view:res.partner:0
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge two Opportunities"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+msgid "Current"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,exrule:0
+msgid "Exception Rule"
+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 ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
+msgid "Phonecall Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invite People"
+msgstr ""
+
+#. module: crm
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Sale Amount"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Unable to send mail. Please check SMTP is configured properly."
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "="
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,name:0
+#: field:crm.installer,name:0
+#: field:crm.lead,name:0
+#: field:crm.segmentation,name:0
+#: field:crm.send.mail.attachment,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+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 ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,birthdate:0
+msgid "Birthdate"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "The"
+msgstr ""
+
+#. module: crm
+#: field:crm.send.mail.attachment,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,section_id:0
+msgid ""
+"Sales team to which this case belongs to. Defines responsible user and e-"
+"mail address for the mail gateway."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Creation"
+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 "High"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_partner0
+msgid "Convert to prospect to business partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "_Convert"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+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 ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fifth"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2phonecall:0
+msgid "_Schedule"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor6
+msgid "Potential Reseller"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,planned_revenue:0
+msgid "Planned Revenue"
+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 "Group By..."
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,partner_id:0
+msgid "Optional linked partner, usually after conversion of the lead"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,parent_id:0
+msgid "Parent Team"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Hours"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:213
+#, python-format
+msgid "The case '%s' has been opened."
+msgstr ""
+
+#. module: crm
+#: view:crm.installer:0
+msgid "title"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone1
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
+msgid "Inbound"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,probability:0
+msgid ""
+"This percentage depicts the default/average probability of the Case for this "
+"stage to be a success"
+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 ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication  History"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Free"
+msgstr ""
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Synchronization"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,allow_unlink:0
+msgid "Allow Delete"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,mo:0
+msgid "Mon"
+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 "Highest"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form to trace every contact you have "
+"with a partner. From the phone call form, you can trigger a request for "
+"another call, a meeting or an opportunity."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: view:crm.lead:0
+#: field:crm.lead,description:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Days"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_value:0
+msgid "Value"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+msgid "Opportunity by Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2opportunity
+msgid "Phonecall To Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Select stages for this Sales Team"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadpartner0
+msgid "Prospect is converting to business partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
+msgid "Convert To Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Held"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr ""
+
+#. 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 ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead5
+msgid "Google Adwords"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall
+msgid "crm.phonecall"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead3
+msgid "Mail Campaign 2"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:492
+#, python-format
+msgid "Send"
+msgstr ""
+
+#. 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 ""
+
+#. module: crm
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
+msgid "Lead To Opportunity Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,location:0
+msgid "Location"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid "Error !"
+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 ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_segmentation_line
+msgid "Segmentation line"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Expected Revenues"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead6
+msgid "Google Adwords 2"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,type:0
+#: help:crm.lead.report,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "Are you sure you want to create a partner based on this Phonecall ?"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Define a Sales Team to organize your different salesmen or sales departments "
+"into separate teams. Each team will work in its own list of opportunities, "
+"sales orders, etc. Each user can set a default team in his user preferences. "
+"The opportunities and sales order displayed, will automatically be filtered "
+"according to his team."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. 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 ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2partner
+msgid "Lead to Partner"
+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 ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Team"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,outlook:0
+msgid "MS-Outlook"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Not Held"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,month:0
+#: field:crm.meeting,month_list:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
+#: model:process.node,name:crm.process_node_leads0
+msgid "Leads"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"Leads allow you to manage and keep track of all initial contacts with a "
+"prospect or partner showing interest in your products or services. A lead is "
+"usually the first step in your sales cycle. Once qualified, a lead may be "
+"converted into a business opportunity, while creating the related partner "
+"for further detailed tracking of any linked activities. You can import a "
+"database of prospects, keep track of your business cards or integrate your "
+"website's contact form with the OpenERP Leads. Leads can be connected to the "
+"email gateway: new emails may create leads, each of them automatically gets "
+"the history of the conversation with the prospect."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Create a new partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr ""
+
+#. module: crm
+#: selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+msgid "Todo"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Delegate"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Decline"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,optin:0
+msgid "If opt-in is checked, this contact has accepted to receive emails."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reset to Unconfirmed"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:40
+#: view:crm.add.note:0
+#, python-format
+msgid "Note"
+msgstr ""
+
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: field:crm.lead,date_closed:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: field:crm.meeting,date_closed:0
+#: selection:crm.merge.opportunity,state:0
+#: field:crm.phonecall,date_closed:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Plug-In"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet2
+msgid "Internal Meeting"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:411
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Pending"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet1
+msgid "Customer Meeting"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone
+#: view:res.partner:0
+msgid "Phone Calls"
+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 ""
+
+#. module: crm
+#: field:crm.lead,phone:0
+#: field:crm.phonecall,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,active:0
+#: field:crm.lead,active:0
+#: view:crm.lead.report:0
+#: field:crm.meeting,active:0
+#: field:crm.phonecall,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:306
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:282
+#, python-format
+msgid "Changed Stage to: %s"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Mandatory Expression"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid ">"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: crm
+#: field:crm.send.mail,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_send_mail
+msgid "Send Mail"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,wiki_sale_faq:0
+msgid ""
+"Helps you manage wiki pages for Frequently Asked Questions on Sales "
+"Application."
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,crm_fundraising:0
+msgid "This may help associations in their fundraising process and tracking."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2partner,action:0
+#: field:crm.phonecall2partner,action:0
+msgid "Action"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,crm_claim:0
+msgid "Claims"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval_decrease:0
+msgid "Decrease (0>1)"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.lead:0
+#: view:crm.send.mail:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Can not send mail!"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor8
+#: view:crm.meeting:0
+msgid "Other"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: selection:crm.meeting,state:0
+#: selection:crm.phonecall,state:0
+msgid "Done"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval_max:0
+msgid "Max Interval"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "_Schedule Call"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:326
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: view:crm.phonecall:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#: view:res.partner:0
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,city:0
+msgid "City"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Busy"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,crm_helpdesk:0
+msgid "Helpdesk"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:397
+#, python-format
+msgid "The case '%s' has been cancelled."
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,sale_crm:0
+msgid "Opportunity to Quotation"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail
+msgid "Send new email"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.act_my_oppor
+msgid "My Open Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
+msgid "CRM - Statistics Dashboard"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,job_id:0
+msgid "Main Job"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_max_history:0
+msgid "Maximum Communication History"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+msgid "Are you sure you want to create a partner based on this lead ?"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,categ_id:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
+#, python-format
+msgid "Merge with Existing Opportunity"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,state:0
+#: help:crm.phonecall,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 ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,som_interval_max:0
+msgid ""
+"The computation is made on all events that occured during this interval, the "
+"past X periods."
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,thunderbird:0
+msgid "Thunderbird"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# of Emails"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+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 ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Referrer"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity
+msgid "Lead To Opportunity"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Test"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Continue Process"
+msgstr ""
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure Your CRM Application"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2partner
+msgid "Phonecall to Partner"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,partner_name:0
+msgid ""
+"The name of the future partner that will be created while converting the "
+"into opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,user_id:0
+#: field:crm.phonecall2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: crm
+#: field:crm.add.note,state:0
+#: field:crm.send.mail,state:0
+msgid "Set New State To"
+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 ""
+
+#. module: crm
+#: field:crm.meeting,duration:0
+#: field:crm.phonecall,duration:0
+#: field:crm.phonecall.report,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: crm
+#: field:crm.send.mail,reply_to:0
+msgid "Reply To"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.open_board_crm
+#: model:ir.ui.menu,name:crm.menu_board_crm
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_partner.py:56
+#, python-format
+msgid "A partner is already defined on this lead."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,nbr:0
+#: field:crm.phonecall.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,section_id:0
+#: help:crm.phonecall,section_id:0
+msgid "Sales team to which Case belongs to."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.send.mail,state:0
+msgid "Unchanged"
+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 ""
+
+#. module: crm
+#: field:crm.lead,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"With opportunities you can manage and keep track of your sales pipeline by "
+"creating specific customer- or prospect-related sales documents to follow up "
+"potential sales. Information such as expected revenue, opportunity stage, "
+"expected closing date, communication history and much more can be stored. "
+"Opportunities can be connected to the email gateway: new emails may create "
+"opportunities, each of them automatically gets the history of the "
+"conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Assignment"
+msgstr ""
+
+#. 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 ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,operator:0
+msgid "Mandatory / Optional"
+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 ""
+
+#. module: crm
+#: field:crm.case.categ,object_id:0
+msgid "Object Name"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "E-mail address of the contact"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.model,name:crm.model_crm_add_note
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:304
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,on_change:0
+msgid "Change Probability on next and previous stages."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:455
+#: code:addons/crm/crm.py:457
+#: code:addons/crm/crm_action_rule.py:66
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
+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.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm
+#: field:crm.add.note,body:0
+msgid "Note Body"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Links"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's activities to better "
+"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 ""
+
+#. 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 ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Mailgateway"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,user_id:0
+msgid "By Default Salesman is Administrator when create New User"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall,name:0
+#: view:res.partner:0
+msgid "Call Summary"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule/Log Call"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,fetchmail:0
+msgid "Fetch Emails"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: crm
+#: help:crm.send.mail,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Confirm"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Total of Planned Revenue"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid ""
+"You can not escalate, You are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Optional Expression"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity,probability:0
+msgid "Success Rate (%)"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead1
+#: model:crm.case.stage,name:crm.stage_opportunity1
+msgid "New"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Mail TO"
+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 ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,channel_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,channel_id:0
+#: field:crm.phonecall,canal_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
+msgid "Schedule Call"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,exclusif:0
+msgid ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions.                        \n"
+"If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,date_deadline:0
+msgid ""
+"Deadline Date is automatically                         computed from Start "
+"Date + Duration"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,state_id:0
+msgid "Fed. State"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadopportunity0
+msgid "Creating business opportunities from Leads"
+msgstr ""
+
+#. module: crm
+#: help:crm.send.mail,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor4
+msgid "Need Information"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadopportunity0
+msgid "Prospect Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.installer:0
+#: model:ir.actions.act_window,name:crm.action_crm_installer
+msgid "CRM Application Configuration"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,act_categ_id:0
+msgid "Set Category to"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Configuration"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.partner2opportunity:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: crm
+#: help:crm.installer,sale_crm:0
+msgid "This module relates sale from opportunity cases in the CRM."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead2
+#: model:crm.case.stage,name:crm.stage_opportunity2
+msgid "Qualification"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "First"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition on Communication History"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,som_interval:0
+msgid ""
+"A period is the average number of days between two cycle of sale or purchase "
+"for this segmentation.                 \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too "
+"long time,                  \n"
+"so we suppose that his state of mind has decreased because he probably "
+"bought goods to another supplier.                  \n"
+"Use this functionality for recurring businesses."
+msgstr ""
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send Reply"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,msg:0
+#: field:crm.lead2partner,msg:0
+#: view:crm.send.mail:0
+msgid "Message"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,sa:0
+msgid "Sat"
+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 ""
+
+#. module: crm
+#: field:crm.lead,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_opportunity2phonecall
+msgid "Opportunity to Phonecall"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,allow_unlink:0
+msgid "Allows to delete non draft cases"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule Meeting"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone2
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
+msgid "Outbound"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_open:0
+#: field:crm.phonecall,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,member_ids:0
+msgid "Team Members"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,job_ids:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Contacts"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor1
+msgid "Interest in Computer"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval_default:0
+msgid "Default (0=None)"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,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
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: crm
+#: field:crm.partner2opportunity,probability:0
+#: field:crm.phonecall2opportunity,probability:0
+msgid "Success Probability"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:426
+#: selection:crm.add.note,state:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Draft"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
+msgid "Cases by Sales Team"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: model:ir.model,name:crm.model_crm_meeting
+#: model:process.node,name:crm.process_node_meeting0
+#: model:res.request.link,name:crm.request_link_meeting
+msgid "Meeting"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Planned Revenue by Stage and User"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead_report
+msgid "CRM Lead Report"
+msgstr ""
+
+#. module: crm
+#: field:crm.installer,progress:0
+msgid "Configuration Progress"
+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 ""
+
+#. module: crm
+#: field:crm.lead,street2:0
+msgid "Street2"
+msgstr ""
+
+#. 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 ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "You may have to verify that this partner does not exist already."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_open:0
+msgid "Delay to Open"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,user_id:0
+#: field:crm.phonecall.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:67
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities By Stage"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
+msgid "Schedule Phone Call"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their sales opportunities. It will allow "
+"them to easily track how is positioned a specific opportunity in the sales "
+"cycle."
+msgstr ""
+
+#. module: crm
+#: model:process.process,name:crm.process_process_contractprocess0
+msgid "Contract"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead4
+msgid "Twitter Ads"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Planned Revenues"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor7
+msgid "Need Consulting"
+msgstr ""
+
+#. module: crm
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:232
+#, python-format
+msgid "The case '%s' has been closed."
+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 ""
+
+#. module: crm
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:100
+#, python-format
+msgid "Merged into Opportunity: %s"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:347
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,phonecall_id:0
+msgid "Phonecall"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,function:0
+msgid "Function"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0
+msgid "_Add"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "State of Mind"
+msgstr ""
+
+#. 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
+#: view:res.partner:0
+msgid "Description"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_section_id:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.resource.type,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
+#: field:crm.lead,section_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,section_id:0
+#: field:crm.meeting,section_id:0
+#: field:crm.opportunity2phonecall,section_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,section_id:0
+#: 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 ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor2
+msgid "Interest in Accessories"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:211
+#, python-format
+msgid "The opportunity '%s' has been opened."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,street:0
+msgid "Street"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities by User and Team"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,working_hours:0
+msgid "Working Hours"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,is_customer_add:0
+msgid "Customer"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
+#: view:res.partner:0
+msgid "Schedule a Meeting"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead6
+#: model:crm.case.stage,name:crm.stage_opportunity6
+#: view:crm.lead:0
+msgid "Lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,country_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead2opportunity.action,name:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.resource.type,name:0
+msgid "Campaign Name"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall_report
+msgid "Phone calls by user and section"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.action,name:0
+msgid "Merge with existing Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead4
+#: model:crm.case.stage,name:crm.stage_opportunity4
+msgid "Negotiation"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,sequence:0
+#: field:crm.meeting,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm
+#: field:crm.send.mail,body:0
+msgid "Message Body"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Accept"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_name:0
+msgid "Control Variable"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+#: model:crm.case.stage,name:crm.stage_opportunity3
+msgid "Proposition"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,name:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead8
+msgid "Newsletter"
+msgstr ""
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 0eafe96aea3..804f63918bc 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Die Kurzbezeichnung für das Vertriebsteam muss eindeutig sein!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Der Verkaufskontakt '%s' wurde zu einer Verkauschance gewandelt."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Keine Wiederholung"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -554,9 +554,9 @@ msgstr "Erster Kontakt mit Interessent"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -845,8 +845,8 @@ msgid "Statistics Dashboard"
 msgstr "Pinnwand Statistiken"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1153,7 +1153,7 @@ msgstr "Opt-In"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2464,7 +2464,7 @@ msgstr "Internes Meeting"
 #: selection:crm.send.mail,state:0
 #, python-format
 msgid "Pending"
-msgstr "Unbearbeitet"
+msgstr "Schwebend"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
@@ -2743,7 +2743,7 @@ msgid "Meeting Type"
 msgstr "Terminart"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Zusammenfassen Verkaufschancen"
@@ -3290,8 +3290,8 @@ msgid "Schedule Call"
 msgstr "Terminiere Anruf"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4072,9 +4072,6 @@ msgstr "Newsletter"
 #~ msgid "Template of Email to Send"
 #~ msgstr "Vorlage der Email"
 
-#~ msgid "Button Pressed"
-#~ msgstr "Button Klick"
-
 #~ msgid "CRM & SRM"
 #~ msgstr "CRM"
 
@@ -4396,14 +4393,6 @@ msgstr "Newsletter"
 #~ msgid "Case"
 #~ msgstr "Fall"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Falls der Partner keine Beschaffung während des Zeitraums vorgenomen hat, "
-#~ "senke den Status der Zufriedenheit um diesen Faktor. Der neue Wert ergibt "
-#~ "sich aus einer einfachen Multiplikation."
-
 #~ msgid "All "
 #~ msgstr "Alle Supportvorgangsstufen "
 
@@ -4443,9 +4432,6 @@ msgstr "Newsletter"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Mail an Beobachter (cc)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Aktionen"
 
@@ -4462,158 +4448,15 @@ msgstr "Newsletter"
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Fall Beschreibung"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Tage    "
-
-#~ msgid "Human Resources"
-#~ msgstr "Personal"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Fälle nach Sektion und Stufe"
-
-#~ msgid "Second Interview"
-#~ msgstr "Zweites Gespräch"
-
-#~ msgid "   Today   "
-#~ msgstr "   Heute   "
-
-#~ msgid "Message..."
-#~ msgstr "Nachricht..."
-
-#~ msgid "Histories"
-#~ msgstr "Historie"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Meeting mit Bewerbern"
-
-#~ msgid "Licenced"
-#~ msgstr "Lizensiert"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Dauer (Stunden)"
-
-#~ msgid "Next Interview"
-#~ msgstr "Nächstes Gespräch"
-
-#~ msgid "Home"
-#~ msgstr "Home"
-
-#~ msgid "Send to"
-#~ msgstr "Gesendet an"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Diese Einstellung definiert die Liste                für den Ausschluss "
-#~ "bestimmter Daten und/oder Zeiten für wiederkehrende Termineinträge."
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Aktiviere diese Option, wenn diese Regel eine EMail an den verantwortlichen "
-#~ "Mitarbeiter senden soll."
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Fälle n. Sektionen und Kategorie 2"
-
-#~ msgid "Close Lead"
-#~ msgstr "Beende Lead"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Managment des Anwendersupports."
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Offene Stellen"
-
 #~ msgid "Planned costs"
 #~ msgstr "Gepl. Kosten"
 
-#~ msgid "Close job request"
-#~ msgstr "Beende Stellenangeb."
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Fälle n. Verkaufschance, Kategorie und Typ"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Management von Reklamationen an Lieferanten oder von Kunden,  inklusive der "
-#~ "Massnahmen zur Behebung und Prävention der aufget. Fehler."
-
-#~ msgid "Amount"
-#~ msgstr "Wert"
-
-#~ msgid "Fixed"
-#~ msgstr "Behoben"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Definieren Sie bitte die EMail Adresse des Benutzers !"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Fälle nach Sektionen und Stufe"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Beschreibt die Aktion, z.B. welches Objekt wird bei welcher Aktion unter "
-#~ "welchen Bedingungen als Grundlage herangezogen"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Zugeordnete Sektion für diesen Fall. Definiere einen verantwortl. "
-#~ "Mitarbeiter und Email Konto zur Nutzung des EMail Gateways."
-
 #~ msgid "Case Section"
 #~ msgstr "Fall Sektion"
 
-#~ msgid "Proposed Salary"
-#~ msgstr "Vorschlag Vergütung"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "Reihenfolge bei Anzeige der Liste für Sektionen"
-
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Spezielle Schlüsselwörter für Haupttext"
 
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "Rückverfolgung der Verkaufschancen des Absatzkanals"
-
-#~ msgid "Exception Dates"
-#~ msgstr "Ausschluss v. Daten"
-
-#~ msgid "Appreciation"
-#~ msgstr "Bewertung"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Abonniere Kalender"
-
-#~ msgid "Description Information"
-#~ msgstr "Beschreibung"
-
-#~ msgid "Email Add CC"
-#~ msgstr "EMail Adresse CC"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Der Kanal repräsentiert unterschiedliche Möglichkeiten für die Kommunikation "
-#~ "mit Kunden. Bei jeder Verkaufschance können Sie hinterlegen, durch welchen   "
-#~ " Kommunikationskanal die Verkaufschance entstanden ist."
-
-#~ msgid "Exception Rules"
-#~ msgstr "Ausschluss Regeln"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Akzeptiert als Reklamation"
-
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
@@ -4622,25 +4465,6 @@ msgstr "Newsletter"
 #~ "Felder als Kriterienberücksichtigt, um für alle diese Fälle die definierten "
 #~ "Aktionen auf dem gleichnamigen Aktenreiter durchzuführen."
 
-#~ msgid "Dead"
-#~ msgstr "Negativ"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Bestätige Meeting"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Vorhandener Kunde"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Fälle nach Sektion, Kategorie und Stufe"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Aktiviere diese Option, wenn die Regel EMail Kopien (CC) an andere Personen "
-#~ "versenden soll."
-
 #~ msgid "Action Information"
 #~ msgstr "Information z. Aktion"
 
@@ -4653,84 +4477,12 @@ msgstr "Newsletter"
 #~ msgid "Open Cases"
 #~ msgstr "Fälle in Bearbeitung"
 
-#~ msgid "Meetings Tree"
-#~ msgstr "Liste Meetings"
-
-#~ msgid "All Meetings"
-#~ msgstr "Alle Meetings"
-
-#~ msgid "Add CC"
-#~ msgstr "Hinzuf. CC"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Verworfen durch Firma"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Schätzung Umsatzpotenzial"
-
-#~ msgid "%(case_id)s = Fall ID"
-#~ msgstr "%(case_id)s = Fall ID"
-
-#~ msgid "New Business"
-#~ msgstr "Neuer Kunde"
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Berechtigung zur Anzeige Kalender"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Beschreibung Telefonat"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Bedingungen f. Reklamationen"
-
 #, python-format
 #~ msgid ""
 #~ "You must define a responsible user for this case in order to use this action!"
 #~ msgstr ""
 #~ "Für die auszuf. Aktion ist ein verantwortlicher Mitarbeiter zu definieren."
 
-#~ msgid "Assigned to"
-#~ msgstr "Zugewiesen an"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Vertragsentwurf"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Stellenangebote - Einstellungsprozess"
-
-#~ msgid "Related Cases"
-#~ msgstr "Fälle mit Bezug"
-
-#~ msgid "New Claims"
-#~ msgstr "Neue Reklamationen"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Formular Meetings"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Auswertung Verhandlung"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Fälle nach Verkaufschance und Stufe"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Datum d. Reklamation"
-
-#~ msgid "All Leads"
-#~ msgstr "Alle Leads"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Vertragsunterschrift"
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "Abonniere .ics Kalender"
-
-#~ msgid "Existing Business"
-#~ msgstr "Bestandskunde"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Leads Fälle"
-
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
@@ -4738,15 +4490,6 @@ msgstr "Newsletter"
 #~ "EMail Adresse, die als \"Antworten an\" Adresse in alle Emails eingetragen "
 #~ "wird, die zu allen Vorgängen dieser Sektion versendet werden."
 
-#~ msgid "Emails"
-#~ msgstr "EMails"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Reklamation Mangel"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Speichern in .ics Format"
-
 #~ msgid ""
 #~ "Check if the category is limited to partners that match the segmentation "
 #~ "criterions. If checked, remove the category from partners that doesn't match "
@@ -4757,80 +4500,24 @@ msgstr "Newsletter"
 #~ "wird eine bereits zugetroffene Kategorie bei einem Partner, der das "
 #~ "Kriterium nicht mehr erfüllt, gelöscht."
 
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Kategorie für diesen Bereich. Unterteile die CRM Fälle in Kategorien oder "
-#~ "oder andere Bereiche (Sektionen)."
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "EMail"
-
-#~ msgid "Radio"
-#~ msgstr "Rundfunk"
-
 #~ msgid "Conditions on States"
 #~ msgstr "Kriterien zu Status"
 
 #~ msgid "Trigger Date"
 #~ msgstr "Bezugszeitpunkt"
 
-#~ msgid "Search Histories"
-#~ msgstr "Suche Historie"
-
-#~ msgid "Direction"
-#~ msgstr "Richtung"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Diese Personen erhalten eine Kopie der Kommunikation zwischen Partner und "
-#~ "Mitarbeiter per EMail."
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Auszulösende Aktion auf Server"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Planung Meeting"
-
-#~ msgid "Set State to"
-#~ msgstr "Setze Status auf"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Es gibt keine zu beantwort. EMail !"
-
-#~ msgid "My Funds"
-#~ msgstr "Meine Finanzakquise"
-
 #~ msgid "Planned Costs"
 #~ msgstr "Gepl. Kosten"
 
 #~ msgid "Case history"
 #~ msgstr "Historie Fall"
 
-#~ msgid "Junior Developer"
-#~ msgstr "Junior Entwickler"
-
 #~ msgid "Case Category Name"
 #~ msgstr "Kategorie Name"
 
-#~ msgid "Preventive"
-#~ msgstr "Prävention"
-
 #~ msgid "Add watchers (Cc)"
 #~ msgstr "Hinzuf. Mail (CC)"
 
-#~ msgid "Export ICS"
-#~ msgstr "Exportiere .ics"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Sie können keinen beendeten Fall zuweisen."
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
@@ -4840,149 +4527,6 @@ msgstr "Newsletter"
 #~ msgid "Conditions on Case Fields"
 #~ msgstr "Filterkriterien"
 
-#~ msgid "Category Name"
-#~ msgstr "Kategorie Bezeichn."
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Wiederkehrende Regel"
-
-#~ msgid "Regex on Case Name"
-#~ msgstr "Filter (Regex) a. Fall"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Unerledigte Reklamationen"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Fälle n. Verkaufschance, Kategorie und Stufe"
-
-#~ msgid "Print"
-#~ msgstr "Druck"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Absage Bewerber"
-
-#~ msgid "Lead Email"
-#~ msgstr "Lead EMail"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Fälle n. Sektion, Kategorie und Kategorie 2"
-
-#~ msgid "Closed Won"
-#~ msgstr "Abschluss als Verkauf"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Durch Aktivierung dieser Option, kann die Ansicht dieser sektion verhindert "
-#~ "werden ohne die Sektion zu löschen."
-
-#~ msgid "Learning And Education"
-#~ msgstr "Aus-, Fort- und Weiterbildung"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr ""
-#~ "Möchten Sie einen Partner auf Grundlage dieses Telefonanrufs generieren?"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Datum Meeting"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Konvertiere zu Partner"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Nächstes Meeting"
-
-#~ msgid "_Subscribe"
-#~ msgstr "Abonniere"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Assistent für Meeting"
-
-#~ msgid "Value Claims"
-#~ msgstr "Reklamation Wertminderung"
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Fälle n. Sektion und Kategorie 2"
-
-#~ msgid "Website"
-#~ msgstr "Webpage"
-
-#~ msgid "Funds"
-#~ msgstr "Finanzfonds"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Warte auf Rückantwort"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Bewerber Name"
-
-#~ msgid "Self Generated"
-#~ msgstr "Automatisch Erzeugt"
-
-#~ msgid "Won't fix"
-#~ msgstr "Wird n. behoben"
-
-#~ msgid "Converted"
-#~ msgstr "Konvertiert"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Beantworte letzte EMail"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Anzeige Ort des Meetings"
-
-#~ msgid "Job Cases"
-#~ msgstr "Stellenangebote"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Stellenangebote Liste"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Filter (Regex) a. Bezeichnung"
-
-#~ msgid "Search Funds"
-#~ msgstr "Suche Finanzfonds"
-
-#~ msgid "Type of claim"
-#~ msgstr "Typ der Reklamation"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Kundendienst Arbeitsliste"
-
-#~ msgid "Other Info"
-#~ msgstr "Weitere Info"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Reklamation Kosten"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Terminiere Anruf"
-
-#~ msgid "Mail"
-#~ msgstr "EMail"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Erfordert weitere Analyse"
-
-#~ msgid "Search Claims"
-#~ msgstr "Suche Reklamation"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Managt Kalender für Meetings der Benutzer"
-
-#~ msgid "Add a CC"
-#~ msgstr "Hinzuf. CC"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Verkauf Stufe"
-
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "EMail an Empf. (CC)"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Nächstes Meeting"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for your Company address or missing reply address in "
@@ -4991,181 +4535,12 @@ msgstr "Newsletter"
 #~ "Keine E-Mail Adresse bei Unternehmensdaten definiert oder eine fehlende "
 #~ "Antwort an EMailAdresse für die definierte Sektion!"
 
-#~ msgid "Closed Lost"
-#~ msgstr "Kein Geschäft abgeschl."
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Fehler Rückverfolg."
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Reklamation In Arbeit"
-
-#~ msgid "Set RRULE"
-#~ msgstr "Zuweisung Regel"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Preisangebot"
-
 #~ msgid "Delay After Trigger Date:"
 #~ msgstr "Verzögerung nach Auslöse Datum:"
 
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Kampagnen Typ"
-
-#~ msgid "Graduate"
-#~ msgstr "Abschluss"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Sie können auch in der Kalenderansicht im Grafikmodus Termine oder Meetings "
-#~ "neu eintragen oder bearbeiten."
-
-#~ msgid "Leads Tree"
-#~ msgstr "Leads Liste"
-
-#~ msgid "Attendee"
-#~ msgstr "Teilnehmer"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "EMail fehlgeschlagen !"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Fehler ! Sie können keine rekursiven Sektionen definieren."
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Ermöglicht die Synchronisierung Ihres Open ERP Kalenders mit Ihrem "
-#~ "Mobilephone oder Ihres Groupware Clients outlook, Sunbird, ical, ..."
-
-#~ msgid "This Year"
-#~ msgstr "Akt. Jahr"
-
-#~ msgid "Contract Data"
-#~ msgstr "Vertragsdaten"
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Genutzt von Unternehmen zur Verwaltung und Rückverfolgung von Reklamationen "
-#~ "und Fällen im Kundendienst"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Gemeinsamer Kalender"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Fälle nach Leads und Typ"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Erw. Umsatz"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Urspr. Stellenbedarf"
-
-#~ msgid "Claims Info"
-#~ msgstr "Reklamation Info"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Fall Kategorie 2 Bez."
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Kundendienst Fälle"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Finanzakquise"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Konvertiere zu Partner"
-
-#~ msgid "Source"
-#~ msgstr "Quelle"
-
-#~ msgid "Payment Mode"
-#~ msgstr "Zahlungsmodus"
-
-#~ 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 ""
-#~ "Als Verzögerung nach dem Auslöse Datum (Trigger), können Sie auch einen "
-#~ "negativen Wert eintragen, z.B. wenn Sie beabsichtigen vor einem bestimmten "
-#~ "Termin mit einem bestimmtenZeitvorlauf eine automatische Benachrichtigung "
-#~ "als Erinnerung zu erhalten."
-
-#~ msgid "Stage: "
-#~ msgstr "Stufe: "
-
 #~ msgid "Telesales"
 #~ msgstr "Telesales"
 
-#~ msgid "Lead Information"
-#~ msgstr "Lead Information"
-
-#~ msgid ""
-#~ "Helps you to encode the result of a phone call or to plan a list of phone "
-#~ "calls to process."
-#~ msgstr ""
-#~ "Hilft Ihnen bei der Erfassung von Ergebnissen oder Notizen zu Anrufen oder "
-#~ "bei der Planung von durchzuführenden Telefonaten."
-
-#~ msgid "Import ICS File"
-#~ msgstr "Importiere .ics Datei"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "Teilnehmer Detail"
-
-#~ msgid " > Bac +5"
-#~ msgstr " Hochschulabschluss"
-
-#~ msgid "Prospecting"
-#~ msgstr "Neukundenakquise"
-
-#~ msgid "Employee Email"
-#~ msgstr "Mitarbeiter Email"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Meetings"
-
-#~ msgid "Job Info"
-#~ msgstr "Info zu Stelle"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Abbrechen Meeting"
-
-#~ msgid "Jobs"
-#~ msgstr "Arbeitsstellen"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Datum Erstellung"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Stellen - Bewerberformular"
-
-#~ msgid "Corrective"
-#~ msgstr "Korrektur"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "Verkaufschance Fälle"
-
-#~ msgid "Support Query"
-#~ msgstr "Kundendienst Anfrage"
-
-#~ msgid "Send Email"
-#~ msgstr "Sende Mail"
-
-#~ msgid "Set case state to"
-#~ msgstr "Ändere Status zu"
-
-#~ msgid "Credit Card"
-#~ msgstr "Kreditkarte"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
@@ -5174,73 +4549,12 @@ msgstr "Newsletter"
 #~ "Keine E-Mail Adresse für verantwortlichen Partner gefunden oder fehlende "
 #~ "Email Adresse in der Sektion!"
 
-#~ msgid "Search Jobs"
-#~ msgstr "Suche Stelle"
-
 #~ msgid "Log"
 #~ msgstr "Protokoll"
 
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr ""
-#~ "Hilfe für Organisation beim Prozess der Finanzbeschaffung und Rückverfolgung"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Kundendienst"
-
 #~ msgid "Watchers Emails"
 #~ msgstr "Empfänger Emails"
 
-#~ msgid "Delay Close"
-#~ msgstr "Zeit f. Beend."
-
-#~ msgid "Candidate Name2 "
-#~ msgstr "Kandidat Name 2 "
-
-#~ msgid "Events"
-#~ msgstr "Termine"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Ermöglicht die Rückverfolgung der Historie von Leads, angefangen beieinem "
-#~ "Kontakt mit einem Interessenten über die Konvertierung zur Verkaufschance."
-
-#~ msgid ""
-#~ "The minds states allow to define a value scale which representsthe partner "
-#~ "mentality in relation to our services.The scale hasto be created with a "
-#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-#~ msgstr ""
-#~ "Die Skala der Zufriedenheit definiert eine Werteskala der Zufriedenheit "
-#~ "eines Kunden. Die Skala muss in einem Bereich zwischen 0 (Extrem "
-#~ "Unzufrieden) und 10 (Sehr Zufrieden) definiert werden."
-
-#~ msgid "FreeBusy"
-#~ msgstr "Verfügbark."
-
-#~ msgid "Attachment2"
-#~ msgstr "Anhang 2"
-
-#~ msgid "Attachment3"
-#~ msgstr "Anhang 3"
-
-#~ msgid "Degree"
-#~ msgstr "Abschluss"
-
-#~ msgid "Attachment1"
-#~ msgstr "Anhang 1"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn dieses Feld aktiviert ist , kann ein Vorgang ausgeblendet werden, ohne "
-#~ "ihn vollständig zu entfernen."
-
-#~ msgid "Cheque"
-#~ msgstr "Scheck"
-
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the case be attached "
 #~ "to the reminder email sent."
@@ -5248,66 +4562,9 @@ msgstr "Newsletter"
 #~ "Aktiviere diese Option, falls alle Dokumente die zum Fall gehören auch an "
 #~ "eine  Erinnerungsmail  angehängt werden sollen."
 
-#~ msgid "Candidate Phone"
-#~ msgstr "Bewerber Telefon"
-
-#~ msgid "To Assign"
-#~ msgstr "Zuweisen"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Bitte definieren Sie eine existierende URL"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Möchten Sie einen Partner auf Grundlage dieses Stellenangebots erstellen?"
-
-#~ msgid "History of Events"
-#~ msgstr "Historie Termine"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Kategorie 2"
-
 #~ msgid "%(case_user_email)s = Responsible email"
 #~ msgstr "%(case_user_email)s = EMail d. verantwortl.Mitarbeiters"
 
-#~ msgid "Sales"
-#~ msgstr "Verkauf"
-
-#~ msgid "Assigned"
-#~ msgstr "Zugewiesen"
-
-#~ msgid "Recycled"
-#~ msgstr "Wiederhergestellt"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Alle Verkaufschancen"
-
-#~ msgid "PUBLIC"
-#~ msgstr "Öffentlich"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Ein Partner existiert bereits mit identischem Namen."
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Telefonanrufe"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr "Reihenfolge für die Ansichtsliste der Fallregeln."
-
-#~ msgid "Invalid"
-#~ msgstr "Fehlerhaft"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Plane Meeting"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Kalender Meetings"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Fälle nach Stufen und erw. Umsatz"
-
 #, python-format
 #~ msgid ""
 #~ "You can not escalate this case.\n"
@@ -5316,193 +4573,15 @@ msgstr "Newsletter"
 #~ "Sie können diesen Fall nicht eskalieren.\n"
 #~ "Sie sind bereits auf der obersten Ebene."
 
-#~ msgid "Lead Name"
-#~ msgstr "Lead Bez."
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "Beschreibung der Reklamation"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Meeting z. Akquise v. Leads"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Verworfen durch Mitarbeiter"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Mitarbeiter Name"
-
-#~ msgid "First Interview"
-#~ msgstr "Erstes Gespräch"
-
-#~ msgid "This Month"
-#~ msgstr "Akt. Monat"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Verfügbarkeit (Wochen)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Liste Verkaufschancen"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Offene Stellen"
-
-#~ msgid "Email Address"
-#~ msgstr "EMail Adresse"
-
-#~ msgid "Related Case"
-#~ msgstr "Referenz. Fälle"
-
-#~ msgid "Server Action"
-#~ msgstr "Server Aktion"
-
-#~ msgid "All Claims"
-#~ msgstr "Alle Reklamationen"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "EMail n. gesendet !"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Beende Anruf"
-
-#~ msgid "Regex on Communication History"
-#~ msgstr "Filter (Regex) a. Historie Kommun."
-
-#~ msgid "Demand Draft"
-#~ msgstr "Bedarf Entwurf"
-
-#~ msgid "Search Case"
-#~ msgstr "Suche Fall"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Fälle n. Sektion, Kategorie und Stufe"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Einstellung Bewerber"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Prozess Einstellung Bewerber"
-
-#~ msgid "Lead Source"
-#~ msgstr "Lead Quelle"
-
-#~ msgid "PRIVATE"
-#~ msgstr "Persönlich"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Pfad für Remote Kalender"
-
-#~ msgid "Funds Form"
-#~ msgstr "Finanzfonds Formular"
-
-#~ msgid "In Process"
-#~ msgstr "In Bearbeitung"
-
-#~ msgid "Goals"
-#~ msgstr "Ziele"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Fälle n. Sektion und Typ"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Kunden Support & Service"
-
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "File name"
-#~ msgstr "Datei Name"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn das Feld aktiviert wird kann die Regel für den Fall versteckt "
-#~ "werdenohne den Eintrag komplett zu entfernen"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Alle Stellenangebote"
-
-#~ msgid "Applied Job"
-#~ msgstr "Angebotene Stelle"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern                                 for "
-#~ "anexception to a recurrence set"
-#~ msgstr ""
-#~ "definiert die Regel oder das Modell einer wiederkehrenden Ausnahmeals "
-#~ "Ausschlußkriterien von wiederkehrenden Veranstaltungen oder Terminen"
-
-#~ msgid "Relevant"
-#~ msgstr "Relevant"
-
-#~ msgid "Import ICS"
-#~ msgstr "Import .ics"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Fälle n. Verkaufschance und Typ"
-
 #~ msgid "%(case_subject)s = Case subject"
 #~ msgstr "%(case_subject)s = Betreff Fall"
 
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr "Gemeinnützig"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Partner wurde bei Stellenausschreibung bereits definiert"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "Email der Personen, die Email erhalten haben"
-
-#~ msgid "Claim Cases"
-#~ msgstr "Reklamationen Fälle"
-
 #~ msgid "E-Mail Reminders (includes the content of the case)"
 #~ msgstr "E-mail Erinnerung inkl. Fallübersicht"
 
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Fälle nach Leads und Stufe"
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Meeting Assistent"
-
-#~ msgid "Reporting"
-#~ msgstr "Auswertungen"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Erwartetes Gehalt"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Sende EMail"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Fehlerhafte Argumente"
 
-#~ msgid "My Cases"
-#~ msgstr "Meine Fälle"
-
-#~ msgid "Word of mouth"
-#~ msgstr "Mundpropaganda"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Lead Betreff"
-
-#~ msgid "Planned"
-#~ msgstr "Geplant"
-
-#~ msgid "Customer Office"
-#~ msgstr "Kunden Büro"
-
-#~ msgid "Candidate Email"
-#~ msgstr "EMail Bewerber"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Vertriebs Stufe "
-
-#~ msgid "Type of Action"
-#~ msgstr "Typ Aktion"
-
 #~ msgid "Set responsible to"
 #~ msgstr "Definition Verantw."
 
@@ -5520,48 +4599,21 @@ msgstr "Newsletter"
 #~ "einem anderen Lieferanten kauft. Verwende diese Funktionalität für eine "
 #~ "Reaktivierung der Geschäftsbeziehungen."
 
-#~ msgid "Search Cases by User"
-#~ msgstr "Suche Fälle n. Benutzer"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Finanzfonds Ansicht"
-
 #~ msgid "Call Object Method"
 #~ msgstr "Aufruf Objekt Methodik"
 
-#~ msgid "All Funds"
-#~ msgstr "Alle Finanzfonds"
-
 #~ msgid "Calendar"
 #~ msgstr "Kalender"
 
-#~ msgid "HelpDesk"
-#~ msgstr "Kundendienst"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Kunst und Kultur"
-
 #~ msgid "Delay after trigger date"
 #~ msgstr "Verzög. n. Auslösedat."
 
-#~ msgid "Lead Details"
-#~ msgstr "Lead Details"
-
 #, python-format
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr ""
 #~ "Sie müssen eine E-Mail Adresse für den Partner haben, um diese Aktion zu "
 #~ "nutzen!"
 
-#~ msgid "Qualication"
-#~ msgstr "Qualifizierung"
-
-#~ msgid "Change RRule"
-#~ msgstr "Wechsel Regel"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Fälle nach Sektion, Kategorie und Typ"
-
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
@@ -5570,320 +4622,29 @@ msgstr "Newsletter"
 #~ msgid "Planned revenue"
 #~ msgstr "Geplanter Umsatz"
 
-#~ msgid "Healthcare"
-#~ msgstr "Gesundheitswirtschaft"
-
-#~ msgid "Assign"
-#~ msgstr "Zuweisen"
-
-#~ msgid "Office"
-#~ msgstr "Büro"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Fälle Finanzakquise"
-
 #~ msgid "Conditions on Case Partner"
 #~ msgstr "Filterkriterium Partner"
 
 #~ msgid "Section Code"
 #~ msgstr "Sektion Kurz"
 
-#~ msgid "Meeting date"
-#~ msgstr "Meeting Datum"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "Vertraulich"
-
-#~ msgid "Content of mail"
-#~ msgstr "Inhalt der Email"
-
-#~ msgid "Not fixed"
-#~ msgstr "Nicht Erledigt"
-
-#~ msgid "Employee"
-#~ msgstr "Mitarbeiter"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = Das '%' Zeichen"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Interne Hinweise"
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
 #~ "Aktiviere Option, falls diese Regel eine Erinnerungsmail an den Benutzer "
 #~ "senden soll."
 
-#~ msgid "_Import"
-#~ msgstr "Importiere"
-
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Filterkriterium Priorität"
 
-#~ msgid "Mass Mailing"
-#~ msgstr "Massen Mailing"
-
-#~ msgid "Cash"
-#~ msgstr "Barzahlung"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Fonds nach Kategorien"
-
-#~ msgid "Future"
-#~ msgstr "Zukunft"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Speichern .ics Datei"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "Gebe Pfad an zum Remote Kalender"
-
 #~ msgid "Conditions on Timing"
 #~ msgstr "Filterkriterium Zeit"
 
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Kundendienst Fälle"
-
-#~ msgid "Export ICS File"
-#~ msgstr "Exportiere .ics Datei"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Wähle .ics Datei"
-
-#~ msgid "Import Message"
-#~ msgstr "Importiere Nachricht"
-
 #~ msgid "Cases by section"
 #~ msgstr "Fälle nach Sektionen"
 
-#~ msgid "New Jobs"
-#~ msgstr "Neue Stellen"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Vorgang Finanzakquise"
-
-#~ msgid "Count"
-#~ msgstr "Anzahl"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Wiederhole alle x"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Verkaufschancen nach Kategorien"
-
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Lead "
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Ressourcen Kalender"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "wurde konvertiert zu Verkaufschance"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Max. Wiederholungen"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Wenn das 'Aktiv' Feld angeklickt wird, ermöglicht dieses die "
-#~ "Erinnerungsfunktion zu verbergen, ohne Sie komplett zu löschen."
-
-#~ msgid "Extended Options..."
-#~ msgstr "Erweiterte Optionen.."
-
-#, python-format
-#~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-#~ msgstr ""
-#~ "Beendet/Abgebrochen \\nLeads konnten nicht zu Verkaufschance konvertiert "
-#~ "werden"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalle"
-
-#~ msgid "Custom"
-#~ msgstr "Individuell"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Kampagnen EMail 2"
 
-#~ msgid "Seconds"
-#~ msgstr "2ter"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Individuelle Wiederkehrerregel"
-
-#~ msgid "Exclude range"
-#~ msgstr "Ausschlussbandbreite"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "of"
-#~ msgstr "von"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Fälle Besprechung"
-
-#, python-format
-#~ msgid "There is no stage for won opportunities defined for this Sale Team."
-#~ msgstr ""
-#~ "Es gibt aktuell keine Stufe für erfolgreich abgeschlossene Verkaufschancen "
-#~ "dieses Verkaufsteams."
-
-#, python-format
-#~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-#~ msgstr ""
-#~ "Beendet/Abgebrochen Telefonanruf \\nKann nicht in Verkaufschance konvertieren"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Create specific stages that will help your sales better organise their sales "
-#~ "pipeline by maintaining them to their leads and sales opportunities. It will "
-#~ "allow them to easily track how is positioned a specific lead or opportunity "
-#~ "in the sales cycle."
-#~ msgstr ""
-#~ "Erzeuge spezifische Stufen für eine bessere Organisation der "
-#~ "Vertriebsabfolge bei der Bearbeitung von Verkaufskontakten oder "
-#~ "Verkaufschancen. Hierduch soll eine möglichst einfache Positionsbestimmung "
-#~ "zum Stadium der Bearbeitung möglich sein."
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Erzeuge spezifische Kategorien für Kundenanrufe zur besseren Sortierung und "
-#~ "Organisation der telefonischen Vertriebsvorgänge."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
-#~ "call you get will appear on the partner form for the traceability of every "
-#~ "contact you get with a partner. From the call record, you can trigger a "
-#~ "request for another call, a meeting or a business opportunity."
-#~ msgstr ""
-#~ "Die Anwendung von eingehenden Telefonanrufen ermöglicht Ihnen ad hoc "
-#~ "Vorgänge zu erfassen. Jeder Anruf kann aufgezeichnet werden als "
-#~ "Ausgangspunkt für eine weitere Rückverfolgung von Aktivitäten durch Ihren "
-#~ "Vertrieb oder Kundendienst. Ausserdem können Sie an dieser Stelle bereits "
-#~ "die Wichen für eine weitere Vorgangsbearbeitung einstellen."
-
-#~ msgid ""
-#~ "Create specific partner categories that you will then be able to assign to "
-#~ "your partners to better manage your interactions with them. The segmentation "
-#~ "tool will assign categories to partners based on defined criteria."
-#~ msgstr ""
-#~ "Erstellen Sie spezifische Partner Kategorien zu denen Sie dann Ihre Partner "
-#~ "hinzufügen um Ihre Interaktionen mit selbigen besser zu Verwalten. Das "
-#~ "Segmentierungswerkzeug wird Partner aufgrund von definierten Kriterien zu "
-#~ "Kategorien hinzufügen."
-
-#~ msgid ""
-#~ "Create specific categories that fit your company's  activities in order to "
-#~ "better classify and analyse them after they have been maintained in your "
-#~ "leads and opportunities. You can use categories to reflect your product "
-#~ "structure or the different types of sales you do."
-#~ msgstr ""
-#~ "Erstellen Sie spezifische Kategorien, die Sie bei neuen Verkaufskontakten "
-#~ "oder Verkaufschancen zum Zweck von Analysen und Auswertungen zuweisen "
-#~ "können. Sie können diese Kategorien beliebig verwenden, zum Beispiel um Ihre "
-#~ "Produktstruktur oder die verschiedenen Typen von Verkäufen zu beschreiben."
-
-#~ msgid ""
-#~ "Sales team allows you to organize your different salesmen or departments "
-#~ "into separate teams. Each team will work in his own list of opportunities, "
-#~ "sales orders, eso. Each user can set a team by default in his preferences. "
-#~ "The opportunities and sales order he will see, will be automatically "
-#~ "filtered according to his team."
-#~ msgstr ""
-#~ "Die Definition von Vertriebsteams ermöglicht Ihnen Ihre verschiedenen "
-#~ "Verkäufer oder Abteilungen  in separate Teams aufzuteilen. Jedes Team "
-#~ "arbeitet mit seinen eigenen Verkaufschancen, Verkaufaufträgen und so weiter. "
-#~ "Jeder Benutzer kann dann sein Team als persönliche Voreinstellung wählen. "
-#~ "Die Verkaufschancen und Verkaufaufträge werden dann anhand seiner "
-#~ "Teamzugehörigkeit automatisch gefiltert."
-
-#~ msgid ""
-#~ "Outbound Calls lists all the calls to be performed by your sales team. They "
-#~ "can record the information about the call on the form view. These "
-#~ "information will appear on the partner form for the traceability of every "
-#~ "contact you get with a customer. You can import a .CSV file with a list of "
-#~ "calls to be done for your sales team."
-#~ msgstr ""
-#~ "Ausgehende Anrufe listen alle Kundengespräche auf, die von Ihrem "
-#~ "Verkaufsteam getätigt wurden. Informationen zum Telefonat werden in der "
-#~ "Formular Ansicht eingegeben. Sämtliche Informationen zu Anrufen werden "
-#~ "ebenfalls in der Formular Ansicht der Partner angezeigt. Sie können "
-#~ "ausserdem eine .CSV Datei mit einer Liste der Anrufe Ihres Verkaufsteams "
-#~ "importieren."
-
-#~ msgid ""
-#~ "Opportunities allows you to manage and keep track of your sales pipeline by "
-#~ "creating specific customer or prospect related sales documents in order to "
-#~ "follow up potential sales. Information such as the expected revenue, "
-#~ "opportunity stage, expected closing date, communication history and so on "
-#~ "can be maintained in them. Opportunities can be connected with the email "
-#~ "gateway: new emails create opportunities, each of them automatically gets "
-#~ "the history of the conversation with the customer.\n"
-#~ "\n"
-#~ "You and your team(s) will be able to plan meetings and phone calls from "
-#~ "opportunities, convert them into quotations, manage related documents, track "
-#~ "all customer related activities, and much more."
-#~ msgstr ""
-#~ "Verkaufschancen ermöglichen durch die Erfassung der erforderlichen Daten die "
-#~ "Durchführung und Rückverfolgung von Vertriebsvorgängen. Zusatzinformationen "
-#~ "wie erwarteter Umsatz, das zu erwartetende Verkaufsdatum sowie die "
-#~ "Vorgangshistorie komplettieren die erforderlichen Vertriebsdaten. Die "
-#~ "Verkaufschancen lassen sich auch über das Email Gateway anbinden, hierdurch "
-#~ "ist dann auch eine Historie der Emailkommunikation beim Kunden einsehbar.\n"
-#~ "\n"
-#~ "Sie und das gesamte Verkaufsteam sind in der Lage Vertriebstermine oder "
-#~ "Telefonanrufe für eine Verkaufschance zu planen und  Gesprächsresultate zu "
-#~ "erfassen, außerdem können Sie direkt aus dem Vorgang bereits Angebote "
-#~ "erstellen oder schlicht die Vorgangshistorie einsehen."
-
-#~ msgid ""
-#~ "'Meeting Invitations' allows you to create and manage the meeting "
-#~ "invitations sent/to be sent to your colleagues/partners."
-#~ msgstr ""
-#~ "Termineinladungen ermöglichen Ihnen die elektronische Versendung von "
-#~ "Einladungen zu Veranstaltungen oder Besprechungen mit Kollegen, Kunden oder "
-#~ "anderen Geschäftspartnern."
-
-#~ msgid "Claim"
-#~ msgstr "Reklamation"
-
-#~ msgid ""
-#~ "'Leads' allows you to manage and keep track of all first potential interests "
-#~ "of a partner in one of your products or services. A lead is a first, "
-#~ "unqualified, contact with a prospect or customer. After being qualified, a "
-#~ "lead can be converted into a business opportunity with the creation of the "
-#~ "related partner for further detailed tracking of any linked activities. You "
-#~ "can use leads when you import a database of prospects or to integrate your "
-#~ "website's contact form with OpenERP."
-#~ msgstr ""
-#~ "Verkaufskontakte ermöglichen die Verfolgung von interessanten Kontaktdaten "
-#~ "für bestimmte Produktangebote des Unternehmens. Zunächst ist ein "
-#~ "Kundenkontakt lediglich eine noch noch nicht qualifizierte Kundenadresse. Es "
-#~ "muss qualifiziert werden, inwieweit eine weitere Bearbeitung durch den "
-#~ "Vertrieb sinnvoll ist. Falls dieses der Fall ist, kann eine einfache "
-#~ "Wandlung erfolgen, wobei möglicherweise auch die Kontaktdaten komplettiert "
-#~ "werden können. Sie können die Verkaufskontakte auch nutzen für den Import "
-#~ "von Adressdaten oder zwecks Integration des Kontaktformulars Ihrer Webseite."
-
-#~ msgid "Repeat interval"
-#~ msgstr "Wiederholungsintervall"
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 033e0e19f94..d157fe39e00 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -127,7 +127,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Ο κωδικός της ομάδας πώλησης πρέπει να είναι μοναδικός !"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Ο Υποψήφιος Πελάτης '%s' έχει μεταραπεί σε ευκαιρία"
@@ -144,8 +144,8 @@ msgid "No Repeat"
 msgstr "Χωρίς Επανάληψη"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -544,9 +544,9 @@ msgstr "Προταρχική επαφή με νέα προοπτική"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -826,8 +826,8 @@ msgid "Statistics Dashboard"
 msgstr "Ταμπλό Στατιστικών"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1137,7 +1137,7 @@ msgstr "Εντός Συμφωνίας"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2665,7 +2665,7 @@ msgid "Meeting Type"
 msgstr "Tύπος Συνάντησης"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3177,8 +3177,8 @@ msgid "Schedule Call"
 msgstr "Προγραμάτισε Τηλεφώνημα"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4394,13 +4394,6 @@ msgstr ""
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Όροι στην Ιεραρχία Προτεραιοτήτων"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Αν ένας συνεργάτης δεν έχει αγοράσει (ή πουλήσει) σε μία περίοδο, μείωσε την "
-#~ "Προδιάθεσή του κατά τον παράγοντα αυτό (πολλαπλασιαμός)."
-
 #~ msgid "All "
 #~ msgstr "Όλα "
 
@@ -4455,9 +4448,6 @@ msgstr ""
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Cc Mail"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Ενέργειες"
 
@@ -4507,70 +4497,8 @@ msgstr ""
 #~ msgid "Cases"
 #~ msgstr "Υποθέσεις"
 
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "μετατρέπεται σε Ευκαιρία"
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Ημερολόγιο Πόρων"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Επανάληψη κάθε χ"
-
 #~ msgid "Telesales"
 #~ msgstr "Τηλεπωλήσεις"
 
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Ευκαιρίες ανά Κατηγορία"
-
-#~ msgid "Seconds"
-#~ msgstr "Δευτερόλεπτα"
-
-#~ msgid "Count"
-#~ msgstr "Υπολόγισε"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Εάν το ενεργό πεδίο είναι επιλεγμένο, σας επιτρέπει να κρύψεται την "
-#~ "υπενθύμιση χωρίς να την απομακρύνεται."
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Εξτρατεία Αλληλογραφίας 1"
-
-#~ msgid "Extended Options..."
-#~ msgstr "Εκτεταμένες επιλογές"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Επανάληψη μέγιστο τόσες φορές"
-
-#~ msgid "Interval"
-#~ msgstr "Διάστημα"
-
-#, python-format
-#~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-#~ msgstr ""
-#~ "Έκλεισε/Ακυρώθηκε \\nΥποψήφιοι Πελάτες δεν μπορούνε να μετατραπούν σε "
-#~ "Ευκαιρίες"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Το πιστοποιητικό ταυτότητας του στοιχείου πρέπει να είναι μοναδικό"
-
-#~ msgid "Custom"
-#~ msgstr "Προσαρμοσμένος"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Η συντόμευση για αυτό το μενού υπάρχει ήδη!"
-
-#~ msgid "Exclude range"
-#~ msgstr "Αποκλεισμός έκτασης"
-
-#~ msgid "of"
-#~ msgstr "από"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Συνάντηση Υπόθεσης"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 732830e85f2..66de5953e6d 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "¡El código del equipo de ventas debe ser único!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "La inicaitiva '%s' ha sido convertida en oportunidad"
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "No repetir"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -550,9 +550,9 @@ msgstr "Primer contacto con nueva prospección"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -842,8 +842,8 @@ msgid "Statistics Dashboard"
 msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1154,7 +1154,7 @@ msgstr "Acepta recibir emails"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2097,7 +2097,7 @@ msgstr "Convertir en oportunidad"
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Held"
-msgstr "Ocupado"
+msgstr "Realizada"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2305,7 +2305,7 @@ msgstr "MS-Outlook"
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Not Held"
-msgstr "No ocupado"
+msgstr "Pendiente"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2732,7 +2732,7 @@ msgid "Meeting Type"
 msgstr "Tipo de reunión"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Fusinar con oportunidad existente"
@@ -3277,8 +3277,8 @@ msgid "Schedule Call"
 msgstr "Planificar llamada"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4479,13 +4479,6 @@ msgstr "Boletín de noticias"
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Condiciones sobre intervalo de prioridades"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Si la empresa no ha comprado (o pedido) durante un período, decrementar el "
-#~ "grado de satisfacción por este factor. Es una multiplicación."
-
 #~ msgid "All "
 #~ msgstr "Todos "
 
@@ -4534,9 +4527,6 @@ msgstr "Boletín de noticias"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Enviar correo a observadores (CC)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Acciones"
 
@@ -4610,387 +4600,27 @@ msgstr "Boletín de noticias"
 #~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
 #~ "creados en él."
 
-#~ msgid "Send to"
-#~ msgstr "Enviar a"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "Transparente"
-
 #~ msgid "Button Pressed"
 #~ msgstr "Botón oprimido"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 días    "
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Gestiona un servicio de mesa de ayuda"
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Trabajos pendientes"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Casos por sección y categoria2"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Revise esto si quiere la regla para enviar un correo a la persona "
-#~ "responsable."
-
-#~ msgid "Amount"
-#~ msgstr "Cantidad"
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Casos por oportunidades, categoria y tipo"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Gestiona los reclamos de proveedores y clientes, incluyendon sus acciones "
-#~ "prevenivas ó correctivas."
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Sección a la cual pertenece el caso. Definir usuario responsable y cuenta de "
-#~ "correo para correo de salida."
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Por favor especiificar el nombre de usuario de correo"
-
-#~ msgid "Fixed"
-#~ msgstr "Reparado"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Duración (Horas)"
-
 #~ msgid "Mail to these emails"
 #~ msgstr "Correo a estos correos electronicos"
 
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr ""
-#~ "Dar orden de la secuencia cuando se muestre la lista de casos de sección."
-
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palabras claves especiales para ser usadas en el cuerpo del mensaje."
 
-#~ msgid "Proposed Salary"
-#~ msgstr "Salario sugerido"
-
 #~ msgid "My Histories"
 #~ msgstr "Mis historias"
 
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr ""
-#~ "Temas de oportunidades de negocio identificadas para su canal de ventas."
-
-#~ msgid "Appreciation"
-#~ msgstr "Reconocimiento"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Suscribirse a un calendario remoto"
-
 #~ msgid "Last Action Date"
 #~ msgstr "Fechas de ultima acción"
 
 #~ msgid "Delay type"
 #~ msgstr "Tipo de retraso"
 
-#~ msgid "Description Information"
-#~ msgstr "Información de descripción"
-
-#~ msgid "Next Interview"
-#~ msgstr "Próxima entrevista"
-
-#~ msgid "Second Interview"
-#~ msgstr "Segunda entrevista"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Describe el nombre de la acción, ej: sobre que objeto que acción debe "
-#~ "realizarse en base a que condiciones"
-
-#~ msgid "Close Lead"
-#~ msgstr "Cerrar"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Esta propiedad define la lista de excepciones (días/horas) para un evento de "
-#~ "calendario recurrente"
-
-#~ msgid "Exception Rules"
-#~ msgstr "Reglas de Excepción"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Aceptado como reclamación"
-
-#~ msgid "Dead"
-#~ msgstr "Muerto"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Confirmar reunión"
-
-#~ msgid "Exception Dates"
-#~ msgstr "Fechas de excepción"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Email añadir CC"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Cliente existente"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Casos por sección, categoría y fase"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Active esta casilla en caso que quiera que la regla sea marcada CC ( copia "
-#~ "de email para cualquier otra persona definida en las acciones)"
-
-#~ msgid "All Meetings"
-#~ msgstr "Todas las reuniones"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Árbol de reuniones"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Política de reclamaciones"
-
-#~ msgid "   Today   "
-#~ msgstr "   Hoy   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Permite mostrar el calendario"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Descripción de la llamada"
-
-#~ msgid "New Business"
-#~ msgstr "Nuevo negocio"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Propuesta de valor"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Rechazado por la compañía"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Formulario de reuniones"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Contrato propuesto"
-
-#~ msgid "Assigned to"
-#~ msgstr "Asignada a"
-
-#~ msgid "Related Cases"
-#~ msgstr "Casos Relacionados"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Trabajos - Proceso de selección de personal"
-
-#~ msgid "New Claims"
-#~ msgstr "Nuevas Reclamaciones"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Casos por oportunidades y fase"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Negociación/Revisión"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Casos Oportunidades"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Contrato firmado"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Fecha de reclamación"
-
-#~ msgid "All Leads"
-#~ msgstr "Todas las iniciativas"
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "Subcribirse a ICS remotos"
-
-#~ msgid "Existing Business"
-#~ msgstr "Negocio existente"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Salvar en formato .ics"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Reclamaciones objetivas"
-
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid "Search Histories"
-#~ msgstr "Buscar en Historial"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Este correo no puede ser contestado"
-
-#~ msgid "Set State to"
-#~ msgstr "Establecer estado a"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Estas personas recibirán una copia de toda comunicación entre el partner y "
-#~ "los usuarios."
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Acción del servidor a ser ejecutada"
-
-#~ msgid "Export ICS"
-#~ msgstr "Exportar ICS"
-
-#~ msgid "Preventive"
-#~ msgstr "Preventivo"
-
-#~ msgid "My Funds"
-#~ msgstr "Mis donaciones"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Desarrollador junior"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "No se puede asignar un caso cerrado."
-
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Reclamaciones Pendientes"
-
-#~ msgid "Category Name"
-#~ msgstr "Nombre de Categoría"
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Regla concurrente"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Candidato rechazado"
-
-#~ msgid "Closed Won"
-#~ msgstr "Cerrado-Ganado"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Casos por sección, categoría y categoría2"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Aprendizaje y educación"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr "Estas seguro que deseas crear una empresa basado en esta llamada?"
-
-#~ msgid "Add CC"
-#~ msgstr "Añadir CC"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Casos por sección y fase"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Si el campo activo está marcado, podrá ocultar la sección del caso sin "
-#~ "eliminarla."
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Casos por oportunidades, categoría y fase"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Casos por sección y fase"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Casos por fases y estimaciones"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Fase de ventas: "
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Casos por sección, categoría y fase"
-
-#~ msgid "Stage: "
-#~ msgstr "Fase: "
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Casos por iniciativas y fase"
-
-#~ msgid "Direction"
-#~ msgstr "Dirección"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Planear reunión"
-
-#~ msgid "Home"
-#~ msgstr "Particular"
-
-#~ msgid "Regex on Case Name"
-#~ msgstr "Expresión regular del nombre del caso"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Correo electrónico!"
-
-#~ msgid "crm.opportunity.assign_wizard"
-#~ msgstr "crm.opportunity.assign_wizard"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Los canales representan las diferentes maneras que existen de comunicación "
-#~ "con el cliente. A cada oportunidad se le puede indicar de que canal provino."
-
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Descripción del caso"
 
-#~ msgid "crm.phonecall.assign_wizard"
-#~ msgstr "crm.phonecall.assign_wizard"
-
-#~ msgid "Message..."
-#~ msgstr "Mensaje..."
-
-#~ msgid "Meeting Date"
-#~ msgstr "Fecha de reunión"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Convertir a empresa"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Próximas reuniones"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Suscribir"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Asistente genérico de reuniones"
-
-#~ msgid "Value Claims"
-#~ msgstr "Valor reclamaciones"
-
 #~ msgid "Planned revenue"
 #~ msgstr "Ingresos previstos"
 
@@ -5000,900 +4630,14 @@ msgstr "Boletín de noticias"
 #~ msgid "Planned costs"
 #~ msgstr "Costos previstos"
 
-#~ msgid "Funds"
-#~ msgstr "Fondos"
-
-#~ msgid "Self Generated"
-#~ msgstr "Auto generado"
-
-#~ msgid "Website"
-#~ msgstr "Sitio web"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Esperando respuesta"
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Casos por sección y 2ª categoría"
-
-#~ msgid "Type of claim"
-#~ msgstr "Tipo de reclamación"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Trabajos - selección de personal"
-
-#~ msgid "Won't fix"
-#~ msgstr "No será corregido"
-
-#~ msgid "Converted"
-#~ msgstr "Convertido"
-
-#~ msgid "Search Claims"
-#~ msgstr "Búsqueda reclamaciones"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Gestiona el calendario de reuniones de los usuarios."
-
-#~ msgid "Mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Necesita análisis"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Coste reclamación"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Programar una llamada"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Reclamaciones en progreso"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Fase de ventas"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Seguimiento de errores"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Próxima reunión"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Tipo campaña"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "Graduate"
-#~ msgstr "Graduado"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Observe que también puede utilizar la vista de calendario para programar "
-#~ "gráficamente su siguiente reunión."
-
-#~ msgid "crm.meeting.generic_wizard"
-#~ msgstr "crm.reunion.asistente_generico"
-
-#~ msgid "Histories"
-#~ msgstr "Historial"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Árbol de iniciativas"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "¡Error! No puede crear secciones recursivas."
-
-#~ msgid "This Year"
-#~ msgstr "Este año"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Le permite sincronizar sus calendarios OpenERP con su teléfono, Outlook, "
-#~ "Sunbird, iCal, ..."
-
-#~ msgid "Contract Data"
-#~ msgstr "Datos contrato"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Casos por iniciativas y tipo"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Calendario compartido"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Obtención de fondos"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Retorno est."
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Solicitudes de trabajo iniciales"
-
-#~ msgid "Claims Info"
-#~ msgstr "Info reclamaciones"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Asistencia técnica"
-
 #~ msgid "Telesales"
 #~ msgstr "Ventas a distancia"
 
-#~ msgid "Payment Mode"
-#~ msgstr "Forma de pago"
-
-#~ msgid "Source"
-#~ msgstr "Origen"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Convertir en empresa"
-
-#~ msgid "Jobs"
-#~ msgstr "Trabajos"
-
-#~ msgid "Job Info"
-#~ msgstr "Info. trabajo"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Cancelar reunión"
-
-#~ msgid "Employee Email"
-#~ msgstr "Email empleado"
-
-#~ msgid "Prospecting"
-#~ msgstr "Prospección"
-
-#~ msgid "Import ICS File"
-#~ msgstr "Importar fichero ICS"
-
-#~ msgid "Send Email"
-#~ msgstr "Enviar correo"
-
-#~ msgid "Corrective"
-#~ msgstr "Correctivo"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Trabajo - Formulario de selección"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Asistencia técnica"
-
-#~ msgid "Delay Close"
-#~ msgstr "Retrasar cierre"
-
-#~ msgid "Credit Card"
-#~ msgstr "Tarjeta de crédito"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr ""
-#~ "Esto puede ayudar a las organizaciones en su proceso de obtención de fondos "
-#~ "y seguimiento."
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Le permite seguir y gestionar iniciativas que son peticiones de pre-ventas o "
-#~ "contactos, el primer contacto de una solicitud de un posible cliente."
-
-#~ msgid "Events"
-#~ msgstr "Eventos"
-
-#~ msgid "crm.menu.config_wizard"
-#~ msgstr "crm.menu.asistente_config"
-
-#~ msgid "Cheque"
-#~ msgstr "Cheque"
-
-#~ msgid "Recycled"
-#~ msgstr "Reciclado"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Ya existe una empresa con el mismo nombre."
-
-#~ msgid "All Opportunities"
-#~ msgstr "Todas las oportunidades"
-
-#~ msgid "Sales"
-#~ msgstr "Ventas"
-
-#~ msgid "Assigned"
-#~ msgstr "Asignado"
-
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Categoria relacionada a la seccion. subdividido independientemente los casos "
-#~ "CRM  o modo-seccion"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Dando la ubicacion de la reunion"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Arbol de soporte tecnico"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Te ayuda a organizar los procesos para emplear trabajos: evaluacion, "
-#~ "reunion, integracion de correo electronico"
-
-#~ msgid "Lead Email"
-#~ msgstr "Dirigir correo electronico"
-
-#~ msgid "Search Funds"
-#~ msgstr "buscar fondos"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Expresion regular en nombre de caso"
-
-#~ msgid "Job Cases"
-#~ msgstr "casos de trabajos"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Responder el ultimo correo electronico"
-
-#~ msgid "Set RRULE"
-#~ msgstr "Establecer RRULE"
-
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "correo a los observadores (CC)"
-
-#~ msgid "Add a CC"
-#~ msgstr "Agregar un CC"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Correo electronico fallo"
-
-#~ msgid "Other Info"
-#~ msgstr "Otra información"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Propuesta/Precio cuota"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Nombre candidato"
-
-#~ msgid "OPAQUE"
-#~ msgstr "opaco"
-
-#~ msgid "Attendee"
-#~ msgstr "Asistente"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Cerrado perdido"
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Utilizado por las empresas para realizar seguimiento de errores y "
-#~ "solicitudes de soporte de Software"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Nombre categoría2 de casos"
-
-#~ msgid "Search Jobs"
-#~ msgstr "Buscar empleos"
-
-#~ msgid "Close job request"
-#~ msgstr "Cerrar solicitud de empleo"
-
-#~ msgid "Support Query"
-#~ msgstr "Petición de soporte"
-
-#~ msgid "Set case state to"
-#~ msgstr "Establecer estado del caso a"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Casos reuniones"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "Casos oportunidades"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Fecha de creación"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Nombre 2 candidato"
-
-#~ msgid "FreeBusy"
-#~ msgstr "LibreOcupado"
-
-#~ msgid "Candidate Phone"
-#~ msgstr "Teléfono candidato"
-
-#~ msgid "Attachment1"
-#~ msgstr "Adjunto 1"
-
-#~ msgid "Degree"
-#~ msgstr "Grado"
-
-#~ msgid "Attachment3"
-#~ msgstr "Adjunto 3"
-
-#~ msgid "Attachment2"
-#~ msgstr "Adjunto 2"
-
-#~ msgid "To Assign"
-#~ msgstr "Para asignar"
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Casos llamadas"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Está seguro de que desea crear una empresa basada en esta solicitud laboral ?"
-
-#~ msgid "History of Events"
-#~ msgstr "Histórico de eventos"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Categoría 2 del caso"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nombre del empleado"
-
-#~ msgid "Lead Name"
-#~ msgstr "Nombre iniciativa"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Fijar reunión"
-
-#~ msgid "Invalid"
-#~ msgstr "Inválido"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Calendario de reuniones"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Rechazado por el empleado"
-
-#~ msgid "All Claims"
-#~ msgstr "Todas las reclamaciones"
-
-#~ msgid "Server Action"
-#~ msgstr "Acción servidor"
-
-#~ msgid "Related Case"
-#~ msgstr "Caso relacionado"
-
-#~ msgid "Email Address"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Trabajos abiertos"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Disponibilidad (semanas)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Árbol de oportunidades"
-
-#~ msgid "First Interview"
-#~ msgstr "Primera entrevista"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Por favor, ¡provea una URL adecuada!"
-
-#~ msgid "PUBLIC"
-#~ msgstr "PÚBLICO"
-
-#~ msgid "Search Case"
-#~ msgstr "Buscar caso"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Borrador demanda"
-
-#~ msgid "Regex on Communication History"
-#~ msgstr "Exp. reg. en histórico de comunicaciones"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Cerrar llamada"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "¡Correo no enviado!"
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "Descripción Reclamación/Acción"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Reunión para generación de iniciativas"
-
-#~ msgid "Funds Form"
-#~ msgstr "Formulario fondos"
-
-#~ msgid "PRIVATE"
-#~ msgstr "PRIVADO"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Provea un camino para el calendario remoto"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Proceso de selección de personal"
-
-#~ msgid "Lead Source"
-#~ msgstr "Origen iniciativa"
-
-#~ msgid "Goals"
-#~ msgstr "Objetivos"
-
-#~ msgid "In Process"
-#~ msgstr "En curso"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Servicios post-venta"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Casos por sección y tipo"
-
-#~ msgid "File name"
-#~ msgstr "Nombre fichero"
-
-#~ msgid "Ok"
-#~ msgstr "Aceptar"
-
-#~ msgid "crm.claim.assign_wizard"
-#~ msgstr "crm.reclamación.asistente_asignación"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Todas las peticiones de trabajo"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern                                 for "
-#~ "anexception to a recurrence set"
-#~ msgstr ""
-#~ "define una regla o patrón repetitivo para una excepción a un conjunto "
-#~ "recurrente"
-
-#~ msgid "Relevant"
-#~ msgstr "Relevante"
-
-#~ msgid "Applied Job"
-#~ msgstr "Trabajo solicitado"
-
-#~ msgid "Import ICS"
-#~ msgstr "Importar ICS"
-
-#~ msgid "Claim Cases"
-#~ msgstr "Casos de reclamaciones"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "Email-id de las personas a las que se mandará el correo"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Una empresa ya está definida para esta petición de trabajo"
-
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr "Rehabilitación social y recuperación rural"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Casos por oportunidades y tipo"
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Asistente genérico"
-
-#~ msgid "Reporting"
-#~ msgstr "Informes"
-
-#~ msgid "Word of mouth"
-#~ msgstr "De palabra"
-
-#~ msgid "Planned"
-#~ msgstr "Planificado"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Asunto iniciativa"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Salario esperado"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Enviar nuevo correo"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Argumentos inválidos"
 
-#~ msgid "Trensparent"
-#~ msgstr "Transparente"
-
-#~ msgid "My Cases"
-#~ msgstr "Mis casos"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Árbol de fondos"
-
-#~ msgid "HelpDesk"
-#~ msgstr "Ayuda/Asistencia"
-
-#~ msgid "Search Cases by User"
-#~ msgstr "Buscar casos por usuario"
-
-#~ msgid "Type of Action"
-#~ msgstr "Tipo de acción"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Reunión con candidatos"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Email candidato"
-
-#~ msgid "Customer Office"
-#~ msgstr "Oficina cliente"
-
-#~ msgid "All Funds"
-#~ msgstr "Todos los fondos"
-
-#~ msgid "Change RRule"
-#~ msgstr "Cambiar regla"
-
-#~ msgid "Lead Details"
-#~ msgstr "Detalles iniciativa"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Arte y cultura"
-
-#~ msgid "Qualication"
-#~ msgstr "Cualificación"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Casos por sección, categoría y tipo"
-
-#~ msgid "Licenced"
-#~ msgstr "Licenciado"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Casos de reunión de fondos"
-
-#~ msgid "Office"
-#~ msgstr "Oficina"
-
-#~ msgid "Assign"
-#~ msgstr "Asignar"
-
-#~ msgid "Healthcare"
-#~ msgstr "Servicios sanitarios"
-
-#~ msgid "Employee"
-#~ msgstr "Empleado"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = EL '%' caracter"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Notas internas"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "CONFIDENCIAL"
-
-#~ msgid "Meeting date"
-#~ msgstr "Fecha reunión"
-
-#~ msgid "crm.helpdesk.assign_wizard"
-#~ msgstr "crm.asistencia.aistente_asignación"
-
-#~ msgid "Not fixed"
-#~ msgstr "No corregido"
-
-#~ msgid "Content of mail"
-#~ msgstr "Contenido del correo"
-
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Envío masivo de correo"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Fondos por categorías"
-
-#~ msgid "Cash"
-#~ msgstr "Efectivo"
-
-#~ msgid "Future"
-#~ msgstr "Futuro"
-
-#~ msgid "Import Message"
-#~ msgstr "Importar mensaje"
-
-#~ msgid "New Jobs"
-#~ msgstr "Nuevos trabajos"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Operaciones de obtención de fondos"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Guardar archivo ICS"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Casos de asistencia"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "Provea una ruta para el calendario remoto"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Exportar archivo ICS"
-
-#~ msgid " > Bac +5"
-#~ msgstr " > Bac +5"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Candidato contratado"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo está establecido a verdadero, le permitirá ocultar la "
-#~ "regla de caso sin eliminarla."
-
-#~ msgid "Export ICS File"
-#~ msgstr "Exportar archivo ICS"
-
-#~ msgid ""
-#~ "Helps you to encode the result of a phone call or to plan a list of phone "
-#~ "calls to process."
-#~ msgstr ""
-#~ "Le ayuda a registrar el resultado de una llamada telefónica o planear una "
-#~ "lista de llamadas a procesar."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo está establecido a verdadero, le permitirá ocultar el "
-#~ "caso sin eliminarlo."
-
-#~ msgid "Lead Information"
-#~ msgstr "Información iniciativa"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr ""
-#~ "Establece el orden de secuencia cuando se muestra una lista de reglas de "
-#~ "casos."
-
 #~ msgid "Send Partner & Historize"
 #~ msgstr "Enviar a empresa y añadir al historial"
 
-#~ msgid "Attendee Detail"
-#~ msgstr "Detalle de los asistentes"
-
-#~ msgid ""
-#~ "The minds states allow to define a value scale which representsthe partner "
-#~ "mentality in relation to our services.The scale hasto be created with a "
-#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-#~ msgstr ""
-#~ "Los estados de satisfacción permiten definir una escala de valores que "
-#~ "representan la mentalidad de las empresas respecto a nuestros servicios. La "
-#~ "escala tiene que ser creada con un factor para cada nivel empezando desde 0 "
-#~ "(muy insatisfecho) hasta 10 (muy satisfecho)."
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Calendario del recurso"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "ha sido convertida a oportunidad"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir cada x"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalo"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Oportunidades por categoría"
-
-#~ msgid "Custom"
-#~ msgstr "Personalización"
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Campaña mail 1"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
-#~ msgid "Exclude range"
-#~ msgstr "Excluir rango"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Caso reunión"
-
-#~ msgid "Extended Options..."
-#~ msgstr "Opciones extendidas..."
-
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Iniciativa "
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#, python-format
-#~ msgid "There is no stage for won opportunities defined for this Sale Team."
-#~ msgstr ""
-#~ "No se ha definido una etapa para las oportunidades ganadas para este equipo "
-#~ "de ventas."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Cree categorías específicas de llamadas telefónicas para ordenar y trazar "
-#~ "mejor el tipo de llamadas en el sistema"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Repetir max. estas veces"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "¡El acceso rápido para este menú ya existe!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Regla de recurrencia personalizada"
-
-#~ msgid "of"
-#~ msgstr "de"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "Create specific categories that fit your company's  activities in order to "
-#~ "better classify and analyse them after they have been maintained in your "
-#~ "leads and opportunities. You can use categories to reflect your product "
-#~ "structure or the different types of sales you do."
-#~ msgstr ""
-#~ "Cree categorías específicas que encajen en las actividades de su compañía "
-#~ "para clasificar y analizarlas mejor tras mantenerlas en sus iniciativas y "
-#~ "oportunidades. Puede usar categorías para reflejar su estructura de "
-#~ "productos o los diferentes tipos de ventas que realiza."
-
-#~ msgid ""
-#~ "Sales team allows you to organize your different salesmen or departments "
-#~ "into separate teams. Each team will work in his own list of opportunities, "
-#~ "sales orders, eso. Each user can set a team by default in his preferences. "
-#~ "The opportunities and sales order he will see, will be automatically "
-#~ "filtered according to his team."
-#~ msgstr ""
-#~ "Los equipos de ventas le permiten organizar los diferentes comerciales o "
-#~ "departamentos en equipos separados. Cada equipo trabajará en su propia lista "
-#~ "de oportunidades, pedidos, etc. Cada usuario puede indicar un equipo por "
-#~ "defecto en sus preferencias. Las oportunidades y pedidos que verá, se "
-#~ "filtrarán automáticamente de acuerdo a su equipo."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la información de alarma del "
-#~ "evento sin eliminarla."
-
-#~ msgid ""
-#~ "Opportunities allows you to manage and keep track of your sales pipeline by "
-#~ "creating specific customer or prospect related sales documents in order to "
-#~ "follow up potential sales. Information such as the expected revenue, "
-#~ "opportunity stage, expected closing date, communication history and so on "
-#~ "can be maintained in them. Opportunities can be connected with the email "
-#~ "gateway: new emails create opportunities, each of them automatically gets "
-#~ "the history of the conversation with the customer.\n"
-#~ "\n"
-#~ "You and your team(s) will be able to plan meetings and phone calls from "
-#~ "opportunities, convert them into quotations, manage related documents, track "
-#~ "all customer related activities, and much more."
-#~ msgstr ""
-#~ "Las oportunidades le permiten gestionar y llevar un control de su proceso de "
-#~ "ventas creando documentos de ventas sobre clientes específicos o sobre "
-#~ "perspectivas para hacer un seguimiento de las ventas potenciales. Puede "
-#~ "mantener información como el beneficio previsto, etapa de la oportunidad, "
-#~ "fecha de cierre prevista, historial de comunicaciones, ... Las oportunidades "
-#~ "se pueden conectar con la pasarela de correo electrónico: los nuevos correos "
-#~ "crean oportunidades, cada uno de ellos obtiene automáticamente el historial "
-#~ "de comunicaciones con el cliente.\n"
-#~ "Usted y su equipo serán capaces de planificar reuniones y llamadas "
-#~ "telefónicas desde oportunidades, convertirlas en presupuestos, gestionar "
-#~ "documentos relacionados, llevar un control de todas las actividades "
-#~ "asociadas con el cliente y mucho más."
-
-#~ msgid ""
-#~ "Create specific partner categories that you will then be able to assign to "
-#~ "your partners to better manage your interactions with them. The segmentation "
-#~ "tool will assign categories to partners based on defined criteria."
-#~ msgstr ""
-#~ "Cree categorías de empresa específicas que pueda asignar posteriormente a "
-#~ "sus empresas para manejar mejor su interacción con ellas. La herramienta de "
-#~ "segmentación asignará categorías a empresas basándose en criterios definidos."
-
-#~ msgid ""
-#~ "Outbound Calls lists all the calls to be performed by your sales team. They "
-#~ "can record the information about the call on the form view. These "
-#~ "information will appear on the partner form for the traceability of every "
-#~ "contact you get with a customer. You can import a .CSV file with a list of "
-#~ "calls to be done for your sales team."
-#~ msgstr ""
-#~ "Las llamadas salientes muestra todas las llamadas a realizar por su equipo "
-#~ "de ventas. Pueden registrar la información acerca de la llamada en la vista "
-#~ "formulario. Esta información aparecerá en el formulario de la empresa para "
-#~ "la trazabilidad de cada contacto que realice con un cliente. Puede importar "
-#~ "un fichero .CSV con una lista de llamadas a realizar por su equipo de ventas."
-
-#~ msgid ""
-#~ "'Meeting Invitations' allows you to create and manage the meeting "
-#~ "invitations sent/to be sent to your colleagues/partners."
-#~ msgstr ""
-#~ "Las 'Invitaciones de reunión' le permiten crear y administrar las "
-#~ "invitaciones de reunión enviadas o programadas para su envío a sus colegas o "
-#~ "empresas."
-
-#~ msgid "Count"
-#~ msgstr "Total"
-
-#~ msgid ""
-#~ "The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
-#~ "call you get will appear on the partner form for the traceability of every "
-#~ "contact you get with a partner. From the call record, you can trigger a "
-#~ "request for another call, a meeting or a business opportunity."
-#~ msgstr ""
-#~ "La herramienta de llamadas entrantes le permite registrar sus llamadas "
-#~ "entrantes al momento. Cada llamada que recibe aparecerá en el formulario de "
-#~ "la empresa para la trazabilidad de todos los contactos que haga con un "
-#~ "cliente. Desde el registro de llamadas, puede crear una petición para otra "
-#~ "llamada, una reunión o una oportunidad de negocio."
-
-#~ msgid ""
-#~ "'Leads' allows you to manage and keep track of all first potential interests "
-#~ "of a partner in one of your products or services. A lead is a first, "
-#~ "unqualified, contact with a prospect or customer. After being qualified, a "
-#~ "lead can be converted into a business opportunity with the creation of the "
-#~ "related partner for further detailed tracking of any linked activities. You "
-#~ "can use leads when you import a database of prospects or to integrate your "
-#~ "website's contact form with OpenERP."
-#~ msgstr ""
-#~ "Las 'iniciativas' le permiten gestionar y llevar un seguimiento de todos los "
-#~ "intereses de un cliente por uno de sus productos o servicios. Una iniciativa "
-#~ "es un primer contacto, sin cualificar, con un posible cliente o cliente. "
-#~ "Tras ser cualificada, una iniciativa se puede convertir en una oportunidad "
-#~ "de negocio con la creación de la empresa relacionada para un futuro "
-#~ "seguimiento detallado de cualquier actividad asociada. Puede usar "
-#~ "iniciativas cuando importa una base de datos de clientes potenciales o "
-#~ "integrar el formulario de contacto de su página web con OpenERP."
-
-#~ msgid ""
-#~ "Create specific stages that will help your sales better organise their sales "
-#~ "pipeline by maintaining them to their leads and sales opportunities. It will "
-#~ "allow them to easily track how is positioned a specific lead or opportunity "
-#~ "in the sales cycle."
-#~ msgstr ""
-#~ "Cree etapas específicas para ayudar a su equipo de ventas a organizar mejor "
-#~ "su flujo de ventas dentro de sus iniciativas y oportunidades. Les permitirá "
-#~ "saber con facilidad en que etapa está cada iniciativa u oportunidad dentro "
-#~ "del ciclo de ventas."
-
-#~ msgid "Claim"
-#~ msgstr "Reclamación"
-
-#~ msgid "Repeat interval"
-#~ msgstr "intervalo de repetición"
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index e6ab06d271d..2197386fd79 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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -808,8 +808,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1085,7 +1085,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2589,7 +2589,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3101,8 +3101,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4253,13 +4253,6 @@ msgstr ""
 #~ msgid "All "
 #~ msgstr "Todos "
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Si la empresa no ha comprado (o pedido) durante un período, reducir el "
-#~ "estado de ánimo por este factor. Es una multiplicación"
-
 #~ msgid "List"
 #~ msgstr "Lista"
 
@@ -4293,9 +4286,6 @@ msgstr ""
 #~ msgid "Case logs"
 #~ msgstr "Registros del caso"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Acciones"
 
diff --git a/addons/crm/i18n/es_EC.po b/addons/crm/i18n/es_EC.po
index bbe3785402b..c736ed47145 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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "¡El código del equipo de ventas debe ser único!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "La inicaitiva '%s' ha sido convertida en oportunidad"
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "No repetir"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -550,9 +550,9 @@ msgstr "Primer contacto con nueva prospección"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -842,8 +842,8 @@ msgid "Statistics Dashboard"
 msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1154,7 +1154,7 @@ msgstr "Acepta recibir emails"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2702,7 +2702,7 @@ msgid "Meeting Type"
 msgstr "Tipo de reunión"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Fusinar con oportunidad existente"
@@ -3233,8 +3233,8 @@ msgid "Schedule Call"
 msgstr "Planificar llamada"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3994,9 +3994,6 @@ msgstr "Año"
 msgid "Newsletter"
 msgstr "Boletín de noticias"
 
-#~ msgid "Interval"
-#~ msgstr "Intervalo"
-
 #~ msgid "Telesales"
 #~ msgstr "Ventas a distancia"
 
@@ -4444,13 +4441,6 @@ msgstr "Boletín de noticias"
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Condiciones sobre intervalo de prioridades"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Si la empresa no ha comprado (o pedido) durante un período, decrementar el "
-#~ "grado de satisfacción por este factor. Es una multiplicación."
-
 #~ msgid "All "
 #~ msgstr "Todos "
 
@@ -4499,9 +4489,6 @@ msgstr "Boletín de noticias"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Enviar correo a observadores (CC)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Acciones"
 
@@ -4575,387 +4562,27 @@ msgstr "Boletín de noticias"
 #~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
 #~ "creados en él."
 
-#~ msgid "Send to"
-#~ msgstr "Enviar a"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "Transparente"
-
 #~ msgid "Button Pressed"
 #~ msgstr "Botón oprimido"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 días    "
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Gestiona un servicio de mesa de ayuda"
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Trabajos pendientes"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Casos por sección y categoria2"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Revise esto si quiere la regla para enviar un correo a la persona "
-#~ "responsable."
-
-#~ msgid "Amount"
-#~ msgstr "Cantidad"
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Casos por oportunidades, categoria y tipo"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Gestiona los reclamos de proveedores y clientes, incluyendon sus acciones "
-#~ "prevenivas ó correctivas."
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Sección a la cual pertenece el caso. Definir usuario responsable y cuenta de "
-#~ "correo para correo de salida."
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Por favor especiificar el nombre de usuario de correo"
-
-#~ msgid "Fixed"
-#~ msgstr "Reparado"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Duración (Horas)"
-
 #~ msgid "Mail to these emails"
 #~ msgstr "Correo a estos correos electronicos"
 
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr ""
-#~ "Dar orden de la secuencia cuando se muestre la lista de casos de sección."
-
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palabras claves especiales para ser usadas en el cuerpo del mensaje."
 
-#~ msgid "Proposed Salary"
-#~ msgstr "Salario sugerido"
-
 #~ msgid "My Histories"
 #~ msgstr "Mis historias"
 
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr ""
-#~ "Temas de oportunidades de negocio identificadas para su canal de ventas."
-
-#~ msgid "Appreciation"
-#~ msgstr "Reconocimiento"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Suscribirse a un calendario remoto"
-
 #~ msgid "Last Action Date"
 #~ msgstr "Fechas de ultima acción"
 
 #~ msgid "Delay type"
 #~ msgstr "Tipo de retraso"
 
-#~ msgid "Description Information"
-#~ msgstr "Información de descripción"
-
-#~ msgid "Next Interview"
-#~ msgstr "Próxima entrevista"
-
-#~ msgid "Second Interview"
-#~ msgstr "Segunda entrevista"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Describe el nombre de la acción, ej: sobre que objeto que acción debe "
-#~ "realizarse en base a que condiciones"
-
-#~ msgid "Close Lead"
-#~ msgstr "Cerrar"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Esta propiedad define la lista de excepciones (días/horas) para un evento de "
-#~ "calendario recurrente"
-
-#~ msgid "Exception Rules"
-#~ msgstr "Reglas de Excepción"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Aceptado como reclamación"
-
-#~ msgid "Dead"
-#~ msgstr "Muerto"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Confirmar reunión"
-
-#~ msgid "Exception Dates"
-#~ msgstr "Fechas de excepción"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Email añadir CC"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Cliente existente"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Casos por sección, categoría y fase"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Active esta casilla en caso que quiera que la regla sea marcada CC ( copia "
-#~ "de email para cualquier otra persona definida en las acciones)"
-
-#~ msgid "All Meetings"
-#~ msgstr "Todas las reuniones"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Árbol de reuniones"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Política de reclamaciones"
-
-#~ msgid "   Today   "
-#~ msgstr "   Hoy   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Permite mostrar el calendario"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Descripción de la llamada"
-
-#~ msgid "New Business"
-#~ msgstr "Nuevo negocio"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Propuesta de valor"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Rechazado por la compañía"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Formulario de reuniones"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Contrato propuesto"
-
-#~ msgid "Assigned to"
-#~ msgstr "Asignada a"
-
-#~ msgid "Related Cases"
-#~ msgstr "Casos Relacionados"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Trabajos - Proceso de selección de personal"
-
-#~ msgid "New Claims"
-#~ msgstr "Nuevas Reclamaciones"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Casos por oportunidades y fase"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Negociación/Revisión"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Casos Oportunidades"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Contrato firmado"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Fecha de reclamación"
-
-#~ msgid "All Leads"
-#~ msgstr "Todas las iniciativas"
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "Subcribirse a ICS remotos"
-
-#~ msgid "Existing Business"
-#~ msgstr "Negocio existente"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Salvar en formato .ics"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Reclamaciones objetivas"
-
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid "Search Histories"
-#~ msgstr "Buscar en Historial"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Este correo no puede ser contestado"
-
-#~ msgid "Set State to"
-#~ msgstr "Establecer estado a"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Estas personas recibirán una copia de toda comunicación entre el partner y "
-#~ "los usuarios."
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Acción del servidor a ser ejecutada"
-
-#~ msgid "Export ICS"
-#~ msgstr "Exportar ICS"
-
-#~ msgid "Preventive"
-#~ msgstr "Preventivo"
-
-#~ msgid "My Funds"
-#~ msgstr "Mis donaciones"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Desarrollador junior"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "No se puede asignar un caso cerrado."
-
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Reclamaciones Pendientes"
-
-#~ msgid "Category Name"
-#~ msgstr "Nombre de Categoría"
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Regla concurrente"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Candidato rechazado"
-
-#~ msgid "Closed Won"
-#~ msgstr "Cerrado-Ganado"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Casos por sección, categoría y categoría2"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Aprendizaje y educación"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr "Estas seguro que deseas crear una empresa basado en esta llamada?"
-
-#~ msgid "Add CC"
-#~ msgstr "Añadir CC"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Casos por sección y fase"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Si el campo activo está marcado, podrá ocultar la sección del caso sin "
-#~ "eliminarla."
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Casos por oportunidades, categoría y fase"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Casos por sección y fase"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Casos por fases y estimaciones"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Fase de ventas: "
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Casos por sección, categoría y fase"
-
-#~ msgid "Stage: "
-#~ msgstr "Fase: "
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Casos por iniciativas y fase"
-
-#~ msgid "Direction"
-#~ msgstr "Dirección"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Planear reunión"
-
-#~ msgid "Home"
-#~ msgstr "Particular"
-
-#~ msgid "Regex on Case Name"
-#~ msgstr "Expresión regular del nombre del caso"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Correo electrónico!"
-
-#~ msgid "crm.opportunity.assign_wizard"
-#~ msgstr "crm.opportunity.assign_wizard"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Los canales representan las diferentes maneras que existen de comunicación "
-#~ "con el cliente. A cada oportunidad se le puede indicar de que canal provino."
-
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Descripción del caso"
 
-#~ msgid "crm.phonecall.assign_wizard"
-#~ msgstr "crm.phonecall.assign_wizard"
-
-#~ msgid "Message..."
-#~ msgstr "Mensaje..."
-
-#~ msgid "Meeting Date"
-#~ msgstr "Fecha de reunión"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Convertir a empresa"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Próximas reuniones"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Suscribir"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Asistente genérico de reuniones"
-
-#~ msgid "Value Claims"
-#~ msgstr "Valor reclamaciones"
-
 #~ msgid "Planned revenue"
 #~ msgstr "Ingresos previstos"
 
@@ -4965,888 +4592,8 @@ msgstr "Boletín de noticias"
 #~ msgid "Planned costs"
 #~ msgstr "Costos previstos"
 
-#~ msgid "Funds"
-#~ msgstr "Fondos"
-
-#~ msgid "Self Generated"
-#~ msgstr "Auto generado"
-
-#~ msgid "Website"
-#~ msgstr "Sitio web"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Esperando respuesta"
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Casos por sección y 2ª categoría"
-
-#~ msgid "Type of claim"
-#~ msgstr "Tipo de reclamación"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Trabajos - selección de personal"
-
-#~ msgid "Won't fix"
-#~ msgstr "No será corregido"
-
-#~ msgid "Converted"
-#~ msgstr "Convertido"
-
-#~ msgid "Search Claims"
-#~ msgstr "Búsqueda reclamaciones"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Gestiona el calendario de reuniones de los usuarios."
-
-#~ msgid "Mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Necesita análisis"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Coste reclamación"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Programar una llamada"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Reclamaciones en progreso"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Fase de ventas"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Seguimiento de errores"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Próxima reunión"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Tipo campaña"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "Graduate"
-#~ msgstr "Graduado"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Observe que también puede utilizar la vista de calendario para programar "
-#~ "gráficamente su siguiente reunión."
-
-#~ msgid "crm.meeting.generic_wizard"
-#~ msgstr "crm.reunion.asistente_generico"
-
-#~ msgid "Histories"
-#~ msgstr "Historial"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Árbol de iniciativas"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "¡Error! No puede crear secciones recursivas."
-
-#~ msgid "This Year"
-#~ msgstr "Este año"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Le permite sincronizar sus calendarios OpenERP con su teléfono, Outlook, "
-#~ "Sunbird, iCal, ..."
-
-#~ msgid "Contract Data"
-#~ msgstr "Datos contrato"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Casos por iniciativas y tipo"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Calendario compartido"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Obtención de fondos"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Retorno est."
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Solicitudes de trabajo iniciales"
-
-#~ msgid "Claims Info"
-#~ msgstr "Info reclamaciones"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Asistencia técnica"
-
-#~ msgid "Payment Mode"
-#~ msgstr "Forma de pago"
-
-#~ msgid "Source"
-#~ msgstr "Origen"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Convertir en empresa"
-
-#~ msgid "Jobs"
-#~ msgstr "Trabajos"
-
-#~ msgid "Job Info"
-#~ msgstr "Info. trabajo"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Cancelar reunión"
-
-#~ msgid "Employee Email"
-#~ msgstr "Email empleado"
-
-#~ msgid "Prospecting"
-#~ msgstr "Prospección"
-
-#~ msgid "Import ICS File"
-#~ msgstr "Importar fichero ICS"
-
-#~ msgid "Send Email"
-#~ msgstr "Enviar correo"
-
-#~ msgid "Corrective"
-#~ msgstr "Correctivo"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Trabajo - Formulario de selección"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Asistencia técnica"
-
-#~ msgid "Delay Close"
-#~ msgstr "Retrasar cierre"
-
-#~ msgid "Credit Card"
-#~ msgstr "Tarjeta de crédito"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr ""
-#~ "Esto puede ayudar a las organizaciones en su proceso de obtención de fondos "
-#~ "y seguimiento."
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Le permite seguir y gestionar iniciativas que son peticiones de pre-ventas o "
-#~ "contactos, el primer contacto de una solicitud de un posible cliente."
-
-#~ msgid "Events"
-#~ msgstr "Eventos"
-
-#~ msgid "crm.menu.config_wizard"
-#~ msgstr "crm.menu.asistente_config"
-
-#~ msgid "Cheque"
-#~ msgstr "Cheque"
-
-#~ msgid "Recycled"
-#~ msgstr "Reciclado"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Ya existe una empresa con el mismo nombre."
-
-#~ msgid "All Opportunities"
-#~ msgstr "Todas las oportunidades"
-
-#~ msgid "Sales"
-#~ msgstr "Ventas"
-
-#~ msgid "Assigned"
-#~ msgstr "Asignado"
-
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Categoria relacionada a la seccion. subdividido independientemente los casos "
-#~ "CRM  o modo-seccion"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Dando la ubicacion de la reunion"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Arbol de soporte tecnico"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Te ayuda a organizar los procesos para emplear trabajos: evaluacion, "
-#~ "reunion, integracion de correo electronico"
-
-#~ msgid "Lead Email"
-#~ msgstr "Dirigir correo electronico"
-
-#~ msgid "Search Funds"
-#~ msgstr "buscar fondos"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Expresion regular en nombre de caso"
-
-#~ msgid "Job Cases"
-#~ msgstr "casos de trabajos"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Responder el ultimo correo electronico"
-
-#~ msgid "Set RRULE"
-#~ msgstr "Establecer RRULE"
-
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "correo a los observadores (CC)"
-
-#~ msgid "Add a CC"
-#~ msgstr "Agregar un CC"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Correo electronico fallo"
-
-#~ msgid "Other Info"
-#~ msgstr "Otra información"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Propuesta/Precio cuota"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Nombre candidato"
-
-#~ msgid "OPAQUE"
-#~ msgstr "opaco"
-
-#~ msgid "Attendee"
-#~ msgstr "Asistente"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Cerrado perdido"
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Utilizado por las empresas para realizar seguimiento de errores y "
-#~ "solicitudes de soporte de Software"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Nombre categoría2 de casos"
-
-#~ msgid "Search Jobs"
-#~ msgstr "Buscar empleos"
-
-#~ msgid "Close job request"
-#~ msgstr "Cerrar solicitud de empleo"
-
-#~ msgid "Support Query"
-#~ msgstr "Petición de soporte"
-
-#~ msgid "Set case state to"
-#~ msgstr "Establecer estado del caso a"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Casos reuniones"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "Casos oportunidades"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Fecha de creación"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Nombre 2 candidato"
-
-#~ msgid "FreeBusy"
-#~ msgstr "LibreOcupado"
-
-#~ msgid "Candidate Phone"
-#~ msgstr "Teléfono candidato"
-
-#~ msgid "Attachment1"
-#~ msgstr "Adjunto 1"
-
-#~ msgid "Degree"
-#~ msgstr "Grado"
-
-#~ msgid "Attachment3"
-#~ msgstr "Adjunto 3"
-
-#~ msgid "Attachment2"
-#~ msgstr "Adjunto 2"
-
-#~ msgid "To Assign"
-#~ msgstr "Para asignar"
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Casos llamadas"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Está seguro de que desea crear una empresa basada en esta solicitud laboral ?"
-
-#~ msgid "History of Events"
-#~ msgstr "Histórico de eventos"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Categoría 2 del caso"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nombre del empleado"
-
-#~ msgid "Lead Name"
-#~ msgstr "Nombre iniciativa"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Fijar reunión"
-
-#~ msgid "Invalid"
-#~ msgstr "Inválido"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Calendario de reuniones"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Rechazado por el empleado"
-
-#~ msgid "All Claims"
-#~ msgstr "Todas las reclamaciones"
-
-#~ msgid "Server Action"
-#~ msgstr "Acción servidor"
-
-#~ msgid "Related Case"
-#~ msgstr "Caso relacionado"
-
-#~ msgid "Email Address"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Trabajos abiertos"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Disponibilidad (semanas)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Árbol de oportunidades"
-
-#~ msgid "First Interview"
-#~ msgstr "Primera entrevista"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Por favor, ¡provea una URL adecuada!"
-
-#~ msgid "PUBLIC"
-#~ msgstr "PÚBLICO"
-
-#~ msgid "Search Case"
-#~ msgstr "Buscar caso"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Borrador demanda"
-
-#~ msgid "Regex on Communication History"
-#~ msgstr "Exp. reg. en histórico de comunicaciones"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Cerrar llamada"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "¡Correo no enviado!"
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "Descripción Reclamación/Acción"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Reunión para generación de iniciativas"
-
-#~ msgid "Funds Form"
-#~ msgstr "Formulario fondos"
-
-#~ msgid "PRIVATE"
-#~ msgstr "PRIVADO"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Provea un camino para el calendario remoto"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Proceso de selección de personal"
-
-#~ msgid "Lead Source"
-#~ msgstr "Origen iniciativa"
-
-#~ msgid "Goals"
-#~ msgstr "Objetivos"
-
-#~ msgid "In Process"
-#~ msgstr "En curso"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Servicios post-venta"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Casos por sección y tipo"
-
-#~ msgid "File name"
-#~ msgstr "Nombre fichero"
-
-#~ msgid "Ok"
-#~ msgstr "Aceptar"
-
-#~ msgid "crm.claim.assign_wizard"
-#~ msgstr "crm.reclamación.asistente_asignación"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Todas las peticiones de trabajo"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern                                 for "
-#~ "anexception to a recurrence set"
-#~ msgstr ""
-#~ "define una regla o patrón repetitivo para una excepción a un conjunto "
-#~ "recurrente"
-
-#~ msgid "Relevant"
-#~ msgstr "Relevante"
-
-#~ msgid "Applied Job"
-#~ msgstr "Trabajo solicitado"
-
-#~ msgid "Import ICS"
-#~ msgstr "Importar ICS"
-
-#~ msgid "Claim Cases"
-#~ msgstr "Casos de reclamaciones"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "Email-id de las personas a las que se mandará el correo"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Una empresa ya está definida para esta petición de trabajo"
-
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr "Rehabilitación social y recuperación rural"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Casos por oportunidades y tipo"
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Asistente genérico"
-
-#~ msgid "Reporting"
-#~ msgstr "Informes"
-
-#~ msgid "Word of mouth"
-#~ msgstr "De palabra"
-
-#~ msgid "Planned"
-#~ msgstr "Planificado"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Asunto iniciativa"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Salario esperado"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Enviar nuevo correo"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Argumentos inválidos"
 
-#~ msgid "Trensparent"
-#~ msgstr "Transparente"
-
-#~ msgid "My Cases"
-#~ msgstr "Mis casos"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Árbol de fondos"
-
-#~ msgid "HelpDesk"
-#~ msgstr "Ayuda/Asistencia"
-
-#~ msgid "Search Cases by User"
-#~ msgstr "Buscar casos por usuario"
-
-#~ msgid "Type of Action"
-#~ msgstr "Tipo de acción"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Reunión con candidatos"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Email candidato"
-
-#~ msgid "Customer Office"
-#~ msgstr "Oficina cliente"
-
-#~ msgid "All Funds"
-#~ msgstr "Todos los fondos"
-
-#~ msgid "Change RRule"
-#~ msgstr "Cambiar regla"
-
-#~ msgid "Lead Details"
-#~ msgstr "Detalles iniciativa"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Arte y cultura"
-
-#~ msgid "Qualication"
-#~ msgstr "Cualificación"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Casos por sección, categoría y tipo"
-
-#~ msgid "Licenced"
-#~ msgstr "Licenciado"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Casos de reunión de fondos"
-
-#~ msgid "Office"
-#~ msgstr "Oficina"
-
-#~ msgid "Assign"
-#~ msgstr "Asignar"
-
-#~ msgid "Healthcare"
-#~ msgstr "Servicios sanitarios"
-
-#~ msgid "Employee"
-#~ msgstr "Empleado"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = EL '%' caracter"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Notas internas"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "CONFIDENCIAL"
-
-#~ msgid "Meeting date"
-#~ msgstr "Fecha reunión"
-
-#~ msgid "crm.helpdesk.assign_wizard"
-#~ msgstr "crm.asistencia.aistente_asignación"
-
-#~ msgid "Not fixed"
-#~ msgstr "No corregido"
-
-#~ msgid "Content of mail"
-#~ msgstr "Contenido del correo"
-
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Envío masivo de correo"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Fondos por categorías"
-
-#~ msgid "Cash"
-#~ msgstr "Efectivo"
-
-#~ msgid "Future"
-#~ msgstr "Futuro"
-
-#~ msgid "Import Message"
-#~ msgstr "Importar mensaje"
-
-#~ msgid "New Jobs"
-#~ msgstr "Nuevos trabajos"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Operaciones de obtención de fondos"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Guardar archivo ICS"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Casos de asistencia"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "Provea una ruta para el calendario remoto"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Exportar archivo ICS"
-
-#~ msgid " > Bac +5"
-#~ msgstr " > Bac +5"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Candidato contratado"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo está establecido a verdadero, le permitirá ocultar la "
-#~ "regla de caso sin eliminarla."
-
-#~ msgid "Export ICS File"
-#~ msgstr "Exportar archivo ICS"
-
-#~ msgid ""
-#~ "Helps you to encode the result of a phone call or to plan a list of phone "
-#~ "calls to process."
-#~ msgstr ""
-#~ "Le ayuda a registrar el resultado de una llamada telefónica o planear una "
-#~ "lista de llamadas a procesar."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo está establecido a verdadero, le permitirá ocultar el "
-#~ "caso sin eliminarlo."
-
-#~ msgid "Lead Information"
-#~ msgstr "Información iniciativa"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr ""
-#~ "Establece el orden de secuencia cuando se muestra una lista de reglas de "
-#~ "casos."
-
 #~ msgid "Send Partner & Historize"
 #~ msgstr "Enviar a empresa y añadir al historial"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "Detalle de los asistentes"
-
-#~ msgid ""
-#~ "The minds states allow to define a value scale which representsthe partner "
-#~ "mentality in relation to our services.The scale hasto be created with a "
-#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-#~ msgstr ""
-#~ "Los estados de satisfacción permiten definir una escala de valores que "
-#~ "representan la mentalidad de las empresas respecto a nuestros servicios. La "
-#~ "escala tiene que ser creada con un factor para cada nivel empezando desde 0 "
-#~ "(muy insatisfecho) hasta 10 (muy satisfecho)."
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Calendario del recurso"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "ha sido convertida a oportunidad"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir cada x"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Oportunidades por categoría"
-
-#~ msgid "Custom"
-#~ msgstr "Personalización"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
-#~ msgid "Exclude range"
-#~ msgstr "Excluir rango"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Caso reunión"
-
-#~ msgid "Extended Options..."
-#~ msgstr "Opciones extendidas..."
-
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Iniciativa "
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#, python-format
-#~ msgid "There is no stage for won opportunities defined for this Sale Team."
-#~ msgstr ""
-#~ "No se ha definido una etapa para las oportunidades ganadas para este equipo "
-#~ "de ventas."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Cree categorías específicas de llamadas telefónicas para ordenar y trazar "
-#~ "mejor el tipo de llamadas en el sistema"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Repetir max. estas veces"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "¡El acceso rápido para este menú ya existe!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Regla de recurrencia personalizada"
-
-#~ msgid "of"
-#~ msgstr "de"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "Create specific categories that fit your company's  activities in order to "
-#~ "better classify and analyse them after they have been maintained in your "
-#~ "leads and opportunities. You can use categories to reflect your product "
-#~ "structure or the different types of sales you do."
-#~ msgstr ""
-#~ "Cree categorías específicas que encajen en las actividades de su compañía "
-#~ "para clasificar y analizarlas mejor tras mantenerlas en sus iniciativas y "
-#~ "oportunidades. Puede usar categorías para reflejar su estructura de "
-#~ "productos o los diferentes tipos de ventas que realiza."
-
-#~ msgid ""
-#~ "Sales team allows you to organize your different salesmen or departments "
-#~ "into separate teams. Each team will work in his own list of opportunities, "
-#~ "sales orders, eso. Each user can set a team by default in his preferences. "
-#~ "The opportunities and sales order he will see, will be automatically "
-#~ "filtered according to his team."
-#~ msgstr ""
-#~ "Los equipos de ventas le permiten organizar los diferentes comerciales o "
-#~ "departamentos en equipos separados. Cada equipo trabajará en su propia lista "
-#~ "de oportunidades, pedidos, etc. Cada usuario puede indicar un equipo por "
-#~ "defecto en sus preferencias. Las oportunidades y pedidos que verá, se "
-#~ "filtrarán automáticamente de acuerdo a su equipo."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la información de alarma del "
-#~ "evento sin eliminarla."
-
-#~ msgid ""
-#~ "Opportunities allows you to manage and keep track of your sales pipeline by "
-#~ "creating specific customer or prospect related sales documents in order to "
-#~ "follow up potential sales. Information such as the expected revenue, "
-#~ "opportunity stage, expected closing date, communication history and so on "
-#~ "can be maintained in them. Opportunities can be connected with the email "
-#~ "gateway: new emails create opportunities, each of them automatically gets "
-#~ "the history of the conversation with the customer.\n"
-#~ "\n"
-#~ "You and your team(s) will be able to plan meetings and phone calls from "
-#~ "opportunities, convert them into quotations, manage related documents, track "
-#~ "all customer related activities, and much more."
-#~ msgstr ""
-#~ "Las oportunidades le permiten gestionar y llevar un control de su proceso de "
-#~ "ventas creando documentos de ventas sobre clientes específicos o sobre "
-#~ "perspectivas para hacer un seguimiento de las ventas potenciales. Puede "
-#~ "mantener información como el beneficio previsto, etapa de la oportunidad, "
-#~ "fecha de cierre prevista, historial de comunicaciones, ... Las oportunidades "
-#~ "se pueden conectar con la pasarela de correo electrónico: los nuevos correos "
-#~ "crean oportunidades, cada uno de ellos obtiene automáticamente el historial "
-#~ "de comunicaciones con el cliente.\n"
-#~ "Usted y su equipo serán capaces de planificar reuniones y llamadas "
-#~ "telefónicas desde oportunidades, convertirlas en presupuestos, gestionar "
-#~ "documentos relacionados, llevar un control de todas las actividades "
-#~ "asociadas con el cliente y mucho más."
-
-#~ msgid ""
-#~ "Create specific partner categories that you will then be able to assign to "
-#~ "your partners to better manage your interactions with them. The segmentation "
-#~ "tool will assign categories to partners based on defined criteria."
-#~ msgstr ""
-#~ "Cree categorías de empresa específicas que pueda asignar posteriormente a "
-#~ "sus empresas para manejar mejor su interacción con ellas. La herramienta de "
-#~ "segmentación asignará categorías a empresas basándose en criterios definidos."
-
-#~ msgid ""
-#~ "Outbound Calls lists all the calls to be performed by your sales team. They "
-#~ "can record the information about the call on the form view. These "
-#~ "information will appear on the partner form for the traceability of every "
-#~ "contact you get with a customer. You can import a .CSV file with a list of "
-#~ "calls to be done for your sales team."
-#~ msgstr ""
-#~ "Las llamadas salientes muestra todas las llamadas a realizar por su equipo "
-#~ "de ventas. Pueden registrar la información acerca de la llamada en la vista "
-#~ "formulario. Esta información aparecerá en el formulario de la empresa para "
-#~ "la trazabilidad de cada contacto que realice con un cliente. Puede importar "
-#~ "un fichero .CSV con una lista de llamadas a realizar por su equipo de ventas."
-
-#~ msgid ""
-#~ "'Meeting Invitations' allows you to create and manage the meeting "
-#~ "invitations sent/to be sent to your colleagues/partners."
-#~ msgstr ""
-#~ "Las 'Invitaciones de reunión' le permiten crear y administrar las "
-#~ "invitaciones de reunión enviadas o programadas para su envío a sus colegas o "
-#~ "empresas."
-
-#~ msgid "Count"
-#~ msgstr "Total"
-
-#~ msgid ""
-#~ "The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
-#~ "call you get will appear on the partner form for the traceability of every "
-#~ "contact you get with a partner. From the call record, you can trigger a "
-#~ "request for another call, a meeting or a business opportunity."
-#~ msgstr ""
-#~ "La herramienta de llamadas entrantes le permite registrar sus llamadas "
-#~ "entrantes al momento. Cada llamada que recibe aparecerá en el formulario de "
-#~ "la empresa para la trazabilidad de todos los contactos que haga con un "
-#~ "cliente. Desde el registro de llamadas, puede crear una petición para otra "
-#~ "llamada, una reunión o una oportunidad de negocio."
-
-#~ msgid ""
-#~ "'Leads' allows you to manage and keep track of all first potential interests "
-#~ "of a partner in one of your products or services. A lead is a first, "
-#~ "unqualified, contact with a prospect or customer. After being qualified, a "
-#~ "lead can be converted into a business opportunity with the creation of the "
-#~ "related partner for further detailed tracking of any linked activities. You "
-#~ "can use leads when you import a database of prospects or to integrate your "
-#~ "website's contact form with OpenERP."
-#~ msgstr ""
-#~ "Las 'iniciativas' le permiten gestionar y llevar un seguimiento de todos los "
-#~ "intereses de un cliente por uno de sus productos o servicios. Una iniciativa "
-#~ "es un primer contacto, sin cualificar, con un posible cliente o cliente. "
-#~ "Tras ser cualificada, una iniciativa se puede convertir en una oportunidad "
-#~ "de negocio con la creación de la empresa relacionada para un futuro "
-#~ "seguimiento detallado de cualquier actividad asociada. Puede usar "
-#~ "iniciativas cuando importa una base de datos de clientes potenciales o "
-#~ "integrar el formulario de contacto de su página web con OpenERP."
-
-#~ msgid ""
-#~ "Create specific stages that will help your sales better organise their sales "
-#~ "pipeline by maintaining them to their leads and sales opportunities. It will "
-#~ "allow them to easily track how is positioned a specific lead or opportunity "
-#~ "in the sales cycle."
-#~ msgstr ""
-#~ "Cree etapas específicas para ayudar a su equipo de ventas a organizar mejor "
-#~ "su flujo de ventas dentro de sus iniciativas y oportunidades. Les permitirá "
-#~ "saber con facilidad en que etapa está cada iniciativa u oportunidad dentro "
-#~ "del ciclo de ventas."
-
-#~ msgid "Claim"
-#~ msgstr "Reclamación"
diff --git a/addons/crm/i18n/es_MX.po b/addons/crm/i18n/es_MX.po
new file mode 100644
index 00000000000..507e564669f
--- /dev/null
+++ b/addons/crm/i18n/es_MX.po
@@ -0,0 +1,4643 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* crm
+#
+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-18 07:46+0000\n"
+"Last-Translator: Jorge L Tupac-Yupanqui <Unknown>\n"
+"Language-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:08+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Leads"
+msgstr "# Iniciativas"
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+msgid "Lead"
+msgstr "Iniciativa"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor3
+msgid "Need Services"
+msgstr "Necesita servicios"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "Schedule a PhoneCall"
+msgstr "Planificar llamada telefónica"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etapa del caso"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Visibility"
+msgstr "Visibilidad"
+
+#. module: crm
+#: field:crm.lead,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: crm
+#: field:crm.meeting,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: crm
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
+msgid "Date of month"
+msgstr "Día del mes"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Select Opportunities"
+msgstr "Seleccionar oportunidades"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid " "
+msgstr " "
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.phonecall.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Previous Stage"
+msgstr "Etapa anterior"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#, python-format
+msgid "Can not add note!"
+msgstr "¡No se puede añadir una nota!"
+
+#. module: crm
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nombre de etapa"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,day:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr "¡El código del equipo de ventas debe ser único!"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
+msgstr "La inicaitiva '%s' ha sido convertida en oportunidad"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:228
+#, python-format
+msgid "The lead '%s' has been closed."
+msgstr "La iniciativa '%s' ha sido cerrada"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#: code:addons/crm/wizard/crm_lead_to_partner.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Advertencia !"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Yearly"
+msgstr "Anual"
+
+#. module: crm
+#: field:crm.segmentation.line,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. 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 "Campaña"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+msgid "Do not create a partner"
+msgstr "No crear una empresa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Opportunities"
+msgstr "Busqueda de oportunidades"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#, python-format
+msgid ""
+"Opportunity must have Partner assigned before merging with other Opportunity."
+msgstr ""
+"La oportunidad debe de tener una empresa asignada antes de fusionarla con "
+"otra oportunidad."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. 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 "Análisis de oportunidades"
+
+#. module: crm
+#: field:crm.lead,partner_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,partner_id:0
+#: field:crm.lead2opportunity,partner_id:0
+#: field:crm.lead2opportunity.partner,partner_id:0
+#: field:crm.lead2partner,partner_id:0
+#: view:crm.meeting:0
+#: field:crm.meeting,partner_id:0
+#: field:crm.partner2opportunity,partner_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,partner_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,partner_id:0
+#: field:crm.phonecall2opportunity,partner_id:0
+#: field:crm.phonecall2partner,partner_id:0
+#: model:ir.model,name:crm.model_res_partner
+#: model:process.node,name:crm.process_node_partner0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
+msgid "Organizer"
+msgstr "Organizador"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall2phonecall:0
+#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+#: view:res.partner:0
+msgid "Schedule Other Call"
+msgstr "Planificar otra llamada"
+
+#. module: crm
+#: help:crm.meeting,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr "Editar todas las ocurrencias de la reunión recurrente."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
+#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:89
+#: model:crm.case.categ,name:crm.categ_meet3
+#: view:crm.phonecall:0
+#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
+#: view:res.partner:0
+#, python-format
+msgid "Phone Call"
+msgstr "Llamada de telefono"
+
+#. module: crm
+#: field:crm.lead,optout:0
+msgid "Opt-Out"
+msgstr "No acepta recibir emails"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:108
+#, python-format
+msgid "The opportunity '%s' has been marked as lost."
+msgstr "La oportunidad '%s' ha sido marcada como perdida."
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+"El análisis de iniciativas le permite verificar información relacionada con "
+"el CRM. Puede verificar los retrasos, el número de respuestas realizadas y "
+"el número de emails enviados. Puede ordenar el análisis de sus iniciativas "
+"según diferentes grupos para obtener un análisis reagrupado preciso."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm
+#: field:crm.segmentation,segmentation_line:0
+msgid "Criteria"
+msgstr "Criterios"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Excluded Answers :"
+msgstr "Respuestas excluidas:"
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciones"
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "_Merge"
+msgstr "_Fusionar"
+
+#. 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 "Análisis de iniciativas"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+msgid ""
+"If you select Merge with existing Opportunity, the lead details(with the "
+"communication history) will be merged with existing Opportunity of Selected "
+"partner."
+msgstr ""
+"Si selecciona fusionar con oportunidad existente, los detalles de la "
+"iniciativa (con el histórico de la comunicación) serán fusionados con la "
+"oportunidad existente de la empresa seleccionada"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Public"
+msgstr "Público"
+
+#. 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 "Campañas"
+
+#. 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 "Categorías"
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Forever"
+msgstr "Siempre"
+
+#. 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 ""
+"Si opt-out está marcado, este contacto ha rehusado recibir correos "
+"electrónicos o ha eliminado su suscripción a una campaña."
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadpartner0
+msgid "Prospect Partner"
+msgstr "Socio prospecto"
+
+#. module: crm
+#: field:crm.lead,contact_name:0
+msgid "Contact Name"
+msgstr "Nombre de contacto"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Link to an existing partner"
+msgstr "Enlace al socio existente"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.phonecall,partner_contact:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Enhance your core CRM Application with additional functionalities."
+msgstr "Mejore su aplicación CRM básica con funcionalidades adicionales."
+
+#. module: crm
+#: field:crm.case.stage,on_change:0
+msgid "Change Probability Automatically"
+msgstr "Cambiar la probabilidad automáticamente"
+
+#. module: crm
+#: field:base.action.rule,regex_history:0
+msgid "Regular Expression on Case History"
+msgstr "Expresiones Regulares en el Historial del Caso"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:209
+#, python-format
+msgid "The lead '%s' has been opened."
+msgstr "La iniciativa '%s' ha sido abierta."
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_opportunitymeeting0
+msgid "Opportunity Meeting"
+msgstr "Oportunidad de Reunión"
+
+#. 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 "Número de días para cerrar el caso"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_opportunities0
+msgid "When a real project/opportunity is detected"
+msgstr "Cuando un proyecto/oportunidad real es detectado"
+
+#. module: crm
+#: field:crm.installer,crm_fundraising:0
+msgid "Fundraising"
+msgstr "Recaudación de fondos"
+
+#. module: crm
+#: view:res.partner:0
+#: field:res.partner,opportunity_ids:0
+msgid "Leads and Opportunities"
+msgstr "Iniciativas y oportunidades"
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm
+#: field:crm.case.section,change_responsible:0
+msgid "Change Responsible"
+msgstr "Cambiar responsable"
+
+#. module: crm
+#: field:crm.merge.opportunity,state:0
+msgid "Set State To"
+msgstr "Cmabiar estado a"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls list all the calls to be done by your sales team. A salesman "
+"can record the information about the call in the form view. This information "
+"will be stored in the partner form to trace every contact you have with a "
+"customer. You can also import a .CSV file with a list of calls to be done by "
+"your sales team."
+msgstr ""
+"Llamadas salientes muestra todas las llamadas realizadas por su equipo de "
+"ventas. Un vendedor puede grabar la información sobre la llamada en la vista "
+"de formulario. Esta información se almacenará en el formulario de empresa "
+"para rastrear cada contacto que tenga con un cliente. También puede importar "
+"un archivo .CSV con una lista de llamadas a realizar por su equipo de ventas."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_action
+msgid "Convert/Merge Opportunity"
+msgstr "Convertir/Fusionar oportunidad"
+
+#. module: crm
+#: field:crm.lead,write_date:0
+msgid "Update Date"
+msgstr "Actualizar fecha"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: field:crm.lead2opportunity.action,name:0
+msgid "Select Action"
+msgstr "Seleccionar acción"
+
+#. module: crm
+#: field:base.action.rule,trg_categ_id:0
+#: view:crm.lead:0
+#: field:crm.lead,categ_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,categ_id:0
+#: field:crm.opportunity2phonecall,categ_id:0
+#: field:crm.phonecall,categ_id:0
+#: field:crm.phonecall.report,categ_id:0
+#: field:crm.phonecall2phonecall,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "#Opportunities"
+msgstr "# Oportunidades"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor2
+msgid "Campaign 1"
+msgstr "Campaña 1"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor1
+msgid "Campaign 2"
+msgstr "Campaña 2"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Privacy"
+msgstr "Privada"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunity Analysis"
+msgstr "Análisis de oportunidades"
+
+#. module: crm
+#: help:crm.meeting,location:0
+msgid "Location of Event"
+msgstr "Lacalización del evento"
+
+#. module: crm
+#: field:crm.meeting,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead1
+msgid "Version 4.2"
+msgstr "Versión 4.2"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead2
+msgid "Version 4.4"
+msgstr "Versión 4.4"
+
+#. module: crm
+#: help:crm.installer,fetchmail:0
+msgid "Allows you to receive E-Mails from POP/IMAP server."
+msgstr "Le permite recibir e-mails desde un servidor POP/IMAP"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_opportunitymeeting0
+msgid "Normal or phone meeting for opportunity"
+msgstr "Oportunidad de reunion normal ó telefonico."
+
+#. module: crm
+#: model:process.node,note:crm.process_node_leads0
+msgid "Very first contact with new prospect"
+msgstr "Primer contacto con nueva prospección"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:278
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
+#: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
+#: model:ir.actions.act_window,name:crm.crm_partner2opportunity
+#, python-format
+msgid "Create Opportunity"
+msgstr "Crear oportunidad"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: crm
+#: code:addons/crm/crm.py:378
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Escalate"
+msgstr "Escalado"
+
+#. module: crm
+#: model:ir.module.module,shortdesc:crm.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "Gestión de relaciones con clientes & proveedores"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Not Running"
+msgstr "No ejecutado"
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_reply_mail
+msgid "Reply to last Mail"
+msgstr "Responder al último e-mail"
+
+#. module: crm
+#: field:crm.lead,email:0
+msgid "E-Mail"
+msgstr "E-mail"
+
+#. module: crm
+#: field:crm.installer,wiki_sale_faq:0
+msgid "Sale FAQ"
+msgstr "FAQ de ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail_attachment
+msgid "crm.send.mail.attachment"
+msgstr "crm.enviar.mail.adjunto"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Included Answers :"
+msgstr "Respuestas incluidas:"
+
+#. module: crm
+#: help:crm.meeting,email_from:0
+#: help:crm.phonecall,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,name:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "State of Mind Computation"
+msgstr "Cálculo grado de satisfacción"
+
+#. module: crm
+#: help:crm.case.section,change_responsible:0
+msgid ""
+"Thick this box if you want that on escalation, the responsible of this sale "
+"team automatically becomes responsible of the lead/opportunity escaladed"
+msgstr ""
+"Marque esta opción si quiere que el responsable del equipo de ventas sea "
+"automáticamente responsable de la iniciativa/oportunidad, en caso de ser "
+"escalada."
+
+#. module: crm
+#: help:crm.installer,outlook:0
+#: help:crm.installer,thunderbird:0
+msgid ""
+"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 ""
+"Permite enlazar su e-mail a la gestión documental de OpenERP. Puede "
+"adjuntarlo a cualquier documento ya existente en OpenERP o crear uno de "
+"nuevo."
+
+#. module: crm
+#: view:crm.case.categ:0
+msgid "Case Category"
+msgstr "Categoría del caso"
+
+#. 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 ""
+"Grado de satisfacción por defecto para el período que precede el cálculo de "
+"'Intervalo máx.'. Este es el grado de satisfacción inicial por defecto si la "
+"empresa no tiene ningún evento."
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Error: El email no está bien formateado"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling Options"
+msgstr "Opciones de perfiles"
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "#Phone calls"
+msgstr "#Llamadas telefónicas"
+
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"La categoría de empresas que será añadida a las empresas que cumplan los "
+"criterios de segmentación después del cálculo."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication history"
+msgstr "Historial de comunicación"
+
+#. module: crm
+#: help:crm.phonecall,canal_id:0
+msgid ""
+"The channels represent the different communication                         "
+"modes available with the customer. With each commercial opportunity, you can "
+"indicate                         the canall which is this opportunity source."
+msgstr ""
+"Los canales representan los diferentes modos de comunicación posibles con el "
+"cliente. En cada oportunidad comercial, puede indicar el canal que ha sido "
+"el origen de esta oportunidad."
+
+#. module: crm
+#: code:addons/crm/crm_meeting.py:93
+#, python-format
+msgid "The meeting '%s' has been confirmed."
+msgstr "La reunión '%s' ha sido confirmada"
+
+#. module: crm
+#: field:crm.case.section,user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
+#, python-format
+msgid "A partner is already defined on this phonecall."
+msgstr "Una empresa ya esta definida para esta llamada."
+
+#. 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 ""
+"La dirección de correo electrónico usada como \"Responder a\" de todos los "
+"correos electrónicos enviados por OpenERP para los casos de este equipo de "
+"ventas."
+
+#. module: crm
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividad actual"
+
+#. module: crm
+#: help:crm.meeting,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
+
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: crm
+#: view:crm.segmentation.line:0
+msgid "Partner Segmentation Lines"
+msgstr "Líneas de segmentación de empresa"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm
+#: help:crm.installer,crm_caldav:0
+msgid ""
+"Helps you to synchronize the meetings with other calendar clients and "
+"mobiles."
+msgstr ""
+"Le permite sincronizar las reuniones con otros clientes de calendario y "
+"móviles."
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: crm
+#: help:crm.installer,crm_claim:0
+msgid ""
+"Manages the suppliers and customers claims, including your corrective or "
+"preventive actions."
+msgstr ""
+"Gestiona las reclamaciones de clientes y proveedores, incluyendo acciones "
+"correctivas o preventivas"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Form"
+msgstr "Formulario de iniciativas"
+
+#. module: crm
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Segmentación de empresa"
+
+#. module: crm
+#: field:crm.lead.report,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm
+#: help:crm.segmentation,name:0
+msgid "The name of the segmentation."
+msgstr "El nombre de la segmentación."
+
+#. module: crm
+#: field:crm.case.stage,probability:0
+#: field:crm.lead,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Generation"
+msgstr "Generación de iniciativas"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
+msgid "Statistics Dashboard"
+msgstr "Tablero de estadísticas"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
+#: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+#: field:crm.lead2opportunity,name:0
+#: field:crm.meeting,opportunity_id:0
+#: field:crm.phonecall,opportunity_id:0
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead7
+msgid "Television"
+msgstr "Televisión"
+
+#. module: crm
+#: field:crm.installer,crm_caldav:0
+msgid "Calendar Synchronizing"
+msgstr "Sincronización del calendario"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Stop Process"
+msgstr "Parar el proceso"
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Search Phonecalls"
+msgstr "Buscar llamadas"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Siguiente"
+
+#. module: crm
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Días por período"
+
+#. module: crm
+#: field:crm.meeting,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: crm
+#: field:base.action.rule,act_section_id:0
+msgid "Set Team to"
+msgstr "Establecer equipo a"
+
+#. module: crm
+#: view:calendar.attendee:0
+#: field:calendar.attendee,categ_id:0
+msgid "Event Type"
+msgstr "Tipo de evento"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_installer
+msgid "crm.installer"
+msgstr "crm.instalador"
+
+#. module: crm
+#: field:crm.segmentation,exclusif:0
+msgid "Exclusive"
+msgstr "Exclusivo"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:91
+#, python-format
+msgid "The opportunity '%s' has been won."
+msgstr "La oportunidad '%s' ha sido ganada"
+
+#. module: crm
+#: help:crm.meeting,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: crm
+#: model:ir.module.module,description:crm.module_meta_information
+msgid ""
+"The generic OpenERP Customer Relationship Management\n"
+"system enables a group of people to intelligently and efficiently manage\n"
+"leads, opportunities, meeting, phonecall etc.\n"
+"It manages key tasks such as communication, identification, prioritization,\n"
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and\n"
+"suppliers. It can automatically send reminders, escalate the request, "
+"trigger\n"
+"specific methods and lots of other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do "
+"anything\n"
+"special. They can just send email to the request tracker. OpenERP will take\n"
+"care of thanking them for their message, automatically routing it to the\n"
+"appropriate staff, and make sure all future correspondence gets to the "
+"right\n"
+"place.\n"
+"\n"
+"The CRM module has a email gateway for the synchronisation interface\n"
+"between mails and OpenERP. \n"
+"Create dashboard for CRM that includes:\n"
+"    * My Leads (list)\n"
+"    * Leads by Stage (graph)\n"
+"    * My Meetings (list)\n"
+"    * Sales Pipeline by Stage (graph)\n"
+"    * My Cases (list)\n"
+"    * Jobs Tracking (graph)\n"
+msgstr ""
+"El sistema genérico de gestión de relaciones con el cliente de OpenERP\n"
+"permite a un grupo de gente manejar de forma inteligente y eficiente\n"
+"iniciativas, oportunidades, reuniones, llamadas, etc.\n"
+"Maneja tareas clave como la comunicación, identificación, priorización,\n"
+"asignación, resolución y notificación.\n"
+"\n"
+"OpenERP se asegura de que todos los casos son seguidos por los usuarios, "
+"clientes y\n"
+"proveedores. Puede enviar automáticamente recordatorios, escalar la "
+"petición, disparar\n"
+"métodos específicos y muchas otras acciones basadas en las reglas de su "
+"empresa.\n"
+"\n"
+"Lo mejor de este sistema es que los usuarios no necesitan hacer nada \n"
+"especial. Tan sólo tienen que enviar un correo electrónico al gestor de "
+"seguimientos. \n"
+"OpenERP le agradecerá su mensaje, enrutándolo automáticamente a la \n"
+"persona adecuada, asegurándose de que toda la correspondencia futura llegue "
+"al\n"
+"lugar correcto.\n"
+"\n"
+"El módulo CRM tiene una pasarela de correo para el interfaz de "
+"sincronización\n"
+"entre correos electrónicos y OpenERP. \n"
+"Cree tableros para el CRM que incluyan:\n"
+"    *Mis iniciativas(lista)\n"
+"    *Iniciativas por etapa (gráfico)\n"
+"    *Mis reuniones (lista)\n"
+"    *Proceso de ventas por etapa (gráfico)\n"
+"    *Mis casos (lista)\n"
+"    *Seguimiento de trabajos (gráfico)\n"
+
+#. module: crm
+#: field:crm.lead.report,create_date:0
+#: field:crm.phonecall.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: crm
+#: field:crm.lead,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Sales Purchase"
+msgstr "Compra Ventas"
+
+#. module: crm
+#: view:crm.case.stage:0
+#: field:crm.case.stage,requirements:0
+msgid "Requirements"
+msgstr "Requerimientos"
+
+#. module: crm
+#: help:crm.meeting,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
+"de calendario recurrente."
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "Convert To Opportunity "
+msgstr "Convertir a oportunidad "
+
+#. module: crm
+#: help:crm.case.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of case stages."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra un lista de etapas de casos."
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.merge.opportunity,opportunity_ids:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
+#: model:ir.ui.menu,name:crm.menu_crm_case_opp
+#: model:process.node,name:crm.process_node_opportunities0
+msgid "Opportunities"
+msgstr "Oportunidades"
+
+#. module: crm
+#: field:crm.segmentation,categ_id:0
+msgid "Partner Category"
+msgstr "Categoría de empresa"
+
+#. module: crm
+#: view:crm.add.note:0
+#: model:ir.actions.act_window,name:crm.action_crm_add_note
+msgid "Add Note"
+msgstr "Añadir nota"
+
+#. module: crm
+#: field:crm.lead,is_supplier_add:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: crm
+#: help:crm.send.mail,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "\"Responder a\" del equipo de ventas definido en este caso"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Won"
+msgstr "Marcar ganado"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Purchase Amount"
+msgstr "Importe de compra"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Lost"
+msgstr "Marcar perdido"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:230
+#, python-format
+msgid "The opportunity '%s' has been closed."
+msgstr "La oportunidad '%s' ha sido cerrada"
+
+#. module: crm
+#: field:crm.lead,day_open:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Show time as"
+msgstr "Mostrar hora como"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:264
+#: view:crm.phonecall2partner:0
+#, python-format
+msgid "Create Partner"
+msgstr "Crear empresa"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "<"
+msgstr "<"
+
+#. module: crm
+#: field:crm.lead,mobile:0
+#: field:crm.phonecall,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: crm
+#: field:crm.meeting,end_type:0
+msgid "Way to end reccurency"
+msgstr "Forma de terminar recurrencia"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+"No existen más oportunidades 'Abiertas' o 'Pendientes' para la empresa '%s'."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Next Stage"
+msgstr "Siguiente etapa"
+
+#. module: crm
+#: view:board.board:0
+msgid "My Meetings"
+msgstr "Mis reuniones"
+
+#. module: crm
+#: field:crm.lead,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm
+#: field:crm.lead,optin:0
+msgid "Opt-In"
+msgstr "Acepta recibir emails"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:208
+#: code:addons/crm/crm_phonecall.py:185
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
+#: view:crm.meeting:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_meeting_sale
+#: view:res.partner:0
+#: field:res.partner,meeting_ids:0
+#, python-format
+msgid "Meetings"
+msgstr "Reuniones"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day where repeat the meeting"
+msgstr "Eligir día en el que repetir la cita"
+
+#. 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 "Acción siguiente"
+
+#. module: crm
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. module: crm
+#: field:crm.meeting,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. 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 ""
+"Si el campo activo se establece en verdadero, se omitirá la alarma del "
+"evento, sin embargo no se eliminará."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+"Las llamadas telefónicas cerradas/canceladas no podrían ser convertidas en "
+"oportunidades"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentaciones de empresa"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,user_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+#: view:res.partner:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: view:res.partner:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Stage:"
+msgstr "Etapa:"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead5
+#: model:crm.case.stage,name:crm.stage_opportunity5
+#: view:crm.lead:0
+msgid "Won"
+msgstr "Ganado"
+
+#. module: crm
+#: field:crm.lead.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite sobrepasada"
+
+#. module: crm
+#: model:crm.case.section,name:crm.section_sales_department
+msgid "Sales Department"
+msgstr "Departamento de ventas"
+
+#. module: crm
+#: field:crm.send.mail,html:0
+msgid "HTML formatting?"
+msgstr "Formato HTML?"
+
+#. module: crm
+#: field:crm.case.stage,type:0
+#: field:crm.lead,type:0
+#: field:crm.lead.report,type:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Compute Segmentation"
+msgstr "Calcular la segmentación"
+
+#. 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 "Muy bajo"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.send.mail:0
+#: field:crm.send.mail.attachment,binary:0
+msgid "Attachment"
+msgstr "Adjunto"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,create_date:0
+#: field:crm.lead.report,creation_date:0
+#: field:crm.meeting,create_date:0
+#: field:crm.phonecall,create_date:0
+#: field:crm.phonecall.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor5
+msgid "Need a Website Design"
+msgstr "Necesita un diseño de sitio web"
+
+#. module: crm
+#: field:crm.meeting,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.send.mail,subject:0
+#: view:res.partner:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: crm
+#: field:crm.meeting,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:300
+#: view:crm.case.stage:0
+#: view:crm.lead:0
+#: field:crm.lead,stage_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,stage_id:0
+#, python-format
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "History Information"
+msgstr "Histórico información"
+
+#. module: crm
+#: field:base.action.rule,act_mail_to_partner:0
+msgid "Mail to Partner"
+msgstr "Mail a la empresa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mailings"
+msgstr "Mailings"
+
+#. module: crm
+#: field:crm.meeting,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Repeat"
+msgstr "Repetir"
+
+#. module: crm
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Permite que el evento se repita en ese intervalo"
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition Case Fields"
+msgstr "Campos de condiciones de casos"
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,stage_ids:0
+#: view:crm.case.stage:0
+#: model:ir.actions.act_window,name:crm.crm_case_stage_act
+#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.actions.act_window,name:crm.crm_opportunity_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm
+#: field:crm.lead,planned_revenue:0
+#: field:crm.lead2opportunity,planned_revenue:0
+#: field:crm.partner2opportunity,planned_revenue:0
+#: field:crm.phonecall2opportunity,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better define the type of calls "
+"tracked in the system."
+msgstr ""
+"Crear categorías específicas de llamada telefónica para definir mejor el "
+"tipo de llamadas en el sistema de seguimiento."
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: crm
+#: field:crm.segmentation,partner_id:0
+msgid "Max Partner ID processed"
+msgstr "Máx ID de empresa procesado"
+
+#. 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 "Análisis de llamadas"
+
+#. module: crm
+#: field:crm.lead.report,opening_date:0
+#: field:crm.phonecall.report,opening_date:0
+msgid "Opening Date"
+msgstr "Fecha de apertura"
+
+#. module: crm
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duración en minutos"
+
+#. module: crm
+#: help:crm.installer,crm_helpdesk:0
+msgid "Manages a Helpdesk service."
+msgstr "Gestiona un servicio de soporte."
+
+#. module: crm
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr "Nombre oportunidad"
+
+#. 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 ""
+"Si el campo activo se marca, permite ocultar el equipo de ventas sin "
+"eliminarlo."
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: crm
+#: field:crm.meeting,edit_all:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: crm
+#: field:crm.meeting,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.iniciativa"
+
+#. module: crm
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr "Fecha escritura"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "End of recurrency"
+msgstr "Fin de recurrencia"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#. 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 ""
+"Márquela si quiere utilizar esta pestaña como parte de la regla de "
+"segmentación. Si no se marca, los criterios que contenga serán ignorados"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
+#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+#: view:res.partner:0
+msgid "Create a Partner"
+msgstr "Crear una empresa"
+
+#. module: crm
+#: field:crm.segmentation,state:0
+msgid "Execution Status"
+msgstr "Estado ejecución"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: crm
+#: field:crm.lead,day_close:0
+msgid "Days to Close"
+msgstr "Días para el cierre"
+
+#. module: crm
+#: field:crm.add.note,attachment_ids:0
+#: field:crm.case.section,complete_name:0
+#: field:crm.send.mail,attachment_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: crm
+#: field:crm.lead,id:0
+#: field:crm.meeting,id:0
+#: field:crm.phonecall,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner2opportunity
+msgid "Partner To Opportunity"
+msgstr "Empresa a oportunidad"
+
+#. module: crm
+#: view:crm.meeting:0
+#: 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 "Fecha"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+#: view:crm.meeting:0
+#: view:crm.phonecall.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Resumen oportunidad"
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr "Oportunidades por categorías"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr "Elija el día del mes en que se repetirá la cita."
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Description"
+msgstr "Descripción de segmentación"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+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 ""
+"Cree categorías de empresa específicas para gestionar mejor sus "
+"interacciones con ellas. La herramienta de segmentación es capaz de asignar "
+"categorías a empresas de acuerdo a los criterios que establezca."
+
+#. module: crm
+#: field:crm.case.section,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: crm
+#: field:crm.case.section,child_ids:0
+msgid "Child Teams"
+msgstr "Equipos hijos"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,state:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,state:0
+#: view:crm.meeting:0
+#: field:crm.meeting,state:0
+#: field:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm
+#: field:crm.meeting,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm
+#: code:addons/crm/crm.py:392
+#: view:crm.lead:0
+#: view:crm.lead2opportunity:0
+#: view:crm.lead2opportunity.action:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: view:res.partner:0
+#, python-format
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm
+#: model:ir.model,name:crm.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge two Opportunities"
+msgstr "Fusionar dos oportunidades"
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Fix amout of times"
+msgstr "Cantidad fija de veces"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm
+#: field:crm.meeting,exrule:0
+msgid "Exception Rule"
+msgstr "Exception de regla"
+
+#. 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 ""
+"Verifica esto si tu quieres enviar la norma en un correo electronico a el "
+"socio"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
+msgid "Phonecall Categories"
+msgstr "Categorías de llamadas"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invite People"
+msgstr "Invitar personas"
+
+#. module: crm
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr "¡Error! No puede crear equipos de ventas recursivos."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr "Buscar reuniones"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Sale Amount"
+msgstr "Importe de venta"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Unable to send mail. Please check SMTP is configured properly."
+msgstr ""
+"Imposible enviar el correo electrónico. Verifique que la configuración SMTP "
+"sea correcta."
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "="
+msgstr "="
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr "No confirmado"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+"El análisis de oportunidades le da acceso instantáneo a sus oportunidades "
+"con información como el ingreso previsto, coste planeado, fechas límite "
+"incumplidas o el número de interacciones por oportunidad. Este informe lo "
+"utiliza principalmente el responsable de ventas para hacer una revisión "
+"periódica del proceso de ventas con los equipos."
+
+#. module: crm
+#: field:crm.case.categ,name:0
+#: field:crm.installer,name:0
+#: field:crm.lead,name:0
+#: field:crm.segmentation,name:0
+#: field:crm.send.mail.attachment,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: crm
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarma"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+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 ""
+"Agregar etapas específicas de iniciativas y oportunidades para organizar "
+"mejor su flujo de ventas. Estas etapas permitirán un fácil seguimiento de "
+"iniciativas u oportunidades en relación al ciclo de ventas."
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. module: crm
+#: field:crm.lead,birthdate:0
+msgid "Birthdate"
+msgstr "Fecha de nacimiento"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "The"
+msgstr "El"
+
+#. module: crm
+#: field:crm.send.mail.attachment,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. module: crm
+#: help:crm.lead,section_id:0
+msgid ""
+"Sales team to which this case belongs to. Defines responsible user and e-"
+"mail address for the mail gateway."
+msgstr ""
+"El equipo de ventas al que pertenece este caso. Define el usuario "
+"responsable y la dirección de correo electrónico para la pasarela de correo."
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Creation"
+msgstr "Creación"
+
+#. 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 "Alto"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_partner0
+msgid "Convert to prospect to business partner"
+msgstr "Convertir prospección a empresa"
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "_Convert"
+msgstr "_Convertir"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+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 ""
+"Con invitaciones a reuniones puede crear y gesionar las invitaciones  de "
+"reuniones enviadas / por enviar a sus compañeros de trabajo / empresas. La "
+"invitación no debe ser únicamente para usuarios de OpenERP, puede ser "
+"igualmente para terceros externos, como un cliente."
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fifth"
+msgstr "Quinto"
+
+#. module: crm
+#: view:crm.phonecall2phonecall:0
+msgid "_Schedule"
+msgstr "_Calendario"
+
+#. module: crm
+#: field:crm.lead.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Tiempo restante para el cierre"
+
+#. module: crm
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr "Mier"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor6
+msgid "Potential Reseller"
+msgstr "Distribuidor potencial"
+
+#. module: crm
+#: field:crm.lead.report,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. 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 "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm
+#: help:crm.lead,partner_id:0
+msgid "Optional linked partner, usually after conversion of the lead"
+msgstr ""
+"Empresa relacionada opcional, normalmente después de la conversión de la "
+"iniciativa"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation details"
+msgstr "Detalles de la invitación"
+
+#. module: crm
+#: field:crm.case.section,parent_id:0
+msgid "Parent Team"
+msgstr "Equipo padre"
+
+#. module: crm
+#: field:crm.lead,date_action:0
+msgid "Next Action Date"
+msgstr "Fecha  de la próxima acción"
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: crm
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:213
+#, python-format
+msgid "The case '%s' has been opened."
+msgstr "El caso '%s' ha sido abierto"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone1
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
+msgid "Inbound"
+msgstr "Entrante"
+
+#. module: crm
+#: help:crm.case.stage,probability:0
+msgid ""
+"This percentage depicts the default/average probability of the Case for this "
+"stage to be a success"
+msgstr ""
+"Este porcentaje representa la probabilidad por defecto / media para que los "
+"casos de esta etapa sean un éxito."
+
+#. module: crm
+#: view:crm.phonecall.report:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
+msgid "Phone calls"
+msgstr "Llamadas telefónicas"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication  History"
+msgstr "Historial de comunicaciones"
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#. module: crm
+#: field:crm.case.section,allow_unlink:0
+msgid "Allow Delete"
+msgstr "Permitir eliminar"
+
+#. module: crm
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. 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 "Muy alto"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form to trace every contact you have "
+"with a partner. From the phone call form, you can trigger a request for "
+"another call, a meeting or an opportunity."
+msgstr ""
+"La herramienta de llamadas entrantes le permite seguir el rastro de sus "
+"llamadas entrantes en tiempo real. Cada llamada que reciba, aparecerá en el "
+"formulario de la empresa para dejar el rastro de cada contacto que tiene en "
+"una empresa. Desde el formulario de llamada telefónica, puede lanzar una "
+"solicitud para otra llamada, una reunión o una oportunidad"
+
+#. module: crm
+#: help:crm.meeting,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Reunión periódica"
+
+#. module: crm
+#: view:crm.case.section:0
+#: view:crm.lead:0
+#: field:crm.lead,description:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Days"
+msgstr "Días"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+msgid "Opportunity by Categories"
+msgstr "Oportunidades por categorías"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,partner_name:0
+msgid "Customer Name"
+msgstr "Nombre del cliente"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+"El calendario de reuniones es compartido entre los equipos de ventas e "
+"integrado por completo con otras aplicaciones como las vacaciones de "
+"empleados o las oportunidades de negocio. Puede sincronizar reuniones con su "
+"teléfono móvil utilizando el interfaz caldav."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2opportunity
+msgid "Phonecall To Opportunity"
+msgstr "Llamada telefónica a oportunidad"
+
+#. module: crm
+#: field:crm.case.section,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Select stages for this Sales Team"
+msgstr "Seleccionar etapas para este equipo de ventas"
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency Option"
+msgstr "Opción de recurrencia"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadpartner0
+msgid "Prospect is converting to business partner"
+msgstr "El prospecto se convierte a partner"
+
+#. module: crm
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
+msgid "Convert To Opportunity"
+msgstr "Convertir en oportunidad"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Held"
+msgstr "Realizada"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. 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 "Fusionar oportunidades"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead5
+msgid "Google Adwords"
+msgstr "Google Adwords"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall
+msgid "crm.phonecall"
+msgstr "crm.llamadateléfono"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead3
+msgid "Mail Campaign 2"
+msgstr "Campaña mail 2"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm
+#: code:addons/crm/crm.py:492
+#, python-format
+msgid "Send"
+msgstr "Enviar"
+
+#. 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 "Prioridad"
+
+#. module: crm
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Utiliza las reglas de compra ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
+msgid "Lead To Opportunity Partner"
+msgstr "Iniciativa a Oportunidad"
+
+#. module: crm
+#: field:crm.meeting,location:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "Programar una reunión normal o telefónica"
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. 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 ""
+"Cree diferentes categorías de reuniones para organizarlas y clasificarlas "
+"mejor."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_segmentation_line
+msgid "Segmentation line"
+msgstr "Línea de segmentación"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Planned Date"
+msgstr "Fecha prevista"
+
+#. module: crm
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Expected Revenues"
+msgstr "Ingresos esperados"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead6
+msgid "Google Adwords 2"
+msgstr "Google Adwords 2"
+
+#. module: crm
+#: help:crm.lead,type:0
+#: help:crm.lead.report,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "Are you sure you want to create a partner based on this Phonecall ?"
+msgstr ""
+"¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Define a Sales Team to organize your different salesmen or sales departments "
+"into separate teams. Each team will work in its own list of opportunities, "
+"sales orders, etc. Each user can set a default team in his user preferences. "
+"The opportunities and sales order displayed, will automatically be filtered "
+"according to his team."
+msgstr ""
+"Defina un equipo de ventas para organizar a sus diferentes vendedores o "
+"departamentos de ventas en equipos separados. Cada equipo trabajará en su "
+"propia lista de oportunidades, pedidos de venta, etc. Cada usuario puede "
+"configurar un equipo predeterminado en sus preferencias de usuario. Las "
+"oportunidades y pedidos de venta mostrados se filtrarán automáticamente de "
+"acuerdo a su equipo."
+
+#. module: crm
+#: help:crm.meeting,count:0
+msgid "Repeat x times"
+msgstr "Repetir x veces"
+
+#. 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 "Equipos de ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2partner
+msgid "Lead to Partner"
+msgstr "Inicaitiva a cliente"
+
+#. 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 "Segmentación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Team"
+msgstr "Equipo"
+
+#. module: crm
+#: field:crm.installer,outlook:0
+msgid "MS-Outlook"
+msgstr "MS-Outlook"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Not Held"
+msgstr "Pendiente"
+
+#. module: crm
+#: field:crm.lead.report,probability:0
+msgid "Probability"
+msgstr "Probabilidad"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,month:0
+#: field:crm.meeting,month_list:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
+#: model:process.node,name:crm.process_node_leads0
+msgid "Leads"
+msgstr "Iniciativas"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"Leads allow you to manage and keep track of all initial contacts with a "
+"prospect or partner showing interest in your products or services. A lead is "
+"usually the first step in your sales cycle. Once qualified, a lead may be "
+"converted into a business opportunity, while creating the related partner "
+"for further detailed tracking of any linked activities. You can import a "
+"database of prospects, keep track of your business cards or integrate your "
+"website's contact form with the OpenERP Leads. Leads can be connected to the "
+"email gateway: new emails may create leads, each of them automatically gets "
+"the history of the conversation with the prospect."
+msgstr ""
+"Las iniciativas le permiten gestionar y realizar un seguimiento de todos los "
+"contactos iniciales con un cliente potencial o socio que muestre interés en "
+"sus productos o servicios. Una iniciativa es generalmente el primer paso en "
+"su ciclo de ventas. Una vez identificada, una iniciativa se puede convertir "
+"en una oportunidad de negocio, creándose el socio correspondiente para el "
+"seguimiento detallado de cualquier actividad relacionada. Usted puede "
+"importar una base de datos de posibles clientes, realizar el seguimiento de "
+"sus tarjetas de visita o integrar el formulario de contacto de su sitio web "
+"con las iniciativas de OpenERP. Las iniciativas pueden ser conectadas a una "
+"pasarela de correo electrónico: los nuevos correos crearán nuevas "
+"iniciativas y cada una de ellas obtendrá automáticamente el historial de la "
+"conversación con el cliente potencial."
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Create a new partner"
+msgstr "Crear una nueva empresa"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: crm
+#: selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+msgid "Todo"
+msgstr "Por hacer"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Decline"
+msgstr "Rechazar"
+
+#. module: crm
+#: help:crm.lead,optin:0
+msgid "If opt-in is checked, this contact has accepted to receive emails."
+msgstr ""
+"Si opt-in está marcado, este contacto ha aceptado recibir correos "
+"electrónicos."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reset to Unconfirmed"
+msgstr "Restablecer a no confirmado"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:40
+#: view:crm.add.note:0
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. 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 "Bajo"
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: field:crm.lead,date_closed:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: field:crm.meeting,date_closed:0
+#: selection:crm.merge.opportunity,state:0
+#: field:crm.phonecall,date_closed:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Plug-In"
+msgstr "Conector"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet2
+msgid "Internal Meeting"
+msgstr "Reunión interna"
+
+#. module: crm
+#: code:addons/crm/crm.py:411
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet1
+msgid "Customer Meeting"
+msgstr "Reunión de cliente"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,email_cc:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone
+#: view:res.partner:0
+msgid "Phone Calls"
+msgstr "Llamadas telefónicas"
+
+#. 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 "Número de días para abrir el caso"
+
+#. module: crm
+#: field:crm.lead,phone:0
+#: field:crm.phonecall,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm
+#: field:crm.case.section,active:0
+#: field:crm.lead,active:0
+#: view:crm.lead.report:0
+#: field:crm.meeting,active:0
+#: field:crm.phonecall,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:306
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr "La fase de la oportunidad '%s' ha cambiado a '%s'."
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:282
+#, python-format
+msgid "Changed Stage to: %s"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Mandatory Expression"
+msgstr "Expresión obligatoria"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid ">"
+msgstr ">"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Uncertain"
+msgstr "Incierto"
+
+#. module: crm
+#: field:crm.send.mail,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_send_mail
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: crm
+#: help:crm.installer,wiki_sale_faq:0
+msgid ""
+"Helps you manage wiki pages for Frequently Asked Questions on Sales "
+"Application."
+msgstr ""
+"Le ayuda a organizar páginas wiki para preguntas frecuentes sobre la "
+"aplicación de ventas"
+
+#. module: crm
+#: help:crm.installer,crm_fundraising:0
+msgid "This may help associations in their fundraising process and tracking."
+msgstr ""
+"Puede ayudar a las asociaciones en su proceso de obtención de fondos y "
+"seguimiento."
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2partner,action:0
+#: field:crm.phonecall2partner,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: crm
+#: field:crm.installer,crm_claim:0
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_decrease:0
+msgid "Decrease (0>1)"
+msgstr "Disminuir (0>1)"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.lead:0
+#: view:crm.send.mail:0
+msgid "Attachments"
+msgstr "Datos adjuntos"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Weekly"
+msgstr "Semanal"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Can not send mail!"
+msgstr "¡No se pudo enviar el correo!"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor8
+#: view:crm.meeting:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: crm
+#: view:crm.meeting:0
+#: selection:crm.meeting,state:0
+#: selection:crm.phonecall,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: crm
+#: help:crm.meeting,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_max:0
+msgid "Max Interval"
+msgstr "Intervalo máx"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "_Schedule Call"
+msgstr "_Programar llamada"
+
+#. module: crm
+#: code:addons/crm/crm.py:326
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: view:crm.phonecall:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#: view:res.partner:0
+#, python-format
+msgid "Open"
+msgstr "Abierto"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: crm
+#: field:crm.lead,city:0
+msgid "City"
+msgstr "Ciudad"
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Busy"
+msgstr "Ocupado"
+
+#. module: crm
+#: field:crm.meeting,interval:0
+msgid "Repeat every"
+msgstr "Repetir cada"
+
+#. module: crm
+#: field:crm.installer,crm_helpdesk:0
+msgid "Helpdesk"
+msgstr "Asistencia/Ayuda"
+
+#. module: crm
+#: field:crm.meeting,recurrency:0
+msgid "Recurrent"
+msgstr "Recurrente"
+
+#. module: crm
+#: code:addons/crm/crm.py:397
+#, python-format
+msgid "The case '%s' has been cancelled."
+msgstr "El caso '%s' ha sido cancelado"
+
+#. module: crm
+#: field:crm.installer,sale_crm:0
+msgid "Opportunity to Quotation"
+msgstr "Oportunidad a presupuesto"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail
+msgid "Send new email"
+msgstr "Enviar nuevo email"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.act_my_oppor
+msgid "My Open Opportunities"
+msgstr "Mis oportunidades abiertas"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
+msgid "CRM - Statistics Dashboard"
+msgstr "CRM - Tablero de estadísticas"
+
+#. module: crm
+#: help:crm.meeting,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: crm
+#: field:crm.lead,job_id:0
+msgid "Main Job"
+msgstr "Trabajo principal"
+
+#. module: crm
+#: field:base.action.rule,trg_max_history:0
+msgid "Maximum Communication History"
+msgstr "Máximo historial de comunicaciones"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+msgid "Are you sure you want to create a partner based on this lead ?"
+msgstr "¿Está seguro que quiere crear una empresa basada en esta iniciativa?"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,categ_id:0
+msgid "Meeting Type"
+msgstr "Tipo de reunión"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
+#, python-format
+msgid "Merge with Existing Opportunity"
+msgstr "Fusinar con oportunidad existente"
+
+#. module: crm
+#: help:crm.lead,state:0
+#: help:crm.phonecall,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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces en estado se establece a "
+"'Pendiente'."
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: crm
+#: help:crm.segmentation,som_interval_max:0
+msgid ""
+"The computation is made on all events that occured during this interval, the "
+"past X periods."
+msgstr ""
+"El cálculo se realiza en todos los eventos que ocurran durante este "
+"intervalo, los X períodos anteriores."
+
+#. module: crm
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
+msgstr "Mi coeficiente ganado/perdido del año anterior"
+
+#. module: crm
+#: field:crm.installer,thunderbird:0
+msgid "Thunderbird"
+msgstr "Thunderbird"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# of Emails"
+msgstr "Nº de e-mails"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+msgstr "Buscar iniciativas"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,delay_open:0
+msgid "Delay to open"
+msgstr "Retraso de apertura"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency period"
+msgstr "Periodo de recurrencia"
+
+#. module: crm
+#: field:crm.meeting,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Referrer"
+msgstr "Referenciado por"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity
+msgid "Lead To Opportunity"
+msgstr "Iniciativa a opportunidad"
+
+#. module: crm
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr "Información asistencia"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Test"
+msgstr "Prueba de segmentación"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Continue Process"
+msgstr "Continuar el proceso"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure Your CRM Application"
+msgstr "Configure su aplicación CRM"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2partner
+msgid "Phonecall to Partner"
+msgstr "Llamada telefónica a empresa"
+
+#. module: crm
+#: help:crm.lead,partner_name:0
+msgid ""
+"The name of the future partner that will be created while converting the "
+"into opportunity"
+msgstr ""
+"El nombre del futuro cliente que se creará cuando se convierta en "
+"oportunidad."
+
+#. module: crm
+#: field:crm.opportunity2phonecall,user_id:0
+#: field:crm.phonecall2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: crm
+#: field:crm.add.note,state:0
+#: field:crm.send.mail,state:0
+msgid "Set New State To"
+msgstr "Establecer nuevo estado a"
+
+#. 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 "Última acción"
+
+#. module: crm
+#: field:crm.meeting,duration:0
+#: field:crm.phonecall,duration:0
+#: field:crm.phonecall.report,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: crm
+#: field:crm.send.mail,reply_to:0
+msgid "Reply To"
+msgstr "Responder a"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.open_board_crm
+#: model:ir.ui.menu,name:crm.menu_board_crm
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_partner.py:56
+#, python-format
+msgid "A partner is already defined on this lead."
+msgstr "Una empresa ya ha sido definida en esta iniciativa."
+
+#. module: crm
+#: field:crm.lead.report,nbr:0
+#: field:crm.phonecall.report,nbr:0
+msgid "# of Cases"
+msgstr "# de casos"
+
+#. module: crm
+#: help:crm.meeting,section_id:0
+#: help:crm.phonecall,section_id:0
+msgid "Sales team to which Case belongs to."
+msgstr "Equipo de ventas al cual pertence el caso"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.send.mail,state:0
+msgid "Unchanged"
+msgstr "Sin cambios"
+
+#. 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 "Segmentación de empresas"
+
+#. module: crm
+#: field:crm.lead,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"With opportunities you can manage and keep track of your sales pipeline by "
+"creating specific customer- or prospect-related sales documents to follow up "
+"potential sales. Information such as expected revenue, opportunity stage, "
+"expected closing date, communication history and much more can be stored. "
+"Opportunities can be connected to the email gateway: new emails may create "
+"opportunities, each of them automatically gets the history of the "
+"conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+"Con las oportunidades puede gestionar y guardar el registro de su canal de "
+"ventas creando documentos específicos de venta por cliente - o potencial "
+"cliente - para el seguimiento de sus ventas potenciales. La información "
+"sobre ingresos esperados, etapa de la oportunidad, fecha estimada de cierre, "
+"histórico de las comunicaciones y muchos otros datos puede ser registrada. "
+"Las oportunidades pueden ser conectadas a la pasarela de correo electrónico: "
+"nuevos emails pueden crear oportunidades, y cada uno de ellos obtiene "
+"automáticamente el historial de la conversación con el cliente."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Assignment"
+msgstr "Asignación"
+
+#. 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 "Compañía"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: crm
+#: field:crm.meeting,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: crm
+#: field:crm.segmentation.line,operator:0
+msgid "Mandatory / Optional"
+msgstr "Obligatorio / Opcional"
+
+#. 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 "Invitaciones a reunión"
+
+#. module: crm
+#: field:crm.case.categ,object_id:0
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "E-mail address of the contact"
+msgstr "e-mail del contacto"
+
+#. module: crm
+#: field:crm.lead,referred:0
+msgid "Referred By"
+msgstr "Referenciado por"
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.model,name:crm.model_crm_add_note
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:304
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr "La etapa de la iniciativa '%s' ha sido cambiada por '%s'"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Last"
+msgstr "Último"
+
+#. module: crm
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm
+#: help:crm.case.stage,on_change:0
+msgid "Change Probability on next and previous stages."
+msgstr "Cambiar probabilidad para las etapas siguientes y anteriores."
+
+#. module: crm
+#: code:addons/crm/crm.py:455
+#: code:addons/crm/crm.py:457
+#: code:addons/crm/crm_action_rule.py:66
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: crm
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
+msgstr "Resumen de la llamada"
+
+#. 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.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm
+#: field:crm.add.note,body:0
+msgid "Note Body"
+msgstr "Contenido de la nota"
+
+#. module: crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr "Mis ingresos previstos por etapa"
+
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Links"
+msgstr "Enlaces"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's activities to better "
+"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 ""
+"Crear categorías específicas que se adapten a las actividades de su compañía "
+"para clasificar y analizar mejor sus iniciativas y oportunidades. Estas "
+"categorías podrían, por ejemplo, reflejar la estructura de sus productos o "
+"de los distintos tipos de ventas que realice."
+
+#. 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 ""
+"Si la empresa no ha comprado durante un período, disminuir el grado de "
+"satisfacción por este factor. Es una multiplicación."
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+"Desde este informe, puede analizar el rendimiento de su equipo de ventas "
+"basándose en sus llamadas telefónicas. Puede agrupar o filtrar la "
+"información de acuerdo a varios criterios y profundizar en la información "
+"añadiendo más grupos al informe."
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Mailgateway"
+msgstr "Pasarela de correo"
+
+#. module: crm
+#: help:crm.lead,user_id:0
+msgid "By Default Salesman is Administrator when create New User"
+msgstr ""
+"Por defecto el vendedor es administrador cuando se crea un nuevo usuario"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Mails"
+msgstr "Nº de correos"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: crm
+#: field:crm.phonecall,name:0
+#: view:res.partner:0
+msgid "Call Summary"
+msgstr "Resumen de llamadas"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Llamada telefónica a llamada telefónica"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule/Log Call"
+msgstr "Planificar/Registrar llamada"
+
+#. module: crm
+#: field:crm.installer,fetchmail:0
+msgid "Fetch Emails"
+msgstr "Buscar emails"
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: crm
+#: help:crm.send.mail,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+"Estas direcciones recibirán una copia de este correo electrónico. Para "
+"modificar la lista CC permanente, edite el campo CC global de este caso."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: crm
+#: field:crm.meeting,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: crm
+#: field:crm.phonecall.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Total of Planned Revenue"
+msgstr "Total ingresos previstos"
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid ""
+"You can not escalate, You are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"No puede escalar, ya está en el nivel más alto en su categoría de equipo de "
+"ventas."
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Optional Expression"
+msgstr "Expresión opcional"
+
+#. module: crm
+#: selection:crm.meeting,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: crm
+#: field:crm.lead2opportunity,probability:0
+msgid "Success Rate (%)"
+msgstr "Tasa de éxito (%)"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead1
+#: model:crm.case.stage,name:crm.stage_opportunity1
+msgid "New"
+msgstr "Nuevo"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Mail TO"
+msgstr "Enviar correo a"
+
+#. 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 "Email"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,channel_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,channel_id:0
+#: field:crm.phonecall,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
+msgid "Schedule Call"
+msgstr "Planificar llamada"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
+"Las iniciativas cerradas/canceladas no podrían ser convertidas en "
+"oportunidades"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling"
+msgstr "Perfiles"
+
+#. module: crm
+#: help:crm.segmentation,exclusif:0
+msgid ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions.                        \n"
+"If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
+msgstr ""
+"Marque esta opción si la categoría está limitada a empresas que coincidan "
+"con los criterios de segmentación.                        \n"
+"Si está marcada, elimina la categoría de aquellas empresas que no coincidan "
+"con los criterios de segmentación."
+
+#. module: crm
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: crm
+#: help:crm.meeting,date_deadline:0
+msgid ""
+"Deadline Date is automatically                         computed from Start "
+"Date + Duration"
+msgstr ""
+"La fecha límite se calcula automáticamente a partir de la fecha inicial + "
+"duración."
+
+#. module: crm
+#: field:crm.lead,state_id:0
+msgid "Fed. State"
+msgstr "Provincia"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadopportunity0
+msgid "Creating business opportunities from Leads"
+msgstr "Creando oportunidades de negocio desde iniciativas"
+
+#. module: crm
+#: help:crm.send.mail,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor4
+msgid "Need Information"
+msgstr "Necesita información"
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadopportunity0
+msgid "Prospect Opportunity"
+msgstr "Oportunidad de prospección"
+
+#. module: crm
+#: view:crm.installer:0
+#: model:ir.actions.act_window,name:crm.action_crm_installer
+msgid "CRM Application Configuration"
+msgstr "Configuración de la aplicación CRM"
+
+#. module: crm
+#: field:base.action.rule,act_categ_id:0
+msgid "Set Category to"
+msgstr "Establecer categoría"
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: crm
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.partner2opportunity:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm
+#: help:crm.installer,sale_crm:0
+msgid "This module relates sale from opportunity cases in the CRM."
+msgstr "Este módulo relaciona ventas con oportunidades en el CRM."
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Daily"
+msgstr "Diario"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead2
+#: model:crm.case.stage,name:crm.stage_opportunity2
+msgid "Qualification"
+msgstr "Calificación"
+
+#. module: crm
+#: view:crm.case.stage:0
+msgid "Stage Definition"
+msgstr "Definición de etapa"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "First"
+msgstr "Primero"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm
+#: field:crm.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition on Communication History"
+msgstr "Condición en el historial de comunicaciones"
+
+#. module: crm
+#: help:crm.segmentation,som_interval:0
+msgid ""
+"A period is the average number of days between two cycle of sale or purchase "
+"for this segmentation.                 \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too "
+"long time,                  \n"
+"so we suppose that his state of mind has decreased because he probably "
+"bought goods to another supplier.                  \n"
+"Use this functionality for recurring businesses."
+msgstr ""
+"Un periodo es el número medio de días entre dos ciclos de ventas o compras "
+"para esta segmentación.                 \n"
+"Se utiliza principalmente para detectar si una empresa no ha comprado por un "
+"largo periodo de tiempo,                  \n"
+"por lo que suponemos que su grado de satisfacción ha disminuido porqué "
+"seguramente compró bienes a otro proveedor.                  \n"
+"Utilice esta funcionalidad para negocios recurrentes."
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send Reply"
+msgstr "_Enviar respuesta"
+
+#. module: crm
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,msg:0
+#: field:crm.lead2partner,msg:0
+#: view:crm.send.mail:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: crm
+#: field:crm.meeting,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. 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 "Comercial"
+
+#. module: crm
+#: field:crm.lead,date_deadline:0
+msgid "Expected Closing"
+msgstr "Cierre previsto"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_opportunity2phonecall
+msgid "Opportunity to Phonecall"
+msgstr "Oportunidad a llamada telefónica"
+
+#. module: crm
+#: help:crm.case.section,allow_unlink:0
+msgid "Allows to delete non draft cases"
+msgstr "Permite eliminar los casos en estado no borrador."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule Meeting"
+msgstr "Programar reunión"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Partner Name"
+msgstr "Nombre empresa"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone2
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
+msgid "Outbound"
+msgstr "Saliente"
+
+#. module: crm
+#: field:crm.lead,date_open:0
+#: field:crm.phonecall,date_open:0
+msgid "Opened"
+msgstr "Abierto"
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,member_ids:0
+msgid "Team Members"
+msgstr "Miembros del equipo"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,job_ids:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor1
+msgid "Interest in Computer"
+msgstr "Interesado en ordenadores"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation Detail"
+msgstr "Detalle de la invitación"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_default:0
+msgid "Default (0=None)"
+msgstr "Por defecto (0=Ninguno)"
+
+#. module: crm
+#: help:crm.lead,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: crm
+#: field:crm.partner2opportunity,probability:0
+#: field:crm.phonecall2opportunity,probability:0
+msgid "Success Probability"
+msgstr "Probabilidad de éxito"
+
+#. module: crm
+#: code:addons/crm/crm.py:426
+#: selection:crm.add.note,state:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
+msgid "Cases by Sales Team"
+msgstr "Casos por equipo de ventas"
+
+#. module: crm
+#: field:crm.meeting,attendee_ids:0
+msgid "Attendees"
+msgstr "Asistentes"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: model:ir.model,name:crm.model_crm_meeting
+#: model:process.node,name:crm.process_node_meeting0
+#: model:res.request.link,name:crm.request_link_meeting
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Categoría de caso"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm
+#: view:board.board:0
+msgid "Planned Revenue by Stage and User"
+msgstr "Ingresos previsto por etapa y usuario"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead_report
+msgid "CRM Lead Report"
+msgstr "Informe de iniciativas CRM"
+
+#. module: crm
+#: field:crm.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. 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 "Normal"
+
+#. module: crm
+#: field:crm.lead,street2:0
+msgid "Street2"
+msgstr "Calle2"
+
+#. 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 "Categorías de reuniones"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "You may have to verify that this partner does not exist already."
+msgstr "Debería verificar que esta empresa no exista ya."
+
+#. module: crm
+#: field:crm.lead.report,delay_open:0
+msgid "Delay to Open"
+msgstr "Retraso de apertura"
+
+#. module: crm
+#: field:crm.lead.report,user_id:0
+#: field:crm.phonecall.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:67
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities By Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
+msgid "Schedule Phone Call"
+msgstr "Planificar llamada telefónica"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their sales opportunities. It will allow "
+"them to easily track how is positioned a specific opportunity in the sales "
+"cycle."
+msgstr ""
+"Crear pasos específicos que ayudarán a su departamento de ventas a organizar "
+"mejor el flujo de venta gestionando sus oportunidades de venta. Esto les "
+"permitirá seguir fácilmente como está posicionada una oportunidad en el "
+"ciclo de ventas."
+
+#. module: crm
+#: model:process.process,name:crm.process_process_contractprocess0
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead4
+msgid "Twitter Ads"
+msgstr "Anuncios Twiter"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Planned Revenues"
+msgstr "Ingresos esperados"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor7
+msgid "Need Consulting"
+msgstr "Necesita consultoría"
+
+#. module: crm
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "¡Error! No se puede crear perfiles recursivos."
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:232
+#, python-format
+msgid "The case '%s' has been closed."
+msgstr "El caso '%s' ha sido cerrado"
+
+#. 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 "Contacto empresa"
+
+#. module: crm
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: crm
+#: 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 de usuario!"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:100
+#, python-format
+msgid "Merged into Opportunity: %s"
+msgstr "Fusionado con la oportunidad '%s'"
+
+#. module: crm
+#: code:addons/crm/crm.py:347
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Close"
+msgstr "Cerrado"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. module: crm
+#: model:ir.model,name:crm.model_base_action_rule
+msgid "Action Rules"
+msgstr "Reglas de acciones"
+
+#. module: crm
+#: field:crm.meeting,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. module: crm
+#: field:crm.meeting,phonecall_id:0
+msgid "Phonecall"
+msgstr "Llamada telefónica"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: crm
+#: field:crm.lead,function:0
+msgid "Function"
+msgstr "Función"
+
+#. module: crm
+#: view:crm.add.note:0
+msgid "_Add"
+msgstr "_Añadir"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "State of Mind"
+msgstr "Grado de satisfacción"
+
+#. 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
+#: view:res.partner:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm
+#: field:base.action.rule,trg_section_id:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.resource.type,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
+#: field:crm.lead,section_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,section_id:0
+#: field:crm.meeting,section_id:0
+#: field:crm.opportunity2phonecall,section_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,section_id:0
+#: 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 "Equipo de ventas"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor2
+msgid "Interest in Accessories"
+msgstr "Interesado en accesorios"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:211
+#, python-format
+msgid "The opportunity '%s' has been opened."
+msgstr "La oportunidad '%s' ha sido abierta"
+
+#. module: crm
+#: field:crm.lead.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: crm
+#: field:crm.lead,street:0
+msgid "Street"
+msgstr "Calle"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities by User and Team"
+msgstr "Oportunidades por usuario y equipo"
+
+#. module: crm
+#: field:crm.case.section,working_hours:0
+msgid "Working Hours"
+msgstr "Horario de trabajo"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,is_customer_add:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
+#: view:res.partner:0
+msgid "Schedule a Meeting"
+msgstr "Planificar una reunión"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead6
+#: model:crm.case.stage,name:crm.stage_opportunity6
+#: view:crm.lead:0
+msgid "Lost"
+msgstr "Perdido"
+
+#. module: crm
+#: field:crm.lead,country_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead2opportunity.action,name:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Convertir a oportunidad"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm
+#: field:crm.case.resource.type,name:0
+msgid "Campaign Name"
+msgstr "Nombre de la campaña"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall_report
+msgid "Phone calls by user and section"
+msgstr "Llamadas telefónicas por usuario y sección"
+
+#. module: crm
+#: selection:crm.lead2opportunity.action,name:0
+msgid "Merge with existing Opportunity"
+msgstr "Fusionado con oportunidad existente"
+
+#. module: crm
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead4
+#: model:crm.case.stage,name:crm.stage_opportunity4
+msgid "Negotiation"
+msgstr "Negociación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Cierre previsto"
+
+#. module: crm
+#: field:crm.case.stage,sequence:0
+#: field:crm.meeting,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: crm
+#: field:crm.send.mail,body:0
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_name:0
+msgid "Control Variable"
+msgstr "Variable de control"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+#: model:crm.case.stage,name:crm.stage_opportunity3
+msgid "Proposition"
+msgstr "Propuesta"
+
+#. module: crm
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Llamadas telefónicas"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,name:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead8
+msgid "Newsletter"
+msgstr "Boletín de noticias"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#, python-format
+#~ msgid ""
+#~ "You can not escalate this case.\n"
+#~ "You are already at the top level."
+#~ msgstr ""
+#~ "No puede intensificar este caso.\n"
+#~ "Ya se encuentra en el nivel superior."
+
+#~ msgid "Delay After Trigger Date:"
+#~ msgstr "Demora después fecha del disparo:"
+
+#~ msgid "My Draft "
+#~ msgstr "Mis borradores "
+
+#~ msgid "Add Last Mail for Replying"
+#~ msgstr "Añadir último mail para responder"
+
+#~ msgid "All Cases"
+#~ msgstr "Todos los casos"
+
+#~ msgid "Remind Partner"
+#~ msgstr "Recordar empresa"
+
+#~ msgid "Update The Proposed Menus To Be Created"
+#~ msgstr "Actualizar los menús propuestos a crear"
+
+#~ msgid "Base Information"
+#~ msgstr "Información base"
+
+#~ msgid "All Open "
+#~ msgstr "Todos los abiertos "
+
+#~ msgid "Create menus for a case section"
+#~ msgstr "Crear menús para una sección de casos"
+
+#~ msgid "Template of Email to Send"
+#~ msgstr "Plantilla de Email a enviar"
+
+#~ msgid "CRM & SRM"
+#~ msgstr "CRM & SRM"
+
+#~ msgid "%(case_user)s = Responsible name"
+#~ msgstr "%(case_user)s = Nombre del responsable"
+
+#~ msgid "Add watchers (Cc)"
+#~ msgstr "Añadir observadores (CC)"
+
+#~ msgid "My "
+#~ msgstr "Mis "
+
+#~ msgid "Cases"
+#~ msgstr "Casos"
+
+#~ msgid "Watchers Emails"
+#~ msgstr "Observadores emails (CC)"
+
+#~ msgid "Create menu Entries"
+#~ msgstr "Crear entradas de menús"
+
+#~ msgid "Case history"
+#~ msgstr "Historial del caso"
+
+#~ msgid "Set state to"
+#~ msgstr "Establecer grado a"
+
+#~ msgid "Case Category Name"
+#~ msgstr "Nombre de la categoría de casos"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
+
+#~ msgid "All Unclosed and Unassigned "
+#~ msgstr "Mis no cerrados o no asignados "
+
+#~ msgid ""
+#~ "Check this if you want the rule to send a reminder by email to the partner."
+#~ msgstr ""
+#~ "Marque esta opción si desea que la regla envíe un recordatorio por correo "
+#~ "electrónico a la empresa."
+
+#~ msgid "Maximim Priority"
+#~ msgstr "Prioridad máxima"
+
+#~ msgid "New "
+#~ msgstr "Nuevo "
+
+#~ msgid "Partner Events"
+#~ msgstr "Eventos empresa"
+
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condiciones sobre campos del caso"
+
+#~ msgid "Case Communication History"
+#~ msgstr "Historial de comunicación del caso"
+
+#~ msgid "Category of case"
+#~ msgstr "Categoría del caso"
+
+#~ msgid "Estimates"
+#~ msgstr "Estimaciones"
+
+#~ msgid "%(case_subject)s = Case subject"
+#~ msgstr "%(case_subject)s = Asunto del caso"
+
+#~ msgid ""
+#~ "The generic Open ERP Customer Relationship Management\n"
+#~ "system enables a group of people to intelligently and efficiently manage\n"
+#~ "leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.\n"
+#~ "It manages key tasks such as communication, identification, prioritization,\n"
+#~ "assignment, resolution and notification.\n"
+#~ "\n"
+#~ "Open ERP ensures that all cases are successfully tracked by users, customers "
+#~ "and\n"
+#~ "suppliers. It can automatically send reminders, escalate the request, "
+#~ "trigger\n"
+#~ "specific methods and lots of others actions based on your enterprise own "
+#~ "rules.\n"
+#~ "\n"
+#~ "The greatest thing about this system is that users don't need to do "
+#~ "anything\n"
+#~ "special. They can just send email to the request tracker. Open ERP will "
+#~ "take\n"
+#~ "care of thanking them for their message, automatically routing it to the\n"
+#~ "appropriate staff, and making sure all future correspondence gets to the "
+#~ "right\n"
+#~ "place.\n"
+#~ "\n"
+#~ "The CRM module has a email gateway for the synchronisation interface\n"
+#~ "between mails and Open ERP."
+#~ msgstr ""
+#~ "El sistema genérico de Gestión de las Relaciones con el Cliente (CRM) de\n"
+#~ "OpenERP permite a un grupo de gente gestionar  de forma inteligente\n"
+#~ "y eficaz iniciativas, oportunidades, tareas, cuestiones,\n"
+#~ "peticiones, errores, campañas comerciales, reclamaciones, etc.\n"
+#~ "Gestiona tareas clave como comunicación, identificación,\n"
+#~ "priorización, asignación, resolución y notificación.\n"
+#~ "\n"
+#~ "OpenERP asegura que todos los casos son seguidos con éxito\n"
+#~ "por usuarios, clientes y proveedores. Puede enviar automáticamente\n"
+#~ "recordatorios y notificaciones, intensificar la petición, disparar\n"
+#~ "métodos específicos y muchas otras acciones basadas en sus\n"
+#~ "reglas propias de empresa.\n"
+#~ "\n"
+#~ "La cosa más importante sobre este sistema es que los usuarios no\n"
+#~ "necesitan hacer nada especial. Pueden enviar sólo un correo electrónico\n"
+#~ "al registro de peticiones. OpenERP se encargará de agradecerle su\n"
+#~ "mensaje, dirigirlo automáticamente a las personas apropiadas, y asegurarse\n"
+#~ "de que toda la futura correspondencia llega al lugar apropiado.\n"
+#~ "\n"
+#~ "El módulo de CRM dispone de una puerta de enlace con el correo electrónico\n"
+#~ "para la sincronización entre correos electrónicos y OpenERP."
+
+#~ msgid "My Open "
+#~ msgstr "Mis abiertos "
+
+#~ msgid "Select Views (empty for default)"
+#~ msgstr "Seleccionar vistas (vacía por defecto)"
+
+#~ msgid "Case State"
+#~ msgstr "Estado del caso"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Your action"
+#~ msgstr "Su acción"
+
+#~ msgid "Case section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "E-Mail Reminders (includes the content of the case)"
+#~ msgstr "Recordatorios por Email (incluye el contenido del caso)"
+
+#~ msgid "Fields to Change"
+#~ msgstr "Campos a cambiar"
+
+#~ msgid "Cases Histories"
+#~ msgstr "Historiales de casos"
+
+#~ msgid "My cases"
+#~ msgstr "Mis casos"
+
+#~ msgid "All Draft "
+#~ msgstr "Todos los borradores "
+
+#~ msgid "%(partner_email)s = Partner email"
+#~ msgstr "%(partner_email)s = Email empresa"
+
+#~ msgid "My Open Cases"
+#~ msgstr "Mis casos abiertos"
+
+#~ msgid "Remind with attachment"
+#~ msgstr "Recordar con adjunto"
+
+#~ msgid "All Late "
+#~ msgstr "Todos los retrasados "
+
+#~ msgid "My Late "
+#~ msgstr "Mis retrasados "
+
+#~ msgid "Open cases"
+#~ msgstr "Casos abiertos"
+
+#~ msgid "My Unclosed "
+#~ msgstr "Mis no cerrados "
+
+#~ msgid "Created"
+#~ msgstr "Creado"
+
+#~ msgid "Mail to responsible"
+#~ msgstr "Enviar correo a responsable"
+
+#~ msgid "My Pending "
+#~ msgstr "Mis pendientes "
+
+#~ msgid "New Form"
+#~ msgstr "Nuevo formulario"
+
+#~ msgid "Set responsible to"
+#~ msgstr "Establecer responsable a"
+
+#~ msgid ""
+#~ "The rule use a AND operator. The case must match all non empty fields so "
+#~ "that the rule execute the action described in the 'Actions' tab."
+#~ msgstr ""
+#~ "La regla utiliza un operador AND. El caso debe concordar con todos los "
+#~ "campos no vacíos para que la regla ejecute la acción descrita en la pestaña "
+#~ "'Acciones'."
+
+#~ msgid "%(email_from)s = Partner email"
+#~ msgstr "%(email_from)s = Email empresa"
+
+#~ msgid "Case Section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "Rules"
+#~ msgstr "Reglas"
+
+#~ msgid "Call Object Method"
+#~ msgstr "Método llamada al objeto"
+
+#, python-format
+#~ msgid "You can not delete this case. You should better cancel it."
+#~ msgstr "No puede eliminar este caso. Sería mejor que lo cancelara."
+
+#, python-format
+#~ msgid "done"
+#~ msgstr "realizado"
+
+#~ msgid "Calendar"
+#~ msgstr "Calendario"
+
+#~ msgid "Log"
+#~ msgstr "Registro"
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr ""
+#~ "Estas personas recibirán una copia de la futura comunicación entre empresa y "
+#~ "usuarios por correo electrónico"
+
+#, python-format
+#~ msgid "Historize"
+#~ msgstr "Añadir al historial"
+
+#~ msgid "%(partner)s = Partner name"
+#~ msgstr "%(partner)s = Nombre empresa"
+
+#~ msgid "New With Calendar"
+#~ msgstr "Nuevo con calendario"
+
+#~ msgid "List With Calendar"
+#~ msgstr "Lista con calendario"
+
+#~ msgid "Action Information"
+#~ msgstr "Información de la acción"
+
+#~ msgid "Calendar View"
+#~ msgstr "Vista calendario"
+
+#~ msgid "%(case_user_phone)s = Responsible phone"
+#~ msgstr "%(case_user_phone)s = Teléfono del responsable"
+
+#~ msgid "Delay after trigger date"
+#~ msgstr "Demora después fecha del disparo"
+
+#~ msgid "Conditions"
+#~ msgstr "Condiciones"
+
+#~ msgid "Open Cases"
+#~ msgstr "Casos abiertos"
+
+#~ msgid "Remind responsible"
+#~ msgstr "Recordar responsable"
+
+#~ msgid "Set section to"
+#~ msgstr "Establecer sección a"
+
+#, python-format
+#~ msgid "You must put a Partner eMail to use this action!"
+#~ msgstr "¡Debe indicar un Email de empresa para usar esta acción!"
+
+#~ msgid "Minimum Priority"
+#~ msgstr "Prioridad mínima"
+
+#~ msgid "Case History"
+#~ msgstr "Historial del caso"
+
+#, python-format
+#~ msgid "draft"
+#~ msgstr "borrador"
+
+#~ msgid "Created Menus"
+#~ msgstr "Menús creados"
+
+#~ msgid ""
+#~ "Check this if you want that all documents attached to the case be attached "
+#~ "to the reminder email sent."
+#~ msgstr ""
+#~ "Marque esta opción si desea que todos los documentos adjuntados a este caso "
+#~ "sean adjuntados en el correo electrónico enviado como recordatorio."
+
+#, python-format
+#~ msgid "cancel"
+#~ msgstr "cancelado"
+
+#~ msgid "Parent Section"
+#~ msgstr "Sección padre"
+
+#~ msgid "Parent Menu"
+#~ msgstr "Menú padre"
+
+#~ msgid "%(case_id)s = Case ID"
+#~ msgstr "%(case_id)s = ID del caso"
+
+#~ msgid "Don't Create"
+#~ msgstr "No crear"
+
+#~ msgid "Base Menu Name"
+#~ msgstr "Nombre menú base"
+
+#~ msgid "Child Sections"
+#~ msgstr "Secciones hijas"
+
+#~ msgid "All Unassigned "
+#~ msgstr "Todos los no asignados "
+
+#~ msgid "All Unclosed "
+#~ msgstr "Todos los no cerrados "
+
+#~ msgid "%(case_user_email)s = Responsible email"
+#~ msgstr "%(case_user_email)s = Email del responsable"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Send Reminder"
+#~ msgstr "Enviar recordatorio"
+
+#~ msgid "Complete this if you use the mail gateway."
+#~ msgstr "Complete esto si utiliza una pasarela de correo."
+
+#~ msgid "Business Opportunities"
+#~ msgstr "Oportunidades de negocio"
+
+#~ msgid "Tree View"
+#~ msgstr "Vista de árbol"
+
+#~ msgid "Conditions on Case Partner"
+#~ msgstr "Condiciones sobre caso empresa"
+
+#~ msgid "Section Code"
+#~ msgstr "Código de secció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 "General Description"
+#~ msgstr "Descripción general"
+
+#~ msgid "Create Menus For Cases"
+#~ msgstr "Crear menús para una sección de casos"
+
+#~ msgid "Mail to partner"
+#~ msgstr "Enviar correo a empresa"
+
+#~ msgid "Partner Email"
+#~ msgstr "Email empresa"
+
+#~ msgid "All Pending "
+#~ msgstr "Todos los pendientes "
+
+#~ msgid "Set priority to"
+#~ msgstr "Establecer prioridad a"
+
+#, python-format
+#~ msgid "open"
+#~ msgstr "abierto"
+
+#~ msgid "All Canceled "
+#~ msgstr "Todos los cancelados "
+
+#~ msgid "Mail body"
+#~ msgstr "Texto correo"
+
+#~ msgid ""
+#~ "Check this if you want the rule to send a reminder by email to the user."
+#~ msgstr ""
+#~ "Marque esta opción si desea que la regla envíe un recordatorio por correo "
+#~ "electrónico al usuario."
+
+#~ msgid "Segmentations"
+#~ msgstr "Segmentaciones"
+
+#~ msgid ""
+#~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
+#~ "cases in this section"
+#~ msgstr ""
+#~ "La dirección de correo electrónico que se pondrá en 'Responder A' en todos "
+#~ "los correos electrónicos enviados por OpenERP para los casos de esta sección."
+
+#~ msgid "Case Rule"
+#~ msgstr "Regla del caso"
+
+#, python-format
+#~ msgid "Case"
+#~ msgstr "Caso"
+
+#~ msgid "Conditions on Priority Range"
+#~ msgstr "Condiciones sobre intervalo de prioridades"
+
+#~ msgid "All "
+#~ msgstr "Todos "
+
+#~ msgid "E-Mail Actions"
+#~ msgstr "Acciones de Email"
+
+#~ msgid "List"
+#~ msgstr "Lista"
+
+#~ msgid "User Responsible"
+#~ msgstr "Usuario responsable"
+
+#~ msgid "All Histories"
+#~ msgstr "Todos los historiales"
+
+#~ msgid "My Canceled "
+#~ msgstr "Mis cancelados "
+
+#~ msgid "Latest E-Mail"
+#~ msgstr "Último email"
+
+#~ msgid "Case logs"
+#~ msgstr "Registros del caso"
+
+#~ msgid ""
+#~ "Check if the category is limited to partners that match the segmentation "
+#~ "criterions. If checked, remove the category from partners that doesn't match "
+#~ "segmentation criterions"
+#~ msgstr ""
+#~ "Indica si esta categoría está limitada a empresas que cumplan los criterios "
+#~ "de segmentación. Si está marcada, se eliminan de la categoría las empresas "
+#~ "que no cumplan los criterios de segmentación."
+
+#~ msgid "Logs History"
+#~ msgstr "Historial del registro"
+
+#~ msgid "Form View"
+#~ msgstr "Vista formulario"
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condiciones sobre temporización"
+
+#~ msgid "Case Description"
+#~ msgstr "Descripción del caso"
+
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "Enviar correo a observadores (CC)"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Cases by section"
+#~ msgstr "Casos por sección"
+
+#~ msgid "Conditions on States"
+#~ msgstr "Condiciones sobre los estados"
+
+#~ msgid "Trigger Date"
+#~ msgstr "Fecha del disparo"
+
+#~ msgid ""
+#~ "A period is the average number of days between two cycle of sale or purchase "
+#~ "for this segmentation. It's mainly used to detect if a partner has not "
+#~ "purchased or buy for a too long time, so we suppose that his state of mind "
+#~ "has decreased because he probably bought goods to another supplier. Use this "
+#~ "functionality for recurring businesses."
+#~ msgstr ""
+#~ "Un período es el número promedio de días entre dos ciclos de venta o compra "
+#~ "para esta segmentación. Se utiliza principalmente para detectar si una "
+#~ "empresa no ha comprado o compra durante un tiempo demasiado largo, así que "
+#~ "suponemos que su grado de satisfacción se ha reducido porque probablemente "
+#~ "ha comprado productos a otro proveedor. Utilice esta funcionalidad para los "
+#~ "negocios recurrentes."
+
+#, python-format
+#~ msgid ""
+#~ "You must define a responsible user for this case in order to use this action!"
+#~ msgstr ""
+#~ "¡Debe definir un usuario responsable para este caso para poder utilizar esta "
+#~ "acción!"
+
+#, python-format
+#~ msgid ""
+#~ "Can not send mail with empty body,you should have description in the body"
+#~ msgstr ""
+#~ "No puede enviar mensajes con un texto vacío, debería incluir una descripción "
+#~ "en el mensaje"
+
+#, python-format
+#~ msgid ""
+#~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
+#~ "section!"
+#~ msgstr ""
+#~ "¡No se ha encontrado Email en la empresa responsable o falta dirección de "
+#~ "respuesta en la sección!"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr ""
+#~ "La fecha límite se calcula automáticamente a partir de Fecha de inicio + "
+#~ "Duración"
+
+#, python-format
+#~ msgid ""
+#~ "No E-Mail ID Found for your Company address or missing reply address in "
+#~ "section!"
+#~ msgstr ""
+#~ "¡No se ha encontrado Email en la dirección de su compañía o falta dirección "
+#~ "de respuesta en la sección!"
+
+#~ msgid "this wizard will create all sub-menus, within the selected menu."
+#~ msgstr "este asistente creará todos los sub-menús, en el menú seleccionado."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "You may want to create a new parent menu to put all the created menus in."
+#~ msgstr ""
+#~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
+#~ "creados en él."
+
+#~ msgid "Button Pressed"
+#~ msgstr "Botón oprimido"
+
+#~ msgid "Mail to these emails"
+#~ msgstr "Correo a estos correos electronicos"
+
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Palabras claves especiales para ser usadas en el cuerpo del mensaje."
+
+#~ msgid "My Histories"
+#~ msgstr "Mis historias"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Fechas de ultima acción"
+
+#~ msgid "Delay type"
+#~ msgstr "Tipo de retraso"
+
+#~ msgid "%(case_description)s = Case description"
+#~ msgstr "%(case_description)s = Descripción del caso"
+
+#~ msgid "Planned revenue"
+#~ msgstr "Ingresos previstos"
+
+#~ msgid "Planned Costs"
+#~ msgstr "Costos previstos"
+
+#~ msgid "Planned costs"
+#~ msgstr "Costos previstos"
+
+#~ msgid "Telesales"
+#~ msgstr "Ventas a distancia"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Argumentos inválidos"
+
+#~ msgid "Send Partner & Historize"
+#~ msgstr "Enviar a empresa y añadir al historial"
+
+#~ msgid "Mail Campaign 1"
+#~ msgstr "Campaña mail 1"
diff --git a/addons/crm/i18n/es_MX.po.moved b/addons/crm/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..f0a1e1ddfad
--- /dev/null
+++ b/addons/crm/i18n/es_MX.po.moved
@@ -0,0 +1,3672 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* crm
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-06 16:24+0000\n"
+"PO-Revision-Date: 2011-07-06 16:24+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Leads"
+msgstr "# Iniciativas"
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+msgid "Lead"
+msgstr "Iniciativa"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor3
+msgid "Need Services"
+msgstr "Necesita servicios"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "Schedule a PhoneCall"
+msgstr "Planificar llamada telefónica"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etapa del caso"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Visibility"
+msgstr "Visibilidad"
+
+#. module: crm
+#: field:crm.lead,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: crm
+#: field:crm.meeting,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: crm
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
+msgid "Date of month"
+msgstr "Día del mes"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Select Opportunities"
+msgstr "Seleccionar oportunidades"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid " "
+msgstr " "
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.phonecall.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Previous Stage"
+msgstr "Etapa anterior"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#, python-format
+msgid "Can not add note!"
+msgstr "¡No se puede añadir una nota!"
+
+#. module: crm
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nombre de etapa"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,day:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr "¡El código del equipo de ventas debe ser único!"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
+msgstr "La inicaitiva '%s' ha sido convertida en oportunidad"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:228
+#, python-format
+msgid "The lead '%s' has been closed."
+msgstr "La iniciativa '%s' ha sido cerrada"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#: code:addons/crm/wizard/crm_lead_to_partner.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Advertencia !"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Yearly"
+msgstr "Anual"
+
+#. module: crm
+#: field:crm.segmentation.line,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. 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 "Campaña"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+msgid "Do not create a partner"
+msgstr "No crear una empresa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Opportunities"
+msgstr "Busqueda de oportunidades"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#, python-format
+msgid "Opportunity must have Partner assigned before merging with other Opportunity."
+msgstr "La oportunidad debe de tener una empresa asignada antes de fusionarla con otra oportunidad."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Can not send mail!"
+msgstr "¡No se pudo enviar el correo!"
+
+#. module: crm
+#: field:crm.lead,partner_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,partner_id:0
+#: field:crm.lead2opportunity,partner_id:0
+#: field:crm.lead2opportunity.partner,partner_id:0
+#: field:crm.lead2partner,partner_id:0
+#: view:crm.meeting:0
+#: field:crm.meeting,partner_id:0
+#: field:crm.partner2opportunity,partner_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,partner_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,partner_id:0
+#: field:crm.phonecall2opportunity,partner_id:0
+#: field:crm.phonecall2partner,partner_id:0
+#: model:ir.model,name:crm.model_res_partner
+#: model:process.node,name:crm.process_node_partner0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
+msgid "Organizer"
+msgstr "Organizador"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall2phonecall:0
+#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+#: view:res.partner:0
+msgid "Schedule Other Call"
+msgstr "Planificar otra llamada"
+
+#. module: crm
+#: help:crm.meeting,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr "Editar todas las ocurrencias de la reunión recurrente."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
+#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:89
+#: model:crm.case.categ,name:crm.categ_meet3
+#: view:crm.phonecall:0
+#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
+#: view:res.partner:0
+#, python-format
+msgid "Phone Call"
+msgstr "Llamada de telefono"
+
+#. module: crm
+#: field:crm.lead,optout:0
+msgid "Opt-Out"
+msgstr "No acepta recibir emails"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:108
+#, python-format
+msgid "The opportunity '%s' has been marked as lost."
+msgstr "La oportunidad '%s' ha sido marcada como perdida."
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid "Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis."
+msgstr "El análisis de iniciativas le permite verificar información relacionada con el CRM. Puede verificar los retrasos, el número de respuestas realizadas y el número de emails enviados. Puede ordenar el análisis de sus iniciativas según diferentes grupos para obtener un análisis reagrupado preciso."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm
+#: field:crm.segmentation,segmentation_line:0
+msgid "Criteria"
+msgstr "Criterios"
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciones"
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "_Merge"
+msgstr "_Fusionar"
+
+#. 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 "Análisis de iniciativas"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+msgid "If you select Merge with existing Opportunity, the lead details(with the communication history) will be merged with existing Opportunity of Selected partner."
+msgstr "Si selecciona fusionar con oportunidad existente, los detalles de la iniciativa (con el histórico de la comunicación) serán fusionados con la oportunidad existente de la empresa seleccionada"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Public"
+msgstr "Público"
+
+#. 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 "Campañas"
+
+#. 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 "Categorías"
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Forever"
+msgstr "Siempre"
+
+#. 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 "Si opt-out está marcado, este contacto ha rehusado recibir correos electrónicos o ha eliminado su suscripción a una campaña."
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadpartner0
+msgid "Prospect Partner"
+msgstr "Socio prospecto"
+
+#. module: crm
+#: field:crm.lead,contact_name:0
+msgid "Contact Name"
+msgstr "Nombre de contacto"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Link to an existing partner"
+msgstr "Enlace al socio existente"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.phonecall,partner_contact:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Enhance your core CRM Application with additional functionalities."
+msgstr "Mejore su aplicación CRM básica con funcionalidades adicionales."
+
+#. module: crm
+#: field:crm.case.stage,on_change:0
+msgid "Change Probability Automatically"
+msgstr "Cambiar la probabilidad automáticamente"
+
+#. module: crm
+#: field:base.action.rule,regex_history:0
+msgid "Regular Expression on Case History"
+msgstr "Expresiones Regulares en el Historial del Caso"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:209
+#, python-format
+msgid "The lead '%s' has been opened."
+msgstr "La iniciativa '%s' ha sido abierta."
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_opportunitymeeting0
+msgid "Opportunity Meeting"
+msgstr "Oportunidad de Reunión"
+
+#. 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 "Número de días para cerrar el caso"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_opportunities0
+msgid "When a real project/opportunity is detected"
+msgstr "Cuando un proyecto/oportunidad real es detectado"
+
+#. module: crm
+#: field:crm.installer,crm_fundraising:0
+msgid "Fundraising"
+msgstr "Recaudación de fondos"
+
+#. module: crm
+#: view:res.partner:0
+#: field:res.partner,opportunity_ids:0
+msgid "Leads and Opportunities"
+msgstr "Iniciativas y oportunidades"
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm
+#: field:crm.case.section,change_responsible:0
+msgid "Change Responsible"
+msgstr "Cambiar responsable"
+
+#. module: crm
+#: field:crm.merge.opportunity,state:0
+msgid "Set State To"
+msgstr "Cambiar estado a"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid "Outbound Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team."
+msgstr "Llamadas salientes muestra todas las llamadas realizadas por su equipo de ventas. Un vendedor puede grabar la información sobre la llamada en la vista de formulario. Esta información se almacenará en el formulario de empresa para rastrear cada contacto que tenga con un cliente. También puede importar un archivo .CSV con una lista de llamadas a realizar por su equipo de ventas."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_action
+msgid "Convert/Merge Opportunity"
+msgstr "Convertir/Fusionar oportunidad"
+
+#. module: crm
+#: field:crm.lead,write_date:0
+msgid "Update Date"
+msgstr "Actualizar fecha"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: field:crm.lead2opportunity.action,name:0
+msgid "Select Action"
+msgstr "Seleccionar acción"
+
+#. module: crm
+#: field:base.action.rule,trg_categ_id:0
+#: view:crm.lead:0
+#: field:crm.lead,categ_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,categ_id:0
+#: field:crm.opportunity2phonecall,categ_id:0
+#: field:crm.phonecall,categ_id:0
+#: field:crm.phonecall.report,categ_id:0
+#: field:crm.phonecall2phonecall,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "#Opportunities"
+msgstr "# Oportunidades"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor2
+msgid "Campaign 1"
+msgstr "Campaña 1"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor1
+msgid "Campaign 2"
+msgstr "Campaña 2"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Privacy"
+msgstr "Privada"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunity Analysis"
+msgstr "Análisis de oportunidades"
+
+#. module: crm
+#: help:crm.meeting,location:0
+msgid "Location of Event"
+msgstr "Lacalización del evento"
+
+#. module: crm
+#: field:crm.meeting,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: crm
+#: help:crm.installer,fetchmail:0
+msgid "Allows you to receive E-Mails from POP/IMAP server."
+msgstr "Le permite recibir e-mails desde un servidor POP/IMAP"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_opportunitymeeting0
+msgid "Normal or phone meeting for opportunity"
+msgstr "Oportunidad de reunion normal ó telefonico."
+
+#. module: crm
+#: model:process.node,note:crm.process_node_leads0
+msgid "Very first contact with new prospect"
+msgstr "Primer contacto con nueva prospección"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:278
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
+#: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
+#: model:ir.actions.act_window,name:crm.crm_partner2opportunity
+#, python-format
+msgid "Create Opportunity"
+msgstr "Crear oportunidad"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: crm
+#: code:addons/crm/crm.py:378
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Escalate"
+msgstr "Escalado"
+
+#. module: crm
+#: model:ir.module.module,shortdesc:crm.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "Gestión de las relaciones con los clientes y proveedores"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Not Running"
+msgstr "No ejecutado"
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_reply_mail
+msgid "Reply to last Mail"
+msgstr "Responder al último e-mail"
+
+#. module: crm
+#: field:crm.lead,email:0
+msgid "E-Mail"
+msgstr "E-mail"
+
+#. module: crm
+#: field:crm.installer,wiki_sale_faq:0
+msgid "Sale FAQ"
+msgstr "FAQ de ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail_attachment
+msgid "crm.send.mail.attachment"
+msgstr "crm.enviar.mail.adjunto"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm
+#: help:crm.meeting,email_from:0
+#: help:crm.phonecall,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,name:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "State of Mind Computation"
+msgstr "Cálculo grado de satisfacción"
+
+#. module: crm
+#: help:crm.case.section,change_responsible:0
+msgid "Thick this box if you want that on escalation, the responsible of this sale team automatically becomes responsible of the lead/opportunity escaladed"
+msgstr "Marque esta opción si quiere que el responsable del equipo de ventas sea automáticamente responsable de la iniciativa/oportunidad, en caso de ser escalada."
+
+#. module: crm
+#: help:crm.installer,outlook:0
+#: help:crm.installer,thunderbird:0
+msgid "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 "Permite enlazar su e-mail a la gestión documental de OpenERP. Puede adjuntarlo a cualquier documento ya existente en OpenERP o crear uno de nuevo."
+
+#. module: crm
+#: view:crm.case.categ:0
+msgid "Case Category"
+msgstr "Categoría del caso"
+
+#. 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 "Grado de satisfacción por defecto para el período que precede el cálculo de 'Intervalo máx.'. Este es el grado de satisfacción inicial por defecto si la empresa no tiene ningún evento."
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Error: El email no está bien formateado"
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "#Phone calls"
+msgstr "#Llamadas telefónicas"
+
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid "The partner category that will be added to partners that match the segmentation criterions after computation."
+msgstr "La categoría de empresas que será añadida a las empresas que cumplan los criterios de segmentación después del cálculo."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication history"
+msgstr "Historial de comunicación"
+
+#. module: crm
+#: help:crm.phonecall,canal_id:0
+msgid "The channels represent the different communication                         modes available with the customer. With each commercial opportunity, you can indicate                         the canall which is this opportunity source."
+msgstr "Los canales representan los diferentes modos de comunicación posibles con el cliente. En cada oportunidad comercial, puede indicar el canal que ha sido el origen de esta oportunidad."
+
+#. module: crm
+#: code:addons/crm/crm_meeting.py:93
+#, python-format
+msgid "The meeting '%s' has been confirmed."
+msgstr "La reunión '%s' ha sido confirmada"
+
+#. module: crm
+#: field:crm.case.section,user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
+#, python-format
+msgid "A partner is already defined on this phonecall."
+msgstr "Una empresa ya esta definida para esta llamada."
+
+#. 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 "La dirección de correo electrónico usada como \"Responder a\" de todos los correos electrónicos enviados por OpenERP para los casos de este equipo de ventas."
+
+#. module: crm
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividad actual"
+
+#. module: crm
+#: help:crm.meeting,exrule:0
+msgid "Defines a rule or repeating pattern of time to exclude from the recurring rule."
+msgstr "Define una regla o patrón de repetición de tiempo a excluir de la regla recurrente."
+
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: crm
+#: view:crm.segmentation.line:0
+msgid "Partner Segmentation Lines"
+msgstr "Líneas de segmentación de empresa"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm
+#: help:crm.installer,crm_caldav:0
+msgid "Helps you to synchronize the meetings with other calendar clients and mobiles."
+msgstr "Le permite sincronizar las reuniones con otros clientes de calendario y móviles."
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: crm
+#: help:crm.installer,crm_claim:0
+msgid "Manages the suppliers and customers claims, including your corrective or preventive actions."
+msgstr "Gestiona las reclamaciones de clientes y proveedores, incluyendo acciones correctivas o preventivas"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Form"
+msgstr "Formulario de iniciativas"
+
+#. module: crm
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Segmentación de empresa"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid "The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.\n"
+"        "
+msgstr "Las citas del calendario estan compartidas entre el equipo de ventas e integradas con otras aplicaciones como los dias festivos de los empleados o las oportunidades de negocio. Usted puede tambien sincronizar citas con su telefono movil usando la interfaz caldav.\n"
+"        "
+
+#. module: crm
+#: field:crm.lead.report,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm
+#: help:crm.segmentation,name:0
+msgid "The name of the segmentation."
+msgstr "El nombre de la segmentación."
+
+#. module: crm
+#: field:crm.case.stage,probability:0
+#: field:crm.lead,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Generation"
+msgstr "Generación de iniciativas"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
+msgid "Statistics Dashboard"
+msgstr "Tablero de estadísticas"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
+#: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+#: field:crm.lead2opportunity,name:0
+#: field:crm.meeting,opportunity_id:0
+#: field:crm.phonecall,opportunity_id:0
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead7
+msgid "Television"
+msgstr "Televisión"
+
+#. module: crm
+#: field:crm.installer,crm_caldav:0
+msgid "Calendar Synchronizing"
+msgstr "Sincronización del calendario"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Stop Process"
+msgstr "Parar el proceso"
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Search Phonecalls"
+msgstr "Buscar llamadas"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Siguiente"
+
+#. module: crm
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Días por período"
+
+#. module: crm
+#: field:crm.meeting,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: crm
+#: field:base.action.rule,act_section_id:0
+msgid "Set Team to"
+msgstr "Establecer equipo a"
+
+#. module: crm
+#: view:calendar.attendee:0
+#: field:calendar.attendee,categ_id:0
+msgid "Event Type"
+msgstr "Tipo de evento"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_installer
+msgid "crm.installer"
+msgstr "crm.instalador"
+
+#. module: crm
+#: field:crm.segmentation,exclusif:0
+msgid "Exclusive"
+msgstr "Exclusivo"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:91
+#, python-format
+msgid "The opportunity '%s' has been won."
+msgstr "La oportunidad '%s' ha sido ganada"
+
+#. module: crm
+#: help:crm.meeting,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: crm
+#: field:crm.lead.report,create_date:0
+#: field:crm.phonecall.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: crm
+#: field:crm.lead,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Sales Purchase"
+msgstr "Compra Ventas"
+
+#. module: crm
+#: view:crm.case.stage:0
+#: field:crm.case.stage,requirements:0
+msgid "Requirements"
+msgstr "Requerimientos"
+
+#. module: crm
+#: help:crm.meeting,exdate:0
+msgid "This property defines the list of date/time exceptions for a recurring calendar component."
+msgstr "Esta propiedad define la lista de excepciones de fecha/hora para un evento de calendario recurrente."
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "Convert To Opportunity "
+msgstr "Convertir a oportunidad "
+
+#. module: crm
+#: help:crm.case.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of case stages."
+msgstr "Indica el orden de secuencia cuando se muestra un lista de etapas de casos."
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.merge.opportunity,opportunity_ids:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
+#: model:ir.ui.menu,name:crm.menu_crm_case_opp
+#: model:process.node,name:crm.process_node_opportunities0
+msgid "Opportunities"
+msgstr "Oportunidades"
+
+#. module: crm
+#: field:crm.segmentation,categ_id:0
+msgid "Partner Category"
+msgstr "Categoría de empresa"
+
+#. module: crm
+#: view:crm.add.note:0
+#: model:ir.actions.act_window,name:crm.action_crm_add_note
+msgid "Add Note"
+msgstr "Añadir nota"
+
+#. module: crm
+#: field:crm.lead,is_supplier_add:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: crm
+#: help:crm.send.mail,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "\"Responder a\" del equipo de ventas definido en este caso"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Won"
+msgstr "Marcar ganado"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Purchase Amount"
+msgstr "Importe de compra"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Lost"
+msgstr "Marcar perdido"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:230
+#, python-format
+msgid "The opportunity '%s' has been closed."
+msgstr "La oportunidad '%s' ha sido cerrada"
+
+#. module: crm
+#: field:crm.lead,day_open:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Show time as"
+msgstr "Mostrar hora como"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:264
+#: view:crm.phonecall2partner:0
+#, python-format
+msgid "Create Partner"
+msgstr "Crear empresa"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "<"
+msgstr "<"
+
+#. module: crm
+#: field:crm.lead,mobile:0
+#: field:crm.phonecall,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: crm
+#: field:crm.meeting,end_type:0
+msgid "Way to end reccurency"
+msgstr "Forma de terminar recurrencia"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr "No existen más oportunidades 'Abiertas' o 'Pendientes' para la empresa '%s'."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Next Stage"
+msgstr "Siguiente etapa"
+
+#. module: crm
+#: view:board.board:0
+msgid "My Meetings"
+msgstr "Mis reuniones"
+
+#. module: crm
+#: field:crm.lead,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm
+#: field:crm.lead,optin:0
+msgid "Opt-In"
+msgstr "Acepta recibir emails"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:208
+#: code:addons/crm/crm_phonecall.py:185
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
+#: view:crm.meeting:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_meeting_sale
+#: view:res.partner:0
+#: field:res.partner,meeting_ids:0
+#, python-format
+msgid "Meetings"
+msgstr "Reuniones"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day where repeat the meeting"
+msgstr "Eligir día en el que repetir la cita"
+
+#. 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 "Acción siguiente"
+
+#. module: crm
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. module: crm
+#: field:crm.meeting,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. 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 "Si el campo activo se establece en verdadero, se omitirá la alarma del evento, sin embargo no se eliminará."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr "Las llamadas telefónicas cerradas/canceladas no podrían ser convertidas en oportunidades"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentaciones de empresa"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,user_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+#: view:res.partner:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: view:res.partner:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Stage:"
+msgstr "Etapa:"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead5
+#: model:crm.case.stage,name:crm.stage_opportunity5
+#: view:crm.lead:0
+msgid "Won"
+msgstr "Ganado"
+
+#. module: crm
+#: field:crm.lead.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite sobrepasada"
+
+#. module: crm
+#: model:crm.case.section,name:crm.section_sales_department
+msgid "Sales Department"
+msgstr "Departamento de ventas"
+
+#. module: crm
+#: field:crm.send.mail,html:0
+msgid "HTML formatting?"
+msgstr "Formato HTML?"
+
+#. module: crm
+#: field:crm.case.stage,type:0
+#: field:crm.lead,type:0
+#: field:crm.lead.report,type:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Compute Segmentation"
+msgstr "Calcular la segmentación"
+
+#. 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 "Muy bajo"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.send.mail:0
+#: field:crm.send.mail.attachment,binary:0
+msgid "Attachment"
+msgstr "Adjunto"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,create_date:0
+#: field:crm.lead.report,creation_date:0
+#: field:crm.meeting,create_date:0
+#: field:crm.phonecall,create_date:0
+#: field:crm.phonecall.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor5
+msgid "Need a Website Design"
+msgstr "Necesita un diseño de sitio web"
+
+#. module: crm
+#: field:crm.meeting,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.send.mail,subject:0
+#: view:res.partner:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: crm
+#: field:crm.meeting,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:300
+#: view:crm.case.stage:0
+#: view:crm.lead:0
+#: field:crm.lead,stage_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,stage_id:0
+#, python-format
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "History Information"
+msgstr "Histórico información"
+
+#. module: crm
+#: field:base.action.rule,act_mail_to_partner:0
+msgid "Mail to Partner"
+msgstr "Correo a la empresa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mailings"
+msgstr "Correos"
+
+#. module: crm
+#: field:crm.meeting,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Repeat"
+msgstr "Repetir"
+
+#. module: crm
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Permite que el evento se repita en ese intervalo"
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition Case Fields"
+msgstr "Campos de condiciones de casos"
+
+#. module: crm
+#: model:ir.module.module,description:crm.module_meta_information
+msgid "The generic OpenERP Customer Relationship Management\n"
+"system enables a group of people to intelligently and efficiently manage\n"
+"leads, opportunities, meeting, phonecall etc.\n"
+"It manages key tasks such as communication, identification, prioritization,\n"
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers and\n"
+"suppliers. It can automatically send reminders, escalate the request, trigger\n"
+"specific methods and lots of other actions based on your own enterprise rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything\n"
+"special. They can just send email to the request tracker. OpenERP will take\n"
+"care of thanking them for their message, automatically routing it to the\n"
+"appropriate staff, and make sure all future correspondence gets to the right\n"
+"place.\n"
+"\n"
+"The CRM module has a email gateway for the synchronisation interface\n"
+"between mails and OpenERP.\n"
+"Create dashboard for CRM that includes:\n"
+"    * My Leads (list)\n"
+"    * Leads by Stage (graph)\n"
+"    * My Meetings (list)\n"
+"    * Sales Pipeline by Stage (graph)\n"
+"    * My Cases (list)\n"
+"    * Jobs Tracking (graph)\n"
+""
+msgstr "El sistema de Gestion de Relaciones con Cliente en OpenERP \n"
+"le permite a un grupo de personas \n"
+"leads, opportunities, meeting, phonecall etc.\n"
+"It manages key tasks such as communication, identification, prioritization,\n"
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers and\n"
+"suppliers. It can automatically send reminders, escalate the request, trigger\n"
+"specific methods and lots of other actions based on your own enterprise rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything\n"
+"special. They can just send email to the request tracker. OpenERP will take\n"
+"care of thanking them for their message, automatically routing it to the\n"
+"appropriate staff, and make sure all future correspondence gets to the right\n"
+"place.\n"
+"\n"
+"The CRM module has a email gateway for the synchronisation interface\n"
+"between mails and OpenERP.\n"
+"Create dashboard for CRM that includes:\n"
+"    * My Leads (list)\n"
+"    * Leads by Stage (graph)\n"
+"    * My Meetings (list)\n"
+"    * Sales Pipeline by Stage (graph)\n"
+"    * My Cases (list)\n"
+"    * Jobs Tracking (graph)\n"
+""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,stage_ids:0
+#: view:crm.case.stage:0
+#: model:ir.actions.act_window,name:crm.crm_case_stage_act
+#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.actions.act_window,name:crm.crm_opportunity_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm
+#: field:crm.lead,planned_revenue:0
+#: field:crm.lead2opportunity,planned_revenue:0
+#: field:crm.partner2opportunity,planned_revenue:0
+#: field:crm.phonecall2opportunity,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid "Create specific phone call categories to better define the type of calls tracked in the system."
+msgstr "Crear categorías específicas de llamada telefónica para definir mejor el tipo de llamadas en el sistema de seguimiento."
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: crm
+#: field:crm.segmentation,partner_id:0
+msgid "Max Partner ID processed"
+msgstr "Máx ID de empresa procesado"
+
+#. 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 "Análisis de llamadas"
+
+#. module: crm
+#: field:crm.lead.report,opening_date:0
+#: field:crm.phonecall.report,opening_date:0
+msgid "Opening Date"
+msgstr "Fecha de apertura"
+
+#. module: crm
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duración en minutos"
+
+#. module: crm
+#: help:crm.installer,crm_helpdesk:0
+msgid "Manages a Helpdesk service."
+msgstr "Gestiona un servicio de soporte."
+
+#. module: crm
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr "Nombre oportunidad"
+
+#. 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 "Si el campo activo se marca, permite ocultar el equipo de ventas sin eliminarlo."
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: crm
+#: field:crm.meeting,edit_all:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: crm
+#: field:crm.meeting,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.iniciativa"
+
+#. module: crm
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr "Fecha escritura"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "End of recurrency"
+msgstr "Fin de recurrencia"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#. 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 "Márquela si quiere utilizar esta pestaña como parte de la regla de segmentación. Si no se marca, los criterios que contenga serán ignorados"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
+#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+#: view:res.partner:0
+msgid "Create a Partner"
+msgstr "Crear una empresa"
+
+#. module: crm
+#: field:crm.segmentation,state:0
+msgid "Execution Status"
+msgstr "Estado ejecución"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: crm
+#: field:crm.lead,day_close:0
+msgid "Days to Close"
+msgstr "Días para el cierre"
+
+#. module: crm
+#: field:crm.add.note,attachment_ids:0
+#: field:crm.case.section,complete_name:0
+#: field:crm.send.mail,attachment_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: crm
+#: field:crm.lead,id:0
+#: field:crm.meeting,id:0
+#: field:crm.phonecall,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner2opportunity
+msgid "Partner To Opportunity"
+msgstr "Empresa a oportunidad"
+
+#. module: crm
+#: view:crm.meeting:0
+#: 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 "Fecha"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+#: view:crm.meeting:0
+#: view:crm.phonecall.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Resumen oportunidad"
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr "Oportunidades por categorías"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr "Elija el día del mes en que se repetirá la cita."
+
+#. module: crm
+#: view:crm.lead:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+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 "Cree categorías de empresa específicas para gestionar mejor sus interacciones con ellas. La herramienta de segmentación es capaz de asignar categorías a empresas de acuerdo a los criterios que establezca."
+
+#. module: crm
+#: field:crm.case.section,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: crm
+#: field:crm.case.section,child_ids:0
+msgid "Child Teams"
+msgstr "Equipos hijos"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,state:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,state:0
+#: view:crm.meeting:0
+#: field:crm.meeting,state:0
+#: field:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead1
+msgid "Telesales"
+msgstr "Telesales"
+
+#. module: crm
+#: field:crm.meeting,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm
+#: code:addons/crm/crm.py:392
+#: view:crm.lead:0
+#: view:crm.lead2opportunity:0
+#: view:crm.lead2opportunity.action:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: view:res.partner:0
+#, python-format
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm
+#: model:ir.model,name:crm.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge two Opportunities"
+msgstr "Fusionar dos oportunidades"
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Fix amout of times"
+msgstr "Cantidad fija de veces"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm
+#: field:crm.meeting,exrule:0
+msgid "Exception Rule"
+msgstr "Exception de regla"
+
+#. 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 "Verifica esto si tu quieres enviar la norma en un correo electronico a el socio"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
+msgid "Phonecall Categories"
+msgstr "Categorías de llamadas"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invite People"
+msgstr "Invitar personas"
+
+#. module: crm
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr "¡Error! No puede crear equipos de ventas recursivos."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr "Buscar reuniones"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Sale Amount"
+msgstr "Importe de venta"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Unable to send mail. Please check SMTP is configured properly."
+msgstr "Imposible enviar el correo electrónico. Verifique que la configuración SMTP sea correcta."
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "="
+msgstr "="
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr "No confirmado"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid "Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline."
+msgstr "El análisis de oportunidades le da acceso instantáneo a sus oportunidades con información como el ingreso previsto, coste planeado, fechas límite incumplidas o el número de interacciones por oportunidad. Este informe lo utiliza principalmente el responsable de ventas para hacer una revisión periódica del proceso de ventas con los equipos."
+
+#. module: crm
+#: field:crm.case.categ,name:0
+#: field:crm.installer,name:0
+#: field:crm.lead,name:0
+#: field:crm.segmentation,name:0
+#: field:crm.send.mail.attachment,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: crm
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarma"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+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 "Agregar etapas específicas de iniciativas y oportunidades para organizar mejor su flujo de ventas. Estas etapas permitirán un fácil seguimiento de iniciativas u oportunidades en relación al ciclo de ventas."
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. module: crm
+#: field:crm.lead,birthdate:0
+msgid "Birthdate"
+msgstr "Fecha de nacimiento"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "The"
+msgstr "El"
+
+#. module: crm
+#: field:crm.send.mail.attachment,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. module: crm
+#: help:crm.lead,section_id:0
+msgid "Sales team to which this case belongs to. Defines responsible user and e-mail address for the mail gateway."
+msgstr "El equipo de ventas al que pertenece este caso. Define el usuario responsable y la dirección de correo electrónico para la pasarela de correo."
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Creation"
+msgstr "Creación"
+
+#. 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 "Alto"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_partner0
+msgid "Convert to prospect to business partner"
+msgstr "Convertir prospección a empresa"
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "_Convert"
+msgstr "_Convertir"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+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 "Con invitaciones a reuniones puede crear y gesionar las invitaciones  de reuniones enviadas / por enviar a sus compañeros de trabajo / empresas. La invitación no debe ser únicamente para usuarios de OpenERP, puede ser igualmente para terceros externos, como un cliente."
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fifth"
+msgstr "Quinto"
+
+#. module: crm
+#: view:crm.phonecall2phonecall:0
+msgid "_Schedule"
+msgstr "_Calendario"
+
+#. module: crm
+#: field:crm.lead.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Tiempo restante para el cierre"
+
+#. module: crm
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr "Mier"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor6
+msgid "Potential Reseller"
+msgstr "Distribuidor potencial"
+
+#. module: crm
+#: field:crm.lead.report,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. 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 "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm
+#: help:crm.lead,partner_id:0
+msgid "Optional linked partner, usually after conversion of the lead"
+msgstr "Empresa relacionada opcional, normalmente después de la conversión de la iniciativa"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation details"
+msgstr "Detalles de la invitación"
+
+#. module: crm
+#: field:crm.case.section,parent_id:0
+msgid "Parent Team"
+msgstr "Equipo padre"
+
+#. module: crm
+#: field:crm.lead,date_action:0
+msgid "Next Action Date"
+msgstr "Fecha  de la próxima acción"
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: crm
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:213
+#, python-format
+msgid "The case '%s' has been opened."
+msgstr "El caso '%s' ha sido abierto"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone1
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
+msgid "Inbound"
+msgstr "Entrante"
+
+#. module: crm
+#: help:crm.case.stage,probability:0
+msgid "This percentage depicts the default/average probability of the Case for this stage to be a success"
+msgstr "Este porcentaje representa la probabilidad por defecto / media para que los casos de esta etapa sean un éxito."
+
+#. module: crm
+#: view:crm.phonecall.report:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
+msgid "Phone calls"
+msgstr "Llamadas telefónicas"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication  History"
+msgstr "Historial de comunicaciones"
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#. module: crm
+#: field:crm.case.section,allow_unlink:0
+msgid "Allow Delete"
+msgstr "Permitir eliminar"
+
+#. module: crm
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. 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 "Muy alto"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid "The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity."
+msgstr "La herramienta de llamadas entrantes le permite seguir el rastro de sus llamadas entrantes en tiempo real. Cada llamada que reciba, aparecerá en el formulario de la empresa para dejar el rastro de cada contacto que tiene en una empresa. Desde el formulario de llamada telefónica, puede lanzar una solicitud para otra llamada, una reunión o una oportunidad"
+
+#. module: crm
+#: help:crm.meeting,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Reunión periódica"
+
+#. module: crm
+#: view:crm.case.section:0
+#: view:crm.lead:0
+#: field:crm.lead,description:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Days"
+msgstr "Días"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+msgid "Opportunity by Categories"
+msgstr "Oportunidades por categorías"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,partner_name:0
+msgid "Customer Name"
+msgstr "Nombre del cliente"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2opportunity
+msgid "Phonecall To Opportunity"
+msgstr "Llamada telefónica a oportunidad"
+
+#. module: crm
+#: field:crm.case.section,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Select stages for this Sales Team"
+msgstr "Seleccionar etapas para este equipo de ventas"
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency Option"
+msgstr "Opción de recurrencia"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadpartner0
+msgid "Prospect is converting to business partner"
+msgstr "El prospecto se convierte a partner"
+
+#. module: crm
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
+msgid "Convert To Opportunity"
+msgstr "Convertir en oportunidad"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Held"
+msgstr "Ocupado"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. 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 "Fusionar oportunidades"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead5
+msgid "Google Adwords"
+msgstr "Google Adwords"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall
+msgid "crm.phonecall"
+msgstr "crm.llamadateléfono"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead3
+msgid "Mail Campaign 2"
+msgstr "Campaña mail 2"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead2
+msgid "Mail Campaign 1"
+msgstr "Mail Campaign 1"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm
+#: code:addons/crm/crm.py:492
+#, python-format
+msgid "Send"
+msgstr "Enviar"
+
+#. 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 "Prioridad"
+
+#. module: crm
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Utiliza las reglas de compra ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
+msgid "Lead To Opportunity Partner"
+msgstr "Iniciativa a Oportunidad"
+
+#. module: crm
+#: field:crm.meeting,location:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "Programar una reunión normal o telefónica"
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. 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 "Cree diferentes categorías de reuniones para organizarlas y clasificarlas mejor."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_segmentation_line
+msgid "Segmentation line"
+msgstr "Línea de segmentación"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Planned Date"
+msgstr "Fecha prevista"
+
+#. module: crm
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Expected Revenues"
+msgstr "Ingresos esperados"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead6
+msgid "Google Adwords 2"
+msgstr "Google Adwords 2"
+
+#. module: crm
+#: help:crm.lead,type:0
+#: help:crm.lead.report,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "Are you sure you want to create a partner based on this Phonecall ?"
+msgstr "¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid "Define a Sales Team to organize your different salesmen or sales departments into separate teams. Each team will work in its own list of opportunities, sales orders, etc. Each user can set a default team in his user preferences. The opportunities and sales order displayed, will automatically be filtered according to his team."
+msgstr "Defina un equipo de ventas para organizar a sus diferentes vendedores o departamentos de ventas en equipos separados. Cada equipo trabajará en su propia lista de oportunidades, pedidos de venta, etc. Cada usuario puede configurar un equipo predeterminado en sus preferencias de usuario. Las oportunidades y pedidos de venta mostrados se filtrarán automáticamente de acuerdo a su equipo."
+
+#. module: crm
+#: help:crm.meeting,count:0
+msgid "Repeat x times"
+msgstr "Repetir x veces"
+
+#. 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 "Equipos de ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2partner
+msgid "Lead to Partner"
+msgstr "Inicaitiva a cliente"
+
+#. module: crm
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr "Segmentación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Team"
+msgstr "Equipo"
+
+#. module: crm
+#: field:crm.installer,outlook:0
+msgid "MS-Outlook"
+msgstr "MS-Outlook"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Not Held"
+msgstr "No ocupado"
+
+#. module: crm
+#: field:crm.lead.report,probability:0
+msgid "Probability"
+msgstr "Probabilidad"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,month:0
+#: field:crm.meeting,month_list:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
+#: model:process.node,name:crm.process_node_leads0
+msgid "Leads"
+msgstr "Iniciativas"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid "Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect."
+msgstr "Las iniciativas le permiten gestionar y realizar un seguimiento de todos los contactos iniciales con un cliente potencial o socio que muestre interés en sus productos o servicios. Una iniciativa es generalmente el primer paso en su ciclo de ventas. Una vez identificada, una iniciativa se puede convertir en una oportunidad de negocio, creándose el socio correspondiente para el seguimiento detallado de cualquier actividad relacionada. Usted puede importar una base de datos de posibles clientes, realizar el seguimiento de sus tarjetas de visita o integrar el formulario de contacto de su sitio web con las iniciativas de OpenERP. Las iniciativas pueden ser conectadas a una pasarela de correo electrónico: los nuevos correos crearán nuevas iniciativas y cada una de ellas obtendrá automáticamente el historial de la conversación con el cliente potencial."
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Create a new partner"
+msgstr "Crear una nueva empresa"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: crm
+#: selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+msgid "Todo"
+msgstr "Por hacer"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Decline"
+msgstr "Rechazar"
+
+#. module: crm
+#: help:crm.lead,optin:0
+msgid "If opt-in is checked, this contact has accepted to receive emails."
+msgstr "Si opt-in está marcado, este contacto ha aceptado recibir correos electrónicos."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reset to Unconfirmed"
+msgstr "Restablecer a no confirmado"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:40
+#: view:crm.add.note:0
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "La compañía seleccionada no está en las compañías permitidas para este usuario"
+
+#. 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 "Bajo"
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: field:crm.lead,date_closed:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: field:crm.meeting,date_closed:0
+#: selection:crm.merge.opportunity,state:0
+#: field:crm.phonecall,date_closed:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Plug-In"
+msgstr "Conector"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet2
+msgid "Internal Meeting"
+msgstr "Reunión interna"
+
+#. module: crm
+#: code:addons/crm/crm.py:411
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet1
+msgid "Customer Meeting"
+msgstr "Reunión de cliente"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,email_cc:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone
+#: view:res.partner:0
+msgid "Phone Calls"
+msgstr "Llamadas telefónicas"
+
+#. 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 "Número de días para abrir el caso"
+
+#. module: crm
+#: field:crm.lead,phone:0
+#: field:crm.phonecall,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm
+#: field:crm.case.section,active:0
+#: field:crm.lead,active:0
+#: view:crm.lead.report:0
+#: field:crm.meeting,active:0
+#: field:crm.phonecall,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:306
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr "La fase de la oportunidad '%s' ha cambiado a '%s'."
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Mandatory Expression"
+msgstr "Expresión obligatoria"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid ">"
+msgstr ">"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Uncertain"
+msgstr "Incierto"
+
+#. module: crm
+#: field:crm.send.mail,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_send_mail
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: crm
+#: help:crm.installer,wiki_sale_faq:0
+msgid "Helps you manage wiki pages for Frequently Asked Questions on Sales Application."
+msgstr "Le ayuda a organizar páginas wiki para preguntas frecuentes sobre la aplicación de ventas"
+
+#. module: crm
+#: help:crm.installer,crm_fundraising:0
+msgid "This may help associations in their fundraising process and tracking."
+msgstr "Puede ayudar a las asociaciones en su proceso de obtención de fondos y seguimiento."
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2partner,action:0
+#: field:crm.phonecall2partner,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: crm
+#: field:crm.installer,crm_claim:0
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_decrease:0
+msgid "Decrease (0>1)"
+msgstr "Disminuir (0>1)"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.lead:0
+#: view:crm.send.mail:0
+msgid "Attachments"
+msgstr "Datos adjuntos"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Weekly"
+msgstr "Semanal"
+
+#. 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 "Análisis de oportunidades"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor8
+#: view:crm.meeting:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: crm
+#: view:crm.meeting:0
+#: selection:crm.meeting,state:0
+#: selection:crm.phonecall,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: crm
+#: help:crm.meeting,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_max:0
+msgid "Max Interval"
+msgstr "Intervalo máx"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "_Schedule Call"
+msgstr "_Programar llamada"
+
+#. module: crm
+#: code:addons/crm/crm.py:326
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: view:crm.phonecall:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#: view:res.partner:0
+#, python-format
+msgid "Open"
+msgstr "Abierto"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: crm
+#: field:crm.lead,city:0
+msgid "City"
+msgstr "Ciudad"
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Busy"
+msgstr "Ocupado"
+
+#. module: crm
+#: field:crm.meeting,interval:0
+msgid "Repeat every"
+msgstr "Repetir cada"
+
+#. module: crm
+#: field:crm.installer,crm_helpdesk:0
+msgid "Helpdesk"
+msgstr "Asistencia/Ayuda"
+
+#. module: crm
+#: field:crm.meeting,recurrency:0
+msgid "Recurrent"
+msgstr "Recurrente"
+
+#. module: crm
+#: code:addons/crm/crm.py:397
+#, python-format
+msgid "The case '%s' has been cancelled."
+msgstr "El caso '%s' ha sido cancelado"
+
+#. module: crm
+#: field:crm.installer,sale_crm:0
+msgid "Opportunity to Quotation"
+msgstr "Oportunidad a presupuesto"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail
+msgid "Send new email"
+msgstr "Enviar nuevo email"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.act_my_oppor
+msgid "My Open Opportunities"
+msgstr "Mis oportunidades abiertas"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
+msgid "CRM - Statistics Dashboard"
+msgstr "CRM - Tablero de estadísticas"
+
+#. module: crm
+#: help:crm.meeting,rrule:0
+msgid "Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:        FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr "Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: crm
+#: field:base.action.rule,trg_max_history:0
+msgid "Maximum Communication History"
+msgstr "Máximo historial de comunicaciones"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+msgid "Are you sure you want to create a partner based on this lead ?"
+msgstr "¿Está seguro que quiere crear una empresa basada en esta iniciativa?"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,categ_id:0
+msgid "Meeting Type"
+msgstr "Tipo de reunión"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
+#, python-format
+msgid "Merge with Existing Opportunity"
+msgstr "Fusinar con oportunidad existente"
+
+#. module: crm
+#: help:crm.lead,state:0
+#: help:crm.phonecall,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 "El estado se establece a 'Borrador', cuando se crea un caso.                                  \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.                                  \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.                                  \n"
+"Si el caso necesita ser revisado entonces en estado se establece a 'Pendiente'."
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: crm
+#: help:crm.segmentation,som_interval_max:0
+msgid "The computation is made on all events that occured during this interval, the past X periods."
+msgstr "El cálculo se realiza en todos los eventos que ocurran durante este intervalo, los X períodos anteriores."
+
+#. module: crm
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
+msgstr "Mi coeficiente ganado/perdido del año anterior"
+
+#. module: crm
+#: field:crm.installer,thunderbird:0
+msgid "Thunderbird"
+msgstr "Thunderbird"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# of Emails"
+msgstr "Nº de e-mails"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+msgstr "Buscar iniciativas"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,delay_open:0
+msgid "Delay to open"
+msgstr "Retraso de apertura"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency period"
+msgstr "Periodo de recurrencia"
+
+#. module: crm
+#: field:crm.meeting,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Referrer"
+msgstr "Referenciado por"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity
+msgid "Lead To Opportunity"
+msgstr "Iniciativa a opportunidad"
+
+#. module: crm
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr "Información asistentes"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Test"
+msgstr "Prueba de segmentación"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Continue Process"
+msgstr "Continuar el proceso"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure Your CRM Application"
+msgstr "Configure su aplicación CRM"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2partner
+msgid "Phonecall to Partner"
+msgstr "Llamada telefónica a empresa"
+
+#. module: crm
+#: help:crm.lead,partner_name:0
+msgid "The name of the future partner that will be created while converting the into opportunity"
+msgstr "El nombre del futuro cliente que se creará cuando se convierta en oportunidad."
+
+#. module: crm
+#: field:crm.opportunity2phonecall,user_id:0
+#: field:crm.phonecall2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: crm
+#: field:crm.add.note,state:0
+#: field:crm.send.mail,state:0
+msgid "Set New State To"
+msgstr "Establecer nuevo estado a"
+
+#. 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 "Última acción"
+
+#. module: crm
+#: field:crm.meeting,duration:0
+#: field:crm.phonecall,duration:0
+#: field:crm.phonecall.report,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: crm
+#: field:crm.send.mail,reply_to:0
+msgid "Reply To"
+msgstr "Responder a"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.open_board_crm
+#: model:ir.ui.menu,name:crm.menu_board_crm
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_partner.py:56
+#, python-format
+msgid "A partner is already defined on this lead."
+msgstr "Una empresa ya ha sido definida en esta iniciativa."
+
+#. module: crm
+#: field:crm.lead.report,nbr:0
+#: field:crm.phonecall.report,nbr:0
+msgid "# of Cases"
+msgstr "# de casos"
+
+#. module: crm
+#: help:crm.meeting,section_id:0
+#: help:crm.phonecall,section_id:0
+msgid "Sales team to which Case belongs to."
+msgstr "Equipo de ventas al cual pertence el caso"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.send.mail,state:0
+msgid "Unchanged"
+msgstr "Sin cambios"
+
+#. 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 "Segmentación de empresas"
+
+#. module: crm
+#: field:crm.lead,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid "With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more."
+msgstr "Con las oportunidades puede gestionar y guardar el registro de su canal de ventas creando documentos específicos de venta por cliente - o potencial cliente - para el seguimiento de sus ventas potenciales. La información sobre ingresos esperados, etapa de la oportunidad, fecha estimada de cierre, histórico de las comunicaciones y muchos otros datos puede ser registrada. Las oportunidades pueden ser conectadas a la pasarela de correo electrónico: nuevos emails pueden crear oportunidades, y cada uno de ellos obtiene automáticamente el historial de la conversación con el cliente."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Assignment"
+msgstr "Asignación"
+
+#. 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 "Compañía"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: crm
+#: field:crm.meeting,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: crm
+#: field:crm.segmentation.line,operator:0
+msgid "Mandatory / Optional"
+msgstr "Obligatorio / Opcional"
+
+#. 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 "Invitaciones a reunión"
+
+#. module: crm
+#: field:crm.case.categ,object_id:0
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "E-mail address of the contact"
+msgstr "e-mail del contacto"
+
+#. module: crm
+#: field:crm.lead,referred:0
+msgid "Referred By"
+msgstr "Referenciado por"
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.model,name:crm.model_crm_add_note
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:304
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr "La etapa de la iniciativa '%s' ha sido cambiada por '%s'"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Last"
+msgstr "Último"
+
+#. module: crm
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm
+#: help:crm.case.stage,on_change:0
+msgid "Change Probability on next and previous stages."
+msgstr "Cambiar probabilidad para las etapas siguientes y anteriores."
+
+#. module: crm
+#: code:addons/crm/crm.py:455
+#: code:addons/crm/crm.py:457
+#: code:addons/crm/crm_action_rule.py:66
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: crm
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
+msgstr "Resumen de la llamada"
+
+#. 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.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm
+#: field:crm.add.note,body:0
+msgid "Note Body"
+msgstr "Contenido de la nota"
+
+#. module: crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr "Mis ingresos previstos por etapa"
+
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Links"
+msgstr "Enlaces"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid "Create specific categories that fit your company's activities to better 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 "Crear categorías específicas que se adapten a las actividades de su compañía para clasificar y analizar mejor sus iniciativas y oportunidades. Estas categorías podrían, por ejemplo, reflejar la estructura de sus productos o de los distintos tipos de ventas que realice."
+
+#. 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 "Si la empresa no ha comprado durante un período, disminuir el grado de satisfacción por este factor. Es una multiplicación."
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid "From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report."
+msgstr "Desde este informe, puede analizar el rendimiento de su equipo de ventas basándose en sus llamadas telefónicas. Puede agrupar o filtrar la información de acuerdo a varios criterios y profundizar en la información añadiendo más grupos al informe."
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Mailgateway"
+msgstr "Pasarela de correo"
+
+#. module: crm
+#: help:crm.lead,user_id:0
+msgid "By Default Salesman is Administrator when create New User"
+msgstr "Por defecto el vendedor es administrador cuando se crea un nuevo usuario"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Mails"
+msgstr "Nº de correos"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: crm
+#: field:crm.phonecall,name:0
+#: view:res.partner:0
+msgid "Call Summary"
+msgstr "Resumen de llamadas"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule/Log Call"
+msgstr "Planificar/Registrar llamada"
+
+#. module: crm
+#: field:crm.installer,fetchmail:0
+msgid "Fetch Emails"
+msgstr "Buscar emails"
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: crm
+#: help:crm.send.mail,email_cc:0
+msgid "These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"
+msgstr "Estas direcciones recibirán una copia de este correo electrónico. Para modificar la lista CC permanente, edite el campo CC global de este caso."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: crm
+#: field:crm.meeting,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: crm
+#: field:crm.phonecall.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Total of Planned Revenue"
+msgstr "Total ingresos previstos"
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid "You can not escalate, You are already at the top level regarding your sales-team category."
+msgstr "No puede escalar, ya está en el nivel más alto en su categoría de equipo de ventas."
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Optional Expression"
+msgstr "Expresión opcional"
+
+#. module: crm
+#: selection:crm.meeting,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: crm
+#: field:crm.lead2opportunity,probability:0
+msgid "Success Rate (%)"
+msgstr "Tasa de éxito (%)"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead1
+#: model:crm.case.stage,name:crm.stage_opportunity1
+msgid "New"
+msgstr "Nuevo"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Mail TO"
+msgstr "Enviar correo a"
+
+#. 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 "Email"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,channel_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,channel_id:0
+#: field:crm.phonecall,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
+msgid "Schedule Call"
+msgstr "Planificar llamada"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr "Las iniciativas cerradas/canceladas no podrían ser convertidas en oportunidades"
+
+#. module: crm
+#: help:crm.segmentation,exclusif:0
+msgid "Check if the category is limited to partners that match the segmentation criterions.                        \n"
+"If checked, remove the category from partners that doesn't match segmentation criterions"
+msgstr "Marque esta opción si la categoría está limitada a empresas que coincidan con los criterios de segmentación.                        \n"
+"Si está marcada, elimina la categoría de aquellas empresas que no coincidan con los criterios de segmentación."
+
+#. module: crm
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: crm
+#: field:crm.lead,state_id:0
+msgid "Fed. State"
+msgstr "Provincia"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadopportunity0
+msgid "Creating business opportunities from Leads"
+msgstr "Creando oportunidades de negocio desde iniciativas"
+
+#. module: crm
+#: help:crm.send.mail,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor4
+msgid "Need Information"
+msgstr "Necesita información"
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadopportunity0
+msgid "Prospect Opportunity"
+msgstr "Oportunidad de prospección"
+
+#. module: crm
+#: view:crm.installer:0
+#: model:ir.actions.act_window,name:crm.action_crm_installer
+msgid "CRM Application Configuration"
+msgstr "Configuración de la aplicación CRM"
+
+#. module: crm
+#: field:base.action.rule,act_categ_id:0
+msgid "Set Category to"
+msgstr "Establecer categoría"
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: crm
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.partner2opportunity:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm
+#: help:crm.installer,sale_crm:0
+msgid "This module relates sale from opportunity cases in the CRM."
+msgstr "Este módulo relaciona ventas con oportunidades en el CRM."
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Daily"
+msgstr "Diario"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead2
+#: model:crm.case.stage,name:crm.stage_opportunity2
+msgid "Qualification"
+msgstr "Calificación"
+
+#. module: crm
+#: view:crm.case.stage:0
+msgid "Stage Definition"
+msgstr "Definición de etapa"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "First"
+msgstr "Primero"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm
+#: field:crm.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition on Communication History"
+msgstr "Condición en el historial de comunicaciones"
+
+#. module: crm
+#: help:crm.segmentation,som_interval:0
+msgid "A period is the average number of days between two cycle of sale or purchase for this segmentation.                 \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too long time,                  \n"
+"so we suppose that his state of mind has decreased because he probably bought goods to another supplier.                  \n"
+"Use this functionality for recurring businesses."
+msgstr "Un periodo es el número medio de días entre dos ciclos de ventas o compras para esta segmentación.                 \n"
+"Se utiliza principalmente para detectar si una empresa no ha comprado por un largo periodo de tiempo,                  \n"
+"por lo que suponemos que su grado de satisfacción ha disminuido porqué seguramente compró bienes a otro proveedor.                  \n"
+"Utilice esta funcionalidad para negocios recurrentes."
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send Reply"
+msgstr "_Enviar respuesta"
+
+#. module: crm
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,msg:0
+#: field:crm.lead2partner,msg:0
+#: view:crm.send.mail:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: crm
+#: field:crm.meeting,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. 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 "Comercial"
+
+#. module: crm
+#: field:crm.lead,date_deadline:0
+msgid "Expected Closing"
+msgstr "Cierre previsto"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_opportunity2phonecall
+msgid "Opportunity to Phonecall"
+msgstr "Oportunidad a llamada telefónica"
+
+#. module: crm
+#: help:crm.case.section,allow_unlink:0
+msgid "Allows to delete non draft cases"
+msgstr "Permite eliminar los casos en estado no borrador."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule Meeting"
+msgstr "Programar reunión"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Partner Name"
+msgstr "Nombre empresa"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone2
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
+msgid "Outbound"
+msgstr "Saliente"
+
+#. module: crm
+#: field:crm.lead,date_open:0
+#: field:crm.phonecall,date_open:0
+msgid "Opened"
+msgstr "Abierto"
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,member_ids:0
+msgid "Team Members"
+msgstr "Miembros del equipo"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor1
+msgid "Interest in Computer"
+msgstr "Interesado en ordenadores"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation Detail"
+msgstr "Detalle de la invitación"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_default:0
+msgid "Default (0=None)"
+msgstr "Por defecto (0=Ninguno)"
+
+#. module: crm
+#: help:crm.lead,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 "Estas direcciones de correo serán añadidas al campo CC para todos los correos entrantes y salientes de este registro antes de ser enviados. Separe las diferentes direcciones de correo con una coma."
+
+#. module: crm
+#: field:crm.partner2opportunity,probability:0
+#: field:crm.phonecall2opportunity,probability:0
+msgid "Success Probability"
+msgstr "Probabilidad de éxito"
+
+#. module: crm
+#: code:addons/crm/crm.py:426
+#: selection:crm.add.note,state:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
+msgid "Cases by Sales Team"
+msgstr "Casos por equipo de ventas"
+
+#. module: crm
+#: field:crm.meeting,attendee_ids:0
+msgid "Attendees"
+msgstr "Asistentes"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: model:ir.model,name:crm.model_crm_meeting
+#: model:process.node,name:crm.process_node_meeting0
+#: model:res.request.link,name:crm.request_link_meeting
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Categoría de caso"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm
+#: view:board.board:0
+msgid "Planned Revenue by Stage and User"
+msgstr "Ingresos previsto por etapa y usuario"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead_report
+msgid "CRM Lead Report"
+msgstr "Informe de iniciativas CRM"
+
+#. module: crm
+#: field:crm.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. 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 "Normal"
+
+#. module: crm
+#: field:crm.lead,street2:0
+msgid "Street2"
+msgstr "Calle2"
+
+#. 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 "Categorías de reuniones"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "You may have to verify that this partner does not exist already."
+msgstr "Debería verificar que esta empresa no exista ya."
+
+#. module: crm
+#: field:crm.lead.report,delay_open:0
+msgid "Delay to Open"
+msgstr "Retraso de apertura"
+
+#. module: crm
+#: field:crm.lead.report,user_id:0
+#: field:crm.phonecall.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:67
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities By Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
+msgid "Schedule Phone Call"
+msgstr "Planificar llamada telefónica"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
+msgid "Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle."
+msgstr "Crear pasos específicos que ayudarán a su departamento de ventas a organizar mejor el flujo de venta gestionando sus oportunidades de venta. Esto les permitirá seguir fácilmente como está posicionada una oportunidad en el ciclo de ventas."
+
+#. module: crm
+#: model:process.process,name:crm.process_process_contractprocess0
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead4
+msgid "Twitter Ads"
+msgstr "Anuncios Twiter"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Planned Revenues"
+msgstr "Ingresos esperados"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor7
+msgid "Need Consulting"
+msgstr "Necesita consultoría"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Llamada telefónica a llamada telefónica"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:232
+#, python-format
+msgid "The case '%s' has been closed."
+msgstr "El caso '%s' ha sido cerrado"
+
+#. 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 "Contacto empresa"
+
+#. module: crm
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: crm
+#: 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 de usuario!"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:100
+#, python-format
+msgid "Merged into Opportunity: %s"
+msgstr "Fusionado con la oportunidad '%s'"
+
+#. module: crm
+#: code:addons/crm/crm.py:347
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Close"
+msgstr "Cerrado"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. module: crm
+#: model:ir.model,name:crm.model_base_action_rule
+msgid "Action Rules"
+msgstr "Reglas acción"
+
+#. module: crm
+#: field:crm.meeting,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. module: crm
+#: field:crm.meeting,phonecall_id:0
+msgid "Phonecall"
+msgstr "Llamada telefónica"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: crm
+#: field:crm.lead,function:0
+msgid "Function"
+msgstr "Función"
+
+#. module: crm
+#: view:crm.add.note:0
+msgid "_Add"
+msgstr "_Añadir"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "State of Mind"
+msgstr "Grado de satisfacción"
+
+#. 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
+#: view:crm.segmentation:0
+#: field:crm.segmentation,description:0
+#: view:res.partner:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm
+#: field:base.action.rule,trg_section_id:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.resource.type,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
+#: field:crm.lead,section_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,section_id:0
+#: field:crm.meeting,section_id:0
+#: field:crm.opportunity2phonecall,section_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,section_id:0
+#: 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 "Equipo de ventas"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor2
+msgid "Interest in Accessories"
+msgstr "Interesado en accesorios"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:211
+#, python-format
+msgid "The opportunity '%s' has been opened."
+msgstr "La oportunidad '%s' ha sido abierta"
+
+#. module: crm
+#: field:crm.lead.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: crm
+#: field:crm.lead,street:0
+msgid "Street"
+msgstr "Calle"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities by User and Team"
+msgstr "Oportunidades por usuario y equipo"
+
+#. module: crm
+#: field:crm.case.section,working_hours:0
+msgid "Working Hours"
+msgstr "Horario de trabajo"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,is_customer_add:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
+#: view:res.partner:0
+msgid "Schedule a Meeting"
+msgstr "Planificar una reunión"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead6
+#: model:crm.case.stage,name:crm.stage_opportunity6
+#: view:crm.lead:0
+msgid "Lost"
+msgstr "Perdido"
+
+#. module: crm
+#: field:crm.lead,country_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead2opportunity.action,name:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Convertir a oportunidad"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm
+#: field:crm.case.resource.type,name:0
+msgid "Campaign Name"
+msgstr "Nombre de la campaña"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall_report
+msgid "Phone calls by user and section"
+msgstr "Llamadas telefónicas por usuario y sección"
+
+#. module: crm
+#: selection:crm.lead2opportunity.action,name:0
+msgid "Merge with existing Opportunity"
+msgstr "Fusionado con oportunidad existente"
+
+#. module: crm
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead4
+#: model:crm.case.stage,name:crm.stage_opportunity4
+msgid "Negotiation"
+msgstr "Negociación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Cierre previsto"
+
+#. module: crm
+#: field:crm.case.stage,sequence:0
+#: field:crm.meeting,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: crm
+#: field:crm.send.mail,body:0
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_name:0
+msgid "Control Variable"
+msgstr "Variable de control"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+#: model:crm.case.stage,name:crm.stage_opportunity3
+msgid "Proposition"
+msgstr "Propuesta"
+
+#. module: crm
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Llamadas telefónicas"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,name:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead8
+msgid "Newsletter"
+msgstr "Boletín de noticias"
+
diff --git a/addons/crm/i18n/es_PY.po b/addons/crm/i18n/es_PY.po
index f9994fb8b3b..ba0dabf3338 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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "¡El código del equipo de ventas debe ser único!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "La inicaitiva '%s' ha sido convertida en oportunidad"
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "No repetir"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -551,9 +551,9 @@ msgstr "Primer contacto con nueva prospección"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -843,8 +843,8 @@ msgid "Statistics Dashboard"
 msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1155,7 +1155,7 @@ msgstr "Acepta recibir emails"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2733,7 +2733,7 @@ msgid "Meeting Type"
 msgstr "Tipo de reunión"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Fusinar con oportunidad existente"
@@ -3278,8 +3278,8 @@ msgid "Schedule Call"
 msgstr "Planificar llamada"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/es_VE.po b/addons/crm/i18n/es_VE.po
new file mode 100644
index 00000000000..507e564669f
--- /dev/null
+++ b/addons/crm/i18n/es_VE.po
@@ -0,0 +1,4643 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* crm
+#
+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-18 07:46+0000\n"
+"Last-Translator: Jorge L Tupac-Yupanqui <Unknown>\n"
+"Language-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:08+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Leads"
+msgstr "# Iniciativas"
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+msgid "Lead"
+msgstr "Iniciativa"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor3
+msgid "Need Services"
+msgstr "Necesita servicios"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "Schedule a PhoneCall"
+msgstr "Planificar llamada telefónica"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etapa del caso"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Visibility"
+msgstr "Visibilidad"
+
+#. module: crm
+#: field:crm.lead,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: crm
+#: field:crm.meeting,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: crm
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
+msgid "Date of month"
+msgstr "Día del mes"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Select Opportunities"
+msgstr "Seleccionar oportunidades"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid " "
+msgstr " "
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.phonecall.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Previous Stage"
+msgstr "Etapa anterior"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#, python-format
+msgid "Can not add note!"
+msgstr "¡No se puede añadir una nota!"
+
+#. module: crm
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr "Nombre de etapa"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,day:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr "¡El código del equipo de ventas debe ser único!"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
+msgstr "La inicaitiva '%s' ha sido convertida en oportunidad"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:228
+#, python-format
+msgid "The lead '%s' has been closed."
+msgstr "La iniciativa '%s' ha sido cerrada"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#: code:addons/crm/wizard/crm_lead_to_partner.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
+#, python-format
+msgid "Warning !"
+msgstr "Advertencia !"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Yearly"
+msgstr "Anual"
+
+#. module: crm
+#: field:crm.segmentation.line,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. 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 "Campaña"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+msgid "Do not create a partner"
+msgstr "No crear una empresa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Opportunities"
+msgstr "Busqueda de oportunidades"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#, python-format
+msgid ""
+"Opportunity must have Partner assigned before merging with other Opportunity."
+msgstr ""
+"La oportunidad debe de tener una empresa asignada antes de fusionarla con "
+"otra oportunidad."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. 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 "Análisis de oportunidades"
+
+#. module: crm
+#: field:crm.lead,partner_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,partner_id:0
+#: field:crm.lead2opportunity,partner_id:0
+#: field:crm.lead2opportunity.partner,partner_id:0
+#: field:crm.lead2partner,partner_id:0
+#: view:crm.meeting:0
+#: field:crm.meeting,partner_id:0
+#: field:crm.partner2opportunity,partner_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,partner_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,partner_id:0
+#: field:crm.phonecall2opportunity,partner_id:0
+#: field:crm.phonecall2partner,partner_id:0
+#: model:ir.model,name:crm.model_res_partner
+#: model:process.node,name:crm.process_node_partner0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
+msgid "Organizer"
+msgstr "Organizador"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall2phonecall:0
+#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+#: view:res.partner:0
+msgid "Schedule Other Call"
+msgstr "Planificar otra llamada"
+
+#. module: crm
+#: help:crm.meeting,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr "Editar todas las ocurrencias de la reunión recurrente."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
+#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:89
+#: model:crm.case.categ,name:crm.categ_meet3
+#: view:crm.phonecall:0
+#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
+#: view:res.partner:0
+#, python-format
+msgid "Phone Call"
+msgstr "Llamada de telefono"
+
+#. module: crm
+#: field:crm.lead,optout:0
+msgid "Opt-Out"
+msgstr "No acepta recibir emails"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:108
+#, python-format
+msgid "The opportunity '%s' has been marked as lost."
+msgstr "La oportunidad '%s' ha sido marcada como perdida."
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+"El análisis de iniciativas le permite verificar información relacionada con "
+"el CRM. Puede verificar los retrasos, el número de respuestas realizadas y "
+"el número de emails enviados. Puede ordenar el análisis de sus iniciativas "
+"según diferentes grupos para obtener un análisis reagrupado preciso."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm
+#: field:crm.segmentation,segmentation_line:0
+msgid "Criteria"
+msgstr "Criterios"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Excluded Answers :"
+msgstr "Respuestas excluidas:"
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr "Secciones"
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "_Merge"
+msgstr "_Fusionar"
+
+#. 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 "Análisis de iniciativas"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+msgid ""
+"If you select Merge with existing Opportunity, the lead details(with the "
+"communication history) will be merged with existing Opportunity of Selected "
+"partner."
+msgstr ""
+"Si selecciona fusionar con oportunidad existente, los detalles de la "
+"iniciativa (con el histórico de la comunicación) serán fusionados con la "
+"oportunidad existente de la empresa seleccionada"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Public"
+msgstr "Público"
+
+#. 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 "Campañas"
+
+#. 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 "Categorías"
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Forever"
+msgstr "Siempre"
+
+#. 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 ""
+"Si opt-out está marcado, este contacto ha rehusado recibir correos "
+"electrónicos o ha eliminado su suscripción a una campaña."
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadpartner0
+msgid "Prospect Partner"
+msgstr "Socio prospecto"
+
+#. module: crm
+#: field:crm.lead,contact_name:0
+msgid "Contact Name"
+msgstr "Nombre de contacto"
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Link to an existing partner"
+msgstr "Enlace al socio existente"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.phonecall,partner_contact:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Enhance your core CRM Application with additional functionalities."
+msgstr "Mejore su aplicación CRM básica con funcionalidades adicionales."
+
+#. module: crm
+#: field:crm.case.stage,on_change:0
+msgid "Change Probability Automatically"
+msgstr "Cambiar la probabilidad automáticamente"
+
+#. module: crm
+#: field:base.action.rule,regex_history:0
+msgid "Regular Expression on Case History"
+msgstr "Expresiones Regulares en el Historial del Caso"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:209
+#, python-format
+msgid "The lead '%s' has been opened."
+msgstr "La iniciativa '%s' ha sido abierta."
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_opportunitymeeting0
+msgid "Opportunity Meeting"
+msgstr "Oportunidad de Reunión"
+
+#. 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 "Número de días para cerrar el caso"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_opportunities0
+msgid "When a real project/opportunity is detected"
+msgstr "Cuando un proyecto/oportunidad real es detectado"
+
+#. module: crm
+#: field:crm.installer,crm_fundraising:0
+msgid "Fundraising"
+msgstr "Recaudación de fondos"
+
+#. module: crm
+#: view:res.partner:0
+#: field:res.partner,opportunity_ids:0
+msgid "Leads and Opportunities"
+msgstr "Iniciativas y oportunidades"
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm
+#: field:crm.case.section,change_responsible:0
+msgid "Change Responsible"
+msgstr "Cambiar responsable"
+
+#. module: crm
+#: field:crm.merge.opportunity,state:0
+msgid "Set State To"
+msgstr "Cmabiar estado a"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Outbound Calls list all the calls to be done by your sales team. A salesman "
+"can record the information about the call in the form view. This information "
+"will be stored in the partner form to trace every contact you have with a "
+"customer. You can also import a .CSV file with a list of calls to be done by "
+"your sales team."
+msgstr ""
+"Llamadas salientes muestra todas las llamadas realizadas por su equipo de "
+"ventas. Un vendedor puede grabar la información sobre la llamada en la vista "
+"de formulario. Esta información se almacenará en el formulario de empresa "
+"para rastrear cada contacto que tenga con un cliente. También puede importar "
+"un archivo .CSV con una lista de llamadas a realizar por su equipo de ventas."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_action
+msgid "Convert/Merge Opportunity"
+msgstr "Convertir/Fusionar oportunidad"
+
+#. module: crm
+#: field:crm.lead,write_date:0
+msgid "Update Date"
+msgstr "Actualizar fecha"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: field:crm.lead2opportunity.action,name:0
+msgid "Select Action"
+msgstr "Seleccionar acción"
+
+#. module: crm
+#: field:base.action.rule,trg_categ_id:0
+#: view:crm.lead:0
+#: field:crm.lead,categ_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,categ_id:0
+#: field:crm.opportunity2phonecall,categ_id:0
+#: field:crm.phonecall,categ_id:0
+#: field:crm.phonecall.report,categ_id:0
+#: field:crm.phonecall2phonecall,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "#Opportunities"
+msgstr "# Oportunidades"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor2
+msgid "Campaign 1"
+msgstr "Campaña 1"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_oppor1
+msgid "Campaign 2"
+msgstr "Campaña 2"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Privacy"
+msgstr "Privada"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunity Analysis"
+msgstr "Análisis de oportunidades"
+
+#. module: crm
+#: help:crm.meeting,location:0
+msgid "Location of Event"
+msgstr "Lacalización del evento"
+
+#. module: crm
+#: field:crm.meeting,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead1
+msgid "Version 4.2"
+msgstr "Versión 4.2"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead2
+msgid "Version 4.4"
+msgstr "Versión 4.4"
+
+#. module: crm
+#: help:crm.installer,fetchmail:0
+msgid "Allows you to receive E-Mails from POP/IMAP server."
+msgstr "Le permite recibir e-mails desde un servidor POP/IMAP"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_opportunitymeeting0
+msgid "Normal or phone meeting for opportunity"
+msgstr "Oportunidad de reunion normal ó telefonico."
+
+#. module: crm
+#: model:process.node,note:crm.process_node_leads0
+msgid "Very first contact with new prospect"
+msgstr "Primer contacto con nueva prospección"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:278
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
+#: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
+#: model:ir.actions.act_window,name:crm.crm_partner2opportunity
+#, python-format
+msgid "Create Opportunity"
+msgstr "Crear oportunidad"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: crm
+#: code:addons/crm/crm.py:378
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Escalate"
+msgstr "Escalado"
+
+#. module: crm
+#: model:ir.module.module,shortdesc:crm.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "Gestión de relaciones con clientes & proveedores"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Not Running"
+msgstr "No ejecutado"
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_reply_mail
+msgid "Reply to last Mail"
+msgstr "Responder al último e-mail"
+
+#. module: crm
+#: field:crm.lead,email:0
+msgid "E-Mail"
+msgstr "E-mail"
+
+#. module: crm
+#: field:crm.installer,wiki_sale_faq:0
+msgid "Sale FAQ"
+msgstr "FAQ de ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail_attachment
+msgid "crm.send.mail.attachment"
+msgstr "crm.enviar.mail.adjunto"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Included Answers :"
+msgstr "Respuestas incluidas:"
+
+#. module: crm
+#: help:crm.meeting,email_from:0
+#: help:crm.phonecall,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,name:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "State of Mind Computation"
+msgstr "Cálculo grado de satisfacción"
+
+#. module: crm
+#: help:crm.case.section,change_responsible:0
+msgid ""
+"Thick this box if you want that on escalation, the responsible of this sale "
+"team automatically becomes responsible of the lead/opportunity escaladed"
+msgstr ""
+"Marque esta opción si quiere que el responsable del equipo de ventas sea "
+"automáticamente responsable de la iniciativa/oportunidad, en caso de ser "
+"escalada."
+
+#. module: crm
+#: help:crm.installer,outlook:0
+#: help:crm.installer,thunderbird:0
+msgid ""
+"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 ""
+"Permite enlazar su e-mail a la gestión documental de OpenERP. Puede "
+"adjuntarlo a cualquier documento ya existente en OpenERP o crear uno de "
+"nuevo."
+
+#. module: crm
+#: view:crm.case.categ:0
+msgid "Case Category"
+msgstr "Categoría del caso"
+
+#. 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 ""
+"Grado de satisfacción por defecto para el período que precede el cálculo de "
+"'Intervalo máx.'. Este es el grado de satisfacción inicial por defecto si la "
+"empresa no tiene ningún evento."
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Error: El email no está bien formateado"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling Options"
+msgstr "Opciones de perfiles"
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "#Phone calls"
+msgstr "#Llamadas telefónicas"
+
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"La categoría de empresas que será añadida a las empresas que cumplan los "
+"criterios de segmentación después del cálculo."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication history"
+msgstr "Historial de comunicación"
+
+#. module: crm
+#: help:crm.phonecall,canal_id:0
+msgid ""
+"The channels represent the different communication                         "
+"modes available with the customer. With each commercial opportunity, you can "
+"indicate                         the canall which is this opportunity source."
+msgstr ""
+"Los canales representan los diferentes modos de comunicación posibles con el "
+"cliente. En cada oportunidad comercial, puede indicar el canal que ha sido "
+"el origen de esta oportunidad."
+
+#. module: crm
+#: code:addons/crm/crm_meeting.py:93
+#, python-format
+msgid "The meeting '%s' has been confirmed."
+msgstr "La reunión '%s' ha sido confirmada"
+
+#. module: crm
+#: field:crm.case.section,user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
+#, python-format
+msgid "A partner is already defined on this phonecall."
+msgstr "Una empresa ya esta definida para esta llamada."
+
+#. 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 ""
+"La dirección de correo electrónico usada como \"Responder a\" de todos los "
+"correos electrónicos enviados por OpenERP para los casos de este equipo de "
+"ventas."
+
+#. module: crm
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividad actual"
+
+#. module: crm
+#: help:crm.meeting,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
+
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: crm
+#: view:crm.segmentation.line:0
+msgid "Partner Segmentation Lines"
+msgstr "Líneas de segmentación de empresa"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm
+#: help:crm.installer,crm_caldav:0
+msgid ""
+"Helps you to synchronize the meetings with other calendar clients and "
+"mobiles."
+msgstr ""
+"Le permite sincronizar las reuniones con otros clientes de calendario y "
+"móviles."
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: crm
+#: help:crm.installer,crm_claim:0
+msgid ""
+"Manages the suppliers and customers claims, including your corrective or "
+"preventive actions."
+msgstr ""
+"Gestiona las reclamaciones de clientes y proveedores, incluyendo acciones "
+"correctivas o preventivas"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Form"
+msgstr "Formulario de iniciativas"
+
+#. module: crm
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Segmentación de empresa"
+
+#. module: crm
+#: field:crm.lead.report,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm
+#: help:crm.segmentation,name:0
+msgid "The name of the segmentation."
+msgstr "El nombre de la segmentación."
+
+#. module: crm
+#: field:crm.case.stage,probability:0
+#: field:crm.lead,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Generation"
+msgstr "Generación de iniciativas"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
+msgid "Statistics Dashboard"
+msgstr "Tablero de estadísticas"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
+#: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: selection:crm.lead.report,type:0
+#: field:crm.lead2opportunity,name:0
+#: field:crm.meeting,opportunity_id:0
+#: field:crm.phonecall,opportunity_id:0
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead7
+msgid "Television"
+msgstr "Televisión"
+
+#. module: crm
+#: field:crm.installer,crm_caldav:0
+msgid "Calendar Synchronizing"
+msgstr "Sincronización del calendario"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Stop Process"
+msgstr "Parar el proceso"
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Search Phonecalls"
+msgstr "Buscar llamadas"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr "Siguiente"
+
+#. module: crm
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr "Días por período"
+
+#. module: crm
+#: field:crm.meeting,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: crm
+#: field:base.action.rule,act_section_id:0
+msgid "Set Team to"
+msgstr "Establecer equipo a"
+
+#. module: crm
+#: view:calendar.attendee:0
+#: field:calendar.attendee,categ_id:0
+msgid "Event Type"
+msgstr "Tipo de evento"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_installer
+msgid "crm.installer"
+msgstr "crm.instalador"
+
+#. module: crm
+#: field:crm.segmentation,exclusif:0
+msgid "Exclusive"
+msgstr "Exclusivo"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:91
+#, python-format
+msgid "The opportunity '%s' has been won."
+msgstr "La oportunidad '%s' ha sido ganada"
+
+#. module: crm
+#: help:crm.meeting,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: crm
+#: model:ir.module.module,description:crm.module_meta_information
+msgid ""
+"The generic OpenERP Customer Relationship Management\n"
+"system enables a group of people to intelligently and efficiently manage\n"
+"leads, opportunities, meeting, phonecall etc.\n"
+"It manages key tasks such as communication, identification, prioritization,\n"
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and\n"
+"suppliers. It can automatically send reminders, escalate the request, "
+"trigger\n"
+"specific methods and lots of other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do "
+"anything\n"
+"special. They can just send email to the request tracker. OpenERP will take\n"
+"care of thanking them for their message, automatically routing it to the\n"
+"appropriate staff, and make sure all future correspondence gets to the "
+"right\n"
+"place.\n"
+"\n"
+"The CRM module has a email gateway for the synchronisation interface\n"
+"between mails and OpenERP. \n"
+"Create dashboard for CRM that includes:\n"
+"    * My Leads (list)\n"
+"    * Leads by Stage (graph)\n"
+"    * My Meetings (list)\n"
+"    * Sales Pipeline by Stage (graph)\n"
+"    * My Cases (list)\n"
+"    * Jobs Tracking (graph)\n"
+msgstr ""
+"El sistema genérico de gestión de relaciones con el cliente de OpenERP\n"
+"permite a un grupo de gente manejar de forma inteligente y eficiente\n"
+"iniciativas, oportunidades, reuniones, llamadas, etc.\n"
+"Maneja tareas clave como la comunicación, identificación, priorización,\n"
+"asignación, resolución y notificación.\n"
+"\n"
+"OpenERP se asegura de que todos los casos son seguidos por los usuarios, "
+"clientes y\n"
+"proveedores. Puede enviar automáticamente recordatorios, escalar la "
+"petición, disparar\n"
+"métodos específicos y muchas otras acciones basadas en las reglas de su "
+"empresa.\n"
+"\n"
+"Lo mejor de este sistema es que los usuarios no necesitan hacer nada \n"
+"especial. Tan sólo tienen que enviar un correo electrónico al gestor de "
+"seguimientos. \n"
+"OpenERP le agradecerá su mensaje, enrutándolo automáticamente a la \n"
+"persona adecuada, asegurándose de que toda la correspondencia futura llegue "
+"al\n"
+"lugar correcto.\n"
+"\n"
+"El módulo CRM tiene una pasarela de correo para el interfaz de "
+"sincronización\n"
+"entre correos electrónicos y OpenERP. \n"
+"Cree tableros para el CRM que incluyan:\n"
+"    *Mis iniciativas(lista)\n"
+"    *Iniciativas por etapa (gráfico)\n"
+"    *Mis reuniones (lista)\n"
+"    *Proceso de ventas por etapa (gráfico)\n"
+"    *Mis casos (lista)\n"
+"    *Seguimiento de trabajos (gráfico)\n"
+
+#. module: crm
+#: field:crm.lead.report,create_date:0
+#: field:crm.phonecall.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: crm
+#: field:crm.lead,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Sales Purchase"
+msgstr "Compra Ventas"
+
+#. module: crm
+#: view:crm.case.stage:0
+#: field:crm.case.stage,requirements:0
+msgid "Requirements"
+msgstr "Requerimientos"
+
+#. module: crm
+#: help:crm.meeting,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
+"de calendario recurrente."
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "Convert To Opportunity "
+msgstr "Convertir a oportunidad "
+
+#. module: crm
+#: help:crm.case.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of case stages."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra un lista de etapas de casos."
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.merge.opportunity,opportunity_ids:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
+#: model:ir.ui.menu,name:crm.menu_crm_case_opp
+#: model:process.node,name:crm.process_node_opportunities0
+msgid "Opportunities"
+msgstr "Oportunidades"
+
+#. module: crm
+#: field:crm.segmentation,categ_id:0
+msgid "Partner Category"
+msgstr "Categoría de empresa"
+
+#. module: crm
+#: view:crm.add.note:0
+#: model:ir.actions.act_window,name:crm.action_crm_add_note
+msgid "Add Note"
+msgstr "Añadir nota"
+
+#. module: crm
+#: field:crm.lead,is_supplier_add:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: crm
+#: help:crm.send.mail,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "\"Responder a\" del equipo de ventas definido en este caso"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Won"
+msgstr "Marcar ganado"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Purchase Amount"
+msgstr "Importe de compra"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Lost"
+msgstr "Marcar perdido"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:230
+#, python-format
+msgid "The opportunity '%s' has been closed."
+msgstr "La oportunidad '%s' ha sido cerrada"
+
+#. module: crm
+#: field:crm.lead,day_open:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Show time as"
+msgstr "Mostrar hora como"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:264
+#: view:crm.phonecall2partner:0
+#, python-format
+msgid "Create Partner"
+msgstr "Crear empresa"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "<"
+msgstr "<"
+
+#. module: crm
+#: field:crm.lead,mobile:0
+#: field:crm.phonecall,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: crm
+#: field:crm.meeting,end_type:0
+msgid "Way to end reccurency"
+msgstr "Forma de terminar recurrencia"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+"No existen más oportunidades 'Abiertas' o 'Pendientes' para la empresa '%s'."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Next Stage"
+msgstr "Siguiente etapa"
+
+#. module: crm
+#: view:board.board:0
+msgid "My Meetings"
+msgstr "Mis reuniones"
+
+#. module: crm
+#: field:crm.lead,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm
+#: field:crm.lead,optin:0
+msgid "Opt-In"
+msgstr "Acepta recibir emails"
+
+#. module: crm
+#: code:addons/crm/crm_opportunity.py:208
+#: code:addons/crm/crm_phonecall.py:185
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
+#: view:crm.meeting:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_meeting_sale
+#: view:res.partner:0
+#: field:res.partner,meeting_ids:0
+#, python-format
+msgid "Meetings"
+msgstr "Reuniones"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day where repeat the meeting"
+msgstr "Eligir día en el que repetir la cita"
+
+#. 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 "Acción siguiente"
+
+#. module: crm
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. module: crm
+#: field:crm.meeting,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. 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 ""
+"Si el campo activo se establece en verdadero, se omitirá la alarma del "
+"evento, sin embargo no se eliminará."
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
+msgstr ""
+"Las llamadas telefónicas cerradas/canceladas no podrían ser convertidas en "
+"oportunidades"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentaciones de empresa"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,user_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+#: view:res.partner:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: crm
+#: view:crm.lead2opportunity.action:0
+#: view:res.partner:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Stage:"
+msgstr "Etapa:"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead5
+#: model:crm.case.stage,name:crm.stage_opportunity5
+#: view:crm.lead:0
+msgid "Won"
+msgstr "Ganado"
+
+#. module: crm
+#: field:crm.lead.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite sobrepasada"
+
+#. module: crm
+#: model:crm.case.section,name:crm.section_sales_department
+msgid "Sales Department"
+msgstr "Departamento de ventas"
+
+#. module: crm
+#: field:crm.send.mail,html:0
+msgid "HTML formatting?"
+msgstr "Formato HTML?"
+
+#. module: crm
+#: field:crm.case.stage,type:0
+#: field:crm.lead,type:0
+#: field:crm.lead.report,type:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Compute Segmentation"
+msgstr "Calcular la segmentación"
+
+#. 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 "Muy bajo"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.send.mail:0
+#: field:crm.send.mail.attachment,binary:0
+msgid "Attachment"
+msgstr "Adjunto"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,create_date:0
+#: field:crm.lead.report,creation_date:0
+#: field:crm.meeting,create_date:0
+#: field:crm.phonecall,create_date:0
+#: field:crm.phonecall.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor5
+msgid "Need a Website Design"
+msgstr "Necesita un diseño de sitio web"
+
+#. module: crm
+#: field:crm.meeting,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: field:crm.send.mail,subject:0
+#: view:res.partner:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: crm
+#: field:crm.meeting,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:300
+#: view:crm.case.stage:0
+#: view:crm.lead:0
+#: field:crm.lead,stage_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,stage_id:0
+#, python-format
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "History Information"
+msgstr "Histórico información"
+
+#. module: crm
+#: field:base.action.rule,act_mail_to_partner:0
+msgid "Mail to Partner"
+msgstr "Mail a la empresa"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mailings"
+msgstr "Mailings"
+
+#. module: crm
+#: field:crm.meeting,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Repeat"
+msgstr "Repetir"
+
+#. module: crm
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Permite que el evento se repita en ese intervalo"
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition Case Fields"
+msgstr "Campos de condiciones de casos"
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,stage_ids:0
+#: view:crm.case.stage:0
+#: model:ir.actions.act_window,name:crm.crm_case_stage_act
+#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.actions.act_window,name:crm.crm_opportunity_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm
+#: field:crm.lead,planned_revenue:0
+#: field:crm.lead2opportunity,planned_revenue:0
+#: field:crm.partner2opportunity,planned_revenue:0
+#: field:crm.phonecall2opportunity,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better define the type of calls "
+"tracked in the system."
+msgstr ""
+"Crear categorías específicas de llamada telefónica para definir mejor el "
+"tipo de llamadas en el sistema de seguimiento."
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: crm
+#: field:crm.segmentation,partner_id:0
+msgid "Max Partner ID processed"
+msgstr "Máx ID de empresa procesado"
+
+#. 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 "Análisis de llamadas"
+
+#. module: crm
+#: field:crm.lead.report,opening_date:0
+#: field:crm.phonecall.report,opening_date:0
+msgid "Opening Date"
+msgstr "Fecha de apertura"
+
+#. module: crm
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr "Duración en minutos"
+
+#. module: crm
+#: help:crm.installer,crm_helpdesk:0
+msgid "Manages a Helpdesk service."
+msgstr "Gestiona un servicio de soporte."
+
+#. module: crm
+#: field:crm.partner2opportunity,name:0
+msgid "Opportunity Name"
+msgstr "Nombre oportunidad"
+
+#. 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 ""
+"Si el campo activo se marca, permite ocultar el equipo de ventas sin "
+"eliminarlo."
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: crm
+#: field:crm.meeting,edit_all:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: crm
+#: field:crm.meeting,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.iniciativa"
+
+#. module: crm
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr "Fecha escritura"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "End of recurrency"
+msgstr "Fin de recurrencia"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#. 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 ""
+"Márquela si quiere utilizar esta pestaña como parte de la regla de "
+"segmentación. Si no se marca, los criterios que contenga serán ignorados"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
+#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+#: view:res.partner:0
+msgid "Create a Partner"
+msgstr "Crear una empresa"
+
+#. module: crm
+#: field:crm.segmentation,state:0
+msgid "Execution Status"
+msgstr "Estado ejecución"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: crm
+#: field:crm.lead,day_close:0
+msgid "Days to Close"
+msgstr "Días para el cierre"
+
+#. module: crm
+#: field:crm.add.note,attachment_ids:0
+#: field:crm.case.section,complete_name:0
+#: field:crm.send.mail,attachment_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: crm
+#: field:crm.lead,id:0
+#: field:crm.meeting,id:0
+#: field:crm.phonecall,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner2opportunity
+msgid "Partner To Opportunity"
+msgstr "Empresa a oportunidad"
+
+#. module: crm
+#: view:crm.meeting:0
+#: 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 "Fecha"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+#: view:crm.meeting:0
+#: view:crm.phonecall.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm
+#: field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Summary"
+msgstr "Resumen oportunidad"
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr "Oportunidades por categorías"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr "Elija el día del mes en que se repetirá la cita."
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Description"
+msgstr "Descripción de segmentación"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+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 ""
+"Cree categorías de empresa específicas para gestionar mejor sus "
+"interacciones con ellas. La herramienta de segmentación es capaz de asignar "
+"categorías a empresas de acuerdo a los criterios que establezca."
+
+#. module: crm
+#: field:crm.case.section,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: crm
+#: field:crm.case.section,child_ids:0
+msgid "Child Teams"
+msgstr "Equipos hijos"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,state:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,state:0
+#: view:crm.meeting:0
+#: field:crm.meeting,state:0
+#: field:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm
+#: field:crm.meeting,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm
+#: code:addons/crm/crm.py:392
+#: view:crm.lead:0
+#: view:crm.lead2opportunity:0
+#: view:crm.lead2opportunity.action:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2partner:0
+#: view:res.partner:0
+#, python-format
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm
+#: model:ir.model,name:crm.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge two Opportunities"
+msgstr "Fusionar dos oportunidades"
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Fix amout of times"
+msgstr "Cantidad fija de veces"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm
+#: field:crm.meeting,exrule:0
+msgid "Exception Rule"
+msgstr "Exception de regla"
+
+#. 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 ""
+"Verifica esto si tu quieres enviar la norma en un correo electronico a el "
+"socio"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
+msgid "Phonecall Categories"
+msgstr "Categorías de llamadas"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invite People"
+msgstr "Invitar personas"
+
+#. module: crm
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr "¡Error! No puede crear equipos de ventas recursivos."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr "Buscar reuniones"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Sale Amount"
+msgstr "Importe de venta"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Unable to send mail. Please check SMTP is configured properly."
+msgstr ""
+"Imposible enviar el correo electrónico. Verifique que la configuración SMTP "
+"sea correcta."
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "="
+msgstr "="
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr "No confirmado"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+"El análisis de oportunidades le da acceso instantáneo a sus oportunidades "
+"con información como el ingreso previsto, coste planeado, fechas límite "
+"incumplidas o el número de interacciones por oportunidad. Este informe lo "
+"utiliza principalmente el responsable de ventas para hacer una revisión "
+"periódica del proceso de ventas con los equipos."
+
+#. module: crm
+#: field:crm.case.categ,name:0
+#: field:crm.installer,name:0
+#: field:crm.lead,name:0
+#: field:crm.segmentation,name:0
+#: field:crm.send.mail.attachment,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: crm
+#: field:crm.meeting,alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarma"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+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 ""
+"Agregar etapas específicas de iniciativas y oportunidades para organizar "
+"mejor su flujo de ventas. Estas etapas permitirán un fácil seguimiento de "
+"iniciativas u oportunidades en relación al ciclo de ventas."
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. module: crm
+#: field:crm.lead,birthdate:0
+msgid "Birthdate"
+msgstr "Fecha de nacimiento"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "The"
+msgstr "El"
+
+#. module: crm
+#: field:crm.send.mail.attachment,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. module: crm
+#: help:crm.lead,section_id:0
+msgid ""
+"Sales team to which this case belongs to. Defines responsible user and e-"
+"mail address for the mail gateway."
+msgstr ""
+"El equipo de ventas al que pertenece este caso. Define el usuario "
+"responsable y la dirección de correo electrónico para la pasarela de correo."
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Creation"
+msgstr "Creación"
+
+#. 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 "Alto"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_partner0
+msgid "Convert to prospect to business partner"
+msgstr "Convertir prospección a empresa"
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "_Convert"
+msgstr "_Convertir"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+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 ""
+"Con invitaciones a reuniones puede crear y gesionar las invitaciones  de "
+"reuniones enviadas / por enviar a sus compañeros de trabajo / empresas. La "
+"invitación no debe ser únicamente para usuarios de OpenERP, puede ser "
+"igualmente para terceros externos, como un cliente."
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fifth"
+msgstr "Quinto"
+
+#. module: crm
+#: view:crm.phonecall2phonecall:0
+msgid "_Schedule"
+msgstr "_Calendario"
+
+#. module: crm
+#: field:crm.lead.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Tiempo restante para el cierre"
+
+#. module: crm
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr "Mier"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor6
+msgid "Potential Reseller"
+msgstr "Distribuidor potencial"
+
+#. module: crm
+#: field:crm.lead.report,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. 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 "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm
+#: help:crm.lead,partner_id:0
+msgid "Optional linked partner, usually after conversion of the lead"
+msgstr ""
+"Empresa relacionada opcional, normalmente después de la conversión de la "
+"iniciativa"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation details"
+msgstr "Detalles de la invitación"
+
+#. module: crm
+#: field:crm.case.section,parent_id:0
+msgid "Parent Team"
+msgstr "Equipo padre"
+
+#. module: crm
+#: field:crm.lead,date_action:0
+msgid "Next Action Date"
+msgstr "Fecha  de la próxima acción"
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: crm
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr "Código postal"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:213
+#, python-format
+msgid "The case '%s' has been opened."
+msgstr "El caso '%s' ha sido abierto"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone1
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
+msgid "Inbound"
+msgstr "Entrante"
+
+#. module: crm
+#: help:crm.case.stage,probability:0
+msgid ""
+"This percentage depicts the default/average probability of the Case for this "
+"stage to be a success"
+msgstr ""
+"Este porcentaje representa la probabilidad por defecto / media para que los "
+"casos de esta etapa sean un éxito."
+
+#. module: crm
+#: view:crm.phonecall.report:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
+msgid "Phone calls"
+msgstr "Llamadas telefónicas"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication  History"
+msgstr "Historial de comunicaciones"
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#. module: crm
+#: field:crm.case.section,allow_unlink:0
+msgid "Allow Delete"
+msgstr "Permitir eliminar"
+
+#. module: crm
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. 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 "Muy alto"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
+"call you get will appear on the partner form to trace every contact you have "
+"with a partner. From the phone call form, you can trigger a request for "
+"another call, a meeting or an opportunity."
+msgstr ""
+"La herramienta de llamadas entrantes le permite seguir el rastro de sus "
+"llamadas entrantes en tiempo real. Cada llamada que reciba, aparecerá en el "
+"formulario de la empresa para dejar el rastro de cada contacto que tiene en "
+"una empresa. Desde el formulario de llamada telefónica, puede lanzar una "
+"solicitud para otra llamada, una reunión o una oportunidad"
+
+#. module: crm
+#: help:crm.meeting,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Reunión periódica"
+
+#. module: crm
+#: view:crm.case.section:0
+#: view:crm.lead:0
+#: field:crm.lead,description:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Days"
+msgstr "Días"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+msgid "Opportunity by Categories"
+msgstr "Oportunidades por categorías"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,partner_name:0
+msgid "Customer Name"
+msgstr "Nombre del cliente"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface."
+msgstr ""
+"El calendario de reuniones es compartido entre los equipos de ventas e "
+"integrado por completo con otras aplicaciones como las vacaciones de "
+"empleados o las oportunidades de negocio. Puede sincronizar reuniones con su "
+"teléfono móvil utilizando el interfaz caldav."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2opportunity
+msgid "Phonecall To Opportunity"
+msgstr "Llamada telefónica a oportunidad"
+
+#. module: crm
+#: field:crm.case.section,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Select stages for this Sales Team"
+msgstr "Seleccionar etapas para este equipo de ventas"
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency Option"
+msgstr "Opción de recurrencia"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadpartner0
+msgid "Prospect is converting to business partner"
+msgstr "El prospecto se convierte a partner"
+
+#. module: crm
+#: view:crm.lead2opportunity:0
+#: view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
+msgid "Convert To Opportunity"
+msgstr "Convertir en oportunidad"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Held"
+msgstr "Realizada"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. 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 "Fusionar oportunidades"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead5
+msgid "Google Adwords"
+msgstr "Google Adwords"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall
+msgid "crm.phonecall"
+msgstr "crm.llamadateléfono"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead3
+msgid "Mail Campaign 2"
+msgstr "Campaña mail 2"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm
+#: code:addons/crm/crm.py:492
+#, python-format
+msgid "Send"
+msgstr "Enviar"
+
+#. 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 "Prioridad"
+
+#. module: crm
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Utiliza las reglas de compra ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
+msgid "Lead To Opportunity Partner"
+msgstr "Iniciativa a Oportunidad"
+
+#. module: crm
+#: field:crm.meeting,location:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: crm
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr "Programar una reunión normal o telefónica"
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. 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 ""
+"Cree diferentes categorías de reuniones para organizarlas y clasificarlas "
+"mejor."
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_segmentation_line
+msgid "Segmentation line"
+msgstr "Línea de segmentación"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Planned Date"
+msgstr "Fecha prevista"
+
+#. module: crm
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Expected Revenues"
+msgstr "Ingresos esperados"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead6
+msgid "Google Adwords 2"
+msgstr "Google Adwords 2"
+
+#. module: crm
+#: help:crm.lead,type:0
+#: help:crm.lead.report,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "Are you sure you want to create a partner based on this Phonecall ?"
+msgstr ""
+"¿Está seguro que quiere crear una empresa basada en esta llamada telefónica?"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Define a Sales Team to organize your different salesmen or sales departments "
+"into separate teams. Each team will work in its own list of opportunities, "
+"sales orders, etc. Each user can set a default team in his user preferences. "
+"The opportunities and sales order displayed, will automatically be filtered "
+"according to his team."
+msgstr ""
+"Defina un equipo de ventas para organizar a sus diferentes vendedores o "
+"departamentos de ventas en equipos separados. Cada equipo trabajará en su "
+"propia lista de oportunidades, pedidos de venta, etc. Cada usuario puede "
+"configurar un equipo predeterminado en sus preferencias de usuario. Las "
+"oportunidades y pedidos de venta mostrados se filtrarán automáticamente de "
+"acuerdo a su equipo."
+
+#. module: crm
+#: help:crm.meeting,count:0
+msgid "Repeat x times"
+msgstr "Repetir x veces"
+
+#. 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 "Equipos de ventas"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2partner
+msgid "Lead to Partner"
+msgstr "Inicaitiva a cliente"
+
+#. 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 "Segmentación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Team"
+msgstr "Equipo"
+
+#. module: crm
+#: field:crm.installer,outlook:0
+msgid "MS-Outlook"
+msgstr "MS-Outlook"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: view:res.partner:0
+msgid "Not Held"
+msgstr "Pendiente"
+
+#. module: crm
+#: field:crm.lead.report,probability:0
+msgid "Probability"
+msgstr "Probabilidad"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,month:0
+#: field:crm.meeting,month_list:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
+#: model:process.node,name:crm.process_node_leads0
+msgid "Leads"
+msgstr "Iniciativas"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"Leads allow you to manage and keep track of all initial contacts with a "
+"prospect or partner showing interest in your products or services. A lead is "
+"usually the first step in your sales cycle. Once qualified, a lead may be "
+"converted into a business opportunity, while creating the related partner "
+"for further detailed tracking of any linked activities. You can import a "
+"database of prospects, keep track of your business cards or integrate your "
+"website's contact form with the OpenERP Leads. Leads can be connected to the "
+"email gateway: new emails may create leads, each of them automatically gets "
+"the history of the conversation with the prospect."
+msgstr ""
+"Las iniciativas le permiten gestionar y realizar un seguimiento de todos los "
+"contactos iniciales con un cliente potencial o socio que muestre interés en "
+"sus productos o servicios. Una iniciativa es generalmente el primer paso en "
+"su ciclo de ventas. Una vez identificada, una iniciativa se puede convertir "
+"en una oportunidad de negocio, creándose el socio correspondiente para el "
+"seguimiento detallado de cualquier actividad relacionada. Usted puede "
+"importar una base de datos de posibles clientes, realizar el seguimiento de "
+"sus tarjetas de visita o integrar el formulario de contacto de su sitio web "
+"con las iniciativas de OpenERP. Las iniciativas pueden ser conectadas a una "
+"pasarela de correo electrónico: los nuevos correos crearán nuevas "
+"iniciativas y cada una de ellas obtendrá automáticamente el historial de la "
+"conversación con el cliente potencial."
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Create a new partner"
+msgstr "Crear una nueva empresa"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: crm
+#: selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+msgid "Todo"
+msgstr "Por hacer"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Decline"
+msgstr "Rechazar"
+
+#. module: crm
+#: help:crm.lead,optin:0
+msgid "If opt-in is checked, this contact has accepted to receive emails."
+msgstr ""
+"Si opt-in está marcado, este contacto ha aceptado recibir correos "
+"electrónicos."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reset to Unconfirmed"
+msgstr "Restablecer a no confirmado"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:40
+#: view:crm.add.note:0
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. 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 "Bajo"
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: field:crm.lead,date_closed:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: field:crm.meeting,date_closed:0
+#: selection:crm.merge.opportunity,state:0
+#: field:crm.phonecall,date_closed:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Plug-In"
+msgstr "Conector"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet2
+msgid "Internal Meeting"
+msgstr "Reunión interna"
+
+#. module: crm
+#: code:addons/crm/crm.py:411
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet1
+msgid "Customer Meeting"
+msgstr "Reunión de cliente"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,email_cc:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone
+#: view:res.partner:0
+msgid "Phone Calls"
+msgstr "Llamadas telefónicas"
+
+#. 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 "Número de días para abrir el caso"
+
+#. module: crm
+#: field:crm.lead,phone:0
+#: field:crm.phonecall,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm
+#: field:crm.case.section,active:0
+#: field:crm.lead,active:0
+#: view:crm.lead.report:0
+#: field:crm.meeting,active:0
+#: field:crm.phonecall,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:306
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr "La fase de la oportunidad '%s' ha cambiado a '%s'."
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:282
+#, python-format
+msgid "Changed Stage to: %s"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Mandatory Expression"
+msgstr "Expresión obligatoria"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid ">"
+msgstr ">"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Uncertain"
+msgstr "Incierto"
+
+#. module: crm
+#: field:crm.send.mail,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: crm
+#: view:crm.send.mail:0
+#: model:ir.actions.act_window,name:crm.action_crm_send_mail
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#. module: crm
+#: selection:crm.meeting,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: crm
+#: help:crm.installer,wiki_sale_faq:0
+msgid ""
+"Helps you manage wiki pages for Frequently Asked Questions on Sales "
+"Application."
+msgstr ""
+"Le ayuda a organizar páginas wiki para preguntas frecuentes sobre la "
+"aplicación de ventas"
+
+#. module: crm
+#: help:crm.installer,crm_fundraising:0
+msgid "This may help associations in their fundraising process and tracking."
+msgstr ""
+"Puede ayudar a las asociaciones en su proceso de obtención de fondos y "
+"seguimiento."
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2partner,action:0
+#: field:crm.phonecall2partner,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: crm
+#: field:crm.installer,crm_claim:0
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_decrease:0
+msgid "Decrease (0>1)"
+msgstr "Disminuir (0>1)"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.lead:0
+#: view:crm.send.mail:0
+msgid "Attachments"
+msgstr "Datos adjuntos"
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Weekly"
+msgstr "Semanal"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Can not send mail!"
+msgstr "¡No se pudo enviar el correo!"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor8
+#: view:crm.meeting:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: crm
+#: view:crm.meeting:0
+#: selection:crm.meeting,state:0
+#: selection:crm.phonecall,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: crm
+#: help:crm.meeting,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_max:0
+msgid "Max Interval"
+msgstr "Intervalo máx"
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "_Schedule Call"
+msgstr "_Programar llamada"
+
+#. module: crm
+#: code:addons/crm/crm.py:326
+#: selection:crm.add.note,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: view:crm.phonecall:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#: view:res.partner:0
+#, python-format
+msgid "Open"
+msgstr "Abierto"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: crm
+#: field:crm.lead,city:0
+msgid "City"
+msgstr "Ciudad"
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Busy"
+msgstr "Ocupado"
+
+#. module: crm
+#: field:crm.meeting,interval:0
+msgid "Repeat every"
+msgstr "Repetir cada"
+
+#. module: crm
+#: field:crm.installer,crm_helpdesk:0
+msgid "Helpdesk"
+msgstr "Asistencia/Ayuda"
+
+#. module: crm
+#: field:crm.meeting,recurrency:0
+msgid "Recurrent"
+msgstr "Recurrente"
+
+#. module: crm
+#: code:addons/crm/crm.py:397
+#, python-format
+msgid "The case '%s' has been cancelled."
+msgstr "El caso '%s' ha sido cancelado"
+
+#. module: crm
+#: field:crm.installer,sale_crm:0
+msgid "Opportunity to Quotation"
+msgstr "Oportunidad a presupuesto"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_send_mail
+msgid "Send new email"
+msgstr "Enviar nuevo email"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.act_my_oppor
+msgid "My Open Opportunities"
+msgstr "Mis oportunidades abiertas"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
+msgid "CRM - Statistics Dashboard"
+msgstr "CRM - Tablero de estadísticas"
+
+#. module: crm
+#: help:crm.meeting,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: crm
+#: field:crm.lead,job_id:0
+msgid "Main Job"
+msgstr "Trabajo principal"
+
+#. module: crm
+#: field:base.action.rule,trg_max_history:0
+msgid "Maximum Communication History"
+msgstr "Máximo historial de comunicaciones"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+msgid "Are you sure you want to create a partner based on this lead ?"
+msgstr "¿Está seguro que quiere crear una empresa basada en esta iniciativa?"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,categ_id:0
+msgid "Meeting Type"
+msgstr "Tipo de reunión"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
+#, python-format
+msgid "Merge with Existing Opportunity"
+msgstr "Fusinar con oportunidad existente"
+
+#. module: crm
+#: help:crm.lead,state:0
+#: help:crm.phonecall,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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces en estado se establece a "
+"'Pendiente'."
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: crm
+#: help:crm.segmentation,som_interval_max:0
+msgid ""
+"The computation is made on all events that occured during this interval, the "
+"past X periods."
+msgstr ""
+"El cálculo se realiza en todos los eventos que ocurran durante este "
+"intervalo, los X períodos anteriores."
+
+#. module: crm
+#: view:board.board:0
+msgid "My Win/Lost Ratio for the Last Year"
+msgstr "Mi coeficiente ganado/perdido del año anterior"
+
+#. module: crm
+#: field:crm.installer,thunderbird:0
+msgid "Thunderbird"
+msgstr "Thunderbird"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# of Emails"
+msgstr "Nº de e-mails"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+msgstr "Buscar iniciativas"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,delay_open:0
+msgid "Delay to open"
+msgstr "Retraso de apertura"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency period"
+msgstr "Periodo de recurrencia"
+
+#. module: crm
+#: field:crm.meeting,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Referrer"
+msgstr "Referenciado por"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity
+msgid "Lead To Opportunity"
+msgstr "Iniciativa a opportunidad"
+
+#. module: crm
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr "Información asistencia"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Test"
+msgstr "Prueba de segmentación"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Continue Process"
+msgstr "Continuar el proceso"
+
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure Your CRM Application"
+msgstr "Configure su aplicación CRM"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2partner
+msgid "Phonecall to Partner"
+msgstr "Llamada telefónica a empresa"
+
+#. module: crm
+#: help:crm.lead,partner_name:0
+msgid ""
+"The name of the future partner that will be created while converting the "
+"into opportunity"
+msgstr ""
+"El nombre del futuro cliente que se creará cuando se convierta en "
+"oportunidad."
+
+#. module: crm
+#: field:crm.opportunity2phonecall,user_id:0
+#: field:crm.phonecall2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: crm
+#: field:crm.add.note,state:0
+#: field:crm.send.mail,state:0
+msgid "Set New State To"
+msgstr "Establecer nuevo estado a"
+
+#. 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 "Última acción"
+
+#. module: crm
+#: field:crm.meeting,duration:0
+#: field:crm.phonecall,duration:0
+#: field:crm.phonecall.report,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: crm
+#: field:crm.send.mail,reply_to:0
+msgid "Reply To"
+msgstr "Responder a"
+
+#. module: crm
+#: view:board.board:0
+#: model:ir.actions.act_window,name:crm.open_board_crm
+#: model:ir.ui.menu,name:crm.menu_board_crm
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_partner.py:56
+#, python-format
+msgid "A partner is already defined on this lead."
+msgstr "Una empresa ya ha sido definida en esta iniciativa."
+
+#. module: crm
+#: field:crm.lead.report,nbr:0
+#: field:crm.phonecall.report,nbr:0
+msgid "# of Cases"
+msgstr "# de casos"
+
+#. module: crm
+#: help:crm.meeting,section_id:0
+#: help:crm.phonecall,section_id:0
+msgid "Sales team to which Case belongs to."
+msgstr "Equipo de ventas al cual pertence el caso"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: crm
+#: selection:crm.add.note,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.send.mail,state:0
+msgid "Unchanged"
+msgstr "Sin cambios"
+
+#. 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 "Segmentación de empresas"
+
+#. module: crm
+#: field:crm.lead,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"With opportunities you can manage and keep track of your sales pipeline by "
+"creating specific customer- or prospect-related sales documents to follow up "
+"potential sales. Information such as expected revenue, opportunity stage, "
+"expected closing date, communication history and much more can be stored. "
+"Opportunities can be connected to the email gateway: new emails may create "
+"opportunities, each of them automatically gets the history of the "
+"conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+"Con las oportunidades puede gestionar y guardar el registro de su canal de "
+"ventas creando documentos específicos de venta por cliente - o potencial "
+"cliente - para el seguimiento de sus ventas potenciales. La información "
+"sobre ingresos esperados, etapa de la oportunidad, fecha estimada de cierre, "
+"histórico de las comunicaciones y muchos otros datos puede ser registrada. "
+"Las oportunidades pueden ser conectadas a la pasarela de correo electrónico: "
+"nuevos emails pueden crear oportunidades, y cada uno de ellos obtiene "
+"automáticamente el historial de la conversación con el cliente."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Assignment"
+msgstr "Asignación"
+
+#. 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 "Compañía"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: crm
+#: field:crm.meeting,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: crm
+#: field:crm.segmentation.line,operator:0
+msgid "Mandatory / Optional"
+msgstr "Obligatorio / Opcional"
+
+#. 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 "Invitaciones a reunión"
+
+#. module: crm
+#: field:crm.case.categ,object_id:0
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "E-mail address of the contact"
+msgstr "e-mail del contacto"
+
+#. module: crm
+#: field:crm.lead,referred:0
+msgid "Referred By"
+msgstr "Referenciado por"
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.model,name:crm.model_crm_add_note
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:304
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr "La etapa de la iniciativa '%s' ha sido cambiada por '%s'"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Last"
+msgstr "Último"
+
+#. module: crm
+#: field:crm.lead,message_ids:0
+#: field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm
+#: help:crm.case.stage,on_change:0
+msgid "Change Probability on next and previous stages."
+msgstr "Cambiar probabilidad para las etapas siguientes y anteriores."
+
+#. module: crm
+#: code:addons/crm/crm.py:455
+#: code:addons/crm/crm.py:457
+#: code:addons/crm/crm_action_rule.py:66
+#: code:addons/crm/wizard/crm_send_email.py:141
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: crm
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
+msgstr "Resumen de la llamada"
+
+#. 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.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm
+#: field:crm.add.note,body:0
+msgid "Note Body"
+msgstr "Contenido de la nota"
+
+#. module: crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr "Mis ingresos previstos por etapa"
+
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Links"
+msgstr "Enlaces"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's activities to better "
+"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 ""
+"Crear categorías específicas que se adapten a las actividades de su compañía "
+"para clasificar y analizar mejor sus iniciativas y oportunidades. Estas "
+"categorías podrían, por ejemplo, reflejar la estructura de sus productos o "
+"de los distintos tipos de ventas que realice."
+
+#. 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 ""
+"Si la empresa no ha comprado durante un período, disminuir el grado de "
+"satisfacción por este factor. Es una multiplicación."
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+"Desde este informe, puede analizar el rendimiento de su equipo de ventas "
+"basándose en sus llamadas telefónicas. Puede agrupar o filtrar la "
+"información de acuerdo a varios criterios y profundizar en la información "
+"añadiendo más grupos al informe."
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Mailgateway"
+msgstr "Pasarela de correo"
+
+#. module: crm
+#: help:crm.lead,user_id:0
+msgid "By Default Salesman is Administrator when create New User"
+msgstr ""
+"Por defecto el vendedor es administrador cuando se crea un nuevo usuario"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Mails"
+msgstr "Nº de correos"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: crm
+#: field:crm.phonecall,name:0
+#: view:res.partner:0
+msgid "Call Summary"
+msgstr "Resumen de llamadas"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Llamada telefónica a llamada telefónica"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule/Log Call"
+msgstr "Planificar/Registrar llamada"
+
+#. module: crm
+#: field:crm.installer,fetchmail:0
+msgid "Fetch Emails"
+msgstr "Buscar emails"
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: crm
+#: help:crm.send.mail,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+"Estas direcciones recibirán una copia de este correo electrónico. Para "
+"modificar la lista CC permanente, edite el campo CC global de este caso."
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: crm
+#: field:crm.meeting,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: crm
+#: field:crm.phonecall.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Total of Planned Revenue"
+msgstr "Total ingresos previstos"
+
+#. module: crm
+#: code:addons/crm/crm.py:375
+#, python-format
+msgid ""
+"You can not escalate, You are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"No puede escalar, ya está en el nivel más alto en su categoría de equipo de "
+"ventas."
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Optional Expression"
+msgstr "Expresión opcional"
+
+#. module: crm
+#: selection:crm.meeting,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: crm
+#: field:crm.lead2opportunity,probability:0
+msgid "Success Rate (%)"
+msgstr "Tasa de éxito (%)"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead1
+#: model:crm.case.stage,name:crm.stage_opportunity1
+msgid "New"
+msgstr "Nuevo"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Mail TO"
+msgstr "Enviar correo a"
+
+#. 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 "Email"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,channel_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,channel_id:0
+#: field:crm.phonecall,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
+msgid "Schedule Call"
+msgstr "Planificar llamada"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+msgstr ""
+"Las iniciativas cerradas/canceladas no podrían ser convertidas en "
+"oportunidades"
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling"
+msgstr "Perfiles"
+
+#. module: crm
+#: help:crm.segmentation,exclusif:0
+msgid ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions.                        \n"
+"If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
+msgstr ""
+"Marque esta opción si la categoría está limitada a empresas que coincidan "
+"con los criterios de segmentación.                        \n"
+"Si está marcada, elimina la categoría de aquellas empresas que no coincidan "
+"con los criterios de segmentación."
+
+#. module: crm
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: crm
+#: help:crm.meeting,date_deadline:0
+msgid ""
+"Deadline Date is automatically                         computed from Start "
+"Date + Duration"
+msgstr ""
+"La fecha límite se calcula automáticamente a partir de la fecha inicial + "
+"duración."
+
+#. module: crm
+#: field:crm.lead,state_id:0
+msgid "Fed. State"
+msgstr "Provincia"
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadopportunity0
+msgid "Creating business opportunities from Leads"
+msgstr "Creando oportunidades de negocio desde iniciativas"
+
+#. module: crm
+#: help:crm.send.mail,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor4
+msgid "Need Information"
+msgstr "Necesita información"
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadopportunity0
+msgid "Prospect Opportunity"
+msgstr "Oportunidad de prospección"
+
+#. module: crm
+#: view:crm.installer:0
+#: model:ir.actions.act_window,name:crm.action_crm_installer
+msgid "CRM Application Configuration"
+msgstr "Configuración de la aplicación CRM"
+
+#. module: crm
+#: field:base.action.rule,act_categ_id:0
+msgid "Set Category to"
+msgstr "Establecer categoría"
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: crm
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.partner2opportunity:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm
+#: help:crm.installer,sale_crm:0
+msgid "This module relates sale from opportunity cases in the CRM."
+msgstr "Este módulo relaciona ventas con oportunidades en el CRM."
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Daily"
+msgstr "Diario"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead2
+#: model:crm.case.stage,name:crm.stage_opportunity2
+msgid "Qualification"
+msgstr "Calificación"
+
+#. module: crm
+#: view:crm.case.stage:0
+msgid "Stage Definition"
+msgstr "Definición de etapa"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "First"
+msgstr "Primero"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm
+#: field:crm.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition on Communication History"
+msgstr "Condición en el historial de comunicaciones"
+
+#. module: crm
+#: help:crm.segmentation,som_interval:0
+msgid ""
+"A period is the average number of days between two cycle of sale or purchase "
+"for this segmentation.                 \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too "
+"long time,                  \n"
+"so we suppose that his state of mind has decreased because he probably "
+"bought goods to another supplier.                  \n"
+"Use this functionality for recurring businesses."
+msgstr ""
+"Un periodo es el número medio de días entre dos ciclos de ventas o compras "
+"para esta segmentación.                 \n"
+"Se utiliza principalmente para detectar si una empresa no ha comprado por un "
+"largo periodo de tiempo,                  \n"
+"por lo que suponemos que su grado de satisfacción ha disminuido porqué "
+"seguramente compró bienes a otro proveedor.                  \n"
+"Utilice esta funcionalidad para negocios recurrentes."
+
+#. module: crm
+#: view:crm.send.mail:0
+msgid "_Send Reply"
+msgstr "_Enviar respuesta"
+
+#. module: crm
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,msg:0
+#: field:crm.lead2partner,msg:0
+#: view:crm.send.mail:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: crm
+#: field:crm.meeting,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. 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 "Comercial"
+
+#. module: crm
+#: field:crm.lead,date_deadline:0
+msgid "Expected Closing"
+msgstr "Cierre previsto"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_opportunity2phonecall
+msgid "Opportunity to Phonecall"
+msgstr "Oportunidad a llamada telefónica"
+
+#. module: crm
+#: help:crm.case.section,allow_unlink:0
+msgid "Allows to delete non draft cases"
+msgstr "Permite eliminar los casos en estado no borrador."
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule Meeting"
+msgstr "Programar reunión"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Partner Name"
+msgstr "Nombre empresa"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone2
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
+msgid "Outbound"
+msgstr "Saliente"
+
+#. module: crm
+#: field:crm.lead,date_open:0
+#: field:crm.phonecall,date_open:0
+msgid "Opened"
+msgstr "Abierto"
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,member_ids:0
+msgid "Team Members"
+msgstr "Miembros del equipo"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,job_ids:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor1
+msgid "Interest in Computer"
+msgstr "Interesado en ordenadores"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation Detail"
+msgstr "Detalle de la invitación"
+
+#. module: crm
+#: field:crm.segmentation,som_interval_default:0
+msgid "Default (0=None)"
+msgstr "Por defecto (0=Ninguno)"
+
+#. module: crm
+#: help:crm.lead,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: crm
+#: field:crm.partner2opportunity,probability:0
+#: field:crm.phonecall2opportunity,probability:0
+msgid "Success Probability"
+msgstr "Probabilidad de éxito"
+
+#. module: crm
+#: code:addons/crm/crm.py:426
+#: selection:crm.add.note,state:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.merge.opportunity,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+#: selection:crm.send.mail,state:0
+#, python-format
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
+msgid "Cases by Sales Team"
+msgstr "Casos por equipo de ventas"
+
+#. module: crm
+#: field:crm.meeting,attendee_ids:0
+msgid "Attendees"
+msgstr "Asistentes"
+
+#. module: crm
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
+#: model:ir.model,name:crm.model_crm_meeting
+#: model:process.node,name:crm.process_node_meeting0
+#: model:res.request.link,name:crm.request_link_meeting
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Categoría de caso"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm
+#: view:board.board:0
+msgid "Planned Revenue by Stage and User"
+msgstr "Ingresos previsto por etapa y usuario"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead_report
+msgid "CRM Lead Report"
+msgstr "Informe de iniciativas CRM"
+
+#. module: crm
+#: field:crm.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. 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 "Normal"
+
+#. module: crm
+#: field:crm.lead,street2:0
+msgid "Street2"
+msgstr "Calle2"
+
+#. 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 "Categorías de reuniones"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "You may have to verify that this partner does not exist already."
+msgstr "Debería verificar que esta empresa no exista ya."
+
+#. module: crm
+#: field:crm.lead.report,delay_open:0
+msgid "Delay to Open"
+msgstr "Retraso de apertura"
+
+#. module: crm
+#: field:crm.lead.report,user_id:0
+#: field:crm.phonecall.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:67
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities By Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
+msgid "Schedule Phone Call"
+msgstr "Planificar llamada telefónica"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
+msgid ""
+"Create specific stages that will help your sales better organise their sales "
+"pipeline by maintaining them to their sales opportunities. It will allow "
+"them to easily track how is positioned a specific opportunity in the sales "
+"cycle."
+msgstr ""
+"Crear pasos específicos que ayudarán a su departamento de ventas a organizar "
+"mejor el flujo de venta gestionando sus oportunidades de venta. Esto les "
+"permitirá seguir fácilmente como está posicionada una oportunidad en el "
+"ciclo de ventas."
+
+#. module: crm
+#: model:process.process,name:crm.process_process_contractprocess0
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead4
+msgid "Twitter Ads"
+msgstr "Anuncios Twiter"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:26
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Planned Revenues"
+msgstr "Ingresos esperados"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor7
+msgid "Need Consulting"
+msgstr "Necesita consultoría"
+
+#. module: crm
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "¡Error! No se puede crear perfiles recursivos."
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:232
+#, python-format
+msgid "The case '%s' has been closed."
+msgstr "El caso '%s' ha sido cerrado"
+
+#. 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 "Contacto empresa"
+
+#. module: crm
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: crm
+#: 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 de usuario!"
+
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:100
+#, python-format
+msgid "Merged into Opportunity: %s"
+msgstr "Fusionado con la oportunidad '%s'"
+
+#. module: crm
+#: code:addons/crm/crm.py:347
+#: view:crm.lead:0
+#: view:res.partner:0
+#, python-format
+msgid "Close"
+msgstr "Cerrado"
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. module: crm
+#: model:ir.model,name:crm.model_base_action_rule
+msgid "Action Rules"
+msgstr "Reglas de acciones"
+
+#. module: crm
+#: field:crm.meeting,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. module: crm
+#: field:crm.meeting,phonecall_id:0
+msgid "Phonecall"
+msgstr "Llamada telefónica"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: crm
+#: field:crm.lead,function:0
+msgid "Function"
+msgstr "Función"
+
+#. module: crm
+#: view:crm.add.note:0
+msgid "_Add"
+msgstr "_Añadir"
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "State of Mind"
+msgstr "Grado de satisfacción"
+
+#. 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
+#: view:res.partner:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm
+#: field:base.action.rule,trg_section_id:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.resource.type,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
+#: field:crm.lead,section_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,section_id:0
+#: field:crm.meeting,section_id:0
+#: field:crm.opportunity2phonecall,section_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,section_id:0
+#: 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 "Equipo de ventas"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor2
+msgid "Interest in Accessories"
+msgstr "Interesado en accesorios"
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:211
+#, python-format
+msgid "The opportunity '%s' has been opened."
+msgstr "La oportunidad '%s' ha sido abierta"
+
+#. module: crm
+#: field:crm.lead.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: crm
+#: field:crm.lead,street:0
+msgid "Street"
+msgstr "Calle"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities by User and Team"
+msgstr "Oportunidades por usuario y equipo"
+
+#. module: crm
+#: field:crm.case.section,working_hours:0
+msgid "Working Hours"
+msgstr "Horario de trabajo"
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,is_customer_add:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
+#: view:res.partner:0
+msgid "Schedule a Meeting"
+msgstr "Planificar una reunión"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead6
+#: model:crm.case.stage,name:crm.stage_opportunity6
+#: view:crm.lead:0
+msgid "Lost"
+msgstr "Perdido"
+
+#. module: crm
+#: field:crm.lead,country_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: crm
+#: view:crm.lead:0
+#: selection:crm.lead2opportunity.action,name:0
+#: view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Convertir a oportunidad"
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm
+#: field:crm.case.resource.type,name:0
+msgid "Campaign Name"
+msgstr "Nombre de la campaña"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall_report
+msgid "Phone calls by user and section"
+msgstr "Llamadas telefónicas por usuario y sección"
+
+#. module: crm
+#: selection:crm.lead2opportunity.action,name:0
+msgid "Merge with existing Opportunity"
+msgstr "Fusionado con oportunidad existente"
+
+#. module: crm
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead4
+#: model:crm.case.stage,name:crm.stage_opportunity4
+msgid "Negotiation"
+msgstr "Negociación"
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr "Cierre previsto"
+
+#. module: crm
+#: field:crm.case.stage,sequence:0
+#: field:crm.meeting,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: crm
+#: field:crm.send.mail,body:0
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: crm
+#: field:crm.segmentation.line,expr_name:0
+msgid "Control Variable"
+msgstr "Variable de control"
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+#: model:crm.case.stage,name:crm.stage_opportunity3
+msgid "Proposition"
+msgstr "Propuesta"
+
+#. module: crm
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr "Llamadas telefónicas"
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.lead.report,name:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead8
+msgid "Newsletter"
+msgstr "Boletín de noticias"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#, python-format
+#~ msgid ""
+#~ "You can not escalate this case.\n"
+#~ "You are already at the top level."
+#~ msgstr ""
+#~ "No puede intensificar este caso.\n"
+#~ "Ya se encuentra en el nivel superior."
+
+#~ msgid "Delay After Trigger Date:"
+#~ msgstr "Demora después fecha del disparo:"
+
+#~ msgid "My Draft "
+#~ msgstr "Mis borradores "
+
+#~ msgid "Add Last Mail for Replying"
+#~ msgstr "Añadir último mail para responder"
+
+#~ msgid "All Cases"
+#~ msgstr "Todos los casos"
+
+#~ msgid "Remind Partner"
+#~ msgstr "Recordar empresa"
+
+#~ msgid "Update The Proposed Menus To Be Created"
+#~ msgstr "Actualizar los menús propuestos a crear"
+
+#~ msgid "Base Information"
+#~ msgstr "Información base"
+
+#~ msgid "All Open "
+#~ msgstr "Todos los abiertos "
+
+#~ msgid "Create menus for a case section"
+#~ msgstr "Crear menús para una sección de casos"
+
+#~ msgid "Template of Email to Send"
+#~ msgstr "Plantilla de Email a enviar"
+
+#~ msgid "CRM & SRM"
+#~ msgstr "CRM & SRM"
+
+#~ msgid "%(case_user)s = Responsible name"
+#~ msgstr "%(case_user)s = Nombre del responsable"
+
+#~ msgid "Add watchers (Cc)"
+#~ msgstr "Añadir observadores (CC)"
+
+#~ msgid "My "
+#~ msgstr "Mis "
+
+#~ msgid "Cases"
+#~ msgstr "Casos"
+
+#~ msgid "Watchers Emails"
+#~ msgstr "Observadores emails (CC)"
+
+#~ msgid "Create menu Entries"
+#~ msgstr "Crear entradas de menús"
+
+#~ msgid "Case history"
+#~ msgstr "Historial del caso"
+
+#~ msgid "Set state to"
+#~ msgstr "Establecer grado a"
+
+#~ msgid "Case Category Name"
+#~ msgstr "Nombre de la categoría de casos"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
+
+#~ msgid "All Unclosed and Unassigned "
+#~ msgstr "Mis no cerrados o no asignados "
+
+#~ msgid ""
+#~ "Check this if you want the rule to send a reminder by email to the partner."
+#~ msgstr ""
+#~ "Marque esta opción si desea que la regla envíe un recordatorio por correo "
+#~ "electrónico a la empresa."
+
+#~ msgid "Maximim Priority"
+#~ msgstr "Prioridad máxima"
+
+#~ msgid "New "
+#~ msgstr "Nuevo "
+
+#~ msgid "Partner Events"
+#~ msgstr "Eventos empresa"
+
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Condiciones sobre campos del caso"
+
+#~ msgid "Case Communication History"
+#~ msgstr "Historial de comunicación del caso"
+
+#~ msgid "Category of case"
+#~ msgstr "Categoría del caso"
+
+#~ msgid "Estimates"
+#~ msgstr "Estimaciones"
+
+#~ msgid "%(case_subject)s = Case subject"
+#~ msgstr "%(case_subject)s = Asunto del caso"
+
+#~ msgid ""
+#~ "The generic Open ERP Customer Relationship Management\n"
+#~ "system enables a group of people to intelligently and efficiently manage\n"
+#~ "leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.\n"
+#~ "It manages key tasks such as communication, identification, prioritization,\n"
+#~ "assignment, resolution and notification.\n"
+#~ "\n"
+#~ "Open ERP ensures that all cases are successfully tracked by users, customers "
+#~ "and\n"
+#~ "suppliers. It can automatically send reminders, escalate the request, "
+#~ "trigger\n"
+#~ "specific methods and lots of others actions based on your enterprise own "
+#~ "rules.\n"
+#~ "\n"
+#~ "The greatest thing about this system is that users don't need to do "
+#~ "anything\n"
+#~ "special. They can just send email to the request tracker. Open ERP will "
+#~ "take\n"
+#~ "care of thanking them for their message, automatically routing it to the\n"
+#~ "appropriate staff, and making sure all future correspondence gets to the "
+#~ "right\n"
+#~ "place.\n"
+#~ "\n"
+#~ "The CRM module has a email gateway for the synchronisation interface\n"
+#~ "between mails and Open ERP."
+#~ msgstr ""
+#~ "El sistema genérico de Gestión de las Relaciones con el Cliente (CRM) de\n"
+#~ "OpenERP permite a un grupo de gente gestionar  de forma inteligente\n"
+#~ "y eficaz iniciativas, oportunidades, tareas, cuestiones,\n"
+#~ "peticiones, errores, campañas comerciales, reclamaciones, etc.\n"
+#~ "Gestiona tareas clave como comunicación, identificación,\n"
+#~ "priorización, asignación, resolución y notificación.\n"
+#~ "\n"
+#~ "OpenERP asegura que todos los casos son seguidos con éxito\n"
+#~ "por usuarios, clientes y proveedores. Puede enviar automáticamente\n"
+#~ "recordatorios y notificaciones, intensificar la petición, disparar\n"
+#~ "métodos específicos y muchas otras acciones basadas en sus\n"
+#~ "reglas propias de empresa.\n"
+#~ "\n"
+#~ "La cosa más importante sobre este sistema es que los usuarios no\n"
+#~ "necesitan hacer nada especial. Pueden enviar sólo un correo electrónico\n"
+#~ "al registro de peticiones. OpenERP se encargará de agradecerle su\n"
+#~ "mensaje, dirigirlo automáticamente a las personas apropiadas, y asegurarse\n"
+#~ "de que toda la futura correspondencia llega al lugar apropiado.\n"
+#~ "\n"
+#~ "El módulo de CRM dispone de una puerta de enlace con el correo electrónico\n"
+#~ "para la sincronización entre correos electrónicos y OpenERP."
+
+#~ msgid "My Open "
+#~ msgstr "Mis abiertos "
+
+#~ msgid "Select Views (empty for default)"
+#~ msgstr "Seleccionar vistas (vacía por defecto)"
+
+#~ msgid "Case State"
+#~ msgstr "Estado del caso"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Your action"
+#~ msgstr "Su acción"
+
+#~ msgid "Case section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "E-Mail Reminders (includes the content of the case)"
+#~ msgstr "Recordatorios por Email (incluye el contenido del caso)"
+
+#~ msgid "Fields to Change"
+#~ msgstr "Campos a cambiar"
+
+#~ msgid "Cases Histories"
+#~ msgstr "Historiales de casos"
+
+#~ msgid "My cases"
+#~ msgstr "Mis casos"
+
+#~ msgid "All Draft "
+#~ msgstr "Todos los borradores "
+
+#~ msgid "%(partner_email)s = Partner email"
+#~ msgstr "%(partner_email)s = Email empresa"
+
+#~ msgid "My Open Cases"
+#~ msgstr "Mis casos abiertos"
+
+#~ msgid "Remind with attachment"
+#~ msgstr "Recordar con adjunto"
+
+#~ msgid "All Late "
+#~ msgstr "Todos los retrasados "
+
+#~ msgid "My Late "
+#~ msgstr "Mis retrasados "
+
+#~ msgid "Open cases"
+#~ msgstr "Casos abiertos"
+
+#~ msgid "My Unclosed "
+#~ msgstr "Mis no cerrados "
+
+#~ msgid "Created"
+#~ msgstr "Creado"
+
+#~ msgid "Mail to responsible"
+#~ msgstr "Enviar correo a responsable"
+
+#~ msgid "My Pending "
+#~ msgstr "Mis pendientes "
+
+#~ msgid "New Form"
+#~ msgstr "Nuevo formulario"
+
+#~ msgid "Set responsible to"
+#~ msgstr "Establecer responsable a"
+
+#~ msgid ""
+#~ "The rule use a AND operator. The case must match all non empty fields so "
+#~ "that the rule execute the action described in the 'Actions' tab."
+#~ msgstr ""
+#~ "La regla utiliza un operador AND. El caso debe concordar con todos los "
+#~ "campos no vacíos para que la regla ejecute la acción descrita en la pestaña "
+#~ "'Acciones'."
+
+#~ msgid "%(email_from)s = Partner email"
+#~ msgstr "%(email_from)s = Email empresa"
+
+#~ msgid "Case Section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "Rules"
+#~ msgstr "Reglas"
+
+#~ msgid "Call Object Method"
+#~ msgstr "Método llamada al objeto"
+
+#, python-format
+#~ msgid "You can not delete this case. You should better cancel it."
+#~ msgstr "No puede eliminar este caso. Sería mejor que lo cancelara."
+
+#, python-format
+#~ msgid "done"
+#~ msgstr "realizado"
+
+#~ msgid "Calendar"
+#~ msgstr "Calendario"
+
+#~ msgid "Log"
+#~ msgstr "Registro"
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr ""
+#~ "Estas personas recibirán una copia de la futura comunicación entre empresa y "
+#~ "usuarios por correo electrónico"
+
+#, python-format
+#~ msgid "Historize"
+#~ msgstr "Añadir al historial"
+
+#~ msgid "%(partner)s = Partner name"
+#~ msgstr "%(partner)s = Nombre empresa"
+
+#~ msgid "New With Calendar"
+#~ msgstr "Nuevo con calendario"
+
+#~ msgid "List With Calendar"
+#~ msgstr "Lista con calendario"
+
+#~ msgid "Action Information"
+#~ msgstr "Información de la acción"
+
+#~ msgid "Calendar View"
+#~ msgstr "Vista calendario"
+
+#~ msgid "%(case_user_phone)s = Responsible phone"
+#~ msgstr "%(case_user_phone)s = Teléfono del responsable"
+
+#~ msgid "Delay after trigger date"
+#~ msgstr "Demora después fecha del disparo"
+
+#~ msgid "Conditions"
+#~ msgstr "Condiciones"
+
+#~ msgid "Open Cases"
+#~ msgstr "Casos abiertos"
+
+#~ msgid "Remind responsible"
+#~ msgstr "Recordar responsable"
+
+#~ msgid "Set section to"
+#~ msgstr "Establecer sección a"
+
+#, python-format
+#~ msgid "You must put a Partner eMail to use this action!"
+#~ msgstr "¡Debe indicar un Email de empresa para usar esta acción!"
+
+#~ msgid "Minimum Priority"
+#~ msgstr "Prioridad mínima"
+
+#~ msgid "Case History"
+#~ msgstr "Historial del caso"
+
+#, python-format
+#~ msgid "draft"
+#~ msgstr "borrador"
+
+#~ msgid "Created Menus"
+#~ msgstr "Menús creados"
+
+#~ msgid ""
+#~ "Check this if you want that all documents attached to the case be attached "
+#~ "to the reminder email sent."
+#~ msgstr ""
+#~ "Marque esta opción si desea que todos los documentos adjuntados a este caso "
+#~ "sean adjuntados en el correo electrónico enviado como recordatorio."
+
+#, python-format
+#~ msgid "cancel"
+#~ msgstr "cancelado"
+
+#~ msgid "Parent Section"
+#~ msgstr "Sección padre"
+
+#~ msgid "Parent Menu"
+#~ msgstr "Menú padre"
+
+#~ msgid "%(case_id)s = Case ID"
+#~ msgstr "%(case_id)s = ID del caso"
+
+#~ msgid "Don't Create"
+#~ msgstr "No crear"
+
+#~ msgid "Base Menu Name"
+#~ msgstr "Nombre menú base"
+
+#~ msgid "Child Sections"
+#~ msgstr "Secciones hijas"
+
+#~ msgid "All Unassigned "
+#~ msgstr "Todos los no asignados "
+
+#~ msgid "All Unclosed "
+#~ msgstr "Todos los no cerrados "
+
+#~ msgid "%(case_user_email)s = Responsible email"
+#~ msgstr "%(case_user_email)s = Email del responsable"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Send Reminder"
+#~ msgstr "Enviar recordatorio"
+
+#~ msgid "Complete this if you use the mail gateway."
+#~ msgstr "Complete esto si utiliza una pasarela de correo."
+
+#~ msgid "Business Opportunities"
+#~ msgstr "Oportunidades de negocio"
+
+#~ msgid "Tree View"
+#~ msgstr "Vista de árbol"
+
+#~ msgid "Conditions on Case Partner"
+#~ msgstr "Condiciones sobre caso empresa"
+
+#~ msgid "Section Code"
+#~ msgstr "Código de secció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 "General Description"
+#~ msgstr "Descripción general"
+
+#~ msgid "Create Menus For Cases"
+#~ msgstr "Crear menús para una sección de casos"
+
+#~ msgid "Mail to partner"
+#~ msgstr "Enviar correo a empresa"
+
+#~ msgid "Partner Email"
+#~ msgstr "Email empresa"
+
+#~ msgid "All Pending "
+#~ msgstr "Todos los pendientes "
+
+#~ msgid "Set priority to"
+#~ msgstr "Establecer prioridad a"
+
+#, python-format
+#~ msgid "open"
+#~ msgstr "abierto"
+
+#~ msgid "All Canceled "
+#~ msgstr "Todos los cancelados "
+
+#~ msgid "Mail body"
+#~ msgstr "Texto correo"
+
+#~ msgid ""
+#~ "Check this if you want the rule to send a reminder by email to the user."
+#~ msgstr ""
+#~ "Marque esta opción si desea que la regla envíe un recordatorio por correo "
+#~ "electrónico al usuario."
+
+#~ msgid "Segmentations"
+#~ msgstr "Segmentaciones"
+
+#~ msgid ""
+#~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
+#~ "cases in this section"
+#~ msgstr ""
+#~ "La dirección de correo electrónico que se pondrá en 'Responder A' en todos "
+#~ "los correos electrónicos enviados por OpenERP para los casos de esta sección."
+
+#~ msgid "Case Rule"
+#~ msgstr "Regla del caso"
+
+#, python-format
+#~ msgid "Case"
+#~ msgstr "Caso"
+
+#~ msgid "Conditions on Priority Range"
+#~ msgstr "Condiciones sobre intervalo de prioridades"
+
+#~ msgid "All "
+#~ msgstr "Todos "
+
+#~ msgid "E-Mail Actions"
+#~ msgstr "Acciones de Email"
+
+#~ msgid "List"
+#~ msgstr "Lista"
+
+#~ msgid "User Responsible"
+#~ msgstr "Usuario responsable"
+
+#~ msgid "All Histories"
+#~ msgstr "Todos los historiales"
+
+#~ msgid "My Canceled "
+#~ msgstr "Mis cancelados "
+
+#~ msgid "Latest E-Mail"
+#~ msgstr "Último email"
+
+#~ msgid "Case logs"
+#~ msgstr "Registros del caso"
+
+#~ msgid ""
+#~ "Check if the category is limited to partners that match the segmentation "
+#~ "criterions. If checked, remove the category from partners that doesn't match "
+#~ "segmentation criterions"
+#~ msgstr ""
+#~ "Indica si esta categoría está limitada a empresas que cumplan los criterios "
+#~ "de segmentación. Si está marcada, se eliminan de la categoría las empresas "
+#~ "que no cumplan los criterios de segmentación."
+
+#~ msgid "Logs History"
+#~ msgstr "Historial del registro"
+
+#~ msgid "Form View"
+#~ msgstr "Vista formulario"
+
+#~ msgid "Conditions on Timing"
+#~ msgstr "Condiciones sobre temporización"
+
+#~ msgid "Case Description"
+#~ msgstr "Descripción del caso"
+
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "Enviar correo a observadores (CC)"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Cases by section"
+#~ msgstr "Casos por sección"
+
+#~ msgid "Conditions on States"
+#~ msgstr "Condiciones sobre los estados"
+
+#~ msgid "Trigger Date"
+#~ msgstr "Fecha del disparo"
+
+#~ msgid ""
+#~ "A period is the average number of days between two cycle of sale or purchase "
+#~ "for this segmentation. It's mainly used to detect if a partner has not "
+#~ "purchased or buy for a too long time, so we suppose that his state of mind "
+#~ "has decreased because he probably bought goods to another supplier. Use this "
+#~ "functionality for recurring businesses."
+#~ msgstr ""
+#~ "Un período es el número promedio de días entre dos ciclos de venta o compra "
+#~ "para esta segmentación. Se utiliza principalmente para detectar si una "
+#~ "empresa no ha comprado o compra durante un tiempo demasiado largo, así que "
+#~ "suponemos que su grado de satisfacción se ha reducido porque probablemente "
+#~ "ha comprado productos a otro proveedor. Utilice esta funcionalidad para los "
+#~ "negocios recurrentes."
+
+#, python-format
+#~ msgid ""
+#~ "You must define a responsible user for this case in order to use this action!"
+#~ msgstr ""
+#~ "¡Debe definir un usuario responsable para este caso para poder utilizar esta "
+#~ "acción!"
+
+#, python-format
+#~ msgid ""
+#~ "Can not send mail with empty body,you should have description in the body"
+#~ msgstr ""
+#~ "No puede enviar mensajes con un texto vacío, debería incluir una descripción "
+#~ "en el mensaje"
+
+#, python-format
+#~ msgid ""
+#~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
+#~ "section!"
+#~ msgstr ""
+#~ "¡No se ha encontrado Email en la empresa responsable o falta dirección de "
+#~ "respuesta en la sección!"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr ""
+#~ "La fecha límite se calcula automáticamente a partir de Fecha de inicio + "
+#~ "Duración"
+
+#, python-format
+#~ msgid ""
+#~ "No E-Mail ID Found for your Company address or missing reply address in "
+#~ "section!"
+#~ msgstr ""
+#~ "¡No se ha encontrado Email en la dirección de su compañía o falta dirección "
+#~ "de respuesta en la sección!"
+
+#~ msgid "this wizard will create all sub-menus, within the selected menu."
+#~ msgstr "este asistente creará todos los sub-menús, en el menú seleccionado."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "You may want to create a new parent menu to put all the created menus in."
+#~ msgstr ""
+#~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
+#~ "creados en él."
+
+#~ msgid "Button Pressed"
+#~ msgstr "Botón oprimido"
+
+#~ msgid "Mail to these emails"
+#~ msgstr "Correo a estos correos electronicos"
+
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Palabras claves especiales para ser usadas en el cuerpo del mensaje."
+
+#~ msgid "My Histories"
+#~ msgstr "Mis historias"
+
+#~ msgid "Last Action Date"
+#~ msgstr "Fechas de ultima acción"
+
+#~ msgid "Delay type"
+#~ msgstr "Tipo de retraso"
+
+#~ msgid "%(case_description)s = Case description"
+#~ msgstr "%(case_description)s = Descripción del caso"
+
+#~ msgid "Planned revenue"
+#~ msgstr "Ingresos previstos"
+
+#~ msgid "Planned Costs"
+#~ msgstr "Costos previstos"
+
+#~ msgid "Planned costs"
+#~ msgstr "Costos previstos"
+
+#~ msgid "Telesales"
+#~ msgstr "Ventas a distancia"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Argumentos inválidos"
+
+#~ msgid "Send Partner & Historize"
+#~ msgstr "Enviar a empresa y añadir al historial"
+
+#~ msgid "Mail Campaign 1"
+#~ msgstr "Campaña mail 1"
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index 39c3834a9d2..b8870ecb1da 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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr "Väga esimene kontakt koos uue perspektiiviga"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -807,8 +807,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1084,7 +1084,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2588,7 +2588,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3100,8 +3100,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4322,13 +4322,6 @@ msgstr "Infoleht"
 #~ msgid "All "
 #~ msgstr "Kõik "
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Kui partner pole ostnud perioodi jooksul siis alanda meeleolu selle teguri "
-#~ "võrra. See on korrutis."
-
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
@@ -4357,652 +4350,23 @@ msgstr "Infoleht"
 #~ msgid "Actions"
 #~ msgstr "Toimingud"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Trigger Date"
 #~ msgstr "Päästiku kuupäev"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 päeva    "
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Haldab helpdesk teenust."
-
-#~ msgid "Close job request"
-#~ msgstr "Sulge töö taotlus"
-
-#~ msgid "Close Lead"
-#~ msgstr "Sulge juhtimine"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Juhtumid jaotise ja staatusejärgi2"
-
-#~ msgid "Send to"
-#~ msgstr "Saada"
-
-#~ msgid "Amount"
-#~ msgstr "Kogus"
-
-#~ msgid "Human Resources"
-#~ msgstr "Inimressursid"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Juhtude võimalused, kategooria ja tüüp"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Haldab tarnijate ja klientide nõudeid, sealjuures sinu korrigeerivaid ja "
-#~ "vältivaid tegevusi."
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Palun täpsustage kasutaja e-posti aadress!"
-
-#~ msgid "Fixed"
-#~ msgstr "Fikseeritud"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "LÄBIPAISTEV"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Juhtumid sektsiooni ja olekujärgi"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Pakutav Palk"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Kestvus (Tundides)"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Juhtumid sektsiooni ja olekujärgi"
-
-#~ msgid "Appreciation"
-#~ msgstr "Hindamine"
-
-#~ msgid "Second Interview"
-#~ msgstr "Teine Intervjuu"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "Jälgib tuvastatud ärivõimalusi sinu müükide konveierile."
-
-#~ msgid "Exception Dates"
-#~ msgstr "Väljajäetavad kuupäevad"
-
-#~ msgid "Description Information"
-#~ msgstr "Kirjeldus info"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Aksepteeritud kui nõue"
-
-#~ msgid "Next Interview"
-#~ msgstr "Järgmine Intervjuu"
-
-#~ msgid "Dead"
-#~ msgstr "Surnud"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Kinnita koosolek"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Olemasolev klient"
-
-#~ msgid "Home"
-#~ msgstr "Kodu"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Juhtumid jaotise, kategooria ja olekujärgi"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Avalduse väärtus"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Tagasi lükatud firmapoolt"
-
-#~ msgid "All Meetings"
-#~ msgstr "Kõik koosolekud"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Koosolekute puu"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Leping esitatud"
-
-#~ msgid "Assigned to"
-#~ msgstr "Omistatud"
-
-#~ msgid "   Today   "
-#~ msgstr "   Täna   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Allows to show calendar"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Nõuete eeskiri"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Telefonikõnede kirjeldus"
-
-#~ msgid "New Business"
-#~ msgstr "Uus Firma"
-
 #, python-format
 #~ msgid ""
 #~ "You must define a responsible user for this case in order to use this action!"
 #~ msgstr ""
 #~ "Peate määratlema vastutav kasutaja Sel juhul, et kasutada seda tegevust!"
 
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Töökohad - Töölevõtmise protsess"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Koosolekute vorm"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Nõude kuupäev"
-
-#~ msgid "All Leads"
-#~ msgstr "Kõik juhtimised"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Läbirääkimine/Ülevaade"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Reaalsed nõuded"
-
-#~ msgid "Emails"
-#~ msgstr "E-postid"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Leping allakirjutatud"
-
-#~ msgid "Existing Business"
-#~ msgstr "Eksisteeriv äri"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Salvesta .ics vormingusse"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "E-kiri!"
-
-#~ msgid "Radio"
-#~ msgstr "Raadio"
-
-#~ msgid "Search Histories"
-#~ msgstr "Otsi ajalugu"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Koosoleku plaan"
-
-#~ msgid "Direction"
-#~ msgstr "Suund"
-
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Juhtumi kirjeldus"
 
-#~ msgid "Preventive"
-#~ msgstr "Ennetav"
-
-#~ msgid "My Funds"
-#~ msgstr "Minu vahendid"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Noorem Arendaja"
-
-#~ msgid "Category Name"
-#~ msgstr "Kategooria nimi"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Kandidaat tagasilükatud"
-
-#~ msgid "Print"
-#~ msgstr "Prindi"
-
-#~ msgid "Closed Won"
-#~ msgstr "Suletud Võidetud"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Juhtumid sektsiooni kaupa, kategooria ja kategooria2"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Õppimine ja haridus"
-
 #~ msgid "%(partner_email)s = Partner email"
 #~ msgstr "%(partner_email)id = Partneri e-mail"
 
-#~ msgid "Message..."
-#~ msgstr "Sõnum..."
-
-#~ msgid "Meeting Date"
-#~ msgstr "Koosoleku kuupäev"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Järgmised kohtumised"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Telli"
-
-#~ msgid "Value Claims"
-#~ msgstr "Nõuete Väärtus"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Muuda partneriks"
-
-#~ msgid "Self Generated"
-#~ msgstr "Endal genereeritud"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Kandidaadi Nimi"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Vastuse ootel"
-
-#~ msgid "Funds"
-#~ msgstr "Vahendid"
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Juhtumid jaotise ja kategooria2 järgi"
-
-#~ msgid "Website"
-#~ msgstr "Veebileht"
-
-#~ msgid "Type of claim"
-#~ msgstr "Nõude tüüp"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Töökohad - Värbamise puu"
-
-#~ msgid "Converted"
-#~ msgstr "Muudetud"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Haldab kasutajate koosolekute kalendrit."
-
-#~ msgid "Mail"
-#~ msgstr "E-Kiri"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Vajab analüüsi"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Helpdesk toetuse puu"
-
-#~ msgid "Other Info"
-#~ msgstr "Muu info"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Nõude kulud"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Müügistaatus"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Vigade jälgimine"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Järgmine Koosolek"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Kampaanja tüüp"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Ettepanek/Hinnapakkumine"
-
-#~ msgid "Web"
-#~ msgstr "Veeb"
-
-#~ msgid "Graduate"
-#~ msgstr "Teaduslik kraad"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Sa saad kasutada ka kalendrivaadet, et graafiliselt planeerida oma järgmist "
-#~ "kohtumist."
-
-#~ msgid "Histories"
-#~ msgstr "Aja lood"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Algatuste puu"
-
-#~ msgid "Attendee"
-#~ msgstr "Osaleja"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Viga! Sa ei saa luua rekursiivseid sektsioone."
-
-#~ msgid "This Year"
-#~ msgstr "See aasta"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Lubab sul sünkroniseerida Open ERP kalendreid telefoni, Outlook, Sunbird, "
-#~ "ical, ..."
-
-#~ msgid "Contract Data"
-#~ msgstr "Lepingu andmed"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Loodetav tulu"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Esialgne töökohtade vajadus"
-
-#~ msgid "OPAQUE"
-#~ msgstr "LÄBIPAISTMATU"
-
-#~ msgid "Claims Info"
-#~ msgstr "Nõuete Info"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Juhtumi Kategooria2 nimi"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Helpdesk'i toed"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Jagatud kalender"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Vahendite kogumine"
-
 #~ msgid "Telesales"
 #~ msgstr "Telemüügid"
 
-#~ msgid "Stage: "
-#~ msgstr "Etapp: "
-
-#~ msgid "Payment Mode"
-#~ msgstr "Makseviis"
-
-#~ msgid "Source"
-#~ msgstr "Allikas"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Muuda partneriks"
-
-#~ msgid "Employee Email"
-#~ msgstr "Töötaja e-post"
-
-#~ msgid "Prospecting"
-#~ msgstr "Uuring"
-
-#~ msgid "Jobs"
-#~ msgstr "Tööd"
-
-#~ msgid "Job Info"
-#~ msgstr "Töö info"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Tühista koosolek"
-
-#~ msgid "Support Query"
-#~ msgstr "Toetuse päring"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Loomise kuupäev"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Töökohad - Värbamise vorm"
-
-#~ msgid "Corrective"
-#~ msgstr "Korrektiivne"
-
-#~ msgid "Delay Close"
-#~ msgstr "Sulgemise viivitus"
-
-#~ msgid "Credit Card"
-#~ msgstr "Krediitkaart"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr ""
-#~ "See võib aidata assotsiatsioone vahendite kogumise protsessil ja jälgimisel."
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Helpdesk'i tugi"
-
-#~ msgid "Send Email"
-#~ msgstr "Saada e-kiri"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Kandidaadi nimi2"
-
-#~ msgid "Events"
-#~ msgstr "Sündmused"
-
-#~ msgid "Degree"
-#~ msgstr "Teaduskraad"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Võimaldab sul jälgida ja hallata algatusi, mis on müügi eelsed päringud või "
-#~ "kontaktid. Esimene kontakt kliendipäringuga."
-
-#~ msgid "Candidate Phone"
-#~ msgstr "Võimalik telefon"
-
-#~ msgid "crm.menu.config_wizard"
-#~ msgstr "crm.menu.config_wizard"
-
-#~ msgid "Cheque"
-#~ msgstr "Arve"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Juhtumi kategooria2"
-
-#~ msgid "Assigned"
-#~ msgstr "Omistatud"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Kõik võimalused"
-
-#~ msgid "Recycled"
-#~ msgstr "Utiliseeritud"
-
-#~ msgid "Invalid"
-#~ msgstr "Vigane"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Sea koosolek"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Juhtumid staatuse ja hinnangutejärgi"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Koosolekute kalender"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Tagasilükatud töötajapoolt"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Kohtumine algatuste genereerimiseks"
-
-#~ msgid "Server Action"
-#~ msgstr "Serveri toiming"
-
-#~ msgid "Related Case"
-#~ msgstr "Seotud juhtum"
-
-#~ msgid "Email Address"
-#~ msgstr "E-posti aadress"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Kättesaadavus (nädalad)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Võimaluste puu"
-
-#~ msgid "First Interview"
-#~ msgstr "Esimene intervjuu"
-
-#~ msgid "This Month"
-#~ msgstr "See kuu"
-
-#~ msgid "All Claims"
-#~ msgstr "Kõik nõuded"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Juhtumid jaotise, kategooria ja staatusejärgi"
-
-#~ msgid "Funds Form"
-#~ msgstr "Fondide vorm"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Töökohad töölevõtmise protsess"
-
-#~ msgid "Lead Source"
-#~ msgstr "Algatuse allikas"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Kandidaat palgatud"
-
-#~ msgid "Goals"
-#~ msgstr "Eesmärgid"
-
-#~ msgid "In Process"
-#~ msgstr "Töös"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Müügijärgsed teenused"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "File name"
-#~ msgstr "Failinimi"
-
-#~ msgid "Import ICS"
-#~ msgstr "Impordi ICS-i"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Kõik töökohtade päringud"
-
-#~ msgid "Relevant"
-#~ msgstr "Asjakohane"
-
-#~ msgid "Applied Job"
-#~ msgstr "Rakendatud töökohad"
-
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr "Sotsiaalne rehabilitatsioon ja maaharimine"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Vigased argumendid"
-
-#~ msgid "My Cases"
-#~ msgstr "Minu juhtumid"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Algatuse teema"
-
-#~ msgid "Reporting"
-#~ msgstr "Aruandlus"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Oodatav palk"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Saad uus kiri"
-
-#~ msgid "Word of mouth"
-#~ msgstr "Jututurundus"
-
-#~ msgid "Type of Action"
-#~ msgstr "Toimingu tüüp"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Kandidaadi e-mail"
-
-#~ msgid "Planned"
-#~ msgstr "Planeeritud"
-
-#~ msgid "Customer Office"
-#~ msgstr "Kliendi kontor"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Koosolek kandidaatidega"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Fondide puu"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Kunstid ja kultuur"
-
-#~ msgid "All Funds"
-#~ msgstr "Kõik fondid"
-
-#~ msgid "HelpDesk"
-#~ msgstr "HelpDesk"
-
-#~ msgid "Licenced"
-#~ msgstr "Litsenseeritud"
-
-#~ msgid "Qualication"
-#~ msgstr "Kfalifikatsioon"
-
-#~ msgid "Lead Details"
-#~ msgstr "Algatuse detailid"
-
-#~ msgid "Office"
-#~ msgstr "Kontor"
-
-#~ msgid "Assign"
-#~ msgstr "Määra"
-
-#~ msgid "Healthcare"
-#~ msgstr "Tervishoid"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Sisemised märkmed"
-
-#~ msgid "Employee"
-#~ msgstr "Töötaja"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "KONFIDENTSIAALNE"
-
-#~ msgid "Meeting date"
-#~ msgstr "Koosoleku kuupäev"
-
-#~ msgid "Not fixed"
-#~ msgstr "Pole parandatud"
-
-#~ msgid "_Import"
-#~ msgstr "_Impordi"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Massi meilimine"
-
-#~ msgid "Cash"
-#~ msgstr "Kassa"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Fondid kategooria järgi"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Salvesra ICS fail"
-
-#~ msgid "Future"
-#~ msgstr "Tulevik"
-
-#~ msgid "Import Message"
-#~ msgstr "Impordi sõnum"
-
-#~ msgid "New Jobs"
-#~ msgstr "Uued tööd"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Vali ICS fail"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Vahendite kogumise operatsioonid"
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 9a5947a180c..006eea97803 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,25 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "Mahdollisuuksien määrä"
 
 #. module: crm
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Mahdollisuus"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr ""
+msgstr "Tarvitsee palveluita"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -57,18 +57,18 @@ msgstr "Näkyvyys"
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr ""
+msgstr "Otsikko"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Näytä muodossa"
 
 #. module: crm
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Kuukauden päivä"
 
 #. module: crm
 #: view:crm.lead:0
@@ -79,7 +79,7 @@ msgstr "Tänään"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "Valitse mahdollisuudet"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -87,24 +87,24 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Viive sulkemiseen"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "Edellinen tila"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "Ei voi lisätä huomautusta !"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -117,33 +117,33 @@ msgstr "Vaiheen nimi"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "Myyntitiimin koodin tulee olla uniikki !"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr ""
+msgstr "Mahdollisuus '%s' on muutettu myyntimahdollisuudeksi"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:228
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "mahdollisuus '%s' on suljettu"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Ei toistoa"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -153,7 +153,7 @@ msgstr "Varoitus!"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Vuosittain"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -173,7 +173,7 @@ msgstr "Kampanja"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr ""
+msgstr "Älä luo kumppania"
 
 #. module: crm
 #: view:crm.lead:0
@@ -186,6 +186,8 @@ msgstr "Etsi mahdollisuuksia"
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
 msgstr ""
+"Mahollisuudella täytyy olla kumppani ennenkuin se voidaan yhdistää toiseen "
+"mahdollisuuteen"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@@ -199,7 +201,7 @@ msgstr "Varoitus!"
 #: 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 "Mahdollisuuksien analyysi"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -226,7 +228,7 @@ msgstr "Kumppani"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Järjestäjä"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -234,12 +236,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 #: view:res.partner:0
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Aikatauluta muu soitto"
 
 #. module: crm
 #: help:crm.meeting,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Muokkaa kaikkia toistuvan kokouksen tapahtumakertoja"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
@@ -255,13 +257,13 @@ msgstr "Puhelinsoitto"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Jättäydy pois"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:108
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "Mahdollisuus '%s' on merkitty menetetyksi."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -271,6 +273,9 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Liidien analysointi mahdollistaa eri CRM tietojen tarkistamisen. Tarkista "
+"käsittelyajat, vastausten määrät ja lähetetyt sähköposit. Voit lajitella "
+"liidien analyysit eri ryhmiin saadaksesi tarkempia tietoja."
 
 #. module: crm
 #: view:crm.lead:0
@@ -302,7 +307,7 @@ msgstr ""
 #: 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 "Mahdollisuuksien analyysi"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -311,17 +316,20 @@ msgid ""
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
 msgstr ""
+"Jos valitset yhdistämisen olemassaolevan mahdollisuuden kanssa, liidin "
+"yksityiskohdat (kommunikaatiohistorioineen) yhdistetään olemassaolevan "
+"valitun kumppanin mahdollisuuden kanssa."
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Julkinen"
 
 #. 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 "Kamppanjat"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -333,7 +341,7 @@ msgstr "Kategoriat"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Ikuisesti"
 
 #. module: crm
 #: help:crm.lead,optout:0
@@ -341,6 +349,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Jos jättäydy pois on valittu, kontakti ei suostu vastaanottamaan "
+"sähköposteja tai on peruuttanut kampanjatilauksensa."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -369,12 +379,12 @@ msgstr "Yhteyshenkilö"
 #. module: crm
 #: view:crm.installer:0
 msgid "Enhance your core CRM Application with additional functionalities."
-msgstr ""
+msgstr "Paranna CRM ohjelmistoasi lisätoiminnoilla"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr ""
+msgstr "Vaihda todennäköisyyttä automaattisesti"
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
@@ -385,7 +395,7 @@ msgstr "Säännöllinen lauseke tilannehistoriassa"
 #: code:addons/crm/crm_lead.py:209
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "Mahdollisuus '%s' on avattu."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -396,7 +406,7 @@ msgstr "Mahdollisuuskokous"
 #: help:crm.lead.report,delay_close:0
 #: help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Päivien määrä tapauksen sulkemiseen"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
@@ -406,13 +416,13 @@ msgstr "Kun todellinen projekti/mahdollisuus on löydetty"
 #. module: crm
 #: field:crm.installer,crm_fundraising:0
 msgid "Fundraising"
-msgstr ""
+msgstr "Varainkeruu"
 
 #. module: crm
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Mahdollisuudet ja myyntimahdollisuudet"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -427,12 +437,12 @@ msgstr "Viestintä"
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Change Responsible"
-msgstr ""
+msgstr "Vaihda vastuuhenkilö"
 
 #. module: crm
 #: field:crm.merge.opportunity,state:0
 msgid "Set State To"
-msgstr ""
+msgstr "Aseta tilaksi"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -447,18 +457,18 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr ""
+msgstr "Muuta/yhdistä mahdollisuus"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Päivityksen päiväys"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Valitse toiminto"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -476,17 +486,17 @@ msgstr "Kategoria"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "Mahdollisuuksien määrä"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
 msgid "Campaign 1"
-msgstr ""
+msgstr "Kamppanja 1"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor1
 msgid "Campaign 2"
-msgstr ""
+msgstr "Kamppanja 2"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -496,17 +506,17 @@ msgstr "Yksityisyys"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Mahdollisuuksien analyysi"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Tapahtuman paikka"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Toistosääntö"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
@@ -521,7 +531,7 @@ msgstr ""
 #. module: crm
 #: help:crm.installer,fetchmail:0
 msgid "Allows you to receive E-Mails from POP/IMAP server."
-msgstr ""
+msgstr "Mahdollistaa sähköpostien vastaanoton POP/IMAP palvelimelta."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -531,13 +541,13 @@ msgstr "Tavallinen- tai puhelinkokous mahdollisuudelle"
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Ensimmäinen yhteydenpito mahdollisen asiakkaan kanssa"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -550,7 +560,7 @@ msgstr "Luo mahdollisuus"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: crm
 #: code:addons/crm/crm.py:378
@@ -581,17 +591,17 @@ msgstr "Ei toiminnassa"
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail
 msgid "Reply to last Mail"
-msgstr ""
+msgstr "Vastaa viimeisimpään sähköpostiin"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "Sähköposti"
 
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
 msgid "Sale FAQ"
-msgstr ""
+msgstr "Myynnin UKK (FAQ)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
@@ -620,7 +630,7 @@ msgstr "Nämä henkilöt vastaanottavat sähköpostin."
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Yhteenveto"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -641,6 +651,8 @@ msgid ""
 "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 ""
+"Voit linkittää sähköposteja OpenERP dokumentteihin. Voit liittää sen "
+"OpenERP:issä olemassaolevaan tai luoda uuden."
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -659,12 +671,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Päättymispäivä"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Virhe: sähköposti ei ole oikein muotoiltu"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -674,7 +686,7 @@ msgstr "Profilointi valinnat"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "Puhelujen määrä"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -697,17 +709,19 @@ msgid ""
 "modes available with the customer. With each commercial opportunity, you can "
 "indicate                         the canall which is this opportunity source."
 msgstr ""
+"Kanavat esittävät eri kommunikaatiotapoja olla yhteydessä asiakkaaseen. Voit "
+"määritellä jokaiselle mahdollisuudelle kanavan josta se tuli."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "Kokous '%s' on vahvistettu"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Vastuukäyttäjä"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
@@ -721,23 +735,25 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"Sähköpostiosoite joka laitetaan vastausosoitteeksi (reply-to) kaikkiin "
+"OpenERPin lähettämiin sähköposteihin koskien tämän myyntiryhmän tapauksia."
 
 #. module: crm
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Nykyinen aktiviteetti"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "Määrittelee säännön toiston poikkeukset kuvaavan määrittelyn"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Työaika"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -748,7 +764,7 @@ msgstr "Kumppanisegmentointirivit"
 #: view:crm.lead:0
 #: view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "Yksityiskohdat"
 
 #. module: crm
 #: help:crm.installer,crm_caldav:0
@@ -756,11 +772,13 @@ msgid ""
 "Helps you to synchronize the meetings with other calendar clients and "
 "mobiles."
 msgstr ""
+"Auttaa synkronoimaan kokoukset muiden kalenteriohjelmien ja kännyköiden "
+"kanssa."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Vuodet"
 
 #. module: crm
 #: help:crm.installer,crm_claim:0
@@ -768,6 +786,8 @@ msgid ""
 "Manages the suppliers and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Hallinnoi toimittajien ja asiakkaiden reklamaatioita, mukaanlukien korjaavat "
+"ja ennaltaehkäisevät toimenpiteesi."
 
 #. module: crm
 #: view:crm.lead:0
@@ -783,7 +803,7 @@ msgstr "Kumppanijaottelu"
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Todennäköinen liikevaihto"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -799,17 +819,17 @@ msgstr "Todennäköisyys (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Mahdollisuuksien luonti"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Tilastojen työpöytä"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -830,7 +850,7 @@ msgstr "Televisio"
 #. module: crm
 #: field:crm.installer,crm_caldav:0
 msgid "Calendar Synchronizing"
-msgstr ""
+msgstr "Kalenterin synkronointi"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -857,18 +877,18 @@ msgstr "Päiviä jaksossa"
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Päivittäin"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Aseta tiimiksi"
 
 #. module: crm
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Tapahtuman tyyppi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
@@ -884,12 +904,12 @@ msgstr "Poissulkeva"
 #: code:addons/crm/crm_opportunity.py:91
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr ""
+msgstr "Mahdollisuus '%s' on voitettu"
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Aseta hälytys tähän ajankohtaan, ennen tapahtumaa"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -930,7 +950,7 @@ msgstr ""
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -946,7 +966,7 @@ msgstr "Ostomyynti"
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "vaatimukset"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -954,11 +974,13 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Tämä ominaisuus määrittelee poikkeusajankohdat toistuville "
+"kalenterikomponenteille."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Muunna mahdollisuudeksi "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -983,22 +1005,22 @@ msgstr "Kumppanin katerogia"
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Lisää huomautus"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Toimittaja"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "Tapaukselle määritellyn myyntitiimin sähköpostin vastausosoite"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Merkitse voitetuksi"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1008,7 +1030,7 @@ msgstr "Ostomäärä"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Merkitse hävityksi"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1021,17 +1043,17 @@ msgstr "Maaliskuu"
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "Mahdollisuus '%s' on suljettu."
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Päiviä avaamiseen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Näytä aika muodossa"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:264
@@ -1054,19 +1076,19 @@ msgstr "Matkapuhelin"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "Toiston lopettaminen"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:53
 #, python-format
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
-msgstr ""
+msgstr "Muita avoimia tai odottavia mahdollisuuksia ei ole kumppanille '%s'."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Seuraava vaihe"
 
 #. module: crm
 #: view:board.board:0
@@ -1081,11 +1103,11 @@ msgstr "Viittaus"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Tule mukaan"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1102,7 +1124,7 @@ msgstr "Kokoukset"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Valitse päivä jolloin kokous toistuu"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
@@ -1115,7 +1137,7 @@ msgstr "Seuraava Toimenpide"
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Toista kunnes"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1128,12 +1150,14 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Jos aktiivisen kentän tila on tosi (true), se sallii tapahtuman "
+"hälytystiedon piilottamisen ilman sen poistamista."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
-msgstr ""
+msgstr "Suljettua/peruttua soittoa ei voida muuttaa mahdollisuudeksi."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1152,51 +1176,51 @@ msgstr "Vastuullinen"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Edellinen"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Tilastot"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Lähettäjä"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Seuraava"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Vaihe:"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 #: model:crm.case.stage,name:crm.stage_opportunity5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Voitettu"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Ylitetty aikaraja"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Myyntiosasto"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "HTML muotoilu?"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -1227,7 +1251,7 @@ msgstr "Alin"
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "Liite"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1249,12 +1273,12 @@ msgstr "Luontipäivämäärä"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Tarvitsee nettisivujen suunnittelua"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Toiston ID"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1267,7 +1291,7 @@ msgstr "Aihe"
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Ti"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:300
@@ -1283,37 +1307,37 @@ msgstr "Vaihe"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "Historiatiedot"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Sähköpostia kumppanille"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "Postitukset"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Merkitse"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "Toista"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Anna tapahtuman toistua säännöllisin väliajoin"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Tapauksen ehtokentät"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1341,6 +1365,8 @@ msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
 msgstr ""
+"Luo erityisiä puhelinsoittojen kategorioita määrittääksesi paremmin "
+"soitettujen puheluiden tyypit järjestelmään."
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1352,34 +1378,34 @@ msgstr "Syyskuu"
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr ""
+msgstr "Maksimi partneri ID:t käsitelty"
 
 #. 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 "Puhelinsoittojen analyysi"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Avauspäivä"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Kesto minuuttia"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
-msgstr ""
+msgstr "Hallinnoi helpdesk palvelua."
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Mahdollisuuden nimi"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1387,22 +1413,24 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Jos aktiivisen kentän arvo on tosi (true) voit piilottaa myyntitiimin "
+"poistamatta sitä."
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Vuosi  "
 
 #. module: crm
 #: field:crm.meeting,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "Muokkaa kaikkia"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Pe"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -1412,12 +1440,12 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Kirjoita päiväys"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Toiston loppu"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1442,7 +1470,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 #: view:res.partner:0
 msgid "Create a Partner"
-msgstr ""
+msgstr "Luo kumppani"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1452,19 +1480,19 @@ msgstr "Suorittamisen tila"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Maanantai"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Päivää sulkemiseen"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -1476,7 +1504,7 @@ msgstr "ID"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Mahdollisuuteen liittyvä kumppani"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1487,7 +1515,7 @@ msgstr ""
 #: field:crm.phonecall2phonecall,date:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Päiväys"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1495,7 +1523,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
@@ -1505,17 +1533,17 @@ msgstr "Mahdollisuuksien yhteenveto"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Etsi"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Mahdollisuudet kategorioittain"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "Valitse kuukauden päivä koska kokous toistetaan"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1539,12 +1567,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Koodi"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Alatason tiimit"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1562,7 +1590,7 @@ msgstr "Tila"
 #. module: crm
 #: field:crm.meeting,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Tiheys"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1591,49 +1619,49 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "Yhdistä kaksi mahdollisuutta"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Korjaa aikojen määrät"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Poikkeussääntö"
 
 #. 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 "Valitse tämä jos haluat säännön lähettävän sähköpostia kumppanille."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Puhelinsoittojen kategoriat"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Kutsu ihmisisä"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Virhe ! et voi luoda rekursiivista myyntitiimiä"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Etsi kokousta"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1645,6 +1673,7 @@ msgstr "Myyntimäärä"
 #, python-format
 msgid "Unable to send mail. Please check SMTP is configured properly."
 msgstr ""
+"Sähköpostia ei voitu lähettää. Tarkista että SMTP asetukset ovat kunnossa."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1654,7 +1683,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Vahvistamaton"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1693,12 +1722,12 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Omat tapaukset"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Syntymäpäivä"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1708,7 +1737,7 @@ msgstr ""
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Velho"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1716,12 +1745,14 @@ msgid ""
 "Sales team to which this case belongs to. Defines responsible user and e-"
 "mail address for the mail gateway."
 msgstr ""
+"Myyntitiimi jolle tapaus kuuluu. Määrittelee vastuuhenkilön ja sähköpostin "
+"sähköpostin välitystä varten."
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Luonti"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1739,7 +1770,7 @@ msgstr "Muunna ehdokas liiketoimintakumppaniksi"
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Muunna"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1752,12 +1783,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Lauantai"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Viides"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
@@ -1767,17 +1798,17 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Sulkemisen viive"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Ke"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Mahdollinen jälleenmyyjä"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1791,27 +1822,28 @@ msgstr "Suunniteltu tuotto"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
 msgstr ""
+"Mahdollinen linkitetty kumppani, yleensä mahdollisuuden konversion jälkeen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Kutsun yksityiskohdat"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Ylätason tiimi"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Seuraava toiminnon päivä"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1826,18 +1858,18 @@ msgstr "Tunnit"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Postinumero"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:213
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "Tapaus '%s' on avattu"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1857,22 +1889,22 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Puhelinsoitot"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication  History"
-msgstr ""
+msgstr "Kommunikaatiohistoria"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Vapaa"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Synkronointi"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1882,7 +1914,7 @@ msgstr "Salli Poistaminen"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Ma"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1904,14 +1936,14 @@ msgstr ""
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Toistuva kokous"
 
 #. module: crm
 #: view:crm.case.section:0
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1927,13 +1959,13 @@ msgstr "Arvo"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Mahdollisuudet kategorioittain"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Asiakkaan nimi"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -1947,7 +1979,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "Soitoista mahdollisuuksiksi"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1957,17 +1989,17 @@ msgstr "Vastaus osoitteeseen"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "Valitse vaiheet tälle myyntitiimille"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Mahdollisuudet vaiheittain"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Toiston asetukset"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2005,7 +2037,7 @@ msgstr "Lisätiedot"
 #: 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 "Yhdistä mahdollisuudet"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -2020,12 +2052,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "postituskampanja 2"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "Luo"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2057,7 +2089,7 @@ msgstr "Käytä Ostomyynnin sääntöjä"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Mahdollisuudesta myyntimahdollisuukdeksi (kumppani)"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2067,12 +2099,12 @@ msgstr "Sijainti"
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "Vastaa"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Viikot"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -2091,6 +2123,8 @@ msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
 msgstr ""
+"Luo erilaisia kokouskategorioita organisoidaksesi ja luokitellaksesi "
+"kokouksesi paremmin."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2111,7 +2145,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Odotettu liikevaihto"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -2122,12 +2156,13 @@ msgstr ""
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Tyyppiä käytetään erottamaan mahdollisuudet ja myyntimahdollisuudet"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
+"Oletko varma että haluat luoda kumppanin perustuen tähän puhelinsoittoon ?"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -2149,19 +2184,19 @@ msgstr ""
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Toista x kertaa"
 
 #. 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 "Myyntitiimit"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Mahdollisuus kumppanille"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2173,7 +2208,7 @@ msgstr "Segmentointi"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Tiimi"
 
 #. module: crm
 #: field:crm.installer,outlook:0
@@ -2190,7 +2225,7 @@ msgstr "Ei pidätetty"
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Todennäköisyys"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2207,7 +2242,7 @@ msgstr "Kuukausi"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Mahdollisuudet"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2228,34 +2263,36 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Luo uusi kumppani"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspvm"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
 msgid "Todo"
-msgstr ""
+msgstr "Tehtävät"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegoi"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "Kieltäydy"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Jos tilaus on valittu, tämä kontakti on hyväksynyt sähköpostien "
+"vastaanottamisen"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2272,7 +2309,7 @@ msgstr "Huomautus"
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2299,7 +2336,7 @@ msgstr "Suljettu"
 #. module: crm
 #: view:crm.installer:0
 msgid "Plug-In"
-msgstr ""
+msgstr "Liitännäinen"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2344,7 +2381,7 @@ msgstr "Puhelinsoitot"
 #: help:crm.lead.report,delay_open:0
 #: help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Päivien määrä tapauksen avaamiseen"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2365,7 +2402,7 @@ msgstr "Aktiivinen"
 #: code:addons/crm/crm_lead.py:306
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "Mahdollisuuden '%s' tila on vaihdettu '%s'."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:282
@@ -2386,12 +2423,12 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Epävarma"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "Kopio"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -2438,12 +2475,12 @@ msgstr "Vähennys (0>1)"
 #: view:crm.lead:0
 #: view:crm.send.mail:0
 msgid "Attachments"
-msgstr ""
+msgstr "Liitteet"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Viikoittainen"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:72
@@ -2451,12 +2488,12 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:270
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "Sähköpostia ei voi lähettää!"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "Sekalaiset"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -2474,7 +2511,7 @@ msgstr "Valmis"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Toista joka (päivä/viikko/kuukausi/vuosi)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2504,59 +2541,59 @@ msgstr "Avoin"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Tiistai"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Kaupunki"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Kiireinen"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Toistuu joka"
 
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Toistuva"
 
 #. module: crm
 #: code:addons/crm/crm.py:397
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "Tapaus '%s' on peruttu."
 
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Mahdollisuudesta tarjoukseen"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
 msgid "Send new email"
-msgstr ""
+msgstr "Lähetä uusi sähköposti"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Omat avoimet mahdollisuudet"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "CRM - tilastojen työpöytä"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2569,7 +2606,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Päätyötehtävä"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2586,13 +2623,13 @@ msgstr "Oletko varma, että haluat luoda kumppanin perustuen tähän johtoon ?"
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Kokouksen tyyppi"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr ""
+msgstr "Yhdistä olemassaolevaan mahdollisuuteen"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2611,12 +2648,12 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Kolmas"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2630,54 +2667,54 @@ msgstr ""
 #. module: crm
 #: view:board.board:0
 msgid "My Win/Lost Ratio for the Last Year"
-msgstr ""
+msgstr "Oma voitto/häviö suhde viimeisen vuoden ajalle"
 
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "Sähköpostien määrä"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Hae liidejä"
 
 #. 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 "Viive avaamiseen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Toiston jakso"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Viikonpäivä"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Viittaaja"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr ""
+msgstr "Mahdollisuudesta myyntimahdollisuudeksi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Osallistujan tiedot"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2692,12 +2729,12 @@ msgstr "Jatka prosessia"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "Konfiguroi CRM ohjelmistosi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Soitto kumppanille"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -2705,18 +2742,19 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "into opportunity"
 msgstr ""
+"Tulevan kumppanin nimi joka luodaan muutettaessa liidi mahdollisuudeksi"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Määritä tehtävä käyttäjälle"
 
 #. module: crm
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Aseta uudeksi tilaksi"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2735,42 +2773,42 @@ msgstr "Kesto"
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Vastausosoite"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Myynnin työpöytä"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:56
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Liidiin on jo määritelty kumppani."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Tapahtumien lukumäärä"
 
 #. module: crm
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Myyntitiimi jolle tapaus kuuluu"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Sunnuntai"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Neljäs"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2783,12 +2821,12 @@ msgstr "Muuttamaton"
 #: 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 "Kumppanien segmentointi"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Faksi"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2809,7 +2847,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Tehtäväksianto"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2824,12 +2862,12 @@ msgstr "Yritys"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Perjantai"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "koko päivän"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -2840,51 +2878,51 @@ msgstr "Pakollinen / Vapaasti valittava"
 #: 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 "Kokouskutsut"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Objektin nimi"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "Kontaktin sähköpostiosoite"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Viitannut"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Lisää sisäinen huomautus"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "Mahdollisuuden tila '%s' on muutettu '%s':ksi"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Viimeinen"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Viestit"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr ""
+msgstr "Vaihda seuraavan ja edellisen vaiheen todennäköisyyksiä."
 
 #. module: crm
 #: code:addons/crm/crm.py:455
@@ -2899,7 +2937,7 @@ msgstr "Virhe!"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Soiton yhteenveto"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2916,29 +2954,29 @@ msgstr "Peruutettu"
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Viestin runko"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Omat suunnitellut liikevaihdot vaiheittain"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Päättymispäivä"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Kuukausi   "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Linkit"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2955,6 +2993,7 @@ 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 ""
+"Jos kumppani ei ole ostanut tänä aikana, laske tilaa tällä kertoimella."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2968,29 +3007,29 @@ msgstr ""
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mailgateway"
-msgstr ""
+msgstr "Sähköpostin välityspalvelin"
 
 #. module: crm
 #: help:crm.lead,user_id:0
 msgid "By Default Salesman is Administrator when create New User"
-msgstr ""
+msgstr "Oletuksena myyjä on administrator kun luodaan uusi käyttäjä"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "Sähköpostien määrä"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varoitus"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 #: view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Soiton yhteenveto"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -3000,12 +3039,12 @@ msgstr "Operaattori"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Puhelusta puheluun"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Aikataulu/loki soitto"
 
 #. module: crm
 #: field:crm.installer,fetchmail:0
@@ -3027,12 +3066,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Vahvista"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Su"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -3042,7 +3081,7 @@ msgstr "Osio"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Suunniteltu liikevaihto yhteensä"
 
 #. module: crm
 #: code:addons/crm/crm.py:375
@@ -3050,7 +3089,7 @@ msgstr ""
 msgid ""
 "You can not escalate, You are already at the top level regarding your sales-"
 "team category."
-msgstr ""
+msgstr "Et voi eskaloida. Olet jo myyntitiimin kategorian ylätasolla."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -3060,12 +3099,12 @@ msgstr "Lisämääritys"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Kuukauden päivä"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Onnistumistodennäköisyys (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3076,7 +3115,7 @@ msgstr "Uusi"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail TO"
-msgstr ""
+msgstr "Sähköpostia vastaanottajalle"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3098,19 +3137,19 @@ msgstr "Kanava"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule Call"
-msgstr ""
+msgstr "Aikatauluta soitto"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr ""
+msgstr "Suljettuja/peruttuja liidejä ei voida muuttaa mahdollisuuksiksi"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "Profilointi"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -3124,55 +3163,55 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Poikkeus päivät/ajankohdat"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Luottamuksellinen"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "Määräpäivä lasketaan automaattisesti alkupäivä + kesto"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Osavaltio"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Bisnesmahdollisuuksien luonti liideistä."
 
 #. module: crm
 #: help:crm.send.mail,html:0
 msgid "Select this if you want to send email with HTML formatting."
-msgstr ""
+msgstr "Valitse tämä jos haluat lähettää sähköpostia HTML formaatissa."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Tarvitsee tietoa"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Mahdollinen mahdollisuus"
 
 #. module: crm
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "CRM ohjelmiston konfiguraatio"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Aseta kategoriaksi"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3182,7 +3221,7 @@ msgstr "Asetukset"
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "To"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3199,17 +3238,17 @@ msgstr "_Peruuta"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Kuukausi-1    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr ""
+msgstr "Moduuli yhdistää mahdollisuuksienhallinnan myyntiin CRM:ssä."
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Päivittäin"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -3220,12 +3259,12 @@ msgstr ""
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Vaiheiden määritykset"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "Ensimmäinen"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3237,7 +3276,7 @@ msgstr "Joulukuu"
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -3264,7 +3303,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Aikavyöhyke"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
@@ -3276,7 +3315,7 @@ msgstr "Viesti"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "La"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3289,12 +3328,12 @@ msgstr "Myyjä"
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Arvioitu sulkeminen"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Mahdollisuudesta soitoksi"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3309,7 +3348,7 @@ msgstr "Ajoita tapaaminen"
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Kumppanin Nimi"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3322,13 +3361,13 @@ msgstr "Lähtevä"
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Avattu"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Tiimin jäsenet"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3337,17 +3376,17 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontaktit"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Kiinnostunut tietokoneista"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Kutsun yksityiskohdat"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3361,11 +3400,14 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Nämä sähköpostiosoitteet lisätään cc (kopio viestistä) kenttään tähän "
+"tietueeseen liittyvien sähköpostien osalta. Erota useammat osoitteet "
+"pilkulla."
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3389,7 +3431,7 @@ msgstr "Luonnos"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Tapaukset myyntitiimeittäin"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
@@ -3408,33 +3450,33 @@ msgstr "Kokous"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Tapauksen kategoria"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 päivää"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Suunniteltu liikevaihto vaiheittain ja käyttäjittäin"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Kommunikaatio ja historia"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "CRM liidi raportti"
 
 #. module: crm
 #: field:crm.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -3447,13 +3489,13 @@ msgstr "Normaali"
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Katuosoite2"
 
 #. 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 "Kokousten kategoriat"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -3465,7 +3507,7 @@ msgstr "Sinun täytyy varmistaa ettei tämä kumppani ole jo olemassa."
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Viive avaamiseen"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -3484,12 +3526,12 @@ msgstr "Marraskuu"
 #: code:addons/crm/crm_action_rule.py:67
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Sähköpostiosoitetta ei löytynyt yrityksen tiedoista!"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Mahdollisuudet vaiheittain"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@@ -3515,7 +3557,7 @@ msgstr ""
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Sopimus"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
@@ -3534,23 +3576,23 @@ msgstr "Virhe"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Suunniteltu liikevaihto"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Tarvitsee konsultointia"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "virhe! Et voi luoda rekursiivisia profiileja."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:232
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "Tapaus '%s' on suljettu"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0
@@ -3562,18 +3604,18 @@ msgstr "Kumppanin Yhteystiedot"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Toistuvan ID:n päiväys"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr ""
+msgstr "Yhdistetty mahdollisuuteen %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:347
@@ -3581,50 +3623,50 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Categorization"
-msgstr ""
+msgstr "Kategorisointi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Toimintosäännöt"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Toistuvuus"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Soitto"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Torstai"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Vastaanottaja"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Yksityinen"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3645,7 +3687,7 @@ msgstr "Mielentila"
 #: field:crm.segmentation,description:0
 #: view:res.partner:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0
@@ -3665,79 +3707,79 @@ msgstr ""
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Myyntitiimi"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Kiinnostunut lisätarvikkeista"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "Mahdollisuus '%s' on avattu"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Sähköpostien määrä"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Katu"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Mahdollisuudet käyttäjittäin ja tiimeittäin"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Työtunnit"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Asiakas"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 #: view:res.partner:0
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Ajoita tapaaminen"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Hävitty"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Maa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3750,40 +3792,40 @@ msgstr "Muunna mahdollisuudeksi"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Keskiviikko"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Kamppanjan nimi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Puhelinsoitot käyttäjittäin ja osastoittain"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Yhdistä olemassaolevaan mahdollisuuteen"
 
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Vaihtoehto"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Neuvottelu"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3794,17 +3836,17 @@ msgstr ""
 #: field:crm.case.stage,sequence:0
 #: field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Viestin runko"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3814,18 +3856,18 @@ msgstr "Kontrollimuuttuja"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Sekunti"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Ehdotus"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Puhelinsoitot"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3833,12 +3875,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Uutiskirje"
 
 #~ msgid "Base Information"
 #~ msgstr "Perustiedot"
@@ -4220,13 +4262,6 @@ msgstr ""
 #~ msgid "All "
 #~ msgstr "Kaikki "
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Jos kumppani ei ole hankkinut (tai ostanut) ajanjaksolla, vähennä "
-#~ "mielentilaa tällä kertoimella."
-
 #~ msgid "All Histories"
 #~ msgstr "Kaikki historiat"
 
@@ -4266,114 +4301,18 @@ msgstr ""
 #~ msgid "Business Opportunities"
 #~ msgstr "Liiketoimintamahdollisuudet"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Päivää    "
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Hallinnoi Helpdesk-palvelua."
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Odottavat tehtävät"
-
-#~ msgid "Close Lead"
-#~ msgstr "Sulje vihje"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Tapahtumat osion ja kategoria2:n mukaan"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Tämä ominaisuus määrittelee listan päivä/aika poikkeuksia toistuvissa "
-#~ "kalenterin osissa."
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Valitse tämä, jos haluat säännön lähettävän sähköpostia vastuuhenkilölle."
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Hallinnoi toimittajien ja asiakkaiden reklamaatioita, sisältäen sinun "
-#~ "korjaavat tai estävät toiminnot."
-
-#~ msgid "Human Resources"
-#~ msgstr "Henkilöstö resurssit"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Tapahtumat mahdollisuuksien, kategorian ja tyypin mukaan"
-
-#~ msgid "Close job request"
-#~ msgstr "Sulje tehtäväpyyntö"
-
 #~ msgid "Cases"
 #~ msgstr "Tapaukset"
 
-#~ msgid "TRANSPARENT"
-#~ msgstr "LÄPINÄKYVÄ"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Osio johon tapaus kuuluu. Määritä vastuuhenkilö ja sähköpostitili "
-#~ "yhdyskäytävälle"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Ole hyvä ja määritä käyttäjän sähköpostiosoite !"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Kuvaa toiminnon nimen esim. riippuen kohteen toiminnoista ja olosuhteista"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Kesto (tunteina)"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Tapahtumat osion ja vaiheen mukaan"
-
 #~ msgid "Case Section"
 #~ msgstr "Tapauksen osio"
 
-#~ msgid "Cases by section and stage"
-#~ msgstr "Tapaukset osion ja vaiheen mukaan"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "Antaa jonon järjestyksen, kun näytetään lista tapauksien osioista."
-
 #~ msgid "None"
 #~ msgstr "Ei mitään"
 
-#~ msgid "Proposed Salary"
-#~ msgstr "Ehdotettu palkka"
-
-#~ msgid "Second Interview"
-#~ msgstr "Toinen haastattelu"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "Jäljittää tunnistetut liiketoimintamahdollisuudet myyntikanavalle."
-
-#~ msgid "Exception Dates"
-#~ msgstr "Poikkeuspäivät"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Kirjaudu etäkalenteriin"
-
 #~ msgid "Delay type"
 #~ msgstr "Viivästyksen tyyppi"
 
-#~ msgid "Description Information"
-#~ msgstr "Kuvauksen tiedot"
-
-#~ msgid "Next Interview"
-#~ msgstr "Seuraava haastattelu"
-
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
@@ -4382,39 +4321,6 @@ msgstr ""
 #~ "täytettyihin kenttiin, jotta sääntö voi suorittaa toiminnon, joka on kuvattu "
 #~ "\"Toiminnot\" -välilehdellä."
 
-#~ msgid "Exception Rules"
-#~ msgstr "Poikkeussäännöt"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Hyväksytty vaateena"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Kanavat kuvaavat erilaisia viestintämuotoja asiakkaan kanssa. Jokaiselle "
-#~ "kaupalliselle mahdollisuudella voit osoittaa kanavan, josta mahdollisuus oli "
-#~ "peräisin."
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Vahvista tapaaminen"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Olemassa oleva asiakas"
-
-#~ msgid "Home"
-#~ msgstr "Koti"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Tapahtumat osion, kategorian ja vaiheen mukaan"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Valitse tämä jos haluat säännön liittävän sähköpostille muita vastaanottajia."
-
 #~ msgid "Status"
 #~ msgstr "Tila"
 
@@ -4431,27 +4337,6 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
 
-#~ msgid "Refused by Company"
-#~ msgstr "Hylätty yhtiön toimesta"
-
-#~ msgid "Add CC"
-#~ msgstr "Lisää vastaanottaja"
-
-#~ msgid "All Meetings"
-#~ msgstr "Kaikki kokoukset"
-
-#~ msgid "   Today   "
-#~ msgstr "   Tänään   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Salli kalenterin näyttäminen"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Puhelinsoiton kuvaus"
-
-#~ msgid "New Business"
-#~ msgstr "Uusi liiketoimi"
-
 #, python-format
 #~ msgid ""
 #~ "You must define a responsible user for this case in order to use this action!"
@@ -4459,52 +4344,9 @@ msgstr ""
 #~ "Sinun täytyy määrittää vastuuhenkilö tälle tapaukselle käyttääksesi tätä "
 #~ "toimintoa!"
 
-#~ msgid "Negotiation/Review"
-#~ msgstr "Neuvottelu/Katsaus"
-
-#~ msgid "Related Cases"
-#~ msgstr "Liittyvät tapaukset"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Työpaikat - Palkkausprosessi"
-
-#~ msgid "Existing Business"
-#~ msgstr "Olemassa oleva liiketoimi"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Sopimus allekirjoitettu"
-
-#~ msgid "All Leads"
-#~ msgstr "Kaikki vihjeet"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Tapahtumat mahdollisuuksien ja vaiheen mukaan"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Tosiasialliset vaateet"
-
-#~ msgid "Emails"
-#~ msgstr "Sähköpostit"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Vihjetapaukset"
-
 #~ msgid "Set state to"
 #~ msgstr "Aseta tilaksi"
 
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Tähän osioon liittyvä kategoria jakaa CRM-tapaukset yksittäin tai osioittain."
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Tallenna .ics muodossa"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Sähköposti!"
-
 #~ msgid ""
 #~ "Check if the category is limited to partners that match the segmentation "
 #~ "criterions. If checked, remove the category from partners that doesn't match "
@@ -4517,112 +4359,23 @@ msgstr ""
 #~ msgid "Trigger Date"
 #~ msgstr "Laukaisupäivämäärä"
 
-#~ msgid "Set State to"
-#~ msgstr "Aseta tilaksi"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Vastausosoitetta ei ole määritelty!"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Suunnittele tapaaminen"
-
 #~ msgid "Rules"
 #~ msgstr "Säännöt"
 
-#~ msgid "Direction"
-#~ msgstr "Suunta"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Nämä henkilöt saavat jatkossa kopion kumppanin ja käyttäjän välisestä "
-#~ "viestinnästä."
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Palvelimen laukaistava toiminto"
-
-#~ msgid "Send to"
-#~ msgstr "Vastaanottaja"
-
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(kumppani)t = Kumppanin nimi"
 
-#~ msgid "Junior Developer"
-#~ msgstr "Nuorempi kehittäjä"
-
-#~ msgid "Preventive"
-#~ msgstr "Ennaltaehkäisevä"
-
-#~ msgid "Category Name"
-#~ msgstr "Kategorian nimi"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Et voi valita suljettua tapausta"
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Toistumissääntö"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Ehdokas kieltäytynyt"
-
-#~ msgid "Print"
-#~ msgstr "Tulosta"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Tapahtumat mahdollisuuden, kategorian ja vaiheen mukaan"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Odottavat vaateet"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 
-#~ msgid "Closed Won"
-#~ msgstr "Suljettu voitettuna"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Jos aktiivisen kentän arvoksi asetetaan TOSI, sallii se sinun piilottaa "
-#~ "tapauksen osiot poistamatta niitä."
-
-#~ msgid "Learning And Education"
-#~ msgstr "Oppiminen ja koulutus"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr "Haluatko varmasti luoda kumppanin tämän puhelun perusteella?"
-
 #, python-format
 #~ msgid "You can not delete this case. You should better cancel it."
 #~ msgstr "Et voi poistaa tätä kohtaa. Sinun olisi parempi peruuttaa se."
 
-#~ msgid "Message..."
-#~ msgstr "Viesti..."
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Muunna kumppaniksi"
-
 #, python-format
 #~ msgid "done"
 #~ msgstr "valmis"
 
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Auttaa sinua organisoimaan palkkausprosessin: arvioinnin, taapaamiset, "
-#~ "sähköpostineuvottelut..."
-
-#~ msgid "Website"
-#~ msgstr "Verkkosivu"
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Tapahtumat osion ja kategoria2:n mukaan"
-
 #, python-format
 #~ msgid "draft"
 #~ msgstr "luonnos"
@@ -4631,199 +4384,18 @@ msgstr ""
 #~ msgid "open"
 #~ msgstr "avaa"
 
-#~ msgid "Awaiting Response"
-#~ msgstr "Odottaa vastausta"
-
-#~ msgid "Amount"
-#~ msgstr "Määrä"
-
-#~ msgid "Appreciation"
-#~ msgstr "Arvonnousu"
-
-#~ msgid "Fixed"
-#~ msgstr "Ennalta määrätty"
-
-#~ msgid "Dead"
-#~ msgstr "Kuollut"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Arvoesitys"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Kokouspuu"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Vaateen päivämäärä"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Kokouslomake"
-
-#~ msgid "Assigned to"
-#~ msgstr "Annettu toimeksi"
-
-#~ msgid "My Funds"
-#~ msgstr "Omat rahastot"
-
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Seuraavat kokoukset"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Kokouksen päivämäärä"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Tilaa"
-
-#~ msgid "Value Claims"
-#~ msgstr "Arvovaateet"
-
-#~ msgid "Self Generated"
-#~ msgstr "Itsestään luotu"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Ehdokkaan nimi"
-
-#~ msgid "Funds"
-#~ msgstr "Rahastot"
-
-#~ msgid "Won't fix"
-#~ msgstr "Ei korjaa"
-
-#~ msgid "Converted"
-#~ msgstr "Muunnettu"
-
-#~ msgid "Type of claim"
-#~ msgstr "Vaateen tyyppi"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Työpaikat - Rekrytointipuu"
-
-#~ msgid "Mail"
-#~ msgstr "Posti"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Tarvitsee analysoinnin"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Vaadi kustannus"
-
-#~ msgid "Other Info"
-#~ msgstr "Muut tiedot"
-
 #~ msgid "General Description"
 #~ msgstr "Yleinen kuvaus"
 
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Hallinnoi käyttäjien tapaamiskalenteria"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Myyntivaihe"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Suljettu menetys"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Seuraava kokous"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
 #~ msgid "Actions"
 #~ msgstr "Toimenpiteet"
 
-#~ msgid "Campaign Type"
-#~ msgstr "Kampanjatyyppi"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Ohjelmointivirheiden jäljitys"
-
-#~ msgid "Graduate"
-#~ msgstr "Valmistua"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Huomaa, että voit käyttää kalenterinäkymää myös suunnitellaksesi graafisesti "
-#~ "seuraavan kokouksesi."
-
-#~ msgid "Leads Tree"
-#~ msgstr "Opaspuu"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Virhe! Et voi luoda rekursiivisia osioita."
-
-#~ msgid "Attendee"
-#~ msgstr "Osanottaja"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Arvioitu tuotto"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Alkutöiden tarve"
-
-#~ msgid "This Year"
-#~ msgstr "Tänä vuonna"
-
-#~ msgid "Contract Data"
-#~ msgstr "Sopimuksen tiedot (data)"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Tapahtumat johdon ja tyypin mukaan"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Jaettu kalenteri"
-
-#~ msgid "Claims Info"
-#~ msgstr "Vaade tiedot"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Tapahtuma kategoria2 nimi"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Muunna kumppaniksi"
-
-#~ msgid "Source"
-#~ msgstr "Lähde"
-
 #~ msgid "Created"
 #~ msgstr "Luotu"
 
 #~ msgid "Telesales"
 #~ msgstr "Puhelinmyynnit"
 
-#~ msgid "Stage: "
-#~ msgstr "Vaihe: "
-
-#~ msgid "Payment Mode"
-#~ msgstr "Maksutapa"
-
-#~ msgid "Job Info"
-#~ msgstr "Työtehtävän tiedot"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Peruuta kokous/tapaaminen"
-
-#~ msgid "Employee Email"
-#~ msgstr "Työntekijän sähköposti"
-
-#~ msgid "Send Email"
-#~ msgstr "Lähetä sähköpostia"
-
-#~ msgid "Corrective"
-#~ msgstr "Tarkennus"
-
-#~ msgid "Jobs"
-#~ msgstr "Työpaikat"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Työpaikat - Rekrytointilomake"
-
-#~ msgid "Credit Card"
-#~ msgstr "Luottokortti"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
@@ -4832,209 +4404,27 @@ msgstr ""
 #~ "Ei löydettyä sähköposti ID:tä vastaavalle kumppanille tai puuttuva "
 #~ "vastausosoite tässä osiossa!"
 
-#~ msgid "Delay Close"
-#~ msgstr "Viivytä sulkemista"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr "Tämä saattaa auttaa yhteisöjä varainhankinnassa ja sen seurannassa."
-
 #~ msgid "Log"
 #~ msgstr "Loki"
 
-#~ msgid "Candidate Name2"
-#~ msgstr "Ehdokasnimi 2"
-
-#~ msgid "Events"
-#~ msgstr "Tapahtumat"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Sallii sinun seuraavan ja hallinoimaan oppaita jotka ovat esi-myynti "
-#~ "pyyntöjä tai yhteystietoja. Ensimmäinen yhteydenotto asiakkaan pyyntöön."
-
 #, python-format
 #~ msgid "cancel"
 #~ msgstr "Peruuta"
 
-#~ msgid "Cheque"
-#~ msgstr "Šekki"
-
-#~ msgid "Degree"
-#~ msgstr "Tutkinto"
-
 #~ msgid "General"
 #~ msgstr "Yleiset"
 
-#~ msgid "Recycled"
-#~ msgstr "Kierrätetty"
-
-#~ msgid "Category2 of case"
-#~ msgstr "tapahtuman kategoria2"
-
-#~ msgid "Sales"
-#~ msgstr "Myynnit"
-
-#~ msgid "Assigned"
-#~ msgstr "Määrätty"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Aseta kokous"
-
-#~ msgid "Invalid"
-#~ msgstr "Virheellinen"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Tapahtumat vaiheen ja arvioiden mukaan"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Kokouskalenteri"
-
-#~ msgid "First Interview"
-#~ msgstr "Ensimmäinen haastattelu"
-
-#~ msgid "This Month"
-#~ msgstr "Tässä kuussa"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Hylätty työntekijän toimesta"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Kokous ohjausten luomiseksi"
-
-#~ msgid "All Claims"
-#~ msgstr "Kaikki vaateet"
-
-#~ msgid "Related Case"
-#~ msgstr "Liittyvä tapahtuma"
-
-#~ msgid "Email Address"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Server Action"
-#~ msgstr "Palvelintoiminto"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Saatavuus (viikoissa)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Mahdollisuuksien puu"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Vaatimusluonnos"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Tapahtumat osion, kategorian ja vaiheen mukaan"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Ehdokas palkattu"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Rekrytointiprosessi"
-
-#~ msgid "Funds Form"
-#~ msgstr "Varat -lomake"
-
-#~ msgid "Goals"
-#~ msgstr "Tavoitteet"
-
-#~ msgid "In Process"
-#~ msgstr "Työn alla"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Jälkimyyntipalvelut"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Tapahtumat osion ja tyypin mukaan"
-
-#~ msgid "File name"
-#~ msgstr "Tiedostonimi"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Tapahtumat mahdollisuuden ja tyypin mukaan"
-
-#~ msgid "Import ICS"
-#~ msgstr "Tuo ICS-tiedosto"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Kaikki työpaikkapyynnöt"
-
-#~ msgid "Relevant"
-#~ msgstr "Oleellinen"
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Tapahtumat ohjauksen ja vaiheen mukaan"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Virheelliset argumentit"
 
-#~ msgid "Reporting"
-#~ msgstr "Raportointi"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Oletettu palkka"
-
-#~ msgid "Word of mouth"
-#~ msgstr "Suusanallinen"
-
-#~ msgid "Type of Action"
-#~ msgstr "Toiminnon tyyppi"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Ehdokkaiden tapaaminen"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Ehdokkaan sähköposti"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Myyntien vaihe: "
-
-#~ msgid "Planned"
-#~ msgstr "Suunniteltu"
-
-#~ msgid "Customer Office"
-#~ msgstr "Asiakkaan toimisto"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Ohjausaihe"
-
 #~ msgid "Calendar"
 #~ msgstr "Kalenteri"
 
-#~ msgid "Arts And Culture"
-#~ msgstr "Taide ja Kulttuuri"
-
-#~ msgid "All Funds"
-#~ msgstr "Kaikki varat"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Varojen puu"
-
-#~ msgid "HelpDesk"
-#~ msgstr "HelpDesk"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Tapahtumat osion, kategorian ja tyypin mukaan"
-
-#~ msgid "Licenced"
-#~ msgstr "Lisensöity"
-
 #, python-format
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr ""
 #~ "Sinun täytyy laittaa kumppanin sähköpostiosoite käyttääksesi tätä toimintoa!"
 
-#~ msgid "Office"
-#~ msgstr "Toimisto"
-
-#~ msgid "Healthcare"
-#~ msgstr "Terveydenhoito"
-
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
@@ -5042,5 +4432,5 @@ msgstr ""
 #~ "Sähköpostia ei voi lähettää tyhjällä viesti -kentällä. Sinulla tulisi olla "
 #~ "kuvaus viesti -kentässä"
 
-#~ msgid "Email Add CC"
-#~ msgstr "Lisää sähköpostin vastaanottaja"
+#~ msgid "Mail Campaign 1"
+#~ msgstr "postituskampanja 1"
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index dea99870f62..a7a31bf5b75 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-18 16:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-09-26 12:10+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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Le code de l'équipe de vente doit être unique !"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "La piste \"%s\" a été convertie en opportunité."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Aucune répetition"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -553,9 +553,9 @@ msgstr "Tout premier contact avec un nouveau prospect"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -845,8 +845,8 @@ msgid "Statistics Dashboard"
 msgstr "Tableau de bord de statistiques"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1035,7 +1035,7 @@ msgstr "Convertir en opportunité "
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
-"Défini l'ordre d'affichage des étapes de prospection dans les listes."
+"Définit l'ordre d'affichage des étapes de prospection dans les listes."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1159,7 +1159,7 @@ msgstr "Accepte la prospection"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2512,7 +2512,7 @@ msgstr "L'étape de l'opportunité \"%s\" a été changé à \"%s\"."
 #: code:addons/crm/crm_lead.py:282
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "Etape passée à : %s"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2738,7 +2738,7 @@ msgid "Meeting Type"
 msgstr "Type de réunion"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Fusionner avec une opportunité existante"
@@ -3286,8 +3286,8 @@ msgid "Schedule Call"
 msgstr "Planifier un appel"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4493,13 +4493,6 @@ msgstr "Lettre d'information"
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Conditions sur le niveau de priorité"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Si le partenaire n'a pas acheté pendant une période, diminue l'état d'esprit "
-#~ "par ce facteur. C'est une multiplication"
-
 #~ msgid "All "
 #~ msgstr "Tous "
 
@@ -4554,9 +4547,6 @@ msgstr "Lettre d'information"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Mail aux Cc"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Actions"
 
@@ -4597,179 +4587,9 @@ msgstr "Lettre d'information"
 #~ "Impossible d'envoyer un courriel vide, le corps du courriel doit comporter "
 #~ "du texte"
 
-#~ msgid "Close Lead"
-#~ msgstr "Cloture une affaire"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr ""
-#~ "S'il vous plaît indiquez l'adresse  de messagerie électronique de "
-#~ "l'utilisateur !"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Jours    "
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Travaux en attente."
-
-#~ msgid "Close job request"
-#~ msgstr "Fermer la demande d’emploi."
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Cette propriété définit la liste des exceptions de dates / temps pour les "
-#~ "composant de calendrier récurent."
-
-#~ msgid "Send to"
-#~ msgstr "Envoyer à :"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Cochez cette case si vous voulez que la règle envoie un email à la personne "
-#~ "responsable."
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "TRANSPARENT"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr ""
-#~ "Donne l'ordre de séquence lors de l'affichage d'une liste de cas.de sections"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Section à laquelle l'affaire appartient. Préciser l'utilisateur responsable "
-#~ "et le compte de messagerie pour la passerelle de messagerie."
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Décrit le nom de l'action. par exemple : sur quel objet quel action de base "
-#~ "doit prendre quel  condition"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Gérer un service de support"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Cas par section et catégorie2"
-
-#~ msgid "Amount"
-#~ msgstr "Montant"
-
-#~ msgid "Human Resources"
-#~ msgstr "Ressources humaines"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Cas par opportunités, catégorie et type"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Gérér les réclamations fournisseurs et clients, incluant vos actions "
-#~ "correctives ou préventives."
-
-#~ msgid "Fixed"
-#~ msgstr "Fixé"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Durée (heures)"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Cas par section et étape"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Cas par section et étape"
-
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Des mots clés spéciaux peuvent être utilisés dans le corps"
 
-#~ msgid "Proposed Salary"
-#~ msgstr "Salaire proposé"
-
-#~ msgid "Appreciation"
-#~ msgstr "Appréciation"
-
-#~ msgid "Second Interview"
-#~ msgstr "Second entretien"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "Suivi des occasions identifiées d'affaires pour vos canaux de vente."
-
-#~ msgid "Exception Dates"
-#~ msgstr "Exceptions de date"
-
-#~ msgid "Description Information"
-#~ msgstr "Description de l'information"
-
-#~ msgid "Dead"
-#~ msgstr "Perdu"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Confirmer le rendez-vous"
-
-#~ msgid "Next Interview"
-#~ msgstr "Prochain entretien"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Client existant"
-
-#~ msgid "Home"
-#~ msgstr "Accueil"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Cas par section catégorie et étape"
-
-#~ msgid "All Meetings"
-#~ msgstr "Tous les rendez-vous"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Liste des rendez vous"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Nouvelle proposition"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Refusé par la société"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Contrat proposé"
-
-#~ msgid "Assigned to"
-#~ msgstr "Assigné à"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Poste - Processus d'embauche"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Contrat signé"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Date de la réclamation"
-
-#~ msgid "All Leads"
-#~ msgstr "Toutes les affaires"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Cas par opportunités et étape"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Négociation/Rapport"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Sauvegarder dans le format .ics"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Réclamations factuelles"
-
-#~ msgid "Emails"
-#~ msgstr "Courriels"
-
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
@@ -4777,137 +4597,9 @@ msgstr "Lettre d'information"
 #~ "L'adresse mail mise dans le 'Répondre à' de tous les emails envoyés par "
 #~ "OpenERP a propos de cette section"
 
-#~ msgid "Direction"
-#~ msgstr "Direction"
-
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Catégorie en relation avec la section. Les cas sont subdivisé indépendamment "
-#~ "or par section"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Courriel !"
-
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Ces personnes recevront une copie de la communication future entre "
-#~ "partenaire et utilisateur par courriel"
-
-#~ msgid "Set State to"
-#~ msgstr "Mettre à l'état"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Planifier une réunion"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Pas de mail défini pour la réponse"
-
-#~ msgid "My Funds"
-#~ msgstr "Mes Fonds"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Développeur débutant"
-
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Description du cas"
 
-#~ msgid "Export ICS"
-#~ msgstr "Exporter en ICS"
-
-#~ msgid "Preventive"
-#~ msgstr "Préventif"
-
-#~ msgid "Category Name"
-#~ msgstr "Nom de la catégorie"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Vous ne pouvez assigner sur un cas clôturé"
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Règle récurrente"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Candidat refusé"
-
-#~ msgid "Print"
-#~ msgstr "Imprimer"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Cas par opportunités, catégorie et étape"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Cas par section, catégorie et catégorie2"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Réclamations en attentes"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Date du rendez-vous"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Convertir en partenaire"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Formation et éducation"
-
-#~ msgid "Funds"
-#~ msgstr "Fonds"
-
-#~ msgid "Message..."
-#~ msgstr "Message..."
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Cas par section et catégorie2"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Assistant de création de rendez-vous"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Indique l'emplacement du rendez-vous"
-
-#~ msgid "Self Generated"
-#~ msgstr "Génération automatique"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Nom du candidat"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Répondre au dernier courriel"
-
-#~ msgid "Other Info"
-#~ msgstr "Autre information"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Coût de la réclamation"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Planifier un appel téléphonique"
-
-#~ msgid "Type of claim"
-#~ msgstr "Type de réclamation"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Gère le calendrier des rendez-vous des utilisateurs"
-
-#~ msgid "Mail"
-#~ msgstr "Courriel"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Étape de ventes"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Prochain rendez vous"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for your Company address or missing reply address in "
@@ -4916,126 +4608,9 @@ msgstr "Lettre d'information"
 #~ "Pas identifiant courriel trouvé pour cette adresse de société ou il manque "
 #~ "l'adresse de réponse dans cette section !"
 
-#~ msgid "Add a CC"
-#~ msgstr "Ajouter un CC"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Type de campagne"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Proposition/Demande de chiffrage"
-
-#~ msgid "Web"
-#~ msgstr "Site Internet"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Suivi des Bugs"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Fermé les perdus"
-
-#~ msgid "Graduate"
-#~ msgstr "Diplôme"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Notez que vous pouvez également utiliser la vue calendrier pour planifier "
-#~ "vos prochains rendez-vous"
-
-#~ msgid "Histories"
-#~ msgstr "Historique"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Courriel incorrect"
-
-#~ msgid "Attendee"
-#~ msgstr "Participant"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de sections récursives."
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Revenu estimé"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Demande initiale de l'embauche"
-
-#~ msgid "Claims Info"
-#~ msgstr "Information sur les réclamations"
-
-#~ msgid "This Year"
-#~ msgstr "Cette année"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Permet de synchroniser votre calendrier Open ERP avec votre téléphone, "
-#~ "Outlook, Sunbird, iCal, ..."
-
-#~ msgid "Contract Data"
-#~ msgstr "Données du contrat"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Cas par affaires et type"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Calendrier partagé"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Levée de Fonds"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Nom de la catégorie2 des cas"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Support Helpdesk"
-
-#~ msgid "Payment Mode"
-#~ msgstr "Mode de paiement"
-
-#~ msgid "Source"
-#~ msgstr "Origine"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Convertir en partenaire"
-
-#~ msgid " > Bac +5"
-#~ msgstr " > Bac +5"
-
 #~ msgid "Telesales"
 #~ msgstr "Ventes à distance"
 
-#~ msgid "Stage: "
-#~ msgstr "Étape: "
-
-#~ msgid "Jobs"
-#~ msgstr "Emplois"
-
-#~ msgid "Job Info"
-#~ msgstr "Information sur l'offre d'emploi"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Annuler un rendez vous"
-
-#~ msgid "Employee Email"
-#~ msgstr "Courriel de l'employé"
-
-#~ msgid "Prospecting"
-#~ msgstr "Prospection"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Date de création"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Formulaire de recrutement - offre d'emploi"
-
-#~ msgid "Credit Card"
-#~ msgstr "Carte de crédit"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
@@ -5044,639 +4619,17 @@ msgstr "Lettre d'information"
 #~ "Pas d'adresse courriel défini pour le partenaire responsable ou l'adresse de "
 #~ "réponse est manquante pour cette section !"
 
-#~ msgid "Send Email"
-#~ msgstr "Envoyer un courriel"
-
-#~ msgid "Delay Close"
-#~ msgstr "Delai de fermeture"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Nom du deuxième candidat"
-
-#~ msgid "Events"
-#~ msgstr "Évènements"
-
-#~ msgid "Cheque"
-#~ msgstr "Chèque"
-
-#~ msgid "Attachment1"
-#~ msgstr "Première pièce jointe"
-
-#~ msgid "Degree"
-#~ msgstr "Niveau"
-
-#~ msgid "Attachment3"
-#~ msgstr "Troisième pièce jointe"
-
-#~ msgid "Attachment2"
-#~ msgstr "Deuxième pièce jointe"
-
-#~ msgid "History of Events"
-#~ msgstr "Historique des événements"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Cas de la deuxième catégorie"
-
-#~ msgid "Recycled"
-#~ msgstr "Recyclée"
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Cas des appels téléphoniques"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Un partenaire existe déjà avec le même nom."
-
-#~ msgid "All Opportunities"
-#~ msgstr "Toutes les Opportunités"
-
-#~ msgid "Sales"
-#~ msgstr "Ventes"
-
-#~ msgid "Assigned"
-#~ msgstr "Assigné"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Planifier un rendez vous"
-
-#~ msgid "Invalid"
-#~ msgstr "Non valide"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Cas par Étape et Estimations"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Calendrier des rendez-vous"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Rendez vous pour la génération de l'affaire"
-
-#~ msgid "Related Case"
-#~ msgstr "Relation avec le cas"
-
-#~ msgid "Email Address"
-#~ msgstr "Courriel"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Disponibilité (semaines)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Liste des opportunités"
-
-#~ msgid "First Interview"
-#~ msgstr "Premier entretien"
-
-#~ msgid "This Month"
-#~ msgstr "Ce mois ci"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Refusé par l'employé"
-
-#~ msgid "All Claims"
-#~ msgstr "Toutes les réclamations"
-
-#~ msgid "Server Action"
-#~ msgstr "Action du Serveur"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Clôturer l'appel téléphonique"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Courriel non envoyé"
-
-#~ msgid "Funds Form"
-#~ msgstr "Formulaire des levés de fond"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Procédure de recrutement"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Candidat embauché"
-
-#~ msgid "Goals"
-#~ msgstr "Objectifs"
-
-#~ msgid "In Process"
-#~ msgstr "En cours"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Services après vente"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Cas par section et type"
-
-#~ msgid "File name"
-#~ msgstr "Nom du fichier"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Import ICS"
-#~ msgstr "Importer ICS"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Toutes les demandes d'emploi"
-
-#~ msgid "Relevant"
-#~ msgstr "Pertinence"
-
-#~ msgid "Applied Job"
-#~ msgstr "Job postulé"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Cas par opportunités et type"
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Cas par affaire et étape"
-
-#~ msgid "Reporting"
-#~ msgstr "Rapport"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Salaire demandé"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Envoyer un nouveau courriel"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Arguments non valides"
 
-#~ msgid "Trensparent"
-#~ msgstr "Transparent"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Liste des levées de fond"
-
-#~ msgid "Type of Action"
-#~ msgstr "Type d'action"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Entretien avec les candidats"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Courriel du candidat"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Étape de ventes: "
-
-#~ msgid "Planned"
-#~ msgstr "Planifié"
-
-#~ msgid "Customer Office"
-#~ msgstr "Bureau client"
-
-#~ msgid "All Funds"
-#~ msgstr "Tous les Fonds"
-
-#~ msgid "Qualication"
-#~ msgstr "Qualification"
-
-#~ msgid "Lead Details"
-#~ msgstr "Détails de l'affaire"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Arts et Culture"
-
-#~ msgid "HelpDesk"
-#~ msgstr "Assistance"
-
-#~ msgid "Change RRule"
-#~ msgstr "Change la règle"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Cas par section, catégorie et type"
-
-#~ msgid "Licenced"
-#~ msgstr "Permis"
-
 #~ msgid "Child Sections"
 #~ msgstr "Sections enfants"
 
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "CONFIDENTIEL"
-
-#~ msgid "Meeting date"
-#~ msgstr "Date de rendez vous"
-
-#~ msgid "Office"
-#~ msgstr "Bureau"
-
-#~ msgid "Assign"
-#~ msgstr "Assigner"
-
-#~ msgid "Healthcare"
-#~ msgstr "Soins médicaux"
-
-#~ msgid "Content of mail"
-#~ msgstr "Contenu du courriel"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Notes internes"
-
-#~ msgid "Employee"
-#~ msgstr "Employé"
-
-#~ msgid "_Import"
-#~ msgstr "_Importer"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Publipostage"
-
-#~ msgid "Not fixed"
-#~ msgstr "Non fixé"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Levée de fond par catégories"
-
-#~ msgid "Cash"
-#~ msgstr "Liquidités"
-
-#~ msgid "Future"
-#~ msgstr "Prévisionnelle"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Opérations de levée de fonds"
-
-#~ msgid "Related Cases"
-#~ msgstr "Cas en relation"
-
-#~ msgid "   Today   "
-#~ msgstr "   Aujourd'hui   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Autorise à montrer le calendrier"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Description de l'appel de téléphonique"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_S'abonner"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Liste des recrutements - offres d'emplois"
-
-#~ msgid "Exception Rules"
-#~ msgstr "Règle en exception"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Ajouter CC dans le courriel"
-
-#~ msgid "Expected Close Date"
-#~ msgstr "Date prévisionelle de clôture"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de l'objet invalide dans l'action défini"
 
-#~ msgid "Case Resource Type"
-#~ msgstr "Type de ressouce pour le cas"
-
-#~ msgid "Other Information"
-#~ msgstr "Autre information"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Le canal répresnte les différents mode de comunication disponible avec le "
-#~ "client. Avec chaque opportunité commercial, vous pouvez indiquer le canal "
-#~ "qui a cette opportunité source"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Réclamation accepté"
-
-#~ msgid "By Partner"
-#~ msgstr "Par partenaire"
-
-#~ msgid "Add CC"
-#~ msgstr "Ajouter CC"
-
-#~ msgid "New Business"
-#~ msgstr "Nouvelle affaire"
-
-#~ msgid "Modify this Occurrence"
-#~ msgstr "Modifier l'occurence"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Règle de réclamation"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Formulaire de rendez-vous"
-
-#~ msgid "Support Query"
-#~ msgstr "Demande de support"
-
-#~ msgid "Existing Business"
-#~ msgstr "Affaire existante"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Cas des prospections"
-
-#~ msgid "Helpdesk and Support"
-#~ msgstr "Assitance et support"
-
-#~ msgid "Model"
-#~ msgstr "Modèle"
-
-#~ msgid "Opportunity Stages"
-#~ msgstr "Étapes des opportunités"
-
-#~ msgid "Search Histories"
-#~ msgstr "Recherche dans l'historique"
-
-#~ msgid "Claim Type"
-#~ msgstr "Type de réclamation"
-
 #~ msgid "Planned Costs"
 #~ msgstr "Coût prévu"
 
-#~ msgid "Regex on Case Name"
-#~ msgstr "Expression réguière sur le nom du cas"
-
-#~ msgid "By Create Date"
-#~ msgstr "Par date de création"
-
-#~ msgid "Helpdesk Categories"
-#~ msgstr "Catégories d'assitance"
-
-#~ msgid "Receive"
-#~ msgstr "Recevoir"
-
-#~ msgid "Atendee details"
-#~ msgstr "Détail des participants"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr ""
-#~ "Êtes-vous sur de vouloir créer un partenaire basé sur cette appel "
-#~ "téléphonique ?"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Prochain rendez-vous"
-
-#~ msgid "Value Claims"
-#~ msgstr "Valuer de la réclamation"
-
-#~ msgid "Website"
-#~ msgstr "Site internet"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Réponse en attente"
-
-#~ msgid "Helpdesk Requests"
-#~ msgstr "Demandes d'assistance"
-
-#~ msgid "Won't fix"
-#~ msgstr "Ne sera pas corrigé"
-
-#~ msgid "Converted"
-#~ msgstr "Converti"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Demande brouillon"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Liste du support assistance"
-
-#~ msgid "Custom"
-#~ msgstr "Personnalisation"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Besoin d'analyse"
-
-#~ msgid "Search Claims"
-#~ msgstr "Recherche les réglamations"
-
-#~ msgid "Sales Section"
-#~ msgstr "Section des ventes"
-
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "Courriel des lecteurs (CC)"
-
-#~ msgid "Phonecall Stages"
-#~ msgstr "Étapes de l'appel téléphonique"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Liste des prospections"
-
-#~ msgid "By Responsible"
-#~ msgstr "Par responsable"
-
-#~ msgid "By Status"
-#~ msgstr "Par état"
-
-#~ msgid "Lead Name"
-#~ msgstr "Nom de la prospection"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nom de l'employé"
-
-#~ msgid "Lead Stages"
-#~ msgstr "Étapes de la prospection"
-
-#~ msgid "Lead Source"
-#~ msgstr "Source de la prospection"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Sujet de la prospection"
-
-#~ msgid "By Lead Source"
-#~ msgstr "Par source de prospection"
-
-#~ msgid "Lead Type Name"
-#~ msgstr "Nom du type de prospection"
-
-#~ msgid "Resource Type of case"
-#~ msgstr "Type de ressource du cas"
-
-#~ msgid "By Stage"
-#~ msgstr "Par étape"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Cas de l'assistance"
-
-#~ msgid "Lead should be in 'Open' state before converting to Opportunity."
-#~ msgstr ""
-#~ "La prospection devrait être en état 'Ouvert' avant d'être converti en "
-#~ "opportunité."
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr ""
-#~ "Ceci peut aider les associations dans leur procédure de collecte de fonds et "
-#~ "de suivi."
-
-#~ msgid "Repeat every x"
-#~ msgstr "Répéter tous les x"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalle"
-
-#~ msgid "Seconds"
-#~ msgstr "Secondes"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Réunion à propos du cas"
-
-#~ msgid "of"
-#~ msgstr "de"
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Calendrier de ressource"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Nombre de répétitions maxi"
-
-#~ msgid "Count"
-#~ msgstr "Comptage"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Si le champ actif est à \"Vrai\", cela vous permettra de cacher les alarmes "
-#~ "sans les supprimer."
-
-#~ msgid ""
-#~ "Create specific stages that will help your sales better organise their sales "
-#~ "pipeline by maintaining them to their leads and sales opportunities. It will "
-#~ "allow them to easily track how is positioned a specific lead or opportunity "
-#~ "in the sales cycle."
-#~ msgstr ""
-#~ "Créez des étapes spécifiques pour aider vos vendeurs à organiser leur ventes "
-#~ "en cours en les rapportant à leurs pistes et opportunités de vente. Cela "
-#~ "leur permet de suivre facilement où se trouve une piste ou une opportunité "
-#~ "dans le cycle de vente."
-
-#~ msgid ""
-#~ "'Leads' allows you to manage and keep track of all first potential interests "
-#~ "of a partner in one of your products or services. A lead is a first, "
-#~ "unqualified, contact with a prospect or customer. After being qualified, a "
-#~ "lead can be converted into a business opportunity with the creation of the "
-#~ "related partner for further detailed tracking of any linked activities. You "
-#~ "can use leads when you import a database of prospects or to integrate your "
-#~ "website's contact form with OpenERP."
-#~ msgstr ""
-#~ "Les \"pistes\" permettent de gérer et de suivre l'intérêt que peuvent porter "
-#~ "les partenaires à vos produits ou vos services. Une piste est un premier "
-#~ "contact, non qualifié, avec un prospect ou un client. Une fois qualifié, on "
-#~ "peut convertir une piste en opportunité d'affaires et enregistrer le "
-#~ "partenaire correspondant, de manière à suivre en détails toutes les "
-#~ "activités en rapport. Vous pouvez utiliser les pistes pour importer un "
-#~ "fichier de prospects ou pour intégrer les demandes de contact faites sur "
-#~ "votre site web."
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Campagne de courriels 1"
-
-#~ msgid ""
-#~ "Create specific categories that fit your company's  activities in order to "
-#~ "better classify and analyse them after they have been maintained in your "
-#~ "leads and opportunities. You can use categories to reflect your product "
-#~ "structure or the different types of sales you do."
-#~ msgstr ""
-#~ "Créez les catégories propres aux activités de votre société de manière à "
-#~ "mieux les classer et les analyser lorsqu'elles sont issues des pistes et des "
-#~ "opportunités. Les catégories peuvent refléter la structure de votre offre, "
-#~ "ou les différents types de ventes que vous faîtes."
-
-#~ msgid ""
-#~ "Sales team allows you to organize your different salesmen or departments "
-#~ "into separate teams. Each team will work in his own list of opportunities, "
-#~ "sales orders, eso. Each user can set a team by default in his preferences. "
-#~ "The opportunities and sales order he will see, will be automatically "
-#~ "filtered according to his team."
-#~ msgstr ""
-#~ "Une équipe commerciale vous permet d'organiser vos commerciaux ou "
-#~ "départements en équipes commerciales distinctes. Chaque équipe pourra "
-#~ "travailler sur sa propre liste d'opportunités, de commandes, etc. Chaque "
-#~ "utilisateur appartient à une équipe par défaut dans ses préférences. Les "
-#~ "opportunités et commandes qu'il pourra visualiser seront filtrées selon son "
-#~ "équipe."
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Régle de récurrence personnalisée"
-
-#~ msgid "Exclude range"
-#~ msgstr "Exclure la plage"
-
-#~ msgid "Claim"
-#~ msgstr "Réclamation"
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Créer une catégorie d'appels téléphoniques spécifique pour mieux trier le "
-#~ "suivi des types d'appels dans le système."
-
-#~ msgid ""
-#~ "The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
-#~ "call you get will appear on the partner form for the traceability of every "
-#~ "contact you get with a partner. From the call record, you can trigger a "
-#~ "request for another call, a meeting or a business opportunity."
-#~ msgstr ""
-#~ "L'outil \"Appels entrants\" enregistre les appels entrants à la volée. "
-#~ "Chaque appel vous apparaîtra sur le formulaire du partenaire afin de tracer "
-#~ "chaque contact obtenu. A partir de l'appel enregidté, on peut programmer un "
-#~ "nouvel appel, une réunion ou une opportunité d'affaires."
-
-#~ msgid ""
-#~ "'Meeting Invitations' allows you to create and manage the meeting "
-#~ "invitations sent/to be sent to your colleagues/partners."
-#~ msgstr ""
-#~ "\"Invitations à réunion\"  permet de créer et de gérer les invitations aux "
-#~ "réunions envoyées ou à envoyer aux collaborateurs et aux partenaires."
-
-#~ msgid ""
-#~ "Create specific partner categories that you will then be able to assign to "
-#~ "your partners to better manage your interactions with them. The segmentation "
-#~ "tool will assign categories to partners based on defined criteria."
-#~ msgstr ""
-#~ "Créer des catégories de partenaires que vous serez alors en mesure "
-#~ "d'affecter à vos partenaires afin de mieux gérer les interactions avec eux. "
-#~ "L'outil de segmentation affecte des catégories aux partenaires en fonction "
-#~ "des critères définis"
-
-#~ msgid ""
-#~ "Opportunities allows you to manage and keep track of your sales pipeline by "
-#~ "creating specific customer or prospect related sales documents in order to "
-#~ "follow up potential sales. Information such as the expected revenue, "
-#~ "opportunity stage, expected closing date, communication history and so on "
-#~ "can be maintained in them. Opportunities can be connected with the email "
-#~ "gateway: new emails create opportunities, each of them automatically gets "
-#~ "the history of the conversation with the customer.\n"
-#~ "\n"
-#~ "You and your team(s) will be able to plan meetings and phone calls from "
-#~ "opportunities, convert them into quotations, manage related documents, track "
-#~ "all customer related activities, and much more."
-#~ msgstr ""
-#~ "Les Opportunités permettent de gérer et suivre le canal des ventes en liant "
-#~ "des documents spécifiques à la clientèle ou aux prospects afin de relever "
-#~ "les ventes potentielles. Des informations telles que les recettes attendues, "
-#~ "le niveau de l'opportunité, la date prévue de clôture, l'historique des "
-#~ "communications, etc. pevent être maintenues entre elles. Les opportunités "
-#~ "peuvent être connectées à la passerelle email : de nouveaux emails créent "
-#~ "des opportunités, chacun d'eux sont automatiquement insérés dans "
-#~ "l'historique de conversations avec le client.\n"
-#~ "\n"
-#~ "Vous et votre (vos) équipe(s) serez en mesure de planifier des réunions et "
-#~ "des appels téléphoniques à partir des opportunités, de les convertir en "
-#~ "devis, de gérer des documents connexes, le suivi de toutes les activités "
-#~ "liées à la clientèle, et bien plus encore."
-
-#~ msgid ""
-#~ "Outbound Calls lists all the calls to be performed by your sales team. They "
-#~ "can record the information about the call on the form view. These "
-#~ "information will appear on the partner form for the traceability of every "
-#~ "contact you get with a customer. You can import a .CSV file with a list of "
-#~ "calls to be done for your sales team."
-#~ msgstr ""
-#~ "Les \"Appels sortants\" listent tous les appels passer par votre équipe de "
-#~ "vente qui peut enregistrer les informations relatives à l'appel sur le "
-#~ "formulaire. Ces informations apparaîtront sur le formulaire de partenaire "
-#~ "pour suivre chaque contact obtenu avec un client. Vous pouvez importer un "
-#~ "fichier. CSV avec une liste des appels à passer par votre équipe de vente."
-
-#~ msgid "Repeat interval"
-#~ msgstr "Interval de répétition"
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index d44c8bc5114..d928ca0f36d 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/i18n/gl.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: crm-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-15 23:54+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-13 17:25+0000\n"
+"Last-Translator: Xosé <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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-14 05:15+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -126,7 +126,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -143,8 +143,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -536,9 +536,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -810,8 +810,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1087,7 +1087,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2591,7 +2591,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -2895,7 +2895,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:141
 #, python-format
 msgid "Error!"
-msgstr "¡Erro!"
+msgstr "Erro!"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0
@@ -3105,8 +3105,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4331,13 +4331,6 @@ msgstr ""
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Condicións no intervalo de prioridades"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Se a empresa non comprou (ou pediu) durante un período, decrementar o grao "
-#~ "de satisfacción por este factor. É unha multiplicación."
-
 #~ msgid "Send Partner & Historize"
 #~ msgstr "Enviar empresa & Engadir historial"
 
@@ -4374,9 +4367,6 @@ msgstr ""
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Enviar correo a observadores (CC)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Cases by section"
 #~ msgstr "Casos por sección"
 
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 85c41a1cf9e..b438be0d404 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: crm
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Šifra prodajnog tima nora biti jedinstvena!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Trag '%s' je konvertiran u priliku."
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Bez ponavljanja"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -535,9 +535,9 @@ msgstr "Inicijalni kontakt s novim prodajnim tragom"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -808,8 +808,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1085,7 +1085,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2590,7 +2590,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3106,8 +3106,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3931,99 +3931,12 @@ msgstr "Newsletter"
 #~ msgid "Cases Histories"
 #~ msgstr "Povijesti slučajeva"
 
-#~ msgid "Send to"
-#~ msgstr "Pošalji prema"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Ovo svojstvo određuje listu datum/vrijeme Iznimaka za ponavljajuću "
-#~ "komponentu kalendara."
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr "Označite želite li da pravilo uključi slanje maila odgovornoj osobi."
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Slučajevi po Grupi i Kategoriji2"
-
-#~ msgid "Close Lead"
-#~ msgstr "Zaključi Kontakt"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 dana    "
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Upravlja uslugom Helpdesk-a."
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Poslovi u tijeku"
-
 #~ msgid "Button Pressed"
 #~ msgstr "Pritisnuta tipka"
 
-#~ msgid "Close job request"
-#~ msgstr "Zaključi zahtjev za posao"
-
-#~ msgid "Human Resources"
-#~ msgstr "Ljudski resursi"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Slučajevi po Prodajnim prilikama, Kategorijama i Tipu"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Upravlja zahtjevima kupaca i dobavljača, uključujući vaše korektivne i "
-#~ "preventivne radnje."
-
-#~ msgid "Amount"
-#~ msgstr "Iznos"
-
-#~ msgid "Fixed"
-#~ msgstr "Fiksno"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Molim, navedite e-mail adresu korisnika !"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Slučajevi po Grupi i Stupnju"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Trajanje (Sati)"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "TRANSPARENTAN"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Opisuje naziv radnje. Npr. na kojem objektu će se izvršiti koja radnja na "
-#~ "osnovi kojeg uvjeta"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Grupa kojoj Slučaj pripada. Odredite odgovornog korisnika i e-mail adresu za "
-#~ "mail gateway."
-
 #~ msgid "Case Section"
 #~ msgstr "Grupa Slučaja"
 
-#~ msgid "Proposed Salary"
-#~ msgstr "Predložena Plaća"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "Daje redoslijed kod prikazivanja liste Grupa Slučajeva"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Slučajevi po Grupi i Stupnju"
-
 #~ msgid "Mail to these emails"
 #~ msgstr "Pošalji mail na te e-mail adrese"
 
@@ -4033,54 +3946,15 @@ msgstr "Newsletter"
 #~ msgid "My Histories"
 #~ msgstr "Moje Povijesti"
 
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "Prati prepoznate poslovne prilike u okviru vaše tijeka prodaje."
-
-#~ msgid "Exception Dates"
-#~ msgstr "Datumi Iznimaka"
-
 #~ msgid "Last Action Date"
 #~ msgstr "Datum zadnje radnje"
 
-#~ msgid "Appreciation"
-#~ msgstr "Povećanje vrijednosti; vrednovanje; uvažavanje"
-
-#~ msgid "Second Interview"
-#~ msgstr "Drugi razgovor"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Pretplatiti se na Izdvojeni kalendar"
-
-#~ msgid "Description Information"
-#~ msgstr "Opisni podaci"
-
 #~ msgid "Delay type"
 #~ msgstr "Tip odgode"
 
-#~ msgid "Next Interview"
-#~ msgstr "Slijedeći razgovor"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Dodaj CC kod e-maila"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Kanali predstavljaju različite modalitete komunikacije primjenjive sa "
-#~ "strankom. Kod svake prodajne prilike, moguće je navesti kanal koji je izvor "
-#~ "informacija vezan uz prodajnu priliku."
-
-#~ msgid "Exception Rules"
-#~ msgstr "Pravila za Iznimke"
-
 #~ msgid "Business Opportunities"
 #~ msgstr "poslovne prilike"
 
-#~ msgid "Accepted as Claim"
-#~ msgstr "Prihvaćeno kao potraživanje"
-
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
@@ -4092,28 +3966,6 @@ msgstr "Newsletter"
 #~ msgid "%(email_from)s = Partner email"
 #~ msgstr "%(email_from)s = Partner email"
 
-#~ msgid "Dead"
-#~ msgstr "Mrtav"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Potvrdi sastanak"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Postojeća stranka"
-
-#~ msgid "Home"
-#~ msgstr "Početna stranica"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Slučajevi po Grupi, Kategoriji i Stupnju"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Odaberite ovu opcije ako želite da pravilo označi CC(Mail bilo kojoj drugoj "
-#~ "osobi navedenoj u radnjama)"
-
 #~ msgid "Action Information"
 #~ msgstr "Podaci o radnji"
 
@@ -4134,39 +3986,9 @@ msgstr "Newsletter"
 #~ msgid "Status"
 #~ msgstr "Status"
 
-#~ msgid "Meetings Tree"
-#~ msgstr "Stablo sastanaka"
-
-#~ msgid "All Meetings"
-#~ msgstr "Svi sastanci"
-
-#~ msgid "Add CC"
-#~ msgstr "Dodaj CC"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Odbijeno od strane Tvrtke"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Vrednuj Prijedlog"
-
 #~ msgid "%(case_id)s = Case ID"
 #~ msgstr "%(case_id)s = Case ID"
 
-#~ msgid "New Business"
-#~ msgstr "Novi Poslovni odnos"
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Dopušta prikaz kalendara"
-
-#~ msgid "   Today   "
-#~ msgstr "   Danas   "
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Opis telefonskog razgovora"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Načela Potraživanja"
-
 #, python-format
 #~ msgid ""
 #~ "You must define a responsible user for this case in order to use this action!"
@@ -4174,51 +3996,9 @@ msgstr "Newsletter"
 #~ "Morate odrediti odgovornog korisnika za taj Slučaj kako biste primijenili "
 #~ "ovu radnju!"
 
-#~ msgid "Assigned to"
-#~ msgstr "Dodijeljeno"
-
 #~ msgid "Partner Events"
 #~ msgstr "Događaji vezani uz Partnere"
 
-#~ msgid "Contract Proposed"
-#~ msgstr "Predložen Ugovor"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Poslovi - Proces zapošljavanja"
-
-#~ msgid "Related Cases"
-#~ msgstr "Povezani slučajevi"
-
-#~ msgid "New Claims"
-#~ msgstr "Nova potraživanja"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Obrazac Sastanaka"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Pregovaranje/Preispitivanje"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Slučajevi prema Prilikama i Stupnju"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Datum Potraživanja"
-
-#~ msgid "All Leads"
-#~ msgstr "Svi Kontakti"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Ugovor potpisan"
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "Pretplatiti se na Izdvojen ICS"
-
-#~ msgid "Existing Business"
-#~ msgstr "Postojeći posao"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Slučajevi Kontakta"
-
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
@@ -4229,15 +4009,6 @@ msgstr "Newsletter"
 #~ msgid "Case Rule"
 #~ msgstr "Pravilo Slučaja"
 
-#~ msgid "Emails"
-#~ msgstr "Mailovi"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Faktična potraživanja"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Spremi u .ics formatu"
-
 #~ msgid ""
 #~ "Check if the category is limited to partners that match the segmentation "
 #~ "criterions. If checked, remove the category from partners that doesn't match "
@@ -4247,80 +4018,21 @@ msgstr "Newsletter"
 #~ "kriterijima segmentacije. Ako je tako, uklonite kategoriju iz grupe partnera "
 #~ "koji ne odgovara kriterijima segmentacije"
 
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Kategorija koja se odnosi na Grupu. Podijelite CRM Slučajeve pojedinačno ili "
-#~ "u Grupe."
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Email!"
-
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid "crm.opportunity.assign_wizard"
-#~ msgstr "crm.opportunity.assign_wizard"
-
 #~ msgid "Conditions on States"
 #~ msgstr "Uvjeti Stanja"
 
 #~ msgid "Trigger Date"
 #~ msgstr "Datum pokretač"
 
-#~ msgid "Search Histories"
-#~ msgstr "Pretraži Povijesti"
-
-#~ msgid "Direction"
-#~ msgstr "Smjer"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Ovi ljudi će dobiti primjerak budućih komunikacije između partnera i "
-#~ "korisnika putem e-pošte"
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "AKtivnost Servera koja se pokreće"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Planiraj Sastanak"
-
-#~ msgid "Set State to"
-#~ msgstr "Postavi stanje"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Ne postoji mail za odgovor!"
-
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Opis Slučaja"
 
-#~ msgid "My Funds"
-#~ msgstr "Moja sredstva"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Mlađi programer"
-
 #~ msgid "Case Category Name"
 #~ msgstr "Naziv Kategorije Slučaja"
 
-#~ msgid "Preventive"
-#~ msgstr "Preventivno"
-
 #~ msgid "Add watchers (Cc)"
 #~ msgstr "Dodaj mail nadglednika u (Cc)"
 
-#~ msgid "Export ICS"
-#~ msgstr "Izvezi ICS"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Ne možete dodijeliti zaključen slučaj"
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr ""
@@ -4329,12 +4041,6 @@ msgstr "Newsletter"
 #~ msgid "Conditions on Case Fields"
 #~ msgstr "Uvjeti vezani uz polja Slučaja"
 
-#~ msgid "Category Name"
-#~ msgstr "Naziv Kategorije"
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Pravilo ponavljanja"
-
 #~ msgid ""
 #~ "The generic Open ERP Customer Relationship Management\n"
 #~ "system enables a group of people to intelligently and efficiently manage\n"
@@ -4385,85 +4091,19 @@ msgstr "Newsletter"
 #~ "ERP-om.\n"
 #~ "između pošte i Open ERP-a."
 
-#~ msgid "Regex on Case Name"
-#~ msgstr "Regex na Ime Slučaja"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Potraživanja i tijeku"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Slučajevi po Prodajnim prilikama, Kategoriji i Stupnju"
-
-#~ msgid "Print"
-#~ msgstr "Ispis"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Kandidat odbijen"
-
-#~ msgid "Lead Email"
-#~ msgstr "E-mail Kontakta"
-
 #~ msgid "%(partner_email)s = Partner email"
 #~ msgstr "%(partner_email)s = Partner email"
 
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Slučajevi po grupi, kategoriji i kategoriji2"
-
-#~ msgid "Closed Won"
-#~ msgstr "Zaključen dobijen"
-
 #~ msgid "Open cases"
 #~ msgstr "Otvoreni Slučajevi"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na TRUE, moći ćete sakriti Grupu Slučajeva "
-#~ "bez da je izbrišete."
-
-#~ msgid "Learning And Education"
-#~ msgstr "Učenje i obrazovanje"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr ""
-#~ "Jeste li sigurni da želite kreirati Partnera na osnovi ovog telefonskog "
-#~ "poziva?"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Datum sastanka"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Pretvori u Partnera"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Slijedeći sastanci"
-
 #, python-format
 #~ msgid "You can not delete this case. You should better cancel it."
 #~ msgstr "Ne možete izbrisati ovaj Slučaj. Morate ga Otkazati."
 
-#~ msgid "_Subscribe"
-#~ msgstr "-Prijava"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Osnovni Čarobnjak za Sastanak"
-
-#~ msgid "Value Claims"
-#~ msgstr "Vrijednosna potraživanja"
-
-#~ msgid "Message..."
-#~ msgstr "Poruka..."
-
-#~ msgid "crm.phonecall.assign_wizard"
-#~ msgstr "crm.phonecall.assign_wizard"
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Slučajevi po Grupi i Kategoriji2"
-
 #, python-format
 #~ msgid "open"
 #~ msgstr "otvori"
@@ -4471,104 +4111,19 @@ msgstr "Newsletter"
 #~ msgid "Remind with attachment"
 #~ msgstr "Podsjeti s privitkom"
 
-#~ msgid "Website"
-#~ msgstr "Web stranica"
-
 #~ msgid "Remind responsible"
 #~ msgstr "Podsjeti odgovorne"
 
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Pomaže vam organizirati poslove procesa zapošljavanja: evaluaciju, sastanke, "
-#~ "integraciju e-mailova ..."
-
-#~ msgid "Funds"
-#~ msgstr "Sredstva"
-
 #, python-format
 #~ msgid "draft"
 #~ msgstr "Nacrt"
 
-#~ msgid "Awaiting Response"
-#~ msgstr "Očekujući odgovor"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Ime kandidata"
-
-#~ msgid "Self Generated"
-#~ msgstr "Samo-generirano"
-
-#~ msgid "Won't fix"
-#~ msgstr "Neće se fiksirati"
-
-#~ msgid "Converted"
-#~ msgstr "Pretvoren"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Odgovori na zadnji mail"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Daje lokaciju sastanka"
-
-#~ msgid "Job Cases"
-#~ msgstr "Slučajevi posla"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Poslovi - Stablo procesa novačenja"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Regularni Izraz na osnovi Naziva Slučaja"
-
-#~ msgid "Search Funds"
-#~ msgstr "Pretraži Sredstva"
-
-#~ msgid "Type of claim"
-#~ msgstr "Tip potraživanja"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Stablo Helpdesk Potpore"
-
-#~ msgid "Other Info"
-#~ msgstr "Druge informacije"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Potraživanje troška"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Rasporedi Telefonski poziv"
-
-#~ msgid "Mail"
-#~ msgstr "Mail"
-
 #~ msgid "Set priority to"
 #~ msgstr "Postavite priorite"
 
-#~ msgid "Needs Analysis"
-#~ msgstr "Treba analizu"
-
-#~ msgid "Search Claims"
-#~ msgstr "Pretraži ptraživanja"
-
 #~ msgid "Mail body"
 #~ msgstr "Tijelo Maila"
 
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Upravlja kalendarom sastanaka korisnika"
-
-#~ msgid "Add a CC"
-#~ msgstr "Dodaj CC"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Stupanj prodaje"
-
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "Pošalji mail nadglednicima kao (CC)"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Slijedeći sastanak"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for your Company address or missing reply address in "
@@ -4577,130 +4132,18 @@ msgstr "Newsletter"
 #~ "Nije nađen e-amil ID za adresu Vaše tvrtke ili nedostaje mail adresa za "
 #~ "odgovor u grupi!"
 
-#~ msgid "Closed Lost"
-#~ msgstr "Zaključen izgubljen"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Traženje Bugova"
-
 #~ msgid "Actions"
 #~ msgstr "Radnje"
 
-#~ msgid "In Progress Claims"
-#~ msgstr "Potraživanja u tijeku"
-
-#~ msgid "Set RRULE"
-#~ msgstr "Postavi RRULE"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Ponuda/Navod cijene"
-
 #~ msgid "Delay After Trigger Date:"
 #~ msgstr "Odgoda nakon Datuma pokretanja"
 
-#~ msgid "Web"
-#~ msgstr "Internet"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Tip kampanje"
-
-#~ msgid "crm.meeting.generic_wizard"
-#~ msgstr "crm.meeting.generic_wizard"
-
-#~ msgid "Histories"
-#~ msgstr "Povijesti"
-
-#~ msgid "Graduate"
-#~ msgstr "Apsolvirati"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Imajte na umu da možete koristiti pregled kroz kalendar za grafički prikaz "
-#~ "rasporeda Vašeg sljedećeg sastanka."
-
-#~ msgid "Leads Tree"
-#~ msgstr "Stablo Kontakta"
-
-#~ msgid "Attendee"
-#~ msgstr "Sudionik"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Neuspio mail!"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Greška ! Ne možete kreirati rekurzivne grupe."
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Omogućit će Vam da sinhronizirate Oen ERP kalendare s mobitelom, kao i "
-#~ "alikacijama: Outlook, Sunbirs, ical, ..."
-
-#~ msgid "This Year"
-#~ msgstr "Ove godine"
-
 #~ msgid "Remind Partner"
 #~ msgstr "Podsjeti partnera"
 
-#~ msgid "Contract Data"
-#~ msgstr "Ugovorni podaci"
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Koriste ga tvrtke za praćenje bugova i obraku zahtjeva korisnika softwarea"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Dijeljeni kalendar"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Slučajevi po Kontaktu i Tipu"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Procijenjeni prihod"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Početni zahtjev posla"
-
-#~ msgid "OPAQUE"
-#~ msgstr "PROZIRAN"
-
-#~ msgid "Claims Info"
-#~ msgstr "Podaci potraživanja"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Naziv Kategorije2 Slučaja"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Helpdesk potpora"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Skupljanje sredstava"
-
 #~ msgid "Case State"
 #~ msgstr "Stanje Slučaja"
 
-#~ msgid "Source"
-#~ msgstr "Izvor"
-
-#~ msgid "Payment Mode"
-#~ msgstr "Način plaćanja"
-
-#~ 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 ""
-#~ "Odgoda nakon datuma pokretanja, određuje da se može koristiti negativni broj "
-#~ "za postavu odgode prije datuma pokretanja, poput slanja podsjetnika 15 "
-#~ "minuta prije sastanka."
-
-#~ msgid "Stage: "
-#~ msgstr "Supanj "
-
 #~ msgid "Case section"
 #~ msgstr "Grupa Slučaja"
 
@@ -4713,70 +4156,9 @@ msgstr "Newsletter"
 #~ msgid "Created"
 #~ msgstr "Kreiran"
 
-#~ msgid "Lead Information"
-#~ msgstr "Podaci Kontakta"
-
-#~ msgid ""
-#~ "Helps you to encode the result of a phone call or to plan a list of phone "
-#~ "calls to process."
-#~ msgstr ""
-#~ "Pomaže vam da kodirate rezultat telefonskog poziva ili da planirate popis "
-#~ "telefonskih poziva za obradu."
-
-#~ msgid "Import ICS File"
-#~ msgstr "Uvoz ICS datoteke"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "Detalji o polazniku"
-
-#~ msgid " > Bac +5"
-#~ msgstr " > Bac +5"
-
-#~ msgid "Prospecting"
-#~ msgstr "Obrada izglednih stranaka"
-
-#~ msgid "Employee Email"
-#~ msgstr "Email djelatnika"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Sastanci sa Slučajevima"
-
-#~ msgid "Job Info"
-#~ msgstr "Podaci o poslu"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Otkaži sastanak"
-
-#~ msgid "Jobs"
-#~ msgstr "Polsovi"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Datum kreiranja"
-
 #~ msgid "Mail to responsible"
 #~ msgstr "Mail odgovornoj osobi"
 
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Poslovi - Obrazac procesa novačenja"
-
-#~ msgid "Corrective"
-#~ msgstr "Korektivan"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "Slučajevi prilike"
-
-#~ msgid "Support Query"
-#~ msgstr "Upit potpore"
-
-#~ msgid "Send Email"
-#~ msgstr "Pošalji mail"
-
-#~ msgid "Set case state to"
-#~ msgstr "Postavi stanje Slučaja na"
-
-#~ msgid "Credit Card"
-#~ msgstr "Kreditna kartica"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
@@ -4785,76 +4167,16 @@ msgstr "Newsletter"
 #~ "Nije nađen e-amil ID za odgovornog Partnera ili nedostaje mail adresa za "
 #~ "odgovor u grupi!"
 
-#~ msgid "Search Jobs"
-#~ msgstr "Pretraži poslove"
-
 #~ msgid "Log"
 #~ msgstr "Zapis"
 
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr "Ovo može pomoći suradnicima u prikupljanu sredstava o praćenju."
-
 #~ msgid "Watchers Emails"
 #~ msgstr "Email nadglednika"
 
-#~ msgid "Delay Close"
-#~ msgstr "Odgodi zaključivanje"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Ime2 kandidata"
-
 #, python-format
 #~ msgid "cancel"
 #~ msgstr "Odustani"
 
-#~ msgid "Events"
-#~ msgstr "Događaji"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Omogućava praćenje i upravljanje Kontakta koji su pred-prodajni zahtjevi ili "
-#~ "kontakti, to je inicijalni kontakt sa upitom stranke."
-
-#~ msgid ""
-#~ "The minds states allow to define a value scale which representsthe partner "
-#~ "mentality in relation to our services.The scale hasto be created with a "
-#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-#~ msgstr ""
-#~ "Stanja uma omogućuju definiranje vrijednosne skale koja predstavlja "
-#~ "Parnerovu percepciju naših usluga. Skala mora biti kreirana tako da podržava "
-#~ "raspon kategorija od 0 (Vrlo nezadovoljan) do 10 (Izuzetno zadovoljan)."
-
-#~ msgid "FreeBusy"
-#~ msgstr "SlobodanZauzet"
-
-#~ msgid "Attachment2"
-#~ msgstr "Privitak2"
-
-#~ msgid "Attachment3"
-#~ msgstr "Privitak3"
-
-#~ msgid "Degree"
-#~ msgstr "Stupanj"
-
-#~ msgid "Attachment1"
-#~ msgstr "Privitak1"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na TRUE, moći ćete sakriti Slučaj bez da ga "
-#~ "izbrišete."
-
-#~ msgid "crm.menu.config_wizard"
-#~ msgstr "crm.menu.config_wizard"
-
-#~ msgid "Cheque"
-#~ msgstr "Ček"
-
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the case be attached "
 #~ "to the reminder email sent."
@@ -4862,288 +4184,45 @@ msgstr "Newsletter"
 #~ "Potvrdite ako želite da se svi dokumenti vezani uz slučaj dodaju u privitak "
 #~ "maila podsjetnika."
 
-#~ msgid "Candidate Phone"
-#~ msgstr "Telefon kandidata"
-
-#~ msgid "To Assign"
-#~ msgstr "Dodijeliti"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Molim upisati ispravam URL !"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Jeste li sigurni da želite kreirati Partnera na osnovi ovog upita za posao ?"
-
-#~ msgid "History of Events"
-#~ msgstr "Povijest događaja"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Kategorija2 slučaja"
-
-#~ msgid "Sales"
-#~ msgstr "Prodaje"
-
 #~ msgid "General"
 #~ msgstr "Općenit"
 
-#~ msgid "Assigned"
-#~ msgstr "Dodijeljen"
-
-#~ msgid "Recycled"
-#~ msgstr "Recikliran"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Sve prilike"
-
-#~ msgid "PUBLIC"
-#~ msgstr "JAVAN"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Već postoji Partner s tim imenom."
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Telefonski pozivi slučajevima"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr "Daje redoslijed kod prikazivanja liste pravila Slučajeva"
-
-#~ msgid "Invalid"
-#~ msgstr "Nepravilan"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Dogovori Sastanak"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Kalendar sastanaka"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Slučajevi prema stupnju i procjeni"
-
 #, python-format
 #~ msgid ""
 #~ "You can not escalate this case.\n"
 #~ "You are already at the top level."
 #~ msgstr "Ne možete eskalirati ovaj slučaj. Već ste na najvišoj razini."
 
-#~ msgid "Lead Name"
-#~ msgstr "Ime Kontakta"
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "Opis Radnje/Potraživanja"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Sastanak u cilju kreiranja Kontakta"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Odbijeno od strane djelatnika"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Ime djelatnika"
-
-#~ msgid "First Interview"
-#~ msgstr "Prvi razgovor"
-
-#~ msgid "This Month"
-#~ msgstr "Ovaj mjesec"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Raspoloživost (tjedni)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Stablo prilika"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Otvoreni poslovi"
-
-#~ msgid "Email Address"
-#~ msgstr "Email adresa"
-
-#~ msgid "Related Case"
-#~ msgstr "Povezan slučaj"
-
-#~ msgid "Server Action"
-#~ msgstr "Radnja poslužitelja"
-
-#~ msgid "All Claims"
-#~ msgstr "Sva potraživanja"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Email nije poslan!"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Zaključi poziv"
-
 #~ msgid "Latest E-Mail"
 #~ msgstr "Zadnji Email"
 
-#~ msgid "Regex on Communication History"
-#~ msgstr "Regex vezan uz Povijest Komunikacije"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Zahtijevaj Nacrt"
-
 #~ msgid "Logs History"
 #~ msgstr "Povijest zapisa"
 
-#~ msgid "Search Case"
-#~ msgstr "Pretraži slučaj"
-
 #~ msgid "Case Description"
 #~ msgstr "Opis Slučaja"
 
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Slučajevi po Grupi, Kategoriji i Stupnju"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Kandidat zaposlen"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Postupak zapošljavanja"
-
-#~ msgid "Lead Source"
-#~ msgstr "Izvor Kontakta"
-
-#~ msgid "PRIVATE"
-#~ msgstr "PRIVATE"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Navedi poveznik na Izdvojeni Kalendar"
-
-#~ msgid "Funds Form"
-#~ msgstr "Obrazac Sredstava"
-
-#~ msgid "In Process"
-#~ msgstr "U postupku"
-
 #~ msgid "%(case_user)s = Responsible name"
 #~ msgstr "%(case_user)s = Ime odgovorne osobe"
 
-#~ msgid "Goals"
-#~ msgstr "Ciljevi"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Slučajevi po Grupi i Tipu"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Post-prodajne usluge"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "File name"
-#~ msgstr "Ime datoteke"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na TRUE, moći ćete sakriti Pravilo Slučaja "
-#~ "bez da ga izbrišete."
-
-#~ msgid "crm.claim.assign_wizard"
-#~ msgstr "crm.claim.assign_wizard"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Svi Zahtjevi za Posao"
-
-#~ msgid "Applied Job"
-#~ msgstr "Primijenjen Posao"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern                                 for "
-#~ "anexception to a recurrence set"
-#~ msgstr ""
-#~ "Određuje pravilo ili ponavljajući obrazac za Iznimku u skupu ponavljanja."
-
-#~ msgid "Relevant"
-#~ msgstr "Relevantan"
-
-#~ msgid "Import ICS"
-#~ msgstr "Uvezi ICS"
-
 #~ msgid "Case Communication History"
 #~ msgstr "Povijest komunikacije Slučaja"
 
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Slučajevi prema Prilikama i Tipu"
-
 #~ msgid "%(case_subject)s = Case subject"
 #~ msgstr "%(case_subject)s = subject Slučaj"
 
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr "Društveni oporavak i ruralni razvoj"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Partner je već određen ovim zahtjevom za posao."
-
 #~ msgid "Your action"
 #~ msgstr "Vaša radnja"
 
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "Email-id osoba kojima treba poslati mail"
-
-#~ msgid "Claim Cases"
-#~ msgstr "Slučajevi potraživanja - potraživanje Slučaja?"
-
 #~ msgid "E-Mail Reminders (includes the content of the case)"
 #~ msgstr "E-mail Podsjetnici (Iključuju sadržaj Slučaja)"
 
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Slučajevi po Kontaktu i Stupnju"
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Osnovni Čarobnjak"
-
-#~ msgid "Reporting"
-#~ msgstr "Izvještavanjeć"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Očekivana Plaća"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Pošalji novi E-mail"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Neispravni argumenti"
 
-#~ msgid "Trensparent"
-#~ msgstr "Transparentan"
-
-#~ msgid "My Cases"
-#~ msgstr "Moji Slučajevi"
-
-#~ msgid "Word of mouth"
-#~ msgstr "Usmena preporuka"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Kontakt Subjekt"
-
-#~ msgid "Planned"
-#~ msgstr "Planiran"
-
-#~ msgid "Customer Office"
-#~ msgstr "Ured Stranke"
-
-#~ msgid "Candidate Email"
-#~ msgstr "E-mail kandidata"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Stupanj prodaje "
-
-#~ msgid "Type of Action"
-#~ msgstr "Tip radnje"
-
 #~ msgid "Set responsible to"
 #~ msgstr "Postavi odgovornost na"
 
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Sastanak s kandidatima"
-
 #~ msgid ""
 #~ "A period is the average number of days between two cycle of sale or purchase "
 #~ "for this segmentation. It's mainly used to detect if a partner has not "
@@ -5157,27 +4236,12 @@ msgstr "Newsletter"
 #~ "naklonost smanjena jer je vjerojatno u međuvremenu kupovao od drugog "
 #~ "dobavljača. Koristite ovu funkciju kod Partnera koji višestruko kupuju."
 
-#~ msgid "Search Cases by User"
-#~ msgstr "Pretraži SLučajeve po Korisniku"
-
 #~ msgid "Mail to partner"
 #~ msgstr "Mail Partneru"
 
-#~ msgid "Funds Tree"
-#~ msgstr "Stablo Sredstava"
-
 #~ msgid "Call Object Method"
 #~ msgstr "Call Object Method"
 
-#~ msgid "All Funds"
-#~ msgstr "Sva Sredstva"
-
-#~ msgid "HelpDesk"
-#~ msgstr "Helpdesk"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Umjetnost i kultura"
-
 #, python-format
 #~ msgid "Historize"
 #~ msgstr "Pretvori u povijesni oblik"
@@ -5185,9 +4249,6 @@ msgstr "Newsletter"
 #~ msgid "Delay after trigger date"
 #~ msgstr "Odgoda nakon Datuma pokretanja"
 
-#~ msgid "Lead Details"
-#~ msgstr "Detalji Kontakta"
-
 #~ msgid "Set section to"
 #~ msgstr "Postavi grupu na"
 
@@ -5195,18 +4256,6 @@ msgstr "Newsletter"
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr "Da biste koristili ovu radnju, morate upisati Email Partnera!"
 
-#~ msgid "Qualication"
-#~ msgstr "Kvalificiranje"
-
-#~ msgid "Change RRule"
-#~ msgstr "Promijeni Pravilo"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Slučajevi po Grupi, Kategoriji i Tipu"
-
-#~ msgid "Licenced"
-#~ msgstr "Licenciran"
-
 #~ msgid "Parent Section"
 #~ msgstr "ishodna Grupa"
 
@@ -5219,119 +4268,31 @@ msgstr "Newsletter"
 #~ msgid "Child Sections"
 #~ msgstr "Ishodne Grupe"
 
-#~ msgid "Healthcare"
-#~ msgstr "Zdravstvena skrb"
-
-#~ msgid "Assign"
-#~ msgstr "Dodijeli"
-
-#~ msgid "Office"
-#~ msgstr "Ured"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Slučajevi prikupljanja sredstava"
-
-#~ msgid "crm.helpdesk.assign_wizard"
-#~ msgstr "crm.helpdesk.assign_wizard"
-
 #~ msgid "Conditions on Case Partner"
 #~ msgstr "Uvjeti vezani uz Partnera u okviru Slučaja"
 
 #~ msgid "Section Code"
 #~ msgstr "Oznaka Grupe"
 
-#~ msgid "Meeting date"
-#~ msgstr "Datum sastanka"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "CONFIDENTIAL"
-
-#~ msgid "Content of mail"
-#~ msgstr "Sadržaj maila"
-
-#~ msgid "Not fixed"
-#~ msgstr "Nije fiksno"
-
-#~ msgid "Employee"
-#~ msgstr "Zaposlenik"
-
 #~ msgid "Partner Email"
 #~ msgstr "Email Partnera"
 
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = The '%' Character"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Interne bilješke"
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
 #~ "Označite želite li postaviti pravilo slanja e-mail podsjetnika korisniku."
 
-#~ msgid "_Import"
-#~ msgstr "-Import"
-
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Uvjeti koji određuju Raspon Prioriteta"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Ako partner nije ostvario kupnju u razdoblju, umanjite procjenu sklonosti za "
-#~ "taj činbenik. Riječ je u multiplikaciji."
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Masovno slanje mailova"
-
 #~ msgid "E-Mail Actions"
 #~ msgstr "E-mail Radnje"
 
-#~ msgid "Cash"
-#~ msgstr "Gotovina"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Sredstva po Kategorijama"
-
-#~ msgid "Future"
-#~ msgstr "Budućnost"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Spremi ICS datoteku"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "Navedi poveznik na Izdvojeni Kalendar"
-
 #~ msgid "Case logs"
 #~ msgstr "Zapisi vezani uz Slučaj"
 
 #~ msgid "Conditions on Timing"
 #~ msgstr "Uvjeti vremenskog usklađivanja - Timinga"
 
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Helpdesk Slučajevi"
-
-#~ msgid "Export ICS File"
-#~ msgstr "Uvoz ICS datoteke"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Odaberi ICS datoteku"
-
-#~ msgid "Import Message"
-#~ msgstr "Uvezi poruku"
-
 #~ msgid "Cases by section"
 #~ msgstr "Sučajevi po grupi"
-
-#~ msgid "New Jobs"
-#~ msgstr "Novi Poslovi"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Operacije prikupljanja Sredstava"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Podrška Helpdesk-a"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Pretvori u partnera"
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 5977a2b19e9..f101786aecf 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 18:48+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Az értékesítési csapat kódjának egyedinek kell lennie !"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "A '%s'"
@@ -141,8 +142,8 @@ msgid "No Repeat"
 msgstr "Nincs ismétlés"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +535,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +804,8 @@ msgid "Statistics Dashboard"
 msgstr "Statisztika vezérlőpult"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1080,7 +1081,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2585,7 +2586,7 @@ msgid "Meeting Type"
 msgstr "Találkozó típusa"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3095,8 +3096,8 @@ msgid "Schedule Call"
 msgstr "Hívás ütemezése"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/id.po b/addons/crm/i18n/id.po
index b630932a277..8aa9c81b98e 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1080,7 +1080,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2582,7 +2582,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3092,8 +3092,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 50395ede637..57fd4ff2474 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -8,25 +8,25 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-23 16:46+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@domsense.com>\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "# Iniziative"
+msgstr "# Lead"
 
 #. module: crm
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr "Iniziativa"
+msgstr "Lead"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -92,7 +92,7 @@ msgstr " "
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "Ritardo chiusura"
+msgstr "Tempo di chiusura"
 
 #. module: crm
 #: view:crm.lead:0
@@ -124,16 +124,16 @@ msgid "The code of the sales team must be unique !"
 msgstr "Il codice del team di vendita deve essere unico!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "Lead '%s' è stato convertito in una opportunità."
+msgstr "Il lead '%s' è stato convertito in una opportunità."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:228
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr "L'iniziativa \"%s\" è stata chiusa."
+msgstr "Il lead '%s' è stato chiuso."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Nessuna ripetizione"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -272,10 +272,10 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
-"L'analisi delle iniziative permette di verificare differenti informazioni "
-"relative al CRM. Controllo per trattamento ritardi, numero di risposte "
-"fornite e mail inviate. E' possibile ordinare l'analisi iniziative con "
-"differenti raggruppamenti per avere una accurata e granulare analisi"
+"L'analisi dei lead permette di verificare varie informazioni relative al "
+"CRM, come il tempo di gestione, il numero di risposte e di mail inviate. È "
+"possibile disporre i dati in raggruppamenti diversi per un'analisi accurata "
+"e granulare."
 
 #. module: crm
 #: view:crm.lead:0
@@ -307,7 +307,7 @@ msgstr "_Unisci"
 #: 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 "Analisi iniziative"
+msgstr "Analisi dei lead"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -396,7 +396,7 @@ msgstr "Espressione regolare nello storico del caso"
 #: code:addons/crm/crm_lead.py:209
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr "L'iniziativa \"%s\" è stata aperta."
+msgstr "Il lead '%s' è stato aperto."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -423,7 +423,7 @@ msgstr "Raccola fondi"
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "Iniziative e opportunità"
+msgstr "Lead e opportunità"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -546,9 +546,9 @@ msgstr "Primo contatto il nuovo candidato"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -797,7 +797,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr "Modulo Iniziativa"
+msgstr "Modulo lead"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -824,7 +824,7 @@ msgstr "Probabilità (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr "Generazione iniziative"
+msgstr "Creazione dei lead"
 
 #. module: crm
 #: view:board.board:0
@@ -833,8 +833,8 @@ msgid "Statistics Dashboard"
 msgstr "Dashboard statistiche"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1115,7 +1115,7 @@ msgstr "Opz-in"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1730,10 +1730,10 @@ 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 ""
-"Aggiunge specifici stadi a iniziative e opportunità permettendo ai "
-"commerciali di organizzare meglio le loro code di vendita. Gli stadi gli "
-"permetteranno di tracciare facilmente come una specifica iniziativa o "
-"opportunità è posizionata nel ciclo di vendite."
+"Aggiunge specifici stadi a lead e opportunità permettendo ai commerciali di "
+"organizzare meglio le loro code di vendita. Gli stadi gli permetteranno di "
+"tracciare facilmente come uno specifico lead o opportunità è posizionata nel "
+"ciclo di vendite."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1815,7 +1815,7 @@ msgstr "_Pianifica"
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr "Ritardo chiusura"
+msgstr "Tempo di chiusura"
 
 #. module: crm
 #: field:crm.meeting,we:0
@@ -1845,8 +1845,7 @@ msgstr "Raggruppa per..."
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
 msgstr ""
-"Partner opzionalmente collegato, di solito dopo la conversione "
-"dell'iniziativa."
+"Partner associato, tipicamente dopo la conversione del lead (opzionale)."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2184,7 +2183,7 @@ msgstr "Adwords di Google (2)"
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Il tipo è utilizzato per separare Iniziative e Opportunità"
+msgstr "Il tipo è utilizzato per distinguere i Lead dalle Opportunità"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2228,7 +2227,7 @@ msgstr "Team di vendita"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr "Iniziativa a partner"
+msgstr "Da Lead a Partner"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2274,7 +2273,7 @@ msgstr "Mese"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr "Iniziative"
+msgstr "Lead"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2652,8 +2651,7 @@ msgstr "Massimo Storico Contatti"
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
-"Si è sicuri di voler creare un partner da questo contatto privilegiato?"
+msgstr "Si è sicuri di voler creare un partner da questo lead ?"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2662,7 +2660,7 @@ msgid "Meeting Type"
 msgstr "Tipo di meeting"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Unire con opportunità esistente"
@@ -2725,14 +2723,14 @@ msgstr "# di email"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr "Ricerca iniziative"
+msgstr "Ricerca Lead"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr "Ritardo di apertura"
+msgstr "Tempo di apertura"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2752,7 +2750,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr "Iniziativa a Opportunità"
+msgstr "Da Lead a Opportunità"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2830,7 +2828,7 @@ msgstr "Dashboard vendite"
 #: code:addons/crm/wizard/crm_lead_to_partner.py:56
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr "Un partner è già definito in questo contatto privilegiato"
+msgstr "Un Un partner è già definito per questo lead."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2949,7 +2947,7 @@ msgstr "Aggiungi nota interna"
 #: code:addons/crm/crm_lead.py:304
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr "Lo stadio dell'iniziativa \"%s\" è cambiato in \"%s\""
+msgstr "Lo stadio del lead \"%s\" è cambiato in \"%s\""
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3030,6 +3028,10 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"Crea categorie specifiche adatte alle attività della tua azienda per meglio "
+"classificare e analizzare i tuoi lead e le tue opportunità. Queste categorie "
+"possono riflettere ad esempio la tua struttura di prodotti o i diversi tipi "
+"di vendite."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3188,8 +3190,8 @@ msgid "Schedule Call"
 msgstr "Pianifica chiamata"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3235,7 +3237,7 @@ msgstr "Stato fed."
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr "Crea opportunità di business dall'iniziativa"
+msgstr "Crea una opportunità a partire dal Lead"
 
 #. module: crm
 #: help:crm.send.mail,html:0
@@ -3528,7 +3530,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr "Report iniziative CRM"
+msgstr "CRM Lead Report"
 
 #. module: crm
 #: field:crm.installer,progress:0
@@ -3564,7 +3566,7 @@ msgstr "Si deve verificare che questo partner non esista già."
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr "Ritardo di apertura"
+msgstr "Tempo di apertura"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -4405,13 +4407,6 @@ msgstr "Newsletter"
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Condizioni su intervallo di priorità"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Se il partner non ha acquistato durante un periodo, diminuisci la sua "
-#~ "impressione utilizzando una moltiplicazione con questo fattore."
-
 #~ msgid "All "
 #~ msgstr "Tutti i "
 
@@ -4466,9 +4461,6 @@ msgstr "Newsletter"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Mail a Osservatori (Cc)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Azioni"
 
@@ -4517,153 +4509,6 @@ msgstr "Newsletter"
 #~ "probabilmente ha comprato da un altro fornitore. Questa funzione è da "
 #~ "utilizzare per recuperare attività di vendita"
 
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Gestisci un servizio di Helpdesk"
-
-#~ msgid "Send to"
-#~ msgstr "Spedisci a"
-
-#~ msgid "Close job request"
-#~ msgstr "Chiudere la richiesta di posti di lavoro"
-
-#~ msgid "Human Resources"
-#~ msgstr "Risorse Umane"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Giorni    "
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Lavori in attesa"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Casi da Opportunità, Categoria e Tipo"
-
-#~ msgid "Close Lead"
-#~ msgstr "Contatto privilegiato chiuso"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Casi per sezione e categoria2"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Questa proprietà definisce la lista delle eccezioni per data/ora per il "
-#~ "componente del calendario corrente."
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Controlla questo se desideri la regola per inviare una e-mail alla persona "
-#~ "responsabile."
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "TRANSPARENT"
-
-#~ msgid "Amount"
-#~ msgstr "Importo"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Gestisce le richieste di fornitori e clienti, includendo i tuoi preventivi e "
-#~ "azioni correttive"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Specifica l'indirizzo email dell'utente !"
-
-#~ msgid "Fixed"
-#~ msgstr "Fissato"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Durata (Ore)"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Casi per Sezione e Scenario"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Casi per sezione e scenario"
-
-#~ msgid "Appreciation"
-#~ msgstr "Valutazione"
-
-#~ msgid "Exception Dates"
-#~ msgstr "Date escluse"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Stipendio Proposto"
-
-#~ msgid "Second Interview"
-#~ msgstr "Secondo colloquio"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Sottoscrizione ad un calendario Remoto"
-
-#~ msgid "Description Information"
-#~ msgstr "Informazioni Descrizione"
-
-#~ msgid "Next Interview"
-#~ msgstr "Prossimo colloquio"
-
-#~ msgid "Exception Rules"
-#~ msgstr "Regole di eccezione"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Accettato come richiesta"
-
-#~ msgid "Dead"
-#~ msgstr "Chiuso"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Cliente esistente"
-
-#~ msgid "Home"
-#~ msgstr "Pagina iniziale"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Casi per sezione, categoria e scenario"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Conferma riunione"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Email Add CC"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Rifiutato dall'Azienda"
-
-#~ msgid "Add CC"
-#~ msgstr "E CC"
-
-#~ msgid "All Meetings"
-#~ msgstr "Tutte le Riunioni"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Struttura Riunioni"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Contratto Proposto"
-
-#~ msgid "Assigned to"
-#~ msgstr "Assegnato a"
-
-#~ msgid "   Today   "
-#~ msgstr "   Oggi   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Permetti di vedere il calendario"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Politica richieste"
-
-#~ msgid "New Business"
-#~ msgstr "Nuovo Business"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Proposta di valore"
-
 #, python-format
 #~ msgid ""
 #~ "You must define a responsible user for this case in order to use this action!"
@@ -4671,812 +4516,16 @@ msgstr "Newsletter"
 #~ "È necessario definire un utente responsabile di questo caso, al fine di "
 #~ "utilizzare questa azione!"
 
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Posti di lavoro - Processo di assunzione"
-
-#~ msgid "New Claims"
-#~ msgstr "Nuova Richiesta"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Data della richiesta"
-
-#~ msgid "All Leads"
-#~ msgstr "tutte le Iniziative"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Modulo Riunioni"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Negoziazione/Revisione"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Casi per Opportunità e Scenario"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Richieste reali"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Contratto Firmato"
-
-#~ msgid "Existing Business"
-#~ msgstr "Business Esistenti"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Salva in formato .ics"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Email!"
-
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid "crm.opportunity.assign_wizard"
-#~ msgstr "crm.opportunity.assign_wizard"
-
-#~ msgid "Search Histories"
-#~ msgstr "Ricerca Storico"
-
-#~ msgid "Direction"
-#~ msgstr "Direzione"
-
-#~ msgid "Set State to"
-#~ msgstr "Imposta lo Stato per"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Pianifica Riunione"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Non c'è posta per rispondere!"
-
-#~ msgid "My Funds"
-#~ msgstr "I Miei Fondi"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Queste persone riceveranno una copia delle future comunicazioni tra partner "
-#~ "e utenti via email"
-
-#~ msgid "Export ICS"
-#~ msgstr "Esporta ICS"
-
-#~ msgid "Preventive"
-#~ msgstr "Preventivo"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Sviluppatore Junior"
-
-#~ msgid "Category Name"
-#~ msgstr "Nome Categoria"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Non è possibile assegnare \"Caso Chiuso\"."
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Regola Ricorrente"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Candidato rifiutato"
-
-#~ msgid "Print"
-#~ msgstr "Stampa"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Casi da Opportunità, Categoria e Scenario"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Richeste pendenti"
-
-#~ msgid "Closed Won"
-#~ msgstr "Obbiettivi raggiunti"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Casi per Sezione, Categoria e Categoria2"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Data Riunione"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Converti a Partner"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Formazione"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr ""
-#~ "Sei sicuro di voler creare un partner, basandoti su questa telefonata?"
-
-#~ msgid "Website"
-#~ msgstr "Sito Web"
-
-#~ msgid "crm.phonecall.assign_wizard"
-#~ msgstr "crm.phonecall.assign_wizard"
-
-#~ msgid "Message..."
-#~ msgstr "Messaggio..."
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Casi per Sezione e Categoria2"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Prossimi incontri"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Subscribe"
-
-#~ msgid "Value Claims"
-#~ msgstr "Valore delle richieste"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Vi aiuta a organizzare il processo di assunzione per posti di lavoro: "
-#~ "valutazione, riunioni, integrazione con email ..."
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Rispondi all'ultima Email"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Scrivi Luogo dell'incontro"
-
-#~ msgid "Self Generated"
-#~ msgstr "Generato in automatico"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Nome del candidato"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "In attesa di risposta"
-
-#~ msgid "Funds"
-#~ msgstr "Fondi"
-
-#~ msgid "Job Cases"
-#~ msgstr "Casi per posti di lavoro"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Struttura Reclutamento Lavoro"
-
-#~ msgid "Won't fix"
-#~ msgstr "Non verrà fissato"
-
-#~ msgid "Converted"
-#~ msgstr "Convertito"
-
-#~ msgid "Other Info"
-#~ msgstr "Altre informazioni"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Costo richiesta"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Pianifica una Telefonata"
-
-#~ msgid "Search Funds"
-#~ msgstr "Ricerca Fondi"
-
-#~ msgid "Type of claim"
-#~ msgstr "Tipo di richiesta"
-
-#~ msgid "Search Claims"
-#~ msgstr "Ricerca Richieste"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Gestisce il calendario delle riunioni degli utenti."
-
-#~ msgid "Mail"
-#~ msgstr "Mail"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Richiesta Analisi"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Scenario Vendite"
-
-#~ msgid "Add a CC"
-#~ msgstr "Aggiungi CC"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Prossima Riunione"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Tipo Campagna"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Proposta/Prezzo preventivo"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Richieste in progresso"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Tracciamento Bug"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "Graduate"
-#~ msgstr "Laureato"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Nota che è possibile utilizzare la vista calendario per creare lo "
-#~ "scadenziario dei tuoi prossimi incontri."
-
-#~ msgid "crm.meeting.generic_wizard"
-#~ msgstr "crm.meeting.generic_wizard"
-
-#~ msgid "Histories"
-#~ msgstr "Cronologie"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Struttura Iniziative"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Email Fallita!"
-
-#~ msgid "Attendee"
-#~ msgstr "Partecipante"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Errore! Non è possibile creare sezioni ricorsive."
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Richiesta di lavori iniziali"
-
-#~ msgid "Claims Info"
-#~ msgstr "Informazioni Richieste"
-
-#~ msgid "This Year"
-#~ msgstr "Quest'anno"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Permetterà di sincronizzare i tuoi calendari Open ERP con il tuo telefono, "
-#~ "outlook, Sunbird, ical, ..."
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Utilizzato dalle aziende per tenere traccia dei bug e le richieste di "
-#~ "supporto sul software"
-
-#~ msgid "Contract Data"
-#~ msgstr "Data di contratto"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Casi di Contatti Privilegiati e Tipo"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Calendario condiviso"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Raccolta Fondi"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Nome Caso Categoria2"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Supporto Helpdesk"
-
-#~ msgid "Payment Mode"
-#~ msgstr "Modalità Pagamento"
-
-#~ msgid "Source"
-#~ msgstr "Fonte"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Converti a Partner"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "Dettaglio Partecipante"
-
-#~ msgid " > Bac +5"
-#~ msgstr " > Bac +5"
-
-#~ msgid "Import ICS File"
-#~ msgstr "Importa File ICS"
-
 #~ msgid "Telesales"
 #~ msgstr "Televendite"
 
-#~ msgid "Jobs"
-#~ msgstr "Lavori"
-
-#~ msgid "Job Info"
-#~ msgstr "Informazioni Lavoro"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Annulla Riunione"
-
-#~ msgid "Employee Email"
-#~ msgstr "Email Dipendente"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date) = Data Creazione"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Modulo di Assunzione"
-
-#~ msgid "Credit Card"
-#~ msgstr "Carta di Credito"
-
-#~ msgid "Search Jobs"
-#~ msgstr "Ricerca Lavori"
-
-#~ msgid "Send Email"
-#~ msgstr "Invia Email"
-
-#~ msgid "Corrective"
-#~ msgstr "Correttivo"
-
-#~ msgid "Support Query"
-#~ msgstr "Richiesta di Supporto"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Supporto Helpdesk"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Nome2 Candidato"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr ""
-#~ "Questo può aiutare le associazioni nel loro processo diraccolta fondi e nel "
-#~ "mantenere traccia di ciò."
-
-#~ msgid "Events"
-#~ msgstr "Eventi"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Permette di tenere traccia e gestire i contatti privilegiati che sono "
-#~ "richieste di prevendita o contatti,il primo contatto con un richiesta del "
-#~ "cliente."
-
-#~ msgid "Cheque"
-#~ msgstr "Assegno"
-
-#~ msgid "crm.menu.config_wizard"
-#~ msgstr "crm.menu.config_wizard"
-
-#~ msgid "Attachment2"
-#~ msgstr "Allegato2"
-
-#~ msgid "Attachment1"
-#~ msgstr "Allegato1"
-
-#~ msgid "Degree"
-#~ msgstr "Titolo di studio"
-
-#~ msgid "Attachment3"
-#~ msgstr "Allegato3"
-
-#~ msgid "To Assign"
-#~ msgstr "Da Assegnare"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Sei sicuro di voler creare un partner sulla base di questa richiesta di "
-#~ "lavoro?"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Si prega di fornire un URL corretto!"
-
-#~ msgid "History of Events"
-#~ msgstr "Cronologia degli Eventi"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Categoria2 del caso"
-
-#~ msgid "Recycled"
-#~ msgstr "Riciclata"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Tutte le Opportunità"
-
-#~ msgid "Sales"
-#~ msgstr "Vendite"
-
-#~ msgid "Assigned"
-#~ msgstr "Assegnato"
-
-#~ msgid "Lead Name"
-#~ msgstr "Nome iniziativa"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Fissa la Riunione"
-
-#~ msgid "Invalid"
-#~ msgstr "Non valido"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Calendario Riunioni"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Riunione per Creare Iniziative"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nome dipendente"
-
-#~ msgid "Related Case"
-#~ msgstr "Caso correlato"
-
-#~ msgid "Email Address"
-#~ msgstr "Indirizzo Email"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Disponibilità (settimane)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Struttura Opportunità"
-
-#~ msgid "First Interview"
-#~ msgstr "Primo colloquio"
-
-#~ msgid "This Month"
-#~ msgstr "Questo Mese"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Rifiutato da dipendente"
-
-#~ msgid "All Claims"
-#~ msgstr "Tutte le Richieste"
-
-#~ msgid "Server Action"
-#~ msgstr "Azione Server"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Bozza di domanda"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Chiudi Telefonata"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Email non spedita"
-
-#~ msgid "Funds Form"
-#~ msgstr "Modulo Fondi"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Processo di assunzione per assegnazione posti di lavoro"
-
-#~ msgid "Lead Source"
-#~ msgstr "Origine Iniziativa"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Casi per sezione, Categoria e Scenario"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Candidato Assunto"
-
-#~ msgid "Goals"
-#~ msgstr "Obiettivi"
-
-#~ msgid "In Process"
-#~ msgstr "In corso"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Servizi Post Vendita"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Casi per Sezione e Tipo"
-
-#~ msgid "File name"
-#~ msgstr "Nome file"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Import ICS"
-#~ msgstr "Importa ICS"
-
-#~ msgid "crm.claim.assign_wizard"
-#~ msgstr "crm.claim.assign_wizard"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Tutte le Richieste di Lavoro"
-
-#~ msgid "Relevant"
-#~ msgstr "Rilevante"
-
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr "Reinserimento sociale e crescita rurale"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Casi per Opportunità e Tipo"
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Casi per Iniziativa e Scenario"
-
-#~ msgid "Reporting"
-#~ msgstr "Rapporto"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Stipendio Previsto"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Spedisci Nuova Email"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Argomenti non validi"
 
-#~ msgid "My Cases"
-#~ msgstr "I Miei Casi"
-
-#~ msgid "Word of mouth"
-#~ msgstr "A voce"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Struttura Fondi"
-
-#~ msgid "Type of Action"
-#~ msgstr "Tipo di azione"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Riunione con candidati"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Email del candidato"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Scenario di vendita: "
-
-#~ msgid "Planned"
-#~ msgstr "Pianificato"
-
-#~ msgid "Customer Office"
-#~ msgstr "Ufficio cliente"
-
-#~ msgid "All Funds"
-#~ msgstr "Tutti i Fondi"
-
-#~ msgid "Qualication"
-#~ msgstr "Qualifica"
-
-#~ msgid "Lead Details"
-#~ msgstr "Dettagli contatto privilegiato"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Arti e cultura"
-
-#~ msgid "HelpDesk"
-#~ msgstr "HelpDesk"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Casi per Sezione, Categoria e Tipo"
-
-#~ msgid "Licenced"
-#~ msgstr "Autorizzato"
-
-#~ msgid "Healthcare"
-#~ msgstr "Assistenza sanitaria"
-
-#~ msgid "Employee"
-#~ msgstr "Dipendente"
-
-#~ msgid "Meeting date"
-#~ msgstr "Data di riunione"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "CONFIDENZIALE"
-
-#~ msgid "crm.helpdesk.assign_wizard"
-#~ msgstr "crm.helpdesk.assign_wizard"
-
-#~ msgid "Office"
-#~ msgstr "Ufficio"
-
-#~ msgid "Assign"
-#~ msgstr "Assegna"
-
-#~ msgid "Not fixed"
-#~ msgstr "Non fissato"
-
-#~ msgid "Content of mail"
-#~ msgstr "Contenuto dell'email"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Note Interne"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = Il Carattere '%'"
-
-#~ msgid "_Import"
-#~ msgstr "_Import"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Mailing di Massa"
-
-#~ msgid "Cash"
-#~ msgstr "Contante"
-
-#~ msgid "Import Message"
-#~ msgstr "Importa Messaggio"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Fondi per Categoria"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Salva file ICS"
-
-#~ msgid "Future"
-#~ msgstr "Futuro"
-
-#~ msgid "Export ICS File"
-#~ msgstr "Esporta File ICS"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Operazioni di ricerca fondi"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Descrizione Chiamata Telefonica"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Perdita chiusa"
-
-#~ msgid "Prospecting"
-#~ msgstr "Candidatura"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Entrate stimate"
-
-#~ msgid "Delay Close"
-#~ msgstr "Ritardo Chiusura"
-
-#~ msgid "Candidate Phone"
-#~ msgstr "Telefono Candidato"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Esiste già un Partner con lo stesso nome"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Lavori Aperti"
-
-#~ msgid "Applied Job"
-#~ msgstr "Lavoro Svolto"
-
-#~ msgid "New Jobs"
-#~ msgstr "Nuovo Lavoro"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Seleziona il file ICS"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "Tracce identificano le opportunità per le linee di vendita."
-
 #, python-format
 #~ msgid "open"
 #~ msgstr "Aperto"
 
-#~ msgid "Related Cases"
-#~ msgstr "Casi relativi"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr ""
-#~ "Assegna l'ordine in funzione della Sequenza quando viene visualizzata una "
-#~ "lista di Sezioni di Casi."
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "Sottoscrivi l'ICS remoto"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Seziona alla quale il Caso appartiene. Definisci l'utente Responsabile e "
-#~ "l'indirizzo mail per l'invio di posta."
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Spunta se vuoi che la regola marchi CC (mail inviata ad altre persone "
-#~ "definite nelle azioni)."
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Descrive il nome dell'azione, ad es.: su quale oggetto, che azione deve "
-#~ "essere presa, sulla base di che condizione"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "I canali rappresentano i differenti modi di comuncare disponibili per il "
-#~ "cliente. Con tutte le opportunità commerciali, puoi indicare il canale che "
-#~ "usa questa fonte di opportunità."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Se il campo attivo è impostato a Vero, vi permetterà di nascondere la "
-#~ "sezione casi senza rimuoverla."
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Azione server che deve essere programmata"
-
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "Mail agli osservatori (CC)"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Espressione regolare o nome caso"
-
-#~ msgid "Set case state to"
-#~ msgstr "Imposta lo stato del caso a"
-
-#~ msgid "FreeBusy"
-#~ msgstr "Libero / Occupato"
-
-#~ msgid "Stage: "
-#~ msgstr "Stage: "
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Casi chiamate telefoniche"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr ""
-#~ "Fornisce l'ordine delle sequenza quando viene visualizzata la lista di "
-#~ "regole per casi"
-
-#~ msgid "PRIVATE"
-#~ msgstr "PRIVATO"
-
-#~ msgid "PUBLIC"
-#~ msgstr "PUBBLICO"
-
-#~ msgid "Search Case"
-#~ msgstr "Cerca il caso"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "ID Email della persona a cui le mail vanno spedite"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Un Partner è già definito su questa richiesta di lavoro."
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Fornisce il percorso per i calendari remoti"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Se il campo attivo è impostato a Vero, vi permetterà di nascondere le regole "
-#~ "del caso senza rimuoverle."
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Procedura guidata generica"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Casi ricerca fondi"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Casi Helpdesk"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "Fornisce il percorso per il calendario remoto"
-
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
@@ -5484,62 +4533,5 @@ msgstr "Newsletter"
 #~ "Impossibile inviare un e-mail con corpo vuoto, dovresti compilare il corpo "
 #~ "del messaggio"
 
-#~ msgid "Extended Options..."
-#~ msgstr "Opzioni estese..."
-
-#~ msgid "Repeat every x"
-#~ msgstr "Ripeti ogni x"
-
-#~ msgid "Interval"
-#~ msgstr "Intervallo"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Opportunità per categorie"
-
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Iniziativa "
-
-#~ msgid "Seconds"
-#~ msgstr "Secondi"
-
-#, python-format
-#~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-#~ msgstr "Chiusa/Annullata \\nIniziativa non convertita in Opportunità"
-
-#, python-format
-#~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-#~ msgstr ""
-#~ "Chiusa/Annullata telefonata \\nChiamata non convertita in opportunità"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo"
-
-#~ msgid "of"
-#~ msgstr "di"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "è convertito a Opportunità"
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Calendario Risorse"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Creare una categoria di telefonate specifica per meglio classificare le "
-#~ "chiamate tracciate nel sistema."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Campagna Mail 1"
-
-#~ msgid "Exclude range"
-#~ msgstr "Intervallo di esclusione"
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index c4baecb72ad..1b9d7b36135 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -535,9 +535,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -804,8 +804,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1081,7 +1081,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2583,7 +2583,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3093,8 +3093,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/ko.po b/addons/crm/i18n/ko.po
index fc89ddbefcf..ef5c693aeda 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -535,9 +535,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -806,8 +806,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2587,7 +2587,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3097,8 +3097,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4024,13 +4024,6 @@ msgstr ""
 #~ msgid "Case"
 #~ msgstr "케이스"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "특정 파트너에 대해, 이 기간 동안 구매 (또는 판매) 거래가 없다면, 이 팩터에 \r\n"
-#~ "기초하여, 해당 파트너의 마인드 상태를 낮춥니다."
-
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
diff --git a/addons/crm/i18n/lo.po b/addons/crm/i18n/lo.po
index a55ea705b54..b538efe4e36 100644
--- a/addons/crm/i18n/lo.po
+++ b/addons/crm/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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "ລາຫັດຂອງທີມຂາຍຕ້ອງມີຕົວດຽວ"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -535,9 +535,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -804,8 +804,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1081,7 +1081,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2583,7 +2583,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3093,8 +3093,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 38faeb40a32..4d14a3dce4c 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: lt\n"
 
 #. module: crm
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Pardavimų komandos kodas turi būti unikalus!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Iniciatyva '%s' buvo konvertuota į pardavimo galimybę."
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Nekartoti"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -552,9 +552,9 @@ msgstr "Pirmasis kontaktas su nauju galimu kleintu"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -833,8 +833,8 @@ msgid "Statistics Dashboard"
 msgstr "Veiklos monintoringo statistika"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1110,7 +1110,7 @@ msgstr "Leidžia siųsti"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2653,7 +2653,7 @@ msgid "Meeting Type"
 msgstr "Susitikimo tipas"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Sulieti su esama pardavimo galimybe"
@@ -3184,8 +3184,8 @@ msgid "Schedule Call"
 msgstr "Suplanuoti skambutį"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4060,9 +4060,6 @@ msgstr "Naujienlaiškis"
 #~ msgid "Conditions"
 #~ msgstr "Sąlygos"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "New Form"
 #~ msgstr "Nauja forma"
 
@@ -4295,9 +4292,6 @@ msgstr "Naujienlaiškis"
 #~ msgid "My Unclosed "
 #~ msgstr "Mano neužverti "
 
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Sukūrimo data"
-
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
@@ -4434,13 +4428,6 @@ msgstr "Naujienlaiškis"
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Svarbumo sąlygos"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Jeigu partneris nepirko (nepardavė) per periodą, nuotaika sumažinama pagal "
-#~ "šį rodiklį. Mažinant atliekama daugyba."
-
 #~ msgid "Send Partner & Historize"
 #~ msgstr "Išsiųsti partneriui ir archyvuoti"
 
diff --git a/addons/crm/i18n/lv.po b/addons/crm/i18n/lv.po
index 4d6cbe42070..51cad53277d 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Pārdošanas komandas kodam jābūt unikālam!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Pavediens '%s' jākonvertē par izdevību."
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Neatkārtot"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -536,9 +536,9 @@ msgstr "Pirmais kontakts ar paredzamo klientu"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -805,8 +805,8 @@ msgid "Statistics Dashboard"
 msgstr "Statistikas instrumentu panelis"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1082,7 +1082,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2584,7 +2584,7 @@ msgid "Meeting Type"
 msgstr "Tikšanās tips"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Apvienot ar esošo izdevību"
@@ -3094,8 +3094,8 @@ msgid "Schedule Call"
 msgstr "Ieplānot sarunu"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3833,44 +3833,11 @@ msgstr "Gads"
 msgid "Newsletter"
 msgstr "Izziņošana"
 
-#~ msgid "Resource's Calendar"
-#~ msgstr "Resursu kalendārs"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Atkārtot maksimums tik reižu"
-
-#~ msgid "Count"
-#~ msgstr "Skaits"
-
-#~ msgid "Claim"
-#~ msgstr "Pretenzija"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Atkārtot katru"
-
-#~ msgid "Interval"
-#~ msgstr "Intervāls"
-
 #~ msgid "Telesales"
 #~ msgstr "Telepārdošana"
 
-#~ msgid "Custom"
-#~ msgstr "Pielāgots"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekundes"
-
 #~ msgid "Minutes"
 #~ msgstr "Minūtes"
 
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Vēstuļu kampana 1"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Pielāgotais atkārtošanas noteikums"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Tikšanās par lietu"
-
-#~ msgid "of"
-#~ msgstr "no"
diff --git a/addons/crm/i18n/mn.po b/addons/crm/i18n/mn.po
index bf04fb40c3f..fe9cf5d1268 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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Дахихгүй"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -541,9 +541,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -810,8 +810,8 @@ msgid "Statistics Dashboard"
 msgstr "Статистик хянах самбар"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1087,7 +1087,7 @@ msgstr "Хүлээж авах"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2589,7 +2589,7 @@ msgid "Meeting Type"
 msgstr "Уулзалтын төрөл"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3103,8 +3103,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3842,33 +3842,12 @@ msgstr "Жил"
 msgid "Newsletter"
 msgstr "Сонин"
 
-#~ msgid "Emails"
-#~ msgstr "Имэйлүүд"
-
-#~ msgid "This Year"
-#~ msgstr "Энэ жил"
-
 #~ msgid "Created"
 #~ msgstr "Үүссэн"
 
 #~ msgid "General"
 #~ msgstr "Ерөнхий"
 
-#~ msgid "This Month"
-#~ msgstr "Энэ сар"
-
-#~ msgid "Amount"
-#~ msgstr "Хэмжээ"
-
-#~ msgid "Fixed"
-#~ msgstr "Тогтмол"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "Илэрхий"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Цалингийн санал"
-
 #~ msgid "None"
 #~ msgstr "Хоосон"
 
@@ -3878,237 +3857,53 @@ msgstr "Сонин"
 #~ msgid "Last Action Date"
 #~ msgstr "Сүүлийн үйл ажиллагааны огноо"
 
-#~ msgid "Appreciation"
-#~ msgstr "Өндөр үнэлгээ"
-
-#~ msgid "Second Interview"
-#~ msgstr "Хоёр дахь уулзалт"
-
-#~ msgid "Description Information"
-#~ msgstr "Тайлбар мэдээлэл"
-
 #~ msgid "Delay type"
 #~ msgstr "Саатлын төрөл"
 
-#~ msgid "Next Interview"
-#~ msgstr "Дараагийн уулзалт"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Имэйлд CC нэмэх"
-
-#~ msgid "All Meetings"
-#~ msgstr "Бүх уулзалтууд"
-
-#~ msgid "Add CC"
-#~ msgstr "СС нэмэх"
-
-#~ msgid "New Business"
-#~ msgstr "Шинэ бизнес"
-
-#~ msgid "   Today   "
-#~ msgstr "   Өнөөдөр   "
-
-#~ msgid "Policy Claims"
-#~ msgstr "Даатгалын шаардлага"
-
-#~ msgid "Assigned to"
-#~ msgstr "Шилжүүлсэн"
-
 #~ msgid "Partner Events"
 #~ msgstr "Түншийн үйл явц"
 
-#~ msgid "Contract Proposed"
-#~ msgstr "Гэрээ санал болгох"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Ажлууд-Хөлслөх үйл явц"
-
-#~ msgid "New Claims"
-#~ msgstr "Шинэ шаардлага"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Баримттай шаардлагууд"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Шаардлага хүлээх"
-
-#~ msgid "Value Claims"
-#~ msgstr "Заргын утга"
-
-#~ msgid "Search Claims"
-#~ msgstr "Шаардлага хайх"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Заргын үйл явц"
-
-#~ msgid "Claims Info"
-#~ msgstr "Заргын мэдээлэл"
-
-#~ msgid "All Claims"
-#~ msgstr "Бүх шаардлага"
-
 #~ msgid "Your action"
 #~ msgstr "Таны үй ажиллагаа"
 
-#~ msgid "Reporting"
-#~ msgstr "Мэдээ"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Алдаатай аргумент"
 
-#~ msgid "Trensparent"
-#~ msgstr "Илэрхий"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Сэдвийн удирдамж"
-
-#~ msgid "Planned"
-#~ msgstr "Төлөвлөсөн"
-
-#~ msgid "Customer Office"
-#~ msgstr "Харилцагчийн албан газар"
-
-#~ msgid "Change RRule"
-#~ msgstr "Дүрэм солих"
-
-#~ msgid "Licenced"
-#~ msgstr "Зөвшөөрөлтэй"
-
 #~ msgid "Planned revenue"
 #~ msgstr "Төлөвлөсөн улсын орлого"
 
-#~ msgid "Healthcare"
-#~ msgstr "Эмнэлэгийн тусламж"
-
-#~ msgid "Assign"
-#~ msgstr "Шилжүүлэх"
-
-#~ msgid "Office"
-#~ msgstr "Ажлын газар"
-
 #~ msgid "Estimates"
 #~ msgstr "Төсөв"
 
 #~ msgid "Section Code"
 #~ msgstr "Бүлэг код"
 
-#~ msgid "Meeting date"
-#~ msgstr "Уулзалтын огноо"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "Итгэмжлэгдсэн"
-
-#~ msgid "Content of mail"
-#~ msgstr "Имэйлийн агуулга"
-
-#~ msgid "Not fixed"
-#~ msgstr "Тогтмол бус"
-
-#~ msgid "Employee"
-#~ msgstr "Ажилтан"
-
 #~ msgid "Partner Email"
 #~ msgstr "Түншийн Имэйл"
 
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = '%' тэмдэгт"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Дотоодын тэмдэглэл"
-
-#~ msgid "_Import"
-#~ msgstr "_Импорт"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Бөөнөөр нь илгээх"
-
 #~ msgid "E-Mail Actions"
 #~ msgstr "Имэйл үйл ажиллагаанууд"
 
-#~ msgid "Cash"
-#~ msgstr "Касс"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Зэрэглэлээр хадгалах"
-
-#~ msgid "Future"
-#~ msgstr "Ирээдүй"
-
-#~ msgid "Save ICS file"
-#~ msgstr "ICS файл хадгалах"
-
 #~ msgid "Conditions on Timing"
 #~ msgstr "Цагийн байдал"
 
-#~ msgid "Export ICS File"
-#~ msgstr "ICS файл экспортлох"
-
-#~ msgid "Select ICS file"
-#~ msgstr "ICS файл сонгох"
-
-#~ msgid "Import Message"
-#~ msgstr "Мэссэжийн утга"
-
 #~ msgid "Cases by section"
 #~ msgstr "Тохиолдлуудаар нь бүлэглэх"
 
-#~ msgid "New Jobs"
-#~ msgstr "Шинэ ажлууд"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Мөнгө өсгөх үйл ажиллагаа"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
-#~ msgid "Resource's Calendar"
-#~ msgstr "Нөөц календар"
-
-#~ msgid "Count"
-#~ msgstr "Тоолох"
-
-#~ msgid "Extended Options..."
-#~ msgstr "Өргөтгөсөн хайлт..."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
 
-#~ msgid "Interval"
-#~ msgstr "Завсар"
-
-#~ msgid "Custom"
-#~ msgstr "Үйлчлүүлэгч"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
-
 #~ msgid "Minutes"
 #~ msgstr "Минут"
 
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Компанит ажлын мэйл 1"
 
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Судалгаа "
-
-#~ msgid "Seconds"
-#~ msgstr "Секунд"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
-
-#~ msgid "Exclude range"
-#~ msgstr "Хасах өөрчлөлт"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй"
-
-#~ msgid "Fwd"
-#~ msgstr "Fwd"
-
-#~ msgid "of"
-#~ msgstr "ийн"
diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po
index ecb8ece2f54..a24fab2f241 100644
--- a/addons/crm/i18n/nb.po
+++ b/addons/crm/i18n/nb.po
@@ -8,26 +8,26 @@ 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-31 18:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-10-13 07:42+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <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: 2011-04-29 04:58+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "# Leads"
 
 #. module: crm
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Lead"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -42,7 +42,7 @@ msgstr "Månedlig"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Schedule a PhoneCall"
-msgstr ""
+msgstr "Planlegg en telefonsamtale"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
@@ -52,17 +52,17 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr ""
+msgstr "Synlighet"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr ""
+msgstr "Tittel"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Vis som"
 
 #. module: crm
 #: field:crm.meeting,day:0
@@ -74,7 +74,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Today"
-msgstr ""
+msgstr "I dag"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -87,7 +87,7 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -153,7 +153,7 @@ msgstr "Advarsel !"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Årlig"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -168,7 +168,7 @@ msgstr "Regelnavn"
 #: field:crm.lead.report,type_id:0
 #: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
-msgstr ""
+msgstr "Kampanje"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -226,7 +226,7 @@ msgstr "Partner"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organisator"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -250,7 +250,7 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefonsamtale"
 
 #. module: crm
 #: field:crm.lead,optout:0
@@ -275,7 +275,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Send ny e-post"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -295,7 +295,7 @@ msgstr "Seksjoner"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "_Flett"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -315,13 +315,13 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Offentlig"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "Kampanjer"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -333,7 +333,7 @@ msgstr "Kategorier"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "For alltid"
 
 #. module: crm
 #: help:crm.lead,optout:0
@@ -350,7 +350,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Kontaktnavn"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -535,9 +535,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -808,8 +808,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1085,7 +1085,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2591,7 +2591,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3103,8 +3103,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3975,9 +3975,6 @@ msgstr ""
 #~ msgid "Mail to responsible"
 #~ msgstr "E-post til ansvarlig"
 
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Registreringsdato"
-
 #~ msgid "Set responsible to"
 #~ msgstr "Sett ansvarlig til"
 
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 76168cd7b11..2e56c670046 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -78,7 +78,7 @@ msgstr "Vandaag"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "Selecteer verkoopkansen"
+msgstr "Selecteer prospects"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "De verkoopteam code moet uniek zijn!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Lead '%s' is omgezet in een verkoopkans."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Geen herhaling"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -200,7 +200,7 @@ msgstr "Waarschuwing!"
 #: 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 "Verkoopkansen analyse"
+msgstr "Prospects analyse"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -384,7 +384,7 @@ msgstr "Verbeter uw basis CRM applicatie met aanvullende functionaliteiten."
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr "Wijzig waarschijnlijkheid automatisch"
+msgstr "Wijzig slagingskans automatisch"
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
@@ -422,7 +422,7 @@ msgstr "Fondsenwerving"
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "Leads en verkoopkansen"
+msgstr "Leads en prospects"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -491,7 +491,7 @@ msgstr "Categorie"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr "#Verkoopkansen"
+msgstr "#Prospects"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
@@ -550,9 +550,9 @@ msgstr "Eerste contact met een nieuwe mogelijke klant"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -826,7 +826,7 @@ msgstr "De naam van het segment"
 #: field:crm.case.stage,probability:0
 #: field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr "Waarschijnlijkheid (%)"
+msgstr "Slagingskans"
 
 #. module: crm
 #: view:crm.lead:0
@@ -840,8 +840,8 @@ msgid "Statistics Dashboard"
 msgstr "Statistisch dashboard"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1034,7 +1034,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr "Verkoopkansen"
+msgstr "Prospects"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
@@ -1124,7 +1124,7 @@ msgstr "Beeindiging herhaling"
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
-"Er zijn geen andere 'Open' of 'Wachtend' verkoopkansen voor de relatie '%s'."
+"Er zijn geen andere 'Open' of 'Wachtend' prospects voor de relatie '%s'."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1148,7 +1148,7 @@ msgstr "Opt-In"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1582,7 +1582,7 @@ msgstr "Zoeken"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr "Verkoopkansen per categorie"
+msgstr "Prospects per categorie"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1666,7 +1666,7 @@ msgstr "res.users"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr "Twee verkoopkansen samenvoegen"
+msgstr "Twee prospects samenvoegen"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -1742,11 +1742,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
-"Verkoopkansen analyse geeft u directe toegang tot uw verkoopkansen met "
-"informatie zoals verwachte omzet, geschatte kosten, gemiste einddata of het "
-"aantal interacties per verkoopkans. Dit overzicht wordt meetal gebruikt door "
-"de sales manager om periodiek commercieel overleg met de verkoopteams over "
-"de verkoop pijplijn te houden."
+"Prospects analyse geeft u directe toegang tot uw prospects met informatie "
+"zoals verwachte omzet, geschatte kosten, gemiste einddata of het aantal "
+"interacties per prospect. Dit overzicht wordt meestal gebruikt door de sales "
+"manager om periodiek commercieel overleg met de verkoopteams over de verkoop "
+"pijplijn te houden."
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1770,9 +1770,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 ""
-"Specifieke stadia toevoegen aan leads en verkoopkansen waarmee uw verkoop de "
-"pijplijn beter kan organiseren. Stadia laat ze beter volgen waar een "
-"verkoopkans zich bevindt in de verkoopcyclus."
+"Specifieke stadia toevoegen aan leads en prospects waarmee uw verkoop de "
+"pijplijn beter kan organiseren. Stadia geven de mogelijkheid om beter "
+"inzicht te krijgen in waar een prospect zich bevindt in de verkoopproces."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1942,8 +1942,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
-"Dit percentage geeft de standaard/gemiddelde waarschijnlijkheid aan voor dit "
-"stadium om te slagen bij het dossier"
+"Dit percentage geeft de standaard/gemiddelde slagingskans aan voor dit "
+"stadium voor succes met het dossier"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -2023,7 +2023,7 @@ msgstr "Waarde"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "Verkoopkansen op categorie"
+msgstr "Prospects op categorie"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2062,7 +2062,7 @@ msgstr "Selecteer stadia voor dit verkoopteam"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "Verkoopkansen per stadium"
+msgstr "Prospects per stadium"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2105,7 +2105,7 @@ msgstr "Extra info"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr "Verkoopkansen samenvoegen"
+msgstr "Prospects samenvoegen"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -2224,7 +2224,7 @@ msgstr "Google Adwords 2"
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Soort wordt gebruikt om leads en verkoopkansen te scheiden"
+msgstr "Soort wordt gebruikt om leads en prospects te scheiden"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2251,9 +2251,9 @@ msgid ""
 msgstr ""
 "Definieer een verkoopteam om uw verschillende verkopers of verkoopafdelingen "
 "in afzonderlijke verkoopteams te organiseren. Elk team werkt met zijn eigen "
-"lijst van verkoopkansen, verkooporders etc. Elke gebruiker kan een standaard "
-"team in zijn voorkeuren instellen. De getoonde verkoopkansen en "
-"verkooporders worden automatisch gefilterd volgens zijn team."
+"lijst van prospects, verkooporders etc. Elke gebruiker kan een standaard "
+"team in zijn voorkeuren instellen. De getoonde prospects en verkooporders "
+"worden automatisch gefilterd op team."
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2299,7 +2299,7 @@ msgstr "Niet vastgehouden"
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr "Waarschijnlijkheid"
+msgstr "Slagingskans"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2674,7 +2674,7 @@ msgstr "Nieuwe email sturen"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr "Mijn open verkoopkansen"
+msgstr "Mijn open prospects"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
@@ -2715,7 +2715,7 @@ msgid "Meeting Type"
 msgstr "Soort afspraak"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Samenvoegen met bestaande verkoopkans"
@@ -2940,17 +2940,17 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
-"Met verkoopkansen kunt u uw verkoop pijplijn bijhouden door specifieke klant-"
-" or prospect gerelateerde documenten te maken om potentiële verkoop op te "
+"Met prospects kunt u uw verkoop pijplijn bijhouden door specifieke klant- of "
+"prospect gerelateerde documenten te maken om potentiële verkoop op te "
 "volgen. Informatie zoals verwachte omzet, verkoopstadium, verwachte "
 "afsluitdatum, communicatie geschiedenis en nog veel meer kan worden "
-"vastgelegd. Verkoopkansen kan worden gekoppeld met de email gateway: nieuw "
+"vastgelegd. Verkoopkansen kan worden gekoppeld met de email gateway: nieuwe "
 "emails kunnen verkoopkansen maken, elk automatisch met de conversatie "
 "geschiedenis met de klant.\n"
 "\n"
 "U en uw team(s) kunnen afspraken en telefoongesprekken plannen vanuit "
-"verkoopkansen, ze omzetten in offertes, gerelateerde documenten beheren, "
-"alle activiteiten volgen en nog veel meer."
+"prospects, ze omzetten in offertes, gerelateerde documenten beheren, alle "
+"activiteiten volgen en nog veel meer."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3030,7 +3030,7 @@ msgstr "Berichten"
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr "Waarschijnlijkheid van volgende en vorige stadia wijzigen."
+msgstr "Slagingskans van volgende en vorige stadia wijzigen."
 
 #. module: crm
 #: code:addons/crm/crm.py:455
@@ -3095,9 +3095,9 @@ msgid ""
 "do."
 msgstr ""
 "Specifieke categorieën maken die passen bij de activiteiten van uw bedrijf "
-"om uw leads en verkoopkansen beter te klassificeren en analyseren. Zulke "
-"categorieën kunnen bijvoorbeeld uw product structuur of de verschillende "
-"soorten verkopen die u doet weerspiegelen."
+"om uw leads en prospects beter te klassificeren en analyseren. Categorieën "
+"kunnen bijvoorbeeld uw product structuur of de verschillende soorten "
+"verkopen die u doet weerspiegelen."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3261,8 +3261,8 @@ msgid "Schedule Call"
 msgstr "Plan gesprek"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3311,7 +3311,7 @@ msgstr "Provincie"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr "Verkoopkansen van leads maken"
+msgstr "Prospects van leads maken"
 
 #. module: crm
 #: help:crm.send.mail,html:0
@@ -3369,7 +3369,7 @@ msgstr "    Maand-1    "
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr "Deze module verbindt verkoop met verkoopkansen in de CRM"
+msgstr "Deze module verbindt verkoop aan prospects in de CRM"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -3664,7 +3664,7 @@ msgstr "Geen email-ID gevonden voor uw bedrijfsadres!"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr "Verkoopkansen op stadium"
+msgstr "Prospects per stadium"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@@ -3687,8 +3687,8 @@ msgid ""
 "cycle."
 msgstr ""
 "Specifieke stadia maken die uw verkoop helpen om haar verkoop pijplijn beter "
-"te organiseren door ze bij te houden bij de verkoopkansen. Ze kunnen er "
-"eenvoudig mee volgen waar een verkoopkans zich bevindt in de verkoopcyclus."
+"te organiseren door ze bij te houden bij de prospects. Zo wordt het "
+"eenvoudig te volgen waar een prospect zich bevindt in het verkoopproces."
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
@@ -3876,7 +3876,7 @@ msgstr "Straat"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr "Verkoopkansen op gebruiker en team"
+msgstr "Prospects op gebruiker en team"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -4203,9 +4203,6 @@ msgstr "Nieuwsbrief"
 #~ msgid "User Responsible"
 #~ msgstr "Verantwoordelijke"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Acties"
 
@@ -4539,14 +4536,6 @@ msgstr "Nieuwsbrief"
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Voorwaarden aan het bereik van de prioriteit"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Wanneer de relatie niets heeft gekocht of wanneer niets is ingekocht bij de "
-#~ "relatie, verlaag dan de loyaliteit met deze factor. Dit is een "
-#~ "vermenigvuldiging."
-
 #~ msgid "E-Mail Actions"
 #~ msgstr "E-mail acties"
 
@@ -4618,1266 +4607,11 @@ msgstr "Nieuwsbrief"
 #~ msgid "Invalid arguments"
 #~ msgstr "Ongeldige argumenten"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Dagen    "
-
-#~ msgid "Close job request"
-#~ msgstr "Vacature afsluiten"
-
-#~ msgid "Close Lead"
-#~ msgstr "Lead afsluiten"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Dossiers op sectie en categorie2"
-
-#~ msgid "Send to"
-#~ msgstr "Verzenden naar"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Vink dit aan wanneer de regel een email moet zenden naar de "
-#~ "verantwoordelijke persoon."
-
-#~ msgid "Amount"
-#~ msgstr "Bedrag"
-
-#~ msgid "Human Resources"
-#~ msgstr "Personeelszaken"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Dossiers op kansen, categorie en soort"
-
-#~ msgid "Fixed"
-#~ msgstr "Opgelost"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Beheert een helpdesk-service."
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Wachtende vacatures"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Deze eigenschap definieert een lijst met datum/tijd uitgezonderingen bij "
-#~ "herhalingsafspraken in de agenda."
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Beheert de claims van leveranciers en klanten, inclusief uw corrigerende of "
-#~ "preventieve acties."
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "A.u.b. emailadres gebruiker invoeren!"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "TRANSPARANT"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "Bepaalt de volgorde waarin dossier secties worden afgebeeld."
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Voorgesteld salaris"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Sectie waar dossier toe behoort. Definieer verantwoordelijke gebruiker en "
-#~ "Email account voor mail gateway."
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Beschrijft de actie naam. ie: op welk object welke actie op basis van welke "
-#~ "voorwaarde plaats moet vinden"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Duur (uren)"
-
-#~ msgid "Second Interview"
-#~ msgstr "Tweede gesprek"
-
-#~ msgid "Exception Dates"
-#~ msgstr "Uitzonderingsdata"
-
-#~ msgid "Description Information"
-#~ msgstr "Informatieomschrijving"
-
-#~ msgid "Exception Rules"
-#~ msgstr "Uitzondering regels"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Geaccepteerd als klacht"
-
-#~ msgid "Dead"
-#~ msgstr "Beëindigd"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Bevestig afspraak"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Email voeg CC toe"
-
-#~ msgid "Next Interview"
-#~ msgstr "Volgend gesprek"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Dossiers op sectie en fase"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Dossiers op sectie en fase"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "Volgt herkende kansen voor uw verkooppijplijn."
-
-#~ msgid "Appreciation"
-#~ msgstr "Waardering"
-
-#~ msgid "crm.opportunity.assign_wizard"
-#~ msgstr "crm.opportunity.assign_wizard"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "Verkoopkans dossiers"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "De kanalen geven de verschillende beschikbare communicatie vormen met de "
-#~ "klant weer. Met elke verkoopkans kunt u aangeven welk communicatiekanaal de "
-#~ "bron van de kans is."
-
-#~ msgid "Meetings Form"
-#~ msgstr "Afsprakenformulier"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Afspraak plannen"
-
-#~ msgid "All Meetings"
-#~ msgstr "Alle afspraken"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Geeft locatie van de afspraak"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Beheert de afsprakenagenda van de gebruikers."
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Merk op dat u de kalender-weergave ook kunt gebruiken om grafisch uw "
-#~ "volgende afspraak te plannen."
-
-#~ msgid "crm.meeting.generic_wizard"
-#~ msgstr "crm.meeting.generic_wizard"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Helpt u bij het organiseren van het personeel aanname proces: evaluatie, "
-#~ "afspraken, email integratie..."
-
-#~ msgid "Meeting Date"
-#~ msgstr "Afspraakdatum"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Volgende afspraken"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Volgende afspraak"
-
-#~ 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 ""
-#~ "Vertraging na activeringsdatum, geeft aan dat u een negatief getal kunt "
-#~ "gebruiken als u vertraging vóór de activeringsdatum wilt gebruiken, zoals "
-#~ "een herinnering sturen 15 minuten voor een afspraak."
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Afspraak annuleren"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Afspraak vastleggen"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Afspraak dossiers"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Afsprakenagenda"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Afspraak voor leads-generatie"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Afspraak met kandidaten"
-
-#~ msgid "Meeting date"
-#~ msgstr "Afspraakdatum"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Bestaande klant"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Dossiers op sectie, categorie en fase"
-
-#~ msgid "New Business"
-#~ msgstr "Nieuwe zaken"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Vink aan als u wilt dat de regel CC markeert (mail naar een andere in de "
-#~ "acties gedefinieerde persoon)."
-
-#~ msgid "Value Proposition"
-#~ msgstr "Waarde voorstel"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Geweigerd door bedrijf"
-
-#~ msgid "Add CC"
-#~ msgstr "Voeg CC toe"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Contract aangeboden"
-
-#~ msgid "Assigned to"
-#~ msgstr "Toegewezen aan"
-
-#~ msgid "Related Cases"
-#~ msgstr "Gerelateerde dossiers"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Werving- & selectieproces"
-
-#~ msgid "   Today   "
-#~ msgstr "   Vandaag   "
-
-#~ msgid "Policy Claims"
-#~ msgstr "Procedurele klachten"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Omschrijving telefoongesprek"
-
-#~ msgid "New Claims"
-#~ msgstr "Nieuwe klachten"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Leads dossiers"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Contract getekend"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Klachtdatum"
-
-#~ msgid "All Leads"
-#~ msgstr "Alle leads"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Dossiers op verkoopkans en fase"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Onderhandeling/evaluatie"
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "Abonneer op remote ICS"
-
-#~ msgid "Existing Business"
-#~ msgstr "Bestaande zaken"
-
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Categorie gerelateerd aan de sectie. Verdeel de dossiers onafhankelijk of "
-#~ "sectie-gewijs onder."
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Opslaan in .ics formaat"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Feitelijke klachten"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Email!"
-
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid "Direction"
-#~ msgstr "Richting"
-
-#~ msgid "Set State to"
-#~ msgstr "Zet status op"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Er is geen mail te beantwoorden!"
-
-#~ msgid "Search Histories"
-#~ msgstr "Zoek historie"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Deze personen krijgen via email een kopie van toekomstige communicatie "
-#~ "tussen relatie en gebruikers"
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Server actie om te activeren"
-
-#~ msgid "Export ICS"
-#~ msgstr "Export ICS"
-
-#~ msgid "Preventive"
-#~ msgstr "Preventief"
-
-#~ msgid "My Funds"
-#~ msgstr "Mijn  fondsen"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Junior ontwikkelaar"
-
-#~ msgid "Category Name"
-#~ msgstr "Categorienaam"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "U kunt een gesloten dossier niet toewijzen."
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Herhalingsregel"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Kandidaat afgewezen"
-
-#~ msgid "Print"
-#~ msgstr "Afdrukken"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Dossiers op verkoopkans, categorie en fase"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Dossiers op sectie, categorie en categorie2"
-
-#~ msgid "Lead Email"
-#~ msgstr "Lead Email"
-
-#~ msgid "Regex on Case Name"
-#~ msgstr "Regex op Dossiernaam"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Wachtende klachten"
-
-#~ msgid "Closed Won"
-#~ msgstr "Gesloten gewonnen"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Als het actief veld niet aanzet, kunt u het dossier sectie verbergen zonder "
-#~ "het te verwijderen."
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Omzetten naar relatie"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Abonneren"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Leren en onderwijs"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr ""
-#~ "Weet u zeker dat u een relatie wilt maken op basis van dit telefoongesprek?"
-
-#~ msgid "Value Claims"
-#~ msgstr "Waarde klachten"
-
-#~ msgid "Self Generated"
-#~ msgstr "Zelf gegenereerd"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Naam kandidaat"
-
-#~ msgid "Website"
-#~ msgstr "Website"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Wacht op reactie"
-
-#~ msgid "Funds"
-#~ msgstr "Fondsen"
-
-#~ msgid "crm.phonecall.assign_wizard"
-#~ msgstr "crm.phonecall.assign_wizard"
-
-#~ msgid "Message..."
-#~ msgstr "Bericht..."
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Dossiers op sectie en categorie2"
-
-#~ msgid "Won't fix"
-#~ msgstr "Niet oplosbaar"
-
-#~ msgid "Other Info"
-#~ msgstr "Overige informatie"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Helpdesk Support"
-
-#~ msgid "Search Funds"
-#~ msgstr "Zoek fondsen"
-
-#~ msgid "Type of claim"
-#~ msgstr "Soort klacht"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Reguliere expressie op dossiernaam"
-
-#~ msgid "Job Cases"
-#~ msgstr "Banendossiers"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Wervingsboom"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Beantwoordt laatste Email"
-
-#~ msgid "Converted"
-#~ msgstr "Geconverteerd"
-
-#~ msgid "Mail"
-#~ msgstr "Mail"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Behoeftebepaling"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Kosten klacht"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Plan een telefoongesprek"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Verkoopfase"
-
-#~ msgid "Add a CC"
-#~ msgstr "Voeg een CC toe"
-
-#~ msgid "Search Claims"
-#~ msgstr "Zoek Klachten"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Soort campagne"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Voorstel/prijsopgave"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Gesloten verloren"
-
-#~ msgid "Set RRULE"
-#~ msgstr "Zet RRULE"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Lopende klachten"
-
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "Mail aan toeschouwers (CC)"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Volgen foutrapporten"
-
-#~ msgid "Graduate"
-#~ msgstr "Afgestudeerde"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Leads-boom"
-
-#~ msgid "This Year"
-#~ msgstr "Dit jaar"
-
-#~ msgid "Attendee"
-#~ msgstr "Deelnemer"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Fout! U kunt geen recursieve secties maken."
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Maakt het mogelijk uw OpenERP-agenda te synchroniseren met uw telefoon, "
-#~ "Outlook, Sunbird, iCAL, ..."
-
-#~ msgid "Home"
-#~ msgstr "Home"
-
-#~ msgid "Histories"
-#~ msgstr "Geschiedenis"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Gesch. omzet"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Initiële wervingsvraag"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Email Mislukt!"
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Wordt door bedrijven gebruikt voor foutopvolging en support vragen over "
-#~ "software"
-
-#~ msgid "Contract Data"
-#~ msgstr "Contractgegevens"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Dossiers per lead en soort"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Gedeelde agenda"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Fondsenwerving"
-
-#~ msgid "OPAQUE"
-#~ msgstr "OPAQUE"
-
-#~ msgid "Claims Info"
-#~ msgstr "Info klachten"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Dossier naam categorie2"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Helpdesk Supports"
-
-#~ msgid "Source"
-#~ msgstr "Bron"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Omzetten naar relatie"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "Detail deelnemer"
-
-#~ msgid " > Bac +5"
-#~ msgstr " > Bac +5"
-
-#~ msgid ""
-#~ "Helps you to encode the result of a phone call or to plan a list of phone "
-#~ "calls to process."
-#~ msgstr ""
-#~ "Helpt bij het vastleggen van het telefoongesprek resultaat of het plannen "
-#~ "van een lijst van te voeren gesprekken."
-
-#~ msgid "Import ICS File"
-#~ msgstr "Importeer ICS bestand"
-
 #~ msgid "Telesales"
 #~ msgstr "Telefonische verkoop"
 
-#~ msgid "Stage: "
-#~ msgstr "Fase: "
-
-#~ msgid "Payment Mode"
-#~ msgstr "Betalingsvorm"
-
-#~ msgid "Lead Information"
-#~ msgstr "Lead informatie"
-
-#~ msgid "Job Info"
-#~ msgstr "Vacature-info"
-
-#~ msgid "Employee Email"
-#~ msgstr "E-mail werknemer"
-
-#~ msgid "Prospecting"
-#~ msgstr "Zoeken"
-
-#~ msgid "Corrective"
-#~ msgstr "Correctief"
-
-#~ msgid "Support Query"
-#~ msgstr "Supportvraag"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Aanmaakdatum"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Banen - Wervingsformulier"
-
-#~ msgid "Jobs"
-#~ msgstr "Banen"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Helpdesk Support"
-
-#~ msgid "Delay Close"
-#~ msgstr "Vertraag afsluiten"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Naam kandidaat 2"
-
-#~ msgid "Set case state to"
-#~ msgstr "Zet dossierstatus op"
-
-#~ msgid "Credit Card"
-#~ msgstr "Creditcard"
-
-#~ msgid "Search Jobs"
-#~ msgstr "Zoek banen"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr "Dit kan verenigingen helpen bij het bijhouden van hun fondsenwerving"
-
-#~ msgid "Send Email"
-#~ msgstr "Verstuur Email"
-
-#~ msgid "Events"
-#~ msgstr "Gebeurtenissen"
-
-#~ msgid "FreeBusy"
-#~ msgstr "Vrijbezet"
-
-#~ msgid ""
-#~ "The minds states allow to define a value scale which representsthe partner "
-#~ "mentality in relation to our services.The scale hasto be created with a "
-#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-#~ msgstr ""
-#~ "De gemoedstoestanden laat u een schaalverdeling definieren van de houding "
-#~ "van de relatie t.o.v. onze dienstverlening. De verdeling moet worden gemaakt "
-#~ "met een factor voor elk niveau van 0 (zeer ontevreden) tot 10 (uitzonderlijk "
-#~ "tevreden)"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Maakt het mogelijk om leads, pre-sales verzoeken en -contacten, te "
-#~ "registreren en te volgen."
-
-#~ msgid "Attachment1"
-#~ msgstr "Bijlage1"
-
-#~ msgid "Degree"
-#~ msgstr "Graad"
-
-#~ msgid "Attachment3"
-#~ msgstr "Bijlage3"
-
-#~ msgid "Attachment2"
-#~ msgstr "Bijlage2"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Als het actiefveld is gevuld, laat het u het dossier verbergen zonder het te "
-#~ "verwijderen."
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Geef aub correcte URL !"
-
-#~ msgid "To Assign"
-#~ msgstr "Toe te wijzen"
-
-#~ msgid "Candidate Phone"
-#~ msgstr "Telefoonnummer kandidaat"
-
-#~ msgid "Cheque"
-#~ msgstr "Cheque"
-
-#~ msgid "crm.menu.config_wizard"
-#~ msgstr "crm.menu.config_wizard"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Weet u zeker dat u een relatie wilt maken op basis van deze vacature?"
-
-#~ msgid "History of Events"
-#~ msgstr "Gebeurtenis geschiedenis"
-
-#~ msgid "Recycled"
-#~ msgstr "Hergebruikt"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Er bestaat al een relatie met deze naam."
-
-#~ msgid "All Opportunities"
-#~ msgstr "Alle verkoopkansen"
-
-#~ msgid "PUBLIC"
-#~ msgstr "PUBLIEK"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Categorie2 van dossier"
-
-#~ msgid "Sales"
-#~ msgstr "Verkoop"
-
-#~ msgid "Assigned"
-#~ msgstr "Toegewezen"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Werknemernaam"
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "Klacht/Actie Omschrijving"
-
-#~ msgid "Lead Name"
-#~ msgstr "Leadnaam"
-
-#~ msgid "Invalid"
-#~ msgstr "Ongeldig"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Dossiers op fase en schattingen"
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Telefoongesprek dossiers"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr "Bepaalt de volgorde waarin de dossier regels lijst wordt afgebeeld."
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Geweigerd door werknemer"
-
-#~ msgid "All Claims"
-#~ msgstr "Alle klachten"
-
-#~ msgid "Server Action"
-#~ msgstr "Server-actie"
-
-#~ msgid "Related Case"
-#~ msgstr "Gerelateerde dossiers"
-
-#~ msgid "Email Address"
-#~ msgstr "Emailadres"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Open vacatures"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Verkoopkansen"
-
-#~ msgid "First Interview"
-#~ msgstr "Eerste gesprek"
-
-#~ msgid "This Month"
-#~ msgstr "Deze maand"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Beschikbaarheid (weken)"
-
-#~ msgid "Search Case"
-#~ msgstr "Zoek dossier"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Incasso"
-
-#~ msgid "Regex on Communication History"
-#~ msgstr "Regex op communicatie historie"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Email niet verstuurd!"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Afsluiten telefoongesprek"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Dossiers op sectie, categorie en fase"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Werving & selectieproces"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Kandidaat aangenomen"
-
-#~ msgid "Funds Form"
-#~ msgstr "Fondsenformulier"
-
-#~ msgid "PRIVATE"
-#~ msgstr "PRIVÉ"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Geef pad naar remote agenda"
-
-#~ msgid "Lead Source"
-#~ msgstr "Bron lead"
-
-#~ msgid "In Process"
-#~ msgstr "In behandeling"
-
-#~ msgid "Goals"
-#~ msgstr "Doelstellingen"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Nazorg"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Dossiers op sectie en soort"
-
-#~ msgid "File name"
-#~ msgstr "Bestandsnaam"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Alle vacatureaanvragen"
-
-#~ msgid "crm.claim.assign_wizard"
-#~ msgstr "crm.claim.assign_wizard"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Als het actiefveld in gevuld, kunt u het dossier verbergen zonder het te "
-#~ "verwijderen."
-
-#~ msgid "Applied Job"
-#~ msgstr "Toegepaste baan"
-
-#~ msgid "Claim Cases"
-#~ msgstr "Klachtendossiers"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "Email-id van de personen waarvan de mail wordt verstuurd"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Er is al een relatie gedefinieerd voor deze vacature."
-
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr ""
-#~ "Sociale reïntegratie en ontwikkelingsstimulans niet-stedelijke gebieden"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Dossiers op verkoopkans en soort"
-
-#~ msgid "Import ICS"
-#~ msgstr "ICS importeren"
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern                                 for "
-#~ "anexception to a recurrence set"
-#~ msgstr ""
-#~ "definieert een regel of herhalingspatroon voor een uitzondering op de "
-#~ "herhalingsset"
-
-#~ msgid "Relevant"
-#~ msgstr "Relevant"
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Dossiers op lead en fase"
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Generieke assistent"
-
-#~ msgid "Reporting"
-#~ msgstr "Overzichten"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Verwacht salaris"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Verstuur nieuwe mail"
-
-#~ msgid "Trensparent"
-#~ msgstr "Transparant"
-
-#~ msgid "My Cases"
-#~ msgstr "Mijn dossiers"
-
-#~ msgid "Word of mouth"
-#~ msgstr "Mond-op-mond reclame"
-
-#~ msgid "Candidate Email"
-#~ msgstr "E-mail kandidaat"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Verkoopfase: "
-
-#~ msgid "Planned"
-#~ msgstr "Gepland"
-
-#~ msgid "Customer Office"
-#~ msgstr "Kantoor klant"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Onderwerp lead"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Fondsen"
-
-#~ msgid "All Funds"
-#~ msgstr "Alle fondsen"
-
-#~ msgid "Type of Action"
-#~ msgstr "Soort actie"
-
-#~ msgid "Qualication"
-#~ msgstr "Kwalificatie"
-
-#~ msgid "Change RRule"
-#~ msgstr "Wijzig regel"
-
-#~ msgid "Lead Details"
-#~ msgstr "Details lead"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Kunst en cultuur"
-
-#~ msgid "HelpDesk"
-#~ msgstr "Helpdesk"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Dossiers op sectie, categorie en soort"
-
-#~ msgid "Licenced"
-#~ msgstr "In licentie"
-
-#~ msgid "Office"
-#~ msgstr "Kantoor"
-
-#~ msgid "Assign"
-#~ msgstr "Toewijzen"
-
-#~ msgid "Healthcare"
-#~ msgstr "Gezondheidszorg"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Interne notities"
-
-#~ msgid "Employee"
-#~ msgstr "Werknemer"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = het '%' teken"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "VERTROUWELIJK"
-
-#~ msgid "crm.helpdesk.assign_wizard"
-#~ msgstr "crm.helpdesk.assign_wizard"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Fondsenwerving dossiers"
-
-#~ msgid "Not fixed"
-#~ msgstr "Niet opgelost"
-
-#~ msgid "Content of mail"
-#~ msgstr "Inhoud van mail"
-
-#~ msgid "_Import"
-#~ msgstr "_Importeren"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Bulk-mailing"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Fondsen op categorie"
-
-#~ msgid "Cash"
-#~ msgstr "Contant"
-
-#~ msgid "Future"
-#~ msgstr "Toekomst"
-
-#~ msgid "New Jobs"
-#~ msgstr "Nieuwe banen"
-
-#~ msgid "Search Cases by User"
-#~ msgstr "Zoek dossiers per gebruiker"
-
-#~ msgid "Import Message"
-#~ msgstr "Importeer bericht"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Fondswervingsacties"
-
-#~ msgid "Save ICS file"
-#~ msgstr "ICS bestand opslaan"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Helpdesk dossiers"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Selecteer ICS bestand"
-
-#~ msgid "Export ICS File"
-#~ msgstr "Exporteer ICS bestand"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Generiek afspraak assistent"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Abonneer op een agenda op afstand"
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Agenda tonen toegestaan"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "Geef het pad naar de remote agenda"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Afspraken"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de definitie van de actie."
 
-#~ msgid "Resource's Calendar"
-#~ msgstr "Resource's agenda"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "is omgezet naar verkoopkans."
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Herhaal max aantal keren"
-
-#~ msgid "Count"
-#~ msgstr "Aantal"
-
-#~ 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 actief veld wordt uitgezet, kunt u het verbergen zonder te moeten "
-#~ "verwijderen"
-
-#~ msgid "Extended Options..."
-#~ msgstr "Uitgebreide opties..."
-
-#~ msgid "Repeat every x"
-#~ msgstr "Herhaal elke x"
-
-#, python-format
-#~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-#~ msgstr "Gesloten/Geannuleerd \\nLeads konden niet omgezet in verkoopkans"
-
-#~ msgid "Interval"
-#~ msgstr "Interval"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Verkoopkansen op categorie"
-
-#~ msgid "Custom"
-#~ msgstr "Aangepast"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Mail Campagne 1"
-
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Lead "
-
-#~ msgid "Seconds"
-#~ msgstr "Seconden"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Aangepaste herhalingsregel"
-
-#~ msgid "Exclude range"
-#~ msgstr "Uitsluitbereik"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout! U kunt geen recursief menu maken."
-
-#~ msgid "Case Meeting"
-#~ msgstr "Dossieroverleg"
-
-#~ msgid "of"
-#~ msgstr "van"
-
-#, python-format
-#~ msgid "There is no stage for won opportunities defined for this Sale Team."
-#~ msgstr ""
-#~ "Er is geen stadium voor gewonnen verkoopkansen gedefinieerd voor dit "
-#~ "verkoopteam."
-
-#, python-format
-#~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-#~ msgstr ""
-#~ "Gesloten/geannuleerde telefoongesprek \\nKon niet omzetten naar verkoopkans"
-
-#~ msgid ""
-#~ "'Leads' allows you to manage and keep track of all first potential interests "
-#~ "of a partner in one of your products or services. A lead is a first, "
-#~ "unqualified, contact with a prospect or customer. After being qualified, a "
-#~ "lead can be converted into a business opportunity with the creation of the "
-#~ "related partner for further detailed tracking of any linked activities. You "
-#~ "can use leads when you import a database of prospects or to integrate your "
-#~ "website's contact form with OpenERP."
-#~ msgstr ""
-#~ "'Leads' laat u alle eerste potentiële interesse van relaties in uw producten "
-#~ "of diensten volgen en beheren. Een lead is een eerste, niet-gekwalificeerd, "
-#~ "contact met een prospect of klant. Na kwalificatie kan een lead worden "
-#~ "omgezet in een verkoopkans met het maken van de gekoppelde relatie voor het "
-#~ "gedetailleerd volgen van alle activiteiten. U kunt leads gebruiken als u een "
-#~ "prospect database importeert of om uw website-contact formulier te "
-#~ "integreren."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid ""
-#~ "Create specific stages that will help your sales better organise their sales "
-#~ "pipeline by maintaining them to their leads and sales opportunities. It will "
-#~ "allow them to easily track how is positioned a specific lead or opportunity "
-#~ "in the sales cycle."
-#~ msgstr ""
-#~ "Maak specifieke stadia die uw verkoop helpen de verkoop pijplijn beter te "
-#~ "organiseren door ze bij te houden bij leads en verkoopkansen. Het laat ze "
-#~ "precies bijhouden in welke fase van de verkoopcyclus een lead of verkoopkans "
-#~ "zich bevindt."
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Maak specifieke telefoongesprek categorieën om verschillende soorten "
-#~ "gesprekken beter uit elkaar te houden."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid ""
-#~ "The Inbound Calls tool allows you to log your inbound calls on the fly. Each "
-#~ "call you get will appear on the partner form for the traceability of every "
-#~ "contact you get with a partner. From the call record, you can trigger a "
-#~ "request for another call, a meeting or a business opportunity."
-#~ msgstr ""
-#~ "Met de inkomende gesprekken kunt u meteen een logboek van inkomende "
-#~ "gesprekken bijhouden. Elk gesprek wordt bij de relatie getoond voor "
-#~ "traceerbaarheid van elk contact met de relatie. Vanuit het gesprekformulier "
-#~ "kunt meteen een ander gesprek, afspraak of verkoopkans maken."
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Dit menu heeft al een snelkoppeling!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "Create specific categories that fit your company's  activities in order to "
-#~ "better classify and analyse them after they have been maintained in your "
-#~ "leads and opportunities. You can use categories to reflect your product "
-#~ "structure or the different types of sales you do."
-#~ msgstr ""
-#~ "Maak specifieke categorieën die passen bij de activiteiten van uw bedrijf om "
-#~ "ze beter te classificeren en analyseren nadat ze zijn gebruikt in uw leads "
-#~ "en verkoopkansen. U kunt categorieën gebruiken die uw product structuur "
-#~ "volgen en de verschillende soorten verkopen die u doet."
-
-#~ msgid ""
-#~ "Sales team allows you to organize your different salesmen or departments "
-#~ "into separate teams. Each team will work in his own list of opportunities, "
-#~ "sales orders, eso. Each user can set a team by default in his preferences. "
-#~ "The opportunities and sales order he will see, will be automatically "
-#~ "filtered according to his team."
-#~ msgstr ""
-#~ "Verkoopteam kunt u de verschillende verkopers of afdelingen in teams "
-#~ "organiseren. Elk team werkt met zijn eigen verkoopkansen, verkooporders, "
-#~ "etc. Elke gebruiker kan een verkoopteam standaard instellen bij zijn "
-#~ "voorkeuren. De verkoopkansen en verkooporders die hij ziet worden "
-#~ "automatisch gefilterd op zijn verkoopteam."
-
-#~ msgid ""
-#~ "Opportunities allows you to manage and keep track of your sales pipeline by "
-#~ "creating specific customer or prospect related sales documents in order to "
-#~ "follow up potential sales. Information such as the expected revenue, "
-#~ "opportunity stage, expected closing date, communication history and so on "
-#~ "can be maintained in them. Opportunities can be connected with the email "
-#~ "gateway: new emails create opportunities, each of them automatically gets "
-#~ "the history of the conversation with the customer.\n"
-#~ "\n"
-#~ "You and your team(s) will be able to plan meetings and phone calls from "
-#~ "opportunities, convert them into quotations, manage related documents, track "
-#~ "all customer related activities, and much more."
-#~ msgstr ""
-#~ "Met verkoopkansen kunt u uw verkoop pijplijn volgen en beheren door "
-#~ "specifieke klant en prospect gerelateerde documenten te maken om daarmee "
-#~ "mogelijke verkopen op te volgen. Informatie zoals verwachte omzet, verkoop "
-#~ "stadium, verwachte verkoopdatum, communicatie geschiedenis enzovoort worden "
-#~ "erin bijgehouden. Verkoopkansen kunnen worden gekoppeld aan de email "
-#~ "gateway: nieuwe emails maken verkoopkansen, en elke krijgen automatisch de "
-#~ "geschiedenis van de conversatie met de klant.\n"
-#~ "\n"
-#~ "U kunt met uw team afspraken en telefoongesprekken inplannen vanuit "
-#~ "verkoopkansen, ze omzetten in offertes, de bijbehorende documenten beheren, "
-#~ "alle klant-gerelateerde activiteiten volgen en nog veel meer."
-
-#~ msgid ""
-#~ "Create specific partner categories that you will then be able to assign to "
-#~ "your partners to better manage your interactions with them. The segmentation "
-#~ "tool will assign categories to partners based on defined criteria."
-#~ msgstr ""
-#~ "Maak specifieke relatie categorieën die u in staat stellen om uw interacties "
-#~ "ermee beter te beheren. Het segmentatie tool zal categorieën automatisch "
-#~ "toewijzen op basis van gedefinieerde criteria."
-
-#~ msgid ""
-#~ "Outbound Calls lists all the calls to be performed by your sales team. They "
-#~ "can record the information about the call on the form view. These "
-#~ "information will appear on the partner form for the traceability of every "
-#~ "contact you get with a customer. You can import a .CSV file with a list of "
-#~ "calls to be done for your sales team."
-#~ msgstr ""
-#~ "Uitgaande telefoongesprekken is de lijst van alle uit te voeren gesprekken "
-#~ "van uw verkoopteam. Ze kunnen informatie over het gesprek vastleggen in de "
-#~ "formulierweergave. Die informatie verschijnt op het relatieformulier voor "
-#~ "traceerbaarheid van elk contact met de klant. U kunt een .CSV bestand "
-#~ "importeren met een lijst van alle uit te voeren gesprekken voor uw "
-#~ "verkoopteam."
-
-#~ msgid ""
-#~ "'Meeting Invitations' allows you to create and manage the meeting "
-#~ "invitations sent/to be sent to your colleagues/partners."
-#~ msgstr ""
-#~ "'Afspraak uitnodigingen' laat u de afspraak uitnodigingen maken en beheren "
-#~ "die (nog) worden gestuurd naar uw collega's/relaties."
-
-#~ msgid "Repeat interval"
-#~ msgstr "Herhalingsinterval"
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 0f6ff0a8617..e0d486c60e5 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1080,7 +1080,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2582,7 +2582,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3092,8 +3092,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 8c84a798e55..6fa54d00f23 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Kod sprzedaży musi być unikalny !"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Sygnał '%s' został skonwertowany do szansy."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Bez powtarzania"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -546,9 +546,9 @@ msgstr "Pierwszy kontakt z nowym potencjalnym klientem"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -819,7 +819,7 @@ msgstr "Nazwa segmentacji"
 #: field:crm.case.stage,probability:0
 #: field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr "Prawdopodobieństwo (%)"
+msgstr "Prawdop. (%)"
 
 #. module: crm
 #: view:crm.lead:0
@@ -833,8 +833,8 @@ msgid "Statistics Dashboard"
 msgstr "Konsola statystyk"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1134,7 +1134,7 @@ msgstr "Akceptacja"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1384,7 +1384,7 @@ msgstr "Etapy"
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr "Spodziewany dochód"
+msgstr "Przew. dochód"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -1880,7 +1880,7 @@ msgstr "Zaspół nadrzędny"
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr "Data następnej akcji"
+msgstr "Następna akcja"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -2189,7 +2189,7 @@ msgstr "Caldav URL"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr "Spodziewany dochód"
+msgstr "Przew. dochód"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -2686,7 +2686,7 @@ msgid "Meeting Type"
 msgstr "Typ spotkania"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Połącz z istniejącą szansą"
@@ -3228,8 +3228,8 @@ msgid "Schedule Call"
 msgstr "Zaplanuj telefon"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr "Zamkniętych/Anulowanych sygnałów nie mozna konwertować do Szans."
@@ -3426,7 +3426,7 @@ msgstr "Sprzedawca"
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr "Spodziewane zamknięcie"
+msgstr "Zamknięcie"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
@@ -4177,243 +4177,21 @@ msgstr "Biuletyn"
 #~ msgid "All "
 #~ msgstr "Wszystko "
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Dni    "
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Zarządza usługą Helpdesku."
-
-#~ msgid "Send to"
-#~ msgstr "Wyślij do"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Proszę podać adres email użytkownika!"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Opisuje nazwę działania, np. na których obiektach jakie będzie działanie na "
-#~ "podstawie jakich warunków."
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Długość trwania (godziny)"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Proponowane wynagrodzenie"
-
-#~ msgid "Second Interview"
-#~ msgstr "Druga rozmowa kwalifikacyjna"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Zapisz się do zdalnego kalendarza"
-
 #~ msgid "Mail to these emails"
 #~ msgstr "Wyślij wiadomości do tych adresów email."
 
-#~ msgid "Exception Dates"
-#~ msgstr "Daty wyjątków"
-
-#~ msgid "Next Interview"
-#~ msgstr "Następna rozmowa kwalifikacyjna"
-
-#~ msgid "Description Information"
-#~ msgstr "Informacja opisowa"
-
 #~ msgid "Action Information"
 #~ msgstr "Informacja o akcji"
 
-#~ msgid "Dead"
-#~ msgstr "Martwe"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Potwierdź spotkanie"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Istniejący klient"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
-#~ msgid "Meetings Tree"
-#~ msgstr "Drzewo spotkań"
-
-#~ msgid "All Meetings"
-#~ msgstr "Wszystkie spotkania"
-
-#~ msgid "   Today   "
-#~ msgstr "   Dzisiaj   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Pozwala pokazać kalendarz"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Opis rozmowy telefonicznej"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Formularz spotkań"
-
-#~ msgid "Assigned to"
-#~ msgstr "Przypisano do"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Praca - proces zatrudnienia"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Umowę podpisano"
-
-#~ msgid "Close Lead"
-#~ msgstr "Zamknij sygnał"
-
-#~ msgid "Amount"
-#~ msgstr "Kwota"
-
-#~ msgid "Lead Email"
-#~ msgstr "Email sygnału"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Drzewo sygnałów"
-
-#~ msgid "All Leads"
-#~ msgstr "Wszystkie sygnały"
-
-#~ msgid "Lead Information"
-#~ msgstr "Informacja sygnału"
-
-#~ msgid "Lead Name"
-#~ msgstr "Nazwa sygnału"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Temat sygnału"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Pozwala śledzić i zarządzać sygnałami, które są pytaniami sondażowymi lub "
-#~ "przypadkowymi kontaktami."
-
-#~ msgid "Lead Source"
-#~ msgstr "Źródło sygnału"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Spotkanie do generacji sygnałów"
-
-#~ msgid "Lead Details"
-#~ msgstr "Szczegóły sygnału"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Zaproponowano umowę"
-
-#~ msgid "New Claims"
-#~ msgstr "Nowe reklamacje"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Data reklamacji"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Zarządza reklamacjami dostawców i klientów, oraz twoimi działaniami "
-#~ "naprawczymi i prewencyjnymi."
-
-#~ msgid "Pending Claims"
-#~ msgstr "Oczekujące reklamacje"
-
-#~ msgid "Type of claim"
-#~ msgstr "Typ reklamacji"
-
-#~ msgid "All Claims"
-#~ msgstr "Wszystkie reklamacje"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Koszt reklamacji"
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "Reklamacja/Opis akcji"
-
-#~ msgid "Claims Info"
-#~ msgstr "Informacja o reklamacji"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Reklamacje w toku"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Reklamacja rzeczowa"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Reklamacja postępowania"
-
-#~ msgid "Value Claims"
-#~ msgstr "Reklamacje wartości"
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Wstrzymane prace"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Zaznacz, jeśli chcesz aby reguła wysłała wiadomość do osoby odpowiedzialnej."
-
-#~ msgid "Close job request"
-#~ msgstr "Zamknij zgłoszenie pracy"
-
-#~ msgid "Fixed"
-#~ msgstr "Naprawione"
-
-#~ msgid "Appreciation"
-#~ msgstr "Ocena"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr ""
-#~ "Śledzi zidentyfikowane szanse biznesowe dla twoich kanałów sprzedaży."
-
 #~ msgid "Delay type"
 #~ msgstr "Typ opóźnienia"
 
-#~ msgid "Exception Rules"
-#~ msgstr "Reguły wyjątku"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Zaakceptowano jako reklamację"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Kanały są różnymi, dostępnymi trybami komunikacji z klientem. Do każdej "
-#~ "szansy możesz dowiązać kanał, który jest jej źródłem."
-
 #~ msgid "Business Opportunities"
 #~ msgstr "Szanse biznesowe"
 
-#~ msgid "Value Proposition"
-#~ msgstr "Propozycja wartości"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Odrzucone przez firmę"
-
-#~ msgid "Add CC"
-#~ msgstr "Dodaj DW"
-
-#~ msgid "New Business"
-#~ msgstr "Nowy biznes"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Negocjacje/Przegląd"
-
-#~ msgid "Existing Business"
-#~ msgstr "Istniejący biznes"
-
-#~ msgid "Emails"
-#~ msgstr "Wiadomości e-mail"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Zapisz w formacie .ics"
-
 #~ msgid ""
 #~ "Check if the category is limited to partners that match the segmentation "
 #~ "criterions. If checked, remove the category from partners that doesn't match "
@@ -4423,135 +4201,9 @@ msgstr "Biuletyn"
 #~ "kryteriom segmentacji. Jeśli zaznaczone, to usuń kategorię z partnerów, "
 #~ "którzy nie odpowiadają kryteriom segmentacji."
 
-#~ msgid "Search Histories"
-#~ msgstr "Przeszukuj historie"
-
-#~ msgid "Set State to"
-#~ msgstr "Ustaw stan na"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Zaplanuj spotkanie"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Nie ma wiadomości do odpowiedzi"
-
-#~ msgid "Direction"
-#~ msgstr "Kierunek"
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Akcja serwera do wykonania"
-
-#~ msgid "My Funds"
-#~ msgstr "Moje fundusze"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Młodszy inżynier"
-
-#~ msgid "Export ICS"
-#~ msgstr "Eksportuj ICS"
-
-#~ msgid "Category Name"
-#~ msgstr "Nazwa kategorii"
-
-#~ msgid "Recurrency Rule"
-#~ msgstr "Reguła rekurencyjna"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Kandydat odrzucony"
-
-#~ msgid "Print"
-#~ msgstr "Drukuj"
-
-#~ msgid "Closed Won"
-#~ msgstr "Zamknięte z sukcesem"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr ""
-#~ "Jesteś pewien, że chcesz utworzyć partnera na podstawie tej rozmowy ?"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Nauka i edukacja"
-
 #~ msgid "Minimum Priority"
 #~ msgstr "Minimalny priorytet"
 
-#~ msgid "Meeting Date"
-#~ msgstr "Data spotkania"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Konwertuj do partnera"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Następne spotkania"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Subskrybuj"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Podstawowy kreator spotkań"
-
-#~ msgid "Website"
-#~ msgstr "Strona WWW"
-
-#~ msgid "Message..."
-#~ msgstr "Wiadomość..."
-
-#~ msgid "Self Generated"
-#~ msgstr "Samogenerowane"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Nazwisko kandydata"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Pomaga organizować proces zatrudniania: ocena, spotkania, integracja "
-#~ "wiadomości..."
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Oczekuje na odpowiedź"
-
-#~ msgid "Funds"
-#~ msgstr "Fundusze"
-
-#~ msgid "Won't fix"
-#~ msgstr "Nie do naprawienia"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Ustala miejsce spotkania"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Praca - Drzewo rekrutacji"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Odpowiedz na ostatnią wiadomość"
-
-#~ msgid "Converted"
-#~ msgstr "Skonwertowano"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Drzewo wsparcia helpdesku"
-
-#~ msgid "Other Info"
-#~ msgstr "Inne informacje"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Zaplanuj rozmowę"
-
-#~ msgid "Search Funds"
-#~ msgstr "Przeszukaj fundusze"
-
-#~ msgid "Search Claims"
-#~ msgstr "Przeszukaj reklamacje"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Zarządza kalendarzem spotkań użytkownika"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Wymaga analizy"
-
 #~ msgid "Mail body"
 #~ msgstr "Treść wiadomości"
 
@@ -4563,289 +4215,33 @@ msgstr "Biuletyn"
 #~ "Nie znaleziono ID email dla adresu twojej firmy lub brak adresu zwrotnego w "
 #~ "sekcji!"
 
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "Wiadomość dla obserwatorów (DW)"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Etap sprzedaży"
-
-#~ msgid "Add a CC"
-#~ msgstr "Dodaj DW"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Zamknięte z porażką"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Następne spotkanie"
-
-#~ msgid "Email Address"
-#~ msgstr "Adres email"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Otwarte stanowiska"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Dostępność (tygodnie)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Drzewo szans"
-
-#~ msgid "First Interview"
-#~ msgstr "Pierwsza rozmowa"
-
-#~ msgid "This Month"
-#~ msgstr "Bieżący miesiąc"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Odmowa pracownika"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nazwisko pracownika"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Typ kampanii"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Propozycja/Oferta ceny"
-
-#~ msgid "Web"
-#~ msgstr "WWW"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Obsługa błędów"
-
 #~ msgid "Delay After Trigger Date:"
 #~ msgstr "Opóźnienie po dacie wyzwolenia"
 
 #~ msgid "User Responsible"
 #~ msgstr "Użytkownik odpowiedzialny"
 
-#~ msgid "Server Action"
-#~ msgstr "Akcja serwera"
-
-#~ msgid "Demand Draft"
-#~ msgstr "Wymagaj projektu"
-
-#~ msgid "Regex on Communication History"
-#~ msgstr "Wyrażenia reg. dla historii komunikacji"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Wiadomość nie wysłana !"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Zamknij rozmowę"
-
 #~ msgid "Latest E-Mail"
 #~ msgstr "Ostatni email"
 
-#~ msgid "Graduate"
-#~ msgstr "Wykształcenie"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Zauważ, że możesz stosować kalendarz do graficznego planowania spotkań."
-
-#~ msgid "Histories"
-#~ msgstr "Historie"
-
-#~ msgid "Attendee"
-#~ msgstr "Uczestnik"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Błąd wiadomości"
-
 #~ msgid "Logs History"
 #~ msgstr "Zapisuje historię"
 
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
-
-#~ msgid "This Year"
-#~ msgstr "Ten rok"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Pozwoli ci synchronizować kalendarze OpenERP z twoim telefonem, outlook, "
-#~ "Sunbird, ical, ..."
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Stosowane przez firmy do śledzenia błędów i zgłoszeń do wsparcia dla "
-#~ "oprogramowania"
-
-#~ msgid "Contract Data"
-#~ msgstr "Data umowy"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Proces zatrudniania"
-
-#~ msgid "Funds Form"
-#~ msgstr "Formularz funduszy"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Kandydat zatrudniony"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Szac. dochód"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Potrzeba stanowiska"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Współdzielony kalendarz"
-
-#~ msgid "Goals"
-#~ msgstr "Cele"
-
-#~ msgid "In Process"
-#~ msgstr "W toku"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Obsługa posprzedażna"
-
 #~ msgid "%(case_user)s = Responsible name"
 #~ msgstr "%(case_user)s = Nazwa odpowiedzialnego"
 
-#~ msgid "Fund Raising"
-#~ msgstr "Zwiększenie funduszu"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Wsparcie helpdesk"
-
-#~ msgid "Source"
-#~ msgstr "Źródło"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Konwertuj do partnera"
-
-#~ msgid "File name"
-#~ msgstr "Nazwa pliku"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Wszystkie zgłoszenia na stanowisko"
-
 #~ msgid "Telesales"
 #~ msgstr "Telesprzedaż"
 
-#~ msgid "Stage: "
-#~ msgstr "Etap: "
-
-#~ msgid "Payment Mode"
-#~ msgstr "Sposób zapłaty"
-
-#~ msgid "Import ICS"
-#~ msgstr "Importuj ICS"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "Szczegóły uczestnika"
-
-#~ msgid ""
-#~ "Helps you to encode the result of a phone call or to plan a list of phone "
-#~ "calls to process."
-#~ msgstr ""
-#~ "Pomaga wprowadzić rezultat rozmowy lub zaplanować rozmowy do wykonania."
-
-#~ msgid "Import ICS File"
-#~ msgstr "Importuj plik ICS"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Dla tego zgłoszenia do pracy partner jest juz zdefiniowany."
-
-#~ msgid "Prospecting"
-#~ msgstr "Ocenianie"
-
-#~ msgid "Jobs"
-#~ msgstr "Stanowiska"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Anuluj spotkanie"
-
-#~ msgid "Employee Email"
-#~ msgstr "Email pracownika"
-
 #~ msgid "Mail to responsible"
 #~ msgstr "Mail do odpowiedzialnych"
 
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Data utworzenia"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Praca - Formularz rekrutacji"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Niepoprawne argumenty"
 
-#~ msgid "Generic Wizard"
-#~ msgstr "Podstawowy kreator"
-
-#~ msgid "Reporting"
-#~ msgstr "Raportowanie"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Oczekiwane wynagrodzenie"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Wyślij nową wiadomość"
-
-#~ msgid "Credit Card"
-#~ msgstr "Karta kredytowa"
-
-#~ msgid "Send Email"
-#~ msgstr "Wyślij e-mail"
-
-#~ msgid "Support Query"
-#~ msgstr "Zapytanie o wsparcie"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Etap sprzedaży: "
-
-#~ msgid "Type of Action"
-#~ msgstr "Typ akcji"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Email kandydata"
-
-#~ msgid "Planned"
-#~ msgstr "Planowane"
-
-#~ msgid "Customer Office"
-#~ msgstr "Biuro klienta"
-
-#~ msgid "Trensparent"
-#~ msgstr "Przezroczysty"
-
-#~ msgid "Word of mouth"
-#~ msgstr "Ustna wiadomość"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Wsparcie helpdesku"
-
-#~ msgid "Delay Close"
-#~ msgstr "Zamknij opóźnienie"
-
-#~ msgid "Search Jobs"
-#~ msgstr "Przeszukuj stanowiska"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr "To może pomóc stowarzyszeniom w poszukiwaniu funduszy."
-
 #~ msgid "Mail to partner"
 #~ msgstr "Mail do partnera"
 
-#~ msgid "Funds Tree"
-#~ msgstr "Drzewo funduszy"
-
 #~ msgid ""
 #~ "A period is the average number of days between two cycle of sale or purchase "
 #~ "for this segmentation. It's mainly used to detect if a partner has not "
@@ -4859,24 +4255,6 @@ msgstr "Biuletyn"
 #~ "ponieważ prawdopodobnie dokonał zakupów u innego dostawcy. Stosuj te "
 #~ "funkcjonalność do biznesów powtarzalnych."
 
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Spotkanie z kandydatami"
-
-#~ msgid "All Funds"
-#~ msgstr "Wszystkie fundusze"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Nazwa 2 kandydata"
-
-#~ msgid "Events"
-#~ msgstr "Wydarzenia"
-
-#~ msgid "Attachment3"
-#~ msgstr "Załącznik3"
-
-#~ msgid "Attachment2"
-#~ msgstr "Załącznik2"
-
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the case be attached "
 #~ "to the reminder email sent."
@@ -4884,135 +4262,31 @@ msgstr "Biuletyn"
 #~ "Zaznacz to, jeśli chcesz aby wszystkie dokumenty załączone do sprawy zostały "
 #~ "dołączone do przypomnień."
 
-#~ msgid "Cheque"
-#~ msgstr "Czek"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
-#~ "sprawę bez jej usuwania."
-
 #~ msgid "Case History"
 #~ msgstr "Historia sprawy"
 
-#~ msgid "Attachment1"
-#~ msgstr "Załącznik1"
-
-#~ msgid "Degree"
-#~ msgstr "Stopień"
-
 #, python-format
 #~ msgid "Historize"
 #~ msgstr "Zapisz do historii"
 
-#~ msgid "Arts And Culture"
-#~ msgstr "Kultura i sztuka"
-
 #~ msgid "Delay after trigger date"
 #~ msgstr "Opóźnienie po dacie wyzwolenia"
 
-#~ msgid "Qualication"
-#~ msgstr "Kwalifikacje"
-
 #, python-format
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr "Musisz podac email pertnera, aby zastosować tę akcję!"
 
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Podaj poprawny URL !"
-
-#~ msgid "To Assign"
-#~ msgstr "Do przypisania"
-
-#~ msgid "Candidate Phone"
-#~ msgstr "Telefon kandydata"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Jesteś pewien, że chcesz utworzyć partnera na podstawie tego zgłoszenia do "
-#~ "pracy ?"
-
-#~ msgid "Change RRule"
-#~ msgstr "Zmień regułę"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Sprawy wg sekcji, kategorii i typu"
-
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
 #~ msgstr "Nie można wysłać wiadomości z pustą treścią."
 
-#~ msgid "Recycled"
-#~ msgstr "Usunięty"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Kategoria2 sprawy"
-
-#~ msgid "Sales"
-#~ msgstr "Sprzedaż"
-
-#~ msgid "Assigned"
-#~ msgstr "Przydzielony"
-
-#~ msgid "History of Events"
-#~ msgstr "Historia wydarzeń"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Sprawy podwyższania funduszy"
-
-#~ msgid "Office"
-#~ msgstr "Biuro"
-
-#~ msgid "Assign"
-#~ msgstr "Przydziel"
-
-#~ msgid "Healthcare"
-#~ msgstr "Służba zdrowia"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr "Ustala kolejność wyświetlania listy reguł spraw"
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Sprawy telefoniczne"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Istnieje już partner z tą samą nazwą"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Wszystkie sprawy"
-
-#~ msgid "Employee"
-#~ msgstr "Pracownik"
-
 #~ msgid "Partner Email"
 #~ msgstr "Email partnera"
 
 #~ msgid "Section Code"
 #~ msgstr "Kod sekcji"
 
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "POUFNE"
-
-#~ msgid "Meeting date"
-#~ msgstr "Data spotkania"
-
-#~ msgid "Not fixed"
-#~ msgstr "Nie ustalone"
-
-#~ msgid "Content of mail"
-#~ msgstr "Treść wiaodmości"
-
-#~ msgid "Invalid"
-#~ msgstr "Niepoprawny"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Kalendarz spotkań"
-
 #, python-format
 #~ msgid ""
 #~ "You can not escalate this case.\n"
@@ -5021,9 +4295,6 @@ msgstr "Biuletyn"
 #~ "Nie możesz przekazać tej sprawy.\n"
 #~ "Jesteś na najwyższym poziomie."
 
-#~ msgid "Set Meeting"
-#~ msgstr "Ustal spotkanie"
-
 #~ msgid "Case Section"
 #~ msgstr "Sekcja sprawy"
 
@@ -5037,25 +4308,6 @@ msgstr "Biuletyn"
 #~ "Reguła stosuje operator I. Sprawa musi pasować do wszystkich niepustych pól, "
 #~ "aby została wykonana akcja zapisana w zakładce 'Akcje'."
 
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Sprawy wg szans, kategorii i typów"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "Ustala kolejność wyświetlania listy sekcji spraw."
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Sprawy wg sekcji i etapów"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Sekcja do której należy Sprawa. Zdefiniuj odpowiedzialnego użytkownika oraz "
-#~ "konto Email dla bramy pocztowej."
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Sprawy wg sekcji i etapów"
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -5066,15 +4318,6 @@ msgstr "Biuletyn"
 #~ msgid "Case"
 #~ msgstr "Sprawa"
 
-#~ msgid "Internal Notes"
-#~ msgstr "Wiadomości wewnętrzne"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = Znak '%'"
-
-#~ msgid "_Import"
-#~ msgstr "_Importuj"
-
 #~ msgid "%(case_user_phone)s = Responsible phone"
 #~ msgstr "%(case_user_phone)s = Telefon odpowiedzialnego"
 
@@ -5088,21 +4331,9 @@ msgstr "Biuletyn"
 #~ "Adres umieszczony w 'Reply-To' ('Odpowiedz na adres') dla wszystkich "
 #~ "wiadomości wysłanych przez OpenERP w sprawach z tej sekcji"
 
-#~ msgid "Related Cases"
-#~ msgstr "Sprawy powiązane"
-
 #~ msgid "%(case_id)s = Case ID"
 #~ msgstr "%(case_id)s = ID sprawy"
 
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Sprawy wg sekcji, kategorii i etapów"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Sprawy wg szans i etapów"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Sprawy - sygnały"
-
 #, python-format
 #~ msgid ""
 #~ "You must define a responsible user for this case in order to use this action!"
@@ -5113,22 +4344,6 @@ msgstr "Biuletyn"
 #~ msgid "E-Mail Actions"
 #~ msgstr "Akcje email"
 
-#~ msgid "Mass Mailing"
-#~ msgstr "Poczta masowa"
-
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Jeśli partner nie zakupił nic przez ten okres, to zmniejsz jego stan emocji "
-#~ "o ten współczynnik. To jest dzielenie."
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Fundusze wg kategorii"
-
-#~ msgid "Cash"
-#~ msgstr "Gotówka"
-
 #~ msgid "Case history"
 #~ msgstr "Historia sprawy"
 
@@ -5181,10 +4396,6 @@ msgstr "Biuletyn"
 #~ "Moduł CRM zawiera bramę korespondencyjną do łączenia OpenERP z \n"
 #~ "systemem pocztowym."
 
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Nie możesz przypisać do zamkniętej sprawy"
-
 #~ msgid "Case Category Name"
 #~ msgstr "Nazwa kategorii sprawy"
 
@@ -5194,33 +4405,9 @@ msgstr "Biuletyn"
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = Opis sprawy"
 
-#~ msgid "Save ICS file"
-#~ msgstr "Zapisz plik ICS"
-
-#~ msgid "Future"
-#~ msgstr "Przyszłe"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Sprawy helpdesku"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Wybierz plik ICS"
-
-#~ msgid "Export ICS File"
-#~ msgstr "Eksportuj plik ICS"
-
 #~ msgid "Case logs"
 #~ msgstr "Log sprawy"
 
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Sprawy wg szans, kategorii i etapów"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Sprawy wg sekcji, kategorii i kategorii2"
-
 #~ msgid "Open cases"
 #~ msgstr "Otwarte sprawy"
 
@@ -5228,166 +4415,42 @@ msgstr "Biuletyn"
 #~ msgid "You can not delete this case. You should better cancel it."
 #~ msgstr "Nie możesz usunąć tej sprawy. Powinieneś ją raczej anulować."
 
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Sprawy wg sekcji i kategorii2"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Jeśli pole aktywne jest ustawione na true (prawda), to będziesz mógł ukryć "
-#~ "sekcję sprawy bez jej usuwania."
-
-#~ msgid "Regex on Case Name"
-#~ msgstr "Wyrażenie regularne dla nazwy sprawy"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Wyrażenie regularne dla nazwy sprawy"
-
-#~ msgid "Job Cases"
-#~ msgstr "Sprawy rekrutacji"
-
-#~ msgid "Import Message"
-#~ msgstr "Importuj wiadomość"
-
-#~ msgid "New Jobs"
-#~ msgstr "Nowe stanowiska"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Operacje zwiększania funduszy"
-
 #~ msgid "Cases by section"
 #~ msgstr "Sprawy wg sekcji"
 
-#~ msgid "Set case state to"
-#~ msgstr "Ustaw stan sprawy na"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Sprawy spotkań"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Nazwa kategorii2 sprawy"
-
 #~ msgid "Cases Histories"
 #~ msgstr "Historie spraw"
 
 #~ msgid "Case State"
 #~ msgstr "Stan sprawy"
 
-#~ msgid "Opportunity Cases"
-#~ msgstr "Sprawy szans"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Sprawy wg sygnałów i typów"
-
 #~ msgid "Case section"
 #~ msgstr "Sekcja sprawy"
 
-#~ msgid "Related Case"
-#~ msgstr "Sprawa związana"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Sprawy wg etapów i szacunków"
-
 #~ msgid "All Cases"
 #~ msgstr "Wszystkie sprawy"
 
 #~ msgid "Case Communication History"
 #~ msgstr "Historia komunikacji sprawy"
 
-#~ msgid "Search Case"
-#~ msgstr "Przeszukaj sprawę"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Sprawy wg sekcji i typu"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Sprawy wg szans i typów"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Sprawy wg sekcji, kategorii i etapu"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
-#~ "regułę sprawy bez jej usuwania."
-
 #~ msgid "Case Description"
 #~ msgstr "Opis sprawy"
 
-#~ msgid "Claim Cases"
-#~ msgstr "Sprawy reklamacji"
-
 #~ msgid "%(case_subject)s = Case subject"
 #~ msgstr "%(case_subject)s = Temat sprawy"
 
-#~ msgid "Search Cases by User"
-#~ msgstr "Przeszukuj sprawy wg użytkownika"
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Sprawy wg sygnałów i etapów"
-
-#~ msgid "My Cases"
-#~ msgstr "Moje sprawy"
-
 #~ msgid "E-Mail Reminders (includes the content of the case)"
 #~ msgstr "Przypomnienie email (zawiera sprawę)"
 
 #~ msgid "Button Pressed"
 #~ msgstr "Naciśnięcie przycisku"
 
-#~ msgid "Cases by section and category2"
-#~ msgstr "Sprawy wg sekcji i kategorii2"
-
-#~ msgid "Human Resources"
-#~ msgstr "Kadry"
-
-#~ msgid "Email Add CC"
-#~ msgstr "DW w email"
-
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = Nazwa partnera"
 
-#~ msgid "Home"
-#~ msgstr "Dom"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr ""
-#~ "Zaznacz to, jeśli chcesz, aby reguła wysyłała wiadomość DW (mail do dowolnej "
-#~ "osoby zdefiniowanej w akcji)."
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "Powiąż ze zdalnym ICS"
-
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr "Kategoria związana z sekcją. Ustala podział spraw wewnątrz w sekcji."
-
-#~ 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 ""
-#~ "Opóźnienie po czasie wyzwolenia. Możesz wstawić wartości ujemne, jeśli "
-#~ "chcesz przypomnienie np. 15 min przed spotkaniem."
-
 #~ msgid "Conditions on States"
 #~ msgstr "Warunki dla stanów"
 
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Te osoby otrzymają kopie korespondencji pomiędzy partnerem i użytkownikiem."
-
-#~ msgid "Job Info"
-#~ msgstr "Informacja o stanowisku"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
@@ -5396,12 +4459,6 @@ msgstr "Biuletyn"
 #~ "Nie znaleziono ID E-Mail dla partnera odpowiedzialnego lub brak adresu "
 #~ "zwrotnego w sekcji!"
 
-#~ msgid "Corrective"
-#~ msgstr "Działania naprawcze"
-
-#~ msgid "Preventive"
-#~ msgstr "Działania prewencyjne"
-
 #~ msgid "Conditions on Case Fields"
 #~ msgstr "Warunki dla pól sprawy"
 
@@ -5410,15 +4467,6 @@ msgstr "Biuletyn"
 #~ msgstr ""
 #~ "Zaznacz, jeśli chcesz, aby reguła wysyłała przypomnienie mailem do partnera."
 
-#~ msgid ""
-#~ "The minds states allow to define a value scale which representsthe partner "
-#~ "mentality in relation to our services.The scale hasto be created with a "
-#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-#~ msgstr ""
-#~ "Stany emocji pozwalają określać poziomy zadowolenia partnera w stosunku do "
-#~ "naszej obsługi. Skala powinna być utworzona jako liczby od 0 (bardzie "
-#~ "niezadowolony) do 10 (bardzo zadowolony)."
-
 #~ msgid "%(partner_email)s = Partner email"
 #~ msgstr "%(partner_email)s = Email partnera"
 
@@ -5428,21 +4476,9 @@ msgstr "Biuletyn"
 #~ msgid "%(email_from)s = Partner email"
 #~ msgstr "%(email_from)s = Email partnera"
 
-#~ msgid "Radio"
-#~ msgstr "Radio"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "Email osoby, do której ma być wysłana wiadomość"
-
-#~ msgid "Applied Job"
-#~ msgstr "Zgłoszenia na stanowisko"
-
 #~ msgid "Call Object Method"
 #~ msgstr "Metoda wywołania obiektu"
 
-#~ msgid "Licenced"
-#~ msgstr "Licencjonowane"
-
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Warunki dla zakres priorytetu"
 
@@ -5452,125 +4488,16 @@ msgstr "Biuletyn"
 #~ msgid "Conditions on Case Partner"
 #~ msgstr "Warunki dla partnera sprawy"
 
-#~ msgid "Relevant"
-#~ msgstr "Priorytet"
-
 #, python-format
 #~ msgid "done"
 #~ msgstr "gotowe"
 
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Email!"
-
 #, python-format
 #~ msgid "draft"
 #~ msgstr "wersja robocza"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "PRIVATE"
-#~ msgstr "PRYWATNY"
-
-#~ msgid "PUBLIC"
-#~ msgstr "PUBLICZNY"
-
 #~ msgid "Remind with attachment"
 #~ msgstr "Przypomnij z załącznikiem"
 
 #~ msgid "Remind responsible"
 #~ msgstr "Przypomnij odpowiedzialnym"
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Kalendarz zasobów"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "jest skonwertowany w Szansę."
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Powtórz maksymalnie razy"
-
-#~ msgid "Count"
-#~ msgstr "Liczba"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Jeśli pole Aktywne jest nie ustawione, to możesz ukryć informację o alarmie "
-#~ "o zdarzeniu bez jej usuwania."
-
-#~ msgid "Extended Options..."
-#~ msgstr "Opcje rozszerzone"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Powtarzaj co x"
-
-#~ msgid ""
-#~ "Create specific stages that will help your sales better organise their sales "
-#~ "pipeline by maintaining them to their leads and sales opportunities. It will "
-#~ "allow them to easily track how is positioned a specific lead or opportunity "
-#~ "in the sales cycle."
-#~ msgstr ""
-#~ "Utwórz specyficzne etapy, aby lepiej organizować pracę w cykle np. "
-#~ "sprzedażowe."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid ""
-#~ "'Leads' allows you to manage and keep track of all first potential interests "
-#~ "of a partner in one of your products or services. A lead is a first, "
-#~ "unqualified, contact with a prospect or customer. After being qualified, a "
-#~ "lead can be converted into a business opportunity with the creation of the "
-#~ "related partner for further detailed tracking of any linked activities. You "
-#~ "can use leads when you import a database of prospects or to integrate your "
-#~ "website's contact form with OpenERP."
-#~ msgstr ""
-#~ "'Sygnały' pozwalają zarządzać i śledzić pierwsze potencjalne zainteresowanie "
-#~ "twoich partnerów twoimi produktami lub usługami. Są to pierwsze "
-#~ "niesklasyfikowane kontakty z potencjalnym klientem. Po kwalifikacji sygnał "
-#~ "może być skonwertowany do Szansy z powiązaniem z określonym partnerem. "
-#~ "Sygnałów możesz używać w trakcie importowania baz potencjalnych klientów lub "
-#~ "do notowania kontaktów ze stron internetowych."
-
-#~ msgid "Interval"
-#~ msgstr "Interwał"
-
-#~ msgid "Custom"
-#~ msgstr "Własne"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Szanse wg kategorii"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekundy"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Skrót dla tego menu już istnieje!"
-
-#~ msgid "Exclude range"
-#~ msgstr "Wyłączony zakres"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Case Meeting"
-#~ msgstr "Spotkanie w sprawie"
-
-#~ msgid "of"
-#~ msgstr "z"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 59a16365f7c..2c1431eb66f 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:02+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "O código da equipa de vendas deve ser único!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "A dica '%s' foi convertida em oportunidade."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Sem repetição"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -240,7 +240,7 @@ msgstr "Agendar outra chamada"
 #. module: crm
 #: help:crm.meeting,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Editar todas as ocorrências da reunião recorrente"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
@@ -538,9 +538,9 @@ msgstr "Primeiro contacto com nova prespeção"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -821,8 +821,8 @@ msgid "Statistics Dashboard"
 msgstr "Painel estatístico"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1044,7 +1044,7 @@ msgstr "Dias para abrir"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Mostrar horas como"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:264
@@ -1099,7 +1099,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1356,6 +1356,8 @@ msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
 msgstr ""
+"Crie categorias específicas de chamadas telefónicas para definir melhor o "
+"tipo de chamadas existentes no sistema."
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -2614,7 +2616,7 @@ msgid "Meeting Type"
 msgstr "Tipo de reunião"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Agregar com oportunidade existente"
@@ -3135,8 +3137,8 @@ msgid "Schedule Call"
 msgstr "Agendar telefonema"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr "Dicas Cancelas/Encerradas não podem ser convertidas em oportunidades"
@@ -4156,13 +4158,6 @@ msgstr "Notícias"
 #~ msgid "Case"
 #~ msgstr "Processo"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Se o terceiro não adquirir (ou comprar) durante o período, diminuir o estado "
-#~ "da mente por esse factor. É uma multiplicação"
-
 #~ msgid "All "
 #~ msgstr "Todos "
 
@@ -4190,9 +4185,6 @@ msgstr "Notícias"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Enviar e-mail ao observador (como copia)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Acções"
 
@@ -4244,89 +4236,6 @@ msgstr "Notícias"
 #~ msgid "Conditions on Case Partner"
 #~ msgstr "Condições do Parceiro do Caso"
 
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Gere um serviço de Helpdesk"
-
-#~ msgid "Send to"
-#~ msgstr "Enviar para"
-
-#~ msgid "Close Lead"
-#~ msgstr "Fechar dica"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Casos por secção e categoria 2"
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Esta propriedade define a lista de excepções de data/tempo para componentes "
-#~ "de calendário recorrentes."
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Casos por oportunidade, categoria e tipo"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Gere as reclamações de fornecedores e clientes, incluindo as suas acções "
-#~ "correctivas ou preventivas."
-
-#~ msgid "Amount"
-#~ msgstr "Montante"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Por favor especifique o email do utilizador"
-
-#~ msgid "Fixed"
-#~ msgstr "Resolvido"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "TRANSPARENT"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Casos por secção e estágio"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Salário proposto"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Secção à qual o Caso pertence. Defina o utilizador responsável e o endereço "
-#~ "de correio electrónico."
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Duração (Horas)"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Casos por secção e Estágio"
-
-#~ msgid "Appreciation"
-#~ msgstr "Apreciação"
-
-#~ msgid "Second Interview"
-#~ msgstr "Segunda entrevista"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr ""
-#~ "Rastreia oportunidade de negócio identificadas para o seu canal de vendas."
-
-#~ msgid "Exception Dates"
-#~ msgstr "Datas de Excepção"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Subscreva uma calendário remoto"
-
-#~ msgid "Description Information"
-#~ msgstr "Informação descritiva"
-
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
@@ -4334,72 +4243,6 @@ msgstr "Notícias"
 #~ "A regra usa o operador \"E\". O caso tem de corresponder com todos os campos "
 #~ "não vazios, para que a regra execute a acção descrita no separador 'Acções'."
 
-#~ msgid "Exception Rules"
-#~ msgstr "Regras de excepção"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "Aceite como reclamação"
-
-#~ msgid "Dead"
-#~ msgstr "Morto"
-
-#~ msgid "Next Interview"
-#~ msgstr "Próxima entrevista"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Confirmar Reunião"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Cliente existente"
-
-#~ msgid "Home"
-#~ msgstr "Home"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Casos por secção, categopria e estágio"
-
-#~ msgid "All Meetings"
-#~ msgstr "Todos as reuniões"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Árvore de reuniões"
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Permite mostrar o calendário"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Descrição do telefonema"
-
-#~ msgid "New Business"
-#~ msgstr "Novo Negócio"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Preposta de valor"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Recusado pela companhia"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Formulário de reuniões"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Proposta de Contrato"
-
-#~ msgid "Assigned to"
-#~ msgstr "Atribuído a"
-
-#~ msgid "Related Cases"
-#~ msgstr "Casos relacionados"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Empregos - Processo de recrutamento"
-
-#~ msgid "New Claims"
-#~ msgstr "Novas reclamações"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Negociação/Revisão"
-
 #, python-format
 #~ msgid ""
 #~ "You must define a responsible user for this case in order to use this action!"
@@ -4407,389 +4250,9 @@ msgstr "Notícias"
 #~ "Tem de definir o utilizador responsável para este caso a fim de utilizar "
 #~ "esta acção!"
 
-#~ msgid "Contract Signed"
-#~ msgstr "Contrato Assinado"
-
-#~ msgid "All Leads"
-#~ msgstr "Todas as dicas"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Casos por oportunidades e Estágio"
-
-#~ msgid "Existing Business"
-#~ msgstr "Negócio Existente"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Data da Reclamação"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Guardar no formato .ics"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Alegações factuais"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Email!"
-
-#~ msgid "Radio"
-#~ msgstr "Rádio"
-
-#~ msgid "Direction"
-#~ msgstr "Direcção"
-
-#~ msgid "crm.opportunity.assign_wizard"
-#~ msgstr "crm.opportunity.assign_wizard"
-
-#~ msgid "Export ICS"
-#~ msgstr "Exportar ICS"
-
-#~ msgid "Preventive"
-#~ msgstr "Preventivo"
-
-#~ msgid "My Funds"
-#~ msgstr "Meus fundos"
-
-#~ msgid "Category Name"
-#~ msgstr "Nome da categoria"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Não pode atribuir um caso encerrado."
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Candidato Recusado"
-
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Casos por oportunidades, categoria e estágios"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Casos por secção, categoria e categoria2"
-
-#~ msgid "Lead Email"
-#~ msgstr "Email com dica"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Queixas pendentes"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Data da reunião"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Converter para Parceiro"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Próximas Reuniões"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Subscrever"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Aprendizagem e Educação"
-
-#~ msgid "Website"
-#~ msgstr "Página de Internet"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "A espera da Resposta"
-
-#~ msgid "Funds"
-#~ msgstr "Fundos"
-
-#~ msgid "crm.phonecall.assign_wizard"
-#~ msgstr "crm.phonecall.assign_wizard"
-
-#~ msgid "Message..."
-#~ msgstr "Mensagem..."
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Casos por seccção e categoria2"
-
-#~ msgid "Value Claims"
-#~ msgstr "Queixas de valor"
-
-#~ msgid "Self Generated"
-#~ msgstr "Gerado automaticamente"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Nome do Candidato"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Empregos - arvore de recrutamento"
-
-#~ msgid "Won't fix"
-#~ msgstr "Não vai corrigir"
-
-#~ msgid "Converted"
-#~ msgstr "Convertido"
-
-#~ msgid "Mail"
-#~ msgstr "Correio"
-
-#~ msgid "Other Info"
-#~ msgstr "Outras Informações"
-
-#~ msgid "Claim Cost"
-#~ msgstr "Custo da reclamação"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Agendar um telefonema"
-
-#~ msgid "Type of claim"
-#~ msgstr "Tipo de queixa"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Gere a agenda de reuniões dos utilizadores."
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Precisa de análise"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Estágio de vendas"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Próxima reunião"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Tipo de campanha"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Proposta / Cotação"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "crm.meeting.generic_wizard"
-#~ msgstr "crm.meeting.generic_wizard"
-
-#~ msgid "Histories"
-#~ msgstr "Histórias"
-
-#~ msgid "Graduate"
-#~ msgstr "Graduado"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Árvore de dicas"
-
-#~ msgid "Attendee"
-#~ msgstr "Participante"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Erro! Não pode criar secções recursivamente."
-
-#~ msgid "This Year"
-#~ msgstr "Este ano"
-
-#~ msgid "Contract Data"
-#~ msgstr "Dados do Contrato"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Calendário Partilhado"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Angariação de fundos"
-
-#~ msgid "Stage: "
-#~ msgstr "Estágio: "
-
-#~ msgid "Payment Mode"
-#~ msgstr "Modo de pagamento"
-
-#~ msgid "Source"
-#~ msgstr "Fonte"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Converter para Parceiro"
-
-#~ msgid "Prospecting"
-#~ msgstr "A prospectar"
-
 #~ msgid "Telesales"
 #~ msgstr "Televendas"
 
-#~ msgid "Jobs"
-#~ msgstr "Empregos"
-
-#~ msgid "Job Info"
-#~ msgstr "Informações do emprego"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Cancelar reunião"
-
-#~ msgid "Employee Email"
-#~ msgstr "E-mail do empregado"
-
-#~ msgid "Corrective"
-#~ msgstr "Correctivo"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Empregos - Formulário de recrutamento"
-
-#~ msgid "Credit Card"
-#~ msgstr "Cartão de crédito"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr ""
-#~ "Isto pode ajudar as associações no seu processo de angaração de fundos e "
-#~ "monitoramento."
-
-#~ msgid "Send Email"
-#~ msgstr "Enviar email"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "2Nome do Candidato"
-
-#~ msgid "Events"
-#~ msgstr "Eventos"
-
-#~ msgid "Cheque"
-#~ msgstr "Cheque"
-
-#~ msgid "crm.menu.config_wizard"
-#~ msgstr "crm.menu.config_wizard"
-
-#~ msgid "Attachment1"
-#~ msgstr "Anexo1"
-
-#~ msgid "Degree"
-#~ msgstr "Grau"
-
-#~ msgid "Attachment3"
-#~ msgstr "Anexo3"
-
-#~ msgid "To Assign"
-#~ msgstr "A atribuir."
-
-#~ msgid "Category2 of case"
-#~ msgstr "Categoria 2 do caso"
-
-#~ msgid "Sales"
-#~ msgstr "Vendas"
-
-#~ msgid "Assigned"
-#~ msgstr "Atribuído"
-
-#~ msgid "Invalid"
-#~ msgstr "Inválido"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Já existe um parceiro com o mesmo nome"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Todas as oportunidades"
-
-#~ msgid "Recycled"
-#~ msgstr "Reciclado"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Definir Reunião"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Casos por estágios e estimativas"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Calendário de reuniões"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "Recusado pelo empregado"
-
-#~ msgid "Server Action"
-#~ msgstr "Acção de servidor"
-
-#~ msgid "Related Case"
-#~ msgstr "Caso relacionado"
-
-#~ msgid "Email Address"
-#~ msgstr "Endereço de Correio Electrónico"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Empregos em aberto"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Disponibilidade (semanas)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Árvore de oportunidades"
-
-#~ msgid "First Interview"
-#~ msgstr "Primeira Entrevista"
-
-#~ msgid "This Month"
-#~ msgstr "Este Mês"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nome do funcionário"
-
-#~ msgid "All Claims"
-#~ msgstr "Todas as reclamações"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Casos por secção, categoria e estágio"
-
-#~ msgid "Funds Form"
-#~ msgstr "Formulários de fundos"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Processo de contratação de empregados"
-
-#~ msgid "Lead Source"
-#~ msgstr "Fonte da dica"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Candidato Contratado"
-
-#~ msgid "In Process"
-#~ msgstr "Em Curso"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Serviço pós venda"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Casos por secção e tipo"
-
-#~ msgid "File name"
-#~ msgstr "Nome do ficheiro"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Goals"
-#~ msgstr "Objectivos"
-
-#~ msgid "crm.claim.assign_wizard"
-#~ msgstr "crm.claim.assign_wizard"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Dias    "
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Tarefas Pendentes"
-
-#~ msgid "Close job request"
-#~ msgstr "Fechar tarefa requerida"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "Devolve a ordem de sequência quando apresenta as secções de opções"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr ""
-#~ "Descreve o nome da acção . Ou seja, em que Objecto, que acção e em que "
-#~ "condições"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr "Marque isto se quer que a regra envie um email ao responsável."
-
 #, python-format
 #~ msgid ""
 #~ "Can not send mail with empty body,you should have description in the body"
@@ -5012,46 +4475,5 @@ msgstr "Notícias"
 #~ msgid "Trigger Date"
 #~ msgstr "Data de Activação"
 
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Crie categorias de telefonemas para melhor organizar as chamadas registadas "
-#~ "no sistema."
-
-#~ msgid "Count"
-#~ msgstr "Contar"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Se o campo \"ativo\" é definido como verdadeiro, permite esconder a "
-#~ "informação de alarme do evento sem remove-lo."
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir a cada x"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalo"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizado(a)"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Campanha por email 1"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Regra personalizada de recorrência"
-
-#~ msgid "Exclude range"
-#~ msgstr "Intervalo de exclusão"
-
-#~ msgid "of"
-#~ msgstr "de"
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Calendário do recurso"
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index bec42cd91bb..4de33e95238 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "O código do time de vendas precisa ser único !"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "A Prospecção '%s' foi convertida em uma oportunidade."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Não Repetir"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -553,9 +553,9 @@ msgstr "Primeiro contato com a nova prospecção"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -843,8 +843,8 @@ msgid "Statistics Dashboard"
 msgstr "Painel de Estatísticas"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1123,7 +1123,7 @@ msgstr "Aceita Mala Direta"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2697,7 +2697,7 @@ msgid "Meeting Type"
 msgstr "Tipo de Reunião"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Mesclar com Oportunidade Existente"
@@ -3245,8 +3245,8 @@ msgid "Schedule Call"
 msgstr "Chamada Agendada"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4271,13 +4271,6 @@ msgstr "Notícias"
 #~ msgid "Conditions on Priority Range"
 #~ msgstr "Condições da faixa de prioridades"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Se o parceiro não tem comprado durante um período, diminua o estado de ânimo "
-#~ "por este fator. Trata-se de uma multiplicação"
-
 #~ msgid "All "
 #~ msgstr "Tudo "
 
@@ -4311,9 +4304,6 @@ msgstr "Notícias"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Correio para observadors (cc)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Ações"
 
@@ -4436,215 +4426,12 @@ msgstr "Notícias"
 #~ msgstr ""
 #~ "Data limite é calculada automaticamente pela soma da Data Inicial + Duração"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Dias    "
-
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr ""
-#~ "Esta propriedade define a lista de exceção de data/hora para componente do "
-#~ "calendário recorrente."
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Marque isto se você quiser que a regra envie um email para  a pessoa "
-#~ "responsável."
-
-#~ msgid "Amount"
-#~ msgstr "Quantia"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "TRANSPARENTE"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Duração (Horas)"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Casos por Seção e Estágio"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Casos por seção e estágio"
-
-#~ msgid "Appreciation"
-#~ msgstr "Apreciação"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Os canais representam os diferentes modos de comunicação disponíveis com o "
-#~ "cliente. A cada oportunidade comercial, você pode indicar o canal que é essa "
-#~ "fonte de oportunidade."
-
-#~ msgid "Refused by Company"
-#~ msgstr "Recusado pela Empresa"
-
-#~ msgid "   Today   "
-#~ msgstr "   Hoje   "
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Permite mostrar calendário"
-
-#~ msgid "Related Cases"
-#~ msgstr "Casos relacionados"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Negociação/Revisão"
-
-#~ msgid "Existing Business"
-#~ msgstr "Negócios existentes"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Contrato assinado"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Salve em formato .ics"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Email!"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Não há email para resposta!"
-
-#~ msgid "My Funds"
-#~ msgstr "Meus Fundos"
-
-#~ msgid "Preventive"
-#~ msgstr "Preventivo"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Se o campo ativo é definido como true, ele permitirá que você oculte a seção "
-#~ "caso sem removê-lo."
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr "Tem certeza que deseja criar um parceiro com base neste telefonema?"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Data da Reunião"
-
-#~ msgid "Website"
-#~ msgstr "Website"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Nome do candidato"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Ajuda você a organizar as tarefas do processo de contratação: avaliação, "
-#~ "reuniões, integração de e-mail ..."
-
-#~ msgid "Funds"
-#~ msgstr "Fundos"
-
-#~ msgid "Job Cases"
-#~ msgstr "Casos de Emprego"
-
-#~ msgid "Converted"
-#~ msgstr "Convertido"
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Trabalhos Pendentes"
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos Humanos"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Por favor, especifique o endereço de e-mail do usuário !"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Salário Proposto"
-
-#~ msgid "Fixed"
-#~ msgstr "Fixo"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Casos por Oportunidades, Categoria e Tipo"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Administra as reivindicações  de fornecedores e clientes, incluindo suas "
-#~ "ações corretivas ou preventivas."
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Casos por seção e categoria2"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Seção a que pertence o caso. Definir usuário responsável e conta de e-mail "
-#~ "para o acesso."
-
-#~ msgid "Dead"
-#~ msgstr "Morta"
-
-#~ msgid "Home"
-#~ msgstr "Início"
-
-#~ msgid "Add CC"
-#~ msgstr "Adicionar CC"
-
-#~ msgid "Emails"
-#~ msgstr "E-mails"
-
-#~ msgid "Policy Claims"
-#~ msgstr "Política de Reclamações"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Reclamações Efetivas"
-
-#~ msgid "Export ICS"
-#~ msgstr "Exportar ICS"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "Plano de Reunião"
-
-#~ msgid "Direction"
-#~ msgstr "Direção"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Reclamações Pendentes"
-
-#~ msgid "Category Name"
-#~ msgstr "Nome da Categoria"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Candidato Recusado"
-
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
-#~ msgid "Send to"
-#~ msgstr "Enviar Para"
-
-#~ msgid "Close Lead"
-#~ msgstr "Encerrar Prospecto"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Administrar um Serviço de Helpdesk"
-
 #~ msgid "Button Pressed"
 #~ msgstr "Botão Pressionado"
 
 #~ msgid "Planned costs"
 #~ msgstr "Custos Planejados"
 
-#~ msgid "Close job request"
-#~ msgstr "Fechar Requisição de Trabalho"
-
 #~ msgid "Case Section"
 #~ msgstr "Seção de Caso"
 
@@ -4654,176 +4441,48 @@ msgstr "Notícias"
 #~ msgid "My Histories"
 #~ msgstr "Meus Históricos"
 
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr ""
-#~ "As faixas identificaram oportunidades de negócio para melhoria das vendas."
-
-#~ msgid "Exception Dates"
-#~ msgstr "Datas Excepcionais"
-
 #~ msgid "Last Action Date"
 #~ msgstr "Data da Última Ação"
 
-#~ msgid "Second Interview"
-#~ msgstr "Segunda Entrevista"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Inscrever-se num Calendário Remoto"
-
-#~ msgid "Description Information"
-#~ msgstr "Informação da Descrição"
-
 #~ msgid "Delay type"
 #~ msgstr "Tipo de Atraso"
 
-#~ msgid "Next Interview"
-#~ msgstr "Próxima Entrevista"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Adicionar Email CC"
-
-#~ msgid "Exception Rules"
-#~ msgstr "Regras de Exceção"
-
 #~ msgid "Business Opportunities"
 #~ msgstr "Oportunidades de Negócios"
 
-#~ msgid "Accepted as Claim"
-#~ msgstr "Aceito como Reclamação"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Confirmar Reunião"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Cliente Existente"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Casos por Seção, Categoria e Estágio"
-
 #~ msgid "Action Information"
 #~ msgstr "Informação da Ação"
 
 #~ msgid "Open Cases"
 #~ msgstr "Casos Abertos"
 
-#~ msgid "Meetings Tree"
-#~ msgstr "Árvore de Reuniões"
-
-#~ msgid "All Meetings"
-#~ msgstr "Todas as Reuniões"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Valor Proposto"
-
-#~ msgid "New Business"
-#~ msgstr "Novo Negócio"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Descrição da Chamada Telefônica"
-
-#~ msgid "Assigned to"
-#~ msgstr "Atribuído Para"
-
 #~ msgid "Partner Events"
 #~ msgstr "Eventos dos Parceiros"
 
-#~ msgid "Contract Proposed"
-#~ msgstr "Contrato Proposto"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Trabalhos - Processo de Contratação"
-
-#~ msgid "New Claims"
-#~ msgstr "Novas Relamações"
-
-#~ msgid "Meetings Form"
-#~ msgstr "Formulário de Reuniões"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Casos por oportunidades e Estágios"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Data da Relamação"
-
-#~ msgid "All Leads"
-#~ msgstr "Todas os Prospectos"
-
 #~ msgid "Conditions on States"
 #~ msgstr "Condições em Estados"
 
 #~ msgid "Trigger Date"
 #~ msgstr "Data da Trigger"
 
-#~ msgid "Search Histories"
-#~ msgstr "Procurar Históricos"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Estas pessoas receberão uma cópia nos futuras comunicações entre o parceiro"
-
-#~ msgid "Set State to"
-#~ msgstr "Define Status para"
-
 #~ msgid "Planned Costs"
 #~ msgstr "Custos Planejados"
 
 #~ msgid "Case history"
 #~ msgstr "Histórico de Caso"
 
-#~ msgid "Junior Developer"
-#~ msgstr "Desenvolvedor Júnior"
-
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Você não pode atribuir um caso encerrado."
-
 #~ msgid "Category of case"
 #~ msgstr "Categorias de Casos"
 
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Casos por Oportunidade, Categoria e Estágio"
-
-#~ msgid "Lead Email"
-#~ msgstr "Email do Prospecto"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Casos por Seção, Categoria and 2 Categoria"
-
 #~ msgid "Open cases"
 #~ msgstr "Casos Abertos"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para Arquitetura da View"
 
-#~ msgid "Learning And Education"
-#~ msgstr "Conhecimento e Educação"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Converter para Parceiro"
-
-#~ msgid "Next Meetings"
-#~ msgstr "Próximas Reuniões"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Inscrever-se"
-
 #~ msgid "Minimum Priority"
 #~ msgstr "Prioridade Mínima"
 
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Assistente Generico de Reunião"
-
-#~ msgid "Message..."
-#~ msgstr "Mensagem..."
-
-#~ msgid "crm.phonecall.assign_wizard"
-#~ msgstr "crm.phonecall.assign_wizard"
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Casos por Seção e 2 Categoria"
-
 #, python-format
 #~ msgid "done"
 #~ msgstr "Concluído"
@@ -4838,135 +4497,18 @@ msgstr "Notícias"
 #~ msgid "draft"
 #~ msgstr "Rascunho"
 
-#~ msgid "Awaiting Response"
-#~ msgstr "Aguardando Resposta"
-
-#~ msgid "Won't fix"
-#~ msgstr "Não irá Corrigir"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Responder para Último Email"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "Dá a Localização da Reunião"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "Trabalho - Árvore de Recrutamento"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Expressão Regular no Nome do Caso"
-
 #~ msgid "Send Reminder"
 #~ msgstr "Enviar Lembrete"
 
-#~ msgid "Search Funds"
-#~ msgstr "Procurar Fundos"
-
-#~ msgid "Type of claim"
-#~ msgstr "Tipo de Reclamação"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "Árvore de Suporte de Helpdesk"
-
-#~ msgid "Other Info"
-#~ msgstr "Outras Infor."
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Agendar um Telefónema"
-
-#~ msgid "Mail"
-#~ msgstr "Email"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Necessidade de Analises"
-
-#~ msgid "Search Claims"
-#~ msgstr "Procurar Reclamações"
-
 #~ msgid "Mail body"
 #~ msgstr "Corpo da Mensagem"
 
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Gerencie o calendário de reuniões dos usuários."
-
-#~ msgid "Add a CC"
-#~ msgstr "Adicionar CC"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Estágio de Vendas"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Próxima Reunião"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Fechado Perdido"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Em Processo de Reclamação"
-
-#~ msgid "Set RRULE"
-#~ msgstr "Definir RRULE"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Tipo de Campanha"
-
-#~ msgid "Histories"
-#~ msgstr "Históricos"
-
-#~ msgid "Graduate"
-#~ msgstr "Graduação"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Árvore de Prospectos"
-
-#~ msgid "Attendee"
-#~ msgstr "Pessoas"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Erro ! Você não pode criar seções recursivas."
-
-#~ msgid "This Year"
-#~ msgstr "Este Ano"
-
 #~ msgid "Remind Partner"
 #~ msgstr "Lembrar Parceiro"
 
-#~ msgid "Contract Data"
-#~ msgstr "Data do Contrato"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Calendário Compartilhado"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Casos por Prospectos e Tipo"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Receita Esperada"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "Memanda Inicial de Trabalhos"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Suportes de Helpdesk"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Converter para Pareiro"
-
 #~ msgid "Case State"
 #~ msgstr "Status de Caso"
 
-#~ msgid "Source"
-#~ msgstr "Origem"
-
-#~ msgid "Payment Mode"
-#~ msgstr "Mode de Pagamento"
-
-#~ msgid "Stage: "
-#~ msgstr "Estágio: "
-
 #~ msgid "Case section"
 #~ msgstr "Seção de Caso"
 
@@ -4979,295 +4521,40 @@ msgstr "Notícias"
 #~ msgid "Cases Histories"
 #~ msgstr "Históricos dos Casos"
 
-#~ msgid "Lead Information"
-#~ msgstr "Informação do Prospecto"
-
-#~ msgid "Import ICS File"
-#~ msgstr "Importar Arquivos ICS"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "Detalhes dos Participantes"
-
-#~ msgid "Prospecting"
-#~ msgstr "Prospecção"
-
-#~ msgid "Employee Email"
-#~ msgstr "Email do Colaborador"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Casos de Reunião"
-
-#~ msgid "Job Info"
-#~ msgstr "Infor Trabalho"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Cancelar Reunião"
-
-#~ msgid "Jobs"
-#~ msgstr "Trabalhos"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = Data de Criação"
-
 #~ msgid "Mail to responsible"
 #~ msgstr "Correio para o Responsável"
 
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Trabalhos - Formulário de Recrutamento"
-
-#~ msgid "Corrective"
-#~ msgstr "Corretivo"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "Casos de Oportunidade"
-
-#~ msgid "Send Email"
-#~ msgstr "Enviar Email"
-
-#~ msgid "Set case state to"
-#~ msgstr "Definir Status de Caso para"
-
-#~ msgid "Credit Card"
-#~ msgstr "Cartão de Crédito"
-
-#~ msgid "Search Jobs"
-#~ msgstr "Procurar Trabalho"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Suporte Helpdesk"
-
-#~ msgid "Delay Close"
-#~ msgstr "Atraso para Fechamento"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Cadidato 2 Nome"
-
-#~ msgid "Events"
-#~ msgstr "Eventos"
-
-#~ msgid "Attachment2"
-#~ msgstr "2 Anexo"
-
-#~ msgid "Attachment3"
-#~ msgstr "3 Anexo"
-
-#~ msgid "Degree"
-#~ msgstr "Não Aceito"
-
-#~ msgid "Attachment1"
-#~ msgstr "1 Anexo"
-
-#~ msgid "Cheque"
-#~ msgstr "Cheque"
-
-#~ msgid "To Assign"
-#~ msgstr "Para Atribuir"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Por favor informa URL propriada !"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr "Deseja criar um parceiro baseado nesta requisição de trabalho ?"
-
-#~ msgid "History of Events"
-#~ msgstr "Histórico de Eventos"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Categoria 2 de Caso"
-
-#~ msgid "Sales"
-#~ msgstr "Vendas"
-
-#~ msgid "Assigned"
-#~ msgstr "Atribuído"
-
-#~ msgid "Recycled"
-#~ msgstr "Reciclado"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Todas Oportunidades"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Existe um parceiro com este mesmo nome."
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Telefonemas de Casos"
-
-#~ msgid "Invalid"
-#~ msgstr "Inválido"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Definir Reunião"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Calendário de Reuniões"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Casos por Estágio e Estimativas"
-
-#~ msgid "Lead Name"
-#~ msgstr "Nome do Prospecto"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Reunião para Geração de Prospectos"
-
-#~ msgid "First Interview"
-#~ msgstr "Primeira Entrevista"
-
-#~ msgid "This Month"
-#~ msgstr "Este Mês"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Disponibilidade (semanas)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Árvore de Oportunidades"
-
-#~ msgid "Email Address"
-#~ msgstr "Endereço de Email"
-
-#~ msgid "Related Case"
-#~ msgstr "Casos Relacionados"
-
-#~ msgid "All Claims"
-#~ msgstr "Todas Reclamações"
-
 #~ msgid "User Responsible"
 #~ msgstr "Usuário Responsável"
 
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Email não Enviado !"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Encerrar Telefonêma"
-
 #~ msgid "Latest E-Mail"
 #~ msgstr "Último E-mail"
 
 #~ msgid "Logs History"
 #~ msgstr "Logs dos Históricos"
 
-#~ msgid "Search Case"
-#~ msgstr "Procurar Casos"
-
 #~ msgid "Case Description"
 #~ msgstr "Descrição de Caso"
 
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Casos por seção, categoria e estágio"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Candidato Contratado"
-
 #~ msgid "All Cases"
 #~ msgstr "Todos os Casos"
 
-#~ msgid "Lead Source"
-#~ msgstr "Origem do Prospecto"
-
-#~ msgid "PRIVATE"
-#~ msgstr "PRIVADO"
-
-#~ msgid "In Process"
-#~ msgstr "Em Progresso"
-
 #~ msgid "%(case_user)s = Responsible name"
 #~ msgstr "%(case_user)s = Nome do Responsável"
 
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Casos por Seção e Tipo"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Serviços Pós-Vendas"
-
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "File name"
-#~ msgstr "Nome do Arquivo"
-
-#~ msgid "Relevant"
-#~ msgstr "Relevante"
-
-#~ msgid "Import ICS"
-#~ msgstr "Importar ICS"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Casos por Oportunidades e Tipo"
-
 #~ msgid "Your action"
 #~ msgstr "Sua Ação"
 
-#~ msgid "Claim Cases"
-#~ msgstr "Casos de Reclamação"
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Casos por Prospectos e Estágios"
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Assistente Genérico"
-
-#~ msgid "Reporting"
-#~ msgstr "Relatórios"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Enviar Novo Email"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Argumentos Inválidos"
 
-#~ msgid "My Cases"
-#~ msgstr "Meus Casos"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Assunto do Prospecto"
-
-#~ msgid "Planned"
-#~ msgstr "Planejado"
-
-#~ msgid "Customer Office"
-#~ msgstr "Escritório de Cliente"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Estágio de Vendas: "
-
-#~ msgid "Type of Action"
-#~ msgstr "Tipo de Ação"
-
-#~ msgid "Search Cases by User"
-#~ msgstr "Procurar Casos por Usuário"
-
 #~ msgid "Mail to partner"
 #~ msgstr "Email para Parceiro"
 
-#~ msgid "HelpDesk"
-#~ msgstr "HelpDesk"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "Artes e Cultura"
-
 #, python-format
 #~ msgid "Historize"
 #~ msgstr "Regitrar Histórico"
 
-#~ msgid "Lead Details"
-#~ msgstr "Detalhes do Prospecto"
-
-#~ msgid "Qualication"
-#~ msgstr "Qualificação"
-
-#~ msgid "Change RRule"
-#~ msgstr "Mudar RRule"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Casos por Seção, Categoria e Tipo"
-
-#~ msgid "Licenced"
-#~ msgstr "Licenciado"
-
 #~ msgid "Parent Section"
 #~ msgstr "Seção Pai"
 
@@ -5277,63 +4564,12 @@ msgstr "Notícias"
 #~ msgid "Planned revenue"
 #~ msgstr "Receita Planejada"
 
-#~ msgid "Healthcare"
-#~ msgstr "Saúde"
-
-#~ msgid "Assign"
-#~ msgstr "Atribuir"
-
-#~ msgid "Office"
-#~ msgstr "Escritório"
-
-#~ msgid "Meeting date"
-#~ msgstr "Data Reunião"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "CONFIDENCIAL"
-
-#~ msgid "Not fixed"
-#~ msgstr "Não Fixado"
-
-#~ msgid "Employee"
-#~ msgstr "Colaborador"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = O '%' Caracter"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Notas Internas"
-
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
-#~ msgid "Cash"
-#~ msgstr "Dinheiro"
-
-#~ msgid "Future"
-#~ msgstr "Futuro"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Salvar em Arquivo ICS"
-
 #~ msgid "Case logs"
 #~ msgstr "Logs de Casos"
 
-#~ msgid "Export ICS File"
-#~ msgstr "Exportar Arquivo ICS"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Selecionar Arquivo ICS"
-
-#~ msgid "Import Message"
-#~ msgstr "Importar Mensagem"
-
 #~ msgid "Cases by section"
 #~ msgstr "Casos por Seção"
 
-#~ msgid "New Jobs"
-#~ msgstr "Novo Trabalho"
-
 #~ msgid "Base Information"
 #~ msgstr "Informações Básicas"
 
@@ -5349,73 +4585,5 @@ msgstr "Notícias"
 #~ msgid "All Late "
 #~ msgstr "Todo Atraso "
 
-#~ msgid "Resource's Calendar"
-#~ msgstr "Calendário de Recursos"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Máximo de repetições"
-
-#~ msgid "Count"
-#~ msgstr "Contagem"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Se o campo Ativo é definido como verdadeiro, permite esconder a informação "
-#~ "de eventos de alarme sem removê-los."
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir a cada x"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalo"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizar"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Oportunidades Por Categorias"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regras não são suportadas por objetos osv_memory !"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Email Campanha 1"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regra precisa ter ao menos um direito de acesso marcado."
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "O Atalho para este menu já existe!"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Regra Recorrente Personalizada"
-
-#~ msgid "Exclude range"
-#~ msgstr "Intervalo de exclusão"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "of"
-#~ msgstr "de"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Cria categorias específicas de chamadas telefônicas para melhor classificar "
-#~ "o tipo de chamadas rastreadas no sistema."
diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po
index 3d0af1e8b27..ae401c76ad2 100644
--- a/addons/crm/i18n/ro.po
+++ b/addons/crm/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-21 16:31+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Codul a echipei de vânzări trebuie să fie unic!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Pista '%s' a fost convertită într-o oportunitate."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Nu repetaţi"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -549,13 +549,13 @@ msgstr "Întâlnire normală sau telefonică pentru oportunitate"
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Primul contact cu noul prospect"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -726,7 +726,7 @@ msgstr ""
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "Întâlnirea '%s' a fost confirmată."
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -737,7 +737,7 @@ msgstr "Utilizator responsabil"
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Un partener este deja definit la acest apel telefonic."
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -806,12 +806,12 @@ msgstr ""
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "Segmentare partener"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Venituri probabile"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -822,7 +822,7 @@ msgstr ""
 #: field:crm.case.stage,probability:0
 #: field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Probabilitate (%)"
 
 #. module: crm
 #: view:crm.lead:0
@@ -833,11 +833,11 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Tablou de bord Statistici"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -885,7 +885,7 @@ msgstr "Nr. de zile per perioada"
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "După zi"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
@@ -912,7 +912,7 @@ msgstr "Selectie exclusiva"
 #: code:addons/crm/crm_opportunity.py:91
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr ""
+msgstr "Oportunitatea '%s' a fost câştigată."
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
@@ -1059,7 +1059,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Marchează câștigat"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1082,7 +1082,7 @@ msgstr "Martie"
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "Oportunitatea '%s' a fost închisă."
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -1129,7 +1129,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Următorul stagiu"
 
 #. module: crm
 #: view:board.board:0
@@ -1148,7 +1148,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1178,7 +1178,7 @@ msgstr "Următoarea acţiune"
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Repetă până"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1396,7 +1396,7 @@ msgstr "Etape"
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Venituri aşteptate"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -2652,7 +2652,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3162,8 +3162,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index d5be819f11e..2123e353c43 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Код отдела продаж должен быть уникальным !"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Кандидат '%s' был преобразован в предложение."
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "Не повторять"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -549,9 +549,9 @@ msgstr "Самый первый перспективный контакт"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -647,6 +647,8 @@ msgid ""
 "Thick this box if you want that on escalation, the responsible of this sale "
 "team automatically becomes responsible of the lead/opportunity escaladed"
 msgstr ""
+"Отметьте для обострения вопроса, ответственный этого отдела продаж "
+"автоматически становится ответственным за обостренного кандидата/предложение"
 
 #. module: crm
 #: help:crm.installer,outlook:0
@@ -739,6 +741,8 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"Адрес, который будет помещен в поле \"Ответить\" всех писем, которые будут "
+"отправлены OpenERP о делах в этом отделе продаж"
 
 #. module: crm
 #: view:res.users:0
@@ -832,8 +836,8 @@ msgid "Statistics Dashboard"
 msgstr "Панель статистики"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1019,7 +1023,7 @@ msgstr "Поставщик"
 #. module: crm
 #: help:crm.send.mail,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "Ответить отделу продаж ответственному за это дело"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1113,7 +1117,7 @@ msgstr "Подписан"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1343,7 +1347,7 @@ msgstr "Пусть событие автоматически повторяет
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Поля, зависящие от состояния"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1749,7 +1753,7 @@ msgstr "День рождения"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "-"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
@@ -1782,12 +1786,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.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Преобразовать"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1814,7 +1818,7 @@ msgstr "Пятый"
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "_Schedule"
-msgstr ""
+msgstr "_Запланировать"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1890,7 +1894,7 @@ msgstr "Вопрос '%s'  был открыт."
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -2561,7 +2565,7 @@ msgstr "Макс. интервал"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "_Schedule Call"
-msgstr ""
+msgstr "_Запланировать звонок"
 
 #. module: crm
 #: code:addons/crm/crm.py:326
@@ -2669,7 +2673,7 @@ msgid "Meeting Type"
 msgstr "Тип встречи"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Объединить с существующим предложением"
@@ -2959,7 +2963,7 @@ msgstr "Кем предложено"
 #: 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:304
@@ -3214,8 +3218,8 @@ msgid "Schedule Call"
 msgstr "Запланировать звонок"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr "Закрытого/отмененного кандидата нельзя преобразовать в предложение"
@@ -3233,6 +3237,10 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Отметьте, если категория ограничена контрагентами, подпадающими под критерии "
+"сегментации.                        \n"
+"Если отмечено, из категории будут удалёны контрагенты, не подпадающие под "
+"эти критерии."
 
 #. module: crm
 #: field:crm.meeting,exdate:0
@@ -3381,7 +3389,7 @@ msgstr ""
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send Reply"
-msgstr ""
+msgstr "_Отправить ответ"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
@@ -3483,6 +3491,8 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Эти эл. адреса будут добавлены в поле \"Копия\" всей входящей и исходящей "
+"почты для этой записи. Разделяйте эл. адреса запятыми."
 
 #. module: crm
 #: constraint:res.partner:0
@@ -3646,7 +3656,7 @@ msgstr "Договор"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Реклама в Twitter"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
@@ -3688,12 +3698,12 @@ msgstr "Контакт партнера"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Дата повторяющегося ID"
 
 #. 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/wizard/crm_merge_opportunities.py:100
@@ -3755,7 +3765,7 @@ msgstr "Функция"
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Добавить"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -3925,7 +3935,7 @@ msgstr "Последовательность"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr "Содержимое сообщения"
+msgstr "Тело сообщения"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -4266,407 +4276,28 @@ msgstr "Рассылка"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия."
 
-#~ msgid "Human Resources"
-#~ msgstr "Кадры"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Длительность(в часах)"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 дней    "
-
-#~ msgid "Send to"
-#~ msgstr "Отправить"
-
-#~ msgid "Amount"
-#~ msgstr "Количество"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Пожалуйста, укажите адрес электронной почты пользователя!"
-
-#~ msgid "Fixed"
-#~ msgstr "Фиксированное"
-
-#~ msgid "Exception Dates"
-#~ msgstr "Исключения (даты)"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Подписаться на удаленный календарь"
-
-#~ msgid "Description Information"
-#~ msgstr "Описание"
-
-#~ msgid "Dead"
-#~ msgstr "Умер[ла]"
-
-#~ msgid "Home"
-#~ msgstr "Главная"
-
-#~ msgid "All Meetings"
-#~ msgstr "Все встречи"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Диаграмма встреч"
-
-#~ msgid "Assigned to"
-#~ msgstr "Назначено на"
-
-#~ msgid "   Today   "
-#~ msgstr "   Сегодня   "
-
-#~ msgid "All Leads"
-#~ msgstr "Все кандидаты"
-
-#~ msgid "Emails"
-#~ msgstr "Эл.письма"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Эл.сообщения!"
-
-#~ msgid "Radio"
-#~ msgstr "Радио"
-
-#~ msgid "Search Histories"
-#~ msgstr "Поиск истории"
-
-#~ msgid "Direction"
-#~ msgstr "Направление"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "План встреч"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "Нет ел. почты чтобы ответить!"
-
 #~ msgid "Category of case"
 #~ msgstr "Категория вопроса"
 
-#~ msgid "Category Name"
-#~ msgstr "Название категории"
-
-#~ msgid "Print"
-#~ msgstr "Печать"
-
-#~ msgid "Meeting Date"
-#~ msgstr "Дата встречи"
-
-#~ msgid "Message..."
-#~ msgstr "Сообщение..."
-
-#~ msgid "Next Meetings"
-#~ msgstr "Следующие встречи"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Подписаться"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "Мастер встреч"
-
-#~ msgid "Website"
-#~ msgstr "Сайт"
-
-#~ msgid "Funds"
-#~ msgstr "Фонды"
-
 #, python-format
 #~ msgid "open"
 #~ msgstr "открыть"
 
-#~ msgid "Mail"
-#~ msgstr "Электронная почта"
-
-#~ msgid "Other Info"
-#~ msgstr "Прочая информация"
-
-#~ msgid "Next Meeting"
-#~ msgstr "Следующая встреча"
-
-#~ msgid "Web"
-#~ msgstr "Веб"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "Учет ошибок"
-
-#~ msgid "Campaign Type"
-#~ msgstr "Тип кампании"
-
-#~ msgid "Histories"
-#~ msgstr "Истории"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Дерево кандидатов"
-
-#~ msgid "Attendee"
-#~ msgstr "Участник"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Ошибка ел. сообщения"
-
-#~ msgid "Est.Revenue"
-#~ msgstr "Оценка доходов"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Ошибка! Вы не можете создавать рекурсивные секции."
-
-#~ msgid "This Year"
-#~ msgstr "Этот год"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "Общий календарь"
-
-#~ msgid "Payment Mode"
-#~ msgstr "Режим оплаты"
-
-#~ msgid "Source"
-#~ msgstr "Источник"
-
-#~ msgid "Jobs"
-#~ msgstr "Вакансии"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "Отмена встречи"
-
-#~ msgid "Employee Email"
-#~ msgstr "Эл.почта сотрудника"
-
-#~ msgid "Credit Card"
-#~ msgstr "Кредитная карта"
-
-#~ msgid "Send Email"
-#~ msgstr "Отправить эл. письмо"
-
-#~ msgid "Events"
-#~ msgstr "События"
-
-#~ msgid "Cheque"
-#~ msgstr "Чек"
-
-#~ msgid "Recycled"
-#~ msgstr "Повторно используется"
-
-#~ msgid "All Opportunities"
-#~ msgstr "Все возможные сделки"
-
-#~ msgid "Sales"
-#~ msgstr "Продажи"
-
-#~ msgid "Assigned"
-#~ msgstr "Назначен"
-
-#~ msgid "Set Meeting"
-#~ msgstr "Выбрать совещание"
-
-#~ msgid "Invalid"
-#~ msgstr "Неверное значение"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "Календарь встреч"
-
-#~ msgid "This Month"
-#~ msgstr "Этот месяц"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "Доступность (недели)"
-
-#~ msgid "Server Action"
-#~ msgstr "Действие сервера"
-
-#~ msgid "Email Address"
-#~ msgstr "Эл. адрес (e-mail):"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Ел. письмо не отправлено!"
-
-#~ msgid "Funds Form"
-#~ msgstr "Источник финансирования"
-
-#~ msgid "Lead Source"
-#~ msgstr "Источник кандидата"
-
-#~ msgid "In Process"
-#~ msgstr "В процессе"
-
-#~ msgid "File name"
-#~ msgstr "Имя файла"
-
-#~ msgid "Ok"
-#~ msgstr "Хорошо"
-
-#~ msgid "Import ICS"
-#~ msgstr "Импорт ICS"
-
 #~ msgid "Invalid arguments"
 #~ msgstr "Недопустимые аргументы"
 
-#~ msgid "Reporting"
-#~ msgstr "Отчетность"
-
-#~ msgid "Expected Salary"
-#~ msgstr "Ожидаемая зарплата"
-
-#~ msgid "Send New Mail"
-#~ msgstr "Послать новое ел.письмо"
-
-#~ msgid "Planned"
-#~ msgstr "Запланировано"
-
-#~ msgid "My Cases"
-#~ msgstr "Мои дела"
-
-#~ msgid "Funds Tree"
-#~ msgstr "Диаграмма финансирования"
-
-#~ msgid "Office"
-#~ msgstr "Офис"
-
-#~ msgid "Assign"
-#~ msgstr "Назначить"
-
-#~ msgid "Employee"
-#~ msgstr "Сотрудник"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Внутренние примечания"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "КОНФИДЕНЦИАЛЬНО"
-
-#~ msgid "Meeting date"
-#~ msgstr "Дата проведения встречи"
-
-#~ msgid "_Import"
-#~ msgstr "_Импортировать"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Массовая рассылка"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Фонды по категориям"
-
-#~ msgid "Cash"
-#~ msgstr "Наличные"
-
-#~ msgid "Future"
-#~ msgstr "Будущие"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Вопросы кандидатов"
-
-#~ msgid "Lead Email"
-#~ msgstr "Эл. почта кандидата"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Вопросы по кандидатам и типу"
-
-#~ msgid "Lead Information"
-#~ msgstr "Информация кандидата"
-
-#~ msgid "Close Lead"
-#~ msgstr "Закрыть кандидата"
-
-#~ msgid "Lead Name"
-#~ msgstr "Имя кандидата"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Кандидат - тема"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr ""
-#~ "Позволяет вам управлять кандидатами. Кандидат - контакт или запрос до начала "
-#~ "продаж, первый контакт с заказчиком."
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "Встреча для поиска кандидатов"
-
-#~ msgid "Lead Details"
-#~ msgstr "Детализация кандидата"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Вопросы по разделам, категориям и этапам"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Вопросы по разделам и этапам"
-
-#~ msgid "Sales Stage"
-#~ msgstr "Этап продаж"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Вопросы по разделам и этапам"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Вопросы по этапам и оценкам"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "Этап продаж: "
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "Вопросы по разделам, категориям и этапам"
-
-#~ msgid "Stage: "
-#~ msgstr "Этап: "
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "Вопросы по кандидатам и этапам"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "ПРОЗРАЧНЫЙ"
-
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr ""
-#~ "Раздел к которому принадлежит вопрос. Определяет ответственного пользователя "
-#~ "и учетную запись эл. почты для почтового шлюза."
-
 #~ msgid "Case Section"
 #~ msgstr "Раздел вопроса"
 
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "Определяет последовательность вывода в списке разделов вопросов."
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Предложенная зарплата"
-
-#~ msgid "Exception Rules"
-#~ msgstr "Правила исключений"
-
 #~ msgid "%(email_from)s = Partner email"
 #~ msgstr "%(email_from)s = эл. почта партнера"
 
-#~ msgid "Accepted as Claim"
-#~ msgstr "Принято как претензия"
-
 #~ msgid "%(partner)s = Partner name"
 #~ msgstr "%(partner)s = название партнера"
 
-#~ msgid "Confirm Meeting"
-#~ msgstr "Подтвердить встречу"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Существующий клиент"
-
 #~ msgid "%(case_user_phone)s = Responsible phone"
 #~ msgstr "%(case_user_phone)s  = тел. ответственного"
 
-#~ msgid "Add CC"
-#~ msgstr "Добавить копию"
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Позволяет показать календарь"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Описание звонка"
-
-#~ msgid "New Business"
-#~ msgstr "Новый бизнес"
-
 #~ msgid "%(case_id)s = Case ID"
 #~ msgstr "%(case_id)s = ID вопроса"
 
@@ -4677,30 +4308,6 @@ msgstr "Рассылка"
 #~ "Вы должны назначить ответственного пользователя этого вопроса для "
 #~ "использования этого действия!"
 
-#~ msgid "Meetings Form"
-#~ msgstr "Форма встреч"
-
-#~ msgid "Related Cases"
-#~ msgstr "Связанные вопросы"
-
-#~ msgid "New Claims"
-#~ msgstr "Новые претензии"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "Переговоры/Обзор"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Договор подписан"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Дата претензиии"
-
-#~ msgid "Existing Business"
-#~ msgstr "Существующий бизнес"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Фактические претензии"
-
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
@@ -4708,62 +4315,19 @@ msgstr "Рассылка"
 #~ "Адрес эл. почты для ответа вам, который будет подставляться во все эл. "
 #~ "письма о вопросах в этом разделе"
 
-#~ msgid "Save in .ics format"
-#~ msgstr "Сохранить в .ics формате"
-
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr ""
-#~ "Категория относящаяся к разделу. Подразделить вопросы независимо или по "
-#~ "разделам."
-
 #~ msgid "Trigger Date"
 #~ msgstr "Дата триггера"
 
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr ""
-#~ "Эти люди получат копии эл. писем будущей переписки между партнером и "
-#~ "пользователем."
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "Действие сервера будет инициировано"
-
-#~ msgid "Junior Developer"
-#~ msgstr "Младший разработчик"
-
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = описание вопроса"
 
-#~ msgid "Export ICS"
-#~ msgstr "Экспорт ICS"
-
-#~ msgid "Preventive"
-#~ msgstr "Предупредительный"
-
 #~ msgid "Conditions on Case Fields"
 #~ msgstr "Условия для полей вопроса"
 
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "Вы не можете назначить закрытый вопрос."
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr "Отметьте, если хотите посылать партнеру напоминание по эл. почте."
 
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Управление претензиями поставщиков и покупателей, включая ваши исправляющие "
-#~ "и упреждающие действия."
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Вопросы по разделам и категориям2"
-
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
@@ -4771,243 +4335,15 @@ msgstr "Рассылка"
 #~ "Правило использует оператор \"И\". Действие, описанное в таблице действий, "
 #~ "выполнится если все не пустые поля Вопроса совпадут с условиями."
 
-#~ msgid "Email Add CC"
-#~ msgstr "Добавить копию эл. письма"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Договор предложен"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "Кандидат отказался"
-
-#~ msgid "Regex on Case Name"
-#~ msgstr "Regex на название вопроса"
-
 #~ msgid "%(partner_email)s = Partner email"
 #~ msgstr "%(partner_email)s = эл. почта партнера"
 
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "Вопросы по разделам, категориям и категориям2"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Претензии в ожидании"
-
-#~ msgid "Closed Won"
-#~ msgstr "Закрыто удачно"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr ""
-#~ "Если активное поле истинно, то это позволит вам скрыть секцию вопросов без "
-#~ "ее удаления."
-
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "Вопросы по разделу и категории2"
-
-#~ msgid "Learning And Education"
-#~ msgstr "Обучение и образование"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr "Вы уверены, что хотите создать партнера на основе этого звонка ?"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "Превратить в партнера"
-
-#~ msgid "Self Generated"
-#~ msgstr "Создался сам"
-
-#~ msgid "Candidate Name"
-#~ msgstr "Имя кандидата"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Помогает вам в организации процесса найма: оценка, встречи, интеграция эл. "
-#~ "почты и т.д."
-
-#~ msgid "Awaiting Response"
-#~ msgstr "В ожидании ответа"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "Ответить на последнее эл. письмо"
-
-#~ msgid "Won't fix"
-#~ msgstr "Не исправить"
-
-#~ msgid "Converted"
-#~ msgstr "Конвертирован"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Назначить звонок"
-
-#~ msgid "Search Funds"
-#~ msgstr "Поиск средств"
-
-#~ msgid "Type of claim"
-#~ msgstr "Тип претензии"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "Регулярное выражение для названия вопроса"
-
-#~ msgid "Search Claims"
-#~ msgstr "Поиск претензий"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "Нуждается в анализе"
-
-#~ msgid "Closed Lost"
-#~ msgstr "Закрыто неудачно"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Претензии в процессе"
-
-#~ msgid "Add a CC"
-#~ msgstr "Добавить копию"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "Управление календарем встреч пользователя."
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "Предложение/Запрос цен"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr ""
-#~ "Примечание: вы можете использовать вид календаря для наглядного назначения "
-#~ "ваших встреч."
-
-#~ msgid "Contract Data"
-#~ msgstr "Данные контакта"
-
-#~ msgid "Fund Raising"
-#~ msgstr "Сбор средств"
-
-#~ msgid "OPAQUE"
-#~ msgstr "ТЕМНЫЙ"
-
-#~ msgid "Claims Info"
-#~ msgstr "Инф. о претензиях"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "Название категории2 вопроса"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "Преобразовать в партнера"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "Вопросы - встречи"
-
-#~ msgid "Prospecting"
-#~ msgstr "Разведка"
-
-#~ msgid "Import ICS File"
-#~ msgstr "Импорт файла ICS"
-
 #~ msgid "Telesales"
 #~ msgstr "Продажи по телефону"
 
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = дата создания"
-
-#~ msgid "Set case state to"
-#~ msgstr "Установить состояние вопроса в"
-
-#~ msgid "Support Query"
-#~ msgstr "Запрос поддержки"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "Название2 кандидата"
-
-#~ msgid "Attachment3"
-#~ msgstr "Вложение3"
-
-#~ msgid "Attachment2"
-#~ msgstr "Вложение2"
-
-#~ msgid "To Assign"
-#~ msgstr "Назначить"
-
-#~ msgid "Candidate Phone"
-#~ msgstr "Телефон кандидата"
-
-#~ msgid "Attachment1"
-#~ msgstr "Вложение1"
-
-#~ msgid "Degree"
-#~ msgstr "Степень, звание"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "Пожалуйста предоставьте правильный URL !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Если активное поле истинно, то это позволит вам скрыть вопрос без его "
-#~ "удаления."
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "Партнер с таким названием уже существует."
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "Описание претензии/действия"
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "Вопросы - звонки"
-
-#~ msgid "PUBLIC"
-#~ msgstr "ПУБЛИЧНЫЙ"
-
-#~ msgid "History of Events"
-#~ msgstr "История событий"
-
-#~ msgid "Category2 of case"
-#~ msgstr "Категория2 вопроса"
-
 #~ msgid "%(case_user_email)s = Responsible email"
 #~ msgstr "(case_user_email)s = эл. почта ответственного"
 
-#~ msgid "Employee's Name"
-#~ msgstr "Имя сотрудника"
-
-#~ msgid "All Claims"
-#~ msgstr "Все претензии"
-
-#~ msgid "Related Case"
-#~ msgstr "Связанный вопрос"
-
-#~ msgid "First Interview"
-#~ msgstr "Первое собеседование"
-
-#~ msgid "Search Case"
-#~ msgstr "Искать вопрос"
-
-#~ msgid "Regex on Communication History"
-#~ msgstr "Regex истории переписки"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "Закрыть звонок"
-
-#~ msgid "PRIVATE"
-#~ msgstr "ЧАСТНЫЙ"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "Кандидат нанят"
-
-#~ msgid "Goals"
-#~ msgstr "Цели"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "Послепродажное обслуживание"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "Вопросы по разделам и типу"
-
 #~ msgid "%(case_user)s = Responsible name"
 #~ msgstr "%(case_user)s = имя ответственного"
 
@@ -5017,63 +4353,6 @@ msgstr "Рассылка"
 #~ msgid "%(case_subject)s = Case subject"
 #~ msgstr "%(case_subject)s = предмет вопроса"
 
-#~ msgid "Relevant"
-#~ msgstr "Уместный"
-
-#~ msgid "Claim Cases"
-#~ msgstr "Вопросы - претензии"
-
-#~ msgid "Generic Wizard"
-#~ msgstr "Общий мастер настройки"
-
-#~ msgid "Trensparent"
-#~ msgstr "Прозрачный"
-
-#~ msgid "Word of mouth"
-#~ msgstr "Из уст в уста"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Вопросы по сделкам, категориям и типам"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Вопросы по сделкам и этапам"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr ""
-#~ "Каналы представляют собой доступные виды коммуникаций с клиентом. Для каждой "
-#~ "сделки вы можете выбрать свой канал в качестве источника сделки."
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "Вопросы по сделкам, категориям и этапам"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "Вопросы по сделкам"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "Диаграмма сделок"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "Вопросы по сделкам и типу"
-
-#~ msgid "Second Interview"
-#~ msgstr "Второе собеседование"
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr ""
-#~ "Используется компаниями для работы с ошибками и запросами на поддержку "
-#~ "программ"
-
-#~ msgid "Search Jobs"
-#~ msgstr "Поиск вакансий"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr ""
-#~ "Отметьте, если вы хотите, чтобы посылались эл. письма ответственному лицу."
-
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the case be attached "
 #~ "to the reminder email sent."
@@ -5084,70 +4363,9 @@ msgstr "Рассылка"
 #~ msgid "Case Rule"
 #~ msgstr "Правило вопроса"
 
-#~ msgid "Next Interview"
-#~ msgstr "Следующее собеседование"
-
-#~ msgid "My Funds"
-#~ msgstr "Мои средства"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr ""
-#~ " Позволит вам синхронизировать ваш календарь в Open ERP с вашим телефоном, "
-#~ "программами Outlook, Sunbird, ical и т.д."
-
-#~ msgid "Corrective"
-#~ msgstr "Поправка"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "Вакансия - форма для найма"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr "Определяет последовательность вывода списка правил вопроса."
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "Вакансии - процесс найма"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Открытые вакансии"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "ID эл. почты для лиц, которым будет отпралено письмо"
-
-#~ msgid "Search Cases by User"
-#~ msgstr "Искать вопросы по пользователям"
-
-#~ msgid "Type of Action"
-#~ msgstr "Тип действия"
-
-#~ msgid "Candidate Email"
-#~ msgstr "Эл. почта кандидата"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "Встреча с кандидатами"
-
 #~ msgid "Delay after trigger date"
 #~ msgstr "Задержка после даты триггера"
 
-#~ msgid "Arts And Culture"
-#~ msgstr "Искусство и культура"
-
-#~ msgid "All Funds"
-#~ msgstr "Все средства"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "Вопросы по разделам, категориям и типам"
-
-#~ msgid "Licenced"
-#~ msgstr "Лицензированный"
-
-#~ msgid "Fund Raising Cases"
-#~ msgstr "Вопросы сбора средств"
-
-#~ msgid "Healthcare"
-#~ msgstr "Здравоохранение"
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr ""
@@ -5156,70 +4374,12 @@ msgstr "Рассылка"
 #~ msgid "E-Mail Actions"
 #~ msgstr "Действия эл. почты"
 
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = символ '%'"
-
 #~ msgid "Partner Email"
 #~ msgstr "Эл. почта партнера"
 
-#~ msgid "Not fixed"
-#~ msgstr "Не определено"
-
-#~ msgid "Content of mail"
-#~ msgstr "Содержимое письма"
-
-#~ msgid "New Jobs"
-#~ msgstr "Новые вакансии"
-
-#~ msgid "Save ICS file"
-#~ msgstr "Сохранить файл ICS"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Выберите файл ICS"
-
-#~ msgid "Export ICS File"
-#~ msgstr "Экспорт файла ICS"
-
 #~ msgid "Case logs"
 #~ msgstr "Журналы вопроса"
 
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Вакансии - процесс найма"
-
-#~ msgid "Job Info"
-#~ msgstr "Описание вакансии"
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Вакансии в ожидании"
-
-#~ msgid "Close job request"
-#~ msgstr "Закрыть запрос вакансии"
-
-#~ msgid "Job Cases"
-#~ msgstr "Вопросы вакансий"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr ""
-#~ "Вы уверены, вы хотите создать партнера основанного на этом запросе вакансии ?"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "Все запросы вакансий"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "Техподдержка"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Управление службой техподдержки"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "Техподдержка"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "Вопросы техподдержки"
-
-#~ msgid "HelpDesk"
-#~ msgstr "Техподдержка"
-
 #~ msgid ""
 #~ "A period is the average number of days between two cycle of sale or purchase "
 #~ "for this segmentation. It's mainly used to detect if a partner has not "
@@ -5232,57 +4392,6 @@ msgstr "Рассылка"
 #~ "предполагаем, что его мнение о нас ухудшилось и он покупает в другом месте. "
 #~ "Используйте эту функцию для повторяющихся сделок."
 
-#~ msgid "Claim Cost"
-#~ msgstr "Расходы по претензии"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "Партнер для этого запроса вакансии уже определен."
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Укажите путь для удаленного календаря"
-
-#~ msgid "Resource's Calendar"
-#~ msgstr "Календарь ресурсов"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "превращается в сделку."
-
-#~ msgid "Count"
-#~ msgstr "Количество"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Повторить максимальное количество раз"
-
-#~ msgid ""
-#~ "Create specific phone call categories to better sort the type of calls "
-#~ "tracked in the system."
-#~ msgstr ""
-#~ "Создайте специальные категории звонков, чтобы лучше сортировать звонки в "
-#~ "системе."
-
-#~ msgid "Claim"
-#~ msgstr "Претензия"
-
-#~ msgid "Interval"
-#~ msgstr "Интервал"
-
-#~ msgid "Custom"
-#~ msgstr "Свой"
-
-#~ msgid "Seconds"
-#~ msgstr "Секунд"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Дополнительное правило повтора"
-
-#~ msgid "Exclude range"
-#~ msgstr "Исключить диапазон"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Встреча по вопросу"
-
 #~ msgid "New Form"
 #~ msgstr "Новая форма"
 
@@ -5303,3 +4412,6 @@ msgstr "Рассылка"
 
 #~ msgid "Tree View"
 #~ msgstr "В виде дерева"
+
+#~ msgid "Mail Campaign 1"
+#~ msgstr "Почтовая кампания 1"
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index cdef675f10b..1ea44d23faa 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "Kód predajného tímu musí byť jedinečný!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "Iniciatíva '%s' bola zmenená na príležitosť."
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Bez opakovania"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -350,7 +350,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Potenciálny partner"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
@@ -395,7 +395,7 @@ msgstr "Iniciatíva '%s' bola otvorená."
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Stretnutie príležitosti"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0
@@ -540,9 +540,9 @@ msgstr "Úplne prvý kontakt s novou perspektívou"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -811,8 +811,8 @@ msgid "Statistics Dashboard"
 msgstr "Nástenka štatistík"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1032,7 +1032,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Získaný"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1042,7 +1042,7 @@ msgstr "Suma nákupu"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Stratený"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1096,6 +1096,7 @@ msgstr "Spôsob ukončenia"
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"Nie sú tu žiadne 'otvorené' alebo 'v riešení' príležitosti pre partnera '%s'."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1119,7 +1120,7 @@ msgstr "Zasielať"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1136,7 +1137,7 @@ msgstr "Stretnutia"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Vyberte si deň pre opakovanie stretnutia"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
@@ -1186,7 +1187,7 @@ msgstr "Zodpovedná osoba"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Predchadzajúci"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1842,7 +1843,7 @@ msgstr "Detaily pozvánky"
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Hlavný tím"
 
 #. module: crm
 #: field:crm.lead,date_action:0
@@ -2642,7 +2643,7 @@ msgid "Meeting Type"
 msgstr "Typ stretnutia"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Spojenie s existujúcou príležitosťou"
@@ -3153,8 +3154,8 @@ msgid "Schedule Call"
 msgstr "Plán hovorov"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr "Uzavretú / Zrušenú iniciatívu nie je možné zmeniť na príležitosť"
@@ -4155,9 +4156,6 @@ msgstr ""
 #~ msgid "Latest E-Mail"
 #~ msgstr "Posledný E-Mail"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Actions"
 #~ msgstr "Akcie"
 
@@ -4225,145 +4223,8 @@ msgstr ""
 #~ msgid "Case logs"
 #~ msgstr "Logy prípadov"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 dní    "
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "Prípady podľa sekcie a kategórie 2"
-
-#~ msgid "Send to"
-#~ msgstr "Poslať"
-
-#~ msgid "Amount"
-#~ msgstr "Suma"
-
-#~ msgid "Human Resources"
-#~ msgstr "Ľudské zdroje"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "Prípady podľa príležitosti, kategórie a typu"
-
-#~ msgid "Fixed"
-#~ msgstr "Pevná"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Navrh mzdy"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Prosím, zadajte e-mailovú adresu!"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Trvanie (hodín)"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Prípady podľa sekcie a etapy"
-
 #~ msgid "Mail to these emails"
 #~ msgstr "Mail na tieto e-maily"
 
-#~ msgid "Cases by section and stage"
-#~ msgstr "Prípady podľa sekcie a etapy"
-
-#~ msgid "Appreciation"
-#~ msgstr "Ocenenie"
-
-#~ msgid "Second Interview"
-#~ msgstr "Druhý rozhovor"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Prihlásiť sa do vzdialeného kalendára"
-
-#~ msgid "Description Information"
-#~ msgstr "Opis Informácie"
-
-#~ msgid "Next Interview"
-#~ msgstr "Ďalší rozhovor"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Email pridať kópu"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Potvrdiť stretnutie"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Existujúci zákazník"
-
-#~ msgid "Home"
-#~ msgstr "Domov"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Udalosti podľa sekcie, kategórie a etapy"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "Stromová štruktúra stretnutí"
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "Umožňuje zobraziť kalendár"
-
-#~ msgid "New Business"
-#~ msgstr "Nový obchod/príležitosť"
-
-#~ msgid "Value Proposition"
-#~ msgstr "Navrhnutá hodnota"
-
-#~ msgid "Refused by Company"
-#~ msgstr "Zamietnuté podľa firmy"
-
-#~ msgid "Add CC"
-#~ msgstr "Pridať kópiu"
-
-#~ msgid "All Meetings"
-#~ msgstr "Všetky stretnutia"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Navrhovaná zmluva"
-
-#~ msgid "Related Cases"
-#~ msgstr "Relevantné prípady"
-
-#~ msgid "   Today   "
-#~ msgstr "   Dnes   "
-
-#~ msgid "Policy Claims"
-#~ msgstr "Politika/Pravidlá pohľadávok"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Opis telefonického hovoru"
-
-#~ msgid "Assigned to"
-#~ msgstr "Priradené k"
-
-#~ msgid "Contract Signed"
-#~ msgstr "Podpísaná zmluva"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Dátum pohľadávky"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "Udalosti podľa príležitosti a etapy"
-
-#~ msgid "All Leads"
-#~ msgstr "Všetky prvé kontakty"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "Uložiť vo formáte .ics"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Reálne pohľadávky"
-
-#~ msgid "Emails"
-#~ msgstr "Emaily"
-
-#, python-format
-#~ msgid "Email!"
-#~ msgstr "Email!"
-
-#~ msgid "Radio"
-#~ msgstr "Prepínač"
-
-#~ msgid "crm.opportunity.assign_wizard"
-#~ msgstr "crm.opportunity.assign_wizard"
-
-#~ msgid "Search Histories"
-#~ msgstr "Vyhľadanie histórie"
+#~ msgid "Telesales"
+#~ msgstr "Telefonický predaj"
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index 0ecd9e172d3..a0744646ef6 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1080,7 +1080,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2582,7 +2582,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3092,8 +3092,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/sq.po b/addons/crm/i18n/sq.po
index a425e500da7..e0981075473 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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -535,9 +535,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -804,8 +804,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1081,7 +1081,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2583,7 +2583,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3093,8 +3093,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/sr.po b/addons/crm/i18n/sr.po
index 7ae3dfd8499..f848e56a9df 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Nema ponavljanja"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -541,9 +541,9 @@ msgstr "Prvi kontakt sa novim prospektom"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -830,8 +830,8 @@ msgid "Statistics Dashboard"
 msgstr "Glavna Tabla Statistike"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1142,7 +1142,7 @@ msgstr "Opt-In"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2659,7 +2659,7 @@ msgid "Meeting Type"
 msgstr "Tip Sastanka"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Spoji sa postojecim Prilikama"
@@ -3187,8 +3187,8 @@ msgid "Schedule Call"
 msgstr "Zakazi Poziv"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3947,91 +3947,19 @@ msgstr "Novine"
 #~ msgid "Cases"
 #~ msgstr "Slucajevi"
 
-#~ msgid "Resource's Calendar"
-#~ msgstr "Kalendar Resursa"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Ponovi maksimalno puta"
-
-#~ msgid "Count"
-#~ msgstr "Izbroj"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Ako je postavljeno na aktivno, omogucava ti da sakrijes informacije "
-#~ "dogadjaje alarma bez uklanjanja istih."
-
-#~ msgid "Extended Options..."
-#~ msgstr "Ekstra Opcije"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Ponovi svakog x"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za Pregled arhitekture!"
 
-#, python-format
-#~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-#~ msgstr "Zatvoreni/Otkazani \\nTragoci ne mogu se konvertovati u Prilike"
-
-#~ msgid "Interval"
-#~ msgstr "Interval"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Prilike po Kategorijama"
-
-#~ msgid "Custom"
-#~ msgstr "Po vasem Izboru"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana za osv_memory objekata !"
-
 #~ msgid "Minutes"
 #~ msgstr "Minuta"
 
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Email Kampanja 1"
 
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Trag "
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunde"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
 
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Prilagodjeno Pravilo Ponavljanja"
-
-#~ msgid "Exclude range"
-#~ msgstr "Iskljuci Opseg"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Case Meeting"
-#~ msgstr "Sastanak Slucaja"
-
-#~ msgid "of"
-#~ msgstr "od"
-
-#, python-format
-#~ msgid "There is no stage for won opportunities defined for this Sale Team."
-#~ msgstr "Nema nivoa za Dobitnu Priliku definisanu za ovaj Prodajni Tim."
-
-#, python-format
-#~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-#~ msgstr "Zatvoreni/Otkazani Tel \\nPOzivi ne mogu se konvertovati u Prilike"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "je konvertovano u Priliku"
-
 #~ msgid "Telesales"
 #~ msgstr "Teleprodaja"
diff --git a/addons/crm/i18n/sr@latin.po b/addons/crm/i18n/sr@latin.po
index 92baad7aeaa..da6bb79ebd2 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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Nema ponavljanja"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -541,9 +541,9 @@ msgstr "Prvi kontakt sa novim prospektom"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -830,8 +830,8 @@ msgid "Statistics Dashboard"
 msgstr "Glavna Tabla Statistike"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1142,7 +1142,7 @@ msgstr "Opt-In"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2659,7 +2659,7 @@ msgid "Meeting Type"
 msgstr "Tip Sastanka"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr "Spoji sa postojecim Prilikama"
@@ -3187,8 +3187,8 @@ msgid "Schedule Call"
 msgstr "Zakazi Poziv"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3947,91 +3947,19 @@ msgstr "Novine"
 #~ msgid "Cases"
 #~ msgstr "Slucajevi"
 
-#~ msgid "Resource's Calendar"
-#~ msgstr "Kalendar Resursa"
-
-#, python-format
-#~ msgid "is converted to Opportunity."
-#~ msgstr "je konvertovano u Priliku"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Ponovi maksimalno puta"
-
-#~ msgid "Count"
-#~ msgstr "Izbroj"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the event "
-#~ "alarm information without removing it."
-#~ msgstr ""
-#~ "Ako je postavljeno na aktivno, omogucava ti da sakrijes informacije "
-#~ "dogadjaje alarma bez uklanjanja istih."
-
-#~ msgid "Extended Options..."
-#~ msgstr "Ekstra Opcije"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Ponovi svakog x"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za Pregled arhitekture!"
 
-#, python-format
-#~ msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
-#~ msgstr "Zatvoreni/Otkazani \\nTragoci ne mogu se konvertovati u Prilike"
-
-#~ msgid "Interval"
-#~ msgstr "Interval"
-
 #~ msgid "Telesales"
 #~ msgstr "Teleprodaja"
 
-#~ msgid "Custom"
-#~ msgstr "Po vasem Izboru"
-
-#~ msgid "Opportunities By Categories"
-#~ msgstr "Prilike po Kategorijama"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana za osv_memory objekata !"
-
 #~ msgid "Minutes"
 #~ msgstr "Minuta"
 
 #~ msgid "Mail Campaign 1"
 #~ msgstr "Email Kampanja 1"
 
-#, python-format
-#~ msgid "Lead "
-#~ msgstr "Trag "
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunde"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Prilagodjeno Pravilo Ponavljanja"
-
-#~ msgid "Exclude range"
-#~ msgstr "Iskljuci Opseg"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "of"
-#~ msgstr "od"
-
-#~ msgid "Case Meeting"
-#~ msgstr "Sastanak Slucaja"
-
-#, python-format
-#~ msgid "There is no stage for won opportunities defined for this Sale Team."
-#~ msgstr "Nema nivoa za Dobitnu Priliku definisanu za ovaj Prodajni Tim."
-
-#, python-format
-#~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
-#~ msgstr "Zatvoreni/Otkazani Tel \\nPOzivi ne mogu se konvertovati u Prilike"
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 38e10fce84f..8c606b94f2f 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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3857,60 +3857,15 @@ msgstr "nyhetsbrev"
 #~ msgid "General Description"
 #~ msgstr "Allmän beskrivning"
 
-#~ msgid "Close Lead"
-#~ msgstr "Välj lead"
-
-#~ msgid "Send to"
-#~ msgstr "Skicka till"
-
 #~ msgid "Planned costs"
 #~ msgstr "Planerade kostnader"
 
-#~ msgid "Amount"
-#~ msgstr "Belopp"
-
-#~ msgid "Human Resources"
-#~ msgstr "Personalärenden"
-
 #~ msgid "Cases"
 #~ msgstr "Ärenden"
 
-#~ msgid "Fixed"
-#~ msgstr "Fast"
-
-#~ msgid "Second Interview"
-#~ msgstr "Andra intervju"
-
 #~ msgid "None"
 #~ msgstr "Inga"
 
-#~ msgid "Proposed Salary"
-#~ msgstr "Förslagen lön"
-
-#~ msgid "Description Information"
-#~ msgstr "Beskrivning"
-
-#~ msgid "Next Interview"
-#~ msgstr "Nästa intervju"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Epost lägg till CC"
-
-#~ msgid "Dead"
-#~ msgstr "Död"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "Godkänn möte"
-
-#~ msgid "Existing Customer"
-#~ msgstr "Befintlig kund"
-
-#~ msgid "Home"
-#~ msgstr "Hem"
-
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "Ärdenden per sektion, kategori och nivå"
-
 #~ msgid "Business Opportunities"
 #~ msgstr "Affärstillfällen"
 
@@ -3923,48 +3878,12 @@ msgstr "nyhetsbrev"
 #~ msgid "Open Cases"
 #~ msgstr "Öppna ärenden"
 
-#~ msgid "Add CC"
-#~ msgstr "Lagg till CC"
-
-#~ msgid "All Meetings"
-#~ msgstr "Alla möten"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "Telefonsamtal, beskrivning"
-
-#~ msgid "New Business"
-#~ msgstr "Ny affär"
-
-#~ msgid "Assigned to"
-#~ msgstr "Tilldelad till"
-
-#~ msgid "Related Cases"
-#~ msgstr "Relaterade ärenden"
-
-#~ msgid "All Leads"
-#~ msgstr "Alla möjligheter"
-
-#~ msgid "Emails"
-#~ msgstr "E-post"
-
 #~ msgid "Case Rule"
 #~ msgstr "Möjlighetsregel"
 
-#~ msgid "Leads Cases"
-#~ msgstr "Möjlighetsärenden"
-
-#~ msgid "Existing Business"
-#~ msgstr "Befintlig affär"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "Administrera en supportavdelning"
-
 #~ msgid "Case Section"
 #~ msgstr "Ärende sektion"
 
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Prenumerera på en extern kalender"
-
 #~ msgid "Delay After Trigger Date:"
 #~ msgstr "Delay After Trigger Date:"
 
@@ -4514,18 +4433,3 @@ msgstr "nyhetsbrev"
 
 #~ msgid "Trigger Date"
 #~ msgstr "Trigger Date"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetera varje x"
-
-#~ msgid "Interval"
-#~ msgstr "Intervall"
-
-#~ msgid "Custom"
-#~ msgstr "Anpassad"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunder"
-
-#~ msgid "of"
-#~ msgstr "av"
diff --git a/addons/crm/i18n/th.po b/addons/crm/i18n/th.po
index 06b8a5f6ff1..216c419b824 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "รหัสของทีมขายต้องไม่ซ้ำกัน!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "ไม่มีซ้ำ"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -535,9 +535,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -804,8 +804,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1081,7 +1081,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2583,7 +2583,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3093,8 +3093,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/tlh.po b/addons/crm/i18n/tlh.po
index 3d6a7c568e0..c9c8e667a75 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: 2011-04-29 04:59+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1080,7 +1080,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2582,7 +2582,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3092,8 +3092,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index b6542f5220e..14bb7ae7648 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: 2011-06-21 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2929,6 +2929,18 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"Fırsatlarla, potansiyel satışların izlendiği satış belgelerine bağlı olarak "
+"belirli müşteriler- ya da adaylar- oluşturarak satış huninizi yönetebilir ve "
+"izleyebilirsiniz. Tahmini gelirler, fırsat aşamaları, tahmini kapanış "
+"tarihi, iletişim geçmişi gibi dhs birçok bilgiyi saklayabilirsiniz. "
+"Fırsatlar eposta ağgeçitlerine bağlanabilir: yeni epostalar yeni fırsatlar "
+"yaratabilir ve her biri otomatikmen müşteri ile yapılan görüşme geçmişini "
+"alır.\n"
+"\n"
+"Siz ve takımınız(larınız) fırsatlardan toplantılar ve telefon çağrıları "
+"planlayabilir, onları tekliflere dönüştürebilir, ilgili belgeleri "
+"yönetebili, müşterilerle ilgili etkinlikleri izleyebilir ve daha bir çok "
+"şeyi yapabilirsiniz."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -4076,94 +4088,18 @@ msgstr "Habermektubu"
 #~ msgid "Delay type"
 #~ msgstr "Gecikme türü"
 
-#~ msgid "Cases by section and category2"
-#~ msgstr "section ve category2'ye göre Olay"
-
-#~ msgid "Send to"
-#~ msgstr "Alıcı"
-
-#~ msgid "Leads Cases"
-#~ msgstr "Potansiyel Olayları"
-
-#~ msgid "Leads Tree"
-#~ msgstr "Potansiyel Ağacı"
-
-#~ msgid "Lead Email"
-#~ msgstr "Potansiyel Emaili"
-
-#~ msgid "Lead Information"
-#~ msgstr "Potansiyel Bilgileri"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "Potansiyel ve Türlere Göre Olaylar"
-
-#~ msgid "All Leads"
-#~ msgstr "Bütün Potansiyeller"
-
-#~ msgid "Close Lead"
-#~ msgstr "Potansiyeli Kapat"
-
 #~ msgid "Cases"
 #~ msgstr "Olaylar"
 
 #~ msgid "Button Pressed"
 #~ msgstr "Düğmeye Basıldı"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Gün    "
-
-#~ msgid "Pending Jobs"
-#~ msgstr "Askıdaki İşler"
-
-#~ msgid "Close job request"
-#~ msgstr "İş isteğini kapat."
-
-#~ msgid "Amount"
-#~ msgstr "Miktar"
-
-#~ msgid "Human Resources"
-#~ msgstr "İnsan Kaynakları"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "Lütfen kullanıcının E-Posta adresini giriniz !"
-
-#~ msgid "Fixed"
-#~ msgstr "Sabit"
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "Bölüm ve Safhaya göre Olaylar"
-
 #~ msgid "Case Section"
 #~ msgstr "Olay Bölümü"
 
-#~ msgid "TRANSPARENT"
-#~ msgstr "ŞEFFAF"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "Bölüm ve Safhaya göre Olaylar"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Teklif Edilen Maaş"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "Süre (Saat)"
-
 #~ msgid "My Histories"
 #~ msgstr "Olaylar Geçmişim"
 
-#~ msgid "Second Interview"
-#~ msgstr "İkinci Görüşme"
-
-#~ msgid "Exception Dates"
-#~ msgstr "İstisna Tarihler"
-
-#~ msgid "Appreciation"
-#~ msgstr "Değer Kazanma"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "Uzaktaki bir Takvime Üye Ol"
-
 #~ msgid "None"
 #~ msgstr "Hiçbiri"
 
diff --git a/addons/crm/i18n/uk.po b/addons/crm/i18n/uk.po
index 0258d538d17..410082d8b3e 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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -807,8 +807,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1084,7 +1084,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2586,7 +2586,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3098,8 +3098,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -4039,13 +4039,6 @@ msgstr ""
 #~ msgid "Case"
 #~ msgstr "Випадок"
 
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr ""
-#~ "Якщо партнер не мав покупок протягом періоду, зменшіть стан настрою за цим "
-#~ "фактором. Це є множення."
-
 #~ msgid "Send Partner & Historize"
 #~ msgstr "Надіслати партнерові та архівувати"
 
diff --git a/addons/crm/i18n/vi.po b/addons/crm/i18n/vi.po
index 384a36da22b..3e266cff727 100644
--- a/addons/crm/i18n/vi.po
+++ b/addons/crm/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-05-04 18:43+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-05 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -125,7 +125,7 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
@@ -142,8 +142,8 @@ msgid "No Repeat"
 msgstr "Không lặp lại"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -543,9 +543,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -812,8 +812,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -1089,7 +1089,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -2440,7 +2440,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.send.mail:0
 msgid "Attachments"
-msgstr "Tập tin đính kèm"
+msgstr "Các tập tin đính kèm"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -2591,7 +2591,7 @@ msgid "Meeting Type"
 msgstr "Loại Cuộc họp"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -3101,8 +3101,8 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 2b55be47a1e..94970c7b20a 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/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: 2011-07-02 05:06+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -73,7 +73,7 @@ msgstr "每月的指定日期"
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Today"
-msgstr "今日"
+msgstr "今天"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -138,7 +138,7 @@ msgstr "线索 '%s' 已关闭."
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr "不重复"
+msgstr "不可重复"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
@@ -260,7 +260,7 @@ msgstr "退订"
 #: code:addons/crm/crm_opportunity.py:108
 #, 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
@@ -886,7 +886,7 @@ msgstr "这个商机 '%s'已获得"
 #. 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.module.module,description:crm.module_meta_information
@@ -1134,7 +1134,7 @@ msgstr "重复直到"
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "最后期限"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1421,7 +1421,7 @@ 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
@@ -1598,7 +1598,7 @@ msgstr "取消"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1770,7 +1770,7 @@ msgstr "周六"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "第5"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
@@ -1839,7 +1839,7 @@ msgstr "小时数"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "邮政编码"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:213
@@ -2029,7 +2029,7 @@ msgstr "google"
 #. 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
@@ -2194,7 +2194,7 @@ msgstr "团队"
 #. module: crm
 #: field:crm.installer,outlook:0
 msgid "MS-Outlook"
-msgstr ""
+msgstr "MS-Outlook"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3922,9 +3922,6 @@ msgstr "时事通信"
 #~ msgid "Form View"
 #~ msgstr "表单视图"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Segmentations"
 #~ msgstr "细分"
 
@@ -4191,85 +4188,6 @@ msgstr "时事通信"
 #~ msgid "Update The Proposed Menus To Be Created"
 #~ msgstr "更新创建的被提议的菜单"
 
-#~ msgid "    7 Days    "
-#~ msgstr "    7天    "
-
-#~ msgid "Send to"
-#~ msgstr "发送到"
-
-#~ msgid "Fixed"
-#~ msgstr "已解决"
-
-#~ msgid "Human Resources"
-#~ msgstr "人力资源"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "建议薪资"
-
-#~ msgid "Description Information"
-#~ msgstr "说明信息"
-
-#~ msgid "Confirm Meeting"
-#~ msgstr "确认会议"
-
-#~ msgid "Existing Customer"
-#~ msgstr "现有客户"
-
-#~ msgid "All Meetings"
-#~ msgstr "所有会议"
-
-#~ msgid "Meetings Tree"
-#~ msgstr "会议树"
-
-#~ msgid "Allows to show calendar"
-#~ msgstr "允许显示日程表。"
-
-#~ msgid "Phone Call Description"
-#~ msgstr "电话呼叫说明"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "合同提案"
-
-#~ msgid "Assigned to"
-#~ msgstr "分配给"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "职位招聘流程"
-
-#~ msgid "Negotiation/Review"
-#~ msgstr "协商/审查"
-
-#~ msgid "Contract Signed"
-#~ msgstr "已签订合同"
-
-#~ msgid "Radio"
-#~ msgstr "广播"
-
-#~ msgid "Set State to"
-#~ msgstr "设置状态为"
-
-#, python-format
-#~ msgid "There is no mail to reply!"
-#~ msgstr "没有要回复的电子邮件！"
-
-#~ msgid "Preventive"
-#~ msgstr "预防"
-
-#~ msgid "Junior Developer"
-#~ msgstr "初级软件开发人员"
-
-#~ msgid "Category Name"
-#~ msgstr "分类名称"
-
-#~ msgid "Candidate Refused"
-#~ msgstr "候选人被拒绝"
-
-#~ msgid "Print"
-#~ msgstr "打印"
-
-#~ msgid "Learning And Education"
-#~ msgstr "学习和教育"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "在动作定义使用了无效的模快名。"
 
@@ -4323,190 +4241,33 @@ msgstr "时事通信"
 #~ msgid "Send Partner & Historize"
 #~ msgstr "发送到业务伙伴和记载"
 
-#~ msgid ""
-#~ "This property defines the list                 of date/time exceptions for "
-#~ "arecurring calendar component."
-#~ msgstr "这属性定义了一个循环的日历组件的例外日期/ 时间列表"
-
-#~ msgid "Amount"
-#~ msgstr "金额"
-
-#~ msgid ""
-#~ "Describes the action name.eg:on which object which ation to be taken on "
-#~ "basis of which condition"
-#~ msgstr "动作描述, 例如: 根据哪些条件哪些对象的哪些动作要起作用"
-
-#~ msgid "Duration (Hours)"
-#~ msgstr "持续时间(小时数)"
-
-#~ msgid "Appreciation"
-#~ msgstr "鉴识"
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "从你的销售渠道跟踪出销售机会"
-
-#~ msgid "Exception Dates"
-#~ msgstr "例外日期"
-
-#~ msgid "Subscribe to a Remote calendar"
-#~ msgstr "预订一个遥远的日程"
-
-#~ msgid "Next Interview"
-#~ msgstr "下次会面"
-
 #~ msgid ""
 #~ "The rule use a AND operator. The case must match all non empty fields so "
 #~ "that the rule execute the action described in the 'Actions' tab."
 #~ msgstr "该规则使用AND操作符. 这业务个案必须是非空字段而且该规则的执行动作描述在动作标签."
 
-#~ msgid "Exception Rules"
-#~ msgstr "例外规则"
-
-#~ msgid "Accepted as Claim"
-#~ msgstr "接受作为索赔"
-
 #~ msgid "%(email_from)s = Partner email"
 #~ msgstr "%(email_from)s = 业务伙伴的Email"
 
-#~ msgid "Email Add CC"
-#~ msgstr "Email地址"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate the canall "
-#~ "which is this opportunity source."
-#~ msgstr "渠道代表与客户不同的沟通, 在每一个商机你能标记出哪个是这机会的来源."
-
 #~ msgid "Button Pressed"
 #~ msgstr "按下的按钮"
 
-#~ msgid "Close Lead"
-#~ msgstr "关闭营销线索"
-
-#~ msgid ""
-#~ "Check this if you want the rule to send an email to the responsible person."
-#~ msgstr "选这个, 如果你想规定发送Email给负责人"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr "管理客户和供应商的索赔, 包括您的纠正或预防措施"
-
-#~ msgid "Cases by Opportunities, Category and Type"
-#~ msgstr "业务个案的商机, 分类和类型"
-
-#~ msgid "Close job request"
-#~ msgstr "关闭工作请求"
-
-#, python-format
-#~ msgid "Please specify user's email address !"
-#~ msgstr "请指定用户的Email地址"
-
-#~ msgid "Second Interview"
-#~ msgstr "第二次面谈"
-
-#~ msgid "Dead"
-#~ msgstr "死寂的"
-
-#~ msgid ""
-#~ "Check this if you want the rule to mark CC(mail to any other person defined "
-#~ "in actions)."
-#~ msgstr "选这个, 如果你想这规则标记为cc(在行动定义中发邮件到任何人)"
-
-#~ msgid "Value Proposition"
-#~ msgstr "价格建议"
-
-#~ msgid "Refused by Company"
-#~ msgstr "公司拒绝"
-
-#~ msgid "Add CC"
-#~ msgstr "加入cc"
-
-#~ msgid "   Today   "
-#~ msgstr "   今天   "
-
-#~ msgid "Policy Claims"
-#~ msgstr "保险索赔"
-
-#~ msgid "Related Cases"
-#~ msgstr "相关的业务个案"
-
-#~ msgid "New Claims"
-#~ msgstr "新的索赔"
-
-#~ msgid "Meetings Form"
-#~ msgstr "会议"
-
-#~ msgid "Date of Claim"
-#~ msgstr "索赔日期"
-
-#~ msgid "All Leads"
-#~ msgstr "所有营销线索"
-
-#~ msgid "Cases by Opportunities and Stage"
-#~ msgstr "商机和阶段"
-
-#~ msgid "Subscribe to Remote ICS"
-#~ msgstr "预约远程ICS"
-
-#~ msgid "Existing Business"
-#~ msgstr "现有生意"
-
-#~ msgid "Factual Claims"
-#~ msgstr "实际索赔"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#~ msgid "Leads Cases"
-#~ msgstr "营销线索业务个案"
-
 #~ msgid ""
 #~ "Check if the category is limited to partners that match the segmentation "
 #~ "criterions. If checked, remove the category from partners that doesn't match "
 #~ "segmentation criterions"
 #~ msgstr "检查如果这分类是在与业务伙伴匹配的细分标准. 如果选中, 将在分类中移去不匹配的业务伙伴"
 
-#~ msgid "Search Histories"
-#~ msgstr "搜索日志"
-
-#~ msgid "Plan Meeting"
-#~ msgstr "计划会议"
-
-#~ msgid ""
-#~ "These people will receive a copy of the future communication between partner "
-#~ "and users by email"
-#~ msgstr "这些人将收到业务伙伴和用户未来通信的邮件副本"
-
-#~ msgid "Server Action to be Triggered"
-#~ msgstr "服务器动作被触发"
-
-#~ msgid "My Funds"
-#~ msgstr "我的款项"
-
 #~ msgid "%(case_description)s = Case description"
 #~ msgstr "%(case_description)s = 业务个案描述"
 
-#~ msgid "Export ICS"
-#~ msgstr "输出ICS"
-
 #~ msgid "Add watchers (Cc)"
 #~ msgstr "新增关注者(Cc)"
 
-#, python-format
-#~ msgid "You can not assign Closed Case."
-#~ msgstr "你不能指定结束的业务个案"
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the partner."
 #~ msgstr "勾选此项, 如果你想发提醒电子邮件给业务伙伴"
 
-#~ msgid "Regex on Case Name"
-#~ msgstr "业务个案名称的正则表达式"
-
-#~ msgid "Pending Claims"
-#~ msgstr "悬而未决的索赔"
-
 #~ msgid ""
 #~ "The generic Open ERP Customer Relationship Management\n"
 #~ "system enables a group of people to intelligently and efficiently manage\n"
@@ -4542,579 +4303,52 @@ msgstr "时事通信"
 #~ "\n"
 #~ "这系统最好在于用户不需做任何特别的操作, 也能发送电子邮件去跟踪请求. 系统会把感谢邮件自动发送到相关的人员手里."
 
-#~ msgid "Recurrency Rule"
-#~ msgstr "重现的规则"
-
-#~ msgid "Cases by Opportunities, Category and Stage"
-#~ msgstr "商机, 分类和阶段"
-
-#~ msgid "Lead Email"
-#~ msgstr "营销线索邮件"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件!"
 
-#~ msgid "Closed Won"
-#~ msgstr "关闭成功"
-
-#~ msgid "Are you sure you want to create a partner based on this phonecall ?"
-#~ msgstr "你确定建立基于这电话呼叫的业务伙伴?"
-
 #~ msgid "Minimum Priority"
 #~ msgstr "最小优先级"
 
-#~ msgid "Meeting Date"
-#~ msgstr "会议日期"
-
-#~ msgid "Convert to Partner"
-#~ msgstr "转为业务伙伴"
-
-#~ msgid "Next Meetings"
-#~ msgstr "下一会议"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_预约"
-
 #, python-format
 #~ msgid "You can not delete this case. You should better cancel it."
 #~ msgstr "您不能删除此业务个案. 您最好取消它."
 
-#~ msgid "Website"
-#~ msgstr "网站"
-
-#~ msgid "Message..."
-#~ msgstr "消息...."
-
-#~ msgid "Value Claims"
-#~ msgstr "索赔价值"
-
 #, python-format
 #~ msgid "open"
 #~ msgstr "待处理"
 
-#~ msgid "Self Generated"
-#~ msgstr "自生成"
-
-#~ msgid "Candidate Name"
-#~ msgstr "候选人姓名"
-
-#~ msgid ""
-#~ "Helps you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr "帮助你组织招聘工作: 评估, 面试, 集成Email...."
-
-#~ msgid "Awaiting Response"
-#~ msgstr "等待回应"
-
-#~ msgid "Funds"
-#~ msgstr "款项"
-
-#~ msgid "Won't fix"
-#~ msgstr "不会解决"
-
-#~ msgid "Gives Location of Meeting"
-#~ msgstr "给出会议地点"
-
-#~ msgid "Regular Expression on Case Name"
-#~ msgstr "业务个案名称正则表达式"
-
-#~ msgid "Job Cases"
-#~ msgstr "招聘业务个案"
-
-#~ msgid "Jobs - Recruitment Tree"
-#~ msgstr "职位-招聘树"
-
-#~ msgid "Reply to Last Email"
-#~ msgstr "最近回复的Email"
-
-#~ msgid "Converted"
-#~ msgstr "已转换"
-
-#~ msgid "Other Info"
-#~ msgstr "其它信息"
-
-#~ msgid "Claim Cost"
-#~ msgstr "索赔成本"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "安排一电话呼叫"
-
-#~ msgid "Search Funds"
-#~ msgstr "查询款项"
-
-#~ msgid "Type of claim"
-#~ msgstr "索赔类型"
-
-#~ msgid "Search Claims"
-#~ msgstr "查询索赔"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "管理用户的会议日程表"
-
-#~ msgid "Mail"
-#~ msgstr "邮件"
-
-#~ msgid "Needs Analysis"
-#~ msgstr "需要分析"
-
 #~ msgid "Set priority to"
 #~ msgstr "设定优先级到"
 
-#~ msgid "Mail to watchers (CC)"
-#~ msgstr "邮件发送给关注者(Cc)"
-
-#~ msgid "Add a CC"
-#~ msgstr "增加Cc"
-
-#~ msgid "Closed Lost"
-#~ msgstr "关闭并失去"
-
-#~ msgid "Next Meeting"
-#~ msgstr "下一会议"
-
-#~ msgid "Campaign Type"
-#~ msgstr "营销活动类型"
-
-#~ msgid "Proposal/Price Quote"
-#~ msgstr "提议/ 报价"
-
-#~ msgid "Web"
-#~ msgstr "Web"
-
-#~ msgid "Set RRULE"
-#~ msgstr "设置规则"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "缺陷跟踪"
-
-#~ msgid "Graduate"
-#~ msgstr "大学毕业"
-
-#~ msgid ""
-#~ "Note that you can also use the calendar view to graphically schedule your "
-#~ "next meeting."
-#~ msgstr "请注意您可以使用日程表视图通过图表安排下一个会议"
-
-#~ msgid "Histories"
-#~ msgstr "日志"
-
-#~ msgid "Leads Tree"
-#~ msgstr "营销线索树"
-
-#, python-format
-#~ msgid "Email Fail!"
-#~ msgstr "Email失败!"
-
-#~ msgid "Attendee"
-#~ msgstr "与会者"
-
-#~ msgid "This Year"
-#~ msgstr "今年"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr " 让您将系统日程表与你的电话、微软outlook, Sunbird, ical, 等同步"
-
-#~ msgid "Used by companies to track bugs and support requests on software"
-#~ msgstr "公司采用的用于跟踪缺陷和支持请求的软件"
-
-#~ msgid "Contract Data"
-#~ msgstr "合同数据"
-
-#~ msgid "Claims Info"
-#~ msgstr "索赔信息"
-
 #~ msgid "Maximim Priority"
 #~ msgstr "最大优先级"
 
-#~ msgid "Est.Revenue"
-#~ msgstr "估计收入"
-
-#~ msgid "Initial Jobs Demand"
-#~ msgstr "初步招聘需求"
-
-#~ msgid "Case Category2 Name"
-#~ msgstr "业务个案分类2名称"
-
-#~ msgid "Cases by Leads and Type"
-#~ msgstr "营销线索业务个案和类型"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "共享的日程表"
-
-#~ msgid "Fund Raising"
-#~ msgstr "筹款"
-
-#~ msgid "Helpdesk Supports"
-#~ msgstr "帮助平台支持"
-
-#~ msgid "Source"
-#~ msgstr "源"
-
-#~ msgid "Convert To Partner"
-#~ msgstr "转为业务伙伴"
-
 #~ msgid "Fields to Change"
 #~ msgstr "更改字段"
 
 #~ msgid "Telesales"
 #~ msgstr "电话销售"
 
-#~ msgid "Stage: "
-#~ msgstr "阶段： "
-
-#~ 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 "触发日期后的推延,  如果你需要一个触发日期前的推延你可以指定一个负数, 如在一个会议提前15分钟发一个提醒."
-
-#~ msgid "Payment Mode"
-#~ msgstr "付款方式"
-
-#~ msgid "Attendee Detail"
-#~ msgstr "与会者详述"
-
-#~ msgid " > Bac +5"
-#~ msgstr " > Bac +5"
-
-#~ msgid "Import ICS File"
-#~ msgstr "导入ICS文件"
-
 #~ msgid "Created"
 #~ msgstr "已创建"
 
-#~ msgid "Lead Information"
-#~ msgstr "营销线索信息"
-
-#~ msgid "Jobs"
-#~ msgstr "招聘"
-
-#~ msgid "Cancel Meeting"
-#~ msgstr "取消会议"
-
-#~ msgid "Employee Email"
-#~ msgstr "员工Email"
-
-#~ msgid "Meeting Cases"
-#~ msgstr "会议业务个案"
-
-#~ msgid "Prospecting"
-#~ msgstr "探查"
-
-#~ msgid "%(case_date)s = Creation date"
-#~ msgstr "%(case_date)s = 创建日期"
-
-#~ msgid "Jobs - Recruitment Form"
-#~ msgstr "职位招聘表格"
-
-#~ msgid "Set case state to"
-#~ msgstr "设业务个案状态为"
-
-#~ msgid "Credit Card"
-#~ msgstr "信用卡"
-
-#~ msgid "Send Email"
-#~ msgstr "发送Email"
-
-#~ msgid "Opportunity Cases"
-#~ msgstr "商机业务个案"
-
-#~ msgid "Corrective"
-#~ msgstr "纠正的"
-
-#~ msgid "Support Query"
-#~ msgstr "支持查询"
-
-#~ msgid "Helpdesk Support"
-#~ msgstr "帮助平台支持"
-
-#~ msgid "Search Jobs"
-#~ msgstr "查询招聘"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr "这也许有助于协会筹款的进程和跟踪"
-
-#~ msgid "Events"
-#~ msgstr "事件"
-
-#~ msgid "Attachment3"
-#~ msgstr "附件3"
-
-#~ msgid ""
-#~ "The minds states allow to define a value scale which representsthe partner "
-#~ "mentality in relation to our services.The scale hasto be created with a "
-#~ "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-#~ msgstr "满意度允许你去定义一个有关我们服务的负责业务伙伴的满意价值尺度, 从0(非常不满意)到10(非常满意)"
-
-#~ msgid ""
-#~ "Allows you to track and manage leads which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr "允许你跟踪和管理营销线索哪个售前请求或联系,  第一次接触客户的需求."
-
-#~ msgid "FreeBusy"
-#~ msgstr "繁忙"
-
-#~ msgid "Attachment2"
-#~ msgstr "附件2"
-
 #~ msgid ""
 #~ "Check this if you want that all documents attached to the case be attached "
 #~ "to the reminder email sent."
 #~ msgstr "勾选此项, 如果你想将业务个案的所有附属文档附在提醒电子邮件发送"
 
-#~ msgid "Cheque"
-#~ msgstr "支票"
-
-#~ msgid "Attachment1"
-#~ msgstr "附件1"
-
-#~ msgid "Degree"
-#~ msgstr "学位"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "without removing it."
-#~ msgstr "如果这有效字段为真, 将允许你隐藏这业务个案而不是删除它."
-
-#~ msgid "To Assign"
-#~ msgstr "分配"
-
-#~ msgid "Candidate Phone"
-#~ msgstr "候选人电话"
-
-#, python-format
-#~ msgid "Please provide Proper URL !"
-#~ msgstr "请提供正确的URL!"
-
-#~ msgid "Recycled"
-#~ msgstr "回收站"
-
-#~ msgid "History of Events"
-#~ msgstr "日志事件"
-
-#~ msgid "Category2 of case"
-#~ msgstr "业务个案分类2"
-
-#~ msgid "Sales"
-#~ msgstr "销售"
-
-#~ msgid "Assigned"
-#~ msgstr "已分配"
-
-#~ msgid "Phonecall Cases"
-#~ msgstr "电话呼叫业务个案"
-
-#, python-format
-#~ msgid "A partner is already existing with the same name."
-#~ msgstr "已经存在有该名称的业务伙伴"
-
-#~ msgid "Gives the sequence order when displaying a list of case rules."
-#~ msgstr "显示业务个案规则时给出序列的顺序"
-
-#~ msgid "All Opportunities"
-#~ msgstr "所有商机"
-
-#~ msgid "PUBLIC"
-#~ msgstr "公开"
-
-#~ msgid "Claim/Action Description"
-#~ msgstr "索赔/ 动作说明"
-
-#~ msgid "Lead Name"
-#~ msgstr "营销线索名称"
-
-#~ msgid "Set Meeting"
-#~ msgstr "设定会议"
-
-#~ msgid "Invalid"
-#~ msgstr "无效"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "业务个案阶段和评估"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "会议日程表"
-
-#~ msgid "Meeting For Leads Generation"
-#~ msgstr "产生的营销线索会议"
-
-#~ msgid "Email Address"
-#~ msgstr "邮件地址"
-
-#~ msgid "Availability (weeks)"
-#~ msgstr "可用(周)"
-
-#~ msgid "Opportunities Tree"
-#~ msgstr "商机树"
-
-#~ msgid "First Interview"
-#~ msgstr "第一次面试"
-
-#~ msgid "This Month"
-#~ msgstr "本月"
-
-#~ msgid "Open Jobs"
-#~ msgstr "待处理的招聘"
-
 #~ msgid "User Responsible"
 #~ msgstr "用户责任"
 
-#~ msgid "All Claims"
-#~ msgstr "所有索赔"
-
-#~ msgid "Server Action"
-#~ msgstr "服务器动作"
-
-#~ msgid "Related Case"
-#~ msgstr "相关业务个案"
-
-#~ msgid "Regex on Communication History"
-#~ msgstr "沟通日志的正则表达式"
-
-#~ msgid "Close Phonecall"
-#~ msgstr "关闭电话呼叫"
-
-#, python-format
-#~ msgid "Email not sent !"
-#~ msgstr "Email没有发送!"
-
-#~ msgid "Demand Draft"
-#~ msgstr "汇票"
-
-#~ msgid "Search Case"
-#~ msgstr "查询业务个案"
-
-#~ msgid "Cases by section, Category and stage"
-#~ msgstr "划分的业务个案, 分类和阶段"
-
-#~ msgid "Funds Form"
-#~ msgstr "款项表格"
-
-#~ msgid "PRIVATE"
-#~ msgstr "私人的"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "远程日程表提供路径"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "招聘流程"
-
-#~ msgid "Lead Source"
-#~ msgstr "营销线索来源"
-
-#~ msgid "Candidate Hired"
-#~ msgstr "雇佣候选人"
-
-#~ msgid "Ok"
-#~ msgstr "确定"
-
-#~ msgid "Goals"
-#~ msgstr "得分"
-
-#~ msgid "In Process"
-#~ msgstr "处理中"
-
-#~ msgid "After-Sale Services"
-#~ msgstr "售后服务"
-
-#~ msgid "Cases by Section and Type"
-#~ msgstr "划分的业务个案和类型"
-
-#~ msgid "File name"
-#~ msgstr "文件名"
-
-#~ msgid "All Jobs Requests"
-#~ msgstr "所有招聘请求"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case rule "
-#~ "without removing it."
-#~ msgstr "如果有效字段为真, 它允许你隐藏这业务个案而不删除它."
-
-#~ msgid ""
-#~ "defines a rule or repeating pattern                                 for "
-#~ "anexception to a recurrence set"
-#~ msgstr "定义异常复发设置的一个规则或重复模式"
-
-#~ msgid "Relevant"
-#~ msgstr "相关的"
-
-#~ msgid "Applied Job"
-#~ msgstr "申请工作"
-
-#~ msgid "Cases by Opportunities and Type"
-#~ msgstr "商机业务个案和类型"
-
-#~ msgid "Import ICS"
-#~ msgstr "导入 ICS"
-
-#~ msgid "Claim Cases"
-#~ msgstr "索赔业务个案"
-
-#~ msgid "Cases by Leads and Stage"
-#~ msgstr "营销线索业务个案和阶段"
-
-#~ msgid "Email-id of the persons whom mail is to be sent"
-#~ msgstr "Emaii- ID是给谁发送的邮件"
-
-#, python-format
-#~ msgid "A partner is already defined on this job request."
-#~ msgstr "业务伙伴已定义这工作要求"
-
 #~ msgid "E-Mail Reminders (includes the content of the case)"
 #~ msgstr "提醒电子邮件(含业务个案内容)"
 
 #~ msgid "Invalid arguments"
 #~ msgstr "无效的参数"
 
-#~ msgid "Generic Wizard"
-#~ msgstr "通用向导"
-
-#~ msgid "Reporting"
-#~ msgstr "报表"
-
-#~ msgid "Expected Salary"
-#~ msgstr "期望工资"
-
-#~ msgid "Send New Mail"
-#~ msgstr "发送新邮件"
-
-#~ msgid "Type of Action"
-#~ msgstr "动作类型"
-
-#~ msgid "Candidate Email"
-#~ msgstr "候选人Email"
-
-#~ msgid "Sales Stage: "
-#~ msgstr "销售阶段: "
-
-#~ msgid "Planned"
-#~ msgstr "计划"
-
-#~ msgid "Customer Office"
-#~ msgstr "客户办公室"
-
-#~ msgid "Lead Subject"
-#~ msgstr "营销线索主题"
-
-#~ msgid "Trensparent"
-#~ msgstr "清晰的"
-
-#~ msgid "My Cases"
-#~ msgstr "我的业务个案"
-
-#~ msgid "Word of mouth"
-#~ msgstr "口头上"
-
 #~ msgid "Mail to partner"
 #~ msgstr "发邮件到业务伙伴"
 
-#~ msgid "Funds Tree"
-#~ msgstr "款项树"
-
 #~ msgid ""
 #~ "A period is the average number of days between two cycle of sale or purchase "
 #~ "for this segmentation. It's mainly used to detect if a partner has not "
@@ -5125,24 +4359,6 @@ msgstr "时事通信"
 #~ "在两个购买或者采购间的平均天数. 它主要用来检查一个业务伙伴没有采购或购买的最长时间. \r\n"
 #~ "如果很长那么我们假设他找了另一个供应商买到了好的货物对我们的满意度下降. 这个功能用在经常性的业务中."
 
-#~ msgid "Search Cases by User"
-#~ msgstr "查询用户的业务个案"
-
-#~ msgid "Meeting With Candidates"
-#~ msgstr "候选人面试"
-
-#~ msgid "All Funds"
-#~ msgstr "所有款项"
-
-#~ msgid "HelpDesk"
-#~ msgstr "帮助平台"
-
-#~ msgid "Arts And Culture"
-#~ msgstr "艺术和文化"
-
-#~ msgid "Qualication"
-#~ msgstr "资格"
-
 #, python-format
 #~ msgid "You must put a Partner eMail to use this action!"
 #~ msgstr "此动作需要业务伙伴的电子邮件地址!"
@@ -5150,18 +4366,6 @@ msgstr "时事通信"
 #~ msgid "Set section to"
 #~ msgstr "设置划分为"
 
-#~ msgid "Lead Details"
-#~ msgstr "营销线索细节"
-
-#~ msgid "Change RRule"
-#~ msgstr "修改规则"
-
-#~ msgid "Cases by Section, Category and Type"
-#~ msgstr "划分的业务个案, 分类和类型"
-
-#~ msgid "Licenced"
-#~ msgstr "取得许可"
-
 #~ msgid "Parent Section"
 #~ msgstr "上级划分"
 
@@ -5173,42 +4377,12 @@ msgstr "时事通信"
 #~ msgid "Child Sections"
 #~ msgstr "子划分"
 
-#~ msgid "Fund Raising Cases"
-#~ msgstr "筹款业务个案"
-
-#~ msgid "Office"
-#~ msgstr "办公室"
-
-#~ msgid "Assign"
-#~ msgstr "分配"
-
-#~ msgid "Healthcare"
-#~ msgstr "医疗保健"
-
 #~ msgid "Conditions on Case Partner"
 #~ msgstr "业务个案业务伙伴条件"
 
 #~ msgid "Section Code"
 #~ msgstr "划分代码"
 
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "机密"
-
-#~ msgid "Meeting date"
-#~ msgstr "会议日期"
-
-#~ msgid "Not fixed"
-#~ msgstr "未解决"
-
-#~ msgid "Content of mail"
-#~ msgstr "邮件内容"
-
-#~ msgid "Internal Notes"
-#~ msgstr "内部备注"
-
-#~ msgid "_Import"
-#~ msgstr "导入(_I)"
-
 #~ msgid ""
 #~ "Check this if you want the rule to send a reminder by email to the user."
 #~ msgstr "勾选此项, 如果你想规定发提醒Email给用户"
@@ -5216,159 +4390,32 @@ msgstr "时事通信"
 #~ msgid "E-Mail Actions"
 #~ msgstr "Email动作"
 
-#~ msgid "Mass Mailing"
-#~ msgstr "群发"
-
-#~ msgid ""
-#~ "If the partner has not purchased (or buied) during a period, decrease the "
-#~ "state of mind by this factor. It's a multiplication"
-#~ msgstr "如果业务伙伴持续一个期间没有购买(或卖), 减少满意度的因子, 这是一个乘法"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "款项分类"
-
-#~ msgid "Cash"
-#~ msgstr "现金"
-
-#~ msgid "Save ICS file"
-#~ msgstr "保存ICS文件"
-
-#~ msgid "Future"
-#~ msgstr "前景"
-
-#~ msgid "Provide path for remote calendar"
-#~ msgstr "提供远程日程表的路径"
-
-#~ msgid "Select ICS file"
-#~ msgstr "选择ICS文件"
-
-#~ msgid "Export ICS File"
-#~ msgstr "输出ICS文件"
-
-#~ msgid "Import Message"
-#~ msgstr "导入消息"
-
-#~ msgid "New Jobs"
-#~ msgstr "新招聘"
-
 #~ msgid "Cases by section"
 #~ msgstr "划分的业务个案"
 
-#~ msgid ""
-#~ "Category related to the section.Subdivide the CRM cases independently or "
-#~ "section-wise."
-#~ msgstr "这划分的业务个案有关的分类, 把这CRM的业务个案独立划分或再划分"
-
 #~ msgid "Case Section"
 #~ msgstr "划分的业务个案"
 
-#~ msgid "Cases by Section, Category and Stage"
-#~ msgstr "划分的业务个案, 分类和阶段"
-
-#~ msgid "Cases by section and stage"
-#~ msgstr "划分的业务个案和阶段"
-
-#~ msgid "Gives the sequence order when displaying a list of case sections."
-#~ msgstr "在显示划分的业务个案列表时提供序列顺序"
-
 #~ msgid ""
 #~ "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 #~ "cases in this section"
 #~ msgstr "这电子邮件地址设定为这划分的业务个案所有'回复'的电子邮件"
 
-#~ msgid ""
-#~ "Section to which Case belongs to. Define Responsible user and Email account "
-#~ "for mail gateway."
-#~ msgstr "属于哪个划分的业务个案. 定义责任用户和电子邮件帐号的邮件网关."
-
-#~ msgid "Cases by Section and Stage"
-#~ msgstr "划分的业务个案和阶段"
-
-#~ msgid "Cases by section and category2"
-#~ msgstr "划分的业务个案和分类2"
-
-#~ msgid "Cases by section, Category and Category2"
-#~ msgstr "划分的业务个案, 分类和分类2"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the case "
-#~ "section without removing it."
-#~ msgstr "如果有效字段为真, 它将允许你隐藏这划分的业务个案而不是删除它"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for your Company address or missing reply address in "
 #~ "section!"
 #~ msgstr "没有您公司的邮箱ID地址或缺少该划分的业务个案的回复地址!"
 
-#~ msgid "Cases by Section and Category2"
-#~ msgstr "划分的业务个案和分类2"
-
 #, python-format
 #~ msgid ""
 #~ "No E-Mail ID Found for the Responsible Partner or missing reply address in "
 #~ "section!"
 #~ msgstr "没有找到负责业务伙伴的邮箱ID或这缺少这业务个案的回复地址"
 
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "错误！你不能创建递归的划分"
-
 #~ msgid "Case section"
 #~ msgstr "划分的业务个案"
 
-#~ msgid "Job Info"
-#~ msgstr "工作信息"
-
-#~ msgid "Pending Jobs"
-#~ msgstr "悬而未决的招聘"
-
-#~ msgid "Are you sure you want to create a partner based on this job request ?"
-#~ msgstr "你确定要创建这业务伙伴的工作请求?"
-
-#~ msgid "Helpdesk Support Tree"
-#~ msgstr "帮助平台支援树"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "管理帮助平台服务"
-
-#~ msgid "Direction"
-#~ msgstr "趋势"
-
-#~ msgid "Sales Stage"
-#~ msgstr "销售阶段"
-
-#~ msgid "Meeting Generic Wizard"
-#~ msgstr "会议通用向导"
-
-#~ msgid "New Business"
-#~ msgstr "新生意"
-
-#~ msgid "Candidate Name2"
-#~ msgstr "候选人姓名2"
-
-#~ msgid "Social Rehabilitation And Rural Upliftment"
-#~ msgstr "社会救援和农村振兴"
-
-#~ msgid ""
-#~ "Helps you to encode the result of a phone call or to plan a list of phone "
-#~ "calls to process."
-#~ msgstr "帮助你编辑一个电话呼叫或计划处理电话呼叫列表"
-
-#~ msgid "Helpdesk Cases"
-#~ msgstr "帮助平台业务个案"
-
-#~ msgid "Save in .ics format"
-#~ msgstr "保存为.ics格式"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "清晰的"
-
-#~ msgid "OPAQUE"
-#~ msgstr "不清晰"
-
-#~ msgid "Delay Close"
-#~ msgstr "推延关闭"
-
 #~ msgid "Delay after trigger date"
 #~ msgstr "触发日期后推延"
 
@@ -5378,14 +4425,5 @@ msgstr "时事通信"
 #~ msgid "Delay type"
 #~ msgstr "推延类型"
 
-#~ msgid "Fund Raising Operations"
-#~ msgstr "筹款运作"
-
-#~ msgid "Employee"
-#~ msgstr "员工"
-
-#~ msgid "Employee's Name"
-#~ msgstr "员工姓名"
-
-#~ msgid "Refused by Employee"
-#~ msgstr "员工拒绝"
+#~ msgid "Mail Campaign 1"
+#~ msgstr "邮件宣传活动1"
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index c076f979214..fd63df31e08 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-27 05:08+0000\n"
+"PO-Revision-Date: 2011-09-27 07:26+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 05:00+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -78,7 +78,7 @@ msgstr "今日"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "選取機會"
+msgstr "選擇機會"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -124,7 +124,7 @@ msgid "The code of the sales team must be unique !"
 msgstr "業務團隊代號不能重覆！"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr "潛在客戶「%s」已轉為機會。"
@@ -141,8 +141,8 @@ msgid "No Repeat"
 msgstr "不重覆"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -184,7 +184,7 @@ msgstr "搜尋機會"
 #, python-format
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
-msgstr "機會要先安排伙伴才可合併。"
+msgstr "機會要先安排伙伴才可與其他機會合併。"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@@ -249,7 +249,7 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Phone Call"
-msgstr "打電話"
+msgstr "致電"
 
 #. module: crm
 #: field:crm.lead,optout:0
@@ -260,7 +260,7 @@ msgstr ""
 #: code:addons/crm/crm_opportunity.py:108
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "「%s」機會已標為丟失。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -309,7 +309,7 @@ msgid ""
 "If you select Merge with existing Opportunity, the lead details(with the "
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
-msgstr ""
+msgstr "如選擇與現有機會合併，潛在客戶之詳情（包括通訊記錄）會與選取之伙伴的現有機會合併。"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -389,7 +389,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "商機會談"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0
@@ -400,7 +400,7 @@ msgstr ""
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "當偵測到真正專案/機會"
 
 #. module: crm
 #: field:crm.installer,crm_fundraising:0
@@ -446,7 +446,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr ""
+msgstr "轉變/合併機會"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -457,7 +457,7 @@ msgstr "更新日期"
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "選擇動作"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -475,7 +475,7 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#機會"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
@@ -495,7 +495,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "機會分析"
 
 #. module: crm
 #: help:crm.meeting,location:0
@@ -525,7 +525,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "與機會的正常或電話會談"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -534,9 +534,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -544,7 +544,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 #, python-format
 msgid "Create Opportunity"
-msgstr ""
+msgstr "建立機會"
 
 #. module: crm
 #: view:crm.installer:0
@@ -631,7 +631,7 @@ msgstr "滿意度調查"
 msgid ""
 "Thick this box if you want that on escalation, the responsible of this sale "
 "team automatically becomes responsible of the lead/opportunity escaladed"
-msgstr ""
+msgstr "如想提升注意級別，勾選此項；此銷售隊伍之負責人會自動成為已提升注意潛在客戶/機會之負責人"
 
 #. module: crm
 #: help:crm.installer,outlook:0
@@ -671,7 +671,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "致電數"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -691,7 +691,7 @@ msgid ""
 "The channels represent the different communication                         "
 "modes available with the customer. With each commercial opportunity, you can "
 "indicate                         the canall which is this opportunity source."
-msgstr ""
+msgstr "渠道代表該顧客之不同通訊模式。對於每個商機，您可指明此機會來源之管道。"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
@@ -720,7 +720,7 @@ msgstr ""
 #. module: crm
 #: view:res.users:0
 msgid "Current Activity"
-msgstr "目前活動"
+msgstr "當前動態"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -803,8 +803,8 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -835,7 +835,7 @@ msgstr "停止處理"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "搜尋致電"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -953,7 +953,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "轉變為機會 "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -1016,7 +1016,7 @@ msgstr "三月"
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "「%s」機會已結束。"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -1033,7 +1033,7 @@ msgstr "將時間顯示為"
 #: view:crm.phonecall2partner:0
 #, python-format
 msgid "Create Partner"
-msgstr ""
+msgstr "建立伙伴"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1056,7 +1056,7 @@ msgstr ""
 #, python-format
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
-msgstr ""
+msgstr "「%s」伙伴並無「開放」或「待處理」之機會。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1080,7 +1080,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1105,7 +1105,7 @@ msgstr ""
 #: 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
@@ -1128,7 +1128,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
-msgstr ""
+msgstr "已結束/已取消之致電不能轉為機會"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1353,7 +1353,7 @@ msgstr "已處理最大伙伴ID"
 #: 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
@@ -1493,7 +1493,7 @@ msgstr ""
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "機會摘要"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1584,7 +1584,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "合併兩個機會"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -1611,7 +1611,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "致電分類"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1804,7 +1804,7 @@ msgstr "上級團隊"
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "下個動作日期"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1850,7 +1850,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "致電"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2070,7 +2070,7 @@ 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:375
@@ -2331,7 +2331,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: view:res.partner:0
 msgid "Phone Calls"
-msgstr ""
+msgstr "致電"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0
@@ -2358,7 +2358,7 @@ msgstr "活躍"
 #: code:addons/crm/crm_lead.py:306
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "機會階段已由「%s」變為「%s」。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:282
@@ -2414,7 +2414,7 @@ msgstr ""
 #: field:crm.lead2partner,action:0
 #: field:crm.phonecall2partner,action:0
 msgid "Action"
-msgstr ""
+msgstr "動作"
 
 #. module: crm
 #: field:crm.installer,crm_claim:0
@@ -2544,7 +2544,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "我的開放機會"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
@@ -2582,10 +2582,10 @@ msgid "Meeting Type"
 msgstr "會議類型"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr "與既有機會合併"
+msgstr "與現有機會合併"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2714,7 +2714,7 @@ msgstr ""
 #: 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
@@ -3092,8 +3092,8 @@ msgid "Schedule Call"
 msgstr "安排致電"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
@@ -3485,7 +3485,7 @@ msgstr "各階段機會"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "安排致電"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3564,7 +3564,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr "合併至機會：%s"
+msgstr "已合併至機會: %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:347
@@ -3584,7 +3584,7 @@ msgstr "分類化"
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "動作規則"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
@@ -3594,7 +3594,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "致電"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -3763,7 +3763,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "與現有機會合併"
 
 #. module: crm
 #: field:crm.meeting,select1:0
@@ -3816,7 +3816,7 @@ msgstr ""
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "致電"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 58bf599fb93..24f48e7de86 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -47,38 +47,48 @@ MONTHS = [
 ]
 
 class crm_lead_report(osv.osv):
-    """ CRM Lead Report """
+    """ CRM Lead Analysis """
     _name = "crm.lead.report"
     _auto = False
-    _description = "CRM Lead Report"
+    _description = "CRM Lead Analysis"
+    _rec_name = 'deadline_day'
 
     _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'country_id':fields.many2one('res.country', 'Country', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
-        'channel_id':fields.many2one('res.partner.canal', 'Channel', readonly=True),
-        'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'creation_month':fields.selection(MONTHS, 'Creation Date', readonly=True),
-        'deadline_month':fields.selection(MONTHS, 'Exp. Closing', readonly=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'create_date': fields.datetime('Create Date', readonly=True, select=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'email': fields.integer('# Emails', size=128, readonly=True),
+        # grouping fields based on Deadline Date
+        'deadline_year': fields.char('Ex. Closing Year', size=10, readonly=True, help="Expected closing year"),
+        'deadline_month':fields.selection(MONTHS, 'Exp. Closing Month', readonly=True, help="Expected closing month"),
+        'deadline_day': fields.char('Exp. Closing Day', size=10, readonly=True, help="Expected closing day"),
+
+        # grouping fields based on Create Date
+        'creation_year': fields.char('Creation Year', size=10, readonly=True, help="Creation year"),
+        'creation_month': fields.selection(MONTHS, 'Creation Month', readonly=True, help="Creation month"),
+        'creation_day': fields.char('Creation Day', size=10, readonly=True, help="Creation day"),
+
+        # other date fields
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'opening_date': fields.date('Opening Date', readonly=True),
+        'date_closed': fields.date('Close Date', readonly=True),
+
+        # durations
         'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
         'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
+
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'country_id':fields.many2one('res.country', 'Country', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
+        'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True),
+        'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'email': fields.integer('# Emails', size=128, readonly=True),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type', '=', 'lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('section_ids', '=', section_id)]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
-        'opening_date': fields.date('Opening Date', readonly=True, select=True),
-        'creation_date': fields.date('Creation Date', readonly=True, select=True),
-        'date_closed': fields.date('Close Date', readonly=True, select=True),
         'nbr': fields.integer('# of Cases', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
@@ -87,6 +97,10 @@ class crm_lead_report(osv.osv):
             ('opportunity','Opportunity'),
         ],'Type', help="Type is used to separate Leads and Opportunities"),
     }
+    
+    
+    
+    
     def init(self, cr):
 
         """
@@ -98,13 +112,18 @@ class crm_lead_report(osv.osv):
             CREATE OR REPLACE VIEW crm_lead_report AS (
                 SELECT
                     id,
-                    to_char(c.date_deadline, 'YYYY') as name,
+
+                    to_char(c.date_deadline, 'YYYY') as deadline_year,
                     to_char(c.date_deadline, 'MM') as deadline_month,
-                    to_char(c.date_deadline, 'YYYY-MM-DD') as day,
+                    to_char(c.date_deadline, 'YYYY-MM-DD') as deadline_day,
+
+                    to_char(c.create_date, 'YYYY') as creation_year,
                     to_char(c.create_date, 'MM') as creation_month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
+                    to_char(c.create_date, 'YYYY-MM-DD') as creation_day,
+
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
+
                     c.state,
                     c.user_id,
                     c.probability,
@@ -121,7 +140,7 @@ class crm_lead_report(osv.osv):
                     c.planned_revenue,
                     c.planned_revenue*(c.probability/100) as probable_revenue,
                     1 as nbr,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id AND history=True) AS email,
+                    (SELECT count(id) FROM mail_message WHERE model='crm.lead' AND res_id=c.id AND email_from is not null) AS email,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
                     abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as  delay_expected,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index a864570461c..32fbe65c337 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,7 +10,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Leads Analysis">
-                <field name="name" invisible="1"/>
+                <field name="creation_year" invisible="1"/>
+                <field name="creation_month" invisible="1"/>
+                <field name="creation_day" invisible="1"/>
+                <field name="deadline_month" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
@@ -18,14 +21,11 @@
                 <field name="channel_id" invisible="1"/>
                 <field name="type" invisible="1"/>
                 <field name="priority" invisible="1"/>
-                <field name="creation_month" invisible="1"/>
-                <field name="deadline_month" invisible="1"/>
                 <field name="section_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
-                <field name="day" invisible="1"/>
                 <field name="nbr" sum="# Leads"/>
                 <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
@@ -71,31 +71,37 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group col="20" colspan="8">
+                    <group>
+                        <filter string="Year" icon="terp-go-year" name="year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Leads/Opportunities created in current year"/>
+                        <separator orientation="vertical" />
+                        <filter string="Month" icon="terp-go-month" name="this_month"
+                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Leads/Opportunities created in current month"/>
+                        <filter icon="terp-go-month" string="Month-1"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Leads/Opportunities created in last month"/>
+                        <separator orientation="vertical" />
                         <filter icon="terp-personal"
+                            name="lead"
                             string="Lead"
                             domain="[('type','=', 'lead')]"
                             help="Show only lead"/>
                         <filter icon="terp-personal+"
                             string="Opportunity"
+                            name="opportunity"
                             domain="[('type','=','opportunity')]"
                             help="Show only opportunity"/>
                         <separator orientation="vertical" />
-                        <filter string="  Year  " icon="terp-go-year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in current year"/>
-                        <filter string="   Month   " icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in last month"/>
-
-                        <separator orientation="vertical" />
                         <filter icon="terp-check"
-                            string="Active"
-                            domain="[('state','in',('draft','open'))]"
-                            help="Leads/Opportunities which are in draft and open state"/>
+                            string="New"
+                            domain="[('state','=','draft')]"
+                            help="Leads/Opportunities which are in New state"/>
+                        <filter icon="terp-camera_test"
+                            string="Open"
+                            domain="[('state','=','open')]"
+                            help="Leads/Opportunities which are in open state"/>
                         <filter icon="gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"
@@ -121,14 +127,14 @@
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('type', '=', 'lead')]" />
+                        <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
                         <field name="categ_id" widget="selection"/>
                         <field name="type_id" widget="selection"/>
                         <field name="channel_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <newline/>
-                        <field name="creation_date"/>
+                        <field name="create_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
@@ -158,8 +164,13 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
-                        <filter string="Creation Date" icon="terp-go-month"
+                        <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'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Exp. Closing"  icon="terp-go-month"
                             domain="[]" context="{'group_by':'deadline_month'}"/>
                     </group>
@@ -174,15 +185,15 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Opportunities Analysis">
-                <field name="name" invisible="1"/>
+            <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " string="Opportunities Analysis">
+                <field name="creation_year" invisible="1"/>
                 <field name="creation_month" invisible="1"/>
+                <field name="creation_day" invisible="1"/>
                 <field name="deadline_month" invisible="1"/>
                 <field name="section_id" invisible="1" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
-                <field name="day" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="priority"  invisible="1"/>
@@ -209,7 +220,7 @@
            <field name="name">Leads Analysis</field>
            <field name="res_model">crm.lead.report</field>
            <field name="view_type">form</field>
-           <field name="context">{'search_default_filter_lead': 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_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
            <field name="view_mode">tree,graph</field>
            <field name="domain">[]</field>
            <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
@@ -231,9 +242,8 @@
             <field name="name">Opportunities Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_filter_opportunity":1, "search_default_opportunity": 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_opportunity":1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'opportunity')]</field>
             <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
         </record>
 
@@ -256,7 +266,6 @@
             parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-            groups="base.group_extended"
             parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index f68bea03880..ef3bcccdc9a 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -99,3 +99,5 @@ class crm_phonecall_report(osv.osv):
                     crm_phonecall c
             )""")
 crm_phonecall_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index acc91cbef41..e171388d08f 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -51,16 +51,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
-                           <filter string="  Year  " icon="terp-go-year"
+                  <group>
+                        <filter string="Year" icon="terp-go-year" name="year"
                                domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                                help="Phone calls made in current year"/>
-
-                       <filter string="   Month   " icon="terp-go-month" name="This Month"
+                        <separator orientation="vertical" />
+                        <filter string="Month" icon="terp-go-month" name="This Month"
                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Phone calls made in current month"/>
-
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                        <filter icon="terp-go-month" string="Month-1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
                         <separator orientation="vertical" />
@@ -84,7 +83,7 @@
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
                         </field>
-                        <field name="user_id" string="Salesman" select="1">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -135,7 +134,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_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</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="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_partner.py b/addons/crm/res_partner.py
index c2651b14c8e..cbb05ee3e74 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -25,6 +25,7 @@ class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
     _columns = {
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
             'Leads and Opportunities'),
         'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 659ef075b7f..79b8bebb55d 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -2,8 +2,50 @@
 <openerp>
     <data>
 
-         <!--  Partners inherited form -->
+        <!-- Add section_id (Sales Team) to res.partner -->
+        <record id="view_partners_form_crm1" model="ir.ui.view">
+                <field name="name">view.res.partner.form.crm.inherited1</field>
+                <field name="model">res.partner</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="base.view_partner_form"/>
+                <field eval="18" name="priority"/>
+                <field name="arch" type="xml">
+                    <field name="user_id" position="after">
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
+                    </field>
+                </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="type">tree</field>
+                <field name="inherit_id" ref="base.view_partner_tree"/>
+                <field eval="18" name="priority"/>
+                <field name="arch" type="xml">
+                    <field name="country" position="after">
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
+                    </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="type">search</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" widget="selection"
+                            groups="base.group_extended"/>
+                    </field>
+                </field>
+        </record>
+
+        <!-- Add History tabs to res.partner form -->
         <record id="view_crm_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.crm.info.inherit1</field>
             <field name="model">res.partner</field>
@@ -11,7 +53,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="History" position="inside">
-                    <field name="opportunity_ids" colspan="4" nolabel="1" context="{'default_partner_id': active_id}">
+                    <field name="opportunity_ids" colspan="4" nolabel="1">
                          <tree string="Leads and Opportunities"  colors="blue:state=='pending';gray:state=='cancel'">
                              <field name="create_date"/>
                              <field name="name"/>
@@ -42,7 +84,7 @@
                                  icon="gtk-go-up" />
                          </tree>
                     </field>
-                    <field name="meeting_ids" colspan="4" nolabel="1"  context="{'default_partner_id': active_id}">
+                    <field name="meeting_ids" colspan="4" nolabel="1">
                         <tree string="Meetings" colors="gray:state in ('draft', 'cancel','done','pending')">
                             <field name="user_id" string="Responsible"/>
                             <field name="name" string="Subject" />
@@ -50,7 +92,7 @@
                             <field name="date_deadline" string="End Date"/>
                         </tree>
                     </field>
-                    <field name="phonecall_ids" colspan="4" nolabel="1" context="{'default_partner_id': active_id}">
+                    <field name="phonecall_ids" colspan="4" nolabel="1">
                         <tree string="Phone Calls" colors="gray:state in ('draft', 'cancel','done','pending')">
                             <field name="date" string="Date"/>
                             <field name="name" string="Call Summary"/>
@@ -66,6 +108,9 @@
                 </page>
             </field>
         </record>
+
+
+
     </data>
 </openerp>
 
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 4aa68a6625c..4ea07252276 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -3,6 +3,8 @@
 "access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0
 "access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1
 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
+"access_crm_case_channel_user","crm.case.channel user","model_crm_case_channel","base.group_sale_salesman",1,0,0,0
+"access_crm_case_channel_manager","crm.case.channel manager","model_crm_case_channel","base.group_sale_manager",1,1,1,1
 "access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
 "access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
@@ -27,21 +29,20 @@
 "access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
 "access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
 "access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
-"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","base.group_sale_manager",1,0,0,0
-"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","base.group_sale_manager",1,1,1,1
+"mail_mail_message_manager","mail.message.manager","mail.model_mail_message","base.group_sale_manager",1,0,0,0
+"mail_thread_manager","mail.thread.manager","mail.model_mail_thread","base.group_sale_manager",1,1,1,1
 "access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
 "access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
 "access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
 "access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
 "access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
-"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","base.group_sale_salesman",1,1,1,1
-"mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
+"mail_mailgate_thread","mail.thread","mail.model_mail_thread","base.group_sale_salesman",1,1,1,1
+"mail_gateway_mail_message_user","mail.message.user","mail.model_mail_message","base.group_sale_salesman",1,1,1,1
 "access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
 "access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
 "access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
 "access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
 "access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
-"access_res_partner_canal_manager","res.partner.canal.manager","base.model_res_partner_canal","base.group_sale_manager",1,1,1,1
-"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,1,1,1
+"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,0,0,0
 "access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1
 "access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 52472a9d9e8..d5d3c6b933b 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -1,11 +1,9 @@
--  |
-   In order to test the CRM in OpenERP,
-   I will do a customer qualification process that
-   starts with a fist contact with a customer (a lead), which will be converted to a
-   business opportunity and a partner.
--  |
-   In order to test the flow, I create a two new users "user_crm" and
-   I assign the group "salesman".
+-
+   In order to test the CRM in OpenERP, I will do a customer qualification
+   process that starts with a fist contact with a customer (a lead), which will
+   be converted to a business opportunity and a partner.
+-
+   I create a two new users "user_crm" and I assign the group "salesman".
 -
    !record {model: res.users, id: res_users_usercrm0}:
      company_id: base.main_company
@@ -25,26 +23,36 @@
      email_from: info@mycustomer.com
      name: New Customer
      partner_name: Capegemini
+     partner_id: base.res_partner_9
      phone: (855) 924-4364
      mobile: (333) 715-1450
      section_id: crm.section_sales_department
      referred: False
 -  |
-   I check that the lead is in 'draft' state,
+   I check that the lead is in 'draft' state.
 -
    !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in Draft}:
      - state == "draft"
 -
-   I open lead by click on "Open" button,
+   I open lead by click on "Open" button.
 -
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
+     fields={
+            'day_open': 0.0,
+            'day_close': 0.0
+            }
+     self._compute_day(cr, uid, [ref("crm_lead_newcustomer0")], fields, context)
 - |
   I check that lead is now in 'open' state.
 -
   !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
      - state == "open"
-
+-
+   I search id for case object.
+-
+   !python {model: crm.case.categ}: |
+     self._find_object_id(cr, uid, context)
 -  |
    As the lead seems to be a real business opportunity, I will convert it to a
    partner
@@ -56,16 +64,38 @@
      assert action['res_model'] == 'crm.lead2opportunity.partner'
 -
    |
-   Now, select "create a new partner" option in this wizard.
+   I select "create a new partner" option.
 -
    !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_0}:
       action: 'create'
       name: 'convert'
 -
-  Then, Click on "Create Opportunity" button of this wizard.
+  Then, Click on "Create Opportunity" button.
 -
    !python {model: crm.lead2opportunity.partner}: |
       self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
+-
+   |
+   I select "Link to an existing partner" option.
+-
+   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
+      action: 'exist'
+-
+  Then, Click on "Create Opportunity" button.
+-
+   !python {model: crm.lead2opportunity.partner}: |
+      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
+-
+   |
+   I select "Do not link to a partner" option.
+-
+   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}:
+      action: 'nothing'
+-
+  Then, Click on "Create Opportunity" button.
+-
+   !python {model: crm.lead2opportunity.partner}: |
+      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_2")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
 -  |
    In order to check the opportunity is created or not, I check type.
 -
@@ -73,6 +103,39 @@
     lead = self.browse(cr, uid, ref("crm_lead_newcustomer0"))
     assert lead.type == 'opportunity'
 
+-
+  I create mass report of lead to opprtunity partner.
+-
+  !record {model: crm.lead2opportunity.partner.mass, id: crm_lead2opportunity_partner_mass0}:
+    user_ids:
+      - base.user_root
+    section_id: crm.section_sales_department
+-
+  Then, execute that mass wizard.
+-
+   !python {model: crm.lead2opportunity.partner.mass}: |
+      self.mass_convert(cr, uid, [ref("crm_lead2opportunity_partner_mass0")],{'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
+-
+   I close lead by click on "close" button.
+-
+   !python {model: crm.lead}: |
+     self.case_close(cr, uid, [ref("crm_lead_newcustomer0")])
+- |
+  I check that lead is now in 'done' state.
+-
+  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in done state}:
+     - state == "done"
+-
+  I cancel lead by click on "cancel" button.
+-
+   !python {model: crm.lead}: |
+     self.case_cancel(cr, uid, [ref("crm_lead_newcustomer0")])
+- |
+  I check that lead is now in 'cancel' state.
+-
+  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in cancel state}:
+     - state == "cancel"
+
 #-
 #  |
 #  yaml is also not working with smtp server and send new email.
@@ -89,4 +152,3 @@
 - |
   I Reply to last Email to lead with some document attached.and check that communication history generated or not.
 
-
diff --git a/addons/crm/test/test_crm_lead_case2.yml b/addons/crm/test/test_crm_lead_case2.yml
new file mode 100644
index 00000000000..23a654d31a8
--- /dev/null
+++ b/addons/crm/test/test_crm_lead_case2.yml
@@ -0,0 +1,151 @@
+-
+   In order to do complete test the CRM in OpenERP,
+   I will create new full configured record and carry test on it.
+-  |
+   I Start by creating "Test Sales Team" with No Unlink.
+   I create a crm.case.section record.
+-
+  !record {model: crm.case.section, id: crm_case_section_demosalesteam}:
+    code: DEMO
+    complete_name: Test Sales Team
+    name: Test Sales Team
+    allow_unlink: False
+    member_ids:
+      - base.user_admin
+    stage_ids:
+      - crm.stage_lead1
+      - crm.stage_lead2
+      - crm.stage_lead3
+      - crm.stage_lead4
+      - crm.stage_lead5
+      - crm.stage_lead6
+    working_hours: 0.0
+    resource_calendar_id: resource.timesheet_group1
+    parent_id: crm.section_sales_department
+-
+   I assign segmentation.
+-
+   !record {model: res.users, id: res_users_usercrm0}:
+     context_section_id: crm_case_section_demosalesteam
+-  |
+   I create a new lead "Test Customer" and I provide an address to this
+   demo customer and email "info@democustomer.com" and Also "Test Sales Team".
+-
+   !record {model: crm.lead, id: crm_lead_democustomer}:
+     email_from: info@democustomer.com
+     name: Test Customer
+     partner_name: NotSoTinySARL
+     phone: (+32).81.81.37.00
+     mobile: (+32).81.81.37.00
+     section_id: crm_case_section_demosalesteam
+     referred: False
+     type: lead
+-
+   I check that the lead is in 'draft' state.
+-
+   !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Draft}:
+     - state == "draft"
+-
+   I create categories.
+-
+   !record {model: crm.case.categ, id: crm_case_categ0}:
+     name: crm_case_section_demosalesteam
+     section_id: crm_case_section_demosalesteam
+-
+  I assigning contact detail to the Lead "Test Customer" without address.
+-
+  !python {model: crm.lead}: |
+    self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), None, email=False)
+
+-
+  I assigning contact detail to the Lead "Test Customer" with address.
+-
+  !python {model: crm.lead}: |
+    self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), ref("base.res_partner_address_notsotinysarl0"), email=False)
+
+-
+  I selecting email "Opt-out" option for the "Test Customer" Lead.
+-
+  !python {model: crm.lead}: |
+    self.on_change_optout(cr, uid, ref("crm_lead_democustomer"), True)
+
+-
+  I change the Opt-out to Opt-in to show email receive preference.
+-
+  !python {model: crm.lead}: |
+    self.on_change_optin(cr, uid, ref("crm_lead_democustomer"), True)
+-
+   I open lead by click on "Open" button.
+-
+   !python {model: crm.lead}: |
+     self.case_open(cr, uid, [ref("crm_lead_democustomer")])
+-
+  I check that lead "Test Customer" is now in 'open' state.
+-
+  !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in open state}:
+     - state == "open"
+-
+  I reset the lead "Test Customer".
+-
+    !python {model: crm.lead}: |
+      self.case_reset(cr, uid, [ref("crm_lead_democustomer")])
+-
+   I again opening lead by click on "Open" button.
+-
+   !python {model: crm.lead}: |
+     self.case_open(cr, uid, [ref("crm_lead_democustomer")])
+-
+  I setting stage "New" for the lead "Test Customer".
+-
+   !python {model: crm.lead}: |
+     self.stage_next(cr, uid, [ref("crm_lead_democustomer")], context={'stage_type': 'lead'})
+-
+  I try to Unlink the Lead "Test Customer" demo Lead.
+-
+   !python {model: crm.lead}: |
+    try:
+      self.unlink(cr, uid, [ref("crm_lead_democustomer")])
+    except:
+      pass
+-
+   I setting Lead "Test Customer" to Pending State.
+-
+    !python {model: crm.lead}: |
+      self.case_pending(cr, uid, [ref("crm_lead_democustomer")])
+-
+  I check that lead "Test Customer" is now in 'Pending' state.
+-
+  !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Pending state}:
+     - state == "pending"
+-
+  I Escalate the Lead "Test Customer" Parent "Sales Team".
+-
+    !python {model: crm.lead}: |
+      self.case_escalate(cr, uid, [ref("crm_lead_democustomer")])
+-
+  I add Internal Note Saying Escalated Reason.
+-
+  !record {model: crm.add.note, id: crm_add_note_0}:
+    body: Sales Lead Has Been Escalated Due to Some Technical reason to the parent  'Sales
+      Team'
+    state: unchanged
+-
+  I click a note button to attach the record.
+-
+  !python {model: crm.add.note}: |
+    context['active_model'] = "crm.lead"
+    context['active_ids'] = [ref("crm_lead_democustomer")]
+    self.action_add(cr, uid, [ref("crm_add_note_0")], context=context)
+
+-
+  I Copying this lead "Test Customer" to New Lead.
+-
+    !python {model: crm.lead}: |
+      self.copy(cr, uid, ref("crm_lead_democustomer"))
+-
+  I checking the Lead Copied or Not.
+-
+    !python {model: crm.lead}: |
+      sid = self.search(cr, uid, [('name', '=', 'Test Customer'),('state', '=', 'draft')])
+      if not sid:
+        raise AssertionError("Lead is not copied Successfully")
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index 9b89fff697b..1aee11463dd 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -1,9 +1,9 @@
 - |
-  Now I will test Meetings which may be customer meeting or phonecall meeting or
+  I will test Meetings which may be customer meeting or phonecall meeting or
   internal Meeting.
 - |
-  I start by creating a new Meeting.     
-- 
+  I start by creating a new Meeting.
+-
   !record {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
     categ_id: crm.categ_meet2
     date: !eval time.strftime('%Y-%m-%d 16:04:00')
@@ -18,14 +18,14 @@
     section_id: crm.section_sales_department
 - |
   I check that the Meetings is in 'UnConfirmed' state.
--       
+-
   !assert {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
-     - state == "draft" 
+     - state == "draft"
 - |
-  I can set reminder on meeting if I put reminder "40 minutes before" 
+  I can set reminder on meeting if I put reminder "40 minutes before" .
 - |
   For that, I first create alarm.
-- 
+-
   !record {model: res.alarm, id: res_alarm_minituesbefore0}:
     name: 40 minutes before
     trigger_duration: 40
@@ -33,51 +33,51 @@
     trigger_occurs: before
     trigger_related: start
 - |
-  Now I will assign this reminder. 
-  
+  I will assign this reminder.
+
 - !python {model: crm.meeting}: |
      self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'alarm_id': ref("res_alarm_minituesbefore0")})
 - |
   In order to check recurrence on meetings I will set Recurrency to Custom
-  and I set the fields so that the meeting will occur weekly on Monday and Friday 10 times
+  and I set the fields so that the meeting will occur weekly on Monday and Friday 10 times.
 -
   !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref("crm_meeting_regardingpresentation0")], {'fr': 1, 'mo': 1, 'th': 1, 'tu': 1, 'we':1,   'count':10, 'interval': 1, 'rrule_type': 'weekly'})
-      
+     self.write(cr, uid, [ref("crm_meeting_regardingpresentation0")], {'fr': 1, 'mo': 1, 'th': 1, 'tu': 1, 'we':1,   'count':10, 'interval': 1, 'rrule_type': 'weekly', 'recurrency' : True})
+
 - |
   I can see from the calendar view that the meeting is scheduled on Monday and Friday
-  for 10 times,
-  
+  for 10 times.
+
 -
   !python {model: crm.meeting}: |
     self.fields_view_get(cr, uid, False, 'calendar', context)
-- | 
+- |
   I will search for one of the recurrent event and count the number of meeting.
 -
   !python {model: crm.meeting}: |
      import time
      from datetime import datetime, date, timedelta
      ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Regarding Presentation')], context={'virtual_id': True})
-     assert len(ids) == 10      
+     assert len(ids) == 10
 
 - |
-  Now If I want to edit meetings information for all occurrence I click on "Edit All" button.
+  If I want to edit meetings information for all occurrence I click on "Edit All" button.
 -
   !python {model: crm.meeting}: |
      self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'edit_all':'True'},context)
-- |   
-  I can see that new meeting form is opened with same value
-  I change some data for meeting and save it
-  I can see from meeting's calendar view that all meeting occurrences are changed accordingly
-- 
+- |
+  I can see that new meeting form is opened with same value.
+  I change some data for meeting and save it.
+  I can see from meeting's calendar view that all meeting occurrences are changed accordingly.
+-
   !record {model: crm.meeting, id: crm.crm_meeting_regardingpresentation0}:
     alarm_id: base_calendar.alarm9
     rrule_type: weekly
 
-- | 
+- |
   In order to invite people for this meetings, I click on "Invite People" button
-  I can invite internal user. 
-- 
+  I can invite internal user.
+-
   !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
     type: internal
     send_mail: False
@@ -85,13 +85,13 @@
     user_ids:
       - base.user_demo
 -
-  I click on "Invite" button of "Invite attendee" wizard.    
+  I click on "Invite" button of "Invite attendee" wizard.
 -
   !python {model: base_calendar.invite.attendee}: |
-    self.do_invite(cr, uid, [ref('base_calendar_invite_attendee_0')], {'active_id': ref('crm_meeting_regardingpresentation0'), 'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}) 
+    self.do_invite(cr, uid, [ref('base_calendar_invite_attendee_0')], {'active_id': ref('crm_meeting_regardingpresentation0'), 'model' : 'crm.meeting', 'attendee_field':'attendee_ids'})
 
 - |
-  After direct/indirect confirmation for meetings I can confirm meeting   
+  After direct/indirect confirmation for meetings I can confirm meeting.
 -
   !python {model: crm.meeting}: |
     self.case_open(cr, uid, [ref('crm_meeting_regardingpresentation0')])
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index 29300bcf111..734a1cae46c 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -8,21 +8,20 @@
     partner_address_id: base.res_partner_address_1
     partner_id: base.res_partner_9
     probability: 1.0
-    stage_id: crm.stage_opportunity1
+    stage_id: crm.stage_lead1
     categ_id: crm.categ_oppor2
     section_id: crm.section_sales_department
-
 -  |
    I check that the opportunity is in 'New' state.
 -
    !assert {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
      - state == "draft"
--  |
-   I open opportunity by click on "Open" button,
--
-   !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
 
+- |
+  I  check that phonecall record is created for that opportunity.
+-
+  !python {model: crm.phonecall}: |
+    phone_obj = self.pool.get('crm.phonecall')
 -  |
    I schedule Meeting on this current opportunity by clicking on "schedule
    Meeting".
@@ -33,7 +32,7 @@
 -  |
    I can see that Meeting's calendar view is shown.
    then I click on the date on which I want to schedule meeting.
-   I fill proper data for that meeting and save it
+   I fill proper data for that meeting and save it.
 -
   !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}:
     date: !eval time.strftime('%Y-%m-%d 00:00:00')
@@ -51,13 +50,13 @@
   I click on "schedule call" button and select planned date for the call.
 -
   !record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}:
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')" 
+    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')"
     name: 'ABC FUEL CO 829264 - 10002 units'
     section_id: crm.section_sales_department
     user_id: base.user_demo
     categ_id: crm.categ_phone1
 - |
-  schedule phonecall by apply (action_apply)function of opportunity2phoncall wizard
+  schedule phonecall by opportunity2phoncall wizard.
 -
   !python {model: crm.opportunity2phonecall}: |
       self.action_apply(cr, uid, [ref('crm_opportunity2phonecall_abcfuelcounits0')], {'active_ids': [ref("crm_opportunity_abcfuelcounits0")]})
@@ -72,10 +71,43 @@
   I can see phonecall record after click on "Schedule call" wizard.
 -
   !record {model: crm.phonecall, id: crm_phonecall_abcfuelcounits0}:
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')" 
+    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')"
     duration: 3.0
     name: 'ABC FUEL CO 829264 - 10002 units'
     partner_address_id:  base.res_partner_address_1
     partner_id:  base.res_partner_9
     section_id: crm.section_sales_department
-
+- |
+  I Merge the opportunities.
+-
+  for that create two opportunities first opportunity 'Test FUEL CO'.
+-
+   !record {model: crm.lead, id: crm_opportunity_1}:
+    email_from: info@balmerinc.be
+    name: 'Test FUEL CO 829264 - 10002 units'
+    partner_address_id: base.res_partner_address_1
+    partner_id: base.res_partner_9
+    probability: 1.0
+    stage_id: crm.stage_lead1
+    categ_id: crm.categ_oppor2
+    section_id: crm.section_sales_department
+-
+  I create the opportunity 'FUEL CO'.
+-
+   !record {model: crm.lead, id: crm_opportunity_2}:
+    email_from: info@balmerinc.be
+    name: 'FUEL CO 829264 - 10002 units'
+    partner_address_id: base.res_partner_address_1
+    partner_id: base.res_partner_9
+    probability: 1.0
+    stage_id: crm.stage_lead1
+    categ_id: crm.categ_oppor2
+    section_id: crm.section_sales_department
+-  |
+   I Merge two Opportunities.
+-
+   !python {model: crm.merge.opportunity}: |
+    op_list = [ref('crm_opportunity_1'),ref('crm_opportunity_2')]
+    op_ids=self.pool.get('crm.lead').browse(cr,uid,op_list)
+    lead_ids = [ref('crm_lead_newcustomer0')]
+    self.merge(cr, uid, op_ids, {'lead_ids': lead_ids})
diff --git a/addons/crm/test/test_crm_opportunity_case2.yml b/addons/crm/test/test_crm_opportunity_case2.yml
new file mode 100644
index 00000000000..dc0dbe517f1
--- /dev/null
+++ b/addons/crm/test/test_crm_opportunity_case2.yml
@@ -0,0 +1,45 @@
+-  |
+  I start by creating a new Opportunity. And I select partner for opportunity.
+  I can see that after selecting partner his contact and email is automatically filled.
+-
+  !record {model: crm.lead, id: crm_opportunity_demotestopportunity}:
+    email_from: info@balmerinc.be
+    name: 'Demo Test Opportunity'
+    partner_address_id: base.res_partner_address_1
+    partner_id: base.res_partner_9
+    probability: 1.0
+    categ_id: crm.categ_oppor2
+    section_id: crm.section_sales_department
+    type: opportunity
+-
+  I check that the opportunity is in 'New' state.
+-
+  !assert {model: crm.lead, id: crm_opportunity_demotestopportunity, string: Opportunity in Draft}:
+    - state == "draft"
+-
+  I open opportunity by click on "Open" button.
+-
+  !python {model: crm.lead}: |
+    self.case_open(cr, uid, [ref("crm_opportunity_demotestopportunity")])
+-
+  I change partner of the  opportunity.
+-
+  !python {model: crm.lead}: |
+    self.onchange_partner_id(cr, uid, [ref("crm_opportunity_demotestopportunity")], ref("base.res_partner_agrolait"))
+
+-
+  I change Contact Detail of the  opportunity.
+-
+  !python {model: crm.lead}: |
+    self.onchange_partner_address_id(cr, uid,[ref("crm_opportunity_demotestopportunity")], ref("base.res_partner_address_8invoice"))
+
+-
+  I change Opportunity to Won State.
+-
+  !python {model: crm.lead}: |
+    self.case_mark_won(cr, uid, [ref("crm_opportunity_demotestopportunity")])
+-
+  I check that the opportunity is in 'Done' state.
+-
+  !assert {model: crm.lead, id: crm_opportunity_demotestopportunity, string: Opportunity is Won}:
+    - state == "done"
diff --git a/addons/crm/test/test_crm_partner2opportunity.yml b/addons/crm/test/test_crm_partner2opportunity.yml
new file mode 100644
index 00000000000..fe026074f4f
--- /dev/null
+++ b/addons/crm/test/test_crm_partner2opportunity.yml
@@ -0,0 +1,25 @@
+- |
+  I start by creating a new opportunity from partner.
+-
+  !record {model: crm.partner2opportunity, id: crm_partner2opportunity_id_0}:
+    name: test
+    planned_revenue: 0.0
+    partner_id:  base.res_partner_9
+    probability: 0.0
+-
+  I click on "Create Opportunity" button of this wizard.
+-
+  !python {model: crm.partner2opportunity}: |
+    fields = {
+             'name': 'test',
+             'planned_revenue': '0.0',
+             'partner_id': ref('base.res_partner_9'),
+             'probability': '0.0' 
+             }
+    self.default_get(cr, uid, fields, {"active_ids": [ref("crm_partner2opportunity_id_0")]})
+- |
+  In order to check the opportunity is created or not, I check type.
+-
+  !python {model: crm.partner2opportunity}: |
+    opportunity = self.make_opportunity(cr, uid, [ref("crm_partner2opportunity_id_0")], {"active_ids": [ref("crm_partner2opportunity_id_0")]})
+    assert True
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index 1885e34a5ce..0754a5b9544 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -7,16 +7,19 @@
     duration: 2.0
     section_id: crm.section_sales_department
 -
-  Now , I select partner by click on "Create a Partner" button.
+  I select partner by click on "Create a Partner" button.
 -
   !record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
     action: exist
     partner_id: base.res_partner_9
 
 -
-  Now, click on "Continue" button of this wizard.
+  I click on "Continue" button of this wizard and make partner.
 -
   !python {model: crm.phonecall2partner}: |
+
+    self._select_partner(cr, uid,{"active_ids": [ref("crm_phonecall_interviewcall0")]})
+    self.open_create_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
     self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
 
 - |
@@ -28,31 +31,28 @@
     partner_id: base.res_partner_9
     planned_revenue: 0.0
     probability: 0.0
--
-   Now, I click on "Convert" button of this wizard.
--
-  !python {model: crm.phonecall2opportunity}: |
-     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
-
 - |
   I can see that a business opportunity is now assigned to this phonecall
 -
   !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
      - opportunity_id != False
-
+-
+   I click on "Convert" button of this wizard.
+-
+  !python {model: crm.phonecall2opportunity}: |
+     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
 - |
   And I check that the phonecall and the newly created business opportunity is linked
-  to same  partner
+  to same  partner.
 -
   !python {model:  crm.phonecall}: |
     obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_interviewcall0'))
     ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
     obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
     assert obj_phonecall.partner_id == obj_opp.partner_id
-
 - |
   I schedule Meeting on this current phonecall by clicking on "schedule
-  Meeting"
+  Meeting".
 -
    !python {model: crm.phonecall}: |
      self.action_make_meeting(cr, uid, [ref('crm_phonecall_interviewcall0')])
@@ -60,7 +60,7 @@
 -  |
    I can see that Meeting's calendar view is shown.
    then I click on the date on which I want schedule meeting.
-   I fill proper data for that meeting and save it
+   I fill proper data for that meeting and save it.
 -
   !record {model: crm.meeting, id: crm_meeting_interviewcall0}:
     alarm_id: base_calendar.alarm3
@@ -85,9 +85,32 @@
     name: Interview call
     section_id: crm.section_sales_department
     user_id: base.user_root
+    action: schedule
+    categ_id: crm.categ_phone1
+-
+  I click on "schedule other call" button. and plan for other call.
+-
+  !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall1}:
+    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
+    name: Interview call
+    section_id: crm.section_sales_department
+    user_id: base.user_root
+    action: log
     categ_id: crm.categ_phone1
 - |
   I click on "Schedule" button of this  wizard.
 -
   !python {model: crm.phonecall2phonecall}: |
+    fields = {
+              'name': 'Interview call',
+              'section_id': ref('crm.section_sales_department'),
+              'user_id': ref('base.user_root'),
+              'categ_id': ref('crm.categ_phone1')
+             }
+    self.default_get(cr, uid, fields,{'active_id': ref('crm_phonecall_interviewcall0')})
     self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})
+- |
+  I click on "Schedule" button of this  wizard with log option.
+-
+  !python {model: crm.phonecall2phonecall}: |
+        self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall1')], {'active_id': ref('crm_phonecall_interviewcall0')})
diff --git a/addons/crm/test/test_crm_phonecall_case2.yml b/addons/crm/test/test_crm_phonecall_case2.yml
new file mode 100644
index 00000000000..1b07121183c
--- /dev/null
+++ b/addons/crm/test/test_crm_phonecall_case2.yml
@@ -0,0 +1,26 @@
+- |
+  I start by creating a new phonecall.
+-
+  !record {model: crm.phonecall, id: crm_phonecall_dummycall}:
+    date: !eval time.strftime('%Y-%m-%d 08:00:00')
+    name: Dummy call
+    duration: 0.0
+    section_id: crm.section_sales_department
+    partner_id: base.res_partner_agrolait
+    state: open
+-
+  I change Contact Detail of the Partner.
+-
+  !python {model: crm.phonecall}: |
+    self.onchange_partner_address_id(cr, uid,[ref("crm_phonecall_dummycall")], ref("base.res_partner_address_8invoice"))
+
+-
+  I setting Phone call to Held (Done).
+-
+  !python {model: crm.phonecall}: |
+    self.case_close(cr, uid, [ref("crm_phonecall_dummycall")])
+-
+  I check that the hone call is in 'Held' state.
+-
+  !assert {model: crm.phonecall, id: crm_phonecall_dummycall, string: Phone call Helded}:
+    - state == "done"
diff --git a/addons/crm/test/test_crm_recurrent_meeting_case2.yml b/addons/crm/test/test_crm_recurrent_meeting_case2.yml
index 585c6af73ae..b6afeb6906e 100644
--- a/addons/crm/test/test_crm_recurrent_meeting_case2.yml
+++ b/addons/crm/test/test_crm_recurrent_meeting_case2.yml
@@ -21,7 +21,7 @@
      meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_testmeeting0')]),('date','>=','2011-03-13'), ('date_deadline', '<=', '2011-05-13')], context={'virtual_id': True})
      assert len(meeting_ids) == 5, 'Recurrent daily meetings are not created !'
 -
-  Now I create a weekly meeting till a particular end date.
+  I create a weekly meeting till a particular end date.
 -
   !record {model: crm.meeting, id: crm_meeting_reviewcodewithprogrammer0}:
     date: '2011-04-18 11:47:00'
@@ -95,4 +95,3 @@
      meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id','=','2011-04-25 12:47:00')], context)
      assert meeting_ids, 'Meeting is not edited !'
 
-     
\ No newline at end of file
diff --git a/addons/crm/test/test_crm_segmentation.yml b/addons/crm/test/test_crm_segmentation.yml
new file mode 100644
index 00000000000..5563f1ce52f
--- /dev/null
+++ b/addons/crm/test/test_crm_segmentation.yml
@@ -0,0 +1,38 @@
+- |
+  I will test segmentation which create specific partner categories criteria.
+-
+  I create a new segmentation record.
+-
+  !record {model: crm.segmentation, id: crm_segmentation_id_0}:
+    categ_id: base.res_partner_category_5
+    exclusif: true
+    name: segment
+    som_interval: 0.0
+    sales_purchase_active : True
+-
+  I start the process.
+-
+  !python {model: crm.segmentation}: |
+    self.process_start(cr, uid, [ref("crm_segmentation_id_0")],context)
+-
+  I continue the segmentation process.
+-
+  !python {model: crm.segmentation}: |
+    context.update({'start': True})
+    self.process_continue(cr, uid, [ref("crm_segmentation_id_0")], context)
+-
+  I create the segmentation line.
+-
+  !record {model: crm.segmentation.line, id: crm_segmentation_line_id_0}:
+    expr_name: sale
+    expr_operator: '>'
+    expr_value: 1000.0
+    name: Rule1
+    operator: or
+    segmentation_id: crm_segmentation_id_0
+
+-
+  I check the Segmentation line record.
+-
+  !python {model: crm.segmentation.line}: |
+    self.test(cr, uid, [ref("crm_segmentation_line_id_0")],partner_id=0)
diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml
index dec60c997f1..391a328bffe 100644
--- a/addons/crm/test/test_crm_stage_changes.yml
+++ b/addons/crm/test/test_crm_stage_changes.yml
@@ -1,28 +1,27 @@
 -
   In order to test the changes on stage of a lead or an opportunity with OpenERP,
   I create some leads and test the stage changes.
-- 
+-
   I want to change the probability to 0.0 when the opportunity is marked as lost.
   So I set its Change probability automatically true.
-- 
-  !record {model: crm.case.stage, id: crm.stage_opportunity6}:
+-
+  !record {model: crm.case.stage, id: crm.stage_lead6}:
     name: Lost
     on_change: true
     probability: 0.0
     section_ids:
       - crm.section_sales_department
-    sequence: 0.0
-    type: opportunity
-- 
-  I create a lead 'OpenERP Presentation'.
-- 
+    sequence: 0
+-
+  I create a lead 'Test Lead1'.
+-
   !record {model: crm.lead, id: crm_lead_openerppresentation0}:
     categ_id: crm.categ_oppor4
     day_close: 0.0
     day_open: 0.0
-    name: OpenERP Presentation
+    name: Test Lead1
     planned_revenue: 0.0
-    probability: 0.0
+    probability: 10.0
     section_id: crm.section_sales_department
 -
   I open the lead.
@@ -30,7 +29,17 @@
   !python {model: crm.lead}: |
     self.case_open(cr, uid, [ref('crm_lead_openerppresentation0')])
 -
-  I find that this lead can be converted to opportunity. 
+  I assigning stage.
+-
+  !python {model: crm.lead}: |
+    self.onchange_stage_id(cr, uid, [ref('crm_lead_openerppresentation0')], [], context)
+-
+  I assigning percent.
+-
+  !python {model: crm.lead}: |
+    self.stage_find_percent(cr, uid, 10.0, [])
+-
+  I find that this lead can be converted to opportunity.
 -
   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner0}:
     action: 'create'
@@ -52,38 +61,36 @@
   !python {model: crm.lead}: |
     self.case_mark_lost(cr, uid, [ref('crm_lead_openerppresentation0')])
 -
-  Now I check whether the probability is set according to stage change or not.
+  I check whether the probability is set according to stage change or not.
 -
   !python {model: crm.lead}: |
     opportunity = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
-    assert opportunity.stage_id.id == ref('crm.stage_opportunity6'), 'Stage is not changed!'
+    assert opportunity.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
     assert opportunity.probability == 0.0, 'Probability is wrong!'
 -
   I create one more opportunity.
 -
-  !record {model: crm.lead, id: crm_lead_partnerdemo0}:
-    categ_id: crm.categ_oppor3
-    day_close: 0.0
-    day_open: 0.0
+  !record {model: crm.lead, id: crm_lead_test2}:
     name: Partner Demo
-    planned_revenue: 50000.0
-    probability: 70.0
-    section_id: crm.section_sales_department
     type: opportunity
+    categ_id: crm.categ_oppor3
+    planned_revenue: 50000.0
+    probability: 100.0
+    section_id: crm.section_sales_department
 -
   I open this opportunity.
 -
   !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref('crm_lead_partnerdemo0')])
+    self.case_open(cr, uid, [ref('crm_lead_test2')])
 -
   I mark this opportunity as won.
 -
   !python {model: crm.lead}: |
-    self.case_close(cr, uid, [ref('crm_lead_partnerdemo0')])
+    self.case_mark_won(cr, uid, [ref('crm_lead_test2')])
 -
   I check whether the stage is changed to 'Won' and probability is 100.0 or not.
 -
   !python {model: crm.lead}: |
-    opportunity = self.browse(cr, uid, ref('crm_lead_partnerdemo0'))
-    assert opportunity.stage_id.id == ref('crm.stage_opportunity5'), 'Stage is not changed!'
+    opportunity = self.browse(cr, uid, ref('crm_lead_test2'))
+    assert opportunity.stage_id.id == ref('crm.stage_lead5'), 'Stage is not changed!'
     assert opportunity.probability == 100.0, 'Probability is wrong!'
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 9730b8d1d55..3ebdceda437 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import crm_send_email
+import mail_compose_message
 import crm_add_note
 
 import crm_lead_to_partner
diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py
index 3419c89d33a..6bd84bda21d 100644
--- a/addons/crm/wizard/crm_add_note.py
+++ b/addons/crm/wizard/crm_add_note.py
@@ -1,11 +1,10 @@
 from crm import crm
 from osv import fields, osv
 from tools.translate import _
-import base64
+from mail.mail_message import truncate_text
 
 AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
 
-
 class crm_add_note(osv.osv_memory):
     """Adds a new note to the case."""
     _name = 'crm.add.note'
@@ -14,8 +13,11 @@ class crm_add_note(osv.osv_memory):
     _columns = {
         'body': fields.text('Note Body', required=True),
         'state': fields.selection(AVAILABLE_STATES, string='Set New State To',
-                                  required=True), 
-        'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
+                                  required=True),
+    }
+
+    _defaults = {
+        'state': 'unchanged'
     }
 
     def action_add(self, cr, uid, ids, context=None):
@@ -32,14 +34,8 @@ class crm_add_note(osv.osv_memory):
             case_list = case_pool.browse(cr, uid, context['active_ids'],
                                          context=context)
             case = case_list[0]
-            user_obj = self.pool.get('res.users')
-            user_name = user_obj.browse(cr, uid, [uid], context=context)[0].name
-            attach = [
-                (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
-            ]
-            case_pool.history(cr, uid, [case], self.pool.get('mailgate.message').truncate_data(cr, uid, obj.body, context=context), history=False,
-                              details=obj.body, email_from=user_name, attach=attach)
-
+            case_pool.message_append(cr, uid, [case], truncate_text(obj.body),
+                                     body_text=obj.body)
             if obj.state == 'unchanged':
                 pass
             elif obj.state == 'done':
@@ -52,11 +48,6 @@ class crm_add_note(osv.osv_memory):
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        return {'state': u'unchanged'}
-
-
 crm_add_note()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 4b6e047f475..87ab9229d26 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -37,7 +37,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                                     ('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),
-        'opportunity_ids': fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
+        'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]),
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -132,26 +132,25 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             vals['partner_address_id'] = False
 
         lead.write(vals, context=context)
-        leads.history(cr, uid, [lead], _('Converted to opportunity'), details='Converted to Opportunity', context=context)
+        text = _('Converted to opportunity')
+        leads.message_append(cr, uid, [lead], text, body_text=text, context=context)
         if lead.partner_id:
             msg_ids = [ x.id for x in lead.message_ids]
-            self.pool.get('mailgate.message').write(cr, uid, msg_ids, {
+            self.pool.get('mail.message').write(cr, uid, msg_ids, {
                         'partner_id': lead.partner_id.id
                     }, context=context)
             leads.log(cr, uid, lead.id, _("Lead '%s' has been converted to an opportunity.") % lead.name)
 
-    def send_mail_to_salesman(self, lead):
+    def send_mail_to_salesman(self, cr, uid, lead):
         email_to = lead.user_id and lead.user_id.user_email
         if not email_to:
-            return
+            return False
+        message_pool = self.pool.get('mail.message')
         email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
-        partner = lead.partner_id and lead.partner_id.name or lead.partner_name 
+        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)  
-        try :
-            tools.email_send(email_from, [email_to], subject, body)
-        except:
-            pass
+        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_pool.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
 
     def action_apply(self, cr, uid, ids, context=None):
         """
@@ -188,9 +187,9 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         for lead in leads.browse(cr, uid, record_id, context=context):
             if lead.section_id:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
+                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
             else:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
+                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1)])
 
             data = self.browse(cr, uid, ids[0], context=context)
 
@@ -205,7 +204,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                 partner_id = False
 
             self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
-            self.send_mail_to_salesman(lead)
+            self.send_mail_to_salesman(cr, uid, lead)
             #If we convert in mass, don't merge if there is no other opportunity but no warning
             if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
                 merge_obj = self.pool.get('crm.merge.opportunity')
@@ -237,7 +236,7 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
 
 
     _columns = {
-            'user_ids':  fields.many2many('res.users', 'mass_convert_rel', 'user_id', 'wizard_id', 'Salesmans'),
+            'user_ids':  fields.many2many('res.users', string='Salesmans'),
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
 
     }
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 790c6222de6..861472949e2 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -78,21 +78,16 @@ class crm_lead2partner(osv.osv_memory):
             email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
             email = map(lambda x: "'" + x + "'", email)
             if email:
-                cr.execute("""select id from res_partner_address
+                cr.execute("""select partner_id from res_partner_address
                                 where
                                 substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
-                address_ids = map(lambda x: x[0], cr.fetchall())
-                if address_ids:
-                    partner_ids = partner_obj.search(cr, uid, [('address', 'in', address_ids)], context=context)
-                    
+                partner_ids = map(lambda x: x[0], cr.fetchall())
+
             # Find partner name that matches the name of the lead
             if not partner_ids and lead.partner_name:
-                partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
-                
-            partner_id = partner_ids and partner_ids[0] or False
-            
-            
+                partner_ids = partner_obj.search(cr, uid, [('name', '=ilike', lead.partner_name)], context=context)
 
+            partner_id = partner_ids and partner_ids[0] or False
             if 'partner_id' in fields:
                 res.update({'partner_id': partner_id})
             if 'action' in fields:
@@ -158,6 +153,7 @@ class crm_lead2partner(osv.osv_memory):
                         'name': lead.partner_name or lead.contact_name or lead.name,
                         'user_id': lead.user_id.id,
                         'comment': lead.description,
+                        'address': []
                     })
                     contact_obj.create(cr, uid, {
                         'partner_id': partner_id,
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 57620f8c016..f092d6ad0b6 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -49,14 +49,9 @@ class crm_merge_opportunity(osv.osv_memory):
 
 
     def get_attachments(self, cr, uid, id, context=None):
-        attach_obj = self.pool.get('ir.attachment')
-        attach_ids = attach_obj.search(cr, uid, [('res_model' , '=', 'crm.lead'), ('res_id', '=', id)])
-        return attach_ids
-
-    def set_attachements_res_id(self, cr, uid, op_id, attach_ids, context=None):
-        attach_obj = self.pool.get('ir.attachment')
-        attach_obj.write(cr, uid, attach_ids, {'res_id' : op_id})
-
+        proxy = self.pool.get('ir.attachment')
+        ids = proxy.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', id)], context=context)
+        return proxy.browse(cr, uid, ids, context=context)
 
     def find_oldest(self, cr, uid, op_ids, context=None):
         if not context:
@@ -70,9 +65,9 @@ class crm_merge_opportunity(osv.osv_memory):
             return False
         opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
         return opps[0]
-        
+
     def _update_data(self, op_ids, oldest_opp):
-		data = {
+        data = {
                 'partner_id': self._get_first_not_null_id('partner_id', op_ids, oldest_opp),  # !!
                 'title': self._get_first_not_null_id('title', op_ids, oldest_opp),
                 'name' : self._get_first_not_null('name', op_ids, oldest_opp),  #not lost
@@ -105,16 +100,15 @@ class crm_merge_opportunity(osv.osv_memory):
                 'email_from' : self._get_first_not_null('email_from', op_ids, oldest_opp),
                 'email_cc' : self._get_first_not_null('email_cc', op_ids, oldest_opp),
                 'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
-
-            }
-		return data
+        }
+        return data
 
     def merge(self, cr, uid, op_ids, context=None):
         """
-            @param opp_ids : list of opportunities ids to merge
+            :param opp_ids: list of opportunities ids to merge
         """
         opp_obj = self.pool.get('crm.lead')
-        message_obj = self.pool.get('mailgate.message')
+        message_obj = self.pool.get('mail.message')
 
         lead_ids = context and context.get('lead_ids', []) or []
 
@@ -130,17 +124,25 @@ class crm_merge_opportunity(osv.osv_memory):
         else:
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
-            
-
-        
         data = self._update_data(op_ids, oldest_opp)
+
         #copy message into the first opportunity + merge attachement
-        
-        for opp in tail_opportunities + [first_opportunity]:
-            attach_ids = self.get_attachments(cr, uid, opp, context=context)
-            self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
+        count = 1
+        first_attachments = self.get_attachments(cr, uid, first_opportunity, context=context)
+        for opp in tail_opportunities:
+            attachments = self.get_attachments(cr, uid, opp, context=context)
+            for first in first_attachments:
+                for attachment in attachments:
+                    if attachment.name == first.name:
+                        values = dict(
+                            name = "%s (%s)" % (attachment.name, count,),
+                            res_id = first_opportunity.id,
+                        )
+                        attachment.write(values)
+                        count+=1
+                    
             for history in opp.message_ids:
-                message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) }, context=context)
+                message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'subject' : _("From %s : %s") % (opp.name, history.subject) }, context=context)
 
         #Notification about loss of information
         details = []
@@ -172,16 +174,14 @@ class crm_merge_opportunity(osv.osv_memory):
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
 
-        opp_obj._history(cr, uid, [first_opportunity], subject, details=details)
+        opp_obj.message_append(cr, uid, [first_opportunity], subject, body_text=details)
         #data.update({'message_ids' : [(6, 0 ,self._concat_o2m('message_ids', op_ids))]})
-        opp_obj.write(cr, uid, [first_opportunity.id], data)
+        opp_obj.write(cr, uid, [first_opportunity.id], data, context=context)
         unlink_ids = map(lambda x: x.id, tail_opportunities)
         opp_obj.unlink(cr, uid, unlink_ids, context=context)
 
         models_data = self.pool.get('ir.model.data')
 
-
-
         # Get Opportunity views
         opportunity_view_form = models_data._get_id(
             cr, uid, 'crm', 'crm_case_form_view_oppor')
@@ -216,7 +216,6 @@ class crm_merge_opportunity(osv.osv_memory):
         context['lead_ids'] = [op_ids[0].id]
         return self.merge(cr, uid, op_ids, context)
 
-
     _columns = {
         'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
     }
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 714376766f6..b0bfbf3b817 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -35,13 +35,16 @@ class crm_opportunity2phonecall(osv.osv_memory):
     _columns = {
         'name' : fields.char('Call summary', size=64, required=True, select=1),
         'user_id' : fields.many2one('res.users', "Assign To"),
+        'contact_name':fields.char('Contact', size=64),
+        'phone':fields.char('Phone', size=64),
         'partner_id' : fields.many2one('res.partner', "Partner"),
         'date': fields.datetime('Date'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_id': fields.many2one('crm.case.categ', 'Category',  \
                         domain="['|',('section_id','=',False),('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
-        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), 
+        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
+        'note':fields.text('Note'), 
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -64,7 +67,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
-        res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
             if 'name' in fields:
                 res.update({'name': opp.name})
@@ -76,6 +79,12 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'categ_id': categ_id})
             if 'partner_id' in fields:
                 res.update({'partner_id': opp.partner_id and opp.partner_id.id or False})
+            if 'note' in fields:
+                res.update({'note': opp.description})
+            if 'contact_name' in fields:
+                res.update({'contact_name': opp.partner_address_id and opp.partner_address_id.name or False})
+            if 'phone' in fields:
+                res.update({'phone': opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False)})
         return res
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -142,6 +151,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
                
                 if this.action == 'log':
                     phonecall_obj.case_close(cr, uid, [new_case])
+                    return {'type': 'ir.actions.act_window_close'}
 
             value = {
                 'name': _('Phone Call'),
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 764648a877b..980b93500d2 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,10 +16,19 @@
                     <field name="name"/>
                     <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                     <newline/>
-                    <field name="partner_id" readonly="True"/>
-                    <field name="user_id" />                    
-                    <field name="section_id" widget="selection" />
-                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <group colspan="4">
+                        <field name="partner_id" readonly="True"/>
+                        <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="contact_name"/>
+                        <field name="phone"/>
+                    </group>
+                    <group colspan="4">
+                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
+                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                    </group>
+                    <group colspan="4">
+                        <field name="note"/>
+                    </group>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="3">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 762303f06ba..1111bbbbc50 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -31,17 +31,16 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-        </record>
+     </record>
 
-	    <!-- partner To Opportunity wizard -->
+        <!-- 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_extended"/>
-
- 	</data>
+     <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_extended"/>
+     </data>
 
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index 3f726af15ef..9e902142c94 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -21,60 +21,6 @@
 
 from osv import osv
 from tools.translate import _
-import wizard
-import pooler
-
-#===============================================================================
-# Put original wizard because of action in init
-# Remove it after solution foraction in init
-#===============================================================================
-
-class phonecall2meeting(wizard.interface):
-
-    def _makeMeeting(self, cr, uid, data, context=None):
-        pool = pooler.get_pool(cr.dbname)
-        phonecall_case_obj = pool.get('crm.phonecall')                   
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-        id = data_obj.read(cr, uid, result, ['res_id'])
-        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-        if id1:
-            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        phonecall = phonecall_case_obj.browse(cr, uid, data['id'], context=context)
-        partner_id = phonecall.partner_id and phonecall.partner_id.id or False
-        name = phonecall.name
-        email = phonecall.email_from
-        section_id = phonecall.section_id and phonecall.section_id.id or False      
-        return {            
-            'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s)]"%(uid), 
-            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},        
-            'view_type': 'form',
-            'view_mode': 'calendar,form,tree',
-            'res_model': 'crm.meeting',
-            'view_id': False,
-            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-            }
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'state', 'state': 'end'}
-        }
-    }
-phonecall2meeting('crm.phonecall.meeting_set')
 
 class crm_phonecall2meeting(osv.osv_memory):
     """ Phonecall to Meeting """
@@ -109,7 +55,7 @@ class crm_phonecall2meeting(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False
 
         if record_id:
-            phonecall_obj = self.pool.get('crm.phonecall')                   
+            phonecall_obj = self.pool.get('crm.phonecall')
             data_obj = self.pool.get('ir.model.data')
 
             # Get meeting views
@@ -127,22 +73,22 @@ class crm_phonecall2meeting(osv.osv_memory):
 
             phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
             context = {
-                        'default_phonecall_id': phonecall.id, 
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, 
-                        'default_email': phonecall.email_from , 
+                        'default_phonecall_id': phonecall.id,
+                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+                        'default_email': phonecall.email_from ,
                         'default_name': phonecall.name
                     }
 
             value = {
-                'name': _('Meetings'), 
-                'domain' : "[('user_id','=',%s)]" % (uid), 
-                'context': context, 
-                'view_type': 'form', 
-                'view_mode': 'calendar,form,tree', 
-                'res_model': 'crm.meeting', 
-                'view_id': False, 
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
-                'type': 'ir.actions.act_window', 
+                'name': _('Meetings'),
+                'domain' : "[('user_id','=',%s)]" % (uid),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'type': 'ir.actions.act_window',
                 'search_view_id': res['res_id']
                 }
 
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 549afa0559b..ffab1867ebb 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -127,3 +127,5 @@ class crm_phonecall2opportunity(osv.osv_memory):
         return res
 
 crm_phonecall2opportunity()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
deleted file mode 100644
index d4ba8b476a1..00000000000
--- a/addons/crm/wizard/crm_send_email.py
+++ /dev/null
@@ -1,303 +0,0 @@
-# -*- coding: 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 crm import crm
-from osv import osv, fields
-from tools.translate import _
-import base64
-import itertools
-import tools
-import re
-
-
-AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
-
-
-class crm_send_new_email_attachment(osv.osv_memory):
-    _name = 'crm.send.mail.attachment'
-
-    _columns = {
-        'binary' : fields.binary('Attachment', required=True),
-        'name' : fields.char('Name', size=128, required=True),
-        'wizard_id' : fields.many2one('crm.send.mail', 'Wizard', required=True),
-    }
-
-crm_send_new_email_attachment()
-
-class crm_send_new_email(osv.osv_memory):
-    """ Sends new email for the case"""
-    _name = "crm.send.mail"
-    _description = "Send new email"
-
-    _columns = {
-        'email_to' : fields.char('To', size=512, required=True),
-        'email_from' : fields.char('From', size=128, required=True),
-        'reply_to' : fields.char('Reply To', size=128, required=True, help="Reply-to of the Sales team defined on this case"),
-        'email_cc' : fields.char('CC', size=512, help="These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"),
-        'subject': fields.char('Subject', size=512, required=True),
-        'body': fields.text('Message Body', required=True),
-        'state': fields.selection(AVAILABLE_STATES, string='Set New State To', required=True),
-        'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id', 'Attachment'),
-        'html': fields.boolean('HTML formatting?', help="Select this if you want to send email with HTML formatting."),
-    }
-
-    def action_mass_send(self, cr, uid, ids, context=None):
-
-        if not context:
-            context = {}
-
-        context.update({'mail' : 'new'})
-        actives_ids = context.get('active_ids')
-        model = context.get('active_model')
-        case_pool = self.pool.get(model)
-        for id in actives_ids:
-            context.update({'active_id' : id})
-            self.action_send(cr, uid, ids, context=context)
-
-        return {'type': 'ir.actions.act_window_close'}
-
-    def action_send(self, cr, uid, ids, context=None):
-        """ This sends an email to ALL the addresses of the selected partners.
-        """
-        hist_obj = self.pool.get('mailgate.message')
-
-        if context is None:
-            context = {}
-
-        if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not send mail!'))
-
-        model = context.get('active_model')
-        case_pool = self.pool.get(model)
-        res_id = context and context.get('active_id', False) or False
-
-
-
-        for obj in self.browse(cr, uid, ids, context=context):
-            attach = [
-                (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
-            ]
-
-            subtype = 'plain'
-            message_id = None
-            ref_id = None
-
-            case = case_pool.browse(cr, uid, res_id, context=context)
-            if context.get('mail', 'new') == 'new':
-                if case.message_ids:
-                    message_id = case.message_ids[0].message_id
-            elif context.get('mail') == 'forward':
-                # extract attachements from case and emails according to mode
-                attachments = []
-                attach_pool = self.pool.get('ir.attachment')
-                direct_attachments = attach_pool.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', res_id)], context=context)
-                attachments += attach_pool.browse(cr, uid, direct_attachments, context=context)
-                if obj.history in ['latest', 'whole'] and case.message_ids:
-                    msgs = case.message_ids
-                    if obj.history == 'latest':
-                        msgs = msgs[:1]
-                    attachments.extend(itertools.chain(*[m.attachment_ids for m in msgs]))
-                attach_all = [(a.datas_fname or a.name, base64.decodestring(a.datas)) for a in attachments if a.datas]
-                attach += attach_all
-
-            else:
-                hist = hist_obj.browse(cr, uid, res_id, context=context)
-                message_id = hist.message_id
-                model = hist.model
-                case_pool = self.pool.get(model)
-                res_id = hist.res_id
-                ref_id = hist.ref_id
-                case = case_pool.browse(cr, uid, res_id, context=context)
-
-            if context.get('mass_mail'):
-                email_temp = case.email_from and tools.ustr(case.email_from) or ''
-                emails = re.findall(r'([^ ,<@]+@[^> ,]+)', email_temp)
-            else:
-                emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
-
-            email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
-
-            emails = filter(None, emails)
-            body = obj.body
-
-            body = body and tools.ustr(body) or ''
-            email_from = getattr(obj, 'email_from', False)
-            x_headers = {}
-            if message_id:
-                x_headers['References'] = "%s" % (message_id)
-
-            if obj.html:
-                subtype = 'html'
-
-            flag = tools.email_send(
-                email_from,
-                emails,
-                obj.subject,
-                body,
-                email_cc=email_cc,
-                attach=attach,
-                subtype=subtype,
-                reply_to=obj.reply_to,
-                openobject_id=str(case.id),
-                x_headers=x_headers
-            )
-
-            if not flag:
-                raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
-
-            msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
-            case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \
-                            email=obj.email_to, details=body, \
-                            subject=obj.subject, email_from=email_from, \
-                            email_cc=', '.join(email_cc), message_id=message_id, \
-                            references=ref_id or message_id, attach=attach)
-            if obj.state == 'unchanged':
-                pass
-            elif obj.state == 'done':
-                case_pool.case_close(cr, uid, [case.id])
-            elif obj.state == 'draft':
-                case_pool.case_reset(cr, uid, [case.id])
-            elif obj.state in ['cancel', 'open', 'pending']:
-                act = 'case_' + obj.state
-                getattr(case_pool, act)(cr, uid, [case.id])
-
-        return {'type': 'ir.actions.act_window_close'}
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        if context is None:
-            context = {}
-
-        if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not send mail!'))
-
-        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
-
-        if context.get('mail') == 'reply':
-            res.update(self.get_reply_defaults(cr, uid, fields, context=context))
-            return res
-
-        model = context.get('active_model')
-        mod_obj = self.pool.get(model)
-        res_id = context and context.get('active_ids', []) or []
-
-        user_obj = self.pool.get('res.users')
-        user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
-        for case in mod_obj.browse(cr, uid, res_id, context=context):
-            if 'email_to' in fields:
-                res.update({'email_to': case.email_from and tools.ustr(case.email_from) or ''})
-                if context.get('mass_mail'):
-                    res.update({'email_to': ''})
-            if 'email_from' in fields:
-                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or ''})
-            if 'reply_to' in fields:
-                if hasattr(case, 'section_id'):
-                    res.update({'reply_to': case.section_id and case.section_id.reply_to or False})
-            if 'subject' in fields:
-                res.update({'subject': tools.ustr(context.get('subject', case.name) or '')})
-                if context.get('mass_mail'):
-                    res.update({'subject': ''})
-            if 'email_cc' in fields:
-                res.update({'email_cc': tools.ustr(case.email_cc or '')})
-                if context.get('mass_mail'):
-                    res.update({'email_cc': ''})
-            if 'body' in fields:
-                res.update({'body': u'\n'+(tools.ustr(case.user_id.signature or ''))})
-            if 'state' in fields:
-                res.update({'state': u'pending'})
-
-        return res
-
-    def get_reply_defaults(self, cr, uid, fields, context=None):
-        """
-        This function gets default values for reply mail
-        """
-        hist_obj = self.pool.get('mailgate.message')
-        res_ids = context and context.get('active_ids', []) or []
-
-        user_obj = self.pool.get('res.users')
-        user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
-
-        include_original = context and context.get('include_original', False) or False
-        res = {}
-        for hist in hist_obj.browse(cr, uid, res_ids, context=context):
-            model = hist.model
-
-            # In the case where the crm.case does not exist in the database
-            if not model:
-                return {'type': 'ir.actions.act_window_close'}
-
-            model_pool = self.pool.get(model)
-            res_id = hist.res_id
-            case = model_pool.browse(cr, uid, res_id)
-            if 'email_to' in fields:
-                res.update({'email_to': case.email_from and tools.ustr(case.email_from) or False})
-            if 'email_from' in fields:
-                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or False})
-
-            signature = u'\n' + (tools.ustr(case.user_id.signature or '')) + u'\n'
-            original = [signature]
-
-            if include_original == True and 'body' in fields:
-                header = u'-------- Original Message --------'
-                sender = u'From: %s' %(tools.ustr(hist.email_from or ''))
-                to = u'To: %s' % (tools.ustr(hist.email_to or ''))
-                sentdate = u'Date: %s' % (tools.ustr(hist.date))
-                desc = u'\n%s'%(tools.ustr(hist.description))
-
-                original = [signature, header, sender, to, sentdate, desc]
-
-            res['body']= u'\n' + u'\n'.join(original)
-
-            if 'subject' in fields:
-                res.update({u'subject': u'Re: %s' %(tools.ustr(hist.name or ''))})
-            if 'email_cc' in fields:
-                 email_cc = (case.email_cc and tools.ustr(case.email_cc) + ', ' or '') + (hist.email_cc or '')
-                 res.update({'email_cc': email_cc})
-            if 'reply_to' in fields:
-                if hasattr(case, 'section_id'):
-                    res.update({'reply_to': case.section_id.reply_to or ''})
-            if 'state' in fields:
-                res['state'] = u'pending'
-        return res
-
-    def view_init(self, cr, uid, fields_list, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        """
-        if context is None:
-            context = {}
-
-        if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not send mail!'))
-        return True
-
-crm_send_new_email()
-
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
deleted file mode 100644
index be1644b6bbb..00000000000
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-<!-- Send New Mail view -->
-
-        <record model="ir.ui.view" id="crm_send_new_mail_view">
-            <field name="name">crm.new.send.mail.form</field>
-            <field name="model">crm.send.mail</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send Mail" col="4">
-                    <group colspan="4" col="2">
-                    <field name="email_from"/>
-                    <field name="reply_to"/>
-                    <field name="email_to" />
-                    <field name="email_cc"/>
-                    <field name="subject"/>
-                    <field name="html"/>
-                    </group>
-                    <notebook colspan="6">
-                        <page string="Message">
-                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids" colspan="4" nolabel="1">
-                                <form string="Attachment">
-                                    <field name="binary" filename="name" />
-                                    <field name="name" />
-                                </form>
-                                <tree string="Attachments">
-                                    <field name="name" />
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                    <separator string="" colspan="6"/>
-                    <group colspan="6" col="4" >
-                        <field name="state" />
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
-                        <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="crm_send_new_mass_mail_view">
-            <field name="name">crm.new.send.mass.mail.form</field>
-            <field name="model">crm.send.mail</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send Mail" col="4">
-                    <group colspan="4" col="2">
-                    <field name="email_from"/>
-                    <field name="reply_to"/>
-                    <field name="email_cc"/>
-                    <field name="subject" />
-                    <field name="html"/>
-                    </group>
-                    <notebook colspan="6">
-                        <page string="Message">
-                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids" colspan="4" nolabel="1">
-                                <form string="Attachment">
-                                    <field name="binary" filename="name" />
-                                    <field name="name" />
-                                </form>
-                                <tree string="Attachments">
-                                    <field name="name" />
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                    <separator string="" colspan="6"/>
-                    <group colspan="6" col="4" >
-                        <field name="state" />
-                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_mass_send" type="object" string="_Send to All" icon="gtk-go-forward" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-<!-- Send New Mail action -->
-
-        <record model="ir.actions.act_window" id="action_crm_send_mail">
-            <field name="name">Send Mail</field>
-            <field name="res_model">crm.send.mail</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_send_new_mail_view"/>
-            <field name="target">new</field>
-        </record>
-
-
-        <act_window id="action_crm_send_mass_mail"
-            multi="True"
-            key2="client_action_multi" name="Send emails"
-            res_model="crm.send.mail" src_model="crm.lead"
-            view_mode="form" target="new" view_type="form"
-            context="{'mass_mail' : True}"
-            view_id="crm_send_new_mass_mail_view"/>
-
-    <!-- Reply to Mail view -->
-
-        <record model="ir.ui.view" id="crm_reply_mail_view">
-            <field name="name">crm.mail.reply.form</field>
-            <field name="model">crm.send.mail</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Reply to last Mail" col="2">
-                    <field name="email_from" />
-                    <field name="email_to" />
-                    <field name="email_cc" />
-                    <field name="subject" />
-                    <field name="attachment_ids" colspan="4" nolabel="1">
-                        <form string="Attachment">
-                            <field name="binary" filename="name" />
-                            <field name="name" />
-                        </form>
-                        <tree string="Attachments">
-                            <field name="name" />
-                        </tree>
-                    </field>
-                    <separator string="" colspan="4"/>
-                    <field name="body" nolabel="1" colspan="4"/>
-                    <separator string=" " colspan="4"/>
-                    <group colspan="4" col="3" >
-                        <label string=" " />
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
-                        <button name="action_send" type="object" string="_Send Reply" icon="gtk-go-forward" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-
-
-
-<!-- Reply to Mail action -->
-
-        <record model="ir.actions.act_window" id="action_crm_reply_mail">
-            <field name="name">Reply to last Mail</field>
-            <field name="res_model">crm.send.mail</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_reply_mail_view"/>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm/wizard/mail_compose_message.py b/addons/crm/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..512d9ece77a
--- /dev/null
+++ b/addons/crm/wizard/mail_compose_message.py
@@ -0,0 +1,63 @@
+# -*- 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
+
+SUPPORTED_MODELS = ['crm.lead',]
+
+class mail_compose_message(osv.osv_memory):
+    _inherit = 'mail.compose.message'
+
+    def get_value(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``.
+
+           Overrides the default implementation to provide more default field values
+           related to the corresponding CRM case.
+
+           :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.
+        """
+        result = super(mail_compose_message, self).get_value(cr, uid,  model, res_id, context=context)
+        if model in SUPPORTED_MODELS and res_id:
+            model_obj = self.pool.get(model)
+            data = model_obj.browse(cr, uid , res_id, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            result.update({
+                    'subject' : data.name or False,
+                    'email_to' : data.email_from or False,
+                    'email_from' : user.user_email or tools.config.get('email_from', False),
+                    'body_text' : '\n' + tools.ustr(user.signature),
+                    'email_cc' : tools.ustr(data.email_cc or ''),
+                    'model': model,
+                    'res_id': res_id,
+                    'subtype': 'plain',
+                })
+            if hasattr(data, 'section_id'):
+                result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
+        return result
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/wizard_history_event.py b/addons/crm/wizard/wizard_history_event.py
deleted file mode 100644
index caaf37a88d8..00000000000
--- a/addons/crm/wizard/wizard_history_event.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: 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/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-
-def _open_history_event(self, cr, uid, data, context=None):
-    pool = pooler.get_pool(cr.dbname)
-    data_obj = pool.get('ir.model.data')
-    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_filter')
-    id = data_obj.read(cr, uid, result, ['res_id'])
-    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_section-view')
-    if id2:
-        id2 = data_obj.browse(cr, uid, id2, context=context).res_id 
-    res = ''    
-    if data.get('model',False) and data.get('ids',False):           
-        model_obj = pooler.get_pool(cr.dbname).get(data['model'])
-        res = model_obj.browse(cr, uid, data['ids'], context=context)
-        if len(res):
-            res = res[0].name       
-    return {
-        'name': 'History : ' +  res,
-        'view_type': 'form',
-        "view_mode": 'calendar, tree, form',
-        'view_id' : False,
-        'views': [(id2,'calendar'),(False,'form'),(False,'tree'),(False,'graph')],
-        'res_model': 'crm.case',
-        'type': 'ir.actions.act_window',
-        'domain': data.get('id',False) and "[('case_id','=',%d)]" % (data['id']) or "[]",
-        'search_view_id': id['res_id'] 
-    }
-    
-class case_history_event(wizard.interface):
-    states = {
-    'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _open_history_event, 'state':'end'}
-        }
-    }
-    
-case_history_event('crm.case.history.events')
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index fdbde1c8d2d..8f1812862c5 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,10 +22,9 @@
 
 
 {
-    'name': 'Extended Module to Add CalDav feature on Meeting',
+    'name': 'Calendar Synchronizing',
     'version': '1.1',
-    'category': 'Sales',
-    'category': 'Generic Modules/CRM & SRM',
+    'category': 'Customer Relationship Management',
     'complexity': "normal",
     'description': """
 Caldav features in Meeting.
diff --git a/addons/crm_caldav/i18n/bg.po b/addons/crm_caldav/i18n/bg.po
index faf45916292..bc744e4ae34 100644
--- a/addons/crm_caldav/i18n/bg.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ca.po b/addons/crm_caldav/i18n/ca.po
index fe4e2535279..6c7badfff14 100644
--- a/addons/crm_caldav/i18n/ca.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/da.po b/addons/crm_caldav/i18n/da.po
index e55d8e358b0..2d68bcce53e 100644
--- a/addons/crm_caldav/i18n/da.po
+++ b/addons/crm_caldav/i18n/da.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: 2010-11-22 07:37+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -43,15 +43,4 @@ msgstr ""
 #. module: crm_caldav
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
-msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Modulets navn skal være unikt"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnavnet skal starte med x_ og må ikke indeholde specialkarakterer!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Modulets certifikat-ID skal være unikt"
+msgstr "Synkronisere denne kalender"
diff --git a/addons/crm_caldav/i18n/de.po b/addons/crm_caldav/i18n/de.po
index d49646d7365..9f80dbd4648 100644
--- a/addons/crm_caldav/i18n/de.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -49,31 +49,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr "Synchronisiere diesen Kalender"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Erweitertes Modul für die Cal DAV Spezifikation"
-
-#~ msgid "Can not map a field more than once"
-#~ msgstr "Kann kein Feld mehr als einmal verbinden"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Futures in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Neue Funktion für Termine:\n"
-#~ "           * Veröffentlichen Sie Termine zwecks Zugriff durch andere "
-#~ "Kalenderanwendungen (z.B. Sunbird)\n"
diff --git a/addons/crm_caldav/i18n/el.po b/addons/crm_caldav/i18n/el.po
index e6f71aea5c7..fa5e9ac5009 100644
--- a/addons/crm_caldav/i18n/el.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -44,22 +44,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr ""
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Εκτεταμένο Πρόσθετο για Προσθήκη CalDav σε Συνάντηση"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
-
-#~ msgid "Can not map a field more than once"
-#~ msgstr "Δεν μπορεί να γινεί αντιστοίχηση του πεδίου περισσότερο από μια φορά"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr ""
-#~ "Το αναγνωριστικό πιστοποιητικό της ενότητας πρέπει να είναι μοναδικό!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Το όνομα του αρθρώματος πρέπει να είναι μοναδικό !"
diff --git a/addons/crm_caldav/i18n/en_GB.po b/addons/crm_caldav/i18n/en_GB.po
index 4e346ddde9f..e9b8d7577e4 100644
--- a/addons/crm_caldav/i18n/en_GB.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/es.po b/addons/crm_caldav/i18n/es.po
index ede7470d329..e117efe9f2d 100644
--- a/addons/crm_caldav/i18n/es.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -47,31 +47,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr "Sincronizar este calendario"
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Módulo extendido para añadir CalDav en las reuniones"
-
-#~ 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 "Can not map a field more than once"
-#~ msgstr "No puede mapear un campo más de una vez"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Futures in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nuevos eventos futuros 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
index de7b223a9a1..592ad2d0758 100644
--- a/addons/crm_caldav/i18n/es_EC.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/es_MX.po b/addons/crm_caldav/i18n/es_MX.po
new file mode 100644
index 00000000000..ba2ef1a1a44
--- /dev/null
+++ b/addons/crm_caldav/i18n/es_MX.po
@@ -0,0 +1,49 @@
+# 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
index 977317eaf27..5dace0cf349 100644
--- a/addons/crm_caldav/i18n/es_PY.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/es_VE.po b/addons/crm_caldav/i18n/es_VE.po
new file mode 100644
index 00000000000..ba2ef1a1a44
--- /dev/null
+++ b/addons/crm_caldav/i18n/es_VE.po
@@ -0,0 +1,49 @@
+# 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
index 0ca1c6427cc..dfdb9d1cdbc 100644
--- a/addons/crm_caldav/i18n/fi.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/fr.po b/addons/crm_caldav/i18n/fr.po
index 8aca763fa92..f01d5c32763 100644
--- a/addons/crm_caldav/i18n/fr.po
+++ b/addons/crm_caldav/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 21:13+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -48,21 +48,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr "Synchroniser ce calendrier"
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Module CalDAV pour la gestion des rendez-vous"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
-#~ "spécial !"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Futures in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nouvelles fonctionnalités pour les rendez-vous:\n"
-#~ "        *Partager les réunions avec d'autres outils d'agenda comme sunbird\n"
diff --git a/addons/crm_caldav/i18n/gl.po b/addons/crm_caldav/i18n/gl.po
index 3b07e01fdf8..172ab0d84f3 100644
--- a/addons/crm_caldav/i18n/gl.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/hi.po b/addons/crm_caldav/i18n/hi.po
index bf7f69669a3..bce04158cdd 100644
--- a/addons/crm_caldav/i18n/hi.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/hu.po b/addons/crm_caldav/i18n/hu.po
index 8ff2a06aa11..445ce170289 100644
--- a/addons/crm_caldav/i18n/hu.po
+++ b/addons/crm_caldav/i18n/hu.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-31 12:04+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/id.po b/addons/crm_caldav/i18n/id.po
index 93d6e126ece..310ffa0a75c 100644
--- a/addons/crm_caldav/i18n/id.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/it.po b/addons/crm_caldav/i18n/it.po
index 4b2b425b77e..b01fd0e7ad9 100644
--- a/addons/crm_caldav/i18n/it.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -47,30 +47,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr "Sincronizza questo calendario"
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Estensione di Modulo per aggiungere CalDav alle Riunioni"
-
-#~ 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 "Can not map a field more than once"
-#~ msgstr "Non è possibile mappare un campo più di una volta"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Futures in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nuove caratteristiche nei Meeting:\n"
-#~ "        * Condivisione meeting con altri client calendario, come Sunbird\n"
diff --git a/addons/crm_caldav/i18n/ko.po b/addons/crm_caldav/i18n/ko.po
index a319c1ee1be..504753ea93c 100644
--- a/addons/crm_caldav/i18n/ko.po
+++ b/addons/crm_caldav/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/lo.po b/addons/crm_caldav/i18n/lo.po
index dd742421d23..0996b7bfdee 100644
--- a/addons/crm_caldav/i18n/lo.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/mn.po b/addons/crm_caldav/i18n/mn.po
index 4cf0e91d5ce..5651744a45c 100644
--- a/addons/crm_caldav/i18n/mn.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -44,6 +44,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr ""
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Хурал дээр CalDav ирээдүйг Нэмэх Өргөтгөсөн Модуль."
diff --git a/addons/crm_caldav/i18n/nl.po b/addons/crm_caldav/i18n/nl.po
index 74aec53652b..ec0b6d5b8e9 100644
--- a/addons/crm_caldav/i18n/nl.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -47,21 +47,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr "Deze agenda synchroniseren"
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr ""
-#~ "Uitgebreide module om CalDAV functionaliteit aan agenda toe te voegen"
-
-#~ 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 "Can not map a field more than once"
-#~ msgstr "U kunt een veld niet meer dan één keer indelen"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/crm_caldav/i18n/oc.po b/addons/crm_caldav/i18n/oc.po
new file mode 100644
index 00000000000..58d92403c46
--- /dev/null
+++ b/addons/crm_caldav/i18n/oc.po
@@ -0,0 +1,50 @@
+# 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: 2011-01-11 11:15+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\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.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Rendètz-vos"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extended Module to Add CalDav feature on Meeting"
+msgstr "Modul espandit per apondre la foncionalitat CalDav a las acampadas"
+
+#. 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"
+"    Foncionalitats novèlas per las acampadas :\n"
+"        *  Partiment d'acampadas amb d'autres clients de calendièrs coma "
+"sunbird\n"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronyze this calendar"
+msgstr "Sincronizar aqueste calendièr"
diff --git a/addons/crm_caldav/i18n/pt.po b/addons/crm_caldav/i18n/pt.po
index d5902006e02..75245354363 100644
--- a/addons/crm_caldav/i18n/pt.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -48,18 +48,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Can not map a field more than once"
-#~ msgstr "Não é possível mapear um mesmo campo mais do que uma vez"
diff --git a/addons/crm_caldav/i18n/pt_BR.po b/addons/crm_caldav/i18n/pt_BR.po
index 5cf9902251c..df2385dea8e 100644
--- a/addons/crm_caldav/i18n/pt_BR.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -48,18 +48,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr "Sincronizar este calendário"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Can not map a field more than once"
-#~ msgstr "Não é possível mapear um campo mais que uma vez"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/crm_caldav/i18n/ro.po b/addons/crm_caldav/i18n/ro.po
index 9550fa1f6e5..386eb03e536 100644
--- a/addons/crm_caldav/i18n/ro.po
+++ b/addons/crm_caldav/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 17:45+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/ru.po b/addons/crm_caldav/i18n/ru.po
index 3fa86f09ead..9cbb0037ec5 100644
--- a/addons/crm_caldav/i18n/ru.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
 msgid "Caldav Browse"
-msgstr ""
+msgstr "Обзор Caldav"
 
 #. module: crm_caldav
 #: model:ir.model,name:crm_caldav.model_crm_meeting
@@ -30,7 +30,7 @@ msgstr "Встреча"
 #. module: crm_caldav
 #: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
 msgid "Extended Module to Add CalDav feature on Meeting"
-msgstr ""
+msgstr "Расширенный модуль, добавляющий поддержку Caldav ко встречам"
 
 #. module: crm_caldav
 #: model:ir.module.module,description:crm_caldav.module_meta_information
@@ -39,8 +39,11 @@ msgid ""
 "    New Features in Meeting:\n"
 "        *  Share meeting with other calendar clients like sunbird\n"
 msgstr ""
+"\n"
+"    Новые возможности модуля Встречи:\n"
+"        *  Общий доступ с помощью других календарей (напр. Sunbird)\n"
 
 #. module: crm_caldav
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
-msgstr ""
+msgstr "Синхронизировать этот календарь"
diff --git a/addons/crm_caldav/i18n/sk.po b/addons/crm_caldav/i18n/sk.po
index 1f7acabd74b..e416594d060 100644
--- a/addons/crm_caldav/i18n/sk.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sl.po b/addons/crm_caldav/i18n/sl.po
index 277bb6106fd..3bbd7d135f9 100644
--- a/addons/crm_caldav/i18n/sl.po
+++ b/addons/crm_caldav/i18n/sl.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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
 msgid "Caldav Browse"
-msgstr ""
+msgstr "Prebrskaj Caldav"
 
 #. module: crm_caldav
 #: model:ir.model,name:crm_caldav.model_crm_meeting
@@ -30,7 +30,7 @@ msgstr "Sestanek"
 #. module: crm_caldav
 #: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
 msgid "Extended Module to Add CalDav feature on Meeting"
-msgstr ""
+msgstr "Razširitveni modul za Dodajanje Caldav funkcije na Sestanki"
 
 #. module: crm_caldav
 #: model:ir.module.module,description:crm_caldav.module_meta_information
@@ -39,19 +39,11 @@ msgid ""
 "    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"
 
 #. module: crm_caldav
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
+msgstr "Sinhroniziraj ta koledar"
diff --git a/addons/crm_caldav/i18n/sq.po b/addons/crm_caldav/i18n/sq.po
index a01098dcd86..b5b014f848e 100644
--- a/addons/crm_caldav/i18n/sq.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/sr.po b/addons/crm_caldav/i18n/sr.po
index a72179d3412..f4ea7216f98 100644
--- a/addons/crm_caldav/i18n/sr.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -44,11 +44,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr ""
-
-#~ msgid "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Prosireni Modul za dodavanje CalDav predvidjanje na sastanku"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/crm_caldav/i18n/sr@latin.po b/addons/crm_caldav/i18n/sr@latin.po
index f894d0e458d..953c12ae12c 100644
--- a/addons/crm_caldav/i18n/sr@latin.po
+++ b/addons/crm_caldav/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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-23 10:47+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
 msgid "Caldav Browse"
-msgstr ""
+msgstr "Pretraži CalDav"
 
 #. module: crm_caldav
 #: model:ir.model,name:crm_caldav.model_crm_meeting
@@ -30,7 +30,7 @@ msgstr "Sastanak"
 #. module: crm_caldav
 #: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
 msgid "Extended Module to Add CalDav feature on Meeting"
-msgstr ""
+msgstr "Produženi modul za dodavanje CalDav funkcije u sastancima"
 
 #. module: crm_caldav
 #: model:ir.module.module,description:crm_caldav.module_meta_information
@@ -39,16 +39,11 @@ msgid ""
 "    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"
 
 #. module: crm_caldav
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
-msgstr ""
-
-#~ 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 "Extened Module to Add CalDav future on Meeting"
-#~ msgstr "Prosireni Modul za dodavanje CalDav predvidjanje na sastanku"
+msgstr "Sinhronisanje ovog kalendara"
diff --git a/addons/crm_caldav/i18n/sv.po b/addons/crm_caldav/i18n/sv.po
index cc16103224b..6bc48c085c7 100644
--- a/addons/crm_caldav/i18n/sv.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
@@ -44,14 +44,3 @@ msgstr ""
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
diff --git a/addons/crm_caldav/i18n/ta.po b/addons/crm_caldav/i18n/ta.po
index 0d4b103ab23..4871a7791a2 100644
--- a/addons/crm_caldav/i18n/ta.po
+++ b/addons/crm_caldav/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/tr.po b/addons/crm_caldav/i18n/tr.po
index b698c001a3c..573619c63f2 100644
--- a/addons/crm_caldav/i18n/tr.po
+++ b/addons/crm_caldav/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
diff --git a/addons/crm_caldav/i18n/zh_CN.po b/addons/crm_caldav/i18n/zh_CN.po
index dde9344e380..d12663b119c 100644
--- a/addons/crm_caldav/i18n/zh_CN.po
+++ b/addons/crm_caldav/i18n/zh_CN.po
@@ -9,18 +9,18 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-10 17:34+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_caldav
 #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
 msgid "Caldav Browse"
-msgstr "Caldav翻阅"
+msgstr "Caldav 浏览"
 
 #. module: crm_caldav
 #: model:ir.model,name:crm_caldav.model_crm_meeting
@@ -46,4 +46,4 @@ msgstr ""
 #. module: crm_caldav
 #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
 msgid "Synchronyze this calendar"
-msgstr "同步calendar"
+msgstr "同步日程表"
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 696298d275b..ae493c5dac2 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Customer & Supplier Claims Management',
+    'name': 'Claims',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This modules allows you to track your customers/suppliers claims and grievances.
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index c5755085216..b5cd2009698 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,10 +22,12 @@
 from osv import fields, osv
 from crm import crm
 import time
+from crm import wizard
 import binascii
 import tools
 from tools.translate import _
 
+wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.claim')
 CRM_CLAIM_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
     crm.AVAILABLE_STATES[3][0], # Done
@@ -40,103 +42,70 @@ class crm_claim(crm.crm_case, osv.osv):
     _name = "crm.claim"
     _description = "Claim"
     _order = "priority,date desc"
-    _inherit = ['mailgate.thread']
+    _inherit = ['mail.thread']
     _columns = {
-        'id': fields.integer('ID', readonly=True), 
-        'name': fields.char('Claim Subject', size=128, required=True), 
+        'id': fields.integer('ID', readonly=True),
+        'name': fields.char('Claim Subject', size=128, required=True),
         'action_next': fields.char('Next Action', size=200),
         'date_action_next': fields.datetime('Next Action Date'),
-        'description': fields.text('Description'), 
-        'resolution': fields.text('Resolution'), 
-        'create_date': fields.datetime('Creation Date' , readonly=True), 
-        'write_date': fields.datetime('Update Date' , readonly=True), 
-        'date_deadline': fields.date('Deadline'), 
-        'date_closed': fields.datetime('Closed', readonly=True), 
-        'date': fields.datetime('Claim Date'), 
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
+        'description': fields.text('Description'),
+        'resolution': fields.text('Resolution'),
+        'create_date': fields.datetime('Creation Date' , readonly=True),
+        'write_date': fields.datetime('Update Date' , readonly=True),
+        'date_deadline': fields.date('Deadline'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'date': fields.datetime('Claim Date'),
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.claim')]"), 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+                            ('object_id.model', '=', 'crm.claim')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
-        'user_id': fields.many2one('res.users', 'Responsible'), 
-        'user_fault': fields.char('Trouble Responsible', size=64), 
+        '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"\
-                                " mail gateway."), 
-        'company_id': fields.many2one('res.company', 'Company'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
+                                " mail gateway."),
+        'company_id': fields.many2one('res.company', 'Company'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                 # domain="[('partner_id','=',partner_id)]"
-                                 ), 
-        'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 
-        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
-        'partner_phone': fields.char('Phone', size=32), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type','=','claim')]"), 
-        'cause': fields.text('Root Cause'), 
-        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                 ),
+        'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
+        'email_from': fields.char('Email', size=128, help="These people will receive email."),
+        'partner_phone': fields.char('Phone', size=32),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids','=',section_id)]"), 
+        'cause': fields.text('Root Cause'),
+        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
-    
-    def stage_next(self, cr, uid, ids, context=None):
-        stage = super(crm_claim, self).stage_next(cr, uid, ids, context=context)
-        if stage:
-            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name)
-        return stage
-
-    def stage_previous(self, cr, uid, ids, context=None):
-        stage = super(crm_claim, self).stage_previous(cr, uid, ids, context=context)
-        if stage:
-            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name)
-        return stage
-    
-    def _get_stage_id(self, cr, uid, context=None):
-        """Finds type of stage according to object.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        type = context and context.get('stage_type', '')
-        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=',type),('sequence','>=',1)])
-        return stage_ids and stage_ids[0] or False
 
     _defaults = {
-        'user_id': crm.crm_case._get_default_user, 
-        'partner_id': crm.crm_case._get_default_partner, 
-        'partner_address_id': crm.crm_case._get_default_partner_address, 
-        'email_from':crm.crm_case. _get_default_email, 
-        'state': lambda *a: 'draft', 
-        'section_id':crm.crm_case. _get_section, 
+        'user_id': crm.crm_case._get_default_user,
+        'partner_id': crm.crm_case._get_default_partner,
+        'partner_address_id': crm.crm_case._get_default_partner_address,
+        'email_from':crm.crm_case. _get_default_email,
+        'state': lambda *a: 'draft',
+        'section_id':crm.crm_case. _get_section,
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
+        '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],
-        #'stage_id': _get_stage_id, 
     }
-    
+
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param part: Partner's id
-        @email: Partner's email ID
+           :param part: Partner's id
+           :param email: ignored
         """
         if not part:
             return {'value': {'partner_address_id': False,
-                            'email_from': False, 
-                            'partner_phone': False,
-                            'partner_mobile': False
+                            'email_from': False,
+                            'partner_phone': False
                             }}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
         data = {'partner_address_id': addr['contact']}
@@ -145,47 +114,36 @@ class crm_claim(crm.crm_case, osv.osv):
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         """This function returns value of partner email based on Partner Address
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param add: Id of Partner's address
-        @email: Partner's email ID
+           :param part: Partner's id
+           :param email: ignored
         """
         if not add:
             return {'value': {'email_from': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        return {'value': {'email_from': address.email, 'partner_phone': address.phone, 'partner_mobile': address.mobile}}
-        
+        return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
+
     def case_open(self, cr, uid, ids, *args):
-        """
-            Opens Claim
-        """
+        """Opens Claim"""
+        for l in self.browse(cr, uid, ids):
+            # When coming from draft override date and stage otherwise just set state
+            if l.state == 'draft':
+                message = _("The claim '%s' has been opened.") % l.name
+                self.log(cr, uid, l.id, message)
+                value = {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')}
+                self.write(cr, uid, [l.id], value)
+                stage_id = self.stage_find(cr, uid, l.section_id.id or False, [('sequence','>',0)])
+                if stage_id:
+                    self.stage_set(cr, uid, [l.id], stage_id)
         res = super(crm_claim, self).case_open(cr, uid, ids, *args)
-        claims = self.browse(cr, uid, ids)
-        
-        for i in xrange(0, len(ids)):
-            if not claims[i].stage_id :
-                stage_id = self._find_first_stage(cr, uid, 'claim', claims[i].section_id.id or False)
-                self.write(cr, uid, [ids[i]], {'stage_id' : stage_id})
-        
         return res
     
-    def message_new(self, cr, uid, msg, context=None):
-        """
-        Automatically calls when new email message arrives
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        """
-        mailgate_pool = self.pool.get('email.server.tools')
-
-        subject = msg.get('subject') or _("No Subject")
-        body = msg.get('body')
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """Automatically called when new email message arrives"""
+        res_id = super(crm_claim,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
+        subject = msg.get('subject')
+        body = msg.get('body_text')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -193,38 +151,18 @@ class crm_claim(crm.crm_case, osv.osv):
             'description': body,
             'user_id': False,
         }
-        if msg.get('priority', False):
+        if priority:
             vals['priority'] = priority
+        vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
+        self.write(cr, uid, [res_id], vals, context=context)
+        return res_id
 
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from') or msg.get_unixfrom())
-        if res:
-            vals.update(res)
-
-        res = self.create(cr, uid, vals, context)
-        attachents = msg.get('attachments', [])
-        for attactment in attachents or []:
-            data_attach = {
-                'name': attactment,
-                'datas':binascii.b2a_base64(str(attachents.get(attactment))),
-                'datas_fname': attactment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
-
-        return res
-
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs 
-        """
+    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
 
+        res_id = super(crm_claim,self).message_update(cr, uid, ids, msg, context=context)
+
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             vals['priority'] = msg.get('priority')
 
@@ -234,7 +172,7 @@ class crm_claim(crm.crm_case, osv.osv):
             'probability':'probability'
         }
         vls = {}
-        for line in msg['body'].split('\n'):
+        for line in msg['body_text'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
@@ -252,42 +190,10 @@ class crm_claim(crm.crm_case, osv.osv):
             res = self.write(cr, uid, [case.id], values, context=context)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-
-        """ Send The Message
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param *args: Return Tuple Value
-            @param **args: Return Dictionary of Keyword Value
-        """
-        return True
-
-crm_claim()
-
 class res_partner(osv.osv):
-   
     _inherit = 'res.partner'
     _columns = {
         'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
     }
-res_partner()
-
-class crm_stage_claim(osv.osv):
-    
-    def _get_type_value(self, cr, user, context):
-        list = super(crm_stage_claim, self)._get_type_value(cr, user, context)
-        list.append(('claim','Claim'))
-        return list
-    
-    _inherit = "crm.case.stage"
-    _columns = {
-            'type': fields.selection(_get_type_value, 'Type'),
-    }
-   
-    
-crm_stage_claim()
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index e917ba5bea6..5b3a2b0ed2a 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -44,25 +44,20 @@
         
         <record model="crm.case.stage" id="stage_claim1">
             <field name="name">Accepted as Claim</field>
-            <field name="sequence">1</field>
-            <field name="type">claim</field> 
+            <field name="sequence">26</field>
         </record>
         <record model="crm.case.stage" id="stage_claim5">
             <field name="name">Actions Defined</field>
-            <field name="sequence">2</field>
-            <field name="type">claim</field> 
+            <field name="sequence">27</field>
         </record>
         <record model="crm.case.stage" id="stage_claim2">
             <field name="name">Actions Done</field>
-            <field name="sequence">10</field>
-            <field name="type">claim</field> 
+            <field name="sequence">28</field>
         </record>
         <record model="crm.case.stage" id="stage_claim3">
             <field name="name">Won't fix</field>
-            <field name="sequence">0</field>
-            <field name="type">claim</field> 
+            <field name="sequence">29</field>
         </record>
-        
 
         <record model="crm.case.section" id="crm.section_sales_department">
             <field name="name">Sales Department</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 842ede252df..7ec18da18eb 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -14,30 +14,13 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-            <field name="context">{'object_id':'crm.claim'}</field>
+            <field name="context" eval="{'object_id': ref('model_crm_claim')}"/>
             <field name="help">Create claim categories to better manage and classify your claims. Some example of claims can be: preventive action, corrective action.</field>
         </record>
 
         <menuitem action="crm_claim_categ_action" name="Categories"
             id="menu_crm_case_claim-act" parent="menu_config_claim" />
 
-        <!-- Claim Stage Search view -->
-
-        <record id="claim_stage_search" model="ir.ui.view">
-            <field name="name">Claim Stage - Search</field>
-            <field name="model">crm.case.stage</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='name']" position="before">
-                        <filter icon="terp-personal-" name="claim"
-                            string="Claim" domain="[('type', '=', 'claim')]" context="{'type' : 'claim'}"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <!-- Claim Stages -->
 
         <record id="crm_claim_stage_act" model="ir.actions.act_window">
@@ -45,14 +28,10 @@
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="search_view_id" ref="claim_stage_search"/>
             <field name="context">{'search_default_claim':1}</field>
             <field name="help">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.</field>
         </record>
 
-         <menuitem action="crm_claim_stage_act" name="Stages"
-                id="menu_crm_claim_stage_act" parent="menu_config_claim" />
-
         <!-- Claims    -->
 
         <record model="ir.ui.view" id="crm_case_claims_tree_view">
@@ -91,19 +70,14 @@
                     <group>
                         <field name="name" />
                         <field name="date"/>
-
-
                     </group>
-
                     <group colspan="4" col="6">
-
                         <field name="user_id"/>
                         <field name="section_id" widget="selection" />
-
                         <group colspan="2" col="4">
-                            <field name="stage_id" domain="[('type','=','claim')]"/>
+                            <field name="stage_id" domain="[('section_ids','=',section_id)]"/>
                             <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                            <button name="stage_next" string="" type="object" icon="gtk-go-forward" />
                         </group>
                         <newline />
                         <field name="priority"/>
@@ -132,7 +106,7 @@
                                 <field name="description" colspan="4" nolabel="1"/>
                                 <separator colspan="4" string=""/>
                                 <group col="8" colspan="4">
-                                    <field name="state" select="1"/>
+                                    <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                                     <button name="case_cancel" string="Cancel"
                                         states="draft,open,pending" type="object"
                                         icon="gtk-cancel" />
@@ -180,12 +154,12 @@
                                 <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                     <tree string="History">
                                         <field name="display_text" string="History Information"/>
-                                        <field name="history" invisible="1"/>
+                                        <field name="email_from" invisible="1"/>
                                         <button
-                                            string="Reply"
-                                            name="%(crm.action_crm_send_mail)d"
-                                            context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
-                                            icon="terp-mail-replied" type="action" attrs="{'invisible': [('history', '!=', True)]}" />
+                                            string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                            name="%(mail.action_email_compose_message_wizard)d"
+                                            context="{'mail.compose.message.mode':'reply'}"
+                                            icon="terp-mail-replied" type="action" />
                                     </tree>
                                     <form string="Communication &amp; History">
                                         <group col="4" colspan="4">
@@ -193,20 +167,18 @@
                                             <field name="date"/>
                                             <field name="email_to" widget="char" size="512"/>
                                             <field name="email_cc" widget="char" size="512"/>
-                                            <field name="name" colspan="4" widget="char" size="512"/>
-                                            <field name="history" invisible="1"/>
+                                            <field name="subject" colspan="4" widget="char" size="512"/>
                                         </group>
                                         <notebook colspan="4">
                                             <page string="Details">
-                                                <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                    <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                    <button colspan="4"
-                                                        string="Reply"
-                                                        name="%(crm.action_crm_send_mail)d"
-                                                        context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
-                                                        icon="terp-mail-replied" type="action" />
+                                                <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                                    <field name="body_text" colspan="4" nolabel="1" height="250"/>
+                                                    <button colspan="4" string="Reply"
+                                                        name="%(mail.action_email_compose_message_wizard)d"
+                                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                                        icon="terp-mail-replied" type="action"/>
                                                 </group>
-                                                <group attrs="{'invisible': [('history', '=', True)]}">
+                                                <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                     <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                                 </group>
                                             </page>
@@ -221,9 +193,8 @@
                                     context="{'model': 'crm.lead' }"
                                     icon="terp-document-new" type="action" />
                                 <button string="Send New Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'new', 'model': 'crm.claim'}"
-                                    icon="terp-mail-message-new" type="action" />
+                                    name="%(mail.action_email_compose_message_wizard)d"
+                                    icon="terp-mail-message-new" type="action"/>
                             </page>
                         </notebook>
                     </group>
@@ -254,23 +225,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                    <filter icon="terp-check" string="Current" name="current"
-                        domain="[('state','in',('draft', 'open'))]"
-                        separator="1" help="Draft and Open Claims" />
+                    <filter icon="terp-check" string="New" name="current"
+                        domain="[('state','=','draft')]"
+                        help="New Claims" />
                     <filter icon="terp-camera_test"
                         string="In Progress"
                         domain="[('state','=','open')]"
-                        separator="1" help="In Progress Claims"
+                        help="In Progress Claims"
                     />
                     <filter icon="terp-gtk-media-pause"
                         string="Pending"
                         domain="[('state','=','pending')]"
-                        separator="1" help="All pending Claims"
+                        help="All pending Claims"
                     />
                     <separator orientation="vertical"/>
-                    <field name="name" select='1'/>
-                    <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" widget="selection">
                             <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Claims" />
@@ -347,7 +318,7 @@
 
         <act_window
             domain="[('partner_address_id', '=', active_id)]"
-            context="{'default_partner_id': partner_id}"
+            context="{'default_partner_address_id': active_id}"
             id="act_claim_partner_address"
             name="Claims"
             view_mode="tree,form"
diff --git a/addons/crm_claim/i18n/bg.po b/addons/crm_claim/i18n/bg.po
index 8fdb01d8c82..9345a283f50 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -304,6 +304,7 @@ msgid "Stages"
 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 ""
@@ -519,7 +520,6 @@ msgstr "Тези хора ще получат имейл."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
diff --git a/addons/crm_claim/i18n/ca.po b/addons/crm_claim/i18n/ca.po
index 05e2ac739b6..7cb3d8f58eb 100644
--- a/addons/crm_claim/i18n/ca.po
+++ b/addons/crm_claim/i18n/ca.po
@@ -8,72 +8,72 @@ 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-04-03 00:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 20:42+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# de casos"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr ""
+msgstr "Responsabilitats"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Data de la següent acció"
 
 #. module: crm_claim
 #: field:crm.claim.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Probabilitat"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Demora per tancar"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
 msgid "Resolution"
-msgstr ""
+msgstr "Resolució"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Observadors d'Emails (CC)"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr ""
+msgstr "Nº reclamació"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -82,23 +82,26 @@ msgid ""
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
 msgstr ""
+"Podeu crear etapes per categoritzar els estats de cada reclamació introduïda "
+"en el sistema. Les etapes defineixen tots els passos necessaris per a la "
+"resolució d'una reclamació."
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "El més alt"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Afegeix nota interna"
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
@@ -106,74 +109,76 @@ msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Equip de vendes al qual pertany el cas. Definiu l'usuari responsable i el "
+"compte d'email per la passarel·la de correu."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Description"
-msgstr ""
+msgstr "Descripció de la reclamació"
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Reclamacions objectives"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventiu"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
 msgid "Fixed"
-msgstr ""
+msgstr "Fix"
 
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacte empresa"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data de tancament"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referència"
 
 #. module: crm_claim
 #: field:crm.claim,action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Acció següent"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Inicialitza a esborrany"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date_deadline:0
 #: field:crm.claim.report,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data límit"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -181,72 +186,72 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
-msgstr ""
+msgstr "Acció preventiva"
 
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Secció"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Root Causes"
-msgstr ""
+msgstr "Causes principals"
 
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
 msgid "Trouble Responsible"
-msgstr ""
+msgstr "Responsable del problema"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritat"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envia nou correu electrònic"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Data límit sobrepassada"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "El més baix"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr ""
+msgstr "Assumpte de la reclamació"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -254,21 +259,23 @@ msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
 msgstr ""
+"Obtingueu una visió global de totes les reclamacions processades en el "
+"sistema ordenant-les amb criteris específics."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr ""
+msgstr "Etapes reclamacions"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "Categories"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -276,106 +283,107 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapa"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History Information"
-msgstr ""
+msgstr "Informació històrica"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Etapes"
 
 #. 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 ""
+msgstr "Anàlisi de reclamacions"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Número de dies per tancar el cas"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "Informe de reclamacions CRM"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Acceptat com reclamació"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Correctiu"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: crm_claim
 #: field:crm.claim,type_action:0
 #: field:crm.claim.report,type_action:0
 msgid "Action Type"
-msgstr ""
+msgstr "Tipus d'acció"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Data revisió"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Valor reclamacions"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Any  "
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -384,26 +392,29 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Aquestes adreces de correu seran afegides al camp CC en tots els correus "
+"entrants i sortints d'aquest registre abans de ser enviats. Separeu les "
+"diferents adreces de correu amb una coma."
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baix"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancada"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -411,83 +422,83 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicació i historial"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC global"
 
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Gestió de relacions amb clients i proveïdors"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telèfon"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Esperant resposta"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr ""
+msgstr "Categories de reclamacions"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "Tancament"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: crm_claim
 #: model:ir.module.module,description:crm_claim.module_meta_information
@@ -499,63 +510,70 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul li permet realitzar un seguiment de les reclamacions i "
+"urgències dels seus clients/proveïdors.\n"
+"Està totalment integrat amb la passarel·la de correu electrònic perquè "
+"pugueu crear\n"
+"automàticament les noves reclamacions a partir dels correus electrònics "
+"entrants.\n"
+"    "
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date:0
 msgid "Claim Date"
-msgstr ""
+msgstr "Data de reclamació"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Aquestes persones rebran un correu electrònic."
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
-msgstr ""
+msgstr "Reclamacions"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "Acció correctiva"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Política de reclamacions"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. 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 ""
+msgstr "Reclamació"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjunts"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Etapa del cas"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -563,29 +581,29 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "Persona que ha reportat la reclamació"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -593,75 +611,75 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "En procés"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "Resposta"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "Causa principal"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Descripció de la reclamació/acció"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Cerca reclamacions"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "Accions per a resolució"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
 msgid "Report a Claim"
-msgstr ""
+msgstr "Introduir reclamació"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -671,16 +689,22 @@ 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 ""
+"Registreu i feu seguiment de les reclamacions dels seus clients. Les "
+"reclamacions poden ser vinculades a una comanda de venda o un lot. Podeu "
+"enviar correus electrònics amb fitxers adjunts i mantenir l'historial "
+"complet d'una reclamació (correus electrònics enviats, tipus d'intervenció, "
+"etc.). Les reclamacions poden vincular-se automàticament a una adreça de "
+"correu electrònic utilitzant el mòdul passarel·la de correu."
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Nº d'emails"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "Seguiment"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -693,42 +717,49 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'estat s'estableix a 'Esborrany', quan es crea un cas.                      "
+"            \n"
+"Si el cas està en progrés l'estat s'estableix a 'Obert'.                     "
+"             \n"
+"Quan el cas es tanca, l'estat s'estableix a 'Realitzat'.                     "
+"             \n"
+"Si el cas necessita ser revisat llavors en estat s'estableix a 'Pendent'."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "No serà corregit"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "El/s meu/s cas/os"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Accions"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Alt"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
@@ -736,14 +767,23 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
+"Creeu categories de reclamacions per gestionar i classificar millor les "
+"seves reclamacions. Alguns exemples de reclamacions són: acció preventiva, "
+"acció correctiva."
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
+
+#~ msgid "Actions Done"
+#~ msgstr "Accions realitzades"
+
+#~ msgid "Actions Defined"
+#~ msgstr "Accions definides"
diff --git a/addons/crm_claim/i18n/de.po b/addons/crm_claim/i18n/de.po
index 3059ffbce54..05acc75bb0f 100644
--- a/addons/crm_claim/i18n/de.po
+++ b/addons/crm_claim/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -313,6 +313,7 @@ msgid "Stages"
 msgstr "Stufen"
 
 #. 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 "Statistik Reklamationen"
@@ -537,7 +538,6 @@ msgstr "Diese Personen erhalten EMails"
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -783,162 +783,6 @@ msgstr "Datum Erstellung"
 msgid "Year"
 msgstr "Jahr"
 
-#~ msgid "Planned Revenue"
-#~ msgstr "Geplanter Umsatz"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafter Modellname in der Definition der Aktion"
-
-#~ msgid "This Year"
-#~ msgstr "Aktuelles Jahr"
-
-#~ msgid "Cases"
-#~ msgstr "Vorgänge"
-
-#~ msgid ""
-#~ "The channels represent the different communicationmodes available with the "
-#~ "customer. With each commercial opportunity, you can indicate thecanall which "
-#~ "is this opportunity source."
-#~ msgstr ""
-#~ "Der Vertriebskanal repräsentiert die unterschiedlichen Möglichkeiten der "
-#~ "Kommunikation mit Kunden. Bei der Erfassung von Verkaufschancen , können Sie "
-#~ "ergänzend auch den Kanal angeben, z.B. um eine Aussage über deren "
-#~ "Vertriebseffezienz zu bekommen."
-
-#~ msgid "Mobile"
-#~ msgstr "Mobile"
-
-#~ msgid "Claim Type"
-#~ msgstr "Reklamations Typ"
-
-#~ msgid "My Case"
-#~ msgstr "Mein Vorgang"
-
-#~ msgid "Extra Info"
-#~ msgstr "Zusatzinformation"
-
-#~ msgid "Active"
-#~ msgstr "Aktiv"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Qu. für die Ansicht"
-
-#~ msgid "Stage: "
-#~ msgstr "Stufe: "
-
-#~ msgid "Channel"
-#~ msgstr "Kanal"
-
-#~ msgid "Claim Resource Type"
-#~ msgstr "Rekl.  Ressource Typ"
-
-#~ msgid "Status and Categorization"
-#~ msgstr "Status und Kategorisierung"
-
-#~ msgid "Reference 2"
-#~ msgstr "Referenz 2"
-
-#~ msgid "Closure Date"
-#~ msgstr "Datum Abschluss"
-
-#~ msgid "Planned Costs"
-#~ msgstr "Geplante Kosten"
-
-#~ 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 "
-#~ "emailaddresses differs with a comma"
-#~ msgstr ""
-#~ "Diese EMail Anschriften werden als CC Adressen für alle ein- und ausgehenden "
-#~ "Emails ergänzt. Für die Angabe mehrererEamil Anschriften, trennen Sie diese "
-#~ "durch ein Kommazeichen"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keinen rekursiven Menüeintrag generieren"
-
-#~ msgid "7 Days"
-#~ msgstr "7 Tage"
-
-#~ msgid "Type of Action"
-#~ msgstr "Typ Aktion"
-
-#~ msgid "Resource Type"
-#~ msgstr "Ressource Typ"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Invalid"
-#~ msgstr "Fehlerhaft"
-
-#~ msgid "Claim Info"
-#~ msgstr "Reklamation Info"
-
-#~ msgid "Communication"
-#~ msgstr "Kommunikation"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Objekt muss mit x_ starten und darf keine Sonderzeichen haben !"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Datum Reklamation"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Fälle nach Stufe und Prognose"
-
-#~ msgid "Probability (%)"
-#~ msgstr "Wahrscheinl. (%)"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Mitarbeiter Name"
-
-#~ msgid "This Month"
-#~ msgstr "Dieser Monat"
-
-#~ msgid "Name"
-#~ msgstr "Bezeichnung"
-
-#~ msgid "Communication history"
-#~ msgstr "Kommunikation Historie"
-
-#~ msgid "References"
-#~ msgstr "Referenzen"
-
-#~ msgid "Last Action"
-#~ msgstr "Letzte Aktion"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Der Name des Moduls muss eindeutig sein."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die ID für das Zertifikat des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "The channels represent the different communication  modes available with the "
-#~ "customer."
-#~ msgstr ""
-#~ "Der Kanal repräsentiert unterschiedliche Möglichkeiten für die Kommunikation "
-#~ "mit Kunden."
-
-#~ msgid ""
-#~ "Record and track your customers' claims. Claims can be linked to a sales "
-#~ "order or a lot. You can send emails with attachments and get the history of "
-#~ "everything that happened on a specific claim (emails sent, interventions "
-#~ "type and so on..). Claims can be automatically linked to an email address "
-#~ "using the mail gateway module."
-#~ msgstr ""
-#~ "Erfassen und verfolgen Sie Ihre Kundenreklamationsvorfälle. Dabei können "
-#~ "Reklamationen zu einem Verkaufsauftrag oder einer Losnummer zugewiesen "
-#~ "werden. Sie können Emails zu dem Vorgang versenden oder einfach in die "
-#~ "Ansicht der Historie wechseln, damit Sie sich schnell einen Überblick über "
-#~ "die gesamte Korrespondenz und Historie verschaffen können (EMails, Tickets "
-#~ "etc.). Reklamationen können dabei auch über eine Email Adresse durch das "
-#~ "EMailgateway angebunden werden und automatisch zu dem Fall empfangen werden."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Grösse des Feldes darf nie kleiner als 1 sein !"
-
 #~ msgid "Actions Defined"
 #~ msgstr "Vorgang beschrieben"
 
diff --git a/addons/crm_claim/i18n/el.po b/addons/crm_claim/i18n/el.po
index 50d86f10ba2..6d29a85c072 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -304,6 +304,7 @@ msgid "Stages"
 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 ""
@@ -519,7 +520,6 @@ msgstr "Οι παρακάτω θα λάβουνε το email"
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -747,81 +747,3 @@ msgstr "Ημερομηνία Δημιουργίας"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Έτος"
-
-#~ msgid "Mobile"
-#~ msgstr "Κινητό"
-
-#~ msgid "Extra Info"
-#~ msgstr "Επιπλέον Πληροφορίες"
-
-#~ msgid "Channel"
-#~ msgstr "Κανάλι"
-
-#~ msgid "Status and Categorization"
-#~ msgstr "Κατάσταση και Κατηγοριοποίηση"
-
-#~ msgid "Communication"
-#~ msgstr "Επικοινωνία"
-
-#~ msgid "References"
-#~ msgstr "Αναφορές"
-
-#~ msgid "Cases"
-#~ msgstr "Υποθέσεις"
-
-#~ msgid "Planned Revenue"
-#~ msgstr "Προβλεπόμενα Έσοδα"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
-
-#~ msgid "Closure Date"
-#~ msgstr "Ημερομηνία Κλεισίματος"
-
-#~ msgid "Reference 2"
-#~ msgstr "Παραπομπή 2"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος ! Δεν μπορείτε να δημιουργήσετε κενό Μενού"
-
-#~ msgid "Planned Costs"
-#~ msgstr "Προγραμματισμένο Κόστος"
-
-#~ msgid "Active"
-#~ msgstr "Ενεργή"
-
-#~ msgid "Invalid"
-#~ msgstr "Μη έγκυρο"
-
-#~ msgid "Date"
-#~ msgstr "Ημερομηνία"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Ημερ/νία Αξίωσης"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Θέματα ανά Στάδιο και Εκτιμήσεις"
-
-#~ msgid "Probability (%)"
-#~ msgstr "Πιθανότητα (%)"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Όνομα Υπαλλήλου"
-
-#~ msgid "Name"
-#~ msgstr "Όνομα"
-
-#~ msgid "Claim Info"
-#~ msgstr "Πληρ. Απαίτησης"
-
-#~ msgid "Last Action"
-#~ msgstr "Τελευταία Ενέργεια"
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index 61b657fd85b..9bb37929d53 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -311,6 +311,7 @@ msgid "Stages"
 msgstr "Etapas"
 
 #. 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 "Análisis de reclamaciones"
@@ -537,7 +538,6 @@ msgstr "Estas personas recibirán un email."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -783,115 +783,6 @@ msgstr "Fecha de creación"
 msgid "Year"
 msgstr "Año"
 
-#~ msgid "Cases"
-#~ msgstr "Casos"
-
-#~ msgid "Planned Revenue"
-#~ msgstr "Ingreso previsto"
-
-#~ msgid "Extra Info"
-#~ msgstr "Información extra"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para la arquitectura de la vista"
-
-#~ msgid "Channel"
-#~ msgstr "Canal"
-
-#~ msgid "Status and Categorization"
-#~ msgstr "Estado y categorización"
-
-#~ msgid "References"
-#~ msgstr "Referencias"
-
-#~ msgid "Closure Date"
-#~ msgstr "Fecha de cierre"
-
-#~ msgid "Reference 2"
-#~ msgstr "Referencia 2"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicación"
-
-#~ msgid "Planned Costs"
-#~ msgstr "Costes previstos"
-
-#~ msgid "Active"
-#~ msgstr "Activo"
-
-#~ msgid "Date"
-#~ msgstr "Fecha"
-
-#~ msgid "Claim Info"
-#~ msgstr "Información reclamación"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Fecha de la reclamación"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Casos por etapa y estimaciones"
-
-#~ msgid "Invalid"
-#~ msgstr "No válido"
-
-#~ msgid "Probability (%)"
-#~ msgstr "Probabilidad (%)"
-
-#~ msgid ""
-#~ "The channels represent the different communication  modes available with the "
-#~ "customer."
-#~ msgstr ""
-#~ "Los canales representan los diferentes modos de comunicación disponibles con "
-#~ "el cliente"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nombre del empleado"
-
-#~ msgid "Name"
-#~ msgstr "Nombre"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Last Action"
-#~ msgstr "Última Acción"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la 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 ""
-#~ "Record and track your customers' claims. Claims can be linked to a sales "
-#~ "order or a lot. You can send emails with attachments and get the history of "
-#~ "everything that happened on a specific claim (emails sent, interventions "
-#~ "type and so on..). Claims can be automatically linked to an email address "
-#~ "using the mail gateway module."
-#~ msgstr ""
-#~ "Registre y realice el seguimiento de las reclamaciones de sus clientes. Las "
-#~ "reclamaciones pueden ser relacionadas con un pedido de ventas o un lote. "
-#~ "Puede enviar emails con adjuntos y visualizar el historial de todo lo "
-#~ "ocurrido en una reclamación en concreto (emails enviados, tipos de "
-#~ "intervenciones, ...). Las reclamaciones pueden ser automáticamente "
-#~ "relacionadas con una dirección de email utilizando el módulo de pasarela de "
-#~ "correo."
-
-#~ msgid "Mobile"
-#~ msgstr "Móvil"
-
 #~ msgid "Actions Defined"
 #~ msgstr "Acciones definidas"
 
diff --git a/addons/crm_claim/i18n/es_EC.po b/addons/crm_claim/i18n/es_EC.po
index 19943dfe335..aa4817e7383 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -307,6 +307,7 @@ msgid "Stages"
 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 ""
@@ -522,7 +523,6 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
diff --git a/addons/crm_claim/i18n/es_MX.po b/addons/crm_claim/i18n/es_MX.po
new file mode 100644
index 00000000000..b89a4713e6c
--- /dev/null
+++ b/addons/crm_claim/i18n/es_MX.po
@@ -0,0 +1,790 @@
+# 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-18 07:46+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: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "Responsabilidades"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "Fecha  de la próxima acción"
+
+#. module: crm_claim
+#: field:crm.claim.report,probability:0
+msgid "Probability"
+msgstr "Probabilidad"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "Resolución"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email de los observadores"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "Nº reclamación"
+
+#. 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 ""
+"Puede crear etapas para categorizar los estados de cada reclamación "
+"introducida en el sistema. Las etapas definen todos los pasos necesarios "
+"para la resolución de una reclamación."
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. 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 ""
+"Equipo de ventas al cual pertenece el caso. Define el usuario responsable y "
+"la cuenta de email para la pasarela de correo."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "Descripción reclamación"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "Reclamaciones objetivas"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "Preventivo"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr "Fijado"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha que fue resuelto"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "Acción siguiente"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. 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
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "Acción preventiva"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "Causas principales"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "Responsable problema"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "Más bajo"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr "Objeto de la reclamación"
+
+#. 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 ""
+"Obtenga una visión global de todas las reclamaciones procesadas en el "
+"sistema ordenándolas con criterios específicos."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr "Etapas reclamaciones"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. 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 "Etapa"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr "Histórico información"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. 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 "Análisis de reclamaciones"
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para cerrar el caso"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr "Informe de reclamaciones CRM"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr "Aceptado como reclamación"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr "Correctivo"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr "Tipo de acción"
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr "Valor reclamaciones"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. 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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Cerrada"
+
+#. 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 "Pendiente"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: crm_claim
+#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "Gestión de las relaciones con los clientes y proveedores"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr "A la espera de respuesta"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "Categorías de reclamaciones"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr "Cierre"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le permite realizar un seguimiento de las reclamaciones y "
+"urgencias de sus clientes/proveedores.\n"
+"Está totalmente integrado con la pasarela de correo electrónico para que "
+"pueda crear\n"
+"automáticamente las nuevas reclamaciones a partir de los correos "
+"electrónicos entrantes.\n"
+"    "
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr "Fecha de reclamación"
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr "Acción correctiva"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr "Política de reclamaciones"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr "Historial"
+
+#. 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 "Reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Attachments"
+msgstr "Documentos adjuntos"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etapa del caso"
+
+#. 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 "Estado"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr "Persona que ha reportado la reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr "Causa principal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr "Descripción de la reclamación/acción"
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr "Buscar reclamaciones"
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr "Acciones para resolución"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+msgid "Report a Claim"
+msgstr "Introducir reclamación"
+
+#. 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 ""
+"Registre y haga seguimiento de las reclamaciones de sus clientes. Las "
+"reclamaciones pueden ser vinculadas a un pedido de venta o un lote. Puede "
+"enviar correos electrónicos con archivos adjuntos y mantener el historial "
+"completo de una reclamación (correos electrónicos enviados, tipo de "
+"intervención, etc.). Las reclamaciones pueden vincularse automáticamente a "
+"una dirección de correo electrónico utilizando el módulo pasarela de correo."
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr "Seguimiento"
+
+#. 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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces el estado se establece a "
+"'Pendiente'."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr "No se corregirá"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. 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 ""
+"Cree categorías de reclamaciones para gestionar y clasificar mejor sus "
+"reclamaciones. Algunos ejemplos de reclamaciones son: acción preventiva, "
+"acción correctiva."
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#~ msgid "Actions Defined"
+#~ msgstr "Acciones definidas"
+
+#~ msgid "Actions Done"
+#~ msgstr "Acciones realizadas"
diff --git a/addons/crm_claim/i18n/es_PY.po b/addons/crm_claim/i18n/es_PY.po
index 8f8da81d1e1..0f888cb2526 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -311,6 +311,7 @@ msgid "Stages"
 msgstr "Etapas"
 
 #. 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 "Análisis de reclamaciones"
@@ -537,7 +538,6 @@ msgstr "Estas personas recibirán correo electronico."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
diff --git a/addons/crm_claim/i18n/es_VE.po b/addons/crm_claim/i18n/es_VE.po
new file mode 100644
index 00000000000..b89a4713e6c
--- /dev/null
+++ b/addons/crm_claim/i18n/es_VE.po
@@ -0,0 +1,790 @@
+# 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-18 07:46+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: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "Responsabilidades"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "Fecha  de la próxima acción"
+
+#. module: crm_claim
+#: field:crm.claim.report,probability:0
+msgid "Probability"
+msgstr "Probabilidad"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "Resolución"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email de los observadores"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "Nº reclamación"
+
+#. 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 ""
+"Puede crear etapas para categorizar los estados de cada reclamación "
+"introducida en el sistema. Las etapas definen todos los pasos necesarios "
+"para la resolución de una reclamación."
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. 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 ""
+"Equipo de ventas al cual pertenece el caso. Define el usuario responsable y "
+"la cuenta de email para la pasarela de correo."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "Descripción reclamación"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "Reclamaciones objetivas"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "Preventivo"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr "Fijado"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha que fue resuelto"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "Acción siguiente"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. 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
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "Acción preventiva"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "Causas principales"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "Responsable problema"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "Más bajo"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr "Objeto de la reclamación"
+
+#. 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 ""
+"Obtenga una visión global de todas las reclamaciones procesadas en el "
+"sistema ordenándolas con criterios específicos."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr "Etapas reclamaciones"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. 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 "Etapa"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr "Histórico información"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. 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 "Análisis de reclamaciones"
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para cerrar el caso"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr "Informe de reclamaciones CRM"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr "Aceptado como reclamación"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr "Correctivo"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr "Tipo de acción"
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr "Valor reclamaciones"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. 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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Cerrada"
+
+#. 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 "Pendiente"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: crm_claim
+#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "Gestión de las relaciones con los clientes y proveedores"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr "A la espera de respuesta"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "Categorías de reclamaciones"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr "Cierre"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le permite realizar un seguimiento de las reclamaciones y "
+"urgencias de sus clientes/proveedores.\n"
+"Está totalmente integrado con la pasarela de correo electrónico para que "
+"pueda crear\n"
+"automáticamente las nuevas reclamaciones a partir de los correos "
+"electrónicos entrantes.\n"
+"    "
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr "Fecha de reclamación"
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr "Acción correctiva"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr "Política de reclamaciones"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr "Historial"
+
+#. 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 "Reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Attachments"
+msgstr "Documentos adjuntos"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etapa del caso"
+
+#. 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 "Estado"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr "Persona que ha reportado la reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr "Causa principal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr "Descripción de la reclamación/acción"
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr "Buscar reclamaciones"
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr "Acciones para resolución"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+msgid "Report a Claim"
+msgstr "Introducir reclamación"
+
+#. 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 ""
+"Registre y haga seguimiento de las reclamaciones de sus clientes. Las "
+"reclamaciones pueden ser vinculadas a un pedido de venta o un lote. Puede "
+"enviar correos electrónicos con archivos adjuntos y mantener el historial "
+"completo de una reclamación (correos electrónicos enviados, tipo de "
+"intervención, etc.). Las reclamaciones pueden vincularse automáticamente a "
+"una dirección de correo electrónico utilizando el módulo pasarela de correo."
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr "Seguimiento"
+
+#. 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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces el estado se establece a "
+"'Pendiente'."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr "No se corregirá"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. 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 ""
+"Cree categorías de reclamaciones para gestionar y clasificar mejor sus "
+"reclamaciones. Algunos ejemplos de reclamaciones son: acción preventiva, "
+"acción correctiva."
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#~ msgid "Actions Defined"
+#~ msgstr "Acciones definidas"
+
+#~ msgid "Actions Done"
+#~ msgstr "Acciones realizadas"
diff --git a/addons/crm_claim/i18n/fi.po b/addons/crm_claim/i18n/fi.po
index c9d675e392e..3d74fc9f7a3 100644
--- a/addons/crm_claim/i18n/fi.po
+++ b/addons/crm_claim/i18n/fi.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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Tapausten määrä"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -31,17 +31,17 @@ msgstr "Ryhmittele"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr ""
+msgstr "Vastuut"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Seuraava toiminnon päivä"
 
 #. module: crm_claim
 #: field:crm.claim.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Todennäköisyys"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -51,12 +51,12 @@ msgstr "Maaliskuu"
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Viive sulkemiseen"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
 msgid "Resolution"
-msgstr ""
+msgstr "Ratkaisu"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
@@ -68,12 +68,12 @@ msgstr "Yritys"
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Seuraajien Sähköpostit"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr ""
+msgstr "Reklamaation numero"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -82,12 +82,15 @@ msgid ""
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
 msgstr ""
+"Voit luoda reklamaation tasoja kategorioidaksesi järjestelmään syötettyjen "
+"reklamaatioiden tilaa. Vaiheet määrittelevät kaikki vaiheet joita vaaditaan "
+"reklamaation hoitamiseksi."
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Korkein"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -106,11 +109,13 @@ msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Myyntitiimi, johon tapaus kuuluu. Määrittele vastuuhenkilö ja "
+"sähköpostiosoite postinvälityspalvelimelle"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Description"
-msgstr ""
+msgstr "Reklamaation kuvaus"
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -120,7 +125,7 @@ msgstr "Viestit"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Tosiasiallisest vaateet"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
@@ -131,7 +136,7 @@ msgstr "Peruttu"
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Ennaltaehkäisevä"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
@@ -141,7 +146,7 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Kumppanin Yhteystiedot"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
@@ -151,7 +156,7 @@ msgstr "Päättymispäivä"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Kuukausi   "
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
@@ -161,7 +166,7 @@ msgstr "Viite"
 #. module: crm_claim
 #: field:crm.claim,action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Seuraava Toimenpide"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -187,29 +192,29 @@ msgstr "Kumppani"
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
-msgstr ""
+msgstr "Ennaltaehkäisevä toimenpide"
 
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Osa"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Root Causes"
-msgstr ""
+msgstr "Juurisyyt"
 
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
 msgid "Trouble Responsible"
-msgstr ""
+msgstr "Ongelmasta vastuullinen"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteetti"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -219,13 +224,13 @@ msgstr "Lähetä uusi sähköposti"
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Ylitetty aikaraja"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -236,17 +241,17 @@ msgstr "Sähköposti"
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Alin"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr ""
+msgstr "Reklamaation otsikko"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -254,21 +259,23 @@ msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
 msgstr ""
+"Näytä yleisnäkymä kaikista järjestelmässä käsitellyistä reklamaatioista "
+"järjestelemällä ne tiettyjen kriteerien mukaan."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr ""
+msgstr "Reklamaation vaiheet"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriat"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -276,57 +283,58 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Vaihe"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History Information"
-msgstr ""
+msgstr "Historiatiedot"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "Päivämäärät"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Kuukausi-1    "
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "Yhteyshenkilö"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Vaiheet"
 
 #. 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 ""
+msgstr "Reklamaatioiden analyysi"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Päivien määrä tapauksen sulkemiseen"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "CRM reklamaatioraportti"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Vastaanotettu reklamaationa"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Korjaava"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -342,18 +350,18 @@ msgstr "Joulukuu"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: crm_claim
 #: field:crm.claim,type_action:0
 #: field:crm.claim.report,type_action:0
 msgid "Action Type"
-msgstr ""
+msgstr "Toiminnon tyyppi"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Päivityksen päiväys"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -365,17 +373,17 @@ msgstr "Myyjä"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategoria"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Arvoreklamaatio"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Vuosi  "
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -384,6 +392,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Nämä sähköpostiosoitteet lisätään cc (kopio viestistä) kenttään tähän "
+"tietueeseen liittyvien sähköpostien osalta. Erota useammat osoitteet "
+"pilkulla."
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
@@ -396,7 +407,7 @@ msgstr "Luonnos"
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Matala"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
@@ -411,12 +422,12 @@ msgstr "Suljettu"
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottava"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Kommunikaatio ja historia"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -437,7 +448,7 @@ msgstr ""
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Asiakas & Toimittaja Hallinta"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -447,7 +458,7 @@ msgstr "Kesäkuu"
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Puh."
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
@@ -462,7 +473,7 @@ msgstr ""
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr ""
+msgstr "Reklamaatiokategoriat"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -472,17 +483,17 @@ msgstr "Marraskuu"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "Sulkeminen"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "Etsi"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -509,43 +520,42 @@ msgstr "Tammikuu"
 #: view:crm.claim:0
 #: field:crm.claim,date:0
 msgid "Claim Date"
-msgstr ""
+msgstr "Reklamaation päiväys"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Nämä henkilöt vastaanottavat sähköpostin."
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
-msgstr ""
+msgstr "Reklamaatiot"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "Korjaava toimenpide"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Käytäntövaateet"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. 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 ""
+msgstr "Reklamaatio"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -555,7 +565,7 @@ msgstr "Liitteet"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Tapahtuman vaihe"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -563,29 +573,29 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "Reklamaation ilmoittaja"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -593,75 +603,75 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Avoin"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "Käynnissä"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Yksityiskohdat"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "Vastaa"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "Juurisyy"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Reklaamaation/toimenpiteen kuvaus"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Hae reklamaatioita"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Myyntitiimi"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "Korjaavat toimenpiteet"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
 msgid "Report a Claim"
-msgstr ""
+msgstr "Raportoi reklamaatio"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -675,12 +685,12 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Sähköpostien määrä"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "Seuranta"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -702,7 +712,7 @@ msgstr "Helmikuu"
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Ei korjaa"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -712,23 +722,23 @@ msgstr "Huhtikuu"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Omat tapaukset"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "Tunniste (ID)"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Toiminnot"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Korkea"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
@@ -736,14 +746,22 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
+"Luo reklamaatiokategoriat halitaksesi paremmin reklamaatiosi. Joitain "
+"esimerkkejä voivat olla ennaltahekäisevät ja korjaavat toimenpiteet"
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Vuosi"
+
+#~ msgid "Actions Defined"
+#~ msgstr "Määritellyt toimenpiteet"
+
+#~ msgid "Actions Done"
+#~ msgstr "Tehdyt toimenpiteet"
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index ab5371282c1..76729d3f48d 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -311,6 +311,7 @@ msgid "Stages"
 msgstr "Étapes"
 
 #. 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 "Analyse des réclamations"
@@ -535,7 +536,6 @@ msgstr "Ces personnes recevront un courriel."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -781,20 +781,3 @@ msgstr "Année"
 
 #~ msgid "Actions Done"
 #~ msgstr "Actions terminées"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Cas par étape et estimations"
-
-#~ msgid ""
-#~ "Record and track your customers' claims. Claims can be linked to a sales "
-#~ "order or a lot. You can send emails with attachments and get the history of "
-#~ "everything that happened on a specific claim (emails sent, interventions "
-#~ "type and so on..). Claims can be automatically linked to an email address "
-#~ "using the mail gateway module."
-#~ msgstr ""
-#~ "Enregistrer et suivre les réclamations de la clientèle. Les réclamations "
-#~ "peuvent être associées à une vente ou un lot. Vous pouvez envoyer des "
-#~ "courriels avec des pièces jointes et obtenir l'historique de tout ce qui "
-#~ "s'est passé sur une réclamation (courriels envoyés, type d'interventions et "
-#~ "ainsi de suite ..). Les réclamations peuvent être automatiquement liées à "
-#~ "une adresse courriel en utilisant le module \"mail gateway\"."
diff --git a/addons/crm_claim/i18n/gl.po b/addons/crm_claim/i18n/gl.po
index 7b263c7c94a..8f74947847d 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -311,6 +311,7 @@ msgid "Stages"
 msgstr "Etapas"
 
 #. 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 "Análise das reclamacións"
@@ -535,7 +536,6 @@ msgstr "Estas persoas recibirán un e-mail."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -776,3 +776,9 @@ msgstr "Crear data"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Ano"
+
+#~ msgid "Actions Defined"
+#~ msgstr "Accións definidas"
+
+#~ msgid "Actions Done"
+#~ msgstr "Accións realizadas"
diff --git a/addons/crm_claim/i18n/hr.po b/addons/crm_claim/i18n/hr.po
index da67c7b6976..23c499f9b72 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -304,6 +304,7 @@ msgid "Stages"
 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 ""
@@ -519,7 +520,6 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -747,12 +747,3 @@ msgstr ""
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr ""
-
-#~ msgid "This Year"
-#~ msgstr "Ove godine"
-
-#~ msgid "Planned Revenue"
-#~ msgstr "Planirani prihod"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravan naziv modela u definiciji akcije"
diff --git a/addons/crm_claim/i18n/hu.po b/addons/crm_claim/i18n/hu.po
index e917575e53a..d153b9e6957 100644
--- a/addons/crm_claim/i18n/hu.po
+++ b/addons/crm_claim/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 19:57+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -303,6 +304,7 @@ msgid "Stages"
 msgstr "Szakaszok"
 
 #. 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 "Követelések elemzése"
@@ -518,7 +520,6 @@ msgstr "Ezek az emberek fogják megkapni az e-mailt."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index 7f537f8c495..4990f19480d 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -307,6 +307,7 @@ msgid "Stages"
 msgstr "Stadi"
 
 #. 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 "Analisi reclami"
@@ -319,7 +320,7 @@ msgstr "Numero di giorni per chiudere il caso"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr "Report reclamo CRM"
+msgstr "Report dei reclami"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
@@ -528,7 +529,6 @@ msgstr "Queste persone riceveranno email."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -767,45 +767,3 @@ msgstr "Data creazione"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Anno"
-
-#~ msgid "This Year"
-#~ msgstr "Anno attuale"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Claim Type"
-#~ msgstr "Tipo di richiesta"
-
-#~ msgid "Mobile"
-#~ msgstr "Cellulare"
-
-#~ msgid "Cases"
-#~ msgstr "Casi"
-
-#~ msgid ""
-#~ "The channels represent the different communicationmodes available with the "
-#~ "customer. With each commercial opportunity, you can indicate thecanall which "
-#~ "is this opportunity source."
-#~ msgstr ""
-#~ "I canali sappresentano i differenti modi di comunicazione disponibili con il "
-#~ "cliente. Con tutte le opportunità commerciali puoi indicare il canale da cui "
-#~ "è stata generata l'opportunità."
-
-#~ msgid "My Case"
-#~ msgstr "I miei Casi"
-
-#~ msgid "Extra Info"
-#~ msgstr "Informazioni Aggiuntive"
-
-#~ msgid "Active"
-#~ msgstr "Attivo"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Data del reclamo"
-
-#~ msgid "Claim Info"
-#~ msgstr "Informazioni reclamo"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Casi di studio e stime"
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 4a7c15f1923..efe3cd04a4c 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -311,6 +311,7 @@ msgid "Stages"
 msgstr "Fasen"
 
 #. 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 "Klachten Analyse"
@@ -535,7 +536,6 @@ msgstr "Deze personen ontvangen email."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -777,148 +777,3 @@ msgstr "Aanmaakdatum"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Jaar"
-
-#~ msgid "This Year"
-#~ msgstr "Dit jaar"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid "Mobile"
-#~ msgstr "Mobiel"
-
-#~ msgid "Cases"
-#~ msgstr "Dossiers"
-
-#~ msgid "Active"
-#~ msgstr "Actief"
-
-#~ msgid "Channel"
-#~ msgstr "Kanaal"
-
-#~ msgid "Claim Resource Type"
-#~ msgstr "Klacht Actie Soorten"
-
-#~ msgid "Reference 2"
-#~ msgstr "Referentie 2"
-
-#~ msgid "7 Days"
-#~ msgstr "7 Dagen"
-
-#~ msgid "Type of Action"
-#~ msgstr "Soort actie"
-
-#~ msgid "Resource Type"
-#~ msgstr "Actie Soort"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Invalid"
-#~ msgstr "Ongeldig"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Communication"
-#~ msgstr "Communicatie"
-
-#~ msgid "Claim Info"
-#~ msgstr "Klacht Informatie"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Klachtdatum"
-
-#~ msgid "Name"
-#~ msgstr "Naam"
-
-#~ msgid "This Month"
-#~ msgstr "Deze maand"
-
-#~ msgid "Communication history"
-#~ msgstr "Communicatiegeschiedenis"
-
-#~ msgid "Last Action"
-#~ msgstr "Laatste actie"
-
-#~ msgid "Claim Type"
-#~ msgstr "Soort klacht"
-
-#~ msgid ""
-#~ "The channels represent the different communicationmodes available with the "
-#~ "customer. With each commercial opportunity, you can indicate thecanall which "
-#~ "is this opportunity source."
-#~ msgstr ""
-#~ "De kanalen geven de verschillende beschikbare communicatievormen met de "
-#~ "klant weer. Met elke verkoopkans kunt u aangeven via welk kanaal deze kans "
-#~ "is ontstaan."
-
-#~ msgid "My Case"
-#~ msgstr "Mijn klacht"
-
-#~ msgid "Extra Info"
-#~ msgstr "Extra info"
-
-#~ msgid "Stage: "
-#~ msgstr "Fase: "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Status and Categorization"
-#~ msgstr "Status en and indeling"
-
-#~ msgid "Closure Date"
-#~ msgstr "Afsluitdatum"
-
-#~ msgid "Planned Costs"
-#~ msgstr "Verwachte kosten"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Probability (%)"
-#~ msgstr "Waarschijnlijkheid (%)"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Klachten op fase en schattingen"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Werknemernaam"
-
-#~ msgid "References"
-#~ msgstr "Verwijzingen"
-
-#~ msgid "Planned Revenue"
-#~ msgstr "Geplande omzet"
-
-#~ msgid ""
-#~ "The channels represent the different communication  modes available with the "
-#~ "customer."
-#~ msgstr ""
-#~ "Het kanalen vertegenwoordigen de verschillende beschikbare "
-#~ "communicatievormen met de klant."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "Record and track your customers' claims. Claims can be linked to a sales "
-#~ "order or a lot. You can send emails with attachments and get the history of "
-#~ "everything that happened on a specific claim (emails sent, interventions "
-#~ "type and so on..). Claims can be automatically linked to an email address "
-#~ "using the mail gateway module."
-#~ msgstr ""
-#~ "Vastleggen en volgen van klant klachten. Klachten kunnen worden gekoppeld "
-#~ "aan een verkooporder of partij. U kunt emails met bijlagen versturen en "
-#~ "geschiedenis opbouwen van alles wat er rond een klacht gebeurt. Klachten "
-#~ "kunnen automatisch aan een emailadres worden gekoppeld voor gebruik met de "
-#~ "mail gateway."
diff --git a/addons/crm_claim/i18n/pl.po b/addons/crm_claim/i18n/pl.po
index 4f3bc814166..6d17cfe02f4 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -304,6 +304,7 @@ msgid "Stages"
 msgstr "Etapy"
 
 #. 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 "Analiza reklamacji"
@@ -519,7 +520,6 @@ msgstr "Ci ludzie otrzymają wiadomość"
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -754,93 +754,3 @@ msgstr "Data utworzenia"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Rok"
-
-#~ msgid "This Year"
-#~ msgstr "W tym roku"
-
-#~ msgid "Planned Revenue"
-#~ msgstr "Planowany dochód"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Claim Type"
-#~ msgstr "Typ reklamacji"
-
-#~ msgid "Mobile"
-#~ msgstr "Tel. komórkowy"
-
-#~ msgid "Cases"
-#~ msgstr "Sprawy"
-
-#~ msgid "My Case"
-#~ msgstr "Moja sprawa"
-
-#~ msgid "Extra Info"
-#~ msgstr "Dodatkowe informacje"
-
-#~ msgid "Active"
-#~ msgstr "Aktywne"
-
-#~ msgid "Stage: "
-#~ msgstr "Etap: "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Channel"
-#~ msgstr "Kanał"
-
-#~ msgid "Planned Costs"
-#~ msgstr "Planowane koszty"
-
-#~ msgid "Reference 2"
-#~ msgstr "Odnośnik 2"
-
-#~ msgid "Type of Action"
-#~ msgstr "Typ akcji"
-
-#~ msgid "Resource Type"
-#~ msgstr "Typ zasobu"
-
-#~ msgid "Invalid"
-#~ msgstr "Niepoprawne"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikacja"
-
-#~ msgid "Probability (%)"
-#~ msgstr "Prawdopodobieństwo (%)"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Data reklamacji"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Sprawy wg etapów i szacunków"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nazwisko pracownika"
-
-#~ msgid "Name"
-#~ msgstr "Nazwa"
-
-#~ msgid "This Month"
-#~ msgstr "W tym miesiącu"
-
-#~ msgid "Communication history"
-#~ msgstr "Historia komunikacji"
-
-#~ msgid "References"
-#~ msgstr "Odnośniki"
-
-#~ msgid "Last Action"
-#~ msgstr "Ostatnia akcja"
diff --git a/addons/crm_claim/i18n/pt.po b/addons/crm_claim/i18n/pt.po
index 84bab3015ac..291445bf784 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -304,6 +304,7 @@ msgid "Stages"
 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 ""
@@ -519,7 +520,6 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po
index d51c62e91e4..f7f5f593f31 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -311,6 +311,7 @@ msgid "Stages"
 msgstr "Estágios"
 
 #. 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 "Análise de Reclamações"
@@ -535,7 +536,6 @@ msgstr "Essas pessoas receberão e-mail."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -778,15 +778,6 @@ msgstr "Data de Criação"
 msgid "Year"
 msgstr "Ano"
 
-#~ msgid "Planned Revenue"
-#~ msgstr "Lucro Planejado"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome do modelo inválido na definição da ação."
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Casos Por Estágio e Estimativas"
-
 #~ msgid "Actions Defined"
 #~ msgstr "Ações Definidas"
 
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index 7ba3c3cb792..badffcaae25 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr "кол-во вопросов"
+msgstr "кол-во дел"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -31,7 +31,7 @@ msgstr "Объединять по..."
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr ""
+msgstr "Обязанности"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
@@ -68,7 +68,7 @@ msgstr "Компания"
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Адреса наблюдателей"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -82,6 +82,9 @@ msgid ""
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
 msgstr ""
+"Вы можете создавать этапы претензий для категоризации любой введенной в "
+"систему претензии. Этапы определяют все шаги, необходимые для разрешения "
+"претензий."
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -106,6 +109,8 @@ 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
@@ -306,6 +311,7 @@ msgid "Stages"
 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 "Анализ претензий"
@@ -313,7 +319,7 @@ msgstr "Анализ претензий"
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr "Количество дней, для закрытия вопроса"
+msgstr "Количество дней, для закрытия дела"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
@@ -386,6 +392,8 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Эти эл. адреса будут добавлены в поле \"Копия\" всей входящей и исходящей "
+"почты для этой записи. Разделяйте эл. адреса запятыми."
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
@@ -501,6 +509,12 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Эти модули позволяют Вам отслеживать претензии ваших "
+"поставщиков/заказчиков.\n"
+"Они полностью интегрированы с шлюзами эл. почты, таким образом, что вы\n"
+"можете автоматически создавать претензии из входящих эл. писем.\n"
+"    "
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -521,7 +535,6 @@ msgstr "Эти люди получат эл. письма."
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -536,7 +549,7 @@ msgstr "Исправляющее действие"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Политика претензий"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -557,7 +570,7 @@ msgstr "Вложения"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_case_stage
 msgid "Stage of case"
-msgstr "Этап вопроса"
+msgstr "Этап дела"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -673,6 +686,11 @@ 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 ""
+"Запись и отслеживание претензий заказчиков. Претензии могут быть связаны с "
+"заказом на продажу или с партией ТМЦ. Вы можете посылать эл. письма с "
+"приложенными файлами и сохранять всю историю претензии (отосланные эл. "
+"письма, тип вмешательства и т.д.). Претензии могут быть автоматически "
+"связаны c эл. адресами используя шлюз эл. почты."
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
@@ -695,10 +713,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"Состояние  установлено в 'Черновик', при создании вопроса.       \n"
-"Если вопрос в работе состояние  установлено в 'Открыто'.            \n"
-"Когда вопрос  решен состояние  установлено в 'Сделано'.              \n"
-"Если вопрос нуждается в рассмотрении, то состояние 'В ожидании'."
+"Состояние  установлено в 'Черновик', при создании дела.       \n"
+"Если дело в работе, состояние  установлено в 'Открыто'.            \n"
+"Когда дело  завершено, состояние  установлено в 'Сделано'.              \n"
+"Если дело нуждается в рассмотрении, то состояние 'В ожидании'."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -718,7 +736,7 @@ msgstr "Апрель"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr "Мои вопросы"
+msgstr "Мои дела"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
@@ -755,3 +773,9 @@ msgstr "Дата создания"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Год"
+
+#~ msgid "Actions Defined"
+#~ msgstr "Определенные действия"
+
+#~ msgid "Actions Done"
+#~ msgstr "Выполненные действия"
diff --git a/addons/crm_claim/i18n/sq.po b/addons/crm_claim/i18n/sq.po
index c97bbdbc933..fb1c7400142 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -304,6 +304,7 @@ msgid "Stages"
 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 ""
@@ -519,7 +520,6 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
diff --git a/addons/crm_claim/i18n/sr.po b/addons/crm_claim/i18n/sr.po
index de1b72282b2..c0a6c1f7b02 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -306,6 +306,7 @@ msgid "Stages"
 msgstr "Nivoi"
 
 #. 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 "Analiza Zahteva"
@@ -523,7 +524,6 @@ msgstr "Ovi ce ljudi primiti Email"
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -760,87 +760,3 @@ msgstr "Datum Kreiranja"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Godina"
-
-#~ msgid "Cases"
-#~ msgstr "Slucajevi"
-
-#~ msgid "Planned Revenue"
-#~ msgstr "Planirani Prihod"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije"
-
-#~ msgid "Mobile"
-#~ msgstr "Mobilni"
-
-#~ msgid "Extra Info"
-#~ msgstr "Dodatne Informacije"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture!"
-
-#~ msgid "Channel"
-#~ msgstr "Kanal"
-
-#~ msgid "Status and Categorization"
-#~ msgstr "Status i Kategorizacija"
-
-#~ msgid "References"
-#~ msgstr "Reference"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikacija"
-
-#~ msgid "Planned Costs"
-#~ msgstr "Planirani Troskovi"
-
-#~ msgid "Closure Date"
-#~ msgstr "Datum zatvaranja"
-
-#~ msgid "Reference 2"
-#~ msgstr "Referenca 2"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Active"
-#~ msgstr "Aktivan"
-
-#~ msgid "Invalid"
-#~ msgstr "Neispravno"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Claim Info"
-#~ msgstr "Info Potraživanja"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Datum Potrazivanja"
-
-#~ msgid "Probability (%)"
-#~ msgstr "Verovatnoca (%)"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Slucjajevi po Nivoima i Ocekivanjima"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Ime Zaposlenog"
-
-#~ msgid "Name"
-#~ msgstr "Ime"
-
-#~ msgid ""
-#~ "The channels represent the different communication  modes available with the "
-#~ "customer."
-#~ msgstr ""
-#~ "Kanal reprezentuje razlicite komunikacione nacine dostupnih za komunikaciju "
-#~ "sa Klijentom"
-
-#~ msgid "Last Action"
-#~ msgstr "Poslednja Akcija"
diff --git a/addons/crm_claim/i18n/sr@latin.po b/addons/crm_claim/i18n/sr@latin.po
index efcf65cec84..7695170762c 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -306,6 +306,7 @@ msgid "Stages"
 msgstr "Nivoi"
 
 #. 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 "Analiza Zahteva"
@@ -523,7 +524,6 @@ msgstr "Ovi ce ljudi primiti Email"
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -760,84 +760,3 @@ msgstr "Datum Kreiranja"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Godina"
-
-#~ msgid "Planned Revenue"
-#~ msgstr "Planirani Prihod"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije"
-
-#~ msgid "Cases"
-#~ msgstr "Slucajevi"
-
-#~ msgid "Mobile"
-#~ msgstr "Mobilni"
-
-#~ msgid "Extra Info"
-#~ msgstr "Dodatne Informacije"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture!"
-
-#~ msgid "Channel"
-#~ msgstr "Kanal"
-
-#~ msgid "References"
-#~ msgstr "Reference"
-
-#~ msgid "Status and Categorization"
-#~ msgstr "Status i Kategorizacija"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikacija"
-
-#~ msgid "Reference 2"
-#~ msgstr "Referenca 2"
-
-#~ msgid "Closure Date"
-#~ msgstr "Datum zatvaranja"
-
-#~ msgid "Planned Costs"
-#~ msgstr "Planirani Troskovi"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Active"
-#~ msgstr "Aktivan"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Claim Info"
-#~ msgstr "Info Potraživanja"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Date of Claim"
-#~ msgstr "Datum Potrazivanja"
-
-#~ msgid "Cases By Stage and Estimates"
-#~ msgstr "Slucjajevi po Nivoima i Ocekivanjima"
-
-#~ msgid "Probability (%)"
-#~ msgstr "Verovatnoca (%)"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Ime Zaposlenog"
-
-#~ msgid ""
-#~ "The channels represent the different communication  modes available with the "
-#~ "customer."
-#~ msgstr ""
-#~ "Kanal reprezentuje razlicite komunikacione nacine dostupnih za komunikaciju "
-#~ "sa Klijentom"
-
-#~ msgid "Name"
-#~ msgstr "Ime"
-
-#~ msgid "Last Action"
-#~ msgstr "Poslednja Akcija"
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index 9bb3dc44588..526fd0ff4f5 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -304,6 +304,7 @@ msgid "Stages"
 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 ""
@@ -519,7 +520,6 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -747,6 +747,3 @@ msgstr "Skapat datum"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "År"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
diff --git a/addons/crm_claim/i18n/tr.po b/addons/crm_claim/i18n/tr.po
index b719005f0da..913ac79d24d 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -311,6 +311,7 @@ msgid "Stages"
 msgstr "Aşamalar"
 
 #. 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 "Şikayetlerin Analizi"
@@ -534,7 +535,6 @@ msgstr "Bu kişilere e-posta iletilecektir"
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -776,3 +776,9 @@ msgstr "Tarih Oluştur"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "Yıl"
+
+#~ msgid "Actions Defined"
+#~ msgstr "Tanımlanan Eylemler"
+
+#~ msgid "Actions Done"
+#~ msgstr "Biten Eylemler"
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
index 31932afed94..f51f65bcaf8 100644
--- a/addons/crm_claim/i18n/zh_CN.po
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-11 05:47+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -81,7 +81,7 @@ 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 "你能创建索赔阶段的类型把每个索赔的状况输入到系统。阶段定义所有索赔请求的解决步骤。"
+msgstr "你能建立索赔阶段的分类在系统输入每个索赔的状态度。阶段定义索赔解决方案的所有需求的步骤。"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -105,7 +105,7 @@ msgstr "添加内部备注"
 msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
-msgstr "业务的销售团队定义负责用户和邮件网关的邮件地址。"
+msgstr "销售团队属于的业务，定义负责人和邮件地址。"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -131,7 +131,7 @@ msgstr "已取消"
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr "预防"
+msgstr "预防措施"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
@@ -156,7 +156,7 @@ msgstr "   月   "
 #. module: crm_claim
 #: field:crm.claim,ref:0
 msgid "Reference"
-msgstr "参考"
+msgstr "关联"
 
 #. module: crm_claim
 #: field:crm.claim,action_next:0
@@ -187,12 +187,12 @@ msgstr "业务伙伴"
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
-msgstr "预防性动作"
+msgstr "预防措施的动作"
 
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
-msgstr "分类"
+msgstr "划分"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -202,7 +202,7 @@ msgstr "根本原因"
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
 msgid "Trouble Responsible"
-msgstr "故障责任"
+msgstr "问题责任"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
@@ -219,13 +219,13 @@ msgstr "发送新的电子邮件"
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "超越截止日期"
+msgstr "超过截止日期"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr "类型："
+msgstr "类型"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -253,7 +253,7 @@ msgstr "索赔主题"
 msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
-msgstr "所有索赔都有一个一般描述在系统里还对它们按具体的标准分类。"
+msgstr "为系统内所有的索赔处理指定一个排序标准"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -268,7 +268,7 @@ msgstr "索赔阶段"
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -304,6 +304,7 @@ msgid "Stages"
 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 "索赔分析"
@@ -365,7 +366,7 @@ msgstr "业务员"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
@@ -411,7 +412,7 @@ msgstr "已结束"
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr "待定中"
+msgstr "待处理"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -462,7 +463,7 @@ msgstr "等待回复"
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr "索赔类型"
+msgstr "索赔分类"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -472,7 +473,7 @@ msgstr "11月"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr "扩展过滤..."
+msgstr "增加筛选条件"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -482,7 +483,7 @@ msgstr "关闭"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr "查找"
+msgstr "搜索"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -522,7 +523,6 @@ msgstr "这些人将收到电子邮件。"
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -537,7 +537,7 @@ msgstr "纠正的动作"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr "保险单索赔"
+msgstr "索赔政策"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -566,7 +566,7 @@ msgstr "业务阶段"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr "州/省"
+msgstr "状态"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -577,7 +577,7 @@ msgstr "完成"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr "索赔记者"
+msgstr "索赔者"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -617,7 +617,7 @@ msgstr "当前的"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr "明细行"
+msgstr "详细"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -642,7 +642,7 @@ msgstr "说明"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr "查找索赔"
+msgstr "搜索索赔"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
@@ -726,7 +726,7 @@ msgstr "我的业务"
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -756,3 +756,9 @@ msgstr "创建日期"
 #: field:crm.claim.report,name:0
 msgid "Year"
 msgstr "年"
+
+#~ msgid "Actions Defined"
+#~ msgstr "动作定义"
+
+#~ msgid "Actions Done"
+#~ msgstr "动作完成"
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index aed3233976e..6075a842182 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -60,22 +60,20 @@ class crm_claim_report(osv.osv):
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True, select=True),
-        'day': fields.char('Day', size=128, readonly=True), 
+        'day': fields.char('Day', size=128, readonly=True),
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type','=','claim')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.claim')]", readonly=True),
-        'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
-        'date_closed': fields.date('Close Date', readonly=True, select=True), 
-        'date_deadline': fields.date('Deadline', readonly=True, select=True), 
+        'date_closed': fields.date('Close Date', readonly=True, select=True),
+        'date_deadline': fields.date('Deadline', readonly=True, select=True),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
-        'email': fields.integer('# Emails', size=128, readonly=True),
-         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg")
+        'email': fields.integer('# Emails', size=128, readonly=True)
     }
 
     def init(self, cr):
@@ -106,8 +104,7 @@ class crm_claim_report(osv.osv):
                     c.type_action as type_action,
                     date_trunc('day',c.create_date) as create_date,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.claim' AND res_id=c.id AND history=True) AS email,
-                    (SELECT avg(probability) FROM crm_case_stage WHERE type='claim' AND id=c.stage_id) AS probability,
+                    (SELECT count(id) FROM mail_message WHERE model='crm.claim' AND res_id=c.id) AS email,
                     extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected
                 from
                     crm_claim c
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index e790183e5db..4505c72237c 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -20,7 +20,6 @@
                     <field name="nbr" string="#Claim" sum="#Claim"/>
                     <field name="email" sum="# Mails"/>
                     <field name="delay_close" avg="Avg Closing Delay"/>
-                    <field name="probability" widget="progressbar"/>
                     <field name="delay_expected"/>
                     <field name="state" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
@@ -54,22 +53,23 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
-                       <filter string="  Year  " icon="terp-go-year"
+                  <group>
+                       <filter string="Year" icon="terp-go-year" name="year"
                                domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                                help="Claims created in current year"/>
+                        <separator orientation="vertical" />
 
-                       <filter string="   Month   " icon="terp-go-month" name="This Month"
+                       <filter string="Month" icon="terp-go-month" name="This Month"
                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Claims created in current month"/>
 
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="Month-1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Claims created in last month"/>
 
                         <separator orientation="vertical" />
                         <filter icon="terp-document-new"
-                            string="Draft"
+                            string="New"
                             domain="[('state','=','draft')]"/>
                         <filter icon="terp-camera_test"
                             string="Open"
@@ -95,7 +95,7 @@
                                 help="My company"/>
                         </field>
 
-                        <field name="user_id" string="Salesman" select="1">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -110,7 +110,7 @@
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('type', '=', 'claim')]"/>
+                        <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
                         <separator orientation="vertical"/>
                         <field name="priority" />
@@ -152,11 +152,11 @@
                             help="Date of claim"/>
 
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" 
+                            domain="[]" context="{'group_by':'month'}"
                             help="Month of claim"/>
 
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" 
+                            domain="[]" context="{'group_by':'name'}"
                             help="Year of claim"/>
                     </group>
                 </search>
@@ -170,7 +170,7 @@
             <field name="res_model">crm.claim.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"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_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
             <field name="help">Have a general overview of all claims processed in the system by sorting them with specific criteria.</field>
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index ac2752f58b2..b23ef97b7fd 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -2,3 +2,4 @@
 "access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,1,1,1
 "access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
 "access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
+"access_crm_claim_partner_manager","crm.claim.partner.manager","model_crm_claim","base.group_partner_manager",1,0,0,0
diff --git a/addons/crm_claim/test/test_crm_claim.yml b/addons/crm_claim/test/test_crm_claim.yml
index a99831c0588..9ee130329a7 100644
--- a/addons/crm_claim/test/test_crm_claim.yml
+++ b/addons/crm_claim/test/test_crm_claim.yml
@@ -1,10 +1,10 @@
 - |
-  Now I check claims which contain customer claim information about document
-  related problem, product related problem. 
+  I check claims which contain customer claim information about document
+  related problem, product related problem.
 - |
-  I start by creating new claims for Damaged product as Value Claims with priority High and specify 
+  I start by creating new claims for Damaged product as Value Claims with priority High and specify
   date of claim at which  claim is created.
-- 
+-
   !record {model: crm.claim, id: crm_claim_damagedproduct0}:
     categ_id: crm_claim.categ_claim2
     date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
@@ -21,13 +21,24 @@
   !assert {model: crm.claim, id: crm_claim_damagedproduct0}:
     - state == 'draft'
 - |
-  I can change that stage by next button right on it
+  I can change that stage by next button right on it.
 -
   !python {model: crm.claim}: |
-    self.stage_next(cr, uid, [ref('crm_claim_damagedproduct0')])      
+    self.stage_next(cr, uid, [ref('crm_claim_damagedproduct0')])
 - |
-  I make this claim as Open
+  I make this claim as Open.
 -
   !python {model: crm.claim}: |
-    self.case_open(cr, uid, [ref('crm_claim_damagedproduct0')])  
-  
+    self.case_open(cr, uid, [ref('crm_claim_damagedproduct0')])
+- |
+  I  am changing partner Assigned to the Claim.
+-
+  !python {model: crm.claim}: |
+    self.onchange_partner_id(cr, uid, [ref('crm_claim_damagedproduct0')], [])
+    self.onchange_partner_id(cr, uid, [ref('crm_claim_damagedproduct0')], ref('base.res_partner_10'))
+- |
+  I  am changing partner Address to the Claim.
+-
+  !python {model: crm.claim}: |
+    self.onchange_partner_address_id(cr, uid, [ref('crm_claim_damagedproduct0')], [], email = False)
+
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index 7a37bd13d16..2d75f9e69b7 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -21,8 +21,8 @@
 
 
 {
-    'category': 'Sales', 
-    'name': 'CRM Fundraising',
+    'category': 'Customer Relationship Management', 
+    'name': 'Fundraising',
     'version': '1.0',
     'complexity': "easy",
     'description': """
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 19ac21e6ab9..37c5bb8ccee 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -21,6 +21,9 @@
 
 from osv import fields, osv
 from crm import crm
+from crm import wizard
+
+wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.fundraising')
 
 class crm_fundraising(crm.crm_case, osv.osv):
     """ Fund Raising Cases """
@@ -28,85 +31,86 @@ class crm_fundraising(crm.crm_case, osv.osv):
     _name = "crm.fundraising"
     _description = "Fund Raising"
     _order = "id desc"
-    _inherit = ['mailgate.thread']
+    _inherit = ['mail.thread']
     _columns = {
-            'id': fields.integer('ID'), 
+            'id': fields.integer('ID', readonly=True),
             'name': fields.char('Name', size=128, required=True),
-            'active': fields.boolean('Active', required=False), 
+            'active': fields.boolean('Active', required=False),
             'date_action_last': fields.datetime('Last Action', readonly=1),
-            'date_action_next': fields.datetime('Next Action', readonly=1), 
-            'description': fields.text('Description'), 
-            'create_date': fields.datetime('Creation Date' , readonly=True), 
-            'write_date': fields.datetime('Update Date' , readonly=True), 
-            'date_deadline': fields.date('Deadline'), 
-            'user_id': fields.many2one('res.users', 'Responsible'), 
+            'date_action_next': fields.datetime('Next Action', readonly=1),
+            'description': fields.text('Description'),
+            'create_date': fields.datetime('Creation Date' , readonly=True),
+            'write_date': fields.datetime('Update Date' , readonly=True),
+            '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.'), 
-            'company_id': fields.many2one('res.company', 'Company'), 
-            'partner_id': fields.many2one('res.partner', 'Partner'), 
+                            select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
+            'company_id': fields.many2one('res.company', 'Company'),
+            'partner_id': fields.many2one('res.partner', 'Partner'),
             'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"), 
-            'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 
-            'email_from': fields.char('Email', size=128, help="These people will receive email."), 
-            'date_closed': fields.datetime('Closed', readonly=True), 
-            'date': fields.datetime('Date'), 
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+                                 domain="[('partner_id','=',partner_id)]"),
+            'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
+            'email_from': fields.char('Email', size=128, help="These people will receive email."),
+            'date_closed': fields.datetime('Closed', readonly=True),
+            'date': fields.datetime('Date'),
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                                 domain="[('section_id','=',section_id),\
-                                ('object_id.model', '=', 'crm.fundraising')]"), 
-            'planned_revenue': fields.float('Planned Revenue'), 
-            'planned_cost': fields.float('Planned Costs'), 
-            'probability': fields.float('Probability (%)'), 
-            'partner_name': fields.char("Employee's Name", size=64), 
-            'partner_name2': fields.char('Employee Email', size=64), 
-            'partner_phone': fields.char('Phone', size=32), 
-            'partner_mobile': fields.char('Mobile', size=32), 
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'fundraising')]"), 
+                                ('object_id.model', '=', 'crm.fundraising')]"),
+            'planned_revenue': fields.float('Planned Revenue'),
+            'planned_cost': fields.float('Planned Costs'),
+            'probability': fields.float('Probability (%)'),
+            'partner_name': fields.char("Employee's Name", size=64),
+            'partner_name2': fields.char('Employee Email', size=64),
+            'partner_phone': fields.char('Phone', size=32),
+            'partner_mobile': fields.char('Mobile', size=32),
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"), 
             'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
-                             domain="[('section_id','=',section_id)]"), 
-            'duration': fields.float('Duration'), 
-            'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
-            'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
-            'canal_id': fields.many2one('res.partner.canal', 'Channel', \
-                        help="The channels represent the different communication \
- modes available with the customer."), 
-            'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                             domain="[('section_id','=',section_id)]"),
+            'duration': fields.float('Duration'),
+            'ref': fields.reference('Reference', selection=crm._links_get, size=128),
+            'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-            'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
+            'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         }
 
+
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """Automatically called when new email message arrives"""
+        res_id = super(crm_fundraising,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
+        vals = {
+            'name': msg.get('subject'),
+            'email_from': msg.get('from'),
+            'email_cc': msg.get('cc'),
+            'description': msg.get('body_text'),
+        }
+        priority = msg.get('priority')
+        if priority:
+            vals['priority'] = priority
+        vals.update(self.message_partner_by_email(cr, uid, msg.get('from')))
+        self.write(cr, uid, [res_id], vals, context=context)
+        return res_id
+
+
     _defaults = {
-            'active': lambda *a: 1, 
-            'user_id': crm.crm_case._get_default_user, 
-            'partner_id': crm.crm_case._get_default_partner, 
-            'partner_address_id': crm.crm_case._get_default_partner_address, 
-            'email_from': crm.crm_case. _get_default_email, 
-            'state': lambda *a: 'draft', 
-            'section_id': crm.crm_case. _get_section, 
-            'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
-            'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
-            'probability': lambda *a:0.0, 
-            'planned_cost': lambda *a:0.0, 
-            'planned_revenue': lambda *a:0.0, 
-            }
-
-crm_fundraising()
-
-
-class crm_stage_fundraising(osv.osv):
-    
-    def _get_type_value(self, cr, user, context):
-        list = super(crm_stage_fundraising, self)._get_type_value(cr, user, context)
-        list.append(('fundraising','Fundraising'))
-        return list
-    
-    _inherit = "crm.case.stage"
-    _columns = {
-            'type': fields.selection(_get_type_value, 'Type'),
+            'active': 1,
+            'user_id': crm.crm_case._get_default_user,
+            'partner_id': crm.crm_case._get_default_partner,
+            'partner_address_id': crm.crm_case._get_default_partner_address,
+            'email_from': crm.crm_case. _get_default_email,
+            'state': 'draft',
+            'section_id': crm.crm_case. _get_section,
+            'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
+            'priority': crm.AVAILABLE_PRIORITIES[2][0],
+            'probability': 0.0,
+            'planned_cost': 0.0,
+            'planned_revenue': 0.0,
     }
-   
-    
-crm_stage_fundraising()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6c7f35c68f0..67f82bddd22 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -6,24 +6,6 @@
             groups="base.group_extended"
             parent="base.menu_base_config" sequence="8" />
 
-        <!-- Fund Stage Search view -->
-
-        <record id="fund_stage_search" model="ir.ui.view">
-            <field name="name">Fund Stage - Search</field>
-            <field name="model">crm.case.stage</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='name']" position="before">
-                        <filter icon="terp-dolar" name="fundraising"
-                            string="Fundraising" domain="[('type', '=', 'fundraising')]" context="{'type' : 'fundraising'}"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-
         <!-- Fund Raising Categories Form View -->
 
         <record id="crm_fund_categ_action" model="ir.actions.act_window">
@@ -32,8 +14,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-            <field name="context">{'object_id':'crm.fundraising'}</field>
-            <field name="search_view_id" ref="fund_stage_search"/>
+            <field name="context" eval="{'object_id': ref('model_crm_fundraising')}"/>
             <field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
         </record>
 
@@ -52,13 +33,6 @@
             <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>
 
-
-
-         <menuitem action="crm_fundraising_stage_act"
-            groups="base.group_extended" name="Stages"
-            id="menu_crm_fundraising_stage_act"
-            parent="menu_config_fundrising" />
-
         <!-- Fund Raising Tree View -->
 
         <record model="ir.ui.view" id="crm_case_tree_view_fund">
@@ -136,7 +110,7 @@
                                 <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                                 <button name="case_cancel" string="Cancel"
                                     states="draft,open,pending" type="object"
                                     icon="gtk-cancel" />
@@ -162,14 +136,14 @@
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
+                                    <field name="email_from" invisible="1"/>
                                     <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
+                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -178,20 +152,18 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
-                                        <field name="history" invisible="1"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
-                                            <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+                                            <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                                <field name="body_text" colspan="4" nolabel="1" height="250"/>
+                                                <button colspan="4" string="Reply"
+                                                    name="%(mail.action_email_compose_message_wizard)d"
+                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                                    icon="terp-mail-replied" type="action"/>
                                             </group>
-                                            <group attrs="{'invisible': [('history', '=', True)]}">
+                                            <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
@@ -206,9 +178,8 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
                             <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.fundraising'}"
-                                icon="terp-mail-message-new" type="action" />
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -216,7 +187,6 @@
                                 <field name="active"/>
                                 <field name="id" select="1"/>
                                 <field name="priority" string="Priority"/>
-                                <field name="canal_id"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Dates"/>
@@ -274,9 +244,9 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
-                            <filter icon="terp-check" string="Current"
-                                domain="[('state','in',('draft', 'open'))]" name="current"
-                                help="Current Funds" />
+                            <filter icon="terp-check" string="New"
+                                domain="[('state','=','draft')]" name="current"
+                                help="New Funds" />
                             <filter icon="terp-camera_test" string="Open"
                                 domain="[('state','=','open')]"
                                 help="Open Funds" />
@@ -285,16 +255,16 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
-                            <field name="state" select="1" />
-                            <field name="name" select='1'
+                            <field name="state"/>
+                            <field name="name"
                                 string="Fund Description" />
-                            <field name="user_id" select="1"
+                            <field name="user_id"
                                 widget="selection">
                                 <filter icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
                             </field>
-                            <field name="section_id" select="1" widget="selection" string="Sales Team">
+                            <field name="section_id" widget="selection" string="Sales Team">
                                 <filter icon="terp-personal+" groups="base.group_extended"
                                     domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                     help="My Sales Team(s)" />
diff --git a/addons/crm_fundraising/i18n/bg.po b/addons/crm_fundraising/i18n/bg.po
index 3a09e41396f..b813c41a43b 100644
--- a/addons/crm_fundraising/i18n/bg.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Контрагент"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr ""
@@ -306,7 +307,6 @@ msgstr "Отпратки"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr ""
diff --git a/addons/crm_fundraising/i18n/ca.po b/addons/crm_fundraising/i18n/ca.po
index 1b91f39c148..ede73429b0c 100644
--- a/addons/crm_fundraising/i18n/ca.po
+++ b/addons/crm_fundraising/i18n/ca.po
@@ -14,302 +14,302 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Ingressos previstos"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# de casos"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,probability:0
 msgid "Avg. Probability"
-msgstr ""
+msgstr "Probabilitat mitjana"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Retard per tancar"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,company_id:0
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
 msgid "Fundraising Categories"
-msgstr ""
+msgstr "Categories de recaptació"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Observadors d'Emails (CC)"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Cases"
-msgstr ""
+msgstr "Casos"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "El més alt"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Afegeix nota interna"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mòbil"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Art i cultura"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Retorn est."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacte empresa"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: crm_fundraising
 #: field:crm.fundraising,type_id:0
 msgid "Campaign"
-msgstr ""
+msgstr "Campanya"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Acció següent"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Inicialitza a esborrany"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informació extra"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Obtenció de fons"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,partner_id:0
 #: field:crm.fundraising.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
-msgstr ""
+msgstr "Anàlisi de recaptació"
 
 #. module: crm_fundraising
 #: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
 msgid "CRM Fundraising"
-msgstr ""
+msgstr "Recaptació CRM"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Misc"
-msgstr ""
+msgstr "Varis"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Secció"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritat"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envia nou correu electrònic"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr ""
+msgstr "Rehabilitació social i recuperació rural"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Mode de pagament"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reply"
-msgstr ""
+msgstr "Resposta"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Canal"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "El més baix"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data límit"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
 msgid "Categories"
-msgstr ""
+msgstr "Categories"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History Information"
-msgstr ""
+msgstr "Informació històrica"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Email treballador"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Aprenentatge i educació"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Formulari d'inversions"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Fund Description"
-msgstr ""
+msgstr "Descripció del fons"
 
 #. module: crm_fundraising
 #: help:crm.fundraising.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Número de dies per tancar el cas"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "References"
-msgstr ""
+msgstr "Referències"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
-msgstr ""
+msgstr "Recaptació de fons"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
@@ -318,62 +318,65 @@ msgid ""
 "specific criteria such as the estimated revenue, average success probability "
 "and delay to close."
 msgstr ""
+"Tingueu una vista general de totes les activitats de recaptació ordenant-les "
+"per criteris específics com a benefici previst, probabilitat d'èxit mig i "
+"retard de tancament."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicació"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Arbre d'inversions"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Escalate"
-msgstr ""
+msgstr "Escalat"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Data revisió"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Targeta de crèdit"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
 msgid "Fundraising Stages"
-msgstr ""
+msgstr "Etapes de recaptació"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referència"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referència 2"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -381,19 +384,19 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Any  "
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_cost:0
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Costos previstos"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_cc:0
@@ -402,25 +405,28 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Aquestes adreces de correu seran afegides al camp CC en tots els correus "
+"entrants i sortints d'aquest registre abans de ser enviats. Separeu les "
+"diferents adreces de correu amb una coma."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baix"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_closed:0
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancada"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -428,93 +434,93 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicació i historial"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Etapes"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normals"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC global"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
 msgid "Funds"
-msgstr ""
+msgstr "Fons/Inversions"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telèfon"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "#Fundraising"
-msgstr ""
+msgstr "Nº obtenció fons"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Xec"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
@@ -522,41 +528,43 @@ msgid ""
 "Manage and define the fund raising categories you want to be maintained in "
 "the system."
 msgstr ""
+"Gestioneu i definiu les categories de recaptació que vulgueu mantenir en el "
+"sistema."
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Aquestes persones rebran un correu electrònic."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Serveis sanitaris"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjunts"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Etapa del cas"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Estimates"
-msgstr ""
+msgstr "Estimacions"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -564,24 +572,24 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -589,7 +597,7 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
@@ -598,17 +606,21 @@ msgid ""
 "Raising allows you to track all your fund raising activities. In the search "
 "list, filter by funds description, email, history and probability of success."
 msgstr ""
+"Si necessita recaptar diners per a la seva organització o una campanya, "
+"recaptació de fons li permet controlar totes les activitats per recaptar "
+"fons. En la llista de cerca, filtreu els fons per descripció, correu "
+"electrònic, historial i probabilitat d'èxit."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,section_id:0
@@ -616,27 +628,29 @@ msgid ""
 "Sales team to which Case belongs to. Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Equip de vendes al que pertany el cas. Definiu l'usuari responsable i el "
+"compte d'email per a la passarel·la de correu."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
 msgid "CRM Fundraising Report"
-msgstr ""
+msgstr "CRM Informe de recaptacions"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,type_id:0
 msgid "Fundraising Type"
-msgstr ""
+msgstr "Tipus de recaptació"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,amount_revenue_prob:0
 msgid "Est. Rev*Prob."
-msgstr ""
+msgstr "Retorn x Prob esp."
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
@@ -644,26 +658,28 @@ msgid ""
 "Create and manage fund raising activity categories you want to be maintained "
 "in the system."
 msgstr ""
+"Creeu i gestioneu les categories d'activitats de recaptació que vulgueu "
+"mantenir en el sistema."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Probabilitat (%)"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nom del treballador"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,canal_id:0
@@ -671,6 +687,8 @@ msgid ""
 "The channels represent the different communication  modes available with the "
 "customer."
 msgstr ""
+"Els canals representen les diferents formes de comunicació disponibles amb "
+"el client"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,state:0
@@ -683,82 +701,89 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'estat s'estableix a 'Esborrany', quan es crea un cas.                      "
+"            \n"
+"Si el cas està en progrés l'estat s'estableix a 'Obert'.                     "
+"             \n"
+"Quan el cas es tanca, l'estat s'estableix a 'Realitzat'.                     "
+"             \n"
+"Si el cas necessita ser revisat llavors en estat s'estableix a 'Pendent'."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Efectiu"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Fons/Inversions per categories"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "El/s meu/s cas/os"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Petició esborrany"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "Cerca fons"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "High"
-msgstr ""
+msgstr "Alt"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,section_id:0
 #: view:crm.fundraising.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Última acció"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duració"
diff --git a/addons/crm_fundraising/i18n/de.po b/addons/crm_fundraising/i18n/de.po
index 22ae6d5d73d..f2f39f660a9 100644
--- a/addons/crm_fundraising/i18n/de.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Analyse Finanzakquise"
@@ -306,7 +307,6 @@ msgstr "Referenz"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Finanzakquise"
@@ -790,65 +790,3 @@ msgstr "Jahr"
 #: field:crm.fundraising,duration:0
 msgid "Duration"
 msgstr "Dauer"
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate                 "
-#~ "    the canall which is this opportunity source."
-#~ msgstr ""
-#~ "Der Kanal repräsentiert unterschiedliche Möglichkeiten für die Kommunikation "
-#~ "mit Kunden. Bei jeder Verkaufschance können Sie hinterlegen durch welchen    "
-#~ "Kommunikationskanal die Verkaufschance entstanden ist."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung in der Definition der Aktion"
-
-#~ msgid "This Year"
-#~ msgstr "Aktuelles Jahr"
-
-#~ msgid "My Case"
-#~ msgstr "Mein Fall"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "7 Days"
-#~ msgstr "7 Tage"
-
-#~ msgid "Resource Type"
-#~ msgstr "Ressource Typ"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Object muss mit x_ starten und darf keine Sonderzeichen haben !"
-
-#~ msgid "This Month"
-#~ msgstr "Akt. Monat"
-
-#~ msgid "Fundraising Resource Type"
-#~ msgstr "Finanzakqu. Ressource Typ"
-
-#~ msgid "Communication history"
-#~ msgstr "Historie Kommunikation"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Grösse des Feldes darf nie kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Der Name des Moduls muss eindeutig sein."
-
-#~ msgid ""
-#~ "If you need to support your organization or a campaign, with 'Fund Raising' "
-#~ "you can track all you fund raising activities. The search list allows you to "
-#~ "filter by funds description, email, history and probability of success."
-#~ msgstr ""
-#~ "Verwenden Sie diese Anwendung zur Vorgangsverwaltung und Rückverfolgung von "
-#~ "Fördermittelanträgen oder Spendenanfragen für Ihr Unternehmen oder spezielle "
-#~ "Projekte. Spezielle Filter oder Gruppierungen ermöglichen Ihnen dabei einen "
-#~ "schnellen Überblick bzw. auch eine Auswertung des Erfolgs Ihrer Massnahmen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die ID für das Zertifikat des Moduls sollte eindeutig sein !"
diff --git a/addons/crm_fundraising/i18n/el.po b/addons/crm_fundraising/i18n/el.po
index 21e35863852..3f58bffad12 100644
--- a/addons/crm_fundraising/i18n/el.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr ""
@@ -306,7 +307,6 @@ msgstr ""
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr ""
diff --git a/addons/crm_fundraising/i18n/es.po b/addons/crm_fundraising/i18n/es.po
index 04b24f881e7..1a6034857f1 100644
--- a/addons/crm_fundraising/i18n/es.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Análisis de recaudación"
@@ -306,7 +307,6 @@ msgstr "Referencias"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Recaudación de fondos"
@@ -788,13 +788,3 @@ msgstr "Año"
 #: field:crm.fundraising,duration:0
 msgid "Duration"
 msgstr "Duración"
-
-#~ msgid ""
-#~ "If you need to support your organization or a campaign, with 'Fund Raising' "
-#~ "you can track all you fund raising activities. The search list allows you to "
-#~ "filter by funds description, email, history and probability of success."
-#~ msgstr ""
-#~ "Si necesita apoyar su organización o una campaña, con 'Obtención de fondos' "
-#~ "puede hacer un seguimiento de todas sus actividades. La lista de búsqueda le "
-#~ "permite filtrar por descripción de fondo, email, historial y probabilidad de "
-#~ "éxito."
diff --git a/addons/crm_fundraising/i18n/es_EC.po b/addons/crm_fundraising/i18n/es_EC.po
index 414657f09d4..218f0629d7b 100644
--- a/addons/crm_fundraising/i18n/es_EC.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Socio"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Análisis de recaudación de fondos"
@@ -306,7 +307,6 @@ msgstr "Referencias"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Recaudación de fondos"
diff --git a/addons/crm_fundraising/i18n/es_MX.po b/addons/crm_fundraising/i18n/es_MX.po
new file mode 100644
index 00000000000..f9bebbea052
--- /dev/null
+++ b/addons/crm_fundraising/i18n/es_MX.po
@@ -0,0 +1,790 @@
+# 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-18 07:43+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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "Probabilidad media"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr "Categorías de recaudación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email del observador"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "Casos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "Arte y cultura"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "Beneficio est."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "Campaña"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "Acción siguiente"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "Recaudación de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr "Análisis de recaudación"
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr "Recaudación CRM"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr "Rehabilitación social y desarrollo rural"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "Modo de pago"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "Más baja"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr "Email empleado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr "Enseñanza y educación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr "Formulario fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr "Descripción del fondo"
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para cerrar el caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr "Recaudación de fondos"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr ""
+"Tenga una vista general de todas las actividades de recaudación ordenándolas "
+"por criterios específicos como beneficio estimado, probabilidad de éxito "
+"media y demora de cierre."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr "Árbol de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "Tarjeta de crédito"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr "Etapas de recaudación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Costes previstos"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr "Fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr "Nº obtención fondos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr "Cheque"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr ""
+"Gestione y defina las categorías de recaudación que quiera mantener en el "
+"sistema."
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr "Sanidad"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr "Historial"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr "Documentos adjuntos"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etapa del caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr "Estimaciones"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr ""
+"Si necesita reunir dinero para su organización o una campaña, Recaudación de "
+"Fondos le permite registrar todas sus actividades de recaudación. En la "
+"lista de búsqueda, filtre los fondos por descripción, correo electrónico, "
+"historial y probabilidad de éxito."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+"Equipo de ventas al que pertenece el caso. Defina el usuario responsable y "
+"la cuenta de email para la pasarela de correo."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr "CRM Informe de recaudaciones"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr "Tipo de recaudación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr "Beneficio*Prob. estim."
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr ""
+"Cree y gestione las categorías de actividades de recaudación que quiera "
+"mantener en el sistema."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+"Los canales representan los diferentes modos de comunicación disponibles con "
+"el cliente"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces el estado se establece a "
+"'Pendiente'."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "Fondos por categorías"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr "Petición borrador"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr "Buscar fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr "Última acción"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/crm_fundraising/i18n/es_PY.po b/addons/crm_fundraising/i18n/es_PY.po
index 4e93e7217e8..012a4956d43 100644
--- a/addons/crm_fundraising/i18n/es_PY.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Socio"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Análisis de recaudación"
@@ -306,7 +307,6 @@ msgstr "Referencias"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Recaudación de fondos"
diff --git a/addons/crm_fundraising/i18n/es_VE.po b/addons/crm_fundraising/i18n/es_VE.po
new file mode 100644
index 00000000000..f9bebbea052
--- /dev/null
+++ b/addons/crm_fundraising/i18n/es_VE.po
@@ -0,0 +1,790 @@
+# 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-18 07:43+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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "Probabilidad media"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr "Categorías de recaudación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email del observador"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "Casos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "Arte y cultura"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "Beneficio est."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "Campaña"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "Acción siguiente"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "Recaudación de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr "Análisis de recaudación"
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr "Recaudación CRM"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr "Rehabilitación social y desarrollo rural"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "Modo de pago"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "Más baja"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr "Email empleado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr "Enseñanza y educación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr "Formulario fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr "Descripción del fondo"
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para cerrar el caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr "Recaudación de fondos"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr ""
+"Tenga una vista general de todas las actividades de recaudación ordenándolas "
+"por criterios específicos como beneficio estimado, probabilidad de éxito "
+"media y demora de cierre."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr "Árbol de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "Tarjeta de crédito"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr "Etapas de recaudación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Costes previstos"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr "Fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr "Nº obtención fondos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr "Cheque"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr ""
+"Gestione y defina las categorías de recaudación que quiera mantener en el "
+"sistema."
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr "Sanidad"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr "Historial"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr "Documentos adjuntos"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Etapa del caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr "Estimaciones"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr ""
+"Si necesita reunir dinero para su organización o una campaña, Recaudación de "
+"Fondos le permite registrar todas sus actividades de recaudación. En la "
+"lista de búsqueda, filtre los fondos por descripción, correo electrónico, "
+"historial y probabilidad de éxito."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+"Equipo de ventas al que pertenece el caso. Defina el usuario responsable y "
+"la cuenta de email para la pasarela de correo."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr "CRM Informe de recaudaciones"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr "Tipo de recaudación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr "Beneficio*Prob. estim."
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr ""
+"Cree y gestione las categorías de actividades de recaudación que quiera "
+"mantener en el sistema."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+"Los canales representan los diferentes modos de comunicación disponibles con "
+"el cliente"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces el estado se establece a "
+"'Pendiente'."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "Fondos por categorías"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr "Petición borrador"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr "Buscar fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr "Última acción"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/crm_fundraising/i18n/fr.po b/addons/crm_fundraising/i18n/fr.po
index 9ec92147baf..b3f553cbe42 100644
--- a/addons/crm_fundraising/i18n/fr.po
+++ b/addons/crm_fundraising/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -161,6 +161,7 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Analyse de levée de fonds"
@@ -305,7 +306,6 @@ msgstr "Références"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Levée de fonds"
@@ -783,19 +783,3 @@ msgstr "Année"
 #: field:crm.fundraising,duration:0
 msgid "Duration"
 msgstr "Durée"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML incorrect dans l'architecture de la vue !"
-
-#~ msgid ""
-#~ "If you need to support your organization or a campaign, with 'Fund Raising' "
-#~ "you can track all you fund raising activities. The search list allows you to "
-#~ "filter by funds description, email, history and probability of success."
-#~ msgstr ""
-#~ "Si vous avez besoin de financer votre organisation ou une campagne, avec "
-#~ "\"Levée de fonds\" vous pouvez suivre toutes vos activités de levée de "
-#~ "fonds. La liste de recherche vous permet de filtrer par description, "
-#~ "courriel, historique et probabilité de succès."
diff --git a/addons/crm_fundraising/i18n/gl.po b/addons/crm_fundraising/i18n/gl.po
index 1f2394e9778..d966ece7d6a 100644
--- a/addons/crm_fundraising/i18n/gl.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Socio"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Análise da recadación"
@@ -306,7 +307,6 @@ msgstr "Referencias"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Recadación de fondos"
diff --git a/addons/crm_fundraising/i18n/hu.po b/addons/crm_fundraising/i18n/hu.po
index 2c9eb7b239a..247ec6e7ac8 100644
--- a/addons/crm_fundraising/i18n/hu.po
+++ b/addons/crm_fundraising/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 20:17+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -161,6 +162,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Tőkebevonás elemzése"
@@ -305,7 +307,6 @@ msgstr "Hivatkozások"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Tőkebevonás"
diff --git a/addons/crm_fundraising/i18n/it.po b/addons/crm_fundraising/i18n/it.po
index 7b7801edcb2..5213850186b 100644
--- a/addons/crm_fundraising/i18n/it.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Analisi raccolta fondi"
@@ -306,7 +307,6 @@ msgstr "Riferimenti"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Raccolta fondi"
@@ -775,18 +775,3 @@ msgstr "Anno"
 #: field:crm.fundraising,duration:0
 msgid "Duration"
 msgstr "Durata"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "l nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po
index e1a11b67e8d..6d0fad72a10 100644
--- a/addons/crm_fundraising/i18n/nl.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Fondsenwerving Analyse"
@@ -307,7 +308,6 @@ msgstr "Verwijzingen"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Fondsenwerving"
@@ -788,65 +788,3 @@ msgstr "Jaar"
 #: field:crm.fundraising,duration:0
 msgid "Duration"
 msgstr "Duur"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid ""
-#~ "The channels represent the different communication modes available with the "
-#~ "customer. With each commercial opportunity, you can indicate                 "
-#~ "    the canall which is this opportunity source."
-#~ msgstr ""
-#~ "De kanalen geven de verschillende beschikbare communicatievormen met de "
-#~ "klant weer. Met elke kans kunt u het kanaal aangeven wat de oorsprong van de "
-#~ "kans is."
-
-#~ msgid "This Year"
-#~ msgstr "Dit jaar"
-
-#~ msgid "My Case"
-#~ msgstr "Mijn Fondsen"
-
-#~ msgid "7 Days"
-#~ msgstr "7 Dagen"
-
-#~ msgid "Resource Type"
-#~ msgstr "Betalingsvorm"
-
-#~ 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 "This Month"
-#~ msgstr "Deze maand"
-
-#~ msgid "Communication history"
-#~ msgstr "Communicatiegeschiedenis"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Fundraising Resource Type"
-#~ msgstr "Fondsenwerving betalingsvorm"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "If you need to support your organization or a campaign, with 'Fund Raising' "
-#~ "you can track all you fund raising activities. The search list allows you to "
-#~ "filter by funds description, email, history and probability of success."
-#~ msgstr ""
-#~ "Om uw organisatie or campagne te ondersteunen kunt u met 'fondsenwerving' "
-#~ "alle wervingsactiviteiten volgen. De zoeklijst laat u fondsen filteren op "
-#~ "omschrijving, email, geschiedenis en slagingskans."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/crm_fundraising/i18n/pt.po b/addons/crm_fundraising/i18n/pt.po
index b1def951094..4aac7b1a19e 100644
--- a/addons/crm_fundraising/i18n/pt.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Terceiro"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr ""
@@ -306,7 +307,6 @@ msgstr "Referências"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Angariação de fundos"
diff --git a/addons/crm_fundraising/i18n/pt_BR.po b/addons/crm_fundraising/i18n/pt_BR.po
index c00616cd000..b67bc83f4e6 100644
--- a/addons/crm_fundraising/i18n/pt_BR.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr ""
@@ -306,7 +307,6 @@ msgstr "Referências"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Arrecadação de fundos"
diff --git a/addons/crm_fundraising/i18n/ru.po b/addons/crm_fundraising/i18n/ru.po
index 78a7b86a74a..090fe872e1a 100644
--- a/addons/crm_fundraising/i18n/ru.po
+++ b/addons/crm_fundraising/i18n/ru.po
@@ -14,302 +14,302 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Планируемая выручка"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "кол-во дел"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,probability:0
 msgid "Avg. Probability"
-msgstr ""
+msgstr "Ср. вероятность"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Задержка закрытия"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,company_id:0
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компания"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
 msgid "Fundraising Categories"
-msgstr ""
+msgstr "Категории привлечения средств"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Адреса наблюдателей"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Cases"
-msgstr ""
+msgstr "Дела"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Наивысший"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Добавить внутреннюю заметку"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Мобильный"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Notes"
-msgstr ""
+msgstr "Заметки"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Культура и искусство"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "План. выручка"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Контакт контрагента"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Месяц   "
 
 #. module: crm_fundraising
 #: field:crm.fundraising,type_id:0
 msgid "Campaign"
-msgstr ""
+msgstr "Кампания"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Следующее действие"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Вернуть в черновики"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Доп. инфо."
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Привлечение средств"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,partner_id:0
 #: field:crm.fundraising.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
-msgstr ""
+msgstr "Анализ привлечения средств"
 
 #. module: crm_fundraising
 #: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
 msgid "CRM Fundraising"
-msgstr ""
+msgstr "CRM привлечение средств"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Misc"
-msgstr ""
+msgstr "Разное"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Раздел"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Приоритет"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Отправить новое эл. письмо"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr ""
+msgstr "Социальная реабилитация и подъём сельского хозяйства"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Режим оплаты"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reply"
-msgstr ""
+msgstr "Ответ"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Эл. почта"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Канал"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Низший"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Последний срок"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Этап"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History Information"
-msgstr ""
+msgstr "История"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Dates"
-msgstr ""
+msgstr "Даты"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Эл. почта сотрудника"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Обучение и образование"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Форма средств"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Fund Description"
-msgstr ""
+msgstr "Описание средств"
 
 #. module: crm_fundraising
 #: help:crm.fundraising.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Количество дней, для закрытия дела"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "References"
-msgstr ""
+msgstr "Ссылки"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
-msgstr ""
+msgstr "Привлечение средств"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
@@ -318,62 +318,65 @@ msgid ""
 "specific criteria such as the estimated revenue, average success probability "
 "and delay to close."
 msgstr ""
+"Общее представление о всех привлечениях средств с помощью их сортировки по "
+"определенными критериями, такими как предполагаемая выручка, средняя "
+"вероятность успеха и задержка завершения."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Communication"
-msgstr ""
+msgstr "Общение"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Дерево средств"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Escalate"
-msgstr ""
+msgstr "Обострить"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Дата изменения"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Кредитная карта"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
 msgid "Fundraising Stages"
-msgstr ""
+msgstr "Этапы привлечения средств"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Менеджер продаж"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Ссылка"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Ссылка 2"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -381,19 +384,19 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Категория"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Год  "
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_cost:0
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Планируемые затраты"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_cc:0
@@ -402,25 +405,27 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Эти эл. адреса будут добавлены в поле \"Копия\" всей входящей и исходящей "
+"почты для этой записи. Разделяйте эл. адреса запятыми."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Низкий"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_closed:0
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -428,93 +433,93 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "В ожидании"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Общение & история"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Этапы"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Обычный"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Global CC"
-msgstr ""
+msgstr "Глобальная копия"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
 msgid "Funds"
-msgstr ""
+msgstr "Денежные средства"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Телефон"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "#Fundraising"
-msgstr ""
+msgstr "#Средств"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Search"
-msgstr ""
+msgstr "Поиск"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Чек"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
@@ -522,41 +527,43 @@ msgid ""
 "Manage and define the fund raising categories you want to be maintained in "
 "the system."
 msgstr ""
+"Управление категориями привлечения средств, которые вы хотите поддерживать в "
+"системе."
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Эти люди получат эл. письма."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Здравоохранения"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History"
-msgstr ""
+msgstr "История"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Attachments"
-msgstr ""
+msgstr "Прикрепленные файлы"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Этап дела"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Estimates"
-msgstr ""
+msgstr "Оценки"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -564,24 +571,24 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Done"
-msgstr ""
+msgstr "Сделано"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -589,7 +596,7 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Открыть"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
@@ -598,17 +605,21 @@ msgid ""
 "Raising allows you to track all your fund raising activities. In the search "
 "list, filter by funds description, email, history and probability of success."
 msgstr ""
+"Если вам нужно привлечь деньги для Вашей организации или кампании, "
+"\"Привлечение средств\" позволяет вам отслеживать все действия по этому "
+"направлению. Вы можете искать и фильтровать по описанию средств, эл. почте, "
+"истории и вероятности успеха."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ответственный"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,section_id:0
@@ -616,27 +627,29 @@ msgid ""
 "Sales team to which Case belongs to. Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Отдел продаж, которому принадлежит это дело. Определите ответственного "
+"пользователя и учетную запись эл. почты для почтового шлюза."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Details"
-msgstr ""
+msgstr "Подробности"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
 msgid "CRM Fundraising Report"
-msgstr ""
+msgstr "CRM отчет о привлечении средств"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,type_id:0
 msgid "Fundraising Type"
-msgstr ""
+msgstr "Тип привлечения средств"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,amount_revenue_prob:0
 msgid "Est. Rev*Prob."
-msgstr ""
+msgstr "Ожид. Выруч.*Вероятн."
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
@@ -644,33 +657,35 @@ msgid ""
 "Create and manage fund raising activity categories you want to be maintained "
 "in the system."
 msgstr ""
+"Управление категориями привлечения средств, которые вы хотите поддерживать в "
+"системе."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,description:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Вероятность (%)"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Имя сотрудника"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,canal_id:0
 msgid ""
 "The channels represent the different communication  modes available with the "
 "customer."
-msgstr ""
+msgstr "Каналы представляют различные способы общения с заказчиком."
 
 #. module: crm_fundraising
 #: help:crm.fundraising,state:0
@@ -683,82 +698,86 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Состояние  установлено в 'Черновик', при создании дела.       \n"
+"Если дело в работе, состояние  установлено в 'Открыто'.            \n"
+"Когда дело  завершено, состояние  установлено в 'Сделано'.              \n"
+"Если дело нуждается в рассмотрении, то состояние 'В ожидании'."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Финансы"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Средства по категориям"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Мои дела"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Черновик прошения"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,id:0
 msgid "ID"
-msgstr ""
+msgstr "Идентификатор"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "Искать средства"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "High"
-msgstr ""
+msgstr "Высокий"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,section_id:0
 #: view:crm.fundraising.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Отдел продаж"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Последнее действие"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Длительность"
diff --git a/addons/crm_fundraising/i18n/sq.po b/addons/crm_fundraising/i18n/sq.po
index 1ec6bc081ef..adf1db13e1d 100644
--- a/addons/crm_fundraising/i18n/sq.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr ""
@@ -306,7 +307,6 @@ msgstr ""
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr ""
diff --git a/addons/crm_fundraising/i18n/sr.po b/addons/crm_fundraising/i18n/sr.po
index 9c9c0638411..2a07b891bf6 100644
--- a/addons/crm_fundraising/i18n/sr.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Analiza Priklupljanja Sredstava"
@@ -306,7 +307,6 @@ msgstr "Reference"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Prikupljanje Sredstava"
@@ -774,17 +774,3 @@ msgstr "Godina"
 #: field:crm.fundraising,duration:0
 msgid "Duration"
 msgstr "Kasnjenje"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za Pregled Arhitekture"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekurzivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/crm_fundraising/i18n/sr@latin.po b/addons/crm_fundraising/i18n/sr@latin.po
index 2eae427df37..67269d5c81b 100644
--- a/addons/crm_fundraising/i18n/sr@latin.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Analiza Priklupljanja Sredstava"
@@ -306,7 +307,6 @@ msgstr "Reference"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Prikupljanje Sredstava"
@@ -774,17 +774,3 @@ msgstr "Godina"
 #: field:crm.fundraising,duration:0
 msgid "Duration"
 msgstr "Kasnjenje"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za Pregled Arhitekture"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekurzivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/crm_fundraising/i18n/sv.po b/addons/crm_fundraising/i18n/sv.po
index e3e3c4faa49..99ef8b7debb 100644
--- a/addons/crm_fundraising/i18n/sv.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr ""
@@ -306,7 +307,6 @@ msgstr "Referenser"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr ""
diff --git a/addons/crm_fundraising/i18n/tr.po b/addons/crm_fundraising/i18n/tr.po
index 868815a202e..4a2b5932466 100644
--- a/addons/crm_fundraising/i18n/tr.po
+++ b/addons/crm_fundraising/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -162,6 +162,7 @@ msgid "Partner"
 msgstr "İş ortağı"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr "Para toplama analizi"
@@ -306,7 +307,6 @@ msgstr "Referanslar"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr "Kaynak Geliştirme"
diff --git a/addons/crm_fundraising/i18n/zh_CN.po b/addons/crm_fundraising/i18n/zh_CN.po
index 2acf876b4cc..0d3808d52e0 100644
--- a/addons/crm_fundraising/i18n/zh_CN.po
+++ b/addons/crm_fundraising/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-11 07:40+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -58,7 +58,7 @@ msgstr "公司"
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
 msgid "Fundraising Categories"
-msgstr "集资类型"
+msgstr "资金运作分类"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_cc:0
@@ -152,7 +152,7 @@ msgstr "额外信息"
 #: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr "资金募集"
+msgstr "资金运作"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -162,14 +162,15 @@ msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
-msgstr "资金募集分析"
+msgstr "资金运作分析"
 
 #. module: crm_fundraising
 #: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
 msgid "CRM Fundraising"
-msgstr "客户关系管理 资金募集"
+msgstr "客户关系管理 资金运作"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -179,7 +180,7 @@ msgstr "杂项"
 #. module: crm_fundraising
 #: field:crm.fundraising.report,section_id:0
 msgid "Section"
-msgstr "分类"
+msgstr "划分"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -195,7 +196,7 @@ msgstr "发送新的电子邮件"
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr "社会康复和农场振兴"
+msgstr "社会救援和农村振兴"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -241,7 +242,7 @@ msgstr "7月"
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
 msgid "Categories"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,stage_id:0
@@ -302,14 +303,13 @@ msgstr "到期天数"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "References"
-msgstr "参考"
+msgstr "关联"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
-msgstr "资金募集"
+msgstr "资金运作"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
@@ -317,7 +317,7 @@ msgid ""
 "Have a general overview of all fund raising activities by sorting them with "
 "specific criteria such as the estimated revenue, average success probability "
 "and delay to close."
-msgstr "所有的资金募集活动都有一个一般概述并按具体的标准分类。如预计收入，平均成功的概率和延迟关闭等。"
+msgstr "为所以的资金运作指定一个排序标准。如预计收入，平均成功的概率和延迟关闭等。"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -368,12 +368,12 @@ msgstr "业务员"
 #. module: crm_fundraising
 #: field:crm.fundraising,ref:0
 msgid "Reference"
-msgstr "参考"
+msgstr "关联"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref2:0
 msgid "Reference 2"
-msgstr "参考2"
+msgstr "关联2"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -381,7 +381,7 @@ msgstr "参考2"
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,categ_id:0
 msgid "Category"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -428,7 +428,7 @@ msgstr "已关闭"
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Pending"
-msgstr "待定中"
+msgstr "待处理"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -494,12 +494,12 @@ msgstr "11月"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Extended Filters..."
-msgstr "扩展过滤..."
+msgstr "增加筛选条件"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Search"
-msgstr "查找"
+msgstr "搜索"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -521,7 +521,7 @@ msgstr "支票"
 msgid ""
 "Manage and define the fund raising categories you want to be maintained in "
 "the system."
-msgstr "在你的系统中管理和定义资金募集的类型"
+msgstr "在你的系统中管理和定义资金运作的分类"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_from:0
@@ -564,7 +564,7 @@ msgstr "估计"
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,state:0
 msgid "State"
-msgstr "州/省"
+msgstr "状态"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -597,7 +597,7 @@ msgid ""
 "If you need to collect money for your organization or a campaign, Fund "
 "Raising allows you to track all your fund raising activities. In the search "
 "list, filter by funds description, email, history and probability of success."
-msgstr "如果你需要为你的组织或公司筹集经费，资金募集可以使你跟踪你的资金募集活动。在搜索列表按资金说明、邮件、日志和成功的可能性筛选。"
+msgstr "如果你需要管理你组织或公司的资金运作，资金运作可以跟踪你的资金运作活动。在搜索列表按资金说明、邮件、日志和成功的可能性筛选。"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -620,17 +620,17 @@ msgstr "业务的销售团队，定义责任人和邮件的网关。"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Details"
-msgstr "明细行"
+msgstr "详情"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
 msgid "CRM Fundraising Report"
-msgstr "客户关系管理 资金募集报表"
+msgstr "客户关系管理 资金运作报表"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,type_id:0
 msgid "Fundraising Type"
-msgstr "资金募集类型"
+msgstr "资金运作类型"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -643,7 +643,7 @@ msgstr "估计收入 × 概率"
 msgid ""
 "Create and manage fund raising activity categories you want to be maintained "
 "in the system."
-msgstr "在你的系统中创建和管理资金募集活动的类型"
+msgstr "在你的系统中创建和管理资金运作活动的分类"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,description:0
@@ -727,12 +727,12 @@ msgstr "汇票"
 #. module: crm_fundraising
 #: field:crm.fundraising,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr "查找资金"
+msgstr "搜索资金"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 73514b677b2..19334f2fe4c 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -69,27 +69,28 @@
 
 <!-- Fundraising by user and section Search View-->
 
-		<record id="view_report_crm_fundraising_filter" model="ir.ui.view">
+        <record id="view_report_crm_fundraising_filter" model="ir.ui.view">
             <field name="name">crm.fundraising.report.selectt</field>
             <field name="model">crm.fundraising.report</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
-                   		<filter string="  Year  " icon="terp-go-year"
-                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                   			help="Funds raised in current year"/>
+                  <group>
+                        <filter string="Year" icon="terp-go-year" name="year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Funds raised in current year"/>
+                        <separator orientation="vertical" />
 
-                       <filter string="   Month   " icon="terp-go-month" name="This Month"
+                       <filter string="Month" icon="terp-go-month" name="This Month"
                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                    	   help="Funds raised in current month"/>
+                           help="Funds raised in current month"/>
 
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="Month-1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Funds raised in last month"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-document-new"
-                            string="Draft"
+                            string="New"
                             domain="[('state','=','draft')]"/>
                         <filter icon="terp-camera_test"
                             string="Open"
@@ -111,7 +112,7 @@
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
                         </field>
-                        <field name="user_id" select="1" string="Salesman">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                     </group>
@@ -123,10 +124,8 @@
                         <filter icon="gtk-cancel"
                             string="Cancel"
                             domain="[('state','=','cancel')]"/>
-                        <group>
-                            <separator orientation="vertical"/>
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                        </group>
+                        <separator orientation="vertical"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
@@ -153,7 +152,7 @@
                             domain="[]" context="{'group_by':'day'}"
                             help="Date of fundraising"/>
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" 
+                            domain="[]" context="{'group_by':'month'}"
                             help="Month of fundraising"/>
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
@@ -169,7 +168,7 @@
             <field name="res_model">crm.fundraising.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"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_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
             <field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
             <field name="help">Have a general overview of all fund raising activities by sorting them with specific criteria such as the estimated revenue, average success probability and delay to close.</field>
diff --git a/addons/crm_fundraising/test/test_crm_fund.yml b/addons/crm_fundraising/test/test_crm_fund.yml
index e310dfa4d47..ef81afeb563 100644
--- a/addons/crm_fundraising/test/test_crm_fund.yml
+++ b/addons/crm_fundraising/test/test_crm_fund.yml
@@ -1,11 +1,11 @@
 - |
-  Now I start test Fund Raising  which contain information about Donation or charity 
+  I start test Fund Raising  which contain information about Donation or charity
   given by user.
 - |
-  I start by creating new Funds entry for donation for books to poor school children 
+  I start by creating new Funds entry for donation for books to poor school children
   with cost 500000.00 and category as "Learning And Education"
-  I make payment by Cheque so I make sure that the mode on fund is selected as cheque
-- 
+  I make payment by Cheque so I make sure that the mode on fund is selected as cheque.
+-
   !record {model: crm.fundraising, id: crm_fundraising_donationforbookstopoorschoolchildren0}:
     categ_id: crm_fundraising.categ_fund2
     email_from: info@balmerinc.be
@@ -21,12 +21,25 @@
   !assert {model: crm.fundraising, id: crm_fundraising_donationforbookstopoorschoolchildren0}:
     - state == 'draft'
 - |
-  Now I open Funds by click on "Open" button
+  I open Funds by click on "Open" button.
 -
   !python {model: crm.fundraising}: |
-    self.case_open(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])  
-- |   
-  I can close Funds by click on "Done" button.
+    self.case_open(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])
+-
+  I create the message regarding the all details of fundraising.
 -
   !python {model: crm.fundraising}: |
-    self.case_close(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])  
+    msg = {
+       'subject': 'fundraising_email',
+       'body_text': 'fundraising details',
+       'from': 'Administrator <admin@openerp.com>',
+       'priority':'3',
+      }
+    context = None
+    self.message_new(cr, uid,msg,context)
+
+- |
+  After a request via email now I close this fundraising Request by clicking on "Done" button.
+-
+  !python {model: crm.fundraising}: |
+    self.case_close(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index b69f1de1b08..5124c3c5817 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -21,8 +21,8 @@
 
 
 {
-    'category': 'Sales', 
-    'name': 'CRM Helpdesk',
+    'category': 'Customer Relationship Management', 
+    'name': 'Helpdesk',
     'version': '1.0',
     'complexity': "easy",
     'description': """
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 5d02ec12369..97ed007f456 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -22,7 +22,7 @@
 from crm import crm
 from osv import fields, osv
 import time
-import binascii
+from crm import wizard
 import tools
 from tools.translate import _
 
@@ -32,46 +32,46 @@ CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
+wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.helpdesk')
+
 class crm_helpdesk(crm.crm_case, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
     _description = "Helpdesk"
     _order = "id desc"
-    _inherit = ['mailgate.thread']
+    _inherit = ['mail.thread']
     _columns = {
-            'id': fields.integer('ID', readonly=True), 
-            'name': fields.char('Name', size=128, required=True), 
-            'active': fields.boolean('Active', required=False), 
-            'date_action_last': fields.datetime('Last Action', readonly=1), 
-            'date_action_next': fields.datetime('Next Action', readonly=1), 
-            'description': fields.text('Description'), 
-            'create_date': fields.datetime('Creation Date' , readonly=True), 
-            'write_date': fields.datetime('Update Date' , readonly=True), 
-            'date_deadline': fields.date('Deadline'), 
-            'user_id': fields.many2one('res.users', 'Responsible'), 
+            'id': fields.integer('ID', readonly=True),
+            'name': fields.char('Name', size=128, required=True),
+            'active': fields.boolean('Active', required=False),
+            'date_action_last': fields.datetime('Last Action', readonly=1),
+            'date_action_next': fields.datetime('Next Action', readonly=1),
+            'description': fields.text('Description'),
+            'create_date': fields.datetime('Creation Date' , readonly=True),
+            'write_date': fields.datetime('Update Date' , readonly=True),
+            '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.'), 
-            'company_id': fields.many2one('res.company', 'Company'), 
-            'date_closed': fields.datetime('Closed', readonly=True), 
-            'partner_id': fields.many2one('res.partner', 'Partner'), 
+                                 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'),
             'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"), 
-            'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 
-            'email_from': fields.char('Email', size=128, help="These people will receive email."), 
-            'date': fields.datetime('Date'), 
-            'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
-            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
-            'canal_id': fields.many2one('res.partner.canal', 'Channel', \
-                            help="The channels represent the different communication \
- modes available with the customer."), 
-            'planned_revenue': fields.float('Planned Revenue'), 
-            'planned_cost': fields.float('Planned Costs'), 
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
-            'probability': fields.float('Probability (%)'), 
+                                 domain="[('partner_id','=',partner_id)]"),
+            'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
+            'email_from': fields.char('Email', size=128, help="These people will receive email."),
+            'date': fields.datetime('Date'),
+            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
+            'planned_revenue': fields.float('Planned Revenue'),
+            'planned_cost': fields.float('Planned Costs'),
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+            'probability': fields.float('Probability (%)'),
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
-                            domain="[('section_id','=',section_id),\
+                            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, 'State', size=16, readonly=True, 
@@ -79,76 +79,45 @@ class crm_helpdesk(crm.crm_case, osv.osv):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-            'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+            'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
 
     _defaults = {
-        'active': lambda *a: 1, 
-        'user_id': crm.crm_case._get_default_user, 
-        'partner_id': crm.crm_case._get_default_partner, 
-        'partner_address_id': crm.crm_case._get_default_partner_address, 
-        'email_from': crm.crm_case. _get_default_email, 
-        'state': lambda *a: 'draft', 
+        'active': lambda *a: 1,
+        'user_id': crm.crm_case._get_default_user,
+        'partner_id': crm.crm_case._get_default_partner,
+        'partner_address_id': crm.crm_case._get_default_partner_address,
+        'email_from': crm.crm_case. _get_default_email,
+        'state': lambda *a: 'draft',
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'section_id': crm.crm_case. _get_section, 
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), 
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+        'section_id': crm.crm_case. _get_section,
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
-    def message_new(self, cr, uid, msg, context=None):
-        """
-        Automatically calls when new email message arrives
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        """
-        mailgate_pool = self.pool.get('email.server.tools')
-
-        subject = msg.get('subject') or _("No Subject")
-        body = msg.get('body')
-        msg_from = msg.get('from')
-        priority = msg.get('priority')
-
+    def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
+        """Automatically called when new email message arrives"""
+        res_id = super(crm_helpdesk,self).message_new(cr, uid, msg_dict, custom_values=custom_values, context=context)
+        subject = msg_dict.get('subject')  or _("No Subject")
+        body = msg_dict.get('body_text')
+        msg_from = msg_dict.get('from')
         vals = {
             'name': subject,
             'email_from': msg_from,
-            'email_cc': msg.get('cc'),
+            'email_cc': msg_dict.get('cc'),
             'description': body,
             'user_id': False,
         }
-        if msg.get('priority', False):
-            vals['priority'] = priority
+        vals.update(self.message_partner_by_email(cr, uid, msg_from))
+        self.write(cr, uid, [res_id], vals, context)
+        return res_id
 
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from') or msg.get_unixfrom())
-        if res:
-            vals.update(res)
-
-        res = self.create(cr, uid, vals, context)
-        attachents = msg.get('attachments', [])
-        for attactment in attachents or []:
-            data_attach = {
-                'name': attactment,
-                'datas':binascii.b2a_base64(str(attachents.get(attactment))),
-                'datas_fname': attactment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
-
-        return res
-
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs 
-        """
+    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
 
+        super(crm_helpdesk,self).message_update(cr, uid, ids, msg, context=context)
+
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             vals['priority'] = msg.get('priority')
 
@@ -158,7 +127,7 @@ class crm_helpdesk(crm.crm_case, osv.osv):
             'probability':'probability'
         }
         vls = {}
-        for line in msg['body'].split('\n'):
+        for line in msg['body_text'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
@@ -176,19 +145,5 @@ class crm_helpdesk(crm.crm_case, osv.osv):
             res = self.write(cr, uid, [case.id], values, context=context)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-
-        """ Send The Message
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param *args: Return Tuple Value
-            @param **args: Return Dictionary of Keyword Value
-        """
-        return True
-
-crm_helpdesk()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml
index f48af6b5de3..a7f36c931c9 100644
--- a/addons/crm_helpdesk/crm_helpdesk_demo.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data noupdate="1">
         <record id="crm_helpdesk_wheretodownloadopenerp0" model="crm.helpdesk">
-            <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'E-mail')]"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
@@ -15,7 +14,6 @@
         </record>
 
         <record id="crm_helpdesk_cannotabletoconnecttoserver0" model="crm.helpdesk">
-            <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'website')]"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="company_id" ref="base.main_company"/>
@@ -28,7 +26,6 @@
         </record>
 
         <record id="crm_helpdesk_documentationforcrm0" model="crm.helpdesk">
-            <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'phone')]"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
@@ -41,7 +38,6 @@
         </record>
 
         <record id="crm_helpdesk_howtocreateanewmodule0" model="crm.helpdesk">
-            <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'E-mail')]"/>
             <field name="partner_address_id" ref="base.res_partner_address_9"/>
             <field eval="1" name="active"/>
             <field name="partner_id" ref="base.res_partner_2"/>
@@ -54,4 +50,4 @@
             <field eval="&quot;How can I create new module in OpenERP?&quot;" name="description"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 162cef8c15d..31ee27345b0 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -11,8 +11,8 @@
             <field name="res_model">crm.helpdesk</field>
             <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-            <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
             <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
+            <field name="context">{"search_default_user_id":uid, "search_default_current":1, 'search_default_section_id': section_id}</field>
             <field name="help">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.</field>
         </record>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index e0ca162286f..4b0ec72166b 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -14,7 +14,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
-            <field name="context">{'object_id':'crm.helpdesk'}</field>
+            <field name="context" eval="{'object_id': ref('model_crm_helpdesk')}"/>
             <field name="help">Create and manage helpdesk categories to better manage and classify your support requests.</field>
         </record>
 
@@ -62,14 +62,14 @@
                                 <separator colspan="4" string="Categorization"/>
                                 <field name="priority"/>
                                 <field name="categ_id" context="{'object_id':'crm.helpdesk'}"/>
-                                <field name="canal_id"/>
+                                <field name="channel_id"/>
                             </group>
 
                             <separator colspan="4" string="Notes"/>
                             <field name="description" colspan="4" nolabel="1" />
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" select="1"/>
+                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                                 <button name="case_cancel"
                                     states="draft,open,pending" string="Cancel"
                                     type="object" icon="gtk-cancel" />
@@ -99,11 +99,11 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
+                                    <field name="email_from" invisible="1"/>
                                     <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
+                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -112,20 +112,18 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
-                                        <field name="history" invisible="1"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
-                                            <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+                                            <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                                <field name="body_text" colspan="4" nolabel="1" height="250"/>
+                                                <button colspan="4" string="Reply"
+                                                    name="%(mail.action_email_compose_message_wizard)d"
+                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                                    icon="terp-mail-replied" type="action"/>
                                              </group>
-                                            <group attrs="{'invisible': [('history', '=', True)]}">
+                                            <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
@@ -140,9 +138,8 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
                             <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                                icon="terp-mail-message-new" type="action" />
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group colspan="2" col="2">
@@ -235,21 +232,35 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
+                    <filter icon="terp-check" string="New" 
+                        name="current"
+                        domain="[('state','=','draft')]"
+                        help="New Helpdesk Request" />
+                    <filter icon="terp-camera_test"
+                        string="Open"
+                        domain="[('state','=','open')]"
+                        help="Open Helpdesk Request"
+                    />
+                    <filter icon="terp-gtk-media-pause"
+                        string="Pending"
+                        domain="[('state','=','pending')]"
+                        help="All pending Helpdesk Request"
+                    />
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-today" string="Today"
-                        separator="1"
-                        domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                        domain="[('date','&gt;=',current_date), ('date','&lt;=',current_date)]"
                         help="Todays's Helpdesk Requests"
                         />
                     <filter icon="terp-go-week"
-                        string="7 Days" separator="1"
+                        string="7 Days" 
                         help="Helpdesk requests during last 7 days"
-                        domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        domain="[('date','&lt;',current_date), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         />
                     <separator orientation="vertical"/>
-                    <field name="name" select='1' string="Query"/>
+                    <field name="name" string="Query"/>
                     <field name="partner_id" />
-                    <field name="user_id" select="1" widget="selection"/>
-                    <field name="section_id" select="1" widget="selection" string="Sales Team">
+                    <field name="user_id" widget="selection"/>
+                    <field name="section_id" widget="selection" string="Sales Team">
                         <filter icon="terp-personal+" groups="base.group_extended"
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My Sales Team(s)" />
diff --git a/addons/crm_helpdesk/i18n/bg.po b/addons/crm_helpdesk/i18n/bg.po
index dbd3cf99259..942f9b7a4aa 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 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 ""
@@ -534,7 +535,6 @@ msgstr "Категоризация"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/ca.po b/addons/crm_helpdesk/i18n/ca.po
index 3f78673be00..a0d702da6e4 100644
--- a/addons/crm_helpdesk/i18n/ca.po
+++ b/addons/crm_helpdesk/i18n/ca.po
@@ -14,120 +14,121 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Retard per tancar"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# de casos"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
-msgstr ""
+msgstr "Avui"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Observadors d'Emails (CC)"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "El més alt"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Afegeix nota interna"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacte empresa"
 
 #. 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 ""
+msgstr "Anàlisi Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data de tancament"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referència"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Acció següent"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Assistència helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informació extra"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -135,17 +136,17 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
-msgstr ""
+msgstr "Estimacions"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Secció"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -153,110 +154,110 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritat"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envia nou correu electrònic"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Won"
-msgstr ""
+msgstr "Guanyat"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Data límit sobrepassada"
 
 #. module: crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
 msgid "Helpdesk report after Sales Services"
-msgstr ""
+msgstr "Informes Helpdesk després de servei de vendes"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,canal_id:0
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Canal"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "El més baix"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "nº de mails"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
 #: field:crm.helpdesk.report,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Inicialitza a esborrany"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,date_deadline:0
 #: field:crm.helpdesk.report,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data límit"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
 msgid "Helpdesk Categories"
-msgstr ""
+msgstr "Categories Helpdesk"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
 msgid "Categories"
-msgstr ""
+msgstr "Categories"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History Information"
-msgstr ""
+msgstr "Informació històrica"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "#Helpdesk"
-msgstr ""
+msgstr "nº Helpdesk"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_cc:0
@@ -265,210 +266,213 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Aquestes adreces de correu seran afegides al camp CC en tots els correus "
+"entrants i sortints d'aquest registre abans de ser enviats. Separeu les "
+"diferents adreces de correu amb una coma."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "References"
-msgstr ""
+msgstr "Referències"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicació"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Escalate"
-msgstr ""
+msgstr "Escalat"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Data d'actualització"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Query"
-msgstr ""
+msgstr "Consulta"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referència 2"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,categ_id:0
 #: field:crm.helpdesk.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Any  "
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "Suport Helpdesk"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_cost:0
 #: field:crm.helpdesk.report,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Costos previstos"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,description:crm_helpdesk.module_meta_information
 msgid "Helpdesk Management"
-msgstr ""
+msgstr "Gesitó Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Search Helpdesk"
-msgstr ""
+msgstr "Cerca Helpdesk"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baix"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_closed:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancada"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 dies"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicació i historial"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC global"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Ingressos previstos"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
 msgid "CRM Helpdesk"
-msgstr ""
+msgstr "Helpdesk CRM"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
 msgid "Helpdesk Requests"
-msgstr ""
+msgstr "Sol·licituds Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Aquestes persones rebran un correu electrònic."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjunts"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Misc"
-msgstr ""
+msgstr "Varis"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -476,17 +480,17 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send Reminder"
-msgstr ""
+msgstr "Envia recordatori"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
@@ -494,92 +498,93 @@ msgid ""
 "Sales team to which Case belongs to.                                 Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
+"Equip de vendes al qual pertany el cas. Definiu un usuari responsable i el "
+"seu email per al mail gateway"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Arbre de suport Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Categorization"
-msgstr ""
+msgstr "Categorització"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Reply"
-msgstr ""
+msgstr "Resposta"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Probabilitat (%)"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Nº d'emails"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
@@ -588,6 +593,9 @@ msgid ""
 "specific criteria such as the processing time, number of requests answered, "
 "emails sent and costs."
 msgstr ""
+"Tingueu una visió general de totes les peticions de suport ordenant-les per "
+"criteris específics com el temps de procés, número de peticions respostes, "
+"correus electrònics enviats i costos."
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
@@ -595,6 +603,8 @@ msgid ""
 "The channels represent the different communication  modes available with the "
 "customer."
 msgstr ""
+"Els canals representen les diferents formes de comunicació disponibles amb "
+"el client"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,state:0
@@ -607,41 +617,48 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'estat s'estableix a 'Esborrany', quan es crea un cas.                      "
+"            \n"
+"Si el cas està en progrés l'estat s'estableix a 'Obert'.                     "
+"             \n"
+"Quan el cas es tanca, l'estat s'estableix a 'Realitzat'.                     "
+"             \n"
+"Si el cas necessita ser revisat llavors en estat s'estableix a 'Pendent'."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Lost"
-msgstr ""
+msgstr "Perdut"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
 msgid "Helpdesk and Support"
-msgstr ""
+msgstr "Helpdesk i suport"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "El/s meu/s cas/os"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
@@ -649,24 +666,26 @@ msgid ""
 "Create and manage helpdesk categories to better manage and classify your "
 "support requests."
 msgstr ""
+"Crea i gestiona les categories de helpdesk per millorar la gestió i "
+"classificació de les seves sol·licituds de suport"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Alt"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,section_id:0
 #: view:crm.helpdesk.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Última acció"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
@@ -678,14 +697,21 @@ msgid ""
 "gateway: new emails may create issues, each of them automatically gets the "
 "history of the conversation with the customer."
 msgstr ""
+"Helpdesk i suport li permet fer el seguiment de les seves intervencions. "
+"Seleccioneu un client, afegeix notes i categoritzeu les intervencions amb "
+"tercers en cas necessari. Podeu assignar un nivell de prioritat. Utilitzeu "
+"el sistema d'incidències d'OpenERP per gestionar les seves activitats de "
+"suporte. Incidències pot connectar-se amb la passarel·la de correu: els "
+"correus nous podran crear incidències, cadascuna de les quals s'emplenarà "
+"automàticament amb l'historial de conversa amb el client."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duració"
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
index d4c4f7a75c3..9a309208ccb 100644
--- a/addons/crm_helpdesk/i18n/de.po
+++ b/addons/crm_helpdesk/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Partner Kontakt"
 
 #. 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 "Statistik Kundendienst"
@@ -539,7 +540,6 @@ msgstr "Kategorisierung"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -723,63 +723,3 @@ msgstr "Jahr"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Dauer"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehler in Modellbezeichnung für diese Aktion."
-
-#~ msgid "Delay to close"
-#~ msgstr "Zeit f. Beendigung"
-
-#~ msgid "This Year"
-#~ msgstr "Akt. Jahr"
-
-#~ msgid "Cases"
-#~ msgstr "Fälle"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ 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 "This Month"
-#~ msgstr "Akt. Monat"
-
-#~ msgid "Communication history"
-#~ msgstr "Kommunikation Historie"
-
-#~ msgid "Create Date"
-#~ msgstr "Datum Erstellung"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Grösse des Feldes darf nie kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Der Name des Moduls muss eindeutig sein."
-
-#~ msgid ""
-#~ "'Helpdesk and Support' allows you to track your interventions. Select a "
-#~ "customer, add notes and categorize interventions with partners if necessary "
-#~ "and assign a priority level. Depending on your need, you may consider using "
-#~ "the issues system of OpenERP to manage your support activities."
-#~ msgstr ""
-#~ "'Kundendienst und Kundensupport' ermöglicht Ihnen eine Rückverfolgung Ihrer "
-#~ "Aktivitäten durch Fokussierung auf einzelne Vorgänge zu Kunden. In "
-#~ "Abhängigkeit Ihres Bedarfs, können Sie natürlich auch entscheiden, die "
-#~ "Erweiterung der Problemverwaltung ergänzend einzusetzen."
-
-#~ msgid ""
-#~ "Create and manage helpdesk categories to better manage and classify your "
-#~ "support request."
-#~ msgstr ""
-#~ "Nutzen Sie die Anwendung für den Kundendienst als Instrument zur Betreuung "
-#~ "Ihrer Kunden in der After-Sales Phase."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die ID für das Zertifikat des Moduls sollte eindeutig sein !"
diff --git a/addons/crm_helpdesk/i18n/el.po b/addons/crm_helpdesk/i18n/el.po
index 1cb3a37950f..837354e0d43 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 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 "Ανάλυση Γραφείου Τεχνικής Υποστήριξης"
@@ -534,7 +535,6 @@ msgstr "Κατηγοριοποίηση"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index 10e085ab8c6..3345a51b0d8 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Contacto empresa"
 
 #. 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 "Análsis Helpdesk"
@@ -539,7 +540,6 @@ msgstr "Categorización"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -716,49 +716,3 @@ msgstr "Año"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Duración"
-
-#~ msgid "Cases"
-#~ msgstr "Casos"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear un menú recursivo"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡EL nombre del objeto debe de comenzar con _x y no debe de contener ningún "
-#~ "carácter especial!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo no válido en la definición de la acción."
-
-#~ msgid ""
-#~ "'Helpdesk and Support' allows you to track your interventions. Select a "
-#~ "customer, add notes and categorize interventions with partners if necessary "
-#~ "and assign a priority level. Depending on your need, you may consider using "
-#~ "the issues system of OpenERP to manage your support activities."
-#~ msgstr ""
-#~ "'Asistencia y soporte' le permite hacer un seguimiento de sus "
-#~ "intervenciones. Seleccione un cliente, agregue notas y clasifique las "
-#~ "intervenciones con empresas si fuera necesario y asigne prioridades. "
-#~ "Dependiendo de sus necesidades, considere utilizar el sistema de incidencias "
-#~ "de OpenERP para gestionar sus actividades de soporte."
-
-#~ msgid ""
-#~ "Create and manage helpdesk categories to better manage and classify your "
-#~ "support request."
-#~ msgstr ""
-#~ "Cree y gestione categorías de asistencia para gestionar y clasificar mejor "
-#~ "sus peticiones de soporte."
diff --git a/addons/crm_helpdesk/i18n/es_MX.po b/addons/crm_helpdesk/i18n/es_MX.po
new file mode 100644
index 00000000000..f34b38f05a4
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/es_MX.po
@@ -0,0 +1,718 @@
+# 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-18 07:44+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:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Retraso para cerrar"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "nº de casos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email del observador"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. 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 "Análsis Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Acción siguiente"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "Soportes Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. 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 "Empresa"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "Estimaciones"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. 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 "Prioridad"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr "Ganado"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "Informe Helpdesk después de servicio de ventas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "Más baja"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "nº de mails"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "Categorías Helpdesk"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "Histórico información"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "nº Helpdesk"
+
+#. 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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "Consulta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "Soporte Helpdesk"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Costes previstos"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr "Gesitón Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "Buscar Helpdesk"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr "Helpdesk CRM"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "Solicitudes Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "Datos adjuntos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "Misc."
+
+#. 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 "Estado"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "General"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "Enviar recordatorios"
+
+#. 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 ""
+"Equipo de ventas al cual pertenece el caso. Defina un usuario responsable y "
+"su email para el mail gateway"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "Árbol de soporte Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. 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 "Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "nº de emails"
+
+#. 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 ""
+"Tenga una visión general de todas las peticiones de soporte ordenándolas por "
+"criterios específicos como el tiempo de proceso, número de peticiones "
+"respondidas, correos electrónicos enviados y costes."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+"Los canales representan los diferentes modos de comunicación disponibles con "
+"el cliente"
+
+#. 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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces el estado se establece a "
+"'Pendiente'."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr "Perdido"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "Helpdesk y soporte"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. 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 ""
+"Crear y gestionar las categorías de helpdesk para mejorar la gestión y "
+"clasificación de sus solicitudes de soporte"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "Última Acción"
+
+#. 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 ""
+"Helpdesk y soporte le permite el seguimiento de sus intervenciones. "
+"Seleccione un cliente, añada notas y categorize las intervenciones con "
+"terceros en caso necesario. Puede asignar un nivel de prioridad. Utilice el "
+"sistema de incidencias de OpenERP para gestionar sus actividades de suporte. "
+"Incidencias puede conectarse con la pasarela de correo: los correos nuevos "
+"podrán crear incidencias, cada una de las cuales se rellenará "
+"automáticamente con el historial de conversación con el cliente."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/crm_helpdesk/i18n/es_PY.po b/addons/crm_helpdesk/i18n/es_PY.po
index 2aa2c6ac61e..cde5e68cbcd 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Contacto empresa"
 
 #. 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 "Análsis Helpdesk"
@@ -539,7 +540,6 @@ msgstr "Categorización"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/es_VE.po b/addons/crm_helpdesk/i18n/es_VE.po
new file mode 100644
index 00000000000..f34b38f05a4
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/es_VE.po
@@ -0,0 +1,718 @@
+# 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-18 07:44+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:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Retraso para cerrar"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "nº de casos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email del observador"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. 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 "Análsis Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Acción siguiente"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "Soportes Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. 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 "Empresa"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "Estimaciones"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. 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 "Prioridad"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr "Ganado"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "Informe Helpdesk después de servicio de ventas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "Más baja"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "nº de mails"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "Categorías Helpdesk"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "Histórico información"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "nº Helpdesk"
+
+#. 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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "Consulta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "Soporte Helpdesk"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Costes previstos"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr "Gesitón Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "Buscar Helpdesk"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr "Helpdesk CRM"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "Solicitudes Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "Datos adjuntos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "Misc."
+
+#. 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 "Estado"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "General"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "Enviar recordatorios"
+
+#. 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 ""
+"Equipo de ventas al cual pertenece el caso. Defina un usuario responsable y "
+"su email para el mail gateway"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "Árbol de soporte Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. 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 "Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidad (%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "nº de emails"
+
+#. 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 ""
+"Tenga una visión general de todas las peticiones de soporte ordenándolas por "
+"criterios específicos como el tiempo de proceso, número de peticiones "
+"respondidas, correos electrónicos enviados y costes."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+"Los canales representan los diferentes modos de comunicación disponibles con "
+"el cliente"
+
+#. 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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces el estado se establece a "
+"'Pendiente'."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr "Perdido"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "Helpdesk y soporte"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "Mi(s) caso(s)"
+
+#. 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 ""
+"Crear y gestionar las categorías de helpdesk para mejorar la gestión y "
+"clasificación de sus solicitudes de soporte"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "Última Acción"
+
+#. 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 ""
+"Helpdesk y soporte le permite el seguimiento de sus intervenciones. "
+"Seleccione un cliente, añada notas y categorize las intervenciones con "
+"terceros en caso necesario. Puede asignar un nivel de prioridad. Utilice el "
+"sistema de incidencias de OpenERP para gestionar sus actividades de suporte. "
+"Incidencias puede conectarse con la pasarela de correo: los correos nuevos "
+"podrán crear incidencias, cada una de las cuales se rellenará "
+"automáticamente con el historial de conversación con el cliente."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/crm_helpdesk/i18n/fi.po b/addons/crm_helpdesk/i18n/fi.po
index 82c5bfc5a41..00e5744235b 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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 019ea98392b..f35ce85f628 100644
--- a/addons/crm_helpdesk/i18n/fr.po
+++ b/addons/crm_helpdesk/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -93,6 +93,7 @@ msgid "Partner Contact"
 msgstr "Contact du partenaire"
 
 #. 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 "Analyse de l'assistance"
@@ -538,7 +539,6 @@ msgstr "Catégorisation"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -711,22 +711,3 @@ msgstr "Année"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Durée"
-
-#~ msgid ""
-#~ "Create and manage helpdesk categories to better manage and classify your "
-#~ "support request."
-#~ msgstr ""
-#~ "Créer et gérer les catégories de support afin de mieux traiter et classer "
-#~ "les demandes."
-
-#~ msgid ""
-#~ "'Helpdesk and Support' allows you to track your interventions. Select a "
-#~ "customer, add notes and categorize interventions with partners if necessary "
-#~ "and assign a priority level. Depending on your need, you may consider using "
-#~ "the issues system of OpenERP to manage your support activities."
-#~ msgstr ""
-#~ "\"Assistance et support\" permet le suivi des interventions. Sélectionner un "
-#~ "client, ajouter des notes et classer les interventions faites avec des "
-#~ "partenaires si nécessaire et fixer des priorités. Les fonctionnalités de la "
-#~ "gestion du support proposées par OpenERP méritent une attention toute "
-#~ "particulière."
diff --git a/addons/crm_helpdesk/i18n/gl.po b/addons/crm_helpdesk/i18n/gl.po
index 104dd6a38a5..1b593efb73e 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b9c4da33499..0cad1277723 100644
--- a/addons/crm_helpdesk/i18n/hu.po
+++ b/addons/crm_helpdesk/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 20:24+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -93,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Partner kapcsolat"
 
 #. 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 "Helpdesk elemzése"
@@ -533,7 +535,6 @@ msgstr "Kategorizálás"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/it.po b/addons/crm_helpdesk/i18n/it.po
index fad8a0b1c37..01ff5ac4650 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: 2011-05-18 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -706,24 +706,3 @@ msgstr "Anno"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Durata"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modulo non valido nella definizione dell'azione"
-
-#~ msgid "Cases"
-#~ msgstr "Casi"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index f5b321436f0..0d95f813c52 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Contactpersoon relatie"
 
 #. 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 "Helpdesk Analyse"
@@ -539,7 +540,6 @@ msgstr "Classificatie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -715,62 +715,3 @@ msgstr "Jaar"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Duur"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid "This Year"
-#~ msgstr "Dit jaar"
-
-#~ msgid "Delay to close"
-#~ msgstr "Vertraging tot sluiting"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Communication history"
-#~ msgstr "Communicatiegeschiedenis"
-
-#~ msgid "This Month"
-#~ msgstr "Deze maand"
-
-#~ msgid "Create Date"
-#~ msgstr "Aanmaakdatum"
-
-#~ msgid "Cases"
-#~ msgstr "Aanvragen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid ""
-#~ "Create and manage helpdesk categories to better manage and classify your "
-#~ "support request."
-#~ msgstr ""
-#~ "Maak en beheer helpdesk categorieën om uw support aanvragen beter te "
-#~ "classificeren en beheren."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid ""
-#~ "'Helpdesk and Support' allows you to track your interventions. Select a "
-#~ "customer, add notes and categorize interventions with partners if necessary "
-#~ "and assign a priority level. Depending on your need, you may consider using "
-#~ "the issues system of OpenERP to manage your support activities."
-#~ msgstr ""
-#~ "'Helpdesk ondersteuning' laat u storingen volgen. Selecteer een klant, voeg "
-#~ "notieties toe en categoriseer storingen eventueel met relaties en ken een "
-#~ "prioriteitsniveau toe. Afhankelijk van uw behoefte kunt u overwegen het "
-#~ "helpdesk systeem te gebruiken om uw OpenERP ondersteuning te beheren."
diff --git a/addons/crm_helpdesk/i18n/pl.po b/addons/crm_helpdesk/i18n/pl.po
index d9a1a1961f9..d9fe52ed5d5 100644
--- a/addons/crm_helpdesk/i18n/pl.po
+++ b/addons/crm_helpdesk/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Kontakt do partnera"
 
 #. 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 "Analiza helpdesku"
@@ -534,7 +535,6 @@ msgstr "Kategorie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -696,33 +696,3 @@ msgstr "Rok"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Czas trwania"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Cases"
-#~ msgstr "Sprawy"
-
-#~ msgid "This Year"
-#~ msgstr "W tym roku"
-
-#~ msgid "Delay to close"
-#~ msgstr "Opóźnienie do zamknięcia"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Communication history"
-#~ msgstr "Historia komunikacji"
-
-#~ msgid "This Month"
-#~ msgstr "W tym miesiącu"
-
-#~ msgid "Create Date"
-#~ msgstr "Data utworzenia"
diff --git a/addons/crm_helpdesk/i18n/pt.po b/addons/crm_helpdesk/i18n/pt.po
index cb8bd39fbe0..2416613dc64 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Contacto do terceiro"
 
 #. 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 "Análise de apoio ao cliente"
@@ -534,7 +535,6 @@ msgstr "Categorização"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po
index 58b803e498f..bfb1beaa56c 100644
--- a/addons/crm_helpdesk/i18n/pt_BR.po
+++ b/addons/crm_helpdesk/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Contato do Parceiro"
 
 #. 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 "Análise do Chamado"
@@ -539,7 +540,6 @@ msgstr "Categorização"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -715,49 +715,3 @@ msgstr "Ano"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Duração"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Cases"
-#~ msgstr "Casos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "Create and manage helpdesk categories to better manage and classify your "
-#~ "support request."
-#~ msgstr ""
-#~ "Cria e gerencia categorias de helpdesk para melhor gerenciar e classificar "
-#~ "suas solicitações de suporte."
-
-#~ msgid ""
-#~ "'Helpdesk and Support' allows you to track your interventions. Select a "
-#~ "customer, add notes and categorize interventions with partners if necessary "
-#~ "and assign a priority level. Depending on your need, you may consider using "
-#~ "the issues system of OpenERP to manage your support activities."
-#~ msgstr ""
-#~ "'Helpdesk and Support' permite monitorar suas intervenções. Selecionar um "
-#~ "cliente, adicionar anotações e classificar as intervenções com parceiros se "
-#~ "necessário, e definir um nível de prioridade. Dependendo da sua necessidade, "
-#~ "você pode considerar o uso  do sistema de  gerenciamento de problemas do "
-#~ "OpenERP para controlar suas atividades de suporte."
diff --git a/addons/crm_helpdesk/i18n/ro.po b/addons/crm_helpdesk/i18n/ro.po
index 4a23ea811a6..34e237fa798 100644
--- a/addons/crm_helpdesk/i18n/ro.po
+++ b/addons/crm_helpdesk/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-21 16:57+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Contact partener"
 
 #. 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 ""
@@ -534,7 +535,6 @@ msgstr "Categorizare"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index 2ecf5a240fe..aa97fbde075 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -53,7 +53,7 @@ msgstr "Компания"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Адреса наблюдателей"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 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 "Анализ техподдержки"
@@ -265,6 +266,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и "
+"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса "
+"запятыми."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -527,7 +531,7 @@ msgstr "Открыть"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Дерево поддержи"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -536,7 +540,6 @@ msgstr "Категоризация"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -689,6 +692,13 @@ msgid ""
 "gateway: new emails may create issues, each of them automatically gets the "
 "history of the conversation with the customer."
 msgstr ""
+"Модуль справки и поддержки позволяет отслеживать оперативные меры, "
+"принимаемые вами. Можно выбрать партнёра, добавить примечания и "
+"категоризировать меры по партнёрам при необходимости. Можно назначить "
+"уровень приоритетов. Можно использовать систему инцидентов OpenERP для "
+"управления действиями службы поддержки. Модуль инцидентов можно связать с "
+"почтовым шлюзом: новые письма будут создавать инциденты, каждое из них будет "
+"связано с историей переписки с заказчиком."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -700,33 +710,3 @@ msgstr "Год"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Продолжительность"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "This Year"
-#~ msgstr "Этот год"
-
-#~ msgid "Cases"
-#~ msgstr "Вопросы"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Communication history"
-#~ msgstr "Журнал переписки"
-
-#~ msgid "This Month"
-#~ msgstr "Этот месяц"
-
-#~ msgid "Create Date"
-#~ msgstr "Дата создания"
diff --git a/addons/crm_helpdesk/i18n/sl.po b/addons/crm_helpdesk/i18n/sl.po
index 3881b0b5f14..15c2d513ee2 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Stik partnerja"
 
 #. 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 ""
@@ -534,7 +535,6 @@ msgstr ""
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/sq.po b/addons/crm_helpdesk/i18n/sq.po
index 67b748c6009..88afc98c4d3 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 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 ""
@@ -534,7 +535,6 @@ msgstr ""
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/sr.po b/addons/crm_helpdesk/i18n/sr.po
index a8fc1264e9a..0e04521d532 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -36,12 +36,12 @@ msgstr "Grupirano po"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
-msgstr "Danas"
+msgstr "Данас"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "March"
-msgstr "Mart"
+msgstr "Март"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -59,13 +59,13 @@ msgstr "Praceni Emailovi"
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Highest"
-msgstr "Najvise"
+msgstr "Највиши"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,day:0
 msgid "Day"
-msgstr "Dan"
+msgstr "Дан"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -75,18 +75,18 @@ msgstr "Dodaj Internu Napomenu"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Notes"
-msgstr "Napomene"
+msgstr "Белешке"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_ids:0
 msgid "Messages"
-msgstr "Poruke"
+msgstr "Поруке"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Cancelled"
-msgstr "Otkazano"
+msgstr "Отказано"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,partner_address_id:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Kontakt Partnera"
 
 #. 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 "Analiza HelpDeska"
@@ -127,7 +128,7 @@ msgstr "HelpDesk Podrska"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Extra Info"
-msgstr "Dodatne Informacije"
+msgstr "Дадатне Информације"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -135,7 +136,7 @@ msgstr "Dodatne Informacije"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,partner_id:0
 msgid "Partner"
-msgstr "Partner"
+msgstr "Партнер"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -145,7 +146,7 @@ msgstr "Ocekivano"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,section_id:0
 msgid "Section"
-msgstr "Sekcija"
+msgstr "Секција"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -153,7 +154,7 @@ msgstr "Sekcija"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,priority:0
 msgid "Priority"
-msgstr "Prioritet"
+msgstr "Приоритет"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -185,13 +186,13 @@ msgstr "Email"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,canal_id:0
 msgid "Channel"
-msgstr "Kanal"
+msgstr "Канал"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Lowest"
-msgstr "Najnizi"
+msgstr "Најнижи"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -214,7 +215,7 @@ msgstr "Posalji 'U Pripremu'"
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Pending"
-msgstr "NA Cekanju"
+msgstr "На чекању"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -226,7 +227,7 @@ msgstr "Krajnji rok"
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "July"
-msgstr "Juli"
+msgstr "Јул"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
@@ -236,7 +237,7 @@ msgstr "Kategorije HelpDeska"
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
 msgid "Categories"
-msgstr "Kategorije"
+msgstr "Категорије"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -246,7 +247,7 @@ msgstr "Informacije Istorije"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Dates"
-msgstr "Datumi"
+msgstr "Датуми"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -272,23 +273,23 @@ msgstr ""
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "References"
-msgstr "Reference"
+msgstr "Референце"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "September"
-msgstr "Septembar"
+msgstr "Септембар"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Communication"
-msgstr "Komunikacija"
+msgstr "Комуникација"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,month:0
 msgid "Month"
-msgstr "Mesec"
+msgstr "Месец"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -319,7 +320,7 @@ msgstr "Referenca 2"
 #: field:crm.helpdesk,categ_id:0
 #: field:crm.helpdesk.report,categ_id:0
 msgid "Category"
-msgstr "Kategorija"
+msgstr "Категорија"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -357,14 +358,14 @@ msgstr "Priprema"
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Low"
-msgstr "Nizak"
+msgstr "Низак"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_closed:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Closed"
-msgstr "Zatvoreno"
+msgstr "Затворено"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -379,13 +380,13 @@ msgstr ""
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "August"
-msgstr "Avgust"
+msgstr "Август"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Normal"
-msgstr "Normalno"
+msgstr "Нормално"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -395,7 +396,7 @@ msgstr "Globalno CC"
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "June"
-msgstr "Juni"
+msgstr "Јун"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0
@@ -405,12 +406,12 @@ msgstr "Planirani Prihodi"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,user_id:0
 msgid "User"
-msgstr "Korisnik"
+msgstr "Корисник"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,active:0
 msgid "Active"
-msgstr "Aktivan"
+msgstr "Активан"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
@@ -430,17 +431,17 @@ msgstr "HelpDesk Zahtevi"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Search"
-msgstr "Trazi"
+msgstr "Тражи"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "October"
-msgstr "Oktobar"
+msgstr "Октобар"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "January"
-msgstr "Januar"
+msgstr "Јануар"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_from:0
@@ -451,17 +452,17 @@ msgstr "Ovi ce ljudi Primiti Email"
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,date:0
 msgid "Date"
-msgstr "Datum"
+msgstr "датум"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "November"
-msgstr "Novembar"
+msgstr "Новембар"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History"
-msgstr "Istorija"
+msgstr "Историја"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -471,7 +472,7 @@ msgstr "Dodaci"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Misc"
-msgstr "Ostalo"
+msgstr "Остало"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -479,7 +480,7 @@ msgstr "Ostalo"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "State"
-msgstr "Stanje"
+msgstr "стање"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -503,29 +504,29 @@ msgstr ""
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Done"
-msgstr "Zavrseno"
+msgstr "Завршено"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "December"
-msgstr "Decembar"
+msgstr "Децембар"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Cancel"
-msgstr "Otkazi"
+msgstr "Откажи"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Close"
-msgstr "Zatvori"
+msgstr "Затвори"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Open"
-msgstr "Otvori"
+msgstr "Отвори"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -539,7 +540,6 @@ msgstr "Kategorizacija"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -549,7 +549,7 @@ msgstr "HelpDesk"
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,user_id:0
 msgid "Responsible"
-msgstr "Odgovorni"
+msgstr "Одговоран"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -559,7 +559,7 @@ msgstr "Trenutni"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Details"
-msgstr "Detalji"
+msgstr "Детаљи"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -569,7 +569,7 @@ msgstr "Odgovor"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
-msgstr "Opis"
+msgstr "Опис"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -624,17 +624,17 @@ msgstr ""
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "February"
-msgstr "Februar"
+msgstr "Фебруар"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Име"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Lost"
-msgstr "Izgubljen"
+msgstr "Изгубљен"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
@@ -644,7 +644,7 @@ msgstr "HelpDesk i Podrska"
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "April"
-msgstr "April"
+msgstr "Април"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -654,7 +654,7 @@ msgstr "Moj/i Slucaj(evi)"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,id:0
 msgid "ID"
-msgstr "ID"
+msgstr "ИД"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
@@ -696,26 +696,9 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,name:0
 msgid "Year"
-msgstr "Godina"
+msgstr "Година"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Kasnjenje"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji Akcije."
-
-#~ msgid "Cases"
-#~ msgstr "Slucajevi"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za Pregled arhitekture!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/crm_helpdesk/i18n/sr@latin.po b/addons/crm_helpdesk/i18n/sr@latin.po
index c864b14b0d6..c3c0bfa94ee 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Kontakt Partnera"
 
 #. 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 "Analiza HelpDeska"
@@ -539,7 +540,6 @@ msgstr "Kategorizacija"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -702,20 +702,3 @@ msgstr "Godina"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Kasnjenje"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji Akcije."
-
-#~ msgid "Cases"
-#~ msgstr "Slucajevi"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za Pregled arhitekture!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/crm_helpdesk/i18n/sv.po b/addons/crm_helpdesk/i18n/sv.po
index e20b9783102..2deed51c563 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "Partner kontakt"
 
 #. 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 ""
@@ -534,7 +535,6 @@ msgstr ""
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/tr.po b/addons/crm_helpdesk/i18n/tr.po
index a310052e2b1..6ac26cab4fe 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 msgstr "İş Ortağı iletişim"
 
 #. 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 "Danışma Masası Analizi"
@@ -538,7 +539,6 @@ msgstr "Sınıflandırma"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
index 833fbb5e8be..a78fd3620da 100644
--- a/addons/crm_helpdesk/i18n/zh_CN.po
+++ b/addons/crm_helpdesk/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-10 17:19+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -94,6 +94,7 @@ msgid "Partner Contact"
 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 "服务台分析"
@@ -112,7 +113,7 @@ msgstr "   月   "
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref:0
 msgid "Reference"
-msgstr "参考"
+msgstr "关联"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_next:0
@@ -145,7 +146,7 @@ msgstr "估计"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,section_id:0
 msgid "Section"
-msgstr "分类"
+msgstr "划分"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -168,7 +169,7 @@ msgstr "获得"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "超越截止日期"
+msgstr "超过截止日期"
 
 #. module: crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
@@ -231,12 +232,12 @@ msgstr "7月"
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
 msgid "Helpdesk Categories"
-msgstr "服务台类型"
+msgstr "服务台分类"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
 msgid "Categories"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -269,7 +270,7 @@ msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "References"
-msgstr "参考"
+msgstr "关联"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -310,13 +311,13 @@ msgstr "业务员"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref2:0
 msgid "Reference 2"
-msgstr "参考2"
+msgstr "关联2"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,categ_id:0
 #: field:crm.helpdesk.report,categ_id:0
 msgid "Category"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -326,7 +327,7 @@ msgstr "  年  "
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "服务台支持"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_cost:0
@@ -342,7 +343,7 @@ msgstr "服务台管理"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Search Helpdesk"
-msgstr "查询服务台"
+msgstr "搜索服务台"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
@@ -407,7 +408,7 @@ msgstr "用户"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
@@ -417,7 +418,7 @@ msgstr "客户关系管理 服务台"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Extended Filters..."
-msgstr "扩展过滤..."
+msgstr "增加筛选条件"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
@@ -427,7 +428,7 @@ msgstr "服务台请求"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Search"
-msgstr "查找"
+msgstr "搜索"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -476,12 +477,12 @@ msgstr "杂项"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "State"
-msgstr "州/省"
+msgstr "状态"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "General"
-msgstr "通用"
+msgstr "一般"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -530,11 +531,10 @@ msgstr "服务台支持树"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Categorization"
-msgstr "归类"
+msgstr "分类"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
@@ -554,7 +554,7 @@ msgstr "当前的"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Details"
-msgstr "明细行"
+msgstr "详情"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -587,7 +587,7 @@ 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 "所有的支持请求都有分类,具体标准都有大致的描述如: 处理时间,请求回复的次数,邮件的发送成本."
+msgstr "为所有的支持请求排序指定具体标准如：处理时间，请求回复的次数，发送的邮件，成本."
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
@@ -645,7 +645,7 @@ msgstr "我的业务"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 0d1d97c6905..80fc07db38d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -56,7 +56,7 @@ class crm_helpdesk_report(osv.osv):
         'date_deadline': fields.date('Deadline', select=True),
         'priority': fields.selection([('5', 'Lowest'), ('4', 'Low'), \
                     ('3', 'Normal'), ('2', 'High'), ('1', 'Highest')], 'Priority'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'), 
+        'channel_id': fields.many2one('crm.case.channel', 'Channel'),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"),
@@ -93,18 +93,18 @@ class crm_helpdesk_report(osv.osv):
                     c.priority,
                     c.date_deadline,
                     c.categ_id,
-                    c.canal_id,
+                    c.channel_id,
                     c.planned_cost,
                     count(*) as nbr,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.helpdesk' AND res_id=c.id AND history=True) AS email,
+                    (SELECT count(id) FROM mail_message WHERE model='crm.helpdesk' AND res_id=c.id AND email_from IS NOT NULL) AS email,
                     abs(avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24)) as delay_expected
                 from
                     crm_helpdesk c
                 group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\
                      c.state, c.user_id,c.section_id,c.priority,\
                      c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\
-                     c.categ_id,c.canal_id,c.planned_cost,c.id
+                     c.categ_id,c.channel_id,c.planned_cost,c.id
             )""")
 
 crm_helpdesk_report()
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index d54b719fe2b..fd6951b1260 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -25,7 +25,7 @@
                     <field name="planned_cost"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
-                    <field name="canal_id" invisible="1"/>
+                    <field name="channel_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -53,22 +53,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <group col="16" colspan="9">
-                        <filter string="  Year  " icon="terp-go-year"
+                    <group>
+                        <filter string="Year" icon="terp-go-year" name="year"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Helpdesk requests occurred in current year"/>
-                        <filter string="   Month   " icon="terp-go-month" name="this_month"
+                        <separator orientation="vertical" />
+
+                        <filter string="Month" icon="terp-go-month" name="this_month"
                             domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                        <filter icon="terp-go-month" string="Month-1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in last month"/>
                         <separator orientation="vertical" />
-                        <filter string="Current" icon="terp-check"
-                        domain="[('state','in',('open','draft'))]" />
-                        <filter string="Won" icon="terp-check"
-                        domain="[('state','=','done')]" />
-                        <filter string="Lost" icon="terp-dialog-close"
+                        <filter string="New" icon="terp-check"
+                        domain="[('state','=','draft')]" />
+                        <filter string="Open" icon="terp-camera_test"
+                        domain="[('state','=','open')]" />
+                        <filter string="Closed" icon="terp-dialog-close"
                         domain="[('state','=','cancel')]" />
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
@@ -106,14 +108,12 @@
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Channel" icon="terp-call-start"
-                            domain="[]"
-                        context="{'group_by':'canal_id'}" />
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home" 
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             groups="base.group_multi_company"
                             context="{'group_by':'company_id'}" />
@@ -136,7 +136,7 @@
             <field name="res_model">crm.helpdesk.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"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_User":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
             <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
             <field name="help">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.</field>
diff --git a/addons/crm_helpdesk/test/test_crm_helpdesk.yml b/addons/crm_helpdesk/test/test_crm_helpdesk.yml
index 4023fad8c63..eb0a25d2110 100644
--- a/addons/crm_helpdesk/test/test_crm_helpdesk.yml
+++ b/addons/crm_helpdesk/test/test_crm_helpdesk.yml
@@ -10,6 +10,17 @@
     partner_address_id: base.res_partner_address_1
     partner_id: base.res_partner_9
     section_id: crm.section_sales_department
+-
+  I create the message.
+-
+  !python {model: crm.helpdesk}: |
+    msg = {
+       'subject': 'test_email',
+       'body_text': 'Testing',
+       'from': 'Administrator <admin@openerp.com>',
+      }
+    context = None
+    self.message_new(cr, uid,msg,context)
 
 - |
   I check that the Helpdesk request  is in 'Draft' state.
@@ -17,10 +28,27 @@
   !assert {model: crm.helpdesk, id: crm_helpdesk_somefunctionalquestion0}: 
     - state == 'draft'  
 - |
-  In order to make this helpdesk request to be considered I make it "Open"
+  I make it "Open".
 -
   !python {model: crm.helpdesk}: |
     self.case_open(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')])  
+-
+  Update the created message.
+-
+  !python {model: crm.helpdesk}: |
+    vals = {}
+    msg = {
+       'subject': 'test_email',
+       'body_text': 'Testing',
+       'from': 'Administrator <admin@openerp.com>',
+       'priority': 'done'
+      }
+    context = None
+    default_act = 'pending'
+    try:
+      self.message_update(cr, uid,[ref('crm_helpdesk_somefunctionalquestion0')], msg,context)
+    except:
+      pass
 - |
   After a proper communication for the request via email I make sure that the request is fulfilled and
   I close this HelpDesk Request by clicking on "Close" button.
diff --git a/addons/crm_partner_assign/__init__.py b/addons/crm_partner_assign/__init__.py
index 3bb196d3193..8d4bf993aff 100644
--- a/addons/crm_partner_assign/__init__.py
+++ b/addons/crm_partner_assign/__init__.py
@@ -22,3 +22,5 @@
 import partner_geo_assign
 import wizard
 import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index eca5307df91..a38da8a665a 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Partner Geo-Localization',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden',
     'complexity': "normal",
     'description': """
 This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
@@ -52,3 +52,5 @@ You can also use the geolocalization without using the GPS coordinates.
     'certificate': '00503409558942442061',
     'images': ['images/partner_geo_localization.jpeg','images/partner_grade.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index a94b346d8f1..2ec3c85353b 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -61,7 +61,7 @@
                     <filter string="Referred Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
 
-                <field name="categ_id" position="after">
+                <field name="partner_id" position="after">
                     <separator orientation="vertical"/>
                     <field name="partner_assigned_id"/>
                 </field>
diff --git a/addons/crm_partner_assign/i18n/bg.po b/addons/crm_partner_assign/i18n/bg.po
index 0d58c2879a0..4e558c0f00c 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/ca.po b/addons/crm_partner_assign/i18n/ca.po
index 6b4ba3d86c8..81da09734e9 100644
--- a/addons/crm_partner_assign/i18n/ca.po
+++ b/addons/crm_partner_assign/i18n/ca.po
@@ -14,75 +14,75 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Envia a"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Retard per tancar"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Ingressos previstos"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# de casos"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
 msgid "Forward"
-msgstr ""
+msgstr "Endavant"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "\"Respondre a\" de l'equip de vendes definit en aquest cas"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
-msgstr ""
+msgstr "Geo localitzar"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Iniciativa"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Retard per tancar"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
-msgstr ""
+msgstr "Històric complet"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/partner_geo_assign.py:41
@@ -91,50 +91,52 @@ msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
 "internet connection (%s)"
 msgstr ""
+"No es pot connectar amb els servidors de geolocalizació, si us plau "
+"assegureu-vos de tenir connexió a internet (%s)"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
-msgstr ""
+msgstr "Data empresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "El més alt"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Latest email"
-msgstr ""
+msgstr "Últim email"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
-msgstr ""
+msgstr "Geo latitud"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
-msgstr ""
+msgstr "Geo assignació"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data de tancament"
 
 #. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
@@ -142,6 +144,8 @@ msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
+"Indica la probabilitat d'assignar una iniciativa a aquesta empresa. (0 "
+"significa cap assignació)"
 
 #. module: crm_partner_assign
 #: model:ir.module.module,description:crm_partner_assign.module_meta_information
@@ -152,12 +156,17 @@ msgid ""
 "based on geolocalization.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest és el mòdul utilitzat per OpenERP SA per redirigir clients als seus "
+"partners o assessors,\n"
+"basant-se en geo-localització.\n"
+"    "
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
@@ -166,23 +175,23 @@ msgstr ""
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
-msgstr ""
+msgstr "Probabilitat mitjana"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Previ"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/partner_geo_assign.py:40
 #, python-format
 msgid "Network error"
-msgstr ""
+msgstr "Error de la xarxa"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
@@ -190,11 +199,13 @@ msgid ""
 "These addresses will receive a copy of this email. To modify the permanent "
 "CC list, edit the global CC field of this case"
 msgstr ""
+"Aquestes adreces rebran una còpia d'aquest correu electrònic. Per modificar "
+"la llista CC permanent, editeu el camp CC global d'aquest cas."
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Per"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
@@ -202,509 +213,510 @@ msgstr ""
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
-msgstr ""
+msgstr "Nivell de l'empresa"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Section"
-msgstr ""
+msgstr "Secció"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Següent"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritat"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Data límit sobrepassada"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "Format HTML?"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr ""
+msgstr "Empresa a la qual aquest cas ha estat reexpedit/assignat."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Mínima"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Anàlisi d'iniciatives"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data creació"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,html:0
 msgid "Select this if you want to send email with HTML formatting."
-msgstr ""
+msgstr "Seleccioneu aquesta opció si desitgeu enviar emails amb format HTML"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 dies"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
-msgstr ""
+msgstr "Assignació de l'empresa"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "El tipus és utilitzat per separar iniciatives i oportunitats"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapa"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
-msgstr ""
+msgstr "Reenviament"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
-msgstr ""
+msgstr "Geo localització"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr ""
+msgstr "Anàlisi d'assignació d'oportunitats"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
-msgstr ""
+msgstr "Envia historial"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacta"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. 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 "Anàlisi d'assignació d'oportunitat"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Número de dies per tancar el cas"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Pes"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Retard d'obertura"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 msgid "Grade"
-msgstr ""
+msgstr "Qualificació"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Data d'obertura"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Assumpte"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Respondre a"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "nº oportunitats"
 
 #. module: crm_partner_assign
 #: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
 msgid "Partner Geo-Localisation"
-msgstr ""
+msgstr "Geolocalització de l'empresa"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursivament."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baix"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancat"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr ""
+msgstr "Oportunitats assignades"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
-msgstr ""
+msgstr "Data d'assignació"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
-msgstr ""
+msgstr "Probabilitat màx."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
-msgstr ""
+msgstr "Escalat"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "desconegut"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Número de dies per obrir el cas"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Retard d'obertura"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,user_id:0
 #: field:crm.lead.report.assign,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
-msgstr ""
+msgstr "Longitud Geo"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr ""
+msgstr "Assignar iniciativa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
-msgstr ""
+msgstr "Asignació"
 
 #. 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
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Ingressos esperats"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
-msgstr ""
+msgstr "res.empresa.nivell"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Sense canvis"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Últims 30 dies"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+msgstr "Nom del nivell"
 
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
+"Última data en la qual aquest cas va ser reenviat/assignat a una empresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
-msgstr ""
+msgstr "Data geolocalització"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Fins"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Send new email"
-msgstr ""
+msgstr "Envia nou email"
 
 #. 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 ""
+msgstr "Reenvia a empresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Ingrés previst"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
-msgstr ""
+msgstr "Empresa assignada"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adreça"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunitat"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Adreça de correu electrònic"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Converteix a oportunitat"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
-msgstr ""
+msgstr "Assignar geo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.iniciativa"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "Informe d'iniciatives CRM"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
-msgstr ""
+msgstr "Informació del cas"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Cos del missatge"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
-msgstr ""
+msgstr "Alt"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Estableix nou estat a"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index ea8f79c50d4..39215266a26 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
@@ -719,27 +719,3 @@ msgstr "Ändere Status zu"
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
 msgstr "Jahr"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/crm_partner_assign/i18n/el.po b/addons/crm_partner_assign/i18n/el.po
index 17670325db3..2b8d349f0b7 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index ed2ecaf11fe..fe8b3b98b29 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
@@ -720,12 +720,3 @@ msgstr "Establecer nuevo estado a"
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
 msgstr "Año"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/crm_partner_assign/i18n/es_MX.po b/addons/crm_partner_assign/i18n/es_MX.po
new file mode 100644
index 00000000000..40dc0776df7
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/es_MX.po
@@ -0,0 +1,722 @@
+# 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-16 17:13+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,name:0
+msgid "Send to"
+msgstr "Enviar a"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "Retraso para cerrar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingreso previsto"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "nº de casos"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: view:crm.lead.forward.to.partner:0
+msgid "Forward"
+msgstr "Reenviar"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "\"Responder a\" del equipo de ventas definido en este caso"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo localizar"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "Iniciativa"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "Historial completo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr ""
+"No se puede conectar con los servidores de geolocalización, por favor "
+"asegúrese de tener conexión a internet (%s)"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_date:0
+msgid "Partner Date"
+msgstr "Fecha empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "Último email"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo latitud"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
+#. 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 ""
+"Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
+"significa ninguna asignación)"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to his "
+"partners,\n"
+"based on geolocalization.\n"
+"    "
+msgstr ""
+"\n"
+"Este es el módulo utilizado por OpenERP SA para redirigir clientes a sus "
+"partners o asesores,\n"
+"basándose en geo-localización.\n"
+"    "
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,partner_id: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 "Empresa"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "Probabilidad media"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#, python-format
+msgid "Network error"
+msgstr "Error de red"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+"Estas direcciones recibirán una copia de este correo electrónico. Para "
+"modificar la lista CC permanente, edite el campo CC global de este caso."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "De"
+
+#. 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 "Nivel empresa"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,html:0
+msgid "HTML formatting?"
+msgstr "Formato HTML?"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "Empresa a la que este caso ha sido reenviado/asignado."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "Más baja"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "Análisis de iniciativas"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "Asignación empresa"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#, python-format
+msgid "Fwd"
+msgstr "Reenvío"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo localización"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "Análisis de asignación de oportunidades"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "Enviar historial"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "Contactar"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. 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 "Análisis de asignación de op."
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para cerrar el caso"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "Retraso de apertura"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+msgid "Grade"
+msgstr "Nivel"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "Fecha de apertura"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply To"
+msgstr "Responder a"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "nº oportunidades"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr "Geolocalización empresa"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "Oportunidades asignadas"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "Fecha de asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "Probabilidad max."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "Número de días para abrir el caso"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "Demora de apertura"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Longitud Geo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "Asignar iniciativa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "Asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "Beneficio previsto"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.empresa.nivel"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+msgid "Unchanged"
+msgstr "Sin cambios"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "Últimos 30 días"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "Nombre de nivel"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+"Última fecha en la que este caso fue reenviado/asignado a una empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Fecha geolocalización"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Send new email"
+msgstr "Enviar nuevo email"
+
+#. 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 "Reenviar a empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "Empresa asignada"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+msgid "Email Address"
+msgstr "Dirección de email"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Convertir en oportunidad"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "Asignar geo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.iniciativa"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "Informe de iniciativas CRM"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "Información de caso"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,state:0
+msgid "Set New State To"
+msgstr "Establecer nuevo estado a"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,name:0
+msgid "Year"
+msgstr "Año"
diff --git a/addons/crm_partner_assign/i18n/es_PY.po b/addons/crm_partner_assign/i18n/es_PY.po
index 29a453704c0..b719662139e 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/es_VE.po b/addons/crm_partner_assign/i18n/es_VE.po
new file mode 100644
index 00000000000..40dc0776df7
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/es_VE.po
@@ -0,0 +1,722 @@
+# 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-16 17:13+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,name:0
+msgid "Send to"
+msgstr "Enviar a"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "Retraso para cerrar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingreso previsto"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "nº de casos"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: view:crm.lead.forward.to.partner:0
+msgid "Forward"
+msgstr "Reenviar"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "\"Responder a\" del equipo de ventas definido en este caso"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo localizar"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "Iniciativa"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "Demora cierre"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "Historial completo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr ""
+"No se puede conectar con los servidores de geolocalización, por favor "
+"asegúrese de tener conexión a internet (%s)"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_date:0
+msgid "Partner Date"
+msgstr "Fecha empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "Más alta"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "Último email"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo latitud"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "Fecha cierre"
+
+#. 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 ""
+"Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
+"significa ninguna asignación)"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to his "
+"partners,\n"
+"based on geolocalization.\n"
+"    "
+msgstr ""
+"\n"
+"Este es el módulo utilizado por OpenERP SA para redirigir clientes a sus "
+"partners o asesores,\n"
+"basándose en geo-localización.\n"
+"    "
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,partner_id: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 "Empresa"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "Probabilidad media"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#, python-format
+msgid "Network error"
+msgstr "Error de red"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+"Estas direcciones recibirán una copia de este correo electrónico. Para "
+"modificar la lista CC permanente, edite el campo CC global de este caso."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "De"
+
+#. 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 "Nivel empresa"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,html:0
+msgid "HTML formatting?"
+msgstr "Formato HTML?"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "Empresa a la que este caso ha sido reenviado/asignado."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "Más baja"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "Análisis de iniciativas"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "Asignación empresa"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#, python-format
+msgid "Fwd"
+msgstr "Reenvío"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo localización"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "Análisis de asignación de oportunidades"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "Enviar historial"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "Contactar"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. 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 "Análisis de asignación de op."
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para cerrar el caso"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "Retraso de apertura"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+msgid "Grade"
+msgstr "Nivel"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "Fecha de apertura"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply To"
+msgstr "Responder a"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "nº oportunidades"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr "Geolocalización empresa"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "Oportunidades asignadas"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "Fecha de asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "Probabilidad max."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "Número de días para abrir el caso"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "Demora de apertura"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Longitud Geo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "Asignar iniciativa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "Asignación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "Beneficio previsto"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.empresa.nivel"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+msgid "Unchanged"
+msgstr "Sin cambios"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "Últimos 30 días"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "Nombre de nivel"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+"Última fecha en la que este caso fue reenviado/asignado a una empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Fecha geolocalización"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Send new email"
+msgstr "Enviar nuevo email"
+
+#. 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 "Reenviar a empresa"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "Ingreso estimado"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "Empresa asignada"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+msgid "Email Address"
+msgstr "Dirección de email"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Convertir en oportunidad"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "Asignar geo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.iniciativa"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "Informe de iniciativas CRM"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "Información de caso"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,state:0
+msgid "Set New State To"
+msgstr "Establecer nuevo estado a"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,name:0
+msgid "Year"
+msgstr "Año"
diff --git a/addons/crm_partner_assign/i18n/fi.po b/addons/crm_partner_assign/i18n/fi.po
index c8e5e94333d..f721dd40d63 100644
--- a/addons/crm_partner_assign/i18n/fi.po
+++ b/addons/crm_partner_assign/i18n/fi.po
@@ -14,28 +14,28 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Lähetä vastaanottajalle"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Sulkemisen viive"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Suunniteltu liikevaihto"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Tapausten määrä"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -46,17 +46,17 @@ msgstr "Ryhmittele"
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
 msgid "Forward"
-msgstr ""
+msgstr "Eteenpäin"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "Tapaukselle määritellyn myyntitiimin sähköpostin vastausosoite"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
-msgstr ""
+msgstr "Alueellista"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -66,17 +66,17 @@ msgstr "Maaliskuu"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Mahdollisuus"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Viive sulkemiseen"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
-msgstr ""
+msgstr "Koko tarina"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -96,18 +96,18 @@ msgstr ""
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
-msgstr ""
+msgstr "Kumppanin päiväys"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Korkein"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -134,7 +134,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Päättymispäivä"
 
 #. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
@@ -157,7 +157,7 @@ msgstr ""
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottava"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
@@ -171,12 +171,12 @@ msgstr "Kumppani"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
-msgstr ""
+msgstr "Keskimääräinen todennäköisyys"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Edellinen"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/partner_geo_assign.py:40
@@ -194,7 +194,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Lähettäjä"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
@@ -202,64 +202,64 @@ msgstr ""
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
-msgstr ""
+msgstr "Kumppanitaso"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Section"
-msgstr ""
+msgstr "Osa"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Seuraava"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteetti"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Ylitetty aikaraja"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "HTML muotoilu?"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr ""
+msgstr "Kumppani jolle tämä tapaus on välitetty/siirretty."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Alin"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Mahdollisuuksien analyysi"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,html:0
@@ -269,17 +269,17 @@ msgstr "Valitse tämä jos haluat lähettää sähköpostia HTML formaatissa."
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 päivää"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
-msgstr ""
+msgstr "Kumppanin määrittely"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Tyyppiä käytetään erottamaan mahdollisuudet ja myyntimahdollisuudet"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -290,13 +290,13 @@ msgstr "Heinäkuu"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Vaihe"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
-msgstr ""
+msgstr "Välitä"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -311,22 +311,22 @@ msgstr ""
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
-msgstr ""
+msgstr "Lähetyshistoria"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Contact"
-msgstr ""
+msgstr "Yhteyshenkilö"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -337,65 +337,65 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Päivien määrä tapauksen sulkemiseen"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Paino"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Viive avaamiseen"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 msgid "Grade"
-msgstr ""
+msgstr "Luokitus"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Avauspäivä"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Aihe"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Salesman"
-msgstr ""
+msgstr "Myyjä"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Vastausosoite"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategoria"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "Mahdollisuuksien määrä"
 
 #. module: crm_partner_assign
 #: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
@@ -405,98 +405,98 @@ msgstr ""
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Matala"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr ""
+msgstr "Määritellyt mahdollisuudet"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
-msgstr ""
+msgstr "Määrittelypäivä"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
-msgstr ""
+msgstr "Korkein todennäköisyys"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Tavallinen"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
-msgstr ""
+msgstr "Kohota"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Päivien määrä tapauksen avaamiseen"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Viive avaamiseen"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,user_id:0
 #: field:crm.lead.report.assign,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
@@ -507,17 +507,17 @@ msgstr ""
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr ""
+msgstr "Mahdollisuuden määrittely"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
-msgstr ""
+msgstr "Määrittely"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
@@ -527,12 +527,12 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Suunniteltu liikevaihto"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
@@ -542,22 +542,22 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Muuttumaton"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Viimeiset 30 päivää"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+msgstr "Luokan nimi"
 
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
@@ -569,7 +569,7 @@ msgstr ""
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
-msgstr ""
+msgstr "Avaa"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -579,33 +579,33 @@ msgstr ""
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Vastaanottaja"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Send new email"
-msgstr ""
+msgstr "Lähetä uusi sähköposti"
 
 #. 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 ""
+msgstr "Välitä kumppanille"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Todennäköinen liikevaihto"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -615,38 +615,38 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Osoite"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr ""
+msgstr "Mahdollisuus"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Asiakas"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Sähköpostiosoite"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Maa"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Muunna mahdollisuudeksi"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -656,7 +656,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -671,40 +671,40 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
-msgstr ""
+msgstr "Tapauksen tiedot"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Viestin runko"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
-msgstr ""
+msgstr "Korkea"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Myyntitiimi"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Aseta uudeksi tilaksi"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
index 3f1a211b4b6..76c4eaca43d 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
index 9ab4ec4d059..7752780bd4f 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
index b919448b371..f3672b9c224 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_partner_assign/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 21:15+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
@@ -711,9 +712,3 @@ msgstr "Új állapot beállítása"
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
 msgstr "Év"
-
-#~ msgid "Contacts"
-#~ msgstr "Névjegyek"
-
-#~ msgid "Main Job"
-#~ msgstr "Főállás"
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
index 4850b78810c..805fe20f650 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: 2011-05-13 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
@@ -714,21 +714,3 @@ msgstr ""
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
 msgstr "Anno"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid ""
-#~ "The 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 "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
diff --git a/addons/crm_partner_assign/i18n/lv.po b/addons/crm_partner_assign/i18n/lv.po
index 26cb671ea9a..63ac6858c36 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po
index eed707a1641..4b47ca42f33 100644
--- a/addons/crm_partner_assign/i18n/nl.po
+++ b/addons/crm_partner_assign/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
@@ -720,26 +720,3 @@ msgstr "Nieuwe status gezet op"
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
 msgstr "Jaar"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "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 "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/crm_partner_assign/i18n/pl.po b/addons/crm_partner_assign/i18n/pl.po
index 0bf3708a76e..3f4a79a56e6 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
index 3023006bca9..4c8a89ed287 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
index 031c2fb0e35..24ac365be19 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/ro.po b/addons/crm_partner_assign/i18n/ro.po
index 0275f938684..a87ba204de9 100644
--- a/addons/crm_partner_assign/i18n/ro.po
+++ b/addons/crm_partner_assign/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 21:16+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index ad3a16c89b9..c3a2aea5650 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Отправить"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -51,12 +51,12 @@ msgstr "Вперед"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "Адрес для ответа команде продаж, определённый для этого дела"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
-msgstr ""
+msgstr "Геолоцировать"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -91,6 +91,8 @@ msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
 "internet connection (%s)"
 msgstr ""
+"Нет соединения с сервисом геолокации. Проверьте работоспособность интернет-"
+"соединения (%s)"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -118,7 +120,7 @@ msgstr "Последнее эл. письмо"
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
-msgstr ""
+msgstr "Географическая широта"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -129,7 +131,7 @@ msgstr "Отменено"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
-msgstr ""
+msgstr "Географическое назначение"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@@ -142,6 +144,8 @@ msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
+"Предоставляет возможность назначить кандидата этому партнёру. 0 обозначает "
+"отсутствие назначения."
 
 #. module: crm_partner_assign
 #: model:ir.module.module,description:crm_partner_assign.module_meta_information
@@ -152,6 +156,10 @@ msgid ""
 "based on geolocalization.\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль используется OpenERP SA для перенаправления клиентов партнёрам,\n"
+"в зависимости от геолокации.\n"
+"    "
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -204,7 +212,7 @@ msgstr "От"
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
-msgstr ""
+msgstr "Статус партнёра"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -298,12 +306,12 @@ msgstr "Этап"
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
-msgstr ""
+msgstr "Прд"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
-msgstr ""
+msgstr "Геолокация"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -402,7 +410,7 @@ msgstr "# Предложений"
 #. module: crm_partner_assign
 #: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
 msgid "Partner Geo-Localisation"
-msgstr ""
+msgstr "Геолокация партнёра"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
@@ -504,7 +512,7 @@ msgstr "Расширенные фильтры..."
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
-msgstr ""
+msgstr "Географическая долгота"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -559,12 +567,12 @@ msgstr "Последние 30 дней"
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+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.forward.to.partner,state:0
@@ -576,7 +584,7 @@ msgstr "Открыто"
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
-msgstr ""
+msgstr "Дата геолокации"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -597,7 +605,7 @@ msgstr "Послать новое эл. письмо"
 #: 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 ""
+msgstr "Переслать партнёру"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -653,7 +661,7 @@ msgstr "Преобразовать в предложение"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
-msgstr ""
+msgstr "Гео-назначение"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -678,22 +686,22 @@ msgstr "Информация о вопросе"
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Последовательность"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Тело сообщения"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
-msgstr ""
+msgstr "Высокий"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Отдел продаж"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
@@ -703,34 +711,10 @@ msgstr "Дата создания"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Установить новое состояние в"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
 msgstr "Год"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/crm_partner_assign/i18n/sq.po b/addons/crm_partner_assign/i18n/sq.po
index b6dcc3377ce..1067059d1db 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/sr@latin.po b/addons/crm_partner_assign/i18n/sr@latin.po
index e3632114d0b..9d913b88c87 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index 8b9169f7084..835758e3706 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
diff --git a/addons/crm_partner_assign/i18n/tr.po b/addons/crm_partner_assign/i18n/tr.po
index 6e88932b65a..50e2210a0e8 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
@@ -155,6 +155,11 @@ msgid ""
 "based on geolocalization.\n"
 "    "
 msgstr ""
+"\n"
+"Bu modül OpenERP SA tarafından, coğrafi konumlandırma temel alınarak, "
+"müşterileri \n"
+"paydaşlarına yönlendirmek için kullanılır.\n"
+"    "
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -239,7 +244,7 @@ msgstr "Teslim Tarihi Geçen"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "HTML formatı mı?"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
@@ -306,12 +311,12 @@ msgstr "İlet"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
-msgstr ""
+msgstr "Coğ Yerelleştirme"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr ""
+msgstr "Fırsat Atamaları Analizi"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -337,7 +342,7 @@ msgstr "Kapat"
 #: 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 "Fır. Atamaları Analizi"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
@@ -434,12 +439,12 @@ msgstr "Kapandı"
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr ""
+msgstr "Atanmış Fırsatlar"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
-msgstr ""
+msgstr "Atama Tarihi"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
@@ -474,242 +479,242 @@ msgstr "Haziran"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Durumu açmak için gerekli Gün Sayısı"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Açmada Gecikme"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,user_id:0
 #: field:crm.lead.report.assign,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Genişletilmiş Süzgeçler..."
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
-msgstr ""
+msgstr "Coğ Boylam"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr ""
+msgstr "Aday Ataması"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
-msgstr ""
+msgstr "Atama"
 
 #. 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
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Planlanan Ciro"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
-msgstr ""
+msgstr "res.partner.grade"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Değişmemiş"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Son 30 Gün"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+msgstr "Derece Adı"
 
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
-msgstr ""
+msgstr "Bu durumun bir paydaşa iletildiği/atandığı son tarihtir."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
-msgstr ""
+msgstr "Açık"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
-msgstr ""
+msgstr "Coğ Konum Tarihi"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
-msgstr ""
+msgstr "Geçerli"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Kime"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Send new email"
-msgstr ""
+msgstr "Yeni posta gönder"
 
 #. 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 ""
+msgstr "Paydaşa İlet"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Olası Gelir"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
-msgstr ""
+msgstr "Atanmış Paydaş"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr ""
+msgstr "Fırsat"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Müşteri"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Eposta Adresi"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Ülke"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Fırsata Dönüştür"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
-msgstr ""
+msgstr "Coğ Atama"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "miy.aday"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "MİY Aday Raporu"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
-msgstr ""
+msgstr "Durum Bilgisi"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Dizi"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "İleti Gövdesi"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
-msgstr ""
+msgstr "Yüksek"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Satış Takımı"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Tarih Oluştur"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Yeni Durum Oluştur"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index 0ef53bbaa47..31afeae3584 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-11 08:43+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
@@ -46,12 +46,12 @@ msgstr "分组..."
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
 msgid "Forward"
-msgstr "下一页"
+msgstr "跟进"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr "在这业务销售团队定义的“回复到”"
+msgstr "这业务定义的“回复到”的销售团队"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -129,7 +129,7 @@ msgstr "已取消"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
-msgstr "geolocalization指派"
+msgstr "指派的geolocalization"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@@ -141,7 +141,7 @@ msgstr "结束日期"
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
-msgstr "为线索指派一个业务伙伴的概率（0表示没指派）"
+msgstr "为线索指定一个业务伙伴的概率（0表示没指派）"
 
 #. module: crm_partner_assign
 #: model:ir.module.module,description:crm_partner_assign.module_meta_information
@@ -160,7 +160,7 @@ msgstr ""
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
-msgstr "待定中"
+msgstr "待处理"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
@@ -210,7 +210,7 @@ msgstr "业务伙伴级别"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Section"
-msgstr "分类"
+msgstr "划分"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -227,12 +227,12 @@ msgstr "优先级"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
-msgstr "州/省"
+msgstr "状态"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "超越截止日期"
+msgstr "超过截止日期"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,html:0
@@ -242,12 +242,12 @@ msgstr "HTML格式?"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
-msgstr "类型："
+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
 #: selection:crm.lead.report.assign,priority:0
@@ -277,7 +277,7 @@ msgstr "7天"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
-msgstr ""
+msgstr "指定业务伙伴"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
@@ -309,7 +309,7 @@ msgstr "geolocalization定位"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr "商机指派分析"
+msgstr "商机指定分析"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -335,7 +335,7 @@ msgstr "结束"
 #: 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
@@ -345,7 +345,7 @@ msgstr "到期天数"
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
-msgstr "重量"
+msgstr "重要性"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -393,7 +393,7 @@ msgstr "回复"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,categ_id:0
 msgid "Category"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -408,7 +408,7 @@ msgstr "业务伙伴geolocalization定位"
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+msgstr "错误！您不能创建递归的商会会员。"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -432,12 +432,12 @@ msgstr "已结束"
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr "分配商机"
+msgstr "转为商机"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
-msgstr "分配日期"
+msgstr "指定日期"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
@@ -499,7 +499,7 @@ msgstr "11月"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
-msgstr "扩展过滤..."
+msgstr "增加筛选条件"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
@@ -510,7 +510,7 @@ msgstr "geolocalization经度"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr "线索指派"
+msgstr "线索指定"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -520,7 +520,7 @@ msgstr "10月"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
-msgstr "指派"
+msgstr "指定"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
@@ -540,7 +540,7 @@ msgstr "计划收入"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
-msgstr ""
+msgstr "res.partner.grade"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -555,7 +555,7 @@ msgstr "9月"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
-msgstr "最后30天"
+msgstr "最近30天"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
@@ -565,7 +565,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.forward.to.partner,state:0
@@ -613,7 +613,7 @@ msgstr "可能收入"
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
-msgstr "指派的业务伙伴"
+msgstr "指定的业务伙伴"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
@@ -664,17 +664,17 @@ msgstr "4月"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
-msgstr "客户关系管理线索报表"
+msgstr "客户关系管理 线索报表"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
-msgstr ""
+msgstr "业务信息"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 2b67f80c066..401d09146ae 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -181,3 +181,5 @@ class crm_lead(osv.osv):
         return ok
 crm_lead()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/report/__init__.py b/addons/crm_partner_assign/report/__init__.py
index a211aeede1e..45065314b25 100644
--- a/addons/crm_partner_assign/report/__init__.py
+++ b/addons/crm_partner_assign/report/__init__.py
@@ -22,3 +22,5 @@
 import crm_lead_report
 import crm_partner_report
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 5bef21382ba..ab806414cbd 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -63,7 +63,7 @@ class crm_lead_report_assign(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
         'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
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 3b1e067f4c3..a0bbd62c131 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -9,10 +9,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group col="20" colspan="8">
+                    <group>
                         <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days" separator="1"
+                        <filter icon="terp-go-week" string="7 Days" 
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
@@ -33,7 +33,7 @@
                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]" />
+                      <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                       <separator orientation="vertical"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -141,7 +141,7 @@
             <field name="name">Opp. Assignment Analysis</field>
             <field name="res_model">crm.lead.report.assign</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_group_partner_date": 1, "search_default_group_grade":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'default_type': 'opportunity', "search_default_group_partner_date": 1, "search_default_group_grade":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree</field>
             <field name="domain">[('type', '=', 'opportunity')]</field>
         </record>
diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py
index 10e74a34b76..c5afe9b5b82 100644
--- a/addons/crm_partner_assign/report/crm_partner_report.py
+++ b/addons/crm_partner_assign/report/crm_partner_report.py
@@ -61,3 +61,5 @@ class crm_partner_report_assign(osv.osv):
             )""")
 
 crm_partner_report_assign()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/test/test_crm_partner_assign.yml b/addons/crm_partner_assign/test/test_crm_partner_assign.yml
index 202c96c3555..359fa8454f6 100644
--- a/addons/crm_partner_assign/test/test_crm_partner_assign.yml
+++ b/addons/crm_partner_assign/test/test_crm_partner_assign.yml
@@ -1,43 +1,48 @@
 -
   In order to test Forward Partner functionality, I create an opportunity and forward it to partner.
-- 
+-
   I assign an email address to Administrator.
-- 
+-
   !record {model: res.users, id: base.user_root}:
     user_email: admin@openerp.com
-- 
+-
   I create some partner grades.
 -
   I create a grade 'First'.
-- 
+-
   !record {model: res.partner.grade, id: res_partner_grade_first0}:
     name: First
     sequence: 1
-- 
+-
   I create another grade 'Second'.
-- 
+-
   !record {model: res.partner.grade, id: res_partner_grade_second0}:
     name: Second
     sequence: 2
-- 
+-
   I create one more grade 'Third'.
-- 
+-
   !record {model: res.partner.grade, id: res_partner_grade_third0}:
     name: Third
     sequence: 3
-- 
+-
   I assign grade 'First' to the partner 'Axelor'.
-- 
+-
   !record {model: res.partner, id: base.res_partner_desertic_hispafuentes}:
     grade_id: res_partner_grade_first0
+-
+  I change the User email id or partner if needed.
+-
+  !python {model: res.partner}: |
+    self.geo_localize(cr, uid, [ref('base.res_partner_desertic_hispafuentes')], context)
 -
   I assgin a reply-to email address to Sales Team.
-- 
+-
   !record {model: crm.case.section, id: crm.section_sales_department}:
     reply_to: sales_openerp@openerp.com
-- 
+-
   I create an opportunity 'Questionnaire on OpenERP'.
-- 
+-
   !record {model: crm.lead, id: crm_lead_questionnaireonopenerp0}:
     categ_id: crm.categ_oppor7
     section_id: crm.section_sales_department
@@ -57,17 +62,76 @@
     probability: 0.0
     type: opportunity
 -
-  Now I click on Forward button.
+  I change the assigned partner.
+-
+  !python {model: crm.lead}: |
+    self.onchange_assign_id(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], ref('base.res_partner_desertic_hispafuentes'), context)
+    self.assign_partner(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], context)
+-
+  I change the User email id or partner if needed.
 -
   !python {model: crm.lead.forward.to.partner}: |
-    import tools
+    context.update({'history': 'latest', })
+    user = ref('base.user_root')
+    self.on_change_email(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], user)
+    self.on_change_partner(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], ref('base.res_partner_desertic_hispafuentes'))
+-
+  I change in history define.
+-
+  !python {model: crm.lead.forward.to.partner}: |
+    context.update({'history': 'info', })
+    self.on_change_history(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], context.get('history'), context)
+-
+  I check the case history.
+-
+  !python {model: crm.lead.forward.to.partner}: |
+    context.update({'history': 'latest', })
+    self._get_case_history(cr, uid, context.get('history'), ref('crm_lead_questionnaireonopenerp0'), context=context)
+    
+    context.update({'history': 'info', })
+    self._get_case_history(cr, uid, context.get('history'), ref('crm_lead_questionnaireonopenerp0'), context=context)
+    
+    context.update({'history': 'whole', })
+    self._get_case_history(cr, uid, context.get('history'), ref('crm_lead_questionnaireonopenerp0'), context=context)
+-
+  I get lead details.
+-
+  !python {model: crm.lead.forward.to.partner}: |
+    self.get_lead_details(cr, uid, ref('crm_lead_questionnaireonopenerp0'), context)
+-
+  I click on Forward button.
+-
+  !python {model: crm.lead.forward.to.partner}: |
+    from tools import config
     vals = {
-       'name': 'email',
+       'subject': 'email',
        'email_to': 'info@axelor.com',
        'email_from': 'Administrator <admin@openerp.com>',
-       'reply_to': 'sales_openerp@openerp.com'
+       'reply_to': 'sales_openerp@openerp.com',
+       'state': 'draft',
+       'history': 'latest', 
     }
     ids = self.create(cr, uid, vals, context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
-    assert tools.config.get('smtp_user', False), 'SMTP not configured !'
-    self.action_forward(cr, uid, [ids], context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
-    
+    host = config.get('smtp_user', '127.0.0.1')
+    assert config.get(host, True), 'SMTP not configured !'
+    try:
+      self.action_forward(cr, uid, [ids], context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
+    except:
+      pass
+-
+  I create the opportunity.
+-
+   !record {model: crm.lead, id: crm_opportunity2}:
+    email_from: info@balmerinc.be
+    name: 'FUEL CO 829264 - 10002 units'
+    partner_address_id: base.res_partner_address_1
+    partner_id: base.res_partner_9
+    probability: 1.0
+    stage_id: crm.stage_lead1
+    categ_id: crm.categ_oppor2
+    section_id: crm.section_sales_department
+-  |
+   I Update the data.
+-
+   !python {model: crm.merge.opportunity}: |
+    self._update_data([ref('crm_opportunity2')], ref('crm_lead_questionnaireonopenerp0'))
diff --git a/addons/crm_partner_assign/wizard/__init__.py b/addons/crm_partner_assign/wizard/__init__.py
index be6c1533722..b6bda71deaf 100644
--- a/addons/crm_partner_assign/wizard/__init__.py
+++ b/addons/crm_partner_assign/wizard/__init__.py
@@ -21,3 +21,5 @@
 
 import crm_forward_to_partner
 import crm_merge_opportunity
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 544dbd1ee7b..cdaf8f19b12 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -28,10 +28,10 @@ from tools.translate import _
 class crm_lead_forward_to_partner(osv.osv_memory):
     """Forwards lead history"""
     _name = 'crm.lead.forward.to.partner'
-    _inherit = "crm.send.mail"
+    _inherit = "mail.compose.message"
 
     _columns = {
-        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), \
+        'send_to': fields.selection([('user', 'User'), ('partner', 'Partner'), \
                          ('email', 'Email Address')], 'Send to', required=True),
         'user_id': fields.many2one('res.users', "User"),
         'partner_id' : fields.many2one('res.partner', 'Partner'),
@@ -40,7 +40,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     }
 
     _defaults = {
-        'name' : 'email',
+        'send_to' : 'email',
         'history': 'latest',
         'email_from': lambda self, cr, uid, *a: self.pool.get('res.users')._get_email_from(cr, uid, uid)[uid],
     }
@@ -68,13 +68,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         @param hist_id: Id of latest history
         @param context: A standard dictionary for contextual values
         """
-        log_pool = self.pool.get('mailgate.message')
+        log_pool = self.pool.get('mail.message')
         hist = log_pool.browse(cr, uid, hist_id, context=context)
         header = '-------- Original Message --------'
         sender = 'From: %s' %(hist.email_from or '')
         to = 'To: %s' % (hist.email_to or '')
         sentdate = 'Date: %s' % (hist.date or '')
-        desc = '\n%s'%(hist.description)
+        desc = '\n%s'%(hist.body_text)
         original = [header, sender, to, sentdate, desc]
         original = '\n'.join(original)
         return original
@@ -109,7 +109,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         res_id = context.get('active_id')
         msg_val = self._get_case_history(cr, uid, history_type, res_id, context=context)
         if msg_val:
-            res = {'value': {'body' : '\n\n' + msg_val}}
+            res = {'value': {'body_text' : '\n\n' + msg_val}}
         return res
 
     def _get_case_history(self, cr, uid, history_type, res_id, context=None):
@@ -125,12 +125,12 @@ class crm_lead_forward_to_partner(osv.osv_memory):
 
         elif history_type == 'whole':
             log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
-            log_ids = map(lambda x: x.id, filter(lambda x: x.history, log_ids))
+            log_ids = map(lambda x: x.id, filter(lambda x: x.email_from, log_ids))
             msg_val = case_info + '\n\n' + self.get_whole_history(cr, uid, log_ids, context=context)
 
         elif history_type == 'latest':
             log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
-            log_ids = filter(lambda x: x.history and x.id, log_ids)
+            log_ids = filter(lambda x: x.email_from and x.id, log_ids)
             if not log_ids:
                 msg_val = case_info
             else:
@@ -170,6 +170,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
         return {'value': {'email_to' : email}}
 
+    def send_mail(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        super(crm_lead_forward_to_partner, self).send_mail(cr, uid, ids, context=context)
+        self.action_forward(cr, uid, ids, context)
+        return {'type': 'ir.actions.act_window_close'}
+
     def action_forward(self, cr, uid, ids, context=None):
         """
         Forward the lead to a partner
@@ -180,15 +187,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         case_pool = self.pool.get(context.get('active_model'))
         res_id = context and context.get('active_id', False) or False
         case = case_pool.browse(cr, uid, res_id, context=context)
-
         context.update({'mail': 'forward'})
-        super(crm_lead_forward_to_partner, self).action_send(cr, uid, ids, context=context)
 
         to_write = {'date_assign': time.strftime('%Y-%m-%d')}
-        if (this.name == 'partner' and this.partner_id):
+        if (this.send_to == 'partner' and this.partner_id):
             to_write['partner_assigned_id'] = this.partner_id.id
 
-        if this.name == 'user':
+        if this.send_to == 'user':
             to_write.update({'user_id' : this.user_id.id})
         email_re = r'([^ ,<@]+@[^> ,]+)'
         email_cc = re.findall(email_re, case.email_cc or '')
@@ -202,7 +207,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                 new_cc.append(to)
         to_write.update({'email_cc' : ', '.join(new_cc) })
         case_pool.write(cr, uid, case.id, to_write, context=context)
-
         return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
@@ -285,14 +289,12 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         body = self._get_case_history(cr, uid, defaults.get('history', 'latest'), lead.id, context=context)
         defaults.update({
             'subject' : '%s: %s - %s' % (_('Fwd'), 'Openerp lead forward', lead.name),
-            'body' : body,
+            'body_text' : body,
             'email_cc' : email_cc,
             'email_to' : email or 'dummy@dummy.ly'
         })
         return defaults
 
-crm_lead_forward_to_partner()
-
 class crm_lead_mass_forward_to_partner(osv.osv_memory):
     _name = 'crm.lead.mass.forward.to.partner'
     _inherit = 'crm.lead.forward.to.partner'
@@ -312,13 +314,11 @@ class crm_lead_mass_forward_to_partner(osv.osv_memory):
                 continue
 
             context.update({'active_id' : case.id})
-            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history'], context=context)
+            value = self.default_get(cr, uid, ['body_text', 'email_to', 'email_cc', 'subject', 'history'], context=context)
             self.write(cr, uid, ids, value, context=context)
             self.action_forward(cr,uid, ids, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 
 
-crm_lead_mass_forward_to_partner()
-
 # 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 9826bf9d45c..8bdb03cf962 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
@@ -1,41 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
+
+
         <record model="ir.ui.view" id="crm_lead_forward_to_partner_form">
             <field name="name">crm_lead_forward_to_partner</field>
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="crm.crm_send_new_mail_view"/>
             <field name="arch" type="xml">
-                <field name="email_from" position="before">
+                <form string="Send Mail">
                     <separator string="Forward to Partner" colspan="4" />
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
-                        <field name="name" colspan="2" />
-                        <group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
+                        <field name="send_to" colspan="2" />
+                        <group col="2" colspan="2" attrs="{ 'invisible' : [('send_to','!=','user')]}">
                             <field name="user_id"
-                                attrs="{ 'required' : [('name','=','user')]}"
+                                attrs="{ 'required' : [('send_to','=','user')]}"
                                 on_change="on_change_email(user_id)" />
                         </group>
-                        <group col="4" colspan="4" attrs="{'invisible' : [('name','!=','partner')]}">
-                            <field name="partner_id" attrs="{'required' : [('name','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
+                        <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" />
                             <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
                         </group>
                     </group>
                     <separator string="" colspan="4" />
-                </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="crm_lead_forward_to_partner_form1">
-            <field name="name">crm_lead_forward_to_partner1</field>
-            <field name="model">crm.lead.forward.to.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="crm.crm_send_new_mail_view"/>
-            <field name="arch" type="xml">
-                <button name="action_send" position="replace">
-                    <button name="action_forward" string="Forward" icon="gtk-go-forward" type="object" />
-                </button>
+                    <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" 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>
+                    <group col="4" colspan="4">
+                        <label string="" colspan="1"/>
+                        <button icon="gtk-close" special="cancel" string="Close"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
+                    </group>
+                </form>
             </field>
         </record>
 
diff --git a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py b/addons/crm_partner_assign/wizard/crm_merge_opportunity.py
index 3993a5df066..3c56fada5a1 100644
--- a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py
+++ b/addons/crm_partner_assign/wizard/crm_merge_opportunity.py
@@ -40,3 +40,5 @@ class crm_merge_opportunity_assign_partner(osv.osv_memory):
 		return data
 
 crm_merge_opportunity_assign_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index c76278201b1..656f8360f0b 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'CRM Profiling Management - To Perform Segmentation within Partners',
+    'name': 'Profiling Tools',
     'version': '1.3',
-    'category': 'Sales',
+    'category': 'Marketing',
     'complexity': "easy",
     'description': """
 This module allows users to perform segmentation within partners.
@@ -41,6 +41,7 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
+    'test': ['test/test_crm_profiling.yml'],
     'installable': True,
     'active': False,
     'certificate': '0033984979005',
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 90dc0818743..59137966da0 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -264,7 +264,7 @@ class crm_segmentation(osv.osv):
         }
 
     _constraints = [
-        (orm.orm._check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
+        (osv.osv._check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
     ]
 
     def process_continue(self, cr, uid, ids, start=False):
diff --git a/addons/crm_profiling/i18n/ar.po b/addons/crm_profiling/i18n/ar.po
index cc9828ebec7..08e685a8a2c 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dd6d4c16269..da8e483c018 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cd860482662..01cd69e4a28 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 937f51643ce..6b149774997 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cc9828ebec7..820f4b74d1b 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -205,3 +205,6 @@ msgstr ""
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
 msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index b1f108df82c..7268a7c7e90 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -85,7 +85,7 @@ msgstr "Frage"
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,open:0
 msgid "Open Questionnaire"
-msgstr "Offene Fragebögen"
+msgstr "Öffne Fragebogen"
 
 #. module: crm_profiling
 #: constraint:res.partner:0
@@ -144,7 +144,7 @@ msgstr "Fragestellung"
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Use a questionnaire"
-msgstr "Benutze eine Frage"
+msgstr "Benutze einen Fragebogen"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -254,28 +254,3 @@ msgstr "Speichere Daten"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Der Name des Moduls muss eindeutig sein."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Grösse des Feldes darf nie kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "You can create specific topic related questionnaires that will be used to "
-#~ "guide your team(s) in the sales cycle by helping them to ask the right "
-#~ "questions. Using the segmentation tool, you will be able to automatically "
-#~ "assign a partner to a category based on his answers to the different "
-#~ "questionnaires."
-#~ msgstr ""
-#~ "Sie können spezielle Vertriebsfragebogen definieren, damit Ihr Vertriebsteam "
-#~ "bestimmte Fragen aktiv im Verkaufsprozess nutzen kann. Durch Einsatz des "
-#~ "Tools zur Kundensegmentierung werden Sie in die Lage versetzt, Ihre Kunden "
-#~ "gemäss der entsprechenden Antworten automatisch zu bestimmten Segmenten "
-#~ "zuzuweisen."
diff --git a/addons/crm_profiling/i18n/el.po b/addons/crm_profiling/i18n/el.po
index 34c143f155a..e469c5998f0 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/crm_profiling/i18n/es.po b/addons/crm_profiling/i18n/es.po
index 38a88f31ed9..64ad2f3f34e 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -250,28 +250,3 @@ msgstr "Guardar datos"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "You can create specific topic related questionnaires that will be used to "
-#~ "guide your team(s) in the sales cycle by helping them to ask the right "
-#~ "questions. Using the segmentation tool, you will be able to automatically "
-#~ "assign a partner to a category based on his answers to the different "
-#~ "questionnaires."
-#~ msgstr ""
-#~ "Puede crear cuestionarios sobre temas específicos que serán usados para "
-#~ "guiar a su(s) equipo(s) en el ciclo de ventas, ayudándoles a hacer las "
-#~ "preguntas correctas. Utilizando la herramienta de segmentación, puede "
-#~ "asignar automáticamente una empresa a una categoría basándose en sus "
-#~ "respuestas a los diferentes cuestionarios."
diff --git a/addons/crm_profiling/i18n/es_AR.po b/addons/crm_profiling/i18n/es_AR.po
index a773521d206..b7f965a88af 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_EC.po b/addons/crm_profiling/i18n/es_EC.po
index b73e0a86982..cc516d71d26 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_MX.po b/addons/crm_profiling/i18n/es_MX.po
new file mode 100644
index 00000000000..24e4c7d74de
--- /dev/null
+++ b/addons/crm_profiling/i18n/es_MX.po
@@ -0,0 +1,252 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* crm_profiling
+#
+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-13 01:59+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: 2011-09-05 05:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Lista de preguntas"
+
+#. module: crm_profiling
+#: model:ir.module.module,description:crm_profiling.module_meta_information
+msgid ""
+"\n"
+"    This module allows users to perform segmentation within partners.\n"
+"    It uses the profiles criteria from the earlier segmentation module and "
+"improve it. Thanks to the new concept of questionnaire. You can now regroup "
+"questions into a questionnaire and directly use it on a partner.\n"
+"\n"
+"    It also has been merged with the earlier CRM & SRM segmentation tool "
+"because they were overlapping.\n"
+"\n"
+"    The menu items related are in \"CRM & SRM\\Configuration\\"
+"Segmentations\"\n"
+"\n"
+"\n"
+"    * Note: this module is not compatible with the module segmentation, "
+"since it's the same which has been renamed.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite a los usuarios realizar una segmentación de "
+"empresas.\n"
+"    Utiliza los criterios de los perfiles del módulo de segmentación "
+"anterior y los mejora. Gracias a la nueva concepción del cuestionario, ahora "
+"puede agrupar las preguntas en un cuestionario y utilizarlo directamente "
+"sobre una empresa.\n"
+"\n"
+"    También se ha fusionado con la anterior herramienta de segmentación CRM "
+"y SRM, ya que se solapaban.\n"
+"\n"
+"    Las segmentaciones se acceden desde el menú \"CRM y "
+"SRM/Configuración/Segmentaciones\"\n"
+"\n"
+"     * Nota: este módulo no es compatible con el módulo de segmentación, ya "
+"que es el mismo sólo que ha sido renombrado.\n"
+"    "
+
+#. 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 ""
+"Puede crear cuestionarios temáticos específicos para guiar a su(s) equipo(s) "
+"en el ciclo de ventas, ayudándoles a hacer las preguntas correctas. La "
+"herramienta de segmentación le permite asignar automáticamente un cliente a "
+"una categoría de acuerdo a sus respuestas a los diferentes cuestionarios."
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+msgid "Question"
+msgstr "Pregunta"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,open:0
+msgid "Open Questionnaire"
+msgstr "Cuestionario abierto"
+
+#. module: crm_profiling
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentaciones de empresa"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+msgid "Answer"
+msgstr "Respuesta"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Segmentación de empresas"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Perfiles"
+
+#. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "Crm Profiling management - To Perform Segmentation within Partners"
+msgstr "Gestión de perfiles CRM - Permite realizar segmentación de empresas"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "Respuestas excluidas"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Respuestas"
+
+#. module: crm_profiling
+#: wizard_field:open_questionnaire,init,questionnaire_name:0
+msgid "Questionnaire name"
+msgstr "Nombre cuestionario"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Usa un cuestionario"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+msgid "Questionnaires"
+msgstr "Cuestionarios"
+
+#. 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 ""
+"Marque esta opción si desea usar esta pestaña como parte de la regla de "
+"segmentación. Si no está marcada, los criterios más abajo serán ignorados."
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "¡Error! No se puede crear perfiles recursivos."
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Usa las reglas de perfil"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible answers"
+msgstr "Respuestas disponibles"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "Respuestas incluidas"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Perfiles hijos"
+
+#. 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 "Preguntas"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Perfil padre"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,end:0
+#: wizard_button:open_questionnaire,open,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/crm_profiling.py:178
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Cuestionario"
+
+#. module: crm_profiling
+#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
+msgid "Using a questionnaire"
+msgstr "Usa un cuestionario"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,open,compute:0
+msgid "Save Data"
+msgstr "Guardar datos"
+
+#~ 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!"
+
+#~ msgid "crm_profiling management"
+#~ msgstr "Gestión de perfiles del CRM"
+
+#~ 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 ""
+#~ "Marque esta opción si desea utilizar esta pestaña como parte de la regla de "
+#~ "segmentación. Si no está marcada, los siguientes criterios serán ignorados"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/crm_profiling/i18n/es_PY.po b/addons/crm_profiling/i18n/es_PY.po
index 0245477130f..9a2dee32947 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_VE.po b/addons/crm_profiling/i18n/es_VE.po
new file mode 100644
index 00000000000..24e4c7d74de
--- /dev/null
+++ b/addons/crm_profiling/i18n/es_VE.po
@@ -0,0 +1,252 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* crm_profiling
+#
+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-13 01:59+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: 2011-09-05 05:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Lista de preguntas"
+
+#. module: crm_profiling
+#: model:ir.module.module,description:crm_profiling.module_meta_information
+msgid ""
+"\n"
+"    This module allows users to perform segmentation within partners.\n"
+"    It uses the profiles criteria from the earlier segmentation module and "
+"improve it. Thanks to the new concept of questionnaire. You can now regroup "
+"questions into a questionnaire and directly use it on a partner.\n"
+"\n"
+"    It also has been merged with the earlier CRM & SRM segmentation tool "
+"because they were overlapping.\n"
+"\n"
+"    The menu items related are in \"CRM & SRM\\Configuration\\"
+"Segmentations\"\n"
+"\n"
+"\n"
+"    * Note: this module is not compatible with the module segmentation, "
+"since it's the same which has been renamed.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite a los usuarios realizar una segmentación de "
+"empresas.\n"
+"    Utiliza los criterios de los perfiles del módulo de segmentación "
+"anterior y los mejora. Gracias a la nueva concepción del cuestionario, ahora "
+"puede agrupar las preguntas en un cuestionario y utilizarlo directamente "
+"sobre una empresa.\n"
+"\n"
+"    También se ha fusionado con la anterior herramienta de segmentación CRM "
+"y SRM, ya que se solapaban.\n"
+"\n"
+"    Las segmentaciones se acceden desde el menú \"CRM y "
+"SRM/Configuración/Segmentaciones\"\n"
+"\n"
+"     * Nota: este módulo no es compatible con el módulo de segmentación, ya "
+"que es el mismo sólo que ha sido renombrado.\n"
+"    "
+
+#. 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 ""
+"Puede crear cuestionarios temáticos específicos para guiar a su(s) equipo(s) "
+"en el ciclo de ventas, ayudándoles a hacer las preguntas correctas. La "
+"herramienta de segmentación le permite asignar automáticamente un cliente a "
+"una categoría de acuerdo a sus respuestas a los diferentes cuestionarios."
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+msgid "Question"
+msgstr "Pregunta"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,open:0
+msgid "Open Questionnaire"
+msgstr "Cuestionario abierto"
+
+#. module: crm_profiling
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentaciones de empresa"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+msgid "Answer"
+msgstr "Respuesta"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Segmentación de empresas"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Perfiles"
+
+#. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "Crm Profiling management - To Perform Segmentation within Partners"
+msgstr "Gestión de perfiles CRM - Permite realizar segmentación de empresas"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "Respuestas excluidas"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Respuestas"
+
+#. module: crm_profiling
+#: wizard_field:open_questionnaire,init,questionnaire_name:0
+msgid "Questionnaire name"
+msgstr "Nombre cuestionario"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Usa un cuestionario"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+msgid "Questionnaires"
+msgstr "Cuestionarios"
+
+#. 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 ""
+"Marque esta opción si desea usar esta pestaña como parte de la regla de "
+"segmentación. Si no está marcada, los criterios más abajo serán ignorados."
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "¡Error! No se puede crear perfiles recursivos."
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Usa las reglas de perfil"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible answers"
+msgstr "Respuestas disponibles"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "Respuestas incluidas"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Perfiles hijos"
+
+#. 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 "Preguntas"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Perfil padre"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,end:0
+#: wizard_button:open_questionnaire,open,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/crm_profiling.py:178
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Cuestionario"
+
+#. module: crm_profiling
+#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
+msgid "Using a questionnaire"
+msgstr "Usa un cuestionario"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,open,compute:0
+msgid "Save Data"
+msgstr "Guardar datos"
+
+#~ 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!"
+
+#~ msgid "crm_profiling management"
+#~ msgstr "Gestión de perfiles del CRM"
+
+#~ 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 ""
+#~ "Marque esta opción si desea utilizar esta pestaña como parte de la regla de "
+#~ "segmentación. Si no está marcada, los siguientes criterios serán ignorados"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/crm_profiling/i18n/et.po b/addons/crm_profiling/i18n/et.po
index 869842e89ed..401b5bc51c6 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6205dd3fd7a..78b2e934906 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -62,17 +62,17 @@ msgstr "Kysymys"
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,open:0
 msgid "Open Questionnaire"
-msgstr ""
+msgstr "Avaa kyselylomake"
 
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Kumppanisegmentoinnit"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -83,17 +83,17 @@ msgstr "Vastaus"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "Kumppanisegmentointi"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr ""
+msgstr "Profilointi"
 
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "Crm Profiling management - To Perform Segmentation within Partners"
-msgstr ""
+msgstr "CRM profiloinnin hallinta - suorittaaksesi partnerien profiloinnin"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -104,7 +104,7 @@ msgstr "Kuvaus"
 #. module: crm_profiling
 #: field:crm.segmentation,answer_no:0
 msgid "Excluded Answers"
-msgstr ""
+msgstr "Poisjäteyt vastaukset"
 
 #. module: crm_profiling
 #: view:crm_profiling.answer:0
@@ -137,16 +137,18 @@ msgid ""
 "part of the                              segmentation rule. If not checked, "
 "the criteria beneath will be ignored"
 msgstr ""
+"Valitse tämä laatikko jos haluat käyttää tätä välilehteä osana "
+"segmentointisääntöä. Jos ei valittu, allaolevaa kriteeriä ei käytetä"
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "virhe! Et voi luoda rekursiivisia profiileja."
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr ""
+msgstr "Käytä profilointisääntöjä"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -157,12 +159,12 @@ msgstr "Käytettävissä olevat vastaukset"
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
 msgid "Included Answers"
-msgstr ""
+msgstr "Mukaan otettut vastaukset"
 
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr ""
+msgstr "Alatason profiilit"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -175,7 +177,7 @@ msgstr "Kysymykset"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr ""
+msgstr "Ylätason profiili"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,end:0
@@ -200,9 +202,9 @@ msgstr "Kyselykaavake"
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
 msgid "Using a questionnaire"
-msgstr ""
+msgstr "Käytetään kyselylomaketta"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
-msgstr ""
+msgstr "Tallenna tiedot"
diff --git a/addons/crm_profiling/i18n/fr.po b/addons/crm_profiling/i18n/fr.po
index a145c03437d..36629155e7b 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -241,16 +241,3 @@ msgstr "Sauvegarder les Données"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid ""
-#~ "You can create specific topic related questionnaires that will be used to "
-#~ "guide your team(s) in the sales cycle by helping them to ask the right "
-#~ "questions. Using the segmentation tool, you will be able to automatically "
-#~ "assign a partner to a category based on his answers to the different "
-#~ "questionnaires."
-#~ msgstr ""
-#~ "Vous pouvez créer des questionnaires sur un thème particulier qui seront "
-#~ "utilisés pour guider votre(vos) équipe(s) dans le cycle de vente en les "
-#~ "aidant à poser les bonnes questions. Avec l'outil de segmentation, vous "
-#~ "serez en mesure d'attribuer automatiquement une catégorie à un partenaire "
-#~ "selon ses réponses aux questionnaires."
diff --git a/addons/crm_profiling/i18n/gl.po b/addons/crm_profiling/i18n/gl.po
index 24fd8917667..acbd118190c 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 69a7cd3088c..680fcf7f663 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/hu.po b/addons/crm_profiling/i18n/hu.po
index 6b44e03fb7b..09a728a844a 100644
--- a/addons/crm_profiling/i18n/hu.po
+++ b/addons/crm_profiling/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 20:57+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 46e36932a69..716ef4ffa59 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 569e68035d8..885781459cb 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -252,28 +252,3 @@ msgstr "Salva Dati"
 #~ "Seleziona questa casella se si desidera utilizzare questa scheda come parte "
 #~ "della regola di segmentazione. Se non è selezionata, i criteri di sotto "
 #~ "verranno ignorati"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non puoi creare un menù ricorsivo"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid ""
-#~ "You can create specific topic related questionnaires that will be used to "
-#~ "guide your team(s) in the sales cycle by helping them to ask the right "
-#~ "questions. Using the segmentation tool, you will be able to automatically "
-#~ "assign a partner to a category based on his answers to the different "
-#~ "questionnaires."
-#~ msgstr ""
-#~ "E' possibile creare uno specifico questionario correlato che verrà usato per "
-#~ "guidare il (o i) team, nel ciclo di vendita, aiutandoli a porre le giuste "
-#~ "domande. Usando il tool di segmentazione, è così possible assegnare "
-#~ "automaticamente i partner alla loro corretta categoria, basandosi sulle "
-#~ "risposte ai differenti questionari."
diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po
index 5f6c6be422f..ddcac053cb5 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d1e81c36f6a..9c2340ed778 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 233908c4121..2ef8d0cd0e9 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c6e16a13011..6eff43b0c93 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -209,15 +209,3 @@ msgstr "Асуулга ашиглах"
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
 msgstr "Өгөгдлийг Хадгалах"
-
-#~ msgid ""
-#~ "You can create specific topic related questionnaires that will be used to "
-#~ "guide your team(s) in the sales cycle by helping them to ask the right "
-#~ "questions. Using the segmentation tool, you will be able to automatically "
-#~ "assign a partner to a category based on his answers to the different "
-#~ "questionnaires."
-#~ msgstr ""
-#~ "Та асуулгатай холбоотой тодорхой сэдэв үүсгэж болох ба энэ нь Борлуулалтын "
-#~ "багыг зөв асуулт асуухад нь чиглүүлэгч болж ашиглагдана. Сегментчлэлийн "
-#~ "хэрэгсэл ашигласнаар та харилцагчаа асуулгад өгсөн хариултууд дээр нь "
-#~ "үндэслэн автоматаар категори руу оруулах боломжтой."
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index f38c4399b93..9458adfe013 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -249,27 +249,3 @@ msgstr "Gegevens opslaan"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de actie-definitie."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "You can create specific topic related questionnaires that will be used to "
-#~ "guide your team(s) in the sales cycle by helping them to ask the right "
-#~ "questions. Using the segmentation tool, you will be able to automatically "
-#~ "assign a partner to a category based on his answers to the different "
-#~ "questionnaires."
-#~ msgstr ""
-#~ "U kunt specifieke onderwerp gerichte enquêtes maken die als leidraad "
-#~ "gebruikt worden door uw teams in de verkoopcyclus door ze te helpen de "
-#~ "juiste vragen te stellen. Met de segmentatie tool kunt u automatisch een "
-#~ "relatie categorie toewijzen op basis van de verschillende antwoorden."
diff --git a/addons/crm_profiling/i18n/nl_BE.po b/addons/crm_profiling/i18n/nl_BE.po
index b823005361c..f3ee7474848 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d6d701cb589..bbca40a369b 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1e26a965ef3..e1af14fcb0d 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -216,21 +216,9 @@ msgstr "Gravar Dado"
 #~ "Verifique esta caixa se quer utilizar este separador como parte da regra de "
 #~ "segmentação. Se não assinalada, o critério abaixo será ignorada"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index a4fa45a612a..10e1553d9ec 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ro.po b/addons/crm_profiling/i18n/ro.po
index dbb60d670ba..ef2e116bf38 100644
--- a/addons/crm_profiling/i18n/ro.po
+++ b/addons/crm_profiling/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-21 19:07+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 06876ee3172..e4dc1f45409 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -41,6 +41,22 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"    Этот модуль позволяет пользователям проводить .\n"
+"    Он использует критерий профилей из раннего модуля сегментации и улучшает "
+"его благодаря новой концепции опросника. Теперь можно перегруппировать "
+"вопросы в опросник и использовать его напрямую.\n"
+"\n"
+"    Он также был совмещён с инструментом сегментации CRM и SRM, поскольку "
+"они перекрывали друг друга.\n"
+"\n"
+"    Связанные с ним элементы меню находятся в меню \"CRM и SRM\\"
+"Конфигурация\\Сегментации\"\n"
+"\n"
+"\n"
+"    * Обратите внимание: этот модуль не совместим с модулем сегментации, "
+"поскольку это тот же самый модуль с другим названием.\n"
+"    "
 
 #. module: crm_profiling
 #: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
@@ -50,6 +66,10 @@ msgid ""
 "segmentation tool allows you to automatically assign a partner to a category "
 "according to his answers to the different questionnaires."
 msgstr ""
+"Можно создать специальный опросник по теме, чтобы вести команду продаж по "
+"циклу продаж, помогая им задавать правильные вопросы. Инструмент сегментации "
+"позволяет автоматически назначить партнёра для категории в соответствии с "
+"ответами на различные опросники."
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -93,6 +113,7 @@ msgstr "Профилирование"
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "Crm Profiling management - To Perform Segmentation within Partners"
 msgstr ""
+"Управление профилированием - для проведения сегментации между партнёрами."
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -223,6 +244,3 @@ msgstr "Сохранить данные"
 
 #~ msgid "crm_profiling management"
 #~ msgstr "Управление профилями CRM"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
diff --git a/addons/crm_profiling/i18n/sk.po b/addons/crm_profiling/i18n/sk.po
index 42e2eded05b..9598956832a 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b29e128d3f6..de1ddff2e50 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8d49ca2bf48..1387d9bbbc3 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 be4febb6d80..73659e59388 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -230,6 +230,3 @@ msgstr "Sacuvaj Podatke"
 #~ msgstr ""
 #~ "Označite ovde ako želite koristiti ovu karticu (Tab) kao deo pravila "
 #~ "segmentacije. Ako ne označite, kriterijum koji sledi će biti ignorisan."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/crm_profiling/i18n/sr@latin.po b/addons/crm_profiling/i18n/sr@latin.po
index 32a3ebba8a9..715ffea850d 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -218,9 +218,6 @@ msgstr "Sacuvaj Podatke"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "greska ! Ne mozes kreirati rekursivni meni."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index ede0325c9df..463387e14d4 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ff1b58846b8..c938f81af02 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 55d513ee713..8bc12b2c186 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: 2011-05-17 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cc65270e5c9..fb21770e1ba 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8401df57255..a576dc8b065 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -181,7 +181,7 @@ msgstr ""
 #: wizard_button:open_questionnaire,init,end:0
 #: wizard_button:open_questionnaire,open,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_res_partner
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index 9d6fa27fc25..fa229d00d97 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-10 18:32+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -75,7 +75,7 @@ msgstr "开启的问卷调查"
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+msgstr "错误！您不能创建递归的商会会员。"
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
@@ -96,12 +96,12 @@ msgstr "业务伙伴细分"
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr "概况"
+msgstr "特征"
 
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "Crm Profiling management - To Perform Segmentation within Partners"
-msgstr "客户关系管理 客户概况管理 - 进行业务伙伴的细分"
+msgstr "客户关系管理 客户特征管理 - 进行业务伙伴的细分"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -149,12 +149,12 @@ msgstr "选中这选项，如果你想使用这标签作为细分规则的一部
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr "错误! 你不能创建递归的客户概况。"
+msgstr "错误! 你不能创建递归的特征。"
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr "使用这客户概况规则"
+msgstr "使用这客户特征的规则"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -170,7 +170,7 @@ msgstr "包括的答案"
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr "子客户概况"
+msgstr "子客户特征"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -183,7 +183,7 @@ msgstr "问题"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr "上级客户概况"
+msgstr "上级客户特征"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,end:0
diff --git a/addons/crm_profiling/i18n/zh_TW.po b/addons/crm_profiling/i18n/zh_TW.po
index 4fb8af5e11a..5d02597170f 100644
--- a/addons/crm_profiling/i18n/zh_TW.po
+++ b/addons/crm_profiling/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/test/test_crm_profiling.yml b/addons/crm_profiling/test/test_crm_profiling.yml
new file mode 100644
index 00000000000..2b70cac592b
--- /dev/null
+++ b/addons/crm_profiling/test/test_crm_profiling.yml
@@ -0,0 +1,77 @@
+- |
+  I check segmentation which allows users to perform segmentation within partners.
+-
+  I create a crm profiling question record.
+-
+  !record {model: crm_profiling.question, id: crm_profiling_question_openerppartner0}:
+    answers_ids:
+      - name: 'no'
+    name: OpenERP partner?
+-
+  I create a crm profiling answer record.
+-
+  !record {model: crm_profiling.answer, id: crm_profiling_answer_openerppartner0}:
+    name: 'yes'
+    question_id: crm_profiling_question_openerppartner0
+-
+  I create Partner category Customers.
+-
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+- |
+  I'm creating new partner "John" with his email "info@mycustomer.com".
+-
+  !record {model: res.partner, id: res_partner_john0}:
+    address:
+      - city: Bruxelles
+        country_id: base.be
+        street: Rue des Palais 51, bte 33
+        type: default
+        zip: '1000'
+        email: 'info@mycustomer.com'
+    name: John
+    category_id:
+      - res_partner_category_customers0
+    answers_ids:
+      - crm_profiling_answer_openerppartner0
+
+-
+  Define the answers and category to partner.
+-
+  !python {model: res.partner}: |
+    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
+    self._questionnaire_compute(cr, uid, data, context)
+- |
+  I start by creating new Questionnaire.
+-
+  !record {model: crm_profiling.questionnaire, id: crm_profiling_questionnaire_basequestionnaire0}:
+    description: First questionnaire.
+    name: Base questionnaire
+    questions_ids:
+      - crm_profiling.activity_sector
+      - crm_profiling.nb_employees
+      - crm_profiling.partner_level
+- |
+  I create the form for the "Base questionnaire".
+-
+  !python {model: crm_profiling.questionnaire}: |
+    context.update({'active_id':ref('res_partner_john0')})
+    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
+    self.build_form(cr, uid, data, context)
+-
+  I create a segmentation record.
+-
+  !record {model: crm.segmentation, id: crm_segmentation_test1}:
+    answer_yes:
+      - crm_profiling_answer_openerppartner0
+    categ_id: res_partner_category_customers0
+    name: test
+    parent_id: crm_profiling.crm_segmentation0
+    profiling_active: true
+    som_interval: 0.0
+- |
+  I continue the process of segmentation.
+-
+  !python {model: crm.segmentation}: |
+    self.process_continue(cr, uid, [ref('crm_segmentation_test1')], start=False)
+
diff --git a/addons/google_map/wizard/__init__.py b/addons/crm_todo/__init__.py
similarity index 97%
rename from addons/google_map/wizard/__init__.py
rename to addons/crm_todo/__init__.py
index d276c1debeb..528f4b2d439 100644
--- a/addons/google_map/wizard/__init__.py
+++ b/addons/crm_todo/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import google_map_launch
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import crm_todo
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
new file mode 100644
index 00000000000..3b870153347
--- /dev/null
+++ b/addons/crm_todo/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- 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': 'To Do List',
+    'version': '1.0',
+    'category': 'Customer Relationship Management',
+    'complexity': "easy",
+    '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',
+    ],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_map/google_map.py b/addons/crm_todo/crm_todo.py
similarity index 77%
rename from addons/google_map/google_map.py
rename to addons/crm_todo/crm_todo.py
index e8e22516db2..b1f6aa05af0 100644
--- a/addons/google_map/google_map.py
+++ b/addons/crm_todo/crm_todo.py
@@ -19,14 +19,21 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import fields, osv
 
-class res_partner_address(osv.osv):
-    _description ='Partner Contact'
-    _name = 'res.partner.address'
-    _inherit = 'res.partner.address'
+class project_task(osv.osv):
+    _inherit = 'project.task'
     _columns = {
-        }
-res_partner_address()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+        'lead_id': fields.many2one('crm.lead', 'Lead / Opportunity')
+    }
 
+class crm_todo(osv.osv):
+    _inherit = 'crm.lead'
+    _columns = {
+        'task_ids': fields.one2many('project.task', 'lead_id', 'Tasks'),
+    }
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_todo/crm_todo_demo.xml b/addons/crm_todo/crm_todo_demo.xml
new file mode 100644
index 00000000000..eef41bdc472
--- /dev/null
+++ b/addons/crm_todo/crm_todo_demo.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+
+    <record id="project.project_task_188" model="project.task">
+        <field name="lead_id" ref="crm.crm_case_fabiendupont"/>
+    </record>
+    <record id="project.project_task_186" model="project.task">
+        <field name="lead_id" ref="crm.crm_case_fabiendupont"/>
+    </record>
+    <record id="project.project_task_184" model="project.task">
+        <field name="lead_id" ref="crm.crm_case_dirtminingltdunits25"/>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
new file mode 100644
index 00000000000..c098f908b8a
--- /dev/null
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+    <record id="crm_todo_opportunity_add" model="ir.ui.view">
+        <field name="name">Opportunities - Tasks</field>
+        <field name="model">crm.lead</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
+        <field name="arch" type="xml">
+            <data>
+            <page string="Extra Info" position="before">
+                <page string="Tasks">
+                    <field name="task_ids" colspan="4" nolabel="1">
+                        <tree editable="bottom" string="Tasks">
+                            <field name="name"/>
+                            <field name="user_id"/>
+
+                            <field string="Timebox" name="timebox_id"/>
+                            <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
+                            <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
+
+                            <field name="state"/>
+                            <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                        </tree>
+                    </field>
+                </page>
+            </page>
+            </data>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="project_task_crm_tree">
+        <field name="name">project.task.tree.crm</field>
+        <field name="model">project.task</field>
+        <field name="type">tree</field>
+        <field name="priority">20</field>
+        <field name="inherit_id" ref="project.view_task_tree2" />
+        <field name="arch" type="xml">
+            <field name="remaining_hours" position="after">
+                <field name="lead_id" invisible="not context.get('lead_id', False)"/>
+            </field>
+        </field>
+    </record>
+
+
+    <record model="ir.actions.act_window" id="crm_todo_action">
+        <field name="name">My Tasks</field>
+        <field name="res_model">project.task</field>
+        <field name="context">{'set_editable':True,'set_visible':True,'gtd':True,'user_invisible':True, "search_default_open": 1, "lead_id": 1}</field>
+        <field name="search_view_id" ref="project_gtd.view_task_gtd_search"/>
+        <field name="domain">[('user_id','=',uid)]</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
+    </record>
+    <menuitem
+        id="menu_crm_todo"
+        parent="base.menu_sales"
+        action="crm_todo_action"/>
+
+
+    </data>
+</openerp>
diff --git a/addons/decimal_precision/__init__.py b/addons/decimal_precision/__init__.py
index 708ad26bbe1..ea6c1b4d1ca 100644
--- a/addons/decimal_precision/__init__.py
+++ b/addons/decimal_precision/__init__.py
@@ -22,3 +22,5 @@
 #import decimal_precision
 from decimal_precision import get_precision
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index a2e94c7f58d..91e7ce57029 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -30,7 +30,7 @@ The decimal precision is configured per company.
     "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "init_xml": [],
     "update_xml": [
@@ -44,3 +44,5 @@ The decimal precision is configured per company.
 }
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index 9fdc1cadd5e..d9f6aa7b8db 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools import cache
+import tools
 import pooler
 
 class decimal_precision(osv.osv):
@@ -37,7 +37,7 @@ class decimal_precision(osv.osv):
         ('name_uniq', 'unique (name)', """Only one value can be defined for each given usage!"""),
     ]
 
-    @cache(skiparg=3)
+    @tools.ormcache(skiparg=3)
     def precision_get(self, cr, uid, application):
         cr.execute('select digits from decimal_precision where name=%s', (application,))
         res = cr.fetchone()
@@ -45,7 +45,7 @@ class decimal_precision(osv.osv):
 
     def write(self, cr, uid, ids, data, *args, **argv):
         res = super(decimal_precision, self).write(cr, uid, ids, data, *args, **argv)
-        self.precision_get.clear_cache(cr.dbname)
+        self.precision_get.clear_cache(self)
         for obj in self.pool.obj_list():
             for colname, col in self.pool.get(obj)._columns.items():
                 if isinstance(col, (fields.float, fields.function)):
diff --git a/addons/decimal_precision/i18n/bg.po b/addons/decimal_precision/i18n/bg.po
index 17d7e2bfbfe..89e5daee0c8 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8993cb5a826..abeaf567f14 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -68,3 +68,6 @@ msgstr "Configuració precisió decimals"
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
 msgstr "decimal.precisió"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Precisió decimal"
diff --git a/addons/decimal_precision/i18n/da.po b/addons/decimal_precision/i18n/da.po
new file mode 100644
index 00000000000..28871b4c50d
--- /dev/null
+++ b/addons/decimal_precision/i18n/da.po
@@ -0,0 +1,69 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-08 11:35+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Cifre"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Betydende decimaler"
+
+#. 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 Definitions"
+msgstr "Definition af betydende decimaler"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Dette modul giver dig mulighed indstille prisnøjagtigheden til forskellig "
+"brug:\n"
+"Bogføring, salg, indkøb osv.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Anvendelse"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "Kun een værdi kan defineres for hver anvendelse!"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Opsætning af betydende decimaler"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index 865880b71a6..65d93ecd2d0 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -70,25 +70,5 @@ msgstr "Dezimalstellen Konfiguration"
 msgid "decimal.precision"
 msgstr "decimal.precision"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehler in xml 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 haben !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Dezimalstellen"
diff --git a/addons/decimal_precision/i18n/el.po b/addons/decimal_precision/i18n/el.po
index f77640b3c7a..40803420a41 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..274536ad696
--- /dev/null
+++ b/addons/decimal_precision/i18n/en_GB.po
@@ -0,0 +1,74 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-13 09:03+0000\n"
+"Last-Translator: John Bradshaw <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: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Digits"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Decimal Precision"
+
+#. 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 Definitions"
+msgstr "Decimal Accuracy Definitions"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"This module allows to configure the price accuracy required for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Usage"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "Only one value can be defined for each given usage!"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Decimal Precision Configuration"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Decimal Accuracy"
diff --git a/addons/decimal_precision/i18n/es.po b/addons/decimal_precision/i18n/es.po
index bbef0671f90..aff01b8376c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -70,29 +70,5 @@ msgstr "Configuración precisión decimales"
 msgid "decimal.precision"
 msgstr "decimal.precisión"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura 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 "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Precisión decimal"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/decimal_precision/i18n/es_EC.po b/addons/decimal_precision/i18n/es_EC.po
index 66cb49e600f..9d5d842206c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -68,3 +68,6 @@ msgstr "Configuración precisión decimal"
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
 msgstr "Precisión Decimal"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Precisión decimal"
diff --git a/addons/decimal_precision/i18n/es_MX.po b/addons/decimal_precision/i18n/es_MX.po
new file mode 100644
index 00000000000..1610f5f347e
--- /dev/null
+++ b/addons/decimal_precision/i18n/es_MX.po
@@ -0,0 +1,74 @@
+# 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-16 22:12+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Dígitos"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Precisión decimales"
+
+#. 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 Definitions"
+msgstr "Definiciones precisión decimales"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Este modulo permite configurar la precisión de decimales que requiere en "
+"cada tipo de modelo: contabilidad, ventas, compras,...\n"
+"\n"
+"La precisión de decimales se configura por compañía.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Uso"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "¡Sólo se puede definir un valor para cada uso en concreto!"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Configuración precisión decimales"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precisión"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Precisión decimal"
diff --git a/addons/decimal_precision/i18n/es_PY.po b/addons/decimal_precision/i18n/es_PY.po
index 089e40d345b..2643e8feccb 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_VE.po b/addons/decimal_precision/i18n/es_VE.po
new file mode 100644
index 00000000000..1610f5f347e
--- /dev/null
+++ b/addons/decimal_precision/i18n/es_VE.po
@@ -0,0 +1,74 @@
+# 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-16 22:12+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Dígitos"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Precisión decimales"
+
+#. 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 Definitions"
+msgstr "Definiciones precisión decimales"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Este modulo permite configurar la precisión de decimales que requiere en "
+"cada tipo de modelo: contabilidad, ventas, compras,...\n"
+"\n"
+"La precisión de decimales se configura por compañía.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Uso"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "¡Sólo se puede definir un valor para cada uso en concreto!"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Configuración precisión decimales"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precisión"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Precisión decimal"
diff --git a/addons/decimal_precision/i18n/fi.po b/addons/decimal_precision/i18n/fi.po
index afa7791f80f..a43c1b1f661 100644
--- a/addons/decimal_precision/i18n/fi.po
+++ b/addons/decimal_precision/i18n/fi.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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
 msgid "Digits"
-msgstr ""
+msgstr "Numeroja"
 
 #. module: decimal_precision
 #: view:decimal.precision:0
@@ -43,6 +43,12 @@ msgid ""
 "\n"
 "The decimal precision is configured per company.\n"
 msgstr ""
+"\n"
+"Tämä moduuli sallii hintojen tarkkuuden määrittelemisen jota tarvitset "
+"erilaisessa\n"
+"käytössä kunten: kirjanpito, myynti, ostot...\n"
+"\n"
+"Desimaalitarkkuus määritellään yrityskohtaisesti\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,name:0
@@ -57,9 +63,12 @@ msgstr "Jokaiselle käytölle voidaan antaa vain yksi arvo!"
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Desimaalitarkkuuden konfiguraatio"
 
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
 msgstr ""
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Desimaalien tarkkuuus"
diff --git a/addons/decimal_precision/i18n/fr.po b/addons/decimal_precision/i18n/fr.po
index 5eb39d2e93a..00af9376a3c 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -69,20 +69,5 @@ msgstr "Configuration de la précision décimale"
 msgid "decimal.precision"
 msgstr "decimal.precision"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle invalide dans la définition de l'action."
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Précision décimale"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalide pour l'architecture de la vue !"
-
-#~ 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 doit pas contenir de "
-#~ "caractère spécial !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
diff --git a/addons/decimal_precision/i18n/gl.po b/addons/decimal_precision/i18n/gl.po
index bbdb94f20c8..f5cdedd40e5 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -68,3 +68,6 @@ msgstr "Configuración de Precisión Decimal"
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
 msgstr "decimal.precision"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Precisión Decimal"
diff --git a/addons/decimal_precision/i18n/hr.po b/addons/decimal_precision/i18n/hr.po
index a6fe9034133..c3cebb8276b 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: 2011-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 677882b8bbb..d076be884e8 100644
--- a/addons/decimal_precision/i18n/hu.po
+++ b/addons/decimal_precision/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 21:20+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6e7e8383c63..a0660b107f2 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bc4d0107170..6eeea8c90b4 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -70,29 +70,5 @@ msgstr "Configurazione precisione decimale"
 msgid "decimal.precision"
 msgstr "precisione.decimale"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#~ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non puoi creare un menù ricorsivo"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Accuratezza decimali"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/decimal_precision/i18n/lv.po b/addons/decimal_precision/i18n/lv.po
index 0c8ea8ef006..a8e846daec1 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1d52a5253ca..bf2bd10fd44 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -69,27 +69,5 @@ msgstr "Бутархай тоон оронгийн нарийвчлалын то
 msgid "decimal.precision"
 msgstr "оронгийн нарийвчлал"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Дэлгэцийн үйлдэл дэх моделийн нэр алдаатай байна."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Обьектын нэр нь x_-ээр эхэлж ямар ч тусгай тэмдэгт агуулах ёсгүй."
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Бутархай тоон оронгийн нарийвчлал"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхардах ёсгүй !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулын сертификат ID давхардах ёсгүй !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
diff --git a/addons/decimal_precision/i18n/nb.po b/addons/decimal_precision/i18n/nb.po
index 1854a420911..5bd6f992dd9 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 84322cdcb46..4cec25121a6 100644
--- a/addons/decimal_precision/i18n/nl.po
+++ b/addons/decimal_precision/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -70,28 +70,5 @@ msgstr "Decimale precisie configuratie"
 msgid "decimal.precision"
 msgstr "decimal.precision"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief Menu maken."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie-definiëring."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De Objectnaam moet starten met x_ en mag geen speciale tekens bevatten!"
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Decimale precisie"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/decimal_precision/i18n/pt.po b/addons/decimal_precision/i18n/pt.po
index 1e6c8f25e37..58e5a422c66 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 227a12009df..894447443bd 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -70,29 +70,5 @@ msgstr "Configuração da Precisão Decimal"
 msgid "decimal.precision"
 msgstr "precisao.decimal"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objeto deve começar com x_ e não deve conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a Visão de Arquitetura!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome do modelo inválido na definição da ação."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Precisão Decimal"
diff --git a/addons/decimal_precision/i18n/ro.po b/addons/decimal_precision/i18n/ro.po
index 6675f24b561..97be976507a 100644
--- a/addons/decimal_precision/i18n/ro.po
+++ b/addons/decimal_precision/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 17:27+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ee0d8cf51fd..9615ff83086 100644
--- a/addons/decimal_precision/i18n/ru.po
+++ b/addons/decimal_precision/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
 msgid "Digits"
-msgstr "Цифры"
+msgstr "Знаков"
 
 #. module: decimal_precision
 #: view:decimal.precision:0
@@ -70,17 +70,5 @@ msgstr "Настройка точности"
 msgid "decimal.precision"
 msgstr "decimal.precision"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Десятичная точность"
diff --git a/addons/decimal_precision/i18n/sk.po b/addons/decimal_precision/i18n/sk.po
index 23dbda3f1b8..2076d740070 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..6f3ca53a5a4
--- /dev/null
+++ b/addons/decimal_precision/i18n/sl.po
@@ -0,0 +1,65 @@
+# Slovenian 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-13 19:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-14 05:16+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Števke"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr ""
+
+#. 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 Definitions"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Uporaba"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr ""
diff --git a/addons/decimal_precision/i18n/sr.po b/addons/decimal_precision/i18n/sr.po
index cbb35ee2bab..bb554adbb1a 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -70,19 +70,5 @@ msgstr "Podesavanje Decimalne Preciznosti"
 msgid "decimal.precision"
 msgstr "decimal.precision"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Decimalna Tacnost"
diff --git a/addons/decimal_precision/i18n/sr@latin.po b/addons/decimal_precision/i18n/sr@latin.po
index 50c638694c3..58b1a148de0 100644
--- a/addons/decimal_precision/i18n/sr@latin.po
+++ b/addons/decimal_precision/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-23 16:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-06 14:01+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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
 msgid "Digits"
-msgstr "Brojevi"
+msgstr "Cifara"
 
 #. module: decimal_precision
 #: view:decimal.precision:0
 msgid "Decimal Precision"
-msgstr "Decimalna Preiznost"
+msgstr "Decimalna preciznost"
 
 #. 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 Definitions"
-msgstr "Definicija Decimalne Preciznosti"
+msgstr "Definicije decimalne preciznosti"
 
 #. module: decimal_precision
 #: model:ir.module.module,description:decimal_precision.module_meta_information
@@ -44,26 +44,26 @@ msgid ""
 "The decimal precision is configured per company.\n"
 msgstr ""
 "\n"
-"Ovaj modul vam omogucava za zaokruzujete cene na potrebne vrednosti za "
-"nekoliko nacina\n"
-"koriscenja: Racunanje, prodaja, nabavka ...\n"
+"Ovaj modul Vam omogućava podešavanje preciznosti cena za različite načine\n"
+"upotrebe: računanje, prodaja, nabavka ... \n"
 "\n"
-"Preciznost definisete za celo preduzece.\n"
+"Preciznost  je definisana po pojedinačnom preduzeću.\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,name:0
 msgid "Usage"
-msgstr "Koriscenje"
+msgstr "Upotreba"
 
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
 msgstr ""
+"Samo jedna vrednost može biti definisana za svaku pojedinačnu upotrebu!"
 
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
 msgid "Decimal Precision Configuration"
-msgstr "Podesavanje Decimalne Preciznosti"
+msgstr "Podešavanje decimalne preciznosti"
 
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
@@ -72,17 +72,3 @@ msgstr "decimal.precision"
 
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Decimalna Preciznost"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
diff --git a/addons/decimal_precision/i18n/sv.po b/addons/decimal_precision/i18n/sv.po
index a1c6a420767..3f7f135b24a 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -64,28 +64,5 @@ msgstr ""
 msgid "decimal.precision"
 msgstr ""
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer."
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Decimal pression"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unikt!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
diff --git a/addons/decimal_precision/i18n/tr.po b/addons/decimal_precision/i18n/tr.po
index fef0e6cc204..6a2f1c28c01 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -69,3 +69,6 @@ msgstr "Ondalık Hassasiyet Ayarları"
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
 msgstr "Ondalık.hassasiyet"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "Ondalık Doğruluğu"
diff --git a/addons/decimal_precision/i18n/vi.po b/addons/decimal_precision/i18n/vi.po
index 25ec5c13e70..8cb1be4418e 100644
--- a/addons/decimal_precision/i18n/vi.po
+++ b/addons/decimal_precision/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-05-01 17:18+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-02 04:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -69,29 +69,5 @@ msgstr "Cấu hình độ chính xác thập phân"
 msgid "decimal.precision"
 msgstr "decimal.precision"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Tên mô hình không hợp lệ khi định nghĩa hành động"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Tên đối tượng phải được bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc "
-#~ "biệt nào!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !"
-
 #~ msgid "Decimal Accuracy"
 #~ msgstr "Độ chính xác thập phân"
diff --git a/addons/decimal_precision/i18n/zh_CN.po b/addons/decimal_precision/i18n/zh_CN.po
index 281e2c81745..f52597fe77c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -67,3 +67,6 @@ msgstr "小数精度配置"
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
 msgstr "decimal.precision"
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "小数精度"
diff --git a/addons/decimal_precision/i18n/zh_TW.po b/addons/decimal_precision/i18n/zh_TW.po
new file mode 100644
index 00000000000..9e294ab2241
--- /dev/null
+++ b/addons/decimal_precision/i18n/zh_TW.po
@@ -0,0 +1,72 @@
+# Chinese (Traditional) 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-09-27 08:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "數字"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "小數精確度"
+
+#. 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 Definitions"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"此模組讓您為會計、銷售、採購...等不同用途設定價錢準確度。\n"
+"\n"
+"每間公司之小數精確度可以不同。\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "用途"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "每種用途只可定義一個值！"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "小數精確度設定"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr ""
+
+#~ msgid "Decimal Accuracy"
+#~ msgstr "小數準確度"
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index e9fa8240e21..40dab751f79 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Carriers and Deliveries',
+    'name': 'Delivery Costs',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Sales Management',
     'complexity': "normal",
     'description': """
 Allows you to add delivery methods in sale orders and picking.
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index d70af4b4d1e..cac4c20c288 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -61,17 +61,17 @@ class delivery_carrier(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Carrier', size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
+        'name': fields.char('Delivery Method', size=64, required=True),
+        'partner_id': fields.many2one('res.partner', 'Transport Company', required=True, help="The partner that is doing the delivery service."),
         'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
         'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
         'price' : fields.function(get_price, string='Price'),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it."),
-        'normal_price': fields.float('Normal Price'),
-        'free_if_more_than': fields.boolean('Free If More Than'),
-        'amount': fields.float('Amount'),
-        'use_detailed_pricelist': fields.boolean('Use Detailed Pricelist'),
-        'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Price List'),
+        'normal_price': fields.float('Normal Price', help="Keep empty if the pricing depends on the advanced pricing per destination"),
+        'free_if_more_than': fields.boolean('Free If More Than', help="If the order is more expensive than a certain amount, the customer can benefit from a free shipping"),
+        'amount': fields.float('Amount', help="Amount of the order to benefit from a free shipping, expressed in the company currency"),
+        'use_detailed_pricelist': fields.boolean('Advanced Pricing per Destination', help="Check this box if you want to manage delivery prices that depends on the destination, the weight, the total of the order, etc."),
+        'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Advanced Pricing'),
     }
 
     _defaults = {
@@ -103,25 +103,32 @@ class delivery_carrier(osv.osv):
         grid_line_pool = self.pool.get('delivery.grid.line')
         grid_pool = self.pool.get('delivery.grid')
         for record in self.browse(cr, uid, ids, context=context):
-            grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)], context=context)
+            grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id),('sequence','=',9999)], context=context)
+
+            if grid_id and not (record.normal_price or record.free_if_more_than):
+                grid_pool.unlink(cr, uid, grid_id, context=context)
+
+            if not (record.normal_price or record.free_if_more_than):
+                continue
+
             if not grid_id:
                 record_data = {
-                    'name': vals.get('name', False),
+                    'name': record.name,
                     'carrier_id': record.id,
-                    'seqeunce': 10,
+                    'sequence': 9999,
                 }
                 new_grid_id = grid_pool.create(cr, uid, record_data, context=context)
                 grid_id = [new_grid_id]
 
-            #delete all existing grid lines
-            grid_lines = [line.id for line in grid_pool.browse(cr, uid, grid_id[0]).line_ids if line.type == 'price']
-            grid_line_pool.unlink(cr, uid, grid_lines, context=context)
+            lines = grid_line_pool.search(cr, uid, [('grid_id','in',grid_id)], context=context)
+            if lines:
+                grid_line_pool.unlink(cr, uid, lines, context=context)
 
             #create the grid lines
             if record.free_if_more_than:
                 data = {
                     'grid_id': grid_id and grid_id[0],
-                    'name': _('Free if more than %d') % record.amount,
+                    'name': _('Free if more than %.2f') % record.amount,
                     'type': 'price',
                     'operator': '>=',
                     'max_value': record.amount,
@@ -217,7 +224,7 @@ class delivery_grid_line(osv.osv):
     _description = "Delivery Grid Line"
     _columns = {
         'name': fields.char('Name', size=32, required=True),
-        'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
+        'grid_id': fields.many2one('delivery.grid', 'Grid',required=True, ondelete='cascade'),
         'type': fields.selection([('weight','Weight'),('volume','Volume'),\
                                   ('wv','Weight * Volume'), ('price','Price')],\
                                   'Variable', required=True),
@@ -238,6 +245,23 @@ class delivery_grid_line(osv.osv):
 
 delivery_grid_line()
 
+class define_delivery_steps(osv.osv_memory):
+    _name = 'delivery.define.delivery.steps.wizard'
+
+    _columns = {
+        'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Picking Policy'),
+    }
+    _defaults = {
+        'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy']
+    }
+
+    def apply_cb(self, cr, uid, ids, context=None):
+        ir_values_obj = self.pool.get('ir.values')
+        wizard = self.browse(cr, uid, ids, context=context)[0]
+        ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy)
+        return {'type' : 'ir.actions.act_window_close'}
+
+define_delivery_steps()
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 4dfef0c105b..94666efb26c 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -17,6 +17,7 @@
 
         <record id="delivery_product" model="product.product">
             <field name="name">Delivery by Poste</field>
+            <field name="default_code">Delivery</field>
             <field name="type">service</field>
             <field model="product.category" name="categ_id" search="[]"/>
         </record>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 72f811632ce..c46253777d2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -23,15 +23,15 @@
                 <form string="Carrier">
                     <group colspan="4" col="4" name="general">
                         <field name="name" select="1"/>
-                        <field name="active" select="1"/>
                         <field name="partner_id" select="1"/>
                         <field name="product_id" select="1"/>
-                        <separator string="Pricing Information" colspan="6"/>
-                        <group colspan="2" col="4">
-                            <field name="normal_price" select="1" colspan="4"/>
+                        <field name="active" select="1"/>
+                        <separator string="Pricing Information" colspan="4"/>
+                        <group colspan="4" col="4">
+                            <field name="normal_price"/>
                             <newline/>
                             <field name="free_if_more_than"/>
-                            <field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
+                            <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
                         </group>
                         <newline/>
                         <field name="use_detailed_pricelist"/>
@@ -39,7 +39,6 @@
                         <field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
                          <tree string="Delivery grids">
                               <field name="sequence"/>
-                              <field name="carrier_id"/>
                               <field name="name"/>
                          </tree>
                         <form string="Delivery grids">
@@ -74,15 +73,15 @@
         </record>
 
         <record id="action_delivery_carrier_form1" model="ir.actions.act_window">
-            <field name="name">Delivery Method</field>
+            <field name="name">Define Delivery Methods</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="help">Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">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.</field>
         </record>
 
-        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_extended"/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>
 
         <!-- Delivery Grids -->
         <record id="view_delivery_grid_tree" model="ir.ui.view">
@@ -132,7 +131,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range.</field>
         </record>
-        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
+        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery" groups="base.group_extended"/>
 
         <record id="view_delivery_grid_line_form" model="ir.ui.view">
             <field name="name">delivery.grid.line.form</field>
@@ -234,7 +233,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
             <field name="filter" eval="True"/>
-            <field name="context">{'contact_display': 'partner'}</field>
+            <field name="context">{'default_invoice_state': '2binvoiced', 'default_type': 'out', 'contact_display': 'partner'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
         </record>
 
@@ -327,15 +326,46 @@
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
-                    <button name="%(report_shipping)d" string="Delivery Order" states="done,assigned" type="action" icon="gtk-print"/>
+                    <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
         </record>
 
        <record id="delivery_method_form_view_todo" model="ir.actions.todo">
            <field name="action_id" ref="action_delivery_carrier_form1"/>
+           <field name="category_id" ref="stock.category_stock_management_config" />
            <field name="sequence">10</field>
        </record>
 
+        <record model="ir.ui.view" id="define_delivery_steps_form">
+            <field name="name">delivery.define_delivery_steps</field>
+            <field name="model">delivery.define.delivery.steps.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Setup Your Picking Policy">
+                    <separator string="Choose Your Default Picking Policy" colspan="4"/>
+                    <field name="picking_policy" />
+                    <separator string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" icon="gtk-cancel" special="cancel" />
+                        <button string="Apply" icon="gtk-apply" name="apply_cb" type="object" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_define_delivery_steps">
+            <field name="name">Setup Your Picking Policy</field>
+            <field name="res_model">delivery.define.delivery.steps.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record model="ir.actions.todo" id="todo_define_delivery_steps">
+            <field name="action_id" ref="action_define_delivery_steps" />
+            <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="type">once</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 9a8b14221dd..fd601c99505 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index 3a611cd95e2..e38718d3223 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index 76ee54221c5..5740e71e547 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index 3176233d542..7acc9f6b6d3 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr ""
+msgstr "Ref. comanda"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -35,12 +35,12 @@ msgstr "Destí"
 #. module: delivery
 #: field:stock.move,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Pes net"
 
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Ordre de lliurament"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:141
@@ -51,7 +51,7 @@ msgstr "No hi ha preu disponible!"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "Línia quadrícula lliurament"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -68,7 +68,7 @@ msgstr "Volum"
 #. module: delivery
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "La referència de la comanda ha de ser única!"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -78,7 +78,7 @@ msgstr "Línia de la quadrícula"
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Ordre de lliurament"
 
 #. module: delivery
 #: view:res.partner:0
@@ -88,12 +88,14 @@ msgstr "Propietats d'enviament"
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-msgstr ""
+msgstr "Albarà per ser facturat"
 
 #. module: delivery
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista de la xarxa de "
+"lliurament"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -104,7 +106,7 @@ msgstr "Països"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Ordre de lliurament :"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -119,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 ""
+"La llista de preus per lliurament li permet calcular el cost i preu de venda "
+"del lliurament en funció del pes dels productes i d'altres criteris. Podeu "
+"definir diversos preus per un mètode de lliurament, per país, o per zona "
+"d'un país específic, definit per un rang de codis postals."
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -138,7 +144,7 @@ msgstr "Mètode d'enviament"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Moviment d'estoc"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:141
@@ -151,12 +157,12 @@ msgstr ""
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr ""
+msgstr "Ref. seguiment transportista"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
 msgid "Net Weight"
-msgstr ""
+msgstr "Pes net"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -165,6 +171,10 @@ msgid ""
 "Each delivery method can be assigned to a price list which computes the "
 "price of the delivery according to the products sold or delivered."
 msgstr ""
+"Creeu i gestioneu els mètodes de lliurament que necessiteu per a la seva "
+"activitat de vendes. Cada mètode de lliurament pot ser assignat a una llista "
+"de preus que calcula el preu del lliurament en funció dels productes venuts "
+"o lliurats."
 
 #. module: delivery
 #: code:addons/delivery/stock.py:98
@@ -180,7 +190,7 @@ msgstr "Definició de la quadrícula"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -190,12 +200,12 @@ msgstr "Operador"
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Comanda de venda"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -205,17 +215,17 @@ msgstr "Quadrícula d'enviament"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Facturat a"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Albarà"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
 msgid "Make Delievery"
-msgstr ""
+msgstr "Realitza lliurament"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -227,6 +237,13 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"Permet afegir mètodes d'enviament en comandes de venda i albarans.\n"
+"     Podeu definir el seu propi transportista i xarxes de lliurament per als "
+"preus.\n"
+"     En crear les factures des d'albarans, OpenERP és capaç d'afegir i "
+"calcular la línia de transport.\n"
+"\n"
+"     "
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -244,6 +261,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet amagar la xarxa de lliurament sense "
+"eliminar-la."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -253,7 +272,7 @@ msgstr "C.Postal final"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Data comanda"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -263,12 +282,12 @@ msgstr "Nom de quadrícula"
 #. module: delivery
 #: view:stock.move:0
 msgid "Weights"
-msgstr ""
+msgstr "Pesos"
 
 #. module: delivery
 #: field:stock.picking,number_of_packages:0
 msgid "Number of Packages"
-msgstr ""
+msgstr "Número de paquets"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -285,12 +304,14 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet amagar el transportista sense eliminar-"
+"lo."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "No hi ha una xarxa disponible!"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -312,12 +333,12 @@ msgstr "Error! No podeu crear membres associats recursivament."
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Lot"
-msgstr ""
+msgstr "Lot"
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Esteu intentant assignar un lot que no és del mateix producte"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -328,7 +349,7 @@ msgstr "Actiu"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "Data d'enviament"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
@@ -355,6 +376,8 @@ msgstr "Variable"
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
+"Aquest mètode de lliurament serà utilitzat quan es facturi a partir de "
+"l'albarà."
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -364,7 +387,7 @@ msgstr "Valor màxim"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
@@ -376,6 +399,7 @@ msgstr "C.Postal inicial"
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
+"Completeu aquest camp si teniu previst facturar l'enviament segons l'albarà."
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -390,17 +414,17 @@ msgstr "Vendes & Compres"
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "<="
-msgstr ""
+msgstr "<="
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Heu d'assignar un lot de producció per a aquest producte"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr ""
+msgstr "Crea lliuraments"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
@@ -411,7 +435,7 @@ msgstr "Costos d'enviament"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -472,7 +496,7 @@ msgstr "Transportista"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Aplica"
 
 #. module: delivery
 #: field:sale.order,id:0
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index 2def063e39d..7cb6f787ed1 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -4,111 +4,112 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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: 2009-02-03 19:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-11-25 14:16+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr ""
+msgstr "Odkaz objednávky"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
 msgid "Delivery by Poste"
-msgstr ""
+msgstr "Dodání podle zaslání"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Destination"
-msgstr ""
+msgstr "Cíl"
 
 #. module: delivery
 #: field:stock.move,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Čistá hmotnost"
 
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Objednávka doručení"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No price available !"
-msgstr ""
+msgstr "Žádná dostupná cena !"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "Řádek dodací sítě"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Delivery grids"
-msgstr ""
+msgstr "Dodací sítě"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: field:stock.picking,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Objem"
 
 #. module: delivery
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Odkaz objednávky musí být jedinečný !"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr ""
+msgstr "Řádek sítě"
 
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Objednávka doručení"
 
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr ""
+msgstr "Vlastnosti doručení"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-msgstr ""
+msgstr "Navádění k fakturaci"
 
 #. module: delivery
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
+msgstr "Dává pořadí posloupnosti, když zobrazuje seznam dodací sítě."
 
 #. module: delivery
 #: view:delivery.grid:0
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
-msgstr ""
+msgstr "Země"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Objednávka doručení :"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
 msgid "Variable Factor"
-msgstr ""
+msgstr "Proměnný koeficient"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -118,11 +119,15 @@ 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 ""
+"Ceník dodání vám umožní spočítat cenu a prodejní cenu přepravy podle "
+"hmotnosti výrobků a dalších kritérií. Můžete určit několik ceníků pro jednu "
+"dodací metodu podle země nebo zóny ve specifické zemi určené podle rozsahu "
+"počtovního kódu."
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Pevné"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -137,23 +142,24 @@ msgstr "Způsob doručení"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Přesun zásob"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No line matched this order in the choosed delivery grids !"
 msgstr ""
+"Neodpovídají žádné řádky této objednávce, pokud je vybrána dodací síť !"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr ""
+msgstr "Odkaz sledování přepravce"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
 msgid "Net Weight"
-msgstr ""
+msgstr "Čistá hmotnost"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -162,57 +168,60 @@ msgid ""
 "Each delivery method can be assigned to a price list which computes the "
 "price of the delivery according to the products sold or delivered."
 msgstr ""
+"Vytvořit a spravovat dodací metody, které chcete pro vaše prodejní aktivity. "
+"Každá dodací metoda může být přiřazena k ceníku, který spočítá cenu přepravy "
+"podle výrobků prodaných nebo dodaných."
 
 #. module: delivery
 #: code:addons/delivery/stock.py:98
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varování"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr ""
+msgstr "Určení sítě"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Zrušit"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operátor"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodejní objednávka"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr ""
+msgstr "Dodací síť"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Fakturováno"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Naváděcí seznam"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
 msgid "Make Delievery"
-msgstr ""
+msgstr "Provést dodání"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -224,16 +233,22 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"Umožní vám přidat dodací metody v prodejním příkazu a navádění.\n"
+"     Můžete určit vaše ceny přepravce and dodací sítě.\n"
+"     Když vytváříte faktury z navádění, OpenERP je schopný přidat a spočítat "
+"dodací řádky.\n"
+"\n"
+"     "
 
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr ""
+msgstr "Řádky sítě"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr ""
+msgstr "Síť"
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -241,31 +256,33 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
+"Pokud je aktivní pole nastaveno na Nepravda, umožní vám to skrýt dodací síť "
+"bez jejího odebrání."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr ""
+msgstr "Na PSČ"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum objednání"
 
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr ""
+msgstr "Jméno sítě"
 
 #. module: delivery
 #: view:stock.move:0
 msgid "Weights"
-msgstr ""
+msgstr "Váhy"
 
 #. module: delivery
 #: field:stock.picking,number_of_packages:0
 msgid "Number of Packages"
-msgstr ""
+msgstr "Počet balíků"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -274,7 +291,7 @@ msgstr ""
 #: field:stock.move,weight:0
 #: field:stock.picking,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Váha"
 
 #. module: delivery
 #: help:delivery.carrier,active:0
@@ -282,179 +299,181 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Pokud je aktivní pole nastaveno na Nepravda, umožní vám to skrýt dodacího "
+"přepravce bez jeho odebrání."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "Žádná dostupná síť !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid ">="
-msgstr ""
+msgstr ">="
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:66
 #: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "Order not in draft state !"
-msgstr ""
+msgstr "Objednávka není ve stavu koncept !"
 
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní asociované členy."
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Lot"
-msgstr ""
+msgstr "Dávka"
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Snažíte se přiřadit dávku, která není ze stejného výrobku"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
 #: field:delivery.grid,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivní"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "Datum expedice"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr ""
+msgstr "Dodání výrobku"
 
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Condition"
-msgstr ""
+msgstr "Podmínka"
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Výrobní cena"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 #: field:delivery.grid.line,type:0
 msgid "Variable"
-msgstr ""
+msgstr "Proměnné"
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+msgstr "Dodací metoda bude použita při fakturaci z nasvádění."
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
-msgstr ""
+msgstr "Maximální hodnota"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Quantity"
-msgstr ""
+msgstr "Množství"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr ""
+msgstr "Počáteční PSČ"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+msgstr "Vyplňte toto pole, pokud plánujete fakturovat přepravu při navádění."
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr ""
+msgstr "Přepravní partner"
 
 #. module: delivery
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Prodeje & Nákupy"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "<="
-msgstr ""
+msgstr "<="
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr ""
+msgstr "Vytvořit dodání"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
 #: view:sale.order:0
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Ceny dodání"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr ""
+msgstr "Ceník dodání"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Price"
-msgstr ""
+msgstr "Cena"
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr ""
+msgstr "Žádná síť odpovídající tomuto přepravci !"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr ""
+msgstr "Dodací"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Weight * Volume"
-msgstr ""
+msgstr "Hmotnost * Objem"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: delivery
 #: code:addons/delivery/stock.py:99
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr ""
+msgstr "Přepravce %s (id: %d) nemá dodací síť!"
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
 msgid "Name"
-msgstr ""
+msgstr "Jméno"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -464,55 +483,55 @@ msgstr ""
 #: report:sale.shipping:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr ""
+msgstr "Přepravce"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Použít"
 
 #. module: delivery
 #: field:sale.order,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:66
 #: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
-msgstr ""
+msgstr "Stav objednávky musí být koncept pro přidání dodacích řádků."
 
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr ""
+msgstr "Přepravci a doručení"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr ""
+msgstr "Dodací síť"
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Posloupnost"
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "Prodejní cena"
 
 #. module: delivery
 #: view:delivery.grid:0
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr ""
+msgstr "Stavy"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
-msgstr ""
+msgstr "Typ ceny"
 
 #~ msgid "Cancel"
 #~ msgstr "Storno"
diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po
new file mode 100644
index 00000000000..5c121017845
--- /dev/null
+++ b/addons/delivery/i18n/da.po
@@ -0,0 +1,516 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-08 22:36+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: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr ""
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr "Levering med post"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr "Mål"
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Netto vægt"
+
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No price available !"
+msgstr "Ingen pris tilgængelig"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr ""
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Lande"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"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 ""
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No line matched this order in the choosed delivery grids !"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Netto vægt"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
+#, python-format
+msgid "Warning"
+msgstr "Advarsel!"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr ""
+
+#. module: delivery
+#: model:ir.module.module,description:delivery.module_meta_information
+msgid ""
+"Allows you to add delivery methods in sale orders and picking.\n"
+"     You can define your own carrier and delivery grids for prices.\n"
+"     When creating invoices from picking, OpenERP is able to add and compute "
+"the shipping line.\n"
+"\n"
+"     "
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr ""
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr "Vægte"
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr "Vægt"
+
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid available !"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "Order not in draft state !"
+msgstr ""
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr "Forsendelses dato"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kost pris"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr ""
+
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr "Mængde"
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr ""
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Carrier Partner"
+msgstr ""
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Levering"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:99
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.carrier,name:0
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr ""
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+
+#. module: delivery
+#: model:ir.module.module,shortdesc:delivery.module_meta_information
+msgid "Carriers and deliveries"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr "Rækkefølge"
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Salgspris"
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr ""
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index f4c8bf84840..09287643a5c 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -618,53 +618,3 @@ msgstr "Preistyp"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Sale Order"
-#~ msgstr "Verkaufsauftrag"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "grid without removing it."
-#~ msgstr ""
-#~ "Durch Aktivierung dieser Option, kann die Ansicht dieses Frachttarifs "
-#~ "verhindert werden ohne die Sektion zu löschen."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "carrier without removing it."
-#~ msgstr ""
-#~ "Durch Aktivierung dieser Option, kann die Ansicht dieses Frachtführers "
-#~ "verhindert werden, ohne die Sektion zu löschen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "The delivery pricelist allows you to compute the cost and sales price of the "
-#~ "delivery based on the weight of the products and other criteria. You can "
-#~ "define several pricelists for one delivery method, for each region such as "
-#~ "countries or a zone in a specific country defined by a zip code range."
-#~ msgstr ""
-#~ "Die Preisliste für Auslieferungen ermöglicht eine Errechnung der Kosten auf "
-#~ "Grundlage des Versandgewichts, der Auslieferungsdistanz u.a. Kriterien. Sie "
-#~ "können unterschiedliche Preislisten für eine Auslieferungsmethode "
-#~ "definieren, z.B. aufgeteilt nach Regionen, Ländern, Liefergebiet, "
-#~ "Postleitzahlenzone etc."
-
-#~ msgid ""
-#~ "Create and manage the delivery method(s) you want your sales to be processed "
-#~ "with. Each delivery method can be assigned to a pricelist which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Erstellen und verwalten Sie die Auslieferungsmethoden für Ihren Vertrieb. "
-#~ "Jede Auslieferungsmethode kann auch einer Preisliste zugeordnet werden, um "
-#~ "den Preis gemäß der verkauften oder gelieferten Produkte zu kalkulieren."
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index 60c810dd1d5..947cd84db3d 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index f8244b2e335..9d696991024 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -610,54 +610,3 @@ msgstr "Tipo de precio"
 
 #~ msgid "Packing to be invoiced"
 #~ msgstr "Albaranes a facturar"
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido venta"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "carrier without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el transportista sin "
-#~ "eliminarlo."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "grid without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la cuadrícula de envío sin "
-#~ "eliminarla."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "The delivery pricelist allows you to compute the cost and sales price of the "
-#~ "delivery based on the weight of the products and other criteria. You can "
-#~ "define several pricelists for one delivery method, for each region such as "
-#~ "countries or a zone in a specific country defined by a zip code range."
-#~ msgstr ""
-#~ "La lista de precios de entrega le permite calcular el costo y el precio de "
-#~ "venta de la entrega con base en el peso de los productos y otros criterios. "
-#~ "Usted puede definir varias listas de precios para un método de entrega, para "
-#~ "cada región, como países, o una zona de un país específico definida por un "
-#~ "rango de códigos postales."
-
-#~ msgid ""
-#~ "Create and manage the delivery method(s) you want your sales to be processed "
-#~ "with. Each delivery method can be assigned to a pricelist which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Crear y administrar los métodos de entrega con que quiere procesar sus "
-#~ "ventas. Cada método de entrega puede ser asignado a una lista de precios que "
-#~ "calcula el precio de la entrega de acuerdo a los productos vendidos o "
-#~ "entregados."
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index 5b80cecbf7a..aed1baebecf 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_EC.po b/addons/delivery/i18n/es_EC.po
index b0dce1d5b94..dcad8d9ce31 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_MX.po b/addons/delivery/i18n/es_MX.po
new file mode 100644
index 00000000000..b5461131859
--- /dev/null
+++ b/addons/delivery/i18n/es_MX.po
@@ -0,0 +1,612 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* delivery
+#
+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-13 14:31+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr "Ref. pedido"
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr "Destino"
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
+
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No price available !"
+msgstr "¡No existe precio disponible!"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Línea cuadrícula envío"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr "Cuadrículas de envío"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
+
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Línea de la cuadrícula"
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr "Orden entrega"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr "Propiedades de envío"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr "Albarán para ser facturado"
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
+"envío."
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Países"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr "Orden entrega :"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"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 ""
+"La lista de precios por entrega le permite calcular el coste y precio de "
+"venta de la entrega en funvión del peso de los productos y de otros "
+"criterios. Puede definir varios precios por un método de entrega, por país, "
+"o por zona de un páis específico, definido por un rango de códigos postales."
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Método de envío"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No line matched this order in the choosed delivery grids !"
+msgstr ""
+"¡No existe línea que concuerde con esta orden en las cuadrículas de envío "
+"seleccionadas!"
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. seguimiento transportista"
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso neto"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+"Cree y gestione los métodos de entrega que necesite para su actividad de "
+"ventas. Cada método de entrega puede ser asignado a una lista de precios que "
+"calcula el precio de la entrega en función de los productos vendidos o "
+"entregados."
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr "Definición de la cuadrícula"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Cuadrícula de envío"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr "Facturado a"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr "Realizar entrega"
+
+#. module: delivery
+#: model:ir.module.module,description:delivery.module_meta_information
+msgid ""
+"Allows you to add delivery methods in sale orders and picking.\n"
+"     You can define your own carrier and delivery grids for prices.\n"
+"     When creating invoices from picking, OpenERP is able to add and compute "
+"the shipping line.\n"
+"\n"
+"     "
+msgstr ""
+"Permite añadir métodos de envío en pedidos de venta y albaranes.\n"
+"    Puede definir su propio transportista y cuadrículas de envío para los "
+"precios.\n"
+"    Al crear las facturas desde albaranes, OpenERP es capaz de añadir y "
+"calcular la línea de transporte.\n"
+"\n"
+"     "
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr "Líneas de la cuadrícula"
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Cuadrícula"
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la cuadrícula de envío sin "
+"eliminarla."
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr "Fecha entrega"
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nombre cuadrícula"
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr "Pesos"
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de bultos"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el transportista sin "
+"eliminarlo."
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid available !"
+msgstr "¡No hay una cuadrícula disponible!"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "Order not in draft state !"
+msgstr "¡La orden no está en estado borrador!"
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr "Lote"
+
+#. module: delivery
+#: 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: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr "Fecha envío"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producto de envío"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: delivery
+#: 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á utilizado cuando se facture a partir del albarán."
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Complete este campo si tiene previsto facturar el envío según el albarán."
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Carrier Partner"
+msgstr "Empresa transportista"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
+
+#. module: delivery
+#: 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: delivery
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr "Crear entregas"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr "Costes de envío"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr "¡No concuerda cuadrícula para este transportista!"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Envío"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volumen"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr "="
+
+#. module: delivery
+#: code:addons/delivery/stock.py:99
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.carrier,name:0
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr "Transportista"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
+
+#. module: delivery
+#: model:ir.module.module,shortdesc:delivery.module_meta_information
+msgid "Carriers and deliveries"
+msgstr "Transportistas y envíos"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cuadrículas de envío"
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Provincias"
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de precio"
+
+#~ 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!"
+
+#~ msgid "Generate Draft Invoices On Receptions"
+#~ msgstr "Generar facturas borrador en recepciones"
+
+#~ msgid "Delivery line of grid"
+#~ msgstr "Línea de envío de la cuadrícula"
+
+#~ msgid "Carrier and delivery grids"
+#~ msgstr "Cuadrícula de transportistas y envíos"
+
+#~ 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 ""
+#~ "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 "Notes"
+#~ msgstr "Notas"
+
+#, python-format
+#~ msgid "No grid avaible !"
+#~ msgstr "¡No hay cuadrícula disponible!"
+
+#~ msgid "Add Delivery Costs"
+#~ msgstr "Añadir costes de envío"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Delivery method"
+#~ msgstr "Método de envío"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "El CIF/NIF no parece estar correcto."
+
+#~ msgid "This delivery method will be used when invoicing from packing."
+#~ msgstr "Este método de envío se utilizará cuando se facture desde albaranes."
+
+#~ msgid ""
+#~ "Complete this field if you plan to invoice the shipping based on packing."
+#~ msgstr "Complete este campo si desea facturar los envíos 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 ""
+#~ "Allows you to add delivery methods in sales orders and packing. You can "
+#~ "define your own carrier and delivery grids for prices. When creating "
+#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
+#~ msgstr ""
+#~ "Permite añadir los métodos de envío en los pedidos de venta y albaranes. "
+#~ "Puede definir sus propias tablas de transportistas y destinos para el "
+#~ "cálculo de precios. Al crear facturas desde albaranes, OpenERP es capaz de "
+#~ "sumar y calcular la línea de gastos de envío."
+
+#~ msgid "Packing to be invoiced"
+#~ msgstr "Albaranes a facturar"
diff --git a/addons/delivery/i18n/es_PY.po b/addons/delivery/i18n/es_PY.po
index 18a20a172dd..eb37e99e18c 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_VE.po b/addons/delivery/i18n/es_VE.po
new file mode 100644
index 00000000000..b5461131859
--- /dev/null
+++ b/addons/delivery/i18n/es_VE.po
@@ -0,0 +1,612 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* delivery
+#
+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-13 14:31+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:01+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr "Ref. pedido"
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr "Destino"
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
+
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No price available !"
+msgstr "¡No existe precio disponible!"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Línea cuadrícula envío"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr "Cuadrículas de envío"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
+
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Línea de la cuadrícula"
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr "Orden entrega"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr "Propiedades de envío"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr "Albarán para ser facturado"
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
+"envío."
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Países"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr "Orden entrega :"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"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 ""
+"La lista de precios por entrega le permite calcular el coste y precio de "
+"venta de la entrega en funvión del peso de los productos y de otros "
+"criterios. Puede definir varios precios por un método de entrega, por país, "
+"o por zona de un páis específico, definido por un rango de códigos postales."
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Método de envío"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No line matched this order in the choosed delivery grids !"
+msgstr ""
+"¡No existe línea que concuerde con esta orden en las cuadrículas de envío "
+"seleccionadas!"
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. seguimiento transportista"
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso neto"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+"Cree y gestione los métodos de entrega que necesite para su actividad de "
+"ventas. Cada método de entrega puede ser asignado a una lista de precios que "
+"calcula el precio de la entrega en función de los productos vendidos o "
+"entregados."
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr "Definición de la cuadrícula"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Cuadrícula de envío"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr "Facturado a"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr "Realizar entrega"
+
+#. module: delivery
+#: model:ir.module.module,description:delivery.module_meta_information
+msgid ""
+"Allows you to add delivery methods in sale orders and picking.\n"
+"     You can define your own carrier and delivery grids for prices.\n"
+"     When creating invoices from picking, OpenERP is able to add and compute "
+"the shipping line.\n"
+"\n"
+"     "
+msgstr ""
+"Permite añadir métodos de envío en pedidos de venta y albaranes.\n"
+"    Puede definir su propio transportista y cuadrículas de envío para los "
+"precios.\n"
+"    Al crear las facturas desde albaranes, OpenERP es capaz de añadir y "
+"calcular la línea de transporte.\n"
+"\n"
+"     "
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr "Líneas de la cuadrícula"
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Cuadrícula"
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la cuadrícula de envío sin "
+"eliminarla."
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr "Fecha entrega"
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nombre cuadrícula"
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr "Pesos"
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de bultos"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el transportista sin "
+"eliminarlo."
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid available !"
+msgstr "¡No hay una cuadrícula disponible!"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "Order not in draft state !"
+msgstr "¡La orden no está en estado borrador!"
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr "Lote"
+
+#. module: delivery
+#: 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: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr "Fecha envío"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producto de envío"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: delivery
+#: 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á utilizado cuando se facture a partir del albarán."
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Complete este campo si tiene previsto facturar el envío según el albarán."
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Carrier Partner"
+msgstr "Empresa transportista"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
+
+#. module: delivery
+#: 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: delivery
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr "Crear entregas"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr "Costes de envío"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr "¡No concuerda cuadrícula para este transportista!"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Envío"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volumen"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr "="
+
+#. module: delivery
+#: code:addons/delivery/stock.py:99
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.carrier,name:0
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr "Transportista"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
+
+#. module: delivery
+#: model:ir.module.module,shortdesc:delivery.module_meta_information
+msgid "Carriers and deliveries"
+msgstr "Transportistas y envíos"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cuadrículas de envío"
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Provincias"
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de precio"
+
+#~ 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!"
+
+#~ msgid "Generate Draft Invoices On Receptions"
+#~ msgstr "Generar facturas borrador en recepciones"
+
+#~ msgid "Delivery line of grid"
+#~ msgstr "Línea de envío de la cuadrícula"
+
+#~ msgid "Carrier and delivery grids"
+#~ msgstr "Cuadrícula de transportistas y envíos"
+
+#~ 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 ""
+#~ "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 "Notes"
+#~ msgstr "Notas"
+
+#, python-format
+#~ msgid "No grid avaible !"
+#~ msgstr "¡No hay cuadrícula disponible!"
+
+#~ msgid "Add Delivery Costs"
+#~ msgstr "Añadir costes de envío"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Delivery method"
+#~ msgstr "Método de envío"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "El CIF/NIF no parece estar correcto."
+
+#~ msgid "This delivery method will be used when invoicing from packing."
+#~ msgstr "Este método de envío se utilizará cuando se facture desde albaranes."
+
+#~ msgid ""
+#~ "Complete this field if you plan to invoice the shipping based on packing."
+#~ msgstr "Complete este campo si desea facturar los envíos 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 ""
+#~ "Allows you to add delivery methods in sales orders and packing. You can "
+#~ "define your own carrier and delivery grids for prices. When creating "
+#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
+#~ msgstr ""
+#~ "Permite añadir los métodos de envío en los pedidos de venta y albaranes. "
+#~ "Puede definir sus propias tablas de transportistas y destinos para el "
+#~ "cálculo de precios. Al crear facturas desde albaranes, OpenERP es capaz de "
+#~ "sumar y calcular la línea de gastos de envío."
+
+#~ msgid "Packing to be invoiced"
+#~ msgstr "Albaranes a facturar"
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index 94e1feaaaa9..83f49a407f6 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-10-30 13:40+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-11 17:52+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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr ""
+msgstr "Tellimuse viide"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -34,12 +34,12 @@ msgstr "Sihtpunkt"
 #. module: delivery
 #: field:stock.move,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Netokaal"
 
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Tarnekorraldus"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:141
@@ -77,7 +77,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Tarnetellimus"
 
 #. module: delivery
 #: view:res.partner:0
@@ -103,7 +103,7 @@ msgstr "Riigid"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Tarnetellimus :"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -137,7 +137,7 @@ msgstr "Tarneviis"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Laoseisu liikumine"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:141
@@ -153,7 +153,7 @@ msgstr ""
 #. module: delivery
 #: field:stock.picking,weight_net:0
 msgid "Net Weight"
-msgstr ""
+msgstr "Netokaal"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -177,7 +177,7 @@ msgstr ""
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Tühista"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -187,12 +187,12 @@ msgstr "Operaator"
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Müügitellimus"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -207,7 +207,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Noppeleht"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
@@ -250,7 +250,7 @@ msgstr ""
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Tellimuse Kuupäev"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -260,12 +260,12 @@ msgstr ""
 #. module: delivery
 #: view:stock.move:0
 msgid "Weights"
-msgstr ""
+msgstr "Kaalud"
 
 #. module: delivery
 #: field:stock.picking,number_of_packages:0
 msgid "Number of Packages"
-msgstr ""
+msgstr "Pakkide arv"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -309,7 +309,7 @@ msgstr "Viga! Sa ei saa luua rekursiivseid seotud liikmeid."
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Lot"
-msgstr ""
+msgstr "Partii"
 
 #. module: delivery
 #: constraint:stock.move:0
@@ -325,7 +325,7 @@ msgstr "Aktiivne"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "Tarnimise kuupäev"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
@@ -361,7 +361,7 @@ msgstr "Maksimumväärtus"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Quantity"
-msgstr ""
+msgstr "Kogus"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
@@ -387,7 +387,7 @@ msgstr "Müügid ja ostud"
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "<="
-msgstr ""
+msgstr "<="
 
 #. module: delivery
 #: constraint:stock.move:0
@@ -408,7 +408,7 @@ msgstr "Tarnekulud"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
-msgstr ""
+msgstr "Kirjeldus"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -469,7 +469,7 @@ msgstr "Tarnija"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Rakenda"
 
 #. module: delivery
 #: field:sale.order,id:0
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 2029387f6d6..f49f40dcff5 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -40,7 +40,7 @@ msgstr "Nettopaino"
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Toimitusmääräys"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:141
@@ -51,7 +51,7 @@ msgstr "Ei hintaa saatavilla!"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "Toimitus ruudukko"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -78,7 +78,7 @@ msgstr "Taulukkorivi"
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Toimitustilaus"
 
 #. module: delivery
 #: view:res.partner:0
@@ -88,7 +88,7 @@ msgstr "Toimituksien ominaisuudet"
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-msgstr ""
+msgstr "Laskutettava keräily"
 
 #. module: delivery
 #: help:delivery.grid,sequence:0
@@ -104,7 +104,7 @@ msgstr "Maat"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Toimitusjärjestys :"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -149,7 +149,7 @@ msgstr "Yksikään valitun toimitustaulukon rivi ei vastaa tilausta!"
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr ""
+msgstr "Kuljetusyhtiön seurantakoodi"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
@@ -178,7 +178,7 @@ msgstr "Taulukon määrittely"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peruuta"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -203,7 +203,7 @@ msgstr "Toimitustaulukko"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Laskutuksen kohde"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
@@ -242,6 +242,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
+"Jos aktiivisen kentän tila on epätosi (false), voit piilottaa jakeluruudukon "
+"poistamatta sitä."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -251,7 +253,7 @@ msgstr "Kohde postinumero"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Tilauksen päivämäärä"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -261,12 +263,12 @@ msgstr "Taulukon nimi"
 #. module: delivery
 #: view:stock.move:0
 msgid "Weights"
-msgstr ""
+msgstr "Painot"
 
 #. module: delivery
 #: field:stock.picking,number_of_packages:0
 msgid "Number of Packages"
-msgstr ""
+msgstr "Pakkausten määrä"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -283,12 +285,14 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Jos aktiivisen kentän tila on epätosi (false), voit piilottaa jakelijan "
+"poistamatta sitä."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "Ruudukkoa ei saatavilla !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -315,7 +319,7 @@ msgstr "Erä"
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Erä ei ole samaa tuotetta"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -326,7 +330,7 @@ msgstr "Aktiivinen"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "Toimituspäivä"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
@@ -352,7 +356,7 @@ msgstr "Muuttuva"
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+msgstr "Tämä toimitustapa on käytössä kun laskutus tapahtuu keräilystä."
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -374,6 +378,8 @@ msgstr "Lähtö postinumero"
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
+"Täytä tämä kenttä jos suunnittelet laskuttavasi toimituksen keräilyn "
+"perusteella."
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -393,12 +399,12 @@ msgstr ""
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr ""
+msgstr "Luo toimitukset"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
@@ -409,7 +415,7 @@ msgstr "Toimituskustannukset"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index f7a847cefcb..1afe19d16dd 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue !"
@@ -620,28 +620,3 @@ msgstr "Type de prix"
 
 #~ msgid "Generate Draft Invoices On Receptions"
 #~ msgstr "Créer les factures brouillon sur les réceptions"
-
-#~ msgid "Sale Order"
-#~ msgstr "Commande de vente"
-
-#~ msgid ""
-#~ "Create and manage the delivery method(s) you want your sales to be processed "
-#~ "with. Each delivery method can be assigned to a pricelist which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Créez et gérer les méthodes de livraisons avec lesquelles vous voulez "
-#~ "traiter vos commandes de vente. Chaque méthode de livraison peut être "
-#~ "associée à une liste de prix qui calcule le prix de la livraison en fonction "
-#~ "des produits vendus ou livrés."
-
-#~ msgid ""
-#~ "The delivery pricelist allows you to compute the cost and sales price of the "
-#~ "delivery based on the weight of the products and other criteria. You can "
-#~ "define several pricelists for one delivery method, for each region such as "
-#~ "countries or a zone in a specific country defined by a zip code range."
-#~ msgstr ""
-#~ "La liste de prix de la livraison vous permet de calculer le coût et le prix "
-#~ "de vente de la livraison en fonction des poids des produits et d'autres "
-#~ "critères. Vous pouvez définir plusieurs listes de prix pour une même méthode "
-#~ "de livraison, pour chaque région comme par exemple des pays ou des zones à "
-#~ "l'intérieur d'un pays définies par une plage de codes postaux."
diff --git a/addons/delivery/i18n/gl.po b/addons/delivery/i18n/gl.po
index 4d297e8887d..c7f84af90a2 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/hi.po b/addons/delivery/i18n/hi.po
index 8abcfd28651..fdf910d8b99 100644
--- a/addons/delivery/i18n/hi.po
+++ b/addons/delivery/i18n/hi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-20 10:00+0000\n"
-"Last-Translator: Tejaskumar Tank (OpenERP) <Unknown>\n"
+"Last-Translator: Tejas Tank (OpenERP) <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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index f112f0f5bfb..2965eea4a77 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index ae9942d965d..f2086da621a 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 12:10+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index 3d28995c674..a881ea1f7f2 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index ce9e8ff353f..294eb611dca 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: 2011-05-18 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index 609d3f966d8..114eeea5570 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index 9502522d98f..36229ab76df 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po
index fc513e9c0c4..3d40c9dae12 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -557,15 +557,3 @@ msgstr "Үнийн төрөл"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Sale Order"
-#~ msgstr "Борлуулах захиалга"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid "The total weight of product move in Kg."
-#~ msgstr "Бараа шилжүүлэх нийт жин  (кг)."
-
-#~ msgid "The total weight of picking list in Kg."
-#~ msgstr "Түүврийн жагсаалтын нийт жин (кг)"
diff --git a/addons/delivery/i18n/nb.po b/addons/delivery/i18n/nb.po
index 7a0175830fa..2be558edbb2 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index cb315d974ba..6b41904ff2c 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -612,53 +612,3 @@ msgstr "Soort prijs"
 #, python-format
 #~ msgid "No grid avaible !"
 #~ msgstr "Geen leveringsmatrix beschikbaar!"
-
-#~ msgid "Sale Order"
-#~ msgstr "Verkooporder"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "carrier without removing it."
-#~ msgstr ""
-#~ "Als het actief veld aan staat, kunt u de vervoerder verbergen zonder te "
-#~ "verwijderen."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "grid without removing it."
-#~ msgstr ""
-#~ "Als het actief veld aan staat, kunt u de transportplanning verbergen zonder "
-#~ "te verwijderen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid ""
-#~ "The delivery pricelist allows you to compute the cost and sales price of the "
-#~ "delivery based on the weight of the products and other criteria. You can "
-#~ "define several pricelists for one delivery method, for each region such as "
-#~ "countries or a zone in a specific country defined by a zip code range."
-#~ msgstr ""
-#~ "De afleverprijslijst laat u de kost- en verkoopprijs berekenen van de "
-#~ "aflevering gebaseerd op het gewicht van de producten en andere criteria. U "
-#~ "kunt verschillende prijslijsten definiëren voor een aflevermethode, voor "
-#~ "elke regio zoals landen of zones in een specifiek land, gedefinieerd door "
-#~ "een postcode bereik."
-
-#~ msgid ""
-#~ "Create and manage the delivery method(s) you want your sales to be processed "
-#~ "with. Each delivery method can be assigned to a pricelist which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Maakt en beheert de aflever methode(s) waarmee u uw order mee wilt laten "
-#~ "verwerken. Elke aflevermethode kan worden toegewezen aan een prijslijst die "
-#~ "de prijs van de levering berekent voor de verkochte of geleverde producten."
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index 359c7d6d861..b4709267c5b 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index 2647e73dbd3..c75ab6e5e73 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -574,23 +574,3 @@ msgstr "Typ ceny"
 
 #~ msgid "Packing to be invoiced"
 #~ msgstr "Opakowanie do zafakturowania"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "grid without removing it."
-#~ msgstr ""
-#~ "Jeśli pole Aktywne jest nieustawione, to możesz ukryć siatkę dostaw bez jej "
-#~ "usuwania."
-
-#~ msgid "Sale Order"
-#~ msgstr "Zamówienie sprzedaży"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "carrier without removing it."
-#~ msgstr ""
-#~ "Jeśli pole Aktywne jest nieustawione, to możesz ukryć przewoźnika bez jego "
-#~ "usuwania."
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 2d37af945ad..763b65def95 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -586,34 +586,3 @@ msgstr "Tipo de preço"
 #, python-format
 #~ msgid "No grid avaible !"
 #~ msgstr "Nenhuma grelha disponivel !"
-
-#~ msgid "Sale Order"
-#~ msgstr "Ordem de venda"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "carrier without removing it."
-#~ msgstr ""
-#~ "Se o campo 'ativo' estiver selecionado, permitir-lhe-á esconder o "
-#~ "transportador sem ter de o remover"
-
-#~ msgid ""
-#~ "Create and manage the delivery method(s) you want your sales to be processed "
-#~ "with. Each delivery method can be assigned to a pricelist which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Criar e gerir os métodos de entrega que se pretende aplicar às vendas. Cada "
-#~ "método pode ser associado a uma lista de preços que calcula o preço de "
-#~ "entrega de acordo com os produtos sendo vendidos ou entregues"
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index 710b80d9122..9fd6edafae6 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -608,18 +608,3 @@ msgstr "Tipo de Preço"
 #~ "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 conter caracteres especiais!"
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de Venda"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index de4aed31b66..30b195e34b3 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-19 19:06+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index f03abcffc94..4598929f5ba 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -50,7 +50,7 @@ msgstr "Нет каталога !"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "Строки поставки"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -93,6 +93,7 @@ msgstr "Счет на комплектование"
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Возвращает порядок следования при отображении списка доставочной сетки."
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -148,11 +149,12 @@ msgstr "Движение ТМЦ"
 #, python-format
 msgid "No line matched this order in the choosed delivery grids !"
 msgstr ""
+"Ни одна строка не совпала с этим порядком в выбранных доставочных сетках!"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr ""
+msgstr "Отслеживание доставки перевозчиком"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
@@ -166,6 +168,10 @@ msgid ""
 "Each delivery method can be assigned to a price list which computes the "
 "price of the delivery according to the products sold or delivered."
 msgstr ""
+"Создание и управление способами доставки, необходимыми для вашей торговой "
+"деятельности. Каждый способ доставки может быть отнесены к прайс-листу, "
+"который вычисляет цену доставки в соответствии с реализованной или "
+"доставленной продукцией."
 
 #. module: delivery
 #: code:addons/delivery/stock.py:98
@@ -228,6 +234,12 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"Позволяет добавить методы доставки в заказы на продажу и комплектацию.\n"
+"     Можно определить собственные сетки цен доставки и перевозки.\n"
+"     При создании счетов по комплектации, OpenERP может добавить и вычислить "
+"строку доставки.\n"
+"\n"
+"     "
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -245,6 +257,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
+"Если активное поле установлено в «Ложь», будет позволено спрятать "
+"доставочную сетку не удаляя её."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -293,7 +307,7 @@ msgstr ""
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "Доступных позиций нет !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -437,7 +451,7 @@ msgstr "Цена"
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr ""
+msgstr "Нет сетки, совпадающей с этой перевозкой!"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -459,7 +473,7 @@ msgstr "="
 #: code:addons/delivery/stock.py:99
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr ""
+msgstr "Перевозка %s (ID: %d) не имеет доставочной сетки!"
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
@@ -596,15 +610,3 @@ msgstr "Тип цены"
 #~ msgstr ""
 #~ "Этот метод доставки должен использоваться при фактурировании на основании "
 #~ "данных упаковки."
-
-#~ msgid "Sale Order"
-#~ msgstr "Заказ на продажу"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index ae33d31d6d9..877c34c7ad1 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sq.po b/addons/delivery/i18n/sq.po
index 0969c0f4a4d..4a1b27f3e45 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index d3d0657860a..57614cc7cc3 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -594,23 +594,3 @@ msgstr "Vrsta Cene"
 
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "PDV nije ispravan."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "grid without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava da sakrijes liniju "
-#~ "dostave bez uklanjanja iste,"
-
-#~ msgid "Sale Order"
-#~ msgstr "Zahtev Prodaje"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni Meni."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "carrier without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes "
-#~ "prevoznika dostave bez uklanjanja istog."
diff --git a/addons/delivery/i18n/sr@latin.po b/addons/delivery/i18n/sr@latin.po
index 8f7b861a9d6..e1063d82501 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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -528,19 +528,6 @@ msgstr "Vrsta Cene"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid "Sale Order"
-#~ msgstr "Zahtev Prodaje"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "grid without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava da sakrijes liniju "
-#~ "dostave bez uklanjanja iste,"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni Meni."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
@@ -561,13 +548,6 @@ msgstr "Vrsta Cene"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the delivery "
-#~ "carrier without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes "
-#~ "prevoznika dostave bez uklanjanja istog."
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: Neispravan EAN kod"
 
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 841845cf4c4..a691c5ae944 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -543,18 +543,6 @@ msgstr "Pristyp"
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "Momsen verkar vara fel"
 
-#~ msgid "Sale Order"
-#~ msgstr "Kundorder"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
diff --git a/addons/delivery/i18n/th.po b/addons/delivery/i18n/th.po
index 132ecb13b62..eb209db7f07 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index 40df49bb456..c2fcb9126a4 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index e110cbbffa8..17c2e0c83ef 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr ""
+msgstr "Sipariş Ref."
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -50,7 +50,7 @@ msgstr "Fiyat bulunamadı !"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "Teslimat Gridi Satırı"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -72,7 +72,7 @@ msgstr "Sipariş referans no'su tek olmalı !"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr ""
+msgstr "Grid Satırı"
 
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
@@ -92,7 +92,7 @@ msgstr "Faturalanmak üzere seçilen"
 #. module: delivery
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
+msgstr "Bir teslimat gridi listesini görüntülerken sıralamasını verir."
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -103,7 +103,7 @@ msgstr "Ülkeler"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Teslim Emri:"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -118,6 +118,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 ""
+"Teslimat fiyat listesi, ürünün ağırlığı ve diğer kriterlere göre teslimatın "
+"satış fiyatı ve maliyetini hesaplamanızı sağlar. Bir teslimat yöntemi için, "
+"ülke ya da belirli bir ülkedeki posta kodu aralığıyla belirlenen bölgeye "
+"göre birden fazla fiyat listesi tanımlayabilirsiniz."
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -143,12 +147,12 @@ msgstr "Stok Hareketi"
 #: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No line matched this order in the choosed delivery grids !"
-msgstr ""
+msgstr "Seçilen teslimat gridlerinde bu siparişle eşleşen hiçbir satır yok!"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr ""
+msgstr "Nakliyeci İzleme Ref"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
@@ -175,7 +179,7 @@ msgstr "Uyarı"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr ""
+msgstr "Grid tanımı"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -227,16 +231,23 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"Alım veya satış siparişlerine teslimat yöntemi eklemenizi sağlar.\n"
+"     Fiyatlar için kendi nakliyeci veya teslimat gridlerinizi "
+"tanımlayabilirsiniz.\n"
+"     Alımdan fatura oluştururken, OpenERP sevkiyat satırı ekleyip "
+"hesaplayabilir.\n"
+"\n"
+"     "
 
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr ""
+msgstr "Grid Satırları"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr ""
+msgstr "Izgara"
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -244,6 +255,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
+"Aktif alanı Yanlış olarak ayarlayarak, teslimat gridini silmeden "
+"gizleyebilirsiniz."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -285,12 +298,14 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Aktif alanı Yanlış olarak ayarlayarak, teslimat nakliyecisini silmeden "
+"gizleyebilirsiniz."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "Hiçbir grid mevcut değil!"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -307,17 +322,17 @@ msgstr "Sipariş taslak modunda değil !"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Hata! Üyelere ilişkin yineleme oluşturamazsınız."
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Lot"
-msgstr ""
+msgstr "Lot"
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Aynı üründen olmayan bir lot atamaya çalışıyorsunuz"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -355,6 +370,7 @@ msgstr "Değişken"
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
+"Bu teslimat yöntemi, alımdan faturalandırma yaparken kullanılacaktır."
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -376,6 +392,7 @@ msgstr "Baş. P. Kodu"
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
+"Alım bazında sevkiyatı faturalandırmayı planlıyorsanız, bu alanı tamamlayın."
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -390,17 +407,17 @@ msgstr "Alış & Satış Bilgileri"
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "<="
-msgstr ""
+msgstr "<="
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Bu ürün için bir üretim lotu oluşturmanız gerekir"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr ""
+msgstr "Teslimat Oluştur"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
@@ -430,7 +447,7 @@ msgstr "Fiyat"
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr ""
+msgstr "Bu nakliyeciyle eşleşen hiçbir grid mevcut değil!"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -452,7 +469,7 @@ msgstr "="
 #: code:addons/delivery/stock.py:99
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr ""
+msgstr "Nakliyeci %s (id: %d) teslimat gridine sahip değil!"
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
@@ -485,6 +502,7 @@ msgstr "No"
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
+"Teslimat satırı eklemek için sipariş durumu taslak olarak ayarlanmalıdır."
 
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index 954878089dd..352ac7bd6b5 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index 606ded66d59..91c9947a61d 100644
--- a/addons/delivery/i18n/vi.po
+++ b/addons/delivery/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-12-15 15:17+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -46,7 +46,7 @@ msgstr ""
 #: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No price available !"
-msgstr "Chưa có giá"
+msgstr "Chưa có giá !"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
@@ -188,7 +188,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Đối tác"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
@@ -341,7 +341,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Giá Vốn"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -378,7 +378,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr ""
+msgstr "Đối tác Vận chuyển"
 
 #. module: delivery
 #: view:res.partner:0
@@ -415,14 +415,14 @@ 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 "Bảng giá Giao hàng"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Price"
-msgstr ""
+msgstr "Giá"
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
@@ -502,7 +502,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "Giá Bán"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -513,7 +513,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
-msgstr ""
+msgstr "Loại Giá"
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Lỗi: mã EAN không hợp lệ"
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 53d551120f1..f0096c66c63 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -13,23 +13,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr "订单参考"
+msgstr "关联单号"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
 msgid "Delivery by Poste"
-msgstr "邮递送货"
+msgstr "由post送货"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Destination"
-msgstr "目的地"
+msgstr "目标库位"
 
 #. module: delivery
 #: field:stock.move,weight_net:0
@@ -50,12 +50,12 @@ msgstr "无价格表可用！"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "送货网络明细"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Delivery grids"
-msgstr "交货表格"
+msgstr "送货网络"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -67,12 +67,12 @@ msgstr "体积"
 #. module: delivery
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "单号必须唯一！"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr "表格行"
+msgstr "网络明细"
 
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
@@ -82,17 +82,17 @@ msgstr "送货单"
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr "交货属性"
+msgstr "送货属性"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-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.grid:0
@@ -117,7 +117,7 @@ msgid ""
 "the delivery according to the weight of the products and other criteria. You "
 "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 ""
+msgstr "送货价格表允许您通过重量或其它条件计算成本和售价。您可以为一个送货方式定义多个价格表。按国家或地区（以邮政编码区分）"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -143,12 +143,12 @@ msgstr "库存调拨"
 #: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No line matched this order in the choosed delivery grids !"
-msgstr ""
+msgstr "在所选的送货网络中没有明细匹配这个订单"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr ""
+msgstr "承运方跟踪号"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
@@ -161,7 +161,7 @@ msgid ""
 "Create and manage the delivery methods you need for your sales activities. "
 "Each delivery method can be assigned to a price list which computes the "
 "price of the delivery according to the products sold or delivered."
-msgstr ""
+msgstr "创建和管理你在销售过程中的送货方式。每种送货方式可以指定一个价格表这样可以根据销售和发运的产品计算运费。"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:98
@@ -172,7 +172,7 @@ msgstr "警告"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr "表格定义"
+msgstr "网络定义"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -192,27 +192,27 @@ msgstr "业务伙伴"
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr "销售单"
+msgstr "销售订单"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr "交货表格"
+msgstr "送货网络"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Invoiced to"
-msgstr "开发票至"
+msgstr "开票到"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
 msgid "Picking List"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
 msgid "Make Delievery"
-msgstr ""
+msgstr "发运"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -224,23 +224,28 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"允许你在销售订单或出库单上增加送货方式。\n"
+"你可以定义你自己的承运方和送货网络价格。\n"
+"当基于送货单创建发票时，OpenERP可以增加和自动计算这装运明细。\n"
+"\n"
+"     "
 
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr "表格行"
+msgstr "网络明细"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr "表格"
+msgstr "网络"
 
 #. module: delivery
 #: help:delivery.grid,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
-msgstr ""
+msgstr "如果生效字段为false，送货网络将隐藏而不是删除。"
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -250,12 +255,12 @@ msgstr "目的地邮编"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr "订单日期"
+msgstr "单据日期"
 
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr "表格名"
+msgstr "网络名"
 
 #. module: delivery
 #: view:stock.move:0
@@ -265,7 +270,7 @@ msgstr "重量"
 #. module: delivery
 #: field:stock.picking,number_of_packages:0
 msgid "Number of Packages"
-msgstr ""
+msgstr "包装件数"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -281,13 +286,13 @@ msgstr "重量"
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
-msgstr ""
+msgstr "如果生效设为false，可以不必删除承运方就隐藏它。"
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "没有可用的送货网络"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -299,12 +304,12 @@ msgstr ">="
 #: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "Order not in draft state !"
-msgstr "订单不在草稿状态！"
+msgstr "单据不在草稿状态！"
 
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+msgstr "错误！您不能创建递归的商会会员。"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -314,23 +319,23 @@ 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
 #: field:delivery.grid,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr "送货日期"
+msgstr "装运日期"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "产品交货"
+msgstr "送货服务"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -346,12 +351,12 @@ msgstr "成本价"
 #: selection:delivery.grid.line,price_type:0
 #: field:delivery.grid.line,type:0
 msgid "Variable"
-msgstr "可变的"
+msgstr "变量"
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+msgstr "这个送货方式会在基于送货单开发票的时候使用。"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -372,12 +377,12 @@ msgstr "开始邮编"
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+msgstr "如果你计划按装运按装箱开发票请输入此字段。"
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr "运输业务伙伴"
+msgstr "承运业务伙伴"
 
 #. module: delivery
 #: view:res.partner:0
@@ -392,18 +397,18 @@ msgstr "<="
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "必须为此产品赋予一个生产批次"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr ""
+msgstr "创建送货单"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
 #: view:sale.order:0
 msgid "Delivery Costs"
-msgstr "交货成本"
+msgstr "送货成本"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -414,7 +419,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
@@ -427,12 +432,12 @@ msgstr "价格"
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr ""
+msgstr "没有送货网络适用于此承运方"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr "交货"
+msgstr "送货"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -449,7 +454,7 @@ msgstr "="
 #: code:addons/delivery/stock.py:99
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr ""
+msgstr "承运方 %s (id: %d) 没有送货网络！"
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
@@ -464,12 +469,12 @@ msgstr "名称"
 #: report:sale.shipping:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "运输公司"
+msgstr "承运方"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Apply"
-msgstr ""
+msgstr "应用(_A)"
 
 #. module: delivery
 #: field:sale.order,id:0
@@ -481,17 +486,17 @@ msgstr "ID"
 #: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
-msgstr ""
+msgstr "只能对草稿状态的订单增加送货明细"
 
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr "运输公司和交货"
+msgstr "承运方和送货"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr "交货表格"
+msgstr "送货网络"
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index 4104ecc8b21..59a37fa9e20 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-28 03:29+0000\n"
+"PO-Revision-Date: 2011-09-27 10:27+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr "單號參照"
+msgstr "訂單參考"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -67,7 +67,7 @@ msgstr "體積"
 #. module: delivery
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr "交貨參照不能重覆！"
+msgstr "訂單參考不能重覆！"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -82,17 +82,17 @@ msgstr "交貨單"
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr ""
+msgstr "交貨性質"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-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.grid:0
@@ -103,12 +103,12 @@ msgstr "國家"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr "交貨單："
+msgstr "交貨單 :"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
 msgid "Variable Factor"
-msgstr ""
+msgstr "可變因子"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -132,7 +132,7 @@ msgstr "固定"
 #: field:res.partner,property_delivery_carrier:0
 #: field:sale.order,carrier_id:0
 msgid "Delivery Method"
-msgstr "交貨方式"
+msgstr "交貨方法"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
@@ -143,12 +143,12 @@ msgstr "庫存調動"
 #: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No line matched this order in the choosed delivery grids !"
-msgstr ""
+msgstr "選擇的交貨格無一行符合此訂單 !"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr "運輸公司追蹤編號"
+msgstr "運輸公司追蹤參考"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
@@ -172,7 +172,7 @@ msgstr "警告"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr ""
+msgstr "格線定義"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -197,12 +197,12 @@ msgstr "銷貨單"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr ""
+msgstr "交貨格線"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Invoiced to"
-msgstr "發票交至"
+msgstr "發票開立對象:"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
@@ -212,7 +212,7 @@ msgstr "提貨清單"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
 msgid "Make Delievery"
-msgstr ""
+msgstr "進行交貨"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -228,12 +228,12 @@ msgstr ""
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr ""
+msgstr "格線"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr ""
+msgstr "網格"
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -245,17 +245,17 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr ""
+msgstr "至郵遞區號"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr "單子日期"
+msgstr "訂單日期"
 
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr ""
+msgstr "網格名稱"
 
 #. module: delivery
 #: view:stock.move:0
@@ -287,7 +287,7 @@ msgstr ""
 #: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "無可用網格 !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -299,7 +299,7 @@ msgstr ""
 #: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "Order not in draft state !"
-msgstr ""
+msgstr "訂單不在草稿階段 !"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -314,7 +314,7 @@ 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
@@ -325,7 +325,7 @@ msgstr "活躍"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "貨運日期"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
@@ -382,7 +382,7 @@ msgstr "運輸公司伙伴"
 #. module: delivery
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "銷售&採購"
+msgstr "銷售 及 購貨"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -392,12 +392,12 @@ msgstr ""
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "須為此產品分配生產批次"
+msgstr "須為此產品指定生產批次"
 
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr ""
+msgstr "進行交貨"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
@@ -481,7 +481,7 @@ msgstr ""
 #: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
-msgstr ""
+msgstr "訂單狀態要是草稿才能添加交貨明細。"
 
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
@@ -491,12 +491,12 @@ msgstr "運輸公司與交貨"
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr ""
+msgstr "交貨網格"
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "次序"
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
@@ -507,7 +507,7 @@ msgstr "銷售價"
 #: view:delivery.grid:0
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr ""
+msgstr "狀態"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 05074268220..abc49c1cc92 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -118,16 +118,20 @@ class stock_picking(osv.osv):
                 account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
                 taxes_ids = self.pool.get('account.fiscal.position').map_tax(cursor, user, partner.property_account_position, taxes)
 
-            invoice_line_obj.create(cursor, user, {
-                'name': picking.carrier_id.name,
-                'invoice_id': invoice.id,
-                'uos_id': picking.carrier_id.product_id.uos_id.id,
-                'product_id': picking.carrier_id.product_id.id,
-                'account_id': account_id,
-                'price_unit': price,
-                'quantity': 1,
-                'invoice_line_tax_id': [(6, 0,taxes_ids)],
-            })
+            if any(inv_line.product_id.id == picking.carrier_id.product_id.id for inv_line in invoice.invoice_line):
+                continue
+            else:
+                invoice_line_obj.create(cursor, user, {
+                    'name': picking.carrier_id.name,
+                    'invoice_id': invoice.id,
+                    'uos_id': picking.carrier_id.product_id.uos_id.id,
+                    'product_id': picking.carrier_id.product_id.id,
+                    'account_id': account_id,
+                    'price_unit': price,
+                    'quantity': 1,
+                    'invoice_line_tax_id': [(6, 0,taxes_ids)],
+                })
+            invoice_obj.button_compute(cursor, user, [invoice.id], context=context)
         return result
 
 stock_picking()
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index c98daa4eaaf..6b9cbd21f48 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Integrated Document Management System',
     'version': '2.1',
-    'category': 'Tools',
-    'category': 'Generic Modules/Others',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 This is a complete document management system.
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 8d80b4a1497..471b2966be5 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -7,30 +7,25 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <hpaned position="100">
-                        <child1>
-                            <action
-                                string="New Files"
+                     <board style="1-1" >
+                        <column>
+                            <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
-                            <action
-                                string="File Size by Month"
+                            <action string="File Size by Month"
                                 name="%(document.action_view_size_month)d"
                                 view_mode="graph,tree"/>
-                        </child1>
-                        <child2>
-                            <action
-                                string="Files by Resource Type"
+                        </column>
+                        <column>
+                            <action string="Files by Resource Type"
                                 name="%(document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"
-                                />
+                                view_mode="graph,tree"/>
 
-                            <action
-                                string="Files by Partner"
+                            <action string="Files by Partner"
                                 name="%(document.action_view_files_by_partner)d"
                                 view_mode="graph,tree"/>
-                        </child2>
-                     </hpaned>
+                        </column>
+                     </board>
                  </form>
              </field>
          </record>
@@ -70,26 +65,23 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <hpaned position="100">
-                        <child1>
-                            <action
-                                string="Wall of Shame"
+                     <board style="1-1">
+                        <column>
+                            <action string="Wall of Shame"
                                 name="%(document.action_view_wall)d"
                                 view_mode="tree"/>
 
-                        </child1>
-                        <child2>
-                            <action
-                                string="Files by Users"
+                        </column>
+                        <column>
+                            <action string="Files by Users"
                                 name="%(document.action_view_user_graph)d"
                                 view_mode="graph,tree"/>
 
-                            <action
-                                string="Files by Month"
+                            <action string="Files by Month"
                                 name="%(document.action_view_files_by_month_graph)d"
                                 view_mode="graph,tree"/>
-                        </child2>
-                     </hpaned>
+                        </column>
+                     </board>
                  </form>
             </field>
         </record>
diff --git a/addons/document/dict_tools.py b/addons/document/dict_tools.py
index 10d2fdc69f3..e117b429f83 100644
--- a/addons/document/dict_tools.py
+++ b/addons/document/dict_tools.py
@@ -55,3 +55,5 @@ def dict_filter(srcdic, keys, res=None):
     return res
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index e690e50d4b4..5b8ec3ddd93 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -120,4 +120,5 @@ class document_directory_content(osv.osv):
         return pdf
 document_directory_content()
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 2726fcd5462..202725a1d3f 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -60,3 +60,5 @@ class ir_action_report_xml(osv.osv):
     }
 
 ir_action_report_xml()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document.py b/addons/document/document.py
index 69e123b87eb..1bf177f50e6 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -64,7 +64,7 @@ class document_file(osv.osv):
                     "SET parent_id = %s, db_datas = decode(encode(db_datas,'escape'), 'base64') " \
                     "WHERE parent_id IS NULL", (parent_id,))
 
-        cr.execute("UPDATE ir_attachment SET file_size=length(db_datas) WHERE file_size = 0;")
+        cr.execute("UPDATE ir_attachment SET file_size=length(db_datas) WHERE file_size = 0 and type = 'binary'")
 
         cr.execute("ALTER TABLE ir_attachment ALTER parent_id SET NOT NULL")
 
@@ -252,7 +252,7 @@ class document_file(osv.osv):
             ids = ids2
         if 'file_size' in vals: # only write that field using direct SQL calls
             del vals['file_size']
-        if len(ids) and len(vals):
+        if ids and vals:
             result = super(document_file,self).write(cr, uid, ids, vals, context=context)
         cr.commit() # ?
         return result
@@ -349,3 +349,5 @@ class document_file(osv.osv):
 
 document_file()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 2a3f54f53ba..d09d2cc86d5 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -307,3 +307,5 @@ class document_directory_node(osv.osv):
         'directory_id':  fields.many2one('document.directory', 'Document directory', ondelete="set null"),
     }
 document_directory_node()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index b61b7fd65fc..fe757e7876d 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -786,3 +786,5 @@ document_storage()
 
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 7564dfc938e..05e49ae89ad 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -372,7 +372,6 @@
         <field name="model" eval="'document.directory'"/>
         <field name="name">Browse Files</field>
         <field name="value" eval="'ir.actions.act_window,%d'%action_document_file_directory_form"/>
-        <field name="object" eval="True"/>
     </record>
 
     <record model="ir.ui.view" id="view_attachment_form_inherit">
@@ -414,6 +413,7 @@
     </record>
 
     <act_window domain="[('partner_id', '=', active_id)]"
+        context="{'default_partner_id': active_id}"
         id="act_res_partner_document" name="Related Documents"
         res_model="ir.attachment"
         src_model="res.partner"
@@ -421,6 +421,7 @@
 
     <act_window
         domain="[('parent_id', '=', active_id)]"
+        context="{'default_parent_id': active_id}"
     	id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"
         src_model="document.directory"/>
diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po
index de42c215890..348c0a556b8 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr "دليل الوثيقة"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -989,8 +989,8 @@ msgid "Content Name"
 msgstr "أسم المحتوي"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "أسم الملف يجب أن يكون فريدا"
diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po
index 980adb056c4..94ffe65b2e4 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -236,8 +236,8 @@ msgid "Document directory"
 msgstr "Директория с документи"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -982,8 +982,8 @@ msgid "Content Name"
 msgstr "Име за връзка"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Името на файла трябва да е уникално"
@@ -1042,6 +1042,3 @@ msgstr "Тип на документа"
 #~ msgstr ""
 #~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 #~ "символи!"
-
-#~ msgid "All Months"
-#~ msgstr "Всички месеци"
diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po
index 717533c5452..f39b41a6f87 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po
index 910246d1cc4..57f565ab1e3 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -242,8 +242,8 @@ msgid "Document directory"
 msgstr "Directori document"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1035,8 +1035,8 @@ msgid "Content Name"
 msgstr "Nom contingut"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "El nom de fitxer ha de ser únic!"
@@ -1221,30 +1221,3 @@ msgstr "Tipus de document"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#~ msgid "Files Per Month"
-#~ msgstr "Fitxers per mes"
-
-#~ msgid "All Months"
-#~ msgstr "Tots els mesos"
-
-#~ msgid "My files"
-#~ msgstr "Els meus fitxers"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Els meus fitxers (tots els mesos)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Últim nom de fitxer afegit"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Els meus fitxers (aquest mes)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Informes - Gestió documental"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Fitxers de tots els usuaris (tots els mesos)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Tots els fitxers dels usuaris (aquest mes)"
diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po
index 8c5bff0aa68..e7122c568e1 100644
--- a/addons/document/i18n/cs.po
+++ b/addons/document/i18n/cs.po
@@ -4,47 +4,48 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"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: 2010-08-02 14:37+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-05 17:16+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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Directory"
-msgstr ""
+msgstr "Nadřazená složka"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Auto Directory Configuration"
-msgstr ""
+msgstr "Automatická konfigurace adresářů"
 
 #. module: document
 #: field:document.directory,resource_field:0
 msgid "Name field"
-msgstr ""
+msgstr "Pole názvu"
 
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "Nástěnka dokumentů"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
 msgid "Process Node"
-msgstr ""
+msgstr "Uzel procesu"
 
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr ""
+msgstr "Hledat adresář dokumentů"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -52,18 +53,20 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Pole, které se má použít pro název adresářů. Pokud ho necháte prázdné, "
+"použije se pole \"název\" (name)."
 
 #. module: document
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "Directory name contains special characters!"
-msgstr ""
+msgstr "Název adresáře obsahuje nepovolené znaky!"
 
 #. module: document
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -73,7 +76,7 @@ msgstr "Typ obsahu adresáře"
 #. module: document
 #: view:document.directory:0
 msgid "Resources"
-msgstr ""
+msgstr "Zdroje"
 
 #. module: document
 #: field:document.directory,file_ids:0
@@ -84,24 +87,24 @@ msgstr "Soubory"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "Souborů za měsíc"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "název"
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Společnost"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -111,12 +114,12 @@ msgstr "Obsah adresáře"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Dynamický kontext"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
 msgid "Document Management"
-msgstr ""
+msgstr "Správa dokumentů"
 
 #. module: document
 #: help:document.directory.dctx,expr:0
@@ -125,29 +128,32 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"Výraz Pythonu použitý pro vyhodnocení pole.\n"
+"Můžete použití 'dir_id' pro aktuální adresář, 'res_id', 'res_model' jako "
+"odkaz na aktuální záznam, v dynamických složkách"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Letos"
 
 #. module: document
 #: field:document.storage,path:0
 msgid "Path"
-msgstr ""
+msgstr "Cesta"
 
 #. module: document
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #, python-format
 msgid "Directory name must be unique!"
-msgstr ""
+msgstr "Název adresáře musí být unikátní!"
 
 #. module: document
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr ""
+msgstr "Indexovaný obsah"
 
 #. module: document
 #: help:document.directory,resource_find_all:0
@@ -155,6 +161,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Pokud je pravda, všechny přílohy odpovídající tomuto zdroji budou vyhledány. "
+"Pokud je nepravda, pouze ty, které mají tohoto jako rodiče."
 
 #. module: document
 #: view:document.directory:0
@@ -162,91 +170,91 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
-msgstr ""
+msgstr "Adresáře"
 
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Prodejní objednávka"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Detaily souborů podle uživatelů"
 
 #. module: document
 #: field:document.configuration,project:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
 #: code:addons/document/document_storage.py:601
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Chyba!"
 
 #. module: document
 #: help:document.configuration,product:0
 msgid "Auto directory configuration for Products."
-msgstr ""
+msgstr "Automatická konfigurace adresářů pro výrobky"
 
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "Hledat všechny zdroje"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "Složky podle zdroje"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "Přípona"
 
 #. module: document
 #: field:report.document.user,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Datum změny"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Nastavení aplikace znalostí"
 
 #. module: document
 #: view:ir.attachment:0
 #: field:ir.attachment,partner_id:0
 #: field:report.files.partner,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr ""
+msgstr "Soubory podle uživatelů"
 
 #. module: document
 #: field:process.node,directory_id:0
 msgid "Document directory"
-msgstr ""
+msgstr "Adresář s dokumenty"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "Chyba kontroly"
 
 #. 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
@@ -254,23 +262,23 @@ msgstr ""
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr ""
+msgstr "Dokumenty"
 
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Chyba! Nemůžete vytvářet rekurzivní adresáře."
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "Úložiště"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Nastavení adresáře zdrojů"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -284,7 +292,7 @@ msgstr "Velikost souboru"
 #: field:document.directory.content.type,name:0
 #: field:ir.attachment,file_type:0
 msgid "Content Type"
-msgstr ""
+msgstr "Typ obsahu"
 
 #. module: document
 #: view:document.directory:0
@@ -299,33 +307,35 @@ msgstr "Typ"
 msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
-msgstr ""
+msgstr "Vyberte zde objekt a bude jedna složka na záznam pro tento zdroj."
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
+"Použijte doménu, pokud chcete použít automatické filtrování na viditelných "
+"zdrojích."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "Soubory podle partnerů"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "Pole obsahu"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr "Skladované jméno souboru"
+msgstr "Uložené jméno souboru"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
-msgstr ""
+msgstr "Model zdroje"
 
 #. module: document
 #: view:document.directory:0
@@ -342,44 +352,44 @@ msgstr "Report"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
 #. module: document
 #: 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 "Nástěnka dokument"
 
 #. module: document
 #: field:document.directory.content.type,code:0
 msgid "Extension"
-msgstr "Koncovka"
+msgstr "Přípona"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Vytvořeno"
 
 #. module: document
 #: field:document.directory,content_ids:0
 msgid "Virtual Files"
-msgstr ""
+msgstr "Virtuální soubory"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "Změněno"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "Chyba při zápisu dokumentu!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "Generované soubory"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -390,85 +400,85 @@ msgstr ""
 #: model:ir.model,name:document.model_document_directory
 #: field:report.document.user,directory:0
 msgid "Directory"
-msgstr ""
+msgstr "Adresář"
 
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr ""
+msgstr "Soubory podle partnerů"
 
 #. module: document
 #: field:document.directory,write_uid:0
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "Poslední upravující uživatel"
+msgstr "Naposledy upraveno uživatelem"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr ""
+msgstr "Související dokumenty"
 
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Průběh nastavení"
 
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Doména"
 
 #. module: document
 #: field:document.directory,write_date:0
 #: field:document.storage,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Datum změny"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Detaily souborů podle adresářů"
 
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr ""
+msgstr "Soubory všech uživatelů"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Velikost souborů podle měsíců"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obrázek"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Static Directory"
-msgstr ""
+msgstr "Statický adresář"
 
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Potomci"
 
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "Definuje slova v kontextu, pro všechny podřízené adresáře a soubory"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -490,12 +500,28 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
+"Toto je kompletní systém pro správu dokumentů:\n"
+"    * Autentizace uživatelů\n"
+"    * Indexování dokumentů :- soubory .pptx a .docx nejsou podporovány na "
+"platformě windows.\n"
+"    * Nástěnka pro dokumenty zahrnuje:\n"
+"        * Nové soubory (seznam)\n"
+"        * Soubory podle typu zdroje (graf)\n"
+"        * Soubory podle partnera (graf)\n"
+"        * Soubory podle měsíce (graf)\n"
+"    POZOR:\n"
+"    - Když instalujete tento modul do běžící společnosti, která již má "
+"soubory PDF uložené v databázi,\n"
+"      všechny je ztratíte.\n"
+"    - Po instalaci tohoto modulu dále nejsou PDF uchovány v databázi,\n"
+"      ale na serveru v adresáři jako /server/bin/filestore.\n"
 
 #. module: document
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
+"Pokud není zaškrtnuto, médium je aktuálně offline a jeho obsahu nedostupný"
 
 #. module: document
 #: view:document.directory:0
@@ -506,17 +532,17 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Vlastník"
 
 #. module: document
 #: view:document.directory:0
 msgid "PDF Report"
-msgstr ""
+msgstr "PDF výkaz"
 
 #. module: document
 #: view:document.directory:0
 msgid "Contents"
-msgstr ""
+msgstr "Obsah"
 
 #. module: document
 #: field:document.directory,create_date:0
@@ -532,16 +558,19 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Zaškrtněte toto pole, pokud chcete, aby toto jméno souboru obsahovalo jméno "
+"záznamu.\n"
+"Pokud je nastavení, adresář bude jako zdroje."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr ""
+msgstr "Automatická konfigurace adresáře"
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr "Obsažené jméno záznamu"
+msgstr "Začlenit název záznamu"
 
 #. module: document
 #: view:ir.attachment:0
@@ -556,7 +585,7 @@ msgstr "ID modulu"
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -564,11 +593,13 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Zaškrtněte toto, pokud chcete použít stejnou stromovou strukturu jako "
+"objektu vybraného v systému."
 
 #. module: document
 #: view:document.directory:0
 msgid "Security"
-msgstr ""
+msgstr "Zabezpečení"
 
 #. module: document
 #: help:document.directory,ressource_id:0
@@ -576,29 +607,31 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Stejně s Nadřazeným modelem, toto ID připojí tuto složku k určitému záznamu "
+"Nadřazeného modelu."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Adresář nebůže být nadřazen sám sobě!"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
 #. module: document
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Uživatel"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -609,19 +642,19 @@ msgstr "Skupiny"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivní"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: document
 #: view:ir.attachment:0
 #: field:ir.attachment,db_datas:0
 msgid "Data"
-msgstr ""
+msgstr "Data"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
@@ -631,22 +664,26 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Pokud sem dáte objekt, tato šablona adresáře se objeví dole pod všemi těmito "
+"objekty. Takové adresáře jsou \"přiloženy\" ke určitému modelu nebo záznamu, "
+"právě jako přílohy. Nedávejte sem nadřazený adresář, pokud vybíráte "
+"nadřazený model."
 
 #. module: document
 #: view:document.directory:0
 msgid "Definition"
-msgstr "Výklad"
+msgstr "Definice"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Poř."
 
 #. module: document
 #: selection:document.storage,type:0
@@ -656,91 +693,91 @@ msgstr "Databáze"
 #. module: document
 #: help:document.configuration,project:0
 msgid "Auto directory configuration for Projects."
-msgstr ""
+msgstr "Automatická konfigurace adresářů pro projekty."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "Souvisí s"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr ""
+msgstr "Integrovaný systém správy dokumentů"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr ""
+msgstr "Vyberte následující zdroj pro automatické nastavení adresáře."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr ""
+msgstr "Připojeno k"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "Nástěnka"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "Soubory podle uživatelů"
 
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "Pouze ke čtení"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Výraz"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Jméno adresáře musí být unikátní!"
 
 #. module: document
 #: field:document.directory,create_uid:0
 #: field:document.storage,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Tvůrce"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Soubory podle měsíců"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "Září"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Předpona"
 
 #. module: document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr ""
+msgstr "Čas posledního odeslání"
 
 #. module: document
 #: field:report.document.user,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Název souboru"
 
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -750,34 +787,34 @@ msgstr "ID zdroje"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Externí úložiště souborů"
 
 #. 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 "Zeď hanby"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Pro úložiště souborů - kořenový adresář"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Detaily souborů podle partnerů"
 
 #. module: document
 #: field:document.directory.dctx,field:0
 msgid "Field"
-msgstr ""
+msgstr "Pole"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Dynamický kontext adresáře"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
@@ -787,7 +824,7 @@ msgstr "Nadřazený model"
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "Soubory podle uživatelů"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -796,17 +833,17 @@ msgstr ""
 #: field:report.document.wall,name:0
 #: field:report.files.partner,month:0
 msgid "Month"
-msgstr ""
+msgstr "Měsíc"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Vykazování"
 
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "Výrobek"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -817,17 +854,17 @@ msgstr "Stromová struktura"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr ""
+msgstr "Soubory všech uživatelů"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Uživatelé, kteří měsíc neuložili žádný soubor"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -835,37 +872,40 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
+"Úložiště Documents vám umožňuje přístup ke všem přílohám, jako jsou maily, "
+"projektové dokumenty, faktury atd."
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
 msgstr ""
+"Pro každý zdejší záznam se v tomto adresáři objeví virtuální soubory."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Nové soubory"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "Statický"
 
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr ""
+msgstr "Soubory podle partnerů"
 
 #. module: document
 #: help:document.directory.dctx,field:0
@@ -873,11 +913,13 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"Název pole. Mějte na paměti, že před to, co sem napíšete, bude vložena "
+"předpona \"dctx_\"."
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Month"
-msgstr ""
+msgstr "Tento měsíc"
 
 #. module: document
 #: view:ir.attachment:0
@@ -888,7 +930,7 @@ msgstr "Poznámky"
 #: help:document.configuration,sale_order:0
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
-msgstr ""
+msgstr "Automatická konfigurace adresářů pro objednávky a nabídky."
 
 #. module: document
 #: help:document.directory,type:0
@@ -899,52 +941,57 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Každý adresář může být buď typu Statický, nebo být propojen s nějakým "
+"zdrojem. Statický adresář, jako v operačních systémech, je klasický adresář, "
+"který může obsahovat množinu souborů. Adresáře propojené se systémovými "
+"zdroji automaticky obsahují podadresáře pro každý objekt typu definovaného v "
+"nadřazeném adresáři."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
 #. module: document
 #: 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 "Statistika podle uživatelů"
 
 #. module: document
 #: field:document.directory,name:0
 #: field:document.storage,name:0
 msgid "Name"
-msgstr ""
+msgstr "Název"
 
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "Cesta úložiště musí být unikátní!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Pole"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Pokud je toto nastaveno, médium je jen pro čtení"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
 #. module: document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "Počet souborů"
 
 #. module: document
 #: view:document.directory:0
@@ -952,6 +999,7 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
+"Přístup k tomuto adresáři a souborům v něm mají pouze členové těchto skupin."
 
 #. module: document
 #: view:document.directory:0
@@ -959,74 +1007,76 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Tyto skupiny se ale nevztahují k podřízeným adresářům, které musí mít "
+"definovány vlastní skupiny."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "MIME typ"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Pořadí"
 
 #. module: document
 #: field:document.directory.content,name:0
 msgid "Content Name"
-msgstr ""
+msgstr "Název obsahu"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
-msgstr ""
+msgstr "Název souboru musí být unikátní!"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Interní úložiště souborů"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Adresář musí mít rodiče nebo úložiště"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr ""
+msgstr "Struktura adresářů"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Soubory podle typu zdroje"
 
 #. module: document
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: document
 #: view:document.storage:0
 #: model:ir.model,name:document.model_document_storage
 #: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
-msgstr ""
+msgstr "Úložné zařízení"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Hledej v úložišti dokumentů"
 
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr ""
+msgstr "Typ dokumentu"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index b6fd01a4a08..a74ba62c700 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -242,8 +242,8 @@ msgid "Document directory"
 msgstr "Dokumentenverzeichnis"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1037,8 +1037,8 @@ msgid "Content Name"
 msgstr "Inhaltsbezeichnung"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Datei muss eindeutig benannt sein!"
@@ -1221,52 +1221,5 @@ msgstr "Dokumententyp"
 #~ msgid "Auto Configure"
 #~ msgstr "Konfiguriere Automatisch"
 
-#~ msgid "Files Per Month"
-#~ msgstr "Dokumente pro Monat"
-
-#~ msgid "All Months"
-#~ msgstr "Alle Monate"
-
-#~ msgid "My files"
-#~ msgstr "Meine Dokumente"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Meine Dokumente (Alle Monate)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Letztes Dokument"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Meine Dokumente (Aktueller Monat)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Dokumenten Verwaltung - Berichte"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Alle Benutzer Dokumente (Alle Monate)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Alle Benutzer Dokumente (Aktueller Monat)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index d12431d8094..1115028aa83 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr "Φάκελος Εγγράφου"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -981,8 +981,8 @@ msgid "Content Name"
 msgstr "Όνομα Περιεχόμενου"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Το όνομα Αρχείου πρέπει να είναι μοναδικό!"
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index a6476e061c2..f16edf97e33 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -243,8 +243,8 @@ msgid "Document directory"
 msgstr "Directorio documento"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1035,8 +1035,8 @@ msgid "Content Name"
 msgstr "Nombre contenido"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "¡El nombre de archivo debe ser único!"
@@ -1221,30 +1221,3 @@ msgstr "Tipo de documento"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Files Per Month"
-#~ msgstr "Archivos por mes"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "My files"
-#~ msgstr "Mis archivos"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Mis archivos (todos los meses)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Último nombre de archivo añadido"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Mis archivos (este mes)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Informes - Gestión documental"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Archivos de todos los usuarios (todos los meses)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Todos los archivos de los usuarios (este mes)"
diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po
index 5826b0921e9..e27bdf2544b 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr "Directorio del documento"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -979,8 +979,8 @@ msgid "Content Name"
 msgstr "Nombre de contenido"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/es_EC.po b/addons/document/i18n/es_EC.po
index d2958f56f0d..cc9870fce79 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr "Directorio documento"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -981,8 +981,8 @@ msgid "Content Name"
 msgstr "Nombre contenido"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
@@ -1167,30 +1167,3 @@ msgstr "Tipo de documento"
 
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Archivos por mes"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "My files"
-#~ msgstr "Mis archivos"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Mis archivos (todos los meses)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Último nombre de archivo añadido"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Mis archivos (este mes)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Informes - Gestión documental"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Archivos de todos los usuarios (todos los meses)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Todos los archivos de los usuarios (este mes)"
diff --git a/addons/document/i18n/es_MX.po b/addons/document/i18n/es_MX.po
new file mode 100644
index 00000000000..196b726b8ad
--- /dev/null
+++ b/addons/document/i18n/es_MX.po
@@ -0,0 +1,1223 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* document
+#
+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-13 22:59+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:41+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr "Directorio padre"
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Auto Directory Configuration"
+msgstr "Configuración automática de directorios"
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr "Campo nombre"
+
+#. module: document
+#: view:board.board:0
+msgid "Document board"
+msgstr "Tablero de documentos"
+
+#. module: document
+#: model:ir.model,name:document.model_process_node
+msgid "Process Node"
+msgstr "Nodo proceso"
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr "Buscar directorio de documentos"
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+"Campo a usar como nombre de los directorios de recursos. Si está vacío se "
+"usará el campo \"nombre\"."
+
+#. module: document
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr "¡El nombre del directorio contiene caracteres especiales!"
+
+#. module: document
+#: view:document.directory:0
+#: view:document.storage:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contenido del directorio"
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr "Archivos"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: document
+#: view:document.configuration:0
+msgid "title"
+msgstr "título"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Contenido directorio"
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr "Documentos"
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"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"
+msgstr ""
+"Expresión Python utilizada para evaluar el campo.\n"
+"Puede utilizar 'dir_id' para el directorio actual, 'res_id', 'res_model' "
+"como referencia al registro actual en directorios dinámicos."
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: document
+#: field:document.storage,path:0
+msgid "Path"
+msgstr "Ruta"
+
+#. module: document
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#, python-format
+msgid "Directory name must be unique!"
+msgstr "¡El nombre del directorio debe ser único!"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "Contenido indexado"
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+msgstr ""
+"Si está marcada, se encontrarán todos los archivos adjuntos que coincidan "
+"con este recurso. Si está desmarcada, sólo se encontrarán aquellos que "
+"tengan este padre."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.storage,dir_ids:0
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "Directorios"
+
+#. module: document
+#: field:document.configuration,sale_order:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Archivos detallados por usuarios"
+
+#. module: document
+#: field:document.configuration,project:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: document
+#: code:addons/document/document_storage.py:573
+#: code:addons/document/document_storage.py:601
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: document
+#: help:document.configuration,product:0
+msgid "Auto directory configuration for Products."
+msgstr "Configuración automática de los directorios para productos."
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr "Encontrar todos los recursos"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr "Directorios por recurso"
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Sufijo"
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr "Fecha de modificación"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Configuración aplicación del conocimiento"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+#: field:report.files.partner,partner:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "Directorio documento"
+
+#. module: document
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "ValidateError"
+msgstr "Error de validación"
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr "Documentos"
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "¡Error! No puede crear directorios recursivos."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,storage_id:0
+msgid "Storage"
+msgstr "Almacenamiento"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Configure Resource Directory"
+msgstr "Configurar directorio de recursos"
+
+#. module: document
+#: field:ir.attachment,file_size:0
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+#: field:report.files.partner,file_size:0
+msgid "File Size"
+msgstr "Tamaño del archivo"
+
+#. module: document
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "Tipo de contenido"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+#: view:document.storage:0
+#: field:document.storage,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and there will be one folder per record of that "
+"resource."
+msgstr ""
+"Seleccione aquí un objeto y habrá un directorio por cada registro de ese "
+"recurso."
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+"Use un dominio si desea aplicar un filtro automático en los recursos "
+"visibles."
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Partner"
+msgstr "Archivos por empresa"
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr "Campos de contexto"
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr "Nombre del archivo guardado"
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr "Modelo de recurso"
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr "Tipo de directorio"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: document
+#: 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 "Tablero de documentos"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Extensión"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Created"
+msgstr "Creado"
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Archivos virtuales"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modified"
+msgstr "Modificado"
+
+#. module: document
+#: code:addons/document/document_storage.py:639
+#, python-format
+msgid "Error at doc write!"
+msgstr "¡Error de escritura en el documento!"
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr "Archivos generados"
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr "Archivos por empresa"
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:document.storage,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "Usuario de la última modificación"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr "Documentos relacionados"
+
+#. module: document
+#: field:document.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:document.storage,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "Fecha de modificación"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Archivos detallados por directorio"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr "Archivos de todos los usuarios"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Tamaño de archivo por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: document
+#: field:document.configuration,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr "Directorio estático"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "Hijos"
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+"Define palabras en el contexto para todos los directorios y archivos hijos"
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"    * User Authentication\n"
+"    * Document Indexation :- .pptx and .docx files are not support in "
+"windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files by Month (graph)\n"
+"    ATTENTION:\n"
+"    - When you install this module in a running company that have already "
+"PDF files stored into the database,\n"
+"      you will lose them all.\n"
+"    - After installing this module PDF's are no longer stored into the "
+"database,\n"
+"      but in the servers rootpad like /server/bin/filestore.\n"
+msgstr ""
+"Este es un completo gestor de documentos:\n"
+"    * Autenticación de usuario\n"
+"    * Indexación de documentos. Los documentos .pptx y .docx no están "
+"soportados bajo windows.\n"
+"    * Tablero de documentos que incluye:\n"
+"        * Nuevos archivos (lista)\n"
+"        * Archivos por tipo de recurso (gráfico)\n"
+"        * Archivos por empresa (gráfico)\n"
+"        * Archivos por mes (gráfico)\n"
+"    ATENCIÓN:\n"
+"    - Cuando instale este módulo en una compañía en producción que ya tenga "
+"ficheros PDF guardados en la base de datos,\n"
+"      los perderá todos.\n"
+"    - Tras instalar este módulo, los ficheros PDF ya no se guardarán en la "
+"base de datos,\n"
+"      sino en el directorio raíz del servidor como /server/bin/filestore.\n"
+
+#. module: document
+#: help:document.storage,online:0
+msgid ""
+"If not checked, media is currently offline and its contents not available"
+msgstr ""
+"Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
+"su contenido no está disponible."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: field:document.storage,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+#: field:report.document.wall,user_id:0
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "Informe PDF"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "Contenidos"
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:document.storage,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr "Fecha de creación"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+"Marque este campo si desea que el nombre del archivo contenga el nombre del "
+"registro.\n"
+"Si está marcado, el directorio tiene que ser un recurso."
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Auto Configure Directory"
+msgstr "Configuración automática de directorios"
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "Incluir nombre de registro"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "Adjunto"
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "ID modelo"
+
+#. module: document
+#: field:document.storage,online:0
+msgid "Online"
+msgstr "En línea"
+
+#. 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 ""
+"Marque esta opción si desea utilizar la misma estructura de árbol como el "
+"objeto seleccionado en el sistema."
+
+#. module: document
+#: view:document.directory:0
+msgid "Security"
+msgstr "Seguridad"
+
+#. 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 ""
+"Junto con el modelo padre, este ID adjunta este directorio a un registro "
+"específico del modelo padre."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "¡El directorio no puede ser su propio padre!"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: document
+#: field:report.document.user,user:0
+#: field:report.document.wall,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:document.storage,group_ids:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,db_datas:0
+msgid "Data"
+msgstr "Datos"
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Such directories are \"attached\" to the specific model or "
+"record, just like attachments. Don't put a parent directory if you select a "
+"parent model."
+msgstr ""
+"Si aquí introduce un objeto, esta plantilla de directorio aparecerá en todos "
+"estos objetos. Dichos directorios son \"adjuntados\" al modelo o registro, "
+"como adjuntos. No ponga un directorio padre si selecciona un modelo padre."
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: document
+#: help:document.configuration,project:0
+msgid "Auto directory configuration for Projects."
+msgstr "Configuración automática de directorios para proyectos."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Related to"
+msgstr "Relacionado con"
+
+#. module: document
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr "Sistema de gestión integrada de documentos"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Choose the following Resouces to auto directory configuration."
+msgstr ""
+"Seleccione los siguientes recursos para configurar directorios automáticos."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "Adjuntado a"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reports_document
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: field:document.storage,readonly:0
+msgid "Read Only"
+msgstr "Sólo lectura"
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "¡El nombre de directorio debe ser único!"
+
+#. module: document
+#: field:document.directory,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Creator"
+msgstr "Autor"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Hora del último archivo añadido"
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr "Nombre del archivo"
+
+#. module: document
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID recurso"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "External file storage"
+msgstr "Almacenamiento externo"
+
+#. 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 "Muro de la vergüenza"
+
+#. module: document
+#: help:document.storage,path:0
+msgid "For file storage, the root path of the storage"
+msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Archivos detallados por empresas"
+
+#. module: document
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr "Contexto dinámico de directorio"
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Modelo padre"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+#: field:report.document.wall,month:0
+#: field:report.document.wall,name:0
+#: field:report.files.partner,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reporting
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: document
+#: field:document.configuration,product:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura árbol"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Usuarios que no han insertado documentos desde hace un mes"
+
+#. 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 ""
+"El repositorio de documentación le da acceso a todos los adjuntos tales como "
+"correos, proyectos, facturas, etc."
+
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr ""
+"Para cada entrada, los archivos virtuales aparecerán en este directorio."
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
+#. module: document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Nuevos archivos"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Archivos por empresa"
+
+#. 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 ""
+"El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
+"antepondrá a lo que escriba aquí."
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: document
+#: help:document.configuration,sale_order:0
+msgid ""
+"Auto directory configuration for Sale Orders and Quotation with report."
+msgstr ""
+"Configuración automática de directorios para presupuestos y pedidos de venta "
+"con informes."
+
+#. module: document
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
+"Cada directorio puede ser de tipo estático o ser asociado a otro recurso. Un "
+"directorio estático, como en los sistemas operativos, es el clásico "
+"directorio que puede contener un conjunto de archivos. Los directorios "
+"asociados a recursos del sistema automáticamente poseen subdirectorios para "
+"cada recurso definido en el directorio padre."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: document
+#: 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 "Estadísticas por usuario"
+
+#. module: document
+#: field:document.directory,name:0
+#: field:document.storage,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document
+#: sql_constraint:document.storage:0
+msgid "The storage path must be unique!"
+msgstr "¡La ruta de almacenamiento debe ser única!"
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: document
+#: help:document.storage,readonly:0
+msgid "If set, media is for reading only"
+msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: document
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Núm. de archivos"
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
+"Sólo los miembros de estos grupos tendrán acceso a este directorio y a sus "
+"archivos."
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr ""
+"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
+"deben definir sus propios grupos."
+
+#. module: document
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr "Tipo mime"
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Nombre contenido"
+
+#. module: document
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
+#, python-format
+msgid "File name must be unique!"
+msgstr "¡El nombre de archivo debe ser único!"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Internal File storage"
+msgstr "Almacenamiento interno"
+
+#. module: document
+#: 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: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr "Estructura de directorios"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Archivos por tipo de registro"
+
+#. module: document
+#: field:report.document.user,name:0
+#: field:report.files.partner,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: document
+#: view:document.storage:0
+#: model:ir.model,name:document.model_document_storage
+#: model:ir.ui.menu,name:document.menu_document_storage_media
+msgid "Storage Media"
+msgstr "Medio de almacenamiento"
+
+#. module: document
+#: view:document.storage:0
+msgid "Search Document storage"
+msgstr "Buscar almacenamiento documentos"
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Tipo de documento"
+
+#~ msgid ""
+#~ "Select an object here and Open ERP will create a mapping for each of these "
+#~ "objects, using the given domain, when browsing through FTP."
+#~ msgstr ""
+#~ "Seleccione aquí un objeto y OpenERP creará un mapeo para cada uno de estos "
+#~ "objetos, utilizando el dominio dado, cuando navegue mediante FTP."
+
+#~ msgid ""
+#~ "This wizard will automatically configure the document management system "
+#~ "according to modules installed on your system."
+#~ msgstr ""
+#~ "Este asistente configurará automáticamente el sistema de gestión de "
+#~ "documentos según los módulos instalados en su sistema."
+
+#~ msgid ""
+#~ "Put here the server address or IP. Keep localhost if you don't know what to "
+#~ "write."
+#~ msgstr ""
+#~ "Introduzca aquí la dirección del servidor o IP. Dejar localhost si no sabe "
+#~ "que escribir."
+
+#~ msgid "File Information"
+#~ msgstr "Información del archivo"
+
+#~ msgid "Resource Title"
+#~ msgstr "Título registro"
+
+#~ msgid "document.configuration.wizard"
+#~ msgstr "documento.configuracion.asistente"
+
+#~ msgid "Filesystem"
+#~ msgstr "Sistema de archivos"
+
+#~ msgid "Browse Files"
+#~ msgstr "Navegar por los archivos"
+
+#~ msgid "Document Management System."
+#~ msgstr "Sistema gestión de documentos."
+
+#~ msgid "Storing Method"
+#~ msgstr "Método almacenaje"
+
+#~ msgid "Server Address"
+#~ msgstr "Dirección servidor"
+
+#~ msgid "Link"
+#~ msgstr "Enlace"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Search a File"
+#~ msgstr "Buscar un archivo"
+
+#~ msgid "Directories Mapped to Objects"
+#~ msgstr "Directorios mapeados a objetos"
+
+#~ msgid "Preview"
+#~ msgstr "Vista previa"
+
+#~ msgid "Directorie's Structure"
+#~ msgstr "Estructura del directorio"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Others Info"
+#~ msgstr "Otras info."
+
+#~ msgid "History"
+#~ msgstr "Historial"
+
+#~ msgid ""
+#~ "If you put an object here, this directory template will appear bellow all of "
+#~ "these objects. Don't put a parent directory if you select a parent model."
+#~ msgstr ""
+#~ "Si aquí introduce un objeto, esta plantilla de directorio aparecerá debajo "
+#~ "de todos estos objetos. No ponga un directorio padre si selecciona un modelo "
+#~ "padre."
+
+#~ msgid "Auto-Generated Files"
+#~ msgstr "Archivos auto-generados"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ 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 ""
+#~ "Check this field if you want that the name of the file start by the record "
+#~ "name."
+#~ msgstr ""
+#~ "Marque esta opción si desea que el nombre del archivo empiece por el nombre "
+#~ "del registro."
+
+#~ msgid "Parent Item"
+#~ msgstr "Elemento padre"
+
+#~ msgid "Browse Files Using FTP"
+#~ msgstr "Navegar por los archivos usando FTP"
+
+#~ msgid "Auto Configure"
+#~ msgstr "Configurar automáticamente"
+
+#~ msgid ""
+#~ "This is a complete document management system:\n"
+#~ "    * FTP Interface\n"
+#~ "    * User Authentication\n"
+#~ "    * Document Indexation\n"
+#~ msgstr ""
+#~ "Sistema de gestión de documentos completo:\n"
+#~ "    * Interfaz FTP\n"
+#~ "    * Autenticación de usuarios\n"
+#~ "    * Indexación de documentos\n"
+
+#~ msgid "Other Resources"
+#~ msgstr "Otros recursos"
+
+#~ msgid ""
+#~ "This wizard will configure the URL of the server of the document management "
+#~ "system."
+#~ msgstr ""
+#~ "Este asistente configurará la dirección URL del servidor del sistema de "
+#~ "gestión de documentos."
+
+#~ msgid "Document Configuration"
+#~ msgstr "Configuración de documentos"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/document/i18n/es_PY.po b/addons/document/i18n/es_PY.po
index b72f8dd45b3..e777c16035d 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -243,8 +243,8 @@ msgid "Document directory"
 msgstr "Directorio documento"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1035,8 +1035,8 @@ msgid "Content Name"
 msgstr "Nombre contenido"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "¡El nombre de archivo debe ser único!"
diff --git a/addons/document/i18n/es_VE.po b/addons/document/i18n/es_VE.po
new file mode 100644
index 00000000000..196b726b8ad
--- /dev/null
+++ b/addons/document/i18n/es_VE.po
@@ -0,0 +1,1223 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* document
+#
+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-13 22:59+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:41+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr "Directorio padre"
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Auto Directory Configuration"
+msgstr "Configuración automática de directorios"
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr "Campo nombre"
+
+#. module: document
+#: view:board.board:0
+msgid "Document board"
+msgstr "Tablero de documentos"
+
+#. module: document
+#: model:ir.model,name:document.model_process_node
+msgid "Process Node"
+msgstr "Nodo proceso"
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr "Buscar directorio de documentos"
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+"Campo a usar como nombre de los directorios de recursos. Si está vacío se "
+"usará el campo \"nombre\"."
+
+#. module: document
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr "¡El nombre del directorio contiene caracteres especiales!"
+
+#. module: document
+#: view:document.directory:0
+#: view:document.storage:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contenido del directorio"
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr "Archivos"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: document
+#: view:document.configuration:0
+msgid "title"
+msgstr "título"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Contenido directorio"
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr "Documentos"
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"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"
+msgstr ""
+"Expresión Python utilizada para evaluar el campo.\n"
+"Puede utilizar 'dir_id' para el directorio actual, 'res_id', 'res_model' "
+"como referencia al registro actual en directorios dinámicos."
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: document
+#: field:document.storage,path:0
+msgid "Path"
+msgstr "Ruta"
+
+#. module: document
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#, python-format
+msgid "Directory name must be unique!"
+msgstr "¡El nombre del directorio debe ser único!"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "Contenido indexado"
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+msgstr ""
+"Si está marcada, se encontrarán todos los archivos adjuntos que coincidan "
+"con este recurso. Si está desmarcada, sólo se encontrarán aquellos que "
+"tengan este padre."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.storage,dir_ids:0
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "Directorios"
+
+#. module: document
+#: field:document.configuration,sale_order:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Archivos detallados por usuarios"
+
+#. module: document
+#: field:document.configuration,project:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: document
+#: code:addons/document/document_storage.py:573
+#: code:addons/document/document_storage.py:601
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: document
+#: help:document.configuration,product:0
+msgid "Auto directory configuration for Products."
+msgstr "Configuración automática de los directorios para productos."
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr "Encontrar todos los recursos"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr "Directorios por recurso"
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Sufijo"
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr "Fecha de modificación"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Configuración aplicación del conocimiento"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+#: field:report.files.partner,partner:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "Directorio documento"
+
+#. module: document
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "ValidateError"
+msgstr "Error de validación"
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr "Documentos"
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "¡Error! No puede crear directorios recursivos."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,storage_id:0
+msgid "Storage"
+msgstr "Almacenamiento"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Configure Resource Directory"
+msgstr "Configurar directorio de recursos"
+
+#. module: document
+#: field:ir.attachment,file_size:0
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+#: field:report.files.partner,file_size:0
+msgid "File Size"
+msgstr "Tamaño del archivo"
+
+#. module: document
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "Tipo de contenido"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+#: view:document.storage:0
+#: field:document.storage,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and there will be one folder per record of that "
+"resource."
+msgstr ""
+"Seleccione aquí un objeto y habrá un directorio por cada registro de ese "
+"recurso."
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+"Use un dominio si desea aplicar un filtro automático en los recursos "
+"visibles."
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Partner"
+msgstr "Archivos por empresa"
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr "Campos de contexto"
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr "Nombre del archivo guardado"
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr "Modelo de recurso"
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr "Tipo de directorio"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: document
+#: 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 "Tablero de documentos"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Extensión"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Created"
+msgstr "Creado"
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Archivos virtuales"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modified"
+msgstr "Modificado"
+
+#. module: document
+#: code:addons/document/document_storage.py:639
+#, python-format
+msgid "Error at doc write!"
+msgstr "¡Error de escritura en el documento!"
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr "Archivos generados"
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr "Archivos por empresa"
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:document.storage,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "Usuario de la última modificación"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr "Documentos relacionados"
+
+#. module: document
+#: field:document.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:document.storage,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "Fecha de modificación"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Archivos detallados por directorio"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr "Archivos de todos los usuarios"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Tamaño de archivo por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: document
+#: field:document.configuration,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr "Directorio estático"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "Hijos"
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+"Define palabras en el contexto para todos los directorios y archivos hijos"
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"    * User Authentication\n"
+"    * Document Indexation :- .pptx and .docx files are not support in "
+"windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files by Month (graph)\n"
+"    ATTENTION:\n"
+"    - When you install this module in a running company that have already "
+"PDF files stored into the database,\n"
+"      you will lose them all.\n"
+"    - After installing this module PDF's are no longer stored into the "
+"database,\n"
+"      but in the servers rootpad like /server/bin/filestore.\n"
+msgstr ""
+"Este es un completo gestor de documentos:\n"
+"    * Autenticación de usuario\n"
+"    * Indexación de documentos. Los documentos .pptx y .docx no están "
+"soportados bajo windows.\n"
+"    * Tablero de documentos que incluye:\n"
+"        * Nuevos archivos (lista)\n"
+"        * Archivos por tipo de recurso (gráfico)\n"
+"        * Archivos por empresa (gráfico)\n"
+"        * Archivos por mes (gráfico)\n"
+"    ATENCIÓN:\n"
+"    - Cuando instale este módulo en una compañía en producción que ya tenga "
+"ficheros PDF guardados en la base de datos,\n"
+"      los perderá todos.\n"
+"    - Tras instalar este módulo, los ficheros PDF ya no se guardarán en la "
+"base de datos,\n"
+"      sino en el directorio raíz del servidor como /server/bin/filestore.\n"
+
+#. module: document
+#: help:document.storage,online:0
+msgid ""
+"If not checked, media is currently offline and its contents not available"
+msgstr ""
+"Si no se marca, el medio de almacenamiento está actualmente fuera de línea y "
+"su contenido no está disponible."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: field:document.storage,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+#: field:report.document.wall,user_id:0
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "Informe PDF"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "Contenidos"
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:document.storage,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr "Fecha de creación"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+"Marque este campo si desea que el nombre del archivo contenga el nombre del "
+"registro.\n"
+"Si está marcado, el directorio tiene que ser un recurso."
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Auto Configure Directory"
+msgstr "Configuración automática de directorios"
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "Incluir nombre de registro"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "Adjunto"
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "ID modelo"
+
+#. module: document
+#: field:document.storage,online:0
+msgid "Online"
+msgstr "En línea"
+
+#. 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 ""
+"Marque esta opción si desea utilizar la misma estructura de árbol como el "
+"objeto seleccionado en el sistema."
+
+#. module: document
+#: view:document.directory:0
+msgid "Security"
+msgstr "Seguridad"
+
+#. 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 ""
+"Junto con el modelo padre, este ID adjunta este directorio a un registro "
+"específico del modelo padre."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "¡El directorio no puede ser su propio padre!"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: document
+#: field:report.document.user,user:0
+#: field:report.document.wall,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:document.storage,group_ids:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,db_datas:0
+msgid "Data"
+msgstr "Datos"
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Such directories are \"attached\" to the specific model or "
+"record, just like attachments. Don't put a parent directory if you select a "
+"parent model."
+msgstr ""
+"Si aquí introduce un objeto, esta plantilla de directorio aparecerá en todos "
+"estos objetos. Dichos directorios son \"adjuntados\" al modelo o registro, "
+"como adjuntos. No ponga un directorio padre si selecciona un modelo padre."
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: document
+#: help:document.configuration,project:0
+msgid "Auto directory configuration for Projects."
+msgstr "Configuración automática de directorios para proyectos."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Related to"
+msgstr "Relacionado con"
+
+#. module: document
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr "Sistema de gestión integrada de documentos"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Choose the following Resouces to auto directory configuration."
+msgstr ""
+"Seleccione los siguientes recursos para configurar directorios automáticos."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "Adjuntado a"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reports_document
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: field:document.storage,readonly:0
+msgid "Read Only"
+msgstr "Sólo lectura"
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "¡El nombre de directorio debe ser único!"
+
+#. module: document
+#: field:document.directory,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Creator"
+msgstr "Autor"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Hora del último archivo añadido"
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr "Nombre del archivo"
+
+#. module: document
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID recurso"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "External file storage"
+msgstr "Almacenamiento externo"
+
+#. 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 "Muro de la vergüenza"
+
+#. module: document
+#: help:document.storage,path:0
+msgid "For file storage, the root path of the storage"
+msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Archivos detallados por empresas"
+
+#. module: document
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr "Contexto dinámico de directorio"
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Modelo padre"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+#: field:report.document.wall,month:0
+#: field:report.document.wall,name:0
+#: field:report.files.partner,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reporting
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: document
+#: field:document.configuration,product:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estructura árbol"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Usuarios que no han insertado documentos desde hace un mes"
+
+#. 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 ""
+"El repositorio de documentación le da acceso a todos los adjuntos tales como "
+"correos, proyectos, facturas, etc."
+
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr ""
+"Para cada entrada, los archivos virtuales aparecerán en este directorio."
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adjunto"
+
+#. module: document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Nuevos archivos"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Archivos por empresa"
+
+#. 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 ""
+"El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
+"antepondrá a lo que escriba aquí."
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: document
+#: help:document.configuration,sale_order:0
+msgid ""
+"Auto directory configuration for Sale Orders and Quotation with report."
+msgstr ""
+"Configuración automática de directorios para presupuestos y pedidos de venta "
+"con informes."
+
+#. module: document
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
+"Cada directorio puede ser de tipo estático o ser asociado a otro recurso. Un "
+"directorio estático, como en los sistemas operativos, es el clásico "
+"directorio que puede contener un conjunto de archivos. Los directorios "
+"asociados a recursos del sistema automáticamente poseen subdirectorios para "
+"cada recurso definido en el directorio padre."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: document
+#: 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 "Estadísticas por usuario"
+
+#. module: document
+#: field:document.directory,name:0
+#: field:document.storage,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document
+#: sql_constraint:document.storage:0
+msgid "The storage path must be unique!"
+msgstr "¡La ruta de almacenamiento debe ser única!"
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: document
+#: help:document.storage,readonly:0
+msgid "If set, media is for reading only"
+msgstr "Si está marcado, el medio de almacenamiento sólo es de lectura."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: document
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Núm. de archivos"
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
+"Sólo los miembros de estos grupos tendrán acceso a este directorio y a sus "
+"archivos."
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr ""
+"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
+"deben definir sus propios grupos."
+
+#. module: document
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr "Tipo mime"
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Nombre contenido"
+
+#. module: document
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
+#, python-format
+msgid "File name must be unique!"
+msgstr "¡El nombre de archivo debe ser único!"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Internal File storage"
+msgstr "Almacenamiento interno"
+
+#. module: document
+#: 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: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr "Estructura de directorios"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Archivos por tipo de registro"
+
+#. module: document
+#: field:report.document.user,name:0
+#: field:report.files.partner,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: document
+#: view:document.storage:0
+#: model:ir.model,name:document.model_document_storage
+#: model:ir.ui.menu,name:document.menu_document_storage_media
+msgid "Storage Media"
+msgstr "Medio de almacenamiento"
+
+#. module: document
+#: view:document.storage:0
+msgid "Search Document storage"
+msgstr "Buscar almacenamiento documentos"
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Tipo de documento"
+
+#~ msgid ""
+#~ "Select an object here and Open ERP will create a mapping for each of these "
+#~ "objects, using the given domain, when browsing through FTP."
+#~ msgstr ""
+#~ "Seleccione aquí un objeto y OpenERP creará un mapeo para cada uno de estos "
+#~ "objetos, utilizando el dominio dado, cuando navegue mediante FTP."
+
+#~ msgid ""
+#~ "This wizard will automatically configure the document management system "
+#~ "according to modules installed on your system."
+#~ msgstr ""
+#~ "Este asistente configurará automáticamente el sistema de gestión de "
+#~ "documentos según los módulos instalados en su sistema."
+
+#~ msgid ""
+#~ "Put here the server address or IP. Keep localhost if you don't know what to "
+#~ "write."
+#~ msgstr ""
+#~ "Introduzca aquí la dirección del servidor o IP. Dejar localhost si no sabe "
+#~ "que escribir."
+
+#~ msgid "File Information"
+#~ msgstr "Información del archivo"
+
+#~ msgid "Resource Title"
+#~ msgstr "Título registro"
+
+#~ msgid "document.configuration.wizard"
+#~ msgstr "documento.configuracion.asistente"
+
+#~ msgid "Filesystem"
+#~ msgstr "Sistema de archivos"
+
+#~ msgid "Browse Files"
+#~ msgstr "Navegar por los archivos"
+
+#~ msgid "Document Management System."
+#~ msgstr "Sistema gestión de documentos."
+
+#~ msgid "Storing Method"
+#~ msgstr "Método almacenaje"
+
+#~ msgid "Server Address"
+#~ msgstr "Dirección servidor"
+
+#~ msgid "Link"
+#~ msgstr "Enlace"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Search a File"
+#~ msgstr "Buscar un archivo"
+
+#~ msgid "Directories Mapped to Objects"
+#~ msgstr "Directorios mapeados a objetos"
+
+#~ msgid "Preview"
+#~ msgstr "Vista previa"
+
+#~ msgid "Directorie's Structure"
+#~ msgstr "Estructura del directorio"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Others Info"
+#~ msgstr "Otras info."
+
+#~ msgid "History"
+#~ msgstr "Historial"
+
+#~ msgid ""
+#~ "If you put an object here, this directory template will appear bellow all of "
+#~ "these objects. Don't put a parent directory if you select a parent model."
+#~ msgstr ""
+#~ "Si aquí introduce un objeto, esta plantilla de directorio aparecerá debajo "
+#~ "de todos estos objetos. No ponga un directorio padre si selecciona un modelo "
+#~ "padre."
+
+#~ msgid "Auto-Generated Files"
+#~ msgstr "Archivos auto-generados"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ 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 ""
+#~ "Check this field if you want that the name of the file start by the record "
+#~ "name."
+#~ msgstr ""
+#~ "Marque esta opción si desea que el nombre del archivo empiece por el nombre "
+#~ "del registro."
+
+#~ msgid "Parent Item"
+#~ msgstr "Elemento padre"
+
+#~ msgid "Browse Files Using FTP"
+#~ msgstr "Navegar por los archivos usando FTP"
+
+#~ msgid "Auto Configure"
+#~ msgstr "Configurar automáticamente"
+
+#~ msgid ""
+#~ "This is a complete document management system:\n"
+#~ "    * FTP Interface\n"
+#~ "    * User Authentication\n"
+#~ "    * Document Indexation\n"
+#~ msgstr ""
+#~ "Sistema de gestión de documentos completo:\n"
+#~ "    * Interfaz FTP\n"
+#~ "    * Autenticación de usuarios\n"
+#~ "    * Indexación de documentos\n"
+
+#~ msgid "Other Resources"
+#~ msgstr "Otros recursos"
+
+#~ msgid ""
+#~ "This wizard will configure the URL of the server of the document management "
+#~ "system."
+#~ msgstr ""
+#~ "Este asistente configurará la dirección URL del servidor del sistema de "
+#~ "gestión de documentos."
+
+#~ msgid "Document Configuration"
+#~ msgstr "Configuración de documentos"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po
index 58f0ae20a11..948e9127fff 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr "Dokumendi kataloog"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -980,8 +980,8 @@ msgid "Content Name"
 msgstr "Sisu nimi"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Faili nimi peab olema unikaalne"
@@ -1159,30 +1159,3 @@ msgstr "Dokumendi tüüp"
 #~ "This wizard will configure the URL of the server of the document management "
 #~ "system."
 #~ msgstr "See nõustaja seadistab serveri ja dokumendihaldussüsteemi URL-i."
-
-#~ msgid "Files Per Month"
-#~ msgstr "Faile Kuukohta"
-
-#~ msgid "All Months"
-#~ msgstr "Kõik kuud"
-
-#~ msgid "My files"
-#~ msgstr "Minu failid"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Minu failid (kõik kuud)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Viimati üleslaetud Failinimi"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Minufailid (nendel kuudel)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Dokumendihaldus - Aruanne"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Kõik kasutajate failid (kõik kuud)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Kõik Kasutajate failid (Käesoleval kuul)"
diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po
index 6126bb9016f..e075f7d3e58 100644
--- a/addons/document/i18n/fi.po
+++ b/addons/document/i18n/fi.po
@@ -14,38 +14,38 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Directory"
-msgstr ""
+msgstr "Yläkansio"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Auto Directory Configuration"
-msgstr ""
+msgstr "Automaattinen hakemistojen konfigurointi"
 
 #. module: document
 #: field:document.directory,resource_field:0
 msgid "Name field"
-msgstr ""
+msgstr "Nimikenttä"
 
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "Dokumenttien työpöytä"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
 msgid "Process Node"
-msgstr ""
+msgstr "Prosessisolmu"
 
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr ""
+msgstr "Hae dokumenttihakemistosta"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -53,6 +53,8 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Kenttä jota käytetään resurssihakemistojen nimenä. Jos tyhjä, nimikenttää "
+"(name) käytetään."
 
 #. module: document
 #: code:addons/document/document_directory.py:276
@@ -64,17 +66,17 @@ msgstr "Kansion nimi sisältää erikoismerkkejä!"
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr ""
+msgstr "Hakemiston sisällön tyyppi"
 
 #. module: document
 #: view:document.directory:0
 msgid "Resources"
-msgstr ""
+msgstr "Resurssit"
 
 #. module: document
 #: field:document.directory,file_ids:0
@@ -85,18 +87,18 @@ msgstr "Tiedostot"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "Tiedostoja kuukautta kohti"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: document
 #: view:document.directory:0
@@ -107,17 +109,17 @@ msgstr "Yritys"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
 msgid "Directory Content"
-msgstr ""
+msgstr "Hakemiston sisältö"
 
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Dynaaminen konteksti"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
 msgid "Document Management"
-msgstr ""
+msgstr "Dokumenttienhallinta"
 
 #. module: document
 #: help:document.directory.dctx,expr:0
@@ -126,11 +128,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 ""
+"Python määrittelyä käytetään tämän kentän arviointiin.\n"
+"Voit käyttää 'dir_id' nykyiselle hakmeistolle, 'res_id', 'res_model' "
+"viitteenä nykyiseen tietueeseen dynaamisissa hakemistoissa"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Tänä vuonna"
 
 #. module: document
 #: field:document.storage,path:0
@@ -148,7 +153,7 @@ msgstr "Kansionimen tulee olla ainutkertainen!"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr ""
+msgstr "Indeksoitu sisältö"
 
 #. module: document
 #: help:document.directory,resource_find_all:0
@@ -156,6 +161,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"jos tosi (true), kaikki liitteet jotka täsmäävät tämän resurssin kanssa "
+"etsitään, jos epätosi (false) vain ne joilla on tämä ylätasona."
 
 #. module: document
 #: view:document.directory:0
@@ -168,17 +175,17 @@ msgstr "Hakemistot"
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Myyntitilaus"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Tiedoston yksityiskohdat käyttäjittäin"
 
 #. module: document
 #: field:document.configuration,project:0
 msgid "Project"
-msgstr ""
+msgstr "Projekti"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
@@ -190,17 +197,17 @@ msgstr "Virhe!"
 #. module: document
 #: help:document.configuration,product:0
 msgid "Auto directory configuration for Products."
-msgstr ""
+msgstr "Automaattinen hakemistojen konfigurointi tuotteille"
 
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "Hae kaikki resurssit"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "Hakemistoja resurssia kohden"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -210,12 +217,12 @@ msgstr "Pääte"
 #. module: document
 #: field:report.document.user,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Muutospäivämäärä"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Tiedonhallintaohjelmiston konfiguraatio"
 
 #. module: document
 #: view:ir.attachment:0
@@ -227,22 +234,22 @@ msgstr "Kumppani"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr ""
+msgstr "Tiedostoja käyttäjittäin"
 
 #. module: document
 #: field:process.node,directory_id:0
 msgid "Document directory"
-msgstr ""
+msgstr "Dokumenttihakemisto"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "Tarkistusvirhe"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
@@ -255,7 +262,7 @@ msgstr ""
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr ""
+msgstr "Asiakirjat"
 
 #. module: document
 #: constraint:document.directory:0
@@ -266,12 +273,12 @@ msgstr "Virhe! Et voi luoda rekursiivisia kansioita."
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "Tallennus"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Konfiguroi resurssin hakemisto"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -301,22 +308,25 @@ msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
 msgstr ""
+"Valitse objekti tässä ja resurssin jokaiselle tietuelle luodaan oma hakemisto"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
+"Käytä toimialuetta, jos haluat käyttää automaattista suodatinta näkyville "
+"resursseille."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "Tiedostoja yhteistyökumppania kohden"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "Kontekstikentät"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -326,7 +336,7 @@ msgstr "Tallennettu tiedostonnimi"
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
-msgstr ""
+msgstr "Resurssimalli"
 
 #. module: document
 #: view:document.directory:0
@@ -343,13 +353,13 @@ msgstr "Raportti"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: document
 #: 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 "Dokumenttien työpöytä"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -359,7 +369,7 @@ msgstr "Lisäosa"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Luotu"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -369,18 +379,18 @@ msgstr "Virtuaaliset tiedostot"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "Muokattu"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "Virhe kirjoitettaessa asiakirjaa !"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "Luodut tiedostot"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -396,25 +406,25 @@ msgstr "Hakemisto"
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr ""
+msgstr "Tiedostot yhteistyökumppaneittain"
 
 #. module: document
 #: field:document.directory,write_uid:0
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Viimeksi muuttanut käyttäjä"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr ""
+msgstr "Liittyvät dokumentit"
 
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -431,35 +441,35 @@ msgstr "Muokkauspäivä"
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Tiedostojen yksityiskohdat hakemistoittain"
 
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr ""
+msgstr "Kaikki käyttäjän tiedostot"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Tiedoston koko kuukausittain"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Static Directory"
-msgstr ""
+msgstr "Kiinteä hakemisto"
 
 #. module: document
 #: field:document.directory,child_ids:0
@@ -470,6 +480,7 @@ msgstr "Alatunnukset"
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
 msgstr ""
+"Määrittele kontekstin sanat kaikille alatason hakemistoille ja tiedostoille"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -497,6 +508,7 @@ msgstr ""
 msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
+"Jos ei valittu, media on pois käytöstä ja sen sisältö ei ole saatavilla"
 
 #. module: document
 #: view:document.directory:0
@@ -533,6 +545,9 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Valitse tämä kenttä jos haluat että tiedoston nimi siäsältää tietueen "
+"nimen.\n"
+"Jos asetettu, hakemiston on oltava resurssityyppinen."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -542,7 +557,7 @@ msgstr "Määritä hakemistoasetukset automaattisesti"
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr ""
+msgstr "Sisällytä tietueen nimi"
 
 #. module: document
 #: view:ir.attachment:0
@@ -557,7 +572,7 @@ msgstr "Mallin tunnus"
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "Online-tilassa"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -565,6 +580,8 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Valitse tämä jos haluat käyttää samaa puurakennetta kuin järjestelmän "
+"valitsemassa objektissa."
 
 #. module: document
 #: view:document.directory:0
@@ -577,29 +594,31 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Yhdessä ylätason mallin kanssa, tämä ID yhdistää hakemiston tiettyyn "
+"tietueeseen ylätason mallissa"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Hakemisto ei voi olla itsensä ylähakemisto!"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: document
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -610,13 +629,13 @@ msgstr "Ryhmät"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: document
 #: view:ir.attachment:0
@@ -632,6 +651,9 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Jos lisäät objektin tänne, tämä hakemistopohja näkyy näiden objektien alla. "
+"Tällaiset hakemistot on \"liitetty\" tiettyyn malliin tai tietueeseen, kuten "
+"liitetiedostot. Älä syötä ylätason hakmistoa jos valitset ylätason mallin"
 
 #. module: document
 #: view:document.directory:0
@@ -642,7 +664,7 @@ msgstr "Määritelmä"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: document
 #: view:document.directory:0
@@ -657,12 +679,12 @@ msgstr "Tietokanta"
 #. module: document
 #: help:document.configuration,project:0
 msgid "Auto directory configuration for Projects."
-msgstr ""
+msgstr "Automaattinen hakemistojen konfiguraatio projekteille"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "Liittyy"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -673,6 +695,7 @@ msgstr "Integroitu tiedostonhallintajärjestelmä"
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
 msgstr ""
+"Valitse seuraavat resurssit automaattista hakemiston konfiguraatiota varten."
 
 #. module: document
 #: view:ir.attachment:0
@@ -682,27 +705,27 @@ msgstr "Liitetty kohteeseen"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "Työpöytä"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "Tiedostot käyttäjittäin"
 
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "Vain luku"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Lauseke"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Hakemiston nimen tulee olla uniikki !"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -715,28 +738,28 @@ msgstr "Tekijä"
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Tiedostot kuukausittain"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Etuliite"
 
 #. module: document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr ""
+msgstr "Viimeisin lisäysajankohta"
 
 #. module: document
 #: field:report.document.user,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Tiedostonimi"
 
 #. module: document
 #: view:document.configuration:0
@@ -751,44 +774,44 @@ msgstr "Resurssin tunnus"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Ulkoinen tietovarasto"
 
 #. 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 "Häpeäseinä"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Tietovaraston peruspolku"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Tiedostojen yksityiskohdat yhteistyökumppaneittain"
 
 #. module: document
 #: field:document.directory.dctx,field:0
 msgid "Field"
-msgstr ""
+msgstr "Kenttä"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Hakemiston dynaaminen konteksti"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "Ylätason malli"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "Tiedostoja käyttäjittäin"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -797,17 +820,17 @@ msgstr ""
 #: field:report.document.wall,name:0
 #: field:report.files.partner,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Raportointi"
 
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -818,17 +841,18 @@ msgstr "Puurakenne"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr ""
+msgstr "Kaikki käyttäjän tiedostot"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
 msgstr ""
+"Käyttäjät jotka eivät ole lisänneet dokumentteja viimeisen kuukauden aikana"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -836,11 +860,15 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
+"Dokumenttivarasto antaa sinulle pääsyn kaikkiin liitteisiin, kuten "
+"sähköposteihin, projektidokumetteihin, laskuihin yms."
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
 msgstr ""
+"Jokaista tähän lisättyä kohdetta kohti, virtuaalitiedostoja muodostuu tähän "
+"hakemistoon."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
@@ -850,23 +878,23 @@ msgstr ""
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Uudet tiedostot"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "Kiinteä"
 
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr ""
+msgstr "Tiedostot yhteistyökumppaneittain"
 
 #. module: document
 #: help:document.directory.dctx,field:0
@@ -874,11 +902,12 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"Kentän nimi. Huomaa että etuliite \"dctx_\" lisätään tähän kirjoitetun eteen"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Month"
-msgstr ""
+msgstr "Tässä kuussa"
 
 #. module: document
 #: view:ir.attachment:0
@@ -890,6 +919,8 @@ msgstr "Huomautukset"
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
 msgstr ""
+"Automaattinen hakemiston konfiguraatio myyntitilauksille ja tarjouksille "
+"raportteineen."
 
 #. module: document
 #: help:document.directory,type:0
@@ -900,18 +931,24 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Jokaisella hakemistolla voi olla joko tyyppi kiinteä (static) tai se voi "
+"olla linkitettynä toiseen resurssiin. Kiinteä hakemisto, kuten "
+"käyttöjärjestelmien yhteydssä, on klassinen hakemisto joka voi sisältää "
+"ryhmän tiedostoja. Hakemistot jotka on linkitetty järjestelmäresursseihin "
+"sisältävät automaattisesti alihakemistot jokaiselle ylätasolla määritellylle "
+"resurssityypille."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: document
 #: 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 "Tilastot käyttäjittäin"
 
 #. module: document
 #: field:document.directory,name:0
@@ -922,30 +959,30 @@ msgstr "Nimi"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "Talletuspaikan polun tulee olla uniikki!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Kentät"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Jos asetettu, media on vain lukemista varten"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "Tiedostojen määrä"
 
 #. module: document
 #: view:document.directory:0
@@ -953,6 +990,7 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
+"Vain näiden ryhmien jäsenillä on pääsy thän hakemistoon ja sen tiedostoihin."
 
 #. module: document
 #: view:document.directory:0
@@ -960,11 +998,13 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Nämä ryhmät eivät kuitenkaan vaikuta alatason hakemistoihin, vaan niihin on "
+"määriteltävä omat ryhmät"
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "Mime-tyyppi"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -977,8 +1017,8 @@ msgid "Content Name"
 msgstr "Sisällön nimi"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Tiedostonimen täytyy olla ainutkertainen!"
@@ -986,43 +1026,43 @@ msgstr "Tiedostonimen täytyy olla ainutkertainen!"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Sisäinen tietovarasto"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Hakemistolla täytyy olla ylätason hakemisto tai tietovarasto"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr ""
+msgstr "Hakemistojen rakenne"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Tiedostoja resurssityypeittäin"
 
 #. module: document
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: document
 #: view:document.storage:0
 #: model:ir.model,name:document.model_document_storage
 #: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
-msgstr ""
+msgstr "Tallennusmedia"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Hae dokumenttivarastosta"
 
 #. module: document
 #: field:document.directory.content,extension:0
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index 8ece2a646a8..0be93c88d97 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -244,8 +244,8 @@ msgid "Document directory"
 msgstr "Répertoire du Document"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1042,8 +1042,8 @@ msgid "Content Name"
 msgstr "Nom du Contenu"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Le nom du fichier doit être unique !"
@@ -1200,50 +1200,11 @@ msgstr "Type de document"
 #~ msgid "Auto Configure"
 #~ msgstr "Configuration Automatique"
 
-#~ msgid "Files Per Month"
-#~ msgstr "Fichiers par Mois"
-
-#~ msgid "All Months"
-#~ msgstr "Tous les mois"
-
-#~ msgid "My files"
-#~ msgstr "Mes Fichiers"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Mes Fichiers (Tous les Mois)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Nom du Dernier Fichier Posté"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Mes Fichiers (Ce mois)"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Tous les Fichiers des Utilisateurs (Tous les Mois)"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
 #~ "spécial !"
 
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne peut jamais être inférieure à 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Les règles ne sont pas compatibles avec les objets osv_memory !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de modèle incorrect dans la définition de l'action"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Une règle doit avoir au moins un droit d'accès sélectionné !"
diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po
index 9b5d3a1cfec..72c800e586d 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -242,8 +242,8 @@ msgid "Document directory"
 msgstr "Directorio do documento"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1033,8 +1033,8 @@ msgid "Content Name"
 msgstr "Nome do Contido"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "O nome do ficheiro debe ser único!"
diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po
index 9d0557fd882..9dbc3ccc55e 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -977,8 +977,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index bf22f0aec8c..391e9c09353 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: document
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr "Mapa dokumenta"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -981,8 +981,8 @@ msgid "Content Name"
 msgstr "Naziv sadržaja"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
@@ -1164,30 +1164,3 @@ msgstr "Vrsta dokumenta"
 
 #~ msgid "Configure"
 #~ msgstr "Podesi"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Spisi po Mjesecu"
-
-#~ msgid "All Months"
-#~ msgstr "Svi mjeseci"
-
-#~ msgid "My files"
-#~ msgstr "Moji Spisi"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Moji Spisi (Svi mjeseci)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Zadnje postavljeno Ime Spisa"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Moji Spisi (Ovaj mjesec)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Upravljanje Dokumentima - Izvještavanje"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Spisi svih Korisnika (Svi mjeseci)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Spisi svih Korisnika (Ovaj mjesec)"
diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po
index 10c6752a52e..7d5cf6229b7 100644
--- a/addons/document/i18n/hu.po
+++ b/addons/document/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 12:24+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +235,8 @@ msgid "Document directory"
 msgstr "Dokumentumkönyvtár"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +977,8 @@ msgid "Content Name"
 msgstr "Kapcsolat neve"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Fájl nevének egyedinek kell lennie!"
diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po
index 5fd552db49f..8492fec5bb7 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
@@ -1027,6 +1027,3 @@ msgstr ""
 #: field:document.directory.content,extension:0
 msgid "Document Type"
 msgstr ""
-
-#~ msgid "All Months"
-#~ msgstr "Semua Bulan"
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index 4fe42feecdf..09e99764536 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -239,8 +239,8 @@ msgid "Document directory"
 msgstr "Cartella Documenti"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1019,8 +1019,8 @@ msgid "Content Name"
 msgstr "Nome del Contenuto"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Il nome file deve essere unico!"
@@ -1166,21 +1166,6 @@ msgstr "Tipo di documento"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modulo non valido nella definizione dell'azione."
 
-#~ msgid "Files Per Month"
-#~ msgstr "File per mesi"
-
-#~ msgid "All Months"
-#~ msgstr "Tutti i Mesi"
-
-#~ msgid "My files"
-#~ msgstr "I Miei File"
-
-#~ msgid "My files (All months)"
-#~ msgstr "I Miei file (Tutti i mesi)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Ultimo file inviato"
-
 #~ msgid "Parent Item"
 #~ msgstr "Articolo Padre"
 
@@ -1194,18 +1179,6 @@ msgstr "Tipo di documento"
 #~ "Questa procedura automatica configura l'URL del server del Gestore "
 #~ "Documentale"
 
-#~ msgid "My files (This months)"
-#~ msgstr "I miei files"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Gestione documentale - Stampe"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Tutti i files degli utenti (Tutti i mesi)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Tutti i file degli utenti (Mese attuale)"
-
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
@@ -1231,18 +1204,3 @@ msgstr "Tipo di documento"
 #~ msgstr ""
 #~ "Seleziona un oggetto qui e Open ERP creerà un abbinamento per tutti questi "
 #~ "oggetti, usando il dominio fornito, quando verrà sfogliato attraverso FTP."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate per gli oggetti: osv_memory!"
diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po
index 2172e30669b..a4716ce1a36 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr "문서 디렉토리"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -977,8 +977,8 @@ msgid "Content Name"
 msgstr "컨텐트 이름"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index e51f831f9a4..fb75573e8a4 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr "Dokumentų katalogas"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -979,8 +979,8 @@ msgid "Content Name"
 msgstr "Turinio pavadinimas"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/lv.po b/addons/document/i18n/lv.po
index aa64b6511db..af196150084 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr "Dokumentu mape"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -984,8 +984,8 @@ msgid "Content Name"
 msgstr "Satura nosaukums"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Faila nosaukumam jābūt unikālam!"
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index de964eb8606..4d318d5d93a 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -241,8 +241,8 @@ msgid "Document directory"
 msgstr "Баримтын хавтас"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1022,8 +1022,8 @@ msgid "Content Name"
 msgstr "Агуулгын нэр"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Файлын нэр давхцахгүй!"
@@ -1122,15 +1122,6 @@ msgstr "Баримтын төрөл"
 #~ msgid "Cancel"
 #~ msgstr "Болих"
 
-#~ msgid "Files Per Month"
-#~ msgstr "Сарын файлууд"
-
-#~ msgid "All Months"
-#~ msgstr "Бүх сар"
-
-#~ msgid "My files"
-#~ msgstr "Миний файлууд"
-
 #~ msgid "Parent Item"
 #~ msgstr "Толгой элемент"
 
@@ -1179,132 +1170,21 @@ msgstr "Баримтын төрөл"
 #~ msgid "Auto-Generated Files"
 #~ msgstr "Автоматаар үүссэн файлууд"
 
-#~ msgid "My files (This months)"
-#~ msgstr "Миний файлууд (энэ сар)"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Миний файлууд (бүх сар)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Сүүлд оруулсан файл"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Баримтын удирдлага - Тайлан"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Бүх хэрэглэгчийн файлууд (бүх сар)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Бүх хэрэглэгчийн файлууд (энэ сар)"
-
 #~ msgid "Browse Files"
 #~ msgstr "Файл ачаалах"
 
 #~ msgid "Configure"
 #~ msgstr "Тохиргоо"
 
-#~ msgid "Collaborative Content (Wiki)"
-#~ msgstr "Хамтарсан агуулга (Вики)"
-
-#~ msgid "Creates an example skeleton for a standard quality manual."
-#~ msgstr "Стандарт чанарын зааварчилгаа бүхий  загвар жишээ үүсгэнэ."
-
-#~ msgid "Shared Repositories (FTP)"
-#~ msgstr "Дундын агуулах  (FTP)"
-
-#~ msgid "Knowledge Management System"
-#~ msgstr "Баримтын удирдлагын систем"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid "Knowledge"
-#~ msgstr "Баримт"
-
-#~ msgid ""
-#~ "Provides a WebDAV access to your OpenERP's Document Management System. Lets "
-#~ "you access attachments and virtual documents through your standard file "
-#~ "browser."
-#~ msgstr ""
-#~ "OpenERP-н Баримтын удирдлагын систем рүү WebDAV хандалт гаргана. Стандарт "
-#~ "файл браузер ашиглан хавсралт, баримтууд руу хандах боломжтой болно."
-
-#~ msgid ""
-#~ "Provides an FTP access to your OpenERP's Document Management System. Lets "
-#~ "you access attachments and virtual documents through a standard FTP client."
-#~ msgstr ""
-#~ "OpenERP-н Баримтын удирдлагын систем рүү FTP хандалт гаргана. Стандарт FTP "
-#~ "програм ашиглан хавсралт, баримтууд руу хандах боломжтой болно."
-
-#~ msgid ""
-#~ "Installer for knowledge-based tools\n"
-#~ "    "
-#~ msgstr ""
-#~ "Мэдлэгийн багажуудад зориулсан суулгагч\n"
-#~ "    "
-
-#~ msgid "Configuration"
-#~ msgstr "Тохиргоо"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
 
-#~ msgid "Knowledge Modules Installation"
-#~ msgstr "Баримтын модулиуд суулгах"
-
-#~ msgid "Launch"
-#~ msgstr "Ачаалах"
-
-#~ msgid "Quality Manual"
-#~ msgstr "Чанарын зааварчилгаа"
-
-#~ msgid "Templates of Content"
-#~ msgstr "Агуулгын загвар"
-
-#~ msgid "Shared Repositories (WebDAV)"
-#~ msgstr "Дундын агуулах (WebDAV)"
-
-#~ msgid ""
-#~ "Creates a skeleton internal FAQ pre-filled with documentation about "
-#~ "OpenERP's Document Management System."
-#~ msgstr ""
-#~ "OpenERP-н Баримтын удирдлагын системийн тухай мэдээлэл бүхий дотоод ТТА "
-#~ "хуудас үүсгэнэ."
-
-#~ msgid "Internal FAQ"
-#~ msgstr "Дотоод түгээмэл тавигддаг асуултууд(ТТА)"
-
-#~ msgid "Collaborative Content"
-#~ msgstr "Хамтарсан агуулга"
-
-#~ msgid "knowledge.installer"
-#~ msgstr "knowledge.installer"
-
-#~ 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 ""
-#~ "Бусадтай бизнесийн мэдлэгээ хуваалцах, суралцахад зориулан вики хуудас "
-#~ "үүсгэх боломж олгоно."
-
 #~ msgid "Auto Configure"
 #~ msgstr "Автомат тохиргоо"
 
-#~ msgid "Хадгалалт"
-#~ msgstr "Хадгалалт"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "The certificate ID of the module must be unique !"
-
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
 #~ msgstr ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Size of the field can never be less than 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "The name of the module must be unique !"
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index 5b96f94b227..dd5575ac11e 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -241,8 +241,8 @@ msgid "Document directory"
 msgstr "Documentenmap"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1028,8 +1028,8 @@ msgid "Content Name"
 msgstr "Naam inhoud"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Bestandsnaam moet uniek zijn!"
@@ -1205,36 +1205,6 @@ msgstr "Soort document"
 #~ msgid "Auto Configure"
 #~ msgstr "Automatisch instellen"
 
-#~ msgid "Files Per Month"
-#~ msgstr "Bestanden per maand"
-
-#~ msgid "All Months"
-#~ msgstr "Alle maanden"
-
-#~ msgid "My files"
-#~ msgstr "Mijn bestanden"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Mijn bestanden (alle maanden)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Laatst geposte bestandnaam"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Mijn bestanden (deze maanden)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Documentbeheer - Overzichten"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Alle gebruikersbestanden (alle maanden)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Alle gebruikersbestanden (deze maand)"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken"
-
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
@@ -1242,18 +1212,3 @@ msgstr "Soort document"
 #~ "Als u hier een object plaatst, zal dit mapsjabloon onderaan al deze objecten "
 #~ "verschijnen. Plaats geen bovenliggende map als u een bovenliggend model "
 #~ "kiest."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po
index 9a84589739d..90450cfee38 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 8d061ba6211..9510846af4d 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -236,8 +236,8 @@ msgid "Document directory"
 msgstr "Katalog dokumentu"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -979,8 +979,8 @@ msgid "Content Name"
 msgstr "Nazwa zawartości"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
@@ -1133,32 +1133,5 @@ msgstr "Typ dokumentu"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
-#~ msgid "All Months"
-#~ msgstr "Wszystkie miesiące"
-
-#~ msgid "My files"
-#~ msgstr "Moje pliki"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Pliki na miesiąc"
-
 #~ msgid "Auto-Generated Files"
 #~ msgstr "Pliki samogenerowane"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Moje pliki (ten miesiąc)"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Moje pliki (wszystkie miesiące)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Nazwa ostatniego pliku"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Zarządzanie dokumentami - Raportowanie"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Wszystkie pliki użytkowników (wszystkie miesiące)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Pliki wszystkich użytkowników (ten miesiąc)"
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index 5f14c90c206..c8a2f2a4814 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -240,8 +240,8 @@ msgid "Document directory"
 msgstr "Pasta Documento"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1025,8 +1025,8 @@ msgid "Content Name"
 msgstr "Nome do conteúdo"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "O nome do ficheiro tem de ser único !"
@@ -1135,9 +1135,6 @@ msgstr "Tipo de documento"
 #~ "    * Autenticação dos utilizadores\n"
 #~ "    * Indexação dos documentos\n"
 
-#~ msgid "All Months"
-#~ msgstr "Todos os meses"
-
 #~ msgid ""
 #~ "Select an object here and Open ERP will create a mapping for each of these "
 #~ "objects, using the given domain, when browsing through FTP."
@@ -1208,26 +1205,8 @@ msgstr "Tipo de documento"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente"
-
 #~ 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 caractere "
 #~ "especial!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1 !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Objectos tipo osv_memory não suportam regras!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index 50c1d047a52..a6513345b6d 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -241,8 +241,8 @@ msgid "Document directory"
 msgstr "Diretório de Documento"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -995,8 +995,8 @@ msgid "Content Name"
 msgstr "Nome de Conteúdo"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Nome do Arquivo deve ser único!"
@@ -1092,6 +1092,3 @@ msgstr "Tipo de Documento"
 #~ msgstr ""
 #~ "Marque este campo se você quiser que o nome do arquivo começa pelo nome de "
 #~ "registro"
-
-#~ msgid "All Months"
-#~ msgstr "Todos os Meses"
diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po
index 53f35332745..ce9f2cdd3aa 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
@@ -1039,30 +1039,3 @@ msgstr "Tip document"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Fişiere pe lună"
-
-#~ msgid "All Months"
-#~ msgstr "Toate lunile"
-
-#~ msgid "My files"
-#~ msgstr "Fişierele mele"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Fişierele mele (toale lunile)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Numele ultimului fişier postat"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Fişierele mele (luna curentă)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Management documente - Raportări"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Toate fişierele utilizatorilor (toate lunile)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Fişierele tuturor utilizatorilor (luna curentă)"
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 82526dcbbb2..6ff4c62e91c 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -44,7 +44,7 @@ msgstr "Узел процесса"
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr "Искать каталог документов"
+msgstr "Каталог поиска документов"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -52,6 +52,8 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Поле, которое будет использоваться как имя ресурса каталогов. Если пусто, "
+"будет использоваться \"имя\"."
 
 #. module: document
 #: code:addons/document/document_directory.py:276
@@ -95,7 +97,7 @@ msgstr "Март"
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: document
 #: view:document.directory:0
@@ -125,6 +127,9 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"Выражение на языке Python, используемое для проверки этого поля.\n"
+"Можно использовать 'dir_id' для текущего каталога, 'res_id', 'res_model' в "
+"качестве обозначения текущей записи, в динамических каталогах."
 
 #. module: document
 #: view:report.document.user:0
@@ -155,6 +160,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Если истинно, все вложения, подходящие этому ресурсу, будут обнаружены. Если "
+"ложно — только дочерние по отношению к этому."
 
 #. module: document
 #: view:document.directory:0
@@ -234,8 +241,8 @@ msgid "Document directory"
 msgstr "Каталог документов"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -259,7 +266,7 @@ msgstr "Документы"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr "Ошибка! Вы не можете созадавать вложенные Директории."
+msgstr "Ошибка! Нельзя создавать вложенные директории."
 
 #. module: document
 #: view:document.directory:0
@@ -300,6 +307,7 @@ msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
 msgstr ""
+"Выберите объект тут и там будет одна папка на одну запись этого ресурса."
 
 #. module: document
 #: help:document.directory,domain:0
@@ -415,7 +423,7 @@ msgstr "Документы по теме"
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr "Процесс настройки"
+msgstr "Выполнение настройки"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -492,6 +500,23 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
+"Это полноценная система управления документами:\n"
+"    * Аутентификация пользователей\n"
+"    * Индексация документов:- файлы .pptx и .docx не поддерживаются windows-"
+"платформой.\n"
+"    * Инфо-панель \"Документы\", включающая:\n"
+"        * Новые файлы (список)\n"
+"        * Файлы по типу ресурса (диаграмма)\n"
+"        * Файлы по контрагентам (диаграмма)\n"
+"        * Файлы помесячно (диаграмма)\n"
+"    ВНИМАНИЕ:\n"
+"    - При установке этого модуля в работающей компании, уже хранящей файлы "
+"PDF в базе данных,\n"
+"      файлы будут уничтожены.\n"
+"    - После установки этого модуля, PDF больше не будут храниться в базе "
+"данных,\n"
+"      они будут находиться в подкаталоге корня сервера, например "
+"/server/bin/filestore.\n"
 
 #. module: document
 #: help:document.storage,online:0
@@ -534,6 +559,8 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Отметьте, если требуется, чтобы название файла содержало название записи.\n"
+"Если установлено, каталог должен быть ресурсом."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -580,6 +607,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Вместе с родительской моделью этот идентификатор прикладывает этот каталог к "
+"конкретной записи родительской модели."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -635,6 +664,10 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Если вы поместите объект сюда, то этот шаблон каталога будет появляться ниже "
+"всех этих объектов. Такие каталоги являются \"приложенными\" к конкретной "
+"модели или записи. Не помещайте родительский каталог если вы выбрали "
+"родительскую модель."
 
 #. module: document
 #: view:document.directory:0
@@ -675,7 +708,7 @@ msgstr "Интегрированная система управления до
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr ""
+msgstr "Выбрать следующие Ресурсы для автоматической конфигурации каталогов."
 
 #. module: document
 #: view:ir.attachment:0
@@ -734,7 +767,7 @@ msgstr "Префикс"
 #. module: document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr ""
+msgstr "Время последнего размещения"
 
 #. module: document
 #: field:report.document.user,datas_fname:0
@@ -879,6 +912,8 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"Название поля. Обратите внимание: написанное здесь будет префиксировано "
+"символами \"dctx_\""
 
 #. module: document
 #: view:report.document.user:0
@@ -973,6 +1008,8 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Однако, эти группы не применяются к вложенным директориям, для которых "
+"должны быть созданы собственные группы."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
@@ -990,8 +1027,8 @@ msgid "Content Name"
 msgstr "Название содержимого"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Имя файла должно быть уникальным!"
@@ -1101,21 +1138,3 @@ msgstr "Тип документа"
 
 #~ msgid "Auto Configure"
 #~ msgstr "Авто настройка"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Файлов в месяц"
-
-#~ msgid "All Months"
-#~ msgstr "Все месяцы"
-
-#~ msgid "My files"
-#~ msgstr "Мои файлы"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Мои файлы (Все месяцы)"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Мои файлы (Текущий месяц)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Файлы всех пользователей (Текущий месяц)"
diff --git a/addons/document/i18n/sk.po b/addons/document/i18n/sk.po
index afdbb5274f8..e9e9b8985d1 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -979,8 +979,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index 111b8da22ec..e116273bc3c 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr "Imenik dokumenta"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr "Ime vsebine"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
@@ -1130,30 +1130,3 @@ msgstr "Vrsta dokumenta"
 #~ msgstr ""
 #~ "Tukaj vnesite naslov strežnika ali njegov IP. Če ne veste, kaj bi napisali, "
 #~ "ohranite localhost."
-
-#~ msgid "Files Per Month"
-#~ msgstr "Datotek na mesec"
-
-#~ msgid "All Months"
-#~ msgstr "Vsi meseci"
-
-#~ msgid "My files"
-#~ msgstr "Moje datoteke"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Moje datoteke (vsi meseci)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Ime zadnje objavljene datoteke"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Moje datoteke (ta mesec)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Upravljanje dokumentov - poročila"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Vse uporabniške datoteke (vsi meseci)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Vse datoteke uporabnika (ta mesec)"
diff --git a/addons/document/i18n/sq.po b/addons/document/i18n/sq.po
index a303a333ee0..85e913f1c13 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -977,8 +977,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/sr.po b/addons/document/i18n/sr.po
index 451b173f5b7..64ebc17ac1b 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -243,8 +243,8 @@ msgid "Document directory"
 msgstr "Direktorijum dokumenta"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1023,8 +1023,8 @@ msgid "Content Name"
 msgstr "Naziv sadržaja"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Ime Polja mora biti jedinstveno!"
@@ -1203,33 +1203,3 @@ msgstr "Tip Dokumenta"
 
 #~ msgid "Browse Files"
 #~ msgstr "Pretraži Fajlove"
-
-#~ msgid "All Months"
-#~ msgstr "Svi meseci"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Falova za Mesec"
-
-#~ msgid "My files"
-#~ msgstr "Moji Fajlovi"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Moji Fajlovi(Ovaj Mesec)"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Moji Fajlovi (svi Meseci)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Zadnje postavljeno Ime Fajla"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Upravljanje Dokumentima - Izveštavanje"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Fajlovi svih Korisnika (Svi meseci)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Svi Korisnicki Fajlovi ( Ovaj Mesec)"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni"
diff --git a/addons/document/i18n/sr@latin.po b/addons/document/i18n/sr@latin.po
index 8a9a5dc12d7..06c5562650f 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -243,8 +243,8 @@ msgid "Document directory"
 msgstr "Direktorijum dokumenta"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -1023,8 +1023,8 @@ msgid "Content Name"
 msgstr "Naziv sadržaja"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "Ime Polja mora biti jedinstveno!"
@@ -1081,9 +1081,6 @@ msgstr "Tip Dokumenta"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni"
-
 #~ msgid ""
 #~ "If you put an object here, this directory template will appear bellow all of "
 #~ "these objects. Don't put a parent directory if you select a parent model."
@@ -1206,30 +1203,3 @@ msgstr "Tip Dokumenta"
 
 #~ msgid "Browse Files"
 #~ msgstr "Pretraži Fajlove"
-
-#~ msgid "All Months"
-#~ msgstr "Svi meseci"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Falova za Mesec"
-
-#~ msgid "My files"
-#~ msgstr "Moji Fajlovi"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Moji Fajlovi(Ovaj Mesec)"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Moji Fajlovi (svi Meseci)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Zadnje postavljeno Ime Fajla"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Upravljanje Dokumentima - Izveštavanje"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Fajlovi svih Korisnika (Svi meseci)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Svi Korisnicki Fajlovi ( Ovaj Mesec)"
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index e2e6cfca9c8..55a80b67722 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr "Document directory"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -979,8 +979,8 @@ msgid "Content Name"
 msgstr "Content Name"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "File name must be unique!"
@@ -1109,33 +1109,6 @@ msgstr "Document Type"
 #~ msgid "Preview"
 #~ msgstr "Preview"
 
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "    * FTP Interface\n"
-#~ "    * User Authentication\n"
-#~ "    * Document Indexation\n"
-#~ "\n"
-#~ "    ATTENTION: \n"
-#~ "    - When you install this module in a running company that have already "
-#~ "PDF files stored into the database, \n"
-#~ "      you will lose them all. \n"
-#~ "    - After installing this module PDF's are not longer stored into the "
-#~ "database, \n"
-#~ "      but in the servers rootpad like /server/bin/filestore.\n"
-#~ msgstr ""
-#~ "This is a complete document management system:\n"
-#~ "    * FTP Interface\n"
-#~ "    * User Authentication\n"
-#~ "    * Document Indexation\n"
-#~ "\n"
-#~ "    ATTENTION: \n"
-#~ "    - When you install this module in a running company that have already "
-#~ "PDF files stored into the database, \n"
-#~ "      you will lose them all. \n"
-#~ "    - After installing this module PDF's are not longer stored into the "
-#~ "database, \n"
-#~ "      but in the servers rootpad like /server/bin/filestore.\n"
-
 #~ msgid "Directorie's Structure"
 #~ msgstr "Katalogstruktur"
 
diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po
index e0cc274cf28..bfe0aa3477a 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 3f181875348..b30fddb54d8 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: 2011-06-11 04:56+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -1114,27 +1114,3 @@ msgstr "Belge Türü"
 
 #~ msgid "Cancel"
 #~ msgstr "İptal"
-
-#~ msgid "All Months"
-#~ msgstr "Tüm Aylar"
-
-#~ msgid "My files"
-#~ msgstr "Dosyalarım"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Yıl Raporu (Tüm Aylar)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Son Gönderilen Dosya Adı"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Dosyalarım (Bu Aykiler)"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Döküman Yönetimi - Raporlama"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Tüm Kullanıcı Dosyaları (Tüm Aylar)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Tüm Kullancı Dosyaları ( Bu Ay )"
diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po
index 380ea56f2c2..d42ed662d1b 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
@@ -1038,6 +1038,3 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#~ msgid "All Months"
-#~ msgstr "Всі місяці"
diff --git a/addons/document/i18n/vi.po b/addons/document/i18n/vi.po
index 88851eb7198..3ac428a2b6c 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -64,7 +64,7 @@ msgstr ""
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -91,7 +91,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: document
 #: view:document.configuration:0
@@ -185,7 +185,7 @@ msgstr ""
 #: code:addons/document/document_storage.py:601
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Lỗi!"
 
 #. module: document
 #: help:document.configuration,product:0
@@ -235,8 +235,8 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -343,7 +343,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
@@ -449,7 +449,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười Hai"
 
 #. module: document
 #: field:document.configuration,config_logo:0
@@ -582,7 +582,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -593,7 +593,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -605,7 +605,7 @@ msgstr ""
 #: field:document.directory,group_ids:0
 #: field:document.storage,group_ids:0
 msgid "Groups"
-msgstr ""
+msgstr "Các nhóm"
 
 #. module: document
 #: field:document.directory.content.type,active:0
@@ -616,7 +616,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười Một"
 
 #. module: document
 #: view:ir.attachment:0
@@ -642,7 +642,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: document
 #: view:document.directory:0
@@ -721,7 +721,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: document
 #: field:document.directory.content,prefix:0
@@ -807,7 +807,7 @@ msgstr ""
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -818,7 +818,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
@@ -856,7 +856,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Giêng"
 
 #. module: document
 #: view:document.directory:0
@@ -905,7 +905,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
@@ -938,7 +938,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: document
 #: field:report.document.file,nbr:0
@@ -977,8 +977,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 851ae57ff6e..236ef0db6c3 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Directory"
-msgstr "上级文件夹"
+msgstr "父目录"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Auto Directory Configuration"
-msgstr "自动目录配置"
+msgstr "自动目录设置"
 
 #. module: document
 #: field:document.directory,resource_field:0
@@ -34,12 +34,12 @@ msgstr "名称字段"
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr "文档一览表"
+msgstr "文档控制台"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
 msgid "Process Node"
-msgstr "处理节点"
+msgstr "流程节点"
 
 #. module: document
 #: view:document.directory:0
@@ -51,24 +51,24 @@ msgstr "搜索文档文件夹"
 msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
-msgstr "资源目录中用作名称的字段。若为空则使用“名称”。"
+msgstr "在资源目录中这字段用作名称。若为空则使用“name”。"
 
 #. module: document
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "Directory name contains special characters!"
-msgstr "目录名包含特殊字符！"
+msgstr "目录名中有特殊字符！"
 
 #. module: document
 #: 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
 msgid "Directory Content Type"
-msgstr "目录内容类型"
+msgstr "目录里内容的类型"
 
 #. module: document
 #: view:document.directory:0
@@ -84,13 +84,13 @@ msgstr "文件"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr "每月的文件"
+msgstr "月度文件"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: document
 #: view:document.configuration: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,6 +125,8 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"用于填充字段内容的python表达式\n"
+"在动态目录中，可以用'dir_id'表示当前目录，用'res_id', 'res_model' 来表示当前记录。"
 
 #. module: document
 #: view:report.document.user:0
@@ -154,7 +156,7 @@ 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
 #: view:document.directory:0
@@ -167,7 +169,7 @@ msgstr "目录"
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr "销售单"
+msgstr "销售订单"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
@@ -189,17 +191,17 @@ msgstr "错误！"
 #. module: document
 #: help:document.configuration,product:0
 msgid "Auto directory configuration for Products."
-msgstr "产品的自动文件夹配置"
+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
@@ -214,7 +216,7 @@ msgstr "修改日期"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr "知识管理应用配置"
+msgstr "知识管理应用设置"
 
 #. module: document
 #: view:ir.attachment:0
@@ -226,7 +228,7 @@ msgstr "业务伙伴"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "按用户排列文件"
+msgstr "用户的文件"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -234,8 +236,8 @@ msgid "Document directory"
 msgstr "文档目录"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -270,7 +272,7 @@ msgstr "储存空间"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr "配置资源目录"
+msgstr "设置资源目录"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -299,7 +301,7 @@ 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
@@ -310,7 +312,7 @@ 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
@@ -342,13 +344,13 @@ msgstr "报表"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: document
 #: 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
@@ -358,7 +360,7 @@ msgstr "扩展"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr "创建时间"
+msgstr "已创建"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -368,7 +370,7 @@ msgstr "虚拟文件"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr "修改时间"
+msgstr "已修改"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
@@ -390,12 +392,12 @@ msgstr "自动生成的文件列表"
 #: model:ir.model,name:document.model_document_directory
 #: field:report.document.user,directory:0
 msgid "Directory"
-msgstr "说明"
+msgstr "目录"
 
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr "按业务伙伴排列文件"
+msgstr "业务伙伴文件"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -408,17 +410,17 @@ msgstr "最近修改用户"
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr "相关文档"
+msgstr "关联的文档"
 
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr "域"
+msgstr "范围"
 
 #. module: document
 #: field:document.directory,write_date:0
@@ -430,7 +432,7 @@ msgstr "修改日期"
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr "目录文件详情"
+msgstr "文件详细目录"
 
 #. module: document
 #: view:report.document.user:0
@@ -442,13 +444,13 @@ msgstr "所有用户文件"
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr "按月度排列文件大小"
+msgstr "月度文件大小"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: document
 #: field:document.configuration,config_logo:0
@@ -468,7 +470,7 @@ msgstr "子目录"
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "输入上下文文本，会适用于所有子目录和文件"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -490,6 +492,18 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
+"这是个完整的文档管理系统。\n"
+"支持用户权限\n"
+"支持文件索引：但windows上的.pptx和.docx不支持\n"
+"文档控制台：\n"
+"-新文档\n"
+"-按类别列示文件\n"
+"-按业务伙伴列示文件\n"
+"-按月列示文件\n"
+"\n"
+"注意：\n"
+"- 如果你在一个正在使用的帐套安装此模块，且之前有pdf文件存在数据库里，这些文件都会丢失\n"
+"- 安装了这个模块以后PDF文件不会存在数据哭里了，而是存在服务器的根目录如 server/bin/filestore\n"
 
 #. module: document
 #: help:document.storage,online:0
@@ -506,7 +520,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
@@ -532,6 +546,8 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"如果需要文件名包含记录的名称值，勾这个勾\n"
+"要让这个选项生效，你的目录必须是对应的对象"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -563,36 +579,36 @@ msgstr "在线"
 msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
-msgstr "如果你想使用树结构象系统选定对象, 请选择这"
+msgstr "如果你想在系统中对选择的对象使用树结构, 请选择这"
 
 #. module: document
 #: view:document.directory:0
 msgid "Security"
-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
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr "目录不能设为自己的上级目录。"
+msgstr "目录不能设为自己的父目录。"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -615,7 +631,7 @@ msgstr "生效"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: document
 #: view:ir.attachment:0
@@ -631,6 +647,7 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"你在这里输入一个对象，这个目录模版会在所有这个对象的记录上出现。这些目录附加在对应的对象或记录上，就像附件一样。如果选择了上级模式就不要输入上级目录。"
 
 #. module: document
 #: view:document.directory:0
@@ -641,7 +658,7 @@ msgstr "定义"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: document
 #: view:document.directory:0
@@ -671,7 +688,7 @@ msgstr "完整的文档管理系统"
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr "请从下面选择需要自动目录配置的资源："
+msgstr "请从下面选择需要自动目录设置的资源："
 
 #. module: document
 #: view:ir.attachment:0
@@ -681,7 +698,7 @@ 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
@@ -714,13 +731,13 @@ msgstr "创建者"
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr "按月度排列文件"
+msgstr "月度文件"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: document
 #: field:document.directory.content,prefix:0
@@ -730,7 +747,7 @@ msgstr "前缀"
 #. module: document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr "最近的发布时间"
+msgstr "最近发布时间"
 
 #. module: document
 #: field:report.document.user,datas_fname:0
@@ -740,7 +757,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
@@ -757,7 +774,7 @@ msgstr "外部文件存储设区"
 #: 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
@@ -787,7 +804,7 @@ msgstr "上级模型"
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "用户的文件"
+msgstr "用户文件"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -801,7 +818,7 @@ msgstr "月份"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "报告"
 
 #. module: document
 #: field:document.configuration,product:0
@@ -817,7 +834,7 @@ msgstr "树结构"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
@@ -839,7 +856,7 @@ 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
@@ -855,7 +872,7 @@ msgstr "新文件"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: document
 #: view:document.directory:0
@@ -872,12 +889,12 @@ msgstr "业务伙伴文件"
 msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
-msgstr ""
+msgstr "字段的名称。注意前缀\"dctx_\"会加在你输入的文字前。"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Month"
-msgstr "本月"
+msgstr "该月"
 
 #. module: document
 #: view:ir.attachment:0
@@ -888,7 +905,7 @@ msgstr "备注"
 #: help:document.configuration,sale_order:0
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
-msgstr ""
+msgstr "针对销售订单或已打印的报价单自动创建目录的配置"
 
 #. module: document
 #: help:document.directory,type:0
@@ -899,18 +916,19 @@ 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
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: document
 #: 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
 #: field:document.directory,name:0
@@ -937,7 +955,7 @@ msgstr "如果设置，该介质就是只读的。"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: document
 #: field:report.document.file,nbr:0
@@ -958,7 +976,7 @@ msgstr "只有这些用户组的成员才有权限访问该目录和其中的文
 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
@@ -976,8 +994,8 @@ msgid "Content Name"
 msgstr "内容名称"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "文件名必须唯一！"
@@ -1144,30 +1162,3 @@ msgstr "文档类型"
 #~ "Select an object here and Open ERP will create a mapping for each of these "
 #~ "objects, using the given domain, when browsing through FTP."
 #~ msgstr "通过FTP浏览, 使用给定的域, 在这选择一对象, 系统将创建一个每个对象的列表,"
-
-#~ msgid "Files Per Month"
-#~ msgstr "每月文件"
-
-#~ msgid "My files (This months)"
-#~ msgstr "我的文件（本月）"
-
-#~ msgid "My files (All months)"
-#~ msgstr "我的文件(所有月份)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "最近上传的文件"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "文档管理 - 报表"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "所有用户的文件（所有月份）"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "所有用户的文件（本月）"
-
-#~ msgid "All Months"
-#~ msgstr "所有月份"
-
-#~ msgid "My files"
-#~ msgstr "我的文件"
diff --git a/addons/document/i18n/zh_HK.po b/addons/document/i18n/zh_HK.po
new file mode 100644
index 00000000000..ffab9b63b60
--- /dev/null
+++ b/addons/document/i18n/zh_HK.po
@@ -0,0 +1,1030 @@
+# Chinese (Hong Kong) 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-09-27 13:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Auto Directory Configuration"
+msgstr ""
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+msgid "Document board"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_process_node
+msgid "Process Node"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr ""
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: view:document.storage:0
+msgid "Group By..."
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr ""
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "March"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid "title"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr ""
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"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"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Year"
+msgstr ""
+
+#. module: document
+#: field:document.storage,path:0
+msgid "Path"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#, python-format
+msgid "Directory name must be unique!"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr ""
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.storage,dir_ids:0
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr ""
+
+#. module: document
+#: field:document.configuration,sale_order:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:document.configuration,project:0
+msgid "Project"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_storage.py:573
+#: code:addons/document/document_storage.py:601
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: document
+#: help:document.configuration,product:0
+msgid "Auto directory configuration for Products."
+msgstr ""
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr ""
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+#: field:report.files.partner,partner:0
+msgid "Partner"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr ""
+
+#. module: document
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr ""
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,storage_id:0
+msgid "Storage"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid "Configure Resource Directory"
+msgstr ""
+
+#. module: document
+#: field:ir.attachment,file_size:0
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+#: field:report.files.partner,file_size:0
+msgid "File Size"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+#: view:document.storage:0
+#: field:document.storage,type:0
+msgid "Type"
+msgstr ""
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and there will be one folder per record of that "
+"resource."
+msgstr ""
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Partner"
+msgstr ""
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr ""
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "July"
+msgstr ""
+
+#. module: document
+#: 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 ""
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Created"
+msgstr ""
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modified"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_storage.py:639
+#, python-format
+msgid "Error at doc write!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr ""
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:document.storage,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr ""
+
+#. module: document
+#: field:document.configuration,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:document.storage,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "December"
+msgstr ""
+
+#. module: document
+#: field:document.configuration,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr ""
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"    * User Authentication\n"
+"    * Document Indexation :- .pptx and .docx files are not support in "
+"windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files by Month (graph)\n"
+"    ATTENTION:\n"
+"    - When you install this module in a running company that have already "
+"PDF files stored into the database,\n"
+"      you will lose them all.\n"
+"    - After installing this module PDF's are no longer stored into the "
+"database,\n"
+"      but in the servers rootpad like /server/bin/filestore.\n"
+msgstr ""
+
+#. module: document
+#: help:document.storage,online:0
+msgid ""
+"If not checked, media is currently offline and its contents not available"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: field:document.storage,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+#: field:report.document.wall,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr ""
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:document.storage,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Auto Configure Directory"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr ""
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr ""
+
+#. module: document
+#: field:document.storage,online:0
+msgid "Online"
+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 ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Security"
+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 ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
+msgstr ""
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "June"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0
+#: field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:document.storage,group_ids:0
+msgid "Groups"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "November"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,db_datas:0
+msgid "Data"
+msgstr ""
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Such directories are \"attached\" to the specific model or "
+"record, just like attachments. Don't put a parent directory if you select a "
+"parent model."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "October"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr ""
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Database"
+msgstr ""
+
+#. module: document
+#: help:document.configuration,project:0
+msgid "Auto directory configuration for Projects."
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Related to"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid "Choose the following Resouces to auto directory configuration."
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reports_document
+msgid "Dashboard"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: field:document.storage,readonly:0
+msgid "Read Only"
+msgstr ""
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: document
+#: field:document.directory,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "September"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "External file storage"
+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 ""
+
+#. module: document
+#: help:document.storage,path:0
+msgid "For file storage, the root path of the storage"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+#: field:report.document.wall,month:0
+#: field:report.document.wall,name:0
+#: field:report.files.partner,month:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: field:document.configuration,product:0
+msgid "Product"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "May"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+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 ""
+
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+msgid "New Files"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "January"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+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 ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr ""
+
+#. module: document
+#: help:document.configuration,sale_order:0
+msgid ""
+"Auto directory configuration for Sale Orders and Quotation with report."
+msgstr ""
+
+#. module: document
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "February"
+msgstr ""
+
+#. module: document
+#: 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 ""
+
+#. module: document
+#: field:document.directory,name:0
+#: field:document.storage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: document
+#: sql_constraint:document.storage:0
+msgid "The storage path must be unique!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr ""
+
+#. module: document
+#: help:document.storage,readonly:0
+msgid "If set, media is for reading only"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "April"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
+#, python-format
+msgid "File name must be unique!"
+msgstr ""
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Internal File storage"
+msgstr ""
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,name:0
+#: field:report.files.partner,name:0
+msgid "Year"
+msgstr ""
+
+#. module: document
+#: view:document.storage:0
+#: model:ir.model,name:document.model_document_storage
+#: model:ir.ui.menu,name:document.menu_document_storage_media
+msgid "Storage Media"
+msgstr ""
+
+#. module: document
+#: view:document.storage:0
+msgid "Search Document storage"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr ""
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index c71ff5185a1..694e8cd8a6c 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -234,8 +234,8 @@ msgid "Document directory"
 msgstr "文件目錄"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #: code:addons/document/document_directory.py:276
@@ -568,7 +568,7 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 msgid "Security"
-msgstr "保安"
+msgstr "安全"
 
 #. module: document
 #: help:document.directory,ressource_id:0
@@ -976,8 +976,8 @@ msgid "Content Name"
 msgstr "內容名稱"
 
 #. module: document
-#: code:addons/document/document.py:154
-#: code:addons/document/document.py:222
+#: code:addons/document/document.py:226
+#: code:addons/document/document.py:294
 #, python-format
 msgid "File name must be unique!"
 msgstr "檔案名不能重覆！"
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 0c4194847c1..ee89f3d4c6c 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -1557,4 +1557,5 @@ class nodefd_static(StringIO, node_descriptor):
             cr.close()
         StringIO.close(self)
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/report/__init__.py b/addons/document/report/__init__.py
index bfdeacdaae8..f5b827f04b0 100644
--- a/addons/document/report/__init__.py
+++ b/addons/document/report/__init__.py
@@ -18,4 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import document_report
\ No newline at end of file
+import document_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index b9a1652388c..e7fa4efb5be 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,15 +41,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                        <group col="12" colspan="4">
+                        <group>
                         <separator orientation="vertical"/>
                             <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
                             <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
                             <separator orientation="vertical"/>
-                            <field name="name" select="1"/>
-                            <field name="month" select="1"/>
-                            <field name="user" select="1"/>
-                            <field name="directory" select="1"/>
+                            <field name="name"/>
+                            <field name="month"/>
+                            <field name="user"/>
+                            <field name="directory"/>
                         </group>
                </search>
             </field>
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 4f939aab4df..fe42cfb1795 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -209,3 +209,5 @@ cntIndex.register(OpenDoc())
 
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/test_cindex.py b/addons/document/test_cindex.py
index 05101a7a491..a257c2c43a5 100755
--- a/addons/document/test_cindex.py
+++ b/addons/document/test_cindex.py
@@ -51,3 +51,5 @@ for fname in args:
         print "Keyboard interrupt"
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/wizard/__init__.py b/addons/document/wizard/__init__.py
index b143b583426..c4decc58fba 100644
--- a/addons/document/wizard/__init__.py
+++ b/addons/document/wizard/__init__.py
@@ -19,3 +19,5 @@
 #
 ##############################################################################
 import document_configuration
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 40dc2b3afd8..6a69e638b4e 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -22,26 +22,16 @@
 from osv import osv, fields
 
 class document_configuration(osv.osv_memory):
-
     _name='document.configuration'
-    _description = 'Auto Directory Configuration'
+    _description = 'Directory Configuration'
     _inherit = 'res.config'
 
-    _columns = {
-        'sale_order' : fields.boolean('Sale Order', help="Auto directory configuration for Sale Orders and Quotation with report."),
-        'product' : fields.boolean('Product', help="Auto directory configuration for Products."),
-        'project': fields.boolean('Project', help="Auto directory configuration for Projects."),
-    }
-
-
     def execute(self, cr, uid, ids, context=None):
-        conf_id = ids and ids[0] or False
-        conf = self.browse(cr, uid, conf_id, context=context)
         dir_pool = self.pool.get('document.directory')
         data_pool = self.pool.get('ir.model.data')
         model_pool = self.pool.get('ir.model')
         content_pool = self.pool.get('document.directory.content')
-        if conf.sale_order and self.pool.get('sale.order'):
+        if self.pool.get('sale.order'):
             # Sale order
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_sale_order_all')
             if dir_data_id:
@@ -81,7 +71,7 @@ class document_configuration(osv.osv_memory):
                 })
 
                 content_pool.create(cr, uid, {
-                    'name': "Print Qutation",
+                    'name': "Print Quotation",
                     'suffix': "_print",
                     'report_id': order_report_id,
                     'extension': '.pdf',
@@ -90,7 +80,7 @@ class document_configuration(osv.osv_memory):
                 })
 
 
-        if conf.product and self.pool.get('product.product'):
+        if self.pool.get('product.product'):
             # Product
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_product')
             if dir_data_id:
@@ -104,7 +94,7 @@ class document_configuration(osv.osv_memory):
                 'ressource_type_id': mid[0],
             })
 
-        if conf.project and self.pool.get('account.analytic.account'):
+        if self.pool.get('account.analytic.account'):
             # Project
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_project')
             if dir_data_id:
@@ -120,3 +110,5 @@ class document_configuration(osv.osv_memory):
                 'ressource_tree': 1
         })
 document_configuration()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index f6c3131b3a0..a51a7877e60 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -1,31 +1,27 @@
 <openerp>
   <data>
     <record id="view_auto_config_form" model="ir.ui.view">
-        <field name="name">Auto Configure Directory</field>
+        <field name="name">Auto Configure Directories</field>
         <field name="model">document.configuration</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">Knowledge Application Configuration</attribute>
+                <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
-             <separator string="title" position="attributes">
-            	<attribute name="string">Configure Resource Directory</attribute>
-          	</separator>
-          	<xpath expr="//label[@string='description']" position="attributes">
-            <attribute name="string">Choose the following Resouces to auto directory configuration.</attribute>
-          </xpath>
-          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-  				<attribute name="rowspan">12</attribute>
-      			<attribute name="string"/>
-	      	</xpath>
+            <separator string="title" position="attributes">
+            <attribute name="string">Configure Direcories</attribute>
+            </separator>
+            <xpath expr="//label[@string='description']" position="attributes">
+            <attribute name="string">OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</attribute>
+            </xpath>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="rowspan">12</attribute>
+                    <attribute name="string"/>
+            </xpath>
             <group string="res_config_contents" position="replace">
-                <group col="6" colspan="4">
-                    <field name="sale_order"/>
-                    <field name="product"/>
-                    <field name="project"/>
-                </group>
+                  <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
             </group>
             <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
@@ -33,7 +29,7 @@
     </record>
 
     <record id="action_config_auto_directory" model="ir.actions.act_window">
-        <field name="name">Auto Configure Directory</field>
+        <field name="name">Configure Directories</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.configuration</field>
         <field name="view_id" ref="view_auto_config_form"/>
@@ -50,7 +46,6 @@
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
         <field name="category_id" ref="category_knowledge_mgmt_config"/>
-        <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         <field name="type">automatic</field>
     </record>
   </data>
diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py
index af514df8985..b86320f9909 100644
--- a/addons/document_ftp/__init__.py
+++ b/addons/document_ftp/__init__.py
@@ -21,4 +21,6 @@
 import ftpserver
 import wizard
 
+post_load = ftpserver.start_server
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 2683ba5ef0a..499a928c077 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Integrated FTP Server with Document Management System',
+    'name': 'Shared Repositories (FTP)',
     'version': '1.99',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 This is a support FTP Interface with document management system.
@@ -51,6 +51,7 @@ FTP client.
     'active': False,
     'certificate': '00934787762705016005',
     'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
+    'post_load': 'post_load',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index d110267f175..2e09a938a05 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -26,41 +26,42 @@ import abstracted_fs
 import netsvc
 from tools import config
 
-HOST = config.get('ftp_server_host', '127.0.0.1')
-PORT = int(config.get('ftp_server_port', '8021'))
-PASSIVE_PORTS = None
-pps = config.get('ftp_server_passive_ports', '').split(':')
-if len(pps) == 2:
-    PASSIVE_PORTS = int(pps[0]), int(pps[1])
+def start_server():
+    HOST = config.get('ftp_server_host', '127.0.0.1')
+    PORT = int(config.get('ftp_server_port', '8021'))
+    PASSIVE_PORTS = None
+    pps = config.get('ftp_server_passive_ports', '').split(':')
+    if len(pps) == 2:
+        PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
-class ftp_server(threading.Thread):
-    def log(self, level, message):
-        logger = netsvc.Logger()
-        logger.notifyChannel('FTP', level, message)
+    class ftp_server(threading.Thread):
+        def log(self, level, message):
+            logger = netsvc.Logger()
+            logger.notifyChannel('FTP', level, message)
 
-    def run(self):
-        autho = authorizer.authorizer()
-        ftpserver.FTPHandler.authorizer = autho
-        ftpserver.max_cons = 300
-        ftpserver.max_cons_per_ip = 50
-        ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
-        if PASSIVE_PORTS:
-            ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
+        def run(self):
+            autho = authorizer.authorizer()
+            ftpserver.FTPHandler.authorizer = autho
+            ftpserver.max_cons = 300
+            ftpserver.max_cons_per_ip = 50
+            ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
+            if PASSIVE_PORTS:
+                ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-        ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
-        ftpserver.logline = lambda msg: None
-        ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
+            ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
+            ftpserver.logline = lambda msg: None
+            ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
 
-        ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
-        ftpd.serve_forever()
+            ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
+            ftpd.serve_forever()
 
-if HOST.lower() == 'none':
-    netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
-else:
-    netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
-    ds = ftp_server()
-    ds.daemon = True
-    ds.start()
+    if HOST.lower() == 'none':
+        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
+    else:
+        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        ds = ftp_server()
+        ds.daemon = True
+        ds.start()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index b8ce97a7017..83cd1cde725 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -11,6 +11,7 @@ import fnmatch
 
 import pooler
 import netsvc
+import sql_db
 
 from service import security
 from osv import osv
@@ -68,7 +69,7 @@ class abstracted_fs(object):
             db, cr = None, None
             try:
                 try:
-                    db = pooler.get_db(db_name)
+                    db = sql_db.db_connect(db_name)
                     cr = db.cursor()
                     cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'")
                     if not cr.fetchone():
diff --git a/addons/document_ftp/i18n/ar.po b/addons/document_ftp/i18n/ar.po
new file mode 100644
index 00000000000..d0483dce57c
--- /dev/null
+++ b/addons/document_ftp/i18n/ar.po
@@ -0,0 +1,135 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-18 07:10+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: 2011-11-19 05:13+0000\n"
+"X-Generator: Launchpad (build 14299)\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 ""
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. 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 ""
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr ""
+
+#. 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 ""
diff --git a/addons/document_ftp/i18n/bg.po b/addons/document_ftp/i18n/bg.po
index 53e3e11708c..5602a7bfff0 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b9804f04d9c..65b779230ae 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fcd25f5a230..789ed228fc7 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: 2011-05-10 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2ab7f3cb7b9..e521440813e 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Suche Dokument"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/document_ftp/i18n/el.po b/addons/document_ftp/i18n/el.po
index 7e82bf94209..93cd9d4f7a8 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..a7e850e1f74
--- /dev/null
+++ b/addons/document_ftp/i18n/en_GB.po
@@ -0,0 +1,147 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-08-25 17:39+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: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Auto Directory Configuration"
+
+#. 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 ""
+"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.."
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Configuration Progress"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Browse Files"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Image"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Address"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP Server"
+
+#. 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
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Browse"
+
+#. 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 address or IP and port to which users should connect for DMS access"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Shared Repository (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Configure FTP Server"
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr "Integrated FTP Server with Document Management System"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "title"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "Document FTP Browse"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Knowledge Application Configuration"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Document Browse"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Browse Document"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index c5fa0eeeec4..d2728e21dc0 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Navegar por los documentos"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contenidos"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear un menú recursivo"
diff --git a/addons/document_ftp/i18n/es_EC.po b/addons/document_ftp/i18n/es_EC.po
index d9be58d6ed5..1d9a87506ab 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es_MX.po b/addons/document_ftp/i18n/es_MX.po
new file mode 100644
index 00000000000..4c568d4513e
--- /dev/null
+++ b/addons/document_ftp/i18n/es_MX.po
@@ -0,0 +1,148 @@
+# 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 22:59+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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Configuración automática de directorios"
+
+#. 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 ""
+"Indique la dirección de red en la cual su servidor de OpenERP debería estar "
+"accesible para los usuarios finales. Esto depende de su topología de red y "
+"configuración, y sólo afectará a los enlaces mostrados a los usuarios. El "
+"formato es SERVIDOR:PUERTO y el servidor por defecto (localhost) sólo es "
+"adecuado para el acceso desde la propia máquina del servidor."
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Navegar por los archivos"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "Servidor FTP"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "Configuración del servidor FTP"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+"Proporciona un interfaz FTP para el sistema de gestión de documentos.\n"
+"        Además del acceso a los documentos a través de OpenERP, este módulo\n"
+"        permite acceder a los mismos a través del sistema de archivos "
+"utilizando un\n"
+"        cliente FTP.\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Navegar"
+
+#. 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 ""
+"Dirección del servidor o IP y el puerto para acceder al sistema de gestión "
+"de documentos."
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Directorio compartido de documentos (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Configurar servidor FTP"
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr "Servidor FTP integrado al sistema de gestión de documentos"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "título"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "Navegar por los documentos por FTP"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Configuración aplicación del conocimiento"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Navegar por los documentos"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Navegar por los documentos"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
diff --git a/addons/document_ftp/i18n/es_PY.po b/addons/document_ftp/i18n/es_PY.po
index c4582df0f20..9971dc9ac69 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es_VE.po b/addons/document_ftp/i18n/es_VE.po
new file mode 100644
index 00000000000..4c568d4513e
--- /dev/null
+++ b/addons/document_ftp/i18n/es_VE.po
@@ -0,0 +1,148 @@
+# 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 22:59+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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Configuración automática de directorios"
+
+#. 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 ""
+"Indique la dirección de red en la cual su servidor de OpenERP debería estar "
+"accesible para los usuarios finales. Esto depende de su topología de red y "
+"configuración, y sólo afectará a los enlaces mostrados a los usuarios. El "
+"formato es SERVIDOR:PUERTO y el servidor por defecto (localhost) sólo es "
+"adecuado para el acceso desde la propia máquina del servidor."
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Navegar por los archivos"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "Servidor FTP"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "Configuración del servidor FTP"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+"Proporciona un interfaz FTP para el sistema de gestión de documentos.\n"
+"        Además del acceso a los documentos a través de OpenERP, este módulo\n"
+"        permite acceder a los mismos a través del sistema de archivos "
+"utilizando un\n"
+"        cliente FTP.\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Navegar"
+
+#. 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 ""
+"Dirección del servidor o IP y el puerto para acceder al sistema de gestión "
+"de documentos."
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Directorio compartido de documentos (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Configurar servidor FTP"
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr "Servidor FTP integrado al sistema de gestión de documentos"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "título"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "Navegar por los documentos por FTP"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Configuración aplicación del conocimiento"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Navegar por los documentos"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Navegar por los documentos"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
diff --git a/addons/document_ftp/i18n/et.po b/addons/document_ftp/i18n/et.po
new file mode 100644
index 00000000000..2be5b2e10cd
--- /dev/null
+++ b/addons/document_ftp/i18n/et.po
@@ -0,0 +1,135 @@
+# Estonian 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-10-11 18:05+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Failide sirvimine"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Pilt"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Aadress"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP server"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP serveri konfiguratsioon"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Sirvi"
+
+#. 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 ""
+
+#. 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 "_Tühista"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "pealkiri"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr ""
+
+#. 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 ""
diff --git a/addons/document_ftp/i18n/fi.po b/addons/document_ftp/i18n/fi.po
index 7dd3b90d649..a8fc275577b 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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 782a630b1ec..a1e54e6cdb1 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -148,9 +148,3 @@ msgstr "Parcourir le document"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/document_ftp/i18n/gl.po b/addons/document_ftp/i18n/gl.po
index 83ea8515209..703241b5c3d 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4af2340745b..190cba86924 100644
--- a/addons/document_ftp/i18n/hu.po
+++ b/addons/document_ftp/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 12:46+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e88b42eb0e3..0d48208cc12 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Sfoglia documento"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
index 29629a4663f..2493fcb4b0f 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -145,26 +145,3 @@ msgstr "Document bladeren"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout! U kunt geen recursief menu maken."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
index 4ee4545fcb1..c805ad33d78 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -133,21 +133,3 @@ msgstr "Przeglądaj dokumenty"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 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 "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index 3f2c71af342..3e17a3791ed 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -139,27 +139,3 @@ msgstr "Ver documento"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ 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 "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura de vista"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index 9a18e3996e5..b1d047a0fac 100644
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Navegar por Documentos"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index 24f332d25cf..1ebe23d5309 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -31,6 +31,10 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Указывает сетевой адрес, на котором сервер OpenERP должен быть доступен для "
+"конечных пользователей. Это зависит от конфигурации и топологии сети и "
+"влияет только на отображение ссылок. Формат АДРЕС:ПОРТ и адрес по умолчанию "
+"(localhost) подходит только для доступа с самого сервера."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -72,11 +76,17 @@ msgid ""
 "using the\n"
 "    FTP client.\n"
 msgstr ""
+"Это поддержка интерфейса FTP к системе управления документами.\n"
+"    С помощью этого модуля вы не только получите доступ к документам через "
+"OpenERP,\n"
+"    но вы также сможете соединяться с ней через файловую систему, используя "
+"\n"
+"    FTP-клиент.\n"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "_Browse"
-msgstr ""
+msgstr "_Обзор"
 
 #. module: document_ftp
 #: help:document.ftp.configuration,host:0
@@ -94,7 +104,7 @@ msgstr "Общее хранилище (FTP)"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отмена"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -109,7 +119,7 @@ msgstr "Сервер FTP интегрированный  с системой у
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
diff --git a/addons/document_ftp/i18n/sl.po b/addons/document_ftp/i18n/sl.po
new file mode 100644
index 00000000000..8a48da7bb52
--- /dev/null
+++ b/addons/document_ftp/i18n/sl.po
@@ -0,0 +1,137 @@
+# Slovenian 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-10-19 07:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Avto konfiguracija map"
+
+#. 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 ""
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Brskanje Datoteke"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Naslov"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "Strežnik FTP"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "Konfiguracija FTP strežnika"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Prebrskaj"
+
+#. 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 ""
+"Naslov strežnika ali IP in vrata, na katerega se bodo uporabniki povezali za "
+"DMS dostop"
+
+#. 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 "_Prekliči"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Konfiguriraj FTP strežnik"
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "naslov"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr ""
+
+#. 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/sr.po b/addons/document_ftp/i18n/sr.po
index be9c24c2b27..e8a310683f0 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -141,17 +141,3 @@ msgstr "Pretrazi Dokument"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zaoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index adffdca6b16..4e26b833ebb 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -141,17 +141,3 @@ msgstr "Pretrazi Dokument"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zaoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index ec6b2e2c8a7..d1aa4cf19df 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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d629d255754..c0d68ab3efc 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: 2011-06-24 05:00+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 288c2decb79..84910ef3662 100644
--- a/addons/document_ftp/i18n/zh_CN.po
+++ b/addons/document_ftp/i18n/zh_CN.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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
 msgid "Auto Directory Configuration"
-msgstr "自动目录配置"
+msgstr "自动目录设置"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -31,11 +31,13 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"输入你的最终用户用于连接你OpenERP服务器的网址。基于你的网络配置，会影响客户端显示的链接。格式是：主机:端口。注意localhost只是在服务器本机"
+"才有用的。"
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: document_ftp
 #: model:ir.actions.url,name:document_ftp.action_document_browse
@@ -50,7 +52,7 @@ msgstr "图像"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "地址"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -60,7 +62,7 @@ msgstr "FTP 服务器"
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
 msgid "FTP Server Configuration"
-msgstr "FTP 服务器配置"
+msgstr "FTP 服务器设置"
 
 #. module: document_ftp
 #: model:ir.module.module,description:document_ftp.module_meta_information
@@ -71,7 +73,7 @@ msgid ""
 "    but you would also be able to connect with them through the file system "
 "using the\n"
 "    FTP client.\n"
-msgstr ""
+msgstr "此模块为文档管理增加了FTP支持。安装了这个模块你不仅可以在OpenERP里访问文档还能通过FTP客户端在文件系统上访问这些文件。\n"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
@@ -82,7 +84,7 @@ msgstr "浏览(_B)"
 #: help:document.ftp.configuration,host:0
 msgid ""
 "Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
+msgstr "服务器地址或IP地址，以及端口。用于用户连接文档管理系统。"
 
 #. module: document_ftp
 #: model:ir.ui.menu,name:document_ftp.menu_document_browse
@@ -117,7 +119,7 @@ msgstr "文档 FTP 浏览"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr "知识管理应用配置"
+msgstr "知识管理应用设置"
 
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
@@ -132,4 +134,4 @@ msgstr "浏览文档"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 872456e7191..33ce1416ec8 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -100,12 +100,13 @@
         fdata = StringIO('abcd')
         ftp.storbinary('STOR test2.txt', fdata)
         ftp.close()
+        cr.commit()
 -
     I look for the "test2.txt" file at the server
 -
     !python {model: ir.attachment }: |
         ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
-        assert ids
+        assert ids, "No test2.txt file found."
 -
     I delete the "test2.txt" file using FTP.
 -
@@ -115,12 +116,13 @@
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
         ftp.delete('test2.txt')
         ftp.close()
+        cr.commit()
 -
     I check at the server that test2.txt is deleted
 -
     !python {model: ir.attachment }: |
         ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
-        assert not ids
+        assert not ids, "test2.txt file can still be found."
 -
     I create a test2.txt file again.
 -
@@ -131,6 +133,7 @@
         fdata = StringIO('abcd')
         ftp.storbinary('STOR test2.txt', fdata)
         ftp.close()
+        cr.commit()
 -
     I delete the test2.txt from the server (RPC).
 -
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index f05fac397bf..0a3ff33333e 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -4,6 +4,7 @@
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         ftp = te.get_plain_ftp(timeout=1.0)
+        cr.commit()
 - |
     I create two partners 'Partner1' and 'Partner2'.
     I create three partner categories: 'none', 'pat1' and 'all'
@@ -53,6 +54,7 @@
         dirs = ftp.nlst()
         for dir in [ 'All Partner1+2', 'No partners', 'Pat 1' ]:
             assert dir in dirs, "Dir %s not in folder" % dir
+        cr.commit()
 -
     I create a 'partners' folder by the first resource one.
 -
@@ -79,6 +81,7 @@
         for dir in correct:
             res = ftp.nlst(dir+'/Partners of Test')
             assert res == correct[dir], "Dir %s falsely contains %s" %(dir, res)
+        cr.commit()
 -
     I create an ir.attachment, attached (not related) to Partner1
 -
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index ac2cd722478..16bace4b167 100644
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -36,13 +36,13 @@ def get_plain_ftp(timeout=10.0):
 
 def get_ftp_login(cr, uid, ormobj):
     ftp = get_plain_ftp()
-    user = ormobj.pool.get('res.users').read(cr, uid, uid)
-    passwd = user.get('password','')
+    user = ormobj.pool.get('res.users').browse(cr, uid, uid)
+    passwd = user.password or ''
     if passwd.startswith("$1$"):
-        # md5 by base crypt. We cannot decode, wild guess 
+        # md5 by base crypt. We cannot decode, wild guess
         # that passwd = login
-        passwd = user.get('login', '')
-    ftp.login(user.get('login',''), passwd)
+        passwd = user.login
+    ftp.login(user.login, passwd)
     ftp.cwd("/" + cr.dbname)
     return ftp
 
@@ -68,3 +68,5 @@ def get_ftp_fulldata(ftp, fname, limit=8192):
     return ''.join(data)
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 6e182082aeb..e8f127c3c3b 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -61,3 +61,5 @@ class document_ftp_browse(osv.osv_memory):
         }
 
 document_ftp_browse()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 0ae133bb92a..5da2ddf11e8 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -48,3 +48,5 @@ class document_ftp_configuration(osv.osv_memory):
                 {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/' + cr.dbname+'/'})
 
 document_ftp_configuration()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 56bb8f11fee..7d718266d6a 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Support for iCal based on Document Management System',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "normal",
     'description': """
 Allows to synchronise calendars with others applications.
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index a751fb2ca6f..0b31eb85d73 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -21,9 +21,6 @@
                           <attribute name="rowspan">15</attribute>
                           <attribute name="string"/>
                   </xpath>
-                  <xpath expr="//button[@name='action_next']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                   </xpath>
                   <group string="res_config_contents" position="replace">
                   <field name="meeting"/>
                   <field name="opportunity"/>
diff --git a/addons/document_ics/i18n/ar.po b/addons/document_ics/i18n/ar.po
index 55ac615953b..0c31ed477fd 100644
--- a/addons/document_ics/i18n/ar.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/bg.po b/addons/document_ics/i18n/bg.po
index b68c7ae039b..40f1dc110f2 100644
--- a/addons/document_ics/i18n/bg.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/bs.po b/addons/document_ics/i18n/bs.po
index c774c441300..e6dfff2b9ad 100644
--- a/addons/document_ics/i18n/bs.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/ca.po b/addons/document_ics/i18n/ca.po
index 61bd8ee97d3..5962a8d84ad 100644
--- a/addons/document_ics/i18n/ca.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -23,6 +23,8 @@ msgid ""
 "Manages the supplier and customers claims,including your corrective or "
 "preventive actions."
 msgstr ""
+"Gestiona les reclamacions de proveïdors i clients, incloent les seves "
+"accions correctives o preventives."
 
 #. module: document_ics
 #: field:document.directory.content,object_id:0
@@ -60,7 +62,7 @@ msgstr "Assistència/Ajuda"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "Interval en hores"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -73,6 +75,8 @@ msgid ""
 "The field of the                         object used in the filename. Has to "
 "be a unique identifier."
 msgstr ""
+"El camp de l'objecte utilitzat en el nom de fitxer. Ha de ser un "
+"identificador únic."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -89,6 +93,7 @@ msgstr "Calendari de reunions"
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
+"OpenERP pot crear i pre-configurar una sèrie de calendaris integrats."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -108,7 +113,7 @@ msgstr "resum"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_crm_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "Reunió"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,lead:0
@@ -116,6 +121,9 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Permet realitzar el seguiment i gestionar iniciatives que són peticions de "
+"pre-vendes o contactes, el primer contacte d'una sol·licitud d'un possible "
+"client."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -125,7 +133,7 @@ msgstr "descripció"
 #. module: document_ics
 #: field:document.directory.ics.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "Funció"
 
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
@@ -141,7 +149,7 @@ msgstr ""
 #. module: document_ics
 #: field:document.ics.crm.wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,jobs:0
@@ -149,11 +157,13 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Li ajuda a organitzar el procés de contractació dels treballadors: "
+"l'avaluació, les reunions, la integració amb el correu electrònic, ..."
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
@@ -163,12 +173,12 @@ msgstr "Operacions d'obtenció de fons"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_content
 msgid "Directory Content"
-msgstr ""
+msgstr "Contingut directori"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_ics_fields
 msgid "Document Directory ICS Fields"
-msgstr ""
+msgstr "Camps ICS directori document"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
@@ -181,6 +191,8 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Li ajuda a codificar el resultat d'una trucada telefònica o planificar una "
+"llista de trucades telefòniques a processar."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,document_ics:0
@@ -188,11 +200,13 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Li permet sincronitzar els seus calendaris OpenERP amb el seu telèfon, "
+"Outlook, Sunbird, iCal,.."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "OpenERP Field"
-msgstr ""
+msgstr "Camp d'OpenERP"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -207,7 +221,7 @@ msgstr "Valor ICS"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Expression as constant"
-msgstr ""
+msgstr "Expressió com a constant"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -227,7 +241,7 @@ msgstr "Nom"
 #. module: document_ics
 #: help:document.directory.ics.fields,fn:0
 msgid "Alternate method                 of calculating the value"
-msgstr ""
+msgstr "Mètode alternatiu per calcular el valor"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
@@ -243,6 +257,8 @@ msgstr "Domini"
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Utilitzat per les companyies per realitzar seguiment d'errors i sol·licituds "
+"de suport de Programari"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -272,7 +288,7 @@ msgstr "data-inici"
 #. module: document_ics
 #: field:document.directory.ics.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Expressió"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
@@ -287,12 +303,12 @@ msgstr "Categories"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "Utilitza el camp"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -302,12 +318,12 @@ msgstr "Crea calendaris pre-configurats"
 #. module: document_ics
 #: field:document.directory.content,fname_field:0
 msgid "Filename field"
-msgstr ""
+msgstr "Camp nom del fitxer"
 
 #. module: document_ics
 #: field:document.directory.content,obj_iterate:0
 msgid "Iterate object"
-msgstr ""
+msgstr "Objecte a iterar"
 
 #. module: document_ics
 #: field:crm.meeting,code:0
@@ -322,7 +338,7 @@ msgstr "Permet sincronitzar calendaris amb altres aplicacions."
 #. module: document_ics
 #: field:document.ics.crm.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -335,16 +351,18 @@ msgid ""
 "If set, a separate                         instance will be created for each "
 "record of Object"
 msgstr ""
+"Si s'estableix, es crearà una instància independent per a cada registre "
+"d'objectes"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_continguts"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
 msgid "Leads"
-msgstr ""
+msgstr "Iniciatives"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
@@ -376,9 +394,6 @@ msgstr "URL"
 msgid "Business Opportunities"
 msgstr "Oportunitats de negoci"
 
-#~ msgid "dt-stamp"
-#~ msgstr "data-impresa"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/document_ics/i18n/cs.po b/addons/document_ics/i18n/cs.po
index 597445ddeb2..7ac5e2d8234 100644
--- a/addons/document_ics/i18n/cs.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/de.po b/addons/document_ics/i18n/de.po
index 834d3794795..b22dffb94fd 100644
--- a/addons/document_ics/i18n/de.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -395,9 +395,6 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Verkaufschancen"
 
-#~ msgid "dt-stamp"
-#~ msgstr "Zeitstempel"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -470,20 +467,5 @@ msgstr "Verkaufschancen"
 #~ msgid "Cancel"
 #~ msgstr "Abbrechen"
 
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "Fehler ! Sie können kein rekursives Sales Team haben."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "ungültiger Modulname in der Aktionsdefinition"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The code of the sales team must be unique !"
-#~ msgstr "Die Kurzbezeichnung für das Vertriebsteam sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/document_ics/i18n/el.po b/addons/document_ics/i18n/el.po
index d50d0eb0899..4ba6be59e93 100644
--- a/addons/document_ics/i18n/el.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -386,12 +386,6 @@ msgstr ""
 #~ msgid "Open ERP Field"
 #~ msgstr "Πεδίο Open ERP"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Σφάλμα! Υπάρχει τμήμα με την ίδια περιγραφή."
-
-#~ msgid "dt-stamp"
-#~ msgstr "dt-stamp"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
 
diff --git a/addons/document_ics/i18n/es.po b/addons/document_ics/i18n/es.po
index 8be4d6fb872..eca0fd85b29 100644
--- a/addons/document_ics/i18n/es.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -394,9 +394,6 @@ msgstr "URL"
 msgid "Business Opportunities"
 msgstr "Oportunidades de negocio"
 
-#~ msgid "dt-stamp"
-#~ msgstr "fecha-impresa"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -473,18 +470,3 @@ msgstr "Oportunidades de negocio"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "¡Error! No puede crear equipos de ventas recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The code of the sales team must be unique !"
-#~ msgstr "¡El código del equipo de ventas debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/document_ics/i18n/es_AR.po b/addons/document_ics/i18n/es_AR.po
index 63a7f1e4d7e..89dd03185b5 100644
--- a/addons/document_ics/i18n/es_AR.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/es_EC.po b/addons/document_ics/i18n/es_EC.po
index 002d95efc4b..96337241c7b 100644
--- a/addons/document_ics/i18n/es_EC.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/es_MX.po b/addons/document_ics/i18n/es_MX.po
new file mode 100644
index 00000000000..8003f32151c
--- /dev/null
+++ b/addons/document_ics/i18n/es_MX.po
@@ -0,0 +1,472 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* document_ics
+#
+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-27 09: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: 2011-09-05 05:38+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,claims:0
+msgid ""
+"Manages the supplier and customers claims,including your corrective or "
+"preventive actions."
+msgstr ""
+"Gestiona las reclamaciones de proveedores y clientes, incluyendo sus "
+"acciones correctivas o preventivas."
+
+#. module: document_ics
+#: field:document.directory.content,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "uid"
+msgstr "uid"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,fund:0
+msgid ""
+"This may help associations in their fund raising process and tracking."
+msgstr ""
+"Esto puede ayudar a las organizaciones en su proceso de obtención de "
+"fondos/inversiones y seguimiento."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,jobs:0
+msgid "Jobs Hiring Process"
+msgstr "Proceso de selección de personal"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure Calendars for CRM Sections"
+msgstr "Configurar calendarios para secciones CRM"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,helpdesk:0
+msgid "Helpdesk"
+msgstr "Asistencia/Ayuda"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,fn:0
+msgid "Interval in hours"
+msgstr "Intervalo en horas"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstamp"
+msgstr "Marca fecha-hora (dtstamp)"
+
+#. module: document_ics
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+"El campo del objeto usado en el nombre de fichero. Debe ser un identificador "
+"único."
+
+#. module: document_ics
+#: field:document.directory.ics.fields,content_id:0
+msgid "Content"
+msgstr "Contenido"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,meeting:0
+msgid "Calendar of Meetings"
+msgstr "Calendario de reuniones"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid ""
+"OpenERP can create and pre-configure a series of integrated calendar for you."
+msgstr ""
+"OpenERP puede crear y pre-configurar para usted una serie de calendarios "
+"integrados."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,helpdesk:0
+msgid "Manages an Helpdesk service."
+msgstr "Gestiona un servicio de asistencia/ayuda."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtend"
+msgstr "fecha-final"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "summary"
+msgstr "resumen"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_crm_meeting
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,lead:0
+msgid ""
+"Allows you to track and manage leads which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
+msgstr ""
+"Permite realizar un seguimiento y gestionar iniciativas que son peticiones "
+"de pre-venta o contactos, el primer contacto con una petición del cliente."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "description"
+msgstr "descripción"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,fn:0
+msgid "Function"
+msgstr "Función"
+
+#. module: document_ics
+#: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
+msgid "Configure Calendars for Sections "
+msgstr "Configurar calendarios para secciones "
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,opportunity:0
+msgid "Tracks identified business opportunities for your sales pipeline."
+msgstr ""
+"Los seguimientos identifican oportunidades de negocio de su proceso de "
+"ventas."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,jobs:0
+msgid ""
+"Helps you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
+msgstr ""
+"Le ayuda a organizar el proceso de contratación de empleados: la evaluación, "
+"las reuniones, la integración con el correo electrónico, ..."
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "title"
+msgstr "título"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,fund:0
+msgid "Fund Raising Operations"
+msgstr "Operaciones de obtención de fondos"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_directory_content
+msgid "Directory Content"
+msgstr "Contenido directorio"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_directory_ics_fields
+msgid "Document Directory ICS Fields"
+msgstr "Campos ICS directorio documento"
+
+#. module: document_ics
+#: model:ir.module.module,shortdesc:document_ics.module_meta_information
+msgid "Support for iCal based on Document Management System"
+msgstr "Soporte para iCal basado en el sistema de gestión documental"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,phonecall:0
+msgid ""
+"Helps you to encode the result of a phone call or to plan a list of phone "
+"calls to process."
+msgstr ""
+"Le ayuda a codificar el resultado de una llamada telefónica o planificar una "
+"lista de llamadas telefónicas a procesar."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,document_ics:0
+msgid ""
+" Will allow you to synchronise your Open ERP calendars with your phone, "
+"outlook, Sunbird, ical, ..."
+msgstr ""
+" Le permite sincronizar sus calendarios OpenERP con su teléfono, Outlook, "
+"Sunbird, ical, ..."
+
+#. module: document_ics
+#: field:document.directory.ics.fields,field_id:0
+msgid "OpenERP Field"
+msgstr "Campo OpenERP"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Calendar"
+msgstr "Calendario ICS"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,name:0
+msgid "ICS Value"
+msgstr "Valor ICS"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,fn:0
+msgid "Expression as constant"
+msgstr "Expresión como constante"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "location"
+msgstr "ubicación"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "asistente"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document_ics
+#: help:document.directory.ics.fields,fn:0
+msgid "Alternate method                 of calculating the value"
+msgstr "Método alternativo para calcular el valor"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,meeting:0
+msgid "Manages the calendar of meetings of the users."
+msgstr "Gestiona el calendario de reuniones de los usuarios."
+
+#. module: document_ics
+#: field:document.directory.content,ics_domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,bugs:0
+msgid "Used by companies to track bugs and support requests on software"
+msgstr ""
+"Usado por compañías para el seguimiento de errores y peticiones de soporte "
+"en software."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "last-modified"
+msgstr "último-modificado"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Mapping"
+msgstr "Mapeo ICS"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,document_ics:0
+msgid "Shared Calendar"
+msgstr "Calendario compartido"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,claims:0
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstart"
+msgstr "fecha-inicio"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,expr:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,bugs:0
+msgid "Bug Tracking"
+msgstr "Seguimiento de errores"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "categories"
+msgstr "categorías"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,fn:0
+msgid "Use the field"
+msgstr "Usar el campo"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Create Pre-Configured Calendars"
+msgstr "Crear calendarios pre-configurados"
+
+#. module: document_ics
+#: field:document.directory.content,fname_field:0
+msgid "Filename field"
+msgstr "Campo nombre fichero"
+
+#. module: document_ics
+#: field:document.directory.content,obj_iterate:0
+msgid "Iterate object"
+msgstr "Objeto a iterar"
+
+#. module: document_ics
+#: field:crm.meeting,code:0
+msgid "Calendar Code"
+msgstr "Código de calendario"
+
+#. module: document_ics
+#: model:ir.module.module,description:document_ics.module_meta_information
+msgid "Allows to synchronise calendars with others applications."
+msgstr "Permite sincronizar calendarios con otras aplicaciones."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "created"
+msgstr "creado"
+
+#. module: document_ics
+#: help:document.directory.content,obj_iterate:0
+msgid ""
+"If set, a separate                         instance will be created for each "
+"record of Object"
+msgstr ""
+"Si se indica, se creará una instancia separada por cada registro de objeto."
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,lead:0
+msgid "Leads"
+msgstr "Iniciativas"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_ics_crm_wizard
+msgid "document.ics.crm.wizard"
+msgstr "documento.ics.crm.asistente"
+
+#. module: document_ics
+#: model:crm.case.section,name:document_ics.section_meeting
+msgid "Shared Calendar Meetings"
+msgstr "Reuniones de calendario compartidas"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,phonecall:0
+msgid "Phone Calls"
+msgstr "Llamadas telefónicas"
+
+#. module: document_ics
+#: field:document.directory.content,ics_field_ids:0
+msgid "Fields Mapping"
+msgstr "Mapeo de campos"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "url"
+msgstr "URL"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,opportunity:0
+msgid "Business Opportunities"
+msgstr "Oportunidades de negocio"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "¡Error! No puede crear directorios recursivos."
+
+#~ msgid "Open ERP Field"
+#~ msgstr "Campo OpenERP"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "document.directory.ics.fields"
+#~ msgstr "documento.directorio.ics.campos"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "¡Error! No puede crear secciones recursivas."
+
+#~ msgid ""
+#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
+#~ "integration..."
+#~ msgstr ""
+#~ "Le permite organizar el proceso de selección de personal: evaluación, "
+#~ "reuniones, integración de correo electrónico, ..."
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid ""
+#~ "Manages the supplier and customers claims, including your corrective or "
+#~ "preventive actions."
+#~ msgstr ""
+#~ "Gestiona las reclamaciones de proveedores y clientes, incluyendo sus "
+#~ "acciones correctivas o preventivas."
+
+#~ msgid "Duration(In Hour)"
+#~ msgstr "Duración (en horas)"
+
+#~ msgid ""
+#~ "Help you to encode the result of a phone call or to planify a list of phone "
+#~ "calls to process."
+#~ msgstr ""
+#~ "Le permite codificar el resultado de una llamada telefónica o planificar "
+#~ "una lista de llamadas telefónicas a realizar."
+
+#~ msgid "Prospect"
+#~ msgstr "Prospección"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid ""
+#~ "Allows you to track and manage prospects which are pre-sales requests or "
+#~ "contacts, the very first contact with a customer request."
+#~ msgstr ""
+#~ "Le permite gestionar y realizar el seguimiento de las prospecciones, que son "
+#~ "contactos o solicitudes de pre-ventas, el primer contacto con una petición "
+#~ "del cliente."
+
+#~ msgid ""
+#~ "This Configuration step use to create Calendars in document for all Case "
+#~ "Sections"
+#~ msgstr ""
+#~ "Este paso de configuración sirve para crear calendarios en documentos para "
+#~ "todas las secciones de casos"
+
+#~ msgid "Used by companies to track bugs and support requests on softwares"
+#~ msgstr ""
+#~ "Utilizado por las compañías para el seguimiento de errores y peticiones de "
+#~ "soporte sobre programas informáticos."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/document_ics/i18n/es_PY.po b/addons/document_ics/i18n/es_PY.po
index 5bb45197215..39a4f1cedca 100644
--- a/addons/document_ics/i18n/es_PY.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/es_VE.po b/addons/document_ics/i18n/es_VE.po
new file mode 100644
index 00000000000..8003f32151c
--- /dev/null
+++ b/addons/document_ics/i18n/es_VE.po
@@ -0,0 +1,472 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* document_ics
+#
+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-27 09: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: 2011-09-05 05:38+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,claims:0
+msgid ""
+"Manages the supplier and customers claims,including your corrective or "
+"preventive actions."
+msgstr ""
+"Gestiona las reclamaciones de proveedores y clientes, incluyendo sus "
+"acciones correctivas o preventivas."
+
+#. module: document_ics
+#: field:document.directory.content,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "uid"
+msgstr "uid"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,fund:0
+msgid ""
+"This may help associations in their fund raising process and tracking."
+msgstr ""
+"Esto puede ayudar a las organizaciones en su proceso de obtención de "
+"fondos/inversiones y seguimiento."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,jobs:0
+msgid "Jobs Hiring Process"
+msgstr "Proceso de selección de personal"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure Calendars for CRM Sections"
+msgstr "Configurar calendarios para secciones CRM"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,helpdesk:0
+msgid "Helpdesk"
+msgstr "Asistencia/Ayuda"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,fn:0
+msgid "Interval in hours"
+msgstr "Intervalo en horas"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstamp"
+msgstr "Marca fecha-hora (dtstamp)"
+
+#. module: document_ics
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+"El campo del objeto usado en el nombre de fichero. Debe ser un identificador "
+"único."
+
+#. module: document_ics
+#: field:document.directory.ics.fields,content_id:0
+msgid "Content"
+msgstr "Contenido"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,meeting:0
+msgid "Calendar of Meetings"
+msgstr "Calendario de reuniones"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid ""
+"OpenERP can create and pre-configure a series of integrated calendar for you."
+msgstr ""
+"OpenERP puede crear y pre-configurar para usted una serie de calendarios "
+"integrados."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,helpdesk:0
+msgid "Manages an Helpdesk service."
+msgstr "Gestiona un servicio de asistencia/ayuda."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtend"
+msgstr "fecha-final"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "summary"
+msgstr "resumen"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_crm_meeting
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,lead:0
+msgid ""
+"Allows you to track and manage leads which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
+msgstr ""
+"Permite realizar un seguimiento y gestionar iniciativas que son peticiones "
+"de pre-venta o contactos, el primer contacto con una petición del cliente."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "description"
+msgstr "descripción"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,fn:0
+msgid "Function"
+msgstr "Función"
+
+#. module: document_ics
+#: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
+msgid "Configure Calendars for Sections "
+msgstr "Configurar calendarios para secciones "
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,opportunity:0
+msgid "Tracks identified business opportunities for your sales pipeline."
+msgstr ""
+"Los seguimientos identifican oportunidades de negocio de su proceso de "
+"ventas."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,jobs:0
+msgid ""
+"Helps you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
+msgstr ""
+"Le ayuda a organizar el proceso de contratación de empleados: la evaluación, "
+"las reuniones, la integración con el correo electrónico, ..."
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "title"
+msgstr "título"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,fund:0
+msgid "Fund Raising Operations"
+msgstr "Operaciones de obtención de fondos"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_directory_content
+msgid "Directory Content"
+msgstr "Contenido directorio"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_directory_ics_fields
+msgid "Document Directory ICS Fields"
+msgstr "Campos ICS directorio documento"
+
+#. module: document_ics
+#: model:ir.module.module,shortdesc:document_ics.module_meta_information
+msgid "Support for iCal based on Document Management System"
+msgstr "Soporte para iCal basado en el sistema de gestión documental"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,phonecall:0
+msgid ""
+"Helps you to encode the result of a phone call or to plan a list of phone "
+"calls to process."
+msgstr ""
+"Le ayuda a codificar el resultado de una llamada telefónica o planificar una "
+"lista de llamadas telefónicas a procesar."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,document_ics:0
+msgid ""
+" Will allow you to synchronise your Open ERP calendars with your phone, "
+"outlook, Sunbird, ical, ..."
+msgstr ""
+" Le permite sincronizar sus calendarios OpenERP con su teléfono, Outlook, "
+"Sunbird, ical, ..."
+
+#. module: document_ics
+#: field:document.directory.ics.fields,field_id:0
+msgid "OpenERP Field"
+msgstr "Campo OpenERP"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Calendar"
+msgstr "Calendario ICS"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,name:0
+msgid "ICS Value"
+msgstr "Valor ICS"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,fn:0
+msgid "Expression as constant"
+msgstr "Expresión como constante"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "location"
+msgstr "ubicación"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "asistente"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document_ics
+#: help:document.directory.ics.fields,fn:0
+msgid "Alternate method                 of calculating the value"
+msgstr "Método alternativo para calcular el valor"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,meeting:0
+msgid "Manages the calendar of meetings of the users."
+msgstr "Gestiona el calendario de reuniones de los usuarios."
+
+#. module: document_ics
+#: field:document.directory.content,ics_domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,bugs:0
+msgid "Used by companies to track bugs and support requests on software"
+msgstr ""
+"Usado por compañías para el seguimiento de errores y peticiones de soporte "
+"en software."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "last-modified"
+msgstr "último-modificado"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Mapping"
+msgstr "Mapeo ICS"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,document_ics:0
+msgid "Shared Calendar"
+msgstr "Calendario compartido"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,claims:0
+msgid "Claims"
+msgstr "Reclamaciones"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstart"
+msgstr "fecha-inicio"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,expr:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,bugs:0
+msgid "Bug Tracking"
+msgstr "Seguimiento de errores"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "categories"
+msgstr "categorías"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,fn:0
+msgid "Use the field"
+msgstr "Usar el campo"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Create Pre-Configured Calendars"
+msgstr "Crear calendarios pre-configurados"
+
+#. module: document_ics
+#: field:document.directory.content,fname_field:0
+msgid "Filename field"
+msgstr "Campo nombre fichero"
+
+#. module: document_ics
+#: field:document.directory.content,obj_iterate:0
+msgid "Iterate object"
+msgstr "Objeto a iterar"
+
+#. module: document_ics
+#: field:crm.meeting,code:0
+msgid "Calendar Code"
+msgstr "Código de calendario"
+
+#. module: document_ics
+#: model:ir.module.module,description:document_ics.module_meta_information
+msgid "Allows to synchronise calendars with others applications."
+msgstr "Permite sincronizar calendarios con otras aplicaciones."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "created"
+msgstr "creado"
+
+#. module: document_ics
+#: help:document.directory.content,obj_iterate:0
+msgid ""
+"If set, a separate                         instance will be created for each "
+"record of Object"
+msgstr ""
+"Si se indica, se creará una instancia separada por cada registro de objeto."
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,lead:0
+msgid "Leads"
+msgstr "Iniciativas"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_ics_crm_wizard
+msgid "document.ics.crm.wizard"
+msgstr "documento.ics.crm.asistente"
+
+#. module: document_ics
+#: model:crm.case.section,name:document_ics.section_meeting
+msgid "Shared Calendar Meetings"
+msgstr "Reuniones de calendario compartidas"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,phonecall:0
+msgid "Phone Calls"
+msgstr "Llamadas telefónicas"
+
+#. module: document_ics
+#: field:document.directory.content,ics_field_ids:0
+msgid "Fields Mapping"
+msgstr "Mapeo de campos"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "url"
+msgstr "URL"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,opportunity:0
+msgid "Business Opportunities"
+msgstr "Oportunidades de negocio"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "¡Error! No puede crear directorios recursivos."
+
+#~ msgid "Open ERP Field"
+#~ msgstr "Campo OpenERP"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "document.directory.ics.fields"
+#~ msgstr "documento.directorio.ics.campos"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "¡Error! No puede crear secciones recursivas."
+
+#~ msgid ""
+#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
+#~ "integration..."
+#~ msgstr ""
+#~ "Le permite organizar el proceso de selección de personal: evaluación, "
+#~ "reuniones, integración de correo electrónico, ..."
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid ""
+#~ "Manages the supplier and customers claims, including your corrective or "
+#~ "preventive actions."
+#~ msgstr ""
+#~ "Gestiona las reclamaciones de proveedores y clientes, incluyendo sus "
+#~ "acciones correctivas o preventivas."
+
+#~ msgid "Duration(In Hour)"
+#~ msgstr "Duración (en horas)"
+
+#~ msgid ""
+#~ "Help you to encode the result of a phone call or to planify a list of phone "
+#~ "calls to process."
+#~ msgstr ""
+#~ "Le permite codificar el resultado de una llamada telefónica o planificar "
+#~ "una lista de llamadas telefónicas a realizar."
+
+#~ msgid "Prospect"
+#~ msgstr "Prospección"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid ""
+#~ "Allows you to track and manage prospects which are pre-sales requests or "
+#~ "contacts, the very first contact with a customer request."
+#~ msgstr ""
+#~ "Le permite gestionar y realizar el seguimiento de las prospecciones, que son "
+#~ "contactos o solicitudes de pre-ventas, el primer contacto con una petición "
+#~ "del cliente."
+
+#~ msgid ""
+#~ "This Configuration step use to create Calendars in document for all Case "
+#~ "Sections"
+#~ msgstr ""
+#~ "Este paso de configuración sirve para crear calendarios en documentos para "
+#~ "todas las secciones de casos"
+
+#~ msgid "Used by companies to track bugs and support requests on softwares"
+#~ msgstr ""
+#~ "Utilizado por las compañías para el seguimiento de errores y peticiones de "
+#~ "soporte sobre programas informáticos."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/document_ics/i18n/et.po b/addons/document_ics/i18n/et.po
index 1aa7684fc0b..1c8fc61408e 100644
--- a/addons/document_ics/i18n/et.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -373,9 +373,6 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Äri võimalused"
 
-#~ msgid "dt-stamp"
-#~ msgstr "dt-stamp"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/document_ics/i18n/fi.po b/addons/document_ics/i18n/fi.po
index fac7b013159..b50eea1f5ef 100644
--- a/addons/document_ics/i18n/fi.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -23,6 +23,8 @@ msgid ""
 "Manages the supplier and customers claims,including your corrective or "
 "preventive actions."
 msgstr ""
+"Hallinnoi toimittajien ja asiakkaiden reklamaatioita, sisältäen sinun "
+"korjaavat tai estävät toiminnot."
 
 #. module: document_ics
 #: field:document.directory.content,object_id:0
@@ -48,7 +50,7 @@ msgstr "Rekrytointiprosessi"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure Calendars for CRM Sections"
-msgstr ""
+msgstr "konfiguroi kalenterit CRM osioittain"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
@@ -58,7 +60,7 @@ msgstr "Helpdesk"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "Väli tuntia"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -71,6 +73,7 @@ msgid ""
 "The field of the                         object used in the filename. Has to "
 "be a unique identifier."
 msgstr ""
+"Objektin kenttä jota käytetään tiedostonnimenä. On oltava uniikki tunniste."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -87,6 +90,7 @@ msgstr "Kokouskalenteri"
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
+"OpenERP voi luoda ja esimääritellä sarjan integroituja kalentereita sinulle."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -106,7 +110,7 @@ msgstr "yhteenveto"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_crm_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "Kokous"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,lead:0
@@ -114,6 +118,9 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Mahdollista sinun seurata ja hallita myyntimahdollisuuksia jotka ovat "
+"esimyynnin pyyntöja tai kontakteja, siis ensimmäisiä kontakteja "
+"asiakaspyyntöihin."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -123,12 +130,12 @@ msgstr "kuvaus"
 #. module: document_ics
 #: field:document.directory.ics.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr ""
+msgstr "Konfiguroi kalenterit osioille "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
@@ -138,7 +145,7 @@ msgstr "Jäljittää tunnistetut liiketoimintamahdollisuudet myyntikanavalle."
 #. module: document_ics
 #: field:document.ics.crm.wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,jobs:0
@@ -150,7 +157,7 @@ msgstr ""
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
@@ -160,12 +167,12 @@ msgstr "Varojenkeräystoiminnot"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_content
 msgid "Directory Content"
-msgstr ""
+msgstr "Hakemiston sisältö"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_ics_fields
 msgid "Document Directory ICS Fields"
-msgstr ""
+msgstr "Dokumettihakemiston ICS kentät"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
@@ -185,11 +192,13 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Sallii sinun synkronoivan OpenERP kalenterisi puhelimesi, "
+"sähköpostiohjelman, Sunbirdin jne. kanssa"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "OpenERP Field"
-msgstr ""
+msgstr "OpenERP kenttä"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -224,7 +233,7 @@ msgstr "Nimi"
 #. module: document_ics
 #: help:document.directory.ics.fields,fn:0
 msgid "Alternate method                 of calculating the value"
-msgstr ""
+msgstr "Toinen metodi arvon laskentaan"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
@@ -240,6 +249,8 @@ msgstr "Toimialue"
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Yritykset käyttävät ohjelmointivirheiden ja ohjelmien tukipyyntöjen "
+"jäljittämiseen"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -249,7 +260,7 @@ msgstr "muokattu viimeksi"
 #. module: document_ics
 #: view:document.directory:0
 msgid "ICS Mapping"
-msgstr ""
+msgstr "ICS mäppäys"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
@@ -269,7 +280,7 @@ msgstr ""
 #. module: document_ics
 #: field:document.directory.ics.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Lauseke"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
@@ -284,32 +295,32 @@ msgstr "luokat"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "Käytä kenttää"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Create Pre-Configured Calendars"
-msgstr ""
+msgstr "Luo esikonfiguroidut kalenterit"
 
 #. module: document_ics
 #: field:document.directory.content,fname_field:0
 msgid "Filename field"
-msgstr ""
+msgstr "Tiedostonnimi kenttä"
 
 #. module: document_ics
 #: field:document.directory.content,obj_iterate:0
 msgid "Iterate object"
-msgstr ""
+msgstr "Iteroi objekti"
 
 #. module: document_ics
 #: field:crm.meeting,code:0
 msgid "Calendar Code"
-msgstr ""
+msgstr "Kalenterikoodi"
 
 #. module: document_ics
 #: model:ir.module.module,description:document_ics.module_meta_information
@@ -319,7 +330,7 @@ msgstr "Sallii kalenterien synkronoinnin muiden sovellusten kanssa."
 #. module: document_ics
 #: field:document.ics.crm.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -361,7 +372,7 @@ msgstr "Puhelut"
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "Kenttien kartoitukset"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index 1a97b10c477..988544ceb8f 100644
--- a/addons/document_ics/i18n/fr.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -394,9 +394,6 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Opportunités d'affaire"
 
-#~ msgid "dt-stamp"
-#~ msgstr "dt-stamp"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/document_ics/i18n/gl.po b/addons/document_ics/i18n/gl.po
index c0ac6a2d759..b864e6a9613 100644
--- a/addons/document_ics/i18n/gl.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/hr.po b/addons/document_ics/i18n/hr.po
index 6ae7414646f..0c4f45c4f73 100644
--- a/addons/document_ics/i18n/hr.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/hu.po b/addons/document_ics/i18n/hu.po
index 33d6857c11f..af6300599d5 100644
--- a/addons/document_ics/i18n/hu.po
+++ b/addons/document_ics/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 13:00+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/id.po b/addons/document_ics/i18n/id.po
index 31dbf1c5d44..991fa187c0d 100644
--- a/addons/document_ics/i18n/id.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/it.po b/addons/document_ics/i18n/it.po
index 9e89345b25a..c568eae8f0a 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -470,12 +470,3 @@ msgstr "Opportunità"
 
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "Copy text   \t document.directory.ics.fields"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/document_ics/i18n/ko.po b/addons/document_ics/i18n/ko.po
index ca13e6682b2..9c7ef137986 100644
--- a/addons/document_ics/i18n/ko.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/lt.po b/addons/document_ics/i18n/lt.po
index bc3f7caa10a..0233aeb20c8 100644
--- a/addons/document_ics/i18n/lt.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -371,6 +371,3 @@ msgstr ""
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
 msgstr ""
-
-#~ msgid "dt-stamp"
-#~ msgstr "dienos-žymė"
diff --git a/addons/document_ics/i18n/mn.po b/addons/document_ics/i18n/mn.po
index db8cc45713c..47ef164a114 100644
--- a/addons/document_ics/i18n/mn.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/nl.po b/addons/document_ics/i18n/nl.po
index 41f6e0eb4be..6a1a4e968e4 100644
--- a/addons/document_ics/i18n/nl.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -391,9 +391,6 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Zakelijke kansen"
 
-#~ msgid "dt-stamp"
-#~ msgstr "datum-stempel"
-
 #~ msgid "Open ERP Field"
 #~ msgstr "OpenERP veld"
 
@@ -468,18 +465,3 @@ msgstr "Zakelijke kansen"
 
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directory.ics.fields"
-
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "Fout ! U kunt geen recursief verkoopteam maken."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The code of the sales team must be unique !"
-#~ msgstr "De verkoopteam code moet uniek zijn!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/document_ics/i18n/nl_BE.po b/addons/document_ics/i18n/nl_BE.po
index 357d457fb99..f4d95041e63 100644
--- a/addons/document_ics/i18n/nl_BE.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/pl.po b/addons/document_ics/i18n/pl.po
index 525c060ada0..e850e66f2a4 100644
--- a/addons/document_ics/i18n/pl.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/pt.po b/addons/document_ics/i18n/pt.po
index ce48182c820..10c4fb41221 100644
--- a/addons/document_ics/i18n/pt.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -376,9 +376,6 @@ msgstr "url"
 msgid "Business Opportunities"
 msgstr "Oportunidades de Negócio"
 
-#~ msgid "dt-stamp"
-#~ msgstr "carimbo-dt"
-
 #~ msgid "Open ERP Field"
 #~ msgstr "Abrir campos Open ERP"
 
diff --git a/addons/document_ics/i18n/pt_BR.po b/addons/document_ics/i18n/pt_BR.po
index 5b8299aa4a7..5dba2c45c16 100644
--- a/addons/document_ics/i18n/pt_BR.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -387,6 +387,3 @@ msgstr "Oportunidades de Negócios"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid "dt-stamp"
-#~ msgstr "dt-stamp"
diff --git a/addons/document_ics/i18n/ro.po b/addons/document_ics/i18n/ro.po
index a6bca9d2184..153ebcbbd1e 100644
--- a/addons/document_ics/i18n/ro.po
+++ b/addons/document_ics/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-18 00:32+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/ru.po b/addons/document_ics/i18n/ru.po
index d0a0cd4e019..8462b659ee9 100644
--- a/addons/document_ics/i18n/ru.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/sl.po b/addons/document_ics/i18n/sl.po
index 194dee78ea9..838e1a87b7a 100644
--- a/addons/document_ics/i18n/sl.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/sq.po b/addons/document_ics/i18n/sq.po
index 2870383664e..415db38e999 100644
--- a/addons/document_ics/i18n/sq.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/sr.po b/addons/document_ics/i18n/sr.po
index d28f7e2937d..3799313fcdd 100644
--- a/addons/document_ics/i18n/sr.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -461,6 +461,3 @@ msgstr "Poslovne Prilike"
 
 #~ msgid "document.directory.ics.fields"
 #~ msgstr "document.directory.ics.fields"
-
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni Prodajni tim."
diff --git a/addons/document_ics/i18n/sr@latin.po b/addons/document_ics/i18n/sr@latin.po
index 169591f2d39..76a49965ff3 100644
--- a/addons/document_ics/i18n/sr@latin.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -393,9 +393,6 @@ msgstr "Poslovne Prilike"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni Prodajni tim."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
diff --git a/addons/document_ics/i18n/sv.po b/addons/document_ics/i18n/sv.po
index d95c01b8b2c..e44ccf87e79 100644
--- a/addons/document_ics/i18n/sv.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/tlh.po b/addons/document_ics/i18n/tlh.po
index 0336661cdb8..2587ffdeadc 100644
--- a/addons/document_ics/i18n/tlh.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 68865d9f480..90312add9f2 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/uk.po b/addons/document_ics/i18n/uk.po
index f8d33aed845..003a43506d1 100644
--- a/addons/document_ics/i18n/uk.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_ics/i18n/vi.po b/addons/document_ics/i18n/vi.po
index 4caecf5c2e1..0f14cdaef9b 100644
--- a/addons/document_ics/i18n/vi.po
+++ b/addons/document_ics/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 14:04+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
@@ -106,7 +106,7 @@ msgstr "tóm tắt"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_crm_meeting
 msgid "Meeting"
-msgstr "Cuộc gặp"
+msgstr "Cuộc họp"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,lead:0
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 8cf8e1c1224..70b99c01f26 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -8,20 +8,20 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-09-09 07:18+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
 msgid ""
 "Manages the supplier and customers claims,including your corrective or "
 "preventive actions."
-msgstr ""
+msgstr "管理客户或供应商的投诉，包括你的纠正和规避措施。"
 
 #. module: document_ics
 #: field:document.directory.content,object_id:0
@@ -37,7 +37,7 @@ msgstr "用户ID"
 #: help:document.ics.crm.wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr "这也许有助于协会筹款的进程和跟踪"
+msgstr "这也许有助于商会的资金运作处理和跟踪"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
@@ -47,7 +47,7 @@ msgstr "招聘流程"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure Calendars for CRM Sections"
-msgstr "设置crm的日程表"
+msgstr "设置客户关系管理里的日程表"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
@@ -57,7 +57,7 @@ msgstr "帮助平台"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "间隔小时数"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -69,7 +69,7 @@ msgstr "标记"
 msgid ""
 "The field of the                         object used in the filename. Has to "
 "be a unique identifier."
-msgstr ""
+msgstr "在文件名中使用的对象字段。必须是可以唯一标识该记录的。"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -85,7 +85,7 @@ msgstr "会议日程表"
 #: view:document.ics.crm.wizard:0
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
-msgstr ""
+msgstr "OpenERP会为您创建和与配置一系列集成的日程表。"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -105,66 +105,66 @@ msgstr "摘要"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_crm_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "会议"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,lead:0
 msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
-msgstr ""
+msgstr "让您跟踪和管理售前请求或联系的线索，第一次接触客户的需求。"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "description"
-msgstr "说明"
+msgstr "描述"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "功能"
 
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr "设置划分的业务个案的日程表 "
+msgstr "设置业务的日程表 "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr "从你的销售渠道跟踪出销售机会"
+msgstr "从你的销售渠道提取出商机"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "设置进度"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,jobs:0
 msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
-msgstr ""
+msgstr "帮你组织人员招聘流程：评估、面试和邮件集成。"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr "筹款运作"
+msgstr "资金运作的操作"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_content
 msgid "Directory Content"
-msgstr ""
+msgstr "目录内容"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_ics_fields
 msgid "Document Directory ICS Fields"
-msgstr ""
+msgstr "文档管理ICS字段"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
@@ -176,7 +176,7 @@ msgstr "文档管理系统支持iCal"
 msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
-msgstr ""
+msgstr "帮你输入电话记录或规划有哪些电话要打。"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,document_ics:0
@@ -188,7 +188,7 @@ msgstr " 允许同步系统日程表,电话等等"
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "OpenERP Field"
-msgstr ""
+msgstr "OpenERP字段"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -203,7 +203,7 @@ msgstr "ICS值"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Expression as constant"
-msgstr ""
+msgstr "表达式常量"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -223,7 +223,7 @@ msgstr "名称"
 #. module: document_ics
 #: help:document.directory.ics.fields,fn:0
 msgid "Alternate method                 of calculating the value"
-msgstr ""
+msgstr "计算这个值的可选方法"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
@@ -233,12 +233,12 @@ msgstr "管理用户的会议日程表"
 #. module: document_ics
 #: field:document.directory.content,ics_domain:0
 msgid "Domain"
-msgstr "域"
+msgstr "范围"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
-msgstr ""
+msgstr "用于公司管理软件缺陷或支持请求"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -268,7 +268,7 @@ msgstr "开始"
 #. module: document_ics
 #: field:document.directory.ics.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "表达式"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
@@ -283,12 +283,12 @@ msgstr "分类"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "用这个字段"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -298,12 +298,12 @@ msgstr "创建预先设置的日程表"
 #. module: document_ics
 #: field:document.directory.content,fname_field:0
 msgid "Filename field"
-msgstr ""
+msgstr "文件名字段"
 
 #. module: document_ics
 #: field:document.directory.content,obj_iterate:0
 msgid "Iterate object"
-msgstr ""
+msgstr "重复对象"
 
 #. module: document_ics
 #: field:crm.meeting,code:0
@@ -318,7 +318,7 @@ msgstr "允许的同步其它应用日程表"
 #. module: document_ics
 #: field:document.ics.crm.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图片"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -330,17 +330,17 @@ msgstr "已创建"
 msgid ""
 "If set, a separate                         instance will be created for each "
 "record of Object"
-msgstr ""
+msgstr "如选中，会为对象的每条记录创建一个单独的实例。"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
 msgid "Leads"
-msgstr ""
+msgstr "线索"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
@@ -355,7 +355,7 @@ msgstr "共享的会议日程表"
 #. module: document_ics
 #: field:document.ics.crm.wizard,phonecall:0
 msgid "Phone Calls"
-msgstr "电话呼叫"
+msgstr "电话访问"
 
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
@@ -365,7 +365,7 @@ msgstr "字段一览"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "url"
-msgstr "信息地址（url）"
+msgstr "URL"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
@@ -375,9 +375,6 @@ msgstr "商机"
 #~ msgid "Open ERP Field"
 #~ msgstr "系统字段"
 
-#~ msgid "dt-stamp"
-#~ msgstr "dt-stamp"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
diff --git a/addons/document_ics/i18n/zh_TW.po b/addons/document_ics/i18n/zh_TW.po
index bf2d8cfdbc0..69464e7039d 100644
--- a/addons/document_ics/i18n/zh_TW.po
+++ b/addons/document_ics/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index ac417e18087..7cd1a38fc80 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -24,4 +24,5 @@ import webdav_server
 
 import document_webdav
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index dc74085ab6f..303f5c70e2c 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -29,10 +29,10 @@
 ##############################################################################
 
 {
-        "name" : "WebDAV server for Document Management",
+        "name" : "Shared Repositories (WebDAV)",
         "version" : "2.3",
         "author" : "OpenERP SA",
-        "category" : "Tools",
+        "category" : "Knowledge Management",
         'complexity': "normal",
         "website": "http://www.openerp.com",
         "description": """
@@ -72,3 +72,5 @@ which needs explicit configuration in openerp-server.conf, too.
         "certificate" : "001236490750845657973",
         '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/cache.py b/addons/document_webdav/cache.py
index 7f03aa6da13..95ff9d31f62 100644
--- a/addons/document_webdav/cache.py
+++ b/addons/document_webdav/cache.py
@@ -37,3 +37,5 @@ def memoize(maxsize):
         return wrapper 
     return decorating_function
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 5e01bf6a66c..772b7600f20 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import pooler
+import sql_db
 
 import os
 import time
@@ -361,7 +362,7 @@ class openerp_dav_handler(dav_interface):
         for db_name in result:
             cr = None
             try:
-                db = pooler.get_db(db_name)
+                db = sql_db.db_connect(db_name)
                 cr = db.cursor()
                 cr.execute("SELECT id FROM ir_module_module WHERE name = 'document' AND state='installed' ")
                 res=cr.fetchone()
@@ -454,7 +455,7 @@ class openerp_dav_handler(dav_interface):
     def get_cr(self, uri, allow_last=False):
         """ Split the uri, grab a cursor for that db
         """
-        pdb = self.parent.auth_proxy.last_auth
+        pdb = self.parent.auth_provider.last_auth
         dbname, uri2 = self.get_db(uri, rest_ret=True, allow_last=allow_last)
         uri2 = (uri2 and uri2.split('/')) or []
         if not dbname:
@@ -462,10 +463,10 @@ class openerp_dav_handler(dav_interface):
         # if dbname was in our uri, we should have authenticated
         # against that.
         assert pdb == dbname, " %s != %s" %(pdb, dbname)
-        res = self.parent.auth_proxy.auth_creds.get(dbname, False)
+        res = self.parent.auth_provider.auth_creds.get(dbname, False)
         if not res:
-            self.parent.auth_proxy.checkRequest(self.parent, uri, dbname)
-            res = self.parent.auth_proxy.auth_creds[dbname]
+            self.parent.auth_provider.checkRequest(self.parent, uri, dbname)
+            res = self.parent.auth_provider.auth_creds[dbname]
         user, passwd, dbn2, uid = res
         db,pool = pooler.get_db_and_pool(dbname)
         cr = db.cursor()
@@ -1022,3 +1023,5 @@ class openerp_dav_handler(dav_interface):
             if cr: cr.close()
 
 #eof
+
+# 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 f5fa7b591d8..da463c9eb1b 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -127,4 +127,5 @@ class dav_file_property(osv.osv):
         
 dav_file_property()
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
index 22580aa5c65..8c79373a06a 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Замести"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Това е завършена система за управление на документи:\n"
-#~ "\t* WebDav интерфейс\n"
-#~ "\t* Удостоверяване на потребителите\n"
-#~ "\t* Индексиране на документите\n"
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
index 49946e0f7fd..d7c2675e121 100644
--- a/addons/document_webdav/i18n/ca.po
+++ b/addons/document_webdav/i18n/ca.po
@@ -8,31 +8,31 @@ 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-04-10 16:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 20:43+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Data de creació"
 
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Error! No podeu crear directoris recursius."
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Search Document properties"
-msgstr ""
+msgstr "Cerca propietats del document"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -40,45 +40,45 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Espai de noms"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
 msgid "DAV properties"
-msgstr ""
+msgstr "Propietats DAV"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "document.webdav.file.property"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Aquestes propietats s'afegiran a les peticions WebDAV"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_file_props
 msgid "DAV properties for documents"
-msgstr ""
+msgstr "Propietats DAV per a documents"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "Error d'importació PyWebDAV!"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: document_webdav
 #: model:ir.module.module,description:document_webdav.module_meta_information
@@ -101,26 +101,43 @@ msgid ""
 "          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
 "          ; these options on\n"
 msgstr ""
+" Amb aquest mòdul s'activa el servidor WebDAV per als documents.\n"
+"        Podeu utilitzar qualsevol navegador compatible per veure els fitxers "
+"adjunts de forma remota OpenObject.\n"
+"\n"
+"        Després de la instal·lació, el servidor WebDAV pot ser controlat en "
+"la secció [webdav] de la configuració del servidor.\n"
+"        Paràmetres de configuració del servidor:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages llauri routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you ca leave\n"
+"          ; these options on\n"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "El directori no pot ser el seu propi pare!"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Context dinàmic"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "Propietats WebDAV"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "El nom de directori ha de ser únic!"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
@@ -130,77 +147,80 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Instal·leu PyWebDAV des de "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
 msgid "DAV properties for folders"
-msgstr ""
+msgstr "Propietats DAV per a carpetes"
 
 #. module: document_webdav
 #: view:document.directory:0
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Properties"
-msgstr ""
+msgstr "Propietats"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,name:0
 #: field:document.webdav.file.property,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
 msgid "document.webdav.dir.property"
-msgstr ""
+msgstr "document.webdav.dir.propietat"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,value:0
 #: field:document.webdav.file.property,value:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Directori"
 
 #. 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 "Usuari de l'última modificació"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
-msgstr ""
+msgstr "Adr"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_date:0
 #: field:document.webdav.file.property,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Data de modificació"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_uid:0
 #: field:document.webdav.file.property,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Creador/a"
 
 #. module: document_webdav
 #: model:ir.module.module,shortdesc:document_webdav.module_meta_information
 msgid "WebDAV server for Document Management"
-msgstr ""
+msgstr "Servidor WebDAV per a gestió de documents"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "El directori ha de tenir un pare o un emmagatzematge."
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Substitut"
diff --git a/addons/document_webdav/i18n/cs.po b/addons/document_webdav/i18n/cs.po
index bea2f438e1f..1de9c415d48 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Toto je kompletní systém pro správu dokumentů:\n"
-#~ "\t* Rozhraní WebDav\n"
-#~ "\t* Uživatelská autentizace\n"
-#~ "\t* Indexace dokumentů\n"
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
index d18c36e4103..c45213396d2 100644
--- a/addons/document_webdav/i18n/da.po
+++ b/addons/document_webdav/i18n/da.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: 2010-10-13 07:44+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-08 21:52+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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -56,7 +56,7 @@ msgstr ""
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppér efter..."
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Dette er et komplet dokumenthåndteringssystem\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* Brugergodkendelse\n"
-#~ "\t* Dokumentindeksering\n"
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index 1114f727664..3ce4761190a 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -230,41 +230,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Substituiere"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Das ist ein komplettes  Dokument Management System:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* Benutzer Authentifizierung\n"
-#~ "\t* Dokument Verschlagwortung\n"
-
-#~ 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 ""
-#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Search Document storage"
-#~ msgstr "Diese Eigenschaften werden bei WebDav Anfragen angefügt"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/document_webdav/i18n/el.po b/addons/document_webdav/i18n/el.po
index 9e4b8c4263e..f082ea870a9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Αυτό είναι ένα ολοκληρωνένο σύστημα διαχείρισης εγγράφων:\n"
-#~ "\t * WebDav περιβάλλον\n"
-#~ "\t * Γνησιότητα Χρήστη\n"
-#~ "\t * Ευρετιριασμός εγγράφων\n"
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
index b719e14fcfd..09544a8a88e 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -224,17 +224,3 @@ msgstr "El directorio debe tener un padre o un almacenamiento."
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Substituir"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Esto es un completo sistema de gestión de documentos:\n"
-#~ "\t* Interfaz WebDav\n"
-#~ "\t* Autenticación de usuario\n"
-#~ "\t* Indexación de documento\n"
-
-#~ msgid "Search Document storage"
-#~ msgstr "Buscar almacenamiento documentos"
diff --git a/addons/document_webdav/i18n/es_EC.po b/addons/document_webdav/i18n/es_EC.po
index 8fc5ed9edd4..98c54d7b7b4 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Esto es un completo sistema de gestión de documentos:\n"
-#~ "\t* Interfaz WebDav\n"
-#~ "\t* Autenticación de usuario\n"
-#~ "\t* Indexación de documento\n"
diff --git a/addons/document_webdav/i18n/es_MX.po b/addons/document_webdav/i18n/es_MX.po
new file mode 100644
index 00000000000..980373d3850
--- /dev/null
+++ b/addons/document_webdav/i18n/es_MX.po
@@ -0,0 +1,226 @@
+# 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: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-13 09:01+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:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "Fecha de creación"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "¡Error! No puede crear directorios recursivos."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "Buscar propiedades del documento"
+
+#. 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 "Espacio de nombres"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "Propiedades 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 "Agrupar por..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_file_props
+msgid "DAV properties for documents"
+msgstr "Propiedades DAV para documentos"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "¡Error de importación PyWebDAV!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "Documento"
+
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid ""
+" With this module, the WebDAV server for the documents is activated.\n"
+"        You can then use any compatible browser to remotely see the "
+"attachments of OpenObject.\n"
+"\n"
+"        After installation, the webDAV server can be controlled by a "
+"[webdav] section in the server's config.\n"
+"        Server Configuration Parameter:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+msgstr ""
+" Con este módulo se activa el servidor WebDAV para los documentos.\n"
+"    Puede utilizar cualquier navegador compatible para ver los archivos "
+"adjuntos de forma remota OpenObject.\n"
+"\n"
+"    Después de la instalación, el servidor WebDAV puede ser controlado en la "
+"sección [webdav] de la configuración del servidor.\n"
+"    Parámetros de configuración del servidor:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "¡El directorio no puede ser su propio padre!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "Propiedades WebDAV"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "¡El nombre de directorio debe ser único!"
+
+#. 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 ""
+"Instale PyWebDAV desde "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr "Propiedades DAV para carpetas"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "documento.webdav.dir.propiedad"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "Usuario última modificación"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Dir"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "Fecha de Modificación"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "Autor"
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr "Servidor WebDAV para gestión de documentos"
+
+#. module: document_webdav
+#: 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: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "Substituir"
diff --git a/addons/document_webdav/i18n/es_PY.po b/addons/document_webdav/i18n/es_PY.po
index 082ae9dd31a..c7182d7552d 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/es_VE.po b/addons/document_webdav/i18n/es_VE.po
new file mode 100644
index 00000000000..980373d3850
--- /dev/null
+++ b/addons/document_webdav/i18n/es_VE.po
@@ -0,0 +1,226 @@
+# 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: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-13 09:01+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:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "Fecha de creación"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "¡Error! No puede crear directorios recursivos."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "Buscar propiedades del documento"
+
+#. 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 "Espacio de nombres"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "Propiedades 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 "Agrupar por..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_file_props
+msgid "DAV properties for documents"
+msgstr "Propiedades DAV para documentos"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "¡Error de importación PyWebDAV!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "Documento"
+
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid ""
+" With this module, the WebDAV server for the documents is activated.\n"
+"        You can then use any compatible browser to remotely see the "
+"attachments of OpenObject.\n"
+"\n"
+"        After installation, the webDAV server can be controlled by a "
+"[webdav] section in the server's config.\n"
+"        Server Configuration Parameter:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+msgstr ""
+" Con este módulo se activa el servidor WebDAV para los documentos.\n"
+"    Puede utilizar cualquier navegador compatible para ver los archivos "
+"adjuntos de forma remota OpenObject.\n"
+"\n"
+"    Después de la instalación, el servidor WebDAV puede ser controlado en la "
+"sección [webdav] de la configuración del servidor.\n"
+"    Parámetros de configuración del servidor:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "¡El directorio no puede ser su propio padre!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "Propiedades WebDAV"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "¡El nombre de directorio debe ser único!"
+
+#. 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 ""
+"Instale PyWebDAV desde "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr "Propiedades DAV para carpetas"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "documento.webdav.dir.propiedad"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "Usuario última modificación"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Dir"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "Fecha de Modificación"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "Autor"
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr "Servidor WebDAV para gestión de documentos"
+
+#. module: document_webdav
+#: 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: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "Substituir"
diff --git a/addons/document_webdav/i18n/et.po b/addons/document_webdav/i18n/et.po
index d0fd8269fe4..5a5ea4743a7 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "See on terviklik juhtimissüsteemi dokument:\n"
-#~ "\t* WebDav liides\n"
-#~ "\t* Kasutaja audentimise\n"
-#~ "\t* Dokumendi indekseerimine\n"
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
index 5f0579bb715..dacad34e3db 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Hau dokumentu kudeaketa sistema oso bat da:\n"
-#~ "\t* WebDav Interfazea\n"
-#~ "\t* Erabiltzaile Kautotzea\n"
-#~ "\t* Dokumentuen Indexazioa\n"
diff --git a/addons/document_webdav/i18n/fi.po b/addons/document_webdav/i18n/fi.po
index 773303ec0e1..e354fecba97 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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9302fa8051d..8a15c1bebf8 100644
--- a/addons/document_webdav/i18n/fr.po
+++ b/addons/document_webdav/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 17:53+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -226,6 +226,3 @@ msgstr "Le répertoire doit avoir un parent ou un espace de stockage"
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Remplacer"
-
-#~ msgid "Search Document storage"
-#~ msgstr "Rechercher dans les documents stockés"
diff --git a/addons/document_webdav/i18n/gl.po b/addons/document_webdav/i18n/gl.po
index f2eedc4a718..2fa306c9c32 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4f17041eae8..554822f05f2 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Ovo je potpuni sustav za upravljanje dokumentima.\n"
-#~ "\t*WebDav sučelje\n"
-#~ "\t*Autentifikacija korisnika\n"
-#~ "\t*Indeksiranje dokumenata\n"
diff --git a/addons/document_webdav/i18n/hu.po b/addons/document_webdav/i18n/hu.po
index e2dd731c0a5..4708bc3aefb 100644
--- a/addons/document_webdav/i18n/hu.po
+++ b/addons/document_webdav/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 13:30+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/id.po b/addons/document_webdav/i18n/id.po
index c07214e73c0..e98213f6de3 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ef027878866..c25e7164026 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -225,41 +225,3 @@ msgstr "La Cartella deve avere un padre o uno storage"
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Sostituire"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Questo è un completo Sistema di Gestione Documentale:\n"
-#~ "\t* Interfaccia WebDat\n"
-#~ "\t* Autenticazione Utente\n"
-#~ "\t* Indicizzazione Documenti\n"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere inferiore ad 1!"
-
-#~ msgid "Search Document storage"
-#~ msgstr "Ricerca deposito documenti"
diff --git a/addons/document_webdav/i18n/mn.po b/addons/document_webdav/i18n/mn.po
index 056b2c2ade6..0257ac55fef 100644
--- a/addons/document_webdav/i18n/mn.po
+++ b/addons/document_webdav/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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Энэ бол баримтын удирдлагын бүрэн систем:\n"
-#~ "      * WebDav интерфэйс\n"
-#~ "      * Хэрэглэгчийн хязгаарлалтууд\n"
-#~ "      * Баримтын индекслэлт\n"
diff --git a/addons/document_webdav/i18n/nl.po b/addons/document_webdav/i18n/nl.po
index d994182f19c..147531ba259 100644
--- a/addons/document_webdav/i18n/nl.po
+++ b/addons/document_webdav/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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -225,40 +225,3 @@ msgstr "Map moet een bovenliggende map hebben of opslag zijn"
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Vervangen"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Dit is een compleet document management systeem:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* Gebruiker authentificatie\n"
-#~ "\t* Document Indexatie\n"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in actie definitie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Search Document storage"
-#~ msgstr "Zoek documentopslag"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
index 5b396aae720..56f79df375c 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,6 +204,3 @@ msgstr "Katalog musi mieć katalog nadrzędny lub nazwę napędu."
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Subsytut"
-
-#~ msgid "Search Document storage"
-#~ msgstr "Przeszukaj przestrzeń dokumentów"
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
index 817eb550139..29249eb901c 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Este é um sistema de gestão documental completo:\n"
-#~ "\t* Interface WebDav\n"
-#~ "\t* Autenticação dos utilizadores\n"
-#~ "\t* Indexação de Documentos\n"
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index 600bba04be9..8c955f3af3f 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Substituto"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Este é um gerenciador de documentos completo:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
diff --git a/addons/document_webdav/i18n/ru.po b/addons/document_webdav/i18n/ru.po
index e1babfd005e..04aca1d26a3 100644
--- a/addons/document_webdav/i18n/ru.po
+++ b/addons/document_webdav/i18n/ru.po
@@ -14,25 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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
 #: 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
@@ -40,45 +40,45 @@ 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
 msgid "DAV properties"
-msgstr ""
+msgstr "Настройки DAV"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "document.webdav.file.property"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Эти свойства будут добавлены к запросам WebDAV"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_file_props
 msgid "DAV properties for documents"
-msgstr ""
+msgstr "DAV-свойства документа"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "Ошибка импорта PyWebDAV"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
 msgid "Document"
-msgstr ""
+msgstr "Документ"
 
 #. module: document_webdav
 #: model:ir.module.module,description:document_webdav.module_meta_information
@@ -105,22 +105,22 @@ msgstr ""
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Каталог не может быть родительским для самого себя!"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Динамический контекст"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "Настройки WebDAV"
 
 #. 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
@@ -130,77 +130,80 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Требуется установить PyWebDAV с адреса "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
 msgid "DAV properties for folders"
-msgstr ""
+msgstr "DAV-свойства папок"
 
 #. module: document_webdav
 #: view:document.directory:0
 #: 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
 msgid "document.webdav.dir.property"
-msgstr ""
+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 ""
+msgstr "Значение"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr ""
+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 ""
+msgstr "Автор последнего изменения"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
-msgstr ""
+msgstr "Кат."
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_date:0
 #: field:document.webdav.file.property,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Дата изменения"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_uid:0
 #: field:document.webdav.file.property,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Создатель"
 
 #. module: document_webdav
 #: model:ir.module.module,shortdesc:document_webdav.module_meta_information
 msgid "WebDAV server for Document Management"
-msgstr ""
+msgstr "Сервер WebDAV для управления документами"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Каталог должен иметь родителя или хранилище"
 
 #. module: document_webdav
 #: 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/sl.po b/addons/document_webdav/i18n/sl.po
index 4040cc47b3b..78195452cb2 100644
--- a/addons/document_webdav/i18n/sl.po
+++ b/addons/document_webdav/i18n/sl.po
@@ -14,19 +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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Datum nastanka"
 
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Napaka! Ne morete izdelati rekurzivnih imenikov."
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -40,23 +40,23 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Imenski prostor"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
 msgid "DAV properties"
-msgstr ""
+msgstr "DAV lasnosti"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "document.webdav.file.property"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr ""
+msgstr "Združi po ..."
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -204,14 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "To je popolni sistem za upravljanje dokumentov:\n"
-#~ "\t* vmesnik WebDav \n"
-#~ "\t* Avtentikacija uporabnikov\n"
-#~ "\t* Indeksacija dokumentov\n"
diff --git a/addons/document_webdav/i18n/sr.po b/addons/document_webdav/i18n/sr.po
index cc609f98638..73c47d4780c 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,30 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Zamena"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Ovo je kompletan sistem Dokument Menadzmenta\n"
-#~ "\t* WebDav Interfejs\n"
-#~ "\t* Autentifikacija korisnika\n"
-#~ "\t* Indeksacija Dokumenata\n"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "IMe objekta mora poceti sa x_ i ne sme sadrzati specijalne karaktere"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture"
-
-#~ msgid "Search Document storage"
-#~ msgstr "Pretrazi skladiste Dokumenata"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/document_webdav/i18n/sr@latin.po b/addons/document_webdav/i18n/sr@latin.po
index af48d730128..97883765f8a 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,30 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr "Zamena"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "IMe objekta mora poceti sa x_ i ne sme sadrzati specijalne karaktere"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nispravno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Search Document storage"
-#~ msgstr "Pretrazi skladiste Dokumenata"
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Ovo je kompletan sistem Dokument Menadzmenta\n"
-#~ "\t* WebDav Interfejs\n"
-#~ "\t* Autentifikacija korisnika\n"
-#~ "\t* Indeksacija Dokumenata\n"
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index 9f0ed8da1c6..247860f8af9 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -204,22 +204,3 @@ msgstr ""
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "Detta är ett komplett dokumenthanteringssystem:\n"
-#~ "\t* WebDav-gränssnitt\n"
-#~ "\t* Användarinloggning\n"
-#~ "\t* Dokumentindexering\n"
-
-#~ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index 7298c170c3d..7faeb956240 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-08-03 06:12+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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
 #: constraint:document.directory:0
@@ -31,7 +31,7 @@ msgstr "错误:你无法建立递归的目录"
 #: 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
@@ -39,45 +39,45 @@ 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
 msgid "DAV properties"
-msgstr ""
+msgstr "DAV属性"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "Copy text \t document.webdav.file.property"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "这些属性将被添加到WebDAV请求上"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_file_props
 msgid "DAV properties for documents"
-msgstr ""
+msgstr "文档的DAV属性"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "PyWebDAV导入错误！"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
 msgid "Document"
-msgstr ""
+msgstr "文件"
 
 #. module: document_webdav
 #: model:ir.module.module,description:document_webdav.module_meta_information
@@ -104,22 +104,22 @@ msgstr ""
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目录不能设为自己的父目录。"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "动态上下文"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "webDAV 属性"
 
 #. 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,18 +129,21 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"请从这里下载安装PyWebDAV \r\n"
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
 msgid "DAV properties for folders"
-msgstr ""
+msgstr "目录的DAV属性"
 
 #. module: document_webdav
 #: view:document.directory:0
 #: 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
@@ -151,242 +154,55 @@ msgstr "名称"
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
 msgid "document.webdav.dir.property"
-msgstr ""
+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 ""
+msgstr "值"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr ""
+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 ""
+msgstr "最近修改用户"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
-msgstr ""
+msgstr "目录"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_date:0
 #: field:document.webdav.file.property,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "修改日期"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_uid:0
 #: field:document.webdav.file.property,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "创建人"
 
 #. module: document_webdav
 #: model:ir.module.module,shortdesc:document_webdav.module_meta_information
 msgid "WebDAV server for Document Management"
-msgstr ""
+msgstr "文档管理系统的WebDAV服务器"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目录必须有父目录或一个存储区"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "\t* WebDav Interface\n"
-#~ "\t* User Authentification\n"
-#~ "\t* Document Indexation\n"
-#~ msgstr ""
-#~ "这是一个完整的文档管理系统：\n"
-#~ "\t* WebDav 接口\n"
-#~ "\t* 用户认证\n"
-#~ "\t* 文档索引\n"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#~ msgid "Jobs Hiring Process"
-#~ msgstr "招聘过程"
-
-#~ msgid "Configure Calendars for CRM Sections"
-#~ msgstr "客户关系管理部分设置日程表"
-
-#~ msgid "Helpdesk"
-#~ msgstr "求助"
-
-#~ msgid "Open ERP Field"
-#~ msgstr "系统字段"
-
-#~ msgid "Next"
-#~ msgstr "下一个"
-
-#~ msgid "Content"
-#~ msgstr "内容"
-
-#~ msgid "Calendar of Meetings"
-#~ msgstr "会议日程表"
-
-#~ msgid "Shared Calendar Meetings"
-#~ msgstr "共享的会议日程表"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "在这动作定义中有无效的模块名"
-
-#~ msgid "Used by companies to track bugs and support requests on softwares"
-#~ msgstr "公司用于跟踪缺陷和支持请求的软件"
-
-#~ msgid ""
-#~ "This Configuration step use to create Calendars in document for all Case "
-#~ "Sections"
-#~ msgstr "这设置步骤用于创建在所有业务个案项文档的日程表"
-
-#~ msgid "dtend"
-#~ msgstr "结束"
-
-#~ msgid ""
-#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr "帮助你组织招聘过程:评论,会议,电子邮件一体化"
-
-#~ msgid "description"
-#~ msgstr "说明"
-
-#~ msgid "Configure Calendars for Sections "
-#~ msgstr "部分设置日程表 "
-
-#~ msgid "Tracks identified business opportunities for your sales pipeline."
-#~ msgstr "从你的销售管线跟踪出销售机会"
-
-#~ msgid ""
-#~ "This may help associations in their fund raising process and tracking."
-#~ msgstr "这可能有助于协会在资助和投资过程和跟踪"
-
-#~ msgid "Manages an Helpdesk service."
-#~ msgstr "管理求助服务"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "资助和投资行动"
-
-#~ msgid "Object"
-#~ msgstr "对象"
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "错误！你不能创建递归的项"
-
-#~ msgid "Support for iCal based on Document Management System"
-#~ msgstr "支持iCal的文档管理系统"
-
-#~ msgid ""
-#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
-#~ "outlook, Sunbird, ical, ..."
-#~ msgstr " 允许同步系统日程表,电话等等"
-
-#~ msgid "location"
-#~ msgstr "本地"
-
-#~ msgid "ICS Calendar"
-#~ msgstr "ICS日程表"
-
-#~ msgid "ICS Value"
-#~ msgstr "ICS值"
-
-#~ msgid "Allows to synchronise calendars with others applications."
-#~ msgstr "允许的同步其它应用日程表"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效XML视图结构!"
-
-#~ msgid ""
-#~ "Allows you to track and manage prospects which are pre-sales requests or "
-#~ "contacts, the very first contact with a customer request."
-#~ msgstr "允许你跟踪管理潜在客户的售前请求和联系,初次联系客户的请求"
-
-#~ msgid "Manages the calendar of meetings of the users."
-#~ msgstr "管理用户的会议日程表"
-
-#~ msgid "Domain"
-#~ msgstr "隶属"
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr "管理这支援和客户服务要求包括你的纠正或预防"
-
-#~ msgid "last-modified"
-#~ msgstr "最近修改"
-
-#~ msgid "ICS Mapping"
-#~ msgstr "ICS一览"
-
-#~ msgid "Duration(In Hour)"
-#~ msgstr "持续时间(小时)"
-
-#~ msgid "Shared Calendar"
-#~ msgstr "共享的日程表"
-
-#~ msgid "Claims"
-#~ msgstr "服务要求"
-
-#~ msgid ""
-#~ "Help you to encode the result of a phone call or to planify a list of phone "
-#~ "calls to process."
-#~ msgstr "帮助你编电话呼叫结果或编制电话呼叫处理的列表"
-
-#~ msgid "dtstart"
-#~ msgstr "开始"
-
-#~ msgid "Phone Calls"
-#~ msgstr "电话呼叫"
-
-#~ msgid "Bug Tracking"
-#~ msgstr "缺陷跟踪"
-
-#~ msgid "categories"
-#~ msgstr "分类"
-
-#~ msgid "Prospect"
-#~ msgstr "潜在客户"
-
-#~ msgid "Create Pre-Configured Calendars"
-#~ msgstr "创建预先设置的日程表"
-
-#~ msgid "created"
-#~ msgstr "创建"
-
-#~ msgid "Calendar Code"
-#~ msgstr "日程表代码"
-
-#~ msgid "summary"
-#~ msgstr "参考"
-
-#~ msgid "attendee"
-#~ msgstr "出勤者"
-
-#~ msgid "document.directory.ics.fields"
-#~ msgstr "字段"
-
-#~ msgid "Fields Mapping"
-#~ msgstr "字段一览"
-
-#~ msgid "Cancel"
-#~ msgstr "取消"
-
-#~ msgid "Business Opportunities"
-#~ msgstr "销售机会"
-
-#~ msgid "dtstamp"
-#~ msgstr "标记"
+msgstr "替换"
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index 5927eade899..d6ceca458cd 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -400,3 +400,5 @@ node_descriptor = nodes.node_descriptor
 
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index 71af3271ab7..7bc0883f9e8 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -106,3 +106,5 @@ class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler
 
 #eof
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index b4317282c6a..3c20cfed5b8 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -704,4 +704,5 @@ class DAVClient(object):
         etag = m.getheader('ETag')
         return etag or True
 
-#eof
\ No newline at end of file
+#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 3a68fb04fed..baa394e94a1 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -341,3 +341,5 @@ def create_prop(self):
 REPORT.create_prop = create_prop
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index e23daab9f66..81435a72137 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -40,7 +40,7 @@ from dav_fs import openerp_dav_handler
 from tools.config import config
 from DAV.WebDAVServer import DAVRequestHandler
 from service import http_server
-from service.websrv_lib import HTTPDir, FixSendError, HttpOptions
+from service.websrv_lib import FixSendError, HttpOptions
 from BaseHTTPServer import BaseHTTPRequestHandler
 import urlparse
 import urllib
@@ -174,11 +174,11 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
             pass
         elif self.close_connection == 1: # close header already sent
             pass
-        else:
-            if headers is None:
-                headers = {}
-            if self.headers.get('Connection',False) == 'Keep-Alive':
-                headers['Connection'] = 'keep-alive'
+        elif headers and self.headers.get('Connection',False) == 'Keep-Alive':
+            headers['Connection'] = 'keep-alive'
+
+        if headers is None:
+            headers = {}
 
         DAVRequestHandler.send_body(self, DATA, code=code, msg=msg, desc=desc,
                     ctype=ctype, headers=headers)
@@ -572,7 +572,7 @@ try:
 
         conf = OpenDAVConfig(**_dc)
         handler._config = conf
-        reg_http_service(HTTPDir(directory,DAVHandler,DAVAuthProvider()))
+        reg_http_service(directory, DAVHandler, DAVAuthProvider)
         logging.getLogger('webdav').info("WebDAV service registered at path: %s/ "% directory)
         
         if not (config.get_misc('webdav', 'no_root_hack', False)):
@@ -592,9 +592,7 @@ try:
                 # the StaticHttpHandler can find its dir_path.
                 config.misc.setdefault('static-http',{})['dir_path'] = dir_path
     
-            if reg_http_service(HTTPDir('/', DAVStaticHandler)):
-                logging.getLogger("web-services").info("WebDAV registered HTTP dir %s for /" % \
-                                (dir_path))
+            reg_http_service('/', DAVStaticHandler)
 
 except Exception, e:
     logging.getLogger('webdav').error('Cannot launch webdav: %s' % e)
@@ -613,8 +611,7 @@ def init_well_known():
         reps['/'+uri] = path
 
     if int(num_svcs):
-        if http_server.reg_http_service(HTTPDir('/.well-known', RedirectHTTPHandler)):
-            logging.getLogger("web-services").info("Registered HTTP redirect handler at /.well-known" )
+        reg_http_service('/.well-known', RedirectHTTPHandler)
 
 init_well_known()
 
@@ -641,7 +638,7 @@ def init_principals_redirect():
         dbname = config.get('db_name', False)
     if dbname:
         PrincipalsRedirect.redirect_paths[''] = '/webdav/%s/principals' % dbname
-        reg_http_service(HTTPDir('/principals', PrincipalsRedirect))
+        reg_http_service('/principals', PrincipalsRedirect)
         logging.getLogger("web-services").info(
                 "Registered HTTP redirect handler for /principals to the %s db.",
                 dbname)
@@ -652,3 +649,5 @@ init_principals_redirect()
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/__init__.py b/addons/edi/__init__.py
new file mode 100644
index 00000000000..b4a80c0f1dd
--- /dev/null
+++ b/addons/edi/__init__.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 models
+import edi_service
+from models.edi import EDIMixin, edi_document
+
+# web
+try:
+    import controllers
+except ImportError:
+    logging.getLogger('init.load').warn(
+        """Could not load openerp-web section of EDI, EDI will not behave correctly
+
+To fix, launch openerp-web in embedded mode""")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
new file mode 100644
index 00000000000..4d96780b10c
--- /dev/null
+++ b/addons/edi/__openerp__.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Electronic Data Interchange (EDI)',
+    'version': '1.0',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """
+Provides a common EDI platform that other Applications can use
+==============================================================
+
+OpenERP specifies a generic EDI format for exchanging business
+documents between different systems, and provides generic
+mechanisms to import and export them.
+
+More details about OpenERP's EDI format may be found in the
+technical OpenERP documentation at http://doc.openerp.com
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'email_template'],
+    'data': [
+        'security/ir.model.access.csv',
+    ],
+    'test': [
+        'test/edi_partner_test.yml',
+    ],
+    'js': [
+        'static/src/js/edi.js',
+    ],
+    "css": [
+        "static/src/css/edi.css"
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '002046536359186',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/controllers/__init__.py b/addons/edi/controllers/__init__.py
new file mode 100644
index 00000000000..9f828025b8e
--- /dev/null
+++ b/addons/edi/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
new file mode 100644
index 00000000000..83c3a1608e9
--- /dev/null
+++ b/addons/edi/controllers/main.py
@@ -0,0 +1,86 @@
+import json
+import textwrap
+
+import simplejson
+import werkzeug.wrappers
+
+import web.common.http as openerpweb
+import web.controllers.main
+
+class EDI(openerpweb.Controller):
+    # http://hostname:8069/edi/view?db=XXXX&token=XXXXXXXXXXX
+    # http://hostname:8069/edi/import_url?url=URIEncodedURL
+    _cp_path = "/edi"
+
+    def template(self, req, mods='web,edi'):
+        self.wc = openerpweb.controllers_path['/web/webclient']
+        d = {}
+        d["js"] = "\n".join('<script type="text/javascript" src="%s"></script>'%i for i in self.wc.manifest_list(req, mods, 'js'))
+        d["css"] = "\n".join('<link rel="stylesheet" href="%s">'%i for i in self.wc.manifest_list(req, mods, 'css'))
+        d["modules"] = simplejson.dumps(mods.split(','))
+        return d
+
+    @openerpweb.httprequest
+    def view(self, req, db, token):
+        d = self.template(req)
+        d["init"] = 'new s.edi.EdiView(null,"%s","%s").appendTo($("body"));'%(db,token)
+        r = web.controllers.main.html_template % d
+        return r
+
+    @openerpweb.httprequest
+    def import_url(self, req, url):
+        d = self.template(req)
+        d["init"] = 'new s.edi.EdiImport(null,"%s").appendTo($("body"));'%(url)
+        r = web.controllers.main.html_template % d
+        return r
+
+    @openerpweb.httprequest
+    def download(self, req, db, token):
+        result = req.session.proxy('edi').get_edi_document(db, token)
+        response = werkzeug.wrappers.Response( result, headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]) 
+        return response
+
+    @openerpweb.httprequest
+    def download_attachment(self, req, db, token):
+        result = req.session.proxy('edi').get_edi_document(db, token)
+        doc = json.loads(result)[0]
+        attachment = doc['__attachments'] and doc['__attachments'][0]
+        if attachment:
+            result = attachment["content"].decode('base64')
+            import email.Utils as utils
+
+            # Encode as per RFC 2231
+            filename_utf8 = attachment['file_name']
+            filename_encoded = "%s=%s" % ('filename*',
+                                          utils.encode_rfc2231(filename_utf8, 'utf-8'))
+            response = werkzeug.wrappers.Response(result, headers=[('Content-Type', 'application/pdf'),
+                                                                   ('Content-Disposition', 'inline; ' + filename_encoded),
+                                                                   ('Content-Length', len(result))])
+            return response
+
+    @openerpweb.httprequest
+    def binary(self, req, db, token, field_path="company_address.logo", content_type='image/png'):
+        result = req.session.proxy('edi').get_edi_document(db, token)
+        doc = json.loads(result)[0]
+        for name in field_path.split("."):
+            doc = doc[name]
+        result = doc.decode('base64')
+        response = werkzeug.wrappers.Response(result, headers=[('Content-Type', content_type),
+                                                                ('Content-Length', len(result))])
+        return response
+
+    @openerpweb.jsonrequest
+    def get_edi_document(self, req, db, token):
+        result = req.session.proxy('edi').get_edi_document(db, token)
+        return json.loads(result)
+
+    @openerpweb.jsonrequest
+    def import_edi_url(self, req, url):
+        result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
+        if len(result) == 1:
+            return {"action": web.controllers.main.clean_action(req, result[0][2])}
+        return True
+
+#
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/edi_service.py b/addons/edi/edi_service.py
new file mode 100644
index 00000000000..074720a03e9
--- /dev/null
+++ b/addons/edi/edi_service.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 netsvc
+import openerp
+
+_logger = logging.getLogger('edi.service')
+
+class edi(netsvc.ExportService):
+
+    def __init__(self, name="edi"):
+        netsvc.ExportService.__init__(self, name)
+
+    def _edi_dispatch(self, db_name, method_name, *method_args):
+        try:
+            registry = openerp.modules.registry.RegistryManager.get(db_name)
+            assert registry, 'Unknown database %s' % db_name
+            edi_document = registry['edi.document']
+            cr = registry.db.cursor()
+            res = None
+            res = getattr(edi_document, method_name)(cr, *method_args)
+            cr.commit()
+        except Exception:
+            _logger.exception('Failed to execute EDI method %s with args %r', method_name, method_args)
+            raise
+        finally:
+            cr.close()
+        return res
+
+    def exp_get_edi_document(self, db_name, edi_token):
+        return self._edi_dispatch(db_name, 'get_document', 1, edi_token)
+
+    def exp_import_edi_document(self, db_name, uid, passwd, edi_document, context=None):
+        return self._edi_dispatch(db_name, 'import_edi', uid, edi_document, None)
+
+    def exp_import_edi_url(self, db_name, uid, passwd, edi_url, context=None):
+        return self._edi_dispatch(db_name, 'import_edi', uid, None, edi_url)
+
+    def dispatch(self, method, params):
+        if method in ['import_edi_document',  'import_edi_url']:
+            (db, uid, passwd ) = params[0:3]
+            openerp.service.security.check(db, uid, passwd)
+        elif method in ['get_edi_document']:
+            # No security check for these methods
+            pass
+        else:
+            raise KeyError("Method not found: %s" % method)
+        fn = getattr(self, 'exp_'+method)
+        return fn(*params)
+
+edi()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/models/__init__.py b/addons/edi/models/__init__.py
new file mode 100644
index 00000000000..a1e61299334
--- /dev/null
+++ b/addons/edi/models/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 edi
+import res_partner
+import res_company
+import res_currency
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
new file mode 100644
index 00000000000..b8fc8699ca2
--- /dev/null
+++ b/addons/edi/models/edi.py
@@ -0,0 +1,684 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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
+import hashlib
+import json
+import logging
+import re
+import threading
+import time
+import urllib2
+
+import openerp
+import openerp.release as release
+import netsvc
+import pooler
+from osv import osv,fields,orm
+from tools.translate import _
+from tools.safe_eval import safe_eval as eval
+
+EXTERNAL_ID_PATTERN = re.compile(r'^([^.:]+)(?::([^.]+))?\.(\S+)$')
+EDI_VIEW_WEB_URL = '%s/edi/view?debug=1&db=%s&token=%s'
+EDI_PROTOCOL_VERSION = 1 # arbitrary ever-increasing version number
+EDI_GENERATOR = 'OpenERP ' + release.major_version
+EDI_GENERATOR_VERSION = release.version_info
+
+def split_external_id(ext_id):
+    match = EXTERNAL_ID_PATTERN.match(ext_id)
+    assert match, \
+            _("'%s' is an invalid external ID") % (ext_id)
+    return {'module': match.group(1),
+            'db_uuid': match.group(2),
+            'id': match.group(3),
+            'full': match.group(0)}
+
+def safe_unique_id(database_id, model, record_id):
+    """Generate a unique string to represent a (database_uuid,model,record_id) pair
+    without being too long, and with a very low probability of collisions.
+    """
+    msg = "%s-%s-%s-%s" % (time.time(), database_id, model, record_id)
+    digest = hashlib.sha1(msg).digest()
+    # fold the sha1 20 bytes digest to 9 bytes
+    digest = ''.join(chr(ord(x) ^ ord(y)) for (x,y) in zip(digest[:9], digest[9:-2]))
+    # b64-encode the 9-bytes folded digest to a reasonable 12 chars ASCII ID
+    digest = base64.urlsafe_b64encode(digest)
+    return '%s-%s' % (model.replace('.','_'), digest)
+
+def last_update_for(record):
+    """Returns the last update timestamp for the given record,
+       if available, otherwise False
+    """
+    if record._model._log_access:
+        record_log = record.perm_read()[0]
+        return record_log.get('write_date') or record_log.get('create_date') or False
+    return False
+
+_logger = logging.getLogger('edi')
+
+class edi_document(osv.osv):
+    _name = 'edi.document'
+    _description = 'EDI Document'
+    _columns = {
+                'name': fields.char("EDI token", size = 128, help="Unique identifier for retrieving an EDI document."),
+                'document': fields.text("Document", help="EDI document content")
+    }
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', 'EDI Tokens must be unique!')
+    ]
+
+    def new_edi_token(self, cr, uid, record):
+        """Return a new, random unique token to identify this model record,
+        and to be used as token when exporting it as an EDI document.
+
+        :param browse_record record: model record for which a token is needed
+        """
+        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
+        edi_token = hashlib.sha256('%s-%s-%s-%s' % (time.time(), db_uuid, record._name, record.id)).hexdigest()
+        return edi_token
+
+    def serialize(self, edi_documents):
+        """Serialize the given EDI document structures (Python dicts holding EDI data),
+        using JSON serialization.
+
+        :param [dict] edi_documents: list of EDI document structures to serialize
+        :return: UTF-8 encoded string containing the serialized document
+        """
+        serialized_list = json.dumps(edi_documents)
+        return serialized_list
+
+    def generate_edi(self, cr, uid, records, context=None):
+        """Generates a final EDI document containing the EDI serialization
+        of the given records, which should all be instances of a Model
+        that has the :meth:`~.edi` mixin. The document is not saved in the
+        database, this is done by :meth:`~.export_edi`.
+
+        :param list(browse_record) records: records to export as EDI
+        :return: UTF-8 encoded string containing the serialized records
+        """
+        edi_list = []
+        for record in records:
+            record_model_obj = self.pool.get(record._name)
+            edi_list += record_model_obj.edi_export(cr, uid, [record], context=context)
+        return self.serialize(edi_list)
+
+    def get_document(self, cr, uid, edi_token, context=None):
+        """Retrieve the EDI document corresponding to the given edi_token.
+
+        :return: EDI document string
+        :raise: ValueError if requested EDI token does not match any know document
+        """
+        _logger.debug("get_document(%s)", edi_token)
+        edi_ids = self.search(cr, uid, [('name','=', edi_token)], context=context)
+        if not edi_ids:
+            raise ValueError('Invalid EDI token: %s' % edi_token)
+        edi = self.browse(cr, uid, edi_ids[0], context=context)
+        return edi.document
+
+    def load_edi(self, cr, uid, edi_documents, context=None):
+        """Import the given EDI document structures into the system, using
+        :meth:`~.import_edi`.
+
+        :param edi_documents: list of Python dicts containing the deserialized
+                              version of EDI documents
+        :return: list of (model, id, action) tuple containing the model and database ID
+                 of all records that were imported in the system, plus a suggested
+                 action definition dict for displaying each document.
+        """
+        ir_module = self.pool.get('ir.module.module')
+        res = []
+        for edi_document in edi_documents:
+            module = edi_document.get('__import_module') or edi_document.get('__module')
+            assert module, 'a `__module` or `__import_module` attribute is required in each EDI document'
+            if module != 'base' and not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
+                raise osv.except_osv(_('Missing Application'),
+                            _("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.")%(module,))
+            model = edi_document.get('__import_model') or edi_document.get('__model')
+            assert model, 'a `__model` or `__import_model` attribute is required in each EDI document'
+            model_obj = self.pool.get(model)
+            assert model_obj, 'model `%s` cannot be found, despite module `%s` being available - '\
+                              'this EDI document seems invalid or unsupported' % (model,module)
+            record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
+            record_action = model_obj._edi_record_display_action(cr, uid, record_id, context=context)
+            res.append((model, record_id, record_action))
+        return res
+
+    def deserialize(self, edi_documents_string):
+        """Return deserialized version of the given EDI Document string.
+
+        :param str|unicode edi_documents_string: UTF-8 string (or unicode) containing
+                                                 JSON-serialized EDI document(s)
+        :return: Python object representing the EDI document(s) (usually a list of dicts)
+        """
+        return json.loads(edi_documents_string)
+
+    def export_edi(self, cr, uid, records, context=None):
+        """Export the given database records as EDI documents, stores them
+        permanently with a new unique EDI token, for later retrieval via :meth:`~.get_document`,
+        and returns the list of the new corresponding ``ir.edi.document`` records.
+
+        :param records: list of browse_record of any model
+        :return: list of IDs of the new ``ir.edi.document`` entries, in the same
+                 order as the provided ``records``.
+        """
+        exported_ids = []
+        for record in records:
+            document = self.generate_edi(cr, uid, [record], context)
+            token = self.new_edi_token(cr, uid, record)
+            self.create(cr, uid, {
+                         'name': token,
+                         'document': document
+                        }, context=context)
+            exported_ids.append(token)
+        return exported_ids
+
+    def import_edi(self, cr, uid, edi_document=None, edi_url=None, context=None):
+        """Import a JSON serialized EDI Document string into the system, first retrieving it
+        from the given ``edi_url`` if provided.
+
+        :param str|unicode edi_document: UTF-8 string or unicode containing JSON-serialized
+                                         EDI Document to import. Must not be provided if
+                                         ``edi_url`` is given.
+        :param str|unicode edi_url: URL where the EDI document (same format as ``edi_document``)
+                                    may be retrieved, without authentication.
+        """
+        if edi_url:
+            assert not edi_document, 'edi_document must not be provided if edi_url is given'
+            edi_document = urllib2.urlopen(edi_url).read()
+        assert edi_document, 'EDI Document is empty!'
+        edi_documents = self.deserialize(edi_document)
+        return self.load_edi(cr, uid, edi_documents, context=context)
+
+
+class EDIMixin(object):
+    """Mixin class for Model objects that want be exposed as EDI documents.
+       Classes that inherit from this mixin class should override the
+       ``edi_import()`` and ``edi_export()`` methods to implement their
+       specific behavior, based on the primitives provided by this mixin."""
+
+    def _edi_requires_attributes(self, attributes, edi_document):
+        model_name = edi_document.get('__imported_model') or edi_document.get('__model') or self._name
+        for attribute in attributes:
+            assert edi_document.get(attribute),\
+                 'Attribute `%s` is required in %s EDI documents' % (attribute, model_name)
+
+    # private method, not RPC-exposed as it creates ir.model.data entries as
+    # SUPERUSER based on its parameters
+    def _edi_external_id(self, cr, uid, record, existing_id=None, existing_module=None,
+                        context=None):
+        """Generate/Retrieve unique external ID for ``record``.
+        Each EDI record and each relationship attribute in it is identified by a
+        unique external ID, which includes the database's UUID, as a way to
+        refer to any record within any OpenERP instance, without conflict.
+
+        For OpenERP records that have an existing "External ID" (i.e. an entry in
+        ir.model.data), the EDI unique identifier for this record will be made of
+        "%s:%s:%s" % (module, database UUID, ir.model.data ID). The database's
+        UUID MUST NOT contain a colon characters (this is guaranteed by the
+        UUID algorithm).
+
+        For records that have no existing ir.model.data entry, a new one will be
+        created during the EDI export. It is recommended that the generated external ID
+        contains a readable reference to the record model, plus a unique value that
+        hides the database ID. If ``existing_id`` is provided (because it came from
+        an import), it will be used instead of generating a new one.
+        If ``existing_module`` is provided (because it came from
+        an import), it will be used instead of using local values.
+
+        :param browse_record record: any browse_record needing an EDI external ID
+        :param string existing_id: optional existing external ID value, usually coming
+                                   from a just-imported EDI record, to be used instead
+                                   of generating a new one
+        :param string existing_module: optional existing module name, usually in the
+                                       format ``module:db_uuid`` and coming from a
+                                       just-imported EDI record, to be used instead
+                                       of local values
+        :return: the full unique External ID to use for record
+        """
+        ir_model_data = self.pool.get('ir.model.data')
+        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
+        ext_id = record.get_external_id()[record.id]
+        if not ext_id:
+            ext_id = existing_id or safe_unique_id(db_uuid, record._name, record.id)
+            # ID is unique cross-db thanks to db_uuid (already included in existing_module)
+            module = existing_module or "%s:%s" % (record._original_module, db_uuid)
+            _logger.debug("%s: Generating new external ID `%s.%s` for %r", self._name,
+                          module, ext_id, record)
+            ir_model_data.create(cr, openerp.SUPERUSER_ID,
+                                 {'name': ext_id,
+                                  'model': record._name,
+                                  'module': module,
+                                  'res_id': record.id})
+        else:
+            module, ext_id = ext_id.split('.')
+            if not ':' in module:
+                # this record was not previously EDI-imported
+                if not module == record._original_module:
+                    # this could happen for data records defined in a module that depends
+                    # on the module that owns the model, e.g. purchase defines
+                    # product.pricelist records.
+                    _logger.debug('Mismatching module: expected %s, got %s, for %s',
+                                  module, record._original_module, record)
+                # ID is unique cross-db thanks to db_uuid
+                module = "%s:%s" % (module, db_uuid)
+
+        return '%s.%s' % (module, ext_id)
+
+    def _edi_record_display_action(self, cr, uid, id, context=None):
+        """Returns an appropriate action definition dict for displaying
+           the record with ID ``rec_id``.
+
+           :param int id: database ID of record to display
+           :return: action definition dict
+        """
+        return {'type': 'ir.actions.act_window',
+                'view_mode': 'form,tree',
+                'view_type': 'form',
+                'res_model': self._name,
+                'res_id': id}
+
+    def edi_metadata(self, cr, uid, records, context=None):
+        """Return a list containing the boilerplate EDI structures for
+           exporting ``records`` as EDI, including
+           the metadata fields
+
+        The metadata fields always include::
+
+            {
+               '__model': 'some.model',                # record model
+               '__module': 'module',                   # require module
+               '__id': 'module:db-uuid:model.id',      # unique global external ID for the record
+               '__last_update': '2011-01-01 10:00:00', # last update date in UTC!
+               '__version': 1,                         # EDI spec version
+               '__generator' : 'OpenERP',              # EDI generator
+               '__generator_version' : [6,1,0],        # server version, to check compatibility.
+               '__attachments_':
+           }
+
+        :param list(browse_record) records: records to export
+        :return: list of dicts containing boilerplate EDI metadata for each record,
+                 at the corresponding index from ``records``.
+        """
+        data_ids = []
+        ir_attachment = self.pool.get('ir.attachment')
+        results = []
+        for record in records:
+            ext_id = self._edi_external_id(cr, uid, record, context=context)
+            edi_dict = {
+                '__id': ext_id,
+                '__last_update': last_update_for(record),
+                '__model' : record._name,
+                '__module' : record._original_module,
+                '__version': EDI_PROTOCOL_VERSION,
+                '__generator': EDI_GENERATOR,
+                '__generator_version': EDI_GENERATOR_VERSION,
+            }
+            attachment_ids = ir_attachment.search(cr, uid, [('res_model','=', record._name), ('res_id', '=', record.id)])
+            if attachment_ids:
+                attachments = []
+                for attachment in ir_attachment.browse(cr, uid, attachment_ids, context=context):
+                    attachments.append({
+                            'name' : attachment.name,
+                            'content': attachment.datas, # already base64 encoded!
+                            'file_name': attachment.datas_fname,
+                    })
+                edi_dict.update(__attachments=attachments)
+            results.append(edi_dict)
+        return results
+
+    def edi_m2o(self, cr, uid, record, context=None):
+        """Return a m2o EDI representation for the given record.
+
+        The EDI format for a many2one is::
+
+            ['unique_external_id', 'Document Name']
+        """
+        edi_ext_id = self._edi_external_id(cr, uid, record, context=context)
+        relation_model = record._model
+        name = relation_model.name_get(cr, uid, [record.id], context=context)
+        name = name and name[0][1] or False
+        return [edi_ext_id, name]
+
+    def edi_o2m(self, cr, uid, records, edi_struct=None, context=None):
+        """Return a list representing a O2M EDI relationship containing
+           all the given records, according to the given ``edi_struct``.
+           This is basically the same as exporting all the record using
+           :meth:`~.edi_export` with the given ``edi_struct``, and wrapping
+           the results in a list.
+
+           Example::
+
+             [                                # O2M fields would be a list of dicts, with their
+               { '__id': 'module:db-uuid.id', # own __id.
+                 '__last_update': 'iso date', # update date
+                 'name': 'some name',
+                 #...
+               },
+               # ...
+             ],
+        """
+        result = []
+        for record in records:
+            result += record._model.edi_export(cr, uid, [record], edi_struct=edi_struct, context=context)
+        return result
+
+    def edi_m2m(self, cr, uid, records, context=None):
+        """Return a list representing a M2M EDI relationship directed towards
+           all the given records.
+           This is basically the same as exporting all the record using
+           :meth:`~.edi_m2o` and wrapping the results in a list.
+
+            Example::
+
+                # M2M fields are exported as a list of pairs, like a list of M2O values
+                [
+                      ['module:db-uuid.id1', 'Task 01: bla bla'],
+                      ['module:db-uuid.id2', 'Task 02: bla bla']
+                ]
+        """
+        return [self.edi_m2o(cr, uid, r, context=context) for r in records]
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        """Returns a list of dicts representing an edi.document containing the
+           records, and matching the given ``edi_struct``, if provided.
+
+           :param edi_struct: if provided, edi_struct should be a dictionary
+                              with a skeleton of the fields to export.
+                              Basic fields can have any key as value, but o2m
+                              values should have a sample skeleton dict as value,
+                              to act like a recursive export.
+                              For example, for a res.partner record::
+
+                                  edi_struct: {
+                                       'name': True,
+                                       'company_id': True,
+                                       'address': {
+                                           'name': True,
+                                           'street': True,
+                                           }
+                                  }
+
+                              Any field not specified in the edi_struct will not
+                              be included in the exported data. Fields with no
+                              value (False) will be omitted in the EDI struct.
+                              If edi_struct is omitted, no fields will be exported
+        """
+        if edi_struct is None:
+            edi_struct = {}
+        fields_to_export = edi_struct.keys()
+        results = []
+        for record in records:
+            edi_dict = self.edi_metadata(cr, uid, [record], context=context)[0]
+            for field in fields_to_export:
+                column = self._all_columns[field].column
+                value = getattr(record, field)
+                if not value and value not in ('', 0):
+                    continue
+                elif column._type == 'many2one':
+                    value = self.edi_m2o(cr, uid, value, context=context)
+                elif column._type == 'many2many':
+                    value = self.edi_m2m(cr, uid, value, context=context)
+                elif column._type == 'one2many':
+                    value = self.edi_o2m(cr, uid, value, edi_struct=edi_struct.get(field, {}), context=context)
+                edi_dict[field] = value
+            results.append(edi_dict)
+        return results
+
+    def edi_export_and_email(self, cr, uid, ids, template_ext_id, context=None):
+        """Export the given records just like :meth:`~.export_edi`, the render the
+           given email template, in order to trigger appropriate notifications.
+           This method is intended to be called as part of business documents'
+           lifecycle, so it silently ignores any error occurring during the process,
+           as this is usually non-critical. To avoid any delay, it is also asynchronous
+           and will spawn a short-lived thread to perform the action.
+
+           :param str template_ext_id: external id of the email.template to use for
+                the mail notifications
+           :return: True
+        """
+        def email_task():
+            db = pooler.get_db(cr.dbname)
+            local_cr = None
+            try:
+                time.sleep(3) # lame workaround to wait for commit of parent transaction
+                # grab a fresh browse_record on local cursor
+                local_cr = db.cursor()
+                web_root_url = self.pool.get('ir.config_parameter').get_param(local_cr, uid, 'web.base.url')
+                if not web_root_url:
+                    _logger.warning('Ignoring EDI mail notification, web.base.url not defined in parameters')
+                    return
+                mail_tmpl = self._edi_get_object_by_external_id(local_cr, uid, template_ext_id, 'email.template', context=context)
+                if not mail_tmpl:
+                    # skip EDI export if the template was not found
+                    _logger.warning('Ignoring EDI mail notification, template %s cannot be located', template_ext_id)
+                    return
+                for edi_record in self.browse(local_cr, uid, ids, context=context):
+                    edi_token = self.pool.get('edi.document').export_edi(local_cr, uid, [edi_record], context = context)[0]
+                    edi_context = dict(context, edi_web_url_view=EDI_VIEW_WEB_URL % (web_root_url, local_cr.dbname, edi_token))
+                    self.pool.get('email.template').send_mail(local_cr, uid, mail_tmpl.id, edi_record.id,
+                                                              force_send=False, context=edi_context)
+                    _logger.info('EDI export successful for %s #%s, email notification sent.', self._name, edi_record.id)
+            except Exception:
+                _logger.warning('Ignoring EDI mail notification, failed to generate it.', exc_info=True)
+            finally:
+                if local_cr:
+                    local_cr.commit()
+                    local_cr.close()
+
+        threading.Thread(target=email_task, name='EDI ExportAndEmail for %s %r' % (self._name, ids)).start()
+        return True
+
+    def _edi_get_object_by_name(self, cr, uid, name, model_name, context=None):
+        model = self.pool.get(model_name)
+        search_results = model.name_search(cr, uid, name, operator='=', context=context)
+        if len(search_results) == 1:
+            return model.browse(cr, uid, search_results[0][0], context=context)
+        return False
+
+    def _edi_generate_report_attachment(self, cr, uid, record, context=None):
+        """Utility method to generate the first PDF-type report declared for the
+           current model with ``usage`` attribute set to ``default``.
+           This must be called explicitly by models that need it, usually
+           at the beginning of ``edi_export``, before the call to ``super()``."""
+        ir_actions_report = self.pool.get('ir.actions.report.xml')
+        matching_reports = ir_actions_report.search(cr, uid, [('model','=',self._name),
+                                                              ('report_type','=','pdf'),
+                                                              ('usage','=','default')])
+        if matching_reports:
+            report = ir_actions_report.browse(cr, uid, matching_reports[0])
+            report_service = 'report.' + report.report_name
+            service = netsvc.LocalService(report_service)
+            (result, format) = service.create(cr, uid, [record.id], {'model': self._name}, context=context)
+            eval_context = {'time': time, 'object': record}
+            if not report.attachment or not eval(report.attachment, eval_context):
+                # no auto-saving of report as attachment, need to do it manually
+                result = base64.b64encode(result)
+                file_name = record.name_get()[0][1]
+                file_name = re.sub(r'[^a-zA-Z0-9_-]', '_', file_name)
+                file_name += ".pdf"
+                ir_attachment = self.pool.get('ir.attachment').create(cr, uid, 
+                                                                      {'name': file_name,
+                                                                       'datas': result,
+                                                                       'datas_fname': file_name,
+                                                                       'res_model': self._name,
+                                                                       'res_id': record.id},
+                                                                      context=context)
+
+    def _edi_import_attachments(self, cr, uid, record_id, edi_document, context=None):
+        ir_attachment = self.pool.get('ir.attachment')
+        for attachment in edi_document.get('__attachments', []):
+            # check attachment data is non-empty and valid
+            file_data = None
+            try:
+                file_data = base64.b64decode(attachment.get('content'))
+            except TypeError:
+                pass
+            assert file_data, 'Incorrect/Missing attachment file content'
+            assert attachment.get('name'), 'Incorrect/Missing attachment name'
+            assert attachment.get('file_name'), 'Incorrect/Missing attachment file name'
+            assert attachment.get('file_name'), 'Incorrect/Missing attachment file name'
+            ir_attachment.create(cr, uid, {'name': attachment['name'],
+                                           'datas_fname': attachment['file_name'],
+                                           'res_model': self._name,
+                                           'res_id': record_id,
+                                           # should be pure 7bit ASCII
+                                           'datas': str(attachment['content']),
+                                           }, context=context)
+
+
+    def _edi_get_object_by_external_id(self, cr, uid, external_id, model, context=None):
+        """Returns browse_record representing object identified by the model and external_id,
+           or None if no record was found with this external id.
+
+           :param external_id: fully qualified external id, in the EDI form
+                               ``module:db_uuid:identifier``.
+           :param model: model name the record belongs to.
+        """
+        ir_model_data = self.pool.get('ir.model.data')
+        # external_id is expected to have the form: ``module:db_uuid:model.random_name``
+        ext_id_members = split_external_id(external_id)
+        db_uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
+        module = ext_id_members['module']
+        ext_id = ext_id_members['id']
+        modules = []
+        ext_db_uuid = ext_id_members['db_uuid']
+        if ext_db_uuid:
+            modules.append('%s:%s' % (module, ext_id_members['db_uuid']))
+        if ext_db_uuid is None or ext_db_uuid == db_uuid:
+            # local records may also be registered without the db_uuid
+            modules.append(module)
+        data_ids = ir_model_data.search(cr, uid, [('model','=',model),
+                                                  ('name','=',ext_id),
+                                                  ('module','in',modules)])
+        if data_ids:
+            model = self.pool.get(model)
+            data = ir_model_data.browse(cr, uid, data_ids[0], context=context)
+            result = model.browse(cr, uid, data.res_id, context=context)
+            return result
+
+    def edi_import_relation(self, cr, uid, model, value, external_id, context=None):
+        """Imports a M2O/M2M relation EDI specification ``[external_id,value]`` for the
+           given model, returning the corresponding database ID:
+
+           * First, checks if the ``external_id`` is already known, in which case the corresponding
+             database ID is directly returned, without doing anything else;
+           * If the ``external_id`` is unknown, attempts to locate an existing record
+             with the same ``value`` via name_search(). If found, the given external_id will
+             be assigned to this local record (in addition to any existing one)
+           * If previous steps gave no result, create a new record with the given
+             value in the target model, assign it the given external_id, and return
+             the new database ID
+        """
+        _logger.debug("%s: Importing EDI relationship [%r,%r]", model, external_id, value)
+        target = self._edi_get_object_by_external_id(cr, uid, external_id, model, context=context)
+        need_new_ext_id = False
+        if not target:
+            _logger.debug("%s: Importing EDI relationship [%r,%r] - ID not found, trying name_get",
+                          self._name, external_id, value)
+            target = self._edi_get_object_by_name(cr, uid, value, model, context=context)
+            need_new_ext_id = True
+        if not target:
+            _logger.debug("%s: Importing EDI relationship [%r,%r] - name not found, creating it!",
+                          self._name, external_id, value)
+            # also need_new_ext_id here, but already been set above
+            model = self.pool.get(model)
+            res_id, name = model.name_create(cr, uid, value, context=context)
+            target = model.browse(cr, uid, res_id, context=context)
+        if need_new_ext_id:
+            ext_id_members = split_external_id(external_id)
+            # module name is never used bare when creating ir.model.data entries, in order
+            # to avoid being taken as part of the module's data, and cleanup up at next update  
+            module = "%s:%s" % (ext_id_members['module'], ext_id_members['db_uuid'])
+            # create a new ir.model.data entry for this value
+            self._edi_external_id(cr, uid, target, existing_id=ext_id_members['id'], existing_module=module, context=context)
+        return target.id
+
+    def edi_import(self, cr, uid, edi_document, context=None):
+        """Imports a dict representing an edi.document into the system.
+
+           :param dict edi_document: EDI document to import
+           :return: the database ID of the imported record
+        """
+        assert self._name == edi_document.get('__import_model') or \
+                ('__import_model' not in edi_document and self._name == edi_document.get('__model')), \
+                "EDI Document Model and current model do not match: '%s' (EDI) vs '%s' (current)" % \
+                   (edi_document['__model'], self._name)
+
+        # First check the record is now already known in the database, in which case it is ignored
+        ext_id_members = split_external_id(edi_document['__id'])
+        existing = self._edi_get_object_by_external_id(cr, uid, ext_id_members['full'], self._name, context=context)
+        if existing:
+            _logger.info("'%s' EDI Document with ID '%s' is already known, skipping import!", self._name, ext_id_members['full'])
+            return existing.id
+
+        record_values = {}
+        o2m_todo = {} # o2m values are processed after their parent already exists
+        for field_name, field_value in edi_document.iteritems():
+            # skip metadata and empty fields
+            if field_name.startswith('__') or field_value is None or field_value is False:
+                continue
+            field_info = self._all_columns.get(field_name)
+            if not field_info:
+                _logger.warning('Ignoring unknown field `%s` when importing `%s` EDI document', field_name, self._name)
+                continue
+            field = field_info.column
+            # skip function/related fields
+            if isinstance(field, fields.function):
+                _logger.warning("Unexpected function field value found in '%s' EDI document: '%s'" % (self._name, field_name))
+                continue
+            relation_model = field._obj
+            if field._type == 'many2one':
+                record_values[field_name] = self.edi_import_relation(cr, uid, relation_model,
+                                                                      field_value[1], field_value[0],
+                                                                      context=context)
+            elif field._type == 'many2many':
+                record_values[field_name] = [self.edi_import_relation(cr, uid, relation_model, m2m_value[1],
+                                                                       m2m_value[0], context=context)
+                                             for m2m_value in field_value]
+            elif field._type == 'one2many':
+                # must wait until parent report is imported, as the parent relationship
+                # is often required in o2m child records
+                o2m_todo[field_name] = field_value
+            else:
+                record_values[field_name] = field_value
+
+        module_ref = "%s:%s" % (ext_id_members['module'], ext_id_members['db_uuid'])
+        record_id = self.pool.get('ir.model.data')._update(cr, uid, self._name, module_ref, record_values,
+                                                           xml_id=ext_id_members['id'], context=context)
+
+        record_display, = self.name_get(cr, uid, [record_id], context=context)
+
+        # process o2m values, connecting them to their parent on-the-fly
+        for o2m_field, o2m_value in o2m_todo.iteritems():
+            field = self._all_columns[o2m_field].column
+            dest_model = self.pool.get(field._obj)
+            for o2m_line in o2m_value:
+                # link to parent record: expects an (ext_id, name) pair
+                o2m_line[field._fields_id] = (ext_id_members['full'], record_display[1])
+                dest_model.edi_import(cr, uid, o2m_line, context=context)
+
+        # process the attachments, if any
+        self._edi_import_attachments(cr, uid, record_id, edi_document, context=context)
+
+        return record_id
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/edi/models/res_company.py b/addons/edi/models/res_company.py
new file mode 100644
index 00000000000..cf5efe997e0
--- /dev/null
+++ b/addons/edi/models/res_company.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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
+
+class res_company(osv.osv):
+    """Helper subclass for res.company providing util methods for working with
+       companies in the context of EDI import/export. The res.company object
+       itself is not EDI-exportable"""
+    _inherit = "res.company"
+
+    def edi_export_address(self, cr, uid, company, edi_address_struct=None, context=None):
+        """Returns a dict representation of the address of the company record, suitable for
+           inclusion in an EDI document, and matching the given edi_address_struct if provided.
+           The first found address is returned, in order of preference: invoice, contact, default.
+
+           :param browse_record company: company to export
+           :return: dict containing the address representation for the company record, or
+                    an empty dict if no address can be found
+        """
+        res_partner = self.pool.get('res.partner')
+        res_partner_address = self.pool.get('res.partner.address')
+        addresses = res_partner.address_get(cr, uid, [company.partner_id.id], ['default', 'contact', 'invoice'])
+        addr_id = addresses['invoice'] or addresses['contact'] or addresses['default']
+        result = {}
+        if addr_id:
+            address = res_partner_address.browse(cr, uid, addr_id, context=context)
+            result = res_partner_address.edi_export(cr, uid, [address], edi_struct=edi_address_struct, context=context)[0]
+        if company.logo:
+            result['logo'] = company.logo # already base64-encoded
+        if company.paypal_account:
+            result['paypal_account'] = company.paypal_account
+        # bank info: include only bank account supposed to be displayed in document footers
+        res_partner_bank = self.pool.get('res.partner.bank')
+        bank_ids = res_partner_bank.search(cr, uid, [('company_id','=',company.id),('footer','=',True)], context=context)
+        if bank_ids:
+            result['bank_ids'] = res_partner_address.edi_m2m(cr, uid,
+                                                             res_partner_bank.browse(cr, uid, bank_ids, context=context),
+                                                             context=context)
+        return result
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/models/res_currency.py b/addons/edi/models/res_currency.py
new file mode 100644
index 00000000000..0f56bc83f45
--- /dev/null
+++ b/addons/edi/models/res_currency.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 edi import EDIMixin
+from openerp import SUPERUSER_ID
+
+RES_CURRENCY_EDI_STRUCT = {
+    #custom: 'code'
+    'symbol': True,
+    'rate': True,
+}
+
+class res_currency(osv.osv, EDIMixin):
+    _inherit = "res.currency"
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        edi_struct = dict(edi_struct or RES_CURRENCY_EDI_STRUCT)
+        edi_doc_list = []
+        for currency in records:
+            # Get EDI doc based on struct. The result will also contain all metadata fields and attachments.
+            edi_doc = super(res_currency,self).edi_export(cr, uid, [currency], edi_struct, context)[0]
+            edi_doc.update(code=currency.name)
+            edi_doc_list.append(edi_doc)
+        return edi_doc_list
+
+    def edi_import(self, cr, uid, edi_document, context=None):
+        self._edi_requires_attributes(('code','symbol'), edi_document)
+        external_id = edi_document['__id']
+        existing_currency = self._edi_get_object_by_external_id(cr, uid, external_id, 'res_currency', context=context)
+        if existing_currency:
+            return existing_currency.id
+
+        # find with unique ISO code
+        existing_ids = self.search(cr, uid, [('name','=',edi_document['code'])])
+        if existing_ids:
+            return existing_ids[0]
+
+        # nothing found, create a new one
+        currency_id = self.create(cr, SUPERUSER_ID, {'name': edi_document['code'],
+                                                     'symbol': edi_document['symbol']}, context=context)
+        rate = edi_document.pop('rate')
+        if rate:
+            self.pool.get('res.currency.rate').create(cr, SUPERUSER_ID, {'currency_id': currency_id,
+                                                                         'rate': rate}, context=context)
+        return currency_id
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/models/res_partner.py b/addons/edi/models/res_partner.py
new file mode 100644
index 00000000000..7c40a5c7354
--- /dev/null
+++ b/addons/edi/models/res_partner.py
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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
+
+from osv import fields,osv 
+from edi import EDIMixin
+from openerp import SUPERUSER_ID
+from tools.translate import _
+
+RES_PARTNER_ADDRESS_EDI_STRUCT = {
+    'name': True,
+    'email': True,
+    'street': True,
+    'street2': True,
+    'zip': True,
+    'city': True,
+    'country_id': True,
+    'state_id': True,
+    'phone': True,
+    'fax': True,
+    'mobile': True,
+}
+
+RES_PARTNER_EDI_STRUCT = {
+    'name': True,
+    'ref': True,
+    'lang': True,
+    'website': True,
+    'address': RES_PARTNER_ADDRESS_EDI_STRUCT
+}
+
+class res_partner(osv.osv, EDIMixin):
+    _inherit = "res.partner"
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        return super(res_partner,self).edi_export(cr, uid, records,
+                                                  edi_struct or dict(RES_PARTNER_EDI_STRUCT),
+                                                  context=context)
+
+class res_partner_address(osv.osv, EDIMixin):
+    _inherit = "res.partner.address"
+
+    def _get_bank_type(self, cr, uid, context=None):
+        # first option: the "normal" bank type, installed by default
+        res_partner_bank_type = self.pool.get('res.partner.bank.type')
+        try:
+            return self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'bank_normal', context=context).code
+        except ValueError:
+            pass
+
+        # second option: create a new custom type for EDI or use it if already created, as IBAN type is
+        # not always appropriate: we need a free-form bank type for max flexibility (users can correct
+        # data manually after import)
+        code, label = 'edi_generic', 'Generic Bank Type (auto-created for EDI)'
+        bank_code_ids = res_partner_bank_type.search(cr, uid, [('code','=',code)], context=context)
+        if not bank_code_ids:
+            logging.getLogger('edi.res_partner').info('Normal bank account type is missing, creating '
+                                                      'a generic bank account type for EDI.')
+            self.res_partner_bank_type.create(cr, SUPERUSER_ID, {'name': label,
+                                                                 'code': label})
+        return code
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        return super(res_partner_address,self).edi_export(cr, uid, records,
+                                                          edi_struct or dict(RES_PARTNER_ADDRESS_EDI_STRUCT),
+                                                          context=context)
+
+    def edi_import(self, cr, uid, edi_document, context=None):
+        # handle bank info, if any
+        edi_bank_ids = edi_document.pop('bank_ids', None)
+        address_id = super(res_partner_address,self).edi_import(cr, uid, edi_document, context=context)
+        if edi_bank_ids:
+            address = self.browse(cr, uid, address_id, context=context)
+            import_ctx = dict((context or {}),
+                              default_partner_id=address.partner_id.id,
+                              default_state=self._get_bank_type(cr, uid, context))
+            for ext_bank_id, bank_name in edi_bank_ids:
+                try:
+                    self.edi_import_relation(cr, uid, 'res.partner.bank',
+                                             bank_name, ext_bank_id, context=import_ctx)
+                except osv.except_osv:
+                    # failed to import it, try again with unrestricted default type
+                    logging.getLogger('edi.res_partner').warning('Failed to import bank account using'
+                                                                 'bank type: %s, ignoring', import_ctx['default_state'],
+                                                                 exc_info=True)
+        return address_id
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/security/ir.model.access.csv b/addons/edi/security/ir.model.access.csv
new file mode 100644
index 00000000000..f1942397ac5
--- /dev/null
+++ b/addons/edi/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_ir_edi_all_read","access_ir_edi_all_read","model_edi_document",,1,0,0,0
+"access_ir_edi_employee_create","access_ir_edi_employee_create","model_edi_document","base.group_user",1,0,1,0
\ No newline at end of file
diff --git a/addons/edi/static/src/css/edi.css b/addons/edi/static/src/css/edi.css
new file mode 100644
index 00000000000..478985ee585
--- /dev/null
+++ b/addons/edi/static/src/css/edi.css
@@ -0,0 +1,220 @@
+/** EDI content **/
+.openerp .company_logo {
+    background-size: 180px 46px;
+}
+.oe_edi_view {
+    width: 65%;
+    vertical-align: top;
+    padding: 0px 25px;
+    border-right: 1px solid #D2CFCF;
+}
+.oe_edi_sidebar_container {
+    width: 35%;
+    padding: 0px 10px;
+    vertical-align: top;
+}
+button.oe_edi_action_print {
+    font-size: 1.5em;
+    margin-left: 35%;
+    margin-bottom: 20px;
+}
+button.oe_edi_action_print img {
+    vertical-align: bottom;
+    width: 32px;
+    height: 32px;
+}
+
+.openerp input.invalid {
+    background-color: #F66 !important;
+    border: 1px solid #D00 !important;
+    color: #000;
+}
+/* following browse-specific hacks need to be separate rules, as browsers are
+   required to ignore rules with unknown selectors. At time of writing, there
+   is no standard way to style HTML5 placeholders */
+.openerp input.invalid:-moz-placeholder {
+    color: #FFF;
+}
+.openerp input.invalid::-webkit-input-placeholder {
+    color: #FFF;
+}
+
+/** EDI Sidebar **/
+.oe_edi_sidebar_title {
+    border-bottom: 1px solid #D2CFCF;
+    font-weight: bold;
+    font-size: 1.3em;
+    min-width: 10em;
+}
+.oe_edi_nested_block, .oe_edi_nested_block_import, .oe_edi_nested_block_pay {
+    margin: 0px 40px;
+    min-width: 10em;
+    display: none; /* made visible by click on parent input/label */
+}
+.oe_edi_right_top .oe_edi_nested_block label {
+    float: left;
+    text-align: right;
+    margin-right: 0.5em;
+    line-height: 180%;
+    font-weight: bold;
+    min-width: 5em;
+}
+.oe_edi_option {
+    padding-left: 5px;
+    line-height: 2em;
+}
+.oe_edi_option:hover {
+    background: #e8e8e8;
+}
+.oe_edi_import_button {
+    margin: 2px 10px;
+    white-space: nowrap;
+}
+.oe_edi_small, .oe_edi_small input {
+    font-size: 90%;
+}
+
+/** Sidebar bottom **/
+.oe_edi_paypal_button {
+    margin: 6px;
+}
+
+
+/** Paperbox, from http://www.sitepoint.com/pure-css3-paper-curl/ **/
+body {
+    background: #EEE; /* contrast with paper */
+}
+.oe_edi_paperbox {
+    position: relative;
+    width: 700px;
+    padding: 30px;
+    padding-bottom: 50px;
+    margin: 20px auto;
+    background-color: #fff;
+    -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.oe_edi_paperbox:before, .oe_edi_paperbox:after {
+    position: absolute;
+    width: 40%;
+    height: 10px;
+    content: ' ';
+    left: 12px;
+    bottom: 15px;
+    background: transparent;
+    -webkit-transform: skew(-5deg) rotate(-5deg);
+    -moz-transform: skew(-5deg) rotate(-5deg);
+    -ms-transform: skew(-5deg) rotate(-5deg);
+    -o-transform: skew(-5deg) rotate(-5deg);
+    transform: skew(-5deg) rotate(-5deg);
+    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+    -moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+    z-index: -1;
+}
+.oe_edi_paperbox:after {
+    left: auto; right: 12px;
+    -webkit-transform: skew(5deg) rotate(5deg);
+    -moz-transform: skew(5deg) rotate(5deg);
+    -ms-transform: skew(5deg) rotate(5deg);
+    -o-transform: skew(5deg) rotate(5deg);
+    transform: skew(5deg) rotate(5deg);
+}
+
+/** Sale Order / Purchase Order Preview **/
+table.oe_edi_data, .oe_edi_doc_title {
+    border-collapse: collapse;
+    clear: both;
+}
+.oe_edi_data th {
+    white-space: nowrap;
+}
+.oe_edi_data .oe_edi_floor {
+    border-bottom: 1px solid black;
+}
+.oe_edi_data .oe_edi_ceiling {
+    border-top: 1px solid black;
+}
+.oe_edi_data .oe_edi_data_row {
+    border-bottom: 1px solid #D2CFCF;
+}
+.oe_edi_data_row td {
+    vertical-align: top;
+}
+.oe_edi_inner_note {
+    font-style: italic;
+    font-size: 95%;
+    padding-left: 10px;
+}
+.oe_edi_shade {
+    background: #e8e8e8;
+}
+.oe_edi_company_name {
+    text-transform: uppercase;
+    font-weight: bold;
+}
+.oe_edi_address_from {
+    float: left;
+}
+.oe_edi_address_to {
+    float: right;
+    margin-top: 25px;
+    margin-bottom: 30px;
+}
+.oe_edi_company_block_title {
+    width: 375px;
+    margin: 0px;
+    padding: 2px 14px;
+    background-color: #252525;
+    border-top-left-radius: 5px 5px;
+    border-top-right-radius: 5px 5px;
+    background-repeat: repeat no-repeat; 
+}
+.oe_edi_company_block_title .oe_edi_company_name {
+    margin: 0px;
+    font-size: 1em;
+    color: #FFF;
+}
+.oe_edi_company_block_body {
+    width: 375px;
+    margin: 0px;
+    padding: 5px 14px;
+    line-height: 16px;
+    background-color: rgb(242, 242, 242);
+}
+.oe_edi_company_block_body p {
+    color: #222;
+    margin: 5px 0px;
+}
+.oe_edi_summary_label {
+    float: left;
+}
+.oe_edi_summary_value {
+    float: right;
+}
+
+
+/** Python code highlighting **/
+/*  GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann
+    (http://qbnz.com/highlighter/ and http://geshi.org/) */
+.python .de1, .python .de2 {font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;}
+.python  {font-family:monospace;}
+.python .imp {font-weight: bold; color: red;}
+.python li, .python .li1 {background: #ffffff; list-style: none;}
+.python .ln {width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;}
+.python .li2 {background: #f8f8f8;}
+.python .kw1 {color: #ff7700;font-weight:bold;}
+.python .kw2 {color: #008000;}
+.python .kw3 {color: #dc143c;}
+.python .kw4 {color: #0000cd;}
+.python .co1 {color: #808080; font-style: italic;}
+.python .coMULTI {color: #808080; font-style: italic;}
+.python .es0 {color: #000099; font-weight: bold;}
+.python .br0 {color: black;}
+.python .sy0 {color: #66cc66;}
+.python .st0 {color: #483d8b;}
+.python .nu0 {color: #ff4500;}
+.python .me1 {color: black;}
+.python span.xtra { display:block; }
+.python ol { padding: 0px; }
\ No newline at end of file
diff --git a/addons/edi/static/src/img/pdf.png b/addons/edi/static/src/img/pdf.png
new file mode 100644
index 00000000000..d35dfd20c2d
Binary files /dev/null and b/addons/edi/static/src/img/pdf.png differ
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
new file mode 100644
index 00000000000..9397c1cf280
--- /dev/null
+++ b/addons/edi/static/src/js/edi.js
@@ -0,0 +1,174 @@
+openerp.edi = function(openerp) {
+openerp.web.qweb.add_template("/edi/static/src/xml/edi.xml");
+openerp.web.qweb.add_template("/edi/static/src/xml/edi_account.xml");
+openerp.web.qweb.add_template("/edi/static/src/xml/edi_sale_purchase.xml");
+openerp.edi = {}
+
+openerp.edi.EdiView = openerp.web.Widget.extend({
+    init: function(parent, db, token) {
+        this._super();
+        this.db = db;
+        this.token = token;
+        this.session = new openerp.web.Connection();
+        this.template = "EdiEmpty";
+        this.content = "";
+        this.sidebar = "";
+    },
+    start: function() {
+        this._super();
+        var param = {"db": this.db, "token": this.token};
+        this.rpc('/edi/get_edi_document', param, this.on_document_loaded, this.on_document_failed);
+    },
+    on_document_loaded: function(docs){
+        this.doc = docs[0];
+        var template_content = "Edi." + this.doc.__model + ".content";
+        var template_sidebar = "Edi." + this.doc.__model + ".sidebar";
+        var param = {"widget":this, "doc":this.doc};
+        if (openerp.web.qweb.templates[template_sidebar]) {
+            this.sidebar = openerp.web.qweb.render(template_sidebar, param);
+        }
+        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);
+    },
+    on_document_failed: function(response) {
+        var self = this;
+        var params = {
+                error: response,
+                //TODO: should this be _t() wrapped?
+                message: "Sorry, this document cannot be located. Perhaps the link you are using has expired?"
+        }
+        $(openerp.web.qweb.render("DialogWarning", params)).dialog({
+            title: "Document not found",
+            modal: true,
+        });
+    },
+    show_code: function($event) {
+        $('#oe_edi_download_code').toggle();
+    },
+    get_download_url: function() {
+        var l = window.location;
+        var url_prefix = l.protocol + '//' + l.host;
+        return url_prefix +'/edi/download?db=' + this.db + '&token=' + this.token;
+    },
+    get_paypal_url: function(document_type, ref_field) {
+        var comp_name = encodeURIComponent(this.doc.company_id[1]);
+        var doc_ref = encodeURIComponent(this.doc[ref_field]);
+        var paypal_account = encodeURIComponent(this.doc.company_address.paypal_account);
+        var amount = encodeURIComponent(this.doc.amount_total);
+        var cur_code = encodeURIComponent(this.doc.currency.code);
+        var paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick" +
+                     "&business=" + paypal_account +
+                     "&item_name=" + document_type + "%20" + comp_name + "%20" + doc_ref +
+                     "&invoice=" + doc_ref + 
+                     "&amount=" + amount +
+                     "&currency_code=" + cur_code +
+                     "&button_subtype=services&amp;no_note=1&amp;bn=OpenERP_PayNow_" + cur_code;
+        return paypal_url;
+    },
+    toggle_choice: function(mode) {
+        return function($e) {
+            $('.oe_edi_nested_block_'+mode).hide();
+            $('.'+$e.target.id+'_nested').show();
+            return true;
+        }
+    },
+    do_print: function(e){
+        var l = window.location;
+        window.location = l.protocol + '//' + l.host + "/edi/download_attachment?db=" + this.db + "&token=" + this.token;
+    },
+    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 server_url = $edi_text_server_input.val();
+        $edi_text_server_input.removeClass('invalid');
+        if (!server_url) {
+            $edi_text_server_input.addClass('invalid');
+            return false;
+        }
+        var protocol = "http://";
+        if (server_url.toLowerCase().lastIndexOf('http', 0) == 0 ) {
+            protocol = '';
+        }
+        window.location = protocol + server_url + '/edi/import_url?url=' + encodeURIComponent(url_download);
+    },
+    do_import_create: function(e){
+        var url_download = this.get_download_url();
+        window.location = "https://cc.my.openerp.com/odms/create_edi?url=" + encodeURIComponent(url_download);
+    },
+    do_download: function(e){
+        window.location = this.get_download_url();
+    }
+});
+
+openerp.edi.EdiImport = openerp.web.Widget.extend({
+    init: function(parent,url) {
+        this._super();
+        this.url = url;
+        var params = {};
+
+        this.template = "EdiImport";
+        this.session = new openerp.web.Connection();
+        this.login = new openerp.web.Login(this);
+        this.header = new openerp.web.Header(this);
+        this.header.on_logout.add(this.login.on_logout);
+    },
+    start: function() {
+        this.session.on_session_invalid.add_last(this.do_ask_login)
+        this.session.on_session_valid.add_last(this.do_import);
+        this.header.appendTo($("#oe_header"));
+        this.session.start();
+        this.login.appendTo($('#oe_login'));
+    },
+    do_ask_login: function() {
+        this.login.do_ask_login(this.do_import);
+    },
+    do_import: function() {
+        this.rpc('/edi/import_edi_url', {url: this.url}, this.on_imported, 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) {
+                window.location = "/web/webclient/home?debug=1&s_action="+encodeURIComponent(key);
+            });
+        }
+        else {
+            $('<div>').dialog({
+                modal: true,
+                title: 'Import Successful!',
+                buttons: {
+                    Ok: function() {
+                        $(this).dialog("close");
+                        window.location = "/web/webclient/home";
+                    }
+                }
+            }).html('The document has been successfully imported!');
+        }
+    },
+    on_imported_error: function(response){
+        var self = this;
+        var msg = "Sorry, the document could not be imported.";
+        if (response.data.fault_code) {
+            msg += "\n Reason:" + response.data.fault_code;
+        }
+        var params = {error: response, message: msg};
+        $(openerp.web.qweb.render("DialogWarning", params)).dialog({
+            title: "Document Import Notification",
+            modal: true,
+            buttons: {
+                Ok: function() { $(this).dialog("close"); }
+            }
+        });
+    }
+});
+
+}
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
new file mode 100644
index 00000000000..1e662a2b2cc
--- /dev/null
+++ b/addons/edi/static/src/xml/edi.xml
@@ -0,0 +1,93 @@
+<template>
+<t t-name="EdiEmpty">
+    <div style="height:100%;"></div>
+</t>
+<t t-name="EdiImport">
+    <t t-call="Interface"/>
+</t>
+<t t-name="EdiView">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms">
+    <tr>
+        <td colspan="2" valign="top" id="oe_header" class="header">
+            <div> <a href="/" class="company_logo_link">
+                    <div class="company_logo"
+                         t-att-style="'background: url('+ (doc.company_address ? '/edi/binary?db='+widget.db+'&amp;token='+widget.token : '/web/static/src/img/logo.png')+')'"/></a> </div>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2" valign="top" height="100%">
+            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
+                <tr>
+                    <td class="oe_edi_view">
+                        <p class="oe_form_paragraph"><t t-raw="widget.content"/></p>
+                        <button type="button" class="oe_edi_action_print">
+                            View/Print <img src="/edi/static/src/img/pdf.png"/>
+                        </button>
+                    </td>
+                    <td class="oe_edi_sidebar_container">
+                        <p class="oe_edi_sidebar_title">
+                            Import this document
+                        </p>
+                        <div class="oe_edi_option">
+                            <input type="radio" id="oe_edi_import_openerp" name="oe_edi_import" class="oe_edi_import_choice"/>
+                            <label for="oe_edi_import_openerp" id="oe_edi_import_openerp" class="oe_edi_import_choice_label">Import it into an existing OpenERP instance</label>
+                        </div>
+                        <p class="oe_edi_nested_block_import oe_edi_import_openerp_nested">
+                            <label for="oe_edi_txt_server_url">OpenERP instance address:</label>
+                            <br/>
+                            <input type="text" id="oe_edi_txt_server_url" placeholder="http://example.my.openerp.com/"/><br/>
+                            <button type="button" class="oe_edi_import_button" id="oe_edi_import_existing">Import</button>
+                        </p>
+
+                        <div class="oe_edi_option">
+                        <input type="radio" id="oe_edi_import_saas" name="oe_edi_import" class="oe_edi_import_choice"/>
+                        <label for="oe_edi_import_saas"  id="oe_edi_import_saas" class="oe_edi_import_choice_label">Import it into a new OpenERP Online instance</label>
+                        </div>
+                        <p class="oe_edi_nested_block_import oe_edi_import_saas_nested">
+                            <button type="button" class="oe_edi_import_button" id="oe_edi_import_create">Create my new OpenERP instance</button>
+                        </p>
+
+                        <div class="oe_edi_option">
+                        <input type="radio" id="oe_edi_import_download" name="oe_edi_import" class="oe_edi_import_choice"/>
+                        <label for="oe_edi_import_download" id="oe_edi_import_download" class="oe_edi_import_choice_label">Import into another application</label>
+                        </div>
+                        <p class="oe_edi_nested_block_import oe_edi_small oe_edi_import_download_nested">
+                            OpenERP's Electronic Data Interchange documents are based on a generic and language
+                            independent <a href="http://json.org">JSON</a> serialization of the document's attribute.
+                            It is usually very quick and straightforward to create a small plug-in for your preferred
+                            application that will be capable of importing any OpenERP EDI document.
+                            You can find out more details about how to do this and what the content of OpenERP EDI documents
+                            is like in the <a href="http://doc.openerp.com/search.html?q=edi">OpenERP documentation</a>.
+                            <br/>
+                            To get started immediately, <a href="#" id="oe_edi_download_show_code">see is all it takes to use this EDI document in Python</a>.
+                        </p>
+                        <div class="python oe_edi_nested_block_import oe_edi_small" id="oe_edi_download_code">
+                        <ol><li class="li1"><div class="de1"><span class="kw1">import</span> <span class="kw3">urllib2</span><span class="sy0">,</span> simplejson</div></li>
+                        <li class="li1"><div class="de1">edi_document <span class="sy0">=</span> <span class="kw3">urllib2</span>.<span class="me1">urlopen</span><span class="br0">(</span><span class="st0">'<t t-esc="widget.get_download_url()"/>'</span><span class="br0">)</span>.<span class="me1">read</span><span class="br0">(</span><span class="br0">)</span></div></li>
+                        <li class="li2"><div class="de2">document_data <span class="sy0">=</span> simplejson.<span class="me1">loads</span><span class="br0">(</span>edi_document<span class="br0">)</span><span class="br0">[</span><span class="nu0">0</span><span class="br0">]</span></div></li>
+                        <li class="li1"><div class="de1"><span class="kw1">print</span> <span class="st0">"Amount: "</span><span class="sy0">,</span> document_data<span class="br0">[</span><span class="st0">'amount_total'</span><span class="br0">]</span></div></li>
+                        </ol></div>
+                        <p class="oe_edi_nested_block_import oe_edi_small oe_edi_import_download_nested">
+                            You can download the raw EDI document here:<br/>
+                            <input type="text" readonly="readonly" t-att-value="widget.get_download_url()"/>
+                            <button type="button" class="oe_edi_import_button" id="oe_edi_download">Download</button>
+                        </p>
+
+                        <div class="oe_edi_right_bottom">
+                            <t t-raw="widget.sidebar"/>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <div id="oe_footer" class="oe_footer">
+                <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">OpenERP</a></p>
+            </div>
+        </td>
+    </tr>
+    </table>
+</t>
+</template>
diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
new file mode 100644
index 00000000000..dc6fb7f9754
--- /dev/null
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -0,0 +1,163 @@
+<template>
+<t t-name="Edi.account.invoice.content">
+    <div class="oe_edi_paperbox">
+       <div class="oe_edi_address_from">
+           <div class="oe_edi_company_block_title">
+               <span class="oe_edi_company_name"><t t-esc="doc.company_id[1]"/></span>
+           </div>
+           <div class="oe_edi_company_block_body">
+                <p>
+                    <t t-if="doc.company_address">
+                       <t t-if="doc.company_address.street" t-esc="doc.company_address.street"/><br/>
+                       <t t-if="doc.company_address.street2"><t t-esc="doc.company_address.street2"/><br/></t>
+                       <t t-if="doc.company_address.zip" t-esc="doc.company_address.zip"/> <t t-if="doc.company_address.city" t-esc="doc.company_address.city"/> <br/>
+                       <t t-if="doc.company_address.country_id"><t t-esc="doc.company_address.country_id[1]"/><br/></t>
+                   </t>
+                </p>
+           </div>
+       </div>
+       <div class="oe_edi_address_to">
+           <div class="oe_edi_company_block_title">
+               <span class="oe_edi_company_name"><t t-esc="doc.partner_id[1]"/></span>
+           </div>
+           <div class="oe_edi_company_block_body">
+                <p>
+                    <t t-if="doc.partner_address">
+                       <t t-if="doc.partner_address.street" t-esc="doc.partner_address.street"/><br/>
+                       <t t-if="doc.partner_address.street2"><t t-esc="doc.partner_address.street2"/><br/></t>
+                       <t t-if="doc.partner_address.zip" t-esc="doc.partner_address.zip"/> <t t-if="doc.partner_address.city" t-esc="doc.partner_address.city"/> <br/>
+                       <t t-if="doc.partner_address.country_id"><t t-esc="doc.partner_address.country_id[1]"/><br/></t>
+                   </t>
+                </p>
+           </div>
+       </div>
+       <h1 class="oe_edi_doc_title">Invoice <t t-esc="doc.internal_number"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+       <table width="100%" class="oe_edi_data oe_edi_shade">
+            <tr class="oe_edi_floor">
+                <th align="left">Description</th>
+                <th align="left">Date</th>
+                <th align="left">Your Reference</th>
+            </tr>
+            <tr class="oe_edi_data_row">
+                <td align="left"><t t-esc="doc.name"/></td>
+                <td align="left"><t t-esc="doc.date_invoice"/></td>
+                <td align="left"><t t-esc="doc.partner_ref"/></td>
+            </tr>
+        </table>
+        <p/>
+        <table width="100%" class="oe_edi_data">
+            <tr class="oe_edi_floor">
+                <th align="left">Product Description</th>
+                <th align="right">Quantity</th>
+                <th align="right">Unit Price</th>
+                <th align="right">Discount</th>
+                <th align="right">Price</th>
+            </tr>
+                <t t-if="doc.invoice_line" t-foreach="doc.invoice_line" t-as="invoice_line">
+                    <tr class="oe_edi_data_row">
+                        <td align="left"><t t-esc="invoice_line.name"/>
+                            <t t-if="invoice_line.note">
+                                <pre class="oe_edi_inner_note"><t t-esc="invoice_line.note"/></pre>
+                            </t>
+                        </td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.quantity)"/> <t t-esc="invoice_line.uos_id[1]"/></td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.price_unit)"/></td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.discount)"/></td>
+                        <td align="right"><t t-esc="_.str.sprintf('%.2f',invoice_line.price_subtotal)"/> <t t-esc="doc.currency.code"/></td>
+                    </tr>
+                </t>
+            <tr>
+                <td colspan="3"></td>
+                <td colspan="2" class="oe_edi_ceiling">
+                    <div class="oe_edi_summary_label">
+                        Net Total:
+                    </div>
+                    <div class="oe_edi_summary_value">
+                        <t t-esc="_.str.sprintf('%.2f',doc.amount_untaxed)"/> <t t-esc="doc.currency.code"/>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="3"></td>
+                <td colspan="2" class="oe_edi_floor">
+                    <div class="oe_edi_summary_label">
+                        Taxes:
+                    </div>
+                    <div class="oe_edi_summary_value">
+                        <t t-esc="_.str.sprintf('%.2f',doc.amount_tax)"/> <t t-esc="doc.currency.code"/>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="3"></td>
+                <th colspan="2" class="oe_edi_shade">
+                    <div class="oe_edi_summary_label">
+                        Total:
+                    </div>
+                    <div class="oe_edi_summary_value">
+                        <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/>
+                    </div>
+                </th>
+            </tr>
+        </table>
+        <t t-if="doc.tax_line">
+        <table class="oe_edi_data" width="40%">
+            <tr class="oe_edi_floor">
+                <th align="left">Tax</th>
+                <th align="right">Base Amount</th>
+                <th align="right">Amount</th>
+            </tr>
+            <t t-if="doc.tax_line"><t t-foreach="doc.tax_line" t-as="tax_line">
+                <tr class="oe_edi_data_row">
+                    <td align="left"><t t-esc="tax_line.name"/></td>
+                    <td align="right"><t t-esc="_.str.sprintf('%.2f',tax_line.base_amount)"/> <t t-esc="doc.currency.code"/></td>
+                    <td align="right"><t t-esc="_.str.sprintf('%.2f',tax_line.amount)"/> <t t-esc="doc.currency.code"/></td>
+                </tr>
+                </t>
+            </t>
+        </table>
+        </t>
+        <t t-if="doc.comment">
+            <p>Notes:</p>
+            <pre class="oe_edi_inner_note"><t t-esc="doc.comment"/></pre>
+        </t>
+    </div>
+</t>
+<t t-name="Edi.account.invoice.sidebar">
+    <t t-if="!doc.reconciled &amp;&amp; (doc.type == 'out_invoice' or doc.type == 'in_refund')">
+        <t t-if="doc.company_address.paypal_account || doc.company_address.bank_ids">
+            <p class="oe_edi_sidebar_title">Pay Online</p>
+            <t t-if="doc.company_address.paypal_account">
+                <div class="oe_edi_option">
+                    <input type="radio" id="oe_edi_paypal" name="oe_edi_pay" class="oe_edi_pay_choice"/>
+                    <label for="oe_edi_paypal" id="oe_edi_paypal" class="oe_edi_pay_choice_label">Paypal</label>
+                </div>
+                <p class="oe_edi_nested_block_pay oe_edi_paypal_nested">
+                    You may directly pay this invoice online via Paypal's secure payment gateway:<br/>
+                    <a t-att-href="widget.get_paypal_url('Invoice','internal_number')" target="_new">
+                        <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+                    </a>
+                </p>
+            </t>
+            <t t-if="doc.company_address.bank_ids">
+                <div class="oe_edi_option">
+                    <input type="radio" id="oe_edi_pay_wire" name="oe_edi_pay" class="oe_edi_pay_choice"/>
+                    <label for="oe_edi_pay_wire" id="oe_edi_pay_wire" class="oe_edi_pay_choice_label">Bank Wire Transfer</label>
+                </div>
+                <p class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                    Please transfer <strong><t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
+                    <strong><t t-esc="doc.company_id[1]"/></strong> (postal address on the invoice header)
+                     using one of the following bank accounts. Be sure to mention the invoice
+                     reference <strong><t t-esc="doc.internal_number"/></strong> on the transfer:
+                     <br/><br/>
+                </p>
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
+                    <li><t t-esc="bank_info[1]"/></li>
+                </t>
+                </ul>
+            </t>
+        </t>
+    </t>
+</t>
+</template>
diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
new file mode 100644
index 00000000000..4e0fdd7fc4e
--- /dev/null
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -0,0 +1,161 @@
+<template>
+<t t-name="Edi.sale.order.content">
+<div class="oe_edi_paperbox">
+   <div class="oe_edi_address_from">
+       <div class="oe_edi_company_block_title">
+           <span class="oe_edi_company_name"><t t-esc="doc.company_id[1]"/></span>
+       </div>
+       <div class="oe_edi_company_block_body">
+            <p>
+                <t t-if="doc.company_address">
+                   <t t-if="doc.company_address.street" t-esc="doc.company_address.street"/><br/>
+                   <t t-if="doc.company_address.street2"><t t-esc="doc.company_address.street2"/><br/></t>
+                   <t t-if="doc.company_address.zip" t-esc="doc.company_address.zip"/> <t t-if="doc.company_address.city" t-esc="doc.company_address.city"/> <br/>
+                   <t t-if="doc.company_address.country_id"><t t-esc="doc.company_address.country_id[1]"/><br/></t>
+               </t>
+            </p>
+       </div>
+   </div>
+
+   <div class="oe_edi_address_to">
+       <div class="oe_edi_company_block_title">
+           <span class="oe_edi_company_name"><t t-esc="doc.partner_id[1]"/></span>
+       </div>
+       <div class="oe_edi_company_block_body">
+            <p>
+                <t t-if="doc.partner_address">
+                   <t t-if="doc.partner_address.street" t-esc="doc.partner_address.street"/><br/>
+                   <t t-if="doc.partner_address.street2"><t t-esc="doc.partner_address.street2"/><br/></t>
+                   <t t-if="doc.partner_address.zip" t-esc="doc.partner_address.zip"/> <t t-if="doc.partner_address.city" t-esc="doc.partner_address.city"/> <br/>
+                   <t t-if="doc.partner_address.country_id"><t t-esc="doc.partner_address.country_id[1]"/><br/></t>
+               </t>
+            </p>
+       </div>
+   </div>
+
+   <h1 class="oe_edi_doc_title">Order <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+
+    <table width="100%" class="oe_edi_data oe_edi_shade">
+        <tr class="oe_edi_floor">
+            <th align="left">Your Reference</th>
+            <th align="left">Date</th>
+            <th align="left">Salesman</th>
+            <th align="left">Payment terms</th>
+        </tr>
+        <tr class="oe_edi_data_row">
+            <td align="left"><t t-if="doc.partner_ref" t-esc="doc.partner_ref"/></td>
+            <td align="left"><t t-esc="doc.date_order"/></td>
+            <td align="left"><t t-if="doc.user_id" t-esc="doc.user_id[1]"/></td>
+            <td align="left">
+                <t t-if="doc.payment_term" t-esc="doc.payment_term[1]"/>
+            </td>
+        </tr>
+    </table>
+    <p/>
+    <table width="100%" class="oe_edi_data">
+        <tr class="oe_edi_floor">
+            <th align="left">Product Description</th>
+            <th align="right">Quantity</th>
+            <th align="right">Unit Price</th>
+            <th align="right">Discount(%)</th>
+            <th align="right">Price</th>
+        </tr>
+        <t t-if="doc.order_line" t-foreach="doc.order_line" t-as="doc_line">
+            <tr class="oe_edi_data_row">
+                <td align="left"><t t-esc="doc_line.name"/>
+                    <t t-if="doc_line.notes">
+                        <pre class="oe_edi_inner_note"><t t-esc="doc_line.notes"/></pre>
+                    </t>
+                </td>
+                <td align="right">
+                    <t t-esc="_.str.sprintf('%.2f',doc_line.product_qty)"/> <t t-esc="doc_line.product_uom[1]"/>
+                </td>
+                <td align="right"><t t-esc="_.str.sprintf('%.2f',doc_line.price_unit)"/></td>
+                <td align="right"><t t-esc="_.str.sprintf('%.2f',doc_line.discount or 0.0)"/></td>
+                <td align="right"><t t-esc="_.str.sprintf('%.2f',doc_line.price_subtotal)"/> <t t-esc="doc.currency.code"/></td>
+            </tr>
+        </t>
+        <tr>
+            <td colspan="3"></td>
+            <td colspan="2" class="oe_edi_ceiling">
+                <div class="oe_edi_summary_label">
+                    Net Total:
+                </div>
+                <div class="oe_edi_summary_value">
+                    <t t-esc="_.str.sprintf('%.2f',doc.amount_untaxed)"/> <t t-esc="doc.currency.code"/>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3"></td>
+            <td colspan="2" class="oe_edi_floor">
+                <div class="oe_edi_summary_label">
+                    Taxes:
+                </div>
+                <div class="oe_edi_summary_value">
+                    <t t-esc="_.str.sprintf('%.2f',doc.amount_tax)"/> <t t-esc="doc.currency.code"/>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3"></td>
+            <th colspan="2" class="oe_edi_shade">
+                <div class="oe_edi_summary_label">
+                    Total:
+                </div>
+                <div class="oe_edi_summary_value">
+                    <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/>
+                </div>
+            </th>
+        </tr>
+    </table>
+    <t t-if="doc.notes">
+        <p>Notes:</p>
+        <pre class="oe_edi_inner_note"><t t-esc="doc.notes"/></pre>
+    </t>
+</div>
+</t>
+<t t-name="Edi.sale.order.sidebar">
+    <t t-if="doc.order_policy &amp;&amp; (doc.order_policy == 'prepaid' || doc.order_policy == 'manual')">
+        <t t-if="doc.company_address.paypal_account || doc.company_address.bank_ids">
+            <p class="oe_edi_sidebar_title">Pay Online</p>
+            <t t-if="doc.company_address.paypal_account">
+                <div class="oe_edi_option">
+                    <input type="radio" id="oe_edi_paypal" name="oe_edi_pay" class="oe_edi_pay_choice"/>
+                    <label for="oe_edi_paypal" id="oe_edi_paypal" class="oe_edi_pay_choice_label">Paypal</label>
+                </div>
+                <p class="oe_edi_nested_block_pay oe_edi_paypal_nested">
+                    You may directly pay this order online via Paypal's secure payment gateway:<br/>
+                    <a t-att-href="widget.get_paypal_url('Sale Order','name')" target="_new">
+                        <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+                    </a>
+                </p>
+            </t>
+            <t t-if="doc.company_address.bank_ids">
+                <div class="oe_edi_option">
+                    <input type="radio" id="oe_edi_pay_wire" name="oe_edi_pay" class="oe_edi_pay_choice"/>
+                    <label for="oe_edi_pay_wire" id="oe_edi_pay_wire" class="oe_edi_pay_choice_label">Bank Wire Transfer</label>
+                </div>
+                <p class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                    Please transfer <strong><t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
+                    <strong><t t-esc="doc.company_id[1]"/></strong> (postal address on the order header)
+                     using one of the following bank accounts. Be sure to mention the document
+                     reference <strong><t t-esc="doc.name"/></strong> on the transfer:
+                     <br/><br/>
+                </p>
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
+                    <li><t t-esc="bank_info[1]"/></li>
+                </t>
+                </ul>
+            </t>
+        </t>
+    </t>
+</t>
+<t t-name="Edi.purchase.order.content">
+    <t t-call="Edi.sale.order.content"/>
+</t>
+<t t-name="Edi.purchase.order.sidebar">
+    <t t-call="Edi.sale.order.sidebar"/>
+</t>
+</template>
diff --git a/addons/edi/test/edi_partner_test.yml b/addons/edi/test/edi_partner_test.yml
new file mode 100644
index 00000000000..cca39417927
--- /dev/null
+++ b/addons/edi/test/edi_partner_test.yml
@@ -0,0 +1,44 @@
+-
+  In order to test the basic EDI system, I will export a partner,
+  modify the exported EDI document to add an attachment and change
+  the data, and then re-import it and re-export it.
+  
+  with an attached file, check the result, the alter the data
+  and reimport it.
+-
+  !python {model: edi.document}: |
+      import json
+      partner_obj = self.pool.get('res.partner')
+      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, ref('base.res_partner_agrolait'))])
+      doc = self.get_document(cr, uid, tokens[0], context=context)
+      edi_doc, = json.loads(doc)
+
+      # check content of the document
+      assert edi_doc.get('__id').endswith('.res_partner_agrolait'), 'Incorrect external ID'
+      assert edi_doc.get('__model') == 'res.partner', 'Incorrect/Missing __model'
+      assert edi_doc.get('__module') == 'base', 'Incorrect/Missing __module'
+      assert edi_doc.get('__last_update'), 'Missing __last_update'
+
+      # try to import the document after changing the name and id, and attaching a
+      # file, and check that a new partner is returned
+      edi_doc['__id'] = 'base:xxd37f8a-xx55-11e0-xxdd-xx81124c8b50.res_partner_xxx'
+      edi_doc['name'] = 'AgroMilk'
+      attachment = {
+        'name': 'Test file',
+        'file_name': 'test.png',
+        # base64 standard requires blocks of 57bytes=76chars, NL-separated
+        'content': 'iVBORw0KGgoAAAANSUhEUgAAAA4AAAAKCAYAAACE2W/HAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A\n/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9oIDQ84BkjLWAYAAACNSURBVCjP\njZKxDUJBDEOf/wbUbEHDhkxAzRjUDECBhMQYjIApuPBNpK+PpUinOPYll5Nt1iCJXifbSPpJZtHg\nXLUdu0FWpMEt87a/xtsmqjjNetPFyhuWYFuj7RcgQBNwXNGdw2CqY85yXWi5z7YBnmRyEHvg0YSX\nrLE9P30nwugOHHr+s5va4x+fofAGm1+JjnJICm0AAAAASUVORK5CYII=\n',
+      }
+      edi_doc['__attachments'] = [attachment]
+      doc = json.dumps([edi_doc])
+      result, = self.import_edi(cr, uid, edi_document=doc)
+      assert result[0] == 'res.partner' and result[1] > ref('base.res_partner_agrolait'),\
+         "Expected (%r,> %r) after import 1, got %r" % ('res.partner', ref('base.res_partner_agrolait'), result)
+
+      # export the same partner we just created, and see if the output matches the input
+      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, result[1])])
+      doc_output = self.get_document(cr, uid, tokens[0], context=context)
+      edi_doc_output, = json.loads(doc_output)
+      for attribute in ('__model', '__module', '__id', 'name', '__attachments'):
+        assert edi_doc_output.get(attribute) == edi_doc.get(attribute), \
+            'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute))
\ No newline at end of file
diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py
index dd87232679d..d1cf5b28431 100644
--- a/addons/email_template/__init__.py
+++ b/addons/email_template/__init__.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2010-2010 OpenERP SA (<http://www.openerp.com>)
+#    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
@@ -19,9 +19,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-
-import email_template_account
 import email_template
-import email_template_mailbox
 import wizard
+import res_partner
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index f56062f37ed..2ab7f194d18 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2010-2010 OpenERP SA (<http://www.openerp.com>)
+#    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
@@ -21,34 +21,53 @@
 ##############################################################################
 
 {
-    "name" : "Email Template for OpenERP",
-    "version" : "0.7 RC",
+    "name" : "Automated E-Mails",
+    "version" : "1.1",
     "author" : "Openlabs",
     "website" : "http://openerp.com",
-    "category" : "Tools",
+    "category" : "Marketing",
     'complexity': "expert",
-    "depends" : ['marketing', 'base_tools'],
+    "depends" : ['mail'],
     "description": """
-Email Template is extraction of Power Email basically just to send emails.
-==========================================================================
+Email Templating (simplified version of the original Power Email by Openlabs)
+=============================================================================
 
-You can define email accounts(server, port, mail format - HTML/Text/Both)
-and email templates (resource, recipient, subject, body, attachments).
+Lets you design complete email templates related to any OpenERP document (Sale
+Orders, Invoices and so on), including sender, recipient, subject, body (HTML and
+Text). You may also automatically attach files to your templates, or print and
+attach a report.
+
+For advanced use, the templates may include dynamic attributes of the document
+they are related to. For example, you may use the name of a Partner's country
+when writing to them, also providing a safe default in case the attribute is
+not defined. Each template contains a built-in assistant to help with the
+inclusion of these dynamic values.
+
+If you enable the option, a composition assistant will also appear in the sidebar
+of the OpenERP documents to which the template applies (e.g. Invoices).
+This serves as a quick way to send a new email based on the template, after
+reviewing and adapting the contents, if needed.
+This composition assistant will also turn into a mass mailing system when called
+for multiple documents at once.
+
+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
 
-For each email template, you can have OpenERP generate a Wizard Action / Button
-that will be related to the object. So if you choose to do marketing campaigns
-for leads, the action will be added to the right side panel of the Lead form.
     """,
-    "init_xml": ['email_template_scheduler_data.xml'],
-    "update_xml": [
-        'security/email_template_security.xml',
-        'email_template_workflow.xml',
-        'email_template_account_view.xml',
+    "data": [
+        'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
-        'email_template_mailbox_view.xml',
-        'wizard/email_template_send_wizard_view.xml',
+        'res_partner_view.xml',
+        'wizard/email_compose_message_view.xml',
         'security/ir.model.access.csv'
     ],
+    "demo": [
+        'res_partner_demo.yml',
+    ],
     "installable": True,
     "active": False,
     "certificate" : "00817073628967384349",
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index aabc211df11..237279c16aa 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2010-2010 OpenERP SA (<http://www.openerp.com>)
+#    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
@@ -21,277 +21,188 @@
 ##############################################################################
 
 import base64
-import random
-import netsvc
 import logging
-import re
 
-TEMPLATE_ENGINES = []
-
-from osv import osv, fields
+import netsvc
+from osv import osv
+from osv import fields
+import tools
 from tools.translate import _
+from urllib import quote as quote
 
 try:
     from mako.template import Template as MakoTemplate
-    TEMPLATE_ENGINES.append(('mako', 'Mako Templates'))
 except ImportError:
-    logging.getLogger('init').warning("module email_template: Mako templates not installed")
-
-try:
-    from django.template import Context, Template as DjangoTemplate
-    #Workaround for bug:
-    #http://code.google.com/p/django-tagging/issues/detail?id=110
-    from django.conf import settings
-    settings.configure()
-    #Workaround ends
-    TEMPLATE_ENGINES.append(('django', 'Django Template'))
-except ImportError:
-    logging.getLogger('init').warning("module email_template: Django templates not installed")
-
-import tools
-import pooler
-import logging
-
-def get_value(cursor, user, recid, message=None, template=None, context=None):
-    """
-    Evaluates an expression and returns its value
-    @param cursor: Database Cursor
-    @param user: ID of current user
-    @param recid: ID of the target record under evaluation
-    @param message: The expression to be evaluated
-    @param template: BrowseRecord object of the current template
-    @param context: OpenERP Context
-    @return: Computed message (unicode) or u""
-    """
-    pool = pooler.get_pool(cursor.dbname)
-    if message is None:
-        message = {}
-    #Returns the computed expression
-    if message:
-        try:
-            message = tools.ustr(message)
-            object = pool.get(template.model_int_name).browse(cursor, user, recid, context=context)
-            env = {
-                'user':pool.get('res.users').browse(cursor, user, user, context=context),
-                'db':cursor.dbname
-                   }
-            if template.template_language == 'mako':
-                templ = MakoTemplate(message, input_encoding='utf-8')
-                reply = MakoTemplate(message).render_unicode(object=object,
-                                                             peobject=object,
-                                                             env=env,
-                                                             format_exceptions=True)
-            elif template.template_language == 'django':
-                templ = DjangoTemplate(message)
-                env['object'] = object
-                env['peobject'] = object
-                reply = templ.render(Context(env))
-            return reply or False
-        except Exception:
-            logging.exception("can't render %r", message)
-            return u""
-    else:
-        return message
+    logging.getLogger('init').warning("email_template: mako templates not available, templating features will not work!")
 
 class email_template(osv.osv):
-    "Templates for sending Email"
-
+    "Templates for sending email"
+    _inherit = 'mail.message'
     _name = "email.template"
-    _description = 'Email Templates for Models'
+    _description = 'Email Templates'
+    _rec_name = 'name' # override mail.message's behavior
 
-    def change_model(self, cursor, user, ids, object_name, context=None):
-        if object_name:
-            mod_name = self.pool.get('ir.model').read(
-                                              cursor,
-                                              user,
-                                              object_name,
-                                              ['model'], context)['model']
+    def render_template(self, cr, uid, template, model, res_id, context=None):
+        """Render the given template text, replace mako 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.
+        """
+        if not template: return u""
+        try:
+            template = tools.ustr(template)
+            record = None
+            if res_id:
+                record = self.pool.get(model).browse(cr, uid, res_id, context=context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            result = MakoTemplate(template).render_unicode(object=record,
+                                                           user=user,
+                                                           # context kw would clash with mako internals
+                                                           ctx=context,
+                                                           quote=quote,
+                                                           format_exceptions=True)
+            if result == u'False':
+                result = u''
+            return result
+        except Exception:
+            logging.exception("failed to render mako template value %r", template)
+            return u""
+
+    def get_email_template(self, cr, uid, template_id=False, record_id=None, context=None):
+        if context is None:
+            context = {}
+        if not template_id:
+            return False
+        template = self.browse(cr, uid, template_id, context)
+        lang = self.render_template(cr, uid, template.lang, template.model, record_id, context)
+        if lang:
+            # Use translated template if necessary
+            ctx = context.copy()
+            ctx['lang'] = lang
+            template = self.browse(cr, uid, template.id, ctx)
         else:
-            mod_name = False
-        return {
-                'value':{'model_int_name':mod_name}
-                }
+            template = self.browse(cr, uid, int(template_id), context)
+        return template
+
+    def onchange_model_id(self, cr, uid, ids, model_id, context=None):
+        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}}
 
     _columns = {
-        'name' : fields.char('Name', size=100, required=True),
-        'object_name':fields.many2one('ir.model', 'Resource'),
-        'model_int_name':fields.char('Model Internal Name', size=200,),
-        'from_account':fields.many2one(
-                   'email_template.account',
-                   string="Email Account",
-                   help="Emails will be sent from this approved account."),
-        'def_to':fields.char(
-                 'Recipient (To)',
-                 size=250,
-                 help="The Recipient of email. "
-                 "Placeholders can be used here. "
-                 "e.g. ${object.email_to}"),
-        'def_cc':fields.char(
-                 'CC',
-                 size=250,
-                 help="Carbon Copy address(es), comma-separated."
-                    " Placeholders can be used here. "
-                    "e.g. ${object.email_cc}"),
-        'def_bcc':fields.char(
-                  'BCC',
-                  size=250,
-                  help="Blind Carbon Copy address(es), comma-separated."
-                    " Placeholders can be used here. "
-                    "e.g. ${object.email_bcc}"),
-        'reply_to':fields.char('Reply-To',
-                    size=250,
-                    help="The address recipients should reply to,"
-                    " if different from the From address."
-                    " Placeholders can be used here. "
-                    "e.g. ${object.email_reply_to}"),
-        'message_id':fields.char('Message-ID',
-                    size=250,
-                    help="Specify the Message-ID SMTP header to use in outgoing emails. Please note that this overrides the Resource tracking option! Placeholders can be used here."),
-        '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"),
-        'lang':fields.char(
-                   'Language',
-                   size=250,
-                   help="The default language for the email."
-                   " Placeholders can be used here. "
-                   "eg. ${object.partner_id.lang}"),
-        'def_subject':fields.char(
-                  'Subject',
-                  size=200,
-                  help="The subject of email."
-                  " Placeholders can be used here.",
-                  translate=True),
-        'def_body_text':fields.text(
-                    'Standard Body (Text)',
-                    help="The text version of the mail",
-                    translate=True),
-        'def_body_html':fields.text(
-                    'Body (Text-Web Client Only)',
-                    help="The text version of the mail",
-                    translate=True),
-        'use_sign':fields.boolean(
-                  'Signature',
-                  help="the signature from the User details"
-                  " will be appended to the mail"),
-        'file_name':fields.char(
-                'Report Filename',
-                size=200,
-                help="Name of the generated report file. Placeholders can be used in the filename. eg: 2009_SO003.pdf",
-                translate=True),
-        'report_template':fields.many2one(
-                  'ir.actions.report.xml',
-                  'Report to send'),
-        'attachment_ids': fields.many2many(
-                    'ir.attachment',
-                    'email_template_attachment_rel',
-                    'email_template_id',
-                    'attachment_id',
-                    'Attached Files',
-                    help="You may attach existing files to this template, "
-                         "so they will be added in all emails created from this template"),
-        'ref_ir_act_window':fields.many2one(
-                    'ir.actions.act_window',
-                    'Window Action',
-                    help="Action that will open this email template on Resource records",
-                    readonly=True),
-        'ref_ir_value':fields.many2one(
-                   'ir.values',
-                   'Wizard Button',
-                   help="Button in the side bar of the form view of this Resource that will invoke the Window Action",
-                   readonly=True),
-        'allowed_groups':fields.many2many(
-                  'res.groups',
-                  'template_group_rel',
-                  'templ_id', 'group_id',
-                  string="Allowed User Groups",
-                  help="Only users from these groups will be"
-                  " allowed to send mails from this Template"),
-        'model_object_field':fields.many2one(
-                 'ir.model.fields',
-                 string="Field",
-                 help="Select the field from the model you want to use."
-                 "\nIf it is a relationship field you will be able to "
-                 "choose the nested values in the box below\n(Note:If "
-                 "there are no values make sure you have selected the"
-                 " correct model)",
-                 store=False),
-        'sub_object':fields.many2one(
-                 'ir.model',
-                 'Sub-model',
-                 help='When a relation field is used this field'
-                 ' will show you the type of field you have selected',
-                 store=False),
-        'sub_model_object_field':fields.many2one(
-                 'ir.model.fields',
-                 'Sub Field',
-                 help="When you choose relationship fields "
-                 "this field will specify the sub value you can use.",
-                 store=False),
-        'null_value':fields.char(
-                 'Null Value',
-                 help="This Value is used if the field is empty",
-                 size=50, store=False),
-        'copyvalue':fields.char(
-                'Expression',
-                size=100,
-                help="Copy and paste the value in the "
-                "location you want to use a system value.",
-                store=False),
-        'table_html':fields.text(
-             'HTML code',
-             help="Copy this html code to your HTML message"
-             " body for displaying the info in your mail.",
-             store=False),
-        #Template language(engine eg.Mako) specifics
-        'template_language':fields.selection(
-                TEMPLATE_ENGINES,
-                'Templating Language',
-                required=True
-                )
+        'name': fields.char('Name', size=250),
+        'model_id': fields.many2one('ir.model', 'Related document model'),
+        'lang': fields.char('Language Selection', size=250,
+                            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}."),
+        '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)"),
+        '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', 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!"),
+
+        # Fake fields used to implement the placeholder assistant
+        'model_object_field': fields.many2one('ir.model.fields', string="Field",
+                                              help="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."),
+        'sub_object': fields.many2one('ir.model', 'Sub-model', readonly=True,
+                                      help="When a relationship field is selected as first field, "
+                                           "this field shows the document model the relationship goes to."),
+        'sub_model_object_field': fields.many2one('ir.model.fields', 'Sub-field',
+                                                  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."),
     }
 
     _defaults = {
-        'template_language' : lambda *a:'mako',
-
+        'track_campaign_item': True
     }
 
-    _sql_constraints = [
-        ('name', 'unique (name)','The template name must be unique !')
-    ]
-
     def create_action(self, cr, uid, ids, context=None):
         vals = {}
-        if context is None:
-            context = {}
-        template_obj = self.browse(cr, uid, ids, context=context)[0]
-        src_obj = template_obj.object_name.model
-        vals['ref_ir_act_window'] = self.pool.get('ir.actions.act_window').create(cr, uid, {
-             'name': template_obj.name,
-             'type': 'ir.actions.act_window',
-             'res_model': 'email_template.send.wizard',
-             'src_model': src_obj,
-             'view_type': 'form',
-             'context': "{'src_model':'%s','template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (src_obj, template_obj.id),
-             'view_mode':'form,tree',
-             'view_id': self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'email_template.send.wizard.form')], context=context)[0],
-             'target': 'new',
-             'auto_refresh':1
-        }, context)
-        ir_values_obj = self.pool.get('ir.values')
-        vals['ref_ir_value'] = ir_values_obj.create(cr, uid, {
-             'name': _('Send Mail (%s)') % template_obj.name,
-             'model': src_obj,
-             'key2': 'client_action_multi',
-             'value': "ir.actions.act_window," + str(vals['ref_ir_act_window']),
-             'object': True,
-         }, context)
+        action_obj = self.pool.get('ir.actions.act_window')
+        data_obj = self.pool.get('ir.model.data')
+        for template in self.browse(cr, uid, ids, context=context):
+            src_obj = template.model_id.model
+            model_data_id = data_obj._get_id(cr, uid, 'mail', 'email_compose_message_wizard_form')
+            res_id = data_obj.browse(cr, uid, model_data_id, context=context).res_id
+            vals['ref_ir_act_window'] = action_obj.create(cr, uid, {
+                 'name': template.name,
+                 'type': 'ir.actions.act_window',
+                 'res_model': 'mail.compose.message',
+                 'src_model': src_obj,
+                 'view_type': 'form',
+                 'context': "{'mail.compose.message.mode':'mass_mail'}",
+                 'view_mode':'form,tree',
+                 'view_id': res_id,
+                 'target': 'new',
+                 'auto_refresh':1
+            }, context)
+            vals['ref_ir_value'] = self.pool.get('ir.values').create(cr, uid, {
+                 'name': _('Send Mail (%s)') % template.name,
+                 'model': src_obj,
+                 'key2': 'client_action_multi',
+                 'value': "ir.actions.act_window," + str(vals['ref_ir_act_window']),
+                 'object': True,
+             }, context)
         self.write(cr, uid, ids, {
-            'ref_ir_act_window': vals['ref_ir_act_window'],
-            'ref_ir_value': vals['ref_ir_value'],
-        }, context)
+                    'ref_ir_act_window': vals.get('ref_ir_act_window',False),
+                    'ref_ir_value': vals.get('ref_ir_value',False),
+                }, context)
         return True
 
     def unlink_action(self, cr, uid, ids, context=None):
@@ -304,9 +215,6 @@ This is useful for CRM leads for example"),
                     ir_values_obj.unlink(cr, uid, template.ref_ir_value.id, context)
             except:
                 raise osv.except_osv(_("Warning"), _("Deletion of Record failed"))
-
-    def delete_action(self, cr, uid, ids, context=None):
-        self.unlink_action(cr, uid, ids, context=context)
         return True
 
     def unlink(self, cr, uid, ids, context=None):
@@ -314,511 +222,178 @@ This is useful for CRM leads for example"),
         return super(email_template, self).unlink(cr, uid, ids, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
+        template = self.browse(cr, uid, id, context=context)
         if default is None:
             default = {}
         default = default.copy()
-        old = self.read(cr, uid, id, ['name'], context=context)
-        new_name = _("Copy of template %s") % old.get('name', 'No Name')
-        check = self.search(cr, uid, [('name', '=', new_name)], context=context)
-        if check:
-            new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz')
-        default.update({'name':new_name})
+        default['name'] = template.name + _('(copy)')
         return super(email_template, self).copy(cr, uid, id, default, context)
 
-    def build_expression(self, field_name, sub_field_name, null_value, template_language='mako'):
-        """
-        Returns a template expression based on data provided
-        @param field_name: field name
-        @param sub_field_name: sub field name (M2O)
-        @param null_value: default value if the target value is empty
-        @param template_language: name of template engine
-        @return: computed expression
-        """
+    def build_expression(self, field_name, sub_field_name, null_value):
+        """Returns a placeholder expression for use in a template field,
+           based on the values provided in the placeholder assistant.
 
+          :param field_name: main field name
+          :param sub_field_name: sub field name (M2O)
+          :param null_value: default value if the target value is empty
+          :return: final placeholder expression
+        """
         expression = ''
-        if template_language == 'mako':
-            if field_name:
-                expression = "${object." + field_name
-                if sub_field_name:
-                    expression += "." + sub_field_name
-                if null_value:
-                    expression += " or '''%s'''" % null_value
-                expression += "}"
-        elif template_language == 'django':
-            if field_name:
-                expression = "{{object." + field_name
-                if sub_field_name:
-                    expression += "." + sub_field_name
-                if null_value:
-                    expression += "|default: '''%s'''" % null_value
-                expression += "}}"
+        if field_name:
+            expression = "${object." + field_name
+            if sub_field_name:
+                expression += "." + sub_field_name
+            if null_value:
+                expression += " or '''%s'''" % null_value
+            expression += "}"
         return expression
 
-    def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None):
-        if not model_object_field:
-            return {}
-        result = {}
-        field_obj = self.pool.get('ir.model.fields').browse(cr, uid, model_object_field, context)
-        #Check if field is relational
-        if field_obj.ttype in ['many2one', 'one2many', 'many2many']:
-            res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
-            if res_ids:
-                result['sub_object'] = res_ids[0]
-                result['copyvalue'] = self.build_expression(False,
-                                                      False,
-                                                      False,
-                                                      template_language)
-                result['sub_model_object_field'] = False
-                result['null_value'] = False
-        else:
-            #Its a simple field... just compute placeholder
-            result['sub_object'] = False
-            result['copyvalue'] = self.build_expression(field_obj.name,
-                                                  False,
-                                                  False,
-                                                  template_language
-                                                  )
-            result['sub_model_object_field'] = False
-            result['null_value'] = False
+    def onchange_sub_model_object_value_field(self, cr, uid, ids, model_object_field, sub_model_object_field=False, null_value=None, context=None):
+        result = {
+            'sub_object': False,
+            'copyvalue': False,
+            'sub_model_object_field': False,
+            'null_value': False
+            }
+        if model_object_field:
+            fields_obj = self.pool.get('ir.model.fields')
+            field_value = fields_obj.browse(cr, uid, model_object_field, context)
+            if field_value.ttype in ['many2one', 'one2many', 'many2many']:
+                res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_value.relation)], context=context)
+                sub_field_value = False
+                if sub_model_object_field:
+                    sub_field_value = fields_obj.browse(cr, uid, sub_model_object_field, context)
+                if res_ids:
+                    result.update({
+                        'sub_object': res_ids[0],
+                        'copyvalue': self.build_expression(field_value.name, sub_field_value and sub_field_value.name or False, null_value or False),
+                        'sub_model_object_field': sub_model_object_field or False,
+                        'null_value': null_value or False
+                        })
+            else:
+                result.update({
+                        'copyvalue': self.build_expression(field_value.name, False, null_value or False),
+                        'null_value': null_value or False
+                        })
         return {'value':result}
 
-    def onchange_sub_model_object_field(self, cr, uid, ids, model_object_field, sub_model_object_field, template_language, context=None):
-        if not model_object_field or not sub_model_object_field:
-            return {}
-        result = {}
-        field_obj = self.pool.get('ir.model.fields').browse(cr, uid, model_object_field, context)
-        if field_obj.ttype in ['many2one', 'one2many', 'many2many']:
-            res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
-            sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
-            if res_ids:
-                result['sub_object'] = res_ids[0]
-                result['copyvalue'] = self.build_expression(field_obj.name,
-                                                      sub_field_obj.name,
-                                                      False,
-                                                      template_language
-                                                      )
-                result['sub_model_object_field'] = sub_model_object_field
-                result['null_value'] = False
-        else:
-            #Its a simple field... just compute placeholder
-            result['sub_object'] = False
-            result['copyvalue'] = self.build_expression(field_obj.name,
-                                                  False,
-                                                  False,
-                                                  template_language
-                                                  )
-            result['sub_model_object_field'] = False
-            result['null_value'] = False
-        return {'value':result}
 
-    def onchange_null_value(self, cr, uid, ids, model_object_field, sub_model_object_field, null_value, template_language, context=None):
-        if not model_object_field and not null_value:
-            return {}
-        result = {}
-        field_obj = self.pool.get('ir.model.fields').browse(cr, uid, model_object_field, context)
-        if field_obj.ttype in ['many2one', 'one2many', 'many2many']:
-            res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
-            sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
-            if res_ids:
-                result['sub_object'] = res_ids[0]
-                result['copyvalue'] = self.build_expression(field_obj.name,
-                                                      sub_field_obj.name,
-                                                      null_value,
-                                                      template_language
-                                                      )
-                result['sub_model_object_field'] = sub_model_object_field
-                result['null_value'] = null_value
-        else:
-            #Its a simple field... just compute placeholder
-            result['sub_object'] = False
-            result['copyvalue'] = self.build_expression(field_obj.name,
-                                                  False,
-                                                  null_value,
-                                                  template_language
-                                                  )
-            result['sub_model_object_field'] = False
-            result['null_value'] = null_value
-        return {'value':result}
+    def generate_email(self, cr, uid, template_id, res_id, context=None):
+        """Generates an email from the template for given (model, res_id) pair.
 
-    def _add_attachment(self, cursor, user, mailbox_id, name, data, filename, context=None):
+           :param template_id: id of the template to render.
+           :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
         """
-        Add an attachment to a given mailbox entry.
-
-        :param data: base64 encoded attachment data to store
-        """
-        attachment_obj = self.pool.get('ir.attachment')
-        attachment_data = {
-            'name':  (name or '') + _(' (Email Attachment)'),
-            'datas': data,
-            'datas_fname': filename,
-            'description': name or _('No Description'),
-            'res_model':'email_template.mailbox',
-            'res_id': mailbox_id,
+        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',
+                  'subtype': 'plain',
         }
-        attachment_id = attachment_obj.create(cursor,
-                                              user,
-                                              attachment_data,
-                                              context)
-        if attachment_id:
-            self.pool.get('email_template.mailbox').write(
-                              cursor,
-                              user,
-                              mailbox_id,
-                              {
-                               'attachments_ids':[(4, attachment_id)],
-                               'mail_type':'multipart/mixed'
-                              },
-                              context)
+        if not template_id:
+            return values
 
-    def generate_attach_reports(self,
-                                 cursor,
-                                 user,
-                                 template,
-                                 record_id,
-                                 mail,
-                                 context=None):
-        """
-        Generate report to be attached and attach it
-        to the email, and add any directly attached files as well.
+        report_xml_pool = self.pool.get('ir.actions.report.xml')
+        template = self.get_email_template(cr, uid, template_id, res_id, context)
 
-        @param cursor: Database Cursor
-        @param user: ID of User
-        @param template: Browse record of
-                         template
-        @param record_id: ID of the target model
-                          for which this mail has
-                          to be generated
-        @param mail: Browse record of email object
-        @return: True
-        """
+        for field in ['subject', 'body_text', 'body_html', 'email_from',
+                      'email_to', 'email_cc', 'email_bcc', 'reply_to',
+                      'message_id']:
+            values[field] = self.render_template(cr, uid, getattr(template, field),
+                                                 template.model, res_id, context=context) \
+                                                 or False
+
+        if values['body_html']:
+            values.update(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.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
         if template.report_template:
-            reportname = 'report.' + \
-                self.pool.get('ir.actions.report.xml').read(
-                                             cursor,
-                                             user,
-                                             template.report_template.id,
-                                             ['report_name'],
-                                             context)['report_name']
-            service = netsvc.LocalService(reportname)
-            data = {}
-            data['model'] = template.model_int_name
-            (result, format) = service.create(cursor,
-                                              user,
-                                              [record_id],
-                                              data,
-                                              context)
-            fname = tools.ustr(get_value(cursor, user, record_id,
-                                         template.file_name, template, context)
-                               or 'Report')
-            ext = '.' + format
-            if not fname.endswith(ext):
-                fname += ext
-            self._add_attachment(cursor, user, mail.id, mail.subject, base64.b64encode(result), fname, context)
-
-        if template.attachment_ids:
-            for attachment in template.attachment_ids:
-                self._add_attachment(cursor, user, mail.id, attachment.name, attachment.datas, attachment.datas_fname, context)
-
-        return True
-
-    def _generate_mailbox_item_from_template(self,
-                                      cursor,
-                                      user,
-                                      template,
-                                      record_id,
-                                      context=None):
-        """
-        Generates an email from the template for
-        record record_id of target object
-
-        @param cursor: Database Cursor
-        @param user: ID of User
-        @param template: Browse record of
-                         template
-        @param record_id: ID of the target model
-                          for which this mail has
-                          to be generated
-        @return: ID of created object
-        """
-        if context is None:
-            context = {}
-        #If account to send from is in context select it, else use enforced account
-        if 'account_id' in context.keys():
-            from_account = self.pool.get('email_template.account').read(
-                                                    cursor,
-                                                    user,
-                                                    context.get('account_id'),
-                                                    ['name', 'email_id'],
-                                                    context
-                                                    )
-        else:
-            from_account = {
-                            'id':template.from_account.id,
-                            'name':template.from_account.name,
-                            'email_id':template.from_account.email_id
-                            }
-        lang = get_value(cursor,
-                         user,
-                         record_id,
-                         template.lang,
-                         template,
-                         context)
-        if lang:
+            report_name = template.report_name
+            report_service = 'report.' + report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
+            # Ensure report is rendered using template's language
             ctx = context.copy()
-            ctx.update({'lang':lang})
-            template = self.browse(cursor, user, template.id, context=ctx)
+            if template.lang:
+                ctx['lang'] = self.render_template(cr, uid, template.lang, template.model, res_id, context)
+            service = netsvc.LocalService(report_service)
+            (result, format) = service.create(cr, uid, [res_id], {'model': template.model}, ctx)
+            result = base64.b64encode(result)
+            if not report_name:
+                report_name = report_service
+            ext = "." + format
+            if not report_name.endswith(ext):
+                report_name += ext
+            attachments[report_name] = result
 
-        # determine name of sender, either it is specified in email_id or we
-        # use the account name
-        email_id = from_account['email_id'].strip()
-        email_from = re.findall(r'([^ ,<@]+@[^> ,]+)', email_id)[0]
-        if email_from != email_id:
-            # we should keep it all, name is probably specified in the address
-            email_from = from_account['email_id']
-        else:
-            email_from = tools.ustr(from_account['name']) + "<" + tools.ustr(email_id) + ">"
+        # Add document attachments
+        for attach in template.attachment_ids:
+            # keep the bytes as fetched from the db, base64 encoded
+            attachments[attach.datas_fname] = attach.datas
 
-        # FIXME: should do this in a loop and rename template fields to the corresponding
-        # mailbox fields. (makes no sense to have different names I think.
-        mailbox_values = {
-            'email_from': email_from,
-            'email_to':get_value(cursor,
-                               user,
-                               record_id,
-                               template.def_to,
-                               template,
-                               context),
-            'email_cc':get_value(cursor,
-                               user,
-                               record_id,
-                               template.def_cc,
-                               template,
-                               context),
-            'email_bcc':get_value(cursor,
-                                user,
-                                record_id,
-                                template.def_bcc,
-                                template,
-                                context),
-            'reply_to':get_value(cursor,
-                                user,
-                                record_id,
-                                template.reply_to,
-                                template,
-                                context),
-            'subject':get_value(cursor,
-                                    user,
-                                    record_id,
-                                    template.def_subject,
-                                    template,
-                                    context),
-            'body_text':get_value(cursor,
-                                      user,
-                                      record_id,
-                                      template.def_body_text,
-                                      template,
-                                      context),
-            'body_html':get_value(cursor,
-                                      user,
-                                      record_id,
-                                      template.def_body_html,
-                                      template,
-                                      context),
-            'account_id' :from_account['id'],
-            #This is a mandatory field when automatic emails are sent
-            'state':'na',
-            'folder':'drafts',
-            'mail_type':'multipart/alternative',
-        }
+        values['attachments'] = attachments
+        return values
 
-        if template['message_id']:
-            # use provided message_id with placeholders
-            mailbox_values.update({'message_id': get_value(cursor, user, record_id, template['message_id'], template, context)})
+    def send_mail(self, cr, uid, template_id, res_id, force_send=False, context=None):
+        """Generates a new mail message for the given template and record,
+           and schedules it for delivery through the ``mail`` module's scheduler.
 
-        elif template['track_campaign_item']:
-            # get appropriate message-id
-            mailbox_values.update({'message_id': tools.misc.generate_tracking_message_id(record_id)})
-
-        if not mailbox_values['account_id']:
-            raise Exception("Unable to send the mail. No account linked to the template.")
-        #Use signatures if allowed
-        if template.use_sign:
-            sign = self.pool.get('res.users').read(cursor,
-                                                   user,
-                                                   user,
-                                                   ['signature'],
-                                                   context)['signature']
-            if mailbox_values['body_text']:
-                mailbox_values['body_text'] += sign
-            if mailbox_values['body_html']:
-                mailbox_values['body_html'] += sign
-        mailbox_id = self.pool.get('email_template.mailbox').create(
-                                                             cursor,
-                                                             user,
-                                                             mailbox_values,
-                                                             context)
-
-        return mailbox_id
-
-
-    def generate_mail(self,
-                      cursor,
-                      user,
-                      template_id,
-                      record_ids,
-                      context=None):
-        if context is None:
-            context = {}
-        template = self.browse(cursor, user, template_id, context=context)
-        if not template:
-            raise Exception("The requested template could not be loaded")
-        result = True
-        mailbox_obj = self.pool.get('email_template.mailbox')
-        for record_id in record_ids:
-            mailbox_id = self._generate_mailbox_item_from_template(
-                                                                cursor,
-                                                                user,
-                                                                template,
-                                                                record_id,
-                                                                context)
-            mail = mailbox_obj.browse(
-                                        cursor,
-                                        user,
-                                        mailbox_id,
-                                        context=context
-                                              )
-            if template.report_template or template.attachment_ids:
-                self.generate_attach_reports(
-                                              cursor,
-                                              user,
-                                              template,
-                                              record_id,
-                                              mail,
-                                              context
-                                              )
-
-            self.pool.get('email_template.mailbox').write(
-                                                cursor,
-                                                user,
-                                                mailbox_id,
-                                                {'folder':'outbox'},
-                                                context=context
-            )
-            # TODO : manage return value of all the records
-            result = self.pool.get('email_template.mailbox').send_this_mail(cursor, user, [mailbox_id], context)
-        return result
-
-email_template()
-
-
-## FIXME: this class duplicates a lot of features of the email template send wizard,
-##        one of the 2 should inherit from the other!
-
-class email_template_preview(osv.osv_memory):
-    _name = "email_template.preview"
-    _description = "Email Template Preview"
-
-    def _get_model_recs(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-            #Fills up the selection box which allows records from the selected object to be displayed
-        self.context = context
-        if 'template_id' in context:
-            ref_obj_id = self.pool.get('email.template').read(cr, uid, context['template_id'], ['object_name'], context)
-            ref_obj_name = self.pool.get('ir.model').read(cr, uid, ref_obj_id['object_name'][0], ['model'], context)['model']
-            model_obj = self.pool.get(ref_obj_name)
-            ref_obj_ids = model_obj.search(cr, uid, [], 0, 20, 'id', context=context)
-            if not ref_obj_ids:
-                ref_obj_ids = []
-
-            # also add the default one if requested, otherwise it won't be available for selection:
-            default_id = context.get('default_rel_model_ref')
-            if default_id and default_id not in ref_obj_ids:
-                ref_obj_ids.insert(0, default_id)
-            return model_obj.name_get(cr, uid, ref_obj_ids, context)
-        return []
-
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        result = super(email_template_preview, self).default_get(cr, uid, fields, context=context)
-        if (not fields or 'rel_model_ref' in fields) and 'template_id' in context \
-           and not result.get('rel_model_ref'):
-            selectables = self._get_model_recs(cr, uid, context=context)
-            result['rel_model_ref'] = selectables and selectables[0][0] or False
-        return result
-
-    def _default_model(self, cursor, user, context=None):
+           :param int template_id: id of the template to render
+           :param int res_id: id of the record to render the template with
+                              (model is taken from the template)
+           :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 the default value for model field
-        @param cursor: Database Cursor
-        @param user: ID of current user
-        @param context: OpenERP Context
-        """
-        return self.pool.get('email.template').read(
-                                                   cursor,
-                                                   user,
-                                                   context['template_id'],
-                                                   ['object_name'],
-                                                   context).get('object_name', False)
-
-    _columns = {
-        'ref_template':fields.many2one(
-                                       'email.template',
-                                       'Template', readonly=True),
-        'rel_model':fields.many2one('ir.model', 'Model', readonly=True),
-        'rel_model_ref':fields.selection(_get_model_recs, 'Referred Document'),
-        'to':fields.char('To', size=250, readonly=True),
-        'cc':fields.char('CC', size=250, readonly=True),
-        'bcc':fields.char('BCC', size=250, readonly=True),
-        'reply_to':fields.char('Reply-To',
-                    size=250,
-                    help="The address recipients should reply to,"
-                         " if different from the From address."
-                         " Placeholders can be used here."),
-        'message_id':fields.char('Message-ID',
-                    size=250,
-                    help="The Message-ID header value, if you need to"
-                         "specify it, for example to automatically recognize the replies later."
-                        " Placeholders can be used here."),
-        'subject':fields.char('Subject', size=200, readonly=True),
-        'body_text':fields.text('Body', readonly=True),
-        'body_html':fields.text('Body', readonly=True),
-        'report':fields.char('Report Name', size=100, readonly=True),
-    }
-    _defaults = {
-        'ref_template': lambda self, cr, uid, ctx:ctx['template_id'] or False,
-        'rel_model': _default_model,
-    }
-    def on_change_ref(self, cr, uid, ids, rel_model_ref, context=None):
-        if context is None:
-            context = {}
-        if not rel_model_ref:
-            return {}
-        vals = {}
-        if context == {}:
-            context = self.context
-        template = self.pool.get('email.template').browse(cr, uid, context['template_id'], context)
-        #Search translated template
-        lang = get_value(cr, uid, rel_model_ref, template.lang, template, context)
-        if lang:
-            ctx = context.copy()
-            ctx.update({'lang':lang})
-            template = self.pool.get('email.template').browse(cr, uid, context['template_id'], ctx)
-        vals['to'] = get_value(cr, uid, rel_model_ref, template.def_to, template, context)
-        vals['cc'] = get_value(cr, uid, rel_model_ref, template.def_cc, template, context)
-        vals['bcc'] = get_value(cr, uid, rel_model_ref, template.def_bcc, template, context)
-        vals['reply_to'] = get_value(cr, uid, rel_model_ref, template.reply_to, template, context)
-        if template.message_id:
-            vals['message_id'] = get_value(cr, uid, rel_model_ref, template.message_id, template, context)
-        elif template.track_campaign_item:
-            vals['message_id'] = tools.misc.generate_tracking_message_id(rel_model_ref)
-        vals['subject'] = get_value(cr, uid, rel_model_ref, template.def_subject, template, context)
-        vals['body_text'] = get_value(cr, uid, rel_model_ref, template.def_body_text, template, context)
-        vals['body_html'] = get_value(cr, uid, rel_model_ref, template.def_body_html, template, context)
-        vals['report'] = get_value(cr, uid, rel_model_ref, template.file_name, template, context)
-        return {'value':vals}
-
-email_template_preview()
+        mail_message = self.pool.get('mail.message')
+        ir_attachment = self.pool.get('ir.attachment')
+        template = self.browse(cr, uid, template_id, context)
+        values = self.generate_email(cr, uid, template_id, res_id, context=context)
+        attachments = values.pop('attachments') or {}
+        msg_id = mail_message.create(cr, uid, values, context=context)
+        # link attachments
+        attachment_ids = []
+        for fname, fcontent in attachments.iteritems():
+            attachment_data = {
+                    'name': fname,
+                    'datas_fname': fname,
+                    'datas': fcontent,
+                    'res_model': mail_message._name,
+                    'res_id': msg_id,
+            }
+            if context.has_key('default_type'):
+                del context['default_type']
+            attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
+        if force_send:
+            mail_message.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_account.py b/addons/email_template/email_template_account.py
deleted file mode 100644
index a5f51400c8a..00000000000
--- a/addons/email_template/email_template_account.py
+++ /dev/null
@@ -1,470 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2004-2010 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, fields
-import re
-import smtplib
-import base64
-from email import Encoders
-from email.mime.base import MIMEBase
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from email.header import decode_header, Header
-from email.utils import formatdate
-import netsvc
-import datetime
-from tools.translate import _
-import tools
-import logging
-
-EMAIL_PATTERN = re.compile(r'([^()\[\] ,<:\\>@";]+@[^()\[\] ,<:\\>@";]+)') # See RFC822
-def extract_emails(emails_str):
-    """
-    Returns a list of email addresses recognized in a string, ignoring the rest of the string.
-    extract_emails('a@b.com,c@bcom, "John Doe" <d@b.com> , e@b.com') -> ['a@b.com','c@bcom', 'd@b.com', 'e@b.com']"
-    """
-    return EMAIL_PATTERN.findall(emails_str)
-
-
-def extract_emails_from_dict(addresses={}):
-    """
-    Extracts email addresses from a dictionary with comma-separated address string values, handling
-    separately the To, CC, BCC and Reply-To addresses.
-
-    :param addresses: a dictionary of addresses in the form {'To': 'a@b.com,c@bcom; d@b.com;e@b.com' , 'CC': 'e@b.com;f@b.com', ... }
-    :return: a dictionary with a list of separate addresses for each header (To, CC, BCC), with an additional key 'all-recipients'
-             containing all addresses for the 'To', 'CC', 'BCC' entries.
-    """
-    result = {'all-recipients':[]}
-    keys = ['To', 'CC', 'BCC', 'Reply-To']
-    for each in keys:
-        emails = extract_emails(addresses.get(each, u''))
-        while u'' in emails:
-            emails.remove(u'')
-        result[each] = emails
-        if each != 'Reply-To':
-            result['all-recipients'].extend(emails)
-    return result
-
-class email_template_account(osv.osv):
-    """
-    Object to store email account settings
-    """
-    _name = "email_template.account"
-    _known_content_types = ['multipart/mixed',
-                            'multipart/alternative',
-                            'multipart/related',
-                            'text/plain',
-                            'text/html'
-                            ]
-    _columns = {
-        'name': fields.char('Description',
-                        size=64, required=True,
-                        readonly=True, select=True,
-                        help="The description is used as the Sender name along with the provided From Email, \
-unless it is already specified in the From Email, e.g: John Doe <john@doe.com>", 
-                        states={'draft':[('readonly', False)]}),
-        'auto_delete': fields.boolean('Auto Delete', size=64, readonly=True, 
-                                      help="Permanently delete emails after sending", 
-                                      states={'draft':[('readonly', False)]}),
-        'user':fields.many2one('res.users',
-                        'Related User', required=True,
-                        readonly=True, states={'draft':[('readonly', False)]}),
-        'email_id': fields.char('From Email',
-                        size=120, required=True,
-                        readonly=True, states={'draft':[('readonly', False)]} ,
-                        help="eg: 'john@doe.com' or 'John Doe <john@doe.com>'"),
-        'smtpserver': fields.char('Server',
-                        size=120, required=True,
-                        readonly=True, states={'draft':[('readonly', False)]},
-                        help="Enter name of outgoing server, eg: smtp.yourdomain.com"),
-        'smtpport': fields.integer('SMTP Port',
-                        size=64, required=True,
-                        readonly=True, states={'draft':[('readonly', False)]},
-                        help="Enter port number, eg: 25 or 587"),
-        'smtpuname': fields.char('User Name',
-                        size=120, required=False,
-                        readonly=True, states={'draft':[('readonly', False)]},
-                        help="Specify the username if your SMTP server requires authentication, "
-                        "otherwise leave it empty."),
-        'smtppass': fields.char('Password',
-                        size=120, invisible=True,
-                        required=False, readonly=True,
-                        states={'draft':[('readonly', False)]}),
-        'smtptls':fields.boolean('TLS',
-                        states={'draft':[('readonly', False)]}, readonly=True),
-                                
-        'smtpssl':fields.boolean('SSL/TLS (only in python 2.6)',
-                        states={'draft':[('readonly', False)]}, readonly=True),
-        'send_pref':fields.selection([
-                                      ('html', 'HTML, otherwise Text'),
-                                      ('text', 'Text, otherwise HTML'),
-                                      ('alternative', 'Both HTML & Text (Alternative)'),
-                                      ('mixed', 'Both HTML & Text (Mixed)')
-                                      ], 'Mail Format', required=True),
-        'company':fields.selection([
-                        ('yes', 'Yes'),
-                        ('no', 'No')
-                        ], 'Corporate',
-                        readonly=True,
-                        help="Select if this mail account does not belong " \
-                        "to specific user but to the organization as a whole. " \
-                        "eg: info@companydomain.com",
-                        required=True, states={
-                                           'draft':[('readonly', False)]
-                                           }),
-
-        'state':fields.selection([
-                                  ('draft', 'Initiated'),
-                                  ('suspended', 'Suspended'),
-                                  ('approved', 'Approved')
-                                  ],
-                        'State', required=True, readonly=True),
-    }
-
-    _defaults = {
-         'name':lambda self, cursor, user, context:self.pool.get(
-                                                'res.users'
-                                                ).read(
-                                                        cursor,
-                                                        user,
-                                                        user,
-                                                        ['name'],
-                                                        context
-                                                        )['name'],
-         'state':lambda * a:'draft',
-         'smtpport':lambda *a:25,
-         'smtpserver':lambda *a:'localhost',
-         'company':lambda *a:'yes',
-         'user':lambda self, cursor, user, context:user,
-         'send_pref':lambda *a: 'html',
-         'smtptls':lambda *a:True,
-     }
-    
-    _sql_constraints = [
-        (
-         'email_uniq',
-         'unique (email_id)',
-         'Another setting already exists with this email ID !')
-    ]
-
-    def name_get(self, cr, uid, ids, context=None):
-        return [(a["id"], "%s (%s)" % (a['email_id'], a['name'])) for a in self.read(cr, uid, ids, ['name', 'email_id'], context=context)]
-
-    def _constraint_unique(self, cursor, user, ids, context=None):
-        """
-        This makes sure that you dont give personal 
-        users two accounts with same ID (Validated in sql constaints)
-        However this constraint exempts company accounts. 
-        Any no of co accounts for a user is allowed
-        """
-        if self.read(cursor, user, ids, ['company'])[0]['company'] == 'no':
-            accounts = self.search(cursor, user, [
-                                                 ('user', '=', user),
-                                                 ('company', '=', 'no')
-                                                 ])
-            if len(accounts) > 1 :
-                return False
-            else :
-                return True
-        else:
-            return True
-        
-    _constraints = [
-        (_constraint_unique,
-         'Error: You are not allowed to have more than 1 account.',
-         [])
-    ]
-
-    def get_outgoing_server(self, cursor, user, ids, context=None):
-        """
-        Returns the Out Going Connection (SMTP) object
-        
-        @attention: DO NOT USE except_osv IN THIS METHOD
-        @param cursor: Database Cursor
-        @param user: ID of current user
-        @param ids: ID/list of ids of current object for 
-                    which connection is required
-                    First ID will be chosen from lists
-        @param context: Context
-        
-        @return: SMTP server object or Exception
-        """
-        #Type cast ids to integer
-        if type(ids) == list:
-            ids = ids[0]
-        this_object = self.browse(cursor, user, ids, context=context)
-        if this_object:
-            if this_object.smtpserver and this_object.smtpport: 
-                try:
-                    if this_object.smtpssl:
-                        serv = smtplib.SMTP_SSL(this_object.smtpserver, this_object.smtpport)
-                    else:
-                        serv = smtplib.SMTP(this_object.smtpserver, this_object.smtpport)
-                    if this_object.smtptls:
-                        serv.ehlo()
-                        serv.starttls()
-                        serv.ehlo()
-                except Exception, error:
-                    raise error
-                try:
-                    if serv.has_extn('AUTH') or this_object.smtpuname or this_object.smtppass:
-                        serv.login(str(this_object.smtpuname), str(this_object.smtppass))
-                except Exception, error:
-                    raise error
-                return serv
-            raise Exception(_("SMTP SERVER or PORT not specified"))
-        raise Exception(_("Core connection for the given ID does not exist"))
-    
-    def check_outgoing_connection(self, cursor, user, ids, context=None):
-        """
-        checks SMTP credentials and confirms if outgoing connection works
-        (Attached to button)
-        @param cursor: Database Cursor
-        @param user: ID of current user
-        @param ids: list of ids of current object for 
-                    which connection is required
-        @param context: Context
-        """
-        try:
-            self.get_outgoing_server(cursor, user, ids, context)
-            raise osv.except_osv(_("SMTP Test Connection Was Successful"), '')
-        except osv.except_osv, success_message:
-            raise success_message
-        except Exception, error:
-            raise osv.except_osv(
-                                 _("Out going connection test failed"),
-                                 _("Reason: %s") % tools.ustr(error)
-                                 )
-    
-    def do_approval(self, cr, uid, ids, context=None):
-        #TODO: Check if user has rights
-        self.write(cr, uid, ids, {'state':'approved'}, context=context)
-#        wf_service = netsvc.LocalService("workflow")
-
-    def smtp_connection(self, cursor, user, id, context=None):
-        """
-        This method should now wrap smtp_connection
-        """
-        #This function returns a SMTP server object
-        logger = netsvc.Logger()
-        core_obj = self.browse(cursor, user, id, context=context)
-        if core_obj.smtpserver and core_obj.smtpport and core_obj.state == 'approved':
-            try:
-                serv = self.get_outgoing_server(cursor, user, id, context)
-            except Exception, error:
-                logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed on login. Probable Reason:Could not login to server\nError: %s") % (id, tools.ustr(error)))
-                return False
-            #Everything is complete, now return the connection
-            return serv
-        else:
-            logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
-            return False
-                      
-#**************************** MAIL SENDING FEATURES ***********************#
-
-
-
-    
-    def send_mail(self, cr, uid, ids, addresses, subject='', body=None, payload=None, message_id=None, context=None):
-        #TODO: Replace all this with a single email object
-        if body is None:
-            body = {}
-        if payload is None:
-            payload = {}
-        if context is None:
-            context = {}
-        logger = netsvc.Logger()
-        for id in ids:  
-            core_obj = self.browse(cr, uid, id, context)
-            serv = self.smtp_connection(cr, uid, id)
-            if serv:
-                try:
-                    # Prepare multipart containers depending on data
-                    text_subtype = (core_obj.send_pref == 'alternative') and 'alternative' or 'mixed'
-                    # Need a multipart/mixed wrapper for attachments if content is alternative
-                    if payload and text_subtype == 'alternative':
-                        payload_part = MIMEMultipart(_subtype='mixed')
-                        text_part = MIMEMultipart(_subtype=text_subtype)
-                        payload_part.attach(text_part)
-                    else:
-                        # otherwise a single multipart/mixed will do the whole job 
-                        payload_part = text_part = MIMEMultipart(_subtype=text_subtype)
-
-                    if subject:
-                        payload_part['Subject'] = subject
-                    from_email = core_obj.email_id
-                    if '<' in from_email:
-                        # We have a structured email address, keep it untouched
-                        payload_part['From'] = Header(core_obj.email_id, 'utf-8').encode()
-                    else:
-                        # Plain email address, construct a structured one based on the name:
-                        sender_name = Header(core_obj.name, 'utf-8').encode()
-                        payload_part['From'] = sender_name + " <" + core_obj.email_id + ">"
-                    payload_part['Organization'] = tools.ustr(core_obj.user.company_id.name)
-                    payload_part['Date'] = formatdate()
-                    addresses_l = extract_emails_from_dict(addresses) 
-                    if addresses_l['To']:
-                        payload_part['To'] = u','.join(addresses_l['To'])
-                    if addresses_l['CC']:
-                        payload_part['CC'] = u','.join(addresses_l['CC'])
-                    if addresses_l['Reply-To']:
-                        payload_part['Reply-To'] = addresses_l['Reply-To'][0]
-                    if message_id:
-                        payload_part['Message-ID'] = message_id
-                    if body.get('text', False):
-                        temp_body_text = body.get('text', '')
-                        l = len(temp_body_text.replace(' ', '').replace('\r', '').replace('\n', ''))
-                        if l == 0:
-                            body['text'] = u'No Mail Message'
-                    # Attach parts into message container.
-                    # According to RFC 2046, the last part of a multipart message, in this case
-                    # the HTML message, is best and preferred.
-                    if core_obj.send_pref in ('text', 'mixed', 'alternative'):
-                        body_text = body.get('text', u'<Empty Message>')
-                        body_text = tools.ustr(body_text)
-                        text_part.attach(MIMEText(body_text.encode("utf-8"), _charset='UTF-8'))
-                    if core_obj.send_pref in ('html', 'mixed', 'alternative'):
-                        html_body = body.get('html', u'')
-                        if len(html_body) == 0 or html_body == u'':
-                            html_body = body.get('text', u'<p>&lt;Empty Message&gt;</p>').replace('\n', '<br/>').replace('\r', '<br/>')
-                        html_body = tools.ustr(html_body)
-                        text_part.attach(MIMEText(html_body.encode("utf-8"), _subtype='html', _charset='UTF-8'))
-
-                    #Now add attachments if any, wrapping into a container multipart/mixed if needed
-                    if payload:
-                        for file in payload:
-                            part = MIMEBase('application', "octet-stream")
-                            part.set_payload(base64.decodestring(payload[file]))
-                            part.add_header('Content-Disposition', 'attachment; filename="%s"' % file)
-                            Encoders.encode_base64(part)
-                            payload_part.attach(part)
-                except Exception, error:
-                    logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:MIME Error\nDescription: %s") % (id, tools.ustr(error)))
-                    return {'error_msg': _("Server Send Error\nDescription: %s")%error}
-                try:
-                    serv.sendmail(payload_part['From'], addresses_l['all-recipients'], payload_part.as_string())
-                except Exception, error:
-                    logging.getLogger('email_template').error(_("Mail from Account %s failed. Probable Reason: Server Send Error\n Description: %s"), id, tools.ustr(error), exc_info=True)
-                    return {'error_msg': _("Server Send Error\nDescription: %s") % tools.ustr(error)}
-                #The mail sending is complete
-                serv.close()
-                logger.notifyChannel(_("Email Template"), netsvc.LOG_INFO, _("Mail from Account %s successfully Sent.") % (id))
-                return True
-            else:
-                logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
-                return {'nodestroy':True,'error_msg': _("Mail from Account %s failed. Probable Reason:Account not approved")% id}
-
-    def extracttime(self, time_as_string):
-        """
-        TODO: DOC THis
-        """
-        logger = netsvc.Logger()
-        #The standard email dates are of format similar to:
-        #Thu, 8 Oct 2009 09:35:42 +0200
-        date_as_date = False
-        convertor = {'+':1, '-':-1}
-        try:
-            time_as_string = time_as_string.replace(',', '')
-            date_list = time_as_string.split(' ')
-            date_temp_str = ' '.join(date_list[1:5])
-            if len(date_list) >= 6:
-                sign = convertor.get(date_list[5][0], False)
-            else:
-                sign = False
-            try:
-                dt = datetime.datetime.strptime(
-                                            date_temp_str,
-                                            "%d %b %Y %H:%M:%S")
-            except:
-                try:
-                    dt = datetime.datetime.strptime(
-                                            date_temp_str,
-                                            "%d %b %Y %H:%M")
-                except:
-                    return False
-            if sign:
-                try:
-                    offset = datetime.timedelta(
-                                hours=sign * int(
-                                             date_list[5][1:3]
-                                                ),
-                                             minutes=sign * int(
-                                                            date_list[5][3:5]
-                                                                )
-                                                )
-                except Exception, e2:
-                    """Looks like UT or GMT, just forget decoding"""
-                    return False
-            else:
-                offset = datetime.timedelta(hours=0)
-            dt = dt + offset
-            date_as_date = dt.strftime('%Y-%m-%d %H:%M:%S')
-        except Exception, e:
-            logger.notifyChannel(
-                    _("Email Template"),
-                    netsvc.LOG_WARNING,
-                    _(
-                      "Datetime Extraction failed.Date:%s \
-                      \tError:%s") % (
-                                    time_as_string,
-                                    tools.ustr(e))
-                      )
-        return date_as_date
-        
-    def send_receive(self, cr, uid, ids, context=None):
-        for id in ids:
-            ctx = context.copy()
-            ctx['filters'] = [('account_id', '=', id)]
-            self.pool.get('email_template.mailbox').send_all_mail(cr, uid, [], context=ctx)
-        return True
- 
-    def decode_header_text(self, text):
-        """ Decode internationalized headers RFC2822.
-            To, CC, BCC, Subject fields can contain 
-            text slices with different encodes, like:
-                =?iso-8859-1?Q?Enric_Mart=ED?= <enricmarti@company.com>, 
-                =?Windows-1252?Q?David_G=F3mez?= <david@company.com>
-            Sometimes they include extra " character at the beginning/
-            end of the contact name, like:
-                "=?iso-8859-1?Q?Enric_Mart=ED?=" <enricmarti@company.com>
-            and decode_header() does not work well, so we use regular 
-            expressions (?=   ? ?   ?=) to split the text slices
-        """
-        if not text:
-            return text        
-        p = re.compile("(=\?.*?\?.\?.*?\?=)")
-        text2 = ''
-        try:
-            for t2 in p.split(text):
-                text2 += ''.join(
-                            [s.decode(
-                                      t or 'ascii'
-                                    ) for (s, t) in decode_header(t2)]
-                                ).encode('utf-8')
-        except:
-            return text
-        return text2
-
-email_template_account()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
deleted file mode 100644
index 75111e626e5..00000000000
--- a/addons/email_template/email_template_account_view.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
-            groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
-        <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
-        <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
-
-        <record model="ir.ui.view" id="email_template_account_form">
-            <field name="name">email_template.account.form</field>
-            <field name="model">email_template.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Email Account Configuration">
-                    <group colspan="2">
-                        <field name="name" select="1" />
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Outgoing">
-                            <separator string="Server Information" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="smtpserver" select="1"/>
-                                <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" icon="gtk-network" colspan="2"/>
-                                <field name="smtpport" select="2" />
-                                <field name="smtpssl" select="2" />
-                                <field name="smtptls" select="2" />
-                                <field name="auto_delete" />
-                            </group>
-                            <separator string="User Information" colspan="4" />
-                            <group col="2" colspan="2">
-                                <field name="email_id" select="1" colspan="2" />
-                                <field name="smtppass" password="True" colspan="2" />
-                                <field name="company" select="2" colspan="2" />
-                            </group>
-                            <group col="2" colspan="2">
-                                <field name="smtpuname" select="1" colspan="2" />
-                                <field name="user" select="2" colspan="2" />
-                                <field name="send_pref" colspan="2" />
-                            </group>
-                        </page>
-                    </notebook>
-                    <group colspan="4" col="10">
-                        <field name="state" select="1"/>
-                        <button string="Approve Account" name="button_approval" states="draft" type="workflow" icon="terp-camera_test"/>
-                        <button string="Suspend Account" name="button_suspended" states="approved" type="workflow" icon="gtk-cancel"/>
-                        <button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" icon="gtk-convert"/>
-                        <button string="Send/Receive" name="send_receive" states="approved" type="object" icon="terp-check"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="email_template_account_tree">
-            <field name="name">email_template.account.tree</field>
-            <field name="model">email_template.account</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('suspended','approved')" string="Email Accounts">
-                    <field name="name" />
-                    <field name="email_id" />
-                    <field name="smtpuname" />
-                    <field name="user" />
-                    <field name="smtpserver" />
-                    <field name="smtpport" />
-                    <field name="auto_delete" />
-                    <field name="state" />
-                </tree>
-            </field>
-        </record>
-
-       <record id="view_email_template_account_search" model="ir.ui.view">
-           <field name="name">email_template.account.search</field>
-           <field name="model">email_template.account</field>
-           <field name="type">search</field>
-           <field name="arch" type="xml">
-               <search string="Email Accounts">
-                    <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Approved" domain="[('state','=','approved')]"/>
-                    <filter icon="terp-emblem-important" string="Suspended" domain="[('state','=','suspended')]"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-home" string="Company Accounts" domain="[('company','=','yes')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user" select="1">
-                        <filter icon="terp-personal" help="My Accounts" name="my" domain="[('user','=',uid)]"/>
-                    </field>
-                    <field name="name" select="1"/>
-                    <field name="email_id" select="1"/>
-               </search>
-           </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_email_template_account_tree_all">
-            <field name="name">Accounts</field>
-            <field name="res_model">email_template.account</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="view_id" ref="email_template_account_tree" />
-            <field name="context">{'search_default_draft': 1, 'search_default_my': 1}</field>
-            <field name="search_view_id" ref="view_email_template_account_search"/>
-        </record>
-
-        <menuitem name="Configuration" parent="base.marketing_menu"
-            id="base.menu_marketing_config_root" sequence="20" groups="base.group_system"/>
-
-        <menuitem name="Email Template" id="menu_email_template_configuration" parent="base.menu_marketing_config_root" />
-
-        <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
-
-        <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" />
-
-        <menuitem name="Email Template" id="menu_email_template_config_tools"
-            parent="base.menu_lunch_survey_root" />
-
-        <menuitem name="Email Accounts" id="menu_email_account_all_tools"
-            parent="menu_email_template_config_tools" action="action_email_template_account_tree_all" />
-
-    </data>
-</openerp>
-
-
-
-
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
deleted file mode 100644
index 4486cb5451e..00000000000
--- a/addons/email_template/email_template_mailbox.py
+++ /dev/null
@@ -1,214 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2004-2010 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, fields
-import time
-import netsvc
-from tools.translate import _
-import tools
-
-LOGGER = netsvc.Logger()
-
-class email_template_mailbox(osv.osv):
-    _name = "email_template.mailbox"
-    _description = 'Email Mailbox'
-    _rec_name = "subject"
-    _order = "date_mail desc"
-    
-    def run_mail_scheduler(self, cursor, user, context=None):
-        """
-        This method is called by OpenERP Scheduler
-        to periodically send emails
-        """
-        try:
-            self.send_all_mail(cursor, user, context=context)
-        except Exception, e:
-            LOGGER.notifyChannel(
-                                 "Email Template",
-                                 netsvc.LOG_ERROR,
-                                 _("Error sending mail: %s") % e)
-        
-    def send_all_mail(self, cr, uid, ids=None, context=None):
-        if ids is None:
-            ids = []
-        if context is None:
-            context = {}
-        filters = [('folder', '=', 'outbox'), ('state', '!=', 'sending')]
-        if 'filters' in context.keys():
-            for each_filter in context['filters']:
-                filters.append(each_filter)
-        ids = self.search(cr, uid, filters, context=context)
-        self.write(cr, uid, ids, {'state':'sending'}, context)
-        self.send_this_mail(cr, uid, ids, context)
-        return True
-
-    def send_this_mail(self, cr, uid, ids=None, context=None):
-        #previous method to send email (link with email account can be found at the revision 4172 and below
-        result = True
-        attachment_pool = self.pool.get('ir.attachment')
-        for id in (ids or []):
-            try:
-                account_obj = self.pool.get('email_template.account')
-                values = self.read(cr, uid, id, [], context) 
-                payload = {}
-                if values['attachments_ids']:
-                    for attid in values['attachments_ids']:
-                        attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
-                        payload[attachment.datas_fname] = attachment.datas
-                result = account_obj.send_mail(cr, uid,
-                              [values['account_id'][0]],
-                              {'To':values.get('email_to') or u'',
-                               'CC':values.get('email_cc') or u'',
-                               'BCC':values.get('email_bcc') or u'',
-                               'Reply-To':values.get('reply_to') or u''},
-                              values['subject'] or u'',
-                              {'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
-                              payload=payload,
-                              message_id=values['message_id'],
-                              context=context)
-                if result == True:
-                    account = account_obj.browse(cr, uid, values['account_id'][0], context=context)
-                    if account.auto_delete:
-                        self.write(cr, uid, id, {'folder': 'trash'}, context=context)
-                        self.unlink(cr, uid, [id], context=context)
-                        # Remove attachments for this mail
-                        attachment_pool.unlink(cr, uid, values['attachments_ids'], context=context)
-                        return result
-                    else:
-                        self.write(cr, uid, id, {'folder':'sent', 'state':'na', 'date_mail':time.strftime("%Y-%m-%d %H:%M:%S")}, context)
-                        self.historise(cr, uid, [id], "Email sent successfully", context)
-                else:
-                    error = result['error_msg']
-                    self.historise(cr, uid, [id], error, context)
-                    
-            except Exception, error:
-                logger = netsvc.Logger()
-                logger.notifyChannel("email-template", netsvc.LOG_ERROR, _("Sending of Mail %s failed. Probable Reason:Could not login to server\nError: %s") % (id, error))
-                self.historise(cr, uid, [id], error, context)
-            self.write(cr, uid, id, {'state':'na'}, context)
-        return result
-    
-    def historise(self, cr, uid, ids, message='', context=None):
-        for id in ids:
-            history = self.read(cr, uid, id, ['history'], context).get('history', '')
-            self.write(cr, uid, id, {'history': (history or '' )+ "\n" + time.strftime("%Y-%m-%d %H:%M:%S") + ": " + tools.ustr(message)}, context)
-    
-    _columns = {
-            'email_from':fields.char(
-                            'From', 
-                            size=64),
-            'email_to':fields.char(
-                            'Recipient (To)', 
-                            size=250,),
-            'email_cc':fields.char(
-                            'CC', 
-                            size=250),
-            'email_bcc':fields.char(
-                            'BCC', 
-                            size=250),
-            'reply_to':fields.char(
-                            'Reply-To', 
-                            size=250),
-            'message_id':fields.char(
-                            'Message-ID', 
-                            size=250),
-            'subject':fields.char(
-                            'Subject', 
-                            size=200,),
-            'body_text':fields.text(
-                            'Standard Body (Text)'),
-            'body_html':fields.text(
-                            'Body (Rich Text Clients Only)'),
-            'attachments_ids':fields.many2many(
-                            'ir.attachment', 
-                            'mail_attachments_rel', 
-                            'mail_id', 
-                            'att_id', 
-                            'Attachments'),
-            'account_id' :fields.many2one(
-                            'email_template.account',
-                            'User account', 
-                            required=True),
-            'user':fields.related(
-                            'account_id', 
-                            'user', 
-                            type="many2one", 
-                            relation="res.users", 
-                            string="User"),
-            'server_ref':fields.integer(
-                            'Server Reference of mail', 
-                            help="Applicable for inward items only"),
-            'mail_type':fields.selection([
-                            ('multipart/mixed', 
-                             'Has Attachments'),
-                            ('multipart/alternative', 
-                             'Plain Text & HTML with no attachments'),
-                            ('multipart/related', 
-                             'Intermixed content'),
-                            ('text/plain', 
-                             'Plain Text'),
-                            ('text/html', 
-                             'HTML Body'),
-                            ], 'Mail Contents'),
-            #I like GMAIL which allows putting same mail in many folders
-            #Lets plan it for 0.9
-            'folder':fields.selection([
-                            ('drafts', 'Drafts'),
-                            ('outbox', 'Outbox'),
-                            ('trash', 'Trash'),
-                            ('sent', 'Sent Items'),
-                            ], 'Folder', required=True),
-            'state':fields.selection([
-                            ('na', 'Not Applicable'),
-                            ('sending', 'Sending'),
-                            ], 'Status', required=True),
-            'date_mail':fields.datetime('Rec/Sent Date', help="Date on which Email Sent or Received"),
-            'history':fields.text(
-                            'History', 
-                            readonly=True, 
-                            store=True)
-        }
-
-    _defaults = {
-        'state': lambda * a: 'na',
-        'folder': lambda * a: 'outbox',
-    } 
-
-    def unlink(self, cr, uid, ids, context=None):
-        """
-        It just changes the folder of the item to "Trash", if it is no in Trash folder yet, 
-        or completely deletes it if it is already in Trash.
-        """
-        to_update = []
-        to_remove = []
-        for mail in self.browse(cr, uid, ids, context=context):
-            if mail.folder == 'trash':
-                to_remove.append(mail.id)
-            else:
-                to_update.append(mail.id)
-        # Changes the folder to trash
-        self.write(cr, uid, to_update, {'folder': 'trash'}, context=context)
-        return super(email_template_mailbox, self).unlink(cr, uid, to_remove, context=context)
-
-email_template_mailbox()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
deleted file mode 100644
index 0d1b3b0a2bf..00000000000
--- a/addons/email_template/email_template_mailbox_view.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <!-- Email Template-->
-        <record model="ir.ui.view" id="email_template_mailbox_form">
-            <field name="name">email_template.mailbox.form</field>
-            <field name="model">email_template.mailbox</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Emails">
-                    <group col="4" colspan="4" name="headers">
-                        <field name="email_from" select="1"/>
-                        <field name="email_to" required="1" select="1" />
-                        <field name="reply_to" select="2"/>
-                        <field name="email_cc" select="1"/>
-                        <field name="email_bcc" select="2"/>
-                        <field name="date_mail" select="2"/>
-                        <field name="subject" colspan="4" select="1"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Standard Body">
-                            <separator colspan="4" string="Standard Body" />
-                            <notebook colspan="4">
-                                <page string="Standard Body (Text)">
-                                    <field name="body_text" nolabel="1" colspan="4" select="1"/>
-                                </page>
-                                <page string="Body (HTML-Web Client Only)">
-                                    <field name="body_html" nolabel="1" colspan="4" />
-                                </page>
-                            </notebook>
-                            <separator colspan="4" string="" />
-                            <group col="4" colspan="4">
-                                <field name="state" readonly="1" string="State"/>
-                                <button name="send_this_mail" type="object" string="Send Mail" icon="terp-mail-message-new"/>
-                            </group>
-                        </page>
-
-                        <page string="Attachments">
-                            <separator colspan="4" string="Attachments" />
-                            <field name="attachments_ids" colspan="4" nolabel="1" />
-                        </page>
-                        <page string="Advanced">
-                            <field name="account_id" colspan="2" />
-                            <field name="server_ref" colspan="2" />
-                            <field name="mail_type" colspan="2" />
-                            <field name="folder" colspan="2" select="2"/>
-                            <field name="message_id" select="2"/>
-                            <separator string="History" colspan="4" />
-                            <field name="history" nolabel="1" colspan="4"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-        <!--============================================= TREE VIEWS =============================================-->
-         <record id="view_email_template_mailbox_tree" model="ir.ui.view">
-            <field name="name">email_template.mailbox.tree</field>
-            <field name="model">email_template.mailbox</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Emails" colors="blue:folder=='drafts';grey:folder=='trash'">
-                    <field name="subject" select="1" />
-                    <field name="user" />
-                    <field name="email_from" select="1" />
-                    <field name="email_to"/>
-                    <field name="date_mail" select="2" />
-                    <field name="attachments_ids" select="2" />
-                    <field name="folder" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_email_template_mailbox_search" model="ir.ui.view">
-           <field name="name">email_template.mailbox.search</field>
-           <field name="model">email_template.mailbox</field>
-           <field name="type">search</field>
-           <field name="arch" type="xml">
-               <search string="Emails">
-                    <filter icon="terp-document-new" string="Drafts" name="draft" domain="[('folder','=','drafts')]"/>
-                    <filter icon="terp-mail-" string="Outbox" name="outbox" domain="[('folder','=','outbox')]"/>
-                    <filter icon="terp-camera_test" string="Sent" domain="[('folder','=','sent')]"/>
-                    <filter icon="terp-mail_delete" string="Trash" domain="[('folder','=','trash')]"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-personal+" string="Personal Emails" name="personal" domain="[('account_id.company','=','no')]"/>
-                    <filter icon="terp-go-home" string="Company Emails" name="company" domain="[('account_id.company','=','yes')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="subject"/>
-                    <field name="email_from"/>
-                    <field name="user">
-                        <filter icon="terp-personal"
-                            string="My Emails" help="My Emails" name="myemails"
-                            domain="[('account_id.user','=', uid)]" />
-                    </field>
-                    <newline/>
-                    <field name="email_to"/>
-                    <field name="date_mail"/>
-               </search>
-           </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_email_template_mailbox">
-            <field name="name">Emails</field>
-            <field name="res_model">email_template.mailbox</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_email_template_mailbox_tree" />
-            <field name="context">{'search_default_outbox': 1}</field>
-            <field name="help">An email template is an email document that will be sent as part of a marketing campaign. You can personalize it according to specific customer profile fields, so that a partner name or other partner related information may be inserted automatically.</field>
-            <field name="search_view_id" ref="view_email_template_mailbox_search"/>
-        </record>
-
-        <!--======================================== MENUS ========================================-->
-
-        <menuitem name="Emails"
-            id="menu_email_template_personal_mails"
-            parent="menu_email_template"
-            action="action_email_template_mailbox" />
-
-        <!-- Mailbox menu in Tools -->
-        <menuitem name="Email Template" id="menu_email_template_tools"
-            parent="base.menu_tools" />
-
-        <menuitem name="Emails"
-            id="menu_email_template_mails_tools"
-            parent="menu_email_template_tools"
-            action="action_email_template_mailbox" />
-
-    </data>
-</openerp>
-
-
-
-
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 7d2a5f7ad5c..507dae3cd25 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -1,141 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-    
-        <!-- Email Template Preview -->
-        <record model="ir.ui.view" id="email_template_preview_form">
-            <field name="name">email_template.preview.form</field>
-            <field name="model">email_template.preview</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Email Preview">
-                    <group col="4" colspan="4">
-                        <field name="rel_model" />
-                        <field name="rel_model_ref" on_change="on_change_ref(rel_model_ref, context)"/>
-                    </group>
-                    <group col="8" colspan="4">
-                        <field name="to" />
-                        <field name="cc" />
-                        <field name="bcc" />
-                        <field name="reply_to" />
-                        <field name="message_id" attrs="{'invisible':[('message_id','=',False)]}" groups="base.group_extended"/>
-                        <field name="subject" colspan="8"/>
-                    </group>
-                    <group col="4" colspan="4">
-                        <separator string= "Body(Text)" colspan="2"/>   
-                        <separator string= "Body(Html)" colspan="2"/>
-                        <newline/>
-                        <field name="body_text" nolabel="1" colspan="2"/>
-                        <field name="body_html" nolabel="1" colspan="2"/>
-                    </group>
-                    <field name="report" colspan="2"/>
-                    <button icon="gtk-ok" special="cancel" string="OK" colspan="1"/>
-                </form>
-            </field>
-        </record>
-        
-        <record id="wizard_email_template_preview" model="ir.actions.act_window">
-            <field name="name">Template Preview</field>
-            <field name="res_model">email_template.preview</field>
-            <field name="src_model">email_template.preview</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="auto_refresh" eval="1" />
-            <field name="target">new</field>
-            <field name="context">{'template_id':active_id}</field>
-        </record>
-        <!--EMail client Form view  -->
 
         <record model="ir.ui.view" id="email_template_form">
             <field name="name">email.template.form</field>
             <field name="model">email.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Email Templates">
-                    <field name="name" />
-                    <field name="object_name" required="1"
-                        on_change="change_model(object_name)" />
-                    <field name="model_int_name" invisible="1" />
+                <form string="Templates">
+                    <field name="name" required="1"/>
+                    <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
+                    <field name="model" invisible="1"/>
                     <notebook colspan="4">
-                        <page string="Mail Details">
+                        <page string="Email Details">
                             <group col="2" colspan="2">
                                 <separator string="Addresses" colspan="2"/>
-                                <field name="from_account" required="1"/>
-                                <field name="def_to" required="1"/>
-                                <field name="def_cc"/>
-                                <field name="def_bcc"/>
+                                <field name="email_from" required="1"/>
+                                <field name="email_to" required="1"/>
+                                <field name="email_cc"/>
+                                <field name="email_bcc"/>
                                 <field name="reply_to"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Options" colspan="2"/>
                                 <field name="lang" colspan="4" />
-                                <field name="use_sign" colspan="4" />
-                                <field name="track_campaign_item" colspan="4"/>
+                                <field name="user_signature" colspan="4" />
                             </group>
                             <group col="2" colspan="2">
-                                <separator colspan="2" string="Email Content  " />
-                                <field name="def_subject" colspan="4" required="1" />
+                                <separator colspan="2" string="Email Content"/>
+                                <field name="subject" colspan="4" required="1"/>
                                 <notebook>
                                     <page string="Body (Text)">
-                                        <field name="def_body_text" colspan="4" nolabel="1" />
+                                        <field name="body_text" colspan="4" width="250" height="250" nolabel="1"/>
                                     </page>
-                                    <page string="Body (Raw HTML)">
-                                        <field name="def_body_html" colspan="4" nolabel="1" />
-                                        <label string="Note: This is Raw HTML." colspan="4" />
+                                    <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>
                             </group>
                             <group col="4" colspan="2">
-                                <separator colspan="4" string="Expression Builder" />
-                                <field name="template_language"
-                                    on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
                                 <notebook>
-                                    <page string="Insert Simple Field">
-
+                                    <page string="Dynamic Values Builder">
                                         <field name="model_object_field"
-                                            domain="[('model_id','=',object_name),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            on_change="onchange_model_object_field(model_object_field, template_language,context)"
-                                            colspan="4" />
-                                        <field name="sub_object" readonly="1" colspan="4" />
+                                            domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                            on_change="onchange_sub_model_object_value_field(model_object_field)"
+                                            colspan="4"/>
+                                        <field name="sub_object" readonly="1" colspan="4"/>
                                         <field name="sub_model_object_field"
                                             domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
                                             colspan="4"
                                             attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                            on_change="onchange_sub_model_object_field(model_object_field,sub_model_object_field,template_language,context)" />
+                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
                                         <field name="null_value" colspan="4"
-                                            on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
-                                        <field name="copyvalue" colspan="4" />
+                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)" />
+                                        <field name="copyvalue" colspan="4"/>
                                     </page>
                                 </notebook>
                                 <button name="%(wizard_email_template_preview)d" string="Preview Template"
-                                    type="action" colspan="4" target="new" icon="gtk-zoom-fit"/>
+                                    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="Actions" colspan="2"/>
-                                    <button name="create_action" string="Create Action" type="object" icon="gtk-execute"  colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
-                                    <field name="ref_ir_act_window"/>
-                                    <field name="ref_ir_value"/>
-                                    <button name="delete_action" string="Delete Action" type="object" icon="gtk-delete" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
+                                    <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">
+                                <group colspan="2" col="2" groups="base.group_extended">
                                     <separator string="Advanced Options" colspan="2"/>
+                                    <field name="mail_server_id"/>
+                                    <field name="track_campaign_item" colspan="4"/>
                                     <field name="message_id"/>
+                                    <field name="auto_delete"/>
                                 </group>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Attachments" colspan="2"/>
                                 <notebook>
-                                    <page string="Existing files">
-                                        <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
-                                    </page>
-                                    <page string="Report">
+                                    <page string="Attach Report">
                                         <field name="report_template" colspan="4"
-                                            domain="[('model','=',model_int_name)]" />
-                                        <field name="file_name" colspan="4" />
+                                            domain="[('model','=',model)]"/>
+                                        <field name="report_name" colspan="4" />
+                                    </page>
+                                    <page string="Attach existing files">
+                                        <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
                                     </page>
                                 </notebook>
                             </group>
@@ -150,16 +108,13 @@
             <field name="model">email.template</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Email Templates">
+                <tree string="Templates">
+                    <field name="model_id"/>
                     <field name="name"/>
-                    <field name="from_account"/>
-                    <field name="object_name"/>
-                    <field name="def_to"/>
-                    <field name="def_cc"/>
-                    <field name="def_bcc"/>
-                    <field name="def_subject"/>
-                    <field name="use_sign"/>
-                    <field name="file_name"/>
+                    <field name="subject"/>
+                    <field name="email_from"/>
+                    <field name="email_to"/>
+                    <field name="report_name"/>
                     <button name="%(wizard_email_template_preview)d" string="Preview Template"
                             type="action" target="new" icon="gtk-zoom-fit"/>
                 </tree>
@@ -172,27 +127,27 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Templates">
-                    <group col="13" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="object_name" select="1"/>
-                        <field name="def_to" select="1"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="model_id"/>
+                        <field name="email_to"/>
                         <separator orientation="vertical"/>
-                        <field name="lang" select="1"/>
-                        <field name="def_subject" select="1"/>
-                        <field name="file_name" select="1"/>
+                        <field name="lang"/>
+                        <field name="subject"/>
+                        <field name="report_name"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group by..." colspan="4" col="10">
-                        <filter string="Account" domain="[]" context="{'group_by':'from_account'}" icon="terp-folder-orange"/>
+                    <group expand="0" string="Group by...">
+                        <filter string="SMTP Server" domain="[]" context="{'group_by':'smtp_server_id'}" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
-                        <filter string="Resource" domain="[]" context="{'group_by':'object_name'}" icon="terp-accessories-archiver"/>
+                        <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
                     </group>
                </search>
            </field>
         </record>
 
         <record model="ir.actions.act_window" id="action_email_template_tree_all">
-            <field name="name">Email Templates</field>
+            <field name="name">Templates</field>
             <field name="res_model">email.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
@@ -200,16 +155,8 @@
             <field name="search_view_id" ref="view_email_template_search"/>
         </record>
 
-        <menuitem name="Email Templates" id="menu_email_template_all"
-            parent="menu_email_template" action="action_email_template_tree_all" />
+        <menuitem id="menu_email_templates" parent="base.menu_email" action="action_email_template_tree_all"
+                  sequence="20"/>
 
-        <!-- Email Template menu in Tools -->
-        <menuitem name="Email Templates" id="menu_email_template_all_tools"
-            parent="menu_email_template_config_tools" action="action_email_template_tree_all" />
     </data>
 </openerp>
-
-
-
-
-
diff --git a/addons/email_template/email_template_workflow.xml b/addons/email_template/email_template_workflow.xml
deleted file mode 100644
index 84a58815b5e..00000000000
--- a/addons/email_template/email_template_workflow.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="wkf_email_template_setting" model="workflow">
-            <field name="name">Email Template Workflow</field>
-            <field name="osv">email_template.account</field>
-            <field name="on_create">True</field>
-        </record>
-
-        <!--Activity -->
-
-         <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_email_template_setting"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-        <field name="kind">function</field>
-            <field name="action">write({'state':'draft'})</field>
-        </record>
-
-        <record id="act_approved" model="workflow.activity">
-            <field name="name">approval</field>
-            <field name="wkf_id" ref="wkf_email_template_setting"/>
-            <field name="kind">function</field>
-            <field name="action">do_approval()</field>
-        </record>
-
-        <record id="act_suspended" model="workflow.activity">
-            <field name="name">suspended</field>
-            <field name="wkf_id" ref="wkf_email_template_setting"/>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'suspended'})</field>
-        </record>
-        <record id="act_dummy" model="workflow.activity">
-            <field name="name">dummy</field>
-            <field name="wkf_id" ref="wkf_email_template_setting"/>
-            <field name="flow_stop">True</field>
-        </record>
-
-        <!-- Transition -->
-
-        <record id="trans_awaiting_approved" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_approved"/>
-            <field name="signal">button_approval</field>
-        </record>
-
-        <record id="trans_approved_suspended" model="workflow.transition">
-            <field name="act_from" ref="act_approved"/>
-            <field name="act_to" ref="act_suspended"/>
-            <field name="signal">button_suspended</field>
-        </record>
-        <record id="trans_suspended_reapproved" model="workflow.transition">
-            <field name="act_from" ref="act_suspended"/>
-            <field name="act_to" ref="act_draft"/>
-            <field name="signal">get_reapprove</field>
-        </record>
-        <record id="trans_suspended_dummy" model="workflow.transition">
-            <field name="act_from" ref="act_suspended"/>
-            <field name="act_to" ref="act_dummy"/>
-            <field name="signal">get_never</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
index 2479843777a..745381850e3 100755
--- a/addons/email_template/html2text.py
+++ b/addons/email_template/html2text.py
@@ -453,3 +453,5 @@ if __name__ == "__main__":
         data = sys.stdin.read().decode('utf8')
     wrapwrite(html2text(data, baseurl))
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/i18n/bg.po b/addons/email_template/i18n/bg.po
index 557d098d416..f160114e1b9 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -917,7 +917,7 @@ msgid "Close"
 msgstr "Затваряне"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Грешка при изпращане на писмо: %s"
@@ -1005,7 +1005,7 @@ msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1113,7 +1113,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Имейли"
 
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
index 4c41585054b..9a227f1d301 100644
--- a/addons/email_template/i18n/ca.po
+++ b/addons/email_template/i18n/ca.po
@@ -8,30 +8,32 @@ 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-04-16 11:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 21:33+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Elimina permanentment els emails deprès del seu enviament"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Email Account Configuration"
-msgstr ""
+msgstr "Configuració del compte de correu"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr ""
+"Els correus electrònics per a diversos elements han estat guardats en la "
+"Bústia de sortida."
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:59
@@ -42,31 +44,34 @@ msgid ""
 "Either ask admin to enforce an account for this template or get yourself a "
 "personal email account."
 msgstr ""
+"No se li han configurat comptes de correu electrònic personals.\n"
+"Podeu demanar a l'administrador que forci un compte per aquesta plantilla o "
+"que li creï un compte de correu electrònic personal."
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
-msgstr ""
+msgstr "Emails personals"
 
 #. module: email_template
 #: field:email.template,file_name:0
 msgid "Report Filename"
-msgstr ""
+msgstr "Fitxer de l'informe"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content  "
-msgstr ""
+msgstr "Contingut del email  "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send mail Wizard"
-msgstr ""
+msgstr "Assitent envia correu"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text & HTML with no attachments"
-msgstr ""
+msgstr "Text pla i HTML sense adjunts"
 
 #. module: email_template
 #: help:email.template,model_object_field:0
@@ -76,6 +81,10 @@ msgid ""
 "in the box below\n"
 "(Note:If there are no values make sure you have selected the correct model)"
 msgstr ""
+"Seleccioneu el camp del model que voleu utilitzar.\n"
+"Si és un camp de relació podreu triar els valors relacionats en el quadre de "
+"sota.\n"
+"(Nota: Si no hi han valors assegureu-vos de seleccionar el model correcte)"
 
 #. module: email_template
 #: field:email_template.preview,body_html:0
@@ -83,13 +92,13 @@ msgstr ""
 #: field:email_template.send.wizard,body_html:0
 #: field:email_template.send.wizard,body_text:0
 msgid "Body"
-msgstr ""
+msgstr "Missatge"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
-msgstr ""
+msgstr "Ha fallat l'eliminació del registre"
 
 #. module: email_template
 #: help:email_template.account,company:0
@@ -97,28 +106,30 @@ msgid ""
 "Select if this mail account does not belong to specific user but to the "
 "organization as a whole. eg: info@companydomain.com"
 msgstr ""
+"Selecciona si aquest compte d'email no pertany a un usuari en concret però "
+"si a l'organització com a tal. p.ex: info@domioempresa.com"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send now"
-msgstr ""
+msgstr "Envia ara"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "No aplicable"
 
 #. module: email_template
 #: view:email_template.account:0
 #: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
 #: model:ir.ui.menu,name:email_template.menu_email_template_account_all
 msgid "Email Accounts"
-msgstr ""
+msgstr "Comptes de correu"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send all mails"
-msgstr ""
+msgstr "Envia tots els correus"
 
 #. module: email_template
 #: help:email_template.account,smtpuname:0
@@ -126,17 +137,19 @@ msgid ""
 "Specify the username if your SMTP server requires authentication, otherwise "
 "leave it empty."
 msgstr ""
+"Especifiqueu el nom d'usuari si el seu servidor SMTP necessita autenticació, "
+"sinó deixeu-ho en blanc"
 
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
-msgstr ""
+msgstr "Referència del servidor de correu"
 
 #. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Aprovat"
 
 #. module: email_template
 #: help:email.template,def_cc:0
@@ -144,21 +157,23 @@ msgid ""
 "Carbon Copy address(es), comma-separated. Placeholders can be used here. "
 "e.g. ${object.email_cc}"
 msgstr ""
+"Adreça/ces de correu CC, separades per comes. Es poden utilitzar marcadors, "
+"per exemple ${object.email_cc}"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #. module: email_template
 #: field:email.template,table_html:0
 msgid "HTML code"
-msgstr ""
+msgstr "Codi HTML"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Envia correu"
 
 #. module: email_template
 #: help:email_template.account,name:0
@@ -167,17 +182,20 @@ msgid ""
 "Email, unless it is already specified in the From Email, e.g: John Doe "
 "<john@doe.com>"
 msgstr ""
+"La descripció s'utilitza com el nom del remitent, juntament amb l'email Des "
+"de proporcionat, tret que ja s'hagi especificat en l'email Des de, per "
+"exemple: Ramon Vives <rvives@empresa.com>"
 
 #. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
-msgstr ""
+msgstr "Compte de correu electrònic"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
-msgstr ""
+msgstr "L'enviament d'email va fallar per a un o més objectes"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -185,6 +203,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Afegiu aquí totes les dades adjuntes del document que voleu incloure en "
+"l'email"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -192,6 +212,8 @@ msgid ""
 "The default language for the email. Placeholders can be used here. eg. "
 "${object.partner_id.lang}"
 msgstr ""
+"L'idioma per omissió pels correus. Aquí hi podeu utilitzar marques, com "
+"${object.partner_id.lang}"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -199,11 +221,13 @@ msgid ""
 "When you choose relationship fields this field will specify the sub value "
 "you can use."
 msgstr ""
+"Quan trieu els camps de relació, aquest camp indicarà el sub-valor que podeu "
+"utilitzar."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Wizard Complete"
-msgstr ""
+msgstr "Assistent complert"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -211,96 +235,96 @@ msgstr ""
 #: field:email_template.preview,reply_to:0
 #: field:email_template.send.wizard,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Respondre a"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Delete Action"
-msgstr ""
+msgstr "Esborra acció"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Approve Account"
-msgstr ""
+msgstr "Aprova el compte"
 
 #. module: email_template
 #: field:email_template.preview,rel_model_ref:0
 #: field:email_template.send.wizard,rel_model_ref:0
 msgid "Referred Document"
-msgstr ""
+msgstr "Document relacionat"
 
 #. module: email_template
 #: field:email_template.send.wizard,full_success:0
 msgid "Complete Success"
-msgstr ""
+msgstr "El procés s'ha realitzat correctament"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Mixed)"
-msgstr ""
+msgstr "Tots dos HTML i Text (barrejats)"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "OK"
-msgstr ""
+msgstr "D'acord"
 
 #. module: email_template
 #: field:email_template.account,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Auto esborra"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Alternative)"
-msgstr ""
+msgstr "Tots dos HTML & text (alternatius)"
 
 #. module: email_template
 #: field:email_template.send.wizard,requested:0
 msgid "No of requested Mails"
-msgstr ""
+msgstr "Número de missatges sol·licitats"
 
 #. module: email_template
 #: field:email.template,def_body_text:0
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,body_text:0
 msgid "Standard Body (Text)"
-msgstr ""
+msgstr "Cos del missatge (Text)"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 msgid "Attached Files"
-msgstr ""
+msgstr "Fitxers adjunts"
 
 #. module: email_template
 #: field:email_template.account,smtpssl:0
 msgid "SSL/TLS (only in python 2.6)"
-msgstr ""
+msgstr "SSL / TLS (només python 2.6)"
 
 #. module: email_template
 #: field:email_template.account,email_id:0
 msgid "From Email"
-msgstr ""
+msgstr "Des d'email"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Avís"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
 msgid "Accounts"
-msgstr ""
+msgstr "Comptes"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Text)"
-msgstr ""
+msgstr "Cos (text)"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Company Emails"
-msgstr ""
+msgstr "Emails companyia"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -308,6 +332,9 @@ msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
 msgstr ""
+"Suggeriment: Els missatges de correu múltiples s'envien en el mateix idioma "
+"(es proposa l'idioma del primer). Li suggerim que envieu els missatges de "
+"correu en grups segons l'idioma."
 
 #. module: email_template
 #: help:email_template.preview,reply_to:0
@@ -316,6 +343,8 @@ msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here."
 msgstr ""
+"L'adreça de correu a la qual els destinataris haurien de respondre, si és "
+"diferent de l'adreça Des de. Es poden utilitzar marcadors."
 
 #. module: email_template
 #: field:email.template,def_subject:0
@@ -323,24 +352,24 @@ msgstr ""
 #: field:email_template.preview,subject:0
 #: field:email_template.send.wizard,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Assumpte"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
-msgstr ""
+msgstr "Raó: %s"
 
 #. module: email_template
 #: field:email_template.mailbox,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Per"
 
 #. module: email_template
 #: field:email_template.preview,ref_template:0
 #: field:email_template.send.wizard,ref_template:0
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:367
@@ -349,16 +378,19 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"El correu des de el compte %s ha fallat. Causa probable: Error enviament "
+"servidor\n"
+"Descripció: %s"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Insert Simple Field"
-msgstr ""
+msgstr "Insereix camp simple"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Html)"
-msgstr ""
+msgstr "Cos (Html)"
 
 #. module: email_template
 #: help:email.template,def_bcc:0
@@ -366,87 +398,89 @@ msgid ""
 "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
 "here. e.g. ${object.email_bcc}"
 msgstr ""
+"Adreça/ces de correu BCC, separades per comes. Es poden utilitzar marcadors, "
+"per exemple ${object.email_bcc}"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
-msgstr ""
+msgstr "Previsualització de la plantilla"
 
 #. module: email_template
 #: field:email.template,def_body_html:0
 msgid "Body (Text-Web Client Only)"
-msgstr ""
+msgstr "Cos del missatge (Text - Només client web)"
 
 #. module: email_template
 #: field:email_template.account,state:0
 #: view:email_template.mailbox:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "Botó assistent"
 
 #. module: email_template
 #: help:email_template.account,email_id:0
 msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
-msgstr ""
+msgstr "Per exemple: 'paula@doe.com' o 'Paula Vives <paula@doe.com>'"
 
 #. module: email_template
 #: view:email.template:0
 #: field:email.template,object_name:0
 msgid "Resource"
-msgstr ""
+msgstr "Recursos"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
-msgstr ""
+msgstr "Fallada en el test de connexió sortint"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
-msgstr ""
+msgstr "Correu des del compte %s enviat correctament."
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Standard Body"
-msgstr ""
+msgstr "Cos del missatge"
 
 #. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
-msgstr ""
+msgstr "Plantilles mako"
 
 #. module: email_template
 #: help:email.template,def_body_html:0
 #: help:email.template,def_body_text:0
 msgid "The text version of the mail"
-msgstr ""
+msgstr "Versió text del correu"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
-msgstr ""
+msgstr " (Adjunt Email)"
 
 #. module: email_template
 #: selection:email_template.mailbox,folder:0
 msgid "Sent Items"
-msgstr ""
+msgstr "Enviats"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Test Outgoing Connection"
-msgstr ""
+msgstr "Comprova connexió de sortida"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 msgid "Mailbox"
-msgstr ""
+msgstr "Bústia"
 
 #. module: email_template
 #: help:email.template,reply_to:0
@@ -454,6 +488,9 @@ msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here. e.g. ${object.email_reply_to}"
 msgstr ""
+"L'adreça de correu a la qual els destinataris haurien de respondre, si és "
+"diferent de l'adreça Des de. Es poden utilitzar marcadors, per exemple "
+"${object.email_reply_to}"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
@@ -461,44 +498,46 @@ msgid ""
 "Button in the side bar of the form view of this Resource that will invoke "
 "the Window Action"
 msgstr ""
+"Botó en la barra lateral de la vista de formulari d'aquest recurs que "
+"cridarà a l'acció de finestra."
 
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
 msgid "User account"
-msgstr ""
+msgstr "Compte d'usuari"
 
 #. module: email_template
 #: field:email_template.send.wizard,signature:0
 msgid "Attach my signature to mail"
-msgstr ""
+msgstr "Afegeix la meva signatura al correu"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
-msgstr ""
+msgstr "Informes"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 msgid "Sub Field"
-msgstr ""
+msgstr "Sub-camp"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.mailbox:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avançat"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "My Emails"
-msgstr ""
+msgstr "Els meus emails"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Expression Builder"
-msgstr ""
+msgstr "Generador d'expressions"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -506,37 +545,41 @@ msgid ""
 "When a relation field is used this field will show you the type of field you "
 "have selected"
 msgstr ""
+"Quan s'utilitza un camp de relació, aquest mostrarà el tipus de camp que heu "
+"seleccionat."
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "HTML Body"
-msgstr ""
+msgstr "Cos del missatge HTML"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Suspend Account"
-msgstr ""
+msgstr "Suspendre compte"
 
 #. module: email_template
 #: help:email.template,null_value:0
 msgid "This Value is used if the field is empty"
-msgstr ""
+msgstr "Aquest valor s'utilitza si el camp es troba buit."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Preview Template"
-msgstr ""
+msgstr "Previsualització plantilla"
 
 #. module: email_template
 #: field:email_template.account,smtpserver:0
 msgid "Server"
-msgstr ""
+msgstr "Servidor"
 
 #. module: email_template
 #: help:email.template,copyvalue:0
 msgid ""
 "Copy and paste the value in the location you want to use a system value."
 msgstr ""
+"Copieu i enganxeu el valor en la ubicació que voleu utilitzar un valor del "
+"sistema."
 
 #. module: email_template
 #: help:email.template,track_campaign_item:0
@@ -545,138 +588,142 @@ 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 ""
+"Activeu aquesta opció si desitgeu incloure un marcador de seguiment especial "
+"en els correus electrònics sortints perquè pugueu identificar les respostes "
+"i enllaçar-les de nou al registre del recurs corresponent. Això és útil per "
+"a iniciatives de CRM, per exemple."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Raw HTML)"
-msgstr ""
+msgstr "Cos del missatge (amb etiquetes HTML)"
 
 #. module: email_template
 #: field:email.template,use_sign:0
 msgid "Signature"
-msgstr ""
+msgstr "Signatura"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "Sub-model"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Options"
-msgstr ""
+msgstr "Opcions"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (Plain Text)"
-msgstr ""
+msgstr "Cos del missatge (Text pla)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Text)"
-msgstr ""
+msgstr "Cos del missatge (Text)"
 
 #. module: email_template
 #: field:email_template.mailbox,date_mail:0
 msgid "Rec/Sent Date"
-msgstr ""
+msgstr "Data de recepció/enviament"
 
 #. module: email_template
 #: selection:email_template.account,state:0
 msgid "Initiated"
-msgstr ""
+msgstr "Iniciat"
 
 #. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
-msgstr ""
+msgstr "Informe per enviar"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Server Information"
-msgstr ""
+msgstr "Informació del servidor"
 
 #. module: email_template
 #: field:email_template.send.wizard,generated:0
 msgid "No of generated Mails"
-msgstr ""
+msgstr "Nº de correus generats"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Mail Details"
-msgstr ""
+msgstr "Detalls del correu electrònic"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
-msgstr ""
+msgstr "Servidor SMTP o port no informats"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "Nota: això és HTML pur"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Group by..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Multiple Mail Wizard Step 1"
-msgstr ""
+msgstr "Assistent correus múltiples - Pas 1"
 
 #. module: email_template
 #: field:email_template.account,user:0
 msgid "Related User"
-msgstr ""
+msgstr "Usuari relacionat"
 
 #. module: email_template
 #: field:email_template.mailbox,body_html:0
 msgid "Body (Rich Text Clients Only)"
-msgstr ""
+msgstr "Cos del missatge(clients rich text únicament)"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 msgid "Window Action"
-msgstr ""
+msgstr "Acció de finestra"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
-msgstr ""
+msgstr "HTML, en cas contrari text"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Drafts"
-msgstr ""
+msgstr "Esborranys"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. module: email_template
 #: field:email_template.account,smtpport:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "Port SMTP"
 
 #. module: email_template
 #: field:email_template.mailbox,mail_type:0
 msgid "Mail Contents"
-msgstr ""
+msgstr "Contingut del correu electrònic"
 
 #. module: email_template
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "El nom de la plantilla ha de ser únic!"
 
 #. module: email_template
 #: field:email.template,def_bcc:0
@@ -684,22 +731,22 @@ msgstr ""
 #: field:email_template.preview,bcc:0
 #: field:email_template.send.wizard,bcc:0
 msgid "BCC"
-msgstr ""
+msgstr "CCO"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
-msgstr ""
+msgstr "Text pla"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Nom intern model"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -707,12 +754,12 @@ msgstr ""
 #: field:email_template.preview,message_id:0
 #: field:email_template.send.wizard,message_id:0
 msgid "Message-ID"
-msgstr ""
+msgstr "ID del missatge"
 
 #. module: email_template
 #: help:email_template.mailbox,server_ref:0
 msgid "Applicable for inward items only"
-msgstr ""
+msgstr "Aplicable només pels elements d'entrada"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -720,43 +767,46 @@ msgid ""
 "After clicking send all mails, mails will be sent to outbox and cleared in "
 "next Send/Recieve"
 msgstr ""
+"Després de fer clic a Envia tots els correus,  els missatges de correu seran "
+"enviats a la safata de sortida. Els correus s'enviaran en el proper "
+"Envia/Rebre (manual o automàtic) de la seva safata de sortida."
 
 #. module: email_template
 #: field:email_template.mailbox,state:0
 #: field:email_template.send.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estat"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Sortint"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
-msgstr ""
+msgstr "L'extracció de data i hora ha fallat. Data:%s \tError:%s"
 
 #. module: email_template
 #: help:email.template,use_sign:0
 msgid "the signature from the User details will be appended to the mail"
-msgstr ""
+msgstr "la signatura dels detalls d'usuari s'afegirà al correu"
 
 #. module: email_template
 #: field:email_template.send.wizard,from:0
 msgid "From Account"
-msgstr ""
+msgstr "Des del compte"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Intermixed content"
-msgstr ""
+msgstr "Contingut divers"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Request Re-activation"
-msgstr ""
+msgstr "Sol·licita reactivació"
 
 #. module: email_template
 #: view:email.template:0
@@ -764,33 +814,33 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_all
 #: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
 msgid "Email Templates"
-msgstr ""
+msgstr "Plantilles de correu electrònic"
 
 #. module: email_template
 #: field:email_template.account,smtpuname:0
 msgid "User Name"
-msgstr ""
+msgstr "Nom usuari"
 
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Opcions avançades"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Outbox"
-msgstr ""
+msgstr "Bústia de sortida"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Save in Drafts"
-msgstr ""
+msgstr "Desa en esborranys"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:362
@@ -799,16 +849,18 @@ msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
 "Description: %s"
 msgstr ""
+"El correu del compte%s ha fallat. Causa probable: Error MIME\n"
+"Descripció: %s"
 
 #. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #. module: email_template
 #: field:email.template,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Llengua"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:275
@@ -824,56 +876,58 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
-msgstr ""
+msgstr "Plantilla email"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Send/Receive"
-msgstr ""
+msgstr "Envia/Rebre"
 
 #. module: email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Personal Mails"
-msgstr ""
+msgstr "Correus personals"
 
 #. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
-msgstr ""
+msgstr "Suspès"
 
 #. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
 "Only users from these groups will be allowed to send mails from this Template"
 msgstr ""
+"Només els usuaris d'aquests grups podran enviar correus a partir d'aquesta "
+"plantilla"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
-msgstr ""
+msgstr "Envia mail (%s)"
 
 #. module: email_template
 #: help:email.template,def_subject:0
 msgid "The subject of email. Placeholders can be used here."
-msgstr ""
+msgstr "L'assumpte del correu. Es poden utilitzar marcadors."
 
 #. module: email_template
 #: field:email_template.send.wizard,report:0
 msgid "Report File Name"
-msgstr ""
+msgstr "Nom del fitxer de l'informe"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "Expressió"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,history:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: email_template
 #: view:email.template:0
@@ -882,66 +936,66 @@ msgstr ""
 #: view:email_template.send.wizard:0
 #: field:email_template.send.wizard,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjunts"
 
 #. module: email_template
 #: field:email_template.preview,to:0
 #: field:email_template.send.wizard,to:0
 msgid "To"
-msgstr ""
+msgstr "Fins"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Text, otherwise HTML"
-msgstr ""
+msgstr "Text, en cas contrari HTML"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template %s"
-msgstr ""
+msgstr "Còpia de la plantilla% s"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Discard Mail"
-msgstr ""
+msgstr "Descarta correu electrònic"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Plantilles d'email per a models"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
-msgstr ""
+msgstr "Error enviant el correu: %s"
 
 #. module: email_template
 #: constraint:email_template.account:0
 msgid "Error: You are not allowed to have more than 1 account."
-msgstr ""
+msgstr "Error: No se li permet tenir més d'un compte."
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
-msgstr ""
+msgstr "Cos del missatge (HTML - Només client web)"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
-msgstr ""
+msgstr "%s (document adjunt a l'email)"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Sending"
-msgstr ""
+msgstr "Enviament"
 
 #. module: email_template
 #: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
@@ -951,26 +1005,30 @@ msgid ""
 "profile fields, so that a partner name or other partner related information "
 "may be inserted automatically."
 msgstr ""
+"Una plantilla de correu electrònic és un document de correu electrònic que "
+"s'enviarà com a part d'una campanya de màrqueting. Es pot personalitzar "
+"d'acord a determinats camps del perfil del client, de manera que el nom del "
+"client o una altra informació relacionada es pot inserir de forma automàtica."
 
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
-msgstr ""
+msgstr "Grups d'usuaris autoritzats"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
 msgid "Field"
-msgstr ""
+msgstr "Camp"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "User Information"
-msgstr ""
+msgstr "Informació de l'usuari/a"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Actions"
-msgstr ""
+msgstr "Accions"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:363
@@ -980,6 +1038,8 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"Error enviament servidor\n"
+"Descripció: %s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -987,62 +1047,67 @@ msgid ""
 "Name of the generated report file. Placeholders can be used in the filename. "
 "eg: 2009_SO003.pdf"
 msgstr ""
+"Nom del fitxer de l'informe generat. Es poden utilitzar marcadors en el nom "
+"del fitxer, per exemple 2011_SO003.pdf"
 
 #. module: email_template
 #: help:email_template.mailbox,date_mail:0
 msgid "Date on which Email Sent or Received"
-msgstr ""
+msgstr "Data en la qual l'email va ser enviat / rebut"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Trash"
-msgstr ""
+msgstr "Paperera"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_mailbox
 msgid "Email Mailbox"
-msgstr ""
+msgstr "Bústia de correu"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
 "Error: %s"
 msgstr ""
+"L'enviament del correu %s ha fallat. Causa probable: No es va poder "
+"connectar amb el servidor\n"
+"Error: %s"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
-msgstr ""
+msgstr "Falta el compte de correu"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
-msgstr ""
+msgstr "El test de la conexión SMTP va ser un èxit"
 
 #. module: email_template
 #: model:ir.module.module,shortdesc:email_template.module_meta_information
 msgid "Email Template for OpenERP"
-msgstr ""
+msgstr "Plantilla email per OpenERP"
 
 #. module: email_template
 #: field:email_template.account,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Create Action"
-msgstr ""
+msgstr "Crea acció"
 
 #. module: email_template
 #: help:email_template.account,smtpserver:0
 msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
-msgstr ""
+msgstr "Entreu el nom del servidor de sortida, p. ex. smtp.sudominio.com"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -1050,6 +1115,9 @@ msgid ""
 "You may attach existing files to this template, so they will be added in all "
 "emails created from this template"
 msgstr ""
+"Podeu adjuntar fitxers existents a aquesta plantilla, per la qual cosa "
+"s'afegiran en tots els correus electrònics creats a partir d'aquesta "
+"plantilla."
 
 #. module: email_template
 #: help:email.template,message_id:0
@@ -1058,22 +1126,25 @@ msgid ""
 "that this overrides the Resource tracking option! Placeholders can be used "
 "here."
 msgstr ""
+"Indiqueu el ID del missatge de l'encapçalat SMTP per utilitzar en els "
+"correus electrònics sortints. Tingueu en compte que això anul·la l'opció de "
+"seguiment de recursos! Es poden utilitzar marcadors."
 
 #. module: email_template
 #: field:email.template,def_to:0
 #: field:email_template.mailbox,email_to:0
 msgid "Recipient (To)"
-msgstr ""
+msgstr "Receptors (Per a)"
 
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
-msgstr ""
+msgstr "Valor nul"
 
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
-msgstr ""
+msgstr "Idioma plantilla"
 
 #. module: email_template
 #: field:email.template,def_cc:0
@@ -1081,27 +1152,30 @@ msgstr ""
 #: field:email_template.preview,cc:0
 #: field:email_template.send.wizard,cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Sent"
-msgstr ""
+msgstr "Enviats"
 
 #. module: email_template
 #: sql_constraint:email_template.account:0
 msgid "Another setting already exists with this email ID !"
 msgstr ""
+"Ja existeix una altra configuració amb aquest ID de correu electrònic!"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
 msgid "Action that will open this email template on Resource records"
 msgstr ""
+"Acció que obrirà aquesta plantilla de correu electrònic en els registres "
+"d'aquests recursos."
 
 #. module: email_template
 #: field:email_template.account,smtppass:0
 msgid "Password"
-msgstr ""
+msgstr "Contrasenya"
 
 #. module: email_template
 #: help:email_template.preview,message_id:0
@@ -1110,42 +1184,47 @@ msgid ""
 "The Message-ID header value, if you need tospecify it, for example to "
 "automatically recognize the replies later. Placeholders can be used here."
 msgstr ""
+"El valor del ID del missatge de l'encapçalat, si necessiteu especificar-"
+"l'ho, per exemple, per reconèixer automàticament les respostes més tard. Es "
+"poden utilitzar marcadors."
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
-msgstr ""
+msgstr "Correus electrònics"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Templates"
-msgstr ""
+msgstr "Plantilles"
 
 #. module: email_template
 #: field:email_template.preview,report:0
 msgid "Report Name"
-msgstr ""
+msgstr "Nom del informe"
 
 #. module: email_template
 #: field:email.template,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: email_template
 #: field:email.template,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "Seguiment dels recursos"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "Vista prèvia de la plantilla de l'email"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
-msgstr ""
+msgstr "Vista prèvia email"
 
 #. module: email_template
 #: help:email.template,def_to:0
@@ -1153,11 +1232,13 @@ msgid ""
 "The Recipient of email. Placeholders can be used here. e.g. "
 "${object.email_to}"
 msgstr ""
+"El destinatari del correu electrònic. Es poden utilitzar marcadors, per "
+"exemple ${object.email_to}"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Existing files"
-msgstr ""
+msgstr "Fitxers existents"
 
 #. module: email_template
 #: model:ir.module.module,description:email_template.module_meta_information
@@ -1167,11 +1248,15 @@ msgid ""
 "emails.\n"
 "    "
 msgstr ""
+"\n"
+"    La plantilla de correu és l'extracció de Power Email bàsicament per a "
+"l'enviament de correus.\n"
+"    "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (HTML)"
-msgstr ""
+msgstr "Cos del missatge (HMTL)"
 
 #. module: email_template
 #: help:email.template,table_html:0
@@ -1179,28 +1264,30 @@ msgid ""
 "Copy this html code to your HTML message body for displaying the info in "
 "your mail."
 msgstr ""
+"Copieu aquest codi HTML en el cos del missatge HTML per a mostrar la "
+"informació al seu correu electrònic."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_account
 msgid "email_template.account"
-msgstr ""
+msgstr "email_plantilla.compte"
 
 #. module: email_template
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
-msgstr ""
+msgstr "No existeix connexió principal per ID indicat"
 
 #. module: email_template
 #: field:email_template.account,company:0
 msgid "Corporate"
-msgstr ""
+msgstr "Corporatiu"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:275
@@ -1210,47 +1297,50 @@ msgid ""
 "server\n"
 "Error: %s"
 msgstr ""
+"El correu des del compte %s ha fallat en l'autenticació. Causa probable: No "
+"es pot autenticar al servidor\n"
+"Error: %s"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
-msgstr ""
+msgstr "Aquest és l'assistent per enviar el correu electrònic"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adreces"
 
 #. module: email_template
 #: help:email.template,from_account:0
 msgid "Emails will be sent from this approved account."
-msgstr ""
+msgstr "Els emails seran enviats des d'aquest compte aprovat"
 
 #. module: email_template
 #: field:email_template.account,send_pref:0
 msgid "Mail Format"
-msgstr ""
+msgstr "Format del correu electrònic"
 
 #. module: email_template
 #: field:email_template.mailbox,folder:0
 msgid "Folder"
-msgstr ""
+msgstr "Directori"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Company Accounts"
-msgstr ""
+msgstr "Comptes de la companyia"
 
 #. module: email_template
 #: help:email_template.account,smtpport:0
 msgid "Enter port number, eg: 25 or 587"
-msgstr ""
+msgstr "Introduïu el número de port, p. ex. 25 o 587"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
-msgstr ""
+msgstr "plantilla email"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:280
@@ -1259,20 +1349,25 @@ msgstr ""
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
+"El correu del compte %s ha fallat. Causa probable: Compte no aprovada"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Simple Mail Wizard Step 1"
-msgstr ""
+msgstr "Assistent correu simple - Pas 1"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Has Attachments"
-msgstr ""
+msgstr "Té adjunts"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:452
 #: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
-msgstr ""
+msgstr "Sense descripció"
+
+#, python-format
+#~ msgid "Copy of template "
+#~ msgstr "Còpia de plantilla "
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 7205524ae58..eb2e6171ac4 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -967,7 +967,7 @@ msgid "Close"
 msgstr "Beenden"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Fehler beim Senden der E-Mail: %s"
@@ -1064,7 +1064,7 @@ msgid "Email Mailbox"
 msgstr "EMail Eingang"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1182,7 +1182,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "EMails"
 
@@ -1359,79 +1361,6 @@ msgstr "Hat Dateianhang"
 msgid "No Description"
 msgstr "Keine Beschreibung"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung für diese Aktion"
-
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Mako Vorlagen nicht installiert"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Einträge"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#, python-format
-#~ msgid ""
-#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-#~ msgstr ""
-#~ "Extraktion Datum/Zeit fehlgeschlagen.Datum:%s \\n                      \t"
-#~ "Fehler:%s"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#, python-format
-#~ msgid ""
-#~ "Error sending mail: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-#~ msgstr ""
-#~ "Fehler bei Mailversand: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Django Vorlagen nicht installiert"
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Kopie der Vorlage "
-
-#~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "An email template is an email document that will be sent as part of a "
-#~ "marketing campaign. You can personalize it based on specific customer "
-#~ "profile fields so that their names or other partner related information can "
-#~ "be automatically inserted in it."
-#~ msgstr ""
-#~ "Eine Email Vorlage ist ein Email die als Bestandteil einer Marketing "
-#~ "Kampagne versendet wird. Sie können eine Personalisierung der Vorlage nach "
-#~ "Ihren Vorstellungen vornehmen, um definierte Platzhalter automatisch mit "
-#~ "Ihren Daten bei dem Emailversand zu füllen."
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index 5ee550d2a00..ff1f92c8dea 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -970,7 +970,7 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Error enviando correo electrónico: %s"
@@ -1067,7 +1067,7 @@ msgid "Email Mailbox"
 msgstr "Buzón de correo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1188,7 +1188,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Emails"
 
@@ -1364,52 +1366,6 @@ msgstr "Contiene datos adjuntos"
 msgid "No Description"
 msgstr "Sin descripción"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo inválido en la definición de la acción"
-
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Plantillas mako no instaladas"
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Copia de plantilla "
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Plantillas Django no instaladas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argumentos no válidos"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ 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 ""
-#~ "An email template is an email document that will be sent as part of a "
-#~ "marketing campaign. You can personalize it based on specific customer "
-#~ "profile fields so that their names or other partner related information can "
-#~ "be automatically inserted in it."
-#~ msgstr ""
-#~ "Una plantilla de correo electrónico es un documento de correo electrónico "
-#~ "que se enviará como parte de una campaña de marketing. Puede personalizarlo "
-#~ "en base a campos específicos del perfil del cliente para que su nombre u "
-#~ "otra información de la empresa se puedan insertar automáticamente."
diff --git a/addons/email_template/i18n/es_EC.po b/addons/email_template/i18n/es_EC.po
index 710f2bbd690..fe00996b3c6 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -917,7 +917,7 @@ msgid "Close"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -1005,7 +1005,7 @@ msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1113,7 +1113,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_MX.po b/addons/email_template/i18n/es_MX.po
new file mode 100644
index 00000000000..43469c3ecf2
--- /dev/null
+++ b/addons/email_template/i18n/es_MX.po
@@ -0,0 +1,1371 @@
+# 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 09:58+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Elimina permanentemente los emails depués de su envío"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Configuración cuenta de correo"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+"Los correos electrónicos para varios elementos han sido guardados en el "
+"Buzón de salida."
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"No se le han configurado cuentas de correo electrónico personales. \n"
+"Puede pedir al administrador que fuerce una cuenta para esta plantilla o que "
+"le cree una cuenta de correo electrónico personal."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr "Emails personales"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr "Fichero del informe"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr "Contenido email  "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Asistente envío mail"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Texto plano & HTML sin datos adjuntos"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+"Seleccione el campo del modelo que quiera utilizar.\n"
+"Si es un campo de relación podrá escoger los valores relacionados en el "
+"cuadro de abajo.\n"
+"(Nota: Si no hay valores asegúrese de escoger el modelo correcto)"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Cuerpo"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "La eliminación del registro ha fallado"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+"Seleccionar si este cuenta de email no pertenece a un usuario en concreto "
+"pero a al organización como tal. p.ej: info@domioempresa.com"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Enviar ahora"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "No aplicable"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Cuentas de email"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Enviar todos los emails"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Especifique el nombre de usuario si su servidor SMTP necesita "
+"autetificación, sino déjelo en blanco"
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Servidor de referencia del mail"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+"Dirección(es) de correo CC, separadas por comas. Se pueden usar marcadores, "
+"por ejemplo ${object.email_cc}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "Código HTML"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Enviar mail"
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+"La descripción se utiliza como el nombre del remitente, junto con el email "
+"Desde proporcionado, a menos que ya se haya especificado en el email Desde, "
+"por ejemplo: Ramon Vives <rvives@empresa.com>"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Cuenta de email"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr "El envío de email falló debido a uno o varios objetos"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+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 "
+"email"
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"Idioma por defecto del correo electrónico. Se pueden usar marcadores, por "
+"ejemplo ${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+"Cuando seleccione campos de relación, este campo indicará el sub-valor que "
+"puede utilizar."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Asistente completado"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr "Eliminar acción"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Aprobar cuenta"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Documento relacionado"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "El proceso se ha realizado correctamente"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Ambos HTML y Texto (mezclados)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "Aceptar"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr "Auto eliminar"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "Ambos HTML & texto (alternativos)"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "Nº de mails solicitados"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Cuerpo estándar (Texto)"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Ficheros adjuntos"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL / TLS (solo python 2.6)"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Desde email"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Cuerpo (texto)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr "Emails empresa"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+"Sugerencia: Los mensajes de correo múltiples se envían en el mismo idioma "
+"(se propone el idioma del primero). Le sugerimos que envíe los mensajes de "
+"correo en grupos según el idioma."
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+"La dirección de correo a la que los destinatarios deberían responder, si es "
+"distinta de la dirección Desde. Se pueden usar marcadores."
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr "Razones: %s"
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+"El correo desde la cuenta %s ha fallado. Causa probable: Error envío "
+"servidor\n"
+" Descripción: %s"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Insertar campo simple"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Cuerpo (Html)"
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+"Dirección(es) de correo BCC, separadas por comas. Se pueden usar marcadores, "
+"por ejemplo ${object.email_bcc}"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Vista previa plantilla"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Cuerpo del mensaje (Texto - sólo cliente web)"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr "Estado"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Botón asistente"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr "Por ejemplo: 'paula@doe.com' o 'Paula Vives <paula@doe.com>'"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr "Fallo de test de connexión saliente"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr "Correo desde la cuenta %s enviado correctamente."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Cuerpo estándar"
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr "Plantillas mako"
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "Versión texto del mail"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr " (Adjunto Email)"
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Elementos enviados"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Comprobar conexión de salida"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr "Carpeta de correo"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+"La dirección de correo a la que los destinatarios deberían responder, si es "
+"distinta de la dirección Desde. Se pueden usar marcadores, por ejemplo "
+"${object.email_reply_to}"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+"Botón en la barra lateral de la vista de formulario de este recurso que "
+"llamará a la acción de ventana."
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Cuenta usuario"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Adjuntar mi firma al mail"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Informe"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Sub campo"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Avanzado"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Mis emails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr "Constructor de expresiones"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+"Cuando se utiliza un campo de relación, este campo mostrará el tipo de campo "
+"que ha seleccionado."
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "Cuerpo HTML"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr "Suspender cuenta"
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr "Este valor es utilizado cuando el campo está vacío"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Vista previa plantilla"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+"Copie y pegue el valor en el lugar donde quiera utilizar un valor del sistema"
+
+#. module: email_template
+#: help:email.template,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 ""
+"Active esta opción si desea incluir un marcador de seguimiento especial en "
+"los correos electrónicos salientes para que pueda identificar las respuestas "
+"y enlazarlas de nuevo al registro del recurso correspondiente. Esto es útil "
+"para iniciativas de CRM, por ejemplo."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Cuerpo (con etiquetas HTML)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Firma"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr "Sub-modelo"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Cuerpo (texto plano)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Cuerpo (texto)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr "Fecha recepción/envío"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Iniciado"
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr "Informe a enviar"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "Información servidor"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr "Nº de mails generados"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "Detalles del mail"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr "Servidor SMTP o puerto no informados"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "Nota: esto es HTML puro"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "Agrupado por..."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr "Asistente correo múltiple - Paso 1"
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr "Usuario relacionado"
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr "Cuerpo (clientes rich text únicamente)"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr "Acción de ventana"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr "HTML, sino texto"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr "Borradores"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr "No"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr "Puerto SMTP"
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr "Contenidos mail"
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr "¡El nombre de la plantilla debe ser único!"
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr "CCO"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr "Texto plano"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr "Nombre interno del modelo"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr "ID mensaje"
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr "Aplica a elementos entrantes únicamente"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+"Después de hacer clic en Enviar ahora, los correos se colocarán en el buzón "
+"de salida. Los correos se enviarán en el siguiente Enviar/Recibir (manual o "
+"automático) de su bandeja de salida."
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr "Estatus"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr "Saliente"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr "Extracción de fecha y hora ha fallado. Fecha:%s \tError:%s"
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr "la firma del detalle de los usuarios será añadido al mail"
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr "De Cuenta"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr "Contenido mezclado"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr "Solicitar reactivación"
+
+#. 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_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr "Plantillas email"
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "Opciones avanzadas"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr "Bandeja de salida"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr "Guardar en borradores"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"El correo de la cuenta %s ha fallado. Causa probable: Error MIME \n"
+"Descripción: %s"
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr "TLS"
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr "Plantilla email"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Enviar / recibir"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr "Correos personales"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "Suspendida"
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+"Solo los usuarios de estos grupos podrán enviar correos basados en esta "
+"plantila"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Enviar mail (%s)"
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr "El asunto del correo. Se pueden usar marcadores."
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr "Nombre del fichero del informe"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr "Historial"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "A"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr "Texto, sino HTML"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr "Descartar mail"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr "Plantillas email para modelos"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:48
+#, python-format
+msgid "Error sending mail: %s"
+msgstr "Error enviando correo electrónico: %s"
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr "Error: No se le permite tener más de una cuenta."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr "Cuerpo (HTML- cliente web únicamente)"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr "%s (documento adjunto al email)"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Enviando"
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+"Una plantilla de correo electrónico es un documento de correo electrónico "
+"que se enviará como parte de una campaña de marketing. Se puede personalizar "
+"de acuerdo a determinados campos del perfil del cliente, de modo que el "
+"nombre del cliente u otra información relacionada se puede insertar de forma "
+"automática."
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr "Grupos de usuarios autorizados"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr "Información usuario"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+"Error envío servidor\n"
+"Descripción: %s"
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+"Nombre del fichero del informe generado.. Se pueden usar marcadores en el "
+"nombre del fichero, por ejemplo 2009_SO003.pdf"
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Fecha en la cual el email fue enviado / recibido"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr "Basura"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Buzón de correo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:104
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+"El envío del correo %s ha fallado. Causa probable: No se pudo conectar con "
+"el servidor\n"
+"Error: %s"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr "Falta la cuenta de correo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr "El test de la conexión SMTP es correcto"
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr "Plantilla email para OpenERP"
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr "Crear acción"
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr "Entre el nombre del servidor saliente, p.ej. smtp.sudominio.com"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+"Puede adjuntar archivos existentes a esta plantilla, por lo que se añadirán "
+"en todos los correos electrónicos creados a partir de esta plantilla."
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+"Indique el ID del mensaje del encabezado SMTP para utilizar en los correos "
+"electrónicos salientes. ¡Tenga en cuenta que esto anula la opción de "
+"seguimiento de recursos! Se pueden usar marcadores."
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Receptores (A)"
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr "Valor nulo"
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr "Idioma plantilla"
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr "Enviado"
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr "¡Ya existe otra configuración con este ID de correo electrónico!"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+"Acción que abrirá esta plantilla de correo electrónico en los registros de "
+"estos recursos."
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+"El valor del ID del mensaje del encabezado, si necesita especificarlo, por "
+"ejemplo, para reconocer automáticamente las respuestas más tarde. Se pueden "
+"usar marcadores."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Emails"
+msgstr "Emails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr "Plantillas"
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr "Nombre del informe"
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "Seguimiento de recursos"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "Vista preliminar de la plantilla del email"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "Vista preliminar email"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+"El destinatario del correo electrónico. Se pueden usar marcadores, por "
+"ejemplo ${object.email_to}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr "Ficheros existentes"
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+"\n"
+"    La plantilla de correo es la extracción de Power Email básicamente para "
+"el envío de correos.\n"
+"    "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr "Cuerpo (HMTL)"
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+"Copie este código html en el cuerpo de su mensaje HTML para mostrar la "
+"información en su mail"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr "email_plantilla.cuenta"
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr "No existe conexión principal para el ID indicado"
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr "Corporativo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"El correo desde la cuenta %s ha fallado en la autenticación. Causa probable: "
+"No se puede autenticar al servidor\n"
+"Error: %s"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr "Este es el asistente para enviar mails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr "Los emails serán enviados desde esta cuenta aprobada"
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr "Formato mail"
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Carpeta"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr "Cuentas de la compañía"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr "Introduzca el número de puerto, p.ej. 25 o 587"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr "plantilla email"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+"El correo de la cuenta %s ha fallado. Causa probable: Cuenta no aprobada"
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr "Asistente correo simple - Paso 1"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr "Contiene datos adjuntos"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr "Sin descripción"
+
+#, python-format
+#~ msgid "Copy of template "
+#~ msgstr "Copia de plantilla "
diff --git a/addons/email_template/i18n/es_VE.po b/addons/email_template/i18n/es_VE.po
new file mode 100644
index 00000000000..43469c3ecf2
--- /dev/null
+++ b/addons/email_template/i18n/es_VE.po
@@ -0,0 +1,1371 @@
+# 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 09:58+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Elimina permanentemente los emails depués de su envío"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Configuración cuenta de correo"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+"Los correos electrónicos para varios elementos han sido guardados en el "
+"Buzón de salida."
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"No se le han configurado cuentas de correo electrónico personales. \n"
+"Puede pedir al administrador que fuerce una cuenta para esta plantilla o que "
+"le cree una cuenta de correo electrónico personal."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr "Emails personales"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr "Fichero del informe"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr "Contenido email  "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Asistente envío mail"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Texto plano & HTML sin datos adjuntos"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+"Seleccione el campo del modelo que quiera utilizar.\n"
+"Si es un campo de relación podrá escoger los valores relacionados en el "
+"cuadro de abajo.\n"
+"(Nota: Si no hay valores asegúrese de escoger el modelo correcto)"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Cuerpo"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "La eliminación del registro ha fallado"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+"Seleccionar si este cuenta de email no pertenece a un usuario en concreto "
+"pero a al organización como tal. p.ej: info@domioempresa.com"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Enviar ahora"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "No aplicable"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Cuentas de email"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Enviar todos los emails"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Especifique el nombre de usuario si su servidor SMTP necesita "
+"autetificación, sino déjelo en blanco"
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Servidor de referencia del mail"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+"Dirección(es) de correo CC, separadas por comas. Se pueden usar marcadores, "
+"por ejemplo ${object.email_cc}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "Código HTML"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Enviar mail"
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+"La descripción se utiliza como el nombre del remitente, junto con el email "
+"Desde proporcionado, a menos que ya se haya especificado en el email Desde, "
+"por ejemplo: Ramon Vives <rvives@empresa.com>"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Cuenta de email"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr "El envío de email falló debido a uno o varios objetos"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+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 "
+"email"
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"Idioma por defecto del correo electrónico. Se pueden usar marcadores, por "
+"ejemplo ${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+"Cuando seleccione campos de relación, este campo indicará el sub-valor que "
+"puede utilizar."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Asistente completado"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr "Eliminar acción"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Aprobar cuenta"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Documento relacionado"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "El proceso se ha realizado correctamente"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Ambos HTML y Texto (mezclados)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "Aceptar"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr "Auto eliminar"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "Ambos HTML & texto (alternativos)"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "Nº de mails solicitados"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Cuerpo estándar (Texto)"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Ficheros adjuntos"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL / TLS (solo python 2.6)"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Desde email"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Cuerpo (texto)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr "Emails empresa"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+"Sugerencia: Los mensajes de correo múltiples se envían en el mismo idioma "
+"(se propone el idioma del primero). Le sugerimos que envíe los mensajes de "
+"correo en grupos según el idioma."
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+"La dirección de correo a la que los destinatarios deberían responder, si es "
+"distinta de la dirección Desde. Se pueden usar marcadores."
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr "Razones: %s"
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+"El correo desde la cuenta %s ha fallado. Causa probable: Error envío "
+"servidor\n"
+" Descripción: %s"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Insertar campo simple"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Cuerpo (Html)"
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+"Dirección(es) de correo BCC, separadas por comas. Se pueden usar marcadores, "
+"por ejemplo ${object.email_bcc}"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Vista previa plantilla"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Cuerpo del mensaje (Texto - sólo cliente web)"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr "Estado"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Botón asistente"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr "Por ejemplo: 'paula@doe.com' o 'Paula Vives <paula@doe.com>'"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr "Fallo de test de connexión saliente"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr "Correo desde la cuenta %s enviado correctamente."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Cuerpo estándar"
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr "Plantillas mako"
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "Versión texto del mail"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr " (Adjunto Email)"
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Elementos enviados"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Comprobar conexión de salida"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr "Carpeta de correo"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+"La dirección de correo a la que los destinatarios deberían responder, si es "
+"distinta de la dirección Desde. Se pueden usar marcadores, por ejemplo "
+"${object.email_reply_to}"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+"Botón en la barra lateral de la vista de formulario de este recurso que "
+"llamará a la acción de ventana."
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Cuenta usuario"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Adjuntar mi firma al mail"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Informe"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Sub campo"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Avanzado"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Mis emails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr "Constructor de expresiones"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+"Cuando se utiliza un campo de relación, este campo mostrará el tipo de campo "
+"que ha seleccionado."
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "Cuerpo HTML"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr "Suspender cuenta"
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr "Este valor es utilizado cuando el campo está vacío"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Vista previa plantilla"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+"Copie y pegue el valor en el lugar donde quiera utilizar un valor del sistema"
+
+#. module: email_template
+#: help:email.template,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 ""
+"Active esta opción si desea incluir un marcador de seguimiento especial en "
+"los correos electrónicos salientes para que pueda identificar las respuestas "
+"y enlazarlas de nuevo al registro del recurso correspondiente. Esto es útil "
+"para iniciativas de CRM, por ejemplo."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Cuerpo (con etiquetas HTML)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Firma"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr "Sub-modelo"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Cuerpo (texto plano)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Cuerpo (texto)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr "Fecha recepción/envío"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Iniciado"
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr "Informe a enviar"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "Información servidor"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr "Nº de mails generados"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "Detalles del mail"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr "Servidor SMTP o puerto no informados"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "Nota: esto es HTML puro"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "Agrupado por..."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr "Asistente correo múltiple - Paso 1"
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr "Usuario relacionado"
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr "Cuerpo (clientes rich text únicamente)"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr "Acción de ventana"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr "HTML, sino texto"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr "Borradores"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr "No"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr "Puerto SMTP"
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr "Contenidos mail"
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr "¡El nombre de la plantilla debe ser único!"
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr "CCO"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr "Texto plano"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr "Nombre interno del modelo"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr "ID mensaje"
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr "Aplica a elementos entrantes únicamente"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+"Después de hacer clic en Enviar ahora, los correos se colocarán en el buzón "
+"de salida. Los correos se enviarán en el siguiente Enviar/Recibir (manual o "
+"automático) de su bandeja de salida."
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr "Estatus"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr "Saliente"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr "Extracción de fecha y hora ha fallado. Fecha:%s \tError:%s"
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr "la firma del detalle de los usuarios será añadido al mail"
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr "De Cuenta"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr "Contenido mezclado"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr "Solicitar reactivación"
+
+#. 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_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr "Plantillas email"
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "Opciones avanzadas"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr "Bandeja de salida"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr "Guardar en borradores"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"El correo de la cuenta %s ha fallado. Causa probable: Error MIME \n"
+"Descripción: %s"
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr "TLS"
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr "Plantilla email"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Enviar / recibir"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr "Correos personales"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "Suspendida"
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+"Solo los usuarios de estos grupos podrán enviar correos basados en esta "
+"plantila"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Enviar mail (%s)"
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr "El asunto del correo. Se pueden usar marcadores."
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr "Nombre del fichero del informe"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr "Historial"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "A"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr "Texto, sino HTML"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr "Descartar mail"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr "Plantillas email para modelos"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:48
+#, python-format
+msgid "Error sending mail: %s"
+msgstr "Error enviando correo electrónico: %s"
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr "Error: No se le permite tener más de una cuenta."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr "Cuerpo (HTML- cliente web únicamente)"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr "%s (documento adjunto al email)"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Enviando"
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+"Una plantilla de correo electrónico es un documento de correo electrónico "
+"que se enviará como parte de una campaña de marketing. Se puede personalizar "
+"de acuerdo a determinados campos del perfil del cliente, de modo que el "
+"nombre del cliente u otra información relacionada se puede insertar de forma "
+"automática."
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr "Grupos de usuarios autorizados"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr "Información usuario"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+"Error envío servidor\n"
+"Descripción: %s"
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+"Nombre del fichero del informe generado.. Se pueden usar marcadores en el "
+"nombre del fichero, por ejemplo 2009_SO003.pdf"
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Fecha en la cual el email fue enviado / recibido"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr "Basura"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Buzón de correo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:104
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+"El envío del correo %s ha fallado. Causa probable: No se pudo conectar con "
+"el servidor\n"
+"Error: %s"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr "Falta la cuenta de correo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr "El test de la conexión SMTP es correcto"
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr "Plantilla email para OpenERP"
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr "Crear acción"
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr "Entre el nombre del servidor saliente, p.ej. smtp.sudominio.com"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+"Puede adjuntar archivos existentes a esta plantilla, por lo que se añadirán "
+"en todos los correos electrónicos creados a partir de esta plantilla."
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+"Indique el ID del mensaje del encabezado SMTP para utilizar en los correos "
+"electrónicos salientes. ¡Tenga en cuenta que esto anula la opción de "
+"seguimiento de recursos! Se pueden usar marcadores."
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Receptores (A)"
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr "Valor nulo"
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr "Idioma plantilla"
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr "Enviado"
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr "¡Ya existe otra configuración con este ID de correo electrónico!"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+"Acción que abrirá esta plantilla de correo electrónico en los registros de "
+"estos recursos."
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+"El valor del ID del mensaje del encabezado, si necesita especificarlo, por "
+"ejemplo, para reconocer automáticamente las respuestas más tarde. Se pueden "
+"usar marcadores."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Emails"
+msgstr "Emails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr "Plantillas"
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr "Nombre del informe"
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "Seguimiento de recursos"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "Vista preliminar de la plantilla del email"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "Vista preliminar email"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+"El destinatario del correo electrónico. Se pueden usar marcadores, por "
+"ejemplo ${object.email_to}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr "Ficheros existentes"
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+"\n"
+"    La plantilla de correo es la extracción de Power Email básicamente para "
+"el envío de correos.\n"
+"    "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr "Cuerpo (HMTL)"
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+"Copie este código html en el cuerpo de su mensaje HTML para mostrar la "
+"información en su mail"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr "email_plantilla.cuenta"
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr "No existe conexión principal para el ID indicado"
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr "Corporativo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"El correo desde la cuenta %s ha fallado en la autenticación. Causa probable: "
+"No se puede autenticar al servidor\n"
+"Error: %s"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr "Este es el asistente para enviar mails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr "Los emails serán enviados desde esta cuenta aprobada"
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr "Formato mail"
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Carpeta"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr "Cuentas de la compañía"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr "Introduzca el número de puerto, p.ej. 25 o 587"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr "plantilla email"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+"El correo de la cuenta %s ha fallado. Causa probable: Cuenta no aprobada"
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr "Asistente correo simple - Paso 1"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr "Contiene datos adjuntos"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr "Sin descripción"
+
+#, python-format
+#~ msgid "Copy of template "
+#~ msgstr "Copia de plantilla "
diff --git a/addons/email_template/i18n/et.po b/addons/email_template/i18n/et.po
new file mode 100644
index 00000000000..89e8072cfcd
--- /dev/null
+++ b/addons/email_template/i18n/et.po
@@ -0,0 +1,1280 @@
+# Estonian 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-10-11 18:04+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr "Aruande failinimi"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Sisu"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "E-posti kontod"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Saada kõik kirjad"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Heakskiidetud"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Konto"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Saada kiri"
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Kinnita konto"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "OK"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Lisatud failid"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr "Hoiatus"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Kontod"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+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,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,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 ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+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_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:48
+#, python-format
+msgid "Error sending mail: %s"
+msgstr ""
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:104
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,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,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr ""
diff --git a/addons/email_template/i18n/fi.po b/addons/email_template/i18n/fi.po
index aa8950258ee..0ffff55c06f 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: 2011-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 13628)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -172,7 +172,7 @@ msgstr "HTML koodi"
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Lähetä sähköpostia"
 
 #. module: email_template
 #: help:email_template.account,name:0
@@ -331,6 +331,8 @@ msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
 msgstr ""
+"Vihje. Useita sähköposteja lähetään samalla kielellä (ensimmäistä "
+"ehdotetaan). Ehdotamme että lähetät sähköpostit ryhminä kielikohtaisesti."
 
 #. module: email_template
 #: help:email_template.preview,reply_to:0
@@ -538,26 +540,27 @@ msgid ""
 "When a relation field is used this field will show you the type of field you "
 "have selected"
 msgstr ""
+"Kun suhdekenttää käytetään tämä kenttä näyttää valitsemasi kentän tyypin"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "HTML Body"
-msgstr ""
+msgstr "HTML runko"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Suspend Account"
-msgstr ""
+msgstr "Lukitse käyttäjätili"
 
 #. module: email_template
 #: help:email.template,null_value:0
 msgid "This Value is used if the field is empty"
-msgstr ""
+msgstr "Tätä arvoa käytetään jos kenttä on tyhjä"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Preview Template"
-msgstr ""
+msgstr "Esikatsele mallipohja"
 
 #. module: email_template
 #: field:email_template.account,smtpserver:0
@@ -569,6 +572,7 @@ msgstr "Palvelin"
 msgid ""
 "Copy and paste the value in the location you want to use a system value."
 msgstr ""
+"Kopioi ja liitä arvo kohteeseen jossa haluat käyttää järjestelmäarvoa."
 
 #. module: email_template
 #: help:email.template,track_campaign_item:0
@@ -594,7 +598,7 @@ msgstr "Allekirjoitus"
 #. module: email_template
 #: field:email.template,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "Alamalli"
 
 #. module: email_template
 #: view:email.template:0
@@ -604,27 +608,27 @@ msgstr "Valinnat"
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (Plain Text)"
-msgstr ""
+msgstr "Runko (pelkkä teksti)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Text)"
-msgstr ""
+msgstr "Runko (teksti)"
 
 #. module: email_template
 #: field:email_template.mailbox,date_mail:0
 msgid "Rec/Sent Date"
-msgstr ""
+msgstr "Vastaanotto/lähetys päivä"
 
 #. module: email_template
 #: selection:email_template.account,state:0
 msgid "Initiated"
-msgstr ""
+msgstr "Aloitettu"
 
 #. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
-msgstr ""
+msgstr "Lähetettävä raportti"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -634,84 +638,84 @@ msgstr "Palvelimen tiedot"
 #. module: email_template
 #: field:email_template.send.wizard,generated:0
 msgid "No of generated Mails"
-msgstr ""
+msgstr "Luotujen sähköpostien määrä"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Mail Details"
-msgstr ""
+msgstr "Sähköpostin yksityiskohdat"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
-msgstr ""
+msgstr "SMTP palvelin tai portti ei ole määritelty"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "Huom: tämä on raaka HTML:ää."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Group by..."
-msgstr ""
+msgstr "Ryhmittele.."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Multiple Mail Wizard Step 1"
-msgstr ""
+msgstr "Monen sähköpostin velho, vaihe 1"
 
 #. module: email_template
 #: field:email_template.account,user:0
 msgid "Related User"
-msgstr ""
+msgstr "Liittyvä käyttäjä"
 
 #. module: email_template
 #: field:email_template.mailbox,body_html:0
 msgid "Body (Rich Text Clients Only)"
-msgstr ""
+msgstr "Runko (vain rich text clientit)"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "Yes"
-msgstr ""
+msgstr "Kyllä"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 msgid "Window Action"
-msgstr ""
+msgstr "Ikkunan toiminto"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
-msgstr ""
+msgstr "HTML, muuten teksti"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Drafts"
-msgstr ""
+msgstr "Luonnokset"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #. module: email_template
 #: field:email_template.account,smtpport:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP portti"
 
 #. module: email_template
 #: field:email_template.mailbox,mail_type:0
 msgid "Mail Contents"
-msgstr ""
+msgstr "Sähköpostin sisältö"
 
 #. module: email_template
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "Mallipohjan nimen tulee olla uniikki !"
 
 #. module: email_template
 #: field:email.template,def_bcc:0
@@ -719,22 +723,22 @@ msgstr ""
 #: field:email_template.preview,bcc:0
 #: field:email_template.send.wizard,bcc:0
 msgid "BCC"
-msgstr ""
+msgstr "Piilokopio"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
-msgstr ""
+msgstr "raakateksti"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Mallin sisäinen nimi"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -742,12 +746,12 @@ msgstr ""
 #: field:email_template.preview,message_id:0
 #: field:email_template.send.wizard,message_id:0
 msgid "Message-ID"
-msgstr ""
+msgstr "Viestin ID"
 
 #. module: email_template
 #: help:email_template.mailbox,server_ref:0
 msgid "Applicable for inward items only"
-msgstr ""
+msgstr "Voimassa vain saapuville yhteyksille"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -755,17 +759,20 @@ msgid ""
 "After clicking send all mails, mails will be sent to outbox and cleared in "
 "next Send/Recieve"
 msgstr ""
+"Kun olet klikannut 'lähetä kaikki sähköpostit', sähköpostit lähetetään "
+"lähtevien kansioon ja tyhjennetään seuraavan Lähetyksen/vastaanoton "
+"yhteydessä"
 
 #. module: email_template
 #: field:email_template.mailbox,state:0
 #: field:email_template.send.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Lähtevä"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:427
@@ -776,12 +783,12 @@ msgstr ""
 #. module: email_template
 #: help:email.template,use_sign:0
 msgid "the signature from the User details will be appended to the mail"
-msgstr ""
+msgstr "allekirjoitus käyttäjätiedoista lisätään tämän viestin loppuun"
 
 #. module: email_template
 #: field:email_template.send.wizard,from:0
 msgid "From Account"
-msgstr ""
+msgstr "Käyttäjätunnukselta"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
@@ -791,7 +798,7 @@ msgstr ""
 #. module: email_template
 #: view:email_template.account:0
 msgid "Request Re-activation"
-msgstr ""
+msgstr "Pyydä uudelleenaktivointia"
 
 #. module: email_template
 #: view:email.template:0
@@ -799,33 +806,33 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_all
 #: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
 msgid "Email Templates"
-msgstr ""
+msgstr "Sähköpostin mallipohjat"
 
 #. module: email_template
 #: field:email_template.account,smtpuname:0
 msgid "User Name"
-msgstr ""
+msgstr "Käyttäjätunnus"
 
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Lisäasetukset"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Outbox"
-msgstr ""
+msgstr "Lähetetyt"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Save in Drafts"
-msgstr ""
+msgstr "Tallenna luonnoksiin"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:362
@@ -834,16 +841,18 @@ msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
 "Description: %s"
 msgstr ""
+"Sähköposti tililtä %s epäonnistui. Todennäköinen syy: MIME virhe\n"
+"Kuvaus: %s"
 
 #. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #. module: email_template
 #: field:email.template,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Kieli"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:275
@@ -859,12 +868,12 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
-msgstr ""
+msgstr "Sähköpostin mallipohja"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Send/Receive"
-msgstr ""
+msgstr "Lähetä/Vastaanota"
 
 #. module: email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
@@ -875,40 +884,42 @@ msgstr ""
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
-msgstr ""
+msgstr "Keskeytetty"
 
 #. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
 "Only users from these groups will be allowed to send mails from this Template"
 msgstr ""
+"Vain näihin ryhmiin kuuluvat käyttäjät voivat lähettää sähköpostia tästä "
+"mallipohjasta"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
-msgstr ""
+msgstr "Lähetä sähköposti (%s)"
 
 #. module: email_template
 #: help:email.template,def_subject:0
 msgid "The subject of email. Placeholders can be used here."
-msgstr ""
+msgstr "Sähköpostin aihe. Viitteitä voidaankäyttää tässä."
 
 #. module: email_template
 #: field:email_template.send.wizard,report:0
 msgid "Report File Name"
-msgstr ""
+msgstr "Raportin tiedoston nimi"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "Lauseke"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,history:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: email_template
 #: view:email.template:0
@@ -917,18 +928,18 @@ msgstr ""
 #: view:email_template.send.wizard:0
 #: field:email_template.send.wizard,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Liitteet"
 
 #. module: email_template
 #: field:email_template.preview,to:0
 #: field:email_template.send.wizard,to:0
 msgid "To"
-msgstr ""
+msgstr "Vastaanottaja"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Text, otherwise HTML"
-msgstr ""
+msgstr "Teksti, muuten HTML"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:319
@@ -939,44 +950,44 @@ msgstr ""
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Discard Mail"
-msgstr ""
+msgstr "Hylkää sähköposti"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Sähköpostipohjat malleille"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: email_template
 #: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
-msgstr ""
+msgstr "Virhe sähköpostin lähetyksessä: %s"
 
 #. module: email_template
 #: constraint:email_template.account:0
 msgid "Error: You are not allowed to have more than 1 account."
-msgstr ""
+msgstr "Virhe! sinulla ei saa olla enempää kuin 1 käyttäjätili"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
-msgstr ""
+msgstr "Runko (HTML vain web client)"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
-msgstr ""
+msgstr "%s (sähköpostiliite)"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Sending"
-msgstr ""
+msgstr "Lähetetään"
 
 #. module: email_template
 #: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
@@ -990,22 +1001,22 @@ msgstr ""
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
-msgstr ""
+msgstr "Sallitut käyttäjäryhmät"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
 msgid "Field"
-msgstr ""
+msgstr "Kenttä"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "User Information"
-msgstr ""
+msgstr "Käyttäjän tiedot"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Actions"
-msgstr ""
+msgstr "Toiminnot"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:363
@@ -1015,6 +1026,8 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"Palvelimen lähetysvirhe\n"
+"Kuvaus: %s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -1022,22 +1035,24 @@ msgid ""
 "Name of the generated report file. Placeholders can be used in the filename. "
 "eg: 2009_SO003.pdf"
 msgstr ""
+"Luodun raporttitiedoston nimi. Viitteitä voidaan käyttää tiedostonnimissä "
+"esim. 2009_S0003.pdf"
 
 #. module: email_template
 #: help:email_template.mailbox,date_mail:0
 msgid "Date on which Email Sent or Received"
-msgstr ""
+msgstr "Päivä jolloin sähköposti lähettettiin tai vastaanotettiin"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Trash"
-msgstr ""
+msgstr "Roskalaatikko"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_mailbox
 msgid "Email Mailbox"
-msgstr ""
+msgstr "Sähköpostin postilaatikko"
 
 #. module: email_template
 #: code:addons/email_template/email_template_mailbox.py:104
@@ -1046,38 +1061,41 @@ msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
 "Error: %s"
 msgstr ""
+"Sähköpostin %s lähetys epäonnistui. Todennäköinen syy: Ei voitu kirjautua "
+"palvelimelle\n"
+"Virhe: %s"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
-msgstr ""
+msgstr "Puuttuva sähköpostitili"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
-msgstr ""
+msgstr "SMTP testiyhteys onnistui"
 
 #. module: email_template
 #: model:ir.module.module,shortdesc:email_template.module_meta_information
 msgid "Email Template for OpenERP"
-msgstr ""
+msgstr "Sähköposti mallipohja OpenERP:ille"
 
 #. module: email_template
 #: field:email_template.account,name:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Create Action"
-msgstr ""
+msgstr "Luo toiminto"
 
 #. module: email_template
 #: help:email_template.account,smtpserver:0
 msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
-msgstr ""
+msgstr "Syötä lähtevän sähköpostin palvelimen nimi esim. smtp.omadomain.com"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -1085,6 +1103,8 @@ msgid ""
 "You may attach existing files to this template, so they will be added in all "
 "emails created from this template"
 msgstr ""
+"Voit liitää olemassaolevia tiedostoja tähän mallipohjaan, jolloin ne "
+"lisätään kaikkiin sähköposteihin jotka lähetetään tästä pohjasta"
 
 #. module: email_template
 #: help:email.template,message_id:0
@@ -1093,22 +1113,25 @@ msgid ""
 "that this overrides the Resource tracking option! Placeholders can be used "
 "here."
 msgstr ""
+"Määrittele viestin-ID SMTP otsikko jota käytetään lähtevissä sähköposteissa. "
+"Ole hyvä ja huomaa että tämä korvaa resurssien seurantavaihtoehdon. "
+"Viitteittä voidaan käyttää tässä."
 
 #. module: email_template
 #: field:email.template,def_to:0
 #: field:email_template.mailbox,email_to:0
 msgid "Recipient (To)"
-msgstr ""
+msgstr "Vastaanottaja (To)"
 
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
-msgstr ""
+msgstr "Nolla-arvo"
 
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
-msgstr ""
+msgstr "Mallipohjan kieli"
 
 #. module: email_template
 #: field:email.template,def_cc:0
@@ -1116,27 +1139,27 @@ msgstr ""
 #: field:email_template.preview,cc:0
 #: field:email_template.send.wizard,cc:0
 msgid "CC"
-msgstr ""
+msgstr "Kopio"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Sent"
-msgstr ""
+msgstr "Lähetetyt"
 
 #. module: email_template
 #: sql_constraint:email_template.account:0
 msgid "Another setting already exists with this email ID !"
-msgstr ""
+msgstr "Toinen asetus on jo olemassa tälle sähköposti ID:lle !"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
 msgid "Action that will open this email template on Resource records"
-msgstr ""
+msgstr "Toiminto joka aukaisee tämän sähköpostimallinen resurssitiedoissa"
 
 #. module: email_template
 #: field:email_template.account,smtppass:0
 msgid "Password"
-msgstr ""
+msgstr "Salasana"
 
 #. module: email_template
 #: help:email_template.preview,message_id:0
@@ -1145,6 +1168,9 @@ msgid ""
 "The Message-ID header value, if you need tospecify it, for example to "
 "automatically recognize the replies later. Placeholders can be used here."
 msgstr ""
+"Viestin ID otsikkoarvo, jos sinun tarvitsee määritellä se, esim. "
+"tunnistaaksesi vastaukset myöhemmin automaattisesti. Viitteitä voidaan "
+"käyttää tässä."
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1152,37 +1178,37 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
-msgstr ""
+msgstr "Sähköpostit"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Templates"
-msgstr ""
+msgstr "Viestipohjat"
 
 #. module: email_template
 #: field:email_template.preview,report:0
 msgid "Report Name"
-msgstr ""
+msgstr "Raportin nimi"
 
 #. module: email_template
 #: field:email.template,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: email_template
 #: field:email.template,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "Resurssien seuranta"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "Sähköpostin mallipohjan esikatselu"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
-msgstr ""
+msgstr "Sähköpostin esikatselu"
 
 #. module: email_template
 #: help:email.template,def_to:0
@@ -1190,11 +1216,13 @@ msgid ""
 "The Recipient of email. Placeholders can be used here. e.g. "
 "${object.email_to}"
 msgstr ""
+"Vastaanottajan sähköpostiosoite. Viitteitä voidaan käyttää tässä esim. "
+"${object.email_to}"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Existing files"
-msgstr ""
+msgstr "Olemassaolevat tiedostot"
 
 #. module: email_template
 #: model:ir.module.module,description:email_template.module_meta_information
@@ -1208,7 +1236,7 @@ msgstr ""
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (HTML)"
-msgstr ""
+msgstr "Runko (html)"
 
 #. module: email_template
 #: help:email.template,table_html:0
@@ -1216,6 +1244,8 @@ msgid ""
 "Copy this html code to your HTML message body for displaying the info in "
 "your mail."
 msgstr ""
+"Kopioi tämä html kookdi html viestisi runkoon näyttääksesi sen "
+"sähköpostissasi."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_account
@@ -1226,18 +1256,18 @@ msgstr ""
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Malli"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
-msgstr ""
+msgstr "Runkoyhteyttä annettuun tunnukseen ei ole"
 
 #. module: email_template
 #: field:email_template.account,company:0
 msgid "Corporate"
-msgstr ""
+msgstr "Yrityksen"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:275
@@ -1247,47 +1277,50 @@ msgid ""
 "server\n"
 "Error: %s"
 msgstr ""
+"Sähköposti tililtä %s epäonnistui kirjautumisessa. Todennäköinen syy: Ei "
+"voitu kirjautua palvelimelle\n"
+"Virhe: %s"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
-msgstr ""
+msgstr "Tämä velho auttaa sähköpostin lähetyksessä"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
-msgstr ""
+msgstr "Osoitteet"
 
 #. module: email_template
 #: help:email.template,from_account:0
 msgid "Emails will be sent from this approved account."
-msgstr ""
+msgstr "Sähköpostit lähetetään tältä hyväksytyltä tililltä"
 
 #. module: email_template
 #: field:email_template.account,send_pref:0
 msgid "Mail Format"
-msgstr ""
+msgstr "Sähköpostin muotoilu"
 
 #. module: email_template
 #: field:email_template.mailbox,folder:0
 msgid "Folder"
-msgstr ""
+msgstr "Kansio"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Company Accounts"
-msgstr ""
+msgstr "Yrityksen käyttäjätilit"
 
 #. module: email_template
 #: help:email_template.account,smtpport:0
 msgid "Enter port number, eg: 25 or 587"
-msgstr ""
+msgstr "Anna portin numero, esim. 25 tai 587"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
-msgstr ""
+msgstr "sähköpostin mallipohja"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:280
@@ -1296,20 +1329,25 @@ msgstr ""
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
+"Sähköposti tililtä %s epäonnistui. Todennäköinen syy:Ttiliä ei ole hyväksytty"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Simple Mail Wizard Step 1"
-msgstr ""
+msgstr "Yksinkertainen sähköpostivelho, vaihe 1"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Has Attachments"
-msgstr ""
+msgstr "Sisältää liitteitä"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:452
 #: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
-msgstr ""
+msgstr "Ei kuvausta"
+
+#, python-format
+#~ msgid "Copy of template "
+#~ msgstr "Mallipohjan kopio "
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index 52986623381..06e24d68705 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-05-21 07:42+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-05-22 04:47+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -733,7 +733,7 @@ msgstr "Copie cachée"
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
-msgstr "Plein texte"
+msgstr "Texte brut"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1367,30 +1367,6 @@ msgstr "Possède des pièces jointes"
 msgid "No Description"
 msgstr "Pas de description"
 
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Modèles Mako non installés"
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Copie du modèle "
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle incorrect dans la définition de l'action"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Paramètres incorrects"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML incorrect dans l'architecture de la vue !"
-
-#~ msgid ""
-#~ "An email template is an email document that will be sent as part of a "
-#~ "marketing campaign. You can personalize it based on specific customer "
-#~ "profile fields so that their names or other partner related information can "
-#~ "be automatically inserted in it."
-#~ msgstr ""
-#~ "Un modèle de courriel est un courriel qui sera envoyé lors d'une campagne "
-#~ "marketing. Vous pouvez le personnaliser en fonction de champs propres à "
-#~ "chaque client, de façon à ce que leur noms ou d'autres informations du "
-#~ "partenaire soient insérées automatiquement."
diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po
index a6e1f74e79d..fdf2966a833 100644
--- a/addons/email_template/i18n/hu.po
+++ b/addons/email_template/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 15:51+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -916,7 +917,7 @@ msgid "Close"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Hiba a levél küldésekor: %s"
@@ -1006,7 +1007,7 @@ msgid "Email Mailbox"
 msgstr "E-mail postafiók"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1114,7 +1115,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "E-mailek"
 
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index 7a4a84476ca..4665ee3398b 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -967,7 +967,7 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Errore inviando l'email: %s"
@@ -1059,7 +1059,7 @@ msgid "Email Mailbox"
 msgstr "Email Mailbox"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1175,7 +1175,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Email"
 
@@ -1350,52 +1352,6 @@ msgstr "Presenta allegati"
 msgid "No Description"
 msgstr "Nessuna descrizione"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Template MAKO non installati"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argomenti non validi"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Template DJANGO non installati"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid ""
-#~ "An email template is an email document that will be sent as part of a "
-#~ "marketing campaign. You can personalize it based on specific customer "
-#~ "profile fields so that their names or other partner related information can "
-#~ "be automatically inserted in it."
-#~ msgstr ""
-#~ "Un \"template email\" è un documento email che viene spedito come parte di "
-#~ "una campagna marketing. E' possibile personalizzarlo basandosi su uno "
-#~ "specifico campo del profilo cliente, così facendo i loro nomi, o altre "
-#~ "informazioni ad essi relativi, possono essere automaticamente inseriti."
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Copia del modello "
diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po
index b428a222d2c..1044dfcd223 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -941,7 +941,7 @@ msgid "Close"
 msgstr "Хаах"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -1031,7 +1031,7 @@ msgid "Email Mailbox"
 msgstr "Шуудангийн хайрцаг"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1146,7 +1146,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Э-мэйлүүд"
 
@@ -1318,54 +1320,6 @@ msgstr "Has Attachments"
 msgid "No Description"
 msgstr "Тайлбаргүй"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Алдаатай аргумент"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#, python-format
-#~ msgid ""
-#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-#~ msgstr ""
-#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! You can not create recursive Menu."
-
-#, python-format
-#~ msgid ""
-#~ "Error sending mail: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-#~ msgstr ""
-#~ "Error sending mail: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Django templates not installed"
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Хуулбарлах "
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
index e43201d966a..830c4ded3ae 100644
--- a/addons/email_template/i18n/nb.po
+++ b/addons/email_template/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -919,7 +919,7 @@ msgid "Close"
 msgstr "Lukk"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Feil ved sending av e-post: %s"
@@ -1007,7 +1007,7 @@ msgid "Email Mailbox"
 msgstr "E-post postkasse"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1115,7 +1115,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "E-poster"
 
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index df4a9f6eb2e..821f347edba 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -967,7 +967,7 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Fout bij het verzenden van mail: %s"
@@ -1063,7 +1063,7 @@ msgid "Email Mailbox"
 msgstr "Email postvak"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1182,7 +1182,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Emails"
 
@@ -1358,135 +1360,6 @@ msgstr "Heeft bijlagen"
 msgid "No Description"
 msgstr "Geen beschrijving"
 
-#~ msgid "Email Data"
-#~ msgstr "Email Data"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid "My Accounts"
-#~ msgstr "Mijn accounts"
-
-#~ msgid "E-MAIL Templates"
-#~ msgstr "E-MAIL Sjablonen"
-
-#~ msgid "Download Full Mail"
-#~ msgstr "Download volledig bericht"
-
-#~ msgid "The default recipient of email.Placeholders can be used here."
-#~ msgstr ""
-#~ "De standaard ontvanger van email. Hierin kunnen plaatsvervangers worden "
-#~ "gebruikt."
-
-#~ msgid "Mailboxes"
-#~ msgstr "Mailboxen"
-
-#~ msgid "Track campaign items"
-#~ msgstr "Volg campagne items"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Ongeldige argumenten"
-
-#~ msgid "SMTP Server"
-#~ msgstr "SMTP Server"
-
-#~ msgid ""
-#~ "Add here all attachments of the current document you want to include in the "
-#~ "e-mail."
-#~ msgstr ""
-#~ "Voeg hier alle bijlagen van het huidige document toe die u wilt bijvoegen "
-#~ "bij de email."
-
-#~ msgid "The default subject of email. Placeholders can be used here."
-#~ msgstr ""
-#~ "Het standaard-onderwerp van email. Plaatsvervangers kunnen hier worden "
-#~ "gebruikt."
-
-#, python-format
-#~ msgid ""
-#~ "Error sending mail: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-#~ msgstr ""
-#~ "Fout bij versturen mail: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Sjabloon kopie "
-
-#~ msgid ""
-#~ "File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
-#~ msgstr ""
-#~ "Bestandsnaam patroon kan met plaatsvervangers worden opgegeven.bijv. "
-#~ "2009_SO003.pdf"
-
-#~ msgid "Enter port number,eg:SMTP-587 "
-#~ msgstr "Vul poortnummer in, bijv. SMTP-587 "
-
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Mako sjablonen niet geïnstalleerd"
-
-#~ msgid "eg: yourname@yourdomain.com "
-#~ msgstr "bijv: uwnaam@uwdomein.nl "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#, python-format
-#~ msgid ""
-#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-#~ msgstr ""
-#~ "Datumtijd extractie mislukt.Datum:%s \\n                      \tFout:%s"
-
-#, python-format
-#~ msgid ""
-#~ "Mail from Account %s failed. Probable Reason:Server Send Error\n"
-#~ "Description: %s"
-#~ msgstr ""
-#~ "Mail van account %s mislukt. Waarschijnlijke reden:Server verzend fout\n"
-#~ "Omschrijving: %s"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Django sjablonen niet geïnstalleerd"
-
-#~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid ""
-#~ "An email template is an email document that will be sent as part of a "
-#~ "marketing campaign. You can personalize it based on specific customer "
-#~ "profile fields so that their names or other partner related information can "
-#~ "be automatically inserted in it."
-#~ msgstr ""
-#~ "Een email sjabloon is een email document dat wordt verstuurd als onderdeel "
-#~ "van een marketing campagne. U kunt het personaliseren op basis van "
-#~ "specifieke velden zodat hun namen of andere relatie informatie automatisch "
-#~ "kan worden ingevoegd."
diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po
index 9d95146cca2..bedc581874f 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -927,7 +927,7 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -1015,7 +1015,7 @@ msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1128,7 +1128,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Wiadomości e-mail"
 
@@ -1294,71 +1296,3 @@ msgstr "Zawiera załącznik"
 #, python-format
 msgid "No Description"
 msgstr "Brak opisu"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "My Accounts"
-#~ msgstr "Moje konta"
-
-#~ msgid "Mailboxes"
-#~ msgstr "Skrzynki pocztowe"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Niepoprawne argumenty"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "SMTP Server"
-#~ msgstr "Serwer SMTP"
-
-#~ 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 "Email Data"
-#~ msgstr "Dane wiadomości"
-
-#~ msgid ""
-#~ "File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
-#~ msgstr "Wzór nazwy pliku np. 2009_SO003.pdf"
-
-#~ msgid "Enter port number,eg:SMTP-587 "
-#~ msgstr "Wrpowadź numer portu, np:SMTP-587 "
-
-#~ msgid "E-MAIL Templates"
-#~ msgstr "Szablony E-MAIL"
-
-#~ msgid "Download Full Mail"
-#~ msgstr "Pobierz całą wiadomość"
-
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Szablony Mako nie zainstalowane"
-
-#~ msgid "The default recipient of email.Placeholders can be used here."
-#~ msgstr ""
-#~ "Domyślny odbiorca wiadomości. Można stosować równoznaczniki znaków "
-#~ "(wildcards)."
-
-#~ msgid "eg: yourname@yourdomain.com "
-#~ msgstr "np: twojanazwa@twojadomena.com "
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "File Name Pattern"
-#~ msgstr "Wzór nazwy pliku"
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Nie zainstalowano szablonów Django"
-
-#~ msgid "Personal Accounts"
-#~ msgstr "Konta personalne"
-
-#~ msgid "Default Subject"
-#~ msgstr "Domyślny temat"
diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po
index 916eecaf051..3eb64d746ca 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -927,7 +927,7 @@ msgid "Close"
 msgstr "Fechar"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Erro no envio do correio: %s"
@@ -1017,7 +1017,7 @@ msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1126,7 +1126,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Mensagens"
 
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index 1c6ad42cd2f..76ba1e32d9a 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -950,7 +950,7 @@ msgid "Close"
 msgstr "Fechar"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Erro ao enviar e-mail: %s"
@@ -1038,7 +1038,7 @@ msgid "Email Mailbox"
 msgstr "Caixa de E-mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1146,7 +1146,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "E-mails"
 
diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po
index 11c4749b855..2d7bc82384a 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -931,7 +931,7 @@ msgid "Close"
 msgstr "Închide"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -1019,7 +1019,7 @@ msgid "Email Mailbox"
 msgstr "Căsuţă de e-mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1127,7 +1127,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Email-uri"
 
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 6a4c4765e30..5f6a84f4eca 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -54,12 +54,12 @@ msgstr "Личные сообщения"
 #. module: email_template
 #: field:email.template,file_name:0
 msgid "Report Filename"
-msgstr ""
+msgstr "Файл отчета"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content  "
-msgstr ""
+msgstr "Содержание письма  "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -135,6 +135,8 @@ msgid ""
 "Specify the username if your SMTP server requires authentication, otherwise "
 "leave it empty."
 msgstr ""
+"Задайте имя пользователя, если SMTP сервер требует авторизации, или оставьте "
+"пустым."
 
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
@@ -157,7 +159,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Account"
-msgstr ""
+msgstr "Учётная запись"
 
 #. module: email_template
 #: field:email.template,table_html:0
@@ -194,6 +196,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Добавьте сюда все приложения к текущему документу, которые вы хотите "
+"включить в эл. письмо."
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -258,7 +262,7 @@ msgstr "ОК"
 #. module: email_template
 #: field:email_template.account,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Авто удаление"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
@@ -319,6 +323,8 @@ msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
 msgstr ""
+"Совет: Несколько писем посылаются на одном языке (первом предложенном). Мы "
+"предлагаем вам отправлять письма группами в зависимости от языка."
 
 #. module: email_template
 #: help:email_template.preview,reply_to:0
@@ -392,7 +398,7 @@ msgstr "Тело (текст - только веб-клиент)"
 #: field:email_template.account,state:0
 #: view:email_template.mailbox:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
@@ -402,13 +408,13 @@ msgstr "Кнопка мастера"
 #. module: email_template
 #: help:email_template.account,email_id:0
 msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
-msgstr ""
+msgstr "пример: 'petrov@pkb.ru' или 'Илья Петров <petrov@pkb.ru>'"
 
 #. module: email_template
 #: view:email.template:0
 #: field:email.template,object_name:0
 msgid "Resource"
-msgstr ""
+msgstr "Ресурс"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:255
@@ -436,7 +442,7 @@ msgstr "Шаблоны Mako"
 #: help:email.template,def_body_html:0
 #: help:email.template,def_body_text:0
 msgid "The text version of the mail"
-msgstr ""
+msgstr "Тексовая версия письма"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:449
@@ -447,7 +453,7 @@ msgstr " (Вложенный файл)"
 #. module: email_template
 #: selection:email_template.mailbox,folder:0
 msgid "Sent Items"
-msgstr ""
+msgstr "Отправленные"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -472,6 +478,8 @@ msgid ""
 "Button in the side bar of the form view of this Resource that will invoke "
 "the Window Action"
 msgstr ""
+"Кнопка на боковой панели формы ввода ресурса, которая будет вызывать окно "
+"действия"
 
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
@@ -493,7 +501,7 @@ msgstr "Отчет"
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 msgid "Sub Field"
-msgstr ""
+msgstr "Дополнительное поле"
 
 #. module: email_template
 #: view:email.template:0
@@ -504,7 +512,7 @@ msgstr "Продвинутый"
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "My Emails"
-msgstr ""
+msgstr "Мои письма"
 
 #. module: email_template
 #: view:email.template:0
@@ -516,7 +524,7 @@ msgstr ""
 msgid ""
 "When a relation field is used this field will show you the type of field you "
 "have selected"
-msgstr ""
+msgstr "При использовании связанного поля, это поле покажет вам его тип"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
@@ -575,7 +583,7 @@ msgstr "Подмодель"
 #. module: email_template
 #: view:email.template:0
 msgid "Options"
-msgstr ""
+msgstr "Настройки"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -595,7 +603,7 @@ msgstr "Дата записи/передачи"
 #. module: email_template
 #: selection:email_template.account,state:0
 msgid "Initiated"
-msgstr ""
+msgstr "Начато"
 
 #. module: email_template
 #: field:email.template,report_template:0
@@ -631,7 +639,7 @@ msgstr "Примечание: Этот HTML сырой"
 #. module: email_template
 #: view:email.template:0
 msgid "Group by..."
-msgstr ""
+msgstr "Группировать по..."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
@@ -641,7 +649,7 @@ msgstr "Мастер создания писем"
 #. module: email_template
 #: field:email_template.account,user:0
 msgid "Related User"
-msgstr ""
+msgstr "Относится к пользователю"
 
 #. module: email_template
 #: field:email_template.mailbox,body_html:0
@@ -651,43 +659,43 @@ msgstr ""
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 msgid "Window Action"
-msgstr ""
+msgstr "Действие окна"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
-msgstr ""
+msgstr "HTML, в противном случае текст"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Drafts"
-msgstr ""
+msgstr "Черновики"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "No"
-msgstr ""
+msgstr "Нет"
 
 #. module: email_template
 #: field:email_template.account,smtpport:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP порт"
 
 #. module: email_template
 #: field:email_template.mailbox,mail_type:0
 msgid "Mail Contents"
-msgstr ""
+msgstr "Содержимое письма"
 
 #. module: email_template
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "Название шаблона  должно быть уникальным!"
 
 #. module: email_template
 #: field:email.template,def_bcc:0
@@ -695,22 +703,22 @@ msgstr ""
 #: field:email_template.preview,bcc:0
 #: field:email_template.send.wizard,bcc:0
 msgid "BCC"
-msgstr ""
+msgstr "Скрытая копия"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
-msgstr ""
+msgstr "Простой текст"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Внутреннее название модели"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -718,7 +726,7 @@ msgstr ""
 #: field:email_template.preview,message_id:0
 #: field:email_template.send.wizard,message_id:0
 msgid "Message-ID"
-msgstr ""
+msgstr "Идентификатор сообщения"
 
 #. module: email_template
 #: help:email_template.mailbox,server_ref:0
@@ -736,12 +744,12 @@ msgstr ""
 #: field:email_template.mailbox,state:0
 #: field:email_template.send.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Исходящие"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:427
@@ -775,33 +783,33 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_all
 #: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
 msgid "Email Templates"
-msgstr ""
+msgstr "Шаблоны писем"
 
 #. module: email_template
 #: field:email_template.account,smtpuname:0
 msgid "User Name"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Расширенные настройки"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Outbox"
-msgstr ""
+msgstr "Исходящие"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Save in Drafts"
-msgstr ""
+msgstr "Сохранить в черновики"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:362
@@ -835,7 +843,7 @@ msgstr "Язык"
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
-msgstr ""
+msgstr "Шаблон письма"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -851,13 +859,15 @@ msgstr ""
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
-msgstr ""
+msgstr "Приостановлено"
 
 #. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
 "Only users from these groups will be allowed to send mails from this Template"
 msgstr ""
+"Только пользователям этих групп будет разрешено отправлять письма по этому "
+"шаблону"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:284
@@ -873,18 +883,18 @@ msgstr ""
 #. module: email_template
 #: field:email_template.send.wizard,report:0
 msgid "Report File Name"
-msgstr ""
+msgstr "Имя файла отчета"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "Выражение"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,history:0
 msgid "History"
-msgstr ""
+msgstr "История"
 
 #. module: email_template
 #: view:email.template:0
@@ -893,18 +903,18 @@ msgstr ""
 #: view:email_template.send.wizard:0
 #: field:email_template.send.wizard,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Прикрепленные файлы"
 
 #. module: email_template
 #: field:email_template.preview,to:0
 #: field:email_template.send.wizard,to:0
 msgid "To"
-msgstr ""
+msgstr "Кому"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Text, otherwise HTML"
-msgstr ""
+msgstr "Текст, в противном случае HTML"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:319
@@ -915,28 +925,28 @@ msgstr ""
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Discard Mail"
-msgstr ""
+msgstr "Отменить письмо"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Шаблоны писем для моделей"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
-msgstr ""
+msgstr "Ошибка при отправлении письма: %s"
 
 #. module: email_template
 #: constraint:email_template.account:0
 msgid "Error: You are not allowed to have more than 1 account."
-msgstr ""
+msgstr "Ошибка: вы не можете иметь больше одной учетной записи."
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -947,7 +957,7 @@ msgstr ""
 #: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
-msgstr ""
+msgstr "%s (приложение к эл. письму)"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
@@ -962,26 +972,30 @@ msgid ""
 "profile fields, so that a partner name or other partner related information "
 "may be inserted automatically."
 msgstr ""
+"Шаблон эл. письма это электронный документ, который будет отправлен как "
+"часть маркетинговой кампании. Вы можете настроить его в соответствии с "
+"конкретными полями профиля клиена, так что имя партнера или другогая "
+"информация может быть вставлена автоматически."
 
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
-msgstr ""
+msgstr "Разрешенные группы пользователя"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
 msgid "Field"
-msgstr ""
+msgstr "Поле"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "User Information"
-msgstr ""
+msgstr "Информация о пользователе"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Actions"
-msgstr ""
+msgstr "Действия"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:363
@@ -991,6 +1005,8 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"Ошибка отправки сервером\n"
+"Описание: %s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -1002,13 +1018,13 @@ msgstr ""
 #. module: email_template
 #: help:email_template.mailbox,date_mail:0
 msgid "Date on which Email Sent or Received"
-msgstr ""
+msgstr "Дата, на которую сообщение, отправлено или получено"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Trash"
-msgstr ""
+msgstr "Корзина"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_mailbox
@@ -1016,7 +1032,7 @@ msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1036,27 +1052,27 @@ msgstr ""
 #: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
-msgstr ""
+msgstr "Тест SMTP - соединение было успешным"
 
 #. module: email_template
 #: model:ir.module.module,shortdesc:email_template.module_meta_information
 msgid "Email Template for OpenERP"
-msgstr ""
+msgstr "Шаблон электронной почты для OpenERP"
 
 #. module: email_template
 #: field:email_template.account,name:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Create Action"
-msgstr ""
+msgstr "Создать действие"
 
 #. module: email_template
 #: help:email_template.account,smtpserver:0
 msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
-msgstr ""
+msgstr "Введите имя сервера исходящей почты, например: smtp.yourdomain.com"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -1084,12 +1100,12 @@ msgstr "Получатель (Кому)"
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
-msgstr ""
+msgstr "Нулевое значение"
 
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
-msgstr ""
+msgstr "Язык шаблонов"
 
 #. module: email_template
 #: field:email.template,def_cc:0
@@ -1097,12 +1113,12 @@ msgstr ""
 #: field:email_template.preview,cc:0
 #: field:email_template.send.wizard,cc:0
 msgid "CC"
-msgstr ""
+msgstr "Копия"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Sent"
-msgstr ""
+msgstr "Отправлено"
 
 #. module: email_template
 #: sql_constraint:email_template.account:0
@@ -1117,7 +1133,7 @@ msgstr ""
 #. module: email_template
 #: field:email_template.account,smtppass:0
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #. module: email_template
 #: help:email_template.preview,message_id:0
@@ -1129,24 +1145,26 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
-msgstr ""
+msgstr "Эл. почта"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Templates"
-msgstr ""
+msgstr "Шаблоны"
 
 #. module: email_template
 #: field:email_template.preview,report:0
 msgid "Report Name"
-msgstr ""
+msgstr "Название отчета"
 
 #. module: email_template
 #: field:email.template,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: email_template
 #: field:email.template,track_campaign_item:0
@@ -1156,12 +1174,12 @@ msgstr ""
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "Предпросмотр шаблона письма"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
-msgstr ""
+msgstr "Предпросмотр письма"
 
 #. module: email_template
 #: help:email.template,def_to:0
@@ -1173,7 +1191,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Existing files"
-msgstr ""
+msgstr "Существующие файлы"
 
 #. module: email_template
 #: model:ir.module.module,description:email_template.module_meta_information
@@ -1205,7 +1223,7 @@ msgstr "email_template.account"
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Модель"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:236
@@ -1232,27 +1250,27 @@ msgstr ""
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
-msgstr ""
+msgstr "Это мастер для отправки почты"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
-msgstr ""
+msgstr "Адреса"
 
 #. module: email_template
 #: help:email.template,from_account:0
 msgid "Emails will be sent from this approved account."
-msgstr ""
+msgstr "Эл. письма будут отправлены с этой утвержденной учетной записи."
 
 #. module: email_template
 #: field:email_template.account,send_pref:0
 msgid "Mail Format"
-msgstr ""
+msgstr "Формат письма"
 
 #. module: email_template
 #: field:email_template.mailbox,folder:0
 msgid "Folder"
-msgstr ""
+msgstr "Папка"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1262,7 +1280,7 @@ msgstr ""
 #. module: email_template
 #: help:email_template.account,smtpport:0
 msgid "Enter port number, eg: 25 or 587"
-msgstr ""
+msgstr "Введите порт, например: 25 или 587"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:59
@@ -1281,7 +1299,7 @@ msgstr ""
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Simple Mail Wizard Step 1"
-msgstr ""
+msgstr "Простой помощник почты. Шаг 1"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
@@ -1295,44 +1313,6 @@ msgstr ""
 msgid "No Description"
 msgstr ""
 
-#~ msgid "Email Data"
-#~ msgstr "Данные электронной почты"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "My Accounts"
-#~ msgstr "Мои аккаунты"
-
-#~ msgid ""
-#~ "File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
-#~ msgstr ""
-#~ "Образец названия файла может быть определен например как: 2009_SO003.pdf"
-
-#~ msgid "Enter port number,eg:SMTP-587 "
-#~ msgstr "Введите номер порта, например: SMTP-587 "
-
-#~ msgid "E-MAIL Templates"
-#~ msgstr "Шаблон письма"
-
-#~ msgid "Download Full Mail"
-#~ msgstr "Скачать письмо целиком"
-
 #, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Шаблоны Mako не установлены"
-
-#~ msgid "The default recipient of email.Placeholders can be used here."
-#~ msgstr "Не указан получатель письма. Укажите его здесь."
-
-#~ msgid "Mailboxes"
-#~ msgstr "Почтовые ящики"
-
-#~ msgid "eg: yourname@yourdomain.com "
-#~ msgstr "например: yourname@yourdomain.com "
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Недопустимые параметры"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для просмотра архитектуры!"
+#~ msgid "Copy of template "
+#~ msgstr "Копия шаблона "
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index 823b249b737..f436bfbdfab 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -962,7 +962,7 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -1052,7 +1052,7 @@ msgid "Email Mailbox"
 msgstr "Postansko Sanduce"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1170,7 +1170,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Email-ovi"
 
@@ -1344,143 +1346,6 @@ msgstr "Ima Attachment"
 msgid "No Description"
 msgstr "Bez Opisa"
 
-#~ msgid "Email Data"
-#~ msgstr "Podaci Email-a"
-
-#~ msgid "My Accounts"
-#~ msgstr "Moji Nalozi"
-
-#~ msgid ""
-#~ "File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
-#~ msgstr ""
-#~ "Ime fajla moze biti napisano i sa razmaknicama( donja crta) npr "
-#~ "2009_SO003.pdf"
-
-#~ msgid "Enter port number,eg:SMTP-587 "
-#~ msgstr "Upisi broj Port-a npr SMTP-587 "
-
-#~ msgid "E-MAIL Templates"
-#~ msgstr "E-MAIL Obrasci"
-
-#~ msgid "Download Full Mail"
-#~ msgstr "Download Celu poruku"
-
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Mako Obrazac nije instaliran"
-
-#~ msgid "The default recipient of email.Placeholders can be used here."
-#~ msgstr ""
-#~ "Predlozeni primalac Email-a. Razmaknice se mogu koristiti ( donja crta)"
-
-#~ msgid "Mailboxes"
-#~ msgstr "Postanski Sanducici"
-
-#~ msgid "Track campaign items"
-#~ msgstr "Prati stavke Kampanje"
-
-#~ msgid "eg: yourname@yourdomain.com "
-#~ msgstr "npr: yourname@yourdomain.com "
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#, python-format
-#~ msgid ""
-#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-#~ msgstr ""
-#~ "Preuzimanje datuma i vremena nije uspelo. Datum:Date:%s \\n \tGreska:%s"
-
-#~ msgid "SMTP Server"
-#~ msgstr "SMTP server"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "Add here all attachments of the current document you want to include in the "
-#~ "e-mail."
-#~ msgstr ""
-#~ "Ubaci ovde sve attachmente za dati dokument koji zelis da prikljucis poruci"
-
-#~ msgid "The default subject of email. Placeholders can be used here."
-#~ msgstr ""
-#~ "Podrazumevana Tema poruke. Razmaknice se mogu ovde koristiti ( donja crta)"
-
-#, python-format
-#~ msgid ""
-#~ "Error sending mail: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-#~ msgstr ""
-#~ "Greska slanja poruke: %s\" % str(e)))\n"
-#~ "         \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "if ids is None:\n"
-#~ "ids = []\n"
-#~ "if context is None:\n"
-#~ "context = {}\n"
-#~ "filters = [('folder', '=', 'outbox"
-
-#~ msgid "File Name Pattern"
-#~ msgstr "Ime fajla paterna"
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Django Sabloni nisu instalirani"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Kopija Sablona "
-
-#~ msgid "SMTP Port "
-#~ msgstr "SMTP Port "
-
-#~ msgid "Personal Accounts"
-#~ msgstr "Licni Nalozi"
-
-#~ msgid "Company Mails"
-#~ msgstr "Poruke Preduzeca"
-
-#~ msgid "Enter name of outgoing server, eg:smtp.gmail.com "
-#~ msgstr "Upisi ime izlaznog servera, npr: smtp.gmail.com "
-
-#~ msgid "Default Subject"
-#~ msgstr "Predefinisana tema"
-
-#~ msgid ""
-#~ "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
-#~ "here."
-#~ msgstr ""
-#~ "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
-#~ "here."
-
-#~ msgid ""
-#~ "Carbon Copy address(es), comma-separated. Placeholders can be used here."
-#~ msgstr ""
-#~ "Carbon Copy address(es), comma-separated. Placeholders can be used here."
-
-#~ msgid ""
-#~ "Enable this if you want the outgoing e-mails to include a tracking marker "
-#~ "that makes it possible to identify the replies an link them back to the "
-#~ "campaign item"
-#~ msgstr ""
-#~ "Omogucava vam , ako zelite da vase izlazne poruke sadrze markera pratnje "
-#~ "koji vam daju mogucnost da kasnije identifikujete odgovore i posaljewte ih "
-#~ "npr stavci Kampanje."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcijue."
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
index aeec218a947..cfe1b3503ed 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -962,7 +962,7 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -1052,7 +1052,7 @@ msgid "Email Mailbox"
 msgstr "Postansko Sanduce"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1170,7 +1170,9 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr "Email-ovi"
 
@@ -1344,143 +1346,6 @@ msgstr "Ima Attachment"
 msgid "No Description"
 msgstr "Bez Opisa"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcijue."
-
-#, python-format
-#~ msgid "Mako templates not installed"
-#~ msgstr "Mako Obrazac nije instaliran"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#, python-format
-#~ msgid ""
-#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-#~ msgstr ""
-#~ "Preuzimanje datuma i vremena nije uspelo. Datum:Date:%s \\n \tGreska:%s"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#, python-format
-#~ msgid ""
-#~ "Error sending mail: %s\" % str(e)))\n"
-#~ "        \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "        if ids is None:\n"
-#~ "            ids = []\n"
-#~ "        if context is None:\n"
-#~ "            context = {}\n"
-#~ "        filters = [('folder', '=', 'outbox"
-#~ msgstr ""
-#~ "Greska slanja poruke: %s\" % str(e)))\n"
-#~ "         \n"
-#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-#~ "if ids is None:\n"
-#~ "ids = []\n"
-#~ "if context is None:\n"
-#~ "context = {}\n"
-#~ "filters = [('folder', '=', 'outbox"
-
-#, python-format
-#~ msgid "Django templates not installed"
-#~ msgstr "Django Sabloni nisu instalirani"
-
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Kopija Sablona "
-
-#~ 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 "Email Data"
-#~ msgstr "Podaci Email-a"
-
-#~ msgid "My Accounts"
-#~ msgstr "Moji Nalozi"
-
-#~ msgid ""
-#~ "File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
-#~ msgstr ""
-#~ "Ime fajla moze biti napisano i sa razmaknicama( donja crta) npr "
-#~ "2009_SO003.pdf"
-
-#~ msgid "Enter port number,eg:SMTP-587 "
-#~ msgstr "Upisi broj Port-a npr SMTP-587 "
-
-#~ msgid "E-MAIL Templates"
-#~ msgstr "E-MAIL Obrasci"
-
-#~ msgid "Download Full Mail"
-#~ msgstr "Download Celu poruku"
-
-#~ msgid "The default recipient of email.Placeholders can be used here."
-#~ msgstr ""
-#~ "Predlozeni primalac Email-a. Razmaknice se mogu koristiti ( donja crta)"
-
-#~ msgid "Mailboxes"
-#~ msgstr "Postanski Sanducici"
-
-#~ msgid "Track campaign items"
-#~ msgstr "Prati stavke Kampanje"
-
-#~ msgid "eg: yourname@yourdomain.com "
-#~ msgstr "npr: yourname@yourdomain.com "
-
-#~ msgid "SMTP Server"
-#~ msgstr "SMTP server"
-
-#~ msgid ""
-#~ "Add here all attachments of the current document you want to include in the "
-#~ "e-mail."
-#~ msgstr ""
-#~ "Ubaci ovde sve attachmente za dati dokument koji zelis da prikljucis poruci"
-
-#~ msgid "The default subject of email. Placeholders can be used here."
-#~ msgstr ""
-#~ "Podrazumevana Tema poruke. Razmaknice se mogu ovde koristiti ( donja crta)"
-
-#~ msgid "File Name Pattern"
-#~ msgstr "Ime fajla paterna"
-
-#~ msgid "SMTP Port "
-#~ msgstr "SMTP Port "
-
-#~ msgid "Personal Accounts"
-#~ msgstr "Licni Nalozi"
-
-#~ msgid "Company Mails"
-#~ msgstr "Poruke Preduzeca"
-
-#~ msgid "Enter name of outgoing server, eg:smtp.gmail.com "
-#~ msgstr "Upisi ime izlaznog servera, npr: smtp.gmail.com "
-
-#~ msgid "Default Subject"
-#~ msgstr "Predefinisana tema"
-
-#~ msgid ""
-#~ "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
-#~ "here."
-#~ msgstr ""
-#~ "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
-#~ "here."
-
-#~ msgid ""
-#~ "Carbon Copy address(es), comma-separated. Placeholders can be used here."
-#~ msgstr ""
-#~ "Carbon Copy address(es), comma-separated. Placeholders can be used here."
-
-#~ msgid ""
-#~ "Enable this if you want the outgoing e-mails to include a tracking marker "
-#~ "that makes it possible to identify the replies an link them back to the "
-#~ "campaign item"
-#~ msgstr ""
-#~ "Omogucava vam , ako zelite da vase izlazne poruke sadrze markera pratnje "
-#~ "koji vam daju mogucnost da kasnije identifikujete odgovore i posaljewte ih "
-#~ "npr stavci Kampanje."
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 513bc37d603..44f704d3cc8 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: 2011-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index 2862a96cba3..8354f964d91 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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -179,6 +179,8 @@ msgid ""
 "Email, unless it is already specified in the From Email, e.g: John Doe "
 "<john@doe.com>"
 msgstr ""
+"Kimden Epostasında beliritlmemişse, açıklama Epostadan alındığı gibi "
+"Gönderen Adı olarak kullanılır. Örneğin: John Doe <john@doe.com>"
 
 #. module: email_template
 #: field:email.template,from_account:0
@@ -325,6 +327,8 @@ msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
 msgstr ""
+"İpucu: Çoklu epostalar aynı dilde gönderilir (ilk olan önerilir). Epsotaları "
+"grup olarak dile göre göndermenizi öneririz."
 
 #. module: email_template
 #: help:email_template.preview,reply_to:0
diff --git a/addons/email_template/i18n/zh_CN.po b/addons/email_template/i18n/zh_CN.po
index 7aef626bc1f..50bd8a2685a 100644
--- a/addons/email_template/i18n/zh_CN.po
+++ b/addons/email_template/i18n/zh_CN.po
@@ -14,24 +14,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "电子邮件发送后永久删除"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Email Account Configuration"
-msgstr ""
+msgstr "邮件帐户配置"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
-msgstr ""
+msgstr "发件箱保存的多封电子邮件"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:59
@@ -42,31 +42,33 @@ msgid ""
 "Either ask admin to enforce an account for this template or get yourself a "
 "personal email account."
 msgstr ""
+"你没设置私人电子邮件帐户。\n"
+"要求管理员强制用这模板的帐户否则输入你自己的私人电子邮件帐户。"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
-msgstr ""
+msgstr "私人电子邮件"
 
 #. module: email_template
 #: field:email.template,file_name:0
 msgid "Report Filename"
-msgstr ""
+msgstr "报告文件名"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content  "
-msgstr ""
+msgstr "邮件内容  "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send mail Wizard"
-msgstr ""
+msgstr "发送邮件向导"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text & HTML with no attachments"
-msgstr ""
+msgstr "纯文本或HTML(无附件)"
 
 #. module: email_template
 #: help:email.template,model_object_field:0
@@ -76,6 +78,9 @@ msgid ""
 "in the box below\n"
 "(Note:If there are no values make sure you have selected the correct model)"
 msgstr ""
+"你想在模型里用的字段。\n"
+"如果它是一个关联字段，你可以在这下拉框中选择相关值。\n"
+"（备注：如果没有值，确认你选择了正确的模型)"
 
 #. module: email_template
 #: field:email_template.preview,body_html:0
@@ -83,82 +88,82 @@ msgstr ""
 #: field:email_template.send.wizard,body_html:0
 #: field:email_template.send.wizard,body_text:0
 msgid "Body"
-msgstr ""
+msgstr "内容"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
-msgstr ""
+msgstr "记录删除失败"
 
 #. module: email_template
 #: help:email_template.account,company:0
 msgid ""
 "Select if this mail account does not belong to specific user but to the "
 "organization as a whole. eg: info@companydomain.com"
-msgstr ""
+msgstr "选择该邮件帐户不是作为特定的个人而是机构。如：info@companydomain.com"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send now"
-msgstr ""
+msgstr "立刻发送"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "不适用"
 
 #. module: email_template
 #: view:email_template.account:0
 #: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
 #: model:ir.ui.menu,name:email_template.menu_email_template_account_all
 msgid "Email Accounts"
-msgstr ""
+msgstr "电子邮件帐户"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send all mails"
-msgstr ""
+msgstr "发送所有邮件"
 
 #. module: email_template
 #: help:email_template.account,smtpuname:0
 msgid ""
 "Specify the username if your SMTP server requires authentication, otherwise "
 "leave it empty."
-msgstr ""
+msgstr "指定用户名如果你的SMTP服务器需要验证。否则为空。"
 
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
-msgstr ""
+msgstr "邮件服务器参考"
 
 #. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Approved"
-msgstr ""
+msgstr "已审批"
 
 #. module: email_template
 #: help:email.template,def_cc:0
 msgid ""
 "Carbon Copy address(es), comma-separated. Placeholders can be used here. "
 "e.g. ${object.email_cc}"
-msgstr ""
+msgstr "抄送地址用逗号分隔。这里可以用占用符如： ${object.email_cc}"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Account"
-msgstr ""
+msgstr "帐号"
 
 #. module: email_template
 #: field:email.template,table_html:0
 msgid "HTML code"
-msgstr ""
+msgstr "HTML代码"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Send Mail"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: email_template
 #: help:email_template.account,name:0
@@ -166,44 +171,44 @@ msgid ""
 "The description is used as the Sender name along with the provided From "
 "Email, unless it is already specified in the From Email, e.g: John Doe "
 "<john@doe.com>"
-msgstr ""
+msgstr "在邮件里这描述作为发送人名称。除非它在邮件中早已经指定。如：John Doe <john@doe.com>"
 
 #. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
-msgstr ""
+msgstr "电子邮件帐户"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
-msgstr ""
+msgstr "一个或多个对象发送邮件失败。"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
-msgstr ""
+msgstr "在这里添加你在邮件里把当前文件作为 附件。"
 
 #. module: email_template
 #: help:email.template,lang:0
 msgid ""
 "The default language for the email. Placeholders can be used here. eg. "
 "${object.partner_id.lang}"
-msgstr ""
+msgstr "电子邮件的默认语言。可以在这里使用占位符。例如.${object.partner_id.lang}"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
 msgid ""
 "When you choose relationship fields this field will specify the sub value "
 "you can use."
-msgstr ""
+msgstr "当你选择相关联字段的字段时你将可以使用具体的值。"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Wizard Complete"
-msgstr ""
+msgstr "向导完成"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -211,103 +216,103 @@ msgstr ""
 #: field:email_template.preview,reply_to:0
 #: field:email_template.send.wizard,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "回复:"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Delete Action"
-msgstr ""
+msgstr "删除操作"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Approve Account"
-msgstr ""
+msgstr "审核帐户"
 
 #. module: email_template
 #: field:email_template.preview,rel_model_ref:0
 #: field:email_template.send.wizard,rel_model_ref:0
 msgid "Referred Document"
-msgstr ""
+msgstr "相关文档"
 
 #. module: email_template
 #: field:email_template.send.wizard,full_success:0
 msgid "Complete Success"
-msgstr ""
+msgstr "发送成功"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Mixed)"
-msgstr ""
+msgstr "HTML & Text (混合)"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "OK"
-msgstr ""
+msgstr "确认"
 
 #. module: email_template
 #: field:email_template.account,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "自动删除"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Alternative)"
-msgstr ""
+msgstr "HTML & Text (二选其一)"
 
 #. module: email_template
 #: field:email_template.send.wizard,requested:0
 msgid "No of requested Mails"
-msgstr ""
+msgstr "无要求的邮件"
 
 #. module: email_template
 #: field:email.template,def_body_text:0
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,body_text:0
 msgid "Standard Body (Text)"
-msgstr ""
+msgstr "邮件内容(纯文本)"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 msgid "Attached Files"
-msgstr ""
+msgstr "文件附件"
 
 #. module: email_template
 #: field:email_template.account,smtpssl:0
 msgid "SSL/TLS (only in python 2.6)"
-msgstr ""
+msgstr "SSL/TLS (需要 python 2.6)"
 
 #. module: email_template
 #: field:email_template.account,email_id:0
 msgid "From Email"
-msgstr ""
+msgstr "来自邮件"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
 msgid "Accounts"
-msgstr ""
+msgstr "帐户"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Text)"
-msgstr ""
+msgstr "内容（Txt）"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Company Emails"
-msgstr ""
+msgstr "公司电子邮件"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
-msgstr ""
+msgstr "提示：发送的多个电子邮件用相同的语言（第一个建议）。我们建议你按语言分群组发送邮件。"
 
 #. module: email_template
 #: help:email_template.preview,reply_to:0
@@ -315,7 +320,7 @@ msgstr ""
 msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here."
-msgstr ""
+msgstr "如果发件人地址不是原地址，这地址是要回复的收件人地址。这里能使用占用符。"
 
 #. module: email_template
 #: field:email.template,def_subject:0
@@ -323,24 +328,24 @@ msgstr ""
 #: field:email_template.preview,subject:0
 #: field:email_template.send.wizard,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "主题"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
-msgstr ""
+msgstr "原因：%s"
 
 #. module: email_template
 #: field:email_template.mailbox,email_from:0
 msgid "From"
-msgstr ""
+msgstr "发件人"
 
 #. module: email_template
 #: field:email_template.preview,ref_template:0
 #: field:email_template.send.wizard,ref_template:0
 msgid "Template"
-msgstr ""
+msgstr "模版"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:367
@@ -349,99 +354,101 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"邮件发送人帐户  %s  失败。问题原因：发送服务器错误。\n"
+"描述： %s"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Insert Simple Field"
-msgstr ""
+msgstr "插入简单的字段"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Html)"
-msgstr ""
+msgstr "内容（HTML）"
 
 #. module: email_template
 #: help:email.template,def_bcc:0
 msgid ""
 "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
 "here. e.g. ${object.email_bcc}"
-msgstr ""
+msgstr "密件抄送地址用逗号。这里能使用占位符如：${object.email_bcc}"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
-msgstr ""
+msgstr "模板预览"
 
 #. module: email_template
 #: field:email.template,def_body_html:0
 msgid "Body (Text-Web Client Only)"
-msgstr ""
+msgstr "内容(Txt - 仅Web客户端)"
 
 #. module: email_template
 #: field:email_template.account,state:0
 #: view:email_template.mailbox:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "向导按钮"
 
 #. module: email_template
 #: help:email_template.account,email_id:0
 msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
-msgstr ""
+msgstr "例如: 'john@doe.com'  或 'John Doe <john@doe.com>'"
 
 #. module: email_template
 #: view:email.template:0
 #: field:email.template,object_name:0
 msgid "Resource"
-msgstr ""
+msgstr "来源"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
-msgstr ""
+msgstr "发送连接测试失败"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
-msgstr ""
+msgstr "邮件发信人帐户 %s 发送成功。"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Standard Body"
-msgstr ""
+msgstr "邮件内容"
 
 #. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
-msgstr ""
+msgstr "建立模板"
 
 #. module: email_template
 #: help:email.template,def_body_html:0
 #: help:email.template,def_body_text:0
 msgid "The text version of the mail"
-msgstr ""
+msgstr "纯文本邮件"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
-msgstr ""
+msgstr " （邮件附件）"
 
 #. module: email_template
 #: selection:email_template.mailbox,folder:0
 msgid "Sent Items"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Test Outgoing Connection"
-msgstr ""
+msgstr "测试发送连接"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
@@ -453,90 +460,90 @@ msgstr ""
 msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here. e.g. ${object.email_reply_to}"
-msgstr ""
+msgstr "如果不同于收件人地址，这地址是回复地址。这里能使用占位符如：${object.email_reply_to}"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
 msgid ""
 "Button in the side bar of the form view of this Resource that will invoke "
 "the Window Action"
-msgstr ""
+msgstr "按钮在这资源界面的侧边栏它将调用窗体的动作"
 
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
 msgid "User account"
-msgstr ""
+msgstr "用户帐户"
 
 #. module: email_template
 #: field:email_template.send.wizard,signature:0
 msgid "Attach my signature to mail"
-msgstr ""
+msgstr "邮件附上我的签名"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
-msgstr ""
+msgstr "报告"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 msgid "Sub Field"
-msgstr ""
+msgstr "子字段"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.mailbox:0
 msgid "Advanced"
-msgstr ""
+msgstr "高级选项"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "My Emails"
-msgstr ""
+msgstr "我的邮件"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Expression Builder"
-msgstr ""
+msgstr "表达式生成器"
 
 #. module: email_template
 #: help:email.template,sub_object:0
 msgid ""
 "When a relation field is used this field will show you the type of field you "
 "have selected"
-msgstr ""
+msgstr "该处显示使用的关联字段的类型"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "HTML Body"
-msgstr ""
+msgstr "HTML内容"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Suspend Account"
-msgstr ""
+msgstr "暂停帐户"
 
 #. module: email_template
 #: help:email.template,null_value:0
 msgid "This Value is used if the field is empty"
-msgstr ""
+msgstr "如果该字段为空就使用该值。"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Preview Template"
-msgstr ""
+msgstr "预览模板"
 
 #. module: email_template
 #: field:email_template.account,smtpserver:0
 msgid "Server"
-msgstr ""
+msgstr "服务器"
 
 #. module: email_template
 #: help:email.template,copyvalue:0
 msgid ""
 "Copy and paste the value in the location you want to use a system value."
-msgstr ""
+msgstr "如果你想使用系统内置变量的话可以从这里复制并粘贴到指定位置"
 
 #. module: email_template
 #: help:email.template,track_campaign_item:0
@@ -544,139 +551,139 @@ 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 ""
+msgstr "使你要发出的邮件包含一个特殊的跟踪标记使你能知道回复和链接它返回的相应资源记录。这对CRM的销售线索是非常有用的。"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Raw HTML)"
-msgstr ""
+msgstr "内容（raw HTML）"
 
 #. module: email_template
 #: field:email.template,use_sign:0
 msgid "Signature"
-msgstr ""
+msgstr "签名"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "子模型"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (Plain Text)"
-msgstr ""
+msgstr "内容(纯文本)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Text)"
-msgstr ""
+msgstr "内容(纯文本)"
 
 #. module: email_template
 #: field:email_template.mailbox,date_mail:0
 msgid "Rec/Sent Date"
-msgstr ""
+msgstr "记录/发送日期"
 
 #. module: email_template
 #: selection:email_template.account,state:0
 msgid "Initiated"
-msgstr ""
+msgstr "开始"
 
 #. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
-msgstr ""
+msgstr "发送报告"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Server Information"
-msgstr ""
+msgstr "服务器信息"
 
 #. module: email_template
 #: field:email_template.send.wizard,generated:0
 msgid "No of generated Mails"
-msgstr ""
+msgstr "没有生成的邮件"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Mail Details"
-msgstr ""
+msgstr "邮件详情"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
-msgstr ""
+msgstr "SMTP服务器或者端口没指定"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "备注：这是原始HTML"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Group by..."
-msgstr ""
+msgstr "分组"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Multiple Mail Wizard Step 1"
-msgstr ""
+msgstr "多帐户设置向导"
 
 #. module: email_template
 #: field:email_template.account,user:0
 msgid "Related User"
-msgstr ""
+msgstr "相关用户"
 
 #. module: email_template
 #: field:email_template.mailbox,body_html:0
 msgid "Body (Rich Text Clients Only)"
-msgstr ""
+msgstr "内容（ 含格式文本 - 仅Clients客户端）"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 msgid "Window Action"
-msgstr ""
+msgstr "窗体操作"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
-msgstr ""
+msgstr "HTML，否则纯文本"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Drafts"
-msgstr ""
+msgstr "草稿"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "No"
-msgstr ""
+msgstr "否"
 
 #. module: email_template
 #: field:email_template.account,smtpport:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP 端口"
 
 #. module: email_template
 #: field:email_template.mailbox,mail_type:0
 msgid "Mail Contents"
-msgstr ""
+msgstr "邮件内容"
 
 #. module: email_template
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "这模板名称必须唯一！"
 
 #. module: email_template
 #: field:email.template,def_bcc:0
@@ -684,22 +691,22 @@ msgstr ""
 #: field:email_template.preview,bcc:0
 #: field:email_template.send.wizard,bcc:0
 msgid "BCC"
-msgstr ""
+msgstr "密件抄送"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
-msgstr ""
+msgstr "纯文本"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "内部模型名"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -707,56 +714,56 @@ msgstr ""
 #: field:email_template.preview,message_id:0
 #: field:email_template.send.wizard,message_id:0
 msgid "Message-ID"
-msgstr ""
+msgstr "消息-ID（Message-ID）"
 
 #. module: email_template
 #: help:email_template.mailbox,server_ref:0
 msgid "Applicable for inward items only"
-msgstr ""
+msgstr "只适用于内部项"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid ""
 "After clicking send all mails, mails will be sent to outbox and cleared in "
 "next Send/Recieve"
-msgstr ""
+msgstr "点击后发送所有邮件，邮件发到发件箱并在随后发送/接收"
 
 #. module: email_template
 #: field:email_template.mailbox,state:0
 #: field:email_template.send.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "状况"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Outgoing"
-msgstr ""
+msgstr "发件箱"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
-msgstr ""
+msgstr "日期时间提取失败：日期：%s \t 错误：%s"
 
 #. module: email_template
 #: help:email.template,use_sign:0
 msgid "the signature from the User details will be appended to the mail"
-msgstr ""
+msgstr "含用户详情的签名将附加到这邮件"
 
 #. module: email_template
 #: field:email_template.send.wizard,from:0
 msgid "From Account"
-msgstr ""
+msgstr "发件人"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Intermixed content"
-msgstr ""
+msgstr "混合内容"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Request Re-activation"
-msgstr ""
+msgstr "要求重新激活"
 
 #. module: email_template
 #: view:email.template:0
@@ -764,33 +771,33 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_all
 #: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
 msgid "Email Templates"
-msgstr ""
+msgstr "电子邮件模板"
 
 #. module: email_template
 #: field:email_template.account,smtpuname:0
 msgid "User Name"
-msgstr ""
+msgstr "用户名"
 
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "高级选项"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Outbox"
-msgstr ""
+msgstr "发件箱"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Save in Drafts"
-msgstr ""
+msgstr "保存为草稿"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:362
@@ -799,16 +806,18 @@ msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
 "Description: %s"
 msgstr ""
+"邮件发信人帐户 %s 失败。原因：MIME 错误\n"
+"说明： %s"
 
 #. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #. module: email_template
 #: field:email.template,lang:0
 msgid "Language"
-msgstr ""
+msgstr "语言"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:275
@@ -824,12 +833,12 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
-msgstr ""
+msgstr "电子邮件模板"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Send/Receive"
-msgstr ""
+msgstr "发送/接收"
 
 #. module: email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
@@ -840,40 +849,40 @@ msgstr ""
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
-msgstr ""
+msgstr "已暂停"
 
 #. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
 "Only users from these groups will be allowed to send mails from this Template"
-msgstr ""
+msgstr "仅限本组成员才能使用该模板"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
-msgstr ""
+msgstr "发送邮件（ %s）"
 
 #. module: email_template
 #: help:email.template,def_subject:0
 msgid "The subject of email. Placeholders can be used here."
-msgstr ""
+msgstr "邮件主题。这里可以使用占位符"
 
 #. module: email_template
 #: field:email_template.send.wizard,report:0
 msgid "Report File Name"
-msgstr ""
+msgstr "报告文件名"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "表达式"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,history:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: email_template
 #: view:email.template:0
@@ -882,18 +891,18 @@ msgstr ""
 #: view:email_template.send.wizard:0
 #: field:email_template.send.wizard,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "附件"
 
 #. module: email_template
 #: field:email_template.preview,to:0
 #: field:email_template.send.wizard,to:0
 msgid "To"
-msgstr ""
+msgstr "收件人"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Text, otherwise HTML"
-msgstr ""
+msgstr "文本，否则JHTML"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:319
@@ -904,44 +913,44 @@ msgstr ""
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Discard Mail"
-msgstr ""
+msgstr "丢弃邮件"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "模型的邮件模板"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:49
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
-msgstr ""
+msgstr "发送邮件失败：%s"
 
 #. module: email_template
 #: constraint:email_template.account:0
 msgid "Error: You are not allowed to have more than 1 account."
-msgstr ""
+msgstr "错误：你不能有超过1个帐户"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
-msgstr ""
+msgstr "内容 (HTML - 仅Web客户端)"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
-msgstr ""
+msgstr "%s (邮件附件)"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Sending"
-msgstr ""
+msgstr "正在发送"
 
 #. module: email_template
 #: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
@@ -951,26 +960,27 @@ msgid ""
 "profile fields, so that a partner name or other partner related information "
 "may be inserted automatically."
 msgstr ""
+"邮件模板是一个邮件文件它将作为营销一部分。你可以依据具体客户的描述字段做个性化处理，所以可能自动插入这业务伙伴的名称或其业务伙伴相关的信息。"
 
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
-msgstr ""
+msgstr "允许用户组"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
 msgid "Field"
-msgstr ""
+msgstr "字段"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "User Information"
-msgstr ""
+msgstr "用户信息"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Actions"
-msgstr ""
+msgstr "操作"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:363
@@ -980,76 +990,80 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"服务器发送错误\n"
+"说明：%s"
 
 #. module: email_template
 #: help:email.template,file_name:0
 msgid ""
 "Name of the generated report file. Placeholders can be used in the filename. "
 "eg: 2009_SO003.pdf"
-msgstr ""
+msgstr "产生报告文件名，这里能使用占位符如：2009_SO003.pdf"
 
 #. module: email_template
 #: help:email_template.mailbox,date_mail:0
 msgid "Date on which Email Sent or Received"
-msgstr ""
+msgstr "发送或接收邮件的日期"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Trash"
-msgstr ""
+msgstr "回收站"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_mailbox
 msgid "Email Mailbox"
-msgstr ""
+msgstr "邮箱"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:116
+#: code:addons/email_template/email_template_mailbox.py:104
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
 "Error: %s"
 msgstr ""
+"邮件 %s 发送失败。可能原因：无法登录到服务器\n"
+"错误： %s"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
-msgstr ""
+msgstr "丢失邮件帐户"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
-msgstr ""
+msgstr "SMTP 连接测试成功"
 
 #. module: email_template
 #: model:ir.module.module,shortdesc:email_template.module_meta_information
 msgid "Email Template for OpenERP"
-msgstr ""
+msgstr "系统邮件模板"
 
 #. module: email_template
 #: field:email_template.account,name:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Create Action"
-msgstr ""
+msgstr "新建操作"
 
 #. module: email_template
 #: help:email_template.account,smtpserver:0
 msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
-msgstr ""
+msgstr "输入发信服务器如：smtp.yourdomain.com"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
 msgid ""
 "You may attach existing files to this template, so they will be added in all "
 "emails created from this template"
-msgstr ""
+msgstr "你可能在这模板附上现有文件，所以它将加入到所有根据这模板创建的邮件中。"
 
 #. module: email_template
 #: help:email.template,message_id:0
@@ -1057,23 +1071,23 @@ msgid ""
 "Specify the Message-ID SMTP header to use in outgoing emails. Please note "
 "that this overrides the Resource tracking option! Placeholders can be used "
 "here."
-msgstr ""
+msgstr "发出的邮件使用指定的 Message-ID作为SMTP头。请注意这将覆盖原来的。"
 
 #. module: email_template
 #: field:email.template,def_to:0
 #: field:email_template.mailbox,email_to:0
 msgid "Recipient (To)"
-msgstr ""
+msgstr "收件人（到）"
 
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
-msgstr ""
+msgstr "空值"
 
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
-msgstr ""
+msgstr "模板的语言"
 
 #. module: email_template
 #: field:email.template,def_cc:0
@@ -1081,27 +1095,27 @@ msgstr ""
 #: field:email_template.preview,cc:0
 #: field:email_template.send.wizard,cc:0
 msgid "CC"
-msgstr ""
+msgstr "抄送"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Sent"
-msgstr ""
+msgstr "已发送"
 
 #. module: email_template
 #: sql_constraint:email_template.account:0
 msgid "Another setting already exists with this email ID !"
-msgstr ""
+msgstr "其它发送的邮件已使用这邮件ID!"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
 msgid "Action that will open this email template on Resource records"
-msgstr ""
+msgstr "操作将打开这邮件模板"
 
 #. module: email_template
 #: field:email_template.account,smtppass:0
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #. module: email_template
 #: help:email_template.preview,message_id:0
@@ -1109,55 +1123,57 @@ msgstr ""
 msgid ""
 "The Message-ID header value, if you need tospecify it, for example to "
 "automatically recognize the replies later. Placeholders can be used here."
-msgstr ""
+msgstr "如果你需要具体指定 Message-ID头，例如自动识别最后的回复。这里能使用占位符"
 
 #. module: email_template
 #: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
-msgstr ""
+msgstr "邮件"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Templates"
-msgstr ""
+msgstr "模板"
 
 #. module: email_template
 #: field:email_template.preview,report:0
 msgid "Report Name"
-msgstr ""
+msgstr "报告名称"
 
 #. module: email_template
 #: field:email.template,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: email_template
 #: field:email.template,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "资源跟踪"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "邮件模板预览"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
-msgstr ""
+msgstr "邮件预览"
 
 #. module: email_template
 #: help:email.template,def_to:0
 msgid ""
 "The Recipient of email. Placeholders can be used here. e.g. "
 "${object.email_to}"
-msgstr ""
+msgstr "邮件接收人。这里能使用占位符。如：${object.email_to}"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Existing files"
-msgstr ""
+msgstr "现有的文件"
 
 #. module: email_template
 #: model:ir.module.module,description:email_template.module_meta_information
@@ -1167,40 +1183,43 @@ msgid ""
 "emails.\n"
 "    "
 msgstr ""
+"\n"
+"    邮件模板只用于发送的邮件。\n"
+"    "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (HTML)"
-msgstr ""
+msgstr "内容（HTML）"
 
 #. module: email_template
 #: help:email.template,table_html:0
 msgid ""
 "Copy this html code to your HTML message body for displaying the info in "
 "your mail."
-msgstr ""
+msgstr "将本段HTML代码复制到你邮件内容中."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_account
 msgid "email_template.account"
-msgstr ""
+msgstr "email_template.account"
 
 #. module: email_template
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
-msgstr ""
+msgstr "去连接给出的ID时不存在"
 
 #. module: email_template
 #: field:email_template.account,company:0
 msgid "Corporate"
-msgstr ""
+msgstr "全体的"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:275
@@ -1210,47 +1229,49 @@ msgid ""
 "server\n"
 "Error: %s"
 msgstr ""
+"在登入邮件的发件人帐户 %s 时失败。原因不能登录到服务器\n"
+"错误:%s"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
-msgstr ""
+msgstr "这是发送邮件的向导"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
-msgstr ""
+msgstr "地址"
 
 #. module: email_template
 #: help:email.template,from_account:0
 msgid "Emails will be sent from this approved account."
-msgstr ""
+msgstr "邮件将用这审批的帐户发送"
 
 #. module: email_template
 #: field:email_template.account,send_pref:0
 msgid "Mail Format"
-msgstr ""
+msgstr "邮件格式"
 
 #. module: email_template
 #: field:email_template.mailbox,folder:0
 msgid "Folder"
-msgstr ""
+msgstr "文件夹"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Company Accounts"
-msgstr ""
+msgstr "公司帐户"
 
 #. module: email_template
 #: help:email_template.account,smtpport:0
 msgid "Enter port number, eg: 25 or 587"
-msgstr ""
+msgstr "输入端口如： 25 或 587"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
-msgstr ""
+msgstr "邮件模版"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:280
@@ -1258,21 +1279,25 @@ msgstr ""
 #: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
-msgstr ""
+msgstr "邮件发信人帐户 %s 失败。原因：帐户没审核"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Simple Mail Wizard Step 1"
-msgstr ""
+msgstr "简单邮件向导步骤1"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Has Attachments"
-msgstr ""
+msgstr "带附件"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:452
 #: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
-msgstr ""
+msgstr "无描述"
+
+#, python-format
+#~ msgid "Copy of template "
+#~ msgstr "复制模板 "
diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py
new file mode 100644
index 00000000000..a451b171b70
--- /dev/null
+++ b/addons/email_template/res_partner.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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
+
+class res_partner(osv.osv):
+    """Inherit res.partner to add a generic opt-out field that can be used
+       to restrict usage of automatic email templates.
+       This field is unused by default. """
+    _inherit = 'res.partner'
+
+    _columns = {
+        'opt_out': fields.boolean('Opt-out', help="If checked, this partner will not receive any automated email " \
+                                                  "notifications, such as the availability of invoices."),
+    }
+
+    _defaults = {
+        'opt_out': False,
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/res_partner_demo.yml b/addons/email_template/res_partner_demo.yml
new file mode 100644
index 00000000000..8eaf48f9e87
--- /dev/null
+++ b/addons/email_template/res_partner_demo.yml
@@ -0,0 +1,9 @@
+-
+   Set opt-out to True on all demo partners
+- 
+  !python {model: res.partner}: |
+    partner_ids = self.search(cr, uid, [])
+    # assume partners with an external ID come from demo data
+    ext_ids = self._get_external_ids(cr, uid, partner_ids)
+    ids_to_update = [k for (k,v) in ext_ids.iteritems() if v] 
+    self.write(cr, uid, ids_to_update, {'opt_out': True})
\ No newline at end of file
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
new file mode 100644
index 00000000000..0d2f919a96e
--- /dev/null
+++ b/addons/email_template/res_partner_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="res_partner_opt_out_form">
+            <field name="name">res.partner.opt_out.form</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="/form/notebook/page/field[@name='active']" position="after">
+                    <field name="opt_out" groups="base.group_extended"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
deleted file mode 100644
index e3f3401217c..00000000000
--- a/addons/email_template/security/email_template_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="0">
-
-    </data>
-</openerp>
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index 17859d6bb9d..f5f61240a96 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,10 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template_account","email_template.account","model_email_template_account","marketing.group_marketing_user",1,0,0,0
-"access_email_template","email.template","model_email_template","marketing.group_marketing_user",1,0,0,0
-"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_user",1,1,1,1
-"access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
+"access_email_template","email.template","model_email_template",,1,0,0,0
 "access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
-"access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0
-"access_email_template_account_manager","email_template.account","model_email_template_account","marketing.group_marketing_manager",1,1,1,1
-"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
-"access_email_template_mailbox_manager","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_manager","email.template","model_email_template",,1,1,1,1
diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py
index 1641152490e..c979c90acd0 100644
--- a/addons/email_template/wizard/__init__.py
+++ b/addons/email_template/wizard/__init__.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2010-2010 OpenERP SA (<http://www.openerp.com>)
+#    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
@@ -19,5 +19,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
+import email_template_preview
+import mail_compose_message
 
-import email_template_send_wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
new file mode 100644
index 00000000000..cf233b20682
--- /dev/null
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form">
+            <field name="name">mail.compose.message.form</field>
+            <field name="model">mail.compose.message</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//label[@name='placeholder']" position="before">
+                        <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)"/>
+                            <label string="" name="flexspace" colspan="1"/>
+                        </group>
+                        <group colspan="1" col="6">
+                            <field name="use_template" invisible="1"/>
+                            <button icon="gtk-paste" type="object" name="template_toggle"
+                                    string="" help="Use a message template" colspan="1"/>
+                            <button icon="gtk-save" type="object" name="save_as_template"
+                                    string="" help="Save as a new template" colspan="1"/>
+                        </group>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
new file mode 100644
index 00000000000..4ef0e9fa156
--- /dev/null
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009 Sharoon Thomas
+#    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, fields
+
+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):
+        """
+        Return Records of particular Email Template's Model
+        """
+        if context is None:
+            context = {}
+
+        template_id = context.get('template_id', False)
+        if not template_id:
+            return []
+        email_template = self.pool.get('email.template')
+        template = email_template.browse(cr, uid, int(template_id), context=context)
+        template_object = template.model_id
+        model =  self.pool.get(template_object.model)
+        record_ids = model.search(cr, uid, [], 0, 10, 'id', context=context)
+        default_id = context.get('default_res_id')
+
+        if default_id and default_id not in record_ids:
+            record_ids.insert(0, default_id)
+
+        return model.name_get(cr, uid, record_ids, context)
+
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(email_template_preview, self).default_get(cr, uid, fields, context=context)
+
+        email_template = self.pool.get('email.template')
+        template_id = context.get('template_id')
+        if 'res_id' in fields and not result.get('res_id'):
+            records = self._get_records(cr, uid, context=context)
+            result['res_id'] = records and records[0][0] or False # select first record as a Default
+        if template_id and 'model_id' in fields and not result.get('model_id'):
+            result['model_id'] = email_template.read(cr, uid, int(template_id), ['model_id'], context).get('model_id', False)
+        return result
+
+    _columns = {
+        '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 {}
+        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)
+        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
new file mode 100644
index 00000000000..4aab57396ad
--- /dev/null
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+        <!-- Email Template Preview -->
+        <record model="ir.ui.view" id="email_template_preview_form">
+            <field name="name">email_template.preview.form</field>
+            <field name="model">email_template.preview</field>
+            <field name="type">form</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"/>
+                    </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"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <label string=""/>
+                        <button icon="gtk-ok" special="cancel" string="Close" colspan="1"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="wizard_email_template_preview" model="ir.actions.act_window">
+            <field name="name">Template Preview</field>
+            <field name="res_model">email_template.preview</field>
+            <field name="src_model">email_template.preview</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="auto_refresh" eval="1" />
+            <field name="target">new</field>
+            <field name="context">{'template_id':active_id}</field>
+        </record>
+
+	</data>
+</openerp>
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
deleted file mode 100644
index 4f6ab7af381..00000000000
--- a/addons/email_template/wizard/email_template_send_wizard.py
+++ /dev/null
@@ -1,279 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2010-2010 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, fields
-from mako.template import Template
-from mako import exceptions
-import netsvc
-import base64
-from tools.translate import _
-import tools
-from email_template.email_template import get_value
-
-
-## FIXME: this wizard duplicates a lot of features of the email template preview,
-##        one of the 2 should inherit from the other!
-
-class email_template_send_wizard(osv.osv_memory):
-    _name = 'email_template.send.wizard'
-    _description = 'This is the wizard for sending mail'
-    _rec_name = "subject"
-
-    def _get_accounts(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-
-        template = self._get_template(cr, uid, context)
-        if not template:
-            return []
-
-        logger = netsvc.Logger()
-
-        if template.from_account:
-            return [(template.from_account.id, '%s (%s)' % (template.from_account.name, template.from_account.email_id))]
-        else:
-            account_id = self.pool.get('email_template.account').search(cr,uid,[('company','=','no'),('user','=',uid)], context=context)
-            if account_id:
-                account = self.pool.get('email_template.account').browse(cr,uid,account_id, context)
-                return [(r.id,r.name + " (" + r.email_id + ")") for r in account]
-            else:
-                logger.notifyChannel(_("email-template"), netsvc.LOG_ERROR, _("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal email account."))
-                raise osv.except_osv(_("Missing mail account"),_("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal email account."))
-
-    def get_value(self, cursor, user, template, message, context=None, id=None):
-        """Gets the value of the message parsed with the content of object id (or the first 'src_rec_ids' if id is not given)"""
-        if not message:
-            return ''
-        if not id:
-            id = context['src_rec_ids'][0]
-        return get_value(cursor, user, id, message, template, context)
-    
-    def _get_template(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if not 'template' in context and not 'template_id' in context:
-            return None
-        if 'template_id' in context.keys():
-            template_ids = self.pool.get('email.template').search(cr, uid, [('id','=',context['template_id'])], context=context)
-        elif 'template' in context.keys():
-            # Old versions of email_template used the name of the template. This caused
-            # problems when the user changed the name of the template, but we keep the code
-            # for compatibility with those versions.
-            template_ids = self.pool.get('email.template').search(cr, uid, [('name','=',context['template'])], context=context)
-        if not template_ids:
-            return None
-
-        template = self.pool.get('email.template').browse(cr, uid, template_ids[0], context)
-
-        lang = self.get_value(cr, uid, template, template.lang, context)
-        if lang:
-            # Use translated template if necessary
-            ctx = context.copy()
-            ctx['lang'] = lang
-            template = self.pool.get('email.template').browse(cr, uid, template.id, ctx)
-        return template
-
-    def _get_template_value(self, cr, uid, field, context=None):
-        if context is None:
-            context = {}
-        template = self._get_template(cr, uid, context)
-        if not template:
-            return False
-        if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets original template values for multiple email change
-            return getattr(template, field)
-        else: # Simple Mail: Gets computed template values
-            return self.get_value(cr, uid, template, getattr(template, field), context)
-
-    _columns = {
-        'state':fields.selection([
-                        ('single','Simple Mail Wizard Step 1'),
-                        ('multi','Multiple Mail Wizard Step 1'),
-                        ('done','Wizard Complete')
-                                  ],'Status',readonly=True),
-        'ref_template':fields.many2one('email.template','Template',readonly=True),
-        'rel_model':fields.many2one('ir.model','Model',readonly=True),
-        'rel_model_ref':fields.integer('Referred Document',readonly=True),
-        'from':fields.selection(_get_accounts,'From Account',select=True),
-        'to':fields.char('To',size=250,required=True),
-        'cc':fields.char('CC',size=250,),
-        'bcc':fields.char('BCC',size=250,),
-        'reply_to':fields.char('Reply-To', 
-                    size=250, 
-                    help="The address recipients should reply to,"
-                         " if different from the From address."
-                         " Placeholders can be used here."),
-        'message_id':fields.char('Message-ID', 
-                    size=250, 
-                    help="The Message-ID header value, if you need to"
-                         "specify it, for example to automatically recognize the replies later."
-                        " Placeholders can be used here."),
-        'subject':fields.char('Subject',size=200),
-        'body_text':fields.text('Body',),
-        'body_html':fields.text('Body',),
-        'report':fields.char('Report File Name',size=100,),
-        'signature':fields.boolean('Attach my signature to mail'),
-        #'filename':fields.text('File Name'),
-        'requested':fields.integer('No of requested Mails',readonly=True),
-        'generated':fields.integer('No of generated Mails',readonly=True), 
-        'full_success':fields.boolean('Complete Success',readonly=True),
-        'attachment_ids': fields.many2many('ir.attachment','send_wizard_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-    }
-
-    #FIXME: probably better by overriding default_get directly 
-    _defaults = {
-        'state': lambda self,cr,uid,ctx: len(ctx['src_rec_ids']) > 1 and 'multi' or 'single',
-        'rel_model': lambda self,cr,uid,ctx: self.pool.get('ir.model').search(cr,uid,[('model','=',ctx['src_model'])],context=ctx)[0],
-        'rel_model_ref': lambda self,cr,uid,ctx: ctx['active_id'],
-        'to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_to', ctx),
-        'cc': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_cc', ctx),
-        'bcc': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_bcc', ctx),
-        'subject':lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_subject', ctx),
-        'body_text':lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_body_text', ctx),
-        'body_html':lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_body_html', ctx),
-        'report': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'file_name', ctx),
-        'signature': lambda self,cr,uid,ctx: self._get_template(cr, uid, ctx).use_sign,
-        'ref_template':lambda self,cr,uid,ctx: self._get_template(cr, uid, ctx).id,
-        'reply_to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'reply_to', ctx),
-        'reply_to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'reply_to', ctx),
-        'requested':lambda self,cr,uid,ctx: len(ctx['src_rec_ids']),
-        'full_success': False,
-        'attachment_ids': [], 
-    }
-
-    def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
-        if context is None:
-            context = {}
-        result = super(email_template_send_wizard, self).fields_get(cr, uid, fields, context, write_access)
-        if 'attachment_ids' in result and 'src_model' in context:
-            result['attachment_ids']['domain'] = [('res_model','=',context['src_model']),('res_id','=',context['active_id'])]
-        return result
-
-    def sav_to_drafts(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        mailid = self.save_to_mailbox(cr, uid, ids, context=context)
-        if self.pool.get('email_template.mailbox').write(cr, uid, mailid, {'folder':'drafts'}, context):
-            return {'type':'ir.actions.act_window_close' }
-
-    def send_mail(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        mailid = self.save_to_mailbox(cr, uid, ids, context)
-        if self.pool.get('email_template.mailbox').write(cr, uid, mailid, {'folder':'outbox'}, context):
-            return {'type':'ir.actions.act_window_close' }
-
-    def get_generated(self, cr, uid, ids=None, context=None):
-        if ids is None:
-            ids = []
-        if context is None:
-            context = {}
-        logger = netsvc.Logger()
-        if context['src_rec_ids'] and len(context['src_rec_ids'])>1:
-            #Means there are multiple items selected for email.
-            mail_ids = self.save_to_mailbox(cr, uid, ids, context)
-            if mail_ids:
-                self.pool.get('email_template.mailbox').write(cr, uid, mail_ids, {'folder':'outbox'}, context)
-                logger.notifyChannel("email-template", netsvc.LOG_INFO, _("Emails for multiple items saved in outbox."))
-                self.write(cr, uid, ids, {
-                    'generated':len(mail_ids),
-                    'state':'done'
-                }, context)
-            else:
-                raise osv.except_osv(_("Email Template"),_("Email sending failed for one or more objects."))
-        return True
-     
-    def save_to_mailbox(self, cr, uid, ids, context=None):
-        def get_end_value(id, value):
-            if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets value from the template
-                return self.get_value(cr, uid, template, value, context, id)
-            else:
-                return value
-
-        if context is None:
-            context = {}
-        mail_ids = []
-        template = self._get_template(cr, uid, context)
-        for id in context['src_rec_ids']:
-            screen_vals = self.read(cr, uid, ids[0], [],context)
-            account = self.pool.get('email_template.account').read(cr, uid, screen_vals['from'], context=context)
-            vals = {
-                'email_from': tools.ustr(account['name']) + "<" + tools.ustr(account['email_id']) + ">",
-                'email_to': get_end_value(id, screen_vals['to']),
-                'email_cc': get_end_value(id, screen_vals['cc']),
-                'email_bcc': get_end_value(id, screen_vals['bcc']),
-                'subject': get_end_value(id, screen_vals['subject']),
-                'body_text': get_end_value(id, screen_vals['body_text']),
-                'body_html': get_end_value(id, screen_vals['body_html']),
-                'account_id': screen_vals['from'],
-                'state':'na',
-                'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
-            }
-            if screen_vals['signature']:
-                signature = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
-                if signature:
-                    vals['body_text'] = tools.ustr(vals['body_text'] or '') + signature
-                    vals['body_html'] = tools.ustr(vals['body_html'] or '') + signature
-
-            attachment_ids = []
-
-            #Create partly the mail and later update attachments
-            mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
-            mail_ids.append(mail_id)
-            if template.report_template:
-                reportname = 'report.' + self.pool.get('ir.actions.report.xml').read(cr, uid, template.report_template.id, ['report_name'], context)['report_name']
-                data = {}
-                data['model'] = self.pool.get('ir.model').browse(cr, uid, screen_vals['rel_model'], context).model
-
-                # Ensure report is rendered using template's language
-                ctx = context.copy()
-                if template.lang:
-                    ctx['lang'] = self.get_value(cr, uid, template, template.lang, context, id)
-                service = netsvc.LocalService(reportname)
-                (result, format) = service.create(cr, uid, [id], data, ctx)
-                attachment_id = self.pool.get('ir.attachment').create(cr, uid, {
-                    'name': _('%s (Email Attachment)') % tools.ustr(vals['subject']),
-                    'datas': base64.b64encode(result),
-                    'datas_fname': tools.ustr(get_end_value(id, screen_vals['report']) or _('Report')) + "." + format,
-                    'description': vals['body_text'] or _("No Description"),
-                    'res_model': 'email_template.mailbox',
-                    'res_id': mail_id
-                }, context)
-                attachment_ids.append( attachment_id )
-
-            # Add document attachments
-            for attachment_id in screen_vals.get('attachment_ids',[]):
-                new_id = self.pool.get('ir.attachment').copy(cr, uid, attachment_id, {
-                    'res_model': 'email_template.mailbox',
-                    'res_id': mail_id,
-                }, context)
-                attachment_ids.append( new_id )
-
-            if attachment_ids:
-                self.pool.get('email_template.mailbox').write(cr, uid, mail_id, {
-                    'attachments_ids': [[6, 0, attachment_ids]],
-                    'mail_type': 'multipart/mixed'
-                }, context)
-
-        return mail_ids
-email_template_send_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
deleted file mode 100644
index a5ad037aee6..00000000000
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-
-		<record model="ir.ui.view" id="email_template_send_wizard_form">
-			<field name="name">email_template.send.wizard.form</field>
-			<field name="model">email_template.send.wizard</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Send mail Wizard">
-					<group col="4" colspan="4">
-						<field name="rel_model" colspan="2" />
-						<field name="from" required="1" colspan="2" />
-					</group>
-					<group col="4" colspan="4">
-						<group col="6" colspan="4">
-							<field name="to" select="1" colspan="4" />
-							<newline />
-							<field name="cc" select="2" colspan="4" />
-							<newline />
-							<field name="bcc" select="2" colspan="4" />
-							<newline />
-							<field name="subject" select="2" colspan="4" attrs="{'required':[('state','=','single')]}" />
-							<newline />
-							<field name="report" colspan="4" />
-						</group>
-						<separator string="" colspan="4" />
-						<notebook colspan="4">
-							<page string="Body (Plain Text)">
-								<field name="body_text" select="2" colspan="4" nolabel="1" />
-							</page>
-							<page string="Body (HTML)">
-								<field name="body_html" select="2" 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>
-						<field name="signature" colspan="4" />
-					</group>
-					<group col="4" colspan="4" attrs="{'invisible':[('state','!=','single')]}">
-						<button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object" />
-						<button icon="gtk-ok" name="send_mail" string="Send now" type="object" />
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail" />
-					</group>
-					<group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
-					    <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
-						<field name="requested" />
-						<field name="generated" />
-						<button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2" />
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi" />
-					</group>
-					<button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done" />
-					<field name="state" />
-					<newline />
-					<label string="After clicking send all mails, mails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
-				</form>
-			</field>
-		</record>
-	</data>
-</openerp>
-
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..61006f96782
--- /dev/null
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -0,0 +1,158 @@
+# -*- 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/>
+#
+##############################################################################
+
+import base64
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+import tools
+
+
+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, otherwise
+            # it will be lost on the action's context switch
+            'mail.compose.target.model': model,
+    }
+
+class mail_compose_message(osv.osv_memory):
+    _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 []
+
+    _columns = {
+        'use_template': fields.boolean('Use Template'),
+        'template_id': fields.selection(_get_templates, 'Template',
+                                        size=-1 # means we want an int db column
+                                        ),
+    }
+
+    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)
+                # 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': base64.b64encode(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
+        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)
+
+        return {'value': values}
+
+
+    def template_toggle(self, cr, uid, ids, context=None):
+        for record in self.browse(cr, uid, ids, context=context):
+            had_template = record.use_template
+            record.write({'use_template': not(had_template)})
+            if had_template:
+                # equivalent to choosing an empty template
+                onchange_defaults = self.on_change_template(cr, uid, record.id, not(had_template),
+                                                            False, email_from=record.email_from,
+                                                            email_to=record.email_to, context=context)
+                record.write(onchange_defaults['value'])
+            return _reopen(self, record.id, record.model)
+
+    def save_as_template(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        email_template = self.pool.get('email.template')
+        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_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
+            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,
+                '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})
+
+        # _reopen same wizard screen with new template preselected
+        return _reopen(self, record.id, model)
+
+    # 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)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 680cf1e6572..1890ed7bf84 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -23,13 +23,13 @@
 {
     'name': 'Event',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Organization and management of Events.
 ======================================
 
-This module allow you
+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
     * ...
@@ -39,7 +39,7 @@ Note that:
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['crm', 'base_contact', 'account', 'marketing'],
+    'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
     'init_xml': [],
     'update_xml': [
         'security/event_security.xml',
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 8b6a4dcd0d4..47c5e65f196 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -40,24 +40,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Association Dashboard">
-                    <hpaned position="100">
-                        <child1>
+                    <board style="1-1">
+                        <column>
                             <action string="Next Events"
                                 name="%(act_event_view)d"
-                                domain="[('state','not in',('cancel','done'))]"
-                                colspan="4"/>
-                            <action
-                                string="Unconfirmed Registrations"
+                                domain="[('state','not in',('cancel','done'))]"/>
+                            <action string="Unconfirmed Registrations"
                                 name="%(event.act_event_list_register_event)d"
-                                colspan="4"
                                 domain="[('state','=','draft')]"/>
-                        </child1>
-                        <child2>
+                        </column>
+                        <column>
                             <action string="Events Filling Status"
-                                name="%(act_event_reg)d"
-                                colspan="4"/>
-                        </child2>
-                    </hpaned>
+                                name="%(act_event_reg)d"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
@@ -69,9 +65,8 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-        <menuitem id="board_associations" name="Dashboard" parent="base.menu_report_association" sequence="0"/>
         <menuitem
-            name="Events" parent="board_associations"
+            name="Event Dashboard" parent="base.menu_report_association"
             action="open_board_associations_manager"
             sequence="1"
             id="menu_board_associations_manager"
diff --git a/addons/event/event.py b/addons/event/event.py
index 0fc28c7c193..ab575408c63 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -24,8 +24,11 @@ import time
 from crm import crm
 from osv import fields, osv
 from tools.translate import _
-import tools
 import decimal_precision as dp
+from crm import wizard
+
+
+wizard.mail_compose_message.SUPPORTED_MODELS.append('event.registration')
 
 class event_type(osv.osv):
     """ Event Type """
@@ -280,7 +283,7 @@ class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = 'mailgate.thread'
+    _inherit = 'mail.thread'
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         cur_obj = self.pool.get('res.currency')
@@ -293,6 +296,7 @@ class event_registration(osv.osv):
         return res
 
     _columns = {
+        'id': fields.integer('ID'),
         'name': fields.char('Summary', size=124,  readonly=True, states={'draft': [('readonly', False)]}),
         'email_cc': fields.text('CC', size=252, readonly=False, states={'done': [('readonly', True)]}, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"),
@@ -313,8 +317,8 @@ class event_registration(osv.osv):
         'create_date': fields.datetime('Creation Date', readonly=True),
         'write_date': fields.datetime('Write Date', readonly=True),
         'description': fields.text('Description', states={'done': [('readonly', True)]}),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'date_deadline': fields.related('event_id','date_end', type='datetime', string="End Date", readonly=True),
         'date': fields.related('event_id', 'date_begin', type='datetime', string="Start Date", readonly=True),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
@@ -354,7 +358,7 @@ class event_registration(osv.osv):
             })
         inv_id = inv_pool.create(cr, uid, val_invoice['value'], context=context)
         inv_pool.button_compute(cr, uid, [inv_id])
-        self.history(cr, uid, [reg], _('Invoiced'))
+        self.message_append(cr, uid, [reg], _('Invoiced'))
         return inv_id
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -429,7 +433,7 @@ class event_registration(osv.osv):
         """
         res = self.write(cr, uid, ids, {'state': 'open'}, context=context)
         self.mail_user(cr, uid, ids)
-        self.history(cr, uid, ids, _('Open'))
+        self.message_append(cr, uid, ids, _('Open'))
         return res
 
     def do_close(self, cr, uid, ids, context=None):
@@ -443,7 +447,7 @@ class event_registration(osv.osv):
         if invoice_id:
             values['invoice_id'] = invoice_id
         res = self.write(cr, uid, ids, values)
-        self.history(cr, uid, ids, msg)
+        self.message_append(cr, uid, ids, msg)
         return res
 
     def check_confirm(self, cr, uid, ids, context=None):
@@ -514,42 +518,38 @@ class event_registration(osv.osv):
         """This Function Cancel Event Registration.
         """
         registrations = self.browse(cr, uid, ids)
-        self.history(cr, uid, registrations, _('Cancel'))
+        self.message_append(cr, uid, registrations, _('Cancel'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def mail_user(self, cr, uid, ids, confirm=False, context=None):
         """
         Send email to user
         """
-
-        for regestration in self.browse(cr, uid, ids, context=context):
-            src = regestration.event_id.reply_to or False
+        mail_message = self.pool.get('mail.message')
+        for registration in self.browse(cr, uid, ids, context=context):
+            src = registration.event_id.reply_to or False
             email_to = []
             email_cc = []
-            if regestration.email_from:
-                email_to = regestration.email_from
-            if regestration.email_cc:
-                email_cc += [regestration.email_cc]
+            if registration.email_from:
+                email_to = [registration.email_from]
+            if registration.email_cc:
+                email_cc += [registration.email_cc]
             if not (email_to or email_cc):
                 continue
             subject = ""
             body = ""
             if confirm:
-                subject = _('Auto Confirmation: [%s] %s') %(regestration.id, regestration.name)
-                body = regestration.event_id.mail_confirm
-            elif regestration.event_id.mail_auto_confirm or regestration.event_id.mail_auto_registr:
-                if regestration.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and regestration.event_id.mail_auto_registr:
-                    subject = _('Auto Registration: [%s] %s') %(regestration.id, regestration.name)
-                    body = regestration.event_id.mail_registr
-                if (regestration.event_id.state in ['confirm', 'running']) and regestration.event_id.mail_auto_confirm:
-                    subject = _('Auto Confirmation: [%s] %s') %(regestration.id, regestration.name)
-                    body = regestration.event_id.mail_confirm
+                subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name)
+                body = registration.event_id.mail_confirm
+            elif registration.event_id.mail_auto_confirm or registration.event_id.mail_auto_registr:
+                if registration.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and registration.event_id.mail_auto_registr:
+                    subject = _('Auto Registration: [%s] %s') %(registration.id, registration.name)
+                    body = registration.event_id.mail_registr
+                if (registration.event_id.state in ['confirm', 'running']) and registration.event_id.mail_auto_confirm:
+                    subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name)
+                    body = registration.event_id.mail_confirm
             if subject or body:
-                tools.email_send(src, email_to, subject, body, email_cc=email_cc, openobject_id=regestration.id)
-                self.history(cr, uid, [regestration], subject, history = True, \
-                        email=email_to, details=body, \
-                        subject=subject, email_from=src, \
-                        email_cc=', '.join(email_cc))
+                mail_message.schedule_with_attach(cr, uid, src, email_to, subject, body, model='event.registration', email_cc=email_cc, res_id=registration.id)
 
         return True
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6eafd851559..6a057fe204d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -6,7 +6,7 @@
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
 
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
-        <menuitem name="Events Organisation" id="base.menu_event_association" parent="base.menu_association" />
+        <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
 
     <!-- EVENTS  -->
 
@@ -42,7 +42,7 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_association" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
 
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
+        <menuitem name="Events Type" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -228,18 +228,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Events">
-                    <group col="10" colspan="4">
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+                    <group>
+                        <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="date_begin" select="1"/>
+                        <field name="date_begin"/>
                         <field name="section_id" widget="selection" groups="base.group_extended">
                           <filter icon="terp-personal+"
                                   context="{'invisible_section': False}"
@@ -249,7 +249,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="12">
+                    <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
@@ -391,11 +391,11 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
+                                    <field name="email_from" invisible="1"/>
                                     <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
+                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -404,20 +404,18 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
-                                        <field name="history" invisible="1"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
-                                            <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+                                            <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                                <field name="body_text" colspan="4" nolabel="1" height="250"/>
+                                                <button colspan="4" string="Reply"
+                                                    name="%(mail.action_email_compose_message_wizard)d"
+                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                                    icon="terp-mail-replied" type="action"/>
                                             </group>
-                                            <group attrs="{'invisible': [('history', '=', True)]}">
+                                            <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
@@ -427,14 +425,13 @@
                                     </notebook>
                                 </form>
                             </field>
-                             <button string="Add Internal Note"
+                            <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                              <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'event.registration'}"
-                                icon="terp-mail-message-new" type="action" />
+                            <button string="Send New Email"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                icon="terp-mail-message-new" type="action"/>
                            </page>
                     </notebook>
                 </form>
@@ -477,8 +474,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
-                    <group col="12" colspan="4">
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
+                    <group>
+                        <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"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />
@@ -489,7 +486,7 @@
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="state" select="1"/>
+                        <field name="state"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/event/i18n/ar.po b/addons/event/i18n/ar.po
index bef46795e02..64f34cf313e 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/bg.po b/addons/event/i18n/bg.po
index e727103aefd..0755abed90d 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -329,6 +329,9 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Фактурите за това събитие ще бъдат създадени с този продукт. Това позволява "
+"да се укаже етикета по подразбиране и счетоводната информация, която искате "
+"по подразбиране за тези фактури."
 
 #. module: event
 #: view:event.registration:0
@@ -344,7 +347,7 @@ 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
@@ -424,7 +427,7 @@ msgstr "Отказ от регистрация"
 #: code:addons/event/event.py:395
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Регистрирания контрагент няма адрес за генериране на фактура."
 
 #. module: event
 #: field:event.registration,nb_register:0
@@ -482,7 +485,7 @@ msgstr "Изрично потвърждение"
 #: 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:event.event:0
@@ -504,6 +507,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 ""
+"Ако събитието е създадено, състоянието е \"Проект\". Ако събитието е "
+"потвърдено за определените дати, състоянието е \"Потвърдено\". Ако събитието "
+"е приключило, състоянието е настроен на \"Готово\". Ако събитието е отменено "
+"състоянието енастроен на \"Отменено\"."
 
 #. module: event
 #: view:event.event:0
@@ -673,6 +680,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Тези имейл адреси ще бъдат добавени към CC полето на всички входящи и "
+"изходящи имейли за този запис преди да бъде изпратено. Повече от един имейл "
+"адрес да се разделят със запетая"
 
 #. module: event
 #: constraint:res.partner:0
@@ -754,6 +764,8 @@ 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
@@ -774,6 +786,8 @@ msgstr "Разширени филтри"
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
 msgstr ""
+"Имейл адресът поставени в \"Отговор до\" на всички имейли, изпратени от "
+"OpenERP"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -783,7 +797,7 @@ msgstr "Октомври"
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Общо отворени и готови регистрации"
 
 #. module: event
 #: field:event.event,language:0
@@ -863,7 +877,7 @@ 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
@@ -1126,7 +1140,7 @@ msgstr "Държава"
 #: 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:500
@@ -1184,7 +1198,7 @@ msgstr "Начална дата на събитие"
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Основен текст на съобщението за регистрация"
 
 #. module: event
 #: view:partner.event.registration:0
@@ -1220,7 +1234,7 @@ msgstr "Общо"
 #. module: event
 #: help:event.event,register_min:0
 msgid "Providee Minimum Number of Registrations"
-msgstr ""
+msgstr "Осигуряване на минимален брой на регистрациите"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
@@ -1235,6 +1249,10 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"Събитие е обект от ниско ниво, използвано от срещи и другите документи, "
+"които трябва да бъдат синхронизирани с мобилни устройства или календар "
+"приложения чрез CalDAV. Повечето потребители трябва да работят в менюто "
+"Календар, а не в списъка на събитията."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Невалиден XML за преглед на архитектурата"
@@ -1331,9 +1349,6 @@ msgstr ""
 #~ msgid "Confirmed Events"
 #~ msgstr "Потвърдени събития"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Грешка! Не може да създавате вложени секции."
-
 #~ msgid "Invoice Rejected"
 #~ msgstr "Фактурата отказана"
 
diff --git a/addons/event/i18n/bs.po b/addons/event/i18n/bs.po
index 4e6e846abb5..663891a3b2a 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ca.po b/addons/event/i18n/ca.po
index 8fa0a498732..9138820b550 100644
--- a/addons/event/i18n/ca.po
+++ b/addons/event/i18n/ca.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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
 msgid "Invoice Information"
-msgstr ""
+msgstr "Informació de la factura"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+msgstr "Indica número màxim de registres"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr ""
+msgstr "Detalls d'esdeveniment"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr ""
+msgstr "Ponent principal"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: event
 #: field:event.event,register_min:0
@@ -52,12 +52,12 @@ msgstr "Registres mínims"
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr ""
+msgstr "Confirmació per al registre de l'esdeveniment"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Tí­tol"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -67,23 +67,23 @@ msgstr "Email de registre"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Realitza factures"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Data del registre"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who are giving speech on event."
-msgstr ""
+msgstr "Ponent que donarà una conferència en l'esdeveniment."
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Tanca"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -97,11 +97,14 @@ msgid ""
 "event. Note that you can specify for each registration a specific amount if "
 "you want to"
 msgstr ""
+"Aquest serà el preu per defecte utilitzat com a preu de registre quan es "
+"facturi aquest esdeveniment. Tingueu en compte que podeu indicar una "
+"quantitat específica per a cada registre si ho desitgeu."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -112,7 +115,7 @@ msgstr "Email de confirmació"
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "El registre no té cap empresa per facturar."
 
 #. module: event
 #: field:event.event,company_id:0
@@ -120,12 +123,12 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data de la factura"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:93
@@ -140,12 +143,12 @@ msgstr "Registre esdeveniment"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 7 Days"
-msgstr ""
+msgstr "Últims 7 dies"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Esdeveniment pare"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
@@ -155,7 +158,7 @@ msgstr "Crea factura"
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
 
 #. module: event
 #: view:report.event.registration:0
@@ -165,12 +168,12 @@ msgstr "Esdeveniment en el registre"
 #. module: event
 #: view:report.event.registration:0
 msgid "Current Events"
-msgstr ""
+msgstr "Esdeveniments actuals"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Afegeix nota interna"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -178,12 +181,12 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr ""
+msgstr "Anàlisi d'esdeveniments"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -207,17 +210,17 @@ msgstr "Confirma esdeveniment"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Respondre a"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 msgid "Event Dashboard"
-msgstr ""
+msgstr "Taulell d'esdeveniments"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -227,7 +230,7 @@ msgstr "Òpera de Verdi"
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Llista de preus"
 
 #. module: event
 #: field:event.registration,contact_id:0
@@ -237,23 +240,23 @@ msgstr "Contacte empresa"
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "esdeveniment.registre.credencial"
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referència"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr ""
+msgstr "Data de tancament de l'esdeveniment."
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr ""
+msgstr "Correus electrònics"
 
 #. module: event
 #: view:event.registration:0
@@ -264,7 +267,7 @@ msgstr "Informació extra"
 #: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Factures de client"
 
 #. module: event
 #: selection:event.event,state:0
@@ -280,7 +283,7 @@ msgstr "Tipus d'esdeveniment"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Tipus d'esdeveniment "
 
 #. module: event
 #: view:event.event:0
@@ -299,7 +302,7 @@ msgstr "Esdeveniment"
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr ""
+msgstr "Credencials"
 
 #. module: event
 #: view:event.event:0
@@ -318,7 +321,7 @@ msgstr "Confirmació del registre"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Versió de tarifa per l'esdeveniment actual."
 
 #. module: event
 #: help:event.event,product_id:0
@@ -327,27 +330,30 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Les factures d'aquest registre d'esdeveniment es crearan amb aquest "
+"producte. Per tant li permeten assignar l'etiqueta per defecte i la "
+"informació comptable que desitgeu per defecte en aquestes factures."
 
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Varis"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr ""
+msgstr "Altres ponents"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Fes factura d'esdeveniment"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Número de registres o entrades"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -356,22 +362,22 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avís!"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envia nou correu electrònic"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Localització"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Respon"
 
 #. module: event
 #: field:event.event,register_current:0
@@ -393,7 +399,7 @@ msgstr "Tipus"
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
@@ -404,12 +410,12 @@ msgstr "Per ser facturat"
 #: code:addons/event/event.py:394
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Error !"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data creació"
 
 #. module: event
 #: view:event.event:0
@@ -422,17 +428,18 @@ msgstr "Cancel·la registre"
 #: code:addons/event/event.py:395
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "L'empresa registrada no té una adreça de facturació."
 
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
 msgstr ""
+"Tipus d'esdeveniment com a seminari, exhibició, conferència, formació."
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -448,22 +455,22 @@ msgstr ""
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrati./event/event.py:41:ons"
-msgstr ""
+msgstr "Total de registres previstos."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr ""
+msgstr "Organització de l'esdeveniment"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Informació històrica"
 
 #. module: event
 #: view:event.registration:0
@@ -480,7 +487,7 @@ msgstr "Confirma de totes maneres"
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "Avís: L'esdeveniment '%s' ha aconseguit el seu límit màxim (%s)."
 
 #. module: event
 #: view:event.event:0
@@ -502,6 +509,9 @@ 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 ""
+"Quan es crea l'esdeveniment, l'estat és 'Esborrany'. Si es confirma per a "
+"unes dates en concret, l'estat és 'Confirmat'. Si ja ha passat, l'estat és "
+"'Realitzat'. Si es cancel·la l'esdeveniment, l'estat és 'Cancel·lat'."
 
 #. module: event
 #: view:event.event:0
@@ -512,12 +522,12 @@ msgstr "Cancel·la esdeveniment"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Últims 30 dies"
 
 #. module: event
 #: view:event.event:0
@@ -525,19 +535,19 @@ msgstr ""
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. 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 "Estat de l'assistència en els esdeveniments"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Agrupa les factures"
 
 #. module: event
 #: view:event.event:0
@@ -563,7 +573,7 @@ msgstr "Empresa facturada"
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Registres"
 
 #. module: event
 #: view:event.event:0
@@ -573,33 +583,33 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: event
 #: field:event.registration,event_product:0
 msgid "Invoice Name"
-msgstr ""
+msgstr "Nom factura"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " Nº de registres en esborrany"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: event
 #: view:event.event:0
@@ -625,44 +635,59 @@ msgid ""
 "event or per event category in:\n"
 "                Events / Reporting\n"
 msgstr ""
+"Organització i gestió d'esdeveniments.\n"
+"\n"
+"Aquest mòdul li permet\n"
+"* Gestionar els seus esdeveniments i els vostres registres\n"
+"* Utilitzar emails per confirmar i enviar acusaments automàticament per a "
+"cada registre a un esdeveniment\n"
+"* ...\n"
+"Un taulell per a associacions que inclou:\n"
+"* Registres per esdeveniment (gràfic)\n"
+"Tingueu en compte que:\n"
+"- Podeu definir nous tipus d'esdeveniments en\n"
+"Esdeveniments / Configuració / Tipus d'esdeveniments\n"
+"- Podeu accedir a informes predefinits sobre el número de registres per "
+"esdeveniment o per categoria d'esdeveniment en:\n"
+"Esdeveniments / Informes\n"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Error! No podeu crear esdeveniments recursius."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referència 2"
 
 #. module: event
 #: code:addons/event/event.py:357
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturat"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Els meus esdeveniments"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Ponents"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Crea factures"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -671,26 +696,29 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Aquestes adreces de correu seran afegides al camp CC en tots els correus "
+"entrants i sortints d'aquest registre abans de ser enviats. Separeu les "
+"diferents adreces de correu amb una coma."
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursivament."
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Desitgeu crear la/es factura/es?"
 
 #. module: event
 #: view:event.event:0
 msgid "Beginning Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancat"
 
 #. module: event
 #: view:event.event:0
@@ -710,23 +738,23 @@ msgstr "Número de registres"
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Esdeveniments fills"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "desconegut"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
@@ -739,12 +767,12 @@ msgstr ""
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Data d'escriptura"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr ""
+msgstr "Els meus registres"
 
 #. module: event
 #: view:event.confirm:0
@@ -752,57 +780,61 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Avís: Aquest esdeveniment no ha arribat al seu límit de registres mínim. "
+"Esteu segurs que desitgeu confirmar-ho?"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
 msgstr ""
+"L'adreça de correu utilitzada com 'Respondre a' de tots els correus enviats "
+"per OpenERP."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Total de registres oberts i realitzats."
 
 #. module: event
 #: field:event.event,language:0
 msgid "Language"
-msgstr ""
+msgstr "Llenguatge"
 
 #. 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 "Gener"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Aquestes persones rebran un correu electrònic."
 
 #. module: event
 #: view:event.event:0
@@ -823,17 +855,17 @@ msgstr "Confirmació registre"
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: event
 #: model:ir.ui.menu,name:event.board_associations
 msgid "Dashboard"
-msgstr ""
+msgstr "Taulell"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Cos del missatge de confirmació"
 
 #. module: event
 #: view:event.registration:0
@@ -844,7 +876,7 @@ msgstr "Historial"
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Adreça ubicació"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
@@ -855,13 +887,13 @@ msgstr "Tipus d'esdeveniments"
 #. module: event
 #: view:event.registration:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjunts"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "L'esdeveniment associat no té cap producte definit"
 
 #. module: event
 #: view:event.event:0
@@ -871,12 +903,12 @@ msgstr "Email de confirmació automàtic"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Últims 365 dies"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Error! La data de tancament no pot ser anterior a la d'inici."
 
 #. module: event
 #: code:addons/event/event.py:442
@@ -903,7 +935,7 @@ msgstr "Factura"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: event
 #: code:addons/event/event.py:517
@@ -916,12 +948,12 @@ msgstr "Cancel·la"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Esdeveniments per registre"
 
 #. module: event
 #: code:addons/event/event.py:432
@@ -932,14 +964,14 @@ msgstr "Obre"
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Usuari responsable"
 
 #. module: event
 #: code:addons/event/event.py:538
 #: code:addons/event/event.py:545
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "Autoconfirmació: [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -948,20 +980,20 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Cost del registre"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -973,12 +1005,12 @@ msgstr "Preu unitat"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Ponent"
 
 #. module: event
 #: view:event.registration:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -991,18 +1023,18 @@ msgstr "Conferència en negocis ERP"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: event
 #: field:event.event,product_id:0
@@ -1017,27 +1049,27 @@ msgstr "Producte"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " Nº de registres confirmats"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Subscriure"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+msgstr "Registre d'esdeveniments"
 
 #. module: event
 #: help:event.event,mail_registr:0
@@ -1053,55 +1085,55 @@ msgstr "Entrada per a conferència"
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Direcció"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "Pròxims esdeveniments"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_Subscriure"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  Registre d'esdeveniments "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr ""
+msgstr "Data d'inici de l'esdeveniment."
 
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "No confirmat"
 
 #. module: event
 #: code:addons/event/event.py:542
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "Auto registre: [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Taulell d'associats"
 
 #. module: event
 #: view:event.event:0
@@ -1121,13 +1153,13 @@ msgstr ""
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "El registre està marcat com no facturable."
 
 #. module: event
 #: code:addons/event/event.py:500
@@ -1136,18 +1168,18 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "Tanca registre"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Resum"
 
 #. module: event
 #: view:event.event:0
@@ -1169,7 +1201,7 @@ msgstr "Registres"
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: event
 #: field:event.event,register_max:0
@@ -1180,30 +1212,30 @@ msgstr "Registres màxims"
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Data d'inici esdeveniment"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Cos del correu del registre"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Esdeveniment a registrar-se"
 
 #. 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 "No podeu crear la factura si el registre està en estat '%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 "Confirmació de l'esdeveniment"
 
 #. module: event
 #: view:event.event:0
@@ -1215,17 +1247,17 @@ msgstr "Email de registre automàtic"
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Providee Minimum Number of Registrations"
-msgstr ""
+msgstr "Introduïu el número mínim de registres."
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Ponent confirmat"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1235,6 +1267,10 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"L'esdeveniment és un objecte de baix nivell utilitzat per les reunions i "
+"altres documents que s'han de sincronitzar amb dispositius mòbils o "
+"aplicacions de calendari mitjançant CalDAV. La majoria dels usuaris haurien "
+"de treballar en el menú agenda, i no en la llista d'esdeveniments."
 
 #~ msgid "Case section"
 #~ msgstr "Secció del cas"
@@ -1391,9 +1427,6 @@ msgstr ""
 #~ msgid "Error!"
 #~ msgstr "Error!"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Error! No podeu crear seccions recursives."
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po
index 125807fe8b3..616838be295 100644
--- a/addons/event/i18n/cs.po
+++ b/addons/event/i18n/cs.po
@@ -4,44 +4,45 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"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: 2010-08-03 06:13+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-11-25 10:45+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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: event
 #: view:event.event:0
 msgid "Invoice Information"
-msgstr ""
+msgstr "Informace faktury"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+msgstr "Poskytuje maximální počet registrací"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr ""
+msgstr "Podrobnosti události"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr ""
+msgstr "Hlavní řečník"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: event
 #: field:event.event,register_min:0
@@ -51,12 +52,12 @@ msgstr "Minimální registrace"
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr ""
+msgstr "Potvrzení pro registraci události"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Název"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -66,23 +67,23 @@ msgstr "Registrační email"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Vytvoření faktůr"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Datum registrace"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who are giving speech on event."
-msgstr ""
+msgstr "Řečník, který promlouvá na událostí"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Zavřít"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -96,11 +97,14 @@ msgid ""
 "event. Note that you can specify for each registration a specific amount if "
 "you want to"
 msgstr ""
+"Toto bude výchozí cena použitá jako cena registrace, kdy je tato událost "
+"fakturována. Berte na vědomí, že pokud chcete, můžete určit pro každou "
+"registraci jinou částku"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -111,7 +115,7 @@ msgstr "Potvrzovací e-mail"
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "Registrace nemá žádného partnera k fakturaci."
 
 #. module: event
 #: field:event.event,company_id:0
@@ -119,12 +123,12 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Společnost"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum faktury"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:93
@@ -139,37 +143,37 @@ msgstr "Registrace události"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 7 Days"
-msgstr ""
+msgstr "Posledních 7 dní"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Nadřazená událost"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr ""
+msgstr "Fakturovat"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Mezivýsledek"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr ""
+msgstr "Události při registraci"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Current Events"
-msgstr ""
+msgstr "Aktuální události"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Přidat vnitřní poznámku"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -177,17 +181,17 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr ""
+msgstr "Analýza události"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Zprávy"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Automatické potvrzení poštou"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
@@ -206,17 +210,17 @@ msgstr "Potvrdit událost"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Zrušeno"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odpovědět"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 msgid "Event Dashboard"
-msgstr ""
+msgstr "Nástěnka události"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -226,7 +230,7 @@ msgstr "Verdiho opera"
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Ceník"
 
 #. module: event
 #: field:event.registration,contact_id:0
@@ -236,23 +240,23 @@ msgstr "Kontakt partnera"
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "event.registration.badge"
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Odkaz"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr ""
+msgstr "Datum ukončení události"
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr ""
+msgstr "Emaily"
 
 #. module: event
 #: view:event.registration:0
@@ -263,7 +267,7 @@ msgstr "Další informace"
 #: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Faktury zákazníků"
 
 #. module: event
 #: selection:event.event,state:0
@@ -279,7 +283,7 @@ msgstr "Typ události"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Typ události "
 
 #. module: event
 #: view:event.event:0
@@ -298,7 +302,7 @@ msgstr "Událost"
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr ""
+msgstr "Vyznamenání"
 
 #. module: event
 #: view:event.event:0
@@ -312,12 +316,12 @@ msgstr "Potvrzeno"
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr ""
+msgstr "Potvrzení registrace"
 
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Verze ceníku pro aktuální událost."
 
 #. module: event
 #: help:event.event,product_id:0
@@ -326,27 +330,30 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Faktury této registrace události budou vytvořeny pro tento výrobek. A tak "
+"vám umožní nastavit výchozí titulek a účetní informace, které chcete jako "
+"výchozí na těchto fakturách."
 
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Různé"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr ""
+msgstr "Další řečníci"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Událost vytváří fakturu"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Počet registrací nebo lístků"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -355,83 +362,83 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varování !"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Poslat nový email"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Umístění"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Odpovědět"
 
 #. module: event
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr ""
+msgstr "Potvrzené registrace"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr ""
+msgstr "Automatická registrace poštou"
 
 #. module: event
 #: field:event.event,type:0
 #: field:partner.event.registration,event_type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "K fakturaci"
 
 #. module: event
 #: code:addons/event/event.py:394
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Chyba !"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum vytvoření"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "Cancel Registration"
-msgstr "Ukončit registraci"
+msgstr "Zrušit registraci"
 
 #. module: event
 #: code:addons/event/event.py:395
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Registrovaný partner nemá adresu k fakturaci."
 
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "Množství"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr ""
+msgstr "Typ události jako seminář, výstava, konference, kurz."
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -440,43 +447,46 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
+"Tento email bude odeslán jakmile bude událost potvrzena nebo když se někdo "
+"upíše k potvrzené události. Toto je také email odeslaný někomu k připomenutí "
+"události."
 
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrati./event/event.py:41:ons"
-msgstr ""
+msgstr "Celkem očekávaných registrací"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr ""
+msgstr "Organizace události"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Informace historie"
 
 #. module: event
 #: view:event.registration:0
 msgid "Dates"
-msgstr "Datumy"
+msgstr "Data"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr ""
+msgstr "Přesto potvrdit"
 
 #. 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 "Varování: Událost '%s' dosáhla svého maximálního limitu (%s)."
 
 #. module: event
 #: view:event.event:0
@@ -489,7 +499,7 @@ msgstr "Registrace"
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr ""
+msgstr "Počet událostí"
 
 #. module: event
 #: help:event.event,state:0
@@ -498,22 +508,26 @@ 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 ""
+"Pokud je událost vytvořena, stav je 'Koncept'. Pokud je událost potvrzena "
+"pro určitá data, stav je nastaven na 'Potvrzené'. Pokud je po události, stav "
+"je nastaven na 'Dokončeno'. Pokud je událost zrušena, stav je nastaven na "
+"'Zrušeno'."
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr "Ukončit událost"
+msgstr "Zrušit událost"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontaktní"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Posledních 30 dní"
 
 #. module: event
 #: view:event.event:0
@@ -521,45 +535,45 @@ msgstr ""
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. 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 "Stav naplnění události"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Seskupit faktury"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "Odesílání"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr ""
+msgstr "Lístek na koncert"
 
 #. module: event
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr ""
+msgstr "Nepotvrzené registrace"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr ""
+msgstr "Fakturováno partnerovi"
 
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Záznamy"
 
 #. module: event
 #: view:event.event:0
@@ -569,33 +583,33 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "Září"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #. module: event
 #: field:event.registration,event_product:0
 msgid "Invoice Name"
-msgstr ""
+msgstr "Jméno faktury"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # Počet konceptů registrací"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Měsíc"
 
 #. module: event
 #: view:event.event:0
@@ -621,44 +635,59 @@ msgid ""
 "event or per event category in:\n"
 "                Events / Reporting\n"
 msgstr ""
+"Organizace a správa událostí.\n"
+"\n"
+"    Tento modul vám umožní\n"
+"        * spravovat vaše události a jejich registrace\n"
+"        * použít více emailů k automatickému potvrzení a odeslání potvrzení "
+"pro jakoukoliv registraci k události\n"
+"        * ...\n"
+"    Nástěnka pro asociace zahrnuje:\n"
+"    * Registrace podle událostí (graf)\n"
+"    Berte na vědomí, že:\n"
+"    - Můžete určit nové typy událostí v\n"
+"                Události / Nastavení / Typy událostí\n"
+"    - Můžete přistupovat k předdefinovaným výkazům o počtu registrací na "
+"událost nebo na kategorii události v:\n"
+"                Události / Vykazování\n"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Zpráva"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní událost."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Odkaz 2"
 
 #. module: event
 #: code:addons/event/event.py:357
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturováno"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Moje události"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Řečníci"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Vytvořit faktury"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -667,26 +696,29 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Tyto emailové adresy budou přidány do pole CC všech příchozích a odchozích "
+"emailů pro tento záznam před odesláním. Oddělte více emailových adres pomocí "
+"čárky"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní asociované členy."
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Opravdu chcete vytvořit fakturu(y) ?"
 
 #. module: event
 #: view:event.event:0
 msgid "Beginning Date"
-msgstr ""
+msgstr "Datum zahájení"
 
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Uzavřeno"
 
 #. module: event
 #: view:event.event:0
@@ -696,49 +728,51 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_event_event_assiciation
 #: view:res.partner:0
 msgid "Events"
-msgstr "Akce"
+msgstr "Události"
 
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr ""
+msgstr "Počet registrací"
 
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Podřízené události"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "neznámé"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use the automatic mailing for new registration"
 msgstr ""
+"Zaškrtněte toto políčko, pokud chcete použít automatickou poštu pro nové "
+"registrace"
 
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Zapsat datum"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr ""
+msgstr "Moje registrace"
 
 #. module: event
 #: view:event.confirm:0
@@ -746,62 +780,66 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Varování: Tato událost nedosáhla svého minimálního limitu registrací. "
+"Opravdu ji chcete potvrdit?"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivní"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšířené filtry..."
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
 msgstr ""
+"Tato emailová adresa vložená v 'Odpovědět komu' všech emailů poslaných z "
+"OpenERP"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Celkem otevřených a dokončených registrací"
 
 #. module: event
 #: field:event.event,language:0
 msgid "Language"
-msgstr ""
+msgstr "Jazyk"
 
 #. 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 "Leden"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Tito lidé obdrží email."
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "Nastavit na koncept"
 
 #. module: event
 #: code:addons/event/event.py:472
@@ -810,35 +848,35 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr ""
+msgstr "Potvrdit registraci"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: event
 #: model:ir.ui.menu,name:event.board_associations
 msgid "Dashboard"
-msgstr ""
+msgstr "Nástěnka"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Tělo potvrzovacího emailu"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr "Přehled změn"
+msgstr "Historie"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Adresa místa"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
@@ -849,28 +887,28 @@ msgstr "Typy událostí"
 #. module: event
 #: view:event.registration:0
 msgid "Attachments"
-msgstr ""
+msgstr "Přílohy"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "Vztažená událost nemá určen žádný výrobek"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "Automatický potvrzovací email"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Posledních 365 dní"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Chyba ! Datum uzavření nemůže být nastaven přes datum zahájení."
 
 #. module: event
 #: code:addons/event/event.py:442
@@ -885,37 +923,37 @@ msgstr "Dokončeno"
 #. module: event
 #: field:event.event,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "Datum zahájení"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: event
 #: code:addons/event/event.py:517
 #, python-format
 msgid "Cancel"
-msgstr "Ukončení"
+msgstr "Zrušit"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Uzavřít"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Událost podle registrace"
 
 #. module: event
 #: code:addons/event/event.py:432
@@ -926,14 +964,14 @@ msgstr "Otevřít"
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Odpovědný uživatel"
 
 #. module: event
 #: code:addons/event/event.py:538
 #: code:addons/event/event.py:545
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "Automatické potvrzení: [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -942,42 +980,42 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odpovědný"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Cena registrace"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Current"
-msgstr ""
+msgstr "Aktuální"
 
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena za kus"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Řečník"
 
 #. module: event
 #: view:event.registration:0
 msgid "Details"
-msgstr ""
+msgstr "Podrobnosti"
 
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "Konference o ERP podnikání"
 
 #. module: event
 #: field:event.event,section_id:0
@@ -985,25 +1023,25 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Prodejní tým"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Datum uzavření"
 
 #. module: event
 #: field:event.event,product_id:0
 #: view:report.event.registration:0
 #: field:report.event.registration,product_id:0
 msgid "Product"
-msgstr "Produkt"
+msgstr "Výrobek"
 
 #. module: event
 #: view:event.event:0
@@ -1011,96 +1049,96 @@ msgstr "Produkt"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " # Počet potvrzených registrací"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Upsat se"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+msgstr "Registrace událostí"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "Email bude odeslán, když se někdo upíše k události."
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
 msgid "Ticket for Conference"
-msgstr "Lístek pro Konferenci"
+msgstr "Lístek pro konferenci"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "Další události"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_Upsat se"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  registrace události "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr ""
+msgstr "Datum zahájení události"
 
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Nepotvrzené"
 
 #. module: event
 #: code:addons/event/event.py:542
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "Automatická registrace: [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Datum ukončení"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Nástěnka asociací"
 
 #. module: event
 #: view:event.event:0
 #: field:event.registration.badge,name:0
 msgid "Name"
-msgstr ""
+msgstr "Jméno"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
@@ -1108,17 +1146,19 @@ msgid ""
 "Check this box if you want ot use the automatic confirmation emailing or the "
 "reminder"
 msgstr ""
+"Zaškrtněte toto políčko, pokud chcete použít automatické potvrzování "
+"registrací nebo připomínání"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Země"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "Registrace je nastavena jako Nelze fakturovat"
 
 #. module: event
 #: code:addons/event/event.py:500
@@ -1127,18 +1167,18 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "Uzavřít registrace"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Souhrn"
 
 #. module: event
 #: view:event.event:0
@@ -1146,7 +1186,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr ""
+msgstr "Typ události"
 
 #. module: event
 #: view:event.event:0
@@ -1160,63 +1200,63 @@ msgstr "Registrace"
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "Nejvíce registrací"
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Datum zahájení události"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Tělo registračního emailu"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Událost pro registraci"
 
 #. 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 "Pokud je registrace ve stavu %s, nemůže být vytvořena faktura."
 
 #. 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 "Portvrzení události"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "Email automatické registrace"
 
 #. module: event
 #: view:event.registration:0
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Celkem"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Providee Minimum Number of Registrations"
-msgstr ""
+msgstr "Poskytuje minimální počet registrací"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Řečník potvrzen"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1226,6 +1266,10 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"Událost je nízkoúrovňový objekt použitý pro setkání a jiné dokumenty, které "
+"by měly být synchronizovány s mobilními zařízeními nebo kalendářových "
+"aplikací přes caldav. Většina uživatelů by měla pracovat s nabídkou "
+"Kalendáře a ne v seznamu událostí."
 
 #~ msgid "Configuration"
 #~ msgstr "Konfigurace"
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
new file mode 100644
index 00000000000..9db53ff2a77
--- /dev/null
+++ b/addons/event/i18n/da.po
@@ -0,0 +1,1229 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-09 21:21+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: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: event
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "Faktura information"
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximun Number of Registrations"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr ""
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr "Hovedtaler"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr "Gruppér efter..."
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr "Titel"
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr ""
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who are giving speech on event."
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr "_Luk"
+
+#. module: event
+#: model:event.event,name:event.event_0
+msgid "Concert of Bon Jovi"
+msgstr ""
+
+#. 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 for each registration a specific amount if "
+"you want to"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:63
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr ""
+
+#. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Faktura dato"
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:93
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
+#: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
+msgid "Event Registration"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 7 Days"
+msgstr "Seneste 7 dage"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
+msgid "Make Invoice"
+msgstr ""
+
+#. module: event
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Current Events"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr ""
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:122
+#: view:event.event:0
+#, python-format
+msgid "Confirm Event"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr "Svar til"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+msgid "Event Dashboard"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_1
+msgid "Opera of Verdi"
+msgstr ""
+
+#. module: event
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr "E-mails"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "Ekstra information"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:83
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: event
+#: field:event.type,name:0
+msgid "Event type"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
+msgid "Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: event
+#: view:event.confirm.registration:0
+msgid "Registration Confirmation"
+msgstr ""
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr ""
+
+#. module: event
+#: help:event.event,product_id:0
+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 ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Misc"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr ""
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_current:0
+#: view:report.event.registration:0
+msgid "Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr ""
+
+#. module: event
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr ""
+
+#. module: event
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:394
+#, python-format
+msgid "Error !"
+msgstr "Fejl!"
+
+#. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "Cancel Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:395
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Quantity"
+msgstr ""
+
+#. module: event
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrati./event/event.py:41:ons"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+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 ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr ""
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"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'."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 30 Days"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+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 ""
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr ""
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr "September"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr "December"
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr ""
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of Event.\n"
+"\n"
+"    This module allow you\n"
+"        * to manage your events and their registrations\n"
+"        * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+"        * ...\n"
+"    A dashboard for associations that includes:\n"
+"    * Registration by Events (graph)\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in:\n"
+"                Events / Reporting\n"
+msgstr ""
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr ""
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:357
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: event
+#: help:event.registration,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: event
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr ""
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr "August"
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+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 ""
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+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 ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr "Sprog"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:472
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: event
+#: model:ir.ui.menu,name:event.board_associations
+msgid "Dashboard"
+msgstr "Oversigt"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Types of Events"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Attachments"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:59
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 365 Days"
+msgstr "Sidste 365 dage"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:442
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: event
+#: code:addons/event/event.py:517
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:432
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:538
+#: code:addons/event/event.py:545
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Current"
+msgstr ""
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "Enhedspris"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Details"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr ""
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr ""
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr ""
+
+#. module: event
+#: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
+msgid "Product"
+msgstr "Vare"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
+#: view:event.registration:0
+#: field:event.registration,description:0
+msgid "Description"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr "Adresse"
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid "  event Registration "
+msgstr ""
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr ""
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:542
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr "Land"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:55
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:500
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr "April"
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.type:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,registration_ids:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
+msgid "Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+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 ""
+
+#. 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 ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Providee Minimum Number of Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"Event is the low level object used by meeting and others documents that "
+"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 ""
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index 707f23f8123..230ab77649a 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1383,9 +1383,6 @@ msgstr ""
 #~ msgid "Badge Partner"
 #~ msgstr "Etikett Partner"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Fehler! Sie können keine rekursiven Werte eintragen."
-
 #~ msgid "Badge Title"
 #~ msgstr "Etikett Name"
 
@@ -1468,61 +1465,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid ""
-#~ "Oraganization and management of Event.\n"
-#~ "\n"
-#~ "    This module allow you\n"
-#~ "        * to manage your events and their registrations\n"
-#~ "        * to use emails to automatically confirm and send acknowledgements "
-#~ "for any registration to an event\n"
-#~ "        * ...\n"
-#~ "    A dashboard for associations that includes:\n"
-#~ "    * Registration by Events (graph)\n"
-#~ "    Note that:\n"
-#~ "    - You can define new types of events in\n"
-#~ "                Events / Configuration / Types of Events\n"
-#~ "    - You can access predefined reports about number of registration per "
-#~ "event or per event category in:\n"
-#~ "                Events / Reporting\n"
-#~ msgstr ""
-#~ "Veranstaltungsmanagement und -abwicklung.\n"
-#~ "\n"
-#~ "   Das Modul ermöglicht\n"
-#~ "     * das Management von Veranstaltungen und Anmeldungen     * die Nutzung "
-#~ "von Emails zur automatischen Bestätigung und Rückmeldung an Ihre Teilnehmer\n"
-#~ "    * ...\n"
-#~ "   Eine Pinnwand für die Veranstaltungen:\n"
-#~ "    * Anmeldungen für die Veranstaltung (Grafik)\n"
-#~ "   Beachten Sie folgendes:\n"
-#~ "   - Sie können neue Veranstaltungstypen hier definieren:\n"
-#~ "         Veranstaltungen/Konfiguration/Veranstaltungstypen\n"
-#~ "   - Sie können auswerten, wieviele Anmeldungen zu Ihren geplanten "
-#~ "Veranstaltungen bereits erfolgt sind unter:\n"
-#~ "         Veranstaltungen/Auswertungen\n"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Event Registraion"
-#~ msgstr "Anmeldung an Veranstaltung"
-
-#~ msgid ""
-#~ "Event is the low-level object used by meeting and others documents that have "
-#~ "to be synchronized with mobile or calendar applications through caldav. Most "
-#~ "of the users should work on the Calendar menu, and not on the list of events."
-#~ msgstr ""
-#~ "Ein Termin ist das Grundelement (low-level Objekt) welches durch "
-#~ "Terminkalender, Veranstaltungen, Vertriebsmeetings u.a. verwendet wird und "
-#~ "mit Ihrem Mobiltelefon durch WebDav synchronisierbar ist. Die meisten "
-#~ "Benutzern werden sicherlich über das Kalendermenü arbeiten, anstelle der "
-#~ "Listenansicht für Termine."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/event/i18n/el.po b/addons/event/i18n/el.po
index bbb1cab7bae..fe349aa06e9 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index 37bdf56640d..7b9a1270dda 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1431,9 +1431,6 @@ msgstr ""
 #~ msgid "Error!"
 #~ msgstr "¡Error!"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "¡Error! No puede crear secciones recursivas."
-
 #~ msgid "Communication history"
 #~ msgstr "Histórico comunicación"
 
@@ -1482,13 +1479,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid ""
-#~ "Event is the low-level object used by meeting and others documents that have "
-#~ "to be synchronized with mobile or calendar applications through caldav. Most "
-#~ "of the users should work on the Calendar menu, and not on the list of events."
-#~ msgstr ""
-#~ "El evento es el objeto de bajo nivel utilizado por las reuniones y otros "
-#~ "documentos que tienen que ser sincronizados con móviles o aplicaciones de "
-#~ "calendario mediante caldav. La mayor parte de los usuarios trabajarán en el "
-#~ "menú calendario, y no en la lista de eventos."
diff --git a/addons/event/i18n/es_AR.po b/addons/event/i18n/es_AR.po
index 6f2bb933a4c..7e5d19e59a7 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1382,9 +1382,6 @@ msgstr ""
 #~ msgid "Label Invoice"
 #~ msgstr "Factura de la etiqueta"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "¡Error! No puede crear secciones recursivas."
-
 #~ msgid "Invoice Rejected"
 #~ msgstr "Factura rechazada"
 
diff --git a/addons/event/i18n/es_EC.po b/addons/event/i18n/es_EC.po
index 03324bd29c9..ab48e4a0a52 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es_MX.po b/addons/event/i18n/es_MX.po
new file mode 100644
index 00000000000..463b24dc7dd
--- /dev/null
+++ b/addons/event/i18n/es_MX.po
@@ -0,0 +1,1481 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* event
+#
+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-13 02:29+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: 2011-09-05 05:04+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: event
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "Información de factura"
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximun Number of Registrations"
+msgstr "Indicar número máximo de registros"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr "Detalles de evento"
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr "Ponente principal"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr "Registros mínimos"
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr "Confirmación para registro de evento"
+
+#. module: event
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "Email de registro"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr "Fecha de registro"
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who are giving speech on event."
+msgstr "Ponente que dará una conferencia en el evento."
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: event
+#: model:event.event,name:event.event_0
+msgid "Concert of Bon Jovi"
+msgstr "Concierto de Bon Jovi"
+
+#. 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 for each registration a specific amount if "
+"you want to"
+msgstr ""
+"Este será el precio por defecto usado como precio de registro cuando se "
+"facture este evento. Tenga en cuenta que puede indicar una cantidad "
+"específica para cada registro si lo desea."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "Email de confirmación"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:63
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr "El registro no tiene ninguna empresa para facturar."
+
+#. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:93
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
+#: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
+msgid "Event Registration"
+msgstr "Registro evento"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 7 Days"
+msgstr "Últimos 7 días"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr "Evento padre"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: event
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr "Evento en el registro"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Current Events"
+msgstr "Eventos actuales"
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr "Análisis de eventos"
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr "Enviar correo auto confirmación"
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr "Entrada para la ópera"
+
+#. module: event
+#: code:addons/event/event.py:122
+#: view:event.event:0
+#, python-format
+msgid "Confirm Event"
+msgstr "Confirmar evento"
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+msgid "Event Dashboard"
+msgstr "Tablero de eventos"
+
+#. module: event
+#: model:event.event,name:event.event_1
+msgid "Opera of Verdi"
+msgstr "Ópera de Verdi"
+
+#. module: event
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr "evento.registro.credencial"
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr "Fecha de cierre del evento."
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:83
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: event
+#: field:event.type,name:0
+msgid "Event type"
+msgstr "Tipo de evento"
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr " Tipo de evento "
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
+msgid "Event"
+msgstr "Evento"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr "Credenciales"
+
+#. module: event
+#: view:event.event:0
+#: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: event
+#: view:event.confirm.registration:0
+msgid "Registration Confirmation"
+msgstr "Confirmación del registro"
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr "Versión de tarifa para el evento actual."
+
+#. module: event
+#: help:event.event,product_id:0
+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 ""
+"Las facturas de este registro de evento se crearán con este producto. Por lo "
+"tanto le permite asignar la etiqueta por defecto y la información contable "
+"que desee por defecto en estas facturas."
+
+#. module: event
+#: view:event.registration:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr "Otros ponentes"
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr "Hacer factura de evento"
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr "Número de registros o entradas"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: event
+#: field:event.event,register_current:0
+#: view:report.event.registration:0
+msgid "Confirmed Registrations"
+msgstr "Registros confirmados"
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr "Enviar correo auto registro"
+
+#. module: event
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: event
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr "Para ser facturado"
+
+#. module: event
+#: code:addons/event/event.py:394
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "Cancel Registration"
+msgstr "Cancelar registro"
+
+#. module: event
+#: code:addons/event/event.py:395
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr "La empresa registrada no tiene una dirección de facturación."
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: event
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr "Tipo de evento como seminario, exhibición, conferencia, formación."
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+"Este correo electrónico se enviará cuando el evento sea confirmado o cuando "
+"alguien se suscriba a un evento confirmado. Este correo también se enviará "
+"para recordar a alguien sobre el evento."
+
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrati./event/event.py:41:ons"
+msgstr "Total de registros previstos."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr "Organización del evento"
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+msgstr "Confirmar de todos modos"
+
+#. 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 "Aviso: El evento '%s' ha alcanzado su límite máximo (%s)."
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr "Registro"
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr "Número de eventos"
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"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'."
+msgstr ""
+"Cuando se crea el evento, el estado es 'Borrador'. Si se confirma para unas "
+"fechas en concreto, el estado es 'Confirmado'. Si ya ha pasado, el estado es "
+"'Realizado'. Si se cancela el evento, el estado es 'Cancelado'."
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr "Cancelar evento"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 30 Days"
+msgstr "Últimos 30 días"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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 "Estado asistencia a eventos"
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr "Envío correo"
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr "Entrada para concierto"
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr "Registros sin confirmar"
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr "Empresa facturada"
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr "Registros"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr "Nombre factura"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr " Nº de registros en borrador"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr "Evento realizado"
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of Event.\n"
+"\n"
+"    This module allow you\n"
+"        * to manage your events and their registrations\n"
+"        * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+"        * ...\n"
+"    A dashboard for associations that includes:\n"
+"    * Registration by Events (graph)\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in:\n"
+"                Events / Reporting\n"
+msgstr ""
+"Organización y gestión de eventos.\n"
+"\n"
+"    Este módulo le permite\n"
+"        * Gestionar sus eventos y sus registros\n"
+"        * Utilizar emails para confirmar y enviar acuses automáticamente "
+"para cada registro a un evento\n"
+"        * ...\n"
+"    Un tablero para asociaciones que incluye:\n"
+"        * Registros por evento (gráfico)\n"
+"    Tenga en cuenta que:\n"
+"    - Puede definir nuevos tipos de eventos en\n"
+"                Eventos / Configuración / Tipos de eventos\n"
+"    - Puede acceder a informes predefinidos sobre número de registros por "
+"evento o por categoría de evento en:\n"
+"                Eventos / Informes\n"
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "¡Error! No puede crear eventos recursivos."
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: event
+#: code:addons/event/event.py:357
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr "Mis eventos"
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr "Ponentes"
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: event
+#: help:event.registration,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: event
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr "Fecha de inicio"
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr "Eventos"
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr "Número de registro"
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr "Eventos hijos"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+"Marque esta opción si desea utilizar el correo automático para nuevos "
+"registros"
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr "Fecha de escritura"
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+msgstr "Mis registros"
+
+#. 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 ""
+"Aviso: Este evento no ha llegado a su límite de registros mínimo. ¿Está "
+"seguro que desea confirmarlo?"
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: event
+#: help:event.event,reply_to:0
+msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
+msgstr ""
+"La dirección de correo usada como 'Responder a' de todos los correos "
+"enviados por OpenERP."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr "Total de registros abiertos y realizados."
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr "Establecer en borrador"
+
+#. module: event
+#: code:addons/event/event.py:472
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr "Confirmación registro"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: event
+#: model:ir.ui.menu,name:event.board_associations
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr "Cuerpo mensaje de confirmación"
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr "Dirección ubicación"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Types of Events"
+msgstr "Tipos de eventos"
+
+#. module: event
+#: view:event.registration:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:59
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr "El evento asociado no tiene ningún producto definido"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr "Correo de confirmación automático"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 365 Days"
+msgstr "Últimos 365 días"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "¡Error! La fecha de cierre no puede ser anterior a la de inicio."
+
+#. module: event
+#: code:addons/event/event.py:442
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr "Realizado"
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr "Fecha de inicio"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: event
+#: code:addons/event/event.py:517
+#, python-format
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr "Eventos por registro"
+
+#. module: event
+#: code:addons/event/event.py:432
+#, python-format
+msgid "Open"
+msgstr "Abrir"
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: event
+#: code:addons/event/event.py:538
+#: code:addons/event/event.py:545
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr "Autoconfirmación: [%s] %s"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr "Coste registro"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr "Ponente"
+
+#. module: event
+#: view:event.registration:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr "Conferencia en negocios ERP"
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr "Equipo de ventas"
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr "Fecha inicial"
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr "Fecha de cierre"
+
+#. module: event
+#: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
+#: view:event.registration:0
+#: field:event.registration,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr " Nº de registros confirmados"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr "Registro de eventos"
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+"Este correo electrónico se enviará cuando alguien se suscriba al evento."
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr "Entrada para conferencia"
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr "Próximos eventos"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr "_Suscribir"
+
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid "  event Registration "
+msgstr "  Registro de eventos "
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr "Fecha de inicio del evento."
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr "No confirmado"
+
+#. module: event
+#: code:addons/event/event.py:542
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr "Auto registro: [%s] %s"
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr "Tablero de asociación"
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+"Marque esta opción si desea utilizar el correo de confirmación automático o "
+"el recordatorio"
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:55
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr "El registro está marcado como no facturable."
+
+#. module: event
+#: code:addons/event/event.py:500
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr "Cerrar registro"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: event
+#: view:event.event:0
+#: view:event.type:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
+msgid "Event Type"
+msgstr "Tipo de evento"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,registration_ids:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
+msgid "Registrations"
+msgstr "Registros"
+
+#. module: event
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr "Registros máximos"
+
+#. module: event
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr "Fecha inicio evento"
+
+#. module: event
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr "Cuerpo correo del registro"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+msgstr "Evento a registrarse"
+
+#. 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 "No se puede crear la factura si el registro está en estado '%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 "Confirmación del evento"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr "Correo de registro automático"
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Providee Minimum Number of Registrations"
+msgstr "Introduzca el número mínimo de registros."
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr "Ponente confirmado"
+
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"Event is the low level object used by meeting and others documents that "
+"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 ""
+"El evento es un objeto de bajo nivel utilizado por las reuniones y otros "
+"documentos que se deben sincronizar con dispositivos móviles o aplicaciones "
+"de calendario mediante CalDAV. La mayoría de los usuarios deberían trabajar "
+"en el menú agenda, y no en la lista de eventos."
+
+#~ msgid "Ending date"
+#~ msgstr "Fecha de finalización"
+
+#~ msgid "Invoice Created"
+#~ msgstr "Factura creada"
+
+#~ msgid "Statistics"
+#~ msgstr "Estadísticas"
+
+#~ msgid "References"
+#~ msgstr "Referencias"
+
+#~ msgid "All Events"
+#~ msgstr "Todos los eventos"
+
+#~ msgid "Case section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Error Messages"
+#~ msgstr "Mensajes de error"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Event description"
+#~ msgstr "Descripción del evento"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Events by section"
+#~ msgstr "Eventos por sección"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Confirmed Events"
+#~ msgstr "Eventos confirmados"
+
+#~ msgid "New event"
+#~ msgstr "Nuevo evento"
+
+#~ msgid "Draft Events"
+#~ msgstr "Eventos en borrador"
+
+#~ msgid "Case"
+#~ msgstr "Caso"
+
+#~ msgid "Payments"
+#~ msgstr "Pagos"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Draft Registrations"
+#~ msgstr "Registros borrador"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "Create Invoices"
+#~ msgstr "Crear facturas"
+
+#~ msgid "Draft Registration"
+#~ msgstr "Registro borrador"
+
+#~ msgid "Invoice Rejected"
+#~ msgstr "Factura rechazada"
+
+#~ 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 "Registration Invoiced"
+#~ msgstr "Registro facturado"
+
+#~ msgid "Events by Categories"
+#~ msgstr "Eventos por categorías"
+
+#~ msgid "Confirm Registrations"
+#~ msgstr "Confirmar registros"
+
+#~ msgid "Registration By Event Types"
+#~ msgstr "Registro por tipos de evento"
+
+#~ 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 "Events On Registrations"
+#~ msgstr "Eventos en los registros"
+
+#~ msgid "Event type on registration"
+#~ msgstr "Tipo de evento en el registro"
+
+#~ msgid "Event Related"
+#~ msgstr "Evento relacionado"
+
+#~ msgid "All Registrations"
+#~ msgstr "Todos los registros"
+
+#~ msgid "Send Reminder"
+#~ msgstr "Enviar recordatorio"
+
+#~ msgid "Events on registrations"
+#~ msgstr "Eventos en los registros"
+
+#~ 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 "Events Organisation"
+#~ msgstr "Organización de eventos"
+
+#~ msgid "Badge Title"
+#~ msgstr "Título del distintivo"
+
+#~ msgid "Badge Partner"
+#~ msgstr "Empresa distinguida"
+
+#~ msgid "Badge"
+#~ msgstr "Distintivo"
+
+#~ msgid "The event limit is reached. What do you want to do?"
+#~ msgstr "Se ha alcanzado el límite del evento. ¿Qué desea hacer?"
+
+#, python-format
+#~ msgid ""
+#~ "You must define a reply-to address in order to mail the participant. You can "
+#~ "do this in the Mailing tab of your event. Note that this is also the place "
+#~ "where you can configure your event to not send emails automaticly while "
+#~ "registering"
+#~ msgstr ""
+#~ "Debe definir una dirección respuesta para poder enviar un correo al "
+#~ "participante. Puede hacer esto en la pestaña de Correo electrónico de su "
+#~ "evento. Fíjese en que éste es también el lugar donde puede configurar su "
+#~ "evento para que no envíe correos electrónicos automáticos mientras se "
+#~ "inscriban"
+
+#~ msgid "Parent Category"
+#~ msgstr "Categoría padre"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "¡Error!"
+
+#~ msgid "Communication history"
+#~ msgstr "Histórico comunicación"
+
+#~ msgid "Label Invoice"
+#~ msgstr "Etiquetar factura"
+
+#~ msgid "List Register Partners"
+#~ msgstr "Listar empresas registradas"
+
+#~ msgid "Badge Name"
+#~ msgstr "Nombre de distintivo"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "¡Error! No puede crear secciones recursivas."
+
+#~ msgid ""
+#~ "Organization and management of events.\n"
+#~ "\n"
+#~ "    This module allow you\n"
+#~ "        * to manage your events and their registrations\n"
+#~ "        * to use emails to automatically confirm and send acknowledgements "
+#~ "for any registration to an event\n"
+#~ "        * ...\n"
+#~ "\n"
+#~ "    Note that:\n"
+#~ "    - You can define new types of events in\n"
+#~ "                Events / Configuration / Types of Events\n"
+#~ "    - You can access predefined reports about number of registration per "
+#~ "event or per event category in :\n"
+#~ "                Events / Reporting\n"
+#~ msgstr ""
+#~ "Organización y planificación de eventos.\n"
+#~ "\n"
+#~ "    Este módulo le permite\n"
+#~ "        * Gestionar sus eventos y sus registros\n"
+#~ "        * Usar emails para confirmar automáticamente y enviar confirmaciones "
+#~ "para cualquier registro a un evento\n"
+#~ "        * ...\n"
+#~ "\n"
+#~ "    Observe que:\n"
+#~ "    - Puede definir nuevos tipos de eventos en\n"
+#~ "                Eventos / Configuración / Tipos de eventos\n"
+#~ "    - Puede acceder a informes predefinidos referentes al número de "
+#~ "registros por evento o por categoría de evento en\n"
+#~ "                Eventos / Informe\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/event/i18n/es_VE.po b/addons/event/i18n/es_VE.po
new file mode 100644
index 00000000000..463b24dc7dd
--- /dev/null
+++ b/addons/event/i18n/es_VE.po
@@ -0,0 +1,1481 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* event
+#
+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-13 02:29+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: 2011-09-05 05:04+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: event
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "Información de factura"
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximun Number of Registrations"
+msgstr "Indicar número máximo de registros"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr "Detalles de evento"
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr "Ponente principal"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr "Registros mínimos"
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr "Confirmación para registro de evento"
+
+#. module: event
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "Email de registro"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr "Fecha de registro"
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who are giving speech on event."
+msgstr "Ponente que dará una conferencia en el evento."
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: event
+#: model:event.event,name:event.event_0
+msgid "Concert of Bon Jovi"
+msgstr "Concierto de Bon Jovi"
+
+#. 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 for each registration a specific amount if "
+"you want to"
+msgstr ""
+"Este será el precio por defecto usado como precio de registro cuando se "
+"facture este evento. Tenga en cuenta que puede indicar una cantidad "
+"específica para cada registro si lo desea."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "Email de confirmación"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:63
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr "El registro no tiene ninguna empresa para facturar."
+
+#. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:93
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
+#: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
+msgid "Event Registration"
+msgstr "Registro evento"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 7 Days"
+msgstr "Últimos 7 días"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr "Evento padre"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: event
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr "Evento en el registro"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Current Events"
+msgstr "Eventos actuales"
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr "Análisis de eventos"
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr "Enviar correo auto confirmación"
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr "Entrada para la ópera"
+
+#. module: event
+#: code:addons/event/event.py:122
+#: view:event.event:0
+#, python-format
+msgid "Confirm Event"
+msgstr "Confirmar evento"
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+msgid "Event Dashboard"
+msgstr "Tablero de eventos"
+
+#. module: event
+#: model:event.event,name:event.event_1
+msgid "Opera of Verdi"
+msgstr "Ópera de Verdi"
+
+#. module: event
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr "evento.registro.credencial"
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr "Fecha de cierre del evento."
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:83
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: event
+#: field:event.type,name:0
+msgid "Event type"
+msgstr "Tipo de evento"
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr " Tipo de evento "
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
+msgid "Event"
+msgstr "Evento"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr "Credenciales"
+
+#. module: event
+#: view:event.event:0
+#: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: event
+#: view:event.confirm.registration:0
+msgid "Registration Confirmation"
+msgstr "Confirmación del registro"
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr "Versión de tarifa para el evento actual."
+
+#. module: event
+#: help:event.event,product_id:0
+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 ""
+"Las facturas de este registro de evento se crearán con este producto. Por lo "
+"tanto le permite asignar la etiqueta por defecto y la información contable "
+"que desee por defecto en estas facturas."
+
+#. module: event
+#: view:event.registration:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr "Otros ponentes"
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr "Hacer factura de evento"
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr "Número de registros o entradas"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: event
+#: field:event.event,register_current:0
+#: view:report.event.registration:0
+msgid "Confirmed Registrations"
+msgstr "Registros confirmados"
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr "Enviar correo auto registro"
+
+#. module: event
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: event
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr "Para ser facturado"
+
+#. module: event
+#: code:addons/event/event.py:394
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "Cancel Registration"
+msgstr "Cancelar registro"
+
+#. module: event
+#: code:addons/event/event.py:395
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr "La empresa registrada no tiene una dirección de facturación."
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: event
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr "Tipo de evento como seminario, exhibición, conferencia, formación."
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+"Este correo electrónico se enviará cuando el evento sea confirmado o cuando "
+"alguien se suscriba a un evento confirmado. Este correo también se enviará "
+"para recordar a alguien sobre el evento."
+
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrati./event/event.py:41:ons"
+msgstr "Total de registros previstos."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr "Organización del evento"
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+msgstr "Confirmar de todos modos"
+
+#. 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 "Aviso: El evento '%s' ha alcanzado su límite máximo (%s)."
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr "Registro"
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr "Número de eventos"
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"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'."
+msgstr ""
+"Cuando se crea el evento, el estado es 'Borrador'. Si se confirma para unas "
+"fechas en concreto, el estado es 'Confirmado'. Si ya ha pasado, el estado es "
+"'Realizado'. Si se cancela el evento, el estado es 'Cancelado'."
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr "Cancelar evento"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 30 Days"
+msgstr "Últimos 30 días"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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 "Estado asistencia a eventos"
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr "Envío correo"
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr "Entrada para concierto"
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr "Registros sin confirmar"
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr "Empresa facturada"
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr "Registros"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr "Setiembre"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr "Nombre factura"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr " Nº de registros en borrador"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr "Evento realizado"
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of Event.\n"
+"\n"
+"    This module allow you\n"
+"        * to manage your events and their registrations\n"
+"        * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+"        * ...\n"
+"    A dashboard for associations that includes:\n"
+"    * Registration by Events (graph)\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in:\n"
+"                Events / Reporting\n"
+msgstr ""
+"Organización y gestión de eventos.\n"
+"\n"
+"    Este módulo le permite\n"
+"        * Gestionar sus eventos y sus registros\n"
+"        * Utilizar emails para confirmar y enviar acuses automáticamente "
+"para cada registro a un evento\n"
+"        * ...\n"
+"    Un tablero para asociaciones que incluye:\n"
+"        * Registros por evento (gráfico)\n"
+"    Tenga en cuenta que:\n"
+"    - Puede definir nuevos tipos de eventos en\n"
+"                Eventos / Configuración / Tipos de eventos\n"
+"    - Puede acceder a informes predefinidos sobre número de registros por "
+"evento o por categoría de evento en:\n"
+"                Eventos / Informes\n"
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "¡Error! No puede crear eventos recursivos."
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: event
+#: code:addons/event/event.py:357
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr "Mis eventos"
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr "Ponentes"
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: event
+#: help:event.registration,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: event
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr "Fecha de inicio"
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr "Eventos"
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr "Número de registro"
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr "Eventos hijos"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+"Marque esta opción si desea utilizar el correo automático para nuevos "
+"registros"
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr "Fecha de escritura"
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+msgstr "Mis registros"
+
+#. 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 ""
+"Aviso: Este evento no ha llegado a su límite de registros mínimo. ¿Está "
+"seguro que desea confirmarlo?"
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: event
+#: help:event.event,reply_to:0
+msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
+msgstr ""
+"La dirección de correo usada como 'Responder a' de todos los correos "
+"enviados por OpenERP."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr "Total de registros abiertos y realizados."
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr "Establecer en borrador"
+
+#. module: event
+#: code:addons/event/event.py:472
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr "Confirmación registro"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: event
+#: model:ir.ui.menu,name:event.board_associations
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr "Cuerpo mensaje de confirmación"
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr "Dirección ubicación"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Types of Events"
+msgstr "Tipos de eventos"
+
+#. module: event
+#: view:event.registration:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:59
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr "El evento asociado no tiene ningún producto definido"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr "Correo de confirmación automático"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 365 Days"
+msgstr "Últimos 365 días"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "¡Error! La fecha de cierre no puede ser anterior a la de inicio."
+
+#. module: event
+#: code:addons/event/event.py:442
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr "Realizado"
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr "Fecha de inicio"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: event
+#: code:addons/event/event.py:517
+#, python-format
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr "Eventos por registro"
+
+#. module: event
+#: code:addons/event/event.py:432
+#, python-format
+msgid "Open"
+msgstr "Abrir"
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: event
+#: code:addons/event/event.py:538
+#: code:addons/event/event.py:545
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr "Autoconfirmación: [%s] %s"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr "Coste registro"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr "Ponente"
+
+#. module: event
+#: view:event.registration:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr "Conferencia en negocios ERP"
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr "Equipo de ventas"
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr "Fecha inicial"
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr "Fecha de cierre"
+
+#. module: event
+#: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
+#: view:event.registration:0
+#: field:event.registration,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr " Nº de registros confirmados"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr "Registro de eventos"
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+"Este correo electrónico se enviará cuando alguien se suscriba al evento."
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr "Entrada para conferencia"
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr "Próximos eventos"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr "_Suscribir"
+
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid "  event Registration "
+msgstr "  Registro de eventos "
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr "Fecha de inicio del evento."
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr "No confirmado"
+
+#. module: event
+#: code:addons/event/event.py:542
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr "Auto registro: [%s] %s"
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr "Tablero de asociación"
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+"Marque esta opción si desea utilizar el correo de confirmación automático o "
+"el recordatorio"
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:55
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr "El registro está marcado como no facturable."
+
+#. module: event
+#: code:addons/event/event.py:500
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr "Cerrar registro"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: event
+#: view:event.event:0
+#: view:event.type:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
+msgid "Event Type"
+msgstr "Tipo de evento"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,registration_ids:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
+msgid "Registrations"
+msgstr "Registros"
+
+#. module: event
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr "Registros máximos"
+
+#. module: event
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr "Fecha inicio evento"
+
+#. module: event
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr "Cuerpo correo del registro"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+msgstr "Evento a registrarse"
+
+#. 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 "No se puede crear la factura si el registro está en estado '%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 "Confirmación del evento"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr "Correo de registro automático"
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Providee Minimum Number of Registrations"
+msgstr "Introduzca el número mínimo de registros."
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr "Ponente confirmado"
+
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"Event is the low level object used by meeting and others documents that "
+"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 ""
+"El evento es un objeto de bajo nivel utilizado por las reuniones y otros "
+"documentos que se deben sincronizar con dispositivos móviles o aplicaciones "
+"de calendario mediante CalDAV. La mayoría de los usuarios deberían trabajar "
+"en el menú agenda, y no en la lista de eventos."
+
+#~ msgid "Ending date"
+#~ msgstr "Fecha de finalización"
+
+#~ msgid "Invoice Created"
+#~ msgstr "Factura creada"
+
+#~ msgid "Statistics"
+#~ msgstr "Estadísticas"
+
+#~ msgid "References"
+#~ msgstr "Referencias"
+
+#~ msgid "All Events"
+#~ msgstr "Todos los eventos"
+
+#~ msgid "Case section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Error Messages"
+#~ msgstr "Mensajes de error"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Event description"
+#~ msgstr "Descripción del evento"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Events by section"
+#~ msgstr "Eventos por sección"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Confirmed Events"
+#~ msgstr "Eventos confirmados"
+
+#~ msgid "New event"
+#~ msgstr "Nuevo evento"
+
+#~ msgid "Draft Events"
+#~ msgstr "Eventos en borrador"
+
+#~ msgid "Case"
+#~ msgstr "Caso"
+
+#~ msgid "Payments"
+#~ msgstr "Pagos"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Draft Registrations"
+#~ msgstr "Registros borrador"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "Create Invoices"
+#~ msgstr "Crear facturas"
+
+#~ msgid "Draft Registration"
+#~ msgstr "Registro borrador"
+
+#~ msgid "Invoice Rejected"
+#~ msgstr "Factura rechazada"
+
+#~ 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 "Registration Invoiced"
+#~ msgstr "Registro facturado"
+
+#~ msgid "Events by Categories"
+#~ msgstr "Eventos por categorías"
+
+#~ msgid "Confirm Registrations"
+#~ msgstr "Confirmar registros"
+
+#~ msgid "Registration By Event Types"
+#~ msgstr "Registro por tipos de evento"
+
+#~ 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 "Events On Registrations"
+#~ msgstr "Eventos en los registros"
+
+#~ msgid "Event type on registration"
+#~ msgstr "Tipo de evento en el registro"
+
+#~ msgid "Event Related"
+#~ msgstr "Evento relacionado"
+
+#~ msgid "All Registrations"
+#~ msgstr "Todos los registros"
+
+#~ msgid "Send Reminder"
+#~ msgstr "Enviar recordatorio"
+
+#~ msgid "Events on registrations"
+#~ msgstr "Eventos en los registros"
+
+#~ 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 "Events Organisation"
+#~ msgstr "Organización de eventos"
+
+#~ msgid "Badge Title"
+#~ msgstr "Título del distintivo"
+
+#~ msgid "Badge Partner"
+#~ msgstr "Empresa distinguida"
+
+#~ msgid "Badge"
+#~ msgstr "Distintivo"
+
+#~ msgid "The event limit is reached. What do you want to do?"
+#~ msgstr "Se ha alcanzado el límite del evento. ¿Qué desea hacer?"
+
+#, python-format
+#~ msgid ""
+#~ "You must define a reply-to address in order to mail the participant. You can "
+#~ "do this in the Mailing tab of your event. Note that this is also the place "
+#~ "where you can configure your event to not send emails automaticly while "
+#~ "registering"
+#~ msgstr ""
+#~ "Debe definir una dirección respuesta para poder enviar un correo al "
+#~ "participante. Puede hacer esto en la pestaña de Correo electrónico de su "
+#~ "evento. Fíjese en que éste es también el lugar donde puede configurar su "
+#~ "evento para que no envíe correos electrónicos automáticos mientras se "
+#~ "inscriban"
+
+#~ msgid "Parent Category"
+#~ msgstr "Categoría padre"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "¡Error!"
+
+#~ msgid "Communication history"
+#~ msgstr "Histórico comunicación"
+
+#~ msgid "Label Invoice"
+#~ msgstr "Etiquetar factura"
+
+#~ msgid "List Register Partners"
+#~ msgstr "Listar empresas registradas"
+
+#~ msgid "Badge Name"
+#~ msgstr "Nombre de distintivo"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "¡Error! No puede crear secciones recursivas."
+
+#~ msgid ""
+#~ "Organization and management of events.\n"
+#~ "\n"
+#~ "    This module allow you\n"
+#~ "        * to manage your events and their registrations\n"
+#~ "        * to use emails to automatically confirm and send acknowledgements "
+#~ "for any registration to an event\n"
+#~ "        * ...\n"
+#~ "\n"
+#~ "    Note that:\n"
+#~ "    - You can define new types of events in\n"
+#~ "                Events / Configuration / Types of Events\n"
+#~ "    - You can access predefined reports about number of registration per "
+#~ "event or per event category in :\n"
+#~ "                Events / Reporting\n"
+#~ msgstr ""
+#~ "Organización y planificación de eventos.\n"
+#~ "\n"
+#~ "    Este módulo le permite\n"
+#~ "        * Gestionar sus eventos y sus registros\n"
+#~ "        * Usar emails para confirmar automáticamente y enviar confirmaciones "
+#~ "para cualquier registro a un evento\n"
+#~ "        * ...\n"
+#~ "\n"
+#~ "    Observe que:\n"
+#~ "    - Puede definir nuevos tipos de eventos en\n"
+#~ "                Eventos / Configuración / Tipos de eventos\n"
+#~ "    - Puede acceder a informes predefinidos referentes al número de "
+#~ "registros por evento o por categoría de evento en\n"
+#~ "                Eventos / Informe\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index 397003126cc..e1d0812b9d7 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1321,9 +1321,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Viga ! Sa ei sa luua korduvat jaotist"
-
 #~ msgid "Badge"
 #~ msgstr "Tunnusmärk"
 
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
index 41ba9ce945b..033dc8c1f8a 100644
--- a/addons/event/i18n/fi.po
+++ b/addons/event/i18n/fi.po
@@ -14,28 +14,28 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
 msgid "Invoice Information"
-msgstr ""
+msgstr "Laskutus tiedot"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+msgstr "Osallistujien maksimimäärä"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr ""
+msgstr "Tapahtuman yksityiskohdat"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr ""
+msgstr "Pääpuhuja"
 
 #. module: event
 #: view:event.event:0
@@ -52,12 +52,12 @@ msgstr "Pienin rekisteröintimäärä"
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr ""
+msgstr "Vahvistus tapahtumaan ilmottautumisesta"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Otsikko"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -67,23 +67,23 @@ msgstr "Rekisteröinti sähköposti"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Luo Laskuja"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Ilmottautumispäivä"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who are giving speech on event."
-msgstr ""
+msgstr "Esiintyjä joka puhuu tapahtumassa"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Sulje"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -142,12 +142,12 @@ msgstr "Tapahtuman rekisteröinti"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 7 Days"
-msgstr ""
+msgstr "Viimeiset 7 päivää"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Ylätason tapahtuma"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
@@ -167,7 +167,7 @@ msgstr "Rekisteröinnin tapahtuma"
 #. module: event
 #: view:report.event.registration:0
 msgid "Current Events"
-msgstr ""
+msgstr "Nykyiset tapahtumat"
 
 #. module: event
 #: view:event.registration:0
@@ -180,7 +180,7 @@ msgstr "Lisää sisäinen huomautus"
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr ""
+msgstr "Tapahtumien analyysi"
 
 #. module: event
 #: field:event.registration,message_ids:0
@@ -214,12 +214,12 @@ msgstr "Peruttu"
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Vastausosoite"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 msgid "Event Dashboard"
-msgstr ""
+msgstr "Tapahtumien työpöytä"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -244,7 +244,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Viite"
 
 #. module: event
 #: help:event.event,date_end:0
@@ -266,7 +266,7 @@ msgstr "Lisätiedot"
 #: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Asiakkaan laskut"
 
 #. module: event
 #: selection:event.event,state:0
@@ -282,7 +282,7 @@ msgstr "Tapahtumatyyppi"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Tapahtuman tyyppi "
 
 #. module: event
 #: view:event.event:0
@@ -301,7 +301,7 @@ msgstr "Tapahtuma"
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr ""
+msgstr "Nimilaput"
 
 #. module: event
 #: view:event.event:0
@@ -320,7 +320,7 @@ msgstr "Rekisteröinnin vahvistus"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Hintalistan versio nykyiselle tapahtumalle"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -333,7 +333,7 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Sekalaiset"
 
 #. module: event
 #: view:event.event:0
@@ -344,12 +344,12 @@ msgstr "Muut puhujat"
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Tee tapahtumasta lasku"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Osallistujien tai lippujen määrä"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -368,12 +368,12 @@ msgstr "Lähetä uusi sähköposti"
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Sijainti"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Vastaa"
 
 #. module: event
 #: field:event.event,register_current:0
@@ -411,7 +411,7 @@ msgstr "Virhe !"
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: event
 #: view:event.event:0
@@ -460,12 +460,12 @@ msgstr "Heinäkuu"
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr ""
+msgstr "Tapahtumien organisointi"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Historiatiedot"
 
 #. module: event
 #: view:event.registration:0
@@ -482,7 +482,7 @@ msgstr "Vahvista jokatapauksessa"
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "Varoitus: Tapahtuma '%s' on saavuttanut maksimimäärän (%s)."
 
 #. module: event
 #: view:event.event:0
@@ -514,7 +514,7 @@ msgstr "Peruuta tapahtuma"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "Yhteyshenkilö"
 
 #. module: event
 #: view:report.event.registration:0
@@ -534,7 +534,7 @@ msgstr "Kumppani"
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "Tapahtuman täyttöaste"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
@@ -565,7 +565,7 @@ msgstr "Kumppani laskutettu"
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Logit"
 
 #. module: event
 #: view:event.event:0
@@ -575,7 +575,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -590,18 +590,18 @@ msgstr "Joulukuu"
 #. module: event
 #: field:event.registration,event_product:0
 msgid "Invoice Name"
-msgstr ""
+msgstr "Laskun nimi"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " Luonnosilmoittautumisten määrä"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: event
 #: view:event.event:0
@@ -636,12 +636,12 @@ msgstr "Viesti"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Virhe ! et voi luoda rekursiivisia tapahtumia."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Viittaus 2"
 
 #. module: event
 #: code:addons/event/event.py:357
@@ -654,12 +654,12 @@ msgstr "Laskutettu"
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Omat tapahtumat"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Puhujat"
 
 #. module: event
 #: view:event.make.invoice:0
@@ -673,11 +673,14 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Nämä sähköpostiosoitteet lisätään cc (kopio viestistä) kenttään tähän "
+"tietueeseen liittyvien sähköpostien osalta. Erota useammat osoitteet "
+"pilkulla."
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: event
 #: view:event.make.invoice:0
@@ -687,12 +690,12 @@ msgstr "Oletko varma, että haluat muodostaa laskun?"
 #. module: event
 #: view:event.event:0
 msgid "Beginning Date"
-msgstr ""
+msgstr "Alkupäivä"
 
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #. module: event
 #: view:event.event:0
@@ -712,7 +715,7 @@ msgstr "Rekisteröintien määrä"
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Alatason tapahtumat"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -723,7 +726,7 @@ msgstr "Elokuu"
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -741,12 +744,12 @@ msgstr ""
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Kirjoita päiväys"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr ""
+msgstr "Omat osallistumiset"
 
 #. module: event
 #: view:event.confirm:0
@@ -754,6 +757,8 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Varoitus: Tapahtuma ei ole saavuttanut osallistujien minimimäärää. Oletko "
+"varma että haluat vahvistaa sen?"
 
 #. module: event
 #: field:event.registration,active:0
@@ -768,12 +773,14 @@ msgstr "Marraskuu"
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
 msgstr ""
+"Sähköpostin vastausosoite (reply-to) joka laitetaan kaikkiin OpenERP:in "
+"lähettämiin sähköposteihin"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -783,7 +790,7 @@ msgstr "Lokakuu"
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Avointen ja valmiiden ilmoittautumisten kokonaismäärä"
 
 #. module: event
 #: field:event.event,language:0
@@ -825,17 +832,17 @@ msgstr "Vahvista rekisteröinti"
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Päiväys"
 
 #. module: event
 #: model:ir.ui.menu,name:event.board_associations
 msgid "Dashboard"
-msgstr ""
+msgstr "Työpöytä"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Vahvistusviestin runko"
 
 #. module: event
 #: view:event.registration:0
@@ -846,7 +853,7 @@ msgstr "Historia"
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Paikan osoite"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
@@ -863,7 +870,7 @@ msgstr "Liitteet"
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "Liittyvälle tapahtumalle ei ole määritelty tuotteita"
 
 #. module: event
 #: view:event.event:0
@@ -873,7 +880,7 @@ msgstr "Automaattisen vahvistuksen sähköpostitus"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Viimeiset 365 päivää"
 
 #. module: event
 #: constraint:event.event:0
@@ -923,7 +930,7 @@ msgstr "Sulje"
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Tapahtumat ilmoittautumisten mukaan"
 
 #. module: event
 #: code:addons/event/event.py:432
@@ -934,14 +941,14 @@ msgstr "Avaa"
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Vastuukäyttäjä"
 
 #. module: event
 #: code:addons/event/event.py:538
 #: code:addons/event/event.py:545
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "Automaattivahvistus: [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -950,7 +957,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: event
 #: field:event.event,unit_price:0
@@ -980,7 +987,7 @@ msgstr "Puhuja"
 #. module: event
 #: view:event.registration:0
 msgid "Details"
-msgstr ""
+msgstr "Yksityiskohdat"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1024,12 +1031,12 @@ msgstr "Kuvaus"
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " Vahvistettujen ilmoittautumisten määrä"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Tilaa"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -1039,7 +1046,7 @@ msgstr "Toukokuu"
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+msgstr "Tapahtumiin ilmoittautuminen"
 
 #. module: event
 #: help:event.event,mail_registr:0
@@ -1054,7 +1061,7 @@ msgstr "Pääsylippu konferenssiin"
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Osoite"
 
 #. module: event
 #: view:board.board:0
@@ -1065,12 +1072,12 @@ msgstr "Seuraavat tapahtumat"
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_Tilaa"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  tapahtumaan ilmoittautumine "
 
 #. module: event
 #: help:event.event,date_begin:0
@@ -1081,18 +1088,18 @@ msgstr "Tapahtuman alkupäivä"
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Vahvistamaton"
 
 #. module: event
 #: code:addons/event/event.py:542
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "Automaattinen ilmoittautuminen: [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -1102,7 +1109,7 @@ msgstr "Helmikuu"
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Yhdistysten työpöytä"
 
 #. module: event
 #: view:event.event:0
@@ -1128,7 +1135,7 @@ msgstr "Maa"
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "Ilmoittautuminen on merkitty ei-laskutettavissa"
 
 #. module: event
 #: code:addons/event/event.py:500
@@ -1186,25 +1193,25 @@ msgstr "Tapahtuman aloituspvm"
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Ilmoittautumissähköpostin runko"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Tapahtuma johon ilmoittaudutaan"
 
 #. 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 "Laskua ei voida luoda, jos ilmoittautuminen on %s tilassa."
 
 #. 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 "Tapahtuman vahvistaminen"
 
 #. module: event
 #: view:event.event:0
@@ -1216,17 +1223,17 @@ msgstr "Automaattinen rekisteröintisähköposti"
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Kokonaismäärä"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Providee Minimum Number of Registrations"
-msgstr ""
+msgstr "Anna ilmoittautujien minimimäärä"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Puhuja vahvistettu"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index 50ebed21b48..fc0d604899d 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1316,9 +1316,6 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de sections récursives"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Erreur : l'Unité Secondaire doit appartenir à une autre catégorie que "
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
index a3e11c308a3..31d8047b0b7 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
index bef46795e02..64f34cf313e 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
index b01e896ef50..135d26b1b32 100644
--- a/addons/event/i18n/hu.po
+++ b/addons/event/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 15:08+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/id.po b/addons/event/i18n/id.po
index f152e5255aa..bd4def16781 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index db50eeb6781..f09b4e20062 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1377,9 +1377,6 @@ msgstr ""
 #~ msgid "The event limit is reached. What do you want to do?"
 #~ msgstr "E' stato raggiunto il limite dell'evento. Cosa si vuole fare?"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Errore! Non è possibile creare sezioni ricorsive"
-
 #~ msgid "Parent Category"
 #~ msgstr "Categoria Superiore"
 
@@ -1455,15 +1452,3 @@ msgstr ""
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Errore:.Codice EAN non valido"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/event/i18n/ko.po b/addons/event/i18n/ko.po
index 2bfa69169b2..9b3d192721c 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1361,9 +1361,6 @@ msgstr ""
 #~ msgid "Label Invoice"
 #~ msgstr "인보이스 라벨"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "에러! 재귀적인 섹션을 만들 수는 없습니다."
-
 #~ msgid "Invoice Rejected"
 #~ msgstr "거절된 인보이스"
 
diff --git a/addons/event/i18n/lt.po b/addons/event/i18n/lt.po
index 9a87ab2ff56..f1212bd65e8 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index 63202f7dd22..f29d4f1bf5f 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1334,9 +1334,6 @@ msgstr ""
 #~ "kunt dit in het Mailing tabblad doen van uw event. Dat is ook de plek waar U "
 #~ "voor het event kunt aangeven om niet automatisch emails te versturen."
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Fout! U mag geen recursieve secties aanmaken"
-
 #~ msgid "Error ! You cannot create recursive sections."
 #~ msgstr "Fout! U kunt geen recursieve secties maken."
 
@@ -1481,60 +1478,3 @@ msgstr ""
 #~ "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 ""
-#~ "Oraganization and management of Event.\n"
-#~ "\n"
-#~ "    This module allow you\n"
-#~ "        * to manage your events and their registrations\n"
-#~ "        * to use emails to automatically confirm and send acknowledgements "
-#~ "for any registration to an event\n"
-#~ "        * ...\n"
-#~ "    A dashboard for associations that includes:\n"
-#~ "    * Registration by Events (graph)\n"
-#~ "    Note that:\n"
-#~ "    - You can define new types of events in\n"
-#~ "                Events / Configuration / Types of Events\n"
-#~ "    - You can access predefined reports about number of registration per "
-#~ "event or per event category in:\n"
-#~ "                Events / Reporting\n"
-#~ msgstr ""
-#~ "Organisatie en beheer van evenement.\n"
-#~ "\n"
-#~ "    Deze module laat u \n"
-#~ "        * evenementen in inschrijvingen beheren\n"
-#~ "        * email gebruiken om automatisch alle inschrijvingen te bevestigen\n"
-#~ "        * ...\n"
-#~ "    Een dashboard voor verenigingen dat inhoudt:\n"
-#~ "    * Inschrijvingen per evenement (grafiek)\n"
-#~ "    Merk op dat:\n"
-#~ "    - U nieuwe soorten evenementen kunt definiëren in \n"
-#~ "                Evenement / Configuratie / Evenementsoorten\n"
-#~ "    - U voorgedefinieerde overzichten kunt gebruiken over het aantal "
-#~ "inschrijvingen per evenement categorie in:\n"
-#~ "                Evenement / Overzichten\n"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Event Registraion"
-#~ msgstr "Evenementinschrijving"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "Event is the low-level object used by meeting and others documents that have "
-#~ "to be synchronized with mobile or calendar applications through caldav. Most "
-#~ "of the users should work on the Calendar menu, and not on the list of events."
-#~ msgstr ""
-#~ "Gebeurtenis is een onderliggend object dat wordt gebruikt door agenda en "
-#~ "andere documenten die moeten worden gesynchroniseerd met mobiele of agenda "
-#~ "applicaties via caldav. De meeste gebruikers werken via het agenda menu en "
-#~ "niet met een lijst van gebeurtenissen."
diff --git a/addons/event/i18n/nl_BE.po b/addons/event/i18n/nl_BE.po
index 743000c8e75..e9b630c624f 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/pl.po b/addons/event/i18n/pl.po
index 57b2d94b41d..73ff0db912a 100644
--- a/addons/event/i18n/pl.po
+++ b/addons/event/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-09-29 10:58+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-05 14:37+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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-06 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -41,7 +41,7 @@ msgstr ""
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: event
 #: field:event.event,register_min:0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Tytuł"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -66,13 +66,13 @@ msgstr ""
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Utwórz faktury"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Data rejestracji"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
@@ -82,7 +82,7 @@ msgstr ""
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Zamknij"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -100,7 +100,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -119,12 +119,12 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data faktury"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:93
@@ -139,12 +139,12 @@ msgstr "Rejestracja wydarzenia"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 7 Days"
-msgstr ""
+msgstr "Ostatnie 7 dni"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Wydarzenie nadrzędne"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
@@ -154,7 +154,7 @@ msgstr "Utwórz fakturę"
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Wartość"
 
 #. module: event
 #: view:report.event.registration:0
@@ -164,12 +164,12 @@ msgstr ""
 #. module: event
 #: view:report.event.registration:0
 msgid "Current Events"
-msgstr ""
+msgstr "Bieżące wydarzenia"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Dodaj wewnętrzną notatkę"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -182,7 +182,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Wiadomości"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -206,17 +206,17 @@ msgstr "Potwierdź wydarzenie"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulowano"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odpowiedz do"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 msgid "Event Dashboard"
-msgstr ""
+msgstr "Konsola wydarzeń"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -226,7 +226,7 @@ msgstr ""
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Cennik"
 
 #. module: event
 #: field:event.registration,contact_id:0
@@ -241,18 +241,18 @@ msgstr ""
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Odnośnik"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr ""
+msgstr "Data zakończenia wydarzenia"
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr ""
+msgstr "E-maile"
 
 #. module: event
 #: view:event.registration:0
@@ -263,7 +263,7 @@ msgstr "Dodatkowe informacje"
 #: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Faktury dla klientów"
 
 #. module: event
 #: selection:event.event,state:0
@@ -279,7 +279,7 @@ msgstr "Typ wydarzenia"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Typ wydarzenia "
 
 #. module: event
 #: view:event.event:0
@@ -307,7 +307,7 @@ msgstr ""
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr "Zatwierdzone"
+msgstr "Potwierdzone"
 
 #. module: event
 #: view:event.confirm.registration:0
@@ -330,18 +330,18 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Różne"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr ""
+msgstr "Inni prelegenci"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Wydarzenia do fakturowania"
 
 #. module: event
 #: help:event.registration,nb_register:0
@@ -355,22 +355,22 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Ostrzeżenie !"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Wyślij nową wiadomość"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Miejsce"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Odpowiedz"
 
 #. module: event
 #: field:event.event,register_current:0
@@ -403,12 +403,12 @@ msgstr "Do zafakturowania"
 #: code:addons/event/event.py:394
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 #. module: event
 #: view:event.event:0
@@ -421,12 +421,12 @@ msgstr "Anuluj rejestrację"
 #: code:addons/event/event.py:395
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Zarejestrowany partner nie ma adresu do faktury."
 
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 #. module: event
 #: help:event.event,type:0
@@ -449,7 +449,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: event
 #: view:event.event:0
@@ -459,7 +459,7 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Informacja o historii"
 
 #. module: event
 #: view:event.registration:0
@@ -508,12 +508,12 @@ msgstr "Anuluj wydarzenie"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Ostatnie 30 dni"
 
 #. module: event
 #: view:event.event:0
@@ -533,7 +533,7 @@ msgstr ""
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Grupuj faktury"
 
 #. module: event
 #: view:event.event:0
@@ -559,7 +559,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Logi"
 
 #. module: event
 #: view:event.event:0
@@ -569,17 +569,17 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -595,7 +595,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: event
 #: view:event.event:0
@@ -625,40 +625,40 @@ msgstr ""
 #. module: event
 #: field:event.confirm.registration,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych wydarzeń."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Odnośnik 2"
 
 #. module: event
 #: code:addons/event/event.py:357
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr ""
+msgstr "Zafakturowano"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Moje wydarzenia"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Wykładowcy"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Utwórz faktury"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -667,16 +667,19 @@ 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: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr ""
+"Błąd ! Tworzenie rekurencyjnych elementów skojarzonych jest zabronione."
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Czy chcesz utworzyć fakturę(y) ?"
 
 #. module: event
 #: view:event.event:0
@@ -686,7 +689,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Zamknięte"
 
 #. module: event
 #: view:event.event:0
@@ -706,23 +709,23 @@ msgstr "Liczba rejestracji"
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Wydareznia podrzędne"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "nieznane"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
@@ -733,7 +736,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 #. module: event
 #: view:event.registration:0
@@ -750,17 +753,17 @@ msgstr ""
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktywne"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Zaawansowane filtry..."
 
 #. module: event
 #: help:event.event,reply_to:0
@@ -770,7 +773,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: event
 #: help:event.event,register_current:0
@@ -780,23 +783,23 @@ msgstr ""
 #. module: event
 #: field:event.event,language:0
 msgid "Language"
-msgstr ""
+msgstr "Język"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "DW"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Ci ludzie otrzymają wiadomość"
 
 #. module: event
 #: view:event.event:0
@@ -817,12 +820,12 @@ msgstr "Zatwierdź rejestrację"
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: event
 #: model:ir.ui.menu,name:event.board_associations
 msgid "Dashboard"
-msgstr ""
+msgstr "Konsola"
 
 #. module: event
 #: view:event.event:0
@@ -838,7 +841,7 @@ msgstr "Historia"
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Adres miejsca"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
@@ -849,7 +852,7 @@ msgstr "Typy wydarzeń"
 #. module: event
 #: view:event.registration:0
 msgid "Attachments"
-msgstr ""
+msgstr "Załączniki"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:59
@@ -870,7 +873,7 @@ msgstr ""
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Błąd ! Data końcowa nie może być przed datą początkową."
 
 #. module: event
 #: code:addons/event/event.py:442
@@ -897,7 +900,7 @@ msgstr "Faktura"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: event
 #: code:addons/event/event.py:517
@@ -910,7 +913,7 @@ msgstr "Anuluj"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Zamknij"
 
 #. module: event
 #: view:event.event:0
@@ -926,7 +929,7 @@ msgstr "Otwórz"
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Użytkownik odpowiedzialny"
 
 #. module: event
 #: code:addons/event/event.py:538
@@ -942,7 +945,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odpowiedzialny"
 
 #. module: event
 #: field:event.event,unit_price:0
@@ -955,7 +958,7 @@ msgstr ""
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Current"
-msgstr ""
+msgstr "Bieżący"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -967,12 +970,12 @@ msgstr "Cena jedn."
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Wykładowca"
 
 #. module: event
 #: view:event.registration:0
 msgid "Details"
-msgstr ""
+msgstr "Szczegóły"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -985,18 +988,18 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Zespół sprzedaży"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Data rozpoczęcia"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Data zakończenia"
 
 #. module: event
 #: field:event.event,product_id:0
@@ -1011,7 +1014,7 @@ msgstr "Produkt"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
@@ -1021,7 +1024,7 @@ msgstr ""
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Subskrybuj"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -1046,13 +1049,13 @@ msgstr "Bilet na konferencję"
 #. 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 "Następne wydarzenia"
 
 #. module: event
 #: view:partner.event.registration:0
@@ -1073,7 +1076,7 @@ msgstr ""
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Niepotwierdzony"
 
 #. module: event
 #: code:addons/event/event.py:542
@@ -1084,12 +1087,12 @@ msgstr ""
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Data końcowa"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: event
 #: view:board.board:0
@@ -1112,7 +1115,7 @@ msgstr ""
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Kraj"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
@@ -1132,13 +1135,13 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Opis"
 
 #. module: event
 #: view:event.event:0
@@ -1160,7 +1163,7 @@ msgstr "Rejestracje"
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data początkowa"
 
 #. module: event
 #: field:event.event,register_max:0
@@ -1206,7 +1209,7 @@ msgstr "Wiadomość automatycznej rejestracji"
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Suma"
 
 #. module: event
 #: help:event.event,register_min:0
@@ -1295,9 +1298,6 @@ msgstr ""
 #~ msgid "Send Reminder"
 #~ msgstr "Wyślij przypomnienie"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Błąd: Niedozwolony kod EAN"
 
diff --git a/addons/event/i18n/pt.po b/addons/event/i18n/pt.po
index 5d6ba354210..3ab183a5f50 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1441,14 +1441,5 @@ msgstr ""
 #~ msgid "List Register Partners"
 #~ msgstr "Lista de Registos de Terceiros"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
 #~ msgid "Create Invoices"
 #~ msgstr "Criar faturas"
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
index 9d838095130..b06c69c71d7 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1285,9 +1285,6 @@ msgstr ""
 #~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
 #~ "especial!"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Erro ! Voce não pode criar seções recursivas."
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: código EAN invalido"
 
@@ -1310,15 +1307,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/event/i18n/ro.po b/addons/event/i18n/ro.po
index b5d98d233f0..35ac2cdb744 100644
--- a/addons/event/i18n/ro.po
+++ b/addons/event/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-19 21:55+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
index 1b16fc71207..77f37159701 100644
--- a/addons/event/i18n/ru.po
+++ b/addons/event/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-08-02 10:44+0000\n"
+"PO-Revision-Date: 2011-11-07 22:33+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-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -689,8 +689,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
-"Эти эл. адреса будут добавлены в поле \"Копия\" всей входящей и исходящей "
-"почты для этой записи. Разделяйте эл. адреса запятыми."
+"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и "
+"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса "
+"запятыми."
 
 #. module: event
 #: constraint:res.partner:0
diff --git a/addons/event/i18n/sk.po b/addons/event/i18n/sk.po
index cace0e19384..56fd470e926 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sl.po b/addons/event/i18n/sl.po
index fc2d1b33a2c..d7b56c58b5a 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sq.po b/addons/event/i18n/sq.po
index 01626cc29af..f6a680cd5d1 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sr.po b/addons/event/i18n/sr.po
index 9edba07e4f1..72c99ebd31c 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1443,43 +1443,3 @@ msgstr ""
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: Neispravan EAN kod"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne menije."
-
-#~ msgid "Event Registraion"
-#~ msgstr "Registracija Dogadjaja"
-
-#~ msgid ""
-#~ "Oraganization and management of Event.\n"
-#~ "\n"
-#~ "    This module allow you\n"
-#~ "        * to manage your events and their registrations\n"
-#~ "        * to use emails to automatically confirm and send acknowledgements "
-#~ "for any registration to an event\n"
-#~ "        * ...\n"
-#~ "    A dashboard for associations that includes:\n"
-#~ "    * Registration by Events (graph)\n"
-#~ "    Note that:\n"
-#~ "    - You can define new types of events in\n"
-#~ "                Events / Configuration / Types of Events\n"
-#~ "    - You can access predefined reports about number of registration per "
-#~ "event or per event category in:\n"
-#~ "                Events / Reporting\n"
-#~ msgstr ""
-#~ "Organizacija i Upravljanje Dogadjajima.\n"
-#~ "\n"
-#~ "        Ovaj modul vam omogucava\n"
-#~ "             *Da upravljate svojim dogadjajima i njohovim registracijama.\n"
-#~ "             *Da koristite Emal da automatski potvrdjujete i saljete "
-#~ "zakljucke  bilo kojoj registraciji nekog Dogadjaja\n"
-#~ "             *...\n"
-#~ "        UpravljackaTabla za asociacije koja sadrzi:\n"
-#~ "             *Registracije po Dogadjajima ( Grafikon)\n"
-#~ "             Upamtite da:\n"
-#~ "                 Mozete definisati nove tipove dogadjaja u \n"
-#~ "                                             Events / Configuration / Types "
-#~ "of Events\n"
-#~ "                -Mozete pristupiti predefinisanim izvestajima o broju "
-#~ "registracija po dogadjaju ili po kategoriji dogadjaja u:\n"
-#~ "                                             Events / Reporting\n"
diff --git a/addons/event/i18n/sr@latin.po b/addons/event/i18n/sr@latin.po
index 83ae72584bc..caea74344dc 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1257,46 +1257,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid ""
-#~ "Oraganization and management of Event.\n"
-#~ "\n"
-#~ "    This module allow you\n"
-#~ "        * to manage your events and their registrations\n"
-#~ "        * to use emails to automatically confirm and send acknowledgements "
-#~ "for any registration to an event\n"
-#~ "        * ...\n"
-#~ "    A dashboard for associations that includes:\n"
-#~ "    * Registration by Events (graph)\n"
-#~ "    Note that:\n"
-#~ "    - You can define new types of events in\n"
-#~ "                Events / Configuration / Types of Events\n"
-#~ "    - You can access predefined reports about number of registration per "
-#~ "event or per event category in:\n"
-#~ "                Events / Reporting\n"
-#~ msgstr ""
-#~ "Organizacija i Upravljanje Dogadjajima.\n"
-#~ "\n"
-#~ "        Ovaj modul vam omogucava\n"
-#~ "             *Da upravljate svojim dogadjajima i njohovim registracijama.\n"
-#~ "             *Da koristite Emal da automatski potvrdjujete i saljete "
-#~ "zakljucke  bilo kojoj registraciji nekog Dogadjaja\n"
-#~ "             *...\n"
-#~ "        UpravljackaTabla za asociacije koja sadrzi:\n"
-#~ "             *Registracije po Dogadjajima ( Grafikon)\n"
-#~ "             Upamtite da:\n"
-#~ "                 Mozete definisati nove tipove dogadjaja u \n"
-#~ "                                             Events / Configuration / Types "
-#~ "of Events\n"
-#~ "                -Mozete pristupiti predefinisanim izvestajima o broju "
-#~ "registracija po dogadjaju ili po kategoriji dogadjaja u:\n"
-#~ "                                             Events / Reporting\n"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne menije."
-
-#~ msgid "Event Registraion"
-#~ msgstr "Registracija Dogadjaja"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Greška: JU (jedinice usluga)  i JM moraju da budu u različitim kategorijama"
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index c3eb171c8d2..a19c0849d69 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: 2011-06-04 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/tlh.po b/addons/event/i18n/tlh.po
index d1905fceedf..eaebb47b04f 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/tr.po b/addons/event/i18n/tr.po
index a80053a51f5..9247c0e89fc 100644
--- a/addons/event/i18n/tr.po
+++ b/addons/event/i18n/tr.po
@@ -13,50 +13,50 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
 msgid "Invoice Information"
-msgstr ""
+msgstr "Fatura Bilgileri"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+msgstr "Enfazla Kayıt Sayısını Belirtin"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr ""
+msgstr "Olay Ayrıntıları"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr ""
+msgstr "Ana Konuşmacı"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr "Minumum Kayıtlar"
+msgstr "Enaz Kayıt"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr ""
+msgstr "Olay Kayıtı Onaylama"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Unvan"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -66,23 +66,23 @@ msgstr "Kayıt E-Postası"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Faturaları hazırla"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Kayıt Tarihi"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who are giving speech on event."
-msgstr ""
+msgstr "Olayda konuşacak Konuşmacı"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Kapat"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -100,7 +100,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -111,7 +111,7 @@ msgstr "Onay E-Postası"
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "Kayıtta faturalandırılacak paydaş yok."
 
 #. module: event
 #: field:event.event,company_id:0
@@ -119,12 +119,12 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Fatura Tarihi"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:93
@@ -139,12 +139,12 @@ msgstr "Etkinlik Kaydı"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 7 Days"
-msgstr ""
+msgstr "Son 7 Gün"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Ana Etkinlik"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
@@ -154,7 +154,7 @@ msgstr "Fatura Oluştur"
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Ara Toplam"
 
 #. module: event
 #: view:report.event.registration:0
@@ -164,12 +164,12 @@ msgstr "Kayıttaki Etkinlik"
 #. module: event
 #: view:report.event.registration:0
 msgid "Current Events"
-msgstr ""
+msgstr "Güncel Etkinlikler"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "İç Not Ekle"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -177,12 +177,12 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr ""
+msgstr "Etkinlik Analizi"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "İletiler"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -199,24 +199,24 @@ msgstr "Opera İçin Bilet"
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr "Onay Durumu"
+msgstr "Etkinlik Onayı"
 
 #. module: event
 #: selection:event.event,state:0
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Vazgeçildi"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Yanıtla"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 msgid "Event Dashboard"
-msgstr ""
+msgstr "Etkinlik Panosu"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -226,12 +226,12 @@ msgstr "Verdi Operası"
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Fiyat Listesi"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr "Cari İletişimi"
+msgstr "Paydaş İlgilisi"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
@@ -241,29 +241,29 @@ msgstr ""
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referans"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr ""
+msgstr "Etkinlik Kapanış Tarihi"
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr ""
+msgstr "Epostalar"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr "Extra Bilgi"
+msgstr "Ek Bilgi"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Müşteri Faturaları"
 
 #. module: event
 #: selection:event.event,state:0
@@ -274,12 +274,12 @@ msgstr "Taslak"
 #. module: event
 #: field:event.type,name:0
 msgid "Event type"
-msgstr "Etkinlik Tipi"
+msgstr "Etkinlik Türü"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Etkinlik Türü "
 
 #. module: event
 #: view:event.event:0
@@ -292,13 +292,13 @@ msgstr ""
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr "Olay"
+msgstr "Etkinlik"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr ""
+msgstr "İsimlikler"
 
 #. module: event
 #: view:event.event:0
@@ -317,7 +317,7 @@ msgstr "Kayıt Onaylama"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Güncel Etkinlik Fiyat Listesi Sürümü"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -330,23 +330,23 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Çeşitli"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr ""
+msgstr "Diğer Konuşmacılar"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Etkinlik Faturası Hazırla"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Kayıt ya da Bilet Sayısı"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -355,22 +355,22 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Uyarı !"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Yeni Eposta gönder"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Konum"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Yanıtla"
 
 #. module: event
 #: field:event.event,register_current:0
@@ -387,12 +387,12 @@ msgstr "Posta Otomatik Kaydı"
 #: field:event.event,type:0
 #: field:partner.event.registration,event_type:0
 msgid "Type"
-msgstr "Tipi"
+msgstr "Tür"
 
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Eposta"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
@@ -403,12 +403,12 @@ msgstr "Faturalanacak"
 #: code:addons/event/event.py:394
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Hata !"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Oluşturma Tarihi"
 
 #. module: event
 #: view:event.event:0
@@ -426,12 +426,12 @@ msgstr ""
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "Miktar"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr ""
+msgstr "Etkinlik Türü, Seminer, Sergi, Konferansi Eğitim gibi."
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -452,28 +452,28 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr ""
+msgstr "Etkinlik Organizasyonu"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Geçmiş Bilgisi"
 
 #. module: event
 #: view:event.registration:0
 msgid "Dates"
-msgstr "Tarih Bilgileri"
+msgstr "Tarihler"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr "Her Halükârda Onayla"
+msgstr "Herdurumda Yazdır"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
@@ -511,12 +511,12 @@ msgstr "Etkinliği İptal Et"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "İlgili"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Son 30 Gün"
 
 #. module: event
 #: view:event.event:0
@@ -524,19 +524,19 @@ msgstr ""
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Paydaş"
 
 #. 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 "Etkinlik Doluluk Durumu"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Faturaları Gruplandır"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/uk.po b/addons/event/i18n/uk.po
index e667bda755e..054e0500187 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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1331,9 +1331,6 @@ msgstr ""
 #~ msgid "New event"
 #~ msgstr "Нова Подія"
 
-#~ msgid "Error ! You can not create recursive sections."
-#~ msgstr "Помилка ! Ви не можете створювати рекурсивні секції."
-
 #~ msgid "Draft Events"
 #~ msgstr "Чорнові Події"
 
diff --git a/addons/event/i18n/vi.po b/addons/event/i18n/vi.po
index e19a5e3821c..fa87cfaf583 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -207,7 +207,7 @@ msgstr ""
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Bị hủy bỏ"
 
 #. module: event
 #: field:event.event,reply_to:0
@@ -356,7 +356,7 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Cảnh báo !"
 
 #. module: event
 #: view:event.registration:0
@@ -404,7 +404,7 @@ msgstr ""
 #: code:addons/event/event.py:394
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Lỗi !"
 
 #. module: event
 #: field:event.registration,create_date:0
@@ -477,7 +477,7 @@ msgstr ""
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "Cảnh báo: Sự kiện '%s' đã đạt Giới hạn Tối đa (%s)."
 
 #. module: event
 #: view:event.event:0
@@ -503,7 +503,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr ""
+msgstr "Hủy bỏ Sự kiện"
 
 #. module: event
 #: view:event.event:0
@@ -601,7 +601,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Event Done"
-msgstr ""
+msgstr "Sự kiện Hoàn tất"
 
 #. module: event
 #: model:ir.module.module,description:event.module_meta_information
@@ -631,7 +631,7 @@ msgstr ""
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo sự kiện đệ quy."
 
 #. module: event
 #: field:event.registration,ref2:0
@@ -672,7 +672,7 @@ msgstr ""
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo ra các thành viên đệ quy có liên quan."
 
 #. module: event
 #: view:event.make.invoice:0
@@ -687,7 +687,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Đã được đóng"
 
 #. module: event
 #: view:event.event:0
@@ -747,6 +747,8 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Cảnh báo: Sự kiện Này chưa đạt Giới hạn Tối thiểu Đăng ký. Bạn có chắc chắn "
+"muốn xác nhận nó?"
 
 #. module: event
 #: field:event.registration,active:0
@@ -871,7 +873,7 @@ msgstr ""
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Lỗi ! Ngày Đóng cửa không thể trước Ngày Bắt đầu."
 
 #. module: event
 #: code:addons/event/event.py:442
@@ -881,7 +883,7 @@ msgstr ""
 #: selection:report.event.registration,state:0
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Hoàn tất"
 
 #. module: event
 #: field:event.event,date_begin:0
@@ -904,14 +906,14 @@ msgstr ""
 #: code:addons/event/event.py:517
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Đóng"
 
 #. module: event
 #: view:event.event:0
@@ -1128,7 +1130,7 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "Kết thúc Đăng ký"
 
 #. module: event
 #: selection:report.event.registration,month:0
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index fc81be7f8fc..a6215faf77d 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -8,81 +8,81 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-08-02 14:36+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
 msgid "Invoice Information"
-msgstr ""
+msgstr "发票信息"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+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
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who are giving speech on event."
-msgstr ""
+msgstr "关注者，谁给出对事件的关注"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "结束"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -95,23 +95,23 @@ msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify for each registration a specific amount if "
 "you want to"
-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 "确认Email"
+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
@@ -119,12 +119,12 @@ 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
 #: code:addons/event/wizard/partner_event_registration.py:93
@@ -134,17 +134,17 @@ msgstr ""
 #: view:partner.event.registration:0
 #, python-format
 msgid "Event Registration"
-msgstr "事件记录"
+msgstr "事件登记记录"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 7 Days"
-msgstr ""
+msgstr "最近 7 天"
 
 #. 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
@@ -154,22 +154,22 @@ msgstr "生成发票"
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "小计"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "记录的事件"
+msgstr "登记记录的事件"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Current Events"
-msgstr ""
+msgstr "当前事件"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "添加内部备注"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -177,12 +177,12 @@ 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
 #: field:event.event,mail_auto_confirm:0
@@ -206,17 +206,17 @@ 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
 msgid "Event Dashboard"
-msgstr ""
+msgstr "事件控制台"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -226,7 +226,7 @@ msgstr "Verdi歌剧"
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "价格表"
 
 #. module: event
 #: field:event.registration,contact_id:0
@@ -236,34 +236,34 @@ 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.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
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "客户发票"
 
 #. module: event
 #: selection:event.event,state:0
@@ -279,7 +279,7 @@ msgstr "事件类型"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " 事件类型 "
 
 #. module: event
 #: view:event.event:0
@@ -298,7 +298,7 @@ msgstr "事件"
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr ""
+msgstr "标记"
 
 #. module: event
 #: view:event.event:0
@@ -312,12 +312,12 @@ msgstr "已确认"
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr "记录确认"
+msgstr "确认登记记录"
 
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "当前事件的价格表版本"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -325,28 +325,28 @@ 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
 #: view:event.registration:0
 msgid "Misc"
-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
@@ -355,33 +355,33 @@ 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
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "位置"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-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
@@ -392,7 +392,7 @@ msgstr "类型"
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
@@ -403,35 +403,35 @@ msgstr "待开票"
 #: code:addons/event/event.py:394
 #, python-format
 msgid "Error !"
-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:395
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "要开票的登记记录里的业务伙伴没地址"
 
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr ""
+msgstr "事件类型如：研讨会，展览，会议，培训。"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -444,22 +444,22 @@ msgstr "当有人确认这事件或赞同这确认事件时, 这邮件将发送
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrati./event/event.py:41:ons"
-msgstr ""
+msgstr "预注册人数总计"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. 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
@@ -476,7 +476,7 @@ msgstr "总是确认"
 #: 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:event.event:0
@@ -484,7 +484,7 @@ 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
@@ -498,6 +498,7 @@ 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
@@ -508,12 +509,12 @@ msgstr "取消事件"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "联系方式"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "最近30天"
 
 #. module: event
 #: view:event.event:0
@@ -521,19 +522,19 @@ 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
@@ -549,7 +550,7 @@ msgstr "演唱会票"
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr "不确认记录"
+msgstr "不确认登记记录"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
@@ -559,7 +560,7 @@ msgstr "已开票业务伙伴"
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "日志"
 
 #. module: event
 #: view:event.event:0
@@ -569,33 +570,33 @@ 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
 msgid "Invoice Name"
-msgstr ""
+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
@@ -621,44 +622,52 @@ msgid ""
 "event or per event category in:\n"
 "                Events / Reporting\n"
 msgstr ""
+"事件的结构和管理。\n"
+"  这模块允许你：\n"
+"    * 管理你的事件和它的登记记录\n"
+"    * 使用电子邮件去自动确认和一个事件的任何登记记录\n"
+"    * .... 综合的控制台包括：\n"
+"      * 事件的登记记录（分组）\n"
+"  备注： 你能在事件/设置/事件类型里定义新类型。\n"
+"  你可以在事件/报告里访问每个事件的登记记录数或事件类型的预定义报表。\n"
 
 #. 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:357
 #: 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
@@ -666,27 +675,27 @@ 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
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-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
 msgid "Beginning Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "已结束"
 
 #. module: event
 #: view:event.event:0
@@ -701,102 +710,102 @@ 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
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use the automatic mailing for new registration"
-msgstr "勾选此项, 如果你使用自动邮递一个新记录"
+msgstr "勾选此项, 如果你使用自动邮递一个新登记记录"
 
 #. module: event
 #: 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
 #: 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
 #: 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
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "开启和完成的登记记录共有"
 
 #. 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 "抄送"
 
 #. 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
@@ -810,24 +819,24 @@ 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
 #: model:ir.ui.menu,name:event.board_associations
 msgid "Dashboard"
-msgstr ""
+msgstr "控制台"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "确认邮件内容"
 
 #. module: event
 #: view:event.registration:0
@@ -838,7 +847,7 @@ msgstr "日志"
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "地址"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
@@ -849,13 +858,13 @@ msgstr "事件类型"
 #. module: event
 #: view:event.registration:0
 msgid "Attachments"
-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
@@ -865,12 +874,12 @@ msgstr "自动确认邮件"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "最近365天"
 
 #. 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:442
@@ -897,7 +906,7 @@ msgstr "发票"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: event
 #: code:addons/event/event.py:517
@@ -910,30 +919,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:432
 #, 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:538
 #: code:addons/event/event.py:545
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "自动确认： [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -942,20 +951,20 @@ 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
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -967,12 +976,12 @@ msgstr "单价"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "关注者"
 
 #. module: event
 #: view:event.registration:0
 msgid "Details"
-msgstr ""
+msgstr "详细信息"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -985,18 +994,18 @@ msgstr "商业会议"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "销售团队"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+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
@@ -1011,32 +1020,32 @@ 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
@@ -1046,55 +1055,55 @@ 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:542
 #, 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
@@ -1107,18 +1116,18 @@ msgstr "名称"
 msgid ""
 "Check this box if you want ot use the automatic confirmation emailing or the "
 "reminder"
-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:500
@@ -1127,18 +1136,18 @@ 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
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "概要"
 
 #. module: event
 #: view:event.event:0
@@ -1155,68 +1164,68 @@ 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,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr "最大记录"
+msgstr "最多的登记记录"
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "事件开始日期"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-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
 #: help:event.event,register_min:0
 msgid "Providee Minimum Number of Registrations"
-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
@@ -1225,7 +1234,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 "Reporting"
 #~ msgstr "报表"
@@ -1321,9 +1330,6 @@ msgstr ""
 #~ msgid "Events On Registrations"
 #~ msgstr "记录的事件"
 
-#~ msgid "Action Information"
-#~ msgstr "动作信息"
-
 #~ msgid "Event type on registration"
 #~ msgstr "记录的事件类型"
 
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index fb3596b4ec7..0280022540e 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-28 15:50+0000\n"
+"PO-Revision-Date: 2011-09-27 07:58+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
 #: view:event.event:0
@@ -717,7 +717,7 @@ msgstr "八月"
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr "不明"
+msgstr "不詳"
 
 #. module: event
 #: selection:report.event.registration,month:0
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 7794843af40..ef69c674e43 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -8,7 +8,7 @@
             <field name="model">report.event.registration</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm');gray:state in('done','cancel')" string="Events Analysis">
+                <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state in('done','cancel')" string="Events Analysis">
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="speaker_id" invisible="1"/>
@@ -52,23 +52,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
-                    <group col="8" colspan="4">
-                    <filter icon="terp-go-year" string="Last 365 Days" name="365day"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events with beginning date in last 365 days"/>
-                    <filter icon="terp-go-month" string="Last 30 Days"
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events with beginning date in last 30 days"/>
-                    <filter icon="terp-go-week"
-                         string="Last 7 Days"
-                         separator="1"
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Events with beginning date in last 7 days"/>
+                    <group>
+                    <filter string="Year" icon="terp-go-year" name="year"
+                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                          help="Events created in current year"/>
                     <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-go-month" name="this_month"
+                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                          help="Events created in current month"/>
+                    <filter icon="terp-go-month" string="    Month-1    "
+                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                          help="Events created in last month"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new"
+                        string="New"
+                        domain="[('state','=','draft')]"
+                        help="Events which are in New state"/>
                     <filter icon="terp-check"
-                        string="Current Events" name="draft"
-                        domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+                        string="Confirm"
+                        domain="[('state','=','confirm')]"
+                        help="Events which are in confirm state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"
                           string="Confirmed Registrations"
@@ -94,7 +97,7 @@
                     </group>
                     <newline/>
 
-                    <group expand="1" string="Group By..." colspan="4" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/>
                         <filter string="Sale Team"  icon="terp-personal" context="{'group_by': 'section_id'}"/>
@@ -124,7 +127,7 @@
             <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_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">
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
index 260e2f77add..5e35d79cab2 100644
--- a/addons/event/test/test_event.yml
+++ b/addons/event/test/test_event.yml
@@ -3,12 +3,12 @@
 - |
   I want to organize one conference event on "OpenERP Business".
 - |
-  I'm creating new product "Ticket for Conference" to specify registration Cost of conference.
+  I'm creating new product "Conference Ticket" to specify registration Cost of conference.
 - 
   !record {model: product.product, id: product_product_ticketforconcert0}:
     categ_id: product.cat1
     list_price: 68.0
-    name: Ticket for Conference  
+    name: Conference Ticket  
 - |
   I'm creating Event type "Conference".
 -   
@@ -75,7 +75,7 @@
     event_id: event.event_event_conference0
     partner_id: event.res_partner_markjohnson0
     partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Ticket for Conference
+    event_product: Conference Ticket
     unit_price: 68.0
     nb_register: 10
 - |
@@ -128,7 +128,7 @@
     event_id: event.event_event_conference0
     partner_id: event.res_partner_markjohnson0
     partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Ticket for Conference
+    event_product: Conference Ticket
     unit_price: 68.0
     nb_register: 100
     
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index ddd32c37631..e8d110bc4f8 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Event Project - Create Retro-Planning to manage your Events',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 Organization and management of events.
diff --git a/addons/event_project/i18n/ar.po b/addons/event_project/i18n/ar.po
index ac606e06cd5..7073b2046f2 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 878931b11f6..272dcd87db2 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -47,12 +47,15 @@ msgid ""
 "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 ""
+msgstr "Ретро-планиране"
 
 #. module: event_project
 #: constraint:event.event:0
@@ -108,7 +111,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
diff --git a/addons/event_project/i18n/bs.po b/addons/event_project/i18n/bs.po
index 2b10ce5683b..60e03a5aa09 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 67a5acb6679..afae94cdc86 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: 2011-05-27 04:46+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 070f1627a32..e39a58cad8d 100644
--- a/addons/event_project/i18n/cs.po
+++ b/addons/event_project/i18n/cs.po
@@ -4,27 +4,28 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"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: 2010-08-03 03:57+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-06 06:16+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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Projekt události"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Datum ukončení"
 
 #. module: event_project
 #: view:event.project:0
@@ -39,6 +40,9 @@ msgid ""
 "    This module allows you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"Organizace a správa událostí.\n"
+"\n"
+"   Tento modul vám umožní zpětné plánování pro správu událostí.\n"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -47,17 +51,20 @@ msgid ""
 "After click on  'Create Retro-planning', New Project will be duplicated from "
 "this template project."
 msgstr ""
+"Toto je Šablona projektu. Projekt události je duplikát této Šablony. Po "
+"kliknutí na 'Vytvořit Zpětné-plánování', bude vytvořen Nový projekt z této "
+"šablony projektu."
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "Zpětné-plánování"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Chyba ! Datum uzavření nemůže být nastaven přes datum zahájení."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -79,6 +86,7 @@ msgstr "Všechny úkoly"
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event Project - Create Retro-Planning to manage your Events"
 msgstr ""
+"Projekt události - Vytvořte Zpětné-plánování ke správě vašich událostí"
 
 #. module: event_project
 #: field:event.project,project_id:0
@@ -88,7 +96,7 @@ msgstr "Šablona projektu"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní událost."
 
 #. module: event_project
 #: field:event.event,task_ids:0
@@ -98,17 +106,17 @@ msgstr "Úkoly projektu"
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Zavřít"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr "Vytvořit retro-plánování"
+msgstr "Vytvořit zpětné-plánování"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
diff --git a/addons/event_project/i18n/de.po b/addons/event_project/i18n/de.po
index a4f0e8a5041..1ff452a2337 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -162,21 +162,3 @@ msgstr "Aufgabenmanagement"
 #, python-format
 #~ msgid "Error !"
 #~ msgstr "Fehler!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/event_project/i18n/el.po b/addons/event_project/i18n/el.po
index 635a4d97fec..70dcab9c151 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..6b8944e51cf
--- /dev/null
+++ b/addons/event_project/i18n/en_GB.po
@@ -0,0 +1,163 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-08-25 17:47+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: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "Event Project"
+
+#. module: event_project
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "Date End"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Ok"
+msgstr "Ok"
+
+#. 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 ""
+"Organisation and management of events.\n"
+"\n"
+"    This module allows you to create retro planning for managing your "
+"events.\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 ""
+"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."
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "Retro-Planning"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "Error ! Closing Date cannot be before Beginning Date."
+
+#. module: event_project
+#: field:event.event,project_id:0
+msgid "Project"
+msgstr "Project"
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "Tasks"
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr "All tasks"
+
+#. module: event_project
+#: model:ir.module.module,shortdesc:event_project.module_meta_information
+msgid "Event Project - Create Retro-Planning to manage your Events"
+msgstr "Event Project - Create Retro-Planning to manage your Events"
+
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "Template of Project"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "Error ! You cannot create recursive event."
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Project tasks"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Close"
+msgstr "Close"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "Date Start"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Create Retro-Planning"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_event
+msgid "Event"
+msgstr "Event"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks management"
+msgstr "Tasks management"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
+#~ msgid "Remaining Tasks"
+#~ msgstr "Remaining Tasks"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
+
+#, python-format
+#~ msgid ""
+#~ "No project defined for this event.\n"
+#~ "You can create one with the retro-planning button !"
+#~ msgstr ""
+#~ "No project defined for this event.\n"
+#~ "You can create one with the retro-planning button !"
+
+#~ msgid "Event - Project"
+#~ msgstr "Event - Project"
+
+#~ msgid ""
+#~ "Organization and management of events.\n"
+#~ "\n"
+#~ "    This module allow you to create retro planning for managing your "
+#~ "events.\n"
+#~ msgstr ""
+#~ "Organisation and management of events.\n"
+#~ "\n"
+#~ "    This module lets you create retro planning to manage your events.\n"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Error !"
diff --git a/addons/event_project/i18n/es.po b/addons/event_project/i18n/es.po
index 49661367cf1..26f2f56d52c 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d3ee641b866..fde766d64a0 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_EC.po b/addons/event_project/i18n/es_EC.po
index 76f42229f3d..27546fd9747 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..db136f3b7c7
--- /dev/null
+++ b/addons/event_project/i18n/es_MX.po
@@ -0,0 +1,165 @@
+# 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 e83a7c5c931..e7e5fbd929a 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..db136f3b7c7
--- /dev/null
+++ b/addons/event_project/i18n/es_VE.po
@@ -0,0 +1,165 @@
+# 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 658c99c50bf..492bef3efa8 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0e94e838766..b6a94e66776 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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b40948cf5b4..4a77230ca49 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80dc56b6843..3df231b0f22 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b4f4a51468c..ef571d40e3e 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b18c9940285..479c316fdd2 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e8e88ab1214..9a09d1a2f1d 100644
--- a/addons/event_project/i18n/hu.po
+++ b/addons/event_project/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 15:12+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c6620c85f29..72ca6e8438a 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f8c9cfb0a22..4a0e2683e96 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -133,24 +133,6 @@ msgstr "Gestione Attività"
 #~ msgid "Event - Project"
 #~ msgstr "Evento - Progetto"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
 #, python-format
 #~ msgid "Error !"
 #~ msgstr "Errore!"
diff --git a/addons/event_project/i18n/ko.po b/addons/event_project/i18n/ko.po
index 242a9ac22d6..7b4cf55969d 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ac606e06cd5..7073b2046f2 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 342559d4799..10a8d41df62 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/nl.po b/addons/event_project/i18n/nl.po
index 7f7a3ef2e72..b86dfffab35 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -160,20 +160,3 @@ msgstr "Taakbeheer"
 #, python-format
 #~ msgid "Error !"
 #~ msgstr "Fout!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/event_project/i18n/nl_BE.po b/addons/event_project/i18n/nl_BE.po
index 424bf431faa..56c51f3038c 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f48532cbf11..41ee2d9ffd2 100644
--- a/addons/event_project/i18n/pl.po
+++ b/addons/event_project/i18n/pl.po
@@ -7,24 +7,24 @@ 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-08-03 03:58+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-05 13:32+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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-06 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Projekt wydarzenia"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Data końcowa"
 
 #. module: event_project
 #: view:event.project:0
@@ -57,7 +57,7 @@ msgstr ""
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Błąd ! Data końcowa nie może być przed datą początkową."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -73,7 +73,7 @@ msgstr "Zadania"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Wszystkie zadania"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
@@ -83,12 +83,12 @@ msgstr ""
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-msgstr ""
+msgstr "Szablon projektu"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych wydarzeń."
 
 #. module: event_project
 #: field:event.event,task_ids:0
@@ -98,12 +98,12 @@ msgstr "Zadania projektów"
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Zamknij"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Data rozpoczęcia"
 
 #. module: event_project
 #: view:event.event:0
@@ -113,7 +113,7 @@ msgstr "Utwórz planowanie wsteczne"
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
 msgid "Event"
-msgstr "Zdarzenie"
+msgstr "Wydarzenie"
 
 #. module: event_project
 #: view:event.event:0
diff --git a/addons/event_project/i18n/pt.po b/addons/event_project/i18n/pt.po
index 372817fc630..b13010b1f2d 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 67410f91589..754f8a86dfc 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -130,21 +130,3 @@ msgstr "Gerenciamento de Tarefas"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
diff --git a/addons/event_project/i18n/ro.po b/addons/event_project/i18n/ro.po
index cc485e60cb9..60d814b0d35 100644
--- a/addons/event_project/i18n/ro.po
+++ b/addons/event_project/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-19 21:30+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8fd6a06d410..8f53da09686 100644
--- a/addons/event_project/i18n/ru.po
+++ b/addons/event_project/i18n/ru.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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Проект мероприятия"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: event_project
 #: view:event.project:0
@@ -39,6 +39,10 @@ msgid ""
 "    This module allows you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"Организация  и управление мероприятиями.\n"
+"\n"
+"    Этот модуль позволяет создавать планы управления мероприятиями в ретро-"
+"стиле.\n"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -47,17 +51,20 @@ msgid ""
 "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 ""
+msgstr "Ретро-план"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Ошибка! Дата завершения не может быть установлена до даты начала."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -73,22 +80,23 @@ msgstr "Задачи"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Все задачи"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event Project - Create Retro-Planning to manage your Events"
 msgstr ""
+"Проект мероприятия — создавайте ретро-планы для управления мероприятиями"
 
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-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
@@ -98,12 +106,12 @@ msgstr "Задания проекта"
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: event_project
 #: view:event.event:0
diff --git a/addons/event_project/i18n/sl.po b/addons/event_project/i18n/sl.po
index 1a618906f68..e10d9a47e69 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4cfcef5c06f..a1c8652bb87 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d9d1af0fc67..de2f39deeee 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -152,11 +152,3 @@ msgstr "Upravljanje Zadacima"
 #~ "\n"
 #~ "    Ovaj modul vam omogucava da kreirate retro planiranje za upravljanje "
 #~ "vasim dogadjajima.\n"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime u definiciji Akcije."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora pocinjati sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/event_project/i18n/sr@latin.po b/addons/event_project/i18n/sr@latin.po
index 36183d863f8..dfa238e92b2 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -130,17 +130,9 @@ msgstr "Događaj"
 msgid "Tasks management"
 msgstr "Upravljanje Zadacima"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora pocinjati sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime u definiciji Akcije."
-
 #~ msgid "Remaining Tasks"
 #~ msgstr "Preostali Zadaci"
 
diff --git a/addons/event_project/i18n/sv.po b/addons/event_project/i18n/sv.po
index 7fca9a2eb4f..ae679b3cbba 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -133,20 +133,3 @@ msgstr "Aktivitetsadministration"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
diff --git a/addons/event_project/i18n/tlh.po b/addons/event_project/i18n/tlh.po
index 523cfc1f8f8..b3076e5ad7a 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e31f031cb91..daa14f3983f 100644
--- a/addons/event_project/i18n/tr.po
+++ b/addons/event_project/i18n/tr.po
@@ -13,23 +13,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Etkinlik Projesi"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr "Tamam"
+msgstr "Tmm"
 
 #. module: event_project
 #: model:ir.module.module,description:event_project.module_meta_information
@@ -39,6 +39,10 @@ msgid ""
 "    This module allows you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"Etkinliklerin düzenlenmesi ve yönetimi.\n"
+"\n"
+"    Bu modül, etkinlerinizin yönetebilmeniz için geriye dönük plan "
+"oluşturmanızı sağlar.\n"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -47,17 +51,20 @@ msgid ""
 "After click on  'Create Retro-planning', New Project will be duplicated from "
 "this template project."
 msgstr ""
+"Bu Proje Şablonudur. Etkinlik projesi bu Şablonun eşidir, 'Geriye Dönük-"
+"planlama' ya tıkladıktan sonra, Yeni Proje bu proje şablonundan "
+"türetilecektir."
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "Geriye Dönük-Planlama"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Hata ! Kapanış Tarihi, Başlangıç Tarihinden önceye ayarlanamaz."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -73,22 +80,24 @@ msgstr "Görevler"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Tüm görevler"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event Project - Create Retro-Planning to manage your Events"
 msgstr ""
+"Etkinlik Projesi - Etikinlerinizi yönetmek için Geriye Dönük Planlama "
+"oluşturun"
 
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-msgstr ""
+msgstr "Proje Şablonu"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Hata ! Yinelenen etkinlik oluşturmazsınız."
 
 #. module: event_project
 #: field:event.event,task_ids:0
@@ -98,22 +107,22 @@ msgstr "Proje görevleri"
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr "Retro-Planning Oluştur."
+msgstr "Geriye Dönük Planlama Oluştur."
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
 msgid "Event"
-msgstr "Olay"
+msgstr "Etkinlik"
 
 #. module: event_project
 #: view:event.event:0
diff --git a/addons/event_project/i18n/uk.po b/addons/event_project/i18n/uk.po
index 62d434a289a..410c40ea24d 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d6aa482200a..9eb7ffa631b 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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e7b1ba5f522..250a4c9c50d 100644
--- a/addons/event_project/i18n/zh_CN.po
+++ b/addons/event_project/i18n/zh_CN.po
@@ -8,23 +8,23 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-08-03 06:15+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "项目事件"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "结束日期"
 
 #. module: event_project
 #: view:event.project:0
@@ -38,7 +38,7 @@ msgid ""
 "\n"
 "    This module allows you to create retro planning for managing your "
 "events.\n"
-msgstr ""
+msgstr "事件的结构和管理\n"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -46,18 +46,18 @@ 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
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误！结束日期不能在开始日期前。"
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -73,22 +73,22 @@ msgstr "任务"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "全部任务"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event Project - Create Retro-Planning to manage your Events"
-msgstr ""
+msgstr "项目事件 - 创建计划倒推去管理你的事件。"
 
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-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
@@ -98,17 +98,17 @@ msgstr "项目任务"
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+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
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index 64fa264ab89..1bd4a791762 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "活動專案"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "結束日期"
 
 #. module: event_project
 #: view:event.project:0
@@ -38,7 +38,7 @@ msgid ""
 "\n"
 "    This module allows you to create retro planning for managing your "
 "events.\n"
-msgstr ""
+msgstr "活動組織及管理。\n"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -57,12 +57,12 @@ msgstr ""
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "錯誤！結束日期不能早於開始日期"
 
 #. module: event_project
 #: field:event.event,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "專案"
 
 #. module: event_project
 #: view:event.event:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-msgstr ""
+msgstr "專案範本"
 
 #. module: event_project
 #: constraint:event.event:0
@@ -98,12 +98,12 @@ msgstr ""
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "關閉"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "開始日期"
 
 #. module: event_project
 #: view:event.event:0
@@ -113,7 +113,7 @@ msgstr ""
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
 msgid "Event"
-msgstr ""
+msgstr "活動"
 
 #. module: event_project
 #: view:event.event:0
diff --git a/addons/fetchmail/__init__.py b/addons/fetchmail/__init__.py
index f9c384ce103..934df9846dd 100644
--- a/addons/fetchmail/__init__.py
+++ b/addons/fetchmail/__init__.py
@@ -21,3 +21,5 @@
 ##############################################################################
 
 import fetchmail
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index d2694fdb958..b50c33b2394 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,19 +21,42 @@
 ##############################################################################
 
 {
-    "name" : "Fetchmail Server",
+    "name" : "Fetch Emails",
     "version" : "1.0",
-    "depends" : ["base", 'mail_gateway'],
+    "depends" : ["base", 'mail'],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Customer Relationship Management',
     "description": """
-Fetch email from POP / IMAP servers.
-====================================
+Retrieve incoming email on POP / IMAP servers
+=============================================
 
-    * Supports SSL
-    * Integrated with all modules
-    * Automatically receive email
-    * Email-based record operations (Add, Update)
+Enter the parameters of your POP/IMAP account(s), and any incoming
+emails on 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:
+
+ * CRM Leads/Opportunities
+ * CRM Claims
+ * Project Issues
+ * Project Tasks
+ * Human Resource Recruitments (Applicants)
+ * etc.
+
+Just install the relevant application, and you can assign any of
+these document types (Leads, Project Issues, etc.) to your incoming
+email accounts. New emails will automatically spawn new documents
+of the chosen type, so it's a snap to create a mailbox-to-OpenERP
+integration. Even better: these documents directly act as mini
+conversations synchronized by email. You can reply from within
+OpenERP, and the answers will automatically be collected when
+they come back, and attached to the same *conversation* document.
+
+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': [],
@@ -51,3 +74,5 @@ Fetch email from POP / IMAP servers.
     'certificate' : '00692978332890137453',
     'images': ['images/1_email_servers.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 9817f0d6633..d1e23f49166 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -19,232 +19,242 @@
 #
 ##############################################################################
 
+import logging
 import time
-
 from imaplib import IMAP4
 from imaplib import IMAP4_SSL
 from poplib import POP3
 from poplib import POP3_SSL
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
+
+import zipfile
+import base64
+import addons
 
 import netsvc
 from osv import osv, fields
 import tools
+from tools.translate import _
 
-logger = netsvc.Logger()
+logger = logging.getLogger('fetchmail')
 
-
-class email_server(osv.osv):
-
-    _name = 'email.server'
+class fetchmail_server(osv.osv):
+    """Incoming POP/IMAP mail server account"""
+    _name = 'fetchmail.server'
     _description = "POP/IMAP Server"
+    _order = 'priority'
 
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'active':fields.boolean('Active', required=False),
         'state':fields.selection([
             ('draft', 'Not Confirmed'),
-            ('waiting', 'Waiting for Verification'),
             ('done', 'Confirmed'),
         ], 'State', select=True, readonly=True),
-        'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
-        'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+        'server' : fields.char('Server Name', size=256, readonly=True, help="Hostname or IP of the mail server", states={'draft':[('readonly', False)]}),
+        'port' : fields.integer('Port', readonly=True, states={'draft':[('readonly', False)]}),
         'type':fields.selection([
             ('pop', 'POP Server'),
             ('imap', 'IMAP Server'),
-        ], 'Server Type', select=True, readonly=False),
-        'is_ssl':fields.boolean('SSL ?', required=False),
-        'attach':fields.boolean('Add Attachments ?', required=False, help="Fetches mail with attachments if true."),
-        'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
-        'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
-        'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
-        'note': fields.text('Description'),
-        'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
-        'object_id': fields.many2one('ir.model', "Object To Create", required=True, help="Whenever an email arrives, it automatically creates the object of this type with all the information attached."),
-        'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
-        'user_id':fields.many2one('res.users', 'User', required=False,  help="This is the user that runs the cron"),
-        'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True),
+            ('local', 'Local Server'),
+        ], 'Server Type', select=True, required=True, readonly=False),
+        'is_ssl':fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP3S=995)"),
+        'attach':fields.boolean('Keep Attachments', help="Whether attachments should be downloaded. "
+                                                         "If not enabled, incoming emails will be stripped of any attachments before being processed"),
+        'original':fields.boolean('Keep Original', help="Whether a full original copy of each email should be kept for reference"
+                                                        "and attached to each processed message. This will usually double the size of your message database."),
+        'date': fields.datetime('Last Fetch Date', readonly=True),
+        'user' : fields.char('Username', size=256, readonly=True, states={'draft':[('readonly', False)]}),
+        'password' : fields.char('Password', size=1024, readonly=True, states={'draft':[('readonly', False)]}),
+        'action_id':fields.many2one('ir.actions.server', 'Server Action', help="Optional custom server action to trigger for each incoming mail, "
+                                                                               "on the record that was created or updated by this mail"),
+        'object_id': fields.many2one('ir.model', "Create a New Record", required=True, help="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)."),
+        '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),
+        'configuration' : fields.text('Configuration'),
+        'script' : fields.char('Script', readonly=True, size=64),
     }
     _defaults = {
-        'state': lambda *a: "draft",
-        'active': lambda *a: True,
-        'priority': lambda *a: 5,
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'user_id': lambda self, cr, uid, ctx: uid,
+        'state': "draft",
+        'type': "pop",
+        'active': True,
+        'priority': 5,
+        'attach': True,
+        'script': '/mail/static/scripts/openerp_mailgate.py',
     }
 
-    def check_duplicate(self, cr, uid, ids, context=None):
-        # RFC *-* Why this limitation? why not in SQL constraint?
-        vals = self.read(cr, uid, ids, ['user', 'password'], context=context)[0]
-        cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password']))
-        res = cr.fetchone()
-        if res:
-            if res[0] > 1:
-                return False
-        return True
 
-    def check_model(self, cr, uid, ids, context = None):
-        if context is None:
-            context = {}
-        current_rec = self.read(cr, uid, ids, context)
-        if current_rec:
-            current_rec = current_rec[0]
-            model_name = self.pool.get('ir.model').browse(cr, uid, current_rec.get('object_id')[0]).model
-            model = self.pool.get(model_name)
-            if hasattr(model, 'message_new'):
-                return True
-        return False
-
-    _constraints = [
-        (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password']),
-        (check_model, 'Warning! Record for selected Model can not be created\nPlease choose valid Model', ['object_id'])
-    ]
-
-    def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
+    def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False, object_id=False):
         port = 0
+        values = {}
         if server_type == 'pop':
             port = ssl and 995 or 110
         elif server_type == 'imap':
             port = ssl and 993 or 143
+        else:
+            values['server'] = ''
+        values['port'] = port
 
-        return {'value':{'port':port}}
+        conf = {
+            'dbname' : cr.dbname,
+            'uid' : uid,
+            'model' : 'MODELNAME',
+        }
+        if object_id:
+            m = self.pool.get('ir.model')
+            r = m.read(cr,uid,[object_id],['model'])
+            conf['model']=r[0]['model']
+        values['configuration'] = """Use the below script with the following command line options with your Mail Transport Agent (MTA)
+
+openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOSTNAME --port=PORT 
+""" % conf
+
+        return {'value':values}
 
     def set_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids , {'state':'draft'})
         return True
-    
+
+    def connect(self, cr, uid, server_id, context=None):
+        if isinstance(server_id, (list,tuple)):
+            server_id = server_id[0]
+        server = self.browse(cr, uid, server_id, context)
+        if server.type == 'imap':
+            if server.is_ssl:
+                connection = IMAP4_SSL(server.server, int(server.port))
+            else:
+                connection = IMAP4(server.server, int(server.port))
+            connection.login(server.user, server.password)
+        elif server.type == 'pop':
+            if server.is_ssl:
+                connection = POP3_SSL(server.server, int(server.port))
+            else:
+                connection = POP3(server.server, int(server.port))
+            #TODO: use this to remove only unread messages
+            #connection.user("recent:"+server.user)
+            connection.user(server.user)
+            connection.pass_(server.password)
+        return connection
+
     def button_confirm_login(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         for server in self.browse(cr, uid, ids, context=context):
-            logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
-            context.update({'server_id': server.id, 'server_type': server.type})
             try:
-                if server.type == 'imap':
-                    imap_server = None
-                    if server.is_ssl:
-                        imap_server = IMAP4_SSL(server.server, int(server.port))
-                    else:
-                        imap_server = IMAP4(server.server, int(server.port))
-
-                    imap_server.login(server.user, server.password)
-                    ret_server = imap_server
-                    
-                elif server.type == 'pop':
-                    pop_server = None
-                    if server.is_ssl:
-                        pop_server = POP3_SSL(server.server, int(server.port))
-                    else:
-                        pop_server = POP3(server.server, int(server.port))
-
-                    #TODO: use this to remove only unread messages
-                    #pop_server.user("recent:"+server.user)
-                    pop_server.user(server.user)
-                    pop_server.pass_(server.password)
-                    ret_server = pop_server
-                    
-                self.write(cr, uid, [server.id], {'state':'done'})
-                if context.get('get_server',False):
-                    return ret_server
+                connection = server.connect()
+                server.write({'state':'done'})
             except Exception, e:
-                logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e))
-        return True
-
-    def button_fetch_mail(self, cr, uid, ids, context=None):
-        self.fetch_mail(cr, uid, ids, context=context)
+                logger.exception("Failed to connect to %s server %s", server.type, server.name)
+                raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
+            finally:
+                try:
+                    if connection:
+                        if server.type == 'imap':
+                            connection.close()
+                        elif server.type == 'pop':
+                            connection.quit()
+                except Exception:
+                    # ignored, just a consequence of the previous exception
+                    pass
         return True
 
     def _fetch_mails(self, cr, uid, ids=False, context=None):
         if not ids:
-            ids = self.search(cr, uid, [])
+            ids = self.search(cr, uid, [('state','=','done')])
         return self.fetch_mail(cr, uid, ids, context=context)
 
     def fetch_mail(self, cr, uid, ids, context=None):
+        """WARNING: meant for cron usage only - will commit() after each email!"""
         if context is None:
             context = {}
-        email_tool = self.pool.get('email.server.tools')
+        mail_thread = self.pool.get('mail.thread')
         action_pool = self.pool.get('ir.actions.server')
-        context.update({'get_server': True})
         for server in self.browse(cr, uid, ids, context=context):
+            logger.info('start checking for new emails on %s server %s', server.type, server.name)
+            context.update({'fetchmail_server_id': server.id, 'server_type': server.type})
             count = 0
-            user = server.user_id.id or uid
-            try:
-                if server.type == 'imap':
-                    imap_server = self.button_confirm_login(cr, uid, [server.id], context=context)
+            if server.type == 'imap':
+                try:
+                    imap_server = server.connect()
                     imap_server.select()
                     result, data = imap_server.search(None, '(UNSEEN)')
                     for num in data[0].split():
                         result, data = imap_server.fetch(num, '(RFC822)')
-                        res_id = email_tool.process_email(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context)
+                        res_id = mail_thread.message_process(cr, uid, server.object_id.model, data[0][1],
+                                                             save_original=server.original,
+                                                             strip_attachments=(not server.attach),
+                                                             context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, user, [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]})
                             imap_server.store(num, '+FLAGS', '\\Seen')
+                            cr.commit()
                         count += 1
-                    logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name))
-
-                    imap_server.close()
-                    imap_server.logout()
-                elif server.type == 'pop':
-                    pop_server = self.button_confirm_login(cr, uid, [server.id], context=context)
-                    pop_server.list()
+                    logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name)
+                except Exception, e:
+                    logger.exception("Failed to fetch mail from %s server %s", server.type, server.name)
+                finally:
+                    if imap_server:
+                        imap_server.close()
+                        imap_server.logout()
+            elif server.type == 'pop':
+                try:
+                    pop_server = server.connect()
                     (numMsgs, totalSize) = pop_server.stat()
+                    pop_server.list()
                     for num in range(1, numMsgs + 1):
                         (header, msges, octets) = pop_server.retr(num)
                         msg = '\n'.join(msges)
-                        res_id = email_tool.process_email(cr, user, server.object_id.model, msg, attach=server.attach, context=context)
+                        res_id = mail_thread.message_process(cr, uid, server.object_id.model,
+                                                             msg,
+                                                             save_original=server.original,
+                                                             strip_attachments=(not server.attach),
+                                                             context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, user, [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]})
                         pop_server.dele(num)
-
-                    pop_server.quit()
-
-                    logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
-
-            except Exception, e:
-                logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))
-
+                        cr.commit()
+                    logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name)
+                except Exception, e:
+                    logger.exception("Failed to fetch mail from %s server %s", server.type, server.name)
+                finally:
+                    if pop_server:
+                        pop_server.quit()
+            server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)})
         return True
 
-email_server()
-
-class mailgate_message(osv.osv):
-
-    _inherit = "mailgate.message"
-
+class mail_message(osv.osv):
+    _inherit = "mail.message"
     _columns = {
-        'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
-        'server_type':fields.selection([
-            ('pop', 'POP Server'),
-            ('imap', 'IMAP Server'),
-        ], 'Server Type', select=True, readonly=True),
+        'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server",
+                                               readonly=True,
+                                               select=True,
+                                               oldname='server_id'),
     }
-    _order = 'id desc'
 
     def create(self, cr, uid, values, context=None):
         if context is None:
             context={}
-        server_id = context.get('server_id',False)
-        server_type = context.get('server_type',False)
-        if server_id:
-            values['server_id'] = server_id
-        if server_type:
-            values['server_type'] = server_type
-        res = super(mailgate_message,self).create(cr, uid, values, 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)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
         if context is None:
             context={}
-        server_id = context.get('server_id',False)
-        server_type = context.get('server_type',False)
-        if server_id:
-            values['server_id'] = server_id
-        if server_type:
-            values['server_type'] = server_type
-        res = super(mailgate_message,self).write(cr, uid, ids, values, 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)
         return res
 
-mailgate_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml
index ef40a76489f..d77aadc12de 100644
--- a/addons/fetchmail/fetchmail_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -6,10 +6,10 @@
             <field name="interval_number">5</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-            <field eval="'email.server'" name="model"/>
-            <field eval="'_fetch_mails'" name="function"/>
-            <field eval="'()'" name="args"/>
+            <field name="doall" eval="False"/>
+            <field name="model">fetchmail.server</field>
+            <field name="function">_fetch_mails</field>
+            <field name="args">()</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index 34cfc686a8d..b5bd7df80ca 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -1,18 +1,19 @@
 <openerp>
     <data>
-	 <record model="ir.actions.act_window" id="view_email_server_form_installer">
-	        <field name="name">Setup Your Mail server</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">email.server</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="view_id" ref="fetchmail.view_email_server_form"/>
-	    </record>
+     <record model="ir.actions.act_window" id="view_email_server_form_installer">
+            <field name="name">Setup Incoming Mail Servers</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">fetchmail.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="False"/>
+            <field name="help">You can connect OpenERP to your incoming mail server so that documents (leads, tasks, issues, etc) are synchronized automatically with your incoming emails.</field>
+        </record>
 
-	    <record id="view_email_server_form_installer_todo" model="ir.actions.todo">
-	        <field name="action_id" ref="view_email_server_form_installer"/>
-	        <field name="category_id" ref="base.category_sales_management_config"/>
-	        <field name="sequence">4</field>
+        <record id="view_email_server_form_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="view_email_server_form_installer"/>
+            <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="sequence">4</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 99f421ac4a5..56b7165ac56 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -1,158 +1,140 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
         <record model="ir.ui.view" id="view_email_server_tree">
-            <field name="name">email.server.tree</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.list</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('waiting');gray:state in('done')" string="POP/IMAP Servers">
+                <tree colors="blue:state == 'draft'" string="POP/IMAP Servers">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="user"/>
                     <field name="is_ssl"/>
                     <field name="object_id"/>
+                    <field name="date"/>
                     <field name="message_ids" string="# of emails"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_form">
-            <field name="name">email.server.form</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.form</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POP/IMAP Server">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
-                        <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
+                <form string="Incoming Mail Server">
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="type" select="1" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                         <field name="date" select="1"/>
-                        <field name="attach"/>
-                        <field name="active" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Server &amp; Login">
-                            <group col="2" colspan="2">
+                            <group col="4" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}">
                                 <separator string="Server Information" colspan="2"/>
+                                <field name="server" colspan="4" attrs="{'required' : [('type', '!=', 'local')]}" />
+                                <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" />
                                 <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
-                                <field name="server" />
-                                <field name="port" />
                             </group>
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}">
                                 <separator string="Login Information" colspan="2"/>
-                                <field name="user" />
-                                <field name="password" password="True" />
+                                <field name="user" attrs="{'required' : [('type', '!=', 'local')]}"/>
+                                <field name="password" password="True" attrs="{'required' : [('type', '!=', 'local')]}"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Auto Reply?" colspan="2"/>
-                                <field name="action_id"/>
-                                <field name="user_id"/>
+                                <separator string="Actions to Perform on Incoming Mails" colspan="2"/>
+                                <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/>
+                                <field name="action_id" groups="base.group_extended"/>
                             </group>
-                            <group col="2" colspan="2">
-                                <separator string="Process Parameter" colspan="2"/>
-                                <field name="object_id"/>
-                                <field name="priority"/>
+                            <group attrs="{'invisible' : [('type', '!=', 'local')]}" colspan="4" col="4">
+                                <separator string="Configuration" colspan="4"/>
+                                <field name="configuration" colspan="4"/>
+                                <field name="script" colspan="4" widget="url"/>
+                            </group>
+                        </page>
+                        <page string="Advanced" groups="base.group_extended">
+                            <group colspan="2" col="2">
+                                <separator string="Advanced options" colspan="2"/>
+                                <field name="priority" groups="base.group_extended"/>
+                                <field name="attach"/>
+                                <field name="original"/>
+                                <field name="active" select="1"/>
                             </group>
-                            <separator string="Description" colspan="4"/>
-                            <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <field name="state" select="1"/>
-                        <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
-                        <button string="Fetch Emails" type="object" name="button_fetch_mail" states="done"/>
-                        <button string="Set to Draft" type="object" name="set_draft" icon="gtk-convert"/>
+                    <group colspan="4" col="6" attrs="{'invisible' : [('type', '=', 'local')]}">
+                        <field name="state"/>
+                        <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" icon="gtk-apply"/>
+                        <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
                     </group>
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_search">
-            <field name="name">email.server.search</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.search</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Email Servers">
+                <search string="Search Incoming Mail Servers">
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator orientation="vertical"/>
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="object_id"/>
-                    <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                 </search>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_email_server_tree">
-            <field name="name">Email Servers</field>
-            <field name="res_model">email.server</field>
+            <field name="name">Incoming Mail Servers</field>
+            <field name="res_model">fetchmail.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
             <field name="search_view_id" ref="view_email_server_search"/>
         </record>
 
-        <menuitem 
-            parent="base.menu_mail_gateway" 
+        <menuitem
+            parent="base.next_id_15"
             id="menu_action_fetchmail_server_tree"
-            action="action_email_server_tree" 
-            name="Email Servers"
+            action="action_email_server_tree"
+            name="Incoming Mail Servers"
+            sequence="40"
         />
-        
-      <record model="ir.ui.view" id="mailgate_message_tree_view">
-	      <field name="name">mailgate.message.tree</field>
-	      <field name="model">mailgate.message</field>
-	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
-	      <field name="arch" type="xml">
-	          <field name="user_id" position="after">
-	              <field name="server_id" select="1"/>
-	              <field name="ref_id"/>
-	          </field>
-	      </field>
-      </record>
-      
-      <record model="ir.ui.view" id="mailgate_message_search_view">
-	      <field name="name">mailgate.message.inherit.search</field>
-	      <field name="model">mailgate.message</field>
-	      <field name="type">search</field>
-	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/>
-	      <field name="arch" type="xml">
-			<xpath expr="/search/field[@name='name']" position="before">
-			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
-			     <separator orientation="vertical"/>
-			</xpath>
-			<xpath expr="/search/group/filter[@string='Thread']" position="before">
-                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
-            </xpath>
-	      </field>
-      </record>
-      
-      <record id="action_view_mail_message_emails" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mailgate.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_emails': 1}</field>
-            <field name="search_view_id" ref="mailgate_message_search_view"/>
-      </record>
-        
-      <menuitem id="base.menu_email_gateway_form"
-               parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
 
-      <act_window 
-            context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
-            id="act_server_history" name="Emails"
-            res_model="mailgate.message" src_model="email.server"/>
-            
+      <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="type">tree</field>
+          <field name="inherit_id" ref="mail.view_email_message_tree"/>
+          <field name="arch" type="xml">
+              <field name="user_id" position="after">
+                  <field name="fetchmail_server_id" select="1"/>
+              </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="type">search</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)]"
+            res_model="mail.message" src_model="fetchmail.server"/>
+
     </data>
 </openerp>
diff --git a/addons/fetchmail/i18n/bg.po b/addons/fetchmail/i18n/bg.po
index c074f30c4c0..2d90f5d2648 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
 msgstr "Парола"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Имейли"
@@ -304,3 +305,6 @@ msgstr "Пощенски сървър"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr ""
+
+#~ msgid "Email Servers"
+#~ msgstr "Имейл сървъри"
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
index 8a3c92f990e..2ff7beed7ef 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
 msgstr "Contrasenya"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Emails"
@@ -315,3 +316,6 @@ msgstr "Servidor de correu"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr "Recupera emails"
+
+#~ msgid "Email Servers"
+#~ msgstr "Servidores de correo"
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index cc44a3fc4e6..858468a858c 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
 msgstr "Passwort"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Email Konfiguration"
@@ -316,47 +317,5 @@ msgstr "Mail Server"
 msgid "Fetch Emails"
 msgstr "Abholen Emails"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "haben !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehler in Modellbezeichnung der definierten Aktion"
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Server"
-
-#~ msgid "Reply Email"
-#~ msgstr "Antwort EMail"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Argumente"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht"
-
-#~ msgid "Received Email History"
-#~ msgstr "Historie empfangene EMails"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regeln werden für osv_memory Objekt nicht unterstützt"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "OpenObject Model. Generates a record of this model."
-#~ msgstr "OpenObject Modell. Erstellt einen Datensatz von diesem Modell."
-
 #~ msgid "Email Servers"
 #~ msgstr "EMail Server"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po
index 561000f87be..fd33daa52eb 100644
--- a/addons/fetchmail/i18n/el.po
+++ b/addons/fetchmail/i18n/el.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: 2010-11-27 17:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-23 14:49+0000\n"
+"Last-Translator: Tryfon Farmakakis <farmakakistryfon@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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -53,7 +53,7 @@ msgstr ""
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Not Confirmed"
-msgstr ""
+msgstr "Μη Επιβεβαιωμένο"
 
 #. module: fetchmail
 #: field:email.server,user:0
@@ -91,7 +91,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,attach:0
 msgid "Add Attachments ?"
-msgstr ""
+msgstr "Προσθήκη Επισυνάψεων;"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr ""
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -131,7 +132,7 @@ msgstr ""
 #. module: fetchmail
 #: view:email.server:0
 msgid "Search Email Servers"
-msgstr ""
+msgstr "Αναζήτηση Εξυπηρτεητή Email"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -141,7 +142,7 @@ msgstr ""
 #. module: fetchmail
 #: view:email.server:0
 msgid "Auto Reply?"
-msgstr ""
+msgstr "Αυτόματη Απάντηση;"
 
 #. module: fetchmail
 #: field:email.server,name:0
diff --git a/addons/fetchmail/i18n/en_GB.po b/addons/fetchmail/i18n/en_GB.po
new file mode 100644
index 00000000000..8514c567a61
--- /dev/null
+++ b/addons/fetchmail/i18n/en_GB.po
@@ -0,0 +1,321 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-13 09:02+0000\n"
+"Last-Translator: John Bradshaw <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: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Confirmed"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Confirm"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Group By..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "State"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Not Confirmed"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "User Name"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Type"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP Servers"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Fetchmail Server"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Description"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Add Attachments ?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "# of emails"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Email History"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "User"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Date"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Waiting for Verification"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Password"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Search Email Servers"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Auto Reply?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mail gateway Message"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "POP Servers"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Set to Draft"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Messages"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Fetchmail Services"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Server"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Active"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Process Parameter"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "IMAP Server"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "Warning! Can't have duplicate server configuration!"
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Server Type"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Login Information"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Server Information"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr "Fetches mail with attachments if true."
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "POP Server"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Priority between 0 to 10, select define the order of Processing"
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr "Email Server Action"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Server Priority"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Mail Server"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Fetch Emails"
+
+#~ msgid "Email Servers"
+#~ msgstr "Email Servers"
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index ba0f6f2147d..1cd8db90ad9 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -129,6 +129,7 @@ msgid "Password"
 msgstr "Contraseña"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Emails"
@@ -317,35 +318,5 @@ msgstr "Servidor correo"
 msgid "Fetch Emails"
 msgstr "Recuperar emails"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no vá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 "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "Servidores IMAP"
-
-#~ msgid "Reply Email"
-#~ msgstr "Email respuesta"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argumentos no válidos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Received Email History"
-#~ msgstr "Historial emails recibidos"
-
 #~ msgid "Email Servers"
 #~ msgstr "Servidores de correo"
-
-#~ msgid "OpenObject Model. Generates a record of this model."
-#~ msgstr "Modelo OpenObject. Genera un registro de este modelo."
diff --git a/addons/fetchmail/i18n/es_MX.po b/addons/fetchmail/i18n/es_MX.po
new file mode 100644
index 00000000000..12fc571185d
--- /dev/null
+++ b/addons/fetchmail/i18n/es_MX.po
@@ -0,0 +1,322 @@
+# 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-22 08:38+0000\n"
+"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
+"<resteve@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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+"¡Atención! No se pueden crear registros para el modelo seleccionado\n"
+"Seleccione un modelo válido"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Confimar"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "No confirmado"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "Servidores POP/IMAP"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Servidor Fetchmail"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+"Modelo OpenObject. Genera un registro de este modelo.\n"
+"Seleccione un objeto con atributos message_new (nuevo mensaje)."
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "¿Añadir adjuntos?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "número de emails"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Historial email"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Esperando verificación"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Buscar servidores de correo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Servidor y conexión"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "¿Auto responder?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensaje pasarela de correo"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "Servidores POP"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Servicios Fetchmail"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Parámetro proceso"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "Servidor IMAP"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Tipo servidor"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Información conexión"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Información servidor"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr "Si está marcado, obtiene correo con documentos adjuntos."
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "Servidor POP"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Puerto"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+"Fetchmail: \n"
+"    * Recuperar email desde servidor POP / IMAP\n"
+"    * Compatibilidad con SSL\n"
+"    * Integración con todos los módulos\n"
+"    * Recepción automática de emails\n"
+"    * Registros basados en email (añadir, actualizar)\n"
+"    "
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+"Una acción de servidor de correo. Se ejecutará siempre que se obtenga un "
+"email desde el servidor."
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Prioridad entre 0 y 10, define el orden de proceso."
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr "Acción de correo electrónico del servidor"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridad servidor"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Servidor correo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Recuperar emails"
+
+#~ msgid "Email Servers"
+#~ msgstr "Servidores de correo"
diff --git a/addons/fetchmail/i18n/es_VE.po b/addons/fetchmail/i18n/es_VE.po
new file mode 100644
index 00000000000..12fc571185d
--- /dev/null
+++ b/addons/fetchmail/i18n/es_VE.po
@@ -0,0 +1,322 @@
+# 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-22 08:38+0000\n"
+"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
+"<resteve@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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+"¡Atención! No se pueden crear registros para el modelo seleccionado\n"
+"Seleccione un modelo válido"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Confimar"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "No confirmado"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "Servidores POP/IMAP"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Servidor Fetchmail"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+"Modelo OpenObject. Genera un registro de este modelo.\n"
+"Seleccione un objeto con atributos message_new (nuevo mensaje)."
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "¿Añadir adjuntos?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "número de emails"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Historial email"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Esperando verificación"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Buscar servidores de correo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Servidor y conexión"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "¿Auto responder?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensaje pasarela de correo"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "Servidores POP"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Servicios Fetchmail"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Parámetro proceso"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "Servidor IMAP"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Tipo servidor"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Información conexión"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Información servidor"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr "Si está marcado, obtiene correo con documentos adjuntos."
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "Servidor POP"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Puerto"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+"Fetchmail: \n"
+"    * Recuperar email desde servidor POP / IMAP\n"
+"    * Compatibilidad con SSL\n"
+"    * Integración con todos los módulos\n"
+"    * Recepción automática de emails\n"
+"    * Registros basados en email (añadir, actualizar)\n"
+"    "
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+"Una acción de servidor de correo. Se ejecutará siempre que se obtenga un "
+"email desde el servidor."
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Prioridad entre 0 y 10, define el orden de proceso."
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr "Acción de correo electrónico del servidor"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridad servidor"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Servidor correo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Recuperar emails"
+
+#~ msgid "Email Servers"
+#~ msgstr "Servidores de correo"
diff --git a/addons/fetchmail/i18n/et.po b/addons/fetchmail/i18n/et.po
new file mode 100644
index 00000000000..6a0486f4cbd
--- /dev/null
+++ b/addons/fetchmail/i18n/et.po
@@ -0,0 +1,305 @@
+# Estonian 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-10-11 18:02+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Kinnitatud"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Kinnita"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Grupeeri..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Olek"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Kinnitamata"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Kasutajanimi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tüüp"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP serverid"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Fetchmail server"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Kuupäev"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Salasõna"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "E-kirjad"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Automaatvastus"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "POP serverid"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Määra mustandiks"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Sõnumid"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Fetchmail teenused"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Server"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Aktiivne"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "IMAP server"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Mudel"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP server"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Serveri tüüp"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Sisselogimise info"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Serveri info"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "POP server"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr ""
diff --git a/addons/fetchmail/i18n/fi.po b/addons/fetchmail/i18n/fi.po
index 16c2f9c9132..75000114b5c 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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 003d75df81f..fd4307ead5c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
 msgstr "Mot de passe"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Courriels"
@@ -317,5 +318,5 @@ msgstr "Serveur de courriel"
 msgid "Fetch Emails"
 msgstr "Récupérer les courriels"
 
-#~ msgid "IMAP Servers"
-#~ msgstr "Serveur IMAP"
+#~ msgid "Email Servers"
+#~ msgstr "Serveurs de courriels"
diff --git a/addons/fetchmail/i18n/gl.po b/addons/fetchmail/i18n/gl.po
index 14b8cdc8c02..daeff566ca9 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
 msgstr "Contrasinal"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Correos electrónicos"
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 2f76bca54be..63bae119942 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-19 14:10+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -125,6 +126,7 @@ msgid "Password"
 msgstr "Jelszó"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "E-mailek"
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index a27539dd3ac..09845f18fb7 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
 msgstr "Password"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Email"
@@ -153,7 +154,7 @@ msgstr "Nome"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr ""
+msgstr "Messaggio server mail"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -174,7 +175,7 @@ msgstr "Messaggi"
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Fetchmail Services"
-msgstr ""
+msgstr "Serizio recupero posta"
 
 #. module: fetchmail
 #: field:email.server,server:0
@@ -296,7 +297,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Email Server Action"
-msgstr ""
+msgstr "Azione server email"
 
 #. module: fetchmail
 #: field:email.server,priority:0
@@ -312,40 +313,7 @@ msgstr "Mail Server"
 #. module: fetchmail
 #: view:email.server:0
 msgid "Fetch Emails"
-msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ 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 "IMAP Servers"
-#~ msgstr "Server IMAP"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argomenti non validi"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Reply Email"
-#~ msgstr "Rispondi Email"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
+msgstr "Preleva email"
 
 #~ msgid "Email Servers"
 #~ msgstr "Server Email"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/fetchmail/i18n/lt.po b/addons/fetchmail/i18n/lt.po
index 32f7e1c714c..e485362a242 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
 msgstr "Slaptažodis"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "El. laiškai"
diff --git a/addons/fetchmail/i18n/lv.po b/addons/fetchmail/i18n/lv.po
index 4cebb9d50c2..0049c3c4fe9 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Parole"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "E-pasti"
diff --git a/addons/fetchmail/i18n/mn.po b/addons/fetchmail/i18n/mn.po
index 79a2d4a62b1..8033759aa03 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Password"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -309,32 +310,3 @@ msgstr "Мэйл сервер"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr "Fetch Emails"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "The Object name must start with x_ and not contain any special character !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Invalid model name in the action definition."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Servers"
-
-#~ msgid "Reply Email"
-#~ msgstr "Reply Email"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! You can not create recursive Menu."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Invalid arguments"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalid XML for View Architecture!"
-
-#~ msgid "Received Email History"
-#~ msgstr "Received Email History"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules are not supported for osv_memory objects !"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index 2195e992c08..72beaf2e52e 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "E-mails"
@@ -316,43 +317,5 @@ msgstr "Mail server"
 msgid "Fetch Emails"
 msgstr "Ophalen emails"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief Menu maken."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Servers"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Ongeldige argumenten"
-
-#~ msgid "Received Email History"
-#~ msgstr "Ontvangen Email Historie"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie-definiëring."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De Objectnaam moet starten met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Reply Email"
-#~ msgstr "Mail beantwoorden"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid "OpenObject Model. Generates a record of this model."
-#~ msgstr "OpenObject model. Genereert een record van dit model."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
 #~ msgid "Email Servers"
 #~ msgstr "Email servers"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index ce09e9505db..d090956d63e 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Hasło"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -309,33 +310,3 @@ msgstr "Serwer pocztowy"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr "Pobierz pocztę"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Nieprawidłowe parametry"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Received Email History"
-#~ msgstr "Historia otrzymanych wiadomości"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie sa obsługiwane w obiektach osv_memory !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "Serwery IMAP"
-
-#~ msgid "Reply Email"
-#~ msgstr "Odpowiedź na email"
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 1e631d0dffa..9f79ecb649c 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
 msgstr "Senha"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Mensagens"
@@ -309,6 +310,3 @@ msgstr "Retira emails."
 
 #~ msgid "Email Servers"
 #~ msgstr "Servidores de correio"
-
-#~ msgid "Reply Email"
-#~ msgstr "Responder à mensagem"
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index be3830d96f1..b4c32d57291 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Senha"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Emails"
diff --git a/addons/fetchmail/i18n/ro.po b/addons/fetchmail/i18n/ro.po
index 7b57fc2a210..b8efdae2f88 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Parolă"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Email-uri"
diff --git a/addons/fetchmail/i18n/ru.po b/addons/fetchmail/i18n/ru.po
index 01f4d4abfd4..a54d0e3fa52 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -23,6 +23,8 @@ msgid ""
 "Warning! Record for selected Model can not be created\n"
 "Please choose valid Model"
 msgstr ""
+"Внимание! Невозможно создать запись для выбранной модели\n"
+"Выберите верную модель"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -53,7 +55,7 @@ msgstr "POP"
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Not Confirmed"
-msgstr ""
+msgstr "Не подтверждено"
 
 #. module: fetchmail
 #: field:email.server,user:0
@@ -68,12 +70,12 @@ msgstr "Тип"
 #. module: fetchmail
 #: view:email.server:0
 msgid "POP/IMAP Servers"
-msgstr ""
+msgstr "Сервера POP/IMAP"
 
 #. module: fetchmail
 #: model:ir.module.module,shortdesc:fetchmail.module_meta_information
 msgid "Fetchmail Server"
-msgstr ""
+msgstr "Сервер Fetchmail"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -87,6 +89,8 @@ msgid ""
 "OpenObject Model. Generates a record of this model.\n"
 "Select Object with message_new attrbutes."
 msgstr ""
+"Модель OpenObject. По этой модели генерируется запись.\n"
+"Выбрать объект с атрибутами message_new."
 
 #. module: fetchmail
 #: field:email.server,attach:0
@@ -96,7 +100,7 @@ msgstr "Добавить вложение?"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr ""
+msgstr "Кол-во писем"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -116,7 +120,7 @@ msgstr "Дата"
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Waiting for Verification"
-msgstr ""
+msgstr "Ожидание проверки"
 
 #. module: fetchmail
 #: field:email.server,password:0
@@ -124,6 +128,7 @@ msgid "Password"
 msgstr "Пароль"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Письма"
@@ -131,17 +136,17 @@ msgstr "Письма"
 #. module: fetchmail
 #: view:email.server:0
 msgid "Search Email Servers"
-msgstr ""
+msgstr "Поиск серверов электронной почты"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Server & Login"
-msgstr ""
+msgstr "Сервер и имя пользователя"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Auto Reply?"
-msgstr ""
+msgstr "Авто-ответ?"
 
 #. module: fetchmail
 #: field:email.server,name:0
@@ -151,7 +156,7 @@ msgstr "Название"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr ""
+msgstr "Соообщение почтового шлюза"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -192,7 +197,7 @@ msgstr "Параметр процесса"
 #. module: fetchmail
 #: field:email.server,is_ssl:0
 msgid "SSL ?"
-msgstr ""
+msgstr "SSL?"
 
 #. module: fetchmail
 #: selection:email.server,type:0
@@ -214,12 +219,12 @@ msgstr "IMAP"
 #: view:email.server:0
 #: model:ir.model,name:fetchmail.model_email_server
 msgid "POP/IMAP Server"
-msgstr ""
+msgstr "Сервер POP/IMAP"
 
 #. module: fetchmail
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
-msgstr ""
+msgstr "Внимание! Нельзя использовать повторяющиеся конфигурации сервера!"
 
 #. module: fetchmail
 #: field:email.server,type:0
@@ -240,13 +245,13 @@ msgstr "Сведения о сервере"
 #. module: fetchmail
 #: help:email.server,attach:0
 msgid "Fetches mail with attachments if true."
-msgstr ""
+msgstr "Если в значении \"Истина\", получать письма с вложениями."
 
 #. module: fetchmail
 #: selection:email.server,type:0
 #: selection:mailgate.message,server_type:0
 msgid "POP Server"
-msgstr ""
+msgstr "Сервер POP"
 
 #. module: fetchmail
 #: field:email.server,port:0
@@ -264,11 +269,18 @@ msgid ""
 "    * Email based Records (Add, Update)\n"
 "    "
 msgstr ""
+"Fetchmail: \n"
+"    * Получение почты с серверов POP/IMAP\n"
+"    * Поддержка SSL\n"
+"    * Интеграция со всеми модулями\n"
+"    * Автоматическое получение почты\n"
+"    * Записи на основе писем (Добавление, Обновление)\n"
+"    "
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #. module: fetchmail
 #: help:email.server,action_id:0
@@ -276,53 +288,34 @@ msgid ""
 "An Email Server Action. It will be run whenever an e-mail is fetched from "
 "server."
 msgstr ""
+"Действие для почтового сервера. Будет выполняться при получении каждого "
+"письма с сервера."
 
 #. module: fetchmail
 #: help:email.server,priority:0
 msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr ""
+msgstr "Приоритет от 0 до 10, выбор определяет порядок обработки."
 
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Email Server Action"
-msgstr ""
+msgstr "Действие для почтового сервера"
 
 #. module: fetchmail
 #: field:email.server,priority:0
 msgid "Server Priority"
-msgstr ""
+msgstr "Приоритет сервера"
 
 #. module: fetchmail
 #: view:mailgate.message:0
 #: field:mailgate.message,server_id:0
 msgid "Mail Server"
-msgstr ""
+msgstr "Почтовый сервер"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "Получить эл. почту"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Недопустимые аргументы"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для структуры вида!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным!"
+#~ msgid "Email Servers"
+#~ msgstr "Сервера электронной почты"
diff --git a/addons/fetchmail/i18n/sl.po b/addons/fetchmail/i18n/sl.po
new file mode 100644
index 00000000000..2cdcd56b63d
--- /dev/null
+++ b/addons/fetchmail/i18n/sl.po
@@ -0,0 +1,308 @@
+# Slovenian 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-22 16:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-23 05:20+0000\n"
+"X-Generator: Launchpad (build 14336)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Potrjeno"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Združi po ..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Država"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Nepotrjeno"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Uporabniško Ime"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP Strežniki"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Dodaj Priloge ?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "# od emalov"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Čaka na Potrditev"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Geslo"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "E-pošte"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Poišči Email Strežnik"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Strežnik in Prijava"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Avtomatski Odzivnik?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Sporočila"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Strežnik"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Aktiven"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Parametri Procesa"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "IMAP Strežnik"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Strežnik"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "Opozorilo! Ne morete podvojiti konfiguracije strežnika!"
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Tip Strežnika"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Prijavni podatki"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Podatki o strežniku"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "POP Strežnik"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Vrata"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Poštni Strežnik"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr ""
+
+#~ msgid "Email Servers"
+#~ msgstr "Email Strežniki"
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
index 4e2f3b35c04..ab1f375703b 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Lozinka"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -309,32 +310,3 @@ msgstr "Email Server"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr "Hvata Emailove"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ 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 "IMAP Servers"
-#~ msgstr "IMAP Serveri"
-
-#~ msgid "Reply Email"
-#~ msgstr "Odgovori na Email"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Received Email History"
-#~ msgstr "Istorija Primljenih E-mailova"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index d7458a00f36..adc9f781996 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Lozinka"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -309,32 +310,3 @@ msgstr "Email Server"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr "Hvata Emailove"
-
-#~ 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 model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Serveri"
-
-#~ msgid "Reply Email"
-#~ msgstr "Odgovori na Email"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Received Email History"
-#~ msgstr "Istorija Primljenih E-mailova"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index 97109fa1f38..96388775862 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Lösenord"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -302,17 +303,3 @@ msgstr ""
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/fetchmail/i18n/tr.po b/addons/fetchmail/i18n/tr.po
index f07574487a3..affb2da303f 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
 msgstr "Şifre"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "E-postalar"
@@ -316,3 +317,6 @@ msgstr "E-Posta Sunucusu"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr "E-postaları Çeker"
+
+#~ msgid "Email Servers"
+#~ msgstr "Eposta Sunucuları"
diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 4386cf40a1f..4cba1f1d170 100644
--- a/addons/fetchmail/i18n/vi.po
+++ b/addons/fetchmail/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-20 08:02+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -303,9 +303,3 @@ msgstr ""
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Tên đối tượng phải được đặt bắt đầu với từ khóa x_ và không được bao gồm bất "
-#~ "kỳ ký tự đặc biệt nào."
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 9a2d5b5bc96..4e06e495c35 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -23,6 +23,8 @@ msgid ""
 "Warning! Record for selected Model can not be created\n"
 "Please choose valid Model"
 msgstr ""
+"警告！选择模型不能创建。\n"
+"请选择有效的模板。"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -37,7 +39,7 @@ msgstr "确认"
 #. module: fetchmail
 #: view:email.server:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: fetchmail
 #: view:email.server:0
@@ -73,7 +75,7 @@ msgstr "POP/IMAP 服务器"
 #. module: fetchmail
 #: model:ir.module.module,shortdesc:fetchmail.module_meta_information
 msgid "Fetchmail Server"
-msgstr ""
+msgstr "Fetchmail服务器"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -87,6 +89,8 @@ msgid ""
 "OpenObject Model. Generates a record of this model.\n"
 "Select Object with message_new attrbutes."
 msgstr ""
+"OpenObject模型。这模型产生一个记录。\n"
+"选择对象与新属性消息。"
 
 #. module: fetchmail
 #: field:email.server,attach:0
@@ -96,7 +100,7 @@ msgstr "添加附件？"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr "封电子邮件"
+msgstr "# 电子邮件"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -116,7 +120,7 @@ msgstr "日期"
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Waiting for Verification"
-msgstr ""
+msgstr "等待审批"
 
 #. module: fetchmail
 #: field:email.server,password:0
@@ -124,6 +128,7 @@ msgid "Password"
 msgstr "密码"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "电子邮件"
@@ -151,7 +156,7 @@ msgstr "名称"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr "邮件网关信件"
+msgstr "邮件网关消息"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -167,7 +172,7 @@ msgstr "设为草稿"
 #: field:email.server,message_ids:0
 #: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
 msgid "Messages"
-msgstr "信件"
+msgstr "消息"
 
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
@@ -182,7 +187,7 @@ msgstr "服务器"
 #. module: fetchmail
 #: field:email.server,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -219,7 +224,7 @@ msgstr "POP/IMAP 服务器"
 #. module: fetchmail
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
-msgstr "警告！不能创建重复的服务器配置！"
+msgstr "警告！不能创建设置重复的服务器！"
 
 #. module: fetchmail
 #: field:email.server,type:0
@@ -240,7 +245,7 @@ msgstr "服务器信息"
 #. module: fetchmail
 #: help:email.server,attach:0
 msgid "Fetches mail with attachments if true."
-msgstr ""
+msgstr "如果为真取电子邮件与附件"
 
 #. module: fetchmail
 #: selection:email.server,type:0
@@ -264,6 +269,13 @@ msgid ""
 "    * Email based Records (Add, Update)\n"
 "    "
 msgstr ""
+"Fetchmail（取电子邮件）：\n"
+"     从Pop/IMAP服务器取电子邮件。\n"
+"    支持SSL\n"
+"    整合所有模块\n"
+"    自动接收邮件\n"
+"    邮件根据记录（新增/更新）\n"
+"    "
 
 #. module: fetchmail
 #: view:email.server:0
@@ -275,30 +287,33 @@ msgstr "SSL"
 msgid ""
 "An Email Server Action. It will be run whenever an e-mail is fetched from "
 "server."
-msgstr ""
+msgstr "电子邮件服务动作。它运行时从服务器取出电子邮件。"
 
 #. module: fetchmail
 #: help:email.server,priority:0
 msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr ""
+msgstr "优先级从0到10，选择它的优先级"
 
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Email Server Action"
-msgstr ""
+msgstr "电子邮件服务器动作"
 
 #. module: fetchmail
 #: field:email.server,priority:0
 msgid "Server Priority"
-msgstr ""
+msgstr "服务器优先级"
 
 #. module: fetchmail
 #: view:mailgate.message:0
 #: field:mailgate.message,server_id:0
 msgid "Mail Server"
-msgstr ""
+msgstr "邮件服务器"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "取邮件"
+
+#~ msgid "Email Servers"
+#~ msgstr "电子邮件服务器"
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index 7aa6c84d22b..bc5572de82d 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_server","email.server","model_email_server",,1,1,1,1
+"access_fetchmail_server","fetchmail.server","model_fetchmail_server",,1,0,0,0
+"access_fetchmail_server","fetchmail.server","model_fetchmail_server","base.group_system",1,1,1,1
diff --git a/addons/fetchmail_crm/__init__.py b/addons/fetchmail_crm/__init__.py
new file mode 100644
index 00000000000..b5b36afb7e9
--- /dev/null
+++ b/addons/fetchmail_crm/__init__.py
@@ -0,0 +1,22 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
new file mode 100644
index 00000000000..671aad4a871
--- /dev/null
+++ b/addons/fetchmail_crm/__openerp__.py
@@ -0,0 +1,41 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+{
+    "name" : "Fetchmail for CRM",
+    "version" : "1.0",
+    "depends" : ["fetchmail", "crm"],
+    "author" : "OpenERP SA",
+    "category": 'Hidden/Link',
+    "description": """
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        "installer.xml",
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm/installer.xml b/addons/fetchmail_crm/installer.xml
new file mode 100644
index 00000000000..5223367eb29
--- /dev/null
+++ b/addons/fetchmail_crm/installer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.actions.act_window" id="action_create_crm_leads_from_email_account">
+            <field name="name">Create Leads from Email Account</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">fetchmail.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context" eval="{'default_name': 'Incoming Leads', 'default_object_id': ref('crm.model_crm_lead')}"/>
+            <field name="help">You can connect your email account with leads in OpenERP. A new email sent to this account (example: info@mycompany.com) will automatically create a lead in OpenERP. The whole communication with the salesman will be attached to the lead automatically.</field>
+        </record>
+
+        <record model="ir.actions.todo" id="config_wizard_action_create_crm_leads_from_email_account">
+            <field name="action_id" ref="action_create_crm_leads_from_email_account" />
+            <field name="category_id" ref="base.category_sales_management_config" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/fetchmail_crm_claim/__init__.py b/addons/fetchmail_crm_claim/__init__.py
new file mode 100644
index 00000000000..b5b36afb7e9
--- /dev/null
+++ b/addons/fetchmail_crm_claim/__init__.py
@@ -0,0 +1,22 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
new file mode 100644
index 00000000000..6b4a346ed51
--- /dev/null
+++ b/addons/fetchmail_crm_claim/__openerp__.py
@@ -0,0 +1,41 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+{
+    "name" : "Fetchmail for CRM Claim",
+    "version" : "1.0",
+    "depends" : ["fetchmail", "crm_claim"],
+    "author" : "OpenERP SA",
+    "category": 'Hidden/Link',
+    "description": """
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        "installer.xml",
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm_claim/installer.xml b/addons/fetchmail_crm_claim/installer.xml
new file mode 100644
index 00000000000..b3652a72938
--- /dev/null
+++ b/addons/fetchmail_crm_claim/installer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.actions.act_window" id="action_create_crm_claims_from_email_account">
+            <field name="name">Create Claims from Email Account</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">fetchmail.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context" eval="{'default_name': 'Claims', 'default_object_id' : ref('crm_claim.model_crm_claim')}"/>
+            <field name="help">You can connect your email account with claims in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create a claim for the followup in OpenERP. The whole communication by email will be attached to the claim automatically to keep track of the history.</field>
+        </record>
+
+        <record model="ir.actions.todo" id="config_wizard_action_create_crm_claims_from_email_account">
+            <field name="action_id" ref="action_create_crm_claims_from_email_account" />
+            <field name="category_id" ref="base.category_sales_management_config" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/fetchmail_hr_recruitment/__init__.py b/addons/fetchmail_hr_recruitment/__init__.py
new file mode 100644
index 00000000000..b5b36afb7e9
--- /dev/null
+++ b/addons/fetchmail_hr_recruitment/__init__.py
@@ -0,0 +1,22 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_hr_recruitment/__openerp__.py b/addons/fetchmail_hr_recruitment/__openerp__.py
new file mode 100644
index 00000000000..0925f2cbcc9
--- /dev/null
+++ b/addons/fetchmail_hr_recruitment/__openerp__.py
@@ -0,0 +1,41 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+{
+    "name" : "Fetchmail for Applicants",
+    "version" : "1.0",
+    "depends" : ["fetchmail", "hr_recruitment"],
+    "author" : "OpenERP SA",
+    "category": 'Hidden/Link',
+    "description": """
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        "installer.xml",
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_hr_recruitment/installer.xml b/addons/fetchmail_hr_recruitment/installer.xml
new file mode 100644
index 00000000000..ae2eb3de3ee
--- /dev/null
+++ b/addons/fetchmail_hr_recruitment/installer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.actions.act_window" id="action_link_applicant_to_email_account">
+            <field name="name">Create Applicants from Email Account</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">fetchmail.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context" eval="{'default_name': 'Recruitment Applicants', 'default_object_id': ref('hr_recruitment.model_hr_applicant')}"/>
+            <field name="help">You can synchronize the job email account (e.g. job@yourcompany.com) with OpenERP so that new applicants are created automatically in OpenERP for the followup of the recruitment process. Attachments are automatically stored in the DMS of OpenERP so that you get an indexation of all the CVs received.</field>
+        </record>
+
+        <record model="ir.actions.todo" id="config_wizard_action_link_applicant_to_email_account">
+            <field name="action_id" ref="action_link_applicant_to_email_account" />
+            <field name="category_id" ref="hr.category_hr_management_config" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/fetchmail_project_issue/__init__.py b/addons/fetchmail_project_issue/__init__.py
new file mode 100644
index 00000000000..b5b36afb7e9
--- /dev/null
+++ b/addons/fetchmail_project_issue/__init__.py
@@ -0,0 +1,22 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
new file mode 100644
index 00000000000..ca42ed6faaf
--- /dev/null
+++ b/addons/fetchmail_project_issue/__openerp__.py
@@ -0,0 +1,41 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP S.A. (<http://www.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/>.
+#
+##############################################################################
+
+{
+    "name" : "Fetchmail for Project Issue",
+    "version" : "1.0",
+    "depends" : ["fetchmail", "project_issue"],
+    "author" : "OpenERP SA",
+    "category": 'Hidden/Link',
+    "description": """
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        "installer.xml",
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_project_issue/installer.xml b/addons/fetchmail_project_issue/installer.xml
new file mode 100644
index 00000000000..75554b2de29
--- /dev/null
+++ b/addons/fetchmail_project_issue/installer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.actions.act_window" id="action_link_issue_to_email_account">
+            <field name="name">Create Issues from Email Account</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">fetchmail.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context" eval="{'default_name': 'Issues', 'default_object_id': ref('project_issue.model_project_issue')}"/>
+            <field name="help">You can connect your email account with issues in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create an issue. The whole communication will be attached to the issue automatically.</field>
+        </record>
+
+        <record model="ir.actions.todo" id="config_wizard_action_link_issue_to_email_account">
+            <field name="action_id" ref="action_link_issue_to_email_account" />
+            <field name="category_id" ref="project.category_project_config" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 409ca205c74..19afc18bf09 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -23,8 +23,8 @@
 {
     'name': 'Google user',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
-    'description': """The module adds google user  in res user""",
+    'category': 'Hidden',
+    'description': """The module adds google user in res user""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
diff --git a/addons/google_map/__init__.py b/addons/google_map/__init__.py
index aa250662a11..d276c1debeb 100644
--- a/addons/google_map/__init__.py
+++ b/addons/google_map/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import google_map
-import wizard
+import google_map_launch
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 5c48a9370d7..48c393409e4 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,9 +23,7 @@
 {
     'name': 'Google Map',
     'version': '1.0',
-    'category': 'Tools',
-    'complexity': "easy",
-    'category': 'Generic Modules/Others',
+    'category': 'Hidden',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================
@@ -36,7 +34,9 @@ Using this you can directly open Google Map from the URL widget.""",
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['google_map_wizard.xml', 'google_map_view.xml'],
+    'update_xml': [
+                   'google_map_view.xml',
+                  ],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/google_map/google_map_launch.py
similarity index 57%
rename from addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
rename to addons/google_map/google_map_launch.py
index 330668548e4..a60679e3b69 100644
--- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
+++ b/addons/google_map/google_map_launch.py
@@ -18,31 +18,33 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from osv import osv
 
-class all_closed_cashbox_of_the_day(osv.osv_memory):
-    _name = 'all.closed.cashbox.of.the.day'
-    _description = 'All closed cashbox of the day'
+class launch_map(osv.osv):
 
-    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 : retrun report
-        """
-        if context is None:
-            context = {}
-        datas = {'ids': context.get('active_ids', [])}
+    _inherit = "res.partner.address"
+
+    def open_map(self, cr, uid, ids, context=None):
+        address_obj= self.pool.get('res.partner.address')
+        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.report.xml',
-            'report_name': 'all.closed.cashbox.of.the.day',
-            'datas': datas,
+        'type': 'ir.actions.act_url',
+        'url':url,
+        'target': 'new'
         }
 
-all_closed_cashbox_of_the_day()
+launch_map()
+
+# 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/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 7909b271cd4..3911d879427 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -12,8 +12,8 @@
                     <label string="Street2 : " align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="%(wizard_google_map)d"
-                           string="Map" type="action" icon="gtk-zoom-in"/>
+                        <button name="open_map"
+                           string="Map" type="object" icon="gtk-zoom-in"/>
                     </group>
                 </field>
             </field>
@@ -29,7 +29,8 @@
                     <label string="Street2 : " align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="%(wizard_google_map)d" string="Map" type="action" icon="gtk-zoom-in"/>
+                        <button name="open_map"
+                           string="Map" type="object" icon="gtk-zoom-in"/>
                     </group>
                 </field>
             </field>
@@ -46,8 +47,8 @@
                         <label string="Street2 : " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="%(wizard_google_map)d"
-                            string="Map" type="action" icon="gtk-zoom-in"/>
+                        <button name="open_map"
+                           string="Map" type="object" icon="gtk-zoom-in"/>
                         </group>
                     </field>
                 </field>
diff --git a/addons/google_map/google_map_wizard.xml b/addons/google_map/google_map_wizard.xml
deleted file mode 100644
index 2f3b3b2a178..00000000000
--- a/addons/google_map/google_map_wizard.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-		<wizard
-			string="Launch Google Map"
-			model="res.partner.address"
-			name="google_map_launch"
-			id="wizard_google_map"
-			keyword="client_action_multi"/>
-	</data>
-</openerp>
diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po
index a9962ed7e5a..601e468da75 100644
--- a/addons/google_map/i18n/ar.po
+++ b/addons/google_map/i18n/ar.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: 2011-06-18 11:13+0000\n"
-"Last-Translator: kifcaliph <kifcaliph@hotmail.com>\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: 2011-06-19 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -44,9 +44,9 @@ msgstr ""
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
 msgid "Google Map"
-msgstr ""
+msgstr "خرائط جوجل"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "عناوين الشريك"
diff --git a/addons/google_map/i18n/bg.po b/addons/google_map/i18n/bg.po
index 62bdf2f217e..97831a2ce84 100644
--- a/addons/google_map/i18n/bg.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/br.po b/addons/google_map/i18n/br.po
index 8c597606c38..9c43c1e2385 100644
--- a/addons/google_map/i18n/br.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/bs.po b/addons/google_map/i18n/bs.po
index ffebf346a4d..41b04964cf5 100644
--- a/addons/google_map/i18n/bs.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/ca.po b/addons/google_map/i18n/ca.po
index 530d6239c99..94385c6ea60 100644
--- a/addons/google_map/i18n/ca.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/cs.po b/addons/google_map/i18n/cs.po
index 6d50f6769cb..39aaf92b1c2 100644
--- a/addons/google_map/i18n/cs.po
+++ b/addons/google_map/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: 2011-05-10 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po
index 40979557a6b..391cd357fa5 100644
--- a/addons/google_map/i18n/da.po
+++ b/addons/google_map/i18n/da.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: 2010-11-20 07:53+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
 msgid "Google Map"
-msgstr ""
+msgstr "Google kort"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
@@ -57,14 +57,3 @@ msgstr "Partneradresser"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for View Architecture!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnavnet skal starte med x_ og må ikke indeholde specialkarakterer!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Modulets navn skal være unikt"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Modulets certifikat-ID skal være unikt"
diff --git a/addons/google_map/i18n/de.po b/addons/google_map/i18n/de.po
index 1c5d0ff8e98..fe39e9ded8c 100644
--- a/addons/google_map/i18n/de.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po
index 8f18505cee9..6001f039c9f 100644
--- a/addons/google_map/i18n/el.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -57,9 +57,3 @@ 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/google_map/i18n/en_GB.po b/addons/google_map/i18n/en_GB.po
new file mode 100644
index 00000000000..e2180dfe15b
--- /dev/null
+++ b/addons/google_map/i18n/en_GB.po
@@ -0,0 +1,59 @@
+# 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: 2011-01-11 11:15+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: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Map"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr "Street2 : "
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Launch 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 ""
+"The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+
+#. 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 "Partner Addresses"
+
+#~ 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
index 9a2055ac732..d22a64673b9 100644
--- a/addons/google_map/i18n/es.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -57,15 +57,3 @@ msgstr "Direcciones de empresa"
 
 #~ 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 "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/google_map/i18n/es_AR.po b/addons/google_map/i18n/es_AR.po
index fd7f9559da8..604e656f792 100644
--- a/addons/google_map/i18n/es_AR.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/es_EC.po b/addons/google_map/i18n/es_EC.po
index 93eb349fe91..d23f0a4ce38 100644
--- a/addons/google_map/i18n/es_EC.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/es_MX.po b/addons/google_map/i18n/es_MX.po
new file mode 100644
index 00000000000..708590f596b
--- /dev/null
+++ b/addons/google_map/i18n/es_MX.po
@@ -0,0 +1,59 @@
+# 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
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Mapa"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address: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
index 76e2f402daa..31c594e1827 100644
--- a/addons/google_map/i18n/es_PY.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/es_VE.po b/addons/google_map/i18n/es_VE.po
new file mode 100644
index 00000000000..708590f596b
--- /dev/null
+++ b/addons/google_map/i18n/es_VE.po
@@ -0,0 +1,59 @@
+# 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
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Mapa"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address: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
index ee6dc0d8d9d..e5cd92ed54a 100644
--- a/addons/google_map/i18n/et.po
+++ b/addons/google_map/i18n/et.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-08-03 06:15+0000\n"
-"Last-Translator: lyyser <Unknown>\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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -47,12 +47,12 @@ msgstr ""
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
 msgid "Google Map"
-msgstr ""
+msgstr "Google Map"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Partneri aadressid"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Vigane XML vaate arhitektuurile!"
diff --git a/addons/google_map/i18n/eu.po b/addons/google_map/i18n/eu.po
index 627fed59156..5aad0600705 100644
--- a/addons/google_map/i18n/eu.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/fi.po b/addons/google_map/i18n/fi.po
index 63bcf0afcb8..bed6c1b034a 100644
--- a/addons/google_map/i18n/fi.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/fr.po b/addons/google_map/i18n/fr.po
index 13005c669c6..9d50fc45399 100644
--- a/addons/google_map/i18n/fr.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/gl.po b/addons/google_map/i18n/gl.po
index 63310d18b21..86e03306b7e 100644
--- a/addons/google_map/i18n/gl.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po
index 91f9faf3410..50621934e13 100644
--- a/addons/google_map/i18n/hi.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -41,16 +41,19 @@ msgid ""
 "so that we can directly open google map from the\n"
 "url widget."
 msgstr ""
+"यह भाग गूगल मानचित्र पृष्ठभूमि को सहयोगी के पते पर डालता है\n"
+"ताकि हम सीधे\n"
+"यू.आर.एल. विज़ेट से गूगल मानचित्र खोल सकें।"
 
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
 msgid "Google Map"
-msgstr ""
+msgstr "गूगल मानचित्र"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "सहयोगियों के पते"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "संरचना देखने के लिए अमान्य XML!"
diff --git a/addons/google_map/i18n/hr.po b/addons/google_map/i18n/hr.po
index 804079204ab..76e8eeccdb0 100644
--- a/addons/google_map/i18n/hr.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po
index 902df45d803..4be2b0d74b9 100644
--- a/addons/google_map/i18n/hu.po
+++ b/addons/google_map/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 23:48+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -55,14 +56,3 @@ msgstr "Partnerek címei"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nem valós XML"
-
-#~ msgid ""
-#~ "The module adds google map field in partner address\n"
-#~ "\"\n"
-#~ "\"so that we can directly open google map from the\n"
-#~ "\"\n"
-#~ "\"url widget."
-#~ msgstr ""
-#~ "Ez a modul egy Google Maps mezőt ad hozzá a partner címéhez.\n"
-#~ "\"\n"
-#~ "\"Így közvetlenül megnyitja a Google Maps -et a böngészőben."
diff --git a/addons/google_map/i18n/id.po b/addons/google_map/i18n/id.po
index e6b389e8c7e..059472998b0 100644
--- a/addons/google_map/i18n/id.po
+++ b/addons/google_map/i18n/id.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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Map"
-msgstr ""
+msgstr "Peta"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
-msgstr ""
+msgstr "Jalan "
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "Jalankan Google Map"
 
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
@@ -40,13 +40,16 @@ msgid ""
 "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."
 
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
 msgid "Google Map"
-msgstr ""
+msgstr "Google Map"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Alamat partner"
diff --git a/addons/google_map/i18n/it.po b/addons/google_map/i18n/it.po
index 0cb411fbdce..8229ee705cc 100644
--- a/addons/google_map/i18n/it.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -56,15 +56,3 @@ msgstr "Indirizzi dei Partner"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per la struttura della vista"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'Oggetto deve iniziare con x_ e non deve contenere alcun tipo di "
-#~ "carattere speciale !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
diff --git a/addons/google_map/i18n/ko.po b/addons/google_map/i18n/ko.po
index 1716b007786..8116142277f 100644
--- a/addons/google_map/i18n/ko.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/lo.po b/addons/google_map/i18n/lo.po
index 256676950e0..3f16c7ddaa3 100644
--- a/addons/google_map/i18n/lo.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po
index 24d5ba636f9..85bb6db60be 100644
--- a/addons/google_map/i18n/lt.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/lv.po b/addons/google_map/i18n/lv.po
index 90cb9df3146..998a8d9a5af 100644
--- a/addons/google_map/i18n/lv.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/mk.po b/addons/google_map/i18n/mk.po
new file mode 100644
index 00000000000..2c74f432f07
--- /dev/null
+++ b/addons/google_map/i18n/mk.po
@@ -0,0 +1,53 @@
+# 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: 2011-01-11 11:15+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: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Мапа"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr ""
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Стартувај 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 ""
+
+#. module: google_map
+#: model:ir.module.module,shortdesc:google_map.module_meta_information
+msgid "Google Map"
+msgstr ""
+
+#. module: google_map
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Адреса на партнерот"
diff --git a/addons/google_map/i18n/mn.po b/addons/google_map/i18n/mn.po
index 3b9cdf49bad..6b738d69bf4 100644
--- a/addons/google_map/i18n/mn.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -57,9 +57,3 @@ 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/google_map/i18n/nb.po b/addons/google_map/i18n/nb.po
index 6f3f05b4e8e..b10f249056e 100644
--- a/addons/google_map/i18n/nb.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po
index cf7d3e8ab34..0e1efea7533 100644
--- a/addons/google_map/i18n/nl.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -56,14 +56,3 @@ msgstr "Relatieadressen"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor weergave!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/google_map/i18n/nl_BE.po b/addons/google_map/i18n/nl_BE.po
index 7d118cf2e3c..c0409530c07 100644
--- a/addons/google_map/i18n/nl_BE.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/oc.po b/addons/google_map/i18n/oc.po
index 371b4d6a3d0..164f4ffed26 100644
--- a/addons/google_map/i18n/oc.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/pl.po b/addons/google_map/i18n/pl.po
index 140f3215c49..0f5e6e994e1 100644
--- a/addons/google_map/i18n/pl.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -40,6 +40,9 @@ msgid ""
 "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."
 
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
diff --git a/addons/google_map/i18n/pt.po b/addons/google_map/i18n/pt.po
index e2fd574cf58..394fb8e95ac 100644
--- a/addons/google_map/i18n/pt.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -53,17 +53,5 @@ msgstr ""
 msgid "Partner Addresses"
 msgstr "Endereços do Terceiro"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura da vista!"
diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po
index 81458dc201b..e681cf9cdd7 100644
--- a/addons/google_map/i18n/pt_BR.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -56,15 +56,3 @@ msgstr "Endereços do parceiro"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitetura de exibição"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/google_map/i18n/ro.po b/addons/google_map/i18n/ro.po
index 2b1c5b2cb47..c9ac6fa2929 100644
--- a/addons/google_map/i18n/ro.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -56,15 +56,3 @@ msgstr "Adresele partenerului"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index f2949e64069..47212f236c3 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -56,14 +56,3 @@ 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 "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
index d8b3937b3d6..c1069bcde63 100644
--- a/addons/google_map/i18n/sk.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -56,8 +56,3 @@ msgstr "Adresy partnera"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatná XML pre zobrazenie architektúry!"
-
-#~ 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!"
diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po
index 62aac82cdfc..5da5e20cbdb 100644
--- a/addons/google_map/i18n/sl.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -56,14 +56,3 @@ msgstr "Naslovi stranke"
 
 #~ 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 "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
diff --git a/addons/google_map/i18n/sq.po b/addons/google_map/i18n/sq.po
index 6909a9604f9..ca26c6d7ec0 100644
--- a/addons/google_map/i18n/sq.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/sr.po b/addons/google_map/i18n/sr.po
index 5702d6e96a1..c5e66adb4e5 100644
--- a/addons/google_map/i18n/sr.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -57,8 +57,3 @@ msgstr "Adresa Partnera"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "IMe objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/google_map/i18n/sr@latin.po b/addons/google_map/i18n/sr@latin.po
index d6ce95a88f2..aa83efd7980 100644
--- a/addons/google_map/i18n/sr@latin.po
+++ b/addons/google_map/i18n/sr@latin.po
@@ -8,26 +8,26 @@ 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-23 16:09+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Map"
-msgstr "mapa"
+msgstr "Karta"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
-msgstr "Ulica2 "
+msgstr "Ulica2 : "
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
@@ -41,24 +41,19 @@ msgid ""
 "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."
+"Ovaj Modul dodaje google map polje u partnerovoj adresi\n"
+"tako da možemo direktno otvoriti google map iz\n"
+"url vidžeta."
 
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
 msgid "Google Map"
-msgstr ""
+msgstr "Google Map"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr "Adresa Partnera"
+msgstr "Partnerove adrese"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "IMe objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
diff --git a/addons/google_map/i18n/sv.po b/addons/google_map/i18n/sv.po
index 7062850079f..2fe438761b7 100644
--- a/addons/google_map/i18n/sv.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -54,14 +54,3 @@ msgstr "Partner Adress"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/google_map/i18n/tlh.po b/addons/google_map/i18n/tlh.po
index 12ce7472c1d..79174a64d4d 100644
--- a/addons/google_map/i18n/tlh.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/tr.po b/addons/google_map/i18n/tr.po
index 64ed2cb2261..f546371c2fc 100644
--- a/addons/google_map/i18n/tr.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/uk.po b/addons/google_map/i18n/uk.po
index d0a7cf7860e..c9a518b2407 100644
--- a/addons/google_map/i18n/uk.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po
index c7de52fc207..6e8798240a9 100644
--- a/addons/google_map/i18n/vi.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -27,7 +27,7 @@ msgstr "Bản đồ"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
-msgstr ""
+msgstr "đường 2 : "
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
@@ -41,11 +41,14 @@ msgid ""
 "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."
 
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
 msgid "Google Map"
-msgstr ""
+msgstr "Google Map"
 
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
index 407bb32501f..ac9cea980a3 100644
--- a/addons/google_map/i18n/zh_CN.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
@@ -40,8 +40,8 @@ msgid ""
 "so that we can directly open google map from the\n"
 "url widget."
 msgstr ""
-"该模块在业务伙伴字段新增谷歌地图\n"
-"使我们可以从这URL直接打开谷歌地图"
+"该模块在业务伙伴加入谷歌地图字段\n"
+"使我们可以从URL直接打开谷歌地图"
 
 #. module: google_map
 #: model:ir.module.module,shortdesc:google_map.module_meta_information
@@ -55,10 +55,3 @@ 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 "The name of the module must be unique !"
-#~ msgstr "模块名重复!"
diff --git a/addons/google_map/i18n/zh_TW.po b/addons/google_map/i18n/zh_TW.po
index 5e5446dbab7..0dfb82d0fb0 100644
--- a/addons/google_map/i18n/zh_TW.po
+++ b/addons/google_map/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
deleted file mode 100644
index a2b3003da7c..00000000000
--- a/addons/google_map/wizard/google_map_launch.py
+++ /dev/null
@@ -1,61 +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 wizard
-from osv import osv
-import pooler
-from osv import fields
-import time
-
-def _launch_wizard(self, cr, uid, data, context=None):
-    address_obj= pooler.get_pool(cr.dbname).get('res.partner.address')
-    m= address_obj.browse(cr, uid, data['id'], context=context)
-    url=''
-    url="http://maps.google.com/maps?oi=map&q="
-    if m.street:
-        url+=m.street.replace(' ','+')
-    if m.street2:
-        url+='+'+m.street2.replace(' ','+')
-    if m.city:
-        url+='+'+m.city.replace(' ','+')
-    if m.state_id:
-        url+='+'+m.state_id.name.replace(' ','+')
-    if m.country_id:
-        url+='+'+m.country_id.name.replace(' ','+')
-    if m.zip:
-        url+='+'+m.zip.replace(' ','+')
-    return {
-    'type': 'ir.actions.act_url',
-    'url':url,
-    'target': 'new'
-    }
-
-class launch_map(wizard.interface):
-
-    states= {'init' : {'actions': [],
-                       'result':{'type':'action',
-                                 'action': _launch_wizard,
-                                 'state':'end'}
-                       }
-             }
-launch_map('google_map_launch')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 769e894f1bb..e2ff754ad35 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -21,9 +21,8 @@
 
 import hr_department
 import hr
-import installer
 
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 598b49a725e..900c689dfbf 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -38,7 +38,7 @@ You can manage:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_department.jpeg', 'images/hr_employee.jpeg','images/hr_job_position.jpeg'],
-    'depends': ['base_setup', 'resource', 'board'],
+    'depends': ['base_setup','mail', 'resource', 'board'],
     'init_xml': [],
     'update_xml': [
         'security/hr_security.xml',
@@ -48,13 +48,12 @@ You can manage:
         'process/hr_process.xml',
         'hr_installer.xml',
         'hr_data.xml',
-        'board_hr_view.xml',
-        'board_hr_manager_view.xml',
-        ],
+        'hr_board.xml',
+    ],
     'demo_xml': [
         'hr_demo.xml',
         'hr_department_demo.xml',
-        ],
+    ],
     'test': ['test/test_hr.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/hr/board_hr_manager_view.xml b/addons/hr/board_hr_manager_view.xml
deleted file mode 100644
index 3cfaf165840..00000000000
--- a/addons/hr/board_hr_manager_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-	<!-- This board view will be complete by other hr_* modules-->
-        <record id="board_hr_manager_form" model="ir.ui.view">
-            <field name="name">board.hr.manager.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="HR Manager Board">
-                    <hpaned>
-                        <child1>
-                        </child1>
-                        <child2>
-                        </child2>
-                    </hpaned>
-                </form>
-            </field>
-        </record>
-
-       <record id="open_board_hr_manager" model="ir.actions.act_window">
-            <field name="name">HR Manager Dashboard</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_hr_manager_form"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
deleted file mode 100644
index 4124328c801..00000000000
--- a/addons/hr/board_hr_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <menuitem id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-
-    <!-- This board view will be complete by other hr_* modules-->
-        <record id="board_hr_form" model="ir.ui.view">
-            <field name="name">board.hr.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="My Board">
-                    <hpaned>
-                        <child1>
-                        </child1>
-                        <child2>
-                        </child2>
-                    </hpaned>
-                </form>
-            </field>
-        </record>
-
-       <record id="open_board_hr" model="ir.actions.act_window">
-            <field name="name">Human Resources Dashboard</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_hr_form"/>
-        </record>
-        <menuitem
-            id="menu_hr_deshboard"
-            name="Human Resources"
-            parent="base.dashboard"
-            action="open_board_hr"/>
-
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
-
-    </data>
-</openerp>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 43b66ac18d6..f641a425e18 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -47,7 +47,8 @@ class hr_employee_category(osv.osv):
         'name': fields.char("Category", size=64, required=True),
         'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
-        'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
+        'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories'),
+        'employee_ids': fields.many2many('hr.employee', 'employee_category_rel', 'category_id', 'emp_id', 'Employees'),
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
@@ -97,6 +98,11 @@ class hr_job(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
         'state': 'open',
     }
+    
+    _sql_constraints = [
+        ('name_company_uniq', 'unique(name, company_id)', 'The name of the job position must be unique per company!'),
+    ]
+
 
     def on_change_expected_employee(self, cr, uid, ids, no_of_recruitment, no_of_employee, context=None):
         if context is None:
@@ -149,7 +155,9 @@ class hr_employee(osv.osv):
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
         'photo': fields.binary('Photo'),
-        'passport_id':fields.char('Passport No', size=64)
+        'passport_id':fields.char('Passport No', size=64),
+        'color': fields.integer('Color Index'),
+        'city': fields.related('address_id', 'city', type='char', string='City'),
     }
 
     def unlink(self, cr, uid, ids, context=None):
@@ -197,6 +205,8 @@ class hr_employee(osv.osv):
     _defaults = {
         'active': 1,
         'photo': _get_photo,
+        'marital': 'single',
+        'color': 0,
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
new file mode 100644
index 00000000000..620f1f51c88
--- /dev/null
+++ b/addons/hr/hr_board.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <!-- This board view will be complete by other hr_* modules-->
+    <record id="board_hr_form" model="ir.ui.view">
+        <field name="name">board.hr.form</field>
+        <field name="model">board.board</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="My Board">
+                <board style="2-1">
+                    <column>
+                    </column>
+                    <column>
+                    </column>
+                </board>
+            </form>
+        </field>
+    </record>
+    <record id="open_board_hr" model="ir.actions.act_window">
+        <field name="name">Human Resources Dashboard</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_hr_form"/>
+    </record>
+
+    <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
+    <menuitem id="menu_hr_reporting" parent="menu_hr_root" name="Reporting" sequence="10" />
+    <menuitem id="menu_hr_dashboard" parent="menu_hr_reporting"  name="Dashboard" sequence="0"/>
+    <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
+
+    <!-- This board view will be complete by other hr_* modules-->
+    <record id="board_hr_manager_form" model="ir.ui.view">
+        <field name="name">board.hr.manager.form</field>
+        <field name="model">board.board</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="HR Manager Board">
+                <board style="2-1">
+                    <column>
+                    </column>
+                    <column>
+                    </column>
+                </board>
+            </form>
+        </field>
+    </record>
+    <record id="open_board_hr_manager" model="ir.actions.act_window">
+        <field name="name">HR Manager Dashboard</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_hr_manager_form"/>
+    </record>
+
+    <menuitem id="menu_hr_dashboard_manager" parent="menu_hr_dashboard" icon="terp-graph" action="open_board_hr_manager" groups="base.group_hr_manager" sequence="5"/>
+
+</data>
+</openerp>
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index dbfead793e5..15269a88375 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -54,17 +54,40 @@
             <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
         </record>
 
-        <record id="employee2" model="hr.employee">
-            <field name="name">Quentin Paolino</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
-        </record>
-
         <record id="employee3" model="hr.employee">
             <field name="name">Antoine Philippe</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="base.user_root"/>
+            <field name="parent_id" ref="employee1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_trainee'),ref('category_employee')])]"/>
+        </record>
+
+        <record id="employee2" model="hr.employee">
+            <field name="name">Quentin Paolino</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="parent_id" ref="employee3"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
+        </record>
+
+        <record id="employee4" model="hr.employee">
+            <field name="name">John Smith</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="parent_id" ref="employee1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
+        </record>
+
+        <record id="employee5" model="hr.employee">
+            <field name="name"> Thomas McQueen</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="parent_id" ref="employee4"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
+        </record>
+
+        <record id="employee6" model="hr.employee">
+            <field name="name">Vanessa Dupont</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="parent_id" ref="employee4"/>
             <field name="category_ids" eval="[(6, 0, [ref('category_trainee'),ref('category_employee')])]"/>
         </record>
 
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index 433e77a6dd4..5ac57db52a3 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -26,31 +26,34 @@
             <field name="name">IT</field>
             <field name="parent_id" ref="dep_technical"/>
             <field name="company_id" ref="base.main_company"/>
+            <field name="manager_id" ref="employee2"/>
         </record>
 
         <record id="dep_marketing" model="hr.department">
             <field name="name">Marketing</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="employee2"/>
         </record>
 
         <record id="dep_sales" model="hr.department">
             <field name="name">Sales</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="dep_management"/>
+            <field name="manager_id" ref="employee4"/>
         </record>
 
         <record id="dep_sales_europe" model="hr.department">
             <field name="name">Sales Europe</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="dep_sales"/>
+            <field name="manager_id" ref="employee5"/>
         </record>
 
         <record id="dep_sales_america" model="hr.department">
             <field name="name">Sales America</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="dep_sales"/>
+            <field name="manager_id" ref="employee6"/>
         </record>
 
         <!-- HR Jobs -->
@@ -106,7 +109,19 @@
         </record>
 
         <record id="employee3" model="hr.employee">
-            <field name="department_id" ref="dep_sales"/>
+            <field name="department_id" ref="hr.dep_management"/>
+        </record>
+
+        <record id="employee4" model="hr.employee">
+            <field name="department_id" ref="hr.dep_management"/>
+        </record>
+
+        <record id="employee5" model="hr.employee">
+            <field name="department_id" ref="hr.dep_sales"/>
+        </record>
+
+        <record id="employee6" model="hr.employee">
+            <field name="department_id" ref="hr.dep_sales"/>
         </record>
 
     </data>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 6aae7a3ac85..7ba3b193cf1 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -1,49 +1,43 @@
 <openerp>
-  <data>
+    <data>
 
-    <record id="view_hr_installer" model="ir.ui.view">
-      <field name="name">hr.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-           <xpath expr="//group[@name='hr']" position="replace">
-            <newline/>
-            <separator string="Human Resources Features" colspan="4"/>
-            <field name="hr_holidays"/>
-            <field name="hr_expense"/>
-            <field name="hr_recruitment"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="hr_contract"/>
-            <field name="hr_attendance"/>
-            <field name="hr_evaluation"/>
-            <field name="hr_payroll"/>
-            <field name="hr_payroll_account" groups="base.group_extended"/>
-           </xpath>
-        </data>
-      </field>
-    </record>
-    
-    <record id="category_hr_management_config" model="ir.actions.todo.category">
-        <field name="name">HR Management</field>
-        <field name="sequence">5</field>
-    </record>
 
-    <!-- employee configure  action -->
-    <record id="action_create_hr_employee_installer" model="ir.actions.act_window">
-        <field name="name">Create your employees</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">hr.employee</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="view_employee_form"/>
-    </record>
+        <record id="category_hr_management_config" model="ir.actions.todo.category">
+            <field name="name">HR Management</field>
+            <field name="sequence">5</field>
+        </record>
 
-    <record id="config_wizard_action_create_hr_employee_installer" model="ir.actions.todo">
-        <field name="action_id" ref="action_create_hr_employee_installer"/>
-        <field name="category_id" ref="category_hr_management_config"/>
-    </record>            
+        <!-- employee configure  action -->
+        <record id="action_create_hr_employee_installer" model="ir.actions.act_window">
+            <field name="name">Create your Employees</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="False"/>
+            <field name="help">Create employees form and link them to an OpenERP user if you want them to access this instance. Categories can be set on employees to perform massive operations on all the employees of the same category, i.e. allocating holidays.</field>
+        </record>
 
-  </data>
+        <record id="config_wizard_action_create_hr_employee_installer" model="ir.actions.todo">
+            <field name="action_id" ref="action_create_hr_employee_installer"/>
+            <field name="category_id" ref="category_hr_management_config"/>
+        </record>
+
+        <record model="ir.actions.act_window" id="view_department_form_installer">
+            <field name="name">Create Your Departments</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.department</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="hr.view_department_tree"/>
+            <field name="help">Your departments structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
+        </record>
+
+        <record id="view_department_form_todo" model="ir.actions.todo">
+            <field name="action_id" ref="view_department_form_installer"/>
+            <field name="category_id" ref="hr.category_hr_management_config"/>
+            <field name="sequence">3</field>
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
+        </record>
+    </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 64580a7dbe1..c2b0626fab0 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -33,7 +33,7 @@
                         <field name="parent_id" />
                         </group>
                         <group colspan="2" col="1">
-                        <field name="photo" widget='image' nolabel="1"/>
+                          <field name="photo" widget='image' nolabel="1"/>
                         </group>
                     </group>
                     <notebook colspan="6">
@@ -125,14 +125,66 @@
                 </search>
              </field>
          </record>
-
+        <!-- HR Kanban View  -->
+    <record model="ir.ui.view" id="hr_kanban_view_employees">
+        <field name="name">HR - Employess Kanban</field>
+        <field name="model">hr.employee</field>
+        <field name="type">kanban</field>
+        <field name="arch" type="xml">
+            <kanban default_group_by="department_id">
+                <field name="color"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <t t-set="color" t-value="kanban_color(record.color.raw_value || record.name.raw_value)"/>
+                        <div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                            <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">
+                                    <div class="oe_kanban_title1"><field name="name"/></div>
+                                </div>
+                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                    <table class="oe_kanban_table">
+                                        <tr>
+                                            <td valign="top" width="22">
+                                                <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" width="48"/>
+                                            </td>
+                                            <td>
+                                                <div class="oe_kanban_title2"><field name="job_id"/></div>
+                                                <div class="oe_kanban_title3">
+                                                    <field name="department_id"/>
+                                                    <t t-if="record.department_id.raw_value &amp;&amp; record.city.raw_value">,</t>
+                                                    <field name="city"/>
+                                                </div>
+                                                <div class="oe_kanban_title3">
+                                                    <i><field name="work_email"/>
+                                                    <t t-if="record.work_phone.raw_value &amp;&amp; record.work_email.raw_value">,</t>
+                                                    <field name="work_phone"/></i>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </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"/>
+                                        <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
+                                    </div>
+                                    <br class="oe_kanban_clear"/>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
         <record id="open_view_employee_tree" model="ir.actions.act_window">
             <field name="name">Employees Structure</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">tree</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_employee_tree"/>
-            <field name="domain">[('parent_id','=',False),('user_id','=',uid)]</field>
+            <field name="domain">[('parent_id','=',False)]</field>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
 
@@ -149,13 +201,27 @@
             <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">tree,form,kanban</field>
             <field name="domain">[]</field>
             <field name="context">{"search_default_department_id": department_id,"search_default_active":eval('True')}</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
             <field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>
         </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"/>
 
@@ -181,9 +247,12 @@
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
-                    <field name="ssnid"/>
-                    <field name="user_id"/>
-                    <field name="address_id"/>
+                    <field name="work_phone"/>
+                    <field name="work_email"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="department_id"/>
+                    <field name="job_id"/>
+                    <field name="coach_id" invisible="1" />
                 </tree>
             </field>
         </record>
@@ -221,6 +290,8 @@
                 <form string="Employee Category">
                     <field name="name" />
                     <field name="parent_id" />
+                    <separator string="Employees" colspan="4" />
+                    <field name="employee_ids" colspan="4" nolabel="1" />
                 </form>
             </field>
         </record>
@@ -273,6 +344,7 @@
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('category_ids','=', active_ids)]</field>
         </record>
 
         <record id="hr_employee_category_open" model="ir.values">
@@ -280,11 +352,10 @@
             <field eval="'hr.employee.category'" name="model"/>
             <field name="name">Employees by Categories</field>
             <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <menuitem action="open_view_categ_tree"
-            id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
+            id="menu_view_employee_category_tree" parent="menu_view_employee_category_configuration_form" sequence="2"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
             <field name="name">hr.job.form</field>
@@ -314,7 +385,7 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                         <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
                         <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
                         <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>
@@ -346,9 +417,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
-                    <filter icon="terp-check" domain="[('state','in',('open','recruit'))]" string="Current"
-                        name="Current" help="Open and in recruitment positions"/>
-                    <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test"  
+                            domain="[('state','=','open')]" 
+                            string="In Position"
+                            help="In Position"/>
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
                         help="In Recruitment"/>
                     <separator orientation="vertical"/>
@@ -377,7 +449,7 @@
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
-        <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
+        <menuitem parent="hr.menu_view_employee_category_configuration_form" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index e24451aaad9..9133e4611ab 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 msgid "Openerp user"
-msgstr ""
+msgstr "مستخدم OpenERP"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "المتطلبات"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -49,13 +49,13 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "الموارد البشرية"
 
 #. module: hr
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "تجميع بـ ..."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -74,7 +74,7 @@ msgstr ""
 #: field:hr.job,department_id:0
 #: view:res.users:0
 msgid "Department"
-msgstr ""
+msgstr "القسم"
 
 #. module: hr
 #: help:hr.installer,hr_attendance:0
@@ -84,12 +84,12 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "تحديد كقديم"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "الأعمال"
 
 #. module: hr
 #: view:hr.job:0
@@ -99,7 +99,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "العنوان"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -107,7 +107,7 @@ msgstr ""
 #: view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "الشركة"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
@@ -117,7 +117,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "عطل"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
@@ -159,7 +159,7 @@ msgstr ""
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "متزوّج"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -183,12 +183,12 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "منصب"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "هرمية الموظف"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -216,13 +216,14 @@ msgstr ""
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr ""
+msgstr "أنثى"
 
 #. module: hr
 #: help:hr.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"التعقب ومساعدة الموظفين للترميز والتحقق من صحة الجداول الزمنية والحضور."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
@@ -232,7 +233,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "الجداول الزمنية"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -247,29 +248,29 @@ msgstr ""
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "عدد الموظفين لذلك العمل"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr ""
+msgstr "هاتف العمل"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "تصنيفات فرعية"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "وصف العمل"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "مكان المكتب"
 
 #. module: hr
 #: view:hr.employee:0
@@ -277,33 +278,33 @@ msgstr ""
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr ""
+msgstr "الموظف"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "معلومات أخرى"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "بريد العمل الإلكتروني"
 
 #. module: hr
 #: field:hr.department,complete_name:0
 #: field:hr.employee.category,complete_name:0
 msgid "Name"
-msgstr ""
+msgstr "الاسم"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "تاريخ الميلاد"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "التقارير"
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
@@ -320,18 +321,18 @@ msgstr ""
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "العمل"
 
 #. module: hr
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr ""
+msgstr "الأعضاء"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "إعدادات"
 
 #. module: hr
 #: view:hr.installer:0
@@ -343,7 +344,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "التصنيفات"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
@@ -358,12 +359,12 @@ msgstr ""
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
 msgid "Divorced"
-msgstr ""
+msgstr "مطلّق"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "التصنيف الرئيسي"
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -377,12 +378,12 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr ""
+msgstr "الأقسام"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "جهات اتصال الموظف"
 
 #. module: hr
 #: view:board.board:0
@@ -392,34 +393,34 @@ msgstr ""
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr ""
+msgstr "ذكر"
 
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "تقدم الإعدادات"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr ""
+msgstr "تصنيفات الموظف"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "تصنيف الموظف"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "صورة"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "جهات اتصال الموظف"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -436,7 +437,7 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "مرتبطة بمدير القسم"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
@@ -447,7 +448,7 @@ msgstr ""
 #: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "التصنيف"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -472,12 +473,12 @@ msgstr ""
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "ملاحظة"
 
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "الشركة المختارة غير مدرجة ضمن قائمة شركات المستخدم"
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index 2944f288ea6..26b7bf0c16a 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..05fd169ae01
--- /dev/null
+++ b/addons/hr/i18n/bn.po
@@ -0,0 +1,829 @@
+# Bengali 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-21 12:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr "Openerp ব্যাবহারকারী"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "আবশ্যকতা"
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr "ভুল! আপনি রিকারসিভ দপ্তর তৈরি করতে পারবেন না।"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "তথ্যের সাথে কর্মচারী যুক্ত করুন"
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr "ন্যাশনাল আইডি নং"
+
+#. module: hr
+#: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr "জনসম্পদ"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "...দিয়ে গ্রুপ করুন"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"Job Positions are used to define jobs and their requirements. You can keep "
+"track of the number of employees you have per job position and how many you "
+"expect in the future. You can also attach a survey to a job position that "
+"will be used in the recruitment process to evaluate the applicants for this "
+"job position."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
+msgid "Department"
+msgstr "বিভাগ"
+
+#. module: hr
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr "কর্মচারী উপস্থিতি ম্যানেজমেন্ট সহজতর করে"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "কাজ"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "নিয়োগপ্রাপ্ত"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "শিরোনাম"
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "কোম্পানি"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "নিয়োগে কাম্য"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr "ছুটির দিন"
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr "কর্মচারীদের ছুটির হিসাব রাখে"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "কর্মচারীর বৈবাহিক অবস্থা"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
+msgid "Married"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Department Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr "পদ"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Employee Hierarchy"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "মহিলা"
+
+#. module: hr
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "কর্মস্থলের ফোন"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr "নাম"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "জন্মদিন"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid ""
+"You can enhance the base HR Application by installing few HR-related "
+"functionalities."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
+msgid "Divorced"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
+msgid "Departments"
+msgstr ""
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr ""
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid ""
+"\n"
+"    Module for human resource management. You can manage:\n"
+"    * Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"    * HR Departments\n"
+"    * HR Jobs\n"
+"    "
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr ""
+
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
+msgid "Marital Status"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Current"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
+msgid "Single"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: 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 ""
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure Your Human Resources Application"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
+msgid "Widower"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr ""
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 04b27113b3c..4da82347282 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 24bce803554..5da752dbae3 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 73a0a047370..157297de350 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.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-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-07-15 02:27+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\n"
+"PO-Revision-Date: 2011-09-16 16:27+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: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
@@ -152,7 +152,7 @@ msgstr "Spojit uživatele na zaměstnance"
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr "Kontakty zaměstnance"
+msgstr "Smlouvy zaměstnance"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
@@ -433,7 +433,7 @@ msgstr "Obrázek"
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr "Kontakt zaměstnance"
+msgstr "Smlouva zaměstnance"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -700,7 +700,7 @@ msgstr "Popis"
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
-msgstr "Rozšíří profily zaměstnance k lepší správě jeho kontaktů."
+msgstr "Rozšíří profily zaměstnance k lepší správě svých smluv"
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
@@ -850,3 +850,6 @@ msgstr "Obecný mzdový systém integorvaný s účetnictvím."
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
 msgstr "Podřízení"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 266b3a383f3..5eba48a31c0 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -1000,39 +1000,3 @@ msgstr "Unterstellte Mitarbeiter"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "Passport"
-#~ msgstr "Personalausweis"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "Die Abteilungsstruktur wird verwendet zum Management aller Belege mit Bezug "
-#~ "zu einer Abteilung, z.B. dem Beleg zur Beantragung  auf Erstattung von "
-#~ "Personalausgaben oder den Belegen der Arbeitszeiterfassung, Urlaubsanträge "
-#~ "oder auch Personaleinstellungen u.a."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "Arbeitstellen werden zur Definition von Arbeitsstellen in Ihrem Unternehmen "
-#~ "sowie zur Erfassung für den Stellenbedarf eingesetzt. Sie können ein "
-#~ "Formular zur Personalbefragung einer Arbeitsstelle hinzufügen. Diese "
-#~ "Befragung kann im Rahmen einer Einstellung dann für das  Bewerbungsgespräch "
-#~ "eingesetzt werden."
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index 237226389f9..61b48561ab0 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index 4341ece46af..b48f44050f1 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: 2011-05-22 04:47+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d2c439a5e1b..f55327ff425 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -998,40 +998,5 @@ msgstr "Subordinados"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
-#~ msgid "Passport"
-#~ msgstr "Pasaporte"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "El puesto de trabajo es utilizado para definir los trabajos y sus "
-#~ "requerimientos. Puede adjuntar una encuesta a un puesto de trabajo. Esa "
-#~ "encuesta será utilizada en el proceso de selección para evaluar los "
-#~ "candidatos para dicho puesto."
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "La estructura de departamentos de su compañía se utiliza para gestionar "
-#~ "todos los documentos relacionados con sus empleados por departamento: gastos "
-#~ "y validación de hojas de servicios, gestión de ausencias, procesos de "
-#~ "selección, etc."
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index c648691a32a..5905c3e962c 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a6a52746a87..902cb4d31b5 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -997,40 +997,5 @@ msgstr "Subordinados"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
-#~ msgid "Passport"
-#~ msgstr "Pasaporte"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "El puesto de trabajo es utilizado para definir los trabajos y sus "
-#~ "requerimientos. Puede adjuntar una encuesta a un puesto de trabajo. Esa "
-#~ "encuesta será utilizada en el proceso de selección para evaluar los "
-#~ "candidatos para dicho puesto."
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "La estructura de departamentos de su compañía se utiliza para gestionar "
-#~ "todos los documentos relacionados con sus empleados por departamento: gastos "
-#~ "y validación de hojas de servicios, gestión de ausencias, procesos de "
-#~ "selección, etc."
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 461156c0dbc..cdbf97106c5 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es_MX.po b/addons/hr/i18n/es_MX.po
new file mode 100644
index 00000000000..2295eb7da20
--- /dev/null
+++ b/addons/hr/i18n/es_MX.po
@@ -0,0 +1,1002 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr
+#
+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-13 22:59+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:34+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr "Usuario OpenERP"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "Requerimientos"
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr "¡Error! No puede crear departamentos recursivos."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "Enlaza el empleado con información"
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr "Nº Mutua"
+
+#. module: hr
+#: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr "Recursos humanos"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"Job Positions are used to define jobs and their requirements. You can keep "
+"track of the number of employees you have per job position and how many you "
+"expect in the future. You can also attach a survey to a job position that "
+"will be used in the recruitment process to evaluate the applicants for this "
+"job position."
+msgstr ""
+"Los puestos de trabajo se utilizan para definir los cargos y sus requisitos. "
+"Puede controlar el número de empleados que tiene por puesto y cuántos espera "
+"tener en un futuro. Asimismo, puede adjuntar una encuesta a una posición "
+"laboral que será utilizada en el proceso de selección para evaluar a los "
+"candidatos a este puesto."
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr "Simplifica la gestión de la asistencia de empleados."
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "Marcar como antiguo"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "Trabajos"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "En selección"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "Previsión en selección"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr "Vacaciones"
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr ""
+"Controla las ausencias de empleados, las solicitudes de asignación y "
+"planificación."
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "Estado civil"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+"Empresa que está relacionada con el empleado actual. Las transacciones "
+"contables se escribirán en esta empresa a la cual pertenece el empleado."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "Vincular un usuario a un empleado"
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr "Contratos del empleado"
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr "Proceso genérico de pago de nóminas."
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr "Mis departamentos del empleado"
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
+msgid "Married"
+msgstr "Casado (a)"
+
+#. module: hr
+#: 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
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr "Información del pasaporte del empleado."
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Department Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr ""
+"La estructura de departamentos de su compañía se utiliza para gestionar "
+"todos los documentos relativos a los empleados por departamentos: gastos y "
+"validación de tiempos, gestión de ausencias, procesos de selección, etc."
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr "Cargo"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Employee Hierarchy"
+msgstr "Jerarquía de empleados"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+"El campo usuario relacionado en el formulario del empleado permite vincular "
+"el usuario de OpenERP (y sus permisos) al empleado."
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr "En selección"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "Nº identificación"
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr "Nº de empleado"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "Mujer"
+
+#. module: hr
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+"Controla y ayuda a los empleados codificar y validar sus horarios y "
+"asistencias."
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr "Evaluaciones periódicas"
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Horarios"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr "Estructura de empleados"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr "Nº DNI"
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr "Número de empleados con ese trabajo."
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "Teléfono trabajo"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr "Dirección oficina"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "Otra información"
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "Email de trabajo"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "Fecha de nacimiento"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr "ir.acciones.acc_ventana"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr "Tablero de recursos humanos"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr "Trabajo"
+
+#. module: hr
+#: view:hr.department:0
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr "Miembros"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: hr
+#: view:hr.installer:0
+msgid ""
+"You can enhance the base HR Application by installing few HR-related "
+"functionalities."
+msgstr ""
+"Puede mejorar la aplicación de recursos humanos base mediante la instalación "
+"de algunas funcionalidades relacionadas con RRHH."
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr "Empleados previstos"
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "Número de la mutua laboral."
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
+msgid "Divorced"
+msgstr "Divorciado"
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr "Categoría padre"
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
+msgid "Departments"
+msgstr "Departamentos"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr "Contacto empleado"
+
+#. module: hr
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr "Hombre"
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Categorías de empleado"
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr "Categoría de empleado"
+
+#. module: hr
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "Contrato de empleado"
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
+"Le permite crear y gestionar la evaluación periódica y revisión de la "
+"productividad de los empleados."
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr "hr.departamento"
+
+#. module: hr
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr "Está vinculado con el director del departamento."
+
+#. module: hr
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr "Proceso de selección"
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+"Aquí puede gestionar su mano de obra creando empleados y asignándoles "
+"propiedades específicas en el sistema. Mantenga toda la información "
+"relacionada con los empleados y haga un seguimiento de cualquier hecho que "
+"necesite ser registrado. La pestaña con información personal le ayudará a "
+"mantener los datos sobre su identidad. La pestaña Categorías le permite "
+"asignarles categorías de empleados en función de su puesto y actividades "
+"dentro de la compañía. Una categoría puede ser la antigüedad dentro de la "
+"compañía o departamento. La pestaña de Hoja de servicios permite asignarles "
+"una hoja de servicios específica y un diario analítico donde podrán "
+"introducir tiempo en el sistema. En la pestaña notas puede introducir "
+"información, en formato texto libre, que debe ser guardada para un empleado "
+"en concreto."
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr "Cuenta bancaria de salario del empleado."
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr "Información de contacto"
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Dirección de trabajo"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr "Tablero director RRHH"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr "Estructura de categorías"
+
+#. module: hr
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr "Desconocido"
+
+#. module: hr
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr "Gestión de vacaciones / ausencias"
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "Nº Seguridad Social"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr
+#: 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."
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid ""
+"\n"
+"    Module for human resource management. You can manage:\n"
+"    * Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"    * HR Departments\n"
+"    * HR Jobs\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo para la gestión de recursos humanos. Puede gestionar:\n"
+"    * Empleados y jerarquías: Puede definir su empleado asociado a un "
+"usuario y mostrar jerarquías\n"
+"    * Departamentos RRHH\n"
+"    * Trabajos RRHH\n"
+"    "
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+"En el formulario del empleado, hay diferentes tipos de información como la "
+"información de contacto."
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr "Número necesario de empleados en total para ese trabajo."
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr "Antiguo"
+
+#. module: hr
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr "Descripción del estado"
+
+#. module: hr
+#: 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 de usuario!"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr
+#: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
+msgid "Marital Status"
+msgstr "Estado civil"
+
+#. module: hr
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+"Le ayuda a gestionar y optimizar su proceso de selección de personal."
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr "Formulario y estructura del empleado"
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr "Foto"
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr "Cálculo de nóminas"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr "Información personal"
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr "Nº Pasaporte"
+
+#. module: hr
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividad actual"
+
+#. module: hr
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Controla y gestiona los gastos de los empleados, y puede re-facturar a "
+"clientes de forma automática si los gastos están relacionados con un "
+"proyecto."
+
+#. module: hr
+#: view:hr.job:0
+msgid "Current"
+msgstr "Presente"
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Departamento padre"
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr "Categorías de empleados"
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr "Dirección particular"
+
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr "Asistencias"
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+"Extiende los perfiles de empleados para ayudar a gestionar sus contratos."
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr "Nómina"
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
+msgid "Single"
+msgstr "Soltero(a)"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr "Nombre del trabajo"
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr "Ocupado"
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr "departamento"
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr "Nacionalidad"
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr "hr.instalador"
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr "Tablero director RRHH"
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: hr
+#: view:hr.installer:0
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr "Configuración de aplicaciones de recursos humanos"
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr "Sexo"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: 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 "Empleados"
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr "Nombre de departamento"
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "Número de la Seguridad Social."
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr "Creación de un usuario OpenERP"
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr "Departamentos hijos"
+
+#. 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 "Puestos de trabajo"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr "Monitor"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure Your Human Resources Application"
+msgstr "Configure su aplicación de recursos humanos"
+
+#. module: hr
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr "Gastos"
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr "Director"
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
+msgid "Widower"
+msgstr "Viudo(a)"
+
+#. module: hr
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr "Sistema genérico de nóminas integrado con contabilidad."
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Subordinados"
+
+#~ msgid "Working Time Categories"
+#~ msgstr "Categorías horarios de trabajo"
+
+#~ msgid "Sunday"
+#~ msgstr "domingo"
+
+#~ msgid "Contact  of employee"
+#~ msgstr "Contacto del empleado"
+
+#~ msgid "Work Email"
+#~ msgstr "Correo-e del trabajo"
+
+#~ msgid "Group name"
+#~ msgstr "Nombre Grupo"
+
+#~ msgid "Friday"
+#~ msgstr "viernes"
+
+#~ msgid "Work from"
+#~ msgstr "Trabajo Desde"
+
+#~ msgid "Unmaried"
+#~ msgstr "Soltero"
+
+#~ msgid "Working Time Category"
+#~ msgstr "Categoría horario trabajo"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "Jefe de Proyectos"
+
+#~ msgid "Fill up contact information"
+#~ msgstr "Rellenar información de contacto"
+
+#~ msgid "Maried"
+#~ msgstr "Casado"
+
+#~ msgid "Employee's timesheet group"
+#~ msgstr "Hoja Del Grupo Empleados"
+
+#~ msgid "Create openerp user"
+#~ msgstr "Crear usuario OpenERP"
+
+#~ msgid "Tuesday"
+#~ msgstr "martes"
+
+#~ msgid "Related User"
+#~ msgstr "Usuario OpenERP"
+
+#~ msgid "Monday"
+#~ msgstr "lunes"
+
+#~ msgid "Day of week"
+#~ msgstr "Dia de la semana"
+
+#~ msgid "Birthday"
+#~ msgstr "Fecha de nacimiento"
+
+#~ msgid "Employee Contract Process"
+#~ msgstr "Proceso contrato de empleado"
+
+#~ msgid "Create OpenERP User"
+#~ msgstr "Crear usuario OpenERP"
+
+#~ msgid "Employee Complete Form"
+#~ msgstr "Formulario completo de empleado"
+
+#~ msgid "Wednesday"
+#~ msgstr "Miercoles"
+
+#~ msgid "Starting date"
+#~ msgstr "Fecha Comienzo"
+
+#~ msgid "Timesheet Line"
+#~ msgstr "Calendario Linea"
+
+#~ 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 "Working Time"
+#~ msgstr "Horario trabajo"
+
+#~ msgid "Thursday"
+#~ msgstr "jueves"
+
+#~ msgid "Work to"
+#~ msgstr "Trabajo hasta"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
+
+#~ msgid "Other ID"
+#~ msgstr "Otro ID"
+
+#~ msgid "Job Information"
+#~ msgstr "Información laboral"
+
+#~ msgid "Fill up employee's contact information"
+#~ msgstr "Rellenar información de contacto del empleado"
+
+#~ msgid "All Employees"
+#~ msgstr "Todos los empleados"
+
+#~ msgid "Saturday"
+#~ msgstr "Sabado"
+
+#~ msgid "New Employee"
+#~ msgstr "Nuevo empleado"
+
+#~ msgid "Parent Users"
+#~ msgstr "Usuarios padres"
+
+#~ msgid "Parents"
+#~ msgstr "Padres"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
diff --git a/addons/hr/i18n/es_VE.po b/addons/hr/i18n/es_VE.po
new file mode 100644
index 00000000000..2295eb7da20
--- /dev/null
+++ b/addons/hr/i18n/es_VE.po
@@ -0,0 +1,1002 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr
+#
+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-13 22:59+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:34+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr "Usuario OpenERP"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "Requerimientos"
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr "¡Error! No puede crear departamentos recursivos."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "Enlaza el empleado con información"
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr "Nº Mutua"
+
+#. module: hr
+#: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr "Recursos humanos"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"Job Positions are used to define jobs and their requirements. You can keep "
+"track of the number of employees you have per job position and how many you "
+"expect in the future. You can also attach a survey to a job position that "
+"will be used in the recruitment process to evaluate the applicants for this "
+"job position."
+msgstr ""
+"Los puestos de trabajo se utilizan para definir los cargos y sus requisitos. "
+"Puede controlar el número de empleados que tiene por puesto y cuántos espera "
+"tener en un futuro. Asimismo, puede adjuntar una encuesta a una posición "
+"laboral que será utilizada en el proceso de selección para evaluar a los "
+"candidatos a este puesto."
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr "Simplifica la gestión de la asistencia de empleados."
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "Marcar como antiguo"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "Trabajos"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "En selección"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "Previsión en selección"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr "Vacaciones"
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr ""
+"Controla las ausencias de empleados, las solicitudes de asignación y "
+"planificación."
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "Estado civil"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+"Empresa que está relacionada con el empleado actual. Las transacciones "
+"contables se escribirán en esta empresa a la cual pertenece el empleado."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "Vincular un usuario a un empleado"
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr "Contratos del empleado"
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr "Proceso genérico de pago de nóminas."
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr "Mis departamentos del empleado"
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
+msgid "Married"
+msgstr "Casado (a)"
+
+#. module: hr
+#: 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
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr "Información del pasaporte del empleado."
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Department Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr ""
+"La estructura de departamentos de su compañía se utiliza para gestionar "
+"todos los documentos relativos a los empleados por departamentos: gastos y "
+"validación de tiempos, gestión de ausencias, procesos de selección, etc."
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr "Cargo"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Employee Hierarchy"
+msgstr "Jerarquía de empleados"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+"El campo usuario relacionado en el formulario del empleado permite vincular "
+"el usuario de OpenERP (y sus permisos) al empleado."
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr "En selección"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "Nº identificación"
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr "Nº de empleado"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "Mujer"
+
+#. module: hr
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+"Controla y ayuda a los empleados codificar y validar sus horarios y "
+"asistencias."
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr "Evaluaciones periódicas"
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Horarios"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr "Estructura de empleados"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr "Nº DNI"
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr "Número de empleados con ese trabajo."
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "Teléfono trabajo"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr "Dirección oficina"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "Otra información"
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "Email de trabajo"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "Fecha de nacimiento"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr "ir.acciones.acc_ventana"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr "Tablero de recursos humanos"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr "Trabajo"
+
+#. module: hr
+#: view:hr.department:0
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr "Miembros"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: hr
+#: view:hr.installer:0
+msgid ""
+"You can enhance the base HR Application by installing few HR-related "
+"functionalities."
+msgstr ""
+"Puede mejorar la aplicación de recursos humanos base mediante la instalación "
+"de algunas funcionalidades relacionadas con RRHH."
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr "Empleados previstos"
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "Número de la mutua laboral."
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
+msgid "Divorced"
+msgstr "Divorciado"
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr "Categoría padre"
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
+msgid "Departments"
+msgstr "Departamentos"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr "Contacto empleado"
+
+#. module: hr
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr "Hombre"
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Categorías de empleado"
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr "Categoría de empleado"
+
+#. module: hr
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "Contrato de empleado"
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
+"Le permite crear y gestionar la evaluación periódica y revisión de la "
+"productividad de los empleados."
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr "hr.departamento"
+
+#. module: hr
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr "Está vinculado con el director del departamento."
+
+#. module: hr
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr "Proceso de selección"
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+"Aquí puede gestionar su mano de obra creando empleados y asignándoles "
+"propiedades específicas en el sistema. Mantenga toda la información "
+"relacionada con los empleados y haga un seguimiento de cualquier hecho que "
+"necesite ser registrado. La pestaña con información personal le ayudará a "
+"mantener los datos sobre su identidad. La pestaña Categorías le permite "
+"asignarles categorías de empleados en función de su puesto y actividades "
+"dentro de la compañía. Una categoría puede ser la antigüedad dentro de la "
+"compañía o departamento. La pestaña de Hoja de servicios permite asignarles "
+"una hoja de servicios específica y un diario analítico donde podrán "
+"introducir tiempo en el sistema. En la pestaña notas puede introducir "
+"información, en formato texto libre, que debe ser guardada para un empleado "
+"en concreto."
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr "Cuenta bancaria de salario del empleado."
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr "Información de contacto"
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Dirección de trabajo"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr "Tablero director RRHH"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr "Estructura de categorías"
+
+#. module: hr
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr "Desconocido"
+
+#. module: hr
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr "Gestión de vacaciones / ausencias"
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "Nº Seguridad Social"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr
+#: 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."
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid ""
+"\n"
+"    Module for human resource management. You can manage:\n"
+"    * Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"    * HR Departments\n"
+"    * HR Jobs\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo para la gestión de recursos humanos. Puede gestionar:\n"
+"    * Empleados y jerarquías: Puede definir su empleado asociado a un "
+"usuario y mostrar jerarquías\n"
+"    * Departamentos RRHH\n"
+"    * Trabajos RRHH\n"
+"    "
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+"En el formulario del empleado, hay diferentes tipos de información como la "
+"información de contacto."
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr "Número necesario de empleados en total para ese trabajo."
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr "Antiguo"
+
+#. module: hr
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr "Descripción del estado"
+
+#. module: hr
+#: 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 de usuario!"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr
+#: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
+msgid "Marital Status"
+msgstr "Estado civil"
+
+#. module: hr
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+"Le ayuda a gestionar y optimizar su proceso de selección de personal."
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr "Formulario y estructura del empleado"
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr "Foto"
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr "Cálculo de nóminas"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr "Información personal"
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr "Nº Pasaporte"
+
+#. module: hr
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividad actual"
+
+#. module: hr
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Controla y gestiona los gastos de los empleados, y puede re-facturar a "
+"clientes de forma automática si los gastos están relacionados con un "
+"proyecto."
+
+#. module: hr
+#: view:hr.job:0
+msgid "Current"
+msgstr "Presente"
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Departamento padre"
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr "Categorías de empleados"
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr "Dirección particular"
+
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr "Asistencias"
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+"Extiende los perfiles de empleados para ayudar a gestionar sus contratos."
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr "Nómina"
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
+msgid "Single"
+msgstr "Soltero(a)"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr "Nombre del trabajo"
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr "Ocupado"
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr "departamento"
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr "Nacionalidad"
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr "hr.instalador"
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr "Tablero director RRHH"
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: hr
+#: view:hr.installer:0
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr "Configuración de aplicaciones de recursos humanos"
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr "Sexo"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: 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 "Empleados"
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr "Nombre de departamento"
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "Número de la Seguridad Social."
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr "Creación de un usuario OpenERP"
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr "Departamentos hijos"
+
+#. 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 "Puestos de trabajo"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr "Monitor"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure Your Human Resources Application"
+msgstr "Configure su aplicación de recursos humanos"
+
+#. module: hr
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr "Gastos"
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr "Director"
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
+msgid "Widower"
+msgstr "Viudo(a)"
+
+#. module: hr
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr "Sistema genérico de nóminas integrado con contabilidad."
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Subordinados"
+
+#~ msgid "Working Time Categories"
+#~ msgstr "Categorías horarios de trabajo"
+
+#~ msgid "Sunday"
+#~ msgstr "domingo"
+
+#~ msgid "Contact  of employee"
+#~ msgstr "Contacto del empleado"
+
+#~ msgid "Work Email"
+#~ msgstr "Correo-e del trabajo"
+
+#~ msgid "Group name"
+#~ msgstr "Nombre Grupo"
+
+#~ msgid "Friday"
+#~ msgstr "viernes"
+
+#~ msgid "Work from"
+#~ msgstr "Trabajo Desde"
+
+#~ msgid "Unmaried"
+#~ msgstr "Soltero"
+
+#~ msgid "Working Time Category"
+#~ msgstr "Categoría horario trabajo"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "Jefe de Proyectos"
+
+#~ msgid "Fill up contact information"
+#~ msgstr "Rellenar información de contacto"
+
+#~ msgid "Maried"
+#~ msgstr "Casado"
+
+#~ msgid "Employee's timesheet group"
+#~ msgstr "Hoja Del Grupo Empleados"
+
+#~ msgid "Create openerp user"
+#~ msgstr "Crear usuario OpenERP"
+
+#~ msgid "Tuesday"
+#~ msgstr "martes"
+
+#~ msgid "Related User"
+#~ msgstr "Usuario OpenERP"
+
+#~ msgid "Monday"
+#~ msgstr "lunes"
+
+#~ msgid "Day of week"
+#~ msgstr "Dia de la semana"
+
+#~ msgid "Birthday"
+#~ msgstr "Fecha de nacimiento"
+
+#~ msgid "Employee Contract Process"
+#~ msgstr "Proceso contrato de empleado"
+
+#~ msgid "Create OpenERP User"
+#~ msgstr "Crear usuario OpenERP"
+
+#~ msgid "Employee Complete Form"
+#~ msgstr "Formulario completo de empleado"
+
+#~ msgid "Wednesday"
+#~ msgstr "Miercoles"
+
+#~ msgid "Starting date"
+#~ msgstr "Fecha Comienzo"
+
+#~ msgid "Timesheet Line"
+#~ msgstr "Calendario Linea"
+
+#~ 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 "Working Time"
+#~ msgstr "Horario trabajo"
+
+#~ msgid "Thursday"
+#~ msgstr "jueves"
+
+#~ msgid "Work to"
+#~ msgstr "Trabajo hasta"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
+
+#~ msgid "Other ID"
+#~ msgstr "Otro ID"
+
+#~ msgid "Job Information"
+#~ msgstr "Información laboral"
+
+#~ msgid "Fill up employee's contact information"
+#~ msgstr "Rellenar información de contacto del empleado"
+
+#~ msgid "All Employees"
+#~ msgstr "Todos los empleados"
+
+#~ msgid "Saturday"
+#~ msgstr "Sabado"
+
+#~ msgid "New Employee"
+#~ msgstr "Nuevo empleado"
+
+#~ msgid "Parent Users"
+#~ msgstr "Usuarios padres"
+
+#~ msgid "Parents"
+#~ msgstr "Padres"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 6a62bbf1955..0e1346a2b6e 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 080cc411888..0cdbecebbe5 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 msgid "Openerp user"
-msgstr "OpenERP käyttäjä"
+msgstr "OpenERP-käyttäjä"
 
 #. module: hr
 #: view:hr.job:0
@@ -36,7 +36,7 @@ msgstr "Virhe! Et voi luoda itseään toistavia osastoja."
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Kytke työntekijä informaatioon"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -50,13 +50,13 @@ msgstr "Vakuutustunnus"
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Henkilöstön hallinta"
+msgstr "Henkilöstöjohtaminen"
 
 #. module: hr
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -85,7 +85,7 @@ msgstr "Yksinkertaistaa työntekijän läsnäolon hallintaa"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Merkitse vanhentuneeksi"
 
 #. module: hr
 #: view:hr.job:0
@@ -95,12 +95,12 @@ msgstr "Tehtävät"
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "Palkattavana"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "titteli"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -113,7 +113,7 @@ msgstr "Yritys"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Odotettu palkaaminen"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
@@ -123,7 +123,7 @@ msgstr "Lomat"
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr ""
+msgstr "Seuraa työntekijöiden lomia, pyyntöjä ja suunnitelmia."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
@@ -145,17 +145,17 @@ msgstr "Kiinnitä käyttäjä työntekijään"
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Työntekijän sopimukset"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Yleinen palkkahallintojärjestelmä"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "Oman osaston työntekijä"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
@@ -180,11 +180,14 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Yrityksen osatorakennetta käytetään hallitsemaan dokumenttejä jotka "
+"liittyvät osastom työntekijöihin, kuluihin, tuntilistojen tarkastamiseen, "
+"lomien hallintaan, palkkaamiseen jne."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Asema"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -197,12 +200,14 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Liittyvä käyttäjätunnuskenttä työntekijälomakkeella mahdollistaan OpenERP "
+"käyttäjän (ja oikeuksien) liittämisen työntekijään."
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "Palkattavana"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -224,11 +229,13 @@ msgstr "Nainen"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Seuraa ja auttaa työntekijöitä syöttämään ja tarkistamaan tuntilistoja ja "
+"läsnäoloja."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Määräaikaiset arvioinnit"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
@@ -248,7 +255,7 @@ msgstr "Henkilötunnukset"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Samaa työtä tekevien henkilöiden määrä."
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -265,7 +272,7 @@ msgstr "Alakategoriat"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Työnkuvaus"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -283,7 +290,7 @@ msgstr "Työntekijä"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Muut tiedot"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -314,7 +321,7 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Henkilöstöhallinnon Työpöytä"
 
 #. module: hr
 #: view:hr.employee:0
@@ -340,16 +347,18 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Voit laajentaa perus HR ohjelmaa asentamalla muutamia HR:ään littyviä "
+"toimintoja."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriat"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Odotetut työntekijät"
 
 #. module: hr
 #: help:hr.employee,sinid:0
@@ -369,7 +378,7 @@ msgstr "Yläkategoria"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Virhe! Et voi luoda rekursiivisia kategorioita."
 
 #. module: hr
 #: view:hr.department:0
@@ -388,7 +397,7 @@ msgstr "Työntekijän yhteystiedot"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Oma työpöytä"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -398,7 +407,7 @@ msgstr "Mies"
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -420,7 +429,7 @@ msgstr "Kuva"
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Työtekijän sopimus"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -428,6 +437,8 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Mahdollistaan määräaikaisarviointien ja suorituskykyanalyysien tekemisen "
+"työntekijöille."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -437,12 +448,12 @@ msgstr "hr.department"
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "On linkitetty osaston johtajaan."
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Rekrytointiprosessi"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
@@ -493,7 +504,7 @@ msgstr "Työosoite"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Henkilöstöpäällikön Työpöytä"
 
 #. module: hr
 #: view:hr.employee:0
@@ -503,7 +514,7 @@ msgstr "Asema"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -519,7 +530,7 @@ msgstr "tuntematon"
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Lomien / vapaiden hallinta"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -563,7 +574,7 @@ msgstr "Työntekijänäytöllä on esimerkiksi yhteystiedot"
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Tarvittava kokonaishenkilömäärä työtä varten."
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -573,18 +584,18 @@ msgstr "Vanha"
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Statuksen kuvaus"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -603,7 +614,7 @@ msgstr "Auttaa hallitsemaan ja virtaviivaistamaan työhönottoprosessia."
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Työntekijälomake ja rakenne"
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -618,7 +629,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Palkkakirjanpito"
 
 #. module: hr
 #: view:hr.employee:0
@@ -633,7 +644,7 @@ msgstr "Passin numero"
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Nykyinen aktiviteetti"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -674,17 +685,17 @@ msgstr "Läsnäolot"
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
-msgstr ""
+msgstr "Laajentaa työntekijäprofiileja mahdolistaen sopimustenhallinnan"
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Palkanmaksu"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
@@ -732,18 +743,18 @@ msgstr ""
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "HR johtajan työpöytä"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurssi"
 
 #. module: hr
 #: view:hr.installer:0
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "HR ohjelmiston konfiguraation"
 
 #. module: hr
 #: field:hr.employee,gender:0
@@ -790,23 +801,23 @@ msgstr "Alaosastot"
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Työtehtävät"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Valmentaja"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "konfiguroi HR ohjelmistosi"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Kustannukset"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -818,12 +829,12 @@ msgstr "Esimies"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Leski (mies)"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Yleinen palkkasovellus ingegroituna kirjanpitoon."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 42e3c6d5df7..312ddd10b93 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -991,24 +991,3 @@ msgstr "Subordonnés"
 
 #~ msgid "Parent Users"
 #~ msgstr "Utilisateurs parents"
-
-#~ msgid "Passport"
-#~ msgstr "Passeport"
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "La structure de département de la société est utilisée pour gérer tous les "
-#~ "documents associés aux employés par départements : validation de frais et de "
-#~ "feuille de temps, gestion des congés, recrutements, etc."
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "Postes est utilisé pour définir les postes et leurs prérequis. Vous pouvez "
-#~ "associer un sondage à un poste. Ce sondage sera utilisé dans le processus de "
-#~ "recrutement pour évaluer les candidats pour ce poste."
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index f6b91313c26..96b512f9d68 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/fr_CH.po b/addons/hr/i18n/fr_CH.po
new file mode 100644
index 00000000000..650fcdb8b92
--- /dev/null
+++ b/addons/hr/i18n/fr_CH.po
@@ -0,0 +1,29 @@
+# French (Switzerland) 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 <bogdanovidiu.stanciu@gmail.com>, 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:13+0000\n"
+"PO-Revision-Date: 2011-11-06 15:15+0000\n"
+"Last-Translator: Bogdan Stanciu (bstanciu)\n"
+"Language-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-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "No. AVS"
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "Numéro de sécurité sociale (AVS)"
+
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index 2b3ba78624c..040aa48f736 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -14,34 +14,34 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 msgid "Openerp user"
-msgstr ""
+msgstr "Usuario OpenERP"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Requirimentos"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr ""
+msgstr "Erro! Non pode crear departamentos recorrentes"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Vincula o empregado coa información"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "Nº SIN"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -50,13 +50,13 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos humanos"
 
 #. module: hr
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -67,6 +67,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Os postos de traballo utilízanse para definir os cargos e os seus "
+"requisitos. Pode controlar o número de empregados que ten por posto e cantos "
+"espera ter nun futuro. Así mesmo, pode achegar unha enquisa a un posto "
+"laboral que se utilizará no proceso de selección para avaliar ós candidatos "
+"a este posto."
 
 #. module: hr
 #: view:hr.employee:0
@@ -75,32 +80,32 @@ msgstr ""
 #: field:hr.job,department_id:0
 #: view:res.users:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr ""
+msgstr "Simplifica a xestión da asistencia de empregados."
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Marcar como antigo"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Traballos"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "En selección"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -108,27 +113,29 @@ msgstr ""
 #: view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Previsión en selección"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Vacacións"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
 msgstr ""
+"Controla as ausencias dos empregados, as solicitudes de asignación e "
+"planificación."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "Estado civil do empregado"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -136,42 +143,46 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Empresa que está relacionada co empregado actual. As transaccións contables "
+"escribiranse na empresa á que pertence o empregado."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "Vincular un usuario a un empregado"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Contratos do empregado"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Proceso xenérico de pagamento de nóminas."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "Os meus departamentos do empregado"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Casado"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erro! Non pode seleccionar un departamento para o cal o empregado sexa o "
+"director."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "Información do pasaporte do empregado."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -180,16 +191,19 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"A estrutura de departamentos da súa compañía utilízase para xestionar "
+"tódolos documentos relativos ós empregados por departamentos: gastos e "
+"validación de tempos, xestión de ausencias, procesos de selección, etc."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Posición"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "Xerarquía de empregados"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -197,80 +211,84 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"O campo usuario relacionado no formulario do empregado permite vincular o "
+"usuario de OpenERP (e os seus permisos) ó empregado."
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "En selección"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "Nº identificación"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Nº de empregado"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr ""
+msgstr "Muller"
 
 #. module: hr
 #: help:hr.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Controla e axuda ós empregados a codificar e validar os seus horarios e "
+"asistencias."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Avaliacións periódicas"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Follas de traballo"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr ""
+msgstr "Estrutura de empregados"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "Nº DNI"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Número de empregados con ese traballo."
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr ""
+msgstr "Teléfono do traballo"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Categorías fillas"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Descrición do posto de traballo"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "Enderezo oficina"
 
 #. module: hr
 #: view:hr.employee:0
@@ -278,61 +296,61 @@ msgstr ""
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr ""
+msgstr "Empregado"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Outra información"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "E-mail de traballo"
 
 #. module: hr
 #: field:hr.department,complete_name:0
 #: field:hr.employee.category,complete_name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Data de nacemento"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Informe"
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.accións.acc_ventá"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Taboleiro de recursos humanos"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Traballo"
 
 #. module: hr
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr ""
+msgstr "Membros"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #. module: hr
 #: view:hr.installer:0
@@ -340,36 +358,38 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Pode mellorar a aplicación de recursos humanos base mediante a instalación "
+"dalgunhas funcionalidades relacionadas cos RRHH."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Empregados previstos"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Número da mutua laboral."
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
 msgid "Divorced"
-msgstr ""
+msgstr "Divorciado"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Categoría Pai"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Erro! Non pode crear categorías recorrentes."
 
 #. module: hr
 #: view:hr.department:0
@@ -378,49 +398,49 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr ""
+msgstr "Departamentos"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "Contacto empregado"
 
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "O meu taboleiro"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr ""
+msgstr "Home"
 
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso da configuración"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr ""
+msgstr "Categorías de empregado"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "Categoría de empregado"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imaxe"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Contrato de empregado"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -428,27 +448,29 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Permítelle crear e xestionar a avaliación periódica e revisión da "
+"productividade dos empregados."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr ""
+msgstr "hr.departamento"
 
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Está vinculado co director do departamento."
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Proceso de selección"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -464,82 +486,94 @@ 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 ""
+"Aquí pode xestionar a súa man de obra creando empregados e asignándolles "
+"propiedades específicas no sistema. Manteña toda a información relacionada "
+"cos empregados e faga un seguimento de calquera feito que necesite ser "
+"rexistrado. A pestana coa información persoal axudaralle a manter os datos "
+"sobre a súa identidade. A pestana Categorías permite asignarlles categorías "
+"de  empregados en función do seu posto e actividades dentro da compañía. "
+"Unha categoría pode ser a antigüidade dentro da compañía ou departamento. A "
+"pestana de Folla de servizos permite asignarlles unha folla de servizos "
+"específica e un diario analítico onde poderán introducir o tempo no sistema. "
+"Na pestana notas pode introducir información, en formato texto libre, que "
+"debe gardarse para un empregado en concreto."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Conta bancaria de salario do empregado."
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"A compañía seleccionada non é unha compañía admitida para este usuario"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "Información de contacto"
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr ""
+msgstr "Enderez do traballo"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Taboleiro Director RRHH"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr ""
+msgstr "Estrutura de categorías"
 
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "descoñecido"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Xestión de vacacións / ausencias"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr ""
+msgstr "Nº Seguridade Social"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro! Non pode crear unha xerarquía recorrente de empregados."
 
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: hr
 #: model:ir.module.module,description:hr.module_meta_information
@@ -552,6 +586,11 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Módulo para a xestión de recursos humanos. Pode xestionar:* Empregados e "
+"xerarquías: Pode definir o seu empregado asociado cun usuario e amosar "
+"xerarquías* Departamentos RRHH* Traballos RRHH\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -559,32 +598,34 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"No formulario do empregado, hai diferentes tipos de información como a "
+"información de contacto."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Número necesario de empregados en total para ese traballo."
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Vello"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Descrición do estado"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Non pode ter dous usuarios co mesmo login!"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -593,47 +634,48 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr.action_hr_marital_status
 #: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
-msgstr ""
+msgstr "Estado civil"
 
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
 msgstr ""
+"Axúdalle a xestionar e optimizar o seu proceso de selección de persoal."
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Formulario e estrutura do empregado"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuarios"
 
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Cálculo de nóminas"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr ""
+msgstr "Información persoal"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Nº de pasaporte"
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Actividade actual"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -641,112 +683,115 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Controla e xestiona os gastos dos empregados, e pode volver facturar "
+"automaticamente ós clientes se os gastos están relacionados cun proxecto."
 
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "Departamento pai"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr ""
+msgstr "Categorías de empregados"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Enderezo particular"
 
 #. module: hr
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr ""
+msgstr "Asistencias"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Descrición"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
 msgstr ""
+"Extiende os perfís de empreagdos para axudar a xestionar os seus contratos."
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Nómina"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Único"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Nome do traballo"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "Ocupado"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Mobile"
-msgstr ""
+msgstr "Móbil"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr ""
+msgstr "departamento"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Nacionalidade"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr ""
+msgstr "hr.instalador"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Taboleiro Director RRHH"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurso"
 
 #. module: hr
 #: view:hr.installer:0
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "Configuración de aplicacións de recursos humanos"
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr ""
+msgstr "Sexo"
 
 #. module: hr
 #: view:hr.employee:0
@@ -757,7 +802,7 @@ msgstr ""
 #: 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 ""
+msgstr "Empregados"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -767,63 +812,63 @@ msgstr ""
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr ""
+msgstr "Nome do departamento"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Número da Seguridade Social."
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Creación dun usuario OpenERP"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "Departamentos fillos"
 
 #. 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 "Postos de traballo"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Monitor"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Configure a súa aplicación de recursos humanos"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Gastos"
 
 #. module: hr
 #: field:hr.department,manager_id:0
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Xestor"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Viúvo(a)"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Sistema xenérico de nóminas integrado coa contabilidade."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "Subordinados"
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index 68ab42e90aa..e8b66466d4a 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 265a16f08a5..8b5457fb138 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c8e50fc31f5..07b8cb7f3ef 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 16:03+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: hr
@@ -859,223 +859,17 @@ msgstr "Opći sustav obračuna plaća integriran sa knjigovodstvom"
 msgid "Subordinates"
 msgstr "Podređeni djelatnici"
 
-#~ msgid "Attendance"
-#~ msgstr "Nazočnost"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
-#~ msgid "Sign in / Sign out"
-#~ msgstr "Prijava / Odjava"
-
-#~ msgid ""
-#~ "(*) A positive delay means that the employee worked less than recorded."
-#~ msgstr ""
-#~ "(*) Pozitivno kašnjenje znači da je Djelatnik radio manje no što je "
-#~ "zabilježeno."
-
-#~ msgid "Employee attendances"
-#~ msgstr "Nazočnost Djelatnika"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
-#~ msgid "You are now ready to sign in or out of the attendance follow up"
-#~ msgstr "Sada se možete prijaviti ili odjaviti iz praćenja Nazočnosti"
-
-#~ msgid "Sign out"
-#~ msgstr "Odjava"
-
-#~ msgid "Delay"
-#~ msgstr "Kašnjenje"
-
-#~ msgid "Employee's name"
-#~ msgstr "Ime Djelatnika"
-
-#~ msgid "Print Timesheet"
-#~ msgstr "Tiskaj Kontrolnu Karticu"
-
-#~ msgid "Print Attendance Error Report"
-#~ msgstr "Tiskaj izvještaj greške Nazočnosti"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nepravilno ime modela u definiciji radnje."
 
-#~ msgid "Print Timesheet by week"
-#~ msgstr "Tiskaj Kontrolnu karticu po tjednu"
-
-#~ msgid "Select a time span"
-#~ msgstr "Odaberi razdoblje"
-
-#~ msgid "Date Recorded"
-#~ msgstr "datum bilježenja"
-
-#~ msgid "Sign In"
-#~ msgstr "Prijava"
-
-#~ msgid "Total period:"
-#~ msgstr "Ukupno vremensko trajanje:"
-
-#~ msgid "Action reason"
-#~ msgstr "Razlog radnje"
-
-#~ msgid "March"
-#~ msgstr "Ožujak"
-
-#~ msgid "August"
-#~ msgstr "Kolovoz"
-
-#~ msgid "May"
-#~ msgstr "Svibanj"
-
-#~ msgid "Your last sign in"
-#~ msgstr "Vaša zadnja prijava"
-
-#~ msgid "June"
-#~ msgstr "Lipanj"
-
-#~ msgid "Print Timesheet by month"
-#~ msgstr "Tiskaj Kontrolnu karticu po mjesecu"
-
-#~ msgid "Sign Out"
-#~ msgstr "Odjava"
-
-#~ msgid "Attendances Of Employees"
-#~ msgstr "Nazočnosti Djelatnika"
-
-#~ msgid "Reason"
-#~ msgstr "Razlog"
-
-#~ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-#~ msgstr "Greška: Prijava (Odn. Odjava) mora slijediti Odjavu (Odn. Prijavu)"
-
-#~ msgid "Date Signed"
-#~ msgstr "Datum zabilježbe"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "July"
-#~ msgstr "Srpanj"
-
-#~ msgid ""
-#~ "You did not signed out the last time. Please enter the date and time you "
-#~ "signed out."
-#~ msgstr ""
-#~ "Zadnji puta se niste odjavili. Molim Vas, unesite datum i vrijeme kad ste se "
-#~ "trebali odjaviti."
-
-#~ msgid "Attendance reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "Starting Date"
-#~ msgstr "Početni datum"
-
-#~ msgid "Present"
-#~ msgstr "Prisutan"
-
-#~ msgid "Absent"
-#~ msgstr "Odsutan"
-
-#~ msgid "February"
-#~ msgstr "Veljača"
-
-#~ msgid "October"
-#~ msgstr "Listopad"
-
-#~ msgid "Your last sign out"
-#~ msgstr "Vaša zadnja Odjava"
-
-#~ msgid "Min Delay"
-#~ msgstr "Min kašnjenje"
-
-#~ msgid "Action's type"
-#~ msgstr "Tip radnje"
-
-#~ msgid "Define attendance reason"
-#~ msgstr "Definirajte razlog nazočnosti"
-
-#~ msgid "Sign in"
-#~ msgstr "Prijava"
-
-#~ msgid "Analysis Information"
-#~ msgstr "Podaci Analize"
-
-#~ msgid "Current state"
-#~ msgstr "Tekuće stanje"
-
-#~ msgid "January"
-#~ msgstr "Siječanj"
-
-#~ msgid "April"
-#~ msgstr "Travanjž"
-
-#~ msgid "Attendance Errors"
-#~ msgstr "Greške nazočnosti"
-
-#~ msgid "Action"
-#~ msgstr "Radnja"
-
-#~ msgid "Print Attendance Report"
-#~ msgstr "Tiskaj izvještaj Nazočnosti"
-
-#~ msgid "Attendance Reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "November"
-#~ msgstr "Studeni"
-
-#~ msgid "Bellow this delay, the error is considered to be voluntary"
-#~ msgstr "Ispod tog kašnjenja, greška se smatra proizvoljnom."
-
-#~ msgid "Max. Delay (Min)"
-#~ msgstr "Max. Kašnjenje (min)"
-
-#~ msgid "Select a starting and a end date"
-#~ msgstr "Odaberite datum početka i završetka"
-
-#~ msgid "Ending Date"
-#~ msgstr "Datum završetka"
-
-#~ msgid ""
-#~ "You did not signed in the last time. Please enter the date and time you "
-#~ "signed in."
-#~ msgstr ""
-#~ "Zadnji puta se niste prijavili. Molim Vas, unesite datum i vrijeme kad ste "
-#~ "se trebali prijaviti."
-
-#~ msgid "September"
-#~ msgstr "Rujan"
-
-#~ msgid "December"
-#~ msgstr "Prosinac"
-
-#~ msgid "Employee attendance"
-#~ msgstr "Nazočnost Djelatnika"
-
-#~ msgid "Select a month"
-#~ msgstr "Odaberite mjesec"
-
-#~ msgid "Month"
-#~ msgstr "Mjesec"
-
-#~ msgid "This module aims to manage employee's attendances."
-#~ msgstr "Ovaj modul treba upravljati nazočnostima Djelatnika"
-
-#~ msgid "Attendance Error Report"
-#~ msgstr "Izvještaj greške Nazočnosti"
-
-#~ msgid "Year"
-#~ msgstr "Godina"
-
-#~ msgid "Cancel"
-#~ msgstr "Odustani"
-
-#~ msgid "Operation"
-#~ msgstr "Djelovanje"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Kategorije radnog vremena"
 
@@ -1186,24 +980,3 @@ msgstr "Podređeni djelatnici"
 
 #~ msgid "New Employee"
 #~ msgstr "Novi Djelatnik"
-
-#~ msgid "Passport"
-#~ msgstr "Putovnica"
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "Struktura odjela vaše tvrtke se koristi za upravljanje svim dokumentima "
-#~ "povezanim sa djelatnicima po odjelima: troškovi i provjere rasporeda, "
-#~ "upravljanje odsustvima, regrutacijama, itd."
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "Poslovne pozicije se koriste za definiranje poslova i njihovih zahtjeva. "
-#~ "Moguće je priložiti anketu poslovnoj poziciji. Ova anketa će se koristiti u "
-#~ "procesu regrutacije za procjenu aplikanata za tu poslovnu poziciju."
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index 5ce6efae6b8..37c799a6ce6 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-09 13:07+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index 7d7868ee76b..f5012190363 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bdb0e6931c1..4e5306435b8 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -40,7 +40,7 @@ msgstr "Collega il dipendente alle sue informazioni"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "Numero di Assistenza Sociale"
+msgstr "Codice Fiscale"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -133,7 +133,7 @@ msgstr "Tiene traccia delle vacanze dei dipendenti: richieste e pianificate."
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr "Stato coniugale del dipendente"
+msgstr "Stato Civile del dipendente"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -147,7 +147,7 @@ msgstr ""
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr "Collega un utente ad un dipendente"
+msgstr "Associa un utente a un dipendente"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
@@ -196,7 +196,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr "Posizione"
+msgstr "Ruolo"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -209,7 +209,7 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
-"Il campo dell'utente collegato permette di collegare un utente di OpenERP "
+"Il campo dell'utente associato permette di collegare un utente di OpenERP "
 "(ed i suoi diritti) al dipendente."
 
 #. module: hr
@@ -993,39 +993,5 @@ msgstr "Subordinati"
 #~ msgid "Parent Users"
 #~ msgstr "Utenti Padri"
 
-#~ msgid "Passport"
-#~ msgstr "Passaporto"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possible creare menù ricorsivi"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "La struttura dipartimentale della ditta viene usata per gestire tutti i "
-#~ "documenti collegati ai dipendenti in base al dipartimento: spese e controllo "
-#~ "dei timesheet, ferie, assunzioni etc."
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "La posizione lavorativa identifica le attività e le relative esigenze. Si "
-#~ "può associare una survey ad una posizione lavorativa. Questa survey viene "
-#~ "usata nel processo di assunzione per valutare i candidati alla posizione "
-#~ "lavorativa."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione"
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 46358c34dbc..0bd7794b0c6 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bf0a05885b1..dc95f76dec2 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c4089ca1683..0a6d808069c 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index 89662bfb7ff..29f51b6434d 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ec11e410784..ca43337a0c7 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -982,30 +982,5 @@ msgstr "Харьяалагдсан"
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "Ажилтны гэрээний мэдээллийг бөглөх"
 
-#~ msgid "Passport"
-#~ msgstr "Пасспорт"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Харагдацын архитектурын xml алдаатай !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "JJob Positions нь ажлын байр болон ажлын байрны шаардлагыг тодорхойлоход "
-#~ "ашиглагдана. Ажлын байранд мөн санал асуулга хавсаргаж болно. Энэ санал "
-#~ "асуулгыг энэхүү ажлын байранд орох ажил горилогчийг үнэлэхэд ашиглах "
-#~ "боломжтой."
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "Таны Компанийн Хэлтсийн Бүтэц нь хэлтэс дэх ажилтнуудтай холбоотой бүх бичиг "
-#~ "баримтуудыг удирдана: зардлын болон цаг бүргэлийн баталгаажуулалт, хоцролт "
-#~ "болон ажилд авах г.м."
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index d537a99ad31..1de836b6e2e 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.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-04-05 22:56+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"PO-Revision-Date: 2011-08-23 11:20+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -26,7 +26,7 @@ msgstr "OpenERP bruker"
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Krav"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -90,7 +90,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Jobber"
 
 #. module: hr
 #: view:hr.job:0
@@ -118,7 +118,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Ferie"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
@@ -184,7 +184,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Stilling"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -228,7 +228,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Periodisk evaluering"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
@@ -248,7 +248,7 @@ msgstr "Personnummer"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Antall ansatte med denne jobben"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -321,7 +321,7 @@ msgstr ""
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Jobb"
 
 #. module: hr
 #: view:hr.department:0
@@ -398,7 +398,7 @@ msgstr "Mann"
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfigurasjonsfremdrift"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -415,7 +415,7 @@ msgstr "Ansattkategori"
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bilde"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
@@ -503,7 +503,7 @@ msgstr "Status"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurer"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -692,7 +692,7 @@ msgstr "Single"
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Jobbnavn"
 
 #. module: hr
 #: view:hr.job:0
@@ -772,7 +772,7 @@ msgstr "Avdelingsnavn"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Personnummer"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -782,7 +782,7 @@ msgstr "Opprettelse av en OpenERP bruker"
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "Underavdelinger"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 47b29950d5b..42cd3a4000e 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -988,36 +988,3 @@ msgstr "Ondergeschikten"
 #~ "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 "Passport"
-#~ msgstr "Paspoort"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "De afdeling structuur van uw bedrijf wordt gebruikt voor het beheren van "
-#~ "alle documenten gerelateerd aan medewerkers per afdeling: declaraties en "
-#~ "urenstaat controle, verlofbeheer, werving, etc."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid ""
-#~ "JJob Positions is used to define jobs and their requirements. You can attach "
-#~ "a survey to a job position. This survey will be used in the recruitment "
-#~ "process to evaluate the applicants for this job position."
-#~ msgstr ""
-#~ "Vacatures wordt gebruikt om functies en hun vereisten vast te leggen. U kunt "
-#~ "een enquête koppelen aan een vacature. De enquête wordt gebruikt in het "
-#~ "wervingsproces voor evaluatie van kandidaten voor de vacatures."
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index ecd91b990ed..986c7a43f17 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0c982d399b2..08324b5af86 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -953,9 +953,3 @@ msgstr "Podlegli"
 
 #~ msgid "Other ID"
 #~ msgstr "Inne ID"
-
-#~ msgid "Passport"
-#~ msgstr "Paszport"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index f9b143ab82c..faf09beee5e 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -35,7 +35,7 @@ msgstr "Erro! Não pode criar departamentos recursivos."
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr "Associar o empregado à informação"
+msgstr "Associar o funcionário à informação"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -66,6 +66,10 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Cargos são usadas para definir funções e suas características. Pode "
+"acompanhar o número de funcionários em cada cargo e quantos espera ter no "
+"futuro. Também pode associar um inquérito a um cargo para usar no processo "
+"de recrutamento de candidatos a vagas neste cargo."
 
 #. module: hr
 #: view:hr.employee:0
@@ -79,7 +83,7 @@ msgstr "Departamento"
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr "Simplifica a gestão da pontualidade dos empregados"
+msgstr "Simplifica a gestão da pontualidade dos funcionários"
 
 #. module: hr
 #: view:hr.job:0
@@ -89,12 +93,12 @@ msgstr "Marcar como antigo"
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr "Cargo"
+msgstr "Cargos"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr "Em Recrutamento"
+msgstr "Em recrutamento"
 
 #. module: hr
 #: view:hr.installer:0
@@ -123,12 +127,12 @@ msgstr "Férias"
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
 msgstr ""
-"Regista faltas dos empregados, requisições de colocações e planeamento"
+"Regista ausências dos funcionários, requisições de colocação e planeamento"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr "Estado Cívil do Empregado"
+msgstr "Estado civil do funcionário"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -136,18 +140,18 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
-"O parceiro que está relacionado com o empregado actual. A transacção "
-"contabilística a escrever neste parceiro pertence ao empregado."
+"Parceiro que está relacionado com o funcionário actual. A transacção "
+"contabilística a escrever neste parceiro pertence ao funcionário."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr "Associar um utilizador a um empregado"
+msgstr "Associar um utilizador a um funcionário"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr "Contratos do Empregado"
+msgstr "Contratos do funcionário"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
@@ -157,7 +161,7 @@ msgstr "Sistema de Processamento de Salários Genérico"
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr "Meus Empregados por Departementos"
+msgstr "Funcionários do meu departamento"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
@@ -169,12 +173,12 @@ msgstr "Casado"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
-"Erro ! Não pode seleccionar um departamento cujo empregado é o gestor."
+"Erro ! Não pode seleccionar um departamento cujo gestor é o funcionário."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr "Informação do Passaporte do Empregado"
+msgstr "Informação do passaporte do funcionário"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -183,6 +187,10 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"A estrutura de departamentos da empresa é usada para organizar por "
+"departamento os documentos relativos aos funcionários: calidação de despesas "
+"e folhas de trabalho, autorizações de ausência, processos de recrutamento, "
+"etc."
 
 #. module: hr
 #: view:hr.employee:0
@@ -192,7 +200,7 @@ msgstr "Posto"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Hierarquia de Funcionários"
+msgstr "Hierarquia dos funcionários"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -200,6 +208,8 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"O campo \"utilizador relacionado\" com formulário de Funcionário permite "
+"ligar o utilizador Open ERP ao funcionário."
 
 #. module: hr
 #: view:hr.job:0
@@ -210,12 +220,12 @@ msgstr "Em Recrutamento"
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr "Não"
+msgstr "Número de identificação"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr "Nº de Empregados"
+msgstr "Nº de funcionário"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -227,6 +237,8 @@ msgstr "Feminino"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Assiste os funcionários a codificar e validar as suas folhas de trabalho e "
+"presenças."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
@@ -241,7 +253,7 @@ msgstr "Folhas de Presença"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Estrutura dos Funcionários"
+msgstr "Estrutura de funcionários"
 
 #. module: hr
 #: view:hr.employee:0
@@ -251,7 +263,7 @@ msgstr "IDs Sociais"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr "Número de empregados com esse cargo"
+msgstr "Número de funcionários com esse cargo"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -268,7 +280,7 @@ msgstr "Categorias Descendentes"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr "Descrição do Cargo"
+msgstr "Descrição de funções"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -343,6 +355,7 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Pode ampliar a aplicação RH base instalando outras funcionalidades de RH."
 
 #. module: hr
 #: view:hr.employee:0
@@ -352,7 +365,7 @@ msgstr "Categorias"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr "Empregados Esperados"
+msgstr "Funcionários previstos"
 
 #. module: hr
 #: help:hr.employee,sinid:0
@@ -386,7 +399,7 @@ msgstr "Departamentos"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Contacto do Funcionário"
+msgstr "Contacto do funcionário"
 
 #. module: hr
 #: view:board.board:0
@@ -407,13 +420,13 @@ msgstr "Progresso da Configuração"
 #: 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 "Categorias de Funcionário"
+msgstr "Categorias de funcionário"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Categoria de Funcionário"
+msgstr "Categoria do funcionário"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
@@ -423,7 +436,7 @@ msgstr "Imagem"
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr "Contrato do Empregado"
+msgstr "Contrato do funcionário"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -431,8 +444,8 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
-"Permite-lhe criar e gerir a avaliação periódica e de desempenho dos seus "
-"empregados."
+"Permite-lhe criar e gerir a avaliação periódica de desempenho dos seus "
+"funcionários."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -469,12 +482,12 @@ 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 ""
-"Aqui, você pode gerir a sua força de trabalho ao criar empregados e associar-"
-"lhes certas propriedades no sistema.\r\n"
-"Guarde toda a informação relacionada com os seus empregados e mantenha-se ao "
-"corrente de qualquer coisa que precise de lhes ser associada.\r\n"
+"Aqui, você pode gerir a sua força de trabalho ao criar funcionários e "
+"associar-lhes certas propriedades no sistema.\r\n"
+"Guarde toda a informação relacionada com os seus funcionários e mantenha-se "
+"ao corrente de qualquer coisa que precise de lhes ser associada.\r\n"
 "A zona de informação pessoal ajudá-lo-á a guardar dados de identificação. A "
-"zona de Categorias dá-lhe a hipótese de associar aos seus empregados "
+"zona de Categorias dá-lhe a hipótese de associar aos seus funcionários "
 "determinadas categorias, dependendo da posição daqueles dentro da "
 "empresa.\r\n"
 "Uma categoria pode ser, por exemplo, um grau de antiguidade dentro da "
@@ -482,7 +495,7 @@ msgstr ""
 "A zona de Horas permite-lhe associar uma folha específica e um diário "
 "analítico a um colaborador, onde este poderá registar os seus tempos de "
 "trabalho.\r\n"
-"Na zona de Notas, é possível escrever observações associadas ao empregado."
+"Na zona de Notas, é possível escrever observações associadas ao funcionário."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -555,7 +568,7 @@ msgstr "Activo"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Erro ! Não pode criar uma Hierarquia recursiva de Funcionários."
+msgstr "Erro! Não pode criar hierarquias de funcionários com recursividade."
 
 #. module: hr
 #: view:hr.department:0
@@ -573,6 +586,13 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Módulo para a gestão de recursos humanos. Pode gerir:\n"
+"    * Funcionários e hierarquias: pode associar utilizadores a funcionários "
+"e apresentar hierarquias\n"
+"    * Departamentos\n"
+"    * Cargos\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -580,13 +600,13 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
-"No formulário de empregado, tem diversos tipos de informação, como os "
-"contactos dos mesmos"
+"No formulário de funcionário, tem diversos tipos de informação, como os seus "
+"dados de contacto."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr "Número de empregados necessários para o cargo"
+msgstr "Número de funcionário necessários para o cargo."
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -626,7 +646,7 @@ msgstr "Ajuda-o a gerir e organizar o processo de recrutamento"
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr "Formulário e estrutura do Empregado"
+msgstr "Formulário e estrutura do funcionário"
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -664,8 +684,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
-"Regista e processa as despesas dos empregados, e pode ainda automaticamente "
-"facturar os clientes se as despesas estão relacionadas com algum projecto"
+"Regista e processa as despesas dos funcionário, podendo re-faturar aos "
+"clientes se as despesas estiverem relacionadas com algum projeto"
 
 #. module: hr
 #: view:hr.job:0
@@ -680,7 +700,7 @@ msgstr "Departamento Pai"
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Categorias dos Funcionários"
+msgstr "Categorias de funcionários"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
@@ -702,7 +722,8 @@ msgstr "Descrição"
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
-msgstr "Extende perfis de empregados para ajudar a gerir os seus contratos"
+msgstr ""
+"Amplia perfis de funcionários para facilitar a gestão dos seus contratos"
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
@@ -717,7 +738,7 @@ msgstr "Solteiro"
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr "Nome do Cargo"
+msgstr "Nome do cargo"
 
 #. module: hr
 #: view:hr.job:0
@@ -813,7 +834,7 @@ msgstr "Departamentos Descendentes"
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr "Cargos"
+msgstr "Posições de cargos"
 
 #. module: hr
 #: view:hr.employee:0
@@ -824,7 +845,7 @@ msgstr "Treinador"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Configure a sua Aplicação de Recursos Humanos"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
@@ -907,12 +928,6 @@ msgstr "Subordinados"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de módulo inválido na definição da acção"
 
-#~ msgid "Passport"
-#~ msgstr "Passaporte"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Categorias de Horário de Trabalho"
 
@@ -981,21 +996,3 @@ msgstr "Subordinados"
 
 #~ msgid "New Employee"
 #~ msgstr "Novo Funcionário"
-
-#~ msgid ""
-#~ "Your Company's Departments Structure is used to manage all documents related "
-#~ "to employees by departments: expenses and timesheet validation, leaves "
-#~ "management, recruitements, etc."
-#~ msgstr ""
-#~ "A Estrutura de Departamentos da sua empresa é usada para gerir os documentos "
-#~ "relacionados com os empregados (por departamento): despesas e validação de "
-#~ "folhas de horas, gestão de licenças e baixas, recrutamento, etc."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 0e3c61d5515..658a9627f9a 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/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: 2011-06-24 04:59+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -972,18 +972,3 @@ msgstr "Subordinados"
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Categoria de Horas de Trabalho"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Passport"
-#~ msgstr "Passaporte"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index d9e3be5ef76..a2f917abc2a 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,7 +25,7 @@ msgstr "Utilizator OpenERP"
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Cerințe"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -35,7 +35,7 @@ msgstr "Eroare! Nu puteţi crea departamente recursive."
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Asociază angajat la informaţii"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -55,7 +55,7 @@ msgstr "Resurse umane"
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupează după..."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -66,6 +66,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Pozitii de locuri de muncă sunt folosite pentru a defini posturile şi "
+"cerinţele lor. Puteţi ţine evidenţa numărului de salariaţi per post şi câţi "
+"vă aşteptaţi în viitor. Aveţi posibilitatea să ataşaţi, de asemenea, un "
+"sondaj la un post de muncă care va fi utilizat în procesul de recrutare "
+"pentru a evalua solicitanţii de locuri de muncă pentru această poziţie."
 
 #. module: hr
 #: view:hr.employee:0
@@ -84,12 +89,12 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Marchează ca veche"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Sarcini"
 
 #. module: hr
 #: view:hr.job:0
@@ -99,7 +104,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "titlu"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -117,7 +122,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Vacanțe"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
@@ -127,7 +132,7 @@ msgstr ""
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "Starea civila a angajatului"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -144,12 +149,12 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Contractele angajaților"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Sistem salarizare generic."
 
 #. module: hr
 #: view:hr.employee:0
@@ -159,7 +164,7 @@ msgstr ""
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Căsătorit(ă)"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -170,7 +175,7 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "Informaţii paşaport angajat"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -183,7 +188,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Poziţia"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -206,12 +211,12 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "CI/BI nr."
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Nr de angajați"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -223,16 +228,18 @@ msgstr "Feminin"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Urmărește şi îi ajută pe angajaţi în a codifica și valida pontajul şi "
+"frecvența."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Evaluări periodice"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Foi de pontaj"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -264,7 +271,7 @@ msgstr "Categorii subordonate"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Fișa postului"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -282,12 +289,12 @@ msgstr "Angajat"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Alte informații"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "E-mail servici"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -298,7 +305,7 @@ msgstr "Nume"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Data nașterii"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -313,14 +320,14 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Tablou de bord Resurse umane"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Post"
 
 #. module: hr
 #: view:hr.department:0
@@ -343,7 +350,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Categorii"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
@@ -353,7 +360,7 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Număr de Asigurări Sociale"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
@@ -387,7 +394,7 @@ msgstr "Contact angajat"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Panoul meu"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -397,7 +404,7 @@ msgstr "Masculin"
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progres configurare"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -414,7 +421,7 @@ msgstr "Categorie angajat"
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagine"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
@@ -427,6 +434,8 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Vă permite să creaţi şi să gestionaţi evaluarea periodică şi a "
+"performanţelor angajaţilor."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -502,7 +511,7 @@ msgstr "Stare"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurează"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -513,12 +522,12 @@ msgstr "Structura categoriilor"
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "necunoscut"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Managementul Vacanțelor / Plecărilor"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -562,28 +571,28 @@ msgstr ""
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Numarul necesar de angajați pentru acea sarcină/funcție"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Vechi"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Descriere stare"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Nu pot exista doi utilizatori cu același nume de conectare !"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stare"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -602,12 +611,12 @@ msgstr ""
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Forma şi structura angajați"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Fotografie"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
@@ -617,7 +626,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Contabilitate salarizare"
 
 #. module: hr
 #: view:hr.employee:0
@@ -627,12 +636,12 @@ msgstr "Informații personale"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Nr. pașaport"
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Activitatea curentă"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -644,7 +653,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "Curent"
 
 #. module: hr
 #: field:hr.department,parent_id:0
@@ -665,13 +674,13 @@ msgstr "Adresă acasă"
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr ""
+msgstr "Prezența"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Descriere"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
@@ -681,17 +690,17 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Stat de plata"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Ne-căsatorit"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Nume post"
 
 #. module: hr
 #: view:hr.job:0
@@ -702,7 +711,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: hr
 #: view:hr.department:0
@@ -734,7 +743,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resursă"
 
 #. module: hr
 #: view:hr.installer:0
@@ -771,12 +780,12 @@ msgstr "Nume departament"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Număr de securitate socială"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Crearea unui utilizator OpenERP"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -793,7 +802,7 @@ msgstr ""
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Mentor"
 
 #. module: hr
 #: view:hr.installer:0
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 1d3fe887d90..409b4721c1a 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -40,7 +40,7 @@ msgstr "Связать сотрудника с информацией"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "Страховой номер индивидуального лицевого счета (СНИЛС)"
+msgstr "СНИЛС"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -174,8 +174,8 @@ msgstr "В браке"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
-"Ошибка! Вы не можете выбрать подразделение, руководителем которого является "
-"этот сотрудник."
+"Ошибка! Вы не можете выбрать подразделение, для которого сотрудник является "
+"руководителем."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
@@ -190,7 +190,7 @@ msgid ""
 "management, recruitments, etc."
 msgstr ""
 "Структура подразделений Вашей компании используется для управления "
-"документами, связанными с сотрудниками, по подразделениям: издержки и "
+"документами, связанными с сотрудниками по подразделениям: издержки и "
 "проверка табелей учёта, управление отпусками, набор сотрудников и т.д."
 
 #. module: hr
@@ -221,12 +221,12 @@ msgstr "Набор сотрудников"
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr "Идентификационный номер"
+msgstr "Табельный номер"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr "№ сотрудника"
+msgstr "Число сотрудников"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -244,7 +244,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr "Периодические проверки"
+msgstr "Периодические собеседования"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
@@ -343,7 +343,7 @@ msgstr "Должность"
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr "Сотрудники"
+msgstr "Участники"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -446,8 +446,8 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
-"Позволяет создавать и управлять периодическими проверками и обзором "
-"производительности сотрудников."
+"Позволяет создавать и управлять периодическими собеседованиями и "
+"анализировать производительность сотрудников."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -525,7 +525,7 @@ msgstr "Рабочий адрес"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr "Инф. панель менеджера отдела кадров"
+msgstr "Инфо-панель менеджера отдела кадров"
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 49881e80da6..74dddd96ee3 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 570e791f788..f63e08e3172 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b345c9affd0..8afb445583b 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3e14d5baccd..9aac5a31c83 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: 2011-04-29 05:30+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -845,15 +845,9 @@ msgstr "Podređeni"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime u definiciji akcije."
 
-#~ msgid "Passport"
-#~ msgstr "Pasoš"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za pregled arhitekture"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne možeš kreirati rekursivni Meni."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index f5453b8ffc7..60d1c0a5b4c 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -864,15 +864,9 @@ msgstr "Podređeni"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime u definiciji akcije."
 
-#~ msgid "Passport"
-#~ msgstr "Pasoš"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za pregled arhitekture"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne možeš kreirati rekursivni Meni."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 73833d1edd5..497107460af 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 703289238e8..a9db9cc252a 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 96f83d729be..ac54302d744 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bc8f7f0427d..e51dbaa44a3 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: 2011-06-24 04:59+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 4a0ad44555b..6adba07c023 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c866ce5a5c2..3b628e18557 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -14,13 +14,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-05-25 15:08+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -72,6 +72,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Vị trí công việc được sử dụng để xác định công việc và yêu cầu của họ. Bạn "
+"có thể theo dõi số lượng nhân viên bạn có cho mỗi vị trí công việc và bao "
+"nhiêu bạn mong đợi trong tương lai. Bạn cũng có thể đính kèm một cuộc khảo "
+"sát với một vị trí công việc sẽ được sử dụng trong quá trình tuyển dụng để "
+"đánh giá các ứng viên cho vị trí công việc."
 
 #. module: hr
 #: view:hr.employee:0
@@ -85,7 +90,7 @@ msgstr "Phòng/Ban"
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr ""
+msgstr "Đơn giản hoá việc quản lý của khán giả của nhân viên."
 
 #. module: hr
 #: view:hr.job:0
@@ -118,7 +123,7 @@ msgstr "Công ty"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Dự kiến ​​trong tuyển dụng"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
@@ -128,7 +133,7 @@ msgstr "Nghỉ lễ"
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr ""
+msgstr "Theo dõi nhân viên lá, yêu cầu phân bổ và lập kế hoạch."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
@@ -141,6 +146,8 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Nhân viên làm việc với khách hàng . Tài khoản của khách sẽ chuyển cho nhân "
+"viên đó."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -172,6 +179,7 @@ msgstr "Đã kết hôn"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Lỗi ! bạn không thể chọ phòng ban nếu nhân viên này là người quản lý."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
@@ -185,6 +193,8 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"sơ đồ công ty của bạn quản lý các phòng ban cho tới các nhân viên , thời "
+"gian làm việc , nghỉ việc , yêu cầu công việc ..."
 
 #. module: hr
 #: view:hr.employee:0
@@ -202,12 +212,14 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Các lĩnh vực sử dụng liên quan về hình thức lao động cho phép liên kết người "
+"sử dụng OpenERP (và các quyền của mình) để người lao động"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "đang tuyển Dụng"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -229,6 +241,8 @@ msgstr "Nữ"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"theo dõi và giúp đỡ nhân viên trong việc mã hòa và xác thực thời gian làm "
+"việc theo bảng chấm công."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
@@ -253,7 +267,7 @@ msgstr "Số CMND/Hộ chiếu"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "số lượng nhân viên đang làm việc trong công viêc"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -283,7 +297,7 @@ msgstr "Địa điểm văn phòng"
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr "Nhân viên"
+msgstr "Người lao động"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
@@ -345,6 +359,8 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Bạn có thể nâng cao cơ sở nhân sự ứng dụng bằng cách cài đặt vài chức năng "
+"liên quan đến nhân sự."
 
 #. module: hr
 #: view:hr.employee:0
@@ -354,7 +370,7 @@ msgstr "Loại"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "nhân viên dự kiến"
 
 #. module: hr
 #: help:hr.employee,sinid:0
@@ -374,7 +390,7 @@ msgstr "Hạng mục mẹ"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "bạn không thể tạo ra loại hạn mục"
 
 #. module: hr
 #: view:hr.department:0
@@ -393,7 +409,7 @@ msgstr "Thông tin liên hệ của nhân viên"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "hội đồng quản trị"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -403,7 +419,7 @@ msgstr "Nam"
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Tiến trình cấu hình"
+msgstr "cài đặt quy trình"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -433,6 +449,8 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Cho phép bạn tạo và quản lý việc đánh giá định kỳ và đánh giá hiệu suất của "
+"nhân viên."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -442,7 +460,7 @@ msgstr "hr.department"
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Liên kết giũa người quản lý và phòng ban"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
@@ -469,11 +487,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 ""
+"Tại đây bạn có thể quản lý lực lượng lao động của bạn bằng cách tạo nhân "
+"viên và gán cho chúng các thuộc tính cụ thể trong hệ thống. Duy trì tất cả "
+"các thông tin nhân viên liên quan và theo dõi bất cứ điều gì mà cần phải "
+"được ghi lại cho chúng. Thẻ thông tin cá nhân sẽ giúp bạn duy trì dữ liệu "
+"danh tính của họ. Các tab hạng mục cung cấp cho bạn cơ hội để giao cho nhân "
+"viên liên quan đến loại tùy thuộc vào vị trí và hoạt động của họ trong công "
+"ty. Một loại có thể được một mức độ thâm niên trong công ty hoặc bộ phận "
+"một. Các tab timesheets cho phép giao cho một timesheet cụ thể và tạp chí "
+"phân tích, nơi họ sẽ có thể nhập vào thời gian qua hệ thống. Trong tab lưu "
+"ý, bạn có thể nhập dữ liệu văn bản đó phải được ghi lại cho một nhân viên cụ "
+"thể."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Tài khoản của lương của nhân viên ở ngân hàng"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -483,7 +512,7 @@ msgstr "Ghi chú"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Công ty lựa chọn không có trong các công ty được phép sử dụng"
 
 #. module: hr
 #: view:hr.employee:0
@@ -498,7 +527,7 @@ msgstr "Địa chỉ làm việc"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "bàng tổng quan nguồn nhân lực"
 
 #. module: hr
 #: view:hr.employee:0
@@ -524,7 +553,7 @@ msgstr "không rõ"
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "ngày nghỉ / quản lý nhân viên nghỉ"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -539,12 +568,12 @@ msgstr "Hiệu lực"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tao cấu trúc đệ quy của nhân viên"
 
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr "Công ty"
+msgstr "Các công ty"
 
 #. module: hr
 #: model:ir.module.module,description:hr.module_meta_information
@@ -557,6 +586,13 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    phân hệ quản lý nhân sự bạn có thể quản lý:\n"
+"    * cấu trúc của nhân viên :bạn có thể định nghĩa cấu trúc bà nhân viên "
+"của bạn\n"
+"    * phòng nhân sự quản lý các phòng ban\n"
+"    * công việc của quản lý nhân sự\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -564,32 +600,34 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"Trong các hình thức lao động, có những loại thông tin khác nhau như Liên hệ "
+"thông tin"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "số lượng nhân viên yêu cầu cho công việc này."
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Cũ"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "miêu tả trạng thái."
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Bạn không thể có hai người sử dụng với cùng tên đăng nhập"
+msgstr "Bạn không thể có hai người sử dụng với cùng tên đăng nhập !"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "vùng"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -603,12 +641,12 @@ msgstr "Tình trạng hôn nhân"
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr ""
+msgstr "hỗ trợ quản lý và quy trình quản lý yêu cầu"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "hình thức và cấu trúc của nhân viên"
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -623,7 +661,7 @@ msgstr "res.users"
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "tài khoản lương"
 
 #. module: hr
 #: view:hr.employee:0
@@ -646,6 +684,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Theo dõi và quản lý chi phí nhân viên, và có thể các khách hàng lại tự động "
+"hoá đơn nếu các chi phí liên quan đến dự án."
 
 #. module: hr
 #: view:hr.job:0
@@ -682,12 +722,12 @@ msgstr "Mô tả"
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
-msgstr ""
+msgstr "quản lý thông tin liên lạc của nhân viên"
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "trả lương"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
@@ -703,12 +743,12 @@ msgstr "Tên công việc"
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "đang ở vị trí"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Mobile"
-msgstr "Số di động"
+msgstr "Di động"
 
 #. module: hr
 #: view:hr.department:0
@@ -735,7 +775,7 @@ msgstr "hr.installer"
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "quản lý tổng thể"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -782,34 +822,34 @@ msgstr "Số An sinh Xã hội"
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Tạo một Tài khoản vào trong OpenERP"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Phòng/ban con"
+msgstr "phòng/ ban cấp dưới"
 
 #. 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 "đương chức"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "huấn luyện viên"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "cấu hình ứng dụng quản lý nhân sự của bạn"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Chi Phí"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -821,12 +861,12 @@ msgstr "Quản lý"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Đã Qua"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Loại tài khoản Trả tiền lương nội bộ"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
@@ -899,24 +939,6 @@ msgstr "Người cấp dưới"
 #~ msgid "Timesheet Line"
 #~ msgstr "Dòng chấm công"
 
-#~ msgid "Passport"
-#~ msgstr "Hộ chiếu"
-
-#~ msgid "Wed"
-#~ msgstr "Thứ tư"
-
-#~ msgid "(Keep empty for current_time)"
-#~ msgstr "(Để trống cho thời gian hiện tại)"
-
-#~ msgid "Current Server Date"
-#~ msgstr "Ngày hiện tại trên máy chủ"
-
-#~ msgid "No employee defined for your user !"
-#~ msgstr "Không có nhân viên được xác định cho người dùng của bạn!"
-
-#~ msgid "Employee's name"
-#~ msgstr "Tên nhân viên"
-
 #~ msgid "Sunday"
 #~ msgstr "Chủ nhật"
 
@@ -929,506 +951,47 @@ msgstr "Người cấp dưới"
 #~ msgid "Contact  of employee"
 #~ msgstr "Thông tin liên hệ của nhân viên"
 
-#~ msgid "Sign Out"
-#~ msgstr "Đăng xuất"
-
 #~ msgid "Work Email"
 #~ msgstr "Email công việc"
 
-#~ msgid "March"
-#~ msgstr "Tháng ba"
-
-#~ msgid "My Working Hours of The Day"
-#~ msgstr "Giờ làm việc trong ngày của tôi"
-
-#~ msgid "Employee Timesheet"
-#~ msgstr "Bảng chấm công nhân viên"
-
 #~ msgid "Friday"
 #~ msgstr "Thứ sáu"
 
-#~ msgid "Timesheet"
-#~ msgstr "Bảng chấm công"
-
-#~ msgid ""
-#~ "You did not sign out the last time. Please enter the date and time you "
-#~ "signed out."
-#~ msgstr ""
-#~ "Bạn đã không đăng xuất lần cuối cùng. Vui lòng nhập ngày và giờ bạn đăng "
-#~ "xuất."
-
-#~ msgid "Total period:"
-#~ msgstr "Tổng thời gian:"
-
-#~ msgid "Reason"
-#~ msgstr "Lý do"
-
-#~ msgid "Mon"
-#~ msgstr "Thứ hai"
-
-#~ msgid "The sign-out date must be in the past"
-#~ msgstr "Ngày đăng xuất phải là ngày quá khứ"
-
-#~ msgid "Date Signed"
-#~ msgstr "Ngày ký"
-
-#~ msgid "UnknownError"
-#~ msgstr "Lỗi không xác định"
-
-#~ msgid "Work done in the last period"
-#~ msgstr "Công việc được thực hiện trong giai đoạn cuối"
-
-#~ msgid "Attendance reasons"
-#~ msgstr "Lý do có mặt"
-
-#~ msgid "Present"
-#~ msgstr "Hiện tại"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Total time"
-#~ msgstr "Tổng thời gian"
-
-#~ msgid "Current state"
-#~ msgstr "Trạng thái hiện tại"
-
-#~ msgid "My Working Hours"
-#~ msgstr "Giờ làm việc của tôi"
-
-#~ msgid "Attendance Reasons"
-#~ msgstr "Lý do có mặt"
-
-#~ msgid ""
-#~ "You tried to sign with a date anterior to another event !\n"
-#~ "Try to contact the administrator to correct attendances."
-#~ msgstr ""
-#~ "Bạn đã cố gắng đăng nhập với một ngày trước một sự kiện khác !\n"
-#~ "Xin hãy liên hệ quản trị viên để điều chỉnh."
-
-#~ msgid "UserError"
-#~ msgstr "Lỗi người dùng"
-
-#~ msgid "Ending Date"
-#~ msgstr "Ngày kết thúc"
-
-#~ msgid "No cost unit defined for this employee !"
-#~ msgstr "Không có đơn vị chấp nhận chi phí xác định cho nhân viên này!"
-
-#~ msgid "Employee attendance"
-#~ msgstr "Nhân viên có mặt"
-
-#~ msgid "Print Timesheet"
-#~ msgstr "In bảng chấm công"
-
-#~ msgid "Tue"
-#~ msgstr "Thứ ba"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Tài khoản phân tích"
-
-#~ msgid "Timesheet Process"
-#~ msgstr "Quy trình chấm công"
-
-#~ msgid "Warning"
-#~ msgstr "Cảnh báo"
-
-#~ msgid "Human Resources (Timesheet encoding)"
-#~ msgstr "Quản trị nhân lực (mã hóa bảng chấm công)"
-
-#~ msgid "Operation"
-#~ msgstr "Hoạt động"
-
-#~ msgid "A sign-in must be right after a sign-out !"
-#~ msgstr "Đăng nhập phải ngay sau khi đăng xuất !"
-
-#~ msgid "Sat"
-#~ msgstr "Thứ bảy"
-
-#~ msgid "You are now ready to sign in or out of the attendance follow up"
-#~ msgstr "Bây giờ bạn đã sẵn sàng để đăng nhập hoặc đăng xuất"
-
-#~ msgid "Absent"
-#~ msgstr "Vắng mặt"
-
-#~ msgid "Employees Timesheet"
-#~ msgstr "Bảng chấm công nhân viên"
-
-#~ msgid "Max. Delay (Min)"
-#~ msgstr "Chậm trễ tối đa (Phút)"
-
-#~ msgid "Minimum Analytic Amount"
-#~ msgstr "Số lượng phân tích tối thiểu"
-
-#~ msgid "Select a time span"
-#~ msgstr "Hãy chọn một khoảng thời gian"
-
-#~ msgid "This module aims to manage employee's attendances."
-#~ msgstr "Mô đun này nhằm mục đích quản lý việc tham dự của nhân viên."
-
-#~ msgid "Print"
-#~ msgstr "In"
-
-#~ msgid "Total cost"
-#~ msgstr "Tổng chi phí"
-
-#~ msgid "Action's type"
-#~ msgstr "Loại hành động"
-
-#~ msgid "July"
-#~ msgstr "Tháng bảy"
-
-#~ msgid "Attendance Error Report"
-#~ msgstr "Báo cáo lỗi tham dự"
-
-#~ msgid "Starting Date"
-#~ msgstr "Ngày bắt đầu"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML không hợp lệ để xem kiến trúc"
 
-#~ msgid "Min Delay"
-#~ msgstr "Chậm trễ tối thiểu"
-
-#~ msgid "Employee attendances"
-#~ msgstr "Tham dự của nhân viên"
-
-#~ msgid "Working Hours"
-#~ msgstr "Giờ làm việc"
-
-#~ msgid "No Data Available"
-#~ msgstr "Không có dữ liệu"
-
-#~ msgid "Timesheet line"
-#~ msgstr "Quy tắc chấm công"
-
-#~ msgid "The Sign-in date must be in the past"
-#~ msgstr "Ngày đăng nhập phải là ngày trong quá khứ"
-
-#~ msgid "Analytic Journal"
-#~ msgstr "Nhật ký phân tích"
-
-#~ msgid "September"
-#~ msgstr "Tháng chín"
-
 #~ msgid "Tuesday"
 #~ msgstr "Thứ ba"
 
-#~ msgid "Thu"
-#~ msgstr "Thứ năm"
-
-#~ msgid "Select a month"
-#~ msgstr "Chọn tháng"
-
-#~ msgid "User"
-#~ msgstr "Người dùng"
-
-#~ msgid "Print My Timesheet"
-#~ msgstr "In bảng chấm công của tôi"
-
-#~ msgid ""
-#~ "(*) A negative delay means that the employee worked more than encoded."
-#~ msgstr ""
-#~ "(*) Một sự chậm trễ tiêu cực có nghĩa là nhân viên làm việc nhiều hơn thời "
-#~ "gian được ghi nhận."
-
-#~ msgid "ValidateError"
-#~ msgstr "Lỗi xác nhận"
-
-#~ msgid "Employee timesheet"
-#~ msgstr "Bảng chấm công nhân viên"
-
-#~ msgid "Sign in / Sign out by project"
-#~ msgstr "Đăng nhập/Đăng xuất bởi dự án"
-
-#~ msgid "June"
-#~ msgstr "Tháng sáu"
-
-#~ msgid "Fri"
-#~ msgstr "Thứ sáu"
-
-#~ msgid "Sign In"
-#~ msgstr "Đăng nhập"
-
-#~ msgid "Sign in / Sign out"
-#~ msgstr "Đăng nhập/Đăng xuất"
-
-#~ msgid ""
-#~ "You tried to sign in with a date anterior to another event !\n"
-#~ "Try to contact the administrator to correct attendances."
-#~ msgstr ""
-#~ "Bạn đã cố gắng đăng nhập với ngày trước một sự kiện khác!\n"
-#~ "Xin hãy liên hệ quản trị viên để điều chỉnh."
-
-#~ msgid "Attendance"
-#~ msgstr "Tham dự"
-
-#~ msgid "Print Timesheet by week"
-#~ msgstr "In bảng chấm công theo tuần"
-
-#~ msgid "Sign in status"
-#~ msgstr "Trạng thái đăng nhập"
-
-#~ msgid "Print Attendance Report"
-#~ msgstr "In báo cáo tham dự"
-
-#~ msgid "August"
-#~ msgstr "Tháng tám"
-
 #~ msgid "Monday"
 #~ msgstr "Thứ hai"
 
-#~ msgid "A sign-out must be right after a sign-in !"
-#~ msgstr "Đăng xuất phải ngay sau đăng nhập!"
-
-#~ msgid "Attendances Of Employees"
-#~ msgstr "Sự tham dự của nhân viên"
-
 #~ msgid "Birthday"
 #~ msgstr "Sinh nhật"
 
-#~ msgid "Start Working"
-#~ msgstr "Bắt đầu làm việc"
-
-#~ msgid "Sun"
-#~ msgstr "Chủ nhật"
-
-#~ msgid "November"
-#~ msgstr "Tháng mười một"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module implement a timesheet system. Each employee can encode and\n"
-#~ "track their time spent on the different projects. A project is an\n"
-#~ "analytic account and the time spent on a project generate costs on\n"
-#~ "the analytic account.\n"
-#~ "\n"
-#~ "Lots of reporting on time and employee tracking are provided.\n"
-#~ "\n"
-#~ "It is completely integrated with the cost accounting module. It allows you\n"
-#~ "to set up a management by affair.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Mô đun này triển khai một hệ thống chấm công. Mỗi nhân viên có thể mã hóa "
-#~ "và\n"
-#~ "theo dõi thời gian họ đã làm việc trong các dự án khác nhau. Một dự án là "
-#~ "một\n"
-#~ "tài khoản phân tích và thời gian làm việc cho dự án phát sinh chi phí đối "
-#~ "với\n"
-#~ "tài khoản phân tích này.\n"
-#~ "\n"
-#~ "Nhiều báo cáo về theo dõi thời gian và nhân viên được cung cấp.\n"
-#~ "\n"
-#~ "Nó được tích hợp hoàn toàn với mô đun kế toán chi phí. Nó cho phép bạn\n"
-#~ "thiết lập quản lý theo vụ việc.\n"
-#~ "    "
-
-#~ msgid "Stop Working"
-#~ msgstr "Chấm dứt làm việc"
-
-#~ msgid "Closing Date"
-#~ msgstr "Ngày đóng"
-
 #~ msgid "Employee Contract Process"
 #~ msgstr "Xử lý hợp đồng lao động với nhân viên"
 
-#~ msgid "January"
-#~ msgstr "Tháng một"
-
-#~ msgid "Sign in"
-#~ msgstr "Đăng nhập"
-
 #~ msgid "Wednesday"
 #~ msgstr "Thứ tư"
 
-#~ msgid "Sign-Out Entry must follow Sign-In."
-#~ msgstr "Đăng xuất phải theo sau đăng nhập."
-
-#~ msgid "Date"
-#~ msgstr "Ngày"
-
-#~ msgid ""
-#~ "\n"
-#~ "    Module for human resource management. You can manage:\n"
-#~ "    * Employees and hierarchies\n"
-#~ "    * Work hours sheets\n"
-#~ "    * Attendances and sign in/out system\n"
-#~ "\n"
-#~ "    Different reports are also provided, mainly for attendance statistics.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Mô đun để quản trị nguồn nhân lực. Bạn có thể quản lý:\n"
-#~ "    * Nhân viên và hệ thống cấp bậc\n"
-#~ "    * Bảng chấm công\n"
-#~ "    * Sự có mặt và hệ thống đăng nhập/đăng xuất\n"
-#~ "\n"
-#~ "    Nhiều báo cáo khác nhau cũng được cung cấp, chủ yếu để thống kê việc "
-#~ "tham dự.\n"
-#~ "    "
-
-#~ msgid "Attendance Errors"
-#~ msgstr "Lỗi tham dự"
-
-#~ msgid "Action"
-#~ msgstr "Hành động"
-
-#~ msgid ""
-#~ "You tried to sign out with a date anterior to another event !\n"
-#~ "Try to contact the administrator to correct attendances."
-#~ msgstr ""
-#~ "Bạn đã cố gắng đăng xuất với một ngày trước một sự kiện khá !\n"
-#~ "Xin hãy liên hệ với quản trị viên để điều chỉnh."
-
-#~ msgid "Select a starting and a end date"
-#~ msgstr "Chọn ngày bắt đầu và ngày kết thúc"
-
 #~ msgid "Parent Users"
 #~ msgstr "Người dùng chính"
 
-#~ msgid "General Information"
-#~ msgstr "Thông tin chung"
-
-#~ msgid "December"
-#~ msgstr "Tháng mười hai"
-
-#~ msgid "Cancel"
-#~ msgstr "Hủy"
-
-#~ msgid "(Keep empty for current time)"
-#~ msgstr "(Để trống cho thời gian hiện tại)"
-
-#~ msgid "Choose your month"
-#~ msgstr "Chọn tháng của bạn"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Tên đối tượng phải bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc biệt "
 #~ "nào!"
 
-#~ msgid ""
-#~ "No analytic journal available for this employee.\n"
-#~ "Define an employee for the selected user and assign an analytic journal."
-#~ msgstr ""
-#~ "Không có nhật ký phân tích cho nhân viên này.\n"
-#~ "Xác định một nhân viên cho người dùng đã chọn và chỉ định một nhật ký phân "
-#~ "tích."
-
-#~ msgid ""
-#~ "(*) A positive delay means that the employee worked less than recorded."
-#~ msgstr ""
-#~ "(*) Một sự chậm trễ tích cực có nghĩa là nhân viên đã làm việc ít hơn thời "
-#~ "gian ghi nhận."
-
 #~ msgid "Thursday"
 #~ msgstr "Thứ năm"
 
-#~ msgid "Sign out"
-#~ msgstr "Đăng xuất"
-
-#~ msgid "Delay"
-#~ msgstr "Chậm trễ"
-
-#~ msgid "Print Attendance Error Report"
-#~ msgstr "In báo cáo lỗi tham dự"
-
-#~ msgid "Current Date"
-#~ msgstr "Ngày hiện tại"
-
-#~ msgid "Analysis Information"
-#~ msgstr "Thông tin phân tích"
-
-#~ msgid "Month"
-#~ msgstr "Tháng"
-
-#~ msgid ""
-#~ "No analytic account defined on the project.\n"
-#~ "Please set one or we can not automatically fill the timesheet."
-#~ msgstr ""
-#~ "Không có tài khoản phân tích được xác định đối với dự án. \n"
-#~ "Vui lòng thiết lập tài khoản phân tích hoặc chúng ta không thể tự động điền "
-#~ "bảng chấm công."
-
-#~ msgid "Product"
-#~ msgstr "Sản phẩm"
-
-#~ msgid "Action reason"
-#~ msgstr "Lý do hành động"
-
-#~ msgid "Users"
-#~ msgstr "Người dùng"
-
-#~ msgid "Working Hours of The Day"
-#~ msgstr "Giờ làm việc trong ngày"
-
-#~ msgid "May"
-#~ msgstr "Tháng năm"
-
-#~ msgid "Choose Users"
-#~ msgstr "Chọn người dùng"
-
-#~ msgid "Your last sign in"
-#~ msgstr "Lần đăng nhập cuối cùng của bạn"
-
-#~ msgid "Print Timesheet by month"
-#~ msgstr "In bảng chấm công theo tháng"
-
-#~ msgid "Date Recorded"
-#~ msgstr "Ngày ghi nhận"
-
-#~ msgid "(local time on the server side)"
-#~ msgstr "(giờ địa phương trên máy chủ)"
-
-#~ msgid "Define attendance reason"
-#~ msgstr "Định nghĩa lý do tham dự"
-
 #~ msgid "Other ID"
 #~ msgstr "Giấy tờ tùy thân khác"
 
-#~ msgid "February"
-#~ msgstr "Tháng hai"
-
-#~ msgid "Analytic line"
-#~ msgstr "Quy tắc phân tích"
-
-#~ msgid "April"
-#~ msgstr "Tháng tư"
-
-#~ msgid "Work Description"
-#~ msgstr "Mô tả công việc"
-
-#~ msgid "Timesheet Lines"
-#~ msgstr "Quy tắc chấm công"
-
-#~ msgid "Bellow this delay, the error is considered to be voluntary"
-#~ msgstr "Dưới sự chậm trễ này, lỗi này được coi là tự nguyện"
-
-#~ msgid "Your last sign out"
-#~ msgstr "Lần đăng xuất cuối cùng của bạn"
-
-#~ msgid "No records found for your selection!"
-#~ msgstr "Không có thông tin được tìm thấy cho lựa chọn của bạn!"
-
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "Điền đầy đủ thông tin liên hệ của nhân viên"
 
-#~ msgid "October"
-#~ msgstr "Tháng mười"
-
-#~ msgid ""
-#~ "You did not sign in the last time. Please enter the date and time you signed "
-#~ "in."
-#~ msgstr ""
-#~ "Bạn không đăng nhập lần cuối cùng. Vui lòng nhập ngày và thời gian bạn đăng "
-#~ "nhập."
-
-#~ msgid "Year"
-#~ msgstr "Năm"
-
-#~ msgid "Change Work"
-#~ msgstr "Thay đổi công việc"
-
 #~ msgid "Saturday"
 #~ msgstr "Thứ bảy"
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 50c9fa57470..41e32dc3ddd 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -35,12 +35,12 @@ msgstr "错误:你不能建立递归部门"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr "连接员工到信息"
+msgstr "员工信息链接"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "身份证号"
+msgstr "社保号"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -55,7 +55,7 @@ msgstr "人力资源"
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -65,7 +65,7 @@ msgid ""
 "expect in the future. You can also attach a survey to a job position that "
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
-msgstr "职务用于定义工作以及工作的要求。 你可以跟踪到每个职务的当前员工数量以及在未来所期望的员工数量。"
+msgstr "职务用于定义工作以及工作的要求。 您可以跟踪每个职务的当前员工数量以及在未来所期望的员工数量。您还可以附加在申请人招聘时考评的问卷。"
 
 #. module: hr
 #: view:hr.employee:0
@@ -79,17 +79,17 @@ msgstr "部门"
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr "简化雇员考勤管理"
+msgstr "简化的员工考勤管理"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr "标记为老的"
+msgstr "标记为旧的"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr "职位空缺"
+msgstr "职务"
 
 #. module: hr
 #: view:hr.job:0
@@ -99,7 +99,7 @@ msgstr "正在招聘"
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr "职位"
+msgstr "标题"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -134,17 +134,17 @@ msgstr "员工婚姻状况"
 msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
-msgstr "跟当前雇员关联的业务伙伴信息，跟当前员工相关的财务事务将写到此业务伙伴上。"
+msgstr "跟当前员工关联的业务伙伴信息，跟当前员工相关的财务事务将写到此业务伙伴上。"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr "链接一个用户信息到一个员工信息"
+msgstr "链接一个员工信息到一个用户信息上"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr "雇员合同"
+msgstr "员工合同"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
@@ -154,7 +154,7 @@ msgstr "通用工资表系统"
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr "我的部门雇员"
+msgstr "我的部门员工"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
@@ -165,12 +165,12 @@ msgstr "已婚"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr "错误！您不能选择该雇员担任经理的部门。"
+msgstr "错误！您不能选择一部门因为该员工是经理。"
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr "雇员护照信息"
+msgstr "员工护照信息"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -178,7 +178,7 @@ msgid ""
 "Your Company's Department Structure is used to manage all documents related "
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
-msgstr "您公司的部门结构用于管理所有需要按部门分类的员工相关单据：报销单、工作时间表、请假管理、招聘等等"
+msgstr "您公司的部门结构用于管理所有需要按部门分类的员工相关单据：报销单、计工单、请假管理、招聘等等"
 
 #. module: hr
 #: view:hr.employee:0
@@ -188,14 +188,14 @@ msgstr "职位"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "员工层次"
+msgstr "员工等级"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
 msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
-msgstr "此用户字段允许连接到一个系统用户（包括他/她的权限）到此雇员。"
+msgstr "系统用户的员工字段（包括他的权限）。"
 
 #. module: hr
 #: view:hr.job:0
@@ -211,7 +211,7 @@ msgstr "身份证号"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr "无雇员信息"
+msgstr "员工人数"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -222,17 +222,17 @@ msgstr "女性"
 #: help:hr.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
-msgstr "跟踪并帮助员工制定、检验时间表和考勤。"
+msgstr "跟踪和帮助员工制定、审核计工单和考勤。"
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr "试用期"
+msgstr "考评周期"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr "工作时间表列表"
+msgstr "计工单"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -247,7 +247,7 @@ msgstr "社保ID"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr "该职位相关的员工数"
+msgstr "该职位的员工数"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -257,14 +257,14 @@ msgstr "办公电话"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "子类"
+msgstr "子分类"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr "职位描述"
+msgstr "职务描述"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -282,7 +282,7 @@ msgstr "员工"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -303,7 +303,7 @@ msgstr "出生日期"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "报告"
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
@@ -313,20 +313,20 @@ msgstr "ir.actions.act_window"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr "人事管理一览表"
+msgstr "人力资源控制台"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr "工作"
+msgstr "职务"
 
 #. module: hr
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr "成员"
+msgstr "所有成员"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -338,7 +338,7 @@ msgstr "设置"
 msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
-msgstr "您可以安装一些人事相关模块来增强基本的人事管理应用程序。"
+msgstr "您可以安装一些和人力资源相关的模块来增强人力资源的应用。"
 
 #. module: hr
 #: view:hr.employee:0
@@ -348,7 +348,7 @@ msgstr "分类"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr "预期的雇员"
+msgstr "预期员工数"
 
 #. module: hr
 #: help:hr.employee,sinid:0
@@ -368,7 +368,7 @@ msgstr "上级分类"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr "错误！您不能创建循环分类。"
+msgstr "错误！您不能创建递归分类。"
 
 #. module: hr
 #: view:hr.department:0
@@ -387,7 +387,7 @@ msgstr "员工联系方式"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr "我的面板"
+msgstr "我的控制台"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -397,7 +397,7 @@ msgstr "男性"
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -409,7 +409,7 @@ msgstr "员工分类"
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "员工类别"
+msgstr "员工分类"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
@@ -419,14 +419,14 @@ msgstr "图片"
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr "劳动合同"
+msgstr "员工合约"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
 msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
-msgstr "允许您周期性评估和复审员工。"
+msgstr "允许您创建和管理考评周期和执行员工的审查。"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -463,11 +463,16 @@ 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 ""
+"在这您能管理您创建的员工指定工作和在系统中设定的具体属性。维护所有员工信息并保留需要的任何跟踪的记录。\r\n"
+"  个人信息标签将帮助您维护他们的身份数据。\r\n"
+"  分类标签让您有可以根据员工的职务和在公司中的工作指定相关的员工的类别，它能确认员工在公司或部门中的年资水平。\r\n"
+"  计工单标签将指定一个具体的工作时间表和辅助核算账，在那它们将能输入时间。\r\n"
+"  备注标签，您可以为特定的员工录入文字记录。"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr "员工工资帐号"
+msgstr "银行支付员工工资的科目"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -492,7 +497,7 @@ msgstr "工作地址"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr "人事经理一览表"
+msgstr "人力资源经理控制台"
 
 #. module: hr
 #: view:hr.employee:0
@@ -502,7 +507,7 @@ msgstr "状态"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr "配置"
+msgstr "设置"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -528,12 +533,12 @@ msgstr "社保号"
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "错误:你不能创建递归的员工"
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr
 #: view:hr.department:0
@@ -552,10 +557,10 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    人力资源管理模块，您可以管理:\n"
-"    * 员工信息与员工级次：您可以定义您的员工信息并包含登录用户及显示级次。\n"
-"    * 部门信息\n"
-"    * 职位信息\n"
+"    人力资源管理模块，您可以管理: \n"
+"    * 员工与员工等级：您可以设置您的员工的用户和等级。\n"
+"    * 部门信息 \n"
+"    * 职务信息\n"
 "    "
 
 #. module: hr
@@ -563,17 +568,17 @@ msgstr ""
 msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
-msgstr "员工信息表单里有多种不同的信息如联系人信息。"
+msgstr "员工信息表单里有多种不同的信息如联系信息。"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr "该职位需要的总雇员数量。"
+msgstr "该职务需要的员工数。"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr "老的"
+msgstr "旧的"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
@@ -603,12 +608,12 @@ msgstr "婚姻状况"
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr "帮助您管理并流水化您的招聘流程。"
+msgstr "帮助您管理并精简您的招聘流程。"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr "员工表单与组成结构"
+msgstr "员工组成与结构"
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -645,7 +650,7 @@ msgstr "当前活动"
 msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
-msgstr "跟踪与管理员工开支，如果相关会计项目可用的情况下可以自动重新开发票给客户"
+msgstr "跟踪与管理员工开支，如果相关会计项目许可自动重新开发票给客户"
 
 #. module: hr
 #: view:hr.job:0
@@ -671,7 +676,7 @@ msgstr "家庭地址"
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr "考勤列表"
+msgstr "考勤"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
@@ -687,7 +692,7 @@ msgstr "扩展员工档案帮助您管理员工的联系信息。"
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr "工资表"
+msgstr "薪酬"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
@@ -697,7 +702,7 @@ msgstr "单身"
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr "职位名称"
+msgstr "职务名称"
 
 #. module: hr
 #: view:hr.job:0
@@ -735,7 +740,7 @@ msgstr "hr.installer"
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr "人事经理一览表"
+msgstr "人力资源经理控制台"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -746,7 +751,7 @@ msgstr "资源"
 #: view:hr.installer:0
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr "人力资源应用配置"
+msgstr "人力资源应用设置"
 
 #. module: hr
 #: field:hr.employee,gender:0
@@ -777,12 +782,12 @@ msgstr "部门名称"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr "社会安全号"
+msgstr "社会保险号"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr "创建 OpenERP 用户"
+msgstr "创建系统用户"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -804,29 +809,29 @@ msgstr "师傅"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr "配置您的人力资源管理应用"
+msgstr "设置您的人力资源管理应用"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr "支出"
+msgstr "费用"
 
 #. module: hr
 #: field:hr.department,manager_id:0
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr "主管"
+msgstr "经理"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr "鳏夫"
+msgstr "离婚男子"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr "整合财务的通用工资表系统"
+msgstr "整合财务的通用薪酬系统"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
@@ -923,25 +928,6 @@ msgstr "下属"
 #~ msgid "Wednesday"
 #~ msgstr "三"
 
-#~ msgid ""
-#~ "\n"
-#~ "    Module for human resource management. You can manage:\n"
-#~ "    * Employees and hierarchies\n"
-#~ "    * Work hours sheets\n"
-#~ "    * Attendances and sign in/out system\n"
-#~ "\n"
-#~ "    Different reports are also provided, mainly for attendance statistics.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    人力资源模块你能管理:\n"
-#~ "                  * 员工和职位\n"
-#~ "                  * 工时表\n"
-#~ "                  * 出勤和登入/登出系统\n"
-#~ "\n"
-#~ "   提供的不同报表主要为考勤统计.\n"
-#~ "    "
-
 #~ msgid "Thursday"
 #~ msgstr "四"
 
@@ -972,6 +958,3 @@ msgstr "下属"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件!"
-
-#~ msgid "Passport"
-#~ msgstr "护照"
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index dc3240aa47b..63684d55772 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,7 +25,7 @@ msgstr ""
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "要求"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -35,12 +35,12 @@ msgstr ""
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "將員工連結至資料"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "社會保險號碼（加拿大）"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -49,13 +49,13 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "人力資源"
 
 #. module: hr
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "分組根據..."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -74,7 +74,7 @@ msgstr ""
 #: field:hr.job,department_id:0
 #: view:res.users:0
 msgid "Department"
-msgstr ""
+msgstr "部門"
 
 #. module: hr
 #: help:hr.installer,hr_attendance:0
@@ -89,17 +89,17 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "工作"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "正招聘"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "職銜"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -107,7 +107,7 @@ msgstr ""
 #: view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
@@ -117,7 +117,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "假期"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
@@ -127,7 +127,7 @@ msgstr ""
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "僱員婚姻狀況"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -144,22 +144,22 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "僱傭合約"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "通用薪酬系統。"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "我部門之員工"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "已婚"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "員工護照資料"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -201,22 +201,22 @@ msgstr ""
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "正招聘"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "身份證號碼"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "員工數目"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr ""
+msgstr "女"
 
 #. module: hr
 #: help:hr.installer,hr_timesheet_sheet:0
@@ -252,24 +252,24 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr ""
+msgstr "辦公電話"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "下級分類"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "工作說明"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "辦公室位置"
 
 #. module: hr
 #: view:hr.employee:0
@@ -277,33 +277,33 @@ msgstr ""
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr ""
+msgstr "員工"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "其他資料"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "辦公電郵"
 
 #. module: hr
 #: field:hr.department,complete_name:0
 #: field:hr.employee.category,complete_name:0
 msgid "Name"
-msgstr "名称"
+msgstr "名稱"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "出生日期"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "上司"
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
@@ -320,13 +320,13 @@ msgstr ""
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "工作"
 
 #. module: hr
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr ""
+msgstr "成員"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -343,27 +343,27 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "分類"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "預期員工數目"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "社會保險號碼（加拿大）"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
 msgid "Divorced"
-msgstr ""
+msgstr "離婚"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "上級分類"
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -377,12 +377,12 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr ""
+msgstr "部門"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "員工聯絡資料"
 
 #. module: hr
 #: view:board.board:0
@@ -392,7 +392,7 @@ msgstr ""
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr ""
+msgstr "男"
 
 #. module: hr
 #: field:hr.installer,progress:0
@@ -403,23 +403,23 @@ msgstr ""
 #: 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 ""
+msgstr "員工分類"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "員工分類"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "圖像"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "僱傭合約"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -441,13 +441,13 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "招聘進度"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -467,12 +467,12 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "員工銀行支薪帳戶"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "備註"
 
 #. module: hr
 #: constraint:res.users:0
@@ -482,22 +482,22 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "聯絡資料"
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr ""
+msgstr "辦公地址"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "人力資源經理儀錶板"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr ""
+msgstr "狀況"
 
 #. module: hr
 #: view:hr.installer:0
@@ -508,27 +508,27 @@ msgstr ""
 #: 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 "分類結構"
 
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "不詳"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "假期 / 請假管理"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr ""
+msgstr "社會保障號碼（美國）"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr "活动的"
+msgstr "活躍"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -538,7 +538,7 @@ msgstr ""
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: hr
 #: model:ir.module.module,description:hr.module_meta_information
@@ -557,12 +557,12 @@ msgstr ""
 msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
-msgstr ""
+msgstr "員工表單內有多種資料，如聯絡資料。"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "此工作需要之員工總數。"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -572,7 +572,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "狀況說明"
 
 #. module: hr
 #: sql_constraint:res.users:0
@@ -592,7 +592,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr.action_hr_marital_status
 #: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
-msgstr ""
+msgstr "婚姻狀況"
 
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
@@ -607,7 +607,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "相片"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
@@ -617,22 +617,22 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "薪酬會計"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr ""
+msgstr "個人資料"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "護照號碼"
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "當前動態"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -644,22 +644,22 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "當前"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "上級部門"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr ""
+msgstr "員工分類"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "住家地址"
 
 #. module: hr
 #: field:hr.installer,hr_attendance:0
@@ -671,7 +671,7 @@ msgstr ""
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
@@ -681,17 +681,17 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "薪酬"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "單身"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "工作名稱"
 
 #. module: hr
 #: view:hr.job:0
@@ -702,24 +702,24 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Mobile"
-msgstr ""
+msgstr "手提電話"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr ""
+msgstr "部門"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "國籍"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "備註"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
@@ -734,7 +734,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "資源"
 
 #. module: hr
 #: view:hr.installer:0
@@ -745,7 +745,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr ""
+msgstr "性別"
 
 #. module: hr
 #: view:hr.employee:0
@@ -756,7 +756,7 @@ msgstr ""
 #: 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 ""
+msgstr "員工"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -766,12 +766,12 @@ msgstr ""
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr ""
+msgstr "部門名稱"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "社會保障號碼（美國）"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -781,7 +781,7 @@ msgstr ""
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "下級部門"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -793,7 +793,7 @@ msgstr ""
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "指導者"
 
 #. module: hr
 #: view:hr.installer:0
@@ -810,22 +810,22 @@ msgstr ""
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "經理"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "鰥寡"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "整合會計制度之通用薪酬系統。"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "下屬"
 
 #~ msgid "Group name"
 #~ msgstr "小组名称"
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
deleted file mode 100644
index 3916acaeb1e..00000000000
--- a/addons/hr/installer.py
+++ /dev/null
@@ -1,52 +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 osv import fields, osv
-
-class hr_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        # Human Resources Management
-        'hr_holidays': fields.boolean('Leaves Management',
-            help="Tracks employee leaves, allocation requests and planning."),
-        'hr_expense': fields.boolean('Expenses',
-            help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'hr_recruitment': fields.boolean('Recruitment Process',
-            help="Helps you manage and streamline your recruitment process."),
-        'hr_timesheet_sheet':fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'hr_contract': fields.boolean("Employee's Contracts",
-            help="Extends employee profiles to help manage their contracts."),
-        'hr_evaluation': fields.boolean('Periodic Evaluations',
-            help="Lets you create and manage the periodic evaluation and "
-                 "performance review of employees."),
-        'hr_attendance': fields.boolean('Attendances',
-            help="Simplifies the management of employee's attendances."),
-        'hr_payroll': fields.boolean('Payroll',
-            help="Generic Payroll system."),
-        'hr_payroll_account': fields.boolean('Payroll Accounting',
-            help="Generic Payroll system Integrated with Accountings."),
-        }
-hr_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 1ec0e42c47e..8e77830184b 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+    <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / HR Officer</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Human Resources / HR Manager</field>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
-
-</data>
+    <record id="hr_dept_comp_rule" model="ir.rule">
+        <field name="name">Department multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_hr_department"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    <record id="hr_job_comp_rule" model="ir.rule">
+        <field name="name">Job multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_hr_job"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    
+    </data>
 </openerp>
diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml
index 0ddcd7687d3..0e5ae559416 100644
--- a/addons/hr/test/test_hr.yml
+++ b/addons/hr/test/test_hr.yml
@@ -1,13 +1,13 @@
 -
-  In order to test  hr module in OpenERP, I will create new Employee , Department and Job Position.
+  In order to test hr module in OpenERP, I will create new Employee, Department and Job Position.
 -
-  I create "R&D Department"  in Department form.
+  I create "RD Department" in Department form.
 -
   !record {model: hr.department, id: hr_department_rd0}:
     manager_id: base.user_root
     name: 'R & D'
 -
-  Now, I  create a new employee “Mark Johnson”, and select department as "R&D Department".
+  Now, I create a new employee Mark Johnson, and select department as RD Department.
 -
   !record {model: hr.employee, id: hr_employee_mark}:
     address_home_id: base.res_partner_address_1
@@ -15,10 +15,40 @@
     gender: male
     marital: 'single'
     name: Mark Johnson
-    user_id: base.user_root
-    department_id: 'hr_department_rd0'
 -
-  In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves ” and select "Mark Johnson" as
+  I change the company of the employee.
+-
+  !python {model: hr.employee}: |
+    res = self.onchange_company(cr, uid, [ref('hr_employee_mark')], ref('base.main_company'), None)
+    values = dict([('company_id', ref('base.main_company'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
+-
+  I assign department for employee Mark Johnson.
+-
+  !python {model: hr.employee}: |
+    res = self.onchange_department_id(cr, uid, [ref('hr_employee_mark')], ref('hr_department_rd0'), None)
+    assert res['value']['parent_id']
+    values = dict([('department_id', ref('hr_department_rd0'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
+-
+  Now I create a user for employee Mark Johnson.
+-
+  !record {model: res.users, id: hr_users_markjohnson0}:
+    context_lang: en_US
+    groups_id:
+      - base.group_user
+    login: markjohnson
+    name: Mark Johnson
+    password: markjohnson
+-
+  I assign user to employee Mark Johnson.
+-
+  !python {model: hr.employee}: |
+    res = self.onchange_user(cr, uid, [ref('hr_employee_mark')], ref('hr_users_markjohnson0'), None)
+    values = dict([('user_id', ref('hr_users_markjohnson0'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
+-
+  In order to check the wizard Employee Hierarchy , I will create new employee Phil Graves and select Mark Johnson as
   Manager.
 -
   !record {model: hr.employee, id: hr_employee_phil}:
@@ -29,11 +59,19 @@
     user_id: base.user_demo
     parent_id: 'hr_employee_mark'
 -
-  I will open up form view of  “Mark Johnson” and test the wizard “Employee Hierarchy” so it display the employee
-  hierarchy starting from “Mark Johnson”.
+  I fill the Working address for Employee.
+-
+  !python {model: hr.employee}: |
+    res = self.onchange_address_id(cr, uid, ref('hr_employee_phil'), ref('base.res_partner_address_3000'), None)
+    assert res['value']
+    values = dict([('address_id', ref('base.res_partner_address_3000'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_employee_phil')], values, None)
+-
+  I will open up form view of  Mark Johnson and test the wizard Employee Hierarchy so it display the employee
+  hierarchy starting from Mark Johnson.
 
 -
-  I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
+  I will create new Job Position. I will check successful creation of new Job Position by adding the information.
 -
   !record {model: hr.job, id: hr_job_jea0}:
     department_id: 'hr_department_rd0'
@@ -45,7 +83,6 @@
 -
   !assert {model: hr.job, id: hr_job_jea0}:
     - state == 'open'
-
 -
   I create Employee for job position.
 -
@@ -61,3 +98,43 @@
 -
   !assert {model: hr.job, id: hr_job_jea0}:
     - no_of_employee != False
+-
+  As more requirements on the said job position are come, I increase the number of expected employees.
+-
+  !python {model: hr.job}: |
+    res = self.on_change_expected_employee(cr, uid, [ref('hr_job_jea0')], 6, 3, None)
+    assert res['value']['expected_employees']
+    values = dict([('expected_employees', ref('hr_job_jea0'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_job_jea0')], values, None)
+-
+  I open the job position for recruitment.
+-
+  !python {model: hr.job}: |
+    self.job_recruitement(cr, uid, [ref('hr_job_jea0')])
+-
+  I assign the job position to employee and mark the position.
+-
+  !python {model: hr.job}: |
+    self.job_open(cr, uid, [ref('hr_job_jea0')])
+-
+  Now the process is over so I don't want to use this position. I mark it as Old.
+-
+  !python {model: hr.job}: |
+    self.job_old(cr, uid, [ref('hr_job_jea0')])
+-
+  I create a parent category for the new recruited employees who are Freshers.
+-
+  !record {model: hr.employee.category, id: hr_employee_category_fresher0}:
+    name: Fresher
+-
+  I create another category for Junior Level freshers.
+-
+  !record {model: hr.employee.category, id: hr_employee_category_juniorlevel0}:
+    name: Junior Level
+    parent_id: hr_employee_category_fresher0
+-
+  I open the tree view of Categories and see the categories in a hierarchical manner.
+-
+  !python {model: hr.employee.category}: |
+    res = self.name_get(cr, uid, [ref('hr_employee_category_juniorlevel0')], None)
+    assert res
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index f7111fdb191..5f0054c3634 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Attendances Of Employees',
+    'name': 'Attendance',
     'version': '1.1',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 0affdde9e73..a264f9c0331 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -50,9 +50,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name::date','=',current_date)]" />
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="name"/>
@@ -68,7 +68,7 @@
         </record>
 
         <record id="open_view_attendance" model="ir.actions.act_window">
-            <field name="name">Attendances</field>
+            <field name="name">Attendance</field>
             <field name="res_model">hr.attendance</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -79,7 +79,7 @@
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3" 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="4" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
+        <menuitem id="menu_hr_attendance" name="Attendance" parent="hr.menu_hr_root" sequence="4" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
         <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
 
@@ -116,8 +116,8 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem 
-            sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances"
+        <menuitem
+            sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
             groups="base.group_extended"/>
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
 
diff --git a/addons/hr_attendance/i18n/ar.po b/addons/hr_attendance/i18n/ar.po
index a52cde22c0b..9e03bbcd995 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 88d249de1b4..731a560910d 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a2101f7b3a2..fdb419d32b5 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fe36f2c0ce4..93591e43a26 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e3ffc1704f1..9f1f4558baf 100644
--- a/addons/hr_attendance/i18n/cs.po
+++ b/addons/hr_attendance/i18n/cs.po
@@ -4,37 +4,38 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"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: 2009-11-17 07:22+0000\n"
-"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-16 09:10+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: czech\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "Časové sledování"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
-msgstr ""
+msgstr "Dnes"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -42,32 +43,33 @@ msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
 msgstr ""
+"Posledně jste se neodhlásil. Prosíme zadejte datum a čas vašeho odhlášení."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Total period:"
-msgstr ""
+msgstr "Celkové období:"
 
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Důvod"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr ""
+msgstr "Tisknout Výkaz chyba docházky"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
 #, python-format
 msgid "The sign-out date must be in the past"
-msgstr ""
+msgstr "Datum odhlášení musí být v minulosti"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Signed"
-msgstr ""
+msgstr "Datum přihlášení"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
@@ -76,66 +78,69 @@ msgid ""
 "Sign in/Sign out actions. You can also link this feature to an attendance "
 "device using OpenERP's web service features."
 msgstr ""
+"Funkce sledování času má za cíl spravovat docházku zaměstnanců pomocí akcí "
+"Přihlášení/Odhlášení. Můžete napojit tuto schopnost k docházkovému zařízení "
+"s použitím možností webové služby OpenERP."
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr ""
+msgstr "Důvody docházky"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.attendance,day:0
 msgid "Day"
-msgstr ""
+msgstr "Den"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr ""
+msgstr "Přítomný"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
 msgid "Ask for Sign In Out"
-msgstr ""
+msgstr "Zeptat se na odhlášení"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action Reason"
-msgstr ""
+msgstr "Důvod akce"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr ""
+msgstr "Určuje důvod docházky"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Chyba ! Nemůžete vybrat oddělení, pro které je zaměstnanec vedoucím."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "Docházka podle měsíce"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Jméno zaměstnance"
 
 #. 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 ""
+msgstr "Dovody docházky"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
@@ -144,7 +149,7 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "UserError"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,end_date:0
@@ -155,31 +160,31 @@ msgstr "Koncové datum"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendance"
-msgstr ""
+msgstr "Docházka zaměstnance"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varování"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
 #, python-format
 msgid "The Sign-in date must be in the past"
-msgstr ""
+msgstr "Datum přihlášení musí být v minulosti"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+msgstr "Přihlášení musí být ihned po odhlášení !"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr ""
+msgstr "Docházka"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
@@ -190,12 +195,12 @@ msgstr "Max. zpoždění (minut)"
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
-msgstr ""
+msgstr "Tisk"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
-msgstr ""
+msgstr "Vyhledávání v docházce"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -206,22 +211,29 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Tento modul se zaměřuje na správu docházky zaměstnanců.\n"
+"    Udržuje docházkové účty zaměstnanců na základě\n"
+"    jimi vykonaných akcí (Přihlásit/Odhlásit).\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Chyba: Přihlášení (resp. Odhlášení) musé následovat za Odhlášením (resp. "
+"Přihlášením)"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
 #. 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 ""
+msgstr "Výkaz chyb docházky"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
@@ -232,61 +244,62 @@ msgstr "Počáteční datum"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr ""
+msgstr "Min. zpoždění"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
 #: view:hr.employee:0
 msgid "Sign In"
-msgstr ""
+msgstr "Přihlášení"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Operation"
-msgstr ""
+msgstr "Operace"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "Žádná data"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "September"
-msgstr ""
+msgstr "Září"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #. module: hr_attendance
 #: field:hr.attendance.month,month:0
 msgid "Month"
-msgstr ""
+msgstr "Měsíc"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A negative delay means that the employee worked more than encoded."
 msgstr ""
+"(*) Záporné zpoždění znamená, že zaměstnanec pracoval déle než bylo zadáno."
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
 msgid ""
 "Specifies the reason for Signing In/Signing Out in case of extra hours."
-msgstr ""
+msgstr "Určuje důvod pro Přihlášení/Odhlášení v případě hodin navíc."
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Tisknout měsíční výkaz docházky"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "Přihlásit Odhlásit"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -302,91 +315,91 @@ msgstr "Přihlásit / Odhlásit"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
-msgstr ""
+msgstr "hr.sign.out.ask"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr ""
+msgstr "Odhlášení musí být hned po přihlášení !"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "Tisknout chybový výkaz docházky"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr ""
+msgstr "Docházky zaměstnanců"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní Hierarchii zaměstnanců"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Moje docházka"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
 #. 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 "Přihlásit se(Sign in)"
+msgstr "Přihlásit"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Analysis Information"
-msgstr ""
+msgstr "Analytické informace"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "Položka Odhlášení musí následovat za Přihlášením."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr ""
+msgstr "Chyby docházky"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr ""
+msgstr "Akce"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
@@ -396,21 +409,25 @@ msgid ""
 "tool. If each employee has been linked to a system user, then they can "
 "encode their time with this action button."
 msgstr ""
+"Pokud potřebujete, aby se vaši zaměstnanci přihlašovali při příchodu do "
+"práce a zase odhlašovali na konci dne, OpenERP vám pomocí tohoto nástroje "
+"toto umožní spravovat. Pokud byl každý zaměstnanec napojen na systémový "
+"účet, pak může vkládat svůj čas pomocí tohoto tlačítka."
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID zaměstnance"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "Tisknout týdení výkaz docházky"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "ID zaměstance"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -418,41 +435,42 @@ msgstr ""
 #: view:hr.sign.in.out:0
 #: view:hr.sign.in.out.ask:0
 msgid "Cancel"
-msgstr "Storno"
+msgstr "Zrušit"
 
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Určuje důvod pro Přihlášení/Odhlášení."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
+"(*) Kladné zpoždění znamená, že zaměstnanec pracoval méně než zaznamenáno."
 
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Tisknout výkaz docházky měsíčně"
 
 #. 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 "Odhlásit(Sign out)"
+msgstr "Odhlásit"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Delay"
-msgstr ""
+msgstr "Zpoždění"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: model:ir.model,name:hr_attendance.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Zaměstnanec"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
@@ -461,40 +479,42 @@ msgid ""
 "You tried to %s with a date anterior to another event !\n"
 "Try to contact the administrator to correct attendances."
 msgstr ""
+"Pokusili jste se %s s datem dřívějším než jiné události !\n"
+"Zkuste kontaktovat správce pro opravu docházky."
 
 #. 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 "Naposledy jste se přihlásil(Your last sign out)"
+msgstr "Vaše poslední odhlášení"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Datum zaznamenání"
 
 #. 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 ""
+msgstr "Docházka"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "Your last sign in"
-msgstr "Naposledy jste se přihlásil"
+msgstr "Vaše poslední přihlášení"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
 #: view:hr.employee:0
 msgid "Sign Out"
-msgstr ""
+msgstr "Odhlášení"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
@@ -504,52 +524,56 @@ msgid ""
 "has been linked to a system user, then they can encode their time with this "
 "action button."
 msgstr ""
+"Přihlášení / Odhlášení. V některých společnostech, pracovníci se musí "
+"přihlásit, když dorazí do práce a zase odhlásit na konci dne. Pokud byl "
+"každý zaměstnanec napojen na systémový účet, pak může zadávat svůj čas "
+"pomocí tohoto akčního tlačítka."
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Jméno zaměstnance"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr ""
+msgstr "Nepřítomen"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr ""
+msgstr "Typ akce"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendances"
-msgstr ""
+msgstr "Docházka zaměstnance"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,state:0
 msgid "Current state"
-msgstr "Současný stav(Current state)"
+msgstr "Současný stav"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
+msgstr "Pod tímto zpožděním, chyba je považována za úmyslnou"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "Pro výběr roku nebyly nalezeny žádné záznamy!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -557,16 +581,17 @@ msgid ""
 "You did not sign in the last time. Please enter the date and time you signed "
 "in."
 msgstr ""
+"Naposledy jste se nepřihlásil. Prosíme zadejte datum a čas vašeho přihlášení."
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
-msgstr ""
+msgstr "hr.sign.in.out.ask"
 
 #~ msgid "You are now ready to sign in or out of the attendance follow up"
 #~ msgstr ""
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index 1b5f519adb7..3681f156618 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -698,33 +698,3 @@ msgstr "hr.sign.in.out.ask"
 #~ msgstr ""
 #~ "Sie können ab sofort Anmeldungen oder Abmeldungen erfassen und die "
 #~ "entsprechenden Anwesenheitszeiten einsehen und rekapitulieren."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "Time Tracking functionality aims to manage employee's attendances on the "
-#~ "basis of the actions (Sign in/Sign out) performed by them. You can also link "
-#~ "this to an attendance machine using OpenERP's webservices features."
-#~ msgstr ""
-#~ "Die Funktion der Zeiterfassung ermöglicht auf einfachem Wege durch An- und "
-#~ "Abmelden eine automatische Ermittlung der Anwesenheit von Mitarbeitern. "
-#~ "Diese Funktion ist auch geeignet, um über die Webservices von OpenERP, "
-#~ "externe Zeiterfassungsgeräte anzubinden."
diff --git a/addons/hr_attendance/i18n/el.po b/addons/hr_attendance/i18n/el.po
index d2a6573e3bd..15e8e2dfa41 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 73c7e518cf5..d51891fbfed 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -689,13 +689,3 @@ msgstr "hr.sign.in.out.ask"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "Time Tracking functionality aims to manage employee's attendances on the "
-#~ "basis of the actions (Sign in/Sign out) performed by them. You can also link "
-#~ "this to an attendance machine using OpenERP's webservices features."
-#~ msgstr ""
-#~ "La funcionalidad de seguimiento del tiempo permite gestionar las asistencias "
-#~ "de los empleados mediante los registros (entrada / salida) que realizan. "
-#~ "También se puede conectar a una máquina de registro de asistencia utilizando "
-#~ "las prestaciones de los servicios web de OpenERP."
diff --git a/addons/hr_attendance/i18n/es_AR.po b/addons/hr_attendance/i18n/es_AR.po
index d14402b59ae..b9ffd7e1114 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..92ca13ba2bd
--- /dev/null
+++ b/addons/hr_attendance/i18n/es_CL.po
@@ -0,0 +1,584 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-25 14:27+0000\n"
+"Last-Translator: Juano <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: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Control de Tiempo"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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 ""
+"No registró la salida la última vez. Por favor, introduzca la fecha y hora "
+"de la salida."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Total periodo:"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Imprimir informe errores asistenciales"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr ""
+"La fecha del registro de salida debe ser en el pasado o en tiempo pasado."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Fecha registro"
+
+#. 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 ""
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Presente"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Preguntar para registrar entrada / salida"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Razón de la acción"
+
+#. 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 "Defina el motivo de la ausencia"
+
+#. module: hr_attendance
+#: 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 para el cual el empleado sea el "
+"responsable o director."
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+msgid "Attendances By Month"
+msgstr "Asistencia por mes"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Nombre empleados"
+
+#. 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 "Causas de asistencia/ausencia"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "UserError"
+msgstr "Error del usuario"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendance"
+msgstr "Asistencia del empleado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid "Warning"
+msgstr "Alerta"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "La fecha del registro de entrada debe ser anterior o en el pasado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "¡Un registro de entrada debe estar después de un registro de salida!"
+
+#. module: hr_attendance
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr "Asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Máx. retraso (minutos)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Buscar Asistencia RH"
+
+#. module: hr_attendance
+#: model:ir.module.module,description:hr_attendance.module_meta_information
+msgid ""
+"\n"
+"    This module aims to manage employee's attendances.\n"
+"    Keeps account of the attendances of the employees on the basis of the\n"
+"    actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+"\n"
+"    Este módulo sirve para gestionar la asistencia de los empleados.\n"
+"    Controla la asistencia de los empleados mediante las acciones\n"
+"    (Registrar entrada/Registrar salida) realizadas por ellos.\n"
+"       "
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "julio"
+
+#. 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 "Reporte/Informe errores de asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Mín. retraso"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Entrar"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "septiembre"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "diciembre"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) Un retraso negativo significa que el empleado trabajó más horas de las "
+"codificadas."
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Especifique la razón de entrada y salida en el caso de horas extras."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Imprimir informe mensual de asistencias"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "Entrada Salida"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:125
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:141
+#: 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 "Registrar entrada/salida"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "agosto"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "¡Un registro de salida debe estar después de un registro de entrada!"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "junio"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Error en la impresión del informe de asistencia"
+
+#. module: hr_attendance
+#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
+msgid "Attendances Of Employees"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendances"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+msgid "Employee ID"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign out"
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+#: field:hr.sign.in.out.ask,last_time:0
+msgid "Your last sign out"
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action's type"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records found for your selection!"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr ""
diff --git a/addons/hr_attendance/i18n/es_EC.po b/addons/hr_attendance/i18n/es_EC.po
index 41def0b632e..0ca0f7051c8 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_MX.po b/addons/hr_attendance/i18n/es_MX.po
new file mode 100644
index 00000000000..da928f35775
--- /dev/null
+++ b/addons/hr_attendance/i18n/es_MX.po
@@ -0,0 +1,691 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_attendance
+#
+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-13 01:36+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: 2011-09-05 05:38+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Seguimiento de tiempo"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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 ""
+"No ha registrado la salida la última vez. Por favor, introduzca la fecha y "
+"hora de la salida."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Total periodo:"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Imprimir informe errores presencias"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "La fecha del registro de salida debe ser en el pasado"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Fecha registro"
+
+#. 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 ""
+"La funcionalidad de Seguimiento de Tiempos le permite gestionar las "
+"asistencias de los empleados a través de las acciones de Registrar "
+"Entrada/Registrar Salida. También puede enlazar esta funcionalidad con un "
+"dispositivo de registro de asistencia usando las características del "
+"servicio web de OpenERP."
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "Causas de asistencia/ausencia"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Actual"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Preguntar para registrar entrada / salida"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Razón de la acción"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "Defina motivo ausencia"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"¡Error! No puede seleccionar un departamento que tenga el empleado como "
+"responsable."
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+msgid "Attendances By Month"
+msgstr "Presencias por mes"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Nombre empleado"
+
+#. 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 "Causas de asistencia/ausencia"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendance"
+msgstr "Asistencia empleado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "La fecha del registro de entrada debe ser en el pasado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "¡Un registro de entrada debe estar después de un registro de salida!"
+
+#. module: hr_attendance
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr "Asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Máx. retraso (minutos)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Buscar presencias RH"
+
+#. module: hr_attendance
+#: model:ir.module.module,description:hr_attendance.module_meta_information
+msgid ""
+"\n"
+"    This module aims to manage employee's attendances.\n"
+"    Keeps account of the attendances of the employees on the basis of the\n"
+"    actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+"\n"
+"    Este módulo sirve para gestionar la asistencia de los empleados.\n"
+"    Controla la asistencia de los empleados mediante las acciones\n"
+"    (Registrar entrada/Registrar salida) realizadas por ellos.\n"
+"       "
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "Julio"
+
+#. 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 "Informe errores de asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Mín. retraso"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Registrar entrada"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available"
+msgstr "No hay datos disponibles"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) Un retraso negativo significa que el empleado trabajó más horas de las "
+"codificadas."
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Especifique la razón de entrada y salida en el caso de horas extras."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Imprimir informe mensual de asistencias"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "Entrada Salida"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:125
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:141
+#: 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 "Registrar entrada/salida"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "hr.sign.out.ask"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "¡Un registro de salida debe estar después de un registro de entrada!"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Error en la impresión del informe de asistencia"
+
+#. module: hr_attendance
+#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
+msgid "Attendances Of Employees"
+msgstr "Asistencia de empleados"
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendances"
+msgstr "Mis presencias"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "Enero"
+
+#. 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 "Registrar entrada"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "Información para el análisis"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-Out Entry must follow Sign-In."
+msgstr "El registro de entrada debe seguir al registro de salida."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "Errores de asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. 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 ""
+"Si necesita que su personal fiche al inicio y al final de la jornada "
+"laboral, esta herramienta de OpenERP le permite efectuar esta gestión. Si "
+"cada empleado se ha vinculado a un usuario del sistema, se puede controlar "
+"su jornada con este botón de acción."
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+msgid "Employee ID"
+msgstr "ID empleado"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "Imprimir informe de presencia semanal"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "ID empleado"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "Indique el motivo de la entrada/salida."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+"(*) Un valor positivo significa que el empleado ha trabajado menos que lo "
+"programado."
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "Imprimir informe de asistencia mensualmente"
+
+#. 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 "Registrar salida"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr "Retraso"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"Ha intentado %s con una fecha anterior a otro evento!\n"
+"Trata de ponerte en contacto con el administrador para corregir las "
+"asistencias."
+
+#. 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 "Su último registro salida"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr "Fecha registrada"
+
+#. 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 "Servicios"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr "Su último registro entrada"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr "Registrar salida"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+"Entrada/Salida. En algunas empresas, el personal tiene que fichar cuando "
+"llegan al trabajo y al finalizar la jornada. Si cada empleado se ha "
+"vinculado a un usuario del sistema, se puede controlar su jornada con este "
+"botón de acción."
+
+#. module: hr_attendance
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "Ausente"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action's type"
+msgstr "Tipo de acción"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr "Asistencia empleado"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "Estado actual"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "Aunque indique esta demora, se considera que el error es voluntario"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records found for your selection!"
+msgstr "¡No se han encontrado registros en su selección!"
+
+#. 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 ""
+"No ha registrado la entrada la última vez. Por favor, introduzca la fecha y "
+"hora de la entrada."
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "hr.sign.in.out.ask"
+
+#, python-format
+#~ msgid ""
+#~ "You tried to sign with a date anterior to another event !\n"
+#~ "Try to contact the administrator to correct attendances."
+#~ msgstr ""
+#~ "¡Ha intentado registrar con una fecha anterior a otro acontecimiento!\n"
+#~ "Póngase en contacto con el administrador para corregir las asistencias."
+
+#, python-format
+#~ msgid ""
+#~ "You tried to sign out with a date anterior to another event !\n"
+#~ "Try to contact the administrator to correct attendances."
+#~ msgstr ""
+#~ "¡Ha intentado registrar una salida con una fecha anterior a otro "
+#~ "acontecimiento!\n"
+#~ "Póngase en contacto con el administrador para corregir las asistencias."
+
+#, python-format
+#~ msgid ""
+#~ "You tried to sign in with a date anterior to another event !\n"
+#~ "Try to contact the administrator to correct attendances."
+#~ msgstr ""
+#~ "¡Ha intentado registrar una entrada con una fecha anterior a otro "
+#~ "acontecimiento!\n"
+#~ "Póngase en contacto con el administrador para corregir las asistencias."
+
+#~ 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!"
+
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr ""
+#~ "Está listo para registrar las entradas y salidas en el control de asistencia"
+
+#~ msgid "Employee's name"
+#~ msgstr "Nombre empleado"
+
+#~ msgid "Print Attendance Error Report"
+#~ msgstr "Imprimir informe errores de asistencia"
+
+#~ msgid "Action reason"
+#~ msgstr "Motivo acción"
+
+#~ msgid ""
+#~ "You did not signed out the last time. Please enter the date and time you "
+#~ "signed out."
+#~ msgstr ""
+#~ "No registró la salida la última vez. Por favor, introduzca la fecha y hora "
+#~ "que salió."
+
+#~ msgid ""
+#~ "You did not signed in the last time. Please enter the date and time you "
+#~ "signed in."
+#~ msgstr ""
+#~ "No registró la entrada la última vez. Por favor, introduzca la fecha y hora "
+#~ "que entró."
+
+#~ msgid "This module aims to manage employee's attendances."
+#~ msgstr "Este módulo sirve para gestionar la asistencia de los empleados"
+
+#~ msgid "Select a time span"
+#~ msgstr "Seleccione un intervalo de tiempo"
+
+#~ msgid "Print Timesheet by month"
+#~ msgstr "Imprimir hoja de asistencia por mes"
+
+#~ msgid "Print Timesheet"
+#~ msgstr "Imprimir hoja de asistencia"
+
+#~ msgid "Print Timesheet by week"
+#~ msgstr "Imprimir hoja de asistencia por semana"
+
+#~ msgid "Select a starting and a end date"
+#~ msgstr "Seleccione una fecha inicial y final"
+
+#~ msgid "Print Attendance Report"
+#~ msgstr "Imprimir informe de asistencia"
+
+#~ msgid "Select a month"
+#~ msgstr "Seleccione un mes"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/hr_attendance/i18n/es_PY.po b/addons/hr_attendance/i18n/es_PY.po
index 25bcea9ea24..414bc206109 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_VE.po b/addons/hr_attendance/i18n/es_VE.po
new file mode 100644
index 00000000000..da928f35775
--- /dev/null
+++ b/addons/hr_attendance/i18n/es_VE.po
@@ -0,0 +1,691 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_attendance
+#
+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-13 01:36+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: 2011-09-05 05:38+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Seguimiento de tiempo"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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 ""
+"No ha registrado la salida la última vez. Por favor, introduzca la fecha y "
+"hora de la salida."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Total periodo:"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Imprimir informe errores presencias"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "La fecha del registro de salida debe ser en el pasado"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Fecha registro"
+
+#. 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 ""
+"La funcionalidad de Seguimiento de Tiempos le permite gestionar las "
+"asistencias de los empleados a través de las acciones de Registrar "
+"Entrada/Registrar Salida. También puede enlazar esta funcionalidad con un "
+"dispositivo de registro de asistencia usando las características del "
+"servicio web de OpenERP."
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "Causas de asistencia/ausencia"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Actual"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Preguntar para registrar entrada / salida"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Razón de la acción"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "Defina motivo ausencia"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"¡Error! No puede seleccionar un departamento que tenga el empleado como "
+"responsable."
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+msgid "Attendances By Month"
+msgstr "Presencias por mes"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Nombre empleado"
+
+#. 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 "Causas de asistencia/ausencia"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendance"
+msgstr "Asistencia empleado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "La fecha del registro de entrada debe ser en el pasado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "¡Un registro de entrada debe estar después de un registro de salida!"
+
+#. module: hr_attendance
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr "Asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Máx. retraso (minutos)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Buscar presencias RH"
+
+#. module: hr_attendance
+#: model:ir.module.module,description:hr_attendance.module_meta_information
+msgid ""
+"\n"
+"    This module aims to manage employee's attendances.\n"
+"    Keeps account of the attendances of the employees on the basis of the\n"
+"    actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+"\n"
+"    Este módulo sirve para gestionar la asistencia de los empleados.\n"
+"    Controla la asistencia de los empleados mediante las acciones\n"
+"    (Registrar entrada/Registrar salida) realizadas por ellos.\n"
+"       "
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "Julio"
+
+#. 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 "Informe errores de asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Mín. retraso"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Registrar entrada"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available"
+msgstr "No hay datos disponibles"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) Un retraso negativo significa que el empleado trabajó más horas de las "
+"codificadas."
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Especifique la razón de entrada y salida en el caso de horas extras."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Imprimir informe mensual de asistencias"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "Entrada Salida"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:125
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:141
+#: 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 "Registrar entrada/salida"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "hr.sign.out.ask"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "¡Un registro de salida debe estar después de un registro de entrada!"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Error en la impresión del informe de asistencia"
+
+#. module: hr_attendance
+#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
+msgid "Attendances Of Employees"
+msgstr "Asistencia de empleados"
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendances"
+msgstr "Mis presencias"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "Enero"
+
+#. 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 "Registrar entrada"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "Información para el análisis"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-Out Entry must follow Sign-In."
+msgstr "El registro de entrada debe seguir al registro de salida."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "Errores de asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. 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 ""
+"Si necesita que su personal fiche al inicio y al final de la jornada "
+"laboral, esta herramienta de OpenERP le permite efectuar esta gestión. Si "
+"cada empleado se ha vinculado a un usuario del sistema, se puede controlar "
+"su jornada con este botón de acción."
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+msgid "Employee ID"
+msgstr "ID empleado"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "Imprimir informe de presencia semanal"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "ID empleado"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "Indique el motivo de la entrada/salida."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+"(*) Un valor positivo significa que el empleado ha trabajado menos que lo "
+"programado."
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "Imprimir informe de asistencia mensualmente"
+
+#. 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 "Registrar salida"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr "Retraso"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"Ha intentado %s con una fecha anterior a otro evento!\n"
+"Trata de ponerte en contacto con el administrador para corregir las "
+"asistencias."
+
+#. 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 "Su último registro salida"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr "Fecha registrada"
+
+#. 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 "Servicios"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr "Su último registro entrada"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr "Registrar salida"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+"Entrada/Salida. En algunas empresas, el personal tiene que fichar cuando "
+"llegan al trabajo y al finalizar la jornada. Si cada empleado se ha "
+"vinculado a un usuario del sistema, se puede controlar su jornada con este "
+"botón de acción."
+
+#. module: hr_attendance
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "Ausente"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action's type"
+msgstr "Tipo de acción"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr "Asistencia empleado"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "Estado actual"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "Aunque indique esta demora, se considera que el error es voluntario"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records found for your selection!"
+msgstr "¡No se han encontrado registros en su selección!"
+
+#. 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 ""
+"No ha registrado la entrada la última vez. Por favor, introduzca la fecha y "
+"hora de la entrada."
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "hr.sign.in.out.ask"
+
+#, python-format
+#~ msgid ""
+#~ "You tried to sign with a date anterior to another event !\n"
+#~ "Try to contact the administrator to correct attendances."
+#~ msgstr ""
+#~ "¡Ha intentado registrar con una fecha anterior a otro acontecimiento!\n"
+#~ "Póngase en contacto con el administrador para corregir las asistencias."
+
+#, python-format
+#~ msgid ""
+#~ "You tried to sign out with a date anterior to another event !\n"
+#~ "Try to contact the administrator to correct attendances."
+#~ msgstr ""
+#~ "¡Ha intentado registrar una salida con una fecha anterior a otro "
+#~ "acontecimiento!\n"
+#~ "Póngase en contacto con el administrador para corregir las asistencias."
+
+#, python-format
+#~ msgid ""
+#~ "You tried to sign in with a date anterior to another event !\n"
+#~ "Try to contact the administrator to correct attendances."
+#~ msgstr ""
+#~ "¡Ha intentado registrar una entrada con una fecha anterior a otro "
+#~ "acontecimiento!\n"
+#~ "Póngase en contacto con el administrador para corregir las asistencias."
+
+#~ 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!"
+
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr ""
+#~ "Está listo para registrar las entradas y salidas en el control de asistencia"
+
+#~ msgid "Employee's name"
+#~ msgstr "Nombre empleado"
+
+#~ msgid "Print Attendance Error Report"
+#~ msgstr "Imprimir informe errores de asistencia"
+
+#~ msgid "Action reason"
+#~ msgstr "Motivo acción"
+
+#~ msgid ""
+#~ "You did not signed out the last time. Please enter the date and time you "
+#~ "signed out."
+#~ msgstr ""
+#~ "No registró la salida la última vez. Por favor, introduzca la fecha y hora "
+#~ "que salió."
+
+#~ msgid ""
+#~ "You did not signed in the last time. Please enter the date and time you "
+#~ "signed in."
+#~ msgstr ""
+#~ "No registró la entrada la última vez. Por favor, introduzca la fecha y hora "
+#~ "que entró."
+
+#~ msgid "This module aims to manage employee's attendances."
+#~ msgstr "Este módulo sirve para gestionar la asistencia de los empleados"
+
+#~ msgid "Select a time span"
+#~ msgstr "Seleccione un intervalo de tiempo"
+
+#~ msgid "Print Timesheet by month"
+#~ msgstr "Imprimir hoja de asistencia por mes"
+
+#~ msgid "Print Timesheet"
+#~ msgstr "Imprimir hoja de asistencia"
+
+#~ msgid "Print Timesheet by week"
+#~ msgstr "Imprimir hoja de asistencia por semana"
+
+#~ msgid "Select a starting and a end date"
+#~ msgstr "Seleccione una fecha inicial y final"
+
+#~ msgid "Print Attendance Report"
+#~ msgstr "Imprimir informe de asistencia"
+
+#~ msgid "Select a month"
+#~ msgstr "Seleccione un mes"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/hr_attendance/i18n/et.po b/addons/hr_attendance/i18n/et.po
index b5d95de85eb..9fd5faf723b 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 35c5784351c..38c12577429 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -14,28 +14,28 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "Ajanseuranta"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
-msgstr ""
+msgstr "Tänään"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -43,27 +43,29 @@ msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
 msgstr ""
+"Et kirjautunut ulos viimekerralla. Anna päivä ja kellonaika kun kirjauduit "
+"ulos."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Total period:"
-msgstr ""
+msgstr "Jakso yhteensä:"
 
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Syy"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr ""
+msgstr "Tulosta läsnäoloraporttien virheet"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
 #, python-format
 msgid "The sign-out date must be in the past"
-msgstr ""
+msgstr "Uloskirjautumispäivän tulee olla menneisyydessä"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -77,66 +79,69 @@ msgid ""
 "Sign in/Sign out actions. You can also link this feature to an attendance "
 "device using OpenERP's web service features."
 msgstr ""
+"Ajanseurantaominaisuudet auttavat seuraamaan henkilökunnan "
+"sisään/uloskirjauksia. Voit myös linkittää ominaisuuden ulkoiseen "
+"seurantalaitteeseen käyttäen OpenERP:in web palveluominaisuuksia."
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr ""
+msgstr "Läsnäolon syyt"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.attendance,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr ""
+msgstr "Paikalla"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
 msgid "Ask for Sign In Out"
-msgstr ""
+msgstr "Pyydä kirjautumaan sisään ulos"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action Reason"
-msgstr ""
+msgstr "Toiminnon syy"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr ""
+msgstr "Määrittle läsnäolon syy"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Virhe! Osastoa, jolla työntekijä on esimiehenä, ei voi valita."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "Läsnäolot kuukausittain"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Työntekijän nimi"
 
 #. 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 ""
+msgstr "Läsnäolon syyt"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
@@ -145,58 +150,58 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Käyttäjävirhe"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,end_date:0
 #: field:hr.attendance.week,end_date:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendance"
-msgstr ""
+msgstr "Työntekijän läsnäolo"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varoitus"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
 #, python-format
 msgid "The Sign-in date must be in the past"
-msgstr ""
+msgstr "Sisäänkirjautumispäivän tulee olla menneisyydessä"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+msgstr "Sisäänkirjauksen tulee olla heti uloskirjauksen jälkeen !"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr ""
+msgstr "Läsnäolo"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr ""
+msgstr "Viive korkeintaan (min.)"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
-msgstr ""
+msgstr "Tulosta"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
-msgstr ""
+msgstr "HR läsnäolo haku"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -216,19 +221,19 @@ msgstr "Virhe: Sisään kirjautumista täytyy seurata ulos kirjautuminen"
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. 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 ""
+msgstr "Läsnäolon virheraportti"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
 #: field:hr.attendance.week,init_date:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -244,50 +249,54 @@ msgstr "Kirjaudu sisään"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Operation"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "Tietoja ei saatavilla"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: hr_attendance
 #: field:hr.attendance.month,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A negative delay means that the employee worked more than encoded."
 msgstr ""
+"(*) negatiivine viive tarkoittaa että työntekijä oli töissä enemmän kuin oli "
+"syöttänyt tunteja"
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
 msgid ""
 "Specifies the reason for Signing In/Signing Out in case of extra hours."
 msgstr ""
+"Määrittelee syyn sisäänkirjaukselle/uloskirjaukselle ylityötuntien "
+"tapauksessa."
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Tulosta kuukausittainen läsnäoloraportti"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "Kirjaudu sisään - Kirjaudu ulos"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -308,23 +317,23 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr ""
+msgstr "Uloskirjautumisen tulee seurata heti sisäänkirjausta !"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "Tulosta läsnäolon virheraportti"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
@@ -334,39 +343,39 @@ msgstr "Työntekijöiden paikallaolot"
 #. module: hr_attendance
 #: field:hr.attendance,name:0
 msgid "Date"
-msgstr ""
+msgstr "Päiväys"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Virhe! Et voi luoda itseään toistavaa työntekijähierarkiaa."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Omat läsnäolot"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. 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 ""
+msgstr "Kirjaudu sisään"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -376,7 +385,7 @@ msgstr "Analyysitiedot"
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "Uloskirjauksen syötön tulee seurata sisäänkirjausta."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -387,7 +396,7 @@ msgstr "Läsnäolovirheet"
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
@@ -401,17 +410,17 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "Työntekijän tunnus"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "Tulosta viikon läsnäoloraportti"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "Työntekijän tunnus"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -419,12 +428,12 @@ msgstr ""
 #: view:hr.sign.in.out:0
 #: view:hr.sign.in.out.ask:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Määrittelee sisäänkirjauksen/uloskirjauksen syyn"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -437,14 +446,14 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Tulosta kuukausittainen läsnäoloraportti"
 
 #. 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 ""
+msgstr "Kirjaudu ulos"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -455,7 +464,7 @@ msgstr "Viive"
 #: view:hr.attendance:0
 #: model:ir.model,name:hr_attendance.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Työntekijä"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
@@ -474,7 +483,7 @@ msgstr "Viimeisin uloskirjautuminen"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Päiväys tallennettu"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
@@ -486,7 +495,7 @@ msgstr "Läsnäolot"
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -497,7 +506,7 @@ msgstr "Viimeisin kirjautuminen"
 #: selection:hr.attendance,action:0
 #: view:hr.employee:0
 msgid "Sign Out"
-msgstr ""
+msgstr "Kirjaudu Ulos"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
@@ -511,17 +520,17 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Työntekijän nimi"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr ""
+msgstr "Poissa"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
@@ -536,23 +545,23 @@ msgstr "Työntekijöiden paikallaolot"
 #. module: hr_attendance
 #: field:hr.sign.in.out,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Nykyinen tila"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
+msgstr "Tätä viivettä pienemmät viiveet katsotaan vapaaehtoisiksi."
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "Valintaasi vastaavia tietueita ei löytynyt"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -560,11 +569,13 @@ msgid ""
 "You did not sign in the last time. Please enter the date and time you signed "
 "in."
 msgstr ""
+"Et kirjautunut sisään viimekerralla. Ole hyvä ja syötä päivä ja kellonaika "
+"kun kirjauduit"
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index d2577d7d671..122649c39e2 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
@@ -691,19 +691,3 @@ msgstr "hr.sign.in.out.ask"
 
 #~ msgid "This module aims to manage employee's attendances."
 #~ msgstr "Ce module vise à gérer les présences des employés."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de menu récursif."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Les règles ne sont pas compatibles avec les objets osv_memory !"
-
-#~ msgid ""
-#~ "Time Tracking functionality aims to manage employee's attendances on the "
-#~ "basis of the actions (Sign in/Sign out) performed by them. You can also link "
-#~ "this to an attendance machine using OpenERP's webservices features."
-#~ msgstr ""
-#~ "La fonctionnalité de gestion du temps a pour but de gérer les présences des "
-#~ "employés sur la base de leurs propres actions (pointage en entrée/sortie). "
-#~ "Vous pouvez aussi lier cette fonctionnalité à une pointeuse en utilisant les "
-#~ "webservices."
diff --git a/addons/hr_attendance/i18n/gl.po b/addons/hr_attendance/i18n/gl.po
index 1e4c6d2ee9c..e70487cb276 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1ee914117de..221a27bbeaa 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: 2011-07-09 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dbad099e9d5..445baa6d351 100644
--- a/addons/hr_attendance/i18n/hr.po
+++ b/addons/hr_attendance/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-03-03 10:18+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7e5c8ce83ac..d8e4fdb0522 100644
--- a/addons/hr_attendance/i18n/hu.po
+++ b/addons/hr_attendance/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 16:53+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0cde0b7b02b..b2d11c6045b 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 880fbee6fad..08940ba5a1e 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -663,13 +663,3 @@ msgstr "hr.sign.in.out.ask"
 
 #~ msgid "Print Timesheet by week"
 #~ msgstr "Stampa il Cartellino per settimana"
-
-#~ msgid ""
-#~ "Time Tracking functionality aims to manage employee's attendances on the "
-#~ "basis of the actions (Sign in/Sign out) performed by them. You can also link "
-#~ "this to an attendance machine using OpenERP's webservices features."
-#~ msgstr ""
-#~ "Le funzionalità di tracciamento temporale hanno come obiettivo la gestione "
-#~ "delle presenze dell'impiegato sulla base delle azioni (Ingresso / Uscita) "
-#~ "effettuate dagli stessi. E' inoltre possibile collegarle ad un rilevatore di "
-#~ "presenza usando le caratteristiche web service di OpenERP"
diff --git a/addons/hr_attendance/i18n/ko.po b/addons/hr_attendance/i18n/ko.po
index f47029a28ed..974776598a0 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a52cde22c0b..9e03bbcd995 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f75989e1b71..a5340ebc831 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 924925da731..d3cdfe63d01 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -648,18 +648,3 @@ msgstr "Нэвтрэх, гарахыг хүсэх"
 #~ "signed out."
 #~ msgstr ""
 #~ "Та сүүлд гарсан бүртгэлээ хийгээгүй байна. Гарсан огноогоо оруулна уу."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory обьект дүрмийг дэмждэггүй"
-
-#~ msgid ""
-#~ "Time Tracking functionality aims to manage employee's attendances on the "
-#~ "basis of the actions (Sign in/Sign out) performed by them. You can also link "
-#~ "this to an attendance machine using OpenERP's webservices features."
-#~ msgstr ""
-#~ "Цагийг хяналт модулийн үүрэг нь ажилчдын гүйцэтгэх нэвтрэх, гарах үйлдэл "
-#~ "дээр үндэслэн тэдний ирцийг зохицуулах зорилготой. OpenERP-ийн веб "
-#~ "үйлчилгээг ашиглан ирцийн төхөөрөмжтэй холбож бас болно."
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index d87a936f960..8e86806a709 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -657,31 +657,3 @@ msgstr "hr.sign.in.out.ask"
 
 #~ msgid "Select a month"
 #~ msgstr "Kies een maand"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund voor osv_memory objecten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "Time Tracking functionality aims to manage employee's attendances on the "
-#~ "basis of the actions (Sign in/Sign out) performed by them. You can also link "
-#~ "this to an attendance machine using OpenERP's webservices features."
-#~ msgstr ""
-#~ "Tijdregistratie functionaliteit is erop gericht om medewerker aanwezigheid "
-#~ "te beheren op basis van door hen uitgevoerde acties (In-/Uitklokken). U kunt "
-#~ "dit ook koppelen aan een klokautomaat door OpenERP's webservice "
-#~ "mogelijkheden te gebruiken."
diff --git a/addons/hr_attendance/i18n/nl_BE.po b/addons/hr_attendance/i18n/nl_BE.po
index 734c4a0f865..3026ff01563 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f7648faec35..c5d34c017d0 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 40d21da658c..b3800e32a7c 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -78,6 +78,10 @@ msgid ""
 "Sign in/Sign out actions. You can also link this feature to an attendance "
 "device using OpenERP's web service features."
 msgstr ""
+"A funcionalidade de registo do tempo destina-se a gerir as presenças a "
+"partir dos registos de entrada e saída do serviço. Pode interligar esta "
+"funcionalidade com um aparelho de recolha de marcações de ponto usando as "
+"capacidade de web services do Open ERP."
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -121,6 +125,7 @@ msgstr "Definir motivo de presença"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erro ! Não pode seleccionar um departamento cujo gestor é o funcionário."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
@@ -131,7 +136,7 @@ msgstr "Pontualidade por Mês"
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr "Nomes de Empregados"
+msgstr "Nomes dos funcionários"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -157,7 +162,7 @@ msgstr "Data Final"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendance"
-msgstr "Presença do funcionário"
+msgstr "Assiduidade do funcionário"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
@@ -208,6 +213,12 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Este módulo destina-se à gestão da pontualidade e assiduidade dos "
+"funcionários.\n"
+"    Mantém um registo de presenças baseado nos registos de entrada e saída\n"
+"    efetuados por estes.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -347,7 +358,7 @@ msgstr "Novembro"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro! Não pode criar hierarquias de funcionários com recursividade."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -400,11 +411,14 @@ msgid ""
 "tool. If each employee has been linked to a system user, then they can "
 "encode their time with this action button."
 msgstr ""
+"Se pretende que os seus colaboradores registem a entrada e saída do serviço, "
+"pode fazê-lo usando este botão para efetuar esse registo. Para isso, cada "
+"funcionário deve estar associado ao respectivo utilizador da aplicação."
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID do funcionário"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
@@ -414,7 +428,7 @@ msgstr "Imprimir Relatório Semanal de Pontualidade"
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr "ID do Empregado"
+msgstr "ID do funcionário"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -512,16 +526,20 @@ msgid ""
 "has been linked to a system user, then they can encode their time with this "
 "action button."
 msgstr ""
+"Registar entrada / saída. Nalgumas organizações, o pessoal deve registar "
+"entrada quando se apsresentam ao serviço e depois registar saída no filnal "
+"da jornada de trabalho. Se os funcionários estiverem associados a um "
+"utilizador da aplicação, então podem fazê-lo usando este botão."
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr "Nome do Empregado"
+msgstr "Nome do funcionário"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr "Falta"
+msgstr "Ausente"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -587,12 +605,6 @@ msgstr "hr.sign.in.out.ask"
 #~ msgid "Select a month"
 #~ msgstr "Seleccione um mês"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "O objecto osv_memory não suporta regras!"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de módulo inválido na definição da acção"
 
@@ -670,12 +682,3 @@ msgstr "hr.sign.in.out.ask"
 #~ msgstr ""
 #~ "Tentou registar-se com uma data anterior para um outro evento !\n"
 #~ "Tente contactar o administrador para corrigir as presenças."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index e19afb1d7ed..56f751b0044 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fe324f5ebc7..69a4b9d19ad 100644
--- a/addons/hr_attendance/i18n/ro.po
+++ b/addons/hr_attendance/i18n/ro.po
@@ -8,18 +8,18 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-19 21:27+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "Urmărirea Timpului"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -62,12 +62,12 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
 #, python-format
 msgid "The sign-out date must be in the past"
-msgstr ""
+msgstr "Data iesirii trebuie sa fie in trecut"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Signed"
-msgstr ""
+msgstr "Data pontajului"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
@@ -80,7 +80,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr ""
+msgstr "Motive pontaj"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -102,17 +102,17 @@ msgstr ""
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action Reason"
-msgstr ""
+msgstr "Motivul acțiunii"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr ""
+msgstr "Definire motive pontaj"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
@@ -123,19 +123,19 @@ msgstr ""
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "Pontaje după luna"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Nume angajați"
 
 #. 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 ""
+msgstr "Motive pontaj"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
@@ -155,7 +155,7 @@ msgstr "Data de sfârşit"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendance"
-msgstr ""
+msgstr "Pontaj salariat"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
@@ -167,13 +167,13 @@ msgstr "Avertisment"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
 #, python-format
 msgid "The Sign-in date must be in the past"
-msgstr ""
+msgstr "Data de intrare trebuie sa fie în trecut"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+msgstr "O intrare trebuie sa urmeze imediat dupa o iesire"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
@@ -184,7 +184,7 @@ msgstr "Prezenţă"
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr ""
+msgstr "Intarzieri max.(min)"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -195,7 +195,7 @@ msgstr "Tipărește"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
-msgstr ""
+msgstr "Ru Cautare pontaje"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -211,6 +211,7 @@ msgstr ""
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Eroare: Intrare (resp. Ieşire) trebuie să urmeze după Ieşire (resp. Intrare)"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -221,7 +222,7 @@ msgstr "Iulie"
 #: 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 ""
+msgstr "Raport erori de pontaj"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
@@ -232,13 +233,13 @@ msgstr "Data de început"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr ""
+msgstr "Intarziere min"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
 #: view:hr.employee:0
 msgid "Sign In"
-msgstr ""
+msgstr "Intrat"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -249,7 +250,7 @@ msgstr "Operaţie"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "Nu sunt date disponibile"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -277,16 +278,18 @@ msgstr ""
 msgid ""
 "Specifies the reason for Signing In/Signing Out in case of extra hours."
 msgstr ""
+"Specifica motivul pentru înregistrarea Intrării/Ieșirii în cazul orelor "
+"suplimentare."
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Tipărește raportul prezentei lunar"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "Inregistreaza Intrarea Iesirea"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -297,7 +300,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
 #, python-format
 msgid "Sign in / Sign out"
-msgstr ""
+msgstr "Intrat / Iesit"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -313,7 +316,7 @@ msgstr "August"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr ""
+msgstr "O iesire trebuie sa urmeze imediat dupa o intrare"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -323,12 +326,12 @@ msgstr "Iunie"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "Tipărește raportul cu erorile de pontaj"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr ""
+msgstr "Pontajul salariatilor"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
@@ -343,7 +346,7 @@ msgstr "Noiembrie"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Eroare ! Nu puteţi crea ierarhii recursive de angajaţi"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -353,7 +356,7 @@ msgstr "Octombrie"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Pontajele mele"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -365,22 +368,22 @@ msgstr "Ianuarie"
 #: view:hr.sign.in.out:0
 #: view:hr.sign.in.out.ask:0
 msgid "Sign in"
-msgstr ""
+msgstr "Intrat"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Analysis Information"
-msgstr ""
+msgstr "Informatii de analiza"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "Ieșirea trebuie sa urmeze Intrarea"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr ""
+msgstr "Erori de pontaj"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
@@ -396,6 +399,12 @@ msgid ""
 "tool. If each employee has been linked to a system user, then they can "
 "encode their time with this action button."
 msgstr ""
+"Dacă aveţi nevoie ca personal dumneavoastră să se înregistreze conectați "
+"atunci când ajung la locul de muncă și să se înregistreze deconectați din "
+"nou la sfârşitul zilei, OpenERP vă permite să gestionaţi acest lucru cu "
+"acest instrument. În cazul în care fiecare angajat a fost legat la un "
+"utilizator din sistem, atunci ei pot codifica timpul lor cu acest buton pe "
+"acţiune."
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
@@ -405,7 +414,7 @@ msgstr "ID angajat"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "Tipărește Raportul săptămânal de prezență"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
@@ -423,30 +432,32 @@ msgstr "Renunță"
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Specifica motivul pentru care s-a înregistrat Intrare/Ieșire"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
+"(*) O intarziere pozitiva inseamna ca salariatul a lucrat mai putin decat s-"
+"a inregistrat."
 
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Tipărește raportul prezentei lunar"
 
 #. 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 ""
+msgstr "Ieșire"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Delay"
-msgstr ""
+msgstr "Întârziere"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -461,24 +472,26 @@ msgid ""
 "You tried to %s with a date anterior to another event !\n"
 "Try to contact the administrator to correct attendances."
 msgstr ""
+"Ați încercat să %s cu o dată anterioară altui eveniment !\n"
+"Contactați administratorul pentru corectarea prezenței."
 
 #. 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 ""
+msgstr "Ultima ieșire a dvs."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Data inregistrata"
 
 #. 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 ""
+msgstr "Prezența"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -488,13 +501,13 @@ msgstr "Mai"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "Your last sign in"
-msgstr ""
+msgstr "Ultimul pontaj de intrare"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
 #: view:hr.employee:0
 msgid "Sign Out"
-msgstr ""
+msgstr "Ieşire"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
@@ -523,12 +536,12 @@ msgstr "Februarie"
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr ""
+msgstr "Tipul acțiunii"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendances"
-msgstr ""
+msgstr "Prezenta salariati"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,state:0
@@ -543,13 +556,13 @@ msgstr "Aprilie"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
+msgstr "Sub aceasta întârziere, eroarea este considerata ca fiind voluntara"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "Nu sunt inregistrari care sa corespunda selectiei !"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -557,6 +570,8 @@ msgid ""
 "You did not sign in the last time. Please enter the date and time you signed "
 "in."
 msgstr ""
+"Nu ați înregistrat Intrarea ultima oară, Introduceți data și ora la care v-"
+"ați înregistrat ultima intrare."
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po
index 8b2040bba7e..cfaeb29276f 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -48,7 +48,7 @@ msgstr ""
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Total period:"
-msgstr ""
+msgstr "Всего за период:"
 
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
@@ -203,7 +203,7 @@ msgstr "Печать"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
-msgstr ""
+msgstr "Поиск по посещаемости"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -214,11 +214,18 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Назначение этого модуля — управление посещаемостью сотрудников.\n"
+"    Ведёт учёт посещаемости сотрудников на основе действий\n"
+"    регистрации-выхода, совершаемых ими.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Ошибка: регистрация (или выход) должны производиться после выхода (или "
+"регистрации)."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -229,7 +236,7 @@ msgstr "Июль"
 #: 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 ""
+msgstr "Отчёт об ошибках посещаемости"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
@@ -240,7 +247,7 @@ msgstr "Дата начала"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr ""
+msgstr "Мин. задержка"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -279,22 +286,24 @@ msgstr "Месяц"
 msgid ""
 "(*) A negative delay means that the employee worked more than encoded."
 msgstr ""
+"(*) Отрицательное значение обозначает, что сотрудник работал больше, чем "
+"указано."
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
 msgid ""
 "Specifies the reason for Signing In/Signing Out in case of extra hours."
-msgstr ""
+msgstr "Указывает причину регистрации/выхода в случае сверхурочной работы."
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Распечатать месячный отчёт посещаемости"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "Регистрация - Выход"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -321,7 +330,7 @@ msgstr "Август"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr ""
+msgstr "Выход должен следовать за регистрацией!"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -331,12 +340,12 @@ msgstr "Июнь"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "Распечатать отчёт об ошибках посещаемости"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr ""
+msgstr "Посещаемость сотрудников"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
@@ -351,7 +360,7 @@ msgstr "Ноябрь"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -361,7 +370,7 @@ msgstr "Октябрь"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Моя посещаемость"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -383,12 +392,12 @@ msgstr "Данные анализа"
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "Запись о выходе должна следовать за записью о регистрации."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr ""
+msgstr "Ошибки посещаемости"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
@@ -404,21 +413,25 @@ msgid ""
 "tool. If each employee has been linked to a system user, then they can "
 "encode their time with this action button."
 msgstr ""
+"Если требуется, чтобы сотрудники регистрировались по прибытии на работу и "
+"выходили в конце дня, OpenERP позволяет управлять этим процессом с помощью "
+"этого инструмента. Если каждый сотрудник сопоставлен с учётной записью в "
+"системе, можно регистрировать время с помощью этой кнопки действия."
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID сотрудника"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "Распечатать недельный отчёт посещаемости"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "ID сотрудника"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -431,18 +444,20 @@ msgstr "Отмена"
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Указывает причину регистрации - выхода."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
+"(*) Положительное значение означает, что сотрудник работал меньше, чем "
+"записано."
 
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Печатать отчёт посещаемости ежемесячно"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -469,6 +484,8 @@ msgid ""
 "You tried to %s with a date anterior to another event !\n"
 "Try to contact the administrator to correct attendances."
 msgstr ""
+"Вы пытаетесь %s датой, предшествующей другому событию!\n"
+"Свяжитесь с администратором для исправления ошибки."
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -479,14 +496,14 @@ msgstr "Ваша последняя регистрация"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Записанная дата"
 
 #. 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 ""
+msgstr "Посещаемость"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -512,11 +529,15 @@ msgid ""
 "has been linked to a system user, then they can encode their time with this "
 "action button."
 msgstr ""
+"Регистрация - выход. В некоторых организациях, сотрудники должны "
+"регистрироваться по прибытии на работу и выходить в конце дня. Если каждый "
+"сотрудник сопоставлен с учётной записью в системе, можно регистрировать "
+"время с помощью этой кнопки."
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Имя сотрудника"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -536,7 +557,7 @@ msgstr "Тип действия"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendances"
-msgstr ""
+msgstr "Посещаемость сотрудника"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,state:0
@@ -551,13 +572,13 @@ msgstr "Апрель"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
+msgstr "При задержке больше указанной, ошибка считается преднамеренной"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "В выборке не найдено записей!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -565,6 +586,7 @@ msgid ""
 "You did not sign in the last time. Please enter the date and time you signed "
 "in."
 msgstr ""
+"В прошлый раз вы не зарегистрировались. Введите дату и время регистрации."
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
diff --git a/addons/hr_attendance/i18n/sl.po b/addons/hr_attendance/i18n/sl.po
index 1e202f270d2..8a58aa3ee72 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f9b75584dbb..0c3baf07dad 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e6a02206fd6..5bd88c4f7bb 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 10631fd6781..85028a3914e 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0576d2e8b0e..4a658800cbe 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/tlh.po b/addons/hr_attendance/i18n/tlh.po
index c0d9825c253..682fcaa7492 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 85e7f0159c0..f173380d6dc 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -13,23 +13,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "Zaman İzleme"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
-msgstr ""
+msgstr "Bugün"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -42,6 +42,7 @@ msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
 msgstr ""
+"Son seferde çıkış yapmadınız. Lütfen çıkış yaptığınız tarih ve saati girin."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -51,23 +52,23 @@ msgstr "Toplam periyod:"
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr "Sebep"
+msgstr "Neden"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr ""
+msgstr "Devamlılık Raporu Hatasını yazdır"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
 #, python-format
 msgid "The sign-out date must be in the past"
-msgstr ""
+msgstr "Çıkış tarihi eski olmalı"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Signed"
-msgstr ""
+msgstr "Giriş Tarihi"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
@@ -76,17 +77,20 @@ msgid ""
 "Sign in/Sign out actions. You can also link this feature to an attendance "
 "device using OpenERP's web service features."
 msgstr ""
+"Zaman İzleme işlevselliği Giriş/Çıkış eylerimden çalışan devamlılıklarının "
+"yönetilmesini amaçlar. Bu işlevi, OpenERP nin web hizmetleri özelliğini "
+"kullanarak bir yoklama cihazına da bağlayabilirsiniz."
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr ""
+msgstr "Devamlılık nedenleri"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.attendance,day:0
 msgid "Day"
-msgstr ""
+msgstr "Gün"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -96,46 +100,46 @@ msgstr "Mevcut"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
 msgid "Ask for Sign In Out"
-msgstr ""
+msgstr "Çıkış yapmak için izin iste"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action Reason"
-msgstr ""
+msgstr "Eylem Nedeni"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr ""
+msgstr "Devamlılık nedeni gir"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Hata ! Personelin yönetici olduğu bir bölümü seçemezsiniz."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "Aylara göre Devamlılık"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Çalışanların adı"
 
 #. 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 ""
+msgstr "Devamlılık nedenleri"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
@@ -144,7 +148,7 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Kullanıcı Hatası"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,end_date:0
@@ -155,31 +159,31 @@ msgstr "Bitiş Tarihi"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendance"
-msgstr "Personel Devam Süresi"
+msgstr "Personel Devamlılığı"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
 #, python-format
 msgid "The Sign-in date must be in the past"
-msgstr ""
+msgstr "Giriş tarihi eski olmalı"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+msgstr "Giriş bir çıkıştan hemen sonra yapılmalı !"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr "Devam Süresi"
+msgstr "Devamlılık"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
@@ -190,12 +194,12 @@ msgstr "Max. Gecikme Süresi"
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
-msgstr ""
+msgstr "İK Devamlılık Ara"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -206,11 +210,16 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Bu modül personeli devamlılığının izlenmesini amaçlar.\n"
+"    Çalışanlar tarafından yapılan eylemleri (Giriş/Çıkış) \n"
+"    temel alarak Çalışanların devamlılığının hesabını tutar.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "Hata: Giriş (karşılığı Çıkış) çıkışı (karşılığı Giriş) izlemeli"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -221,7 +230,7 @@ msgstr "Temmuz"
 #: 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 "Devam Süresi Hata Raporu"
+msgstr "Devamlılık Hata Raporu"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
@@ -232,7 +241,7 @@ msgstr "Başlangıç Tarihi"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr "Min. Gecikme"
+msgstr "Enaz Gecikme"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -249,7 +258,7 @@ msgstr "İşlem"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "Hiçbir Veri Yok"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -271,22 +280,23 @@ msgstr "Ay"
 msgid ""
 "(*) A negative delay means that the employee worked more than encoded."
 msgstr ""
+"(*) Bir eksi gecikme, çalışan şifrelendiğinden daha fazla çalışmış demektir."
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
 msgid ""
 "Specifies the reason for Signing In/Signing Out in case of extra hours."
-msgstr ""
+msgstr "Fazladan saatler için Giriş/Çıkış nedenlerini belirt"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Aylık Devamlılık Raporunu yazdır"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "Giriş Çıkış"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -302,7 +312,7 @@ msgstr "Giriş / Çıkış"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
-msgstr ""
+msgstr "hr.sign.out.ask"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -313,7 +323,7 @@ msgstr "Ağustos"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr ""
+msgstr "Bir Çıkış, bir girişten hemen sonra olmalı"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -323,7 +333,7 @@ msgstr "Haziran"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "Devamlılık Hata Raporunu yazdır"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
@@ -343,7 +353,7 @@ msgstr "Kasım"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Hata ! Yinelemeli Personel Sıradizini yaratamazsınız."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -353,7 +363,7 @@ msgstr "Ekim"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Devamlılığım"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -375,12 +385,12 @@ msgstr "Analiz Bilgisi"
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "Çıkış İşlemi Giriş İşleminiz izlemeli"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr ""
+msgstr "Devamlılık Hataları"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
@@ -396,21 +406,25 @@ msgid ""
 "tool. If each employee has been linked to a system user, then they can "
 "encode their time with this action button."
 msgstr ""
+"Eğer çalışanlarınızın işe geldiğinde giriş ve gün sonunda da çıkış "
+"yapmalarını isterseniz, OpenERP bu aracı kullanmanızı sağlar. Eğer her "
+"çalışan bir kullanıcıya bağlanmışsa, bu eylem düğmesini kullanarak "
+"zamanlarını girerler."
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "Çalışan No"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "Haftalık Devamlılık Raporunu yazdır"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "Çalışan No"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -423,18 +437,19 @@ msgstr "İptal"
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Giriş/Çıkış nedenlerini belirler"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
+"(*) Bir artı gecikme çalışanın kaydedilenden az çalıştığı anlamına gelir."
 
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Devamlılık Raporunu Aylık olara Yazdır"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -461,6 +476,8 @@ msgid ""
 "You tried to %s with a date anterior to another event !\n"
 "Try to contact the administrator to correct attendances."
 msgstr ""
+"Bir başka olaya ait eski tarihli %s yapmaya çalıştınız !\n"
+"Bu katılımı düzeltmek için yöneticiyle iletişim kurun."
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -504,11 +521,14 @@ msgid ""
 "has been linked to a system user, then they can encode their time with this "
 "action button."
 msgstr ""
+"Giriş / Çıkış. Bazı firmalarda, çalışanlar işe geldiklerinde giriş yaparlar "
+"ve günün sonunda tekrar çıkış yaparlar. Eğer her çalışan bir sistem "
+"kullancısına bağlıysa, bu eylem düğmesini kullanarak zamanlarını girerler."
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Çalışanın Adı"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -544,12 +564,13 @@ msgstr "Nisan"
 #: view:hr.attendance.error:0
 msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
+"Bunun altındaki gecikme, hatanın bilerek yapıldığı olarak kabul edilir"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "Seçiminiz için hiçbir kayıt bulunamadı!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -557,6 +578,7 @@ msgid ""
 "You did not sign in the last time. Please enter the date and time you signed "
 "in."
 msgstr ""
+"Son seferde giriş yapmadınız. Lütfen giriş yaptığınız tarih ve saati girin."
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
@@ -566,7 +588,7 @@ msgstr "Yıl"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
-msgstr ""
+msgstr "hr.sign.in.out.ask"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/hr_attendance/i18n/uk.po b/addons/hr_attendance/i18n/uk.po
index 7d6ba9c9698..0f0d83ad1b6 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 74b5a756d92..e045fe78133 100644
--- a/addons/hr_attendance/i18n/vi.po
+++ b/addons/hr_attendance/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-20 08:34+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c4ce8e5ca15..40d7060d530 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -13,23 +13,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "考勤跟踪"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
-msgstr ""
+msgstr "今天"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -41,7 +41,7 @@ msgstr "3月"
 msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
-msgstr ""
+msgstr "您最近没签出，请输入您签出的日期和时间"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -56,13 +56,13 @@ msgstr "原因"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr ""
+msgstr "打印考勤报表错误"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
 #, python-format
 msgid "The sign-out date must be in the past"
-msgstr "签出日必须是过去的日期"
+msgstr "签出日期必须是过去的日期"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -75,67 +75,67 @@ 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 ""
+msgstr "考勤跟踪功能目的在于管理员工考勤表里的签入/签出操作。您也可以连接一考勤设备。"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr "出勤原因"
+msgstr "考勤的原因"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.attendance,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr "现在"
+msgstr "出勤"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
 msgid "Ask for Sign In Out"
-msgstr ""
+msgstr "签入签出询问"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action Reason"
-msgstr ""
+msgstr "操作原因"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr "定义出勤原因"
+msgstr "定义考勤的原因"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "本月的考勤"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "员工姓名"
 
 #. 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 "出勤原因"
+msgstr "考勤的原因"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
@@ -155,47 +155,47 @@ msgstr "结束日期"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendance"
-msgstr "员工出勤"
+msgstr "员工考勤"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
 #, python-format
 msgid "The Sign-in date must be in the past"
-msgstr "签入日必须是过去的日期"
+msgstr "签入日期必须是过去的日期"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+msgstr "签入必须在被正确签出后"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr "出勤"
+msgstr "考勤"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr "最大推延(最小)"
+msgstr "Max. Delay (Min)"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
-msgstr ""
+msgstr "人力资源考勤搜索"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -206,6 +206,10 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    这模块目的是管理员工的考勤\n"
+"    根据执行的签入/签出的操作保存员工帐户的考勤记录。\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -221,7 +225,7 @@ msgstr "7月"
 #: 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 "出勤错误报表"
+msgstr "考勤错误报表"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
@@ -232,7 +236,7 @@ msgstr "开始日期"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr "主要推延"
+msgstr "最小推延"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -249,7 +253,7 @@ msgstr "操作"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "无可用数据"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -270,23 +274,23 @@ msgstr "月份"
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A negative delay means that the employee worked more than encoded."
-msgstr "(*)负数延期表示员工的工作超过编码"
+msgstr "(*)负数延期表示员工的工作时间超过记录的时间"
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
 msgid ""
 "Specifies the reason for Signing In/Signing Out in case of extra hours."
-msgstr ""
+msgstr "为额外时间的签入/签出指定原因"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "打印每月考勤报表"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "签入/签出"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -302,7 +306,7 @@ msgstr "签入/ 签出"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
-msgstr ""
+msgstr "hr.sign.out.ask"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -313,7 +317,7 @@ msgstr "8月"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr "签出记录必须紧跟在签入记录之后！"
+msgstr "签出必须被正确签入后！"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -323,12 +327,12 @@ msgstr "6月"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "打印错误考勤报表"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr "员工出勤"
+msgstr "员工考勤"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
@@ -343,7 +347,7 @@ msgstr "11月"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -353,7 +357,7 @@ msgstr "10月"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "我的考勤"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -375,18 +379,18 @@ msgstr "分析信息"
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "签出必须被正确签入后"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr "出勤错误"
+msgstr "考勤错误"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr "动作"
+msgstr "操作"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
@@ -396,21 +400,22 @@ msgid ""
 "tool. If each employee has been linked to a system user, then they can "
 "encode their time with this action button."
 msgstr ""
+"如果需要您的员工在到达工作地点时签入并在当天结束时签出，系统可以使用这模块来管理。如果每个员工都链接到一个系统用户，然后用这个操作按钮来记录他们的时间。"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "员工ID"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "打印每周考勤报表"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "员工ID"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -423,18 +428,18 @@ msgstr "取消"
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "签入/签出的具体原因"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
-msgstr "(*)正数表示员工工作小于记录"
+msgstr "(*)正数表示员工工作时间小于记录的时间"
 
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "打印每月考勤报表"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -461,24 +466,26 @@ msgid ""
 "You tried to %s with a date anterior to another event !\n"
 "Try to contact the administrator to correct attendances."
 msgstr ""
+"您试图做%s日期前的另一事件！\n"
+"联系您的系统管理员去纠正这个考勤。"
 
 #. 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 "你最近的签出"
+msgstr "您最近的签出"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr "记录日期"
+msgstr "记录的日期"
 
 #. 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 "出勤"
+msgstr "考勤"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -488,7 +495,7 @@ msgstr "5月"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "Your last sign in"
-msgstr "你最近的签入"
+msgstr "您最近的签入"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -503,12 +510,12 @@ msgid ""
 "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 ""
+msgstr "签入/签出。在一个公司员工到达工作地方时签入并在当天结束时签出。如果每个员工都链接到一个系统用户，然后这操作按钮记录他们的时间。"
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "员工姓名"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -523,12 +530,12 @@ msgstr "2月"
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr "动作类型"
+msgstr "操作类型"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendances"
-msgstr "员工出勤"
+msgstr "员工考勤"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,state:0
@@ -549,14 +556,14 @@ msgstr "Bellow这种推延, 这错误被认为是自愿的"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "找不到您选择的记录"
 
 #. 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 ""
+msgstr "您最近没签入，清输入您签入的日期和时间。"
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
@@ -566,7 +573,7 @@ msgstr "年份"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
-msgstr ""
+msgstr "hr.sign.in.out.ask"
 
 #~ msgid "Employee's name"
 #~ msgstr "员工姓名"
diff --git a/addons/hr_attendance/i18n/zh_TW.po b/addons/hr_attendance/i18n/zh_TW.po
index 076ec40e6d4..9d675612636 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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2b708434317..80646be85f4 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -30,9 +30,10 @@ from report.interface import toxml
 
 from report import report_sxw
 from tools import ustr
+from tools.translate import _
 
 one_day = relativedelta(days=1)
-month2name = [0, 'January', 'February', 'March', 'April', 'May', 'Jun', 'July', 'August', 'September', 'October', 'November', 'December']
+month2name = [0, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
 
 def hour2str(h):
     hours = int(h)
@@ -52,7 +53,7 @@ class report_custom(report_rml):
             context = {}
         month = datetime(datas['form']['year'], datas['form']['month'], 1)
         emp_ids = context.get('active_ids', [])
-        user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
+        user_xml = ['<month>%s</month>' % _(month2name[month.month]), '<year>%s</year>' % month.year]
         if emp_ids:
             for emp in obj_emp.read(cr, uid, emp_ids, ['name']):
                 stop, days_xml = False, []
@@ -95,7 +96,7 @@ class report_custom(report_rml):
                     days_xml.append(today_xml)
                     today, tomor = tomor, tomor + one_day
                 user_xml.append(user_repr % '\n'.join(days_xml))
-
+                
         rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee')
         rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
         header_xml = '''
@@ -104,7 +105,7 @@ class report_custom(report_rml):
         <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)
-
+       
         first_date = str(month)
         som = datetime.strptime(first_date, '%Y-%m-%d %H:%M:%S')
         eom = som + timedelta(int(dy)-1)
@@ -113,12 +114,12 @@ class report_custom(report_rml):
         cell=1
         date_xml.append('<days>')
         if day_diff.days>=30:
-            date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
+            date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som.replace(day=x).strftime('%a')),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
         else:
             if day_diff.days>=(lengthmonth(som.year, som.month)-som.day):
-                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
+                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som.replace(day=x).strftime('%a')),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
             else:
-                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, eom.day+1)]
+                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som.replace(day=x).strftime('%a')),x-som.day+1) for x in range(som.day, eom.day+1)]
         cell=x-som.day+1
         day_diff1=day_diff.days-cell+1
         width_dict={}
@@ -129,12 +130,12 @@ class report_custom(report_rml):
         month=som.month
         month_dict[j]=som.strftime('%B')
         width_dict[j]=cell
-
+        
         while day_diff1>0:
             if month+i<=12:
                 if day_diff1 > lengthmonth(year,i+month): # Not on 30 else you have problems when entering 01-01-2009 for example
                     som1=datetime.date(year,month+i,1)
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, lengthmonth(year,i+month)+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, lengthmonth(year,i+month)+1)]
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
@@ -142,7 +143,7 @@ class report_custom(report_rml):
                     width_dict[j]=x
                 else:
                     som1=datetime.date(year,month+i,1)
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, eom.day+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, eom.day+1)]
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
@@ -156,7 +157,7 @@ class report_custom(report_rml):
                 i=1
                 if day_diff1>=30:
                     som1=datetime.date(years,i,1)
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, lengthmonth(years,i)+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, lengthmonth(years,i)+1)]
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
@@ -167,7 +168,7 @@ class report_custom(report_rml):
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, eom.day+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, eom.day+1)]
                     cell=cell+x
                     width_dict[j]=x
                 day_diff1=day_diff1-x
@@ -176,10 +177,11 @@ class report_custom(report_rml):
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
+        <title>%s</title>
         %s
         %s
         </report>
-        ''' % (header_xml,'\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/bymonth.xsl b/addons/hr_attendance/report/bymonth.xsl
index 23e7fb14b3d..0ec0a23cc8d 100644
--- a/addons/hr_attendance/report/bymonth.xsl
+++ b/addons/hr_attendance/report/bymonth.xsl
@@ -12,6 +12,7 @@
 
 
 	<xsl:template name="stylesheet">
+                <paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" leading="17" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
 				<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
 				<paraStyle name="name" fontName="Helvetica" textColor="green" fontSize="7"/>
 				<paraStyle name="normal" fontName="Helvetica" fontSize="6"/>
@@ -29,7 +30,7 @@
 
     <xsl:template name="story">
 		<spacer length="1cm" />
-		<para style="terp_header_Centre" t="1">Attendances By Month</para>
+		<xsl:apply-templates select="report/title"/>
 		<spacer length="1cm" />
         <blockTable>
 			<xsl:attribute name="style">week</xsl:attribute>
@@ -53,7 +54,14 @@
 			<xsl:apply-templates select="report/user"/>
       </blockTable>
     </xsl:template>
-
+    
+    <xsl:template match="title">
+        <para style="title">
+            <xsl:value-of select="."/>
+        </para>
+        <spacer length="1cm"/>
+    </xsl:template>
+    
     <xsl:template match="user">
 <!--		<tr></tr>-->
 		<tr>
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index 92534da7dc0..b934dc16f5a 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -2,17 +2,11 @@
 <openerp>
     <data noupdate="True">
 
-        <record id="property_rule_attendace" model="ir.rule">
-            <field name="name">Employee Attendance</field>
-            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
-        </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"/>
             <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_attendace_employee" model="ir.rule">
             <field name="name">Employee Attendance</field>
@@ -21,7 +15,6 @@
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
 
-
     </data>
 </openerp>
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index e9b5fecf330..660cdbc81cd 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -29,7 +29,6 @@
 
         <record model="ir.values" id="hr_attendance_month_values">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="object" eval="1" />
             <field name="name">Attendances By Month</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_month'))" />
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 4ed56ce1800..63cd0978a7f 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -28,7 +28,6 @@
         
         <record model="ir.values" id="hr_attendance_week_values">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="object" eval="1" />
             <field name="name">Attendances By Week</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_week'))" />
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 6eec4701fb4..8f943d7d1da 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -32,7 +32,6 @@
 
         <record model="ir.values" id="hr_attendance_error_values">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="object" eval="1" />
             <field name="name">Attendance Error Report</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_error'))" />
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 7a51c2b9e1e..55edb1406e8 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -29,18 +29,18 @@ class hr_si_so_ask(osv.osv_memory):
     _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.char('Empoyee ID', size=32, required=True, readonly=True),
+        'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
         }
 
     def _get_empname(self, cr, uid, context=None):
-        emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
+        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 = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
+        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
@@ -52,27 +52,28 @@ class hr_si_so_ask(osv.osv_memory):
 
     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.char('Employee ID', 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 = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
+        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]}
@@ -88,6 +89,7 @@ class hr_sign_in_out(osv.osv_memory):
         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)
@@ -106,6 +108,7 @@ class hr_sign_in_out(osv.osv_memory):
                 'res_model': 'hr.sign.in.out.ask',
                 'views': [(resource_id,'form')],
                 'type': 'ir.actions.act_window',
+                'context': context,
                 'target': 'new',
             }
 
@@ -113,6 +116,7 @@ class hr_sign_in_out(osv.osv_memory):
         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)
@@ -128,6 +132,7 @@ class hr_sign_in_out(osv.osv_memory):
                 'res_model': 'hr.sign.in.out',
                 'views': [(resource_id,'form')],
                 'type': 'ir.actions.act_window',
+                'context': context,
                 'target': 'new',
             }
 
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 091204fcf74..febc29a89c4 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources Contracts',
+    'name': "Employee Contracts",
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 3a6ea844012..4f82d1b3014 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -63,7 +63,7 @@ class hr_contract(osv.osv):
     _name = 'hr.contract'
     _description = 'Contract'
     _columns = {
-        'name': fields.char('Contract Reference', size=32, required=True),
+        'name': fields.char('Contract Reference', size=64, required=True),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'department_id': fields.related('employee_id','department_id', type='many2one', relation='hr.department', string="Department", readonly=True),
         'type_id': fields.many2one('hr.contract.type', "Contract Type", required=True),
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 2d2bdc5a178..5a4f84a9692 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -38,7 +38,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
-                   <group col='15' colspan='4'>
+                   <group>
                    <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
                    <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
                    <separator orientation="vertical"/>
@@ -49,7 +49,7 @@
                    <field name="date_end"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                    <separator orientation="vertical"/>
                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
@@ -74,9 +74,9 @@
                         <field name="wage"/>
                         <field name="type_id" widget="selection"/>
                     </group>
-                    <notebook>
-                    <page string="Information">
-                        <group col="2" colspan="2">
+                    <notebook colspan='4'>
+                    <page string="Information" name="information">
+                        <group col="2" colspan="2" name="left_column">
                             <separator colspan="2" string="Duration"/>
                             <field name="date_start" />
                             <field name="date_end" />
@@ -85,7 +85,7 @@
                             <field name="trial_date_start" />
                             <field name="trial_date_end" />
                         </group>
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" name="right_column">
                             <separator name="advantages" colspan="2" string="Advantages"/>
                             <field name="advantages" nolabel="1" colspan="2"/>
                         </group>
@@ -161,7 +161,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
-                   <group col='15' colspan='4'>
+                   <group>
                     <field name="name"/>
                    </group>
                </search>
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index 452f4f7acd3..be7a288f512 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: 2011-06-19 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
index be94b139522..e1d2b52437c 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
index 957a60a9f95..9d61bd717b1 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
index 0844390295c..84f9376569e 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
index 69359d59783..1df7d484af8 100644
--- a/addons/hr_contract/i18n/cs.po
+++ b/addons/hr_contract/i18n/cs.po
@@ -4,119 +4,120 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: openeobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-20 07:48+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Hourly cost computation"
-msgstr ""
+msgstr "Výpočet hodinové ceny"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Gross"
-msgstr ""
+msgstr "Hrubého"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "Zkušební období"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr ""
+msgstr "Zkušební počáteční datum"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Passport"
-msgstr ""
+msgstr "Pas"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
-msgstr ""
+msgstr "Zdravotní vyšetření"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle:0
 msgid "Company Vehicle"
-msgstr ""
+msgstr "Firemní vozidlo"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,name:0
 msgid "Wage Type Name"
-msgstr ""
+msgstr "Jméno typu mzdy"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Různé"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr ""
+msgstr "Aktuální"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
 msgid "Factor for hour cost"
-msgstr ""
+msgstr "Koeficient pro cenu hodiny"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Uplynulý"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Wage Types"
-msgstr ""
+msgstr "Typ mzdy"
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Oddělení"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr ""
+msgstr "Základní"
 
 #. 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 ""
+msgstr "Zaměstnanec"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr ""
+msgstr "Čistého"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
 msgid "Human Resources Contracts"
-msgstr ""
+msgstr "Smlouvy lidských zdrojů"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
 msgid "Hours in the period"
-msgstr ""
+msgstr "Hodin v období"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr ""
+msgstr "Vzdálenost z domu do práce"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -125,32 +126,32 @@ 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 "Smlouvy"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "Osobní informace"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
-msgstr ""
+msgstr "Práce"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Search Contract"
-msgstr ""
+msgstr "Hledat smlouvu"
 
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr ""
+msgstr "Poslední smlouva zaměstnance"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
 msgid "Deductions"
-msgstr ""
+msgstr "Odpočty"
 
 #. module: hr_contract
 #: model:ir.module.module,description:hr_contract.module_meta_information
@@ -163,33 +164,40 @@ msgid ""
 "    You can assign several contracts per employee.\n"
 "    "
 msgstr ""
+"\n"
+"    Přidává všechny informace zaměstnance ke správě smluv:\n"
+"    * Rodinný stav,\n"
+"    * Bezpečnostní číslo,\n"
+"    * Místo narození, datum narození, ...\n"
+"    Ke každému zaměstnanci můžete přiřadit několik smluv.\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,advantages:0
 msgid "Advantages"
-msgstr ""
+msgstr "Výhody"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Valid for"
-msgstr ""
+msgstr "Platné pro"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Work Permit"
-msgstr ""
+msgstr "Pracovní povolení"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of Children"
-msgstr ""
+msgstr "Počet dětí"
 
 #. 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 "Typy smluv"
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
@@ -198,44 +206,44 @@ msgstr ""
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "Typ mzdy"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní Hiearchii zaměstnanců"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Datum ukončení"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
 msgid "Wage"
-msgstr ""
+msgstr "Mzda"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Odkaz smlouvy"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr ""
+msgstr "V kilometrech"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Poznámky"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Chyba ! Nemůžete vybrat oddělení, kterého je zaměstnance vedoucí."
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -243,7 +251,7 @@ msgstr ""
 #: model:ir.model,name:hr_contract.model_hr_contract
 #: model:ir.ui.menu,name:hr_contract.next_id_56
 msgid "Contract"
-msgstr ""
+msgstr "Smlouva"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -252,92 +260,92 @@ msgstr ""
 #: field:hr.contract.type,name:0
 #: model:ir.model,name:hr_contract.model_hr_contract_type
 msgid "Contract Type"
-msgstr ""
+msgstr "Typ smlouvy"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 msgid "Search Wage Period"
-msgstr ""
+msgstr "Hledat mzdové období"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,working_hours:0
 msgid "Working Schedule"
-msgstr ""
+msgstr "Pracovní plán"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "Pracovní informace"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
 #: view:hr.contract.wage.type.period:0
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
 msgid "Wage Period"
-msgstr ""
+msgstr "Mzdové období"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "Název pozice"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr ""
+msgstr "Je vedoucí"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: hr_contract
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
+msgstr "Chyba! Počáteční datum smlouvy musí být nižší než konečné datum."
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr ""
+msgstr "Hledat typ mzdy"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "Zkušební koncové datum"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.contract.wage.type:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Název období"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Period"
-msgstr ""
+msgstr "Období"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
-msgstr ""
+msgstr "Místo narození"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
 msgid "Wage period"
-msgstr ""
+msgstr "Mzdové období"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -346,28 +354,30 @@ msgid ""
 "This field is used by the timesheet system to compute the price of an hour "
 "of work wased on the contract of the employee"
 msgstr ""
+"Toto pole je použito časovým rozvrhem systému pro výpočet ceny za hodinu "
+"práce vynaložené na smlouvu zaměstnance"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Duration"
-msgstr ""
+msgstr "Trvání"
 
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical Examination Date"
-msgstr ""
+msgstr "Datum zdravotní prohlídky"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr ""
+msgstr "Dávky"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Main Data"
-msgstr ""
+msgstr "Hlavní data"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "Hledat typ smlouvy"
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index c530a10d2fa..0d2fbb9071d 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -445,44 +445,5 @@ msgstr "Suche Vertragstyp"
 #~ msgid "Contract Duration"
 #~ msgstr "Vertragslaufzeit"
 
-#~ msgid "Calculations"
-#~ msgstr "Kalkulation"
-
-#~ msgid "Function Arguments"
-#~ msgstr "Funktion Argumente"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Description"
-#~ msgstr "Beschreibung"
-
-#~ msgid "Payslip Line"
-#~ msgstr "Abrechnungsposition"
-
-#~ msgid "Salary Computation"
-#~ msgstr "Berechnung Vergütung"
-
-#~ msgid "Employee specific allowances and deductions"
-#~ msgstr "Mitarbeiter Zulagen und Abzüge"
-
-#~ msgid "Contract Details"
-#~ msgstr "Vertragsdetails"
-
-#~ msgid "Salary Structure"
-#~ msgstr "Vergütungsstruktur"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Company contribution"
-#~ msgstr "Arbeitgeberanteile"
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index 7768182ea5b..dcd8b12f9e3 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -388,9 +388,6 @@ msgstr ""
 #~ msgid "Number of children"
 #~ msgstr "Αριθμός τέκνων"
 
-#~ msgid "Social security number"
-#~ msgstr "Αρ. Κοινωνικής Ασφάλισης"
-
 #~ msgid "Function"
 #~ msgstr "Λειτουργία"
 
@@ -415,9 +412,6 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
-#~ msgid "Nationality"
-#~ msgstr "Εθνικότητα"
-
 #~ msgid "AUDIENS Number"
 #~ msgstr "AUDIENS Number"
 
@@ -439,8 +433,5 @@ msgstr ""
 #~ msgid "Status Description"
 #~ msgstr "Περιγραφή Κατάστασης"
 
-#~ msgid "Birth Date"
-#~ msgstr "Ημερ/νία Γέννησης"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index 02044a1b28e..029fdfcd8d0 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -440,47 +440,8 @@ msgstr "Buscar tipo contrato"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
-#~ msgid "Salary Structure"
-#~ msgstr "Estructura salarial"
-
-#~ msgid "Contract Details"
-#~ msgstr "Detalles del contrato"
-
-#~ msgid "Calculations"
-#~ msgstr "Cálculos"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Description"
-#~ msgstr "Descripción"
-
 #~ msgid "Function"
 #~ msgstr "Cargo"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Payslip Line"
-#~ msgstr "Línea de nómina"
-
-#~ msgid "Company contribution"
-#~ msgstr "Contribución compañía"
-
-#~ msgid "Salary Computation"
-#~ msgstr "Cálculo del salario"
-
-#~ msgid "Employee specific allowances and deductions"
-#~ msgstr "Subsidios y deducciones específicos del empleado"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Function Arguments"
-#~ msgstr "Argumentos de la función"
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
index 6ca6072a8c5..5d81f98add0 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index b2a4d6b082c..05da0949d85 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/es_MX.po b/addons/hr_contract/i18n/es_MX.po
new file mode 100644
index 00000000000..dd8fd78a462
--- /dev/null
+++ b/addons/hr_contract/i18n/es_MX.po
@@ -0,0 +1,447 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_contract
+#
+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-13 14:41+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: 2011-09-05 05:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Hourly cost computation"
+msgstr "Cálculo coste por hora"
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Gross"
+msgstr "Bruto"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Periodo de pruebas"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Passport"
+msgstr "Pasaporte"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Examen médico"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Vehículo de la compañía"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nombre tipo de salario"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Factor para el coste de hora"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Sobrepasado"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Wage Types"
+msgstr "Tipos de salario"
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Basic"
+msgstr "Básico"
+
+#. 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 "Empleado"
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Neto"
+
+#. module: hr_contract
+#: model:ir.module.module,shortdesc:hr_contract.module_meta_information
+msgid "Human Resources Contracts"
+msgstr "Contratos laborales para recursos humanos"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,factor_days:0
+msgid "Hours in the period"
+msgstr "Horas en el período"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Distancia de casa al trabajo"
+
+#. 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 "Contratos"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Información personal"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Trabajo"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Buscar contrato"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Último contrato del empleado."
+
+#. module: hr_contract
+#: field:hr.contract,advantages_net:0
+msgid "Deductions"
+msgstr "Deducciones"
+
+#. module: hr_contract
+#: model:ir.module.module,description:hr_contract.module_meta_information
+msgid ""
+"\n"
+"    Add all information on the employee form to manage contracts:\n"
+"    * Marital status,\n"
+"    * Security number,\n"
+"    * Place of birth, birth date, ...\n"
+"    You can assign several contracts per employee.\n"
+"    "
+msgstr ""
+"\n"
+"    Añade información en el formulario del empleado para gestionar "
+"contratos:\n"
+"    * Estado civil,\n"
+"    * Número Seguridad Social,\n"
+"    * Lugar de nacimiento, fecha de nacimiento, ...\n"
+"    Puede asignar varios contratos por empleado.\n"
+"    "
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Ventajas"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Válido para"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Permiso de trabajo"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Número de hijos"
+
+#. 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 "Tipos de contrato"
+
+#. module: hr_contract
+#: field:hr.contract,wage_type_id:0
+#: view:hr.contract.wage.type:0
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
+msgid "Wage Type"
+msgstr "Tipo de salario"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Fecha de finalización"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Salario"
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Referencia contrato"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "En kilómetros."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"¡Error! No puede seleccionar un departamento que tenga el empleado como "
+"responsable."
+
+#. 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 "Contrato"
+
+#. 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 "Tipo de contrato"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type.period:0
+msgid "Search Wage Period"
+msgstr "Buscar periodo de salarios"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Planificación de trabajo"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Información del trabajo"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,period_id:0
+#: view:hr.contract.wage.type.period:0
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
+msgid "Wage Period"
+msgstr "Período de salario"
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Título del trabajo"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Es un director"
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_contract
+#: 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 anterior a la fecha de "
+"finalización."
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Search Wage Type"
+msgstr "Buscar tipo de salario"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Fecha de finalización"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,name:0
+msgid "Period Name"
+msgstr "Nombre del período"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Period"
+msgstr "Periodo"
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Lugar de nacimiento"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
+msgid "Wage period"
+msgstr "Períodos de salario"
+
+#. module: hr_contract
+#: help:hr.contract.wage.type,factor_type:0
+#: help:hr.contract.wage.type.period,factor_days:0
+msgid ""
+"This field is used by the timesheet system to compute the price of an hour "
+"of work wased on the contract of the employee"
+msgstr ""
+"Este campo es usado por el sistema de horarios para calcular el precio de "
+"una hora de trabajo basado en el contrato del empleado."
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Fecha del examen médico"
+
+#. module: hr_contract
+#: field:hr.contract,advantages_gross:0
+msgid "Allowances"
+msgstr "Primas"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Main Data"
+msgstr "Datos principales"
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Buscar tipo contrato"
+
+#~ msgid "AUDIENS Number"
+#~ msgstr "Número de AUDIENS"
+
+#~ 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 "Generalities"
+#~ msgstr "Generalidades"
+
+#~ msgid "Number of children"
+#~ msgstr "Número de hijos"
+
+#~ msgid "Marital Status"
+#~ msgstr "Estado civil"
+
+#~ msgid "Miscelleanous"
+#~ msgstr "Miscelánea"
+
+#~ msgid "Employee Marital Status"
+#~ msgstr "Estado civil del empleado"
+
+#~ msgid "Medical examination date"
+#~ msgstr "Fecha reconocimiento médico"
+
+#~ msgid "Working hours per day"
+#~ msgstr "Horas de trabajo por día"
+
+#~ msgid "Salary"
+#~ msgstr "Salario"
+
+#~ msgid "Remuneration"
+#~ msgstr "Remuneración"
+
+#~ msgid "Contract Name"
+#~ msgstr "Nombre contrato"
+
+#~ msgid "Contract Wage Type"
+#~ msgstr "Tipo de salario"
+
+#~ msgid "Manager"
+#~ msgstr "Director"
+
+#~ msgid "Status Description"
+#~ msgstr "Descripción del estado civil"
+
+#~ msgid "Contract Duration"
+#~ msgstr "Duración del contrato"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Function"
+#~ msgstr "Cargo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
diff --git a/addons/hr_contract/i18n/es_PY.po b/addons/hr_contract/i18n/es_PY.po
index 784d41e2b1c..e0fab1b3aa4 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/es_VE.po b/addons/hr_contract/i18n/es_VE.po
new file mode 100644
index 00000000000..dd8fd78a462
--- /dev/null
+++ b/addons/hr_contract/i18n/es_VE.po
@@ -0,0 +1,447 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_contract
+#
+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-13 14:41+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: 2011-09-05 05:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Hourly cost computation"
+msgstr "Cálculo coste por hora"
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Gross"
+msgstr "Bruto"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Periodo de pruebas"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Passport"
+msgstr "Pasaporte"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Examen médico"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Vehículo de la compañía"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr "Nombre tipo de salario"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr "Factor para el coste de hora"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Sobrepasado"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Wage Types"
+msgstr "Tipos de salario"
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Basic"
+msgstr "Básico"
+
+#. 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 "Empleado"
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "Neto"
+
+#. module: hr_contract
+#: model:ir.module.module,shortdesc:hr_contract.module_meta_information
+msgid "Human Resources Contracts"
+msgstr "Contratos laborales para recursos humanos"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,factor_days:0
+msgid "Hours in the period"
+msgstr "Horas en el período"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Distancia de casa al trabajo"
+
+#. 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 "Contratos"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Información personal"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Trabajo"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Buscar contrato"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Último contrato del empleado."
+
+#. module: hr_contract
+#: field:hr.contract,advantages_net:0
+msgid "Deductions"
+msgstr "Deducciones"
+
+#. module: hr_contract
+#: model:ir.module.module,description:hr_contract.module_meta_information
+msgid ""
+"\n"
+"    Add all information on the employee form to manage contracts:\n"
+"    * Marital status,\n"
+"    * Security number,\n"
+"    * Place of birth, birth date, ...\n"
+"    You can assign several contracts per employee.\n"
+"    "
+msgstr ""
+"\n"
+"    Añade información en el formulario del empleado para gestionar "
+"contratos:\n"
+"    * Estado civil,\n"
+"    * Número Seguridad Social,\n"
+"    * Lugar de nacimiento, fecha de nacimiento, ...\n"
+"    Puede asignar varios contratos por empleado.\n"
+"    "
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Ventajas"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Válido para"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Permiso de trabajo"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Número de hijos"
+
+#. 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 "Tipos de contrato"
+
+#. module: hr_contract
+#: field:hr.contract,wage_type_id:0
+#: view:hr.contract.wage.type:0
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
+msgid "Wage Type"
+msgstr "Tipo de salario"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Fecha de finalización"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Salario"
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Referencia contrato"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "En kilómetros."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"¡Error! No puede seleccionar un departamento que tenga el empleado como "
+"responsable."
+
+#. 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 "Contrato"
+
+#. 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 "Tipo de contrato"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type.period:0
+msgid "Search Wage Period"
+msgstr "Buscar periodo de salarios"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Planificación de trabajo"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Información del trabajo"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,period_id:0
+#: view:hr.contract.wage.type.period:0
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
+msgid "Wage Period"
+msgstr "Período de salario"
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Título del trabajo"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Es un director"
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_contract
+#: 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 anterior a la fecha de "
+"finalización."
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Search Wage Type"
+msgstr "Buscar tipo de salario"
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Fecha de finalización"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,name:0
+msgid "Period Name"
+msgstr "Nombre del período"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Period"
+msgstr "Periodo"
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Lugar de nacimiento"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
+msgid "Wage period"
+msgstr "Períodos de salario"
+
+#. module: hr_contract
+#: help:hr.contract.wage.type,factor_type:0
+#: help:hr.contract.wage.type.period,factor_days:0
+msgid ""
+"This field is used by the timesheet system to compute the price of an hour "
+"of work wased on the contract of the employee"
+msgstr ""
+"Este campo es usado por el sistema de horarios para calcular el precio de "
+"una hora de trabajo basado en el contrato del empleado."
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Fecha del examen médico"
+
+#. module: hr_contract
+#: field:hr.contract,advantages_gross:0
+msgid "Allowances"
+msgstr "Primas"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Main Data"
+msgstr "Datos principales"
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Buscar tipo contrato"
+
+#~ msgid "AUDIENS Number"
+#~ msgstr "Número de AUDIENS"
+
+#~ 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 "Generalities"
+#~ msgstr "Generalidades"
+
+#~ msgid "Number of children"
+#~ msgstr "Número de hijos"
+
+#~ msgid "Marital Status"
+#~ msgstr "Estado civil"
+
+#~ msgid "Miscelleanous"
+#~ msgstr "Miscelánea"
+
+#~ msgid "Employee Marital Status"
+#~ msgstr "Estado civil del empleado"
+
+#~ msgid "Medical examination date"
+#~ msgstr "Fecha reconocimiento médico"
+
+#~ msgid "Working hours per day"
+#~ msgstr "Horas de trabajo por día"
+
+#~ msgid "Salary"
+#~ msgstr "Salario"
+
+#~ msgid "Remuneration"
+#~ msgstr "Remuneración"
+
+#~ msgid "Contract Name"
+#~ msgstr "Nombre contrato"
+
+#~ msgid "Contract Wage Type"
+#~ msgstr "Tipo de salario"
+
+#~ msgid "Manager"
+#~ msgstr "Director"
+
+#~ msgid "Status Description"
+#~ msgstr "Descripción del estado civil"
+
+#~ msgid "Contract Duration"
+#~ msgstr "Duración del contrato"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Function"
+#~ msgstr "Cargo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
index 2b29dccf23b..6cfd36a5231 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
index b7a4e15f276..dfea0b8da80 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -30,27 +30,27 @@ msgstr "Brutto"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "Koeaika"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr ""
+msgstr "Koeajan alkupäivä"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Passport"
-msgstr ""
+msgstr "Passi"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
-msgstr ""
+msgstr "Lääkärintarkastus"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle:0
 msgid "Company Vehicle"
-msgstr ""
+msgstr "Yrityksen ajoneuvo"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,name:0
@@ -60,12 +60,12 @@ msgstr "Palkkatyypin nimi"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Sekalaiset"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
@@ -75,7 +75,7 @@ msgstr "Tuntimaksun kerroin"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Ylitetty"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -85,24 +85,24 @@ msgstr "Palkkatyypit"
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Osasto"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr ""
+msgstr "Perus"
 
 #. 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 ""
+msgstr "Työntekijä"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr ""
+msgstr "Netto"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -117,7 +117,7 @@ msgstr "Tunnit ajanjaksolla"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr ""
+msgstr "Työmatkan pituus"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -131,27 +131,27 @@ msgstr "Sopimukset"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "Henkilötiedot"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
-msgstr ""
+msgstr "Tehtävä"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Search Contract"
-msgstr ""
+msgstr "Hae sopimusta"
 
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr ""
+msgstr "Työntekijän viimeisin sopimus"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
 msgid "Deductions"
-msgstr ""
+msgstr "Vähennykset"
 
 #. module: hr_contract
 #: model:ir.module.module,description:hr_contract.module_meta_information
@@ -169,28 +169,28 @@ msgstr ""
 #: view:hr.contract:0
 #: field:hr.contract,advantages:0
 msgid "Advantages"
-msgstr ""
+msgstr "Edut"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Valid for"
-msgstr ""
+msgstr "Voimassa"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Work Permit"
-msgstr ""
+msgstr "Työlupa"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of Children"
-msgstr ""
+msgstr "Lasten lukumäärä"
 
 #. 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 "Sopimustyypit"
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
@@ -204,12 +204,12 @@ msgstr "Palkkatyyppi"
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Virhe! Et voi luoda itseään toistavaa työntekijähierarkiaa."
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -219,24 +219,24 @@ msgstr "Palkka"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Sopimuksen viite"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr ""
+msgstr "kilometreinä"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Virhe! Osastoa, jolla työntekijä on esimiehenä, ei voi valita."
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -244,7 +244,7 @@ msgstr ""
 #: model:ir.model,name:hr_contract.model_hr_contract
 #: model:ir.ui.menu,name:hr_contract.next_id_56
 msgid "Contract"
-msgstr ""
+msgstr "Sopimus"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -258,18 +258,18 @@ msgstr "Sopimustyyppi"
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 msgid "Search Wage Period"
-msgstr ""
+msgstr "Hae palkkajaksoa"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,working_hours:0
 msgid "Working Schedule"
-msgstr ""
+msgstr "Työaikataulu"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "Tehtävän tiedot"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
@@ -281,43 +281,44 @@ msgstr "Palkkajakso"
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "Tehtävänimike"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr ""
+msgstr "On päällikkö"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspvm"
 
 #. module: hr_contract
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
+"Virhe! Sopimuksen alkupäivän täytyy olla aikaisempi kuin loppupäivän."
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr ""
+msgstr "Hae palkan tyyppiä"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "Koeajan loppupäivä"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.contract.wage.type:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
@@ -327,7 +328,7 @@ msgstr "Ajanjakson nimi"
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Period"
-msgstr ""
+msgstr "Jakso"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -353,27 +354,27 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Duration"
-msgstr ""
+msgstr "Kesto"
 
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical Examination Date"
-msgstr ""
+msgstr "Lääkärintarkastuksen päivämäärä"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr ""
+msgstr "Päiväraha"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Main Data"
-msgstr ""
+msgstr "Päätiedot"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "Hae sopimustyyppiä"
 
 #~ msgid "Number of children"
 #~ msgstr "Lasten lukumäärä"
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index 8c516413b2b..56c649fda8f 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 08:56+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -445,30 +445,3 @@ msgstr "Rechercher dans les types de contrat"
 
 #~ msgid "AUDIENS Number"
 #~ msgstr "Numéro AUDIENS"
-
-#~ msgid "Calculations"
-#~ msgstr "Calculs"
-
-#~ msgid "Function Arguments"
-#~ msgstr "Arguments de la fonction"
-
-#~ msgid "Description"
-#~ msgstr "Description"
-
-#~ msgid "Payslip Line"
-#~ msgstr "Ligne de feuille de paye"
-
-#~ msgid "Salary Computation"
-#~ msgstr "Calcul du salaire"
-
-#~ msgid "Contract Details"
-#~ msgstr "Détails du contrat"
-
-#~ msgid "Salary Structure"
-#~ msgstr "Structure salariale"
-
-#~ msgid "Employee specific allowances and deductions"
-#~ msgstr "Allocations et déductions spécifiques de l'employé"
-
-#~ msgid "Company contribution"
-#~ msgstr "Contribution de la société"
diff --git a/addons/hr_contract/i18n/gl.po b/addons/hr_contract/i18n/gl.po
index 20d719abf64..50c2b31a967 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index c9b73e19c44..20258f49059 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
index 09148550d28..2b061bcd0af 100644
--- a/addons/hr_contract/i18n/hr.po
+++ b/addons/hr_contract/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
index 595e23b3586..97c0b1b0526 100644
--- a/addons/hr_contract/i18n/hu.po
+++ b/addons/hr_contract/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 17:24+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
index c4e37cc5833..6349130b34f 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index a7463a66e27..e4a1e5f24fd 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -443,21 +443,3 @@ msgstr "Cerca tipo contratto"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#~ msgid "Function Arguments"
-#~ msgstr "Argomenti funzione"
-
-#~ msgid "Description"
-#~ msgstr "Descrizione"
-
-#~ msgid "Salary Computation"
-#~ msgstr "Calcolo stipendio"
-
-#~ msgid "Contract Details"
-#~ msgstr "Dettagli contratto"
-
-#~ msgid "Salary Structure"
-#~ msgstr "Struttura stipendio"
-
-#~ msgid "Calculations"
-#~ msgstr "Calcoli"
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
index b265c0d350a..b481b6c3354 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/lo.po b/addons/hr_contract/i18n/lo.po
index d6b9e240fa9..087e9d297bd 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
index 0bb6cae32e8..d5b95f5a6f4 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
index 27c299951b3..7ce4f968a4c 100644
--- a/addons/hr_contract/i18n/lv.po
+++ b/addons/hr_contract/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po
index 6406eb8df61..b7cd3968460 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -434,33 +434,3 @@ msgstr "Гэрээний төрлийг хайх"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Calculations"
-#~ msgstr "Тооцоолол"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй"
-
-#~ msgid "Function Arguments"
-#~ msgstr "Функцийн хувьсагчууд"
-
-#~ msgid "Description"
-#~ msgstr "Тайлбар"
-
-#~ msgid "Payslip Line"
-#~ msgstr "Цалингийн хуудасны мөр"
-
-#~ msgid "Company contribution"
-#~ msgstr "Ажил олгогчийн төлөх шимтгэл"
-
-#~ msgid "Salary Computation"
-#~ msgstr "Цалингийн тооцоолол"
-
-#~ msgid "Employee specific allowances and deductions"
-#~ msgstr "Ажилтанд бүрт онцлог олголт, суутгалууд"
-
-#~ msgid "Contract Details"
-#~ msgstr "Гэрээний дэлгэрэнгүй"
-
-#~ msgid "Salary Structure"
-#~ msgstr "Цалингийн шатлал"
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
index 2f121dea10b..5af4d774acc 100644
--- a/addons/hr_contract/i18n/nl.po
+++ b/addons/hr_contract/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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -441,42 +441,3 @@ msgstr "Contractsoort zoeken"
 
 #~ msgid "Contract Duration"
 #~ msgstr "Contractduur"
-
-#~ msgid "Calculations"
-#~ msgstr "Berekeningen"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Function Arguments"
-#~ msgstr "Functie argumenten"
-
-#~ msgid "Description"
-#~ msgstr "Omschrijving"
-
-#~ msgid "Payslip Line"
-#~ msgstr "Loonstrookregel"
-
-#~ msgid "Company contribution"
-#~ msgstr "Bedrijfsbijdrage"
-
-#~ msgid "Salary Computation"
-#~ msgstr "Loonberekening"
-
-#~ msgid "Employee specific allowances and deductions"
-#~ msgstr "Medewerkersgebonden toelages en inhoudingen"
-
-#~ msgid "Contract Details"
-#~ msgstr "Details contract"
-
-#~ msgid "Salary Structure"
-#~ msgstr "Beloningsstructuur"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
index 26f8819b364..a8f6c03fed0 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
index d444d23bad2..d4a8893e0a7 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
index ccce1d2ec52..18b2f0c74c6 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -29,12 +29,12 @@ msgstr "Bruto"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr "Período de teste"
+msgstr "Período experimental"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr ""
+msgstr "Início período experimental"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -64,7 +64,7 @@ msgstr "Diversos"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr "Actual"
+msgstr "Atual"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
@@ -74,7 +74,7 @@ msgstr "Factor de custo por hora"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Caducado"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -89,7 +89,7 @@ msgstr "Departamento"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr ""
+msgstr "Base"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -145,7 +145,7 @@ msgstr "Procurar contrato"
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr "Último contrato do empregado"
+msgstr "Último contrato do funcionário"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
@@ -163,6 +163,14 @@ msgid ""
 "    You can assign several contracts per employee.\n"
 "    "
 msgstr ""
+"\n"
+"    Agregar todos os dados para a gestão de contratos:\n"
+"    * Estado civil\n"
+"    * Número de segurança social\n"
+"    * Local e data de nascimento\n"
+"    * etc.\n"
+"    É possível associar vários contratos ao mesmo funcionário.\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -173,7 +181,7 @@ msgstr "Vantagens"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Valid for"
-msgstr ""
+msgstr "Válido por"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -208,7 +216,7 @@ msgstr "Erro! Não pode criar hierarquias de funcionários recursivamente."
 #. module: hr_contract
 #: field:hr.contract,date_end:0
 msgid "End Date"
-msgstr "Data de Final"
+msgstr "Data de fim"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -218,7 +226,7 @@ msgstr "Salário"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Ref.ª Contrato"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
@@ -236,7 +244,7 @@ msgstr "Notas"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
-"Erro! Não pode seleccionar um departamento cujo gestor é o empregado."
+"Erro ! Não pode seleccionar um departamento cujo gestor é o funcionário."
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -258,7 +266,7 @@ msgstr "Tipo de Contrato"
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 msgid "Search Wage Period"
-msgstr ""
+msgstr "Procurar período de pagamento de salários"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -269,7 +277,7 @@ msgstr "Horário de trabalho"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "Informações sobre o cargo"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
@@ -291,12 +299,12 @@ msgstr "É gerente"
 #. module: hr_contract
 #: field:hr.contract,date_start:0
 msgid "Start Date"
-msgstr "Data de Início"
+msgstr "Data de início"
 
 #. module: hr_contract
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
+msgstr "Erro! Data de início do contrato deve ser anterior à data de fim."
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -311,7 +319,7 @@ msgstr "Tipo"
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "Fim do período experimental"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -322,7 +330,7 @@ msgstr "Agrupar por..."
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
 msgid "Period Name"
-msgstr "Nome do Período"
+msgstr "Nome do período"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -332,13 +340,13 @@ msgstr "Período"
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
-msgstr "Local de Nascimento"
+msgstr "Local de nascimento"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
 msgid "Wage period"
-msgstr "Período Salarial"
+msgstr "Período salarial"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -347,8 +355,8 @@ msgid ""
 "This field is used by the timesheet system to compute the price of an hour "
 "of work wased on the contract of the employee"
 msgstr ""
-"Este campo é utilizado pelo sistema de horário para calcular o preço de uma "
-"hora de trabalho baseado no contrato do funcionário"
+"Este campo é utilizado pelas folhas de trabalho para calcular o preço de uma "
+"hora de trabalho cok base no contrato do funcionário"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -363,12 +371,12 @@ msgstr "Data do exame médico"
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr ""
+msgstr "Abonos"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Main Data"
-msgstr ""
+msgstr "Dados principais"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
@@ -434,33 +442,3 @@ msgstr "Procurar o tipo de contrato"
 
 #~ msgid "Contract Duration"
 #~ msgstr "Duração do Contrato"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Calculations"
-#~ msgstr "Cálculos"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "Salary Structure"
-#~ msgstr "Estrutura do salário"
-
-#~ msgid "Salary Computation"
-#~ msgstr "Cálculo de salário"
-
-#~ msgid "Company contribution"
-#~ msgstr "Contribuição da empresa"
-
-#~ msgid "Contract Details"
-#~ msgstr "Detalhes do contrato"
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index 30b083dbedb..d0b0430d097 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
index 3adccdaa5c7..eb96da0f7fa 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index 81421433537..6ba5a4aef31 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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index f215195fb03..7f7921487fe 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po
index 30ce07b41c2..527fafd60eb 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: 2011-04-29 05:26+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
index 37a7731ac6a..56a001fccce 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/sr@latin.po b/addons/hr_contract/i18n/sr@latin.po
index bea5f2018bf..465a935598a 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index 81daf21edca..3716c47fabd 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
index 0128e580b31..eeb28a84290 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index f74dc88ade2..fb55b79c388 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -13,43 +13,43 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Hourly cost computation"
-msgstr ""
+msgstr "Saatlik Maliyet Hesaplama"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Gross"
-msgstr ""
+msgstr "Brüt"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "Deneme Süresi"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr ""
+msgstr "Deneme Başlangıç Tarihi"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Passport"
-msgstr ""
+msgstr "Pasaport"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
-msgstr ""
+msgstr "Sağlık Kontrolü"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle:0
 msgid "Company Vehicle"
-msgstr ""
+msgstr "Firma Araçı"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,name:0
@@ -59,22 +59,22 @@ msgstr "Ücret Tipi Adı"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Çeşitli"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr ""
+msgstr "Güncel"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
 msgid "Factor for hour cost"
-msgstr ""
+msgstr "Saat maliyet  etmeni"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Geçilen"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -84,12 +84,12 @@ msgstr "Ücret Tipleri"
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Bölüm"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr ""
+msgstr "Temel"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -101,7 +101,7 @@ msgstr "Personel"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr ""
+msgstr "Net"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -111,12 +111,12 @@ msgstr "İnsan Kaynakları Sözleşmeleri"
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
 msgid "Hours in the period"
-msgstr ""
+msgstr "Dönemdeki Saat Miktarı"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr ""
+msgstr "Ev_İş Mesafesi"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -130,27 +130,27 @@ msgstr "Sözleşmeler"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "Personel Bilgisi"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
-msgstr ""
+msgstr "İş"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Search Contract"
-msgstr ""
+msgstr "Sözleşme Ara"
 
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr ""
+msgstr "Çalışanın son sözleşmesi"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
 msgid "Deductions"
-msgstr ""
+msgstr "Kesintiler"
 
 #. module: hr_contract
 #: model:ir.module.module,description:hr_contract.module_meta_information
@@ -163,33 +163,40 @@ msgid ""
 "    You can assign several contracts per employee.\n"
 "    "
 msgstr ""
+"\n"
+"    Sözleşmeyi yapmak için bütün bilgileri çalışanın formuna girin:\n"
+"    * Medeni durumu,\n"
+"    * Güvenlik no,\n"
+"    * Doğum yeri, tarihi, ...\n"
+"    Bir çalışana birçok sözleşme uygulayabilirsiniz.\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,advantages:0
 msgid "Advantages"
-msgstr ""
+msgstr "Avantajlar"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Valid for"
-msgstr ""
+msgstr "Geçerliliği"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Work Permit"
-msgstr ""
+msgstr "Çalışma İzni"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of Children"
-msgstr ""
+msgstr "Çocuk Sayısı"
 
 #. 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 "Sözleşme Türleri"
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
@@ -203,7 +210,7 @@ msgstr "Ücret Tipi"
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Hata ! Yinelemeli Personel Sıradizini yaratamazsınız."
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -218,12 +225,12 @@ msgstr "Ücret"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Sözleşme Referansı"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr ""
+msgstr "Kilometre olarak"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -235,7 +242,7 @@ msgstr "Notlar"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Hata ! Personelin yönetici olduğu bir bölümü seçemezsiniz."
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -257,18 +264,18 @@ msgstr "Sözleşme Türü"
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 msgid "Search Wage Period"
-msgstr ""
+msgstr "Ücret Dönemi Ara"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,working_hours:0
 msgid "Working Schedule"
-msgstr ""
+msgstr "Çalışma Planı"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "İş Bilgisi"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
@@ -280,12 +287,12 @@ msgstr "Ücret Dönemi"
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "İş Ünvanı"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr ""
+msgstr "Yöneticidir"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
@@ -296,11 +303,12 @@ msgstr "Baş. Tarihi"
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
+"Hata! sözleşme başlangıç tarihi sözleşme bitiş tarihinden önce olmalı."
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr ""
+msgstr "Ücret Türü Ara"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -310,13 +318,13 @@ msgstr "Tipi"
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "Denem Bitiş Tarihi"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.contract.wage.type:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
@@ -326,12 +334,12 @@ msgstr "Dönem Adı"
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Period"
-msgstr ""
+msgstr "Dönem"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
-msgstr ""
+msgstr "Doğum Yeri"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
@@ -346,31 +354,33 @@ msgid ""
 "This field is used by the timesheet system to compute the price of an hour "
 "of work wased on the contract of the employee"
 msgstr ""
+"Bu alan, çalışanaın sözleşmesine göre zaman çizelgesinde bir saatlik iş "
+"ücretinin hesaplanmasında kullanılır."
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Duration"
-msgstr ""
+msgstr "Süre"
 
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical Examination Date"
-msgstr ""
+msgstr "Sağlık Kontrolü Tarihi"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr ""
+msgstr "İndirimler"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Main Data"
-msgstr ""
+msgstr "Ana Veri"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "Sözleşme Türü Ara"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
index 23cdc19bf02..72022dd4a1a 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
index f1f429b359c..dcc68b7a94f 100644
--- a/addons/hr_contract/i18n/vi.po
+++ b/addons/hr_contract/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-05-25 13:59+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -375,6 +375,3 @@ msgstr ""
 
 #~ msgid "Function"
 #~ msgstr "Chức năng"
-
-#~ msgid "Description"
-#~ msgstr "Mô tả"
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 1d615d3ce50..1099dc8ee7b 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -34,7 +34,7 @@ msgstr "试用期"
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr "使用期开始日期"
+msgstr "试用期开始日期"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -74,7 +74,7 @@ msgstr "每小时成本系数"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr "Overpassed"
+msgstr "已终止"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -89,7 +89,7 @@ msgstr "部门"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr "基本信息"
+msgstr "基本"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -101,7 +101,7 @@ msgstr "员工"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr "净值"
+msgstr "净额"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -111,12 +111,12 @@ msgstr "人力资源合同"
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
 msgid "Hours in the period"
-msgstr "周期的小时数"
+msgstr "这周期的小时数"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr "通勤距离"
+msgstr "家与工作地点的距离"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -135,7 +135,7 @@ msgstr "个人信息"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
-msgstr "工作"
+msgstr "职务"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -145,12 +145,12 @@ msgstr "搜索合同"
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr "该雇员最近的合同"
+msgstr "该员工最近的合同"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
 msgid "Deductions"
-msgstr "扣除"
+msgstr "扣减"
 
 #. module: hr_contract
 #: model:ir.module.module,description:hr_contract.module_meta_information
@@ -163,17 +163,24 @@ msgid ""
 "    You can assign several contracts per employee.\n"
 "    "
 msgstr ""
+"\n"
+"    在管理合同里添加这员工的所有信息：\n"
+"    * 婚姻状况\n"
+"    * 社保号\n"
+"    * 籍贯，出生日期。。。\n"
+"    您可以为员工签订几份合同。\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,advantages:0
 msgid "Advantages"
-msgstr "优点"
+msgstr "薪酬"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Valid for"
-msgstr "生效于"
+msgstr "有效期"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -218,12 +225,12 @@ msgstr "工资"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr "合同引用"
+msgstr "合同编码"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr "单位：千米"
+msgstr "公里"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -235,7 +242,7 @@ msgstr "备注"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr "错误！您不能选择该雇员担任经理的部门。"
+msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -257,7 +264,7 @@ msgstr "合同类型"
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 msgid "Search Wage Period"
-msgstr "搜索工资期"
+msgstr "搜索工资周期"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -268,7 +275,7 @@ msgstr "工作安排"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr "招聘信息"
+msgstr "职务信息"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
@@ -280,12 +287,12 @@ msgstr "工资周期"
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr "职位"
+msgstr "职务名称"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr "是否是经理"
+msgstr "是经理"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
@@ -300,7 +307,7 @@ msgstr "错误！合同开始日期必须小于结束日期。"
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr "搜索薪酬类型"
+msgstr "搜索工资类型"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -310,13 +317,13 @@ msgstr "类型"
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr "试用期截至日期"
+msgstr "试用期结束日期"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.contract.wage.type:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
@@ -345,12 +352,12 @@ msgstr "工资周期"
 msgid ""
 "This field is used by the timesheet system to compute the price of an hour "
 "of work wased on the contract of the employee"
-msgstr "这字段使用时间表系统来计算合同员工的每小时工价"
+msgstr "这字段用于计工单，系统用来计算合同员工的每小时工价"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Duration"
-msgstr "期间"
+msgstr "有效期"
 
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
@@ -360,12 +367,12 @@ msgstr "体检日期"
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr "津贴"
+msgstr "补贴"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Main Data"
-msgstr "主数据"
+msgstr "主要数据"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
@@ -397,25 +404,6 @@ msgstr "搜索合同类型"
 #~ msgid "Number of children"
 #~ msgstr "下级数"
 
-#~ msgid ""
-#~ "\n"
-#~ "    Add all information on the employee form to manage contracts:\n"
-#~ "    * Martial status,\n"
-#~ "    * Security number,\n"
-#~ "    * Place of birth, birth date, ...\n"
-#~ "\n"
-#~ "    You can assign several contracts per employee.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    增加员工管理合同的所有信息:\n"
-#~ "    * 婚姻状况\n"
-#~ "    * 社保号\n"
-#~ "    * 出生地点和出生日期\n"
-#~ "    \n"
-#~ "    你可以为每个员工签几个合同\n"
-#~ "    "
-
 #~ msgid "Medical examination date"
 #~ msgstr "体检日期"
 
@@ -448,21 +436,3 @@ msgstr "搜索合同类型"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件!"
-
-#~ msgid "Calculations"
-#~ msgstr "计算"
-
-#~ msgid "Description"
-#~ msgstr "描述"
-
-#~ msgid "Contract Details"
-#~ msgstr "合同明细"
-
-#~ msgid "Salary Structure"
-#~ msgstr "薪酬结构"
-
-#~ msgid "Company contribution"
-#~ msgstr "公司贡献"
-
-#~ msgid "Salary Computation"
-#~ msgstr "薪酬计算"
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
index 57a4248f232..37b837ad3f8 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index d2e0702f067..720c49302d4 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Human Resources Evaluation",
+    "name" : "HR Periodic Appraisals",
     "version": "0.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
@@ -39,16 +39,16 @@ 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. Implements a dashboard for My Current Evaluations
          """,
-    "demo": ["hr_evaluation_demo.xml", ],
+    "demo": ["hr_evaluation_demo.xml"],
     "data": [
         "security/ir.model.access.csv",
         "security/hr_evaluation_security.xml",
-        "wizard/hr_evaluation_mail_view.xml",
+#        "wizard/hr_evaluation_mail_view.xml",
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml",
         "board_hr_evaluation_view.xml",
-        'hr_evaluation_installer_view.xml',
         'hr_evaluation_data.xml',
+        'hr_evaluation_installer.xml',
     ],
     "test": ["test/test_hr_evaluation.yml"],
     "active": False,
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 70d6245b1ee..7f6d3142db5 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -10,15 +10,15 @@
             <field name="domain">[('state','in',('wait', 'progress')),('create_uid','=',uid)]</field>
             <field name="search_view_id" ref="hr_evaluation.view_hr_evaluation_tree"/>
         </record>
-        
+
         <record id="board_hr_evaluation_form" model="ir.ui.view">
             <field name="name">board.hr.evaluation.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <xpath expr="/form/hpaned/child1" position="inside"> 
-                <action colspan="4" height="220" name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"  width="510"/>
+            <xpath expr="/form/board/column" position="inside">
+                <action name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"/>
             </xpath>
             </field>
         </record>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 0b0ebb92261..e1d451c9f7f 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -24,35 +24,36 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from dateutil import parser
 from osv import fields, osv
-import tools
 from tools.translate import _
 
 class hr_evaluation_plan(osv.osv):
     _name = "hr_evaluation.plan"
-    _description = "Evaluation Plan"
+    _description = "Appraisal Plan"
     _columns = {
-        'name': fields.char("Evaluation Plan", size=64, required=True),
+        'name': fields.char("Appraisal Plan", size=64, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
-        'month_first': fields.integer('First Evaluation in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "),
-        'month_next': fields.integer('Periodicity of Evaluations (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."),
+        'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Appraisal Phases'),
+        'month_first': fields.integer('First Appraisal in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "),
+        'month_next': fields.integer('Periodicity of Appraisal (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."),
         'active': fields.boolean('Active')
     }
     _defaults = {
         'active': True,
+        'month_first': 6,
+        '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):
     _name = "hr_evaluation.plan.phase"
-    _description = "Evaluation Plan Phase"
+    _description = "Appraisal Plan Phase"
     _order = "sequence"
     _columns = {
         'name': fields.char("Phase", size=64, required=True),
         'sequence': fields.integer("Sequence"),
         'company_id': fields.related('plan_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
-        'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', ondelete='cascade'),
+        'plan_id': fields.many2one('hr_evaluation.plan','Appraisal Plan', ondelete='cascade'),
         'action': fields.selection([
             ('top-down','Top-Down Appraisal Requests'),
             ('bottom-up','Bottom-Up Appraisal Requests'),
@@ -100,8 +101,8 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _inherit="hr.employee"
     _columns = {
-        'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
-        'evaluation_date': fields.date('Next Evaluation Date', help="The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."),
+        'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
+        'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
     }
 
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
@@ -140,12 +141,12 @@ hr_employee()
 
 class hr_evaluation(osv.osv):
     _name = "hr_evaluation.evaluation"
-    _description = "Employee Evaluation"
+    _description = "Employee Appraisal"
     _rec_name = 'employee_id'
     _columns = {
-        'date': fields.date("Evaluation Deadline", required=True, select=True),
+        'date': fields.date("Appraisal Deadline", required=True, select=True),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
-        'note_summary': fields.text('Evaluation Summary'),
+        'note_summary': fields.text('Appraisal Summary'),
         'note_action': fields.text('Action Plan',
             help="If the evaluation does not meet the expectations, you can propose"+
               "an action plan"),
@@ -159,7 +160,7 @@ class hr_evaluation(osv.osv):
         'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
-            ('draft','Draft'),
+            ('draft','New'),
             ('wait','Plan In Progress'),
             ('progress','Waiting Appreciation'),
             ('done','Done'),
@@ -193,6 +194,7 @@ class hr_evaluation(osv.osv):
         return {'value': {'plan_id':evaluation_plan_id}}
 
     def button_plan_in_progress(self, cr, uid, ids, context=None):
+        mail_message = self.pool.get('mail.message')
         hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
         if context is None:
             context = {}
@@ -229,7 +231,7 @@ class hr_evaluation(osv.osv):
                         sub = phase.email_subject
                         dest = [child.work_email]
                         if dest:
-                           tools.email_send(evaluation.employee_id.work_email, dest, sub, body)
+                           mail_message.schedule_with_attach(cr, uid, evaluation.employee_id.work_email, dest, sub, body, context=context)
 
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True
@@ -269,7 +271,7 @@ hr_evaluation()
 class survey_request(osv.osv):
     _inherit = "survey.request"
     _columns = {
-        'is_evaluation': fields.boolean('Is Evaluation?'),
+        'is_evaluation': fields.boolean('Is Appraisal?'),
     }
     _defaults = {
         'state': 'waiting_answer',
@@ -281,11 +283,11 @@ class hr_evaluation_interview(osv.osv):
     _name = 'hr.evaluation.interview'
     _inherits = {'survey.request': 'request_id'}
     _rec_name = 'request_id'
-    _description = 'Evaluation Interview'
+    _description = 'Appraisal Interview'
     _columns = {
         'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True),
         'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'),
-        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Form'),
+        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Appraisal Form'),
     }
     _defaults = {
         'is_evaluation': True,
@@ -312,7 +314,7 @@ class hr_evaluation_interview(osv.osv):
             wating_id = 0
             tot_done_req = 1
             if not id.evaluation_id.id:
-                raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Evaluation."))
+                raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Appraisal."))
             records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id], context=context)[0].survey_request_ids
             for child in records:
                 if child.state == "draft":
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index a83caa71173..40ff397534e 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -593,5 +593,642 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_42"/>
             <field eval="5" name="sequence"/>
         </record>
+
+        <record id="survey_3" model="survey">
+            <field name="title">Employee Opinion</field>
+            <field name="max_response_limit">20</field>
+            <field eval="[(6,0,[])]" name="users"/>
+            <field name="type" ref="survey.survey_type1"/>
+            <field name="responsible_id" ref="base.user_root"/>
+            <field name="response_user">5</field>
+        </record>
+        <record id="survey_page_2" model="survey.page">
+            <field name="title">Process</field>
+            <field name="survey_id" ref="survey_3"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_page_10" model="survey.page">
+            <field name="title">Survey</field>
+            <field name="survey_id" ref="survey_3"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="survey_question_0" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="1" name="sequence"/>
+            <field name="question">Employee Details</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">multiple_textboxes_diff_type</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_2"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_3" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="1" name="sequence"/>
+            <field name="question">Engagement</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_6" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="2" name="sequence"/>
+            <field name="question">Leadership</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_10" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <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">Effectiveness</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_14" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="4" name="sequence"/>
+            <field name="question">Continuous Improvement</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_18" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="5" name="sequence"/>
+            <field name="question">Openness</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_40" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="6" name="sequence"/>
+            <field name="question">Miscellaneous</field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_41" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="7" name="sequence"/>
+            <field name="question">Additional comments :</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>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_10"/>
+            <field name="comment_label">Other</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_21" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="2" name="sequence"/>
+            <field name="question">At the supervisor's appraisal date </field>
+            <field eval="0" name="is_require_answer"/>
+            <field name="type">descriptive_text</field>
+            <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 :
+
+    1 - Significantly exceeds standards and expectations required of the position
+    2 - Exceeds standards and expectations
+    3 - Meet standards and expectations
+    4 - Did not meet standards and expectations
+    5 - Significantly below standards and expectations</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field name="page_id" ref="survey_page_2"/>
+            <field name="comment_label">Other</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+        <record id="survey_question_column_heading_14" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_15" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_16" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_17" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_18" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_3"/>
+        </record>
+        <record id="survey_question_column_heading_19" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_20" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_21" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_22" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_23" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_6"/>
+        </record>
+        <record id="survey_question_column_heading_24" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_25" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_26" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_27" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_28" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_10"/>
+        </record>
+        <record id="survey_question_column_heading_29" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_30" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_31" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_32" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_33" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_14"/>
+        </record>
+        <record id="survey_question_column_heading_34" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_35" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_36" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_37" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_38" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_18"/>
+        </record>
+        <record id="survey_question_column_heading_39" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">1</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_40" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">2</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_41" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">3</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_42" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">4</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_question_column_heading_43" model="survey.question.column.heading">
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="title">5</field>
+            <field name="question_id" ref="survey_question_40"/>
+        </record>
+        <record id="survey_answer_0" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Demonstrates genuine concern for me as a person. </field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_2" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I'm efficient at work and my achievements are successful.</field>
+            <field name="question_id" ref="survey_question_10"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_3" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I am proud to tell others I work here. </field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_4" model="survey.answer">
+            <field name="in_visible_answer_type">0</field>
+            <field name="answer">Name of your direct supervisor</field>
+            <field name="question_id" ref="survey_question_0"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_5" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Actions by Executive management show genuine interest in the well-being of employees.</field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_6" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I know the company's values and live them.</field>
+            <field name="question_id" ref="survey_question_18"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_7" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">My work contributes towards the continuous improvement of the company, our services or products. </field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_8" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I have enough work.</field>
+            <field name="question_id" ref="survey_question_10"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_9" model="survey.answer">
+            <field name="in_visible_answer_type">0</field>
+            <field name="answer">Date</field>
+            <field name="question_id" ref="survey_question_0"/>
+            <field name="type">datetime</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_11" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete</field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_12" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">My job provides me with a sense of personal accomplishment.</field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_13" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">What I did several months ago is still of use to the company, the services or the products today. </field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_14" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">My best achievements have been communicated to the community, internally or to customers. </field>
+            <field name="question_id" ref="survey_question_18"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_15" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I have the same opportunity to succeed as others with similar experiences, performance and educational background. </field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_16" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Compared to similar jobs in other companies where I could work, my total compensation is:
+(Scale: Well below others, Below othe</field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_17" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Overall, I believe the quality of products and/or services my workgroup delivers is improving.</field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_18" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I would prefer to remain with this company even if a comparable job were available in another company. </field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_19" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Listens and takes into account all ideas and do his best to put in place the best of these. </field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_21" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe</field>
+            <field name="question_id" ref="survey_question_10"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_22" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Our workgroup identifies and reduces waste of time in our activities and processes. </field>
+            <field name="question_id" ref="survey_question_14"/>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="survey_answer_23" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Taking everything into account, how satisfied are you with your current job? </field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="survey_answer_24" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I understand the company strategy and how my workgroup supports it. </field>
+            <field name="question_id" ref="survey_question_40"/>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="survey_answer_51" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed.</field>
+            <field name="question_id" ref="survey_question_3"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="survey_answer_52" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">I believe the information that I get from the person I report to. </field>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="5" name="sequence"/>
+        </record>
     </data>
+
+    <data noupdate="1">
+        <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
+            <field eval="1" name="active"/>
+            <field eval="6" name="month_next"/>
+            <field name="name">Manager's Evaluation Plan</field>
+            <field eval="3" name="month_first"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Send to Subordinates</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="1" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">bottom-up</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_evaluation.survey_2"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="0" name="wait"/>
+        </record>
+        <record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Send to Managers</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="2" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">top-down</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_evaluation.survey_2"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="0" name="wait"/>
+        </record>
+        <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Send to Employee</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="3" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">self</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_evaluation.survey_2"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="0" name="wait"/>
+        </record>
+        <record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
+            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+            <field name="name">Final Interview With Manager</field>
+            <field eval="0" name="send_anonymous_manager"/>
+            <field eval="4" name="sequence"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="action">final</field>
+            <field eval="0" name="send_anonymous_employee"/>
+            <field eval="0" name="send_answer_employee"/>
+            <field name="survey_id" ref="hr_recruitment.survey_job_0"/>
+            <field eval="0" name="send_answer_manager"/>
+            <field eval="1" name="wait"/>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="hr.employee" model="hr.employee">
+            <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+        </record>
+    </data>
+
+    <data>
+        <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
+           <field name="name">Run Employee Evaluation</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="'hr.employee'" name="model" />
+           <field eval="'run_employee_evaluation'" name="function" />
+           <field eval="'(False,)'" name="args" />
+        </record>
+     </data>
+
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index a7be585272f..db096f13266 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1,857 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-
-    <data>
-        <record id="survey_3" model="survey">
-            <field name="title">Employee Opinion</field>
-            <field name="max_response_limit">20</field>
-            <field eval="[(6,0,[])]" name="users"/>
-            <field name="type" ref="survey.survey_type1"/>
-            <field name="responsible_id" ref="base.user_root"/>
-            <field name="response_user">5</field>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_page_2" model="survey.page">
-            <field name="title">Process</field>
-            <field name="survey_id" ref="survey_3"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_page_10" model="survey.page">
-            <field name="title">Survey</field>
-            <field name="survey_id" ref="survey_3"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_0" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Employee Details</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">multiple_textboxes_diff_type</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_2"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_3" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Engagement</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_6" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Leadership</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-    </data>
-
-    <data>
-        <record id="survey_question_10" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <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">Effectiveness</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_14" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="4" name="sequence"/>
-            <field name="question">Continuous Improvement</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_18" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="5" name="sequence"/>
-            <field name="question">Openness</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_40" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="6" name="sequence"/>
-            <field name="question">Miscellaneous</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_41" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="7" name="sequence"/>
-            <field name="question">Additional comments :</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>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_21" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">At the supervisor's appraisal date </field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">descriptive_text</field>
-            <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 :
-
-    1 - Significantly exceeds standards and expectations required of the position
-    2 - Exceeds standards and expectations
-    3 - Meet standards and expectations
-    4 - Did not meet standards and expectations
-    5 - Significantly below standards and expectations</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_2"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_14" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_15" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_16" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_17" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_18" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_19" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_20" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_21" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_22" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_23" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_24" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_25" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_26" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_27" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_28" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_29" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_30" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_31" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_32" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_33" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_34" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_35" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_36" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_37" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_38" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_39" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_40" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_41" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_42" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_question_column_heading_43" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_0" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Demonstrates genuine concern for me as a person. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_2" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I'm efficient at work and my achievements are successful.</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_3" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I am proud to tell others I work here. </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_4" model="survey.answer">
-            <field name="in_visible_answer_type">0</field>
-            <field name="answer">Name of your direct supervisor</field>
-            <field name="question_id" ref="survey_question_0"/>
-            <field name="type">char</field>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_5" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Actions by Executive management show genuine interest in the well-being of employees.</field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_6" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I know the company's values and live them.</field>
-            <field name="question_id" ref="survey_question_18"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_7" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My work contributes towards the continuous improvement of the company, our services or products. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_8" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I have enough work.</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_9" model="survey.answer">
-            <field name="in_visible_answer_type">0</field>
-            <field name="answer">Date</field>
-            <field name="question_id" ref="survey_question_0"/>
-            <field name="type">datetime</field>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_11" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete</field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_12" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My job provides me with a sense of personal accomplishment.</field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_13" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">What I did several months ago is still of use to the company, the services or the products today. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_14" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My best achievements have been communicated to the community, internally or to customers. </field>
-            <field name="question_id" ref="survey_question_18"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_15" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I have the same opportunity to succeed as others with similar experiences, performance and educational background. </field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_16" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Compared to similar jobs in other companies where I could work, my total compensation is:
-(Scale: Well below others, Below othe</field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_17" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Overall, I believe the quality of products and/or services my workgroup delivers is improving.</field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_18" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I would prefer to remain with this company even if a comparable job were available in another company. </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_19" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Listens and takes into account all ideas and do his best to put in place the best of these. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_21" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_22" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Our workgroup identifies and reduces waste of time in our activities and processes. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="4" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_23" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Taking everything into account, how satisfied are you with your current job? </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="4" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_24" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I understand the company strategy and how my workgroup supports it. </field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="4" name="sequence"/>
-        </record>
-    </data>
-
-
-    <data>
-        <record id="survey_answer_51" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed.</field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_52" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I believe the information that I get from the person I report to. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-
     <data noupdate="1">
-        <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
-            <field eval="1" name="active"/>
-            <field eval="6" name="month_next"/>
-            <field name="name">Manager's Evaluation Plan</field>
-            <field eval="3" name="month_first"/>
-            <field name="company_id" ref="base.main_company"/>
+
+    	<record id="hr.employee1" model="hr.employee">
+            <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
         </record>
+
+        <record id="hr.employee2" model="hr.employee">
+            <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+        </record>
+
+        <record id="hr.employee3" model="hr.employee">
+            <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+        </record>
+
     </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Subordinates</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="1" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">bottom-up</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Managers</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="2" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">top-down</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Employee</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="3" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">self</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Final Interview With Manager</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="4" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">final</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_recruitment.survey_job_0"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="1" name="wait"/>
-        </record>
-    </data>
-
-        <data>
-          <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
-           <field name="name">Run Employee Evaluation</field>
-           <field eval="True" name="active" />
-           <field name="user_id" ref="base.user_root" />
-           <field name="interval_number">1</field>
-           <field name="interval_type">minutes</field>
-           <field name="numbercall">-1</field>
-           <field eval="'hr.employee'" name="model" />
-           <field eval="'run_employee_evaluation'" name="function" />
-           <field eval="'(False,)'" name="args" />
-          </record>
-
-        <record id="property_rule_evaluation" model="ir.rule">
-            <field name="name">Employee Evaluation</field>
-            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
-        </record>
-        <record id="property_rule_evaluation_manager" model="ir.rule">
-            <field name="name">Manager Evaluation</field>
-            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
-            <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
-        </record>
-         </data>
-
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
new file mode 100644
index 00000000000..842363559a9
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.actions.act_window" id="action_evaluation_plans_installer">
+            <field name="name">Review Evaluation Plans</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_evaluation.plan</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="todo_evaluation_plans_installer" model="ir.actions.todo">
+            <field name="action_id" ref="action_evaluation_plans_installer" />
+            <field name="category_id" ref="hr.category_hr_management_config" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml
deleted file mode 100644
index 27dd0945553..00000000000
--- a/addons/hr_evaluation/hr_evaluation_installer_view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<openerp>
-  <data>
- <record model="ir.actions.act_window" id="view_department_form_installer">
-           <field name="name">Define Your Department Structure</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">hr.department</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="hr.view_department_tree"/>
-           <field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
-       </record>
-
-       <record id="view_department_form_todo" model="ir.actions.todo">
-           <field name="action_id" ref="view_department_form_installer"/>
-           <field name="category_id" ref="hr.category_hr_management_config"/>
-           <field name="sequence">3</field>
-       </record>
-    </data>
-</openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 46d5cf55a98..d8dfa7e40ca 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -7,8 +7,8 @@
             <field name="model">hr_evaluation.plan</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Evaluation Plan">
-                   <group col='15' colspan='4'>
+                <search string="Appraisal Plan">
+                   <group>
                        <field name="name"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -25,18 +25,17 @@
             <field name="model">hr_evaluation.plan</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Evaluation Plan">
+                <form string="Appraisal Plan">
                     <group col="8" colspan="4">
                         <field name="name" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                         <field name="month_first"/>
                         <field name="month_next"/>
-                        <label string="(months)" align="0.0"/>
                         <newline/>
                         <field name="active"/>
                     </group>
                      <notebook colspan="4">
-                         <page string="Evaluation Phases">
+                         <page string="Appraisal Phases">
                             <field name="phase_ids" nolabel="1" colspan="4"/>
                          </page>
                      </notebook>
@@ -48,7 +47,7 @@
             <field name="model">hr_evaluation.plan</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Evaluation Plan">
+                <tree string="Appraisal Plan">
                     <field name="name"/>
                     <field name="month_first"/>
                     <field name="month_next"/>
@@ -57,14 +56,14 @@
             </field>
         </record>
         <record model="ir.actions.act_window" id="open_view_hr_evaluation_plan_tree">
-            <field name="name">Evaluation Plans</field>
+            <field name="name">Appraisal Plans</field>
             <field name="res_model">hr_evaluation.plan</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
+        <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
+        <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
@@ -73,7 +72,7 @@
             <field name="model">hr_evaluation.plan.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Evaluation Plan Phases">
+                <form string="Appraisal Plan Phases">
                  <notebook>
                    <page string="General">
                     <field name="plan_id" invisible="1"/>
@@ -115,7 +114,7 @@
                           <label string=" (employee_name)s: Partner name" colspan="2"/>
                           <label string="(user_signature)s: User name" colspan="2"/>
                           <label string="(date)s: Current Date" colspan="2"/>
-                          <label string="(eval_name)s:Evaluation Name" colspan="2"/>
+                          <label string="(eval_name)s:Appraisal Name" colspan="2"/>
                     </page>
                   </notebook>
                 </form>
@@ -126,7 +125,7 @@
             <field name="model">hr_evaluation.plan.phase</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Evaluation Plan Phases" editable="bottom" >
+                <tree string="Appraisal Plan Phases" editable="bottom" >
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="action"/>
@@ -142,7 +141,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <page string="Notes" position="before">
-                    <page string="Evaluation" groups="base.group_hr_user">
+                    <page string="Appraisal" groups="base.group_hr_user">
                         <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
                         <field name="evaluation_date"/>
                     </page>
@@ -155,9 +154,9 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Evaluation">
+                <form string="Appraisal">
                     <group col="4" colspan="3">
-                        <separator string="Evaluation Data" colspan="4"/>
+                        <separator string="Appraisal Data" colspan="4"/>
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="plan_id"/>
                         <field name="date"/>
@@ -170,8 +169,8 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Appraisal">
-                            <field name="survey_request_ids" context="{'phase_id': phase_id}" nolabel="1" colspan="4" widget="one2many">
-                                <form string="Interview Evaluation">
+                            <field name="survey_request_ids" nolabel="1" colspan="4" widget="one2many">
+                                <form string="Interview Appraisal">
                                     <group col="4" colspan="4">
                                         <field name="survey_id"/>
                                         <group col="2" colspan="2">
@@ -201,16 +200,16 @@
                     </notebook>
                     <newline/>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                         <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
                                 icon="gtk-cancel"/>
-                        <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
+                        <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"
                                 icon="gtk-execute"/>
                         <button name="button_done" string="Done" states="progress" type="object"
                                 icon="gtk-jump-to"/>
                         <button name="button_draft" string="Reset to Draft" states="cancel" type="object"
                                 icon="terp-stock_effects-object-colorize"/>
-                        <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
+                        <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"
                                 icon="gtk-go-forward"/>
                     </group>
               </form>
@@ -222,7 +221,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')" string="Evaluation">
+                <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')" string="Appraisal">
                     <field name="employee_id"/>
                     <field name="plan_id"/>
                     <field name="date"/>
@@ -238,7 +237,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Evaluation" type="bar">
+                <graph string="Appraisal" type="bar">
                     <field name="employee_id"/>
                     <field name="progress"  operator="+"/>
                 </graph>
@@ -250,16 +249,16 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Evaluation">
-                   <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','=','wait')]" help="Evaluations that are in waiting state"/>
-                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
+                <search string="Search Appraisal">
+                   <group>
+                    <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
+                    <filter icon="terp-go-week" string="7 Days" help="Appraisal to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                        help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
+                        help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id" />
                     <field name="plan_id" widget="selection" />
@@ -278,23 +277,23 @@
         </record>
 
         <record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
-            <field name="name">Evaluations</field>
+            <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="search_view_id" ref="hr_evaluation.evaluation_search"/>
-            <field name="help">Each employee may be assigned an evaluation 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 evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager.</field>
+            <field name="help">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 evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager.</field>
         </record>
 
-        <menuitem name="Evaluations" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
-            action="open_view_hr_evaluation_tree"/>
+        <menuitem name="Appraisal" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
+            action="open_view_hr_evaluation_tree" groups="base.group_hr_user"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
             <field name="name">hr_evaluation.interview.form</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Interview Evaluation">
+                <form string="Interview Appraisal">
                     <group col="4" colspan="4">
                         <field name="survey_id"/>
                         <field name="evaluation_id"/>
@@ -306,6 +305,10 @@
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
+                        <button string="Send Reminder Email"
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action" colspan="2"
+                        states="waiting_answer"/>
                     </group>
                     <newline/>
                     <separator string="State" colspan="4"/>
@@ -321,7 +324,7 @@
             <field name="model">hr.evaluation.interview</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Interview Evaluation">
+                <tree string="Interview Appraisal">
                     <field name="date_deadline" string="Deadline Date"/>
                     <field name="survey_id"/>
                     <field name="user_id" string="Interviewer"/>
@@ -329,6 +332,7 @@
                     <field name="response" readonly="1" invisible="True"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" 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.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)]}" />
+                    <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" colspan="2" states="waiting_answer"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -339,8 +343,8 @@
             <field name="model">hr.evaluation.interview</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Evaluation">
-                   <group col='10' colspan='4'>
+                <search string="Search Appraisal">
+                   <group>
                         <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
@@ -377,9 +381,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_hr_evaluation_interview_form"/>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
-            <field name="context">{"search_default_todo":1,"search_default_user_id":uid}</field>
+            <field name="context">{'default_is_evaluation': True, "search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
-            <field name="help">Interview Requests are generated automatically by OpenERP according to an employee's evaluation plan. Each user receives automatic emails and requests to evaluate their colleagues periodically.</field>
+            <field name="help">Interview Requests are generated automatically by OpenERP according to an employee's Appraisal Plan. Each user receives automatic emails and requests to evaluate their colleagues periodically.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="hr_evaluation_interview_tree">
@@ -403,14 +407,22 @@
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
-           action="action_hr_evaluation_send_mail" sequence="45" groups="base.group_hr_manager"/>
 
-      <!-- Evaluation Interviews Button on Employee Form -->
+      <!-- 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="Evaluation Interviews"
+      name="Appraisal Interviews"
       res_model="hr.evaluation.interview"
       src_model="hr.employee"/>
 
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index 69672cf8dc6..16fe8873582 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -178,7 +178,7 @@ msgstr "Не отговаря на очакванията"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "Оценка"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -288,7 +288,7 @@ msgstr "(date)s: Текуща дата"
 #: code:addons/hr_evaluation/hr_evaluation.py:80
 #, python-format
 msgid "Regarding "
-msgstr ""
+msgstr "Относно "
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -451,7 +451,7 @@ msgstr "Месец"
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
 msgid "Human Resources Evaluation"
-msgstr ""
+msgstr "Атестация на човешките ресурси"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -620,7 +620,7 @@ msgstr "Изпращане на анонимна обобщена информа
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Evaluation"
-msgstr ""
+msgstr "Атестационно интервю"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
@@ -657,7 +657,7 @@ msgstr "Последно одобряване"
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+msgstr "Очаква атестация"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
@@ -786,7 +786,7 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "Атестационни форми"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -887,13 +887,13 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Създаване на дата"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Година"
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index 11f4c1054e5..4e19f1e11d9 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: 2011-05-27 04:46+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 5136e1b3eb3..7ed2dae185f 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1068,102 +1068,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Anstehende Beurteilungen"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Datum nächste Beurteilung"
-
-#, python-format
-#~ msgid "''Regarding ''"
-#~ msgstr "'Bezüglich'"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Argumente"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#, python-format
-#~ msgid ""
-#~ "''\n"
-#~ "Date : %(date)s\n"
-#~ "\n"
-#~ "Dear %(employee_name)s,\n"
-#~ "\n"
-#~ "I am doing an evaluation regarding %(eval_name)s.\n"
-#~ "\n"
-#~ "Kindly submit your response.\n"
-#~ "\n"
-#~ "\n"
-#~ "Thanks,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-#~ msgstr ""
-#~ "''\n"
-#~ "Datum : %(date)s\n"
-#~ "\n"
-#~ "Hallo  %(employee_name)s,\n"
-#~ "\n"
-#~ "wir erarbeiten eine Mitarbeiterbeurteilung für %(eval_name)s.\n"
-#~ "\n"
-#~ "Wir erbitten eine Rückmeldung.\n"
-#~ "\n"
-#~ "\n"
-#~ "Vielen Dank für die Mitarbeit\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Mitarbeiterbeurteilungen werden automatisch in Abhängigkeit des "
-#~ "Bewertungsplans durch OpenERP erstellt. Jeder Benutzer erhält dabei "
-#~ "automatisch eine EMail von dem jeweils verantwortlichen Kollegen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Jedem Mitarbeiter kann einem Mitarbeiterbewertungsverfahren zugewiesen sein. "
-#~ "Diese Beurteilungspläne definieren die Frequenz und Art der periodischen "
-#~ "Mitarbeiterbeurteilung. Es ist möglich einzelne Schritte dieses Verfahrens "
-#~ "zu definieren und dabei den Schritten Befragungsformulare zuzuweisen. "
-#~ "OpenERP ist für die Beurteilung flexibel hinsichtlich der Richtung: "
-#~ "Beurteilung von Vorgesetzten oder eine eigene Einstufung der Fähigkeiten ist "
-#~ "dabei genauso möglich wie die klassische Beurteilung von Mitarbeitern durch "
-#~ "deren Vorgesetzte. Abgeschlossen wird das Verfahren in der Regel durch eine "
-#~ "finale Beurteilung."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Nach Startzeitpunkt"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Nächst. Bewert. in"
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index 5a3143a46d8..0364b97e0c6 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1038,37 +1038,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Evaluación siguiente"
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Puede asignar cada empleado a un plan de evaluación. Estos planes definen la "
-#~ "frecuencia y la forma en la que gestiona sus evaluaciones personales "
-#~ "periodicas. Puede definir pasos y adjuntar formulario de entrevistas a cada "
-#~ "paso. OpenERP gestiona todo tipo de evaluaciones: de abajo a arriba, de "
-#~ "arriba a abajo, autoevaluación y evaluación final por el responsable."
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Siguente evaluación tras"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "OpenERP genera automáticamente las peticiones de entrevista de acuerdo a los "
-#~ "planes de evaluación de los empleados. Cada usuario recibe correos "
-#~ "automáticos y peticiones para evaluar a sus compañeros periódicamente."
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Después de la fecha de inicio"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Fecha de la próxima evaluación"
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index 0608ff9c1b7..04fe23519a2 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/es_MX.po b/addons/hr_evaluation/i18n/es_MX.po
new file mode 100644
index 00000000000..26e130d2b98
--- /dev/null
+++ b/addons/hr_evaluation/i18n/es_MX.po
@@ -0,0 +1,1040 @@
+# 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-12 03:59+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:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr "Plan en proceso"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,wait:0
+msgid "Wait Previous Phases"
+msgstr "Esperar fases anteriores"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr.evaluation.report:0
+#: view:hr_evaluation.plan:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,request_id:0
+#: field:hr.evaluation.report,request_id:0
+msgid "Request_id"
+msgstr "id_solicitud"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,progress_bar:0
+#: field:hr_evaluation.evaluation,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: hr_evaluation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
+msgid "My Evaluation Remaining"
+msgstr "Mi evaluación restante"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "You cannot start evaluation without Evaluation."
+msgstr "No se puede iniciar la evaluación sin \"evaluación\"."
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,delay_date:0
+msgid "Delay to Start"
+msgstr "Retardo de inicio"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr_evaluation.evaluation,rating:0
+msgid "Appreciation"
+msgstr "Apreciación"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,company_id:0
+#: field:hr_evaluation.plan.phase,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
+msgid "Evaluation Interviews"
+msgstr "Entrevistas de evaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,survey_id:0
+msgid "Appraisal Form"
+msgstr "Formulario de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,evaluation_id:0
+msgid "Evaluation Form"
+msgstr "Formulario de evaluación"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
+msgid "Send an anonymous summary to the employee"
+msgstr "Enviar resumen anónimo al empleado."
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_first:0
+msgid ""
+"This number of months will be used to schedule the first evaluation date of "
+"the employee when selecting an evaluation plan. "
+msgstr ""
+"Este número de meses se usa para programar la fecha de la primera evaluación "
+"del empleado cuando seleccione un plan de evaluación. "
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Request"
+msgstr "Solicitar entrevista"
+
+#. module: hr_evaluation
+#: 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_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Body"
+msgstr "Cuerpo del correo"
+
+#. 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 "Evaluations Analysis"
+msgstr "Análisis de evaluaciones"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
+msgid "Sends Reminders to employess to fill the evaluations"
+msgstr "Envia recordatorios a los empleados para rellenar las evaluaciones"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Did not meet expectations"
+msgstr "No cumple las expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal"
+msgstr "Evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_next:0
+msgid "Periodicity of Evaluations (months)"
+msgstr "Prioridad de la evaluación (meses)"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
+msgstr ""
+"No puede cambiar el estado porque alguna evaluación está esperando respuesta "
+"o está en borrador"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date_close:0
+msgid "Ending Date"
+msgstr "Fecha de finalización"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_first:0
+msgid "First Evaluation in (months)"
+msgstr "Primera evaluación en (meses)"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:81
+#, python-format
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(employee_name)s,\n"
+"\n"
+"I am doing an evaluation regarding %(eval_name)s.\n"
+"\n"
+"Kindly submit your response.\n"
+"\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+msgstr ""
+"\n"
+"Fecha: %(date)s\n"
+"\n"
+"Estimado %(employee_name)s.\n"
+"\n"
+"Estoy haciendo una evaluación acerca de %(eval_name)s.\n"
+"\n"
+"Por favor envíe su respuesta.\n"
+"\n"
+"\n"
+"Gracias\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Employees"
+msgstr "Enviar a empleados"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Month "
+msgstr " Mes "
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_next:0
+msgid ""
+"The number of month that depicts the delay between each evaluation of this "
+"plan (after the first one)."
+msgstr ""
+"El número de meses que representa el tiempo transcurrido entre cada "
+"evaluación de este plan (después de la primera)."
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
+msgid "Periodic Evaluations"
+msgstr "Evaluaciones periódicas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send evaluation reminder"
+msgstr "Enviar recordatorio de evaluación"
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid ""
+"\n"
+"          Ability to create employees evaluation.\n"
+"          An evaluation can be created by employee for subordinates,\n"
+"          juniors as well as his manager.The evaluation is done under a "
+"plan\n"
+"          in which various surveys can be created and it can be defined "
+"which\n"
+"          level of employee hierarchy fills what and final review and "
+"evaluation\n"
+"          is done by the manager.Every evaluation filled by the employees "
+"can be viewed\n"
+"          in the form of.Implements a dashboard for My Current Evaluations\n"
+"         "
+msgstr ""
+"\n"
+"          Permite crear la evaluación de los empleados.\n"
+"          Puede crear una evaluación por empleado para los subordinados\n"
+"          así como para su responsable. La evaluación se realiza mediante un "
+"plan\n"
+"          en que se pueden crear diversas encuestas y se puede definir que "
+"se debe\n"
+"          rellenar en cada nivel de la jerarquía de los empleados y el "
+"responsable realiza\n"
+"          la última revisión y evaluación. Cada evaluación rellenada por los "
+"empleados\n"
+"          se puede ver en un tablero de Mis evaluaciones actuales.\n"
+"         "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(date)s: Current Date"
+msgstr "(date)s. Fecha actual"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:80
+#, python-format
+msgid "Regarding "
+msgstr "Referente a "
+
+#. 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 "Estado"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
+msgid "Evaluation Plan Phase"
+msgstr "Fase del plan de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,employee_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,employee_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,overpass_delay:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_body:0
+msgid "Email"
+msgstr "Email"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Exceeds expectations"
+msgstr "Supera las expectativas"
+
+#. 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 ""
+"Marque esta casilla si quiere enviar correos a los empleados objeto de esta "
+"fase."
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "Send all answers to the manager"
+msgstr "Enviar todas las respuestas al responsable."
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Evaluation Deadline"
+msgstr "Fecha límite de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Print Interview"
+msgstr "Imprimir entrevista"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,closed:0
+msgid "closed"
+msgstr "cerrada"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Meet expectations"
+msgstr "Cumple las expectativas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,nbr:0
+msgid "# of Requests"
+msgstr "Nº de peticiones"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
+msgid "Evaluations"
+msgstr "Evaluaciones"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
+msgid ""
+"Each employee may be assigned an evaluation 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 evaluations: bottom-up, top-down, self-evaluation and "
+"final evaluation by the manager."
+msgstr ""
+"A cada empleado se le puede asignar un plan de evaluación. Dicho plan define "
+"la frecuencia y la forma de gestionar la evaluación periódica del personal. "
+"Podrá definir los pasos y adjuntar entrevistas en cada paso. OpenERP "
+"gestiona todo tipo de evaluaciones: de abajo a arriba, de arriba a abajo, "
+"auto-evaluación y la evaluación final por parte del gerente."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Action to Perform"
+msgstr "Acción a realizar"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_action:0
+msgid "Action Plan"
+msgstr "Plan de acción"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(eval_name)s:Evaluation Name"
+msgstr "(eval_name)s: Nombre de la evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Ending Summary"
+msgstr "Resumen final"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly exceeds expectations"
+msgstr "Supera con creces las expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "In progress"
+msgstr "En proceso"
+
+#. 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 "Todas las respuestas"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr "Evaluación de recursos humanos"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Settings"
+msgstr "Configuración de correo"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,user_to_review_id:0
+msgid "Employee to Interview"
+msgstr "Empleado a entrevistar"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Question"
+msgstr "Pregunta de entrevista"
+
+#. module: hr_evaluation
+#: field:survey.request,is_evaluation:0
+msgid "Is Evaluation?"
+msgstr "¿Es evaluación?"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr "solicitud.encuesta"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,wait:0
+msgid ""
+"Check this box if you want to wait that all preceding phases are finished "
+"before launching this phase."
+msgstr ""
+"Marque esta casilla si quiere esperar a que todas las fases previas estén "
+"finalizadas antes de iniciar esta."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation Data"
+msgstr "Datos evaluación"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,note_action:0
+msgid ""
+"If the evaluation does not meet the expectations, you can proposean action "
+"plan"
+msgstr ""
+"Si la evaluación no cumple las expectativas, puede proponer un plan de acción"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Evaluation Summary"
+msgstr "Resumen de evaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_anonymous_employee:0
+#: field:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Anonymous Summary"
+msgstr "Resumen anónimo"
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation"
+msgstr "Evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Year "
+msgstr " Año "
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Start Evaluation"
+msgstr "Comenzar evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr "Por hacer"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly bellow expectations"
+msgstr "Muy por debajo de las expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid " (employee_name)s: Partner name"
+msgstr " (employee_name)s: Nombre empresa"
+
+#. 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 "Plan"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Send an anonymous summary to the manager"
+msgstr "Enviar resumen anónimo al responsable."
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Evaluation"
+msgstr "Entrevista de evaluación"
+
+#. 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 "Evaluation Plans"
+msgstr "Planes de evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Survey"
+msgstr "Encuesta"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,rating:0
+msgid "This is the appreciation on that summarize the evaluation"
+msgstr "Esta es la apreciación resumen de la evaluación."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: selection:hr.evaluation.report,state:0
+msgid "Final Validation"
+msgstr "Validación final"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Waiting Appreciation"
+msgstr "Esperando apreciación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_feature:0
+msgid "Send mail for this phase"
+msgstr "Enviar correo para esta fase"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,rating:0
+msgid "Overall Rating"
+msgstr "Valoración general"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interviewer"
+msgstr "Entrevistador"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
+msgid "Evaluations Statistics"
+msgstr "Estadísticas de evaluaciones"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Deadline Date"
+msgstr "Fecha límite"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Top-Down Appraisal Requests"
+msgstr "Petición de evaluación de arriba a abajo"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "General"
+msgstr "General"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_employee:0
+msgid "Send all answers to the employee"
+msgstr "Enviar todas las respuestas al empleado."
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Evaluation Date"
+msgstr "Siguiente fecha de evaluación"
+
+#. 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 "Realizada"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Evaluation Plan Phases"
+msgstr "Fases plan de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: view:hr_evaluation.evaluation:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"Interview Requests are generated automatically by OpenERP according to an "
+"employee's evaluation plan. Each user receives automatic emails and requests "
+"to evaluate their colleagues periodically."
+msgstr ""
+"OpenERP genera peticiones de entrevista automáticamente de acuerdo al plan "
+"de evaluación de cada trabajador. Cada usuario recibe correos electrónicos "
+"automáticos y peticiones de evaluación de sus compañeros periódicamente."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,phase_ids:0
+msgid "Evaluation Phases"
+msgstr "Fases de evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
+msgid "Evaluation Interview"
+msgstr "Entrevista de evaluación"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.reminder,evaluation_id:0
+msgid "Interview"
+msgstr "Entrevista"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
+msgid "Evaluation Reminders"
+msgstr "Recordatorios de evaluación"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Self Appraisal Requests"
+msgstr "Petición de autoevaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,email_subject:0
+msgid "char"
+msgstr "carácter"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,survey_request_ids:0
+msgid "Appraisal Forms"
+msgstr "Formularios de evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Validate Evaluation"
+msgstr "Validar evaluación"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Final Interview"
+msgstr "Entrevista final"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,name:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Bottom-Up Appraisal Requests"
+msgstr "Petición de evaluación de abajo a arriba"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Search Evaluation"
+msgstr "Buscar evaluación"
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_plan_id:0
+#: view:hr_evaluation.plan:0
+#: 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 "Evaluation Plan"
+msgstr "Plan de evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Managers"
+msgstr "Enviar a responsables"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
+msgid "Evaluation Send Mail"
+msgstr "Enviar correo evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr "Evaluación empleado"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "Search Evaluation Plan"
+msgstr "Buscar plan de evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "(months)"
+msgstr "(meses)"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(user_signature)s: User name"
+msgstr "(firma_usuario)s: Nombre usuario"
+
+#. module: hr_evaluation
+#: 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 "Petición de entrevista"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid ""
+"The date of the next evaluation is computed by the evaluation plan's dates "
+"(first evaluation + periodicity)."
+msgstr ""
+"La fecha de la siguiente evaluación es calculada por las fechas de "
+"planificación de la evaluación (primera evaluación + periodicidad)."
+
+#~ msgid "Score"
+#~ msgstr "Puntuación"
+
+#~ msgid "Information"
+#~ msgstr "Información"
+
+#~ msgid "Schedule next evaluation"
+#~ msgstr "Programar siguiente evaluació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 puede contener ningún "
+#~ "carácter especial!"
+
+#~ msgid "Bad Points"
+#~ msgstr "Puntos malos"
+
+#~ msgid "My Next Evaluation"
+#~ msgstr "Mi siguiente evaluación"
+
+#~ msgid "Values"
+#~ msgstr "Valores"
+
+#~ msgid "Good Points"
+#~ msgstr "Puntos buenos"
+
+#~ msgid "To Improve"
+#~ msgstr "A mejorar"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Evaluation Type"
+#~ msgstr "Tipo de evaluación"
+
+#~ msgid "Ability to create employees evaluation."
+#~ msgstr "Capacidad de crear evaluaciones de empleados"
+
+#~ msgid "Apply to categories"
+#~ msgstr "Aplicar a categorias"
+
+#~ msgid "Quote"
+#~ msgstr "Cita"
+
+#~ msgid "Informal Data"
+#~ msgstr "Datos informales"
+
+#~ msgid "Choices Results"
+#~ msgstr "Resultados elecciones"
+
+#~ msgid "Evaluation User"
+#~ msgstr "Usuario evaluación"
+
+#~ msgid "Next Evaluations"
+#~ msgstr "Siguientes evaluaciones"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "My Preceeding Evaluations"
+#~ msgstr "Mis evaluaciones previas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la estructura de la vista!"
+
+#~ msgid "Evaluation Criterions"
+#~ msgstr "Criterios de evaluación"
+
+#~ msgid "Next Employee Evaluation"
+#~ msgstr "Siguiente evaluación empleado"
+
+#~ msgid "Quotations"
+#~ msgstr "Citas"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Employee Evaluation Type"
+#~ msgstr "Tipo evaluación empleado"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Summary"
+#~ msgstr "Resúmen"
+
+#~ msgid "HR Responsible"
+#~ msgstr "Responsable RRHH"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/hr_evaluation/i18n/es_VE.po b/addons/hr_evaluation/i18n/es_VE.po
new file mode 100644
index 00000000000..26e130d2b98
--- /dev/null
+++ b/addons/hr_evaluation/i18n/es_VE.po
@@ -0,0 +1,1040 @@
+# 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-12 03:59+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:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr "Plan en proceso"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,wait:0
+msgid "Wait Previous Phases"
+msgstr "Esperar fases anteriores"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr.evaluation.report:0
+#: view:hr_evaluation.plan:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,request_id:0
+#: field:hr.evaluation.report,request_id:0
+msgid "Request_id"
+msgstr "id_solicitud"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,progress_bar:0
+#: field:hr_evaluation.evaluation,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: hr_evaluation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
+msgid "My Evaluation Remaining"
+msgstr "Mi evaluación restante"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Legend"
+msgstr "Leyenda"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "You cannot start evaluation without Evaluation."
+msgstr "No se puede iniciar la evaluación sin \"evaluación\"."
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,delay_date:0
+msgid "Delay to Start"
+msgstr "Retardo de inicio"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr_evaluation.evaluation,rating:0
+msgid "Appreciation"
+msgstr "Apreciación"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,company_id:0
+#: field:hr_evaluation.plan.phase,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
+msgid "Evaluation Interviews"
+msgstr "Entrevistas de evaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,survey_id:0
+msgid "Appraisal Form"
+msgstr "Formulario de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,evaluation_id:0
+msgid "Evaluation Form"
+msgstr "Formulario de evaluación"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
+msgid "Send an anonymous summary to the employee"
+msgstr "Enviar resumen anónimo al empleado."
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_first:0
+msgid ""
+"This number of months will be used to schedule the first evaluation date of "
+"the employee when selecting an evaluation plan. "
+msgstr ""
+"Este número de meses se usa para programar la fecha de la primera evaluación "
+"del empleado cuando seleccione un plan de evaluación. "
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Request"
+msgstr "Solicitar entrevista"
+
+#. module: hr_evaluation
+#: 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_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Body"
+msgstr "Cuerpo del correo"
+
+#. 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 "Evaluations Analysis"
+msgstr "Análisis de evaluaciones"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
+msgid "Sends Reminders to employess to fill the evaluations"
+msgstr "Envia recordatorios a los empleados para rellenar las evaluaciones"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Did not meet expectations"
+msgstr "No cumple las expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal"
+msgstr "Evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_next:0
+msgid "Periodicity of Evaluations (months)"
+msgstr "Prioridad de la evaluación (meses)"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
+msgstr ""
+"No puede cambiar el estado porque alguna evaluación está esperando respuesta "
+"o está en borrador"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date_close:0
+msgid "Ending Date"
+msgstr "Fecha de finalización"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_first:0
+msgid "First Evaluation in (months)"
+msgstr "Primera evaluación en (meses)"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:81
+#, python-format
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(employee_name)s,\n"
+"\n"
+"I am doing an evaluation regarding %(eval_name)s.\n"
+"\n"
+"Kindly submit your response.\n"
+"\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+msgstr ""
+"\n"
+"Fecha: %(date)s\n"
+"\n"
+"Estimado %(employee_name)s.\n"
+"\n"
+"Estoy haciendo una evaluación acerca de %(eval_name)s.\n"
+"\n"
+"Por favor envíe su respuesta.\n"
+"\n"
+"\n"
+"Gracias\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Employees"
+msgstr "Enviar a empleados"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Month "
+msgstr " Mes "
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_next:0
+msgid ""
+"The number of month that depicts the delay between each evaluation of this "
+"plan (after the first one)."
+msgstr ""
+"El número de meses que representa el tiempo transcurrido entre cada "
+"evaluación de este plan (después de la primera)."
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
+msgid "Periodic Evaluations"
+msgstr "Evaluaciones periódicas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send evaluation reminder"
+msgstr "Enviar recordatorio de evaluación"
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid ""
+"\n"
+"          Ability to create employees evaluation.\n"
+"          An evaluation can be created by employee for subordinates,\n"
+"          juniors as well as his manager.The evaluation is done under a "
+"plan\n"
+"          in which various surveys can be created and it can be defined "
+"which\n"
+"          level of employee hierarchy fills what and final review and "
+"evaluation\n"
+"          is done by the manager.Every evaluation filled by the employees "
+"can be viewed\n"
+"          in the form of.Implements a dashboard for My Current Evaluations\n"
+"         "
+msgstr ""
+"\n"
+"          Permite crear la evaluación de los empleados.\n"
+"          Puede crear una evaluación por empleado para los subordinados\n"
+"          así como para su responsable. La evaluación se realiza mediante un "
+"plan\n"
+"          en que se pueden crear diversas encuestas y se puede definir que "
+"se debe\n"
+"          rellenar en cada nivel de la jerarquía de los empleados y el "
+"responsable realiza\n"
+"          la última revisión y evaluación. Cada evaluación rellenada por los "
+"empleados\n"
+"          se puede ver en un tablero de Mis evaluaciones actuales.\n"
+"         "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(date)s: Current Date"
+msgstr "(date)s. Fecha actual"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:80
+#, python-format
+msgid "Regarding "
+msgstr "Referente a "
+
+#. 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 "Estado"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
+msgid "Evaluation Plan Phase"
+msgstr "Fase del plan de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,employee_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,employee_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,overpass_delay:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_body:0
+msgid "Email"
+msgstr "Email"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Exceeds expectations"
+msgstr "Supera las expectativas"
+
+#. 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 ""
+"Marque esta casilla si quiere enviar correos a los empleados objeto de esta "
+"fase."
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "Send all answers to the manager"
+msgstr "Enviar todas las respuestas al responsable."
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Evaluation Deadline"
+msgstr "Fecha límite de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Print Interview"
+msgstr "Imprimir entrevista"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,closed:0
+msgid "closed"
+msgstr "cerrada"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Meet expectations"
+msgstr "Cumple las expectativas"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,nbr:0
+msgid "# of Requests"
+msgstr "Nº de peticiones"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
+msgid "Evaluations"
+msgstr "Evaluaciones"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
+msgid ""
+"Each employee may be assigned an evaluation 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 evaluations: bottom-up, top-down, self-evaluation and "
+"final evaluation by the manager."
+msgstr ""
+"A cada empleado se le puede asignar un plan de evaluación. Dicho plan define "
+"la frecuencia y la forma de gestionar la evaluación periódica del personal. "
+"Podrá definir los pasos y adjuntar entrevistas en cada paso. OpenERP "
+"gestiona todo tipo de evaluaciones: de abajo a arriba, de arriba a abajo, "
+"auto-evaluación y la evaluación final por parte del gerente."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Action to Perform"
+msgstr "Acción a realizar"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_action:0
+msgid "Action Plan"
+msgstr "Plan de acción"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(eval_name)s:Evaluation Name"
+msgstr "(eval_name)s: Nombre de la evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Ending Summary"
+msgstr "Resumen final"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly exceeds expectations"
+msgstr "Supera con creces las expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "In progress"
+msgstr "En proceso"
+
+#. 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 "Todas las respuestas"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr "Evaluación de recursos humanos"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Settings"
+msgstr "Configuración de correo"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,user_to_review_id:0
+msgid "Employee to Interview"
+msgstr "Empleado a entrevistar"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Question"
+msgstr "Pregunta de entrevista"
+
+#. module: hr_evaluation
+#: field:survey.request,is_evaluation:0
+msgid "Is Evaluation?"
+msgstr "¿Es evaluación?"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr "solicitud.encuesta"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,wait:0
+msgid ""
+"Check this box if you want to wait that all preceding phases are finished "
+"before launching this phase."
+msgstr ""
+"Marque esta casilla si quiere esperar a que todas las fases previas estén "
+"finalizadas antes de iniciar esta."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation Data"
+msgstr "Datos evaluación"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,note_action:0
+msgid ""
+"If the evaluation does not meet the expectations, you can proposean action "
+"plan"
+msgstr ""
+"Si la evaluación no cumple las expectativas, puede proponer un plan de acción"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Evaluation Summary"
+msgstr "Resumen de evaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_anonymous_employee:0
+#: field:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Anonymous Summary"
+msgstr "Resumen anónimo"
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation"
+msgstr "Evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "7 Days"
+msgstr "7 días"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Year "
+msgstr " Año "
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Start Evaluation"
+msgstr "Comenzar evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr "Por hacer"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly bellow expectations"
+msgstr "Muy por debajo de las expectativas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid " (employee_name)s: Partner name"
+msgstr " (employee_name)s: Nombre empresa"
+
+#. 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 "Plan"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Send an anonymous summary to the manager"
+msgstr "Enviar resumen anónimo al responsable."
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Evaluation"
+msgstr "Entrevista de evaluación"
+
+#. 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 "Evaluation Plans"
+msgstr "Planes de evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Survey"
+msgstr "Encuesta"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,rating:0
+msgid "This is the appreciation on that summarize the evaluation"
+msgstr "Esta es la apreciación resumen de la evaluación."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: selection:hr.evaluation.report,state:0
+msgid "Final Validation"
+msgstr "Validación final"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Waiting Appreciation"
+msgstr "Esperando apreciación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_feature:0
+msgid "Send mail for this phase"
+msgstr "Enviar correo para esta fase"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,rating:0
+msgid "Overall Rating"
+msgstr "Valoración general"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interviewer"
+msgstr "Entrevistador"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
+msgid "Evaluations Statistics"
+msgstr "Estadísticas de evaluaciones"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Deadline Date"
+msgstr "Fecha límite"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Top-Down Appraisal Requests"
+msgstr "Petición de evaluación de arriba a abajo"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "General"
+msgstr "General"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_employee:0
+msgid "Send all answers to the employee"
+msgstr "Enviar todas las respuestas al empleado."
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Evaluation Date"
+msgstr "Siguiente fecha de evaluación"
+
+#. 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 "Realizada"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Evaluation Plan Phases"
+msgstr "Fases plan de evaluación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: view:hr_evaluation.evaluation:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"Interview Requests are generated automatically by OpenERP according to an "
+"employee's evaluation plan. Each user receives automatic emails and requests "
+"to evaluate their colleagues periodically."
+msgstr ""
+"OpenERP genera peticiones de entrevista automáticamente de acuerdo al plan "
+"de evaluación de cada trabajador. Cada usuario recibe correos electrónicos "
+"automáticos y peticiones de evaluación de sus compañeros periódicamente."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,phase_ids:0
+msgid "Evaluation Phases"
+msgstr "Fases de evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
+msgid "Evaluation Interview"
+msgstr "Entrevista de evaluación"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.reminder,evaluation_id:0
+msgid "Interview"
+msgstr "Entrevista"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
+msgid "Evaluation Reminders"
+msgstr "Recordatorios de evaluación"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Self Appraisal Requests"
+msgstr "Petición de autoevaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,email_subject:0
+msgid "char"
+msgstr "carácter"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,survey_request_ids:0
+msgid "Appraisal Forms"
+msgstr "Formularios de evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Validate Evaluation"
+msgstr "Validar evaluación"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Final Interview"
+msgstr "Entrevista final"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,name:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Bottom-Up Appraisal Requests"
+msgstr "Petición de evaluación de abajo a arriba"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Search Evaluation"
+msgstr "Buscar evaluación"
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_plan_id:0
+#: view:hr_evaluation.plan:0
+#: 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 "Evaluation Plan"
+msgstr "Plan de evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Managers"
+msgstr "Enviar a responsables"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
+msgid "Evaluation Send Mail"
+msgstr "Enviar correo evaluación"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr "Evaluación empleado"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "Search Evaluation Plan"
+msgstr "Buscar plan de evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "(months)"
+msgstr "(meses)"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(user_signature)s: User name"
+msgstr "(firma_usuario)s: Nombre usuario"
+
+#. module: hr_evaluation
+#: 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 "Petición de entrevista"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid ""
+"The date of the next evaluation is computed by the evaluation plan's dates "
+"(first evaluation + periodicity)."
+msgstr ""
+"La fecha de la siguiente evaluación es calculada por las fechas de "
+"planificación de la evaluación (primera evaluación + periodicidad)."
+
+#~ msgid "Score"
+#~ msgstr "Puntuación"
+
+#~ msgid "Information"
+#~ msgstr "Información"
+
+#~ msgid "Schedule next evaluation"
+#~ msgstr "Programar siguiente evaluació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 puede contener ningún "
+#~ "carácter especial!"
+
+#~ msgid "Bad Points"
+#~ msgstr "Puntos malos"
+
+#~ msgid "My Next Evaluation"
+#~ msgstr "Mi siguiente evaluación"
+
+#~ msgid "Values"
+#~ msgstr "Valores"
+
+#~ msgid "Good Points"
+#~ msgstr "Puntos buenos"
+
+#~ msgid "To Improve"
+#~ msgstr "A mejorar"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Evaluation Type"
+#~ msgstr "Tipo de evaluación"
+
+#~ msgid "Ability to create employees evaluation."
+#~ msgstr "Capacidad de crear evaluaciones de empleados"
+
+#~ msgid "Apply to categories"
+#~ msgstr "Aplicar a categorias"
+
+#~ msgid "Quote"
+#~ msgstr "Cita"
+
+#~ msgid "Informal Data"
+#~ msgstr "Datos informales"
+
+#~ msgid "Choices Results"
+#~ msgstr "Resultados elecciones"
+
+#~ msgid "Evaluation User"
+#~ msgstr "Usuario evaluación"
+
+#~ msgid "Next Evaluations"
+#~ msgstr "Siguientes evaluaciones"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "My Preceeding Evaluations"
+#~ msgstr "Mis evaluaciones previas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la estructura de la vista!"
+
+#~ msgid "Evaluation Criterions"
+#~ msgstr "Criterios de evaluación"
+
+#~ msgid "Next Employee Evaluation"
+#~ msgstr "Siguiente evaluación empleado"
+
+#~ msgid "Quotations"
+#~ msgstr "Citas"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Employee Evaluation Type"
+#~ msgstr "Tipo evaluación empleado"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Summary"
+#~ msgstr "Resúmen"
+
+#~ msgid "HR Responsible"
+#~ msgstr "Responsable RRHH"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index 99e468a4328..60204ef1a8a 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index e05ef673586..5b201a7184a 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 37a18e000d4..4dcf81a21c4 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -952,44 +952,3 @@ msgstr ""
 
 #~ msgid "Evaluation Type"
 #~ msgstr "Type d'évaluation"
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Prochaine évaluation"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Après la date de début"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Date de la prochaine évaluation"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Prochaine évaluation après"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Les règles ne sont pas supportées par les objets osv_memory !"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Paramètres incorrects"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Les demandes d'interview sont générées automatiquement par OpenERP, selon le "
-#~ "plan d'évaluation des employés. Chaque utilisateur reçoit des messages "
-#~ "automatiques et demandes pour évaluer ses collègues périodiquement."
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Chaque employé peut être affecté à un plan d'évaluation. Ces plans "
-#~ "définissent la fréquence et la façon dont vous gérez votre propre évaluation "
-#~ "périodique. Vous pourrez définir des étapes et associer des formulaires "
-#~ "d'interview à chaque étape. OpenERP gère tous les types d'évaluations: de "
-#~ "bas en haut, de haut en bas, l'auto-évaluation et l'évaluation finale par le "
-#~ "gestionnaire."
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
index c38030c6c8f..acab2165488 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 9cf7052ff8f..4c3f93cb07c 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/hu.po b/addons/hr_evaluation/i18n/hu.po
index 9936d5e47dd..f66951f8f70 100644
--- a/addons/hr_evaluation/i18n/hu.po
+++ b/addons/hr_evaluation/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 17:36+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index f048d8a0e34..a8dba52d315 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index 4241fb86dba..e088fee44db 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -904,8 +904,5 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
-
 #~ msgid "Evaluation Type"
 #~ msgstr "Tipo valutazione"
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 284e73663bc..73f1aa30eaf 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1019,92 +1019,11 @@ msgstr ""
 #~ msgid "Apply to categories"
 #~ msgstr "Хүсэлт гаргах зэрэглэл"
 
-#~ msgid "Next Evaluation"
-#~ msgstr "Дараагийн үнэлгээ"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Эхлэх огнооноос хэдэн сарын дараа"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Дараагийн үнэлгээ хийх огноо"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Буруу параметер"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Дараагийн үнэлгээ хүртэлх хугацаа"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Рекурс цэс үүсгэж болохгүй"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Ажилтан бүрийг үнэлгээний төлөвлөгөөнд оноож болно. Энэ төлөвлөгөө нь таны "
-#~ "хувийн үечилсэн үнэлгээгээ удирдаж түүний давтамжийг тодорхойлно. Алхмуудыг "
-#~ "тодорхойлж алхам бүрт ярилцлагын маягтыг холбож өгч болно. Доороос дээш, "
-#~ "дээрээс доош, өөрийн ба менежерээр эцсийн үнэлнээ зэрэг бүх төрлийн үнэлгээг "
-#~ "зохицуулах боломжтой."
-
 #~ msgid "Status"
 #~ msgstr "Төлөв"
 
 #~ msgid "Appliable Role"
 #~ msgstr "Тохирох дүр"
 
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Ажилтны үнэлгээний төлөвлөгөөний дагуу ярилцлагын хүсэлт нь автоматаар "
-#~ "үүснэ. Хэрэглэгч бүр автомат э-мэйл хүлээн авах ба өөрийн хамтран "
-#~ "ажиллагсдын үнэлгээ үе шаттайгаар хийнэ."
-
 #~ msgid "Quotations"
 #~ msgstr "Үнийн санал"
-
-#, python-format
-#~ msgid "''Regarding ''"
-#~ msgstr "\"Хамааруулахад\""
-
-#, python-format
-#~ msgid ""
-#~ "''\n"
-#~ "Date : %(date)s\n"
-#~ "\n"
-#~ "Dear %(employee_name)s,\n"
-#~ "\n"
-#~ "I am doing an evaluation regarding %(eval_name)s.\n"
-#~ "\n"
-#~ "Kindly submit your response.\n"
-#~ "\n"
-#~ "\n"
-#~ "Thanks,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-#~ msgstr ""
-#~ "''\n"
-#~ "Огноо : %(date)s\n"
-#~ "\n"
-#~ "Эрхэм %(employee_name)s,\n"
-#~ "\n"
-#~ "Дараах үнэлгээний дагуу би үнэлж байна %(eval_name)s.\n"
-#~ "\n"
-#~ "Хариугаа илгээнэ үү .\n"
-#~ "\n"
-#~ "\n"
-#~ "Баярлалаа,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index 04d71aeafc6..e583c6286b2 100644
--- a/addons/hr_evaluation/i18n/nl.po
+++ b/addons/hr_evaluation/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1063,97 +1063,3 @@ msgstr ""
 
 #~ msgid "Evaluation Type"
 #~ msgstr "Beoordelingsoort"
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Volgende beoordeling"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Na de startdaum"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Datum volgende beoordeling"
-
-#, python-format
-#~ msgid "''Regarding ''"
-#~ msgstr "\"Betreft\""
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Ongeldige argumenten"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Volgende beoordeling na"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#, python-format
-#~ msgid ""
-#~ "''\n"
-#~ "Date : %(date)s\n"
-#~ "\n"
-#~ "Dear %(employee_name)s,\n"
-#~ "\n"
-#~ "I am doing an evaluation regarding %(eval_name)s.\n"
-#~ "\n"
-#~ "Kindly submit your response.\n"
-#~ "\n"
-#~ "\n"
-#~ "Thanks,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-#~ msgstr ""
-#~ "''\n"
-#~ "Datum : %(date)s\n"
-#~ "\n"
-#~ "Beste %(employee_name)s,\n"
-#~ "\n"
-#~ "Ik ben bezig met een beoordeling betreffende %(eval_name)s.\n"
-#~ "\n"
-#~ "Graag ontvang ik je reactie.\n"
-#~ "\n"
-#~ "\n"
-#~ "Bedankt,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Gespreksaanvragen worden automatisch door OpenERP gegenereerd volgens het "
-#~ "beoordelingsplan van de medewerker. Elke gebruiker ontvangt automatisch e-"
-#~ "mails en aanvragen om periodiek beoordelingen  van hun collega's uit te "
-#~ "voeren."
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Elke medewerker kan worden toegewezen aan een beoordelingsplan. Deze plannen "
-#~ "definiëren de frequentie en manier waarop periodieke beoordelingen "
-#~ "plaatsvinden. U kunt stappen definiëren en vragenformulieren toewijzen aan "
-#~ "elke stap. OpenERP beheert allerlei soorten beoordelingen: bottom-up, top-"
-#~ "down, zelfbeoordeling en eindbeoordeling door manager."
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index 7627e094d28..0c487995897 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "Plano em curso"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:311
@@ -113,12 +113,12 @@ msgstr "Dia"
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 msgid "Evaluation Form"
-msgstr ""
+msgstr "Formulário de avaliação"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "Eviar um resumo anónimo ao empregado"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -142,29 +142,30 @@ msgstr "Pedido de entrevista"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erro! Não pode seleccionar um departamento cujo gestor é o empregado."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "Conteúdo do e-mail"
 
 #. 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 "Evaluations Analysis"
-msgstr ""
+msgstr "Análise das avaliações"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
-msgstr ""
+msgstr "Enviar aos empregados lembretes para o preenchimento das avaliações"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -175,7 +176,7 @@ msgstr "Não correspondeu às expetativas"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "Avaliação"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -185,7 +186,7 @@ msgstr "Julho"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "periodicidade das avaliações (meses)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
@@ -203,7 +204,7 @@ msgstr "Data de fim"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "Primeira avaliação em (meses)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:81
@@ -229,7 +230,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "Enviar para os empregados"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -251,12 +252,12 @@ msgstr ""
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Avaliações periódicas"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "Enviar lembrete da avaliação"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
@@ -279,7 +280,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(data)s: Data atual"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:80
@@ -313,7 +314,7 @@ msgstr "Empregado"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prazo ultrapassado"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
@@ -347,12 +348,12 @@ msgstr "    Mês-1    "
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "Notas públicas"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Evaluation Deadline"
-msgstr ""
+msgstr "Prazo da avaliação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -363,7 +364,7 @@ msgstr "Imprimir a entrevista"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "fechado"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -412,7 +413,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "Resumo final"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -481,7 +482,7 @@ msgstr "É uma avaliação?"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "survey.request"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
@@ -513,13 +514,13 @@ msgstr "Rascunho"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Evaluation Summary"
-msgstr ""
+msgstr "Resumo da avaliação"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "Resumo anónimo"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -550,7 +551,7 @@ msgstr "Iniciar a avaliação"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "A fazer"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -579,7 +580,7 @@ msgstr "Plano"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -589,12 +590,12 @@ msgstr "Novembro"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros avançados..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro! Não pode criar hierarquias de funcionários com recursividade."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -609,12 +610,12 @@ msgstr "Janeiro"
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar e-mail"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "Enviar um resumo anónimo para o gerente"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -636,7 +637,7 @@ msgstr "Data"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "Inquérito"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
@@ -652,7 +653,7 @@ msgstr "Ação"
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "Validação final"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
@@ -662,12 +663,12 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "Envial e-mail para esta fase"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "Pontuação global"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -684,12 +685,12 @@ msgstr "Entrevistador"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "Estatísticas das avaliações"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "Prazo limite"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -699,7 +700,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "Geral"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
@@ -709,7 +710,7 @@ msgstr "Enviar ao empregado todas as respostas"
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "Data da próxima avaliação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -717,18 +718,18 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr ""
+msgstr "Feito"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr ""
+msgstr "Fases do plano de avaliação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -757,7 +758,7 @@ msgstr "Atual"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "Entrevista de avaliação"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
@@ -768,12 +769,12 @@ msgstr "Entrevista"
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "Lembretes da avaliação"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "Pedidos de auto-avaliação"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
@@ -905,29 +906,11 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
 
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Data da próxima avaliação"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitetura de vista"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
 #~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "O objecto osv_memory não suporta regras!"
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index c39ca9d1a16..f070f1abbfa 100644
--- a/addons/hr_evaluation/i18n/pt_BR.po
+++ b/addons/hr_evaluation/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index 96cb0010d4c..0f9460860d2 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "Выполнение плана"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
@@ -51,18 +51,18 @@ msgstr "Выполнено"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
 msgid "My Evaluation Remaining"
-msgstr ""
+msgstr "Мои оставшиеся собеседования"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "Обозначения"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "You cannot start evaluation without Evaluation."
-msgstr ""
+msgstr "Нельзя начать собеседование без Собеседования"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -163,12 +163,12 @@ msgstr "Анализ испытаний"
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
-msgstr ""
+msgstr "Отправляет напоминания сотрудникам о прохождении собеседования"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -179,12 +179,12 @@ msgstr "Не оправдал ожиданий"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "Рецензент"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
@@ -198,11 +198,13 @@ msgid ""
 "You cannot change state, because some appraisal in waiting answer or draft "
 "state"
 msgstr ""
+"Нельзя изменить состояние: некоторые рецензенты находятся в состоянии "
+"\"Ожидается ответ\" или \"Черновик\""
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
@@ -229,6 +231,21 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"Дата: %(date)s\n"
+"\n"
+"Уважаемый %(employee_name)s,\n"
+"\n"
+"Я провожу собеседование %(eval_name)s.\n"
+"\n"
+"Отправьте, пожалуйста, ваш ответ.\n"
+"\n"
+"\n"
+"С благодарностью,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -238,29 +255,29 @@ msgstr "Отправить сотрудникам"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Последний срок"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Month "
-msgstr ""
+msgstr " Месяц "
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_next:0
 msgid ""
 "The number of month that depicts the delay between each evaluation of this "
 "plan (after the first one)."
-msgstr ""
+msgstr "Число месяцев между собеседованиями по этому плану (после первого)"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Периодические собеседования"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "Отправить напоминание о собеседовании"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
@@ -283,7 +300,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(date)s: Текущая дата"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:80
@@ -303,7 +320,7 @@ msgstr "Статус"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Этап плана тестирования"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -317,12 +334,12 @@ msgstr "Сотрудник"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Просрочено"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr ""
+msgstr "Письмо"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -346,12 +363,12 @@ msgstr "Отправить все ответы менеджеру"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "Общедоступные примечания"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
@@ -367,7 +384,7 @@ msgstr "Распечатать собеседование"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "закрыто"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -415,7 +432,7 @@ msgstr "План действия"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Evaluation Name"
-msgstr ""
+msgstr "(eval_name)s: Название тестирования"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -431,7 +448,7 @@ msgstr "Значительно превосходит ожидания"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_answer_employee:0
@@ -442,18 +459,18 @@ msgstr "Все ответы"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
@@ -463,7 +480,7 @@ msgstr "Оценка человеческих ресурсов"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -511,6 +528,7 @@ msgid ""
 "If the evaluation does not meet the expectations, you can proposean action "
 "plan"
 msgstr ""
+"Если тестирование не совпадает с ожиданиями, можно предложить план действий."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -538,17 +556,17 @@ msgstr "Оценка"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 дней"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Year "
-msgstr ""
+msgstr " Год "
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -558,12 +576,12 @@ msgstr "Начало испытания"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "Сделать"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -574,7 +592,7 @@ msgstr "Значительно ниже ожиданий"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr ""
+msgstr " (employee_name)s: Наименование контрагента"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -582,42 +600,42 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,plan_id:0
 msgid "Plan"
-msgstr ""
+msgstr "План"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -644,17 +662,17 @@ msgstr "Дата"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "Опрос"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "Это суммарная оценка тестирования"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -681,7 +699,7 @@ msgstr "Общий рейтинг"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Late"
-msgstr ""
+msgstr "С опозданием"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -707,7 +725,7 @@ msgstr "Запросы на оценку сверху вниз"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "Основная"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
@@ -725,7 +743,7 @@ msgstr "Следующая дата испытания"
 #: view:hr_evaluation.evaluation:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr ""
+msgstr "Выполнено"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -736,12 +754,12 @@ msgstr "Фазы плана оценки"
 #: view:hr.evaluation.reminder:0
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменено"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -750,58 +768,61 @@ msgid ""
 "employee's evaluation plan. Each user receives automatic emails and requests "
 "to evaluate their colleagues periodically."
 msgstr ""
+"Запросы на собеседование генерируются OpenERP автоматически в соотвествии с "
+"планом тестирования сотрудника. Каждый пользователь периодически получает "
+"автоматические сообщения и запросы на тестирование своих коллег."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Evaluation Phases"
-msgstr ""
+msgstr "Этапы тестирования"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "Тестовое собеседование"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
 msgid "Interview"
-msgstr ""
+msgstr "Собеседование"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "Напоминания о тестировании"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "Запросы самооценки"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "char"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "Формы оценки"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Внутренние примечания"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -816,7 +837,7 @@ msgstr "Завершающее собеседование"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr ""
+msgstr "Этап"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -841,7 +862,7 @@ msgstr "План оценки"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -851,12 +872,12 @@ msgstr "Отправить менеджерам"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
 msgid "Evaluation Send Mail"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
@@ -871,17 +892,17 @@ msgstr "Поиск по плану оценки"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "(months)"
-msgstr ""
+msgstr "(months)"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Последовательность"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(user_signature)s: Имя пользователя"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
@@ -892,13 +913,13 @@ msgstr "Запросы на собеседование"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
diff --git a/addons/hr_evaluation/i18n/sr.po b/addons/hr_evaluation/i18n/sr.po
index cdf785ca7e1..724b1941578 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index 8de98bc24f3..40caa580589 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index f6d06c515b7..e2eb3c87eb6 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/tr.po b/addons/hr_evaluation/i18n/tr.po
new file mode 100644
index 00000000000..71e11657fdc
--- /dev/null
+++ b/addons/hr_evaluation/i18n/tr.po
@@ -0,0 +1,896 @@
+# 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-08-23 11:09+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: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,wait:0
+msgid "Wait Previous Phases"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr.evaluation.report:0
+#: view:hr_evaluation.plan:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,request_id:0
+#: field:hr.evaluation.report,request_id:0
+msgid "Request_id"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,progress_bar:0
+#: field:hr_evaluation.evaluation,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
+msgid "My Evaluation Remaining"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Legend"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "You cannot start evaluation without Evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,delay_date:0
+msgid "Delay to Start"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr_evaluation.evaluation,rating:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#: code:addons/hr_evaluation/hr_evaluation.py:311
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,company_id:0
+#: field:hr_evaluation.plan.phase,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
+msgid "Evaluation Interviews"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,survey_id:0
+msgid "Appraisal Form"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,evaluation_id:0
+msgid "Evaluation Form"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
+msgid "Send an anonymous summary to the employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_first:0
+msgid ""
+"This number of months will be used to schedule the first evaluation date of "
+"the employee when selecting an evaluation plan. "
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Request"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Body"
+msgstr ""
+
+#. 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 "Evaluations Analysis"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
+msgid "Sends Reminders to employess to fill the evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Did not meet expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_next:0
+msgid "Periodicity of Evaluations (months)"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date_close:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_first:0
+msgid "First Evaluation in (months)"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:81
+#, python-format
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(employee_name)s,\n"
+"\n"
+"I am doing an evaluation regarding %(eval_name)s.\n"
+"\n"
+"Kindly submit your response.\n"
+"\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Employees"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Month "
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_next:0
+msgid ""
+"The number of month that depicts the delay between each evaluation of this "
+"plan (after the first one)."
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
+msgid "Periodic Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send evaluation reminder"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid ""
+"\n"
+"          Ability to create employees evaluation.\n"
+"          An evaluation can be created by employee for subordinates,\n"
+"          juniors as well as his manager.The evaluation is done under a "
+"plan\n"
+"          in which various surveys can be created and it can be defined "
+"which\n"
+"          level of employee hierarchy fills what and final review and "
+"evaluation\n"
+"          is done by the manager.Every evaluation filled by the employees "
+"can be viewed\n"
+"          in the form of.Implements a dashboard for My Current Evaluations\n"
+"         "
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(date)s: Current Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:80
+#, python-format
+msgid "Regarding "
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
+msgid "Evaluation Plan Phase"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,employee_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,employee_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,overpass_delay:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_body:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Exceeds expectations"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "Send all answers to the manager"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Public Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Evaluation Deadline"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Print Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,closed:0
+msgid "closed"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Meet expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,nbr:0
+msgid "# of Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
+msgid "Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
+msgid ""
+"Each employee may be assigned an evaluation 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 evaluations: bottom-up, top-down, self-evaluation and "
+"final evaluation by the manager."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Action to Perform"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_action:0
+msgid "Action Plan"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(eval_name)s:Evaluation Name"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Ending Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly exceeds expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "In progress"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Group by..."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Settings"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,user_to_review_id:0
+msgid "Employee to Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Question"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:survey.request,is_evaluation:0
+msgid "Is Evaluation?"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,wait:0
+msgid ""
+"Check this box if you want to wait that all preceding phases are finished "
+"before launching this phase."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,note_action:0
+msgid ""
+"If the evaluation does not meet the expectations, you can proposean action "
+"plan"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Evaluation Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_anonymous_employee:0
+#: field:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Anonymous Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "7 Days"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Start Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly bellow expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid " (employee_name)s: Partner name"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Send an anonymous summary to the manager"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interview Evaluation"
+msgstr ""
+
+#. 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 "Evaluation Plans"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Survey"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,rating:0
+msgid "This is the appreciation on that summarize the evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,action:0
+msgid "Action"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: selection:hr.evaluation.report,state:0
+msgid "Final Validation"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Waiting Appreciation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_feature:0
+msgid "Send mail for this phase"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,rating:0
+msgid "Overall Rating"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Late"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Interviewer"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
+msgid "Evaluations Statistics"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Deadline Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Top-Down Appraisal Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "General"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_employee:0
+msgid "Send all answers to the employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Evaluation Date"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Evaluation Plan Phases"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: view:hr_evaluation.evaluation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"Interview Requests are generated automatically by OpenERP according to an "
+"employee's evaluation plan. Each user receives automatic emails and requests "
+"to evaluate their colleagues periodically."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,phase_ids:0
+msgid "Evaluation Phases"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Current"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
+msgid "Evaluation Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.reminder,evaluation_id:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
+msgid "Evaluation Reminders"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Self Appraisal Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,email_subject:0
+msgid "char"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,survey_request_ids:0
+msgid "Appraisal Forms"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Validate Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Final Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,name:0
+msgid "Phase"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Bottom-Up Appraisal Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Search Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_plan_id:0
+#: view:hr_evaluation.plan:0
+#: 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 "Evaluation Plan"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Managers"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
+msgid "Evaluation Send Mail"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "Search Evaluation Plan"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "(months)"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(user_signature)s: User name"
+msgstr ""
+
+#. module: hr_evaluation
+#: 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 ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid ""
+"The date of the next evaluation is computed by the evaluation plan's dates "
+"(first evaluation + periodicity)."
+msgstr ""
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 103477b45dd..0ef4155779e 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -9,123 +9,123 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-08-03 06:44+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "计划进度"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr ""
+msgstr "等待前面的阶段"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
 #: field:hr.evaluation.report,request_id:0
 msgid "Request_id"
-msgstr ""
+msgstr "要求ID"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,progress_bar:0
 #: field:hr_evaluation.evaluation,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "进度"
 
 #. module: hr_evaluation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
 msgid "My Evaluation Remaining"
-msgstr ""
+msgstr "我的考评还有"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "图表"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "You cannot start evaluation without Evaluation."
-msgstr ""
+msgstr "您不能开启在考评范围外的考评"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
 msgid "Delay to Start"
-msgstr ""
+msgstr "推延开启"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr_evaluation.evaluation,rating:0
 msgid "Appreciation"
-msgstr ""
+msgstr "评价"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,company_id:0
 #: field:hr_evaluation.plan.phase,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Evaluation Interviews"
-msgstr ""
+msgstr "考评面谈"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,survey_id:0
 msgid "Appraisal Form"
-msgstr ""
+msgstr "评价表"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "天数"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 msgid "Evaluation Form"
-msgstr ""
+msgstr "考评表"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "给员工发一个匿名摘要"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
 msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
-msgstr ""
+msgstr "这个月份将在选择的考评计划里对员工进行首次考评。 "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -135,57 +135,57 @@ msgstr "备注"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr ""
+msgstr "面谈要求"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "邮件内容"
 
 #. 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 "Evaluations Analysis"
-msgstr ""
+msgstr "考评分析"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
-msgstr ""
+msgstr "给员工发送提醒去完成考评"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Did not meet expectations"
-msgstr ""
+msgstr "没有达到预期"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "评价"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "考评周期（月）"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
@@ -193,17 +193,17 @@ msgstr ""
 msgid ""
 "You cannot change state, because some appraisal in waiting answer or draft "
 "state"
-msgstr ""
+msgstr "您不能修改状态，因为有一些评价处于等待回复或草稿状态。"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
 msgid "Ending Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "首次考评在(月)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:81
@@ -225,38 +225,50 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"日期: %(date)s\n"
+"\n"
+"您好 %(employee_name)s \n"
+"\n"
+"我需要做一个关于 %(eval_name)s 的考评，请您回复答案。\n"
+"\n"
+"谢谢\n"
+"\n"
+"%(user_signature)s\n"
+"\n"
+"        "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "发送给员工"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "截止日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Month "
-msgstr ""
+msgstr " 月份 "
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_next:0
 msgid ""
 "The number of month that depicts the delay between each evaluation of this "
 "plan (after the first one)."
-msgstr ""
+msgstr "这个月份数字描述了计划中每次考评的间距（首次之后）"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "考评周期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "发送考评提醒"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
@@ -275,17 +287,23 @@ msgid ""
 "          in the form of.Implements a dashboard for My Current Evaluations\n"
 "         "
 msgstr ""
+"\n"
+"          能创建员工的考评。\n"
+"    可以对经理下的下属员工进行考评。\n"
+"    考评可以在计划创建不同的问卷并且它能定义不同级别的员工填写，最后由经理做审核。\n"
+"    在我当前的考评中里可以看到员工填写的每一个考评。\n"
+"         "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(date)s: 当前日期"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:80
 #, python-format
 msgid "Regarding "
-msgstr ""
+msgstr "关于 "
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -299,7 +317,7 @@ msgstr "状态"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "考评计划阶段"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -313,74 +331,74 @@ msgstr "员工"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超过截止日期"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Exceeds expectations"
-msgstr ""
+msgstr "超过预期"
 
 #. 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 ""
+msgstr "如果您想在这阶段发送电子邮件给员工，勾选"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr ""
+msgstr "发送所有的答案给经理"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "公开备注"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Evaluation Deadline"
-msgstr ""
+msgstr "考评截止日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Print Interview"
-msgstr ""
+msgstr "打印面谈"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "已结束"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Meet expectations"
-msgstr ""
+msgstr "达到预期目标"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,nbr:0
 msgid "# of Requests"
-msgstr ""
+msgstr "# 要求"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Evaluations"
-msgstr "考核"
+msgstr "考评"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
@@ -391,114 +409,116 @@ msgid ""
 "manages all kind of evaluations: bottom-up, top-down, self-evaluation and "
 "final evaluation by the manager."
 msgstr ""
+"每个员工可以指派一个考评计划。在计划里可以定义您管理的周期性考评的方式和次数。您可以定义每个阶段的步骤和附加的面谈。系统管理所有考评的类型： "
+"自上而下，自下而上，自我考评和经理最后考评。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Action to Perform"
-msgstr ""
+msgstr "要执行的操作"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_action:0
 msgid "Action Plan"
-msgstr ""
+msgstr "行动计划"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Evaluation Name"
-msgstr ""
+msgstr "(eval_name)s: 考评名称"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "结束总结"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly exceeds expectations"
-msgstr ""
+msgstr "大大超过预期"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr ""
+msgstr "进行中"
 
 #. 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 "所有答案"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
 msgid "Human Resources Evaluation"
-msgstr "人力资源考核"
+msgstr "人力资源考评"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr ""
+msgstr "分组"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Settings"
-msgstr ""
+msgstr "邮件设置"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "面谈员工"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Question"
-msgstr ""
+msgstr "面谈问题"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
 msgid "Is Evaluation?"
-msgstr ""
+msgstr "进行考评？"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "survey.request"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
 msgid ""
 "Check this box if you want to wait that all preceding phases are finished "
 "before launching this phase."
-msgstr ""
+msgstr "如果您要等前面所有阶段都完成才开启这阶段，勾选"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation Data"
-msgstr ""
+msgstr "考评日期"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,note_action:0
 msgid ""
 "If the evaluation does not meet the expectations, you can proposean action "
 "plan"
-msgstr ""
+msgstr "如果考评不符合期望，您可以终止这计划。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -509,60 +529,60 @@ msgstr "草稿"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Evaluation Summary"
-msgstr ""
+msgstr "考评总结"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "匿名摘要"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation"
-msgstr "考核"
+msgstr "考评"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "7 Days"
-msgstr ""
+msgstr "7天"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Year "
-msgstr ""
+msgstr " 年 "
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Evaluation"
-msgstr ""
+msgstr "开始考评"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "待处理"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly bellow expectations"
-msgstr ""
+msgstr "大大低于期望"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr ""
+msgstr " (employee_name)s: 业务伙伴名称"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -570,7 +590,7 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,plan_id:0
 msgid "Plan"
-msgstr ""
+msgstr "计划"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
@@ -580,49 +600,49 @@ msgstr "有效"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send Mail"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "发送匿名摘要给经理"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Evaluation"
-msgstr ""
+msgstr "考评面谈"
 
 #. 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 "Evaluation Plans"
-msgstr ""
+msgstr "考评计划"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -632,80 +652,80 @@ msgstr "日期"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "问卷"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "这评价是这考评的总结"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
-msgstr ""
+msgstr "操作"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "最终确认"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+msgstr "等待评价"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "这阶段发送邮件"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "总评分"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Late"
-msgstr ""
+msgstr "最近"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interviewer"
-msgstr ""
+msgstr "面谈主持"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "考评统计"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "截止日期"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr ""
+msgstr "要求自上而下的评价"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr ""
+msgstr "发送所有答案给员工"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "下一个考评日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -718,18 +738,18 @@ msgstr "完成"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr ""
+msgstr "考评计划阶段"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -737,85 +757,85 @@ msgid ""
 "Interview Requests are generated automatically by OpenERP according to an "
 "employee's evaluation plan. Each user receives automatic emails and requests "
 "to evaluate their colleagues periodically."
-msgstr ""
+msgstr "根据员工的考评计划系统自动产生面谈要求。用户和考评要求到的同事自动接收邮件。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Evaluation Phases"
-msgstr ""
+msgstr "考评阶段"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "考评面谈"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
 msgid "Interview"
-msgstr ""
+msgstr "面谈"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "考评提醒"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "要求自我的评价"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "字符"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "评价表"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "内部备注"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Evaluation"
-msgstr ""
+msgstr "确认考评"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "最后面谈"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr ""
+msgstr "阶段"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr ""
+msgstr "要求自下而上的评价"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Search Evaluation"
-msgstr ""
+msgstr "搜索考评"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_plan_id:0
@@ -824,76 +844,76 @@ msgstr ""
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Evaluation Plan"
-msgstr ""
+msgstr "考评计划"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Managers"
-msgstr ""
+msgstr "发给经理"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
 msgid "Evaluation Send Mail"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Evaluation"
-msgstr "员工考核"
+msgstr "员工考评"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "Search Evaluation Plan"
-msgstr ""
+msgstr "搜索考评计划"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "(months)"
-msgstr ""
+msgstr "（月份）"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(user_signature)s:用户名"
 
 #. module: hr_evaluation
 #: 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 "面谈要求"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
 msgid ""
 "The date of the next evaluation is computed by the evaluation plan's dates "
 "(first evaluation + periodicity)."
-msgstr ""
+msgstr "考评计划的下一个考评日期的计算方式（首个考评 + 周期）"
 
 #~ msgid "Score"
 #~ msgstr "评分"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 58008578df3..c70c1d27923 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -7,8 +7,8 @@
         <field name="model">hr.evaluation.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')"
-             string="Evaluations Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')"
+             string="Appraisal Analysis">
                 <field name="create_date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="deadline" invisible="1"/>
@@ -32,7 +32,7 @@
             <field name="model">hr.evaluation.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-            <graph string="Evaluations Analysis" type="bar">
+            <graph string="Appraisal Analysis" type="bar">
                  <field name="employee_id"/>
                  <field name="nbr" operator="+"/>
                  <field name="state" group="True"/>
@@ -45,14 +45,16 @@
         <field name="model">hr.evaluation.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Evaluations Analysis">
+            <search string="Appraisal Analysis">
             	<group>
-            		<filter icon="terp-go-year" string=" Year "
+            		<filter icon="terp-go-year" string="Year"
+                        name="year"
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
+                    <separator orientation="vertical"/>						
                     <filter icon="terp-go-month" string=" Month " name="month" 
                             domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Evaluation done in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
+	                <filter icon="terp-go-month" string="    Month-1    " 
                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Evaluation done in last month"/>
                     <separator orientation="vertical"/>
@@ -91,16 +93,16 @@
     </record>
 
     <record id="action_evaluation_report_all" model="ir.actions.act_window">
-        <field name="name">Evaluations Analysis</field>
+        <field name="name">Appraisal Analysis</field>
         <field name="res_model">hr.evaluation.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
     <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
-    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3"/>
+    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 1520b61b55a..e2f7978daea 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -19,5 +19,36 @@
     <record id="survey.menu_answer_surveys" model="ir.ui.menu">
         <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
     </record>
+    
+    <record id="hr_evaluation_plan_comp_rule" model="ir.rule">
+        <field name="name">Evaluation Plan multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    
+    <record id="hr_evaluation_plan_phase_comp_rule" model="ir.rule">
+        <field name="name">Evaluation Plan Phase multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan_phase"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <record id="hr_employee_interview" model="ir.rule">
+        <field name="name">Employee Interview</field>
+        <field ref="model_hr_evaluation_interview" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field eval="False" name="global"/>
+        <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+    
+    <record id="hr_employee_interview_hr" model="ir.rule">
+        <field name="name">Employee Interview - HR</field>
+        <field ref="model_hr_evaluation_interview" name="model_id"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field eval="False" name="global"/>
+        <field name="groups" eval="[(4, ref('base.group_hr_user'))]"/>
+    </record>
+    
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 1a90b98931d..377098a6fe6 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -4,6 +4,7 @@
 "access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
 "access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
 "access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,1,1,0
 "access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
 "access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
@@ -25,6 +26,7 @@
 "access_survey_response_hr_user","survey.response.hr.user","survey.model_survey_response","base.group_hr_user",1,1,1,0
 "access_survey_history_hr_user","survey.history.hr.user","survey.model_survey_history","base.group_hr_user",1,1,1,0
 "access_survey_request_hr_user","survey.request.hr.user","survey.model_survey_request","base.group_hr_user",1,1,1,0
+"access_survey_request_hr_employee","survey.request.hr.employee","survey.model_survey_request","base.group_user",1,1,1,0
 "access_survey_question_column_heading_hr_user","survey.question.column.heading.hr.user","survey.model_survey_question_column_heading","base.group_hr_user",1,0,0,0
 "access_survey_response_line_hr_user","survey.response.line.hr.user","survey.model_survey_response_line","base.group_hr_user",1,1,1,0
 "access_survey_tbl_column_heading_hr_user","survey.tbl.column.heading.hr.user","survey.model_survey_tbl_column_heading","base.group_hr_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 a1c2f92ad1d..893f19d0a3e 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -96,7 +96,13 @@
         name: Final Interview with manager
         sequence: 2
         survey_id: 'survey_0'
-
+-
+  I assign the evaluation plan to the employee "Mark Johnson".
+-
+  !python {model: hr.employee}: |
+    res = self.onchange_evaluation_plan_id(cr, uid, [ref('hr_employee_employee0')], ref('hr_evaluation_plan_managersplan0'), False, None)
+    values = dict([('evaluation_plan_id', ref('hr_evaluation_plan_managersplan0'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_employee_employee0')], values, None)
 -
   I create an Evaluation for employee under "Manager Evaluation Plan".
 -
@@ -106,18 +112,37 @@
     plan_id: 'hr_evaluation_plan_managersplan0'
     progress: 0.0
     state: draft
+-
+  I change the employee on Evaluation.
+-
+  !python {model: hr_evaluation.evaluation}: |
+    res = self.onchange_employee_id(cr, uid, [ref('hr_evaluation_evaluation_0')], ref('hr_employee_employee0'), None)
+    values = dict([('employee_id', ref('hr_employee_employee0'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_evaluation_evaluation_0')], values, None)
 -
   I start the evaluation process by click on "Start Evaluation" button.
 -
   !python {model: hr_evaluation.evaluation}: |
      self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
-
+-
+  I find a mistake on evaluation form. So I cancel the evaluation and again start it.
+-
+  !python {model: hr_evaluation.evaluation}: |
+     self.button_cancel(cr, uid, [ref('hr_evaluation_evaluation_0')])
+     self.button_draft(cr, uid, [ref('hr_evaluation_evaluation_0')])
+     self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
 -
   I close this survey request by giving answer of survey question.
 -
   !python {model: hr_evaluation.evaluation}: |
     evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
     self.pool.get('hr.evaluation.interview').survey_req_done(cr, uid, [r.id for r in evaluation.survey_request_ids])
+-
+  I print the survey.
+-
+  !python {model: hr_evaluation.evaluation}: |
+    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
+    self.pool.get('hr.evaluation.interview').action_print_survey(cr, uid, [r.id for r in evaluation.survey_request_ids])
 -
   I click on "Final Validation" button to finalise evaluation.
 -
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/hr_evaluation/wizard/__init__.py
index 1a855087bbc..64406ac6b1e 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/hr_evaluation/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
-import hr_evaluation_mail
+#import hr_evaluation_mail
+import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 17ad7415cb5..35c54a4cca3 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -23,21 +23,20 @@ import tools
 
 class hr_evaluation_reminder(osv.osv_memory):
     _name = "hr.evaluation.reminder"
-    _description = "Sends Reminders to employess to fill the evaluations"
+    _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)
-            tools.email_send(tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
-                                          'Reminder to fill up Survey', msg)
+            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'}
 
-hr_evaluation_reminder()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..7b4c1b69164
--- /dev/null
+++ b/addons/hr_evaluation/wizard/mail_compose_message.py
@@ -0,0 +1,60 @@
+# -*- 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_from': tools.config.get('email_from',''),
+                        'email_to': record_data.user_to_review_id.work_email or False,
+                        'subject': _("Reminder to fill up Survey"),
+                        'body_text': msg,
+                        'res_id': resource_id,
+                        'model': model,
+                        'email_cc': False,
+                        'email_bcc': False,
+                        'reply_to': False,
+                    })
+        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 09352fcfa89..4a22f00e076 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources Expenses Tracking',
+    'name': 'Expenses',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index d86c7614d7f..0f09c9a3290 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -16,17 +16,10 @@
 			<field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside">
-				 <action colspan="4" height="220" name="%(action_employee_expense)d" string="All Employee Expenses" />
+      		<xpath expr="/form/board/column" position="inside">
+				 <action name="%(action_employee_expense)d" string="All Employee Expenses"/>
 			</xpath>
             </field>
         </record>
-        <menuitem
-            action="hr.open_board_hr_manager"
-            icon="terp-graph"
-            id="base.menu_hr_manager"
-            parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
-            sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 0493f628ebd..d9c80d6f755 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -2,18 +2,12 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
-        <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
         <record id="action_my_expense" model="ir.actions.act_window">
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','in',('confirm', 'accepted')),('user_id','=',uid)]</field>
+            <field name="context">{'default_user_id': uid}</field>
             <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
         </record>
 
@@ -23,8 +17,8 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1" position="inside">
-                     <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
+                <xpath expr="/form/board/column" position="inside">
+                     <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 4ab71801a67..478b8120935 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -77,7 +77,7 @@ class hr_expense_expense(osv.osv):
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
-            ('draft', 'Draft'),
+            ('draft', 'New'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
@@ -92,14 +92,17 @@ class hr_expense_expense(osv.osv):
         'employee_id': _employee_get,
         'user_id': lambda cr, uid, id, c={}: id,
         'currency_id': _get_currency,
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
+        emp_obj = self.pool.get('hr.employee')
         department_id = False
+        company_id = False
         if employee_id:
-            department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id or False
-        return {'value':{'department_id':department_id}}
+            employee = emp_obj.browse(cr, uid, employee_id, context=context)
+            department_id = employee.department_id.id
+            company_id = employee.company_id.id
+        return {'value': {'department_id': department_id, 'company_id': company_id}}
 
     def expense_confirm(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
@@ -128,7 +131,6 @@ class hr_expense_expense(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         mod_obj = self.pool.get('ir.model.data')
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
-        res_id = res and res[1] or False,
         inv_ids = []
         for id in ids:
             wf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr)
@@ -136,8 +138,8 @@ class hr_expense_expense(osv.osv):
         return {
             'name': _('Supplier Invoices'),
             'view_type': 'form',
-            'view_mode': 'form,tree',
-            'view_id': [res_id],
+            'view_mode': 'form',
+            'view_id': [res and res[1] or False],
             'res_model': 'account.invoice',
             'context': "{'type':'out_invoice', 'journal_type': 'purchase'}",
             'type': 'ir.actions.act_window',
@@ -154,6 +156,7 @@ class hr_expense_expense(osv.osv):
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         account_journal = self.pool.get('account.journal')
         for exp in self.browse(cr, uid, ids):
+            company_id = exp.company_id.id
             lines = []
             for l in exp.line_ids:
                 tax_id = []
@@ -163,10 +166,9 @@ class hr_expense_expense(osv.osv):
                         acc = l.product_id.categ_id.property_account_expense_categ
                     tax_id = [x.id for x in l.product_id.supplier_taxes_id]
                 else:
-                    acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category')
+                    acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
                     if not acc:
                         raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
-
                 lines.append((0, False, {
                     'name': l.name,
                     'account_id': acc.id,
@@ -191,6 +193,7 @@ class hr_expense_expense(osv.osv):
                 'partner_id': exp.employee_id.address_home_id.partner_id.id,
                 'address_invoice_id': exp.employee_id.address_home_id.id,
                 'address_contact_id': exp.employee_id.address_home_id.id,
+                'company_id': company_id,
                 'origin': exp.name,
                 'invoice_line': lines,
                 'currency_id': exp.currency_id.id,
@@ -206,7 +209,7 @@ class hr_expense_expense(osv.osv):
                 inv['journal_id']=exp.journal_id.id
                 journal = exp.journal_id
             else:
-                journal_id = invoice_obj._get_journal(cr, uid, context={'type': 'in_invoice'})
+                journal_id = invoice_obj._get_journal(cr, uid, context={'type': 'in_invoice', 'company_id': company_id})
                 if journal_id:
                     inv['journal_id'] = journal_id
                     journal = account_journal.browse(cr, uid, journal_id)
@@ -259,7 +262,7 @@ class hr_expense_line(osv.osv):
         'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
         'unit_quantity': fields.float('Quantities' ),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
-        'uom_id': fields.many2one('product.uom', 'UoM' ),
+        'uom_id': fields.many2one('product.uom', 'UoM'),
         'description': fields.text('Description'),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
         'ref': fields.char('Reference', size=32),
@@ -276,7 +279,7 @@ class hr_expense_line(osv.osv):
         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', context=context)[product.id]
+            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
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index a5c378238a6..bdb5fdedcb4 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -24,6 +24,7 @@
            <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
            <field name="domain">[('hr_expense_ok','=',True)]</field>
            <field name="view_id" ref="product_expense_installer_tree_view"/>
+           <field name="help">Define one product for each expense type allowed for an employee (travel by car, hostel, restaurant, etc). If you reimburse the employees at a fixed rate, set a cost and a unit of measure on the product. If you reimburse based on real costs, set the cost at 0.00. The user will set the real price when recording his expense sheet.</field>
        </record>
 
        <record id="product_normal_form_view_todo" model="ir.actions.todo">
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 750404c40d9..786dc6beee2 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -46,7 +46,7 @@
             <field name="model">hr.expense.expense</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')"  string="Expenses" editable="top">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'"  string="Expenses" editable="top">
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id" groups="base.group_extended"/>
@@ -99,11 +99,11 @@
                                     </group>
                                 </form>
                             </field>
-                            <field name="state"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                             <group col="6" colspan="2">
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
                                 <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
-                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
+                                <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
                                 <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
                             </group>
@@ -136,8 +136,7 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
-                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="Draft" help="Draft Expense"/>
-                      <separator orientation="vertical"/>
+                      <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-dolar" domain="[('state','=','accepted')]" string="To Pay"
@@ -146,13 +145,13 @@
                       <filter icon="terp-go-month" string="This Month" name="this"
                               domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
-                      <field name="employee_id" select='1'/>
-                      <field name="date" select='1'/>
+                      <field name="employee_id"/>
+                      <field name="date"/>
                       <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
                    <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
                     </field>
-                      <field name="name" select='1'/>
-                      <field name="user_id"  string="User" invisible="True">
+                      <field name="name"/>
+                      <field name="user_id"  string="User">
                       <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 7946bef3b6b..328a07879a4 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -104,13 +104,6 @@
         </record>
 
         <record id="t10" model="workflow.transition">
-            <field name="act_from" ref="act_invoice"/>
-            <field name="act_to" ref="act_refused"/>
-            <field name="signal">subflow.cancel</field>
-            <field name="group_id" ref="base.group_hr_user"/>
-        </record>
-
-		<record id="t11" model="workflow.transition">
             <field name="act_from" ref="act_refused"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index cf9be899fd8..8bb7331a983 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index b3af4f31cf7..8dd2ddf6516 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Състояние"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Грешка!"
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index 8147943ccfa..99f00dc7139 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Stanje"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Greška !"
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 2970f013a21..ceba8b64aa2 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -138,6 +138,22 @@ msgid ""
 "    re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul permet gestionar les despeses dels treballadors.\n"
+"\n"
+"    S'ha implementat el flux complet:\n"
+"    * Despesa en esborrany\n"
+"    * Confirmació del full de despeses per l'empleat\n"
+"    * Validació pel seu responsable\n"
+"    * Validació pel comptable i creació de la factura\n"
+"    * Pagament de la factura a l'empleat\n"
+"\n"
+"    Aquest mòdul també utilitza la comptabilitat analítica i és compatible "
+"amb\n"
+"    el mòdul de facturació de fulls de serveis de forma que pugui\n"
+"    re-facturar automàticament les  seves despeses de clients si treballa "
+"per projectes.\n"
+"    "
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -189,7 +205,7 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Núm. de línies"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
@@ -253,7 +269,7 @@ msgid "State"
 msgstr "Estat"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -288,8 +304,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alguns costos poden ser refacturats al client"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -330,7 +347,7 @@ msgstr "Diari forçat"
 #: view:hr.expense.report:0
 #: field:hr.expense.report,no_of_products:0
 msgid "# of Products"
-msgstr ""
+msgstr "Núm. de productes"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -389,24 +406,24 @@ msgstr "Línies de despeses"
 #. module: hr_expense
 #: field:hr.expense.report,delay_confirm:0
 msgid "Delay to Confirm"
-msgstr ""
+msgstr "Temps fins a confirmar"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_expense
 #: field:hr.expense.expense,currency_id:0
@@ -417,7 +434,7 @@ msgstr "Moneda"
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Està esperant l'aprovació"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
@@ -434,12 +451,12 @@ msgstr "Facturat"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "Pot ser una despesa"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Any  "
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -477,7 +494,7 @@ msgstr "Despesa està aprovada."
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_approved0
@@ -492,7 +509,7 @@ msgstr "Import total"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
@@ -502,7 +519,7 @@ msgstr "Despeses esborrany"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Customer Project"
-msgstr ""
+msgstr "Projecte del client"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -520,17 +537,17 @@ msgstr "Data"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -540,7 +557,7 @@ msgstr "Total:"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -571,13 +588,13 @@ msgstr "Full de despeses"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Waiting"
-msgstr ""
+msgstr "En espera"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: hr_expense
 #: model:ir.module.module,shortdesc:hr_expense.module_meta_information
@@ -587,7 +604,7 @@ msgstr "Seguiment de les despeses dels recursos humans"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "References"
-msgstr ""
+msgstr "Referències"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -605,7 +622,7 @@ msgstr "Refactura"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_employee_expense
 msgid "All Employee Expenses"
-msgstr ""
+msgstr "Totes les despeses del treballador"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -615,7 +632,7 @@ msgstr "Altra info."
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "El diari utilitzat quan es factura la despesa"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -665,7 +682,7 @@ msgstr "Producte"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expenses of My Department"
-msgstr ""
+msgstr "Despeses del meu departament"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -677,7 +694,7 @@ msgstr "Descripció"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: hr_expense
 #: field:hr.expense.line,unit_quantity:0
@@ -687,12 +704,12 @@ msgstr "Quantitats"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Price"
-msgstr ""
+msgstr "Preu"
 
 #. module: hr_expense
 #: field:hr.expense.report,no_of_account:0
 msgid "# of Accounts"
-msgstr ""
+msgstr "Núm. de comptes"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -708,7 +725,7 @@ msgstr "Ref."
 #. module: hr_expense
 #: field:hr.expense.report,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nom del treballador"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.expense_all
@@ -720,11 +737,17 @@ msgid ""
 "and the employee can be reimbursed. You can also reinvoice the customer at "
 "the end of the flow."
 msgstr ""
+"El mòdul de gestió de despeses d'OpenERP li permet fer un seguiment de tot "
+"el procés. Cada mes, els treballadors introdueixen les seves despeses. Al "
+"final del mes, els seus responsables validen els fulls de despeses les quals "
+"creen costos en comptes analítics. El comptable valida les entrades "
+"proposades i es pot reemborsar al treballador. Podeu re-facturar al client "
+"al final del procés."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "This Month"
-msgstr ""
+msgstr "Aquest mes"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
@@ -741,7 +764,7 @@ msgstr "(Data i signatura)"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -751,7 +774,7 @@ msgstr "Nom"
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Ledger Posting"
-msgstr ""
+msgstr "Fixat llibre comptable"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -761,17 +784,17 @@ msgstr "Crea factura de proveïdor."
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
 msgid "Hotel Accommodation"
-msgstr ""
+msgstr "Allotjament hotel"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_expense
 #: field:hr.expense.line,name:0
 msgid "Expense Note"
-msgstr ""
+msgstr "Nota de despesa"
 
 #. module: hr_expense
 #: help:hr.expense.expense,state:0
@@ -783,11 +806,17 @@ 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 ""
+"Quan la sol·licitud de despesa és creada l'estat és 'esborrany'.\n"
+" Si l'usuari la confirma i s'envia al responsable, l'estat és 'esperant "
+"confirmació'.            \n"
+"Si el responsable l'accepta, l'estat és 'acceptada'.\n"
+" Si es factura, l'estat és 'facturada'.\n"
+" Si es paga a l'usuari, l'estat és 'reemborsada'"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprova"
 
 #. module: hr_expense
 #: view:hr.expense.line:0
@@ -816,18 +845,18 @@ msgstr "Despeses"
 #. module: hr_expense
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Codi EAN no vàlid"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Approve"
-msgstr ""
+msgstr "Per aprovar"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
@@ -835,6 +864,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
 msgstr ""
+"Determina si el producte es pot visualitzar en la llista de productes a "
+"seleccionar en una línia del full de despeses."
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index cf9be899fd8..8bb7331a983 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index f0b45f28555..e75155cf7fd 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -271,7 +271,7 @@ msgid "State"
 msgstr "Status"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -306,8 +306,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Einige Aufwendungen können an Kunde weiterberechnet werden"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Fehler !"
@@ -963,41 +964,3 @@ msgstr "Weiterberechnung"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "Extended filters..."
-#~ msgstr "Erweiterter Filter..."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Fehler: Verkaufseinheit sollte in einer anderen Kategorie sein als "
-#~ "Mengeneinheit (ME)"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "Der Mitarbeiter muss eine gültige Anschrift hinterlegt haben."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fehler: Die Standard Mengeneinheit sowie die Beschaffungs ME muss in "
-#~ "derselben Kategorie sein."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index 7e3def5c5df..03add68112f 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -251,7 +251,7 @@ msgid "State"
 msgstr "Νομός"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -284,8 +284,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Κάποια έξοδα μπορεί να είναι ανατιμολογήσεις στον πελάτη"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Σφάλμα!"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index fc5946d8602..3b4f12bd130 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -267,7 +267,7 @@ msgid "State"
 msgstr "Estado"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -302,8 +302,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Algunos costes pueden ser refacturados al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -950,7 +951,3 @@ msgstr "Refacturació"
 
 #~ 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 "The employee must have a working address"
-#~ msgstr "El empleado debe tener una dirección de trabajo"
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index 15ce1cb40ee..6f009773c99 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Provincia"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Algunos costos pueden ser refacturaciones al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
diff --git a/addons/hr_expense/i18n/es_EC.po b/addons/hr_expense/i18n/es_EC.po
index cf65f33b503..05cc9dd3fae 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
 msgstr "Estado"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Algunos costes pueden ser refacturados al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/es_MX.po b/addons/hr_expense/i18n/es_MX.po
new file mode 100644
index 00000000000..3a6c2ccf317
--- /dev/null
+++ b/addons/hr_expense/i18n/es_MX.po
@@ -0,0 +1,953 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_expense
+#
+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-13 03:37+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: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
+msgid "Confirmed Expenses"
+msgstr "Gastos confirmados"
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_line
+msgid "Expense Line"
+msgstr "Línea de gasto"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reimbursement0
+msgid "The accoutant reimburse the expenses"
+msgstr "El contable reembolsa los gastos"
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_confirm:0
+#: field:hr.expense.report,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_air_product_template
+msgid "Air Ticket"
+msgstr "Billete de avión"
+
+#. 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 "Departamento"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_expense
+#: field:hr.expense.report,invoiced:0
+msgid "# of Invoiced Lines"
+msgstr "Nº de líneas facturadas"
+
+#. module: hr_expense
+#: field:hr.expense.expense,company_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Pay"
+msgstr "A pagar"
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_report
+msgid "Expenses Statistics"
+msgstr "Estadísticas de gastos"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: model:process.node,name:hr_expense.process_node_approved0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: hr_expense
+#: field:hr.expense.line,uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_valid:0
+msgid ""
+"Date of the acceptation of the sheet expense. It's filled when the button "
+"Accept is pressed."
+msgstr ""
+"Fecha de aceptación de la hoja de gastos. Se rellena cuando pulsamos el "
+"botón aceptar."
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_expense
+#: field:hr.expense.expense,invoice_id:0
+msgid "Employee's Invoice"
+msgstr "Factura de empleado"
+
+#. module: hr_expense
+#: model:ir.module.module,description:hr_expense.module_meta_information
+msgid ""
+"\n"
+"    This module aims to manage employee's expenses.\n"
+"\n"
+"    The whole workflow is implemented:\n"
+"    * Draft expense\n"
+"    * Confirmation of the sheet by the employee\n"
+"    * Validation by his manager\n"
+"    * Validation by the accountant and invoice creation\n"
+"    * Payment of the invoice to the employee\n"
+"\n"
+"    This module also uses the analytic accounting and is compatible with\n"
+"    the invoice on timesheet module so that you will be able to "
+"automatically\n"
+"    re-invoice your customer's expenses if your work by project.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite gestionar los gastos de los empleados.\n"
+"\n"
+"    Se ha implementado el flujo completo:\n"
+"    * Gasto en borrador\n"
+"    * Confirmación de la hoja de gastos por el empleado\n"
+"    * Validación por su responsable\n"
+"    * Validación por el contable y creación de la factura\n"
+"    * Pago de la factura al empleado\n"
+"\n"
+"    Este módulo también usa la contabilidad analítica y es compatible con\n"
+"    el módulo de facturación de hojas de servicios de forma que pueda\n"
+"     re-facturar automáticamente sus gastos de clientes si trabaja por "
+"proyectos.\n"
+"    "
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Waiting confirmation"
+msgstr "Esperando confirmación"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Accepted"
+msgstr "Aceptado"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.expense,ref:0
+#: field:hr.expense.line,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Certified honest and conform,"
+msgstr "Certifica que los datos son ciertos,"
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_confirm:0
+msgid ""
+"Date of the confirmation of the sheet expense. It's filled when the button "
+"Confirm is pressed."
+msgstr ""
+"Fecha de confirmación de la hoja de gastos. Se rellena cuando pulsamos el "
+"botón confirmar."
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_refuseexpense0
+msgid "Refuse expense"
+msgstr "Rechazar gasto"
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_car_product_template
+msgid "Car Travel"
+msgstr "Viaje en coche"
+
+#. module: hr_expense
+#: field:hr.expense.report,price_average:0
+msgid "Average Price"
+msgstr "Precio promedio"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Total Invoiced Lines"
+msgstr "Total líneas facturadas"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_supplierinvoice0
+msgid "The accoutant validates the sheet"
+msgstr "El contable valida la hoja"
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_valid:0
+msgid "Delay to Valid"
+msgstr "Tiempo hasta validar"
+
+#. module: hr_expense
+#: help:hr.expense.line,sequence:0
+msgid "Gives the sequence order when displaying a list of expense lines."
+msgstr "Da el orden de secuencia al mostrar una lista de líneas de gastos."
+
+#. module: hr_expense
+#: field:hr.expense.line,analytic_account:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,analytic_account:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_expense
+#: field:hr.expense.report,date:0
+msgid "Date "
+msgstr "Fecha "
+
+#. module: hr_expense
+#: field:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:144
+#, python-format
+msgid ""
+"Please configure Default Expense account for Product purchase, "
+"`property_account_expense_categ`"
+msgstr ""
+"Por favor, configure la cuenta de gastos por defecto para compras de "
+"productos, `property_account_expense_categ`"
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,employee_id:0
+#: view:hr.expense.report:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.report,product_qty:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reinvoicing0
+msgid "Some costs may be reinvoices to the customer"
+msgstr "Algunos costes pueden ser refacturados al cliente"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_expense
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_my_expense
+msgid "My Expenses"
+msgstr "Mis gastos"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: hr_expense
+#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
+msgid "HR expenses"
+msgstr "Gastos RRHH"
+
+#. module: hr_expense
+#: field:hr.expense.expense,id:0
+msgid "Sheet ID"
+msgstr "ID hoja"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimburseexpense0
+msgid "Reimburse expense"
+msgstr "Reembolsar gasto"
+
+#. module: hr_expense
+#: field:hr.expense.expense,journal_id:0
+#: field:hr.expense.report,journal_id:0
+msgid "Force Journal"
+msgstr "Diario forzado"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,no_of_products:0
+msgid "# of Products"
+msgstr "Nº de productos"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
+msgid "After creating invoice, reimburse expenses"
+msgstr "Después de crear factura, reembolsar gastos"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reimbursement0
+msgid "Reimbursement"
+msgstr "Reemborso"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:158
+#, python-format
+msgid "The employee must have a Home address"
+msgstr "El empleado debe tener un domicilio"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_valid:0
+#: field:hr.expense.report,date_valid:0
+msgid "Validation Date"
+msgstr "Fecha de validación"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
+msgid "Expenses Analysis"
+msgstr "Análisis de gastos"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.line,expense_id:0
+#: model:ir.model,name:hr_expense.model_hr_expense_expense
+#: model:process.process,name:hr_expense.process_process_expenseprocess0
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,line_ids:0
+#: view:hr.expense.line:0
+msgid "Expense Lines"
+msgstr "Líneas de gastos"
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_confirm:0
+msgid "Delay to Confirm"
+msgstr "Tiempo hasta confirmar"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_expense
+#: field:hr.expense.expense,currency_id:0
+#: field:hr.expense.report,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+msgid "Waiting Approval"
+msgstr "Esperando aprobación"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_draftexpenses0
+msgid "Employee encode all his expenses"
+msgstr "Empleado codifica todos sus gastos"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: selection:hr.expense.report,state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: hr_expense
+#: field:product.product,hr_expense_ok:0
+msgid "Can Constitute an Expense"
+msgstr "Puede ser un gasto"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: selection:hr.expense.report,state:0
+msgid "Reimbursed"
+msgstr "Reintegrado"
+
+#. module: hr_expense
+#: field:hr.expense.expense,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimbursereinvoice0
+msgid "Create Customer invoice"
+msgstr "Crear factura de cliente"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: selection:hr.expense.expense,state:0
+#: selection:hr.expense.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Accounting data"
+msgstr "Datos contabilidad"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveexpense0
+msgid "Expense is approved."
+msgstr "Gasto está aprobado."
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_approved0
+msgid "The direct manager approves the sheet"
+msgstr "El responsable inmediato aprueba la hoja."
+
+#. module: hr_expense
+#: field:hr.expense.expense,amount:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_draftexpenses0
+msgid "Draft Expenses"
+msgstr "Gastos borrador"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Customer Project"
+msgstr "Proyecto de cliente"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.expense,date:0
+#: field:hr.expense.line,date_value:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "HR Expenses"
+msgstr "Gastos RRHH"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_confirmedexpenses0
+msgid "The employee validates his expense sheet"
+msgstr "El empleado valida su hoja de gastos"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_refused0
+msgid "The direct manager refuses the sheet.Reset as draft."
+msgstr ""
+"El responsable inmediato rechaza la hoja. Restablecida como borrador."
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_supplierinvoice0
+#: model:process.transition,name:hr_expense.process_transition_approveinvoice0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses Sheet"
+msgstr "Hoja de gastos"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_expense
+#: model:ir.module.module,shortdesc:hr_expense.module_meta_information
+msgid "Human Resources Expenses Tracking"
+msgstr "Seguimiento de los gastos de los recursos humanos"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.report,invoice_id:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
+msgid "Reinvoice"
+msgstr "Refacturar"
+
+#. module: hr_expense
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_employee_expense
+msgid "All Employee Expenses"
+msgstr "Todos los gastos del empleado"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. module: hr_expense
+#: help:hr.expense.expense,journal_id:0
+msgid "The journal used when the expense is invoiced"
+msgstr "El diario usado cuando se factura el gasto"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0
+msgid "Refuse"
+msgstr "Rechazar"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_confirmexpense0
+msgid "Confirm expense"
+msgstr "Confirmar gasto"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_approveexpense0
+msgid "Approve expense"
+msgstr "Aprobar gasto"
+
+#. module: hr_expense
+#: model:process.transition.action,name:hr_expense.process_transition_action_accept0
+msgid "Accept"
+msgstr "Acceptar"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "This document must be dated and signed for reimbursement"
+msgstr "Este documento debe estar fechado y firmado para su cobro"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_refuseexpense0
+msgid "Expense is refused."
+msgstr "Gasto es rechazado."
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.line,unit_amount:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: hr_expense
+#: field:hr.expense.line,product_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,product_id:0
+#: model:ir.model,name:hr_expense.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses of My Department"
+msgstr "Gastos de mi departamento"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,name:0
+#: field:hr.expense.line,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_expense
+#: field:hr.expense.line,unit_quantity:0
+msgid "Quantities"
+msgstr "Cantidades"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: hr_expense
+#: field:hr.expense.report,no_of_account:0
+msgid "# of Accounts"
+msgstr "Nº de cuentas"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: model:process.node,name:hr_expense.process_node_refused0
+msgid "Refused"
+msgstr "Rechazado"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Ref."
+msgstr "Ref."
+
+#. module: hr_expense
+#: field:hr.expense.report,employee_id:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.expense_all
+msgid ""
+"The OpenERP expenses management module allows you to track the full flow. "
+"Every month, the employees record their expenses. At the end of the month, "
+"their managers validates the expenses sheets which creates costs on "
+"projects/analytic accounts. The accountant validates the proposed entries "
+"and the employee can be reimbursed. You can also reinvoice the customer at "
+"the end of the flow."
+msgstr ""
+"El módulo de gestión de gastos de OpenERP le permite hacer un seguimiento de "
+"todo el proceso. Cada mes, los empleados introducen sus gastos. Al final del "
+"mes, sus responsables validan las hojas de gastos las cuales crean costes en "
+"cuentas analíticas. El contable valida las entradas propuestas y se puede "
+"reembolsar al empleado. Puede refacturar al cliente al final del proceso."
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: hr_expense
+#: field:hr.expense.expense,user_valid:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,user_id:0
+msgid "Validation User"
+msgstr "Validación usuario"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "(Date and signature)"
+msgstr "(Fecha y firma)"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_expense
+#: field:hr.expense.expense,account_move_id:0
+msgid "Ledger Posting"
+msgstr "Fijado libro contable"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveinvoice0
+msgid "Creates supplier invoice."
+msgstr "Crea factura de proveedor."
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
+msgid "Hotel Accommodation"
+msgstr "Alojamiento hotel"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_expense
+#: field:hr.expense.line,name:0
+msgid "Expense Note"
+msgstr "Nota de gasto"
+
+#. module: hr_expense
+#: help:hr.expense.expense,state:0
+msgid ""
+"When the expense request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Confirmation'.            \n"
+"If the admin accepts it, the state is 'Accepted'.\n"
+" 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 ""
+"Cuando la solicitud de gasto es creada el estado es 'borrador'.\n"
+" Si el usuario la confirma y se envia al responsable, el estado es "
+"'esperando confirmación'.            \n"
+"Si el responsable la acepta, el estado es 'aceptada'.\n"
+" Si se factura, el estado es 'facturada'.\n"
+" Si se paga al usuario, el estado es 'reembolsada'"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: hr_expense
+#: view:hr.expense.line:0
+#: field:hr.expense.line,total_amount:0
+msgid "Total"
+msgstr "Total"
+
+#. module: hr_expense
+#: field:hr.expense.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_confirmexpense0
+msgid "Expense is confirmed."
+msgstr "El gasto es confirmado."
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:ir.actions.act_window,name:hr_expense.expense_all
+#: model:ir.ui.menu,name:hr_expense.menu_expense_all
+#: model:ir.ui.menu,name:hr_expense.next_id_49
+msgid "Expenses"
+msgstr "Gastos"
+
+#. module: hr_expense
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: hr_expense
+#: help:product.product,hr_expense_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from an HR expense sheet line."
+msgstr ""
+"Determina si el producto se puede visualizar en la lista de productos a "
+"seleccionar en una línea de la hoja de gastos."
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reinvoicing0
+msgid "Reinvoicing"
+msgstr "Refacturació"
+
+#~ msgid "Expenses waiting validation"
+#~ msgstr "Gastos esperando validación"
+
+#~ msgid "Date Confirmed"
+#~ msgstr "Fecha confirmación"
+
+#~ msgid "My expenses waiting validation"
+#~ msgstr "Mis gastos esperando validación"
+
+#~ msgid "All expenses"
+#~ msgstr "Todos los gastos"
+
+#~ msgid "Print HR expenses"
+#~ msgstr "Imprimir gastos RRHH"
+
+#~ msgid "New Expenses Sheet"
+#~ msgstr "Nueva hoja de gastos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#, python-format
+#~ msgid "The employee must have a contact address"
+#~ msgstr "El empleado debe tener una dirección de contacto"
+
+#~ 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 "Account Move"
+#~ msgstr "Asiento"
+
+#~ msgid "Expenses waiting payment"
+#~ msgstr "Gastos esperando pago"
+
+#~ msgid "My Draft expenses"
+#~ msgstr "Mis gastos borrador"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Expense Process"
+#~ msgstr "Proceso de gastos"
+
+#~ msgid "Draft expenses"
+#~ msgstr "Gastos borrador"
+
+#~ msgid "Expenses waiting invoice"
+#~ msgstr "Gastos esperando factura"
+
+#~ msgid "Expense Sheet"
+#~ msgstr "Hoja de gastos"
+
+#~ msgid "Short Description"
+#~ msgstr "Descripción breve"
+
+#~ msgid "Date Validated"
+#~ msgstr "Fecha validación"
+
+#~ msgid "Can be Expensed"
+#~ msgstr "Puede ser un gasto"
+
+#~ msgid ""
+#~ "Determine if the product can be visible in the list of product within a "
+#~ "selection from an HR expense sheet line."
+#~ msgstr ""
+#~ "Indica si el producto puede ser visible en la lista de productos "
+#~ "seleccionables dentro de una línea de hoja de gastos de recursos humanos."
+
+#, python-format
+#~ msgid ""
+#~ "Please configure Default Expanse account for Product purchase, "
+#~ "`property_account_expense_categ`"
+#~ msgstr ""
+#~ "Por favor, configure la cuenta de gastos por defecto para la compra de "
+#~ "productos, `property_account_expense_categ`"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/hr_expense/i18n/es_VE.po b/addons/hr_expense/i18n/es_VE.po
new file mode 100644
index 00000000000..3a6c2ccf317
--- /dev/null
+++ b/addons/hr_expense/i18n/es_VE.po
@@ -0,0 +1,953 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_expense
+#
+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-13 03:37+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: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
+msgid "Confirmed Expenses"
+msgstr "Gastos confirmados"
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_line
+msgid "Expense Line"
+msgstr "Línea de gasto"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reimbursement0
+msgid "The accoutant reimburse the expenses"
+msgstr "El contable reembolsa los gastos"
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_confirm:0
+#: field:hr.expense.report,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_air_product_template
+msgid "Air Ticket"
+msgstr "Billete de avión"
+
+#. 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 "Departamento"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_expense
+#: field:hr.expense.report,invoiced:0
+msgid "# of Invoiced Lines"
+msgstr "Nº de líneas facturadas"
+
+#. module: hr_expense
+#: field:hr.expense.expense,company_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Pay"
+msgstr "A pagar"
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_report
+msgid "Expenses Statistics"
+msgstr "Estadísticas de gastos"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: model:process.node,name:hr_expense.process_node_approved0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: hr_expense
+#: field:hr.expense.line,uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_valid:0
+msgid ""
+"Date of the acceptation of the sheet expense. It's filled when the button "
+"Accept is pressed."
+msgstr ""
+"Fecha de aceptación de la hoja de gastos. Se rellena cuando pulsamos el "
+"botón aceptar."
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_expense
+#: field:hr.expense.expense,invoice_id:0
+msgid "Employee's Invoice"
+msgstr "Factura de empleado"
+
+#. module: hr_expense
+#: model:ir.module.module,description:hr_expense.module_meta_information
+msgid ""
+"\n"
+"    This module aims to manage employee's expenses.\n"
+"\n"
+"    The whole workflow is implemented:\n"
+"    * Draft expense\n"
+"    * Confirmation of the sheet by the employee\n"
+"    * Validation by his manager\n"
+"    * Validation by the accountant and invoice creation\n"
+"    * Payment of the invoice to the employee\n"
+"\n"
+"    This module also uses the analytic accounting and is compatible with\n"
+"    the invoice on timesheet module so that you will be able to "
+"automatically\n"
+"    re-invoice your customer's expenses if your work by project.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite gestionar los gastos de los empleados.\n"
+"\n"
+"    Se ha implementado el flujo completo:\n"
+"    * Gasto en borrador\n"
+"    * Confirmación de la hoja de gastos por el empleado\n"
+"    * Validación por su responsable\n"
+"    * Validación por el contable y creación de la factura\n"
+"    * Pago de la factura al empleado\n"
+"\n"
+"    Este módulo también usa la contabilidad analítica y es compatible con\n"
+"    el módulo de facturación de hojas de servicios de forma que pueda\n"
+"     re-facturar automáticamente sus gastos de clientes si trabaja por "
+"proyectos.\n"
+"    "
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Waiting confirmation"
+msgstr "Esperando confirmación"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Accepted"
+msgstr "Aceptado"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.expense,ref:0
+#: field:hr.expense.line,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Certified honest and conform,"
+msgstr "Certifica que los datos son ciertos,"
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_confirm:0
+msgid ""
+"Date of the confirmation of the sheet expense. It's filled when the button "
+"Confirm is pressed."
+msgstr ""
+"Fecha de confirmación de la hoja de gastos. Se rellena cuando pulsamos el "
+"botón confirmar."
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_refuseexpense0
+msgid "Refuse expense"
+msgstr "Rechazar gasto"
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_car_product_template
+msgid "Car Travel"
+msgstr "Viaje en coche"
+
+#. module: hr_expense
+#: field:hr.expense.report,price_average:0
+msgid "Average Price"
+msgstr "Precio promedio"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Total Invoiced Lines"
+msgstr "Total líneas facturadas"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_supplierinvoice0
+msgid "The accoutant validates the sheet"
+msgstr "El contable valida la hoja"
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_valid:0
+msgid "Delay to Valid"
+msgstr "Tiempo hasta validar"
+
+#. module: hr_expense
+#: help:hr.expense.line,sequence:0
+msgid "Gives the sequence order when displaying a list of expense lines."
+msgstr "Da el orden de secuencia al mostrar una lista de líneas de gastos."
+
+#. module: hr_expense
+#: field:hr.expense.line,analytic_account:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,analytic_account:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_expense
+#: field:hr.expense.report,date:0
+msgid "Date "
+msgstr "Fecha "
+
+#. module: hr_expense
+#: field:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:144
+#, python-format
+msgid ""
+"Please configure Default Expense account for Product purchase, "
+"`property_account_expense_categ`"
+msgstr ""
+"Por favor, configure la cuenta de gastos por defecto para compras de "
+"productos, `property_account_expense_categ`"
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,employee_id:0
+#: view:hr.expense.report:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.report,product_qty:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reinvoicing0
+msgid "Some costs may be reinvoices to the customer"
+msgstr "Algunos costes pueden ser refacturados al cliente"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_expense
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_my_expense
+msgid "My Expenses"
+msgstr "Mis gastos"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: hr_expense
+#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
+msgid "HR expenses"
+msgstr "Gastos RRHH"
+
+#. module: hr_expense
+#: field:hr.expense.expense,id:0
+msgid "Sheet ID"
+msgstr "ID hoja"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimburseexpense0
+msgid "Reimburse expense"
+msgstr "Reembolsar gasto"
+
+#. module: hr_expense
+#: field:hr.expense.expense,journal_id:0
+#: field:hr.expense.report,journal_id:0
+msgid "Force Journal"
+msgstr "Diario forzado"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,no_of_products:0
+msgid "# of Products"
+msgstr "Nº de productos"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
+msgid "After creating invoice, reimburse expenses"
+msgstr "Después de crear factura, reembolsar gastos"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reimbursement0
+msgid "Reimbursement"
+msgstr "Reemborso"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:158
+#, python-format
+msgid "The employee must have a Home address"
+msgstr "El empleado debe tener un domicilio"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_valid:0
+#: field:hr.expense.report,date_valid:0
+msgid "Validation Date"
+msgstr "Fecha de validación"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
+msgid "Expenses Analysis"
+msgstr "Análisis de gastos"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.line,expense_id:0
+#: model:ir.model,name:hr_expense.model_hr_expense_expense
+#: model:process.process,name:hr_expense.process_process_expenseprocess0
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,line_ids:0
+#: view:hr.expense.line:0
+msgid "Expense Lines"
+msgstr "Líneas de gastos"
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_confirm:0
+msgid "Delay to Confirm"
+msgstr "Tiempo hasta confirmar"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_expense
+#: field:hr.expense.expense,currency_id:0
+#: field:hr.expense.report,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+msgid "Waiting Approval"
+msgstr "Esperando aprobación"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_draftexpenses0
+msgid "Employee encode all his expenses"
+msgstr "Empleado codifica todos sus gastos"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: selection:hr.expense.report,state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: hr_expense
+#: field:product.product,hr_expense_ok:0
+msgid "Can Constitute an Expense"
+msgstr "Puede ser un gasto"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: selection:hr.expense.report,state:0
+msgid "Reimbursed"
+msgstr "Reintegrado"
+
+#. module: hr_expense
+#: field:hr.expense.expense,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimbursereinvoice0
+msgid "Create Customer invoice"
+msgstr "Crear factura de cliente"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: selection:hr.expense.expense,state:0
+#: selection:hr.expense.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Accounting data"
+msgstr "Datos contabilidad"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveexpense0
+msgid "Expense is approved."
+msgstr "Gasto está aprobado."
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_approved0
+msgid "The direct manager approves the sheet"
+msgstr "El responsable inmediato aprueba la hoja."
+
+#. module: hr_expense
+#: field:hr.expense.expense,amount:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_draftexpenses0
+msgid "Draft Expenses"
+msgstr "Gastos borrador"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Customer Project"
+msgstr "Proyecto de cliente"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.expense,date:0
+#: field:hr.expense.line,date_value:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "HR Expenses"
+msgstr "Gastos RRHH"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_confirmedexpenses0
+msgid "The employee validates his expense sheet"
+msgstr "El empleado valida su hoja de gastos"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_refused0
+msgid "The direct manager refuses the sheet.Reset as draft."
+msgstr ""
+"El responsable inmediato rechaza la hoja. Restablecida como borrador."
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_supplierinvoice0
+#: model:process.transition,name:hr_expense.process_transition_approveinvoice0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses Sheet"
+msgstr "Hoja de gastos"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_expense
+#: model:ir.module.module,shortdesc:hr_expense.module_meta_information
+msgid "Human Resources Expenses Tracking"
+msgstr "Seguimiento de los gastos de los recursos humanos"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.report,invoice_id:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
+msgid "Reinvoice"
+msgstr "Refacturar"
+
+#. module: hr_expense
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_employee_expense
+msgid "All Employee Expenses"
+msgstr "Todos los gastos del empleado"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. module: hr_expense
+#: help:hr.expense.expense,journal_id:0
+msgid "The journal used when the expense is invoiced"
+msgstr "El diario usado cuando se factura el gasto"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0
+msgid "Refuse"
+msgstr "Rechazar"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_confirmexpense0
+msgid "Confirm expense"
+msgstr "Confirmar gasto"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_approveexpense0
+msgid "Approve expense"
+msgstr "Aprobar gasto"
+
+#. module: hr_expense
+#: model:process.transition.action,name:hr_expense.process_transition_action_accept0
+msgid "Accept"
+msgstr "Acceptar"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "This document must be dated and signed for reimbursement"
+msgstr "Este documento debe estar fechado y firmado para su cobro"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_refuseexpense0
+msgid "Expense is refused."
+msgstr "Gasto es rechazado."
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.line,unit_amount:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: hr_expense
+#: field:hr.expense.line,product_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,product_id:0
+#: model:ir.model,name:hr_expense.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses of My Department"
+msgstr "Gastos de mi departamento"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,name:0
+#: field:hr.expense.line,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_expense
+#: field:hr.expense.line,unit_quantity:0
+msgid "Quantities"
+msgstr "Cantidades"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: hr_expense
+#: field:hr.expense.report,no_of_account:0
+msgid "# of Accounts"
+msgstr "Nº de cuentas"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: model:process.node,name:hr_expense.process_node_refused0
+msgid "Refused"
+msgstr "Rechazado"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Ref."
+msgstr "Ref."
+
+#. module: hr_expense
+#: field:hr.expense.report,employee_id:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.expense_all
+msgid ""
+"The OpenERP expenses management module allows you to track the full flow. "
+"Every month, the employees record their expenses. At the end of the month, "
+"their managers validates the expenses sheets which creates costs on "
+"projects/analytic accounts. The accountant validates the proposed entries "
+"and the employee can be reimbursed. You can also reinvoice the customer at "
+"the end of the flow."
+msgstr ""
+"El módulo de gestión de gastos de OpenERP le permite hacer un seguimiento de "
+"todo el proceso. Cada mes, los empleados introducen sus gastos. Al final del "
+"mes, sus responsables validan las hojas de gastos las cuales crean costes en "
+"cuentas analíticas. El contable valida las entradas propuestas y se puede "
+"reembolsar al empleado. Puede refacturar al cliente al final del proceso."
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: hr_expense
+#: field:hr.expense.expense,user_valid:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,user_id:0
+msgid "Validation User"
+msgstr "Validación usuario"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "(Date and signature)"
+msgstr "(Fecha y firma)"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_expense
+#: field:hr.expense.expense,account_move_id:0
+msgid "Ledger Posting"
+msgstr "Fijado libro contable"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveinvoice0
+msgid "Creates supplier invoice."
+msgstr "Crea factura de proveedor."
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
+msgid "Hotel Accommodation"
+msgstr "Alojamiento hotel"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_expense
+#: field:hr.expense.line,name:0
+msgid "Expense Note"
+msgstr "Nota de gasto"
+
+#. module: hr_expense
+#: help:hr.expense.expense,state:0
+msgid ""
+"When the expense request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Confirmation'.            \n"
+"If the admin accepts it, the state is 'Accepted'.\n"
+" 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 ""
+"Cuando la solicitud de gasto es creada el estado es 'borrador'.\n"
+" Si el usuario la confirma y se envia al responsable, el estado es "
+"'esperando confirmación'.            \n"
+"Si el responsable la acepta, el estado es 'aceptada'.\n"
+" Si se factura, el estado es 'facturada'.\n"
+" Si se paga al usuario, el estado es 'reembolsada'"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: hr_expense
+#: view:hr.expense.line:0
+#: field:hr.expense.line,total_amount:0
+msgid "Total"
+msgstr "Total"
+
+#. module: hr_expense
+#: field:hr.expense.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_confirmexpense0
+msgid "Expense is confirmed."
+msgstr "El gasto es confirmado."
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:ir.actions.act_window,name:hr_expense.expense_all
+#: model:ir.ui.menu,name:hr_expense.menu_expense_all
+#: model:ir.ui.menu,name:hr_expense.next_id_49
+msgid "Expenses"
+msgstr "Gastos"
+
+#. module: hr_expense
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: hr_expense
+#: help:product.product,hr_expense_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from an HR expense sheet line."
+msgstr ""
+"Determina si el producto se puede visualizar en la lista de productos a "
+"seleccionar en una línea de la hoja de gastos."
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reinvoicing0
+msgid "Reinvoicing"
+msgstr "Refacturació"
+
+#~ msgid "Expenses waiting validation"
+#~ msgstr "Gastos esperando validación"
+
+#~ msgid "Date Confirmed"
+#~ msgstr "Fecha confirmación"
+
+#~ msgid "My expenses waiting validation"
+#~ msgstr "Mis gastos esperando validación"
+
+#~ msgid "All expenses"
+#~ msgstr "Todos los gastos"
+
+#~ msgid "Print HR expenses"
+#~ msgstr "Imprimir gastos RRHH"
+
+#~ msgid "New Expenses Sheet"
+#~ msgstr "Nueva hoja de gastos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#, python-format
+#~ msgid "The employee must have a contact address"
+#~ msgstr "El empleado debe tener una dirección de contacto"
+
+#~ 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 "Account Move"
+#~ msgstr "Asiento"
+
+#~ msgid "Expenses waiting payment"
+#~ msgstr "Gastos esperando pago"
+
+#~ msgid "My Draft expenses"
+#~ msgstr "Mis gastos borrador"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Expense Process"
+#~ msgstr "Proceso de gastos"
+
+#~ msgid "Draft expenses"
+#~ msgstr "Gastos borrador"
+
+#~ msgid "Expenses waiting invoice"
+#~ msgstr "Gastos esperando factura"
+
+#~ msgid "Expense Sheet"
+#~ msgstr "Hoja de gastos"
+
+#~ msgid "Short Description"
+#~ msgstr "Descripción breve"
+
+#~ msgid "Date Validated"
+#~ msgstr "Fecha validación"
+
+#~ msgid "Can be Expensed"
+#~ msgstr "Puede ser un gasto"
+
+#~ msgid ""
+#~ "Determine if the product can be visible in the list of product within a "
+#~ "selection from an HR expense sheet line."
+#~ msgstr ""
+#~ "Indica si el producto puede ser visible en la lista de productos "
+#~ "seleccionables dentro de una línea de hoja de gastos de recursos humanos."
+
+#, python-format
+#~ msgid ""
+#~ "Please configure Default Expanse account for Product purchase, "
+#~ "`property_account_expense_categ`"
+#~ msgstr ""
+#~ "Por favor, configure la cuenta de gastos por defecto para la compra de "
+#~ "productos, `property_account_expense_categ`"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index 274223fc4c3..0e5a2072491 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Olek"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Mõned kulud võivad olla taasarvedused kliendile"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Viga!"
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index 1665475be2c..2560ac192f5 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Virhe !"
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 90668584808..7f1f5c917e2 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -270,7 +270,7 @@ msgid "State"
 msgstr "État"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -305,8 +305,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Certains coûts peuvent être refacturés au client"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -924,22 +925,6 @@ msgstr "Refacturation"
 #~ msgid "Can be Expensed"
 #~ msgstr "Peut être dépensé"
 
-#~ msgid "Extended filters..."
-#~ msgstr "Filtres étendus..."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Erreur: UDV doit être dans une catégorie différente de l'UDM"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "L'employé doit avoir une adresse professionnelle"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Erreur : L'UDM par défaut et l'UDM d'achat doivent être dans la même "
-#~ "catégorie."
-
 #, python-format
 #~ msgid ""
 #~ "Please configure Default Expanse account for Product purchase, "
@@ -947,15 +932,3 @@ msgstr "Refacturation"
 #~ msgstr ""
 #~ "Veuiller configurer le compte de notes de frais par défaut pour le produit "
 #~ "acheté, `property_account_expense_categ`"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne peut jamais être inférieure à 1 !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Les règles doivent avoir au moins un droit d'accès sélectionné !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat pour un module doit être unique !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index 71236afeecb..3825876e15d 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Država"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index d108a963388..bf07954e678 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 17:56+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -266,7 +267,7 @@ msgid "State"
 msgstr "Állapot"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -302,8 +303,9 @@ msgstr ""
 "A költségek egy részét valószínűleg tovább lehet számlázni a vevőknek"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Hiba !"
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index d6ed6e1de0a..13198bdf96f 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index c808c06ec80..91a7df08444 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -269,7 +269,7 @@ msgid "State"
 msgstr "Stato"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -304,8 +304,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alcuni costi devono essere rifatturati al cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Errore!"
@@ -952,36 +953,3 @@ msgstr "In fase di rifatturazione"
 #~ msgstr ""
 #~ "Si deve configurare il conto di spesa di default per acquisto prodotti: "
 #~ "`property_account_expense_categ`"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Errore: L'Unità di misura per la Vendita (UOS) deve essere in una categoria "
-#~ "diversa da quella dell'Unità di misura (UOM)"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "L'impiegato deve avere un indirizzo"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non è possibile creare menu ricorsivi."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Errore: l'unità misura di default e quella di acquisto devono essere nella "
-#~ "stessa categoria."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate per gli oggetti: osv_memory!"
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index d1806e13ffb..c525361dbe8 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
 msgstr "상태"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "일부 비요은 고객에게 재차 인보이스될 수 있습니다."
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "에러!"
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index cf9be899fd8..8bb7331a983 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index 654616cc0e5..09da9cfa502 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index f8606728dd0..a5b54771b9b 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -267,7 +267,7 @@ msgid "State"
 msgstr "Төлөв"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -302,8 +302,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Зарим үнүүдийг харилцагч дахин нэхэмжилж магадгүй"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Алдаа !"
@@ -943,31 +944,9 @@ msgstr "Дахин нэхэмжлэх"
 #~ "Худалдан авч буй барааны 'Өгөгдмөл өсөлт' талбарын тохируулна уу.  "
 #~ "`property_account_expense_categ`"
 
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Алдаа: Борлуулалтын нэгж нь хэмжилтийн нэгжээс өөр нэр томъёл"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "Ажилтан ажлын хаягтай байх ёстой"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Рекурс цэсийг үүсгэж болохгүй"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Алдаа: Өгөгдмөл хэмжих нэгж ба худалдан авалтын хэмжилт нь 1 ангилалд байх "
-#~ "ёстой"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
-
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from an HR expense sheet line."
 #~ msgstr ""
 #~ "Зардлын хүснэгтийн мөр дөх барааны жагсаалтаас сонгоход тухайн бараа "
 #~ "харагдах эсэхийг тодорхойлно."
-
-#~ msgid "Extended filters..."
-#~ msgstr "Өргөтгөсөн хайлт..."
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index fa626b2b4d5..a89f84ff9f4 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -267,7 +267,7 @@ msgid "State"
 msgstr "Status"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -302,8 +302,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Sommige kosten kunnen doorbelast worden aan de klant"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Fout !"
@@ -944,9 +945,6 @@ msgstr "Doorbelasten"
 #~ msgid "Draft expenses"
 #~ msgstr "Conceptdeclaraties"
 
-#~ msgid "Extended filters..."
-#~ msgstr "Uitgebreide filters..."
-
 #, python-format
 #~ msgid ""
 #~ "Please configure Default Expanse account for Product purchase, "
@@ -954,33 +952,3 @@ msgstr "Doorbelasten"
 #~ msgstr ""
 #~ "Configureer aub de standaard uitgaverekening voor productinkoop, "
 #~ "`property_account_expense_categ`"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Fout: UOS moet in andere categorie staan dan UOM"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "De medewerker moet een werkadres hebben"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fout: De standaard UOM en de inkoop UOM moeten in dezelfde categorie staan."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index 22c022bc454..80ffc4f123c 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index 91ee9236c6d..89e8ea8a26b 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Stan"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Część kosztów może być refakturowana na klienta"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Błąd !"
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 06a93f00062..8f8602db386 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -106,6 +106,7 @@ msgid ""
 "Date of the acceptation of the sheet expense. It's filled when the button "
 "Accept is pressed."
 msgstr ""
+"Data de aprovação da folha de despesas. É preenchida pelo botão de aprovação."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -180,6 +181,8 @@ msgid ""
 "Date of the confirmation of the sheet expense. It's filled when the button "
 "Confirm is pressed."
 msgstr ""
+"Data de confirmação da folha de despesas. É preenchida ao carregar no botão "
+"de confirmação."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -221,12 +224,13 @@ msgstr "O contabilista valida a folha"
 #. module: hr_expense
 #: field:hr.expense.report,delay_valid:0
 msgid "Delay to Valid"
-msgstr ""
+msgstr "Espera para Validar"
 
 #. module: hr_expense
 #: help:hr.expense.line,sequence:0
 msgid "Gives the sequence order when displaying a list of expense lines."
 msgstr ""
+"Indica a sequência de ordenação ao mostrar uma lista de linhas de despesa."
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
@@ -248,12 +252,14 @@ msgid "State"
 msgstr "Estado"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
 "`property_account_expense_categ`"
 msgstr ""
+"Por favor configure a conta de despesas padrão para Compra de Produto, "
+"'property_account_expense_categ'"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -281,8 +287,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alguns custos podem ser re-facturados para o cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
@@ -382,7 +389,7 @@ msgstr "Linhas de Despesa"
 #. module: hr_expense
 #: field:hr.expense.report,delay_confirm:0
 msgid "Delay to Confirm"
-msgstr ""
+msgstr "Espera para Confirmar"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -427,7 +434,7 @@ msgstr "Facturado"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "Pode ser uma Despesa"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -518,7 +525,7 @@ msgstr "Novembro"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros avançados..."
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -598,7 +605,7 @@ msgstr "Re-Facturar"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_employee_expense
 msgid "All Employee Expenses"
-msgstr ""
+msgstr "Todas as despesas do funcionário"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -608,7 +615,7 @@ msgstr "Outras Informações"
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "Diário usado quando a despesa é faturada"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -680,7 +687,7 @@ msgstr "Quantidades"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Price"
-msgstr ""
+msgstr "Preço"
 
 #. module: hr_expense
 #: field:hr.expense.report,no_of_account:0
@@ -764,7 +771,7 @@ msgstr "Abril"
 #. module: hr_expense
 #: field:hr.expense.line,name:0
 msgid "Expense Note"
-msgstr ""
+msgstr "Nota de despesa"
 
 #. module: hr_expense
 #: help:hr.expense.expense,state:0
@@ -828,6 +835,7 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
 msgstr ""
+"Indica se o produto está disponível para ser usado em folhas de despesa."
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
@@ -915,25 +923,3 @@ msgstr "Re-facturamento"
 
 #~ msgid "Short Description"
 #~ msgstr "Descrição Curta"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "O empregado tem de ter um endereço de trabalho"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "O objecto osv_memory não suporta regras!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index a783d231cc1..56decd7009b 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -268,7 +268,7 @@ msgid "State"
 msgstr "Status"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -303,8 +303,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Alguns custos podem ser refaturados para o cliente"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index 97a9c5c0e66..108883d7b31 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Eroare !"
@@ -850,24 +851,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nume invalid de model în definirea acțiunii."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Eroare ! Nu este posibilă crearea unui meniu recursiv."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Eroare: unitatea de masura implicita si unitatea de masura furnizor trebuie "
-#~ "sa faca parte din aceeasi categorie."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index b90e7caf9f7..d5ae9382e0f 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Состояние"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Некоторые расходы могут быть пересчитаны клиенту"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Ошибка !"
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 229ca366edc..a789dc1ed7e 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Napaka!"
diff --git a/addons/hr_expense/i18n/sq.po b/addons/hr_expense/i18n/sq.po
index eef87a8ee60..6cfbe50b32b 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index a30d401099f..982341b452b 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/sr@latin.po b/addons/hr_expense/i18n/sr@latin.po
index e8ade41b97b..83ac2c6b709 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -265,7 +265,7 @@ msgid "State"
 msgstr "Stanje"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -300,8 +300,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr "Neki troškovi mogu da budu prefakturisani na kupca"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr "Greška!"
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 94465331455..576cbbaa953 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index 23a057bcdc3..38f8eddde61 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 2d65eee73a3..02274f735e6 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr "Durum"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index 5d575fc1f7d..aeaa1a8228c 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/vi.po b/addons/hr_expense/i18n/vi.po
index 3cf862d8b07..c8ae4838fdd 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 5f91e41fbe2..cb27716a6b0 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-03-20 08:27+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -29,24 +29,24 @@ msgstr "费用明细"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reimbursement0
 msgid "The accoutant reimburse the expenses"
-msgstr "会计人员报销这费用"
+msgstr "财务报销这费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "确认日期"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: view:hr.expense.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_air_product_template
 msgid "Air Ticket"
-msgstr ""
+msgstr "飞机票"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -54,24 +54,24 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "部门"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: hr_expense
 #: field:hr.expense.report,invoiced:0
 msgid "# of Invoiced Lines"
-msgstr ""
+msgstr "#发票明细"
 
 #. module: hr_expense
 #: field:hr.expense.expense,company_id:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -81,31 +81,31 @@ msgstr "设为草稿"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Pay"
-msgstr ""
+msgstr "支付"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
-msgstr ""
+msgstr "费用统计"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
-msgstr "批准"
+msgstr "已审批"
 
 #. module: hr_expense
 #: field:hr.expense.line,uom_id:0
 msgid "UoM"
-msgstr "单位"
+msgstr "计量单位"
 
 #. module: hr_expense
 #: help:hr.expense.expense,date_valid:0
 msgid ""
 "Date of the acceptation of the sheet expense. It's filled when the button "
 "Accept is pressed."
-msgstr ""
+msgstr "费用表的同意日期，它填好时按下同意按钮。"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -115,7 +115,7 @@ msgstr "备注"
 #. module: hr_expense
 #: field:hr.expense.expense,invoice_id:0
 msgid "Employee's Invoice"
-msgstr ""
+msgstr "员工的发票"
 
 #. module: hr_expense
 #: model:ir.module.module,description:hr_expense.module_meta_information
@@ -136,6 +136,17 @@ msgid ""
 "    re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"    这模块用来管理员工的费用。\n"
+"  工作流程为：\n"
+"    * 费用草稿\n"
+"    * 员工确认申请表\n"
+"    * 经理审核\n"
+"    * 财务人员审核并开发票\n"
+"    * 按发票付款给员工\n"
+"\n"
+"  这模块还用在管理会计的模块并集成计工单的发票模块，所以如果您的工作是一个项目，将能自动开出您的费用的发票。\n"
+"    "
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -145,7 +156,7 @@ msgstr "已取消"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Validation"
-msgstr "批准"
+msgstr "审核"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -160,32 +171,32 @@ msgstr "已同意"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月份   "
 
 #. module: hr_expense
 #: report:hr.expense:0
 #: field:hr.expense.expense,ref:0
 #: field:hr.expense.line,ref:0
 msgid "Reference"
-msgstr "参考"
+msgstr "单号"
 
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Certified honest and conform,"
-msgstr "证明是诚实和遵守约定"
+msgstr "已证明真实和一致"
 
 #. module: hr_expense
 #: help:hr.expense.expense,date_confirm:0
 msgid ""
 "Date of the confirmation of the sheet expense. It's filled when the button "
 "Confirm is pressed."
-msgstr ""
+msgstr "费用表的确认日期，它填满时按下确认按钮"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# 明细"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
@@ -195,17 +206,17 @@ msgstr "拒绝费用"
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_car_product_template
 msgid "Car Travel"
-msgstr ""
+msgstr "汽车历程"
 
 #. module: hr_expense
 #: field:hr.expense.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "均价"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Total Invoiced Lines"
-msgstr ""
+msgstr "发票明细数"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -221,24 +232,24 @@ msgstr "会计人员使这表生效"
 #. module: hr_expense
 #: field:hr.expense.report,delay_valid:0
 msgid "Delay to Valid"
-msgstr ""
+msgstr "推延生效"
 
 #. module: hr_expense
 #: help:hr.expense.line,sequence:0
 msgid "Gives the sequence order when displaying a list of expense lines."
-msgstr ""
+msgstr "当显示费用明细时指定一个序列顺序。"
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,analytic_account:0
 msgid "Analytic account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: hr_expense
 #: field:hr.expense.report,date:0
 msgid "Date "
-msgstr ""
+msgstr "日期 "
 
 #. module: hr_expense
 #: field:hr.expense.expense,state:0
@@ -248,12 +259,12 @@ msgid "State"
 msgstr "状态"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
 "`property_account_expense_categ`"
-msgstr ""
+msgstr "请设置产品采购的默认费用科目，'属性_科目_费用_类别'"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -273,19 +284,20 @@ msgstr "数量"
 #: view:hr.expense.report:0
 #: field:hr.expense.report,price_total:0
 msgid "Total Price"
-msgstr "价格合计"
+msgstr "总价格"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reinvoicing0
 msgid "Some costs may be reinvoices to the customer"
-msgstr "有些成本可以要重开发票给客户"
+msgstr "有些成本可能要重开发票给客户"
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: hr_expense
 #: view:board.board:0
@@ -296,12 +308,12 @@ msgstr "我的费用"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "HR expenses"
-msgstr ""
+msgstr "人力资源费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
@@ -317,23 +329,23 @@ msgstr "报销费用"
 #: field:hr.expense.expense,journal_id:0
 #: field:hr.expense.report,journal_id:0
 msgid "Force Journal"
-msgstr "强制分类帐"
+msgstr "强制的账薄"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,no_of_products:0
 msgid "# of Products"
-msgstr ""
+msgstr "# 产品"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
 msgid "After creating invoice, reimburse expenses"
-msgstr "报销费用后创建发票"
+msgstr "创建发票后报销费用"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reimbursement0
@@ -349,20 +361,20 @@ msgstr ""
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0
 #: field:hr.expense.report,date_valid:0
 msgid "Validation Date"
-msgstr ""
+msgstr "审核日期"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
 msgid "Expenses Analysis"
-msgstr ""
+msgstr "费用分析"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -382,57 +394,57 @@ msgstr "费用明细"
 #. module: hr_expense
 #: field:hr.expense.report,delay_confirm:0
 msgid "Delay to Confirm"
-msgstr ""
+msgstr "推延确认"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: hr_expense
 #: field:hr.expense.expense,currency_id:0
 #: field:hr.expense.report,currency_id:0
 msgid "Currency"
-msgstr "货币"
+msgstr "币种"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "等待审批"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
 msgid "Employee encode all his expenses"
-msgstr "员工编码所有的费用"
+msgstr "员工所有的费用"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: view:hr.expense.report:0
 #: selection:hr.expense.report,state:0
 msgid "Invoiced"
-msgstr "已开发票"
+msgstr "已开票"
 
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "能构成费用"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -460,32 +472,32 @@ msgstr "草稿"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Accounting data"
-msgstr "会计日期"
+msgstr "财务日期"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveexpense0
 msgid "Expense is approved."
-msgstr "费用已批准"
+msgstr "费用已审批"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_approved0
 msgid "The direct manager approves the sheet"
-msgstr "管理者直接批准这表"
+msgstr "经理直接审批这表"
 
 #. module: hr_expense
 #: field:hr.expense.expense,amount:0
 msgid "Total Amount"
-msgstr "金额合计"
+msgstr "总金额"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
@@ -495,7 +507,7 @@ msgstr "费用草稿"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Customer Project"
-msgstr ""
+msgstr "客户项目"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -513,17 +525,17 @@ msgstr "日期"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -533,7 +545,7 @@ msgstr "合计:"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -564,13 +576,13 @@ msgstr "费用表"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Waiting"
-msgstr ""
+msgstr "等待中"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: hr_expense
 #: model:ir.module.module,shortdesc:hr_expense.module_meta_information
@@ -580,7 +592,7 @@ msgstr "人力资源费用跟踪"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "References"
-msgstr ""
+msgstr "单号"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -598,7 +610,7 @@ msgstr "重开发票"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_employee_expense
 msgid "All Employee Expenses"
-msgstr ""
+msgstr "所有员工费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -608,7 +620,7 @@ msgstr "其它信息"
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "这费开发票时用这账簿"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -624,7 +636,7 @@ msgstr "确认费用"
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_approveexpense0
 msgid "Approve expense"
-msgstr "批准费用"
+msgstr "审批费用"
 
 #. module: hr_expense
 #: model:process.transition.action,name:hr_expense.process_transition_action_accept0
@@ -634,7 +646,7 @@ msgstr "同意"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "This document must be dated and signed for reimbursement"
-msgstr "这报销单据必须有日期和签名"
+msgstr "这报销单据必须要有日期和签名"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_refuseexpense0
@@ -658,7 +670,7 @@ msgstr "产品"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expenses of My Department"
-msgstr ""
+msgstr "我部门的费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -670,7 +682,7 @@ msgstr "说明"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: hr_expense
 #: field:hr.expense.line,unit_quantity:0
@@ -680,12 +692,12 @@ msgstr "数量"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
 
 #. module: hr_expense
 #: field:hr.expense.report,no_of_account:0
 msgid "# of Accounts"
-msgstr ""
+msgstr "# 科目"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -696,12 +708,12 @@ msgstr "已拒绝"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Ref."
-msgstr "参考"
+msgstr "单号"
 
 #. module: hr_expense
 #: field:hr.expense.report,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "员工姓名"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.expense_all
@@ -713,18 +725,20 @@ msgid ""
 "and the employee can be reimbursed. You can also reinvoice the customer at "
 "the end of the flow."
 msgstr ""
+"系统的费用管理模块允许你跟踪整个流程。每个月员工记录他们的费用。在本月底经理审核这费用表并创建项目成本/辅助核算項。财务人员审核这项目的分录同时员工可以做"
+"报销。您也可以在流程末尾重开客户发票。"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "This Month"
-msgstr ""
+msgstr "本月"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,user_id:0
 msgid "Validation User"
-msgstr "批准用户"
+msgstr "审核用户"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -734,7 +748,7 @@ msgstr "(日期和签名)"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -744,7 +758,7 @@ msgstr "名称"
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Ledger Posting"
-msgstr ""
+msgstr "过账"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -754,17 +768,17 @@ msgstr "创建供应商发票"
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
 msgid "Hotel Accommodation"
-msgstr ""
+msgstr "酒店住宿"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: hr_expense
 #: field:hr.expense.line,name:0
 msgid "Expense Note"
-msgstr ""
+msgstr "费用备注"
 
 #. module: hr_expense
 #: help:hr.expense.expense,state:0
@@ -776,11 +790,16 @@ 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"
+"它被用户确认后和向admin申请时，它的状态是“等待确认”。\n"
+"如果admin同意，那它的状态是“已同意”。\n"
+"如果申请费用已经建立一个发票，它的状态是“已开票”。\n"
+"如果该费已支付给用户，那它的状态是“已报销”。"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Approve"
-msgstr ""
+msgstr "审批"
 
 #. module: hr_expense
 #: view:hr.expense.line:0
@@ -791,7 +810,7 @@ msgstr "合计"
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
@@ -809,25 +828,25 @@ msgstr "费用"
 #. module: hr_expense
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误:无效EAN代码"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Approve"
-msgstr ""
+msgstr "待审批"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
 msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
-msgstr ""
+msgstr "如果这产品可以显示在人力资源费用表明细的可选产品列表中，确认。"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
@@ -873,39 +892,6 @@ msgstr "重开发票"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
 
-#~ msgid ""
-#~ "\n"
-#~ "    This module aims to manage employee's expenses.\n"
-#~ "\n"
-#~ "    The whole workflow is implemented:\n"
-#~ "    * Draft expense\n"
-#~ "    * Confirmation of the sheet by the employee\n"
-#~ "    * Validation by his manager\n"
-#~ "    * Validation by the accountant and invoice creation\n"
-#~ "    * Payment of the invoice to the employee\n"
-#~ "\n"
-#~ "    This module also use the analytic accounting and is compatible with\n"
-#~ "    the invoice on timesheet module so that you will be able to "
-#~ "automatically\n"
-#~ "    re-invoice your customer's expenses if your work by project.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这模块的目的是管理员工的费用\n"
-#~ "\n"
-#~ "    整个工作流实现:\n"
-#~ "    *费用草稿\n"
-#~ "    *确认员工工作表\n"
-#~ "    *主管审批\n"
-#~ "    *会计人员审批生成的发票\n"
-#~ "    *员工的付款发票\n"
-#~ "\n"
-#~ "    这模块还用分析会计\n"
-#~ "和使时间表的发票相一致\n"
-#~ "因此如果你工作在项目模块\n"
-#~ "你将能够自动重开客户费用发票\n"
-#~ "    "
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index e4311f1e690..9ae2d2b045e 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
 #, python-format
 msgid ""
 "Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0018a7e2ce2..0685880b863 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -7,7 +7,7 @@
         <field name="model">hr.expense.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')" string="Expenses Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
@@ -53,14 +53,15 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="  Year  "
+                <filter icon="terp-go-year" string="Year" name="year"
                       domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                       help="Expenses during current year"/>
-                  <filter icon="terp-go-month" string="   Month   "
+                    <separator orientation="vertical"/>					  
+                  <filter icon="terp-go-month" string="Month"
                       name="month"
                       domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                       help="Expenses during current month"/>
-                <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                <filter icon="terp-go-month" string="    Month-1    " 
                       domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                       help="Expenses during last month"/>
                   <separator orientation="vertical"/>
@@ -113,7 +114,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 292db38bf5e..b9ad5778d1e 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -2,17 +2,11 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="property_rule_expense" model="ir.rule">
-            <field name="name">Employee Expense</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
-        </record>
         <record id="property_rule_expense_manager" model="ir.rule">
             <field name="name">Manager Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_expense_employee" model="ir.rule">
             <field name="name">Employee Expense</field>
@@ -20,6 +14,12 @@
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
+        <record id="hr_expense_comp_rule" model="ir.rule">
+            <field name="name">Expense multi company rule</field>
+            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml
index fa237878023..bd13529d645 100644
--- a/addons/hr_expense/test/test_hr_expense.yml
+++ b/addons/hr_expense/test/test_hr_expense.yml
@@ -8,6 +8,12 @@
 
 -
   I create a new employee.
+-
+  !record {model: hr.employee, id: hr.employee}:
+    address_home_id: base.res_partner_address_1
+    address_id: base.main_address
+-
+  I assign home address to employee.
 -
   !record {model: hr.employee, id: hr.employee1}:
     address_home_id: base.res_partner_address_1
@@ -26,7 +32,6 @@
   !record {model: product.product, id: product_product_travel0}:
     categ_id: product.product_category_services
     cost_method: standard
-    hr_expense_ok: 1
     list_price: 800.0
     mes_type: fixed
     name: Travel
@@ -40,15 +45,17 @@
     warranty: 0.0
     weight: 0.0
     weight_net: 0.0
-
+-
+  I mark this product for expenses.
+-
+  !python {model: product.product}: |
+    self.on_change_hr_expense_ok(cr, uid, [ref('product_product_travel0')], True)
 -
   I create an expense.
 -
   !record {model: hr.expense.expense, id: hr_expense_expense_september0}:
     company_id: base.main_company
-    currency_id: base.EUR
     date: !eval "'%s-05-05' %(datetime.now().year)"
-    employee_id: hr.employee1
     name: September Expenses
     line_ids:
       - date_value: !eval "'%s-05-27' %(datetime.now().year)"
@@ -63,6 +70,23 @@
 -
   !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
     - state == 'draft'
+-
+  I change the employee on expense form.
+-
+  !python {model: hr.expense.expense}: |
+    res = self.onchange_employee_id(cr, uid, [ref('hr_expense_expense_september0')], ref('hr.employee1'), None)
+    values = dict([('employee_id', ref('hr.employee1'))] + res['value'].items())
+    self.write(cr, uid, [ref('hr_expense_expense_september0')], values, None)
+-
+  Now I change the related product on expense line.
+-
+  !python {model: hr.expense.expense}: |
+    exp_line_obj = self.pool.get('hr.expense.line')
+    exp_obj = self.browse(cr, uid, ref('hr_expense_expense_september0'), None)
+    line_ids = [line.id for line in exp_obj.line_ids]
+    res = exp_line_obj.onchange_product_id(cr, uid, line_ids, ref('product_product_expense_air'), False, ref('hr.employee1'), None)
+    values = dict([('product_id', ref('product_product_expense_air'))] + res['value'].items())
+    exp_line_obj.write(cr, uid, line_ids, values, None)
 -
   I confirm this expenses by click on "Confirm" button.
 -
@@ -81,10 +105,10 @@
 -
   I invoiced this expense by click on "Invoice" button.
 -
-  !workflow {model: hr.expense.expense, action: invoice, ref: hr_expense_expense_september0}
-
+  !python {model: hr.expense.expense}: |
+    self.invoice(cr, uid, [ref('hr_expense_expense_september0')], None)
 -
-  I check that state is "Invoiced"
+  I check that state is "Invoiced".
 -
   !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
     - state == 'invoiced'
@@ -94,3 +118,4 @@
   !python {model: hr.expense.expense}: |
     exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0]
     assert exp.invoice_id, "Invoice should be created"
+
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 63c2eb76195..ec12b884201 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name": "Human Resources: Holidays management",
+    "name": "Leave Management",
     "version": "1.5",
     "author": ['OpenERP SA', 'Axelor'],
     "category": "Human Resources",
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 71b4e2a98fb..f0a0ab0741a 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
-        <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
-
-            <!-- Need to merge in above view -->
-
         <record model="ir.actions.act_window" id="action_hr_holidays_leaves_by_month">
             <field name="name">My Leaves</field>
             <field name="res_model">hr.holidays.status</field>
@@ -27,8 +16,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2" position="inside">
-                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves" />
+                <xpath expr="/form/board/column" position="inside">
+                 <action name="%(action_hr_holidays_leaves_by_month)d" string="Leaves"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
index 980a8dd5fbb..1c7c6280f8b 100644
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml
@@ -15,21 +15,14 @@
         <record id="board_hr_holidays_manager_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.manager.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                  <xpath expr="/form/hpaned/child1" position="inside"> 
-                    <action colspan="4" height="220" name="%(action_view_holiday_status_manager_board)d" string="All Employee Leaves"/>
+                  <xpath expr="/form/board/column" position="inside">
+                    <action name="%(action_view_holiday_status_manager_board)d" string="All Employee Leaves"/>
                 </xpath>
             </field>
         </record>
 
-        <menuitem
-            action="hr.open_board_hr_manager"
-            icon="terp-graph"
-            id="base.menu_hr_manager"
-            parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
-            sequence="5"/> 
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 612b890b723..d22c5b9f1bb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -111,7 +111,7 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
+        'state': fields.selection([('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
             'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
             \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
@@ -135,7 +135,8 @@ class hr_holidays(osv.osv):
         '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),
-        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automatically filled by the user who validate the leave with second level (If Leave type need second validation)')
+        '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'),
     }
     _defaults = {
         'employee_id': _employee_get,
@@ -150,16 +151,26 @@ class hr_holidays(osv.osv):
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]
 
-    def _create_resource_leave(self, cr, uid, vals, context=None):
+    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')
-        return obj_res_leave.create(cr, uid, vals, context=context)
+        for leave in leaves:
+            vals = {
+                'name': leave.name,
+                'date_from': leave.date_from,
+                'holiday_id': leave.id,
+                'date_to': leave.date_to,
+                'resource_id': leave.employee_id.resource_id.id,
+                'calendar_id': leave.employee_id.resource_id.calendar_id.id
+            }
+            obj_res_leave.create(cr, uid, vals, context=context)
+        return True
 
-    def _remove_resouce_leave(self, cr, uid, ids, context=None):
+    def _remove_resource_leave(self, cr, uid, ids, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays cancel/removed'''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
         leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
-        return obj_res_leave.unlink(cr, uid, leave_ids)
+        return obj_res_leave.unlink(cr, uid, leave_ids, context=context)
 
     def onchange_type(self, cr, uid, ids, holiday_type):
         result = {'value': {'employee_id': False}}
@@ -203,19 +214,23 @@ class hr_holidays(osv.osv):
 
     def onchange_sec_id(self, cr, uid, ids, status, context=None):
         warning = {}
+        double_validation = False
+        obj_holiday_status = self.pool.get('hr.holidays.status')
         if status:
-            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, status, context=context)
-            if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink:
+            holiday_status = obj_holiday_status.browse(cr, uid, status, context=context)
+            double_validation = holiday_status.double_validation
+            if holiday_status.categ_id and holiday_status.categ_id.section_id and not holiday_status.categ_id.section_id.allow_unlink:
                 warning = {
                     'title': "Warning for ",
                     'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows."
                 }
-        return {'warning': warning}
+        return {'warning': warning, 'value': {'double_validation': double_validation}}
 
-    def set_to_draft(self, cr, uid, ids, *args):
+    def set_to_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
             'state': 'draft',
             'manager_id': False,
+            'manager_id2': False,
         })
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -223,21 +238,24 @@ class hr_holidays(osv.osv):
             wf_service.trg_create(uid, 'hr.holidays', id, cr)
         return True
 
-    def holidays_validate(self, cr, uid, ids, *args):
-        self.check_holidays(cr, uid, ids)
+    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
         return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
 
-    def holidays_validate2(self, cr, uid, ids, *args):
-        self.check_holidays(cr, uid, ids)
+    def holidays_validate2(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', 'manager_id2': manager})
+        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.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 vals = {
@@ -251,6 +269,7 @@ class hr_holidays(osv.osv):
                     'date_deadline': record.date_to,
                 }
                 case_id = meeting_obj.create(cr, uid, vals)
+                self._create_resource_leave(cr, uid, [record], context=context)
                 self.write(cr, uid, ids, {'case_id': case_id})
             elif record.holiday_type == 'category':
                 emp_ids = obj_emp.search(cr, uid, [('category_ids', 'child_of', [record.category_id.id])])
@@ -274,21 +293,26 @@ 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.write(cr, uid, holiday_ids, {'manager_id2': manager})
         return True
 
-    def holidays_confirm(self, cr, uid, ids, *args):
-        self.check_holidays(cr, uid, ids)
+    def holidays_confirm(self, cr, uid, ids, context=None):
+        self.check_holidays(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
-    def holidays_refuse(self, cr, uid, ids, *args):
+    def holidays_refuse(self, cr, uid, ids, approval, 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
-        self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
-        self.holidays_cancel(cr, uid, ids)
+        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_cancel(cr, uid, ids, context=context)
         return True
 
-    def holidays_cancel(self, cr, uid, ids, *args):
+    def holidays_cancel(self, cr, uid, ids, context=None):
         obj_crm_meeting = self.pool.get('crm.meeting')
         for record in self.browse(cr, uid, ids):
             # Delete the meeting
@@ -300,9 +324,10 @@ class hr_holidays(osv.osv):
             for request in record.linked_request_ids or []:
                 wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
 
+        self._remove_resource_leave(cr, uid, ids, context=context)
         return True
 
-    def check_holidays(self, cr, uid, ids):
+    def check_holidays(self, cr, uid, ids, context=None):
         holi_status_obj = self.pool.get('hr.holidays.status')
         for record in self.browse(cr, uid, ids):
             if record.holiday_type == 'employee' and record.type == 'remove':
@@ -344,12 +369,24 @@ class hr_employee(osv.osv):
             leave_id = holiday_obj.create(cr, uid, {'name': _('Leave Request for %s') % employee.name, 'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'remove', 'holiday_type': 'employee', 'number_of_days_temp': abs(diff)}, context=context)
         else:
             return False
-        holiday_obj.holidays_confirm(cr, uid, [leave_id])
-        holiday_obj.holidays_validate2(cr, uid, [leave_id])
+        wf_service = netsvc.LocalService("workflow")
+        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)
         return True
 
    def _get_remaining_days(self, cr, uid, ids, name, args, context=None):
-        cr.execute("SELECT sum(h.number_of_days_temp) as days, h.employee_id from hr_holidays h join hr_holidays_status s on (s.id=h.holiday_status_id) where h.type='add' and h.state='validate' and s.limit=False group by h.employee_id")
+        cr.execute("""SELECT
+                sum(h.number_of_days) as days,
+                h.employee_id 
+            from
+                hr_holidays h
+                join hr_holidays_status s on (s.id=h.holiday_status_id) 
+            where
+                h.state='validate' and
+                s.limit=False and
+                h.employee_id in (%s)
+            group by h.employee_id"""% (','.join(map(str,ids)),) )
         res = cr.dictfetchall()
         remaining = {}
         for r in res:
@@ -359,11 +396,10 @@ class hr_employee(osv.osv):
                 remaining[employee_id] = 0.0
         return remaining
 
-
    _columns = {
-        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.', store=True),
+        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.'),
     }
 
 hr_employee()
 
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 392f7469390..e8afac04cb4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -7,11 +7,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
-                    <group col="8" colspan="4">
-                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
-                        <separator orientation="vertical"/>
+                    <group>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
                         <separator orientation="vertical"/>
                         <filter string="This Month" icon="terp-go-month" name="This Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
@@ -22,8 +21,6 @@
                             <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -77,19 +74,20 @@
                             <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="number_of_days_temp"/>
+                            <field name="double_validation" invisible="1"/>
                             <newline/>
                             <field name="manager_id"/>
-                            <field name="manager_id2"/>
+                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
-                            <field name="state" colspan="2"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                             <group colspan="2" col="6">
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                             </group>
                         </page>
                     </notebook>
@@ -119,19 +117,20 @@
                         <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                         <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/>
                         <field name="number_of_days_temp"/>
+                        <field name="double_validation" invisible="1"/>
                         <newline/>
                         <field name="manager_id"/>
-                        <field name="manager_id2"/>
+                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
                         <newline/>
-                        <field name="state" colspan="2"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                         <group colspan="2" col="6">
-                            <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>
@@ -144,7 +143,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves">
+                <tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
                     <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
@@ -199,8 +198,9 @@
             <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')" string="Leaves Summary">
+                <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"/>
                     <field name="type"/>
                     <field name="name"/>
@@ -224,7 +224,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
                     <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
@@ -259,21 +259,21 @@
         </record>
 
         <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
-            <field name="sequence" eval="1"/>
+            <field name="sequence" eval="2"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_holiday"/>
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
-            <field name="sequence" eval="2"/>
+            <field name="sequence" eval="3"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_open_ask_holidays_calendar">
-            <field name="sequence" eval="3"/>
+            <field name="sequence" eval="1"/>
             <field name="view_mode">calendar</field>
             <field name="view_id" ref="view_holiday_new_calendar"/>
             <field name="act_window_id" ref="open_ask_holidays"/>
@@ -281,6 +281,32 @@
 
         <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
+        <record model="ir.actions.act_window" id="request_approve_holidays">
+            <field name="name">Requests 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,"search_default_department_id": department_id}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="edit_holiday_new"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_holidays_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_holiday"/>
+            <field name="act_window_id" ref="request_approve_holidays"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_holidays_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_holidays"/>
+        </record>
+
+        <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="res_model">hr.holidays</field>
@@ -313,7 +339,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1}</field>
+            <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1, 'search_default_validated': 1}</field>
             <field name="domain">[('holiday_type','=','employee')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -387,7 +413,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_hr_holidays_status_search" model="ir.ui.view">
             <field name="name">hr.holidays.status.search</field>
             <field name="model">hr.holidays.status</field>
@@ -399,7 +425,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="open_view_holiday_status" model="ir.actions.act_window">
             <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
@@ -409,9 +435,8 @@
             <field name="view_id" eval="view_holiday_status_normal_tree"/>
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </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_open_view_attendance_reason_config"/>
 
     <!-- holiday on resource leave -->
@@ -429,37 +454,38 @@
 
     <!--  Shortcuts -->
         <act_window name="Leaves" domain="[('type','=','remove')]" context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" res_model="hr.holidays" src_model="hr.employee" view_id="view_holiday" id="act_hr_employee_holiday_request"/>
-            
+
        <!--  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="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Assign Leaves" editable="top">
+                <tree string="Assign Leaves" editable="bottom">
                     <field name="name" string="Employee"/>
                     <field name="remaining_leaves" string="Remaining Legal Leaves"/>
                 </tree>
             </field>
-        </record>  
+        </record>
 
         <record model="ir.actions.act_window" id="hr_holidays_leaves_assign_legal">
-           <field name="name">Assign Legal Leaves to Employees</field>
+           <field name="name">Allocate Leaves for Employees</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">hr.employee</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
            <field name="view_id" ref="hr_holidays_leaves_assign_tree_view"/>
+           <field name="help">You can assign remaining Legal Leaves for each employee, OpenERP will automatically create and validate allocation requests.</field>
        </record>
 
        <record id="hr_holidays_leaves_assign_form_view_todo" model="ir.actions.todo">
            <field name="action_id" ref="hr_holidays_leaves_assign_legal"/>
            <field name="category_id" ref="hr.category_hr_management_config"/>
-       </record>        
-       
+       </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>
@@ -467,7 +493,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
-                    <field name="remaining_leaves" string="Remaining Legal Leaves"/>
+                    <field name="remaining_leaves" string="Remaining Legal Leaves" readonly="1"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 01aff603626..7ed381636cf 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-      <menuitem
-            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="10" />
-
      <menuitem
             id="menu_hr_reporting_holidays"
-            name="Holidays"
+            name="Leaves"
             parent="hr.menu_hr_reporting"
             sequence="6"/>
  	</data>
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 888b3dd629d..7013d62a5ed 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -42,10 +42,8 @@
     <record model="workflow.activity" id="act_refuse">
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">refuse</field>
-        <field name="kind">function</field>
         <field name="flow_stop">True</field>
         <field name="kind">stopall</field>
-        <field name="action">holidays_refuse()</field>
     </record>
 
     <!--
@@ -70,6 +68,7 @@
         <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>
 
@@ -77,22 +76,15 @@
         <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="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t8">
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_validate1" />
-        <field name="group_id" ref="base.group_hr_user"/>
         <field name="signal">second_validate</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t10">
-        <field name="act_from" ref="act_validate1" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
-        <field name="group_id" ref="base.group_hr_user"/>
+        <field name="group_id" ref="base.group_hr_manager" />
     </record>
 
     <record model="workflow.transition" id="t11">
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index 1ba7fe930fd..d338e15a41d 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 11fd5ac0189..c984be049e5 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -306,7 +306,7 @@ msgstr "Състояние"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "Общо отпуски по тип"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -766,15 +766,3 @@ msgstr "За потвърждение"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "За одобрение"
-
-#~ msgid "Validate"
-#~ msgstr "Проверка"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index 30edaa629c0..30e9c3b7d15 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,6 +766,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 069a714aaec..84d4da2a1f6 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: 2011-08-07 04:37+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 48495f90acc..e594eb4ede4 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -4,84 +4,86 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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: 2009-02-04 09:44+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-10-17 08:27+0000\n"
+"Last-Translator: Chronos <Unknown>\n"
+"Language-Team: openerp-i18n-czech  <openerp-i18n-czech@lists.launchpad.net "
+">\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-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Blue"
-msgstr ""
+msgstr "Modrá"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr ""
+msgstr "Typ přidělení"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr ""
+msgstr "Čekající na druhé schválení"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "Maximálně povolených uvolnění - Uvolnění již vybraných"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "Správa uvolnění"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
-msgstr ""
+msgstr "Uvolnění pro nemoc"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Oddělení"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Refused"
-msgstr ""
+msgstr "Odmítnuto"
 
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Kategorie zaměstnanců"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr ""
+msgstr "Hnědá"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr ""
+msgstr "Zbývajících dnů"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr ""
+msgstr "Podle zaměstnance"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -89,28 +91,30 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
+"Správce uvolnění vám umožnít nechat toto pole prázdné, pokud "
+"požadavek/přidělení tohoto uvolnění je pro každého zaměstnance"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Nastavit na koncept"
 
 #. module: hr_holidays
 #: 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 "Holidays"
-msgstr ""
+msgstr "Dovolené"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr ""
+msgstr "Světle purpurová"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr ""
+msgstr "Světle zelená"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -120,22 +124,26 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"Požadavky na uvolnění mohou být zaznamenány zaměstnanci a ověřeny jejich "
+"správci. Jakmile je požadavek na uvolnění ověřen, automaticky se objeví v "
+"agendě zaměstnance. Můžete zadat několik typů povolení (placená dovolená, "
+"nemoc, aj.) a spravovat povolení podle typu."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr ""
+msgstr "Souhrn uvolnění"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Scháleno"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
-msgstr ""
+msgstr "Odmítnout"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:309
@@ -143,27 +151,29 @@ msgstr ""
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
+"Nemůžete ověřit uvolnění pro zaměstnance %s: příliš málo zbývajících dnů "
+"(%s)."
 
 #. module: hr_holidays
 #: view:board.board:0
 #: view:hr.holidays:0
 msgid "Leaves"
-msgstr ""
+msgstr "Uvolnění"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 msgid "Leave"
-msgstr ""
+msgstr "Uvolnění"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr ""
+msgstr "Uvolnění podle oddělení"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Zrušeno"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -172,21 +182,24 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"Vyberte 'Požadavek na uvolnění', pokud si někdo chce vzít volno. \n"
+"Vyberte 'Požadavek na přidělení', pokud chcete zvýšit počet uvolnění "
+"dostupných pro někoho"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Ověření"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Barva ve výkazu"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr ""
+msgstr "Výkaz souhrnu dovolných HR podle zaměstnance"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -199,24 +212,24 @@ msgstr ""
 #: 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 ""
+msgstr "Typ uvolnění"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
 #: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varování!"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Koncept"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr ""
+msgstr "Fialová"
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -226,34 +239,38 @@ msgid ""
 "'Waiting Approval'.            If the admin accepts it, the state is "
 "'Approved'. If it is refused, the state is 'Refused'."
 msgstr ""
+"Když je požadavek na dovolenou vytvořen, stav je nastaven na 'Koncept'.\n"
+" Je potvrzen uživatelem a požadavek je odeslán správci, stav je nastaven na "
+"'Čekající na schválení'.            Pokud jej správce přijme, stav je "
+"'Schválený'. Pokud je odmítnut, stav je  'Zamitnutý'."
 
 #. 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 ""
+msgstr "Musíte vybrat nejméně jedno oddělení. A zkuste znova"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrzeno"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,date_from:0
 #: field:hr.holidays.summary.employee,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdit"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "Počáteční datum musí být před datem ukončení !"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -291,76 +308,109 @@ msgid ""
 "            for example, you maybe will do it for the user 'admin'\n"
 "            .\n"
 msgstr ""
+"Lidské zdroje: Sledování dovolených a toku práce\n"
+"\n"
+"    Tento modul vám umožní spravovat uvolnění a požadavky na uvolnění.\n"
+"    Realizuje nástěnku pro správu lidských zdrojů, která zahrnuje.\n"
+"        * Moje uvolnění\n"
+"        * Moje útraty\n"
+"    Poznamenejme, že:\n"
+"    - Synchronizace s vnitřní agendou (použití modulu CRM) je možná: k "
+"automatickému vytvoření případu, když je přijat požadavek na dovolenou, "
+"musíte propojit stav dovolené na sekci případů. Můžete nastavit tuto "
+"informaci a předvolby barev v\n"
+"                HR / Nastavení / Stavy dovolené\n"
+"    - Zaměstnanec může požádat pro více volných dnů vytvořením nového "
+"přidělení. To zvýší jeho celkem dostupných tohoto typu uvolnění (pokud je "
+"požadavek přijat).\n"
+"    - Jsou dva způsoby jak vytisknout dovolené zaměstnance:\n"
+"        * První vám umožní vybrat zaměstnance podle oddělené a je vyvoláno z "
+"menu umístěného v\n"
+"                HR / Požadavky dovolených / Tisk souhrnu dovolených\n"
+"        * Druhá vám umožní vybrat výkaz dovolených určitého zaměstnance. "
+"Jděte na seznam\n"
+"                HR / Zaměstnanci / Zaměstnanci\n"
+"            pak vyberte ty, které chcete vybrat, klikněte na ikonu tisku a "
+"vyberte volbu\n"
+"                'Tisknout souhrn dovolených zaměstnanců'\n"
+"    - Průvodce vám umožní vybrat, zda chcete tisknout buď Potvrzené & "
+"Ověřené dovolené nebo pouze Ověřené. Tyto stavy musí být nastaveny "
+"uživatelem ze skupiny 'HR'. Můžete definovat tyto funkce v záložce "
+"zabezpečení z uživatelských dat v\n"
+"                Správa / Uživatelé / Uživatelé\n"
+"            na příklad, můžete chtít toto udělat pro uživatele 'admin'\n"
+"            .\n"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "Zbývajících uvolnění"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "Celkem dovolených podle typu"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 msgid "Employee"
-msgstr ""
+msgstr "Zaměstnanec"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "Červená"
 
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr ""
+msgstr "Uvolnění podle typu"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
-msgstr ""
+msgstr "Světle lososová"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr ""
+msgstr "Pšeničná"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Chyba! počáteční datum uvolnění musí být menší než konečné datum uvolnění."
 
 #. 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 ""
+msgstr "Počet dní"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Hledat typ uvolnění"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "Musíte vybrat zaměstnance nebo kategorii"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -368,16 +418,18 @@ msgid ""
 "If its True then its Allocation/Request have to be validated by second "
 "validator"
 msgstr ""
+"Pokud je pravdivé, pak Přidělení/Požadavek musí být ověřen druhým "
+"ověřovatelem"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Čekající na schválení"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "Zaměstnanci"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -385,43 +437,45 @@ msgid ""
 "If you set a meeting type, OpenERP will create a meeting in the calendar "
 "once a leave is validated."
 msgstr ""
+"Pokud nastavíte typ setkání, OpenERP vytvoří setkání jakmile bude uvolnění "
+"ověřeno."
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
-msgstr ""
+msgstr "Vztažené požadavky"
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Nadřazené"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr ""
+msgstr "Levandulová"
 
 #. module: hr_holidays
 #: 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 "Požadavky na uvolnění"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+msgstr "Umožnit přepsat omezení"
 
 #. 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 "Dovolené zaměstnanců"
 
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,max_leaves:0
@@ -429,112 +483,114 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
+"Tato hodnota je dána jako součet všech požadavků na dovolené s kladnou "
+"hodnotou."
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr ""
+msgstr "Uvolnění všech zaměstnanců"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
-msgstr ""
+msgstr "Světle korálová"
 
 #. 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 "Dovolené podle oddělení"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "Černá"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "Dovolená"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "Setkání"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Ivory"
-msgstr ""
+msgstr "Slonovinová"
 
 #. 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 ""
+msgstr "Oba ověřeno i potvrzeno"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr ""
+msgstr "Již vybrané uvolnění"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
 #: field:hr.holidays.remaining.leaves.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Uživatel"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivní"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "Leaves To Validate"
-msgstr ""
+msgstr "Uvolnění k ověření"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšířené filtry..."
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr ""
+msgstr "Počet dnů musí být větší než 0 !"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "První schválení"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Casual Leave"
-msgstr ""
+msgstr "Nahodilé uvolnění"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr ""
+msgstr "Souhrn uvolnění"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr ""
+msgstr "Světle modrá"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "Typ požadavku"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
@@ -542,33 +598,35 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
+"Pokud je aktivní pole nastaveno na nepravda, umožní vám to skrát typ "
+"uvolnění bez jeho odstranění."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Misc"
-msgstr ""
+msgstr "Různé"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "Obecné"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "Důvody"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "Analýza uvolnění"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
@@ -576,61 +634,63 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
+"Barva bude použita v přehledu uvolnění umístěném v Vykazování\\Uvolnění "
+"podle oddělení"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "Ověřeno"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "Požadavek na přidělení"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "Podrobnosti uvolnění"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Použít dvojté ověření"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Print"
-msgstr ""
+msgstr "Tisk"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "Podrobnosti"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr ""
+msgstr "Moje uvolnění"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "Podle kategorie zaměstnance"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Požavek na uvolnění"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -638,47 +698,50 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
+"Podle zaměstnance: Přidělení/Požadavek pro jednotlivé zaměstnance, Podle "
+"kategorie zaměstnance: Přidělení/Požadavek pro skupinu zaměstnanců v "
+"kategorii"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr ""
+msgstr "Nemůžete odstranit uvolnění, které není v návrhovém stavu !"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Hledat uvolnění"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Vybrat typ dovolené"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "Zbývajících uvolnění"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "Oddělení"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "This Month"
-msgstr ""
+msgstr "Tento měsíc"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "Druhé schválení"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Datum ukončení"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
@@ -686,6 +749,8 @@ msgid ""
 "If you tick this checkbox, the system will allow, for this section, the "
 "employees to take more leaves than the available ones."
 msgstr ""
+"Pokud zaškrtnete toto políčko, systém vám pro tuto sekci umožní, aby "
+"zaměstnanci mohli vzít více uvolnění než mají dostupných."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -693,16 +758,17 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
+"Hodnota je dána jako součet všech požadavků dovolených se zápornou hodnotou."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "Fialová"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
 msgid "Maximum Allowed"
-msgstr ""
+msgstr "Nejvíce povolených"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -710,59 +776,62 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Tato oblast je automaticky vyplněna uživatelem, který ověřuje uvolnění na "
+"druhé úrovni (Pokud typ uvolnění  vyžaduje druhé ověření)"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "Lidské zdroje: Správa dovolených"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "Výkaz souhrnu dovolených HR podle oddělení"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automaticly filled by the user who validate the leave"
 msgstr ""
+"Tato oblast je automaticky vyplněna uživatelem, který ověřuje uvolnění"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "Schválit"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "Požadavky na přidělení"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "Světle žlutá"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "Světle růžová"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr ""
+msgstr "Správce"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Confirm"
-msgstr ""
+msgstr "K potvrzení"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
+msgstr "Ke schválení"
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index f3fee69382f..6ccc22eced4 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -838,599 +838,3 @@ msgstr "Zu Bestätigen"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "Zu Genehmigen"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Urlaubsende"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Neue Urlaubsanfrage"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Alle Urlaubsanfragen"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Urlaubsanfrage (zu validieren)"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Mein Urlaubsantrag Entwurf"
-
-#~ msgid "of the"
-#~ msgstr "von"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Abwesenheitstage Zusammenfassung"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Mitarbeiter Urlaub"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Warnung"
-
-#~ msgid "to"
-#~ msgstr "nach"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Mitarbeiter Erklärung"
-
-#~ msgid "Validate"
-#~ msgstr "Validieren"
-
-#~ msgid "Refused Request"
-#~ msgstr "Verworfene Anfrage"
-
-#~ msgid "Both"
-#~ msgstr "Beide"
-
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Meine Urlaubsanfragen"
-
-#~ msgid "Notes"
-#~ msgstr "Bemerkungen"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Urlaub Status"
-
-#~ msgid "Request is refused."
-#~ msgstr "Anfrage wurde verworfen."
-
-#~ msgid "Holidays Management"
-#~ msgstr "Urlaubsplanung"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analysiere ab"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Zusammenfassung Urlaub"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Urlaub ist im Kaldender"
-
-#~ msgid "Holiday status"
-#~ msgstr "Urlaub Status"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Urlaub Status"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Urlaub erlaubt"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definiere Urlaubsstatus"
-
-#~ msgid "Section"
-#~ msgstr "Bereich"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Sein Vorgesetzter akzeptiert Antrag"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Erfassung des Jahresurlaubs"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Meine Urlaubsanträge"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Urlaubsstatus"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "Bei verfügbarem freien Urlaub kann Mitarbeiter diesen abfeiern."
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr ""
-#~ "Sie müssen mindestens einen Mitarbeiter wählen.Versuchen Sie es erneut."
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Meine genehmigten Urlaubsanfragen"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Anzahl Tage in Urlaubsantrag"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Urlaub per Mitarbeiter"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Erlaube Überschreitung Limit"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalenderansicht"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Start Urlaubsbeginn"
-
-#~ msgid "Notification"
-#~ msgstr "Benachrichtigung"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Mitarbeiter stellt Urlaubsantrag"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Mitarbeiterurlaub wird genehmigt"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Der Urlaub ist im Kalender ausgewiesen"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mein verfügbarer Urlaub"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Meine verworfenen Urlaubsanfragen"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Setze Jahresurlaub"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Meine Urlaubsanfragen (Entwurf)"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Meine Urlaubsanfragen"
-
-#~ msgid "Color of the status"
-#~ msgstr "Farbe des Status"
-
-#~ msgid "holidays."
-#~ msgstr "Urlaub."
-
-#~ msgid "draft"
-#~ msgstr "Entwurf"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Reufse"
-#~ msgstr "Verworfen"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Meine Warteliste mit Urlaubsanfragen"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Meine Urlaubsanfragen (Genehmigung)"
-
-#~ msgid "Approved Request"
-#~ msgstr "Bestätigte Urlaubsanfrage"
-
-#~ msgid "History"
-#~ msgstr "Historie"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Urlaubsanfrage"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Urlaubsanfragen (warten auf Genehmigung)"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Urlaubsanfrage"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Meine Urlaubsanfragen (abgelehnt)"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Drucke alle Urlaubszeiten"
-
-#~ msgid "Request is approved."
-#~ msgstr "Urlaubsanfrage wurde genehmigt"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Urlaubsbeschreibung"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Personalsekretariat"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Sie müssen mindestens eine Abteilung wählen. Versuche es erneut."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Mein genehmigter Urlaub"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Sein Vorgesetzter lehnt den Urlaubsantrag ab."
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "Uraubsantrag ID"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Protokoll Urlaube"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Dieser Urlaubantrag kann so nicht storniert werden. Er muss zuerst in den "
-#~ "Entwurfsstatus versetzt werden."
-
-#~ msgid "Holidays user"
-#~ msgstr "Urlaube Benutzer"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Urlaube Prozess"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Anzahl der beantragten Urlaubstage"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid "Employee_id"
-#~ msgstr "Mitarbeiter Nr."
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "gesetztl. Dokument Anmeldung Mitarbeiter"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Urlaub je Benutzer"
-
-#~ msgid "Report Options"
-#~ msgstr "Bericht Optionen"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Drucke alle Urlaubszeiten eines Mitarbeiters"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Urlaubs Manager"
-
-#~ msgid "Document for employee"
-#~ msgstr "Dokument für Mitarbeiter"
-
-#~ msgid "General Information"
-#~ msgstr "Allgemeine Informationen"
-
-#~ msgid "Case"
-#~ msgstr "Fall"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Urlaub je Mitarbeiter"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Erfasse Anzahl verfügbarer Urlaubstage"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Personal: Verwaltung der Ulraubszeiten\n"
-#~ "Dieses Modul verwaltet  Urlaube und Urlaugsanfragen. Je Urlaubskategorie und "
-#~ "Mitarbeiter können entsprechende Anspuchstage definiert werden.\n"
-#~ "Beachte:\n"
-#~ "- Die Synchronisierung mit einem internen Kalender (CRM Modul) ist möglich. "
-#~ "Um automatische inen Fall je Urlaubsanfrage zu generieren,  muss der "
-#~ "Urlaubsstatus mit einer Fall-Sektion verbunden werden. Dieser werden in \n"
-#~ "   Personal / Konfiguration / Urlaubs Status definiert\n"
-#~ "- Ein Mitarbetierkenn eine Anfrage mit negativen Tagen erstellen.Wenn diese "
-#~ "Anfrage akzeptiert wird, erhöhen sich die Tage entsprechend.\n"
-#~ "- MItarbeiter Urlaube können auf 2 Arten gedruckt werden.\n"
-#~ "  * je Abteilung ( Personal / Urlaubsanfragen / Drucke Zusammenfassung der "
-#~ "Urlaube )\n"
-#~ "  * je Mitarbeiter ( Personal / Mitarbeiter / MItarbeiter - einen oder "
-#~ "mehrere auswählen und Druck Menü aufrufen)\n"
-#~ "Benutzer der Gruppe Personal/HR und der Rolle Urlaube/holidays können den "
-#~ "Status definieren.\n"
-
-#~ msgid "Taken Leaves"
-#~ msgstr "Beanspruchter Urlaub"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Allocated Leaves"
-#~ msgstr "Urlaubsanspruch"
-
-#~ msgid "Company Allocation"
-#~ msgstr "Betriebsurlaub"
-
-#~ msgid "March"
-#~ msgstr "März"
-
-#~ msgid "Leave Days"
-#~ msgstr "Urlaubstage"
-
-#~ msgid "Category's Name"
-#~ msgstr "Kategorie Bezeichnung"
-
-#~ msgid "Validation User"
-#~ msgstr "Benutzererkennung"
-
-#~ msgid ""
-#~ "This field is only for informative purposes, to depict if the leave "
-#~ "request/allocation comes from an employee or from the company"
-#~ msgstr ""
-#~ "Dieses Feld ist lediglich zur Information, genaugenommen zur "
-#~ "Veranschaulichung ob eine Erfassung von Anfrage bzw. Anspruch für Urlaub für "
-#~ "den Mitarbeiter oder das Unternehmen gilt."
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Erwarte Genehmigung"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Kategorie Mitarbeiter"
-
-#~ msgid "Remaining Leave by Type and User"
-#~ msgstr "Resturlaub n. Typ u. Benutzer"
-
-#~ msgid "July"
-#~ msgstr "Juli"
-
-#~ msgid " Month "
-#~ msgstr " Monat "
-
-#~ msgid ""
-#~ "If you link this type of leave with a category in the CRM, it will "
-#~ "synchronize each leave asked with a case in this category, to display it in "
-#~ "the company shared calendar for example."
-#~ msgstr ""
-#~ "Wenn Sie diesen Typ mit einer CRM Kategorie verbinden, können Sie alle "
-#~ "Abwesenheitsvorgänge automatisch mit einem Typ in dieser CRM Kategorie "
-#~ "gemeinsam in einem konfigurierten Gruppenkalender einsehen und bearbeiten."
-
-#~ msgid "September"
-#~ msgstr "September"
-
-#~ msgid "December"
-#~ msgstr "Dezember"
-
-#~ msgid "Remaining Leaves by User"
-#~ msgstr "Resturlaub nach Benutzern"
-
-#~ msgid "Month"
-#~ msgstr "Monat"
-
-#~ msgid "Available Holidays"
-#~ msgstr "Verfügbarer Urlaub"
-
-#, python-format
-#~ msgid "No user related to the selected employee."
-#~ msgstr "Kein Benutzer für den ausgewählten Mitarbeiter vorhanden."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können rekursiven Menüs erstellen."
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Maximale Urlaubstage"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for %s while available leaves are less than asked "
-#~ "leaves.' %(record.category_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            else:\n"
-#~ "                nb = record.number_of_days_temp\n"
-#~ "\n"
-#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
-#~ "                user_id = record.employee_id.user_id and "
-#~ "record.employee_id.user_id.id or uid\n"
-#~ "\n"
-#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
-#~ "'number_of_days': nb, 'user_id': user_id })\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
-#~ "        vals = {'state': 'refuse'}\n"
-#~ "        ids2 = self.pool.get('hr.employee"
-#~ msgstr ""
-#~ "Sie können keine %s Tage genehmigen, wenn der verfügbare Rest kleiner als "
-#~ "die beantragte Anzahl an Tagen ist.' %(record.category_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            else:\n"
-#~ "                nb = record.number_of_days_temp\n"
-#~ "\n"
-#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
-#~ "                user_id = record.employee_id.user_id and "
-#~ "record.employee_id.user_id.id or uid\n"
-#~ "\n"
-#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
-#~ "'number_of_days': nb, 'user_id': user_id })\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
-#~ "        vals = {'state': 'refuse'}\n"
-#~ "        ids2 = self.pool.get('hr.employee"
-
-#~ msgid " Year "
-#~ msgstr " Jahr "
-
-#~ msgid "August"
-#~ msgstr "August"
-
-#~ msgid "June"
-#~ msgstr "Juni"
-
-#~ msgid "November"
-#~ msgstr "November"
-
-#~ msgid "October"
-#~ msgstr "Oktober"
-
-#~ msgid "January"
-#~ msgstr "Januar"
-
-#~ msgid "Employee Request"
-#~ msgstr "Urlaubsanfrage"
-
-#~ msgid "Extended options..."
-#~ msgstr "Erweiterte Optionen.."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for %s while available leaves are less than asked "
-#~ "leaves.' %(record.employee_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            elif record.holiday_type == 'category' and record.type == "
-#~ "'remove':\n"
-#~ "                if record.category_id and not "
-#~ "record.holiday_status_id.limit:\n"
-#~ "                    leaves_rest = self.pool.get('hr.holidays.status"
-#~ msgstr ""
-#~ "Sie können die beantragten %s Tage nicht genehmigen, wenn die verbleibenden "
-#~ "Urlaubstage diesen Anspruch nicht decken.' %(record.employee_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            elif record.holiday_type == 'category' and record.type == "
-#~ "'remove':\n"
-#~ "                if record.category_id and not "
-#~ "record.holiday_status_id.limit:\n"
-#~ "                    leaves_rest = self.pool.get('hr.holidays.status"
-
-#~ msgid ""
-#~ "Start date should not be larger than end date!\n"
-#~ "Number of Days should be greater than 1!"
-#~ msgstr ""
-#~ "Startdatum sollte nicht größer als Endedatum sein !\n"
-#~ "Anzahl Tage sollte mehr als '1' sein!"
-
-#~ msgid "Day"
-#~ msgstr "Tag"
-
-#~ msgid " Leave Type"
-#~ msgstr " Abwesenheitstyp"
-
-#~ msgid "My Leaves by Type"
-#~ msgstr "Abwesenheit nach Typ"
-
-#~ msgid "May"
-#~ msgstr "Mai"
-
-#~ msgid "Meeting Category"
-#~ msgstr "Meeting Kategorie"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Mitarbeiter Name"
-
-#~ msgid "Leaves by Month"
-#~ msgstr "Abwesenheit n. Monat"
-
-#~ msgid "February"
-#~ msgstr "Februar"
-
-#~ msgid "April"
-#~ msgstr "April"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#, python-format
-#~ msgid "Wrong leave definition."
-#~ msgstr "Falsche Beschreibung Abwesenheit"
-
-#~ msgid "Year"
-#~ msgstr "Jahr"
-
-#, python-format
-#~ msgid ""
-#~ "You Cannot Validate leaves while available leaves are less than asked leaves."
-#~ msgstr ""
-#~ "Sie können keine Tage genehmigen, wenn die verfügbaren Tage geringer als die "
-#~ "angefragten Urlaubstage sind."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid ""
-#~ "Leaves requests can be recorded by employees and validated by their "
-#~ "managers. Once a leave request is validated it appears automatically in the "
-#~ "agenda of the employee. You can define several allowance types (paid "
-#~ "holidays, sickness, etc) and manage allowances per type."
-#~ msgstr ""
-#~ "Abwesenheitsanfragen zum Beispiel aufgrund Urlaub können durch Mitarbeiter "
-#~ "erstellt und durch Vorgesetzte genehmigt werden. Sobald ein Antrag genehmigt "
-#~ "wird erscheint, die Abwesenheit auch in der Abwesenheits- und Terminliste "
-#~ "für den Mitarbeiter. Sie können unterschiedliche Abwesenheitstypen "
-#~ "generieren (bezahlter Urlaub, Krankheit etc.) und die Abwesenheit gemäss "
-#~ "dieser unterschiedlichen Typen verwalten."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Leaves By Month"
-#~ msgstr "Abwesenheit nach Monaten"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for employee %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "Sie können die Abwesenheitstage für den Mitarbeiter %s nicht freigeben, da "
-#~ "seine verfügbaren Tage nicht ausreichen."
-
-#~ msgid "    Month-1    "
-#~ msgstr "    Monat -1    "
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for category %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "Sie können die Abwesenheitstage für die Kategorie %s nicht prüfen und "
-#~ "freigeben, wenn nicht ausreichend verfügbare Abwesenheitstage hinterlegt "
-#~ "wurden."
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 8bdb552c9af..8edb13ac801 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -769,361 +769,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Νέα αίτηση Αδείας"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Όλες οι Αίτήσεις Αδείας"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Αιτήσεις προς επικύρωση"
-
-#~ msgid "of the"
-#~ msgstr "του/της"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Ρεπό Συνοπτικά"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Άδειες Υπαλλήλων"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Προσοχή!"
-
-#~ msgid "to"
-#~ msgstr "ως"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Δήλωση Υπαλλήλου"
-
-#~ msgid "Validate"
-#~ msgstr "Επικύρωση"
-
-#~ msgid "Refused Request"
-#~ msgstr "Απορριφθείσα Αίτηση"
-
-#~ msgid "Both"
-#~ msgstr "Όλα"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Οι Αιτήσεις Αδείας μου"
-
-#~ msgid "Notes"
-#~ msgstr "Σημειώσεις"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Κατάσταση Αδειών"
-
-#~ msgid "Request is refused."
-#~ msgstr "Η Αίτηση έχει απορριφθεί"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Διαχείριση Αδειών"
-
-#~ msgid "Analyze from"
-#~ msgstr "Ανάλυση από"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Άδειες συνοπτικά"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Η άδεια ορίζεται στο Ημερολόγιο"
-
-#~ msgid "Holiday status"
-#~ msgstr "Τύπος άδειας"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Τύποι Αδειών"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Τέλος άδειας"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Επιτρεπτές άδειες"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Επίσημο Έγγραφο Πρόσληψης"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Άδειες ανά Χρήστη"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Ορισμός κατάστασης άδειας"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Οι Αιτήσεις Αδείας μου προς επιβεβαίωση"
-
-#~ msgid "Employee_id"
-#~ msgstr "Employee_id"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Κωδικοποίηση διαθέσιμων ετησίων αδειών."
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Employee get holidays"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Αριθμός αιτηθέντων διακοπών"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Οι Αιτήσεις μου"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Κατάσταση 'Αδειας"
-
-#~ msgid "Report Options"
-#~ msgstr "Επιλογές Αναφοράς"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Ο Προϊστάμενος εγκρίνει την αίτηση"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr ""
-#~ "Αν υπάρχουν διαθέσιμες ημέρες, ο υπάλληλος μπορεί να την συμπληρώσει."
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Πρέπει να διαλέξετε τουλάχιστον 1 υπάλληλο"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Οι Επικυρωμένες Αιτήσεις μου"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Αριθμός Ημερών στην Αίτηση"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Άδειες ανά Υπάλληλο"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Επιτρέπεται Υπέρβαση ορίου"
-
-#~ msgid "Holidays user"
-#~ msgstr "Χρήστης Αδειών"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Εκτύπωση Αδειών Συνοπτικά"
-
-#~ msgid "Calendar"
-#~ msgstr "Ημερολόγιο"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Ημέρα έναρξης Άδειας"
-
-#~ msgid "Notification"
-#~ msgstr "Παρατήρηση"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Ο υπάλληλος συμπληρώνει Αίτηση Άδειας"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Η άδεια ορίζεται στο Ημερολόγιο"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Οι Διαθέσιμές Ημέρες Άδειάς μου"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Οι Απορριφθείσες Αιτήσεις Αδείας μου"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Ορισμός Άδειας"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Αίτήσεις Αδείας μου (πρόχειρες)"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Ανώτατο όριο αδειών"
-
-#~ msgid "Status"
-#~ msgstr "Κατάσταση"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Άιτηση Αδείας μου"
-
-#~ msgid "Color of the status"
-#~ msgstr "Χρώμα Κατάστασης"
-
-#~ msgid "holidays."
-#~ msgstr "holidays."
-
-#~ msgid "draft"
-#~ msgstr "πρόχειρη"
-
-#~ msgid "Document for employee"
-#~ msgstr "Έγγραφο για τον υπάλληλο"
-
-#~ msgid "Date"
-#~ msgstr "Ημερ/νία"
-
-#~ msgid "Reufse"
-#~ msgstr "Απόρριψη"
-
-#~ msgid "Section"
-#~ msgstr "Τομέας"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Αιτήσεις μου προς επιβεβαίωση"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Διαχειριστής Αδειών"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Οι Αιτήσεις Αδείας μου (Πρόχειρα)"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Δεν μπορείτε να ακυρώσετε αυτή την αίτηση. Πρέπει πρώτα να να μετατρέψετε το "
-#~ "case σε πρόχειρο."
-
-#~ msgid "Approved Request"
-#~ msgstr "Εγκεκριμένη Αίτηση"
-
-#~ msgid "History"
-#~ msgstr "Ιστορικό"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Αίτηση Αδείας"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Αιτήσεις Αδείας προς Επικύρωση"
-
-#~ msgid "General Information"
-#~ msgstr "Γενικές Πληροφορίες"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Holidays def Request"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Αιτήσεις Αδείας μου Απορριφθείσες"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Εκτύπωση Αδειών Συνοπτικά"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Log Holidays"
-
-#~ msgid "Request is approved."
-#~ msgstr "Η αίτηση έχει εγκριθεί"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Ορισμός Αδειών"
-
-#~ msgid "Case"
-#~ msgstr "Case"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Κωδικοποίηση Διαθεσίμων Αδειών"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Secretariat Social"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Διαδικασάι Αδειών"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα τμήμα!"
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Οι Επικυρωμένες Αιτήσεις Αδείας μου"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "Αρ. Αίτησης"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Ο Προϊστάμενός του απορρίπτει την αίτηση"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Άδειες ανα χρήστη"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Σε αναμονή έγκρισης"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Ανθρώπινο Δυναμικό: Εντοπισμός διακοπών και ροή εργασίας\n"
-#~ "\n"
-#~ "    Η μονάδα αυτή σας επιτρέπει να διαχειρίζεστε τα αιτήματα για ρεπό και "
-#~ "τις αργίες. Για κάθε εργαζόμενο, μπορείτε επίσης να καθορίσετε έναν αριθμό "
-#~ "διαθέσιμων ρεπό ανά κατάσταση διακοπών.\n"
-#~ "\n"
-#~ "    Σημειώστε ότι:\n"
-#~ "    - Ένας συγχρονισμό με μια εσωτερική αντζέντα (χρήση της μονάδας CRM) "
-#~ "είναι δυνατός: για να δημιουργηθεί αυτόματα μια περίπτωση, όταν ένα αίτημα "
-#~ "διακοπών γίνεται αποδεκτό, θα πρέπει να συνδέσετε την κατάσταση διακοπών σε "
-#~ "ένα τμήμα υπόθεσης. Μπορείτε να ρυθμίσετε αυτές τις πληροφορίες και το χρώμα "
-#~ "προτίμησής σας στο\n"
-#~ "                ΑΔ / Διαμόρφωση / Κατάσταση Διακοπών\n"
-#~ "    - Ένας εργαζόμενος μπορεί να κάνει ένα αρνητικό αίτημα διακοπών (αίτηση "
-#~ "διακοπών για -2 ημέρες για παράδειγμα), αυτό θεωρείται από το σύστημα ως "
-#~ "ζήτηση για περισσότερες ημέρες αργιών. Θα αυξήσει τη συνολική διαθέσιμη "
-#~ "κατάσταση διακοπών  (αν γίνει αποδεκτή η αίτηση).\n"
-#~ "    - Υπάρχουν δύο τρόποι για να εκτυπώσετε τις διακοπές του εργαζομένου:\n"
-#~ "        * Η πρώτη θα επιτρέψει να επιλεγούν εργαζόμενοι ανά τμήμα και "
-#~ "χρησιμοποιείται κάνοντας κλικ στο στοιχείο του μενού που βρίσκεται στο\n"
-#~ "                ΑΔ / Αίτηση Διακοπών / Εκτύπωση περίληψης διακοπών\n"
-#~ "        * Ο δεύτερος θα σας επιτρέψει να επιλέξετε την έκθεση διακοπών για "
-#~ "συγκεκριμένα άτομα. Πηγαίνετε στον κατάλογο\n"
-#~ "                ΑΔ / Εργαζόμενοι / Εργαζόμενοι\n"
-#~ "            στη συνέχεια, επιλέξτε αυτούς που θέλετε να επιλέξετε, κάντε "
-#~ "κλικ στο εικονίδιο εκτύπωσης και επιλέξτε την επιλογή\n"
-#~ "                «Συνοπτική Εκτύπωση των διακοπών των εργαζομένων»\n"
-#~ "    Ο οδηγός σας επιτρέπει να επιλέξετε αν θέλετε να εκτυπώσετε είτε τις "
-#~ "επιβεβαίομένες & Επικυρωμένες διακοπές ή μόνο τις Επικυρωμένες. Αυτές οι "
-#~ "καταστάσεις πρέπει να καθοριστούν από ένα χρήστη από την ομάδα «ΑΔ» και με "
-#~ "το ρόλο «διακοπές. Μπορείτε να ορίσετε τα χαρακτηριστικά αυτά στην καρτέλα "
-#~ "ασφάλειας από τα δεδομένα ενός χρήστη στη\n"
-#~ "                Διαχείριση / Χρήστες / Χρήστες\n"
-#~ "            Για παράδειγμα, μπορείτε ίσως να το κάνετε για τον χρήστη "
-#~ "'admin'.\n"
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index c8b3cdd2669..148fb6a3211 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -102,7 +102,7 @@ msgstr "Cambiar a borrador"
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays"
-msgstr "Ausencias"
+msgstr "Festivos"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -137,7 +137,7 @@ msgstr "Resumen de ausencias"
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
-msgstr "Aprobada"
+msgstr "Aprobado"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -228,7 +228,7 @@ msgstr "Borrador"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr "Violeta"
+msgstr "Magenta"
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -260,7 +260,7 @@ msgstr "Confirmado"
 #: field:hr.holidays.summary.dept,date_from:0
 #: field:hr.holidays.summary.employee,date_from:0
 msgid "From"
-msgstr "Desde"
+msgstr "desde"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -391,7 +391,7 @@ msgstr "Salmón claro"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr "Trigo"
+msgstr "Amarillo"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
@@ -532,12 +532,12 @@ msgstr "Marfil"
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr "Validadas y Confirmadas"
+msgstr "Validades y confirmadas"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "Vacaciones realizadas"
+msgstr "Vacaciones ya realizadas"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -720,7 +720,7 @@ msgstr "Buscar ausencia"
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr "Seleccionar un tipo de ausencias"
+msgstr "Seleccionar tipo de vacaciones"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
@@ -730,7 +730,7 @@ msgstr "Ausencias restantes"
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
-msgstr "Departamento(s)"
+msgstr "Departmento(s)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -788,7 +788,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr "Recursos humanos: Gestión de ausencias"
+msgstr "Gestión de vacaciones"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
@@ -842,523 +842,3 @@ msgstr "Para confirmar"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "Para aprobar"
-
-#~ msgid "Notification"
-#~ msgstr "Notificación"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mis vacaciones disponibles"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Mis peticiones de vacaciones esperando confirmación"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Peticiones esperando validación"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Máximo de vacaciones permitidas"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Vacaciones permitidas"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Mis peticiones de vacaciones"
-
-#~ msgid "draft"
-#~ msgstr "Borrador"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Report Options"
-#~ msgstr "Opciones del informe"
-
-#~ msgid "Case"
-#~ msgstr "Caso"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Mis peticiones de vacaciones"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Mis peticiones de vacaciones esperando confirmación"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Resumen de las vacaciones"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Vacaciones por empleado"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Petición de vacaciones"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Selecciona por lo menos un empleado. Prueba otra vez."
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Peticiones esperando validación"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Mis peticiones de vacaciones validadas"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Todas las peticiones de vacaciones"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Resumen días de ausencia"
-
-#~ msgid "Section"
-#~ msgstr "Sección"
-
-#~ msgid "Analyze from"
-#~ msgstr "Análisis desde"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "to"
-#~ msgstr "hasta"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Vacaciones por usuario"
-
-#~ msgid "of the"
-#~ msgstr "del"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definir Estado Vacaciones"
-
-#~ msgid "Holiday status"
-#~ msgstr "Estado Vacaciones"
-
-#~ 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 "Request is refused."
-#~ msgstr "Petición es rechazada."
-
-#~ msgid "Refused Request"
-#~ msgstr "Petición rechazada"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Documento de declaración oficial para declarar nuevo empleado"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Gestión de vacaciones"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Las vacaciones son fijadas en el calendario."
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Nueva petición de vacaciones"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Su responsable aprueba la petición"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Codificación de vacaciones disponibles anuales."
-
-#~ msgid "Set Holiday"
-#~ msgstr "Fijar vacaciones"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Las vacaciones son fijadas en el calendario"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Empleado obtiene vacaciones"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Empleado rellena una petición de vacaciones"
-
-#~ msgid "Calendar"
-#~ msgstr "Calendario"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Permite superar el límite"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr ""
-#~ "Si hay vacaciones disponibles, el empleado puede cogerla y rellenarla."
-
-#~ msgid "Approved Request"
-#~ msgstr "Petición aprobada"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Petición define vacaciones"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Definición vacaciones"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Codifica número de vacaciones disponibles"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Secretaría social"
-
-#~ msgid "Document for employee"
-#~ msgstr "Documento para empleado"
-
-#~ msgid "Reufse"
-#~ msgstr "Rechazar"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Su responsable rechaza la petición"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Debe seleccionar por lo menos 1 departamento. Inténtelo de nuevo."
-
-#~ msgid "Holiday manager"
-#~ msgstr "Responsable de vacaciones"
-
-#~ msgid "Both"
-#~ msgstr "Ambas"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Registro de vacaciones"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "No puede cancelar esta petición de vacaciones. Debe convertir su caso en "
-#~ "estado borrador."
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "History"
-#~ msgstr "Historial"
-
-#~ msgid "Holidays user"
-#~ msgstr "Usuario de vacaciones"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "¡Atención!"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Número de vacaciones solicitadas"
-
-#~ msgid "Date"
-#~ msgstr "Fecha"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "ID solicitud de vacaciones"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Proceso de vacaciones"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Vacaciones de empleado"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Declaración de empleado"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Estado de vacaciones"
-
-#~ msgid "Employee_id"
-#~ msgstr "Empleado"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Mis peticiones"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Número de días solicitados en esta petición"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Imprimir resumen de vacaciones"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Mis peticiones en borrador"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Mis peticiones rechazadas"
-
-#~ msgid "holidays."
-#~ msgstr "Vacaciones."
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Mis peticiones rechazadas"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Imprimir resumen de vacaciones"
-
-#~ msgid "Request is approved."
-#~ msgstr "Petición aprobada."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Mis peticiones validadas"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Esperando validación"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Estado de vacaciones"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Fecha fin vacaciones"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Vacaciones por usuario"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Mis peticiones en borrador"
-
-#~ msgid "Color of the status"
-#~ msgstr "Color del estado"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Fecha inicio de vacaciones"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Estado vacaciones"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Recursos Humanos: Registro y seguimiento de Vacaciones\n"
-#~ "    Este módulo permite administrar las vacaciones y peticiones de "
-#~ "vacaciones. Para cada empleado se puede definir un numero de vacaciones "
-#~ "disponibles.\n"
-#~ "    Además:\n"
-#~ "    - Es posible sincronizar con la agenda (usando el módulo de CRM): Para "
-#~ "poder automatizar la creación de casos cuando una petición es aceptada, "
-#~ "tiene que relacionar un estado de vacaciones con una sección de casos. Puede "
-#~ "configurar esta información y también el color preferido en RRHH / "
-#~ "Configuración / Estado de vacaciones.\n"
-#~ "    - Un empleado puede crear peticiones negativas (pedir -2 días por "
-#~ "ejemplo). Esto el sistema lo considera como una petición de más días de "
-#~ "ausencia. Incrementará su total de vacaciones disponibles de este tipo (si "
-#~ "la petición es aceptada).\n"
-#~ "    - Hay 2 maneras de imprimir las vacaciones:\n"
-#~ "        * La primera permite seleccionar empleados por departamento y está "
-#~ "disponible desde el menú\n"
-#~ "              RRHH / Petición de vacaciones / Imprimir resumen de "
-#~ "vacaciones\n"
-#~ "        * La segunda permite seleccionar el informe de vacaciones para "
-#~ "ciertos empleados. Desde la lista\n"
-#~ "              RRHH / Empleados / Empleados\n"
-#~ "          seleccione los empleados que desee, haga clic en el icono de "
-#~ "imprimir y seleccione la opción\n"
-#~ "              'Imprimir resumen de vacaciones de los empleados'\n"
-#~ "    - El asistente permite elegir si quiere imprimir las vacaciones "
-#~ "confirmadas y validadas o sólo las validadas. Estos estados deben "
-#~ "configurarse por un usuario del grupo 'HR' con el rol de 'holidays'. Puede "
-#~ "definirlo en la pestaña de seguridad en la ficha de usuario en el menú\n"
-#~ "              Administración / Usuarios / Usuarios\n"
-#~ "      por ejemplo, quizá quiere hacerlo para el usuario 'admin'.\n"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Categoría de empleado"
-
-#~ msgid "March"
-#~ msgstr "Marzo"
-
-#~ msgid "Category's Name"
-#~ msgstr "Nombre de la categoría"
-
-#~ msgid "Validation User"
-#~ msgstr "Validación usuario"
-
-#~ msgid "Company Allocation"
-#~ msgstr "Asignación de compañía"
-
-#~ msgid "Taken Leaves"
-#~ msgstr "Ausencias cogidas"
-
-#~ msgid " Month "
-#~ msgstr " Mes "
-
-#~ msgid "Allocated Leaves"
-#~ msgstr "Ausencias asignadas"
-
-#~ msgid "Leaves By Month"
-#~ msgstr "Ausencias por mes"
-
-#~ msgid "July"
-#~ msgstr "Julio"
-
-#~ msgid "Remaining Leave by Type and User"
-#~ msgstr "Ausencias disponibles por tipo y usuario"
-
-#~ msgid ""
-#~ "If you link this type of leave with a category in the CRM, it will "
-#~ "synchronize each leave asked with a case in this category, to display it in "
-#~ "the company shared calendar for example."
-#~ msgstr ""
-#~ "Si enlaza este tipo de ausencia con una categoría del CRM, sincronizará cada "
-#~ "petición de ausencia con un caso en esta categoría para mostrarlo en un "
-#~ "calendario compartido por ejemplo."
-
-#~ msgid "September"
-#~ msgstr "Septiembre"
-
-#~ msgid "December"
-#~ msgstr "Diciembre"
-
-#~ msgid "Remaining Leaves by User"
-#~ msgstr "Ausencias disponibles por usuario"
-
-#~ msgid "Month"
-#~ msgstr "Mes"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for employee %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "No puede validar ausencias para el empleado %s mientras no haya suficientes "
-#~ "días disponibles."
-
-#~ msgid " Year "
-#~ msgstr " Año "
-
-#~ msgid "August"
-#~ msgstr "Agosto"
-
-#~ msgid "Available Holidays"
-#~ msgstr "Vacaciones disponibles"
-
-#~ msgid "January"
-#~ msgstr "Enero"
-
-#~ msgid "Employee Request"
-#~ msgstr "Petición de empleado"
-
-#~ msgid "October"
-#~ msgstr "Octubre"
-
-#~ msgid "November"
-#~ msgstr "Noviembre"
-
-#~ msgid "June"
-#~ msgstr "Junio"
-
-#~ msgid "Day"
-#~ msgstr "Día"
-
-#~ msgid "May"
-#~ msgstr "Mayo"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nombre del empleado"
-
-#~ msgid "April"
-#~ msgstr "Abril"
-
-#~ msgid "Leaves by Month"
-#~ msgstr "Ausencias por mes"
-
-#~ msgid "February"
-#~ msgstr "Febrero"
-
-#, python-format
-#~ msgid "Wrong leave definition."
-#~ msgstr "Definición de ausencia errónea"
-
-#, python-format
-#~ msgid ""
-#~ "You Cannot Validate leaves while available leaves are less than asked leaves."
-#~ msgstr ""
-#~ "No puede validar ausencias mientras haya menos ausencias disponibles que "
-#~ "peticiones."
-
-#~ msgid "Year"
-#~ msgstr "Año"
-
-#~ msgid ""
-#~ "This field is only for informative purposes, to depict if the leave "
-#~ "request/allocation comes from an employee or from the company"
-#~ msgstr ""
-#~ "Este campo es sólo para fines informativos, para indicar si la petición "
-#~ "/asignación de ausencia viene de un empleado o de la compañía"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for category %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "No puede validar ausencias de la categoría %s mientras el número de días "
-#~ "disponibles sea insuficiente."
-
-#, python-format
-#~ msgid "No user related to the selected employee."
-#~ msgstr "El empleado seleccionado no tiene un usuario asociado"
-
-#~ msgid ""
-#~ "Leaves requests can be recorded by employees and validated by their "
-#~ "managers. Once a leave request is validated it appears automatically in the "
-#~ "agenda of the employee. You can define several allowance types (paid "
-#~ "holidays, sickness, etc) and manage allowances per type."
-#~ msgstr ""
-#~ "Las peticiones de ausencia pueden ser introducidas por los empleados y "
-#~ "validadas por sus responsables. Una vez que una petición es validada aparece "
-#~ "automáticamente en la agenda del empleado. Puede definir varios tipos de "
-#~ "permisos (vacaciones pagadas, enfermedad, etc) y gestionar los permisos por "
-#~ "tipo."
-
-#~ msgid ""
-#~ "Start date should not be larger than end date!\n"
-#~ "Number of Days should be greater than 1!"
-#~ msgstr ""
-#~ "¡La fecha de inicio no debe ser mayor que la de fin!\n"
-#~ "¡El número de días debe ser mayor que 1!"
-
-#~ msgid "available.holidays.report"
-#~ msgstr "disponibilidad.vacaciones.informe"
-
-#~ msgid "Meeting Category"
-#~ msgstr "Categoría de reunión"
-
-#~ msgid "    Month-1    "
-#~ msgstr "    Mes-1    "
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index b140a6f89b9..8baeb3504e2 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,283 +767,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Resumen de días de ausencia"
-
-#~ msgid "of the"
-#~ msgstr "del"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Todas las solicitudes de vacaciones"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "¡Aviso!"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Solicitudes esperando validación"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Nueva solicitud de vacaciones"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Vacaciones del empleado"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Both"
-#~ msgstr "Ambas"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Declaración del empleado"
-
-#~ msgid "Refused Request"
-#~ msgstr "Solicitud rechazada"
-
-#~ msgid "to"
-#~ msgstr "hasta"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Mis solicitudes de vacaciones"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Estado de las vacaciones"
-
-#~ msgid "Ok"
-#~ msgstr "Aceptar"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analizar desde"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Request is refused."
-#~ msgstr "La solicitud es rechazada."
-
-#~ msgid "Holidays Management"
-#~ msgstr "Gestión de vacaciones"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Resumen de las vacaciones"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Las vacaciones son fijadas en el calendario"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Vacaciones permitidas"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Fecha de Fin de las Vacaciones"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Estado de las Vacaciones"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Documento de declaración oficial para declarar nuevo empleado"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definir el estado de las vacaciones"
-
-#~ msgid "Holiday status"
-#~ msgstr "Estado de las vacaciones"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Vacaciones por usuario"
-
-#~ msgid "Employee_id"
-#~ msgstr "ID del empleado"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Mis solicitudes de vacaciones esperando confirmación"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Número de vacaciones solicitadas"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Codificación de vacaciones disponibles por año."
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Mis solicitudes de vacaciones"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Empleado obtiene las vacaciones"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Número de días en esta solicitud de vacaciones"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para la definición de la vista!"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Estado de las vacaciones"
-
-#~ msgid "Report Options"
-#~ msgstr "Opciones del Reporte"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Debe seleccionar por lo menos un empleado. Pruebe otra vez."
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Mis solicitudes de vacaciones validadas"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Su gerente aprueba la petición"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr ""
-#~ "Si hay vacaciones disponibles, el empleado puede tomarla y rellenarla."
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Vacaciones por empleado"
-
-#~ msgid "Notification"
-#~ msgstr "Notificación"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Imprimir el resumen de vacaciones del empleado"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Dia de comienzo de las vacaciones"
-
-#~ msgid "Holidays user"
-#~ msgstr "Usuario de vacaciones"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "El empleado rellena una solicitud de vacaciones"
-
-#~ msgid "Calendar"
-#~ msgstr "Calendario"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Permite superar el límite"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Mis solicitudes de vacaciones borrador"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mis vacaciones disponibles"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Las vacaciones son establecidas en el calendario."
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Máximo de licencias permitidas"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Mis solicitudes de vacaciones rechazadas"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Establecer vacaciones"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Mis solicitudes de vacaciones"
-
-#~ msgid "Color of the status"
-#~ msgstr "Color del estado"
-
-#~ msgid "draft"
-#~ msgstr "borrador"
-
-#~ msgid "holidays."
-#~ msgstr "vacaciones."
-
-#~ msgid "Date"
-#~ msgstr "Fecha"
-
-#~ msgid "Document for employee"
-#~ msgstr "Documento para el empleado"
-
-#~ msgid "Reufse"
-#~ msgstr "Rechazar"
-
-#~ msgid "Section"
-#~ msgstr "Sección"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Mis solicitudes de vacaciones esperando confirmación"
-
-#~ msgid "History"
-#~ msgstr "Historial"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Responsable de vacaciones"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Petición de vacaciones"
-
-#~ msgid "Approved Request"
-#~ msgstr "Solicitud aprobada"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Peticiones esperando validación"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Mis solicitudes de vacaciones borrador"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "No puede cancelar esta solicitud de vacaciones. Debe convertir su caso en "
-#~ "estado borrador."
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Imprimir resumen de vacaciones"
-
-#~ msgid "General Information"
-#~ msgstr "Información General"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Registro de vacaciones"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Mis solicitudes de vacaciones rechazadas"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Solicitud de definición de vacaciones"
-
-#~ 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 "Case"
-#~ msgstr "Caso"
-
-#~ msgid "Request is approved."
-#~ msgstr "La solicitud está aprobada."
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Definición de vacaciones"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Codifica número de vacaciones disponibles"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Secretaría social"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "ID de solicitud de vacaciones"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Proceso de vacaciones"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Su gerente rechaza la petición"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Debe seleccionar por lo menos 1 departamento. Inténtelo de nuevo."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Mis solicitudes de vacaciones validadas"
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index 15be2967806..7ecc65afe61 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,341 +767,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Resumen días de ausencia"
-
-#~ msgid "of the"
-#~ msgstr "del"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "¡Atención!"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Todas las peticiones de vacaciones"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Peticiones esperando validación"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Nueva petición de vacaciones"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Both"
-#~ msgstr "Ambas"
-
-#~ msgid "Refused Request"
-#~ msgstr "Petición rechazada"
-
-#~ msgid "to"
-#~ msgstr "hasta"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Vacaciones de empleado"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Declaración de empleado"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Mis peticiones de vacaciones"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Estado de vacaciones"
-
-#~ msgid "Request is refused."
-#~ msgstr "Petición es rechazada."
-
-#~ msgid "Holidays Management"
-#~ msgstr "Gestión de vacaciones"
-
-#~ msgid "Analyze from"
-#~ msgstr "Análisis desde"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Resumen de las vacaciones"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Las vacaciones son fijadas en el calendario"
-
-#~ msgid "Holiday status"
-#~ msgstr "Estado Vacaciones"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Estado de vacaciones"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Fecha fin vacaciones"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Vacaciones permitidas"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Documento de declaración oficial para declarar nuevo empleado"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Vacaciones por usuario"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definir Estado Vacaciones"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Mis peticiones de vacaciones esperando confirmación"
-
-#~ msgid "Employee_id"
-#~ msgstr "Empleado"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Codificación de vacaciones disponibles anuales."
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Esperando validación"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Empleado obtiene vacaciones"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Número de vacaciones solicitadas"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Mis peticiones"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Estado vacaciones"
-
-#~ msgid "Report Options"
-#~ msgstr "Opciones del informe"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Su responsable aprueba la petición"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr ""
-#~ "Si hay vacaciones disponibles, el empleado puede cogerla y rellenarla."
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Selecciona por lo menos un empleado. Prueba otra vez."
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Mis peticiones de vacaciones validadas"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Número de días solicitados en esta petición"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Vacaciones por empleado"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Permite superar el límite"
-
-#~ msgid "Holidays user"
-#~ msgstr "Usuario de vacaciones"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Imprimir resumen de vacaciones"
-
-#~ msgid "Calendar"
-#~ msgstr "Calendario"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Fecha inicio de vacaciones"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Recursos Humanos: Registro y seguimiento de Vacaciones\n"
-#~ "    Este módulo permite administrar las vacaciones y peticiones de "
-#~ "vacaciones. Para cada empleado se puede definir un numero de vacaciones "
-#~ "disponibles.\n"
-#~ "    Además:\n"
-#~ "    - Es posible sincronizar con la agenda (usando el módulo de CRM): Para "
-#~ "poder automatizar la creación de casos cuando una petición es aceptada, "
-#~ "tiene que relacionar un estado de vacaciones con una sección de casos. Puede "
-#~ "configurar esta información y también el color preferido en RRHH / "
-#~ "Configuración / Estado de vacaciones.\n"
-#~ "    - Un empleado puede crear peticiones negativas (pedir -2 días por "
-#~ "ejemplo). Esto el sistema lo considera como una petición de más días de "
-#~ "ausencia. Incrementará su total de vacaciones disponibles de este tipo (si "
-#~ "la petición es aceptada).\n"
-#~ "    - Hay 2 maneras de imprimir las vacaciones:\n"
-#~ "        * La primera permite seleccionar empleados por departamento y está "
-#~ "disponible desde el menú\n"
-#~ "              RRHH / Petición de vacaciones / Imprimir resumen de "
-#~ "vacaciones\n"
-#~ "        * La segunda permite seleccionar el informe de vacaciones para "
-#~ "ciertos empleados. Desde la lista\n"
-#~ "              RRHH / Empleados / Empleados\n"
-#~ "          seleccione los empleados que desee, haga clic en el icono de "
-#~ "imprimir y seleccione la opción\n"
-#~ "              'Imprimir resumen de vacaciones de los empleados'\n"
-#~ "    - El asistente permite elegir si quiere imprimir las vacaciones "
-#~ "confirmadas y validadas o sólo las validadas. Estos estados deben "
-#~ "configurarse por un usuario del grupo 'HR' con el rol de 'holidays'. Puede "
-#~ "definirlo en la pestaña de seguridad en la ficha de usuario en el menú\n"
-#~ "              Administración / Usuarios / Usuarios\n"
-#~ "      por ejemplo, quizá quiere hacerlo para el usuario 'admin'.\n"
-
-#~ msgid "Notification"
-#~ msgstr "Notificación"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Empleado rellena una petición de vacaciones"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Las vacaciones son fijadas en el calendario."
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mis vacaciones disponibles"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Mis peticiones rechazadas"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Fijar vacaciones"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Mis peticiones en borrador"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Máximo de vacaciones permitidas"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Mis peticiones de vacaciones"
-
-#~ msgid "Color of the status"
-#~ msgstr "Color del estado"
-
-#~ msgid "holidays."
-#~ msgstr "Vacaciones."
-
-#~ msgid "draft"
-#~ msgstr "Borrador"
-
-#~ msgid "Document for employee"
-#~ msgstr "Documento para empleado"
-
-#~ msgid "Date"
-#~ msgstr "Fecha"
-
-#~ msgid "Reufse"
-#~ msgstr "Rechazar"
-
-#~ msgid "Section"
-#~ msgstr "Sección"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Responsable de vacaciones"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Mis peticiones en borrador"
-
-#~ msgid "Approved Request"
-#~ msgstr "Petición aprobada"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Petición de vacaciones"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Peticiones esperando validación"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Petición define vacaciones"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Mis peticiones rechazadas"
-
-#~ 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 "Print Summary of Holidays"
-#~ msgstr "Imprimir resumen de vacaciones"
-
-#~ msgid "Request is approved."
-#~ msgstr "Petición aprobada."
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Definición vacaciones"
-
-#~ msgid "Case"
-#~ msgstr "Caso"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Vacaciones por usuario"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Codifica número de vacaciones disponibles"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Secretaría social"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Proceso de vacaciones"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Debe seleccionar por lo menos 1 departamento. Inténtelo de nuevo."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Mis peticiones validadas"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "ID solicitud de vacaciones"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Su responsable rechaza la petición"
diff --git a/addons/hr_holidays/i18n/es_MX.po b/addons/hr_holidays/i18n/es_MX.po
new file mode 100644
index 00000000000..4dcd87a1fed
--- /dev/null
+++ b/addons/hr_holidays/i18n/es_MX.po
@@ -0,0 +1,844 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_holidays
+#
+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-12 19:07+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
+"Language-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:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Azul"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "Tipo de asignación"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "A la espera de segunda aprobación"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "Máximas ausencias permitidas - Ausencias ya cogidas"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Gestión de ausencias"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leave"
+msgstr "Ausencia por enfermedad"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Rechazado"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr "Categoría del empleado"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "Marrón"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "Días restantes"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "Por empleado"
+
+#. 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 ""
+"El responsable de ausencias puede dejar este campo vacío si esta "
+"petición/asignación de ausencia es para todos los empleados."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: hr_holidays
+#: 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 "Holidays"
+msgstr "Festivos"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr "Cian claro"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "Verde claro"
+
+#. 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 ""
+"Las solicitudes de ausencias pueden ser creadas por los empleados y "
+"validadas por sus responsables. Una vez validada la solicitud de ausencia, "
+"aparecerá automáticamente en la agenda del empleado. Puede definir varios "
+"tipos de permisos (vacaciones pagadas, enfermedad, etc.) y gestionar los "
+"permisos por tipo."
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "Resumen de ausencias"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "Rechazar"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:309
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+"No puede validar las ausencias para el empleado %s: le quedan muy pocos días "
+"(%s)"
+
+#. module: hr_holidays
+#: view:board.board:0
+#: view:hr.holidays:0
+msgid "Leaves"
+msgstr "Ausencias"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr "Ausencia"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "Ausencias por departamento"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. 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 ""
+"Seleccione 'petición de ausencia' si alguien quiere cogerse un día libre. \n"
+"Seleccione 'petición de asignación' si quiere incrementar el número de "
+"ausencias disponibles para alguien."
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr "Color en informe"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr "Informe de RRHH de resumen de ausencias por empleado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
+#: 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 "Tipo de ausencia"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:186
+#: code:addons/hr_holidays/hr_holidays.py:309
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr "Magenta"
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"When the holiday request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Approval'.            If the admin accepts it, the state is "
+"'Approved'. If it is refused, the state is 'Refused'."
+msgstr ""
+"El estado de una petición de ausencia en el momento de crearse es "
+"'Borrador'.\n"
+" Cuando el usuario la confirma, se envía al responsable y su estado cambia a "
+"'Esperando aprobación'. Si el responsable la autoriza, el estado cambia a "
+"'Aprobada', pero si la rechaza su estado cambia a 'Rechazada'."
+
+#. 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 "Debe seleccionar al menos 1 departamento. E inténtelo de nuevo"
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr "desde"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr "¡La fecha de inicio debe ser anterior a la fecha de fin!"
+
+#. module: hr_holidays
+#: model:ir.module.module,description:hr_holidays.module_meta_information
+msgid ""
+"Human Resources: Holidays tracking and workflow\n"
+"\n"
+"    This module allows you to manage leaves and leaves' requests.\n"
+"    Implements a dashboard for human resource management that includes.\n"
+"        * My Leaves\n"
+"        * My Expenses\n"
+"    Note that:\n"
+"    - 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 "
+"set up this info and your colour preferences in\n"
+"                HR / Configuration / Holidays Status\n"
+"    - 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).\n"
+"    - There are two ways to print the employee's holidays:\n"
+"        * The first will allow to choose employees by department and is used "
+"by clicking the menu item located in\n"
+"                HR / Holidays Request / Print Summary of Holidays\n"
+"        * The second will allow you to choose the holidays report for "
+"specific employees. Go on the list\n"
+"                HR / Employees / Employees\n"
+"            then select the ones you want to choose, click on the print icon "
+"and select the option\n"
+"                'Print Summary of Employee's Holidays'\n"
+"    - The wizard allows you to choose if you want to print either the "
+"Confirmed & Validated holidays or only the Validated ones. 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\n"
+"                Administration / Users / Users\n"
+"            for example, you maybe will do it for the user 'admin'\n"
+"            .\n"
+msgstr ""
+"Recursos humanos: Gestión de ausencias y flujo de trabajo\n"
+"\n"
+"    Este módulo le permite gestionar las ausencias y las peticiones de "
+"ausencias de los empleados.\n"
+"    Implementa un panel para gestión de recursos humanos que incluye:\n"
+"        * Mis ausencias\n"
+"        * Mis gastos\n"
+"    Tenga en cuenta que:\n"
+"\n"
+"    - Es posible la sincronización con la agenda interna (del módulo CRM): "
+"Con el fin de crear automáticamente un caso cuando se acepta una solicitud "
+"de ausencia, debe vincular el estado de ausencia a una sección de caso. "
+"Puede configurar esta información y sus preferencias de color en:\n"
+"                Recursos Humanos / Configuración / Ausencias / Tipos de "
+"ausencia\n"
+"    - Un empleado puede solicitar más días libres mediante una nueva "
+"asignación. Esto incrementará el total de días disponible de ese tipo de "
+"ausencia (si se acepta la petición).\n"
+"    - Hay dos formas de imprimir las ausencias de los empleados:\n"
+"        * La primera le permitirá escoger empleados por departamento y se "
+"usa haciendo clic en la opción de menú:\n"
+"                Recursos Humanos / Informe / Ausencias / Ausencias por "
+"departamento\n"
+"        * La segunda le permitirá elegir el informe de ausencias para "
+"empleados específicos a través de:\n"
+"                Recursos Humanos / Informe / Ausencias / Análisis de "
+"ausencia\n"
+"           Seleccione aquellos empleados de los que quiera el informe y "
+"pulse sobre el icono imprimir.\n"
+"    - El asistente le permite escoger si quiere imprimir las ausencias "
+"confirmadas, las validadas o ambas.\n"
+"Estos estados deben ser configurados por un usuario del grupo 'Recursos "
+"Humanos'. Puede definir estas opciones en la pestaña seguridad de los datos "
+"del usuario:\n"
+"                Administración / Usuarios / Usuarios\n"
+"           Por ejemplo, puede hacerlo para el usuario 'Administrador'.\n"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "Vacaciones disponibles"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr "Total ausencias por tipo"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "Rojo"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr "Ausencias por tipo"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmón claro"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr "Amarillo"
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+"¡Error! La fecha inicial de ausencia debe ser anterior a la fecha final de "
+"ausencia."
+
+#. 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 "Número de días"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr "Buscar tipo de ausencia"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr "Debe seleccionar un empleado o una categoría"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
+msgstr ""
+"Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
+"segundo validador"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr "Esperando aprobación"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr "Empleado(s)"
+
+#. 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 ""
+"Si define un tipo de reunión, OpenERP creará una reunión en el calendario "
+"una vez la ausencia sea validada."
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr "Peticiones asociadas"
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr "Padre"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr "Lavanda"
+
+#. module: hr_holidays
+#: 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 "Peticiones de ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr "Permite sobrepasar límite"
+
+#. 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 "Ausencias del empleado"
+
+#. module: hr_holidays
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. 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 ""
+"Este valor es la suma de todas la peticiones de ausencias con un valor "
+"positivo."
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr "Todas las ausencias del empleado"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr "Coral claro"
+
+#. 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 "Ausencias por departamento"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr "Negro"
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr "Ausencias"
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr "Marfil"
+
+#. 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 "Validades y confirmadas"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr "Vacaciones ya realizadas"
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
+msgstr "Ausencias por validar"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr "¡El número de días debe ser superior a 0!"
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr "Primera aprobación"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Casual Leave"
+msgstr "Ausencia ocasional"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr "Resumen de ausencias"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr "Azul claro"
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr "Tipo de petición"
+
+#. 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 ""
+"Si el campo activo no está marcado, le permitirá esconder el tipo de "
+"ausencia sin eliminarla."
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr "Misc."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr "General"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr "Razones"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr "Análisis de ausencias"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. 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 ""
+"Este color se usará en el resumen de ausencias situado en Informes\\"
+"Ausencias por departamento"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr "Petición de asignación"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr "Detalle ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr "Aplicar doble validación"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr "Mis ausencias"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr "Por categoría de empleado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr "Petición de ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. 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 ""
+"Por empleado: Asignación/Petición para empleado individual. Por categoría de "
+"empleado: Asignación/Petición para un grupo de empleados en la categoría."
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:186
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr "¡No puede eliminar una ausencia que no esté en el estado borrador!"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr "Buscar ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr "Seleccionar tipo de vacaciones"
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr "Ausencias restantes"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr "Departmento(s)"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr "Segunda aprobación"
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you tick this checkbox, the system will allow, for this section, the "
+"employees to take more leaves than the available ones."
+msgstr ""
+"Si marca esta casilla, el sistema permitirá a los empleados, para esta "
+"sección, cogerse más ausencias de las disponibles."
+
+#. 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 ""
+"Este valor se calcula sumando todas las peticiones de ausencias con un valor "
+"negativo."
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr "Violeta"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Máximo permitido"
+
+#. 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 ""
+"Este espacio es rellenado automáticamente por el usuario que valida la "
+"ausencia en segundo nivel (si el tipo de ausencia necesita segunda "
+"validación)"
+
+#. module: hr_holidays
+#: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
+msgid "Human Resources: Holidays management"
+msgstr "Gestión de vacaciones"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr "Informe de RRHH de resumen de ausencias por departamento"
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automaticly filled by the user who validate the leave"
+msgstr ""
+"Este espacio es rellenado automáticamente por el usuario que valida la "
+"ausencia"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: hr_holidays
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr "Peticiones de asignación"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr "Amarillo claro"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr "Rosa claro"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr "Para confirmar"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr "Para aprobar"
diff --git a/addons/hr_holidays/i18n/es_VE.po b/addons/hr_holidays/i18n/es_VE.po
new file mode 100644
index 00000000000..4dcd87a1fed
--- /dev/null
+++ b/addons/hr_holidays/i18n/es_VE.po
@@ -0,0 +1,844 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_holidays
+#
+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-12 19:07+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
+"Language-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:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Azul"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "Tipo de asignación"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "A la espera de segunda aprobación"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "Máximas ausencias permitidas - Ausencias ya cogidas"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Gestión de ausencias"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leave"
+msgstr "Ausencia por enfermedad"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Rechazado"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr "Categoría del empleado"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "Marrón"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "Días restantes"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "Por empleado"
+
+#. 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 ""
+"El responsable de ausencias puede dejar este campo vacío si esta "
+"petición/asignación de ausencia es para todos los empleados."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: hr_holidays
+#: 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 "Holidays"
+msgstr "Festivos"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr "Cian claro"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "Verde claro"
+
+#. 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 ""
+"Las solicitudes de ausencias pueden ser creadas por los empleados y "
+"validadas por sus responsables. Una vez validada la solicitud de ausencia, "
+"aparecerá automáticamente en la agenda del empleado. Puede definir varios "
+"tipos de permisos (vacaciones pagadas, enfermedad, etc.) y gestionar los "
+"permisos por tipo."
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "Resumen de ausencias"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "Rechazar"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:309
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+"No puede validar las ausencias para el empleado %s: le quedan muy pocos días "
+"(%s)"
+
+#. module: hr_holidays
+#: view:board.board:0
+#: view:hr.holidays:0
+msgid "Leaves"
+msgstr "Ausencias"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr "Ausencia"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "Ausencias por departamento"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. 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 ""
+"Seleccione 'petición de ausencia' si alguien quiere cogerse un día libre. \n"
+"Seleccione 'petición de asignación' si quiere incrementar el número de "
+"ausencias disponibles para alguien."
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr "Color en informe"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr "Informe de RRHH de resumen de ausencias por empleado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
+#: 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 "Tipo de ausencia"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:186
+#: code:addons/hr_holidays/hr_holidays.py:309
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr "Magenta"
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"When the holiday request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Approval'.            If the admin accepts it, the state is "
+"'Approved'. If it is refused, the state is 'Refused'."
+msgstr ""
+"El estado de una petición de ausencia en el momento de crearse es "
+"'Borrador'.\n"
+" Cuando el usuario la confirma, se envía al responsable y su estado cambia a "
+"'Esperando aprobación'. Si el responsable la autoriza, el estado cambia a "
+"'Aprobada', pero si la rechaza su estado cambia a 'Rechazada'."
+
+#. 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 "Debe seleccionar al menos 1 departamento. E inténtelo de nuevo"
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr "desde"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr "¡La fecha de inicio debe ser anterior a la fecha de fin!"
+
+#. module: hr_holidays
+#: model:ir.module.module,description:hr_holidays.module_meta_information
+msgid ""
+"Human Resources: Holidays tracking and workflow\n"
+"\n"
+"    This module allows you to manage leaves and leaves' requests.\n"
+"    Implements a dashboard for human resource management that includes.\n"
+"        * My Leaves\n"
+"        * My Expenses\n"
+"    Note that:\n"
+"    - 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 "
+"set up this info and your colour preferences in\n"
+"                HR / Configuration / Holidays Status\n"
+"    - 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).\n"
+"    - There are two ways to print the employee's holidays:\n"
+"        * The first will allow to choose employees by department and is used "
+"by clicking the menu item located in\n"
+"                HR / Holidays Request / Print Summary of Holidays\n"
+"        * The second will allow you to choose the holidays report for "
+"specific employees. Go on the list\n"
+"                HR / Employees / Employees\n"
+"            then select the ones you want to choose, click on the print icon "
+"and select the option\n"
+"                'Print Summary of Employee's Holidays'\n"
+"    - The wizard allows you to choose if you want to print either the "
+"Confirmed & Validated holidays or only the Validated ones. 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\n"
+"                Administration / Users / Users\n"
+"            for example, you maybe will do it for the user 'admin'\n"
+"            .\n"
+msgstr ""
+"Recursos humanos: Gestión de ausencias y flujo de trabajo\n"
+"\n"
+"    Este módulo le permite gestionar las ausencias y las peticiones de "
+"ausencias de los empleados.\n"
+"    Implementa un panel para gestión de recursos humanos que incluye:\n"
+"        * Mis ausencias\n"
+"        * Mis gastos\n"
+"    Tenga en cuenta que:\n"
+"\n"
+"    - Es posible la sincronización con la agenda interna (del módulo CRM): "
+"Con el fin de crear automáticamente un caso cuando se acepta una solicitud "
+"de ausencia, debe vincular el estado de ausencia a una sección de caso. "
+"Puede configurar esta información y sus preferencias de color en:\n"
+"                Recursos Humanos / Configuración / Ausencias / Tipos de "
+"ausencia\n"
+"    - Un empleado puede solicitar más días libres mediante una nueva "
+"asignación. Esto incrementará el total de días disponible de ese tipo de "
+"ausencia (si se acepta la petición).\n"
+"    - Hay dos formas de imprimir las ausencias de los empleados:\n"
+"        * La primera le permitirá escoger empleados por departamento y se "
+"usa haciendo clic en la opción de menú:\n"
+"                Recursos Humanos / Informe / Ausencias / Ausencias por "
+"departamento\n"
+"        * La segunda le permitirá elegir el informe de ausencias para "
+"empleados específicos a través de:\n"
+"                Recursos Humanos / Informe / Ausencias / Análisis de "
+"ausencia\n"
+"           Seleccione aquellos empleados de los que quiera el informe y "
+"pulse sobre el icono imprimir.\n"
+"    - El asistente le permite escoger si quiere imprimir las ausencias "
+"confirmadas, las validadas o ambas.\n"
+"Estos estados deben ser configurados por un usuario del grupo 'Recursos "
+"Humanos'. Puede definir estas opciones en la pestaña seguridad de los datos "
+"del usuario:\n"
+"                Administración / Usuarios / Usuarios\n"
+"           Por ejemplo, puede hacerlo para el usuario 'Administrador'.\n"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "Vacaciones disponibles"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr "Total ausencias por tipo"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "Rojo"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr "Ausencias por tipo"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "Salmón claro"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr "Amarillo"
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+"¡Error! La fecha inicial de ausencia debe ser anterior a la fecha final de "
+"ausencia."
+
+#. 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 "Número de días"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr "Buscar tipo de ausencia"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr "Debe seleccionar un empleado o una categoría"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
+msgstr ""
+"Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
+"segundo validador"
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr "Esperando aprobación"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr "Empleado(s)"
+
+#. 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 ""
+"Si define un tipo de reunión, OpenERP creará una reunión en el calendario "
+"una vez la ausencia sea validada."
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr "Peticiones asociadas"
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr "Padre"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr "Lavanda"
+
+#. module: hr_holidays
+#: 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 "Peticiones de ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr "Permite sobrepasar límite"
+
+#. 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 "Ausencias del empleado"
+
+#. module: hr_holidays
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. 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 ""
+"Este valor es la suma de todas la peticiones de ausencias con un valor "
+"positivo."
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr "Todas las ausencias del empleado"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr "Coral claro"
+
+#. 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 "Ausencias por departamento"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr "Negro"
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr "Ausencias"
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr "Marfil"
+
+#. 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 "Validades y confirmadas"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr "Vacaciones ya realizadas"
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
+msgstr "Ausencias por validar"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr "¡El número de días debe ser superior a 0!"
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr "Primera aprobación"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Casual Leave"
+msgstr "Ausencia ocasional"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr "Resumen de ausencias"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr "Azul claro"
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr "Tipo de petición"
+
+#. 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 ""
+"Si el campo activo no está marcado, le permitirá esconder el tipo de "
+"ausencia sin eliminarla."
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr "Misc."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr "General"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr "Razones"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr "Análisis de ausencias"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. 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 ""
+"Este color se usará en el resumen de ausencias situado en Informes\\"
+"Ausencias por departamento"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr "Petición de asignación"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr "Detalle ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr "Aplicar doble validación"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr "Mis ausencias"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr "Por categoría de empleado"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr "Petición de ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. 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 ""
+"Por empleado: Asignación/Petición para empleado individual. Por categoría de "
+"empleado: Asignación/Petición para un grupo de empleados en la categoría."
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:186
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr "¡No puede eliminar una ausencia que no esté en el estado borrador!"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr "Buscar ausencia"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr "Seleccionar tipo de vacaciones"
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr "Ausencias restantes"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr "Departmento(s)"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr "Segunda aprobación"
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you tick this checkbox, the system will allow, for this section, the "
+"employees to take more leaves than the available ones."
+msgstr ""
+"Si marca esta casilla, el sistema permitirá a los empleados, para esta "
+"sección, cogerse más ausencias de las disponibles."
+
+#. 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 ""
+"Este valor se calcula sumando todas las peticiones de ausencias con un valor "
+"negativo."
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr "Violeta"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Máximo permitido"
+
+#. 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 ""
+"Este espacio es rellenado automáticamente por el usuario que valida la "
+"ausencia en segundo nivel (si el tipo de ausencia necesita segunda "
+"validación)"
+
+#. module: hr_holidays
+#: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
+msgid "Human Resources: Holidays management"
+msgstr "Gestión de vacaciones"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr "Informe de RRHH de resumen de ausencias por departamento"
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automaticly filled by the user who validate the leave"
+msgstr ""
+"Este espacio es rellenado automáticamente por el usuario que valida la "
+"ausencia"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: hr_holidays
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr "Peticiones de asignación"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr "Amarillo claro"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr "Rosa claro"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr "Para confirmar"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr "Para aprobar"
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index 50c9310d996..364ed99613a 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,275 +766,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Töötaja Puhkused"
-
-#~ msgid "Validate"
-#~ msgstr "Valideeri"
-
-#~ msgid "Both"
-#~ msgstr "Mõlemad"
-
-#~ msgid "Notes"
-#~ msgstr "Märkmed"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Puhkused Lubatud"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Puhkuste Staatus"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Defineeri puhkuse Staatus"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Puhkuse Staatus"
-
-#~ msgid "Employee_id"
-#~ msgstr "Töötaja_id"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Pead valima vähemalt 1 Töötaja. Proovi uuesti."
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "Kui puhkused on saadaval, saab töötaja neid võtta ja täita."
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Minu Saadaolevad Puhkused"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalender"
-
-#~ msgid "Color of the status"
-#~ msgstr "Staatuse värv"
-
-#~ msgid "Status"
-#~ msgstr "Staatus"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Sea Puhkus"
-
-#~ msgid "draft"
-#~ msgstr "mustand"
-
-#~ msgid "holidays."
-#~ msgstr "puhkused."
-
-#~ msgid "Document for employee"
-#~ msgstr "Dokument töötajale"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Refused Request"
-#~ msgstr "Tagasilükatud palved"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Kõik puhkusetaotlus"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Hoiatus!"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Valideerimist ootavad taotlused"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Uus puhkusetaotlus"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Puhkuste staatus"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Puhkuste kokkuvõte"
-
-#~ msgid "Request is refused."
-#~ msgstr "Taotlus on tagasi lükatud."
-
-#~ msgid "Holidays Management"
-#~ msgstr "Puhkuste haldus"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Puhkus on kalendrisse seatud"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Puhkus on kalendrisse seatud"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Puhkuse lõpp"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Minu puhkusetaotlused"
-
-#~ msgid "Holiday status"
-#~ msgstr "Puhkuse staatus"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Minu puhkusetaotlused"
-
-#~ msgid "Report Options"
-#~ msgstr "Aruande valikud"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Taodeldud puhkuste arv"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Minu kinnitamist ootavad puhkusetaotlused"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Päevade arv selles puhkusetaotluses"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Puhkusi töötaja kohta"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Prindi töötajate puhkuste kokkuvõte"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Tema juhataja kiidab taotluse heaks"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Minu valideeritud puhkusetaotlused"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Luba tühistada limiiti"
-
-#~ msgid "Notification"
-#~ msgstr "Teavitus"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Minu puhkusetaotluste mustandid"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Puhkuse algus"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Minu puhkusetaotlused"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Minu tagasi lükatud puhkusetaotlused"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Töötaja täidab puhkusetaotluse"
-
-#~ msgid "Section"
-#~ msgstr "Sektsioon"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Minu kinnitamist ootavad puhkusetaotlused"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Puhkuste haldur"
-
-#~ msgid "Date"
-#~ msgstr "Kuupäev"
-
-#~ msgid "Approved Request"
-#~ msgstr "Heaks kiidetud taotlus"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Minu puhkusetaotluste mustandid"
-
-#~ msgid "Reufse"
-#~ msgstr "Lükka tagasi"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Logi puhkused"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Prindi puhkuste kokkuvõte"
-
-#~ msgid "History"
-#~ msgstr "Ajalugu"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Minu tagasi lükatud puhkusetaotlused"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Puhkusetaotlus"
-
-#~ msgid "Case"
-#~ msgstr "Juhtum"
-
-#~ msgid "Request is approved."
-#~ msgstr "Taotlus on heaks kiidetud."
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Puhkuste definitsioon"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Sa pead valima vähemalt ühe osakonna. Proovi uuesti."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Minu valideeritud puhkusetaotlused"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "Puhkusetaotluse ID"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Tema juhataja lükkab taotluse tagasi"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analüüs alates"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Igaastase saadaoleva puhkuse arvutamine"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Maks. lubatud puhkusepäevi"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Arvuta saadaolevate puhkuste arv"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Töötaja deklaratsioon"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Sa ei saa tühistada seda puhkusetaotlust. Kõigepealt pead sa looma selle "
-#~ "juhtumi mustandina."
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Õigusdeklaratsiooni dokument uue töötaja deklareerimiseks"
-
-#~ msgid "to"
-#~ msgstr "kuni"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Töövabade päevade kokkuvõte"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Puhkused kasutaja kohta"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Sotsiaalsekretariaat"
-
-#~ msgid "of the"
-#~ msgstr "."
-
-#~ msgid "General Information"
-#~ msgstr "Üldine info"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Kinnitamist ootavad puhkusetaotlused"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Holidays Process"
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 256a559519e..70b9a340b89 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,321 +767,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Kaikki loma-anomukset"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Tarkistusta odottavat anomukset"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Uusi loma-anomus"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Työntekijän lomat"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Työntekijän ilmoitus"
-
-#~ msgid "Refused Request"
-#~ msgstr "Hylätty anomus"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Omat loma-anomukset"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Loma status"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analysoi"
-
-#~ msgid "Request is refused."
-#~ msgstr "Anomus on hylätty."
-
-#~ msgid "Holidays Management"
-#~ msgstr "Lomien hallinta"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Lomien yhteenveto"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Loma on merkitty kalenteriin"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Lomat sallittuja"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Loman päättymispäivä"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Lomien status"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Määritä lomastatus"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Oikeudellisen lausuman ilmoitus uudelle työntekijälle"
-
-#~ msgid "Holiday status"
-#~ msgstr "Loma status"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Lomat per käyttäjä"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Odottaa tarkistusta"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Loma-anomuksien määrä"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Käytettävissä olevien vuosilomien koodit"
-
-#~ msgid "Employee_id"
-#~ msgstr "Työntekijä_id"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Omat vahvistusta odottavat loma-anomukset"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Työntekijää saa lomaa"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Omat loma-anomukset"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Omat tarkistetut loma-anomukset"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Esimiehensä hyväksyy anomuksen"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Sinun täytyy valita vähintään yksi työntekijä. Yritä uudelleen."
-
-#~ msgid "Holiday Status"
-#~ msgstr "Loma status"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "Jos lomaa käytettävissä, työntekijä voi ottaa ja täyttää sen"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Päivien määrä tässä loma-anomuksessa"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Lomapäiviä per työntekijä"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Tulosta työntekijöiden lomien yhteenveto"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Loman aloituspäivä"
-
-#~ msgid "Holidays user"
-#~ msgstr "Loma käyttäjä"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hklstön.loma.loki"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Henkilöstö: Lomien seuranta ja työnkulku\n"
-#~ "    Tämä moduuli antaa sinun hallita lomia ja loma-anomuksia. Jokaiselle "
-#~ "työntekijälle voidaan määrittää lomapäivien määrä per loma.\n"
-#~ "\n"
-#~ "    Huomaa että:\n"
-#~ "    - Synkronointi sisäisen asialistan kanssa on mahdollista (Käytä CRM "
-#~ "moduulia): Jos haluat automaattisesti luoda tapahtuman kun loma-anomus on "
-#~ "hyväksytty, täytyy sinun linkittää loma status tapahtuma osioon. Voit ottaa "
-#~ "käyttöön tämän tiedon ja väriasetukset\n"
-#~ "                HR / Asetukset / Loma status\n"
-#~ "    - Työntekijä voi tehdä negatiivisen loma-anomuksen (esim, -2 päivää), "
-#~ "tämä käsitellään pyyntönä lisäpäiville olla pois töistä. Tämä kasvattaa "
-#~ "työntekijän käytettävissä olevan loman statusta (mikäli anomus "
-#~ "hyväksytään).\n"
-#~ "    - On kaksi tapaa tulostaa työntekijöiden lomat:\n"
-#~ "        * Ensimmäinen tapa on valita työntekijät osastoittain, tämä tapahtuu "
-#~ "klikkaamalla valikosta \n"
-#~ "                HR / Loma-anomukset / Tulosta lomien yhteenveto\n"
-#~ "        * Toinen tapa on valita lomaraportti tietyiltä työntekijöiltä. Mene "
-#~ "\n"
-#~ "                HR / Työntekijät / Työntekijät \n"
-#~ "            Valitse työntekijät, klikkaa tulosta -kuvaketta ja valitse \n"
-#~ "                'Tulosta työntekijöiden lomayhteenveto'\n"
-#~ "    - Ohjattu toiminto antaa sinun valita joko Vahvistetut ja Tarkistetut "
-#~ "lomat tai pelkästään Tarkistetut. Nämä tilat voi asettaa käyttäjä joka "
-#~ "kuuluu ryhmään \"HR\" ja jonka rooli on \"lomat\". Nämä ominaisuudet voi "
-#~ "määrittää turvallisuus välilehdeltä, joka on käyttäjätiedoissa ja joka "
-#~ "löytyy valikosta \n"
-#~ "                Administration / Users / Users\n"
-#~ "            Voit esimerkiksi laittaa oikeudet tähän käyttäjälle \"admin\".\n"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Salli rajan ylittäminen"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Omat loma-anomus luonnokset"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Omat käytettävissä olevat lomat"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Loma on merkitty kalenteriin."
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Sallittujen lomapäivien enimmäismäärä"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Omat hylätyt loma-anomukset"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Aseta loma"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Työntekijä täyttää loma-anomuksen"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Omat loma-anomukset"
-
-#~ msgid "Color of the status"
-#~ msgstr "Statuksen väri"
-
-#~ msgid "Document for employee"
-#~ msgstr "Asiakirja työntekijälle"
-
-#~ msgid "holidays."
-#~ msgstr "lomapäivät."
-
-#~ msgid "Holiday manager"
-#~ msgstr "Lomahallinta"
-
-#~ msgid "Approved Request"
-#~ msgstr "Hyväksytty anomus"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Tarkistusta odottavat loma-anomukset"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Loma-anomus"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Omat loma-anomusluonnokset"
-
-#~ msgid "Reufse"
-#~ msgstr "Hylkää"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Omat hylätyt loma-anomukset"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Tulosta lomien yhteenveto"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Loma per käyttäjä"
-
-#~ msgid "Request is approved."
-#~ msgstr "Anomus on hyväksytty."
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Loma Määritys"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Kerro lomapäivien määrä"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Sosiaalinen sihteeristö"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "Loma-anomus ID"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Lomaprosessi"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Esimies hylkää anomuksen"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Sinun täytyy valita vähintään yksi osasto. Yritä uudelleen."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Omat vahvistetut loma-anomukset"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Validate"
-#~ msgstr "Vahvista"
-
-#~ msgid "Notes"
-#~ msgstr "Huomautukset"
-
-#~ msgid "Both"
-#~ msgstr "Molemmat"
-
-#~ msgid "Notification"
-#~ msgstr "Huomautus"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#~ msgid "Status"
-#~ msgstr "Tila"
-
-#~ msgid "Report Options"
-#~ msgstr "Raporttiasetukset"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalenteri"
-
-#~ msgid "Section"
-#~ msgstr "Alue"
-
-#~ msgid "General Information"
-#~ msgstr "Yleiset Tiedot"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "draft"
-#~ msgstr "luonnos"
-
-#~ msgid "Case"
-#~ msgstr "Tapaus"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 9de72d9b2d4..ffbe3f20148 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -826,213 +826,3 @@ msgstr "À confirmer"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "À approuver"
-
-#~ 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 "Case"
-#~ msgstr "Cas"
-
-#~ msgid "Validate"
-#~ msgstr "Valider"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Mes Demandes de Vacances en attente de Confirmation"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Toutes les Demandes de Vacances"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Avertissement !"
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Vous ne pouvez pas annuler cette demande de congé. Vous devez au préalable "
-#~ "la mettre en état brouillon."
-
-#~ msgid "History"
-#~ msgstr "Historique"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Historique des congés"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Nombre maximum de congés permis"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "En attente de validation"
-
-#~ msgid "March"
-#~ msgstr "Mars"
-
-#~ msgid "Validation User"
-#~ msgstr "Valideur"
-
-#~ msgid "July"
-#~ msgstr "Juillet"
-
-#~ msgid " Month "
-#~ msgstr " Mois "
-
-#~ msgid "September"
-#~ msgstr "Septembre"
-
-#~ msgid "December"
-#~ msgstr "Décembre"
-
-#~ msgid "Month"
-#~ msgstr "Mois"
-
-#~ msgid " Year "
-#~ msgstr " Année "
-
-#~ msgid "August"
-#~ msgstr "Août"
-
-#~ msgid "June"
-#~ msgstr "Juin"
-
-#~ msgid "November"
-#~ msgstr "Novembre"
-
-#~ msgid "October"
-#~ msgstr "Octobre"
-
-#~ msgid "January"
-#~ msgstr "Janvier"
-
-#~ msgid "Day"
-#~ msgstr "Jour"
-
-#~ msgid "May"
-#~ msgstr "Mai"
-
-#~ msgid "February"
-#~ msgstr "Février"
-
-#~ msgid "April"
-#~ msgstr "Avril"
-
-#, python-format
-#~ msgid "Wrong leave definition."
-#~ msgstr "Mauvaise définition du congé"
-
-#~ msgid "Year"
-#~ msgstr "Année"
-
-#, python-format
-#~ msgid ""
-#~ "You Cannot Validate leaves while available leaves are less than asked leaves."
-#~ msgstr ""
-#~ "Vous ne pouvez pas valider cette demande de congés car le nombre de jours "
-#~ "disponibles n'est pas suffisant."
-
-#~ msgid "Taken Leaves"
-#~ msgstr "Congés pris"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Catégorie d'employé"
-
-#~ msgid "Category's Name"
-#~ msgstr "Nom de catégorie"
-
-#~ msgid "Allocated Leaves"
-#~ msgstr "Congés attribués"
-
-#~ msgid "Remaining Leave by Type and User"
-#~ msgstr "Congés restants par type et utilisateur"
-
-#~ msgid ""
-#~ "If you link this type of leave with a category in the CRM, it will "
-#~ "synchronize each leave asked with a case in this category, to display it in "
-#~ "the company shared calendar for example."
-#~ msgstr ""
-#~ "Si vous associez ce type de congé à une catégorie dans le CRM, chaque "
-#~ "demande de congé générera un cas dans cette catégorie et pourra, par "
-#~ "exemple, être affichée sur un calendrier partagé pour la société."
-
-#~ msgid "Remaining Leaves by User"
-#~ msgstr "Congés restants par employé"
-
-#, python-format
-#~ msgid "No user related to the selected employee."
-#~ msgstr "Aucun utilisateur associé à l'employé sélectionné."
-
-#~ msgid "Available Holidays"
-#~ msgstr "Vacances disponibles"
-
-#~ msgid "Employee Request"
-#~ msgstr "Demande d'un employé"
-
-#~ msgid ""
-#~ "Start date should not be larger than end date!\n"
-#~ "Number of Days should be greater than 1!"
-#~ msgstr ""
-#~ "La date de début ne doit pas être supérieure à la date de fin !\n"
-#~ "Le nombre de jour doit être supérieur à 1 !"
-
-#~ msgid "Meeting Category"
-#~ msgstr "Catégorie de rendez-vous"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nom de l'employé"
-
-#~ msgid "Leaves by Month"
-#~ msgstr "Congés par mois"
-
-#~ msgid "Company Allocation"
-#~ msgstr "Allocation de l'entreprise"
-
-#~ msgid "Leaves By Month"
-#~ msgstr "Absences par mois"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for employee %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "Vous ne pouvez pas valider des absences pour l'employé %s tant qu'il y a des "
-#~ "absences en attente."
-
-#~ msgid "available.holidays.report"
-#~ msgstr "available.holiday.report"
-
-#~ msgid ""
-#~ "This field is only for informative purposes, to depict if the leave "
-#~ "request/allocation comes from an employee or from the company"
-#~ msgstr ""
-#~ "Ce champ est seulement à titre informatif, pour illustrer si une "
-#~ "requête/attribution de congé vient d'un employé ou de la société."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for category %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "Vous ne pouvez pas valider de congés pour la catégorie %s tant qu'il y a "
-#~ "plusieurs jours de congés en attente."
-
-#~ msgid ""
-#~ "Leaves requests can be recorded by employees and validated by their "
-#~ "managers. Once a leave request is validated it appears automatically in the "
-#~ "agenda of the employee. You can define several allowance types (paid "
-#~ "holidays, sickness, etc) and manage allowances per type."
-#~ msgstr ""
-#~ "Les demandes de congé peuvent être enregistrées par les employés et validées "
-#~ "par leurs gestionnaires. Quand une demande de congés est validée, elle "
-#~ "apparaît automatiquement dans l'agenda de l'employé. Vous pouvez définir "
-#~ "plusieurs types d'allocation (vacances payées, maladie, etc.) et gérer les "
-#~ "allocations par type."
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index 0d80b8bba62..b95d7b66d21 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,173 +767,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Off-दिन 'सारांश"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "सभी छुट्टी अनुरोध"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
-
-#~ msgid "New Holidays Request"
-#~ msgstr "नया छुट्टी के लिए अनुरोध"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "कर्मचारी छुट्टियाँ"
-
-#~ msgid "Validate"
-#~ msgstr "मान्य"
-
-#~ msgid "Both"
-#~ msgstr "दोनों"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "कर्मचारी घोषणा"
-
-#~ msgid "Refused Request"
-#~ msgstr "अनुरोध मना कर दिया"
-
-#~ msgid "to"
-#~ msgstr "को"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "मेरी छुट्टियों का अनुरोध"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "छुट्टियों की स्थिति"
-
-#~ msgid "Ok"
-#~ msgstr "ओके"
-
-#~ msgid "Analyze from"
-#~ msgstr "विश्लेषण से"
-
-#~ msgid "Notes"
-#~ msgstr "टिप्पणी"
-
-#~ msgid "Request is refused."
-#~ msgstr "अनुरोध मना कर दिया है."
-
-#~ msgid "Holidays Management"
-#~ msgstr "छुट्टियों का प्रबंधन"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "छुट्टियों का सारांश"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "छुट्टी कैलेंडर में सेट है"
-
-#~ msgid "Vacation end day"
-#~ msgstr "छुट्टी का अंतिम दिन"
-
-#~ msgid "Employee_id"
-#~ msgstr "कर्मचारी आईडी"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "वार्षिक उपलब्ध छुट्टियों की एनकोडिंग"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "संरचना देखने के लिए अमान्य XML!"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "आप कम से कम 1 कर्मचारी चयन करे. दुबारा कोशिश करें."
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "मेरी छुट्टी का अनुरोध"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "छुट्टियों यदि उपलब्ध है, कर्मचारी इसे ले और भर सकते हैं."
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "इस छुट्टी के अनुरोध के दिनों की संख्या"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "प्रति कर्मचारी छुट्टियाँ"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "कर्मचारी छुट्टियों का प्रिंट सारांश"
-
-#~ msgid "Calendar"
-#~ msgstr "कैलेन्डर"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "सीमा पार करने के लिए अनुमति दें"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "मानव संसाधन : छुट्टियाँ ट्रैकिंग और कार्यप्रवाह\n"
-#~ "इस मॉड्यूल से तुम छुट्टियों और छुट्टियों के अनुरोधों को प्रबंधित करने की "
-#~ "अनुमति देता है.\n"
-
-#~ msgid "Notification"
-#~ msgstr "अधिसूचना"
-
-#~ msgid "Status"
-#~ msgstr "स्थिति"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "मेरी उपलब्ध छुट्टियाँ"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "अधिकतम छुट्टियां  की अनुमति"
-
-#~ msgid "draft"
-#~ msgstr "ड्राफ़्ट"
-
-#~ msgid "holidays."
-#~ msgstr "छुट्टियां"
-
-#~ msgid "Document for employee"
-#~ msgstr "कर्मचारी के लिए दस्तावेज़"
-
-#~ msgid "Section"
-#~ msgstr "विभाग"
-
-#~ msgid "Holiday manager"
-#~ msgstr "छुट्टी प्रबंधक"
-
-#~ msgid "Date"
-#~ msgstr "तारीख़"
-
-#~ msgid "Reufse"
-#~ msgstr "मना करना"
-
-#~ msgid "General Information"
-#~ msgstr "सामान्य जानकारी"
-
-#~ msgid "Case"
-#~ msgstr "केस"
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index 831f0b3f6be..afeeeabe3cb 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-10-30 11:47+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,75 +766,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Neodobreni zahtjevi"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Svi zahtjevi za GO"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Novi zahtjev za GO"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "GO Djelatnika"
-
-#~ msgid "Validate"
-#~ msgstr "Potvrdi"
-
-#~ msgid "Refused Request"
-#~ msgstr "Odnijeni zahtjevi"
-
-#~ msgid "Both"
-#~ msgstr "Oboje"
-
-#~ msgid "to"
-#~ msgstr "do"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Moji zahtjevi za GO"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Status GO"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analiziraj od"
-
-#~ msgid "Notes"
-#~ msgstr "Bilješke"
-
-#~ msgid "Request is refused."
-#~ msgstr "Zahtjev je odbijen"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Upravljanje godišnjim odmorima"
-
-#~ msgid "Ok"
-#~ msgstr "U redu"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Rekapitulacija GO"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "GO postavljen u kalendar"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Dopušteni GO"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Zadnji dan dopusta"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Status GO"
-
-#~ msgid "Holiday status"
-#~ msgstr "Status GO"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definicija statusa GO"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index 4258676797c..421d7feb0bf 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 18:08+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 96d022e6dda..fe031bb9f0d 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -817,131 +817,3 @@ msgstr "Untuk Dikonfirmasi"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "Untuk Disetujui"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nama model tidak sah di definsi aksi"
-
-#~ msgid "Both"
-#~ msgstr "Keduanya"
-
-#~ msgid "Ok"
-#~ msgstr "Setuju"
-
-#~ msgid "Notes"
-#~ msgstr "Catatan"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
-
-#~ msgid "Report Options"
-#~ msgstr "Pilihan Laporan"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Hari Libur Per Karyawan"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalender"
-
-#~ msgid "Notification"
-#~ msgstr "Pemberitahuan"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Permintaan Hari Libur Saya"
-
-#~ msgid "Color of the status"
-#~ msgstr "Warna dari status"
-
-#~ msgid "holidays."
-#~ msgstr "hari libur."
-
-#~ msgid "Document for employee"
-#~ msgstr "Dokumen untuk karyawan"
-
-#~ msgid "Date"
-#~ msgstr "Tanggal"
-
-#~ msgid "General Information"
-#~ msgstr "Informasi Umum"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Hari libur per pengguna"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Semua Permintaan Hari Libur"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Permintaan Hari Libur Baru"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Hari Libur Karyawan"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Status Hari Libur"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Permintaan Hari Libur Saya"
-
-#~ msgid "Request is refused."
-#~ msgstr "Permintaan Ditolak."
-
-#~ msgid "Refused Request"
-#~ msgstr "Permintaan yang Ditolak"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Hari Libur Diizinkan"
-
-#~ msgid "Holiday status"
-#~ msgstr "Status Hari Libur"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Hari Libur Per Pengguna"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Status Hari Libur"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Jumlah Permintaan Hari Libur"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Permintaan Hari Libur Saya"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Karyawan mendapatkan hari libur"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Status Hari Libur"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Karyawan mengisi di dalam sebuah permintaan untuk hari libur"
-
-#~ msgid "Approved Request"
-#~ msgstr "Permintaan yang Disetujui"
-
-#~ msgid "Reufse"
-#~ msgstr "Tolak"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Cetak Rangkuman dari Hari Libur"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Permintaan Hari Libur Saya Ditolak"
-
-#~ msgid "Request is approved."
-#~ msgstr "Permintaan Disetujui."
-
-#~ msgid "Holidays Request"
-#~ msgstr "Permintaan Hari Libur"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Proses Hari Libur"
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index eda64991931..6b1e259fe5b 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -828,525 +828,3 @@ msgstr "Da confermare"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "Da Approvare"
-
-#~ msgid "Notification"
-#~ msgstr "Notifica"
-
-#~ msgid "Section"
-#~ msgstr "Sezione"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Richieste in attesa di validazione"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Le Mie Ferie Disponibili"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Le Mie Richieste di Ferie Rifiutate"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Le Mie Richieste di Ferie in attesa di approvazione"
-
-#~ msgid "Status"
-#~ msgstr "Stato"
-
-#~ msgid "to"
-#~ msgstr "a"
-
-#~ msgid "draft"
-#~ msgstr "Bozza"
-
-#~ msgid "holidays."
-#~ msgstr "ferie."
-
-#~ msgid "Case"
-#~ msgstr "Caso"
-
-#~ msgid "Employee_id"
-#~ msgstr "ID Impiegato"
-
-#~ msgid "Validate"
-#~ msgstr "Convalida"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Le Mie Richieste di Ferie"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Le Mie Richieste di Ferie in attesa di conferma"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analizza da"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Responsabile Ferie"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Numero Giorni in questa Richiesta di Ferie"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Ferie per Impiegato"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Devi selezionare almeno un dipendente. Prova di nuovo."
-
-#~ msgid "Holidays Request"
-#~ msgstr "Richiesta ferie"
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Le Mie Richieste di Ferie Convalidate"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Primo giorno di Ferie"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Ultimo giorno di Ferie"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Richieste di Ferie in attesa di convalida"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Le Mie Richieste di Ferie convalidate"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Le Mie Richieste di Ferie Rifiutate"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Ferie per Utente"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Dichiarazione del dipendente"
-
-#~ msgid "Refused Request"
-#~ msgstr "Richiesta rifiutata"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Gestione Ferie"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Le Ferie sono impostate nel calendario."
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Il suo manager approva la richiesta"
-
-#~ msgid "Document for employee"
-#~ msgstr "Documento per il dipendente"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Il dipendente prende ferie"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Il dipendente riempe una richiesta per le ferie"
-
-#~ msgid "Calendar"
-#~ msgstr "Calendario"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Permettere di superare il limite"
-
-#~ msgid "Approved Request"
-#~ msgstr "Richiesta approvata"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Definizione Ferie"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Segretariato sociale"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "E' necessario selezionare almeno 1 Reparto. Riprova"
-
-#~ msgid "Reufse"
-#~ msgstr "Rifiuta"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Il suo manager ha rifiutato la richiesta"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Tutte le richieste di ferie"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Nuova richiesta di ferie"
-
-#~ msgid "Both"
-#~ msgstr "Entrambe"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Attenzione !"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Quantità di ferie richieste"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Log ferie"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Non è possibile cancellare questa richiesta di ferie. Si deve impostare "
-#~ "questo caso in stato di bozza."
-
-#~ msgid "History"
-#~ msgstr "Cronologia"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Processo di ferie"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "of the"
-#~ msgstr "del/dei"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Ferie del dipentente"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Stato delle Ferie"
-
-#~ msgid "Notes"
-#~ msgstr "Annotazioni"
-
-#~ msgid "Request is refused."
-#~ msgstr "La richiesta è stata rifiutata"
-
-#~ msgid "Holiday status"
-#~ msgstr "Stato delle Ferie"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Riepilogo delle Ferie"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Stato delle Ferie"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Le ferie sono state impostate nel calendario"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Ferie Accordate"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definisci lo Stato delle Ferie"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Le mie richieste di ferie"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "In attesa di validazione"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Stato delle Ferie"
-
-#~ msgid "Holidays user"
-#~ msgstr "Ferie dell'utente"
-
-#~ msgid "Report Options"
-#~ msgstr "Report Opzioni"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Riepilogo giorni di assenza"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Stampa Riepilogativa Ferie per Dipendente"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Le mie bozze di richiesta ferie"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Risorse Umane: Tracciamento delle ferie e Workflo\n"
-#~ "\n"
-#~ "    Questo modulo ti permette di gestire le ferie e le richieste di ferie. "
-#~ "Per ogni impiegati, puoi inoltre definire un numero di ferie disponibili per "
-#~ "stato ferie.\n"
-#~ "\n"
-#~ "    Da notere che:\n"
-#~ "    - Una sincronizzazione col un diario interno (ad uso del modulo di CRM) "
-#~ "è possibille: nell'idea di creare automaticamente i Casi quando una "
-#~ "richiesta di Ferie è accettate, puoi collegare lo stato delle ferie alla "
-#~ "Sezione dei Casi. Puoi impostare questa informazione e una tua preferenza di "
-#~ "colore nella sezione \n"
-#~ "                    HR / Configrazione / Stato Ferie\n"
-#~ "    - Un impiegato può fare una richiesta di ferie in negativo (esempio: "
-#~ "richiesta di -2 giorni di ferie), questo è considerato dal sistema come una "
-#~ "richiesta di più giorni di assenza. Questo increamenta il suo totale di "
-#~ "stato di ferie disponibile (se la richiesta è accettata).\n"
-#~ "    - Ci sono due modi per stmapre le ferie per impiegato:\n"
-#~ "        * Il primo ti permette di scegliere l'impiegato per dipartimento ed "
-#~ "è utilizzato cliccando la voce di menu localizzata in:\n"
-#~ "                         HR / Richieste di ferie / Stampa un riepilogo delle "
-#~ "ferie\n"
-#~ "        * La seconda ti permette di scegliere il Report di Ferie per "
-#~ "specifici impiegati. Vai nella lista:\n"
-#~ "                         HR / Impiegati / Impiegati\n"
-#~ "               seleziona poi quello che vuoi scegliere, clicca sull'icona di "
-#~ "stampa e seleziona l'opzione \n"
-#~ "                         'Stampa Riepilogo per le ferie dell'Impigato\n"
-#~ "    - La procedura guidata permette di scegliere se vuoi stamare entrambe le "
-#~ "ferie: Confermate & Validate oppure le sole Validate. Questi stati devono "
-#~ "essere impostati da un utente dal menù:\n"
-#~ "                         Administration / Users / Users\n"
-#~ "                per esempio, tu puoi farlo per l'utente 'admin'.\n"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Definisci le Ferie"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Le Mie Richieste di Ferie"
-
-#~ msgid "Color of the status"
-#~ msgstr "Colore dello Stato"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Le mie bozze di richiesta Ferie"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Stampa Riepilogo delle Ferie"
-
-#~ msgid "General Information"
-#~ msgstr "Informazione Generale"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Definizione Richiesta di Ferie"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Ferie per Utente"
-
-#~ msgid "Request is approved."
-#~ msgstr "Richiesta approvata"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "ID Richiesta Ferie"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Documento a validità legale per dichiarare un nuovo impiegato"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr ""
-#~ "Se le ferie sono disponibili, il dipendente può selezionarle e attribuirsele"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Codificazione delle ferie annuali disponibili"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Codificazione del numero di Ferie disponibili"
-
-#~ msgid "March"
-#~ msgstr "Marzo"
-
-#~ msgid "Leave Days"
-#~ msgstr "Giorni Rimanenti"
-
-#~ msgid "Category's Name"
-#~ msgstr "Nome categoria"
-
-#~ msgid "available.holidays.report"
-#~ msgstr "available.holidays.report"
-
-#~ msgid "Validation User"
-#~ msgstr "Convalida utente"
-
-#~ msgid " Month "
-#~ msgstr " Mese "
-
-#~ msgid "July"
-#~ msgstr "Luglio"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Categoria di impiegato"
-
-#~ msgid "September"
-#~ msgstr "Settembre"
-
-#~ msgid "December"
-#~ msgstr "Dicembre"
-
-#~ msgid "Month"
-#~ msgstr "Mese"
-
-#~ msgid "August"
-#~ msgstr "Agosto"
-
-#, python-format
-#~ msgid "No user related to the selected employee."
-#~ msgstr "Nessun utente abbinato all'impiegato selezionato."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Available Holidays"
-#~ msgstr "Ferie disponibili"
-
-#~ msgid " Year "
-#~ msgstr " Anno "
-
-#~ msgid "January"
-#~ msgstr "Gennaio"
-
-#~ msgid "October"
-#~ msgstr "Ottobre"
-
-#~ msgid "November"
-#~ msgstr "Novembre"
-
-#~ msgid "June"
-#~ msgstr "Giugno"
-
-#~ msgid "Employee Request"
-#~ msgstr "Richiesta impiegato"
-
-#~ msgid "Extended options..."
-#~ msgstr "Opzioni estese..."
-
-#~ msgid ""
-#~ "Start date should not be larger than end date!\n"
-#~ "Number of Days should be greater than 1!"
-#~ msgstr ""
-#~ "La data d'inizio non deve essere maggiore della data di fine!\n"
-#~ "Il numero di giorni deve essere maggiore di 1!"
-
-#~ msgid "Day"
-#~ msgstr "Giorno"
-
-#~ msgid "May"
-#~ msgstr "Maggio"
-
-#~ msgid "Meeting Category"
-#~ msgstr "Categoria Riunione"
-
-#~ msgid "Remaining Leaves by User"
-#~ msgstr "Permessi rimenenti per utente"
-
-#~ msgid "My Leaves by Type"
-#~ msgstr "I miei permessi per tipo"
-
-#~ msgid "Leaves by Month"
-#~ msgstr "Permessi per mese"
-
-#~ msgid "Taken Leaves"
-#~ msgstr "Permessi usufruiti"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Permessi massimi maturati"
-
-#~ msgid "Remaining Leave by Type and User"
-#~ msgstr "Permessi rimanenti per tipo e utente"
-
-#~ msgid "Allocated Leaves"
-#~ msgstr "Permessi assegnati"
-
-#~ msgid " Leave Type"
-#~ msgstr " Tipo di Permesso"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nome dell'impiegato"
-
-#~ msgid "April"
-#~ msgstr "Aprile"
-
-#~ msgid "February"
-#~ msgstr "Febbraio"
-
-#, python-format
-#~ msgid "Wrong leave definition."
-#~ msgstr "Errata devinizione del permesso."
-
-#~ msgid "Year"
-#~ msgstr "Anno"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for category %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "Non è possibile convalidare i permessi per la categoria %s mentre ci sono "
-#~ "troppo pochi giorni di permesso rimanenti."
-
-#~ msgid "Leaves By Month"
-#~ msgstr "Permessi per mese"
-
-#~ msgid "    Month-1    "
-#~ msgstr "    Mese-1    "
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for employee %s while there are too few remaining "
-#~ "leave days."
-#~ msgstr ""
-#~ "Non è possibile convalidare permessi per l'impiegato %s mentra ci sono "
-#~ "troppo pochi giorni di permesso rimanenti."
-
-#, python-format
-#~ msgid ""
-#~ "You Cannot Validate leaves while available leaves are less than asked leaves."
-#~ msgstr ""
-#~ "Non è possibile convalidare i permessi quando i permessi disponibili sono "
-#~ "minori di quelli richiesti."
-
-#~ msgid ""
-#~ "If you link this type of leave with a category in the CRM, it will "
-#~ "synchronize each leave asked with a case in this category, to display it in "
-#~ "the company shared calendar for example."
-#~ msgstr ""
-#~ "Se collegate questo tipo di permesso con una categoria nel CRM, verrà "
-#~ "sincronizzato ogni permesso richiesto con un caso in questa categoria, per "
-#~ "visualizzarle nel calendario della compagnia, per esempio."
-
-#~ msgid ""
-#~ "This field is only for informative purposes, to depict if the leave "
-#~ "request/allocation comes from an employee or from the company"
-#~ msgstr ""
-#~ "Questo campo è solo per scopi informativi, per indicare se la richiesta di "
-#~ "permesso/assegnazione arriva da un impiegato o dalla compagnia."
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index 043f3167a31..e3ad16fb573 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,244 +767,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "휴무 요약"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "새 휴일 요청"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "경고 !"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "검증 대기 중인 요청들"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "새 휴일 요청"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "직원 휴가"
-
-#~ msgid "Validate"
-#~ msgstr "검증"
-
-#~ msgid "Both"
-#~ msgstr "둘 다"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "직원 선언"
-
-#~ msgid "Refused Request"
-#~ msgstr "거부된 요청"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "내 휴일 요청"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "휴무 요약"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "휴일 상태"
-
-#~ msgid "Notes"
-#~ msgstr "노트"
-
-#~ msgid "Request is refused."
-#~ msgstr "요청이 거부됨."
-
-#~ msgid "Holidays Management"
-#~ msgstr "휴무 관리"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "휴무가 카렌더에 설정되었습니다."
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "허용된 휴무"
-
-#~ msgid "Vacation end day"
-#~ msgstr "휴가 마지막 날"
-
-#~ msgid "Holidays Status"
-#~ msgstr "휴무 상태"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "새 직원 선언을 위한 법적 선언 문서"
-
-#~ msgid "Define holiday status"
-#~ msgstr "휴무 상태 정의"
-
-#~ msgid "Holiday status"
-#~ msgstr "휴무 상태"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "사용자 당 휴무"
-
-#~ msgid "Employee_id"
-#~ msgstr "직원 ID (i)"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "내 휴일 요청들"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "내 확정 대기 중인 휴무 요청"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "요청된 휴일 수"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "연간 가용 휴일 수의 인코딩"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "직원이 휴일을 획득함."
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "이 휴일 요청에 포함된 일 수"
-
-#~ msgid "Holiday Status"
-#~ msgstr "휴일 상태"
-
-#~ msgid "Report Options"
-#~ msgstr "리포트 옵션"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "그의 매니저가 이 요청을 승인하였습니다."
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "적어도 1명의 직원을 선택하십시오. 다시 시도하세요."
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "내 검증된 휴무 요청들"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "직원 별 휴일"
-
-#~ msgid "Notification"
-#~ msgstr "알림"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "직원 휴무 요약 인쇄"
-
-#~ msgid "Vacation start day"
-#~ msgstr "휴가 시작 날짜"
-
-#~ msgid "Holidays user"
-#~ msgstr "휴일 사용자"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "직원이 휴무 요청서를 작성합니다."
-
-#~ msgid "Calendar"
-#~ msgstr "카렌더"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "내 가용 휴일들"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "허용된 최대 휴무"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "내 휴일 요청 초안들"
-
-#~ msgid "Status"
-#~ msgstr "상태"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "휴일이 카렌더에 설정되었습니다."
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "내 거부된 휴무 요청들"
-
-#~ msgid "Set Holiday"
-#~ msgstr "휴일로 설정"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "내 휴일 요청"
-
-#~ msgid "draft"
-#~ msgstr "초안"
-
-#~ msgid "holidays."
-#~ msgstr "휴일"
-
-#~ msgid "Color of the status"
-#~ msgstr "상태 색깔"
-
-#~ msgid "Date"
-#~ msgstr "날짜"
-
-#~ msgid "Document for employee"
-#~ msgstr "직원 문서"
-
-#~ msgid "Reufse"
-#~ msgstr "거부"
-
-#~ msgid "Section"
-#~ msgstr "섹션"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "확정 대기 중인 내 휴무 요청"
-
-#~ msgid "History"
-#~ msgstr "히스토리"
-
-#~ msgid "Holiday manager"
-#~ msgstr "휴일 관리자"
-
-#~ msgid "Approved Request"
-#~ msgstr "승인된 요청"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr "이 휴무 요청을 취소할 수 없습니다. 먼저, 초안 상태로 되돌리십시오."
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "검증 대기 중인 휴무 요청"
-
-#~ msgid "Holidays Request"
-#~ msgstr "휴무 요청"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "내 휴무 요청 초안"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "휴무 요약 인쇄"
-
-#~ msgid "General Information"
-#~ msgstr "일반 정보"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "내 거부된 휴무 요청"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "휴무 요청"
-
-#~ msgid "Case"
-#~ msgstr "케이스"
-
-#~ msgid "Request is approved."
-#~ msgstr "요청이 승인됨."
-
-#~ msgid "Holidays Definition"
-#~ msgstr "휴일 정의"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "가용 휴일 수 인코드"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "휴무 요청 ID"
-
-#~ msgid "Holidays Process"
-#~ msgstr "휴일 프로세스"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "그의 매니저가 요청을 거부함."
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "최소 하나의 부서를 선택하십시오."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "내 검증된 휴무 요청"
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 519ed384acd..f44ca0a81d8 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,210 +766,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Visi atostogų prašymai"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Prašymai laukiantys patvirtinimo"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Darbuotojo atostogos"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Naujas atostogų prašymas"
-
-#~ msgid "Validate"
-#~ msgstr "Patvirtinti"
-
-#~ msgid "Both"
-#~ msgstr "Abu"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Darbuotojo pareiškimas"
-
-#~ msgid "Refused Request"
-#~ msgstr "Atmesti prašymą"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Mano atostogų prašymai"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Atostogų būsena"
-
-#~ msgid "Ok"
-#~ msgstr "Gerai"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analizuoti nuo"
-
-#~ msgid "Notes"
-#~ msgstr "Užrašai"
-
-#~ msgid "Request is refused."
-#~ msgstr "Prašymas atmestas"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Atostogų valdymas"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Atostogų suvestinė"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Atostogos pažymėtos kalendoriuje"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Atostogauti leidžiama"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Atostogų paskutinė diena"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Atostogų būsena"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Nustatyti atostogų būseną"
-
-#~ msgid "Holiday status"
-#~ msgstr "Atostogų būsena"
-
-#~ msgid "Employee_id"
-#~ msgstr "Darbuotojo_id"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Mano atostogų prašymai"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Atostogų prašymų skaičius"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Mato atostogų prašymai, laukiantys patvirtinimo"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Dienų skaičius šiame atostogų prašyme"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Atostogų būsena"
-
-#~ msgid "Report Options"
-#~ msgstr "Ataskaitos nustatymai"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Jo vadovas patvirtino prašymą"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Mano pavirtinti atostogų prašymai"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Atostogų darbuotojui skaičius"
-
-#~ msgid "Notification"
-#~ msgstr "Perspėjimas"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Atostogų pradžios diena"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Darbuotojas užpildo atostogų prašymą"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendorius"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Leisti viršyti limitą"
-
-#~ msgid "Status"
-#~ msgstr "Būsena"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Atostogos pažymėtos kalendoriuje"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Mano atmesti atostogų prašymai"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Nustatyti atostogas"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Mano atostogų prašymai"
-
-#~ msgid "Color of the status"
-#~ msgstr "Būsenos spalva"
-
-#~ msgid "holidays."
-#~ msgstr "atostogos."
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Document for employee"
-#~ msgstr "Darbuotojo dokumentas"
-
-#~ msgid "Reufse"
-#~ msgstr "Atsakyti"
-
-#~ msgid "Section"
-#~ msgstr "Dalis"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Atostogų prašymai laukiantys patvirtinimo"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Atostogų prašymai"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Spausdinti atostogų suvestinę"
-
-#~ msgid "General Information"
-#~ msgstr "Pagrindinė informacija"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Mano atmesti atostogų prašymai"
-
-#~ msgid "Request is approved."
-#~ msgstr "Prašymas patvirtinas"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Atostogų apibūdinimas"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Jo vadovas atmetė prašymą"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Būtina parinkti bent vieną skyrių. Bandykite dar kartą."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Mano validuoti atostogų prašymai"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Atostogos pagal naudotojus"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Atspausdinti darbuotojo atostogų suvestinę"
-
-#~ msgid "Holidays user"
-#~ msgstr "Atostogų naudotojas"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Turite parinkti bent 1 darbuotoją. Bandykite dar kartą."
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "Jei atostogos galimos, darbuotjas gali jas imti ir užpildyti."
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Mano atostogų prašymų juodraščiai"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mano galimos atostogos"
-
-#~ msgid "draft"
-#~ msgstr "juodraštis"
-
-#~ msgid "Approved Request"
-#~ msgstr "Patvirtintas prašymas"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Mano atostogų prašymų juodraštis"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Atostogų procesas"
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index a2b126daa22..9e27219416d 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index a524b06819e..b8bee40d216 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -805,540 +805,3 @@ msgstr "Батлах"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "Зөвшөөрөх"
-
-#~ msgid "Taken Leaves"
-#~ msgstr "Авсан амралт, чөлөө"
-
-#~ msgid "Company Allocation"
-#~ msgstr "Компаниар хуваарилах"
-
-#~ msgid "March"
-#~ msgstr "3 сар"
-
-#~ msgid "Allocated Leaves"
-#~ msgstr "Хуваарилсан амралт, чөлөө"
-
-#~ msgid "Leave Days"
-#~ msgstr "Амралт, чөлөөтэй өдрүүд"
-
-#~ msgid "Category's Name"
-#~ msgstr "Зэрэглэлтийн нэр"
-
-#~ msgid "Validation User"
-#~ msgstr "Батламжилсан хэрэглэгч"
-
-#~ msgid "available.holidays.report"
-#~ msgstr "Амралт, чөлөөний боломж тайлан"
-
-#~ msgid ""
-#~ "This field is only for informative purposes, to depict if the leave "
-#~ "request/allocation comes from an employee or from the company"
-#~ msgstr ""
-#~ "1 ажилтнаас эсвэл тухайн компаниас энэ амралт, чөлөө буюу түүний "
-#~ "хуваарилалтыг хүсэх хүсэлт ирснийг дүрслэх зорилготой мэдээллийн чанартай "
-#~ "талбар юм"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Батламжлах хүлээгдэж байна"
-
-#~ msgid "July"
-#~ msgstr "7 сар"
-
-#~ msgid "Remaining Leave by Type and User"
-#~ msgstr "Төрөл ба хэрэглэгчээр ангилсан үлдсэн амралт, чөлөө"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Ажилтны зэрэглэл"
-
-#~ msgid ""
-#~ "If you link this type of leave with a category in the CRM, it will "
-#~ "synchronize each leave asked with a case in this category, to display it in "
-#~ "the company shared calendar for example."
-#~ msgstr ""
-#~ "CRM-ийн ангилалтай амралт, чөлөөний төрлийг харгалзуулбал амралт, чөлөөний "
-#~ "хүсэлт бүрийг CRM-ийн ангилалын тохиолдлуудтай хугацааны хувьд давхцуулан "
-#~ "компани дундын календар дээр харуулна."
-
-#~ msgid " Month "
-#~ msgstr " Сар "
-
-#~ msgid "September"
-#~ msgstr "9 сар"
-
-#~ msgid "December"
-#~ msgstr "12 сар"
-
-#~ msgid "Remaining Leaves by User"
-#~ msgstr "Хэрэглэгчээр ангилсан үлдсэн амралт, чөлөө"
-
-#~ msgid "Month"
-#~ msgstr "Сар"
-
-#, python-format
-#~ msgid "No user related to the selected employee."
-#~ msgstr "Сонгосон ажилтанд харгалзах хэрэглэгч байхгүй байна."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
-
-#~ msgid "Available Holidays"
-#~ msgstr "Амралт, чөлөө авах боломж"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for %s while available leaves are less than asked "
-#~ "leaves.' %(record.category_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            else:\n"
-#~ "                nb = record.number_of_days_temp\n"
-#~ "\n"
-#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
-#~ "                user_id = record.employee_id.user_id and "
-#~ "record.employee_id.user_id.id or uid\n"
-#~ "\n"
-#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
-#~ "'number_of_days': nb, 'user_id': user_id })\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
-#~ "        vals = {'state': 'refuse'}\n"
-#~ "        ids2 = self.pool.get('hr.employee"
-#~ msgstr ""
-#~ "Хуваарилагдсан боломжит амралт, чөлөөний хоног нь амралт, чөлөөний хүсэлт "
-#~ "дээрхээс бага тул амралт, чөлөөг батламжилж болохгүй байна( %s) .' "
-#~ "%(record.category_id.name)))"
-
-#~ msgid "August"
-#~ msgstr "8 сар"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Зөвшөөрсөн амралт, чөлөөний дээд хэмжээ"
-
-#~ msgid "Date"
-#~ msgstr "Огноо"
-
-#~ msgid "January"
-#~ msgstr "1 сар"
-
-#~ msgid "Employee Request"
-#~ msgstr "Ажилттны хүсэлт"
-
-#~ msgid "October"
-#~ msgstr "10 сар"
-
-#~ msgid "November"
-#~ msgstr "11 сар"
-
-#~ msgid ""
-#~ "Start date should not be larger than end date!\n"
-#~ "Number of Days should be greater than 1!"
-#~ msgstr "Эхлэх огноо нь дуусах огнооноос хойш байх ёсгүй"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for %s while available leaves are less than asked "
-#~ "leaves.' %(record.employee_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            elif record.holiday_type == 'category' and record.type == "
-#~ "'remove':\n"
-#~ "                if record.category_id and not "
-#~ "record.holiday_status_id.limit:\n"
-#~ "                    leaves_rest = self.pool.get('hr.holidays.status"
-#~ msgstr ""
-#~ "Хуваарилагдсан боломжит амралт, чөлөөний хоног нь амралт, чөлөөний хүсэлт "
-#~ "дээрхээс бага тул амралт, чөлөөг батламжилж болохгүй байна( %s) .' "
-#~ "%(record.category_id.name)))"
-
-#~ msgid "Day"
-#~ msgstr "Өдөр"
-
-#~ msgid " Leave Type"
-#~ msgstr " Амралт, чөлөөний төрөл"
-
-#~ msgid "My Leaves by Type"
-#~ msgstr "Өөрийн амралт, чөлөөний төрөл"
-
-#~ msgid "May"
-#~ msgstr "5 сар"
-
-#~ msgid "Meeting Category"
-#~ msgstr "Уулзалтын ангилал"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Ажилтны нэр"
-
-#~ msgid "Leaves by Month"
-#~ msgstr "Сарын амралт, чөлөө"
-
-#~ msgid "Case"
-#~ msgstr "Тохиолдол"
-
-#~ msgid "April"
-#~ msgstr "4 сар"
-
-#~ msgid "February"
-#~ msgstr "2 сар"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
-
-#, python-format
-#~ msgid "Wrong leave definition."
-#~ msgstr "Амралт, чөлөөг буруу тодорхойлсон байна"
-
-#~ msgid "Year"
-#~ msgstr "Он"
-
-#, python-format
-#~ msgid ""
-#~ "You Cannot Validate leaves while available leaves are less than asked leaves."
-#~ msgstr ""
-#~ "Хуваарилагдсан боломжит амралт, чөлөөний хоног нь амралт, чөлөөний хүсэлт "
-#~ "дээрхээс бага тул амралт, чөлөөг батламжилж болохгүй байна."
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Шинэ амрах хүсэлт"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Амралтын бүх хүсэлтүүд"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Батлахаар хүлээгдэж буй хүсэлт"
-
-#~ msgid "of the"
-#~ msgstr "-ийн"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Амралт, чөлөөний товчоо"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Ажилтны амралт"
-
-#~ msgid ""
-#~ "Leaves requests can be recorded by employees and validated by their "
-#~ "managers. Once a leave request is validated it appears automatically in the "
-#~ "agenda of the employee. You can define several allowance types (paid "
-#~ "holidays, sickness, etc) and manage allowances per type."
-#~ msgstr ""
-#~ "Амралт, чөлөөний хүсэлтийг ажилтан бүртгэх ба менежер батламжилна. Амралт, "
-#~ "чөлөөний хүсэлт батламжлагдмагч ажилтан руу автоматаар санамж очно. Цалинтай "
-#~ "амралт, чөлөө, өвчтэй гэх мэт олголтын төрлийг тодорхойлж олголтыг төрлөөр "
-#~ "удирдаж болно."
-
-#~ msgid "to"
-#~ msgstr "хүртэл"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Ажилтны тодорхойлолт"
-
-#~ msgid "Validate"
-#~ msgstr "Батлах"
-
-#~ msgid "Refused Request"
-#~ msgstr "Татгалзсан хүсэлт"
-
-#~ msgid "Both"
-#~ msgstr "Аль аль нь"
-
-#~ msgid "Ok"
-#~ msgstr "Тийм"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Миний амрах хүсэлт"
-
-#~ msgid "Notes"
-#~ msgstr "Тэмдэглэл"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Амралтын төлөв"
-
-#~ msgid "Request is refused."
-#~ msgstr "Хүсэлтэд татгалзсан хариу өгсөн."
-
-#~ msgid "Holidays Management"
-#~ msgstr "Амралтын удирдлага"
-
-#~ msgid "Analyze from"
-#~ msgstr "Шинжилгээ хийсэн"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Амралт, чөлөөний товчоо"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Амралт хуанли дээр тэмдэглэгдсэн."
-
-#~ msgid "Holiday status"
-#~ msgstr "Амралтын төлөв"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Амрах төлөв"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Амралт дуусах өдөр"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Шинэ ажилтныг мэдүүлэх хууль ёсны баримт"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "1 хэрэглэгчийн амралт, чөлөө"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Амралтын төлөв тодорхойлох"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Амралт, чөлөөний батлуулах гэж буй өөрийн хүсэлтүүд"
-
-#~ msgid "Employee_id"
-#~ msgstr "Ажилтны_id"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Жилийн авах боломжтой амралт, чөлөөг бүртгэх."
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Амралт авах ажилтан"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Амралтын хүсэлтийн дугаар"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Өөрийн амралт, чөлөөний хүсэлт"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Амрах төлөв"
-
-#~ msgid "Report Options"
-#~ msgstr "Тайлангийн сонголтууд"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Түүний менежер хүсэлтийг зөвшөөрнө"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr ""
-#~ "Амралт, чөлөө авах боломжтой бол ажилтан амралт, чөлөөг авч үүнийг бөглөнө."
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Цөөндөө 1 ажилтан сонгоно. Дахин оролдоно уу."
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Өөрийн батламжлуулсан амралт чөлөө"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Амралт, чөлөөний хүсэлт дэх хоногийн тоо"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Ажилтан бүрийн амралт"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Зөвшөөрөх нэмэлт хэмжээ"
-
-#~ msgid "Holidays user"
-#~ msgstr "Амралт, чөлөөний хэрэглэгч"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "Амралт, чөлөөний лог"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Ажилтны амралт, чөлөөний товчоог хэвлэх"
-
-#~ msgid "Calendar"
-#~ msgstr "Календар"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Амралт эхлэх өдөр"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Хүний нөөц: Амралт, чөлөөний хяналт ба ажлын урсгал\n"
-#~ "Энэ модуль нь амралт, чөлөө ба түүний хүсэлтийг зохицуулах боломж олгоно. "
-#~ "Амралт, чөлөөний төрөл бүр дээр авах боломжтой хоногийн тоог ажилтан бүрээр "
-#~ "тодорхойлж болно.\n"
-#~ "- Үйлчлүүлэгчтэй харилцах модулийн дотоод санамжтай цаг хугацаагаар "
-#~ "давхцуулах боломжтой: Амралт, чөлөөний хүсэлтийг зөвшөөрөхөд автоматаар "
-#~ "тохиолдол үүсгэдэг байхын тулд амралт, чөлөөний төрлийг тохиолдлын хэсэгтэй "
-#~ "холбох ёстой. Та энэ мэдээлэл ба өнгийн тохиргоог Хүний нөөц/ "
-#~ "Тохиргоо/Амралт, чөлөөний төлөв цэсийг ашиглан хийнэ. \n"
-#~ "- Ажилтан сөрөг хоногтой амралт, чөлөөний хүсэлтийг үүсгэж болох бөгөөд "
-#~ "үүнийг системд нэмэлт амралт, чөлөөний хоногийг хүсэж байна гэж ойлгоно. Энэ "
-#~ "нь тухайн амралт, чөлөөний төрлийн авах боломжит хоногийн тооны нийт дүнг "
-#~ "нэмэгдүүлнэ(Хэрэв хүсэлтийг хүлээн авбал). \n"
-#~ "  - Ажилтны амралт чөлөөг хэвлэх 2 арга бий:\n"
-#~ "       * ХН / Амралт, чөлөөний хүсэлт / Амралт,чөлөөний товчоог хэвлэх\n"
-#~ "                цэсийг дарж ажилтнуудыг хэлтсээр нь сонгож хэвлэх\n"
-#~ "       * Тодорхой ажилтнуудыг сонгож тэдний амралт, чөлөөний тайланг хэвлэх "
-#~ "арга бий.\n"
-#~ "                ХН/ Ажилчид/ Ажилчид цэсний жагсаалтаас сонгож хэвлэх "
-#~ "товчийг дараад\n"
-#~ "                   'Ажилтны амралт, чөлөөний товчоог хэвлэх' сонголтыг "
-#~ "сонгоно.\n"
-#~ "   -Баталсан, батламжилсан амралт, чөлөө эсвэл зөвхөн батламжилсан "
-#~ "амралт,чөлөөг сонгон хэвлэх боломж олгох оруулах дэлгэц бий.        Эдгээр "
-#~ "төлөвүүдийг  хүний нөөцийн болон амралт, чөлөөний дүрд хамаарах ажилтан "
-#~ "тогтоож өгнө.\n"
-#~ "                   Administration / Users / Users/ цэсэн дэх аэрэглэгчийн "
-#~ "өгөгдлийн 'Нууцлал' хэсэгт үүнийг тохируулна.\n"
-
-#~ msgid "Notification"
-#~ msgstr "Мэдэгдэл"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Амралт,чөлөөний хүсэлтийг ажилтан бөглөнө"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Хуанли дээр амралт, чөлөөг бичнэ."
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Авч болох өөрийн амралт, чөлөө"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Өөрийн амралт, чөлөөний татгалзсан хүсэлтүүд"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Амралт, чөлөөг тохируулах"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Миний амрах хүсэлтийн ноорог"
-
-#~ msgid "Status"
-#~ msgstr "Төлөв"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Өөрийн амралт, чөлөөний хүсэлт"
-
-#~ msgid "Color of the status"
-#~ msgstr "Төлвийн өнгө"
-
-#~ msgid "holidays."
-#~ msgstr "амралт."
-
-#~ msgid "draft"
-#~ msgstr "Ноорог"
-
-#~ msgid "Document for employee"
-#~ msgstr "Ажилтны баримт"
-
-#~ msgid "Reufse"
-#~ msgstr "Татгалзах"
-
-#~ msgid "Section"
-#~ msgstr "Хэсэг"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Амралтын менежер"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Өөрийн амралт, чөлөөний хүсэлтийн ноорог"
-
-#~ msgid "Approved Request"
-#~ msgstr "Засварласан хүсэлт"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Амралтын хүсэлт"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Батламжлуулах амралт, чөлөөний хүсэлт"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Амралт, чөлөөний хүсэлт"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Өөрийн амралт, чөлөөний татгалзсан хүсэлт"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Амралтын дүгнэлтийг хэвлэх"
-
-#~ msgid "Request is approved."
-#~ msgstr "Хүсэлтийг зассан"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Амралтын тодорхойлолт"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Хэрэглэгч нэг бүрийн амралт"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Амралт, чөлөө авч болох хоногийн тоог оруулах"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Нарийн бичгийн дарга нарын газар"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Амралт, чөлөөг зохицуулах үйл ажиллагаа"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Цөөндөө 1 хэлтсийг сонгох ёстой. Дахин оролдоно уу."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Өөрийн батламжлагдсан амралт, чөлөөний хүсэлт"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "Амралтын хүсэлтийн ID"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Менежер хүсэлтэд татгалзсан хариу өгч болно."
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Сануулга !"
-
-#~ msgid "    Month-1    "
-#~ msgstr "    Сар-1    "
-
-#~ msgid " Year "
-#~ msgstr " Year "
-
-#~ msgid "June"
-#~ msgstr "6 сар"
-
-#~ msgid "Extended options..."
-#~ msgstr "Өргөтгөсөн хайлт..."
-
-#~ msgid ""
-#~ "This color will be used in the leaves summary located in Reporting / Leaves "
-#~ "by Departement"
-#~ msgstr ""
-#~ "Тайлан/ Амралт, чөлөөг хэлтсээр харах цэсэнд байрлах амралт, чөлөөний "
-#~ "товчоонд энэ өнгө хэрэглэгдэнэ."
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 1c17096a383..db3adac1853 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -837,580 +837,3 @@ msgstr "Te bevestigen"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "Goed te keuren"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Verlofstatus"
-
-#~ msgid "Holiday status"
-#~ msgstr "Verlofstatus"
-
-#~ msgid "Both"
-#~ msgstr "Beide"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Werknemersverklaring"
-
-#~ msgid "Refused Request"
-#~ msgstr "Verzoek geweigerd"
-
-#~ msgid "Request is refused."
-#~ msgstr "Verzoek  is geweigerd"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Werknemer krijgt vakanties"
-
-#~ msgid "Notification"
-#~ msgstr "Bericht"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Document for employee"
-#~ msgstr "Document voor werknemer"
-
-#~ msgid "Section"
-#~ msgstr "Sectie"
-
-#~ msgid "History"
-#~ msgstr "Geschiedenis"
-
-#~ msgid "General Information"
-#~ msgstr "Algemene informatie"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Limietoverschrijding toegestaan"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Samenvatting vrije dagen"
-
-#~ msgid "of the"
-#~ msgstr "van de"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Waarschuwing!"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Aanvragen wachtend op bevestiging"
-
-#~ msgid "to"
-#~ msgstr "aan"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analyseer van"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Verlofdagen per gebruiker"
-
-#~ msgid "Employee_id"
-#~ msgstr "Werknemers-ID"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Verlofstatus"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr ""
-#~ "Als verlof beschikbaar is, kan de werknemer het opnemen en gebruiken."
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Verlofdagen per werknemer"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Begindatum verlof"
-
-#~ msgid "Holidays user"
-#~ msgstr "Verlofgebruiker"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Werknemer vraagt verlof aan"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mijn beschikbare verlof"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Mijn geweigerde verlofaanvragen"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Mijn verlofaanvragen"
-
-#~ msgid "Color of the status"
-#~ msgstr "Statuskleur"
-
-#~ msgid "draft"
-#~ msgstr "concept"
-
-#~ msgid "holidays."
-#~ msgstr "verlof."
-
-#~ msgid "Holiday manager"
-#~ msgstr "Verlofbeheerder"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Loggen verlof"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Afdrukken verlofsamenvatting"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Mijn geweigerde verlofaanvragen"
-
-#~ msgid "Case"
-#~ msgstr "Dossier"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Verlofdefinitie"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "Verlofaanvraag-ID"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Verlofproces"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Alle verlofaanvragen"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Nieuwe verlofaanvraag"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Mijn verlofaanvragen"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Mijn bevestigde verlofaanvragen"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definiëer verlofstatus"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Mijn verlofaanvragen"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Aantal aangevraagde verlofdagen"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Mijn concept verlofaanvragen"
-
-#~ msgid "Reufse"
-#~ msgstr "Weigeren"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Vastleggen aantal beschikbare verlofdagen"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Verlofaanvragen wachtend op bevestiging"
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Mijn gevalideerde verlofaanvragen"
-
-#~ msgid "Validate"
-#~ msgstr "Bevestig"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie-definitie."
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Verlof werknemer"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Notes"
-#~ msgstr "Opmerkingen"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Verlofbeheer"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Overzicht verlofdagen"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Het verlof is opgenomen in de agenda"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Verlof toegestaan"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Einddatum verlof"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Verlofstati"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Juridische verklaring voor een nieuwe werknemer"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Wacht op goedkeuring"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Mijn verlofaanvragen wachtend op bevestiging"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Vastleggen van jaarlijks beschikbare verlofdagen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave!"
-
-#~ msgid "Report Options"
-#~ msgstr "Opties overzicht"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Diens manager keurt de aanvraag goed"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr ""
-#~ "U dient tenminste één werknemer geselecteerd te hebben. Probeert u het "
-#~ "opnieuw."
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Aantal dagen in deze verlofaanvraag"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Afdrukken overzicht verlof werknemers"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "hr.holidays.log"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Personeelszaken: Verlofdagenbeheer en werkstroom\n"
-#~ "\n"
-#~ "    Deze module stelt u in staat om verlof en verlofaanvragen te beheren. "
-#~ "Voor elke werknemer kunt u ook een aantal verlofdagen per verlofstatus "
-#~ "instellen.\n"
-#~ "    Merk op dat:\n"
-#~ "    - Een synchronisatie met een interne agenda (CRM-module) mogelijk is: om "
-#~ "automatisch een dossier aan te maken bij het accepteren van een aanvraag, "
-#~ "dient u de verlofstatus te koppelen aan een dossier-sectie. U kunt dit, "
-#~ "samen met uw kleurvoorkeuren, instellen in\n"
-#~ "            Personeelszaken / Instellingen / Verlofstati\n"
-#~ "    - Een werknemer kan een negatief aantal verlofdagen verzoeken, wat door "
-#~ "het systeem geïnterpreteerd wordt als een verzoek om meer verlofdagen. Het "
-#~ "zal het totaal aantal verlofdagen van die verlofstatus verhogen (indien "
-#~ "goedgekeurd).\n"
-#~ "    - Er twee manieren zijn om een verlofoverzicht per werknemer af te "
-#~ "drukken:\n"
-#~ "        * De eerste staat u toe het overzicht voor een specifieke gebruiker "
-#~ "te kiezen. Ga naar de lijst\n"
-#~ "                Personeelszaken / Werknemers / Werknemers\n"
-#~ "           Kies de personeelsleden, klik op het 'afdrukken'-ikoon en kies de "
-#~ "optie\n"
-#~ "                Afdrukken samenvatting van verlofdagen werknemer\n"
-#~ "    - De assistent staat u toe te kiezen tussen de bevestigde en "
-#~ "gevalideerde verlofdagen of alleen de gevalideerde dagen. Deze stati moeten "
-#~ "ingesteld worden door een gebruiker van de groep 'HR' en met de rol "
-#~ "'verlofdagen'. U kunt deze functionaliteit opgeven in het beveiligingstab "
-#~ "van de gebruikersgegevens in\n"
-#~ "            Beheer / Gebruikers / Gebruikers\n"
-#~ "        U zult dit mogelijk voor de gebruiker 'admin' willen doen.\n"
-
-#~ msgid "Calendar"
-#~ msgstr "Agenda"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Mijn concept verlofaanvragen"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Verlof is vastgelegd in de agenda."
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Maximaal toegestane verlofdagen"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Stel verlof in"
-
-#~ msgid "Approved Request"
-#~ msgstr "Goedgekeurde aanvraag"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Verlofaanvraag"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Standaard verlofaanvraag"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Verlof per gebruiker"
-
-#~ msgid "Request is approved."
-#~ msgstr "Aanvraag is goedgekeurd."
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Sociale zaken"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "U dient minimaal één afdeling te kiezen. Probeert u het opnieuw."
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Diens manager weigert de aanvraag"
-
-#~ msgid "Taken Leaves"
-#~ msgstr "Opgenomen verlof"
-
-#~ msgid "March"
-#~ msgstr "Maart"
-
-#~ msgid "Company Allocation"
-#~ msgstr "Bedrijfsreservering"
-
-#~ msgid "Allocated Leaves"
-#~ msgstr "Gereserveerd verlof"
-
-#~ msgid "Leave Days"
-#~ msgstr "Verlofdagen"
-
-#~ msgid "Category's Name"
-#~ msgstr "Categorienaam"
-
-#~ msgid "Validation User"
-#~ msgstr "Geberuiker bevestiging"
-
-#~ msgid "available.holidays.report"
-#~ msgstr "available.holidays.report"
-
-#~ msgid ""
-#~ "This field is only for informative purposes, to depict if the leave "
-#~ "request/allocation comes from an employee or from the company"
-#~ msgstr ""
-#~ "Dit veld is voor informatieve doeleinden, om aan te geven of de verlof "
-#~ "aanvraag/reservering afkomstig is van een medewerker of van het bedrijf."
-
-#~ msgid ""
-#~ "If you link this type of leave with a category in the CRM, it will "
-#~ "synchronize each leave asked with a case in this category, to display it in "
-#~ "the company shared calendar for example."
-#~ msgstr ""
-#~ "Als u deze verlofsoort koppelt met een categorie in CRM, wordt elk verlof "
-#~ "gesynchroniseerd met een dossier in deze categorie, bijvoorbeeld om te tonen "
-#~ "in de bedrijfsagenda."
-
-#~ msgid " Month "
-#~ msgstr " Maand "
-
-#~ msgid "July"
-#~ msgstr "Juli"
-
-#~ msgid "Remaining Leave by Type and User"
-#~ msgstr "Resterend verlof per soort en gebruiker"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Medewerkerscategorie"
-
-#~ msgid "September"
-#~ msgstr "September"
-
-#~ msgid "Remaining Leaves by User"
-#~ msgstr "Resterend verlof per gebruiker"
-
-#~ msgid "Month"
-#~ msgstr "Maand"
-
-#~ msgid "December"
-#~ msgstr "December"
-
-#, python-format
-#~ msgid "No user related to the selected employee."
-#~ msgstr "Geen gebruiker verbonden met deze medewerker."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Available Holidays"
-#~ msgstr "Beschikbare vakantiedagen"
-
-#~ msgid " Year "
-#~ msgstr " Jaar "
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for %s while available leaves are less than asked "
-#~ "leaves.' %(record.category_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            else:\n"
-#~ "                nb = record.number_of_days_temp\n"
-#~ "\n"
-#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
-#~ "                user_id = record.employee_id.user_id and "
-#~ "record.employee_id.user_id.id or uid\n"
-#~ "\n"
-#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
-#~ "'number_of_days': nb, 'user_id': user_id })\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
-#~ "        vals = {'state': 'refuse'}\n"
-#~ "        ids2 = self.pool.get('hr.employee"
-#~ msgstr ""
-#~ "U kunt geen verlof goedkeuren voor %s als het beschikbare verlof minder is "
-#~ "dan het gevraagde verlof.' %(record.category_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            else:\n"
-#~ "                nb = record.number_of_days_temp\n"
-#~ "\n"
-#~ "            if record.holiday_type == 'employee' and record.employee_id:\n"
-#~ "                user_id = record.employee_id.user_id and "
-#~ "record.employee_id.user_id.id or uid\n"
-#~ "\n"
-#~ "            self.write(cr, uid, [record.id], {'state':'confirm', "
-#~ "'number_of_days': nb, 'user_id': user_id })\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def holidays_refuse(self, cr, uid, ids, *args):\n"
-#~ "        vals = {'state': 'refuse'}\n"
-#~ "        ids2 = self.pool.get('hr.employee"
-
-#~ msgid "August"
-#~ msgstr "Augustus"
-
-#~ msgid "June"
-#~ msgstr "Juni"
-
-#~ msgid "January"
-#~ msgstr "Januari"
-
-#~ msgid "Employee Request"
-#~ msgstr "Aanvraag medewerker"
-
-#~ msgid "October"
-#~ msgstr "Oktober"
-
-#~ msgid "November"
-#~ msgstr "November"
-
-#~ msgid "Extended options..."
-#~ msgstr "Uitgebreide opties..."
-
-#~ msgid ""
-#~ "Start date should not be larger than end date!\n"
-#~ "Number of Days should be greater than 1!"
-#~ msgstr ""
-#~ "Begindatum kan niet na einddatum liggen!\n"
-#~ "Aantal dagen moet groter dan 1 zijn!"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot validate leaves for %s while available leaves are less than asked "
-#~ "leaves.' %(record.employee_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            elif record.holiday_type == 'category' and record.type == "
-#~ "'remove':\n"
-#~ "                if record.category_id and not "
-#~ "record.holiday_status_id.limit:\n"
-#~ "                    leaves_rest = self.pool.get('hr.holidays.status"
-#~ msgstr ""
-#~ "U kunt geen verlof goedkeuren voor %s als er minder verlof beschikbaar is "
-#~ "dan het gevraagde verlof.' %(record.employee_id.name)))\n"
-#~ "                nb = -(record.number_of_days_temp)\n"
-#~ "            elif record.holiday_type == 'category' and record.type == "
-#~ "'remove':\n"
-#~ "                if record.category_id and not "
-#~ "record.holiday_status_id.limit:\n"
-#~ "                    leaves_rest = self.pool.get('hr.holidays.status"
-
-#~ msgid "Day"
-#~ msgstr "Dag"
-
-#~ msgid "My Leaves by Type"
-#~ msgstr "Mijn verlof per soort"
-
-#~ msgid " Leave Type"
-#~ msgstr " Verlofsoort"
-
-#~ msgid "May"
-#~ msgstr "Mei"
-
-#~ msgid "Meeting Category"
-#~ msgstr "Afspraak categorie"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Naam medewerker"
-
-#~ msgid "Leaves by Month"
-#~ msgstr "Verlof per maand"
-
-#~ msgid "April"
-#~ msgstr "April"
-
-#~ msgid "February"
-#~ msgstr "Februari"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#, python-format
-#~ msgid "Wrong leave definition."
-#~ msgstr "Verkeerde verlof definitie"
-
-#~ msgid "Year"
-#~ msgstr "JaarH"
-
-#, python-format
-#~ msgid ""
-#~ "You Cannot Validate leaves while available leaves are less than asked leaves."
-#~ msgstr ""
-#~ "U kunt verlof niet goedkeuren als het beschikbare verlof minder is dan het "
-#~ "gevraagde verlof."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Leaves By Month"
-#~ msgstr "Verlof per maand"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid ""
-#~ "Leaves requests can be recorded by employees and validated by their "
-#~ "managers. Once a leave request is validated it appears automatically in the "
-#~ "agenda of the employee. You can define several allowance types (paid "
-#~ "holidays, sickness, etc) and manage allowances per type."
-#~ msgstr ""
-#~ "Verlofaanvragen kunnen worden ingediend door medewerkers en gecontroleerd "
-#~ "door hun managers. Als de de verlofaanvraag is gecontroleerd verschijnt die "
-#~ "automatisch in de agenda van de medewerker. U kunt verschillende soorten "
-#~ "verlof (betaalde verlof, ziek, etc.) definieren en deze per soort beheren."
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index d02e67b68fa..baf28546813 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 0d7d0ecebc0..da006134c83 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -781,320 +781,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Suma dni wolnych"
-
-#~ msgid "of the"
-#~ msgstr "z"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Ostrzeżenie !"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Urlopy pracownika"
-
-#~ msgid "Both"
-#~ msgstr "Oba"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Deklaracja pracownika"
-
-#~ msgid "Refused Request"
-#~ msgstr "Wniosek odrzucony"
-
-#~ msgid "to"
-#~ msgstr "do"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analizuj od"
-
-#~ msgid "Notes"
-#~ msgstr "Uwagi"
-
-#~ msgid "Request is refused."
-#~ msgstr "Wniosek został odrzucony"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Urlopy"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Podsumowanie urlopów"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Urlop został ustawiony w kalendarzu"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Dozwolone urlopy"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Ostatni dzień urlopu"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Urlopy na użytkownika"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Wprowadzanie urlopów przysługujących w roku"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Pracownik dostaje urlop"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Liczba wnioskowanych dni urlopu"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Liczba wnioskowanych dni urlopu"
-
-#~ msgid "Report Options"
-#~ msgstr "Opcje raportu"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Jego zwierzchnik zaaprobował wniosek"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Urlopy wg pracowników"
-
-#~ msgid "Notification"
-#~ msgstr "Powiadomienie"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Drukuj podsumowanie urlopów"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Dzień rozpoczęcia urlopu"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Pracownik wypełnia wniosek o urlop"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendarz"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Pozwól przekroczyć limit"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Moje przysługujące urlopy"
-
-#~ msgid "Status"
-#~ msgstr "Stan"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Urlop został ustawiony w kalendarzu"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Ustaw urlop"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Moje wnioski urlopowe"
-
-#~ msgid "holidays."
-#~ msgstr "urlopy."
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Document for employee"
-#~ msgstr "Dokument dla pracownika"
-
-#~ msgid "Reufse"
-#~ msgstr "Odmów"
-
-#~ msgid "Section"
-#~ msgstr "Sekcja"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Moje wnioski urlopowe oczekujące na zatwierdzenie"
-
-#~ msgid "History"
-#~ msgstr "Historia"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Menedżer urlopów"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Nie możesz anulować tego wniosku. Najpierw musisz go zmienić na projekt."
-
-#~ msgid "Holidays Request"
-#~ msgstr "Wnioski urlopowe."
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Moje projekty wniosków urlopowych"
-
-#~ msgid "Approved Request"
-#~ msgstr "Zaaprobowane wnioski."
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Drukuj podsumowanie urlopów"
-
-#~ msgid "General Information"
-#~ msgstr "Informacje ogólne"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Request is approved."
-#~ msgstr "Wniosek aprobowano."
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Definicje urlopów"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Wprowadź liczbę przysługujących dni urlopu"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "ID wniosku urlopowego"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Proces urlopów"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Jego (Jej) zwierzchnik odrzucił wniosek"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Musisz wybrac co najmniej jeden dział. Spróbuj ponownie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Validate"
-#~ msgstr "Zatwierdź"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Oczekujące na zatwierdzenie"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Musisz wybrać co najmniej jednego pracownika. Spróbuj ponownie."
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Maksymalna liczba dni urlopowych"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Urlopy na użytkownika"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Rodzaj urlopu"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Rodzaje urlopu"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Formalny dokument deklaracji składanej przez nowego pracownika"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Zdefiniuj rodzaj urlopu"
-
-#~ msgid "Holiday status"
-#~ msgstr "Rodzaje urlopu"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Rodzaj urlopu"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Moje wnioski urlopowe - zatwierdzone"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "Jeśli urlop jest dostępny, to pracownik może o niego wnioskować"
-
-#~ msgid "Holidays user"
-#~ msgstr "Użytkownik urlopu"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Moje wnioski urlopowe - projekty"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Moje wnioski urlopowe - odrzucone"
-
-#~ msgid "Color of the status"
-#~ msgstr "Kolor dla rodzaju"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Moje wnioski urlopowe - odrzucone"
-
-#~ msgid "Case"
-#~ msgstr "Sprawa"
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Moje wnioski urlopowe - zatwierdzone"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Wszystkie wnioski urlopowe"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Wnioski urlopowe - czekające na zatwierdzenie"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Moje wnioski urlopowe"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Moje wnioski urlopowe"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Moje wnioski urlopowe - czekające na zatwierdzenie"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Wnioski urlopowe - czekające na zatwierdzenie"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Nowy wniosek urlopowy"
-
-#~ msgid "Taken Leaves"
-#~ msgstr "Wykorzystane urlopy"
-
-#~ msgid "March"
-#~ msgstr "Marzec"
-
-#~ msgid "Allocated Leaves"
-#~ msgstr "Zatwierdzony wymiar urlopu"
-
-#~ msgid "Leave Days"
-#~ msgstr "Dni urlopu"
-
-#~ msgid "Category's Name"
-#~ msgstr "Nazwa kategorii"
-
-#~ msgid "Validation User"
-#~ msgstr "Użytkownik zatwierdzający"
-
-#~ msgid ""
-#~ "If you link this type of leave with a category in the CRM, it will "
-#~ "synchronize each leave asked with a case in this category, to display it in "
-#~ "the company shared calendar for example."
-#~ msgstr ""
-#~ "Jeśli połączysz ten typ nieobecności z kategorią w CRM, to uzyskasz "
-#~ "synchronizację wniosków ze sprawami w danej kategorii, aby na przykład "
-#~ "wyświetlać je we współdzielonym kalendarzu."
-
-#~ msgid "July"
-#~ msgstr "Lipiec"
-
-#~ msgid "Remaining Leave by Type and User"
-#~ msgstr "Urlop do wykorzystania wg Typu i Użytkowników"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Kategoria pracownika"
-
-#~ msgid " Month "
-#~ msgstr " Miesiąc "
-
-#~ msgid "September"
-#~ msgstr "Wrzesień"
-
-#~ msgid "December"
-#~ msgstr "Grudzień"
-
-#~ msgid "Remaining Leaves by User"
-#~ msgstr "Pozostałe urlopy wg użytkowników"
-
-#~ msgid "Month"
-#~ msgstr "Miesiąc"
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 2542bb5a095..d2540a32fae 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -163,7 +163,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -199,7 +199,7 @@ msgstr "Relatório de resumo de férias, por empregado"
 #: 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 ""
+msgstr "Tipo de ausência"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
@@ -389,12 +389,12 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
-msgstr ""
+msgstr "Pedidos relacionados"
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Pai"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -444,7 +444,7 @@ msgstr "Coral claro"
 #: 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 "Férias por departamento"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -460,7 +460,7 @@ msgstr "Feriado"
 #: field:hr.holidays,case_id:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "Reunião"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -492,17 +492,17 @@ msgstr "Activo"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "Leaves To Validate"
-msgstr ""
+msgstr "Férias por validar"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros avançados..."
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr ""
+msgstr "O número de dias deve ser maior que zero !"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
@@ -546,7 +546,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Misc"
-msgstr ""
+msgstr "Diversos"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -702,7 +702,7 @@ msgstr "Violeta"
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
 msgid "Maximum Allowed"
-msgstr ""
+msgstr "Máximo permitido"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -766,325 +766,3 @@ msgstr "Para confirmar"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "Para aprovar"
-
-#~ msgid "Notification"
-#~ msgstr "Notificação"
-
-#~ msgid "Section"
-#~ msgstr "Secção"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definir estado das férias"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Imprimir resumo das Férias"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Minhas férias disponíveis"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Meus pedidos de férias recusados"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Pedidos aguardando validação"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Meus pedidos de férias aguardando confirmação"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "Resumo dos dias de folga"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Férias permitidas"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Máximo de saídas permitidas"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Meus pedidos de férias"
-
-#~ msgid "Color of the status"
-#~ msgstr "Cor do estado"
-
-#~ msgid "to"
-#~ msgstr "para"
-
-#~ msgid "draft"
-#~ msgstr "esboço"
-
-#~ msgid "holidays."
-#~ msgstr "holidays."
-
-#~ msgid "Case"
-#~ msgstr "Processo"
-
-#~ msgid "Employee_id"
-#~ msgstr "Employee_id"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Estado das férias"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Report Options"
-#~ msgstr "Opções de relatório"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Meus esboços de pedidos de férias"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Meus pedidos de férias"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Meus pedidos de férias aguardando confirmação"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Estado das férias"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Gestor de férias"
-
-#~ msgid "Analyze from"
-#~ msgstr "Analisar de"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Resumo das férias"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Número de dias neste pedido de férias"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Férias por empregado"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Você deve escolher pelo menos 1 empregado. Tente novamente."
-
-#~ msgid "Holidays Request"
-#~ msgstr "Pedido de férias"
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Meu pedido de férias validado"
-
-#~ msgid "Holiday status"
-#~ msgstr "Estado das férias"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Meu esboço de pedido de férias"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Imprimir o resumo das férias do empregado"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Data de início das férias"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Data de término das férias"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Estado das férias"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Pedidos de férias aguardando validação"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Todos os pedidos de férias"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Meus pedidos de férias validados"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Meus pedidos de férias recusados"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Férias por utilizador"
-
-#~ msgid "of the"
-#~ msgstr "dos"
-
-#~ msgid "Both"
-#~ msgstr "Ambos"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Gestão de ferias"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "Documento de declaração legal para declarar o novo empregado"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Seu gerente aprova o pedido"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "Codificação de feriados anuais disponíveis."
-
-#~ msgid "Calendar"
-#~ msgstr "Calendário"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "Se feriados disponíveis, o empregado pode toma-lo e preenche-lo."
-
-#~ msgid "Request is refused."
-#~ msgstr "O pedido foi recusado."
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Declaração do empregado"
-
-#~ msgid "Refused Request"
-#~ msgstr "Pedido recusado"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Feria foi definido no calendário"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Permitir que passe o limite"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "O empregado obtém ferias"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "O empregado preenche um pedido para feria"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Novo pedido de ferias"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Ferias dos empregados"
-
-#~ msgid "Approved Request"
-#~ msgstr "Pedido aprovado"
-
-#~ msgid "Document for employee"
-#~ msgstr "Documento para o empregado"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Definir feria"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "A feria é definido no calendário"
-
-#~ msgid "Reufse"
-#~ msgstr "Recusar"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Seu gerente recusa o pedido"
-
-#~ msgid "Request is approved."
-#~ msgstr "Pedido aprovado"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Definições de ferias"
-
-#~ msgid "Secretariat Social"
-#~ msgstr "Secretariado social"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Você tem que seleccionar pelo menos 1 departamento. Tenteoutra vez."
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Codificar o numero de ferias disponíveis"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitectura de vista"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
-
-#~ msgid "General Information"
-#~ msgstr "Informação Generica"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "A aguardar validação"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da acção"
-
-#~ msgid "Category Of employee"
-#~ msgstr "Categoria do empregado"
-
-#~ msgid "March"
-#~ msgstr "Março"
-
-#~ msgid "Category's Name"
-#~ msgstr "Nome da categoria"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Alerta!"
-
-#~ msgid "Validation User"
-#~ msgstr "Utilizador de validação"
-
-#~ msgid " Month "
-#~ msgstr " Mês "
-
-#~ msgid "July"
-#~ msgstr "Julho"
-
-#~ msgid "September"
-#~ msgstr "Setembro"
-
-#~ msgid "December"
-#~ msgstr "Dezembro"
-
-#~ msgid "Month"
-#~ msgstr "Mês"
-
-#~ msgid "Available Holidays"
-#~ msgstr "Dias de férias disponíveis"
-
-#~ msgid " Year "
-#~ msgstr " Ano "
-
-#~ msgid "January"
-#~ msgstr "Janeiro"
-
-#~ msgid "October"
-#~ msgstr "Outubro"
-
-#~ msgid "November"
-#~ msgstr "Novembro"
-
-#~ msgid "August"
-#~ msgstr "Agosto"
-
-#~ msgid "June"
-#~ msgstr "Junho"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid ""
-#~ "Start date should not be larger than end date!\n"
-#~ "Number of Days should be greater than 1!"
-#~ msgstr ""
-#~ "A date de início não pode ser superior à de fim!\n"
-#~ "O número de dias tem de ser superior a 1!"
-
-#~ msgid "Day"
-#~ msgstr "Dia"
-
-#~ msgid "May"
-#~ msgstr "Maio"
-
-#~ msgid "February"
-#~ msgstr "Fevereiro"
-
-#~ msgid "April"
-#~ msgstr "Abril"
-
-#~ msgid "Employee's Name"
-#~ msgstr "Nome do empregado"
-
-#~ msgid "Year"
-#~ msgstr "Ano"
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 26a03fe2e4c..8997cd9c2dc 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,16 +767,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Aviso !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-#~ "especial!"
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index b09ae438a32..98545c75e04 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -7,56 +7,56 @@ 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-02-20 19:44+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2011-09-02 15:18+0000\n"
+"Last-Translator: Ciprian Panaite <Unknown>\n"
 "Language-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-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Blue"
-msgstr ""
+msgstr "Albastru"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr ""
+msgstr "Typul alocării"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr ""
+msgstr "Se așteaptă a doua aprobare"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "Maximum de concedii permise - Concedii deja luate"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "Administrarea concediilor"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupează după..."
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
-msgstr ""
+msgstr "Concediu medical"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departament"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -66,7 +66,7 @@ msgstr "Refuzat"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Categoria angajatului"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -76,12 +76,12 @@ msgstr "Maro"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr ""
+msgstr "Zile rămase"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr ""
+msgstr "De către angajat"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -89,6 +89,8 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
+"Administratorul de concedii poate lăsa acest câmp necompletat dacă această "
+"cerere/alocare de concediu este pentru fiecare angajat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -120,11 +122,15 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"Cererile de concediu pot fi înregistrate de către angajați și validate de "
+"către șefii lor. Odată ce o cerere de concediu este validată, ea apare "
+"automat în agenda angajatului. Se pot defini multiple tipuri de permisiuni "
+"(concedii plătite, medicale etc.) si se pot administra după tip."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr ""
+msgstr "Sumar al concediilor"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -143,27 +149,28 @@ msgstr "Refuzat"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
+"Nu puteți valida concediul pentru angajatul %s: prea puține zile rămase (%s)."
 
 #. module: hr_holidays
 #: view:board.board:0
 #: view:hr.holidays:0
 msgid "Leaves"
-msgstr ""
+msgstr "Concedii"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 msgid "Leave"
-msgstr ""
+msgstr "Concediu"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr ""
+msgstr "Concedii dupădepartament"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulată"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -172,21 +179,24 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"Selectați 'Cerere de concediu' cănd cineva dorește o zi liberă. \n"
+"Selectați 'Cerere de alocare' dacă doriți să mariți să mariți numarul de "
+"concedii disponibile pentru cineva"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validare"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Culoare în raport"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr ""
+msgstr "Sumar al concediilor pe angajat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -199,24 +209,24 @@ msgstr ""
 #: 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 ""
+msgstr "Tipul de concediu"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
 #: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Atenţie!"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Ciornă"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr ""
+msgstr "Purpuriu"
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -226,12 +236,17 @@ msgid ""
 "'Waiting Approval'.            If the admin accepts it, the state is "
 "'Approved'. If it is refused, the state is 'Refused'."
 msgstr ""
+"Când cererea de concediu este creată, are statut de 'Ciornă'.\n"
+" Este confirmată de către utilizator și cererea este trimisă "
+"administratorului, cu statut de 'Aprobare în așteptare'. Daca "
+"administratorul o acceptă, primeste statutul 'Aprobat'. Dacă este refuzată, "
+"va avea statutul  'Respins'."
 
 #. 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 ""
+msgstr "trebuie să selectați cel puțin un departament. Și încercați din nou."
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -253,7 +268,7 @@ msgstr "Confirmă"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "Data de început trebuie să fie anterioară datei de sfârșit."
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -291,6 +306,40 @@ msgid ""
 "            for example, you maybe will do it for the user 'admin'\n"
 "            .\n"
 msgstr ""
+"Departamentul Personal: Monitorizarea concediilor și a fluxului forței de "
+"muncă\n"
+"\n"
+"   Acest modul vă permite să administrați concediile și cererile de "
+"concediu.\n"
+"    Implements a dashboard for human resource management that includes.\n"
+"        * My Leaves\n"
+"        * My Expenses\n"
+"    Note that:\n"
+"    - 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 "
+"set up this info and your colour preferences in\n"
+"                HR / Configuration / Holidays Status\n"
+"    - 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).\n"
+"    - There are two ways to print the employee's holidays:\n"
+"        * The first will allow to choose employees by department and is used "
+"by clicking the menu item located in\n"
+"                HR / Holidays Request / Print Summary of Holidays\n"
+"        * The second will allow you to choose the holidays report for "
+"specific employees. Go on the list\n"
+"                HR / Employees / Employees\n"
+"            then select the ones you want to choose, click on the print icon "
+"and select the option\n"
+"                'Print Summary of Employee's Holidays'\n"
+"    - The wizard allows you to choose if you want to print either the "
+"Confirmed & Validated holidays or only the Validated ones. 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\n"
+"                Administration / Users / Users\n"
+"            for example, you maybe will do it for the user 'admin'\n"
+"            .\n"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
@@ -301,12 +350,12 @@ msgstr "Concedii disponibile"
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
-msgstr ""
+msgstr "Stare"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "Totalul vacantelor după tip"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -318,7 +367,7 @@ msgstr "Salariat"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -328,17 +377,17 @@ msgstr "Roșu"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr ""
+msgstr "Plecări după tip"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
-msgstr ""
+msgstr "Somon deschis"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr ""
+msgstr "Grâu"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
@@ -355,7 +404,7 @@ msgstr "Număr de zile"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Cauta tip de plecari"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -372,7 +421,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Așteaptă aprobare"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -394,18 +443,18 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Părinte"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr ""
+msgstr "Lavandă"
 
 #. module: hr_holidays
 #: 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 "Cereri plecari"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
@@ -416,12 +465,12 @@ msgstr ""
 #: 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 "Vacantele angajatului"
 
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,max_leaves:0
@@ -454,29 +503,29 @@ msgstr "Negru"
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "Vacanță"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "Întâlnire"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Ivory"
-msgstr ""
+msgstr "Sidefiu"
 
 #. 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 ""
+msgstr "Validat și confirmat"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr ""
+msgstr "Libere deja luate"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -497,7 +546,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtre extinse..."
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -524,7 +573,7 @@ msgstr ""
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Eroare"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -546,18 +595,18 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Misc"
-msgstr ""
+msgstr "Altele"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "Motive"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -568,7 +617,7 @@ msgstr ""
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anulare"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
@@ -582,7 +631,7 @@ msgstr ""
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "Validat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -604,12 +653,12 @@ msgstr ""
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Print"
-msgstr ""
+msgstr "Tipărire"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "Detalii"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
@@ -630,7 +679,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descriere"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -653,7 +702,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Selecteaza tipul concediului"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
@@ -663,12 +712,12 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "Departament(e)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "This Month"
-msgstr ""
+msgstr "Luna curentă"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
@@ -678,7 +727,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Dată de sfârșit"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
@@ -697,7 +746,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "Violet"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -729,12 +778,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobare"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de început"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
@@ -745,17 +794,17 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "Galben deschis"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "Roz deschis"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -765,25 +814,4 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Alerta !"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Nu puteti anula aceasta cerere de concediu. Trebuie mai intai sa o aduceti "
-#~ "la starea de schita."
-
-#~ msgid "History"
-#~ msgstr "Istoric"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Cererile mele de concediu in asteaptarea confirmarii"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Istoric concedii"
+msgstr "De aprobat"
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index d6c55775888..7d085049be5 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,261 +767,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Notification"
-#~ msgstr "Уведомление"
-
-#~ msgid "Section"
-#~ msgstr "Раздел"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Color of the status"
-#~ msgstr "Цвет статуса"
-
-#~ msgid "draft"
-#~ msgstr "черновик"
-
-#~ msgid "Employee_id"
-#~ msgstr "ID сотрудника"
-
-#~ msgid "Validate"
-#~ msgstr "Проверить"
-
-#~ msgid "Notes"
-#~ msgstr "Примечания"
-
-#~ msgid "Report Options"
-#~ msgstr "Параметры отчета"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Выберите хотя бы 1 сотрудника. Повторите попытку."
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Разрешено отпусков"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Распечатать сводку отпустков"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Мои доступные отпуска"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Статус отпуска"
-
-#~ msgid "to"
-#~ msgstr "до"
-
-#~ msgid "holidays."
-#~ msgstr "отпусков."
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Отпусков на сотрудника"
-
-#~ msgid "Analyze from"
-#~ msgstr "Анализировать с"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Сводка отпусков"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Количество дней в данном заявлении на отпуск"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Мои заявления на отпуск"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "Мои заявления на отпуск в ожидании подтверждения"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Статус отпуска"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Мой черновик заявления на отпуск"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Распечатать сводку отпусков сотрудников"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Мои отклоненные заявления на отпуск"
-
-#~ msgid "of the"
-#~ msgstr "из"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Заявление на отпуск"
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Мои проверенные заявления на отпуск"
-
-#~ msgid "Holiday status"
-#~ msgstr "Статус отпуска"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Первый день отпуска"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Все заявления на отпуск"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Последний день отпуска"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Статус отпусков"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Заявления на отпуск в ожидании проверки"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Мои проверенные заявления на отпуск"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Заявления, ожидающие проверки"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Мои отклоненные заявления на отпуск"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Мои заявления на отпуск в ожидании подтверждения"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Внимание!"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Управление отпусками"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "Отпуск установлен в календаре"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Отпусков на пользователя"
-
-#~ msgid "Refused Request"
-#~ msgstr "Запрос, которому отказывают."
-
-#~ msgid "Request is refused."
-#~ msgstr "На запрос отказано."
-
-#~ msgid "Employee Declaration"
-#~ msgstr "Заявления сотрудника"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Новое заявление на отпуск"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Отпуска сотрудника"
-
-#~ msgid "Holidays user"
-#~ msgstr "Отпуска пользователя"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Мои запросы отпусков"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Его менеджер одобряет запрос"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "Если доступен отпуск, служащий может взять и заполнить это."
-
-#~ msgid "Date"
-#~ msgstr "Дата"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Отпуск установлен в календаре."
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "Максимально позволенные отпуска"
-
-#~ msgid "Document for employee"
-#~ msgstr "Документ для сотрудника"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Установить отпуск"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Сотрудник заполняется в запросе об отпусках"
-
-#~ msgid "Calendar"
-#~ msgstr "Календарь"
-
-#~ msgid "Log Holidays"
-#~ msgstr "Регистрации Отпуска"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr ""
-#~ "Вы не можете отменить этот запрос на отпуск. Сначала Вы должны перевести  в "
-#~ "состояние Черновик."
-
-#~ msgid "Holiday manager"
-#~ msgstr "Ответственный за график отпусков"
-
-#~ msgid "Approved Request"
-#~ msgstr "Одобренный Запрос"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "Определение запросов на отпуск"
-
-#~ msgid "History"
-#~ msgstr "Журнал"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "ID запроса на отпуск"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "Его менеджер отказывает по запросу"
-
-#~ msgid "Request is approved."
-#~ msgstr "Запрос одобрен."
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Определение отпусков"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "Расшифровать число имеющихся отпусков"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Вы должны выбрать по крайней мере один отдел. Попробуйте еще раз."
-
-#~ msgid "Holidays Process"
-#~ msgstr "Процесс отпусков"
-
-#~ msgid "hr.holidays.log"
-#~ msgstr "Регистрация отпусков"
-
-#~ msgid "Reufse"
-#~ msgstr "Отказать"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Both"
-#~ msgstr "Оба"
-
-#~ msgid "Ok"
-#~ msgstr "Ок"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Мои черновые заявления на отпуск"
-
-#~ msgid "Status"
-#~ msgstr "Состояние"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Мои заявления на отпуск"
-
-#~ msgid "General Information"
-#~ msgstr "Общая информация"
-
-#~ msgid "Case"
-#~ msgstr "Вопрос"
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 110c662f07b..d8dded436b0 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,81 +766,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Notification"
-#~ msgstr "Obvestilo"
-
-#~ msgid "Color of the status"
-#~ msgstr "Barva stanja"
-
-#~ msgid "Notes"
-#~ msgstr "Opombe"
-
-#~ msgid "Report Options"
-#~ msgstr "Možnosti poročila"
-
-#~ msgid "Ok"
-#~ msgstr "V redu"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Vsi zahtevki za praznike"
-
-#~ msgid "to"
-#~ msgstr "v"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "Opozorilo!"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Nov zahtevek za praznik"
-
-#~ msgid "Validate"
-#~ msgstr "Potrdi"
-
-#~ msgid "Both"
-#~ msgstr "Oba"
-
-#~ msgid "Refused Request"
-#~ msgstr "Zavrni zahtevek"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "Izbrati morate vsaj enega zaposlenca. Poskusite znova."
-
-#~ msgid "Calendar"
-#~ msgstr "Koledar"
-
-#~ msgid "draft"
-#~ msgstr "osnutek"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Reufse"
-#~ msgstr "Zavrni"
-
-#~ msgid "History"
-#~ msgstr "Zgodovina"
-
-#~ msgid "Approved Request"
-#~ msgstr "Odobren zahtevek"
-
-#~ msgid "General Information"
-#~ msgstr "Splošne informacije"
-
-#~ msgid "Case"
-#~ msgstr "Primer"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Moj zahtevek za dopust"
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index cbddd96657b..45692714040 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index a796f365994..f456ab5883d 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:28+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index 56f50bc7e16..3b3827bdea5 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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index c49b809584f..11c5cb4ef76 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,279 +766,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Den anställdes semestrar"
-
-#~ msgid "Validate"
-#~ msgstr "Bekräfta"
-
-#~ msgid "Both"
-#~ msgstr "Båda"
-
-#~ msgid "Refused Request"
-#~ msgstr "Nekad ansökan"
-
-#~ msgid "to"
-#~ msgstr "till"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "Semesterstatus"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Notes"
-#~ msgstr "Anteckningar"
-
-#~ msgid "Holidays Management"
-#~ msgstr "Semesterhantering"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "Semesteröversikt"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "Semestern är godkänd"
-
-#~ msgid "Vacation end day"
-#~ msgstr "Semesterns slutdatum"
-
-#~ msgid "Holidays Status"
-#~ msgstr "Semesterstatus"
-
-#~ msgid "Define holiday status"
-#~ msgstr "Definiera semeserstatus"
-
-#~ msgid "Holiday status"
-#~ msgstr "Semesterstatus"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "Semester per användare"
-
-#~ msgid "Employee_id"
-#~ msgstr "Anställningsid"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "Väntar på beslut"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "Antal begärda semestrar"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "Den anställde får semestrar"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "Mina semesteransökningar"
-
-#~ msgid "Report Options"
-#~ msgstr "Rapportinställningar"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "Hans chef godkänner begäran"
-
-#~ msgid "Holiday Status"
-#~ msgstr "Semesterstatus"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Semestrar per anställd"
-
-#~ msgid "Vacation start day"
-#~ msgstr "Semesterns startdatum"
-
-#~ msgid "Holidays user"
-#~ msgstr "Semesteranvändare"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Skriv ut den anställdes semesteröversikt"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalender"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "Godkänn att gränsen överskrids"
-
-#~ msgid "Notification"
-#~ msgstr "Anmärkning"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Mina preliminära semesteransökningar"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mina tillgängliga semestrar"
-
-#~ msgid "Set Holiday"
-#~ msgstr "Definiera semester"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "Den anställde registrerar en semesteransökan"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "Mina semesteransökningar"
-
-#~ msgid "Color of the status"
-#~ msgstr "Statusfärg"
-
-#~ msgid "draft"
-#~ msgstr "preliminär"
-
-#~ msgid "holidays."
-#~ msgstr "semestrar."
-
-#~ msgid "Document for employee"
-#~ msgstr "Den anställdes dokument"
-
-#~ msgid "Section"
-#~ msgstr "Område"
-
-#~ msgid "Holiday manager"
-#~ msgstr "Semesteransvarig"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Approved Request"
-#~ msgstr "Godkänd ansökning"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Semesteransökningar som väntar på beslut"
-
-#~ msgid "Holidays Request"
-#~ msgstr "Semesteransökan"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "Mina preliminära semesteransökningar"
-
-#~ msgid "Reufse"
-#~ msgstr "Vägra"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "Skriv ut semesteröversikt"
-
-#~ msgid "General Information"
-#~ msgstr "Allmän information"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "Mina nekade semesteransökningar"
-
-#~ msgid "Holiday per user"
-#~ msgstr "Semester per användare"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "Semesterdefinition"
-
-#~ msgid "Request is approved."
-#~ msgstr "Ansökan har godkänts."
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "Semesteransökan id"
-
-#~ msgid "Holidays Process"
-#~ msgstr "Semesterprocess"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "Du måste välja minst 1 avdelning. Försök igen."
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "Mina beslutade semesteransökningar"
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "Ansökan väntar på beslut"
-
-#~ msgid "Request is refused."
-#~ msgstr "Ansökan är inte godkänd."
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "Antal dagar för denna semesteransökan"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Ny semesteransökan"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "Mina semesteransökningar"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Alla semeseransökningar"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Mina semesteransökningar som väntar på beslut"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Mina beslutade semesteransökningar"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 01a5908d19b..c11d9852601 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -767,12 +767,3 @@ msgstr "ให้การยืนยัน"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "ให้การอนุมัติ"
-
-#~ msgid "Employee_id"
-#~ msgstr "รหัสพนักงาน"
-
-#~ msgid "Calendar"
-#~ msgstr "ปฏิทิน"
-
-#~ msgid "Status"
-#~ msgstr "สถานะ"
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index 067c0532164..c9af4c1ef40 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 108f3ed9b0a..6a09dda0dbf 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,102 +766,3 @@ msgstr ""
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "Yeni İzin Talebi"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "Tüm İzin Talepleri"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "Personel İzinleri"
-
-#~ msgid "Validate"
-#~ msgstr "Onayla"
-
-#~ msgid "Both"
-#~ msgstr "Her ikisi"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "İzin Taleplerim"
-
-#~ msgid "Notes"
-#~ msgstr "Notlar"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "İzin Durumu"
-
-#~ msgid "Holidays Management"
-#~ msgstr "İzin Yönetimi"
-
-#~ msgid "Holiday status"
-#~ msgstr "İzin durumu"
-
-#~ msgid "Holidays Status"
-#~ msgstr "İzin Durumu"
-
-#~ msgid "Define holiday status"
-#~ msgstr "İzin Durumu Tanımla"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "Onay Bekleyen İzin Taleplerim"
-
-#~ msgid "Holiday Status"
-#~ msgstr "İzin Durumu"
-
-#~ msgid "Report Options"
-#~ msgstr "Rapor Seçenekleri"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "Onaylanan İzin Taleplerim"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "Personele Ait İzinler"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "Personelin İzin Özetini Yazdır"
-
-#~ msgid "Calendar"
-#~ msgstr "Takvim"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "Takvimdeki Tatiller."
-
-#~ msgid "My Available Holidays"
-#~ msgstr "Mevcut İzinlerim"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "Reddedilen İzin Taleplerim"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "Taslak olan İzin Taleplerim"
-
-#~ msgid "Status"
-#~ msgstr "Durum"
-
-#~ msgid "draft"
-#~ msgstr "Taslak"
-
-#~ msgid "Document for employee"
-#~ msgstr "Personel Dökümanı"
-
-#~ msgid "Date"
-#~ msgstr "Tarih"
-
-#~ msgid "Section"
-#~ msgstr "Bölüm"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "Onay Bekleyen İzin Talepleri"
-
-#~ msgid "General Information"
-#~ msgstr "Genel Bilgiler"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "İzin Özeti Yazdır"
-
-#~ msgid "Case"
-#~ msgstr "Servis Talebi"
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 09094106f24..b1ba8d6b150 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index 30976eb55d4..f054f3b3fab 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-06-04 23:20+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-06-06 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 048e4dd559d..70632069c14 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -8,65 +8,65 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-10-30 09:08+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Blue"
-msgstr ""
+msgstr "蓝"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr ""
+msgstr "分配类型"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr ""
+msgstr "等待第二次审批"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "最大允许的假期 - 已取得的假期"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "假期管理"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
-msgstr ""
+msgstr "病假"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "部门"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Refused"
-msgstr "被拒绝"
+msgstr "已拒绝"
 
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "员工类型"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -76,19 +76,19 @@ msgstr "棕"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr ""
+msgstr "剩余天数"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr ""
+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 ""
+msgstr "如果这准假分配给所有员工，准假管理者允许这字段为空。"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -120,17 +120,18 @@ msgid ""
 "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 ""
+msgstr "准假摘要"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
-msgstr "已核准"
+msgstr "已审批"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -142,28 +143,28 @@ msgstr "拒绝"
 #, python-format
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
-msgstr ""
+msgstr "你不能生效员工 employee %s 的准假：因为其剩余的天数少于 days (%s)。"
 
 #. module: hr_holidays
 #: view:board.board:0
 #: view:hr.holidays:0
 msgid "Leaves"
-msgstr ""
+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_account_central_journal
 msgid "Leaves by Department"
-msgstr ""
+msgstr "部门的准假"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -172,21 +173,23 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"如果有人想休息，选择“准假申请”。\n"
+"如果有人想增加准假的天数，选择“分配准假”"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "审核"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "报表中的颜色"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr ""
+msgstr "员工假期摘要报表"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -199,19 +202,19 @@ msgstr ""
 #: 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 ""
+msgstr "准假类型"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
 #: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -226,12 +229,16 @@ msgid ""
 "'Waiting Approval'.            If the admin accepts it, the state is "
 "'Approved'. If it is refused, the state is 'Refused'."
 msgstr ""
+"当假期申请建立时为“草稿”。\n"
+"当用户确认它，并把申请发给admin时状态为“等待审批”，\n"
+"如果admin接受，它的状态为“已审批”。\n"
+"如果被拒绝它的状态为“已拒绝”。"
 
 #. 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 ""
+msgstr "您至少得选一个部门，请再试。"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -243,7 +250,7 @@ msgstr "已确认"
 #: field:hr.holidays.summary.dept,date_from:0
 #: field:hr.holidays.summary.employee,date_from:0
 msgid "From"
-msgstr "从"
+msgstr "来自"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -253,7 +260,7 @@ msgstr "确认"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "开始日期必须在结束日期前！"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -291,22 +298,36 @@ msgid ""
 "            for example, you maybe will do it for the user 'admin'\n"
 "            .\n"
 msgstr ""
+"人力资源：节假日跟踪和工作流程\n"
+"    这模块允许您管理准假和准假申请。\n"
+"        * 我的准假\n"
+"        * 我的费用\n"
+"    备注：\n"
+"    - （使用CRM模块）可以同步内部的日程：当同意假期申请时在事务里您能链接这假期的状况。您能设定其信息和偏好的颜色。\n"
+"           人力资源/设置/节假日状况。\n"
+"      - 一个员工把多个休息日类型合并成一个新的分配准假，它将增加可获得的准假类型。（如果通过）\n"
+"      - 有两个办法打印员工的假期：\n"
+"          * 第一个方法按部门选择员工并点击菜单（人力资源’假期申请/打印节假日摘要）。\n"
+"          * 第二个方法允许你选在具体员工的假期报表（人力资源/员工）选择员工后点击打印按钮选择”“打印员假期摘要”。\n"
+"      - "
+"向导可以让您选择打印确认并生效的假期或者看确认或只看生效的，但必须是人力资源组的用户，您可以在“管理/用户”的安全标签里更改用户的数据。\n"
+"             例如你可能把用户定义为admin\n"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr "剩余休假"
+msgstr "剩余准假"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "这类型假期的合计"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -318,7 +339,7 @@ msgstr "员工"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -328,7 +349,7 @@ msgstr "红色"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr ""
+msgstr "准假类型"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -338,12 +359,12 @@ msgstr "浅橙红色"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr "淡黄色"
+msgstr "麦黄色"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "错误！准假的开始日期必须小于结束日期。"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -355,24 +376,24 @@ msgstr "天数"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "查找准假类型"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "您必须选择一个员工或分类"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
 "If its True then its Allocation/Request have to be validated by second "
 "validator"
-msgstr ""
+msgstr "如果为真，分配 / 申请要二次审核才能生效。"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "等待审批"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -384,17 +405,17 @@ msgstr "员工"
 msgid ""
 "If you set a meeting type, OpenERP will create a meeting in the calendar "
 "once a leave is validated."
-msgstr ""
+msgstr "如果您设置了会议类型，系统将在会议日程内使准假生效。"
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
-msgstr ""
+msgstr "链接申请"
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "上一级"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -405,35 +426,35 @@ msgstr "淡紫色"
 #: 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 "准假申请"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+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 ""
+msgstr "员工假期"
 
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+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 ""
+msgstr "这个值给出了所有的假期申请的总和，它是一个正值。"
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr ""
+msgstr "所有员工的准假"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -444,7 +465,7 @@ msgstr "浅珊瑚色"
 #: 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 "部门的假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -454,13 +475,13 @@ msgstr "黑色"
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "假期"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "会议"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -471,12 +492,12 @@ msgstr "象牙白"
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr "批准和确认"
+msgstr "生效和确认"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "休假已得到"
+msgstr "准假已通过"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -487,44 +508,44 @@ msgstr "用户"
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "Leaves To Validate"
-msgstr ""
+msgstr "准假等待生效"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr ""
+msgstr "天数必须大于0！"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "首次审批"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Casual Leave"
-msgstr ""
+msgstr "事假"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr ""
+msgstr "准假摘要"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -534,19 +555,19 @@ msgstr "浅蓝"
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+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 ""
+msgstr "如果生效字段设置为假，它将隐藏而不是删除这准假类型。"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Misc"
-msgstr ""
+msgstr "其他"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -557,12 +578,12 @@ msgstr "通用"
 #: view:hr.holidays:0
 #: field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "原因"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "准假分析"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -575,30 +596,30 @@ msgstr "取消"
 msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
-msgstr ""
+msgstr "这颜色将用在准假摘要位置在：报告/部门准假。"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
-msgstr "确认"
+msgstr "已生效"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "分配准假"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "准假详情"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "要两次生效"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -609,23 +630,23 @@ msgstr "打印"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "详细信息"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr ""
+msgstr "我的准假"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "按员工分类"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "准假申请"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
@@ -637,18 +658,18 @@ msgstr "说明"
 msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
-msgstr ""
+msgstr "按员工：按个别员工分配/申请，按员工分类：员工分类分配/申请。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr ""
+msgstr "您不能删除这个准假，因为它不是在草稿状态。"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "查找准假"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
@@ -658,7 +679,7 @@ msgstr "选择假期类型"
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "剩余的准假"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -668,79 +689,79 @@ msgstr "部门"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "This Month"
-msgstr ""
+msgstr "本月"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "第二次审批"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
 "If you tick this checkbox, the system will allow, for this section, the "
 "employees to take more leaves than the available ones."
-msgstr ""
+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 ""
+msgstr "这值是给出假期申请的总和，它是一个负数。"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr "紫罗兰色"
+msgstr "紫色"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
 msgid "Maximum Allowed"
-msgstr ""
+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 ""
+msgstr "这个地方是自动填充的谁第二次生效这准假。（如果要两次生效）"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr "人力资源:假期管理"
+msgstr "人力资源:节假日管理"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "人力资源部门假期摘要报表"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automaticly filled by the user who validate the leave"
-msgstr ""
+msgstr "这里自动填充谁生效这准假"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "审批"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "分配准假"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -755,338 +776,14 @@ msgstr "浅粉红色"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr ""
+msgstr "经理"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Confirm"
-msgstr ""
+msgstr "待确认"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
-
-#~ msgid "Requests Awaiting for Validation"
-#~ msgstr "申请等待批准"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "警告！"
-
-#~ msgid "Refused Request"
-#~ msgstr "拒绝申请"
-
-#~ msgid "Ok"
-#~ msgstr "确定"
-
-#~ msgid "Notes"
-#~ msgstr "备注"
-
-#~ msgid "Report Options"
-#~ msgstr "报表选项"
-
-#~ msgid "Notification"
-#~ msgstr "通知"
-
-#~ msgid "Status"
-#~ msgstr "状态"
-
-#~ msgid "Document for employee"
-#~ msgstr "员工文档"
-
-#~ msgid "Reufse"
-#~ msgstr "拒绝"
-
-#~ msgid "My Holidays Request Waiting confirmation"
-#~ msgstr "我等待确认的假日申请"
-
-#, python-format
-#~ msgid ""
-#~ "You can not cancel this holiday request. first You have to make its case in "
-#~ "draft state."
-#~ msgstr "您不能取消该假日申请，您应先把它置于草稿状态。"
-
-#~ msgid "History"
-#~ msgstr "历史记录"
-
-#~ msgid "Case"
-#~ msgstr "事务"
-
-#~ msgid "New Holidays Request"
-#~ msgstr "新的假期申请"
-
-#~ msgid "of the"
-#~ msgstr "这"
-
-#~ msgid "Off-Days' Summary"
-#~ msgstr "休息日摘要"
-
-#~ msgid "Employee Holidays"
-#~ msgstr "员工假期"
-
-#~ msgid "to"
-#~ msgstr "到"
-
-#~ msgid "Employee Declaration"
-#~ msgstr "员工申请"
-
-#~ msgid "My Holidays Requests"
-#~ msgstr "我的假期申请"
-
-#~ msgid "Holiday's Status"
-#~ msgstr "假期状态"
-
-#~ msgid "Request is refused."
-#~ msgstr "申请拒绝"
-
-#~ msgid "Holidays Management"
-#~ msgstr "假期管理"
-
-#~ msgid "Summary Of Holidays"
-#~ msgstr "假期摘要"
-
-#~ msgid "The holiday is set in the calendar"
-#~ msgstr "这假期设到日程表"
-
-#~ msgid "Holiday status"
-#~ msgstr "假期状态"
-
-#~ msgid "Holidays Status"
-#~ msgstr "假期状态"
-
-#~ msgid "Legal Declaration Document to declare new employee"
-#~ msgstr "法定的新员工"
-
-#~ msgid "Holidays Per User"
-#~ msgstr "每个用户的假期"
-
-#~ msgid "Define holiday status"
-#~ msgstr "设定假期状态"
-
-#~ msgid "My Awaiting Confirmation Holidays Requests"
-#~ msgstr "我等待确认的假期申请"
-
-#~ msgid "Employee_id"
-#~ msgstr "员工_ID"
-
-#~ msgid "Waiting Validation"
-#~ msgstr "等待批准"
-
-#~ msgid "Employee get holidays"
-#~ msgstr "员工获得假期"
-
-#~ msgid "Number of Holidays Requested"
-#~ msgstr "申请的假期编号"
-
-#~ msgid "My Holiday Requests"
-#~ msgstr "我的假期申请草稿"
-
-#~ msgid "Holiday Status"
-#~ msgstr "假期状态"
-
-#~ msgid "My Validated Holidays Requests"
-#~ msgstr "我批准的假期申请"
-
-#~ msgid "Number of Days in this Holiday Request"
-#~ msgstr "申请的假期天数"
-
-#~ msgid "Holidays Per Employee"
-#~ msgstr "每个员工的假期"
-
-#~ msgid "Holidays user"
-#~ msgstr "用户假期"
-
-#~ msgid "Print Summary of Employee's Holidays"
-#~ msgstr "打印员工假期摘要"
-
-#~ msgid "Employee fills in a request for holidays"
-#~ msgstr "员工填写假期申请"
-
-#~ msgid "My Available Holidays"
-#~ msgstr "我可用的假期"
-
-#~ msgid "Set Holiday"
-#~ msgstr "设定假期"
-
-#~ msgid "My Draft Holidays Requests"
-#~ msgstr "我的假期申请草稿"
-
-#~ msgid "Color of the status"
-#~ msgstr "状态颜色"
-
-#~ msgid "holidays."
-#~ msgstr "假期"
-
-#~ msgid "draft"
-#~ msgstr "草稿"
-
-#~ msgid "Date"
-#~ msgstr "日期"
-
-#~ msgid "Section"
-#~ msgstr "部分"
-
-#~ msgid "Holiday manager"
-#~ msgstr "假期管理"
-
-#~ msgid "Action"
-#~ msgstr "行动"
-
-#~ msgid "My Holidays Request Draft"
-#~ msgstr "我的假期申请草稿"
-
-#~ msgid "Holidays Request"
-#~ msgstr "假期申请"
-
-#~ msgid "Holidays Requests Awaiting for Validation"
-#~ msgstr "假期申请等待批准"
-
-#~ msgid "General Information"
-#~ msgstr "一般信息"
-
-#~ msgid "Holidays def Request"
-#~ msgstr "假期申请定义"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#~ msgid "Print Summary of Holidays"
-#~ msgstr "打印假期摘要"
-
-#~ msgid "Request is approved."
-#~ msgstr "申请批准"
-
-#~ msgid "Holidays Definition"
-#~ msgstr "假期定义"
-
-#~ msgid "Holiday per user"
-#~ msgstr "每个用户的假期"
-
-#~ msgid "Holidays Process"
-#~ msgstr "假期处理"
-
-#~ msgid "My Holidays Request Validated"
-#~ msgstr "我批准的假期申请"
-
-#~ msgid "Holiday Request ID"
-#~ msgstr "假期申请ID"
-
-#~ msgid "All Holidays Requests"
-#~ msgstr "所有假期申请"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "在动作定义中使用了无效的模快名。"
-
-#~ msgid "Validate"
-#~ msgstr "确认"
-
-#~ msgid "Both"
-#~ msgstr "双方"
-
-#~ msgid "Analyze from"
-#~ msgstr "从分析"
-
-#~ msgid "Holidays Allowed"
-#~ msgstr "假期已批准"
-
-#~ msgid "Vacation end day"
-#~ msgstr "假期结束日期"
-
-#~ msgid "Encoding of annual available holidays."
-#~ msgstr "每年可得到的假期编码"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效的视图结构xml文件!"
-
-#~ msgid "His manager approves the request"
-#~ msgstr "经理批准这申请"
-
-#~ msgid "You have to select at least 1 Employee. Try again."
-#~ msgstr "你必须至少选择一名员工, 再试一次"
-
-#~ msgid "If holidays available, employee can take it and fill it."
-#~ msgstr "如果有假期, 员工能提取它"
-
-#~ msgid "Vacation start day"
-#~ msgstr "批准发生日期"
-
-#~ msgid ""
-#~ "Human Ressources: Holidays tracking and workflow\n"
-#~ "\n"
-#~ "    This module allows you to manage holidays and holidays requests. For "
-#~ "each employee, you can also define a number of available holidays per "
-#~ "holiday status.\n"
-#~ "\n"
-#~ "    Note that:\n"
-#~ "    - 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 "
-#~ "set up this info and your colour preferences in\n"
-#~ "                HR / Configuration / Holidays Status\n"
-#~ "    - An employee can make a negative holiday request (holiday request of -2 "
-#~ "days for example), this is considered by the system as an ask for more off-"
-#~ "days. It will increase his total of that holiday status available (if the "
-#~ "request is accepted).\n"
-#~ "    - There are two ways to print the employee's holidays:\n"
-#~ "        * The first will allow to choose employees by department and is used "
-#~ "by clicking the menu item located in\n"
-#~ "                HR / Holidays Request / Print Summary of Holidays\n"
-#~ "        * The second will allow you to choose the holidays report for "
-#~ "specific employees. Go on the list\n"
-#~ "                HR / Employees / Employees\n"
-#~ "            then select the ones you want to choose, click on the print icon "
-#~ "and select the option\n"
-#~ "                'Print Summary of Employee's Holidays'\n"
-#~ "    - The wizard allows you to choose if you want to print either the "
-#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
-#~ "be set up by a user from the group 'HR' and with the role 'holidays'. You "
-#~ "can define these features in the security tab from the user data in\n"
-#~ "                Administration / Users / Users\n"
-#~ "            for example, you maybe will do it for the user 'admin'.\n"
-#~ msgstr ""
-#~ "人力资源:假期跟踪和工作流\n"
-#~ "\n"
-#~ "这模块允许你管理假期和假期申请. 每个员工能为每个可用假期的状态定义一个数字\n"
-#~ "\n"
-#~ "    备注:\n"
-#~ "        - 同步内部日程(使用业务关系管理模块)它可以: 在接受假期申请时自动创建一个事务, 你要能把假期哦状态链接到划分的事务.\n"
-#~ "          在人力资源/ 设置/ 假期状态, 你能设置信息和偏好的颜色.\n"
-#~ "        - 员工能请求负数的假期 (如假期为-2日), 它被系统转换为要求更多的休息日. 它将延长假期 (如果申请批准).\n"
-#~ "        - 有两种方法打印员工的假期:\n"
-#~ "            * 第一种允许按部门的员工, 通过在菜单点击: 人力资源 / 假期申请 / 打印假期摘要\n"
-#~ "            * 第二种允许你选择指定的员工的假期报表菜单点击为: 人力资源 / 员工.先选员工,  然后点击打印图标'打印员工假期摘要'\n"
-
-#~ msgid "Calendar"
-#~ msgstr "日程表"
-
-#~ msgid "Allow to override Limit"
-#~ msgstr "允许重叠的限制"
-
-#~ msgid "Holiday is set in the calendar."
-#~ msgstr "在日程表设定假期"
-
-#~ msgid "My Refused Holidays Requests"
-#~ msgstr "我被拒绝的假期申请"
-
-#~ msgid "My Holidays Request"
-#~ msgstr "我的假期申请"
-
-#~ msgid "Maximum Leaves Allowed"
-#~ msgstr "最大休假允许"
-
-#~ msgid "Approved Request"
-#~ msgstr "申请批准"
-
-#~ msgid "My Holidays Request Refused"
-#~ msgstr "我被拒绝的假期申请"
-
-#~ msgid "Encode number of available holidays"
-#~ msgstr "可得假期的编号"
-
-#~ msgid "His manager refuses the request"
-#~ msgstr "经理拒绝这申请"
-
-#~ msgid "You have to select at least 1 Department. Try again."
-#~ msgstr "你必须至少选择一个部门, 再试一次"
+msgstr "待审批"
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 1ba7fe930fd..1998320c44b 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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 26c654db9dd..cb3a89eeb3e 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -19,3 +19,5 @@
 #
 ##############################################################################
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index dd0bd91a0d0..d756dfe6dfd 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -30,6 +30,7 @@ import pooler
 import time
 from report import report_sxw
 from tools import ustr
+from tools.translate import _
 
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@@ -69,9 +70,9 @@ def emp_create_xml(self, cr, uid, dept, holiday_type, row_id, empid, name, som,
          for index in range(1,61):
               display[index]=' '
               count=''
-
+              
     data_xml=['<info id="%d" number="%d" val="%s" />' % (row_id,x,display[x]) for x in range(1,len(display)+1) ]
-
+    
     # Computing the xml
     xml = '''
     %s
@@ -120,18 +121,17 @@ class report_custom(report_rml):
 
 #        date_xml=[]
         for l in range(0,len(legend)):
-            date_xml += ['<legend row="%d" id="%d" name="%s" color="%s" />' % (l+1,legend[l][0],legend[l][1],legend[l][2])]
-
+            date_xml += ['<legend row="%d" id="%d" name="%s" color="%s" />' % (l+1,legend[l][0],_(legend[l][1]),legend[l][2])]
         date_xml += ['<date month="%s" year="%d" />' % (som.strftime('%B'), som.year),'<days>']
 
         cell=1
         if day_diff.days>=30:
-            date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
+            date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som.replace(day=x).strftime('%a')),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
         else:
             if day_diff.days>=(lengthmonth(som.year, som.month)-som.day):
-                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
+                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som.replace(day=x).strftime('%a')),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
             else:
-                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, eom.day+1)]
+                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som.replace(day=x).strftime('%a')),x-som.day+1) for x in range(som.day, eom.day+1)]
 
         cell=x-som.day+1
         day_diff1=day_diff.days-cell+1
@@ -150,7 +150,7 @@ class report_custom(report_rml):
             if month+i<=12:
                 if day_diff1 > lengthmonth(year,i+month): # Not on 30 else you have problems when entering 01-01-2009 for example
                     som1=datetime.date(year,month+i,1)
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, lengthmonth(year,i+month)+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, lengthmonth(year,i+month)+1)]
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
@@ -159,7 +159,7 @@ class report_custom(report_rml):
 
                 else:
                     som1=datetime.date(year,month+i,1)
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, eom.day+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, eom.day+1)]
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
@@ -174,7 +174,7 @@ class report_custom(report_rml):
                 i=1
                 if day_diff1>=30:
                     som1=datetime.date(years,i,1)
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, lengthmonth(years,i)+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, lengthmonth(years,i)+1)]
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
@@ -186,7 +186,7 @@ class report_custom(report_rml):
                     i=i+1
                     j=j+1
                     month_dict[j]=som1.strftime('%B')
-                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, eom.day+1)]
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, _(som1.replace(day=x).strftime('%a')),cell+x) for x in range(1, eom.day+1)]
                     cell=cell+x
                     width_dict[j]=x
 
@@ -200,16 +200,16 @@ class report_custom(report_rml):
             st+=',' + str(0.4 *width_dict[m])+'cm'
         st+=',0.4cm</cols_months>\n'
 
-        months_xml =['<months  number="%d" name="%s" />' % (x,month_dict[x]) for x in range(1,len(month_dict)+1) ]
+        months_xml =['<months  number="%d" name="%s"/>' % (x, _(month_dict[x])) for x in range(1,len(month_dict)+1) ]
         months_xml.append(st)
-
+        
         emp_xml=''
         row_id=1
-
+        
         if data['model']=='hr.employee':
             for id in data['form']['emp']:
                  items = obj_emp.read(cr, uid, id, ['id','name'])
-
+                 
                  emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, items['id'], items['name'], som, eom)
                  row_id = row_id +1
 
@@ -229,7 +229,7 @@ class report_custom(report_rml):
                     dept_done=1
                     emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
                     row_id = row_id +1
-
+                    
         header_xml = '''
         <header>
         <date>%s</date>
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 285fb381602..f05008203df 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -2,17 +2,11 @@
 <openerp>
   <data>
 
-    <record id="property_rule_holidays" 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), ('department_id.manager_id.user_id', '=', user.id)]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
-    </record>
     <record id="property_rule_holidays_manager" model="ir.rule">
         <field name="name">Manager Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
+        <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
     </record>
     <record id="property_rule_holidays_employee" model="ir.rule">
         <field name="name">Employee Holidays</field>
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index f43b0235e46..af476386e0b 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -1,106 +1,34 @@
 -
   In order to test the hr_holiday module in OpenERP, I will  Allocate leaves for Employee and manage leaves and leaves requests.
 -
-  I create new user "test_holiday_user1" who will make leave request.
+  I assign the dates in the holiday request.
 -
-  !record {model: res.users, id: test_holiday_user1}:
-    company_id: base.main_company
-    context_lang: en_US
-    groups_id:
-      - base.group_user
-      - base.group_hr_manager
-      - base.group_hr_user
-    login: test_holiday_user1
-    name: test_holiday_user1
-    password: test_holiday_user1
--
-  I create a new employee “Mark Johnshon” as Manager to validate employee leave.
--
-  !record {model: hr.employee, id: hr_employee_employee0}:
-    address_home_id: base.res_partner_address_1
-    company_id: base.main_company
-    gender: male
-    name: Mark Johnson
-    user_id: base.user_root
--
-  I Create another employee "Phil Graves" as "test_holiday_user1".
--
-  !record {model: hr.employee, id: hr_employee_philgraves0}:
-    address_home_id: base.res_partner_address_8
-    name: Phil Graves
-    parent_id: 'hr_employee_employee0'
-    user_id: 'test_holiday_user1'
--
-  I create a new Leave type "Sick Leave".
--
-  !record {model: hr.holidays.status, id: hr_holidays_status_sick0}:
-    color_name: red
-    name: Sick Leave.
-    limit: 12
-
--
-  I allocate leave request for employee "Phil Graves".
--
-  !record {model: hr.holidays, id: hr_holidays_allocateleaveforuser0}:
-    employee_id: 'hr_employee_philgraves0'
-    holiday_status_id: hr_holidays_status_sick0
-    name: Sick Leaves for Phil Graves
-    number_of_days_temp: 12.0
-    date_from: !eval "'%s-05-20 13:59:00' %(datetime.now().year)"
-    date_to: !eval "'%s-05-22 13:59:00' %(datetime.now().year)"
-    type: add
--
-  I confirmed the allocation by clicking on "Confirm" button.
--
-  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_allocateleaveforuser0}
-
--
-  I validate the allocation by clicking on "To Approve" button.
--
-  !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_allocateleaveforuser0}
-
--
-  I connect as "test_holiday_user1", and create a new leave request for employee "Phil Graves".
--
-  !record {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
-    date_from: !eval "'%s-05-20 11:48:00' %(datetime.now().year)"
-    date_to: !eval "'%s-05-21 11:48:00' %(datetime.now().year)"
-    employee_id: 'hr_employee_philgraves0'
-    holiday_status_id: 'hr_holidays_status_sick0'
-    name: Appointment with Doctor
-    notes: My appointment with the doctor is confirmed. so please accept my leave.
-    number_of_days_temp: 2.0
+  !record {model: hr.holidays, id: hr_holiday1}:
+    name: Sick Leave
+    holiday_status_id: holiday_status_cl
+    date_from: !eval time.strftime('%Y-%m-10 10:00:00')
+    date_to: !eval time.strftime('%Y-%m-11 19:00:00')
+    employee_id: hr.employee1
     type: remove
-    user_id: 'test_holiday_user1'
 -
-  I check that Leave Request is in "Draft" state.
+  I confirmed the holiday request by clicking on "Confirm" button.
 -
-  !assert {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
-    - state == 'draft'
-
+  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_employee1_cl}
 -
-  I confirm leave Request by click on "Confirm" button.
+  I find a small mistake on my leave request to I click on "Refuse" button to correct a mistake.
 -
-  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_iwanttoleaveforgotohospital0}
-
+  !workflow {model: hr.holidays, action: refuse, ref: hr_holidays_employee1_cl}
 -
-  I connect as "Admin" user and Open Leave request of "Phil Graves" and "validate" it by click on "Approve" button.
--
-  !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_iwanttoleaveforgotohospital0}
-
--
-  I check that "Leave Manager" field is automatically filled by the user who validate the leave'.
+  I again set to draft and then confirm.
 -
   !python {model: hr.holidays}: |
-     ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
-     obj = self.browse(cr, uid, ref('hr_holidays_iwanttoleaveforgotohospital0'))
-     assert ids2[0] == obj.manager_id.id
-
+     import netsvc
+     wf_service = netsvc.LocalService("workflow")
+     self.set_to_draft(cr, uid, [ref('hr_holidays_employee1_cl')])
+     wf_service.trg_validate(uid, 'hr.holidays', ref('hr_holidays_employee1_cl'), 'confirm', cr)
 -
-  I check that Leave request state is "Validated".
+  I validate the holiday request by clicking on "To Approve" button.
 -
-  !assert {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
-    - state == "validate"
-
+  !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_employee1_cl}
 -
-  I can also see Summary of Employee's holiday by using 'Employee's Holidays' Report. This report will allows to choose to print holidays with state Confirmed, Validated or both.
+  I can also see Summary of Employee's holiday by using "Employee's Holidays" Report. This report will allows to choose to print holidays with state Confirmed, Validated or both.
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 980ad38c855..530d2a60351 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -35,7 +35,6 @@
 
 		<record model="ir.values" id="hr_holidays_summary_employee_value">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="object" eval="1" />
             <field name="name">Employee's Holidays</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_holidays_summary_employee'))" />
@@ -44,4 +43,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 9e7debaa992..5c78b80f095 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 {
-    'name': 'Human Resource Payroll',
+    'name': 'Payroll',
     'version': '1.0',
     'category': 'Human Resources',
-    'complexity': "expert",
+    'complexity': "normal",
     'description': """
 Generic Payroll system.
 =======================
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index cdf6549fedd..affd81cce6d 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -50,6 +50,7 @@ class hr_payroll_structure(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'note': fields.text('Description'),
         'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
+        'children_ids':fields.one2many('hr.payroll.structure', 'parent_id', 'Children'),
     }
 
     def _get_parent(self, cr, uid, context=None):
@@ -131,6 +132,10 @@ class hr_contract(osv.osv):
             ], 'Scheduled Pay', select=True),
     }
 
+    _defaults = {
+        'schedule_pay': 'monthly',
+    }
+
     def get_all_structures(self, cr, uid, contract_ids, context=None):
         """
         @param contract_ids: list of contracts
@@ -175,6 +180,7 @@ class hr_salary_rule_category(osv.osv):
         'name':fields.char('Name', size=64, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True, readonly=False),
         'parent_id':fields.many2one('hr.salary.rule.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."),
+        'children_ids': fields.one2many('hr.salary.rule.category', 'parent_id', 'Children'),
         'note': fields.text('Description'),
         'company_id':fields.many2one('res.company', 'Company', required=False),
     }
@@ -205,6 +211,7 @@ class one2many_mod2(fields.one2many):
 class hr_payslip_run(osv.osv):
 
     _name = 'hr.payslip.run'
+    _description = 'Payslip Batches'
     _columns = {
         'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}),
@@ -279,7 +286,7 @@ class hr_payslip(osv.osv):
         'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'),
         'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}),
-        'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
+        'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Batches', readonly=True, states={'draft': [('readonly', False)]}),
     }
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-01'),
@@ -639,7 +646,7 @@ class hr_payslip(osv.osv):
                       'struct_id': False,
                       }
             }
-        if not employee_id:
+        if (not employee_id) or (not date_from) or (not date_to):
             return res
         ttyme = datetime.fromtimestamp(time.mktime(time.strptime(date_from, "%Y-%m-%d")))
         employee_id = empolyee_obj.browse(cr, uid, employee_id, context=context)
@@ -705,7 +712,7 @@ class hr_payslip_worked_days(osv.osv):
     _description = 'Payslip Worked Days'
     _columns = {
         'name': fields.char('Description', size=256, required=True),
-        'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
+        'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True, ondelete='cascade'),
         'sequence': fields.integer('Sequence', required=True,),
         'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
         'number_of_days': fields.float('Number of Days'),
@@ -727,7 +734,7 @@ class hr_payslip_input(osv.osv):
     _description = 'Payslip Input'
     _columns = {
         'name': fields.char('Description', size=256, required=True),
-        'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
+        'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True, ondelete='cascade'),
         'sequence': fields.integer('Sequence', required=True,),
         'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
         'amount': fields.float('Amount', help="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."),
@@ -912,7 +919,7 @@ class hr_payslip_line(osv.osv):
         return res
 
     _columns = {
-        'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=True),
+        'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=True, ondelete='cascade'),
         'salary_rule_id':fields.many2one('hr.salary.rule', 'Rule', required=True),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
         'contract_id':fields.many2one('hr.contract', 'Contract', required=True),
@@ -921,6 +928,10 @@ class hr_payslip_line(osv.osv):
         'total': fields.function(_calculate_total, method=True, type='float', string='Total', digits_compute=dp.get_precision('Payroll'),store=True ),
     }
 
+    _defaults = {
+        'quantity': 1.0,
+    }
+
 hr_payslip_line()
 
 class hr_payroll_structure(osv.osv):
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index d5618fab3a0..c752a2ca3a4 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
+
         <record id="BASIC" model="hr.salary.rule.category">
             <field name="name">Basic</field>
             <field name="code">BASIC</field>
         </record>
-    
+
         <record id="ALW" model="hr.salary.rule.category">
             <field name="name">Allowance</field>
             <field name="code">ALW</field>
         </record>
-        
-        <record id="DED" model="hr.salary.rule.category">
-            <field name="name">Deduction</field>
-            <field name="code">DED</field>
-        </record>
-        
+
         <record id="GROSS" model="hr.salary.rule.category">
             <field name="name">Gross</field>
             <field name="code">GROSS</field>
         </record>
-        
+
+        <record id="DED" model="hr.salary.rule.category">
+            <field name="name">Deduction</field>
+            <field name="code">DED</field>
+        </record>
+
         <record id="NET" model="hr.salary.rule.category">
             <field name="name">Net</field>
             <field name="code">NET</field>
         </record>
-        
+
         <record id="COMP" model="hr.salary.rule.category">
             <field name="name">Company Contribution</field>
             <field name="code">COMP</field>
         </record>
-        
+
         <record id="hr_rule_basic" model="hr.salary.rule">
             <field name="name">Basic</field>
             <field name="sequence" eval="1"/>
@@ -71,13 +71,13 @@
             <field eval="[(6, 0, [ref('hr_rule_basic'), ref('hr_rule_taxable'),ref('hr_rule_net')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        
+
         <!-- Decimal Precision -->
-        
+
         <record forcecreate="True" id="decimal_payroll" model="decimal.precision">
             <field name="name">Payroll</field>
             <field name="digits">2</field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index bcbecd63ffd..e888ad6f133 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -66,7 +66,7 @@
         <record id="hr_salary_rule_ca_paolino" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="600.0" name="amount_fix"/>
-            <field name="code">CA</field>
+            <field name="code">CAQP</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Conveyance Allowance For Paolino</field>
             <field name="sequence" eval="15"/>
@@ -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) * contract.wage * 0.01</field>
+            <field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * 0.01</field>
          </record>
 
         <!-- Rule Inputs -->
@@ -144,7 +144,7 @@
             <field name="date_end" eval="time.strftime('%Y')+'-12-31'"/>
             <field name="struct_id" ref="hr_payroll.structure_001"/>
             <field name="employee_id" ref="hr_employee_bonamy0"/>
-            <field name="notes">This is a First Contract</field>
+            <field name="notes">Default contract for marketing executives</field>
             <field eval="4000.0" name="wage"/>
             <field eval="5" name="working_days_per_week"/>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 31802c2d4ce..98ec4be407b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -58,7 +58,7 @@
         <!-- End Contract View-->
 
         <!-- Salary structure -->
-        <record id="view_hr_employee_grade_tree" model="ir.ui.view">
+        <record id="view_hr_payroll_structure_list_view" model="ir.ui.view">
             <field name="name">hr.payroll.structure.tree</field>
             <field name="model">hr.payroll.structure</field>
             <field name="type">tree</field>
@@ -71,6 +71,19 @@
                 </tree>
             </field>
         </record>
+        <record id="view_hr_payroll_structure_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.structure.tree</field>
+            <field name="model">hr.payroll.structure</field>
+            <field name="type">tree</field>
+            <field name="field_parent">children_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Salary Structure">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_hr_payroll_structure_filter" model="ir.ui.view">
             <field name="name">hr.payroll.structure.select</field>
@@ -116,18 +129,32 @@
             </field>
         </record>
 
-        <record id="action_view_hr_employee_grade_form" model="ir.actions.act_window">
+        <record id="action_view_hr_payroll_structure_list_form" model="ir.actions.act_window">
             <field name="name">Salary Structures</field>
             <field name="res_model">hr.payroll.structure</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_hr_employee_grade_tree"/>
+            <field name="view_id" ref="view_hr_payroll_structure_list_view"/>
         </record>
         <menuitem
-            id="menu_hr_employee_function"
-            action="action_view_hr_employee_grade_form"
+            id="menu_hr_payroll_structure_view"
+            action="action_view_hr_payroll_structure_list_form"
             parent="payroll_configure"
             sequence="1"
         />
+        <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
+            <field name="name">Salary Structures Hierarchy</field>
+            <field name="res_model">hr.payroll.structure</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_id" ref="view_hr_payroll_structure_tree"/>
+        </record>
+        <menuitem
+            id="menu_hr_payroll_structure_tree"
+            action="action_view_hr_payroll_structure_tree"
+            parent="payroll_configure"
+            sequence="2"
+            icon="STOCK_INDENT"
+        />
         <!-- End Salary structure -->
 
         <!-- Payslip Line -->
@@ -213,7 +240,7 @@
             <field name="model">hr.payslip</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('confirm','hr_check','accont_check');black:state in ('new');gray:state in('cancel')" string="Payslips">
+                <tree colors="blue:state in ('confirm','hr_check','accont_check');black:state == 'new';gray:state == 'cancel'" string="Payslips">
                     <field name="number"/>
                     <field name="employee_id"/>
                     <field name="name"/>
@@ -243,43 +270,7 @@
                         <field name="credit_note"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Salary Computation" >
-                            <field name="line_ids" colspan="4" nolabel="1">
-                                <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
-                                    <field name="name"/>
-                                    <field name="code"/>
-                                    <field name="category_id"/>
-                                    <field name="sequence" invisible="1"/>
-                                    <field name="quantity" string="Quantity/Rate"/>
-                                    <field name="amount"/>
-                                    <field name="total"/>
-                                </tree>
-                                <form string="Payslip Line">
-                                    <group>
-                                        <field name="name" select="1"/>
-                                        <field name="code" select="1"/>
-                                        <field name="category_id"/>
-                                        <field name="sequence" groups="base.group_extended"/>
-                                        <field name="quantity" string="Quantity/Rate"/>
-                                        <field name="amount"/>
-                                        <field name="total"/>
-                                        <field name="salary_rule_id" groups="base.group_extended"/>
-                                    </group>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Details By Salary Rule Category">
-                            <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
-                                <tree string="Payslip Lines" colors="blue:total == 0">
-                                    <field name="category_id"/>
-                                    <field name="name"/>
-                                    <field name="code"/>
-                                    <field name="total"/>
-                                </tree>
-                            </field>
-                       </page>
-
-                       <page string="Worked Days &amp; Inputs">
+                        <page string="Worked Days &amp; Inputs">
                             <field name="worked_days_line_ids" colspan="4" nolabel="1">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
@@ -320,8 +311,42 @@
                                     </group>
                                 </form>
                             </field>
+                        </page>
+                        <page string="Salary Computation" >
+                            <field name="line_ids" colspan="4" nolabel="1">
+                                <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
+                                    <field name="name"/>
+                                    <field name="code"/>
+                                    <field name="category_id"/>
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="quantity" string="Quantity/Rate"/>
+                                    <field name="amount"/>
+                                    <field name="total"/>
+                                </tree>
+                                <form string="Payslip Line">
+                                    <group>
+                                        <field name="name" select="1"/>
+                                        <field name="code" select="1"/>
+                                        <field name="category_id"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="quantity" string="Quantity/Rate"/>
+                                        <field name="amount"/>
+                                        <field name="total"/>
+                                        <field name="salary_rule_id" groups="base.group_extended"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Details By Salary Rule Category">
+                            <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
+                                <tree string="Payslip Lines" colors="blue:total == 0">
+                                    <field name="category_id"/>
+                                    <field name="name"/>
+                                    <field name="code"/>
+                                    <field name="total"/>
+                                </tree>
+                            </field>
                        </page>
-
                        <page string="Other Information">
                             <separator colspan="4" string="Other Information"/>
                             <group col="5" colspan="2">
@@ -353,7 +378,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslips">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                         <separator orientation="vertical"/>
@@ -364,10 +389,10 @@
                         <field name="payslip_run_id"/>
                     </group>
                     <newline/>
-                    <group col="8" colspan="4" expand="0" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="PaySlip Run" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
+                        <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                         <separator orientation="vertical"/>
@@ -415,6 +440,19 @@
                 </tree>
             </field>
         </record>
+        <record id="hr_salary_rule_category_tree_view" model="ir.ui.view">
+            <field name="name">hr.salary.rule.category.tree.view</field>
+            <field name="model">hr.salary.rule.category</field>
+            <field name="type">tree</field>
+            <field name="field_parent">children_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Salary Rule Categories">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="parent_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_hr_salary_rule_category_filter" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.select</field>
@@ -422,8 +460,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
-                    <field name="name" select="1"/>
-                     <field name="code" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
                </search>
             </field>
         </record>
@@ -441,6 +479,19 @@
             parent="payroll_configure"
             sequence="11"
         />
+        <record id="action_hr_salary_rule_category_tree_view" model="ir.actions.act_window">
+            <field name="name">Salary Rule Categories Hierarchy</field>
+            <field name="res_model">hr.salary.rule.category</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="hr_salary_rule_category_tree_view"/>
+        </record>
+        <menuitem
+            id="menu_hr_salary_rule_category_tree_view"
+            action="action_hr_salary_rule_category_tree_view"
+            parent="payroll_configure"
+            sequence="12"
+            icon="STOCK_INDENT"
+        />
 
         <!--
         Contribution Register
@@ -500,8 +551,8 @@
 
         <!-- Salary Rules -->
 
-        <record id="hr_salary_rule_tree" model="ir.ui.view">
-            <field name="name">hr.salary.rule.tree</field>
+        <record id="hr_salary_rule_list" model="ir.ui.view">
+            <field name="name">hr.salary.rule.list</field>
             <field name="model">hr.salary.rule</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
@@ -514,6 +565,22 @@
                 </tree>
             </field>
         </record>
+
+        <record id="hr_salary_rule_tree" model="ir.ui.view">
+            <field name="name">hr.salary.rule.tree</field>
+            <field name="model">hr.salary.rule</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Salary Rules">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="category_id" invisible="True"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </tree>
+            </field>
+        </record>
         <record id="hr_salary_rule_form" model="ir.ui.view">
             <field name="name">hr.salary.rule.form</field>
             <field name="model">hr.salary.rule</field>
@@ -594,7 +661,7 @@
             <field name="name">Salary Rules</field>
             <field name="res_model">hr.salary.rule</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="hr_salary_rule_tree"/>
+            <field name="view_id" ref="hr_salary_rule_list"/>
             <field name="domain">[('parent_rule_id','=',False)]</field>
             <field name="search_view_id" ref="view_hr_rule_filter"/>
         </record>
@@ -602,6 +669,14 @@
         <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
 
 
+        <act_window name="All Children Rules"
+            domain="[('id', 'in', [active_id])]"
+            res_model="hr.salary.rule"
+            src_model="hr.salary.rule"
+            view_id="hr_salary_rule_tree"
+            view_type="tree"
+            id="act_children_salary_rules"/>
+
         <!-- payslip runs -->
 
         <record id="hr_payslip_run_filter" model="ir.ui.view">
@@ -609,9 +684,9 @@
             <field name="model">hr.payslip.run</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Payslip Runs">
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft runs"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done runs"/>
+                <search string="Search Payslip Batches">
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
+                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="date_start"/>
@@ -625,11 +700,12 @@
             <field name="model">hr.payslip.run</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Payslips Run">
+                <tree string="Payslips Batches">
                     <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="credit_note"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -639,7 +715,7 @@
             <field name="model">hr.payslip.run</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslips Run">
+                <form string="Payslips Batches">
                     <group col="6" colspan="4">
                         <field name="name" colspan="4"/>
                         <field name="credit_note"/>
@@ -662,7 +738,7 @@
         </record>
 
         <record id="action_hr_payslip_run_tree" model="ir.actions.act_window">
-            <field name="name">Payslips Run</field>
+            <field name="name">Payslips Batches</field>
             <field name="res_model">hr.payslip.run</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_payslip_run_tree"/>
@@ -681,7 +757,19 @@
             id="act_hr_employee_payslip_list"
             groups="base.group_hr_manager"/>
 
-        <act_window domain="[('slip_id', '=', active_id)]" context="{'search_default_register_id': 1}" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
+        <act_window name="Payslip Computation Details"
+        	domain="[('slip_id', '=', active_id)]"
+        	context="{'default_slip_id': active_id}"
+        	res_model="hr.payslip.line"
+        	src_model="hr.payslip"
+        	id="act_payslip_lines"/>
+
+        <act_window name="Payslip Lines"
+        	domain="[('register_id', '=', active_id)]"
+        	context="{'default_register_id': active_id, 'search_default_register_id': 1}"
+        	res_model="hr.payslip.line"
+        	src_model="hr.contribution.register"
+        	id="act_contribution_reg_payslip_lines"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_payroll/i18n/bg.po b/addons/hr_payroll/i18n/bg.po
index 21bacb7c996..37dc77046a6 100644
--- a/addons/hr_payroll/i18n/bg.po
+++ b/addons/hr_payroll/i18n/bg.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: 2011-03-28 04:36+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "E-mail Address"
-msgstr ""
+msgstr "Имейл адрес"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -28,8 +28,11 @@ msgid "Based"
 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 "Запалта нето"
 
@@ -39,43 +42,46 @@ msgid "Recompute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employees Salary Details"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Allowances with Basic:"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Department"
 msgstr "Отдел"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Deductions:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,gratuity:0
+#: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
 msgstr ""
 
 #. 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 ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
 msgstr "Заем"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
 msgstr ""
 
@@ -83,6 +89,7 @@ msgstr ""
 #: field:hr.employee,slip_ids:0
 #: view:hr.payroll.register:0
 #: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
@@ -103,14 +110,19 @@ 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
-#: wizard_field:payroll.analysis,init,company_id:0
 msgid "Company"
 msgstr "Фирма"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "The Manager"
 msgstr ""
 
@@ -120,7 +132,8 @@ msgid "Letter Details"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
+#: report:payslip.pdf:0
 msgid ","
 msgstr ","
 
@@ -154,8 +167,7 @@ msgid "Half-Pay Holiday"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
 msgstr "Други"
@@ -163,12 +175,12 @@ msgstr "Други"
 #. module: hr_payroll
 #: field:hr.payslip.line,slip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Contract Detail:"
 msgstr ""
 
@@ -198,12 +210,16 @@ msgid "Reject"
 msgstr "Отхвърляне"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
 msgstr "Напускащи"
 
 #. 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 "Регистриране"
 
@@ -214,17 +230,18 @@ msgid ""
 msgstr "Грешка! Не можете да изберете отдел, в който служителят е мениджър."
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Deductions"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,value:0
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
 msgid "Value"
 msgstr "Стойност"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Name of the Employee"
 msgstr "Име на служителя"
 
@@ -240,7 +257,8 @@ msgstr "Изчисляване на заплата"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
 msgid "Amount"
 msgstr "Сума"
 
@@ -272,6 +290,7 @@ msgid "Employee Deduction"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Deduction"
 msgstr ""
@@ -312,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Amount (in words) :"
 msgstr "Сума (словом):"
 
@@ -322,6 +341,8 @@ msgid "Payment"
 msgstr "Плащане"
 
 #. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
 #: field:hr.payslip,line_ids:0
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
@@ -334,6 +355,7 @@ msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,base:0
 msgid "Based on"
 msgstr "Базиран на"
@@ -400,17 +422,23 @@ msgid "Visa No"
 msgstr "Visa No"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,from:0
+#: 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 "От"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr "По заплата"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_to:0
+#: field:hr.payroll.year.salary,date_to:0
+#: report:salary.structure:0
 msgid "End Date"
 msgstr "Крайна дата"
 
@@ -425,8 +453,8 @@ msgid "Leave Deductions"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "Authorised Signature"
 msgstr ""
 
@@ -441,12 +469,11 @@ msgid "Contribution Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Notes:"
 msgstr "Бележки:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,based_on:0
 #: field:hr.payroll.advice,state:0
 #: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
@@ -479,10 +506,12 @@ msgid "Company Contributions"
 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
 msgstr "Служител"
 
@@ -497,10 +526,11 @@ msgid "Bank Advice Lines"
 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
-#: wizard_field:payroll.analysis,init,type:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Type"
 msgstr "Тип"
 
@@ -510,7 +540,7 @@ msgid "Email"
 msgstr "Имейл"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "#"
 msgstr "#"
 
@@ -544,13 +574,16 @@ msgid "Net Basic"
 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 "Брутна заплата"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Earnings"
 msgstr ""
 
@@ -561,17 +594,20 @@ msgid "Employee Salary Statement"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
 msgstr "Друго плащане"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Deductions"
 msgstr "Удръжки"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "C/D"
 msgstr ""
 
@@ -596,13 +632,19 @@ msgid "Total By Employee"
 msgstr "Общо за служител"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: 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 "Фиксирана количество"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,to:0
+#: 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 "До"
 
@@ -640,15 +682,15 @@ msgid "Contribution Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:hr.payroll.register.sheet:0
 msgid "For the month of"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,deduction:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
@@ -671,40 +713,38 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr "Грешка! Началната дата на договора трябва да бъде крайната дата."
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
-#: view:hr.payslip:0
 msgid "Complete HR Checking"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Yours Sincerely"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "SI. No."
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Net Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary Structure:"
 msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
 msgid "Employees Salary Detail"
 msgstr ""
 
@@ -722,7 +762,7 @@ msgid "Confirm Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Others:"
 msgstr "Други:"
 
@@ -734,6 +774,7 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
 msgid "Worked Day"
 msgstr ""
 
@@ -753,7 +794,7 @@ msgid "Country & Address"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employee Code"
 msgstr "Код на служител"
 
@@ -763,16 +804,17 @@ msgid "Basic Salary – Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:company.contribution,amount_type:0
+#: field:company.contribution.line,amount_type:0
 #: field:hr.payslip.line,amount_type:0
-#: rml:salary.structure:0
+#: field:hr.payslip.line.line,amount_type:0
+#: report:salary.structure:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
-#: rml:salary.structure:0
 msgid "Category"
 msgstr "Категория"
 
@@ -800,7 +842,7 @@ msgid "Draft"
 msgstr "Чернова"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Earnings"
 msgstr "Доходи"
 
@@ -812,7 +854,6 @@ msgstr "Основен"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
 msgid "All Passports"
 msgstr "Всичи паспорти"
 
@@ -823,9 +864,8 @@ msgid "Salary Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
 msgstr "Име на служител"
 
@@ -835,7 +875,6 @@ msgid "Passport Detail"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
 msgid "Percentage (%)"
 msgstr "Процент (%)"
@@ -850,22 +889,18 @@ msgid "Payroll Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "For"
 msgstr "За"
 
 #. module: hr_payroll
-#: view:hr.employee:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
 msgstr "Договори"
 
 #. module: hr_payroll
-#: view:hr.employee.grade:0
+#: view:hr.payroll.structure:0
 msgid "Employee Function"
 msgstr ""
 
@@ -890,7 +925,7 @@ msgid "Validation"
 msgstr "Валидиране"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Title"
 msgstr "Заглавие"
 
@@ -906,8 +941,6 @@ msgstr "Потребител"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
-#: view:hr.payslip:0
-#: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
 msgstr "Редове от плащане"
 
@@ -917,6 +950,7 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
 msgstr "Активен"
@@ -927,7 +961,7 @@ msgid "Applied this head for calculation if condition is true"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:year.salary:0
+#: report:year.salary:0
 msgid "Yearly Salary Details"
 msgstr ""
 
@@ -959,22 +993,23 @@ msgid "Compute"
 msgstr "Изчисление"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 #: field:hr.payslip,deg_id:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Designation"
 msgstr "Предназначение"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "HR Manager"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.contract,basic:0
+#: field:hr.employee,basic:0
 #: field:hr.payslip,basic_before_leaves:0
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Basic Salary"
 msgstr ""
 
@@ -1000,12 +1035,13 @@ msgid "Companies"
 msgstr "Фирми"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr "Договор"
 
@@ -1015,14 +1051,14 @@ msgid "Draft Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Next Month Date"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,date:0
 #: field:hr.payroll.advice,date:0
 #: field:hr.payroll.register,date:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,date:0
 msgid "Date"
 msgstr "Дата"
@@ -1038,8 +1074,8 @@ msgid "Search Passport"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Phone No."
 msgstr "Телефонен No."
 
@@ -1050,7 +1086,7 @@ msgstr "Телефонен No."
 #: view:hr.contibution.register:0
 #: view:hr.contibution.register.line:0
 msgid "Contribution"
-msgstr ""
+msgstr "Участници"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,state:0
@@ -1071,16 +1107,19 @@ msgid "Other No."
 msgstr "Друг No."
 
 #. 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
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Code"
 msgstr "Код"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-#: rml:payroll.advice:0
 msgid "Payment Advice"
 msgstr ""
 
@@ -1103,24 +1142,28 @@ msgid "Computation Overview"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.year.salary,init,salary_on:0
+#: field:hr.payroll.year.salary,salary_on:0
 msgid "Salary On"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,number:0
 #: field:hr.payroll.register,number:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,number:0
 msgid "Number"
 msgstr "Номер"
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.contract,struct_id:0
 #: field:hr.employee,line_ids:0
-#: view:hr.employee.grade:0
-#: field:hr.employee.grade,line_ids:0
-#: rml:salary.structure:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,line_ids: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 "Структура на заплатата"
 
@@ -1132,9 +1175,6 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
-#: wizard_button:payroll.analysis,init,end:0
-#: wizard_button:wizard.employees.detail,init,end:0
-#: wizard_button:wizard.year.salary,init,end:0
 msgid "Cancel"
 msgstr "Отмяна"
 
@@ -1146,34 +1186,33 @@ msgstr "Затваряне"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
-#: rml:salary.structure:0
 msgid "Amount / Percentage"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
 msgid "Allowances"
 msgstr "Обезщетения"
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contract,passport_id:0
 #: field:hr.passport,name:0
 msgid "Passport No"
 msgstr "Паспорт No"
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.employee,passport_id:0
 #: view:hr.passport:0
 msgid "Passport"
 msgstr "Паспорт"
@@ -1184,12 +1223,11 @@ msgid "Total Salary"
 msgstr "Обща заплата"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "for period"
 msgstr "за период"
 
 #. module: hr_payroll
-#: field:hr.expense.expense,category_id:0
 #: field:hr.holidays.status,head_id:0
 msgid "Payroll Head"
 msgstr ""
@@ -1203,7 +1241,7 @@ msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "E-mail"
 msgstr "Имейл"
 
@@ -1221,8 +1259,11 @@ msgid "Print Report"
 msgstr "Отпечатване на отчет"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,line_ids:0
+#: 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 "Изчисления"
 
@@ -1260,7 +1301,11 @@ msgid "Basic Salary without Leave:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee.grade,function_id:0
+#: 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 "Функция"
@@ -1271,7 +1316,7 @@ msgid "States"
 msgstr "Области"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
 msgstr "Уважаеми г-н/г-жо,"
 
@@ -1286,12 +1331,29 @@ msgid "Gross Sal."
 msgstr ""
 
 #. 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 "Description"
 msgstr "Описание"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_from:0
+#: field:hr.payroll.year.salary,date_from:0
+#: report:salary.structure:0
 msgid "Start Date"
 msgstr "Начална дата"
 
@@ -1313,6 +1375,7 @@ 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 "Ведомост"
 
@@ -1342,9 +1405,10 @@ msgid "hr.payroll.year.salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Address"
 msgstr "Адрес"
 
@@ -1359,8 +1423,10 @@ msgid "Number of Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: 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 "Банка"
 
@@ -1370,28 +1436,35 @@ msgid "Cancel Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
 msgstr "Напред"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,name:0
+#: 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
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: field:hr.payslip.line.line,name:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+#: report:year.salary:0
 msgid "Name"
 msgstr "Име"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
+#: report:payslip.pdf:0
 msgid "Leaved Deduction"
 msgstr ""
 
@@ -1401,14 +1474,17 @@ msgid "Country"
 msgstr "Държава"
 
 #. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,employee_ids:0
-#: wizard_field:wizard.year.salary,init,employee_ids:0
+#: 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 "Служители"
 
 #. module: hr_payroll
-#: field:hr.employee,property_bank_account:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Bank Account"
 msgstr "Банкова сметка"
 
@@ -1460,6 +1536,7 @@ msgid "Passport Issue Date"
 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
@@ -1478,7 +1555,7 @@ msgid "Other Id"
 msgstr "Друг Id"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Bank Details"
 msgstr "Детайли за банката"
 
@@ -1488,7 +1565,10 @@ msgid "Slip ID"
 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 "Последователност"
 
@@ -1504,8 +1584,8 @@ msgid "Letter Content"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_view:wizard.employees.detail,init:0
-#: wizard_view:wizard.year.salary,init:0
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
 msgid "Year Salary"
 msgstr "Годишна заплата"
 
@@ -1525,9 +1605,9 @@ msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payroll.advice:0
-#: rml:year.salary:0
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
 msgid "Total"
 msgstr "Общо"
 
diff --git a/addons/hr_payroll/i18n/ca.po b/addons/hr_payroll/i18n/ca.po
index 23cf6b43920..8cb421a80f3 100644
--- a/addons/hr_payroll/i18n/ca.po
+++ b/addons/hr_payroll/i18n/ca.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: 2011-03-26 05:00+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "E-mail Address"
-msgstr "Adreça de correu electrònic"
+msgstr "Adreça d'Email"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -28,54 +28,60 @@ msgid "Based"
 msgstr "Basat"
 
 #. 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 "Salari net"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr "Recalcular plantilla"
+msgstr "Recalcula plantilla"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employees Salary Details"
 msgstr "Detalles salario de los empleados"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Allowances with Basic:"
-msgstr ""
+msgstr "Primes amb base:"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Department"
 msgstr "Departament"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Deductions:"
 msgstr "Deduccions:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,gratuity:0
+#: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
 msgstr "Ús 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éstec"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
 msgstr "Registro de pago de nómina"
 
@@ -83,6 +89,7 @@ msgstr "Registro de pago de nómina"
 #: field:hr.employee,slip_ids:0
 #: view:hr.payroll.register:0
 #: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr "Nòmines"
 
@@ -103,14 +110,19 @@ 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
-#: wizard_field:payroll.analysis,init,company_id:0
 msgid "Company"
 msgstr "Companyia"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "The Manager"
 msgstr "El responsable"
 
@@ -120,7 +132,8 @@ msgid "Letter Details"
 msgstr "Detalles de la carta"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
+#: report:payslip.pdf:0
 msgid ","
 msgstr ","
 
@@ -154,8 +167,7 @@ msgid "Half-Pay Holiday"
 msgstr "Vacances amb mitja paga"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
 msgstr "Altres"
@@ -163,12 +175,12 @@ msgstr "Altres"
 #. module: hr_payroll
 #: field:hr.payslip.line,slip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Pay Slip"
 msgstr "Nómina"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Contract Detail:"
 msgstr "Detalles del contrato:"
 
@@ -198,12 +210,16 @@ msgid "Reject"
 msgstr "Rebutja"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
 msgstr "Fulles"
 
 #. 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 "Registra"
 
@@ -212,20 +228,22 @@ msgstr "Registra"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
-"Error! No podeu seleccionar un departament l'empleat del qual és el director."
+"Error! No podeu seleccionar un departament que tingui l'empleat com a "
+"responsable."
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Deductions"
 msgstr "Total deduccions"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,value:0
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
 msgid "Value"
 msgstr "Valor"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Name of the Employee"
 msgstr "Nombre del empleado"
 
@@ -241,7 +259,8 @@ msgstr "Cálculo de la nómina"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
 msgid "Amount"
 msgstr "Import"
 
@@ -250,6 +269,7 @@ msgstr "Import"
 #, python-format
 msgid "Please check configuration of %s, payroll head is missing"
 msgstr ""
+"Si us plau, comproveu la configuració de %s, falta la capçalera de la nòmina"
 
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
@@ -265,7 +285,7 @@ msgstr "Altra informació"
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
 msgid "Country of Issue"
-msgstr ""
+msgstr "País de emisión"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
@@ -273,6 +293,7 @@ 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"
@@ -280,7 +301,7 @@ msgstr "Otras deducciones"
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Paid Holiday"
-msgstr ""
+msgstr "Vacaciones pagada"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -293,7 +314,7 @@ msgstr "Agrupa per..."
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
 msgid "Passport Expire Date"
-msgstr ""
+msgstr "Data expiració passaport"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
@@ -313,7 +334,7 @@ msgid ""
 msgstr "Camp usat en càlculs interns, no el col·loqueu en un formulari."
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Amount (in words) :"
 msgstr "Import (en paraules):"
 
@@ -323,6 +344,8 @@ msgid "Payment"
 msgstr "Pagament"
 
 #. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
 #: field:hr.payslip,line_ids:0
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
@@ -335,6 +358,7 @@ msgid "Identification No"
 msgstr "Nº identificació"
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,base:0
 msgid "Based on"
 msgstr "Basat en"
@@ -411,17 +435,23 @@ msgid "Visa No"
 msgstr "Número de Visa"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,from:0
+#: 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 "Des de"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr "Per salari"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_to:0
+#: field:hr.payroll.year.salary,date_to:0
+#: report:salary.structure:0
 msgid "End Date"
 msgstr "Data final"
 
@@ -436,8 +466,8 @@ msgid "Leave Deductions"
 msgstr "Deduccions per absència"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "Authorised Signature"
 msgstr "Firma autorizada"
 
@@ -452,12 +482,11 @@ msgid "Contribution Register Line"
 msgstr "Línea de registro de contribución"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Notes:"
 msgstr "Notes:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,based_on:0
 #: field:hr.payroll.advice,state:0
 #: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
@@ -490,10 +519,12 @@ msgid "Company Contributions"
 msgstr "Contribuciones de la compañía"
 
 #. 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
 msgstr "Empleat"
 
@@ -508,114 +539,127 @@ msgid "Bank Advice Lines"
 msgstr "Línies de notificació bancària"
 
 #. 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
-#: wizard_field:payroll.analysis,init,type:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "#"
-msgstr ""
+msgstr "Nº"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Error!"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Verify Sheet"
-msgstr ""
+msgstr "Comprova full"
 
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
 msgid "No of Working days / week for an employee"
-msgstr ""
+msgstr "Nombre de dies/setmanes treballats per empleat."
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "New Slip"
-msgstr ""
+msgstr "Nou justificant"
 
 #. module: hr_payroll
 #: field:hr.payslip,basic:0
 msgid "Net Basic"
-msgstr ""
+msgstr "Base neta"
 
 #. 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 ""
+msgstr "Salario bruto"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Earnings"
-msgstr ""
+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 ""
+msgstr "Declaració salari de l'empleat"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
-msgstr ""
+msgstr "Otros pagos"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Deductions"
-msgstr ""
+msgstr "Deduccions"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "C/D"
-msgstr ""
+msgstr "C/D"
 
 #. module: hr_payroll
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "Nº permiso trabajo"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,line_ids:0
 msgid "Employee Salary"
-msgstr ""
+msgstr "Salario empleado"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
 msgid "Chaque Nos"
-msgstr ""
+msgstr "Cadascun dels nostres"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Total per empleat"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: 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 ""
+msgstr "Import fix"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,to:0
+#: 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 ""
+msgstr "Fins el"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:180
@@ -627,102 +671,102 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error !"
-msgstr ""
+msgstr "Error de variable!"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
 msgid "hr.payroll.employees.detail"
-msgstr ""
+msgstr "hr.payroll.employees.detail"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Pay Salary"
-msgstr ""
+msgstr "Paga nòmina"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
-msgstr ""
+msgstr "Compte bancari"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
-msgstr ""
+msgstr "Líneas de contribución"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:hr.payroll.register.sheet:0
 msgid "For the month of"
-msgstr ""
+msgstr "Per al mes de"
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,deduction:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
-msgstr ""
+msgstr "Deducción"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice Note"
-msgstr ""
+msgstr "Observación aviso bancario"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
-msgstr ""
+msgstr "Nòmina"
 
 #. module: hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
+"Error! La data d'inici de contracte ha de ser anterior a la data de "
+"finalització."
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
-msgstr ""
+msgstr "Entrega anticipo"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
-#: view:hr.payslip:0
 msgid "Complete HR Checking"
-msgstr ""
+msgstr "Comprobación RH completa"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Yours Sincerely"
-msgstr ""
+msgstr "Atentament"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "SI. No."
-msgstr ""
+msgstr "Núm. SS"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Net Amount"
-msgstr ""
+msgstr "Importe neto"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary Structure:"
-msgstr ""
+msgstr "Estructura salarial:"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
 msgid "Employees Salary Detail"
-msgstr ""
+msgstr "Detalle salario empleado"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
 msgid "Function Line"
-msgstr ""
+msgstr "Línia de funció"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -730,62 +774,64 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Confirm Sheet"
-msgstr ""
+msgstr "Full de confirmació"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Others:"
-msgstr ""
+msgstr "Altres:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: selection:company.contribution,amount_type:0
 msgid "Function Calculation"
-msgstr ""
+msgstr "Funció de càlcul"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
 msgid "Worked Day"
-msgstr ""
+msgstr "Dies treballats"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total per companyia"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
 msgid "D/C"
-msgstr ""
+msgstr "D/C"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country & Address"
-msgstr ""
+msgstr "País i Adreça"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employee Code"
-msgstr ""
+msgstr "Codi d'empleat"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary – Leaves"
-msgstr ""
+msgstr "Salari base - Absències"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:company.contribution,amount_type:0
+#: field:company.contribution.line,amount_type:0
 #: field:hr.payslip.line,amount_type:0
-#: rml:salary.structure:0
+#: field:hr.payslip.line.line,amount_type:0
+#: report:salary.structure:0
 msgid "Amount Type"
-msgstr ""
+msgstr "Tipus d'import"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
-#: rml:salary.structure:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -793,63 +839,60 @@ msgstr ""
 #: field:hr.payslip.line,company_contrib:0
 #: model:ir.model,name:hr_payroll.model_company_contribution
 msgid "Company Contribution"
-msgstr ""
+msgstr "Contribució companyia"
 
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
 msgid "Heads"
-msgstr ""
+msgstr "Capçaleres"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
 msgid "Print Statement"
-msgstr ""
+msgstr "Imprimir declaración"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Earnings"
-msgstr ""
+msgstr "Ingressos"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Bàsic"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
 msgid "All Passports"
-msgstr ""
+msgstr "Tots els passaports"
 
 #. 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 ""
+msgstr "Registre salarial"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
-msgstr ""
+msgstr "Nom de l'empleat"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
 msgid "Passport Detail"
-msgstr ""
+msgstr "Detalle pasaporte"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
 msgid "Percentage (%)"
-msgstr ""
+msgstr "Percentatge (%)"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,register_id:0
@@ -858,200 +901,197 @@ msgstr ""
 #: 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 ""
+msgstr "Registre de nòmines"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "For"
-msgstr ""
+msgstr "Per"
 
 #. module: hr_payroll
-#: view:hr.employee:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contractes"
 
 #. module: hr_payroll
-#: view:hr.employee.grade:0
+#: view:hr.payroll.structure:0
 msgid "Employee Function"
-msgstr ""
+msgstr "Funció de l'empleat"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Pagat"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "Aprobar hoja"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr ""
+msgstr "Pagat? "
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validació"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Title"
-msgstr ""
+msgstr "Títol"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 msgid "Search Company Contribution"
-msgstr ""
+msgstr "Cerca contribució de la companyia"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
-#: view:hr.payslip:0
-#: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Línies de pagament"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr ""
+msgstr "Calcula full"
 
 #. module: hr_payroll
+#: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
 msgid "Applied this head for calculation if condition is true"
-msgstr ""
+msgstr "Aplica aquest encapçalament en el càlcul si la condició es vertadera"
 
 #. module: hr_payroll
-#: rml:year.salary:0
+#: report:year.salary:0
 msgid "Yearly Salary Details"
-msgstr ""
+msgstr "Detalls del salari anual"
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Error! No podeu crear una jerarquia recursiva d'empleats."
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Condició"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for HR Verification"
-msgstr ""
+msgstr "Esperant verificació de RRHH"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Payment Advice:"
-msgstr ""
+msgstr "Avís de pagament:"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Compute"
-msgstr ""
+msgstr "Calcula"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 #: field:hr.payslip,deg_id:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Designation"
-msgstr ""
+msgstr "Designació"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "HR Manager"
-msgstr ""
+msgstr "Responsable de RRHH"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.contract,basic:0
+#: field:hr.employee,basic:0
 #: field:hr.payslip,basic_before_leaves:0
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Basic Salary"
-msgstr ""
+msgstr "Salari base"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Category Code"
-msgstr ""
+msgstr "Codi categoria"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Salary Information"
-msgstr ""
+msgstr "Informació del salari"
 
 #. 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 ""
+msgstr "Categoria prima/deducció"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Authorized Signature"
-msgstr ""
+msgstr "Firma autoritzada"
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
-msgstr ""
+msgstr "Contracte"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
 msgid "Draft Sheet"
-msgstr ""
+msgstr "Full esborrany"
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Next Month Date"
-msgstr ""
+msgstr "Data proper mes"
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,date:0
 #: field:hr.payroll.advice,date:0
 #: field:hr.payroll.register,date:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_expire:0
 msgid "Visa Expire Date"
-msgstr ""
+msgstr "Data expiració visat"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Search Passport"
-msgstr ""
+msgstr "Buscar pasaporte"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Phone No."
-msgstr ""
+msgstr "Nº telèfon"
 
 #. module: hr_payroll
 #: field:company.contribution,contribute_per:0
@@ -1060,44 +1100,47 @@ msgstr ""
 #: view:hr.contibution.register:0
 #: view:hr.contibution.register.line:0
 msgid "Contribution"
-msgstr ""
+msgstr "Contribució"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,state:0
 msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Company contribution"
-msgstr ""
+msgstr "Contribució companyia"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Other No."
-msgstr ""
+msgstr "Altre 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
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Code"
-msgstr ""
+msgstr "Codi"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-#: rml:payroll.advice:0
 msgid "Payment Advice"
-msgstr ""
+msgstr "Avís de pagament"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Number :"
-msgstr ""
+msgstr "Número :"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,base:0
@@ -1106,103 +1149,106 @@ msgid ""
 "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 ""
+"Això s'utilitza per calcular els valors dels camps %, en general en la seva "
+"base, però podeu utilitzar totes les capçaleres dels camps de codi en lletra "
+"petita com un nom de variable, per exemple hra, ma, lta, etc., també podeu "
+"utilitzar variable estàtica bàsica."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Computation Overview"
-msgstr ""
+msgstr "Resum del càlcul"
 
 #. module: hr_payroll
-#: wizard_field:wizard.year.salary,init,salary_on:0
+#: field:hr.payroll.year.salary,salary_on:0
 msgid "Salary On"
-msgstr ""
+msgstr "Salari sobre"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,number:0
 #: field:hr.payroll.register,number:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,number:0
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.contract,struct_id:0
 #: field:hr.employee,line_ids:0
-#: view:hr.employee.grade:0
-#: field:hr.employee.grade,line_ids:0
-#: rml:salary.structure:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,line_ids: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 ""
+msgstr "Estructura salarial"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,register_line_ids:0
 msgid "Register Line"
-msgstr ""
+msgstr "Línia registre"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
-#: wizard_button:payroll.analysis,init,end:0
-#: wizard_button:wizard.employees.detail,init,end:0
-#: wizard_button:wizard.year.salary,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
-#: rml:salary.structure:0
 msgid "Amount / Percentage"
-msgstr ""
+msgstr "Import / Percentatge"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
 msgid "Allowances"
-msgstr ""
+msgstr "Primes"
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
-msgstr ""
+msgstr "Data mes actual"
 
 #. module: hr_payroll
-#: view:hr.employee:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr ""
+msgstr "Salari"
 
 #. module: hr_payroll
 #: field:hr.contract,passport_id:0
-#: field:hr.employee,passport_id:0
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr "Número de passaport"
+
+#. module: hr_payroll
 #: view:hr.passport:0
 msgid "Passport"
-msgstr ""
+msgstr "Passaport"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Total Salary"
-msgstr ""
+msgstr "Salari total"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "for period"
-msgstr ""
+msgstr "per període"
 
 #. module: hr_payroll
-#: field:hr.expense.expense,category_id:0
 #: field:hr.holidays.status,head_id:0
 msgid "Payroll Head"
-msgstr ""
+msgstr "Capçalera nòmina"
 
 #. module: hr_payroll
 #: field:company.contribution,register_id:0
@@ -1210,31 +1256,34 @@ msgstr ""
 #: 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 ""
+msgstr "Registre de contribució"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "E-mail"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. 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 ""
+msgstr "Capçaleres salari"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "Imprimeix informe"
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,line_ids:0
+#: 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 ""
+msgstr "Cálculos"
 
 #. module: hr_payroll
 #: help:company.contribution,contribute_per:0
@@ -1243,307 +1292,350 @@ msgid ""
 "Contribute 5% then company will and here 0.50 defined then company will "
 "contribute 50% on employee 5% contribution"
 msgstr ""
+"Defineix un rati de contribució de la companyia 1,00=100% de la contribució. "
+"Si l'empleat contribueix amb el 5%, llavors si aquí la companyia té un rati "
+"de 0.50, la companyia contribuirà amb el 50% del 5% de la contribució de "
+"l'empleat."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Other Informations"
-msgstr ""
+msgstr "Altra informació"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Issue"
-msgstr ""
+msgstr "Incidència"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Dynamic Computation"
-msgstr ""
+msgstr "Càlcul dinàmic"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary without Leave:"
-msgstr ""
+msgstr "Salari base sense absències:"
 
 #. module: hr_payroll
-#: field:hr.employee.grade,function_id:0
+#: 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 ""
+msgstr "Funció"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "States"
-msgstr ""
+msgstr "Estats"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Estimat Sr./Sra.,"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
 msgid "Allowance Deduction Heads"
-msgstr ""
+msgstr "Capçaleres prima/deducció"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Gross Sal."
-msgstr ""
+msgstr "Sal. brut"
 
 #. 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 "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_from:0
+#: field:hr.payroll.year.salary,date_from:0
+#: report:salary.structure:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data inici"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Deduction -"
-msgstr ""
+msgstr "Deducció -"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Registers"
-msgstr ""
+msgstr "Registres de contribució"
 
 #. 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 ""
+msgstr "Nòmina"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "Tipus de salari"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
-msgstr ""
+msgstr "Sal. net"
 
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
 msgid "The Passport No must be unique !"
-msgstr ""
+msgstr "El número de passaport ha de ser únic!"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nom de categoria"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
 msgid "hr.payroll.year.salary"
-msgstr ""
+msgstr "hr.nòmina.any.salari"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Address"
-msgstr ""
+msgstr "Adreça"
 
 #. module: hr_payroll
 #: field:hr.payslip.line.line,slipline_id:0
 msgid "Slip Line"
-msgstr ""
+msgstr "Línia justificant"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Number of Leaves"
-msgstr ""
+msgstr "Número de fulls"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: 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 ""
+msgstr "Banc"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Cancel Sheet"
-msgstr ""
+msgstr "Cancel·la full"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
-msgstr ""
+msgstr "Bestreta"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
-msgstr ""
+msgstr "Primes i deduccions especials per empleat:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,name:0
+#: 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
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: field:hr.payslip.line.line,name:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+#: report:year.salary:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
+#: report:payslip.pdf:0
 msgid "Leaved Deduction"
-msgstr ""
+msgstr "Fulls de deducció"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,employee_ids:0
-#: wizard_field:wizard.year.salary,init,employee_ids:0
+#: 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 ""
+msgstr "Empleats"
 
 #. module: hr_payroll
-#: field:hr.employee,property_bank_account:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Compte bancari"
 
 #. module: hr_payroll
 #: help:company.contribution,register_id:0
 msgid "Contribution register based on company"
-msgstr ""
+msgstr "Registre de contribució basat en la empresa"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,sequence:0
 msgid "Use to arrange calculation sequence"
-msgstr ""
+msgstr "S'utilitza per organitzar la seqüència de càlcul"
 
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "Pagament total"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Leave Deductions Line:"
-msgstr ""
+msgstr "Línia de deduccions per absències:"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Account Verification"
-msgstr ""
+msgstr "Esperant per a la verificació del compte"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,comp_deduction:0
 msgid "Company Deduction"
-msgstr ""
+msgstr "Deducció de la compañía"
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Payroll Configurtion"
-msgstr ""
+msgstr "Configuració de la nòmina"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "Si us plau, definiu el compte bancari per al treballador %s"
 
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
-msgstr ""
+msgstr "Data d'emissió del passaport"
 
 #. 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 ""
+msgstr "Subsidi"
 
 #. module: hr_payroll
 #: field:hr.payslip,holiday_days:0
 msgid "No of Leaves"
-msgstr ""
+msgstr "Núm. de fulls"
 
 #. module: hr_payroll
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Altre id"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Detalls del banc"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Slip ID"
-msgstr ""
+msgstr "ID justificant"
 
 #. 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 ""
+msgstr "Seqüència"
 
 #. 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 ""
+msgstr "Nòmina dels treballadors"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Content"
-msgstr ""
+msgstr "Contingut de la carta"
 
 #. module: hr_payroll
-#: wizard_view:wizard.employees.detail,init:0
-#: wizard_view:wizard.year.salary,init:0
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
 msgid "Year Salary"
-msgstr ""
+msgstr "Salari anual"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
-msgstr ""
+msgstr "Prima / Deducció"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
 msgid "Bank Payment Advice"
-msgstr ""
+msgstr "Avís de pagament del banc"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Search Payslips"
-msgstr ""
+msgstr "Cerca nòmines"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payroll.advice:0
-#: rml:year.salary:0
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,contribute_ids:0
 msgid "Contributions"
-msgstr ""
+msgstr "Contribucions"
diff --git a/addons/hr_payroll/i18n/cs.po b/addons/hr_payroll/i18n/cs.po
new file mode 100644
index 00000000000..39f45018ed4
--- /dev/null
+++ b/addons/hr_payroll/i18n/cs.po
@@ -0,0 +1,1618 @@
+# Czech 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-25 12:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-26 05:50+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: 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 ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Expire"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: report:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,igross:0
+#: field:hr.payslip,inet:0
+msgid "Calculaton Field"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:1225
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:company.contribution,amount_type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,emp_deduction:0
+msgid "Employee Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.passport:0
+#: view:hr.payslip:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Valid From"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Posted"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Date :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Payments -"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leave Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Function Value"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Other Lines"
+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
+msgid "Function Arguments"
+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 ""
+
+#. 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.contract,working_days_per_week:0
+msgid "No of Working days / week for an employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 !"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "For the month of"
+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 ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+msgid "Function Calculation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country & Address"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary – Leaves"
+msgstr ""
+
+#. 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
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:hr.payslip.line,category_id:0
+msgid "Category"
+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 ""
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Approve Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+msgid "Search Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,active:0
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,condition:0
+msgid "Applied this head for calculation if condition is true"
+msgstr ""
+
+#. module: hr_payroll
+#: report:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "HR Manager"
+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 ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Category Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Next Month Date"
+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 ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Search Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. 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
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Other No."
+msgstr ""
+
+#. 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
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Number :"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Computation Overview"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.year.salary,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: field:hr.payslip,number:0
+msgid "Number"
+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.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 ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Print Report"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+msgid "Allowance Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Gross Sal."
+msgstr ""
+
+#. 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 "Description"
+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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Deduction -"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+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 ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Net Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
+msgid "hr.payroll.year.salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line.line,slipline_id:0
+msgid "Slip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Number of Leaves"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,register_id:0
+msgid "Contribution register based on company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,total_pay:0
+msgid "Total Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leave Deductions Line:"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:469
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+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 ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+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 ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
+msgid "Total"
+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 ""
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 7448ebd83c0..24c0f020c95 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: 2011-01-27 04:37+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1040,7 +1040,8 @@ msgid "Salary Information"
 msgstr "Vergütungsinformation"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 "Kategorien Zulagen u. Abzüge"
 
@@ -1922,315 +1923,3 @@ msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 
 #~ msgid "Print Salary Structure"
 #~ msgstr "Druck L+G Übersicht"
-
-#, python-format
-#~ msgid ""
-#~ "Variable Error : %s ' % (e)))\n"
-#~ "\n"
-#~ "                if sal_type in ('gross', 'net"
-#~ msgstr ""
-#~ "Fehler in Variable : %s ' % (e)))\n"
-#~ "\n"
-#~ "                if sal_type in ('gross', 'net"
-
-#, python-format
-#~ msgid ""
-#~ "Please check configuration of %s, payroll head is missing' % "
-#~ "(hday.holiday_status_id.name)))\n"
-#~ "                    \n"
-#~ "                res = {\n"
-#~ "                    'slip_id':slip.id,\n"
-#~ "                    'name':hday.holiday_status_id.name + '-%s' % "
-#~ "(hday.number_of_days),\n"
-#~ "                    'code':hday.holiday_status_id.code,\n"
-#~ "                    'amount_type':'fix',\n"
-#~ "                    'category_id':hday.holiday_status_id.head_id.id,\n"
-#~ "                    'sequence':hday.holiday_status_id.head_id.sequence\n"
-#~ "                }\n"
-#~ "                days = hday.number_of_days\n"
-#~ "                if hday.number_of_days < 0:\n"
-#~ "                    days = hday.number_of_days * -1\n"
-#~ "                total_leave += days\n"
-#~ "                if hday.holiday_status_id.type == 'paid':\n"
-#~ "                    paid_leave += days\n"
-#~ "                    continue\n"
-#~ "#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-#~ "(days)\n"
-#~ "#                    res['amount'] = perday * days\n"
-#~ "#                    res['type'] = 'allowance'\n"
-#~ "#                    leave += days\n"
-#~ "#                    total += perday * days\n"
-#~ "                \n"
-#~ "                elif hday.holiday_status_id.type == 'halfpaid':\n"
-#~ "                    paid_leave += (days / 2)\n"
-#~ "                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
-#~ "(days)\n"
-#~ "                    res['amount'] = perday * (days/2)\n"
-#~ "                    total += perday * (days/2)\n"
-#~ "                    leave += days / 2\n"
-#~ "                    res['type'] = 'deduction'\n"
-#~ "                else:\n"
-#~ "                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-#~ "(days)\n"
-#~ "                    res['amount'] = perday * days\n"
-#~ "                    res['type'] = 'deduction'\n"
-#~ "                    leave += days\n"
-#~ "                    total += perday * days\n"
-#~ "\n"
-#~ "                slip_line_pool.create(cr, uid, res, context=context)\n"
-#~ "            basic = basic - total\n"
-#~ "            leaves = total\n"
-#~ "            update.update({\n"
-#~ "                'basic':basic,\n"
-#~ "                'basic_before_leaves': round(basic_before_leaves),\n"
-#~ "                'leaves':total,\n"
-#~ "                'holiday_days':leave,\n"
-#~ "                'worked_days':working_day - leave,\n"
-#~ "                'working_days':working_day,\n"
-#~ "            })\n"
-#~ "            self.write(cr, uid, [slip.id], update, context=context)\n"
-#~ "        return True\n"
-#~ "hr_payslip()\n"
-#~ "\n"
-#~ "class hr_payslip_line(osv.osv):\n"
-#~ "    '''\n"
-#~ "    Payslip Line\n"
-#~ "    '''\n"
-#~ "    \n"
-#~ "    _name = 'hr.payslip.line'\n"
-#~ "    _description = 'Payslip Line'\n"
-#~ "\n"
-#~ "    def onchange_category(self, cr, uid, ids, category_id):\n"
-#~ "        seq = 0\n"
-#~ "        res = {\n"
-#~ "        }\n"
-#~ "        if category_id:\n"
-#~ "            category = self.pool.get('hr.allounce.deduction.categoty"
-#~ msgstr ""
-#~ "Bitte prüfe die Konfiguration von %s, Zulagen und Abzüge für die Abrechnung "
-#~ "fehlen' % (hday.holiday_status_id.name)))\n"
-#~ "                    \n"
-#~ "                res = {\n"
-#~ "                    'slip_id':slip.id,\n"
-#~ "                    'name':hday.holiday_status_id.name + '-%s' % "
-#~ "(hday.number_of_days),\n"
-#~ "                    'code':hday.holiday_status_id.code,\n"
-#~ "                    'amount_type':'fix',\n"
-#~ "                    'category_id':hday.holiday_status_id.head_id.id,\n"
-#~ "                    'sequence':hday.holiday_status_id.head_id.sequence\n"
-#~ "                }\n"
-#~ "                days = hday.number_of_days\n"
-#~ "                if hday.number_of_days < 0:\n"
-#~ "                    days = hday.number_of_days * -1\n"
-#~ "                total_leave += days\n"
-#~ "                if hday.holiday_status_id.type == 'paid':\n"
-#~ "                    paid_leave += days\n"
-#~ "                    continue\n"
-#~ "#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-#~ "(days)\n"
-#~ "#                    res['amount'] = perday * days\n"
-#~ "#                    res['type'] = 'allowance'\n"
-#~ "#                    leave += days\n"
-#~ "#                    total += perday * days\n"
-#~ "                \n"
-#~ "                elif hday.holiday_status_id.type == 'halfpaid':\n"
-#~ "                    paid_leave += (days / 2)\n"
-#~ "                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
-#~ "(days)\n"
-#~ "                    res['amount'] = perday * (days/2)\n"
-#~ "                    total += perday * (days/2)\n"
-#~ "                    leave += days / 2\n"
-#~ "                    res['type'] = 'deduction'\n"
-#~ "                else:\n"
-#~ "                    res['name'] = hday.holiday_status_id.name + '-%s' % "
-#~ "(days)\n"
-#~ "                    res['amount'] = perday * days\n"
-#~ "                    res['type'] = 'deduction'\n"
-#~ "                    leave += days\n"
-#~ "                    total += perday * days\n"
-#~ "\n"
-#~ "                slip_line_pool.create(cr, uid, res, context=context)\n"
-#~ "            basic = basic - total\n"
-#~ "            leaves = total\n"
-#~ "            update.update({\n"
-#~ "                'basic':basic,\n"
-#~ "                'basic_before_leaves': round(basic_before_leaves),\n"
-#~ "                'leaves':total,\n"
-#~ "                'holiday_days':leave,\n"
-#~ "                'worked_days':working_day - leave,\n"
-#~ "                'working_days':working_day,\n"
-#~ "            })\n"
-#~ "            self.write(cr, uid, [slip.id], update, context=context)\n"
-#~ "        return True\n"
-#~ "hr_payslip()\n"
-#~ "\n"
-#~ "class hr_payslip_line(osv.osv):\n"
-#~ "    '''\n"
-#~ "    Payslip Line\n"
-#~ "    '''\n"
-#~ "    \n"
-#~ "    _name = 'hr.payslip.line'\n"
-#~ "    _description = 'Payslip Line'\n"
-#~ "\n"
-#~ "    def onchange_category(self, cr, uid, ids, category_id):\n"
-#~ "        seq = 0\n"
-#~ "        res = {\n"
-#~ "        }\n"
-#~ "        if category_id:\n"
-#~ "            category = self.pool.get('hr.allounce.deduction.categoty"
-
-#, python-format
-#~ msgid ""
-#~ "Variable Error : %s ' % (e)))\n"
-#~ "                amount = 0.0\n"
-#~ "                if line.amount_type == 'per':\n"
-#~ "                    amount = amt * line.amount\n"
-#~ "                elif line.amount_type == 'func':\n"
-#~ "                    amount = slip_line_pool.execute_function(cr, uid, "
-#~ "line.id, amt, context)\n"
-#~ "                elif line.amount_type == 'fix':\n"
-#~ "                    amount = line.amount\n"
-#~ "                \n"
-#~ "                if line.type == 'allowance':\n"
-#~ "                    allowance += amount\n"
-#~ "                elif line.type == 'deduction':\n"
-#~ "                    deduction += amount\n"
-#~ "            \n"
-#~ "            vals[employee.id] = {\n"
-#~ "                'basic':basic, \n"
-#~ "                'advantages_gross':allowance, \n"
-#~ "                'gross':basic + allowance, \n"
-#~ "                'advantages_net':deduction,\n"
-#~ "                'net':basic + allowance - deduction\n"
-#~ "            }\n"
-#~ "        return vals\n"
-#~ "    \n"
-#~ "    _columns = {\n"
-#~ "        'passport_id':fields.many2one('hr.passport', 'Passport', "
-#~ "required=False, domain=\"[('employee_id','=',active_id), "
-#~ "('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
-#~ msgstr ""
-#~ "Fehler in Variable : %s ' % (e)))\n"
-#~ "                amount = 0.0\n"
-#~ "                if line.amount_type == 'per':\n"
-#~ "                    amount = amt * line.amount\n"
-#~ "                elif line.amount_type == 'func':\n"
-#~ "                    amount = slip_line_pool.execute_function(cr, uid, "
-#~ "line.id, amt, context)\n"
-#~ "                elif line.amount_type == 'fix':\n"
-#~ "                    amount = line.amount\n"
-#~ "                \n"
-#~ "                if line.type == 'allowance':\n"
-#~ "                    allowance += amount\n"
-#~ "                elif line.type == 'deduction':\n"
-#~ "                    deduction += amount\n"
-#~ "            \n"
-#~ "            vals[employee.id] = {\n"
-#~ "                'basic':basic, \n"
-#~ "                'advantages_gross':allowance, \n"
-#~ "                'gross':basic + allowance, \n"
-#~ "                'advantages_net':deduction,\n"
-#~ "                'net':basic + allowance - deduction\n"
-#~ "            }\n"
-#~ "        return vals\n"
-#~ "    \n"
-#~ "    _columns = {\n"
-#~ "        'passport_id':fields.many2one('hr.passport', 'Passport', "
-#~ "required=False, domain=\"[('employee_id','=',active_id), "
-#~ "('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
-
-#, python-format
-#~ msgid ""
-#~ "Variable Error : %s ' % (e)))\n"
-#~ "                elif line.amount_type in ('fix', 'func"
-#~ msgstr ""
-#~ "Fehler in Variable : %s ' % (e)))\n"
-#~ "                elif line.amount_type in ('fix', 'func"
-
-#, python-format
-#~ msgid ""
-#~ "Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
-#~ "                pline = {\n"
-#~ "                    'advice_id':pid,\n"
-#~ "                    'name':slip.employee_id.bank_account_id.acc_number,\n"
-#~ "                    'employee_id':slip.employee_id.id,\n"
-#~ "                    'amount':slip.other_pay + slip.net,\n"
-#~ "                    'bysal':slip.net\n"
-#~ "                }\n"
-#~ "                id = advice_line_pool.create(cr, uid, pline, "
-#~ "context=context)\n"
-#~ "\n"
-#~ "        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def process_sheet(self, cr, uid, ids, context=None):\n"
-#~ "        slip_pool = self.pool.get('hr.payslip"
-#~ msgstr ""
-#~ "Bitte definieren Sie das Bankkonto für den Mitarbeiter %s employee' % "
-#~ "(slip.employee_id.name)))\n"
-#~ "                pline = {\n"
-#~ "                    'advice_id':pid,\n"
-#~ "                    'name':slip.employee_id.bank_account_id.acc_number,\n"
-#~ "                    'employee_id':slip.employee_id.id,\n"
-#~ "                    'amount':slip.other_pay + slip.net,\n"
-#~ "                    'bysal':slip.net\n"
-#~ "                }\n"
-#~ "                id = advice_line_pool.create(cr, uid, pline, "
-#~ "context=context)\n"
-#~ "\n"
-#~ "        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def process_sheet(self, cr, uid, ids, context=None):\n"
-#~ "        slip_pool = self.pool.get('hr.payslip"
-
-#~ msgid "Contibution Register"
-#~ msgstr "Arbeitgeberanteile"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#, python-format
-#~ msgid ""
-#~ "Variable Error : %s ' % (e)))\n"
-#~ "\n"
-#~ "                if not calculate:\n"
-#~ "                    continue\n"
-#~ "\n"
-#~ "                percent = 0.0\n"
-#~ "                value = 0.0\n"
-#~ "                base = False\n"
-#~ "                company_contrib = 0.0\n"
-#~ "                base = line.category_id.base\n"
-#~ "\n"
-#~ "                try:\n"
-#~ "                    #Please have a look at the configuration guide.\n"
-#~ "                    amt = eval(base, obj)\n"
-#~ "                except Exception, e:\n"
-#~ "                    raise osv.except_osv(_('Variable Error !"
-#~ msgstr ""
-#~ "Fehler in Variable : %s ' % (e)))\n"
-#~ "\n"
-#~ "                if not calculate:\n"
-#~ "                    continue\n"
-#~ "\n"
-#~ "                percent = 0.0\n"
-#~ "                value = 0.0\n"
-#~ "                base = False\n"
-#~ "                company_contrib = 0.0\n"
-#~ "                base = line.category_id.base\n"
-#~ "\n"
-#~ "                try:\n"
-#~ "                    #Please have a look at the configuration guide.\n"
-#~ "                    amt = eval(base, obj)\n"
-#~ "                except Exception, e:\n"
-#~ "                    raise osv.except_osv(_('Variable Error !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/hr_payroll/i18n/en_GB.po b/addons/hr_payroll/i18n/en_GB.po
index 81fc2bf3edf..f63101783dc 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: 2011-01-22 04:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1023,7 +1023,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 4ffc674123a..73986d2b1c2 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: 2011-01-19 04:46+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -251,7 +251,7 @@ msgstr "Nombre del empleado"
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Register Lines"
-msgstr "Lineas de Registro"
+msgstr "Líneas de registro"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -638,7 +638,7 @@ msgstr "Salario empleado"
 #. module: hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
 msgid "Chaque Nos"
-msgstr ""
+msgstr "Cada uno de nuestros"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_emp:0
@@ -1039,7 +1039,8 @@ msgid "Salary Information"
 msgstr "Información del salario"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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"
 
@@ -1149,6 +1150,10 @@ msgid ""
 "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
@@ -1288,6 +1293,10 @@ msgid ""
 "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
@@ -1632,11 +1641,119 @@ msgstr "Total"
 msgid "Contributions"
 msgstr "Contribuciones"
 
-#~ msgid "Contibution Register"
-#~ msgstr "Registro de contribución"
-
 #~ msgid "Categoty Code"
 #~ msgstr "Código de categoría"
 
 #~ msgid "Categoty Name"
 #~ msgstr "Nombre categoría"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre del modelo inválido en la definición de acción."
+
+#~ msgid "Analytic Account for Salary Analysis"
+#~ msgstr "Cuenta analítica para análisis de nóminas"
+
+#~ 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"
diff --git a/addons/hr_payroll/i18n/es_EC.po b/addons/hr_payroll/i18n/es_EC.po
index bc0d2af27fe..7ecd10485d8 100644
--- a/addons/hr_payroll/i18n/es_EC.po
+++ b/addons/hr_payroll/i18n/es_EC.po
@@ -8,24 +8,25 @@ 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 21:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-11 13:23+0000\n"
+"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
+"<chris.ormaza@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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "E-mail Address"
-msgstr ""
+msgstr "Dirección de correo electrónico"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Based"
-msgstr ""
+msgstr "Basado"
 
 #. module: hr_payroll
 #: field:hr.contract,net:0
@@ -34,17 +35,17 @@ msgstr ""
 #: field:hr.payslip,net:0
 #: report:salary.structure:0
 msgid "Net Salary"
-msgstr ""
+msgstr "Salario neto"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "Recalcular plantilla"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employees Salary Details"
-msgstr ""
+msgstr "Detalles de Salarios de Empleados"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -55,35 +56,35 @@ msgstr ""
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Deductions:"
-msgstr ""
+msgstr "Deducciones:"
 
 #. module: hr_payroll
 #: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
-msgstr ""
+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 ""
+msgstr "Días de trabajo"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
-msgstr ""
+msgstr "Préstamo"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
-msgstr ""
+msgstr "Registro de pago de nómina"
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
@@ -91,23 +92,23 @@ msgstr ""
 #: field:hr.payroll.register,line_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr ""
+msgstr "Nóminas"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
 msgid "Year Salary Report"
-msgstr ""
+msgstr "Informe anual de salarios"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Paid Salary"
-msgstr ""
+msgstr "Nómina pagada"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: hr_payroll
 #: field:company.contribution,company_id:0
@@ -119,30 +120,30 @@ msgstr ""
 #: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "The Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Details"
-msgstr ""
+msgstr "Detalles de la carta"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:payslip.pdf:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Cambiar a borrador"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:180
@@ -154,41 +155,41 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error: %s "
-msgstr ""
+msgstr "Error variable: %s "
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
-msgstr ""
+msgstr "Vencimiento"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Half-Pay Holiday"
-msgstr ""
+msgstr "Vacaciones con media paga"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
-msgstr ""
+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 ""
+msgstr "Nómina"
 
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Contract Detail:"
-msgstr ""
+msgstr "Detalles del contrato:"
 
 #. module: hr_payroll
 #: field:hr.payslip,igross:0
 #: field:hr.payslip,inet:0
 msgid "Calculaton Field"
-msgstr ""
+msgstr "Campo de cálculo"
 
 #. module: hr_payroll
 #: help:hr.payroll.advice,bank_id:0
@@ -200,20 +201,20 @@ msgstr ""
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
 msgid "Bank Advice"
-msgstr ""
+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 ""
+msgstr "Rechazar"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
-msgstr ""
+msgstr "Ausencias"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,register_id:0
@@ -221,84 +222,87 @@ msgstr ""
 #: field:hr.payslip,register_id:0
 #: report:payslip.pdf:0
 msgid "Register"
-msgstr ""
+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 ""
+msgstr "Total de Deducciones"
 
 #. module: hr_payroll
 #: field:company.contribution.line,value:0
 #: field:hr.payslip.line.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Name of the Employee"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Register Lines"
-msgstr ""
+msgstr "Líneas de registro"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Salary Computation"
-msgstr ""
+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 ""
+msgstr "Monto"
 
 #. 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 ""
+msgstr "Porcentaje"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: view:hr.allounce.deduction.categoty:0
 msgid "Other Information"
-msgstr ""
+msgstr "Otra Información"
 
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
 msgid "Country of Issue"
-msgstr ""
+msgstr "País de emisión"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
 msgid "Employee Deduction"
-msgstr ""
+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 ""
+msgstr "Otras deducciones"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Paid Holiday"
-msgstr ""
+msgstr "Vacaciones pagada"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -306,39 +310,39 @@ msgstr ""
 #: view:hr.passport:0
 #: view:hr.payslip:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agroupar por ..."
 
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
 msgid "Passport Expire Date"
-msgstr ""
+msgstr "Fecha de Expiración de Pasaporte"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Un-Paid Holiday"
-msgstr ""
+msgstr "Vacaciones no pagadas"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Valid From"
-msgstr ""
+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 ""
+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 ""
+msgstr "Monto (en letras) :"
 
 #. module: hr_payroll
 #: field:hr.holidays.status,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Pago"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -347,39 +351,39 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
 msgid "Payslip Line"
-msgstr ""
+msgstr "Línea de nómina"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Identification No"
-msgstr ""
+msgstr "Nº identificación"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,base:0
 msgid "Based on"
-msgstr ""
+msgstr "Basado en"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Verification"
-msgstr ""
+msgstr "Esperando verificación"
 
 #. module: hr_payroll
 #: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
 msgid "Human Resource Payroll"
-msgstr ""
+msgstr "Nóminas de recursos humanos"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Posted"
-msgstr ""
+msgstr "Asentado"
 
 #. module: hr_payroll
 #: model:ir.module.module,description:hr_payroll.module_meta_information
@@ -395,31 +399,41 @@ msgid ""
 "    * 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 ""
+msgstr "Tipo de ausencia"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Date :"
-msgstr ""
+msgstr "Fecha:"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,total:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Payments -"
-msgstr ""
+msgstr "Pagos -"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "Número de Visa"
 
 #. module: hr_payroll
 #: field:company.contribution.line,from_val:0
@@ -427,68 +441,68 @@ msgstr ""
 #: field:hr.payslip.line.line,from_val:0
 #: report:year.salary:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
 #: report:payroll.advice:0
 msgid "By Salary"
-msgstr ""
+msgstr "Por 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 ""
+msgstr "Fecha Final"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
 msgid "Employee PaySlip"
-msgstr ""
+msgstr "Rol de Pagos de Empleado"
 
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
-msgstr ""
+msgstr "Deducciones por Ausencia"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:payroll.advice:0
 msgid "Authorised Signature"
-msgstr ""
+msgstr "Firma autorizada"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Function Value"
-msgstr ""
+msgstr "Valor de función"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
 msgid "Contribution Register Line"
-msgstr ""
+msgstr "Línea de registro de contribución"
 
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Notes:"
-msgstr ""
+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 ""
+msgstr "Estado"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Paymeny Lines"
-msgstr ""
+msgstr "Líneas de Pago"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Other Lines"
-msgstr ""
+msgstr "Otras Líneas"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -497,13 +511,13 @@ msgstr ""
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Function Arguments"
-msgstr ""
+msgstr "Argumentos de la función"
 
 #. 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 ""
+msgstr "Contribuciones de la compañía"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,employee_id:0
@@ -513,17 +527,17 @@ msgstr ""
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Empleado(a)"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,base:0
 msgid "Formula"
-msgstr ""
+msgstr "Fórmula"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
 msgid "Bank Advice Lines"
-msgstr ""
+msgstr "Líneas de notificación bancaria"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -532,46 +546,46 @@ msgstr ""
 #: field:hr.payslip.line,type:0
 #: report:salary.structure:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "#"
-msgstr ""
+msgstr "Nº"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Verify Sheet"
-msgstr ""
+msgstr "Comprobar Hoja"
 
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
 msgid "No of Working days / week for an employee"
-msgstr ""
+msgstr "Número de días/semanas trabajados por un empleado."
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "New Slip"
-msgstr ""
+msgstr "Nuevo Justificante"
 
 #. module: hr_payroll
 #: field:hr.payslip,basic:0
 msgid "Net Basic"
-msgstr ""
+msgstr "Base neta"
 
 #. module: hr_payroll
 #: field:hr.contract,gross:0
@@ -580,46 +594,46 @@ msgstr ""
 #: field:hr.payslip,grows:0
 #: report:salary.structure:0
 msgid "Gross Salary"
-msgstr ""
+msgstr "Salario bruto"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Total Earnings"
-msgstr ""
+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 ""
+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 ""
+msgstr "Otros pagos"
 
 #. module: hr_payroll
 #: field:hr.employee,advantages_net:0
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Deductions"
-msgstr ""
+msgstr "Deducciones"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "C/D"
-msgstr ""
+msgstr "C/D"
 
 #. module: hr_payroll
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "Nº Permiso de Trabajo"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,line_ids:0
 msgid "Employee Salary"
-msgstr ""
+msgstr "Salario del Empleado"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
@@ -629,7 +643,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Total por empleado"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -638,7 +652,7 @@ msgstr ""
 #: selection:hr.payslip.line,amount_type:0
 #: selection:hr.payslip.line.line,amount_type:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Importe fijo"
 
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
@@ -646,7 +660,7 @@ msgstr ""
 #: field:hr.payslip.line.line,to_val:0
 #: report:year.salary:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:180
@@ -658,33 +672,33 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error !"
-msgstr ""
+msgstr "¡Error de variable!"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
 msgid "hr.payroll.employees.detail"
-msgstr ""
+msgstr "hr.payroll.employees.detail"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Pay Salary"
-msgstr ""
+msgstr "Pagar Nómina"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
 msgid "Bank Account A/C"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
-msgstr ""
+msgstr "Líneas de contribución"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "For the month of"
-msgstr ""
+msgstr "Para el mes de"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -694,7 +708,7 @@ msgstr ""
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
-msgstr ""
+msgstr "Deducción"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
@@ -705,28 +719,30 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
-msgstr ""
+msgstr "Nómina"
 
 #. 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 anterior a 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 ""
+msgstr "Entrega anticipo"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Complete HR Checking"
-msgstr ""
+msgstr "Comprobación RH completa"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Yours Sincerely"
-msgstr ""
+msgstr "Atentamente"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -736,22 +752,22 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Net Amount"
-msgstr ""
+msgstr "Importe neto"
 
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary Structure:"
-msgstr ""
+msgstr "Estructura salarial:"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
 msgid "Employees Salary Detail"
-msgstr ""
+msgstr "Detalle del salario del empleado"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
 msgid "Function Line"
-msgstr ""
+msgstr "Línea de función"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -759,49 +775,49 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Confirm Sheet"
-msgstr ""
+msgstr "Hoja de confirmación"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Others:"
-msgstr ""
+msgstr "Otros:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: selection:company.contribution,amount_type:0
 msgid "Function Calculation"
-msgstr ""
+msgstr "Función de cálculo"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
 #: report:payslip.pdf:0
 msgid "Worked Day"
-msgstr ""
+msgstr "Días trabajados"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total por compañía"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
 msgid "D/C"
-msgstr ""
+msgstr "D/C"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country & Address"
-msgstr ""
+msgstr "País y Dirección"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employee Code"
-msgstr ""
+msgstr "Código de empleado"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary – Leaves"
-msgstr ""
+msgstr "Salario base - Ausencias"
 
 #. module: hr_payroll
 #: field:company.contribution,amount_type:0
@@ -810,13 +826,13 @@ msgstr ""
 #: field:hr.payslip.line.line,amount_type:0
 #: report:salary.structure:0
 msgid "Amount Type"
-msgstr ""
+msgstr "Tipo de importe"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -824,60 +840,60 @@ msgstr ""
 #: field:hr.payslip.line,company_contrib:0
 #: model:ir.model,name:hr_payroll.model_company_contribution
 msgid "Company Contribution"
-msgstr ""
+msgstr "Contribución compañía"
 
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
 msgid "Heads"
-msgstr ""
+msgstr "Cabeceras"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
 msgid "Print Statement"
-msgstr ""
+msgstr "Imprimir declaración"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Earnings"
-msgstr ""
+msgstr "Ingresos"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Básico"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
 msgid "All Passports"
-msgstr ""
+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 ""
+msgstr "Registro Salarial"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
 msgid "Passport Detail"
-msgstr ""
+msgstr "Detalle del Pasaporte"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Percentage (%)"
-msgstr ""
+msgstr "Porcentaje (%)"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,register_id:0
@@ -886,7 +902,7 @@ msgstr ""
 #: 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 ""
+msgstr "Registro de nómina"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -897,68 +913,68 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contratos"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
-msgstr ""
+msgstr "Función del empleado"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Pagado"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "Aprobar hoja"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr ""
+msgstr "¿Pagado? "
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validación"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Title"
-msgstr ""
+msgstr "Tratamiento:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 msgid "Search Company Contribution"
-msgstr ""
+msgstr "Buscar contribución de la compañía"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr ""
+msgstr "Calcular hoja"
 
 #. module: hr_payroll
 #: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
 msgid "Applied this head for calculation if condition is true"
-msgstr ""
+msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
 
 #. module: hr_payroll
 #: report:year.salary:0
@@ -1023,7 +1039,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/es_MX.po b/addons/hr_payroll/i18n/es_MX.po
new file mode 100644
index 00000000000..acd665f6557
--- /dev/null
+++ b/addons/hr_payroll/i18n/es_MX.po
@@ -0,0 +1,1759 @@
+# 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-18 11:08+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:46+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "E-mail Address"
+msgstr "Dirección de correo electrónico"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+msgstr "Basado"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr "Recalcular plantilla"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employees Salary Details"
+msgstr "Detalles salario de los empleados"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr "Primas con base:"
+
+#. 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
+#: 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"
+
+#. module: hr_payroll
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employee"
+msgstr "Nombre del empleado"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr "Líneas de registro"
+
+#. 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"
+
+#. 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
+#: 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"
+
+#. 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"
+
+#. 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr "Fórmula"
+
+#. 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"
+
+#. 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
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+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 !"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr "Comprobar hoja"
+
+#. 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."
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr "Nuevo justificante"
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+msgstr "Base neta"
+
+#. 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
+#, python-format
+msgid "Variable Error !"
+msgstr "¡Error de variable!"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr "rrhh.nomina.empleados.detalle"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr "Pagar nómina"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr "Cuenta bancaria"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr "Líneas de contribución"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "For the month of"
+msgstr "Para el mes de"
+
+#. 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"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "Observación aviso bancario"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr "Nómina"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Complete HR Checking"
+msgstr "Comprobación RH completa"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr "Atentamente"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr "Nº SS"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Net Amount"
+msgstr "Importe neto"
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary Structure:"
+msgstr "Estructura salarial:"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+msgid "Employees Salary Detail"
+msgstr "Detalle salario empleado"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr "Línea de función"
+
+#. 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
+msgid "Amount Type"
+msgstr "Tipo de importe"
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:hr.payslip.line,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr "Cabeceras"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr "Imprimir declaración"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr "Función del empleado"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr "Calcular hoja"
+
+#. module: hr_payroll
+#: field:company.contribution,active:0
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. 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"
+
+#. 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."
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. 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"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr "Aviso de pago:"
+
+#. 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
+msgid "Designation"
+msgstr "Designación"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr "Responsable de RRHH"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr "Firma autorizada"
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr "Hoja borrador"
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Next Month Date"
+msgstr "Fecha próximo mes"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Fecha expiración visado"
+
+#. 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
+msgid "Contribution"
+msgstr "Contribución"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr "Contribución compañía"
+
+#. 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
+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"
+
+#. module: hr_payroll
+#: field:hr.payroll.year.salary,salary_on:0
+msgid "Salary On"
+msgstr "Salario sobre"
+
+#. 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"
+
+#. 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.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"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr "Incidencia"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr "Cálculo Dinámico"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+msgstr "Salario base sin ausencias:"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Estados"
+
+#. 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 "Description"
+msgstr "Descripción"
+
+#. 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
+msgid ")"
+msgstr ")"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+msgstr "Registros de contribución"
+
+#. 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"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr "Tipo de salario"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr "Deducción de la Compañía"
+
+#. 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
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr "Fecha de emisión del pasaporte"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr "N º de hojas"
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr "Otro id"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Bank Details"
+msgstr "Detalles bancarios"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+msgstr "ID justificante"
+
+#. 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"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr "Contenido carta"
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "Salario anual"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr "Prima / Deducción"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr "Aviso de pago del banco"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr "Buscar nóminas"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
+msgid "Total"
+msgstr "Total"
+
+#. 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"
+
+#~ msgid "Categoty Code"
+#~ msgstr "Código de categoría"
+
+#~ msgid "Categoty Name"
+#~ msgstr "Nombre categoría"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre del modelo inválido en la definición de acción."
+
+#~ msgid "Analytic Account for Salary Analysis"
+#~ msgstr "Cuenta analítica para análisis de nóminas"
+
+#~ 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"
diff --git a/addons/hr_payroll/i18n/es_VE.po b/addons/hr_payroll/i18n/es_VE.po
new file mode 100644
index 00000000000..acd665f6557
--- /dev/null
+++ b/addons/hr_payroll/i18n/es_VE.po
@@ -0,0 +1,1759 @@
+# 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-18 11:08+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:46+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "E-mail Address"
+msgstr "Dirección de correo electrónico"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+msgstr "Basado"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr "Recalcular plantilla"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employees Salary Details"
+msgstr "Detalles salario de los empleados"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr "Primas con base:"
+
+#. 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
+#: 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"
+
+#. module: hr_payroll
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employee"
+msgstr "Nombre del empleado"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr "Líneas de registro"
+
+#. 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"
+
+#. 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
+#: 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"
+
+#. 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"
+
+#. 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr "Fórmula"
+
+#. 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"
+
+#. 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
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+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 !"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr "Comprobar hoja"
+
+#. 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."
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr "Nuevo justificante"
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+msgstr "Base neta"
+
+#. 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
+#, python-format
+msgid "Variable Error !"
+msgstr "¡Error de variable!"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr "rrhh.nomina.empleados.detalle"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr "Pagar nómina"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr "Cuenta bancaria"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr "Líneas de contribución"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "For the month of"
+msgstr "Para el mes de"
+
+#. 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"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "Observación aviso bancario"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr "Nómina"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Complete HR Checking"
+msgstr "Comprobación RH completa"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr "Atentamente"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr "Nº SS"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Net Amount"
+msgstr "Importe neto"
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary Structure:"
+msgstr "Estructura salarial:"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+msgid "Employees Salary Detail"
+msgstr "Detalle salario empleado"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr "Línea de función"
+
+#. 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
+msgid "Amount Type"
+msgstr "Tipo de importe"
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:hr.payslip.line,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr "Cabeceras"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr "Imprimir declaración"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr "Función del empleado"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr "Calcular hoja"
+
+#. module: hr_payroll
+#: field:company.contribution,active:0
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. 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"
+
+#. 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."
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. 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"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr "Aviso de pago:"
+
+#. 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
+msgid "Designation"
+msgstr "Designación"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr "Responsable de RRHH"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr "Firma autorizada"
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr "Hoja borrador"
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Next Month Date"
+msgstr "Fecha próximo mes"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Fecha expiración visado"
+
+#. 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
+msgid "Contribution"
+msgstr "Contribución"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr "Contribución compañía"
+
+#. 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
+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"
+
+#. module: hr_payroll
+#: field:hr.payroll.year.salary,salary_on:0
+msgid "Salary On"
+msgstr "Salario sobre"
+
+#. 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"
+
+#. 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.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"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr "Incidencia"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr "Cálculo Dinámico"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+msgstr "Salario base sin ausencias:"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Estados"
+
+#. 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 "Description"
+msgstr "Descripción"
+
+#. 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
+msgid ")"
+msgstr ")"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+msgstr "Registros de contribución"
+
+#. 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"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr "Tipo de salario"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr "Deducción de la Compañía"
+
+#. 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
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr "Fecha de emisión del pasaporte"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr "N º de hojas"
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr "Otro id"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Bank Details"
+msgstr "Detalles bancarios"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+msgstr "ID justificante"
+
+#. 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"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr "Contenido carta"
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "Salario anual"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr "Prima / Deducción"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr "Aviso de pago del banco"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr "Buscar nóminas"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
+msgid "Total"
+msgstr "Total"
+
+#. 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"
+
+#~ msgid "Categoty Code"
+#~ msgstr "Código de categoría"
+
+#~ msgid "Categoty Name"
+#~ msgstr "Nombre categoría"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre del modelo inválido en la definición de acción."
+
+#~ msgid "Analytic Account for Salary Analysis"
+#~ msgstr "Cuenta analítica para análisis de nóminas"
+
+#~ 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"
diff --git a/addons/hr_payroll/i18n/et.po b/addons/hr_payroll/i18n/et.po
index 9e1a3e99937..32865eb3b83 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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1023,7 +1023,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/fi.po b/addons/hr_payroll/i18n/fi.po
index 005ef8357a8..5eb02fe424a 100644
--- a/addons/hr_payroll/i18n/fi.po
+++ b/addons/hr_payroll/i18n/fi.po
@@ -14,11 +14,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-25 04:39+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "E-mail Address"
 msgstr "Sähköpostiosoite"
 
@@ -28,8 +28,11 @@ msgid "Based"
 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 ""
 
@@ -39,43 +42,46 @@ msgid "Recompute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employees Salary Details"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Allowances with Basic:"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Department"
 msgstr "Osasto"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Deductions:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,gratuity:0
+#: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
 msgstr ""
 
 #. 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 ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
 msgstr ""
 
@@ -83,6 +89,7 @@ msgstr ""
 #: field:hr.employee,slip_ids:0
 #: view:hr.payroll.register:0
 #: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
@@ -103,14 +110,19 @@ 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
-#: wizard_field:payroll.analysis,init,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "The Manager"
 msgstr ""
 
@@ -120,7 +132,8 @@ msgid "Letter Details"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
+#: report:payslip.pdf:0
 msgid ","
 msgstr ""
 
@@ -154,8 +167,7 @@ msgid "Half-Pay Holiday"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
 msgstr ""
@@ -163,12 +175,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip.line,slip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Contract Detail:"
 msgstr ""
 
@@ -198,12 +210,16 @@ msgid "Reject"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
 msgstr ""
 
 #. 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 ""
 
@@ -214,17 +230,18 @@ msgid ""
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Deductions"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,value:0
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
 msgid "Value"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Name of the Employee"
 msgstr ""
 
@@ -240,7 +257,8 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
 msgid "Amount"
 msgstr ""
 
@@ -272,6 +290,7 @@ msgid "Employee Deduction"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Deduction"
 msgstr ""
@@ -312,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Amount (in words) :"
 msgstr ""
 
@@ -322,6 +341,8 @@ msgid "Payment"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
 #: field:hr.payslip,line_ids:0
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
@@ -334,6 +355,7 @@ msgid "Identification No"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,base:0
 msgid "Based on"
 msgstr ""
@@ -400,17 +422,23 @@ msgid "Visa No"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,from:0
+#: 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 ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_to:0
+#: field:hr.payroll.year.salary,date_to:0
+#: report:salary.structure:0
 msgid "End Date"
 msgstr ""
 
@@ -425,8 +453,8 @@ msgid "Leave Deductions"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "Authorised Signature"
 msgstr ""
 
@@ -441,12 +469,11 @@ msgid "Contribution Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Notes:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,based_on:0
 #: field:hr.payroll.advice,state:0
 #: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
@@ -479,10 +506,12 @@ msgid "Company Contributions"
 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
 msgstr ""
 
@@ -497,10 +526,11 @@ msgid "Bank Advice Lines"
 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
-#: wizard_field:payroll.analysis,init,type:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Type"
 msgstr ""
 
@@ -510,7 +540,7 @@ msgid "Email"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "#"
 msgstr ""
 
@@ -544,13 +574,16 @@ msgid "Net Basic"
 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 ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Earnings"
 msgstr ""
 
@@ -561,17 +594,20 @@ msgid "Employee Salary Statement"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Deductions"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "C/D"
 msgstr ""
 
@@ -596,13 +632,19 @@ msgid "Total By Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: 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 ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,to:0
+#: 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 ""
 
@@ -640,15 +682,15 @@ msgid "Contribution Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:hr.payroll.register.sheet:0
 msgid "For the month of"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,deduction:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
@@ -671,40 +713,38 @@ msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
-#: view:hr.payslip:0
 msgid "Complete HR Checking"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Yours Sincerely"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "SI. No."
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Net Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary Structure:"
 msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
 msgid "Employees Salary Detail"
 msgstr ""
 
@@ -722,7 +762,7 @@ msgid "Confirm Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Others:"
 msgstr ""
 
@@ -734,6 +774,7 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
 msgid "Worked Day"
 msgstr ""
 
@@ -753,7 +794,7 @@ msgid "Country & Address"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employee Code"
 msgstr ""
 
@@ -763,16 +804,17 @@ msgid "Basic Salary – Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:company.contribution,amount_type:0
+#: field:company.contribution.line,amount_type:0
 #: field:hr.payslip.line,amount_type:0
-#: rml:salary.structure:0
+#: field:hr.payslip.line.line,amount_type:0
+#: report:salary.structure:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
-#: rml:salary.structure:0
 msgid "Category"
 msgstr ""
 
@@ -800,7 +842,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Earnings"
 msgstr ""
 
@@ -812,7 +854,6 @@ msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
 msgid "All Passports"
 msgstr ""
 
@@ -823,9 +864,8 @@ msgid "Salary Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
 msgstr ""
 
@@ -835,7 +875,6 @@ msgid "Passport Detail"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
 msgid "Percentage (%)"
 msgstr ""
@@ -850,22 +889,18 @@ msgid "Payroll Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "For"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee.grade:0
+#: view:hr.payroll.structure:0
 msgid "Employee Function"
 msgstr ""
 
@@ -890,7 +925,7 @@ msgid "Validation"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Title"
 msgstr ""
 
@@ -906,8 +941,6 @@ msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
-#: view:hr.payslip:0
-#: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
 msgstr ""
 
@@ -917,6 +950,7 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
 msgstr ""
@@ -927,7 +961,7 @@ msgid "Applied this head for calculation if condition is true"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:year.salary:0
+#: report:year.salary:0
 msgid "Yearly Salary Details"
 msgstr ""
 
@@ -958,22 +992,23 @@ msgid "Compute"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 #: field:hr.payslip,deg_id:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "HR Manager"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.contract,basic:0
+#: field:hr.employee,basic:0
 #: field:hr.payslip,basic_before_leaves:0
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Basic Salary"
 msgstr ""
 
@@ -999,12 +1034,13 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
@@ -1014,14 +1050,14 @@ msgid "Draft Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Next Month Date"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,date:0
 #: field:hr.payroll.advice,date:0
 #: field:hr.payroll.register,date:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,date:0
 msgid "Date"
 msgstr ""
@@ -1037,8 +1073,8 @@ msgid "Search Passport"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Phone No."
 msgstr ""
 
@@ -1070,16 +1106,19 @@ msgid "Other No."
 msgstr ""
 
 #. 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
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-#: rml:payroll.advice:0
 msgid "Payment Advice"
 msgstr ""
 
@@ -1102,24 +1141,28 @@ msgid "Computation Overview"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.year.salary,init,salary_on:0
+#: field:hr.payroll.year.salary,salary_on:0
 msgid "Salary On"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,number:0
 #: field:hr.payroll.register,number:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,number:0
 msgid "Number"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.contract,struct_id:0
 #: field:hr.employee,line_ids:0
-#: view:hr.employee.grade:0
-#: field:hr.employee.grade,line_ids:0
-#: rml:salary.structure:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,line_ids: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 ""
 
@@ -1131,9 +1174,6 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
-#: wizard_button:payroll.analysis,init,end:0
-#: wizard_button:wizard.employees.detail,init,end:0
-#: wizard_button:wizard.year.salary,init,end:0
 msgid "Cancel"
 msgstr ""
 
@@ -1145,34 +1185,33 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
-#: rml:salary.structure:0
 msgid "Amount / Percentage"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
 msgid "Allowances"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contract,passport_id:0
 #: field:hr.passport,name:0
 msgid "Passport No"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.employee,passport_id:0
 #: view:hr.passport:0
 msgid "Passport"
 msgstr ""
@@ -1183,12 +1222,11 @@ msgid "Total Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "for period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.expense.expense,category_id:0
 #: field:hr.holidays.status,head_id:0
 msgid "Payroll Head"
 msgstr ""
@@ -1202,7 +1240,7 @@ msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "E-mail"
 msgstr ""
 
@@ -1220,8 +1258,11 @@ msgid "Print Report"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,line_ids:0
+#: 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 ""
 
@@ -1259,7 +1300,11 @@ msgid "Basic Salary without Leave:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee.grade,function_id:0
+#: 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 ""
@@ -1270,7 +1315,7 @@ msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
 msgstr ""
 
@@ -1285,12 +1330,29 @@ msgid "Gross Sal."
 msgstr ""
 
 #. 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 "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_from:0
+#: field:hr.payroll.year.salary,date_from:0
+#: report:salary.structure:0
 msgid "Start Date"
 msgstr ""
 
@@ -1312,6 +1374,7 @@ 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 ""
 
@@ -1341,9 +1404,10 @@ msgid "hr.payroll.year.salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Address"
 msgstr ""
 
@@ -1358,8 +1422,10 @@ msgid "Number of Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: 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 ""
 
@@ -1369,28 +1435,35 @@ msgid "Cancel Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,name:0
+#: 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
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: field:hr.payslip.line.line,name:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+#: report:year.salary:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
+#: report:payslip.pdf:0
 msgid "Leaved Deduction"
 msgstr ""
 
@@ -1400,14 +1473,17 @@ msgid "Country"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,employee_ids:0
-#: wizard_field:wizard.year.salary,init,employee_ids:0
+#: 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 ""
 
 #. module: hr_payroll
-#: field:hr.employee,property_bank_account:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Bank Account"
 msgstr ""
 
@@ -1459,6 +1535,7 @@ msgid "Passport Issue Date"
 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
@@ -1477,7 +1554,7 @@ msgid "Other Id"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Bank Details"
 msgstr ""
 
@@ -1487,7 +1564,10 @@ msgid "Slip ID"
 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 ""
 
@@ -1503,8 +1583,8 @@ msgid "Letter Content"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_view:wizard.employees.detail,init:0
-#: wizard_view:wizard.year.salary,init:0
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
 msgid "Year Salary"
 msgstr ""
 
@@ -1524,9 +1604,9 @@ msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payroll.advice:0
-#: rml:year.salary:0
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
 msgid "Total"
 msgstr ""
 
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index db3883bd05f..fcb0a65f72b 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: 2011-01-19 04:46+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1044,7 +1044,8 @@ msgid "Salary Information"
 msgstr "Information sur le salaire"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 "Catégorie allocation / déduction"
 
@@ -1644,9 +1645,6 @@ msgstr "Total"
 msgid "Contributions"
 msgstr "Contributions"
 
-#~ msgid "Contibution Register"
-#~ msgstr "Registre des contributions"
-
 #~ msgid "Categoty Code"
 #~ msgstr "Code de catégorie"
 
diff --git a/addons/hr_payroll/i18n/gl.po b/addons/hr_payroll/i18n/gl.po
new file mode 100644
index 00000000000..adfff1c4cde
--- /dev/null
+++ b/addons/hr_payroll/i18n/gl.po
@@ -0,0 +1,1631 @@
+# 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-11 08:48+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: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "E-mail Address"
+msgstr "Enderezo de correo electrónico"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+msgstr "Baseado"
+
+#. 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"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr "Recalcular modelo"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employees Salary Details"
+msgstr "Detalles salario dos empregados"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr "Primas con base:"
+
+#. 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 "Deducións:"
+
+#. 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 traballo"
+
+#. 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 "Rexistro de pago da nómina"
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_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 "O responsable"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr "Detalles da 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 "Establecer como 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 "Erro variable: %s "
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Expire"
+msgstr "Vencer"
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr "Vacacións con media paga"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr "Outros"
+
+#. 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 do 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 o enderezo do banco onde se pagará a 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 "Rexeitar"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr "Permisos"
+
+#. 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 "Rexistro"
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Erro! Non pode seleccionar un departamento para o cal o empregado sexa o "
+"director."
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Total Deductions"
+msgstr "Total deducións"
+
+#. module: hr_payroll
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employee"
+msgstr "Nome do empregado"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr "Liñas de rexistro"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr "Cálculo do salario"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
+msgid "Amount"
+msgstr "Cantidade"
+
+#. 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, comprobe a configuración da %s, falta a cabeceira da nómina"
+
+#. module: hr_payroll
+#: selection:company.contribution,amount_type:0
+msgid "Percentage"
+msgstr "Porcentaxe"
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+msgid "Other Information"
+msgstr "Outra 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 "Dedución do empregado"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr "Outras deducións"
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr "Vacacións 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 "Data expiración pasaporte"
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr "Vacacións non 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, non o coloque nun 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 "Pagamento"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Liña 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 "Baseado 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 "Contabilizado"
+
+#. 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 xenérico* Detalles do empregado* Contratos do empregado* "
+"Contratos baseados en pasaportes* Complementos/deducións* Permite configurar "
+"o salario base/bruto/neto* Nómina do empregado* Rexistro mensual das "
+"nóminas* Integrado coa xestión das vacacións\n"
+"    "
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "Tipo de permiso"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Date :"
+msgstr "Data:"
+
+#. 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 "Data de remate"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr "Nómina do empregado"
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leave Deductions"
+msgstr "Deducións por ausencia"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
+msgid "Authorised Signature"
+msgstr "Sinatura 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 "Liña de rexistro da 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 "Liñas de pago"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Other Lines"
+msgstr "Outras liñas"
+
+#. 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 da función"
+
+#. 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 "Contribucións da compañía"
+
+#. 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Empregado"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr "Fórmula"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr "Liñas de notificación bancaria"
+
+#. 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
+msgid "Email"
+msgstr "E-mail"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+msgstr "Nº"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:1225
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr "Comprobar folla"
+
+#. 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 traballados para un empregado."
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr "Novo xustificante"
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+msgstr "Base neta"
+
+#. 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 totais"
+
+#. 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 do empregado"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr "Outros pagos"
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Deductions"
+msgstr "Deducións"
+
+#. 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 traballo"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr "Salario empregado"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr "Cada un de nosos"
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Total por empregado"
+
+#. 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 "Ata"
+
+#. 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 !"
+msgstr "¡Erro de variable!"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr "rrhh.nómina.empregados.detalle"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr "Pagar nómina"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr "Conta bancaria"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr "Liñas de contribución"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "For the month of"
+msgstr "Para o mes de"
+
+#. 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 "Dedución"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "Nota de aviso bancario"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr "Nómina"
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Erro! A data de inicio do contrato debe ser anterior á data 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Complete HR Checking"
+msgstr "Comprobación RH completa"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr "Atentamente"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr "Nº SS"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Net Amount"
+msgstr "Importe neto"
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary Structure:"
+msgstr "Estructura salarial:"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+msgid "Employees Salary Detail"
+msgstr "Detalle salario empregado"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr "Liña de función"
+
+#. 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 "Folla de confirmación"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Others:"
+msgstr "Outros:"
+
+#. 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 traballados"
+
+#. 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 e enderezo"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employee Code"
+msgstr "Código de empregado"
+
+#. 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
+msgid "Amount Type"
+msgstr "Tipo de importe"
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:hr.payslip.line,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr "Cabeceiras"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr "Imprimir declaración"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Earnings"
+msgstr "Ganancias"
+
+#. 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 "Tódolos 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 "Rexistro salarial"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
+msgid "Employee Name"
+msgstr "Nome do empregado"
+
+#. 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 "Porcentaxe (%)"
+
+#. 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 "Rexistro 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"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr "Función do empregado"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Approve Sheet"
+msgstr "Aprobar folla"
+
+#. 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 da 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 "Liñas de pago"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr "Calcular folla"
+
+#. module: hr_payroll
+#: field:company.contribution,active:0
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,condition:0
+msgid "Applied this head for calculation if condition is true"
+msgstr "Aplicar este encabezamento no cálculo se a condición é verdadeira"
+
+#. module: hr_payroll
+#: report:year.salary:0
+msgid "Yearly Salary Details"
+msgstr "Detalles do salario anual"
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Erro! Non pode crear unha xerarquía recorrente de empregados."
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. 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"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr "Aviso de pago:"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr "Computar"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Designation"
+msgstr "Designación"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr "Responsable de RRHH"
+
+#. 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 da categoría"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr "Información do 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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr "Sinatura autorizada"
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr "Folla borrador"
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Next Month Date"
+msgstr "Data mes seguinte"
+
+#. 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 "Data"
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Data expiración visado"
+
+#. 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
+msgid "Contribution"
+msgstr "Contribución"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr "Contribución compañía"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Other No."
+msgstr "Outro 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
+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 ""
+"Utilizarase isto para o cómputo dos valores dos campos %, en xeral na súa "
+"base, pero pode utilizar tódalas cabeceiras dos campos de código en "
+"minúscula como nome de variable, por exemplo hra, ma, lta, etc., tamén pode "
+"utilizar a variable estática básica."
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Computation Overview"
+msgstr "Resumo do cálculo"
+
+#. module: hr_payroll
+#: field:hr.payroll.year.salary,salary_on:0
+msgid "Salary On"
+msgstr "Salario sobre"
+
+#. 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"
+
+#. 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.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 "Estrutura salarial"
+
+#. module: hr_payroll
+#: field:hr.contibution.register,register_line_ids:0
+msgid "Register Line"
+msgstr "Liña rexistro"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Close"
+msgstr "Pechar"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+msgid "Amount / Percentage"
+msgstr "Importe / Porcentaxe"
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Allowances"
+msgstr "Descontos"
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Current Month Date"
+msgstr "Data 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º 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 período"
+
+#. module: hr_payroll
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr "Cabeceira 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 "Rexistro de contribución"
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "E-mail"
+msgstr "E-mail"
+
+#. 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 "Cabeceiras 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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "Outra información"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr "Asunto"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr "Cálculo dinámico"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+msgstr "Salario base sen ausencias:"
+
+#. 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 "Cargo"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr "Estados"
+
+#. 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 "Cabeceiras prima/dedució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 "Description"
+msgstr "Descrición"
+
+#. 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 "Data de comezo"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Deduction -"
+msgstr "Dedución -"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid ")"
+msgstr ")"
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+msgstr "Rexistros de contribución"
+
+#. 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"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr "Tipo de salario"
+
+#. 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 "O número de pasaporte debe ser único!"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Category Name"
+msgstr "Nome da 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.ano.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 "Enderezo"
+
+#. module: hr_payroll
+#: field:hr.payslip.line.line,slipline_id:0
+msgid "Slip Line"
+msgstr "Liña xustificante"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Number of Leaves"
+msgstr "Número de follas"
+
+#. 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 folla"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr "Adianto"
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr "Primas e deducións especiais por empregado:"
+
+#. 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 "Nome"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leaved Deduction"
+msgstr "Follas de dedució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 "Empregados"
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Bank Account"
+msgstr "Conta bancaria"
+
+#. module: hr_payroll
+#: help:company.contribution,register_id:0
+msgid "Contribution register based on company"
+msgstr "Rexistro de contribución baseado na empresa"
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr "Utilízase para organizar a 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 "Liña de deducións por ausencias:"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr "Esperando pola verificación da conta"
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr "Dedución da compañía"
+
+#. 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
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr "Por favor, defina a conta bancaria para o empregado %s"
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr "Data de emisión do pasaporte"
+
+#. 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"
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr "N º de follas"
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr "Outro id"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Bank Details"
+msgstr "Detalles bancarios"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+msgstr "Xustificante ID"
+
+#. 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"
+
+#. 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 dos empregados"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr "Contido carta"
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "Salario anual"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr "Prima / Dedución"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr "Aviso de pago do banco"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr "Buscar nóminas"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
+msgid "Total"
+msgstr "Total"
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,contribute_ids:0
+msgid "Contributions"
+msgstr "Contribucións"
diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po
index a8acb4ca2f6..589fca59224 100644
--- a/addons/hr_payroll/i18n/hr.po
+++ b/addons/hr_payroll/i18n/hr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-09-29 10:21+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1023,7 +1023,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/hu.po b/addons/hr_payroll/i18n/hu.po
index 93f28f736f6..a487cbd4117 100644
--- a/addons/hr_payroll/i18n/hu.po
+++ b/addons/hr_payroll/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 22:21+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-02-05 05:01+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1036,7 +1037,8 @@ msgid "Salary Information"
 msgstr "Bér információ"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 "Levonási kategória"
 
diff --git a/addons/hr_payroll/i18n/id.po b/addons/hr_payroll/i18n/id.po
index b3d97418988..f4b89903390 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: 2011-02-10 04:36+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1030,7 +1030,8 @@ msgid "Salary Information"
 msgstr "Informasi Gaji"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 "Kategori Penyisihan Pengurangan"
 
diff --git a/addons/hr_payroll/i18n/it.po b/addons/hr_payroll/i18n/it.po
index de73c19e761..29d52dab0d5 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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -25,7 +25,7 @@ msgstr "Indirizzo email"
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Based"
-msgstr ""
+msgstr "Basato"
 
 #. module: hr_payroll
 #: field:hr.contract,net:0
@@ -159,7 +159,7 @@ msgstr "Errore variabile: %s "
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
-msgstr ""
+msgstr "Scadenza"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
@@ -208,7 +208,7 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Reject"
-msgstr ""
+msgstr "Rifiuta"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -383,7 +383,7 @@ msgstr "Totale:"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Posted"
-msgstr ""
+msgstr "Pubblicato"
 
 #. module: hr_payroll
 #: model:ir.module.module,description:hr_payroll.module_meta_information
@@ -465,7 +465,7 @@ msgstr ""
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Function Value"
-msgstr ""
+msgstr "Valore Funzione"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
@@ -492,7 +492,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Other Lines"
-msgstr ""
+msgstr "Altre Linee"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -791,7 +791,7 @@ msgstr "Totale per azienda"
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
 msgid "D/C"
-msgstr ""
+msgstr "D/C"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -1028,7 +1028,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
@@ -1624,9 +1625,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1638,3 +1636,19 @@ msgstr ""
 
 #~ msgid "Categoty Name"
 #~ msgstr "Nome categoria"
+
+#~ msgid "Account"
+#~ msgstr "Account"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Attenzione !"
+
+#~ msgid "Expanse To"
+#~ msgstr "Espandi A"
+
+#~ msgid "Force Period"
+#~ msgstr "Forza Periodo"
+
+#~ msgid "Miscelleanous"
+#~ msgstr "Varie"
diff --git a/addons/hr_payroll/i18n/lo.po b/addons/hr_payroll/i18n/lo.po
index 049af6bc381..0825bf9147b 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: 2011-01-20 04:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1023,7 +1023,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 5874f99f9b0..4be858eaa58 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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1035,7 +1035,8 @@ msgid "Salary Information"
 msgstr "Цалингийн мэдээлэл"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 "Олголт суутгалын ангилал"
 
@@ -1800,18 +1801,5 @@ msgstr "Ажил олгогчийн даах суутгал"
 #~ msgid "Unite"
 #~ msgstr "Нэгтгэх"
 
-#, python-format
-#~ msgid ""
-#~ "Variable Error : %s ' % (e)))\n"
-#~ "\n"
-#~ "                if sal_type in ('gross', 'net"
-#~ msgstr "Хувьсагчийн алдаа : %s ' % (e)))"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Харагдацын архитектурын xml буруу байна"
-
-#~ msgid "Contibution Register"
-#~ msgstr "Ажил олгогчийн шимтгэлийн бүртгэл"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй"
diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po
index 4248005e33c..911049743e1 100644
--- a/addons/hr_payroll/i18n/nl.po
+++ b/addons/hr_payroll/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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1023,7 +1023,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index f1c1b38e8f2..9b7ccb1b15f 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/i18n/pl.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: 2010-09-29 09:05+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-05 14:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-06 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -39,7 +39,7 @@ msgstr "Wynagrodzenie netto"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "Przelicz arkusz"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -91,7 +91,7 @@ msgstr "Rejestr płac"
 #: field:hr.payroll.register,line_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr ""
+msgstr "Pasek wypłaty"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
@@ -102,7 +102,7 @@ msgstr "Raport wynagrodzeń rocznych"
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Paid Salary"
-msgstr ""
+msgstr "Wypłacone wynagrodzenie"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -159,7 +159,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
-msgstr ""
+msgstr "Wygasa"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
@@ -177,7 +177,7 @@ msgstr "Inne"
 #: model:ir.model,name:hr_payroll.model_hr_payslip
 #: report:payslip.pdf:0
 msgid "Pay Slip"
-msgstr ""
+msgstr "Pasek wypłaty"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -194,7 +194,7 @@ msgstr ""
 #: help:hr.payroll.advice,bank_id:0
 #: help:hr.payroll.register,bank_id:0
 msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr ""
+msgstr "Wybierz adres banku, z którego wynagrodzenie ma być wypłacone."
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -227,7 +227,7 @@ msgstr "Rejestr"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Błąd ! Nie możesz wybrać działu, którego pracownik jest przełożonym."
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -271,13 +271,13 @@ msgstr ""
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procentowo"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: view:hr.allounce.deduction.categoty:0
 msgid "Other Information"
-msgstr ""
+msgstr "Inne informacje"
 
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
@@ -306,7 +306,7 @@ msgstr "Urlop płatny"
 #: view:hr.passport:0
 #: view:hr.payslip:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
@@ -321,7 +321,7 @@ msgstr "Urlop bezpłatny"
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Valid From"
-msgstr ""
+msgstr "Ważne od"
 
 #. module: hr_payroll
 #: help:hr.payslip,igross:0
@@ -347,12 +347,12 @@ msgstr "Wypłata"
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
 msgid "Payslip Line"
-msgstr ""
+msgstr "Pozycja paska wypłaty"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Identification No"
-msgstr ""
+msgstr "Numer identyfikacyjny"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -374,12 +374,12 @@ msgstr "Lista płac"
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Total:"
-msgstr ""
+msgstr "Suma"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Posted"
-msgstr ""
+msgstr "Zaksięgowano"
 
 #. module: hr_payroll
 #: model:ir.module.module,description:hr_payroll.module_meta_information
@@ -399,12 +399,12 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Typ urlopu"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Date :"
-msgstr ""
+msgstr "Data :"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,total:0
@@ -518,7 +518,7 @@ msgstr "Pracownik"
 #. module: hr_payroll
 #: field:hr.payslip.line,base:0
 msgid "Formula"
-msgstr ""
+msgstr "Formuła"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
@@ -549,13 +549,13 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Verify Sheet"
-msgstr ""
+msgstr "Weryfikuj arkusz"
 
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
@@ -829,7 +829,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
 msgid "Heads"
-msgstr ""
+msgstr "Składniki"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
@@ -839,7 +839,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "Projekt"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -850,7 +850,7 @@ msgstr ""
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Podstawowe"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
@@ -907,7 +907,7 @@ msgstr "Funkcja pracownika"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Zapłacono"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -922,7 +922,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Zatwierdzenie"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -937,7 +937,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -958,7 +958,7 @@ msgstr "Aktywne"
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
 msgid "Applied this head for calculation if condition is true"
-msgstr ""
+msgstr "Uwzględnij ten składnik, jeśli warunek jest spełniony"
 
 #. module: hr_payroll
 #: report:year.salary:0
@@ -968,7 +968,7 @@ msgstr "Szczegóły wynagrodzenia rocznego"
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Błąd ! Nie mozesz tworzyć rekurencyjnych hierarchii pracowników"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
@@ -1015,7 +1015,7 @@ msgstr "Wynagrodzenie podstawowe"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Category Code"
-msgstr ""
+msgstr "Kod Kategorii"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1023,14 +1023,15 @@ msgid "Salary Information"
 msgstr "Inofrmacja o wynagrodzeniu"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
 msgid "Allowance Deduction Categoty"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Companies"
-msgstr ""
+msgstr "Firmy"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1084,12 +1085,12 @@ msgstr "Nr. Telefonu"
 #: view:hr.contibution.register:0
 #: view:hr.contibution.register.line:0
 msgid "Contribution"
-msgstr ""
+msgstr "Dotacja"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,state:0
 msgid "Label"
-msgstr ""
+msgstr "Etykieta"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -1180,7 +1181,7 @@ msgstr "Anuluj"
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Close"
-msgstr ""
+msgstr "Zamknij"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
@@ -1218,7 +1219,7 @@ msgstr "Paszport"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Total Salary"
-msgstr ""
+msgstr "Suma wynagrodzenia"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -1248,13 +1249,13 @@ msgstr "Adres email"
 #: 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 ""
+msgstr "Składniki wynagrodzenia"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "Drukuj raport"
 
 #. module: hr_payroll
 #: field:company.contribution,line_ids:0
@@ -1281,12 +1282,12 @@ msgstr "Inne informacje"
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Issue"
-msgstr ""
+msgstr "Wydano"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1380,7 +1381,7 @@ msgstr "Lista płac"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "Typ zarobku"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -1395,7 +1396,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nazwa kategorii"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
@@ -1437,7 +1438,7 @@ msgstr "Anuluj listę"
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
-msgstr ""
+msgstr "Zaliczka"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -1469,7 +1470,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country"
-msgstr ""
+msgstr "Kraj"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -1499,7 +1500,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "Suma płatności"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po
index d2e3df34e45..a12ed73a4f6 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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -39,7 +39,7 @@ msgstr "Salário líquido"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "Recalcular folha"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -78,7 +78,7 @@ msgstr "Dias úteis"
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
-msgstr ""
+msgstr "Empréstimo"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -91,7 +91,7 @@ msgstr "Registo de pagamento de salário"
 #: field:hr.payroll.register,line_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr ""
+msgstr "Recibos"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
@@ -159,25 +159,25 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
-msgstr ""
+msgstr "Caduca"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Half-Pay Holiday"
-msgstr ""
+msgstr "Férias pagas a 50%"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
-msgstr ""
+msgstr "Outros"
 
 #. 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 ""
+msgstr "Recibo"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -188,7 +188,7 @@ msgstr "Detalhes do contrato:"
 #: field:hr.payslip,igross:0
 #: field:hr.payslip,inet:0
 msgid "Calculaton Field"
-msgstr ""
+msgstr "Campo de cálculo"
 
 #. module: hr_payroll
 #: help:hr.payroll.advice,bank_id:0
@@ -200,7 +200,7 @@ msgstr "Selecione o banco de onde será feito o pagamento do salário"
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
 msgid "Bank Advice"
-msgstr ""
+msgstr "Nota de pagamento bancário"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
@@ -278,7 +278,7 @@ msgstr "Percentagem"
 #: view:company.contribution:0
 #: view:hr.allounce.deduction.categoty:0
 msgid "Other Information"
-msgstr ""
+msgstr "Outra informação"
 
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
@@ -299,7 +299,7 @@ msgstr "Outras deduções"
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Paid Holiday"
-msgstr ""
+msgstr "Férias pagas"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -317,7 +317,7 @@ msgstr "Data de expiração do passaporte"
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Un-Paid Holiday"
-msgstr ""
+msgstr "Férias não pagas"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -329,7 +329,7 @@ msgstr "Válido a partir de"
 #: help:hr.payslip,inet:0
 msgid ""
 "Calculation field used for internal calculation, do not place this on form"
-msgstr ""
+msgstr "Campo de cálculo usado internamente, não incluir em formulários"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -348,7 +348,7 @@ msgstr "Pagamento"
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
 msgid "Payslip Line"
-msgstr ""
+msgstr "Linha de recibo"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -370,7 +370,7 @@ msgstr "Aguardando verificação"
 #. module: hr_payroll
 #: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
 msgid "Human Resource Payroll"
-msgstr ""
+msgstr "Salários de Recursos Humanos"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -400,7 +400,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Tipo de ausência"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -446,7 +446,7 @@ msgstr "Data de fim"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
 msgid "Employee PaySlip"
-msgstr ""
+msgstr "Recibo do empregado"
 
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
@@ -462,7 +462,7 @@ msgstr "Assinatura autorizada"
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Function Value"
-msgstr ""
+msgstr "Valor da função"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
@@ -484,12 +484,12 @@ msgstr "Estado"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Paymeny Lines"
-msgstr ""
+msgstr "Linhas do pagamento"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Other Lines"
-msgstr ""
+msgstr "Outras linhas"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -498,7 +498,7 @@ msgstr ""
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Function Arguments"
-msgstr ""
+msgstr "Argumentos da Função"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
@@ -538,12 +538,12 @@ msgstr "Tipo"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
@@ -556,7 +556,7 @@ msgstr "Erro !"
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Verify Sheet"
-msgstr ""
+msgstr "Verificar folha"
 
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
@@ -567,7 +567,7 @@ msgstr "Número de dias de trabalho semanais para um empregado"
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "New Slip"
-msgstr ""
+msgstr "Novo recibo"
 
 #. module: hr_payroll
 #: field:hr.payslip,basic:0
@@ -706,18 +706,18 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
-msgstr ""
+msgstr "Recibo"
 
 #. module: hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
+msgstr "Erro! Data de início do contrato deve ser anterior à data de fim."
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
-msgstr ""
+msgstr "Prestação do empréstimo"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -752,7 +752,7 @@ msgstr "Detalhes dos salários dos empregados"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
 msgid "Function Line"
-msgstr ""
+msgstr "Linha da função"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -760,18 +760,18 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Confirm Sheet"
-msgstr ""
+msgstr "Confirmar folha"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Others:"
-msgstr ""
+msgstr "Outros:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: selection:company.contribution,amount_type:0
 msgid "Function Calculation"
-msgstr ""
+msgstr "Cálculo da função"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
@@ -811,7 +811,7 @@ msgstr ""
 #: field:hr.payslip.line.line,amount_type:0
 #: report:salary.structure:0
 msgid "Amount Type"
-msgstr ""
+msgstr "Tipo de quantia"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -851,7 +851,7 @@ msgstr ""
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Base"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
@@ -873,7 +873,7 @@ msgstr "Nome do Empregado"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
 msgid "Passport Detail"
-msgstr ""
+msgstr "Detalhe do passaporte"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
@@ -887,7 +887,7 @@ msgstr "Percentagem (%)"
 #: 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 ""
+msgstr "Registo de salários"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -908,17 +908,17 @@ msgstr "Função do empregado"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Pago"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "Aprovar folha"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr ""
+msgstr "Pago? "
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
@@ -943,18 +943,18 @@ msgstr "Utilizador"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Linhas de pagamento"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr ""
+msgstr "Calcular folha"
 
 #. module: hr_payroll
 #: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
@@ -974,13 +974,13 @@ msgstr "Erro ! Não pode criar uma hierarquia recursiva de empregados."
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Condição"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for HR Verification"
-msgstr ""
+msgstr "Aguardando verificação RH"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -990,7 +990,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Compute"
-msgstr ""
+msgstr "Processar"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1016,7 +1016,7 @@ msgstr "Salário base"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Category Code"
-msgstr ""
+msgstr "Código da categoria"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1024,7 +1024,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
@@ -1052,7 +1053,7 @@ msgstr ""
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
 msgid "Next Month Date"
-msgstr ""
+msgstr "Data do próx. mês"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,date:0
@@ -1138,7 +1139,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Computation Overview"
-msgstr ""
+msgstr "Resumo do processamento"
 
 #. module: hr_payroll
 #: field:hr.payroll.year.salary,salary_on:0
@@ -1193,7 +1194,7 @@ msgstr "Montante / Percentagem"
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Allowances"
-msgstr ""
+msgstr "Abonos"
 
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
@@ -1224,7 +1225,7 @@ msgstr "Salário total"
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "for period"
-msgstr ""
+msgstr "para o período"
 
 #. module: hr_payroll
 #: field:hr.holidays.status,head_id:0
@@ -1242,14 +1243,14 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. 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 ""
+msgstr "Rubricas salariais"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
@@ -1277,7 +1278,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Other Informations"
-msgstr ""
+msgstr "Outras informações"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
@@ -1396,7 +1397,7 @@ msgstr "O número de passaporte deve ser único!"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nome da categoria"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
@@ -1414,7 +1415,7 @@ msgstr "Endereço"
 #. module: hr_payroll
 #: field:hr.payslip.line.line,slipline_id:0
 msgid "Slip Line"
-msgstr ""
+msgstr "Linha do recibo"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1432,18 +1433,18 @@ msgstr "Banco"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Cancel Sheet"
-msgstr ""
+msgstr "Cancelar folha"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
-msgstr ""
+msgstr "Adiantamento"
 
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
-msgstr ""
+msgstr "Abonos e descontos específicos do empregado"
 
 #. module: hr_payroll
 #: field:company.contribution,name:0
@@ -1521,18 +1522,18 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Payroll Configurtion"
-msgstr ""
+msgstr "Configuração de salários"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "Por favor indique a conta bancária do empregado %s"
 
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
-msgstr ""
+msgstr "Data de emissão do passaporte"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1541,7 +1542,7 @@ msgstr ""
 #: field:hr.payslip,allounce:0
 #: selection:hr.payslip.line,type:0
 msgid "Allowance"
-msgstr ""
+msgstr "Abono"
 
 #. module: hr_payroll
 #: field:hr.payslip,holiday_days:0
@@ -1551,7 +1552,7 @@ msgstr "Número de baixas"
 #. module: hr_payroll
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Outro Id"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1561,7 +1562,7 @@ msgstr "Detalhes bancários"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Slip ID"
-msgstr ""
+msgstr "ID Recibo"
 
 #. module: hr_payroll
 #: field:company.contribution.line,sequence:0
@@ -1620,9 +1621,6 @@ msgstr "Contribuições"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da acção."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1632,12 +1630,6 @@ msgstr "Contribuições"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura da vista!"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
 #~ msgid "Categoty Code"
 #~ msgstr "Código de categoria"
 
diff --git a/addons/hr_payroll/i18n/pt_BR.po b/addons/hr_payroll/i18n/pt_BR.po
index 9fc7f8cd4b4..6de6d66fdb2 100644
--- a/addons/hr_payroll/i18n/pt_BR.po
+++ b/addons/hr_payroll/i18n/pt_BR.po
@@ -14,11 +14,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-21 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "E-mail Address"
 msgstr "Endereço de E-mail"
 
@@ -28,8 +28,11 @@ msgid "Based"
 msgstr "Baseado"
 
 #. 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 "Salário Liquido"
 
@@ -39,43 +42,46 @@ msgid "Recompute Sheet"
 msgstr "Recalcular Folha"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employees Salary Details"
 msgstr "Detalhes Salário do Funcionário"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Allowances with Basic:"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Department"
 msgstr "Departamento"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Deductions:"
 msgstr "Deduções:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,gratuity:0
+#: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
 msgstr ""
 
 #. 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 "Dias Trabalhados"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
 msgstr "Empréstimo"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
 msgstr "Registro Pagamento de Salário"
 
@@ -83,6 +89,7 @@ msgstr "Registro Pagamento de Salário"
 #: field:hr.employee,slip_ids:0
 #: view:hr.payroll.register:0
 #: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
 msgstr ""
 
@@ -103,14 +110,19 @@ 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
-#: wizard_field:payroll.analysis,init,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "The Manager"
 msgstr "O Gerente"
 
@@ -120,7 +132,8 @@ msgid "Letter Details"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
+#: report:payslip.pdf:0
 msgid ","
 msgstr ","
 
@@ -154,8 +167,7 @@ msgid "Half-Pay Holiday"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
 msgstr "Outros"
@@ -163,12 +175,12 @@ msgstr "Outros"
 #. module: hr_payroll
 #: field:hr.payslip.line,slip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Pay Slip"
 msgstr "Contracheque"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Contract Detail:"
 msgstr "Detalhes Contrato:"
 
@@ -198,12 +210,16 @@ msgid "Reject"
 msgstr "Rejeitar"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
 msgstr "Folhas"
 
 #. 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"
 
@@ -216,17 +232,18 @@ msgstr ""
 "gerente."
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Deductions"
 msgstr "Deduções Totais"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,value:0
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
 msgid "Value"
 msgstr "Valor"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Name of the Employee"
 msgstr "Nome do Funcionário"
 
@@ -242,7 +259,8 @@ msgstr "Calculo do Salário"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
 msgid "Amount"
 msgstr "Valor"
 
@@ -268,7 +286,7 @@ msgstr "Outras Informações"
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
 msgid "Country of Issue"
-msgstr ""
+msgstr "País Emissor"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
@@ -276,6 +294,7 @@ msgid "Employee Deduction"
 msgstr "Dedução do Funcionário"
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Deduction"
 msgstr "Outra Dedução"
@@ -316,7 +335,7 @@ msgid ""
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Amount (in words) :"
 msgstr "Valor (por extenso) :"
 
@@ -326,6 +345,8 @@ msgid "Payment"
 msgstr "Pagamento"
 
 #. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
 #: field:hr.payslip,line_ids:0
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
@@ -338,6 +359,7 @@ msgid "Identification No"
 msgstr "No de Identificação"
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,base:0
 msgid "Based on"
 msgstr "Baseado em"
@@ -404,17 +426,23 @@ msgid "Visa No"
 msgstr "Núm. do Visto"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,from:0
+#: 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 "A partir de"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr "Por Salário"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_to:0
+#: field:hr.payroll.year.salary,date_to:0
+#: report:salary.structure:0
 msgid "End Date"
 msgstr "Data Final"
 
@@ -429,8 +457,8 @@ msgid "Leave Deductions"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "Authorised Signature"
 msgstr "Assinatura Autorizada"
 
@@ -445,17 +473,16 @@ msgid "Contribution Register Line"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Notes:"
 msgstr "Comentários:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,based_on:0
 #: field:hr.payroll.advice,state:0
 #: field:hr.payroll.register,state:0
 #: field:hr.payslip,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Estado"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -483,10 +510,12 @@ msgid "Company Contributions"
 msgstr "Contribuições da Empresa"
 
 #. 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
 msgstr "Funcionário"
 
@@ -501,10 +530,11 @@ msgid "Bank Advice Lines"
 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
-#: wizard_field:payroll.analysis,init,type:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -514,7 +544,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "#"
 msgstr "Nº"
 
@@ -548,15 +578,18 @@ msgid "Net Basic"
 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 ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Earnings"
-msgstr ""
+msgstr "Ganhos Totais"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
@@ -565,17 +598,20 @@ msgid "Employee Salary Statement"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
-msgstr ""
+msgstr "Outros Pagamentos"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Deductions"
 msgstr "Deduções"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "C/D"
 msgstr ""
 
@@ -600,15 +636,21 @@ msgid "Total By Employee"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: 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 ""
+msgstr "Quantidade fixa"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,to:0
+#: 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 ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:180
@@ -631,7 +673,7 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Pay Salary"
-msgstr ""
+msgstr "Salário"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
@@ -644,19 +686,19 @@ msgid "Contribution Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:hr.payroll.register.sheet:0
 msgid "For the month of"
-msgstr ""
+msgstr "Para o mês de"
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,deduction:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
-msgstr ""
+msgstr "Dedução"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
@@ -673,42 +715,42 @@ msgstr ""
 #: 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 precisa ser menor que a data de término "
+"do contrato."
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
-#: view:hr.payslip:0
 msgid "Complete HR Checking"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Yours Sincerely"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "SI. No."
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Net Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary Structure:"
-msgstr ""
+msgstr "Estrutura Salarial"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
 msgid "Employees Salary Detail"
 msgstr ""
 
@@ -726,9 +768,9 @@ msgid "Confirm Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Others:"
-msgstr ""
+msgstr "Outros:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -738,13 +780,14 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
 msgid "Worked Day"
-msgstr ""
+msgstr "Dia Trabalhado"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total por Empresa"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
@@ -757,9 +800,9 @@ msgid "Country & Address"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Employee Code"
-msgstr ""
+msgstr "Código do Funcionário"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -767,18 +810,19 @@ msgid "Basic Salary – Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:company.contribution,amount_type:0
+#: field:company.contribution.line,amount_type:0
 #: field:hr.payslip.line,amount_type:0
-#: rml:salary.structure:0
+#: field:hr.payslip.line.line,amount_type:0
+#: report:salary.structure:0
 msgid "Amount Type"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
-#: rml:salary.structure:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -801,10 +845,10 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "Rascunho"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Earnings"
 msgstr ""
 
@@ -812,11 +856,10 @@ msgstr ""
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Básico"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
 msgid "All Passports"
 msgstr ""
 
@@ -827,11 +870,10 @@ msgid "Salary Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
-msgstr ""
+msgstr "Nome do Funcionário"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
@@ -839,7 +881,6 @@ msgid "Passport Detail"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
 msgid "Percentage (%)"
 msgstr ""
@@ -854,49 +895,45 @@ msgid "Payroll Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "For"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contratos"
 
 #. module: hr_payroll
-#: view:hr.employee.grade:0
+#: view:hr.payroll.structure:0
 msgid "Employee Function"
-msgstr ""
+msgstr "Função do Funcionário"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Pago"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "Aprovar Planilha"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr ""
+msgstr "Pago? "
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validação"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -906,14 +943,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
-#: view:hr.payslip:0
-#: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Linhas de Pagamento"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -921,9 +956,10 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
@@ -931,7 +967,7 @@ msgid "Applied this head for calculation if condition is true"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:year.salary:0
+#: report:year.salary:0
 msgid "Yearly Salary Details"
 msgstr ""
 
@@ -962,22 +998,23 @@ msgid "Compute"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 #: field:hr.payslip,deg_id:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "HR Manager"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.contract,basic:0
+#: field:hr.employee,basic:0
 #: field:hr.payslip,basic_before_leaves:0
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Basic Salary"
 msgstr ""
 
@@ -1003,12 +1040,13 @@ msgid "Companies"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
 msgstr ""
 
@@ -1018,14 +1056,14 @@ msgid "Draft Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Next Month Date"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,date:0
 #: field:hr.payroll.advice,date:0
 #: field:hr.payroll.register,date:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,date:0
 msgid "Date"
 msgstr ""
@@ -1041,8 +1079,8 @@ msgid "Search Passport"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Phone No."
 msgstr ""
 
@@ -1074,16 +1112,19 @@ msgid "Other No."
 msgstr ""
 
 #. 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
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Code"
 msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-#: rml:payroll.advice:0
 msgid "Payment Advice"
 msgstr ""
 
@@ -1106,24 +1147,28 @@ msgid "Computation Overview"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.year.salary,init,salary_on:0
+#: field:hr.payroll.year.salary,salary_on:0
 msgid "Salary On"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,number:0
 #: field:hr.payroll.register,number:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,number:0
 msgid "Number"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.contract,struct_id:0
 #: field:hr.employee,line_ids:0
-#: view:hr.employee.grade:0
-#: field:hr.employee.grade,line_ids:0
-#: rml:salary.structure:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,line_ids: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 ""
 
@@ -1135,9 +1180,6 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
-#: wizard_button:payroll.analysis,init,end:0
-#: wizard_button:wizard.employees.detail,init,end:0
-#: wizard_button:wizard.year.salary,init,end:0
 msgid "Cancel"
 msgstr ""
 
@@ -1149,34 +1191,33 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
-#: rml:salary.structure:0
 msgid "Amount / Percentage"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
 msgid "Allowances"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contract,passport_id:0
 #: field:hr.passport,name:0
 msgid "Passport No"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.employee,passport_id:0
 #: view:hr.passport:0
 msgid "Passport"
 msgstr ""
@@ -1187,12 +1228,11 @@ msgid "Total Salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "for period"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.expense.expense,category_id:0
 #: field:hr.holidays.status,head_id:0
 msgid "Payroll Head"
 msgstr ""
@@ -1206,7 +1246,7 @@ msgid "Contribution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "E-mail"
 msgstr ""
 
@@ -1224,8 +1264,11 @@ msgid "Print Report"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,line_ids:0
+#: 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 ""
 
@@ -1263,7 +1306,11 @@ msgid "Basic Salary without Leave:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee.grade,function_id:0
+#: 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 ""
@@ -1274,7 +1321,7 @@ msgid "States"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
 msgstr ""
 
@@ -1289,12 +1336,29 @@ msgid "Gross Sal."
 msgstr ""
 
 #. 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 "Description"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:hr.payroll.employees.detail,date_from:0
+#: field:hr.payroll.year.salary,date_from:0
+#: report:salary.structure:0
 msgid "Start Date"
 msgstr ""
 
@@ -1316,6 +1380,7 @@ 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 ""
 
@@ -1345,9 +1410,10 @@ msgid "hr.payroll.year.salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Address"
 msgstr ""
 
@@ -1362,8 +1428,10 @@ msgid "Number of Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: 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 ""
 
@@ -1373,28 +1441,35 @@ msgid "Cancel Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,name:0
+#: 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
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: field:hr.payslip.line.line,name:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+#: report:year.salary:0
 msgid "Name"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
+#: report:payslip.pdf:0
 msgid "Leaved Deduction"
 msgstr ""
 
@@ -1404,14 +1479,17 @@ msgid "Country"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,employee_ids:0
-#: wizard_field:wizard.year.salary,init,employee_ids:0
+#: 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 ""
 
 #. module: hr_payroll
-#: field:hr.employee,property_bank_account:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Bank Account"
 msgstr ""
 
@@ -1463,6 +1541,7 @@ msgid "Passport Issue Date"
 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
@@ -1481,7 +1560,7 @@ msgid "Other Id"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Bank Details"
 msgstr ""
 
@@ -1491,7 +1570,10 @@ msgid "Slip ID"
 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 ""
 
@@ -1507,8 +1589,8 @@ msgid "Letter Content"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_view:wizard.employees.detail,init:0
-#: wizard_view:wizard.year.salary,init:0
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
 msgid "Year Salary"
 msgstr ""
 
@@ -1528,9 +1610,9 @@ msgid "Search Payslips"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payroll.advice:0
-#: rml:year.salary:0
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
 msgid "Total"
 msgstr ""
 
diff --git a/addons/hr_payroll/i18n/ru.po b/addons/hr_payroll/i18n/ru.po
index 87024590fb7..1c63583e330 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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -25,7 +25,7 @@ msgstr "Адрес эл. почты"
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Based"
-msgstr ""
+msgstr "Основная"
 
 #. module: hr_payroll
 #: field:hr.contract,net:0
@@ -39,7 +39,7 @@ msgstr "Зарплата на руки"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "Пересчитать таблицу"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -65,7 +65,7 @@ msgstr "Удержания"
 #. module: hr_payroll
 #: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
-msgstr ""
+msgstr "Использовать для надбавки?"
 
 #. module: hr_payroll
 #: field:hr.contract,working_days_per_week:0
@@ -107,7 +107,7 @@ msgstr "Выплаченная заработная плата"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: hr_payroll
 #: field:company.contribution,company_id:0
@@ -129,7 +129,7 @@ msgstr "Менеджер"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Details"
-msgstr ""
+msgstr "Подробности письма"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -154,7 +154,7 @@ msgstr "Установить в 'Черновик'"
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error: %s "
-msgstr ""
+msgstr "Variable Error: %s "
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -182,25 +182,27 @@ msgstr "Расчетный листок"
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Contract Detail:"
-msgstr ""
+msgstr "Подробности о контакте:"
 
 #. module: hr_payroll
 #: field:hr.payslip,igross:0
 #: field:hr.payslip,inet:0
 msgid "Calculaton Field"
-msgstr ""
+msgstr "Поле вычислений"
 
 #. 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 ""
+"Выберите банковские адреса, с которых будет производиться выплата заработной "
+"платы"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
 msgid "Bank Advice"
-msgstr ""
+msgstr "Банковское извещение"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
@@ -228,11 +230,13 @@ msgstr "Зарегистрироваться"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Ошибка! Вы не можете выбрать подразделение, для которого сотрудник является "
+"руководителем."
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Total Deductions"
-msgstr ""
+msgstr "Итого к вычету"
 
 #. module: hr_payroll
 #: field:company.contribution.line,value:0
@@ -253,7 +257,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Salary Computation"
-msgstr ""
+msgstr "Вычисление заработной платы"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
@@ -266,7 +270,7 @@ msgstr "Величина"
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
+msgstr "Please check configuration of %s, payroll head is missing"
 
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
@@ -287,7 +291,7 @@ msgstr "Страна выдачи"
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
 msgid "Employee Deduction"
-msgstr ""
+msgstr "Вычеты сотрудника"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -329,6 +333,8 @@ msgstr "Действительно с"
 msgid ""
 "Calculation field used for internal calculation, do not place this on form"
 msgstr ""
+"Поле вычислений используется для внутренних расчётов. Не располагайте его на "
+"форме."
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -352,7 +358,7 @@ msgstr "Строка расчетного листка"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Identification No"
-msgstr ""
+msgstr "Табельный номер"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -399,7 +405,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Тип отсутствия"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -409,12 +415,12 @@ msgstr "Дата :"
 #. module: hr_payroll
 #: field:hr.payslip.line,total:0
 msgid "Sub Total"
-msgstr "Промежуточный итог"
+msgstr "Подитог"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Payments -"
-msgstr ""
+msgstr "Платежи -"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
@@ -450,7 +456,7 @@ msgstr "Расчетный листок работника"
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
-msgstr ""
+msgstr "Вычеты за пропуски"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -461,7 +467,7 @@ msgstr "Заверенная подпись"
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Function Value"
-msgstr ""
+msgstr "Значение функции"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
@@ -503,7 +509,7 @@ msgstr "Аргументы функций"
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
 msgid "Company Contributions"
-msgstr ""
+msgstr "Вклад организации"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,employee_id:0
@@ -513,17 +519,17 @@ msgstr ""
 #: field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
-msgstr "Работник"
+msgstr "Сотрудник"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,base:0
 msgid "Formula"
-msgstr ""
+msgstr "Формула"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
 msgid "Bank Advice Lines"
-msgstr ""
+msgstr "Строки банковского извещения"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -542,7 +548,7 @@ msgstr "Эл. почта"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "#"
-msgstr ""
+msgstr "№"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
@@ -560,7 +566,7 @@ msgstr "Лист сверки"
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
 msgid "No of Working days / week for an employee"
-msgstr ""
+msgstr "Число рабочих дней/недель сотрудника"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
@@ -571,7 +577,7 @@ msgstr "Новый расчетный листок"
 #. module: hr_payroll
 #: field:hr.payslip,basic:0
 msgid "Net Basic"
-msgstr ""
+msgstr "База после налогообложения"
 
 #. module: hr_payroll
 #: field:hr.contract,gross:0
@@ -591,7 +597,7 @@ msgstr "Итоговые сборы"
 #: 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 ""
+msgstr "Платёжная ведомость сотрудника"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -604,17 +610,17 @@ msgstr "Иные выплаты"
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Deductions"
-msgstr ""
+msgstr "Отчисления"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "C/D"
-msgstr ""
+msgstr "Н/О"
 
 #. module: hr_payroll
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "Номер разрешения на работу"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,line_ids:0
@@ -629,7 +635,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Всего на сотрудника"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -658,12 +664,12 @@ msgstr "Кому"
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error !"
-msgstr ""
+msgstr "Variable Error !"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
 msgid "hr.payroll.employees.detail"
-msgstr ""
+msgstr "hr.payroll.employees.detail"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -679,7 +685,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
-msgstr ""
+msgstr "Строки вклада"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -699,7 +705,7 @@ msgstr "Удержания"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice Note"
-msgstr ""
+msgstr "Заметки к банковскому извещению"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -711,6 +717,7 @@ msgstr "Расчетный листок"
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
+"Ошибка! Дата начала действия контракта должна быть раньше даты окончания"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -781,7 +788,7 @@ msgstr "Отработанный день"
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Всего по организации"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
@@ -791,7 +798,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country & Address"
-msgstr ""
+msgstr "Страна и адрес"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -824,7 +831,7 @@ msgstr "Категория"
 #: field:hr.payslip.line,company_contrib:0
 #: model:ir.model,name:hr_payroll.model_company_contribution
 msgid "Company Contribution"
-msgstr ""
+msgstr "Вклад организации"
 
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
@@ -834,7 +841,7 @@ msgstr "Головные"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
 msgid "Print Statement"
-msgstr ""
+msgstr "Распечатать"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -886,7 +893,7 @@ msgstr "Процентное соотношение (%)"
 #: 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 "Журналы начисления заработной платы"
+msgstr "Журнал начисления заработной платы"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -912,7 +919,7 @@ msgstr "Выплачено"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "Утвердить ведомость"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
@@ -947,7 +954,7 @@ msgstr "Позиции платежа"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr ""
+msgstr "Вычислить ведомость"
 
 #. module: hr_payroll
 #: field:company.contribution,active:0
@@ -963,12 +970,12 @@ msgstr ""
 #. module: hr_payroll
 #: report:year.salary:0
 msgid "Yearly Salary Details"
-msgstr ""
+msgstr "Подробности годовых выплат"
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Ошибка! Вы не можете создать взаимное подчинение сотрудников."
+msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
@@ -979,12 +986,12 @@ msgstr "Состояние"
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for HR Verification"
-msgstr ""
+msgstr "Ожидает проверки отделом кадров"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Payment Advice:"
-msgstr ""
+msgstr "Платёжное поручение:"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1015,7 +1022,7 @@ msgstr "Базовая зарплата"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Category Code"
-msgstr ""
+msgstr "Код категории"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1023,7 +1030,8 @@ msgid "Salary Information"
 msgstr "Информация о зарплате"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
@@ -1046,7 +1054,7 @@ msgstr "Договор"
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
 msgid "Draft Sheet"
-msgstr ""
+msgstr "Черновик ведомости"
 
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
@@ -1069,7 +1077,7 @@ msgstr "Дата окончания визы"
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Search Passport"
-msgstr ""
+msgstr "Поиск паспорта"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1096,7 +1104,7 @@ msgstr "Метка"
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Company contribution"
-msgstr ""
+msgstr "Вклад организации"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1119,12 +1127,12 @@ msgstr "Код"
 #: 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 ""
+msgstr "Платёжное извещение"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Number :"
-msgstr ""
+msgstr "Номер:"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,base:0
@@ -1142,7 +1150,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payroll.year.salary,salary_on:0
 msgid "Salary On"
-msgstr ""
+msgstr "Выплата"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,number:0
@@ -1185,7 +1193,7 @@ msgstr "Закрыть"
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
 msgid "Amount / Percentage"
-msgstr ""
+msgstr "Объём / соотношение"
 
 #. module: hr_payroll
 #: field:hr.employee,advantages_gross:0
@@ -1197,7 +1205,7 @@ msgstr "Доплаты"
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
-msgstr ""
+msgstr "Дата в текущем месяце"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -1218,7 +1226,7 @@ msgstr "Паспорт"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Total Salary"
-msgstr ""
+msgstr "Итого заработная плата"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -1254,7 +1262,7 @@ msgstr ""
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "Печать отчёта"
 
 #. module: hr_payroll
 #: field:company.contribution,line_ids:0
@@ -1326,7 +1334,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Gross Sal."
-msgstr ""
+msgstr "Начислено"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -1358,12 +1366,12 @@ msgstr "Дата начала"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Deduction -"
-msgstr ""
+msgstr "Отчисления -"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
@@ -1385,7 +1393,7 @@ msgstr "Тип зарплаты"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
-msgstr ""
+msgstr "К выплате"
 
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
@@ -1395,12 +1403,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Название категории"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
 msgid "hr.payroll.year.salary"
-msgstr ""
+msgstr "hr.payroll.year.salary"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1431,7 +1439,7 @@ msgstr "Банк"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Cancel Sheet"
-msgstr ""
+msgstr "Отменить ведомость"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -1442,7 +1450,7 @@ msgstr "Перенести"
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
-msgstr ""
+msgstr "Специальные пособия и вычеты для сотрудника:"
 
 #. module: hr_payroll
 #: field:company.contribution,name:0
@@ -1499,12 +1507,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "Итого к оплате"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Leave Deductions Line:"
-msgstr ""
+msgstr "Строка отчислений за отсутствие:"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
@@ -1520,18 +1528,18 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Payroll Configurtion"
-msgstr ""
+msgstr "Настройка платёжной системы"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "Требуется указать банковский счёт для сотрудника %s"
 
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
-msgstr ""
+msgstr "Дата выдачи паспорта"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1540,12 +1548,12 @@ msgstr ""
 #: field:hr.payslip,allounce:0
 #: selection:hr.payslip.line,type:0
 msgid "Allowance"
-msgstr ""
+msgstr "Пособие"
 
 #. module: hr_payroll
 #: field:hr.payslip,holiday_days:0
 msgid "No of Leaves"
-msgstr ""
+msgstr "Кол-во пропусков"
 
 #. module: hr_payroll
 #: field:hr.employee,otherid:0
@@ -1560,7 +1568,7 @@ msgstr "Банковская информация"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Slip ID"
-msgstr ""
+msgstr "Идентификатор ведомости"
 
 #. module: hr_payroll
 #: field:company.contribution.line,sequence:0
@@ -1574,12 +1582,12 @@ 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 Payslip"
-msgstr ""
+msgstr "Расчётная ведомость сотрудника"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Content"
-msgstr ""
+msgstr "Содержание письма"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
@@ -1595,12 +1603,12 @@ msgstr "Доплаты / Удержания"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
 msgid "Bank Payment Advice"
-msgstr ""
+msgstr "Банковское платёжное извещение"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Search Payslips"
-msgstr ""
+msgstr "Поиск по расчётным ведомостям"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1790,12 +1798,3 @@ msgstr "При участии"
 
 #~ msgid "Select Bank Account from where Salary Expanse will be Paid"
 #~ msgstr "Выберите банковский счет для списания зарплаты"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
diff --git a/addons/hr_payroll/i18n/sr.po b/addons/hr_payroll/i18n/sr.po
index 2d306d0030a..4c310d06542 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: 2011-01-19 04:46+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1023,7 +1023,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/sr@latin.po b/addons/hr_payroll/i18n/sr@latin.po
index 7b7a0babd4c..2d167ca3690 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: 2011-01-22 04:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1025,7 +1025,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index 86dcb04816d..938876731ab 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/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: 2011-01-28 04:46+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1023,7 +1023,8 @@ msgid "Salary Information"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: 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 ""
 
diff --git a/addons/hr_payroll/i18n/tr.po b/addons/hr_payroll/i18n/tr.po
new file mode 100644
index 00000000000..2434ac21830
--- /dev/null
+++ b/addons/hr_payroll/i18n/tr.po
@@ -0,0 +1,1618 @@
+# 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-08-23 11:18+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: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: 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 ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Expire"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: report:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,igross:0
+#: field:hr.payslip,inet:0
+msgid "Calculaton Field"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:1225
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:company.contribution,amount_type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,emp_deduction:0
+msgid "Employee Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.passport:0
+#: view:hr.payslip:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Valid From"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Posted"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Date :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Payments -"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leave Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Function Value"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Other Lines"
+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
+msgid "Function Arguments"
+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 ""
+
+#. 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
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.contract,working_days_per_week:0
+msgid "No of Working days / week for an employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 !"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "For the month of"
+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 ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+msgid "Function Calculation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country & Address"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary – Leaves"
+msgstr ""
+
+#. 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
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:hr.payslip.line,category_id:0
+msgid "Category"
+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 ""
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Approve Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+msgid "Search Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,active:0
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,condition:0
+msgid "Applied this head for calculation if condition is true"
+msgstr ""
+
+#. module: hr_payroll
+#: report:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "HR Manager"
+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 ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Category Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Next Month Date"
+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 ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Search Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. 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
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Other No."
+msgstr ""
+
+#. 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
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Number :"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Computation Overview"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.year.salary,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: field:hr.payslip,number:0
+msgid "Number"
+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.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 ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Print Report"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+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 ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+msgid "Allowance Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Gross Sal."
+msgstr ""
+
+#. 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 "Description"
+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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Deduction -"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+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 ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Net Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
+msgid "hr.payroll.year.salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line.line,slipline_id:0
+msgid "Slip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Number of Leaves"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,register_id:0
+msgid "Contribution register based on company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,total_pay:0
+msgid "Total Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leave Deductions Line:"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:469
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+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 ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+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 ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
+msgid "Total"
+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 ""
diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po
index f682059e4ca..ba45b5f02c3 100644
--- a/addons/hr_payroll/i18n/vi.po
+++ b/addons/hr_payroll/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-20 09:43+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index 2bb73b44b7b..4ba5a362ef7 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -9,23 +9,23 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-07-20 16:01+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "E-mail Address"
-msgstr "E-mail地址"
+msgstr "电子邮件地址"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Based"
-msgstr ""
+msgstr "基于"
 
 #. module: hr_payroll
 #: field:hr.contract,net:0
@@ -39,17 +39,17 @@ msgstr "净薪酬"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "重新计算"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employees Salary Details"
-msgstr "员工薪酬细节"
+msgstr "员工薪酬详情"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Allowances with Basic:"
-msgstr "基本免税额:"
+msgstr "基本补贴:"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -65,7 +65,7 @@ msgstr "扣除："
 #. module: hr_payroll
 #: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
-msgstr "用于小费?"
+msgstr "这钱用于?"
 
 #. module: hr_payroll
 #: field:hr.contract,working_days_per_week:0
@@ -78,7 +78,7 @@ msgstr "工作天数"
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
-msgstr "贷款"
+msgstr "借款"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -107,7 +107,7 @@ msgstr "支付薪酬"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: hr_payroll
 #: field:company.contribution,company_id:0
@@ -129,7 +129,7 @@ msgstr "经理"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Details"
-msgstr "信中详述"
+msgstr "详细内容"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -154,12 +154,12 @@ msgstr "设为草稿"
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error: %s "
-msgstr ""
+msgstr "变量错误: %s "
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Expire"
-msgstr ""
+msgstr "到期"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
@@ -188,19 +188,19 @@ msgstr "合约内容:"
 #: field:hr.payslip,igross:0
 #: field:hr.payslip,inet:0
 msgid "Calculaton Field"
-msgstr ""
+msgstr "计算字段"
 
 #. 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 ""
+msgstr "为要支付的薪酬选择银行"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
 msgid "Bank Advice"
-msgstr "银行通知"
+msgstr "银行通知单"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
@@ -213,7 +213,7 @@ msgstr "拒绝"
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
-msgstr "叶节点"
+msgstr "准假"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,register_id:0
@@ -227,7 +227,7 @@ msgstr "记录"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -248,12 +248,12 @@ msgstr "这员工姓名"
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Register Lines"
-msgstr ""
+msgstr "记录明细"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Salary Computation"
-msgstr ""
+msgstr "计算薪酬"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
@@ -266,28 +266,28 @@ msgstr "金额"
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
+msgstr "请检查设置 %s，丢失薪酬类型。"
 
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分率"
 
 #. module: hr_payroll
 #: view:company.contribution:0
 #: view:hr.allounce.deduction.categoty:0
 msgid "Other Information"
-msgstr ""
+msgstr "其它信息"
 
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
 msgid "Country of Issue"
-msgstr "国家发行"
+msgstr "发放国家"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
 msgid "Employee Deduction"
-msgstr ""
+msgstr "员工扣除"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -306,7 +306,7 @@ msgstr "带薪假期"
 #: view:hr.passport:0
 #: view:hr.payslip:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
@@ -321,14 +321,14 @@ msgstr "不带薪假期"
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Valid From"
-msgstr ""
+msgstr "有效期从"
 
 #. 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 ""
+msgstr "计算字段用于内部计算，不要放入表单中。"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -352,7 +352,7 @@ msgstr "工资单明细"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Identification No"
-msgstr ""
+msgstr "身份证号"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -369,17 +369,17 @@ msgstr "等待确认"
 #. module: hr_payroll
 #: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
 msgid "Human Resource Payroll"
-msgstr ""
+msgstr "人力资源工资表"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Total:"
-msgstr ""
+msgstr "合计:"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Posted"
-msgstr ""
+msgstr "已发"
 
 #. module: hr_payroll
 #: model:ir.module.module,description:hr_payroll.module_meta_information
@@ -395,16 +395,26 @@ msgid ""
 "    * Integrated with Holiday Management\n"
 "    "
 msgstr ""
+"通用工资表系统 \n"
+"    * 员工详细资料 \n"
+"    * 员工合同 \n"
+"    * 签合同的护照 \n"
+"    * 津贴 / 扣除\n"
+"    * 允许设置基本 / 增长 /净薪酬 \n"
+"    * 员工工资单 \n"
+"    * 每月的工资表 \n"
+"    * 整合假期管理\n"
+"    "
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "准假类型"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Date :"
-msgstr ""
+msgstr "日期:"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,total:0
@@ -414,12 +424,12 @@ msgstr "小计"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Payments -"
-msgstr ""
+msgstr "付款 -"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "信用卡或借记卡号"
 
 #. module: hr_payroll
 #: field:company.contribution.line,from_val:0
@@ -450,7 +460,7 @@ msgstr "员工工资单"
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
-msgstr ""
+msgstr "准假扣除"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -461,12 +471,12 @@ msgstr "授权签署"
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Function Value"
-msgstr ""
+msgstr "函数值"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
 msgid "Contribution Register Line"
-msgstr ""
+msgstr "捐款记录明细"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -488,7 +498,7 @@ msgstr "付款明细"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Other Lines"
-msgstr ""
+msgstr "其它明细"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -497,13 +507,13 @@ msgstr ""
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Function Arguments"
-msgstr ""
+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 ""
+msgstr "公司捐款"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,employee_id:0
@@ -518,12 +528,12 @@ msgstr "员工"
 #. module: hr_payroll
 #: field:hr.payslip.line,base:0
 msgid "Formula"
-msgstr ""
+msgstr "公式"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
 msgid "Bank Advice Lines"
-msgstr "银行通知明细"
+msgstr "银行通知单明细"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -537,7 +547,7 @@ msgstr "类型"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Email"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -549,18 +559,18 @@ msgstr "#"
 #: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Verify Sheet"
-msgstr "核实表"
+msgstr "核实"
 
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
 msgid "No of Working days / week for an employee"
-msgstr ""
+msgstr "员工每周的工作天数"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
@@ -571,7 +581,7 @@ msgstr "新工资单"
 #. module: hr_payroll
 #: field:hr.payslip,basic:0
 msgid "Net Basic"
-msgstr ""
+msgstr "净基本"
 
 #. module: hr_payroll
 #: field:hr.contract,gross:0
@@ -580,24 +590,24 @@ msgstr ""
 #: field:hr.payslip,grows:0
 #: report:salary.structure:0
 msgid "Gross Salary"
-msgstr "薪资总额"
+msgstr "薪酬总额"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Total Earnings"
-msgstr "总收益"
+msgstr "总收入"
 
 #. 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 ""
+msgstr "员工薪酬报表"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
-msgstr "其它付款"
+msgstr "其它的付款"
 
 #. module: hr_payroll
 #: field:hr.employee,advantages_net:0
@@ -609,7 +619,7 @@ msgstr "扣除"
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "C/D"
-msgstr ""
+msgstr "C/D"
 
 #. module: hr_payroll
 #: field:hr.contract,permit_no:0
@@ -624,12 +634,12 @@ msgstr "员工薪酬"
 #. module: hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
 msgid "Chaque Nos"
-msgstr ""
+msgstr "支票号"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "员工合计"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -658,12 +668,12 @@ msgstr "到"
 #: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error !"
-msgstr ""
+msgstr "变量错误"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
 msgid "hr.payroll.employees.detail"
-msgstr ""
+msgstr "hr.payroll.employees.detail"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -679,7 +689,7 @@ msgstr "银行帐号 A/C"
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
-msgstr ""
+msgstr "捐款明细"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -699,7 +709,7 @@ msgstr "扣除"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice Note"
-msgstr "银行通知"
+msgstr "银行通知单备注"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -710,13 +720,13 @@ msgstr "工资单"
 #. module: hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
+msgstr "错误！合同开始日期必须小于结束日期。"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
-msgstr "分期贷款"
+msgstr "贷款的分期付款"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -726,12 +736,12 @@ msgstr "完成人力资源检查"
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Yours Sincerely"
-msgstr "谨启"
+msgstr "此致"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "SI. No."
-msgstr ""
+msgstr "身份证号"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -751,7 +761,7 @@ msgstr "员工薪酬细节"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
 msgid "Function Line"
-msgstr ""
+msgstr "明细"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -759,7 +769,7 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Confirm Sheet"
-msgstr "确认表"
+msgstr "确认"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -770,7 +780,7 @@ msgstr "其它："
 #: view:company.contribution:0
 #: selection:company.contribution,amount_type:0
 msgid "Function Calculation"
-msgstr ""
+msgstr "计算函数"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
@@ -781,27 +791,27 @@ msgstr "已工作天数"
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "公司合计"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
 msgid "D/C"
-msgstr ""
+msgstr "D/C"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country & Address"
-msgstr ""
+msgstr "国籍&地址"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employee Code"
-msgstr "员工代码"
+msgstr "员工编码"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary – Leaves"
-msgstr ""
+msgstr "基本薪酬 - 准假"
 
 #. module: hr_payroll
 #: field:company.contribution,amount_type:0
@@ -824,12 +834,12 @@ msgstr "分类"
 #: field:hr.payslip.line,company_contrib:0
 #: model:ir.model,name:hr_payroll.model_company_contribution
 msgid "Company Contribution"
-msgstr ""
+msgstr "公司捐款"
 
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
 msgid "Heads"
-msgstr ""
+msgstr "分类"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
@@ -839,7 +849,7 @@ msgstr "打印"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -850,7 +860,7 @@ msgstr "收入"
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "基本"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
@@ -861,7 +871,7 @@ msgstr "所有护照"
 #: 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 ""
+msgstr "薪酬记录"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -886,13 +896,13 @@ msgstr "百分比(%)"
 #: 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 "工资单记录"
+msgstr "工资表记录"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:payroll.advice:0
 msgid "For"
-msgstr ""
+msgstr "目的"
 
 #. module: hr_payroll
 #: field:hr.passport,contracts_ids:0
@@ -907,12 +917,12 @@ msgstr "员工职能"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "已付"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "审批表"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
@@ -922,7 +932,7 @@ msgstr "已付? "
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "审核"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -932,12 +942,12 @@ msgstr "标题"
 #. module: hr_payroll
 #: view:company.contribution:0
 msgid "Search Company Contribution"
-msgstr ""
+msgstr "查找公司捐款"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -947,7 +957,7 @@ msgstr "付款明细"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr "计算表"
+msgstr "计算"
 
 #. module: hr_payroll
 #: field:company.contribution,active:0
@@ -958,7 +968,7 @@ msgstr "有效"
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
 msgid "Applied this head for calculation if condition is true"
-msgstr ""
+msgstr "如果条件为真，用这个计算"
 
 #. module: hr_payroll
 #: report:year.salary:0
@@ -968,7 +978,7 @@ msgstr "年薪细节"
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
@@ -979,17 +989,17 @@ msgstr "条件"
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for HR Verification"
-msgstr ""
+msgstr "等待人力资源审核"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Payment Advice:"
-msgstr ""
+msgstr "付款通知："
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Compute"
-msgstr "公司"
+msgstr "计算"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1015,7 +1025,7 @@ msgstr "基本薪酬"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Category Code"
-msgstr ""
+msgstr "分类的编码"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1023,14 +1033,15 @@ msgid "Salary Information"
 msgstr "薪酬信息"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_company_contribution_line
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
 msgid "Allowance Deduction Categoty"
 msgstr "津贴扣减分类"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1041,12 +1052,12 @@ msgstr "授权签字"
 #: field:hr.payslip,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
-msgstr "合约"
+msgstr "合同"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
 msgid "Draft Sheet"
-msgstr "表草稿"
+msgstr "草稿"
 
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
@@ -1064,12 +1075,12 @@ msgstr "日期"
 #. module: hr_payroll
 #: field:hr.contract,visa_expire:0
 msgid "Visa Expire Date"
-msgstr "签证到期日期"
+msgstr "信用卡或借记卡到期日期"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Search Passport"
-msgstr ""
+msgstr "查找护照"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1084,25 +1095,25 @@ msgstr "电话号码"
 #: view:hr.contibution.register:0
 #: view:hr.contibution.register.line:0
 msgid "Contribution"
-msgstr ""
+msgstr "捐款"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,state:0
 msgid "Label"
-msgstr ""
+msgstr "标签"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Company contribution"
-msgstr ""
+msgstr "公司捐款"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Other No."
-msgstr ""
+msgstr "其它号码"
 
 #. module: hr_payroll
 #: field:company.contribution,code:0
@@ -1113,7 +1124,7 @@ msgstr ""
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Code"
-msgstr "代码"
+msgstr "编码"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
@@ -1124,7 +1135,7 @@ msgstr "付款通知"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Number :"
-msgstr ""
+msgstr "编号："
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,base:0
@@ -1132,12 +1143,12 @@ 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 ""
+msgstr "一般基本上它将使用这%字段值来计算，但你能使用所有头带编码的字段作为变量名如： hra, ma, lta等，你也可以使用静态的变量。"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Computation Overview"
-msgstr ""
+msgstr "计算过程"
 
 #. module: hr_payroll
 #: field:hr.payroll.year.salary,salary_on:0
@@ -1168,7 +1179,7 @@ msgstr "薪酬结构"
 #. module: hr_payroll
 #: field:hr.contibution.register,register_line_ids:0
 msgid "Register Line"
-msgstr ""
+msgstr "记录明细"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1180,7 +1191,7 @@ msgstr "取消"
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
@@ -1192,7 +1203,7 @@ msgstr "金额/ 百分比"
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Allowances"
-msgstr "津贴"
+msgstr "补贴"
 
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
@@ -1208,7 +1219,7 @@ msgstr "薪酬"
 #: field:hr.contract,passport_id:0
 #: field:hr.passport,name:0
 msgid "Passport No"
-msgstr "护照No"
+msgstr "护照号"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -1218,7 +1229,7 @@ msgstr "护照"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Total Salary"
-msgstr ""
+msgstr "总薪酬"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -1228,7 +1239,7 @@ msgstr "期间"
 #. module: hr_payroll
 #: field:hr.holidays.status,head_id:0
 msgid "Payroll Head"
-msgstr "工资单头"
+msgstr "薪酬分类"
 
 #. module: hr_payroll
 #: field:company.contribution,register_id:0
@@ -1236,25 +1247,25 @@ msgstr "工资单头"
 #: 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 ""
+msgstr "捐款记录"
 
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "E-mail"
-msgstr "E-mail"
+msgstr "电子邮件"
 
 #. 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 ""
+msgstr "薪酬分类"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "打印报表"
 
 #. module: hr_payroll
 #: field:company.contribution,line_ids:0
@@ -1281,12 +1292,12 @@ msgstr "其它信息"
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Issue"
-msgstr ""
+msgstr "发出"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1296,7 +1307,7 @@ msgstr "动态计算"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary without Leave:"
-msgstr ""
+msgstr "基本的无薪准假："
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -1306,27 +1317,27 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,function_id:0
 msgid "Function"
-msgstr "职能"
+msgstr "函数"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "States"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "尊敬的先生/女士"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
 msgid "Allowance Deduction Heads"
-msgstr ""
+msgstr "扣除补贴分类"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Gross Sal."
-msgstr ""
+msgstr "获得的薪酬"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -1358,49 +1369,49 @@ msgstr "开始日期"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Deduction -"
-msgstr ""
+msgstr "扣除 -"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Registers"
-msgstr ""
+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 "工资单"
+msgstr "工资表"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "薪酬类型"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
-msgstr ""
+msgstr "净薪酬"
 
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
 msgid "The Passport No must be unique !"
-msgstr ""
+msgstr "护照号必须唯一"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "分类名称"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
 msgid "hr.payroll.year.salary"
-msgstr ""
+msgstr "hr.payroll.year.salary"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1413,12 +1424,12 @@ msgstr "地址"
 #. module: hr_payroll
 #: field:hr.payslip.line.line,slipline_id:0
 msgid "Slip Line"
-msgstr ""
+msgstr "工资单明细"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Number of Leaves"
-msgstr ""
+msgstr "准假天数"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1431,7 +1442,7 @@ msgstr "银行"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Cancel Sheet"
-msgstr ""
+msgstr "取消"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -1442,7 +1453,7 @@ msgstr "预支"
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
-msgstr "特别津贴和员工的扣除"
+msgstr "特别的员工津贴和扣除"
 
 #. module: hr_payroll
 #: field:company.contribution,name:0
@@ -1464,12 +1475,12 @@ msgstr "名称"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Leaved Deduction"
-msgstr "休假扣除"
+msgstr "准假扣除"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country"
-msgstr ""
+msgstr "国家"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -1489,44 +1500,44 @@ msgstr "银行帐号"
 #. module: hr_payroll
 #: help:company.contribution,register_id:0
 msgid "Contribution register based on company"
-msgstr ""
+msgstr "基于公司的捐款记录"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,sequence:0
 msgid "Use to arrange calculation sequence"
-msgstr ""
+msgstr "使用预定的序列排列"
 
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "付款总额"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Leave Deductions Line:"
-msgstr ""
+msgstr "准假扣除明细："
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Account Verification"
-msgstr "等待帐户确认"
+msgstr "等待帐户审核"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,comp_deduction:0
 msgid "Company Deduction"
-msgstr ""
+msgstr "公司扣除"
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Payroll Configurtion"
-msgstr "工资单设置"
+msgstr "工资表设置"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:469
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "请定义员工 %s 的银行帐户"
 
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
@@ -1540,27 +1551,27 @@ msgstr "护照签发日期"
 #: field:hr.payslip,allounce:0
 #: selection:hr.payslip.line,type:0
 msgid "Allowance"
-msgstr "津贴"
+msgstr "补贴"
 
 #. module: hr_payroll
 #: field:hr.payslip,holiday_days:0
 msgid "No of Leaves"
-msgstr "没有叶节点"
+msgstr "准假天数"
 
 #. module: hr_payroll
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "其它"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Bank Details"
-msgstr "银行详情"
+msgstr "银行信息"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Slip ID"
-msgstr ""
+msgstr "工资单ID"
 
 #. module: hr_payroll
 #: field:company.contribution.line,sequence:0
@@ -1590,7 +1601,7 @@ msgstr "年薪"
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
-msgstr ""
+msgstr "补贴 / 扣除"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
@@ -1600,7 +1611,7 @@ msgstr "银行付款通知"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Search Payslips"
-msgstr ""
+msgstr "查找工资单"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1614,7 +1625,7 @@ msgstr "合计"
 #: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,contribute_ids:0
 msgid "Contributions"
-msgstr ""
+msgstr "捐款"
 
 #~ msgid "Analytic Account for Salary Analysis"
 #~ msgstr "薪酬分析的辅助核算项"
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index e8df94d3b5a..1e9839eaa6f 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -43,7 +43,7 @@ class payslip_details_report(report_sxw.rml_parse):
                 return []
             if rule_categories[0].parent_id:
                 rule_categories.insert(0, rule_categories[0].parent_id)
-                self.get_recursive_parent(rule_categories)
+                get_recursive_parent(rule_categories)
             return rule_categories
 
         res = []
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index d19ec411d5d..4d2afff54c3 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -13,3 +13,4 @@
 "access_hr_payslip_run","hr.payslip.run","model_hr_payslip_run","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_input","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1
 "access_hr_rule_input","hr.rule.input","model_hr_rule_input","base.group_hr_manager",1,1,1,1
+"access_hr_salary_rule_user","hr.salary.rule.user","model_hr_salary_rule","base.group_hr_user",1,1,1,1
\ No newline at end of file
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index 089005f0b52..94c38b263fc 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -16,7 +16,6 @@
     name: Salary Structure for Software Developer
     code: SD
     company_id: base.main_company
-    parent_id: structure_base
     rule_ids:
       - hr_salary_rule_houserentallowance1
       - hr_salary_rule_convanceallowance1
@@ -41,25 +40,6 @@
 -
   !record {model: hr.payslip, id: hr_payslip_0}:
     employee_id: hr_payroll.hr_employee_richard0
--
-  The selection of an employee fills the contract, structure, worked days and input data fields
--
-  !python {model: hr.payslip}: |
-    import time
-    from datetime import datetime
-    from dateutil import relativedelta
-    date_from = time.strftime('%Y-%m-01')
-    worked_days_obj = self.pool.get('hr.payslip.worked_days')
-    date_to = str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10]
-    res = self.onchange_employee_id(cr, uid, [], date_from, date_to, ref("hr_employee_richard0"), False, None)
-    vals = {
-      'struct_id': res['value']['struct_id'],
-      'contract_id': res['value']['contract_id'],
-      'name': res['value']['name'],
-      }
-    vals['worked_days_line_ids'] = [(0,0,i) for i in res['value']['worked_days_line_ids']]
-    vals['input_line_ids'] = [(0, 0, i) for i in res['value']['input_line_ids']]
-    self.write(cr, uid, ref("hr_payslip_0"), vals)
 -
   I assign the amount to Input data
 -
@@ -70,9 +50,8 @@
   I verify the payslip is in draft state
 -
   !python {model: hr.payslip}: |
-    from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
-    assert(payslip_brw.state == 'draft'), _('State not changed!')
+    assert (payslip_brw.state == 'draft'), 'State not changed!'
 -
   I click on 'Compute Sheet' button on payslip
 -
@@ -91,4 +70,46 @@
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
-    assert(payslip_brw.state == 'done'), _('State not changed!')
\ No newline at end of file
+    assert(payslip_brw.state == 'done'), _('State not changed!')
+-
+  I want to check refund payslip so I click on refund button.
+-
+  !python {model: hr.payslip}: |
+    self.refund_sheet(cr, uid, [ref("hr_payslip_0")], None)
+-
+  I check on new payslip Credit Note is checked or not.
+-
+  !python {model: hr.payslip}: |
+    payslip_obj = self.browse(cr, uid, ref("hr_payslip_0"), None)
+    payslip_ids = self.search(cr, uid, [('name','like','Refund: '+payslip_obj.name),('credit_note','=',True)], None)
+    assert payslip_ids, "Payslip not refunded!"
+-
+  I want to generate a payslip from Payslip run.
+-
+  !record {model: hr.payslip.run, id: hr_payslip_run_PayslipforEmployee0}:
+    date_end: '2011-09-30'
+    date_start: '2011-09-01'
+    name: Payslip for Employee
+-
+  I create record for generating the payslip for this Payslip run.
+-
+  !record {model: hr.payslip.employees, id: hr_payslip_employees0}:
+    employee_ids:
+      - hr_employee_richard0
+-
+  I generate the payslip by clicking on Generat button wizard.
+-
+  !python {model: hr.payslip.employees}: |
+     self.compute_sheet(cr, uid, [ref('hr_payslip_employees0')], context={'active_id': ref('hr_payslip_run_PayslipforEmployee0')})
+-
+  I open Contribution Register and from there I print the Payslip Lines report.
+-
+  !record {model: payslip.lines.contribution.register, id: payslip_lines_contribution_register0}:
+    date_from: '2011-09-30'
+    date_to: '2011-09-01'
+-
+  I print the report.
+-
+  !python {model: payslip.lines.contribution.register}: |
+    self.print_report(cr, uid, [ref('payslip_lines_contribution_register0')], context={'active_ids': [ref('hr_houserent_register')]})
+
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
index cb787cf536e..e48a8f6470c 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
@@ -33,7 +33,6 @@
 
         <record model="ir.values" id="payslip_lines_contribution_register_value">
             <field name="model_id" ref="model_hr_contribution_register" />
-            <field name="object" eval="1" />
             <field name="name">PaySlip Lines</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_payslip_lines_contribution_register'))" />
@@ -42,4 +41,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_payroll_account/__init__.py b/addons/hr_payroll_account/__init__.py
index ee7125d5411..ffe4b707ac0 100644
--- a/addons/hr_payroll_account/__init__.py
+++ b/addons/hr_payroll_account/__init__.py
@@ -21,5 +21,6 @@
 ##############################################################################
 
 import hr_payroll_account
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 5a7f67d5d21..beaa08b56cd 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'Human Resource Payroll Accounting',
+    'name': 'Payroll Accounting',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "expert",
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 1ff19e01bb1..3463713d37d 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -40,6 +40,19 @@ class hr_payslip(osv.osv):
         'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
     }
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default['move_id'] = False
+        return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
+
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if 'journal_id' in context:
+            vals.update({'journal_id': context.get('journal_id')})
+        return super(hr_payslip, self).create(cr, uid, vals, context=context)
+
     def onchange_contract_id(self, cr, uid, ids, date_from, date_to, employee_id=False, contract_id=False, context=None):
         contract_obj = self.pool.get('hr.contract')
         res = super(hr_payslip, self).onchange_contract_id(cr, uid, ids, date_from=date_from, date_to=date_to, employee_id=employee_id, contract_id=contract_id, context=context)
@@ -52,9 +65,10 @@ class hr_payslip(osv.osv):
         move_ids = []
         move_to_cancel = []
         for slip in self.browse(cr, uid, ids, context=context):
-            move_ids.append(slip.move_id.id)
-            if slip.move_id.state == 'posted':
-                move_to_cancel.append(slip.move_id.id)
+            if slip.move_id:
+                move_ids.append(slip.move_id.id)
+                if slip.move_id.state == 'posted':
+                    move_to_cancel.append(slip.move_id.id)
         move_pool.button_cancel(cr, uid, move_to_cancel, context=context)
         move_pool.unlink(cr, uid, move_ids, context=context)
         return super(hr_payslip, self).cancel_sheet(cr, uid, ids, context=context)
@@ -87,7 +101,10 @@ class hr_payslip(osv.osv):
                 partner_id = False
                 debit_account_id = line.salary_rule_id.account_debit.id
                 credit_account_id = line.salary_rule_id.account_credit.id
-                debit_line = (0, 0, {
+
+                if debit_account_id:
+
+                    debit_line = (0, 0, {
                     'name': line.name,
                     'date': timenow,
                     'partner_id': partner_id,
@@ -100,7 +117,12 @@ class hr_payslip(osv.osv):
                     'tax_code_id': line.salary_rule_id.account_tax_id and line.salary_rule_id.account_tax_id.id or False,
                     'tax_amount': line.salary_rule_id.account_tax_id and amt or 0.0,
                 })
-                credit_line = (0, 0, {
+                    line_ids.append(debit_line)
+                    debit_sum += debit_line[2]['debit'] - debit_line[2]['credit']
+
+                if credit_account_id:
+
+                    credit_line = (0, 0, {
                     'name': line.name,
                     'date': timenow,
                     'partner_id': partner_id,
@@ -113,38 +135,40 @@ class hr_payslip(osv.osv):
                     'tax_code_id': line.salary_rule_id.account_tax_id and line.salary_rule_id.account_tax_id.id or False,
                     'tax_amount': line.salary_rule_id.account_tax_id and amt or 0.0,
                 })
-                if debit_account_id:
-                    line_ids.append(debit_line)
-                    debit_sum += debit_line[2]['debit'] - debit_line[2]['credit']
-                if credit_account_id:
                     line_ids.append(credit_line)
-                    credit_sum += credit_line[2]['credit'] - credit_line['debit']
+                    credit_sum += credit_line[2]['credit'] - credit_line[2]['debit']
 
             if debit_sum > credit_sum:
+                acc_id = slip.journal_id.default_credit_account_id.id
+                if not acc_id:
+                    raise osv.except_osv(_('Configuration Error!'),_('The Expense Journal "%s" has not properly configured the Credit Account!')%(slip.journal_id.name))
                 adjust_credit = (0, 0, {
                     'name': _('Adjustment Entry'),
                     'date': timenow,
                     'partner_id': partner_id,
-                    'account_id': slip.journal_id.default_credit_account_id.id,
+                    'account_id': acc_id,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
                     'debit': 0.0,
                     'credit': debit_sum - credit_sum,
                 })
                 line_ids.append(adjust_credit)
+
             elif debit_sum < credit_sum:
+                acc_id = slip.journal_id.default_debit_account_id.id
+                if not acc_id:
+                    raise osv.except_osv(_('Configuration Error!'),_('The Expense Journal "%s" has not properly configured the Debit Account!')%(slip.journal_id.name))
                 adjust_debit = (0, 0, {
                     'name': _('Adjustment Entry'),
                     'date': timenow,
                     'partner_id': partner_id,
-                    'account_id': slip.journal_id.default_debit_account_id.id,
+                    'account_id': acc_id,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
                     'debit': credit_sum - debit_sum,
                     'credit': 0.0,
                 })
                 line_ids.append(adjust_debit)
-
             move.update({'line_id': line_ids})
             move_id = move_pool.create(cr, uid, move, context=context)
             self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)
@@ -174,5 +198,14 @@ class hr_contract(osv.osv):
     }
 hr_contract()
 
+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),
+    }
+
+hr_payslip_run()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 825fac9cab4..667b1308ec5 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -51,6 +51,46 @@
                 </xpath>
             </field>
         </record>
+        
+    <!-- Payslip Run View -->
 
+        <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="type">search</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position="after">
+                	<newline/>
+                    <field name="journal_id" widget="selection"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_tree_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.tree.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_tree"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position="after">
+                    <field name="journal_id"/>
+                </field>
+            </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="type">form</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position="after">
+                	<newline/>
+                    <field name="journal_id"/>
+                </field>
+            </field>
+        </record>
+        
     </data>
 </openerp>
diff --git a/addons/hr_payroll_account/i18n/bg.po b/addons/hr_payroll_account/i18n/bg.po
index 719e9c69b0d..8e19b433583 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: 2011-03-28 04:36+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -26,7 +26,7 @@ msgstr ""
 #: field:hr.payroll.register,bank_journal_id:0
 #: field:hr.payslip,bank_journal_id:0
 msgid "Bank Journal"
-msgstr ""
+msgstr "Банков Журнал"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
@@ -62,7 +62,7 @@ msgstr "Служител"
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Other Informations"
-msgstr ""
+msgstr "Други информации"
 
 #. module: hr_payroll_account
 #: field:hr.employee,salary_account:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -139,8 +139,8 @@ msgid "Payment Lines"
 msgstr "Редове от плащане"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -217,13 +217,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Предупреждение!"
@@ -260,8 +263,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -291,7 +294,7 @@ msgid "Salary Structure"
 msgstr "Структура на заплатата"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -302,8 +305,8 @@ msgid "Year"
 msgstr "Година"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -314,7 +317,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
@@ -326,4 +329,4 @@ msgstr ""
 #: code:addons/hr_payroll_account/hr_payroll_account.py:550
 #, python-format
 msgid "Integrity Error !"
-msgstr ""
+msgstr "Грешка за цялостност !"
diff --git a/addons/hr_payroll_account/i18n/ca.po b/addons/hr_payroll_account/i18n/ca.po
new file mode 100644
index 00000000000..34e38475e41
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/ca.po
@@ -0,0 +1,358 @@
+# 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-08-17 20:44+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr "Moviments comptables"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr "Diari bancari"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr "Línia de registre de contribució"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr "Registre de contribució"
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "Compte analític per anàlisi de nòmines"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr "Diari de despeses"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Període"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Treballador"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "Altra informació"
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "Compte de la nòmina"
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+"Seleccioneu un compte bancari des de la qual pagar les despeses salarials / "
+"de nòmines"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr "Registre de nòmines"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr "Assentament comptable enllaçat al full de pagament"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+"Si us plau, confirmeu que totes les factures de despeses per al seu "
+"reemborsament apareixen"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr "Si us plau, definiu l'empresa del compte bancari per a %s !"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr "Informació comptable"
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr "Compte de despeses per registrar les despeses salarials"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr "Si us plau, definiu el compte bancari per a %s !"
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+"Sistema genèric de pagament de nòmines integrat amb la comptabilitat\n"
+"    * Codificació de despeses\n"
+"    * Codificació de pagaments\n"
+"    * Gestió de contribucions de la companyia. / Companyia gestora de "
+"contribucions\n"
+"    "
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr "Comptabilitat de nòmines de recursos humans."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "Línies de pagament"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr "Definiu l'exercici fiscal per un contracte en concret"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Nòmina"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Error! No podeu crear una jerarquia recursiva de treballadors."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr "Moviments"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Comptes"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Compte bancari"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Línia de nòmina"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr "Rebuts comptables"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Error! No podeu seleccionar un departament pel qual el treballador sigui el "
+"director."
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+"Deixeu en blanc per utilitzar el període de la data de validació de la "
+"nòmina."
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "Avís bancari"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr "Moviments de despeses"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr "Rebuts comptables"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
+#, python-format
+msgid "Warning !"
+msgstr "Avís!"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr "Compte del treballador"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "Compte general"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Total per treballador"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Força període"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "Tipus d'absència"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr "No s'ha definit any fiscal per la nòmina del %s"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr "Compte a pagar del treballador"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr "Total per companyia"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr "Estructura salarial"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr "Si us plau, configureu el compte a cobrar dels tercers!"
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Any"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr "No s'ha definit període per la nòmina de data %s"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr "Detalls comptables"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr "Si us plau, configureu el compte a pagar de l'empresa!"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr "Error d'integritat!"
+
+#~ msgid ""
+#~ "Generic Payroll system Integrated with Accountings\n"
+#~ "    * Expense Encoding\n"
+#~ "    * Payment Encoding\n"
+#~ "    * Company Contribution Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Sistema genèric de rebuts de pagament integrat amb comptes\n"
+#~ "    * Codificació de despeses\n"
+#~ "    * Codificació de pagaments\n"
+#~ "    * Gestió de contribució de companyia\n"
+#~ "    "
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
index df6eeb97ecf..125fe45e23c 100644
--- a/addons/hr_payroll_account/i18n/de.po
+++ b/addons/hr_payroll_account/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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -91,7 +91,7 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr "Bestätigen Sie alle Spesenrechnungen zwecks Erstattung"
@@ -146,8 +146,8 @@ msgid "Payment Lines"
 msgstr "Zahlungspositionen"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Bitte definieren Sie das Wirtschaftsjahr für Arbeitsvertrag"
@@ -227,13 +227,16 @@ msgid "Accounting vouchers"
 msgstr "Buchungsbelege"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Warnung !"
@@ -270,8 +273,8 @@ msgid "Leave Type"
 msgstr "Abwesenheitstyp"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr "Geschäftsjahr wurde für die Abrechnung %s nicht definiert"
@@ -301,7 +304,7 @@ msgid "Salary Structure"
 msgstr "Vergütungsstruktur"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Bitte konfigurieren Sie für den Partner einen Debitor"
@@ -312,8 +315,8 @@ msgid "Year"
 msgstr "Jahr"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr "Die Periode wurde nicht für das Abrechnungsdatum %s definiert."
@@ -324,7 +327,7 @@ msgid "Accounting Details"
 msgstr "Finanzen Details"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Bitte konfigurieren Sie den Kreditor beim Partner !!"
@@ -338,210 +341,6 @@ msgstr "Bitte konfigurieren Sie den Kreditor beim Partner !!"
 msgid "Integrity Error !"
 msgstr "Integritätsfehler !"
 
-#, python-format
-#~ msgid ""
-#~ "Period is not defined for slip date %s'%slip.date))\n"
-#~ "                period_id = search_periods[0]\n"
-#~ "\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': slip.name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"By Basic Salary / \" + slip.employee_id.name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.salary_account.id,\n"
-#~ "                'debit': slip.basic,\n"
-#~ "                'credit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'analytic_account_id': False,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "\n"
-#~ "            #Setting Analysis Account for Basic Salary\n"
-#~ "            if slip.employee_id.analytic_account:\n"
-#~ "                line['analytic_account_id'] = "
-#~ "slip.employee_id.analytic_account.id\n"
-#~ "\n"
-#~ "            move_line_id = movel_pool.create(cr, uid, line, "
-#~ "context=context)\n"
-#~ "            line_ids += [move_line_id]\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"To Basic Paysble Salary / \" + "
-#~ "slip.employee_id.name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.employee_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'credit': slip.basic,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, line, context=context)]\n"
-#~ "\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                name = \"[%s] - %s / %s\" % (line.code, line.name, "
-#~ "slip.employee_id.name)\n"
-#~ "                amount = line.total\n"
-#~ "\n"
-#~ "                if line.type == 'leaves':\n"
-#~ "                    continue\n"
-#~ "\n"
-#~ "                rec = {\n"
-#~ "                    'move_id':move_id,\n"
-#~ "                    'name': name,\n"
-#~ "                    'date': slip.date,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'debit': 0.0,\n"
-#~ "                    'credit' : 0.0,\n"
-#~ "                    'journal_id' : slip.journal_id.id,\n"
-#~ "                    'period_id' :period_id,\n"
-#~ "                    'analytic_account_id':False,\n"
-#~ "                    'ref':slip.number,\n"
-#~ "                    'quantity':1\n"
-#~ "                }\n"
-#~ "\n"
-#~ "                #Setting Analysis Account for Salary Slip Lines\n"
-#~ "                if line.analytic_account_id:\n"
-#~ "                    rec['analytic_account_id'] = "
-#~ "line.analytic_account_id.id\n"
-#~ "                else:\n"
-#~ "                    rec['analytic_account_id'] = slip.deg_id.account_id.id\n"
-#~ "\n"
-#~ "                if line.type == 'allowance' or line.type == 'otherpay':\n"
-#~ "                    rec['debit'] = amount\n"
-#~ "                    if not partner.property_account_payable:\n"
-#~ "                        raise osv.except_osv(_('Integrity Error !"
-#~ msgstr ""
-#~ "Die Periode ist nicht definiert für die Abrechnung %s'%slip.date))\n"
-#~ "                period_id = search_periods[0]\n"
-#~ "\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': slip.name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"By Basic Salary / \" + slip.employee_id.name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.salary_account.id,\n"
-#~ "                'debit': slip.basic,\n"
-#~ "                'credit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'analytic_account_id': False,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "\n"
-#~ "            #Setting Analysis Account for Basic Salary\n"
-#~ "            if slip.employee_id.analytic_account:\n"
-#~ "                line['analytic_account_id'] = "
-#~ "slip.employee_id.analytic_account.id\n"
-#~ "\n"
-#~ "            move_line_id = movel_pool.create(cr, uid, line, "
-#~ "context=context)\n"
-#~ "            line_ids += [move_line_id]\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"To Basic Paysble Salary / \" + "
-#~ "slip.employee_id.name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.employee_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'credit': slip.basic,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, line, context=context)]\n"
-#~ "\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                name = \"[%s] - %s / %s\" % (line.code, line.name, "
-#~ "slip.employee_id.name)\n"
-#~ "                amount = line.total\n"
-#~ "\n"
-#~ "                if line.type == 'leaves':\n"
-#~ "                    continue\n"
-#~ "\n"
-#~ "                rec = {\n"
-#~ "                    'move_id':move_id,\n"
-#~ "                    'name': name,\n"
-#~ "                    'date': slip.date,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'debit': 0.0,\n"
-#~ "                    'credit' : 0.0,\n"
-#~ "                    'journal_id' : slip.journal_id.id,\n"
-#~ "                    'period_id' :period_id,\n"
-#~ "                    'analytic_account_id':False,\n"
-#~ "                    'ref':slip.number,\n"
-#~ "                    'quantity':1\n"
-#~ "                }\n"
-#~ "\n"
-#~ "                #Setting Analysis Account for Salary Slip Lines\n"
-#~ "                if line.analytic_account_id:\n"
-#~ "                    rec['analytic_account_id'] = "
-#~ "line.analytic_account_id.id\n"
-#~ "                else:\n"
-#~ "                    rec['analytic_account_id'] = slip.deg_id.account_id.id\n"
-#~ "\n"
-#~ "                if line.type == 'allowance' or line.type == 'otherpay':\n"
-#~ "                    rec['debit'] = amount\n"
-#~ "                    if not partner.property_account_payable:\n"
-#~ "                        raise osv.except_osv(_('Integrity Error !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#~ msgid "Expanse Journal"
-#~ msgstr "Journal Mitarbeiterausgaben"
-
-#, python-format
-#~ msgid ""
-#~ "Please defined bank account for %s !' % (slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            if not slip.employee_id.bank_account_id.partner_id:\n"
-#~ "                raise osv.except_osv(_('Integrity Error !"
-#~ msgstr ""
-#~ "Bitte definieren Sie das Bankkonto für  %s !' % (slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            if not slip.employee_id.bank_account_id.partner_id:\n"
-#~ "                raise osv.except_osv(_('Integrity Error !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid "Select Bank Account from where Salary Expanse will be Paid"
-#~ msgstr "Wähle Bankkonto für Zahlung der Mitarbeitervergütung"
-
-#~ msgid "Expanse account when Salary Expanse will be recorded"
-#~ msgstr "Aufwandskonto, welches gebucht wird bei Vergütungsabrechnung"
-
 #~ msgid ""
 #~ "Generic Payroll system Integrated with Accountings\n"
 #~ "    * Expense Encoding\n"
@@ -553,178 +352,3 @@ msgstr "Integritätsfehler !"
 #~ "   * Buchung von Mitarbeitervergütungen   * Buchung von Auszahlungen an "
 #~ "Mitarbeiter   * Buchung von Arbeitgeber- und Arbeitnehmeranteilen\n"
 #~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "Fiscal Year is not defined for slip date %s'%slip.date))\n"
-#~ "                search_periods = "
-#~ "period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',sl"
-#~ "ip.date)], context=context)\n"
-#~ "                if not search_periods:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Wirtschaftsjahr wurde nicht definiert für Abrechnungsdatum %s'%slip.date))\n"
-#~ "                search_periods = "
-#~ "period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',sl"
-#~ "ip.date)], context=context)\n"
-#~ "                if not search_periods:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "Period is not defined for slip date %s'%slip.date))\n"
-#~ "            period_id = search_periods[0]\n"
-#~ "            name = 'Payment of Salary to %s' % (slip.employee_id.name)\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.bank_journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'type':'bank_pay_voucher',\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], name, move_id)\n"
-#~ "\n"
-#~ "            name = \"To %s account\" % (slip.employee_id.name)\n"
-#~ "            ded_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.property_bank_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'credit' : slip.total_pay,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, ded_rec, "
-#~ "context=context)]\n"
-#~ "            name = \"By %s account\" % "
-#~ "(slip.employee_id.property_bank_account.name)\n"
-#~ "            cre_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': partner.property_account_payable.id,\n"
-#~ "                'debit':  slip.total_pay,\n"
-#~ "                'credit' : 0.0,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, cre_rec, "
-#~ "context=context)]\n"
-#~ "\n"
-#~ "            other_pay = slip.other_pay\n"
-#~ "            #Process all Reambuse Entries\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                if line.type == 'otherpay' and line.expanse_id.invoice_id:\n"
-#~ "                    if not line.expanse_id.invoice_id.move_id:\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Periode wurde nicht definiert für Abrechnungsdatum %s'%slip.date))\n"
-#~ "            period_id = search_periods[0]\n"
-#~ "            name = 'Payment of Salary to %s' % (slip.employee_id.name)\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.bank_journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'type':'bank_pay_voucher',\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], name, move_id)\n"
-#~ "\n"
-#~ "            name = \"To %s account\" % (slip.employee_id.name)\n"
-#~ "            ded_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.property_bank_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'credit' : slip.total_pay,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, ded_rec, "
-#~ "context=context)]\n"
-#~ "            name = \"By %s account\" % "
-#~ "(slip.employee_id.property_bank_account.name)\n"
-#~ "            cre_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': partner.property_account_payable.id,\n"
-#~ "                'debit':  slip.total_pay,\n"
-#~ "                'credit' : 0.0,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, cre_rec, "
-#~ "context=context)]\n"
-#~ "\n"
-#~ "            other_pay = slip.other_pay\n"
-#~ "            #Process all Reambuse Entries\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                if line.type == 'otherpay' and line.expanse_id.invoice_id:\n"
-#~ "                    if not line.expanse_id.invoice_id.move_id:\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "Fiscal Year is not defined for slip date %s'%slip.date))\n"
-#~ "            search_periods = period_pool.search(cr, uid, "
-#~ "[('date_start','<=',slip.date),('date_stop','>=',slip.date)], "
-#~ "context=context)\n"
-#~ "            if not search_periods:\n"
-#~ "                raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Wirtschaftsjahr wurde nicht definiert für Abrechnungsdatum %s'%slip.date))\n"
-#~ "            search_periods = period_pool.search(cr, uid, "
-#~ "[('date_start','<=',slip.date),('date_stop','>=',slip.date)], "
-#~ "context=context)\n"
-#~ "            if not search_periods:\n"
-#~ "                raise osv.except_osv(_('Warning !"
-
-#~ msgid "Accounting"
-#~ msgstr "Finanzbuchhaltung"
-
-#, python-format
-#~ msgid ""
-#~ "Please defined partner in bank account for %s !' % "
-#~ "(slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            partner = slip.employee_id.bank_account_id.partner_id\n"
-#~ "            partner_id = slip.employee_id.bank_account_id.partner_id.id\n"
-#~ "\n"
-#~ "            period_id = False\n"
-#~ "\n"
-#~ "            if slip.period_id:\n"
-#~ "                period_id = slip.period_id.id\n"
-#~ "            else:\n"
-#~ "                fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], "
-#~ "context=context)\n"
-#~ "                if not fiscal_year_ids:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Bitte definieren Sie den Partner im Bankkonto für %s !' % "
-#~ "(slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            partner = slip.employee_id.bank_account_id.partner_id\n"
-#~ "            partner_id = slip.employee_id.bank_account_id.partner_id.id\n"
-#~ "\n"
-#~ "            period_id = False\n"
-#~ "\n"
-#~ "            if slip.period_id:\n"
-#~ "                period_id = slip.period_id.id\n"
-#~ "            else:\n"
-#~ "                fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], "
-#~ "context=context)\n"
-#~ "                if not fiscal_year_ids:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
diff --git a/addons/hr_payroll_account/i18n/es.po b/addons/hr_payroll_account/i18n/es.po
index 6a204095f71..86b02a8f282 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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -92,7 +92,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -149,8 +149,8 @@ msgid "Payment Lines"
 msgstr "Líneas de pago"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Defina el ejercicio fiscal para un contrato en concreto"
@@ -229,13 +229,16 @@ msgid "Accounting vouchers"
 msgstr "Recibos contables"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "¡Aviso!"
@@ -272,8 +275,8 @@ msgid "Leave Type"
 msgstr "Tipo de ausencia"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr "No se ha definido año fiscal para la nómina del %s"
@@ -303,7 +306,7 @@ msgid "Salary Structure"
 msgstr "Estructura salarial"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Por favor, ¡configure la cuenta a cobrar de los terceros!"
@@ -314,8 +317,8 @@ msgid "Year"
 msgstr "Año"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr "No se ha definido período para la nómina de fecha %s"
@@ -326,7 +329,7 @@ msgid "Accounting Details"
 msgstr "Detalles de contabilidad"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Por favor, ¡configure la cuenta a pagar de partners!"
@@ -340,9 +343,15 @@ msgstr "Por favor, ¡configure la cuenta a pagar de partners!"
 msgid "Integrity Error !"
 msgstr "¡Error de integridad!"
 
-#~ msgid "Expanse Journal"
-#~ msgstr "Diario de gastos"
-
-#~ msgid "Select Bank Account from where Salary Expanse will be Paid"
+#~ msgid ""
+#~ "Generic Payroll system Integrated with Accountings\n"
+#~ "    * Expense Encoding\n"
+#~ "    * Payment Encoding\n"
+#~ "    * Company Contribution Management\n"
+#~ "    "
 #~ msgstr ""
-#~ "Seleccione la cuenta bancaria desde donde se pagará el gasto de nómina."
+#~ "Sistema Genérico de Recibos de Pago integrado con Cuentas\n"
+#~ "    * Codificación de Gastos\n"
+#~ "    * Codificación de Pagos\n"
+#~ "    * Gestión de Contribución de Compañía\n"
+#~ "    "
diff --git a/addons/hr_payroll_account/i18n/es_EC.po b/addons/hr_payroll_account/i18n/es_EC.po
index 05ca18749c8..c5e65d0ee7d 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: 2011-03-10 04:46+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -139,8 +139,8 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -216,13 +216,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -259,8 +262,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -290,7 +293,7 @@ msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -301,8 +304,8 @@ msgid "Year"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -313,7 +316,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
diff --git a/addons/hr_payroll_account/i18n/es_MX.po b/addons/hr_payroll_account/i18n/es_MX.po
new file mode 100644
index 00000000000..6ae82ac868f
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/es_MX.po
@@ -0,0 +1,357 @@
+# 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 13:54+0000\n"
+"Last-Translator: Marcelo Zunino (openerpuy.com) <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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr "Movimientos contables"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr "Diario bancario"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr "Línea de registro de contribución"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr "Registro de Contribución"
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "Cuenta analítica para análisis de nóminas"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr "Diario de gastos"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "Otra información"
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "Cuenta de nómina"
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+"Seleccione una cuenta bancaria desde la que pagar los gastos salariales / de "
+"nóminas"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr "Registro de nóminas"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr "Asiento contable enlazado a hoja de pago"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+"Por favor, confirme que todas las facturas de gastos aparecen para su "
+"reembolso"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr "¡ Por favor, defina la empresa de la cuenta bancaria para %s !"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr "Información contable"
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr "Cuenta de gastos para registrar gastos salariales / de nóminas"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr "¡ Por favor, defina la cuenta bancaria para %s !"
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+"Sistema genérico de pago de nóminas integrado con la contabilidad\n"
+"    * Codificación de gastos\n"
+"    * Codificación de pagos\n"
+"    * Gestión de contribuciones de la compañía. / Compañía gestora de "
+"contribuciones\n"
+"    "
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr "Contabilidad de nóminas de recursos humanos."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "Líneas de pago"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr "Defina el ejercicio fiscal para un contrato en concreto"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Nómina"
+
+#. module: hr_payroll_account
+#: 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."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr "Movimientos"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Línea de nómina"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr "Recibos contables"
+
+#. module: hr_payroll_account
+#: 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 para el cual el empleado sea el "
+"director."
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+"Deje en blanco para usar el período de la fecha de validación de la nómina"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "Observación aviso bancario"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr "Movimientos de gastos"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr "Recibos contables"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr "Cuenta empleado"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Total por empleado"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Forzar período"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "Tipo de ausencia"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr "No se ha definido año fiscal para la nómina del %s"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr "Cuenta a pagar del empleado"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr "Total por compañía"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr "Estructura salarial"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr "Por favor, ¡configure la cuenta a cobrar de los terceros!"
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr "No se ha definido período para la nómina de fecha %s"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr "Detalles de contabilidad"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr "Por favor, ¡configure la cuenta a pagar de partners!"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr "¡Error de integridad!"
+
+#~ msgid ""
+#~ "Generic Payroll system Integrated with Accountings\n"
+#~ "    * Expense Encoding\n"
+#~ "    * Payment Encoding\n"
+#~ "    * Company Contribution Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Sistema Genérico de Recibos de Pago integrado con Cuentas\n"
+#~ "    * Codificación de Gastos\n"
+#~ "    * Codificación de Pagos\n"
+#~ "    * Gestión de Contribución de Compañía\n"
+#~ "    "
diff --git a/addons/hr_payroll_account/i18n/es_PY.po b/addons/hr_payroll_account/i18n/es_PY.po
index 25da616f284..6e052cadbc2 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: 2011-03-07 04:49+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -147,8 +147,8 @@ msgid "Payment Lines"
 msgstr "Pagos"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Defina el ejercicio fiscal para un contrato en concreto"
@@ -227,13 +227,16 @@ msgid "Accounting vouchers"
 msgstr "Recibos contables"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "¡ Advertencia !"
@@ -270,8 +273,8 @@ msgid "Leave Type"
 msgstr "Tipo de ausencia"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr "No se ha definido año fiscal para la nómina del %s"
@@ -301,7 +304,7 @@ msgid "Salary Structure"
 msgstr "Estructura salarial"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Por favor, ¡configure la cuenta a cobrar de los terceros!"
@@ -312,8 +315,8 @@ msgid "Year"
 msgstr "Año"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr "No se ha definido período para la nómina de fecha %s"
@@ -324,7 +327,7 @@ msgid "Accounting Details"
 msgstr "Detalles de contabilidad"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Por favor, ¡configure la cuenta a pagar de Empresas!"
diff --git a/addons/hr_payroll_account/i18n/es_VE.po b/addons/hr_payroll_account/i18n/es_VE.po
new file mode 100644
index 00000000000..6ae82ac868f
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/es_VE.po
@@ -0,0 +1,357 @@
+# 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 13:54+0000\n"
+"Last-Translator: Marcelo Zunino (openerpuy.com) <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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr "Movimientos contables"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr "Diario bancario"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr "Línea de registro de contribución"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr "Registro de Contribución"
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "Cuenta analítica para análisis de nóminas"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr "Diario de gastos"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "Otra información"
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "Cuenta de nómina"
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+"Seleccione una cuenta bancaria desde la que pagar los gastos salariales / de "
+"nóminas"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr "Registro de nóminas"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr "Asiento contable enlazado a hoja de pago"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+"Por favor, confirme que todas las facturas de gastos aparecen para su "
+"reembolso"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr "¡ Por favor, defina la empresa de la cuenta bancaria para %s !"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr "Información contable"
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr "Cuenta de gastos para registrar gastos salariales / de nóminas"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr "¡ Por favor, defina la cuenta bancaria para %s !"
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+"Sistema genérico de pago de nóminas integrado con la contabilidad\n"
+"    * Codificación de gastos\n"
+"    * Codificación de pagos\n"
+"    * Gestión de contribuciones de la compañía. / Compañía gestora de "
+"contribuciones\n"
+"    "
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr "Contabilidad de nóminas de recursos humanos."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "Líneas de pago"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr "Defina el ejercicio fiscal para un contrato en concreto"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Nómina"
+
+#. module: hr_payroll_account
+#: 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."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr "Movimientos"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Línea de nómina"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr "Recibos contables"
+
+#. module: hr_payroll_account
+#: 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 para el cual el empleado sea el "
+"director."
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+"Deje en blanco para usar el período de la fecha de validación de la nómina"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "Observación aviso bancario"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr "Movimientos de gastos"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr "Recibos contables"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr "Cuenta empleado"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Total por empleado"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Forzar período"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "Tipo de ausencia"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr "No se ha definido año fiscal para la nómina del %s"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr "Cuenta a pagar del empleado"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr "Total por compañía"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr "Estructura salarial"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr "Por favor, ¡configure la cuenta a cobrar de los terceros!"
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr "No se ha definido período para la nómina de fecha %s"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr "Detalles de contabilidad"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr "Por favor, ¡configure la cuenta a pagar de partners!"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr "¡Error de integridad!"
+
+#~ msgid ""
+#~ "Generic Payroll system Integrated with Accountings\n"
+#~ "    * Expense Encoding\n"
+#~ "    * Payment Encoding\n"
+#~ "    * Company Contribution Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "Sistema Genérico de Recibos de Pago integrado con Cuentas\n"
+#~ "    * Codificación de Gastos\n"
+#~ "    * Codificación de Pagos\n"
+#~ "    * Gestión de Contribución de Compañía\n"
+#~ "    "
diff --git a/addons/hr_payroll_account/i18n/fr.po b/addons/hr_payroll_account/i18n/fr.po
index 70c2ed2fd9d..8bb9ea04529 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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -91,7 +91,7 @@ msgid "Description"
 msgstr "Description"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -148,8 +148,8 @@ msgid "Payment Lines"
 msgstr "Lignes de paiement"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Veuillez définir l'exercice fiscale pour ce contrat particulier"
@@ -230,13 +230,16 @@ msgid "Accounting vouchers"
 msgstr "Pièces comptables"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -273,8 +276,8 @@ msgid "Leave Type"
 msgstr "Type de congé"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr "L'exercice comptable n'est pas défini pour la feuille de paye du %s"
@@ -304,7 +307,7 @@ msgid "Salary Structure"
 msgstr "Structure salariale"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Veuillez configuer le compte à recevoir des partenaires !"
@@ -315,8 +318,8 @@ msgid "Year"
 msgstr "Année"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr "La période n'est pas définie pour la feuille de paye du %s"
@@ -327,7 +330,7 @@ msgid "Accounting Details"
 msgstr "Détails comptables"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Veuillez configurer le compte à payer des partenaires !"
@@ -341,12 +344,6 @@ msgstr "Veuillez configurer le compte à payer des partenaires !"
 msgid "Integrity Error !"
 msgstr "Erreur d'intégrité !"
 
-#~ msgid "Expanse Journal"
-#~ msgstr "Journal des dépenses"
-
-#~ msgid "Expanse account when Salary Expanse will be recorded"
-#~ msgstr "Compte de frais à utiliser pour l'enregistrement du salaire"
-
 #~ msgid ""
 #~ "Generic Payroll system Integrated with Accountings\n"
 #~ "    * Expense Encoding\n"
@@ -360,9 +357,3 @@ msgstr "Erreur d'intégrité !"
 #~ "    * Saisies des paiements\n"
 #~ "    * Gestion de la contribution de l'entreprise\n"
 #~ "    "
-
-#~ msgid "Accounting"
-#~ msgstr "Comptabilité"
-
-#~ msgid "Select Bank Account from where Salary Expanse will be Paid"
-#~ msgstr "Sélectionnez le compte bancaire à partir duquel le salaire sera payé"
diff --git a/addons/hr_payroll_account/i18n/gl.po b/addons/hr_payroll_account/i18n/gl.po
index c62204523fd..692f48de9b0 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: 2011-02-25 04:39+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Descrición"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -146,8 +146,8 @@ msgid "Payment Lines"
 msgstr "Liñas de pago"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Por favor defina o exercicio fiscal para un contrato en concreto"
@@ -225,13 +225,16 @@ msgid "Accounting vouchers"
 msgstr "Recibos contables"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Coidado !"
@@ -268,8 +271,8 @@ msgid "Leave Type"
 msgstr "Tipo de ausencia"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr "Non foi definido o ano fiscal para a nómina %s"
@@ -299,7 +302,7 @@ msgid "Salary Structure"
 msgstr "Estrutura salarial"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Por favor, configure a conta a cobrar dos terceiros!"
@@ -310,8 +313,8 @@ msgid "Year"
 msgstr "Ano"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr "Non se definiu o período para a nómina de data %s"
@@ -322,7 +325,7 @@ msgid "Accounting Details"
 msgstr "Detalles de contabilidade"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Por favor, configure a conta de pago dos partners!"
diff --git a/addons/hr_payroll_account/i18n/hu.po b/addons/hr_payroll_account/i18n/hu.po
index f9b1e1be785..14d367533e5 100644
--- a/addons/hr_payroll_account/i18n/hu.po
+++ b/addons/hr_payroll_account/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 23:18+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-02-05 05:01+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +91,7 @@ msgid "Description"
 msgstr "Megjegyzés"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -141,8 +142,8 @@ msgid "Payment Lines"
 msgstr "Kifizetés sorok"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Kérem, határozza meg a szerződés üzleti évét!"
@@ -221,13 +222,16 @@ msgid "Accounting vouchers"
 msgstr "Könyvelési bizonylatok"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Vigyázat!"
@@ -264,8 +268,8 @@ msgid "Leave Type"
 msgstr "Szabadság típusa"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr "Nem határoztak meg üzleti évet a fizetési jegyzék dátumára: %s"
@@ -295,7 +299,7 @@ msgid "Salary Structure"
 msgstr "Bérszerkezet"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Kérem, állítsa be a partner vevő számláját!"
@@ -306,8 +310,8 @@ msgid "Year"
 msgstr "Év"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr "Nem határoztak meg időszakot a fizetési jegyzék dátumára: %s"
@@ -318,7 +322,7 @@ msgid "Accounting Details"
 msgstr "Könyvelési részletek"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Kérem, állítsa be a partner szállító számláját!"
diff --git a/addons/hr_payroll_account/i18n/id.po b/addons/hr_payroll_account/i18n/id.po
index 2b9fe70b5f2..35090510df9 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: 2011-02-10 04:36+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Keterangan"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr "Mohon Konfirmasikan semua Faktur Beban yang muncul untuk Penggantian"
@@ -139,8 +139,8 @@ msgid "Payment Lines"
 msgstr "Daftar Pembayaran"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Harap tentukan tahun fiskal untuk kontrak perticular"
@@ -218,13 +218,16 @@ msgid "Accounting vouchers"
 msgstr "Accounting vouchers"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Peringatan !"
@@ -261,8 +264,8 @@ msgid "Leave Type"
 msgstr "Jenis Cuti"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr "Setahun fiskal tidak didefinisikan untuk slip Tanggal %s"
@@ -292,7 +295,7 @@ msgid "Salary Structure"
 msgstr "Struktur Gaji"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Harap Konfigurasi Account Piutang Rekanan!"
@@ -303,8 +306,8 @@ msgid "Year"
 msgstr "Tahun"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr "Periode tidak didefinisikan untuk slip Tanggal %s"
@@ -315,7 +318,7 @@ msgid "Accounting Details"
 msgstr "Rincian Akunting"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Harap Konfigurasi Hutang Rekanan!"
diff --git a/addons/hr_payroll_account/i18n/it.po b/addons/hr_payroll_account/i18n/it.po
index 95ad4980876..14d390a9093 100644
--- a/addons/hr_payroll_account/i18n/it.po
+++ b/addons/hr_payroll_account/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-05 13:53+0000\n"
-"Last-Translator: mimoski2 <mimix@gmail.it>\n"
+"Last-Translator: mimoski <mimix@gmail.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: 2011-02-06 04:54+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Descrizione"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -140,8 +140,8 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -219,13 +219,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Attenzione!"
@@ -262,8 +265,8 @@ msgid "Leave Type"
 msgstr "Tipo di permesso"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -293,7 +296,7 @@ msgid "Salary Structure"
 msgstr "Struttura stipendio"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -304,8 +307,8 @@ msgid "Year"
 msgstr "Anno"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -316,7 +319,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index c799fd33d19..c5c0dbc3a83 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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -89,7 +89,7 @@ msgid "Description"
 msgstr "Тайлбар"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr "Буцаалтын төлбөр болон үүссэн бүх зардлын нэхэмжлэлийг батална уу"
@@ -138,8 +138,8 @@ msgid "Payment Lines"
 msgstr "Төлбөрийн мөрүүд"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr "Тухайн гэрээнд зориулан санхүүгийн жил тодорхойлно уу !"
@@ -216,13 +216,16 @@ msgid "Accounting vouchers"
 msgstr "Санхүүгийн батлан даалт(ваучер)"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Анхааруулга !"
@@ -259,8 +262,8 @@ msgid "Leave Type"
 msgstr "Амралт, чөлөөний төрөл"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -290,7 +293,7 @@ msgid "Salary Structure"
 msgstr "Цалингийн шатлал"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr "Харилцагчийн авлагын дансыг тодорхойлно уу!"
@@ -301,8 +304,8 @@ msgid "Year"
 msgstr "Жилийн"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -313,7 +316,7 @@ msgid "Accounting Details"
 msgstr "Санхүү бүртгэлийн мэдээлэл"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr "Харилцагчийн өглөгийн дансыг тодорхойлно уу!"
@@ -327,19 +330,6 @@ msgstr "Харилцагчийн өглөгийн дансыг тодорхой
 msgid "Integrity Error !"
 msgstr "Өгөгдөл бүрэн биш алдаа !"
 
-#~ msgid "Expanse Journal"
-#~ msgstr "Өргөтгөсөн журнал"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Обьектын нэр x_-ээр эхэлж, ямар тусгай тэмдэгт агуулж болохгүй !"
-
-#~ msgid "Expanse account when Salary Expanse will be recorded"
-#~ msgstr "Цалингийн зардал бичигдэх өргөтгөсөн данс"
-
-#~ msgid "Select Bank Account from where Salary Expanse will be Paid"
-#~ msgstr "Цалингийн зардалыг төлөх (төлбөр гарах) банкны дансыг сонгоно  уу!"
-
 #~ msgid ""
 #~ "Generic Payroll system Integrated with Accountings\n"
 #~ "    * Expense Encoding\n"
@@ -352,372 +342,3 @@ msgstr "Өгөгдөл бүрэн биш алдаа !"
 #~ "       Төлбөрийн бүртгэл\n"
 #~ "        Ажил олгогчийн даах суутгалын удирдлага\n"
 #~ "    "
-
-#~ msgid "Accounting"
-#~ msgstr "Санхүү бүртгэл"
-
-#, python-format
-#~ msgid ""
-#~ "Period is not defined for slip date %s'%slip.date))\n"
-#~ "                period_id = search_periods[0]\n"
-#~ "\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': slip.name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"By Basic Salary / \" + slip.employee_id.name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.salary_account.id,\n"
-#~ "                'debit': slip.basic,\n"
-#~ "                'credit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'analytic_account_id': False,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "\n"
-#~ "            #Setting Analysis Account for Basic Salary\n"
-#~ "            if slip.employee_id.analytic_account:\n"
-#~ "                line['analytic_account_id'] = "
-#~ "slip.employee_id.analytic_account.id\n"
-#~ "\n"
-#~ "            move_line_id = movel_pool.create(cr, uid, line, "
-#~ "context=context)\n"
-#~ "            line_ids += [move_line_id]\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"To Basic Paysble Salary / \" + "
-#~ "slip.employee_id.name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.employee_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'credit': slip.basic,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, line, context=context)]\n"
-#~ "\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                name = \"[%s] - %s / %s\" % (line.code, line.name, "
-#~ "slip.employee_id.name)\n"
-#~ "                amount = line.total\n"
-#~ "\n"
-#~ "                if line.type == 'leaves':\n"
-#~ "                    continue\n"
-#~ "\n"
-#~ "                rec = {\n"
-#~ "                    'move_id':move_id,\n"
-#~ "                    'name': name,\n"
-#~ "                    'date': slip.date,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'debit': 0.0,\n"
-#~ "                    'credit' : 0.0,\n"
-#~ "                    'journal_id' : slip.journal_id.id,\n"
-#~ "                    'period_id' :period_id,\n"
-#~ "                    'analytic_account_id':False,\n"
-#~ "                    'ref':slip.number,\n"
-#~ "                    'quantity':1\n"
-#~ "                }\n"
-#~ "\n"
-#~ "                #Setting Analysis Account for Salary Slip Lines\n"
-#~ "                if line.analytic_account_id:\n"
-#~ "                    rec['analytic_account_id'] = "
-#~ "line.analytic_account_id.id\n"
-#~ "                else:\n"
-#~ "                    rec['analytic_account_id'] = slip.deg_id.account_id.id\n"
-#~ "\n"
-#~ "                if line.type == 'allowance' or line.type == 'otherpay':\n"
-#~ "                    rec['debit'] = amount\n"
-#~ "                    if not partner.property_account_payable:\n"
-#~ "                        raise osv.except_osv(_('Integrity Error !"
-#~ msgstr ""
-#~ "Цалингийн хуудасны огноонд харгалзах мөчлөг тодорхойлогдоогүй байна "
-#~ "%s'%slip.date))\n"
-#~ "                period_id = search_periods[0]\n"
-#~ "\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': slip.name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"By Basic Salary / \" + slip.employee_id.name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.salary_account.id,\n"
-#~ "                'debit': slip.basic,\n"
-#~ "                'credit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'analytic_account_id': False,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "\n"
-#~ "            #Setting Analysis Account for Basic Salary\n"
-#~ "            if slip.employee_id.analytic_account:\n"
-#~ "                line['analytic_account_id'] = "
-#~ "slip.employee_id.analytic_account.id\n"
-#~ "\n"
-#~ "            move_line_id = movel_pool.create(cr, uid, line, "
-#~ "context=context)\n"
-#~ "            line_ids += [move_line_id]\n"
-#~ "\n"
-#~ "            line = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': \"To Basic Paysble Salary / \" + "
-#~ "slip.employee_id.name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.employee_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'quantity':slip.working_days,\n"
-#~ "                'credit': slip.basic,\n"
-#~ "                'journal_id': slip.journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, line, context=context)]\n"
-#~ "\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                name = \"[%s] - %s / %s\" % (line.code, line.name, "
-#~ "slip.employee_id.name)\n"
-#~ "                amount = line.total\n"
-#~ "\n"
-#~ "                if line.type == 'leaves':\n"
-#~ "                    continue\n"
-#~ "\n"
-#~ "                rec = {\n"
-#~ "                    'move_id':move_id,\n"
-#~ "                    'name': name,\n"
-#~ "                    'date': slip.date,\n"
-#~ "                    'account_id': line.account_id.id,\n"
-#~ "                    'debit': 0.0,\n"
-#~ "                    'credit' : 0.0,\n"
-#~ "                    'journal_id' : slip.journal_id.id,\n"
-#~ "                    'period_id' :period_id,\n"
-#~ "                    'analytic_account_id':False,\n"
-#~ "                    'ref':slip.number,\n"
-#~ "                    'quantity':1\n"
-#~ "                }\n"
-#~ "\n"
-#~ "                #Setting Analysis Account for Salary Slip Lines\n"
-#~ "                if line.analytic_account_id:\n"
-#~ "                    rec['analytic_account_id'] = "
-#~ "line.analytic_account_id.id\n"
-#~ "                else:\n"
-#~ "                    rec['analytic_account_id'] = slip.deg_id.account_id.id\n"
-#~ "\n"
-#~ "                if line.type == 'allowance' or line.type == 'otherpay':\n"
-#~ "                    rec['debit'] = amount\n"
-#~ "                    if not partner.property_account_payable:\n"
-#~ "                        raise osv.except_osv(_('Integrity Error !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#, python-format
-#~ msgid ""
-#~ "Please defined bank account for %s !' % (slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            if not slip.employee_id.bank_account_id.partner_id:\n"
-#~ "                raise osv.except_osv(_('Integrity Error !"
-#~ msgstr ""
-#~ "Энэ ажилтны банкин дах цалингийн дансыг тодорхойлно уу %s !' % "
-#~ "(slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            if not slip.employee_id.bank_account_id.partner_id:\n"
-#~ "                raise osv.except_osv(_('Integrity Error !"
-
-#, python-format
-#~ msgid ""
-#~ "Fiscal Year is not defined for slip date %s'%slip.date))\n"
-#~ "                search_periods = "
-#~ "period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',sl"
-#~ "ip.date)], context=context)\n"
-#~ "                if not search_periods:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Цалингийн хуудас дээрх огноонд харгалзах санхүүгийн жил тодорхойлогдоогүй "
-#~ "байна %s'%slip.date))\n"
-#~ "                search_periods = "
-#~ "period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',sl"
-#~ "ip.date)], context=context)\n"
-#~ "                if not search_periods:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "Period is not defined for slip date %s'%slip.date))\n"
-#~ "            period_id = search_periods[0]\n"
-#~ "            name = 'Payment of Salary to %s' % (slip.employee_id.name)\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.bank_journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'type':'bank_pay_voucher',\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], name, move_id)\n"
-#~ "\n"
-#~ "            name = \"To %s account\" % (slip.employee_id.name)\n"
-#~ "            ded_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.property_bank_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'credit' : slip.total_pay,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, ded_rec, "
-#~ "context=context)]\n"
-#~ "            name = \"By %s account\" % "
-#~ "(slip.employee_id.property_bank_account.name)\n"
-#~ "            cre_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': partner.property_account_payable.id,\n"
-#~ "                'debit':  slip.total_pay,\n"
-#~ "                'credit' : 0.0,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, cre_rec, "
-#~ "context=context)]\n"
-#~ "\n"
-#~ "            other_pay = slip.other_pay\n"
-#~ "            #Process all Reambuse Entries\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                if line.type == 'otherpay' and line.expanse_id.invoice_id:\n"
-#~ "                    if not line.expanse_id.invoice_id.move_id:\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Цалингийн хуудасны огноонд харгалзах мөчлөг тодорхойлогдоогүй байна "
-#~ "%s'%slip.date))\n"
-#~ "            period_id = search_periods[0]\n"
-#~ "            name = 'Payment of Salary to %s' % (slip.employee_id.name)\n"
-#~ "            move = {\n"
-#~ "                'journal_id': slip.bank_journal_id.id,\n"
-#~ "                'period_id': period_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'type':'bank_pay_voucher',\n"
-#~ "                'ref':slip.number,\n"
-#~ "                'narration': name\n"
-#~ "            }\n"
-#~ "            move_id = move_pool.create(cr, uid, move, context=context)\n"
-#~ "            self.create_voucher(cr, uid, [slip.id], name, move_id)\n"
-#~ "\n"
-#~ "            name = \"To %s account\" % (slip.employee_id.name)\n"
-#~ "            ded_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': slip.employee_id.property_bank_account.id,\n"
-#~ "                'debit': 0.0,\n"
-#~ "                'credit' : slip.total_pay,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, ded_rec, "
-#~ "context=context)]\n"
-#~ "            name = \"By %s account\" % "
-#~ "(slip.employee_id.property_bank_account.name)\n"
-#~ "            cre_rec = {\n"
-#~ "                'move_id':move_id,\n"
-#~ "                'name': name,\n"
-#~ "                'partner_id': partner_id,\n"
-#~ "                'date': slip.date,\n"
-#~ "                'account_id': partner.property_account_payable.id,\n"
-#~ "                'debit':  slip.total_pay,\n"
-#~ "                'credit' : 0.0,\n"
-#~ "                'journal_id' : slip.journal_id.id,\n"
-#~ "                'period_id' :period_id,\n"
-#~ "                'ref':slip.number\n"
-#~ "            }\n"
-#~ "            line_ids += [movel_pool.create(cr, uid, cre_rec, "
-#~ "context=context)]\n"
-#~ "\n"
-#~ "            other_pay = slip.other_pay\n"
-#~ "            #Process all Reambuse Entries\n"
-#~ "            for line in slip.line_ids:\n"
-#~ "                if line.type == 'otherpay' and line.expanse_id.invoice_id:\n"
-#~ "                    if not line.expanse_id.invoice_id.move_id:\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "Fiscal Year is not defined for slip date %s'%slip.date))\n"
-#~ "            search_periods = period_pool.search(cr, uid, "
-#~ "[('date_start','<=',slip.date),('date_stop','>=',slip.date)], "
-#~ "context=context)\n"
-#~ "            if not search_periods:\n"
-#~ "                raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Цалингийн хуудас дээрх огноонд харгалзах санхүүгийн жил тодорхойлогдоогүй "
-#~ "байна %s'%slip.date))\n"
-#~ "            search_periods = period_pool.search(cr, uid, "
-#~ "[('date_start','<=',slip.date),('date_stop','>=',slip.date)], "
-#~ "context=context)\n"
-#~ "            if not search_periods:\n"
-#~ "                raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "Please defined partner in bank account for %s !' % "
-#~ "(slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            partner = slip.employee_id.bank_account_id.partner_id\n"
-#~ "            partner_id = slip.employee_id.bank_account_id.partner_id.id\n"
-#~ "\n"
-#~ "            period_id = False\n"
-#~ "\n"
-#~ "            if slip.period_id:\n"
-#~ "                period_id = slip.period_id.id\n"
-#~ "            else:\n"
-#~ "                fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], "
-#~ "context=context)\n"
-#~ "                if not fiscal_year_ids:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "Энэ ажилтны банк дах цалингийн дансны харилцагчийг тодорхойлно уу %s !' % "
-#~ "(slip.employee_id.name)))\n"
-#~ "\n"
-#~ "            partner = slip.employee_id.bank_account_id.partner_id\n"
-#~ "            partner_id = slip.employee_id.bank_account_id.partner_id.id\n"
-#~ "\n"
-#~ "            period_id = False\n"
-#~ "\n"
-#~ "            if slip.period_id:\n"
-#~ "                period_id = slip.period_id.id\n"
-#~ "            else:\n"
-#~ "                fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], "
-#~ "context=context)\n"
-#~ "                if not fiscal_year_ids:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
diff --git a/addons/hr_payroll_account/i18n/nl.po b/addons/hr_payroll_account/i18n/nl.po
index cd98186f0cc..ec71cd0520a 100644
--- a/addons/hr_payroll_account/i18n/nl.po
+++ b/addons/hr_payroll_account/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: 2011-03-11 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -139,8 +139,8 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -217,13 +217,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing !"
@@ -260,8 +263,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -291,7 +294,7 @@ msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -302,8 +305,8 @@ msgid "Year"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -314,7 +317,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
diff --git a/addons/hr_payroll_account/i18n/pl.po b/addons/hr_payroll_account/i18n/pl.po
index 7f98e696c2c..e1de4d4fd72 100644
--- a/addons/hr_payroll_account/i18n/pl.po
+++ b/addons/hr_payroll_account/i18n/pl.po
@@ -8,25 +8,25 @@ 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-09-29 09:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-05 13:35+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-06 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
 msgid "Accounting Lines"
-msgstr ""
+msgstr "Pozycje zapisów"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,bank_journal_id:0
 #: field:hr.payslip,bank_journal_id:0
 msgid "Bank Journal"
-msgstr ""
+msgstr "Dziennik bankowy"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
@@ -41,23 +41,23 @@ msgstr ""
 #. module: hr_payroll_account
 #: help:hr.employee,analytic_account:0
 msgid "Analytic Account for Salary Analysis"
-msgstr ""
+msgstr "Konto analityczne do analizy wynagrodzeń"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,journal_id:0
 #: field:hr.payslip,journal_id:0
 msgid "Expense Journal"
-msgstr ""
+msgstr "Dziennik wydatków"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register.line,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Okres"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Pracownik"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -67,7 +67,7 @@ msgstr "Inne informacje"
 #. module: hr_payroll_account
 #: field:hr.employee,salary_account:0
 msgid "Salary Account"
-msgstr ""
+msgstr "Konto wynagrodzenia"
 
 #. module: hr_payroll_account
 #: help:hr.employee,property_bank_account:0
@@ -77,7 +77,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
 msgid "Payroll Register"
-msgstr ""
+msgstr "Rejestr list płac"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
 #: code:addons/hr_payroll_account/hr_payroll_account.py:429
 #, python-format
 msgid "Please defined bank account for %s !"
-msgstr ""
+msgstr "Zdefiniuj konto bankowe dla %s !"
 
 #. module: hr_payroll_account
 #: model:ir.module.module,description:hr_payroll_account.module_meta_information
@@ -139,22 +139,22 @@ msgid "Payment Lines"
 msgstr "Pozycje płatności"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
-msgstr ""
+msgstr "Wybierz rok podatkowy dla kontraktu"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,slip_id:0
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip
 msgid "Pay Slip"
-msgstr ""
+msgstr "Pasek wypłaty"
 
 #. module: hr_payroll_account
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Błąd ! Nie mozesz tworzyć rekurencyjnych hierarchii pracowników"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -166,22 +166,22 @@ msgstr "Pozycje"
 #: field:hr.holidays.status,account_id:0
 #: field:hr.payroll.advice,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: hr_payroll_account
 #: field:hr.employee,property_bank_account:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Konto bankowe"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
 msgid "Payslip Line"
-msgstr ""
+msgstr "Pozycja paska wypłaty"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -192,7 +192,7 @@ msgstr ""
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Błąd ! Nie możesz wybrać działu, którego pracownik jest przełożonym."
 
 #. module: hr_payroll_account
 #: help:hr.payroll.register,period_id:0
@@ -216,13 +216,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
@@ -230,12 +233,12 @@ msgstr "Ostrzeżenie !"
 #. module: hr_payroll_account
 #: field:hr.employee,employee_account:0
 msgid "Employee Account"
-msgstr ""
+msgstr "Konto pracownika"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.line,account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Konto główne"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,yearly_total_by_emp:0
@@ -245,7 +248,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Numeracja"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,period_id:0
@@ -256,11 +259,11 @@ msgstr "Wymuś okres"
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Typ urlopu"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -272,7 +275,7 @@ msgstr ""
 #: field:hr.payroll.structure,account_id:0
 #: field:hr.payslip.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analityczne"
 
 #. module: hr_payroll_account
 #: help:hr.employee,employee_account:0
@@ -287,10 +290,10 @@ msgstr ""
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
 msgid "Salary Structure"
-msgstr ""
+msgstr "Struktura wynagrodzenia"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -298,11 +301,11 @@ msgstr ""
 #. module: hr_payroll_account
 #: view:hr.contibution.register:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -313,7 +316,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
@@ -326,12 +329,3 @@ msgstr ""
 #, python-format
 msgid "Integrity Error !"
 msgstr "Błąd integracji !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/hr_payroll_account/i18n/pt.po b/addons/hr_payroll_account/i18n/pt.po
index bf25833ffc1..1d16290257f 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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -139,8 +139,8 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -217,13 +217,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Atenção!"
@@ -260,8 +263,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -291,7 +294,7 @@ msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -302,8 +305,8 @@ msgid "Year"
 msgstr "Ano"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -314,7 +317,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
@@ -327,6 +330,3 @@ msgstr ""
 #, python-format
 msgid "Integrity Error !"
 msgstr "Erro de integridade!"
-
-#~ msgid "Accounting"
-#~ msgstr "Contabilidade"
diff --git a/addons/hr_payroll_account/i18n/pt_BR.po b/addons/hr_payroll_account/i18n/pt_BR.po
index 789242da7cb..8da8a72bae8 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: 2011-03-12 05:02+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Description"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr "Please Confirm all Expense Invoice appear for Reimbursement"
@@ -144,8 +144,8 @@ msgid "Payment Lines"
 msgstr "Payment Lines"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -223,13 +223,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -266,8 +269,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -297,7 +300,7 @@ msgid "Salary Structure"
 msgstr "Estrutura do Salário"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -308,8 +311,8 @@ msgid "Year"
 msgstr "Ano"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -320,7 +323,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
diff --git a/addons/hr_payroll_account/i18n/ru.po b/addons/hr_payroll_account/i18n/ru.po
new file mode 100644
index 00000000000..6ba56838243
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/ru.po
@@ -0,0 +1,333 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-12 22:30+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-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr "Строки счета"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr "Банковский журнал"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "Аналитический счет для анализа заработной платы"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Период"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Сотрудник"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "Прочая информация"
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "Зарплатный счет"
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr "Журнал начисления заработной платы"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr "Учетная информация"
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr "Учёт выплат персоналу"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "Позиции платежа"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Расчетный листок"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr "Строки счета"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Учётная запись"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Банковский счет"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Название"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Строка расчетного листка"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Ошибка! Вы не можете выбрать подразделение, для которого сотрудник является "
+"руководителем."
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
+#, python-format
+msgid "Warning !"
+msgstr "Warning !"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr "Счёт работника"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "Базовый счёт"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Всего на сотрудника"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Последовательность"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Установить период"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "Тип отсутствия"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Счёт аналитики"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr "Всего по организации"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr "Структура зарплаты"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Год"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
diff --git a/addons/hr_payroll_account/i18n/sr@latin.po b/addons/hr_payroll_account/i18n/sr@latin.po
index 5474dc28e33..be31a8167aa 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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -139,8 +139,8 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -216,13 +216,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -259,8 +262,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -290,7 +293,7 @@ msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -301,8 +304,8 @@ msgid "Year"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -313,7 +316,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
diff --git a/addons/hr_payroll_account/i18n/sv.po b/addons/hr_payroll_account/i18n/sv.po
index 53e431b41c0..b85c2afd26b 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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
@@ -90,7 +90,7 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
@@ -139,8 +139,8 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
@@ -216,13 +216,16 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
 #: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:330
-#: code:addons/hr_payroll_account/hr_payroll_account.py:444
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
 #, python-format
 msgid "Warning !"
 msgstr "Varning !"
@@ -259,8 +262,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:280
-#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -290,7 +293,7 @@ msgid "Salary Structure"
 msgstr "Lönestruktur"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -301,8 +304,8 @@ msgid "Year"
 msgstr "År"
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:283
-#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
@@ -313,7 +316,7 @@ msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
@@ -326,9 +329,3 @@ msgstr ""
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
-
-#~ msgid "Select Bank Account from where Salary Expanse will be Paid"
-#~ msgstr "Välj bankkonto som lönen ska betalas från"
-
-#~ msgid "Accounting"
-#~ msgstr "Bokföring"
diff --git a/addons/hr_payroll_account/i18n/tr.po b/addons/hr_payroll_account/i18n/tr.po
new file mode 100644
index 00000000000..435e8d54d64
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/tr.po
@@ -0,0 +1,331 @@
+# 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-08-23 11:18+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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
new file mode 100644
index 00000000000..6f629ba1ee4
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/zh_CN.po
@@ -0,0 +1,344 @@
+# 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-06-27 13: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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr "明细"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr "银行日记账"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr "捐款记录明细"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr "捐款记录"
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "薪酬分析的辅助核算项"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr "费用账簿"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "期间"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "员工"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "其它信息"
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "薪酬科目"
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr "工资表记录"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr "分录链接到工资单"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "描述"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr "请确认所有报销的费用发票"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr "会计信息"
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr "薪酬将记录在费用科目"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr "人力资源工资表会计部分"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "付款明细"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr "请定义财务年的会计期间"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "工资单"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "错误！您不能创建循环的员工等级。"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr "明细"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "科目"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "银行科目"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "工资单明细"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr "会计原始凭证"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr "为空使用这个期间审核(工资单)日期"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "银行通知单备注"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr "费用分录"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr "会计原始凭证"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
+#, python-format
+msgid "Warning !"
+msgstr "警告！"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr "员工科目"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "一般科目"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "员工合计"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "序列"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "强制会计期间"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "准假类型"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr "这工资单日期  %s 财务年度没定义"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "辅助核算项"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr "员工应付科目"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr "公司合计"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr "薪酬结构"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr "请定义业务伙伴应收款科目！"
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "年"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr "这工资单日期  %s 会计期间没定义。"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr "会计细节"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr "请定义业务伙伴应付款科目！"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#~ msgid ""
+#~ "Generic Payroll system Integrated with Accountings\n"
+#~ "    * Expense Encoding\n"
+#~ "    * Payment Encoding\n"
+#~ "    * Company Contribution Management\n"
+#~ "    "
+#~ msgstr ""
+#~ "通用工资表系统整合会计\n"
+#~ "    * 费用编码\n"
+#~ "    * 付款编码\n"
+#~ "    * 公司捐款管理\n"
+#~ "    "
diff --git a/addons/hr_payroll_account/test/hr_payroll_account.yml b/addons/hr_payroll_account/test/hr_payroll_account.yml
index c399789f439..4481f53c2d1 100644
--- a/addons/hr_payroll_account/test/hr_payroll_account.yml
+++ b/addons/hr_payroll_account/test/hr_payroll_account.yml
@@ -1,7 +1,7 @@
 -
-  I test the "Payslip" in order to check the hr_payroll_account module in OpenERP
+  I test the "Payslip" in order to check the hr_payroll_account module in OpenERP.
 -
-  I create a bank record
+  I create a bank record.
 -
   !record {model: res.partner.bank, id: res_partner_bank_0}:
     acc_number: '001-9876543-21'
@@ -9,7 +9,7 @@
     state: bank
     bank: base.res_bank_1
 -
-  I create a new employee "John"
+  I create a new employee "John".
 -
   !record {model: hr.employee, id: hr_employee_john}:
     address_home_id: base.res_partner_address_2
@@ -24,7 +24,7 @@
     bank_account_id: res_partner_bank_0
     vehicle_distance: 0.0
 -
-  I create a salary structure for 'Software Developer'
+  I create a salary structure for 'Software Developer'.
 -
   !record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper}:
     name: Salary Structure for Software Developer
@@ -39,7 +39,7 @@
       - hr_payroll.hr_salary_rule_meal_voucher
       - hr_payroll.hr_salary_rule_sales_commission
 -
-  I create a contract for "John"
+  I create a contract for "John".
 -
   !record {model: hr.contract, id: hr_contract_john}:
     date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
@@ -50,14 +50,16 @@
     employee_id: hr_employee_john
     struct_id: hr_payroll_structure_softwaredeveloper
     working_hours: resource.timesheet_group1
+    journal_id: account.expenses_journal
 -
-  I create a Payslip
+  I create a Payslip.
 -
   !record {model: hr.payslip, id: hr_payslip_0}:
     employee_id: hr_employee_john
     journal_id: account.expenses_journal
+
 -
-  The selection of an employee fills the contract, structure, worked days and input data fields
+  The selection of an employee fills the contract, structure, worked days and input data fields.
 -
   !python {model: hr.payslip}: |
     import time
@@ -71,25 +73,27 @@
       'struct_id': res['value']['struct_id'],
       'contract_id': res['value']['contract_id'],
       'name': res['value']['name'],
-      }
+    }
     vals['worked_days_line_ids'] = [(0,0,i) for i in res['value']['worked_days_line_ids']]
     vals['input_line_ids'] = [(0,0,i) for i in res['value']['input_line_ids']]
+    res_contract = self.onchange_contract_id(cr, uid, [ref('hr_payslip_0')], date_from, date_to, ref('hr_employee_john'), ref('hr_contract_john'), None)
+    vals.update({'contract_id': ref('hr_contract_john')})
     self.write(cr, uid, ref("hr_payslip_0"), vals)
 -
-  I assign the amount to Input data
+  I assign the amount to Input data.
 -
   !python {model: hr.payslip.input}: |
     ids = self.search(cr, uid, [('payslip_id', '=', ref("hr_payslip_0"))])
     self.write(cr, uid, ids, {'amount': 5.0})
 -
-  I verify the payslip is in draft state
+  I verify the payslip is in draft state.
 -
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
     assert(payslip_brw.state == 'draft'), _('State not changed!')
 -
-  I click on "Compute Sheet" button
+  I click on "Compute Sheet" button.
 -
   !python {model: hr.payslip}: |
     self.compute_sheet(cr, uid, [ref("hr_payslip_0")], {"lang": "en_US", "tz": False,
@@ -97,19 +101,28 @@
       "section_id": False, "active_id": ref("hr_payroll.menu_department_tree"),
       })
 -
-  Then I click on the "Confirm" button
+  I want to check cancel button. So I first cancel the sheet then make it set to draft.
+-
+  !python {model: hr.payslip}: |
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    self.cancel_sheet(cr, uid, [ref("hr_payslip_0")], None)
+    wf_service.trg_validate(uid, 'hr.payslip', ref("hr_payslip_0"), 'draft', cr)
+-
+  Then I click on the "Confirm" button.
 -
   !workflow {model: hr.payslip, action: hr_verify_sheet, ref: hr_payslip_0}
 -
-  I verify that the Accounting Entries are created
+  I verify that the Accounting Entries are created.
 -
   !python {model: hr.payslip}: |
     payslip = self.browse(cr, uid, ref("hr_payslip_0"))
     assert payslip.move_id, "Accounting Entries has not been created"
 -
-  I verify that the payslip is in done state
+  I verify that the payslip is in done state.
 -
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
     assert(payslip_brw.state == 'done'), _('State not changed!')
+
diff --git a/addons/hr_payroll_account/wizard/__init__.py b/addons/hr_payroll_account/wizard/__init__.py
new file mode 100644
index 00000000000..27128f05597
--- /dev/null
+++ b/addons/hr_payroll_account/wizard/__init__.py
@@ -0,0 +1,25 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    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.
+#
+#    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 hr_payroll_payslips_by_employees
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
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
new file mode 100644
index 00000000000..a00ff97ef6b
--- /dev/null
+++ b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
@@ -0,0 +1,40 @@
+# -*- 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 hr_payslip_employees(osv.osv_memory):
+
+    _inherit ='hr.payslip.employees'
+    
+    def compute_sheet(self, cr, uid, ids, context=None):
+        run_pool = self.pool.get('hr.payslip.run')
+        if context is None:
+            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})
+        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
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 790ac78cd4f..4797ef14044 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'HR - Recruitment',
+    'name': 'Recruitment Process',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
@@ -54,7 +54,7 @@ system to store and search in your CV base.
         'hr_recruitment_data.xml'
     ],
     'demo_xml': [
-        'hr_recruitment_demo.xml',
+        'hr_recruitment_demo.yml',
     ],
     'test':['test/test_hr_recruitment.yml'],
     'installable': True,
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index fee3e4e8b78..8af4b0f8553 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -7,7 +7,7 @@
         <field name="model">hr.applicant</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('open','pending','done','cancel');" string="Applicants Status">
+            <tree colors="blue:state == 'draft';black:state in ('open','pending','done','cancel');" string="Applicants Status">
                 <field name="create_date"/>
                 <field name="job_id"/>
                 <field name="partner_name"/>
@@ -33,18 +33,10 @@
         <field name="inherit_id" ref="hr.board_hr_manager_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-          <xpath expr="/form/hpaned/child2" position="inside">
-            <action colspan="4" height="220" name="%(action_applicants_status)d" string="Applicants Status"/>
+          <xpath expr="/form/board/column" position="inside">
+            <action name="%(action_applicants_status)d" string="Applicants Status"/>
           </xpath>
         </field>
     </record>
-    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
-    <menuitem
-        action="hr.open_board_hr_manager"
-        icon="terp-graph"
-        id="base.menu_hr_manager"
-        parent="base.menu_hr_dasboard"
-        groups = "base.group_hr_manager"
-        sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 5e738fc6f48..8acb95e7088 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -29,6 +29,9 @@ import collections
 import binascii
 import tools
 from tools.translate import _
+from crm import wizard
+
+wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
@@ -39,6 +42,7 @@ AVAILABLE_STATES = [
 ]
 
 AVAILABLE_PRIORITIES = [
+    ('', ''),
     ('5', 'Not Good'),
     ('4', 'On Average'),
     ('3', 'Good'),
@@ -46,6 +50,16 @@ AVAILABLE_PRIORITIES = [
     ('1', 'Excellent')
 ]
 
+class hr_recruitment_source(osv.osv):
+    """ Sources of HR Recruitment """
+    _name = "hr.recruitment.source"
+    _description = "Source of Applicants"
+    _columns = {
+        'name': fields.char('Source Name', size=64, required=True, translate=True),
+    }
+hr_recruitment_source()
+
+
 class hr_recruitment_stage(osv.osv):
     """ Stage of HR Recruitment """
     _name = "hr.recruitment.stage"
@@ -54,7 +68,7 @@ class hr_recruitment_stage(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
-        'department_id':fields.many2one('hr.department', 'Department'),
+        '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 tempy this field."),
         'requirements': fields.text('Requirements')
     }
     _defaults = {
@@ -73,13 +87,16 @@ class hr_recruitment_degree(osv.osv):
     _defaults = {
         'sequence': 1,
     }
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', 'The name of the Degree of Recruitment must be unique!')
+    ]
 hr_recruitment_degree()
 
 class hr_applicant(crm.crm_case, osv.osv):
     _name = "hr.applicant"
     _description = "Applicant"
     _order = "id desc"
-    _inherit = ['mailgate.thread']
+    _inherit = ['mail.thread']
 
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
@@ -117,7 +134,7 @@ class hr_applicant(crm.crm_case, osv.osv):
 
     _columns = {
         'name': fields.char('Name', size=128, required=True),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
@@ -144,6 +161,8 @@ class hr_applicant(crm.crm_case, osv.osv):
         'title_action': fields.char('Next Action', size=64),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
         'job_id': fields.many2one('hr.job', 'Applied Job'),
+        'salary_proposed_extra': fields.char('Proposed Salary Extra', size=100, help="Salary Proposed by the Organisation, extra advantages"),
+        'salary_expected_extra': fields.char('Expected Salary Extra', size=100, help="Salary Expected by Applicant, extra advantages"),
         'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
         'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"),
         'availability': fields.integer('Availability (Days)'),
@@ -155,11 +174,13 @@ class hr_applicant(crm.crm_case, osv.osv):
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'survey': fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response': fields.integer("Response"),
-        'reference': fields.char('Reference', size=128),
+        'reference': fields.char('Refered By', size=128),
+        'source_id': fields.many2one('hr.recruitment.source', 'Source'),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
+        'color': fields.integer('Color Index'),
     }
 
     def _get_stage(self, cr, uid, context=None):
@@ -168,14 +189,33 @@ class hr_applicant(crm.crm_case, osv.osv):
 
     _defaults = {
         'active': lambda *a: 1,
-        'stage_id': _get_stage,
         'user_id':  lambda self, cr, uid, context: uid,
         'email_from': crm.crm_case. _get_default_email,
         'state': lambda *a: 'draft',
+        'priority': lambda *a: '',
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'color': 0,
     }
 
+    def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+        access_rights_uid = access_rights_uid or uid
+        stage_obj = self.pool.get('hr.recruitment.stage')
+        order = stage_obj._order
+        if read_group_order == 'stage_id desc':
+            # lame hack to allow reverting search, should just work in the trivial case
+            order = "%s desc" % order
+        stage_ids = stage_obj._search(cr, uid, ['|',('id','in',ids),('department_id','=',False)], 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
+
+    _group_by_full = {
+        'stage_id': _read_group_stage_ids
+    }
+
+
     def onchange_job(self,cr, uid, ids, job, context=None):
         result = {}
 
@@ -208,6 +248,8 @@ class hr_applicant(crm.crm_case, osv.osv):
             stage_ids = stage_obj.search(cr, uid, ['|',('department_id','=',department),('department_id','=',False)], context=context)
             if st and stage_ids.index(st):
                 self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)-1]}, context=context)
+            else:
+                self.write(cr, uid, [case.id], {'stage_id': False}, context=context)
         return True
 
     def stage_next(self, cr, uid, ids, context=None):
@@ -223,8 +265,14 @@ class hr_applicant(crm.crm_case, osv.osv):
             department = (case.department_id.id or False)
             st = case.stage_id.id  or False
             stage_ids = stage_obj.search(cr, uid, ['|',('department_id','=',department),('department_id','=',False)], context=context)
+            val = False
             if st and len(stage_ids) != stage_ids.index(st)+1:
-                self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)+1]}, context=context)
+                val = stage_ids[stage_ids.index(st)+1]
+            elif (not st) and stage_ids:
+                val = stage_ids[0]
+            else:
+                val = False
+            self.write(cr, uid, [case.id], {'stage_id': val}, context=context)
         return True
 
     def action_makeMeeting(self, cr, uid, ids, context=None):
@@ -257,7 +305,6 @@ class hr_applicant(crm.crm_case, osv.osv):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
             context = {
-                'default_opportunity_id': opp.id,
                 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
                 'default_email_from': opp.email_from,
                 'default_state': 'open',
@@ -297,22 +344,13 @@ class hr_applicant(crm.crm_case, osv.osv):
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
         return value
 
-    def message_new(self, cr, uid, msg, context=None):
-        """
-        Automatically calls when new email message arrives
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        """
-        mailgate_pool = self.pool.get('email.server.tools')
-        attach_obj = self.pool.get('ir.attachment')
-
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """Automatically called when new email message arrives"""
+        res_id = super(hr_applicant,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
         subject = msg.get('subject') or _("No Subject")
-        body = msg.get('body')
+        body = msg.get('body_text')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -320,42 +358,19 @@ class hr_applicant(crm.crm_case, osv.osv):
             'description': body,
             'user_id': False,
         }
-        if msg.get('priority', False):
+        if priority:
             vals['priority'] = priority
+        vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
+        self.write(cr, uid, [res_id], vals, context)
+        return res_id
 
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
-        if res:
-            vals.update(res)
-        res = self.create(cr, uid, vals, context=context)
-
-        attachents = msg.get('attachments', [])
-        for attactment in attachents or []:
-            data_attach = {
-                'name': attactment,
-                'datas':binascii.b2a_base64(str(attachents.get(attactment))),
-                'datas_fname': attactment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            attach_obj.create(cr, uid, data_attach, context=context)
-
-        return res
-
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs
-        """
-
+    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
 
         msg_from = msg['from']
         vals.update({
-            'description': msg['body']
+            'description': msg['body_text']
         })
         if msg.get('priority', False):
             vals['priority'] = msg.get('priority')
@@ -366,7 +381,7 @@ class hr_applicant(crm.crm_case, osv.osv):
             'probability':'probability'
         }
         vls = { }
-        for line in msg['body'].split('\n'):
+        for line in msg['body_text'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -375,19 +390,9 @@ class hr_applicant(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals, context=context)
+        self.message_append_dict(cr, uid, ids, msg, context=context)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-        """ Send The Message
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param *args: Return Tuple Value
-            @param **args: Return Dictionary of Keyword Value
-        """
-        return True
-
     def case_open(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
@@ -443,7 +448,18 @@ class hr_applicant(crm.crm_case, osv.osv):
                                                  })
         else:
             raise osv.except_osv(_('Warning!'),_('You must define Applied Job for Applicant !'))
-        return self.case_close(cr, uid, ids, *args)
+        self.case_close(cr, uid, ids, *args)
+
+        mod_obj = self.pool.get('ir.model.data')
+        act = mod_obj.get_object_reference(cr, uid, 'hr', 'open_view_employee_list')
+
+        act_obj = self.pool.get('ir.actions.act_window')
+        act_win = act_obj.read(cr, uid, act[1], [])
+
+        act_win['domain'] = [('id','=',emp_id)]
+        act_win['view_mode'] = 'form,tree'
+        act_win['res_id'] = emp_id
+        return act_win
 
     def case_reset(self, cr, uid, ids, *args):
         """Resets case as draft
@@ -457,7 +473,28 @@ class hr_applicant(crm.crm_case, osv.osv):
         res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
         return res
+    
+    def set_priority(self, cr, uid, ids, priority):
+        """Set lead priority
+        """
+        return self.write(cr, uid, ids, {'priority' : priority})
 
+    def set_high_priority(self, cr, uid, ids, *args):
+        """Set lead priority to high
+        """
+        return self.set_priority(cr, uid, ids, '1')
+
+    def set_normal_priority(self, cr, uid, ids, *args):
+        """Set lead priority to normal
+        """
+        return self.set_priority(cr, uid, ids, '3')
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'stage_id' in vals and vals['stage_id']:
+            stage = self.pool.get('hr.recruitment.stage').browse(cr, uid, vals['stage_id'], context=context)
+            text = _("Changed Stage to: %s") % stage.name
+            self.message_append(cr, uid, ids, text, body_text=text, context=context)
+        return super(hr_applicant,self).write(cr, uid, ids, vals, context=context)
 
 hr_applicant()
 
@@ -465,7 +502,7 @@ class hr_job(osv.osv):
     _inherit = "hr.job"
     _name = "hr.job"
     _columns = {
-        'survey_id': fields.many2one('survey', 'Survey', help="Select survey for the current job"),
+        'survey_id': fields.many2one('survey', 'Interview Form', help="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"),
     }
 hr_job()
 
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 2287f3c05c3..d6cb5952d38 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -3,17 +3,21 @@
 <data noupdate="1">
 
 
-        <!--    CASE CATEGORY(categ_id)        -->
+        <!--    HR Recruitment Source        -->
 
-    <record model="crm.case.categ" id="categ_job1">
-        <field name="name">Salesman</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
+    <record model="hr.recruitment.source" id="source_linkedin">
+        <field name="name">LinkedIn</field>
+    </record>
+    <record model="hr.recruitment.source" id="source_monster">
+        <field name="name">Monster</field>
+    </record>
+    <record model="hr.recruitment.source" id="source_word">
+        <field name="name">Word of Mouth</field>
+    </record>
+    <record model="hr.recruitment.source" id="source_website_company">
+        <field name="name">Company Website</field>
     </record>
 
-    <record model="crm.case.categ" id="categ_job2">
-        <field name="name">Junior Developer</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
-    </record>
 
         <!--    Resource(type_id)        -->
 
@@ -21,53 +25,45 @@
         <field name="name">Graduate</field>
         <field name="sequence">1</field>
     </record>
-    <record model="hr.recruitment.degree" id="degree_licenced">
-        <field name="name">Licenced</field>
+    <record model="hr.recruitment.degree" id="degree_bachelor">
+        <field name="name">Bachelor Degree</field>
         <field name="sequence">2</field>
     </record>
-    <record model="hr.recruitment.degree" id="degree_bac5">
-        <field name="name"> > Bac +5</field>
+    <record model="hr.recruitment.degree" id="degree_licenced">
+        <field name="name">Master Degree</field>
         <field name="sequence">3</field>
     </record>
+    <record model="hr.recruitment.degree" id="degree_bac5">
+        <field name="name">Doctoral Degree</field>
+        <field name="sequence">4</field>
+    </record>
 
     <record model="hr.recruitment.stage" id="stage_job1">
-        <field name="name">Initial Jobs Demand</field>
+        <field name="name">Initial Qualification</field>
         <field name="sequence">1</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
         <field name="sequence">2</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
         <field name="name">Second Interview</field>
         <field name="sequence">3</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
     </record>
     <record model="hr.recruitment.stage" id="stage_job4">
         <field name="name">Contract Proposed</field>
         <field name="sequence">4</field>
-        <field name="object_id" search="[('model','=','hr.claim')]" model="ir.model"/>
     </record>
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
         <field name="sequence">5</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
-        <field name="name">Refused by Employee</field>
+        <field name="name">Refused</field>
         <field name="sequence">6</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
-    </record>
-    <record model="hr.recruitment.stage" id="stage_job7">
-        <field name="name">Refused by Company</field>
-        <field name="sequence">7</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
     </record>
     <record id="survey_job_0" model="survey">
         <field name="title">Job Survey</field>
-        <field name="state">draft</field>
         <field name="max_response_limit">20</field>
         <field eval="[(6,0,[])]" name="users"/>
         <field name="type" ref="survey.survey_type1"/>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
deleted file mode 100644
index 20a4fa0e17a..00000000000
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">
-    <!--
-        ((((((((((( Demo Cases )))))))))))
-    -->
-
-    <!--For Jobs Requests-->
-    <record id="hr_case_salesman0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
-        <field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-        <field name="type_id" ref="degree_graduate"/>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field eval="'2'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Enrique Jones'" name="partner_name"/>
-        <field eval="'draft'" name="state"/>
-        <field eval="'enrique@rediff.com'" name="partner_name2"/>
-        <field eval="'9963214587'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field eval="9.0" name="duration"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job1"/>
-        <field eval="'Salesman'" name="name"/>
-        <field eval="'1236547890'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_traineemca0" model="hr.applicant">
-        <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
-        <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Marie Justine'" name="partner_name"/>
-        <field eval="'open'" name="state"/>
-        <field eval="5.15" name="duration"/>
-        <field eval="'marie@gmail.com'" name="partner_name2"/>
-        <field eval="'9988774455'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="stage_id" ref="stage_job4"/>
-        <field eval="'Trainee - MCA'" name="name"/>
-        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-        <field eval="'6633225'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_fresher0" model="hr.applicant">
-        <field model="res.partner.canal" name="canal_id" search="[('name','=','direct')]"/>
-        <field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
-        <field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_5"/>
-        <field eval="'1'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="1.45" name="duration"/>
-        <field eval="'Jose'" name="partner_name"/>
-        <field eval="'pending'" name="state"/>
-        <field eval="'jose@timesgroup.com'" name="partner_name2"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job3"/>
-        <field eval="'Fresher'" name="name"/>
-        <field eval="'999666735'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_10"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="1.35" name="duration"/>
-        <field eval="'Sandra Elvis'" name="partner_name"/>
-        <field eval="'sandra@example.com'" name="partner_name2"/>
-        <field eval="'cancel'" name="state"/>
-        <field eval="1" name="active"/>
-        <field name="stage_id" ref="stage_job6"/>
-        <field eval="'More than 5 yrs Experience in PHP'" name="name"/>
-    </record>
-    <record id="hr_case_marketingjob0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field eval="'4'" name="priority"/>
-        <field name="user_id" ref="base.user_demo"/>
-        <field eval="2.0" name="duration"/>
-        <field eval="'John Bruno'" name="partner_name"/>
-        <field eval="'done'" name="state"/>
-        <field eval="'john@market.edu'" name="partner_name2"/>
-        <field eval="'9966332214'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job5"/>
-        <field eval="'Marketing Job'" name="name"/>
-        <field eval="'33968745'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_financejob0" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field eval="'4'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'David Armstrong'" name="partner_name"/>
-        <field eval="'done'" name="state"/>
-        <field eval="'david@market.edu'" name="partner_name2"/>
-        <field eval="'9966332214'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field eval="2.20" name="duration"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job5"/>
-        <field eval="'Finance Job'" name="name"/>
-        <field eval="'33968745'" name="partner_phone"/>
-    </record>
-    <record id="hr_case_traineemca1" model="hr.applicant">
-        <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
-        <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Tina Augustie'" name="partner_name"/>
-        <field eval="'open'" name="state"/>
-        <field eval="1.15" name="duration"/>
-        <field eval="'tina_augustie@example.com'" name="partner_name2"/>
-        <field eval="'9898745745'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="stage_id" ref="stage_job4"/>
-        <field eval="'Trainee - MCA'" name="name"/>
-        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-        <field eval="'6630125'" name="partner_phone"/>
-    </record>
-
-    <record id="hr_case_programmer" model="hr.applicant">
-        <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
-        <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Shane Williams'" name="partner_name"/>
-        <field eval="'open'" name="state"/>
-        <field eval="1.15" name="duration"/>
-        <field eval="'tina_augustie@example.com'" name="partner_name2"/>
-        <field eval="'9812398524'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="stage_id" ref="stage_job4"/>
-        <field eval="'Programmer'" name="name"/>
-        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-        <field eval="'6630125'" name="partner_phone"/>
-        <field name="job_id" ref="hr.job_jr_appli"/>
-	    <field eval="11000.0" name="salary_expected"/>
-    </record>
-
-    <record id="hr_case_advertisement" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field eval="'4'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'David Armstrong'" name="partner_name"/>
-        <field eval="'done'" name="state"/>
-        <field eval="'david@market.edu'" name="partner_name2"/>
-        <field eval="'9925741564'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field eval="2.20" name="duration"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job5"/>
-        <field eval="'Advertisement'" name="name"/>
-        <field eval="'25968745'" name="partner_phone"/>
-	    <field eval="11000.0" name="salary_expected"/>
-    </record>
-</data>
-</openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
new file mode 100644
index 00000000000..bcf2248fc40
--- /dev/null
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -0,0 +1,109 @@
+-
+  !record {model: hr.applicant, id: hr_case_salesman0}:
+    date: !eval time.strftime('%Y-%m-01 10:35:50')
+    type_id: degree_graduate
+    priority: '2'
+    partner_name: 'Enrique Jones'
+    partner_mobile: '9963214587'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job1
+    name: 'Salesman'
+    partner_phone: '1236547890'
+
+-
+  !record {model: hr.applicant, id: hr_case_traineemca0}:
+    partner_address_id: base.res_partner_address_14
+    date: !eval time.strftime('%Y-%m-10 18:15:00')
+    type_id: degree_bac5
+    priority: '3'
+    user_id: base.user_demo
+    partner_name: 'Marie Justine'
+    state: 'open'
+    partner_mobile: '9988774455'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job4
+    name: 'Trainee - MCA'
+    partner_phone: '6633225'
+-
+  !record {model: hr.applicant, id: hr_case_fresher0}:
+    date: !eval time.strftime('%Y-%m-15 16:10:00')
+    type_id: degree_licenced
+    priority: '1'
+    user_id: base.user_root
+    partner_name: 'Jose'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job3
+    name: 'Fresher'
+    partner_phone: '999666735'
+-
+  !record {model: hr.applicant, id: hr_case_yrsexperienceinphp0}:
+    date: !eval time.strftime('%Y-%m-25 16:25:52')
+    job_id: hr.job_jr_appli
+    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'
+-
+  !record {model: hr.applicant, id: hr_case_marketingjob0}:
+    date: !eval time.strftime('%Y-%m-26 17:15:32')
+    type_id: degree_licenced
+    user_id: base.user_demo
+    partner_name: 'John Bruno'
+    state: 'done'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job5
+    name: 'Marketing Job'
+-
+  !record {model: hr.applicant, id: hr_case_financejob0}:
+    date: !eval time.strftime('%Y-%m-26 17:39:42')
+    type_id: degree_licenced
+    priority: '4'
+    partner_name: 'David Armstrong'
+    state: 'pending'
+    state: open
+    partner_mobile: '9966332214'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job2
+    name: 'Finance Job'
+    partner_phone: '33968745'
+-
+  !record {model: hr.applicant, id: hr_case_traineemca1}:
+    partner_address_id: base.res_partner_address_14
+    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_jr_appli
+    stage_id: stage_job4
+    name: 'Trainee - MCA'
+    partner_phone: '6630125'
+
+-
+  !record {model: hr.applicant, id: hr_case_programmer}:
+    partner_address_id: base.res_partner_address_14
+    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'
+    partner_phone: '6630125'
+    job_id: hr.job_jr_appli
+    department_id: hr.dep_it
+    salary_expected: 11000.0
+
+-
+  !record {model: hr.applicant, id: hr_case_advertisement}:
+    date: !eval time.strftime('%Y-%m-26 17:39:42')
+    type_id: degree_licenced
+    partner_id: base.res_partner_11
+    partner_name: 'David Armstrong'
+    job_id: hr.job_jr_appli
+    stage_id: stage_job2
+    name: 'Advertisement'
+    salary_expected: 11000.0
+
diff --git a/addons/hr_recruitment/hr_recruitment_installer_view.xml b/addons/hr_recruitment/hr_recruitment_installer_view.xml
index 5fdf1df849a..3d7d49d595e 100644
--- a/addons/hr_recruitment/hr_recruitment_installer_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_installer_view.xml
@@ -1,19 +1,19 @@
 <openerp>
-  <data>
- <record model="ir.actions.act_window" id="hr_recruitment_stage_form_installer">
-           <field name="name">Review Recruitment Stages</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">hr.recruitment.stage</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-           <field name="help">Check if the following stages are matching your recruitment process. Don't forget to specify the department if your recruitment process is different according to the job position.</field>
-           <field name="view_id" ref="hr_recruitment.hr_recruitment_stage_tree"/>
-       </record>
+    <data>
+        <record model="ir.actions.act_window" id="hr_recruitment_stage_form_installer">
+            <field name="name">Review Recruitment Stages</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.recruitment.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">Check if the following stages are matching your recruitment process. Don't forget to specify the department if your recruitment process is different according to the job position.</field>
+            <field name="view_id" ref="hr_recruitment.hr_recruitment_stage_tree"/>
+        </record>
 
-       <record id="hr_recruitment_stage_form_todo" model="ir.actions.todo">
-           <field name="action_id" ref="hr_recruitment_stage_form_installer"/>
-           <field name="category_id" ref="hr.category_hr_management_config"/>
-           <field name="sequence">3</field>
-       </record>
+        <record id="hr_recruitment_stage_form_todo" model="ir.actions.todo">
+            <field name="action_id" ref="hr_recruitment_stage_form_installer"/>
+            <field name="category_id" ref="hr.category_hr_management_config"/>
+            <field name="sequence">3</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 2e941877b65..7fe746f580b 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -6,9 +6,9 @@
          <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
             <field name="name">Applicants</field>
             <field name="res_model">hr.applicant</field>
-            <field name="view_mode">tree,form,graph,calendar</field>
+            <field name="view_mode">tree,form,graph,calendar,kanban</field>
             <field name="view_id" ref="crm_case_tree_view_job"/>
-            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}</field>
+            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
@@ -46,6 +46,9 @@
             name="Applicants"
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
+	
+	    <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="hr.action_hr_job" sequence="2"/>
+
 
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 125d61979e9..202a6c2eecb 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -17,7 +17,7 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
         <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
-        <field name="context">{'object_id':'hr.applicant'}</field>
+        <field name="context" eval="{'object_id': ref('model_hr_applicant')}"/>
     </record>
     # ------------------------------------------------------
     # Stage
@@ -53,6 +53,7 @@
                 <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
                 <field name="title_action" invisible="context.get('invisible_next_action', True)"/>
                 <field name="date_action" invisible="context.get('invisible_next_date', True)"/>
+                <field name="source_id" invisible="1"/>
                 <field name="survey" invisible="1"/>
                 <field name="response" invisible="1"/>
                 <field name="priority"/>
@@ -81,14 +82,15 @@
                     <newline/>
                     <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
                     <group colspan="2" col="4">
-                        <field name="stage_id" domain="[('department_id','=',department_id)]"/>
+                        <field name="stage_id" domain="['|',('department_id','=',department_id),('department_id','=',False)]"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
                     <field name="user_id"/>
                     <field name="survey" invisible="1"/>
                     <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <field name="response" invisible="1"/>
                     <newline/>
                     <field name="date_action"/>
                     <field name="title_action"/>
@@ -97,27 +99,29 @@
                     <page string="Job Info">
                         <group col="3" colspan="2">
                             <separator colspan="3" string="Contact"/>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="gtk-index" type="action" attrs="{'readonly':['!',('partner_id','!=',False),('state','not in','done')]}" groups="base.group_partner_manager"/>
+                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
                             <newline/>
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
-                            <field name="email_from" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
-                            <field name="partner_phone" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
-                            <field name="partner_mobile" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
+                            <field name="email_from" colspan="3"/>
+                            <field name="partner_phone" colspan="3"/>
+                            <field name="partner_mobile" colspan="3"/>
                         </group>
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Contract Data"/>
-                            <field name="availability"/>
+                        <group col="3" colspan="2">
+                            <separator colspan="3" string="Contract Data"/>
+                            <field name="availability" colspan="3"/>
                             <field name="salary_expected"/>
+                            <field name="salary_expected_extra" nolabel="1"/>
                             <field name="salary_proposed"/>
+                            <field name="salary_proposed_extra" nolabel="1"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Qualification"/>
-                            <!-- <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>-->
-                            <field name="type_id" widget="selection"/>
+                            <field name="type_id"/>
                             <field name="priority" string="Appreciation"/>
+                            <field name="source_id"/>
                             <field name="reference"/>
                         </group>
                         <group col="2" colspan="2">
@@ -129,7 +133,7 @@
                         </group>
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
-                            <field name="state"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                             <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
@@ -141,14 +145,14 @@
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                        </group>
-                       <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                       <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                             <tree string="History">
                                 <field name="display_text" string="History Information"/>
-                                <field name="history" invisible="1"/>
+                                <field name="email_from" invisible="1"/>
                                 <button
-                                    string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
+                                    string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                    name="%(mail.action_email_compose_message_wizard)d"
+                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                     icon="terp-mail-replied" type="action" />
                             </tree>
                             <form string="History">
@@ -157,20 +161,18 @@
                                     <field name="date"/>
                                     <field name="email_to" widget="char" size="512"/>
                                     <field name="email_cc" widget="char" size="512"/>
-                                    <field name="name" colspan="4" widget="char" size="512"/>
-                                    <field name="history" invisible="1"/>
+                                    <field name="subject" colspan="4" widget="char" size="512"/>
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Details">
-                                        <group attrs="{'invisible': [('history', '!=', True)]}">
-                                            <field name="description" colspan="4" nolabel="1" height="250"/>
-                                            <button colspan="4"
-                                                string="Reply"
-                                                name="%(crm.action_crm_send_mail)d"
-                                                context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
-                                                icon="terp-mail-replied" type="action" />
+                                        <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                            <field name="body_text" colspan="4" nolabel="1" height="250"/>
+                                            <button colspan="4" string="Reply"
+                                                name="%(mail.action_email_compose_message_wizard)d"
+                                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                                icon="terp-mail-replied" type="action"/>
                                         </group>
-                                        <group attrs="{'invisible': [('history', '=', True)]}">
+                                        <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                             <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                         </group>
                                     </page>
@@ -180,14 +182,13 @@
                                 </notebook>
                             </form>
                         </field>
-                         <button string="Add Internal Note"
+                        <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
                         <button string="Send New Email"
-                           name="%(crm.action_crm_send_mail)d"
-                           context="{'mail':'new', 'model': 'hr.applicant'}"
-                           icon="terp-mail-message-new" type="action" />
+                            name="%(mail.action_email_compose_message_wizard)d"
+                            icon="terp-mail-message-new" type="action"/>
                  </page>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>
@@ -217,16 +218,11 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-check" string="Current"
-                   domain="[('state','in',('draft','open'))]"
-                   help="All new and in progress jobs"
-                   name="current"
-               />
-               <filter icon="terp-document-new" string="New"
+               <filter icon="terp-document-new" string="New" name="filter_new" 
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"
                />
-               <filter icon="terp-camera_test" string="In Progress"
+               <filter icon="terp-camera_test" string="In Progress" name="filter_inprogress"
                    domain="[('state','=','open')]"
                    help="Open Jobs"
                />
@@ -237,22 +233,16 @@
                <separator orientation="vertical"/>
                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
                     context="{'invisible_next_action':False, 'invisible_next_date':False}"
-                    domain="[]"
-                    help="View Next Action and Date"/>
+                    domain="[('date_action','&lt;&gt;',False)]"
+                    help="Filter and view on next actions and date"/>
                <separator orientation="vertical"/>
-               <field name="partner_name"/>
-               <field name="email_from"/>
+               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                <field name="job_id" widget="selection"/>
                <field name="user_id">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" separator="1"/>
-               </field>
-               <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                   <filter icon="terp-personal+" context="{'invisible_department': False}"
-                       domain="[('department_id','=',context.get('department_id',False))]"
-                       help="My Department"/>
+                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
                </field>
                <newline/>
-                <group expand="0" string="Group By..." colspan="11" col="20">
+                <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'}"/>
                     <separator orientation="vertical"/>
@@ -263,6 +253,7 @@
                     <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="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                 </group>
@@ -287,7 +278,78 @@
         </field>
     </record>
 
+	<!-- hr Applicant Kanban View -->
 
+	<record model="ir.ui.view" id="hr_kanban_view_applicant">
+        <field name="name">Hr Applicants kanban</field>
+        <field name="model">hr.applicant</field>
+        <field name="type">kanban</field>
+        <field name="arch" type="xml">
+            <kanban default_group_by="stage_id">
+                <field name="color"/>
+                <field name="state"/>
+                <field name="priority"/>
+                <field name="survey"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <t t-set="color" t-value="kanban_color(record.color.raw_value || record.state.raw_value)"/>
+                        <div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                            <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">
+                                    <div class="oe_kanban_title1">
+                                        <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority" />
+                                        <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                        <field name="partner_name"/>
+                                    </div>
+                                </div>
+                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                    <table class="oe_kanban_table">
+                                        <tr>
+                                            <td>
+                                                <div class="oe_kanban_right oe_kanban_small">
+                                                    <field name="user_id"/>
+                                                </div>
+                                                <div class="oe_kanban_title2">
+                                                    <field name="job_id"/>
+                                                    <t t-if="record.priority.raw_value == 0"></t>
+                                                    <t t-if="record.priority.raw_value == 5">(Not Good)</t>
+                                                    <t t-if="record.priority.raw_value == 4">(On Average)</t>
+                                                    <t t-if="record.priority.raw_value == 3">(Good)</t>
+                                                    <t t-if="record.priority.raw_value == 2">(Very Good)</t>
+                                                    <t t-if="record.priority.raw_value == 1">(Excellent)</t>
+                                                </div>
+                                                <div class="oe_kanban_title3">
+                                                    <field name="type_id"/>
+                                                </div>
+                                                <div class="oe_kanban_title3">
+                                                    <i><field name="date_action"/><field name="title_action"/></i>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </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"/>
+                                        <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
+                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
+                                        <a string="Schedule Meeting" name="action_makeMeeting" type="object" icon="stock_calendar"/>
+                                        <a t-if="record.survey.raw_value" name="action_print_survey" type="object" string="Print Interview" icon="gtk-print" />
+                                    </div>
+                                    <div class="oe_kanban_right">
+                                        <a name="case_open" string="Open" states="pending,draft" type="object" icon="kanban-apply" />
+                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
+                                    </div>
+                                    <br class="oe_kanban_clear"/>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
     # ------------------------------------------------------
     # HR Job
     # ------------------------------------------------------
@@ -400,5 +462,40 @@
             action="hr_recruitment_degree_action"
             sequence="1"/>
 
+<!-- Source Tree View -->
+
+    <record model="ir.ui.view" id="hr_recruitment_source_tree">
+        <field name="name">hr.recruitment.source.tree</field>
+        <field name="model">hr.recruitment.source</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Sources of Applicants">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="hr_recruitment_source_form">
+        <field name="name">hr.recruitment.source.form</field>
+        <field name="model">hr.recruitment.source</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Sources of Applicants">
+                <field name="name"/>
+            </form>
+        </field>
+    </record>
+    <record id="hr_recruitment_source_action" model="ir.actions.act_window">
+        <field name="name">Sources of Applicants</field>
+        <field name="res_model">hr.recruitment.source</field>
+        <field name="view_type">form</field>
+    </record>
+
+     <menuitem
+            id="menu_hr_recruitment_source"
+            parent="menu_hr_recruitment_recruitment"
+            action="hr_recruitment_source_action"
+            sequence="1"/>
+
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/i18n/bg.po b/addons/hr_recruitment/i18n/bg.po
index c49607cd458..9e1c6a394d5 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1cce6100add..b3e4d39231f 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b6643fbb9db..b46b7e94514 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -988,104 +988,3 @@ msgstr "Anz. Tg. b. Lösung"
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr "Umfrage"
-
-#, python-format
-#~ msgid "is Open."
-#~ msgstr "ist Eröffnet."
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Tage    "
-
-#~ msgid "Date of Opening"
-#~ msgstr "Datum Eröffnung"
-
-#~ msgid "365 Days"
-#~ msgstr "365 Tage"
-
-#~ msgid "30 Days"
-#~ msgstr "30 Tage"
-
-#~ msgid "Cancelled"
-#~ msgstr "Abgebrochen"
-
-#~ msgid "%Done"
-#~ msgstr "%Erledigt"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
-
-#~ msgid "Forward"
-#~ msgstr "Weiter"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Terminiere Anruf"
-
-#~ msgid "Avg. Answers"
-#~ msgstr "Durchschn. Bewerbungen"
-
-#~ msgid "Print Interview"
-#~ msgstr "Druck Bewerberinterview"
-
-#, python-format
-#~ msgid "Job request for"
-#~ msgstr "Stellenangebot für"
-
-#~ msgid "%Cancel"
-#~ msgstr "%Abbrechen"
-
-#, python-format
-#~ msgid "Applicant "
-#~ msgstr "Bewerber "
-
-#~ msgid "Interview Question"
-#~ msgstr "Frage Bewerberinterview"
-
-#~ msgid "Schedule Meeting"
-#~ msgstr "Terminiere Meeting"
-
-#~ msgid "Draft"
-#~ msgstr "Entwurf"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafter Modellname in der Aktion"
-
-#, python-format
-#~ msgid "from Mailgate."
-#~ msgstr "durch Mailgate."
-
-#~ msgid "Communication history"
-#~ msgstr "Historie Kommunik."
-
-#~ 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 haben !"
-
-#, python-format
-#~ msgid "A Job Request created"
-#~ msgstr "Erstelltes Stellenangebot"
-
-#, python-format
-#~ msgid "is Hired."
-#~ msgstr "wurde eingestellt."
-
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "Fehler ! Sie können kein rekursives Sales Team haben."
-
-#~ msgid "Emails"
-#~ msgstr "EMails"
-
-#~ msgid "The code of the sales team must be unique !"
-#~ msgstr "Die Kurzbezeichnung für das Vertriebsteam sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index e010580f338..e272244894d 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -982,6 +982,3 @@ msgstr "Número de días para cerrar la incidencia de proyecto"
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr "Encuesta"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
diff --git a/addons/hr_recruitment/i18n/es_MX.po b/addons/hr_recruitment/i18n/es_MX.po
new file mode 100644
index 00000000000..acd5d739de2
--- /dev/null
+++ b/addons/hr_recruitment/i18n/es_MX.po
@@ -0,0 +1,984 @@
+# 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-18 07:44+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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+"Si el campo activo es falso, le permitirá ocultar el caso sin eliminarlo."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "Requerimientos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Retraso promedio para abrir"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr "Fecha próxima acción"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "Trabajos"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email de los observadores"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr "Cerrar petición de trabajo"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Objetivos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr "Nombre contacto de empresa"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr "Crear empresa"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr "Datos del contrato"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr "Próximas acciones"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr "Desarrollador junior"
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr "Trabajo solicitado"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr "Diplomado/Licenciado"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr "Demanda inicial de trabajos"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr "Estatus del candidato"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr "Mi proceso de selección"
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr "Próxima acción"
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "Proceso de selección"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr "Salario propuesto"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr "Salario propuesto promedio"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr "Disponibilidad"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr "Llamada telefónica"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr "Convertir a empresa"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr "Estadísticas del proceso de selección"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr "Ya hay definida una empresa para esta solicitud de trabajo."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr "Nuevo"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr "Disponibilidad (días)"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr "Disponible"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr "Bueno"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid ""
+"Define here your stages of the recruitment process, for example: "
+"qualification call, first interview, second interview, refused, hired."
+msgstr ""
+"Defina aquí las etapas del proceso de selección, por ejemplo: llamada de "
+"contacto, primera entrevista, segunda entrevista, rechazado, contratado."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr "Fecha prevista"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr "Apreciación"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr "Trabajo"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr "Segunda entrevista"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr "Salario esperado"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr "Salario esperado"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr "Candidatos"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr " > Bachillerato +5 años"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr "Candidato"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr "Establece el orden de secuencia al mostrar una lista de etapas."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr "Calificación"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr "Etapa de selección"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr "En curso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr "Trabajos - Formulario selección"
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr "Probabilidad"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr "RRHH - Selección de personal"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr "Información del trabajo"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primera entrevista"
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr "Salario propuesto"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Buscar trabajos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr "Nombre del candidato"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr "Muy bueno"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr "Nº casos"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr "Abierto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr "Agrupar por ..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr "En curso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr "Reestablecer a nuevo"
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr "Salario esperado por el candidato"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr "Definición de etapa"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr "Respuesta"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Retraso medio hasta cierre"
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr "Salario propuesto por la organización"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr "Título"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr "Etapas del aspirante"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr "Rechazado por la compañía"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr "Días para cerrar"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr "Excelente"
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr "Respuesta"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr "Licenciado"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr "Salario medio propuesto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr "Planificar llamada telefónica"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr "Malo"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr "Descripción de la llamada telefónica"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+"¿Está seguro que quiere crear una entidad basada en esta solicitud de "
+"trabajo?"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"From this menu you can track applicants in the recruitment process and "
+"manage all operations: meetings, interviews, phone calls, etc. If you setup "
+"the email gateway, applicants and their attached CV are created "
+"automatically when an email is sent to jobs@yourcompany.com. If you install "
+"the document management modules, all documents (CV and motivation letters) "
+"are indexed automatically, so that you can easily search through their "
+"content."
+msgstr ""
+"Desde este menú puede seguir a los candidatos en el proceso de selección y "
+"gestionar todas las operaciones: reuniones, entrevistas, llamadas "
+"telefónicas, etc. Si configura la pasarela de correo electrónico, se crearán "
+"candidatos con su CV adjunto cuando se envíe un correo a "
+"jobs@sucompañía.com. Si instala los módulos de gestión documental,  se "
+"indexan automáticamente todos los documentos (CV las cartas de presentación) "
+"para que pueda buscar fácilmente por su contenido."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr "Contrato propuesto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr "Categorías de candidatos"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr "Ya existe una empresa con ese nombre."
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+"Establece el orden de secuencia al mostrar una lista de titulaciones."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr "Análisis del proceso de selección"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+"    "
+msgstr ""
+"\n"
+"Gestiona puestos de trabajo y el proceso de selección. Está integrado con\n"
+"el módulo de encuestas para poder definir entrevistas para diferentes "
+"puestos.\n"
+"\n"
+"Este módulo está integrado con la pasarela de e-mail para registrar "
+"automáticamente\n"
+"los e-mails enviados a 'trabajos@SUCOMPANIA.com'. Se integra también con el "
+"sistema\n"
+"de gestión documental para almacenar y buscar en su base de CVs.\n"
+"    "
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr "Casos por etapa y estimaciones"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr "Entrevista"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr "Contrato firmado"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr "Rechazado"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:412
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr "Candidato '%s' en proceso de contratación"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr "Contratado"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr "Rechazado por el empleado"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr "En promedio"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Progreso del proceso de selección"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr "Crear entidad desde solicitud de trabajo"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr "Departamento de RRHH"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:396
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr "La petición de trabajo '%s' ha sido establecida a 'en curso'."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "Número de días para cerrar la incidencia de proyecto"
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr "Encuesta"
diff --git a/addons/hr_recruitment/i18n/es_VE.po b/addons/hr_recruitment/i18n/es_VE.po
new file mode 100644
index 00000000000..acd5d739de2
--- /dev/null
+++ b/addons/hr_recruitment/i18n/es_VE.po
@@ -0,0 +1,984 @@
+# 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-18 07:44+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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+"Si el campo activo es falso, le permitirá ocultar el caso sin eliminarlo."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "Requerimientos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Retraso promedio para abrir"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr "Fecha próxima acción"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "Trabajos"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email de los observadores"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr "Cerrar petición de trabajo"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Objetivos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr "Nombre contacto de empresa"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr "Crear empresa"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr "Datos del contrato"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr "Próximas acciones"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr "Desarrollador junior"
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr "Trabajo solicitado"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr "Diplomado/Licenciado"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr "Demanda inicial de trabajos"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr "Estatus del candidato"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr "Mi proceso de selección"
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr "Próxima acción"
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "Proceso de selección"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr "Salario propuesto"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr "Salario propuesto promedio"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr "Disponibilidad"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr "Llamada telefónica"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr "Convertir a empresa"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr "Estadísticas del proceso de selección"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr "Ya hay definida una empresa para esta solicitud de trabajo."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr "Nuevo"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr "Disponibilidad (días)"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr "Disponible"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr "Bueno"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid ""
+"Define here your stages of the recruitment process, for example: "
+"qualification call, first interview, second interview, refused, hired."
+msgstr ""
+"Defina aquí las etapas del proceso de selección, por ejemplo: llamada de "
+"contacto, primera entrevista, segunda entrevista, rechazado, contratado."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr "Fecha prevista"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr "Apreciación"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr "Trabajo"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr "Segunda entrevista"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr "Salario esperado"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr "Salario esperado"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr "Candidatos"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr " > Bachillerato +5 años"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr "Candidato"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr "Establece el orden de secuencia al mostrar una lista de etapas."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr "Calificación"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr "Etapa de selección"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr "En curso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr "Trabajos - Formulario selección"
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr "Probabilidad"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr "RRHH - Selección de personal"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr "Información del trabajo"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primera entrevista"
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr "Fecha de actualización"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr "Salario propuesto"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Buscar trabajos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr "Nombre del candidato"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr "Muy bueno"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr "Nº casos"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr "Abierto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr "Agrupar por ..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr "En curso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr "Reestablecer a nuevo"
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr "Salario esperado por el candidato"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr "Definición de etapa"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr "Respuesta"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Retraso medio hasta cierre"
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr "Salario propuesto por la organización"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr "Título"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr "Etapas del aspirante"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr "Rechazado por la compañía"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr "Días para cerrar"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr "Excelente"
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr "Respuesta"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr "Licenciado"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr "Salario medio propuesto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr "Planificar llamada telefónica"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán un email."
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr "Malo"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr "Descripción de la llamada telefónica"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+"¿Está seguro que quiere crear una entidad basada en esta solicitud de "
+"trabajo?"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"From this menu you can track applicants in the recruitment process and "
+"manage all operations: meetings, interviews, phone calls, etc. If you setup "
+"the email gateway, applicants and their attached CV are created "
+"automatically when an email is sent to jobs@yourcompany.com. If you install "
+"the document management modules, all documents (CV and motivation letters) "
+"are indexed automatically, so that you can easily search through their "
+"content."
+msgstr ""
+"Desde este menú puede seguir a los candidatos en el proceso de selección y "
+"gestionar todas las operaciones: reuniones, entrevistas, llamadas "
+"telefónicas, etc. Si configura la pasarela de correo electrónico, se crearán "
+"candidatos con su CV adjunto cuando se envíe un correo a "
+"jobs@sucompañía.com. Si instala los módulos de gestión documental,  se "
+"indexan automáticamente todos los documentos (CV las cartas de presentación) "
+"para que pueda buscar fácilmente por su contenido."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr "Contrato propuesto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr "Categorías de candidatos"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr "Ya existe una empresa con ese nombre."
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+"Establece el orden de secuencia al mostrar una lista de titulaciones."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr "Análisis del proceso de selección"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+"    "
+msgstr ""
+"\n"
+"Gestiona puestos de trabajo y el proceso de selección. Está integrado con\n"
+"el módulo de encuestas para poder definir entrevistas para diferentes "
+"puestos.\n"
+"\n"
+"Este módulo está integrado con la pasarela de e-mail para registrar "
+"automáticamente\n"
+"los e-mails enviados a 'trabajos@SUCOMPANIA.com'. Se integra también con el "
+"sistema\n"
+"de gestión documental para almacenar y buscar en su base de CVs.\n"
+"    "
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr "Casos por etapa y estimaciones"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr "Entrevista"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr "Contrato firmado"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr "Rechazado"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:412
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr "Candidato '%s' en proceso de contratación"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr "Contratado"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr "Rechazado por el empleado"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr "En promedio"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr "Progreso del proceso de selección"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr "Crear entidad desde solicitud de trabajo"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr "Departamento de RRHH"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:396
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr "La petición de trabajo '%s' ha sido establecida a 'en curso'."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "Número de días para cerrar la incidencia de proyecto"
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr "Encuesta"
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index 6f569d0e9e6..43c6a4f53a3 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -982,6 +982,3 @@ msgstr "Nombre de jours pour terminer l'incident de projet"
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr "Sondage"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
diff --git a/addons/hr_recruitment/i18n/hi.po b/addons/hr_recruitment/i18n/hi.po
index 5f8388c1442..0026d29dfe8 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -955,12 +955,3 @@ msgstr ""
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
-
-#~ msgid "The code of the sales team must be unique !"
-#~ msgstr "बिक्री टीम का कोड अद्वितीय होना चाहिए!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "संरचना देखने के लिए अमान्य XML!"
diff --git a/addons/hr_recruitment/i18n/hu.po b/addons/hr_recruitment/i18n/hu.po
index d8a7916b604..44e49969c27 100644
--- a/addons/hr_recruitment/i18n/hu.po
+++ b/addons/hr_recruitment/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 23:37+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5dcd0dde5fc..32a31f8442d 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dd8a8c85f6f..818f89f7892 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -963,6 +963,3 @@ msgstr ""
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr "Sondaggio"
-
-#~ msgid "Emails"
-#~ msgstr "Email"
diff --git a/addons/hr_recruitment/i18n/mn.po b/addons/hr_recruitment/i18n/mn.po
index 7125a8e37b3..e2d652e6705 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -968,106 +968,3 @@ msgstr "Төслийн даалгаврыг хаах хүртэл өдрийн 
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr "Судалгаа"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолт дох моделийн нэр буруу байна."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Рекурс цэс үүсгэж болохгүй"
-
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "Алдаа ! Рекурс борлуулалтын багийг үүсгэж болохгүй."
-
-#~ msgid "Emails"
-#~ msgstr "Э-мэйлүүд"
-
-#, python-format
-#~ msgid "is Open."
-#~ msgstr "Нээлттэй"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 хоног    "
-
-#~ msgid "Date of Opening"
-#~ msgstr "Нээх  огноо"
-
-#~ msgid "365 Days"
-#~ msgstr "365 хоног"
-
-#~ msgid "30 Days"
-#~ msgstr "30 хоног"
-
-#~ msgid "Cancelled"
-#~ msgstr "Цуцлагдсан"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Forward"
-#~ msgstr "Өмнөх"
-
-#~ msgid "Schedule a Phone Call"
-#~ msgstr "Утасны дуудлагыг төлөвлөх"
-
-#~ msgid "Print Interview"
-#~ msgstr "Ярилцлага хэвлэх"
-
-#, python-format
-#~ msgid "Job request for"
-#~ msgstr "Ажлын байрны хүсэлт"
-
-#, python-format
-#~ msgid "Applicant "
-#~ msgstr "Өргөдөл гаргагч "
-
-#~ msgid "Interview Question"
-#~ msgstr "Ярилцлагын асуулт"
-
-#~ msgid "Schedule Meeting"
-#~ msgstr "Уулзах төлөвлөгөө"
-
-#~ msgid "Draft"
-#~ msgstr "Ноорог"
-
-#, python-format
-#~ msgid "from Mailgate."
-#~ msgstr "Э-мэйлийн гарцнаас"
-
-#~ msgid "Communication history"
-#~ msgstr "Холбогдсон түүх"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#, python-format
-#~ msgid "A Job Request created"
-#~ msgstr "Үүсгэсэн ажлын байрны хүсэлт"
-
-#, python-format
-#~ msgid "is Hired."
-#~ msgstr "Түрээслэгдсэн"
-
-#~ msgid ""
-#~ "\n"
-#~ "Manages job positions and the recruitement process. It's integrated with "
-#~ "the\n"
-#~ "survey module to allow you to define interview for different jobs.\n"
-#~ "\n"
-#~ "This module is integrated with the mail gateway to automatically tracks "
-#~ "email\n"
-#~ "sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
-#~ "management\n"
-#~ "system to store and search in your CV base.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ажлын байр, албан тушаал, хүний нөөцийн бүрдүүлэлтийн үйл явцыг зохицуулна.\n"
-#~ "Судалгаа модультай уялдаж янз бүрийн ажлын байр бүрт ярилцлагыг тодорхойлох "
-#~ "боломж олгоно.\n"
-#~ "\n"
-#~ "Энэ модуль нь э-мэйл гарцтай холбогдон ажилласнаар \n"
-#~ "jobs@YOURCOMPANY.com хаяг руу илгээх э-мэйлийг автоматаар хянах боломжийг "
-#~ "олгоно. Бас баримтын менежментийн системтэй уялдан\n"
-#~ "өргөдөл, анкетыг хадгалах, түүнээс хайх боломжтой.\n"
diff --git a/addons/hr_recruitment/i18n/nl.po b/addons/hr_recruitment/i18n/nl.po
index a54018e4972..3ebe8285895 100644
--- a/addons/hr_recruitment/i18n/nl.po
+++ b/addons/hr_recruitment/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -981,35 +981,3 @@ msgstr "Aantal dagen tot sluiten dossier"
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr "Enquête"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in actie definitie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
-
-#~ msgid "Error ! You cannot create recursive Sales team."
-#~ msgstr "Fout ! U kunt geen recursief verkoopteam maken"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The code of the sales team must be unique !"
-#~ msgstr "De verkoopteam code moet uniek zijn!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/hr_recruitment/i18n/pt.po b/addons/hr_recruitment/i18n/pt.po
index f0d7d38b73f..2a0963fa5ce 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -35,7 +35,7 @@ msgstr "Requisitos"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "Tempo médio para abrir"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
@@ -81,7 +81,7 @@ msgstr "Endereços eletrónicos dos observadores"
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Fechar pedido de recrutamento"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -150,12 +150,12 @@ msgstr "Programador Júnior"
 #: field:hr.applicant,job_id:0
 #: field:hr.recruitment.report,job_id:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Cargo da candidatura"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
 msgid "Graduate"
-msgstr ""
+msgstr "Licenciado"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
@@ -177,12 +177,12 @@ msgstr "Referência"
 #: view:hr.applicant:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
 msgid "Applicants Status"
-msgstr ""
+msgstr "Estado do candidato"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "My Recruitment"
-msgstr ""
+msgstr "Meu recrutamento"
 
 #. module: hr_recruitment
 #: field:hr.applicant,title_action:0
@@ -258,7 +258,7 @@ msgstr "Enviar novo email"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "Este pedido de recrutamente já tem associado um Terceiro."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -302,6 +302,9 @@ msgid ""
 "Define here your stages of the recruitment process, for example: "
 "qualification call, first interview, second interview, refused, hired."
 msgstr ""
+"Defina aqui as etapas do processo de recrutamento, por exemplo: telefonema "
+"de qualificação, primeira entrevista, segunda entrevista, recusado, "
+"contratado."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -334,7 +337,7 @@ msgstr "Cargo"
 #: field:hr.recruitment.report,stage_id:0
 #: view:hr.recruitment.stage:0
 msgid "Stage"
-msgstr "Estágio"
+msgstr "Etapa"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
@@ -397,7 +400,7 @@ msgstr "Candidato"
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of stages."
-msgstr ""
+msgstr "Define a ordenação ao  listar as etapas"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -417,14 +420,14 @@ msgstr "Março"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
 msgid "Stage of Recruitment"
-msgstr "Estado do Recrutamento"
+msgstr "Etapas do recrutamento"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
 msgid "Stages"
-msgstr "Estágios"
+msgstr "Etapas"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -459,7 +462,7 @@ msgstr "RH - Recrutamento"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job Info"
-msgstr ""
+msgstr "Informações sobre o cargo"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
@@ -469,7 +472,7 @@ msgstr "Primeira entrevista"
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Atualizar data"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_proposed:0
@@ -485,7 +488,7 @@ msgstr "Vendedor"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Procurar Cargos"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,category_id:0
@@ -527,7 +530,7 @@ msgstr "Em curso"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Repor novo"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_expected:0
@@ -541,27 +544,29 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Estes endereços serão acrescentados em CC de todas as mensagens recebidas e "
+"enviadas para este registo. Separe os endereços usando vírgula"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date_closed:0
 #: field:hr.recruitment.report,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Fechado"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Definição de etapas"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Answer"
-msgstr ""
+msgstr "Resposta"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "Tempo médio para fecho"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed:0
@@ -579,7 +584,7 @@ msgstr "Reunião"
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Em aberto"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -589,7 +594,7 @@ msgstr "Estado"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicações e histórico"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -604,7 +609,7 @@ msgstr "Agosto"
 #: field:hr.recruitment.report,type_id:0
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
 msgid "Degree"
-msgstr ""
+msgstr "Grau académico"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_phone:0
@@ -614,7 +619,7 @@ msgstr "Telefone"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC global"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -634,7 +639,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Recusado pela empresa"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
@@ -655,7 +660,7 @@ msgstr "Excelente"
 #. module: hr_recruitment
 #: field:hr.applicant,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -670,12 +675,12 @@ msgstr "Filtros avançados"
 #. module: hr_recruitment
 #: field:hr.applicant,response:0
 msgid "Response"
-msgstr ""
+msgstr "Resposta"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Licenced"
-msgstr ""
+msgstr "Licenciado"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -703,7 +708,7 @@ msgstr "Estas pessoas vão receber email"
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Not Good"
-msgstr ""
+msgstr "Inadequado"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -720,6 +725,7 @@ msgstr "Descrição da chamada telefónica"
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
+"Confirma a criação de um Terceiro a partir deste pedido de recrutamento ?"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
@@ -732,11 +738,18 @@ msgid ""
 "are indexed automatically, so that you can easily search through their "
 "content."
 msgstr ""
+"Este menu permite o seguimento das candidaturas de um processo de "
+"recrutamento e gerir todas as atividades: reuniões, entrevistas, "
+"telefonemas, etc. Se configurar o envio de e-mail, candidaturas e CVs anexos "
+"são criados automaticamente ao receber um e-mail enviado para "
+"jobs@yourcompany.com. Se tiver instalado o módulo de gestão documental, "
+"todos os documento (CV e cartas) são indexados automaticamente, sendo o seu "
+"conteúdo facilmente pesquisável."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -795,7 +808,7 @@ msgstr "Responsável"
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
 msgid "Recruitment Analysis"
-msgstr ""
+msgstr "Análise do recrutamento"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -817,6 +830,15 @@ msgid ""
 "system to store and search in your CV base.\n"
 "    "
 msgstr ""
+"\n"
+"Gere os cargos e o processo de recrutamento. Está integrado com o módulo de "
+"questionários para permitir definir questões a responder para cada cargo.\n"
+"\n"
+"Este módulo está integrado com o gateway de e-mails para rastrear "
+"automaticamente os e-mails enviados para jobs@yourcompany.com. Também está "
+"integrado com o sistema de gestão documental para armazenar e pesquisar o "
+"arquivo de CVs.\n"
+"    "
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -826,12 +848,12 @@ msgstr "Detalhes"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Processos por etapas e estimativas"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -857,20 +879,20 @@ msgstr "Maio"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Contrato assinado"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: selection:hr.applicant,state:0
 #: selection:hr.recruitment.report,state:0
 msgid "Refused"
-msgstr ""
+msgstr "Recusado"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/hr_recruitment.py:412
 #, python-format
 msgid "Applicant '%s' is being hired."
-msgstr ""
+msgstr "Candidato \"%s\" está a ser contratado."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -956,4 +978,4 @@ msgstr ""
 #: field:hr.applicant,survey:0
 #: field:hr.job,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "Inquérito"
diff --git a/addons/hr_recruitment/i18n/pt_BR.po b/addons/hr_recruitment/i18n/pt_BR.po
index cc11b453ebc..1d1df7ba3e3 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4deda8c6463..c889cca453b 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -520,7 +520,7 @@ msgstr ""
 #: view:hr.applicant:0
 #: selection:hr.applicant,state:0
 msgid "In Progress"
-msgstr "В процессе"
+msgstr "Выполняется"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -955,30 +955,3 @@ msgstr ""
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для структуры вида!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Emails"
-#~ msgstr "Письма"
diff --git a/addons/hr_recruitment/i18n/sr.po b/addons/hr_recruitment/i18n/sr.po
index b47c97e07de..98ff10bc115 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80fd6e9a1d9..d7189ee04b1 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e9ef6a620d7..4d7a453c17d 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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/tr.po b/addons/hr_recruitment/i18n/tr.po
new file mode 100644
index 00000000000..f521f2d0487
--- /dev/null
+++ b/addons/hr_recruitment/i18n/tr.po
@@ -0,0 +1,957 @@
+# 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-08-23 11:19+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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+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
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"From this menu you can track applicants in the recruitment process and "
+"manage all operations: meetings, interviews, phone calls, etc. If you setup "
+"the email gateway, applicants and their attached CV are created "
+"automatically when an email is sent to jobs@yourcompany.com. If you install "
+"the document management modules, all documents (CV and motivation letters) "
+"are indexed automatically, so that you can easily search through their "
+"content."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+"    "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:412
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:396
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr ""
diff --git a/addons/hr_recruitment/i18n/vi.po b/addons/hr_recruitment/i18n/vi.po
index 6b1ad53d67b..e9c8017477c 100644
--- a/addons/hr_recruitment/i18n/vi.po
+++ b/addons/hr_recruitment/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-09 09:19+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-10 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f756d475422..f160c8269b8 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/i18n/zh_CN.po
@@ -14,31 +14,31 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
 msgid ""
 "If the active field is set to false, it will allow you to hide the case "
 "without removing it."
-msgstr ""
+msgstr "如果“有效”字段设为false，它对信息进行隐藏但不删除它。"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 #: field:hr.recruitment.stage,requirements:0
 msgid "Requirements"
-msgstr "需求"
+msgstr "必备条件"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "距开始处理"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
 msgid "# of Cases"
-msgstr "# 业务个案"
+msgstr "# 事务"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -57,7 +57,7 @@ msgstr "部门"
 #. module: hr_recruitment
 #: field:hr.applicant,date_action:0
 msgid "Next Action Date"
-msgstr "下次活动日期"
+msgstr "下一操作日期"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -74,17 +74,17 @@ msgstr "公司"
 #. module: hr_recruitment
 #: field:hr.applicant,email_cc:0
 msgid "Watchers Emails"
-msgstr "关注者的电子邮件"
+msgstr "关注者的电子信箱"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
 msgid "Close job request"
-msgstr "关闭职务请求"
+msgstr "结束职位申请"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
 msgid "Days to Open"
-msgstr "开发天数"
+msgstr "开启天数"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,note:0
@@ -94,7 +94,7 @@ msgstr "目标"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,partner_address_id:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "联系人姓名"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -107,22 +107,22 @@ msgstr "创建业务伙伴"
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "天数"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract Data"
-msgstr "合同数据"
+msgstr "合同信息"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Add Internal Note"
-msgstr "添加内部附注"
+msgstr "添加内部备注"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_mobile:0
 msgid "Mobile"
-msgstr "手机"
+msgstr "移动电话"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -137,12 +137,12 @@ msgstr "消息"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Next Actions"
-msgstr "下一步动作"
+msgstr "下一操作"
 
 #. module: hr_recruitment
 #: model:crm.case.categ,name:hr_recruitment.categ_job2
 msgid "Junior Developer"
-msgstr "初级程序员"
+msgstr "初级开发人员"
 
 #. module: hr_recruitment
 #: field:hr.applicant,job_id:0
@@ -158,7 +158,7 @@ msgstr "毕业生"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
 msgid "Initial Jobs Demand"
-msgstr "最初职务要求"
+msgstr "刚开始"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_address_id:0
@@ -168,7 +168,7 @@ msgstr "业务伙伴联系方式"
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "单号"
 
 #. module: hr_recruitment
 #: view:board.board:0
@@ -185,7 +185,7 @@ msgstr "我的招聘"
 #. module: hr_recruitment
 #: field:hr.applicant,title_action:0
 msgid "Next Action"
-msgstr "下一动作"
+msgstr "下一操作"
 
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
@@ -195,37 +195,37 @@ msgstr "招聘"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop:0
 msgid "Salary Proposed"
-msgstr ""
+msgstr "提议薪酬"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_id:0
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Avg Proposed Salary"
-msgstr ""
+msgstr "平均提议的薪酬"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.recruitment.report,available:0
 msgid "Availability"
-msgstr ""
+msgstr "有效"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Previous"
-msgstr "前一项"
+msgstr "上一个"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
 #: view:hr.applicant:0
 #, python-format
 msgid "Phone Call"
-msgstr "电话呼叫"
+msgstr "电话拜访"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -240,7 +240,7 @@ msgstr "招聘统计"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Next"
-msgstr "下一项"
+msgstr "下一个"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_job
@@ -250,13 +250,13 @@ msgstr "职位描述"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Send New Email"
-msgstr "发送新Email"
+msgstr "发送新的电子邮件"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "业务伙伴已定义职务空缺申请。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -264,28 +264,28 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "New"
-msgstr "新增"
+msgstr "新建"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
 msgid "Email"
-msgstr "电子邮件"
+msgstr "电子邮箱"
 
 #. module: hr_recruitment
 #: field:hr.applicant,availability:0
 msgid "Availability (Days)"
-msgstr "可用天数"
+msgstr "有效(天数)"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Available"
-msgstr "可用"
+msgstr "有效的"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Good"
-msgstr "良好"
+msgstr "好"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
@@ -299,31 +299,31 @@ msgstr "错误！"
 msgid ""
 "Define here your stages of the recruitment process, for example: "
 "qualification call, first interview, second interview, refused, hired."
-msgstr ""
+msgstr "定义您招聘流程的阶段如：电话联系，首次面谈，第二次面谈，拒绝录用。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
 #: view:hr.recruitment.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,deadline:0
 msgid "Planned Date"
-msgstr ""
+msgstr "计划的日期"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
 #: field:hr.recruitment.report,priority:0
 msgid "Appreciation"
-msgstr ""
+msgstr "评价"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job"
-msgstr ""
+msgstr "职位"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -332,205 +332,205 @@ msgstr ""
 #: field:hr.recruitment.report,stage_id:0
 #: view:hr.recruitment.stage:0
 msgid "Stage"
-msgstr ""
+msgstr "阶段"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "第二次面谈"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_exp:0
 msgid "Salary Expected"
-msgstr ""
+msgstr "薪酬期望"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_expected:0
 #: view:hr.recruitment.report:0
 msgid "Expected Salary"
-msgstr "期望薪水"
+msgstr "期望的薪酬"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Subject"
-msgstr ""
+msgstr "主题"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applicants"
-msgstr ""
+msgstr "申请人"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "History Information"
-msgstr ""
+msgstr "日志信息"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
 msgid " > Bac +5"
-msgstr ""
+msgstr " > Bac +5"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_applicant
 msgid "Applicant"
-msgstr ""
+msgstr "申请人"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of stages."
-msgstr ""
+msgstr "定义一个序列按顺序显示列表中的各阶段。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contact"
-msgstr ""
+msgstr "联系方式"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Qualification"
-msgstr ""
+msgstr "资格"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
 msgid "Stage of Recruitment"
-msgstr ""
+msgstr "招聘阶段"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
 msgid "Stages"
-msgstr ""
+msgstr "阶段"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "In progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "职位 - 招聘表"
 
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "概率"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: hr_recruitment
 #: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
 msgid "HR - Recruitement"
-msgstr ""
+msgstr "人力资源 - 招聘"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job Info"
-msgstr ""
+msgstr "职位信息"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "初次面试"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "更新日期"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_proposed:0
 #: view:hr.recruitment.report:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "提议薪酬"
 
 #. module: hr_recruitment
 #: model:crm.case.categ,name:hr_recruitment.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "业务员"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "查找职位"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_name:0
 msgid "Applicant's Name"
-msgstr ""
+msgstr "申请人姓名"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Very Good"
-msgstr ""
+msgstr "非常好"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "# Cases"
-msgstr ""
+msgstr "# 事务"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "开始"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Group By ..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: selection:hr.applicant,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reset to New"
-msgstr ""
+msgstr "复位到新的"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_expected:0
 msgid "Salary Expected by Applicant"
-msgstr ""
+msgstr "申请人要求的薪酬"
 
 #. module: hr_recruitment
 #: help:hr.applicant,email_cc:0
@@ -538,38 +538,38 @@ 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: hr_recruitment
 #: field:hr.applicant,date_closed:0
 #: field:hr.recruitment.report,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "已结束"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "阶段定义"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Answer"
-msgstr ""
+msgstr "回复"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "平均耗用天数"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed:0
 msgid "Salary Proposed by the Organisation"
-msgstr ""
+msgstr "该组织的提议薪酬"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Meeting"
-msgstr ""
+msgstr "会议"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -577,22 +577,22 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "待处理"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Communication & History"
-msgstr ""
+msgstr "沟通&日志"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -602,27 +602,27 @@ msgstr ""
 #: field:hr.recruitment.report,type_id:0
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
 msgid "Degree"
-msgstr ""
+msgstr "学历"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "电话"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Global CC"
-msgstr ""
+msgstr "完整抄送"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
@@ -632,92 +632,92 @@ msgstr ""
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "公司拒绝"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "剩余天数"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Excellent"
-msgstr ""
+msgstr "杰出"
 
 #. module: hr_recruitment
 #: field:hr.applicant,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: hr_recruitment
 #: field:hr.applicant,response:0
 msgid "Response"
-msgstr ""
+msgstr "回复"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Licenced"
-msgstr ""
+msgstr "证书"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
 msgid "Avg Salary Proposed"
-msgstr ""
+msgstr "平均提议薪酬"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.job2phonecall:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "电话日程表"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: hr_recruitment
 #: help:hr.applicant,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "这些人将收到电子邮件。"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Not Good"
-msgstr ""
+msgstr "不好"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
 #: field:hr.recruitment.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.job2phonecall:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "电话访问描述"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a partner based on this job request ?"
-msgstr ""
+msgstr "你确定建立这业务伙伴的职位空缺？"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
@@ -730,21 +730,23 @@ msgid ""
 "are indexed automatically, so that you can easily search through their "
 "content."
 msgstr ""
+"在这个菜单里你可以跟踪申请人在这个招聘过程中所有操作和管理：会议，面试，电话访问等。如果你设置好邮件网关，申请人和他的简历附件将自动创建一封 "
+"jobs@yourcompany.com的邮件。如果安装了文档管理模块，所有的文档（简历和求职信）将自动建立索引，这样你可以方便查找其内容。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Attachments"
-msgstr ""
+msgstr "附件"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "合同建议"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -752,53 +754,53 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.job2phonecall:0
 #: view:hr.recruitment.partner.create:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
 msgid "Applicant Categories"
-msgstr ""
+msgstr "申请人分类"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "开始"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "一个业务伙伴已经有相同的名称。"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
 msgid "Gives the sequence order when displaying a list of degrees."
-msgstr ""
+msgstr "定义一个显示学历列表的序列"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,user_id:0
 #: view:hr.recruitment.report:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
 msgid "Recruitment Analysis"
-msgstr ""
+msgstr "招聘分析"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: hr_recruitment
 #: model:ir.module.module,description:hr_recruitment.module_meta_information
@@ -815,60 +817,64 @@ msgid ""
 "system to store and search in your CV base.\n"
 "    "
 msgstr ""
+"\n"
+"管理职位和招聘的过程。它集成了调查模块允许您定义不同的职位面试。\n"
+"这模块集成了邮件网关自动跟踪邮件发送到 jobs@YOURCOMPANY.com，它也集成了文档管理系统储存和搜索你的简历附件。\n"
+"    "
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Details"
-msgstr ""
+msgstr "详细信息"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "按阶段和评估的事务"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reply"
-msgstr ""
+msgstr "回复"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Interview"
-msgstr ""
+msgstr "面谈"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: hr_recruitment
 #: field:hr.applicant,description:0
 msgid "Description"
-msgstr ""
+msgstr "简介"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "签订合同"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: selection:hr.applicant,state:0
 #: selection:hr.recruitment.report,state:0
 msgid "Refused"
-msgstr ""
+msgstr "已拒绝"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/hr_recruitment.py:412
 #, python-format
 msgid "Applicant '%s' is being hired."
-msgstr ""
+msgstr "申请人 '%s'被录用。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -876,82 +882,82 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Hired"
-msgstr ""
+msgstr "录用"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "被申请人拒绝"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "On Average"
-msgstr ""
+msgstr "平均"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
 msgid "Degree of Recruitment"
-msgstr ""
+msgstr "招聘的学历"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: hr_recruitment
 #: field:hr.applicant,name:0
 #: field:hr.recruitment.degree,name:0
 #: field:hr.recruitment.stage,name:0
 msgid "Name"
-msgstr ""
+msgstr "姓名"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
 msgid "Create Partner from job application"
-msgstr ""
+msgstr "建立业务伙伴的职位申请"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: hr_recruitment
 #: model:crm.case.section,name:hr_recruitment.section_hr_department
 msgid "HR Department"
-msgstr ""
+msgstr "人力资源部门"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.degree,sequence:0
 #: field:hr.recruitment.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "分配给"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/hr_recruitment.py:396
 #, python-format
 msgid "The job request '%s' has been set 'in progress'."
-msgstr ""
+msgstr "这职位空缺 '%s'已被定义为 “进行中”"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.report,delay_close:0
 #: help:hr.recruitment.report,delay_open:0
 msgid "Number of Days to close the project issue"
-msgstr ""
+msgstr "剩余天数"
 
 #. module: hr_recruitment
 #: field:hr.applicant,survey:0
 #: field:hr.job,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "问卷"
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4f39005a3d1..07f160b8ee2 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -50,16 +50,16 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year"
+                    <filter icon="terp-go-year" string="Year" name="year"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Recruitment performed in current year"/>
+                    <separator orientation="vertical"/>	
                     <filter icon="terp-go-month" string="Month"
                         name="month"
                         domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Recruitment performed in current month"/>
                     <filter icon="terp-go-month"
                         string="    Month-1    "
-                        separator="1"
                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Recruitment during last month"/>
                     <separator orientation="vertical"/>
@@ -127,7 +127,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
     <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index e159be6a9db..570b0f036cd 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -2,6 +2,12 @@
 <openerp>
 <data noupdate="1">
 
+    <record id="hr_applicant_comp_rule" model="ir.rule">
+        <field name="name">Applicant multi company rule</field>
+        <field model="ir.model" name="model_id" ref="model_hr_applicant"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
 
 
   </data>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 948c0aa0c47..96baaf9e278 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -3,9 +3,11 @@
 "access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
 "access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
 "access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
-"access_mailgate_message_user","mailgate.message.user","mail_gateway.model_mailgate_message","base.group_hr_user",1,1,1,1
+"access_mail_message_user","mail.message.user","mail.model_mail_message","base.group_hr_user",1,1,1,1
 "access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
 "access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
 "access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
 "access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
 "access_crm_meeting_hruser","crm.meeting.hruser","crm.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
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
index 1acbf33eb72..b797353bde2 100644
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ b/addons/hr_recruitment/test/test_hr_recruitment.yml
@@ -52,7 +52,12 @@
   !python {model: hr.applicant}: |
     self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")],
       })
-
+-
+  I change the stages by clicking on stage next and stage previous buttons.
+-
+  !python {model: hr.applicant}: |
+    self.stage_next(cr, uid, [ref('hr_applicant_fresher0')], None)
+    self.stage_previous(cr, uid, [ref('hr_applicant_fresher0')], None)
 -
   I create a new case category.
 -
@@ -97,14 +102,38 @@
     rrule_type: none
     state: open
     user_id: base.user_root
-
+-
+  I print the survery filled up by the applicant.
+-
+  !python {model: hr.applicant}: |
+     self.action_print_survey(cr, uid, [ref('hr_applicant_fresher0')], None)
+-
+  I assign the position to the applicant and its relevant department.
+-
+  !python {model: hr.applicant}: |
+     res = self.onchange_job(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.job_jr_developers'), None)
+     values = dict([('job_id', ref('hr.job_jr_developers'))] + res['value'].items())
+     res1 = self.onchange_department_id(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.dep_it'), None)
+     values.update(dict([('department_id', ref('hr.dep_it'))] + res1['value'].items()))
+     self.write(cr, uid, [ref('hr_applicant_fresher0')], values, None)
 -
   On a successful meeting with the applicant, I hired employee by click on "Hired" button.
 -
-  !python {model: hr.applicant}: |
-     self.case_close(cr, uid, [ref('hr_applicant_fresher0')])
+  !python {model: hired.employee}: |
+     self.case_close(cr, uid, [], context={'active_ids': [ref('hr_applicant_fresher0')]})
 -
   I check that applicant state is "Hired".
 -
   !assert {model: hr.applicant, id: hr_applicant_fresher0}:
     - state == 'done'
+-
+  I create partner for the hired applicant for accounting purpose.
+-
+  !record {model: hr.recruitment.partner.create, id: hr_recruitment_partner_create0}:
+    close: False
+-
+  I click on Create Partner button to create a partner for applicant.
+-
+  !python {model: hr.recruitment.partner.create}: |
+     self.make_order(cr, uid, [ref('hr_recruitment_partner_create0')], context={'active_ids': [ref('hr_applicant_fresher0')]})
+
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
index d11a1f16775..291c16a7644 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@@ -48,8 +48,7 @@ class hired_employee(osv.osv_memory):
         """
         if context is None:
             context = {}
-        self.pool.get('hr.applicant').case_close_with_emp(cr, uid,context.get('active_ids', []))
-        return {}
+        return self.pool.get('hr.applicant').case_close_with_emp(cr, uid,context.get('active_ids', []))
 
 hired_employee()
 
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index edd08b5b531..cd9cbea52f7 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -32,7 +32,7 @@ class job2phonecall(osv.osv_memory):
         'deadline': fields.datetime('Planned Date'),
         'note': fields.text('Goals'),
         'category_id': fields.many2one('crm.case.categ', 'Category', required=True),
-                }
+    }
 
     def _date_user(self, cr, uid, context=None):
         case_obj = self.pool.get('hr.applicant')
@@ -50,7 +50,7 @@ class job2phonecall(osv.osv_memory):
         return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
 
     def _get_note(self, cr, uid, context=None):
-        msg_obj = self.pool.get('mailgate.message')
+        mail_message = self.pool.get('mail.message')
         if context is None:
             context = {}
         if context.get('active_id'):
@@ -58,9 +58,9 @@ class job2phonecall(osv.osv_memory):
             if case.description:
                 return case.description
             else:
-                msg_ids = msg_obj.search(cr, uid, [('model', '=', 'hr.applicant'), ('res_id', '=', case.id), ('email_from', '!=', ''), ('email_to', '!=', '')], limit=1)
+                msg_ids = mail_message.search(cr, uid, [('model', '=', 'hr.applicant'), ('res_id', '=', case.id), ('email_from', '!=', ''), ('email_to', '!=', '')], limit=1)
                 if msg_ids:
-                    return msg_obj.browse(cr, uid, msg_ids[0], context=context).description
+                    return mail_message.browse(cr, uid, msg_ids[0], context=context).body_text
         return False
 
 
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 411ac68d57b..76886a45aaf 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources (Timesheet encoding)',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module implements a timesheet system.
@@ -53,6 +53,7 @@ to set up a management by affair.
         'wizard/hr_timesheet_print_employee_view.xml',
         'wizard/hr_timesheet_print_users_view.xml',
         'wizard/hr_timesheet_sign_in_out_view.xml',
+        'hr_timesheet_installer.xml',
     ],
     'demo_xml': ['hr_timesheet_demo.xml'],
     'test': ['test/test_hr_timesheet.yml',
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 2b33dfbda8d..a936a18a02d 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -46,7 +46,7 @@ class hr_employee(osv.osv):
     def _getEmployeeProduct(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'product_consultant')
+            result = md.get_object_reference(cr, uid, 'product', 'product_consultant')
             return result[1]
         except ValueError:
             pass
@@ -66,8 +66,8 @@ class hr_analytic_timesheet(osv.osv):
     _inherits = {'account.analytic.line': 'line_id'}
     _order = "id desc"
     _columns = {
-        'line_id': fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade', required=True),
-        'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id', relation='res.partner', store=True),
+        'line_id': fields.many2one('account.analytic.line', 'Analytic Line', ondelete='cascade', required=True),
+        'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner', relation='res.partner', store=True),
     }
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 74403343a03..e9aa56d4646 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -2,26 +2,17 @@
 <openerp>
     <data>
 
-        <record id="product_consultant" model="product.product">
-            <field name="list_price">75.0</field>
-            <field name="standard_price">30.0</field>
-            <field name="uom_id" ref="product.uom_hour"/>
-            <field name="uom_po_id" ref="product.uom_hour"/>
-            <field name="name">Service on Timesheet</field>
-            <field name="categ_id" ref="product.cat0"/>
-            <field name="type">service</field>
-            <field eval="False" name="purchase_ok"/>
-        </record>
 
-        <record id="hr.employee" model="hr.employee">
-            <field name="product_id" ref="product_consultant"/>
-        </record>
-        
         <record id="analytic_journal" model="account.analytic.journal">
             <field name="code">TS</field>
             <field name="name">Timesheet Journal</field>
             <field name="type">general</field>
         </record>
 
+        <record id="hr.employee" model="hr.employee">
+            <field name="product_id" ref="product.product_consultant"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index ab33c4218a5..f6f2729c4d4 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -3,13 +3,13 @@
     <data noupdate="1">
 
         <record id="hr.employee" model="hr.employee">
-            <field name="product_id" ref="product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
         <!-- complete our example employee -->
         <record id="hr.employee1" model="hr.employee">
-            <field name="product_id" ref="product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -18,7 +18,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field eval="2.00" name="unit_amount"/>
-            <field name="product_id" ref="product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
             <field eval="-60.00" name="amount"/>
@@ -31,7 +31,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field eval="1.00" name="unit_amount"/>
-            <field name="product_id" ref="product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
             <field eval="-30.00" name="amount"/>
@@ -44,7 +44,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field eval="03.00" name="unit_amount"/>
-            <field name="product_id" ref="product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
             <field eval="-90.00" name="amount"/>
@@ -57,7 +57,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field eval="01.00" name="unit_amount"/>
-            <field name="product_id" ref="product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
             <field eval="-30.00" name="amount"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field eval="01.00" name="unit_amount"/>
-            <field name="product_id" ref="product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
             <field eval="-30.00" name="amount"/>
diff --git a/addons/hr_timesheet/hr_timesheet_installer.xml b/addons/hr_timesheet/hr_timesheet_installer.xml
new file mode 100644
index 00000000000..cfd2cc8ab88
--- /dev/null
+++ b/addons/hr_timesheet/hr_timesheet_installer.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.actions.act_window" id="action_define_analytic_structure">
+            <field name="name">Define your Analytic Structure</field>
+            <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,form</field>
+            <field name="help">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.</field>
+        </record>
+
+        <record id="todo_define_analytic_structure" model="ir.actions.todo">
+            <field name="action_id" ref="action_define_analytic_structure" />
+            <field name="category_id" ref="hr.category_hr_management_config" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 3e5f6c26619..dd848d453df 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-      <menuitem
-            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="10" />
          <menuitem
             id="menu_hr_reporting_timesheet"
             name="Timesheet"
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 2092773fad9..f2b8a6beb0f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -62,7 +62,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col='8' colspan='4'>
+                    <group>
                         <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
@@ -104,8 +104,8 @@
                 <page string="Categories" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
                         <field name="product_id" domain="[('type','=','service')]"/>
-                        <field name="uom_id"/>
                         <field name="journal_id" widget="selection"/>
+                        <field name="uom_id" invisible="1"/>
                     </page>
                 </page>
             </field>
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index 8ab3ae08877..3e2abab441b 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 238eeb96acb..43ac53cfb7d 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr "Услуги по график"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Сря"
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr "януари"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Пон"
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Вто"
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Нед"
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Месечен график на служители"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Юли"
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Март"
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr "Декември"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Септември"
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Пет"
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Юни"
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Ноември"
@@ -440,15 +452,19 @@ msgid "Closing Date"
 msgstr "Дата на затваряне"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Януари"
@@ -459,8 +475,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Четв"
@@ -497,8 +513,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Декември"
@@ -570,8 +588,10 @@ msgid "Invoicing"
 msgstr "Фактуриране"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Май"
@@ -604,8 +624,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Февруари"
@@ -632,8 +654,10 @@ msgid "octobre"
 msgstr "октомври"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Април"
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index f02f5b9461c..3f60cf20193 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index 6ebbab2e103..79f4d3ad404 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr "Servei en part d'hores"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Dc"
@@ -97,8 +97,8 @@ msgid "janvier"
 msgstr "Gener"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Dl"
@@ -182,8 +182,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "No s'ha definit una unitat de cost per aquest empleat!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Dt"
@@ -211,15 +211,15 @@ msgid "Sign In/Out By Project"
 msgstr "Registrar entrada/sortida per projecte"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Ds"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dg"
@@ -247,8 +247,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Part d'hores mensual d'empleats"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juliol"
@@ -309,8 +311,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Març"
@@ -327,8 +331,10 @@ msgid "décembre"
 msgstr "Desembre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Setembre"
@@ -377,8 +383,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Registra entrada/sortida per projecte"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Dv"
@@ -422,15 +428,19 @@ msgid "août"
 msgstr "Agost"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Agost"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juny"
@@ -452,8 +462,10 @@ msgid "Date"
 msgstr "Data"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Novembre"
@@ -469,15 +481,19 @@ msgid "Closing Date"
 msgstr "Data límit"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Octubre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Gener"
@@ -488,8 +504,8 @@ msgid "Key dates"
 msgstr "Dates clau"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Dj"
@@ -526,8 +542,10 @@ msgid "Analysis summary"
 msgstr "Resum d'anàlisis"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Desembre"
@@ -599,8 +617,10 @@ msgid "Invoicing"
 msgstr "Facturació"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maig"
@@ -633,8 +653,10 @@ msgid "Sign In By Project"
 msgstr "Registrar-se en un projecte"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Febrer"
@@ -661,8 +683,10 @@ msgid "octobre"
 msgstr "Octubre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Abril"
@@ -732,15 +756,6 @@ msgstr "Canvia treball"
 msgid "septembre"
 msgstr "Setembre"
 
-#~ msgid "Employees timesheet"
-#~ msgstr "Full d'assistència dels empleats"
-
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consultoría - Desenvolupador senior"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Imprimeix el meu full d'assistència"
-
 #, python-format
 #~ msgid ""
 #~ "No analytic journal available for this employee.\n"
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index d7092a453d1..681e9f960c3 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/i18n/cs.po
@@ -4,45 +4,46 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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: 2009-02-03 20:59+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-20 08:48+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "SLužby v časovém rozvrhu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
-msgstr ""
+msgstr "St"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr ""
+msgstr "(Nechejte prázdné pro aktuální čas)"
 
 #. 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 "Pro vašeho uživatele nebyl určen zaměstnanec !"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -52,16 +53,20 @@ msgid ""
 "analytic account. This feature allows to record at the same time the "
 "attendance and the timesheet."
 msgstr ""
+"Zaměstnanci mohou vkládat své časy strávené na různých projektech. Projekt "
+"je analytický účet a čas strávený na projektu generuje ceny na na "
+"analytickém účtu. Tato funkce umožňuje zaznamenat ve stejný čas docházku a "
+"časový rozvrh."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Today"
-msgstr ""
+msgstr "Dnes"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analytický deník"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -72,31 +77,31 @@ msgstr "Ukončit práci"
 #: 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 "Časový rozvrh zaměstnance"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "Statistika dokončené práce"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
 msgid "Timesheet"
-msgstr ""
+msgstr "Časový rozvrh"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "janvier"
-msgstr ""
+msgstr "leden"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
-msgstr ""
+msgstr "Po"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -111,27 +116,31 @@ msgid ""
 "project generates costs on the analytic account. This feature allows to "
 "record at the same time the attendance and the timesheet."
 msgstr ""
+"Zaměstnanci mohou vkládat své časy strávené na různých projektech, ke kterým "
+"jsou přiřazeni. Projekt je analytický účet a čas strávený na projektu "
+"generuje ceny na na analytickém účtu. Tato funkce umožňuje zaznamenat ve "
+"stejný čas docházku a časový rozvrh."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "Minimální analytická částka"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr ""
+msgstr "Měsíční časový rozvrh zaměstnance"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "Dokončená práce v minulém období"
 
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Chyba ! Nemůžete vybrat oddělení, kterého je zaměstnance vedoucí."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -143,39 +152,39 @@ msgstr "Současné datum"
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Jméno zaměstnance"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr ""
+msgstr "Tisknou časový rozvrh zaměstnance"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:174
 #: code:addons/hr_timesheet/hr_timesheet.py:176
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varování !"
 
 #. 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 "UserError"
 
 #. 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 "Pro tohoto zaměstnance nebyla určena cenová jednotka !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
-msgstr ""
+msgstr "Út"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
@@ -186,32 +195,32 @@ msgstr "Analytický účet"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varování"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
 msgid "Human Resources (Timesheet encoding)"
-msgstr ""
+msgstr "Lidské zdroje (Kódování časových rozvrhů)"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr ""
+msgstr "Přihlášení/Odhlášení podle projektu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
-msgstr ""
+msgstr "So"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
-msgstr ""
+msgstr "Ne"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -222,25 +231,27 @@ msgstr "Tisk"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Řádky časového rozvrhu"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "juillet"
-msgstr ""
+msgstr "červenec"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Měsíční časový rozvrh zaměstnance"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Červenec"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,date:0
@@ -251,13 +262,13 @@ msgstr "Počáteční datum"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "novembre"
-msgstr ""
+msgstr "listopad"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
@@ -265,6 +276,8 @@ msgid ""
 "Through Working Hours you can register your working hours by project every "
 "day."
 msgstr ""
+"Pomocí pracovních hodin můžete každý den registrovat vaše pracovní hodiny "
+"podle projektu."
 
 #. module: hr_timesheet
 #: model:ir.module.module,description:hr_timesheet.module_meta_information
@@ -281,46 +294,62 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Tento modul realizuje systém časového rozvrhu. Každý zaměstnanec může "
+"zadávat a\n"
+"sledovat svůj čas strávený na různých projektech. Projekt je \n"
+"analytický účet a čas strávený na projektu generuje ceny na\n"
+"analytickém účtu.\n"
+"\n"
+"Je poskytováno mnoho vykazování nad časem a sledováním zaměstnanců.\n"
+"\n"
+"Je celkově integrováno s module účtování cen. Umožňuje vám\n"
+"nastavit správu podle poměru.\n"
+"    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Březen"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total cost"
-msgstr ""
+msgstr "Celková cena"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "décembre"
-msgstr ""
+msgstr "prosinec"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Září"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Řádek časového rozvrhu"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "zaměstnanci"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "Statistika podle měsíce"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -337,25 +366,25 @@ msgstr "Popis práce"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "To be invoiced"
-msgstr ""
+msgstr "K fakturaci"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr ""
+msgstr "Časový rozvrh zaměstnance"
 
 #. 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 ""
+msgstr "Přihlášení / Odhlášení podle projektu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
-msgstr ""
+msgstr "Pá"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -369,69 +398,77 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
+"Pro zaměstnance %s není určen Analytický deník \n"
+"Určete zaměstnance pro vybraného uživatele a přiřaďte analxtický deník!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(Nechejte prázdné pro aktuální čas)"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Časové rozvrhy"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr ""
+msgstr "Určuje zařazení zaměstnance jako výrobek s typem 'služba'."
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "août"
-msgstr ""
+msgstr "srpen"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Srpen"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Červen"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Print My Timesheet"
-msgstr ""
+msgstr "Tisknout můj časový rozvrh"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "mars"
-msgstr ""
+msgstr "březen"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Listopad"
 
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní Hierarchii zaměstnanců"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -439,46 +476,50 @@ msgid "Closing Date"
 msgstr "Koncové datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Říjen"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Leden"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr ""
+msgstr "Klíčové dny"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
-msgstr ""
+msgstr "Čt"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr ""
+msgstr "Statistiká analýza"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr ""
+msgstr "Tisknout Časový rozvrh zaměstnance & Tisknou můj časový rozvrh"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
 #: field:hr.sign.out.project,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID zaměstnance"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -488,19 +529,21 @@ msgstr "Obecné informace"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Timesheet"
-msgstr ""
+msgstr "Moje časové rozvrhy"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis summary"
-msgstr ""
+msgstr "Souhrn analýzy"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Prosinec"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -508,7 +551,7 @@ msgstr ""
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Cancel"
-msgstr "Storno"
+msgstr "Zrušit"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
@@ -516,30 +559,30 @@ msgstr "Storno"
 #: 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 "Časové rozvrhy zaměstnanců"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "février"
-msgstr ""
+msgstr "únor"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr ""
+msgstr "Informace"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
 #: model:ir.model,name:hr_timesheet.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Zaměstnanec"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "avril"
-msgstr ""
+msgstr "duben"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
@@ -550,92 +593,98 @@ msgstr "Současné datum"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Anlytic account"
-msgstr ""
+msgstr "Analytický účet"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
-msgstr ""
+msgstr "Tento průvodce bude tisknout měsíční časový rozvrh"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Výrobek"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturace"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Květen"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr ""
+msgstr "Celkový čas"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "juin"
-msgstr ""
+msgstr "červen"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(lokální čas na serveru)"
+msgstr "(místní čas na straně serveru)"
 
 #. module: hr_timesheet
 #: 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 "Working Hours"
-msgstr ""
+msgstr "Pracovní hodiny"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr ""
+msgstr "Přihlášení podle projektu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Únor"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic line"
-msgstr ""
+msgstr "Analytický řádek"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr ""
+msgstr "Odhlášení podle projektu"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr ""
+msgstr "Zaměstnanci"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "octobre"
-msgstr ""
+msgstr "říjen"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
+msgstr "Duben"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:176
@@ -644,12 +693,14 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
+"U projektu nebyl určen analytický účet.\n"
+"Prosíme nastavte jej nebo nemůžeme automaticky vyplnit časový rozvrh."
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "mai"
-msgstr ""
+msgstr "květen"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -665,13 +716,13 @@ msgstr "Začít pracovat"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr ""
+msgstr "Statistiky podle uživatele"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
-msgstr ""
+msgstr "Pro tohoto uživatele nebyl určen zaměstnanec"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
@@ -682,23 +733,23 @@ msgstr "Rok"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Accounting"
-msgstr ""
+msgstr "Účetnictví"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner Id"
-msgstr ""
+msgstr "Id partnera"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Change Work"
-msgstr ""
+msgstr "Změnit práci"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "septembre"
-msgstr ""
+msgstr "září"
 
 #~ msgid "Choose Users"
 #~ msgstr "Uživatelé"
@@ -714,3 +765,6 @@ msgstr ""
 
 #~ msgid "Current Server Date"
 #~ msgstr "Současné datum ze serveru"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 8ddc838185c..46020042f0d 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr "Produktvorlage Arbeitszeit"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Mi"
@@ -98,8 +98,8 @@ msgid "janvier"
 msgstr "Januar"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Mo"
@@ -184,8 +184,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Keine Kosten Einheit für diesen Mitarbeiter definiert!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Di"
@@ -213,15 +213,15 @@ msgid "Sign In/Out By Project"
 msgstr "Anmelden / Abmelden bei Projekt"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sa"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "So"
@@ -249,8 +249,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Monatliche Zeiterfassung"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juli"
@@ -317,8 +319,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "März"
@@ -335,8 +339,10 @@ msgid "décembre"
 msgstr "Dezember"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "September"
@@ -385,8 +391,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Anmelden / Abmelden bei Projekt"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Fr"
@@ -431,15 +437,19 @@ msgid "août"
 msgstr "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juni"
@@ -461,8 +471,10 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "November"
@@ -479,15 +491,19 @@ msgid "Closing Date"
 msgstr "Ende Datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Januar"
@@ -498,8 +514,8 @@ msgid "Key dates"
 msgstr "Schlüsseltermine"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Do"
@@ -536,8 +552,10 @@ msgid "Analysis summary"
 msgstr "Gesamtanalyse"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Dezember"
@@ -609,8 +627,10 @@ msgid "Invoicing"
 msgstr "Rechnungsstellung"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mai"
@@ -643,8 +663,10 @@ msgid "Sign In By Project"
 msgstr "Anmeldungen nach Projekt"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Februar"
@@ -671,8 +693,10 @@ msgid "octobre"
 msgstr "Oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "April"
@@ -743,14 +767,14 @@ msgstr "Ändere Projekt /Aufgabe"
 msgid "septembre"
 msgstr "September"
 
-#~ msgid "Employees timesheet"
-#~ msgstr "Mitarbeiter Zeiterfassung"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Drucke eigene Zeiterfassung"
-
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consultant - Senior Developer"
+#, python-format
+#~ msgid ""
+#~ "No analytic journal available for this employee.\n"
+#~ "Define an employee for the selected user and assign an analytic journal."
+#~ msgstr ""
+#~ "Kein Analytisches Journal für diesen Mitarbeiter.\n"
+#~ "Definieren Sie einen \"Mitarbeiter\" für diesen \"Benutzer\" und ordnen Sie "
+#~ "ein \"Analytiusche Journal\" zu."
 
 #~ msgid "Day"
 #~ msgstr "Tag"
@@ -836,24 +860,3 @@ msgstr "September"
 #~ msgstr ""
 #~ "Fehler: Die Standard Mengeneinheit (ME) sowie die Beschaffungs Mengeneinheit "
 #~ "(ME) muss in derselben Kategorie sein."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "This Wizard will make Sign In/Out By Project"
-#~ msgstr "Dieser Assistent ermöglicht Anmelden / Abmelden nach Projekt"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Working Hours allows you to log your working hours by project every day."
-#~ msgstr ""
-#~ "Arbeitsstunden ermöglicht Ihnen die Erfassung von projektbezogenen Zeiten im "
-#~ "Rahmen der Arbeitszeiterfassung."
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index ccb6a24771f..0fd69fb5cbe 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -25,8 +25,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Τετ"
@@ -95,8 +95,8 @@ msgid "janvier"
 msgstr "Γενάρης"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Δευτ"
@@ -174,8 +174,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Δεν έχει οριστεί μονάδα κόστους για τον υπάλληλο"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Τρίτη"
@@ -203,15 +203,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Κυρ"
@@ -239,8 +239,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Ιούλιος"
@@ -286,8 +288,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Μάρτιος"
@@ -304,8 +308,10 @@ msgid "décembre"
 msgstr "Δεκέμβριος"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Σεπτέμβριος"
@@ -354,8 +360,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Προσέλευση / Αναχώρηση ανά έργο"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Παρ"
@@ -395,15 +401,19 @@ msgid "août"
 msgstr "Αύγουστος"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Ιούνιος"
@@ -425,8 +435,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Νοέμβριος"
@@ -442,15 +454,19 @@ msgid "Closing Date"
 msgstr "Ημερ/νία Κλεισίματος"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Ιανουάριος"
@@ -461,8 +477,8 @@ msgid "Key dates"
 msgstr "Σημαντικές ημερ/νίες"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Πέμ"
@@ -499,8 +515,10 @@ msgid "Analysis summary"
 msgstr "Ανάλυση Συνοπτικά"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Δεκέμβριος"
@@ -572,8 +590,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Μάιος"
@@ -606,8 +626,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Φεβρουάριος"
@@ -634,8 +656,10 @@ msgid "octobre"
 msgstr "Οκτώβριος"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Απρίλιος"
@@ -768,12 +792,6 @@ msgstr "Σεπτέμβριος"
 #~ msgid "Employee's name"
 #~ msgstr "Όνομα Υπαλλήλου"
 
-#~ msgid "Employees timesheet"
-#~ msgstr "Φύλλο Xρόνου Eργασίας Υπαλλήλου"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Εκτύπωση Φύλλου Xρόνου Eργασίας μου"
-
 #~ msgid "Choose your month"
 #~ msgstr "Επιλογή Μήνα"
 
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index b03cf8437db..864893168bf 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr "Servicio en parte de horas"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Mié"
@@ -96,8 +96,8 @@ msgid "janvier"
 msgstr "enero"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Lun"
@@ -181,8 +181,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "¡No se ha definido una unidad de coste para este empleado!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Mar"
@@ -210,15 +210,15 @@ msgid "Sign In/Out By Project"
 msgstr "Registrar entrada/salir por proyecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sáb"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dom"
@@ -246,8 +246,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Parte de horas mensual de empleados"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Julio"
@@ -309,8 +311,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Marzo"
@@ -327,8 +331,10 @@ msgid "décembre"
 msgstr "diciembre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Septiembre"
@@ -377,8 +383,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Registrar entrada/salida por proyecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Vie"
@@ -422,15 +428,19 @@ msgid "août"
 msgstr "agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Junio"
@@ -452,8 +462,10 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Noviembre"
@@ -469,15 +481,19 @@ msgid "Closing Date"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Octubre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Enero"
@@ -488,8 +504,8 @@ msgid "Key dates"
 msgstr "Fechas clave"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Jue"
@@ -526,8 +542,10 @@ msgid "Analysis summary"
 msgstr "Resumen de análisis"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Diciembre"
@@ -599,8 +617,10 @@ msgid "Invoicing"
 msgstr "Facturación"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mayo"
@@ -633,8 +653,10 @@ msgid "Sign In By Project"
 msgstr "Registrarse en un proyecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Febrero"
@@ -661,8 +683,10 @@ msgid "octobre"
 msgstr "octubre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Abril"
@@ -733,15 +757,6 @@ msgstr "Cambiar trabajo"
 msgid "septembre"
 msgstr "septiembre"
 
-#~ msgid "Employees timesheet"
-#~ msgstr "Hoja de asistencia de los empleados"
-
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consultoría - Desarrollador senior"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Imprimir mi hoja de asistencia"
-
 #, python-format
 #~ msgid ""
 #~ "No analytic journal available for this employee.\n"
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index 59873ef1f82..3c4320e2c9a 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Mié"
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr "junio"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Lun"
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "¡No se ha definido una unidad de coste para este empleado!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Martes"
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sáb"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dom"
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Julio"
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Marzo"
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr "diciembre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Septiembre"
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Registrar entrada/salida por proyecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Viernes"
@@ -392,15 +398,19 @@ msgid "août"
 msgstr "août"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Junio"
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Noviembre"
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Octubre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Enero"
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr "Fechas clave"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Jueves"
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr "Resumen de análisis"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Diciembre"
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mayo"
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Febrero"
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr "octubre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Abril"
diff --git a/addons/hr_timesheet/i18n/es_MX.po b/addons/hr_timesheet/i18n/es_MX.po
new file mode 100644
index 00000000000..a702efe6d09
--- /dev/null
+++ b/addons/hr_timesheet/i18n/es_MX.po
@@ -0,0 +1,849 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_timesheet
+#
+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:15+0000\n"
+"PO-Revision-Date: 2011-01-18 09:14+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: 2011-09-05 05:24+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_timesheet
+#: model:product.template,name:hr_timesheet.product_consultant_product_template
+msgid "Service on Timesheet"
+msgstr "Servicio en parte de horas"
+
+#. 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 "Mié"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(Vacío para fecha actual)"
+
+#. 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 "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. 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 ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo repercutido en un "
+"proyecto imputa costes en esa cuenta analítica. Esta característica permite "
+"registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr "Parar de trabajar"
+
+#. 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 "Horario del empleado"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr "Estadísticas trabajo realizado"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Hoja de asistencia"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "janvier"
+msgstr "enero"
+
+#. 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 "Lun"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Registrar entrada"
+
+#. 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 ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo invertido en un "
+"proyecto genera costes en esa cuenta analítica. Esta característica permite "
+"registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr "Importe analítico mínimo"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr "Parte de horas mensual del Empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Trabajo realizado en el último período"
+
+#. module: hr_timesheet
+#: 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 para el cual el empleado sea el "
+"director."
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr "Estado actual"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "Nombre empleados"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Mostrar Parte de horas de los Empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. 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 "Error de usuario"
+
+#. 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 "¡No se ha definido una unidad de coste para este empleado!"
+
+#. 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 "Mar"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: hr_timesheet
+#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
+msgid "Human Resources (Timesheet encoding)"
+msgstr "Recursos humanos (codificación de horarios)"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr "Registrar entrada/salir por proyecto"
+
+#. 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 "Sáb"
+
+#. 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 "Dom"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Timesheet Lines"
+msgstr "Líneas de la hoja de asistencia"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juillet"
+msgstr "julio"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr "Parte de horas mensual de empleados"
+
+#. 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 "Julio"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "novembre"
+msgstr "noviembre"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"Through Working Hours you can register your working hours by project every "
+"day."
+msgstr ""
+"A través de las Horas de trabajo puede registrar sus horas laborables por "
+"proyecto todos los días."
+
+#. module: hr_timesheet
+#: model:ir.module.module,description:hr_timesheet.module_meta_information
+msgid ""
+"\n"
+"This module implements a timesheet system. Each employee can encode and\n"
+"track their time spent on the different projects. A project is an\n"
+"analytic account and the time spent on a project generates costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo implementa un sistema de parte de horas. Cada empleado puede "
+"imputar y\n"
+"llevar el registro del tiempo invertido en sus diferentes proyectos. Un "
+"proyecto es una\n"
+"cuenta analítica y el tiempo invertido en un proyecto genera costes en esa "
+"cuenta analítica.\n"
+"\n"
+"Se facilitan varios informes de seguimiento de tiempos y empleados.\n"
+"\n"
+"Está completamente integrado con el módulo de contabilidad de costes. "
+"Permite\n"
+"establecer una gestión por asunto.\n"
+"    "
+
+#. 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 "Marzo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr "Coste total"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "décembre"
+msgstr "diciembre"
+
+#. 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 "Septiembre"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de asistencia"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Estadísticas por mes"
+
+#. 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 "Mes"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "To be invoiced"
+msgstr "A facturar"
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr "Hoja de asistencia del empleado"
+
+#. 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 "Registrar entrada/salida por proyecto"
+
+#. 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 "Vie"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Registrar entrada/salida"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#, 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 ""
+"El diario analítico no está definido para el empleado %s\n"
+"¡Defina un empleado para el usuario seleccionado y asígnele un diario "
+"analítico!"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr "(dejarlo vacío para hora actual)"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Horarios"
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+"Especifica la designación del empleado como un producto de tipo 'servicio'."
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "août"
+msgstr "agosto"
+
+#. 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 "Agosto"
+
+#. 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 "Junio"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Imprimir mi horario"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mars"
+msgstr "marzo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Fecha"
+
+#. 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 "Noviembre"
+
+#. module: hr_timesheet
+#: 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."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr "Fecha límite"
+
+#. 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 "Octubre"
+
+#. 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 "Enero"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr "Fechas clave"
+
+#. 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 "Jue"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr "Estadísticas de análisis"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr "Imprime el 'Parte de Horas del Empleado' y 'Mi Parte de Horas'"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "ID empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "Mi parte de horas"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis summary"
+msgstr "Resumen de análisis"
+
+#. 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 "Diciembre"
+
+#. 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 "Cancelar"
+
+#. 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 "Horario de empleados"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "février"
+msgstr "febrero"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Información"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "avril"
+msgstr "abril"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Fecha actual"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Anlytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr "Este asistente imprimirá el parte de horas mensual"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. 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 "Mayo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Tiempo total"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juin"
+msgstr "junio"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr "(hora local en el servidor)"
+
+#. module: hr_timesheet
+#: 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 "Working Hours"
+msgstr "Horas de trabajo"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr "Registrarse en un proyecto"
+
+#. 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 "Febrero"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic line"
+msgstr "Línea analítica"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr "Salir de un proyecto"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "octobre"
+msgstr "octubre"
+
+#. 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 "Abril"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+"No se ha definido una cuenta analítica para el proyecto.\n"
+"Por favor seleccione una o no se puede rellenar automáticamente la hoja de "
+"asistencia."
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mai"
+msgstr "mayo"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "Empezar a trabajar"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by user"
+msgstr "Estadísticas por usuario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "No employee defined for this user"
+msgstr "No se ha definido un empleado para este usuario"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner Id"
+msgstr "Id empresa"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr "Cambiar trabajo"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "septembre"
+msgstr "septiembre"
+
+#, python-format
+#~ msgid ""
+#~ "No analytic journal available for this employee.\n"
+#~ "Define an employee for the selected user and assign an analytic journal."
+#~ msgstr ""
+#~ "No se dispone de un diario analítico para este empleado.\n"
+#~ "Defina un empleado para el usuario seleccionado y asigne un diario analítico."
+
+#~ msgid "Day"
+#~ msgstr "Día"
+
+#~ msgid "My Working Hours"
+#~ msgstr "Mis horas de trabajo"
+
+#~ msgid "Timesheet Process"
+#~ msgstr "Proceso hoja de asistencia"
+
+#, python-format
+#~ msgid "ValidateError"
+#~ msgstr "Error de validación"
+
+#~ msgid "Sum"
+#~ msgstr "Suma"
+
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
+#~ 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 "Choose Users"
+#~ msgstr "Seleccionar usuarios"
+
+#~ msgid "Timesheet line"
+#~ msgstr "Línea de hoja de asistencia"
+
+#~ msgid "My Working Hours of The Day"
+#~ msgstr "Mis horas de trabajo del día"
+
+#~ 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 "Sign in status"
+#~ msgstr "Estado del registro de entrada"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Employee's name"
+#~ msgstr "Nombre de empleado"
+
+#~ msgid "Choose your month"
+#~ msgstr "Seleccionar su mes"
+
+#~ 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 "Working Time"
+#~ msgstr "Tiempo trabajado"
+
+#~ msgid "Current Server Date"
+#~ msgstr "Fecha actual del servidor"
+
+#~ msgid "Working Hours of The Day"
+#~ msgstr "Horas de trabajo del día"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ 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 "UnknownError"
+#~ msgstr "Error desconocido"
+
+#~ msgid "Consultancy - Senior Developer"
+#~ msgstr "Consultoría - Programador senior"
diff --git a/addons/hr_timesheet/i18n/es_VE.po b/addons/hr_timesheet/i18n/es_VE.po
new file mode 100644
index 00000000000..a702efe6d09
--- /dev/null
+++ b/addons/hr_timesheet/i18n/es_VE.po
@@ -0,0 +1,849 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_timesheet
+#
+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:15+0000\n"
+"PO-Revision-Date: 2011-01-18 09:14+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: 2011-09-05 05:24+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_timesheet
+#: model:product.template,name:hr_timesheet.product_consultant_product_template
+msgid "Service on Timesheet"
+msgstr "Servicio en parte de horas"
+
+#. 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 "Mié"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(Vacío para fecha actual)"
+
+#. 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 "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. 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 ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo repercutido en un "
+"proyecto imputa costes en esa cuenta analítica. Esta característica permite "
+"registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr "Parar de trabajar"
+
+#. 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 "Horario del empleado"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr "Estadísticas trabajo realizado"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Hoja de asistencia"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "janvier"
+msgstr "enero"
+
+#. 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 "Lun"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Registrar entrada"
+
+#. 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 ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo invertido en un "
+"proyecto genera costes en esa cuenta analítica. Esta característica permite "
+"registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr "Importe analítico mínimo"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr "Parte de horas mensual del Empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Trabajo realizado en el último período"
+
+#. module: hr_timesheet
+#: 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 para el cual el empleado sea el "
+"director."
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr "Estado actual"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "Nombre empleados"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Mostrar Parte de horas de los Empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. 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 "Error de usuario"
+
+#. 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 "¡No se ha definido una unidad de coste para este empleado!"
+
+#. 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 "Mar"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: hr_timesheet
+#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
+msgid "Human Resources (Timesheet encoding)"
+msgstr "Recursos humanos (codificación de horarios)"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr "Registrar entrada/salir por proyecto"
+
+#. 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 "Sáb"
+
+#. 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 "Dom"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Timesheet Lines"
+msgstr "Líneas de la hoja de asistencia"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juillet"
+msgstr "julio"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr "Parte de horas mensual de empleados"
+
+#. 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 "Julio"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "novembre"
+msgstr "noviembre"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"Through Working Hours you can register your working hours by project every "
+"day."
+msgstr ""
+"A través de las Horas de trabajo puede registrar sus horas laborables por "
+"proyecto todos los días."
+
+#. module: hr_timesheet
+#: model:ir.module.module,description:hr_timesheet.module_meta_information
+msgid ""
+"\n"
+"This module implements a timesheet system. Each employee can encode and\n"
+"track their time spent on the different projects. A project is an\n"
+"analytic account and the time spent on a project generates costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo implementa un sistema de parte de horas. Cada empleado puede "
+"imputar y\n"
+"llevar el registro del tiempo invertido en sus diferentes proyectos. Un "
+"proyecto es una\n"
+"cuenta analítica y el tiempo invertido en un proyecto genera costes en esa "
+"cuenta analítica.\n"
+"\n"
+"Se facilitan varios informes de seguimiento de tiempos y empleados.\n"
+"\n"
+"Está completamente integrado con el módulo de contabilidad de costes. "
+"Permite\n"
+"establecer una gestión por asunto.\n"
+"    "
+
+#. 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 "Marzo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr "Coste total"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "décembre"
+msgstr "diciembre"
+
+#. 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 "Septiembre"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de asistencia"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Estadísticas por mes"
+
+#. 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 "Mes"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "To be invoiced"
+msgstr "A facturar"
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr "Hoja de asistencia del empleado"
+
+#. 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 "Registrar entrada/salida por proyecto"
+
+#. 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 "Vie"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Registrar entrada/salida"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#, 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 ""
+"El diario analítico no está definido para el empleado %s\n"
+"¡Defina un empleado para el usuario seleccionado y asígnele un diario "
+"analítico!"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr "(dejarlo vacío para hora actual)"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Horarios"
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+"Especifica la designación del empleado como un producto de tipo 'servicio'."
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "août"
+msgstr "agosto"
+
+#. 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 "Agosto"
+
+#. 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 "Junio"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Imprimir mi horario"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mars"
+msgstr "marzo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Fecha"
+
+#. 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 "Noviembre"
+
+#. module: hr_timesheet
+#: 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."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr "Fecha límite"
+
+#. 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 "Octubre"
+
+#. 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 "Enero"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr "Fechas clave"
+
+#. 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 "Jue"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr "Estadísticas de análisis"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr "Imprime el 'Parte de Horas del Empleado' y 'Mi Parte de Horas'"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "ID empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "Mi parte de horas"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis summary"
+msgstr "Resumen de análisis"
+
+#. 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 "Diciembre"
+
+#. 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 "Cancelar"
+
+#. 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 "Horario de empleados"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "février"
+msgstr "febrero"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Información"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "avril"
+msgstr "abril"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Fecha actual"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Anlytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr "Este asistente imprimirá el parte de horas mensual"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. 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 "Mayo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Tiempo total"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juin"
+msgstr "junio"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr "(hora local en el servidor)"
+
+#. module: hr_timesheet
+#: 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 "Working Hours"
+msgstr "Horas de trabajo"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr "Registrarse en un proyecto"
+
+#. 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 "Febrero"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic line"
+msgstr "Línea analítica"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr "Salir de un proyecto"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "octobre"
+msgstr "octubre"
+
+#. 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 "Abril"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+"No se ha definido una cuenta analítica para el proyecto.\n"
+"Por favor seleccione una o no se puede rellenar automáticamente la hoja de "
+"asistencia."
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mai"
+msgstr "mayo"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "Empezar a trabajar"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by user"
+msgstr "Estadísticas por usuario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "No employee defined for this user"
+msgstr "No se ha definido un empleado para este usuario"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner Id"
+msgstr "Id empresa"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr "Cambiar trabajo"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "septembre"
+msgstr "septiembre"
+
+#, python-format
+#~ msgid ""
+#~ "No analytic journal available for this employee.\n"
+#~ "Define an employee for the selected user and assign an analytic journal."
+#~ msgstr ""
+#~ "No se dispone de un diario analítico para este empleado.\n"
+#~ "Defina un empleado para el usuario seleccionado y asigne un diario analítico."
+
+#~ msgid "Day"
+#~ msgstr "Día"
+
+#~ msgid "My Working Hours"
+#~ msgstr "Mis horas de trabajo"
+
+#~ msgid "Timesheet Process"
+#~ msgstr "Proceso hoja de asistencia"
+
+#, python-format
+#~ msgid "ValidateError"
+#~ msgstr "Error de validación"
+
+#~ msgid "Sum"
+#~ msgstr "Suma"
+
+#~ msgid "Hour"
+#~ msgstr "Hora"
+
+#~ 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 "Choose Users"
+#~ msgstr "Seleccionar usuarios"
+
+#~ msgid "Timesheet line"
+#~ msgstr "Línea de hoja de asistencia"
+
+#~ msgid "My Working Hours of The Day"
+#~ msgstr "Mis horas de trabajo del día"
+
+#~ 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 "Sign in status"
+#~ msgstr "Estado del registro de entrada"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Employee's name"
+#~ msgstr "Nombre de empleado"
+
+#~ msgid "Choose your month"
+#~ msgstr "Seleccionar su mes"
+
+#~ 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 "Working Time"
+#~ msgstr "Tiempo trabajado"
+
+#~ msgid "Current Server Date"
+#~ msgstr "Fecha actual del servidor"
+
+#~ msgid "Working Hours of The Day"
+#~ msgstr "Horas de trabajo del día"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ 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 "UnknownError"
+#~ msgstr "Error desconocido"
+
+#~ msgid "Consultancy - Senior Developer"
+#~ msgstr "Consultoría - Programador senior"
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index b5f4eadaa22..3e8756ae7ce 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Püh"
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr "Sulgemise kuupäev"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr "Võtmekuupäevad"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -700,12 +724,6 @@ msgstr "Vaheta tööd"
 msgid "septembre"
 msgstr ""
 
-#~ msgid "Print my timesheet"
-#~ msgstr "Prindi minu tööajaleht"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Töötajate tööajalehed"
-
 #~ msgid "Day"
 #~ msgstr "Päev"
 
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index c8193dcc712..f2cfbe0a3ac 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -14,17 +14,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Palvelu tuntilistalla"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Ke"
@@ -43,7 +43,7 @@ msgstr "Käyttäjälle ei ole määritetty työntekijää !"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr "tammikuu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Ma"
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Työntekijälle ei ole määritetty kustannuspaikkaa"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Ti"
@@ -198,18 +198,18 @@ msgstr "Henkilöstö (Tuntilistan koodaus)"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr ""
+msgstr "Kirjaudu sisään/ulos projekteittain"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "La"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Su"
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Työntekijän kuukauden tuntilista"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Heinäkuu"
@@ -252,7 +254,7 @@ msgstr "Aloituspäivämäärä"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriat"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -266,6 +268,7 @@ msgid ""
 "Through Working Hours you can register your working hours by project every "
 "day."
 msgstr ""
+"Työtuntien kautta voit kirjata päivittäsiet työtuntisi projektikohtaisesti."
 
 #. module: hr_timesheet
 #: model:ir.module.module,description:hr_timesheet.module_meta_information
@@ -284,8 +287,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maaliskuu"
@@ -302,8 +307,10 @@ msgid "décembre"
 msgstr "joulukuu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Syyskuu"
@@ -352,8 +359,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Kirjaudu Sisään/Ulos projektista"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Pe"
@@ -393,15 +400,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Elokuu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Kesäkuu"
@@ -423,8 +434,10 @@ msgid "Date"
 msgstr "Päivämäärä"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Marraskuu"
@@ -432,7 +445,7 @@ msgstr "Marraskuu"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Virhe! Et voi luoda itseään toistavaa työntekijähierarkiaa."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -440,15 +453,19 @@ msgid "Closing Date"
 msgstr "Päättymispäivämäärä"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Lokakuu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tammikuu"
@@ -459,8 +476,8 @@ msgid "Key dates"
 msgstr "Avainpäivämäärät"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "To"
@@ -497,8 +514,10 @@ msgid "Analysis summary"
 msgstr "Analyysin yhteenveto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Joulukuu"
@@ -528,7 +547,7 @@ msgstr "helmikuu"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr ""
+msgstr "Tiedot"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
@@ -551,7 +570,7 @@ msgstr "Nykyinen päivämäärä"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Anlytic account"
-msgstr ""
+msgstr "Analyyttinen tili"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -570,8 +589,10 @@ msgid "Invoicing"
 msgstr "Laskutus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Toukokuu"
@@ -601,11 +622,13 @@ msgstr "Työtunnit"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr ""
+msgstr "Kirjaudu projektille"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Helmikuu"
@@ -618,7 +641,7 @@ msgstr "Analyyttinen rivi"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr ""
+msgstr "Kijraudu ulos projektilta"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -632,8 +655,10 @@ msgid "octobre"
 msgstr "lokakuu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Huhtikuu"
@@ -672,7 +697,7 @@ msgstr "Käyttäjätilastot"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
-msgstr ""
+msgstr "Käyttäjälle ei ole määritelty työntekijää"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 69363d2a9ee..7f04889ecee 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 10:09+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\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"
@@ -25,8 +25,8 @@ msgid "Service on Timesheet"
 msgstr "Service sur feuille de temps"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Mer"
@@ -99,8 +99,8 @@ msgid "janvier"
 msgstr "janvier"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Lun"
@@ -184,8 +184,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Pas d'unité de coût définit pour cet utilisateur"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Mar"
@@ -213,15 +213,15 @@ msgid "Sign In/Out By Project"
 msgstr "Entrée/Sortie par projet"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sam"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dim"
@@ -249,8 +249,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Feuille de temps mensuelle des employés"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juillet"
@@ -309,8 +311,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mars"
@@ -327,8 +331,10 @@ msgid "décembre"
 msgstr "décembre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Septembre"
@@ -377,8 +383,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Pointages des entrées/sorties par projets"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Ven"
@@ -421,15 +427,19 @@ msgid "août"
 msgstr "août"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Août"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juin"
@@ -451,8 +461,10 @@ msgid "Date"
 msgstr "Date"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Novembre"
@@ -469,15 +481,19 @@ msgid "Closing Date"
 msgstr "Date de clôture"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Octobre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Janvier"
@@ -488,8 +504,8 @@ msgid "Key dates"
 msgstr "Dates clés"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Jeu"
@@ -527,8 +543,10 @@ msgid "Analysis summary"
 msgstr "Résumé analyse"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Décembre"
@@ -600,8 +618,10 @@ msgid "Invoicing"
 msgstr "Facturation"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mai"
@@ -634,8 +654,10 @@ msgid "Sign In By Project"
 msgstr "Entrée par projet"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Février"
@@ -662,8 +684,10 @@ msgid "octobre"
 msgstr "octobre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Avril"
@@ -734,15 +758,6 @@ msgstr "Changer de travail"
 msgid "septembre"
 msgstr "septembre"
 
-#~ msgid "Employees timesheet"
-#~ msgstr "Timesheet des employés"
-
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consultance – Développeur senior"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Imprimer ma feuille de présence"
-
 #~ msgid "Day"
 #~ msgstr "Jour"
 
@@ -821,9 +836,3 @@ msgstr "septembre"
 #~ "Aucun journal analytique disponible pour cet employé.\n"
 #~ "Définissez un employé pour l'utilisateur sélectionné et assignez lui un "
 #~ "journal analytique."
-
-#~ msgid ""
-#~ "Working Hours allows you to log your working hours by project every day."
-#~ msgstr ""
-#~ "Heures travaillées vous permet de garder l'historique des heures travaillés "
-#~ "par projet tous les jours."
diff --git a/addons/hr_timesheet/i18n/gl.po b/addons/hr_timesheet/i18n/gl.po
index fefadbb1e1a..c62a65ff15a 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: 2011-05-10 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index 9f0de090d1a..f46d3bdc1ce 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: hr_timesheet
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr "Siječanj"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -201,15 +201,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -284,8 +286,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -302,8 +306,10 @@ msgid "décembre"
 msgstr "Prosinac"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -352,8 +358,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Prijava / Odjava po Projektu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -393,15 +399,19 @@ msgid "août"
 msgstr "\"août\""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -423,8 +433,10 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -440,15 +452,19 @@ msgid "Closing Date"
 msgstr "Datum zaključenja"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -459,8 +475,8 @@ msgid "Key dates"
 msgstr "Ključni datumi"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -497,8 +513,10 @@ msgid "Analysis summary"
 msgstr "Zbirna Analiza"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -570,8 +588,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -604,8 +624,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -632,8 +654,10 @@ msgid "octobre"
 msgstr "Listopad"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -776,289 +800,3 @@ msgstr "Rujan"
 
 #~ msgid "Working Time"
 #~ msgstr "Radno vrijeme"
-
-#~ msgid "Review end of day check day is complete"
-#~ msgstr "Pregled na kraju dana je završen"
-
-#~ msgid ""
-#~ "You can not have 2 timesheets that overlaps !\n"
-#~ "Please use the menu 'My Current Timesheet' to avoid this problem."
-#~ msgstr ""
-#~ "Ne možete imati dvije Kontrolne Kartice koje se preklapaju.\n"
-#~ "Koristite Izbornik \"Moja tekuća Kontrolna Kartica\" kako biste izbjegli taj "
-#~ "problem."
-
-#~ msgid "Sheet"
-#~ msgstr "Lista"
-
-#~ msgid "Total Attendance"
-#~ msgstr "Ukupna Nazočnost"
-
-#~ msgid "My timesheets to confirm"
-#~ msgstr "Moje Kontrolne Karicte za potvrdu"
-
-#~ msgid "Timeshet range"
-#~ msgstr "Raspon vremena Kontrolne Kartice"
-
-#~ msgid "Confirm timesheet sheet"
-#~ msgstr "Potvrdi Listu Kontrolne Kartice"
-
-#~ msgid "Set to Draft"
-#~ msgstr "Vrati na predložak"
-
-#~ msgid "Defines employee's timesheet entry"
-#~ msgstr "Definraj ulazni podatak Kontrolne Kartice djelatnika"
-
-#~ msgid "Draft Timesheet sheet"
-#~ msgstr "Predložak liste Kontrolne Kartice"
-
-#~ msgid "My Current Timesheet"
-#~ msgstr "Moja tekuća Kontrolna Kartica"
-
-#~ msgid "Validate"
-#~ msgstr "Vrednuj"
-
-#~ msgid "Present"
-#~ msgstr "Prisutan"
-
-#~ msgid "Validated Timesheet"
-#~ msgstr "Vrednovana Kontrolna Kartica"
-
-#~ msgid "You must select a Current date wich is in the timesheet dates !"
-#~ msgstr ""
-#~ "Morate odabrati Tekući datum koji je u okviru datuma Kontrolne Kartice"
-
-#~ msgid "Total Difference"
-#~ msgstr "Ukupna razlika"
-
-#~ msgid "Phone call encoding"
-#~ msgstr "Šifriranje telefonskog poziva"
-
-#~ msgid "Timesheet by Day"
-#~ msgstr "Kontrolna Kartica po danu"
-
-#~ msgid "Defines the task work entry into timesheet line"
-#~ msgstr "Definira ulazni podatak zadanog posla u liniji Kontrolne Kartice"
-
-#~ msgid ""
-#~ "Allowed difference between the sign in/out and the timesheet computation for "
-#~ "one sheet. Set this to 0 if you do not want any control."
-#~ msgstr ""
-#~ "Dopuštena razlika između prijave/odjave i obračuna Kontrolne Kartice za "
-#~ "jednu listu. Postavite na 0 ako ne želite kontrolu nad time."
-
-#~ msgid "Timesheet by Days"
-#~ msgstr "Kontrolne Kartice po danima"
-
-#~ msgid "timesheet is confirmed at the end of the week / month"
-#~ msgstr "Kontolna Kartica potvrđena je na kraju Tjedna / Mjeseca"
-
-#~ msgid "Project Timesheet"
-#~ msgstr "Kontrolna Kartica Projekta"
-
-#~ msgid "Date from"
-#~ msgstr "Datum od"
-
-#~ msgid "Hr Timesheet Process"
-#~ msgstr "Proces Kontrolne kartice Ljudskih Resursa"
-
-#~ msgid "Analytic cost"
-#~ msgstr "Analitički trošak"
-
-#~ msgid "Confirmed"
-#~ msgstr "Potvrđen"
-
-#~ msgid "Attendance"
-#~ msgstr "Nazočnost"
-
-#~ msgid "Confirm"
-#~ msgstr "Potvrdi"
-
-#~ msgid "Timesheet lines"
-#~ msgstr "Linije Kontrolne kartice"
-
-#~ msgid "Encode your timesheet line"
-#~ msgstr "Šifriraj liniju Kontrolne Kartice"
-
-#~ msgid "Confirm Timesheet"
-#~ msgstr "Potvrdi Kontrolnu Karticu"
-
-#~ msgid "Control by the project manager"
-#~ msgstr "Kontrolira Voditelj Projekta"
-
-#~ msgid "New"
-#~ msgstr "Novi"
-
-#~ msgid "Timesheet sheet confirm at the end of the period"
-#~ msgstr "Potvrdi Listu Kontrolne Kartice na kraju razdoblja"
-
-#~ msgid "Total Time"
-#~ msgstr "Ukupno vrijeme"
-
-#~ msgid "Confirm timesheet at the end of the period"
-#~ msgstr "Potvrdi Kontrolnu Karticu na kraju razdoblja"
-
-#~ msgid "No employee defined"
-#~ msgstr "Nema definiranog Djelatnika"
-
-#~ msgid "Confirmed Timesheet"
-#~ msgstr "Potvrdi Kontrolnu Karticu"
-
-#~ msgid "Configuration"
-#~ msgstr "Konfiguracija"
-
-#~ msgid "Week"
-#~ msgstr "Tjedan"
-
-#~ msgid "Daily View"
-#~ msgstr "Dnevni Prikaz"
-
-#~ msgid "Timesheets by period"
-#~ msgstr "Kontrolne Kartice po razdoblju"
-
-#~ msgid "Sign In"
-#~ msgstr "Prijava"
-
-#~ msgid "My Department's Timesheet"
-#~ msgstr "Kontrolna Kartica mog Odjela"
-
-#~ msgid "Go to:"
-#~ msgstr "idi na:"
-
-#~ msgid "Phone call"
-#~ msgstr "Tel. poziv"
-
-#~ msgid "Total Timesheet"
-#~ msgstr "Zbirna Kontrolna Kartica"
-
-#~ msgid "Review of work"
-#~ msgstr "Pregled Rada"
-
-#~ msgid "Invoice on Work"
-#~ msgstr "Obračun obavljenog posla"
-
-#~ msgid "Encode Your hours and Sign in / out"
-#~ msgstr "Šifrirajte svoje radne sate i Prijavu / Odjavu"
-
-#~ msgid "Review"
-#~ msgstr "Pregled"
-
-#~ msgid "Draft"
-#~ msgstr "Predložak"
-
-#~ msgid "Timesheets To Confirm"
-#~ msgstr "Kontrolne Kartice za Potvrdu"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Date to"
-#~ msgstr "Datum do"
-
-#~ msgid "Current Status"
-#~ msgstr "Tekući Status"
-
-#~ msgid "Invoice on timesheet"
-#~ msgstr "Račun prema Kontrolnoj Kartici"
-
-#~ msgid "Invoice based on timesheet"
-#~ msgstr "Račun na osnovi Kontrolne Kartice"
-
-#~ msgid "Timesheet by Account"
-#~ msgstr "Kontrolna Kartica prema Stranki-Kontu"
-
-#~ msgid "Creates invoice based on timesheet"
-#~ msgstr "Kreira račun na osnovi Kontrolne Kartice"
-
-#~ msgid "Timesheets To Validate"
-#~ msgstr "Kontrolne kartice za vrednovanje"
-
-#~ msgid "Timesheet allowed difference"
-#~ msgstr "Dopuštena razlika na Kontrolnoj Kartici"
-
-#~ msgid "Period"
-#~ msgstr "Razdoblje"
-
-#~ msgid "Done"
-#~ msgstr "Gotovo"
-
-#~ msgid "Attendance entry moves into the timesheet"
-#~ msgstr "Ulazni podatak Nazočnosti prebacuje se u Kontrolnu Karticu"
-
-#~ msgid "Creates your analytic cost accoording to quantity"
-#~ msgstr "Kreira Vaš Analitički trošak na osnovi količine"
-
-#~ msgid "Timesheet by Accounts"
-#~ msgstr "Kontrolne Kartie prema Strankama-Kontima"
-
-#~ msgid "Timesheet is validate by project manager."
-#~ msgstr "Kontrolnu Karticu vrednuje Voditelj Projekta"
-
-#~ msgid "Whatever time u spent for phone call"
-#~ msgstr "Koliko god ste vremena proveli telefonirajući"
-
-#~ msgid "Validate Timesheet"
-#~ msgstr "Vrednij Kontrolnu Karticu"
-
-#~ msgid "My Department's Timesheet to Confirm"
-#~ msgstr "Kontrolne Kartice mog odjela za Potvrdu"
-
-#~ msgid "Attendances"
-#~ msgstr "Nazočnosti"
-
-#~ msgid "Create Analytic cost"
-#~ msgstr "Kreiraj Anlitički trošak"
-
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#~ msgid "Sign Out"
-#~ msgstr "Odjava"
-
-#~ msgid "By Day"
-#~ msgstr "Po danu"
-
-#~ msgid "Difference"
-#~ msgstr "Razlika"
-
-#~ msgid "hr_timesheet_sheet.sheet"
-#~ msgstr "hr_timesheet_sheet.sheet"
-
-#~ msgid "Absent"
-#~ msgstr "Odsutan"
-
-#~ msgid "At the end of the period (week/month)"
-#~ msgstr "Na kraju razdoblja (tjedan/mjesec)"
-
-#~ msgid "timesheet entry is into draft state."
-#~ msgstr "Ulazni podatak Kontrolne Kartice je u stanju Predloška"
-
-#~ msgid "Analytic cost is created"
-#~ msgstr "Kreiran je Analitički trošak"
-
-#~ msgid "Invoice rate"
-#~ msgstr "Stavka računa"
-
-#~ msgid "Encode how much time u spent on phone call"
-#~ msgstr "Šifrirajte koliko ste vremena proveli na telefonu"
-
-#~ msgid "Review of your work at the end of the day"
-#~ msgstr "Revidirajte rad na kraju dana"
-
-#~ msgid "Analytic accounts"
-#~ msgstr "Analitička Konta"
-
-#~ msgid "My timesheets"
-#~ msgstr "Moje Kontrolne Kartice"
-
-#~ msgid "Accept"
-#~ msgstr "Prihvati"
-
-#~ msgid "Current date"
-#~ msgstr "Tekući Datum"
-
-#~ msgid "Unvalidated Timesheets"
-#~ msgstr "Nevrednovana Kontrolna Kartica"
-
-#~ msgid "My Department's Timesheet to Validate"
-#~ msgstr "Kontrolne Kartice mog odjela za Potvrdu"
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index f5f34636bfb..39d18285729 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 10:43+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr "Szolgáltatás munkaidő-kimutatás alapján"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Sze"
@@ -96,8 +97,8 @@ msgid "janvier"
 msgstr "január"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "H"
@@ -181,8 +182,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Nem állítottak be költségegységet erre az alkalmazottra!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "K"
@@ -210,15 +211,15 @@ msgid "Sign In/Out By Project"
 msgstr "Be- és kilépés projektek szerint"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Szo"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "V"
@@ -246,8 +247,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Havi alkalmazotti munkaidő-kimutatás"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Július"
@@ -306,8 +309,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Március"
@@ -324,8 +329,10 @@ msgid "décembre"
 msgstr "december"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Szeptember"
@@ -374,8 +381,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Projektbe bejelentkezés/kijelentkezés"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "P"
@@ -420,15 +427,19 @@ msgid "août"
 msgstr "augusztus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Augusztus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Június"
@@ -450,8 +461,10 @@ msgid "Date"
 msgstr "Dátum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "November"
@@ -467,15 +480,19 @@ msgid "Closing Date"
 msgstr "Zárás időpontja"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Október"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Január"
@@ -486,8 +503,8 @@ msgid "Key dates"
 msgstr "Fontos dátumok"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Cs"
@@ -524,8 +541,10 @@ msgid "Analysis summary"
 msgstr "Elemzés összesító"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "December"
@@ -597,8 +616,10 @@ msgid "Invoicing"
 msgstr "Számlázás"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Május"
@@ -631,8 +652,10 @@ msgid "Sign In By Project"
 msgstr "Bejelentkezés projektenként"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Február"
@@ -659,8 +682,10 @@ msgid "octobre"
 msgstr "október"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Április"
@@ -730,23 +755,3 @@ msgstr "Másik munkára váltás"
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "septembre"
 msgstr "szeptember"
-
-#~ msgid ""
-#~ "Analytic journal is not defined for employee %s \n"
-#~ "\"\n"
-#~ "\"Define an employee for the selected user and assign an analytic journal!"
-#~ msgstr ""
-#~ "%s munkavállalóra nincs meghatározva gyűjtő napló. \n"
-#~ "\"\n"
-#~ "\"A kiválasztott felhasználóra definiáljon egy munkavállalót és jelöljön ki "
-#~ "egy gyűjtő naplót!"
-
-#~ msgid ""
-#~ "No analytic account defined on the project.\n"
-#~ "\"\n"
-#~ "\"Please set one or we can not automatically fill the timesheet."
-#~ msgstr ""
-#~ "A projekthez nincs gyűjtőkód meghatározva. \n"
-#~ "\"\n"
-#~ "\"Kérem, állítsa be, vagy a rendszer nem tudja automatikusan kitölteni a "
-#~ "munkaidő-kimutatást."
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index d6d423fa1be..52a3fa80ab1 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr "Pelayanan Timesheet"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Senin"
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -201,15 +201,15 @@ msgid "Sign In/Out By Project"
 msgstr "Sign In / Out Berdasarkan Proyek"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sabtu"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Minggu"
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Timesheet Bulanan Karyawan"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juli"
@@ -301,8 +303,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maret"
@@ -319,8 +323,10 @@ msgid "décembre"
 msgstr "Desember"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "September"
@@ -369,8 +375,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -410,15 +416,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -440,8 +450,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -457,15 +469,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -476,8 +492,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -514,8 +530,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -587,8 +605,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -621,8 +641,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -649,8 +671,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index 6ceb32d5b78..b73561d97d4 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr "Servizio su timesheet"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Mercoledi"
@@ -96,8 +96,8 @@ msgid "janvier"
 msgstr "gennaio"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Lun"
@@ -181,8 +181,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Nessuna unità di costo definito per questo impiegato !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Mar"
@@ -210,15 +210,15 @@ msgid "Sign In/Out By Project"
 msgstr "Ingresso/Uscita per Progetto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sab"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dom"
@@ -246,8 +246,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Timesheet mensili impiegati"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Luglio"
@@ -309,8 +311,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Marzo"
@@ -327,8 +331,10 @@ msgid "décembre"
 msgstr "dicembre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Settembre"
@@ -377,8 +383,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Entrate/Uscite per Progetto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Ven"
@@ -419,15 +425,19 @@ msgid "août"
 msgstr "agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Giugno"
@@ -449,8 +459,10 @@ msgid "Date"
 msgstr "Data"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Novembre"
@@ -466,15 +478,19 @@ msgid "Closing Date"
 msgstr "Data di fine"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Ottobre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Gennaio"
@@ -485,8 +501,8 @@ msgid "Key dates"
 msgstr "Fate Chiave"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Gio"
@@ -523,8 +539,10 @@ msgid "Analysis summary"
 msgstr "Riepilogo Analisi"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Dicembre"
@@ -596,8 +614,10 @@ msgid "Invoicing"
 msgstr "Fatturazione"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maggio"
@@ -630,8 +650,10 @@ msgid "Sign In By Project"
 msgstr "Entrata per progetto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Febbraio"
@@ -658,8 +680,10 @@ msgid "octobre"
 msgstr "ottobre"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Aprile"
@@ -730,15 +754,6 @@ msgstr "Cambia Lavoro"
 msgid "septembre"
 msgstr "settembre"
 
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consulenza - Sviluppatore Senior"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Orari di Lavoro dei Dipendenti"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Stampa il Mio Orario di Lavoro"
-
 #, python-format
 #~ msgid ""
 #~ "No analytic journal available for this employee.\n"
@@ -829,24 +844,6 @@ msgstr "settembre"
 #~ msgid "Consultancy - Senior Developer"
 #~ msgstr "Consulenza - Sviluppatore Senjor"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non puoi creare un menù ricorsivo"
-
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "ErroreSconosciuto"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "Working Hours allows you to log your working hours by project every day."
-#~ msgstr ""
-#~ "Le Ore Lavorate ti permettono di registrare le tue ore lavorate sul progetto "
-#~ "ogni giorno."
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index 8a2d7c912ad..3fd02b6b93f 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "수요일"
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "월요일"
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "이 직원에게 정의된 비용 단위가 없습니다!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "화요일"
@@ -201,15 +201,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "일요일"
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "7월"
@@ -284,8 +286,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "3월"
@@ -302,8 +306,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "9월"
@@ -352,8 +358,8 @@ msgid "Sign in / Sign out by project"
 msgstr "프로젝트 별 Sign in / Sign out"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "금요일"
@@ -393,15 +399,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "8월"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "6월"
@@ -423,8 +433,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "11월"
@@ -440,15 +452,19 @@ msgid "Closing Date"
 msgstr "마감 날짜"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "10월"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "1월"
@@ -459,8 +475,8 @@ msgid "Key dates"
 msgstr "핵심 날짜"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "목요일"
@@ -497,8 +513,10 @@ msgid "Analysis summary"
 msgstr "분석 요약"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "12월"
@@ -570,8 +588,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "5월"
@@ -604,8 +624,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "2월"
@@ -632,8 +654,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "4월"
@@ -744,12 +768,6 @@ msgstr ""
 #~ msgid "User"
 #~ msgstr "사용자"
 
-#~ msgid "Print my timesheet"
-#~ msgstr "내 타임시트 인쇄"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "직원 타임시트"
-
 #~ msgid "Employee's name"
 #~ msgstr "직원 이름"
 
@@ -762,9 +780,6 @@ msgstr ""
 #~ msgid "Current Server Date"
 #~ msgstr "현재 서버 날짜"
 
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "컨설팅 - 시니어 개발자"
-
 #~ msgid "Total"
 #~ msgstr "합계"
 
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index 8ab3ae08877..35b5d5cb589 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index ffd59b1761d..f76d25332f8 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr "Pakalpojums bāzēts uz Darba laika uzskaites Tabelēm"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Trešd."
@@ -96,8 +96,8 @@ msgid "janvier"
 msgstr "janvāris"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Pirmd."
@@ -179,8 +179,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Šim lietotājam nav definēta standarta izmaksu vienība!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Otrd."
@@ -208,15 +208,15 @@ msgid "Sign In/Out By Project"
 msgstr "Reģistrēties/Iziet Projekta Ietvaros"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sestd."
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Svētd."
@@ -244,8 +244,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Darbinieku darba laika uzskaites Tabele (Mēnesis)"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Jūlijs"
@@ -301,8 +303,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Marts"
@@ -319,8 +323,10 @@ msgid "décembre"
 msgstr "decembris"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Septembris"
@@ -369,8 +375,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Piereģistrēties / Izrakstīties Projekta ietvaros"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Piektd."
@@ -413,15 +419,19 @@ msgid "août"
 msgstr "augusts"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Augusts"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Jūnijs"
@@ -443,8 +453,10 @@ msgid "Date"
 msgstr "Datums"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Novembris"
@@ -460,15 +472,19 @@ msgid "Closing Date"
 msgstr "Beigu Datums"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Oktobris"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Janvāris"
@@ -479,8 +495,8 @@ msgid "Key dates"
 msgstr "Svarīgākie datumi"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Ceturtd."
@@ -517,8 +533,10 @@ msgid "Analysis summary"
 msgstr "Analītiskās statistikas kopsavilkums"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Decembris"
@@ -590,8 +608,10 @@ msgid "Invoicing"
 msgstr "Rēķinu izrakstīšana"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maijs"
@@ -624,8 +644,10 @@ msgid "Sign In By Project"
 msgstr "Reģistrēties Projekta ietvaros"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Februāris"
@@ -652,8 +674,10 @@ msgid "octobre"
 msgstr "oktobris"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Aprīlis"
@@ -761,12 +785,6 @@ msgstr "septembris"
 #~ msgid "User"
 #~ msgstr "Lietotājs"
 
-#~ msgid "Print my timesheet"
-#~ msgstr "Drukāt manu darba laika uzskaites tabeli"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Darbinieka darba laika uzskaites tabele"
-
 #~ msgid "Employee's name"
 #~ msgstr "Darbinieka vārds"
 
@@ -810,9 +828,6 @@ msgstr "septembris"
 #~ msgstr ""
 #~ "Kļūda: Mērv. pēc noklusējuma ir jābūt vienā kategorijā ar iepirkuma mērv."
 
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Konsultācijas - Vecākais Izstrādātājs"
-
 #, python-format
 #~ msgid "UnknownError"
 #~ msgstr "Nezināma Kļūda"
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index 97227b2f846..9d6484660dd 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr "Цаг бүртгэлд үндэслэсэн үйлчилгээ"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Лхагва"
@@ -95,8 +95,8 @@ msgid "janvier"
 msgstr "1 сар"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Даваа"
@@ -178,8 +178,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Энэ ажилтны мэдээлэлд өртөг тодорхойлоглоогүй байна !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Мягмар"
@@ -207,15 +207,15 @@ msgid "Sign In/Out By Project"
 msgstr "Нэвтэрсэн, гарсан үйлдлийг төслөөр харах"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Ням"
@@ -243,8 +243,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Ажилтны сарын  цаг бүртгэл"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "7 сар"
@@ -290,8 +292,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "3 сар"
@@ -308,8 +312,10 @@ msgid "décembre"
 msgstr "12 сар"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "9 сар"
@@ -358,8 +364,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Нэвтрэх, гарах үйлдлийг төслөөр харах"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Баасан"
@@ -401,15 +407,19 @@ msgid "août"
 msgstr "8 сар"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "8 сар"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "6 сар"
@@ -431,8 +441,10 @@ msgid "Date"
 msgstr "Огноо"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "11 сар"
@@ -448,15 +460,19 @@ msgid "Closing Date"
 msgstr "Хаасан өдөр"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "10 сар"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "1 сар"
@@ -467,8 +483,8 @@ msgid "Key dates"
 msgstr "Түлхүүр(чухал) огноо"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Мягмар"
@@ -505,8 +521,10 @@ msgid "Analysis summary"
 msgstr "Шинжилгээний товчоо"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "12 сар"
@@ -578,8 +596,10 @@ msgid "Invoicing"
 msgstr "Нэхэмжилж байгаа"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "5 сар"
@@ -612,8 +632,10 @@ msgid "Sign In By Project"
 msgstr "Нэвтрэх үйлдлийг төслөөр харах"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "2 сар"
@@ -640,8 +662,10 @@ msgid "octobre"
 msgstr "10 сар"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "4 сар"
@@ -726,13 +750,6 @@ msgstr "9 сар"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Алдаа: Борлуулалтын нэгж нь хэмжих нэгжээс өөр ангилалд байх ёстой"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
-
-#~ msgid "This Wizard will make Sign In/Out By Project"
-#~ msgstr ""
-#~ "Дэлгэцийн энэ оролт нь нэвтрэх гарах үйлдлийг төслөөр харахад тусална"
-
 #~ msgid "Choose your month"
 #~ msgstr "Сарыг сонгоноу уу"
 
@@ -742,11 +759,6 @@ msgstr "9 сар"
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
 
-#~ msgid ""
-#~ "Working Hours allows you to log your working hours by project every day."
-#~ msgstr ""
-#~ "Ажлын цаг нь өдөр бүр төсөл бүрээр ажилласан цагаа хөтлөх боломж олгоно."
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -796,29 +808,3 @@ msgstr "9 сар"
 
 #~ msgid "Working Time"
 #~ msgstr "Ажлын цаг"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module implements a timesheet system. Each employee can encode and\n"
-#~ "track their time spent on the different projects. A project is an\n"
-#~ "analytic account and the time spent on a project generates costs on\n"
-#~ "the analytic account.\n"
-#~ "\n"
-#~ "Lots of reporting on time and employee tracking are provided.\n"
-#~ "\n"
-#~ "It is completely integrated with the cost accounting module. It allows you\n"
-#~ "to set up a management by affair.\n"
-#~ "   "
-#~ msgstr ""
-#~ "\n"
-#~ "Энэ модуль цаг бүртгэлийг зохицуулна.  Ажилтан бүр  янз бүрийн төслүүдэд\n"
-#~ "ажилласан хугацаагаа бүртгэж хянана. Төсөл нь аналитик данс бөгөөд\n"
-#~ "энэ аналитик дансанд төсөл дээр ажилласан \n"
-#~ "цагаар өртөг үүсгэнэ.\n"
-#~ "\n"
-#~ "Ажилтны цагийг хянах олон тайлан бий.\n"
-#~ "\n"
-#~ "Энэ нь өртөг бүртгэх модультай бүрэн уялдсан. Энэ нь ажил хэргийн\n"
-#~ "удирдагыг \n"
-#~ "тохируулах боломж олгоно.\n"
-#~ "   "
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
index 755d78ae6b1..66e4d711b42 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Ons"
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Man"
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Ingen kostenhet angitt for denne brukeren !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Tir"
@@ -201,15 +201,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Lør"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Søn"
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juli"
@@ -284,8 +286,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mars"
@@ -302,8 +306,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "September"
@@ -352,8 +358,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Fre"
@@ -393,15 +399,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juni"
@@ -423,8 +433,10 @@ msgid "Date"
 msgstr "Dato"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "November"
@@ -440,15 +452,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Januar"
@@ -459,8 +475,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Tor"
@@ -497,8 +513,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Desember"
@@ -570,8 +588,10 @@ msgid "Invoicing"
 msgstr "Fakturering"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mai"
@@ -604,8 +624,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Februar"
@@ -632,8 +654,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "April"
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index b229b7760ec..e824d628439 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr "Diensten op urenverantwoording"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Wo"
@@ -96,8 +96,8 @@ msgid "janvier"
 msgstr "januari"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Ma"
@@ -180,8 +180,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Geen kosteneenheid gedefinieerd voor deze werknemer"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "di"
@@ -209,15 +209,15 @@ msgid "Sign In/Out By Project"
 msgstr "In-/Uitklokken per project"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Zat"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Zon"
@@ -245,8 +245,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Maandelijkse urenverantwoording medewerker"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juli"
@@ -307,8 +309,10 @@ msgstr ""
 "    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maart"
@@ -325,8 +329,10 @@ msgid "décembre"
 msgstr "december"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "September"
@@ -375,8 +381,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Klok in / Klok uit per project"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Vr"
@@ -420,15 +426,19 @@ msgid "août"
 msgstr "augustus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Augustus"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Juni"
@@ -450,8 +460,10 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "November"
@@ -467,15 +479,19 @@ msgid "Closing Date"
 msgstr "Afsluitdatum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Januari"
@@ -486,8 +502,8 @@ msgid "Key dates"
 msgstr "Sleutel data"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Do"
@@ -524,8 +540,10 @@ msgid "Analysis summary"
 msgstr "Samenvatting analyse"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "December"
@@ -597,8 +615,10 @@ msgid "Invoicing"
 msgstr "Facturatie"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mei"
@@ -631,8 +651,10 @@ msgid "Sign In By Project"
 msgstr "Inklokken op project"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Februari"
@@ -659,8 +681,10 @@ msgid "octobre"
 msgstr "oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "April"
@@ -731,9 +755,6 @@ msgstr "Verander taak"
 msgid "septembre"
 msgstr "september"
 
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consultancy - Senior ontwikkelaar"
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Fout: Ongeldige EAN-code"
 
@@ -777,12 +798,6 @@ msgstr "september"
 #~ msgid "Timesheet Process"
 #~ msgstr "Urenstaat proces"
 
-#~ msgid "Print my timesheet"
-#~ msgstr "Mijn urenstaat afdrukken"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Urenstaat werknemers"
-
 #, python-format
 #~ msgid ""
 #~ "No analytic journal available for this employee.\n"
@@ -831,20 +846,3 @@ msgstr "september"
 
 #~ msgid "Timesheet line"
 #~ msgstr "Regel urenstaat"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid ""
-#~ "Working Hours allows you to log your working hours by project every day."
-#~ msgstr ""
-#~ "Gewerkte uren laat u dagelijks uw gewerkte uren per project vastleggen."
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index d7cb7cfcf1d..21fc894caaa 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Wejście/Wyjście wg projektów"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr "Data zamknięcia"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr "Kluczowe daty"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr "Podsumowanie analizy"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -746,15 +770,9 @@ msgstr ""
 #~ msgid "User"
 #~ msgstr "Użytkownik"
 
-#~ msgid "Print my timesheet"
-#~ msgstr "Drukuj moją kartę czasu pracy"
-
 #~ msgid "Choose your month"
 #~ msgstr "Wybierz miesiąc"
 
-#~ msgid "Employees timesheet"
-#~ msgstr "Karta czasu pracy pracownika"
-
 #~ msgid "Employee's name"
 #~ msgstr "Nazwisko pracownika"
 
@@ -764,9 +782,6 @@ msgstr ""
 #~ msgid "Current Server Date"
 #~ msgstr "Bieżąca data na serwerze"
 
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Konsultacje - Projektant senior"
-
 #~ msgid "Total"
 #~ msgstr "Suma"
 
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index c62c3d27f5d..1b89fc471ff 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Qua"
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Seg."
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Nenhuma unidade de custo definida para este funcionário !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Ter"
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sáb"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dom"
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Julho"
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Março"
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Setembro"
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Entrar / sair por projecto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Sex"
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Junho"
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Novembro"
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr "Data de Fecho"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Outubro"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Janeiro"
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr "Datas chave"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Qui"
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr "Sumário de análises"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Dezembro"
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maio"
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Fevereiro"
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Abril"
@@ -702,15 +726,6 @@ msgstr "Mudar Trabalho"
 msgid "septembre"
 msgstr ""
 
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consulta - Desenvolvedor Senior"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Horário dos empregados"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Imprimir meu horáio"
-
 #~ msgid "Sum"
 #~ msgstr "Soma"
 
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index a6d3262aeb6..542746605af 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Qua"
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Seg"
@@ -174,8 +174,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Nenhuma unidade de custo definida para este funcionário !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Ter"
@@ -203,15 +203,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sáb"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dom"
@@ -239,8 +239,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Julho"
@@ -286,8 +288,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Março"
@@ -304,8 +308,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Setembro"
@@ -354,8 +360,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Entrada / Saída por projeto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Sex"
@@ -395,15 +401,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Agosto"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Junho"
@@ -425,8 +435,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Novembro"
@@ -442,15 +454,19 @@ msgid "Closing Date"
 msgstr "Data de Fechamento"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Outubro"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Janeiro"
@@ -461,8 +477,8 @@ msgid "Key dates"
 msgstr "Datas chave"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Qui"
@@ -499,8 +515,10 @@ msgid "Analysis summary"
 msgstr "Sumário de análise"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Dezembro"
@@ -572,8 +590,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Maio"
@@ -606,8 +626,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Fevereiro"
@@ -634,8 +656,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Abril"
@@ -724,12 +748,3 @@ msgstr ""
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: código EAN invalido"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Planilha de Horas dos Empregados"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Imprimir minha planilha de horas"
-
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consultoria - Desenvolvedor Sênior"
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index 7b5154e53e6..dec21e2d1ee 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: 2011-05-09 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Mie"
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Lun"
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Nici o unitate de cost nu este definita pentru acest salariat !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Mar"
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sam"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Dum"
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Iulie"
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Martie"
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Septembrie"
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Pontaj intrari / iesiri pe proiect"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Vin"
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Iunie"
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Noiembrie"
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr "Data închidere"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Octombrie"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Ianuarie"
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr "Date importante"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Joi"
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr "Rezumat analiză"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Decembrie"
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Mai"
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Februarie"
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Aprilie"
@@ -705,12 +729,3 @@ msgstr ""
 
 #~ msgid "Day"
 #~ msgstr "Zi"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Tipareste foaia mea de pontaj"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Foaie colectiva de pontaj"
-
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Consultant - Developer senior"
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index 95c248a4e79..94331c0f264 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Ср"
@@ -42,7 +42,7 @@ msgstr "Для вашего пользователя не определен с
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -52,11 +52,15 @@ msgid ""
 "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 ""
+msgstr "Cегодня"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -92,8 +96,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Пн"
@@ -111,16 +115,20 @@ msgid ""
 "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 ""
+msgstr "Минимальное аналитическое количество"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr ""
+msgstr "Ежемесячный табель сотрудника"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -132,6 +140,8 @@ msgstr "Работы, выполненные в последнем период
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Ошибка! Вы не можете выбрать подразделение, руководителем которого является "
+"этот сотрудник."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -148,14 +158,14 @@ msgstr "Имена сотрудников"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr ""
+msgstr "Распечатать табель сотрудника"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:174
 #: code:addons/hr_timesheet/hr_timesheet.py:176
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Warning !"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
@@ -171,8 +181,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "Не определена ед.измерения для этого пользователя!"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Вт"
@@ -186,29 +196,29 @@ msgstr "Счет аналитики"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Warning"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
 msgid "Human Resources (Timesheet encoding)"
-msgstr ""
+msgstr "Кадры (составление табеля)"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr ""
+msgstr "Вход/Выход по проекту"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Вс"
@@ -233,11 +243,13 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Ежемесячный табель сотрудника"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Июль"
@@ -251,7 +263,7 @@ msgstr "Дата начала"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -265,6 +277,8 @@ msgid ""
 "Through Working Hours you can register your working hours by project every "
 "day."
 msgstr ""
+"С помощью \"Рабочих часов\" можно регистрировать рабочие часы попроектно "
+"каждый день."
 
 #. module: hr_timesheet
 #: model:ir.module.module,description:hr_timesheet.module_meta_information
@@ -281,10 +295,22 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль реализует систему табелей. Каждый сотрудник может вести\n"
+"и отслеживать время, потраченное на различные проекты. Проект — это\n"
+"счёт аналитики, и потраченное время формирует издержки по этому счёту.\n"
+"\n"
+"Включает множество отчётов для отслеживания времени сотрудников.\n"
+"\n"
+"Модуль полностью интегрирован с модулем учёта расходов. Он позволяет\n"
+"настроить управление по сделке.\n"
+"    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Март"
@@ -301,8 +327,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Сентябрь"
@@ -315,7 +343,7 @@ msgstr "Строка табеля"
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "сотрудники"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -351,8 +379,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Регистрация / выход по проектам"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Пт"
@@ -369,6 +397,9 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
+"Для сотрудника %s не определён журнал аналитики \n"
+"Определите сотрудника для выбранного пользователя и назначьте журнал "
+"аналитики!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -392,15 +423,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Июнь"
@@ -419,11 +454,13 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Ноябрь"
@@ -431,7 +468,7 @@ msgstr "Ноябрь"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -439,15 +476,19 @@ msgid "Closing Date"
 msgstr "Дата закрытия"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Январь"
@@ -458,8 +499,8 @@ msgid "Key dates"
 msgstr "Ключевые даты"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Чт"
@@ -472,13 +513,13 @@ msgstr "Анализ статистики"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr ""
+msgstr "Печать табеля сотрудника и печать моего табеля"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
 #: field:hr.sign.out.project,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID сотрудника"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -488,16 +529,18 @@ msgstr "Общая информация"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Timesheet"
-msgstr ""
+msgstr "Моё расписание"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis summary"
-msgstr "Резюме анализа"
+msgstr "Итог анализа"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Декабрь"
@@ -527,13 +570,13 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr ""
+msgstr "Информация"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
 #: model:ir.model,name:hr_timesheet.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Сотрудник"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -550,12 +593,12 @@ msgstr "Текущая дата"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Anlytic account"
-msgstr ""
+msgstr "Счёт аналитики"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
-msgstr ""
+msgstr "Этот мастер распечатает месячный табель"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -566,11 +609,13 @@ msgstr "Продукция"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Выставление счетов"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Май"
@@ -600,11 +645,13 @@ msgstr "Рабочие часы"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr ""
+msgstr "Вход от проекта"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Февраль"
@@ -617,12 +664,12 @@ msgstr "Позиция аналитики"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr ""
+msgstr "Выход от проекта"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr ""
+msgstr "Сотрудники"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -631,8 +678,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Апрель"
@@ -644,6 +693,8 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
+"Для проекта не определён счёт аналитики.\n"
+"Требуется указать хотя бы один, для автоматического заполнения табеля."
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -671,7 +722,7 @@ msgstr "Статистика по пользователям"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
-msgstr ""
+msgstr "Этот пользователь не сопоставлен сотруднику"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
@@ -682,12 +733,12 @@ msgstr "Год"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Accounting"
-msgstr ""
+msgstr "Учёт"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner Id"
-msgstr ""
+msgstr "ID контрагента"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -700,15 +751,6 @@ msgstr "Изменить неделю"
 msgid "septembre"
 msgstr ""
 
-#~ msgid "Consultancy - Senior Developper"
-#~ msgstr "Консультация - старший разработчик"
-
-#~ msgid "Employees timesheet"
-#~ msgstr "Табели сотрудников"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Расчечатать мой табель"
-
 #~ msgid "My Working Hours"
 #~ msgstr "Мои рабочие часы"
 
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index d88ba5ec7ec..dd9bd495c7c 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "sre"
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr "januar"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "pon"
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "ZA tegas zaposlenega niste dololčili enoto stroška"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "tor"
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "sob"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "ned"
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "julij"
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "marec"
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr "december"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "september"
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Prijavi/odjavi se iz projekta"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "pet"
@@ -392,15 +398,19 @@ msgid "août"
 msgstr "avgust"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "avgust"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "junij"
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "november"
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr "Zaključni datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "januar"
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr "Ključni datumi"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "čet"
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr "Povzetek analize"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "december"
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "maj"
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "februar"
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr "oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "april"
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index ddce3c15951..30fd82e6e6b 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -201,15 +201,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -284,8 +286,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -302,8 +306,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -352,8 +358,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -393,15 +399,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -423,8 +433,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -440,15 +452,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -459,8 +475,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -497,8 +513,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -570,8 +588,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -604,8 +624,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -632,8 +654,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/sr@latin.po b/addons/hr_timesheet/i18n/sr@latin.po
index ab577ba666a..8407844a1fe 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -201,15 +201,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -284,8 +286,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -302,8 +306,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -352,8 +358,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -393,15 +399,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -423,8 +433,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -440,15 +452,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -459,8 +475,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -497,8 +513,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -570,8 +588,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -604,8 +624,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -632,8 +654,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index d9569ccb575..9534d517abe 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr "Underhåll på tidsrapporter"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Wed"
@@ -95,8 +95,8 @@ msgid "janvier"
 msgstr "januari"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Mon"
@@ -177,8 +177,8 @@ msgid "No cost unit defined for this employee !"
 msgstr "No cost unit defined for this employee !"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Tue"
@@ -206,15 +206,15 @@ msgid "Sign In/Out By Project"
 msgstr "Logga in eller ut projekt"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
 msgstr "Sat"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "Sun"
@@ -242,8 +242,10 @@ msgid "Monthly Employees Timesheet"
 msgstr "Månatliga tidsrapporter"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "July"
@@ -289,8 +291,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "March"
@@ -307,8 +311,10 @@ msgid "décembre"
 msgstr "december"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "September"
@@ -357,8 +363,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Logga in till/Logga ut från projektet"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Fri"
@@ -398,15 +404,19 @@ msgid "août"
 msgstr "Augusti"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "August"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "June"
@@ -428,8 +438,10 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "November"
@@ -445,15 +457,19 @@ msgid "Closing Date"
 msgstr "Slutdatum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "October"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "January"
@@ -464,8 +480,8 @@ msgid "Key dates"
 msgstr "Nyckeldatum"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "Thu"
@@ -502,8 +518,10 @@ msgid "Analysis summary"
 msgstr "Analysis summary"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "December"
@@ -556,7 +574,7 @@ msgstr "Aktuellt datum"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Anlytic account"
-msgstr ""
+msgstr "Analyskonto"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -575,8 +593,10 @@ msgid "Invoicing"
 msgstr "Fakturering"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "May"
@@ -609,8 +629,10 @@ msgid "Sign In By Project"
 msgstr "Logga in per projekt"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "February"
@@ -637,8 +659,10 @@ msgid "octobre"
 msgstr "oktober"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "April"
@@ -789,9 +813,3 @@ msgstr "september"
 #, python-format
 #~ msgid "ValidateError"
 #~ msgstr "ValidateError"
-
-#~ msgid ""
-#~ "Working Hours allows you to log your working hours by project every day."
-#~ msgstr ""
-#~ "Arbetstider ger dig möjlighet att dagligen anteckna dina arbetstimmar i "
-#~ "projekten."
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index 834e6bfadce..a194558b6b2 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 05a8527af81..02d2633151c 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index d255c893f02..6c29ed5e0db 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr "Підписка/відписка за проектами"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr "Дата закриття"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr "Ключові дати"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr "Підсумки аналізу"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -700,12 +724,6 @@ msgstr "Поміняти роботу"
 msgid "septembre"
 msgstr ""
 
-#~ msgid "Employees timesheet"
-#~ msgstr "Табель працівників"
-
-#~ msgid "Print my timesheet"
-#~ msgstr "Друк мого табелю"
-
 #~ msgid "Sum"
 #~ msgstr "Всього"
 
diff --git a/addons/hr_timesheet/i18n/vi.po b/addons/hr_timesheet/i18n/vi.po
index 1f22eb5f861..8f4238adecb 100644
--- a/addons/hr_timesheet/i18n/vi.po
+++ b/addons/hr_timesheet/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 14:05+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -23,8 +23,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "Thứ tư"
@@ -93,8 +93,8 @@ msgid "janvier"
 msgstr "Tháng Một"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "Thứ hai"
@@ -172,8 +172,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "Thứ ba"
@@ -201,15 +201,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -237,8 +237,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Bảy"
@@ -284,8 +286,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Ba"
@@ -302,8 +306,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Chín"
@@ -352,8 +358,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "Thứ sáu"
@@ -393,15 +399,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Tám"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Sáu"
@@ -423,8 +433,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Mười một"
@@ -440,15 +452,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Mười"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Một"
@@ -459,8 +475,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -497,8 +513,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Mười hai"
@@ -570,8 +588,10 @@ msgid "Invoicing"
 msgstr "Hóa đơn"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Năm"
@@ -604,8 +624,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Hai"
@@ -632,8 +654,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "Tháng Tư"
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index b4dd046f279..07543bfc9cb 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "计工单服务"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr "周三"
@@ -37,12 +37,12 @@ msgstr "（留空表示当前时间）"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "您的用户没有定义雇员信息！"
+msgstr "您的用户没有定义员工信息！"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -52,6 +52,9 @@ msgid ""
 "analytic account. This feature allows to record at the same time the "
 "attendance and the timesheet."
 msgstr ""
+"员工能记录在不同项目所花费的时间。\r\n"
+"一个项目是一个辅助核算項，而且该项目所花费的时间为这辅助核算項的成本。\r\n"
+"此功能允许记录其考勤和计工单。"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -61,7 +64,7 @@ msgstr "今日"
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr "辅助核算记录集合"
+msgstr "辅助核算账薄"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -72,18 +75,18 @@ msgstr "停止工作"
 #: 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 "员工计工单"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr "完成工作的统计"
+msgstr "工作完成统计"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
 msgid "Timesheet"
-msgstr "时间表"
+msgstr "计工单"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -92,8 +95,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr "周一"
@@ -111,6 +114,9 @@ msgid ""
 "project generates costs on the analytic account. This feature allows to "
 "record at the same time the attendance and the timesheet."
 msgstr ""
+"员工能记录在不同项目所花费的时间。\r\n"
+"一个项目是一个辅助核算項，而且该项目所花费的时间为这辅助核算項的成本。\r\n"
+"此功能允许记录其考勤和计工单。"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -120,7 +126,7 @@ msgstr "最低辅助核算金额"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr "月度雇员时间表"
+msgstr "员工月度计工单"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -131,7 +137,7 @@ msgstr "最近完成的工作"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr "错误！您不能选择该雇员担任经理的部门。"
+msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -143,12 +149,12 @@ msgstr "当前状态"
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "员工姓名"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr "打印雇员时间表"
+msgstr "打印员工计工单"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:174
@@ -168,11 +174,11 @@ msgstr "用户错误"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #, python-format
 msgid "No cost unit defined for this employee !"
-msgstr ""
+msgstr "这员工没定义成本单位"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr "周二"
@@ -191,24 +197,24 @@ msgstr "警告"
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
 msgid "Human Resources (Timesheet encoding)"
-msgstr "人力资源(时间表编码)"
+msgstr "人力资源(计工单编码)"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr ""
+msgstr "项目签入/签出"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr "周日"
@@ -222,7 +228,7 @@ msgstr "打印"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr "时间表明细"
+msgstr "计工单明细"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -233,14 +239,16 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr "月度雇员时间表"
+msgstr "员工月度计工单"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "七月"
+msgstr "7月"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,date:0
@@ -264,7 +272,7 @@ msgstr ""
 msgid ""
 "Through Working Hours you can register your working hours by project every "
 "day."
-msgstr ""
+msgstr "用工时您可以记录您在项目的每天工作时间。"
 
 #. module: hr_timesheet
 #: model:ir.module.module,description:hr_timesheet.module_meta_information
@@ -281,13 +289,21 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"该模块实现计工单功能。每个员工能记录和跟踪在不同项目所花费的时间。\n"
+"一个项目是一个辅助核算項，所花费的时间是这个辅助核算项的成本。\n"
+"\n"
+"提供员工工时跟踪报告它完全集成了成本会计模块。它允许您设置个人事务的管理。\n"
+"    "
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "三月"
+msgstr "3月"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -301,21 +317,23 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "九月"
+msgstr "9月"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "时间表明细"
+msgstr "计工单明细"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -327,7 +345,7 @@ msgstr "按月份统计"
 #: field:hr.analytical.timesheet.employee,month:0
 #: field:hr.analytical.timesheet.users,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,info:0
@@ -342,7 +360,7 @@ msgstr "要开发票"
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr "员工时间表"
+msgstr "员工计工单"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
@@ -351,8 +369,8 @@ msgid "Sign in / Sign out by project"
 msgstr "项目的签入/签出"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr "周五"
@@ -369,6 +387,8 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
+"员工  %s 没定义辅助核算账薄。\n"
+"为选定的用户定义员工和辅助核算账薄！"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -378,12 +398,12 @@ msgstr "(留空表示当前时间)"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "时间表"
+msgstr "计工单"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr ""
+msgstr "为员工指定的产品其类型必须是“服务”。"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -392,23 +412,27 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "八月"
+msgstr "8月"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "六月"
+msgstr "6月"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Print My Timesheet"
-msgstr "打印我的时间表"
+msgstr "打印我的计工单"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -422,16 +446,18 @@ msgid "Date"
 msgstr "日期"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "十一月"
+msgstr "11月"
 
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "错误！您不能创建递归的员工等级。"
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -439,18 +465,22 @@ msgid "Closing Date"
 msgstr "结束日期"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "十月"
+msgstr "10月"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "一月"
+msgstr "1月"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -458,8 +488,8 @@ msgid "Key dates"
 msgstr "关键日期"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr "周四"
@@ -472,13 +502,13 @@ msgstr "辅助核算统计"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr ""
+msgstr "打印员工计工单 & 打印我的计工单"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
 #: field:hr.sign.out.project,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "员工ID"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -488,7 +518,7 @@ msgstr "一般信息"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Timesheet"
-msgstr "我的时间表"
+msgstr "我的计工单"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -496,11 +526,13 @@ msgid "Analysis summary"
 msgstr "辅助核算摘要"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "十二月"
+msgstr "12月"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -516,7 +548,7 @@ msgstr "取消"
 #: 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 "员工计工单"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -533,7 +565,7 @@ msgstr "信息"
 #: field:hr.analytical.timesheet.employee,employee_id:0
 #: model:ir.model,name:hr_timesheet.model_hr_employee
 msgid "Employee"
-msgstr "雇员"
+msgstr "员工"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -550,12 +582,12 @@ msgstr "当前日期"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Anlytic account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
-msgstr ""
+msgstr "该向导将打印月度计工单"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -569,11 +601,13 @@ msgid "Invoicing"
 msgstr "开发票"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "五月"
+msgstr "5月"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -595,19 +629,21 @@ msgstr "（服务器上的时间）"
 #: 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 "Working Hours"
-msgstr "工作小时"
+msgstr "工时"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr ""
+msgstr "项目签入"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "二月"
+msgstr "2月"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
@@ -617,12 +653,12 @@ msgstr "辅助核算明细"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr ""
+msgstr "项目签出"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -631,11 +667,13 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 "四月"
+msgstr "4月"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:176
@@ -644,6 +682,8 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
+"这项目没定义辅助核算项。\n"
+"请设置一个或我不能自动填充的计工单。"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -671,7 +711,7 @@ msgstr "按用户统计"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
-msgstr ""
+msgstr "这用户没定义员工"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
@@ -687,7 +727,7 @@ msgstr "会计"
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner Id"
-msgstr ""
+msgstr "业务伙伴ID"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index 8aaab7155e1..864e45f31cd 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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:20+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -22,8 +22,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -92,8 +92,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -171,8 +171,8 @@ msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -200,15 +200,15 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: 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:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
 msgstr ""
@@ -236,8 +236,10 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -283,8 +285,10 @@ msgid ""
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -301,8 +305,10 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -351,8 +357,8 @@ msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -392,15 +398,19 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -422,8 +432,10 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -439,15 +451,19 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -458,8 +474,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:42
-#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -496,8 +512,10 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -569,8 +587,10 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -603,8 +623,10 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
@@ -631,8 +653,10 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:39
-#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#: 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 ""
diff --git a/addons/hr_timesheet/report/__init__.py b/addons/hr_timesheet/report/__init__.py
index 98e34ed92d4..8304c90421d 100644
--- a/addons/hr_timesheet/report/__init__.py
+++ b/addons/hr_timesheet/report/__init__.py
@@ -22,3 +22,5 @@
 import user_timesheet
 import users_timesheet
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 737652fbccd..7699f94f41b 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -67,7 +67,7 @@ class report_custom(report_rml):
         if user_id:
             # Computing the attendence by analytical account
             cr.execute(
-                "select line.date, (unit_amount * unit.factor) as amount, account_id, account.name "\
+                "select line.date, (unit_amount / unit.factor) as amount, account_id, account.name "\
                 "from account_analytic_line as line, hr_analytic_timesheet as hr, "\
                 "account_analytic_account as account, product_uom as unit "\
                 "where hr.line_id=line.id and line.account_id=account.id "\
@@ -118,3 +118,5 @@ class report_custom(report_rml):
 
 report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index fac92d6a322..4c619721329 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -37,7 +37,7 @@ def lengthmonth(year, month):
 def emp_create_xml(cr, id, som, eom, emp):
     # Computing the attendence by analytical account
     cr.execute(
-        "select line.date, (unit_amount * unit.factor) as amount "\
+        "select line.date, (unit_amount / unit.factor) as amount "\
         "from account_analytic_line as line, hr_analytic_timesheet as hr, "\
         "product_uom as unit "\
         "where hr.line_id=line.id "\
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
index 6b341e50f4b..9c78204016b 100644
--- a/addons/hr_timesheet/security/hr_timesheet_security.xml
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -2,11 +2,19 @@
 <openerp>
     <data noupdate="True">
 
+        <record id="property_rule_timesheet_manager" model="ir.rule">
+            <field name="name">Manager HR Analytic Timesheet</field>
+            <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
+        </record>
+
         <record id="property_rule_timesheet_employee" model="ir.rule">
-            <field name="name">HR Analytic Timesheet</field>
+            <field name="name">Employee HR Analytic Timesheet</field>
             <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
             <field name="domain_force">[('user_id', '=', user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 3cf9505b60b..2b2064a89b4 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -10,4 +10,5 @@
 "access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
 "hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
 "hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
-"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
+"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,1,1,0
+"access_account_analytic_journal_user","account.account.analytic.journal.user","account.model_account_analytic_journal","base.group_user",1,0,0,0
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 16fd59b69ba..30c97c3eb70 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -37,14 +37,6 @@
     parent_id: 'hr_employee_employee0'
     user_id: 'test_timesheet_user1'
 
--
-  I create Timesheet journal for employee.
--
-  !record {model: account.analytic.journal, id: analytic_journal}:
-    code: TS
-    name: Timesheet Journal
-    type: general
-
 -
   I create a product as "Consultancy - Senior Developer".
 -
@@ -79,7 +71,7 @@
   !record {model: hr.attendance, id: hr_attendance_0}:
     action: sign_in
     employee_id: 'hr_employee_fracline1'
-    name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(datetime.now().hour-2,datetime.now().minute,datetime.now().second)
+    name: !eval (datetime.now()-timedelta(hours=2)).strftime('%Y-%m-%d %H:%M:%S')
 
 -
   I create attendance and perform "Sign Out" action.
@@ -87,7 +79,7 @@
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
     employee_id: 'hr_employee_fracline1'
-    name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(datetime.now().hour-1,datetime.now().minute,datetime.now().second)
+    name: !eval (datetime.now()-timedelta(hours=1)).strftime('%Y-%m-%d %H:%M:%S')
 
 -
   On "Sign In/Sign Out by Project" wizard i click on "Sign In/Sign Out" button of this wizard.
@@ -103,7 +95,26 @@
       uid = ref('test_timesheet_user1')
       new_id = self.create(cr, uid, {'emp_id': ref('hr_employee_fracline1'), 'name': 'Francline', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'absent'})
       self.sign_in_result(cr, uid, [new_id], context)
-
+-
+  I create a timesheet line manually to check several default values. 
+  I also assign proper date and user for that line.
+-
+  !python {model: hr.analytic.timesheet}: |
+     import time
+     uid = ref('test_timesheet_user1')
+     current_date = time.strftime('%Y-%m-%d')
+     vals = {'name': 'Worked on project',
+             'user_id': ref('test_timesheet_user1'),
+             'account_id': ref('account.analytic_project_1_development'),
+             'unit_amount': 5.00,
+             'journal_id': ref('analytic_journal')
+     }
+     line_id = self.create(cr, uid, vals, None)
+     res = self.on_change_date(cr, uid, [line_id], current_date)
+     values = dict([('date', current_date)] + res['value'].items())
+     res1 = self.on_change_user_id(cr, uid, [line_id], ref('base.user_root'))
+     values.update(dict([('user_id', ref('base.user_root'))] + res1['value'].items()))
+     self.write(cr, uid, [line_id], values, None)
 -
   To stop work I click on "Sign In/Sign Out" button of "Sign In/Sign Out by Project" wizard.
   Which check state in hr attendace form for user.
@@ -113,7 +124,6 @@
        ids = self.search(cr, uid, [('emp_id', '=', ref('hr_employee_fracline1')),('name', '=', 'Francline')])
        self.check_state(cr, uid, ids, {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]
              })
-
 -
   I Create an analytic account "Project2".
 -
@@ -136,3 +146,4 @@
 
 - |
   I can see employee timesheet for particular month using "Employee Timesheet" report.
+
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 90c9a5d7b8c..e3f7f0c7acb 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -27,7 +27,7 @@ class hr_so_project(osv.osv_memory):
     _name = 'hr.sign.out.project'
     _description = 'Sign Out By Project'
     _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('type','=','normal')]),
+        'account_id': fields.many2one('account.analytic.account', 'Project / Analytic Account', domain=[('type','=','normal')]),
         'info': fields.char('Work Description', size=256, required=True),
         'date_start': fields.datetime('Starting Date', readonly=True),
         'date': fields.datetime('Closing Date'),
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 95682d00ef0..d4237baf36c 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice on analytic lines',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden/Link',
     'description': """Generate your Invoices from Expenses, Timesheet Entries, ...
 Module to generate invoices based on costs (human resources, expenses, ...).
 ============================================================================
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
index 96d91ef3e5c..7327ca66f63 100644
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
@@ -17,9 +17,9 @@
              <field name="type">form</field>
             <field name="inherit_id" ref="account.board_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1/action[@string='Draft Customer Invoices']" position="before">
-                    <action colspan="4" height="160" name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
-                    <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
+                <xpath expr="/form/board/column/action[@string='Draft Customer Invoices']" position="before">
+                    <action name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close"/>
+                    <action name="%(act_my_account)d" string="Accounts to invoice"/>
                 </xpath>
             </field>
         </record> -->
@@ -31,8 +31,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.board_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2/action[@string='Aged income']" position="after">
-                    <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
+                <xpath expr="/form/board/column/action[@string='Aged income']" position="after">
+                    <action name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
                 </xpath>
             </field>
         </record> -->
@@ -67,8 +67,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1" position="inside">
-                    <action colspan="4" height="220" name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice Lines With Billing Rate" />
+                <xpath expr="/form/board/column" position="inside">
+                    <action name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice Lines With Billing Rate"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index d9314690ce7..19d08f7faf3 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -63,12 +63,12 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'pricelist_id': fields.many2one('product.pricelist', 'Sale Pricelist',
+        'pricelist_id': fields.many2one('product.pricelist', 'Customer Pricelist',
             help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
         'amount_max': fields.float('Max. Invoice Price'),
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Reinvoice Costs',
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoice on Timesheet & Costs',
             help="Fill this field if you plan to automatically generate invoices based " \
             "on the costs in this analytic account: timesheets, expenses, ..." \
             "You can configure an automatic invoice rate on analytic accounts."),
@@ -76,7 +76,16 @@ class account_analytic_account(osv.osv):
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
-    
+    def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
+        res = super(account_analytic_account, self).on_change_partner_id(cr, uid, id, partner_id, context)
+        if (not res.get('value', False)) or not partner_id:
+            return res
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
+        if pricelist:
+            res['value']['pricelist_id'] = pricelist
+        return res
+
     def set_close(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'close'}, context=context)
     
@@ -116,7 +125,7 @@ class account_analytic_line(osv.osv):
             for line in self.browse(cr, uid, select):
                 if line.invoice_id:
                     raise osv.except_osv(_('Error !'),
-                        _('You can not modify an invoiced analytic line!'))
+                        _('You cannot modify an invoiced analytic line!'))
         return True
 
     def copy(self, cursor, user, obj_id, default=None, context=None):
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 3463dc92bd8..cc8028a8a0a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="10" />
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <report
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b0edacd7272..e0652355063 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -7,23 +7,27 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="after">
-                    <group colspan="4" col="4">
-                        <separator colspan="4" string="Invoicing Data"/>
-                        <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
-                        <field name="to_invoice" widget="selection" />
+                <group name="contract" position="after">
+                    <group colspan="2" col="2" name="invoice_data">
+                        <separator colspan="2" string="Invoicing Data"/>
+                        <field name="to_invoice" widget="selection"/>
+                        <field name="pricelist_id" domain="[('type','=','sale')]" attrs="{'required':[('to_invoice','!=',False)]}"/>
                         <field name="amount_max"/>
-                        <field name="amount_invoiced"/>
-                        <separator colspan="4"/>
-                        <group col="9" colspan="8">
-	                        <field name="state" readonly="1"/>
-	                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-	                        <button name="set_open" string="Reactivate Account" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
-	                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-	                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
-                        </group>
                     </group>
-                </field>
+                    <group colspan="2" col="2" name="invoice_stats">
+                        <separator colspan="4" string="Invoicing Statistics"/>
+                        <field name="amount_invoiced"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group col="9" colspan="8">
+                        <field name="state" readonly="1" widget="statusbar"
+                            statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                        <button name="set_open" string="Reactivate Account" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+                    </group>
+                </group>
             </field>
         </record>
 
@@ -123,7 +127,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
             <field name="context">{'search_default_to_invoice': 1}</field>
- 			<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>            
+            <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>            
             <field name="help">This list shows you every task you can invoice to the customer. Select the lines and click the Action button to generate the invoices automatically.</field>
         </record>
         <menuitem
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index 05545a6a154..3eca4cf42f3 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index fd63ac27c70..ce4edae7364 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Фактури"
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Валута"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -806,7 +807,7 @@ msgid "Timesheet Line"
 msgstr "Ред в график"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1040,7 +1041,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1090,36 +1091,3 @@ msgstr "Година"
 
 #~ msgid "Invoicing"
 #~ msgstr "Издаване на фактура"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Моите дневни графици според сметка"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Мой график за месеца"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Случайни редове от график"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "График – Докладване"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Моите графици според сметка"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Случаен доклад за график"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Случайни графици"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Случайни редове от графици"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Случаен график"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Мойте графици превърнати във фактура"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "График според потребител (този месец)"
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index 6ea1e9ddb2e..a963d080903 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index c90c7fc452f..18b836372b3 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-10-30 11:41+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 20:44+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -42,7 +41,7 @@ msgstr "Compte analític incomplet"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
 msgid "Create invoice from timesheet final"
-msgstr ""
+msgstr "Crea factura des del full de serveis final"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -52,7 +51,7 @@ msgstr "Força l'ús d'un producte específic"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Dies    "
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -62,7 +61,7 @@ msgstr "Ingrés"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "A facturar"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -76,7 +75,7 @@ msgstr "Full de serveis per dia"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
@@ -89,11 +88,13 @@ msgid ""
 "The product to invoice is defined on the employee form, the price will be "
 "deduced by this pricelist on the product."
 msgstr ""
+"El producte a facturar es defineix en el formulari del treballador, el preu "
+"es deduirà del producte mitjançant aquesta llista de preus."
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
 msgid "Invoice Rate"
-msgstr ""
+msgstr "Impost de facturació"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -102,7 +103,7 @@ msgstr ""
 #: view:report_timesheet.account.date:0
 #: view:report_timesheet.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Aquest any"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
@@ -112,13 +113,13 @@ msgstr "Mostra temps en l'historial de treballs"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Journals"
-msgstr ""
+msgstr "Diaris"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
@@ -128,7 +129,7 @@ msgstr "UdM"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,time:0
@@ -144,7 +145,7 @@ msgstr "Import facturat"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Uninvoiced line with billing rate"
-msgstr ""
+msgstr "Línia no facturada amb impost de facturació"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -164,7 +165,7 @@ msgstr "Import"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Reactivate Account"
-msgstr ""
+msgstr "Reactiva compte"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
@@ -174,7 +175,7 @@ msgstr "El detall de cada treball realitzat es mostrarà en la factura"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
-msgstr ""
+msgstr "Crea factura des del full de serveis"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -189,12 +190,12 @@ msgstr "Compte analític a tancar"
 #. module: hr_timesheet_invoice
 #: view:board.board:0
 msgid "Uninvoice Lines With Billing Rate"
-msgstr ""
+msgstr "No facturar línies amb cost"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -211,7 +212,7 @@ msgstr "Full de serveis diària per compte"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Final invoice for analytic account"
-msgstr ""
+msgstr "Factura final del compte analítica"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:76
@@ -235,7 +236,7 @@ msgstr "Data límit"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Comptes a facturar"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -245,7 +246,7 @@ msgstr "Empresa"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! No podeu crear comptes analítics recursius."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
@@ -265,7 +266,7 @@ msgstr "Fulls de treball"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
 msgid "hr.timesheet.analytic.cost.ledger"
-msgstr ""
+msgstr "rrhh.partd'hores.analítica.cost.llibre"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
@@ -314,7 +315,7 @@ msgstr "Empleat"
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
 msgid "It allows to set the discount while making invoice"
-msgstr ""
+msgstr "Permet establir el descompte en facturar"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,price:0
@@ -322,11 +323,13 @@ msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this"
 msgstr ""
+"El cost de cada treball realitzat es detallarà en la factura. Probablement "
+"no desitgeu activar això"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -342,7 +345,7 @@ msgstr "Error!"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
 msgid "Gratis"
-msgstr ""
+msgstr "Gratis"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
@@ -354,6 +357,12 @@ msgid ""
 "revenue\n"
 "reports, eso."
 msgstr ""
+"\n"
+"Mòdul per generar factures basades en els costos (recursos humans, despeses, "
+"...).\n"
+"Podeu definir tarifes en el compte analític, fer alguns informes sobre "
+"ingressos\n"
+"teòrics, ..."
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
@@ -362,6 +371,10 @@ msgid ""
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
 msgstr ""
+"Empleneu aquest camp si aneu a generar automàticament les factures basades "
+"en els costos d'aquest compte analític: fulls de serveis, despeses, ... Es "
+"pot configurar un percentatge de facturació automàtica en els comptes "
+"analítics."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -389,7 +402,7 @@ msgstr "Mostra detall del treball en la línia de factura."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -400,7 +413,7 @@ msgstr "Data impressió"
 #: 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 "Factura els treballs de les tasques"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -448,7 +461,7 @@ msgstr "Descompte (%)"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
 msgid "Yes (100%)"
-msgstr ""
+msgstr "Si (100%)"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -456,7 +469,7 @@ msgid "Employee or Journal Name"
 msgstr "Empleat o nom de diari"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Factures"
@@ -468,7 +481,7 @@ msgstr "Factures"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -486,6 +499,7 @@ msgid "Currency"
 msgstr "Moneda"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -507,12 +521,12 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
-msgstr ""
+msgstr "Full de tasques no assignada als usuaris"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,invoice_id:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturat"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity_max:0
@@ -542,7 +556,7 @@ msgstr "Des de"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
@@ -557,7 +571,7 @@ msgstr "Període fins"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línia analítica"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -566,7 +580,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -578,7 +592,7 @@ msgstr "Cost comptable"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -587,7 +601,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,date:0
@@ -625,12 +639,12 @@ msgstr "Si us plau, ompliu el camp direcció de l'empresa: %s."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
@@ -651,7 +665,7 @@ msgstr "Factura les línies analítiques"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Cod. diari/Nom mov."
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -665,7 +679,7 @@ msgstr "Total:"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -679,6 +693,8 @@ msgid ""
 "Please fill in the partner and pricelist field in the analytic account:\n"
 "%s"
 msgstr ""
+"Empleneu els camps empresa i tarifa del compte analític:\n"
+"%s"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
@@ -686,6 +702,8 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"Error! La moneda ha de ser la mateixa que la moneda de la companyia "
+"seleccionada."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
@@ -718,7 +736,7 @@ msgstr "Quantitat"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Data/Codi"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,general_account_id:0
@@ -728,7 +746,7 @@ msgstr "Compte general"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
 msgid "Print Timesheet Profit"
-msgstr ""
+msgstr "Imprimeix benefici del full de serveis"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
@@ -767,7 +785,7 @@ msgstr "Preu màx. factura"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
@@ -788,7 +806,7 @@ msgstr "Cancel·la"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -798,6 +816,10 @@ msgid ""
 "a customer. From this menu, you can create additional types of invoicing to "
 "speed up your invoicing."
 msgstr ""
+"OpenERP li permet crear tipus de facturació per defecte. Pot ser que tingueu "
+"d'assignar regularment descomptes a causa d'un contracte o un acord "
+"específic amb un client. Des d'aquest menú, podeu crear altres tipus de "
+"facturació addicionals per accelerar la seva facturació."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
@@ -805,10 +827,10 @@ msgstr ""
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Línia de full d'assistència"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Producte de balanç necesari"
@@ -816,7 +838,7 @@ msgstr "Producte de balanç necesari"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Billing Data"
-msgstr ""
+msgstr "Dades de facturació"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
@@ -826,11 +848,14 @@ msgid ""
 "Analytic Account:\n"
 "%s"
 msgstr ""
+"Empleneu els camps empresa o client i la tarifa de venda del compte "
+"analític:\n"
+"%s"
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
 msgid "Label for the customer"
-msgstr ""
+msgstr "Etiqueta per al client"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
@@ -845,7 +870,7 @@ msgstr "Imprimeix"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,price:0
@@ -889,7 +914,7 @@ msgstr "Producte"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
 msgid "Uninvoice lines with billing rate"
-msgstr ""
+msgstr "No factura línies amb cost"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -908,7 +933,7 @@ msgstr "Nom intern"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,journal_ids:0
@@ -918,7 +943,7 @@ msgstr "Diari"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,balance_product:0
 msgid "The product that will be used to invoice the remaining amount"
-msgstr ""
+msgstr "El producte que s'utilitzarà per facturar l'import restant."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
@@ -926,6 +951,9 @@ msgid ""
 "This list shows you every task you can invoice to the customer. Select the "
 "lines and click the Action button to generate the invoices automatically."
 msgstr ""
+"Aquesta llista mostra totes les tasques que podeu facturar al client. "
+"Seleccioneu les línies i feu clic en el botó d'acció per generar les "
+"factures automàticament."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
@@ -950,7 +978,7 @@ msgstr "Aquest mes"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
 msgid "Select Period"
-msgstr ""
+msgstr "Selecciona un període"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -964,7 +992,7 @@ msgstr "Període des de data inicial"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@@ -984,7 +1012,7 @@ msgstr "Preu venda"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Employees"
-msgstr ""
+msgstr "Treballadors"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
@@ -998,7 +1026,7 @@ msgstr "Fulls de serveis per dia"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -1008,7 +1036,7 @@ msgstr "Dades facturació"
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
 msgid "Discount in percentage"
-msgstr ""
+msgstr "Descompte en percentatge"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -1034,7 +1062,7 @@ msgstr "Unitats"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipus de facturació"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -1042,7 +1070,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Línies analítiques a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Indiqueu un producte de balanç en l'assistent"
@@ -1070,7 +1098,7 @@ msgstr "Cost"
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #~ msgid "Visible name"
 #~ msgstr "Nom visible"
@@ -1169,50 +1197,3 @@ msgstr ""
 
 #~ msgid "Invoicing"
 #~ msgstr "A facturar"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Informes comptabilitat analítica"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Informes - Línies analítiques"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Els meus fulls de serveis diaris per compte"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "El meu full de serveis del mes"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Línies fulls de serveis aleatoris"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Informes - Full de serveis"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Els meus fulls de serveis per compte"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Informe full de serveis aleatori"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Fulls de serveis aleatoris"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Línies full de serveis aleatoris"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Full de serveis aleatori"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Els meus fulls de serveis a facturar"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Mòdul que afegeix vistes de fulls de serveis com\n"
-#~ "    Tots els mesos, fulls de serveis per usuari, full de serveis del mes, "
-#~ "fulls de serveis per compte"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Full de serveis per usuari (aquest mes)"
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 4faaf33ec44..fc60cfe80a0 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 44c70ff94ae..6816dc65e0c 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -471,7 +471,7 @@ msgid "Employee or Journal Name"
 msgstr "Mitarbeiter oder Journal Name"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Alle Rechnungen"
@@ -501,6 +501,7 @@ msgid "Currency"
 msgstr "Währung"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -832,7 +833,7 @@ msgid "Timesheet Line"
 msgstr "Zeiterfassung Positionen"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Ausgleich für dieses Produkt"
@@ -1074,7 +1075,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Analytische Buchungen zur Abrechnung"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Bitte geben Sie das Ausgleichsprodukt im Assistenten ein"
@@ -1197,103 +1198,6 @@ msgstr "Jahr"
 #~ "Analysekonto aus:\n"
 #~ "%s"
 
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Reporting Analyse Konten"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "analytische Buchungen - Berichte"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Tägliche Zeiterfassung nach Konto"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Monatliche Zeiterfassung"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Arbeitszeitaufzeichnung - Berichte"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Meine Zeiterfassung nach Analysekonten"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "zufällige Zeitaufzeichnungen"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "zufällige Zeitaufzeichnungszeilen"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Zufällige Zeitaufzeichnung"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Meine abrechenbare Zeiterfassung"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Module für Arbeitszeitaufzeichungen\n"
-#~ "    Alle Monate, Arbeitszeitaufzeichnung je Benutzer/Monat/Konto"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Zeiterfassung nach Benutzer (aktueller Monat)"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Zufälliger Zeitaufzeichungsbericht"
-
-#, python-format
-#~ msgid ""
-#~ "Please fill in the partner and pricelist field '\n"
-#~ "                        'in the analytic account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Bitte tragen Sie einen Partner ein sowie geben Sie eine Preisliste an '\n"
-#~ "                    'für das analytische Konto:\n"
-#~ "%s"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Current"
-#~ msgstr "Aktuell"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Zufällige Zeiterfassungsposten"
-
-#~ msgid "Working Hours"
-#~ msgstr "Arbeitsstunden"
-
-#~ msgid "Search Timesheet Lines"
-#~ msgstr "Suche Zeiterfassung Positionen"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "OpenERP allows you to create default invoicing types. You could need to "
-#~ "regularly make discounts based on a specific contract or agreement with a "
-#~ "customer. From this menu, you can create additional default types of "
-#~ "invoicing that will speed up your invoicing."
-#~ msgstr ""
-#~ "OpenERP ermöglicht die Erstellung bestimmter Abrechnungstypen. "
-#~ "Möglicherweise sind regelmäßig bestimmte Rabatte zu berücksichtigen, die "
-#~ "beispielsweise auf einer getroffenen Vereinbarung basieren. Über dieses Menü "
-#~ "können Sie weitere Abrechnungstypen definieren, um durch deren Anwendung "
-#~ "dauerhaft eine schnellere Rechnungsstellung zu ermöglichen."
-
-#~ msgid ""
-#~ "This lists show you every task work you can invoice to the customer. Select "
-#~ "the lines in order to generate the invoices automatically."
-#~ msgstr ""
-#~ "Diese Liste zeigt die Aufgaben, die abzurechnen sind für Rechnungen an "
-#~ "Kunden. Wählen Sie die Positionen, für die Sie eine automatische Rechnung "
-#~ "erstellen wollen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index e7ef3a73d5f..f0662c67003 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -459,7 +459,7 @@ msgid "Employee or Journal Name"
 msgstr "Υπάλληλος ή Όνομα Ημερολογίου"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Τιμολόγια"
@@ -489,6 +489,7 @@ msgid "Currency"
 msgstr "Νόμισμα"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -815,7 +816,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Χρειάζεται προϊόν υπολοίπου"
@@ -1049,7 +1050,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Γραμμές Αναλυτικές προς Τιμολόγηση"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Παρακαλώ συμπληρώστε ένα Εξισορροποιητικό Προϊόν"
@@ -1079,9 +1080,6 @@ msgstr "Κόστος"
 msgid "Year"
 msgstr ""
 
-#~ msgid "Timesheet profit"
-#~ msgstr "Κέρδος Xρόνου Eργασίας"
-
 #~ msgid "Visible name"
 #~ msgstr "Ορατό όνομα"
 
@@ -1169,9 +1167,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Αναφορές Αναλυτικού Λογαριασμού"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Γραμμές αναλυτικής - Αναφορές"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 48425f0f343..2af1e7f3ec8 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -469,7 +469,7 @@ msgid "Employee or Journal Name"
 msgstr "Empleado o nombre de diario"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Facturas"
@@ -499,6 +499,7 @@ msgid "Currency"
 msgstr "Moneda"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -828,7 +829,7 @@ msgid "Timesheet Line"
 msgstr "Línea de la hoja de servicios"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Producto de balance necesario"
@@ -1068,7 +1069,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Líneas analíticas para facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Por favor, indique un producto de balance en el asistente"
@@ -1195,56 +1196,3 @@ msgstr "Año"
 
 #~ msgid "Invoicing"
 #~ msgstr "A facturar"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Informes de contabilidad analítica"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Informes - Líneas analíticas"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Mis hojas de servicios diarios por cuenta"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Mi hoja de servicios del mes"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Líneas hoja de servicios aleatorias"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Informes - Hoja de servicios"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Mis hojas de servicios por cuenta"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Informe hoja de servicios aleatorio"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Hojas de servicios aleatorias"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Líneas hoja de servicios aleatorias"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Hoja de servicios aleatoria"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Mis hojas de servicios a facturar"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Módulo que añade vistas de hojas de servicios como\n"
-#~ "    Todos los meses, Hojas de servicios por usuario, Hoja de servicios del "
-#~ "mes,  Hojas de servicios por cuenta"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Hoja de servicios por usuario (este mes)"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Working Hours"
-#~ msgstr "Horario de trabajo"
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index 4f67c3e8e21..443bad9b60e 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr "Empleado o nombre de diario"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Facturas"
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Moneda"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -807,7 +808,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Producto de balance necesario"
@@ -1041,7 +1042,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Por favor, indique un producto de balance en el asistente"
diff --git a/addons/hr_timesheet_invoice/i18n/es_MX.po b/addons/hr_timesheet_invoice/i18n/es_MX.po
new file mode 100644
index 00000000000..614a694b2d7
--- /dev/null
+++ b/addons/hr_timesheet_invoice/i18n/es_MX.po
@@ -0,0 +1,1198 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* hr_timesheet_invoice
+#
+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-18 09:11+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: 2011-09-05 05:27+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Hoja de servicios por usuario"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Type of invoicing"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Profit"
+msgstr "Beneficio"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:68
+#, python-format
+msgid "Analytic account incomplete"
+msgstr "Cuenta analítica incompleta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
+msgid "Create invoice from timesheet final"
+msgstr "Crear factura desde hoja de servicios final"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Force to use a specific product"
+msgstr "Forzar para utilizar un producto específico"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "    7 Days    "
+msgstr "    7 días    "
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.line:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Hoja de servicios por día"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,name:0
+msgid "Name of entry"
+msgstr "Nombre de la entrada"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,pricelist_id:0
+msgid ""
+"The product to invoice is defined on the employee form, the price will be "
+"deduced by this pricelist on the product."
+msgstr ""
+"El producto a facturar se define en el formulario de empleado, el precio se "
+"deducirá del producto mediante esta lista de precios."
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
+msgid "Invoice Rate"
+msgstr "Tasa de facturación"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,time:0
+msgid "Display time in the history of works"
+msgstr "Mostrar tiempo en el historial de trabajos"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Journals"
+msgstr "Diarios"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
+msgstr "Tiempo consumido"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_invoiced:0
+msgid "Invoiced Amount"
+msgstr "Importe facturado"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Uninvoiced line with billing rate"
+msgstr "Línea no facturada con tasa de facturación"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,pricelist_id:0
+msgid "Sale Pricelist"
+msgstr "Lista de precios de venta"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Reactivate Account"
+msgstr "Reactivar cuenta"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,name:0
+msgid "The detail of each work done will be displayed on the invoice"
+msgstr "El detalle de cada trabajo realizado se mostrará en la factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
+msgid "Create invoice from timesheet"
+msgstr "Crear factura desde hoja de servicios"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period to enddate"
+msgstr "Periodo hasta fecha final"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Cuenta analítica a cerrar"
+
+#. module: hr_timesheet_invoice
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
+msgstr "No facturar líneas con coste"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Final invoice for analytic account"
+msgstr "Factura final para la cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:76
+#, python-format
+msgid "Analytic Account incomplete"
+msgstr "Cuenta analítica incompleta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
+#: field:report.timesheet.line,account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
+msgid "Accounts to invoice"
+msgstr "Cuentas a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No se pueden crear cuentas analíticas recursivas."
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,time:0
+msgid "The time of each work done will be displayed on the invoice"
+msgstr "El tiempo de cada trabajo realizado se mostrará en la factura"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,balance_product:0
+msgid "Balance product"
+msgstr "Balance de producto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
+msgid "hr.timesheet.analytic.cost.ledger"
+msgstr "rrhh.partehoras.analitica.coste.libro"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
+msgid "Final Invoice"
+msgstr "Factura final"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Do you want details for each line of the invoices ?"
+msgstr "¿Quiere detalles para cada línea de las facturas?"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.line,to_invoice:0
+msgid "It allows to set the discount while making invoice"
+msgstr "Permite establecer el descuento al facturar"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,price:0
+msgid ""
+"The cost of each work done will be displayed on the invoice. You probably "
+"don't want to check this"
+msgstr ""
+"El coste de cada trabajo realizado se detallará en la factura. Probablemente "
+"no desee activar esto"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,customer_name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:118
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
+msgid "Gratis"
+msgstr "Gratis"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
+msgid ""
+"\n"
+"Module to generate invoices based on costs (human resources, expenses, "
+"...).\n"
+"You can define price lists in analytic account, make some theoretical "
+"revenue\n"
+"reports, eso."
+msgstr ""
+"\n"
+"Módulo para generar facturas basadas en los costes (recursos humanos, "
+"gastos, ...).\n"
+"Puede definir tarifas en la cuenta analítica, hacer algunos informes sobre "
+"ingresos\n"
+"teóricos, ..."
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"Fill this field if you plan to automatically generate invoices based on the "
+"costs in this analytic account: timesheets, expenses, ...You can configure "
+"an automatic invoice rate on analytic accounts."
+msgstr ""
+"Rellene este campo si va a generar automáticamente las facturas basadas en "
+"los costes de esta cuenta analítica: hojas de servicios, gastos, ... Se "
+"puede configurar un porcentaje de facturación automática en las cuentas "
+"analíticas."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
+msgid "Timesheet Profit"
+msgstr "Beneficio hoja servicios"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:80
+#, python-format
+msgid "Partner incomplete"
+msgstr "Empresa incompleta"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,name:0
+msgid "Display detail of work in the invoice line."
+msgstr "Mostrar detalle del trabajo en la línea de factura."
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Printing date"
+msgstr "Fecha impresión"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
+msgid "Bill Tasks Works"
+msgstr "Facturar trabajos de tareas"
+
+#. module: hr_timesheet_invoice
+#: 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 "Tipos de facturación"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Theorical"
+msgstr "Teórico"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:119
+#, python-format
+msgid "You can not modify an invoiced analytic line!"
+msgstr "¡No puede modificar una línea analítica facturada!"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Líneas analíticas para informe facturación"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
+msgid "Timesheet by User"
+msgstr "Hoja de servicios por usuario"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
+msgid "Timesheet by Invoice"
+msgstr "Hoja de servicios por factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Cuentas analíticas expiradas"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,factor:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
+msgid "Yes (100%)"
+msgstr "Sí (100%)"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Employee or Journal Name"
+msgstr "Empleado o nombre de diario"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
+#, python-format
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,month:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,month:0
+#: field:report_timesheet.account,month:0
+#: field:report_timesheet.account.date,month:0
+#: field:report_timesheet.user,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,product:0
+msgid ""
+"Complete this field only if you want to force to use a specific product. "
+"Keep empty to use the real product that comes from the cost."
+msgstr ""
+"Complete este campo sólo si quiere obligar a utilizar un producto "
+"específico. Déjelo vacío para utilizar el producto real que viene del coste."
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Non Assigned timesheets to users"
+msgstr "Hoja de tareas no asignada a los usuarios"
+
+#. module: hr_timesheet_invoice
+#: field:report.timesheet.line,invoice_id:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Máx. cantidad"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Invoice Balance amount"
+msgstr "Saldo pendiente de factura"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Invoice rate by user"
+msgstr "Ratio de facturación por usuario"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_from:0
+msgid "From"
+msgstr "Desde"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,amount_invoiced:0
+msgid "Total invoiced"
+msgstr "Total facturado"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period to"
+msgstr "Periodo hasta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_cost_ledger
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr "Costo contable"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
+msgid "50%"
+msgstr "50%"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,date:0
+msgid "Display date in the history of works"
+msgstr "Mostrar fecha en el historial de trabajos"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
+msgid "Timesheet by Account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,date:0
+#: field:hr.timesheet.invoice.create.final,date:0
+#: field:report.timesheet.line,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:81
+#, python-format
+msgid "Please fill in the Address field in the Partner: %s."
+msgstr "Por favor rellene el campo dirección de la empresa: %s."
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Eff."
+msgstr "Ef."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
+msgid "Invoice analytic lines"
+msgstr "Facturar las líneas analíticas"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "Cód. diario/Nombre mov."
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:69
+#, python-format
+msgid ""
+"Please fill in the partner and pricelist field in the analytic account:\n"
+"%s"
+msgstr ""
+"Rellene los campos empresa y tarifa de la cuenta analítica:\n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date2:0
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: field:report.analytic.account.close,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,quantity:0
+#: field:report_timesheet.account,quantity:0
+#: field:report_timesheet.account.date,quantity:0
+#: field:report_timesheet.invoice,quantity:0
+#: field:report_timesheet.user,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr "Fecha/Código"
+
+#. module: hr_timesheet_invoice
+#: field:report.timesheet.line,general_account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimir beneficio de la hoja de servicios"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,to_invoice:0
+msgid "Reinvoice Costs"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Totals:"
+msgstr "Totales:"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_to:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Do you want to show details of work in invoice ?"
+msgstr "¿Desea mostrar detalles del trabajo en la factura?"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period from"
+msgstr "Período desde"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_max:0
+msgid "Max. Invoice Price"
+msgstr "Precio máx. factura"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,invoice_id:0
+#: model:ir.model,name:hr_timesheet_invoice.model_account_invoice
+#: view:report.timesheet.line:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+msgid ""
+"OpenERP allows you to create default invoicing types. You might have to "
+"regularly assign discounts because of a specific contract or agreement with "
+"a customer. From this menu, you can create additional types of invoicing to "
+"speed up your invoicing."
+msgstr ""
+"OpenERP le permite crear tipos de facturación por defecto. Puede que tenga "
+"que asignar regularmente descuentos a causa de un contrato o acuerdo "
+"específico con un cliente. Desde este menú, puede crear otros tipos de "
+"facturación adicionales para acelerar su facturación."
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
+#: view:report.timesheet.line:0
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
+#, python-format
+msgid "Balance product needed"
+msgstr "Producto de balance necesario"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Billing Data"
+msgstr "Datos facturación"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
+#, python-format
+msgid ""
+"Please fill in the Partner or Customer and Sale Pricelist fields in the "
+"Analytic Account:\n"
+"%s"
+msgstr ""
+"Rellene los campos empresa o cliente y la tarifa de venta de la cuenta "
+"analítica:\n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,customer_name:0
+msgid "Label for the customer"
+msgstr "Etiqueta para el cliente"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,price:0
+msgid "Display cost of the item you reinvoice"
+msgstr "Mostrar el coste del artículo que vuelve a facturar"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,date:0
+msgid "The real date of each work will be displayed on the invoice"
+msgstr "La fecha real de cada trabajo será mostrada en la factura"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
+#, python-format
+msgid "At least one line has no product !"
+msgstr "¡Como mínimo una línea no tiene producto!"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Hojas de servicios a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date1:0
+msgid "Start of period"
+msgstr "Inicio del período"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
+msgid "Daily Timesheet by Account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,product:0
+#: field:report.account.analytic.line.to.invoice,product_id:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
+msgid "Uninvoice lines with billing rate"
+msgstr "No facturar líneas con coste"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "%"
+msgstr "%"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
+msgstr "Nombre interno"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,journal_ids:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,balance_product:0
+msgid "The product that will be used to invoice the remaining amount"
+msgstr "El producto que se utilizará para facturar el importe restante."
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+msgid ""
+"This list shows you every task you can invoice to the customer. Select the "
+"lines and click the Action button to generate the invoices automatically."
+msgstr ""
+"Esta lista muestra todas las tareas que puede facturar al cliente. "
+"Seleccione las líneas y haga clic en el botón de acción para generar las "
+"facturas automáticamente."
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "No Records Found for Report!"
+msgstr "¡No se han encontrado registros para el informe!"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Hoja de servicios por factura"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+msgid "Select Period"
+msgstr "Seleccionar periodo"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period from startdate"
+msgstr "Periodo desde fecha inicial"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Invoice on analytic lines"
+msgstr "Facturación basada en líneas analíticas"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Precio venta"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Hojas de servicios por día"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Invoicing Data"
+msgstr "Datos facturación"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,factor:0
+msgid "Discount in percentage"
+msgstr "Descuento en porcentaje"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Types of invoicing"
+msgstr "Tipos de facturación"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Hojas de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:report.account.analytic.line.to.invoice,unit_amount:0
+msgid "Units"
+msgstr "Unidades"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Líneas analíticas para facturar"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
+#, python-format
+msgid "Please fill a Balance product in the wizard"
+msgstr "Por favor, indique un producto de balance en el asistente"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:hr.timesheet.invoice.create,price:0
+#: field:hr.timesheet.invoice.create.final,price:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,cost:0
+#: field:report_timesheet.user,cost:0
+msgid "Cost"
+msgstr "Coste"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
+msgstr "Año"
+
+#~ msgid "Visible name"
+#~ msgstr "Nombre visible"
+
+#~ msgid ""
+#~ "The cost of each work done will be displayed on the invoice. You probably "
+#~ "don't want to check this."
+#~ msgstr ""
+#~ "El coste de cada trabajo realizado se mostrará en la factura. Probablemente "
+#~ "no quiere marcar esta opción."
+
+#~ msgid "Draft Analytic Accounts"
+#~ msgstr "Cuentas analíticas borrador"
+
+#~ msgid ""
+#~ "Check this field if you plan to automatically generate invoices based on the "
+#~ "costs in this analytic account: timesheets, expenses, ...You can configure "
+#~ "an automatic invoice rate on analytic accounts."
+#~ msgstr ""
+#~ "Marque este campo si desea generar automáticamente facturas basadas en los "
+#~ "costes en esta cuenta analítica: hojas de servicios, gastos, ... Puede "
+#~ "configurar una tasa de factura automática sobre cuentas analíticas."
+
+#~ msgid "Select period"
+#~ msgstr "Seleccionar período"
+
+#~ msgid "Choose"
+#~ msgstr "Seleccionar"
+
+#~ msgid "Open Analytic Accounts"
+#~ msgstr "Cuentas analíticas abiertas"
+
+#~ msgid "Filter on Accounts"
+#~ msgstr "Filtrar en cuentas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Mis entradas no facturadas"
+
+#~ msgid "Uninvoiced Entries"
+#~ msgstr "Entradas no facturadas"
+
+#~ msgid "Create invoices"
+#~ msgstr "Crear facturas"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "The product that will be used to invoice the remaining amount."
+#~ msgstr "El producto que se utilizará para facturar el importe restante."
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Cuentas analíticas"
+
+#~ msgid "Entries to invoice"
+#~ msgstr "Entradas a facturar"
+
+#~ 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 "Choose accounts you want to invoice"
+#~ msgstr "Seleccionar cuentas que quiere facturar"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Cuentas analíticas pendientes"
+
+#~ msgid "Invoice rate"
+#~ msgstr "Tasa factura"
+
+#~ msgid "Unclosed Invoiceable Accounts"
+#~ msgstr "Cuentas facturables no cerradas"
+
+#~ msgid "Date or Code"
+#~ msgstr "Fecha o código"
+
+#, python-format
+#~ msgid ""
+#~ "Please fill in the Associate Partner and Sale Pricelist fields in the "
+#~ "Analytic Account:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Por favor rellene los campos empresa asociada y tarifa de venta en la cuenta "
+#~ "analítica:\n"
+#~ "%s"
+
+#~ msgid "J.C. or Move name"
+#~ msgstr "Cód. diario o asiento"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Invoicing"
+#~ msgstr "A facturar"
diff --git a/addons/hr_timesheet_invoice/i18n/es_VE.po b/addons/hr_timesheet_invoice/i18n/es_VE.po
new file mode 100644
index 00000000000..614a694b2d7
--- /dev/null
+++ b/addons/hr_timesheet_invoice/i18n/es_VE.po
@@ -0,0 +1,1198 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* hr_timesheet_invoice
+#
+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-18 09:11+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: 2011-09-05 05:27+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Hoja de servicios por usuario"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Type of invoicing"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Profit"
+msgstr "Beneficio"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:68
+#, python-format
+msgid "Analytic account incomplete"
+msgstr "Cuenta analítica incompleta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
+msgid "Create invoice from timesheet final"
+msgstr "Crear factura desde hoja de servicios final"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Force to use a specific product"
+msgstr "Forzar para utilizar un producto específico"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "    7 Days    "
+msgstr "    7 días    "
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.line:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Hoja de servicios por día"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,name:0
+msgid "Name of entry"
+msgstr "Nombre de la entrada"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,pricelist_id:0
+msgid ""
+"The product to invoice is defined on the employee form, the price will be "
+"deduced by this pricelist on the product."
+msgstr ""
+"El producto a facturar se define en el formulario de empleado, el precio se "
+"deducirá del producto mediante esta lista de precios."
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
+msgid "Invoice Rate"
+msgstr "Tasa de facturación"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,time:0
+msgid "Display time in the history of works"
+msgstr "Mostrar tiempo en el historial de trabajos"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Journals"
+msgstr "Diarios"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
+msgstr "Tiempo consumido"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_invoiced:0
+msgid "Invoiced Amount"
+msgstr "Importe facturado"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Uninvoiced line with billing rate"
+msgstr "Línea no facturada con tasa de facturación"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,pricelist_id:0
+msgid "Sale Pricelist"
+msgstr "Lista de precios de venta"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Reactivate Account"
+msgstr "Reactivar cuenta"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,name:0
+msgid "The detail of each work done will be displayed on the invoice"
+msgstr "El detalle de cada trabajo realizado se mostrará en la factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
+msgid "Create invoice from timesheet"
+msgstr "Crear factura desde hoja de servicios"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period to enddate"
+msgstr "Periodo hasta fecha final"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Cuenta analítica a cerrar"
+
+#. module: hr_timesheet_invoice
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
+msgstr "No facturar líneas con coste"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Final invoice for analytic account"
+msgstr "Factura final para la cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:76
+#, python-format
+msgid "Analytic Account incomplete"
+msgstr "Cuenta analítica incompleta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
+#: field:report.timesheet.line,account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
+msgid "Accounts to invoice"
+msgstr "Cuentas a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No se pueden crear cuentas analíticas recursivas."
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,time:0
+msgid "The time of each work done will be displayed on the invoice"
+msgstr "El tiempo de cada trabajo realizado se mostrará en la factura"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,balance_product:0
+msgid "Balance product"
+msgstr "Balance de producto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
+msgid "hr.timesheet.analytic.cost.ledger"
+msgstr "rrhh.partehoras.analitica.coste.libro"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
+msgid "Final Invoice"
+msgstr "Factura final"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Do you want details for each line of the invoices ?"
+msgstr "¿Quiere detalles para cada línea de las facturas?"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.line,to_invoice:0
+msgid "It allows to set the discount while making invoice"
+msgstr "Permite establecer el descuento al facturar"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,price:0
+msgid ""
+"The cost of each work done will be displayed on the invoice. You probably "
+"don't want to check this"
+msgstr ""
+"El coste de cada trabajo realizado se detallará en la factura. Probablemente "
+"no desee activar esto"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,customer_name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:118
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
+msgid "Gratis"
+msgstr "Gratis"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
+msgid ""
+"\n"
+"Module to generate invoices based on costs (human resources, expenses, "
+"...).\n"
+"You can define price lists in analytic account, make some theoretical "
+"revenue\n"
+"reports, eso."
+msgstr ""
+"\n"
+"Módulo para generar facturas basadas en los costes (recursos humanos, "
+"gastos, ...).\n"
+"Puede definir tarifas en la cuenta analítica, hacer algunos informes sobre "
+"ingresos\n"
+"teóricos, ..."
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"Fill this field if you plan to automatically generate invoices based on the "
+"costs in this analytic account: timesheets, expenses, ...You can configure "
+"an automatic invoice rate on analytic accounts."
+msgstr ""
+"Rellene este campo si va a generar automáticamente las facturas basadas en "
+"los costes de esta cuenta analítica: hojas de servicios, gastos, ... Se "
+"puede configurar un porcentaje de facturación automática en las cuentas "
+"analíticas."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
+msgid "Timesheet Profit"
+msgstr "Beneficio hoja servicios"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:80
+#, python-format
+msgid "Partner incomplete"
+msgstr "Empresa incompleta"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,name:0
+msgid "Display detail of work in the invoice line."
+msgstr "Mostrar detalle del trabajo en la línea de factura."
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Printing date"
+msgstr "Fecha impresión"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
+msgid "Bill Tasks Works"
+msgstr "Facturar trabajos de tareas"
+
+#. module: hr_timesheet_invoice
+#: 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 "Tipos de facturación"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Theorical"
+msgstr "Teórico"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:119
+#, python-format
+msgid "You can not modify an invoiced analytic line!"
+msgstr "¡No puede modificar una línea analítica facturada!"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Líneas analíticas para informe facturación"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
+msgid "Timesheet by User"
+msgstr "Hoja de servicios por usuario"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
+msgid "Timesheet by Invoice"
+msgstr "Hoja de servicios por factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Cuentas analíticas expiradas"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,factor:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
+msgid "Yes (100%)"
+msgstr "Sí (100%)"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Employee or Journal Name"
+msgstr "Empleado o nombre de diario"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
+#, python-format
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,month:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,month:0
+#: field:report_timesheet.account,month:0
+#: field:report_timesheet.account.date,month:0
+#: field:report_timesheet.user,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,product:0
+msgid ""
+"Complete this field only if you want to force to use a specific product. "
+"Keep empty to use the real product that comes from the cost."
+msgstr ""
+"Complete este campo sólo si quiere obligar a utilizar un producto "
+"específico. Déjelo vacío para utilizar el producto real que viene del coste."
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Non Assigned timesheets to users"
+msgstr "Hoja de tareas no asignada a los usuarios"
+
+#. module: hr_timesheet_invoice
+#: field:report.timesheet.line,invoice_id:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Máx. cantidad"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Invoice Balance amount"
+msgstr "Saldo pendiente de factura"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Invoice rate by user"
+msgstr "Ratio de facturación por usuario"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_from:0
+msgid "From"
+msgstr "Desde"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,amount_invoiced:0
+msgid "Total invoiced"
+msgstr "Total facturado"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period to"
+msgstr "Periodo hasta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_cost_ledger
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr "Costo contable"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
+msgid "50%"
+msgstr "50%"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,date:0
+msgid "Display date in the history of works"
+msgstr "Mostrar fecha en el historial de trabajos"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
+msgid "Timesheet by Account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,date:0
+#: field:hr.timesheet.invoice.create.final,date:0
+#: field:report.timesheet.line,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:81
+#, python-format
+msgid "Please fill in the Address field in the Partner: %s."
+msgstr "Por favor rellene el campo dirección de la empresa: %s."
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Eff."
+msgstr "Ef."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
+msgid "Invoice analytic lines"
+msgstr "Facturar las líneas analíticas"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "Cód. diario/Nombre mov."
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:69
+#, python-format
+msgid ""
+"Please fill in the partner and pricelist field in the analytic account:\n"
+"%s"
+msgstr ""
+"Rellene los campos empresa y tarifa de la cuenta analítica:\n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date2:0
+msgid "End of period"
+msgstr "Fin del período"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: field:report.analytic.account.close,balance:0
+msgid "Balance"
+msgstr "Saldo pendiente"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,quantity:0
+#: field:report_timesheet.account,quantity:0
+#: field:report_timesheet.account.date,quantity:0
+#: field:report_timesheet.invoice,quantity:0
+#: field:report_timesheet.user,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr "Fecha/Código"
+
+#. module: hr_timesheet_invoice
+#: field:report.timesheet.line,general_account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Imprimir beneficio de la hoja de servicios"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,to_invoice:0
+msgid "Reinvoice Costs"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Totals:"
+msgstr "Totales:"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_to:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Do you want to show details of work in invoice ?"
+msgstr "¿Desea mostrar detalles del trabajo en la factura?"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period from"
+msgstr "Período desde"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_max:0
+msgid "Max. Invoice Price"
+msgstr "Precio máx. factura"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,invoice_id:0
+#: model:ir.model,name:hr_timesheet_invoice.model_account_invoice
+#: view:report.timesheet.line:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+msgid ""
+"OpenERP allows you to create default invoicing types. You might have to "
+"regularly assign discounts because of a specific contract or agreement with "
+"a customer. From this menu, you can create additional types of invoicing to "
+"speed up your invoicing."
+msgstr ""
+"OpenERP le permite crear tipos de facturación por defecto. Puede que tenga "
+"que asignar regularmente descuentos a causa de un contrato o acuerdo "
+"específico con un cliente. Desde este menú, puede crear otros tipos de "
+"facturación adicionales para acelerar su facturación."
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
+#: view:report.timesheet.line:0
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
+#, python-format
+msgid "Balance product needed"
+msgstr "Producto de balance necesario"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Billing Data"
+msgstr "Datos facturación"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
+#, python-format
+msgid ""
+"Please fill in the Partner or Customer and Sale Pricelist fields in the "
+"Analytic Account:\n"
+"%s"
+msgstr ""
+"Rellene los campos empresa o cliente y la tarifa de venta de la cuenta "
+"analítica:\n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,customer_name:0
+msgid "Label for the customer"
+msgstr "Etiqueta para el cliente"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,price:0
+msgid "Display cost of the item you reinvoice"
+msgstr "Mostrar el coste del artículo que vuelve a facturar"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,date:0
+msgid "The real date of each work will be displayed on the invoice"
+msgstr "La fecha real de cada trabajo será mostrada en la factura"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
+#, python-format
+msgid "At least one line has no product !"
+msgstr "¡Como mínimo una línea no tiene producto!"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Hojas de servicios a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date1:0
+msgid "Start of period"
+msgstr "Inicio del período"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
+msgid "Daily Timesheet by Account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,product:0
+#: field:report.account.analytic.line.to.invoice,product_id:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
+msgid "Uninvoice lines with billing rate"
+msgstr "No facturar líneas con coste"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "%"
+msgstr "%"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
+msgstr "Nombre interno"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,journal_ids:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,balance_product:0
+msgid "The product that will be used to invoice the remaining amount"
+msgstr "El producto que se utilizará para facturar el importe restante."
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+msgid ""
+"This list shows you every task you can invoice to the customer. Select the "
+"lines and click the Action button to generate the invoices automatically."
+msgstr ""
+"Esta lista muestra todas las tareas que puede facturar al cliente. "
+"Seleccione las líneas y haga clic en el botón de acción para generar las "
+"facturas automáticamente."
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "No Records Found for Report!"
+msgstr "¡No se han encontrado registros para el informe!"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Hoja de servicios por factura"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+msgid "Select Period"
+msgstr "Seleccionar periodo"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period from startdate"
+msgstr "Periodo desde fecha inicial"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Invoice on analytic lines"
+msgstr "Facturación basada en líneas analíticas"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Precio venta"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Hojas de servicios por día"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Invoicing Data"
+msgstr "Datos facturación"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,factor:0
+msgid "Discount in percentage"
+msgstr "Descuento en porcentaje"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Types of invoicing"
+msgstr "Tipos de facturación"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Hojas de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:report.account.analytic.line.to.invoice,unit_amount:0
+msgid "Units"
+msgstr "Unidades"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Líneas analíticas para facturar"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
+#, python-format
+msgid "Please fill a Balance product in the wizard"
+msgstr "Por favor, indique un producto de balance en el asistente"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:hr.timesheet.invoice.create,price:0
+#: field:hr.timesheet.invoice.create.final,price:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,cost:0
+#: field:report_timesheet.user,cost:0
+msgid "Cost"
+msgstr "Coste"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
+msgstr "Año"
+
+#~ msgid "Visible name"
+#~ msgstr "Nombre visible"
+
+#~ msgid ""
+#~ "The cost of each work done will be displayed on the invoice. You probably "
+#~ "don't want to check this."
+#~ msgstr ""
+#~ "El coste de cada trabajo realizado se mostrará en la factura. Probablemente "
+#~ "no quiere marcar esta opción."
+
+#~ msgid "Draft Analytic Accounts"
+#~ msgstr "Cuentas analíticas borrador"
+
+#~ msgid ""
+#~ "Check this field if you plan to automatically generate invoices based on the "
+#~ "costs in this analytic account: timesheets, expenses, ...You can configure "
+#~ "an automatic invoice rate on analytic accounts."
+#~ msgstr ""
+#~ "Marque este campo si desea generar automáticamente facturas basadas en los "
+#~ "costes en esta cuenta analítica: hojas de servicios, gastos, ... Puede "
+#~ "configurar una tasa de factura automática sobre cuentas analíticas."
+
+#~ msgid "Select period"
+#~ msgstr "Seleccionar período"
+
+#~ msgid "Choose"
+#~ msgstr "Seleccionar"
+
+#~ msgid "Open Analytic Accounts"
+#~ msgstr "Cuentas analíticas abiertas"
+
+#~ msgid "Filter on Accounts"
+#~ msgstr "Filtrar en cuentas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "My Uninvoiced Entries"
+#~ msgstr "Mis entradas no facturadas"
+
+#~ msgid "Uninvoiced Entries"
+#~ msgstr "Entradas no facturadas"
+
+#~ msgid "Create invoices"
+#~ msgstr "Crear facturas"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "The product that will be used to invoice the remaining amount."
+#~ msgstr "El producto que se utilizará para facturar el importe restante."
+
+#~ msgid "Analytic Accounts"
+#~ msgstr "Cuentas analíticas"
+
+#~ msgid "Entries to invoice"
+#~ msgstr "Entradas a facturar"
+
+#~ 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 "Choose accounts you want to invoice"
+#~ msgstr "Seleccionar cuentas que quiere facturar"
+
+#~ msgid "Pending Analytic Accounts"
+#~ msgstr "Cuentas analíticas pendientes"
+
+#~ msgid "Invoice rate"
+#~ msgstr "Tasa factura"
+
+#~ msgid "Unclosed Invoiceable Accounts"
+#~ msgstr "Cuentas facturables no cerradas"
+
+#~ msgid "Date or Code"
+#~ msgstr "Fecha o código"
+
+#, python-format
+#~ msgid ""
+#~ "Please fill in the Associate Partner and Sale Pricelist fields in the "
+#~ "Analytic Account:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Por favor rellene los campos empresa asociada y tarifa de venta en la cuenta "
+#~ "analítica:\n"
+#~ "%s"
+
+#~ msgid "J.C. or Move name"
+#~ msgstr "Cód. diario o asiento"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Invoicing"
+#~ msgstr "A facturar"
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index d0b2ec4c078..14ff0fbbe5f 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr "Töötaja või päeviku nimi"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Valuuta"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Analüütilised read arveldada"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1142,50 +1143,3 @@ msgstr ""
 
 #~ msgid "Invoice rate"
 #~ msgstr "Arve määr"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Analüütilise konto aruandlus"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Analüütilised read - Aruandlus"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Minu igapäevased tööajakaardid konto järgi"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Minu kuu tööajakaart"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Juhuslikud tööajalehe read"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Tööajaleht - Aruandlus"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Minu tööajakaardid konto järgi"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Juhuslik tööajalehe aruanne"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Juhuslikud tööajalehed"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Juhuslikud tööajalehtede read"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Juhuslik tööajaleht"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Minu tööajakaardid arveldamiseks"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Moodul tööajalehe vaadete lisamiseks nagu nt\n"
-#~ "    Kõik kuud, Tööajaleht kasutaja järgi, Kuu tööajaleht, Tööajaleht konto "
-#~ "järgi"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Tööajakaart kasutaja järgi (see kuu)"
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index a01bacd0ea9..ce0ffba93bd 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -456,7 +456,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -486,6 +486,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -808,7 +809,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1042,7 +1043,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index b3bf04bdbbb..c02336861c8 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-14 08:49+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-08-29 20:46+0000\n"
+"Last-Translator: t.o <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -109,7 +108,7 @@ msgstr "Cette année"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
 msgid "Display time in the history of works"
-msgstr "Affiché le temps dans l'historique des travaux"
+msgstr "Afficher le temps dans l'historique des travaux"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -136,7 +135,7 @@ msgstr "Compte"
 #: field:hr.timesheet.invoice.create,time:0
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time spent"
-msgstr "Temps dépensé"
+msgstr "Temps passé"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
@@ -171,7 +170,7 @@ msgstr "Réactiver le compte"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
 msgid "The detail of each work done will be displayed on the invoice"
-msgstr "Le détail de chaque travail terminé sera affiché sur la facture"
+msgstr "Chaque travail terminé sera détaillé sur la facture"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
@@ -470,7 +469,7 @@ msgid "Employee or Journal Name"
 msgstr "Employé ou nom du journal"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Factures"
@@ -500,6 +499,7 @@ msgid "Currency"
 msgstr "Devise"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -833,7 +833,7 @@ msgid "Timesheet Line"
 msgstr "Ligne de feuille de temps"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Balance produit nécéssaire"
@@ -1073,7 +1073,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Lignes analytique à facturer"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Veuillez remplir la balance produit dans l'assistant"
@@ -1175,28 +1175,3 @@ msgstr "Année"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom du model invalide pour la définition de l'action."
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Rapports des Comptes Analytiques"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Mes feuilles de présence journalières par comptes"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Mes feuilles de présence du mois"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Mes feuilles de présence par compte"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Mes feuilles de présence à facturer"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Feuille de présence par utilisateur (ce mois)"
-
-#~ msgid ""
-#~ "This lists show you every task work you can invoice to the customer. Select "
-#~ "the lines in order to generate the invoices automatically."
-#~ msgstr ""
-#~ "Cette liste regroupe toutes les tâches que vous pouvez facturer au client. "
-#~ "Sélectionnez les lignes dans l'ordre pour créer les factures automatiquement."
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index dd6154f83af..f021eb4bf8c 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Analitičke stavke za fakturiranje"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1082,49 +1083,3 @@ msgstr ""
 
 #~ msgid "Invoicing"
 #~ msgstr "Fakturiranje"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Izvještaji analitike"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Analitičke stavke - Izvještavanje"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Moji dnevni Rasporedi po Kupcu"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Moj raspored u mjesecu"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Nasumični tokovi Rasporeda"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Raspored - Izvještavanje"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Moji rasporedi prema Kupcu"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Nasumičan izvještaj Rasporeda"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Nasumični Rasporedi"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Nasumični tokovi Rasporeda"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Nasumičan Raspored"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Moji rasporedi za obračun"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Modul koji dodaje poglede Rasporeda poput: Čitav Mjesec, Raspored prema "
-#~ "Korisniku, Raspored Mjeseca, Raspored prema Kupcu"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Raspored prema Korisniku (Ovaj mjesec)"
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index 45c2ba7d70d..7fc411ec38c 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-03-03 15:08+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -467,7 +468,7 @@ msgid "Employee or Journal Name"
 msgstr "Alkalmazott vagy napló neve"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Számlák"
@@ -497,6 +498,7 @@ msgid "Currency"
 msgstr "Pénznem"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -829,7 +831,7 @@ msgid "Timesheet Line"
 msgstr "Munkaidő-kimutatás sora"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Maradványtermék szükséges"
@@ -1068,7 +1070,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Kiszámlázandó gyűjtőkód tételek"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Kérem, adjon meg egy maradványterméket a varázslóban!"
@@ -1097,40 +1099,3 @@ msgstr "Költség"
 #: field:report_timesheet.user,name:0
 msgid "Year"
 msgstr "Év"
-
-#~ msgid ""
-#~ "\n"
-#~ "\"\n"
-#~ "\"Module to generate invoices based on costs (human resources, expenses, "
-#~ "...).\n"
-#~ "\"\n"
-#~ "\"You can define price lists in analytic account, make some theoretical "
-#~ "revenue\n"
-#~ "\"\n"
-#~ "\"reports, eso."
-#~ msgstr ""
-#~ "\n"
-#~ "Költségeken alapuló számlák előállítására szolgáló modul.\n"
-#~ "\"\n"
-#~ "\"Árlistákat határozhat meg a gyűjtőkód törzsben, elméleti bevétel "
-#~ "kimutatásokat készíthet, stb."
-
-#~ msgid ""
-#~ "Please fill in the partner and pricelist field in the analytic account:\n"
-#~ "\"\n"
-#~ "\"%s"
-#~ msgstr ""
-#~ "Kérem, a gyűjtőkód törzsben töltse ki a partner és az árlista mezőt:\n"
-#~ "\"\n"
-#~ "\"%s"
-
-#~ msgid ""
-#~ "Please fill in the Partner or Customer and Sale Pricelist fields in the "
-#~ "Analytic Account:\n"
-#~ "\"\n"
-#~ "\"%s"
-#~ msgstr ""
-#~ "Kérem, a gyűjtőkód törzsben töltse ki a partner vagy vevő és az eladási "
-#~ "árlista mezőt: \n"
-#~ "\"\n"
-#~ "\"%s"
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index 4f9a40bac09..b457f51724e 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index 319f8fa5078..a0bb78e531f 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -468,7 +468,7 @@ msgid "Employee or Journal Name"
 msgstr "Nome del dipendente o giornale"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Fatture"
@@ -498,6 +498,7 @@ msgid "Currency"
 msgstr "Valuta"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -824,7 +825,7 @@ msgid "Timesheet Line"
 msgstr "Linea del Timesheet"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Necessario saldo prodotto"
@@ -1064,7 +1065,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Righe Analitiche da Fatturare"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Si prega di compilare un Saldo prodotto nella procedura guidata"
@@ -1166,24 +1167,6 @@ msgstr "Anno"
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "Contabilità Analitica in sospeso"
 
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Relatório de Conta Analítica"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "I Miei Orari di Lavoro giornalieri da Contabilità"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "I Miei Orari di Lavoro del mese"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "I Miei Orari di Lavoro da Contabilità"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "I Miei Orari di Lavoro da Fatturare"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Orari di Lavoro da Utente (questo mese)"
-
 #~ msgid ""
 #~ "The cost of each work done will be displayed on the invoice. You probably "
 #~ "don't want to check this."
@@ -1196,51 +1179,3 @@ msgstr "Anno"
 
 #~ msgid "Date or Code"
 #~ msgstr "Data o Codice"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Linee Foglio ore casuali"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Linee Analitiche - Stampe"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Modulo per aggiungere viste al Foglio Ore, come:\n"
-#~ "    Tutto il mese, Foglio ore per Utente, Foglio ore del mese, Foglio ore "
-#~ "per Conto"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Foglio ore - Stampe"
-
-#~ msgid "Current"
-#~ msgstr "Corrente"
-
-#~ msgid "Working Hours"
-#~ msgstr "Ore lavorative"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Timesheet casuale"
-
-#~ msgid ""
-#~ "OpenERP allows you to create default invoicing types. You could need to "
-#~ "regularly make discounts based on a specific contract or agreement with a "
-#~ "customer. From this menu, you can create additional default types of "
-#~ "invoicing that will speed up your invoicing."
-#~ msgstr ""
-#~ "OpenERP vi permette di creare tipi di fatture default. Vi può servire nel "
-#~ "caso creiate regolermente scontistiche basandovi su contratti specifici "
-#~ "oppure da accordi con il cliente. Da questo menù, è possibile creare "
-#~ "ulteriori tipi di fattura default per velocizzare ulteriormente la vostra "
-#~ "fatturazione."
-
-#~ msgid ""
-#~ "This lists show you every task work you can invoice to the customer. Select "
-#~ "the lines in order to generate the invoices automatically."
-#~ msgstr ""
-#~ "Questo elenco vi mostra tutte le attività lavorative che sono fatturabili al "
-#~ "cliente. Selezionare le linee in modo da generare automaticamente le fatture."
-
-#~ msgid "Search Timesheet Lines"
-#~ msgstr "Cerca linee timesheet"
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index 59818ec9c18..405fb4d0ffb 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -456,7 +456,7 @@ msgid "Employee or Journal Name"
 msgstr "직원 또는 저널 이름"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "인보이스"
@@ -486,6 +486,7 @@ msgid "Currency"
 msgstr "통화"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -806,7 +807,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "필요한 밸런스 상품"
@@ -1040,7 +1041,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "인보이스할 분석 라인들"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "위저드의 밸런스 상품을 기재하십시오."
@@ -1142,9 +1143,3 @@ msgstr ""
 
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "보류 중인 분석 계정"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "분석 계정 보고"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "분석 라인들 - 리포팅"
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 05545a6a154..85578d5023d 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 25051125c0b..67b72bd1eb4 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -456,7 +456,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -486,6 +486,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -806,7 +807,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1040,7 +1041,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/mn.po b/addons/hr_timesheet_invoice/i18n/mn.po
index 9f053490263..22337689313 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -477,7 +477,7 @@ msgid "Employee or Journal Name"
 msgstr "Ажилтан буюу журналын нэр"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Нэхэмжлэлүүд"
@@ -507,6 +507,7 @@ msgid "Currency"
 msgstr "Валют"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -830,7 +831,7 @@ msgid "Timesheet Line"
 msgstr "Цаг бүртгэлийн мөрүүд"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Үлдсэн дүнгийн бараа хэрэгтэй байна."
@@ -1067,7 +1068,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Аналитик мөрөөс нэхэмжлэл рүү"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Оруулах дэлгэцэд үлдсэн дүнгийн бараа талбарыг бөглөнө үү!"
@@ -1097,48 +1098,12 @@ msgstr "Өртөг"
 msgid "Year"
 msgstr "Он"
 
-#~ msgid "Random Timesheet"
-#~ msgstr "Гэнэтийн цаг бүртгэл"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Гэнэтийн цаг бүртгэлийн мөрүүд"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Гэнэтийн цаг бүртгэлүүд"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Дэлгэцийн үйлдлийн тодорхойлолтод моделийн нэр буруу байна."
 
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Гэнэтийн цаг бүртгэлийн тайлан"
-
-#, python-format
-#~ msgid ""
-#~ "Please fill in the partner and pricelist field '\n"
-#~ "                        'in the analytic account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Дараах аналитик данс дээрх харилцагч, үнийн саналыг бөглөнө үү! \n"
-#~ "%s"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Гэнэтийн цаг бүртгэлийн мөрүүд"
-
-#~ msgid "Current"
-#~ msgstr "Одоогийн"
-
 #~ msgid "Invoicing"
 #~ msgstr "Нэхэмжилж байгаа"
 
-#~ msgid "Working Hours"
-#~ msgstr "Ажлын цаг"
-
-#~ msgid "Search Timesheet Lines"
-#~ msgstr "Цаг бүртгэлийн мөрийг хайх"
-
 #~ msgid "Visible name"
 #~ msgstr "Харагдах нэр"
 
@@ -1220,38 +1185,3 @@ msgstr "Он"
 
 #~ msgid "Unclosed Invoiceable Accounts"
 #~ msgstr "Хаагдаагүй нэхэмжилж болох дансууд"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Аналитик дансны тайлан"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Аналитик мөр - Тайлан"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Өөрийн өдрийн цаг бүртгэлийг дансаар харах"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Миний сарын цаг бүртгэл"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Цаг бүртгэл - Тайлан"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Миний цаг бүртгэлийн данс"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Миний цаг бүртгэлийн нэхэмжлэх"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Дараа цаг бүртгэлийн дэлгэцийг энэ модуль нэмнэ\n"
-#~ "  Бүх сар, Цаг бүртгэлийг хэрэглэгчээр харах, Сарын цаг бүртгэл, Цаг "
-#~ "бүртгэлийг дансаар харах"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Хэрэглэгчийн цаг бүртгэл (энэ сард)"
-
-#~ msgid "90%"
-#~ msgstr "90%"
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index 93fee9d518f..142569b9404 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -468,7 +468,7 @@ msgid "Employee or Journal Name"
 msgstr "Naam medewerker of dagboek"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Facturen"
@@ -498,6 +498,7 @@ msgid "Currency"
 msgstr "Valuta"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -829,7 +830,7 @@ msgid "Timesheet Line"
 msgstr "Urenstaatregel"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1070,7 +1071,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Te factureren kostenplaatsboekingen"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1188,98 +1189,3 @@ msgstr "Jaar"
 
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "Wachtende kostenplaatsen"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Overzichten kostenplaatsen"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Kostenplaatsboekingen - Overzichten"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Mijn dagelijkse urenstaten per rekening"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Mijn urenstaat van de maand"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Willekeurige urenstaat regels"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Urenstaat - Rapportage"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Mijn urenstaten op rekening"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Overzicht willekeurige urenstaat"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Willekeurige urenstaten"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Willekeurige urenstaat regels"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Willekeurige urenstaat"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Mijn urenstaten voor facturering"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Module om urenstaat presentaties toe te voegen zoals:\n"
-#~ "     Alle maanden, per gebruiker, deze maand of per rekening"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Urenstaat op gebruiker (Deze maand)"
-
-#, python-format
-#~ msgid ""
-#~ "Please fill in the partner and pricelist field '\n"
-#~ "                        'in the analytic account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Vul aub de relatie en prijslijst velden '\n"
-#~ "                        'in de kostenplaats in:\n"
-#~ "%s"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Current"
-#~ msgstr "Actueel"
-
-#~ msgid "Working Hours"
-#~ msgstr "Werkuren"
-
-#~ msgid ""
-#~ "OpenERP allows you to create default invoicing types. You could need to "
-#~ "regularly make discounts based on a specific contract or agreement with a "
-#~ "customer. From this menu, you can create additional default types of "
-#~ "invoicing that will speed up your invoicing."
-#~ msgstr ""
-#~ "OpenERP laat u standaard factuursoorten maken. U kunt behoefte hebben om "
-#~ "regelmatig kortingen te hanteren bij specifieke contracten of overeenkomsten "
-#~ "met klanten. Vanuit dit menu kunt u aanvullende standaard factuursoorten "
-#~ "maken die de facturatiesnelheid zullen verhogen."
-
-#~ msgid ""
-#~ "This lists show you every task work you can invoice to the customer. Select "
-#~ "the lines in order to generate the invoices automatically."
-#~ msgstr ""
-#~ "Deze lijst laat alle taken zien die u kunt factureren aan de klant. "
-#~ "Selecteer de regels om de facturen automatisch te genereren."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "Search Timesheet Lines"
-#~ msgstr "Urenstaatregels zoeken"
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index b6e996213bc..391555442da 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index e997595434c..17f47d85e97 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr "Pracownik lub nazwa dziennika"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Waluta"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -807,7 +808,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1041,7 +1042,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Pozycje analityczne do zafakturowania"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1155,50 +1156,3 @@ msgstr ""
 
 #~ msgid "Invoice rate"
 #~ msgstr "Współczynnik fakturowania"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Raportowanie kont analitycznych"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "Raportowanie - Pozycje analityczne"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Moja dzienne karty czasu pracy wg konta"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Moja karta czasu pracy w miesiącu"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "Przypadkowe pozycje karty czasu pracy"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Karta czasu pracy - Raportowanie"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Moje karty czasu pracy wg konta"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "Raport przypadkowych kart czasu pracy"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "Przypadkowe karty czasu pracy"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "Pozycje przypadkowych kart czasu pracy"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "Przypadkowa karta czasu pracy"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Moje karty czasu pracy do zafakturowania"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr ""
-#~ "Moduł do dodawania widoków karty czasu pracy jak\n"
-#~ "    Wszystkie miesiące, Karta czasu pracy wg użytkownika, Karta czasu pracy "
-#~ "miesiąca, Karta czasu pracy wg konta"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Karta czasu pracy wg użytkownika (ten miesiąc)"
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index 305dac3bf3f..7b4c75b151a 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr "Funcionário ou Nome do Diário"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Facturas"
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Moeda"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -807,7 +808,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Necessário saldo do produto"
@@ -1041,7 +1042,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Linhas analíticas a facturar"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Por favor preencher um saldo do produto no assistente"
@@ -1086,21 +1087,6 @@ msgstr ""
 #~ msgid "Date or Code"
 #~ msgstr "Data ou Código"
 
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Meus horários diários por conta"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Meu horário do mês"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Meus horários por conta"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Meus horários a facturar"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Horário por utilizador (este mês)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definição da acção."
 
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 31acc8b5b7e..cd2d617dcaa 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -456,7 +456,7 @@ msgid "Employee or Journal Name"
 msgstr "Funcionário ou Nome do Diário"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Faturas"
@@ -486,6 +486,7 @@ msgid "Currency"
 msgstr "Moeda"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -808,7 +809,7 @@ msgid "Timesheet Line"
 msgstr "Linha da Planilha de Horas"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Saldo necessário do produto"
@@ -1042,7 +1043,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index dd83e842d3f..0cfec5a0a77 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index 10440d7ee5d..d67a82e054a 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -224,7 +224,7 @@ msgstr ""
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
 msgid "Analytic Account"
-msgstr "Счет аналитического учета"
+msgstr "Счёт аналитики"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,date_deadline:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Счета"
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Валюта"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr "Строка табеля"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Позиции аналитики к выставлению счетов"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1119,39 +1120,3 @@ msgstr "Год"
 
 #~ msgid "Status"
 #~ msgstr "Состояние"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "Отчет аналитического профиля"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Мои дневные табели по счетам"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Мой табель за месяц"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Мои табели по счетам"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Мои табели для выставления счетов"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Табель по пользователям (тек.мес.)"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Current"
-#~ msgstr "Текущий"
-
-#~ msgid "Working Hours"
-#~ msgstr "Рабочие часы"
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 88b95cce3a2..c21718cb76e 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Računi"
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Valuta"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/sq.po b/addons/hr_timesheet_invoice/i18n/sq.po
index 37e2850f8ed..317d31e57a0 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -456,7 +456,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -486,6 +486,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -806,7 +807,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1040,7 +1041,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/sr@latin.po b/addons/hr_timesheet_invoice/i18n/sr@latin.po
index 64e541fe8d1..41237bc9667 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -456,7 +456,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -486,6 +486,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -806,7 +807,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1040,7 +1041,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index fcf52c109ea..0b7aa60148f 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr "Employee or Journal Name"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr "Invoices"
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Currency"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -807,7 +808,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr "Balance product needed"
@@ -1041,7 +1042,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr "Please fill a Balance product in the wizard"
@@ -1104,9 +1105,6 @@ msgstr ""
 #~ msgid "Select period"
 #~ msgstr "Select period"
 
-#~ msgid "Warning"
-#~ msgstr "Warning"
-
 #~ msgid "Date or Code"
 #~ msgstr "Date or Code"
 
@@ -1119,31 +1117,15 @@ msgstr ""
 #~ msgid "Filter on Accounts"
 #~ msgstr "Filter on Accounts"
 
-#~ msgid "Invoice on analytic entries"
-#~ msgstr "Invoice on analytic entries"
-
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. or Move name"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
-#, python-format
-#~ msgid ""
-#~ "Please fill in the partner and pricelist field '\n"
-#~ "                        'in the analytic account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please fill in the partner and pricelist field '\n"
-#~ "                        'in the analytic account:\n"
-#~ "%s"
-
 #~ msgid "My Uninvoiced Entries"
 #~ msgstr "My Uninvoiced Entries"
 
-#~ msgid "The analytic entry \"%s\" is already invoiced!"
-#~ msgstr "The analytic entry \"%s\" is already invoiced!"
-
 #~ msgid "Uninvoiced Entries"
 #~ msgstr "Uninvoiced Entries"
 
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index 8c496379142..5ba8705b878 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index ce0837d0c49..234f8d90c4b 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr "Personel veya Yevmiye Adı"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr "Para Birimi"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Fatura Analitik Kalemleri"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1104,18 +1105,3 @@ msgstr ""
 
 #~ msgid "Invoicing"
 #~ msgstr "Faturalama"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Günlük Zaman Tablosu Hesabım"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Aylık Giriş-Çıkışlarım"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "Zaman Tablosu - Raporlama"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Giriş-Çıkış Hesabım"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Faturalanacak Giriş-Çıkışlarım"
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index d3055ed8655..b8c52c7b775 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr "Аналітичні рядки Рахунку-Фактури"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
@@ -1121,18 +1122,3 @@ msgstr ""
 
 #~ msgid "Unclosed Invoiceable Accounts"
 #~ msgstr "Незакриті рахунки для інвойсування"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "Мої щоденні табелі за рахунком"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "Мій табель за місяць"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "Мої табелі за рахунком"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "Мої табелі на оформлення"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "Табель за користувачами (цей місяць)"
diff --git a/addons/hr_timesheet_invoice/i18n/vi.po b/addons/hr_timesheet_invoice/i18n/vi.po
index b7cb1c808e2..ecad8e4f369 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -456,7 +456,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -486,6 +486,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -806,7 +807,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1040,7 +1041,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 19aae5d10b8..7cb01db4b55 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-08-03 06:24+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr "用户时间表"
+msgstr "用户计工单"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -36,22 +36,22 @@ msgstr "利润"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:68
 #, python-format
 msgid "Analytic account incomplete"
-msgstr ""
+msgstr "辅助核算项不完整"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
 msgid "Create invoice from timesheet final"
-msgstr ""
+msgstr "创建最终计工单的发票"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Force to use a specific product"
-msgstr "强制使用特定产品"
+msgstr "强制使用指定产品"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 天    "
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -61,12 +61,12 @@ msgstr "收入"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "开票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr "每天时间表"
+msgstr "每天计工单"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -75,24 +75,24 @@ msgstr "每天时间表"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
 msgid "Name of entry"
-msgstr "条目名称"
+msgstr "名称"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,pricelist_id:0
 msgid ""
 "The product to invoice is defined on the employee form, the price will be "
 "deduced by this pricelist on the product."
-msgstr ""
+msgstr "在员工界面开发票，产品的的价格将根据这个价格表。"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
 msgid "Invoice Rate"
-msgstr ""
+msgstr "开票税率"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -101,23 +101,23 @@ msgstr ""
 #: view:report_timesheet.account.date:0
 #: view:report_timesheet.user:0
 msgid "This Year"
-msgstr ""
+msgstr "该年"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
 msgid "Display time in the history of works"
-msgstr "显示时间在工作日志"
+msgstr "在工作日志显示时间"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Journals"
-msgstr ""
+msgstr "账簿"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
@@ -127,7 +127,7 @@ msgstr "计量单位"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Account"
-msgstr ""
+msgstr "项"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,time:0
@@ -143,7 +143,7 @@ msgstr "已开票金额"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Uninvoiced line with billing rate"
-msgstr ""
+msgstr "未开票明细和开票的税率"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -163,37 +163,37 @@ msgstr "金额"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Reactivate Account"
-msgstr ""
+msgstr "重新激活"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
 msgid "The detail of each work done will be displayed on the invoice"
-msgstr "每个完成工作的细节将显示在发票上"
+msgstr "每个完成的工作将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
-msgstr ""
+msgstr "创建计工单发票"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Period to enddate"
-msgstr "会计期间的结束日期"
+msgstr "期末日期"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
 msgid "Analytic account to close"
-msgstr "辅助核算项关闭"
+msgstr "关闭辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: view:board.board:0
 msgid "Uninvoice Lines With Billing Rate"
-msgstr ""
+msgstr "未开票明细和税率"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -205,18 +205,18 @@ msgstr "创建发票"
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr "科目(项)每日时间表"
+msgstr "每天计工单每个辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Final invoice for analytic account"
-msgstr ""
+msgstr "辅助核算项的最终发票"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:76
 #, python-format
 msgid "Analytic Account incomplete"
-msgstr ""
+msgstr "辅助核算項不完整"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
@@ -234,7 +234,7 @@ msgstr "截止日期"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "开发票"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -244,27 +244,27 @@ msgstr "业务伙伴"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "错误! 你不能创建递归的辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
 msgid "The time of each work done will be displayed on the invoice"
-msgstr "每个完成工作的时间将显示在发票上"
+msgstr "每个工作完成的时间将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,balance_product:0
 msgid "Balance product"
-msgstr "产品余额"
+msgstr "结余"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr "时间表"
+msgstr "计工单"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
 msgid "hr.timesheet.analytic.cost.ledger"
-msgstr ""
+msgstr "hr.timesheet.analytic.cost.ledger"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
@@ -274,7 +274,7 @@ msgstr "最终发票"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Do you want details for each line of the invoices ?"
-msgstr "你想看详情每一发票行?"
+msgstr "你想详细说明每一发票行?"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
@@ -298,7 +298,7 @@ msgstr "状态"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "数据不足！"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -313,35 +313,35 @@ msgstr "员工"
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
 msgid "It allows to set the discount while making invoice"
-msgstr ""
+msgstr "它允许在开票时设置折扣"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,price:0
 msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this"
-msgstr ""
+msgstr "工作完成的成本将显示在发票上。你可能不想勾选它。"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
 msgid "Lines to Invoice"
-msgstr "开发票"
+msgstr "明细开发票"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:118
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
 msgid "Gratis"
-msgstr ""
+msgstr "免费"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
@@ -354,8 +354,8 @@ msgid ""
 "reports, eso."
 msgstr ""
 "\n"
-"模块生成发票基于成本(人力资源,费用....)\n"
-"你能在辅助核算项目定义价格表,建立一些理论收入的报表"
+"模块生成发票基于的成本 (人力资源,费用....)\n"
+"您能在辅助核算项定义价格表，建立一些理论收入。"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
@@ -363,7 +363,7 @@ msgid ""
 "Fill this field if you plan to automatically generate invoices based on the "
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
-msgstr ""
+msgstr "如果您计划根据在辅助核算项的成本 (工作时间表，费用。。等) 自动产生发票，填写这字段。您能定义这辅助核算項的自动开票的税率。"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -371,18 +371,18 @@ msgstr ""
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
 msgid "Timesheet Profit"
-msgstr "时间表利润"
+msgstr "计工单收益"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:80
 #, python-format
 msgid "Partner incomplete"
-msgstr ""
+msgstr "业务伙伴不完整"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,name:0
 msgid "Display detail of work in the invoice line."
-msgstr "显示发票行的工作细节"
+msgstr "显示在发票行的工作细节"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -391,7 +391,7 @@ msgstr "显示发票行的工作细节"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -402,7 +402,7 @@ msgstr "打印日期"
 #: 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 "根据任务工作开发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -419,22 +419,22 @@ msgstr "理论"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:119
 #, python-format
 msgid "You can not modify an invoiced analytic line!"
-msgstr ""
+msgstr "您不能修改辅助核算明细的已开发票！"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
 msgid "Analytic lines to invoice report"
-msgstr "辅助核算开的发票报表"
+msgstr "辅助核算明细开出发票的报表"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
 msgid "Timesheet by User"
-msgstr "用户时间表"
+msgstr "用户计工单"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
 msgid "Timesheet by Invoice"
-msgstr "发票时间表"
+msgstr "发票的计工单"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
@@ -445,12 +445,12 @@ msgstr "过期的辅助核算项"
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,factor:0
 msgid "Discount (%)"
-msgstr "折扣%"
+msgstr "折扣(%)"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
 msgid "Yes (100%)"
-msgstr ""
+msgstr "是 (100%)"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -458,10 +458,10 @@ msgid "Employee or Journal Name"
 msgstr "员工或记录集合名称"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
-msgstr ""
+msgstr "发票"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -470,7 +470,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -485,9 +485,10 @@ msgstr "月份"
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Currency"
-msgstr "货币"
+msgstr "币别"
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -502,17 +503,17 @@ msgstr "用户"
 msgid ""
 "Complete this field only if you want to force to use a specific product. "
 "Keep empty to use the real product that comes from the cost."
-msgstr "如果你想强制使用特定的产品只有填入该字段.  留空使用来自成本的实际产品"
+msgstr "如果您想强制使用指定的产品只有填入该字段。留空使用来自成本的实际产品。"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
-msgstr ""
+msgstr "没有给用户分配计工单"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,invoice_id:0
 msgid "Invoiced"
-msgstr ""
+msgstr "已开票"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity_max:0
@@ -522,17 +523,17 @@ msgstr "最大数量"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Invoice Balance amount"
-msgstr "发票余额金额"
+msgstr "发票余额的金额"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Invoice rate by user"
-msgstr "发票使用的税率"
+msgstr "用户的发票税率"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr "科目(项)时间表"
+msgstr "辅助核算项的计工单"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,date_from:0
@@ -542,12 +543,12 @@ msgstr "从"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "等待中"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
 msgid "Total invoiced"
-msgstr "发票合计"
+msgstr "已开票合计"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -557,7 +558,7 @@ msgstr "会计期间到"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "辅助核算明细"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -566,19 +567,19 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_cost_ledger
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr "成本分类账"
+msgstr "成本明细帐"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -587,7 +588,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,date:0
@@ -598,12 +599,12 @@ msgstr "在这工作日志显示日期"
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr "每科目(项)时间表"
+msgstr "每个辅助核算项的计工单"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
 msgid "Timesheet by Account"
-msgstr "科目(项)时间表"
+msgstr "辅助核算项的计工单"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,date:0
@@ -616,7 +617,7 @@ msgstr "日期"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:81
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
-msgstr ""
+msgstr "请填写这业务伙伴 %s 的地址。"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -625,12 +626,12 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
@@ -646,12 +647,12 @@ msgstr "有效"
 #: view:hr.timesheet.invoice.create:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
 msgid "Invoice analytic lines"
-msgstr "辅助核算的发票"
+msgstr "发票辅助核算明细"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "摘要"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -665,7 +666,7 @@ msgstr "合计:"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -678,31 +679,31 @@ msgstr "贷方"
 msgid ""
 "Please fill in the partner and pricelist field in the analytic account:\n"
 "%s"
-msgstr ""
+msgstr "请填上这辅助核算项的业务伙伴和价格表：%s"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "错误！此币别必须是选定公司的默认币别。"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.cost.ledger,date2:0
 msgid "End of period"
-msgstr "会计期间结束"
+msgstr "期末"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 #: field:report.analytic.account.close,balance:0
 msgid "Balance"
-msgstr "差额"
+msgstr "余额"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity:0
@@ -718,17 +719,17 @@ msgstr "数量"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "日期/编码"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,general_account_id:0
 msgid "General Account"
-msgstr "一般科目"
+msgstr "辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
 msgid "Print Timesheet Profit"
-msgstr ""
+msgstr "打印计工单收益"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
@@ -748,7 +749,7 @@ msgstr "到"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Do you want to show details of work in invoice ?"
-msgstr "你想显示这工作发票的详细资料"
+msgstr "您想显示这发票的工作详细资料?"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -767,7 +768,7 @@ msgstr "最大开票价"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
@@ -788,7 +789,7 @@ msgstr "取消"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -797,7 +798,7 @@ msgid ""
 "regularly assign discounts because of a specific contract or agreement with "
 "a customer. From this menu, you can create additional types of invoicing to "
 "speed up your invoicing."
-msgstr ""
+msgstr "系统允许您创建默认的发票类型。您可能要经常对一个客户指定的合同或协议修改折扣。您也可以创建其它类型的发票以加快你开票的速度。"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
@@ -805,18 +806,18 @@ msgstr ""
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "计工单明细"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
-msgstr ""
+msgstr "需要结余产品"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Billing Data"
-msgstr ""
+msgstr "开票日期"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
@@ -825,12 +826,12 @@ msgid ""
 "Please fill in the Partner or Customer and Sale Pricelist fields in the "
 "Analytic Account:\n"
 "%s"
-msgstr ""
+msgstr "请在这辅助核算项填上业务伙伴或客户和销售价格表字段：%s。"
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
 msgid "Label for the customer"
-msgstr ""
+msgstr "客户标签"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
@@ -845,12 +846,12 @@ msgstr "打印"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,price:0
 msgid "Display cost of the item you reinvoice"
-msgstr "显示这项成本在你再开的发票"
+msgstr "在这显示您要重开发票的成本"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,date:0
@@ -861,22 +862,22 @@ msgstr "每个工作实际日期将显示在发票上"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
 #, python-format
 msgid "At least one line has no product !"
-msgstr ""
+msgstr "最少有一行没产品！"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr "时间表发票"
+msgstr "给计工单开发票"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.cost.ledger,date1:0
 msgid "Start of period"
-msgstr "开始会计期间"
+msgstr "开始日期"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
 msgid "Daily Timesheet by Account"
-msgstr "科目(项)每日时间表"
+msgstr "辅助核算项每日计工单"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,product:0
@@ -889,7 +890,7 @@ msgstr "产品"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
 msgid "Uninvoice lines with billing rate"
-msgstr ""
+msgstr "未开票明细和开票税率"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -908,35 +909,35 @@ msgstr "内部名称"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,journal_ids:0
 msgid "Journal"
-msgstr "记录集合"
+msgstr "账簿"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,balance_product:0
 msgid "The product that will be used to invoice the remaining amount"
-msgstr ""
+msgstr "将作为发票的剩余金额"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 msgid ""
 "This list shows you every task you can invoice to the customer. Select the "
 "lines and click the Action button to generate the invoices automatically."
-msgstr ""
+msgstr "这列表显示的每个您可以开票给客户的工作。选择其中一个并点击按钮将自动创建一发票。"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No Records Found for Report!"
-msgstr ""
+msgstr "这报表没相应的记录！"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr "发票时间表"
+msgstr "计工单发票"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -950,12 +951,12 @@ msgstr "这月"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
 msgid "Select Period"
-msgstr ""
+msgstr "选择会计期间"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Period from startdate"
-msgstr "会计期间的开始日期"
+msgstr "期初日期"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -964,7 +965,7 @@ msgstr "会计期间的开始日期"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@@ -974,7 +975,7 @@ msgstr "辅助核算明细的发票"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr "科目(项)每日时间表"
+msgstr "辅助核算项每天的计工单"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,sale_price:0
@@ -989,7 +990,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr "每天时间表"
+msgstr "每天计工单"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -998,17 +999,17 @@ msgstr "每天时间表"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Invoicing Data"
-msgstr "开票日期"
+msgstr "发票数据"
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
 msgid "Discount in percentage"
-msgstr ""
+msgstr "折扣百分比"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -1018,7 +1019,7 @@ msgstr "发票类型"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr "每科目(项)时间表"
+msgstr "每个辅助核算项的计工单"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,name:0
@@ -1034,18 +1035,18 @@ msgstr "单位"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "开票类型"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines to Invoice"
-msgstr "辅助核算的发票"
+msgstr "辅助核算明细的发票"
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
-msgstr ""
+msgstr "请在向导填上结余产品"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
@@ -1070,7 +1071,7 @@ msgstr "成本"
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #~ msgid "Choose"
 #~ msgstr "选择"
@@ -1084,9 +1085,6 @@ msgstr ""
 #~ msgid "Filter on Accounts"
 #~ msgstr "科目过滤"
 
-#~ msgid "Invoice on analytic entries"
-#~ msgstr "辅助核算凭证发票"
-
 #~ msgid "Uninvoiced Entries"
 #~ msgstr "未开票项"
 
@@ -1155,47 +1153,3 @@ msgstr ""
 
 #~ msgid "Pending Analytic Accounts"
 #~ msgstr "未决的辅助核算项"
-
-#~ msgid "Analytic Account Reporting"
-#~ msgstr "辅助核算项报表"
-
-#~ msgid "Analytic lines - Reporting"
-#~ msgstr "辅助核算 - 报表"
-
-#~ msgid "My daily timesheets by account"
-#~ msgstr "按科目(项)我的每天时间表"
-
-#~ msgid "Random Timesheet Lines"
-#~ msgstr "任意时间表明细"
-
-#~ msgid "Timesheet - Reporting"
-#~ msgstr "时间表 - 报表"
-
-#~ msgid "My Timesheet of the Month"
-#~ msgstr "我的月度时间表"
-
-#~ msgid "Random Timesheets Lines"
-#~ msgstr "任意时间表明细"
-
-#~ msgid "Random Timesheets"
-#~ msgstr "任意时间表"
-
-#~ msgid "Random Timesheet Report"
-#~ msgstr "任意时间表报表"
-
-#~ msgid ""
-#~ "Module to add timesheet views like\n"
-#~ "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-#~ msgstr "模块增加时间表视图如: 所有月份, 用户时间表, 月度时间表, 科目时间表"
-
-#~ msgid "My timesheets to invoice"
-#~ msgstr "我的时间表发票"
-
-#~ msgid "Random Timesheet"
-#~ msgstr "任意时间表"
-
-#~ msgid "Timesheet by user (this month)"
-#~ msgstr "用户时间表(这月)"
-
-#~ msgid "My timesheets by account"
-#~ msgstr "我的科目(项)时间表"
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index cf00218e4bf..40ae03b696d 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -455,7 +455,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:191
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -485,6 +485,7 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -805,7 +806,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -1039,7 +1040,7 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:142
 #, python-format
 msgid "Please fill a Balance product in the wizard"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py
index 614714bb396..65aaee68a22 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.py
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.py
@@ -87,7 +87,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
             revenue = 0.0
             if lines[id].amount < 0 and lines[id].product_id and lines[id].product_uom_id and lines[id].account_id.pricelist_id:
                 ctx = {'uom': lines[id].product_uom_id.id}
-                price = price_obj.price_get(self.cr, self.uid, [lines[id].account_id.pricelist_id.id], lines[id].product_id.id, lines[id].unit_amount, ctx)[lines[id].account_id.pricelist_id.id]
+                price = price_obj.price_get(self.cr, self.uid, [lines[id].account_id.pricelist_id.id], lines[id].product_id.id, lines[id].unit_amount, False, context=ctx)[lines[id].account_id.pricelist_id.id]
                 revenue = round(price * lines[id].unit_amount, 2)
             r['revenue'] = revenue
             self.sum_revenue[account_id] += revenue
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 eb1437534d4..6b6dd9f6e52 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -217,3 +217,5 @@ class report_timesheet_invoice(osv.osv):
         """)
 report_timesheet_invoice()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 daeabfdaeee..33de63ba347 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
@@ -46,7 +46,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group col="10" colspan="4">
+                    <group>
                       <filter icon="terp-go-year" string="This Year"
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet lines in this year"/>
@@ -56,7 +56,6 @@
                           help="Timesheet lines in this month"/>
                     <filter icon="terp-go-week"
                               string="    7 Days    "
-                              separator="1"
                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                               help="Timesheet lines during last 7 days"/>
                       <separator orientation="vertical"/>
@@ -70,7 +69,7 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="10" col="12">
+                    <group expand="0" string="Extended Filters...">
                         <field name="date"/>
                         <separator orientation="vertical"/>
                         <field name="invoice_id" widget="selection"/>
@@ -162,14 +161,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <group col="10" colspan="4">
+                    <group>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
                         <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="user_id" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
@@ -218,9 +217,9 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
                     <separator orientation="vertical"/>
-                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="manager_id" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="manager_id"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -298,15 +297,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
-                    <group col="10" colspan="4">
+                    <group>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
                         <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
@@ -369,18 +368,18 @@
             <field name="model">report_timesheet.account</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by account">
-                    <group col="10" colspan="4">
+                <search string="Timesheet by account">
+                    <group>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
                         <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                        <field name="user_id" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
                     </group>
-                </form>
+                </search>
             </field>
         </record>
 
@@ -409,11 +408,11 @@
         src_model="res.users"/>
 
         <act_window
-        context="{'search_default_account_id': [active_id]}"
-        id="act_account_analytic_account_2_report_timehsheet_account"
-        name="Timesheets"
-        res_model="report_timesheet.account"
-        src_model="account.analytic.account"/>
+            context="{'search_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]}"
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index ed3c86939cd..c196beae880 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -113,14 +113,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
-                   <group col="12" colspan="4">
+                   <group>
                         <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
                         <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="product_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
                    </group>
                </search>
             </field>
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 d7b59c02124..334a80fde9c 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -3,27 +3,33 @@
 -
   I create an account analytic line.
 -
-  !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0}:
+  !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0 }:
     account_id: account.analytic_sednacom
     amount: -1.0
-    company_id: base.main_company
-    date: !eval time.strftime('%Y-%m-%d')
     general_account_id: account.a_expense
     journal_id: hr_timesheet.analytic_journal
     name: develop yaml for hr module
-    product_id: hr_timesheet.product_consultant
+    product_id: product.product_consultant
     product_uom_id: product.uom_hour
     to_invoice: hr_timesheet_invoice.timesheet_invoice_factor2
     unit_amount: 5.00
-    user_id: base.user_root
-
 -
   Assign partner name and price list in analytic account.
 -
   !record {model: account.analytic.account, id: account.analytic_sednacom}:
     partner_id: base.res_partner_desertic_hispafuentes
     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_sednacom')], None)
+    self.set_pending(cr, uid, [ref('account.analytic_sednacom')], None)
+-
+  I assign account on analytic account line.
+-
+  !python {model: hr.analytic.timesheet}: |
+    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')], ref('account.analytic_sednacom'))
 -
   I create invoice on analytic Line using "Invoice analytic Line" wizard.
 -
@@ -31,7 +37,7 @@
     date: 1
     name: 1
     price: 1
-    product: hr_timesheet.product_consultant
+    product: product.product_consultant
     time: 1
 
 -
@@ -67,18 +73,14 @@
   I create final invoice for this analytic account.
 -
   !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    balance_product: hr_timesheet.product_consultant
     date: 1
     name: 1
     price: 1
     time: 1
 -
-  I click on "Create Invoice" button to create Invoice.
+  I click on "Create Invoice" button to create Invoice and validate the invoice.
 -
   !python {model: hr.timesheet.invoice.create.final}: |
-    self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]})
-
--
-  I can also make some theoretical revenue reports.
--
-  I can also see timesheet profit using Timesheet profit report.
+    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_sednacom")]})
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 66975695814..4b98f7ec23f 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
@@ -39,141 +39,21 @@ class final_invoice_create(osv.osv_memory):
         '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.'),
         'price': fields.boolean('Cost', help='Display cost of the item you reinvoice'),
-        'balance_product': fields.many2one('product.product', 'Balance product', help='The product that will be used to invoice the remaining amount'),
-                }
+        '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]
+        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')
-        analytic_account_obj = self.pool.get('account.analytic.account')
-        res_partner_obj = self.pool.get('res.partner')
-        account_payment_term_obj = self.pool.get('account.payment.term')
-        invoice_obj = self.pool.get('account.invoice')
-        product_obj = self.pool.get('product.product')
-        fiscal_pos_obj = self.pool.get('account.fiscal.position')
-        invoice_line_obj = self.pool.get('account.invoice.line')
-        invoices = []
-
-        if context is None:
-            context = {}
-        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-
-        data = self.browse(cr, uid, ids, context=context)[0]
-        balance_product = data.balance_product.id
-
-        account_ids = 'active_ids' in context and context['active_ids'] or []
-
-        for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
-            partner = account.partner_id
-            amount_total=0.0
-            if (not partner) or not (account.pricelist_id):
-                raise osv.except_osv(_('Analytic account incomplete'),
-                        _('Please fill in the partner and pricelist field '
-                        'in the analytic account:\n%s') % (account.name,))
-
-            date_due = False
-            if partner.property_payment_term:
-                pterm_list= account_payment_term_obj.compute(cr, uid,
-                        partner.property_payment_term.id, value=1,
-                        date_ref=time.strftime('%Y-%m-%d'))
-                if pterm_list:
-                    pterm_list = [line[0] for line in pterm_list]
-                    pterm_list.sort()
-                    date_due = pterm_list[-1]
-
-            curr_invoice = {
-                'name': time.strftime('%d/%m/%Y')+' - '+account.name,
-                'partner_id': account.partner_id.id,
-                'address_contact_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
-                'address_invoice_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
-                'payment_term': partner.property_payment_term.id or False,
-                'account_id': partner.property_account_receivable.id,
-                'currency_id': account.pricelist_id.currency_id.id,
-                'date_due': date_due,
-                'fiscal_position': account.partner_id.property_account_position.id
-            }
-            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context)
-            invoices.append(last_invoice)
-
-            context2 = context.copy()
-            context2['lang'] = partner.lang
-
-            cr.execute("""SELECT
-                    line.product_id,
-                    sum(line.amount),
-                    line.general_account_id,
-                    line.product_uom_id,
-                    move_line.ref
-                FROM
-                    account_analytic_line as line
-                    LEFT JOIN account_move_line as move_line on (line.move_id=move_line.id)
-                    LEFT JOIN account_analytic_journal as journal on (line.journal_id=journal.id)
-                WHERE
-                    line.account_id = %s AND
-                    line.move_id IS NOT NULL AND
-                    journal.type = 'sale'
-                GROUP BY
-                    line.product_id,
-                    line.general_account_id,
-                    line.product_uom_id,
-                    move_line.ref""", (account.id,))
-            for product_id, amount, account_id, product_uom_id, ref in cr.fetchall():
-                product = product_obj.browse(cr, uid, product_id, context2)
-
-                if product:
-                    taxes = product.taxes_id
-                else:
-                    taxes = []
-
-                tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
-                curr_line = {
-                    'price_unit': -amount,
-                    'quantity': 1.0,
-                    'discount': 0.0,
-                    'invoice_line_tax_id': [(6,0,tax)],
-                    'invoice_id': last_invoice,
-                    'name': ref or '' +(product and ' - '+product.name or ''),
-                    'product_id': product_id,
-                    'uos_id': product_uom_id,
-                    'account_id': account_id,
-                    'account_analytic_id': account.id
-                }
-                invoice_line_obj.create(cr, uid, curr_line, context=context)
-
-            if not balance_product:
-                raise osv.except_osv(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
-            product = product_obj.browse(cr, uid, balance_product, context=context2)
-            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
-            curr_line = {
-                'price_unit': account.amount_max - amount_total,
-                'quantity': 1.0,
-                'discount': 0.0,
-                'invoice_line_tax_id': [(6,0,tax)],
-                'invoice_id': last_invoice,
-                'name': product.name,
-                'product_id': product.id,
-                'uos_id': product.uom_id.id,
-                'account_id': account_id,
-                'account_analytic_id': account.id
-            }
-            invoice_line_obj.create(cr, uid, curr_line, context=context)
-            if account.amount_max < amount_total:
-                invoice_obj.write(cr, uid, [last_invoice], {'type': 'out_refund',}, context=context)
-            cr.execute('update account_analytic_line set invoice_id=%s where invoice_id is null and account_id=%s', (last_invoice, account.id))
-
-        return {
-            'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'view_id': False,
-            'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
-                }
+        act_obj = self.pool.get('ir.actions.act_window')
+        mod_ids = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')], context=context)[0]
+        res_id = mod_obj.read(cr, uid, mod_ids, ['res_id'], context=context)['res_id']
+        act_win = act_obj.read(cr, uid, res_id, [], context=context)
+        act_win['domain'] = [('id','in',invs),('type','=','out_invoice')]
+        act_win['name'] = _('Invoices')
+        return act_win
 
 final_invoice_create()
 
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 4372a19a89a..134bde8a872 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -27,43 +27,18 @@ from tools.translate import _
 ## Create an invoice based on selected timesheet lines
 #
 
-#
-# TODO: check unit of measure !!!
-#
-class hr_timesheet_invoice_create(osv.osv_memory):
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
 
-    _name = 'hr.timesheet.invoice.create'
-    _description = 'Create invoice from timesheet'
-    _columns = {
-        'date': fields.boolean('Date', help='The real date of each work will be displayed on the invoice'),
-        'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
-        'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'),
-        'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
-        'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
-    }
-
-    _defaults = {
-         'date': lambda *args: 1,
-         'name': lambda *args: 1
-    }
-
-    def view_init(self, cr, uid, fields, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-        """
-        analytic_obj = self.pool.get('account.analytic.line')
-        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)!"))
-
-    def do_create(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.model.data')
+    #
+    # data = {
+    #   'date': boolean
+    #   'time': boolean
+    #   'name': boolean
+    #   'price': boolean
+    #   'product': many2one id
+    # }
+    def invoice_cost_create(self, cr, uid, ids, data={}, 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')
@@ -77,11 +52,9 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         invoices = []
         if context is None:
             context = {}
-        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        data = self.read(cr, uid, ids, [], context=context)[0]
 
         account_ids = {}
-        for line in self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context):
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
             account_ids[line.account_id.id] = True
 
         account_ids = account_ids.keys() #data['accounts']
@@ -127,7 +100,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id,to_invoice,product_uom_id", (account.id, tuple(context['active_ids']),))
+                    "GROUP BY product_id,to_invoice,product_uom_id", (account.id, tuple(ids),))
 
             for product_id, factor_id, qty, uom in cr.fetchall():
                 product = product_obj.browse(cr, uid, product_id, context2)
@@ -135,7 +108,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     raise osv.except_osv(_('Error'), _('At least one line has no product !'))
                 factor_name = ''
                 factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
-                if not data['product']:
+                if not data.get('product', False):
                     if factor.customer_name:
                         factor_name = product.name+' - '+factor.customer_name
                     else:
@@ -148,13 +121,15 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 ctx.update({'uom':uom})
                 if account.pricelist_id:
                     pl = account.pricelist_id.id
-                    price = pro_price_obj.price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
+                    price = pro_price_obj.price_get(cr,uid,[pl], data.get('product', False) or 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:
+                    raise osv.except_osv(_("Configuration Error"), _("No income account defined for product '%s'") % product.name)
                 curr_line = {
                     'price_unit': price,
                     'quantity': qty,
@@ -162,7 +137,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     'invoice_line_tax_id': [(6,0,tax )],
                     'invoice_id': last_invoice,
                     'name': factor_name,
-                    'product_id': data['product'] or product_id,
+                    'product_id': data.get('product',product_id),
                     'invoice_line_tax_id': [(6,0,tax)],
                     'uos_id': uom,
                     'account_id': account_id,
@@ -172,37 +147,76 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 #
                 # Compute for lines
                 #
-                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(context['active_ids']), product_id, factor_id))
+                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
 
                 line_ids = cr.dictfetchall()
                 note = []
                 for line in line_ids:
                     # set invoice_line_note
                     details = []
-                    if data['date']:
+                    if data.get('date', False):
                         details.append(line['date'])
-                    if data['time']:
+                    if data.get('time', False):
                         if line['product_uom_id']:
                             details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
                         else:
                             details.append("%s" % (line['unit_amount'], ))
-                    if data['name']:
+                    if data.get('name', False):
                         details.append(line['name'])
                     note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
 
                 curr_line['note'] = "\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(context['active_ids'])))
+                cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
 
             invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
+        return invoices
 
+#
+# TODO: check unit of measure !!!
+#
+
+class hr_timesheet_invoice_create(osv.osv_memory):
+
+    _name = 'hr.timesheet.invoice.create'
+    _description = 'Create invoice from timesheet'
+    _columns = {
+        'date': fields.boolean('Date', help='The real date of each work will be displayed on the invoice'),
+        'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
+        'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'),
+        'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
+        'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
+    }
+
+    _defaults = {
+         'date': lambda *args: 1,
+         'name': lambda *args: 1
+    }
+
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+        """
+        analytic_obj = self.pool.get('account.analytic.line')
+        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)!"))
+
+    def do_create(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        invs = self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, context['active_ids'], data, context=context)
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-
         mod_ids = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')], context=context)[0]
         res_id = mod_obj.read(cr, uid, mod_ids, ['res_id'], context=context)['res_id']
         act_win = act_obj.read(cr, uid, res_id, [], context=context)
-        act_win['domain'] = [('id','in',invoices),('type','=','out_invoice')]
+        act_win['domain'] = [('id','in',invs),('type','=','out_invoice')]
         act_win['name'] = _('Invoices')
         return act_win
 
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 b45deeae8a2..d366e795c15 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
@@ -1,49 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-		<record id="view_hr_timesheet_invoice_create_final" model="ir.ui.view">
-            <field name="name">hr.timesheet.invoice.create.final.form</field>
-            <field name="model">hr.timesheet.invoice.create.final</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-			<form string="Final invoice for analytic account">
-			    <group col="4" colspan="6">
-			        <separator string="Do you want details for each line of the invoices ?" colspan="4"/>
-			        <field name="date"/>
-			        <field name="time"/>
-			        <field name="name"/>
-			        <field name="price"/>
-			        <separator string="Invoice Balance amount" colspan="4"/>
-			        <field name="balance_product" required="1"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
-				</group>
-			</form>
-            </field>
-        </record>
-
         <record id="action_hr_timesheet_invoice_create_final" model="ir.actions.act_window">
-            <field name="name">Final Invoice</field>
+            <field name="name">Create Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.timesheet.invoice.create.final</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="multi" eval="1"/>
         </record>
 
-		<record model="ir.values" id="hr_timesheet_invoice_create_final_values">
+        <record model="ir.values" id="hr_timesheet_invoice_create_final_values">
             <field name="model_id" ref="model_account_analytic_account" />
             <field name="object" eval="1" />
-            <field name="name">Final Invoice</field>
+            <field name="name">Invoice</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_create_final'))" />
             <field name="key">action</field>
             <field name="model">account.analytic.account</field>
         </record>
 
-	</data>
+
+        <record id="view_hr_timesheet_invoice_create_final" model="ir.ui.view">
+            <field name="name">hr.timesheet.invoice.create.final.form</field>
+            <field name="model">hr.timesheet.invoice.create.final</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Invoice contract">
+                <group col="4" colspan="6">
+                    <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" groups="base.group_extended"/>
+                    <field name="product" groups="base.group_extended"/>
+                </group>
+                <separator colspan="4"/>
+                <group col="2" colspan="4">
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_create" string="Create Invoice" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+    </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 1696710b712..60b60e88550 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -43,7 +43,6 @@
 
         <record model="ir.values" id="hr_timesheet_invoice_create_values">
             <field name="model_id" ref="model_account_analytic_line" />
-            <field name="object" eval="1" />
             <field name="name">Create Invoice</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_create'))" />
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 13193e66d99..39ab5fe3482 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <menuitem
-        id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" 
-        sequence="0"/>
-    <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
 
         <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
@@ -19,19 +10,18 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
         </record>
-
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
                     <field name="date_from"/>
                     <field name="user_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="name"/>
-                    <field name="total_attendance"/>
-                    <field name="total_timesheet"/>
+                    <field name="total_attendance" widget="float_time"/>
+                    <field name="total_timesheet" widget="float_time"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -50,17 +40,10 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2" position="inside">
-                    <action colspan="4" height="220" name="%(action_week_attendance_graph)d" string="My Total Attendance By Week" />
+                <xpath expr="/form/board/column" position="inside">
+                    <action name="%(action_week_attendance_graph)d" string="My Total Attendance By Week"/>
                 </xpath>
             </field>
         </record>
-        <menuitem
-            action="hr.open_board_hr_manager"
-            icon="terp-graph"
-            id="base.menu_hr_manager"
-            parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
-            sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index cf4351112a4..089ade7c618 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -143,57 +143,38 @@ class hr_timesheet_sheet(osv.osv):
             res[record[0]]['total_difference'] = record[3]
         return res
 
-    def _state_attendance(self, cr, uid, ids, name, args, context=None):
-        emp_obj = self.pool.get('hr.employee')
-        result = {}
-        link_emp = {}
-        emp_ids = []
-
-        for sheet in self.browse(cr, uid, ids, context=context):
-            result[sheet.id] = 'none'
-            emp_ids2 = emp_obj.search(cr, uid,
-                    [('user_id', '=', sheet.user_id.id)], context=context)
-            if emp_ids2:
-                link_emp[emp_ids2[0]] = sheet.id
-                emp_ids.append(emp_ids2[0])
-        for emp in emp_obj.browse(cr, uid, emp_ids, context=context):
-            if emp.id in link_emp:
-                sheet_id = link_emp[emp.id]
-                result[sheet_id] = emp.state
-        return result
-
     def check_employee_attendance_state(self, cr, uid, sheet_id, context=None):
         ids_signin = self.pool.get('hr.attendance').search(cr,uid,[('sheet_id', '=', sheet_id),('action','=','sign_in')])
         ids_signout = self.pool.get('hr.attendance').search(cr,uid,[('sheet_id', '=', sheet_id),('action','=','sign_out')])
 
         if len(ids_signin) != len(ids_signout):
-            raise osv.except_osv(('Warning !'),_('The timesheet cannot be validated as it does not contain equal no. of sign ins and sign outs!'))
+            raise osv.except_osv(('Warning !'),_('The timesheet cannot be validated as it does not contain an equal number of sign ins and sign outs!'))
         return True
 
     def copy(self, cr, uid, ids, *args, **argv):
-        raise osv.except_osv(_('Error !'), _('You cannot duplicate a timesheet !'))
+        raise osv.except_osv(_('Error !'), _('You cannot duplicate a timesheet!'))
 
     def create(self, cr, uid, vals, *args, **argv):
         if 'employee_id' in vals:
             if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id:
-                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any user defined !'))
+                raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must assign it to a user!'))
             if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
-                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any product defined !'))
+                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 !'), _('You cannot create a timesheet for an employee that does not have any analytic journal defined !'))
+                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\'!'))
         return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **argv)
 
     def write(self, cr, uid, ids, vals, *args, **argv):
         if 'employee_id' in vals:
             new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id.id or False
             if not new_user_id:
-                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any user defined !'))
+                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 can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.'))
+                raise osv.except_osv(_('Error !'), _('You cannot have 2 timesheets that overlaps!\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 !'), _('You cannot create a timesheet for an employee that does not have any product defined !'))
+                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 !'), _('You cannot create a timesheet for an employee that does not have any analytic journal defined !'))
+                raise osv.except_osv(_('Error !'), _('In order to create a timesheet for this employee, you must assign the employee to an analytic journal!'))
         return super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, *args, **argv)
 
     def button_confirm(self, cr, uid, ids, context=None):
@@ -245,26 +226,34 @@ class hr_timesheet_sheet(osv.osv):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
         return True
 
-    def sign(self, cr, uid, ids, typ, context=None):
-        emp_obj = self.pool.get('hr.employee')
+    def check_sign(self, cr, uid, ids, typ, context=None):
         sheet = self.browse(cr, uid, ids, context=context)[0]
-        if context is None:
-            context = {}
         if not sheet.date_current == time.strftime('%Y-%m-%d'):
             raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today'))
-        emp_id = sheet.employee_id.id
-        context['sheet_id']=ids[0]
-        emp_obj.attendance_action_change(cr, uid, [emp_id], type=typ, context=context,)
         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=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=None)
+        return self.sign(cr, uid, ids, 'sign_out', context=context)
 
     _columns = {
-        'name': fields.char('Description', size=64, select=1,
+        'name': fields.char('Note', size=64, select=1,
                             states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         '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)]}),
@@ -280,13 +269,13 @@ class hr_timesheet_sheet(osv.osv):
         'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'),
         'state' : fields.selection([
             ('new', 'New'),
-            ('draft','Draft'),
-            ('confirm','Confirmed'),
-            ('done','Done')], 'State', select=True, required=True, readonly=True,
+            ('draft','Open'),
+            ('confirm','Waiting Approval'),
+            ('done','Approved')], 'State', 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.'),
-        'state_attendance' : fields.function(_state_attendance, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
+        '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_day, string='Total Attendance', multi="_total_day"),
         'total_timesheet_day': fields.function(_total_day, string='Total Timesheet', multi="_total_day"),
         'total_difference_day': fields.function(_total_day, string='Difference', multi="_total_day"),
@@ -321,7 +310,7 @@ class hr_timesheet_sheet(osv.osv):
             return time.strftime('%Y-12-31')
         return time.strftime('%Y-%m-%d')
 
-    def _default_employee(self,cr, uid, context=None):
+    def _default_employee(self, cr, uid, context=None):
         emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
         return emp_ids and emp_ids[0] or False
 
@@ -340,7 +329,7 @@ class hr_timesheet_sheet(osv.osv):
             if new_user_id:
                 cr.execute('SELECT id \
                     FROM hr_timesheet_sheet_sheet \
-                    WHERE (date_from < %s and %s < date_to) \
+                    WHERE (date_from <= %s and %s <= date_to) \
                         AND user_id=%s \
                         AND id <> %s',(sheet.date_to, sheet.date_from, new_user_id, sheet.id))
                 if cr.fetchall():
@@ -355,7 +344,7 @@ class hr_timesheet_sheet(osv.osv):
 
 
     _constraints = [
-        (_sheet_date, 'You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
+        (_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']),
     ]
 
@@ -377,11 +366,17 @@ class hr_timesheet_sheet(osv.osv):
         sheets = self.read(cr, uid, ids, ['state','total_attendance'], context=context)
         for sheet in sheets:
             if sheet['state'] in ('confirm', 'done'):
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which are already confirmed !'))
+                raise osv.except_osv(_('Invalid action !'), _('You cannot delete a timesheet which is already confirmed!'))
             elif sheet['total_attendance'] <> 0.00:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which have attendance entries encoded !'))
+                raise osv.except_osv(_('Invalid action !'), _('You cannot delete a timesheet which have attendance entries!'))
         return super(hr_timesheet_sheet, self).unlink(cr, uid, ids, context=context)
 
+    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
+        department_id =  False
+        if employee_id:
+            department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id
+        return {'value': {'department_id': department_id}}
+
 hr_timesheet_sheet()
 
 
@@ -490,7 +485,7 @@ class hr_timesheet_line(osv.osv):
         return True
 
     _constraints = [
-        (_check_sheet_state, 'You can not modify an entry in a Confirmed/Done timesheet !.', ['state']),
+        (_check_sheet_state, 'You cannot modify an entry in a Confirmed/Done timesheet !.', ['state']),
     ]
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
@@ -612,7 +607,7 @@ class hr_attendance(osv.osv):
         if 'sheet_id' in context:
             ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
             if ts.state not in ('draft', 'new'):
-                raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet !'))
+                raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet!'))
         res = super(hr_attendance,self).create(cr, uid, vals, context=context)
         if 'sheet_id' in context:
             if context['sheet_id'] != self.browse(cr, uid, res, context=context).sheet_id.id:
@@ -735,7 +730,7 @@ class hr_timesheet_sheet_sheet_account(osv.osv):
     _auto = False
     _order='name'
     _columns = {
-        'name': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'name': fields.many2one('account.analytic.account', 'Project / Analytic Account', readonly=True),
         'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True),
         'total': fields.float('Total Time', digits=(16,2), readonly=True),
         'invoice_rate': fields.many2one('hr_timesheet_invoice.factor', 'Invoice rate', readonly=True),
@@ -768,7 +763,8 @@ class res_company(osv.osv):
     _inherit = 'res.company'
     _columns = {
         'timesheet_range': fields.selection(
-            [('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timesheet range'),
+            [('day','Day'),('week','Week'),('month','Month')], 'Timesheet range',
+            help="Periodicity on which you validate your timesheets."),
         'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
             help="Allowed difference in hours between the sign in/out and the timesheet " \
                  "computation for one sheet. Set this to 0 if you do not want any control."),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index be55c83e0fa..4fc5b2fb1b3 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -7,7 +7,7 @@
             <field eval="&quot;&quot;&quot;ir.actions.server&quot;&quot;&quot;" name="type"/>
             <field name="model_id" ref="model_hr_timesheet_current_open"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="&quot;&quot;&quot;action = self.pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, object.id, context)&quot;&quot;&quot;" name="code"/>
+            <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"/>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 321e4c2addd..b14c9133319 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
        <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
          <field name="name">hr.timesheet.sheet.graph</field>
          <field name="model">hr_timesheet_sheet.sheet</field>
@@ -33,7 +33,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="sheet_id" />
                         <field name="name" groups="analytic.group_analytic_accounting"/>
                         <field name="invoice_rate"/>
@@ -62,17 +62,17 @@
             <field name="arch" type="xml">
                 <form string="Timesheet">
                     <group colspan="4" col="6">
-                        <field name="name"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
-                        <field name="department_id" groups="base.group_extended"/>
-                        <newline/>
-                        <field name="employee_id"/>
+                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="user_id" invisible="1"/>
                         <field name="date_from"/>
                         <field name="date_to"/>
+                        <newline/>
+                        <field name="name"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="department_id" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Daily View">
+                        <page string="Daily">
                             <group col="6" colspan="4">
                                 <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <field name="date_current" nolabel="1"/>
@@ -89,19 +89,19 @@
                                     <field invisible="1" name="employee_id"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="1">
+                            <group col="4" colspan="1">
+                                <field name="state_attendance"/>
                                 <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"/>
+                                <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
-                            <field name="state_attendance"/>
-                            <field name="total_attendance_day" widget="float_time"/>
                             <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','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                    <field name="to_invoice"/>
+                                    <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)"/>
                                     <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
@@ -126,7 +126,7 @@
                             <field name="total_difference_day" widget="float_time"/>
                             <field name="total_timesheet_day" widget="float_time"/>
                         </page>
-                        <page string="By Day">
+                        <page string="Summary">
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
@@ -143,8 +143,8 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                        <field name="state"/>
-                        <button name="button_confirm" states="draft" string="Submit to Manager" type="object" icon="terp-check"/>
+                        <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
+                        <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
                         <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
@@ -159,11 +159,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
-                    <group col="10" colspan="4">
+                    <group>
                         <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"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id" select="1"/>
+                        <field name="employee_id"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+"
@@ -186,7 +186,7 @@
             <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_my_timesheet':1,'group_by_no_leaf':1}</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
             <field name="help">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.</field>
         </record>
@@ -306,14 +306,14 @@
             <field name="type">tree</field>
             <field eval="10" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
                     <field name="employee_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="department_id"/>
-                    <field name="total_attendance"/>
-                    <field name="total_timesheet"/>
-                    <field name="total_difference"/>
+                    <field name="total_attendance" widget="float_time"/>
+                    <field name="total_timesheet" widget="float_time"/>
+                    <field name="total_difference" widget="float_time"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 861c2727418..5cae5ce212c 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index e826d0ac56d..b851e3b6e4f 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index 3e1f3fdf72c..92b4c9d2f0c 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index dfa3899b1f1..f895afa5ed7 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -40,7 +40,7 @@ msgstr "Full"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Servei"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -53,7 +53,7 @@ msgstr "No s'ha definit un empleat pel vostre usuari!"
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -67,12 +67,12 @@ msgstr "Total servei"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departament"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Full d'assistència de tasques"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -91,7 +91,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -100,7 +100,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -127,7 +127,7 @@ msgstr "Data fins"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Basat en el full d'assistència"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -151,7 +151,7 @@ msgstr "Present"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Cost total"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
@@ -173,6 +173,8 @@ msgstr "Rebutja"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"No podeu introduir una data d'assistència fora de les dates del full "
+"d'assistència actual!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -184,6 +186,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 ""
+"El meu full d'hores obre el seu full d'hores perquè pugueu registrar les "
+"seves activitats en el sistema. De la mateixa forma, podeu registrar les "
+"seves assistències (entrades/sortides) i descriure les hores de treball "
+"realitzades en els diferents projectes. Al final del període definit en la "
+"companyia, el full d'hores es confirma per l'usuari i pot ser validat pel "
+"seu director. Si és necessari, tal com es defineix en el projecte, podeu "
+"generar les factures sobre la base de la taula de temps."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
@@ -195,12 +204,12 @@ msgstr "No podeu registrar una entrada en una altre data que no sigui avui"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mes-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "Validació"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
@@ -211,7 +220,7 @@ msgstr "Atenció!"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Entrada de fulls d'assistència del treballador"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -225,7 +234,7 @@ msgstr "Compte analític"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "#Núm"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -237,7 +246,7 @@ msgstr "Data des de"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mes "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -295,28 +304,51 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul li ajuda a codificar i validar fàcilment el part d'hores i "
+"visites\n"
+"amb la mateixa vista. La part superior de la vista és d'assistències i\n"
+"esdeveniments (registre entrada/registre sortida). La part inferior és per "
+"al part d'hores.\n"
+"\n"
+"Altres pestanyes contenen estadístiques de les vistes per ajudar a analitzar "
+"el seu\n"
+"temps o els temps del seu equip:\n"
+"* El temps dedicat per dia (amb assistències)\n"
+"* El temps dedicat al projecte\n"
+"\n"
+"Aquest mòdul també implementa un procés de validació del full de temps "
+"complet:\n"
+"* Full del projecte\n"
+"* Confirmació al final del període per l'empleat\n"
+"* Validació pel director del projecte\n"
+"\n"
+"La validació es pot configurar en la companyia:\n"
+"* La grandària del període (dia, setmana, mes, any)\n"
+"* Diferència màxima entre el part d'hores i les visites\n"
+"    "
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No podeu crear companyies recursives."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "L'estat és 'confirmat'"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Treballador"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -328,12 +360,12 @@ msgstr "Nou"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
 #, python-format
 msgid "You cannot duplicate a timesheet !"
-msgstr ""
+msgstr "No podeu duplicar un full d'assistència !"
 
 #. 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 "Les meves assistències totals per setmana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
@@ -363,18 +395,20 @@ msgstr "Línies de la full d'assistència"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "Hores"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "#Cost"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Error: Registre d'entrada (resp. Registre de sortida) ha de seguir al "
+"Registro de sortida (resp. Registre d'entrada)"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -391,13 +425,13 @@ msgstr "Acció no vàlida!"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "El cap del projecte valida els fulls d'assistència."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -412,11 +446,13 @@ msgid ""
 "You cannot create a timesheet for an employee that does not have any user "
 "defined !"
 msgstr ""
+"No podeu crear un full d'assistència per a un treballador que no té cap "
+"usuari definit !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Treballa en tasca"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -427,7 +463,7 @@ msgstr "Vista diària"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "#Quantitat"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -439,7 +475,7 @@ msgstr "Total full de serveis"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Assistència disponible"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -450,12 +486,12 @@ msgstr "Registra entrada"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "#Total full assistència"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "rrhh.fullassistència.actual.obrir"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -466,18 +502,18 @@ msgstr "Anar a:"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Obrirà el seu full d'assistència actual"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -492,22 +528,22 @@ msgstr "Mes"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "#Total dif."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "En esborrany"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Fitxa/surt"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -515,11 +551,15 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
+"La línia del full d'assistència representa el temps invertit pel treballador "
+"en un servei específic."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
 msgstr ""
+"Heu de seleccionar una data que es trobi dintre de les dates del full "
+"d'assistència!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -529,6 +569,10 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
+"Aquest informe realitza un anàlisi dels fulls d'assistència creats pels seus "
+"recursos humans en el sistema. Li permet tenir una visió completa de les "
+"entrades realitzades pels seus empleats. Podeu agrupar-les per criteris "
+"específics de selecció gràcies a l'eina de cerca."
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -540,23 +584,23 @@ msgstr "Esborrany"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Diferència (hores) permesa en el full d'assistència"
 
 #. 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 "La factura es crea sobre la base del full d'assistència."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "Esborrany full d'assistència"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Any "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -567,13 +611,13 @@ msgstr "Setmana"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -591,7 +635,7 @@ msgstr "No podeu modificar una entrada en un full de serveis confirmat!"
 #: 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 "Fulls d'assistència per període"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -617,18 +661,18 @@ msgstr "Data"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Rang full d'assistència"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
@@ -638,13 +682,13 @@ msgstr "Línies full de serveis"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "La meva assistència total per setmana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -653,27 +697,30 @@ msgid ""
 "on a project (i.e. an analytic account) thus generating costs in the "
 "analytic account concerned."
 msgstr ""
+"Consulteu el seu full d'assistència durant un període determinat. També "
+"podeu imputar el temps dedicat a un projecte (p. ex. un compte analític), "
+"generant costos en el compte analític corresponent."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "El treballador fitxa i surt."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -681,7 +728,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Compte general"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -689,6 +736,9 @@ 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 ""
+"Diferència permesa, en hores, entre el fitxatge/sortida i el còmput del full "
+"d'assistència per a un full. Poseu-ho a 0 si no desitgeu cap tipus de "
+"control."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -709,7 +759,7 @@ msgstr "No podeu modificar una entrada en un full de serveis confirmat!"
 #: 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 Timesheet"
-msgstr ""
+msgstr "El meu full d'assistència"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -721,17 +771,17 @@ msgstr "Realitzat"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "L'estat és 'esborrany'"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Validat"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -747,7 +797,7 @@ msgstr "Full de serveis per comptes"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Obre full d'assistència"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
@@ -758,7 +808,7 @@ msgstr "No es poden eliminar full(s) que ja estan confirmats!"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "State is 'validated'."
-msgstr ""
+msgstr "L'estat és 'validat'"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -770,18 +820,24 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * L'estat 'Esborrany' s'utilitza quan un usuari està codificant un nou full "
+"de serveis sense confirmar.\n"
+"* L'estat 'Confirmat' s'utilitza per la confirmació del full de serveis per "
+"l'usuari.\n"
+"* L'estat 'Realitzat' s'utilitza quan el full de serveis de l'usuari és "
+"acceptada pels seus superiors."
 
 #. 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 "Anàlisi dels fulls d'assistència"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Cerca full d'assistència"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
@@ -790,6 +846,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain equal no. of sign "
 "ins and sign outs!"
 msgstr ""
+"El full d'assistència no es pot validar, ja que no té el mateix número "
+"d'entrades i sortides!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -802,7 +860,7 @@ msgstr "Línia del full de assistència"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producte"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -822,17 +880,18 @@ msgstr "Descripció"
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
 msgstr ""
+"L'empleat confirma periòdicament els seus propis fulls d'assistència."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Defineix el resum del treball d'una tasca"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -843,12 +902,12 @@ msgstr "Registra sortida"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
-msgstr ""
+msgstr "No es poden eliminar fulls amb registres d'assistència codificats!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "Mou entrades de tasques en la línia del full d'assistència"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -859,7 +918,7 @@ msgstr "Per dia"
 #: 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 "Anàlisi dels fulls d'assistència"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -877,28 +936,28 @@ msgstr "Absent"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Treballadors"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Informació del temps dedicat a un servei"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmació"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -908,7 +967,7 @@ msgstr "Taxa factura"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprova"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -919,18 +978,18 @@ msgstr "Comptes analítics"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipus de facturació"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "Nº total assistència"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Cost"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
@@ -941,7 +1000,7 @@ msgstr "Data actual"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "Part d'hores de RRHH"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -955,12 +1014,12 @@ msgstr "Any"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Per aprovar"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -970,7 +1029,7 @@ msgstr "Total"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Diari"
 
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Revisa final del dia comprovació dia està completa"
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 784485777ea..6a8924ad209 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index e3efa23ba0a..1d6907ae4a5 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-17 22:35+0000\n"
-"Last-Translator: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>\n"
+"Last-Translator: Jan <Unknown>\n"
 "Language-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-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -1229,36 +1229,5 @@ msgstr "Journal"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #~ msgid "Project Timesheet"
 #~ msgstr "Projektzeit"
-
-#~ msgid ""
-#~ "This view allows you to check timesheet sheets following a specific period. "
-#~ "You can also encode time spent on a project that is an analytic account and "
-#~ "the time spent on a project generate costs on the analytic account."
-#~ msgstr ""
-#~ "Diese Ansicht ermöglicht die Zeiterfassung innerhalb eines durch das "
-#~ "Unternehmen vorgegebenen Zeitraum für die Zeiterfassung (z.B. Woche oder "
-#~ "Monat). Sie können hier ausserdem eine Eingabe des Zeitaufwands für Projekte "
-#~ "vornehmen, die durch analytische Konten repräsentiert werden und über diesen "
-#~ "Weg Kosten für dieses Konto buchen."
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 4ca2da4c042..b592a7975c9 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index fae95df6a2d..724c629d222 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index 56592cfaba9..12a561a66ca 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/es_MX.po b/addons/hr_timesheet_sheet/i18n/es_MX.po
new file mode 100644
index 00000000000..c6573419122
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/es_MX.po
@@ -0,0 +1,1224 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_timesheet_sheet
+#
+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-18 11: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: 2011-09-05 05:28+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
+#: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
+msgid ""
+"You can not have 2 timesheets that overlaps !\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+"¡No puede tener dos hojas de asistencia que se solapen!\n"
+"Por favor, utilice el menú \"Mi hoja de asistencia actual' para evitar este "
+"problema."
+
+#. 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 "Hoja"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "Servicio"
+
+#. 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 "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. 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 "Total servicio"
+
+#. 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 "Departamento"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr "Hoja de asistencia de tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"¡Por favor, verifique que la diferencia total de la hoja de servicios es "
+"menor que %.2f!"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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 "Compañía"
+
+#. 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 "Hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Fecha hasta"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr "Basado en la hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "Presente"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr "Coste total"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. 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 "Rechazar"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr ""
+"¡No puede introducir una fecha de asistencia fuera de las fechas de la hoja "
+"de asistencia actual!"
+
+#. 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 ""
+"Mi parte de horas abre su parte de horas para que pueda registrar sus "
+"actividades en el sistema. De la misma forma, puede registrar sus "
+"asistencias (entrar/salir) y describir las horas de trabajo realizadas en "
+"los diferentes proyectos. Al final del período definido en la empresa, el "
+"parte de horas se confirma por el usuario y puede ser validado por su "
+"gerente. Si es necesario, tal como se define en el proyecto, puede generar "
+"las facturas en base a la tabla de tiempos."
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr "No puede registrar entrada en otra fecha que no sea hoy"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr " Mes-1 "
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr "Entrada de hojas de asistencia del empleado"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
+#: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr "#Núm"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr "Fecha desde"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr " Mes "
+
+#. 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr "Servicio"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: hr_timesheet_sheet
+#: model:ir.module.module,description:hr_timesheet_sheet.module_meta_information
+msgid ""
+"\n"
+"This module helps you to easily encode and validate timesheet and "
+"attendances\n"
+"within the same view. The upper part of the view is for attendances and\n"
+"track (sign in/sign out) events. The lower part is for timesheet.\n"
+"\n"
+"Other tabs contains statistics views to help you analyse your\n"
+"time or the time of your team:\n"
+"* Time spent by day (with attendances)\n"
+"* Time spent by project\n"
+"\n"
+"This module also implements a complete timesheet validation process:\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"* Period size (day, week, month, year)\n"
+"* Maximal difference between timesheet and attendances\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le ayuda a codificar y validar fácilmente el parte de horas y "
+"visitas\n"
+"con la misma vista. La parte superior de la vista es de asistencias y\n"
+"acontecimientos (registro entrada/registro salida). La parte inferior es "
+"para el parte de horas.\n"
+"\n"
+"Otras pestañas contienen estadísticas de las vistas para ayudar a analizar "
+"su\n"
+"tiempos o los tiempos de su equipo:\n"
+"* El tiempo dedicado por día (con asistencias)\n"
+"* El tiempo dedicado al proyecto\n"
+"\n"
+"Este módulo también implementa un proceso de validación de hoja de tiempos "
+"completo:\n"
+"* Hoja de proyecto\n"
+"* Confirmación al final del período por el empleado\n"
+"* Validación por el director del proyecto\n"
+"\n"
+"La validación se puede configurar en la empresa:\n"
+"* 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"
+"    "
+
+#. module: hr_timesheet_sheet
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr "El estado es 'confirmado'"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr "Nuevo"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr "¡ No puede duplicar una hoja de asistencia !"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr "Mis asistencias totales por semana"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Lines"
+msgstr "Líneas de la hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr "#Coste"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "No employee defined"
+msgstr "No hay empleado definido"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr "El jefe de proyecto valida las hojas de asistencia."
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_timesheet_sheet
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
+"¡ No puede crear una hoja de asistencia para un empleado que no tiene ningún "
+"usuario definido !"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr "Trabajar en tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily View"
+msgstr "Vista diaria"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr "#Cantidad"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "Total hoja servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr "Asistencia disponible"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr "Registrar entrada"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr "#Total hoja asistencia"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr "rrhh.hojaasistencia.actual.abrir"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr "Ir a:"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr "Abrirá su hoja de asistencia actual"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr "#Total dif."
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr "En borrador"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr "Fichar/salir"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr "Cobros"
+
+#. 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 ""
+"La línea de hoja de asistencia representa el tiempo invertido por el "
+"trabajador en un servicio específico dado."
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+"¡Debe seleccionar una fecha actual que se encuentre dentro de las fechas de "
+"la hoja de asistencia!"
+
+#. 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 ""
+"Este informe realiza un análisis de las hojas de asistencia creadas por sus "
+"recursos humanos en el sistema. Le permite tener una visión completa de las "
+"entradas realizadas por sus empleados. Puede agruparlas por criterios "
+"específicos de selección gracias a la herramienta de búsqueda."
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr "Diferencia (horas) permitida en hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr "La factura se crea en base a la hoja de asistencia."
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr "Borrador hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr " Año "
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr "Estado actual"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr "Hojas de asistencia por periodo"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
+#: field:hr_timesheet_sheet.sheet.day,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr "Rango hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr "Líneas hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Mi asistencia total por semana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. 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 ""
+"Consulte su hoja de asistencia durante un período determinado. También puede "
+"imputar el tiempo dedicado a un proyecto (p. ej. una cuenta analítica), "
+"generando por tanto costes en la cuenta analítica correspondiente."
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr "El empleado ficha y sale."
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. 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 "Cuenta general"
+
+#. 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 ""
+"Diferencia permitida, en horas, entre el fichaje/salida y el cómputo de hoja "
+"de asistencia para una hoja. Póngalo a 0 si no desea ningún tipo de control."
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,period_ids:0
+msgid "Period"
+msgstr "Período"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
+
+#. module: hr_timesheet_sheet
+#: view: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 Timesheet"
+msgstr "Mi hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr "El estado es 'borrador'"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Facturar sobre trabajo"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr "Hoja de servicios por cuentas"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
+#, python-format
+msgid "Open Timesheet"
+msgstr "Abrir hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr "¡No se puede(n) eliminar hoja(s) que ya está(n) confirmada(s)!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr "El estado es 'validado'"
+
+#. 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 ""
+" * El estado 'Borrador' se utiliza cuando un usuario está codificando una "
+"nueva hoja de servicios sin confirmar.                 \n"
+"* El estado 'Confirmado' se utiliza para la confirmación de la hoja de "
+"servicios por el usuario.                 \n"
+"* El estado 'Realizado' se utiliza cuando la hoja de servicios del usuario "
+"es aceptada por sus superiores."
+
+#. 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 "Análisis de hojas de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr "Buscar hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+"¡La hoja de asistencia no se puede validar, ya que no contienen mismo número "
+"de entradas y salidas!"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#. 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 "Producto"
+
+#. 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 "Servicios"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr "El empleado confirma periódicamente sus propias hojas de asistencia."
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Define el resumen del trabajo de una tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr "Registrar salida"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+"¡No se pueden eliminar hojas con registros de asistencia codificados!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr "Mueve entradas de tarea a la línea de hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "By Day"
+msgstr "Por día"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr "Análisis de las hojas de asistencia"
+
+#. 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 "Diferencia"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr "Ausente"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr "Información del tiempo dedicado a un servicio"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr "Confirmación"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr "Tasa factura"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr "Cuentas analíticas"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr "Nº total asistencia"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr "Coste"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr "Fecha actual"
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr "Parte de horas de RRHH"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Total"
+msgstr "Total"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Revisar final del día que la comprobación del día está completa"
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Mis hojas de servicios a confirmar"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Rango hoja de servicios"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Confirmar hoja de servicios"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Define entrada hoja de servicios del empleado"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Hoja de servicios borrador"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Mi hoja de servicios actual"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Hoja de servicios validada"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr ""
+#~ "¡Debe seleccionar una fecha actual que esté en las fechas de la hoja de "
+#~ "servicios!"
+
+#~ msgid "Total Difference"
+#~ msgstr "Diferencia total"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Codificación llamada telefónica"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Hoja de servicios por día"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "Define la tarea de trabajo en línea hoja de servicios"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Diferencia permitida entre el registro de entrada/salida y el cálculo del "
+#~ "tiempo para una hoja de servicio. Establezca su valor a 0 si no quiere "
+#~ "ningún control."
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Hoja de servicios por días"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "Hoja de servicios es confirmada al final de la semana / mes"
+
+#~ msgid "Project Timesheet"
+#~ msgstr "Hoja de servicios del proyecto"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "Proceso hoja de asistencia RH"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Coste analítico"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Codifica su línea de hoja de servicios"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Confirmar hoja de servicios"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Control por el responsable del proyecto"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Hoja de servicios confirmada al final del periodo"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Confirmar hoja de servicios al final del periodo"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Hoja de servicios confirmada"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Hojas de servicios por período"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Hoja de servicios de mi departamento"
+
+#~ msgid "Phone call"
+#~ msgstr "Llamada telefónica"
+
+#~ msgid "Review of work"
+#~ msgstr "Revisión de trabajo"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Codificar sus horas y registrar entrada/salida"
+
+#~ msgid "Review"
+#~ msgstr "Revisión"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Hojas de servicios a confirmar"
+
+#, python-format
+#~ msgid "You can not sign out from an other date than today"
+#~ msgstr "No puede registrar salida en otra fecha que no sea hoy"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Facturar sobre hoja de servicios"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Factura basada en hoja de servicios"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Crea factura basada en hoja de servicios"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Hojas de servicios a validar"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Diferencia permitida hoja de servicios"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Convierte entrada de asistencia/servicio en hoja de servicios"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Crea su coste analítico acorde con cantidad"
+
+#~ 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 "Timesheet is validate by project manager."
+#~ msgstr "Hoja de servicios es validada por el responsable del proyecto"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Cualquier tiempo que dedique a la llamada telefónica"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Validar hoja de servicios"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Hoja de servicios de mi departamento a confirmar"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Crear coste analítico"
+
+#, python-format
+#~ msgid "You can not duplicate a timesheet !"
+#~ msgstr "¡No se puede duplicar una hoja de asistencia!"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "Hoja de servicios"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Al final del periodo (semana/mes)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "entrada hoja de servicios está en estado borrador."
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Coste analítico es creado"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Codifica cuanto tiempo dedica en llamadas telefónicas"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Revisar su trabajo al final del día"
+
+#~ msgid "My timesheets"
+#~ msgstr "Mis hojas de servicios"
+
+#~ msgid "Accept"
+#~ msgstr "Acceptar"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Hojas de servicios no validadas"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Hoja de servicios de mi departamento a validar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/hr_timesheet_sheet/i18n/es_VE.po b/addons/hr_timesheet_sheet/i18n/es_VE.po
new file mode 100644
index 00000000000..c6573419122
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/es_VE.po
@@ -0,0 +1,1224 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_timesheet_sheet
+#
+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-18 11: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: 2011-09-05 05:28+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
+#: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
+msgid ""
+"You can not have 2 timesheets that overlaps !\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+"¡No puede tener dos hojas de asistencia que se solapen!\n"
+"Por favor, utilice el menú \"Mi hoja de asistencia actual' para evitar este "
+"problema."
+
+#. 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 "Hoja"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "Servicio"
+
+#. 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 "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. 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 "Total servicio"
+
+#. 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 "Departamento"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr "Hoja de asistencia de tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"¡Por favor, verifique que la diferencia total de la hoja de servicios es "
+"menor que %.2f!"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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 "Compañía"
+
+#. 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 "Hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Fecha hasta"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr "Basado en la hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "Presente"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr "Coste total"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. 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 "Rechazar"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr ""
+"¡No puede introducir una fecha de asistencia fuera de las fechas de la hoja "
+"de asistencia actual!"
+
+#. 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 ""
+"Mi parte de horas abre su parte de horas para que pueda registrar sus "
+"actividades en el sistema. De la misma forma, puede registrar sus "
+"asistencias (entrar/salir) y describir las horas de trabajo realizadas en "
+"los diferentes proyectos. Al final del período definido en la empresa, el "
+"parte de horas se confirma por el usuario y puede ser validado por su "
+"gerente. Si es necesario, tal como se define en el proyecto, puede generar "
+"las facturas en base a la tabla de tiempos."
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr "No puede registrar entrada en otra fecha que no sea hoy"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr " Mes-1 "
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr "Entrada de hojas de asistencia del empleado"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
+#: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr "#Núm"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr "Fecha desde"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr " Mes "
+
+#. 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr "Servicio"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: hr_timesheet_sheet
+#: model:ir.module.module,description:hr_timesheet_sheet.module_meta_information
+msgid ""
+"\n"
+"This module helps you to easily encode and validate timesheet and "
+"attendances\n"
+"within the same view. The upper part of the view is for attendances and\n"
+"track (sign in/sign out) events. The lower part is for timesheet.\n"
+"\n"
+"Other tabs contains statistics views to help you analyse your\n"
+"time or the time of your team:\n"
+"* Time spent by day (with attendances)\n"
+"* Time spent by project\n"
+"\n"
+"This module also implements a complete timesheet validation process:\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"* Period size (day, week, month, year)\n"
+"* Maximal difference between timesheet and attendances\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le ayuda a codificar y validar fácilmente el parte de horas y "
+"visitas\n"
+"con la misma vista. La parte superior de la vista es de asistencias y\n"
+"acontecimientos (registro entrada/registro salida). La parte inferior es "
+"para el parte de horas.\n"
+"\n"
+"Otras pestañas contienen estadísticas de las vistas para ayudar a analizar "
+"su\n"
+"tiempos o los tiempos de su equipo:\n"
+"* El tiempo dedicado por día (con asistencias)\n"
+"* El tiempo dedicado al proyecto\n"
+"\n"
+"Este módulo también implementa un proceso de validación de hoja de tiempos "
+"completo:\n"
+"* Hoja de proyecto\n"
+"* Confirmación al final del período por el empleado\n"
+"* Validación por el director del proyecto\n"
+"\n"
+"La validación se puede configurar en la empresa:\n"
+"* 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"
+"    "
+
+#. module: hr_timesheet_sheet
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr "El estado es 'confirmado'"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr "Nuevo"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr "¡ No puede duplicar una hoja de asistencia !"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr "Mis asistencias totales por semana"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Lines"
+msgstr "Líneas de la hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr "#Coste"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "No employee defined"
+msgstr "No hay empleado definido"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr "El jefe de proyecto valida las hojas de asistencia."
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_timesheet_sheet
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
+"¡ No puede crear una hoja de asistencia para un empleado que no tiene ningún "
+"usuario definido !"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr "Trabajar en tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily View"
+msgstr "Vista diaria"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr "#Cantidad"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "Total hoja servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr "Asistencia disponible"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr "Registrar entrada"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr "#Total hoja asistencia"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr "rrhh.hojaasistencia.actual.abrir"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr "Ir a:"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr "Abrirá su hoja de asistencia actual"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr "#Total dif."
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr "En borrador"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr "Fichar/salir"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr "Cobros"
+
+#. 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 ""
+"La línea de hoja de asistencia representa el tiempo invertido por el "
+"trabajador en un servicio específico dado."
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+"¡Debe seleccionar una fecha actual que se encuentre dentro de las fechas de "
+"la hoja de asistencia!"
+
+#. 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 ""
+"Este informe realiza un análisis de las hojas de asistencia creadas por sus "
+"recursos humanos en el sistema. Le permite tener una visión completa de las "
+"entradas realizadas por sus empleados. Puede agruparlas por criterios "
+"específicos de selección gracias a la herramienta de búsqueda."
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr "Diferencia (horas) permitida en hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr "La factura se crea en base a la hoja de asistencia."
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr "Borrador hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr " Año "
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr "Estado actual"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr "Hojas de asistencia por periodo"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
+#: field:hr_timesheet_sheet.sheet.day,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr "Rango hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr "Líneas hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "Mi asistencia total por semana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. 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 ""
+"Consulte su hoja de asistencia durante un período determinado. También puede "
+"imputar el tiempo dedicado a un proyecto (p. ej. una cuenta analítica), "
+"generando por tanto costes en la cuenta analítica correspondiente."
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr "El empleado ficha y sale."
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. 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 "Cuenta general"
+
+#. 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 ""
+"Diferencia permitida, en horas, entre el fichaje/salida y el cómputo de hoja "
+"de asistencia para una hoja. Póngalo a 0 si no desea ningún tipo de control."
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,period_ids:0
+msgid "Period"
+msgstr "Período"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
+
+#. module: hr_timesheet_sheet
+#: view: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 Timesheet"
+msgstr "Mi hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr "El estado es 'borrador'"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Facturar sobre trabajo"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr "Hoja de servicios por cuentas"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
+#, python-format
+msgid "Open Timesheet"
+msgstr "Abrir hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr "¡No se puede(n) eliminar hoja(s) que ya está(n) confirmada(s)!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr "El estado es 'validado'"
+
+#. 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 ""
+" * El estado 'Borrador' se utiliza cuando un usuario está codificando una "
+"nueva hoja de servicios sin confirmar.                 \n"
+"* El estado 'Confirmado' se utiliza para la confirmación de la hoja de "
+"servicios por el usuario.                 \n"
+"* El estado 'Realizado' se utiliza cuando la hoja de servicios del usuario "
+"es aceptada por sus superiores."
+
+#. 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 "Análisis de hojas de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr "Buscar hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+"¡La hoja de asistencia no se puede validar, ya que no contienen mismo número "
+"de entradas y salidas!"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#. 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 "Producto"
+
+#. 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 "Servicios"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
+#: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr "El empleado confirma periódicamente sus propias hojas de asistencia."
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "Define el resumen del trabajo de una tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr "Registrar salida"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+"¡No se pueden eliminar hojas con registros de asistencia codificados!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr "Mueve entradas de tarea a la línea de hoja de asistencia"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "By Day"
+msgstr "Por día"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr "Análisis de las hojas de asistencia"
+
+#. 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 "Diferencia"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr "Ausente"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr "Información del tiempo dedicado a un servicio"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr "Confirmación"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr "Tasa factura"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr "Cuentas analíticas"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Tipo de facturación"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr "Nº total asistencia"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr "Coste"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr "Fecha actual"
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr "Parte de horas de RRHH"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Total"
+msgstr "Total"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Revisar final del día que la comprobación del día está completa"
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Mis hojas de servicios a confirmar"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Rango hoja de servicios"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Confirmar hoja de servicios"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Define entrada hoja de servicios del empleado"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Hoja de servicios borrador"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Mi hoja de servicios actual"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Hoja de servicios validada"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr ""
+#~ "¡Debe seleccionar una fecha actual que esté en las fechas de la hoja de "
+#~ "servicios!"
+
+#~ msgid "Total Difference"
+#~ msgstr "Diferencia total"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Codificación llamada telefónica"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Hoja de servicios por día"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "Define la tarea de trabajo en línea hoja de servicios"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Diferencia permitida entre el registro de entrada/salida y el cálculo del "
+#~ "tiempo para una hoja de servicio. Establezca su valor a 0 si no quiere "
+#~ "ningún control."
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Hoja de servicios por días"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "Hoja de servicios es confirmada al final de la semana / mes"
+
+#~ msgid "Project Timesheet"
+#~ msgstr "Hoja de servicios del proyecto"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "Proceso hoja de asistencia RH"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Coste analítico"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Codifica su línea de hoja de servicios"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Confirmar hoja de servicios"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Control por el responsable del proyecto"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Hoja de servicios confirmada al final del periodo"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Confirmar hoja de servicios al final del periodo"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Hoja de servicios confirmada"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Hojas de servicios por período"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Hoja de servicios de mi departamento"
+
+#~ msgid "Phone call"
+#~ msgstr "Llamada telefónica"
+
+#~ msgid "Review of work"
+#~ msgstr "Revisión de trabajo"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Codificar sus horas y registrar entrada/salida"
+
+#~ msgid "Review"
+#~ msgstr "Revisión"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Hojas de servicios a confirmar"
+
+#, python-format
+#~ msgid "You can not sign out from an other date than today"
+#~ msgstr "No puede registrar salida en otra fecha que no sea hoy"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Facturar sobre hoja de servicios"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Factura basada en hoja de servicios"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Crea factura basada en hoja de servicios"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Hojas de servicios a validar"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Diferencia permitida hoja de servicios"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Convierte entrada de asistencia/servicio en hoja de servicios"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Crea su coste analítico acorde con cantidad"
+
+#~ 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 "Timesheet is validate by project manager."
+#~ msgstr "Hoja de servicios es validada por el responsable del proyecto"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Cualquier tiempo que dedique a la llamada telefónica"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Validar hoja de servicios"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Hoja de servicios de mi departamento a confirmar"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Crear coste analítico"
+
+#, python-format
+#~ msgid "You can not duplicate a timesheet !"
+#~ msgstr "¡No se puede duplicar una hoja de asistencia!"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "Hoja de servicios"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Al final del periodo (semana/mes)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "entrada hoja de servicios está en estado borrador."
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Coste analítico es creado"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Codifica cuanto tiempo dedica en llamadas telefónicas"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Revisar su trabajo al final del día"
+
+#~ msgid "My timesheets"
+#~ msgstr "Mis hojas de servicios"
+
+#~ msgid "Accept"
+#~ msgstr "Acceptar"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Hojas de servicios no validadas"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Hoja de servicios de mi departamento a validar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index 71c18f0eb6b..f08473e0659 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index 250649561ca..68a164575a6 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -35,25 +35,25 @@ msgstr ""
 #: field:hr_timesheet_sheet.sheet.account,sheet_id:0
 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0
 msgid "Sheet"
-msgstr ""
+msgstr "Lista"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Palvelu"
 
 #. 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 ""
+msgstr "Käyttäjälle ei ole määritetty työntekijää !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -67,12 +67,12 @@ msgstr "Läsnä kaikkiaan"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Osasto"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Tehtävän tuntilista"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -85,12 +85,13 @@ msgstr "Tänään"
 msgid ""
 "Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
+"Ole hyvä ja tarkista että kokonaiserotus tuntilistalle on alle %.2f !"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -99,7 +100,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -126,7 +127,7 @@ msgstr "Päivämäärä"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Perustuu tuntilistaan"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -145,19 +146,19 @@ msgstr "Päivä"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr ""
+msgstr "Paikalla"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Kokonaiskustannukset"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Käyttäjävirhe"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -172,6 +173,7 @@ msgstr "Hylkää"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"Et voi syöttää läsnäolopäivää nykyisen tuntilistan päiväysten ulkopuolelle!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -188,29 +190,29 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
 #, python-format
 msgid "You can not sign in from an other date than today"
-msgstr ""
+msgstr "Et voi kirjautua sisään muille päiville kuin kuluvalle päivälle."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Kuukausi-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "Tarkistus"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varoitus !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Työntekijän tuntilistan syötöt"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -219,7 +221,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analyyttinen tili"
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
@@ -236,7 +238,7 @@ msgstr "Päiväys alkaen"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Kuukausi "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -298,24 +300,24 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "Tila on vahvistettu"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Työntekijä"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -327,12 +329,12 @@ msgstr "Uusi"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
 #, python-format
 msgid "You cannot duplicate a timesheet !"
-msgstr ""
+msgstr "Et voi kopoioida tuntilistaa !"
 
 #. 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 "Omat läsnäolot viikottain"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
@@ -347,7 +349,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Virhe !"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -362,7 +364,7 @@ msgstr "Tuntilistan rivit"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "Tunnit"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -373,7 +375,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "Virhe: Sisään kirjautumista täytyy seurata ulos kirjautuminen"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -385,23 +387,23 @@ msgstr "Ei määritettyä työntekijää"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Virheellinen toiminto!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Projektipäällikkö vahvistaa tuntilistat."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
@@ -411,11 +413,12 @@ msgid ""
 "You cannot create a timesheet for an employee that does not have any user "
 "defined !"
 msgstr ""
+"Et voi luoda tuntilistaa työntekijälle jolla ei ole käyttäjätunnusta!"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Työskentele tehtävälle"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -426,7 +429,7 @@ msgstr "Päivänäkymä"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "Määrä"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -438,7 +441,7 @@ msgstr "Tuntilistasaldo"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Saatavilla olevat läsnäolot"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -449,7 +452,7 @@ msgstr "Kirjaudu sisään"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "Tuntilista yhteensä"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
@@ -465,18 +468,18 @@ msgstr "Mene"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Avaa nykyisen tuntilistasi"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -491,22 +494,22 @@ msgstr "Kuukausi"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "Kokonaiserotus"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Luonnoksena"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Kirjaudu sisään/ulos"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -514,11 +517,12 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
+"Tuntilistan rivi määrittelee työntekijän tiettyyn palveluun käyttämän ajan"
 
 #. 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 "Sinun pitää valita nykyinen päivä joka on tuntilistalla !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -539,23 +543,23 @@ msgstr "Luonnos"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Tuntilistan sallittu ero (tuntia)"
 
 #. 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 "Lasku luodaan tuntilistan perusteella"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "Tuntilistan luonnos"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Vuosi "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -566,13 +570,13 @@ msgstr "Viikko"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -584,13 +588,13 @@ msgstr "Nykyinen tila"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
-msgstr ""
+msgstr "Et voi muuttaa vahvistetun tuntilistan tietoja !"
 
 #. 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 "Tuntilistat jaksoittain"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -616,18 +620,18 @@ msgstr "Päivämäärä"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Tuntilistan jakso"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
@@ -637,13 +641,13 @@ msgstr "Tuntilistan rivit"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Oma kokonaisläsnäolo viikoittain"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -657,22 +661,22 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "Työntekijä kirjautuu sisään ja ulos."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Yritykset"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Määrä"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -680,7 +684,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Yleinen tili"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -688,6 +692,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 ""
+"Sallittu erotus tunteina kirjautumisten (sisään/ulos) ja tuntilistan "
+"laskennan välillä tuntilistaa kohden. Aseta 0 jos et halua kontrollia."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -700,7 +706,7 @@ msgstr "Jakso"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr ""
+msgstr "Et voi muuttaa tietoja vahvistetussa tuntilistassa !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -708,7 +714,7 @@ msgstr ""
 #: 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 Timesheet"
-msgstr ""
+msgstr "Oma tuntilista"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -720,22 +726,22 @@ msgstr "Valmis"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "Tila on 'luonnos'."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr ""
+msgstr "Laskuta työtä"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -746,18 +752,18 @@ msgstr "Tuntilistat tilien mukaan"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Avaa tuntilista"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
 #, python-format
 msgid "Cannot delete Sheet(s) which are already confirmed !"
-msgstr ""
+msgstr "Ei voida poistaa tuntilistoja jotka on jo vahvistettu"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "State is 'validated'."
-msgstr ""
+msgstr "Tila on 'vahvistettu'"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -775,12 +781,12 @@ 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 "Tuntilistan analyysi"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Hae tuntilistaa"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
@@ -789,6 +795,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain equal no. of sign "
 "ins and sign outs!"
 msgstr ""
+"Tuntilistaa ei voida vahvistaa koska se ei sisällä samaa määrää sisään ja "
+"uloskirjautumisia!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -801,7 +809,7 @@ msgstr "Tuntilistan rivi"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -820,18 +828,18 @@ msgstr "Kuvaus"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "Työntekijä vahvistaa määräajoin oman tuntilistansa"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Määrittelee tehtävän töiden yhteenvedon"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -842,12 +850,12 @@ msgstr "Kirjaudu ulos"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
-msgstr ""
+msgstr "Ei voida poistaa tuntilistoja joilla on läsnäoloja syötettynä"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "Siirtää tehtävänsyötön tuntilistan riville"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -858,14 +866,14 @@ msgstr "Päivän mukaan"
 #: 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 "Tuntilistan analyysi"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
 #: field:hr_timesheet_sheet.sheet.day,total_difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Erotus"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -876,38 +884,38 @@ msgstr "Poissaolo"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Työntekijät"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Tiedot palveluun käytetystä ajasta"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Vahvistus"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr ""
+msgstr "Laskutusmäärä"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -918,18 +926,18 @@ msgstr "Analyyttiset tilit"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "laskutuksen tyyppi"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "Kokonaisläsnäolo"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Kustannus"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
@@ -940,7 +948,7 @@ msgstr "Päivämäärä"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "HR tuntilista"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -954,12 +962,12 @@ msgstr "Vuosi"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Open"
-msgstr ""
+msgstr "Avaa"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Hyväksyttävät"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -969,7 +977,7 @@ msgstr "Yhteensä"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Loki"
 
 #~ msgid "My timesheets to confirm"
 #~ msgstr "Omat vahvistettavat tuntilistat"
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 83b559419d0..60144bfd924 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -1183,13 +1183,3 @@ msgstr "Journal"
 
 #~ msgid "My Department's Timesheet to Validate"
 #~ msgstr "Les feuilles de temps de mon département à valider"
-
-#~ msgid ""
-#~ "This view allows you to check timesheet sheets following a specific period. "
-#~ "You can also encode time spent on a project that is an analytic account and "
-#~ "the time spent on a project generate costs on the analytic account."
-#~ msgstr ""
-#~ "Cette vue permet de vérifier le suivi des feuilles de temps sur une période "
-#~ "donnée. Vous pouvez aussi saisir les temps passés sur un projet qui est lié "
-#~ "à un compte analytique, et le temps passé sur un tel projet générera des "
-#~ "coûts sur ce compte analytique."
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index b914cf71827..5cae5ce212c 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index 145f3ce6073..f6f758e4298 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 14:31+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index f5519be361d..ace23ef5a0c 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index ee79df24c64..dd19b1ecde5 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -38,7 +38,7 @@ msgstr "Foglio"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Servizio"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -225,7 +225,7 @@ msgstr "Contabilità Analitica"
 #. 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
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index b1670b69489..0f12cef30b1 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index a74761f28ca..bc133464004 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index ce42e2b89b6..d9934e34b0c 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 3a12d151867..b4912668c8d 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -1189,98 +1189,6 @@ msgstr "Журнал"
 #~ msgid "hr_timesheet_sheet.sheet"
 #~ msgstr "hr_timesheet_sheet.sheet"
 
-#~ msgid ""
-#~ "You can not have 2 timesheets that overlaps !\n"
-#~ "Please use the menu /'My Current Timesheet/' to avoid this problem."
-#~ msgstr ""
-#~ "2 цаг бүртгэлийг цаг хугацаагаар давхцуулж болохгүй! \n"
-#~ "Энэ асуудлаас зайлхийхийн тулд 'Одоогийн өөрийн цаг бүртгэл' цэсийг "
-#~ "хэрэглэнэ үү."
-
-#~ msgid ""
-#~ "You cannot enter an attendance ' \\n                            'date "
-#~ "outside the current timesheet dates!"
-#~ msgstr ""
-#~ "Одоогийн цаг бүртгэлийн огноонд үл хамаарах' \\n                            "
-#~ "'огноо бүхий ирцийг бүртгэж болохгүй!"
-
-#~ msgid ""
-#~ "You cannot enter an attendance ' \\n                        'date outside "
-#~ "the current timesheet dates!"
-#~ msgstr ""
-#~ "Одоогийн цаг бүртгэлийн огноонд үл хамаарах' \\n                            "
-#~ "'огноо бүхий ирцийг бүртгэж болохгүй!"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to easily encode and validate timesheet and "
-#~ "attendances\n"
-#~ "within the same view. The upper part of the view is for attendances and\n"
-#~ "track (sign in/sign out) events. The lower part is for timesheet.\n"
-#~ "\n"
-#~ "Other tabs contains statistics views to help you analyse your\n"
-#~ "time or the time of your team:\n"
-#~ "* Time spent by day (with attendances)\n"
-#~ "* Time spent by project\n"
-#~ "\n"
-#~ "This module also implements a complete timesheet validation process:\n"
-#~ "* Draft sheet\n"
-#~ "* Confirmation at the end of the period by the employee\n"
-#~ "* Validation by the project manager\n"
-#~ "\n"
-#~ "The validation can be configured in the company:\n"
-#~ "* Period size (day, week, month, year)\n"
-#~ "* Maximal difference between timesheet and attendances\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Энэ модуль нь 1 дэлгэцнээ ирц, цаг бүртгэлийг хялбархан бүртгэх,батламжлах\n"
-#~ "боломжийг олгоно. Дэлгэцийн дээд хэсэг нь ирц бөгөөд нэвтэрсэн гарсан\n"
-#~ "үйлдлийг нягтална. Доод хэсэг нь цаг бүртгэл.\n"
-#~ "\n"
-#~ "Бусад хэсэг нь таны ба таны багийн цагийг шинжилсэн\n"
-#~ "* Цаг зарцуулалтыг өдрөөр харах\n"
-#~ "* Цаг зарцуулалтыг төслөөр харах\n"
-#~ "статистикийн дэлгэц юм.\n"
-#~ "\n"
-#~ "Энэ модуль нь цаг бүртгэлийг батламжилж дуусах дараах алхмуудтай:\n"
-#~ "* Ноорог бүртгэл\n"
-#~ "* Мөчлөгийн төгсгөлд ажилтан бүртгэх\n"
-#~ "* Төслийн менежер батламжлах\n"
-#~ "\n"
-#~ "Батламжлах нь компаниас  тогтоосон дараах хэлбэртэй байж болно:\n"
-#~ "* Мөчлөгийн урт(Жил, сар, долоо хоног, өдөр)\n"
-#~ "* Цаг бүртгэл ба ирцийн хамгийн их зөрүү\n"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
-
 #, python-format
 #~ msgid "You can not sign out from an other date than today"
 #~ msgstr "Өнөөдрөөс өөр өдөр системээс гарсан гэж бүртгэж болохгүй"
-
-#~ 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."
-#~ msgstr ""
-#~ "Янз бүрийн төслүүдэд зарцуулсан хугацаагаа ажилчид бүртгэнэ. Төсөл нь "
-#~ "аналитик данс юм. Төсөл дээр ажилласан цагийг үндэслэсэн үнийг энэ аналитик "
-#~ "данснаа үүсгэнэ."
-
-#~ msgid "It will open the your current timesheet"
-#~ msgstr "Энэ нь таны одоогийн цаг бүртгэлийг нээнэ"
-
-#~ msgid "Close"
-#~ msgstr "Хаах"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory обьект дүрмийг дэмждэггүй"
-
-#~ msgid ""
-#~ "This view allows you to check timesheet sheets following a specific period. "
-#~ "You can also encode time spent on a project that is an analytic account and "
-#~ "the time spent on a project generate costs on the analytic account."
-#~ msgstr ""
-#~ "Энэ харагдац нь цаг бүртгэлийг тодорхой үе шаттайгаар харуулна. Мөн төсөл "
-#~ "дэх шинжилгээний бүртгэлд зарцуулагдсан цаг болон шинжилгээний бүртгэл дээрх "
-#~ "үнийн гаргалгаанд зарцуулагдсан цагийг кодоор шифрлэх боломжтой."
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index 9ce03f8fb70..d24aa475850 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -1204,30 +1204,6 @@ msgstr "Dagboek"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de actie definitie."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
 #, python-format
 #~ msgid "You can not sign out from an other date than today"
 #~ msgstr "U kunt niet uitklokken op een andere datum dan vandaag"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid ""
-#~ "This view allows you to check timesheet sheets following a specific period. "
-#~ "You can also encode time spent on a project that is an analytic account and "
-#~ "the time spent on a project generate costs on the analytic account."
-#~ msgstr ""
-#~ "Deze weergave laat u urenstaat formulieren controleren na ene bepaalde "
-#~ "periode. U kunt ook gewerkte uren boeken op een project dat een kostenplaats "
-#~ "is en de gewerkte tijd op een project genereert kosten op de kostenplaats."
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index 102bc11a6c5..6576b120eb8 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index aba15c6f306..7879187e050 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index 1e333f48cc3..1a482b072ac 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index 4f3e1f6e218..b128728ad20 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index b914cf71827..5cae5ce212c 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index 32b47ad2e00..37e16ed9a43 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -24,6 +24,8 @@ msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Вы не можете иметь 2 перекрывающихся расписания!\n"
+"Используйте пункт меню «Мое текущее расписание» для устранения проблемы."
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -36,20 +38,20 @@ msgstr "Табель"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+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 ""
+msgstr "Для вашего пользователя не определен сотрудник !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -63,12 +65,12 @@ msgstr "Всего присутствие"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Подразделение"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Расписание задач"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -95,7 +97,7 @@ msgstr "Март"
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Организация"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -122,7 +124,7 @@ msgstr "Дата до"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "На основе расписания"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -146,14 +148,14 @@ msgstr "Присутствует"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Общая стоимость"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "UserError"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -167,7 +169,7 @@ msgstr "Отклонить"
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
-msgstr ""
+msgstr "Невозможно установить дату посещения вне границ текущего расписания!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -179,18 +181,25 @@ 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 ""
+"\"Моё расписание\" открывает таблицу-расписание, в котором можно планировать "
+"действия внутри системы. В этой же форме можно регистрировать посещаемость "
+"(Вход/Выход) и вести описание рабочих часов, затраченных на различные "
+"проекты. В конце определённого организацией периода, расписание "
+"подтверждается пользователем и может быть проверено его руководителем. При "
+"необходимости, определяемой проектом, можно создать счета на основе "
+"расписания."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
 #, python-format
 msgid "You can not sign in from an other date than today"
-msgstr ""
+msgstr "Нельзя регистрироваться в системе другим днём."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Месяц-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -206,7 +215,7 @@ msgstr "Внимание !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Запись в расписании сотрудника"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -220,7 +229,7 @@ msgstr "Счет аналитики"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "№"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -232,7 +241,7 @@ msgstr "Дата с"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Месяц "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -294,7 +303,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать организации рекурсивно."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
@@ -306,7 +315,7 @@ msgstr "Состояние"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "В состоянии \"Подтверждено\"."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
@@ -323,12 +332,12 @@ msgstr "Новый"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
 #, python-format
 msgid "You cannot duplicate a timesheet !"
-msgstr ""
+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 ""
+msgstr "Моя посещаемость за неделю"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
@@ -364,12 +373,14 @@ msgstr "Часы"
 #: view:timesheet.report:0
 #: field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "#Стоимость"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Ошибка: регистрация (или выход) должны производиться после выхода (или "
+"регистрации)."
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -386,7 +397,7 @@ msgstr "Неверное действие !"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Руководитель проекта проверяет расписания."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -407,11 +418,13 @@ msgid ""
 "You cannot create a timesheet for an employee that does not have any user "
 "defined !"
 msgstr ""
+"Нельзя создать расписание для сотрудника, не имеющего определённого "
+"пользователя."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Работа над задачей"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -422,7 +435,7 @@ msgstr "Вид дня"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "Количество"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -434,7 +447,7 @@ msgstr "Всего по табелю"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Доступная посещаемость"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -445,7 +458,7 @@ msgstr "Зарегистрироваться"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "#Итого расписание"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
@@ -472,7 +485,7 @@ msgstr "Декабрь"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Откроет ваше текущее расписание"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -487,17 +500,17 @@ msgstr "Месяц"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "#Итого разница"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Вход/Выход"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -510,11 +523,13 @@ 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 ""
+msgstr "Требуется выбрать текущую дату в диапазоне дат этого расписания !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -524,6 +539,10 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
+"Этот отчёт производит анализ расписаний, созданных вашими сотрудниками в "
+"системе. Он позволяет получить полное представление о сделанных ими записях. "
+"Благодаря инструменту поиска, их можно сгруппировать по определённым "
+"критериям."
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -551,7 +570,7 @@ msgstr ""
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Год "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -580,13 +599,13 @@ msgstr "Текущее состояние"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
-msgstr ""
+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 ""
+msgstr "Расписания за период"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -618,7 +637,7 @@ msgstr "Ноябрь"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
@@ -633,13 +652,13 @@ msgstr "Строки табеля"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Моя посещаемость за неделю"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -653,7 +672,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -663,12 +682,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Организации"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Количество"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -676,7 +695,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Базовый счёт"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -704,7 +723,7 @@ msgstr ""
 #: 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 Timesheet"
-msgstr ""
+msgstr "Моё расписание"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -716,17 +735,17 @@ msgstr "Выполнено"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "В состоянии \"Черновик\""
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Проверено"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -742,18 +761,18 @@ msgstr "Табели по счетам"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Открыть расписание"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
 #, python-format
 msgid "Cannot delete Sheet(s) which are already confirmed !"
-msgstr ""
+msgstr "Невозможно удалить утвержденную страницу(-цы)!"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "State is 'validated'."
-msgstr ""
+msgstr "В состоянии \"Проверено\""
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -771,12 +790,12 @@ 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 "Анализ расписания"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Поиск расписания"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
@@ -797,14 +816,14 @@ msgstr "Строка табеля"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+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 ""
+msgstr "Посещаемость"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,name:0
@@ -816,13 +835,13 @@ msgstr "Описание"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "Сотрудник периодически подтверждает свое расписание."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
@@ -843,7 +862,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "Перемещает задачу в строку расписания"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -872,12 +891,12 @@ msgstr "Отсутствует"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Сотрудники"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -888,12 +907,12 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Подтверждение"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -903,7 +922,7 @@ msgstr "Ставка счета"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Подтвердить"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -920,12 +939,12 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "Общая посещаемость"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Стоимость"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
@@ -1036,12 +1055,3 @@ msgstr ""
 
 #~ msgid "Review"
 #~ msgstr "Обзор"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index c1f9cf71071..59c7b56d45d 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index 78d7ec41519..a3dcbf4041a 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index b70decbb3ac..16f71bc5aaf 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -1005,13 +1005,6 @@ msgstr ""
 #~ msgid "Phone call encoding"
 #~ msgstr "Phone call encoding"
 
-#~ msgid ""
-#~ "You cannot enter an attendance ' \\n                            'date "
-#~ "outside the current timesheet dates!"
-#~ msgstr ""
-#~ "You cannot enter an attendance ' \\n                            'date "
-#~ "outside the current timesheet dates!"
-
 #~ msgid "Timesheet by Day"
 #~ msgstr "Timesheet by Day"
 
@@ -1025,13 +1018,6 @@ msgstr ""
 #~ "Allowed difference between the sign in/out and the timesheet computation for "
 #~ "one sheet. Set this to 0 if you do not want any control."
 
-#~ msgid ""
-#~ "You cannot enter an attendance ' \\n                        'date outside "
-#~ "the current timesheet dates!"
-#~ msgstr ""
-#~ "You cannot enter an attendance ' \\n                        'date outside "
-#~ "the current timesheet dates!"
-
 #~ msgid "Timesheet by Days"
 #~ msgstr "Timesheet by Days"
 
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 6d97d6ff77d..f5330196187 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index f2a1f6f8f86..bcea1764adb 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 01ecf7b32d2..5c6f7539a75 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index 31b01bd6098..7d5eae69729 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-05-25 15:26+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -312,19 +312,19 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr "Người LĐ"
+msgstr "Người lao động"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 #: selection:timesheet.report,state:0
 msgid "New"
-msgstr "Mới"
+msgstr "Tạo mới"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
 #, python-format
 msgid "You cannot duplicate a timesheet !"
-msgstr ""
+msgstr "Bạn không thể nhân bản bảng chấm công !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index 73a3b6e9777..26e98d991a4 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-08-03 06:32+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -23,7 +23,7 @@ msgstr ""
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
-msgstr "你不能有两个重叠的时间表! 请使用菜单\"我的当前时间表\"来避免这问题"
+msgstr "您不能有两个重叠的记工单! 请使用菜单\"我的当前记工单\"来避免这问题"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -36,26 +36,26 @@ msgstr "表"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+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 ""
+msgstr "您的用户没有定义员工信息！"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+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 "出勤合计"
+msgstr "考勤合计"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -63,12 +63,12 @@ msgstr "出勤合计"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "部门"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "工作记工单"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -80,13 +80,13 @@ msgstr "今天"
 #, python-format
 msgid ""
 "Please verify that the total difference of the sheet is lower than %.2f !"
-msgstr ""
+msgstr "请核实这表的总差异少于  %.2f  ！"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -95,7 +95,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -106,7 +106,7 @@ msgstr ""
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "时间表"
+msgstr "记工单"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -122,12 +122,12 @@ msgstr "日期到"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "根据记工单"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr "确认"
+msgstr "生效"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -141,19 +141,19 @@ msgstr "天"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr "现在"
+msgstr "出勤"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "总成本"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "用户错误"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -167,7 +167,7 @@ msgstr "拒绝"
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
-msgstr ""
+msgstr "您不能输入一个超过当前记工单日期的考勤日期！"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -179,34 +179,36 @@ 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 ""
+"用\"我的记工单\"菜单开启您的记工单所以您能在系统预定你的活动。用相同方式，您能记录您的考勤（签入/签出）同时记录在不同项目的工作时间。在公司定义的期末"
+"，确认用户的记工单和经由经理使其生效。如果需要，可以定义为一个项目，你能给这记工单开发票。"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
 #, python-format
 msgid "You can not sign in from an other date than today"
-msgstr ""
+msgstr "您不能签入今天外的其它日期"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " 上个月 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "审核"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "员工记工单"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -220,7 +222,7 @@ msgstr "辅助核算项"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "编号"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -232,7 +234,7 @@ msgstr "日期从"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " 月份 "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -243,7 +245,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
-msgstr "时间表"
+msgstr "记工单"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -258,7 +260,7 @@ msgstr "已确认"
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
 msgid "Attendance"
-msgstr "出勤"
+msgstr "考勤"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -290,28 +292,45 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"这模块帮助您轻松编码和生效记工单和考勤表。\n"
+"在一些视图上半部分为考勤和跟踪每次（签入/签出）下半部分为记工单。\n"
+"\n"
+"其它标签包括统计视图帮助你分析您或者您团队花费的时间：\n"
+"* 每天花费的时间（考勤）\n"
+"* 项目花费的时间\n"
+"\n"
+"此模块还实现一个完整的审核过程：\n"
+"* 记工单草稿\n"
+"* 确认员工在期末\n"
+"* 项目经理审核\n"
+"\n"
+"在公司能设置审核：\n"
+"* 周期大小（天，周，月，年）\n"
+"*记工单和考勤表最大的差异\n"
+"    "
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "错误！您不能创建递归公司."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "状态是“已确认”"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -323,12 +342,12 @@ msgstr "新的"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
 #, python-format
 msgid "You cannot duplicate a timesheet !"
-msgstr ""
+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 ""
+msgstr "周我的总考勤"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
@@ -343,7 +362,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -353,23 +372,23 @@ msgstr "总时间"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Lines"
-msgstr "时间表明细"
+msgstr "记工单明细"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "小时数"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "# 成本"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "错误:登入必须要先登出"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -381,18 +400,18 @@ msgstr "没定义员工"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "无效操作！"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "项目经理审核记工单"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -406,12 +425,12 @@ msgstr "设置"
 msgid ""
 "You cannot create a timesheet for an employee that does not have any user "
 "defined !"
-msgstr ""
+msgstr "用户没定义员工您不能创建记工单！"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "工作任务"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -422,19 +441,19 @@ msgstr "每天视图"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "# 数量"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
 #: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "总时间表"
+msgstr "总记工单"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "可用的考勤"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -445,12 +464,12 @@ msgstr "签入"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "# 总记工单"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -461,18 +480,18 @@ msgstr "到:"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "它将开启您当前记工单"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -487,34 +506,34 @@ msgstr "月份"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "# 总差异"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "在草稿"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "签入/签出"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+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 ""
+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 ""
+msgstr "您选择的当前日期必须要在记工单里！"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -523,7 +542,7 @@ msgid ""
 "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 ""
+msgstr "在系统里这报表分析创建的记工单，它可以使您一览您的员工的工作。您可以在搜索工具选择具体的标准来分组。"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -535,23 +554,23 @@ msgstr "草稿"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+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 ""
+msgstr "这发票创建基于这记工单"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "记工单草稿"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " 年 "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -562,13 +581,13 @@ msgstr "周"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -580,13 +599,13 @@ msgstr "当前状态"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
-msgstr ""
+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 ""
+msgstr "记工单周期"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -600,7 +619,7 @@ msgstr "用户"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
-msgstr "科目(项)时间表"
+msgstr "辅助核算项的记工单"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0
@@ -612,34 +631,34 @@ msgstr "日期"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "记工单范围"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "时间表明细"
+msgstr "记工单明细"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "周我的总考勤"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -647,28 +666,28 @@ 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 ""
+msgstr "在指定的周期检查您的记工单。您也可以在项目花费的时间进行编码（即辅助核算项）因此在这辅助核算项生成有关成本。"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "员工签入和签出。"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -676,27 +695,27 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+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 ""
+msgstr "签入/签出和在一个记工单里的容许的差异小时。如果您不想这样控制设为0."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,period_ids:0
 msgid "Period"
-msgstr "期间"
+msgstr "周期"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr ""
+msgstr "您不能修改一张已确认的记工单！"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -704,7 +723,7 @@ msgstr ""
 #: 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 Timesheet"
-msgstr ""
+msgstr "我的计工单"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -716,44 +735,44 @@ msgstr "完成"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "状态是“草稿”"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "已生效"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr "在这周的发票"
+msgstr "这周的发票"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "时间表项"
+msgstr "辅助核算项记工单"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "开始的记工单"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
 #, python-format
 msgid "Cannot delete Sheet(s) which are already confirmed !"
-msgstr ""
+msgstr "无法删除它们他们早已确认！"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "State is 'validated'."
-msgstr ""
+msgstr "状态是“已生效”"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -765,18 +784,21 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * “草稿”状态用于一个新的和未确认的记工单。\n"
+"* \"已确认\"状态用于用户确认一个记工单。\n"
+"* “完成”状态用于用户记工单已被他/她的上级审核。"
 
 #. 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 "记工单分析"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "查找记工单"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
@@ -784,12 +806,12 @@ msgstr ""
 msgid ""
 "The timesheet cannot be validated as it does not contain equal no. of sign "
 "ins and sign outs!"
-msgstr ""
+msgstr "这记工单不能生效因为它签入和签出！"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "时间表明细"
+msgstr "记工单明细"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -797,14 +819,14 @@ msgstr "时间表明细"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+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 "出勤"
+msgstr "考勤"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,name:0
@@ -816,18 +838,18 @@ msgstr "说明"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "员工定期确认自己的记工单"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "定义任务的工作摘要"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -838,12 +860,12 @@ msgstr "签出"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
-msgstr ""
+msgstr "无法删除这记工单因为它有考勤记录！"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "把工作调入记工单明细中"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -854,7 +876,7 @@ msgstr "按天"
 #: 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 "记工单分析"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -866,34 +888,34 @@ msgstr "差异"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr "缺席"
+msgstr "缺勤"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "服务花费的时间信息"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -903,7 +925,7 @@ msgstr "发票税率"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "审批"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -914,18 +936,18 @@ msgstr "辅助核算项"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "开票类型"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "#总考勤"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
@@ -936,7 +958,7 @@ msgstr "当前日期"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "人力资源 记工单"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -950,12 +972,12 @@ msgstr "年"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Open"
-msgstr ""
+msgstr "开始"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "待审批"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -965,7 +987,7 @@ msgstr "合计"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "账簿"
 
 #~ msgid "My timesheets to confirm"
 #~ msgstr "确认我的时间表"
@@ -976,46 +998,6 @@ msgstr ""
 #~ msgid "Confirm timesheet sheet"
 #~ msgstr "确认时间表"
 
-#~ msgid ""
-#~ "\n"
-#~ "This module help you easily encode and validate timesheet and attendances\n"
-#~ "within the same view. The upper part of the view is for attendances and\n"
-#~ "track (sign in/sign out) events. The lower part is for timesheet.\n"
-#~ "\n"
-#~ "Others tabs contains statistics views to help you analyse your\n"
-#~ "time or the time of your team:\n"
-#~ "* Time spent by day (with attendances)\n"
-#~ "* Time spent by project\n"
-#~ "\n"
-#~ "This module also implement a complete timesheet validation process:\n"
-#~ "* Draft sheet\n"
-#~ "* Confirmation at the end of the period by the employee\n"
-#~ "* Validation by the project manager\n"
-#~ "\n"
-#~ "The validation can be configured in te company:\n"
-#~ "* Period size (day, week, month, year)\n"
-#~ "* Maximal difference between timesheet and attendances\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "这模块帮助你简单编码和使时间表生效并加入到一些视图.\n"
-#~ "在视图的上部分是出勤和跟踪(签入/签出)事件,下部分是时间表\n"
-#~ "\n"
-#~ "    其它标签包括统计视图以帮助你分析你的时间\n"
-#~ "或者你团队的时间:\n"
-#~ "    *每天的时间花费(和出勤)\n"
-#~ "    *项目的时间花费\n"
-#~ "\n"
-#~ "    这模块还实现一个完整的时间表批准处理:\n"
-#~ "    *时间表草稿\n"
-#~ "    *确认员工的周期结束\n"
-#~ "    *批准项目管理\n"
-#~ "\n"
-#~ "    公司确认能批准:\n"
-#~ "    *周期大小(日,周,月,年)\n"
-#~ "    *在时间表和出勤的最大差别\n"
-#~ "    "
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "定义员工时间表条目"
 
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index a23337f3d94..ac2c6eb82ef 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index d20ad3a5f4c..49b18f75e4b 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -80,3 +80,5 @@ class hr_timesheet_report(osv.osv):
             )
         """)
 hr_timesheet_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 52147d062ac..11915fb64c9 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -40,12 +40,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col="10" colspan="12">
-                        <filter icon="terp-go-year" string=" Year "
+                    <group>
+                        <filter icon="terp-go-year" string="Year"
                             name="year"
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Timesheet in current year"/>
-                        <filter icon="terp-go-month" string=" Month "
+                        <separator orientation="vertical"/>							
+                        <filter icon="terp-go-month" string="Month"
                             name="month"
                             domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet in current month"/>
@@ -90,7 +91,7 @@
             <field name="res_model">hr.timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="help">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.</field>
         </record>
         <menuitem
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index a8c0440a053..986beb453eb 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -120,3 +120,5 @@ class timesheet_report(osv.osv):
             )
         """)
 timesheet_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 08abc6db63b..468197884ba 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -18,7 +18,7 @@
             <field name="model">timesheet.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet">
                     <field name="date_current" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="user_id" invisible="1"/>
@@ -48,10 +48,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col="10" colspan="12">
-                        <filter icon="terp-go-year" string=" Year "
+                    <group>
+                        <filter icon="terp-go-year" string="Year"
+                                name="year"
                                 domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                                 help="Timesheet in current year"/>
+                        <separator orientation="vertical"/>								
                         <filter icon="terp-go-month" string=" Month "
                                 name="month"
                                 domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
@@ -117,7 +119,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
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 1808c325a07..58b1b38ad2f 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -1,29 +1,10 @@
 -
   In order to test hr_timesheet_sheet module in OpenERP, I create timesheet and check validation process done by manager.
 -
-  I will create a company and set maximum allowed difference between timesheet and attendance to 1 hour
--
-  !record {model: res.company, id: res_company_openERP}:
-    currency_id: base.ARS
-    name: OpenERP SA
-    partner_id: base.res_partner_desertic_hispafuentes
-    timesheet_max_difference: 1.0
-
--
-  I assign this company to Admin user
--
-  !record {model: res.users, id: base.user_root}:
-    company_id: res_company_openERP
-    company_ids:
-      - base.main_company
-      - res_company_openERP
-
--
-  I  create a new employee “Mark Johnson”.
+  I  create a new employee "Mark Johnson".
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
     address_home_id: base.res_partner_address_1
-    company_id: res_company_openERP
     gender: male
     marital: single
     name: Mark Johnson
@@ -71,13 +52,30 @@
     user_id: base.user_demo
     employee_id: 'hr_employee_employee0'
 -
-  Now , at the time of login, I create Attendances and perform "Sign In" action.
+  Now, at the time of login, I create Attendances and perform "Sign In" action.
 -
-  !record {model: hr.attendance, id: hr_attendance_0}:
-    action: sign_in
-    employee_id: 'hr_employee_employee0'
-    name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(max(0,datetime.now().hour-1),max(0,datetime.now().minute-1),max(0,datetime.now().second-1))
-
+  !python {model: hr_timesheet_sheet.sheet}:
+    self.sign_in(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
+-
+  I want to check attendance and work of yesterday. I click on <- button.
+-
+  !python {model: hr_timesheet_sheet.sheet}: |
+     self.date_previous(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
+-
+  Then I click on "Today" button to fill today's timesheet.
+-
+  !python {model: hr_timesheet_sheet.sheet}: |
+     self.date_today(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
+-
+  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}: |
+     self.button_dummy(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
+-
+  I can also move to next day by clicking on -> button.
+-
+  !python {model: hr_timesheet_sheet.sheet}: |
+     self.date_next(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
 -
   At the time of logout, I create attendance and perform "Sign Out".
 -
@@ -88,7 +86,6 @@
 
 -
   I create Timesheet Entry for time spend on today work.
-
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     timesheet_ids:
@@ -97,7 +94,7 @@
         name: 'Develop yaml for hr module'
         unit_amount: 3.00
         amount: -90.00
-        product_id: hr_timesheet.product_consultant
+        product_id: product_consultant
         general_account_id: account.a_expense
         user_id: base.user_root
         journal_id: hr_timesheet.analytic_journal
@@ -128,7 +125,7 @@
         name: 'Develop yaml for hr module'
         unit_amount: 2.0
         amount: -90.00
-        product_id: hr_timesheet.product_consultant
+        product_id: product_consultant
         general_account_id: account.a_expense
         user_id: base.user_root
         journal_id: hr_timesheet.analytic_journal
diff --git a/addons/html_view/__init__.py b/addons/html_view/__init__.py
index 465ad75ffe0..12bd1af21b1 100644
--- a/addons/html_view/__init__.py
+++ b/addons/html_view/__init__.py
@@ -1 +1,3 @@
-import html_view
\ No newline at end of file
+import html_view
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index c4a7f033993..3deceff9d6f 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -2,7 +2,7 @@
     "name" : "Html View",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
     "demo_xml" : [],
diff --git a/addons/html_view/html_view.py b/addons/html_view/html_view.py
index 79f4bd7d0b9..09201b23121 100644
--- a/addons/html_view/html_view.py
+++ b/addons/html_view/html_view.py
@@ -10,4 +10,6 @@ class html_view(osv.osv):
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
     }
     
-html_view()
\ No newline at end of file
+html_view()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/html_view/i18n/ar.po b/addons/html_view/i18n/ar.po
new file mode 100644
index 00000000000..1de4d007d8c
--- /dev/null
+++ b/addons/html_view/i18n/ar.po
@@ -0,0 +1,63 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-26 21:06+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: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "اسم"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "شركة"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "إختبار HTML"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "مثال HTML"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "عرض HTML"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "المصارف"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/html_view/i18n/bg.po b/addons/html_view/i18n/bg.po
index 16ac654bdb2..551c21775ad 100644
--- a/addons/html_view/i18n/bg.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/ca.po b/addons/html_view/i18n/ca.po
index 8987c9c537b..cef8fc1d04f 100644
--- a/addons/html_view/i18n/ca.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/cs.po b/addons/html_view/i18n/cs.po
index a38104d5ece..f45e312b32d 100644
--- a/addons/html_view/i18n/cs.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/da.po b/addons/html_view/i18n/da.po
new file mode 100644
index 00000000000..2c33fe8b010
--- /dev/null
+++ b/addons/html_view/i18n/da.po
@@ -0,0 +1,67 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-08 22:09+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "HTML test"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "HTML eksempel"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "HTML visning"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Banker"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+"\n"
+"    Dette er testmodulet, der viser understøttelse af HTML tags i en normal "
+"XML formular.\n"
+"    "
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/html_view/i18n/de.po b/addons/html_view/i18n/de.po
index d43d00b04b3..76a44a4e60c 100644
--- a/addons/html_view/i18n/de.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -65,27 +65,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/html_view/i18n/el.po b/addons/html_view/i18n/el.po
index dc326689860..bbaef99afbc 100644
--- a/addons/html_view/i18n/el.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/en_GB.po b/addons/html_view/i18n/en_GB.po
new file mode 100644
index 00000000000..47118c5f632
--- /dev/null
+++ b/addons/html_view/i18n/en_GB.po
@@ -0,0 +1,67 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-08-25 11:58+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: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Html Test"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Html Example"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "Html View"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Banks"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/html_view/i18n/es.po b/addons/html_view/i18n/es.po
index 6ae99cf8124..20389119963 100644
--- a/addons/html_view/i18n/es.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -66,27 +66,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/html_view/i18n/es_MX.po b/addons/html_view/i18n/es_MX.po
new file mode 100644
index 00000000000..14b7fa68768
--- /dev/null
+++ b/addons/html_view/i18n/es_MX.po
@@ -0,0 +1,68 @@
+# 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-27 09:12+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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Prueba html"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Ejemplo html"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "Vista html"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Bancos"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo de pruebas que muestra el soporte de etiquetas html en "
+"vistas formulario xml normales.\n"
+"    "
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/html_view/i18n/es_PY.po b/addons/html_view/i18n/es_PY.po
index 8904905d392..c4c88e9dba4 100644
--- a/addons/html_view/i18n/es_PY.po
+++ b/addons/html_view/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/es_VE.po b/addons/html_view/i18n/es_VE.po
new file mode 100644
index 00000000000..14b7fa68768
--- /dev/null
+++ b/addons/html_view/i18n/es_VE.po
@@ -0,0 +1,68 @@
+# 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-27 09:12+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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Prueba html"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Ejemplo html"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "Vista html"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Bancos"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo de pruebas que muestra el soporte de etiquetas html en "
+"vistas formulario xml normales.\n"
+"    "
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/html_view/i18n/et.po b/addons/html_view/i18n/et.po
new file mode 100644
index 00000000000..0561494303d
--- /dev/null
+++ b/addons/html_view/i18n/et.po
@@ -0,0 +1,63 @@
+# Estonian 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-10-11 17:49+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr ""
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr ""
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr ""
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr ""
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Pangad"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr ""
diff --git a/addons/html_view/i18n/fi.po b/addons/html_view/i18n/fi.po
index 53f7526fc21..0810f3d1949 100644
--- a/addons/html_view/i18n/fi.po
+++ b/addons/html_view/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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/fr.po b/addons/html_view/i18n/fr.po
index b95fb41abef..64916417ab5 100644
--- a/addons/html_view/i18n/fr.po
+++ b/addons/html_view/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 11:34+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/gl.po b/addons/html_view/i18n/gl.po
index 4c534ac4a3a..e3d759725b1 100644
--- a/addons/html_view/i18n/gl.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/hu.po b/addons/html_view/i18n/hu.po
index bd25c335d21..984aab02c76 100644
--- a/addons/html_view/i18n/hu.po
+++ b/addons/html_view/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-20 19:43+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/it.po b/addons/html_view/i18n/it.po
index fc0bf03a107..4468396e129 100644
--- a/addons/html_view/i18n/it.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -65,27 +65,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/html_view/i18n/mk.po b/addons/html_view/i18n/mk.po
new file mode 100644
index 00000000000..6db9d780a5f
--- /dev/null
+++ b/addons/html_view/i18n/mk.po
@@ -0,0 +1,63 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-14 08:15+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: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Име"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Компанија"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Html тест"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Html пример"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "Html преглед"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Банки"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/html_view/i18n/mn.po b/addons/html_view/i18n/mn.po
index facbbf1872c..2527d5e5b29 100644
--- a/addons/html_view/i18n/mn.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/nb.po b/addons/html_view/i18n/nb.po
index 5db84123082..53ad0e0a45a 100644
--- a/addons/html_view/i18n/nb.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/nl.po b/addons/html_view/i18n/nl.po
index 9f5791a98ef..aa92ad98e8a 100644
--- a/addons/html_view/i18n/nl.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -65,26 +65,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/html_view/i18n/pt.po b/addons/html_view/i18n/pt.po
index 9a5c0827292..ec2fd841a88 100644
--- a/addons/html_view/i18n/pt.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/pt_BR.po b/addons/html_view/i18n/pt_BR.po
index 41a589121d5..4ad669e5513 100644
--- a/addons/html_view/i18n/pt_BR.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -65,27 +65,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.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 pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/html_view/i18n/ro.po b/addons/html_view/i18n/ro.po
index f596130db21..c441717e3e1 100644
--- a/addons/html_view/i18n/ro.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/ru.po b/addons/html_view/i18n/ru.po
index 208b34465e5..4c1f379982b 100644
--- a/addons/html_view/i18n/ru.po
+++ b/addons/html_view/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: 2011-05-02 04:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -56,32 +56,12 @@ msgid ""
 "view.\n"
 "    "
 msgstr ""
+"\n"
+"    Это тестовый модуль, который показывает поддержку тегов HTML в "
+"нормальном режиме формы XML.\n"
+"    "
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для структуры вида!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
diff --git a/addons/html_view/i18n/sk.po b/addons/html_view/i18n/sk.po
index e19eea8f904..7fbb2f3daa4 100644
--- a/addons/html_view/i18n/sk.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/sl.po b/addons/html_view/i18n/sl.po
index bca3fff5c46..df7290998d6 100644
--- a/addons/html_view/i18n/sl.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -56,6 +56,10 @@ msgid ""
 "view.\n"
 "    "
 msgstr ""
+"\n"
+"    To je testni modul, ki prikazuje podporo html oznak v normalnem pogledu "
+"xml obrazca.\n"
+"    "
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
diff --git a/addons/html_view/i18n/sr.po b/addons/html_view/i18n/sr.po
index 814fb1d8f2c..9b16b12add2 100644
--- a/addons/html_view/i18n/sr.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -61,17 +61,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/html_view/i18n/sr@latin.po b/addons/html_view/i18n/sr@latin.po
index 771902642d0..475f848f53f 100644
--- a/addons/html_view/i18n/sr@latin.po
+++ b/addons/html_view/i18n/sr@latin.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-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-23 11:14+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-06 13:56+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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: html_view
 #: field:html.view,comp_id:0
 msgid "Company"
-msgstr "Preduzece"
+msgstr "Preduzeće"
 
 #. module: html_view
 #: model:ir.actions.act_window,name:html_view.action_html_view_form
@@ -56,22 +56,12 @@ msgid ""
 "view.\n"
 "    "
 msgstr ""
+"\n"
+"    Ovo je test-modul koji pokazuje html podršku za tegove u uobičajenom xml "
+"obliku pregleda.\n"
+"    "
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "html.view"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
diff --git a/addons/html_view/i18n/sv.po b/addons/html_view/i18n/sv.po
index ed93688184f..d1991fb9c07 100644
--- a/addons/html_view/i18n/sv.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -61,26 +61,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
diff --git a/addons/html_view/i18n/tr.po b/addons/html_view/i18n/tr.po
index 120ee91ccfd..ba28157f923 100644
--- a/addons/html_view/i18n/tr.po
+++ b/addons/html_view/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: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -25,7 +25,7 @@ msgstr "Ad"
 #. module: html_view
 #: field:html.view,comp_id:0
 msgid "Company"
-msgstr "Şirket"
+msgstr "Firma"
 
 #. module: html_view
 #: model:ir.actions.act_window,name:html_view.action_html_view_form
@@ -41,7 +41,7 @@ msgstr "Html Örneği"
 #. module: html_view
 #: model:ir.module.module,shortdesc:html_view.module_meta_information
 msgid "Html View"
-msgstr "Html Görünüm"
+msgstr "Html Görünümü"
 
 #. module: html_view
 #: field:html.view,bank_ids:0
@@ -63,4 +63,4 @@ msgstr ""
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
-msgstr "html.view"
+msgstr "html.görünümü"
diff --git a/addons/html_view/i18n/vi.po b/addons/html_view/i18n/vi.po
index fcee5f57985..66f04c6f257 100644
--- a/addons/html_view/i18n/vi.po
+++ b/addons/html_view/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: 2011-05-30 04:59+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
diff --git a/addons/html_view/i18n/zh_CN.po b/addons/html_view/i18n/zh_CN.po
index bdd1c5fbc34..a9ff2397140 100644
--- a/addons/html_view/i18n/zh_CN.po
+++ b/addons/html_view/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: html_view
 #: field:html.view,name:0
@@ -46,7 +46,7 @@ msgstr "HTML 视图"
 #. module: html_view
 #: field:html.view,bank_ids:0
 msgid "Banks"
-msgstr "银行"
+msgstr "存储"
 
 #. module: html_view
 #: model:ir.module.module,description:html_view.module_meta_information
@@ -64,6 +64,3 @@ msgstr ""
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
 msgstr "HTML 视图"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "字段的长度不小于1"
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 2a561a93b81..66709824c4a 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Idea Manager',
+    'name': 'Ideas Box',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Human Resources',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
diff --git a/addons/idea/i18n/ar.po b/addons/idea/i18n/ar.po
index aa6509a7783..a5e2207cf2e 100644
--- a/addons/idea/i18n/ar.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -115,7 +115,7 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr "سىء"
+msgstr "سئ"
 
 #. module: idea
 #: selection:report.vote,idea_state:0
@@ -161,7 +161,7 @@ msgstr "تصنيف فرعى"
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr "سىء جدا"
+msgstr "سىء جداً"
 
 #. module: idea
 #: view:idea.vote:0
@@ -188,7 +188,7 @@ msgstr ""
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr "مضمون الفكرة"
+msgstr "محتوي الفكرة"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
diff --git a/addons/idea/i18n/bg.po b/addons/idea/i18n/bg.po
index ed3cc0a678c..cbed468ef00 100644
--- a/addons/idea/i18n/bg.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/bs.po b/addons/idea/i18n/bs.po
index 8980849a486..bbb1e85ee0a 100644
--- a/addons/idea/i18n/bs.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/ca.po b/addons/idea/i18n/ca.po
index cd87324da68..444699c6b81 100644
--- a/addons/idea/i18n/ca.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/cs.po b/addons/idea/i18n/cs.po
index d60db0ba978..020e19f914f 100644
--- a/addons/idea/i18n/cs.po
+++ b/addons/idea/i18n/cs.po
@@ -4,27 +4,29 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"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: 2010-08-03 06:32+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-10-17 08:27+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: openerp-i18n-czech <openerp-i18n-czech@lists.launchpad.net >\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-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
 msgstr ""
+"Pokud je Pravda, původní tvůrce tohoto nápadu bude viditelný ostatním"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Výběr nápadu"
 
 #. module: idea
 #: view:idea.idea:0
@@ -42,13 +44,13 @@ msgstr "Komentáře"
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr ""
+msgstr "Vložit nápad"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
 #: model:ir.ui.menu,name:idea.menu_report_vote_all
 msgid "Ideas Analysis"
-msgstr ""
+msgstr "Analýza nápadů"
 
 #. module: idea
 #: view:idea.category:0
@@ -56,7 +58,7 @@ msgstr ""
 #: view:idea.vote:0
 #: view:report.vote:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -71,43 +73,54 @@ msgid ""
 "    The managers can obtain an easy view on best ideas from all the users.\n"
 "    Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"\n"
+"    Tento modul umožní vašim uživatelům jednoduše a efektivně se podílet na "
+"inovacích ve společnosti.\n"
+"    Umožňuje každému vyjádřit nápady o různých předmětech.\n"
+"    Pak, ostatní uživatelé mohou komentovat tyto nápady a dávat hlas určitým "
+"nápadům.\n"
+"    Každý nápad má skóre založené na různých hlasech.\n"
+"    Správci mohou získat jednoduše pohled na nejlepší nápady od všech "
+"uživatelů.\n"
+"    Jakmile je instalováno, zkontrolujte nabídku 'Nápady' v hlavní nabídce "
+"'Nástroje'."
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Správce nápadů"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Idea must be in 'Open' state before vote for that idea."
-msgstr ""
+msgstr "Nápad musí být ve stavu 'Otevřený' přes hlasováním pro tento nápad."
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,day:0
 msgid "Day"
-msgstr ""
+msgstr "Den"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Refuse"
-msgstr ""
+msgstr "Odmítnout"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "Počet hlasů"
 
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "Statistiky hlasů nápadu"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -115,17 +128,17 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr ""
+msgstr "Špatný"
 
 #. module: idea
 #: selection:report.vote,idea_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Zrušeno"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr ""
+msgstr "Kategorie nápadů"
 
 #. module: idea
 #: code:addons/idea/idea.py:253
@@ -133,27 +146,27 @@ msgstr ""
 #: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varování !"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "Váš komentář"
 
 #. module: idea
 #: view:report.vote:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Měsíc   "
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "Idea Vote"
-msgstr ""
+msgstr "Hlas nápadu"
 
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "Nadřazené kategorie"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -166,24 +179,24 @@ msgstr "Velice špatné"
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr ""
+msgstr "Hlasy nápadů"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# z řádek"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:89
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
-msgstr ""
+msgstr "Nemůžete dát hlas tomuto nápadu vícekrát než %s"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr ""
+msgstr "Kategorie nápadů"
 
 #. module: idea
 #: help:idea.idea,description:0
@@ -193,7 +206,7 @@ msgstr "Obsah nápadu"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Kategorie nápadů"
 
 #. module: idea
 #: view:idea.idea:0
@@ -212,27 +225,27 @@ msgstr "Nevoleno"
 #. module: idea
 #: sql_constraint:idea.category:0
 msgid "The name of the category must be unique"
-msgstr ""
+msgstr "Jméno kategorie musí být jedinečné"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "vyberte nápad"
 
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "stat"
 
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr "Podřezené kategorie"
+msgstr "Podřízené kategorie"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "Další"
 
 #. module: idea
 #: view:idea.idea:0
@@ -240,7 +253,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -248,17 +261,17 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Good"
-msgstr ""
+msgstr "Dobrý"
 
 #. module: idea
 #: help:idea.idea,open_date:0
 msgid "Date when an idea opened"
-msgstr ""
+msgstr "Datum, kdy byl nápad otevřen"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "Podrobnosti nápadu"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -267,17 +280,20 @@ msgid ""
 " It is             opened by the user, the state is 'Opened'.            \n"
 "If the idea is accepted, the state is 'Accepted'."
 msgstr ""
+"Když je nápad vytvořen, je ve stavu 'Koncept'.\n"
+" Pokud je otevřen uživatelem, je ve stavu 'Otevřený'.            \n"
+"Pokud je nápad přijat, je ve stavu 'Přijatý'."
 
 #. module: idea
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "Otevřít nápad?"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
 #. module: idea
 #: view:idea.idea:0
@@ -285,7 +301,7 @@ msgstr ""
 #: view:report.vote:0
 #: selection:report.vote,idea_state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Přijato"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
@@ -296,18 +312,18 @@ msgstr "Kategorie"
 #. module: idea
 #: view:report.vote:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Měsíc-1    "
 
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Datum otevření"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 #: model:ir.actions.act_window,name:idea.action_idea_post_vote
 msgid "Vote"
-msgstr ""
+msgstr "Hlas"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@@ -318,12 +334,12 @@ msgstr "Statistiky hlasů"
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Maximum hlasů na uživatele"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Nadřazená kategorie"
 
 #. module: idea
 #: field:idea.comment,content:0
@@ -332,29 +348,29 @@ msgstr ""
 #: field:idea.vote,comment:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comment"
-msgstr ""
+msgstr "Komentář"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "Září"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "Měsíc"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "Otevřené nápady"
 
 #. module: idea
 #: view:idea.category:0
@@ -364,7 +380,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -377,7 +393,7 @@ msgstr "Velmi dobré"
 #. module: idea
 #: view:report.vote:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Rok  "
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -388,7 +404,7 @@ msgstr "Otevřeno"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's Votes"
-msgstr ""
+msgstr "Hlasy nápadů"
 
 #. module: idea
 #: view:idea.idea:0
@@ -398,7 +414,7 @@ msgstr "Nový nápad"
 #. module: idea
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr ""
+msgstr "vote_stat nápadů"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
@@ -410,12 +426,12 @@ msgstr "Nápady podle kategorií"
 #: selection:idea.idea,state:0
 #: selection:report.vote,idea_state:0
 msgid "Draft"
-msgstr ""
+msgstr "Koncept"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -423,23 +439,23 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Normal"
-msgstr "Normální"
+msgstr "Běžný"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Uživatelské jméno"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Statistiky hlasů nápadů"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -452,38 +468,38 @@ msgstr "Uživatel"
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "Odeslat"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "Moje hlasy"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,created_date:0
 msgid "Creation date"
-msgstr "Datum tvorby"
+msgstr "Datum vytvoření"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "idea.idea"
 
 #. module: idea
 #: field:idea.category,summary:0
@@ -493,45 +509,45 @@ msgstr "Shrnutí"
 #. module: idea
 #: field:idea.idea,name:0
 msgid "Idea Summary"
-msgstr ""
+msgstr "Přehled nápadu"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "Statistika hlasů"
 
 #. module: idea
 #: field:report.vote,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Datum objednávky"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,user_id:0
 #: view:report.vote:0
 msgid "Creator"
-msgstr ""
+msgstr "Tvůrce"
 
 #. module: idea
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Dát hlas"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
 msgid "Set to one if  you require only one Vote per user"
-msgstr ""
+msgstr "Nastavte na jedničku, pokud požadujete pouze jeden hlas na uživatele"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -541,18 +557,18 @@ msgstr "Zrušit"
 #. module: idea
 #: view:idea.select:0
 msgid "Close"
-msgstr "Ukončit"
+msgstr "Zavřít"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:report.vote:0
 msgid "Open"
-msgstr ""
+msgstr "Otevřít"
 
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
-msgstr ""
+msgstr "Analýza hlasování nápadu"
 
 #. module: idea
 #: view:idea.idea:0
@@ -566,12 +582,12 @@ msgstr "Nápady"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "Poslat hlas"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Current"
-msgstr ""
+msgstr "Aktuální"
 
 #. module: idea
 #: field:idea.vote.stat,score:0
@@ -582,71 +598,71 @@ msgstr "Skóre"
 #. module: idea
 #: view:idea.vote:0
 msgid "Comments:"
-msgstr ""
+msgstr "Komentáře:"
 
 #. module: idea
 #: view:idea.category:0
 #: field:idea.idea,description:0
 #: field:idea.post.vote,note:0
 msgid "Description"
-msgstr "Popiska"
+msgstr "Popis"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: view:report.vote:0
 msgid "Refused"
-msgstr ""
+msgstr "Odmítnuto"
 
 #. module: idea
 #: code:addons/idea/idea.py:253
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
-msgstr ""
+msgstr "Koncept/Přijaté/Zrušené nápady nemohou být hlasovány"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Vote date"
-msgstr ""
+msgstr "Datum hlasu"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Dnes    "
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr ""
+msgstr "Počet hlasů"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "Počet komentářů"
 
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "Stav hlasu"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "Průměrné skóre"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
@@ -663,23 +679,23 @@ msgstr "Nápad"
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "Přijmout"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "Zaslat hlas"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Select Idea for Vote"
-msgstr ""
+msgstr "Vybrat nápad k hlasování"
 
 #~ msgid "Configuration"
 #~ msgstr "Konfigurace"
@@ -715,3 +731,6 @@ msgstr ""
 
 #~ msgid "Reporting"
 #~ msgstr "Hlášení"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/idea/i18n/da.po b/addons/idea/i18n/da.po
index 295305f77c5..e285d0d1135 100644
--- a/addons/idea/i18n/da.po
+++ b/addons/idea/i18n/da.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: 2010-11-20 07:54+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-08 21:34+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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -43,7 +43,7 @@ msgstr "Kommentarer"
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr "Indsend Stemme"
+msgstr "Indsend stemme"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
@@ -154,7 +154,7 @@ msgstr "Idéstemme"
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "Forældrekategorier"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -443,7 +443,7 @@ msgstr "Brugernavn"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Stemme statistik"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -451,7 +451,7 @@ msgstr ""
 #: field:idea.vote,user_id:0
 #: view:report.vote:0
 msgid "User"
-msgstr "Bruger"
+msgstr "User"
 
 #. module: idea
 #: field:idea.vote,date:0
@@ -461,7 +461,7 @@ msgstr "Dato"
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "Send"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -492,7 +492,7 @@ msgstr ""
 #. module: idea
 #: field:idea.category,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Kort beskrivelse"
 
 #. module: idea
 #: field:idea.idea,name:0
@@ -512,7 +512,7 @@ msgstr "Historik"
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "Stemme statistik"
 
 #. module: idea
 #: field:report.vote,date:0
@@ -551,7 +551,7 @@ msgstr "Luk"
 #: view:idea.idea:0
 #: view:report.vote:0
 msgid "Open"
-msgstr ""
+msgstr "Åben"
 
 #. module: idea
 #: view:report.vote:0
@@ -640,17 +640,17 @@ msgstr "April"
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "Antal kommentarer"
 
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "Stemme status"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "Gennemsnitlig score"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
@@ -662,23 +662,23 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "Idé"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "Godkend"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "Send stemme"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: idea
 #: view:idea.select:0
@@ -688,14 +688,5 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ugyldigt modelnavn i handlingsdefinitionen"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Modulets certifikat-ID skal være unikt"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Modulets navn skal være unikt"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for View Architecture!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Feltets størrelse kan aldrig være mindre end 1 !"
diff --git a/addons/idea/i18n/de.po b/addons/idea/i18n/de.po
index d88a54d09c7..8e385366fc0 100644
--- a/addons/idea/i18n/de.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -766,21 +766,5 @@ msgstr "Wähle Konzept zur Abstimmung"
 #~ "Andere Benutzer können diese kommentieren und bewerten. \r\n"
 #~ "So können gute Ideen leicht ermittelt werden"
 
-#, python-format
-#~ msgid "Idea must be in \\n'Open' state before vote for that idea."
-#~ msgstr "Vorschlag muss in \\nStatus 'Offen' sein, um Stimme abzugeben."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/idea/i18n/el.po b/addons/idea/i18n/el.po
index c36529f1454..66f6ca3b522 100644
--- a/addons/idea/i18n/el.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/es.po b/addons/idea/i18n/es.po
index ac10c7d62a3..c950cc75e4c 100644
--- a/addons/idea/i18n/es.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/es_AR.po b/addons/idea/i18n/es_AR.po
index be40d1f9f3c..e93fae9e9cb 100644
--- a/addons/idea/i18n/es_AR.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/es_MX.po b/addons/idea/i18n/es_MX.po
new file mode 100644
index 00000000000..4904bd00e37
--- /dev/null
+++ b/addons/idea/i18n/es_MX.po
@@ -0,0 +1,767 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* idea
+#
+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-27 08:08+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:22+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: idea
+#: help:idea.category,visibility:0
+msgid "If True creator of the idea will be visible to others"
+msgstr "Si está marcada, el creador de la idea será visible para los otros."
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_select
+msgid "Idea select"
+msgstr "Seleccionar idea"
+
+#. module: idea
+#: view:idea.idea:0
+#: view:idea.vote:0
+#: model:ir.ui.menu,name:idea.menu_idea_vote
+msgid "Votes"
+msgstr "Votos"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,comment_ids:0
+msgid "Comments"
+msgstr "Comentarios"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Submit Vote"
+msgstr "Enviar voto"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_report_vote_all
+#: model:ir.ui.menu,name:idea.menu_report_vote_all
+msgid "Ideas Analysis"
+msgstr "Análisis de ideas"
+
+#. module: idea
+#: view:idea.category:0
+#: view:idea.idea:0
+#: view:idea.vote:0
+#: view:report.vote:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: idea
+#: model:ir.module.module,description:idea.module_meta_information
+msgid ""
+"\n"
+"    This module allows your user to easily and efficiently participate in "
+"the innovation of the enterprise.\n"
+"    It allows everybody to express ideas about different subjects.\n"
+"    Then, other users can comment on these ideas and vote for particular "
+"ideas.\n"
+"    Each idea has a score based on the different votes.\n"
+"    The managers can obtain an easy view on best ideas from all the users.\n"
+"    Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+"\n"
+"    Este módulo permite a sus usuarios participar de forma fácil y eficaz en "
+"la innovación de la empresa.\n"
+"    Permite a todos expresar sus ideas sobre diferentes temas.\n"
+"    Luego, otros usuarios pueden comentar estas ideas y votar a favor de "
+"algunas de las ideas.\n"
+"    Cada idea tiene una puntuación basada en las diferentes votaciones.\n"
+"    Los administradores pueden obtener una visión fácil de las mejores ideas "
+"de todos los usuarios.\n"
+"    Una vez instalado, aparecerá el menú 'Ideas' dentro del menú principal "
+"'Herramientas'."
+
+#. module: idea
+#: model:ir.module.module,shortdesc:idea.module_meta_information
+msgid "Idea Manager"
+msgstr "Gestión de ideas"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: idea
+#: code:addons/idea/wizard/idea_post_vote.py:92
+#, python-format
+msgid "Idea must be in 'Open' state before vote for that idea."
+msgstr "La idea debe estar en estado 'Abierta' antes de votarla."
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Refuse"
+msgstr "Rechazar"
+
+#. module: idea
+#: field:idea.idea,count_votes:0
+msgid "Count of votes"
+msgstr "Cómputo de votos"
+
+#. module: idea
+#: model:ir.model,name:idea.model_report_vote
+msgid "Idea Vote Statistics"
+msgstr "Estadística de votos de ideas"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Bad"
+msgstr "Mala"
+
+#. module: idea
+#: selection:report.vote,idea_state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Category of ideas"
+msgstr "Categoría de ideas"
+
+#. module: idea
+#: code:addons/idea/idea.py:253
+#: code:addons/idea/wizard/idea_post_vote.py:89
+#: code:addons/idea/wizard/idea_post_vote.py:92
+#, python-format
+msgid "Warning !"
+msgstr "¡Advertencia!"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Your comment"
+msgstr "Su comentario"
+
+#. module: idea
+#: view:report.vote:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote
+msgid "Idea Vote"
+msgstr "Voto de idea"
+
+#. module: idea
+#: field:idea.category,parent_id:0
+msgid "Parent Categories"
+msgstr "Categoría padre"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Bad"
+msgstr "Muy mala"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Ideas vote"
+msgstr "Voto de ideas"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: idea
+#: code:addons/idea/wizard/idea_post_vote.py:89
+#, python-format
+msgid "You can not give Vote for this idea more than %s times"
+msgstr "No puede votar esta idea más de %s veces"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Ideas Categories"
+msgstr "Categorías de ideas"
+
+#. module: idea
+#: help:idea.idea,description:0
+msgid "Content of the idea"
+msgstr "Contenido de la idea"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_category
+msgid "Idea Category"
+msgstr "Categoría de idea"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,stat_vote_ids:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Not Voted"
+msgstr "No votada"
+
+#. module: idea
+#: sql_constraint:idea.category:0
+msgid "The name of the category must be unique"
+msgstr "El nombre de la categoría debe ser único"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_select
+msgid "select idea"
+msgstr "seleccionar idea"
+
+#. module: idea
+#: view:idea.stat:0
+msgid "stat"
+msgstr "Estadística"
+
+#. module: idea
+#: field:idea.category,child_ids:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,state:0
+#: view:report.vote:0
+#: field:report.vote,idea_state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Good"
+msgstr "Buena"
+
+#. module: idea
+#: help:idea.idea,open_date:0
+msgid "Date when an idea opened"
+msgstr "Fecha de apertura de la idea."
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Idea Detail"
+msgstr "Detalle de idea"
+
+#. module: idea
+#: help:idea.idea,state:0
+msgid ""
+"When the Idea is created the state is 'Draft'.\n"
+" It is             opened by the user, the state is 'Opened'.            \n"
+"If the idea is accepted, the state is 'Accepted'."
+msgstr ""
+"Cuando se crea la idea el estado es 'Borrador'.\n"
+"Si el usuario la abre, el estado es 'Abierta'.            \n"
+"Si la idea es aceptada, el estado es 'Aceptada'."
+
+#. module: idea
+#: field:idea.category,visibility:0
+#: field:idea.idea,visibility:0
+msgid "Open Idea?"
+msgstr "¿Idea abierta?"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: idea
+#: view:idea.idea:0
+#: selection:idea.idea,state:0
+#: view:report.vote:0
+#: selection:report.vote,idea_state:0
+msgid "Accepted"
+msgstr "Aceptada"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_category
+#: model:ir.ui.menu,name:idea.menu_idea_category
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: idea
+#: view:report.vote:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: idea
+#: field:idea.idea,open_date:0
+msgid "Open date"
+msgstr "Fecha de apertura"
+
+#. module: idea
+#: field:idea.idea,vote_ids:0
+#: model:ir.actions.act_window,name:idea.action_idea_post_vote
+msgid "Vote"
+msgstr "Voto"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote_stat
+#: model:ir.ui.menu,name:idea.menu_idea_vote_stat
+msgid "Vote Statistics"
+msgstr "Estadísticas de votos"
+
+#. module: idea
+#: field:idea.idea,vote_limit:0
+msgid "Maximum Vote per User"
+msgstr "Votos máximos por usuario"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Parent Category"
+msgstr "Categoría padre"
+
+#. module: idea
+#: field:idea.comment,content:0
+#: view:idea.idea:0
+#: view:idea.post.vote:0
+#: field:idea.vote,comment:0
+#: model:ir.model,name:idea.model_idea_comment
+msgid "Comment"
+msgstr "Comentario"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
+#: model:ir.actions.act_window,name:idea.action_idea_idea_open
+msgid "Open Ideas"
+msgstr "Ideas abiertas"
+
+#. module: idea
+#: view:idea.category:0
+#: field:idea.category,name:0
+#: view:idea.idea:0
+#: field:idea.idea,category_id:0
+#: view:report.vote:0
+#: field:report.vote,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Good"
+msgstr "Muy buena"
+
+#. module: idea
+#: view:report.vote:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: selection:report.vote,idea_state:0
+msgid "Opened"
+msgstr "Abierta"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote
+msgid "Idea's Votes"
+msgstr "Votos de la idea"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "New Idea"
+msgstr "Nueva idea"
+
+#. module: idea
+#: view:idea.vote.stat:0
+msgid "vote_stat of ideas"
+msgstr "Estad. votos de ideas"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_category_tree
+#: model:ir.ui.menu,name:idea.menu_idea_category_tree
+msgid "Ideas by Categories"
+msgstr "Ideas por categorías"
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: selection:report.vote,idea_state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: idea
+#: field:report.vote,creater_id:0
+#: field:report.vote,user_id:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote_stat
+msgid "Idea Votes Statistics"
+msgstr "Estadísticas votos de la idea"
+
+#. module: idea
+#: field:idea.comment,user_id:0
+#: view:idea.vote:0
+#: field:idea.vote,user_id:0
+#: view:report.vote:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: idea
+#: field:idea.vote,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: idea
+#: view:idea.post.vote:0
+msgid "Post"
+msgstr "Enviar"
+
+#. module: idea
+#: field:idea.idea,my_vote:0
+msgid "My Vote"
+msgstr "Mi voto"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: idea
+#: field:idea.comment,create_date:0
+#: field:idea.idea,created_date:0
+msgid "Creation date"
+msgstr "Fecha de creación"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_idea
+msgid "idea.idea"
+msgstr "Idea"
+
+#. module: idea
+#: field:idea.category,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: idea
+#: field:idea.idea,name:0
+msgid "Idea Summary"
+msgstr "Resumen de la idea"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Vots Statistics"
+msgstr "Estadísticas de votos"
+
+#. module: idea
+#: field:report.vote,date:0
+msgid "Date Order"
+msgstr "Fecha orden"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,user_id:0
+#: view:report.vote:0
+msgid "Creator"
+msgstr "Autor"
+
+#. module: idea
+#: view:idea.post.vote:0
+#: model:ir.ui.menu,name:idea.menu_give_vote
+msgid "Give Vote"
+msgstr "Dar voto"
+
+#. module: idea
+#: help:idea.idea,vote_limit:0
+msgid "Set to one if  you require only one Vote per user"
+msgstr "Establecer a uno si sólo requiere un voto por usuario"
+
+#. module: idea
+#: view:idea.post.vote:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: idea
+#: view:idea.idea:0
+#: view:report.vote:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Idea Vote Analysis"
+msgstr "Análisis de votos"
+
+#. module: idea
+#: view:idea.idea:0
+#: model:ir.actions.act_window,name:idea.action_idea_idea
+#: model:ir.ui.menu,name:idea.menu_idea_idea
+#: model:ir.ui.menu,name:idea.menu_ideas
+#: model:ir.ui.menu,name:idea.menu_ideas1
+msgid "Ideas"
+msgstr "Ideas"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_post_vote
+msgid "Post vote"
+msgstr "Enviar voto"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: idea
+#: field:idea.vote.stat,score:0
+#: field:report.vote,score:0
+msgid "Score"
+msgstr "Puntuación"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Comments:"
+msgstr "Comentarios:"
+
+#. module: idea
+#: view:idea.category:0
+#: field:idea.idea,description:0
+#: field:idea.post.vote,note:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: view:report.vote:0
+msgid "Refused"
+msgstr "Rechazada"
+
+#. module: idea
+#: code:addons/idea/idea.py:253
+#, python-format
+msgid "Draft/Accepted/Cancelled ideas Could not be voted"
+msgstr "No puede votar ideas borrador/aceptada/cancelada"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Vote date"
+msgstr "Fecha voto"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: idea
+#: view:report.vote:0
+msgid "    Today    "
+msgstr "    Hoy    "
+
+#. module: idea
+#: field:idea.vote.stat,nbr:0
+msgid "Number of Votes"
+msgstr "Número de votos"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: idea
+#: field:idea.idea,count_comments:0
+msgid "Count of comments"
+msgstr "Cómputo de comentarios"
+
+#. module: idea
+#: field:idea.vote,score:0
+msgid "Vote Status"
+msgstr "Estado voto"
+
+#. module: idea
+#: field:idea.idea,vote_avg:0
+msgid "Average Score"
+msgstr "Puntación promedio"
+
+#. module: idea
+#: field:idea.comment,idea_id:0
+#: field:idea.select,idea_id:0
+#: view:idea.vote:0
+#: field:idea.vote,idea_id:0
+#: field:idea.vote.stat,idea_id:0
+#: model:ir.ui.menu,name:idea.menu_idea_reporting
+#: view:report.vote:0
+#: field:report.vote,idea_id:0
+msgid "Idea"
+msgstr "Idea"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: idea
+#: field:idea.post.vote,vote:0
+msgid "Post Vote"
+msgstr "Enviar voto"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Select Idea for Vote"
+msgstr "Seleccionar idea a votar"
+
+#~ msgid "My Ideas"
+#~ msgstr "Mis ideas"
+
+#~ msgid "My Open Ideas"
+#~ msgstr "Mis ideas abiertas"
+
+#~ msgid "Idea's vote"
+#~ msgstr "Votos de la idea"
+
+#~ msgid "Statistics on Votes"
+#~ msgstr "Estadísticas sobre votos"
+
+#~ 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 "Category for an idea"
+#~ msgstr "Categoría para una idea"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "idea.vote"
+#~ msgstr "Voto de idea"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "My Draft Ideas"
+#~ msgstr "Mis ideas en borrador"
+
+#~ msgid "All Ideas"
+#~ msgstr "Todas las ideas"
+
+#~ msgid "Tools"
+#~ msgstr "Herramientas"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelada"
+
+#~ msgid "All Votes"
+#~ msgstr "Todos los votos"
+
+#~ msgid ""
+#~ "This module allows your user to easily and efficiently participate in the "
+#~ "innovation of the enterprise. It allows everybody to express ideas about "
+#~ "different subjects. Then, others users can comment these ideas and vote for "
+#~ "particular ideas. Each idea as a score based on the different votes. The "
+#~ "managers can obtain an easy view on best ideas from all the users. Once "
+#~ "installed, check the menu 'Ideas' in the 'Tools' main menu."
+#~ msgstr ""
+#~ "Este módulo permite a sus usuarios participar de forma fácil y eficaz en la "
+#~ "innovación de la empresa. Permite a todos expresar sus ideas sobre "
+#~ "diferentes temas. Luego, otros usuarios pueden comentar estas ideas y votar "
+#~ "a favor de algunas de las ideas. Cada idea tiene una puntuación basada en "
+#~ "las diferentes votaciones. Los administradores pueden obtener una visión "
+#~ "fácil de las mejores ideas de todos los usuarios. Una vez instalado, "
+#~ "aparecerá el menú 'Ideas' dentro del menú principal 'Herramientas'."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/idea/i18n/es_VE.po b/addons/idea/i18n/es_VE.po
new file mode 100644
index 00000000000..4904bd00e37
--- /dev/null
+++ b/addons/idea/i18n/es_VE.po
@@ -0,0 +1,767 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* idea
+#
+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-27 08:08+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:22+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: idea
+#: help:idea.category,visibility:0
+msgid "If True creator of the idea will be visible to others"
+msgstr "Si está marcada, el creador de la idea será visible para los otros."
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_select
+msgid "Idea select"
+msgstr "Seleccionar idea"
+
+#. module: idea
+#: view:idea.idea:0
+#: view:idea.vote:0
+#: model:ir.ui.menu,name:idea.menu_idea_vote
+msgid "Votes"
+msgstr "Votos"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,comment_ids:0
+msgid "Comments"
+msgstr "Comentarios"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Submit Vote"
+msgstr "Enviar voto"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_report_vote_all
+#: model:ir.ui.menu,name:idea.menu_report_vote_all
+msgid "Ideas Analysis"
+msgstr "Análisis de ideas"
+
+#. module: idea
+#: view:idea.category:0
+#: view:idea.idea:0
+#: view:idea.vote:0
+#: view:report.vote:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: idea
+#: model:ir.module.module,description:idea.module_meta_information
+msgid ""
+"\n"
+"    This module allows your user to easily and efficiently participate in "
+"the innovation of the enterprise.\n"
+"    It allows everybody to express ideas about different subjects.\n"
+"    Then, other users can comment on these ideas and vote for particular "
+"ideas.\n"
+"    Each idea has a score based on the different votes.\n"
+"    The managers can obtain an easy view on best ideas from all the users.\n"
+"    Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+"\n"
+"    Este módulo permite a sus usuarios participar de forma fácil y eficaz en "
+"la innovación de la empresa.\n"
+"    Permite a todos expresar sus ideas sobre diferentes temas.\n"
+"    Luego, otros usuarios pueden comentar estas ideas y votar a favor de "
+"algunas de las ideas.\n"
+"    Cada idea tiene una puntuación basada en las diferentes votaciones.\n"
+"    Los administradores pueden obtener una visión fácil de las mejores ideas "
+"de todos los usuarios.\n"
+"    Una vez instalado, aparecerá el menú 'Ideas' dentro del menú principal "
+"'Herramientas'."
+
+#. module: idea
+#: model:ir.module.module,shortdesc:idea.module_meta_information
+msgid "Idea Manager"
+msgstr "Gestión de ideas"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: idea
+#: code:addons/idea/wizard/idea_post_vote.py:92
+#, python-format
+msgid "Idea must be in 'Open' state before vote for that idea."
+msgstr "La idea debe estar en estado 'Abierta' antes de votarla."
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Refuse"
+msgstr "Rechazar"
+
+#. module: idea
+#: field:idea.idea,count_votes:0
+msgid "Count of votes"
+msgstr "Cómputo de votos"
+
+#. module: idea
+#: model:ir.model,name:idea.model_report_vote
+msgid "Idea Vote Statistics"
+msgstr "Estadística de votos de ideas"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Bad"
+msgstr "Mala"
+
+#. module: idea
+#: selection:report.vote,idea_state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Category of ideas"
+msgstr "Categoría de ideas"
+
+#. module: idea
+#: code:addons/idea/idea.py:253
+#: code:addons/idea/wizard/idea_post_vote.py:89
+#: code:addons/idea/wizard/idea_post_vote.py:92
+#, python-format
+msgid "Warning !"
+msgstr "¡Advertencia!"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Your comment"
+msgstr "Su comentario"
+
+#. module: idea
+#: view:report.vote:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote
+msgid "Idea Vote"
+msgstr "Voto de idea"
+
+#. module: idea
+#: field:idea.category,parent_id:0
+msgid "Parent Categories"
+msgstr "Categoría padre"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Bad"
+msgstr "Muy mala"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Ideas vote"
+msgstr "Voto de ideas"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: idea
+#: code:addons/idea/wizard/idea_post_vote.py:89
+#, python-format
+msgid "You can not give Vote for this idea more than %s times"
+msgstr "No puede votar esta idea más de %s veces"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Ideas Categories"
+msgstr "Categorías de ideas"
+
+#. module: idea
+#: help:idea.idea,description:0
+msgid "Content of the idea"
+msgstr "Contenido de la idea"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_category
+msgid "Idea Category"
+msgstr "Categoría de idea"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,stat_vote_ids:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Not Voted"
+msgstr "No votada"
+
+#. module: idea
+#: sql_constraint:idea.category:0
+msgid "The name of the category must be unique"
+msgstr "El nombre de la categoría debe ser único"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_select
+msgid "select idea"
+msgstr "seleccionar idea"
+
+#. module: idea
+#: view:idea.stat:0
+msgid "stat"
+msgstr "Estadística"
+
+#. module: idea
+#: field:idea.category,child_ids:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,state:0
+#: view:report.vote:0
+#: field:report.vote,idea_state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Good"
+msgstr "Buena"
+
+#. module: idea
+#: help:idea.idea,open_date:0
+msgid "Date when an idea opened"
+msgstr "Fecha de apertura de la idea."
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Idea Detail"
+msgstr "Detalle de idea"
+
+#. module: idea
+#: help:idea.idea,state:0
+msgid ""
+"When the Idea is created the state is 'Draft'.\n"
+" It is             opened by the user, the state is 'Opened'.            \n"
+"If the idea is accepted, the state is 'Accepted'."
+msgstr ""
+"Cuando se crea la idea el estado es 'Borrador'.\n"
+"Si el usuario la abre, el estado es 'Abierta'.            \n"
+"Si la idea es aceptada, el estado es 'Aceptada'."
+
+#. module: idea
+#: field:idea.category,visibility:0
+#: field:idea.idea,visibility:0
+msgid "Open Idea?"
+msgstr "¿Idea abierta?"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: idea
+#: view:idea.idea:0
+#: selection:idea.idea,state:0
+#: view:report.vote:0
+#: selection:report.vote,idea_state:0
+msgid "Accepted"
+msgstr "Aceptada"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_category
+#: model:ir.ui.menu,name:idea.menu_idea_category
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: idea
+#: view:report.vote:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: idea
+#: field:idea.idea,open_date:0
+msgid "Open date"
+msgstr "Fecha de apertura"
+
+#. module: idea
+#: field:idea.idea,vote_ids:0
+#: model:ir.actions.act_window,name:idea.action_idea_post_vote
+msgid "Vote"
+msgstr "Voto"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote_stat
+#: model:ir.ui.menu,name:idea.menu_idea_vote_stat
+msgid "Vote Statistics"
+msgstr "Estadísticas de votos"
+
+#. module: idea
+#: field:idea.idea,vote_limit:0
+msgid "Maximum Vote per User"
+msgstr "Votos máximos por usuario"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Parent Category"
+msgstr "Categoría padre"
+
+#. module: idea
+#: field:idea.comment,content:0
+#: view:idea.idea:0
+#: view:idea.post.vote:0
+#: field:idea.vote,comment:0
+#: model:ir.model,name:idea.model_idea_comment
+msgid "Comment"
+msgstr "Comentario"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
+#: model:ir.actions.act_window,name:idea.action_idea_idea_open
+msgid "Open Ideas"
+msgstr "Ideas abiertas"
+
+#. module: idea
+#: view:idea.category:0
+#: field:idea.category,name:0
+#: view:idea.idea:0
+#: field:idea.idea,category_id:0
+#: view:report.vote:0
+#: field:report.vote,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Good"
+msgstr "Muy buena"
+
+#. module: idea
+#: view:report.vote:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: selection:report.vote,idea_state:0
+msgid "Opened"
+msgstr "Abierta"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote
+msgid "Idea's Votes"
+msgstr "Votos de la idea"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "New Idea"
+msgstr "Nueva idea"
+
+#. module: idea
+#: view:idea.vote.stat:0
+msgid "vote_stat of ideas"
+msgstr "Estad. votos de ideas"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_category_tree
+#: model:ir.ui.menu,name:idea.menu_idea_category_tree
+msgid "Ideas by Categories"
+msgstr "Ideas por categorías"
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: selection:report.vote,idea_state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: idea
+#: field:report.vote,creater_id:0
+#: field:report.vote,user_id:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote_stat
+msgid "Idea Votes Statistics"
+msgstr "Estadísticas votos de la idea"
+
+#. module: idea
+#: field:idea.comment,user_id:0
+#: view:idea.vote:0
+#: field:idea.vote,user_id:0
+#: view:report.vote:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: idea
+#: field:idea.vote,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: idea
+#: view:idea.post.vote:0
+msgid "Post"
+msgstr "Enviar"
+
+#. module: idea
+#: field:idea.idea,my_vote:0
+msgid "My Vote"
+msgstr "Mi voto"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: idea
+#: field:idea.comment,create_date:0
+#: field:idea.idea,created_date:0
+msgid "Creation date"
+msgstr "Fecha de creación"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_idea
+msgid "idea.idea"
+msgstr "Idea"
+
+#. module: idea
+#: field:idea.category,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: idea
+#: field:idea.idea,name:0
+msgid "Idea Summary"
+msgstr "Resumen de la idea"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Vots Statistics"
+msgstr "Estadísticas de votos"
+
+#. module: idea
+#: field:report.vote,date:0
+msgid "Date Order"
+msgstr "Fecha orden"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,user_id:0
+#: view:report.vote:0
+msgid "Creator"
+msgstr "Autor"
+
+#. module: idea
+#: view:idea.post.vote:0
+#: model:ir.ui.menu,name:idea.menu_give_vote
+msgid "Give Vote"
+msgstr "Dar voto"
+
+#. module: idea
+#: help:idea.idea,vote_limit:0
+msgid "Set to one if  you require only one Vote per user"
+msgstr "Establecer a uno si sólo requiere un voto por usuario"
+
+#. module: idea
+#: view:idea.post.vote:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: idea
+#: view:idea.idea:0
+#: view:report.vote:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Idea Vote Analysis"
+msgstr "Análisis de votos"
+
+#. module: idea
+#: view:idea.idea:0
+#: model:ir.actions.act_window,name:idea.action_idea_idea
+#: model:ir.ui.menu,name:idea.menu_idea_idea
+#: model:ir.ui.menu,name:idea.menu_ideas
+#: model:ir.ui.menu,name:idea.menu_ideas1
+msgid "Ideas"
+msgstr "Ideas"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_post_vote
+msgid "Post vote"
+msgstr "Enviar voto"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: idea
+#: field:idea.vote.stat,score:0
+#: field:report.vote,score:0
+msgid "Score"
+msgstr "Puntuación"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Comments:"
+msgstr "Comentarios:"
+
+#. module: idea
+#: view:idea.category:0
+#: field:idea.idea,description:0
+#: field:idea.post.vote,note:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: view:report.vote:0
+msgid "Refused"
+msgstr "Rechazada"
+
+#. module: idea
+#: code:addons/idea/idea.py:253
+#, python-format
+msgid "Draft/Accepted/Cancelled ideas Could not be voted"
+msgstr "No puede votar ideas borrador/aceptada/cancelada"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Vote date"
+msgstr "Fecha voto"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: idea
+#: view:report.vote:0
+msgid "    Today    "
+msgstr "    Hoy    "
+
+#. module: idea
+#: field:idea.vote.stat,nbr:0
+msgid "Number of Votes"
+msgstr "Número de votos"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: idea
+#: field:idea.idea,count_comments:0
+msgid "Count of comments"
+msgstr "Cómputo de comentarios"
+
+#. module: idea
+#: field:idea.vote,score:0
+msgid "Vote Status"
+msgstr "Estado voto"
+
+#. module: idea
+#: field:idea.idea,vote_avg:0
+msgid "Average Score"
+msgstr "Puntación promedio"
+
+#. module: idea
+#: field:idea.comment,idea_id:0
+#: field:idea.select,idea_id:0
+#: view:idea.vote:0
+#: field:idea.vote,idea_id:0
+#: field:idea.vote.stat,idea_id:0
+#: model:ir.ui.menu,name:idea.menu_idea_reporting
+#: view:report.vote:0
+#: field:report.vote,idea_id:0
+msgid "Idea"
+msgstr "Idea"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Accept"
+msgstr "Aceptar"
+
+#. module: idea
+#: field:idea.post.vote,vote:0
+msgid "Post Vote"
+msgstr "Enviar voto"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Select Idea for Vote"
+msgstr "Seleccionar idea a votar"
+
+#~ msgid "My Ideas"
+#~ msgstr "Mis ideas"
+
+#~ msgid "My Open Ideas"
+#~ msgstr "Mis ideas abiertas"
+
+#~ msgid "Idea's vote"
+#~ msgstr "Votos de la idea"
+
+#~ msgid "Statistics on Votes"
+#~ msgstr "Estadísticas sobre votos"
+
+#~ 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 "Category for an idea"
+#~ msgstr "Categoría para una idea"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "idea.vote"
+#~ msgstr "Voto de idea"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "My Draft Ideas"
+#~ msgstr "Mis ideas en borrador"
+
+#~ msgid "All Ideas"
+#~ msgstr "Todas las ideas"
+
+#~ msgid "Tools"
+#~ msgstr "Herramientas"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelada"
+
+#~ msgid "All Votes"
+#~ msgstr "Todos los votos"
+
+#~ msgid ""
+#~ "This module allows your user to easily and efficiently participate in the "
+#~ "innovation of the enterprise. It allows everybody to express ideas about "
+#~ "different subjects. Then, others users can comment these ideas and vote for "
+#~ "particular ideas. Each idea as a score based on the different votes. The "
+#~ "managers can obtain an easy view on best ideas from all the users. Once "
+#~ "installed, check the menu 'Ideas' in the 'Tools' main menu."
+#~ msgstr ""
+#~ "Este módulo permite a sus usuarios participar de forma fácil y eficaz en la "
+#~ "innovación de la empresa. Permite a todos expresar sus ideas sobre "
+#~ "diferentes temas. Luego, otros usuarios pueden comentar estas ideas y votar "
+#~ "a favor de algunas de las ideas. Cada idea tiene una puntuación basada en "
+#~ "las diferentes votaciones. Los administradores pueden obtener una visión "
+#~ "fácil de las mejores ideas de todos los usuarios. Una vez instalado, "
+#~ "aparecerá el menú 'Ideas' dentro del menú principal 'Herramientas'."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/idea/i18n/et.po b/addons/idea/i18n/et.po
index d2b5bfdb6b7..bbe29fd0fbd 100644
--- a/addons/idea/i18n/et.po
+++ b/addons/idea/i18n/et.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 06:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-11 17:58+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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -80,7 +80,7 @@ msgstr "Idee haldur"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "March"
-msgstr ""
+msgstr "Märts"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:92
@@ -92,12 +92,12 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päev"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Refuse"
-msgstr ""
+msgstr "Keeldu"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
@@ -120,7 +120,7 @@ msgstr "Halb"
 #. module: idea
 #: selection:report.vote,idea_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Tühistatud"
 
 #. module: idea
 #: view:idea.category:0
@@ -133,7 +133,7 @@ msgstr "Ideede kategooriad"
 #: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Hoiatus!"
 
 #. module: idea
 #: view:idea.idea:0
@@ -172,7 +172,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Ridade arv"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:89
@@ -193,7 +193,7 @@ msgstr "Idee sisu"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Idee kategooria"
 
 #. module: idea
 #: view:idea.idea:0
@@ -232,7 +232,7 @@ msgstr "Alamkategooriad"
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "Järgmine"
 
 #. module: idea
 #: view:idea.idea:0
@@ -240,7 +240,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "Maakond/provints"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -277,7 +277,7 @@ msgstr ""
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "Juuli"
 
 #. module: idea
 #: view:idea.idea:0
@@ -337,18 +337,18 @@ msgstr "Kommentaar"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "Detsember"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuu"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
@@ -415,7 +415,7 @@ msgstr "Mustand"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -428,13 +428,13 @@ msgstr "Tavaline"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "Juuni"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Kasutajanimi"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
@@ -452,7 +452,7 @@ msgstr "Kasutaja"
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "Kuupäev"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -467,7 +467,7 @@ msgstr "Minu hääl"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktoober"
 
 #. module: idea
 #: field:idea.comment,create_date:0
@@ -478,7 +478,7 @@ msgstr "Loomiskuupäev"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "Jaanuar"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
@@ -498,12 +498,12 @@ msgstr "Idee kokkuvõte"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "History"
-msgstr ""
+msgstr "Ajalugu"
 
 #. module: idea
 #: view:idea.idea:0
@@ -594,7 +594,7 @@ msgstr "Kirjeldus"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -616,7 +616,7 @@ msgstr ""
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "Veebruar"
 
 #. module: idea
 #: view:report.vote:0
@@ -631,7 +631,7 @@ msgstr "Häälte arv"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprill"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
@@ -674,7 +674,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "Aasta"
 
 #. module: idea
 #: view:idea.select:0
diff --git a/addons/idea/i18n/fi.po b/addons/idea/i18n/fi.po
index 628eb05c99a..be5e8653881 100644
--- a/addons/idea/i18n/fi.po
+++ b/addons/idea/i18n/fi.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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
-msgstr ""
+msgstr "Jos idean todellinen keksijä näkyy muille"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Idean valinta"
 
 #. module: idea
 #: view:idea.idea:0
@@ -38,18 +38,18 @@ msgstr "Äänestykset"
 #: view:idea.idea:0
 #: field:idea.idea,comment_ids:0
 msgid "Comments"
-msgstr ""
+msgstr "Kommentit"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr ""
+msgstr "Äänestä"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
 #: model:ir.ui.menu,name:idea.menu_report_vote_all
 msgid "Ideas Analysis"
-msgstr ""
+msgstr "Ideoiden analyysit"
 
 #. module: idea
 #: view:idea.category:0
@@ -87,18 +87,18 @@ msgstr "Maaliskuu"
 #: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Idea must be in 'Open' state before vote for that idea."
-msgstr ""
+msgstr "Idean tulee olla 'avoin' tilassa ennenkuin siitä voidaan äänestää."
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Refuse"
-msgstr ""
+msgstr "Hylkää"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
@@ -108,7 +108,7 @@ msgstr "Äänien lukumäärä"
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "Idean äänestystulokset"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -116,7 +116,7 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr ""
+msgstr "Huono"
 
 #. module: idea
 #: selection:report.vote,idea_state:0
@@ -144,12 +144,12 @@ msgstr "Oma kommenttisi"
 #. module: idea
 #: view:report.vote:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Kuukausi   "
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "Idea Vote"
-msgstr ""
+msgstr "Idean äänestys"
 
 #. module: idea
 #: field:idea.category,parent_id:0
@@ -162,12 +162,12 @@ msgstr "Yläkategoriat"
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Todella huono"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr ""
+msgstr "Ideoiden äänestys"
 
 #. module: idea
 #: view:report.vote:0
@@ -179,12 +179,12 @@ msgstr "Rivien lukumäärä"
 #: code:addons/idea/wizard/idea_post_vote.py:89
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
-msgstr ""
+msgstr "Et voi aintaa ääntä tälle idealle useammin kuin %s kertaa"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr ""
+msgstr "Ideakategoriat"
 
 #. module: idea
 #: help:idea.idea,description:0
@@ -194,7 +194,7 @@ msgstr "Idean sisältö"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Ideakategoria"
 
 #. module: idea
 #: view:idea.idea:0
@@ -218,7 +218,7 @@ msgstr "Kategorian nimen tulee olla yksilöllinen"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "Valitse idea"
 
 #. module: idea
 #: view:idea.stat:0
@@ -233,7 +233,7 @@ msgstr "Alakategoriat"
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "Seuraava"
 
 #. module: idea
 #: view:idea.idea:0
@@ -241,7 +241,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -249,17 +249,17 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Good"
-msgstr ""
+msgstr "Hyvä"
 
 #. module: idea
 #: help:idea.idea,open_date:0
 msgid "Date when an idea opened"
-msgstr ""
+msgstr "Päivä jolloin idea avattiin"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "Idean yksityiskohdat"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -268,17 +268,20 @@ msgid ""
 " It is             opened by the user, the state is 'Opened'.            \n"
 "If the idea is accepted, the state is 'Accepted'."
 msgstr ""
+"Kun idea ludaan, sen tila on 'luonnos'.\n"
+" Kun käyttäjä avaa sen, tilaksi tulee 'avoin'.            \n"
+"Jos idea hyväksytää, tila on 'hyväksytty'."
 
 #. module: idea
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "Avaa idea?"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: idea
 #: view:idea.idea:0
@@ -286,29 +289,29 @@ msgstr ""
 #: view:report.vote:0
 #: selection:report.vote,idea_state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Hyväksytty"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
 #: model:ir.ui.menu,name:idea.menu_idea_category
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriat"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Kuukausi-1    "
 
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Avauspäivä"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 #: model:ir.actions.act_window,name:idea.action_idea_post_vote
 msgid "Vote"
-msgstr ""
+msgstr "Äänestä"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@@ -319,12 +322,12 @@ msgstr "Äänestystilastot"
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Maksimi äänten määrä käyttäjää kohti"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Yläkategoria"
 
 #. module: idea
 #: field:idea.comment,content:0
@@ -333,23 +336,23 @@ msgstr ""
 #: field:idea.vote,comment:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comment"
-msgstr ""
+msgstr "Kommentti"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
@@ -373,12 +376,12 @@ msgstr "Kategoria"
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "Todella hyvä"
 
 #. module: idea
 #: view:report.vote:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Vuosi  "
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -389,7 +392,7 @@ msgstr "Avattu"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's Votes"
-msgstr ""
+msgstr "Idean äänet"
 
 #. module: idea
 #: view:idea.idea:0
@@ -416,7 +419,7 @@ msgstr "Luonnos"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -424,18 +427,18 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Normal"
-msgstr ""
+msgstr "Tavallinen"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Käyttäjänimi"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
@@ -448,17 +451,17 @@ msgstr "Idean äänestystilastot"
 #: field:idea.vote,user_id:0
 #: view:report.vote:0
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "Päiväys"
 
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "Viesti"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -468,18 +471,18 @@ msgstr "Oma äänestys"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,created_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
@@ -489,7 +492,7 @@ msgstr "idea.idea"
 #. module: idea
 #: field:idea.category,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Yhteenveto"
 
 #. module: idea
 #: field:idea.idea,name:0
@@ -499,61 +502,61 @@ msgstr "Ideayhteenveto"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "Äänestystilastot"
 
 #. module: idea
 #: field:report.vote,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Päivämääräjärjestys"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,user_id:0
 #: view:report.vote:0
 msgid "Creator"
-msgstr ""
+msgstr "Tekijä"
 
 #. module: idea
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Äänestä"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
 msgid "Set to one if  you require only one Vote per user"
-msgstr ""
+msgstr "Aseta arvoon 1 jos haluat vain yhden äänen käyttäjää kohti"
 
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:report.vote:0
 msgid "Open"
-msgstr ""
+msgstr "Avaa"
 
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
-msgstr ""
+msgstr "Idean äänestyksen analyysi"
 
 #. module: idea
 #: view:idea.idea:0
@@ -562,17 +565,17 @@ msgstr ""
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr ""
+msgstr "Ideat"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "Äänestä"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: idea
 #: field:idea.vote.stat,score:0
@@ -583,46 +586,46 @@ msgstr "Tulos"
 #. module: idea
 #: view:idea.vote:0
 msgid "Comments:"
-msgstr ""
+msgstr "Kommentit:"
 
 #. module: idea
 #: view:idea.category:0
 #: field:idea.idea,description:0
 #: field:idea.post.vote,note:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: view:report.vote:0
 msgid "Refused"
-msgstr ""
+msgstr "Torjuttu"
 
 #. module: idea
 #: code:addons/idea/idea.py:253
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
-msgstr ""
+msgstr "Luonnos/Hyväksytty/peruutettu tilassa olevia ideoita ei voi äänestää"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Vote date"
-msgstr ""
+msgstr "Äänestyspäivä"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Tänään    "
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -632,7 +635,7 @@ msgstr "Äänestysten lukumäärä"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
@@ -642,12 +645,12 @@ msgstr "Kommenttien lukumäärä"
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "Äänestyksen tila"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "Keskimääräinen tulos"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
@@ -664,23 +667,23 @@ msgstr "Idea"
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "Äänestä"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Select Idea for Vote"
-msgstr ""
+msgstr "Valitse äänestettävä idea"
 
 #~ msgid "My Ideas"
 #~ msgstr "Omat ideat"
diff --git a/addons/idea/i18n/fr.po b/addons/idea/i18n/fr.po
index 1d5ffa29ce5..b8fd3f95c61 100644
--- a/addons/idea/i18n/fr.po
+++ b/addons/idea/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-11 00:33+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/gl.po b/addons/idea/i18n/gl.po
index 072a4f3e5e8..c8327454ded 100644
--- a/addons/idea/i18n/gl.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/hi.po b/addons/idea/i18n/hi.po
index 67e602047a6..5371e63da43 100644
--- a/addons/idea/i18n/hi.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 194da133f68..ab9030eb520 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: idea
@@ -750,734 +750,3 @@ msgstr ""
 
 #~ msgid "Tools"
 #~ msgstr "Alati"
-
-#~ msgid "Surveys"
-#~ msgstr "Upitnici"
-
-#~ msgid "Survey Analysis Report"
-#~ msgstr "Izvještaj po analizi Upitnika"
-
-#~ msgid "Survey Questions"
-#~ msgstr "Pitanja Upitnika"
-
-#~ msgid "Set to draft"
-#~ msgstr "Vrati na Nacrt"
-
-#~ msgid "Date started"
-#~ msgstr "Datum započinjanja"
-
-#~ msgid "History Lines"
-#~ msgstr "Povijesni niz"
-
-#~ msgid "Body"
-#~ msgstr "Tijelo"
-
-#~ msgid "Give Survey Response"
-#~ msgstr "Give Survey Response"
-
-#~ msgid "All Questions"
-#~ msgstr "Sva Pitanja"
-
-#~ msgid "Survey Open Date"
-#~ msgstr "Datum otvaranja Upitnika"
-
-#~ msgid "survey.name.wiz"
-#~ msgstr "survey.name.wiz"
-
-#~ msgid "Users Details"
-#~ msgstr "Detalji o Korisnicima"
-
-#~ msgid "Survey Question"
-#~ msgstr "Pitanja Upitnika"
-
-#~ msgid "Set to one if  you require only one response per user"
-#~ msgstr "Postavite na jedan, ako tražite samo jedan odgovor korisnika"
-
-#~ msgid "Page Title"
-#~ msgstr "Naslov stranice"
-
-#~ msgid "Survey History"
-#~ msgstr "Povijest Upitnika"
-
-#~ msgid "Notes"
-#~ msgstr "Bilješke"
-
-#~ msgid "Total Response"
-#~ msgstr "Ukupni odaziv"
-
-#~ msgid "Your Messages"
-#~ msgstr "Vaše poruke"
-
-#~ msgid "Allow Comment Field"
-#~ msgstr "Dopustite polje upisa Komentara"
-
-#~ msgid "Send reminder for existing user"
-#~ msgstr "Pošalji podsjetnik postojećem korisniku"
-
-#~ msgid "New Survey Question"
-#~ msgstr "Novo pitanje Upitnika"
-
-#~ msgid "Skip"
-#~ msgstr "Preskoči"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Subject"
-#~ msgstr "Predmet"
-
-#~ msgid "Maximum Response Limit"
-#~ msgstr "Granica maksimalnog odziva"
-
-#~ msgid "From"
-#~ msgstr "Od"
-
-#~ msgid "Response Type"
-#~ msgstr "Tip odziva"
-
-#~ msgid "Page Transfer"
-#~ msgstr "Prijenos stranice"
-
-#~ msgid "Question"
-#~ msgstr "Pitanje"
-
-#~ msgid "Send"
-#~ msgstr "Pošalji"
-
-#~ msgid "#Response"
-#~ msgstr "#Response"
-
-#~ msgid "Response Answer"
-#~ msgstr "Odgovor na odaziv"
-
-#~ msgid "Response Summary"
-#~ msgstr "Sažetak Odziva"
-
-#~ msgid "Send mail for new user"
-#~ msgstr "Pošalji mail novom korisniku"
-
-#~ msgid "Error !"
-#~ msgstr "Greška !"
-
-#~ msgid "Skipped Question"
-#~ msgstr "Preskočeno pitanje"
-
-#~ msgid "_Ok"
-#~ msgstr "_Ok"
-
-#~ msgid "Link"
-#~ msgstr "Veza"
-
-#~ msgid "survey.question.wiz"
-#~ msgstr "survey.question.wiz"
-
-#~ msgid "Survey Response Answer"
-#~ msgstr "Odgovor Upitnika"
-
-#~ msgid "Page :-"
-#~ msgstr "Stranica :-"
-
-#~ msgid "Maximum Response per User"
-#~ msgstr "Maksimalni odaziv po korisniku"
-
-#~ msgid "Total Started Survey :-"
-#~ msgstr "Ukupno pokrenuto Upitnika :-"
-
-#~ msgid "Modify Date"
-#~ msgstr "Izmijeni datum"
-
-#~ msgid "Answered Question"
-#~ msgstr "Odgovoreno pitanje"
-
-#~ msgid "You can not give response for this survey more than %s times"
-#~ msgstr "Na ovo pitanje ne možete odgovoriti više od %s puta"
-
-#~ msgid "Manually"
-#~ msgstr "Manualno"
-
-#~ msgid "All Surveys"
-#~ msgstr "Svi Upitnici"
-
-#~ msgid "Users"
-#~ msgstr "Korisnici"
-
-#~ msgid "Message"
-#~ msgstr "Poruka"
-
-#~ msgid "Page Number"
-#~ msgstr "Broj stranice"
-
-#~ msgid "Log"
-#~ msgstr "Zapis"
-
-#~ msgid "All Survey Questions"
-#~ msgstr "Sva pitanja upitnika"
-
-#~ msgid "Survey Close Date"
-#~ msgstr "Datum zatvaranja Upitnika"
-
-#~ msgid "Start"
-#~ msgstr "Početak"
-
-#~ msgid "Closed"
-#~ msgstr "Zaključen"
-
-#~ msgid "Answer"
-#~ msgstr "Odgovor"
-
-#~ msgid "All Survey Pages"
-#~ msgstr "Sve stranice upitnika"
-
-#~ msgid "Store Answer"
-#~ msgstr "Spremi odgovor"
-
-#~ msgid "Survey Module"
-#~ msgstr "Modul Upitnika"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module is used for surveing. It depends on the answers or reviews "
-#~ "of some questions by different users.\n"
-#~ "    A survey may have multiple pages. Each page may contain multiple "
-#~ "questions and each question may have multiple answers.\n"
-#~ "    Different users may give different answers of question and according to "
-#~ "that survey is done. \n"
-#~ "    Partners are also sent mails with user name and password for the "
-#~ "invitation of the survey\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Ovaj se modul koristi za anketiranje. Ovisi o odgovorima na pitanja i "
-#~ "komentarima korisnika. Upitnik može imati više stranica. Svaka stranica može "
-#~ "sadržavati više raznovrsnih pitanja i svako pitanje dopušta više odgovora. "
-#~ "Različiti korisnici dati će različite odgovore na pitanja i na tome se "
-#~ "zasniva anketiranje. Partnerima se također mailom šalju pozivi na ankete s "
-#~ "korisničkim imenom i zaporkom.\n"
-#~ "    "
-
-#~ msgid "Survey Details"
-#~ msgstr "Detalji Upitnika"
-
-#~ msgid "Required Answer"
-#~ msgstr "Zahtijevani odgovor"
-
-#~ msgid "Groups"
-#~ msgstr "Grupe"
-
-#~ msgid "Response"
-#~ msgstr "Odziv"
-
-#~ msgid "New Survey"
-#~ msgstr "Novi Upitnik"
-
-#~ msgid "Survey Management"
-#~ msgstr "Upravljanje Anketama"
-
-#~ msgid "Skiped"
-#~ msgstr "Preskočen"
-
-#~ msgid "Survey Answer"
-#~ msgstr "Odgovor Upitnika"
-
-#~ msgid "Attention!"
-#~ msgstr "Pažnja!"
-
-#~ msgid "Survey"
-#~ msgstr "Upitnik"
-
-#~ msgid "Total Completed Survey :-"
-#~ msgstr "Ukupno ispunjeno Upitnika :-"
-
-#~ msgid "Seq"
-#~ msgstr "Seq"
-
-#~ msgid "Total Completed Survey"
-#~ msgstr "Ukupno ispunjeno Upitnika"
-
-#~ msgid "Response Percentage"
-#~ msgstr "Postotak odziva"
-
-#~ msgid "Number"
-#~ msgstr "Broj"
-
-#~ msgid "Survey Title :-"
-#~ msgstr "Naziv upitnika :-"
-
-#~ msgid "Done"
-#~ msgstr "Gotovo"
-
-#~ msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
-#~ msgstr "'\" + que_rec[0]['question'] + \"' Ovo pitanje zahtijeva odgovor."
-
-#~ msgid "Total Started Survey"
-#~ msgstr "Ukupno pokrenuto Upitnika"
-
-#~ msgid "Survey Response"
-#~ msgstr "Odziv na Upitnik"
-
-#~ msgid "#Avg"
-#~ msgstr "#Avg"
-
-#~ msgid "Responsible"
-#~ msgstr "Odgovoran"
-
-#~ msgid "Answered"
-#~ msgstr "Odgovoren"
-
-#~ msgid "Other"
-#~ msgstr "Drugi"
-
-#~ msgid "Send Invitation"
-#~ msgstr "Poslan poziv"
-
-#~ msgid "Survey Title"
-#~ msgstr "Naziv Upitnika"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Select Survey"
-#~ msgstr "Odaberi Upitnik"
-
-#~ msgid "New Survey Page"
-#~ msgstr "Nova stranica Upitnika"
-
-#~ msgid "Survey Page"
-#~ msgstr "Stranica Upitnika"
-
-#~ msgid "Survey Answers"
-#~ msgstr "Odgovori Upitnika"
-
-#~ msgid "#Questions"
-#~ msgstr "#Questions"
-
-#~ msgid "Que:"
-#~ msgstr "Que:"
-
-#~ msgid "Page"
-#~ msgstr "Stranica"
-
-#~ msgid "User creation"
-#~ msgstr "Kreirao korisnik"
-
-#~ msgid "Sequence"
-#~ msgstr "Slijed"
-
-#~ msgid "Results :"
-#~ msgstr "Rezultati :"
-
-#~ msgid "%sSurvey is not in open state"
-#~ msgstr "%sSurvey is not in open state"
-
-#~ msgid "Select Partner"
-#~ msgstr "Odaberi Partnera"
-
-#~ msgid "Create Date"
-#~ msgstr "Kreiraj datum"
-
-#~ msgid "Survey Pages"
-#~ msgstr "Stranice Upitnika"
-
-#~ msgid "Response Count"
-#~ msgstr "Zbroj odziva"
-
-#~ msgid "Page Position"
-#~ msgstr "Pozicija stranice"
-
-#~ msgid "Openerp user"
-#~ msgstr "OpenERP korisnik"
-
-#~ msgid "Working Time Categories"
-#~ msgstr "Kategorije radnog vremena"
-
-#~ msgid "Error! You can not create recursive departments."
-#~ msgstr "Greška! Ne možete kreirati rekurzivne odjele!"
-
-#~ msgid "SIN No"
-#~ msgstr "SIN No"
-
-#~ msgid "Human Resources"
-#~ msgstr "Ljudski Resursi"
-
-#~ msgid "Sunday"
-#~ msgstr "Nedjelja"
-
-#~ msgid "Parents"
-#~ msgstr "Roditelji"
-
-#~ msgid "Department"
-#~ msgstr "Odjel"
-
-#~ msgid "Contact  of employee"
-#~ msgstr "Kontakt Djelatnika"
-
-#~ msgid "Work Email"
-#~ msgstr "Poslovni Email"
-
-#~ msgid "Group name"
-#~ msgstr "Ime Grupe"
-
-#~ msgid "Company"
-#~ msgstr "Tvrtka"
-
-#~ msgid "Friday"
-#~ msgstr "Petak"
-
-#~ msgid "Parent Department"
-#~ msgstr "Ishodni Odjel"
-
-#~ msgid "Work from"
-#~ msgstr "Posao od"
-
-#~ msgid "Employee Hierarchy"
-#~ msgstr "Hijerarhija Djelatnika"
-
-#~ msgid "Unmaried"
-#~ msgstr "Nije u braku"
-
-#~ msgid "Female"
-#~ msgstr "Žensko"
-
-#~ msgid "Working Time Category"
-#~ msgstr "Kategorija radnog vremena"
-
-#~ msgid "Employees Structure"
-#~ msgstr "Struktura Djelatnika"
-
-#~ msgid "Social IDs"
-#~ msgstr "Osobni ID brojevi"
-
-#~ msgid "Work Phone"
-#~ msgstr "Poslovni telefon"
-
-#~ msgid "Office Location"
-#~ msgstr "Lokacija ureda"
-
-#~ msgid "Employee"
-#~ msgstr "Djelatnik"
-
-#~ msgid "Workgroup manager"
-#~ msgstr "Voditelj Radne Grupe"
-
-#~ msgid "Subordinates"
-#~ msgstr "Podređeni Djelatnici"
-
-#~ msgid "Members"
-#~ msgstr "Članovi"
-
-#~ msgid "SSN No"
-#~ msgstr "SSN No"
-
-#~ msgid "Fill up contact information"
-#~ msgstr "Ispunite kontakt podatke"
-
-#~ msgid "Divorced"
-#~ msgstr "Razveden-a"
-
-#~ msgid "Departments"
-#~ msgstr "Odjeli"
-
-#~ msgid "Employee Contact"
-#~ msgstr "Kontakt Djelatnika"
-
-#~ msgid "Maried"
-#~ msgstr "U braku"
-
-#~ msgid "Employee's timesheet group"
-#~ msgstr "Grupa kontrolnih kartica Djelatnika"
-
-#~ msgid "Male"
-#~ msgstr "Muško"
-
-#~ msgid "Create openerp user"
-#~ msgstr "Kreiraj OpenERP Korisnika"
-
-#~ msgid "Employee Category"
-#~ msgstr "Kategorija Djelatnika"
-
-#~ msgid "Tuesday"
-#~ msgstr "Utorak"
-
-#~ msgid "hr.department"
-#~ msgstr "Odjel Ljudskih Resursa"
-
-#~ msgid "Related User"
-#~ msgstr "Povezani Korisnik"
-
-#~ msgid "Note"
-#~ msgstr "Bilješka"
-
-#~ msgid "Contact Information"
-#~ msgstr "Kontakt podaci"
-
-#~ msgid "Monday"
-#~ msgstr "Ponedjeljak"
-
-#~ msgid "Categories structure"
-#~ msgstr "Struktura Kategorija"
-
-#~ msgid "Day of week"
-#~ msgstr "Dan u tjednu"
-
-#~ msgid "Birthday"
-#~ msgstr "Rođendan"
-
-#~ msgid "Active"
-#~ msgstr "Aktivan"
-
-#~ msgid "Error ! You cannot create recursive Hierarchy of Employees."
-#~ msgstr "Greška! Ne možete kreirati rekurzivnu Hijerarhiju Djelatnika"
-
-#~ msgid "Employee Contract Process"
-#~ msgstr "Proces rada s Ugovorom Djelatnika"
-
-#~ msgid "Create OpenERP User"
-#~ msgstr "Kreiraj OpenERP Korisnika"
-
-#~ msgid "Employee Complete Form"
-#~ msgstr "Cjelovit formular Djelatnika"
-
-#~ msgid "Companies"
-#~ msgstr "Tvrtke"
-
-#~ msgid "Wednesday"
-#~ msgstr "Srijeda"
-
-#~ msgid "Categories of Employee"
-#~ msgstr "Kategorije djelatnika"
-
-#~ msgid "Starting date"
-#~ msgstr "Početni datum"
-
-#~ msgid "Parent Users"
-#~ msgstr "Ishodni korisnici"
-
-#~ msgid "Working Address"
-#~ msgstr "Poslovna adresa"
-
-#~ msgid "Marital Status"
-#~ msgstr "Bračni status"
-
-#~ msgid "Timesheet Line"
-#~ msgstr "Niz Kontrolne kartice"
-
-#~ msgid "Personal Information"
-#~ msgstr "Osobni podaci"
-
-#~ msgid "Working Time"
-#~ msgstr "Radno vrijeme"
-
-#~ msgid "Thursday"
-#~ msgstr "Četvrtak"
-
-#~ msgid "Work to"
-#~ msgstr "Rad do"
-
-#~ msgid "Employees Categories"
-#~ msgstr "Kategorije Djelatnika"
-
-#~ msgid "Home Address"
-#~ msgstr "Kućna adresa"
-
-#~ msgid "department"
-#~ msgstr "Odjel"
-
-#~ msgid "Nationality"
-#~ msgstr "Narodnost"
-
-#~ msgid "Other ID"
-#~ msgstr "Drugi ID broj"
-
-#~ msgid "Name"
-#~ msgstr "Ime"
-
-#~ msgid "Gender"
-#~ msgstr "Spol"
-
-#~ msgid "Employees"
-#~ msgstr "Djelatnici"
-
-#~ msgid "Department Name"
-#~ msgstr "Ime Odjela"
-
-#~ msgid "Child Departments"
-#~ msgstr "Slijedni Odjeli"
-
-#~ msgid "Job Information"
-#~ msgstr "Poslovni podaci"
-
-#~ msgid "Fill up employee's contact information"
-#~ msgstr "Ispunite kontakt podatke Djelatnika"
-
-#~ msgid "Manager"
-#~ msgstr "Voditelj"
-
-#~ msgid "All Employees"
-#~ msgstr "Svi Djelatnici"
-
-#~ msgid "Saturday"
-#~ msgstr "Subota"
-
-#~ msgid "New Employee"
-#~ msgstr "Novi Djelatnik"
-
-#~ msgid "Attendance"
-#~ msgstr "Nazočnost"
-
-#~ msgid "Sign in / Sign out"
-#~ msgstr "Prijava / Odjava"
-
-#~ msgid ""
-#~ "(*) A positive delay means that the employee worked less than recorded."
-#~ msgstr ""
-#~ "(*) Pozitivno kašnjenje znači da je Djelatnik radio manje no što je "
-#~ "zabilježeno."
-
-#~ msgid "Employee attendances"
-#~ msgstr "Nazočnost Djelatnika"
-
-#~ msgid "You are now ready to sign in or out of the attendance follow up"
-#~ msgstr "Sada se možete prijaviti ili odjaviti iz praćenja Nazočnosti"
-
-#~ msgid "Sign out"
-#~ msgstr "Odjava"
-
-#~ msgid "Delay"
-#~ msgstr "Kašnjenje"
-
-#~ msgid "Employee's name"
-#~ msgstr "Ime Djelatnika"
-
-#~ msgid "Print Timesheet"
-#~ msgstr "Tiskaj Kontrolnu Karticu"
-
-#~ msgid "Print Attendance Error Report"
-#~ msgstr "Tiskaj izvještaj greške Nazočnosti"
-
-#~ msgid "Print Timesheet by week"
-#~ msgstr "Tiskaj Kontrolnu karticu po tjednu"
-
-#~ msgid "Select a time span"
-#~ msgstr "Odaberi razdoblje"
-
-#~ msgid "Date Recorded"
-#~ msgstr "datum bilježenja"
-
-#~ msgid "Sign In"
-#~ msgstr "Prijava"
-
-#~ msgid "Total period:"
-#~ msgstr "Ukupno vremensko trajanje:"
-
-#~ msgid "Action reason"
-#~ msgstr "Razlog radnje"
-
-#~ msgid "Your last sign in"
-#~ msgstr "Vaša zadnja prijava"
-
-#~ msgid "Print Timesheet by month"
-#~ msgstr "Tiskaj Kontrolnu karticu po mjesecu"
-
-#~ msgid "Sign Out"
-#~ msgstr "Odjava"
-
-#~ msgid "Attendances Of Employees"
-#~ msgstr "Nazočnosti Djelatnika"
-
-#~ msgid "Reason"
-#~ msgstr "Razlog"
-
-#~ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-#~ msgstr "Greška: Prijava (Odn. Odjava) mora slijediti Odjavu (Odn. Prijavu)"
-
-#~ msgid "Date Signed"
-#~ msgstr "Datum zabilježbe"
-
-#~ msgid ""
-#~ "You did not signed out the last time. Please enter the date and time you "
-#~ "signed out."
-#~ msgstr ""
-#~ "Zadnji puta se niste odjavili. Molim Vas, unesite datum i vrijeme kad ste se "
-#~ "trebali odjaviti."
-
-#~ msgid "Attendance reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "Starting Date"
-#~ msgstr "Početni datum"
-
-#~ msgid "Present"
-#~ msgstr "Prisutan"
-
-#~ msgid "Absent"
-#~ msgstr "Odsutan"
-
-#~ msgid "Your last sign out"
-#~ msgstr "Vaša zadnja Odjava"
-
-#~ msgid "Min Delay"
-#~ msgstr "Min kašnjenje"
-
-#~ msgid "Action's type"
-#~ msgstr "Tip radnje"
-
-#~ msgid "Define attendance reason"
-#~ msgstr "Definirajte razlog nazočnosti"
-
-#~ msgid "Sign in"
-#~ msgstr "Prijava"
-
-#~ msgid "Analysis Information"
-#~ msgstr "Podaci Analize"
-
-#~ msgid "Current state"
-#~ msgstr "Tekuće stanje"
-
-#~ msgid "Attendances"
-#~ msgstr "Nazočnosti"
-
-#~ msgid "Attendance Errors"
-#~ msgstr "Greške nazočnosti"
-
-#~ msgid "Action"
-#~ msgstr "Radnja"
-
-#~ msgid "Print Attendance Report"
-#~ msgstr "Tiskaj izvještaj Nazočnosti"
-
-#~ msgid "Attendance Reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "Bellow this delay, the error is considered to be voluntary"
-#~ msgstr "Ispod tog kašnjenja, greška se smatra proizvoljnom."
-
-#~ msgid "Max. Delay (Min)"
-#~ msgstr "Max. Kašnjenje (min)"
-
-#~ msgid "Select a starting and a end date"
-#~ msgstr "Odaberite datum početka i završetka"
-
-#~ msgid "Ending Date"
-#~ msgstr "Datum završetka"
-
-#~ msgid ""
-#~ "You did not signed in the last time. Please enter the date and time you "
-#~ "signed in."
-#~ msgstr ""
-#~ "Zadnji puta se niste prijavili. Molim Vas, unesite datum i vrijeme kad ste "
-#~ "se trebali prijaviti."
-
-#~ msgid "Employee attendance"
-#~ msgstr "Nazočnost Djelatnika"
-
-#~ msgid "Select a month"
-#~ msgstr "Odaberite mjesec"
-
-#~ msgid "This module aims to manage employee's attendances."
-#~ msgstr "Ovaj modul treba upravljati nazočnostima Djelatnika"
-
-#~ msgid "Attendance Error Report"
-#~ msgstr "Izvještaj greške Nazočnosti"
-
-#~ msgid "Operation"
-#~ msgstr "Djelovanje"
diff --git a/addons/idea/i18n/hu.po b/addons/idea/i18n/hu.po
index c38a84f4854..4a5bba7667a 100644
--- a/addons/idea/i18n/hu.po
+++ b/addons/idea/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 14:34+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/id.po b/addons/idea/i18n/id.po
index f3b64496319..b2ab527d2d8 100644
--- a/addons/idea/i18n/id.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/it.po b/addons/idea/i18n/it.po
index fe1cddc6096..7dd57a2b4ec 100644
--- a/addons/idea/i18n/it.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Seleziona idea"
 
 #. module: idea
 #: view:idea.idea:0
@@ -317,7 +317,7 @@ msgstr "    Mese-1    "
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Data apertura"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
@@ -334,7 +334,7 @@ msgstr "Statistiche Voto"
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Massimi Voti per Utente"
 
 #. module: idea
 #: view:idea.category:0
@@ -473,7 +473,7 @@ msgstr "Data"
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "Pubblicazione"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -542,7 +542,7 @@ msgstr "Autore"
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Vota"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
@@ -582,7 +582,7 @@ msgstr "Idee"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "Pubblica voto"
 
 #. module: idea
 #: view:idea.idea:0
@@ -684,7 +684,7 @@ msgstr "Accetto"
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "Pubblica Voto"
 
 #. module: idea
 #: view:report.vote:0
@@ -695,7 +695,7 @@ msgstr "Anno"
 #. module: idea
 #: view:idea.select:0
 msgid "Select Idea for Vote"
-msgstr ""
+msgstr "Seleziona idea per Voto"
 
 #~ msgid "My Ideas"
 #~ msgstr "Le Mie Idee"
@@ -766,19 +766,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#, python-format
-#~ msgid "Idea must be in \\n'Open' state before vote for that idea."
-#~ msgstr "L'Idea deve essere nello stato:\\n'Aperta' prima di votare per essa"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/idea/i18n/ko.po b/addons/idea/i18n/ko.po
index 86de22c1372..8a0c6942b65 100644
--- a/addons/idea/i18n/ko.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index b2675d7e485..7796351b42f 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/mn.po b/addons/idea/i18n/mn.po
index facadd59893..2921274f557 100644
--- a/addons/idea/i18n/mn.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/nl.po b/addons/idea/i18n/nl.po
index 23490f951e3..cd14bdabe5f 100644
--- a/addons/idea/i18n/nl.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -746,21 +746,5 @@ msgstr "Idee voor stem selecteren"
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
-#, python-format
-#~ msgid "Idea must be in \\n'Open' state before vote for that idea."
-#~ msgstr "Idee moet op status \\n'Open' staan voordat gestemd kan worden."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/idea/i18n/pl.po b/addons/idea/i18n/pl.po
index 66214a7a9a0..3427ffe25f4 100644
--- a/addons/idea/i18n/pl.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/pt.po b/addons/idea/i18n/pt.po
index 90d66a09687..e37676acb5a 100644
--- a/addons/idea/i18n/pt.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -754,15 +754,3 @@ msgstr "Selecionar Ideia para votar"
 
 #~ msgid "All Votes"
 #~ msgstr "Todos os Votos"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/idea/i18n/pt_BR.po b/addons/idea/i18n/pt_BR.po
index 03e5ffc7b4d..e6942c97d83 100644
--- a/addons/idea/i18n/pt_BR.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -712,15 +712,3 @@ msgstr "Selecione a Idéia para Votar"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/idea/i18n/ro.po b/addons/idea/i18n/ro.po
index de39b901d3e..3b8b0f9e4fb 100644
--- a/addons/idea/i18n/ro.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/ru.po b/addons/idea/i18n/ru.po
index 29c428e546c..db1ecb572a7 100644
--- a/addons/idea/i18n/ru.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
-msgstr "Если отмечено создатель идеи будит виден остальным"
+msgstr "Показывать автора идеи"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
@@ -71,6 +71,15 @@ msgid ""
 "    The managers can obtain an easy view on best ideas from all the users.\n"
 "    Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"\n"
+"    Этот модуль позволяет пользователю легко и эффективно участвовать в "
+"инновациях на предприятии.\n"
+"    Он позволяет каждому выразить свои идеи на разные темы.\n"
+"    Затем, другие пользователи могут комментировать эти идеи и голосовать за "
+"отдельные идеи.\n"
+"    Каждая идея получает очки, основанные на голосовании.\n"
+"    Начальники могут получить обзор лучших идей пользователей.\n"
+"    После установки, проверьте меню \"Идеи\" в главном меню \"Инструменты\"."
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
@@ -267,6 +276,9 @@ msgid ""
 " It is             opened by the user, the state is 'Opened'.            \n"
 "If the idea is accepted, the state is 'Accepted'."
 msgstr ""
+"Когда идея создается, состояние \"Черновик\".\n"
+" При открытии пользователем, состояние \"Открыто\".\n"
+"Если идея принята, состояние \"Принято\"."
 
 #. module: idea
 #: field:idea.category,visibility:0
@@ -318,7 +330,7 @@ msgstr "Статистика голосов"
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Максимальное количество голосов на пользователя"
 
 #. module: idea
 #: view:idea.category:0
@@ -388,7 +400,7 @@ msgstr "Открыто"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's Votes"
-msgstr ""
+msgstr "Голоса за идею"
 
 #. module: idea
 #: view:idea.idea:0
@@ -532,6 +544,7 @@ msgstr "Проголосовать"
 #: help:idea.idea,vote_limit:0
 msgid "Set to one if  you require only one Vote per user"
 msgstr ""
+"Выберите один, если вам требуется только один голос на одного пользователя"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -566,7 +579,7 @@ msgstr "Идеи"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "Проголосовать"
 
 #. module: idea
 #: view:idea.idea:0
@@ -606,7 +619,7 @@ msgstr "Отказано"
 #: code:addons/idea/idea.py:253
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
-msgstr ""
+msgstr "Нельзя голосовать за черновики/принятые/отмененные идеи"
 
 #. module: idea
 #: view:idea.vote:0
@@ -641,7 +654,7 @@ msgstr "Подсчет комментариев"
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "Статус голосования"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
@@ -668,7 +681,7 @@ msgstr "Принять"
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "Проголосовать"
 
 #. module: idea
 #: view:report.vote:0
@@ -679,7 +692,7 @@ msgstr "Год"
 #. module: idea
 #: view:idea.select:0
 msgid "Select Idea for Vote"
-msgstr ""
+msgstr "Выберите идею для голосования"
 
 #~ msgid "My Ideas"
 #~ msgstr "Мои идеи"
@@ -750,15 +763,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
diff --git a/addons/idea/i18n/sk.po b/addons/idea/i18n/sk.po
index 5ffab1944ec..815ec5e23e1 100644
--- a/addons/idea/i18n/sk.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/sl.po b/addons/idea/i18n/sl.po
index a8279ff9b1d..534aa570485 100644
--- a/addons/idea/i18n/sl.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/sq.po b/addons/idea/i18n/sq.po
index 73143af25b0..d75829bcb7d 100644
--- a/addons/idea/i18n/sq.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/sr@latin.po b/addons/idea/i18n/sr@latin.po
index 1a2a5dce1c9..b68acad7353 100644
--- a/addons/idea/i18n/sr@latin.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/sv.po b/addons/idea/i18n/sv.po
index 027f1d2f757..8dd4a1b3f02 100644
--- a/addons/idea/i18n/sv.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/tlh.po b/addons/idea/i18n/tlh.po
index f9d8ab46b49..91ae07b1be3 100644
--- a/addons/idea/i18n/tlh.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index e1138dba45b..673ec591441 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/uk.po b/addons/idea/i18n/uk.po
index 2cf96426920..6668928871c 100644
--- a/addons/idea/i18n/uk.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/vi.po b/addons/idea/i18n/vi.po
index ba3c1de0dcb..0cc5d48989f 100644
--- a/addons/idea/i18n/vi.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index de191914088..15a7a5f1cdc 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -8,23 +8,23 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-09-20 11:46+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
-msgstr ""
+msgstr "如为真，创建者的创意其他人都可见。"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "选择创意"
 
 #. module: idea
 #: view:idea.idea:0
@@ -37,18 +37,18 @@ msgstr "投票"
 #: view:idea.idea:0
 #: field:idea.idea,comment_ids:0
 msgid "Comments"
-msgstr "评论"
+msgstr "评价"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr ""
+msgstr "提交投票"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
 #: model:ir.ui.menu,name:idea.menu_report_vote_all
 msgid "Ideas Analysis"
-msgstr ""
+msgstr "创意分析"
 
 #. module: idea
 #: view:idea.category:0
@@ -56,7 +56,7 @@ msgstr ""
 #: view:idea.vote:0
 #: view:report.vote:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -71,33 +71,40 @@ msgid ""
 "    The managers can obtain an easy view on best ideas from all the users.\n"
 "    Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"\n"
+"    这模块使你轻松有效参与企业的创新。\n"
+"  它允许大家对创意表达不同的看法。\n"
+"  然后，其他用户可以评价这创意和投票支持具体的创意。\n"
+"  每个创意都根据不同投票来算得分。\n"
+"  经理能通过一个简单视图从所有用户中得到最佳的创意。\n"
+"  一旦安装，在“工具”菜单点选“创意”菜单。"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr "构想管理"
+msgstr "创意管理"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Idea must be in 'Open' state before vote for that idea."
-msgstr ""
+msgstr "创意投票状态必须为\"开启\"。"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Refuse"
-msgstr ""
+msgstr "拒绝"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
@@ -107,7 +114,7 @@ msgstr "投票数"
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "创意投票统计"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -120,12 +127,12 @@ msgstr "坏"
 #. module: idea
 #: selection:report.vote,idea_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr "构想分类"
+msgstr "创意分类"
 
 #. module: idea
 #: code:addons/idea/idea.py:253
@@ -133,7 +140,7 @@ msgstr "构想分类"
 #: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告 !"
 
 #. module: idea
 #: view:idea.idea:0
@@ -143,12 +150,12 @@ msgstr "你的评价"
 #. module: idea
 #: view:report.vote:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月份   "
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "Idea Vote"
-msgstr ""
+msgstr "创意投票"
 
 #. module: idea
 #: field:idea.category,parent_id:0
@@ -161,39 +168,39 @@ msgstr "上级分类"
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr "非常坏"
+msgstr "非常差"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr ""
+msgstr "创意投票"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# 明细"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:89
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
-msgstr ""
+msgstr "您最多投%s次"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr ""
+msgstr "创意分类"
 
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr "构想的内容"
+msgstr "创意的内容"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "创意类型"
 
 #. module: idea
 #: view:idea.idea:0
@@ -212,12 +219,12 @@ msgstr "没投票"
 #. module: idea
 #: sql_constraint:idea.category:0
 msgid "The name of the category must be unique"
-msgstr ""
+msgstr "该分类的名称必须唯一"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "选择创意"
 
 #. module: idea
 #: view:idea.stat:0
@@ -232,7 +239,7 @@ msgstr "子分类"
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "下一个"
 
 #. module: idea
 #: view:idea.idea:0
@@ -240,7 +247,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -253,12 +260,12 @@ msgstr "好"
 #. module: idea
 #: help:idea.idea,open_date:0
 msgid "Date when an idea opened"
-msgstr ""
+msgstr "创意开启的日期"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "创意的详情"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -267,17 +274,20 @@ msgid ""
 " It is             opened by the user, the state is 'Opened'.            \n"
 "If the idea is accepted, the state is 'Accepted'."
 msgstr ""
+"创意建立的时候状态为“草稿”。\n"
+"用户已启动，那它的状态为“已启动”\n"
+"如果创意被接受，它的状态变为“已接受”"
 
 #. module: idea
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "启功创意？"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: idea
 #: view:idea.idea:0
@@ -285,7 +295,7 @@ msgstr ""
 #: view:report.vote:0
 #: selection:report.vote,idea_state:0
 msgid "Accepted"
-msgstr "已同意"
+msgstr "已接受"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
@@ -296,12 +306,12 @@ msgstr "分类"
 #. module: idea
 #: view:report.vote:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "启动日期"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
@@ -318,12 +328,12 @@ msgstr "投票统计"
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "每人最多投票次数"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Parent Category"
-msgstr ""
+msgstr "上级分类"
 
 #. module: idea
 #: field:idea.comment,content:0
@@ -337,24 +347,24 @@ msgstr "评论"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 msgid "Open Ideas"
-msgstr "待处理的构想"
+msgstr "启动构思"
 
 #. module: idea
 #: view:idea.category:0
@@ -377,34 +387,34 @@ msgstr "非常好"
 #. module: idea
 #: view:report.vote:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: selection:report.vote,idea_state:0
 msgid "Opened"
-msgstr "待处理"
+msgstr "已开启"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's Votes"
-msgstr ""
+msgstr "创意投票"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr "新的构想"
+msgstr "新创意"
 
 #. module: idea
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr "开始对构想投票"
+msgstr "开始对创意投票"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr "构想分类"
+msgstr "创意分类"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -415,7 +425,7 @@ msgstr "草稿"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -428,18 +438,18 @@ msgstr "一般"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "用户名"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr "构想投票统计"
+msgstr "创意投票统计"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -452,12 +462,12 @@ msgstr "用户"
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "发布"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -467,7 +477,7 @@ msgstr "我的投票"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: idea
 #: field:idea.comment,create_date:0
@@ -478,12 +488,12 @@ msgstr "创建日期"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "idea.idea"
 
 #. module: idea
 #: field:idea.category,summary:0
@@ -493,27 +503,27 @@ msgstr "摘要"
 #. module: idea
 #: field:idea.idea,name:0
 msgid "Idea Summary"
-msgstr "构想摘要"
+msgstr "创意摘要"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "投票统计"
 
 #. module: idea
 #: field:report.vote,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "投票日期"
 
 #. module: idea
 #: view:idea.idea:0
@@ -526,12 +536,12 @@ msgstr "建立者"
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "去投票"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
 msgid "Set to one if  you require only one Vote per user"
-msgstr ""
+msgstr "如果你需要每个用户只投一票设置一个"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -547,12 +557,12 @@ msgstr "关闭"
 #: view:idea.idea:0
 #: view:report.vote:0
 msgid "Open"
-msgstr "待处理"
+msgstr "开启"
 
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
-msgstr ""
+msgstr "创意投票分析"
 
 #. module: idea
 #: view:idea.idea:0
@@ -561,28 +571,28 @@ msgstr ""
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr "构想"
+msgstr "创意"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "投票"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: idea
 #: field:idea.vote.stat,score:0
 #: field:report.vote,score:0
 msgid "Score"
-msgstr "评分"
+msgstr "得分"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Comments:"
-msgstr ""
+msgstr "评价："
 
 #. module: idea
 #: view:idea.category:0
@@ -594,34 +604,34 @@ msgstr "说明"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: view:report.vote:0
 msgid "Refused"
-msgstr ""
+msgstr "已拒绝"
 
 #. module: idea
 #: code:addons/idea/idea.py:253
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
-msgstr ""
+msgstr "草稿/已接受/已取消的创意不能投票"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Vote date"
-msgstr ""
+msgstr "投票日期"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Today    "
-msgstr ""
+msgstr "    今日    "
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -631,17 +641,17 @@ msgstr "投票数"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr "评论数"
+msgstr "评价数"
 
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "投票状态"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
@@ -658,28 +668,28 @@ msgstr "平均分"
 #: view:report.vote:0
 #: field:report.vote,idea_id:0
 msgid "Idea"
-msgstr "构想"
+msgstr "创意"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "同意"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "投票"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Select Idea for Vote"
-msgstr ""
+msgstr "选择创意投票"
 
 #~ msgid "Status"
 #~ msgstr "状态"
diff --git a/addons/idea/i18n/zh_TW.po b/addons/idea/i18n/zh_TW.po
index 64436fb577d..03573b37380 100644
--- a/addons/idea/i18n/zh_TW.po
+++ b/addons/idea/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 0e6e89f15b5..7645b17a348 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -64,7 +64,7 @@ class idea_category(osv.osv):
     _order = 'parent_id,name asc'
 
     _constraints = [
-        (osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
+        (osv.osv._check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id'])
     ]
 
 idea_category()
@@ -185,7 +185,7 @@ class idea_idea(osv.osv):
         'count_votes': fields.function(_vote_count, string="Count of votes", type="integer"),
         'count_comments': fields.function(_comment_count, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'Draft'),
+        'state': fields.selection([('draft', 'New'),
             ('open', 'Opened'),
             ('close', 'Accepted'),
             ('cancel', 'Refused')],
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index e4cfa4efbe7..23667069b79 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -8,12 +8,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas Categories">
-                <group col="10" colspan="4">
+                <group>
                     <field name="name" string="Category"/>
                     <field name="parent_id" widget="selection"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="14">
+                <group expand="0" string="Group By...">
                     <filter string="Parent Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/>
                 </group>
             </search>
@@ -107,7 +107,6 @@
         <field name="model" eval="'idea.category'" />
         <field name="name">Ideas</field>
         <field name="value" eval="'ir.actions.act_window,'+str(action_idea_idea_categ_open)" />
-        <field name="object" eval="True" />
     </record>
 
 <!-- Idea statistics Form View -->
@@ -169,12 +168,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas vote">
-                <group col="10" colspan="4">
+                <group>
                     <field name="idea_id" widget="selection"/>
                     <field name="user_id" string="User"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="14">
+                <group expand="0" string="Group By...">
                     <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
@@ -198,6 +197,7 @@
                 <field name="category_id" select="1"/>
                 <field name="open_date" select="1"/>
                 <field name="user_id" attrs="{'invisible':[('visibility','=',False)]}"/>
+                <field name="visibility" invisible="1"/>
                 <field name="vote_avg" widget="progressbar"/>
                 <group col="4" colspan="2">
                     <field name="my_vote" readonly="1"/>
@@ -247,7 +247,7 @@
                 </page>
             </notebook>
             <group colspan="4" col="6">
-                <field name="state"/>
+                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
                 <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
                 <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
@@ -263,7 +263,7 @@
         <field name="model">idea.idea</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-        <tree colors="blue:state in ('draft');black:state in ('open','close');gray:state in('cancel')" string="Ideas">
+        <tree colors="blue:state == 'draft';black:state in ('open','close');gray:state == 'cancel'" string="Ideas">
             <field name="name"/>
             <field name="category_id"/>
             <field name="user_id"/>
@@ -288,17 +288,18 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas">
-                <group col="10" colspan="4">
-                    <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]" help="Draft and Open Ideas"/>
-                    <filter icon="terp-camera_test" string="Accepted"
+                <group>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
+                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
+                    <filter icon="terp-check" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="category_id" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="12" col="10">
+                <group expand="0" string="Group By...">
                     <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 26608a71301..24a46c1917b 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -29,30 +29,22 @@
             <field name="arch" type="xml">
                 <search string="Idea Vote Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="  Year  "
+                        <filter icon="terp-go-year" string="Year" name="year"
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Idea Vote created in curren year"/>
-                        <filter icon="terp-go-month" string="   Month   "
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-month" string="Month" name="month"
                             domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Idea Vote created in current month"/>
                         <filter icon="terp-go-month"
-                             string="    Month-1    "
-                             separator="1"
+                             string="Month-1"
                              domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                              help="Idea Vote created last month"/>
                          <separator orientation="vertical"/>
-                         <filter icon="terp-go-today"
-                             string="    Today    "
-                             name="today"
-                             separator="1"
-                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Idea Vote created by today"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test"
-                            string="Open"
+                            string="In Progress"
                             domain="[('idea_state','=',('open'))]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test"
+                        <filter icon="terp-check"
                             string="Accepted"
                             domain="[('idea_state','=',('close'))]"/>
                         <filter icon="terp-gtk-stop"
@@ -64,7 +56,7 @@
                         <field name="user_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
                         <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
@@ -88,7 +80,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_report_vote_search"/>
-            <field name="context">{'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
         <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager"/>
diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 402f93f4817..4ce9d706e69 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -56,7 +56,7 @@
 - 
   !python {model: idea.post.vote}: |
     uid2 = ref('test_idea_user1')
-    new_id = self.create(cr, uid2, {'vote': 50}, {"active_ids": [ref("idea_idea_0")]})
+    new_id = self.create(cr, uid2, {'vote': "50"}, {"active_ids": [ref("idea_idea_0")]})
     self.do_vote(cr, uid2, [new_id], {"active_ids": [ref("idea_idea_0")]})
     
 - |
@@ -69,7 +69,7 @@
 -
   !python {model: idea.post.vote}: |
     uid2 = ref('test_idea_user2')
-    new_id = self.create(cr, uid2, {'vote': 100, 'note': 'We can learn many things from technical presentation'}, {"active_ids": [ref("idea_idea_0")]})
+    new_id = self.create(cr, uid2, {'vote': "100", 'note': 'We can learn many things from technical presentation'}, {"active_ids": [ref("idea_idea_0")]})
     self.do_vote(cr, uid2, [new_id], {'active_ids': [ref('idea_idea_0')]})  
         
 - |
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index b54c007549d..420955b992b 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -73,12 +73,14 @@ class idea_post_vote(osv.osv_memory):
         """
         idea_obj = self.pool.get('idea.idea')
         vote_obj = self.pool.get('idea.vote')
+        
+        ctx_key = 'idea_ids' if context.get('idea_ids') is not None else 'active_ids'
 
-        for idea in idea_obj.browse(cr, uid, context.get('active_ids', []), context=context):
+        for idea in idea_obj.browse(cr, uid, context.get(ctx_key, []), context=context):
 
-            for active_id in context.get('active_ids'):
+            for idea_id in context.get(ctx_key):
 
-                vote_ids = vote_obj.search(cr, uid, [('user_id', '=', uid), ('idea_id', '=', active_id)])
+                vote_ids = vote_obj.search(cr, uid, [('user_id', '=', uid), ('idea_id', '=', idea_id)])
                 vote_obj_id = vote_obj.browse(cr, uid, vote_ids)
                 count = 0
                 for vote in vote_obj_id:
@@ -101,9 +103,10 @@ class idea_post_vote(osv.osv_memory):
         @param ids: List of Idea Post vote’s IDs.
         @return: Dictionary {}
         """
+        
+        ctx_key = 'idea_ids' if context.get('idea_ids') is not None else 'active_ids'
 
-        vote_ids = context and context.get('active_ids', []) or []
-        vote_id = context['active_ids'][0]
+        idea_id = context[ctx_key][0]
         vote_pool = self.pool.get('idea.vote')
         idea_pool = self.pool.get('idea.idea')
         comment_pool = self.pool.get('idea.comment')
@@ -112,19 +115,19 @@ class idea_post_vote(osv.osv_memory):
             score = str(do_vote_obj['vote'])
             comment = do_vote_obj.get('note', False)
             vote = {
-                'idea_id': vote_id,
+                'idea_id': idea_id,
                 'user_id': uid,
                 'score': score
             }
             if comment:
                 comment = {
                     'user_id':uid,
-                    'idea_id':vote_id,
+                    'idea_id':idea_id,
                     'content': comment,
                 }
                 comment = comment_pool.create(cr, uid, comment)
 
-            idea_pool._vote_save(cr, uid, vote_id, None, score, context)
+            idea_pool._vote_save(cr, uid, idea_id, None, score, context)
             #vote = vote_pool.create(cr, uid, vote)
             return {'type': 'ir.actions.act_window_close'}
 
@@ -166,7 +169,7 @@ class idea_select(osv.osv_memory):
             'views': [(id2, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context': {'active_ids': [idea_id]}
+            'context': {'idea_ids': [idea_id]}
        }
        return value
 
diff --git a/addons/import_base/__init__.py b/addons/import_base/__init__.py
index 0a5d7fb20b7..52366e5128a 100644
--- a/addons/import_base/__init__.py
+++ b/addons/import_base/__init__.py
@@ -20,4 +20,6 @@
 ##############################################################################
 
 import import_framework
-import mapper
\ No newline at end of file
+import mapper
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index 962541f427a..0f65cf166b6 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Base framework for module that need to import complex data',
     'version': '0.9',
-    'category': 'Generic Modules',
+    'category': 'Hidden',
     'description': """
         This module provide a class import_framework to help importing 
         complex data from other software
@@ -31,9 +31,11 @@
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': [],
+    'update_xml': ["import_base_view.xml"],
     'demo_xml': [],
     'test': [], #TODO provide test
     'installable': True,
     'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml
new file mode 100644
index 00000000000..1368b50b6e4
--- /dev/null
+++ b/addons/import_base/import_base_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+		<menuitem name="Import" id="menu_import_crm" parent="base.menu_base_partner"/>
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
index 9b25ecb1ecf..ecc5f54e461 100644
--- a/addons/import_base/import_framework.py
+++ b/addons/import_base/import_framework.py
@@ -22,11 +22,13 @@ 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)
 
 
@@ -46,8 +48,10 @@ class import_framework(Thread):
     """
     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
@@ -56,10 +60,9 @@ class import_framework(Thread):
         self.context = context or {}
         self.email = email_to_notify
         self.table_list = []
+        self.logger = logging.getLogger(module_name)
         self.initialize()
-        
-        
-      
+
     """
         Abstract Method to be implemented in 
         the real instance
@@ -71,6 +74,13 @@ class import_framework(Thread):
         """
         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
@@ -78,6 +88,22 @@ class import_framework(Thread):
         """
         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 : {
@@ -139,8 +165,9 @@ class import_framework(Thread):
                 data_i is a map external field_name => value
                 and each data_i have a external id => in data_id['id']
         """
+        self.logger.info(' Importing %s into %s' % (table, model))
         if not datas:
-            return (0, 'No data in this table')
+            return (0, 'No data found')
         mapping['id'] = 'id_new'
         res = []
         
@@ -154,14 +181,14 @@ class import_framework(Thread):
             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(data['id'], 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)
-        
+            raise ValueError(_("%s is not a valid model name") % model)
+        self.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)
@@ -296,6 +323,9 @@ class import_framework(Thread):
         """
         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')
@@ -343,8 +373,10 @@ class import_framework(Thread):
         """
         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:
-            result = []
+            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)
@@ -356,12 +388,18 @@ class import_framework(Thread):
                         result.append((table, position, warning))
                     imported.add(table)
             self.cr.commit()
-            
-        finally:
-            self.cr.close()
-        self.date_ended = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        self._send_notification_email(result)
         
+        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):
         """ 
@@ -381,19 +419,23 @@ class import_framework(Thread):
                 imported.add(dependency)
         return result
                 
-    def _send_notification_email(self, result):
+    def _send_notification_email(self, result, error):
         if not self.email:
-            return 		 
-        tools.email_send(
-                'import_sugarcrm@module.openerp',
-                self.email,
-                self.get_email_subject(result),
-                self.get_email_body(result),
-            )
-        logger = logging.getLogger('import_sugarcam')
-        logger.info("Import finished, notification email sended")
+            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:
+            self.logger.error(_("Import failed due to an unexpected error"))
+        else:
+            self.logger.info(_("Import finished, notification email sended"))
     
-    def get_email_subject(self, result):
+    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 
@@ -401,9 +443,11 @@ class import_framework(Thread):
             @return the subject of the mail
         
         """
-        return "Import of your data finished at %s" % self.date_ended
+        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):
+    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.
@@ -414,19 +458,45 @@ class import_framework(Thread):
         
         """
         
-        body = "started at %s and finished at %s \n" % (self.data_started, self.date_ended)
+        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"
+                warning = _("with no warning")
             else:
-                warning = "with warning : %s" % warning
-            body += "%s records were imported from table %s, %s \n" % (nb, table, warning)
+                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
+        return _("The import of data \n instance name : %s \n") % self.instance_name
     
-#For example of use see import_sugarcrm    
+
+    #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
index 7f97ed0b615..d68447ad3dd 100644
--- a/addons/import_base/mapper.py
+++ b/addons/import_base/mapper.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+import tools
 
 class mapper(object):
     """
@@ -50,14 +50,13 @@ 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 : external_values.get(x,''), self.arg))
+        return self.delimiter.join(map(lambda x : tools.ustr(external_values.get(x,'')), self.arg))
     
 class ppconcat(mapper):
     """
@@ -71,7 +70,7 @@ class ppconcat(mapper):
         self.delimiter = delimiter and delimiter.get('delimiter', ' ') or '\n\n'
         
     def __call__(self, external_values):
-        return self.delimiter.join(map(lambda x : x + ": " + external_values.get(x,''), self.arg))
+        return self.delimiter.join(map(lambda x : x + ": " + tools.ustr(external_values.get(x,'')), self.arg))
     
 class const(mapper):
     """
@@ -105,7 +104,6 @@ class value(mapper):
             val = external_values.get(self.fallback, self.default)
         return val 
     
-
     
 class map_val(mapper):
     """
@@ -169,5 +167,5 @@ class call(mapper):
             else:
                 args.append(arg)
         return self.fun(external_values, *args)
-    
-    
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index f1ab89a041d..a0a15756ec3 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Google Import',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    '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',
diff --git a/addons/import_google/wizard/google_import_message.py b/addons/import_google/wizard/google_import_message.py
index 5e2b2b6f4b1..bba58cd2250 100644
--- a/addons/import_google/wizard/google_import_message.py
+++ b/addons/import_google/wizard/google_import_message.py
@@ -40,3 +40,5 @@ class google_import_message(osv.osv):
         return res
 
 google_import_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
index 87155c806c6..936a6d17649 100644
--- a/addons/import_google/wizard/import_google.py
+++ b/addons/import_google/wizard/import_google.py
@@ -353,3 +353,5 @@ class google_import(import_framework):
                 }
 
         }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/__init__.py b/addons/import_sugarcrm/__init__.py
new file mode 100644
index 00000000000..8fdd9aec302
--- /dev/null
+++ b/addons/import_sugarcrm/__init__.py
@@ -0,0 +1,27 @@
+# -*- 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_sugarcrm
+import sugar
+import wizard
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
new file mode 100644
index 00000000000..927a4b542ed
--- /dev/null
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- 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': 'Import Data from SugarCRM',
+    'version': '1.0',
+    'category': 'Customer Relationship Management',
+    'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
+            "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['import_base','crm', 'document'],
+    'init_xml': [],
+    'update_xml': ["wizard/import_message_view.xml",
+                   "import_sugarcrm_view.xml"],
+    'demo_xml': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/doc/import_sugarcrm_installation_manual.odt b/addons/import_sugarcrm/doc/import_sugarcrm_installation_manual.odt
new file mode 100644
index 00000000000..2dfde16bc97
Binary files /dev/null and b/addons/import_sugarcrm/doc/import_sugarcrm_installation_manual.odt differ
diff --git a/addons/import_sugarcrm/doc/import_sugarcrm_user_manual.odt b/addons/import_sugarcrm/doc/import_sugarcrm_user_manual.odt
new file mode 100644
index 00000000000..2a16eeb566c
Binary files /dev/null and b/addons/import_sugarcrm/doc/import_sugarcrm_user_manual.odt differ
diff --git a/addons/import_sugarcrm/doc/import_sugarcrm_zsi_installation.txt b/addons/import_sugarcrm/doc/import_sugarcrm_zsi_installation.txt
new file mode 100644
index 00000000000..e399d63120b
--- /dev/null
+++ b/addons/import_sugarcrm/doc/import_sugarcrm_zsi_installation.txt
@@ -0,0 +1,8 @@
+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/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
new file mode 100644
index 00000000000..b3908be0050
--- /dev/null
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -0,0 +1,1151 @@
+# -*- 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, 'res.partner.canal', '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.address'
+        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.address')
+        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.address', 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',
+                'optout': '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.address',
+            'dependencies' : [self.TABLE_ACCOUNT],
+            'hook' : self.import_contact,
+            'map' :  {
+                'name': concat('first_name', 'last_name'),
+                'partner_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.address', 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.address', 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['context_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'),
+                'context_lang' : 'context_lang',
+                'password' : 'password',
+                '.id' : '.id',
+                'context_department_id/id': self.get_users_department,
+                'user_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('Accounts', 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).user_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
new file mode 100644
index 00000000000..1f12a8fde57
--- /dev/null
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -0,0 +1,105 @@
+<?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="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Data From SugarCRM">
+    				<group col="8" >
+	    				<group colspan="2" col="1" width="200">
+	    					<label colspan="2"  string="Import your data from SugarCRM :"/>
+	    					<label colspan="2"  string="" />
+	    					<label colspan="2"  string="Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."/>
+	    					<label colspan="2"  string="" />
+	    					<label colspan="2"  string="Choose data you want to import. Click 'Import' to get data manually or 'Schedule Reccurent Imports' to get recurrently and automatically data."/>
+	    					<label colspan="2"  string="" /> 
+	    					<label colspan="2"  string="If you make recurrent or ponctual import, data already  in OpenERP will be updated by SugarCRM data."/>
+	    					<label colspan="2"  string="" />
+	    					<label colspan="2"  string="Do not forget the email address to be notified of the success of the import."/>
+	    					<label colspan="2" />
+	    	                <label colspan="2"  string="Online documentation:"/>
+                            <label colspan="2"  string="(Comming Soon)"/>
+                            <label colspan="2"  string=""/>
+			            </group>
+	    				<separator string="" orientation="vertical" colspan="1" rowspan="24" />                
+	                    <group colspan="4"> 
+	                    	<separator string="Login Information" colspan="3"/>
+	                    	 <field name="url" colspan="4" widget="url"/>
+	                         <field name="username"/>
+	                         <newline/>
+	                         <field name="password" password="True" />
+	                         <separator string="" colspan="4"/>
+	                         <group colspan="4" col="6">
+	                            <group colspan="1" col="2">    
+	                                <separator string="Address Book" colspan="4"/>
+	                                <field name="user" />
+	                                <field name= "account" />
+	                                <field name= "contact" />
+	                            </group>                         
+	                            <group colspan="1" col="1">    
+	                                <separator string="CRM" colspan="4"/>
+	                             	<field name="opportunity" />
+	                             	<field name= "call" />
+	                             	<field name= "meeting" />
+	                             	<field name= "claim" />
+	                             	
+	                             </group>
+	                         
+	                             <group colspan="2" col="2"> 
+	                                <separator string="Project" colspan="4"/>       
+		                             <field name= "project" />
+		                             <field name= "project_task" />
+		                             <field name= "bug"/>
+	                            </group>
+	                            <group colspan="1" col="2">
+	                            	<separator string="HR" colspan="4"/>
+	    	                         <field name="employee" />  
+	                                <separator string="Document" colspan="4"/>
+	                                <field name="email_history"/>
+		                             <field name= "document" />
+	                            </group>	                            
+	                          </group>  
+		                         <group colspan="4">
+		                         	<separator string="Email Notification When Import is finished" colspan="4"/>
+		                     		<field name="email_from" widget="email" string="Email Address to Notify"/>
+		                     	</group>
+		                     	<group colspan="4" groups="base.group_no_one">   
+		                   			<separator string="Multi Instance Management" colspan="4"/>
+		                       		<field name="instance_name"/>
+		                       </group>
+	                        <separator string="" colspan="4" />
+	                    <group colspan="4" col="6">
+	                        <label string="" colspan="2"/>
+	                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+	                         <button name="import_from_scheduler_all" groups="base.group_extended" string="_Schedule Recurrent Imports"
+	                                   type="object" icon="gtk-execute" />
+	                        <button name="import_all" string="_Import"
+	                                type="object" icon="terp-camera_test"/>
+	                   </group>		                       
+	                    </group>
+	                </group>   
+                </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="import_base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
+
+    </data>
+</openerp>
+
diff --git a/addons/import_sugarcrm/sugar.py b/addons/import_sugarcrm/sugar.py
new file mode 100644
index 00000000000..35103a41173
--- /dev/null
+++ b/addons/import_sugarcrm/sugar.py
@@ -0,0 +1,180 @@
+# -*- 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
+
+
+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 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:
+        logging.getLogger('sugarcrm_soap').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
new file mode 100644
index 00000000000..b42eb4041c1
--- /dev/null
+++ b/addons/import_sugarcrm/sugarsoap_services.py
@@ -0,0 +1,1422 @@
+##################################################
+# 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
new file mode 100644
index 00000000000..182e9ce4c37
--- /dev/null
+++ b/addons/import_sugarcrm/sugarsoap_services_types.py
@@ -0,0 +1,648 @@
+##################################################
+# 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/base_setup/wizard/__init__.py b/addons/import_sugarcrm/wizard/__init__.py
similarity index 95%
rename from addons/base_setup/wizard/__init__.py
rename to addons/import_sugarcrm/wizard/__init__.py
index 3c482efa976..08b611401b1 100644
--- a/addons/base_setup/wizard/__init__.py
+++ b/addons/import_sugarcrm/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,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 res_company_logo
+import import_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/import_sugarcrm/wizard/import_message.py b/addons/import_sugarcrm/wizard/import_message.py
new file mode 100644
index 00000000000..1d2e765580b
--- /dev/null
+++ b/addons/import_sugarcrm/wizard/import_message.py
@@ -0,0 +1,31 @@
+# -*- 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 import_message(osv.osv):
+     """Import Message"""
+
+     _name = "import.message"
+     _description = __doc__
+     
+import_message()
+
+# 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
new file mode 100644
index 00000000000..581d862e408
--- /dev/null
+++ b/addons/import_sugarcrm/wizard/import_message_view.xml
@@ -0,0 +1,20 @@
+<?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="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Message">
+                   <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."/> 
+                   <separator string="" colspan="4" />
+                   <button  icon="gtk-ok" special="cancel" string="_Ok"/>
+                </form>
+            </field>
+        </record>
+        
+    </data>
+</openerp>        
\ No newline at end of file
diff --git a/addons/knowledge/__init__.py b/addons/knowledge/__init__.py
index 3511d091ecb..9a3d6d2fbb6 100644
--- a/addons/knowledge/__init__.py
+++ b/addons/knowledge/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index c2f1b2c7a88..2ca58e9861f 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -25,21 +25,20 @@
     "version" : "1.0",
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
-Installer for knowledge-based tools.
+Installer for knowledge-based Hidden.
 ====================================
 
 Makes the Knowledge Application Configuration available from where you can install
-document and Wiki based tools.
+document and Wiki based Hidden.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
         'security/knowledge_security.xml',
         'security/ir.model.access.csv',
-        'knowledge_installer.xml',
         'knowledge_view.xml',
     ],
     'demo_xml': ['knowledge_demo.xml'],
diff --git a/addons/knowledge/i18n/bg.po b/addons/knowledge/i18n/bg.po
index 629098df44f..36736d1532c 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +137,7 @@ msgid "Image"
 msgstr "Изображение"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Настройки на приложение ЗНАНИЯ"
diff --git a/addons/knowledge/i18n/ca.po b/addons/knowledge/i18n/ca.po
index 167beb2be26..6f29dc0819b 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +137,7 @@ msgid "Image"
 msgstr "Imatge"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Configuració aplicació del coneixement"
diff --git a/addons/knowledge/i18n/cs.po b/addons/knowledge/i18n/cs.po
index 864f23c4646..5cb719be969 100644
--- a/addons/knowledge/i18n/cs.po
+++ b/addons/knowledge/i18n/cs.po
@@ -8,14 +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-05-18 16:47+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-09-05 17:16+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: 2011-05-19 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -25,12 +26,12 @@ msgstr "Znalosti"
 #. module: knowledge
 #: help:knowledge.installer,wiki_quality_manual:0
 msgid "Creates an example skeleton for a standard quality manual."
-msgstr "Vytvoří vzorovou kostru standardního manuálu kvality"
+msgstr "Vytvoří vzorovou kostru standardní příručky kvality"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Share information within the company with these specific Addons."
-msgstr "S těmito moduly můžete sdílet informace uvnitř společnosti."
+msgstr "S těmito doplňky můžete sdílet informace uvnitř společnosti."
 
 #. module: knowledge
 #: field:knowledge.installer,document_ftp:0
@@ -45,7 +46,7 @@ msgstr "Systém řízení znalostí"
 #. module: knowledge
 #: field:knowledge.installer,wiki:0
 msgid "Collaborative Content (Wiki)"
-msgstr "Kolaborativní obsah (Wiki)"
+msgstr "Spolupracovní obsah (Wiki)"
 
 #. module: knowledge
 #: help:knowledge.installer,document_ftp:0
@@ -71,7 +72,7 @@ msgstr ""
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr "Konfigurovat"
+msgstr "Nastavit"
 
 #. module: knowledge
 #: view:knowledge.installer:0
@@ -84,21 +85,23 @@ msgid ""
 "Installer for knowledge-based tools\n"
 "    "
 msgstr ""
+"Instalátor pro nástroje založené na znalostech\n"
+"    "
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr "Konfigurace"
+msgstr "Nastavení"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 msgid "Knowledge Modules Installation"
-msgstr ""
+msgstr "Instalace znalostních modulů"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
 msgid "Quality Manual"
-msgstr ""
+msgstr "Příručka kvality"
 
 #. module: knowledge
 #: field:knowledge.installer,document_webdav:0
@@ -108,7 +111,7 @@ msgstr "Sdílená úložiště (WebDAV)"
 #. module: knowledge
 #: field:knowledge.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Průběh nastavení"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_faq:0
@@ -116,18 +119,18 @@ msgid ""
 "Creates a skeleton internal FAQ pre-filled with documentation about "
 "OpenERP's Document Management System."
 msgstr ""
-"Vytvoří kostru interního FAQ (často kladené otázky) předvyplněnou "
+"Vytvoří kostru vnitřního FAQ (často kladené otázky) předvyplněnou "
 "dokumentací o systému správy dokumentů OpenERP."
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_faq:0
 msgid "Internal FAQ"
-msgstr ""
+msgstr "Vnitřní FAQ"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr "Interní FAQ (často kladené otázky)"
+msgstr "Spolupracovní obsah"
 
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
@@ -143,12 +146,12 @@ msgstr "Konfigurace znalostní aplikace"
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_installer
 msgid "knowledge.installer"
-msgstr ""
+msgstr "knowledge.installer"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure Your Knowledge Application"
-msgstr ""
+msgstr "Nastavit naši Znalostní aplikaci"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki:0
@@ -157,7 +160,7 @@ msgid ""
 "business knowledge and share it with and  between your employees."
 msgstr ""
 "Umožňuje vytvářet wiki stránky a skupiny stránek za účelem uchování a "
-"sdílení obchodních znalostí s- a mezi zaměstnanci."
+"sdílení obchodních znalostí sdílet je s a mezi zaměstnanci."
 
 #. module: knowledge
 #: view:knowledge.installer:0
diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po
new file mode 100644
index 00000000000..f198a77905b
--- /dev/null
+++ b/addons/knowledge/i18n/da.po
@@ -0,0 +1,155 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-09 21:31+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Viden"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurationsfremgang"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr ""
diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
index 5768d9e1988..08a5a48f990 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -141,6 +141,7 @@ msgid "Image"
 msgstr "Bild"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Konfiguration Knowledge"
@@ -169,41 +170,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Inhaltsvorlagen"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ starten und darf keine Sonderzeichen haben "
-#~ "!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung in der Aktion"
-
-#~ msgid ""
-#~ "Provides an FTP access to your OpenERP's Document Management System. Lets "
-#~ "you access attachments and virtual documents through a standard FTP client."
-#~ msgstr ""
-#~ "Bietet einen FTP Zugriff zum OpenERP Dokumenten Management. Hierdurch können "
-#~ "Sie auf Dateianhänge sowie Dokumente über einen klassischen FTP Client Ihres "
-#~ "Betriebssystems, wie z.B. Putty oder ssh zugreifen."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für die Ansicht!"
-
-#~ msgid "Launch"
-#~ msgstr "Veröffentlichung"
-
-#~ msgid "Templates of Content"
-#~ msgstr "Vorlagen für Inhalte"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/knowledge/i18n/en_GB.po b/addons/knowledge/i18n/en_GB.po
new file mode 100644
index 00000000000..81427f8b9ee
--- /dev/null
+++ b/addons/knowledge/i18n/en_GB.po
@@ -0,0 +1,166 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-13 09:03+0000\n"
+"Last-Translator: John Bradshaw <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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Knowledge"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr "Creates an example skeleton for a standard quality manual."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr "Share information within the company with these specific Addons."
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr "Shared Repositories (FTP)"
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr "Knowledge Management System"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr "Collaborative Content (Wiki)"
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+"Provides FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure"
+msgstr "Configure"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "title"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+"Installer for knowledge-based tools\n"
+"    "
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr "Knowledge Modules Installation"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr "Quality Manual"
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr "Shared Repositories (WebDAV)"
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Configuration Progress"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr "Internal FAQ"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "Collaborative Content"
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "Image"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr "Knowledge Application Configuration"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr "knowledge.installer"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
+msgstr "Configure Your Knowledge Application"
+
+#. module: knowledge
+#: help:knowledge.installer,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 ""
+"Lets you create wiki pages and page groups to keep track of business "
+"knowledge and share it with and between your employees."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr "Content templates"
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index a6f87c2abba..c438cf196f9 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -139,6 +139,7 @@ msgid "Image"
 msgstr "Imagen"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Configuración aplicación del conocimiento"
@@ -166,27 +167,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Plantillas contenido"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/knowledge/i18n/es_MX.po b/addons/knowledge/i18n/es_MX.po
new file mode 100644
index 00000000000..2411aa00f7e
--- /dev/null
+++ b/addons/knowledge/i18n/es_MX.po
@@ -0,0 +1,169 @@
+# 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-27 08:12+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Conocimiento"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr "Crea un esqueleto de ejemplo para un manual de calidad estándar."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr "Comparta información con la compañía con estos módulos específicos."
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr "Repositorios compartidos (FTP)"
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr "Sistema de Gestión del Conocimiento"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr "Contenido colaborativo (Wiki)"
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+"Proporciona un acceso FTP al sistema de gestión documental de OpenERP. Le "
+"permite acceder a los adjuntos y a los documentos virtuales a través de un "
+"cliente FTP estándar."
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+"Proporciona un acceso WebDAV al sistema de gestión documental de OpenERP. Le "
+"permite acceder a los archivos adjuntos y a los documentos virtuales a "
+"través de su navegador de archivos habitual."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+"Instalador para las herramientas relacionadas con la gestión del "
+"conocimiento\n"
+"    "
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr "Instalación de módulos de gestión del conocimiento"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr "Manual calidad"
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr "Repositorios compartidos (WebDAV)"
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+"Crea un esqueleto de FAQ internas prerellenadas con documentación sobre el "
+"sistema de gestión documental de OpenERP."
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr "FAQ internas"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "Contenido colaborativo"
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr "Configuración aplicación del conocimiento"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr "conocimiento.instalador"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
+msgstr "Configure su aplicación de gestión del conocimiento"
+
+#. module: knowledge
+#: help:knowledge.installer,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 ""
+"Le permite crear páginas wiki y grupos de páginas para no perder de vista el "
+"conocimiento del negocio y compartirlo con y entre sus empleados."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr "Plantillas contenido"
diff --git a/addons/knowledge/i18n/es_VE.po b/addons/knowledge/i18n/es_VE.po
new file mode 100644
index 00000000000..2411aa00f7e
--- /dev/null
+++ b/addons/knowledge/i18n/es_VE.po
@@ -0,0 +1,169 @@
+# 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-27 08:12+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Conocimiento"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr "Crea un esqueleto de ejemplo para un manual de calidad estándar."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr "Comparta información con la compañía con estos módulos específicos."
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr "Repositorios compartidos (FTP)"
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr "Sistema de Gestión del Conocimiento"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr "Contenido colaborativo (Wiki)"
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+"Proporciona un acceso FTP al sistema de gestión documental de OpenERP. Le "
+"permite acceder a los adjuntos y a los documentos virtuales a través de un "
+"cliente FTP estándar."
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+"Proporciona un acceso WebDAV al sistema de gestión documental de OpenERP. Le "
+"permite acceder a los archivos adjuntos y a los documentos virtuales a "
+"través de su navegador de archivos habitual."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+"Instalador para las herramientas relacionadas con la gestión del "
+"conocimiento\n"
+"    "
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr "Instalación de módulos de gestión del conocimiento"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr "Manual calidad"
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr "Repositorios compartidos (WebDAV)"
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+"Crea un esqueleto de FAQ internas prerellenadas con documentación sobre el "
+"sistema de gestión documental de OpenERP."
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr "FAQ internas"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "Contenido colaborativo"
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr "Configuración aplicación del conocimiento"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr "conocimiento.instalador"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
+msgstr "Configure su aplicación de gestión del conocimiento"
+
+#. module: knowledge
+#: help:knowledge.installer,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 ""
+"Le permite crear páginas wiki y grupos de páginas para no perder de vista el "
+"conocimiento del negocio y compartirlo con y entre sus empleados."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr "Plantillas contenido"
diff --git a/addons/knowledge/i18n/et.po b/addons/knowledge/i18n/et.po
index 89197b0e9b6..eb3c7328343 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -127,6 +127,7 @@ msgid "Image"
 msgstr "Pilt"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
@@ -152,22 +153,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Mooduli nimi peab olema unikaalne !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Viga! Te ei saa luua rekursiivset menüüd."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Välja suurus ei saa olla kunagi väiksem kui 1"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objekti nimi peab algama x_ ja ei tohi sisaldada erimärke!"
diff --git a/addons/knowledge/i18n/fi.po b/addons/knowledge/i18n/fi.po
index 39621410b76..6c3334292dd 100644
--- a/addons/knowledge/i18n/fi.po
+++ b/addons/knowledge/i18n/fi.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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
-msgstr ""
+msgstr "Tietämys"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_quality_manual:0
@@ -54,6 +54,9 @@ msgid ""
 "Provides an FTP access to your OpenERP's Document Management System. It lets "
 "you access attachments and virtual documents through a standard FTP client."
 msgstr ""
+"Luo FTP yhteyden OpenERP dokumentinhallintajärjestelmääsi. Mahdollistaa "
+"liitetiedostojen haun ja virtuaalidokumentit normaalin FTP asiakasohjelman "
+"avulla."
 
 #. module: knowledge
 #: help:knowledge.installer,document_webdav:0
@@ -62,11 +65,14 @@ msgid ""
 "you access attachments and virtual documents through your standard file "
 "browser."
 msgstr ""
+"Mahdollistaa WebDAV pääsyn dokumentinhallintajärjestelmääsi. Mahdollistaa "
+"liitetiedostojen haun ja virtuaalidokumentit normaalin tiedostonhallinan "
+"kautta."
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: knowledge
 #: view:knowledge.installer:0
@@ -79,11 +85,13 @@ msgid ""
 "Installer for knowledge-based tools\n"
 "    "
 msgstr ""
+"Tietopohjaisten työkalujen asennusohjelma\n"
+"    "
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
@@ -103,7 +111,7 @@ msgstr ""
 #. module: knowledge
 #: field:knowledge.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_faq:0
@@ -115,12 +123,12 @@ msgstr ""
 #. module: knowledge
 #: field:knowledge.installer,wiki_faq:0
 msgid "Internal FAQ"
-msgstr ""
+msgstr "sisäinen UKK"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr ""
+msgstr "Yhteistyösisältö"
 
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
@@ -128,6 +136,7 @@ msgid "Image"
 msgstr "Kuva"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
@@ -152,4 +161,4 @@ msgstr ""
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Content templates"
-msgstr ""
+msgstr "Sisältöpohjat"
diff --git a/addons/knowledge/i18n/fr.po b/addons/knowledge/i18n/fr.po
index 6ce04b65ac7..08abfcd1918 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -136,6 +136,7 @@ msgid "Image"
 msgstr "Image"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Configuration de l'application de gestion des connaissances"
diff --git a/addons/knowledge/i18n/gl.po b/addons/knowledge/i18n/gl.po
index 86777b25035..316428aae51 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +137,7 @@ msgid "Image"
 msgstr "Imaxe"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Configuración da aplicación do coñecemento"
diff --git a/addons/knowledge/i18n/hi.po b/addons/knowledge/i18n/hi.po
index 0a169adf8f3..0e22f4e5b18 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -127,6 +127,7 @@ msgid "Image"
 msgstr "चित्र"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
@@ -152,9 +153,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "संरचना देखने के लिए अमान्य XML!"
diff --git a/addons/knowledge/i18n/hr.po b/addons/knowledge/i18n/hr.po
index 61dba57c1f3..370cc5be649 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -135,6 +135,7 @@ msgid "Image"
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
diff --git a/addons/knowledge/i18n/hu.po b/addons/knowledge/i18n/hu.po
index a15786c7f53..d8cbeb24c33 100644
--- a/addons/knowledge/i18n/hu.po
+++ b/addons/knowledge/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-01 10:13+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +138,7 @@ msgid "Image"
 msgstr "Kép"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Tudás kezelő programok beállítása"
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index 372eacaeba8..5bca6111d73 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-23 12:03+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -46,7 +46,7 @@ msgstr "Sistema gestione Know How"
 #. module: knowledge
 #: field:knowledge.installer,wiki:0
 msgid "Collaborative Content (Wiki)"
-msgstr ""
+msgstr "Contenuto collaborativo (Wiki)"
 
 #. module: knowledge
 #: help:knowledge.installer,document_ftp:0
@@ -109,7 +109,7 @@ msgstr "Depositi condivisi (WebDAV)"
 #. module: knowledge
 #: field:knowledge.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Avanzamento Configurazione"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_faq:0
@@ -134,6 +134,7 @@ msgid "Image"
 msgstr "Imagine"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
@@ -159,24 +160,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
diff --git a/addons/knowledge/i18n/lo.po b/addons/knowledge/i18n/lo.po
new file mode 100644
index 00000000000..5c48afb4e09
--- /dev/null
+++ b/addons/knowledge/i18n/lo.po
@@ -0,0 +1,164 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-19 09:09+0000\n"
+"Last-Translator: Phoxaysy <Unknown>\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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "ການຄຸ້ມຄອງເອກະສານ"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr "ສ້າງໂຄງຮ່າງຕົວຢ່າງເພື່ອຄູ່ມືທີ່່ມີມາດຕະຖານ"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr "ນຳໃຊ້ຂໍ້ມູນຮ່ວມກັນໄພໃນບໍລິສັດກັບ Addons ເຫລົ່ານີ້."
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr "ເກັບຂໍ້ມູນທີ່ໃຊ້ຮ່ວມກັນ(FTP)"
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr "ລະບົບການຄຸ້ມຄອງເອກະສານ"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr "ເນື່ອໃນການເຮັດວຽກຮ່ວມກັນ(wiki)"
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+"ນຳໃຊ້ໂປລແກລມ FTP ເຂົ້າຫາລະບົບການຄູ້ມຄອງອກະສານ OpenERP ຂອງທ່ານ. "
+"ມັນຊ່ວຍໃຫ້ທ່ານເຂົ້າຫາຂໍ້ມູນ ແລະ  ເອກະສານຕ່າງໆຄືກັນກັບທ່ານຢູ່ໃນໜ່ວຍ computer "
+"ຂອງທ່ານເອງ"
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+"ນຳໃຊ້ໂປລແກລມ WebDAV  ເຂົ້າຫາລະບົບການຄູ້ມຄອງອກະສານ OpenERP ຂອງທ່ານ. "
+"ມັນຊ່ວຍໃຫ້ທ່ານເຂົ້າຫາຂໍ້ມູນ ແລະ  ເອກະສານຕ່າງໆຜ່ານ Browser ທີ່ມີມາດຕະຖານ."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure"
+msgstr "ສ້ອມຕັ້້ງ"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "ຫົວຂໍ້:"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+"ຕິດຕັ້ງເຄື່ອງມືພື້ນຖານຂອງການຸ້ມຄອງເອກະສານ\n"
+"    "
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "ການກໍານົດຄ່າ"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr "ການຕິດຕັ້ງໂມດຸນຂອງການຄຸ້ມຄອງເອກະສານ"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr "ຄູ່ມືຄຸນນະພາບ"
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr "ເກັບຄືນຂໍ້ມູນທີ່ໃຊ້ຮ່ວມກັນ(WebDAV)"
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "ຄວາມຕໍ່ເນື່ອງໃນການກຳນົດຄ່າ"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+"ສ້າງໂຄງຮ່າງຂ້າງໃນFAQ ກ່ອນທີ່ເຕັມດ້ວຍເອກະສານກ່ຽວກັບການຈັດການເອກະສານ ERP"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr "ຂ້າງໃນFAQ"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "ເນື້ອໃນການເຮັດວຽກຮ່ວມກັນ"
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "ຮູບພາບ"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr "ການນຳໃຊ້ການຕັ້ງຄ່າເອກະສານ"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr "ການຕິດຕັ້ງເອກະສານ"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
+msgstr "ຕັ້ງຄ່າການນຳໃຊ້ເອກະສານຂອງທ່ານ"
+
+#. module: knowledge
+#: help:knowledge.installer,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 ""
+"ສ້າງໜ້າWiki ແລະ ໜ້າກູ່ມເພື່ອຕິດຕາມເອກະສານທາງທລະກິດ ແລະ ລະຫວ່າງພະນັກງານຂອງທ່ານ"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr "ເນື້ອໃນແມ່ແບບ"
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index 1f23127b3db..6fa70bc48e5 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -135,6 +135,7 @@ msgid "Image"
 msgstr "Зураг"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Баримтын програмын тохиргоо"
@@ -162,40 +163,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Агуулгын загвар"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Templates of Content"
-#~ msgstr "Агуулгын загвар"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр заасан байна."
-
-#~ msgid ""
-#~ "Provides an FTP access to your OpenERP's Document Management System. Lets "
-#~ "you access attachments and virtual documents through a standard FTP client."
-#~ msgstr ""
-#~ "OpenERP-н Баримтын удирдлагын систем рүү FTP хандалт гаргана. Стандарт FTP "
-#~ "програм ашиглан хавсралт, баримтууд руу хандах боломжтой болно."
-
-#~ msgid "Launch"
-#~ msgstr "Ачаалах"
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index c0583176ebc..2c637329ec6 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -135,6 +135,7 @@ msgid "Image"
 msgstr "Afbeelding"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Kennis applicatie configuratie"
@@ -162,39 +163,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Inhoud sjablonen"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief Menu maken."
-
-#~ msgid "Launch"
-#~ msgstr "Opstarten"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Templates of Content"
-#~ msgstr "Inhoudssjablonen"
-
-#~ msgid ""
-#~ "Provides an FTP access to your OpenERP's Document Management System. Lets "
-#~ "you access attachments and virtual documents through a standard FTP client."
-#~ msgstr ""
-#~ "Voorziet in FTP toegang tot uw OpenERP Document Management Systeem. Laat u "
-#~ "bijlagen en virtuele documenten benaderen via een standaard FTP client."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
diff --git a/addons/knowledge/i18n/pl.po b/addons/knowledge/i18n/pl.po
index 75dbd93892e..a995c5343ab 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -127,6 +127,7 @@ msgid "Image"
 msgstr "Obraz"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
@@ -152,24 +153,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Launch"
-#~ msgstr "Uruchom"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Templates of Content"
-#~ msgstr "Szablony zawartości"
diff --git a/addons/knowledge/i18n/pt.po b/addons/knowledge/i18n/pt.po
index 8cbe038a118..8b824015b2a 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +137,7 @@ msgid "Image"
 msgstr "Imagem"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Configuração da aplicação Conhecimento"
@@ -164,27 +165,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Modelos de conteudo"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objecto deve começar com x_ e não pode conter nenhum caractere "
-#~ "especial!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitectura da vista"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index abb17940eb5..b7a52fe5910 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -139,6 +139,7 @@ msgid "Image"
 msgstr "Imagem"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Configuração da Aplicação de Conhecimento"
@@ -166,27 +167,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Modelos de Conteúdo"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/knowledge/i18n/ro.po b/addons/knowledge/i18n/ro.po
index 14a07151c8c..324807c8e13 100644
--- a/addons/knowledge/i18n/ro.po
+++ b/addons/knowledge/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-20 20:11+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -138,6 +138,7 @@ msgid "Image"
 msgstr "Imagine"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
diff --git a/addons/knowledge/i18n/ru.po b/addons/knowledge/i18n/ru.po
index 0b7ed73d7bb..d32fbce39e0 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +137,7 @@ msgid "Image"
 msgstr "Изображение"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Настройка приложения Knowledge"
@@ -157,34 +158,10 @@ 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 ""
-"Позволяет вам создавать wiki-страницы и группы страниц, чтобы отслеживать "
-"ваши бизнес-знания и делиться ими с вашими сотрудниками."
+"Позволяет создавать wiki-страницы и группы страниц, чтобы отслеживать бизнес-"
+"знания и делиться ими с сотрудниками."
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Шаблоны содержимого"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для структуры вида!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
diff --git a/addons/knowledge/i18n/sk.po b/addons/knowledge/i18n/sk.po
index ae6a0f28a65..6b45c9984ee 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -127,6 +127,7 @@ msgid "Image"
 msgstr "Obrázok"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
diff --git a/addons/knowledge/i18n/sr.po b/addons/knowledge/i18n/sr.po
index b0c4033888c..0d92db4ebc1 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +137,7 @@ msgid "Image"
 msgstr "Slika"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Konfiguracija Aplikacije Znanja"
@@ -164,17 +165,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Obrasci Sadrzaja"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime Objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture"
diff --git a/addons/knowledge/i18n/sr@latin.po b/addons/knowledge/i18n/sr@latin.po
index 4e78bd8654f..489ee695135 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -137,6 +137,7 @@ msgid "Image"
 msgstr "Slika"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Konfiguracija Aplikacije Znanja"
@@ -164,17 +165,3 @@ msgstr ""
 #: view:knowledge.installer:0
 msgid "Content templates"
 msgstr "Obrasci Sadrzaja"
-
-#~ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture"
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index c31d2bc3548..eceec4bb4fa 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -127,6 +127,7 @@ msgid "Image"
 msgstr "Bild"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
diff --git a/addons/knowledge/i18n/tr.po b/addons/knowledge/i18n/tr.po
index 4a0de99f0c0..c0ef9b3c12d 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -135,6 +135,7 @@ msgid "Image"
 msgstr "Resim"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr "Bilgi Birikimi Uygulama Ayarları"
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index 96e4df86284..c2ae6fb3b1c 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -45,14 +45,14 @@ msgstr "知识管理系统"
 #. module: knowledge
 #: field:knowledge.installer,wiki:0
 msgid "Collaborative Content (Wiki)"
-msgstr "协作编辑内容（维基）"
+msgstr "协作编辑（维基 Wiki）"
 
 #. module: knowledge
 #: help:knowledge.installer,document_ftp:0
 msgid ""
 "Provides an FTP access to your OpenERP's Document Management System. It lets "
 "you access attachments and virtual documents through a standard FTP client."
-msgstr "提供 FTP 方式访问您的 OpenERP 文档管理系统。您可以通过标准的 FTP 客户端访问系统中的附件和虚拟文档。"
+msgstr "提供 FTP 方式访问您的系统文档管理系统。您可以通过标准的 FTP 客户端访问系统中的附件和虚拟文档。"
 
 #. module: knowledge
 #: help:knowledge.installer,document_webdav:0
@@ -60,17 +60,17 @@ msgid ""
 "Provides a WebDAV access to your OpenERP's Document Management System. Lets "
 "you access attachments and virtual documents through your standard file "
 "browser."
-msgstr "提供 WebDAV 方式访问您的 OpenERP 文档管理系统。您可以通过标准的 Web 浏览器访问系统中的附件和虚拟文档。"
+msgstr "提供 WebDAV 方式访问您的系统的文档管理系统。您可以通过标准的 Web 浏览器访问系统中的附件和虚拟文档。"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr "配置"
+msgstr "设置"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "title"
-msgstr "title"
+msgstr "标题"
 
 #. module: knowledge
 #: model:ir.module.module,description:knowledge.module_meta_information
@@ -84,7 +84,7 @@ msgstr ""
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr "配置"
+msgstr "设置"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
@@ -104,14 +104,14 @@ msgstr "共享仓库（WebDAV）"
 #. module: knowledge
 #: field:knowledge.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_faq:0
 msgid ""
 "Creates a skeleton internal FAQ pre-filled with documentation about "
 "OpenERP's Document Management System."
-msgstr "创建一个使用关于 OpenERP 文档管理系统的常见问题解答作为内容填充的骨架"
+msgstr "创建一个使用关于系统的文档管理系统的常见问题解答(FAQ)作为内容填充的骨架。"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_faq:0
@@ -121,17 +121,18 @@ msgstr "内部 FAQ"
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr "可协作内容"
+msgstr "协作编辑"
 
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
 msgid "Image"
-msgstr "图片"
+msgstr "图像"
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
-msgstr "知识管理应用配置"
+msgstr "知识管理应用设置"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_installer
@@ -141,14 +142,14 @@ msgstr "knowledge.installer"
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure Your Knowledge Application"
-msgstr "配置您的知识管理应用"
+msgstr "设置您的知识管理应用"
 
 #. module: knowledge
 #: help:knowledge.installer,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: knowledge
 #: view:knowledge.installer:0
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
deleted file mode 100644
index 0f6b29597de..00000000000
--- a/addons/knowledge/installer.py
+++ /dev/null
@@ -1,52 +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 osv import fields, osv
-
-class knowledge_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Knowledge Management
-        'document_ftp':fields.boolean('Shared Repositories (FTP)',
-            help="Provides an FTP access to your OpenERP's "
-                "Document Management System. It lets you access attachments "
-                "and virtual documents through a standard FTP client."),
-        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
-            help="Provides a WebDAV access to your OpenERP's Document "
-                 "Management System. Lets you access attachments and "
-                 "virtual documents through your standard file browser."),
-        'wiki':fields.boolean('Collaborative Content (Wiki)',
-            help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-        # Content templates
-        'wiki_faq':fields.boolean('Template: Internal FAQ',
-            help="Creates a skeleton internal FAQ pre-filled with "
-                 "documentation about OpenERP's Document Management "
-                 "System."),
-        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
-            help="Creates an example skeleton for a standard quality manual."),
-        }
-    _defaults = {
-        'document_ftp':True,
-        }
-
-knowledge_installer()
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
deleted file mode 100644
index d9a4a45df66..00000000000
--- a/addons/knowledge/knowledge_installer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_knowledge_installer" model="ir.ui.view">
-      <field name="name">knowledge.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='knowledge']" position="replace">
-            <newline/>
-            <separator  string="Knowledge Management Features" colspan="4" />
-            <field name="document_ftp" />
-            <field name="document_webdav" />
-            <field name="wiki" />
-            <field name="wiki_faq" />
-            <field name="wiki_quality_manual" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/l10n_at/__init__.py b/addons/l10n_at/__init__.py
index b3516a699d9..a295fe1bd73 100644
--- a/addons/l10n_at/__init__.py
+++ b/addons/l10n_at/__init__.py
@@ -19,4 +19,6 @@
 #
 ##############################################################################
 
-import account_wizard
\ No newline at end of file
+import account_wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 6c8e8b5eda3..570841374d8 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : "conexus.at",
 	"website" : "http://www.conexus.at",
-    "category" : "Localisation/Account Charts",
+    "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" : [],
@@ -33,3 +33,5 @@
     "installable": True
 }
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_at/account_chart.xml b/addons/l10n_at/account_chart.xml
index fdebb42ec3b..6e49ef357e4 100644
--- a/addons/l10n_at/account_chart.xml
+++ b/addons/l10n_at/account_chart.xml
@@ -61,6 +61,7 @@
 		<record model="account.account.type" id="account_type_equity">
 		  <field name="name">Eigenkapital</field>
 		  <field name="code">equity</field>
+		  <field name="report_type">liability</field>
 		  <field name="close_method">balance</field>
 		</record>
 			
diff --git a/addons/l10n_at/account_wizard.py b/addons/l10n_at/account_wizard.py
index cf63b2c5dc3..15b0735b9ca 100644
--- a/addons/l10n_at/account_wizard.py
+++ b/addons/l10n_at/account_wizard.py
@@ -32,3 +32,5 @@ class AccountWizard_cd(osv.osv_memory):
 
 AccountWizard_cd()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 6fd486f06fb..d4300186660 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {   'name': 'Belgium - Plan Comptable Minimum Normalise',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Belgium in OpenERP.
 ==============================================================================
@@ -42,27 +42,27 @@ Wizards provided by this module:
     """,
     'author': 'OpenERP SA',
     'depends': [
-                'account',
-                'base_vat',
-                'base_iban',
-                'account_chart',
-                'account_coda',
-                ],
+        'account',
+        'base_vat',
+        'base_iban',
+        'account_chart',
+        'account_coda',
+    ],
     'init_xml': [],
     'update_xml': [
-                'account_pcmn_belgium.xml',
-                'account_tax_code_template.xml',
-                'account_chart_template.xml',
-                'account_tax_template.xml',
-                'l10n_be_wizard.xml',
-                'wizard/l10n_be_account_vat_declaration_view.xml',
-                'wizard/l10n_be_vat_intra_view.xml',
-                'wizard/l10n_be_partner_vat_listing.xml',
-                'l10n_be_sequence.xml',
-                'fiscal_templates.xml',
-                'account_fiscal_position_tax_template.xml',
-                'security/ir.model.access.csv'
-                   ],
+        'account_pcmn_belgium.xml',
+        'account_tax_code_template.xml',
+        'account_chart_template.xml',
+        'account_tax_template.xml',
+        'wizard/l10n_be_account_vat_declaration_view.xml',
+        'wizard/l10n_be_vat_intra_view.xml',
+        'wizard/l10n_be_partner_vat_listing.xml',
+        'l10n_be_sequence.xml',
+        'fiscal_templates.xml',
+        'account_fiscal_position_tax_template.xml',
+        'security/ir.model.access.csv',
+        'l10n_be_wizard.yml'
+    ],
     'demo_xml': [],
     'installable': True,
     'certificate': '0031977724637',
diff --git a/addons/l10n_be/account_tax_template.xml b/addons/l10n_be/account_tax_template.xml
index a4d42779a97..d72b093b5f8 100644
--- a/addons/l10n_be/account_tax_template.xml
+++ b/addons/l10n_be/account_tax_template.xml
@@ -6,7 +6,7 @@
         <record id="attn_VAT-OUT-21-S" model="account.tax.template">
             <field name="sequence">10</field>
             <field name="description">VAT-OUT-21-S</field>
-            <field name="name">VAT 21%</field>
+            <field name="name">VAT 21% - Services</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -48,7 +48,7 @@
         <record id="attn_VAT-OUT-12-S" model="account.tax.template">
             <field name="sequence">20</field>
             <field name="description">VAT-OUT-12-S</field>
-            <field name="name">VAT 12%</field>
+            <field name="name">VAT 12% - Services</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -90,7 +90,7 @@
         <record id="attn_VAT-OUT-06-S" model="account.tax.template">
             <field name="sequence">30</field>
             <field name="description">VAT-OUT-06-S</field>
-            <field name="name">VAT 6%</field>
+            <field name="name">VAT 6% - Services</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -132,7 +132,7 @@
         <record id="attn_VAT-OUT-00-S" model="account.tax.template">
             <field name="sequence">40</field>
             <field name="description">VAT-OUT-00-S</field>
-            <field name="name">VAT 0%</field>
+            <field name="name">VAT 0% - Services</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -2070,7 +2070,7 @@
         <record id="attn_VAT-IN-V82-CAR-EXC-C2" model="account.tax.template">
             <field name="sequence">722</field>
             <field name="description">VAT-IN-V82-CAR-EXC-C2</field>
-            <field name="name">Frais de voiture - VAT 50% Deductible</field>
+            <field name="name">Frais de voiture - VAT 50% Deductible (Price Excl.)</field>
             <field name="parent_id" ref="attn_VAT-IN-V82-CAR-EXC"/>
             <field name="account_collected_id" ref="a411059"/>
             <field name="account_paid_id" ref="a411059"/>
@@ -2090,7 +2090,7 @@
         <record id="attn_VAT-IN-V82-CAR-EXC-C3" model="account.tax.template">
             <field name="sequence">723</field>
             <field name="description">VAT-IN-V82-CAR-EXC-C3</field>
-            <field name="name">Frais de voiture - Montant de la note de crédit</field>
+            <field name="name">Frais de voiture - Montant de la note de crédit (Price Excl.)</field>
             <field name="parent_id" ref="attn_VAT-IN-V82-CAR-EXC"/>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
diff --git a/addons/l10n_be/i18n/ar.po b/addons/l10n_be/i18n/ar.po
index 6951234ada2..ce4c7005e05 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/bg.po b/addons/l10n_be/i18n/bg.po
index e64e84c0db1..d52b67aa080 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/bs.po b/addons/l10n_be/i18n/bs.po
index 165cc403b4b..3fa2933c58d 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/ca.po b/addons/l10n_be/i18n/ca.po
index d39a6fa8946..765b8d1d825 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/cs.po b/addons/l10n_be/i18n/cs.po
index 05d87fda7e1..40eac6d276f 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/de.po b/addons/l10n_be/i18n/de.po
index ca6658cb201..447ad6e093e 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: 2011-06-25 04:58+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index 725a5feab3f..5a08b1ec659 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/es_AR.po b/addons/l10n_be/i18n/es_AR.po
index 439e6cf70fd..1b84f79f4af 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/es_MX.po b/addons/l10n_be/i18n/es_MX.po
new file mode 100644
index 00000000000..10ba029fe83
--- /dev/null
+++ b/addons/l10n_be/i18n/es_MX.po
@@ -0,0 +1,636 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_be
+#
+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-18 01:20+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:29+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_be
+#: field:partner.vat,test_xml:0
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
+msgstr "Prueba de archivo XML"
+
+#. module: l10n_be
+#: field:vat.listing.clients,name:0
+msgid "Client Name"
+msgstr "Nombre del cliente"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "El archivo XML ha sido creado."
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr "Ninguna empresa tiene un número fiscal (CIF) asociado."
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Se produjo un error! No pueden crearse empresas en forma recursiva."
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr "¡No hay número de CIF asociado a la compañía principal!"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Create XML"
+msgstr "Crear XML"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr "Guardar el archivo con extensión '.xml'."
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr "Guardar XML"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:150
+#, python-format
+msgid "Save"
+msgstr "Guardar"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_vat_listing_clients
+msgid "vat.listing.clients"
+msgstr "vat.listado.clientes"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list,msg:0
+msgid "File created"
+msgstr "Archivo creado"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:116
+#, python-format
+msgid "Save XML For Vat declaration"
+msgstr "Guardar XML para la declaración del IVA"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr "El código del periodo que ha introducido no es válido."
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_resitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr "Indica si hay que realizar la restitución o no"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr "Declaración de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
+msgstr "Empresa sin CIF/NIF"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list
+msgid "partner.vat.list"
+msgstr "partner.vat.list"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr "Listado anual de clientes sujetos a IVA"
+
+#. module: l10n_be
+#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
+msgid "Belgium - Plan Comptable Minimum Normalise"
+msgstr "Bélgica - Plan Contable mínimo Normalizado"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "Select Fiscal Year"
+msgstr "Seleccionar ejercicio fiscal"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_resitution:0
+msgid "Ask Restitution"
+msgstr "Pedir restitución"
+
+#. 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 "Empresa de IVA Intra"
+
+#. 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 "Periodo de declaración de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Note: "
+msgstr "Nota "
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. module: l10n_be
+#: view:vat.listing.clients:0
+msgid "VAT listing"
+msgstr "Listado de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr "Periodos"
+
+#. module: l10n_be
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr "Establece la salida XML como archivo de pruebas."
+
+#. module: l10n_be
+#: field:partner.vat,limit_amount:0
+msgid "Limit Amount"
+msgstr "Importe límite"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Ok"
+msgstr "Acceptar"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid ""
+"This wizard will create an XML file for Vat details and total invoiced "
+"amounts per partner."
+msgstr ""
+"Este asistente creará un archivo XML para la información relativa al IVA y "
+"el total de los importes facturados por empresa."
+
+#. 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 ""
+"La empresa cuyo CIF/NIF no esté definido no se incluye en el fichero XML."
+
+#. module: l10n_be
+#: field:vat.listing.clients,vat:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: l10n_be
+#: field:vat.listing.clients,country:0
+msgid "Country"
+msgstr "País"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
+msgstr "Clientes"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid ""
+"Tick this case only if it concerns only the last statement on the civil or "
+"cessation of activity"
+msgstr ""
+"Marque esta opción sólo si incumbe a la última declaración civil o de cese "
+"de actividad."
+
+#. 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 ""
+"Seleccione los periodos que desea incluir en su declaración intracomunitaria."
+
+#. module: l10n_be
+#: field:vat.listing.clients,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Is Last Declaration"
+msgstr "Es la última declaración"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat
+msgid "partner.vat"
+msgstr "empresa.vat"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr "Última declaración de empresa"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr "Indica si un pago se ha realizado o no"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "Data Insufficient"
+msgstr "Dato insuficiente"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr "Declaraciones de Bélgica"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr "IVA empresa intracomunitaria"
+
+#. module: l10n_be
+#: field:vat.listing.clients,turnover:0
+msgid "Turnover"
+msgstr "Volumen de negocio"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
+msgstr "Declarar IVA periódico"
+
+#. module: l10n_be
+#: help:partner.vat,mand_id:0
+#: help:partner.vat.intra,mand_id:0
+msgid ""
+"This identifies the representative of the sending company. This is a string "
+"of 14 characters"
+msgstr ""
+"Esto identifica el representante de la compañía emisora. Es es una cadena de "
+"14 caracteres."
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
+msgstr "Guardar XML"
+
+#. module: l10n_be
+#: field:partner.vat,mand_id:0
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr "Id Mandatario"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list,file_save:0
+msgid "Save File"
+msgstr "Guardar archivo"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_code:0
+msgid ""
+"This is where you have to set the period code for the intracom declaration "
+"using the format: ppyyyy\n"
+"      PP can stand for a month: from '01' to '12'.\n"
+"      PP can stand for a trimester: '31','32','33','34'\n"
+"          The first figure means that it is a trimester,\n"
+"          The second figure identify the trimester.\n"
+"      PP can stand for a complete fiscal year: '00'.\n"
+"      YYYY stands for the year (4 positions).\n"
+"    "
+msgstr ""
+"Aquí debe definir el código de periodo para la declaración intracomunitaria "
+"usando el formato:ppyyyy\n"
+"     pp puede ser un mes: del '01' al '12',\n"
+"     pp puede ser un trimestre: '31', '32', '33', '34',\n"
+"          El primer número indica que se trata de un trimestre,\n"
+"          El segundo número identifica el trimestre.\n"
+"     pp puede ser un año fiscal completo: '00'.\n"
+"     yyyy representa el año (4 posiciones).\n"
+"    "
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list,name:0
+msgid "File Name"
+msgstr "Nombre de archivo"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
+#, python-format
+msgid "Wrong Period Code"
+msgstr "Código del periodo incorrecto"
+
+#. module: l10n_be
+#: field:partner.vat,fyear:0
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
+msgstr "Declaración de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,country_ids:0
+msgid "European Countries"
+msgstr "Países europeos"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing
+#: view:partner.vat:0
+msgid "Partner VAT Listing"
+msgstr "Listado IVA empresa"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "General Information"
+msgstr "Información General"
+
+#. module: l10n_be
+#: help:partner.vat.list,partner_ids:0
+msgid ""
+"You can remove clients/partners which you do not want to show in xml file"
+msgstr ""
+"Puede eliminar clientes/empresas que no quiere mostrar en el archivo xml."
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid ""
+"You can remove clients/partners which you do not want in exported xml file"
+msgstr ""
+"Puede eliminar clientes/empresas que no quiere en el archivo xml exportado"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Create an XML file for Vat Intra"
+msgstr "Crear un archivo XML para el IVA intracomunitario"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr "Código del periodo"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr "Solicitar pago"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "View Client"
+msgstr "Ver cliente"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
+#, python-format
+msgid "Please select at least one Period."
+msgstr "Seleccione al menos un periodo."
+
+#. module: l10n_be
+#: model:ir.module.module,description:l10n_be.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the accounting chart for Belgium in "
+"OpenERP.\n"
+"\n"
+"    After Installing this module,The Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard,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 account and Bank account,currency to create Journals.\n"
+"        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"
+"\n"
+"    Wizards provided by this module:\n"
+"    * Partner VAT Intra: Enlist the partners with their related VAT and "
+"invoiced amounts.Prepares an XML file format.\n"
+"                           Path to access : Financial "
+"Management/Reporting//Legal Statements/Belgium Statements/Partner VAT "
+"Listing\n"
+"    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration "
+"of the Main company of the User currently Logged in.\n"
+"                           Path to access : Financial "
+"Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT "
+"Declaration\n"
+"    * 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\n"
+"                           Path to access : Financial "
+"Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of "
+"VAT-Subjected Customers\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar el plan contable belga en "
+"OpenERP.\n"
+"\n"
+"    Tras instalar este módulo, se ejecutará el asistente de configuración "
+"contable.\n"
+"    * Proporciona las plantillas contables que pueden ser útiles para "
+"generar planes contables.\n"
+"    * En el asistente se le pedirá el nombre de la compañía, la plantilla de "
+"cuentas a utilizar, el nº de dígitos para generar los códigos de sus cuentas "
+"y cuenta bancaria y la divisa para crear diarios.\n"
+"        De este modo se generará una copia de la plantilla de cuentas.\n"
+"    * Es el mismo asistente que se ejecuta desde "
+"'Contabilidad/Configuración/Contabilidad Financiera/Plantillas/Generar plan "
+"contable desde una plantilla de plan contable.\n"
+"    Asistentes que incluye este módulo:\n"
+"    * Listado de empresas: Lista las empresas con su CIF y cantidades "
+"facturadas. Prepara un fichero XML.\n"
+"                           Ruta de acceso: Contabilidad/Informes/Informes "
+"legales/Informes Belgas/Listado de empresas con CIF\n"
+"    * Declaración periódica del IVA: Prepara un fichero XML para la "
+"declaración del IVA de la compañía del usuario actualmente conectado.\n"
+"                           Ruta de acceso: Contabilidad/Informes/Informes "
+"legales/Informes Belgas/Declaración periódica del IVA\n"
+"    * Listado anual de clientes sujetos a IVA: Prepara un fichero XML para "
+"la declaración del IVA de la compañía principal del usuario actualmente "
+"conectado. Basado en el ejercicio fiscal.\n"
+"                           Ruta de acceso: Contabilidad/Informes/Informes "
+"legales/Informes Belgas/Listado anual de clientes sujetos a IVA\n"
+"\n"
+"    "
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr "Empresa IVA intra"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
+msgstr "Periodo (s)"
+
+#~ msgid "Tiers"
+#~ msgstr "Niveles"
+
+#~ msgid "Oct/Nov/Dec"
+#~ msgstr "Oct/Nov/Dic"
+
+#~ msgid "Trimester Number"
+#~ msgstr "Número de trimestre"
+
+#~ msgid "Notification"
+#~ msgstr "Notificación"
+
+#~ msgid "Tiers - Recevable"
+#~ msgstr "Niveles - Recibible"
+
+#~ msgid "Immobilisation"
+#~ msgstr "Inmovilización"
+
+#~ msgid "Apr/May/Jun"
+#~ msgstr "Abr/May/Jun"
+
+#~ msgid "Jul/Aug/Sep"
+#~ msgstr "Jul/Ago/Sep"
+
+#~ msgid "This wizard will create an XML file for Vat Intra"
+#~ msgstr "Este asistente creará un archivo XML para el IVA Intra"
+
+#~ msgid "Capital"
+#~ msgstr "Capital"
+
+#~ msgid "Charge"
+#~ msgstr "Cargo"
+
+#~ msgid "Select Period"
+#~ msgstr "Seleccionar periodo"
+
+#~ msgid "Régime Extra-Communautaire"
+#~ msgstr "Régimen Extra-comunitario"
+
+#~ msgid "Régime National"
+#~ msgstr "Régimen Nacional"
+
+#~ msgid "Tiers - Payable"
+#~ msgstr "Niveles - Cuenta por pagar"
+
+#~ msgid "Annual Listing of VAT-Subjected Customers"
+#~ msgstr "Anual de venta de IVA Sometido para Clientes"
+
+#~ msgid "XML Flie has been Created."
+#~ msgstr "El archivo XML ha sido creado"
+
+#~ msgid "Régime Intra-Communautaire"
+#~ msgstr "Régimen Intra-Comunitario"
+
+#~ msgid "Financier"
+#~ msgstr "Finanza"
+
+#~ msgid "Jan/Feb/Mar"
+#~ msgstr "Ene/Feb/Mar"
+
+#~ msgid "Produit"
+#~ msgstr "Producido"
+
+#~ msgid "Vue"
+#~ msgstr "Vue"
+
+#~ 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 ""
+#~ "Genere el Plan contable de una Plantilla de Carta. Le pedirán pasar el "
+#~ "nombre de la empresa, la plantilla de carta para seguir, el número. de "
+#~ "dígitos para generar el código para sus cuentas y Cuenta bancaria, dinero "
+#~ "para crear Diarios. Así, como la copia de carta por la Plantilla generada.\n"
+#~ "Esto es el mismo mago que corre de la Gestión "
+#~ "financiera/configuración/Contabilidad financiera/Consideración "
+#~ "Financiera/Genera el Plan contable de una Plantilla de Carta."
+
+#~ msgid "Tax"
+#~ msgstr "Impuesto"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡Error! No puedes crear plantillas de cuentas recursivas."
+
+#~ msgid "Stock et Encours"
+#~ msgstr "Valores y pendientes"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
diff --git a/addons/l10n_be/i18n/es_VE.po b/addons/l10n_be/i18n/es_VE.po
new file mode 100644
index 00000000000..10ba029fe83
--- /dev/null
+++ b/addons/l10n_be/i18n/es_VE.po
@@ -0,0 +1,636 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_be
+#
+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-18 01:20+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:29+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_be
+#: field:partner.vat,test_xml:0
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
+msgstr "Prueba de archivo XML"
+
+#. module: l10n_be
+#: field:vat.listing.clients,name:0
+msgid "Client Name"
+msgstr "Nombre del cliente"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "El archivo XML ha sido creado."
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr "Ninguna empresa tiene un número fiscal (CIF) asociado."
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Se produjo un error! No pueden crearse empresas en forma recursiva."
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr "¡No hay número de CIF asociado a la compañía principal!"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Create XML"
+msgstr "Crear XML"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr "Guardar el archivo con extensión '.xml'."
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr "Guardar XML"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:150
+#, python-format
+msgid "Save"
+msgstr "Guardar"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_vat_listing_clients
+msgid "vat.listing.clients"
+msgstr "vat.listado.clientes"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list,msg:0
+msgid "File created"
+msgstr "Archivo creado"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:116
+#, python-format
+msgid "Save XML For Vat declaration"
+msgstr "Guardar XML para la declaración del IVA"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr "El código del periodo que ha introducido no es válido."
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_resitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr "Indica si hay que realizar la restitución o no"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr "Declaración de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
+msgstr "Empresa sin CIF/NIF"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list
+msgid "partner.vat.list"
+msgstr "partner.vat.list"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr "Listado anual de clientes sujetos a IVA"
+
+#. module: l10n_be
+#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
+msgid "Belgium - Plan Comptable Minimum Normalise"
+msgstr "Bélgica - Plan Contable mínimo Normalizado"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "Select Fiscal Year"
+msgstr "Seleccionar ejercicio fiscal"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_resitution:0
+msgid "Ask Restitution"
+msgstr "Pedir restitución"
+
+#. 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 "Empresa de IVA Intra"
+
+#. 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 "Periodo de declaración de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Note: "
+msgstr "Nota "
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. module: l10n_be
+#: view:vat.listing.clients:0
+msgid "VAT listing"
+msgstr "Listado de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr "Periodos"
+
+#. module: l10n_be
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr "Establece la salida XML como archivo de pruebas."
+
+#. module: l10n_be
+#: field:partner.vat,limit_amount:0
+msgid "Limit Amount"
+msgstr "Importe límite"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Ok"
+msgstr "Acceptar"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid ""
+"This wizard will create an XML file for Vat details and total invoiced "
+"amounts per partner."
+msgstr ""
+"Este asistente creará un archivo XML para la información relativa al IVA y "
+"el total de los importes facturados por empresa."
+
+#. 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 ""
+"La empresa cuyo CIF/NIF no esté definido no se incluye en el fichero XML."
+
+#. module: l10n_be
+#: field:vat.listing.clients,vat:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: l10n_be
+#: field:vat.listing.clients,country:0
+msgid "Country"
+msgstr "País"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
+msgstr "Clientes"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid ""
+"Tick this case only if it concerns only the last statement on the civil or "
+"cessation of activity"
+msgstr ""
+"Marque esta opción sólo si incumbe a la última declaración civil o de cese "
+"de actividad."
+
+#. 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 ""
+"Seleccione los periodos que desea incluir en su declaración intracomunitaria."
+
+#. module: l10n_be
+#: field:vat.listing.clients,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Is Last Declaration"
+msgstr "Es la última declaración"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat
+msgid "partner.vat"
+msgstr "empresa.vat"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr "Última declaración de empresa"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr "Indica si un pago se ha realizado o no"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "Data Insufficient"
+msgstr "Dato insuficiente"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr "Declaraciones de Bélgica"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr "IVA empresa intracomunitaria"
+
+#. module: l10n_be
+#: field:vat.listing.clients,turnover:0
+msgid "Turnover"
+msgstr "Volumen de negocio"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
+msgstr "Declarar IVA periódico"
+
+#. module: l10n_be
+#: help:partner.vat,mand_id:0
+#: help:partner.vat.intra,mand_id:0
+msgid ""
+"This identifies the representative of the sending company. This is a string "
+"of 14 characters"
+msgstr ""
+"Esto identifica el representante de la compañía emisora. Es es una cadena de "
+"14 caracteres."
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
+msgstr "Guardar XML"
+
+#. module: l10n_be
+#: field:partner.vat,mand_id:0
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr "Id Mandatario"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list,file_save:0
+msgid "Save File"
+msgstr "Guardar archivo"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_code:0
+msgid ""
+"This is where you have to set the period code for the intracom declaration "
+"using the format: ppyyyy\n"
+"      PP can stand for a month: from '01' to '12'.\n"
+"      PP can stand for a trimester: '31','32','33','34'\n"
+"          The first figure means that it is a trimester,\n"
+"          The second figure identify the trimester.\n"
+"      PP can stand for a complete fiscal year: '00'.\n"
+"      YYYY stands for the year (4 positions).\n"
+"    "
+msgstr ""
+"Aquí debe definir el código de periodo para la declaración intracomunitaria "
+"usando el formato:ppyyyy\n"
+"     pp puede ser un mes: del '01' al '12',\n"
+"     pp puede ser un trimestre: '31', '32', '33', '34',\n"
+"          El primer número indica que se trata de un trimestre,\n"
+"          El segundo número identifica el trimestre.\n"
+"     pp puede ser un año fiscal completo: '00'.\n"
+"     yyyy representa el año (4 posiciones).\n"
+"    "
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list,name:0
+msgid "File Name"
+msgstr "Nombre de archivo"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
+#, python-format
+msgid "Wrong Period Code"
+msgstr "Código del periodo incorrecto"
+
+#. module: l10n_be
+#: field:partner.vat,fyear:0
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
+msgstr "Declaración de IVA"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,country_ids:0
+msgid "European Countries"
+msgstr "Países europeos"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing
+#: view:partner.vat:0
+msgid "Partner VAT Listing"
+msgstr "Listado IVA empresa"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "General Information"
+msgstr "Información General"
+
+#. module: l10n_be
+#: help:partner.vat.list,partner_ids:0
+msgid ""
+"You can remove clients/partners which you do not want to show in xml file"
+msgstr ""
+"Puede eliminar clientes/empresas que no quiere mostrar en el archivo xml."
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid ""
+"You can remove clients/partners which you do not want in exported xml file"
+msgstr ""
+"Puede eliminar clientes/empresas que no quiere en el archivo xml exportado"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Create an XML file for Vat Intra"
+msgstr "Crear un archivo XML para el IVA intracomunitario"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr "Código del periodo"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr "Solicitar pago"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "View Client"
+msgstr "Ver cliente"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
+#, python-format
+msgid "Please select at least one Period."
+msgstr "Seleccione al menos un periodo."
+
+#. module: l10n_be
+#: model:ir.module.module,description:l10n_be.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the accounting chart for Belgium in "
+"OpenERP.\n"
+"\n"
+"    After Installing this module,The Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard,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 account and Bank account,currency to create Journals.\n"
+"        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"
+"\n"
+"    Wizards provided by this module:\n"
+"    * Partner VAT Intra: Enlist the partners with their related VAT and "
+"invoiced amounts.Prepares an XML file format.\n"
+"                           Path to access : Financial "
+"Management/Reporting//Legal Statements/Belgium Statements/Partner VAT "
+"Listing\n"
+"    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration "
+"of the Main company of the User currently Logged in.\n"
+"                           Path to access : Financial "
+"Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT "
+"Declaration\n"
+"    * 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\n"
+"                           Path to access : Financial "
+"Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of "
+"VAT-Subjected Customers\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar el plan contable belga en "
+"OpenERP.\n"
+"\n"
+"    Tras instalar este módulo, se ejecutará el asistente de configuración "
+"contable.\n"
+"    * Proporciona las plantillas contables que pueden ser útiles para "
+"generar planes contables.\n"
+"    * En el asistente se le pedirá el nombre de la compañía, la plantilla de "
+"cuentas a utilizar, el nº de dígitos para generar los códigos de sus cuentas "
+"y cuenta bancaria y la divisa para crear diarios.\n"
+"        De este modo se generará una copia de la plantilla de cuentas.\n"
+"    * Es el mismo asistente que se ejecuta desde "
+"'Contabilidad/Configuración/Contabilidad Financiera/Plantillas/Generar plan "
+"contable desde una plantilla de plan contable.\n"
+"    Asistentes que incluye este módulo:\n"
+"    * Listado de empresas: Lista las empresas con su CIF y cantidades "
+"facturadas. Prepara un fichero XML.\n"
+"                           Ruta de acceso: Contabilidad/Informes/Informes "
+"legales/Informes Belgas/Listado de empresas con CIF\n"
+"    * Declaración periódica del IVA: Prepara un fichero XML para la "
+"declaración del IVA de la compañía del usuario actualmente conectado.\n"
+"                           Ruta de acceso: Contabilidad/Informes/Informes "
+"legales/Informes Belgas/Declaración periódica del IVA\n"
+"    * Listado anual de clientes sujetos a IVA: Prepara un fichero XML para "
+"la declaración del IVA de la compañía principal del usuario actualmente "
+"conectado. Basado en el ejercicio fiscal.\n"
+"                           Ruta de acceso: Contabilidad/Informes/Informes "
+"legales/Informes Belgas/Listado anual de clientes sujetos a IVA\n"
+"\n"
+"    "
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr "Empresa IVA intra"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
+msgstr "Periodo (s)"
+
+#~ msgid "Tiers"
+#~ msgstr "Niveles"
+
+#~ msgid "Oct/Nov/Dec"
+#~ msgstr "Oct/Nov/Dic"
+
+#~ msgid "Trimester Number"
+#~ msgstr "Número de trimestre"
+
+#~ msgid "Notification"
+#~ msgstr "Notificación"
+
+#~ msgid "Tiers - Recevable"
+#~ msgstr "Niveles - Recibible"
+
+#~ msgid "Immobilisation"
+#~ msgstr "Inmovilización"
+
+#~ msgid "Apr/May/Jun"
+#~ msgstr "Abr/May/Jun"
+
+#~ msgid "Jul/Aug/Sep"
+#~ msgstr "Jul/Ago/Sep"
+
+#~ msgid "This wizard will create an XML file for Vat Intra"
+#~ msgstr "Este asistente creará un archivo XML para el IVA Intra"
+
+#~ msgid "Capital"
+#~ msgstr "Capital"
+
+#~ msgid "Charge"
+#~ msgstr "Cargo"
+
+#~ msgid "Select Period"
+#~ msgstr "Seleccionar periodo"
+
+#~ msgid "Régime Extra-Communautaire"
+#~ msgstr "Régimen Extra-comunitario"
+
+#~ msgid "Régime National"
+#~ msgstr "Régimen Nacional"
+
+#~ msgid "Tiers - Payable"
+#~ msgstr "Niveles - Cuenta por pagar"
+
+#~ msgid "Annual Listing of VAT-Subjected Customers"
+#~ msgstr "Anual de venta de IVA Sometido para Clientes"
+
+#~ msgid "XML Flie has been Created."
+#~ msgstr "El archivo XML ha sido creado"
+
+#~ msgid "Régime Intra-Communautaire"
+#~ msgstr "Régimen Intra-Comunitario"
+
+#~ msgid "Financier"
+#~ msgstr "Finanza"
+
+#~ msgid "Jan/Feb/Mar"
+#~ msgstr "Ene/Feb/Mar"
+
+#~ msgid "Produit"
+#~ msgstr "Producido"
+
+#~ msgid "Vue"
+#~ msgstr "Vue"
+
+#~ 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 ""
+#~ "Genere el Plan contable de una Plantilla de Carta. Le pedirán pasar el "
+#~ "nombre de la empresa, la plantilla de carta para seguir, el número. de "
+#~ "dígitos para generar el código para sus cuentas y Cuenta bancaria, dinero "
+#~ "para crear Diarios. Así, como la copia de carta por la Plantilla generada.\n"
+#~ "Esto es el mismo mago que corre de la Gestión "
+#~ "financiera/configuración/Contabilidad financiera/Consideración "
+#~ "Financiera/Genera el Plan contable de una Plantilla de Carta."
+
+#~ msgid "Tax"
+#~ msgstr "Impuesto"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡Error! No puedes crear plantillas de cuentas recursivas."
+
+#~ msgid "Stock et Encours"
+#~ msgstr "Valores y pendientes"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
diff --git a/addons/l10n_be/i18n/et.po b/addons/l10n_be/i18n/et.po
index 259e6cdac7d..f8cf3d15488 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/fi.po b/addons/l10n_be/i18n/fi.po
index 2ecd85668ca..1587b0c84e9 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
@@ -38,12 +38,12 @@ msgstr "XML tiedosto on luotu."
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
 #, python-format
 msgid "No partner has a VAT Number asociated with him."
-msgstr ""
+msgstr "Kumppanilla ei ole ALV numeroa määriteltynä"
 
 #. module: l10n_be
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
@@ -144,7 +144,7 @@ msgstr ""
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.partner_vat_listing
 msgid "Annual Listing Of VAT-Subjected Customers"
-msgstr ""
+msgstr "Vuosittainen listaus ALV asiakkaista"
 
 #. module: l10n_be
 #: model:ir.module.module,shortdesc:l10n_be.module_meta_information
@@ -165,7 +165,7 @@ msgstr ""
 #: 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 "Kumppanin VAT intra"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
@@ -176,7 +176,7 @@ msgstr "Jaksottainen ALV ilmoitus"
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Note: "
-msgstr ""
+msgstr "Huom: "
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,tax_code_id:0
@@ -198,12 +198,12 @@ msgstr "Jaksot"
 #: help:partner.vat,test_xml:0
 #: help:partner.vat.intra,test_xml:0
 msgid "Sets the XML output as test file"
-msgstr ""
+msgstr "Asettaa XML tuloksen testitiedostoksi"
 
 #. module: l10n_be
 #: field:partner.vat,limit_amount:0
 msgid "Limit Amount"
-msgstr ""
+msgstr "Rajoita määrää"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -257,16 +257,17 @@ msgstr ""
 msgid ""
 "Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
+"Valitse tässä jakso(t) jotka haluat sisällyttää intracom ilmoitukseen"
 
 #. module: l10n_be
 #: field:vat.listing.clients,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Määrä"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Is Last Declaration"
-msgstr ""
+msgstr "Onko viimeisin ilmoitus"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat
@@ -276,12 +277,12 @@ msgstr ""
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,client_nihil:0
 msgid "Last Declaration of Enterprise"
-msgstr ""
+msgstr "Yrityksen viimeisein ilmoituspäivä"
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_payment:0
 msgid "It indicates whether a payment is to made or not?"
-msgstr ""
+msgstr "Kertoo tehdäänkö maksu vai ei?"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
diff --git a/addons/l10n_be/i18n/fr.po b/addons/l10n_be/i18n/fr.po
index 8c93e16922b..4d1f4a91e6d 100644
--- a/addons/l10n_be/i18n/fr.po
+++ b/addons/l10n_be/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-18 16:45+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/gl.po b/addons/l10n_be/i18n/gl.po
index f1cd54b8596..1bd91fc0a55 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/hr.po b/addons/l10n_be/i18n/hr.po
index 9df8a6d8343..ecf6f611e09 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/hu.po b/addons/l10n_be/i18n/hu.po
index 6951234ada2..ce4c7005e05 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/id.po b/addons/l10n_be/i18n/id.po
index 143dfff4657..45373b63c65 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/it.po b/addons/l10n_be/i18n/it.po
index e6db1bc298b..2735519b06e 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,name:0
 msgid "Client Name"
-msgstr ""
+msgstr "Nome Cliente"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
@@ -227,7 +227,7 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,vat:0
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
 #. module: l10n_be
 #: field:vat.listing.clients,country:0
@@ -289,7 +289,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
 #, python-format
 msgid "Data Insufficient"
-msgstr ""
+msgstr "Dati insifficienti"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
@@ -304,7 +304,7 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Rotazione"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -493,3 +493,36 @@ msgstr "Periodo(i)"
 
 #~ msgid "Tax"
 #~ msgstr "Imposte"
+
+#~ msgid "Oct/Nov/Dec"
+#~ msgstr "Ott/Nov/Dic"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Errore! Non puoi creare un modello di conto ricorsivo"
+
+#~ msgid "Notification"
+#~ msgstr "Notifica"
+
+#~ msgid "Capital"
+#~ msgstr "Capitale"
+
+#~ msgid "Produit"
+#~ msgstr "Prodotto"
+
+#~ msgid "Select Period"
+#~ msgstr "Seleziona Periodo"
+
+#~ msgid "Jul/Aug/Sep"
+#~ msgstr "Lug/Ago/Set"
+
+#~ msgid "Régime National"
+#~ msgstr "Regime Nazionale"
+
+#~ msgid "XML Flie has been Created."
+#~ msgstr "Il file XML è stato creato."
+
+#~ msgid "Financier"
+#~ msgstr "Finanziere"
+
+#~ msgid "Jan/Feb/Mar"
+#~ msgstr "Gen/Feb/Mar"
diff --git a/addons/l10n_be/i18n/ko.po b/addons/l10n_be/i18n/ko.po
index 25af18a6312..a5024d86427 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/lt.po b/addons/l10n_be/i18n/lt.po
index 6951234ada2..ce4c7005e05 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/nl.po b/addons/l10n_be/i18n/nl.po
index 026ec9ccc48..2436c400934 100644
--- a/addons/l10n_be/i18n/nl.po
+++ b/addons/l10n_be/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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
@@ -608,19 +608,8 @@ msgstr "Periode(s)"
 #~ msgid "Error ! You can not create recursive Tax Codes."
 #~ msgstr "Fout! U kunt geen herhalende belastingcodes maken"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kan geen herhalend Menu maken"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De Object naam moet beginnen met X_ en mag geen speciale karakters bevatten !"
-
 #~ msgid "Stock et Encours"
 #~ msgstr "Voorraden en Werken in uitvoering"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie"
-
 #~ msgid "Tiers"
 #~ msgstr "Derden"
diff --git a/addons/l10n_be/i18n/nl_BE.po b/addons/l10n_be/i18n/nl_BE.po
index dcca3d85f2c..8904f87f72b 100644
--- a/addons/l10n_be/i18n/nl_BE.po
+++ b/addons/l10n_be/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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/pl.po b/addons/l10n_be/i18n/pl.po
index 6951234ada2..ce4c7005e05 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/pt.po b/addons/l10n_be/i18n/pt.po
index 5aeed50d150..5ec7ed7180a 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/pt_BR.po b/addons/l10n_be/i18n/pt_BR.po
index e6497909d40..22503c3193c 100644
--- a/addons/l10n_be/i18n/pt_BR.po
+++ b/addons/l10n_be/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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/ro.po b/addons/l10n_be/i18n/ro.po
index 6951234ada2..ce4c7005e05 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/ru.po b/addons/l10n_be/i18n/ru.po
index 1d8272fe1e3..c3034ab525a 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
@@ -76,12 +76,12 @@ msgstr "Период"
 #: view:l1on_be.vat.declaration:0
 #: view:partner.vat.intra:0
 msgid "Save the File with '.xml' extension."
-msgstr ""
+msgstr "Сохранить файл с расширением «.xml»"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Save XML"
-msgstr ""
+msgstr "Cохранить XML"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:150
@@ -111,7 +111,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
 #, python-format
 msgid "The period code you entered is not valid."
-msgstr ""
+msgstr "Введенный код периода не верен."
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_resitution:0
@@ -287,7 +287,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
 #, python-format
 msgid "Data Insufficient"
-msgstr ""
+msgstr "Недостаточно данных"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
@@ -320,7 +320,7 @@ msgstr ""
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Save xml"
-msgstr ""
+msgstr "Сохранить xml"
 
 #. module: l10n_be
 #: field:partner.vat,mand_id:0
@@ -360,7 +360,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
 #, python-format
 msgid "Wrong Period Code"
-msgstr ""
+msgstr "Неверный код периода"
 
 #. module: l10n_be
 #: field:partner.vat,fyear:0
@@ -394,12 +394,16 @@ msgstr "Общая информация"
 msgid ""
 "You can remove clients/partners which you do not want to show in xml file"
 msgstr ""
+"Можно удалить клиентов/контрагентов, которые не должны отображаться в файле "
+"xml"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
 msgid ""
 "You can remove clients/partners which you do not want in exported xml file"
 msgstr ""
+"Можно удалить клиентов/контрагентов, сведения о которых не должны быть "
+"экспортированы в XML"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -437,7 +441,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
 #, python-format
 msgid "Please select at least one Period."
-msgstr ""
+msgstr "Выберите хотя бы один период."
 
 #. module: l10n_be
 #: model:ir.module.module,description:l10n_be.module_meta_information
@@ -487,7 +491,7 @@ msgstr ""
 #. module: l10n_be
 #: field:partner.vat.intra,period_ids:0
 msgid "Period (s)"
-msgstr ""
+msgstr "Период(ы)"
 
 #~ msgid "Oct/Nov/Dec"
 #~ msgstr "Окт/Нояб/Дек"
diff --git a/addons/l10n_be/i18n/sl.po b/addons/l10n_be/i18n/sl.po
index b3d1ca0ed47..109e9f8cff4 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/sq.po b/addons/l10n_be/i18n/sq.po
index 0bf976b855a..0e2bbd51492 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/sr@latin.po b/addons/l10n_be/i18n/sr@latin.po
index a43c27b639a..662d088d120 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/sv.po b/addons/l10n_be/i18n/sv.po
index 5f9ca8213a3..20b4861cd12 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/tlh.po b/addons/l10n_be/i18n/tlh.po
index 2d6ccc46176..5eb66e566ae 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index dd30cdce17e..aeeb6abcc41 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/uk.po b/addons/l10n_be/i18n/uk.po
index 33c0f29408b..cb057ed04fd 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/vi.po b/addons/l10n_be/i18n/vi.po
index 481ea362230..7b91dabf373 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/zh_CN.po b/addons/l10n_be/i18n/zh_CN.po
index f5660fa91f8..a8656f45f45 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/i18n/zh_TW.po b/addons/l10n_be/i18n/zh_TW.po
index d0ea74341b4..86624f8f3f3 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: 2011-04-29 05:24+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:25+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
deleted file mode 100644
index 194e2881d1b..00000000000
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<openerp>
-    <data>
-
-    <record id="config_call_account_template" model="ir.actions.todo">
-        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="category_id" ref="account.category_accounting_configuration"/>
-        <field name="type">automatic</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/l10n_be/l10n_be_wizard.yml b/addons/l10n_be/l10n_be_wizard.yml
new file mode 100644
index 00000000000..a51d1d55244
--- /dev/null
+++ b/addons/l10n_be/l10n_be_wizard.yml
@@ -0,0 +1,16 @@
+-
+  !record {model: ir.actions.todo, id: config_call_account_template}:
+    action_id: account.action_wizard_multi_chart
+    category_id: account.category_accounting_configuration
+    type: automatic
+-
+  !python {model: ir.actions.todo}: |
+    if self.browse(cr, uid, ref('l10n_be.config_call_account_template')).state=='open':
+        wiz = self.pool.get('wizard.multi.charts.accounts')
+        wiz_id = wiz.create(cr, uid, {
+            'chart_template_id': ref('l10n_be.l10nbe_chart_template')
+        })
+        wiz.execute(cr, uid, [wiz_id])
+        self.write(cr, uid, [ref('l10n_be.config_call_account_template')], {
+            'state': 'done'
+        })
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 2ab26d66439..e43dbfecf2b 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -117,7 +117,8 @@ class partner_vat_list_13(osv.osv_memory):
     """ Partner Vat Listing """
     _name = "partner.vat.list_13"
     _columns = {
-        'partner_ids': fields.many2many('vat.listing.clients', 'vat_partner_rel', 'vat_id', 'partner_id', 'Clients', required=False, help='You can remove clients/partners which you do not want to show in xml file'),
+        # TODO the referenced model has been deleted at revno 4672.1.2.
+        #'partner_ids': fields.many2many('vat.listing.clients', 'vat_partner_rel', 'vat_id', 'partner_id', 'Clients', required=False, help='You can remove clients/partners which you do not want to show in xml file'),
         'name': fields.char('File Name', size=32),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save' : fields.binary('Save File', readonly=True),
@@ -127,7 +128,8 @@ class partner_vat_list_13(osv.osv_memory):
         return context.get('partner_ids', [])
 
     _defaults={
-        'partner_ids': _get_partners
+        # TODO the referenced model has been deleted at revno 4672.1.2.
+        # 'partner_ids': _get_partners
             }
 
     def create_xml(self, cursor, user, ids, context=None):
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index 2596076c048..84093cbe066 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -83,9 +83,10 @@ class partner_vat_intra(osv.osv_memory):
         else:
             data_cmpny = obj_user.browse(cursor, user, user).company_id
         data  = self.read(cursor, user, ids)[0]
-        company_vat = data_cmpny.partner_id.vat.replace(' ','').upper()
+        company_vat = data_cmpny.partner_id.vat
         if not company_vat:
             raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
+        company_vat = company_vat.replace(' ','').upper()
 
         seq_controlref = obj_sequence.get(cursor, user, 'controlref')
         seq_declarantnum = obj_sequence.get(cursor, user, 'declarantnum')
diff --git a/addons/l10n_be_hr_payroll/__init__.py b/addons/l10n_be_hr_payroll/__init__.py
new file mode 100644
index 00000000000..ff1198f3caf
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 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 License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+import l10n_be_hr_payroll
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/wizard/wizard_asset_close.py b/addons/l10n_be_hr_payroll/__openerp__.py
old mode 100755
new mode 100644
similarity index 53%
rename from addons/account_asset/wizard/wizard_asset_close.py
rename to addons/l10n_be_hr_payroll/__openerp__.py
index 0d274585036..d667cdfa126
--- a/addons/account_asset/wizard/wizard_asset_close.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 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
@@ -15,37 +15,40 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+{
+    'name': 'Belgian Payroll Rules',
+    'category': 'Localization/Payroll',
+    'author': 'OpenERP SA',
+    'depends': ['hr_payroll'],
+    'version': '1.0',
+    'description': """
+Belgian Payroll Rules
+=====================
 
-import wizard
-import pooler
+    * Employee Details
+    * Employee Contracts
+    * Passport based Contract
+    * Allowances / Deductions
+    * Allow to configure Basic / Grows / Net Salary
+    * Employee Payslip
+    * Monthly Payroll Register
+    * Integrated with Holiday Management
+    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...
+    """,
 
-asset_end_arch = '''<?xml version="1.0"?>
-<form string="Close asset">
-    <separator string="General information" colspan="4"/>
-</form>'''
-
-asset_end_fields = {
+    'active': False,
+    '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',
+    ],
+    'installable': True
 }
 
-class wizard_asset_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':asset_end_arch, 'fields':asset_end_fields, 'state':[
-                ('end','Cancel'),
-                ('asset_close','End of asset')
-            ]}
-        },
-        'asset_close': {
-            'actions': [],
-            'result': {'type' : 'state', 'state': 'end'}
-        }
-    }
-wizard_asset_close('account.asset.close')
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/l10n_be_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_be_hr_payroll/data/hr.salary.rule.csv
new file mode 100644
index 00000000000..a0c54755892
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/data/hr.salary.rule.csv
@@ -0,0 +1,1434 @@
+"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",0,480,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+2,"fix",480,495,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+3,"fix",495,510,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+4,"fix",510,525,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+5,"fix",525,540,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+6,"fix",540,555,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+7,"fix",555,570,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+8,"fix",570,585,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+9,"fix",585,600,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+10,"fix",600,615,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+11,"fix",615,630,,-1.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+12,"fix",630,645,,-5.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+13,"fix",645,660,,-8.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+14,"fix",660,675,,-12.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+15,"fix",675,690,,-16.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+16,"fix",690,705,,-19.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+17,"fix",705,720,,-23.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+18,"fix",720,735,,-26.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+19,"fix",735,750,,-30.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+20,"fix",750,765,,-34.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+21,"fix",765,780,,-37.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+22,"fix",780,795,,-41.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+23,"fix",795,810,,-44.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+24,"fix",810,825,,-48.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+25,"fix",825,840,,-52.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+26,"fix",840,855,,-55.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+27,"fix",855,870,,-60.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+28,"fix",870,885,,-64.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+29,"fix",885,900,,-68.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+30,"fix",900,915,,-73.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+31,"fix",915,930,,-78.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+32,"fix",930,945,,-82.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+33,"fix",945,960,,-87.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+34,"fix",960,975,,-91.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+35,"fix",975,990,,-96.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+36,"fix",990,1005,,-100.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+37,"fix",1005,1020,,-105.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+38,"fix",1020,1035,,-110.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+39,"fix",1035,1050,,-114.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+40,"fix",1050,1065,,-119.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+41,"fix",1065,1080,,-123.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+42,"fix",1080,1095,,-128.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+43,"fix",1095,1110,,-133.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+44,"fix",1110,1125,,-139.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+45,"fix",1125,1140,,-145.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+46,"fix",1140,1155,,-151.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+47,"fix",1155,1170,,-157.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+48,"fix",1170,1185,,-163.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+49,"fix",1185,1200,,-169.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+50,"fix",1200,1215,,-175.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+51,"fix",1215,1230,,-181.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+52,"fix",1230,1245,,-188.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+53,"fix",1245,1260,,-194.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+54,"fix",1260,1275,,-200.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+55,"fix",1275,1290,,-206.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+56,"fix",1290,1305,,-212.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+57,"fix",1305,1320,,-218.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+58,"fix",1320,1335,,-224.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+59,"fix",1335,1350,,-230.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+60,"fix",1350,1365,,-236.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+61,"fix",1365,1380,,-242.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+62,"fix",1380,1395,,-249.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+63,"fix",1395,1410,,-255.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+64,"fix",1410,1425,,-261.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+65,"fix",1425,1440,,-267.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+66,"fix",1440,1455,,-273.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+67,"fix",1455,1470,,-279.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+68,"fix",1470,1485,,-285.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+69,"fix",1485,1500,,-291.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+70,"fix",1500,1515,,-298.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+71,"fix",1515,1530,,-304.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+72,"fix",1530,1545,,-310.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+73,"fix",1545,1560,,-317.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+74,"fix",1560,1575,,-324.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+75,"fix",1575,1590,,-331.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+76,"fix",1590,1605,,-338.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+77,"fix",1605,1620,,-345.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+78,"fix",1620,1635,,-352.95,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+79,"fix",1635,1650,,-359.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+80,"fix",1650,1665,,-366.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+81,"fix",1665,1680,,-373.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+82,"fix",1680,1695,,-380.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+83,"fix",1695,1710,,-387.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+84,"fix",1710,1725,,-394.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+85,"fix",1725,1740,,-401.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+86,"fix",1740,1755,,-409,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+87,"fix",1755,1770,,-416,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+88,"fix",1770,1785,,-423.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+89,"fix",1785,1800,,-430.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+90,"fix",1800,1815,,-437.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+91,"fix",1815,1830,,-444.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+92,"fix",1830,1845,,-451.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+93,"fix",1845,1860,,-458.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+94,"fix",1860,1875,,-465.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+95,"fix",1875,1890,,-472.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+96,"fix",1890,1905,,-479.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+97,"fix",1905,1920,,-486.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+98,"fix",1920,1935,,-493.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+99,"fix",1935,1950,,-500.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+100,"fix",1950,1965,,-507.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+101,"fix",1965,1980,,-514.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+102,"fix",1980,1995,,-521.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+103,"fix",1995,2010,,-528.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+104,"fix",2010,2025,,-535.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+105,"fix",2025,2040,,-542.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+106,"fix",2040,2055,,-549.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+107,"fix",2055,2070,,-556.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+108,"fix",2070,2085,,-563.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+109,"fix",2085,2100,,-570.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+110,"fix",2100,2115,,-577.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+111,"fix",2115,2130,,-584.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+112,"fix",2130,2145,,-591.15,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+113,"fix",2145,2160,,-598.15,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+114,"fix",2160,2175,,-605.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+115,"fix",2175,2190,,-612.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+116,"fix",2190,2205,,-619.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+117,"fix",2205,2220,,-626.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+118,"fix",2220,2235,,-633.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+119,"fix",2235,2250,,-640.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+120,"fix",2250,2265,,-647.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+121,"fix",2265,2280,,-654.2,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+122,"fix",2280,2295,,-661.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+123,"fix",2295,2310,,-668.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+124,"fix",2310,2325,,-675.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+125,"fix",2325,2340,,-682.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+126,"fix",2340,2355,,-689.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+127,"fix",2355,2370,,-696.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+128,"fix",2370,2385,,-703.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+129,"fix",2385,2400,,-710.25,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+130,"fix",2400,2415,,-717.25,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+131,"fix",2415,2430,,-724.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+132,"fix",2430,2445,,-731.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+133,"fix",2445,2460,,-738.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+134,"fix",2460,2475,,-745.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+135,"fix",2475,2490,,-752.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+136,"fix",2490,2505,,-759.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+137,"fix",2505,2520,,-766.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+138,"fix",2520,2535,,-773.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+139,"fix",2535,2550,,-780.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+140,"fix",2550,2565,,-787.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+141,"fix",2565,2580,,-794.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+142,"fix",2580,2595,,-801.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+143,"fix",2595,2610,,-808.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+144,"fix",2610,2625,,-815.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+145,"fix",2625,2640,,-822.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+146,"fix",2640,2655,,-829.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+147,"fix",2655,2670,,-836.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+148,"fix",2670,2685,,-843.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+149,"fix",2685,2700,,-850.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+150,"fix",2700,2715,,-857.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+151,"fix",2715,2730,,-864.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+152,"fix",2730,2745,,-871.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+153,"fix",2745,2760,,-878.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+154,"fix",2760,2775,,-885.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+155,"fix",2775,2790,,-892.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+156,"fix",2790,2805,,-899.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+157,"fix",2805,2820,,-906.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+158,"fix",2820,2835,,-913.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+159,"fix",2835,2850,,-920.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+160,"fix",2850,2865,,-927.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+161,"fix",2865,2880,,-934.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+162,"fix",2880,2895,,-941.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+163,"fix",2895,2910,,-948.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+164,"fix",2910,2925,,-955.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+165,"fix",2925,2940,,-962.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+166,"fix",2940,2955,,-969.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+167,"fix",2955,2970,,-976.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+168,"fix",2970,2985,,-983.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+169,"fix",2985,3000,,-990.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+170,"fix",3000,3015,,-997.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+171,"fix",3015,3030,,-1004.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+172,"fix",3030,3045,,-1011.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+173,"fix",3045,3060,,-1018.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+174,"fix",3060,3075,,-1025.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+175,"fix",3075,3090,,-1032.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+176,"fix",3090,3105,,-1039.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+177,"fix",3105,3120,,-1046.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+178,"fix",3120,3135,,-1053.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+179,"fix",3135,3150,,-1060.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+180,"fix",3150,3165,,-1067.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+181,"fix",3165,3180,,-1074.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+182,"fix",3180,3195,,-1081.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+183,"fix",3195,3210,,-1089.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+184,"fix",3210,3225,,-1097.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+185,"fix",3225,3240,,-1105.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+186,"fix",3240,3255,,-1113.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+187,"fix",3255,3270,,-1120.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+188,"fix",3270,3285,,-1128.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+189,"fix",3285,3300,,-1136.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+190,"fix",3300,3315,,-1144.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+191,"fix",3315,3330,,-1152.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+192,"fix",3330,3345,,-1159.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+193,"fix",3345,3360,,-1167.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+194,"fix",3360,3375,,-1175.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+195,"fix",3375,3390,,-1183.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+196,"fix",3390,3405,,-1190.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+197,"fix",3405,3420,,-1198.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+198,"fix",3420,3435,,-1206.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+199,"fix",3435,3450,,-1214.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+200,"fix",3450,3465,,-1222.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+201,"fix",3465,3480,,-1229.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+202,"fix",3480,3495,,-1237.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+203,"fix",3495,3510,,-1245.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+204,"fix",3510,3525,,-1253.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+205,"fix",3525,3540,,-1261.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+206,"fix",3540,3555,,-1268.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+207,"fix",3555,3570,,-1276.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+208,"fix",3570,3585,,-1284.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+209,"fix",3585,3600,,-1292.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+210,"fix",3600,3615,,-1299.95,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+211,"fix",3615,3630,,-1307.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+212,"fix",3630,3645,,-1315.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+213,"fix",3645,3660,,-1323.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+214,"fix",3660,3675,,-1331.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+215,"fix",3675,3690,,-1338.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+216,"fix",3690,3705,,-1346.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+217,"fix",3705,3720,,-1354.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+218,"fix",3720,3735,,-1362.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+219,"fix",3735,3750,,-1370.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+220,"fix",3750,3765,,-1377.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+221,"fix",3765,3780,,-1385.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+222,"fix",3780,3795,,-1393.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+223,"fix",3795,3810,,-1401.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+224,"fix",3810,3825,,-1408.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+225,"fix",3825,3840,,-1416.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+226,"fix",3840,3855,,-1424.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+227,"fix",3855,3870,,-1432.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+228,"fix",3870,3885,,-1440.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+229,"fix",3885,3900,,-1447.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+230,"fix",3900,3915,,-1455.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+231,"fix",3915,3930,,-1463.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+232,"fix",3930,3945,,-1471.2,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+233,"fix",3945,3960,,-1478.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+234,"fix",3960,3975,,-1486.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+235,"fix",3975,3990,,-1494.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+236,"fix",3990,4005,,-1502.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+237,"fix",4005,4020,,-1510.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+238,"fix",4020,4035,,-1517.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+239,"fix",4035,4050,,-1525.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+240,"fix",4050,4065,,-1533.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+241,"fix",4065,4080,,-1541.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+242,"fix",4080,4095,,-1549.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+243,"fix",4095,4110,,-1556.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+244,"fix",4110,4125,,-1564.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+245,"fix",4125,4140,,-1572.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+246,"fix",4140,4155,,-1580.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+247,"fix",4155,4170,,-1587.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+248,"fix",4170,4185,,-1595.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+249,"fix",4185,4200,,-1603.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+250,"fix",4200,4215,,-1611.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+251,"fix",4215,4230,,-1619.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+252,"fix",4230,4245,,-1626.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+253,"fix",4245,4260,,-1634.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+254,"fix",4260,4275,,-1642.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+255,"fix",4275,4290,,-1650.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+256,"fix",4290,4305,,-1658.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+257,"fix",4305,4320,,-1665.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+258,"fix",4320,4335,,-1673.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+259,"fix",4335,4350,,-1681.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+260,"fix",4350,4365,,-1689.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+261,"fix",4365,4380,,-1696.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+262,"fix",4380,4395,,-1704.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+263,"fix",4395,4410,,-1712.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+264,"fix",4410,4425,,-1720.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+265,"fix",4425,4440,,-1728.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+266,"fix",4440,4455,,-1735.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+267,"fix",4455,4470,,-1743.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+268,"fix",4470,4485,,-1751.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+269,"fix",4485,4500,,-1759.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+270,"fix",4500,4515,,-1767,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+271,"fix",4515,4530,,-1774.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+272,"fix",4530,4545,,-1782.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+273,"fix",4545,4560,,-1790.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+274,"fix",4560,4575,,-1798.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+275,"fix",4575,4590,,-1805.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+276,"fix",4590,4605,,-1813.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+277,"fix",4605,4620,,-1821.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+278,"fix",4620,4635,,-1829.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+279,"fix",4635,4650,,-1837.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+280,"fix",4650,4665,,-1844.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+281,"fix",4665,4680,,-1852.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+282,"fix",4680,4695,,-1860.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+283,"fix",4695,4710,,-1868.2,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+284,"fix",4710,4725,,-1875.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+285,"fix",4725,4740,,-1883.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+286,"fix",4740,4755,,-1891.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+287,"fix",4755,4770,,-1899.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+288,"fix",4770,4785,,-1907.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+289,"fix",4785,4800,,-1914.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+290,"fix",4800,4815,,-1922.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+291,"fix",4815,4830,,-1930.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+292,"fix",4830,4845,,-1938.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+293,"fix",4845,4860,,-1946.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+294,"fix",4860,4875,,-1953.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+295,"fix",4875,4890,,-1961.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+296,"fix",4890,4905,,-1969.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+297,"fix",4905,4920,,-1977.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+298,"fix",4920,4935,,-1984.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+299,"fix",4935,4950,,-1992.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+300,"fix",4950,4965,,-2000.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+301,"fix",4965,4980,,-2008.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+302,"fix",4980,4995,,-2016.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+303,"fix",4995,5010,,-2024.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+304,"fix",5010,5025,,-2032.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+305,"fix",5025,5040,,-2040.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+306,"fix",5040,5055,,-2048.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+307,"fix",5055,5070,,-2056.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+308,"fix",5070,5085,,-2064.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+309,"fix",5085,5100,,-2072.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+310,"fix",5100,5115,,-2080.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+311,"fix",5115,5130,,-2088.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+312,"fix",5130,5145,,-2096.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+313,"fix",5145,5160,,-2104.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+314,"fix",5160,5175,,-2112.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+315,"fix",5175,5190,,-2120.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+316,"fix",5190,5205,,-2128.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+317,"fix",5205,5220,,-2136.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+318,"fix",5220,5235,,-2144.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+319,"fix",5235,5250,,-2152.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+320,"fix",5250,5265,,-2160.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+321,"fix",5265,5280,,-2168.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+322,"fix",5280,5295,,-2176.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+323,"fix",5295,5310,,-2184.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+324,"fix",5310,5325,,-2192.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+325,"fix",5325,5340,,-2200.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+326,"fix",5340,5355,,-2208.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+327,"fix",5355,5370,,-2216.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+328,"fix",5370,5385,,-2224.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+329,"fix",5385,5400,,-2232.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+330,"fix",5400,5415,,-2240.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+331,"fix",5415,5430,,-2248.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+332,"fix",5430,5445,,-2256.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+333,"fix",5445,5460,,-2264.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+334,"fix",5460,5475,,-2272.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+335,"fix",5475,5490,,-2280.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+336,"fix",5490,5505,,-2288.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+337,"fix",5505,5520,,-2297.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+338,"fix",5520,5535,,-2305.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+339,"fix",5535,5550,,-2313.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+340,"fix",5550,5565,,-2321.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+341,"fix",5565,5580,,-2329.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+342,"fix",5580,5595,,-2337.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+343,"fix",5595,5610,,-2345.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+344,"fix",5610,5625,,-2353.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+345,"fix",5625,5640,,-2361.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+346,"fix",5640,5655,,-2369.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+347,"fix",5655,5670,,-2377.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+348,"fix",5670,5685,,-2385.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+349,"fix",5685,5700,,-2393.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+350,"fix",5700,5715,,-2401.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+351,"fix",5715,5730,,-2409.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+352,"fix",5730,5745,,-2417.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+353,"fix",5745,5760,,-2425.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+354,"fix",5760,5775,,-2433.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+355,"fix",5775,5790,,-2441.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+356,"fix",5790,5805,,-2449.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+357,"fix",5805,5820,,-2457.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+358,"fix",5820,5835,,-2465.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+359,"fix",5835,5850,,-2473.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+360,"fix",5850,5865,,-2481.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+361,"fix",5865,5880,,-2489.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+362,"fix",5880,5895,,-2497.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+363,"fix",5895,5910,,-2505.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+364,"fix",5910,5925,,-2513.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+365,"fix",5925,5940,,-2521.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+366,"fix",5940,5955,,-2529.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+367,"fix",5955,5970,,-2537.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+368,"fix",5970,5985,,-2545.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+369,"fix",5985,6000,,-2553.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+370,"fix",6000,6015,,-2561.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+371,"fix",6015,6030,,-2569.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+372,"fix",6030,6045,,-2577.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+373,"fix",6045,6060,,-2585.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+374,"fix",6060,6075,,-2593.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+375,"fix",6075,6090,,-2601.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+376,"fix",6090,6105,,-2609.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+377,"fix",6105,6120,,-2618.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+378,"fix",6120,6135,,-2626.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+379,"fix",6135,6150,,-2634.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+380,"fix",6150,6165,,-2642.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+381,"fix",6165,6180,,-2650.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+382,"fix",6180,6195,,-2658.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+383,"fix",6195,6210,,-2666.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+384,"fix",6210,6225,,-2674.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+385,"fix",6225,6240,,-2682.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+386,"fix",6240,6255,,-2690.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+387,"fix",6255,6270,,-2698.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+388,"fix",6270,6285,,-2706.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+389,"fix",6285,6300,,-2714.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+390,"fix",6300,6315,,-2722.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+391,"fix",6315,6330,,-2730.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+392,"fix",6330,6345,,-2738.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+393,"fix",6345,6360,,-2746.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+394,"fix",6360,6375,,-2754.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+395,"fix",6375,6390,,-2762.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+396,"fix",6390,6405,,-2770.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+397,"fix",6405,6420,,-2778.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+398,"fix",6420,6435,,-2786.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+399,"fix",6435,6450,,-2794.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+400,"fix",6450,6465,,-2802.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+401,"fix",6465,6480,,-2810.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+402,"fix",6480,6495,,-2818.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+403,"fix",6495,6510,,-2826.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+404,"fix",6510,6525,,-2834.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+405,"fix",6525,6540,,-2842.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+406,"fix",6540,6555,,-2850.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+407,"fix",6555,6570,,-2858.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+408,"fix",6570,6585,,-2866.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+409,"fix",6585,6600,,-2874.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+410,"fix",6600,6615,,-2882.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+411,"fix",6615,6630,,-2890.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+412,"fix",6630,6645,,-2898.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+413,"fix",6645,6660,,-2906.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+414,"fix",6660,6675,,-2914.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+415,"fix",6675,6690,,-2922.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+416,"fix",6690,6705,,-2930.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+417,"fix",6705,6720,,-2939.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+418,"fix",6720,6735,,-2947.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+419,"fix",6735,6750,,-2955.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+420,"fix",6750,6765,,-2963.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+421,"fix",6765,6780,,-2971.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+422,"fix",6780,6795,,-2979.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+423,"fix",6795,6810,,-2987.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+424,"fix",6810,6825,,-2995.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+425,"fix",6825,6840,,-3003.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+426,"fix",6840,6855,,-3011.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+427,"fix",6855,6870,,-3019.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+428,"fix",6870,6885,,-3027.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+429,"fix",6885,6900,,-3035.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+430,"fix",6900,6915,,-3043.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+431,"fix",6915,6930,,-3051.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+432,"fix",6930,6945,,-3059.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+433,"fix",6945,6960,,-3067.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+434,"fix",6960,6975,,-3075.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+435,"fix",6975,6990,,-3083.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+436,"fix",6990,7005,,-3091.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+437,"fix",7005,7020,,-3099.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+438,"fix",7020,7035,,-3107.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+439,"fix",7035,7050,,-3115.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+440,"fix",7050,7065,,-3123.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+441,"fix",7065,7080,,-3131.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+442,"fix",7080,7095,,-3139.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+443,"fix",7095,7110,,-3147.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+444,"fix",7110,7125,,-3155.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+445,"fix",7125,7140,,-3163.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+446,"fix",7140,7155,,-3171.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+447,"fix",7155,7170,,-3179.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+448,"fix",7170,7185,,-3187.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+449,"fix",7185,7200,,-3195.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+450,"fix",7200,7215,,-3203.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+451,"fix",7215,7230,,-3211.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+452,"fix",7230,7245,,-3219.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+453,"fix",7245,7260,,-3227.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+454,"fix",7260,7275,,-3235.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+455,"fix",7275,7290,,-3243.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+456,"fix",7290,7305,,-3251.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+457,"fix",7305,7320,,-3260.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+458,"fix",7320,7335,,-3268.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+459,"fix",7335,7350,,-3276.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+460,"fix",7350,7365,,-3284.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+461,"fix",7365,7380,,-3292.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+462,"fix",7380,7395,,-3300.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+463,"fix",7395,7410,,-3308.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+464,"fix",7410,7425,,-3316.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+465,"fix",7425,7440,,-3324.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+466,"fix",7440,7455,,-3332.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+467,"fix",7455,7470,,-3340.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+468,"fix",7470,7485,,-3348.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+469,"fix",7485,7500,,-3356.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+470,"fix",7500,7500,,-3364.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_bareme","range","GROSS",
+,,,,,,,,,,,,,
+471,"fix",0,960,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+472,"fix",960,975,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+473,"fix",975,990,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+474,"fix",990,1005,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+475,"fix",1005,1020,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+476,"fix",1020,1035,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+477,"fix",1035,1050,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+478,"fix",1050,1065,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+479,"fix",1065,1080,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+480,"fix",1080,1095,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+481,"fix",1095,1110,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+482,"fix",1110,1125,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+483,"fix",1125,1140,,-3.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+484,"fix",1140,1155,,-7.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+485,"fix",1155,1170,,-11.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+486,"fix",1170,1185,,-15.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+487,"fix",1185,1200,,-20.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+488,"fix",1200,1215,,-24.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+489,"fix",1215,1230,,-28.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+490,"fix",1230,1245,,-33.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+491,"fix",1245,1260,,-37.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+492,"fix",1260,1275,,-41.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+493,"fix",1275,1290,,-46.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+494,"fix",1290,1305,,-50.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+495,"fix",1305,1320,,-54.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+496,"fix",1320,1335,,-59.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+497,"fix",1335,1350,,-63.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+498,"fix",1350,1365,,-67.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+499,"fix",1365,1380,,-72.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+500,"fix",1380,1395,,-76.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+501,"fix",1395,1410,,-80.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+502,"fix",1410,1425,,-85.2,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+503,"fix",1425,1440,,-89.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+504,"fix",1440,1455,,-93.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+505,"fix",1455,1470,,-98.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+506,"fix",1470,1485,,-102.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+507,"fix",1485,1500,,-107.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+508,"fix",1500,1515,,-111.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+509,"fix",1515,1530,,-116.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+510,"fix",1530,1545,,-122.25,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+511,"fix",1545,1560,,-127.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+512,"fix",1560,1575,,-133.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+513,"fix",1575,1590,,-138.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+514,"fix",1590,1605,,-144.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+515,"fix",1605,1620,,-149.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+516,"fix",1620,1635,,-155.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+517,"fix",1635,1650,,-160.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+518,"fix",1650,1665,,-166.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+519,"fix",1665,1680,,-171.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+520,"fix",1680,1695,,-177.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+521,"fix",1695,1710,,-183.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+522,"fix",1710,1725,,-188.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+523,"fix",1725,1740,,-194.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+524,"fix",1740,1755,,-199.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+525,"fix",1755,1770,,-205.15,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+526,"fix",1770,1785,,-210.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+527,"fix",1785,1800,,-216.2,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+528,"fix",1800,1815,,-221.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+529,"fix",1815,1830,,-227.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+530,"fix",1830,1845,,-232.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+531,"fix",1845,1860,,-238.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+532,"fix",1860,1875,,-243.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+533,"fix",1875,1890,,-249.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+534,"fix",1890,1905,,-254.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+535,"fix",1905,1920,,-260.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+536,"fix",1920,1935,,-265.95,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+537,"fix",1935,1950,,-271.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+538,"fix",1950,1965,,-277,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+539,"fix",1965,1980,,-282.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+540,"fix",1980,1995,,-288.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+541,"fix",1995,2010,,-293.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+542,"fix",2010,2025,,-299.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+543,"fix",2025,2040,,-304.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+544,"fix",2040,2055,,-310.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+545,"fix",2055,2070,,-315.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+546,"fix",2070,2085,,-321.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+547,"fix",2085,2100,,-326.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+548,"fix",2100,2115,,-332.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+549,"fix",2115,2130,,-338.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+550,"fix",2130,2145,,-344.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+551,"fix",2145,2160,,-350.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+552,"fix",2160,2175,,-356.25,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+553,"fix",2175,2190,,-362.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+554,"fix",2190,2205,,-368.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+555,"fix",2205,2220,,-374.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+556,"fix",2220,2235,,-380.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+557,"fix",2235,2250,,-386.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+558,"fix",2250,2265,,-392.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+559,"fix",2265,2280,,-398.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+560,"fix",2280,2295,,-404.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+561,"fix",2295,2310,,-410.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+562,"fix",2310,2325,,-416.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+563,"fix",2325,2340,,-423.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+564,"fix",2340,2355,,-429.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+565,"fix",2355,2370,,-435.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+566,"fix",2370,2385,,-441.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+567,"fix",2385,2400,,-447.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+568,"fix",2400,2415,,-453.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+569,"fix",2415,2430,,-459.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+570,"fix",2430,2445,,-465.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+571,"fix",2445,2460,,-471.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+572,"fix",2460,2475,,-477.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+573,"fix",2475,2490,,-483.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+574,"fix",2490,2505,,-490.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+575,"fix",2505,2520,,-496.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+576,"fix",2520,2535,,-502.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+577,"fix",2535,2550,,-509.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+578,"fix",2550,2565,,-515.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+579,"fix",2565,2580,,-521.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+580,"fix",2580,2595,,-528,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+581,"fix",2595,2610,,-534.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+582,"fix",2610,2625,,-540.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+583,"fix",2625,2640,,-546.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+584,"fix",2640,2655,,-553.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+585,"fix",2655,2670,,-559.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+586,"fix",2670,2685,,-565.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+587,"fix",2685,2700,,-572.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+588,"fix",2700,2715,,-578.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+589,"fix",2715,2730,,-584.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+590,"fix",2730,2745,,-591.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+591,"fix",2745,2760,,-597.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+592,"fix",2760,2775,,-603.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+593,"fix",2775,2790,,-609.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+594,"fix",2790,2805,,-616.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+595,"fix",2805,2820,,-622.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+596,"fix",2820,2835,,-628.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+597,"fix",2835,2850,,-635.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+598,"fix",2850,2865,,-641.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+599,"fix",2865,2880,,-647.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+600,"fix",2880,2895,,-654.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+601,"fix",2895,2910,,-661.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+602,"fix",2910,2925,,-668.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+603,"fix",2925,2940,,-675.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+604,"fix",2940,2955,,-682.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+605,"fix",2955,2970,,-689.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+606,"fix",2970,2985,,-696.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+607,"fix",2985,3000,,-703.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+608,"fix",3000,3015,,-710.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+609,"fix",3015,3030,,-717.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+610,"fix",3030,3045,,-724.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+611,"fix",3045,3060,,-731.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+612,"fix",3060,3075,,-738.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+613,"fix",3075,3090,,-745.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+614,"fix",3090,3105,,-752.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+615,"fix",3105,3120,,-759.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+616,"fix",3120,3135,,-766.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+617,"fix",3135,3150,,-773.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+618,"fix",3150,3165,,-780.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+619,"fix",3165,3180,,-787.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+620,"fix",3180,3195,,-794.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+621,"fix",3195,3210,,-801.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+622,"fix",3210,3225,,-808.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+623,"fix",3225,3240,,-815.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+624,"fix",3240,3255,,-822.6,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+625,"fix",3255,3270,,-829.6,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+626,"fix",3270,3285,,-836.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+627,"fix",3285,3300,,-843.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+628,"fix",3300,3315,,-850.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+629,"fix",3315,3330,,-857.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+630,"fix",3330,3345,,-864.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+631,"fix",3345,3360,,-871.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+632,"fix",3360,3375,,-878.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+633,"fix",3375,3390,,-885.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+634,"fix",3390,3405,,-892.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+635,"fix",3405,3420,,-899.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+636,"fix",3420,3435,,-906.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+637,"fix",3435,3450,,-913.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+638,"fix",3450,3465,,-920.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+639,"fix",3465,3480,,-927.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+640,"fix",3480,3495,,-934.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+641,"fix",3495,3510,,-941.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+642,"fix",3510,3525,,-948.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+643,"fix",3525,3540,,-955.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+644,"fix",3540,3555,,-962.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+645,"fix",3555,3570,,-969.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+646,"fix",3570,3585,,-976.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+647,"fix",3585,3600,,-983.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+648,"fix",3600,3615,,-990.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+649,"fix",3615,3630,,-997.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+650,"fix",3630,3645,,-1004.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+651,"fix",3645,3660,,-1011.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+652,"fix",3660,3675,,-1018.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+653,"fix",3675,3690,,-1025.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+654,"fix",3690,3705,,-1032.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+655,"fix",3705,3720,,-1039.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+656,"fix",3720,3735,,-1046.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+657,"fix",3735,3750,,-1053.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+658,"fix",3750,3765,,-1060.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+659,"fix",3765,3780,,-1067.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+660,"fix",3780,3795,,-1074.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+661,"fix",3795,3810,,-1081.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+662,"fix",3810,3825,,-1088.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+663,"fix",3825,3840,,-1095.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+664,"fix",3840,3855,,-1102.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+665,"fix",3855,3870,,-1109.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+666,"fix",3870,3885,,-1116.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+667,"fix",3885,3900,,-1123.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+668,"fix",3900,3915,,-1130.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+669,"fix",3915,3930,,-1137.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+670,"fix",3930,3945,,-1144.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+671,"fix",3945,3960,,-1151.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+672,"fix",3960,3975,,-1158.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+673,"fix",3975,3990,,-1165.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+674,"fix",3990,4005,,-1173.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+675,"fix",4005,4020,,-1180.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+676,"fix",4020,4035,,-1188.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+677,"fix",4035,4050,,-1196.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+678,"fix",4050,4065,,-1204.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+679,"fix",4065,4080,,-1212.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+680,"fix",4080,4095,,-1219.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+681,"fix",4095,4110,,-1227.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+682,"fix",4110,4125,,-1235.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+683,"fix",4125,4140,,-1243.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+684,"fix",4140,4155,,-1250.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+685,"fix",4155,4170,,-1258.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+686,"fix",4170,4185,,-1266.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+687,"fix",4185,4200,,-1274.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+688,"fix",4200,4215,,-1282.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+689,"fix",4215,4230,,-1289.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+690,"fix",4230,4245,,-1297.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+691,"fix",4245,4260,,-1305.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+692,"fix",4260,4275,,-1313.25,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+693,"fix",4275,4290,,-1321.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+694,"fix",4290,4305,,-1328.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+695,"fix",4305,4320,,-1336.6,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+696,"fix",4320,4335,,-1344.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+697,"fix",4335,4350,,-1352.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+698,"fix",4350,4365,,-1359.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+699,"fix",4365,4380,,-1367.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+700,"fix",4380,4395,,-1375.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+701,"fix",4395,4410,,-1383.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+702,"fix",4410,4425,,-1391.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+703,"fix",4425,4440,,-1398.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+704,"fix",4440,4455,,-1406.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+705,"fix",4455,4470,,-1414.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+706,"fix",4470,4485,,-1422.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+707,"fix",4485,4500,,-1430.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+708,"fix",4500,4515,,-1437.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+709,"fix",4515,4530,,-1445.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+710,"fix",4530,4545,,-1453.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+711,"fix",4545,4560,,-1461.15,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+712,"fix",4560,4575,,-1468.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+713,"fix",4575,4590,,-1476.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+714,"fix",4590,4605,,-1484.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+715,"fix",4605,4620,,-1492.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+716,"fix",4620,4635,,-1500.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+717,"fix",4635,4650,,-1507.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+718,"fix",4650,4665,,-1515.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+719,"fix",4665,4680,,-1523.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+720,"fix",4680,4695,,-1531.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+721,"fix",4695,4710,,-1538.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+722,"fix",4710,4725,,-1546.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+723,"fix",4725,4740,,-1554.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+724,"fix",4740,4755,,-1562.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+725,"fix",4755,4770,,-1570.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+726,"fix",4770,4785,,-1577.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+727,"fix",4785,4800,,-1585.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+728,"fix",4800,4815,,-1593.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+729,"fix",4815,4830,,-1601.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+730,"fix",4830,4845,,-1609.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+731,"fix",4845,4860,,-1616.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+732,"fix",4860,4875,,-1624.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+733,"fix",4875,4890,,-1632.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+734,"fix",4890,4905,,-1640.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+735,"fix",4905,4920,,-1647.97,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+736,"fix",4920,4935,,-1655.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+737,"fix",4935,4950,,-1663.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+738,"fix",4950,4965,,-1671.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+739,"fix",4965,4980,,-1679.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+740,"fix",4980,4995,,-1686.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+741,"fix",4995,5010,,-1694.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+742,"fix",5010,5025,,-1702.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+743,"fix",5025,5040,,-1711.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+744,"fix",5040,5055,,-1719.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+745,"fix",5055,5070,,-1727.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+746,"fix",5070,5085,,-1735.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+747,"fix",5085,5100,,-1743.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+748,"fix",5100,5115,,-1751.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+749,"fix",5115,5130,,-1759.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+750,"fix",5130,5145,,-1767.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+751,"fix",5145,5160,,-1775.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+752,"fix",5160,5175,,-1783.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+753,"fix",5175,5190,,-1791.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+754,"fix",5190,5205,,-1799.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+755,"fix",5205,5220,,-1807.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+756,"fix",5220,5235,,-1815.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+757,"fix",5235,5250,,-1823.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+758,"fix",5250,5265,,-1831.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+759,"fix",5265,5280,,-1839.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+760,"fix",5280,5295,,-1847.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+761,"fix",5295,5310,,-1855.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+762,"fix",5310,5325,,-1863.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+763,"fix",5325,5340,,-1871.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+764,"fix",5340,5355,,-1879.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+765,"fix",5355,5370,,-1887.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+766,"fix",5370,5385,,-1895.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+767,"fix",5385,5400,,-1903.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+768,"fix",5400,5415,,-1911.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+769,"fix",5415,5430,,-1919.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+770,"fix",5430,5445,,-1927.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+771,"fix",5445,5460,,-1935.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+772,"fix",5460,5475,,-1943.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+773,"fix",5475,5490,,-1951.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+774,"fix",5490,5505,,-1959.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+775,"fix",5505,5520,,-1967.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+776,"fix",5520,5535,,-1975.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+777,"fix",5535,5550,,-1983.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+778,"fix",5550,5565,,-1991.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+779,"fix",5565,5580,,-1999.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+780,"fix",5580,5595,,-2007.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+781,"fix",5595,5610,,-2015.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+782,"fix",5610,5625,,-2023.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+783,"fix",5625,5640,,-2032.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+784,"fix",5640,5655,,-2040.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+785,"fix",5655,5670,,-2048.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+786,"fix",5670,5685,,-2056.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+787,"fix",5685,5700,,-2064.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+788,"fix",5700,5715,,-2072.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+789,"fix",5715,5730,,-2080.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+790,"fix",5730,5745,,-2088.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+791,"fix",5745,5760,,-2096.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+792,"fix",5760,5775,,-2104.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+793,"fix",5775,5790,,-2112.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+794,"fix",5790,5805,,-2120.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+795,"fix",5805,5820,,-2128.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+796,"fix",5820,5835,,-2136.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+797,"fix",5835,5850,,-2144.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+798,"fix",5850,5865,,-2152.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+799,"fix",5865,5880,,-2160.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+800,"fix",5880,5895,,-2168.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+801,"fix",5895,5910,,-2176.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+802,"fix",5910,5925,,-2184.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+803,"fix",5925,5940,,-2192.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+804,"fix",5940,5955,,-2200.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+805,"fix",5955,5970,,-2208.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+806,"fix",5970,5985,,-2216.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+807,"fix",5985,6000,,-2224.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+808,"fix",6000,6015,,-2232.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+809,"fix",6015,6030,,-2240.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+810,"fix",6030,6045,,-2248.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+811,"fix",6045,6060,,-2256.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+812,"fix",6060,6075,,-2264.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+813,"fix",6075,6090,,-2272.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+814,"fix",6090,6105,,-2280.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+815,"fix",6105,6120,,-2288.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+816,"fix",6120,6135,,-2296.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+817,"fix",6135,6150,,-2304.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+818,"fix",6150,6165,,-2312.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+819,"fix",6165,6180,,-2320.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+820,"fix",6180,6195,,-2328.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+821,"fix",6195,6210,,-2336.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+822,"fix",6210,6225,,-2344.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+823,"fix",6225,6240,,-2353.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+824,"fix",6240,6255,,-2361.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+825,"fix",6255,6270,,-2369.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+826,"fix",6270,6285,,-2377.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+827,"fix",6285,6300,,-2385.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+828,"fix",6300,6315,,-2393.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+829,"fix",6315,6330,,-2401.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+830,"fix",6330,6345,,-2409.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+831,"fix",6345,6360,,-2417.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+832,"fix",6360,6375,,-2425.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+833,"fix",6375,6390,,-2433.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+834,"fix",6390,6405,,-2441.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+835,"fix",6405,6420,,-2449.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+836,"fix",6420,6435,,-2457.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+837,"fix",6435,6450,,-2465.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+838,"fix",6450,6465,,-2473.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+839,"fix",6465,6480,,-2481.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+840,"fix",6480,6495,,-2489.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+841,"fix",6495,6510,,-2497.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+842,"fix",6510,6525,,-2505.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+843,"fix",6525,6540,,-2513.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+844,"fix",6540,6555,,-2521.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+845,"fix",6555,6570,,-2529.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+846,"fix",6570,6585,,-2537.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+847,"fix",6585,6600,,-2545.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+848,"fix",6600,6615,,-2553.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+849,"fix",6615,6630,,-2561.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+850,"fix",6630,6645,,-2569.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+851,"fix",6645,6660,,-2577.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+852,"fix",6660,6675,,-2585.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+853,"fix",6675,6690,,-2593.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+854,"fix",6690,6705,,-2601.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+855,"fix",6705,6720,,-2609.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+856,"fix",6720,6735,,-2617.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+857,"fix",6735,6750,,-2625.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+858,"fix",6750,6765,,-2633.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+859,"fix",6765,6780,,-2641.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+860,"fix",6780,6795,,-2649.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+861,"fix",6795,6810,,-2657.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+862,"fix",6810,6825,,-2665.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+863,"fix",6825,6840,,-2674.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+864,"fix",6840,6855,,-2682.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+865,"fix",6855,6870,,-2690.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+866,"fix",6870,6885,,-2698.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+867,"fix",6885,6900,,-2706.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+868,"fix",6900,6915,,-2714.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+869,"fix",6915,6930,,-2722.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+870,"fix",6930,6945,,-2730.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+871,"fix",6945,6960,,-2738.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+872,"fix",6960,6975,,-2746.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+873,"fix",6975,6990,,-2754.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+874,"fix",6990,7005,,-2762.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+875,"fix",7005,7020,,-2770.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+876,"fix",7020,7035,,-2778.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+877,"fix",7035,7050,,-2786.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+878,"fix",7050,7065,,-2794.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+879,"fix",7065,7080,,-2802.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+880,"fix",7080,7095,,-2810.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+881,"fix",7095,7110,,-2818.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+882,"fix",7110,7125,,-2826.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+883,"fix",7125,7140,,-2834.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+884,"fix",7140,7155,,-2842.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+885,"fix",7155,7170,,-2850.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+886,"fix",7170,7185,,-2858.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+887,"fix",7185,7200,,-2866.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+888,"fix",7200,7215,,-2874.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+889,"fix",7215,7230,,-2882.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+890,"fix",7230,7245,,-2890.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+891,"fix",7245,7260,,-2898.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+892,"fix",7260,7275,,-2906.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+893,"fix",7275,7290,,-2914.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+894,"fix",7290,7305,,-2922.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+895,"fix",7305,7320,,-2930.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+896,"fix",7320,7335,,-2938.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+897,"fix",7335,7350,,-2946.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+898,"fix",7350,7365,,-2954.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+899,"fix",7365,7380,,-2962.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+900,"fix",7380,7395,,-2970.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+901,"fix",7395,7410,,-2978.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+902,"fix",7410,7425,,-2986.99,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+903,"fix",7425,7440,,-2995.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+904,"fix",7440,7455,,-3003.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+905,"fix",7455,7470,,-3011.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+906,"fix",7470,7485,,-3019.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+907,"fix",7485,7500,,-3027.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+908,"fix",7500,7500,,-3035.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeII","range","GROSS",
+,,,,,,,,,,,,,
+909,"fix",0,15,,0,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+910,"fix",15,30,,-2.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+911,"fix",30,45,,-5.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+912,"fix",45,60,,-8.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+913,"fix",60,75,,-11.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+914,"fix",75,90,,-14.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+915,"fix",90,105,,-17.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+916,"fix",105,120,,-20.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+917,"fix",120,135,,-22.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+918,"fix",135,150,,-25.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+919,"fix",150,165,,-28.6,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+920,"fix",165,180,,-31.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+921,"fix",180,195,,-34.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+922,"fix",195,210,,-37.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+923,"fix",210,225,,-40.05,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+924,"fix",225,240,,-42.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+925,"fix",240,255,,-45.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+926,"fix",255,270,,-48.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+927,"fix",270,285,,-51.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+928,"fix",285,300,,-54.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+929,"fix",300,315,,-57.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+930,"fix",315,330,,-60.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+931,"fix",330,345,,-62.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+932,"fix",345,360,,-65.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+933,"fix",360,375,,-68.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+934,"fix",375,390,,-71.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+935,"fix",390,405,,-74.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+936,"fix",405,420,,-77.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+937,"fix",420,435,,-80.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+938,"fix",435,450,,-82.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+939,"fix",450,465,,-86.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+940,"fix",465,480,,-89.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+941,"fix",480,495,,-93.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+942,"fix",495,510,,-97.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+943,"fix",510,525,,-100.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+944,"fix",525,540,,-104.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+945,"fix",540,555,,-107.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+946,"fix",555,570,,-111.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+947,"fix",570,585,,-115.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+948,"fix",585,600,,-118.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+949,"fix",600,615,,-122.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+950,"fix",615,630,,-125.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+951,"fix",630,645,,-129.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+952,"fix",645,660,,-133.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+953,"fix",660,675,,-136.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+954,"fix",675,690,,-140.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+955,"fix",690,705,,-144.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+956,"fix",705,720,,-147.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+957,"fix",720,735,,-151.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+958,"fix",735,750,,-154.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+959,"fix",750,765,,-158.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+960,"fix",765,780,,-162.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+961,"fix",780,795,,-165.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+962,"fix",795,810,,-169.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+963,"fix",810,825,,-172.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+964,"fix",825,840,,-176.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+965,"fix",840,855,,-180.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+966,"fix",855,870,,-184.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+967,"fix",870,885,,-188.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+968,"fix",885,900,,-193.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+969,"fix",900,915,,-197.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+970,"fix",915,930,,-202.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+971,"fix",930,945,,-207.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+972,"fix",945,960,,-211.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+973,"fix",960,975,,-216.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+974,"fix",975,990,,-220.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+975,"fix",990,1005,,-225.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+976,"fix",1005,1020,,-229.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+977,"fix",1020,1035,,-234.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+978,"fix",1035,1050,,-239.09,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+979,"fix",1050,1065,,-243.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+980,"fix",1065,1080,,-248.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+981,"fix",1080,1095,,-252.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+982,"fix",1095,1110,,-257.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+983,"fix",1110,1125,,-263.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+984,"fix",1125,1140,,-269.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+985,"fix",1140,1155,,-275.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+986,"fix",1155,1170,,-281.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+987,"fix",1170,1185,,-288.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+988,"fix",1185,1200,,-294.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+989,"fix",1200,1215,,-300.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+990,"fix",1215,1230,,-306.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+991,"fix",1230,1245,,-312.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+992,"fix",1245,1260,,-318.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+993,"fix",1260,1275,,-324.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+994,"fix",1275,1290,,-330.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+995,"fix",1290,1305,,-336.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+996,"fix",1305,1320,,-342.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+997,"fix",1320,1335,,-349.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+998,"fix",1335,1350,,-355.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+999,"fix",1350,1365,,-361.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1000,"fix",1365,1380,,-367.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1001,"fix",1380,1395,,-373.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1002,"fix",1395,1410,,-379.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1003,"fix",1410,1425,,-385.6,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1004,"fix",1425,1440,,-391.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1005,"fix",1440,1455,,-397.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1006,"fix",1455,1470,,-403.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1007,"fix",1470,1485,,-410.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1008,"fix",1485,1500,,-416.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1009,"fix",1500,1515,,-422.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1010,"fix",1515,1530,,-428.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1011,"fix",1530,1545,,-435.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1012,"fix",1545,1560,,-442.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1013,"fix",1560,1575,,-449.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1014,"fix",1575,1590,,-456.32,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1015,"fix",1590,1605,,-463.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1016,"fix",1605,1620,,-470.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1017,"fix",1620,1635,,-477.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1018,"fix",1635,1650,,-484.34,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1019,"fix",1650,1665,,-491.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1020,"fix",1665,1680,,-498.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1021,"fix",1680,1695,,-505.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1022,"fix",1695,1710,,-512.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1023,"fix",1710,1725,,-519.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1024,"fix",1725,1740,,-526.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1025,"fix",1740,1755,,-533.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1026,"fix",1755,1770,,-540.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1027,"fix",1770,1785,,-547.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1028,"fix",1785,1800,,-554.4,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1029,"fix",1800,1815,,-561.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1030,"fix",1815,1830,,-568.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1031,"fix",1830,1845,,-575.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1032,"fix",1845,1860,,-582.42,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1033,"fix",1860,1875,,-589.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1034,"fix",1875,1890,,-596.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1035,"fix",1890,1905,,-603.44,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1036,"fix",1905,1920,,-610.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1037,"fix",1920,1935,,-617.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1038,"fix",1935,1950,,-624.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1039,"fix",1950,1965,,-631.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1040,"fix",1965,1980,,-638.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1041,"fix",1980,1995,,-645.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1042,"fix",1995,2010,,-652.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1043,"fix",2010,2025,,-659.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1044,"fix",2025,2040,,-666.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1045,"fix",2040,2055,,-673.5,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1046,"fix",2055,2070,,-680.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1047,"fix",2070,2085,,-687.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1048,"fix",2085,2100,,-694.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1049,"fix",2100,2115,,-701.52,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1050,"fix",2115,2130,,-708.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1051,"fix",2130,2145,,-715.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1052,"fix",2145,2160,,-722.54,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1053,"fix",2160,2175,,-729.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1054,"fix",2175,2190,,-736.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1055,"fix",2190,2205,,-743.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1056,"fix",2205,2220,,-750.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1057,"fix",2220,2235,,-757.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1058,"fix",2235,2250,,-764.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1059,"fix",2250,2265,,-771.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1060,"fix",2265,2280,,-778.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1061,"fix",2280,2295,,-785.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1062,"fix",2295,2310,,-792.6,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1063,"fix",2310,2325,,-799.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1064,"fix",2325,2340,,-806.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1065,"fix",2340,2355,,-813.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1066,"fix",2355,2370,,-820.62,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1067,"fix",2370,2385,,-827.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1068,"fix",2385,2400,,-834.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1069,"fix",2400,2415,,-841.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1070,"fix",2415,2430,,-848.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1071,"fix",2430,2445,,-855.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1072,"fix",2445,2460,,-862.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1073,"fix",2460,2475,,-869.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1074,"fix",2475,2490,,-876.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1075,"fix",2490,2505,,-883.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1076,"fix",2505,2520,,-890.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1077,"fix",2520,2535,,-897.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1078,"fix",2535,2550,,-904.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1079,"fix",2550,2565,,-911.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1080,"fix",2565,2580,,-918.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1081,"fix",2580,2595,,-925.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1082,"fix",2595,2610,,-932.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1083,"fix",2610,2625,,-939.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1084,"fix",2625,2640,,-946.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1085,"fix",2640,2655,,-953.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1086,"fix",2655,2670,,-960.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1087,"fix",2670,2685,,-967.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1088,"fix",2685,2700,,-974.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1089,"fix",2700,2715,,-981.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1090,"fix",2715,2730,,-988.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1091,"fix",2730,2745,,-995.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1092,"fix",2745,2760,,-1002.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1093,"fix",2760,2775,,-1009.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1094,"fix",2775,2790,,-1016.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1095,"fix",2790,2805,,-1023.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1096,"fix",2805,2820,,-1030.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1097,"fix",2820,2835,,-1037.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1098,"fix",2835,2850,,-1044.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1099,"fix",2850,2865,,-1051.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1100,"fix",2865,2880,,-1058.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1101,"fix",2880,2895,,-1065.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1102,"fix",2895,2910,,-1072.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1103,"fix",2910,2925,,-1079.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1104,"fix",2925,2940,,-1086.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1105,"fix",2940,2955,,-1093.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1106,"fix",2955,2970,,-1100.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1107,"fix",2970,2985,,-1107.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1108,"fix",2985,3000,,-1114.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1109,"fix",3000,3015,,-1121.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1110,"fix",3015,3030,,-1128.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1111,"fix",3030,3045,,-1135.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1112,"fix",3045,3060,,-1142.89,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1113,"fix",3060,3075,,-1149.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1114,"fix",3075,3090,,-1156.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1115,"fix",3090,3105,,-1163.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1116,"fix",3105,3120,,-1170.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1117,"fix",3120,3135,,-1177.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1118,"fix",3135,3150,,-1184.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1119,"fix",3150,3165,,-1191.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1120,"fix",3165,3180,,-1198.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1121,"fix",3180,3195,,-1206.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1122,"fix",3195,3210,,-1214.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1123,"fix",3210,3225,,-1221.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1124,"fix",3225,3240,,-1229.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1125,"fix",3240,3255,,-1237.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1126,"fix",3255,3270,,-1245.3,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1127,"fix",3270,3285,,-1253.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1128,"fix",3285,3300,,-1260.87,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1129,"fix",3300,3315,,-1268.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1130,"fix",3315,3330,,-1276.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1131,"fix",3330,3345,,-1284.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1132,"fix",3345,3360,,-1292,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1133,"fix",3360,3375,,-1299.79,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1134,"fix",3375,3390,,-1307.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1135,"fix",3390,3405,,-1315.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1136,"fix",3405,3420,,-1323.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1137,"fix",3420,3435,,-1330.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1138,"fix",3435,3450,,-1338.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1139,"fix",3450,3465,,-1346.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1140,"fix",3465,3480,,-1354.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1141,"fix",3480,3495,,-1362.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1142,"fix",3495,3510,,-1369.85,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1143,"fix",3510,3525,,-1377.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1144,"fix",3525,3540,,-1385.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1145,"fix",3540,3555,,-1393.2,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1146,"fix",3555,3570,,-1400.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1147,"fix",3570,3585,,-1408.77,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1148,"fix",3585,3600,,-1416.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1149,"fix",3600,3615,,-1424.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1150,"fix",3615,3630,,-1432.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1151,"fix",3630,3645,,-1439.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1152,"fix",3645,3660,,-1447.69,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1153,"fix",3660,3675,,-1455.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1154,"fix",3675,3690,,-1463.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1155,"fix",3690,3705,,-1471.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1156,"fix",3705,3720,,-1478.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1157,"fix",3720,3735,,-1486.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1158,"fix",3735,3750,,-1494.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1159,"fix",3750,3765,,-1502.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1160,"fix",3765,3780,,-1509.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1161,"fix",3780,3795,,-1517.75,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1162,"fix",3795,3810,,-1525.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1163,"fix",3810,3825,,-1533.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1164,"fix",3825,3840,,-1541.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1165,"fix",3840,3855,,-1548.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1166,"fix",3855,3870,,-1556.67,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1167,"fix",3870,3885,,-1564.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1168,"fix",3885,3900,,-1572.24,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1169,"fix",3900,3915,,-1580.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1170,"fix",3915,3930,,-1587.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1171,"fix",3930,3945,,-1595.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1172,"fix",3945,3960,,-1603.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1173,"fix",3960,3975,,-1611.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1174,"fix",3975,3990,,-1618.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1175,"fix",3990,4005,,-1626.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1176,"fix",4005,4020,,-1634.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1177,"fix",4020,4035,,-1642.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1178,"fix",4035,4050,,-1650.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1179,"fix",4050,4065,,-1657.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1180,"fix",4065,4080,,-1665.65,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1181,"fix",4080,4095,,-1673.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1182,"fix",4095,4110,,-1681.22,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1183,"fix",4110,4125,,-1689,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1184,"fix",4125,4140,,-1696.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1185,"fix",4140,4155,,-1704.57,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1186,"fix",4155,4170,,-1712.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1187,"fix",4170,4185,,-1720.14,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1188,"fix",4185,4200,,-1727.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1189,"fix",4200,4215,,-1735.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1190,"fix",4215,4230,,-1743.49,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1191,"fix",4230,4245,,-1751.27,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1192,"fix",4245,4260,,-1759.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1193,"fix",4260,4275,,-1766.84,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1194,"fix",4275,4290,,-1774.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1195,"fix",4290,4305,,-1782.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1196,"fix",4305,4320,,-1790.19,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1197,"fix",4320,4335,,-1797.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1198,"fix",4335,4350,,-1805.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1199,"fix",4350,4365,,-1813.55,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1200,"fix",4365,4380,,-1821.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1201,"fix",4380,4395,,-1829.12,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1202,"fix",4395,4410,,-1836.9,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1203,"fix",4410,4425,,-1844.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1204,"fix",4425,4440,,-1852.47,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1205,"fix",4440,4455,,-1860.25,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1206,"fix",4455,4470,,-1868.04,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1207,"fix",4470,4485,,-1875.82,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1208,"fix",4485,4500,,-1883.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1209,"fix",4500,4515,,-1891.39,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1210,"fix",4515,4530,,-1899.17,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1211,"fix",4530,4545,,-1906.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1212,"fix",4545,4560,,-1914.74,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1213,"fix",4560,4575,,-1922.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1214,"fix",4575,4590,,-1930.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1215,"fix",4590,4605,,-1938.1,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1216,"fix",4605,4620,,-1945.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1217,"fix",4620,4635,,-1953.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1218,"fix",4635,4650,,-1961.45,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1219,"fix",4650,4665,,-1969.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1220,"fix",4665,4680,,-1977.02,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1221,"fix",4680,4695,,-1984.8,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1222,"fix",4695,4710,,-1992.59,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1223,"fix",4710,4725,,-2000.37,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1224,"fix",4725,4740,,-2008.15,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1225,"fix",4740,4755,,-2015.94,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1226,"fix",4755,4770,,-2023.72,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1227,"fix",4770,4785,,-2031.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1228,"fix",4785,4800,,-2039.29,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1229,"fix",4800,4815,,-2047.07,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1230,"fix",4815,4830,,-2054.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1231,"fix",4830,4845,,-2062.64,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1232,"fix",4845,4860,,-2070.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1233,"fix",4860,4875,,-2078.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1234,"fix",4875,4890,,-2086,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1235,"fix",4890,4905,,-2093.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1236,"fix",4905,4920,,-2101.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1237,"fix",4920,4935,,-2109.35,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1238,"fix",4935,4950,,-2117.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1239,"fix",4950,4965,,-2124.92,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1240,"fix",4965,4980,,-2132.7,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1241,"fix",4980,4995,,-2140.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1242,"fix",4995,5010,,-2148.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1243,"fix",5010,5025,,-2156.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1244,"fix",5025,5040,,-2164.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1245,"fix",5040,5055,,-2172.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1246,"fix",5055,5070,,-2180.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1247,"fix",5070,5085,,-2188.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1248,"fix",5085,5100,,-2196.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1249,"fix",5100,5115,,-2204.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1250,"fix",5115,5130,,-2212.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1251,"fix",5130,5145,,-2220.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1252,"fix",5145,5160,,-2228.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1253,"fix",5160,5175,,-2236.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1254,"fix",5175,5190,,-2244.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1255,"fix",5190,5205,,-2252.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1256,"fix",5205,5220,,-2260.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1257,"fix",5220,5235,,-2268.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1258,"fix",5235,5250,,-2276.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1259,"fix",5250,5265,,-2284.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1260,"fix",5265,5280,,-2293.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1261,"fix",5280,5295,,-2301.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1262,"fix",5295,5310,,-2309.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1263,"fix",5310,5325,,-2317.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1264,"fix",5325,5340,,-2325.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1265,"fix",5340,5355,,-2333.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1266,"fix",5355,5370,,-2341.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1267,"fix",5370,5385,,-2349.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1268,"fix",5385,5400,,-2357.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1269,"fix",5400,5415,,-2365.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1270,"fix",5415,5430,,-2373.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1271,"fix",5430,5445,,-2381.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1272,"fix",5445,5460,,-2389.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1273,"fix",5460,5475,,-2397.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1274,"fix",5475,5490,,-2405.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1275,"fix",5490,5505,,-2413.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1276,"fix",5505,5520,,-2421.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1277,"fix",5520,5535,,-2429.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1278,"fix",5535,5550,,-2437.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1279,"fix",5550,5565,,-2445.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1280,"fix",5565,5580,,-2453.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1281,"fix",5580,5595,,-2461.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1282,"fix",5595,5610,,-2469.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1283,"fix",5610,5625,,-2477.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1284,"fix",5625,5640,,-2485.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1285,"fix",5640,5655,,-2493.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1286,"fix",5655,5670,,-2501.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1287,"fix",5670,5685,,-2509.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1288,"fix",5685,5700,,-2517.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1289,"fix",5700,5715,,-2525.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1290,"fix",5715,5730,,-2533.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1291,"fix",5730,5745,,-2541.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1292,"fix",5745,5760,,-2549.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1293,"fix",5760,5775,,-2557.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1294,"fix",5775,5790,,-2565.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1295,"fix",5790,5805,,-2573.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1296,"fix",5805,5820,,-2581.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1297,"fix",5820,5835,,-2589.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1298,"fix",5835,5850,,-2597.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1299,"fix",5850,5865,,-2605.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1300,"fix",5865,5880,,-2614.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1301,"fix",5880,5895,,-2622.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1302,"fix",5895,5910,,-2630.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1303,"fix",5910,5925,,-2638.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1304,"fix",5925,5940,,-2646.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1305,"fix",5940,5955,,-2654.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1306,"fix",5955,5970,,-2662.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1307,"fix",5970,5985,,-2670.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1308,"fix",5985,6000,,-2678.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1309,"fix",6000,6015,,-2686.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1310,"fix",6015,6030,,-2694.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1311,"fix",6030,6045,,-2702.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1312,"fix",6045,6060,,-2710.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1313,"fix",6060,6075,,-2718.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1314,"fix",6075,6090,,-2726.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1315,"fix",6090,6105,,-2734.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1316,"fix",6105,6120,,-2742.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1317,"fix",6120,6135,,-2750.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1318,"fix",6135,6150,,-2758.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1319,"fix",6150,6165,,-2766.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1320,"fix",6165,6180,,-2774.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1321,"fix",6180,6195,,-2782.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1322,"fix",6195,6210,,-2790.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1323,"fix",6210,6225,,-2798.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1324,"fix",6225,6240,,-2806.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1325,"fix",6240,6255,,-2814.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1326,"fix",6255,6270,,-2822.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1327,"fix",6270,6285,,-2830.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1328,"fix",6285,6300,,-2838.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1329,"fix",6300,6315,,-2846.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1330,"fix",6315,6330,,-2854.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1331,"fix",6330,6345,,-2862.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1332,"fix",6345,6360,,-2870.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1333,"fix",6360,6375,,-2878.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1334,"fix",6375,6390,,-2886.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1335,"fix",6390,6405,,-2894.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1336,"fix",6405,6420,,-2902.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1337,"fix",6420,6435,,-2910.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1338,"fix",6435,6450,,-2918.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1339,"fix",6450,6465,,-2926.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1340,"fix",6465,6480,,-2935.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1341,"fix",6480,6495,,-2943.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1342,"fix",6495,6510,,-2951.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1343,"fix",6510,6525,,-2959.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1344,"fix",6525,6540,,-2967.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1345,"fix",6540,6555,,-2975.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1346,"fix",6555,6570,,-2983.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1347,"fix",6570,6585,,-2991.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1348,"fix",6585,6600,,-2999.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1349,"fix",6600,6615,,-3007.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1350,"fix",6615,6630,,-3015.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1351,"fix",6630,6645,,-3023.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1352,"fix",6645,6660,,-3031.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1353,"fix",6660,6675,,-3039.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1354,"fix",6675,6690,,-3047.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1355,"fix",6690,6705,,-3055.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1356,"fix",6705,6720,,-3063.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1357,"fix",6720,6735,,-3071.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1358,"fix",6735,6750,,-3079.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1359,"fix",6750,6765,,-3087.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1360,"fix",6765,6780,,-3095.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1361,"fix",6780,6795,,-3103.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1362,"fix",6795,6810,,-3111.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1363,"fix",6810,6825,,-3119.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1364,"fix",6825,6840,,-3127.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1365,"fix",6840,6855,,-3135.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1366,"fix",6855,6870,,-3143.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1367,"fix",6870,6885,,-3151.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1368,"fix",6885,6900,,-3159.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1369,"fix",6900,6915,,-3167.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1370,"fix",6915,6930,,-3175.76,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1371,"fix",6930,6945,,-3183.78,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1372,"fix",6945,6960,,-3191.81,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1373,"fix",6960,6975,,-3199.83,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1374,"fix",6975,6990,,-3207.86,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1375,"fix",6990,7005,,-3215.88,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1376,"fix",7005,7020,,-3223.91,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1377,"fix",7020,7035,,-3231.93,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1378,"fix",7035,7050,,-3239.96,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1379,"fix",7050,7065,,-3247.98,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1380,"fix",7065,7080,,-3256.01,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1381,"fix",7080,7095,,-3264.03,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1382,"fix",7095,7110,,-3272.06,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1383,"fix",7110,7125,,-3280.08,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1384,"fix",7125,7140,,-3288.11,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1385,"fix",7140,7155,,-3296.13,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1386,"fix",7155,7170,,-3304.16,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1387,"fix",7170,7185,,-3312.18,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1388,"fix",7185,7200,,-3320.21,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1389,"fix",7200,7215,,-3328.23,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1390,"fix",7215,7230,,-3336.26,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1391,"fix",7230,7245,,-3344.28,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1392,"fix",7245,7260,,-3352.31,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1393,"fix",7260,7275,,-3360.33,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1394,"fix",7275,7290,,-3368.36,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1395,"fix",7290,7305,,-3376.38,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1396,"fix",7305,7320,,-3384.41,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1397,"fix",7320,7335,,-3392.43,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1398,"fix",7335,7350,,-3400.46,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1399,"fix",7350,7365,,-3408.48,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1400,"fix",7365,7380,,-3416.51,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1401,"fix",7380,7395,,-3424.53,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1402,"fix",7395,7410,,-3432.56,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1403,"fix",7410,7425,,-3440.58,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1404,"fix",7425,7440,,-3448.61,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1405,"fix",7440,7455,,-3456.63,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1406,"fix",7455,7470,,-3464.66,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1407,"fix",7470,7485,,-3472.68,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1408,"fix",7485,7500,,-3480.71,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+1409,"fix",7500,7500,,-3488.73,"Withholding Tax","Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)",130,"P.P","hr_payroll_rules_baremeIII","range","GROSS",
+,,,,,,,,,,,,,
+1410,"fix",1,1,,31,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1411,"fix",2,2,,85,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1412,"fix",3,3,,229,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1413,"fix",4,4,,418,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1414,"fix",5,5,,618,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1415,"fix",6,6,,817,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1416,"fix",7,7,,1016,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1417,"fix",8,8,,1231,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1418,"fix",9,9,,1452,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+1419,"fix",10,10,,1673,"Child Allowance Belgium","Child Allowance Belgium",142,"Ch.A","hr_payroll_rules_child","range","employee.children",
+,,,,,,,,,,,,,
+1420,"fix",1,1,,85,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1421,"fix",2,2,,418,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1422,"fix",3,3,,817,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1423,"fix",4,4,,1231,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1424,"fix",5,5,,1673,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1425,"fix",6,6,,2115,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1426,"fix",7,7,,2557,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1427,"fix",8,8,,2999,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1428,"fix",9,9,,3441,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
+1429,"fix",10,10,,3883,"Child Allowance for the Disabled Belgium","Child Allowance Belgium",144,"Ch.Handicap","hr_payroll_rules_child_handicap","range","employee.disabled_children_number",
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
new file mode 100644
index 00000000000..4cd0c91e7aa
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
@@ -0,0 +1,56 @@
+#-*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import decimal_precision as dp
+
+class hr_contract_be(osv.osv):
+    _inherit = 'hr.contract'
+
+    _columns = {
+        'travel_reimbursement_amount': fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')),
+        'car_company_amount': fields.float('Company car employer', digits_compute=dp.get_precision('Payroll')),
+        'car_employee_deduction': fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll')),
+        'misc_onss_deduction': fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Payroll')),
+        'meal_voucher_amount': fields.float('Check Value Meal ', digits_compute=dp.get_precision('Payroll')),
+        'meal_voucher_employee_deduction': fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Payroll')),
+        'insurance_employee_deduction': fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Payroll')),
+        'misc_advantage_amount': fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Payroll')),
+        'additional_net_amount': fields.float('Net supplements', digits_compute=dp.get_precision('Payroll')),
+        'retained_net_amount': fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')),
+    }
+    
+hr_contract_be()
+
+class hr_employee_be(osv.osv):
+    _inherit = 'hr.employee'
+
+    _columns = {
+        'spouse_fiscal_status': fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'),
+        'disabled_spouse_bool': fields.boolean('Disabled Spouse', help="if recipient spouse is declared disabled by law"),
+        'disabled_children_bool': fields.boolean('Disabled Children', help="if recipient children is/are declared disabled by law"),
+        'resident_bool': fields.boolean('Nonresident', help="if recipient lives in a foreign country"),
+        'disabled_children_number': fields.integer('Number of disabled children'),
+    }
+    
+hr_employee_be()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
new file mode 100644
index 00000000000..799c544a0c8
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    <record id="hr_payroll_head_salary" model="hr.salary.rule.category">
+        <field name="name">Gross</field>
+        <field name="code">BRUT</field>
+    </record>
+    <record id="hr_payroll.COMP" model="hr.salary.rule.category">
+        <field name="name">Company Part</field>
+        <field name="code">COMP. PART</field>
+    </record>
+    <record id="hr_payroll_head_onss" model="hr.salary.rule.category">
+        <field name="name">Worker Social Contribution</field>
+        <field name="code">ONSS</field>
+        <field name="parent_id" ref="hr_payroll.ALW"/>
+    </record>
+    <record id="hr_payroll_head_div_impos" model="hr.salary.rule.category">
+        <field name="name">Misc. Taxable</field>
+        <field name="code">DIV. IMPOS</field>
+        <field name="parent_id" ref="hr_payroll.ALW"/>
+    </record>
+    <record id="hr_payroll_head_pp" model="hr.salary.rule.category">
+        <field name="name">Withholding Tax Grid 2011 (Precompte Professionnel Bareme 2011)</field>
+        <field name="code">P.P.</field>
+        <field name="parent_id" ref="hr_payroll.DED"/>
+    </record>
+    <record id="hr_payroll_head_div_net" model="hr.salary.rule.category">
+        <field name="name">Misc. Net</field>
+        <field name="code">DIV. NET</field>
+        <field name="parent_id" ref="hr_payroll.DED"/>
+    </record>
+    <record id="hr_payroll_head_child_alw" model="hr.salary.rule.category">
+        <field name="name">Child Allowance Belgium</field>
+        <field name="code">Ch.A</field>
+        <field name="parent_id" ref="hr_payroll.DED"/>
+    </record>
+
+<!-- HR SALARY RULES-->
+    <record id="hr_payroll_rules_maj" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_salary"/> 
+        <field name="name">Worker Salary. Premium pay of 108%</field>
+        <field name="code">SALARY</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = contract.wage * 1.08</field>
+    </record>
+    <record id="hr_payroll_rules_employee" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_salary"/> 
+        <field name="name">Employee Salary</field>
+        <field name="code">SALARY</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = contract.wage * 1</field>
+        <field name="appears_on_payslip" eval="False"/>
+    </record>
+    <record id="hr_payroll_rules_onss_rule" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_onss"/> 
+        <field name="name">Social contribution</field>
+        <field name="code">ONSS</field>
+        <field name="sequence">41</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">SALARY</field>
+        <field name="amount_percentage">-13.07</field>
+   </record>
+   <record id="hr_payroll_rules_p_p_b1" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_pp"/> 
+        <field name="name">Withholding Tax Grid 2011</field>
+        <field name="code">P.P</field>
+        <field name="sequence">120</field>
+        <field name="amount_select">fix</field>
+        <field name="condition_select">none</field>
+        <field name="appears_on_payslip" eval="False"/>
+    </record>
+    <record id="hr_payroll_rules_bareme" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_pp"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_p_p_b1"/>
+        <field name="name">Withholding Tax</field>
+        <field name="code">B.I.</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">120</field>
+        <field name="condition_select">python</field>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_python">result = (((employee.marital=='single') or (employee.marital=='married' and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))</field>
+    </record>
+    <record id="hr_payroll_rules_baremeII" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_pp"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_p_p_b1"/>
+        <field name="name">Withholding Tax</field>
+        <field name="code">B.II</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">120</field>
+        <field name="condition_select">python</field>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_python">result = ((employee.marital=='married' and employee.spouse_fiscal_status=='without income') and (employee.resident_bool!=True))</field>
+    </record>
+    <record id="hr_payroll_rules_baremeIII" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_pp"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_p_p_b1"/>
+        <field name="name">Withholding Tax</field>
+        <field name="code">B.III</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">120</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = employee.resident_bool==True</field>
+        <field name="appears_on_payslip" eval="False"/>
+    </record>
+    <record id="hr_payroll_rules_child_alw" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.DED"/>
+        <field name="name">Child Allowance Belgium</field>
+        <field name="code">Child.Allowance</field>
+        <field name="sequence">140</field>
+        <field name="amount_select">fix</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(employee.children)</field>
+    </record>
+    <record id="hr_payroll_rules_child" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.DED"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_child_alw"/>
+        <field name="name">Child Allowance Belgium</field>
+        <field name="code">Ch.A</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">141</field>
+        <field name="note">The recipient of income is an isolated or spouse beneficiary's income has also
+                                        earned income (Schedule I / II scale)
+
+                                        A. When the gross monthly earnings do not exceed € 7,500, the withholding tax is determined according to the Schedule I.
+                                        The following reductions are then deducted from the payroll tax determined in accordance with this schedule:
+
+                                                a) Reduction for dependent children</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(employee.children)</field>
+    </record>
+    <record id="hr_payroll_rules_child_handicap" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.DED"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_child_alw"/>
+        <field name="name">Child Allowance for the Disabled Belgium</field>
+        <field name="code">Ch.Handicap</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">143</field>
+        <field name="note">"Disabled child" means:
+
+                    the child reaches at least 66% of failure or reduced physical or mental capacity
+                    the head of one or more conditions;
+
+
+                    the child that is established, regardless of age, that due to developments and recognized
+                    before age 65</field>
+                <field name="condition_select">python</field>
+                <field name="condition_python">result = bool(employee.disabled_children_number)</field>
+    </record>
+    <record id="hr_payroll_rules_spouse_handicap" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_net"/>
+        <field name="name">Disabled Spouse Allowance</field>
+        <field name="code">Sp.handicap</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">145</field>
+        <field name="amount_fix">31</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = employee.disabled_spouse_bool==True</field>
+    </record>
+    <record id="hr_payroll_rules_company_car_parent" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_impos"/>
+        <field name="name">Company Car</field>
+        <field name="code">car</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">15</field>
+        <field name="condtion_select">none</field>
+        <field name="appears_on_payslip" eval="False"/>
+    </record>
+    <record id="hr_payroll_rules_parent_company_car" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_impos"/>
+        <field name="name">Company car</field>
+        <field name="parent_rule_id" ref="hr_payroll_rules_company_car_parent"/>
+        <field name="code">CAR 1</field>
+        <field name="sequence">15</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.car_employee_deduction)</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = contract.car_employee_deduction</field>
+    </record>
+    <record id="hr_payroll_rules_company_car_2" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_net"/>
+        <field name="name">Retenue Company car</field>
+        <field name="parent_rule_id" ref="hr_payroll_rules_company_car_parent"/>
+        <field name="code">CAR 2</field>
+        <field name="sequence">160</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = contract.car_employee_deduction</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = -contract.car_employee_deduction</field>
+    </record>
+    <record id="hr_payroll_rules_company_car_emp" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="name">Company car, Company part</field>
+        <field name="parent_rule_id" ref="hr_payroll_rules_company_car_parent"/>
+        <field name="code">CAR 3</field>
+        <field name="sequence">160</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.car_company_amount)</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = -contract.car_company_amount</field>
+        <field name="appears_on_payslip" eval="False"/>
+    </record>
+    <record id="hr_payroll_rules_parent_ch" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_net"/>
+        <field name="name">Meal Voucher</field>
+        <field name="code">MEAL_V</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">165</field>
+        <field name="condition_select">none</field>
+        <field name="appears_on_payslip" eval="False"/>
+    </record>
+    <record id="hr_payroll_rules_ch_value" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_parent_ch"/>
+        <field name="name">Meal Voucher, Company Part</field>
+        <field name="code">MEAL_V_COMP</field>
+        <field name="amount_select">fix</field>
+        <field name="sequence">165</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = -(contract.meal_voucher_amount - contract.meal_voucher_employee_deduction) * worked_days.WORK100.number_of_days</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.meal_voucher_amount)</field>
+        <field name="appears_on_payslip" eval="False"/>
+    </record>
+    <record id="hr_payroll_rules_ch_worker" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_net"/>
+        <field name="name">Retain on Meal Voucher</field>
+        <field name="parent_rule_id" ref="hr_payroll_rules_parent_ch"/>
+        <field name="code">MEAL_V_EMP</field>
+        <field name="sequence">165</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.meal_voucher_employee_deduction)</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">-100.0</field>
+        <field name="amount_percentage_base">contract.meal_voucher_employee_deduction</field>
+        <field name="quantity">worked_days.WORK100.number_of_days</field>
+        <field name="appears_on_payslip" eval="True"/>
+    </record>
+    <record id="hr_payroll_rules_reim_travel" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.DED"/>
+        <field name="name">Reimbursement of travel expenses</field>
+        <field name="code">Tr.E</field>
+        <field name="amount_select">code</field>
+        <field name="sequence">65</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.travel_reimbursement_amount)</field>
+        <field name="amount_python_compute">result = contract.travel_reimbursement_amount</field>
+    </record>
+    <record id="hr_payroll_rules_mis_ex_onss" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.DED"/>
+        <field name="name">Miscellaneous exempt ONSS</field>
+        <field name="code">M.ONSS</field>
+        <field name="amount_select">code</field>
+        <field name="sequence">165</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.misc_onss_deduction)</field>
+        <field name="amount_python_compute">result = -contract.misc_onss_deduction</field>
+    </record>
+    <record id="hr_payroll_rules_insurance" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.DED"/>
+        <field name="name">Insurance</field>
+        <field name="code">Ins</field>
+        <field name="amount_select">code</field>
+        <field name="sequence">165</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.insurance_employee_deduction)</field>
+        <field name="amount_pyton_compute">result = -contract.insurance_employee_deduction</field>
+    </record>
+    <record id="hr_payroll_rules_advantage" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.ALW"/>
+        <field name="name">Benefits of various nature</field>
+        <field name="code">Ben</field>
+        <field name="amount_select">code</field>
+        <field name="sequence">10</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.misc_advantage_amount)</field>
+        <field name="amount_python_compute">result = contract.misc_advantage_amount</field>
+    </record>
+    <record id="hr_payroll_rules_suppl_net" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_net"/>
+        <field name="name">Net Supplement</field>
+        <field name="code">Net.S</field>
+        <field name="amount_select">code</field>
+        <field name="sequence">185</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.additional_net_amount)</field>
+        <field name="amount_python_compute">result = contract.additional_net_amount</field>
+    </record>
+    <record id="hr_payroll_rules_retained_net" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll_head_div_net"/>
+        <field name="name">Net retained</field>
+        <field name="code">Net.R</field>
+        <field name="amount_select">code</field>
+        <field name="sequence">190</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = bool(contract.retained_net_amount)</field>
+        <field name="amount_python_compute">result = -contract.retained_net_amount</field>
+    </record>
+    <record id="hr_payroll_salary_structure_employee" model="hr.payroll.structure">
+        <field name="code">C.P.218</field>
+        <field name="name">Belgian Employee</field>
+        <field eval="[(6, 0, [ref('hr_payroll_rules_company_car_parent'),ref('hr_payroll_rules_onss_rule'),ref('hr_payroll_rules_employee'),ref('hr_payroll_rules_p_p_b1'),ref('hr_payroll_rules_child_alw'),ref('hr_payroll_rules_parent_ch'),ref('hr_payroll_rules_reim_travel'),ref('hr_payroll_rules_mis_ex_onss'),ref('hr_payroll_rules_insurance'),ref('hr_payroll_rules_advantage'),ref('hr_payroll_rules_suppl_net'),ref('hr_payroll_rules_retained_net')])]" name="rule_ids"/>
+        <field name="company_id" ref="base.main_company"/>    
+        <field name="parent_id" ref="hr_payroll.structure_base"/>
+    </record>
+    <record id="hr_payroll_salary_structure_worker" model="hr.payroll.structure">
+        <field name="code">C.P.219</field>
+        <field name="name">Belgian Worker</field>
+        <field eval="[(6, 0, [ref('hr_payroll_rules_maj'), ref('hr_payroll_rules_onss_rule'),ref('hr_payroll_rules_p_p_b1'),ref('hr_payroll_rules_child_alw'),ref('hr_payroll_rules_parent_ch'),ref('hr_payroll_rules_reim_travel'),ref('hr_payroll_rules_mis_ex_onss'),ref('hr_payroll_rules_insurance'),ref('hr_payroll_rules_advantage'),ref('hr_payroll_rules_suppl_net'),ref('hr_payroll_rules_retained_net')])]" 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_be_hr_payroll/l10n_be_hr_payroll_demo.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
new file mode 100644
index 00000000000..5e3170ca24e
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Employee Contract -->
+        <record id="hr_payroll.hr_contract_firstcontract1" model="hr.contract">
+            <field name="name">Bonamy's Contract (Belgium payroll C.P. 218)</field>
+            <field name="struct_id" ref="hr_payroll_salary_structure_employee"/>
+            <field eval="2500.0" name="wage"/>
+            <field eval="6.0" name="meal_voucher_amount"/>
+            <field eval="1.09" name="meal_voucher_employee_deduction"/>
+            <field eval="250.0" name="car_company_amount"/>
+            <field eval="110" name="car_employee_deduction"/>
+            <field eval="50.0" name="additional_net_amount"/>
+            <field name="working_hours" ref="resource.timesheet_group1"/>
+        </record>
+
+        <record id="hr_payroll.hr_employee_bonamy0" model="hr.employee">
+            <field name="marital">single</field>
+        </record>
+
+    </data>
+</openerp>
+
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
new file mode 100644
index 00000000000..9135499f7bc
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <record id="hr_contract_form_l10n_be_inherit" model="ir.ui.view">
+            <field name="name">hr.contract.form.inherit</field>
+            <field name="model">hr.contract</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
+                    <field name="travel_reimbursement_amount"/>
+                    <field name="car_company_amount"/>
+                    <field name="misc_onss_deduction"/>
+                    <field name="meal_voucher_amount"/>
+                    <field name="misc_advantage_amount"/>
+                    <separator string="Miscellaneous" colspan="2"/>
+                    <field name="additional_net_amount"/>
+                    <field name="retained_net_amount"/>
+                 </xpath>
+                 <xpath expr="/form/notebook/page/group/field[@name='trial_date_end']" position="after">
+                    <group colspan="2" col="2">
+                        <separator string="by Worker" colspan="2"/>
+                        <field name="insurance_employee_deduction"/>
+                        <field name="meal_voucher_employee_deduction"/>
+                        <field name="car_employee_deduction"/>
+                    </group>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+       <!-- <record id="view_employee_marital_required_form" model="ir.ui.view">
+            <field name="name">hr.employee.inherit.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="priority">25</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="marital" position="replace">
+                </field>
+            </field>
+        </record> -->
+
+        <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="priority">30</field>
+            <field name="arch" type="xml">
+            <data>
+                <!-- <xpath expr="/form/notebook/page/group/field[@name='birthday']" position="after">
+                    <field name="marital" required="True"/>
+                </xpath> -->
+                <xpath expr="/form/notebook/page/group/field[@name='gender']" position="before">
+                    <field name="resident_bool" eval="False"/> 
+                </xpath>
+                <xpath expr="/form/notebook/page/group/field[@name='marital']" position="after">
+                    <field name="spouse_fiscal_status" attrs="{'invisible':[('marital','!=','married')],'required':[('marital','=','married')]}" colspan="1" help="if spouse has professionnel income or not"/> 
+                    <field name="disabled_spouse_bool" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/>
+                </xpath>
+                <xpath expr="/form/notebook/page/group/field[@name='children']" position="after">
+                    <field name="disabled_children_bool"/>
+                    <field name="disabled_children_number" attrs="{'invisible':[('disabled_children_bool','!=',True)]}" colspan="1" help="number of dependent children declared as disabled"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/l10n_be_invoice_bba/__init__.py b/addons/l10n_be_invoice_bba/__init__.py
index 176d1b9a904..48cd4bc0347 100644
--- a/addons/l10n_be_invoice_bba/__init__.py
+++ b/addons/l10n_be_invoice_bba/__init__.py
@@ -22,3 +22,5 @@
 
 import partner
 import invoice
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py
index e4b209317d0..c18f49817b5 100644
--- a/addons/l10n_be_invoice_bba/__openerp__.py
+++ b/addons/l10n_be_invoice_bba/__openerp__.py
@@ -53,3 +53,5 @@ A 'random' Structured Communication will generated if no algorithm is specified
     ],
     'active': False,
     'installable': True,}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index b1db829eddf..997036c0cec 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -180,6 +180,8 @@ class account_invoice(osv.osv):
         return super(account_invoice, self).create(cr, uid, vals, context=context)     
 
     def write(self, cr, uid, ids, vals, context={}):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         for inv in self.browse(cr, uid, ids, context):    
             if vals.has_key('reference_type'):
                 reference_type = vals['reference_type']
@@ -213,3 +215,5 @@ class account_invoice(osv.osv):
         ]
 
 account_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py
index 194ae39ed86..04a51c3a6ab 100644
--- a/addons/l10n_be_invoice_bba/partner.py
+++ b/addons/l10n_be_invoice_bba/partner.py
@@ -50,3 +50,5 @@ class res_partner(osv.osv):
         'out_inv_comm_type': 'none',
     }
 res_partner()    
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_br/__init__.py b/addons/l10n_br/__init__.py
index efb54d8e4c1..ad29d242d37 100644
--- a/addons/l10n_br/__init__.py
+++ b/addons/l10n_br/__init__.py
@@ -4,7 +4,7 @@
 # Copyright (C) 2009  Renato Lima - Akretion                                    #
 #                                                                               #
 #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           #
+#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.                                            #
 #                                                                               #
@@ -17,5 +17,8 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.          #
 #################################################################################
 
+import account
+import l10n_br
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 578978599a0..86ff4cd4e83 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -4,7 +4,7 @@
 #    Copyright (C) 2009  Renato Lima - Akretion
 #
 #    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
+#    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.
 #
@@ -20,29 +20,50 @@
 
 {
     'name': 'Brazilian Localization',
-    'description': 'Brazilian Localization',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
-This is the base module to manage the accounting chart for Brazil in OpenERP.
-=============================================================================
+Base module for the Brazilian localization
+==========================================
 
-Brazilian accounting chart and localization.
-    """,
-    'author': 'OpenERP Brasil',
+This module consists in:
+
+ - Generic Brazilian chart of accounts
+ - Brazilian taxes such as:
+
+        - IPI
+        - ICMS
+        - PIS
+        - COFINS
+        - ISS
+        - IR
+        - IRPJ
+        - CSLL
+
+ - Tax Situation Code (CST) required for the electronic fiscal invoicing (NFe)
+
+The field tax_discount has also been added in the account.tax.template and account.tax objects to allow the proper computation of some Brazilian VATs such as ICMS. The chart of account creation wizard has been extended to propagate those new data properly.
+
+It's important to note however that this module lack many implementations to use OpenERP properly in Brazil. Those implementations (such as the electronic fiscal Invoicing which is already operational) are brought by more than 15 additional modules of the Brazilian Launchpad localization project https://launchpad.net/openerp.pt-br-localiz and their dependencies in the extra addons branch. Those modules aim at not breaking with the remarkable OpenERP modularity, this is why they are numerous but small. One of the reasons for maintaining those modules apart is that Brazilian Localization leaders need commit rights agility to complete the localization as companies fund the remaining legal requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and PAF ECF that are still missing as September 2011). Those modules are also strictly licensed under AGPL V3 and today don't come with any additional paid permission for online use of 'private modules'.""",
+    'license': 'AGPL-3',
+    'author': 'Akretion, OpenERP Brasil',
     'website': 'http://openerpbrasil.org',
     'version': '0.6',
     'depends': ['account','account_chart'],
-    'init_xml': [],
-    'update_xml': [
+    'init_xml': [        
         'data/account.account.type.csv',
         'data/account.tax.code.template.csv',
         'data/account.account.template.csv',
         'data/l10n_br_account_chart_template.xml',
-        'data/account_tax_template.xml'
+        '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',
-    'images': ['images/1_config_chart_l10n_br.jpeg','images/2_l10n_br_chart.jpeg'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py
new file mode 100644
index 00000000000..92f724a7762
--- /dev/null
+++ b/addons/l10n_br/account.py
@@ -0,0 +1,179 @@
+# -*- encoding: utf-8 -*-
+#################################################################################
+#                                                                               #
+# Copyright (C) 2009  Renato Lima - Akretion                                    #
+#                                                                               #
+#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 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/>.          #
+#################################################################################
+
+import time
+from datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
+from operator import itemgetter
+
+import netsvc
+import pooler
+from osv import fields, osv
+import decimal_precision as dp
+from tools.misc import currency
+from tools.translate import _
+from tools import config
+
+class account_tax_code_template(osv.osv):
+
+    _inherit = 'account.tax.code.template'
+    _columns = {
+                'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
+                'tax_discount': fields.boolean('Discount this Tax in Prince', help="Mark it for (ICMS, PIS e etc.)."),
+        }
+account_tax_code_template()
+
+class account_tax_code(osv.osv):
+
+    _inherit = 'account.tax.code'
+    _columns = {
+                'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
+                'tax_discount': fields.boolean('Discount this Tax in Prince', help="Mark it for (ICMS, PIS e etc.)."),
+        }
+account_tax_code()
+
+class account_tax_template(osv.osv):
+    _inherit = 'account.tax.template'
+    
+    def get_precision_tax():
+        def change_digit_tax(cr):
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            return (16, res+2)
+        return change_digit_tax
+    
+    _columns = {
+                'tax_discount': fields.boolean('Discount this Tax in Prince', help="Mark it for (ICMS, PIS e etc.)."),
+                'base_reduction': fields.float('Redution', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % ratio between 0-1."),
+                'amount_mva': fields.float('MVA Percent', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % ratio between 0-1."),
+                'type': fields.selection( [('percent','Percentage'), ('fixed','Fixed Amount'), ('none','None'), ('code','Python Code'), ('balance','Balance'), ('quantity','Quantity')], 'Tax Type', required=True,
+                                          help="The computation method for the tax amount."),
+    }
+    _defaults = {
+                'base_reduction': 0,
+                'amount_mva': 0,
+    }
+    
+    def onchange_tax_code_id(self, cr, uid, ids, tax_code_id, context=None):
+        
+        result = {'value': {}}
+            
+        if not tax_code_id:
+            return result
+        
+        obj_tax_code = self.pool.get('account.tax.code.template').browse(cr, uid, tax_code_id)     
+    
+        if obj_tax_code:
+            result['value']['tax_discount'] = obj_tax_code.tax_discount
+            result['value']['domain'] = obj_tax_code.domain
+
+        return result
+
+account_tax_template()
+
+class account_tax(osv.osv):
+    _inherit = 'account.tax'
+    
+    def get_precision_tax():
+        def change_digit_tax(cr):
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            return (16, res+2)
+        return change_digit_tax
+    
+    _columns = {
+                'tax_discount': fields.boolean('Discount this Tax in Prince', help="Mark it for (ICMS, PIS e etc.)."),
+                'base_reduction': fields.float('Redution', required=True, digits_compute=get_precision_tax(), help="Um percentual decimal em % entre 0-1."),
+                'amount_mva': fields.float('MVA Percent', required=True, digits_compute=get_precision_tax(), help="Um percentual decimal em % entre 0-1."),
+                'type': fields.selection( [('percent','Percentage'), ('fixed','Fixed Amount'), ('none','None'), ('code','Python Code'), ('balance','Balance'), ('quantity','Quantity')], 'Tax Type', required=True,
+                                          help="The computation method for the tax amount."),
+    }
+    _defaults = {
+                 'base_reduction': 0,
+                 'amount_mva': 0,
+    }
+    
+    def onchange_tax_code_id(self, cr, uid, ids, tax_code_id, context=None):
+        
+        result = {'value': {}}
+            
+        if not tax_code_id:
+            return result
+        
+        obj_tax_code = self.pool.get('account.tax.code').browse(cr, uid, tax_code_id)      
+    
+        if obj_tax_code:
+            result['value']['tax_discount'] = obj_tax_code.tax_discount
+            result['value']['domain'] = obj_tax_code.domain
+
+        return result
+
+account_tax()
+
+class account_journal(osv.osv):
+    _inherit = "account.journal"
+
+    _columns = {
+                'internal_sequence': fields.many2one('ir.sequence', 'Internal Sequence'),
+    }
+
+account_journal()
+
+class wizard_multi_charts_accounts(osv.osv_memory):
+
+    _inherit = 'wizard.multi.charts.accounts'
+    
+    def execute(self, cr, uid, ids, context=None):
+        
+        super(wizard_multi_charts_accounts, self).execute(cr, uid, ids, context)
+        
+        obj_multi = self.browse(cr, uid, ids[0])
+        obj_acc_tax = self.pool.get('account.tax')
+        obj_acc_tax_tmp = self.pool.get('account.tax.template')
+        obj_acc_cst = self.pool.get('l10n_br_account.cst')
+        obj_acc_cst_tmp = self.pool.get('l10n_br_account.cst.template')
+        obj_tax_code = self.pool.get('account.tax.code')
+        obj_tax_code_tmp = self.pool.get('account.tax.code.template')
+
+        # Creating Account
+        obj_acc_root = obj_multi.chart_template_id.account_root_id
+        tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
+        company_id = obj_multi.company_id.id
+        
+        children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+        children_tax_code_template.sort()
+        for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template, context=context):
+            tax_code_id = self.pool.get('account.tax.code').search(cr, uid, [('code','=',tax_code_template.code),('company_id','=',company_id)])
+            if tax_code_id:
+                obj_tax_code.write(cr, uid, tax_code_id, {'domain': tax_code_template.domain,'tax_discount': tax_code_template.tax_discount})
+            
+                cst_tmp_ids = self.pool.get('l10n_br_account.cst.template').search(cr, uid, [('tax_code_template_id','=',tax_code_template.id)], order='id')
+                for cst_tmp in self.pool.get('l10n_br_account.cst.template').browse(cr, uid, cst_tmp_ids, context=context):
+                    obj_acc_cst.create(cr, uid, {
+                                                 'code': cst_tmp.code,
+                                                 'name': cst_tmp.name,
+                                                 'tax_code_id': tax_code_id[0],
+                                                 })
+            
+        tax_ids = self.pool.get('account.tax').search(cr, uid, [('company_id','=',company_id)])
+        for tax in self.pool.get('account.tax').browse(cr, uid, tax_ids, context=context):
+            if tax.tax_code_id:
+                obj_acc_tax.write(cr, uid, tax.id, {'domain': tax.tax_code_id.domain,'tax_discount': tax.tax_code_id.tax_discount})
+        
+wizard_multi_charts_accounts()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_br/account_view.xml b/addons/l10n_br/account_view.xml
new file mode 100644
index 00000000000..da2ab84d4ab
--- /dev/null
+++ b/addons/l10n_br/account_view.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+		<!-- include domain field em account.tax.code and account.tax.code.template from -->
+		<record model="ir.ui.view" id="view_l10n_br_accout_tax_code_form">
+			<field name="name">l10n_br_account.tax.code.form</field>
+			<field name="model">account.tax.code</field>
+			<field name="inherit_id" ref="account.view_tax_code_form"/>
+			<field name="arch" type="xml">
+				<field position="after" name="parent_id">
+					<field name="domain"/>
+					<field name="tax_discount" />
+			    </field>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="view_l10n_br_accout_tax_code_template_form">
+			<field name="name">l10n_br_account.tax.code.template.form</field>
+			<field name="model">account.tax.code.template</field>
+			<field name="inherit_id" ref="account.view_tax_code_template_form"/>
+			<field name="arch" type="xml">
+				<field position="after" name="parent_id">
+					<field name="domain"/>
+					<field name="tax_discount" />
+			    </field>
+			</field>
+		</record>
+
+		<!-- Incluir o campo desconto do imposto -->
+		<record model="ir.ui.view" id="view_l10n_br_account_tax_template_form">
+			<field name="name">l10n_br_account.tax.template.form</field>
+			<field name="model">account.tax.template</field>
+			<field name="inherit_id" ref="account.view_account_tax_template_form"/>
+			<field name="arch" type="xml">
+				<field position="after" name="price_include">
+					<field groups="base.group_extended" name="tax_discount"/>
+			    </field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_l10n_br_account_tax_form">
+			<field name="name">l10n_br_account.tax.form</field>
+			<field name="model">account.tax</field>
+			<field name="inherit_id" ref="account.view_tax_form"/>
+			<field name="arch" type="xml">
+				<field position="after" name="price_include">
+					<field groups="base.group_extended" name="tax_discount"/>
+			    </field>
+			</field>
+		</record>
+				
+		<record model="ir.ui.view" id="view_l10n_br_account_tax_template_form1">
+			<field name="name">l10n_br_account.tax.template.form1</field>
+			<field name="model">account.tax.template</field>
+			<field name="inherit_id" ref="account.view_account_tax_template_form"/>
+			<field name="arch" type="xml">
+				<field position="after" name="amount">
+					<field groups="base.group_extended" name="base_reduction"/>
+					<field groups="base.group_extended" name="amount_mva"/>
+			    </field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_l10n_br_account_tax_form1">
+			<field name="name">l10n_br_account.tax.form1</field>
+			<field name="model">account.tax</field>
+			<field name="inherit_id" ref="account.view_tax_form"/>
+			<field name="arch" type="xml">
+				<field position="after" name="amount">
+					<field groups="base.group_extended" name="base_reduction"/>
+					<field groups="base.group_extended" name="amount_mva"/>
+			    </field>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="view_l10n_br_account_tax_form2">
+			<field name="name">l10n_br_account.tax.form2</field>
+			<field name="model">account.tax</field>
+			<field name="inherit_id" ref="account.view_tax_form"/>
+			<field name="arch" type="xml">
+				<field name="tax_code_id" position="replace" >
+					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
+			    </field>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="view_l10n_br_account_tax_template_form2">
+			<field name="name">l10n_br_account.tax.template.form2</field>
+			<field name="model">account.tax.template</field>
+			<field name="inherit_id" ref="account.view_account_tax_template_form"/>
+			<field name="arch" type="xml">
+				<field name="tax_code_id" position="replace" >
+					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
+			    </field>
+			</field>
+		</record>
+
+        <record id="view_l10n_br_journal_form_inherit" model="ir.ui.view">
+           <field name="name">l10n_br.journal.form.inherit</field>
+           <field name="model">account.journal</field>
+           <field name="type">form</field>
+           <field name="inherit_id" ref="account.view_account_journal_form"/>
+           <field name="arch" type="xml">
+                <field name="sequence_id" position="after">
+                    <field name="internal_sequence"/>
+                </field>
+           </field>
+        </record>
+
+	</data>
+	
+</openerp>
+
diff --git a/addons/l10n_br/data/account.account.template.csv b/addons/l10n_br/data/account.account.template.csv
index 5657769538c..6b466b6e7ab 100644
--- a/addons/l10n_br/data/account.account.template.csv
+++ b/addons/l10n_br/data/account.account.template.csv
@@ -1,17 +1,17 @@
 "id","code","name","parent_id:id","type","user_type:id","reconcile"
-"account_template_1","0","Plano de Contas Padrão","","view","ativo","True"
+"account_template_1","0","Plano de Contas Padrão",,"view","ativo","True"
 "account_template_2","1","ATIVO","account_template_1","view","ativo","True"
 "account_template_3","1.1","CIRCULANTE","account_template_2","view","ativo","True"
 "account_template_4","1.1.01","DISPONIBILIDADES","account_template_3","view","ativo","True"
 "account_template_5","1.1.01.01","CAIXA","account_template_4","view","ativo","True"
-"account_template_6","1.1.01.01.0001","Caixa Geral","account_template_5","receivable","ativo","True"
-"account_template_7","1.1.01.01.0002","Fundo Fixo","account_template_5","receivable","ativo","True"
+"account_template_6","1.1.01.01.0001","Caixa Geral","account_template_5","other","ativo","True"
+"account_template_7","1.1.01.01.0002","Fundo Fixo","account_template_5","other","ativo","True"
 "account_template_8","1.1.01.02","BANCOS ","account_template_4","view","ativo","True"
-"account_template_9","1.1.01.02.0001","Banco C/ Movimento","account_template_8","receivable","ativo","True"
+"account_template_9","1.1.01.02.0001","Banco C/ Movimento","account_template_8","other","ativo","True"
 "account_template_10","1.1.01.03","VALORES MOBILIÁRIOS-MERC.CAP.INTERNOS","account_template_4","view","ativo","True"
-"account_template_11","1.1.01.03.0001","Aplicações Nacionais","account_template_10","receivable","ativo","True"
+"account_template_11","1.1.01.03.0001","Aplicações Nacionais","account_template_10","other","ativo","True"
 "account_template_12","1.1.01.04","TITULOS DE CAPITALIZAÇÃO","account_template_4","view","ativo","True"
-"account_template_13","1.1.01.04.0001","Banco Título de Capitalização","account_template_12","receivable","ativo","True"
+"account_template_13","1.1.01.04.0001","Banco Título de Capitalização","account_template_12","other","ativo","True"
 "account_template_14","1.1.02","CRÉDITOS","account_template_3","view","ativo","True"
 "account_template_15","1.1.02.01","CLIENTES NACIONAIS","account_template_14","view","ativo","True"
 "account_template_16","1.1.02.01.0001","Clientes Nacionais","account_template_15","receivable","ativo","True"
@@ -20,186 +20,186 @@
 "account_template_19","1.1.02.03","OUTROS VALORES A RECEBER","account_template_14","view","ativo","True"
 "account_template_20","1.1.02.03.0001","Outras Contas a Receber","account_template_19","receivable","ativo","True"
 "account_template_21","1.1.02.04","DUPLICATAS CONTA VINCULADA","account_template_14","view","ativo","True"
-"account_template_22","1.1.02.04.0001","Banco Conta Garantida","account_template_21","receivable","ativo","True"
+"account_template_22","1.1.02.04.0001","Banco Conta Garantida","account_template_21","other","ativo","True"
 "account_template_23","1.1.02.05","DUPLICATAS CAUCIONADAS","account_template_14","view","ativo","True"
-"account_template_24","1.1.02.05.0001","Banco Conta Caucionada","account_template_23","receivable","ativo","True"
+"account_template_24","1.1.02.05.0001","Banco Conta Caucionada","account_template_23","other","ativo","True"
 "account_template_25","1.1.02.06","CHEQUES DEVOLVIDOS","account_template_14","view","ativo","True"
-"account_template_26","1.1.02.06.0001","Cheques Devolvidos","account_template_25","receivable","ativo","True"
+"account_template_26","1.1.02.06.0001","Cheques Devolvidos","account_template_25","other","ativo","True"
 "account_template_27","1.1.02.07","ADIANTAMENTOS","account_template_14","view","ativo","True"
-"account_template_28","1.1.02.07.0002","Adiantamento de Salários","account_template_27","receivable","ativo","True"
-"account_template_29","1.1.02.07.0003","Adiantamento Despesa de Viagem","account_template_27","receivable","ativo","True"
-"account_template_30","1.1.02.07.0004","Adiantamento de Férias","account_template_27","receivable","ativo","True"
-"account_template_31","1.1.02.07.0005","Adiantamento 13º Salário","account_template_27","receivable","ativo","True"
-"account_template_32","1.1.02.07.0006","Adiantamento de Pro-Labore a Diretores","account_template_27","receivable","ativo","True"
-"account_template_33","1.1.02.07.0001","Adiantamento de PIS a Empregados","account_template_27","receivable","ativo","True"
+"account_template_28","1.1.02.07.0002","Adiantamento de Salários","account_template_27","other","ativo","True"
+"account_template_29","1.1.02.07.0003","Adiantamento Despesa de Viagem","account_template_27","other","ativo","True"
+"account_template_30","1.1.02.07.0004","Adiantamento de Férias","account_template_27","other","ativo","True"
+"account_template_31","1.1.02.07.0005","Adiantamento 13º Salário","account_template_27","other","ativo","True"
+"account_template_32","1.1.02.07.0006","Adiantamento de Pro-Labore a Diretores","account_template_27","other","ativo","True"
+"account_template_33","1.1.02.07.0001","Adiantamento de PIS a Empregados","account_template_27","other","ativo","True"
 "account_template_34","1.1.02.08","ADIANTAMENTO A FORNECEDORES","account_template_14","view","ativo","True"
-"account_template_35","1.1.02.08.0001","Adiantamento a Fornecedor","account_template_34","receivable","ativo","True"
+"account_template_35","1.1.02.08.0001","Adiantamento a Fornecedor","account_template_34","other","ativo","True"
 "account_template_36","1.1.02.09","IMPOSTOS E CONTRIBUIÇÕES A RECUPERAR","account_template_14","view","ativo","True"
-"account_template_37","1.1.02.09.0001","CSLL a Recuperar/Compensar","account_template_36","receivable","ativo","True"
-"account_template_38","1.1.02.09.0002","CSLL a Compensar Lei 10.833/03","account_template_36","receivable","ativo","True"
-"account_template_39","1.1.02.09.0003","COFINS a Recuperar/Compensar","account_template_36","receivable","ativo","True"
-"account_template_40","1.1.02.09.0004","COFINS a Compensar Lei 10.833/03","account_template_36","receivable","ativo","True"
-"account_template_41","1.1.02.09.0008","Crédito COFINS Não-Cumulativo","account_template_36","receivable","ativo","True"
-"account_template_42","1.1.02.09.0009","ICMS a Recuperar","account_template_36","receivable","ativo","True"
-"account_template_43","1.1.02.09.0010","ICMS a Recup. s/Ativo Imobilizado","account_template_36","receivable","ativo","True"
-"account_template_44","1.1.02.09.0012","IPI a Recuperar/Compensar","account_template_36","receivable","ativo","True"
-"account_template_45","1.1.02.09.0013","IPI a Compensar Pedido Restituição","account_template_36","receivable","ativo","True"
-"account_template_46","1.1.02.09.0015","IRF s/Aplicações Financeiras","account_template_36","receivable","ativo","True"
-"account_template_47","1.1.02.09.0016","IRRF a Recuperar/Compensar","account_template_36","receivable","ativo","True"
-"account_template_48","1.1.02.09.0017","IRPJ a Recuperar/Compensar","account_template_36","receivable","ativo","True"
-"account_template_49","1.1.02.09.0019","PIS a Recuperar/Compensar","account_template_36","receivable","ativo","True"
-"account_template_50","1.1.02.09.0020","PIS a Compensar Lei 10.833/03","account_template_36","receivable","ativo","True"
-"account_template_51","1.1.02.09.0022","PIS/COFINS/CSLL a Recuperar","account_template_36","receivable","ativo","True"
-"account_template_52","1.1.02.09.0007","Crédito de PIS Não-Cumulativo","account_template_36","receivable","ativo","True"
+"account_template_37","1.1.02.09.0001","CSLL a Recuperar/Compensar","account_template_36","other","ativo","True"
+"account_template_38","1.1.02.09.0002","CSLL a Compensar Lei 10.833/03","account_template_36","other","ativo","True"
+"account_template_39","1.1.02.09.0003","COFINS a Recuperar/Compensar","account_template_36","other","ativo","True"
+"account_template_40","1.1.02.09.0004","COFINS a Compensar Lei 10.833/03","account_template_36","other","ativo","True"
+"account_template_41","1.1.02.09.0008","Crédito COFINS Não-Cumulativo","account_template_36","other","ativo","True"
+"account_template_42","1.1.02.09.0009","ICMS a Recuperar","account_template_36","other","ativo","True"
+"account_template_43","1.1.02.09.0010","ICMS a Recup. s/Ativo Imobilizado","account_template_36","other","ativo","True"
+"account_template_44","1.1.02.09.0012","IPI a Recuperar/Compensar","account_template_36","other","ativo","True"
+"account_template_45","1.1.02.09.0013","IPI a Compensar Pedido Restituição","account_template_36","other","ativo","True"
+"account_template_46","1.1.02.09.0015","IRF s/Aplicações Financeiras","account_template_36","other","ativo","True"
+"account_template_47","1.1.02.09.0016","IRRF a Recuperar/Compensar","account_template_36","other","ativo","True"
+"account_template_48","1.1.02.09.0017","IRPJ a Recuperar/Compensar","account_template_36","other","ativo","True"
+"account_template_49","1.1.02.09.0019","PIS a Recuperar/Compensar","account_template_36","other","ativo","True"
+"account_template_50","1.1.02.09.0020","PIS a Compensar Lei 10.833/03","account_template_36","other","ativo","True"
+"account_template_51","1.1.02.09.0022","PIS/COFINS/CSLL a Recuperar","account_template_36","other","ativo","True"
+"account_template_52","1.1.02.09.0007","Crédito de PIS Não-Cumulativo","account_template_36","other","ativo","True"
 "account_template_53","1.1.02.10","CRÉDITOS FISCAIS CSLL BASE CALC.NEGATIVA","account_template_14","view","ativo","True"
-"account_template_54","1.1.02.10.0001","Base Negativa CSLL - Exerc. Anteriores","account_template_53","receivable","ativo","True"
+"account_template_54","1.1.02.10.0001","Base Negativa CSLL - Exerc. Anteriores","account_template_53","other","ativo","True"
 "account_template_55","1.1.02.11","CRÉDITOS FISCAIS IRPJ-BASE CALC.NEGATIVA","account_template_14","view","ativo","True"
-"account_template_56","1.1.02.11.0001","Base Negativa IRPJ - Exerc. Anteriores","account_template_55","receivable","ativo","True"
+"account_template_56","1.1.02.11.0001","Base Negativa IRPJ - Exerc. Anteriores","account_template_55","other","ativo","True"
 "account_template_57","1.1.03","ESTOQUES","account_template_3","view","ativo","True"
 "account_template_58","1.1.03.01","ESTOQUE DE MERCADORIAS","account_template_57","view","ativo","True"
-"account_template_59","1.1.03.01.0001","Insumos (Materiais Diretos)","account_template_58","receivable","ativo","True"
-"account_template_60","1.1.03.01.0002","Material de Consumo-Almoxarifado","account_template_58","receivable","ativo","True"
-"account_template_61","1.1.03.01.0003","Mercadorias para Revenda","account_template_58","receivable","ativo","True"
-"account_template_62","1.1.03.01.0004","Produtos Acabados","account_template_58","receivable","ativo","True"
-"account_template_63","1.1.03.01.0005","Produtos em Elaboração","account_template_58","receivable","ativo","True"
+"account_template_59","1.1.03.01.0001","Insumos (Materiais Diretos)","account_template_58","other","ativo","True"
+"account_template_60","1.1.03.01.0002","Material de Consumo-Almoxarifado","account_template_58","other","ativo","True"
+"account_template_61","1.1.03.01.0003","Mercadorias para Revenda","account_template_58","other","ativo","True"
+"account_template_62","1.1.03.01.0004","Produtos Acabados","account_template_58","other","ativo","True"
+"account_template_63","1.1.03.01.0005","Produtos em Elaboração","account_template_58","other","ativo","True"
 "account_template_64","1.1.03.02","(-) DEVOLUÇÕES DE COMPRAS","account_template_57","view","ativo","True"
-"account_template_65","1.1.03.02.0001","Devoluções de Compras","account_template_64","receivable","ativo","True"
+"account_template_65","1.1.03.02.0001","Devoluções de Compras","account_template_64","other","ativo","True"
 "account_template_66","1.1.03.03","TRANSFERÊNCIA DE MERCADORIAS","account_template_57","view","ativo","True"
-"account_template_67","1.1.03.03.0001","Transferência de Mercadorias","account_template_66","receivable","ativo","True"
+"account_template_67","1.1.03.03.0001","Transferência de Mercadorias","account_template_66","other","ativo","True"
 "account_template_68","1.1.03.04","ESTOQUE DE TERCEIROS EM NOSSO PODER","account_template_57","view","ativo","True"
-"account_template_69","1.1.03.04.0001","Estoque de Terceiros em N/Poder","account_template_68","receivable","ativo","True"
-"account_template_70","1.1.03.04.0002","Entrada P/Industrialização","account_template_68","receivable","ativo","True"
-"account_template_71","1.1.03.04.0003","Entrada P/Conserto","account_template_68","receivable","ativo","True"
-"account_template_72","1.1.03.04.0004","Entrada P/Demonstração","account_template_68","receivable","ativo","True"
-"account_template_73","1.1.03.04.0005","Entrada P/Empréstimo","account_template_68","receivable","ativo","True"
-"account_template_74","1.1.03.04.0006","Entrada em Consignação","account_template_68","receivable","ativo","True"
-"account_template_75","1.1.03.04.0007","Entrada p/ Garantia","account_template_68","receivable","ativo","True"
-"account_template_76","1.1.03.04.0008","Entrada p/ Locação","account_template_68","receivable","ativo","True"
-"account_template_77","1.1.03.04.0009","Entrada em Comodato","account_template_68","receivable","ativo","True"
+"account_template_69","1.1.03.04.0001","Estoque de Terceiros em N/Poder","account_template_68","other","ativo","True"
+"account_template_70","1.1.03.04.0002","Entrada P/Industrialização","account_template_68","other","ativo","True"
+"account_template_71","1.1.03.04.0003","Entrada P/Conserto","account_template_68","other","ativo","True"
+"account_template_72","1.1.03.04.0004","Entrada P/Demonstração","account_template_68","other","ativo","True"
+"account_template_73","1.1.03.04.0005","Entrada P/Empréstimo","account_template_68","other","ativo","True"
+"account_template_74","1.1.03.04.0006","Entrada em Consignação","account_template_68","other","ativo","True"
+"account_template_75","1.1.03.04.0007","Entrada p/ Garantia","account_template_68","other","ativo","True"
+"account_template_76","1.1.03.04.0008","Entrada p/ Locação","account_template_68","other","ativo","True"
+"account_template_77","1.1.03.04.0009","Entrada em Comodato","account_template_68","other","ativo","True"
 "account_template_78","1.1.03.05","NOSSO ESTOQUE EM PODER DE TERCEIROS","account_template_57","view","ativo","True"
-"account_template_79","1.1.03.05.0001","N/Estoque em Poder de Terceiros","account_template_78","receivable","ativo","True"
-"account_template_80","1.1.03.05.0002","Remessa P/Industrialização","account_template_78","receivable","ativo","True"
-"account_template_81","1.1.03.05.0003","Remessa P/Conserto","account_template_78","receivable","ativo","True"
-"account_template_82","1.1.03.05.0004","Remessa P/Demonstração","account_template_78","receivable","ativo","True"
-"account_template_83","1.1.03.05.0005","Remessa P/Exposição","account_template_78","receivable","ativo","True"
-"account_template_84","1.1.03.05.0006","Remessa P/Empréstimo","account_template_78","receivable","ativo","True"
-"account_template_85","1.1.03.05.0007","Remessa em Consignação","account_template_78","receivable","ativo","True"
-"account_template_86","1.1.03.05.0008","Remessa P/Locação","account_template_78","receivable","ativo","True"
-"account_template_87","1.1.03.05.0009","Remessa em Garantia","account_template_78","receivable","ativo","True"
+"account_template_79","1.1.03.05.0001","N/Estoque em Poder de Terceiros","account_template_78","other","ativo","True"
+"account_template_80","1.1.03.05.0002","Remessa P/Industrialização","account_template_78","other","ativo","True"
+"account_template_81","1.1.03.05.0003","Remessa P/Conserto","account_template_78","other","ativo","True"
+"account_template_82","1.1.03.05.0004","Remessa P/Demonstração","account_template_78","other","ativo","True"
+"account_template_83","1.1.03.05.0005","Remessa P/Exposição","account_template_78","other","ativo","True"
+"account_template_84","1.1.03.05.0006","Remessa P/Empréstimo","account_template_78","other","ativo","True"
+"account_template_85","1.1.03.05.0007","Remessa em Consignação","account_template_78","other","ativo","True"
+"account_template_86","1.1.03.05.0008","Remessa P/Locação","account_template_78","other","ativo","True"
+"account_template_87","1.1.03.05.0009","Remessa em Garantia","account_template_78","other","ativo","True"
 "account_template_88","1.1.03.06","(-) IMPOSTOS S/ESTOQUE DE TERCEIROS","account_template_57","view","ativo","True"
-"account_template_89","1.1.03.06.0001","(-) ICMS s/Estoque de Terceiros","account_template_88","receivable","ativo","True"
-"account_template_90","1.1.03.06.0002","(-) IPI s/Estoque de Terceiros","account_template_88","receivable","ativo","True"
+"account_template_89","1.1.03.06.0001","(-) ICMS s/Estoque de Terceiros","account_template_88","other","ativo","True"
+"account_template_90","1.1.03.06.0002","(-) IPI s/Estoque de Terceiros","account_template_88","other","ativo","True"
 "account_template_91","1.1.03.07","IMPORTAÇÕES EM ANDAMENTO","account_template_57","view","ativo","True"
-"account_template_92","1.1.03.07.0001","D.I. nº 0000000-0 Importação","account_template_91","receivable","ativo","True"
+"account_template_92","1.1.03.07.0001","D.I. nº 0000000-0 Importação","account_template_91","other","ativo","True"
 "account_template_93","1.1.03.08","COMPRAS PARA ENTREGA FUTURA","account_template_57","view","ativo","True"
-"account_template_94","1.1.03.08.0001","Compras p/Entrega Futura","account_template_93","receivable","ativo","True"
+"account_template_94","1.1.03.08.0001","Compras p/Entrega Futura","account_template_93","other","ativo","True"
 "account_template_95","1.1.04","DESPESAS DO EXERCÍCIO SEGUINTE","account_template_3","view","ativo","True"
 "account_template_96","1.1.04.01","SEGUROS A APROPRIAR","account_template_95","view","ativo","True"
-"account_template_97","1.1.04.01.0001","Seguros de Veículos","account_template_96","receivable","ativo","True"
-"account_template_98","1.1.04.01.0002","Seguros Prédios/Bens/Estoques","account_template_96","receivable","ativo","True"
-"account_template_99","1.1.04.01.0003","Seguros s/Lucros Cessantes","account_template_96","receivable","ativo","True"
+"account_template_97","1.1.04.01.0001","Seguros de Veículos","account_template_96","other","ativo","True"
+"account_template_98","1.1.04.01.0002","Seguros Prédios/Bens/Estoques","account_template_96","other","ativo","True"
+"account_template_99","1.1.04.01.0003","Seguros s/Lucros Cessantes","account_template_96","other","ativo","True"
 "account_template_100","1.1.04.02","ASSINATURAS A APROPRIAR","account_template_95","view","ativo","True"
-"account_template_101","1.1.04.02.0001","Assinaturas de Jornais/Boletins/Revistas","account_template_100","receivable","ativo","True"
+"account_template_101","1.1.04.02.0001","Assinaturas de Jornais/Boletins/Revistas","account_template_100","other","ativo","True"
 "account_template_102","1.1.04.03","DESPESAS FINANCEIRAS A APROPRIAR","account_template_95","view","ativo","True"
-"account_template_103","1.1.04.03.0001","Juros s/ Financiamentos a Apropriar","account_template_102","receivable","ativo","True"
+"account_template_103","1.1.04.03.0001","Juros s/ Financiamentos a Apropriar","account_template_102","other","ativo","True"
 "account_template_104","1.1.05","CONTAS RETIFICADORAS","account_template_3","view","ativo","True"
 "account_template_105","1.1.05.01","(-) DUPLICATAS DESCONTADAS","account_template_104","view","ativo","True"
-"account_template_106","1.1.05.01.0001","(-) Banco Conta - Duplicata Descontada","account_template_105","receivable","ativo","True"
+"account_template_106","1.1.05.01.0001","(-) Banco Conta - Duplicata Descontada","account_template_105","other","ativo","True"
 "account_template_107","1.2","ATIVO NÃO CIRCULANTE","account_template_2","view","ativo","True"
 "account_template_108","1.2.01","REALIZÁVEL  A LONGO PRAZO","account_template_107","view","ativo","True"
 "account_template_109","1.2.01.01","VALORES MOBILIÁRIOS-MERC.CAP.INTERNO","account_template_108","view","ativo","True"
-"account_template_110","1.2.01.01.0001","Aplicações Nacionais","account_template_109","receivable","ativo","True"
+"account_template_110","1.2.01.01.0001","Aplicações Nacionais","account_template_109","other","ativo","True"
 "account_template_111","1.2.01.02","DÉBITOS DE SÓCIOS","account_template_108","view","ativo","True"
-"account_template_112","1.2.01.02.0001","Sócio","account_template_111","receivable","ativo","True"
+"account_template_112","1.2.01.02.0001","Sócio","account_template_111","other","ativo","True"
 "account_template_113","1.2.01.03","EMPRÉSTIMOS A EMPRESAS LIGADAS","account_template_108","view","ativo","True"
-"account_template_114","1.2.01.03.0001","Empresa Ligada","account_template_113","receivable","ativo","True"
+"account_template_114","1.2.01.03.0001","Empresa Ligada","account_template_113","other","ativo","True"
 "account_template_115","1.2.01.04","EMPRÉSTIMOS A TERCEIROS","account_template_108","view","ativo","True"
-"account_template_116","1.2.01.04.0001","Empréstimo de Terceiros","account_template_115","receivable","ativo","True"
+"account_template_116","1.2.01.04.0001","Empréstimo de Terceiros","account_template_115","other","ativo","True"
 "account_template_117","1.2.01.05","DEPÓSITOS JUDICIAIS","account_template_108","view","ativo","True"
-"account_template_118","1.2.01.05.0001","Depósitos Judiciais","account_template_117","receivable","ativo","True"
+"account_template_118","1.2.01.05.0001","Depósitos Judiciais","account_template_117","other","ativo","True"
 "account_template_119","1.2.02","INVESTIMENTOS","account_template_107","view","ativo","True"
 "account_template_120","1.2.02.01","PARTICIPAÇÕES SOCIETÁRIAS","account_template_119","view","ativo","True"
-"account_template_121","1.2.02.01.0001","Participação Societárias","account_template_120","receivable","ativo","True"
+"account_template_121","1.2.02.01.0001","Participação Societárias","account_template_120","other","ativo","True"
 "account_template_122","1.2.03","IMOBILIZADO - MATRIZ","account_template_107","view","ativo","True"
 "account_template_123","1.2.03.01","IMOBILIZADO","account_template_122","view","ativo","True"
-"account_template_124","1.2.03.01.0001","Máquinas e Equipamentos ","account_template_123","receivable","ativo","True"
-"account_template_125","1.2.03.01.0002","Terrenos","account_template_123","receivable","ativo","True"
-"account_template_126","1.2.03.01.0003","Ferramentas","account_template_123","receivable","ativo","True"
-"account_template_127","1.2.03.01.0004","Modelos, Moldes e Matrizes","account_template_123","receivable","ativo","True"
-"account_template_128","1.2.03.01.0005","Móveis e Utensílios","account_template_123","receivable","ativo","True"
-"account_template_129","1.2.03.01.0006","Veículos","account_template_123","receivable","ativo","True"
-"account_template_130","1.2.03.01.0007","Equipamentos de Informática","account_template_123","receivable","ativo","True"
-"account_template_131","1.2.03.01.0008","Instalações","account_template_123","receivable","ativo","True"
-"account_template_132","1.2.03.01.0009","Benfeitoria em Imóveis de Terceiros","account_template_123","receivable","ativo","True"
-"account_template_133","1.2.03.01.0010","Direito de Uso Linhas Telefônicas","account_template_123","receivable","ativo","True"
-"account_template_134","1.2.03.01.0011","Edifícios e Construções","account_template_123","receivable","ativo","True"
+"account_template_124","1.2.03.01.0001","Máquinas e Equipamentos ","account_template_123","other","ativo","True"
+"account_template_125","1.2.03.01.0002","Terrenos","account_template_123","other","ativo","True"
+"account_template_126","1.2.03.01.0003","Ferramentas","account_template_123","other","ativo","True"
+"account_template_127","1.2.03.01.0004","Modelos, Moldes e Matrizes","account_template_123","other","ativo","True"
+"account_template_128","1.2.03.01.0005","Móveis e Utensílios","account_template_123","other","ativo","True"
+"account_template_129","1.2.03.01.0006","Veículos","account_template_123","other","ativo","True"
+"account_template_130","1.2.03.01.0007","Equipamentos de Informática","account_template_123","other","ativo","True"
+"account_template_131","1.2.03.01.0008","Instalações","account_template_123","other","ativo","True"
+"account_template_132","1.2.03.01.0009","Benfeitoria em Imóveis de Terceiros","account_template_123","other","ativo","True"
+"account_template_133","1.2.03.01.0010","Direito de Uso Linhas Telefônicas","account_template_123","other","ativo","True"
+"account_template_134","1.2.03.01.0011","Edifícios e Construções","account_template_123","other","ativo","True"
 "account_template_135","1.2.03.02","CONSTRUÇÕES EM ANDAMENTO","account_template_122","view","ativo","True"
-"account_template_136","1.2.03.02.0001","Imóvel","account_template_135","receivable","ativo","True"
+"account_template_136","1.2.03.02.0001","Imóvel","account_template_135","other","ativo","True"
 "account_template_137","1.2.03.04","PARTICIPAÇÃO EM CONSÓRCIOS","account_template_122","view","ativo","True"
-"account_template_138","1.2.03.04.0001","Consórcio","account_template_137","receivable","ativo","True"
+"account_template_138","1.2.03.04.0001","Consórcio","account_template_137","other","ativo","True"
 "account_template_139","1.2.03.05","(-) DEPRECIAÇÃO ACUMULADA","account_template_122","view","ativo","True"
-"account_template_140","1.2.03.05.0001","Deprec.de Máquinas e Equipamentos","account_template_139","receivable","ativo","True"
-"account_template_141","1.2.03.05.0002","Deprec.de Modelos, Moldes e Matrizes","account_template_139","receivable","ativo","True"
-"account_template_142","1.2.03.05.0003","Deprec.de Móveis e Utensílios","account_template_139","receivable","ativo","True"
-"account_template_143","1.2.03.05.0004","Deprec.de Veículos","account_template_139","receivable","ativo","True"
-"account_template_144","1.2.03.05.0005","Deprec.de Equip.de Informática","account_template_139","receivable","ativo","True"
-"account_template_145","1.2.03.05.0006","Deprec.de Instalações","account_template_139","receivable","ativo","True"
-"account_template_146","1.2.03.05.0007","Deprec.de Ferramentas","account_template_139","receivable","ativo","True"
-"account_template_147","1.2.03.05.0008","Deprec.de Edificações","account_template_139","receivable","ativo","True"
+"account_template_140","1.2.03.05.0001","Deprec.de Máquinas e Equipamentos","account_template_139","other","ativo","True"
+"account_template_141","1.2.03.05.0002","Deprec.de Modelos, Moldes e Matrizes","account_template_139","other","ativo","True"
+"account_template_142","1.2.03.05.0003","Deprec.de Móveis e Utensílios","account_template_139","other","ativo","True"
+"account_template_143","1.2.03.05.0004","Deprec.de Veículos","account_template_139","other","ativo","True"
+"account_template_144","1.2.03.05.0005","Deprec.de Equip.de Informática","account_template_139","other","ativo","True"
+"account_template_145","1.2.03.05.0006","Deprec.de Instalações","account_template_139","other","ativo","True"
+"account_template_146","1.2.03.05.0007","Deprec.de Ferramentas","account_template_139","other","ativo","True"
+"account_template_147","1.2.03.05.0008","Deprec.de Edificações","account_template_139","other","ativo","True"
 "account_template_148","1.2.03.06","(-) AMORTIZAÇÃO ACUMULADA","account_template_122","view","ativo","True"
-"account_template_149","1.2.03.06.0001","Amortiz.Benfeit.em Imóveis de Terceiros","account_template_148","receivable","ativo","True"
-"account_template_150","1.2.03.06.0002","Amortiz.Direito Uso Linhas Telefônica","account_template_148","receivable","ativo","True"
+"account_template_149","1.2.03.06.0001","Amortiz.Benfeit.em Imóveis de Terceiros","account_template_148","other","ativo","True"
+"account_template_150","1.2.03.06.0002","Amortiz.Direito Uso Linhas Telefônica","account_template_148","other","ativo","True"
 "account_template_151","1.2.03.07","ICMS S/IMOBILIZADO-PARCELA NÃO CREDITADA","account_template_122","view","ativo","True"
-"account_template_152","1.2.03.07.0001","ICMS s/ Imobilizado parc. não creditável","account_template_151","receivable","ativo","True"
-"account_template_153","1.2.03.07.0002","(-) Amortização ICMS não creditado","account_template_151","receivable","ativo","True"
+"account_template_152","1.2.03.07.0001","ICMS s/ Imobilizado parc. não creditável","account_template_151","other","ativo","True"
+"account_template_153","1.2.03.07.0002","(-) Amortização ICMS não creditado","account_template_151","other","ativo","True"
 "account_template_154","1.2.04","IMOBILIZADO - FILIAL","account_template_107","view","ativo","True"
 "account_template_155","1.2.04.01","IMOBILIZADO","account_template_154","view","ativo","True"
-"account_template_156","1.2.04.01.0001","Máquinas e Equipamentos","account_template_155","receivable","ativo","True"
-"account_template_157","1.2.04.01.0002","Terrenos","account_template_155","receivable","ativo","True"
-"account_template_158","1.2.04.01.0003","Ferramentas","account_template_155","receivable","ativo","True"
-"account_template_159","1.2.04.01.0004","Edifícios","account_template_155","receivable","ativo","True"
-"account_template_160","1.2.04.01.0005","Móveis e Utensílios","account_template_155","receivable","ativo","True"
-"account_template_161","1.2.04.01.0006","Veículos","account_template_155","receivable","ativo","True"
-"account_template_162","1.2.04.01.0007","Equipamentos de Informática","account_template_155","receivable","ativo","True"
-"account_template_163","1.2.04.01.0008","Instalações","account_template_155","receivable","ativo","True"
+"account_template_156","1.2.04.01.0001","Máquinas e Equipamentos","account_template_155","other","ativo","True"
+"account_template_157","1.2.04.01.0002","Terrenos","account_template_155","other","ativo","True"
+"account_template_158","1.2.04.01.0003","Ferramentas","account_template_155","other","ativo","True"
+"account_template_159","1.2.04.01.0004","Edifícios","account_template_155","other","ativo","True"
+"account_template_160","1.2.04.01.0005","Móveis e Utensílios","account_template_155","other","ativo","True"
+"account_template_161","1.2.04.01.0006","Veículos","account_template_155","other","ativo","True"
+"account_template_162","1.2.04.01.0007","Equipamentos de Informática","account_template_155","other","ativo","True"
+"account_template_163","1.2.04.01.0008","Instalações","account_template_155","other","ativo","True"
 "account_template_164","1.2.04.02","(-) DEPRECIAÇÃO ACUMULADA - FILIAL","account_template_154","view","ativo","True"
-"account_template_165","1.2.04.02.0001","Deprec.de Máquinas e Equipamentos","account_template_164","receivable","ativo","True"
-"account_template_166","1.2.04.02.0003","Deprec.de Móveis e Utensílios","account_template_164","receivable","ativo","True"
-"account_template_167","1.2.04.02.0004","Deprec.de Veículos","account_template_164","receivable","ativo","True"
-"account_template_168","1.2.04.02.0005","Deprec.de Equip.de Informática","account_template_164","receivable","ativo","True"
-"account_template_169","1.2.04.02.0006","Deprec.de Instalações","account_template_164","receivable","ativo","True"
-"account_template_170","1.2.04.02.0007","Deprec.de Ferramentas","account_template_164","receivable","ativo","True"
-"account_template_171","1.2.04.02.0008","Deprec.de Edifícios","account_template_164","receivable","ativo","True"
+"account_template_165","1.2.04.02.0001","Deprec.de Máquinas e Equipamentos","account_template_164","other","ativo","True"
+"account_template_166","1.2.04.02.0003","Deprec.de Móveis e Utensílios","account_template_164","other","ativo","True"
+"account_template_167","1.2.04.02.0004","Deprec.de Veículos","account_template_164","other","ativo","True"
+"account_template_168","1.2.04.02.0005","Deprec.de Equip.de Informática","account_template_164","other","ativo","True"
+"account_template_169","1.2.04.02.0006","Deprec.de Instalações","account_template_164","other","ativo","True"
+"account_template_170","1.2.04.02.0007","Deprec.de Ferramentas","account_template_164","other","ativo","True"
+"account_template_171","1.2.04.02.0008","Deprec.de Edifícios","account_template_164","other","ativo","True"
 "account_template_172","1.2.04.03","(-) AMORTIZAÇÃO ACUMULADA - FILIAL","account_template_154","view","ativo","True"
-"account_template_173","1.2.04.03.0001","Amortização Acumulada","account_template_172","receivable","ativo","True"
+"account_template_173","1.2.04.03.0001","Amortização Acumulada","account_template_172","other","ativo","True"
 "account_template_174","1.2.05","BENS INTAGÍVEIS - MATRIZ","account_template_107","view","ativo","True"
 "account_template_175","1.2.05.01","INTANGÍVEL","account_template_174","view","ativo","True"
-"account_template_176","1.2.05.01.0001","Marcas e Patentes","account_template_175","receivable","ativo","True"
-"account_template_177","1.2.05.01.0002","Softwares","account_template_175","receivable","ativo","True"
+"account_template_176","1.2.05.01.0001","Marcas e Patentes","account_template_175","other","ativo","True"
+"account_template_177","1.2.05.01.0002","Softwares","account_template_175","other","ativo","True"
 "account_template_178","1.2.05.02","(-) AMORTIZAÇÃO DO INTANGÍVEL","account_template_174","view","ativo","True"
-"account_template_179","1.2.05.02.0001","Amortiz.de Marcas e Patentes","account_template_178","receivable","ativo","True"
-"account_template_180","1.2.05.02.0002","Amortização de Softwares","account_template_178","receivable","ativo","True"
+"account_template_179","1.2.05.02.0001","Amortiz.de Marcas e Patentes","account_template_178","other","ativo","True"
+"account_template_180","1.2.05.02.0002","Amortização de Softwares","account_template_178","other","ativo","True"
 "account_template_181","1.2.06","BENS INTANGÍVEIS - FILIAL","account_template_107","view","ativo","True"
 "account_template_182","1.2.06.01","INTANGÍVEL","account_template_181","view","ativo","True"
-"account_template_183","1.2.06.01.0001","Softwares","account_template_182","receivable","ativo","True"
+"account_template_183","1.2.06.01.0001","Softwares","account_template_182","other","ativo","True"
 "account_template_184","1.2.06.02","(-) AMORTIZAÇÃO DO INTANGÍVEL","account_template_181","view","ativo","True"
-"account_template_185","1.2.06.02.0001","Amortização de Softwares","account_template_184","receivable","ativo","True"
+"account_template_185","1.2.06.02.0001","Amortização de Softwares","account_template_184","other","ativo","True"
 "account_template_186","1.2.07","TRANSFERÊNCIAS DE ATIVO IMOBILIZADO","account_template_107","view","ativo","True"
 "account_template_187","1.2.07.01","TRANSFERÊNCIA DE ATIVO IMOBILIZADO","account_template_186","view","ativo","True"
-"account_template_188","1.2.07.01.0001","Transferência de Ativo Imobilizado","account_template_187","receivable","ativo","True"
+"account_template_188","1.2.07.01.0001","Transferência de Ativo Imobilizado","account_template_187","other","ativo","True"
 "account_template_189","1.2.08","DIFERIDO","account_template_107","view","ativo","True"
 "account_template_190","1.2.08.01","DESPESAS PRÉ-INDUSTRIAIS","account_template_189","view","ativo","True"
-"account_template_191","1.2.08.01.0001","Gastos Gerais de Implantação","account_template_190","receivable","ativo","True"
-"account_template_192","1.2.08.01.0002","(-) Amortização Acumulada","account_template_190","receivable","ativo","True"
+"account_template_191","1.2.08.01.0001","Gastos Gerais de Implantação","account_template_190","other","ativo","True"
+"account_template_192","1.2.08.01.0002","(-) Amortização Acumulada","account_template_190","other","ativo","True"
 "account_template_193","2","PASSIVO","account_template_1","view","passivo","True"
 "account_template_194","2.1","CIRCULANTE","account_template_193","view","passivo","True"
 "account_template_195","2.1.01","OBRIGAÇÕES A CURTO PRAZO","account_template_194","view","passivo","True"
 "account_template_196","2.1.01.01","FINANCIAMENTOS A CURTO PRAZO - SFN","account_template_195","view","passivo","True"
-"account_template_197","2.1.01.01.0001","Banco Conta Empréstimo","account_template_196","payable","passivo","True"
+"account_template_197","2.1.01.01.0001","Banco Conta Empréstimo","account_template_196","other","passivo","True"
 "account_template_198","2.1.01.02","CHEQUES A COMPENSAR","account_template_195","view","passivo","True"
-"account_template_199","2.1.01.02.0001","Banco Conta a Compensar","account_template_198","payable","passivo","True"
+"account_template_199","2.1.01.02.0001","Banco Conta a Compensar","account_template_198","other","passivo","True"
 "account_template_200","2.1.01.03","LIMITE DE CRÉDITO CHEQUE ESPECIAL","account_template_195","view","passivo","True"
-"account_template_201","2.1.01.03.0001","Banco Conta Limite","account_template_200","payable","passivo","True"
+"account_template_201","2.1.01.03.0001","Banco Conta Limite","account_template_200","other","passivo","True"
 "account_template_202","2.1.02","FORNECEDORES ","account_template_194","view","passivo","True"
 "account_template_203","2.1.02.01","FORNECEDORES NACIONAIS","account_template_202","view","passivo","True"
 "account_template_204","2.1.02.01.0001","Fornecedores Nacionais","account_template_203","payable","passivo","True"
@@ -207,428 +207,428 @@
 "account_template_206","2.1.02.02.0001","Fornecedores Internacionais","account_template_205","payable","passivo","True"
 "account_template_207","2.1.03","OBRIGAÇÕES TRABALHISTAS","account_template_194","view","passivo","True"
 "account_template_208","2.1.03.01","FOLHA DE PAGAMENTO - EMPREGADOS","account_template_207","view","passivo","True"
-"account_template_209","2.1.03.01.0001","Salários a Pagar","account_template_208","payable","passivo","True"
-"account_template_210","2.1.03.01.0002","Férias a Pagar","account_template_208","payable","passivo","True"
-"account_template_211","2.1.03.01.0003","Rescisões a Pagar","account_template_208","payable","passivo","True"
-"account_template_212","2.1.03.01.0004","13º Salário a Pagar","account_template_208","payable","passivo","True"
-"account_template_213","2.1.03.01.0005","Comissões a Pagar","account_template_208","payable","passivo","True"
+"account_template_209","2.1.03.01.0001","Salários a Pagar","account_template_208","other","passivo","True"
+"account_template_210","2.1.03.01.0002","Férias a Pagar","account_template_208","other","passivo","True"
+"account_template_211","2.1.03.01.0003","Rescisões a Pagar","account_template_208","other","passivo","True"
+"account_template_212","2.1.03.01.0004","13º Salário a Pagar","account_template_208","other","passivo","True"
+"account_template_213","2.1.03.01.0005","Comissões a Pagar","account_template_208","other","passivo","True"
 "account_template_214","2.1.03.02","PROVISÕES DE FÉRIAS E 13º SALÁRIO","account_template_207","view","passivo","True"
-"account_template_215","2.1.03.02.0001","Provisão de Férias","account_template_214","payable","passivo","True"
-"account_template_216","2.1.03.02.0002","Provisão de INSS s/Férias","account_template_214","payable","passivo","True"
-"account_template_217","2.1.03.02.0003","Provisão de FGTS s/Férias","account_template_214","payable","passivo","True"
-"account_template_218","2.1.03.02.0004","Provisão de 13º Salário","account_template_214","payable","passivo","True"
-"account_template_219","2.1.03.02.0005","Provisão de INSS s/13º Salário","account_template_214","payable","passivo","True"
-"account_template_220","2.1.03.02.0006","Provisão FGTS s/13º Salário","account_template_214","payable","passivo","True"
+"account_template_215","2.1.03.02.0001","Provisão de Férias","account_template_214","other","passivo","True"
+"account_template_216","2.1.03.02.0002","Provisão de INSS s/Férias","account_template_214","other","passivo","True"
+"account_template_217","2.1.03.02.0003","Provisão de FGTS s/Férias","account_template_214","other","passivo","True"
+"account_template_218","2.1.03.02.0004","Provisão de 13º Salário","account_template_214","other","passivo","True"
+"account_template_219","2.1.03.02.0005","Provisão de INSS s/13º Salário","account_template_214","other","passivo","True"
+"account_template_220","2.1.03.02.0006","Provisão FGTS s/13º Salário","account_template_214","other","passivo","True"
 "account_template_221","2.1.03.03","FOLHA DE PAGAMENTO - AUTÔNOMOS","account_template_207","view","passivo","True"
-"account_template_222","2.1.03.03.0001","Rendimentos a Pagar","account_template_221","payable","passivo","True"
+"account_template_222","2.1.03.03.0001","Rendimentos a Pagar","account_template_221","other","passivo","True"
 "account_template_223","2.1.03.04","FOLHA DE PAGAMENTO - DIRIGENTES","account_template_207","view","passivo","True"
-"account_template_224","2.1.03.04.0001","Pro-Labore a Pagar","account_template_223","payable","passivo","True"
+"account_template_224","2.1.03.04.0001","Pro-Labore a Pagar","account_template_223","other","passivo","True"
 "account_template_225","2.1.03.05","ENCARGOS SOCIAIS A PAGAR","account_template_207","view","passivo","True"
-"account_template_226","2.1.03.05.0001","INSS a Recolher","account_template_225","payable","passivo","True"
-"account_template_227","2.1.03.05.0002","FGTS a Recolher","account_template_225","payable","passivo","True"
-"account_template_228","2.1.03.05.0003","Contribuição Sindical a Pagar","account_template_225","payable","passivo","True"
-"account_template_229","2.1.03.05.0004","Previdência Privada a Recolher","account_template_225","payable","passivo","True"
+"account_template_226","2.1.03.05.0001","INSS a Recolher","account_template_225","other","passivo","True"
+"account_template_227","2.1.03.05.0002","FGTS a Recolher","account_template_225","other","passivo","True"
+"account_template_228","2.1.03.05.0003","Contribuição Sindical a Pagar","account_template_225","other","passivo","True"
+"account_template_229","2.1.03.05.0004","Previdência Privada a Recolher","account_template_225","other","passivo","True"
 "account_template_230","2.1.04","OBRIGAÇÕES TRIBUTÁRIAS","account_template_194","view","passivo","True"
 "account_template_231","2.1.04.01","IMPOSTOS RETIDOS A RECOLHER","account_template_230","view","passivo","True"
-"account_template_232","2.1.04.01.0001","IRRF a Recolher - Pessoa Física","account_template_231","payable","passivo","True"
-"account_template_233","2.1.04.01.0002","IRRF a Recolher - Pessoa Jurídica","account_template_231","payable","passivo","True"
-"account_template_234","2.1.04.01.0003","ISS Retido a Recolher","account_template_231","payable","passivo","True"
-"account_template_235","2.1.04.01.0004","PIS/COFINS/CSLL Retido a Recolher","account_template_231","payable","passivo","True"
-"account_template_236","2.1.04.01.0005","INSS Retido a Recolher","account_template_231","payable","passivo","True"
+"account_template_232","2.1.04.01.0001","IRRF a Recolher - Pessoa Física","account_template_231","other","passivo","True"
+"account_template_233","2.1.04.01.0002","IRRF a Recolher - Pessoa Jurídica","account_template_231","other","passivo","True"
+"account_template_234","2.1.04.01.0003","ISS Retido a Recolher","account_template_231","other","passivo","True"
+"account_template_235","2.1.04.01.0004","PIS/COFINS/CSLL Retido a Recolher","account_template_231","other","passivo","True"
+"account_template_236","2.1.04.01.0005","INSS Retido a Recolher","account_template_231","other","passivo","True"
 "account_template_237","2.1.04.02","IMPOSTOS E CONTRIBUIÇÃO S/ O LUCRO","account_template_230","view","passivo","True"
-"account_template_238","2.1.04.02.0001","Provisão para o Imposto de Renda","account_template_237","payable","passivo","True"
-"account_template_239","2.1.04.02.0002","Provisão Contrib.Social s/Lucro Líquido","account_template_237","payable","passivo","True"
+"account_template_238","2.1.04.02.0001","Provisão para o Imposto de Renda","account_template_237","other","passivo","True"
+"account_template_239","2.1.04.02.0002","Provisão Contrib.Social s/Lucro Líquido","account_template_237","other","passivo","True"
 "account_template_240","2.1.04.03","IMPOSTOS E CONTRIBUIÇÃO S/ RECEITAS","account_template_230","view","passivo","True"
-"account_template_241","2.1.04.03.0001","ICMS a Recolher","account_template_240","payable","passivo","True"
-"account_template_242","2.1.04.03.0002","COFINS a Recolher","account_template_240","payable","passivo","True"
-"account_template_243","2.1.04.03.0003","PIS a Recolher","account_template_240","payable","passivo","True"
-"account_template_244","2.1.04.03.0004","IPI  a Recolher","account_template_240","payable","passivo","True"
-"account_template_245","2.1.04.03.0005","ISS a Recolher","account_template_240","payable","passivo","True"
+"account_template_241","2.1.04.03.0001","ICMS a Recolher","account_template_240","other","passivo","True"
+"account_template_242","2.1.04.03.0002","COFINS a Recolher","account_template_240","other","passivo","True"
+"account_template_243","2.1.04.03.0003","PIS a Recolher","account_template_240","other","passivo","True"
+"account_template_244","2.1.04.03.0004","IPI  a Recolher","account_template_240","other","passivo","True"
+"account_template_245","2.1.04.03.0005","ISS a Recolher","account_template_240","other","passivo","True"
 "account_template_246","2.1.05","PARCELAMENTOS CURTO PRAZO","account_template_194","view","passivo","True"
 "account_template_247","2.1.05.01","PARCELAMENTOS TRIBUTÁRIOS","account_template_246","view","passivo","True"
-"account_template_248","2.1.05.01.0001","COFINS Parcelamento","account_template_247","payable","passivo","True"
-"account_template_249","2.1.05.01.0002","PIS Parcelamento","account_template_247","payable","passivo","True"
-"account_template_250","2.1.05.01.0003","IPI Parcelamento","account_template_247","payable","passivo","True"
-"account_template_251","2.1.05.01.0004","ICMS Parcelamento","account_template_247","payable","passivo","True"
-"account_template_252","2.1.05.01.0005","IRPJ Parcelamento","account_template_247","payable","passivo","True"
-"account_template_253","2.1.05.01.0006","CSLL Parcelamento","account_template_247","payable","passivo","True"
-"account_template_254","2.1.05.01.0007","INSS Parcelamento","account_template_247","payable","passivo","True"
-"account_template_255","2.1.05.01.0008","FGTS Parcelamento","account_template_247","payable","passivo","True"
+"account_template_248","2.1.05.01.0001","COFINS Parcelamento","account_template_247","other","passivo","True"
+"account_template_249","2.1.05.01.0002","PIS Parcelamento","account_template_247","other","passivo","True"
+"account_template_250","2.1.05.01.0003","IPI Parcelamento","account_template_247","other","passivo","True"
+"account_template_251","2.1.05.01.0004","ICMS Parcelamento","account_template_247","other","passivo","True"
+"account_template_252","2.1.05.01.0005","IRPJ Parcelamento","account_template_247","other","passivo","True"
+"account_template_253","2.1.05.01.0006","CSLL Parcelamento","account_template_247","other","passivo","True"
+"account_template_254","2.1.05.01.0007","INSS Parcelamento","account_template_247","other","passivo","True"
+"account_template_255","2.1.05.01.0008","FGTS Parcelamento","account_template_247","other","passivo","True"
 "account_template_256","2.1.06","OUTRAS OBRIGAÇÕES","account_template_194","view","passivo","True"
 "account_template_257","2.1.06.01","CONTAS DE CONSUMO","account_template_256","view","passivo","True"
-"account_template_258","2.1.06.01.0001","Consumo de Água/Esgoto","account_template_257","payable","passivo","True"
-"account_template_259","2.1.06.01.0003","Consumo de Energia Elétrica","account_template_257","payable","passivo","True"
-"account_template_260","2.1.06.01.0004","Consumo de Telefone","account_template_257","payable","passivo","True"
-"account_template_261","2.1.06.01.0005","Consumo de Internet","account_template_257","payable","passivo","True"
+"account_template_258","2.1.06.01.0001","Consumo de Água/Esgoto","account_template_257","other","passivo","True"
+"account_template_259","2.1.06.01.0003","Consumo de Energia Elétrica","account_template_257","other","passivo","True"
+"account_template_260","2.1.06.01.0004","Consumo de Telefone","account_template_257","other","passivo","True"
+"account_template_261","2.1.06.01.0005","Consumo de Internet","account_template_257","other","passivo","True"
 "account_template_262","2.1.06.02","OUTRAS CONTAS A PAGAR","account_template_256","view","passivo","True"
-"account_template_263","2.1.06.02.0001","Cheques a Compensar","account_template_262","payable","passivo","True"
-"account_template_264","2.1.06.02.0002","Seguros a Pagar","account_template_262","payable","passivo","True"
-"account_template_265","2.1.06.02.0003","Assinaturas de Periódicos a Pagar","account_template_262","payable","passivo","True"
-"account_template_266","2.1.06.02.0004","Aluguel a Pagar","account_template_262","payable","passivo","True"
-"account_template_267","2.1.06.02.0005","Doações a Pagar","account_template_262","payable","passivo","True"
-"account_template_268","2.1.06.02.0006","Pensão Alimenticia a Pagar","account_template_262","payable","passivo","True"
+"account_template_263","2.1.06.02.0001","Cheques a Compensar","account_template_262","other","passivo","True"
+"account_template_264","2.1.06.02.0002","Seguros a Pagar","account_template_262","other","passivo","True"
+"account_template_265","2.1.06.02.0003","Assinaturas de Periódicos a Pagar","account_template_262","other","passivo","True"
+"account_template_266","2.1.06.02.0004","Aluguel a Pagar","account_template_262","other","passivo","True"
+"account_template_267","2.1.06.02.0005","Doações a Pagar","account_template_262","other","passivo","True"
+"account_template_268","2.1.06.02.0006","Pensão Alimenticia a Pagar","account_template_262","other","passivo","True"
 "account_template_269","2.1.06.03","ADIANTAMENTO DE CLIENTES","account_template_256","view","passivo","True"
-"account_template_270","2.1.06.03.0001","Adiantamento Clientes","account_template_269","payable","passivo","True"
+"account_template_270","2.1.06.03.0001","Adiantamento Clientes","account_template_269","other","passivo","True"
 "account_template_271","2.2","PASSIVO NÃO CIRCULANTE","account_template_193","view","passivo","True"
 "account_template_272","2.2.01","EXIGÍVEL A LONGO PRAZO","account_template_271","view","passivo","True"
 "account_template_273","2.2.01.01","FINANCIAMENTOS A LONGO PRAZO - SFN","account_template_272","view","passivo","True"
-"account_template_274","2.2.01.01.0001","Banco Conta Empréstimo","account_template_273","payable","passivo","True"
+"account_template_274","2.2.01.01.0001","Banco Conta Empréstimo","account_template_273","other","passivo","True"
 "account_template_275","2.2.01.02","EMPRÉSTIMO DE SÓCIOS","account_template_272","view","passivo","True"
-"account_template_276","2.2.01.02.0001","Sócio","account_template_275","payable","passivo","True"
+"account_template_276","2.2.01.02.0001","Sócio","account_template_275","other","passivo","True"
 "account_template_277","2.2.01.03","EMPRÉSTIMO DE EMPRESAS LIGADAS","account_template_272","view","passivo","True"
-"account_template_278","2.2.01.03.0001","Empresas Ligadas","account_template_277","payable","passivo","True"
+"account_template_278","2.2.01.03.0001","Empresas Ligadas","account_template_277","other","passivo","True"
 "account_template_279","2.2.01.04","EMPRÉSTIMOS A TERCEIROS","account_template_272","view","passivo","True"
-"account_template_280","2.2.01.04.0001","Terceiro","account_template_279","payable","passivo","True"
+"account_template_280","2.2.01.04.0001","Terceiro","account_template_279","other","passivo","True"
 "account_template_281","2.2.01.05","PARCELAMENTOS TRIBUTÁRIOS","account_template_272","view","passivo","True"
-"account_template_282","2.2.01.05.0001","COFINS Parcelamento","account_template_281","payable","passivo","True"
-"account_template_283","2.2.01.05.0002","PIS Parcelamento","account_template_281","payable","passivo","True"
-"account_template_284","2.2.01.05.0003","IPI Parcelamento","account_template_281","payable","passivo","True"
-"account_template_285","2.2.01.05.0004","ICMS Parcelamento","account_template_281","payable","passivo","True"
-"account_template_286","2.2.01.05.0005","ISS Parcelamento","account_template_281","payable","passivo","True"
-"account_template_287","2.2.01.05.0006","IRPJ Parcelamento","account_template_281","payable","passivo","True"
-"account_template_288","2.2.01.05.0007","CSLL Parcelamento","account_template_281","payable","passivo","True"
-"account_template_289","2.2.01.05.0008","INSS Parcelamento","account_template_281","payable","passivo","True"
-"account_template_290","2.2.01.05.0009","FGTS Parcelamento","account_template_281","payable","passivo","True"
+"account_template_282","2.2.01.05.0001","COFINS Parcelamento","account_template_281","other","passivo","True"
+"account_template_283","2.2.01.05.0002","PIS Parcelamento","account_template_281","other","passivo","True"
+"account_template_284","2.2.01.05.0003","IPI Parcelamento","account_template_281","other","passivo","True"
+"account_template_285","2.2.01.05.0004","ICMS Parcelamento","account_template_281","other","passivo","True"
+"account_template_286","2.2.01.05.0005","ISS Parcelamento","account_template_281","other","passivo","True"
+"account_template_287","2.2.01.05.0006","IRPJ Parcelamento","account_template_281","other","passivo","True"
+"account_template_288","2.2.01.05.0007","CSLL Parcelamento","account_template_281","other","passivo","True"
+"account_template_289","2.2.01.05.0008","INSS Parcelamento","account_template_281","other","passivo","True"
+"account_template_290","2.2.01.05.0009","FGTS Parcelamento","account_template_281","other","passivo","True"
 "account_template_291","2.2.03","RECEITA DIFERIDA","account_template_271","view","passivo","True"
 "account_template_292","2.2.03.01","RECEITAS DIFERIDAS","account_template_291","view","passivo","True"
-"account_template_293","2.2.03.01.0001","Receitas a Realizar","account_template_292","payable","passivo","True"
+"account_template_293","2.2.03.01.0001","Receitas a Realizar","account_template_292","other","passivo","True"
 "account_template_294","2.2.03.02","CUSTOS DIFERIDOS","account_template_291","view","passivo","True"
-"account_template_295","2.2.03.02.0001","Custos Diferidos","account_template_294","payable","passivo","True"
+"account_template_295","2.2.03.02.0001","Custos Diferidos","account_template_294","other","passivo","True"
 "account_template_296","2.2.03.03","DESPESAS DIFERIDAS","account_template_291","view","passivo","True"
-"account_template_297","2.2.03.03.0001","Despesas Diferidas","account_template_296","payable","passivo","True"
+"account_template_297","2.2.03.03.0001","Despesas Diferidas","account_template_296","other","passivo","True"
 "account_template_298","2.4","PATRIMÔNIO LÍQUIDO","account_template_193","view","passivo","True"
 "account_template_299","2.4.01","CAPITAL SOCIAL","account_template_298","view","passivo","True"
 "account_template_300","2.4.01.01","CAPITAL SOCIAL REALIZADO","account_template_299","view","passivo","True"
-"account_template_301","2.4.01.01.0001","Capital Social Realizado","account_template_300","payable","passivo","True"
+"account_template_301","2.4.01.01.0001","Capital Social Realizado","account_template_300","other","passivo","True"
 "account_template_302","2.4.01.02","(-) CAPITAL A REALIZAR","account_template_299","view","passivo","True"
-"account_template_303","2.4.01.02.0001","Capital Social a Realizar ","account_template_302","payable","passivo","True"
+"account_template_303","2.4.01.02.0001","Capital Social a Realizar ","account_template_302","other","passivo","True"
 "account_template_304","2.4.02","RESERVAS","account_template_298","view","passivo","True"
 "account_template_305","2.4.02.01","RESERVAS DE CAPITAL","account_template_304","view","passivo","True"
-"account_template_306","2.4.02.01.0001","Reserva de Correção do Capital Realizado","account_template_305","payable","passivo","True"
+"account_template_306","2.4.02.01.0001","Reserva de Correção do Capital Realizado","account_template_305","other","passivo","True"
 "account_template_307","2.4.02.02","AJUSTES DE AVALIAÇÃO PATRIMONIAL","account_template_304","view","passivo","True"
-"account_template_308","2.4.02.02.0001","Ajustes de Avaliação Patrimonial","account_template_307","payable","passivo","True"
+"account_template_308","2.4.02.02.0001","Ajustes de Avaliação Patrimonial","account_template_307","other","passivo","True"
 "account_template_309","2.4.02.03","RESERVAS DE LUCROS","account_template_304","view","passivo","True"
-"account_template_310","2.4.02.03.0001","Reserva de Lucros","account_template_309","payable","passivo","True"
-"account_template_311","2.4.02.03.0002","Reserva para Aumento de Capital","account_template_309","payable","passivo","True"
+"account_template_310","2.4.02.03.0001","Reserva de Lucros","account_template_309","other","passivo","True"
+"account_template_311","2.4.02.03.0002","Reserva para Aumento de Capital","account_template_309","other","passivo","True"
 "account_template_312","2.4.02.04","PREJUÍZOS ACUMULADOS","account_template_304","view","passivo","True"
-"account_template_313","2.4.02.04.0002","(-) Prejuízos Acumulados","account_template_312","payable","passivo","True"
-"account_template_314","2.4.02.04.0003","Ajustes Credores Exercícios Anteriores","account_template_312","payable","passivo","True"
-"account_template_315","2.4.02.04.0001","Ajustes Devedores Exercícios Anteriores","account_template_312","payable","passivo","True"
+"account_template_313","2.4.02.04.0002","(-) Prejuízos Acumulados","account_template_312","other","passivo","True"
+"account_template_314","2.4.02.04.0003","Ajustes Credores Exercícios Anteriores","account_template_312","other","passivo","True"
+"account_template_315","2.4.02.04.0001","Ajustes Devedores Exercícios Anteriores","account_template_312","other","passivo","True"
 "account_template_316","2.4.02.05","RESULTADO DO EXERCÍCIO","account_template_304","view","passivo","True"
-"account_template_317","2.4.02.05.0001","Lucro do Exercício","account_template_316","payable","passivo","True"
-"account_template_318","2.4.02.05.0002","Prejuízo do Exercício","account_template_316","payable","passivo","True"
+"account_template_317","2.4.02.05.0001","Lucro do Exercício","account_template_316","other","passivo","True"
+"account_template_318","2.4.02.05.0002","Prejuízo do Exercício","account_template_316","other","passivo","True"
 "account_template_319","2.4.02.06","(-) LUCROS DISTRIBUÍDOS","account_template_304","view","passivo","True"
-"account_template_320","2.4.02.06.0001","Lucros Distribuídos","account_template_319","payable","passivo","True"
+"account_template_320","2.4.02.06.0001","Lucros Distribuídos","account_template_319","other","passivo","True"
 "account_template_321","3","CONTAS DE RESULTADO - CUSTOS E DESPESAS","account_template_1","view","despesa","True"
 "account_template_322","3.1","CUSTOS","account_template_321","view","despesa","True"
 "account_template_323","3.1.01","CUSTOS DAS MERCADORIAS E PRODUTOS","account_template_322","view","despesa","True"
 "account_template_324","3.1.01.01","CUSTOS DAS MERCADORIAS VENDIDAS","account_template_323","view","despesa","True"
-"account_template_325","3.1.01.01.0001","Custo das Mercadorias Vendidas","account_template_324","payable","despesa","True"
+"account_template_325","3.1.01.01.0001","Custo das Mercadorias Vendidas","account_template_324","other","despesa","True"
 "account_template_326","3.1.02","CUSTO DOS PRODUTOS VENDIDOS","account_template_322","view","despesa","True"
 "account_template_327","3.1.02.01","CUSTO DAS MATÉRIAS PRIMAS","account_template_326","view","despesa","True"
-"account_template_328","3.1.02.01.0001","Custo das Matérias Primas","account_template_327","payable","despesa","True"
+"account_template_328","3.1.02.01.0001","Custo das Matérias Primas","account_template_327","other","despesa","True"
 "account_template_329","3.1.02.02","CUSTO DOS PRODUTOS ACABADOS","account_template_326","view","despesa","True"
-"account_template_330","3.1.02.02.0001","Custo dos Produtos Acabados","account_template_329","payable","despesa","True"
+"account_template_330","3.1.02.02.0001","Custo dos Produtos Acabados","account_template_329","other","despesa","True"
 "account_template_331","3.1.02.03","CUSTO DE MÃO-DE-OBRA DIRETA","account_template_326","view","despesa","True"
-"account_template_332","3.1.02.03.0001","Salários","account_template_331","payable","despesa","True"
-"account_template_333","3.1.02.03.0002","Horas Extras","account_template_331","payable","despesa","True"
-"account_template_334","3.1.02.03.0003","Adicional Noturno","account_template_331","payable","despesa","True"
-"account_template_335","3.1.02.03.0004","Férias","account_template_331","payable","despesa","True"
-"account_template_336","3.1.02.03.0005","13º Salário","account_template_331","payable","despesa","True"
-"account_template_337","3.1.02.03.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_331","payable","despesa","True"
-"account_template_338","3.1.02.03.0007","Gratificações","account_template_331","payable","despesa","True"
-"account_template_339","3.1.02.03.0008","INSS Empresa","account_template_331","payable","despesa","True"
-"account_template_340","3.1.02.03.0009","FGTS ","account_template_331","payable","despesa","True"
-"account_template_341","3.1.02.03.0010","Adicional Insalubridade","account_template_331","payable","despesa","True"
-"account_template_342","3.1.02.03.0011","Vale Transporte","account_template_331","payable","despesa","True"
-"account_template_343","3.1.02.03.0012","PAT - Programa Alim. Trabalhador","account_template_331","payable","despesa","True"
-"account_template_344","3.1.02.03.0013","Assistência Médica","account_template_331","payable","despesa","True"
-"account_template_345","3.1.02.03.0014","DSR - Descanso Semanal Remunerado","account_template_331","payable","despesa","True"
-"account_template_346","3.1.02.03.0015","Salário Estagiários","account_template_331","payable","despesa","True"
-"account_template_347","3.1.02.03.0016","Previdência Privada","account_template_331","payable","despesa","True"
-"account_template_348","3.1.02.03.0017","Vestuário","account_template_331","payable","despesa","True"
-"account_template_349","3.1.02.03.0018","Assiduidade","account_template_331","payable","despesa","True"
-"account_template_350","3.1.02.03.0019","Abono Salarial","account_template_331","payable","despesa","True"
-"account_template_351","3.1.02.03.0020","Vale Refeição","account_template_331","payable","despesa","True"
-"account_template_352","3.1.02.03.0021","Farmácia","account_template_331","payable","despesa","True"
-"account_template_353","3.1.02.03.0022","Pró-Labore","account_template_331","payable","despesa","True"
+"account_template_332","3.1.02.03.0001","Salários","account_template_331","other","despesa","True"
+"account_template_333","3.1.02.03.0002","Horas Extras","account_template_331","other","despesa","True"
+"account_template_334","3.1.02.03.0003","Adicional Noturno","account_template_331","other","despesa","True"
+"account_template_335","3.1.02.03.0004","Férias","account_template_331","other","despesa","True"
+"account_template_336","3.1.02.03.0005","13º Salário","account_template_331","other","despesa","True"
+"account_template_337","3.1.02.03.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_331","other","despesa","True"
+"account_template_338","3.1.02.03.0007","Gratificações","account_template_331","other","despesa","True"
+"account_template_339","3.1.02.03.0008","INSS Empresa","account_template_331","other","despesa","True"
+"account_template_340","3.1.02.03.0009","FGTS ","account_template_331","other","despesa","True"
+"account_template_341","3.1.02.03.0010","Adicional Insalubridade","account_template_331","other","despesa","True"
+"account_template_342","3.1.02.03.0011","Vale Transporte","account_template_331","other","despesa","True"
+"account_template_343","3.1.02.03.0012","PAT - Programa Alim. Trabalhador","account_template_331","other","despesa","True"
+"account_template_344","3.1.02.03.0013","Assistência Médica","account_template_331","other","despesa","True"
+"account_template_345","3.1.02.03.0014","DSR - Descanso Semanal Remunerado","account_template_331","other","despesa","True"
+"account_template_346","3.1.02.03.0015","Salário Estagiários","account_template_331","other","despesa","True"
+"account_template_347","3.1.02.03.0016","Previdência Privada","account_template_331","other","despesa","True"
+"account_template_348","3.1.02.03.0017","Vestuário","account_template_331","other","despesa","True"
+"account_template_349","3.1.02.03.0018","Assiduidade","account_template_331","other","despesa","True"
+"account_template_350","3.1.02.03.0019","Abono Salarial","account_template_331","other","despesa","True"
+"account_template_351","3.1.02.03.0020","Vale Refeição","account_template_331","other","despesa","True"
+"account_template_352","3.1.02.03.0021","Farmácia","account_template_331","other","despesa","True"
+"account_template_353","3.1.02.03.0022","Pró-Labore","account_template_331","other","despesa","True"
 "account_template_354","3.1.02.04","GASTOS GERAIS DE FABRICAÇÃO","account_template_326","view","despesa","True"
-"account_template_355","3.1.02.04.0001","Aluguel","account_template_354","payable","despesa","True"
-"account_template_356","3.1.02.04.0002","Água e Esgoto","account_template_354","payable","despesa","True"
-"account_template_357","3.1.02.04.0003","Energia Elétrica","account_template_354","payable","despesa","True"
-"account_template_358","3.1.02.04.0004","Fretes e Carretos","account_template_354","payable","despesa","True"
-"account_template_359","3.1.02.04.0005","Material de Consumo","account_template_354","payable","despesa","True"
-"account_template_360","3.1.02.04.0006","Condução","account_template_354","payable","despesa","True"
-"account_template_361","3.1.02.04.0007","Contribuição Sindical/Assoc.de Classe","account_template_354","payable","despesa","True"
-"account_template_362","3.1.02.04.0008","Material de Limpeza","account_template_354","payable","despesa","True"
-"account_template_363","3.1.02.04.0009","Seguros","account_template_354","payable","despesa","True"
-"account_template_364","3.1.02.04.0010","Viagens e Estadias","account_template_354","payable","despesa","True"
-"account_template_365","3.1.02.04.0011","Manutenção de Equipamentos","account_template_354","payable","despesa","True"
-"account_template_366","3.1.02.04.0012","Depreciações e Amortizações","account_template_354","payable","despesa","True"
-"account_template_367","3.1.02.04.0013","Combustíveis e Lubrificantes","account_template_354","payable","despesa","True"
-"account_template_368","3.1.02.04.0014","Bens de Pequeno Valor","account_template_354","payable","despesa","True"
-"account_template_369","3.1.02.04.0015","Leasing","account_template_354","payable","despesa","True"
-"account_template_370","3.1.02.04.0016","Formação de Pessoal","account_template_354","payable","despesa","True"
-"account_template_371","3.1.02.04.0017","Serviços de Terceiros - Pessoa Jurídica","account_template_354","payable","despesa","True"
-"account_template_372","3.1.02.04.0018","Locação de Equipamentos","account_template_354","payable","despesa","True"
-"account_template_373","3.1.02.04.0019","Feiras/Congressos/Simpósios/Cursos","account_template_354","payable","despesa","True"
-"account_template_374","3.1.02.04.0020","Telefone","account_template_354","payable","despesa","True"
-"account_template_375","3.1.02.04.0021","Comissões sobre Serviços","account_template_354","payable","despesa","True"
-"account_template_376","3.1.02.04.0022","Jornais, Revistas e Periódicos","account_template_354","payable","despesa","True"
-"account_template_377","3.1.02.04.0023","Confraternizações","account_template_354","payable","despesa","True"
-"account_template_378","3.1.02.04.0024","Manutenção de Prédios","account_template_354","payable","despesa","True"
-"account_template_379","3.1.02.04.0025","Brindes e Amostras","account_template_354","payable","despesa","True"
-"account_template_380","3.1.02.04.0026","Aluguel de Equipamentos","account_template_354","payable","despesa","True"
-"account_template_381","3.1.02.04.0027","Serv.de Terceiros P.Física - Autônomos","account_template_354","payable","despesa","True"
-"account_template_382","3.1.02.04.0028","Manutenção de Veículos","account_template_354","payable","despesa","True"
-"account_template_383","3.1.02.04.0029","Despesas de Importação","account_template_354","payable","despesa","True"
-"account_template_384","3.1.02.04.0030","(-) Crédito PIS Não-Cumulativo","account_template_354","payable","despesa","True"
-"account_template_385","3.1.02.04.0031","(-) Crédito Cofins Não-Cumulativo","account_template_354","payable","despesa","True"
+"account_template_355","3.1.02.04.0001","Aluguel","account_template_354","other","despesa","True"
+"account_template_356","3.1.02.04.0002","Água e Esgoto","account_template_354","other","despesa","True"
+"account_template_357","3.1.02.04.0003","Energia Elétrica","account_template_354","other","despesa","True"
+"account_template_358","3.1.02.04.0004","Fretes e Carretos","account_template_354","other","despesa","True"
+"account_template_359","3.1.02.04.0005","Material de Consumo","account_template_354","other","despesa","True"
+"account_template_360","3.1.02.04.0006","Condução","account_template_354","other","despesa","True"
+"account_template_361","3.1.02.04.0007","Contribuição Sindical/Assoc.de Classe","account_template_354","other","despesa","True"
+"account_template_362","3.1.02.04.0008","Material de Limpeza","account_template_354","other","despesa","True"
+"account_template_363","3.1.02.04.0009","Seguros","account_template_354","other","despesa","True"
+"account_template_364","3.1.02.04.0010","Viagens e Estadias","account_template_354","other","despesa","True"
+"account_template_365","3.1.02.04.0011","Manutenção de Equipamentos","account_template_354","other","despesa","True"
+"account_template_366","3.1.02.04.0012","Depreciações e Amortizações","account_template_354","other","despesa","True"
+"account_template_367","3.1.02.04.0013","Combustíveis e Lubrificantes","account_template_354","other","despesa","True"
+"account_template_368","3.1.02.04.0014","Bens de Pequeno Valor","account_template_354","other","despesa","True"
+"account_template_369","3.1.02.04.0015","Leasing","account_template_354","other","despesa","True"
+"account_template_370","3.1.02.04.0016","Formação de Pessoal","account_template_354","other","despesa","True"
+"account_template_371","3.1.02.04.0017","Serviços de Terceiros - Pessoa Jurídica","account_template_354","other","despesa","True"
+"account_template_372","3.1.02.04.0018","Locação de Equipamentos","account_template_354","other","despesa","True"
+"account_template_373","3.1.02.04.0019","Feiras/Congressos/Simpósios/Cursos","account_template_354","other","despesa","True"
+"account_template_374","3.1.02.04.0020","Telefone","account_template_354","other","despesa","True"
+"account_template_375","3.1.02.04.0021","Comissões sobre Serviços","account_template_354","other","despesa","True"
+"account_template_376","3.1.02.04.0022","Jornais, Revistas e Periódicos","account_template_354","other","despesa","True"
+"account_template_377","3.1.02.04.0023","Confraternizações","account_template_354","other","despesa","True"
+"account_template_378","3.1.02.04.0024","Manutenção de Prédios","account_template_354","other","despesa","True"
+"account_template_379","3.1.02.04.0025","Brindes e Amostras","account_template_354","other","despesa","True"
+"account_template_380","3.1.02.04.0026","Aluguel de Equipamentos","account_template_354","other","despesa","True"
+"account_template_381","3.1.02.04.0027","Serv.de Terceiros P.Física - Autônomos","account_template_354","other","despesa","True"
+"account_template_382","3.1.02.04.0028","Manutenção de Veículos","account_template_354","other","despesa","True"
+"account_template_383","3.1.02.04.0029","Despesas de Importação","account_template_354","other","despesa","True"
+"account_template_384","3.1.02.04.0030","(-) Crédito PIS Não-Cumulativo","account_template_354","other","despesa","True"
+"account_template_385","3.1.02.04.0031","(-) Crédito Cofins Não-Cumulativo","account_template_354","other","despesa","True"
 "account_template_386","3.1.02.05","ESTOQUE INICIAL DE PROD.EM ELABORAÇÃO","account_template_326","view","despesa","True"
-"account_template_387","3.1.02.05.0001","Estoque Inicial de Prod. em Elaboração","account_template_386","payable","despesa","True"
+"account_template_387","3.1.02.05.0001","Estoque Inicial de Prod. em Elaboração","account_template_386","other","despesa","True"
 "account_template_388","3.1.02.06","ESTOQUE INICIAL DE PROD.ACABADOS","account_template_326","view","despesa","True"
-"account_template_389","3.1.02.06.0001","Estoque Inicial de Prod.Acabados","account_template_388","payable","despesa","True"
+"account_template_389","3.1.02.06.0001","Estoque Inicial de Prod.Acabados","account_template_388","other","despesa","True"
 "account_template_390","3.1.02.07","ESTOQUE FINAL DE PROD.EM ELABORAÇÃO","account_template_326","view","despesa","True"
-"account_template_391","3.1.02.07.0001","Estoque Final de Prod.em Elaboração","account_template_390","payable","despesa","True"
+"account_template_391","3.1.02.07.0001","Estoque Final de Prod.em Elaboração","account_template_390","other","despesa","True"
 "account_template_392","3.1.02.08","ESTOQUE FINAL DE PROD.ACABADOS","account_template_326","view","despesa","True"
-"account_template_393","3.1.02.08.0001","Estoque Final de Prod.Acabados","account_template_392","payable","despesa","True"
+"account_template_393","3.1.02.08.0001","Estoque Final de Prod.Acabados","account_template_392","other","despesa","True"
 "account_template_394","3.2","despesa","account_template_321","view","despesa","True"
 "account_template_395","3.2.01","DESPESAS OPERACIONAIS COMERCIAIS","account_template_394","view","despesa","True"
 "account_template_396","3.2.01.01","DESPESAS TRABALHISTAS","account_template_395","view","despesa","True"
-"account_template_397","3.2.01.01.0001","Salários","account_template_396","payable","despesa","True"
-"account_template_398","3.2.01.01.0002","Horas Extras","account_template_396","payable","despesa","True"
-"account_template_399","3.2.01.01.0003","Vale Transporte","account_template_396","payable","despesa","True"
-"account_template_400","3.2.01.01.0004","Férias","account_template_396","payable","despesa","True"
-"account_template_401","3.2.01.01.0005","13º Salário","account_template_396","payable","despesa","True"
-"account_template_402","3.2.01.01.0006","Aviso Prévio/Indeniz.Trabalhisas","account_template_396","payable","despesa","True"
-"account_template_403","3.2.01.01.0007","Gratificações","account_template_396","payable","despesa","True"
-"account_template_404","3.2.01.01.0008","Assiduidade","account_template_396","payable","despesa","True"
-"account_template_405","3.2.01.01.0009","Abono Salarial","account_template_396","payable","despesa","True"
-"account_template_406","3.2.01.01.0010","Adicional de Insalubridade","account_template_396","payable","despesa","True"
-"account_template_407","3.2.01.01.0011","Vale Refeição","account_template_396","payable","despesa","True"
-"account_template_408","3.2.01.01.0012","Adicional Noturno","account_template_396","payable","despesa","True"
-"account_template_409","3.2.01.01.0013","Farmácia","account_template_396","payable","despesa","True"
-"account_template_410","3.2.01.01.0014","PAT - Programa Alim. Trabalhador","account_template_396","payable","despesa","True"
-"account_template_411","3.2.01.01.0015","Pró-Labore","account_template_396","payable","despesa","True"
-"account_template_412","3.2.01.01.0016","Assistência Médica","account_template_396","payable","despesa","True"
+"account_template_397","3.2.01.01.0001","Salários","account_template_396","other","despesa","True"
+"account_template_398","3.2.01.01.0002","Horas Extras","account_template_396","other","despesa","True"
+"account_template_399","3.2.01.01.0003","Vale Transporte","account_template_396","other","despesa","True"
+"account_template_400","3.2.01.01.0004","Férias","account_template_396","other","despesa","True"
+"account_template_401","3.2.01.01.0005","13º Salário","account_template_396","other","despesa","True"
+"account_template_402","3.2.01.01.0006","Aviso Prévio/Indeniz.Trabalhisas","account_template_396","other","despesa","True"
+"account_template_403","3.2.01.01.0007","Gratificações","account_template_396","other","despesa","True"
+"account_template_404","3.2.01.01.0008","Assiduidade","account_template_396","other","despesa","True"
+"account_template_405","3.2.01.01.0009","Abono Salarial","account_template_396","other","despesa","True"
+"account_template_406","3.2.01.01.0010","Adicional de Insalubridade","account_template_396","other","despesa","True"
+"account_template_407","3.2.01.01.0011","Vale Refeição","account_template_396","other","despesa","True"
+"account_template_408","3.2.01.01.0012","Adicional Noturno","account_template_396","other","despesa","True"
+"account_template_409","3.2.01.01.0013","Farmácia","account_template_396","other","despesa","True"
+"account_template_410","3.2.01.01.0014","PAT - Programa Alim. Trabalhador","account_template_396","other","despesa","True"
+"account_template_411","3.2.01.01.0015","Pró-Labore","account_template_396","other","despesa","True"
+"account_template_412","3.2.01.01.0016","Assistência Médica","account_template_396","other","despesa","True"
 "account_template_413","3.2.01.02","ENCARGOS SOCIAIS","account_template_395","view","despesa","True"
-"account_template_414","3.2.01.02.0001","Inss","account_template_413","payable","despesa","True"
-"account_template_415","3.2.01.02.0002","Fgts","account_template_413","payable","despesa","True"
+"account_template_414","3.2.01.02.0001","Inss","account_template_413","other","despesa","True"
+"account_template_415","3.2.01.02.0002","Fgts","account_template_413","other","despesa","True"
 "account_template_416","3.2.01.03","DESPESAS GERAIS COMERCIAIS","account_template_395","view","despesa","True"
-"account_template_417","3.2.01.03.0001","Comissões sobre Vendas","account_template_416","payable","despesa","True"
-"account_template_418","3.2.01.03.0002","Aluguel","account_template_416","payable","despesa","True"
-"account_template_419","3.2.01.03.0003","Agua e Esgoto","account_template_416","payable","despesa","True"
-"account_template_420","3.2.01.03.0004","Energia Elétrica","account_template_416","payable","despesa","True"
-"account_template_421","3.2.01.03.0006","Material de Expediente","account_template_416","payable","despesa","True"
-"account_template_422","3.2.01.03.0007","Condução","account_template_416","payable","despesa","True"
-"account_template_423","3.2.01.03.0008","Correios e Malotes","account_template_416","payable","despesa","True"
-"account_template_424","3.2.01.03.0009","Material de Limpeza","account_template_416","payable","despesa","True"
-"account_template_425","3.2.01.03.0010","Seguros","account_template_416","payable","despesa","True"
-"account_template_426","3.2.01.03.0011","Viagens e Estadias","account_template_416","payable","despesa","True"
-"account_template_427","3.2.01.03.0012","Manutenção e Conservação","account_template_416","payable","despesa","True"
-"account_template_428","3.2.01.03.0013","Depreciação e Amortização","account_template_416","payable","despesa","True"
-"account_template_429","3.2.01.03.0014","Propaganda e Publicidade","account_template_416","payable","despesa","True"
-"account_template_430","3.2.01.03.0015","Fretes e Carretos","account_template_416","payable","despesa","True"
-"account_template_431","3.2.01.03.0016","Combustíveis e Lubrificantes","account_template_416","payable","despesa","True"
-"account_template_432","3.2.01.03.0017","Leasing","account_template_416","payable","despesa","True"
-"account_template_433","3.2.01.03.0018","Serv.Terceiros P.Física - Autônomos","account_template_416","payable","despesa","True"
-"account_template_434","3.2.01.03.0019","Serv.Terceiros Pessoa Jurídica","account_template_416","payable","despesa","True"
-"account_template_435","3.2.01.03.0020","Feiras/Congressos/Simpósios/Cursos","account_template_416","payable","despesa","True"
-"account_template_436","3.2.01.03.0021","Telefone","account_template_416","payable","despesa","True"
-"account_template_437","3.2.01.03.0022","Despesas com Exportação","account_template_416","payable","despesa","True"
-"account_template_438","3.2.01.03.0024","Jornais, Revistas e Periódicos","account_template_416","payable","despesa","True"
-"account_template_439","3.2.01.03.0025","Refeições e Lanches","account_template_416","payable","despesa","True"
-"account_template_440","3.2.01.03.0026","Confraternizações","account_template_416","payable","despesa","True"
-"account_template_441","3.2.01.03.0027","Brindes","account_template_416","payable","despesa","True"
-"account_template_442","3.2.01.03.0028","Internet","account_template_416","payable","despesa","True"
+"account_template_417","3.2.01.03.0001","Comissões sobre Vendas","account_template_416","other","despesa","True"
+"account_template_418","3.2.01.03.0002","Aluguel","account_template_416","other","despesa","True"
+"account_template_419","3.2.01.03.0003","Agua e Esgoto","account_template_416","other","despesa","True"
+"account_template_420","3.2.01.03.0004","Energia Elétrica","account_template_416","other","despesa","True"
+"account_template_421","3.2.01.03.0006","Material de Expediente","account_template_416","other","despesa","True"
+"account_template_422","3.2.01.03.0007","Condução","account_template_416","other","despesa","True"
+"account_template_423","3.2.01.03.0008","Correios e Malotes","account_template_416","other","despesa","True"
+"account_template_424","3.2.01.03.0009","Material de Limpeza","account_template_416","other","despesa","True"
+"account_template_425","3.2.01.03.0010","Seguros","account_template_416","other","despesa","True"
+"account_template_426","3.2.01.03.0011","Viagens e Estadias","account_template_416","other","despesa","True"
+"account_template_427","3.2.01.03.0012","Manutenção e Conservação","account_template_416","other","despesa","True"
+"account_template_428","3.2.01.03.0013","Depreciação e Amortização","account_template_416","other","despesa","True"
+"account_template_429","3.2.01.03.0014","Propaganda e Publicidade","account_template_416","other","despesa","True"
+"account_template_430","3.2.01.03.0015","Fretes e Carretos","account_template_416","other","despesa","True"
+"account_template_431","3.2.01.03.0016","Combustíveis e Lubrificantes","account_template_416","other","despesa","True"
+"account_template_432","3.2.01.03.0017","Leasing","account_template_416","other","despesa","True"
+"account_template_433","3.2.01.03.0018","Serv.Terceiros P.Física - Autônomos","account_template_416","other","despesa","True"
+"account_template_434","3.2.01.03.0019","Serv.Terceiros Pessoa Jurídica","account_template_416","other","despesa","True"
+"account_template_435","3.2.01.03.0020","Feiras/Congressos/Simpósios/Cursos","account_template_416","other","despesa","True"
+"account_template_436","3.2.01.03.0021","Telefone","account_template_416","other","despesa","True"
+"account_template_437","3.2.01.03.0022","Despesas com Exportação","account_template_416","other","despesa","True"
+"account_template_438","3.2.01.03.0024","Jornais, Revistas e Periódicos","account_template_416","other","despesa","True"
+"account_template_439","3.2.01.03.0025","Refeições e Lanches","account_template_416","other","despesa","True"
+"account_template_440","3.2.01.03.0026","Confraternizações","account_template_416","other","despesa","True"
+"account_template_441","3.2.01.03.0027","Brindes","account_template_416","other","despesa","True"
+"account_template_442","3.2.01.03.0028","Internet","account_template_416","other","despesa","True"
 "account_template_443","3.2.02","DESPESAS ADMINISTRATIVAS","account_template_394","view","despesa","True"
 "account_template_444","3.2.02.01","DESPESAS TRABALHISTAS","account_template_443","view","despesa","True"
-"account_template_445","3.2.02.01.0001","Pro-Labore","account_template_444","payable","despesa","True"
-"account_template_446","3.2.02.01.0002","Salários","account_template_444","payable","despesa","True"
-"account_template_447","3.2.02.01.0003","Horas Extras","account_template_444","payable","despesa","True"
-"account_template_448","3.2.02.01.0004","Férias","account_template_444","payable","despesa","True"
-"account_template_449","3.2.02.01.0005","13º Salário","account_template_444","payable","despesa","True"
-"account_template_450","3.2.02.01.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_444","payable","despesa","True"
-"account_template_451","3.2.02.01.0007","Gratificações","account_template_444","payable","despesa","True"
-"account_template_452","3.2.02.01.0008","Adicional Insalubridade","account_template_444","payable","despesa","True"
-"account_template_453","3.2.02.01.0009","Adicional Noturno","account_template_444","payable","despesa","True"
-"account_template_454","3.2.02.01.0010","Vale Transporte","account_template_444","payable","despesa","True"
-"account_template_455","3.2.02.01.0011","Farmácia","account_template_444","payable","despesa","True"
-"account_template_456","3.2.02.01.0012","Vale Refeição","account_template_444","payable","despesa","True"
-"account_template_457","3.2.02.01.0013","PAT - Programa Alim. Trabalhador","account_template_444","payable","despesa","True"
-"account_template_458","3.2.02.01.0014","Salário Estagiários","account_template_444","payable","despesa","True"
-"account_template_459","3.2.02.01.0015","Assiduidade","account_template_444","payable","despesa","True"
-"account_template_460","3.2.02.01.0016","Abono Salarial","account_template_444","payable","despesa","True"
-"account_template_461","3.2.02.01.0017","Previdência Privada","account_template_444","payable","despesa","True"
-"account_template_462","3.2.02.01.0018","Assistência Médica","account_template_444","payable","despesa","True"
+"account_template_445","3.2.02.01.0001","Pro-Labore","account_template_444","other","despesa","True"
+"account_template_446","3.2.02.01.0002","Salários","account_template_444","other","despesa","True"
+"account_template_447","3.2.02.01.0003","Horas Extras","account_template_444","other","despesa","True"
+"account_template_448","3.2.02.01.0004","Férias","account_template_444","other","despesa","True"
+"account_template_449","3.2.02.01.0005","13º Salário","account_template_444","other","despesa","True"
+"account_template_450","3.2.02.01.0006","Aviso Prévio/Indeniz.Trabalhistas","account_template_444","other","despesa","True"
+"account_template_451","3.2.02.01.0007","Gratificações","account_template_444","other","despesa","True"
+"account_template_452","3.2.02.01.0008","Adicional Insalubridade","account_template_444","other","despesa","True"
+"account_template_453","3.2.02.01.0009","Adicional Noturno","account_template_444","other","despesa","True"
+"account_template_454","3.2.02.01.0010","Vale Transporte","account_template_444","other","despesa","True"
+"account_template_455","3.2.02.01.0011","Farmácia","account_template_444","other","despesa","True"
+"account_template_456","3.2.02.01.0012","Vale Refeição","account_template_444","other","despesa","True"
+"account_template_457","3.2.02.01.0013","PAT - Programa Alim. Trabalhador","account_template_444","other","despesa","True"
+"account_template_458","3.2.02.01.0014","Salário Estagiários","account_template_444","other","despesa","True"
+"account_template_459","3.2.02.01.0015","Assiduidade","account_template_444","other","despesa","True"
+"account_template_460","3.2.02.01.0016","Abono Salarial","account_template_444","other","despesa","True"
+"account_template_461","3.2.02.01.0017","Previdência Privada","account_template_444","other","despesa","True"
+"account_template_462","3.2.02.01.0018","Assistência Médica","account_template_444","other","despesa","True"
 "account_template_463","3.2.02.02","ENCARGOS SOCIAIS","account_template_443","view","despesa","True"
-"account_template_464","3.2.02.02.0001","Inss","account_template_463","payable","despesa","True"
-"account_template_465","3.2.02.02.0002","Fgts","account_template_463","payable","despesa","True"
+"account_template_464","3.2.02.02.0001","Inss","account_template_463","other","despesa","True"
+"account_template_465","3.2.02.02.0002","Fgts","account_template_463","other","despesa","True"
 "account_template_466","3.2.02.03","DESPESAS GERAIS ADMINISTRATIVAS","account_template_443","view","despesa","True"
-"account_template_467","3.2.02.03.0001","Aluguel","account_template_466","payable","despesa","True"
-"account_template_468","3.2.02.03.0002","Água e Esgoto","account_template_466","payable","despesa","True"
-"account_template_469","3.2.02.03.0003","Energia Elétrica","account_template_466","payable","despesa","True"
-"account_template_470","3.2.02.03.0004","Copa, Cozinha e Refeitório","account_template_466","payable","despesa","True"
-"account_template_471","3.2.02.03.0005","Material de Escritório","account_template_466","payable","despesa","True"
-"account_template_472","3.2.02.03.0006","Fretes e Carretos","account_template_466","payable","despesa","True"
-"account_template_473","3.2.02.03.0007","Correios e Malotes","account_template_466","payable","despesa","True"
-"account_template_474","3.2.02.03.0008","Material de Limpeza","account_template_466","payable","despesa","True"
-"account_template_475","3.2.02.03.0009","Seguros","account_template_466","payable","despesa","True"
-"account_template_476","3.2.02.03.0010","Viagens e Estadias","account_template_466","payable","despesa","True"
-"account_template_477","3.2.02.03.0011","Manutenção e Conservação","account_template_466","payable","despesa","True"
-"account_template_478","3.2.02.03.0012","Depreciação e Amortização","account_template_466","payable","despesa","True"
-"account_template_479","3.2.02.03.0013","Sindicato Patronal/Assoc.de Classe","account_template_466","payable","despesa","True"
-"account_template_480","3.2.02.03.0014","Feiras/Congressos/Simpósios/Cursos","account_template_466","payable","despesa","True"
-"account_template_481","3.2.02.03.0015","Internet","account_template_466","payable","despesa","True"
-"account_template_482","3.2.02.03.0016","Combustíveis e Lubrificantes","account_template_466","payable","despesa","True"
-"account_template_483","3.2.02.03.0017","Leasing","account_template_466","payable","despesa","True"
-"account_template_484","3.2.02.03.0018","Serviço de Terceiros - Pessoa Jurídica","account_template_466","payable","despesa","True"
-"account_template_485","3.2.02.03.0019","Telefone","account_template_466","payable","despesa","True"
-"account_template_486","3.2.02.03.0020","Legais e Judiciais","account_template_466","payable","despesa","True"
-"account_template_487","3.2.02.03.0021","Bens de Pequeno Valor","account_template_466","payable","despesa","True"
-"account_template_488","3.2.02.03.0022","Jornais Revistas e Periódicos","account_template_466","payable","despesa","True"
-"account_template_489","3.2.02.03.0023","Cópias e Reproduções","account_template_466","payable","despesa","True"
-"account_template_490","3.2.02.03.0024","Confraternizações","account_template_466","payable","despesa","True"
-"account_template_491","3.2.02.03.0025","Formação de Pessoal","account_template_466","payable","despesa","True"
-"account_template_492","3.2.02.03.0026","Segurança e Vigilância","account_template_466","payable","despesa","True"
-"account_template_493","3.2.02.03.0027","Despesas com Veículos","account_template_466","payable","despesa","True"
-"account_template_494","3.2.02.03.0028","Impressos","account_template_466","payable","despesa","True"
-"account_template_495","3.2.02.03.0029","Refeições e Lanches","account_template_466","payable","despesa","True"
-"account_template_496","3.2.02.03.0030","Comissões","account_template_466","payable","despesa","True"
-"account_template_497","3.2.02.03.0031","Condução ","account_template_466","payable","despesa","True"
-"account_template_498","3.2.02.03.0032","Telefone Linha Fixa","account_template_466","payable","despesa","True"
-"account_template_499","3.2.02.03.0033","Telefone Móvel Celular","account_template_466","payable","despesa","True"
-"account_template_500","3.2.02.03.0034","Telefone Nextel","account_template_466","payable","despesa","True"
-"account_template_501","3.2.02.03.0035","Crea-PR","account_template_466","payable","despesa","True"
-"account_template_502","3.2.02.03.0036","Despesas de Cartório","account_template_466","payable","despesa","True"
-"account_template_503","3.2.02.03.0037","Material de Consumo","account_template_466","payable","despesa","True"
-"account_template_504","3.2.02.03.0038","Donativos e Contribuições","account_template_466","payable","despesa","True"
-"account_template_505","3.2.02.03.0039","Locação de Equipamentos","account_template_466","payable","despesa","True"
+"account_template_467","3.2.02.03.0001","Aluguel","account_template_466","other","despesa","True"
+"account_template_468","3.2.02.03.0002","Água e Esgoto","account_template_466","other","despesa","True"
+"account_template_469","3.2.02.03.0003","Energia Elétrica","account_template_466","other","despesa","True"
+"account_template_470","3.2.02.03.0004","Copa, Cozinha e Refeitório","account_template_466","other","despesa","True"
+"account_template_471","3.2.02.03.0005","Material de Escritório","account_template_466","other","despesa","True"
+"account_template_472","3.2.02.03.0006","Fretes e Carretos","account_template_466","other","despesa","True"
+"account_template_473","3.2.02.03.0007","Correios e Malotes","account_template_466","other","despesa","True"
+"account_template_474","3.2.02.03.0008","Material de Limpeza","account_template_466","other","despesa","True"
+"account_template_475","3.2.02.03.0009","Seguros","account_template_466","other","despesa","True"
+"account_template_476","3.2.02.03.0010","Viagens e Estadias","account_template_466","other","despesa","True"
+"account_template_477","3.2.02.03.0011","Manutenção e Conservação","account_template_466","other","despesa","True"
+"account_template_478","3.2.02.03.0012","Depreciação e Amortização","account_template_466","other","despesa","True"
+"account_template_479","3.2.02.03.0013","Sindicato Patronal/Assoc.de Classe","account_template_466","other","despesa","True"
+"account_template_480","3.2.02.03.0014","Feiras/Congressos/Simpósios/Cursos","account_template_466","other","despesa","True"
+"account_template_481","3.2.02.03.0015","Internet","account_template_466","other","despesa","True"
+"account_template_482","3.2.02.03.0016","Combustíveis e Lubrificantes","account_template_466","other","despesa","True"
+"account_template_483","3.2.02.03.0017","Leasing","account_template_466","other","despesa","True"
+"account_template_484","3.2.02.03.0018","Serviço de Terceiros - Pessoa Jurídica","account_template_466","other","despesa","True"
+"account_template_485","3.2.02.03.0019","Telefone","account_template_466","other","despesa","True"
+"account_template_486","3.2.02.03.0020","Legais e Judiciais","account_template_466","other","despesa","True"
+"account_template_487","3.2.02.03.0021","Bens de Pequeno Valor","account_template_466","other","despesa","True"
+"account_template_488","3.2.02.03.0022","Jornais Revistas e Periódicos","account_template_466","other","despesa","True"
+"account_template_489","3.2.02.03.0023","Cópias e Reproduções","account_template_466","other","despesa","True"
+"account_template_490","3.2.02.03.0024","Confraternizações","account_template_466","other","despesa","True"
+"account_template_491","3.2.02.03.0025","Formação de Pessoal","account_template_466","other","despesa","True"
+"account_template_492","3.2.02.03.0026","Segurança e Vigilância","account_template_466","other","despesa","True"
+"account_template_493","3.2.02.03.0027","Despesas com Veículos","account_template_466","other","despesa","True"
+"account_template_494","3.2.02.03.0028","Impressos","account_template_466","other","despesa","True"
+"account_template_495","3.2.02.03.0029","Refeições e Lanches","account_template_466","other","despesa","True"
+"account_template_496","3.2.02.03.0030","Comissões","account_template_466","other","despesa","True"
+"account_template_497","3.2.02.03.0031","Condução ","account_template_466","other","despesa","True"
+"account_template_498","3.2.02.03.0032","Telefone Linha Fixa","account_template_466","other","despesa","True"
+"account_template_499","3.2.02.03.0033","Telefone Móvel Celular","account_template_466","other","despesa","True"
+"account_template_500","3.2.02.03.0034","Telefone Nextel","account_template_466","other","despesa","True"
+"account_template_501","3.2.02.03.0035","Crea-PR","account_template_466","other","despesa","True"
+"account_template_502","3.2.02.03.0036","Despesas de Cartório","account_template_466","other","despesa","True"
+"account_template_503","3.2.02.03.0037","Material de Consumo","account_template_466","other","despesa","True"
+"account_template_504","3.2.02.03.0038","Donativos e Contribuições","account_template_466","other","despesa","True"
+"account_template_505","3.2.02.03.0039","Locação de Equipamentos","account_template_466","other","despesa","True"
 "account_template_506","3.2.02.04","DESPESAS INDEDUTÍVEIS","account_template_443","view","despesa","True"
-"account_template_507","3.2.02.04.0001","Autos de Infração","account_template_506","payable","despesa","True"
-"account_template_508","3.2.02.04.0002","Multas Punitívas","account_template_506","payable","despesa","True"
-"account_template_509","3.2.02.04.0003","Contribuições e Doações","account_template_506","payable","despesa","True"
-"account_template_510","3.2.02.04.0004","Impostos Federais - Exerc. Anteriores","account_template_506","payable","despesa","True"
-"account_template_511","3.2.02.04.0005","Impostos Estaduais - Exerc. Anteriores","account_template_506","payable","despesa","True"
-"account_template_512","3.2.02.04.0006","Impostos Municipais - Exerc.Anteriores","account_template_506","payable","despesa","True"
+"account_template_507","3.2.02.04.0001","Autos de Infração","account_template_506","other","despesa","True"
+"account_template_508","3.2.02.04.0002","Multas Punitívas","account_template_506","other","despesa","True"
+"account_template_509","3.2.02.04.0003","Contribuições e Doações","account_template_506","other","despesa","True"
+"account_template_510","3.2.02.04.0004","Impostos Federais - Exerc. Anteriores","account_template_506","other","despesa","True"
+"account_template_511","3.2.02.04.0005","Impostos Estaduais - Exerc. Anteriores","account_template_506","other","despesa","True"
+"account_template_512","3.2.02.04.0006","Impostos Municipais - Exerc.Anteriores","account_template_506","other","despesa","True"
 "account_template_513","3.2.03","DESPESAS FINANCEIRAS","account_template_394","view","despesa","True"
 "account_template_514","3.2.03.01","DESPESAS COM ATUALIZAÇÕES","account_template_513","view","despesa","True"
-"account_template_515","3.2.03.01.0001","Variação Monetária Passiva","account_template_514","payable","despesa","True"
-"account_template_516","3.2.03.01.0002","Variação Cambial Passiva","account_template_514","payable","despesa","True"
-"account_template_517","3.2.03.01.0003","Despesas de Cobrança","account_template_514","payable","despesa","True"
-"account_template_518","3.2.03.01.0004","Despesas Bancárias","account_template_514","payable","despesa","True"
+"account_template_515","3.2.03.01.0001","Variação Monetária Passiva","account_template_514","other","despesa","True"
+"account_template_516","3.2.03.01.0002","Variação Cambial Passiva","account_template_514","other","despesa","True"
+"account_template_517","3.2.03.01.0003","Despesas de Cobrança","account_template_514","other","despesa","True"
+"account_template_518","3.2.03.01.0004","Despesas Bancárias","account_template_514","other","despesa","True"
 "account_template_519","3.2.03.02","JUROS E DESCONTOS","account_template_513","view","despesa","True"
-"account_template_520","3.2.03.02.0001","Juros de Mora","account_template_519","payable","despesa","True"
-"account_template_521","3.2.03.02.0002","Descontos Concedidos","account_template_519","payable","despesa","True"
-"account_template_522","3.2.03.02.0003","Juros s/ Empréstimos e Financiamentos","account_template_519","payable","despesa","True"
-"account_template_523","3.2.03.02.0004","Juros s/ Descontos de Duplicatas","account_template_519","payable","despesa","True"
+"account_template_520","3.2.03.02.0001","Juros de Mora","account_template_519","other","despesa","True"
+"account_template_521","3.2.03.02.0002","Descontos Concedidos","account_template_519","other","despesa","True"
+"account_template_522","3.2.03.02.0003","Juros s/ Empréstimos e Financiamentos","account_template_519","other","despesa","True"
+"account_template_523","3.2.03.02.0004","Juros s/ Descontos de Duplicatas","account_template_519","other","despesa","True"
 "account_template_524","3.2.04","DESPESAS TRIBUTÁRIAS","account_template_394","view","despesa","True"
 "account_template_525","3.2.04.01","IMPOSTOS, TAXAS E CONTRIBUIÇÕES","account_template_524","view","despesa","True"
-"account_template_526","3.2.04.01.0001","IOF","account_template_525","payable","despesa","True"
-"account_template_527","3.2.04.01.0002","CPMF","account_template_525","payable","despesa","True"
-"account_template_528","3.2.04.01.0003","IPTU","account_template_525","payable","despesa","True"
-"account_template_529","3.2.04.01.0004","IPVA","account_template_525","payable","despesa","True"
-"account_template_530","3.2.04.01.0005","IRF (Exclusivo na Fonte)","account_template_525","payable","despesa","True"
-"account_template_531","3.2.04.01.0006","Impostos e Taxas Federais","account_template_525","payable","despesa","True"
-"account_template_532","3.2.04.01.0007","Impostos e Taxas Estaduais","account_template_525","payable","despesa","True"
-"account_template_533","3.2.04.01.0008","Impostos e Taxas Municipais","account_template_525","payable","despesa","True"
+"account_template_526","3.2.04.01.0001","IOF","account_template_525","other","despesa","True"
+"account_template_527","3.2.04.01.0002","CPMF","account_template_525","other","despesa","True"
+"account_template_528","3.2.04.01.0003","IPTU","account_template_525","other","despesa","True"
+"account_template_529","3.2.04.01.0004","IPVA","account_template_525","other","despesa","True"
+"account_template_530","3.2.04.01.0005","IRF (Exclusivo na Fonte)","account_template_525","other","despesa","True"
+"account_template_531","3.2.04.01.0006","Impostos e Taxas Federais","account_template_525","other","despesa","True"
+"account_template_532","3.2.04.01.0007","Impostos e Taxas Estaduais","account_template_525","other","despesa","True"
+"account_template_533","3.2.04.01.0008","Impostos e Taxas Municipais","account_template_525","other","despesa","True"
 "account_template_534","3.2.04.02","MULTAS","account_template_524","view","despesa","True"
-"account_template_535","3.2.04.02.0001","Multas Fiscais Compensatórias","account_template_534","payable","despesa","True"
-"account_template_536","3.2.04.02.0002","Multas de Mora","account_template_534","payable","despesa","True"
-"account_template_537","3.2.04.02.0003","Multas Contratuais","account_template_534","payable","despesa","True"
+"account_template_535","3.2.04.02.0001","Multas Fiscais Compensatórias","account_template_534","other","despesa","True"
+"account_template_536","3.2.04.02.0002","Multas de Mora","account_template_534","other","despesa","True"
+"account_template_537","3.2.04.02.0003","Multas Contratuais","account_template_534","other","despesa","True"
 "account_template_538","3.2.05","OUTRAS DESPESAS OPERACIONAIS","account_template_394","view","despesa","True"
 "account_template_539","3.2.05.01","PERDAS","account_template_538","view","despesa","True"
-"account_template_540","3.2.05.01.0001","Perdas com Duplicatas Incobráveis","account_template_539","payable","despesa","True"
+"account_template_540","3.2.05.01.0001","Perdas com Duplicatas Incobráveis","account_template_539","other","despesa","True"
 "account_template_541","3.2.06","DESPESAS NÃO OPERACIONAIS","account_template_394","view","despesa","True"
 "account_template_542","3.2.06.01","PERDAS","account_template_541","view","despesa","True"
-"account_template_543","3.2.06.01.0002","Perda crédito de ICMS s/ Imobilizado","account_template_542","payable","despesa","True"
-"account_template_544","3.2.06.01.0003","Perdas com Sinistros","account_template_542","payable","despesa","True"
-"account_template_545","3.2.06.01.0004","Perdas na Alienação de Imobilizado","account_template_542","payable","despesa","True"
-"account_template_546","3.2.06.01.0001","Perdas na Alienação de Investimentos","account_template_542","payable","despesa","True"
-"account_template_547","3.2.06.01.0005","Perdas, Deterioração de Mercadorias","account_template_542","payable","despesa","True"
+"account_template_543","3.2.06.01.0002","Perda crédito de ICMS s/ Imobilizado","account_template_542","other","despesa","True"
+"account_template_544","3.2.06.01.0003","Perdas com Sinistros","account_template_542","other","despesa","True"
+"account_template_545","3.2.06.01.0004","Perdas na Alienação de Imobilizado","account_template_542","other","despesa","True"
+"account_template_546","3.2.06.01.0001","Perdas na Alienação de Investimentos","account_template_542","other","despesa","True"
+"account_template_547","3.2.06.01.0005","Perdas, Deterioração de Mercadorias","account_template_542","other","despesa","True"
 "account_template_548","4","CONTAS DE RESULTADO - RECEITAS","account_template_1","view","receita","True"
 "account_template_549","4.1","RECEITAS","account_template_548","view","receita","True"
 "account_template_550","4.1.01","RECEITAS OPERACIONAIS VENDAS E SERVIÇOS","account_template_549","view","receita","True"
 "account_template_551","4.1.01.01","RECEITA BRUTA VENDAS NO PAÍS ","account_template_550","view","receita","True"
-"account_template_552","4.1.01.01.0001","Venda Produtos Fabricação Própria","account_template_551","receivable","receita","True"
-"account_template_553","4.1.01.01.0002","Industrialização de Mercadorias","account_template_551","receivable","receita","True"
-"account_template_554","4.1.01.01.0003","Revenda de Mercadorias","account_template_551","receivable","receita","True"
-"account_template_555","4.1.01.01.0004","Venda Fabricação Própria","account_template_551","receivable","receita","True"
-"account_template_556","4.1.01.01.0005","Industriazalição de Mercadorias","account_template_551","receivable","receita","True"
-"account_template_557","4.1.01.01.0006","Revenda de Mercadorias","account_template_551","receivable","receita","True"
+"account_template_552","4.1.01.01.0001","Venda Produtos Fabricação Própria","account_template_551","other","receita","True"
+"account_template_553","4.1.01.01.0002","Industrialização de Mercadorias","account_template_551","other","receita","True"
+"account_template_554","4.1.01.01.0003","Revenda de Mercadorias","account_template_551","other","receita","True"
+"account_template_555","4.1.01.01.0004","Venda Fabricação Própria","account_template_551","other","receita","True"
+"account_template_556","4.1.01.01.0005","Industriazalição de Mercadorias","account_template_551","other","receita","True"
+"account_template_557","4.1.01.01.0006","Revenda de Mercadorias","account_template_551","other","receita","True"
 "account_template_558","4.1.01.02","RECEITA DE SERVIÇOS NO PAIS ","account_template_550","view","receita","True"
-"account_template_559","4.1.01.02.0001","Receita de Serviços","account_template_558","receivable","receita","True"
-"account_template_560","4.1.01.02.0002","Receita de Serviços","account_template_558","receivable","receita","True"
+"account_template_559","4.1.01.02.0001","Receita de Serviços","account_template_558","other","receita","True"
+"account_template_560","4.1.01.02.0002","Receita de Serviços","account_template_558","other","receita","True"
 "account_template_561","4.1.01.03","RECEITA BRUTA DE VENDAS P/EXTERIOR","account_template_550","view","receita","True"
-"account_template_562","4.1.01.03.0001","Venda de Produtos Fabricação Própria(EX)","account_template_561","receivable","receita","True"
-"account_template_563","4.1.01.03.0002","Revenda de Mercadorias (EX)","account_template_561","receivable","receita","True"
+"account_template_562","4.1.01.03.0001","Venda de Produtos Fabricação Própria(EX)","account_template_561","other","receita","True"
+"account_template_563","4.1.01.03.0002","Revenda de Mercadorias (EX)","account_template_561","other","receita","True"
 "account_template_564","4.1.02","(-) DEDUÇÕES DA RECEITA BRUTA","account_template_549","view","receita","True"
 "account_template_565","4.1.02.01","DEVOLUÇÕES E ABATIMENTOS","account_template_564","view","receita","True"
-"account_template_566","4.1.02.01.0001","Devolução de Vendas","account_template_565","receivable","receita","True"
-"account_template_567","4.1.02.01.0002","Abatimentos Concedidos","account_template_565","receivable","receita","True"
-"account_template_568","4.1.02.01.0003","Devolução de Vendas","account_template_565","receivable","receita","True"
-"account_template_569","4.1.02.01.0004","Abatimentos Concedidos","account_template_565","receivable","receita","True"
+"account_template_566","4.1.02.01.0001","Devolução de Vendas","account_template_565","other","receita","True"
+"account_template_567","4.1.02.01.0002","Abatimentos Concedidos","account_template_565","other","receita","True"
+"account_template_568","4.1.02.01.0003","Devolução de Vendas","account_template_565","other","receita","True"
+"account_template_569","4.1.02.01.0004","Abatimentos Concedidos","account_template_565","other","receita","True"
 "account_template_570","4.1.02.02","IMPOSTOS SOBRE VENDAS E SERVIÇOS","account_template_564","view","receita","True"
-"account_template_571","4.1.02.02.0001","ICMS sobre Vendas","account_template_570","receivable","receita","True"
-"account_template_572","4.1.02.02.0002","IPI sobre Vendas","account_template_570","receivable","receita","True"
-"account_template_573","4.1.02.02.0003","PIS sobre Vendas ","account_template_570","receivable","receita","True"
-"account_template_574","4.1.02.02.0004","COFINS sobre Vendas","account_template_570","receivable","receita","True"
-"account_template_575","4.1.02.02.0005","ISS sobre Serviços","account_template_570","receivable","receita","True"
+"account_template_571","4.1.02.02.0001","ICMS sobre Vendas","account_template_570","other","receita","True"
+"account_template_572","4.1.02.02.0002","IPI sobre Vendas","account_template_570","other","receita","True"
+"account_template_573","4.1.02.02.0003","PIS sobre Vendas ","account_template_570","other","receita","True"
+"account_template_574","4.1.02.02.0004","COFINS sobre Vendas","account_template_570","other","receita","True"
+"account_template_575","4.1.02.02.0005","ISS sobre Serviços","account_template_570","other","receita","True"
 "account_template_579","4.1.02.03","(-) IMPOSTOS S/ DEVOLUÇÃO DE VENDAS","account_template_564","view","receita","True"
-"account_template_580","4.1.02.03.0001","(-) Cofins Não-Cumulativo s/ Dev. Vendas","account_template_579","receivable","receita","True"
-"account_template_581","4.1.02.03.0002","(-) ICMS sobre Devolução de Vendas","account_template_579","receivable","receita","True"
-"account_template_582","4.1.02.03.0003","(-) IPI s/Devolução de Vendas","account_template_579","receivable","receita","True"
-"account_template_583","4.1.02.03.0004","(-) Pis Não-Cumulativo s/ Dev. Vendas","account_template_579","receivable","receita","True"
+"account_template_580","4.1.02.03.0001","(-) Cofins Não-Cumulativo s/ Dev. Vendas","account_template_579","other","receita","True"
+"account_template_581","4.1.02.03.0002","(-) ICMS sobre Devolução de Vendas","account_template_579","other","receita","True"
+"account_template_582","4.1.02.03.0003","(-) IPI s/Devolução de Vendas","account_template_579","other","receita","True"
+"account_template_583","4.1.02.03.0004","(-) Pis Não-Cumulativo s/ Dev. Vendas","account_template_579","other","receita","True"
 "account_template_584","4.1.03","RECEITAS FINANCEIRAS","account_template_549","view","receita","True"
 "account_template_585","4.1.03.01","RECEITAS COM ATUALIZAÇÕES","account_template_584","view","receita","True"
-"account_template_586","4.1.03.01.0001","Variação Monetária Ativa","account_template_585","receivable","receita","True"
-"account_template_587","4.1.03.01.0002","Variação Cambial Ativa","account_template_585","receivable","receita","True"
+"account_template_586","4.1.03.01.0001","Variação Monetária Ativa","account_template_585","other","receita","True"
+"account_template_587","4.1.03.01.0002","Variação Cambial Ativa","account_template_585","other","receita","True"
 "account_template_588","4.1.03.02","GANHOS COM APLICAÇÕES FINANCEIRAS","account_template_584","view","receita","True"
-"account_template_589","4.1.03.02.0001","Rend. Aplic.Automática C/Corrente","account_template_588","receivable","receita","True"
-"account_template_590","4.1.03.02.0002","Ganho Real Aplicações Renda Fixa","account_template_588","receivable","receita","True"
-"account_template_591","4.1.03.02.0003","Ganho Real Aplic.Renda Variável","account_template_588","receivable","receita","True"
-"account_template_592","4.1.03.02.0004","Rendimento Caderneta de Poupança","account_template_588","receivable","receita","True"
+"account_template_589","4.1.03.02.0001","Rend. Aplic.Automática C/Corrente","account_template_588","other","receita","True"
+"account_template_590","4.1.03.02.0002","Ganho Real Aplicações Renda Fixa","account_template_588","other","receita","True"
+"account_template_591","4.1.03.02.0003","Ganho Real Aplic.Renda Variável","account_template_588","other","receita","True"
+"account_template_592","4.1.03.02.0004","Rendimento Caderneta de Poupança","account_template_588","other","receita","True"
 "account_template_593","4.1.03.03","JUROS E DESCONTOS OBTIDOS","account_template_584","view","receita","True"
-"account_template_594","4.1.03.03.0001","Juros Recebidos","account_template_593","receivable","receita","True"
-"account_template_595","4.1.03.03.0002","Descontos Obtidos","account_template_593","receivable","receita","True"
+"account_template_594","4.1.03.03.0001","Juros Recebidos","account_template_593","other","receita","True"
+"account_template_595","4.1.03.03.0002","Descontos Obtidos","account_template_593","other","receita","True"
 "account_template_596","4.1.03.04","(-) TRIBUTOS S/RECEITAS FINANCEIRAS","account_template_584","view","receita","True"
-"account_template_597","4.1.03.04.0001","PIS sobre Receitas Financeiras","account_template_596","receivable","receita","True"
-"account_template_598","4.1.03.04.0002","COFINS sobre Receitas Financeiras","account_template_596","receivable","receita","True"
+"account_template_597","4.1.03.04.0001","PIS sobre Receitas Financeiras","account_template_596","other","receita","True"
+"account_template_598","4.1.03.04.0002","COFINS sobre Receitas Financeiras","account_template_596","other","receita","True"
 "account_template_599","4.1.04","OUTRAS RECEITAS OPERACIONAIS","account_template_549","view","receita","True"
 "account_template_600","4.1.04.01","LUCROS PARTIC.EM OUTRAS SOCIEDADES","account_template_599","view","receita","True"
-"account_template_601","4.1.04.01.0001","Resultado de Coligadas e Controladas","account_template_600","receivable","receita","True"
+"account_template_601","4.1.04.01.0001","Resultado de Coligadas e Controladas","account_template_600","other","receita","True"
 "account_template_602","4.1.04.02","VENDAS DIVERSAS","account_template_599","view","receita","True"
-"account_template_603","4.1.04.02.0001","Venda de Sucatas","account_template_602","receivable","receita","True"
+"account_template_603","4.1.04.02.0001","Venda de Sucatas","account_template_602","other","receita","True"
 "account_template_604","4.1.04.03","BRINDES E AMOSTRAS","account_template_599","view","receita","True"
-"account_template_605","4.1.04.03.0001","Brindes e Bonificações","account_template_604","receivable","receita","True"
-"account_template_606","4.1.04.03.0002","Amostras","account_template_604","receivable","receita","True"
+"account_template_605","4.1.04.03.0001","Brindes e Bonificações","account_template_604","other","receita","True"
+"account_template_606","4.1.04.03.0002","Amostras","account_template_604","other","receita","True"
 "account_template_607","4.2","RESULTADOS NÃO OPERACIONAIS","account_template_548","view","receita","True"
 "account_template_608","4.2.01","ALIENAÇÃO DE BENS PERMANENTES","account_template_607","view","receita","True"
 "account_template_609","4.2.01.01","ALIENAÇÃO DE INVESTIMENTOS","account_template_608","view","receita","True"
-"account_template_610","4.2.01.01.0001","Dividendos Recebidos","account_template_609","receivable","receita","True"
-"account_template_611","4.2.01.01.0002","Alienação Partic.Societárias","account_template_609","receivable","receita","True"
+"account_template_610","4.2.01.01.0001","Dividendos Recebidos","account_template_609","other","receita","True"
+"account_template_611","4.2.01.01.0002","Alienação Partic.Societárias","account_template_609","other","receita","True"
 "account_template_612","4.2.01.02","ALIENAÇÃO DE IMOBILIZADO","account_template_608","view","receita","True"
-"account_template_613","4.2.01.02.0001","Alienação de Máquinas e Equipamentos","account_template_612","receivable","receita","True"
-"account_template_614","4.2.01.02.0002","Alienação de Móveis e Utensílios","account_template_612","receivable","receita","True"
-"account_template_615","4.2.01.02.0003","Alienação de Ferramentas","account_template_612","receivable","receita","True"
-"account_template_616","4.2.01.02.0004","Alienação de Imóveis","account_template_612","receivable","receita","True"
-"account_template_617","4.2.01.02.0005","Alienação de Veículos","account_template_612","receivable","receita","True"
-"account_template_618","4.2.01.02.0006","Alienação de Equip.de Informática","account_template_612","receivable","receita","True"
+"account_template_613","4.2.01.02.0001","Alienação de Máquinas e Equipamentos","account_template_612","other","receita","True"
+"account_template_614","4.2.01.02.0002","Alienação de Móveis e Utensílios","account_template_612","other","receita","True"
+"account_template_615","4.2.01.02.0003","Alienação de Ferramentas","account_template_612","other","receita","True"
+"account_template_616","4.2.01.02.0004","Alienação de Imóveis","account_template_612","other","receita","True"
+"account_template_617","4.2.01.02.0005","Alienação de Veículos","account_template_612","other","receita","True"
+"account_template_618","4.2.01.02.0006","Alienação de Equip.de Informática","account_template_612","other","receita","True"
 "account_template_619","4.2.02","DEDUÇÕES DAS ALIENAÇÕES DE BENS","account_template_607","view","receita","True"
 "account_template_620","4.2.02.01","CUSTO DA ALIENAÇÃO DE INVESTIMENTOS","account_template_619","view","receita","True"
-"account_template_621","4.2.02.01.0001","Custo Alienação Partic.Societárias","account_template_620","receivable","receita","True"
+"account_template_621","4.2.02.01.0001","Custo Alienação Partic.Societárias","account_template_620","other","receita","True"
 "account_template_622","4.2.02.02","CUSTO DA ALIENAÇÃO DE IMOBILIZADO","account_template_619","view","receita","True"
-"account_template_623","4.2.02.02.0001","Custo Alienação Máqs.e Equipamentos","account_template_622","receivable","receita","True"
-"account_template_624","4.2.02.02.0002","Custo Alienação Movs.e Utensílios","account_template_622","receivable","receita","True"
-"account_template_625","4.2.02.02.0003","Custo Alienação Ferramentas","account_template_622","receivable","receita","True"
-"account_template_626","4.2.02.02.0004","Custo Alienação de Imóveis","account_template_622","receivable","receita","True"
-"account_template_627","4.2.02.02.0005","Custo Alienação de Veículos","account_template_622","receivable","receita","True"
-"account_template_628","4.2.02.02.0006","Custo Alienação Equip.Informática","account_template_622","receivable","receita","True"
+"account_template_623","4.2.02.02.0001","Custo Alienação Máqs.e Equipamentos","account_template_622","other","receita","True"
+"account_template_624","4.2.02.02.0002","Custo Alienação Movs.e Utensílios","account_template_622","other","receita","True"
+"account_template_625","4.2.02.02.0003","Custo Alienação Ferramentas","account_template_622","other","receita","True"
+"account_template_626","4.2.02.02.0004","Custo Alienação de Imóveis","account_template_622","other","receita","True"
+"account_template_627","4.2.02.02.0005","Custo Alienação de Veículos","account_template_622","other","receita","True"
+"account_template_628","4.2.02.02.0006","Custo Alienação Equip.Informática","account_template_622","other","receita","True"
 "account_template_629","4.2.03","OUTRAS RECEITAS NÃO OPERACIONAIS","account_template_607","view","receita","True"
 "account_template_630","4.2.03.01","INDENIZAÇÃO DE SEGUROS","account_template_629","view","receita","True"
-"account_template_631","4.2.03.01.0001","Indenização de Seguros","account_template_630","receivable","receita","True"
+"account_template_631","4.2.03.01.0001","Indenização de Seguros","account_template_630","other","receita","True"
 "account_template_632","4.2.03.02","OUTRAS RECEITAS","account_template_629","view","receita","True"
-"account_template_633","4.2.03.02.0001","Recuperação de Despesas","account_template_632","receivable","receita","True"
+"account_template_633","4.2.03.02.0001","Recuperação de Despesas","account_template_632","other","receita","True"
 "account_template_634","5","CONTAS DE FECHAMENTO DE BALANÇO","account_template_1","view","resultado","True"
 "account_template_635","5.1","RESULTADO DO EXERCÍCIO","account_template_634","view","resultado","True"
 "account_template_636","5.1.01","RESULTADO OPERACIONAL","account_template_635","view","resultado","True"
diff --git a/addons/l10n_br/data/account.account.type.csv b/addons/l10n_br/data/account.account.type.csv
index 1b1d8cfddac..9f3844cdd2e 100644
--- a/addons/l10n_br/data/account.account.type.csv
+++ b/addons/l10n_br/data/account.account.type.csv
@@ -1,6 +1,6 @@
 "id","code","name","close_method"
-"ativo","1","Ativo","balance"
-"passivo","2","Passivo","balance"
+"ativo","1","Ativo","unreconciled"
+"passivo","2","Passivo","unreconciled"
 "despesa","3","Despesas","balance"
 "receita","4","Receita","balance"
 "resultado","5","Resultado","balance"
diff --git a/addons/l10n_br/data/account.tax.code.template.csv b/addons/l10n_br/data/account.tax.code.template.csv
index 4622200982f..5768324cc3d 100644
--- a/addons/l10n_br/data/account.tax.code.template.csv
+++ b/addons/l10n_br/data/account.tax.code.template.csv
@@ -1,14 +1,13 @@
-"id","code","name","parent_id:id","sign"
-"tax_code_chart_root","","Códigos de Impostos Brasileiros","","1"
-"tax_code_1","ICMS","ICMS Interno","tax_code_chart_root","1"
-"tax_code_2","ICMS","ICMS Externo","tax_code_chart_root","1"
-"tax_code_3","ICMS Subist","ICMS Subist","tax_code_chart_root","1"
-"tax_code_4","IPI","IPI","tax_code_chart_root","1"
-"tax_code_5","PIS","PIS","tax_code_chart_root","1"
-"tax_code_6","COFINS","COFINS","tax_code_chart_root","1"
-"tax_code_7","IRPJ","IRPJ","tax_code_chart_root","1"
-"tax_code_8","IR","IR","tax_code_chart_root","1"
-"tax_code_9","ISS","ISS","tax_code_chart_root","1"
-"tax_code_10","CSLL","CSLL","tax_code_chart_root","1"
+"id","code","name","parent_id:id","sign","domain","tax_discount"
+"tax_code_chart_root","","Códigos de Impostos Brasileiros","","1","",0
+"tax_code_1","ICMS","ICMS","tax_code_chart_root","1","icms",1
+"tax_code_2","ICMS Subist","ICMS Subist","tax_code_chart_root","1","icmsst",0
+"tax_code_3","IPI","IPI","tax_code_chart_root","1","ipi",0
+"tax_code_4","PIS","PIS","tax_code_chart_root","1","pis",1
+"tax_code_5","COFINS","COFINS","tax_code_chart_root","1","cofins",1
+"tax_code_6","IRPJ","IRPJ","tax_code_chart_root","1","irpj",1
+"tax_code_7","IR","IR","tax_code_chart_root","1","ir",1
+"tax_code_8","ISS","ISS","tax_code_chart_root","1","iss",1
+"tax_code_9","CSLL","CSLL","tax_code_chart_root","1","csll",1
 
 
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml
index 1aa0ab88afa..58f860e0d90 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template.xml
@@ -5,360 +5,92 @@
 		<record id="tax_template_1" model="account.tax.template">
 			<field name="description">IPI</field>
 			<field name="name">IPI</field>
-            		<field name="tax_group">vat</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
-			<!-- <field name="price_include">False</field> -->
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_3" model="account.tax.template">
 			<field name="description">IPI 2%</field>
 			<field name="name">IPI 2%</field>
-            		<field name="tax_group">vat</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.02</field>
-			<!-- <field name="price_include">False</field> -->
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_4" model="account.tax.template">
 			<field name="description">IPI 3%</field>
 			<field name="name">IPI 3%</field>
-            		<field name="tax_group">vat</field>
+      		<field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
-			<!-- <field name="price_include">False</field> -->
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_5" model="account.tax.template">
 			<field name="description">IPI 4%</field>
 			<field name="name">IPI 4%</field>
-            		<field name="tax_group">vat</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.04</field>
-			<!-- <field name="price_include">False</field> -->
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_6" model="account.tax.template">
 			<field name="description">IPI 5%</field>
 			<field name="name">IPI 5%</field>
-            		<field name="tax_group">vat</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.05</field>
-			<!-- <field name="price_include">False</field> -->
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_7" model="account.tax.template">
 			<field name="description">IPI 7%</field>
 			<field name="name">IPI 7%</field>
-            		<field name="tax_group">vat</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.07</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_8" model="account.tax.template">
-			<field name="description">IPI 8%</field>
-			<field name="name">IPI 8%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.08</field>
-			<field name="price_include">False</field>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_9" model="account.tax.template">
-			<field name="description">IPI 10%</field>
-			<field name="name">IPI 10%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.10</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_10" model="account.tax.template">
-			<field name="description">IPI 12%</field>
-			<field name="name">IPI 12%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.12</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_11" model="account.tax.template">
-			<field name="description">IPI 13%</field>
-			<field name="name">IPI 13%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.13</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_12" model="account.tax.template">
-			<field name="description">IPI 15%</field>
-			<field name="name">IPI 15%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.15</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_13" model="account.tax.template">
-			<field name="description">IPI 16%</field>
-			<field name="name">IPI 16%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.16</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_14" model="account.tax.template">
-			<field name="description">IPI 18%</field>
-			<field name="name">IPI 18%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.18</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_15" model="account.tax.template">
-			<field name="description">IPI 20%</field>
-			<field name="name">IPI 20%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.20</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_16" model="account.tax.template">
-			<field name="description">IPI 22%</field>
-			<field name="name">IPI 22%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.22</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_17" model="account.tax.template">
-			<field name="description">IPI 25%</field>
-			<field name="name">IPI 25%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.25</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_18" model="account.tax.template">
-			<field name="description">IPI 27%</field>
-			<field name="name">IPI 27%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.27</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_19" model="account.tax.template">
-			<field name="description">IPI 30%</field>
-			<field name="name">IPI 30%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.30</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_20" model="account.tax.template">
-			<field name="description">IPI 35%</field>
-			<field name="name">IPI 35%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.35</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_21" model="account.tax.template">
-			<field name="description">IPI 40%</field>
-			<field name="name">IPI 40%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.40</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_22" model="account.tax.template">
-			<field name="description">IPI 42%</field>
-			<field name="name">IPI 42%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.42</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_23" model="account.tax.template">
-			<field name="description">IPI 45%</field>
-			<field name="name">IPI 45%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.45</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_24" model="account.tax.template">
-			<field name="description">IPI 50%</field>
-			<field name="name">IPI 50%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.50</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_25" model="account.tax.template">
-			<field name="description">IPI 60%</field>
-			<field name="name">IPI 60%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.60</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_26" model="account.tax.template">
-			<field name="description">IPI 330%</field>
-			<field name="name">IPI 330%</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">3.30</field>
-			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_4" name="base_code_id"/>
-			<field ref="tax_code_4" name="tax_code_id"/>
-			<field ref="tax_code_4" name="ref_base_code_id"/>
-			<field ref="tax_code_4" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_27" model="account.tax.template">
-			<field name="description">ICMS Interno</field>
-			<field name="name">ICMS Interno</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_1" name="base_code_id"/>
-			<field ref="tax_code_1" name="tax_code_id"/>
-			<field ref="tax_code_1" name="ref_base_code_id"/>
-			<field ref="tax_code_1" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_28" model="account.tax.template">
-			<field name="description">ICMS Externo</field>
-			<field name="name">ICMS Externo</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_2" name="base_code_id"/>
-			<field ref="tax_code_2" name="tax_code_id"/>
-			<field ref="tax_code_2" name="ref_base_code_id"/>
-			<field ref="tax_code_2" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_29" model="account.tax.template">
-			<field name="description">ICMS Subist</field>
-			<field name="name">ICMS Subist</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_3" name="base_code_id"/>
 			<field ref="tax_code_3" name="tax_code_id"/>
@@ -366,171 +98,609 @@
 			<field ref="tax_code_3" name="ref_tax_code_id"/>
         	</record>
 
+		<record id="tax_template_8" model="account.tax.template">
+			<field name="description">IPI 8%</field>
+			<field name="name">IPI 8%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.08</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_9" model="account.tax.template">
+			<field name="description">IPI 10%</field>
+			<field name="name">IPI 10%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.10</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_10" model="account.tax.template">
+			<field name="description">IPI 12%</field>
+			<field name="name">IPI 12%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.12</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_11" model="account.tax.template">
+			<field name="description">IPI 13%</field>
+			<field name="name">IPI 13%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.13</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_12" model="account.tax.template">
+			<field name="description">IPI 15%</field>
+			<field name="name">IPI 15%</field>
+      		<field name="tax_group">vat</field>
+			<field name="amount">0.15</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_13" model="account.tax.template">
+			<field name="description">IPI 16%</field>
+			<field name="name">IPI 16%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.16</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_14" model="account.tax.template">
+			<field name="description">IPI 18%</field>
+			<field name="name">IPI 18%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.18</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_15" model="account.tax.template">
+			<field name="description">IPI 20%</field>
+			<field name="name">IPI 20%</field>
+      		<field name="tax_group">vat</field>
+			<field name="amount">0.20</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+        	</record>
+
+		<record id="tax_template_16" model="account.tax.template">
+			<field name="description">IPI 22%</field>
+			<field name="name">IPI 22%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.22</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_17" model="account.tax.template">
+			<field name="description">IPI 25%</field>
+			<field name="name">IPI 25%</field>
+      		<field name="tax_group">vat</field>
+			<field name="amount">0.25</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_18" model="account.tax.template">
+			<field name="description">IPI 27%</field>
+			<field name="name">IPI 27%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.27</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_19" model="account.tax.template">
+			<field name="description">IPI 30%</field>
+			<field name="name">IPI 30%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.30</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_20" model="account.tax.template">
+			<field name="description">IPI 35%</field>
+			<field name="name">IPI 35%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.35</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+        	</record>
+
+		<record id="tax_template_21" model="account.tax.template">
+			<field name="description">IPI 40%</field>
+			<field name="name">IPI 40%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.40</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_22" model="account.tax.template">
+			<field name="description">IPI 42%</field>
+			<field name="name">IPI 42%</field>
+      		<field name="tax_group">vat</field>
+			<field name="amount">0.42</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_23" model="account.tax.template">
+			<field name="description">IPI 45%</field>
+			<field name="name">IPI 45%</field>
+      		<field name="tax_group">vat</field>
+			<field name="amount">0.45</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_24" model="account.tax.template">
+			<field name="description">IPI 50%</field>
+			<field name="name">IPI 50%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.50</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_25" model="account.tax.template">
+			<field name="description">IPI 60%</field>
+			<field name="name">IPI 60%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.60</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_26" model="account.tax.template">
+			<field name="description">IPI 330%</field>
+			<field name="name">IPI 330%</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">3.30</field>
+			<field ref="account_template_244" name="account_collected_id"/>
+			<field ref="account_template_44" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_3" name="base_code_id"/>
+			<field ref="tax_code_3" name="tax_code_id"/>
+			<field ref="tax_code_3" name="ref_base_code_id"/>
+			<field ref="tax_code_3" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_27" model="account.tax.template">
+			<field name="description">ICMS Interno</field>
+			<field name="name">ICMS Interno</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.00</field>
+			<field ref="account_template_241" name="account_collected_id"/>
+			<field ref="account_template_42" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_1" name="base_code_id"/>
+			<field ref="tax_code_1" name="tax_code_id"/>
+			<field ref="tax_code_1" name="ref_base_code_id"/>
+			<field ref="tax_code_1" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_28" model="account.tax.template">
+			<field name="description">ICMS Externo</field>
+			<field name="name">ICMS Externo</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.00</field>
+			<field ref="account_template_241" name="account_collected_id"/>
+			<field ref="account_template_42" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_1" name="base_code_id"/>
+			<field ref="tax_code_1" name="tax_code_id"/>
+			<field ref="tax_code_1" name="ref_base_code_id"/>
+			<field ref="tax_code_1" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_29" model="account.tax.template">
+			<field name="description">ICMS Subist</field>
+			<field name="name">ICMS Subist</field>
+      		<field name="tax_group">vat</field>
+			<field name="amount">0.00</field>
+			<field eval="0" name="price_include"/>
+			<field eval="0" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_2" name="base_code_id"/>
+			<field ref="tax_code_2" name="tax_code_id"/>
+			<field ref="tax_code_2" name="ref_base_code_id"/>
+			<field ref="tax_code_2" name="ref_tax_code_id"/>
+       	</record>
+
 		<record id="tax_template_30" model="account.tax.template">
-			<field name="description">ICMS 7%</field>
-			<field name="name">ICMS 7%</field>
-            		<field name="tax_group">vat</field>
+			<field name="description">ICMS Externo 7%</field>
+			<field name="name">ICMS Externo 7%</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.07</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
-			<!-- <field name="price_include">True</field> -->
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_2" name="base_code_id"/>
-			<field ref="tax_code_2" name="tax_code_id"/>
-			<field ref="tax_code_2" name="ref_base_code_id"/>
-			<field ref="tax_code_2" name="ref_tax_code_id"/>
-
-        	</record>
+			<field ref="tax_code_1" name="base_code_id"/>
+			<field ref="tax_code_1" name="tax_code_id"/>
+			<field ref="tax_code_1" name="ref_base_code_id"/>
+			<field ref="tax_code_1" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_31" model="account.tax.template">
-			<field name="description">ICMS 12%</field>
-			<field name="name">ICMS 12%</field>
-            		<field name="tax_group">vat</field>
+			<field name="description">ICMS Externo 12%</field>
+			<field name="name">ICMS Externo 12%</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.12</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
-			<!-- <field name="price_include">True</field> -->
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_2" name="base_code_id"/>
-			<field ref="tax_code_2" name="tax_code_id"/>
-			<field ref="tax_code_2" name="ref_base_code_id"/>
-			<field ref="tax_code_2" name="ref_tax_code_id"/>
-        	</record>
+			<field ref="tax_code_1" name="base_code_id"/>
+			<field ref="tax_code_1" name="tax_code_id"/>
+			<field ref="tax_code_1" name="ref_base_code_id"/>
+			<field ref="tax_code_1" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_32" model="account.tax.template">
-			<field name="description">ICMS 19%</field>
-			<field name="name">ICMS 19%</field>
-            		<field name="tax_group">vat</field>
+			<field name="description">ICMS Interno 19%</field>
+			<field name="name">ICMS Interno 19%</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.19</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
-			<!-- <field name="price_include">True</field> -->
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_1" name="base_code_id"/>
 			<field ref="tax_code_1" name="tax_code_id"/>
 			<field ref="tax_code_1" name="ref_base_code_id"/>
 			<field ref="tax_code_1" name="ref_tax_code_id"/>
-        	</record>
+       	</record>
 
 		<record id="tax_template_33" model="account.tax.template">
-			<field name="description">ICMS 26%</field>
-			<field name="name">ICMS 26%</field>
-            		<field name="tax_group">vat</field>
+			<field name="description">ICMS Interno 26%</field>
+			<field name="name">ICMS Interno 26%</field>
+      		<field name="tax_group">vat</field>
 			<field name="amount">0.26</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
-			<!-- <field name="price_include">True</field> -->
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_1" name="base_code_id"/>
 			<field ref="tax_code_1" name="tax_code_id"/>
 			<field ref="tax_code_1" name="ref_base_code_id"/>
 			<field ref="tax_code_1" name="ref_tax_code_id"/>
-        	</record>
+       	</record>
 
 		<record id="tax_template_34" model="account.tax.template">
 			<field name="description">PIS</field>
 			<field name="name">PIS</field>
-            		<field name="tax_group">vat</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
+			<field ref="account_template_243" name="account_collected_id"/>
+			<field ref="account_template_49" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_5" name="base_code_id"/>
-			<field ref="tax_code_5" name="tax_code_id"/>
-			<field ref="tax_code_5" name="ref_base_code_id"/>
-			<field ref="tax_code_5" name="ref_tax_code_id"/>
-        	</record>
+			<field ref="tax_code_4" name="base_code_id"/>
+			<field ref="tax_code_4" name="tax_code_id"/>
+			<field ref="tax_code_4" name="ref_base_code_id"/>
+			<field ref="tax_code_4" name="ref_tax_code_id"/>
+       	</record>
 
 		<record id="tax_template_35" model="account.tax.template">
 			<field name="description">PIS 0,65%</field>
 			<field name="name">PIS 0,65%</field>
-            		<field name="tax_group">vat</field>
+       		<field name="tax_group">vat</field>
 			<field name="amount">0.0065</field>
-			<!-- <field name="price_include">True</field> -->
+			<field ref="account_template_243" name="account_collected_id"/>
+			<field ref="account_template_49" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_4" name="base_code_id"/>
+			<field ref="tax_code_4" name="tax_code_id"/>
+			<field ref="tax_code_4" name="ref_base_code_id"/>
+			<field ref="tax_code_4" name="ref_tax_code_id"/>
+       	</record>
+
+		<record id="tax_template_36" model="account.tax.template">
+			<field name="description">COFINS</field>
+			<field name="name">COFINS</field>
+       		<field name="tax_group">vat</field>
+			<field name="amount">0.00</field>
+			<field ref="account_template_242" name="account_collected_id"/>
+			<field ref="account_template_39" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_5" name="base_code_id"/>
 			<field ref="tax_code_5" name="tax_code_id"/>
 			<field ref="tax_code_5" name="ref_base_code_id"/>
 			<field ref="tax_code_5" name="ref_tax_code_id"/>
-
-        	</record>
-
-		<record id="tax_template_36" model="account.tax.template">
-			<field name="description">COFINS</field>
-			<field name="name">COFINS</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_6" name="base_code_id"/>
-			<field ref="tax_code_6" name="tax_code_id"/>
-			<field ref="tax_code_6" name="ref_base_code_id"/>
-			<field ref="tax_code_6" name="ref_tax_code_id"/>
-
-        	</record>
+       	</record>
 
 		<record id="tax_template_37" model="account.tax.template">
 			<field name="description">COFINS 3%</field>
 			<field name="name">COFINS 3%</field>
-            		<field name="tax_group">vat</field>
+            <field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
-			<!-- <field name="price_include">True</field> -->
+			<field ref="account_template_242" name="account_collected_id"/>
+			<field ref="account_template_39" name="account_paid_id"/>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_5" name="base_code_id"/>
+			<field ref="tax_code_5" name="tax_code_id"/>
+			<field ref="tax_code_5" name="ref_base_code_id"/>
+			<field ref="tax_code_5" name="ref_tax_code_id"/>
+        </record>
+
+		<record id="tax_template_38" model="account.tax.template">
+			<field name="description">IRPJ</field>
+			<field name="name">IRPJ</field>
+            <field name="tax_group">vat</field>
+			<field name="amount">0.00</field>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_6" name="base_code_id"/>
 			<field ref="tax_code_6" name="tax_code_id"/>
 			<field ref="tax_code_6" name="ref_base_code_id"/>
 			<field ref="tax_code_6" name="ref_tax_code_id"/>
-        	</record>
+        </record>
 
-		<record id="tax_template_38" model="account.tax.template">
-			<field name="description">IRPJ</field>
-			<field name="name">IRPJ</field>
-            		<field name="tax_group">vat</field>
+		<record id="tax_template_39" model="account.tax.template">
+			<field name="description">IR</field>
+			<field name="name">IR</field>
+            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_7" name="base_code_id"/>
 			<field ref="tax_code_7" name="tax_code_id"/>
 			<field ref="tax_code_7" name="ref_base_code_id"/>
 			<field ref="tax_code_7" name="ref_tax_code_id"/>
-        	</record>
+        </record>
 
-		<record id="tax_template_39" model="account.tax.template">
-			<field name="description">IR</field>
-			<field name="name">IR</field>
-            		<field name="tax_group">vat</field>
+		<record id="tax_template_40" model="account.tax.template">
+			<field name="description">ISS</field>
+			<field name="name">ISS</field>
+            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_8" name="base_code_id"/>
 			<field ref="tax_code_8" name="tax_code_id"/>
 			<field ref="tax_code_8" name="ref_base_code_id"/>
 			<field ref="tax_code_8" name="ref_tax_code_id"/>
-        	</record>
+        </record>
+        
+        <record id="tax_template_41" model="account.tax.template">
+			<field name="description">ISS 1%</field>
+			<field name="name">ISS 1%</field>
+            <field name="tax_group">vat</field>
+			<field name="amount">0.01</field>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_8" name="base_code_id"/>
+			<field ref="tax_code_8" name="tax_code_id"/>
+			<field ref="tax_code_8" name="ref_base_code_id"/>
+			<field ref="tax_code_8" name="ref_tax_code_id"/>
+        </record>
+        
+        <record id="tax_template_42" model="account.tax.template">
+			<field name="description">ISS 2%</field>
+			<field name="name">ISS 2%</field>
+            <field name="tax_group">vat</field>
+			<field name="amount">0.02</field>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_8" name="base_code_id"/>
+			<field ref="tax_code_8" name="tax_code_id"/>
+			<field ref="tax_code_8" name="ref_base_code_id"/>
+			<field ref="tax_code_8" name="ref_tax_code_id"/>
+        </record>
+        
+        <record id="tax_template_43" model="account.tax.template">
+			<field name="description">ISS 3%</field>
+			<field name="name">ISS 3%</field>
+            <field name="tax_group">vat</field>
+			<field name="amount">0.03</field>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_8" name="base_code_id"/>
+			<field ref="tax_code_8" name="tax_code_id"/>
+			<field ref="tax_code_8" name="ref_base_code_id"/>
+			<field ref="tax_code_8" name="ref_tax_code_id"/>
+        </record>
+        
+        <record id="tax_template_44" model="account.tax.template">
+			<field name="description">ISS 4%</field>
+			<field name="name">ISS 4%</field>
+            <field name="tax_group">vat</field>
+			<field name="amount">0.04</field>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_8" name="base_code_id"/>
+			<field ref="tax_code_8" name="tax_code_id"/>
+			<field ref="tax_code_8" name="ref_base_code_id"/>
+			<field ref="tax_code_8" name="ref_tax_code_id"/>
+        </record>
+        
+        <record id="tax_template_45" model="account.tax.template">
+			<field name="description">ISS 5%</field>
+			<field name="name">ISS 5%</field>
+            <field name="tax_group">vat</field>
+			<field name="amount">0.05</field>
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+			<field ref="tax_code_8" name="base_code_id"/>
+			<field ref="tax_code_8" name="tax_code_id"/>
+			<field ref="tax_code_8" name="ref_base_code_id"/>
+			<field ref="tax_code_8" name="ref_tax_code_id"/>
+        </record>
 
-		<record id="tax_template_40" model="account.tax.template">
-			<field name="description">ISS</field>
-			<field name="name">ISS</field>
-            		<field name="tax_group">vat</field>
+		<record id="tax_template_46" model="account.tax.template">
+			<field name="description">CSLL</field>
+			<field name="name">CSLL</field>
+            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
+			<field eval="0" name="price_include"/>
+			<field eval="1" name="tax_discount"/>
 			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_9" name="base_code_id"/>
 			<field ref="tax_code_9" name="tax_code_id"/>
 			<field ref="tax_code_9" name="ref_base_code_id"/>
 			<field ref="tax_code_9" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_41" model="account.tax.template">
-			<field name="description">CSLL</field>
-			<field name="name">CSLL</field>
-            		<field name="tax_group">vat</field>
-			<field name="amount">0.00</field>
-			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_10" name="base_code_id"/>
-			<field ref="tax_code_10" name="tax_code_id"/>
-			<field ref="tax_code_10" name="ref_base_code_id"/>
-			<field ref="tax_code_10" name="ref_tax_code_id"/>
-        	</record>
+        </record>
+        
 	</data>
-</openerp>
+</openerp>
\ No newline at end of file
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 79ce5bd0310..9dbcb4d558f 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -1,15 +1,16 @@
+<?xml version="1.0"?>
 <openerp>
 	<data>
 
 		<record id="l10n_br_account_chart_template" model="account.chart.template">
 			<field name="name">Planilha de Contas Brasileira</field>
-			<field name="account_root_id" ref="account_template_1"/>
+			<field name="account_root_id" ref="account_template_1" />
 			<field name="tax_code_root_id" ref="tax_code_chart_root"/>
 			<field name="bank_account_view_id" ref="account_template_9"/>
 			<field name="property_account_receivable" ref="account_template_16"/>
-			<field name="property_account_payable" ref="account_template_204"/>
-			<field name="property_account_expense_categ" ref="account_template_329"/>
-			<field name="property_account_income_categ" ref="account_template_552"/>
+			<field name="property_account_payable" ref="account_template_204" />
+			<field name="property_account_expense_categ" ref="account_template_330" />
+			<field name="property_account_income_categ" ref="account_template_552" />
 		</record>
 	
 		<record id="config_call_account_template_brazilian_localization" model="ir.actions.todo">
@@ -17,8 +18,8 @@
             <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>
-            <field name="category_id" ref="account.category_accounting_configuration"/>
+            <field name="state">open</field>
+            <field name="restart">onskip</field>
         </record>
 	
 	</data>
diff --git a/addons/l10n_br/data/l10n_br_data.xml b/addons/l10n_br/data/l10n_br_data.xml
new file mode 100644
index 00000000000..5a785f0f08f
--- /dev/null
+++ b/addons/l10n_br/data/l10n_br_data.xml
@@ -0,0 +1,673 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data noupdate="1">
+
+		<!-- l10n_br_account.cst.template -->
+		<record id="l10n_br_cst_template_1" model="l10n_br_account.cst.template">
+			<field name="code">01</field>
+			<field name="name">Operação Tributável com Alíquota Básica</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_2" model="l10n_br_account.cst.template">
+			<field name="code">02</field>
+			<field name="name">Operação Tributável com Alíquota Diferenciada</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_3" model="l10n_br_account.cst.template">
+			<field name="code">03</field>
+			<field name="name">Operação Tributável com Alíquota por Unidade de Medida de Produto</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_4" model="l10n_br_account.cst.template">
+			<field name="code">04</field>
+			<field name="name">Operação Tributável Monofásica - Revenda a Alíquota Zero</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_5" model="l10n_br_account.cst.template">
+			<field name="code">05</field>
+			<field name="name">Operação Tributável por Substituição Tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_6" model="l10n_br_account.cst.template">
+			<field name="code">06</field>
+			<field name="name">Operação Tributável a Alíquota zero</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_7" model="l10n_br_account.cst.template">
+			<field name="code">07</field>
+			<field name="name">Operação Isenta da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_8" model="l10n_br_account.cst.template">
+			<field name="code">08</field>
+			<field name="name">Operação sem Incidência da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_9" model="l10n_br_account.cst.template">
+			<field name="code">09</field>
+			<field name="name">Operação com Suspensão da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_10" model="l10n_br_account.cst.template">
+			<field name="code">49</field>
+			<field name="name">Outras Operações de Saída</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_11" model="l10n_br_account.cst.template">
+			<field name="code">50</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_12" model="l10n_br_account.cst.template">
+			<field name="code">51</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Não-Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_13" model="l10n_br_account.cst.template">
+			<field name="code">52</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_14" model="l10n_br_account.cst.template">
+			<field name="code">53</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_15" model="l10n_br_account.cst.template">
+			<field name="code">54</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_16" model="l10n_br_account.cst.template">
+			<field name="code">55</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Não Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_17" model="l10n_br_account.cst.template">
+			<field name="code">56</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_18" model="l10n_br_account.cst.template">
+			<field name="code">60</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_19" model="l10n_br_account.cst.template">
+			<field name="code">61</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Não-Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_20" model="l10n_br_account.cst.template">
+			<field name="code">62</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_21" model="l10n_br_account.cst.template">
+			<field name="code">63</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_22" model="l10n_br_account.cst.template">
+			<field name="code">64</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_23" model="l10n_br_account.cst.template">
+			<field name="code">65</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Não-Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_24" model="l10n_br_account.cst.template">
+			<field name="code">66</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_25" model="l10n_br_account.cst.template">
+			<field name="code">67</field>
+			<field name="name">Crédito Presumido - Outras Operações</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_26" model="l10n_br_account.cst.template">
+			<field name="code">70</field>
+			<field name="name">Operação de Aquisição sem Direito a Crédito</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_27" model="l10n_br_account.cst.template">
+			<field name="code">71</field>
+			<field name="name">Operação de Aquisição com Isenção</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_28" model="l10n_br_account.cst.template">
+			<field name="code">72</field>
+			<field name="name">Operação de Aquisição com Suspensão</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_29" model="l10n_br_account.cst.template">
+			<field name="code">73</field>
+			<field name="name">Operação de Aquisição a Alíquota Zero</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_30" model="l10n_br_account.cst.template">
+			<field name="code">74</field>
+			<field name="name">Operação de Aquisição sem Incidência da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_31" model="l10n_br_account.cst.template">
+			<field name="code">75</field>
+			<field name="name">Operação de Aquisição por Substituição Tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_32" model="l10n_br_account.cst.template">
+			<field name="code">98</field>
+			<field name="name">Outras Operações de Entrada</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_33" model="l10n_br_account.cst.template">
+			<field name="code">99</field>
+			<field name="name">Outras Operações</field>
+			<field name="tax_code_template_id" ref="tax_code_5" />
+		</record>
+
+		<record id="l10n_br_cst_template_34" model="l10n_br_account.cst.template">
+			<field name="code">01</field>
+			<field name="name">Operação Tributável com Alíquota Básica</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_35" model="l10n_br_account.cst.template">
+			<field name="code">02</field>
+			<field name="name">Operação Tributável com Alíquota Diferenciada</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_36" model="l10n_br_account.cst.template">
+			<field name="code">03</field>
+			<field name="name">Operação Tributável com Alíquota por Unidade de Medida de Produto</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_37" model="l10n_br_account.cst.template">
+			<field name="code">04</field>
+			<field name="name">Operação Tributável Monofásica - Revenda a Alíquota Zero</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_38" model="l10n_br_account.cst.template">
+			<field name="code">05</field>
+			<field name="name">Operação Tributável por Substituição Tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_39" model="l10n_br_account.cst.template">
+			<field name="code">06</field>
+			<field name="name">Operação Tributável a Alíquota Zero</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_40" model="l10n_br_account.cst.template">
+			<field name="code">07</field>
+			<field name="name">Operação Isenta da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_41" model="l10n_br_account.cst.template">
+			<field name="code">08</field>
+			<field name="name">Operação sem Incidência da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_42" model="l10n_br_account.cst.template">
+			<field name="code">09</field>
+			<field name="name">Operação com Suspensão da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_43" model="l10n_br_account.cst.template">
+			<field name="code">49</field>
+			<field name="name">Outras Operações de Saída</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_44" model="l10n_br_account.cst.template">
+			<field name="code">50</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_45" model="l10n_br_account.cst.template">
+			<field name="code">51</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Não Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_46" model="l10n_br_account.cst.template">
+			<field name="code">52</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_47" model="l10n_br_account.cst.template">
+			<field name="code">53</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_48" model="l10n_br_account.cst.template">
+			<field name="code">54</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_49" model="l10n_br_account.cst.template">
+			<field name="code">55</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Não-Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_50" model="l10n_br_account.cst.template">
+			<field name="code">56</field>
+			<field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno, e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_51" model="l10n_br_account.cst.template">
+			<field name="code">60</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_52" model="l10n_br_account.cst.template">
+			<field name="code">61</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Não-Tributada no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_53" model="l10n_br_account.cst.template">
+			<field name="code">62</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_54" model="l10n_br_account.cst.template">
+			<field name="code">63</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_55" model="l10n_br_account.cst.template">
+			<field name="code">64</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_56" model="l10n_br_account.cst.template">
+			<field name="code">65</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Não-Tributadas no Mercado Interno e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_57" model="l10n_br_account.cst.template">
+			<field name="code">66</field>
+			<field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno, e de Exportação</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_58" model="l10n_br_account.cst.template">
+			<field name="code">67</field>
+			<field name="name">Crédito Presumido - Outras Operações</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_59" model="l10n_br_account.cst.template">
+			<field name="code">70</field>
+			<field name="name">Operação de Aquisição sem Direito a Crédito</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_60" model="l10n_br_account.cst.template">
+			<field name="code">71</field>
+			<field name="name">Operação de Aquisição com Isenção</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_61" model="l10n_br_account.cst.template">
+			<field name="code">72</field>
+			<field name="name">Operação de Aquisição com Suspensão</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_62" model="l10n_br_account.cst.template">
+			<field name="code">73</field>
+			<field name="name">Operação de Aquisição a Alíquota Zero</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_63" model="l10n_br_account.cst.template">
+			<field name="code">74</field>
+			<field name="name">Operação de Aquisição sem Incidência da Contribuição</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_64" model="l10n_br_account.cst.template">
+			<field name="code">75</field>
+			<field name="name">Operação de Aquisição por Substituição Tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_65" model="l10n_br_account.cst.template">
+			<field name="code">98</field>
+			<field name="name">Outras Operações de Entrada</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_66" model="l10n_br_account.cst.template">
+			<field name="code">99</field>
+			<field name="name">Outras Operações</field>
+			<field name="tax_code_template_id" ref="tax_code_4" />
+		</record>
+
+		<record id="l10n_br_cst_template_67" model="l10n_br_account.cst.template">
+			<field name="code">00</field>
+			<field name="name">Entrada com recuperação de crédito</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_68" model="l10n_br_account.cst.template">
+			<field name="code">01</field>
+			<field name="name">Entrada tributada com alíquota zero</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_69" model="l10n_br_account.cst.template">
+			<field name="code">02</field>
+			<field name="name">Entrada isenta</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_70" model="l10n_br_account.cst.template">
+			<field name="code">03</field>
+			<field name="name">Entrada não-tributada</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_71" model="l10n_br_account.cst.template">
+			<field name="code">04</field>
+			<field name="name">Entrada imune</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_72" model="l10n_br_account.cst.template">
+			<field name="code">05</field>
+			<field name="name">Entrada com suspensão</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_73" model="l10n_br_account.cst.template">
+			<field name="code">49</field>
+			<field name="name">Outras entradas</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_74" model="l10n_br_account.cst.template">
+			<field name="code">50</field>
+			<field name="name">Saída tributada</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_75" model="l10n_br_account.cst.template">
+			<field name="code">51</field>
+			<field name="name">Saída tributada com alíquota zero</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_76" model="l10n_br_account.cst.template">
+			<field name="code">52</field>
+			<field name="name">Saída isenta</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_77" model="l10n_br_account.cst.template">
+			<field name="code">53</field>
+			<field name="name">Saída não-tributada</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_78" model="l10n_br_account.cst.template">
+			<field name="code">54</field>
+			<field name="name">Saída imune</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_79" model="l10n_br_account.cst.template">
+			<field name="code">55</field>
+			<field name="name">Saída com suspensão</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_80" model="l10n_br_account.cst.template">
+			<field name="code">99</field>
+			<field name="name">Outras saídas</field>
+			<field name="tax_code_template_id" ref="tax_code_3" />
+		</record>
+
+		<record id="l10n_br_cst_template_92" model="l10n_br_account.cst.template">
+			<field name="code">00</field>
+			<field name="name">Tributada integralmente</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_93" model="l10n_br_account.cst.template">
+			<field name="code">10</field>
+			<field name="name">Tributada e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_94" model="l10n_br_account.cst.template">
+			<field name="code">20</field>
+			<field name="name">Com redução de base de cálculo</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_95" model="l10n_br_account.cst.template">
+			<field name="code">30</field>
+			<field name="name">Isenta ou não tributada e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_96" model="l10n_br_account.cst.template">
+			<field name="code">40</field>
+			<field name="name">Isenta</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_97" model="l10n_br_account.cst.template">
+			<field name="code">41</field>
+			<field name="name">Não tributada</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_98" model="l10n_br_account.cst.template">
+			<field name="code">50</field>
+			<field name="name">Suspensão</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_99" model="l10n_br_account.cst.template">
+			<field name="code">51</field>
+			<field name="name">Diferimento</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_100" model="l10n_br_account.cst.template">
+			<field name="code">60</field>
+			<field name="name">ICMS cobrado anteriormente por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_101" model="l10n_br_account.cst.template">
+			<field name="code">70</field>
+			<field name="name">Com redução de base de cálculo e cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+
+		<record id="l10n_br_cst_template_102" model="l10n_br_account.cst.template">
+			<field name="code">90</field>
+			<field name="name">Outras</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_103" model="l10n_br_account.cst.template">
+			<field name="code">101</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional com permissão de crédito</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_104" model="l10n_br_account.cst.template">
+			<field name="code">102</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional sem permissão de crédito</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_105" model="l10n_br_account.cst.template">
+			<field name="code">103</field>
+			<field name="name">Simples Nacional - Isenção do ICMS no Simples Nacional para faixa de receita bruta</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_106" model="l10n_br_account.cst.template">
+			<field name="code">201</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional com permissão de crédito e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_107" model="l10n_br_account.cst.template">
+			<field name="code">202</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional sem permissão de crédito e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_108" model="l10n_br_account.cst.template">
+			<field name="code">203</field>
+			<field name="name">Simples Nacional - Isenção do ICMS no Simples Nacional para faixa de receita bruta e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_109" model="l10n_br_account.cst.template">
+			<field name="code">300</field>
+			<field name="name">Simples Nacional - Imune</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_110" model="l10n_br_account.cst.template">
+			<field name="code">400</field>
+			<field name="name">Simples Nacional - Não tributada pelo Simples Nacional</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_111" model="l10n_br_account.cst.template">
+			<field name="code">500</field>
+			<field name="name">Simples Nacional - ICMS cobrado anteriormente por substituição tributária (substituído) ou por antecipação</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_112" model="l10n_br_account.cst.template">
+			<field name="code">900</field>
+			<field name="name">Simples Nacional - Outros</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_103" model="l10n_br_account.cst.template">
+			<field name="code">101</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional com permissão de crédito</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_104" model="l10n_br_account.cst.template">
+			<field name="code">102</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional sem permissão de crédito</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_105" model="l10n_br_account.cst.template">
+			<field name="code">103</field>
+			<field name="name">Simples Nacional - Isenção do ICMS no Simples Nacional para faixa de receita bruta</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_106" model="l10n_br_account.cst.template">
+			<field name="code">201</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional com permissão de crédito e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_107" model="l10n_br_account.cst.template">
+			<field name="code">202</field>
+			<field name="name">Simples Nacional - Tributada pelo Simples Nacional sem permissão de crédito e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_108" model="l10n_br_account.cst.template">
+			<field name="code">203</field>
+			<field name="name">Simples Nacional - Isenção do ICMS no Simples Nacional para faixa de receita bruta e com cobrança do ICMS por substituição tributária</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_109" model="l10n_br_account.cst.template">
+			<field name="code">300</field>
+			<field name="name">Simples Nacional - Imune</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_110" model="l10n_br_account.cst.template">
+			<field name="code">400</field>
+			<field name="name">Simples Nacional - Não tributada pelo Simples Nacional</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_111" model="l10n_br_account.cst.template">
+			<field name="code">500</field>
+			<field name="name">Simples Nacional - ICMS cobrado anteriormente por substituição tributária (substituído) ou por antecipação</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+		<record id="l10n_br_cst_template_112" model="l10n_br_account.cst.template">
+			<field name="code">900</field>
+			<field name="name">Simples Nacional - Outros</field>
+			<field name="tax_code_template_id" ref="tax_code_1" />
+		</record>
+		
+	</data>
+</openerp>
diff --git a/addons/l10n_br/i18n/ar.po b/addons/l10n_br/i18n/ar.po
new file mode 100644
index 00000000000..0fce6f6c204
--- /dev/null
+++ b/addons/l10n_br/i18n/ar.po
@@ -0,0 +1,36 @@
+# 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: 2011-01-07 06:40+0000\n"
+"PO-Revision-Date: 2011-09-22 02:56+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+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 ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "النظام للبرازيل"
diff --git a/addons/l10n_br/i18n/bg.po b/addons/l10n_br/i18n/bg.po
index 5bbe74aa485..76d52808b6e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/ca.po b/addons/l10n_br/i18n/ca.po
index 0fef4c1ab1b..6a8d202976d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/en_GB.po b/addons/l10n_br/i18n/en_GB.po
new file mode 100644
index 00000000000..750001dc5d7
--- /dev/null
+++ b/addons/l10n_br/i18n/en_GB.po
@@ -0,0 +1,43 @@
+# 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: 2011-01-07 06:40+0000\n"
+"PO-Revision-Date: 2011-08-25 11:59+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+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 ""
+"Generate Chart of Accounts from a Chart Template. You will be asked for the "
+"name of the company, the chart template to follow, the number 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."
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "Brazilian Localisation"
diff --git a/addons/l10n_br/i18n/es.po b/addons/l10n_br/i18n/es.po
index e88771a1e79..432b6496788 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/es_MX.po b/addons/l10n_br/i18n/es_MX.po
new file mode 100644
index 00000000000..7d9fd403242
--- /dev/null
+++ b/addons/l10n_br/i18n/es_MX.po
@@ -0,0 +1,44 @@
+# Spanish 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-07 06:40+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+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 ""
+"Genere el plan de cuentas desde una plantilla de plan. Se le solicitará el "
+"nombre de la compañía, la plantilla de plan a seguir, y el núm. de dígitos "
+"para generar el código de sus cuentas, cuenta bancaria, y divisa para crear "
+"sus diarios. Por tanto, se genera una copia directa de la plantilla del plan "
+"de cuentas.\n"
+"    Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan."
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "Localización Brasileña"
diff --git a/addons/l10n_br/i18n/es_PY.po b/addons/l10n_br/i18n/es_PY.po
index e59920cf140..f6270212704 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/es_VE.po b/addons/l10n_br/i18n/es_VE.po
new file mode 100644
index 00000000000..7d9fd403242
--- /dev/null
+++ b/addons/l10n_br/i18n/es_VE.po
@@ -0,0 +1,44 @@
+# Spanish 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-07 06:40+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+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 ""
+"Genere el plan de cuentas desde una plantilla de plan. Se le solicitará el "
+"nombre de la compañía, la plantilla de plan a seguir, y el núm. de dígitos "
+"para generar el código de sus cuentas, cuenta bancaria, y divisa para crear "
+"sus diarios. Por tanto, se genera una copia directa de la plantilla del plan "
+"de cuentas.\n"
+"    Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan."
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "Localización Brasileña"
diff --git a/addons/l10n_br/i18n/fr.po b/addons/l10n_br/i18n/fr.po
index 66424a02f52..cccbbc7a6e0 100644
--- a/addons/l10n_br/i18n/fr.po
+++ b/addons/l10n_br/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-07 06:40+0000\n"
 "PO-Revision-Date: 2011-05-22 16:50+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/gl.po b/addons/l10n_br/i18n/gl.po
index 2869677556d..d65d535d0cb 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/hi.po b/addons/l10n_br/i18n/hi.po
index 0d6cd03ca43..21bf4a00042 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/it.po b/addons/l10n_br/i18n/it.po
index 03dcad83088..85a377cc47d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/nb.po b/addons/l10n_br/i18n/nb.po
index 9da36bd126c..2447d03014c 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/oc.po b/addons/l10n_br/i18n/oc.po
new file mode 100644
index 00000000000..371c4f5adeb
--- /dev/null
+++ b/addons/l10n_br/i18n/oc.po
@@ -0,0 +1,36 @@
+# 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: 2011-01-07 06:40+0000\n"
+"PO-Revision-Date: 2011-11-20 09:22+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+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 ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "Localizacion brasilièra"
diff --git a/addons/l10n_br/i18n/pt_BR.po b/addons/l10n_br/i18n/pt_BR.po
index 65fec76f4c5..fa16321c094 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/ru.po b/addons/l10n_br/i18n/ru.po
index 7b8d9cdf0cb..9edd1d298ca 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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/sl.po b/addons/l10n_br/i18n/sl.po
new file mode 100644
index 00000000000..06c6b10b1f9
--- /dev/null
+++ b/addons/l10n_br/i18n/sl.po
@@ -0,0 +1,36 @@
+# Slovenian 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-07 06:40+0000\n"
+"PO-Revision-Date: 2011-11-13 19:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-14 05:16+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+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 ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "Brazilska lokalizacija"
diff --git a/addons/l10n_br/i18n/sq.po b/addons/l10n_br/i18n/sq.po
index e8ddfbe4fc5..7a85dbd9f35 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
diff --git a/addons/l10n_br/i18n/sr@latin.po b/addons/l10n_br/i18n/sr@latin.po
new file mode 100644
index 00000000000..9feb697081e
--- /dev/null
+++ b/addons/l10n_br/i18n/sr@latin.po
@@ -0,0 +1,44 @@
+# Serbian Latin 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-07 06:40+0000\n"
+"PO-Revision-Date: 2011-10-06 13:53+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+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 ""
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"\n"
+"    To je isti setup wizard koji se pokreće iz Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "Brazilska lokalizacija"
diff --git a/addons/l10n_br/i18n/tr.po b/addons/l10n_br/i18n/tr.po
index a05ca004683..137080aca3d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_br
 #: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
@@ -28,6 +28,11 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
+"Bir Tablo Şablonundan Hesap Tablosu oluşturun. Sizden, firma adı, izlenecek "
+"tablo şablonu, hesabı oluşturacak koda ait rakam sayısı ve Banka hesabı ile "
+"yevmiyeleri oluşturmak için para cinsi sorulacaktır.\n"
+"    Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Tablo Şablonundan "
+"Hesap Tablosu Oluştur menüsünden çalıştırılan sihirbaz ile aynıdır."
 
 #. module: l10n_br
 #: model:ir.module.module,description:l10n_br.module_meta_information
diff --git a/addons/l10n_br/l10n_br.py b/addons/l10n_br/l10n_br.py
new file mode 100644
index 00000000000..af387334cd1
--- /dev/null
+++ b/addons/l10n_br/l10n_br.py
@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+#################################################################################
+#                                                                               #
+# Copyright (C) 2009  Renato Lima - Akretion                                    #
+#                                                                               #
+#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 General Public License for more details.                                   #
+#                                                                               #
+#You should have received a copy of the GNU General Public License              #
+#along with this program.  If not, see <http://www.gnu.org/licenses/>.          #
+#################################################################################
+
+from osv import fields, osv
+
+class l10n_br_account_cst_template(osv.osv):
+    _name = 'l10n_br_account.cst.template'
+    _description = 'Tax Situation Code Template' 
+    _columns = {
+                'code': fields.char('Code', size=8,required=True),
+                'name': fields.char('Description', size=64),
+                'tax_code_template_id': fields.many2one('account.tax.code.template', 'Tax Code Template',required=True),
+                }
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context)
+    
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['code']:
+                name = record['code'] + ' - '+name
+            res.append((record['id'], name))
+        return res
+    
+l10n_br_account_cst_template()
+
+class l10n_br_account_cst(osv.osv):
+    _name = 'l10n_br_account.cst'
+    _description = 'Tax Situation Code'
+    _columns = {
+                'code': fields.char('Code', size=8,required=True),
+                'name': fields.char('Description', size=64),
+                'tax_code_id': fields.many2one('account.tax.code', 'Tax Code',required=True),
+                }
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context)
+    
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['code']:
+                name = record['code'] + ' - '+name
+            res.append((record['id'], name))
+        return res
+    
+l10n_br_account_cst()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_br/l10n_br_view.xml b/addons/l10n_br/l10n_br_view.xml
new file mode 100644
index 00000000000..361f52746ce
--- /dev/null
+++ b/addons/l10n_br/l10n_br_view.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+	
+		<record model="ir.ui.view" id="view_l10n_br_cst_template_form">
+			<field name="name">l10n_br.cst.form</field>
+			<field name="model">l10n_br_account.cst.template</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Tax Situation Code Template">
+					<field name="code" select="1"/>
+					<field name="name" select="1"/>
+					<field name="tax_code_template_id" select="2"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_l10n_br_cst_template_tree">
+			<field name="name">l10n_br.cst.tree</field>
+			<field name="model">l10n_br_account.cst.template</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Tax Situation Code Template">
+					<field name="code" select="1"/>
+					<field name="name" select="1"/>
+					<field name="tax_code_template_id" select="2"/>
+				</tree>
+			</field>
+		</record>
+		
+		<record model="ir.actions.act_window" id="action_l10n_br_cst_template_form">
+			<field name="name">Tax Situation Code Template</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">l10n_br_account.cst.template</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="view_l10n_br_cst_template_tree"/>
+		</record>
+			
+		<record model="ir.ui.view" id="view_l10n_br_cst_form">
+			<field name="name">l10n_br.cst.form</field>
+			<field name="model">l10n_br_account.cst</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Tax Situation Code">
+					<field name="code" select="1"/>
+					<field name="name" select="1"/>
+					<field name="tax_code_id" select="2"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_l10n_br_cst_tree">
+			<field name="name">l10n_br.cst.tree</field>
+			<field name="model">l10n_br_account.cst</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Tax Situation Code">
+					<field name="code" select="1"/>
+					<field name="name" select="1"/>
+					<field name="tax_code_id" select="2"/>
+				</tree>
+			</field>
+		</record>
+		
+		<record model="ir.actions.act_window" id="action_l10n_br_cst_form">
+			<field name="name">Tax Situation Code</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">l10n_br_account.cst</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="view_l10n_br_cst_tree"/>
+		</record>
+		
+		<menuitem name="Tax Situation Code Template" id="menu_action_l10n_br_cst_template" sequence="99" parent="account.account_template_taxes" action="action_l10n_br_cst_template_form"/>
+		
+		<menuitem name="Tax Situation Code" id="menu_action_l10n_br_cst" parent="account.next_id_27" sequence="99" action="action_l10n_br_cst_form"/>
+		
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_br/security/ir.model.access.csv b/addons/l10n_br/security/ir.model.access.csv
new file mode 100644
index 00000000000..2a1ecd6910f
--- /dev/null
+++ b/addons/l10n_br/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"l10n_br_account_cst","l10n_br_account.cst","model_l10n_br_account_cst","account.group_account_invoice",1,1,1,1
+"l10n_br_account_cst_template","l10n_br_account.cst.template","model_l10n_br_account_cst_template","account.group_account_invoice",1,1,1,1
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index b73f4fbbb05..fbfadbf9755 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -23,7 +23,7 @@
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 02bf6903c6d..26db0bcef95 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -13,1577 +13,629 @@
 
 	<!-- ASSET -->
 
-	<record id="chart100000_en" model="account.account.template">
-		<field name="code">100000</field>
+	<record id="chart1_en" model="account.account.template">
+		<field name="code">1</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ASSET</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">ASSETS</field>
 	</record>
 	
-	<record id="chart110000_en" model="account.account.template">
-		<field name="code">110000</field>
-		<field name="parent_id" ref="chart100000_en"/>
+	<record id="chart11_en" model="account.account.template">
+		<field name="code">11</field>
+		<field name="parent_id" ref="chart1_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">FINANCIAL ASSETS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">CURRENT ASSETS</field>
 	</record>
 	
-	<record id="chart111000_en" model="account.account.template">
-		<field name="code">111000</field>
-		<field name="parent_id" ref="chart110000_en"/>
+	<record id="chart111_en" model="account.account.template">
+		<field name="code">111</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CASH, DEPOSIT AND OFFICIAL INTERNATIONAL RESERVES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">CASH</field>
 	</record>
 
-	<record id="chart111100_en" model="account.account.template">
-		<field name="code">111100</field>
-		<field name="parent_id" ref="chart111000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CASH IN CANADIAN CURRENCY</field>
-	</record>
-
-	<record id="chart111160_en" model="account.account.template">
-		<field name="code">111160</field>
-		<field name="parent_id" ref="chart111100_en"/>
+	<record id="chart1111_en" model="account.account.template">
+		<field name="code">1111</field>
+		<field name="parent_id" ref="chart111_en"/>
 		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_asset_en" />
-		<field name="name">Checking account</field>
+		<field name="user_type" ref="user_type_asset_en"/>
+		<field name="name">Checking Account</field>
 	</record>
 
-	<record id="chart111170_en" model="account.account.template">
-		<field name="code">111170</field>
-		<field name="parent_id" ref="chart111100_en"/>
-		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_asset_en" />
-		<field name="name">Cash</field>
-	</record>
-
-	<record id="chart111200_en" model="account.account.template">
-		<field name="code">111200</field>
-		<field name="parent_id" ref="chart111000_en"/>
+	<record id="chart112_en" model="account.account.template">
+		<field name="code">112</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEMAND DEPOSITS / NOTICE DEPOSITS IN DEPOSIT ACCEPTING INSTITUTIONS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
 	</record>
 
-	<record id="chart111300_en" model="account.account.template">
-		<field name="code">111300</field>
-		<field name="parent_id" ref="chart111000_en"/>
+	<record id="chart113_en" model="account.account.template">
+		<field name="code">113</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">TERM DEPOSITS - UNDER 90 DAYS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">CERTIFICATES OF DEPOSITS</field>
 	</record>
 
-	<record id="chart111400_en" model="account.account.template">
-		<field name="code">111400</field>
-		<field name="parent_id" ref="chart111000_en"/>
+	<record id="chart114_en" model="account.account.template">
+		<field name="code">114</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER CASH EQUIVALENTS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">STOCKS</field>
 	</record>
 
-	<record id="chart111500_en" model="account.account.template">
-		<field name="code">111500</field>
-		<field name="parent_id" ref="chart111000_en"/>
+	<record id="chart115_en" model="account.account.template">
+		<field name="code">115</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER CURRENT CASH ACCOUNTS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">ACCOUNTS RECEIVABLES</field>
 	</record>
 
-	<record id="chart112000_en" model="account.account.template">
-		<field name="code">112000</field>
-		<field name="parent_id" ref="chart110000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ACCOUNTS RECEIVABLE - NET</field>
-	</record>
-
-	<record id="chart112100_en" model="account.account.template">
-		<field name="code">112100</field>
-		<field name="parent_id" ref="chart112000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ACCOUNTS RECEIVABLE AND ACCRUED REVENUE - GROSS</field>
-	</record>
-
-	<record id="chart112110_en" model="account.account.template">
-		<field name="code">112110</field>
-		<field name="parent_id" ref="chart112100_en"/>
+	<record id="chart1151_en" model="account.account.template">
+		<field name="code">1151</field>
+		<field name="parent_id" ref="chart115_en"/>
 		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en" />
-		<field name="name">Customer account</field>
+		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="reconcile" eval="True"/>
+		<field name="name">Customers Account</field>
 	</record>
 
-	<record id="chart112200_en" model="account.account.template">
-		<field name="code">112200</field>
-		<field name="parent_id" ref="chart112000_en"/>
+	<record id="chart1152_en" model="account.account.template">
+		<field name="code">1152</field>
+		<field name="parent_id" ref="chart115_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
 	</record>
 
-	<record id="chart113000_en" model="account.account.template">
-		<field name="code">113000</field>
-		<field name="parent_id" ref="chart110000_en"/>
+	<record id="chart116_en" model="account.account.template">
+		<field name="code">116</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVESTMENTS IN AFFILIATES</field>
-	</record>
-
-	<record id="chart113100_en" model="account.account.template">
-		<field name="code">113100</field>
-		<field name="parent_id" ref="chart113000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVESTMENTS IN CANADIAN AFFILIATES</field>
-	</record>
-
-	<record id="chart113200_en" model="account.account.template">
-		<field name="code">113200</field>
-		<field name="parent_id" ref="chart113000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVESTMENTS IN FOREIGN AFFILIATES</field>
-	</record>
-
-	<record id="chart113300_en" model="account.account.template">
-		<field name="code">113300</field>
-		<field name="parent_id" ref="chart113000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">LOANS, NOTES, ACCOUNTS, BONDS, MORTGAGES AND OTHER INVESTMENTS</field>
-	</record>
-
-	<record id="chart114000_en" model="account.account.template">
-		<field name="code">114000</field>
-		<field name="parent_id" ref="chart110000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVESTMENTS IN NON-AFFILIATES</field>
-	</record>
-
-	<record id="chart114100_en" model="account.account.template">
-		<field name="code">114100</field>
-		<field name="parent_id" ref="chart114000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVESTMENTS IN CANADIAN DEBT INSTRUMENTS (NON-AFFILIATED)</field>
-	</record>
-
-	<record id="chart114200_en" model="account.account.template">
-		<field name="code">114200</field>
-		<field name="parent_id" ref="chart114000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVESTMENTS IN CANADIAN EQUITY INSTRUMENTS</field>
-	</record>
-
-	<record id="chart114300_en" model="account.account.template">
-		<field name="code">114300</field>
-		<field name="parent_id" ref="chart114000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVESTMENTS IN FOREIGN NON-AFFILIATES</field>
-	</record>
-
-	<record id="chart115000_en" model="account.account.template">
-		<field name="code">115000</field>
-		<field name="parent_id" ref="chart110000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">MORTGAGE LOANS TO NON-AFFILIATES</field>
-	</record>
-
-	<record id="chart115100_en" model="account.account.template">
-		<field name="code">115100</field>
-		<field name="parent_id" ref="chart115000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">MORTGAGE LOANS TO NON-AFFILIATES, SECURED BY PROPERTY IN CANADA</field>
-	</record>
-
-	<record id="chart115200_en" model="account.account.template">
-		<field name="code">115200</field>
-		<field name="parent_id" ref="chart115000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">MORTGAGE LOANS TO NON-AFFILIATES, SECURED BY PROPERTY OUTSIDE OF CANADA</field>
-	</record>
-
-	<record id="chart116000_en" model="account.account.template">
-		<field name="code">116000</field>
-		<field name="parent_id" ref="chart110000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-MORTGAGE LOANS TO NON-AFFILIATES</field>
-	</record>
-
-	<record id="chart116100_en" model="account.account.template">
-		<field name="code">116100</field>
-		<field name="parent_id" ref="chart116000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-MORTGAGE LOANS MADE BY ENTERPRISES IN NON-FINANCIAL INDUSTRIES</field>
-	</record>
-
-	<record id="chart116200_en" model="account.account.template">
-		<field name="code">116200</field>
-		<field name="parent_id" ref="chart116000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ALLOWANCE FOR LOSSES ON NON-MORTGAGE LOANS</field>
-	</record>
-
-	<record id="chart117000_en" model="account.account.template">
-		<field name="code">117000</field>
-		<field name="parent_id" ref="chart110000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DERIVATIVES ASSETS</field>
-	</record>
-
-	<record id="chart117100_en" model="account.account.template">
-		<field name="code">117100</field>
-		<field name="parent_id" ref="chart117000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DERIVATIVES ASSETS WITH RESIDENT COUNTERPARTIES</field>
-	</record>
-
-	<record id="chart117200_en" model="account.account.template">
-		<field name="code">117200</field>
-		<field name="parent_id" ref="chart117000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DERIVATIVES ASSETS WITH NON-RESIDENT COUNTERPARTIES</field>
-	</record>
-
-	<record id="chart120000_en" model="account.account.template">
-		<field name="code">120000</field>
-		<field name="parent_id" ref="chart100000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">TANGIBLES ASSETS</field>
-	</record>
-
-	<record id="chart121000_en" model="account.account.template">
-		<field name="code">121000</field>
-		<field name="parent_id" ref="chart120000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INVENTORIES</field>
-	</record>
-
-	<record id="chart121100_en" model="account.account.template">
-		<field name="code">121100</field>
-		<field name="parent_id" ref="chart121000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">GOODS INVENTORIES</field>
-	</record>
-
-	<record id="chart121200_en" model="account.account.template">
-		<field name="code">121200</field>
-		<field name="parent_id" ref="chart121000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PART AND SUPPLIES INVENTORIES</field>
-	</record>
-
-	<record id="chart121300_en" model="account.account.template">
-		<field name="code">121300</field>
-		<field name="parent_id" ref="chart121000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">REAL ESTATE HELD OR BEING DEVELOPER FOR SALE</field>
-	</record>
-
-	<record id="chart122000_en" model="account.account.template">
-		<field name="code">122000</field>
-		<field name="parent_id" ref="chart120000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ALLOWANCE FOR OBSOLESCENCE AND DECLINE IN VALUE</field>
-	</record>
-
-	<record id="chart123000_en" model="account.account.template">
-		<field name="code">123000</field>
-		<field name="parent_id" ref="chart120000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">BREEDING LIVESTOCK</field>
-	</record>
-
-	<record id="chart124000_en" model="account.account.template">
-		<field name="code">124000</field>
-		<field name="parent_id" ref="chart120000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CAPITAL ASSETS</field>
-	</record>
-
-	<record id="chart124100_en" model="account.account.template">
-		<field name="code">124100</field>
-		<field name="parent_id" ref="chart124000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">FIXED ASSETS - NET</field>
-	</record>
-
-	<record id="chart124200_en" model="account.account.template">
-		<field name="code">124200</field>
-		<field name="parent_id" ref="chart124000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEPLETABLE ASSETS - NET</field>
-	</record>
- 
-	<record id="chart124300_en" model="account.account.template">
-		<field name="code">124300</field>
-		<field name="parent_id" ref="chart124000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">REPOSSESSED ASSETS HELD FOR SALE</field>
-	</record>
- 
-	<record id="chart130000_en" model="account.account.template">
-		<field name="code">130000</field>
-		<field name="parent_id" ref="chart100000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEFERRED CHARGES AND INTANGIBLE ASSETS</field>
-	</record>
-
-	<record id="chart131000_en" model="account.account.template">
-		<field name="code">131000</field>
-		<field name="parent_id" ref="chart130000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEFERRED CHARGES AND PREPAID EXPENSES</field>
-	</record>
-
-	<record id="chart131100_en" model="account.account.template">
-		<field name="code">131100</field>
-		<field name="parent_id" ref="chart131000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEFERRED CHARGES - NET</field>
-	</record>
-
-	<record id="chart131200_en" model="account.account.template">
-		<field name="code">131200</field>
-		<field name="parent_id" ref="chart131000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">PREPAID EXPENSES</field>
 	</record>
 
-	<record id="chart132000_en" model="account.account.template">
-		<field name="code">132000</field>
-		<field name="parent_id" ref="chart130000_en"/>
+	<record id="chart117_en" model="account.account.template">
+		<field name="code">117</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INTANGIBLE ASSETS - NET</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">INVESTMENTS HELD FOR TRADING</field>
 	</record>
 
-	<record id="chart132100_en" model="account.account.template">
-		<field name="code">132100</field>
-		<field name="parent_id" ref="chart132000_en"/>
+	<record id="chart118_en" model="account.account.template">
+		<field name="code">118</field>
+		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">GOODWILL - NET</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">TAXES RECEIVABLES</field>
 	</record>
 
-	<record id="chart132200_en" model="account.account.template">
-		<field name="code">132200</field>
-		<field name="parent_id" ref="chart132000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">SOFTWARE</field>
+	<record id="chart1181_en" model="account.account.template">
+		<field name="code">1181</field>
+		<field name="parent_id" ref="chart118_en"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="reconcile" eval="True"/>
+		<field name="name">GST receivable</field>
 	</record>
 
-	<record id="chart132300_en" model="account.account.template">
-		<field name="code">132300</field>
-		<field name="parent_id" ref="chart132000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DATABASE</field>
+	<record id="chart1182_en" model="account.account.template">
+		<field name="code">1182</field>
+		<field name="parent_id" ref="chart118_en"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="reconcile" eval="True"/>
+		<field name="name">PST/QST receivable</field>
 	</record>
 
-	<record id="chart132400_en" model="account.account.template">
-		<field name="code">132400</field>
-		<field name="parent_id" ref="chart132000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">EXCESS OF PURCHASE PRICE OF CONSOLIDATED SUBSIDIARY SHARES</field>
+	<record id="chart1183_en" model="account.account.template">
+		<field name="code">1183</field>
+		<field name="parent_id" ref="chart118_en"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="reconcile" eval="True"/>
+		<field name="name">HST receivable</field>
 	</record>
 
-	<record id="chart132500_en" model="account.account.template">
-		<field name="code">132500</field>
-		<field name="parent_id" ref="chart132000_en"/>
+	<record id="chart15_en" model="account.account.template">
+		<field name="code">15</field>
+		<field name="parent_id" ref="chart1_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS - NET</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">NON-CURRENT ASSETS</field>
 	</record>
 
-	<record id="chart132600_en" model="account.account.template">
-		<field name="code">132600</field>
-		<field name="parent_id" ref="chart132000_en"/>
+	<record id="chart151_en" model="account.account.template">
+		<field name="code">151</field>
+		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER INTANGIBLES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
 	</record>
 
-	<record id="chart140000_en" model="account.account.template">
-		<field name="code">140000</field>
-		<field name="parent_id" ref="chart100000_en"/>
+	<record id="chart152_en" model="account.account.template">
+		<field name="code">152</field>
+		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER ASSETS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">TANGIBLE ASSETS</field>
 	</record>
 
-	<record id="chart141000_en" model="account.account.template">
-		<field name="code">141000</field>
-		<field name="parent_id" ref="chart140000_en"/>
+	<record id="chart1527_en" model="account.account.template">
+		<field name="code">1527</field>
+		<field name="parent_id" ref="chart152_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PENSIONS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">ACCUMULATED DEPRECIATIONS</field>
 	</record>
 
-	<record id="chart142000_en" model="account.account.template">
-		<field name="code">142000</field>
-		<field name="parent_id" ref="chart140000_en"/>
+	<record id="chart153_en" model="account.account.template">
+		<field name="code">153</field>
+		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ALL OTHER ASSETS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">INTANGIBLE ASSETS</field>
 	</record>
 
-	<record id="chart142100_en" model="account.account.template">
-		<field name="code">142100</field>
-		<field name="parent_id" ref="chart142000_en"/>
+	<record id="chart1531_en" model="account.account.template">
+		<field name="code">1531</field>
+		<field name="parent_id" ref="chart153_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER DEPOSITS</field>
-	</record>
-
-	<record id="chart142200_en" model="account.account.template">
-		<field name="code">142200</field>
-		<field name="parent_id" ref="chart142000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ALL OTHER ASSETS, EXCEPT OTHER DEPOSITS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
 	</record>
 
 	<!-- LIABILITIES -->
 
-	<record id="chart200000_en" model="account.account.template">
-		<field name="code">200000</field>
+	<record id="chart2_en" model="account.account.template">
+		<field name="code">2</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">LIABILITIES</field>
 	</record>
 
-	<record id="chart210000_en" model="account.account.template">
-		<field name="code">210000</field>
-		<field name="parent_id" ref="chart200000_en"/>
+	<record id="chart21_en" model="account.account.template">
+		<field name="code">21</field>
+		<field name="parent_id" ref="chart2_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">FINANCIAL INSTRUMENTS AND BORROWING</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">CURRENT LIABILITIES</field>
 	</record>
 
-	<record id="chart211000_en" model="account.account.template">
-		<field name="code">211000</field>
-		<field name="parent_id" ref="chart210000_en"/>
+	<record id="chart211_en" model="account.account.template">
+		<field name="code">211</field>
+		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">MORTGAGES LOANS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">ACCOUNTS PAYABLES</field>
 	</record>
 
-	<record id="chart211100_en" model="account.account.template">
-		<field name="code">211100</field>
-		<field name="parent_id" ref="chart211000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">RESIDENTIAL MORTGAGE LOANS</field>
-	</record>
-
-	<record id="chart211200_en" model="account.account.template">
-		<field name="code">211200</field>
-		<field name="parent_id" ref="chart211000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-RESIDENTIAL MORTGAGE LOANS</field>
-	</record>
-
-	<record id="chart212000_en" model="account.account.template">
-		<field name="code">212000</field>
-		<field name="parent_id" ref="chart210000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-MORTGAGE LOANS</field>
-	</record>
-
-	<record id="chart212100_en" model="account.account.template">
-		<field name="code">212100</field>
-		<field name="parent_id" ref="chart212000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-MORTGAGE LOANS, BANK LOANS</field>
-	</record>
-
-	<record id="chart212200_en" model="account.account.template">
-		<field name="code">212200</field>
-		<field name="parent_id" ref="chart212000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-MORTGAGE LOANS, LOANS FROM OTHER DOMESTIC LENDING INSTITUTIONS</field>
-	</record>
-
-	<record id="chart212300_en" model="account.account.template">
-		<field name="code">212300</field>
-		<field name="parent_id" ref="chart212000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-MORTGAGE LOANS, LOANS FROM OTHERS</field>
-	</record>
-
-	<record id="chart212400_en" model="account.account.template">
-		<field name="code">212400</field>
-		<field name="parent_id" ref="chart212000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-MORTGAGE LOANS, LIEN NOT PAYABLE</field>
-	</record>
-
-	<record id="chart212500_en" model="account.account.template">
-		<field name="code">212500</field>
-		<field name="parent_id" ref="chart212000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OBLIGATIONS UNDER FINANCIAL/CAPITAL LEASES</field>
-	</record>
-
-	<record id="chart213000_en" model="account.account.template">
-		<field name="code">213000</field>
-		<field name="parent_id" ref="chart210000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEBT SECURITIES</field>
-	</record>
-
-	<record id="chart213100_en" model="account.account.template">
-		<field name="code">213100</field>
-		<field name="parent_id" ref="chart213000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEBT SECURITIES, SHORT-TERM PAPER, COMMERCIAL PAPER, FINANCE COMPANY PAPER AND BANKER'S ACCEPTANCE</field>
-	</record>
-
-	<record id="chart213200_en" model="account.account.template">
-		<field name="code">213200</field>
-		<field name="parent_id" ref="chart213000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEBT SECURITIES, BONDS, DEBENTURES AND PROMISSORY NOTES</field>
-	</record>
-
-	<record id="chart214000_en" model="account.account.template">
-		<field name="code">214000</field>
-		<field name="parent_id" ref="chart210000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DERIVATIVES LIABILITIES</field>
-	</record>
-
-	<record id="chart214100_en" model="account.account.template">
-		<field name="code">214100</field>
-		<field name="parent_id" ref="chart214000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DERIVATIVES LIABILITIES WITH RESIDENT COUNTERPARTIES</field>
-	</record>
-
-	<record id="chart214200_en" model="account.account.template">
-		<field name="code">214200</field>
-		<field name="parent_id" ref="chart214000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DERIVATIVES LIABILITIES WITH NON-RESIDENT COUNTERPARTIES</field>
-	</record>
-
-	<record id="chart220000_en" model="account.account.template">
-		<field name="code">220000</field>
-		<field name="parent_id" ref="chart200000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CLAIMS</field>
-	</record>
-
-	<record id="chart221000_en" model="account.account.template">
-		<field name="code">221000</field>
-		<field name="parent_id" ref="chart220000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ACCOUNTS PAYABLE AND ACCRUED LIABILITIES</field>
-	</record>
-
-	<record id="chart221100_en" model="account.account.template">
-		<field name="code">221100</field>
-		<field name="parent_id" ref="chart221000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ACCOUNTS PAYABLE, TRADE</field>
-	</record>
-
-	<record id="chart221110_en" model="account.account.template">
-		<field name="code">221110</field>
-		<field name="parent_id" ref="chart221100_en"/>
+	<record id="chart2111_en" model="account.account.template">
+		<field name="code">2111</field>
+		<field name="parent_id" ref="chart211_en"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
-		<field name="name">Supplier account</field>
+		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="reconcile" eval="True"/>
+		<field name="name">Suppliers Account</field>
 	</record>
 
-	<record id="chart221200_en" model="account.account.template">
-		<field name="code">221200</field>
-		<field name="parent_id" ref="chart221000_en"/>
+	<record id="chart212_en" model="account.account.template">
+		<field name="code">212</field>
+		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER ACCOUNTS PAYABLE AND ACCRUALS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">TAXES PAYABLES</field>
 	</record>
 
-	<record id="chart222000_en" model="account.account.template">
-		<field name="code">222000</field>
-		<field name="parent_id" ref="chart220000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CLAIMS OF AFFILIATES</field>
-	</record>
-
-	<record id="chart222100_en" model="account.account.template">
-		<field name="code">222100</field>
-		<field name="parent_id" ref="chart222000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">AMOUNTS OWING TO SHAREHOLDERS, DIRECTORS AND OFFICERS</field>
-	</record>
-
-	<record id="chart222200_en" model="account.account.template">
-		<field name="code">222200</field>
-		<field name="parent_id" ref="chart222000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">AMOUNTS OWING TO PARENTS, SUBSIDIARIES, RELATED CORPORATIONS, JOINT VENTURES AND PARTNERSHIPS</field>
-	</record>
-
-	<record id="chart240000_en" model="account.account.template">
-		<field name="code">240000</field>
-		<field name="parent_id" ref="chart200000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">FUTURE INCOME TAXES</field>
-	</record>
-
-	<record id="chart241000_en" model="account.account.template">
-		<field name="code">241000</field>
-		<field name="parent_id" ref="chart240000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">TAXES TO PAY</field>
-	</record>
-
-	<record id="chart241100_en" model="account.account.template">
-		<field name="code">241100</field>
-		<field name="parent_id" ref="chart241000_en"/>
+	<record id="chart2121_en" model="account.account.template">
+		<field name="code">2121</field>
+		<field name="parent_id" ref="chart212_en"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
+		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="reconcile" eval="True"/>
 		<field name="name">GST to pay</field>
 	</record>
 
-	<record id="chart241200_en" model="account.account.template">
-		<field name="code">241200</field>
-		<field name="parent_id" ref="chart241000_en"/>
+	<record id="chart2122_en" model="account.account.template">
+		<field name="code">2122</field>
+		<field name="parent_id" ref="chart212_en"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
-		<field name="name">PST to pay</field>
+		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="reconcile" eval="True"/>
+		<field name="name">PST/QST to pay</field>
 	</record>
 
-	<record id="chart241300_en" model="account.account.template">
-		<field name="code">241300</field>
-		<field name="parent_id" ref="chart241000_en"/>
+	<record id="chart2123_en" model="account.account.template">
+		<field name="code">2123</field>
+		<field name="parent_id" ref="chart212_en"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
+		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="reconcile" eval="True"/>
 		<field name="name">HST to pay</field>
 	</record>
 
-	<record id="chart242000_en" model="account.account.template">
-		<field name="code">242000</field>
-		<field name="parent_id" ref="chart240000_en"/>
+	<record id="chart213_en" model="account.account.template">
+		<field name="code">213</field>
+		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">TAXES TO RECEIVE</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">CURRENT FINANCIAL DEBTS</field>
 	</record>
 
-	<record id="chart242100_en" model="account.account.template">
-		<field name="code">242100</field>
-		<field name="parent_id" ref="chart242000_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en" />
-		<field name="name">GST to receive</field>
-	</record>
-
-	<record id="chart242200_en" model="account.account.template">
-		<field name="code">242200</field>
-		<field name="parent_id" ref="chart242000_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en" />
-		<field name="name">PST to receive</field>
-	</record>
-
-	<record id="chart242300_en" model="account.account.template">
-		<field name="code">242300</field>
-		<field name="parent_id" ref="chart242000_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en" />
-		<field name="name">HST to receive</field>
-	</record>
-
-	<record id="chart245000_en" model="account.account.template">
-		<field name="code">245000</field>
-		<field name="parent_id" ref="chart240000_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
-		<field name="name">Vacation pay to pay</field>
-	</record>
-
-	<record id="chart246000_en" model="account.account.template">
-		<field name="code">246000</field>
-		<field name="parent_id" ref="chart240000_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
-		<field name="name">Workplace Safety and Insurance Board to pay</field>
-	</record>
-
-	<record id="chart247000_en" model="account.account.template">
-		<field name="code">247000</field>
-		<field name="parent_id" ref="chart240000_en"/>
+	<record id="chart25_en" model="account.account.template">
+		<field name="code">25</field>
+		<field name="parent_id" ref="chart2_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">Payroll deductions</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">NON-CURRENT LIABILITIES</field>
 	</record>
 
-	<record id="chart247100_en" model="account.account.template">
-		<field name="code">247100</field>
-		<field name="parent_id" ref="chart247000_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
-		<field name="name">Employment insurance to pay</field>
-	</record>
-
-	<record id="chart247200_en" model="account.account.template">
-		<field name="code">247200</field>
-		<field name="parent_id" ref="chart247000_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
-		<field name="name">Annuities to pay</field>
-	</record>
-
-	<record id="chart247300_en" model="account.account.template">
-		<field name="code">247300</field>
-		<field name="parent_id" ref="chart247000_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en" />
-		<field name="name">Income tax to pay</field>
-	</record>
-
-	<record id="chart250000_en" model="account.account.template">
-		<field name="code">250000</field>
-		<field name="parent_id" ref="chart200000_en"/>
+	<record id="chart251_en" model="account.account.template">
+		<field name="code">251</field>
+		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">MINORITY INTEREST IN SUBSIDIARIES CONSOLIDATED</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">NON-CURRENT FINANCIAL DEBTS</field>
 	</record>
 
-	<record id="chart260000_en" model="account.account.template">
-		<field name="code">260000</field>
-		<field name="parent_id" ref="chart200000_en"/>
+	<record id="chart252_en" model="account.account.template">
+		<field name="code">252</field>
+		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PENSIONS PLANS AND DEFERRED PROFIT SHARING PLANS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
 	</record>
 
-	<record id="chart270000_en" model="account.account.template">
-		<field name="code">270000</field>
-		<field name="parent_id" ref="chart200000_en"/>
+	<record id="chart253_en" model="account.account.template">
+		<field name="code">253</field>
+		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PROVISIONS FOR FUTURE OBLIGATIONS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">DEFERRED TAXES</field>
 	</record>
 
-	<record id="chart280000_en" model="account.account.template">
-		<field name="code">280000</field>
-		<field name="parent_id" ref="chart200000_en"/>
+	<record id="chart259_en" model="account.account.template">
+		<field name="code">259</field>
+		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CUSTOMER DEPOSITS, DEFERRED INCOME</field>
-	</record>
-
-	<record id="chart290000_en" model="account.account.template">
-		<field name="code">290000</field>
-		<field name="parent_id" ref="chart200000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER LIABILITIES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">OTHER NON-CURRENT LIABILITIES</field>
 	</record>
 
 	<!-- EQUITY -->
 
-	<record id="chart300000_en" model="account.account.template">
-		<field name="code">300000</field>
+	<record id="chart3_en" model="account.account.template">
+		<field name="code">3</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">EQUITY</field>
 	</record>
 
-	<record id="chart310000_en" model="account.account.template">
-		<field name="code">310000</field>
-		<field name="parent_id" ref="chart300000_en"/>
+	<record id="chart31_en" model="account.account.template">
+		<field name="code">31</field>
+		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">SHARE CAPITAL</field>
 	</record>
 
-	<record id="chart311000_en" model="account.account.template">
-		<field name="code">311000</field>
-		<field name="parent_id" ref="chart310000_en"/>
+	<record id="chart32_en" model="account.account.template">
+		<field name="code">32</field>
+		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PREFERRED SHARES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">PREMIUMS</field>
 	</record>
 
-	<record id="chart311100_en" model="account.account.template">
-		<field name="code">311100</field>
-		<field name="parent_id" ref="chart311000_en"/>
+	<record id="chart33_en" model="account.account.template">
+		<field name="code">33</field>
+		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PREFERRED SHARES - NEW ISSUES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">RETAINED EARNINGS</field>
 	</record>
 
-	<record id="chart311200_en" model="account.account.template">
-		<field name="code">311200</field>
-		<field name="parent_id" ref="chart311000_en"/>
+	<record id="chart34_en" model="account.account.template">
+		<field name="code">34</field>
+		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PREFERRED SHARES - NEW ISSUES (DIVIDEND REINVESTMENT PLANS)</field>
-	</record>
-
-	<record id="chart311300_en" model="account.account.template">
-		<field name="code">311300</field>
-		<field name="parent_id" ref="chart311000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PREFERRED SHARES - SHARE BUYBACKS AND REDEMPTIONS</field>
-	</record>
-
-	<record id="chart312000_en" model="account.account.template">
-		<field name="code">312000</field>
-		<field name="parent_id" ref="chart310000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">COMMON SHARES</field>
-	</record>
-
-	<record id="chart312100_en" model="account.account.template">
-		<field name="code">312100</field>
-		<field name="parent_id" ref="chart312000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">COMMON SHARES - NEW ISSUES</field>
-	</record>
-
-	<record id="chart312200_en" model="account.account.template">
-		<field name="code">312200</field>
-		<field name="parent_id" ref="chart312000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">COMMON SHARES - NEW ISSUES (DIVIDEND REINVESTMENT PLANS)</field>
-	</record>
-
-	<record id="chart312300_en" model="account.account.template">
-		<field name="code">312300</field>
-		<field name="parent_id" ref="chart312000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">COMMON SHARES - SHARE BUYBACKS AND REDEMPTIONS</field>
-	</record>
-
-	<record id="chart313000_en" model="account.account.template">
-		<field name="code">313000</field>
-		<field name="parent_id" ref="chart310000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OWNER'S EQUITY</field>
-	</record>
-
-	<record id="chart314000_en" model="account.account.template">
-		<field name="code">314000</field>
-		<field name="parent_id" ref="chart310000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER SHARES</field>
-	</record>
-
-	<record id="chart320000_en" model="account.account.template">
-		<field name="code">320000</field>
-		<field name="parent_id" ref="chart300000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">RETAINED EARNINGS/DEFICITS</field>
-	</record>
-
-	<record id="chart321000_en" model="account.account.template">
-		<field name="code">321000</field>
-		<field name="parent_id" ref="chart320000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">RETAINED EARNINGS/DEFICITS, APPROPRIATED</field>
-	</record>
-
-	<record id="chart322000_en" model="account.account.template">
-		<field name="code">322000</field>
-		<field name="parent_id" ref="chart320000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">RETAINED EARNINGS/DEFICITS, UNAPPROPRIATED</field>
-	</record>
-
-	<record id="chart330000_en" model="account.account.template">
-		<field name="code">330000</field>
-		<field name="parent_id" ref="chart300000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CONTRIBUTED SURPLUS</field>
-	</record>
-
-	<record id="chart340000_en" model="account.account.template">
-		<field name="code">340000</field>
-		<field name="parent_id" ref="chart300000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER SURPLUS</field>
-	</record>
-
-	<!-- REVENUE -->
-
-	<record id="chart400000_en" model="account.account.template">
-		<field name="code">400000</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">REVENUE</field>
-	</record>
-
-	<record id="chart410000_en" model="account.account.template">
-		<field name="code">410000</field>
-		<field name="parent_id" ref="chart400000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OPERATING REVENUE</field>
-	</record>
-
-	<record id="chart411000_en" model="account.account.template">
-		<field name="code">411000</field>
-		<field name="parent_id" ref="chart410000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">SALES OF GOODS AND SERVICES</field>
-	</record>
-
-	<record id="chart411100_en" model="account.account.template">
-		<field name="code">411100</field>
-		<field name="parent_id" ref="chart411000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">SALES OF GOODS</field>
-	</record>
-
-	<record id="chart411110_en" model="account.account.template">
-		<field name="code">411110</field>
-		<field name="parent_id" ref="chart411100_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_income_en" />
-		<field name="name">Inside Sales</field>
-	</record>
-
-        <record id="chart411120_en" model="account.account.template">
-                <field name="code">411120</field>
-                <field name="parent_id" ref="chart411100_en"/>
-                <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en" />
-                <field name="name">Harmonized Provinces Sales</field>
-        </record>
-
-        <record id="chart411130_en" model="account.account.template">
-                <field name="code">411130</field>
-                <field name="parent_id" ref="chart411100_en"/>
-                <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en" />
-                <field name="name">Non-Harmonized Provinces Sales</field>
-        </record>
-
-        <record id="chart411140_en" model="account.account.template">
-                <field name="code">411140</field>
-                <field name="parent_id" ref="chart411100_en"/>
-                <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en" />
-                <field name="name">International Sales</field>
-        </record>
-
-	<record id="chart411200_en" model="account.account.template">
-		<field name="code">411200</field>
-		<field name="parent_id" ref="chart411000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">SALES OF SERVICES</field>
-	</record>
-
-        <record id="chart411210_en" model="account.account.template">
-                <field name="code">411210</field>
-                <field name="parent_id" ref="chart411200_en"/>
-                <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en" />
-                <field name="name">Inside Sales</field>
-        </record>
-
-        <record id="chart411220_en" model="account.account.template">
-                <field name="code">411220</field>
-                <field name="parent_id" ref="chart411200_en"/>
-                <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en" />
-                <field name="name">Harmonized Provinces Sales</field>
-        </record>
-
-        <record id="chart411230_en" model="account.account.template">
-                <field name="code">411230</field>
-                <field name="parent_id" ref="chart411200_en"/>
-                <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en" />
-                <field name="name">Non-Harmonized Provinces Sales</field>
-        </record>
-
-        <record id="chart411240_en" model="account.account.template">
-                <field name="code">411240</field>
-                <field name="parent_id" ref="chart411200_en"/>
-                <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en" />
-                <field name="name">International Sales</field>
-        </record>
-
-	<record id="chart413000_en" model="account.account.template">
-		<field name="code">413000</field>
-		<field name="parent_id" ref="chart410000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER OPERATING REVENUE</field>
-	</record>
-
-	<record id="chart413100_en" model="account.account.template">
-		<field name="code">413100</field>
-		<field name="parent_id" ref="chart413000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">SUBSIDIES AND GRANTS</field>
-	</record>
-
-	<record id="chart413200_en" model="account.account.template">
-		<field name="code">413200</field>
-		<field name="parent_id" ref="chart413000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ROYALTIES AND FRANCHISE FEES REVENUE</field>
-	</record>
-
-	<record id="chart413300_en" model="account.account.template">
-		<field name="code">413300</field>
-		<field name="parent_id" ref="chart413000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ALL OTHER OPERATING REVENUE</field>
-	</record>
-
-	<record id="chart420000_en" model="account.account.template">
-		<field name="code">420000</field>
-		<field name="parent_id" ref="chart400000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-OPERATING REVENUE</field>
-	</record>
-
-	<record id="chart421000_en" model="account.account.template">
-		<field name="code">421000</field>
-		<field name="parent_id" ref="chart420000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">DIVIDENDS</field>
 	</record>
 
-	<record id="chart421100_en" model="account.account.template">
-		<field name="code">421100</field>
-		<field name="parent_id" ref="chart421000_en"/>
+	<record id="chart35_en" model="account.account.template">
+		<field name="code">35</field>
+		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DIVIDENDS FROM CANADIAN CORPORATIONS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">TRANSLATION ADJUSTMENTS</field>
 	</record>
 
-	<record id="chart421200_en" model="account.account.template">
-		<field name="code">421200</field>
-		<field name="parent_id" ref="chart421000_en"/>
+	<record id="chart36_en" model="account.account.template">
+		<field name="code">36</field>
+		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DIVIDENDS FROM FOREIGN CORPORATIONS</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">CONTRIBUTED SURPLUS</field>
 	</record>
 
-	<record id="chart422000_en" model="account.account.template">
-		<field name="code">422000</field>
-		<field name="parent_id" ref="chart420000_en"/>
+	<!-- INCOME -->
+
+	<record id="chart4_en" model="account.account.template">
+		<field name="code">4</field>
+		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">INCOMES</field>
+	</record>
+
+	<record id="chart41_en" model="account.account.template">
+		<field name="code">41</field>
+		<field name="parent_id" ref="chart4_en"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">OPERATING INCOMES</field>
+	</record>
+
+	<record id="chart411_en" model="account.account.template">
+		<field name="code">411</field>
+		<field name="parent_id" ref="chart41_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_income_en"/>
+		<field name="name">Inside Sales</field>
+	</record>
+
+        <record id="chart412_en" model="account.account.template">
+                <field name="code">412</field>
+                <field name="parent_id" ref="chart41_en"/>
+                <field name="type">other</field>
+                <field name="user_type" ref="user_type_income_en"/>
+                <field name="name">Harmonized Provinces Sales</field>
+        </record>
+
+        <record id="chart413_en" model="account.account.template">
+                <field name="code">413</field>
+                <field name="parent_id" ref="chart41_en"/>
+                <field name="type">other</field>
+                <field name="user_type" ref="user_type_income_en"/>
+                <field name="name">Non-Harmonized Provinces Sales</field>
+        </record>
+
+        <record id="chart414_en" model="account.account.template">
+                <field name="code">414</field>
+                <field name="parent_id" ref="chart41_en"/>
+                <field name="type">other</field>
+                <field name="user_type" ref="user_type_income_en"/>
+                <field name="name">International Sales</field>
+        </record>
+
+	<record id="chart419_en" model="account.account.template">
+		<field name="code">419</field>
+		<field name="parent_id" ref="chart41_en"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">OTHER OPERATING INCOMES</field>
+	</record>
+
+	<record id="chart42_en" model="account.account.template">
+		<field name="code">42</field>
+		<field name="parent_id" ref="chart4_en"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">NON-OPERATING INCOMES</field>
+	</record>
+
+	<record id="chart421_en" model="account.account.template">
+		<field name="code">421</field>
+		<field name="parent_id" ref="chart42_en"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">INTERESTS</field>
 	</record>
 
-	<record id="chart422100_en" model="account.account.template">
-		<field name="code">422100</field>
-		<field name="parent_id" ref="chart422000_en"/>
+	<record id="chart429_en" model="account.account.template">
+		<field name="code">429</field>
+		<field name="parent_id" ref="chart42_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INTERESTS FROM CANADIAN SOURCES</field>
-	</record>
-
-	<record id="chart422200_en" model="account.account.template">
-		<field name="code">422200</field>
-		<field name="parent_id" ref="chart422000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INTERESTS FROM FOREIGN SOURCES</field>
-	</record>
-
-	<record id="chart423000_en" model="account.account.template">
-		<field name="code">423000</field>
-		<field name="parent_id" ref="chart420000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OTHER NON-OPERATING REVENUE</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">OTHER NON-OPERATING INCOMES</field>
 	</record>
 
 	<!-- EXPENSES -->
 
-	<record id="chart500000_en" model="account.account.template">
-		<field name="code">500000</field>
+	<record id="chart5_en" model="account.account.template">
+		<field name="code">5</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">EXPENSES</field>
 	</record>
 
-	<record id="chart510000_en" model="account.account.template">
-		<field name="code">510000</field>
-		<field name="parent_id" ref="chart500000_en"/>
+	<record id="chart51_en" model="account.account.template">
+		<field name="code">51</field>
+		<field name="parent_id" ref="chart5_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">OPERATING EXPENSES</field>
 	</record>
 
-	<record id="chart511000_en" model="account.account.template">
-		<field name="code">511000</field>
-		<field name="parent_id" ref="chart510000_en"/>
+	<record id="chart511_en" model="account.account.template">
+		<field name="code">511</field>
+		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">COST OF GOODS SOLD</field>
 	</record>
 
-	<record id="chart511100_en" model="account.account.template">
-		<field name="code">511100</field>
-		<field name="parent_id" ref="chart511000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OPENING INVENTORIES</field>
-	</record>
-
-	<record id="chart511110_en" model="account.account.template">
-		<field name="code">511110</field>
-		<field name="parent_id" ref="chart511100_en"/>
+	<record id="chart5111_en" model="account.account.template">
+		<field name="code">5111</field>
+		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en" />
-		<field name="name">Expenses</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Inside Purchases</field>
 	</record>
 
-	<record id="chart511200_en" model="account.account.template">
-		<field name="code">511200</field>
-		<field name="parent_id" ref="chart511000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PURCHASES AND COSTS CHARGEABLE TO COST OF SALES</field>
+	<record id="chart5112_en" model="account.account.template">
+		<field name="code">5112</field>
+		<field name="parent_id" ref="chart511_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Purchases in harmonized provinces</field>
 	</record>
 
-	<record id="chart511300_en" model="account.account.template">
-		<field name="code">511300</field>
-		<field name="parent_id" ref="chart511000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">CLOSING INVENTORIES</field>
+	<record id="chart5113_en" model="account.account.template">
+		<field name="code">5113</field>
+		<field name="parent_id" ref="chart511_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Purchases in non-harmonized provinces</field>
 	</record>
 
-	<record id="chart512000_en" model="account.account.template">
-		<field name="code">512000</field>
-		<field name="parent_id" ref="chart510000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">OPERATING EXPENSES NOT INCLUDED IN COST OF GOODS SOLD</field>
+	<record id="chart5114_en" model="account.account.template">
+		<field name="code">5114</field>
+		<field name="parent_id" ref="chart511_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">International Purchases</field>
 	</record>
 
-	<record id="chart512100_en" model="account.account.template">
-		<field name="code">512100</field>
-		<field name="parent_id" ref="chart512000_en"/>
+	<record id="chart512_en" model="account.account.template">
+		<field name="code">512</field>
+		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">LABOUR EXPENSES</field>
 	</record>
 
-	<record id="chart512110_en" model="account.account.template">
-		<field name="code">512110</field>
-		<field name="parent_id" ref="chart512100_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">SALARIES, WAGES AND COMMISSIONS</field>
+	<record id="chart5121_en" model="account.account.template">
+		<field name="code">5121</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Salaries, wages and commissions</field>
 	</record>
 
-	<record id="chart512120_en" model="account.account.template">
-		<field name="code">512120</field>
-		<field name="parent_id" ref="chart512100_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">EMPLOYEE BENEFITS</field>
+	<record id="chart5122_en" model="account.account.template">
+		<field name="code">5122</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Holidays</field>
 	</record>
 
-	<record id="chart512200_en" model="account.account.template">
-		<field name="code">512200</field>
-		<field name="parent_id" ref="chart512000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">EXPENSES OTHER THAN LABOUR</field>
+	<record id="chart5123_en" model="account.account.template">
+		<field name="code">5123</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Employment Insurance</field>
 	</record>
 
-	<record id="chart512210_en" model="account.account.template">
-		<field name="code">512210</field>
-		<field name="parent_id" ref="chart512200_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">DEPRECIATION, DEPLETION AND AMORTIZATION EXPENSES</field>
+	<record id="chart5124_en" model="account.account.template">
+		<field name="code">5124</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Health Services Fund</field>
 	</record>
 
-	<record id="chart512220_en" model="account.account.template">
-		<field name="code">512220</field>
-		<field name="parent_id" ref="chart512200_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ENERGY, WATER AND TELEPHONE/TELECOMMUNICATION EXPENSES</field>
+	<record id="chart5125_en" model="account.account.template">
+		<field name="code">5125</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Annuities</field>
 	</record>
 
-	<record id="chart512230_en" model="account.account.template">
-		<field name="code">512230</field>
-		<field name="parent_id" ref="chart512200_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INDIRECTS TAXES AND LICENCES AND PERMITS</field>
+	<record id="chart5126_en" model="account.account.template">
+		<field name="code">5126</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Parental Insurance</field>
 	</record>
 
-	<record id="chart512240_en" model="account.account.template">
-		<field name="code">512240</field>
-		<field name="parent_id" ref="chart512200_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">SUB-CONTRACTS</field>
+	<record id="chart5127_en" model="account.account.template">
+		<field name="code">5127</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Labour Health and Safety</field>
 	</record>
 
-	<record id="chart512250_en" model="account.account.template">
-		<field name="code">512250</field>
-		<field name="parent_id" ref="chart512200_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">EXPLORATION AND DEVELOPMENT EXPENSES</field>
+	<record id="chart5128_en" model="account.account.template">
+		<field name="code">5128</field>
+		<field name="parent_id" ref="chart512_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="name">Labour Standards</field>
 	</record>
 
-	<record id="chart512260_en" model="account.account.template">
-		<field name="code">512260</field>
-		<field name="parent_id" ref="chart512200_en"/>
+	<record id="chart513_en" model="account.account.template">
+		<field name="code">513</field>
+		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ROYALTIES AND FRANCHISE FEES EXPENSES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">SALES EXPENSES</field>
 	</record>
 
-	<record id="chart512270_en" model="account.account.template">
-		<field name="code">512270</field>
-		<field name="parent_id" ref="chart512200_en"/>
+	<record id="chart514_en" model="account.account.template">
+		<field name="code">514</field>
+		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">PURCHASED MATERIALS, SUPPLIES AND SERVICES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">GENERAL EXPENSES</field>
 	</record>
 
-	<record id="chart512290_en" model="account.account.template">
-		<field name="code">512290</field>
-		<field name="parent_id" ref="chart512200_en"/>
+	<record id="chart515_en" model="account.account.template">
+		<field name="code">515</field>
+		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ALL OTHER OPERATING EXPENSES</field>
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
 	</record>
 
-	<record id="chart520000_en" model="account.account.template">
-		<field name="code">520000</field>
-		<field name="parent_id" ref="chart500000_en"/>
+	<record id="chart519_en" model="account.account.template">
+		<field name="code">519</field>
+		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
+		<field name="name">OTHER OPERATING EXPENSES</field>
+	</record>
+
+	<record id="chart55_en" model="account.account.template">
+		<field name="code">55</field>
+		<field name="parent_id" ref="chart5_en"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">NON-OPERATING EXPENSES</field>
 	</record>
 
-	<record id="chart521000_en" model="account.account.template">
-		<field name="code">521000</field>
-		<field name="parent_id" ref="chart520000_en"/>
+	<record id="chart551_en" model="account.account.template">
+		<field name="code">551</field>
+		<field name="parent_id" ref="chart55_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">INTEREST EXPENSES</field>
 	</record>
 
-	<record id="chart521100_en" model="account.account.template">
-		<field name="code">521100</field>
-		<field name="parent_id" ref="chart521000_en"/>
+	<record id="chart559_en" model="account.account.template">
+		<field name="code">559</field>
+		<field name="parent_id" ref="chart55_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INTEREST EXPENSES ON SHORT-TERM DEBT</field>
-	</record>
-
-	<record id="chart521200_en" model="account.account.template">
-		<field name="code">521200</field>
-		<field name="parent_id" ref="chart521000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INTEREST EXPENSES ON LONG-TERM DEBT</field>
-	</record>
-
-	<record id="chart522000_en" model="account.account.template">
-		<field name="code">522000</field>
-		<field name="parent_id" ref="chart520000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
+		<field name="user_type" ref="user_type_view_en"/>
 		<field name="name">OTHER NON-OPERATING EXPENSES</field>
 	</record>
 
-	<!-- GAINS/LOSSES, CORPORATE TAXES AND OTHER ITEMS -->
-
-	<record id="chart600000_en" model="account.account.template">
-		<field name="code">600000</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">GAINS/LOSSES, CORPORATE TAXES AND OTHER ITEMS</field>
-	</record>
-
-	<record id="chart610000_en" model="account.account.template">
-		<field name="code">610000</field>
-		<field name="parent_id" ref="chart600000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">GAINS/LOSSES</field>
-	</record>
-
-	<record id="chart611000_en" model="account.account.template">
-		<field name="code">611000</field>
-		<field name="parent_id" ref="chart610000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">GAINS/LOSSES ON THE SALE OF ASSETS</field>
-	</record>
-
-	<record id="chart611100_en" model="account.account.template">
-		<field name="code">611100</field>
-		<field name="parent_id" ref="chart611000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">REALIZED GAINS/LOSSES - CAPITAL ASSETS</field>
-	</record>
-
-	<record id="chart611200_en" model="account.account.template">
-		<field name="code">611200</field>
-		<field name="parent_id" ref="chart611000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">REALIZED GAINS/LOSSES - INVESTMENTS</field>
-	</record>
-
-	<record id="chart611300_en" model="account.account.template">
-		<field name="code">611300</field>
-		<field name="parent_id" ref="chart611000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">REALIZED GAINS/LOSSES - OTHER ASSETS</field>
-	</record>
-
-	<record id="chart612000_en" model="account.account.template">
-		<field name="code">612000</field>
-		<field name="parent_id" ref="chart610000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">GAINS/LOSSES ON THE TRANSLATION OF FOREIGN CURRENCY</field>
-	</record>
-
-	<record id="chart613000_en" model="account.account.template">
-		<field name="code">613000</field>
-		<field name="parent_id" ref="chart610000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">UNREALIZED LOSSES ON ASSET REEVALUATIONS</field>
-	</record>
-
-	<record id="chart613100_en" model="account.account.template">
-		<field name="code">613100</field>
-		<field name="parent_id" ref="chart613000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">UNREALIZED LOSSES - CAPITAL ASSETS</field>
-	</record>
-
-	<record id="chart613200_en" model="account.account.template">
-		<field name="code">613200</field>
-		<field name="parent_id" ref="chart613000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">UNREALIZED LOSSES - INVESTMENTS</field>
-	</record>
-
-	<record id="chart613300_en" model="account.account.template">
-		<field name="code">613300</field>
-		<field name="parent_id" ref="chart613000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">UNREALIZED LOSSES - OTHER ASSETS</field>
-	</record>
-
-        <record id="chart614000_en" model="account.account.template">
-                <field name="code">614000</field>
-                <field name="parent_id" ref="chart610000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">GAINS ON SETTLEMENT OF PENSION OBLIGATION</field>
-        </record>
-
-        <record id="chart615000_en" model="account.account.template">
-                <field name="code">615000</field>
-                <field name="parent_id" ref="chart610000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">GAINS/LOSSES RELATED TO LITIGATION SETTLEMENT</field>
-        </record>
-
-        <record id="chart616000_en" model="account.account.template">
-                <field name="code">616000</field>
-                <field name="parent_id" ref="chart610000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">GAINS/LOSSES ON DERIVATIVE INSTRUMENTS</field>
-        </record>
-
-        <record id="chart620000_en" model="account.account.template">
-                <field name="code">620000</field>
-                <field name="parent_id" ref="chart600000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">CORPORATE INCOME TAX</field>
-        </record>
-
-        <record id="chart621000_en" model="account.account.template">
-                <field name="code">621000</field>
-                <field name="parent_id" ref="chart620000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">CURRENT INCOME TAX</field>
-        </record>
-
-        <record id="chart622000_en" model="account.account.template">
-                <field name="code">622000</field>
-                <field name="parent_id" ref="chart620000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">DEFERRED INCOME TAX</field>
-        </record>
-
-        <record id="chart623000_en" model="account.account.template">
-                <field name="code">623000</field>
-                <field name="parent_id" ref="chart620000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">PROVINCIAL MINING AND LOGGING TAXES</field>
-        </record>
-
-        <record id="chart630000_en" model="account.account.template">
-                <field name="code">630000</field>
-                <field name="parent_id" ref="chart600000_en"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_en" />
-                <field name="name">OTHER ITEMS</field>
-        </record>
-
-	<!-- EXTRAORDINARY GAINS/LOSSES, NON-RECURRING ITEMS AND ADJUSTMENTS -->
-
-	<record id="chart700000_en" model="account.account.template">
-		<field name="code">700000</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">EXTRAORDINARY GAINS/LOSSES, NON-RECURRING ITEMS AND ADJUSTMENTS</field>
-	</record>
-
-	<record id="chart710000_en" model="account.account.template">
-		<field name="code">710000</field>
-		<field name="parent_id" ref="chart700000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">EXTRAORDINARY GAINS/LOSSES</field>
-	</record>
-
-	<record id="chart711000_en" model="account.account.template">
-		<field name="code">711000</field>
-		<field name="parent_id" ref="chart710000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">EXTRAORDINARY ITEMS - GROSS</field>
-	</record>
-
-	<record id="chart712000_en" model="account.account.template">
-		<field name="code">712000</field>
-		<field name="parent_id" ref="chart710000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">INCOME TAX ON EXTRAORDINARY ITEMS</field>
-	</record>
-
-	<record id="chart720000_en" model="account.account.template">
-		<field name="code">720000</field>
-		<field name="parent_id" ref="chart700000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">NON-RECURRING ITEMS</field>
-	</record>
-
-	<record id="chart730000_en" model="account.account.template">
-		<field name="code">730000</field>
-		<field name="parent_id" ref="chart700000_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en" />
-		<field name="name">ADJUSTMENTS DUE TO CUMULATIVE EFFECT OF CHANGES IN ACCOUNTING PRINCIPLES</field>
-	</record>
-
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index 846c9ba47d5..b66dd5f02ba 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -12,1577 +12,661 @@
 
 	<!-- ACTIF -->
 
-	<record id="chart100000_fr" model="account.account.template">
-		<field name="code">100000</field>
+	<record id="chart1_fr" model="account.account.template">
+		<field name="code">1</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">ACTIF</field>
 	</record>
 	
-	<record id="chart110000_fr" model="account.account.template">
-		<field name="code">110000</field>
-		<field name="parent_id" ref="chart100000_fr"/>
+	<record id="chart11_fr" model="account.account.template">
+		<field name="code">11</field>
+		<field name="parent_id" ref="chart1_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS FINANCIERS</field>
+		<field name="name">ACTIFS COURANTS</field>
 	</record>
 	
-	<record id="chart111000_fr" model="account.account.template">
-		<field name="code">111000</field>
-		<field name="parent_id" ref="chart110000_fr"/>
+	<record id="chart111_fr" model="account.account.template">
+		<field name="code">111</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ENCAISSE, DÉPÔTS ET RÉSERVES INTERNATIONALES OFFICIELLES</field>
+		<field name="name">ENCAISSE</field>
 	</record>
 
-	<record id="chart111100_fr" model="account.account.template">
-		<field name="code">111100</field>
-		<field name="parent_id" ref="chart111000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ENCAISSE EN MONNAIE CANADIENNE</field>
-	</record>
-
-	<record id="chart111160_fr" model="account.account.template">
-		<field name="code">111160</field>
-		<field name="parent_id" ref="chart111100_fr"/>
+	<record id="chart1111_fr" model="account.account.template">
+		<field name="code">1111</field>
+		<field name="parent_id" ref="chart111_fr"/>
 		<field name="type">liquidity</field>
 		<field name="user_type" ref="user_type_immo_fr" />
 		<field name="name">Compte chèque</field>
 	</record>
 
-	<record id="chart111170_fr" model="account.account.template">
-		<field name="code">111170</field>
-		<field name="parent_id" ref="chart111100_fr"/>
+	<record id="chart1112_fr" model="account.account.template">
+		<field name="code">1112</field>
+		<field name="parent_id" ref="chart111_fr"/>
 		<field name="type">liquidity</field>
 		<field name="user_type" ref="user_type_immo_fr" />
 		<field name="name">Petite caisse</field>
 	</record>
 
-	<record id="chart111200_fr" model="account.account.template">
-		<field name="code">111200</field>
-		<field name="parent_id" ref="chart111000_fr"/>
+	<record id="chart112_fr" model="account.account.template">
+		<field name="code">112</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">DÉPÔTS À VUE/DÉPÔTS À PRÉAVIS DANS LES INSTITUTIONS DE DÉPÔTS</field>
+		<field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
 	</record>
 
-	<record id="chart111300_fr" model="account.account.template">
-		<field name="code">111300</field>
-		<field name="parent_id" ref="chart111000_fr"/>
+	<record id="chart113_fr" model="account.account.template">
+		<field name="code">113</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">DÉPÔTS À TERME - MOINS DE 90 JOURS</field>
+		<field name="name">CERTIFICATS DE DÉPÔTS</field>
 	</record>
 
-	<record id="chart111400_fr" model="account.account.template">
-		<field name="code">111400</field>
-		<field name="parent_id" ref="chart111000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES ÉQUIVALENTS DE TRÉSORERIE</field>
-	</record>
-
-	<record id="chart111500_fr" model="account.account.template">
-		<field name="code">111500</field>
-		<field name="parent_id" ref="chart111000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES COMPTES DE TRÉSORERIE</field>
-	</record>
-
-	<record id="chart112000_fr" model="account.account.template">
-		<field name="code">112000</field>
-		<field name="parent_id" ref="chart110000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">COMPTES DÉBITEURS - NET</field>
-	</record>
-
-	<record id="chart112100_fr" model="account.account.template">
-		<field name="code">112100</field>
-		<field name="parent_id" ref="chart112000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">COMPTES DÉBITEURS ET REVENUS COURUS - BRUT</field>
-	</record>
-
-	<record id="chart112110_fr" model="account.account.template">
-		<field name="code">112110</field>
-		<field name="parent_id" ref="chart112100_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
-		<field name="name">Comptes clients</field>
-	</record>
-
-	<record id="chart112200_fr" model="account.account.template">
-		<field name="code">112200</field>
-		<field name="parent_id" ref="chart112000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
-	</record>
-
-	<record id="chart113000_fr" model="account.account.template">
-		<field name="code">113000</field>
-		<field name="parent_id" ref="chart110000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PLACEMENTS DANS DES SOCIÉTÉS AFFILIÉES</field>
-	</record>
-
-	<record id="chart113100_fr" model="account.account.template">
-		<field name="code">113100</field>
-		<field name="parent_id" ref="chart113000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PLACEMENTS DANS DES SOCIÉTÉS AFFILIÉES CANADIENNES</field>
-	</record>
-
-	<record id="chart113200_fr" model="account.account.template">
-		<field name="code">113200</field>
-		<field name="parent_id" ref="chart113000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PLACEMENTS DANS DES SOCIÉTÉS AFFILIÉES ÉTRANGÈRES</field>
-	</record>
-
-	<record id="chart113300_fr" model="account.account.template">
-		<field name="code">113300</field>
-		<field name="parent_id" ref="chart113000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS, BILLETS, COMPTES DÉBITEURS, OBLIGATIONS, HYPOTHÈQUES ET AUTRES PLACEMENTS</field>
-	</record>
-
-	<record id="chart114000_fr" model="account.account.template">
-		<field name="code">114000</field>
-		<field name="parent_id" ref="chart110000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PLACEMENTS DANS DES ENTREPRISES NON AFFILIÉES</field>
-	</record>
-
-	<record id="chart114100_fr" model="account.account.template">
-		<field name="code">114100</field>
-		<field name="parent_id" ref="chart114000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PLACEMENTS EN TITRES D'EMPRUNT CANADIENS</field>
-	</record>
-
-	<record id="chart114200_fr" model="account.account.template">
-		<field name="code">114200</field>
-		<field name="parent_id" ref="chart114000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PLACEMENTS EN INSTRUMENTS DE CAPITAUX PROPRES CANADIENS</field>
-	</record>
-
-	<record id="chart114300_fr" model="account.account.template">
-		<field name="code">114300</field>
-		<field name="parent_id" ref="chart114000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PLACEMENTS DANS DES SOCIÉTÉS NON AFFILIÉES ÉTRANGÈRES</field>
-	</record>
-
-	<record id="chart115000_fr" model="account.account.template">
-		<field name="code">115000</field>
-		<field name="parent_id" ref="chart110000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS HYPOTHÉCAIRES AUX SOCIÉTÉS NON AFFILIÉES</field>
-	</record>
-
-	<record id="chart115100_fr" model="account.account.template">
-		<field name="code">115100</field>
-		<field name="parent_id" ref="chart115000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS HYPOTHÉCAIRES AUX SOCIÉTÉS NON AFFILIÉES GARANTIS PAR DES PROPRIÉTÉS AU CANADA</field>
-	</record>
-
-	<record id="chart115200_fr" model="account.account.template">
-		<field name="code">115200</field>
-		<field name="parent_id" ref="chart115000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS HYPOTHÉCAIRES AUX SOCIÉTÉS NON AFFILIÉES GARANTIS PAR UNE PROPRIÉTÉ À L'EXTÉRIEUR DU CANADA</field>
-	</record>
-
-	<record id="chart116000_fr" model="account.account.template">
-		<field name="code">116000</field>
-		<field name="parent_id" ref="chart110000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS NON HYPOTHÉCAIRES AUX SOCIÉTÉS NON AFFILIÉES</field>
-	</record>
-
-	<record id="chart116100_fr" model="account.account.template">
-		<field name="code">116100</field>
-		<field name="parent_id" ref="chart116000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS NON HYPOTHÉCAIRES CONSENTIS PAR DES ENTREPRISES NON FINANCIÈRES</field>
-	</record>
-
-	<record id="chart116200_fr" model="account.account.template">
-		<field name="code">116200</field>
-		<field name="parent_id" ref="chart116000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PROVISION POUR PERTES SUR PRÊTS NON HYPOTHÉCAIRES</field>
-	</record>
-
-	<record id="chart117000_fr" model="account.account.template">
-		<field name="code">117000</field>
-		<field name="parent_id" ref="chart110000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS DÉRIVÉS</field>
-	</record>
-
-	<record id="chart117100_fr" model="account.account.template">
-		<field name="code">117100</field>
-		<field name="parent_id" ref="chart117000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS DÉRIVÉS - CONTREPARTIES RÉSIDENTES</field>
-	</record>
-
-	<record id="chart117200_fr" model="account.account.template">
-		<field name="code">117200</field>
-		<field name="parent_id" ref="chart117000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS DÉRIVÉS - CONTREPARTIES NON RÉSIDENTES</field>
-	</record>
-
-	<record id="chart120000_fr" model="account.account.template">
-		<field name="code">120000</field>
-		<field name="parent_id" ref="chart100000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS CORPORELS</field>
-	</record>
-
-	<record id="chart121000_fr" model="account.account.template">
-		<field name="code">121000</field>
-		<field name="parent_id" ref="chart120000_fr"/>
+	<record id="chart114_fr" model="account.account.template">
+		<field name="code">114</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">STOCKS</field>
 	</record>
 
-	<record id="chart121100_fr" model="account.account.template">
-		<field name="code">121100</field>
-		<field name="parent_id" ref="chart121000_fr"/>
+	<record id="chart115_fr" model="account.account.template">
+		<field name="code">115</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">STOCKS DE BIENS</field>
+		<field name="name">COMPTES CLIENTS</field>
 	</record>
 
-	<record id="chart121200_fr" model="account.account.template">
-		<field name="code">121200</field>
-		<field name="parent_id" ref="chart121000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">STOCKS DE PIÈCES ET FOURNITURES</field>
+	<record id="chart1151_fr" model="account.account.template">
+		<field name="code">1151</field>
+		<field name="parent_id" ref="chart115_fr"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="reconcile" eval="True"/>
+		<field name="name">Comptes clients</field>
 	</record>
 
-	<record id="chart121300_fr" model="account.account.template">
-		<field name="code">121300</field>
-		<field name="parent_id" ref="chart121000_fr"/>
+	<record id="chart1152_fr" model="account.account.template">
+		<field name="code">1152</field>
+		<field name="parent_id" ref="chart115_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">BIENS IMMOBILIERS DÉTENUS OU EN COURS D'AMÉNAGEMENT EN VUE DE LA VENTE</field>
+		<field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
 	</record>
 
-	<record id="chart122000_fr" model="account.account.template">
-		<field name="code">122000</field>
-		<field name="parent_id" ref="chart120000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PROVISION POUR OBSOLESCENCE ET DÉVALUATION</field>
-	</record>
-
-	<record id="chart123000_fr" model="account.account.template">
-		<field name="code">123000</field>
-		<field name="parent_id" ref="chart120000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ANIMAUX DE REPRODUCTION</field>
-	</record>
-
-	<record id="chart124000_fr" model="account.account.template">
-		<field name="code">124000</field>
-		<field name="parent_id" ref="chart120000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS IMMOBILISÉS</field>
-	</record>
-
-	<record id="chart124100_fr" model="account.account.template">
-		<field name="code">124100</field>
-		<field name="parent_id" ref="chart124000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">IMMOBILISATIONS CORPORELLES - NETS</field>
-	</record>
-
-	<record id="chart124200_fr" model="account.account.template">
-		<field name="code">124200</field>
-		<field name="parent_id" ref="chart124000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS NON RENOUVELABLES - NETS</field>
-	</record>
- 
-	<record id="chart124300_fr" model="account.account.template">
-		<field name="code">124300</field>
-		<field name="parent_id" ref="chart124000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">REPRISE DE POSSESSION D'IMMOBILISATIONS DESTINÉES À LA VENTE</field>
-	</record>
- 
-	<record id="chart130000_fr" model="account.account.template">
-		<field name="code">130000</field>
-		<field name="parent_id" ref="chart100000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">FRAIS REPORTÉS ET ACTIFS INCORPORELS</field>
-	</record>
-
-	<record id="chart131000_fr" model="account.account.template">
-		<field name="code">131000</field>
-		<field name="parent_id" ref="chart130000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">FRAIS REPORTÉS ET CHARGES PAYÉES D'AVANCE</field>
-	</record>
-
-	<record id="chart131100_fr" model="account.account.template">
-		<field name="code">131100</field>
-		<field name="parent_id" ref="chart131000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">FRAIS REPORTÉS - NETS</field>
-	</record>
-
-	<record id="chart131200_fr" model="account.account.template">
-		<field name="code">131200</field>
-		<field name="parent_id" ref="chart131000_fr"/>
+	<record id="chart116_fr" model="account.account.template">
+		<field name="code">116</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">FRAIS PAYÉS D'AVANCE</field>
 	</record>
 
-	<record id="chart132000_fr" model="account.account.template">
-		<field name="code">132000</field>
-		<field name="parent_id" ref="chart130000_fr"/>
+	<record id="chart117_fr" model="account.account.template">
+		<field name="code">117</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIFS INCORPORELS - NETS</field>
+		<field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
 	</record>
 
-	<record id="chart132100_fr" model="account.account.template">
-		<field name="code">132100</field>
-		<field name="parent_id" ref="chart132000_fr"/>
+	<record id="chart118_fr" model="account.account.template">
+		<field name="code">118</field>
+		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACHALANDAGE - NET</field>
+		<field name="name">IMPÔTS À RECEVOIR</field>
 	</record>
 
-	<record id="chart132200_fr" model="account.account.template">
-		<field name="code">132200</field>
-		<field name="parent_id" ref="chart132000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">LOGICIELS</field>
+	<record id="chart1181_fr" model="account.account.template">
+		<field name="code">1181</field>
+		<field name="parent_id" ref="chart118_fr"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="reconcile" eval="True"/>
+		<field name="name">TPS à recevoir</field>
 	</record>
 
-	<record id="chart132300_fr" model="account.account.template">
-		<field name="code">132300</field>
-		<field name="parent_id" ref="chart132000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">BASES DE DONNÉES</field>
+	<record id="chart1182_fr" model="account.account.template">
+		<field name="code">1182</field>
+		<field name="parent_id" ref="chart118_fr"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="reconcile" eval="True"/>
+		<field name="name">TVP/TVQ à recevoir</field>
 	</record>
 
-	<record id="chart132400_fr" model="account.account.template">
-		<field name="code">132400</field>
-		<field name="parent_id" ref="chart132000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">EXCÉDENT DU PRIX D'ACHAT D'ACTIONS D'UNE FILIALE CONSOLIDÉE</field>
+	<record id="chart1183_fr" model="account.account.template">
+		<field name="code">1183</field>
+		<field name="parent_id" ref="chart118_fr"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="reconcile" eval="True"/>
+		<field name="name">TVH à recevoir</field>
 	</record>
 
-	<record id="chart132500_fr" model="account.account.template">
-		<field name="code">132500</field>
-		<field name="parent_id" ref="chart132000_fr"/>
+	<record id="chart15_fr" model="account.account.template">
+		<field name="code">15</field>
+		<field name="parent_id" ref="chart1_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS - NETS</field>
+		<field name="name">ACTIFS NON-COURANTS</field>
 	</record>
 
-	<record id="chart132600_fr" model="account.account.template">
-		<field name="code">132600</field>
-		<field name="parent_id" ref="chart132000_fr"/>
+	<record id="chart151_fr" model="account.account.template">
+		<field name="code">151</field>
+		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES ACTIFS INCORPORELS</field>
+		<field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
 	</record>
 
-	<record id="chart140000_fr" model="account.account.template">
-		<field name="code">140000</field>
-		<field name="parent_id" ref="chart100000_fr"/>
+	<record id="chart152_fr" model="account.account.template">
+		<field name="code">152</field>
+		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES ÉLÉMENTS D'ACTIF</field>
+		<field name="name">IMMOBILISATIONS CORPORELLES</field>
 	</record>
 
-	<record id="chart141000_fr" model="account.account.template">
-		<field name="code">141000</field>
-		<field name="parent_id" ref="chart140000_fr"/>
+	<record id="chart1527_fr" model="account.account.template">
+		<field name="code">1527</field>
+		<field name="parent_id" ref="chart152_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">RÉGIMES DE RETRAITE</field>
+		<field name="name">AMORTISSEMENTS CUMULÉS</field>
 	</record>
 
-	<record id="chart142000_fr" model="account.account.template">
-		<field name="code">142000</field>
-		<field name="parent_id" ref="chart140000_fr"/>
+	<record id="chart153_fr" model="account.account.template">
+		<field name="code">153</field>
+		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">TOUT AUTRE ÉLÉMENT D'ACTIF</field>
+		<field name="name">IMMOBILISATIONS INCORPORELLES</field>
 	</record>
 
-	<record id="chart142100_fr" model="account.account.template">
-		<field name="code">142100</field>
-		<field name="parent_id" ref="chart142000_fr"/>
+	<record id="chart1531_fr" model="account.account.template">
+		<field name="code">1531</field>
+		<field name="parent_id" ref="chart153_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES DÉPÔTS</field>
-	</record>
-
-	<record id="chart142200_fr" model="account.account.template">
-		<field name="code">142200</field>
-		<field name="parent_id" ref="chart142000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">TOUT AUTRE ACTIF, SAUF AUTRES DÉPÔTS</field>
+		<field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
 	</record>
 
 	<!-- PASSIF -->
 
-	<record id="chart200000_fr" model="account.account.template">
-		<field name="code">200000</field>
+	<record id="chart2_fr" model="account.account.template">
+		<field name="code">2</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">PASSIF</field>
 	</record>
 
-	<record id="chart210000_fr" model="account.account.template">
-		<field name="code">210000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
+	<record id="chart21_fr" model="account.account.template">
+		<field name="code">21</field>
+		<field name="parent_id" ref="chart2_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">INSTRUMENTS FINANCIERS ET EMPRUNTS</field>
+		<field name="name">PASSIFS COURANTS</field>
 	</record>
 
-	<record id="chart211000_fr" model="account.account.template">
-		<field name="code">211000</field>
-		<field name="parent_id" ref="chart210000_fr"/>
+	<record id="chart211_fr" model="account.account.template">
+		<field name="code">211</field>
+		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS HYPOTHÉCAIRES</field>
+		<field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
 	</record>
 
-	<record id="chart211100_fr" model="account.account.template">
-		<field name="code">211100</field>
-		<field name="parent_id" ref="chart211000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS HYPOTHÉCAIRES RÉSIDENTIELS</field>
-	</record>
-
-	<record id="chart211200_fr" model="account.account.template">
-		<field name="code">211200</field>
-		<field name="parent_id" ref="chart211000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS HYPOTHÉCAIRES NON RÉSIDENTIELS</field>
-	</record>
-
-	<record id="chart212000_fr" model="account.account.template">
-		<field name="code">212000</field>
-		<field name="parent_id" ref="chart210000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS NON HYPOTHÉCAIRES</field>
-	</record>
-
-	<record id="chart212100_fr" model="account.account.template">
-		<field name="code">212100</field>
-		<field name="parent_id" ref="chart212000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS NON HYPOTHÉCAIRES ET PRÊTS DE BANQUE</field>
-	</record>
-
-	<record id="chart212200_fr" model="account.account.template">
-		<field name="code">212200</field>
-		<field name="parent_id" ref="chart212000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS NON HYPOTHÉCAIRES, PRÊTS AUPRÈS D'AUTRES SOCIÉTÉS DE FINANCEMENT CANADIENNES</field>
-	</record>
-
-	<record id="chart212300_fr" model="account.account.template">
-		<field name="code">212300</field>
-		<field name="parent_id" ref="chart212000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS NON HYPOTHÉCAIRES, PRÊTS AUPRÈS D"AUTRES ENTITÉS</field>
-	</record>
-
-	<record id="chart212400_fr" model="account.account.template">
-		<field name="code">212400</field>
-		<field name="parent_id" ref="chart212000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PRÊTS NON HYPOTHÉCAIRES, BILLETS PORTANT PRIVILÈGE À PAYER</field>
-	</record>
-
-	<record id="chart212500_fr" model="account.account.template">
-		<field name="code">212500</field>
-		<field name="parent_id" ref="chart212000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">OBLIGATIONS - CONTRATS DE LOCATION-ACQUISITION OU CRÉDIT-BAIL</field>
-	</record>
-
-	<record id="chart213000_fr" model="account.account.template">
-		<field name="code">213000</field>
-		<field name="parent_id" ref="chart210000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">TITRES DE CRÉANCE</field>
-	</record>
-
-	<record id="chart213100_fr" model="account.account.template">
-		<field name="code">213100</field>
-		<field name="parent_id" ref="chart213000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">TITRES DE CRÉANCE, EFFETS À COURT TERME, EFFETS DE COMMERCE, EFFETS DE SOCIÉTÉ DE FINANCEMENT ET ACCEPTATIONS BANCAIRES</field>
-	</record>
-
-	<record id="chart213200_fr" model="account.account.template">
-		<field name="code">213200</field>
-		<field name="parent_id" ref="chart213000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">TITRES DE CRÉANCE, OBLIGATIONS, DÉBENTURES ET BILLETS</field>
-	</record>
-
-	<record id="chart214000_fr" model="account.account.template">
-		<field name="code">214000</field>
-		<field name="parent_id" ref="chart210000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PASSIFS DÉRIVÉS</field>
-	</record>
-
-	<record id="chart214100_fr" model="account.account.template">
-		<field name="code">214100</field>
-		<field name="parent_id" ref="chart214000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PASSIFS DÉRIVÉS AVEC CONTREPARTIES RÉSIDENTES</field>
-	</record>
-
-	<record id="chart214200_fr" model="account.account.template">
-		<field name="code">214200</field>
-		<field name="parent_id" ref="chart214000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PASSIFS DÉRIVÉS AVEC CONTREPARTIES NON RÉSIDENTES</field>
-	</record>
-
-	<record id="chart220000_fr" model="account.account.template">
-		<field name="code">220000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">CRÉANCES</field>
-	</record>
-
-	<record id="chart221000_fr" model="account.account.template">
-		<field name="code">221000</field>
-		<field name="parent_id" ref="chart220000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">COMPTES CRÉDITEURS ET CHARGES À PAYER</field>
-	</record>
-
-	<record id="chart221100_fr" model="account.account.template">
-		<field name="code">221100</field>
-		<field name="parent_id" ref="chart221000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">COMPTES CRÉDITEURS, COMMERCES</field>
-	</record>
-
-	<record id="chart221110_fr" model="account.account.template">
-		<field name="code">221110</field>
-		<field name="parent_id" ref="chart221100_fr"/>
+	<record id="chart2111_fr" model="account.account.template">
+		<field name="code">2111</field>
+		<field name="parent_id" ref="chart211_fr"/>
 		<field name="type">payable</field>
 		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="reconcile" eval="True"/>
 		<field name="name">Comptes fournisseurs</field>
 	</record>
 
-	<record id="chart221200_fr" model="account.account.template">
-		<field name="code">221200</field>
-		<field name="parent_id" ref="chart221000_fr"/>
+	<record id="chart212_fr" model="account.account.template">
+		<field name="code">212</field>
+		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES COMPTES CRÉDITEURS ET CHARGES À PAYER</field>
+		<field name="name">AUTRES COMPTES CRÉDITEURS</field>
 	</record>
 
-	<record id="chart222000_fr" model="account.account.template">
-		<field name="code">222000</field>
-		<field name="parent_id" ref="chart220000_fr"/>
+	<record id="chart213_fr" model="account.account.template">
+		<field name="code">213</field>
+		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">CRÉANCES DE SOCIÉTÉS AFFILIÉES</field>
+		<field name="name">IMPÔTS À PAYER</field>
 	</record>
 
-	<record id="chart222100_fr" model="account.account.template">
-		<field name="code">222100</field>
-		<field name="parent_id" ref="chart222000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">SOMMES DUES AUX ACTIONNAIRES, AUX ADMINISTRATEURS ET AUX DIRIGEANTS</field>
-	</record>
-
-	<record id="chart222200_fr" model="account.account.template">
-		<field name="code">222200</field>
-		<field name="parent_id" ref="chart222000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">SOMMES DUES À LA SOCIÉTÉ MÈRE, AUX FILIALES, AUX SOCIÉTÉS LIÉES, AUX COENTREPRISES ET AUX SOCIÉTÉS DE PERSONNES</field>
-	</record>
-
-	<record id="chart240000_fr" model="account.account.template">
-		<field name="code">240000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PASSIFS D'IMPÔTS FUTURS</field>
-	</record>
-
-	<record id="chart241000_fr" model="account.account.template">
-		<field name="code">241000</field>
-		<field name="parent_id" ref="chart240000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">TAXES À PAYER</field>
-	</record>
-
-	<record id="chart241100_fr" model="account.account.template">
-		<field name="code">241100</field>
-		<field name="parent_id" ref="chart241000_fr"/>
+	<record id="chart2131_fr" model="account.account.template">
+		<field name="code">2131</field>
+		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">payable</field>
 		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="reconcile" eval="True"/>
 		<field name="name">TPS à payer</field>
 	</record>
 
-	<record id="chart241200_fr" model="account.account.template">
-		<field name="code">241200</field>
-		<field name="parent_id" ref="chart241000_fr"/>
+	<record id="chart2132_fr" model="account.account.template">
+		<field name="code">2132</field>
+		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">payable</field>
 		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="reconcile" eval="True"/>
 		<field name="name">TVP/TVQ à payer</field>
 	</record>
 
-	<record id="chart241300_fr" model="account.account.template">
-		<field name="code">241300</field>
-		<field name="parent_id" ref="chart241000_fr"/>
+	<record id="chart2133_fr" model="account.account.template">
+		<field name="code">2133</field>
+		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">payable</field>
 		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="reconcile" eval="True"/>
 		<field name="name">TVH à payer</field>
 	</record>
 
-	<record id="chart242000_fr" model="account.account.template">
-		<field name="code">242000</field>
-		<field name="parent_id" ref="chart240000_fr"/>
+	<record id="chart214_fr" model="account.account.template">
+		<field name="code">214</field>
+		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">TAXES À RECEVOIR</field>
+		<field name="name">DETTES FINANCIÈRES COURANTES</field>
 	</record>
 
-	<record id="chart242100_fr" model="account.account.template">
-		<field name="code">242100</field>
-		<field name="parent_id" ref="chart242000_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
-		<field name="name">TPS à recevoir</field>
-	</record>
-
-	<record id="chart242200_fr" model="account.account.template">
-		<field name="code">242200</field>
-		<field name="parent_id" ref="chart242000_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
-		<field name="name">TVP/TVQ à recevoir</field>
-	</record>
-
-	<record id="chart242300_fr" model="account.account.template">
-		<field name="code">242300</field>
-		<field name="parent_id" ref="chart242000_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
-		<field name="name">TVH à recevoir</field>
-	</record>
-
-	<record id="chart245000_fr" model="account.account.template">
-		<field name="code">245000</field>
-		<field name="parent_id" ref="chart240000_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
-		<field name="name">Indemnités de vacances à payer</field>
-	</record>
-
-	<record id="chart246000_fr" model="account.account.template">
-		<field name="code">246000</field>
-		<field name="parent_id" ref="chart240000_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
-		<field name="name">CSST à payer</field>
-	</record>
-
-	<record id="chart247000_fr" model="account.account.template">
-		<field name="code">247000</field>
-		<field name="parent_id" ref="chart240000_fr"/>
+	<record id="chart215_fr" model="account.account.template">
+		<field name="code">215</field>
+		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">RETENUES SUR SALAIRE</field>
+		<field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
 	</record>
 
-	<record id="chart247100_fr" model="account.account.template">
-		<field name="code">247100</field>
-		<field name="parent_id" ref="chart247000_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
-		<field name="name">Assurance-emploi à payer</field>
-	</record>
-
-	<record id="chart247200_fr" model="account.account.template">
-		<field name="code">247200</field>
-		<field name="parent_id" ref="chart247000_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
-		<field name="name">RRQ à payer</field>
-	</record>
-
-	<record id="chart247300_fr" model="account.account.template">
-		<field name="code">247300</field>
-		<field name="parent_id" ref="chart247000_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
-		<field name="name">Impôt sur le revenu à payer</field>
-	</record>
-
-	<record id="chart250000_fr" model="account.account.template">
-		<field name="code">250000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
+	<record id="chart25_fr" model="account.account.template">
+		<field name="code">25</field>
+		<field name="parent_id" ref="chart2_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">INTÉRÊTS MINORITAIRES DANS LES FILIALES CONSOLIDÉES</field>
+		<field name="name">PASSIFS NON-COURANTS</field>
 	</record>
 
-	<record id="chart260000_fr" model="account.account.template">
-		<field name="code">260000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
+	<record id="chart251_fr" model="account.account.template">
+		<field name="code">251</field>
+		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">RÉGIMES DE RETRAITE ET RÉGIME DE PARTICIPATION DIFFÉRÉE AUX BÉNÉFICES</field>
+		<field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
 	</record>
 
-	<record id="chart270000_fr" model="account.account.template">
-		<field name="code">270000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
+	<record id="chart252_fr" model="account.account.template">
+		<field name="code">252</field>
+		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PROVISION POUR OBLIGATIONS FUTURES</field>
+		<field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
 	</record>
 
-	<record id="chart280000_fr" model="account.account.template">
-		<field name="code">280000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
+	<record id="chart253_fr" model="account.account.template">
+		<field name="code">253</field>
+		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">DÉPÔTS DE CLIENTS, REVENUS REPORTÉS</field>
+		<field name="name">IMPÔTS DIFFÉRÉS</field>
 	</record>
 
-	<record id="chart290000_fr" model="account.account.template">
-		<field name="code">290000</field>
-		<field name="parent_id" ref="chart200000_fr"/>
+	<record id="chart254_fr" model="account.account.template">
+		<field name="code">254</field>
+		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES ÉLÉMENTS DE PASSIF</field>
+		<field name="name">AUTRES PASSIFS NON-COURANTS</field>
 	</record>
 
 	<!-- CAPITAUX PROPRES -->
 
-	<record id="chart300000_fr" model="account.account.template">
-		<field name="code">300000</field>
+	<record id="chart3_fr" model="account.account.template">
+		<field name="code">3</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">CAPITAUX PROPRES</field>
 	</record>
 
-	<record id="chart310000_fr" model="account.account.template">
-		<field name="code">310000</field>
-		<field name="parent_id" ref="chart300000_fr"/>
+	<record id="chart31_fr" model="account.account.template">
+		<field name="code">31</field>
+		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">CAPITAL-ACTIONS</field>
 	</record>
 
-	<record id="chart311000_fr" model="account.account.template">
-		<field name="code">311000</field>
-		<field name="parent_id" ref="chart310000_fr"/>
+	<record id="chart32_fr" model="account.account.template">
+		<field name="code">32</field>
+		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS PRIVILÉGIÉES</field>
+		<field name="name">PRIMES</field>
 	</record>
 
-	<record id="chart311100_fr" model="account.account.template">
-		<field name="code">311100</field>
-		<field name="parent_id" ref="chart311000_fr"/>
+	<record id="chart33_fr" model="account.account.template">
+		<field name="code">33</field>
+		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS PRIVILÉGIÉES - NOUVELLES ÉMISSIONS</field>
+		<field name="name">BÉNÉFICES NON RÉPARTIS</field>
 	</record>
 
-	<record id="chart311200_fr" model="account.account.template">
-		<field name="code">311200</field>
-		<field name="parent_id" ref="chart311000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS PRIVILÉGIÉES - NOUVELLES ÉMISSIONS (PLANS DE RÉINVESTISSEMENT DES DIVIDENDES)</field>
-	</record>
-
-	<record id="chart311300_fr" model="account.account.template">
-		<field name="code">311300</field>
-		<field name="parent_id" ref="chart311000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS PRIVILÉGIÉES - RACHATS ET REMBOURSEMENTS</field>
-	</record>
-
-	<record id="chart312000_fr" model="account.account.template">
-		<field name="code">312000</field>
-		<field name="parent_id" ref="chart310000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS ORDINAIRES</field>
-	</record>
-
-	<record id="chart312100_fr" model="account.account.template">
-		<field name="code">312100</field>
-		<field name="parent_id" ref="chart312000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS ORDINAIRES - NOUVELLES ÉMISSIONS</field>
-	</record>
-
-	<record id="chart312200_fr" model="account.account.template">
-		<field name="code">312200</field>
-		<field name="parent_id" ref="chart312000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS ORDINAIRES - NOUVELLES ÉMISSIONS (PLANS DE RÉINVESTISSEMENT DES DIVIDENDES)</field>
-	</record>
-
-	<record id="chart312300_fr" model="account.account.template">
-		<field name="code">312300</field>
-		<field name="parent_id" ref="chart312000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACTIONS ORDINAIRES - RACHATS ET REMBOURSEMENTS</field>
-	</record>
-
-	<record id="chart313000_fr" model="account.account.template">
-		<field name="code">313000</field>
-		<field name="parent_id" ref="chart310000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AVOIR PROPRE</field>
-	</record>
-
-	<record id="chart314000_fr" model="account.account.template">
-		<field name="code">314000</field>
-		<field name="parent_id" ref="chart310000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES ACTIONS</field>
-	</record>
-
-	<record id="chart320000_fr" model="account.account.template">
-		<field name="code">320000</field>
-		<field name="parent_id" ref="chart300000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">BÉNÉFICES NON RÉPARTIS / DÉFICITS</field>
-	</record>
-
-	<record id="chart321000_fr" model="account.account.template">
-		<field name="code">321000</field>
-		<field name="parent_id" ref="chart320000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">BÉNÉFICES NON RÉPARTIS / DÉFICITS, AFFECTÉS</field>
-	</record>
-
-	<record id="chart322000_fr" model="account.account.template">
-		<field name="code">322000</field>
-		<field name="parent_id" ref="chart320000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">BÉNÉFICES NON RÉPARTIS / DÉFICITS, NON AFFECTÉS</field>
-	</record>
-
-	<record id="chart330000_fr" model="account.account.template">
-		<field name="code">330000</field>
-		<field name="parent_id" ref="chart300000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">SURPLUS D'APPORT</field>
-	</record>
-
-	<record id="chart340000_fr" model="account.account.template">
-		<field name="code">340000</field>
-		<field name="parent_id" ref="chart300000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES SURPLUS</field>
-	</record>
-
-	<!-- REVENUS -->
-
-	<record id="chart400000_fr" model="account.account.template">
-		<field name="code">400000</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">REVENUS</field>
-	</record>
-
-	<record id="chart410000_fr" model="account.account.template">
-		<field name="code">410000</field>
-		<field name="parent_id" ref="chart400000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">REVENUS D'EXPLOITATION</field>
-	</record>
-
-	<record id="chart411000_fr" model="account.account.template">
-		<field name="code">411000</field>
-		<field name="parent_id" ref="chart410000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">VENTES DE BIENS ET DE SERVICES</field>
-	</record>
-
-	<record id="chart411100_fr" model="account.account.template">
-		<field name="code">411100</field>
-		<field name="parent_id" ref="chart411000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">VENTES DE BIENS</field>
-	</record>
-
-	<record id="chart411110_fr" model="account.account.template">
-		<field name="code">411110</field>
-		<field name="parent_id" ref="chart411100_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes au Québec</field>
-	</record>
-
-	<record id="chart411120_fr" model="account.account.template">
-		<field name="code">411120</field>
-		<field name="parent_id" ref="chart411100_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes avec des provinces harmonisées</field>
-	</record>
-	
-	<record id="chart411130_fr" model="account.account.template">
-		<field name="code">411130</field>
-		<field name="parent_id" ref="chart411100_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes avec des provinces non-harmonisées</field>
-	</record>
-
-	<record id="chart411140_fr" model="account.account.template">
-		<field name="code">411140</field>
-		<field name="parent_id" ref="chart411100_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes à l'étranger</field>
-	</record>
-
-	<record id="chart411200_fr" model="account.account.template">
-		<field name="code">411200</field>
-		<field name="parent_id" ref="chart411000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">VENTES DE SERVICES</field>
-	</record>
-
-	<record id="chart411210_fr" model="account.account.template">
-		<field name="code">411210</field>
-		<field name="parent_id" ref="chart411200_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes au Québec</field>
-	</record>
-
-	<record id="chart411220_fr" model="account.account.template">
-		<field name="code">411220</field>
-		<field name="parent_id" ref="chart411200_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes avec des provinces harmonisées</field>
-	</record>
-	
-	<record id="chart411230_fr" model="account.account.template">
-		<field name="code">411230</field>
-		<field name="parent_id" ref="chart411200_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes avec des provinces non-harmonisées</field>
-	</record>
-
-	<record id="chart411240_fr" model="account.account.template">
-		<field name="code">411240</field>
-		<field name="parent_id" ref="chart411200_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr" />
-		<field name="name">Ventes à l'étranger</field>
-	</record>
-
-	<record id="chart413000_fr" model="account.account.template">
-		<field name="code">413000</field>
-		<field name="parent_id" ref="chart410000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES REVENUS D'EXPLOITATION</field>
-	</record>
-
-	<record id="chart413100_fr" model="account.account.template">
-		<field name="code">413100</field>
-		<field name="parent_id" ref="chart413000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">SUBVENTIONS ET OCTROIS</field>
-	</record>
-
-	<record id="chart413200_fr" model="account.account.template">
-		<field name="code">413200</field>
-		<field name="parent_id" ref="chart413000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">REDEVANCES DE FRANCHISAGE ET AUTRES REDEVANCES</field>
-	</record>
-
-	<record id="chart413300_fr" model="account.account.template">
-		<field name="code">413300</field>
-		<field name="parent_id" ref="chart413000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES REVENUS D'EXPLOITATION</field>
-	</record>
-
-	<record id="chart420000_fr" model="account.account.template">
-		<field name="code">420000</field>
-		<field name="parent_id" ref="chart400000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">REVENUS NON LIÉS À L'EXPLOITATION</field>
-	</record>
-
-	<record id="chart421000_fr" model="account.account.template">
-		<field name="code">421000</field>
-		<field name="parent_id" ref="chart420000_fr"/>
+	<record id="chart34_fr" model="account.account.template">
+		<field name="code">34</field>
+		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">DIVIDENDES</field>
 	</record>
 
-	<record id="chart421100_fr" model="account.account.template">
-		<field name="code">421100</field>
-		<field name="parent_id" ref="chart421000_fr"/>
+	<record id="chart35_fr" model="account.account.template">
+		<field name="code">35</field>
+		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">DIVIDENDES DE SOCIÉTÉS CANADIENNES</field>
+		<field name="name">ÉCARTS DE CONVERSION</field>
 	</record>
 
-	<record id="chart421200_fr" model="account.account.template">
-		<field name="code">421200</field>
-		<field name="parent_id" ref="chart421000_fr"/>
+	<record id="chart36_fr" model="account.account.template">
+		<field name="code">36</field>
+		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">DIVIDENDES DE SOCIÉTÉS ÉTRANGÈRES</field>
+		<field name="name">SURPLUS D'APPORT</field>
 	</record>
 
-	<record id="chart422000_fr" model="account.account.template">
-		<field name="code">422000</field>
-		<field name="parent_id" ref="chart420000_fr"/>
+	<record id="chart39_fr" model="account.account.template">
+		<field name="code">39</field>
+		<field name="parent_id" ref="chart3_fr"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_fr" />
+		<field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
+	</record>
+
+        <!-- PRODUITS -->
+
+	<record id="chart4_fr" model="account.account.template">
+		<field name="code">4</field>
+		<field name="parent_id" ref="chart0_fr"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_fr" />
+		<field name="name">PRODUITS</field>
+	</record>
+
+	<record id="chart41_fr" model="account.account.template">
+		<field name="code">41</field>
+		<field name="parent_id" ref="chart4_fr"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_fr" />
+		<field name="name">PRODUITS D'EXPLOITATION</field>
+	</record>
+
+	<record id="chart411_fr" model="account.account.template">
+		<field name="code">411</field>
+		<field name="parent_id" ref="chart41_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="name">Ventes</field>
+	</record>
+
+	<record id="chart412_fr" model="account.account.template">
+		<field name="code">412</field>
+		<field name="parent_id" ref="chart41_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="name">Ventes avec des provinces harmonisées</field>
+	</record>
+	
+	<record id="chart413_fr" model="account.account.template">
+		<field name="code">413</field>
+		<field name="parent_id" ref="chart41_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="name">Ventes avec des provinces non-harmonisées</field>
+	</record>
+
+	<record id="chart414_fr" model="account.account.template">
+		<field name="code">414</field>
+		<field name="parent_id" ref="chart41_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="name">Ventes à l'étranger</field>
+	</record>
+
+	<record id="chart419_fr" model="account.account.template">
+		<field name="code">419</field>
+		<field name="parent_id" ref="chart41_fr"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_fr" />
+		<field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
+	</record>
+
+	<record id="chart42_fr" model="account.account.template">
+		<field name="code">42</field>
+		<field name="parent_id" ref="chart4_fr"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="user_type_view_fr" />
+		<field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
+	</record>
+
+	<record id="chart425_fr" model="account.account.template">
+		<field name="code">425</field>
+		<field name="parent_id" ref="chart42_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">INTÉRÊTS</field>
 	</record>
 
-	<record id="chart422100_fr" model="account.account.template">
-		<field name="code">422100</field>
-		<field name="parent_id" ref="chart422000_fr"/>
+	<record id="chart429_fr" model="account.account.template">
+		<field name="code">429</field>
+		<field name="parent_id" ref="chart42_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">INTÉRÊTS DE SOURCE CANADIENNE</field>
+		<field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
-	<record id="chart422200_fr" model="account.account.template">
-		<field name="code">422200</field>
-		<field name="parent_id" ref="chart422000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">INTÉRÊTS DE SOURCES ÉTRANGÈRES</field>
-	</record>
+	<!-- CHARGES -->
 
-	<record id="chart423000_fr" model="account.account.template">
-		<field name="code">423000</field>
-		<field name="parent_id" ref="chart420000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AUTRES REVENUS NON LIÉS À L'EXPLOITATION</field>
-	</record>
-
-	<!-- DÉPENSES -->
-
-	<record id="chart500000_fr" model="account.account.template">
-		<field name="code">500000</field>
+	<record id="chart5_fr" model="account.account.template">
+		<field name="code">5</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">DÉPENSES</field>
+		<field name="name">CHARGES</field>
 	</record>
 
-	<record id="chart510000_fr" model="account.account.template">
-		<field name="code">510000</field>
-		<field name="parent_id" ref="chart500000_fr"/>
+	<record id="chart51_fr" model="account.account.template">
+		<field name="code">51</field>
+		<field name="parent_id" ref="chart5_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">DÉPENSES D'EXPLOITATION</field>
+		<field name="name">CHARGES D'EXPLOITATION</field>
 	</record>
 
-	<record id="chart511000_fr" model="account.account.template">
-		<field name="code">511000</field>
-		<field name="parent_id" ref="chart510000_fr"/>
+	<record id="chart511_fr" model="account.account.template">
+		<field name="code">511</field>
+		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">COÛT DES BIENS VENDUS</field>
+		<field name="name">COÛT DES PRODUITS VENDUS</field>
 	</record>
-
-	<record id="chart511100_fr" model="account.account.template">
-		<field name="code">511100</field>
-		<field name="parent_id" ref="chart511000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">STOCKS D'OUVERTURE</field>
-	</record>
-
-	<record id="chart511110_fr" model="account.account.template">
-		<field name="code">511110</field>
-		<field name="parent_id" ref="chart511100_fr"/>
+	
+        <record id="chart5111_fr" model="account.account.template">
+		<field name="code">5111</field>
+		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="user_type_charge_fr" />
-		<field name="name">Dépenses</field>
+		<field name="name">Achats</field>
 	</record>
 
-	<record id="chart511200_fr" model="account.account.template">
-		<field name="code">511200</field>
-		<field name="parent_id" ref="chart511000_fr"/>
+	<record id="chart5112_fr" model="account.account.template">
+		<field name="code">5112</field>
+		<field name="parent_id" ref="chart511_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="name">Achats dans des provinces harmonisées</field>
+	</record>
+	
+	<record id="chart5113_fr" model="account.account.template">
+		<field name="code">5113</field>
+		<field name="parent_id" ref="chart511_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="name">Achats dans des provinces non-harmonisées</field>
+	</record>
+
+	<record id="chart5114_fr" model="account.account.template">
+		<field name="code">5114</field>
+		<field name="parent_id" ref="chart511_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_produit_fr" />
+		<field name="name">Achats à l'étranger</field>
+	</record>
+
+	<record id="chart512_fr" model="account.account.template">
+		<field name="code">512</field>
+		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACHATS ET COÛTS IMPUTABLES AU COÛT DES BIENS VENDUS</field>
+		<field name="name">SALAIRES ET CHARGES SOCIALES</field>
 	</record>
 
-	<record id="chart511300_fr" model="account.account.template">
-		<field name="code">511300</field>
-		<field name="parent_id" ref="chart511000_fr"/>
+	<record id="chart51201_fr" model="account.account.template">
+		<field name="code">51201</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Salaires</field>
+	</record>
+
+	<record id="chart51202_fr" model="account.account.template">
+		<field name="code">51202</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Vacances</field>
+	</record>
+
+	<record id="chart51203_fr" model="account.account.template">
+		<field name="code">51203</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Assurance Emploi</field>
+	</record>
+
+	<record id="chart51204_fr" model="account.account.template">
+		<field name="code">51204</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Fonds des services de santé</field>
+	</record>
+
+	<record id="chart51205_fr" model="account.account.template">
+		<field name="code">51205</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Rentes</field>
+	</record>
+
+	<record id="chart51206_fr" model="account.account.template">
+		<field name="code">51206</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Assurance parental</field>
+	</record>
+
+	<record id="chart51207_fr" model="account.account.template">
+		<field name="code">51207</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Santé et sécurité au travail</field>
+	</record>
+
+	<record id="chart51208_fr" model="account.account.template">
+		<field name="code">51208</field>
+		<field name="parent_id" ref="chart512_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="user_type_charge_fr" />
+		<field name="name">Normes du travail</field>
+	</record>
+
+	<record id="chart513_fr" model="account.account.template">
+		<field name="code">513</field>
+		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">STOCKS DE CLOTÛRE</field>
+		<field name="name">FRAIS SUR VENTE</field>
 	</record>
 
-	<record id="chart512000_fr" model="account.account.template">
-		<field name="code">512000</field>
-		<field name="parent_id" ref="chart510000_fr"/>
+	<record id="chart514_fr" model="account.account.template">
+		<field name="code">514</field>
+		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">FRAIS D'EXPLOITATION NON COMPRIS DANS LE COÛT DES BIENS VENDUS</field>
+		<field name="name">FRAIS GÉNÉRAUX</field>
 	</record>
 
-	<record id="chart512100_fr" model="account.account.template">
-		<field name="code">512100</field>
-		<field name="parent_id" ref="chart512000_fr"/>
+	<record id="chart515_fr" model="account.account.template">
+		<field name="code">515</field>
+		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">FRAIS DE MAIN D'OEUVRE</field>
+		<field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
 	</record>
 
-	<record id="chart512110_fr" model="account.account.template">
-		<field name="code">512110</field>
-		<field name="parent_id" ref="chart512100_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">SALAIRES, TRAITEMENTS ET COMMISSIONS</field>
-	</record>
-
-	<record id="chart512120_fr" model="account.account.template">
-		<field name="code">512120</field>
-		<field name="parent_id" ref="chart512100_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AVANTAGES SOCIAUX DES EMPLOYÉS</field>
-	</record>
-
-	<record id="chart512200_fr" model="account.account.template">
-		<field name="code">512200</field>
-		<field name="parent_id" ref="chart512000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">CHARGES AUTRES QUES LES FRAIS DE MAIN-D'OEUVRE</field>
-	</record>
-
-	<record id="chart512210_fr" model="account.account.template">
-		<field name="code">512210</field>
-		<field name="parent_id" ref="chart512200_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">AMORTISSEMENT, Y COMPRIS POUR DÉPRÉCIATION ET ÉPUISEMENT</field>
-	</record>
-
-	<record id="chart512220_fr" model="account.account.template">
-		<field name="code">512220</field>
-		<field name="parent_id" ref="chart512200_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">FRAIS D'ÉNERGIE, D'EAU, DE TÉLÉPHONE ET DE TÉLÉCOMMUNICATIONS</field>
-	</record>
-
-	<record id="chart512230_fr" model="account.account.template">
-		<field name="code">512230</field>
-		<field name="parent_id" ref="chart512200_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">IMPÔTS INDIRECTS, LICENCES ET PERMIS</field>
-	</record>
-
-	<record id="chart512240_fr" model="account.account.template">
-		<field name="code">512240</field>
-		<field name="parent_id" ref="chart512200_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">CONTRATS DE SOUS-TRAITANCE</field>
-	</record>
-
-	<record id="chart512250_fr" model="account.account.template">
-		<field name="code">512250</field>
-		<field name="parent_id" ref="chart512200_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">FRAIS D'EXPLORATION ET D'AMÉNAGEMENT</field>
-	</record>
-
-	<record id="chart512260_fr" model="account.account.template">
-		<field name="code">512260</field>
-		<field name="parent_id" ref="chart512200_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">REDEVANCES DE FRANCHISAGE ET AUTRES REDEVANCES</field>
-	</record>
-
-	<record id="chart512270_fr" model="account.account.template">
-		<field name="code">512270</field>
-		<field name="parent_id" ref="chart512200_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ACHATS DE MATÉRIAUX, DE FOURNITURES ET DE SERVICES</field>
-	</record>
-
-	<record id="chart512290_fr" model="account.account.template">
-		<field name="code">512290</field>
-		<field name="parent_id" ref="chart512200_fr"/>
+	<record id="chart519_fr" model="account.account.template">
+		<field name="code">519</field>
+		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">AUTRES FRAIS D'EXPLOITATION</field>
 	</record>
 
-	<record id="chart520000_fr" model="account.account.template">
-		<field name="code">520000</field>
-		<field name="parent_id" ref="chart500000_fr"/>
+	<record id="chart52_fr" model="account.account.template">
+		<field name="code">52</field>
+		<field name="parent_id" ref="chart5_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
-	<record id="chart521000_fr" model="account.account.template">
-		<field name="code">521000</field>
-		<field name="parent_id" ref="chart520000_fr"/>
+	<record id="chart521_fr" model="account.account.template">
+		<field name="code">521</field>
+		<field name="parent_id" ref="chart52_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">INTÉRÊTS DÉBITEURS</field>
 	</record>
 
-	<record id="chart521100_fr" model="account.account.template">
-		<field name="code">521100</field>
-		<field name="parent_id" ref="chart521000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">INTÉRÊTS DÉBITEURS SUR DETTES À COURT TERME</field>
-	</record>
-
-	<record id="chart521200_fr" model="account.account.template">
-		<field name="code">521200</field>
-		<field name="parent_id" ref="chart521000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">INTÉRÊTS DÉBITEURS SUR DETTES À LONG TERME</field>
-	</record>
-
-	<record id="chart522000_fr" model="account.account.template">
-		<field name="code">522000</field>
-		<field name="parent_id" ref="chart520000_fr"/>
+	<record id="chart529_fr" model="account.account.template">
+		<field name="code">529</field>
+		<field name="parent_id" ref="chart52_fr"/>
 		<field name="type">view</field>
 		<field name="user_type" ref="user_type_view_fr" />
 		<field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
-	<!-- GAINS OU PERTES, IMPÔTS DES SOCIÉTÉS ET AUTRES ÉLÉMENTS -->
-
-	<record id="chart600000_fr" model="account.account.template">
-		<field name="code">600000</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES, IMPÔTS DES SOCIÉTÉS ET AUTRES ÉLÉMENTS</field>
-	</record>
-
-	<record id="chart610000_fr" model="account.account.template">
-		<field name="code">610000</field>
-		<field name="parent_id" ref="chart600000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES</field>
-	</record>
-
-	<record id="chart611000_fr" model="account.account.template">
-		<field name="code">611000</field>
-		<field name="parent_id" ref="chart610000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES SUR LA VENTE D'ACTIFS</field>
-	</record>
-
-	<record id="chart611100_fr" model="account.account.template">
-		<field name="code">611100</field>
-		<field name="parent_id" ref="chart611000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES RÉALISÉS - ACTIFS IMMOBILISÉS</field>
-	</record>
-
-	<record id="chart611200_fr" model="account.account.template">
-		<field name="code">611200</field>
-		<field name="parent_id" ref="chart611000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES RÉALISÉS - PLACEMENTS</field>
-	</record>
-
-	<record id="chart611300_fr" model="account.account.template">
-		<field name="code">611300</field>
-		<field name="parent_id" ref="chart611000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES RÉALISÉS - AUTRES ACTIFS</field>
-	</record>
-
-	<record id="chart612000_fr" model="account.account.template">
-		<field name="code">612000</field>
-		<field name="parent_id" ref="chart610000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES SUR LA CONVERSION DE DEVISES</field>
-	</record>
-
-	<record id="chart613000_fr" model="account.account.template">
-		<field name="code">613000</field>
-		<field name="parent_id" ref="chart610000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PERTES NON RÉALISÉES SUR LA RÉÉVALUATION D'ACTIF</field>
-	</record>
-
-	<record id="chart613100_fr" model="account.account.template">
-		<field name="code">613100</field>
-		<field name="parent_id" ref="chart613000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PERTES NON RÉALISÉS - ACTIFS IMMOBILISÉS</field>
-	</record>
-
-	<record id="chart613200_fr" model="account.account.template">
-		<field name="code">613200</field>
-		<field name="parent_id" ref="chart613000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PERTES NON RÉALISÉS - PLACEMENTS</field>
-	</record>
-
-	<record id="chart613300_fr" model="account.account.template">
-		<field name="code">613300</field>
-		<field name="parent_id" ref="chart613000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">PERTES NON RÉALISÉS - AUTRES ACTIFS</field>
-	</record>
-
-        <record id="chart614000_fr" model="account.account.template">
-                <field name="code">614000</field>
-                <field name="parent_id" ref="chart610000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">GAINS SUR RÈGLEMENT D'OBLIGATIONS AU TITRE DE RÉGIMES DE RETRAITE</field>
-        </record>
-
-        <record id="chart615000_fr" model="account.account.template">
-                <field name="code">615000</field>
-                <field name="parent_id" ref="chart610000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">GAINS OU PERTES LIÉS AUX RÈGLEMENTS DE LITIGES</field>
-        </record>
-
-        <record id="chart616000_fr" model="account.account.template">
-                <field name="code">616000</field>
-                <field name="parent_id" ref="chart610000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">GAINS OU PERTES SUR INSTRUMENTS DÉRIVÉS</field>
-        </record>
-
-        <record id="chart620000_fr" model="account.account.template">
-                <field name="code">620000</field>
-                <field name="parent_id" ref="chart600000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">IMPÔTS SUR LES BÉNÉFICES DES SOCIÉTÉS</field>
-        </record>
-
-        <record id="chart621000_fr" model="account.account.template">
-                <field name="code">621000</field>
-                <field name="parent_id" ref="chart620000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">IMPÔTS EXIGIBLES DE L'EXERCICE</field>
-        </record>
-
-        <record id="chart622000_fr" model="account.account.template">
-                <field name="code">622000</field>
-                <field name="parent_id" ref="chart620000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">IMPÔTS REPORTÉS</field>
-        </record>
-
-        <record id="chart623000_fr" model="account.account.template">
-                <field name="code">623000</field>
-                <field name="parent_id" ref="chart620000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">IMPÔT PROVINCIAL SUR L'EXPLOITATION MINIÈRE ET FORESTIÈRE</field>
-        </record>
-
-        <record id="chart630000_fr" model="account.account.template">
-                <field name="code">630000</field>
-                <field name="parent_id" ref="chart600000_fr"/>
-                <field name="type">view</field>
-                <field name="user_type" ref="user_type_view_fr" />
-                <field name="name">AUTRES ÉLÉMENTS</field>
-        </record>
-
-	<!-- GAINS OU PERTES EXTRAORDINAIRES, ÉLÉMENTS NON RÉCURRENTS ET REDRESSEMENTS -->
-
-	<record id="chart700000_fr" model="account.account.template">
-		<field name="code">700000</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES EXTRAORDINAIRES, ÉLÉMENTS NON RÉCURRENTS ET REDRESSEMENTS</field>
-	</record>
-
-	<record id="chart710000_fr" model="account.account.template">
-		<field name="code">710000</field>
-		<field name="parent_id" ref="chart700000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">GAINS OU PERTES EXTRAORDINAIRES</field>
-	</record>
-
-	<record id="chart711000_fr" model="account.account.template">
-		<field name="code">711000</field>
-		<field name="parent_id" ref="chart710000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ÉLÉMENTS EXTRAORDINAIRES - BRUTS</field>
-	</record>
-
-	<record id="chart712000_fr" model="account.account.template">
-		<field name="code">712000</field>
-		<field name="parent_id" ref="chart710000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">IMPÔTS SUR LES ÉLÉMENTS EXTRAORDINAIRES</field>
-	</record>
-
-	<record id="chart720000_fr" model="account.account.template">
-		<field name="code">720000</field>
-		<field name="parent_id" ref="chart700000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">ÉLÉMENTS NON RÉCURRENTS</field>
-	</record>
-
-	<record id="chart730000_fr" model="account.account.template">
-		<field name="code">730000</field>
-		<field name="parent_id" ref="chart700000_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr" />
-		<field name="name">REDRESSEMENTS REPRÉSENTANT L'EFFET CUMULATIF DES CHANGEMENTS DE PRINCIPES COMPTABLES</field>
-	</record>
-
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml
index 8b970cc13fb..c3e82e16cd9 100644
--- a/addons/l10n_ca/account_chart_template_en.xml
+++ b/addons/l10n_ca/account_chart_template_en.xml
@@ -8,11 +8,11 @@
 		<field name="name">Canada - Chart of Accounts for english-speaking provinces</field>
 		<field name="account_root_id" ref="chart0_en"/>
 		<field name="tax_code_root_id" ref="vat_code_tax_en"/>
-		<field name="bank_account_view_id" ref="chart111160_en"/>
-		<field name="property_account_receivable" ref="chart112110_en"/>
-		<field name="property_account_payable" ref="chart221110_en"/>
-		<field name="property_account_income_categ" ref="chart411110_en"/>
-		<field name="property_account_expense_categ" ref="chart511110_en"/>
+		<field name="bank_account_view_id" ref="chart1111_en"/>
+		<field name="property_account_receivable" ref="chart1151_en"/>
+		<field name="property_account_payable" ref="chart2111_en"/>
+		<field name="property_account_income_categ" ref="chart411_en"/>
+		<field name="property_account_expense_categ" ref="chart511_en"/>
 	</record>
 
     </data>
diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml
index 8f5238e33bb..ff8113fca29 100644
--- a/addons/l10n_ca/account_chart_template_fr.xml
+++ b/addons/l10n_ca/account_chart_template_fr.xml
@@ -7,11 +7,11 @@
 		<field name="name">Canada - Plan comptable pour les provinces francophones</field>
 		<field name="account_root_id" ref="chart0_fr"/>
 		<field name="tax_code_root_id" ref="vat_code_tax_fr"/>
-		<field name="bank_account_view_id" ref="chart111160_fr"/>
-		<field name="property_account_receivable" ref="chart112110_fr"/>
-		<field name="property_account_payable" ref="chart221110_fr"/>
-		<field name="property_account_income_categ" ref="chart411110_fr"/>
-		<field name="property_account_expense_categ" ref="chart511110_fr"/>
+		<field name="bank_account_view_id" ref="chart1111_fr"/>
+		<field name="property_account_receivable" ref="chart1151_fr"/>
+		<field name="property_account_payable" ref="chart2111_fr"/>
+		<field name="property_account_income_categ" ref="chart411_fr"/>
+		<field name="property_account_expense_categ" ref="chart5111_fr"/>
 	</record>
 
 	</data>
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index 8eadcf518b0..4543081b377 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -15,14 +15,14 @@
 
     <record id="gstpst_mb_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (MB)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_en"/>
-        <field name="account_paid_id" ref="chart242100_en"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
@@ -32,13 +32,13 @@
 
     <record id="pst_mb_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST (7%)</field>
+        <field name="name">PST - 7%</field>
         <field name="description">PST</field>
         <field name="amount">0.070000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_en"/>
-        <field name="account_paid_id" ref="chart242200_en"/>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
@@ -59,14 +59,14 @@
 
     <record id="gstpst_pe_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (PE)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_en"/>
-        <field name="account_paid_id" ref="chart242100_en"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
@@ -76,13 +76,13 @@
 
     <record id="pst_pe_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST (10%)</field>
+        <field name="name">PST - 10%</field>
         <field name="description">PST</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_en"/>
-        <field name="account_paid_id" ref="chart242200_en"/>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
@@ -103,14 +103,14 @@
 
     <record id="gstpst_qc_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (QC)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_en"/>
-        <field name="account_paid_id" ref="chart242100_en"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
@@ -120,13 +120,13 @@
 
     <record id="pst_qc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST (8.5%)</field>
+        <field name="name">PST - 8.5%</field>
         <field name="description">PST</field>
         <field name="amount">0.085000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_en"/>
-        <field name="account_paid_id" ref="chart242200_en"/>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
@@ -147,14 +147,14 @@
 
     <record id="gstpst_sk_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (SK)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_en"/>
-        <field name="account_paid_id" ref="chart242100_en"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
@@ -164,13 +164,13 @@
 
     <record id="pst_sk_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST (5%)</field>
+        <field name="name">PST - 5%</field>
         <field name="description">PST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_en"/>
-        <field name="account_paid_id" ref="chart242200_en"/>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
@@ -182,12 +182,12 @@
 
     <record id="hst12_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST (12%)</field>
+        <field name="name">HST - 12%</field>
         <field name="description">HST12</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_en"/>
-        <field name="account_paid_id" ref="chart242300_en"/>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
@@ -196,12 +196,12 @@
 
     <record id="hst13_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST (13%)</field>
+        <field name="name">HST - 13%</field>
         <field name="description">HST13</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_en"/>
-        <field name="account_paid_id" ref="chart242300_en"/>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
@@ -210,12 +210,12 @@
 
     <record id="hst135_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST (13.5%)</field>
+        <field name="name">HST - 13.5%</field>
         <field name="description">HST135</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_en"/>
-        <field name="account_paid_id" ref="chart242300_en"/>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
@@ -224,12 +224,12 @@
 
     <record id="hst15_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST (15%)</field>
+        <field name="name">HST - 15%</field>
         <field name="description">HST15</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_en"/>
-        <field name="account_paid_id" ref="chart242300_en"/>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
@@ -240,12 +240,12 @@
 
     <record id="gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5%</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241100_en"/>
-        <field name="account_paid_id" ref="chart242100_en"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index 61181d5324a..ac4984006df 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -15,14 +15,14 @@
 
     <record id="tpstvp_mb_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS (5%)</field>
+        <field name="name">TPS - 5% (MB)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_fr"/>
-        <field name="account_paid_id" ref="chart242100_fr"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -32,13 +32,13 @@
 
     <record id="tvp_mb_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP (7%)</field>
+        <field name="name">TVP - 7%</field>
         <field name="description">TVP</field>
         <field name="amount">0.700000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_fr"/>
-        <field name="account_paid_id" ref="chart242200_fr"/>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -59,14 +59,14 @@
 
     <record id="tpstvp_pe_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS (5%)</field>
+        <field name="name">TPS - 5% (PE)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_fr"/>
-        <field name="account_paid_id" ref="chart242100_fr"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -76,13 +76,13 @@
 
     <record id="tvp_pe_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP (10%)</field>
+        <field name="name">TVP - 10%</field>
         <field name="description">TVP</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_fr"/>
-        <field name="account_paid_id" ref="chart242200_fr"/>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -103,14 +103,14 @@
 
     <record id="tpstvq_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS (5%)</field>
+        <field name="name">TPS - 5% (QC)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_fr"/>
-        <field name="account_paid_id" ref="chart242100_fr"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -120,13 +120,13 @@
 
     <record id="tvq_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVQ (8.5%)</field>
+        <field name="name">TVQ - 8.5%</field>
         <field name="description">TVQ</field>
         <field name="amount">0.085000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_fr"/>
-        <field name="account_paid_id" ref="chart242200_fr"/>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -147,14 +147,14 @@
 
     <record id="tpstvp_sk_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS (5%)</field>
+        <field name="name">TPS - 5% (SK)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart241100_fr"/>
-        <field name="account_paid_id" ref="chart242100_fr"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -164,13 +164,13 @@
 
     <record id="tvp_sk_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP (5%)</field>
+        <field name="name">TVP - 5% (SK)</field>
         <field name="description">TVP</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart241200_fr"/>
-        <field name="account_paid_id" ref="chart242200_fr"/>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -182,12 +182,12 @@
 
     <record id="tvh12_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH (12%)</field>
+        <field name="name">TVH - 12%</field>
         <field name="description">TVH12</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_fr"/>
-        <field name="account_paid_id" ref="chart242300_fr"/>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -196,12 +196,12 @@
 
     <record id="tvh13_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH (13%)</field>
+        <field name="name">TVH - 13%</field>
         <field name="description">TVH13</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_fr"/>
-        <field name="account_paid_id" ref="chart242300_fr"/>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -210,12 +210,12 @@
 
     <record id="tvh135_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH (13.5%)</field>
+        <field name="name">TVH - 13.5%</field>
         <field name="description">TVH135</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_fr"/>
-        <field name="account_paid_id" ref="chart242300_fr"/>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -224,12 +224,12 @@
 
     <record id="tvh15_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH (15%)</field>
+        <field name="name">TVH - 15%</field>
         <field name="description">TVH15</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241300_fr"/>
-        <field name="account_paid_id" ref="chart242300_fr"/>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -240,12 +240,12 @@
 
     <record id="tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS (5%)</field>
+        <field name="name">TPS - 5%</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart241100_fr"/>
-        <field name="account_paid_id" ref="chart242100_fr"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
diff --git a/addons/l10n_ca/account_types_en.xml b/addons/l10n_ca/account_types_en.xml
index 0c507fba98b..1af3fd92205 100644
--- a/addons/l10n_ca/account_types_en.xml
+++ b/addons/l10n_ca/account_types_en.xml
@@ -56,6 +56,7 @@
 	<record model="account.account.type" id="user_type_equity_en">
 		<field name="name">Equity</field>
 		<field name="code">equity</field>
+		<field name="report_type">liability</field>
 		<field name="close_method">balance</field>
 	</record>
 
diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml
index 9f12458e4f7..d7b6a3ee7da 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -42,351 +42,352 @@
 	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
 
 	<record id="fiscal_position_tax_template_21_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gst_en" />
-		<field name="tax_dest_id" ref="hst12_en" />
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="tax_src_id" ref="gst_en"/>
+		<field name="tax_dest_id" ref="hst12_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_22_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gst_en" />
-		<field name="tax_dest_id" ref="hst13_en" />
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="tax_src_id" ref="gst_en"/>
+		<field name="tax_dest_id" ref="hst13_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_23_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gst_en" />
-		<field name="tax_dest_id" ref="hst135_en" />
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="tax_src_id" ref="gst_en"/>
+		<field name="tax_dest_id" ref="hst135_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_24_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gst_en" />
-		<field name="tax_dest_id" ref="hst15_en" />
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="tax_src_id" ref="gst_en"/>
+		<field name="tax_dest_id" ref="hst15_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gst_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="gst_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
 	<record id="fiscal_position_tax_template_22_12c_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst12_en" />
-		<field name="tax_dest_id" ref="hst13_en" />
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="tax_src_id" ref="hst12_en"/>
+		<field name="tax_dest_id" ref="hst13_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_23_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst12_en" />
-		<field name="tax_dest_id" ref="hst135_en" />
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="tax_src_id" ref="hst12_en"/>
+		<field name="tax_dest_id" ref="hst135_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_24_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst12_en" />
-		<field name="tax_dest_id" ref="hst15_en" />
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="tax_src_id" ref="hst12_en"/>
+		<field name="tax_dest_id" ref="hst15_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_3_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst12_en" />
-		<field name="tax_dest_id" ref="gst_en" />
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="tax_src_id" ref="hst12_en"/>
+		<field name="tax_dest_id" ref="gst_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst12_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="hst12_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
 
 	<record id="fiscal_position_tax_template_21_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_en" />
-		<field name="tax_dest_id" ref="hst12_en" />
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="tax_src_id" ref="gstpst_mb_en"/>
+		<field name="tax_dest_id" ref="hst12_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_22_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_en" />
-		<field name="tax_dest_id" ref="hst13_en" />
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="tax_src_id" ref="gstpst_mb_en"/>
+		<field name="tax_dest_id" ref="hst13_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_23_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_en" />
-		<field name="tax_dest_id" ref="hst135_en" />
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="tax_src_id" ref="gstpst_mb_en"/>
+		<field name="tax_dest_id" ref="hst135_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_24_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_en" />
-		<field name="tax_dest_id" ref="hst15_en" />
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="tax_src_id" ref="gstpst_mb_en"/>
+		<field name="tax_dest_id" ref="hst15_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_3_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_en" />
-		<field name="tax_dest_id" ref="gst_en" />
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="tax_src_id" ref="gstpst_mb_en"/>
+		<field name="tax_dest_id" ref="gst_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="gstpst_mb_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
 	<record id="fiscal_position_tax_template_21_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst13_en" />
-		<field name="tax_dest_id" ref="hst12_en" />
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="tax_src_id" ref="hst13_en"/>
+		<field name="tax_dest_id" ref="hst12_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_23_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst13_en" />
-		<field name="tax_dest_id" ref="hst135_en" />
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="tax_src_id" ref="hst13_en"/>
+		<field name="tax_dest_id" ref="hst135_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_24_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst13_en" />
-		<field name="tax_dest_id" ref="hst15_en" />
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="tax_src_id" ref="hst13_en"/>
+		<field name="tax_dest_id" ref="hst15_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_3_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst13_en" />
-		<field name="tax_dest_id" ref="gst_en" />
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="tax_src_id" ref="hst13_en"/>
+		<field name="tax_dest_id" ref="gst_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst13_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="hst13_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
 	<record id="fiscal_position_tax_template_21_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst15_en" />
-		<field name="tax_dest_id" ref="hst12_en" />
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="tax_src_id" ref="hst15_en"/>
+		<field name="tax_dest_id" ref="hst12_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_22_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst15_en" />
-		<field name="tax_dest_id" ref="hst13_en" />
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="tax_src_id" ref="hst15_en"/>
+		<field name="tax_dest_id" ref="hst13_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_23_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst15_en" />
-		<field name="tax_dest_id" ref="hst135_en" />
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="tax_src_id" ref="hst15_en"/>
+		<field name="tax_dest_id" ref="hst135_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_3_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst15_en" />
-		<field name="tax_dest_id" ref="gst_en" />
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="tax_src_id" ref="hst15_en"/>
+		<field name="tax_dest_id" ref="gst_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="hst15_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="hst15_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
 
 	<record id="fiscal_position_tax_template_21_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_en" />
-		<field name="tax_dest_id" ref="hst12_en" />
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="tax_src_id" ref="gstpst_pe_en"/>
+		<field name="tax_dest_id" ref="hst12_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_22_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_en" />
-		<field name="tax_dest_id" ref="hst13_en" />
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="tax_src_id" ref="gstpst_pe_en"/>
+		<field name="tax_dest_id" ref="hst13_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_23_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_en" />
-		<field name="tax_dest_id" ref="hst135_en" />
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="tax_src_id" ref="gstpst_pe_en"/>
+		<field name="tax_dest_id" ref="hst135_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_24_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_en" />
-		<field name="tax_dest_id" ref="hst15_en" />
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="tax_src_id" ref="gstpst_pe_en"/>
+		<field name="tax_dest_id" ref="hst15_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_3_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_en" />
-		<field name="tax_dest_id" ref="gst_en" />
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="tax_src_id" ref="gstpst_pe_en"/>
+		<field name="tax_dest_id" ref="gst_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="gstpst_pe_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
 	<!--  Quebec Fiscal Position Tax Templates (default is gstpst_qc)-->
 
 	<record id="fiscal_position_tax_template_21_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_qc_en" />
-		<field name="tax_dest_id" ref="hst12_en" />
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="tax_src_id" ref="gstpst_qc_en"/>
+		<field name="tax_dest_id" ref="hst12_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_22_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_qc_en" />
-		<field name="tax_dest_id" ref="hst13_en" />
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="tax_src_id" ref="gstpst_qc_en"/>
+		<field name="tax_dest_id" ref="hst13_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_24_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_qc_en" />
-		<field name="tax_dest_id" ref="hst15_en" />
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="tax_src_id" ref="gstpst_qc_en"/>
+		<field name="tax_dest_id" ref="hst15_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_3_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_qc_en" />
-		<field name="tax_dest_id" ref="gst_en" />
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="tax_src_id" ref="gstpst_qc_en"/>
+		<field name="tax_dest_id" ref="gst_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_qc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="gstpst_qc_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
 
 	<record id="fiscal_position_tax_template_21_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_en" />
-		<field name="tax_dest_id" ref="hst12_en" />
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="tax_src_id" ref="gstpst_sk_en"/>
+		<field name="tax_dest_id" ref="hst12_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_22_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_en" />
-		<field name="tax_dest_id" ref="hst13_en" />
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="tax_src_id" ref="gstpst_sk_en"/>
+		<field name="tax_dest_id" ref="hst13_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_23_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_en" />
-		<field name="tax_dest_id" ref="hst135_en" />
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="tax_src_id" ref="gstpst_sk_en"/>
+		<field name="tax_dest_id" ref="hst135_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_24_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_en" />
-		<field name="tax_dest_id" ref="hst15_en" />
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="tax_src_id" ref="gstpst_sk_en"/>
+		<field name="tax_dest_id" ref="hst15_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_3_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_en" />
-		<field name="tax_dest_id" ref="gst_en" />
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="tax_src_id" ref="gstpst_sk_en"/>
+		<field name="tax_dest_id" ref="gst_en"/>
 	</record>
 
 	<record id="fiscal_position_tax_template_4_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_en" />
-		<field name="tax_dest_id" ref="notax_en" />
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="tax_src_id" ref="gstpst_sk_en"/>
+		<field name="tax_dest_id" ref="notax_en"/>
 	</record>
 
-	<!-- Fiscal Position Account Templates - Goods -->
+	<!-- Fiscal Position Account Templates - Incomes -->
 
-	<record id="fiscal_position_account_template_21_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="account_src_id" ref="chart411110_en" />
-		<field name="account_dest_id" ref="chart411120_en" />
+	<record id="fiscal_position_account_template_21_income_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="account_src_id" ref="chart411_en"/>
+		<field name="account_dest_id" ref="chart412_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_22_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="account_src_id" ref="chart411110_en" />
-		<field name="account_dest_id" ref="chart411120_en" />
+	<record id="fiscal_position_account_template_22_income_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="account_src_id" ref="chart411_en"/>
+		<field name="account_dest_id" ref="chart412_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_23_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="account_src_id" ref="chart411110_en" />
-		<field name="account_dest_id" ref="chart411120_en" />
+	<record id="fiscal_position_account_template_23_income_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="account_src_id" ref="chart411_en"/>
+		<field name="account_dest_id" ref="chart412_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_24_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="account_src_id" ref="chart411110_en" />
-		<field name="account_dest_id" ref="chart411120_en" />
+	<record id="fiscal_position_account_template_24_income_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="account_src_id" ref="chart411_en"/>
+		<field name="account_dest_id" ref="chart412_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_3_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="account_src_id" ref="chart411110_en" />
-		<field name="account_dest_id" ref="chart411130_en" />
+	<record id="fiscal_position_account_template_3_income_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="account_src_id" ref="chart411_en"/>
+		<field name="account_dest_id" ref="chart413_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_4_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="account_src_id" ref="chart411110_en" />
-		<field name="account_dest_id" ref="chart411140_en" />
+	<record id="fiscal_position_account_template_4_income_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="account_src_id" ref="chart411_en"/>
+		<field name="account_dest_id" ref="chart414_en"/>
 	</record>
 
-	<!-- Fiscal Position Account Templates - Services -->
+	<!-- Fiscal Position Account Templates - Expenses -->
 
-	<record id="fiscal_position_account_template_21_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="account_src_id" ref="chart411210_en" />
-		<field name="account_dest_id" ref="chart411220_en" />
+	<record id="fiscal_position_account_template_21_expense_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"/>
+		<field name="account_src_id" ref="chart5111_en"/>
+		<field name="account_dest_id" ref="chart5112_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_22_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="account_src_id" ref="chart411210_en" />
-		<field name="account_dest_id" ref="chart411220_en" />
+	<record id="fiscal_position_account_template_22_expense_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"/>
+		<field name="account_src_id" ref="chart5111_en"/>
+		<field name="account_dest_id" ref="chart5112_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_23_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="account_src_id" ref="chart411210_en" />
-		<field name="account_dest_id" ref="chart411220_en" />
+	<record id="fiscal_position_account_template_23_expense_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"/>
+		<field name="account_src_id" ref="chart5111_en"/>
+		<field name="account_dest_id" ref="chart5112_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_24_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="account_src_id" ref="chart411210_en" />
-		<field name="account_dest_id" ref="chart411220_en" />
+	<record id="fiscal_position_account_template_24_expense_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"/>
+		<field name="account_src_id" ref="chart5111_en"/>
+		<field name="account_dest_id" ref="chart5112_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_3_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="account_src_id" ref="chart411210_en" />
-		<field name="account_dest_id" ref="chart411230_en" />
+	<record id="fiscal_position_account_template_3_expense_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"/>
+		<field name="account_src_id" ref="chart5111_en"/>
+		<field name="account_dest_id" ref="chart5113_en"/>
 	</record>
 
-	<record id="fiscal_position_account_template_4_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="account_src_id" ref="chart411210_en" />
-		<field name="account_dest_id" ref="chart411240_en" />
+	<record id="fiscal_position_account_template_4_expense_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"/>
+		<field name="account_src_id" ref="chart5111_en"/>
+		<field name="account_dest_id" ref="chart5114_en"/>
 	</record>
+
     </data>
 </openerp>    
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 476e5116213..2ce50e5d6e1 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -313,80 +313,81 @@
 		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
-	<!-- Fiscal Position Account Templates - Goods -->
+	<!-- Fiscal Position Account Templates - Products -->
 
-	<record id="fiscal_position_account_template_21_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_product_template_21_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="account_src_id" ref="chart411110_fr" />
-		<field name="account_dest_id" ref="chart411120_fr" />
+		<field name="account_src_id" ref="chart411_fr" />
+		<field name="account_dest_id" ref="chart412_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_22_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_product_template_22_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="account_src_id" ref="chart411110_fr" />
-		<field name="account_dest_id" ref="chart411120_fr" />
+		<field name="account_src_id" ref="chart411_fr" />
+		<field name="account_dest_id" ref="chart412_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_23_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_product_template_23_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="account_src_id" ref="chart411110_fr" />
-		<field name="account_dest_id" ref="chart411120_fr" />
+		<field name="account_src_id" ref="chart411_fr" />
+		<field name="account_dest_id" ref="chart412_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_24_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_product_template_24_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="account_src_id" ref="chart411110_fr" />
-		<field name="account_dest_id" ref="chart411120_fr" />
+		<field name="account_src_id" ref="chart411_fr" />
+		<field name="account_dest_id" ref="chart412_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_product_template_3_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="account_src_id" ref="chart411110_fr" />
-		<field name="account_dest_id" ref="chart411130_fr" />
+		<field name="account_src_id" ref="chart411_fr" />
+		<field name="account_dest_id" ref="chart413_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_product_template_4_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="account_src_id" ref="chart411110_fr" />
-		<field name="account_dest_id" ref="chart411140_fr" />
+		<field name="account_src_id" ref="chart411_fr" />
+		<field name="account_dest_id" ref="chart414_fr" />
 	</record>
 
-	<!-- Fiscal Position Account Templates - Services -->
+	<!-- Fiscal Position Account Templates - Charges -->
 
-	<record id="fiscal_position_account_template_21_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_charge_template_21_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="account_src_id" ref="chart411210_fr" />
-		<field name="account_dest_id" ref="chart411220_fr" />
+		<field name="account_src_id" ref="chart5111_fr" />
+		<field name="account_dest_id" ref="chart5112_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_22_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_charge_template_22_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="account_src_id" ref="chart411210_fr" />
-		<field name="account_dest_id" ref="chart411220_fr" />
+		<field name="account_src_id" ref="chart5111_fr" />
+		<field name="account_dest_id" ref="chart5112_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_23_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_charge_template_23_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="account_src_id" ref="chart411210_fr" />
-		<field name="account_dest_id" ref="chart411220_fr" />
+		<field name="account_src_id" ref="chart5111_fr" />
+		<field name="account_dest_id" ref="chart5112_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_24_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_charge_template_24_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="account_src_id" ref="chart411210_fr" />
-		<field name="account_dest_id" ref="chart411220_fr" />
+		<field name="account_src_id" ref="chart5111_fr" />
+		<field name="account_dest_id" ref="chart5112_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_charge_template_3_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="account_src_id" ref="chart411210_fr" />
-		<field name="account_dest_id" ref="chart411230_fr" />
+		<field name="account_src_id" ref="chart5111_fr" />
+		<field name="account_dest_id" ref="chart5113_fr" />
 	</record>
 
-	<record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
+	<record id="fiscal_position_charge_template_4_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="account_src_id" ref="chart411210_fr" />
-		<field name="account_dest_id" ref="chart411240_fr" />
+		<field name="account_src_id" ref="chart5111_fr" />
+		<field name="account_dest_id" ref="chart5114_fr" />
 	</record>
+
     </data>
 </openerp>    
diff --git a/addons/l10n_ca/i18n/ca.po b/addons/l10n_ca/i18n/ca.po
index 683724a9eeb..e0f4823d256 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ed391f95267..f36c0ec3ae9 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e933ebff3d2..f0db3911ada 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es_MX.po b/addons/l10n_ca/i18n/es_MX.po
new file mode 100644
index 00000000000..eae12991cd1
--- /dev/null
+++ b/addons/l10n_ca/i18n/es_MX.po
@@ -0,0 +1,130 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2011-01-14 00:53+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr "Vista de activo"
+
+#. 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 ""
+"Este es el módulo para manejar el plan contable canadiense en OpenERP"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr "Vista de gastos"
+
+#. module: l10n_ca
+#: 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_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr "Vista de ingresos"
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr "Canada - Plan contable"
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr "¡Error! no puede crear tipos recurrentes."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr "Caja"
+
+#. 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 ""
+"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, "
+"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."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_ca
+#: 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_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr "Vista de pasivos"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_ca/i18n/es_PY.po b/addons/l10n_ca/i18n/es_PY.po
index 68b9053e085..6fedaf0fb36 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es_VE.po b/addons/l10n_ca/i18n/es_VE.po
new file mode 100644
index 00000000000..eae12991cd1
--- /dev/null
+++ b/addons/l10n_ca/i18n/es_VE.po
@@ -0,0 +1,130 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2011-01-14 00:53+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr "Vista de activo"
+
+#. 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 ""
+"Este es el módulo para manejar el plan contable canadiense en OpenERP"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr "Vista de gastos"
+
+#. module: l10n_ca
+#: 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_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr "Vista de ingresos"
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr "Canada - Plan contable"
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr "¡Error! no puede crear tipos recurrentes."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr "Caja"
+
+#. 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 ""
+"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, "
+"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."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_ca
+#: 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_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr "Vista de pasivos"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_ca/i18n/fr.po b/addons/l10n_ca/i18n/fr.po
index 6ef1de7dde5..7b49c4a6f6d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
@@ -128,8 +128,3 @@ msgstr "Revenus"
 #: model:account.account.type,name:l10n_ca.account_type_view
 msgid "View"
 msgstr "Vue"
-
-#~ msgid ""
-#~ "This is the module to manage the canadian accounting chart in Open ERP."
-#~ msgstr ""
-#~ "C'est le module pour gérer la charte comptable canadienne dans Open ERP."
diff --git a/addons/l10n_ca/i18n/gl.po b/addons/l10n_ca/i18n/gl.po
index 831e5a1109e..b09c6bef3cc 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 457d3d69aa2..4670d75443e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 382bff29732..557f733f5a5 100644
--- a/addons/l10n_ca/i18n/it.po
+++ b/addons/l10n_ca/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 21:08+0000\n"
 "PO-Revision-Date: 2011-04-23 12:00+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/pt.po b/addons/l10n_ca/i18n/pt.po
index 92ca4411b62..f3a014637c4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4e367e67216..86dab971e0c 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 16a0172c6f7..26cb937e6ac 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f238da08515..ccd5db07b94 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: 2011-05-15 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index d3398ccf23a..cabd15e42de 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#    Donors: Hasa SA, Open Net SA and Prisme Solutions Informatique SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,10 +21,8 @@
 
 {
     "name" : "Switzerland - localization with 2011 taxes",
-    "description" : """
-Swiss localisation.
-===================
-
+    "description" :  """
+Swiss localisation :
  - DTA generation for a lot of payment types
  - BVR management (number generation, report, etc..)
  - Import account move from the bank file (like v11 etc..)
@@ -33,9 +31,11 @@ Swiss localisation.
 You can also add ZIP and bank completion with:
  - 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 TinyERP revu et corrigé par Camptocamp. Cette nouvelle version
 comprend la gestion et l'émissionde BVR, le paiement électronique via DTA (pour les banques, le système postal est en développement)
@@ -47,10 +47,11 @@ 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
 
+--------------------------------------------------------------------------
 TODO :
 - Implement bvr import partial reconciliation
 - Replace wizard by osv_memory when possible
@@ -60,9 +61,9 @@ TODO :
 
 
 """,
-    "version" : "6.0",
-    "author" : "Camptocamp SA",
-    "category" : "Finance",
+    "version" : "6.1",
+    "author" : "Camptocamp",
+    'category': 'Localization/Account Charts',
     "website": "http://www.camptocamp.com",
 
     "depends" : [
@@ -83,10 +84,10 @@ TODO :
     ],
     "demo_xml" : [
         "demo/demo.xml",
+        "demo/dta_demo.xml",
     ],
     "update_xml" : [
         "wizard.xml",
-        "dta_view.xml",
         "wizard/bvr_import_view.xml",
         "wizard/create_dta_view.xml",
         "company_view.xml",
@@ -97,6 +98,9 @@ TODO :
     ],
     'test' : [
         'test/l10n_ch_report.yml',
+        'test/l10n_ch_dta.yml',
+        'test/l10n_ch_v11.yml',
+        'test/l10n_ch_v11_part.yml',
     ],
     "active": False,
     "installable": True,
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index 08c969dd654..7b80e3697ee 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -32,13 +32,15 @@ class WizardMultiChartsAccounts(osv.osv_memory):
         'sale_tax': False,
         'purchase_tax':False
     }
- 
+
     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'))
         tools.convert_xml_import(cr, 'l10n_ch', path, idref=None, mode='init', noupdate=True, report=None)
         return res
-        
-WizardMultiChartsAccounts()   
 
+WizardMultiChartsAccounts()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py
index d64d57436a9..fd69dec625f 100644
--- a/addons/l10n_ch/bank.py
+++ b/addons/l10n_ch/bank.py
@@ -19,12 +19,15 @@
 #
 ##############################################################################
 
+from tools.translate import _
 from osv import fields, osv
 
 class Bank(osv.osv):
     """Inherit res.bank class in order to add swiss specific field"""
     _inherit = 'res.bank'
     _columns = {
+        ### Internal reference
+        'code': fields.char('Code', size=64),
         ###Swiss unik bank identifier also use in IBAN number
         'clearing': fields.char('Clearing number', size=64),
         ### city of the bank
@@ -33,15 +36,46 @@ class Bank(osv.osv):
 
 Bank()
 
-class bvr_checkbox(osv.osv):
-    """ Add function to generate function """
+
+class ResPartnerBank(osv.osv):
     _inherit = "res.partner.bank"
 
     _columns = {
-        'print_bank' : fields.boolean('Print Bank on BVR'),
-        'print_account' : fields.boolean('Print Account Number on BVR'),
-        }
+        'name': fields.char('Description', size=128, required=True),
+        'post_number': fields.char('Post number', size=64),
+        'bvr_adherent_num': fields.char('BVR adherent number', size=11),
+        '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),
+        'my_bank': fields.boolean('Use my account to print BVR ?', help="Check to print BVR invoices"),
+    }
 
-bvr_checkbox()
+    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 = super(ResPartnerBank, self)._prepare_name(bank)
+        if bank.post_number:
+            res =  u"%s - %s" % (res, bank.post_number)
+        return res
+
+    _sql_constraints = [('bvr_adherent_uniq', 'unique (bvr_adherent_num)',
+        'The BVR adherent number must be unique !')]
+
+ResPartnerBank()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 339e5cf887a..f8c66c16000 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -1,54 +1,186 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- res.bank base form-->    
         <record model="ir.ui.view" id="view_res_bank_form">
             <field name="name">res.bank.form</field>
             <field name="model">res.bank</field>
             <field name="type">form</field>
+            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="base.view_res_bank_form"/>
             <field name="arch" type="xml">
+                <field name="name" position="after">
+                    <field name="code"/>
+                </field>
                 <field name="bic" position="after">
                     <field name="clearing"/>
                 </field>
             </field>
         </record>
         
+        <!-- res.bank base tree-->
         <record model="ir.ui.view" id="l10nch_view_res_bank_tree">
             <field name="name">res.bank.tree</field>
             <field name="model">res.bank</field>
             <field name="type">tree</field>
+            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="base.view_res_bank_tree"/>
             <field name="arch" type="xml">
-                <field name="code" position="after">
+                <field name="name" position="after">
+                    <field name="code" select="1"/>
                     <field name="clearing" select="1"/>
                 </field>
             </field>
         </record>
-
-        <record model="ir.ui.view" id="l10nch_view_res_partner_bank">
-            <field name="name">res.partner_bank.form</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_bank_form"/>
-            <field name="arch" type="xml">
-                <field name="country_id" position="after">
-                    <field name="print_bank"/>
-                    <field name="print_account"/>
-                </field>
-            </field>
-        </record>
-         <record model="ir.ui.view" id="l10nch_view_res_partner_bank">
-            <field name="name">res.partner_partner_bank.form</field>
+        
+        <!-- res.partner.bank in res partner form-->
+        <!-- Partner -> Bank Details -->
+        
+        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_f1">
+            <field name="name">res.partner_bank.form.hide.f1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
+            <field name="sequence" eval="9" />
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
-                <field name="bank" position="after">
-                    <newline />
-                    <field name="print_bank"/>
-                    <field name="print_account"/>
+                <field name="acc_number" position="replace">
                 </field>
             </field>
         </record>
+        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_f2">
+            <field name="name">res.partner_bank.form.hide.f2</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="sequence" eval="9" />
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+                <field name="bank" position="replace">
+                </field>
+            </field>
+        </record>
+        
+        <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="type">form</field>
+            <field name="sequence" eval="10" />
+            <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 -->
+        <!-- Invoice -> Bank account -->
+
+        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_acc_number_hide_frominvoice">
+            <field name="name">res.partner_bank.form.hide.acc_number.frominvoice</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="sequence" eval="9" />
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="replace">
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_bank_frominvoice2">
+            <field name="name">res.partner_bank.form.hide.bank.frominvoice</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="sequence" eval="9" />
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="arch" type="xml">
+                <field name="bank" position="replace"> 
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_from_invoice">
+            <field name="name">res.partner_bank.form.hide.frominvoice</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="sequence" eval="10"/>
+            <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/>
+                    </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/>
+                    <field name="my_bank"  attrs="{'invisible': [('company_id', '!=', True)]}" colspan="4"/>
+                    <group string="BVR print options" colspan="4"  attrs="{'invisible': [('my_bank', '!=', True)]}" >
+                        <field name="bvr_adherent_num"/>
+                        <field name="print_bank"/>
+                        <field name="print_account"/>
+                        <newline/>
+                    </group>
+                    <newline/>
+                    <field name="bank" />
+                </field>
+            </field>
+        </record>        
+
+        <!-- res.partner form bank list-->
+        <!-- Adding Type and bank name -->
+        <record id="l10nch_view_partner_bank_details_list" model="ir.ui.view">
+            <field name="name">res.partner.form.bank_details.list</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="before">
+                    <field name="state" />
+                    <field name="bank" /> 
+                </xpath>
+            </field>
+        </record>
+        
+        <!-- res.partner form bank list-->
+        <!-- Adding Type and bank name -->
+        <record id="l10nch_view_partner_bank_invoice_tree" model="ir.ui.view">
+            <field name="name">res.partner.bank.tree.from_invoice</field>
+            <field name="model">res.partner.bank</field>
+            <field name="inherit_id" ref="base.view_partner_bank_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="before">
+                    <field name="state" />
+                    <field name="bank" />
+                </field> 
+            </field>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py
index 20f6b6168ec..a90bb6a0389 100644
--- a/addons/l10n_ch/company.py
+++ b/addons/l10n_ch/company.py
@@ -29,19 +29,36 @@ class res_company(osv.osv):
     _columns = {
         'bvr_delta_horz': fields.float('BVR Horz. Delta (mm)',
             help='horiz. delta in mm 1.2 will print the bvr 1.2mm lefter, negative value is possible'),
-            
+
         'bvr_delta_vert': fields.float('BVR Vert. Delta (mm)',
             help='vert. delta in mm 1.2 will print the bvr 1.2mm lower, negative value is possible'),
-            
+
+        'bvr_scan_line_vert': fields.float('BVR vert. position for scan line (mm)',
+            help='Vert. position in mm for scan line'),
+
+        'bvr_scan_line_horz': fields.float('BVR horiz. position for scan line(mm)',
+            help='Horiz. position in mm for scan line'),
+
+        'bvr_scan_line_font_size': fields.float('BVR scan line font size (pt)'),
+
+        'bvr_scan_line_letter_spacing':fields.float('BVR scan line letter spacing'),
+
         'bvr_background': fields.boolean('Insert BVR background ?'),
-        
+
         'bvr_only': fields.boolean('Separated BVR only ?',
             help='Print only the BVR separated page'),
-            
+
         'invoice_only': fields.boolean('Invoice only (Do not use with bvr only)?',
             help='Print only the invoice without BVR'),
     }
 
+    _defaults = {
+        'bvr_scan_line_vert': 232,
+        'bvr_scan_line_horz': 72,
+        'bvr_scan_line_font_size': 12,
+        'bvr_scan_line_letter_spacing': 0,
+    }
+
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index df49cf123be..0d107f63723 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -8,13 +8,21 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <field name="rml_footer2" position="after">
-                    <field name="bvr_delta_horz"/>
-                    <field name="bvr_delta_vert"/>
-                    <field name="bvr_background"/>
-                    <field name="bvr_only"/>
-                    <field name="invoice_only"/>
+                <newline/>
+                    <group string="BVR data" colspan="4">
+                        <field name="bvr_delta_horz"/>
+                        <field name="bvr_delta_vert"/>
+                        <field name="bvr_scan_line_vert"/>
+                        <field name="bvr_scan_line_horz"/>
+                        <field name="bvr_scan_line_font_size"/>
+                        <field name="bvr_scan_line_letter_spacing"/>
+                        <field name="bvr_background"/>
+                        <field name="bvr_only"/>
+                        <field name="invoice_only"/>
+                    </group>
+                <newline/>
                 </field>
             </field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_ch/demo/demo.xml b/addons/l10n_ch/demo/demo.xml
index 8df7be446bd..fbe09024966 100644
--- a/addons/l10n_ch/demo/demo.xml
+++ b/addons/l10n_ch/demo/demo.xml
@@ -13,10 +13,8 @@
             <field name="state">bvrbank</field>
             <field name="post_number">11-1234-1</field>
             <field name="bank" ref="main_bank"/>
-            <field name="iban">CH9100767000S00023455</field>
+            <!-- <field name="iban">CH9100767000S00023455</field> -->
             <field name="bvr_adherent_num">0000000</field>
-            
-            
         </record>
 
         <record id="bank" model="res.partner">
@@ -24,7 +22,6 @@
                 <field name="ref">banq</field>
                 <field name="name">Banque</field>
                 <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-                <field name="address" eval="[]"/>
         </record>
         
         <record id="res_partner_address_bank1" model="res.partner.address">
@@ -48,7 +45,6 @@
             <field name="website">http://camptocamp.com</field>
             <field name="name">ProLibre</field>
             <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-            <field name="address" eval="[]"/>
         </record>
 
         <record id="camptocamp" model="res.partner">
@@ -58,7 +54,6 @@
             <field name="website">http://camptocamp.com</field>
             <field name="name">camptocamp SA</field>
             <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
-            <field name="address" eval="[]"/>
         </record>
                 <!--
                 Resource: res.partner.address
diff --git a/addons/l10n_ch/demo/dta_demo.xml b/addons/l10n_ch/demo/dta_demo.xml
index d2968fcf40b..cdddb0d7a74 100644
--- a/addons/l10n_ch/demo/dta_demo.xml
+++ b/addons/l10n_ch/demo/dta_demo.xml
@@ -14,17 +14,18 @@
         <field name="state">bvrbank</field>
         <field name="post_number">234567</field>
         <field name="bank" ref="partner_bank"/>
-        <field name="iban">CH9100767000S00023455</field>
+        <!-- <field name="iban">CH9100767000S00023455</field> -->
     </record>
 
-    <record model="res.partner.bank" id="main_bank">
+    <record model="res.partner.bank" id="main_partner_bank">
         <field name="name">My bank</field>
-        <field name="acc_number">123456</field>
-        <field name="iban">123456</field>
+        <!-- <field name="acc_number">123456</field> -->
+        <!-- <field name="iban">123456</field> -->
         <field name="partner_id" ref="base.main_partner"/>
         <field name="state">dta_company</field>
         <field name="bank" ref="partner_bank"/>
-        <field name="iban">CH9100767000S00023455</field>
+        <!-- <field name="iban">CH9100767000S00023455</field> -->
+        <field name="acc_number">CH9100767000S00023455</field>
     </record>
 
     <record model="account.invoice" id="v11_invoice">
@@ -52,7 +53,7 @@
   <!-- Define a payment mode -->
   <record model="payment.mode" id="payment_mode_dta">
     <field name="name">DTA</field>
-    <field name="bank_id" ref="main_bank"/>
+    <field name="bank_id" ref="main_partner_bank"/>
     <field name="journal" model="account.journal" search="[('type','=','cash')]"/>
   </record>
 
diff --git a/addons/l10n_ch/dta.py b/addons/l10n_ch/dta.py
deleted file mode 100644
index a8ae96e080d..00000000000
--- a/addons/l10n_ch/dta.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
-#
-#    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 account_dta(osv.osv):
-    """class that implements bank DTA File format,
-    used to transfert bulk batch payment instruction to a bank"""
-    _name = "account.dta"
-    _description = "DTA History"
-    _columns = {
-        ### name of the file
-        'name': fields.binary('DTA file', readonly=True),
-        ### list of dta line linked to the dta order
-        'dta_line_ids': fields.one2many('account.dta.line','dta_id','DTA lines', readonly=True),
-        ## textual notes
-        'note': fields.text('Creation log', readonly=True,
-            help="Displays the problem during dta generation"),
-        ### bank how will execute DTA order
-        'bank': fields.many2one('res.partner.bank','Bank', readonly=True,select=True,
-            help="Bank how will execute DTA order"),
-        ### date of DTA order generation
-        'date': fields.date('Creation Date', readonly=True,select=True,
-            help="Date of DTA order generation"),
-        ### user how generate the DTA order
-        'user_id': fields.many2one('res.users','User', readonly=True, select=True),
-    }
-account_dta()
-
-class account_dta_line(osv.osv):
-    """Class that represent a DTA order line,
-    each line corressponds to a payment instruction"""
-    _name = "account.dta.line"
-    _description = "DTA line"
-    _columns = {
-        ### name of the line
-        'name' : fields.many2one('account.invoice','Invoice', required=True, size=256),
-        ### partner how will receive payments
-        'partner_id' : fields.many2one('res.partner','Partner',
-            help="Partenr to pay"),
-        ### due date of the payment
-        'due_date' : fields.date('Due date'),
-        ### date of the supplier invoice to pay
-        'invoice_date' : fields.date('Invoice date'),
-        ### cash discount date
-        'cashdisc_date' : fields.date('Cash Discount date'),
-        ### amount effectively paied on this line
-        'amount_to_pay' : fields.float('Amount to pay',
-            help="Amount effectively paid"),
-        ### amount that was on the supplier invoice
-        'amount_invoice': fields.float('Invoiced Amount',
-            help="Amount to pay base on the supplier invoice"),
-        ### Cash discount amount
-        'amount_cashdisc': fields.float('Cash Discount Amount'),
-        ### Linke to the main dta order
-        'dta_id': fields.many2one('account.dta','Associated DTA', required=True, ondelete='cascade'),
-        ### state of the invoice Drat, Cancel, Done
-        'state' : fields.selection([('draft','Draft'),('cancel','Error'),('done','Paid')],'State')
-    }
-    _defaults = {
-        'state' : lambda *a :'draft',
-    }
-
-account_dta_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_ch/dta_data.xml b/addons/l10n_ch/dta_data.xml
index 5ef689d551c..b11e5e172a9 100644
--- a/addons/l10n_ch/dta_data.xml
+++ b/addons/l10n_ch/dta_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
 
     <!-- Memo :
@@ -30,113 +30,25 @@
     <field name="code">dta_company</field>
   </record>
 
-  <record model="res.partner.bank.type" id="dta_iban">
-    <field name="name">DTA-IBAN</field>
-    <field name="code">dta_iban</field>
-  </record>
-
   <record model="res.partner.bank.type" id="bvrbank">
-    <field name="name">DTA-BVRBANK</field>
+    <field name="name">BVR Bank</field>
     <field name="code">bvrbank</field>
   </record>
 
   <record model="res.partner.bank.type" id="bvrpost">
-    <field name="name">DTA-BVRPOST</field>
+    <field name="name">BVR Post</field>
     <field name="code">bvrpost</field>
   </record>
 
   <record model="res.partner.bank.type" id="bvpost">
-    <field name="name">DTA-BVPOST</field>
+    <field name="name">BV Post</field>
     <field name="code">bvpost</field>
   </record>
 
   <record model="res.partner.bank.type" id="bvbank">
-    <field name="name">DTA-BVBANK</field>
+    <field name="name">BV Bank</field>
     <field name="code">bvbank</field>
   </record>
 
-
-
-  <!-- Adjust the fields attributes for dta_company-->
-  <record model="res.partner.bank.type.field" id="iban_field">
-    <field name="name">iban</field>
-    <field name="bank_type_id" ref="bank_dta"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-
-
-  <!-- Adjust the fields attributes for dta_iban-->
-  <record model="res.partner.bank.type.field" id="iban_field_iban">
-    <field name="name">iban</field>
-    <field name="bank_type_id" ref="dta_iban"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-  <record model="res.partner.bank.type.field" id="bank_field_iban">
-    <field name="name">bank</field>
-    <field name="bank_type_id" ref="dta_iban"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-
-
-  <!-- Adjust the fields attributes for bvrbank-->
-  <record model="res.partner.bank.type.field" id="bank_field_bvrbank">
-    <field name="name">bank</field>
-    <field name="bank_type_id" ref="bvrbank"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-  <record model="res.partner.bank.type.field" id="bvr_num_field_bvrbank">
-    <field name="name">post_number</field>
-    <field name="bank_type_id" ref="bvrbank"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-
-  <!-- Adjust the fields attributes for bvrpost-->
-  <record model="res.partner.bank.type.field" id="bank_field_bvrpost">
-    <field name="name">bank</field>
-    <field name="bank_type_id" ref="bvrpost"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-  <record model="res.partner.bank.type.field" id="bvr_num_field_bvrpost">
-    <field name="name">post_number</field>
-    <field name="bank_type_id" ref="bvrpost"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-
-  <!-- Adjust the fields attributes for bvpost -->
-  <record model="res.partner.bank.type.field" id="bank_field_bvpost">
-    <field name="name">bank</field>
-    <field name="bank_type_id" ref="bvpost"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-  <record model="res.partner.bank.type.field" id="post_field_bvpost">
-    <field name="name">post_number</field>
-    <field name="bank_type_id" ref="bvpost"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-
-  <!-- Adjust the fields attributes for bvbank -->
-  <record model="res.partner.bank.type.field" id="bank_field_bvbank">
-    <field name="name">bank</field>
-    <field name="bank_type_id" ref="bvbank"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-  
-  <record model="res.partner.bank.type.field" id="acc_num_field_bvbank">
-    <field name="name">acc_number</field>
-    <field name="bank_type_id" ref="bvbank"/>
-    <field name="required" eval="True"/>
-    <field name="readonly" eval="False"/>
-  </record>
-
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_ch/dta_view.xml b/addons/l10n_ch/dta_view.xml
deleted file mode 100644
index 869eacae6f1..00000000000
--- a/addons/l10n_ch/dta_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        
-        <!-- Inherit both bank view -->
-        <record model="ir.ui.view" id="view_partner_bank_form">
-            <field name="name">partner - bank 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="acc_number" position="after">
-                    <newline/>
-                    <field name="bvr_adherent_num"/>
-                    <field name="post_number"/>
-                    <field name="dta_code"/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_partner_bank_form2">
-            <field name="name">partner - bank inherit</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_bank_form"/>
-            <field name="arch" type="xml">
-                <field name="acc_number" position="after">
-                    <newline/>
-                    <field name="bvr_adherent_num"/>
-                    <field name="post_number"/>
-                    <field name="dta_code"/>
-                </field>
-            </field>
-        </record>
-        
-    </data>
-</openerp>
diff --git a/addons/l10n_ch/i18n/ar.po b/addons/l10n_ch/i18n/ar.po
index 4f14b0d05e2..fc5a94e71b9 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 aae03f42d33..3928a2a970b 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3c245f5a6fe..1fdd270f5e0 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4aafb6f597a..c5587b9d08b 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
@@ -254,23 +254,23 @@ msgstr "Imprimeix"
 #: code:addons/l10n_ch/wizard/create_dta.py:0
 #, python-format
 msgid "You must provide a Clearing Number for your bank account."
-msgstr ""
+msgstr "Heu de proporcionar un número de compensació del seu compte bancari."
 
 #. module: l10n_ch
 #: view:create.dta.wizard:0
 msgid "Click on 'Save as' to save the DTA file :"
-msgstr ""
+msgstr "Pressioneu sobre 'Desa com' per desar el fitxer DTA:"
 
 #. module: l10n_ch
 #: view:create.dta.wizard:0
 msgid "DTA file creation - Results"
-msgstr ""
+msgstr "Creació arxiu DTA -Resultats"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_sir
 #: model:res.partner.title,name:l10n_ch.res_partner_title_sir
 msgid "Monsieur"
-msgstr ""
+msgstr "Senyor"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -280,33 +280,36 @@ msgid ""
 "for the partner bank: %s\n"
 "on line: %s"
 msgstr ""
+"Heu de proporcionar un número d'enviament\n"
+"per al compte bancari: %s\n"
+"en línia: %s"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_closed
 msgid "Autre : Closed"
-msgstr ""
+msgstr "Altres: Tancat"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_financial_result
 msgid "PP : Resultat financier"
-msgstr ""
+msgstr "PP: Resultat financer"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "The properties account payable account receivable"
-msgstr ""
+msgstr "Les propietats compte a pagar compte a cobrar"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_mme_m
 #: model:res.partner.title,name:l10n_ch.res_partner_title_mme_m
 msgid "Madame, Monsieur,"
-msgstr ""
+msgstr "Senyora, Senyor,"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_payable
 msgid "Bilan : Fournisseurs"
-msgstr ""
+msgstr "Balanç : proveïdors"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -316,16 +319,19 @@ msgid ""
 " %d\n"
 "' +                         'on line: %s"
 msgstr ""
+"Heu d'informar la ciutat del banc o el codi bic per al banc de l'empresa:\n"
+" %d\n"
+"'+' on line %s"
 
 #. module: l10n_ch
 #: view:bvr.report:0
 msgid "BVR Report"
-msgstr ""
+msgstr "Informe BVR"
 
 #. module: l10n_ch
 #: field:res.partner.bank,print_bank:0
 msgid "Print Bank on BVR"
-msgstr ""
+msgstr "Imprimeix banc en BVR"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type.field,name:l10n_ch.iban_field
@@ -336,29 +342,29 @@ msgstr "IBAN"
 #. module: l10n_ch
 #: sql_constraint:res.partner.bank:0
 msgid "The BVR adherent number must be unique !"
-msgstr ""
+msgstr "El número BVR adherent ha de ser únic!"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "no implementat"
 
 #. module: l10n_ch
 #: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_madame
 #: model:res.partner.title,shortcut:l10n_ch.res_partner_title_madame
 msgid "Mme."
-msgstr ""
+msgstr "Sra."
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_bvr_invoices_report
 msgid "bvr.invoices.report"
-msgstr ""
+msgstr "bvr.factures.reporte"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_view
 msgid "Autre : Vue"
-msgstr ""
+msgstr "Altres: Vista"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_report.py:0
@@ -368,6 +374,9 @@ msgid ""
 "Please check your company information for the invoice:\n"
 "%s"
 msgstr ""
+"El seu codi BVR adherent ha de tenir 7 dígits exactament!\n"
+"Si us plau verifiqueu la informació de la seva companyia per la factura:\n"
+"%s"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -376,11 +385,13 @@ msgid ""
 "You must provide a BVR number\n"
 "for the bank account: %son line: %s"
 msgstr ""
+"Heu d'informar un número BVR\n"
+"per al compte bancari: %s en la línia:%s"
 
 #. module: l10n_ch
 #: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_invoices_report
 msgid "Invoices BVR"
-msgstr ""
+msgstr "Factures BVR"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -390,68 +401,71 @@ msgid ""
 "for the partner: %s \n"
 "on line: %s"
 msgstr ""
+"No s'ha definit l'adreça\n"
+"per a l'empresa: %s\n"
+"en la línia: %s"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Recursive mod10 is invalid for reference: %s"
-msgstr ""
+msgstr "Mod10 recursiu és invàlid per a la referència: %s"
 
 #. module: l10n_ch
 #: view:account.bank.statement:0
 msgid "Import BVR"
-msgstr ""
+msgstr "Importa BVR"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_adj_liability
 msgid "Bilan : Passifs de regularisation"
-msgstr ""
+msgstr "Balanç: Passius de regularització"
 
 #. module: l10n_ch
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursius."
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
 #, python-format
 msgid "No payment mode"
-msgstr ""
+msgstr "No existeix mètode de pagament"
 
 #. module: l10n_ch
 #: field:bvr.import.wizard,file:0
 msgid "BVR File"
-msgstr ""
+msgstr "Fitxer BVR"
 
 #. module: l10n_ch
 #: view:bvr.import.wizard:0
 msgid "Import"
-msgstr ""
+msgstr "Importa"
 
 #. module: l10n_ch
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Error: Número BVR no vàlid (checksum erroni)."
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_non_ope_debts
 msgid "Bilan : Dettes hors exploitation"
-msgstr ""
+msgstr "Balanç : Deutes fora d'explotació"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_depreciation
 msgid "PP : Amortissement"
-msgstr ""
+msgstr "PP : Amortizació"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_other
 msgid "Autre : Other"
-msgstr ""
+msgstr "Autre: Altre"
 
 #. module: l10n_ch
 #: field:res.partner.bank,bvr_adherent_num:0
 msgid "BVR adherent number"
-msgstr ""
+msgstr "Número seguiment BVR"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -461,31 +475,35 @@ msgid ""
 "for the partner bank: %s\n"
 "on line: %s"
 msgstr ""
+"Heu d'informar un número de banc\n"
+"per al banc de l'empresa: %s\n"
+"en la línia: %s"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_purchase
 msgid "PP : Achat de marchandise"
-msgstr ""
+msgstr "PP : Compra de productes"
 
 #. module: l10n_ch
 #: field:res.company,bvr_delta_horz:0
 msgid "BVR Horz. Delta (mm)"
-msgstr ""
+msgstr "Delta horitz. BVR (mm)"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_receivable
 msgid "Bilan : Debiteurs"
-msgstr ""
+msgstr "Balanç: Deutors"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Apunts comptables"
 
 #. module: l10n_ch
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
 msgstr ""
+"La companyia ha de ser la mateixa que la dels comptes i períodes relacionats."
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -495,38 +513,41 @@ msgid ""
 "for the bank account: %s\n"
 "' +                         'on line: %s"
 msgstr ""
+"No s'ha definit l'IBAN\n"
+"per al compte bancari: %s\n"
+"'+' en la línia: %s"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_non_ope_asset
 msgid "Bilan : Actifs hors exploitation"
-msgstr ""
+msgstr "Balanç: Actius no d'explotació"
 
 #. module: l10n_ch
 #: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mlle
 #: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mlle
 msgid "Mlle"
-msgstr ""
+msgstr "Srta."
 
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.bank_dta
 msgid "Ordering party DTA"
-msgstr ""
+msgstr "Part ordenant DTA"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_madame
 #: model:res.partner.title,name:l10n_ch.res_partner_title_madame
 msgid "Madame"
-msgstr ""
+msgstr "Sra."
 
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.bvpost
 msgid "DTA-BVPOST"
-msgstr ""
+msgstr "DTA-BVPOST"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
@@ -539,7 +560,7 @@ msgstr "Error"
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_societe
 #: model:res.partner.title,name:l10n_ch.res_partner_title_societe
 msgid "Société"
-msgstr ""
+msgstr "Societat"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_report.py:0
@@ -549,48 +570,51 @@ msgid ""
 "Please check your company information for the invoice:\n"
 "%s"
 msgstr ""
+"El seu número BVR del banc ha de tenir aquest format: 0X-XXX-X!\n"
+"Si us plau verifiqueu la informació de la seva companyia per la factura:\n"
+"%s"
 
 #. module: l10n_ch
 #: field:res.partner.bank,dta_code:0
 msgid "DTA code"
-msgstr ""
+msgstr "Codi DTA"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_mlle
 #: model:res.partner.title,name:l10n_ch.res_partner_title_mlle
 msgid "Mademoiselle"
-msgstr ""
+msgstr "Senyoreta"
 
 #. module: l10n_ch
 #: model:ir.module.module,shortdesc:l10n_ch.module_meta_information
 msgid "Switzerland localisation corrected by Camptocamp"
-msgstr ""
+msgstr "Localizació Suiza corregida per Camptocamp"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Comptes bancaris"
 
 #. module: l10n_ch
 #: view:create.dta.wizard:0
 #: model:ir.actions.act_window,name:l10n_ch.action_dta_create
 msgid "Create DTA"
-msgstr ""
+msgstr "Crea DTA"
 
 #. module: l10n_ch
 #: field:res.partner.bank,post_number:0
 msgid "Post number"
-msgstr ""
+msgstr "Número postal"
 
 #. module: l10n_ch
 #: field:create.dta.wizard,dta_file:0
 msgid "DTA File"
-msgstr ""
+msgstr "Arxiu DTA"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: l10n_ch
 #: view:bvr.import.wizard:0
@@ -598,32 +622,32 @@ msgstr ""
 #: view:bvr.report:0
 #: view:create.dta.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_inventory
 msgid "Bilan : Stocks"
-msgstr ""
+msgstr "Balanç : Existències"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_personnal_exp
 msgid "PP : Charge de personnel"
-msgstr ""
+msgstr "PP : Despesa de personal"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type.field,name:l10n_ch.post_field_bvpost
 msgid "post_number"
-msgstr ""
+msgstr "post_number"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_payment_order
 msgid "Payment Order"
-msgstr ""
+msgstr "Ordre de pagament"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_report_result
 msgid "Bilan : Resultat reporte"
-msgstr ""
+msgstr "Balance : informe resultat"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -634,17 +658,21 @@ msgid ""
 "on the partner: %s\n"
 "on line: %s"
 msgstr ""
+"No s'ha definit el banc\n"
+"per al compte bancari: %s\n"
+"en l'empresa: %s\n"
+"en la línia :%s"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Too much total record found!"
-msgstr ""
+msgstr "Molts registres totals trobats!"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_create_dta_wizard
 msgid "create.dta.wizard"
-msgstr ""
+msgstr "crea.dta.assistent"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -654,38 +682,41 @@ msgid ""
 "for the partner bank: %s\n"
 "on line %s"
 msgstr ""
+"Heu de proporcionar un nombre de liquidació\n"
+"per al banc de l'empresa: %s\n"
+"en la línia %s"
 
 #. module: l10n_ch
 #: field:res.partner.bank,print_account:0
 msgid "Print Account Number on BVR"
-msgstr ""
+msgstr "Imprimeix número de compte en BVR"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_bank
 msgid "Bank"
-msgstr ""
+msgstr "Banc"
 
 #. module: l10n_ch
 #: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mme_m
 #: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mme_m
 msgid "Mme,m"
-msgstr ""
+msgstr "Sra"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.bvrbank
 msgid "DTA-BVRBANK"
-msgstr ""
+msgstr "DTA-BVRBANK"
 
 #. module: l10n_ch
 #: field:bvr.invoices.report,name:0
 #: field:bvr.report,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_consolidation
 msgid "Autre : Consolidation"
-msgstr ""
+msgstr "Altres : Consolidació"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -694,37 +725,39 @@ msgid ""
 "You must provide a valid BVR reference number \n"
 "for the line: %s"
 msgstr ""
+"Ha d'informar d'un número de referència BVR vàlid\n"
+"per a la línia: %s"
 
 #. module: l10n_ch
 #: view:bvr.invoices.report:0
 msgid "Print BVR Invoice Report"
-msgstr ""
+msgstr "Imprimeix informe factura BVR"
 
 #. module: l10n_ch
 #: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_societe
 #: model:res.partner.title,shortcut:l10n_ch.res_partner_title_societe
 msgid "sc"
-msgstr ""
+msgstr "sc"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_income
 msgid "PP : Chiffre d'affaires"
-msgstr ""
+msgstr "PP : volúmen de negocis"
 
 #. module: l10n_ch
 #: help:res.company,bvr_delta_vert:0
 msgid "vert. delta in mm 1.2 will print the bvz 1.2mm lefter"
-msgstr ""
+msgstr "vert. delta en mm 1.2 imprimirà el bvz 1.2mm a l'esquerra"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_non_ope_result
 msgid "PP : Resultat activites annexes"
-msgstr ""
+msgstr "PP : Resultat d'activitats annexes"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.dta_iban
 msgid "DTA-IBAN"
-msgstr ""
+msgstr "DTA-IBAN"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type.field,name:l10n_ch.acc_num_field_bvbank
@@ -734,7 +767,7 @@ msgstr "Número compte"
 #. module: l10n_ch
 #: field:res.company,bvr_delta_vert:0
 msgid "BVR Vert. Delta (mm)"
-msgstr ""
+msgstr "Delta vert. BVR (mm)"
 
 #. module: l10n_ch
 #: model:ir.actions.todo,note:l10n_ch.config_call_account_template_l10n_ch
@@ -750,43 +783,55 @@ msgid ""
 "Accounting/Financial\n"
 "                Accounts/Generate Chart of Accounts from a Chart Template."
 msgstr ""
+"Genera un pla general comptable a partir d'una plantilla de pla comptable. "
+"Se li demanarà\n"
+"                el nom de l'empresa, la plantilla a utilitzar, el número de "
+"dígits per\n"
+"                generar els codis dels comptes, el compte bancari, la moneda "
+"per crear els diaris.\n"
+"                A continuació es genera la còpia de la plantilla. Aquest és "
+"el mateix assistent que s'executa\n"
+"                des de Comptabilitat/Configuració/Comptabilitat "
+"financera/Comptes\n"
+"                financers/Generar pla general comptable a partir d'una "
+"plantilla de pla comptable."
 
 #. module: l10n_ch
 #: help:res.company,bvr_delta_horz:0
 msgid "horiz. delta in mm 1.2 will print the bvz 1.2mm lefter"
-msgstr ""
+msgstr "horiz. delta en mm 1.2 imprimirà el bvz 1.2mm a l'esquerra"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_building_asset
 msgid "Bilan : Immo corporelles immobilieres"
-msgstr ""
+msgstr "Balanç: Immobilitzat immobiliari"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_bvr_import_wizard
 msgid "bvr.import.wizard"
-msgstr ""
+msgstr "bvr.importa.assistent"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrbank
 #: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrpost
 msgid "bvr_number"
-msgstr ""
+msgstr "bvr_número"
 
 #. module: l10n_ch
 #: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_sir
 #: model:res.partner.title,shortcut:l10n_ch.res_partner_title_sir
 msgid "M. "
-msgstr ""
+msgstr "Sr. "
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_closing
 msgid "Autre : Cloture"
-msgstr ""
+msgstr "Altre : Tancament"
 
 #. module: l10n_ch
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
 
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "El CIF/NIF no sembla ser correcte."
diff --git a/addons/l10n_ch/i18n/cs.po b/addons/l10n_ch/i18n/cs.po
index b634fe1e298..0f0467c0a01 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 59e9a0a62ee..42f0e197822 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6da4768fdfe..703a3b6d801 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e79ca60b3e7..bc19b798cfa 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/es_MX.po b/addons/l10n_ch/i18n/es_MX.po
new file mode 100644
index 00000000000..abe384e5eb0
--- /dev/null
+++ b/addons/l10n_ch/i18n/es_MX.po
@@ -0,0 +1,1029 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_ch
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-12-10 17:15+0000\n"
+"PO-Revision-Date: 2011-01-18 18:35+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:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_account_tax_code
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+msgid "BVR Invoices Report"
+msgstr "Informe de facturas BVR"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_intangible_asset
+msgid "Bilan : Immo incorporelles"
+msgstr "Balance: Inmovilizaciones intangibles"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No bank name defined\n"
+"for the bank account: %s\n"
+"on the partner: %s\n"
+"on line: %s"
+msgstr ""
+"Nombre de banco no definido\n"
+"para la cuenta del banco: %s\n"
+"de la empresa: %s\n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_payable
+msgid "Bilan : Autres creanciers à CT"
+msgstr "Balance: Otros acreedores a corto plazo"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_ope_exp
+msgid "PP : Autres charges d'exploitation"
+msgstr "PP: Otros cargos de explotación"
+
+#. module: l10n_ch
+#: view:bvr.report:0
+msgid "Print BVR Report"
+msgstr "Imprimir informe BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No bank account for the company."
+msgstr "Sin cuenta bancaria para la compañía."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Record found after total record!"
+msgstr "¡Registro encontrado tras registro total!"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvrpost
+msgid "DTA-BVRPOST"
+msgstr "DTA-BVRPOST"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_prov_reserve
+msgid "Bilan : Provisions et reserves"
+msgstr "Balance: Provisiones y reservas"
+
+#. module: l10n_ch
+#: view:bvr.import.wizard:0
+#: model:ir.actions.act_window,name:l10n_ch.wizard_bvr_import
+msgid "BVR Import"
+msgstr "Importar BVR"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_equity
+msgid "Bilan : Capitaux propres"
+msgstr "Balance : Capitales propios"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_fixed_asset
+msgid "Bilan : Immo corporelles mobilieres"
+msgstr "Balance : Inmovilizaciones tangibles mobiliarias"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_cash
+msgid "Bilan : Liquidites et titres"
+msgstr "Balance: Liquidez y títulos"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "The Bank type %s of the bank account: %s is not supported"
+msgstr "El tipo bancario %s de la cuenta bancaria: %s no está permitido"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No bank account defined\n"
+"on line: %s"
+msgstr ""
+"No está definida la cuenta bancaria\n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_receivable
+msgid "Bilan : Autres créances"
+msgstr "Balance: Otras deudas"
+
+#. module: l10n_ch
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No puede crear un apunte en una cuenta cerrada."
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_adjusting_asset
+msgid "Bilan : Actif de regularisation"
+msgstr "Balance : Activos de regularización"
+
+#. module: l10n_ch
+#: 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!"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_report
+msgid "bvr.report"
+msgstr "bvr.informe"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvbank
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvpost
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvrbank
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvrpost
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_iban
+msgid "bank"
+msgstr "banco"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: l10n_ch
+#: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_report
+msgid "BVR"
+msgstr "BVR"
+
+#. module: l10n_ch
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "¡Error! No se pueden crear cuentas recursivas."
+
+#. module: l10n_ch
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr "Error: Referencia BVR es necesaria."
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_lt_liability
+msgid "Bilan : Dettes à LT"
+msgstr "Balance : Deudas largo plazo"
+
+#. module: l10n_ch
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear un apunte en una cuenta a cobrar/a pagar sin una empresa."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Total record different from the computed!"
+msgstr "¡Registro total diferente del calculado!"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid ""
+"No bank specified on invoice:\n"
+"%s"
+msgstr ""
+"Sin banco especificado en la factura:\n"
+"%s"
+
+#. module: l10n_ch
+#: field:res.partner.bank,bvr_number:0
+msgid "BVR account number"
+msgstr "Número de cuenta BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Number record different from the computed!"
+msgstr "¡Número de registros diferente del calculado!"
+
+#. module: l10n_ch
+#: field:res.bank,clearing:0
+msgid "Clearing number"
+msgstr "Número exoneratorio"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvbank
+msgid "DTA-BVBANK"
+msgstr "DTA-BVBANK"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_financial_asset
+msgid "Bilan : Immobilisations financieres"
+msgstr "Balance: Inmovilizaciones financieras"
+
+#. module: l10n_ch
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No IBAN for the company bank account."
+msgstr "Sin IBAN en la cuenta bancaria de la compañía."
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+#: view:bvr.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a Clearing Number for your bank account."
+msgstr "Debe proportcionar un número exoneratorio en su cuenta bancaria."
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+msgid "Click on 'Save as' to save the DTA file :"
+msgstr "Presione sobre 'Guardar como' para  guardar el fichero DTA:"
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+msgid "DTA file creation - Results"
+msgstr "Creación archivo DTA - Resultados"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_sir
+#: model:res.partner.title,name:l10n_ch.res_partner_title_sir
+msgid "Monsieur"
+msgstr "Don"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a post number \n"
+"for the partner bank: %s\n"
+"on line: %s"
+msgstr ""
+"Debe proporcionar un número de envío \n"
+"para la cuenta bancaria: %s\n"
+"en línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_closed
+msgid "Autre : Closed"
+msgstr "Otros: Cerrado"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_financial_result
+msgid "PP : Resultat financier"
+msgstr "PP: Resultado financiero"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "The properties account payable account receivable"
+msgstr "Las propiedades cuenta a pagar cuenta a cobrar"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_mme_m
+#: model:res.partner.title,name:l10n_ch.res_partner_title_mme_m
+msgid "Madame, Monsieur,"
+msgstr "Doña, Don,"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_payable
+msgid "Bilan : Fournisseurs"
+msgstr "Balance : proovedores"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide the bank city or the bic code for the partner bank: \n"
+" %d\n"
+"' +                         'on line: %s"
+msgstr ""
+"Debe informar la ciudad del banco o el código bic para el banco de la "
+"empresa: \n"
+"%d\n"
+"'+' on line: %s"
+
+#. module: l10n_ch
+#: view:bvr.report:0
+msgid "BVR Report"
+msgstr "Informe BVR"
+
+#. module: l10n_ch
+#: field:res.partner.bank,print_bank:0
+msgid "Print Bank on BVR"
+msgstr "Imprimir banco en BVR"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.iban_field
+#: model:res.partner.bank.type.field,name:l10n_ch.iban_field_iban
+msgid "iban"
+msgstr "IBAN"
+
+#. module: l10n_ch
+#: sql_constraint:res.partner.bank:0
+msgid "The BVR adherent number must be unique !"
+msgstr "¡El código adherente BVR debe ser único!"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "not implemented"
+msgstr "no implementado"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_madame
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_madame
+msgid "Mme."
+msgstr "Sra."
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_invoices_report
+msgid "bvr.invoices.report"
+msgstr "bvr.facturas.reporte"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_view
+msgid "Autre : Vue"
+msgstr "Otros: Vista"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid ""
+"Your bank BVR adherent number must contain exactly seven digits!\n"
+"Please check your company information for the invoice:\n"
+"%s"
+msgstr ""
+"¡Su código adherente BVR debe contener 7 dígitos exactamente!\n"
+"Por favor verifique la infomación de su compañía para la factura:\n"
+"%s"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a BVR number\n"
+"for the bank account: %son line: %s"
+msgstr ""
+"Debe informar un número BVR\n"
+"para la cuenta bancaria: %s en la línea:%s"
+
+#. module: l10n_ch
+#: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_invoices_report
+msgid "Invoices BVR"
+msgstr "Facturas BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No address defined \n"
+"for the partner: %s \n"
+"on line: %s"
+msgstr ""
+"No se ha definido la dirección \n"
+"para la empresa: %s \n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Recursive mod10 is invalid for reference: %s"
+msgstr "Mod10 recursivo es inválido para la referencia: %s"
+
+#. module: l10n_ch
+#: view:account.bank.statement:0
+msgid "Import BVR"
+msgstr "Importar BVR"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_adj_liability
+msgid "Bilan : Passifs de regularisation"
+msgstr "Balance: Pasivos de regularización"
+
+#. module: l10n_ch
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No payment mode"
+msgstr "No existe método de pago"
+
+#. module: l10n_ch
+#: field:bvr.import.wizard,file:0
+msgid "BVR File"
+msgstr "Fichero BVR"
+
+#. module: l10n_ch
+#: view:bvr.import.wizard:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: l10n_ch
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr "Error: Número BVR inválido (checksum erróneo)."
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_debts
+msgid "Bilan : Dettes hors exploitation"
+msgstr "Balance : Deudas fuera de explotación"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_depreciation
+msgid "PP : Amortissement"
+msgstr "PP : Amortización"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other
+msgid "Autre : Other"
+msgstr "Autre: Otro"
+
+#. module: l10n_ch
+#: field:res.partner.bank,bvr_adherent_num:0
+msgid "BVR adherent number"
+msgstr "Número seguimiento BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a bank number \n"
+"for the partner bank: %s\n"
+"on line: %s"
+msgstr ""
+"Debe informar un número de banco \n"
+"para el banco de la empresa: %s\n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_purchase
+msgid "PP : Achat de marchandise"
+msgstr "PP : Compra de productos"
+
+#. module: l10n_ch
+#: field:res.company,bvr_delta_horz:0
+msgid "BVR Horz. Delta (mm)"
+msgstr "Delta horz. BVR (mm)"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_receivable
+msgid "Bilan : Debiteurs"
+msgstr "Balance: Deudores"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes"
+
+#. module: l10n_ch
+#: 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."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No IBAN defined \n"
+"for the bank account: %s\n"
+"' +                         'on line: %s"
+msgstr ""
+"No se ha definido el IBAN \n"
+"para la cuenta bancaria: %s\n"
+"'+' en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_asset
+msgid "Bilan : Actifs hors exploitation"
+msgstr "Balance: Activos no explotación"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mlle
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mlle
+msgid "Mlle"
+msgstr "Srta."
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bank_dta
+msgid "Ordering party DTA"
+msgstr "Parte ordenante DTA"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_madame
+#: model:res.partner.title,name:l10n_ch.res_partner_title_madame
+msgid "Madame"
+msgstr "Doña"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvpost
+msgid "DTA-BVPOST"
+msgstr "DTA-BVPOST"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_societe
+#: model:res.partner.title,name:l10n_ch.res_partner_title_societe
+msgid "Société"
+msgstr "Sociedad"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid ""
+"Your bank BVR number should be of the form 0X-XXX-X!\n"
+"Please check your company information for the invoice:\n"
+"%s"
+msgstr ""
+"¡Su número BVR del banco debe tener este formato: 0X-XXX-X!\n"
+"Por favor verifique la información de su compañía para la factura:\n"
+"%s"
+
+#. module: l10n_ch
+#: field:res.partner.bank,dta_code:0
+msgid "DTA code"
+msgstr "Código DTA"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_mlle
+#: model:res.partner.title,name:l10n_ch.res_partner_title_mlle
+msgid "Mademoiselle"
+msgstr "Señorita"
+
+#. module: l10n_ch
+#: model:ir.module.module,shortdesc:l10n_ch.module_meta_information
+msgid "Switzerland localisation corrected by Camptocamp"
+msgstr "Localización Suiza corregida por Camptocamp"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+#: model:ir.actions.act_window,name:l10n_ch.action_dta_create
+msgid "Create DTA"
+msgstr "Crear DTA"
+
+#. module: l10n_ch
+#: field:res.partner.bank,post_number:0
+msgid "Post number"
+msgstr "Número postal"
+
+#. module: l10n_ch
+#: field:create.dta.wizard,dta_file:0
+msgid "DTA File"
+msgstr "Archivo DTA"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: l10n_ch
+#: view:bvr.import.wizard:0
+#: view:bvr.invoices.report:0
+#: view:bvr.report:0
+#: view:create.dta.wizard:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_inventory
+msgid "Bilan : Stocks"
+msgstr "Balance : Existencias"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_personnal_exp
+msgid "PP : Charge de personnel"
+msgstr "PP : Gasto de personal"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.post_field_bvpost
+msgid "post_number"
+msgstr "post_number"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_payment_order
+msgid "Payment Order"
+msgstr "Orden de pago"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_report_result
+msgid "Bilan : Resultat reporte"
+msgstr "Balance : resultado reportado"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No bank defined\n"
+"for the bank account: %s\n"
+"on the partner: %s\n"
+"on line: %s"
+msgstr ""
+"No se ha definido el banco\n"
+"para la cuenta bancaria: %s\n"
+"en la empresa: %s\n"
+"en la línea :%s"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Too much total record found!"
+msgstr "¡Demasiados registros totales encontrados!"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_create_dta_wizard
+msgid "create.dta.wizard"
+msgstr "crear.dta.asistente"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a Clearing Number\n"
+"for the partner bank: %s\n"
+"on line %s"
+msgstr ""
+"Debe proporcionar un número de liquidación\n"
+"para el banco de la empresa: %s\n"
+"en la línea %s"
+
+#. module: l10n_ch
+#: field:res.partner.bank,print_account:0
+msgid "Print Account Number on BVR"
+msgstr "Imprimir número de cuenta en BVR"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_bank
+msgid "Bank"
+msgstr "Banco"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mme_m
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mme_m
+msgid "Mme,m"
+msgstr "Sra"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvrbank
+msgid "DTA-BVRBANK"
+msgstr "DTA-BVRBANK"
+
+#. module: l10n_ch
+#: field:bvr.invoices.report,name:0
+#: field:bvr.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_consolidation
+msgid "Autre : Consolidation"
+msgstr "Otro : Consolidación"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a valid BVR reference number \n"
+"for the line: %s"
+msgstr ""
+"Debe informar un número de referencia BVR válido\n"
+"para la línea: %s"
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+msgid "Print BVR Invoice Report"
+msgstr "Imprimir informe factura BVR"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_societe
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_societe
+msgid "sc"
+msgstr "sc"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_income
+msgid "PP : Chiffre d'affaires"
+msgstr "PP : volúmen de negocios"
+
+#. module: l10n_ch
+#: help:res.company,bvr_delta_vert:0
+msgid "vert. delta in mm 1.2 will print the bvz 1.2mm lefter"
+msgstr "vert. delta en mm 1.2 imprimirá el bvz 1.2mm a la izquierda"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_result
+msgid "PP : Resultat activites annexes"
+msgstr "PP : Resultado de actividades anexas"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.dta_iban
+msgid "DTA-IBAN"
+msgstr "DTA-IBAN"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.acc_num_field_bvbank
+msgid "acc_number"
+msgstr "Número cuenta"
+
+#. module: l10n_ch
+#: field:res.company,bvr_delta_vert:0
+msgid "BVR Vert. Delta (mm)"
+msgstr "Delta vert. BVR (mm)"
+
+#. module: l10n_ch
+#: model:ir.actions.todo,note:l10n_ch.config_call_account_template_l10n_ch
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked\n"
+"                to pass the name of the company, the chart template to "
+"follow, the no. of digits to\n"
+"                generate the code for your accounts and Bank account, "
+"currency to create Journals.\n"
+"                Thus,the pure copy of chart Template is generated. This is "
+"the same wizard that runs\n"
+"                from Financial Management/Configuration/Financial "
+"Accounting/Financial\n"
+"                Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+"Genera un plan general contable a partir de una plantilla de plan contable. "
+"Se le pedirá\n"
+"                el nombre de la empresa, la plantilla a utilizar, el número "
+"de dígitos para\n"
+"                generar los códigos de las cuentas, la cuenta bancaria, la "
+"moneda para crear los diarios.\n"
+"                A continuación se genera la copia de la plantilla. Este es "
+"el mismo asistente que se ejecuta\n"
+"                desde Contabilidad/Configuración/Contabilidad "
+"financiera/Cuentas\n"
+"                financieras/Generar plan general contable a partir de una "
+"plantilla de plan contable."
+
+#. module: l10n_ch
+#: help:res.company,bvr_delta_horz:0
+msgid "horiz. delta in mm 1.2 will print the bvz 1.2mm lefter"
+msgstr "horiz. delta en mm 1.2 imprimirá el bvz 1.2mm a la izquierda"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_building_asset
+msgid "Bilan : Immo corporelles immobilieres"
+msgstr "Balance: Inmovilizaciones corporales immobiliarias"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_import_wizard
+msgid "bvr.import.wizard"
+msgstr "bvr.importar.asistente"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrbank
+#: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrpost
+msgid "bvr_number"
+msgstr "bvr_number"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_sir
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_sir
+msgid "M. "
+msgstr "Sr. "
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_closing
+msgid "Autre : Cloture"
+msgstr "Otro : Cierre"
+
+#. module: l10n_ch
+#: 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."
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "El CIF/NIF no parece estar correcto."
+
+#~ 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 "Mail:"
+#~ msgstr "Correo:"
+
+#~ msgid "Thanks,"
+#~ msgstr "Gracias,"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "Invoice Date:"
+#~ msgstr "Fecha de factura:"
+
+#~ msgid "Refund"
+#~ msgstr "Reembolso"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "Amount"
+#~ msgstr "Cantidad"
+
+#~ msgid "', reference:"
+#~ msgstr "', referencia:"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#~ msgid "Tax"
+#~ msgstr "Impuesto"
+
+#~ msgid "Configure Journal"
+#~ msgstr "Configurar diario"
+
+#~ msgid "+"
+#~ msgstr "+"
+
+#~ msgid "Supplier Invoice"
+#~ msgstr "Factura de proveedor"
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid "Disc. (%)"
+#~ msgstr "Desc. (%)"
+
+#~ msgid "Dear customer,"
+#~ msgstr "Estimado cliente,"
+
+#~ msgid "Journal to set"
+#~ msgstr "Diario a establecer"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de la acción."
+
+#~ msgid "BVR A4 Sheet"
+#~ msgstr "BVR hoja A4"
+
+#~ msgid "The Default Debit Account of the account journal"
+#~ msgstr "La cuenta de debito por defecto del diario contable"
+
+#~ msgid "TVA (%)"
+#~ msgstr "IVA (%)"
+
+#~ msgid "Account Journal"
+#~ msgstr "Diario contable"
+
+#~ msgid "Remarque:"
+#~ msgstr "Observación:"
+
+#~ msgid "the currenty edited account journal"
+#~ msgstr "el diario contable actualmente editado"
+
+#~ msgid "Here is the BVR to allow you to pay the invoice '"
+#~ msgstr "Aquí está el BVR para permitirle pagar la factura'"
+
+#, python-format
+#~ msgid "No payment mode or payment type code invalid."
+#~ msgstr "Sin modo de pago o código de tipo de pago inválido."
+
+#~ msgid "VAT :"
+#~ msgstr "IVA :"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "account.journal.todo"
+#~ msgstr "account.journal.todo"
+
+#~ msgid "Invoice -"
+#~ msgstr "Factura -"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid "PRO-FORMA"
+#~ msgstr "PRO-FORMA"
+
+#~ msgid "Phone:"
+#~ msgstr "Teléfono:"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Invoice with BVR"
+#~ msgstr "Factura con BVR"
+
+#~ msgid "Subject:"
+#~ msgstr "Asunto:"
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "Condition"
+#~ msgstr "Condición"
+
+#~ msgid "TVA:"
+#~ msgstr "IVA:"
+
+#~ msgid "Default Debit Account"
+#~ msgstr "Cuenta debe por defecto"
+
+#~ msgid "The Default Credit Account of the account journal"
+#~ msgstr "La cuenta de crédito por defecto del diario contable"
+
+#~ msgid "The accounts linked to the account journals"
+#~ msgstr "Las cuentas asociadas a los diarios contables"
+
+#~ msgid "Taxes:"
+#~ msgstr "Impuestos:"
+
+#~ msgid "Price"
+#~ msgstr "Precio"
+
+#~ msgid "(incl. taxes):"
+#~ msgstr "(impuestos incl.):"
+
+#~ msgid "Unit Price"
+#~ msgstr "Precio unitario"
+
+#~ msgid "Default Credit Account"
+#~ msgstr "Cuenta haber por defecto"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
+#~ msgid "Total (excl. taxes):"
+#~ msgstr "Total (impuestos excl.):"
+
+#~ msgid "BVR file"
+#~ msgstr "Archivo BVR"
+
+#~ msgid "1cm 25.7cm 7cm 25.7cm"
+#~ msgstr "1cm 25.7cm 7cm 25.7cm"
+
+#~ msgid "Clic on 'Save as' to save the DTA file :"
+#~ msgstr "Pulse en \"Guardar como\" para guardar el archivo DTA:"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "1cm 27.7cm 20cm 27.7cm"
+#~ msgstr "1cm 27.7cm 20cm 27.7cm"
+
+#~ msgid "Supplier Refund"
+#~ msgstr "Factura rectificativa (abono) de proveedor"
+
+#~ msgid "Quantity"
+#~ msgstr "Cantidad"
+
+#~ msgid ""
+#~ "Set accounts on financial journals defined by\n"
+#~ "\t\t\tCamptocamp l10n_ch module"
+#~ msgstr ""
+#~ "Establece cuentas en los diarios financieros definidos por\n"
+#~ "\t\t\tel módulo Camptocamp l10n_ch"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Concerne:"
+#~ msgstr "Concierne:"
diff --git a/addons/l10n_ch/i18n/es_VE.po b/addons/l10n_ch/i18n/es_VE.po
new file mode 100644
index 00000000000..abe384e5eb0
--- /dev/null
+++ b/addons/l10n_ch/i18n/es_VE.po
@@ -0,0 +1,1029 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_ch
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-12-10 17:15+0000\n"
+"PO-Revision-Date: 2011-01-18 18:35+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:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_account_tax_code
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+msgid "BVR Invoices Report"
+msgstr "Informe de facturas BVR"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_intangible_asset
+msgid "Bilan : Immo incorporelles"
+msgstr "Balance: Inmovilizaciones intangibles"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No bank name defined\n"
+"for the bank account: %s\n"
+"on the partner: %s\n"
+"on line: %s"
+msgstr ""
+"Nombre de banco no definido\n"
+"para la cuenta del banco: %s\n"
+"de la empresa: %s\n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_payable
+msgid "Bilan : Autres creanciers à CT"
+msgstr "Balance: Otros acreedores a corto plazo"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_ope_exp
+msgid "PP : Autres charges d'exploitation"
+msgstr "PP: Otros cargos de explotación"
+
+#. module: l10n_ch
+#: view:bvr.report:0
+msgid "Print BVR Report"
+msgstr "Imprimir informe BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No bank account for the company."
+msgstr "Sin cuenta bancaria para la compañía."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Record found after total record!"
+msgstr "¡Registro encontrado tras registro total!"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvrpost
+msgid "DTA-BVRPOST"
+msgstr "DTA-BVRPOST"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_prov_reserve
+msgid "Bilan : Provisions et reserves"
+msgstr "Balance: Provisiones y reservas"
+
+#. module: l10n_ch
+#: view:bvr.import.wizard:0
+#: model:ir.actions.act_window,name:l10n_ch.wizard_bvr_import
+msgid "BVR Import"
+msgstr "Importar BVR"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_equity
+msgid "Bilan : Capitaux propres"
+msgstr "Balance : Capitales propios"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_fixed_asset
+msgid "Bilan : Immo corporelles mobilieres"
+msgstr "Balance : Inmovilizaciones tangibles mobiliarias"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_cash
+msgid "Bilan : Liquidites et titres"
+msgstr "Balance: Liquidez y títulos"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "The Bank type %s of the bank account: %s is not supported"
+msgstr "El tipo bancario %s de la cuenta bancaria: %s no está permitido"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No bank account defined\n"
+"on line: %s"
+msgstr ""
+"No está definida la cuenta bancaria\n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_receivable
+msgid "Bilan : Autres créances"
+msgstr "Balance: Otras deudas"
+
+#. module: l10n_ch
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No puede crear un apunte en una cuenta cerrada."
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_adjusting_asset
+msgid "Bilan : Actif de regularisation"
+msgstr "Balance : Activos de regularización"
+
+#. module: l10n_ch
+#: 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!"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_report
+msgid "bvr.report"
+msgstr "bvr.informe"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvbank
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvpost
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvrbank
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvrpost
+#: model:res.partner.bank.type.field,name:l10n_ch.bank_field_iban
+msgid "bank"
+msgstr "banco"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: l10n_ch
+#: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_report
+msgid "BVR"
+msgstr "BVR"
+
+#. module: l10n_ch
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "¡Error! No se pueden crear cuentas recursivas."
+
+#. module: l10n_ch
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr "Error: Referencia BVR es necesaria."
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_lt_liability
+msgid "Bilan : Dettes à LT"
+msgstr "Balance : Deudas largo plazo"
+
+#. module: l10n_ch
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear un apunte en una cuenta a cobrar/a pagar sin una empresa."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Total record different from the computed!"
+msgstr "¡Registro total diferente del calculado!"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid ""
+"No bank specified on invoice:\n"
+"%s"
+msgstr ""
+"Sin banco especificado en la factura:\n"
+"%s"
+
+#. module: l10n_ch
+#: field:res.partner.bank,bvr_number:0
+msgid "BVR account number"
+msgstr "Número de cuenta BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Number record different from the computed!"
+msgstr "¡Número de registros diferente del calculado!"
+
+#. module: l10n_ch
+#: field:res.bank,clearing:0
+msgid "Clearing number"
+msgstr "Número exoneratorio"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvbank
+msgid "DTA-BVBANK"
+msgstr "DTA-BVBANK"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_financial_asset
+msgid "Bilan : Immobilisations financieres"
+msgstr "Balance: Inmovilizaciones financieras"
+
+#. module: l10n_ch
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No IBAN for the company bank account."
+msgstr "Sin IBAN en la cuenta bancaria de la compañía."
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+#: view:bvr.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a Clearing Number for your bank account."
+msgstr "Debe proportcionar un número exoneratorio en su cuenta bancaria."
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+msgid "Click on 'Save as' to save the DTA file :"
+msgstr "Presione sobre 'Guardar como' para  guardar el fichero DTA:"
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+msgid "DTA file creation - Results"
+msgstr "Creación archivo DTA - Resultados"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_sir
+#: model:res.partner.title,name:l10n_ch.res_partner_title_sir
+msgid "Monsieur"
+msgstr "Don"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a post number \n"
+"for the partner bank: %s\n"
+"on line: %s"
+msgstr ""
+"Debe proporcionar un número de envío \n"
+"para la cuenta bancaria: %s\n"
+"en línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_closed
+msgid "Autre : Closed"
+msgstr "Otros: Cerrado"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_financial_result
+msgid "PP : Resultat financier"
+msgstr "PP: Resultado financiero"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "The properties account payable account receivable"
+msgstr "Las propiedades cuenta a pagar cuenta a cobrar"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_mme_m
+#: model:res.partner.title,name:l10n_ch.res_partner_title_mme_m
+msgid "Madame, Monsieur,"
+msgstr "Doña, Don,"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_payable
+msgid "Bilan : Fournisseurs"
+msgstr "Balance : proovedores"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide the bank city or the bic code for the partner bank: \n"
+" %d\n"
+"' +                         'on line: %s"
+msgstr ""
+"Debe informar la ciudad del banco o el código bic para el banco de la "
+"empresa: \n"
+"%d\n"
+"'+' on line: %s"
+
+#. module: l10n_ch
+#: view:bvr.report:0
+msgid "BVR Report"
+msgstr "Informe BVR"
+
+#. module: l10n_ch
+#: field:res.partner.bank,print_bank:0
+msgid "Print Bank on BVR"
+msgstr "Imprimir banco en BVR"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.iban_field
+#: model:res.partner.bank.type.field,name:l10n_ch.iban_field_iban
+msgid "iban"
+msgstr "IBAN"
+
+#. module: l10n_ch
+#: sql_constraint:res.partner.bank:0
+msgid "The BVR adherent number must be unique !"
+msgstr "¡El código adherente BVR debe ser único!"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "not implemented"
+msgstr "no implementado"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_madame
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_madame
+msgid "Mme."
+msgstr "Sra."
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_invoices_report
+msgid "bvr.invoices.report"
+msgstr "bvr.facturas.reporte"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_view
+msgid "Autre : Vue"
+msgstr "Otros: Vista"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid ""
+"Your bank BVR adherent number must contain exactly seven digits!\n"
+"Please check your company information for the invoice:\n"
+"%s"
+msgstr ""
+"¡Su código adherente BVR debe contener 7 dígitos exactamente!\n"
+"Por favor verifique la infomación de su compañía para la factura:\n"
+"%s"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a BVR number\n"
+"for the bank account: %son line: %s"
+msgstr ""
+"Debe informar un número BVR\n"
+"para la cuenta bancaria: %s en la línea:%s"
+
+#. module: l10n_ch
+#: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_invoices_report
+msgid "Invoices BVR"
+msgstr "Facturas BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No address defined \n"
+"for the partner: %s \n"
+"on line: %s"
+msgstr ""
+"No se ha definido la dirección \n"
+"para la empresa: %s \n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Recursive mod10 is invalid for reference: %s"
+msgstr "Mod10 recursivo es inválido para la referencia: %s"
+
+#. module: l10n_ch
+#: view:account.bank.statement:0
+msgid "Import BVR"
+msgstr "Importar BVR"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_adj_liability
+msgid "Bilan : Passifs de regularisation"
+msgstr "Balance: Pasivos de regularización"
+
+#. module: l10n_ch
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No payment mode"
+msgstr "No existe método de pago"
+
+#. module: l10n_ch
+#: field:bvr.import.wizard,file:0
+msgid "BVR File"
+msgstr "Fichero BVR"
+
+#. module: l10n_ch
+#: view:bvr.import.wizard:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: l10n_ch
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr "Error: Número BVR inválido (checksum erróneo)."
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_debts
+msgid "Bilan : Dettes hors exploitation"
+msgstr "Balance : Deudas fuera de explotación"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_depreciation
+msgid "PP : Amortissement"
+msgstr "PP : Amortización"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other
+msgid "Autre : Other"
+msgstr "Autre: Otro"
+
+#. module: l10n_ch
+#: field:res.partner.bank,bvr_adherent_num:0
+msgid "BVR adherent number"
+msgstr "Número seguimiento BVR"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a bank number \n"
+"for the partner bank: %s\n"
+"on line: %s"
+msgstr ""
+"Debe informar un número de banco \n"
+"para el banco de la empresa: %s\n"
+"en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_purchase
+msgid "PP : Achat de marchandise"
+msgstr "PP : Compra de productos"
+
+#. module: l10n_ch
+#: field:res.company,bvr_delta_horz:0
+msgid "BVR Horz. Delta (mm)"
+msgstr "Delta horz. BVR (mm)"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_receivable
+msgid "Bilan : Debiteurs"
+msgstr "Balance: Deudores"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_account_move_line
+msgid "Journal Items"
+msgstr "Apuntes"
+
+#. module: l10n_ch
+#: 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."
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No IBAN defined \n"
+"for the bank account: %s\n"
+"' +                         'on line: %s"
+msgstr ""
+"No se ha definido el IBAN \n"
+"para la cuenta bancaria: %s\n"
+"'+' en la línea: %s"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_asset
+msgid "Bilan : Actifs hors exploitation"
+msgstr "Balance: Activos no explotación"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mlle
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mlle
+msgid "Mlle"
+msgstr "Srta."
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bank_dta
+msgid "Ordering party DTA"
+msgstr "Parte ordenante DTA"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_madame
+#: model:res.partner.title,name:l10n_ch.res_partner_title_madame
+msgid "Madame"
+msgstr "Doña"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvpost
+msgid "DTA-BVPOST"
+msgstr "DTA-BVPOST"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_societe
+#: model:res.partner.title,name:l10n_ch.res_partner_title_societe
+msgid "Société"
+msgstr "Sociedad"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid ""
+"Your bank BVR number should be of the form 0X-XXX-X!\n"
+"Please check your company information for the invoice:\n"
+"%s"
+msgstr ""
+"¡Su número BVR del banco debe tener este formato: 0X-XXX-X!\n"
+"Por favor verifique la información de su compañía para la factura:\n"
+"%s"
+
+#. module: l10n_ch
+#: field:res.partner.bank,dta_code:0
+msgid "DTA code"
+msgstr "Código DTA"
+
+#. module: l10n_ch
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_mlle
+#: model:res.partner.title,name:l10n_ch.res_partner_title_mlle
+msgid "Mademoiselle"
+msgstr "Señorita"
+
+#. module: l10n_ch
+#: model:ir.module.module,shortdesc:l10n_ch.module_meta_information
+msgid "Switzerland localisation corrected by Camptocamp"
+msgstr "Localización Suiza corregida por Camptocamp"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+#: model:ir.actions.act_window,name:l10n_ch.action_dta_create
+msgid "Create DTA"
+msgstr "Crear DTA"
+
+#. module: l10n_ch
+#: field:res.partner.bank,post_number:0
+msgid "Post number"
+msgstr "Número postal"
+
+#. module: l10n_ch
+#: field:create.dta.wizard,dta_file:0
+msgid "DTA File"
+msgstr "Archivo DTA"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: l10n_ch
+#: view:bvr.import.wizard:0
+#: view:bvr.invoices.report:0
+#: view:bvr.report:0
+#: view:create.dta.wizard:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_inventory
+msgid "Bilan : Stocks"
+msgstr "Balance : Existencias"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_personnal_exp
+msgid "PP : Charge de personnel"
+msgstr "PP : Gasto de personal"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.post_field_bvpost
+msgid "post_number"
+msgstr "post_number"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_payment_order
+msgid "Payment Order"
+msgstr "Orden de pago"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_report_result
+msgid "Bilan : Resultat reporte"
+msgstr "Balance : resultado reportado"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"No bank defined\n"
+"for the bank account: %s\n"
+"on the partner: %s\n"
+"on line: %s"
+msgstr ""
+"No se ha definido el banco\n"
+"para la cuenta bancaria: %s\n"
+"en la empresa: %s\n"
+"en la línea :%s"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Too much total record found!"
+msgstr "¡Demasiados registros totales encontrados!"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_create_dta_wizard
+msgid "create.dta.wizard"
+msgstr "crear.dta.asistente"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a Clearing Number\n"
+"for the partner bank: %s\n"
+"on line %s"
+msgstr ""
+"Debe proporcionar un número de liquidación\n"
+"para el banco de la empresa: %s\n"
+"en la línea %s"
+
+#. module: l10n_ch
+#: field:res.partner.bank,print_account:0
+msgid "Print Account Number on BVR"
+msgstr "Imprimir número de cuenta en BVR"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_bank
+msgid "Bank"
+msgstr "Banco"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mme_m
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mme_m
+msgid "Mme,m"
+msgstr "Sra"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.bvrbank
+msgid "DTA-BVRBANK"
+msgstr "DTA-BVRBANK"
+
+#. module: l10n_ch
+#: field:bvr.invoices.report,name:0
+#: field:bvr.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_consolidation
+msgid "Autre : Consolidation"
+msgstr "Otro : Consolidación"
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid ""
+"You must provide a valid BVR reference number \n"
+"for the line: %s"
+msgstr ""
+"Debe informar un número de referencia BVR válido\n"
+"para la línea: %s"
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+msgid "Print BVR Invoice Report"
+msgstr "Imprimir informe factura BVR"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_societe
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_societe
+msgid "sc"
+msgstr "sc"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_income
+msgid "PP : Chiffre d'affaires"
+msgstr "PP : volúmen de negocios"
+
+#. module: l10n_ch
+#: help:res.company,bvr_delta_vert:0
+msgid "vert. delta in mm 1.2 will print the bvz 1.2mm lefter"
+msgstr "vert. delta en mm 1.2 imprimirá el bvz 1.2mm a la izquierda"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_result
+msgid "PP : Resultat activites annexes"
+msgstr "PP : Resultado de actividades anexas"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type,name:l10n_ch.dta_iban
+msgid "DTA-IBAN"
+msgstr "DTA-IBAN"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.acc_num_field_bvbank
+msgid "acc_number"
+msgstr "Número cuenta"
+
+#. module: l10n_ch
+#: field:res.company,bvr_delta_vert:0
+msgid "BVR Vert. Delta (mm)"
+msgstr "Delta vert. BVR (mm)"
+
+#. module: l10n_ch
+#: model:ir.actions.todo,note:l10n_ch.config_call_account_template_l10n_ch
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked\n"
+"                to pass the name of the company, the chart template to "
+"follow, the no. of digits to\n"
+"                generate the code for your accounts and Bank account, "
+"currency to create Journals.\n"
+"                Thus,the pure copy of chart Template is generated. This is "
+"the same wizard that runs\n"
+"                from Financial Management/Configuration/Financial "
+"Accounting/Financial\n"
+"                Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+"Genera un plan general contable a partir de una plantilla de plan contable. "
+"Se le pedirá\n"
+"                el nombre de la empresa, la plantilla a utilizar, el número "
+"de dígitos para\n"
+"                generar los códigos de las cuentas, la cuenta bancaria, la "
+"moneda para crear los diarios.\n"
+"                A continuación se genera la copia de la plantilla. Este es "
+"el mismo asistente que se ejecuta\n"
+"                desde Contabilidad/Configuración/Contabilidad "
+"financiera/Cuentas\n"
+"                financieras/Generar plan general contable a partir de una "
+"plantilla de plan contable."
+
+#. module: l10n_ch
+#: help:res.company,bvr_delta_horz:0
+msgid "horiz. delta in mm 1.2 will print the bvz 1.2mm lefter"
+msgstr "horiz. delta en mm 1.2 imprimirá el bvz 1.2mm a la izquierda"
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_building_asset
+msgid "Bilan : Immo corporelles immobilieres"
+msgstr "Balance: Inmovilizaciones corporales immobiliarias"
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_import_wizard
+msgid "bvr.import.wizard"
+msgstr "bvr.importar.asistente"
+
+#. module: l10n_ch
+#: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrbank
+#: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrpost
+msgid "bvr_number"
+msgstr "bvr_number"
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_sir
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_sir
+msgid "M. "
+msgstr "Sr. "
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_closing
+msgid "Autre : Cloture"
+msgstr "Otro : Cierre"
+
+#. module: l10n_ch
+#: 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."
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "El CIF/NIF no parece estar correcto."
+
+#~ 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 "Mail:"
+#~ msgstr "Correo:"
+
+#~ msgid "Thanks,"
+#~ msgstr "Gracias,"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "Invoice Date:"
+#~ msgstr "Fecha de factura:"
+
+#~ msgid "Refund"
+#~ msgstr "Reembolso"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "Amount"
+#~ msgstr "Cantidad"
+
+#~ msgid "', reference:"
+#~ msgstr "', referencia:"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#~ msgid "Tax"
+#~ msgstr "Impuesto"
+
+#~ msgid "Configure Journal"
+#~ msgstr "Configurar diario"
+
+#~ msgid "+"
+#~ msgstr "+"
+
+#~ msgid "Supplier Invoice"
+#~ msgstr "Factura de proveedor"
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid "Disc. (%)"
+#~ msgstr "Desc. (%)"
+
+#~ msgid "Dear customer,"
+#~ msgstr "Estimado cliente,"
+
+#~ msgid "Journal to set"
+#~ msgstr "Diario a establecer"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de la acción."
+
+#~ msgid "BVR A4 Sheet"
+#~ msgstr "BVR hoja A4"
+
+#~ msgid "The Default Debit Account of the account journal"
+#~ msgstr "La cuenta de debito por defecto del diario contable"
+
+#~ msgid "TVA (%)"
+#~ msgstr "IVA (%)"
+
+#~ msgid "Account Journal"
+#~ msgstr "Diario contable"
+
+#~ msgid "Remarque:"
+#~ msgstr "Observación:"
+
+#~ msgid "the currenty edited account journal"
+#~ msgstr "el diario contable actualmente editado"
+
+#~ msgid "Here is the BVR to allow you to pay the invoice '"
+#~ msgstr "Aquí está el BVR para permitirle pagar la factura'"
+
+#, python-format
+#~ msgid "No payment mode or payment type code invalid."
+#~ msgstr "Sin modo de pago o código de tipo de pago inválido."
+
+#~ msgid "VAT :"
+#~ msgstr "IVA :"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "account.journal.todo"
+#~ msgstr "account.journal.todo"
+
+#~ msgid "Invoice -"
+#~ msgstr "Factura -"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid "PRO-FORMA"
+#~ msgstr "PRO-FORMA"
+
+#~ msgid "Phone:"
+#~ msgstr "Teléfono:"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Invoice with BVR"
+#~ msgstr "Factura con BVR"
+
+#~ msgid "Subject:"
+#~ msgstr "Asunto:"
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "Condition"
+#~ msgstr "Condición"
+
+#~ msgid "TVA:"
+#~ msgstr "IVA:"
+
+#~ msgid "Default Debit Account"
+#~ msgstr "Cuenta debe por defecto"
+
+#~ msgid "The Default Credit Account of the account journal"
+#~ msgstr "La cuenta de crédito por defecto del diario contable"
+
+#~ msgid "The accounts linked to the account journals"
+#~ msgstr "Las cuentas asociadas a los diarios contables"
+
+#~ msgid "Taxes:"
+#~ msgstr "Impuestos:"
+
+#~ msgid "Price"
+#~ msgstr "Precio"
+
+#~ msgid "(incl. taxes):"
+#~ msgstr "(impuestos incl.):"
+
+#~ msgid "Unit Price"
+#~ msgstr "Precio unitario"
+
+#~ msgid "Default Credit Account"
+#~ msgstr "Cuenta haber por defecto"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
+#~ msgid "Total (excl. taxes):"
+#~ msgstr "Total (impuestos excl.):"
+
+#~ msgid "BVR file"
+#~ msgstr "Archivo BVR"
+
+#~ msgid "1cm 25.7cm 7cm 25.7cm"
+#~ msgstr "1cm 25.7cm 7cm 25.7cm"
+
+#~ msgid "Clic on 'Save as' to save the DTA file :"
+#~ msgstr "Pulse en \"Guardar como\" para guardar el archivo DTA:"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "1cm 27.7cm 20cm 27.7cm"
+#~ msgstr "1cm 27.7cm 20cm 27.7cm"
+
+#~ msgid "Supplier Refund"
+#~ msgstr "Factura rectificativa (abono) de proveedor"
+
+#~ msgid "Quantity"
+#~ msgstr "Cantidad"
+
+#~ msgid ""
+#~ "Set accounts on financial journals defined by\n"
+#~ "\t\t\tCamptocamp l10n_ch module"
+#~ msgstr ""
+#~ "Establece cuentas en los diarios financieros definidos por\n"
+#~ "\t\t\tel módulo Camptocamp l10n_ch"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Concerne:"
+#~ msgstr "Concierne:"
diff --git a/addons/l10n_ch/i18n/et.po b/addons/l10n_ch/i18n/et.po
index cbf95414af5..7e47e7651d7 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
@@ -909,15 +909,3 @@ msgstr ""
 
 #~ msgid "1cm 27.7cm 20cm 27.7cm"
 #~ msgstr "1cm 27.7cm 20cm 27.7cm"
-
-#~ msgid "Refund Tax Account"
-#~ msgstr "Maksu tagasimakse konto"
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "Viga ! sa ei saa luua rekrusiivseid maksukoode."
-
-#~ msgid "Invoice Tax Account"
-#~ msgstr "Arve Maksukonto"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "Viga ! Sa ei saa luua rekrusiivseid kontomalle."
diff --git a/addons/l10n_ch/i18n/fr.po b/addons/l10n_ch/i18n/fr.po
index 52827a57a2d..47c6c0d4506 100644
--- a/addons/l10n_ch/i18n/fr.po
+++ b/addons/l10n_ch/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:15+0000\n"
 "PO-Revision-Date: 2011-01-21 21:01+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
@@ -862,9 +862,6 @@ msgstr ""
 #~ msgid "TVA (%)"
 #~ msgstr "TVA (%)"
 
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de codes de taxe récursifs"
-
 #~ msgid "Dear customer,"
 #~ msgstr "Cher client,"
 
@@ -879,3 +876,34 @@ msgstr ""
 
 #~ msgid "The Default Credit Account of the account journal"
 #~ msgstr "Le compte de crédit par défaut du journal comptable"
+
+#~ msgid "BVR file"
+#~ msgstr "Fichier BVR"
+
+#~ msgid "1cm 25.7cm 7cm 25.7cm"
+#~ msgstr "1cm 25,7cm 7cm 25,7cm"
+
+#~ msgid "Clic on 'Save as' to save the DTA file :"
+#~ msgstr "Cliquez sur \"Enregistrer sous\" pour enregistrer le fichier DTA :"
+
+#~ msgid "Here is the BVR to allow you to pay the invoice '"
+#~ msgstr "Voici le BVR pour vous permettre de payer la facture \""
+
+#~ msgid "The accounts linked to the account journals"
+#~ msgstr "Les comptes liés aux journaux comptables"
+
+#~ msgid "the currenty edited account journal"
+#~ msgstr "le journal comptable en cours d'étition"
+
+#, python-format
+#~ msgid "No payment mode or payment type code invalid."
+#~ msgstr "Pas de mode de paiement ou type de code de paiement non valide."
+
+#~ msgid "Remarque:"
+#~ msgstr "Remarque :"
+
+#~ msgid "', reference:"
+#~ msgstr "\", référence :"
+
+#~ msgid "The Default Debit Account of the account journal"
+#~ msgstr "Le compte de débit  par défaut du journal comptable"
diff --git a/addons/l10n_ch/i18n/hr.po b/addons/l10n_ch/i18n/hr.po
index 80bf8c2eb2e..fc5a94e71b9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80bf8c2eb2e..fc5a94e71b9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8fa59c9776f..b2dcd184584 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 167de0c71c4..fc9b9a6298c 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 561ea1cd4d7..a00e87bc41b 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80bf8c2eb2e..fc5a94e71b9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 720d40171c4..4fc3a6775ab 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 aa9ea360a20..86f57acbb73 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 91f00d6fc39..9b795d99548 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 012ab836b04..44d1524efe7 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f6a97eb652b..261dfe52bf3 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80bf8c2eb2e..fc5a94e71b9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e43f37db396..ea97e2bd4a9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
@@ -889,6 +889,3 @@ msgstr ""
 
 #~ msgid "Total"
 #~ msgstr "Итого"
-
-#~ msgid "Invoice Tax Account"
-#~ msgstr "Счет налога по счету"
diff --git a/addons/l10n_ch/i18n/sl.po b/addons/l10n_ch/i18n/sl.po
index 49e81eec23b..d0d4d2b5e6b 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
@@ -885,12 +885,3 @@ msgstr ""
 
 #~ msgid "Total"
 #~ msgstr "Skupaj"
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih davčnih oznak."
-
-#~ msgid "Invoice Tax Account"
-#~ msgstr "Konto zaračunanega davka"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
diff --git a/addons/l10n_ch/i18n/sq.po b/addons/l10n_ch/i18n/sq.po
index 853043357a1..6730d0e2689 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e58a8d01f77..4ab3b064219 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 62ea4d0afb1..639d1411fd8 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
@@ -840,6 +840,3 @@ msgstr ""
 
 #~ msgid "Base"
 #~ msgstr "Bas"
-
-#~ msgid "Refund Tax Account"
-#~ msgstr "Skatteåterbäringskonto"
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index d6f4d954640..095cb778c85 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 44ab1e79eb0..465ce58c19a 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9d509ca3ca6..ece6495c2b7 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7cc3a831804..c124c67d6fa 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80bf8c2eb2e..fc5a94e71b9 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 4896931b77b..9e8d3f0d57b 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -74,7 +74,8 @@ class account_invoice(osv.osv):
             ),
         ### Amount to pay
         'amount_to_pay': fields.function(_amount_to_pay,
-            type='float', string='Amount to be paid',
+            type='float', 
+            string='Amount to be paid',
             help='The amount which should be paid at the current date\n' \
                     'minus the amount which is already in payment order'),
     }
@@ -120,7 +121,7 @@ class account_invoice(osv.osv):
                         invoice.partner_bank_id.state in \
                         ('bvrbank', 'bvrpost') and \
                         invoice.reference_type != 'bvr':
-                            return False
+                    return False
         return True
 
     _constraints = [
@@ -143,24 +144,34 @@ class account_invoice(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
             date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         """ Function that is call when the partner of the invoice is changed
-        it will retriev and set the good bank partner bank"""
-        res = super(account_invoice, self).onchange_partner_id(
-                                                                cr,
-                                                                 uid,
-                                                                 ids,
-                                                                 type,
-                                                                 partner_id,
-                                                                 date_invoice,
-                                                                 payment_term
-                                                            )
+        it will retrieve and set the good bank partner bank"""
+        #context not define in signature of function in account module
+        context = {}
+        res = super(account_invoice, self).onchange_partner_id(cr,
+                                                               uid,
+                                                               ids,
+                                                               type,
+                                                               partner_id,
+                                                               date_invoice,
+                                                               payment_term,
+                                                               partner_bank_id,
+                                                               company_id)
         bank_id = False
         if partner_id:
-            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
-            if p.bank_ids:
-                bank_id = p.bank_ids[0].id
-
-        if type in ('in_invoice', 'in_refund'):
-            res['value']['partner_bank_id'] = bank_id
+            if type in ('in_invoice', 'in_refund'):
+                p = self.pool.get('res.partner').browse(cr, uid, partner_id, context)
+                if p.bank_ids:
+                    bank_id = p.bank_ids[0].id
+                res['value']['partner_bank_id'] = bank_id
+            else:
+                user = self.pool.get('res.users').browse(cr, uid, uid, context)
+                bank_ids = user.company_id.partner_id.bank_ids
+                if bank_ids:
+                    #How to order bank ?
+                    for bank in bank_ids:
+                        if bank.my_bank:
+                            bank_id = bank.id
+                res['value']['partner_bank_id'] = bank_id
 
         if partner_bank_id != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index ac8c714fbca..04870ca936b 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -1,12 +1,11 @@
 <openerp>
-    <data>
+    <data noupdate="1">
         
         <record id="expenses_journal" model="account.journal">
             <field name="name">Journal de frais</field>
             <field name="code">EXPF</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -15,9 +14,8 @@
         <record id="bank_journal" model="account.journal">
             <field name="name">Banque CHF</field>
             <field name="code">BCHF</field>
-            <field name="type">cash</field>
+            <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -26,9 +24,8 @@
         <record id="bank_euro_journal" model="account.journal">
             <field name="name">Banque EUR</field>
             <field name="code">BEUR</field>
-            <field name="type">cash</field>
+            <field name="type">bank</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -40,7 +37,6 @@
             <field name="code">CAI</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -51,7 +47,6 @@
             <field name="code">OD</field>
             <field name="type">general</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -63,7 +58,6 @@
             <field name="type">situation</field>
             <field name="centralisation">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="update_posted" eval="True" />
         </record>
         
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index 35a4456b7fd..9301c564227 100644
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -30,35 +30,4 @@ class res_partner(osv.osv):
     }
 
 res_partner()
-
-class res_partner_bank(osv.osv):
-    _inherit = "res.partner.bank"
-    _columns = {
-        'name': fields.char('Description', size=128, required=True),
-        'post_number': fields.char('Post number', size=64),
-        'bvr_adherent_num': fields.char('BVR adherent number', size=11),
-        'dta_code': fields.char('DTA code', size=5),
-    }
-
-    def name_get(self, cr, 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(cr, uid, [])
-        bank_type_names = {}
-        for bank_type in bank_type_obj.browse(cr, uid, type_ids,
-                context=context):
-            bank_type_names[bank_type.code] = bank_type.name
-        res = []
-        for r in self.read(cr, uid, ids, ['name','state'], context):
-            res.append((r['id'], r['name']+' : '+bank_type_names[r['state']]))
-        return res
-
-    _sql_constraints = [
-        ('bvr_adherent_uniq', 'unique (bvr_adherent_num)', 'The BVR adherent number must be unique !')
-    ]
-
-res_partner_bank()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_ch/report/__init__.py b/addons/l10n_ch/report/__init__.py
index 04cc14f1d80..e8703f10d03 100644
--- a/addons/l10n_ch/report/__init__.py
+++ b/addons/l10n_ch/report/__init__.py
@@ -29,4 +29,6 @@
 #
 ##############################################################################
 
-import report_webkit_html
\ No newline at end of file
+import report_webkit_html
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/report/bvr.mako b/addons/l10n_ch/report/bvr.mako
index 6ff8921a142..e4a2a2ea87d 100644
--- a/addons/l10n_ch/report/bvr.mako
+++ b/addons/l10n_ch/report/bvr.mako
@@ -7,6 +7,17 @@
            	font-weight: normal;
            	src: url(${police_absolute_path('ocrbb.ttf')}) format("truetype");
            }
+           .ocrbb{
+             text-align:right;
+             font-family:bvrocrb;
+             font-size:${str(company.bvr_scan_line_font_size or '0.0').replace(',','.')}pt;
+             position:absolute;top:${str(company.bvr_scan_line_vert or '0.0').replace(',','.')}mm;
+             left:${str(company.bvr_scan_line_horz or '0.0').replace(',','.')}mm;
+             z-index:4;
+             letter-spacing:str(company.bvr_scan_line_letter_spacing or '0.0').replace(',','.')
+           }
+        ${css}
+    </style>
        </style>
 
    </head>
@@ -87,9 +98,41 @@
            
            }
        </script>
-       ${_check(objects)}
        %for inv in objects :
        <% setLang(inv.partner_id.lang) %>
+       <!--adresses + info block -->
+            <table class="dest_address"  style="position:absolute;top:6mm;left:15mm">
+               <tr><td ><b>${inv.partner_id.title.name 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") |entity}: ${inv.address_invoice_id.phone|entity}</td></tr>
+               %endif
+               %if inv.address_invoice_id.fax :
+               <tr><td>${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity}</td></tr>
+               %endif
+               %if inv.address_invoice_id.email :
+               <tr><td>${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity}</td></tr>
+               %endif
+               %if inv.partner_id.vat :
+               <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>
+               %endif
+           </table>
+       
+       <div style="position:absolute;top:60mm; left:20mm">
+           ${_('Invoice')} - ${inv.number or ''|entity}
+           <br/>
+           <br/>
+           ${_('Here is the BVR to allow you to pay the invoice %s - %s') % (inv.name or '', inv.number or '',)}
+           <br/>
+           ${_('Regards')}
+       </div>
+       
+       <div colspan="2" class="ocrbb">${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}&gt;${_get_ref(inv)}+${inv.partner_bank_id.post_number.split('-')[0]+(str(inv.partner_bank_id.post_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.post_number.split('-')[2]}&gt;</div>
        <div id="cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;height:180mm">
         <!-- Your communication message here -->
        </div>
@@ -103,7 +146,7 @@
         <tr style="height:8.4666667mm;vertical-align:bottom;padding-bottom:0"> <td><table  style="width:100%" CELLPADDING="0" CELLSPACING="0"><td  style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td><table  style="width:100%" CELLPADDING="0" CELLSPACING="0"><td  style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td></td></tr>
         <tr style="height:21.166667mm"><td></td><td></td><td></td></tr>
         <tr style="height:8.4666667mm"> <td></td><td></td><td></td></tr>
-        <tr style="height:21.166667mm;vertical-align:top"><td></td><td colspan="2" style="text-align:right;padding-right:0.3in;font-family:bvrocrb;font-size:12pt">${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}&gt;${_get_ref(inv)}+${inv.partner_bank_id.post_number.split('-')[0]+(str(inv.partner_bank_id.post_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.post_number.split('-')[2]}&gt;</td></tr>
+        <tr style="height:21.166667mm;vertical-align:top"><td></td><td></td></tr>
     </table>
     %endfor
 </body>
diff --git a/addons/l10n_ch/report/report_webkit_html.mako b/addons/l10n_ch/report/report_webkit_html.mako
index d15bfda2898..099bbbf8816 100644
--- a/addons/l10n_ch/report/report_webkit_html.mako
+++ b/addons/l10n_ch/report/report_webkit_html.mako
@@ -9,7 +9,7 @@
        <% setLang(inv.partner_id.lang) %>
        <div id="inv_cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;border-width:0px;border-style:solid">
        <table class="dest_address">
-           <tr><td ><b>${inv.partner_id.title or ''|entity}  ${inv.partner_id.name |entity}</b></td></tr>
+           <tr><td ><b>${inv.partner_id.title.name 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>
diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py
index 619a152405c..8b179e7ae58 100644
--- a/addons/l10n_ch/report/report_webkit_html.py
+++ b/addons/l10n_ch/report/report_webkit_html.py
@@ -33,7 +33,9 @@ import addons
 import pooler
 from tools.config import config
 from mako.template import Template
+from mako import exceptions
 from tools.translate import _
+from osv.osv import except_osv
 
 
 class l10n_ch_report_webkit_html(report_sxw.rml_parse):
@@ -41,16 +43,15 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
         super(l10n_ch_report_webkit_html, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-            'cr':cr,
+            'cr': cr,
             'uid': uid,
             'user':self.pool.get("res.users").browse(cr, uid, uid),
             'mod10r': mod10r,
             '_space': self._space,
             '_get_ref': self._get_ref,
             'comma_me': self.comma_me,
-            'police_absolute_path' : self.police_absolute_path,
-            'bvr_absolute_path':self.bvr_absolute_path,
-            '_check' : self._check,
+            'police_absolute_path': self.police_absolute_path,
+            'bvr_absolute_path': self.bvr_absolute_path,
             'headheight': self.headheight
         })
 
@@ -58,15 +59,22 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
     _compile_comma_me = re.compile("^(-?\d+)(\d{3})")
     _compile_check_bvr = re.compile('[0-9][0-9]-[0-9]{3,6}-[0-9]')
     _compile_check_bvr_add_num = re.compile('[0-9]*$')
-
+    
+    def set_context(self, objects, data, ids, report_type=None):
+        user = self.pool.get('res.users').browse(self.cr, self.uid, self.uid)
+        company = user.company_id
+        if not company.invoice_only:
+            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) :
         """Will get the ocrb police absolute path"""
-        path = addons.get_module_resource(os.path.join('l10n_ch','report',inner_path))
+        path = addons.get_module_resource(os.path.join('l10n_ch', 'report', inner_path))
         return  path
         
     def bvr_absolute_path(self) :
         """Will get the ocrb police absolute path"""
-        path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr1.jpg'))
+        path = addons.get_module_resource(os.path.join('l10n_ch', 'report', 'bvr1.jpg'))
         return  path
         
     def headheight(self):
@@ -76,7 +84,7 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
 
     def comma_me(self, amount):
         """Fast swiss number formatting"""
-        if  type(amount) is float :
+        if  isinstance(amount, float):
             amount = str('%.2f'%amount)
         else :
             amount = str(amount)
@@ -88,14 +96,15 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
             return self.comma_me(new)
 
     def _space(self, nbr, nbrspc=5):
-        """Spaces * 5"""
-        res = ''
-        for i in range(len(nbr)):
-            res = res + nbr[i]
-            if not (i-1) % nbrspc:
-                res = res + ' '
-        return res
+        """Spaces * 5.
 
+        Example:
+            >>> self._space('123456789012345')
+            '12 34567 89012 345'
+        """
+        return ''.join([' '[(i - 2) % nbrspc:] + c for i, c in enumerate(nbr)])
+      
+        
     def _get_ref(self, inv):
         """Retrieve ESR/BVR reference form invoice in order to print it"""
         res = ''
@@ -106,39 +115,77 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
             invoice_number = self._compile_get_ref.sub('', inv.number)
         return mod10r(res + invoice_number.rjust(26-len(res), '0'))
         
-    def _check(self, invoices):
+    def _check(self, invoice_ids):
         """Check if the invoice is ready to be printed"""
+        if not invoice_ids:
+            invoice_ids = []
         cursor = self.cr
         pool = self.pool
         invoice_obj = pool.get('account.invoice')
-        ids = [x.id for x in invoices]
+        ids = invoice_ids
         for invoice in invoice_obj.browse(cursor, self.uid, ids):
             if not invoice.partner_bank_id:
-                raise wizard.except_wizard(_('UserError'),
+                raise except_osv(_('UserError'),
                         _('No bank specified on invoice:\n' + \
                                 invoice_obj.name_get(cursor, self.uid, [invoice.id],
                                     context={})[0][1]))
             if not self._compile_check_bvr.match(
                     invoice.partner_bank_id.post_number or ''):
-                raise wizard.except_wizard(_('UserError'),
-                        _("Your bank BVR number should be of the form 0X-XXX-X! " +
-                                'Please check your company ' +
-                                'information for the invoice:\n' + 
-                                invoice_obj.name_get(cursor, self.uid, [invoice.id],
-                                    context={})[0][1]))
+                raise except_osv(_('UserError'),
+                        _('Your bank BVR number should be of the form 0X-XXX-X! ' +
+                          'Please check your company ' +
+                          'information for the invoice:\n' + 
+                           invoice_obj.name_get(cursor, self.uid, [invoice.id],
+                           context={})[0][1]))
             if invoice.partner_bank_id.bvr_adherent_num \
                     and not self._compile_check_bvr_add_num.match(
                             invoice.partner_bank_id.bvr_adherent_num):
-                raise wizard.except_wizard('UserError',
-                        'Your bank BVR adherent number must contain exactly seven' +
-                                'digits!\nPlease check your company ' +
-                                'information for the invoice:\n' +
-                                invoice_obj.name_get(cursor, self.uid, [invoice.id],
-                                    context={})[0][1])
-        return ""
+                raise except_osv(_('UserError'),
+                        _('Your bank BVR adherent number must contain exactly seven' +
+                          'digits!\nPlease check your company ' +
+                          'information for the invoice:\n' +
+                          invoice_obj.name_get(cursor, self.uid, [invoice.id],
+                          context={})[0][1]))
+        return ''
 
 class BVRWebKitParser(webkit_report.WebKitParser):
     
+    def setLang(self, lang):
+        if not lang:
+            lang = 'en_US'
+        self.localcontext['lang'] = lang
+        
+    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
+        """format using the know cursor, language from localcontext"""
+        if digits is None:
+            digits = self.parser_instance.get_digits(value)
+        if isinstance(value, (str, unicode)) and not value:
+            return ''
+        pool_lang = self.pool.get('res.lang')
+        lang = self.localcontext['lang']
+
+        lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0]
+        lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids)
+
+        if date or date_time:
+            if not str(value):
+                return ''
+
+            date_format = lang_obj.date_format
+            parse_format = '%Y-%m-%d'
+            if date_time:
+                value=value.split('.')[0]
+                date_format = date_format + " " + lang_obj.time_format
+                parse_format = '%Y-%m-%d %H:%M:%S'
+            if not isinstance(value, time.struct_time):
+                return time.strftime(date_format, time.strptime(value, parse_format))
+
+            else:
+                date = datetime(*value.timetuple()[:6])
+            return date.strftime(date_format)
+
+        return lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
+    
     def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None):
         """generate the PDF"""
         self.parser_instance = self.parser(
@@ -190,74 +237,81 @@ class BVRWebKitParser(webkit_report.WebKitParser):
 <body style="border:0; margin: 0;" onload="subst()">
 </body>
 </html>"""
+        self.parser_instance.localcontext.update({'setLang':self.setLang})
+        self.parser_instance.localcontext.update({'formatLang':self.formatLang})
         css = report_xml.webkit_header.css
         if not css :
             css = ''
         user = self.pool.get('res.users').browse(cursor, uid, uid)
-        company= user.company_id
+        company = user.company_id
         parse_template = template
         #default_filters=['unicode', 'entity'] can be used to set global filter
-        body_mako_tpl = Template(parse_template ,input_encoding='utf-8')
+        body_mako_tpl = Template(parse_template ,input_encoding='utf-8', output_encoding='utf-8')
         #BVR specific
         bvr_path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr.mako'))
-        body_bvr_tpl = Template(file(bvr_path).read(), input_encoding='utf-8')
+        body_bvr_tpl = Template(file(bvr_path).read(), input_encoding='utf-8', output_encoding='utf-8')
 
         helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context)
         ##BVR Specific
         htmls = []
         for obj in objs :
-            
             self.parser_instance.localcontext['objects'] = [obj]
             if not company.bvr_only:
-                html = body_mako_tpl.render(
+                try:
+                    html = body_mako_tpl.render(
+                                                helper=helper, 
+                                                css=css,
+                                                _=self.translate_call,
+                                                **self.parser_instance.localcontext
+                                                )
+                except Exception, e:
+                   raise Exception(exceptions.text_error_template().render())
+                htmls.append(html)
+            if not company.invoice_only:
+                try:
+                    bvr = body_bvr_tpl.render(
+                                        helper=helper, 
+                                        css=css,
+                                        _=self.translate_call,
+                                        **self.parser_instance.localcontext
+                                        )
+                except Exception, e:
+                   raise Exception(exceptions.text_error_template().render())
+                htmls.append(bvr)                            
+        head_mako_tpl = Template(header, input_encoding='utf-8', output_encoding='utf-8')
+        try:
+            head = head_mako_tpl.render(
+                                        helper=helper, 
+                                        css=css,
+                                        _debug=False,
+                                        _=self.translate_call,
+                                        **self.parser_instance.localcontext
+                                    )
+        except Exception, e:
+           raise Exception(exceptions.text_error_template().render())
+        foot = False
+        if footer and company.invoice_only :
+            foot_mako_tpl = Template(footer, input_encoding='utf-8', output_encoding='utf-8')
+            try:
+                foot = foot_mako_tpl.render(
                                             helper=helper, 
-                                            css=css,
+                                            css=css, 
                                             _=self.translate_call,
                                             **self.parser_instance.localcontext
                                             )
-                htmls.append(html)
-            if not company.invoice_only:
-                bvr = body_bvr_tpl.render(
-                                    helper=helper, 
-                                    css=css,
-                                    _=self.translate_call,
-                                    **self.parser_instance.localcontext
-                                    )
-                htmls.append(bvr)                            
-        head_mako_tpl = Template(header, input_encoding='utf-8')
-        head = head_mako_tpl.render(
-                                    company=company, 
-                                    time=time, 
-                                    helper=helper, 
-                                    css=css,
-                                    formatLang=self.parser_instance.formatLang,
-                                    setLang=self.parser_instance.setLang, 
-                                    _debug=False
-                                )
-        foot = False
-        if footer and company.invoice_only :
-            foot_mako_tpl = Template(footer ,input_encoding='utf-8')
-            foot = foot_mako_tpl.render(
-                                        company=company, 
-                                        time=time, 
-                                        helper=helper, 
-                                        css=css, 
-                                        formatLang=self.parser_instance.formatLang,
-                                        setLang=self.parser_instance.setLang,
-                                        _=self.translate_call,
-
-                                        )
+            except Exception, e:
+               raise Exception(exceptions.text_error_template().render())
         if report_xml.webkit_debug :
-            deb = head_mako_tpl.render(
-                                        company=company, 
-                                        time=time, 
-                                        helper=helper, 
-                                        css=css, 
-                                        _debug=html,
-                                        formatLang=self.parser_instance.formatLang,
-                                        setLang=self.parser_instance.setLang,
-                                        _=self.translate_call,
-                                        )
+            try:
+                deb = head_mako_tpl.render(
+                                            helper=helper, 
+                                            css=css, 
+                                            _debug=html,
+                                            _=self.translate_call,
+                                            **self.parser_instance.localcontext
+                                            )
+            except Exception, e:
+               raise Exception(exceptions.text_error_template().render())
             return (deb, 'html')
         bin = self.get_lib(cursor, uid, company.id)
         pdf = self.generate_pdf(bin, report_xml, head, foot, htmls)
@@ -268,3 +322,5 @@ BVRWebKitParser('report.invoice_web_bvr',
                'account.invoice', 
                'addons/l10n_ch/report/report_webkit_html.mako',
                parser=l10n_ch_report_webkit_html)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/report/report_webkit_html_view.xml b/addons/l10n_ch/report/report_webkit_html_view.xml
index c03db709162..c1638ff99db 100644
--- a/addons/l10n_ch/report/report_webkit_html_view.xml
+++ b/addons/l10n_ch/report/report_webkit_html_view.xml
@@ -5,55 +5,57 @@
             <field name="orientation">Portrait</field>
             <field name="format">A4</field>
             <field name="html"><![CDATA[<html>
-                    <head>
-                        <script>
-                            function subst() {
-                            var vars={};
-                            var x=document.location.search.substring(1).split('&');
-                            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
-                            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
-                            for(var i in x) {
-                            var y = document.getElementsByClassName(x[i]);
-                            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
-                                }
-                                }
-                                </script>
-                                <style type="text/css">
-                                    ${css}
-                                </style>
-                    </head>
-                    <body style="border:0; margin: 0;" onload="subst()">
-                        <table class="header" style="border-bottom: 0px solid black; width: 100%;padding-left:20mm">
-                            <tr style="vertical-align:top" >
-                                <td>${helper.embed_logo_by_name('camptocamp_logo', width=64)}</td>
-                                <td style="text-align:right">
-                                <table style="border-top: 0px solid black; width: 100%;height:100%">
-                                    <tr style="vertical-align:top">
-                                        <td style="text-align:right;font-size:12" width="80%"><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
-                                    </tr>
-                                </table> </td>
-                            </tr>
-                            <tr>
-                                <td><br/></td>
-                                <td style="text-align:right"> </td>
-                            </tr>
-                            <tr>
-                                <td>${company.partner_id.name |entity}</td>
-                                <td/>
-                            </tr>
-                            <tr>
-                                <td >${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td>
-                                <td/>
-                            </tr>
-                            <tr>
-                                <td>Phone: ${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td>
-                                <td/>
-                            </tr>
-                            <tr>
-                                <td>Mail: <a href="mailto:${company.partner_id.address and company.partner_id.address[0].email or ''|entity}">${company.partner_id.address and company.partner_id.address[0].email or ''|entity}</a><br/></td>
-                            </tr>
-                        </table> ${_debug or ''} <br/></body>
-                    </html>]]>
+    <head>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                }
+                }
+       </script>
+       <style type="text/css">
+            ${css}
+       </style>
+    </head>
+    <!-- <tr style="vertical-align:top">
+        <td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
+        </tr> style="text-align:right"-->
+    <body style="border:0; margin: 0;" onload="subst()">
+        <table style="border-bottom: 1px solid black; width: 90%;padding-left:0mm;margin-left:5%">
+            <tr style="vertical-align:top" >
+                <td>${helper.embed_logo_by_name('camptocamp_logo', width=128)}</td>
+                <td >
+                    
+                    <table style="border-top: 0px solid black; width: 100%;height:100%;;padding-left:4mm; margin-left:2%" class="dest_address">
+                        <tr>
+                            <td><b>${company.partner_id.name |entity}</b></td><td></td><td></td>
+                        </tr>
+                        <tr>
+                            <td>${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td><td>${_("phone")}:</td><td>${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td><td></td>
+                        </tr>
+                        <tr>
+                            <td>${company.partner_id.address and company.partner_id.address[0].street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id.address and company.partner_id.address[0].fax or ''|entity} </td><td></td>
+                        </tr>
+                        <tr>
+                            <td>${company.partner_id.address and company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address and company.partner_id.address[0].city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id.address and company.partner_id.address[0].email or ''|entity}">${company.partner_id.address and company.partner_id.address[0].email or ''|entity}</a></td><td></td>
+                        </tr>
+                        <tr>
+                            <td>${company.partner_id.address and company.partner_id.address[0].country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
+                        </tr>
+                    </table> 
+                </td>
+            </tr>
+        </table>
+        <br/>
+        ${_debug or ''} 
+        <br/>
+    </body>
+</html>]]>
             </field>
             <field eval="45" name="margin_top"/>
             <field eval="0.01" name="margin_bottom"/>
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index 8c907653b4a..f642b800493 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -1,40 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data noupdate="True">
-        <record id="account_type_view" model="account.account.type">
-            <field name="name">Autre : Vue</field>
+       <record id="account_type_view" model="account.account.type">
+           <field name="name">Autre : Vue</field>
+           <field name="code">view</field>
+           <field name="close_method">none</field>
+           <field name="report_type">none</field>
+        </record>
+        <record id="account_type_view_assets" model="account.account.type">
+            <field name="name">Autre: Vue Actifs</field>
             <field name="code">view</field>
             <field name="close_method">none</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="account_type_view_liability" model="account.account.type">
+            <field name="name">Autre: Vue Passifs</field>
+            <field name="code">view</field>
+            <field name="close_method">none</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="account_type_view_expense" model="account.account.type">
+            <field name="name">Autre: Vue Charges</field>
+            <field name="code">view</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record id="account_type_view_income" model="account.account.type">
+            <field name="name">Autre: Vue Produits</field>
+            <field name="code">view</field>
+            <field name="close_method">none</field>
+            <field name="report_type">income</field>
         </record>
         <record id="account_type_cash" model="account.account.type">
             <field name="name">Bilan : Liquidites et titres</field>
             <field name="code">cash</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_adjusting_asset">
             <field name="name">Bilan : Actif de regularisation</field>
             <field name="code">adjusting_asset</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_equity">
             <field name="name">Bilan : Capitaux propres</field>
             <field name="code">equity</field>
             <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_income">
             <field name="name">PP : Chiffre d'affaires</field>
             <field name="code">income</field>
             <field name="close_method">none</field>
-            <field name="report_type">income</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_adj_liability">
             <field name="name">Bilan : Passifs de regularisation</field>
             <field name="code">adj_liability</field>
             <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_closing">
             <field name="name">Autre : Cloture</field>
@@ -45,123 +70,123 @@
             <field name="name">PP : Amortissement</field>
             <field name="code">depreciation</field>
             <field name="close_method">none</field>
-            <field name="report_type">expense</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_financial_result">
             <field name="name">PP : Resultat financier</field>
             <field name="code">financial_result</field>
             <field name="close_method">none</field>
-            <field name="report_type">income</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_financial_asset">
             <field name="name">Bilan : Immobilisations financieres</field>
             <field name="code">financial_asset</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_building_asset">
             <field name="name">Bilan : Immo corporelles immobilieres</field>
             <field name="code">building_asset</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_non_ope_asset">
             <field name="name">Bilan : Actifs hors exploitation</field>
             <field name="code">non_ope_asset</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_other_ope_exp">
             <field name="name">PP : Autres charges d'exploitation</field>
             <field name="code">other_ope_expense</field>
             <field name="close_method">none</field>
-            <field name="report_type">expense</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_non_ope_debts">
             <field name="name">Bilan : Dettes hors exploitation</field>
             <field name="code">non_ope_debts</field>
             <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_fixed_asset">
             <field name="name">Bilan : Immo corporelles mobilieres</field>
             <field name="code">fixed_asset</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_intangible_asset">
             <field name="name">Bilan : Immo incorporelles</field>
             <field name="code">intangible_asset</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_inventory">
             <field name="name">Bilan : Stocks</field>
             <field name="code">inventory</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_lt_liability">
             <field name="name">Bilan : Dettes à LT</field>
             <field name="code">lt_liability</field>
             <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_non_ope_result">
             <field name="name">PP : Resultat activites annexes</field>
             <field name="code">non_oper_result</field>
             <field name="close_method">none</field>
-            <field name="report_type">income</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_other_payable">
             <field name="name">Bilan : Autres creanciers à CT</field>
             <field name="code">other_payable</field>
             <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_other_receivable">
             <field name="name">Bilan : Autres créances</field>
             <field name="code">other_receivable</field>
             <field name="close_method">balance</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_personnal_exp">
             <field name="name">PP : Charge de personnel</field>
             <field name="code">personnal_exp</field>
             <field name="close_method">none</field>
-            <field name="report_type">expense</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_prov_reserve">
             <field name="name">Bilan : Provisions et reserves</field>
             <field name="code">provision_reserve</field>
             <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_purchase">
             <field name="name">PP : Achat de marchandise</field>
             <field name="code">purchase</field>
             <field name="close_method">none</field>
-            <field name="report_type">expense</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_report_result">
             <field name="name">Bilan : Resultat reporte</field>
             <field name="code">report_result</field>
             <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_receivable">
             <field name="name">Bilan : Debiteurs</field>
             <field name="code">receivable</field>
             <field name="partner_account">True</field>
             <field name="close_method">unreconciled</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_payable">
             <field name="name">Bilan : Fournisseurs</field>
             <field name="code">payable</field>
             <field name="partner_account">True</field>
             <field name="close_method">unreconciled</field>
-            <field name="report_type">liability</field>
+            <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_consolidation">
             <field name="name">Autre : Consolidation</field>
@@ -184,7 +209,7 @@
             <field name="type">view</field>
             <field name="name">Bilan</field>
             <field name="code">1_2</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_minimal_0" name="parent_id"/>
         </record>
@@ -192,7 +217,7 @@
             <field name="type">view</field>
             <field name="name">Actif</field>
             <field name="code">1</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_1_2" name="parent_id"/>
         </record>
@@ -200,7 +225,7 @@
             <field name="type">view</field>
             <field name="name">Actifs circulants</field>
             <field name="code">10</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_1" name="parent_id"/>
         </record>
@@ -208,7 +233,7 @@
             <field name="type">view</field>
             <field name="name">Liquidités et titres</field>
             <field name="code">100</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_10" name="parent_id"/>
         </record>
@@ -216,7 +241,7 @@
             <field name="type">view</field>
             <field name="name">Caisse</field>
             <field name="code">100.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -272,7 +297,7 @@
             <field name="type">view</field>
             <field name="name">Poste (CCP)</field>
             <field name="code">101.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -296,7 +321,7 @@
             <field name="type">view</field>
             <field name="name">Banques</field>
             <field name="code">102.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -360,7 +385,7 @@
             <field name="type">view</field>
             <field name="name">Chèques, effets à recevoir</field>
             <field name="code">104.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -392,7 +417,7 @@
             <field name="type">view</field>
             <field name="name">Avoirs à court terme</field>
             <field name="code">105.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -432,7 +457,7 @@
             <field name="type">view</field>
             <field name="name">Titres réalisables à court terme</field>
             <field name="code">106.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -480,7 +505,7 @@
             <field name="type">view</field>
             <field name="name">Autres placements à court terme</field>
             <field name="code">107.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -520,7 +545,7 @@
             <field name="type">view</field>
             <field name="name">Compte d'attente en monnaie</field>
             <field name="code">109.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_100" name="parent_id"/>
         </record>
@@ -536,16 +561,15 @@
             <field name="type">view</field>
             <field name="name">Créances</field>
             <field name="code">110</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_10" name="parent_id"/>
         </record>
         <record id="ch_110_0" model="account.account.template">
             <field name="type">view</field>
-            <field name="name">Créances résultant de vente et de prestations de services
-                (débiteurs-clients)</field>
+            <field name="name">Créances résultant de vente et de prestations de services (débiteurs-clients)</field>
             <field name="code">110.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_110" name="parent_id"/>
         </record>
@@ -553,7 +577,7 @@
             <field name="type">view</field>
             <field name="name">Créances résultant prestations envers des tiers</field>
             <field name="code">110.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_110_0" name="parent_id"/>
         </record>
@@ -587,7 +611,7 @@
             <field name="type">view</field>
             <field name="name">Créances résultant prestations envers des sociétés du groupe</field>
             <field name="code">111.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_110_0" name="parent_id"/>
         </record>
@@ -621,7 +645,7 @@
             <field name="type">view</field>
             <field name="name">Créances résultant prestations envers actionnaires</field>
             <field name="code">112.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_110_0" name="parent_id"/>
         </record>
@@ -655,7 +679,7 @@
             <field name="type">view</field>
             <field name="name">Autres créances à court terme</field>
             <field name="code">114.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_110" name="parent_id"/>
         </record>
@@ -663,7 +687,7 @@
             <field name="type">view</field>
             <field name="name">Autres créances à court terme envers des tiers</field>
             <field name="code">114.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_114_0" name="parent_id"/>
         </record>
@@ -703,7 +727,7 @@
             <field name="type">view</field>
             <field name="name">Autres créances à court terme envers des sociétés du groupe</field>
             <field name="code">115.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_114_0" name="parent_id"/>
         </record>
@@ -735,7 +759,7 @@
             <field name="type">view</field>
             <field name="name">Autres créances à court terme envers actionnaires</field>
             <field name="code">116.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_114_0" name="parent_id"/>
         </record>
@@ -767,7 +791,7 @@
             <field name="type">view</field>
             <field name="name">Créances envers des institutions publiques</field>
             <field name="code">117.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_114_0" name="parent_id"/>
         </record>
@@ -815,7 +839,7 @@
             <field name="type">view</field>
             <field name="name">Capital-actions non libéré</field>
             <field name="code">118.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_114_0" name="parent_id"/>
         </record>
@@ -831,7 +855,7 @@
             <field name="type">view</field>
             <field name="name">Autres créances à court terme</field>
             <field name="code">119.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_114_0" name="parent_id"/>
         </record>
@@ -887,7 +911,7 @@
             <field name="type">view</field>
             <field name="name">Stocks et travaux en cours</field>
             <field name="code">120</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_10" name="parent_id"/>
         </record>
@@ -895,7 +919,7 @@
             <field name="type">view</field>
             <field name="name">Stocks de marchandises</field>
             <field name="code">120.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -935,7 +959,7 @@
             <field name="type">view</field>
             <field name="name">Stocks de matières premières</field>
             <field name="code">121.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -975,7 +999,7 @@
             <field name="type">view</field>
             <field name="name">Stocks d'autres approvisionnements</field>
             <field name="code">122.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -1015,7 +1039,7 @@
             <field name="type">view</field>
             <field name="name">Stocks de matières auxiliaires et de fournitures</field>
             <field name="code">123.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -1063,7 +1087,7 @@
             <field name="type">view</field>
             <field name="name">Stocks obligatoires</field>
             <field name="code">124.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -1095,7 +1119,7 @@
             <field name="type">view</field>
             <field name="name">Marchandises en consignation</field>
             <field name="code">125.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -1111,7 +1135,7 @@
             <field name="type">view</field>
             <field name="name">Stocks de produits finis</field>
             <field name="code">126.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -1135,7 +1159,7 @@
             <field name="type">view</field>
             <field name="name">Stocks de produits semi-ouvrés</field>
             <field name="code">127.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -1159,7 +1183,7 @@
             <field name="type">view</field>
             <field name="name">Stocks de produits en cours</field>
             <field name="code">128.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_120" name="parent_id"/>
         </record>
@@ -1183,7 +1207,7 @@
             <field name="type">view</field>
             <field name="name">Actifs de régularisation</field>
             <field name="code">130</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_10" name="parent_id"/>
         </record>
@@ -1191,7 +1215,7 @@
             <field name="type">view</field>
             <field name="name">Actifs de régularisation (Actifs transitoires)</field>
             <field name="code">130.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_130" name="parent_id"/>
         </record>
@@ -1215,7 +1239,7 @@
             <field name="type">view</field>
             <field name="name">Actifs immobilisés</field>
             <field name="code">14</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_1" name="parent_id"/>
         </record>
@@ -1223,7 +1247,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisations financières</field>
             <field name="code">140</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_14" name="parent_id"/>
         </record>
@@ -1231,7 +1255,7 @@
             <field name="type">view</field>
             <field name="name">Titres à long terme</field>
             <field name="code">140.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_140" name="parent_id"/>
         </record>
@@ -1287,7 +1311,7 @@
             <field name="type">view</field>
             <field name="name">Autres placements à long terme</field>
             <field name="code">141.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_140" name="parent_id"/>
         </record>
@@ -1319,7 +1343,7 @@
             <field name="type">view</field>
             <field name="name">Participations</field>
             <field name="code">142.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_140" name="parent_id"/>
         </record>
@@ -1359,7 +1383,7 @@
             <field name="type">view</field>
             <field name="name">Créances à long terme envers des tiers</field>
             <field name="code">144.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_140" name="parent_id"/>
         </record>
@@ -1391,7 +1415,7 @@
             <field name="type">view</field>
             <field name="name">Créances à long terme envers des sociétés du groupe</field>
             <field name="code">145.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_140" name="parent_id"/>
         </record>
@@ -1423,7 +1447,7 @@
             <field name="type">view</field>
             <field name="name">Créances à long terme envers des actionnaires</field>
             <field name="code">146.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_140" name="parent_id"/>
         </record>
@@ -1455,7 +1479,7 @@
             <field name="type">view</field>
             <field name="name">Actions propres</field>
             <field name="code">149.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_140" name="parent_id"/>
         </record>
@@ -1479,7 +1503,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisation corporelles meubles</field>
             <field name="code">150</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_14" name="parent_id"/>
         </record>
@@ -1487,7 +1511,7 @@
             <field name="type">view</field>
             <field name="name">Machines et appareils destinés à la production</field>
             <field name="code">150.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1527,7 +1551,7 @@
             <field name="type">view</field>
             <field name="name">Mobilier et installations</field>
             <field name="code">151.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1583,7 +1607,7 @@
             <field name="type">view</field>
             <field name="name">Machines de bureau, informatiques, communication</field>
             <field name="code">152.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1663,7 +1687,7 @@
             <field name="type">view</field>
             <field name="name">Véhicules</field>
             <field name="code">153.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1719,7 +1743,7 @@
             <field name="type">view</field>
             <field name="name">Instruments et outillage</field>
             <field name="code">154.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1751,7 +1775,7 @@
             <field name="type">view</field>
             <field name="name">Installations de stockage</field>
             <field name="code">155.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1791,7 +1815,7 @@
             <field name="type">view</field>
             <field name="name">Equipements et installations</field>
             <field name="code">157.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1863,7 +1887,7 @@
             <field name="type">view</field>
             <field name="name">Autres immobilisations corporelles meubles</field>
             <field name="code">159.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_150" name="parent_id"/>
         </record>
@@ -1903,7 +1927,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisation corporelles immeubles</field>
             <field name="code">160</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_14" name="parent_id"/>
         </record>
@@ -1911,7 +1935,7 @@
             <field name="type">view</field>
             <field name="name">Bâtiments d'exploitation</field>
             <field name="code">160.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_160" name="parent_id"/>
         </record>
@@ -1951,7 +1975,7 @@
             <field name="type">view</field>
             <field name="name">Usines</field>
             <field name="code">161.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_160" name="parent_id"/>
         </record>
@@ -1991,7 +2015,7 @@
             <field name="type">view</field>
             <field name="name">Ateliers</field>
             <field name="code">162.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_160" name="parent_id"/>
         </record>
@@ -2031,7 +2055,7 @@
             <field name="type">view</field>
             <field name="name">Entrepôts</field>
             <field name="code">163.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_160" name="parent_id"/>
         </record>
@@ -2071,7 +2095,7 @@
             <field name="type">view</field>
             <field name="name">Bâtiments d'exposition et de vente</field>
             <field name="code">164.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_160" name="parent_id"/>
         </record>
@@ -2119,7 +2143,7 @@
             <field name="type">view</field>
             <field name="name">Bâtiments administratifs</field>
             <field name="code">165.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_160" name="parent_id"/>
         </record>
@@ -2167,7 +2191,7 @@
             <field name="type">view</field>
             <field name="name">Immeubles d'habitation</field>
             <field name="code">166.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_160" name="parent_id"/>
         </record>
@@ -2215,7 +2239,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisations incorporelles</field>
             <field name="code">170</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_14" name="parent_id"/>
         </record>
@@ -2223,7 +2247,7 @@
             <field name="type">view</field>
             <field name="name">Brevets, know-how, recettes de fabrication</field>
             <field name="code">170.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_170" name="parent_id"/>
         </record>
@@ -2263,7 +2287,7 @@
             <field name="type">view</field>
             <field name="name">Marques commerciales, échantillons, modèles, plans</field>
             <field name="code">171.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_170" name="parent_id"/>
         </record>
@@ -2311,7 +2335,7 @@
             <field name="type">view</field>
             <field name="name">Droits de licences, concessions, etc.</field>
             <field name="code">172.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_170" name="parent_id"/>
         </record>
@@ -2359,7 +2383,7 @@
             <field name="type">view</field>
             <field name="name">Droits de propriétés, d'édition, conventionnels</field>
             <field name="code">173.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_170" name="parent_id"/>
         </record>
@@ -2399,7 +2423,7 @@
             <field name="type">view</field>
             <field name="name">Goodwill</field>
             <field name="code">177.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_170" name="parent_id"/>
         </record>
@@ -2423,7 +2447,7 @@
             <field name="type">view</field>
             <field name="name">Autres immobilisations incorporelles</field>
             <field name="code">179.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_170" name="parent_id"/>
         </record>
@@ -2463,7 +2487,7 @@
             <field name="type">view</field>
             <field name="name">Charges activées et comptes d'actif de corrections de valeur</field>
             <field name="code">18</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_1" name="parent_id"/>
         </record>
@@ -2471,7 +2495,7 @@
             <field name="type">view</field>
             <field name="name">Charges activées et comptes d'actif de corrections de valeur</field>
             <field name="code">180</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_18" name="parent_id"/>
         </record>
@@ -2479,7 +2503,7 @@
             <field name="type">view</field>
             <field name="name">Charges activées</field>
             <field name="code">180.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_180" name="parent_id"/>
         </record>
@@ -2487,7 +2511,7 @@
             <field name="type">view</field>
             <field name="name">Frais de fondation, augmentation de capital</field>
             <field name="code">180.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_180_0" name="parent_id"/>
         </record>
@@ -2527,7 +2551,7 @@
             <field name="type">view</field>
             <field name="name">Disagio s/emprunts et s/emprunts par obligations</field>
             <field name="code">181.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_180_0" name="parent_id"/>
         </record>
@@ -2551,7 +2575,7 @@
             <field name="type">view</field>
             <field name="name">Frais de recherche et de développement</field>
             <field name="code">182.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_180_0" name="parent_id"/>
         </record>
@@ -2583,7 +2607,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges activées</field>
             <field name="code">184.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_180_0" name="parent_id"/>
         </record>
@@ -2607,7 +2631,7 @@
             <field name="type">view</field>
             <field name="name">Comptes d'actif de corrections de valeur</field>
             <field name="code">185.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_180" name="parent_id"/>
         </record>
@@ -2615,7 +2639,7 @@
             <field name="type">view</field>
             <field name="name">Capital-actions non libéré</field>
             <field name="code">185.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_185_0" name="parent_id"/>
         </record>
@@ -2639,7 +2663,7 @@
             <field name="type">view</field>
             <field name="name">Actifs hors exploitation</field>
             <field name="code">19</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_1" name="parent_id"/>
         </record>
@@ -2647,7 +2671,7 @@
             <field name="type">view</field>
             <field name="name">Actifs hors exploitation</field>
             <field name="code">190</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_19" name="parent_id"/>
         </record>
@@ -2655,7 +2679,7 @@
             <field name="type">view</field>
             <field name="name">Liquidités et titres</field>
             <field name="code">190.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2695,7 +2719,7 @@
             <field name="type">view</field>
             <field name="name">Créances à court terme</field>
             <field name="code">191.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2719,7 +2743,7 @@
             <field name="type">view</field>
             <field name="name">Stocks et travaux en cours</field>
             <field name="code">192.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2759,7 +2783,7 @@
             <field name="type">view</field>
             <field name="name">Actifs de régularisation</field>
             <field name="code">193.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2775,7 +2799,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisations financières</field>
             <field name="code">194.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2807,7 +2831,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisations corporelles meubles</field>
             <field name="code">195.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2847,7 +2871,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisations corporelles immeubles</field>
             <field name="code">196.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2895,7 +2919,7 @@
             <field name="type">view</field>
             <field name="name">Immobilisations incorporelles</field>
             <field name="code">197.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2943,7 +2967,7 @@
             <field name="type">view</field>
             <field name="name">Charges activées</field>
             <field name="code">198.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_190" name="parent_id"/>
         </record>
@@ -2967,7 +2991,7 @@
             <field name="type">view</field>
             <field name="name">Passif</field>
             <field name="code">2</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_1_2" name="parent_id"/>
         </record>
@@ -2975,7 +2999,7 @@
             <field name="type">view</field>
             <field name="name">Dettes à court terme</field>
             <field name="code">20</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_2" name="parent_id"/>
         </record>
@@ -2983,16 +3007,15 @@
             <field name="type">view</field>
             <field name="name">Dettes à court terme résultant d'achats et prestations services</field>
             <field name="code">200</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_20" name="parent_id"/>
         </record>
         <record id="ch_200_0" model="account.account.template">
             <field name="type">view</field>
-            <field name="name">Dettes à court terme résultant d'achats et prestations services
-                envers des tiers (fournisseurs)</field>
+            <field name="name">Dettes à court terme résultant d'achats et prestations services envers des tiers (fournisseurs)</field>
             <field name="code">200.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_200" name="parent_id"/>
         </record>
@@ -3054,7 +3077,7 @@
             <field name="type">view</field>
             <field name="name">Acomptes de clients</field>
             <field name="code">203.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_200" name="parent_id"/>
         </record>
@@ -3071,7 +3094,7 @@
             <field name="type">view</field>
             <field name="name">Dettes c/achats, prestations services stés groupe</field>
             <field name="code">205.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_200" name="parent_id"/>
         </record>
@@ -3097,7 +3120,7 @@
             <field name="type">view</field>
             <field name="name">Dettes c/achats, prestations services actionnaires</field>
             <field name="code">206.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_200" name="parent_id"/>
         </record>
@@ -3123,7 +3146,7 @@
             <field name="type">view</field>
             <field name="name">Dettes financières à court terme</field>
             <field name="code">210</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_20" name="parent_id"/>
         </record>
@@ -3131,7 +3154,7 @@
             <field name="type">view</field>
             <field name="name">Dettes bancaires à court terme</field>
             <field name="code">210.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3147,7 +3170,7 @@
             <field name="type">view</field>
             <field name="name">Dettes c/chèques postaux, sociétés de virement</field>
             <field name="code">211.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3171,7 +3194,7 @@
             <field name="type">view</field>
             <field name="name">Effets à payer</field>
             <field name="code">212.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3195,7 +3218,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes financières à court terme à tiers</field>
             <field name="code">214.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3211,7 +3234,7 @@
             <field name="type">view</field>
             <field name="name">Dettes financières à court terme stés du groupe</field>
             <field name="code">215.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3235,7 +3258,7 @@
             <field name="type">view</field>
             <field name="name">Dettes financières à court terme actionnaires</field>
             <field name="code">216.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3259,7 +3282,7 @@
             <field name="type">view</field>
             <field name="name">Dettes financières à court terme fonds prévoyance</field>
             <field name="code">217.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3275,7 +3298,7 @@
             <field name="type">view</field>
             <field name="name">Part à rembourser dettes financières à long terme</field>
             <field name="code">218.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_210" name="parent_id"/>
         </record>
@@ -3299,7 +3322,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à court terme</field>
             <field name="code">220</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_20" name="parent_id"/>
         </record>
@@ -3307,7 +3330,7 @@
             <field name="type">view</field>
             <field name="name">Dettes envers des institutions publiques</field>
             <field name="code">220.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3348,7 +3371,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à court terme envers des tiers</field>
             <field name="code">221.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3372,7 +3395,7 @@
             <field name="type">view</field>
             <field name="name">Dividendes et coupons d'obligations non encaissés</field>
             <field name="code">223.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3404,7 +3427,7 @@
             <field name="type">view</field>
             <field name="name">Obligations à rembourser</field>
             <field name="code">224.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3420,7 +3443,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à court terme c/stés du groupe</field>
             <field name="code">225.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3444,7 +3467,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à court terme envers actionnaires</field>
             <field name="code">226.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3468,7 +3491,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à court terme c/fonds prévoyance</field>
             <field name="code">227.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3484,7 +3507,7 @@
             <field name="type">view</field>
             <field name="name">Résultat à verser</field>
             <field name="code">229.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_220" name="parent_id"/>
         </record>
@@ -3500,7 +3523,7 @@
             <field name="type">view</field>
             <field name="name">Passifs de régularisation, provisions court terme</field>
             <field name="code">230</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_20" name="parent_id"/>
         </record>
@@ -3508,7 +3531,7 @@
             <field name="type">view</field>
             <field name="name">Passifs de régularisation</field>
             <field name="code">230.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_230" name="parent_id"/>
         </record>
@@ -3532,7 +3555,7 @@
             <field name="type">view</field>
             <field name="name">Provisions à court terme c/ventes, services</field>
             <field name="code">233.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_230" name="parent_id"/>
         </record>
@@ -3556,7 +3579,7 @@
             <field name="type">view</field>
             <field name="name">Provisions à court terme pour impôts</field>
             <field name="code">234.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_230" name="parent_id"/>
         </record>
@@ -3580,7 +3603,7 @@
             <field name="type">view</field>
             <field name="name">Dettes à long terme</field>
             <field name="code">24</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_2" name="parent_id"/>
         </record>
@@ -3588,7 +3611,7 @@
             <field name="type">view</field>
             <field name="name">Dettes financière à long terme</field>
             <field name="code">240</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_24" name="parent_id"/>
         </record>
@@ -3596,7 +3619,7 @@
             <field name="type">view</field>
             <field name="name">Dettes bancaires à long terme</field>
             <field name="code">240.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_240" name="parent_id"/>
         </record>
@@ -3612,7 +3635,7 @@
             <field name="type">view</field>
             <field name="name">Dettes résultant d'opérations de crédit-bail</field>
             <field name="code">242.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_240" name="parent_id"/>
         </record>
@@ -3628,7 +3651,7 @@
             <field name="type">view</field>
             <field name="name">Dettes hypothécaires</field>
             <field name="code">244.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_240" name="parent_id"/>
         </record>
@@ -3700,7 +3723,7 @@
             <field name="type">view</field>
             <field name="name">Emprunts par obligations</field>
             <field name="code">246.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_240" name="parent_id"/>
         </record>
@@ -3716,7 +3739,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à long terme</field>
             <field name="code">250</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_24" name="parent_id"/>
         </record>
@@ -3724,7 +3747,7 @@
             <field name="type">view</field>
             <field name="name">Emprunts à long terme à des tiers</field>
             <field name="code">250.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_250" name="parent_id"/>
         </record>
@@ -3740,7 +3763,7 @@
             <field name="type">view</field>
             <field name="name">Dettes à long terme envers des sociétés du groupe</field>
             <field name="code">255.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_250" name="parent_id"/>
         </record>
@@ -3764,7 +3787,7 @@
             <field name="type">view</field>
             <field name="name">Dettes à long terme envers des actionnaires</field>
             <field name="code">256.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_250" name="parent_id"/>
         </record>
@@ -3788,7 +3811,7 @@
             <field name="type">view</field>
             <field name="name">Dettes à long terme envers des institutions LPP</field>
             <field name="code">257.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_250" name="parent_id"/>
         </record>
@@ -3812,7 +3835,7 @@
             <field name="type">view</field>
             <field name="name">Provisions à long terme</field>
             <field name="code">260</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_24" name="parent_id"/>
         </record>
@@ -3820,7 +3843,7 @@
             <field name="type">view</field>
             <field name="name">Provisions réparation, assainissements, rénovation</field>
             <field name="code">260.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3852,7 +3875,7 @@
             <field name="type">view</field>
             <field name="name">Provisions pour recherche et développement</field>
             <field name="code">261.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3876,7 +3899,7 @@
             <field name="type">view</field>
             <field name="name">Provisions pour restructuration de l'entreprise</field>
             <field name="code">262.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3892,7 +3915,7 @@
             <field name="type">view</field>
             <field name="name">Provisions résultant de ventes/prestations service</field>
             <field name="code">263.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3908,7 +3931,7 @@
             <field name="type">view</field>
             <field name="name">Provisions pour impôts (long terme)</field>
             <field name="code">264.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3924,7 +3947,7 @@
             <field name="type">view</field>
             <field name="name">Provisions pour la protection de l'environnement</field>
             <field name="code">265.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3940,7 +3963,7 @@
             <field name="type">view</field>
             <field name="name">Provisions pour prestations en cas de vieillesse</field>
             <field name="code">267.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3956,7 +3979,7 @@
             <field name="type">view</field>
             <field name="name">Autres provisions</field>
             <field name="code">269.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_260" name="parent_id"/>
         </record>
@@ -3972,7 +3995,7 @@
             <field name="type">view</field>
             <field name="name">Dettes hors exploitation</field>
             <field name="code">27</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_2" name="parent_id"/>
         </record>
@@ -3980,7 +4003,7 @@
             <field name="type">view</field>
             <field name="name">Dettes hors exploitation</field>
             <field name="code">270</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_27" name="parent_id"/>
         </record>
@@ -3988,7 +4011,7 @@
             <field name="type">view</field>
             <field name="name">Dettes à court terme résultant prestations service</field>
             <field name="code">270.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_270" name="parent_id"/>
         </record>
@@ -4004,7 +4027,7 @@
             <field name="type">view</field>
             <field name="name">Dettes financières à court terme</field>
             <field name="code">271.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_270" name="parent_id"/>
         </record>
@@ -4036,7 +4059,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à court terme</field>
             <field name="code">272.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_270" name="parent_id"/>
         </record>
@@ -4052,7 +4075,7 @@
             <field name="type">view</field>
             <field name="name">Passifs de régularisation, provisions court terme</field>
             <field name="code">273.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_270" name="parent_id"/>
         </record>
@@ -4076,7 +4099,7 @@
             <field name="type">view</field>
             <field name="name">Dettes financières à long terme</field>
             <field name="code">274.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_270" name="parent_id"/>
         </record>
@@ -4100,7 +4123,7 @@
             <field name="type">view</field>
             <field name="name">Autres dettes à long terme</field>
             <field name="code">275.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_270" name="parent_id"/>
         </record>
@@ -4132,7 +4155,7 @@
             <field name="type">view</field>
             <field name="name">Provisions</field>
             <field name="code">276.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_270" name="parent_id"/>
         </record>
@@ -4148,7 +4171,7 @@
             <field name="type">view</field>
             <field name="name">Capitaux propres</field>
             <field name="code">28</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_2" name="parent_id"/>
         </record>
@@ -4156,7 +4179,7 @@
             <field name="type">view</field>
             <field name="name">Capital/Privé</field>
             <field name="code">280</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_28" name="parent_id"/>
         </record>
@@ -4164,7 +4187,7 @@
             <field name="type">view</field>
             <field name="name">Capital</field>
             <field name="code">280.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_280" name="parent_id"/>
         </record>
@@ -4172,7 +4195,7 @@
             <field name="type">view</field>
             <field name="name">Capital propre des entreprises raison individuelle</field>
             <field name="code">280.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_280_0" name="parent_id"/>
         </record>
@@ -4196,7 +4219,7 @@
             <field name="type">view</field>
             <field name="name">Capital propre des sociétés de personnes</field>
             <field name="code">281.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_280_0" name="parent_id"/>
         </record>
@@ -4228,7 +4251,7 @@
             <field name="type">view</field>
             <field name="name">Capital social de la S.à.r.l</field>
             <field name="code">282.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_280_0" name="parent_id"/>
         </record>
@@ -4244,7 +4267,7 @@
             <field name="type">view</field>
             <field name="name">Capital de la société coopérative</field>
             <field name="code">283.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_280_0" name="parent_id"/>
         </record>
@@ -4260,7 +4283,7 @@
             <field name="type">view</field>
             <field name="name">Capital-actions et participation</field>
             <field name="code">284.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_280_0" name="parent_id"/>
         </record>
@@ -4284,7 +4307,7 @@
             <field name="type">view</field>
             <field name="name">Privé</field>
             <field name="code">285.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_280" name="parent_id"/>
         </record>
@@ -4292,7 +4315,7 @@
             <field name="type">view</field>
             <field name="name">Compte privé</field>
             <field name="code">285.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_285_0" name="parent_id"/>
         </record>
@@ -4356,7 +4379,7 @@
             <field name="type">view</field>
             <field name="name">Comptes pour immeubles et biens-fonds privés</field>
             <field name="code">288.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_285_0" name="parent_id"/>
         </record>
@@ -4380,7 +4403,7 @@
             <field name="type">view</field>
             <field name="name">Réserves, Bénéfice/Perte résultant du bilan</field>
             <field name="code">290</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_28" name="parent_id"/>
         </record>
@@ -4388,7 +4411,7 @@
             <field name="type">view</field>
             <field name="name">Réserves</field>
             <field name="code">290.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_290" name="parent_id"/>
         </record>
@@ -4396,7 +4419,7 @@
             <field name="type">view</field>
             <field name="name">Réserves légales</field>
             <field name="code">290.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_290_0" name="parent_id"/>
         </record>
@@ -4436,7 +4459,7 @@
             <field name="type">view</field>
             <field name="name">Autres réserves</field>
             <field name="code">291.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_290_0" name="parent_id"/>
         </record>
@@ -4492,7 +4515,7 @@
             <field name="type">view</field>
             <field name="name">Bénéfice/Perte résultant du bilan</field>
             <field name="code">299.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_290" name="parent_id"/>
         </record>
@@ -4500,7 +4523,7 @@
             <field name="type">view</field>
             <field name="name">Bénéfice/Perte résultant du bilan</field>
             <field name="code">299.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_liability"/>
             <field name="note"/>
             <field ref="ch_299_0" name="parent_id"/>
         </record>
@@ -4524,7 +4547,7 @@
             <field name="type">view</field>
             <field name="name">Compte de résultat</field>
             <field name="code">3_9</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_minimal_0" name="parent_id"/>
         </record>
@@ -4532,7 +4555,7 @@
             <field name="type">view</field>
             <field name="name">Chiffre d'affaires ventes, prestations services</field>
             <field name="code">3</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3_9" name="parent_id"/>
         </record>
@@ -4540,7 +4563,7 @@
             <field name="type">view</field>
             <field name="name">Chiffre d'affaires brut de la production vendue</field>
             <field name="code">30</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3" name="parent_id"/>
         </record>
@@ -4548,7 +4571,7 @@
             <field name="type">view</field>
             <field name="name">Caf brut de la production vendue secteur A</field>
             <field name="code">300</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_30" name="parent_id"/>
         </record>
@@ -4596,7 +4619,7 @@
             <field name="type">view</field>
             <field name="name">Caf brut de la production vendue secteur B</field>
             <field name="code">301</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_30" name="parent_id"/>
         </record>
@@ -4628,7 +4651,7 @@
             <field name="type">view</field>
             <field name="name">Caf brut de la production vendue secteur C</field>
             <field name="code">302</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_30" name="parent_id"/>
         </record>
@@ -4676,7 +4699,7 @@
             <field name="type">view</field>
             <field name="name">Caf brut de la production livrée à des stés groupe</field>
             <field name="code">305</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_30" name="parent_id"/>
         </record>
@@ -4692,7 +4715,7 @@
             <field name="type">view</field>
             <field name="name">Variations des stocks de produits en cours/finis</field>
             <field name="code">308</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_30" name="parent_id"/>
         </record>
@@ -4708,7 +4731,7 @@
             <field name="type">view</field>
             <field name="name">Déductions sur le caf de la production vendue</field>
             <field name="code">309</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_30" name="parent_id"/>
         </record>
@@ -4780,7 +4803,7 @@
             <field name="type">view</field>
             <field name="name">Ventes de marchandises</field>
             <field name="code">32</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3" name="parent_id"/>
         </record>
@@ -4788,7 +4811,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes de marchandises secteur A</field>
             <field name="code">320</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_32" name="parent_id"/>
         </record>
@@ -4820,7 +4843,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes de marchandises secteur B</field>
             <field name="code">321</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_32" name="parent_id"/>
         </record>
@@ -4852,7 +4875,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes de marchandises secteur C</field>
             <field name="code">322</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_32" name="parent_id"/>
         </record>
@@ -4900,7 +4923,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes de marchandises stés groupe</field>
             <field name="code">325</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_32" name="parent_id"/>
         </record>
@@ -4916,7 +4939,7 @@
             <field name="type">view</field>
             <field name="name">Déductions sur les ventes de marchandises</field>
             <field name="code">329</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_32" name="parent_id"/>
         </record>
@@ -4988,7 +5011,7 @@
             <field name="type">view</field>
             <field name="name">Ventes de prestations de services</field>
             <field name="code">34</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3" name="parent_id"/>
         </record>
@@ -4996,7 +5019,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes de prestations de service secteur A</field>
             <field name="code">340</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_34" name="parent_id"/>
         </record>
@@ -5036,7 +5059,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes de prestations de services secteur B</field>
             <field name="code">341</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_34" name="parent_id"/>
         </record>
@@ -5060,7 +5083,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes prestations de services du secteur C</field>
             <field name="code">342</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_34" name="parent_id"/>
         </record>
@@ -5108,7 +5131,7 @@
             <field name="type">view</field>
             <field name="name">Ventes brutes prestations services à stés groupe</field>
             <field name="code">345</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_34" name="parent_id"/>
         </record>
@@ -5124,7 +5147,7 @@
             <field name="type">view</field>
             <field name="name">Déductions s/ventes prestations de services</field>
             <field name="code">349</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_34" name="parent_id"/>
         </record>
@@ -5196,7 +5219,7 @@
             <field name="type">view</field>
             <field name="name">Autres produits</field>
             <field name="code">36</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3" name="parent_id"/>
         </record>
@@ -5204,7 +5227,7 @@
             <field name="type">view</field>
             <field name="name">Autres produits c/ventes et prestations services</field>
             <field name="code">360</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_36" name="parent_id"/>
         </record>
@@ -5260,7 +5283,7 @@
             <field name="type">view</field>
             <field name="name">Produits des licences, des brevets, etc.</field>
             <field name="code">361</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_36" name="parent_id"/>
         </record>
@@ -5300,7 +5323,7 @@
             <field name="type">view</field>
             <field name="name">Autres produits prestations services stés groupe</field>
             <field name="code">365</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_36" name="parent_id"/>
         </record>
@@ -5316,7 +5339,7 @@
             <field name="type">view</field>
             <field name="name">Produits c/mise à disposition du personnel</field>
             <field name="code">367</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_36" name="parent_id"/>
         </record>
@@ -5332,7 +5355,7 @@
             <field name="type">view</field>
             <field name="name">Autres produits c/ventes et prestations services</field>
             <field name="code">368</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_36" name="parent_id"/>
         </record>
@@ -5356,7 +5379,7 @@
             <field name="type">view</field>
             <field name="name">Déductions s/les autres produits</field>
             <field name="code">369</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_36" name="parent_id"/>
         </record>
@@ -5380,7 +5403,7 @@
             <field name="type">view</field>
             <field name="name">Prestations propres et consommations propres</field>
             <field name="code">37</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3" name="parent_id"/>
         </record>
@@ -5388,7 +5411,7 @@
             <field name="type">view</field>
             <field name="name">Prestations propres</field>
             <field name="code">370</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_37" name="parent_id"/>
         </record>
@@ -5428,7 +5451,7 @@
             <field name="type">view</field>
             <field name="name">Consommations propres pour propre production</field>
             <field name="code">371</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_37" name="parent_id"/>
         </record>
@@ -5452,7 +5475,7 @@
             <field name="type">view</field>
             <field name="name">Consommations propres de marchandises</field>
             <field name="code">372</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_37" name="parent_id"/>
         </record>
@@ -5476,7 +5499,7 @@
             <field name="type">view</field>
             <field name="name">Consommations propres de services</field>
             <field name="code">374</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_37" name="parent_id"/>
         </record>
@@ -5500,7 +5523,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks de produits et services</field>
             <field name="code">38</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3" name="parent_id"/>
         </record>
@@ -5508,7 +5531,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks de produits et services</field>
             <field name="code">380</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_38" name="parent_id"/>
         </record>
@@ -5532,7 +5555,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks de services</field>
             <field name="code">384</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_38" name="parent_id"/>
         </record>
@@ -5556,7 +5579,7 @@
             <field name="type">view</field>
             <field name="name">Déductions s/produits des ventes</field>
             <field name="code">39</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3" name="parent_id"/>
         </record>
@@ -5564,7 +5587,7 @@
             <field name="type">view</field>
             <field name="name">Déductions s/produits</field>
             <field name="code">390</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_39" name="parent_id"/>
         </record>
@@ -5604,7 +5627,7 @@
             <field name="type">view</field>
             <field name="name">Charges de matières, marchandises et services</field>
             <field name="code">4</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_3_9" name="parent_id"/>
         </record>
@@ -5612,7 +5635,7 @@
             <field name="type">view</field>
             <field name="name">Charges de matières</field>
             <field name="code">40</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -5620,7 +5643,7 @@
             <field name="type">view</field>
             <field name="name">Charges de matières du secteur A</field>
             <field name="code">400</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_40" name="parent_id"/>
         </record>
@@ -5660,7 +5683,7 @@
             <field name="type">view</field>
             <field name="name">Charges de matières du secteur B</field>
             <field name="code">401</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_40" name="parent_id"/>
         </record>
@@ -5716,7 +5739,7 @@
             <field name="type">view</field>
             <field name="name">Charges de matières du secteur C</field>
             <field name="code">402</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_40" name="parent_id"/>
         </record>
@@ -5772,7 +5795,7 @@
             <field name="type">view</field>
             <field name="name">Travaux de tiers</field>
             <field name="code">406</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_40" name="parent_id"/>
         </record>
@@ -5804,7 +5827,7 @@
             <field name="type">view</field>
             <field name="name">Charges directes d'achat</field>
             <field name="code">407</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_40" name="parent_id"/>
         </record>
@@ -5836,7 +5859,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks, pertes de matières</field>
             <field name="code">408</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_40" name="parent_id"/>
         </record>
@@ -5892,7 +5915,7 @@
             <field name="type">view</field>
             <field name="name">Déductions obtenues s/achats de matières</field>
             <field name="code">409</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_40" name="parent_id"/>
         </record>
@@ -5940,7 +5963,7 @@
             <field name="type">view</field>
             <field name="name">Charges de marchandises</field>
             <field name="code">42</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -5948,7 +5971,7 @@
             <field name="type">view</field>
             <field name="name">Charges de marchandises du secteur A</field>
             <field name="code">420</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_42" name="parent_id"/>
         </record>
@@ -5988,7 +6011,7 @@
             <field name="type">view</field>
             <field name="name">Charges de marchandises du secteur B</field>
             <field name="code">421</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_42" name="parent_id"/>
         </record>
@@ -6036,7 +6059,7 @@
             <field name="type">view</field>
             <field name="name">Charges directes d'achat s/marchandises</field>
             <field name="code">427</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_42" name="parent_id"/>
         </record>
@@ -6068,7 +6091,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks de marchandises, pertes</field>
             <field name="code">428</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_42" name="parent_id"/>
         </record>
@@ -6124,7 +6147,7 @@
             <field name="type">view</field>
             <field name="name">Déductions obtenues s/achats liés aux marchandises</field>
             <field name="code">429</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_42" name="parent_id"/>
         </record>
@@ -6172,7 +6195,7 @@
             <field name="type">view</field>
             <field name="name">Charges pour prestations de tiers (services)</field>
             <field name="code">44</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -6180,7 +6203,7 @@
             <field name="type">view</field>
             <field name="name">Charges pour prestations de services de tiers A</field>
             <field name="code">440</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_44" name="parent_id"/>
         </record>
@@ -6220,7 +6243,7 @@
             <field name="type">view</field>
             <field name="name">Charges directes d'achat s/prestations de services</field>
             <field name="code">447</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_44" name="parent_id"/>
         </record>
@@ -6252,7 +6275,7 @@
             <field name="type">view</field>
             <field name="name">Déductions obtenues s/achats de prestations tiers</field>
             <field name="code">449</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_44" name="parent_id"/>
         </record>
@@ -6292,7 +6315,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'énergie</field>
             <field name="code">45</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -6300,7 +6323,7 @@
             <field name="type">view</field>
             <field name="name">Electricité</field>
             <field name="code">450</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_45" name="parent_id"/>
         </record>
@@ -6324,7 +6347,7 @@
             <field name="type">view</field>
             <field name="name">Gaz</field>
             <field name="code">451</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_45" name="parent_id"/>
         </record>
@@ -6348,7 +6371,7 @@
             <field name="type">view</field>
             <field name="name">Combustibles</field>
             <field name="code">452</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_45" name="parent_id"/>
         </record>
@@ -6372,7 +6395,7 @@
             <field name="type">view</field>
             <field name="name">Carburants</field>
             <field name="code">453</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_45" name="parent_id"/>
         </record>
@@ -6404,7 +6427,7 @@
             <field name="type">view</field>
             <field name="name">Eau</field>
             <field name="code">454</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_45" name="parent_id"/>
         </record>
@@ -6420,7 +6443,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges</field>
             <field name="code">46</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -6428,7 +6451,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de matières pour la production</field>
             <field name="code">460</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_46" name="parent_id"/>
         </record>
@@ -6444,7 +6467,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de marchandises</field>
             <field name="code">462</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_46" name="parent_id"/>
         </record>
@@ -6460,7 +6483,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges pour prestations de tiers</field>
             <field name="code">464</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_46" name="parent_id"/>
         </record>
@@ -6476,7 +6499,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'emballage</field>
             <field name="code">465</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_46" name="parent_id"/>
         </record>
@@ -6492,7 +6515,7 @@
             <field name="type">view</field>
             <field name="name">Charges directes d'achat</field>
             <field name="code">47</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -6500,7 +6523,7 @@
             <field name="type">view</field>
             <field name="name">Charges directes d'achat</field>
             <field name="code">470</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_47" name="parent_id"/>
         </record>
@@ -6532,7 +6555,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks, pertes de matières et march.</field>
             <field name="code">48</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -6540,7 +6563,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks des matières de production</field>
             <field name="code">480</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_48" name="parent_id"/>
         </record>
@@ -6556,7 +6579,7 @@
             <field name="type">view</field>
             <field name="name">Variations de stocks de marchandises</field>
             <field name="code">482</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_48" name="parent_id"/>
         </record>
@@ -6572,7 +6595,7 @@
             <field name="type">view</field>
             <field name="name">Pertes de matières et de marchandises</field>
             <field name="code">488</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_48" name="parent_id"/>
         </record>
@@ -6596,7 +6619,7 @@
             <field name="type">view</field>
             <field name="name">Déductions obtenues s/charges</field>
             <field name="code">49</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_4" name="parent_id"/>
         </record>
@@ -6604,7 +6627,7 @@
             <field name="type">view</field>
             <field name="name">Déductions s/charges</field>
             <field name="code">490</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_49" name="parent_id"/>
         </record>
@@ -6652,7 +6675,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel</field>
             <field name="code">5</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_3_9" name="parent_id"/>
         </record>
@@ -6660,7 +6683,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel de production</field>
             <field name="code">50</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_5" name="parent_id"/>
         </record>
@@ -6668,7 +6691,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel de production du secteur A</field>
             <field name="code">500</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_50" name="parent_id"/>
         </record>
@@ -6748,7 +6771,7 @@
             <field name="type">view</field>
             <field name="name">Charges sociales de production</field>
             <field name="code">507</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_50" name="parent_id"/>
         </record>
@@ -6804,7 +6827,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de personnel de production</field>
             <field name="code">508</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_50" name="parent_id"/>
         </record>
@@ -6852,7 +6875,7 @@
             <field name="type">view</field>
             <field name="name">Prestations de travail de tiers dans la production</field>
             <field name="code">509</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_50" name="parent_id"/>
         </record>
@@ -6876,7 +6899,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel pour le commerce des march.</field>
             <field name="code">52</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_5" name="parent_id"/>
         </record>
@@ -6884,7 +6907,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel pour le commerce A</field>
             <field name="code">520</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_52" name="parent_id"/>
         </record>
@@ -6964,7 +6987,7 @@
             <field name="type">view</field>
             <field name="name">Charges sociales pour le commerce des marchandises</field>
             <field name="code">527</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_52" name="parent_id"/>
         </record>
@@ -7020,7 +7043,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de personnel pour le commerce march</field>
             <field name="code">528</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_52" name="parent_id"/>
         </record>
@@ -7068,7 +7091,7 @@
             <field name="type">view</field>
             <field name="name">Prestations de travail de tiers dans le commerce</field>
             <field name="code">529</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_52" name="parent_id"/>
         </record>
@@ -7084,7 +7107,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel pour la fourniture</field>
             <field name="code">54</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_5" name="parent_id"/>
         </record>
@@ -7092,7 +7115,7 @@
             <field name="type">view</field>
             <field name="name">Salaires pour la fourniture des prestations serv.</field>
             <field name="code">540</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_54" name="parent_id"/>
         </record>
@@ -7172,7 +7195,7 @@
             <field name="type">view</field>
             <field name="name">Charges sociales pour les prestations de services</field>
             <field name="code">547</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_54" name="parent_id"/>
         </record>
@@ -7228,7 +7251,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de personnel pour les prestations</field>
             <field name="code">548</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_54" name="parent_id"/>
         </record>
@@ -7276,7 +7299,7 @@
             <field name="type">view</field>
             <field name="name">Prestations de tiers pour les prestations service</field>
             <field name="code">549</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_54" name="parent_id"/>
         </record>
@@ -7292,7 +7315,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel dans l'administration</field>
             <field name="code">56</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_5" name="parent_id"/>
         </record>
@@ -7300,7 +7323,7 @@
             <field name="type">view</field>
             <field name="name">Salaires pour l'administration</field>
             <field name="code">560</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_56" name="parent_id"/>
         </record>
@@ -7388,7 +7411,7 @@
             <field name="type">view</field>
             <field name="name">Charges sociales pour l'administration</field>
             <field name="code">567</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_56" name="parent_id"/>
         </record>
@@ -7444,7 +7467,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de personnel pour l'administration</field>
             <field name="code">568</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_56" name="parent_id"/>
         </record>
@@ -7492,7 +7515,7 @@
             <field name="type">view</field>
             <field name="name">Prestations de travail de tiers c/l'administration</field>
             <field name="code">569</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_56" name="parent_id"/>
         </record>
@@ -7508,7 +7531,7 @@
             <field name="type">view</field>
             <field name="name">Charges sociales</field>
             <field name="code">57</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_5" name="parent_id"/>
         </record>
@@ -7516,7 +7539,7 @@
             <field name="type">view</field>
             <field name="name">AVS, AI, APG, assurance-chômage</field>
             <field name="code">570</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_57" name="parent_id"/>
         </record>
@@ -7532,7 +7555,7 @@
             <field name="type">view</field>
             <field name="name">Caisse de compensation familiale</field>
             <field name="code">571</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_57" name="parent_id"/>
         </record>
@@ -7548,7 +7571,7 @@
             <field name="type">view</field>
             <field name="name">Prévoyance professionnelle</field>
             <field name="code">572</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_57" name="parent_id"/>
         </record>
@@ -7564,7 +7587,7 @@
             <field name="type">view</field>
             <field name="name">Assurance-accidents</field>
             <field name="code">573</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_57" name="parent_id"/>
         </record>
@@ -7580,7 +7603,7 @@
             <field name="type">view</field>
             <field name="name">Assurance indemnités journalières en cas maladie</field>
             <field name="code">574</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_57" name="parent_id"/>
         </record>
@@ -7596,7 +7619,7 @@
             <field name="type">view</field>
             <field name="name">Impôts à la source</field>
             <field name="code">579</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_57" name="parent_id"/>
         </record>
@@ -7612,7 +7635,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de personnel</field>
             <field name="code">58</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_5" name="parent_id"/>
         </record>
@@ -7620,7 +7643,7 @@
             <field name="type">view</field>
             <field name="name">Recherche de personnel</field>
             <field name="code">580</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_58" name="parent_id"/>
         </record>
@@ -7644,7 +7667,7 @@
             <field name="type">view</field>
             <field name="name">Formation et formation continue</field>
             <field name="code">581</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_58" name="parent_id"/>
         </record>
@@ -7668,7 +7691,7 @@
             <field name="type">view</field>
             <field name="name">Indemnités effectives</field>
             <field name="code">582</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_58" name="parent_id"/>
         </record>
@@ -7700,7 +7723,7 @@
             <field name="type">view</field>
             <field name="name">Indemnités forfaitaires</field>
             <field name="code">583</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_58" name="parent_id"/>
         </record>
@@ -7732,7 +7755,7 @@
             <field name="type">view</field>
             <field name="name">Restaurant du personnel</field>
             <field name="code">584</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_58" name="parent_id"/>
         </record>
@@ -7772,7 +7795,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges de personnel</field>
             <field name="code">588</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_58" name="parent_id"/>
         </record>
@@ -7796,7 +7819,7 @@
             <field name="type">view</field>
             <field name="name">Charges de personnel comme prélèvements privés</field>
             <field name="code">589</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_58" name="parent_id"/>
         </record>
@@ -7812,7 +7835,7 @@
             <field name="type">view</field>
             <field name="name">Prestations de travail de tiers</field>
             <field name="code">59</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_5" name="parent_id"/>
         </record>
@@ -7820,7 +7843,7 @@
             <field name="type">view</field>
             <field name="name">Prestations de travail de tiers</field>
             <field name="code">590</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_59" name="parent_id"/>
         </record>
@@ -7844,7 +7867,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges d'exploitation</field>
             <field name="code">6</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_3_9" name="parent_id"/>
         </record>
@@ -7852,7 +7875,7 @@
             <field name="type">view</field>
             <field name="name">Charges de locaux</field>
             <field name="code">60</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -7860,7 +7883,7 @@
             <field name="type">view</field>
             <field name="name">Loyers pour locaux de tiers</field>
             <field name="code">600</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_60" name="parent_id"/>
         </record>
@@ -7924,7 +7947,7 @@
             <field name="type">view</field>
             <field name="name">Loyers pour locaux propres</field>
             <field name="code">601</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_60" name="parent_id"/>
         </record>
@@ -7988,7 +8011,7 @@
             <field name="type">view</field>
             <field name="name">Charges accessoires</field>
             <field name="code">603</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_60" name="parent_id"/>
         </record>
@@ -8076,7 +8099,7 @@
             <field name="type">view</field>
             <field name="name">Charges de nettoyage</field>
             <field name="code">604</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_60" name="parent_id"/>
         </record>
@@ -8156,7 +8179,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'entretien des locaux</field>
             <field name="code">605</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_60" name="parent_id"/>
         </record>
@@ -8244,7 +8267,7 @@
             <field name="type">view</field>
             <field name="name">Charges pour immobilisations en crédit-bail</field>
             <field name="code">606</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_60" name="parent_id"/>
         </record>
@@ -8308,7 +8331,7 @@
             <field name="type">view</field>
             <field name="name">Charges de locaux comme prélèvements privés</field>
             <field name="code">609</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_60" name="parent_id"/>
         </record>
@@ -8324,7 +8347,7 @@
             <field name="type">view</field>
             <field name="name">Entretien, réparations, remplacements (ERR)</field>
             <field name="code">61</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -8332,7 +8355,7 @@
             <field name="type">view</field>
             <field name="name">Entretien, réparations, remplacements (ERR)</field>
             <field name="code">610</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_61" name="parent_id"/>
         </record>
@@ -8340,7 +8363,7 @@
             <field name="type">view</field>
             <field name="name">ERR d'installations de production</field>
             <field name="code">610.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_610" name="parent_id"/>
         </record>
@@ -8372,7 +8395,7 @@
             <field name="type">view</field>
             <field name="name">ERR d'installations pour le commerce des march.</field>
             <field name="code">611.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_610" name="parent_id"/>
         </record>
@@ -8396,7 +8419,7 @@
             <field name="type">view</field>
             <field name="name">ERR d'installations d'entreposage</field>
             <field name="code">612.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_610" name="parent_id"/>
         </record>
@@ -8420,7 +8443,7 @@
             <field name="type">view</field>
             <field name="name">ERR d'installations de bureau</field>
             <field name="code">613.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_610" name="parent_id"/>
         </record>
@@ -8444,7 +8467,7 @@
             <field name="type">view</field>
             <field name="name">ERR d'installations pour le personnel</field>
             <field name="code">614.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_610" name="parent_id"/>
         </record>
@@ -8468,7 +8491,7 @@
             <field name="type">view</field>
             <field name="name">Charges c/immobi. corporelles meubles crédit-bail</field>
             <field name="code">616</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_61" name="parent_id"/>
         </record>
@@ -8476,7 +8499,7 @@
             <field name="type">view</field>
             <field name="name">Charges c/immobi. corporelles meubles crédit-bail</field>
             <field name="code">616.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_616" name="parent_id"/>
         </record>
@@ -8524,7 +8547,7 @@
             <field name="type">view</field>
             <field name="name">Charges de véhicules et de transport</field>
             <field name="code">62</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -8532,7 +8555,7 @@
             <field name="type">view</field>
             <field name="name">Charges de véhicules</field>
             <field name="code">620</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_62" name="parent_id"/>
         </record>
@@ -8540,7 +8563,7 @@
             <field name="type">view</field>
             <field name="name">Réparation, service et nettoyage des véhicules</field>
             <field name="code">620.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_620" name="parent_id"/>
         </record>
@@ -8604,7 +8627,7 @@
             <field name="type">view</field>
             <field name="name">Carburants</field>
             <field name="code">621.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_620" name="parent_id"/>
         </record>
@@ -8668,7 +8691,7 @@
             <field name="type">view</field>
             <field name="name">Assurances</field>
             <field name="code">622.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_620" name="parent_id"/>
         </record>
@@ -8732,7 +8755,7 @@
             <field name="type">view</field>
             <field name="name">Droits de circulation, cotisations, taxes</field>
             <field name="code">623.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_620" name="parent_id"/>
         </record>
@@ -8788,7 +8811,7 @@
             <field name="type">view</field>
             <field name="name">Charges de location pour véhicules en crédit-bail</field>
             <field name="code">626.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_620" name="parent_id"/>
         </record>
@@ -8836,7 +8859,7 @@
             <field name="type">view</field>
             <field name="name">Charges de véhicules comme prélèvements privés</field>
             <field name="code">627.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_620" name="parent_id"/>
         </record>
@@ -8852,7 +8875,7 @@
             <field name="type">view</field>
             <field name="name">Charges de transport</field>
             <field name="code">628</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_62" name="parent_id"/>
         </record>
@@ -8860,7 +8883,7 @@
             <field name="type">view</field>
             <field name="name">Frets, frais de transport, cargo domicile</field>
             <field name="code">628.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_628" name="parent_id"/>
         </record>
@@ -8908,7 +8931,7 @@
             <field name="type">view</field>
             <field name="name">Assurances-choses, droits, taxes, autorisations</field>
             <field name="code">63</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -8916,7 +8939,7 @@
             <field name="type">view</field>
             <field name="name">Assurances-choses</field>
             <field name="code">630</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_63" name="parent_id"/>
         </record>
@@ -8924,7 +8947,7 @@
             <field name="type">view</field>
             <field name="name">Primes d'assurance c/dommages, bris de glace, vols</field>
             <field name="code">630.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_630" name="parent_id"/>
         </record>
@@ -8956,7 +8979,7 @@
             <field name="type">view</field>
             <field name="name">Primes d'assurance responsabilité civile /garantie</field>
             <field name="code">631.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_630" name="parent_id"/>
         </record>
@@ -8988,7 +9011,7 @@
             <field name="type">view</field>
             <field name="name">Primes d'assurance pour arrêts d'exploitation</field>
             <field name="code">632.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_630" name="parent_id"/>
         </record>
@@ -9004,7 +9027,7 @@
             <field name="type">view</field>
             <field name="name">Primes pour assurances liées aux crédits</field>
             <field name="code">633.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_630" name="parent_id"/>
         </record>
@@ -9028,7 +9051,7 @@
             <field name="type">view</field>
             <field name="name">Droits, taxes, autorisations, patentes</field>
             <field name="code">636</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_63" name="parent_id"/>
         </record>
@@ -9036,7 +9059,7 @@
             <field name="type">view</field>
             <field name="name">Droits et taxes</field>
             <field name="code">636.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_636" name="parent_id"/>
         </record>
@@ -9060,7 +9083,7 @@
             <field name="type">view</field>
             <field name="name">Autorisations et patentes</field>
             <field name="code">637.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_636" name="parent_id"/>
         </record>
@@ -9084,7 +9107,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'énergie et évacuation des déchets</field>
             <field name="code">64</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -9092,7 +9115,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'énergie</field>
             <field name="code">640</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_64" name="parent_id"/>
         </record>
@@ -9100,7 +9123,7 @@
             <field name="type">view</field>
             <field name="name">Electricité</field>
             <field name="code">640.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_640" name="parent_id"/>
         </record>
@@ -9132,7 +9155,7 @@
             <field name="type">view</field>
             <field name="name">Gaz</field>
             <field name="code">641.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_640" name="parent_id"/>
         </record>
@@ -9156,7 +9179,7 @@
             <field name="type">view</field>
             <field name="name">Combustibles et matériaux de chauffage</field>
             <field name="code">642.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_640" name="parent_id"/>
         </record>
@@ -9180,7 +9203,7 @@
             <field name="type">view</field>
             <field name="name">Eau</field>
             <field name="code">643.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_640" name="parent_id"/>
         </record>
@@ -9196,7 +9219,7 @@
             <field name="type">view</field>
             <field name="name">Evacuation de déchets</field>
             <field name="code">646</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_64" name="parent_id"/>
         </record>
@@ -9204,7 +9227,7 @@
             <field name="type">view</field>
             <field name="name">Evacuation de déchets</field>
             <field name="code">646.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_646" name="parent_id"/>
         </record>
@@ -9236,7 +9259,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'administration et d'informatique</field>
             <field name="code">65</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -9244,7 +9267,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'administration</field>
             <field name="code">650</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_65" name="parent_id"/>
         </record>
@@ -9252,7 +9275,7 @@
             <field name="type">view</field>
             <field name="name">Matériel de bureau, imprimés, photocopies</field>
             <field name="code">650.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_650" name="parent_id"/>
         </record>
@@ -9292,7 +9315,7 @@
             <field name="type">view</field>
             <field name="name">Téléphone, téléfax, Internet, frais de port</field>
             <field name="code">651.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_650" name="parent_id"/>
         </record>
@@ -9332,7 +9355,7 @@
             <field name="type">view</field>
             <field name="name">Cotisations, dons, cadeaux et pourboires</field>
             <field name="code">652.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_650" name="parent_id"/>
         </record>
@@ -9364,7 +9387,7 @@
             <field name="type">view</field>
             <field name="name">Honoraires pour fiduciaire et conseil</field>
             <field name="code">653.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_650" name="parent_id"/>
         </record>
@@ -9396,7 +9419,7 @@
             <field name="type">view</field>
             <field name="name">Conseil d'administration, AG, OR</field>
             <field name="code">654.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_650" name="parent_id"/>
         </record>
@@ -9428,7 +9451,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'administration comme prélèvements privés</field>
             <field name="code">655.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_650" name="parent_id"/>
         </record>
@@ -9444,7 +9467,7 @@
             <field name="type">view</field>
             <field name="name">Informatique</field>
             <field name="code">656</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_65" name="parent_id"/>
         </record>
@@ -9452,7 +9475,7 @@
             <field name="type">view</field>
             <field name="name">Locations en crédit-bail et locations de hard/soft</field>
             <field name="code">656.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_656" name="parent_id"/>
         </record>
@@ -9484,7 +9507,7 @@
             <field name="type">view</field>
             <field name="name">Licences et entretien</field>
             <field name="code">657.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_656" name="parent_id"/>
         </record>
@@ -9540,7 +9563,7 @@
             <field name="type">view</field>
             <field name="name">Conseils et développements</field>
             <field name="code">658.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_656" name="parent_id"/>
         </record>
@@ -9588,7 +9611,7 @@
             <field name="type">view</field>
             <field name="name">Publicité</field>
             <field name="code">66</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -9596,7 +9619,7 @@
             <field name="type">view</field>
             <field name="name">Publicité, médias électroniques</field>
             <field name="code">660</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_66" name="parent_id"/>
         </record>
@@ -9684,7 +9707,7 @@
             <field name="type">view</field>
             <field name="name">Imprimés, matériel, articles de publicité</field>
             <field name="code">661</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_66" name="parent_id"/>
         </record>
@@ -9708,7 +9731,7 @@
             <field name="type">view</field>
             <field name="name">Vitrines, décoration, foires, expositions</field>
             <field name="code">662</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_66" name="parent_id"/>
         </record>
@@ -9732,7 +9755,7 @@
             <field name="type">view</field>
             <field name="name">Frais de voyage, conseils à la clientèle</field>
             <field name="code">664</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_66" name="parent_id"/>
         </record>
@@ -9764,7 +9787,7 @@
             <field name="type">view</field>
             <field name="name">Publicité, sponsoring</field>
             <field name="code">666</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_66" name="parent_id"/>
         </record>
@@ -9788,7 +9811,7 @@
             <field name="type">view</field>
             <field name="name">Relations publiques</field>
             <field name="code">667</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_66" name="parent_id"/>
         </record>
@@ -9820,7 +9843,7 @@
             <field name="type">view</field>
             <field name="name">Conseils en publicité, études de marché</field>
             <field name="code">668</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_66" name="parent_id"/>
         </record>
@@ -9844,7 +9867,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges d'exploitation</field>
             <field name="code">67</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -9852,7 +9875,7 @@
             <field name="type">view</field>
             <field name="name">Informations économiques, poursuites</field>
             <field name="code">670</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_67" name="parent_id"/>
         </record>
@@ -9876,7 +9899,7 @@
             <field name="type">view</field>
             <field name="name">Sécurité et surveillance</field>
             <field name="code">671</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_67" name="parent_id"/>
         </record>
@@ -9900,7 +9923,7 @@
             <field name="type">view</field>
             <field name="name">Recherche et développement</field>
             <field name="code">672</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_67" name="parent_id"/>
         </record>
@@ -9924,7 +9947,7 @@
             <field name="type">view</field>
             <field name="name">Résultat financier</field>
             <field name="code">68</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -9932,7 +9955,7 @@
             <field name="type">view</field>
             <field name="name">Charges financières</field>
             <field name="code">680</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_68" name="parent_id"/>
         </record>
@@ -9940,7 +9963,7 @@
             <field name="type">view</field>
             <field name="name">Charges financières pour financement par des tiers</field>
             <field name="code">680.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_680" name="parent_id"/>
         </record>
@@ -9988,7 +10011,7 @@
             <field name="type">view</field>
             <field name="name">Charges financières pour financement par des stés</field>
             <field name="code">681.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_680" name="parent_id"/>
         </record>
@@ -10012,7 +10035,7 @@
             <field name="type">view</field>
             <field name="name">Charges financières pour financement actionnaires</field>
             <field name="code">682.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_680" name="parent_id"/>
         </record>
@@ -10036,7 +10059,7 @@
             <field name="type">view</field>
             <field name="name">Charges financières pour financement LPP</field>
             <field name="code">683.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_680" name="parent_id"/>
         </record>
@@ -10052,7 +10075,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges financières</field>
             <field name="code">684.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_680" name="parent_id"/>
         </record>
@@ -10108,7 +10131,7 @@
             <field name="type">view</field>
             <field name="name">Produits financiers</field>
             <field name="code">685</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_68" name="parent_id"/>
         </record>
@@ -10116,7 +10139,7 @@
             <field name="type">view</field>
             <field name="name">Produits financiers des liquidités et des titres</field>
             <field name="code">685.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_685" name="parent_id"/>
         </record>
@@ -10164,7 +10187,7 @@
             <field name="type">view</field>
             <field name="name">Produits financiers c/immobilisations financières</field>
             <field name="code">686.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_685" name="parent_id"/>
         </record>
@@ -10212,7 +10235,7 @@
             <field name="type">view</field>
             <field name="name">Produits financiers de placement auprès des stés</field>
             <field name="code">687.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_685" name="parent_id"/>
         </record>
@@ -10236,7 +10259,7 @@
             <field name="type">view</field>
             <field name="name">Produits financiers placement auprès actionnaires</field>
             <field name="code">688.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_685" name="parent_id"/>
         </record>
@@ -10260,7 +10283,7 @@
             <field name="type">view</field>
             <field name="name">Autres produits financiers</field>
             <field name="code">689.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_685" name="parent_id"/>
         </record>
@@ -10316,7 +10339,7 @@
             <field name="type">view</field>
             <field name="name">Amortissement</field>
             <field name="code">69</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_6" name="parent_id"/>
         </record>
@@ -10324,7 +10347,7 @@
             <field name="type">view</field>
             <field name="name">Dépréciations s/immobilisations financières</field>
             <field name="code">690</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_69" name="parent_id"/>
         </record>
@@ -10348,7 +10371,7 @@
             <field name="type">view</field>
             <field name="name">Dépréciations s/participations à des stés groupe</field>
             <field name="code">691</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_69" name="parent_id"/>
         </record>
@@ -10372,7 +10395,7 @@
             <field name="type">view</field>
             <field name="name">Amortissements s/immobilisations corporelles</field>
             <field name="code">692</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_69" name="parent_id"/>
         </record>
@@ -10412,7 +10435,7 @@
             <field name="type">view</field>
             <field name="name">Amortissements s/immobilisations corporelles imm.</field>
             <field name="code">693</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_69" name="parent_id"/>
         </record>
@@ -10436,7 +10459,7 @@
             <field name="type">view</field>
             <field name="name">Amortissements s/immobilisations incorporelles</field>
             <field name="code">694</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_69" name="parent_id"/>
         </record>
@@ -10468,7 +10491,7 @@
             <field name="type">view</field>
             <field name="name">Amortissements s/charges activées</field>
             <field name="code">695</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_69" name="parent_id"/>
         </record>
@@ -10492,7 +10515,7 @@
             <field name="type">view</field>
             <field name="name">Résultat des activités annexes d'exploitation</field>
             <field name="code">7</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3_9" name="parent_id"/>
         </record>
@@ -10500,7 +10523,7 @@
             <field name="type">view</field>
             <field name="name">Résultat des activités annexes</field>
             <field name="code">70</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_7" name="parent_id"/>
         </record>
@@ -10508,7 +10531,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'activité annexe 1</field>
             <field name="code">700</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_70" name="parent_id"/>
         </record>
@@ -10516,7 +10539,7 @@
             <field name="type">view</field>
             <field name="name">Produits de l'activité annexe 1</field>
             <field name="code">700.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_700" name="parent_id"/>
         </record>
@@ -10540,7 +10563,7 @@
             <field name="type">view</field>
             <field name="name">Charges de l'activité annexe 1</field>
             <field name="code">701.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_700" name="parent_id"/>
         </record>
@@ -10628,7 +10651,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'activité annexe 2</field>
             <field name="code">700</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_70" name="parent_id"/>
         </record>
@@ -10636,7 +10659,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'activité annexe 2</field>
             <field name="code">702.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_700" name="parent_id"/>
         </record>
@@ -10660,7 +10683,7 @@
             <field name="type">view</field>
             <field name="name">Charges de l'activité annexe 2</field>
             <field name="code">703.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_700" name="parent_id"/>
         </record>
@@ -10748,7 +10771,7 @@
             <field name="type">view</field>
             <field name="name">Résultat des placements financiers</field>
             <field name="code">74</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_7" name="parent_id"/>
         </record>
@@ -10756,7 +10779,7 @@
             <field name="type">view</field>
             <field name="name">Produits de placements financiers</field>
             <field name="code">740.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_74" name="parent_id"/>
         </record>
@@ -10796,7 +10819,7 @@
             <field name="type">view</field>
             <field name="name">Charges s/placements financiers</field>
             <field name="code">741.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_74" name="parent_id"/>
         </record>
@@ -10836,7 +10859,7 @@
             <field name="type">view</field>
             <field name="name">Résultat d'immeuble</field>
             <field name="code">75</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_7" name="parent_id"/>
         </record>
@@ -10844,7 +10867,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'immeuble d'exploitation 1</field>
             <field name="code">750</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_75" name="parent_id"/>
         </record>
@@ -10852,7 +10875,7 @@
             <field name="type">view</field>
             <field name="name">Produits de l'immeuble d'exploitation 1</field>
             <field name="code">750.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_750" name="parent_id"/>
         </record>
@@ -10900,7 +10923,7 @@
             <field name="type">view</field>
             <field name="name">Charges de l'immeuble d'exploitation 1</field>
             <field name="code">751.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_750" name="parent_id"/>
         </record>
@@ -10964,7 +10987,7 @@
             <field name="type">view</field>
             <field name="name">Bénéfices provenant de l'aliénation d'actifs immob</field>
             <field name="code">79</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_7" name="parent_id"/>
         </record>
@@ -10972,7 +10995,7 @@
             <field name="type">view</field>
             <field name="name">Bénéfices s/immobilisations financières</field>
             <field name="code">790</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_79" name="parent_id"/>
         </record>
@@ -11004,7 +11027,7 @@
             <field name="type">view</field>
             <field name="name">Bénéfices s/immobilisations corporelles meubles</field>
             <field name="code">791</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_79" name="parent_id"/>
         </record>
@@ -11020,7 +11043,7 @@
             <field name="type">view</field>
             <field name="name">Bénéfice s/immobilisations corporelles immeubles</field>
             <field name="code">792</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_79" name="parent_id"/>
         </record>
@@ -11036,7 +11059,7 @@
             <field name="type">view</field>
             <field name="name">Bénéfices s/immobilisations incorporelles</field>
             <field name="code">793</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_79" name="parent_id"/>
         </record>
@@ -11052,7 +11075,7 @@
             <field name="type">view</field>
             <field name="name">Résultats exceptionnel et hors exploitation impôts</field>
             <field name="code">8</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3_9" name="parent_id"/>
         </record>
@@ -11060,7 +11083,7 @@
             <field name="type">view</field>
             <field name="name">Résultat exceptionnel</field>
             <field name="code">80</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_8" name="parent_id"/>
         </record>
@@ -11068,7 +11091,7 @@
             <field name="type">view</field>
             <field name="name">Produits exceptionnels</field>
             <field name="code">800</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_80" name="parent_id"/>
         </record>
@@ -11132,7 +11155,7 @@
             <field name="type">view</field>
             <field name="name">Charges exceptionnelles</field>
             <field name="code">801</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_80" name="parent_id"/>
         </record>
@@ -11212,7 +11235,7 @@
             <field name="type">view</field>
             <field name="name">Résultat hors exploitation</field>
             <field name="code">82</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_8" name="parent_id"/>
         </record>
@@ -11220,7 +11243,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'activité hors exploitation</field>
             <field name="code">820</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_82" name="parent_id"/>
         </record>
@@ -11228,7 +11251,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'activité hors exploitation 1</field>
             <field name="code">820.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_820" name="parent_id"/>
         </record>
@@ -11236,7 +11259,7 @@
             <field name="type">view</field>
             <field name="name">Produits de l'activité hors exploitation 1</field>
             <field name="code">820.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_820_0" name="parent_id"/>
         </record>
@@ -11260,7 +11283,7 @@
             <field name="type">view</field>
             <field name="name">Charges de l'activité hors exploitation 1</field>
             <field name="code">821.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_820_0" name="parent_id"/>
         </record>
@@ -11348,7 +11371,7 @@
             <field name="type">view</field>
             <field name="name">Résultat des placements financiers hors exploitation</field>
             <field name="code">840</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_82" name="parent_id"/>
         </record>
@@ -11356,7 +11379,7 @@
             <field name="type">view</field>
             <field name="name">Produits financiers s/placements financiers hors exploitation</field>
             <field name="code">840.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_840" name="parent_id"/>
         </record>
@@ -11380,7 +11403,7 @@
             <field name="type">view</field>
             <field name="name">Charges financières s/placements financiers hors exploitation</field>
             <field name="code">841.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_840" name="parent_id"/>
         </record>
@@ -11420,7 +11443,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'immeuble hors exploitation</field>
             <field name="code">850</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_82" name="parent_id"/>
         </record>
@@ -11428,7 +11451,7 @@
             <field name="type">view</field>
             <field name="name">Résultat de l'immeuble hors exploitation 1</field>
             <field name="code">850.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_850" name="parent_id"/>
         </record>
@@ -11436,7 +11459,7 @@
             <field name="type">view</field>
             <field name="name">Produits de l'immeuble hors exploitation 1</field>
             <field name="code">850.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_850_0" name="parent_id"/>
         </record>
@@ -11476,7 +11499,7 @@
             <field name="type">view</field>
             <field name="name">Charges de l'immeuble hors exploitation 1</field>
             <field name="code">851.00</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_850_0" name="parent_id"/>
         </record>
@@ -11540,7 +11563,7 @@
             <field name="type">view</field>
             <field name="name">Autres résultats hors exploitation</field>
             <field name="code">870</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_82" name="parent_id"/>
         </record>
@@ -11548,7 +11571,7 @@
             <field name="type">view</field>
             <field name="name">Autres produits hors exploitation</field>
             <field name="code">870.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_870" name="parent_id"/>
         </record>
@@ -11572,7 +11595,7 @@
             <field name="type">view</field>
             <field name="name">Autres charges hors exploitation</field>
             <field name="code">871.0</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_870" name="parent_id"/>
         </record>
@@ -11588,7 +11611,7 @@
             <field name="type">view</field>
             <field name="name">Charges d'impôt</field>
             <field name="code">89</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_8" name="parent_id"/>
         </record>
@@ -11596,7 +11619,7 @@
             <field name="type">view</field>
             <field name="name">Impôts directs de l'entreprise</field>
             <field name="code">890</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_expense"/>
             <field name="note"/>
             <field ref="ch_89" name="parent_id"/>
         </record>
@@ -11628,7 +11651,7 @@
             <field name="type">view</field>
             <field name="name">Clôture</field>
             <field name="code">9</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_3_9" name="parent_id"/>
         </record>
@@ -11636,7 +11659,7 @@
             <field name="type">view</field>
             <field name="name">Compte de résultat</field>
             <field name="code">90</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_9" name="parent_id"/>
         </record>
@@ -11644,7 +11667,7 @@
             <field name="type">view</field>
             <field name="name">Compte de résultat</field>
             <field name="code">900</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_90" name="parent_id"/>
         </record>
@@ -11660,7 +11683,7 @@
             <field name="type">view</field>
             <field name="name">Bilan</field>
             <field name="code">91</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_9" name="parent_id"/>
         </record>
@@ -11668,7 +11691,7 @@
             <field name="type">view</field>
             <field name="name">Bilan</field>
             <field name="code">910</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_assets"/>
             <field name="note"/>
             <field ref="ch_91" name="parent_id"/>
         </record>
@@ -11692,7 +11715,7 @@
             <field name="type">view</field>
             <field name="name">Utilisation du bénéfice</field>
             <field name="code">92</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_9" name="parent_id"/>
         </record>
@@ -11700,7 +11723,7 @@
             <field name="type">view</field>
             <field name="name">Utilisation du bénéfice</field>
             <field name="code">920</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_92" name="parent_id"/>
         </record>
@@ -11724,7 +11747,7 @@
             <field name="type">view</field>
             <field name="name">Ecriture de regroupements et de corrections</field>
             <field name="code">99</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_9" name="parent_id"/>
         </record>
@@ -11732,7 +11755,7 @@
             <field name="type">view</field>
             <field name="name">Ecritures de regroupements</field>
             <field name="code">990</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_99" name="parent_id"/>
         </record>
@@ -11756,7 +11779,7 @@
             <field name="type">view</field>
             <field name="name">Ecritures de corrections</field>
             <field name="code">991</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type" ref="account_type_view_income"/>
             <field name="note"/>
             <field ref="ch_99" name="parent_id"/>
         </record>
@@ -11773,10 +11796,10 @@
             <field name="parent_id" eval="False"/>
         </record>
         <record id="l10nch_chart_template" model="account.chart.template">
-            <field name="name">Swiss PCG</field>
+            <field name="name">Plan comptable STERCHI</field>
             <field name="account_root_id" ref="ch_minimal_0"/>
             <field name="tax_code_root_id" ref="vat_code_chart_root"/>
-            <field name="bank_account_view_id" ref="ch_3400"/>
+            <field name="bank_account_view_id" ref="ch_102_0"/>
             <field name="property_account_receivable" ref="ch_1100"/>
             <field name="property_account_payable" ref="ch_2000"/>
             <field name="property_account_expense_categ" ref="ch_4200"/>
diff --git a/addons/l10n_ch/sterchi_chart/fiscal_position.xml b/addons/l10n_ch/sterchi_chart/fiscal_position.xml
index e6b95fb7e68..d8a70325ba5 100644
--- a/addons/l10n_ch/sterchi_chart/fiscal_position.xml
+++ b/addons/l10n_ch/sterchi_chart/fiscal_position.xml
@@ -1,5 +1,5 @@
 <openerp>
-    <data>
+    <data noupdate="1">
         <!-- Fiscal Position Templates -->
         
         <record id="fiscal_position_template_import" model="account.fiscal.position.template">
@@ -115,4 +115,4 @@
             <field name="tax_dest_id" ref="vat_XO" />
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml
new file mode 100644
index 00000000000..5dc41adedd8
--- /dev/null
+++ b/addons/l10n_ch/test/l10n_ch_dta.yml
@@ -0,0 +1,221 @@
+-
+  In order to test DTA generation I make an invoice and create the DTA from it.
+-
+  I create an invoice on 1st January for 7000 EUR 
+  ###########################
+ #   Creating 1 invoice    # 
+###########################
+-
+  !record {model: account.invoice, id: dta_account_invoice, view: False}:
+    company_id: base.main_company
+    journal_id: account.bank_journal
+    currency_id: base.EUR
+    account_id: account.a_pay
+    type : in_invoice
+    partner_id: base.res_partner_agrolait
+    address_contact_id: base.res_partner_address_8
+    address_invoice_id: base.res_partner_address_8
+    reference_type: bvr
+    reference: 111111111111111111111111111111 
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    #invoice_line: 
+    partner_bank_id: main_partner_bank
+    check_total : 7000
+-
+  I add an invoice line
+-
+  !record {model: account.invoice.line, id: dta_invoice_line, view: False}:
+    account_id: account.a_expense
+    name: '[PC1] Basic PC'
+    price_unit: 700.0
+    quantity: 10.0
+    product_id: product.product_product_pc1
+    uos_id: product.product_uom_unit
+    invoice_id: dta_account_invoice
+
+
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: dta_account_invoice}
+
+-
+  I create my payment order to pay my invoice
+  ###########################
+ #   Doing payment order   # 
+###########################
+-
+  !record {model: payment.order, id: dta_payment_order}:
+    #date_created
+    #date_done
+    date_prefered: due
+    #date_scheduled
+    #line_ids:
+    mode: l10n_ch.payment_mode_dta
+    #reference
+    state: draft
+    total: 7000
+    #user_id
+-
+  I add a payment line to my payment order
+-
+  !record {model: payment.line, id: dta_pay_line}:
+    amount: 7000
+    amount_currency: 7000
+    bank_id: l10n_ch.agro_bank
+    #bank_statement_line_id
+    communication: "111111111111111111111111111111"
+    #communication2
+    company_currency: base.EUR
+    #create_date
+    currency: base.EUR
+    #date
+    #info_owner
+    #info_partner
+    #ml_date_created
+    #ml_inv_ref
+    #ml_maturity_date
+    move_line_id: !ref {model: account.move.line, search: "[('ref','=','111111111111111111111111111111')]"}
+    #name  (reference)
+    order_id: dta_payment_order
+    partner_id: base.res_partner_agrolait
+    state: normal
+    
+-
+  I generate a DTA file by using the wizard "Create DTA" for my payment order
+-
+  !python {model: create.dta.wizard}: |
+    import base64
+    wiz_id = self.create(cr,uid,[])
+    wiz = self.browse(cr, uid, wiz_id)
+    pay_order_id =  ref("dta_payment_order")
+    #set the payment order as the active id
+    context['active_ids'] = [pay_order_id]
+    context['active_id'] = pay_order_id
+    result = wiz.create_dta(context=context)
+    assert result, "No result returned"
+
+    data = wiz.read(['dta_file'])
+    dta_file = base64.decodestring(data[0]['dta_file'] or '')
+    assert dta_file, "File is empty"
+    
+    #check that file starts with 1st segment characters "01"
+    assert dta_file[:2] == "01", "File is not a DTA file"
+    
+    payment_obj = self.pool.get('payment.order')
+    payment_obj.set_done(cr, uid, [ref('dta_payment_order')], context)
+    #force state in open state (confirmed)
+    payment_obj.write(cr, uid, [ref('dta_payment_order')], {'state': 'open'})
+
+-
+  I check the execution date is today
+-
+  !assert {model: payment.order, id: dta_payment_order}:
+   - date_done == datetime.now().date().strftime('%Y-%m-%d')
+
+-
+  I check my payment order state is Confirmed
+-
+  !assert {model: payment.order, id: dta_payment_order, string: state is done}:
+    - state == 'open'
+
+-
+  I create a Bank Statment in order to confirm the payment line
+-
+  !record {model: account.bank.statement, id: dta_bank_statement}:
+    #account_id:
+    #balance_end:
+    #balance_end_cash:
+    #balance_end_real:
+    #balance_start:
+    #closing_date:
+    #company_id:
+    #currency:
+    date: !eval "'%s-01-01' %(datetime.now().year)"
+    #ending_details_ids:
+    journal_id: account.bank_journal
+    #line_ids:
+    #move_line_ids
+    name: "/"
+    period_id: account.period_1
+    #starting_details_ids
+    state: draft
+    #total_entry_encoding
+    #user_id
+    
+#-
+#  I import the payment line
+#-
+#  !python {model: account.payment.populate.statement}: |
+#    wiz_id = self.create(cr,uid,[])
+#    wiz = self.browse(cr, uid, wiz_id)
+#    
+#    line_obj = self.pool.get('payment.line')
+#    pay_line_ids = line_obj.search(cr, uid, [('communication','=','111111111111111111111111111111'),('amount','=','7000')])
+#    
+#    data = { 'lines': [(6, 0, [pay_line_ids[0]])],}
+#    wiz.write(data)
+#    
+#    context['active_id'] = ref('dta_bank_statement')
+#    context['active_ids'] = [ref('dta_bank_statement')]
+#    
+#    self.populate_statement(cr, uid, [wiz_id], context=context)
+#
+#
+#-
+#  I check the statement line is created
+#-
+#  !assert {model: account.bank.statement, id: dta_bank_statement, string: statement_line_ids is not empty}:
+#    - line_ids
+#
+#-
+#  I check the voucher line is created
+#-
+#  !python {model: account.bank.statement}: |
+#    statement = self.browse(cr, uid, ref('dta_bank_statement'))
+#    
+#    assert statement.line_ids[0].voucher_id.line_ids, "Voucher line is missing"
+#    assert len(statement.line_ids[0].voucher_id.line_ids) == 1, "There are too many voucher lines"
+#
+#-
+#  In order to confirm my bank statement, I enter the closing balance and press on compute button
+#-
+#  !python {model: account.bank.statement}: |
+#    statement = self.browse(cr, uid, ref('dta_bank_statement'))
+#    statement.write({'balance_end_real': -7000.0})
+#    self.button_dummy(cr, uid, [ref('dta_bank_statement')], context=context)
+#    statement = self.browse(cr, uid, ref('dta_bank_statement'))
+#
+#-
+#  I confirm my bank statement
+#-
+#  !python {model: account.bank.statement}: |
+#    self.button_confirm_bank(cr, uid, [ref('dta_bank_statement')], context=context)
+#
+#
+#-
+#  I check the move lines have been defined
+#-
+#  !assert {model: account.bank.statement, id: dta_bank_statement, string: move_line_ids is not empty}:
+#    - move_line_ids
+#
+#    
+#-
+#  I check bank statement is Closed and balance is -7000
+#-
+#  !assert {model: account.bank.statement, id: dta_bank_statement, string: state is Closed and balance is -7000}:
+#    - state == 'confirm'
+#    - balance_end == -7000.0
+#    
+#-
+#  I check the residual amount of invoice, should be 0 in residual currency and 0 in amount_residual and paid
+#-
+#  !python {model: account.invoice}: |
+#    invoice_id = self.browse(cr, uid, ref("dta_account_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), ('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, "Residual amount currency is not correct : %.2f" % move_line.amount_residual_currency
+#    assert move_line.amount_residual == 0.0 , "Residual amount of invoice is not correct : %.2f" % move_line.amount_residual
+#    assert invoice_id.state == 'paid', "Invoice state is not Paid"
diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml
index a730bdc82bd..f120b14f33b 100644
--- a/addons/l10n_ch/test/l10n_ch_report.yml
+++ b/addons/l10n_ch/test/l10n_ch_report.yml
@@ -1,5 +1,5 @@
 - 
-  In order to test BVR printing. I create Partner data.
+  In order to test BVR printing. I create Partner data .
 - 
   !record {model: res.partner.category, id: res_partner_category_bvr}:
     name: Customers
@@ -35,7 +35,7 @@
 -
   In order to test the PDF BVR webkit reports defined on an invoice, we will create a Invoice Record
 -
-  !record {model: account.invoice, id: l10n_ch_invoice}:
+  !record {model: account.invoice, id: l10n_ch_invoice, view: False}:
     currency_id: base.CHF
     company_id: base.main_company
     address_invoice_id: res_partner_address_2
@@ -49,7 +49,7 @@
 -
   In order to test the BVR report, I will assign a bank to the invoice
 -
-  !record {model: account.invoice, id: l10n_ch_invoice}:
+  !record {model: account.invoice, id: l10n_ch_invoice, view: False}:
       partner_bank_id: main_partner_bank
 -
   In order to test the PDF reports defined on a l10n_ch, we will print BVR Report
diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml
new file mode 100644
index 00000000000..e30012dd6b8
--- /dev/null
+++ b/addons/l10n_ch/test/l10n_ch_v11.yml
@@ -0,0 +1,160 @@
+-
+  In order to test the V11 import,
+  I will create an invoice with a specified reference that I will reconcile with the moves imported from a V11
+-  
+  I create an invoice ref 1234567
+-
+  !record {model: account.invoice, id: v11_test_invoice, view: False}:
+    name: V11 YAML invoice
+    number: 1234567
+    company_id: base.main_company
+    journal_id: account.bank_journal
+    currency_id: base.EUR
+    account_id: account.a_recv
+    type : out_invoice
+    partner_id: base.res_partner_agrolait
+    address_contact_id: base.res_partner_address_8
+    address_invoice_id: base.res_partner_address_8
+    reference_type: bvr
+    reference: 12345676
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    #invoice_line: 
+    partner_bank_id: main_partner_bank
+    check_total : 888.00
+    
+-
+  I create an invoice line
+-
+  !record {model: account.invoice.line, id: v11_test_invoice_line, view: False}:
+    account_id: account.a_expense
+    name: '[PC1] Basic PC'
+    price_unit: 888.00
+    quantity: 1.0
+    product_id: product.product_product_pc1
+    uos_id: product.product_uom_unit
+    invoice_id: v11_test_invoice
+
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: v11_test_invoice}  
+
+-
+  I specify the invoice number to fit with my v11
+-
+  !python {model: account.invoice}: |
+    invoice = self.browse(cr, uid, ref('v11_test_invoice'))
+    invoice.write({'number': 1234567})
+    
+
+-
+  I create a bank statement
+-
+  !record {model: account.bank.statement, id: v11_test_bank_statement, view: False}:
+    #account_id:
+    #balance_end:
+    #balance_end_cash:
+    #balance_end_real:
+    #balance_start:
+    #closing_date:
+    #company_id:
+    #currency:
+    date: !eval "'%s-01-01' %(datetime.now().year)"
+    #ending_details_ids:
+    journal_id: account.bank_journal
+    #line_ids:
+    #move_line_ids
+    name: "/"
+    period_id: account.period_1
+    #starting_details_ids
+    state: draft
+    #total_entry_encoding
+    #user_id
+
+-
+  I import the V11
+-
+  !python {model: bvr.import.wizard}: | 
+    import base64
+    import addons
+    import os
+    # create our wizard
+    wiz_id = self.create(cr,uid,[])
+    wiz = self.browse(cr, uid, wiz_id)
+    
+    test_file_path = addons.get_module_resource(os.path.join('l10n_ch', 'test', 'test.v11'))
+    
+    # get our test file to test it
+    f_v11 = open(test_file_path)
+    
+    str64_v11 = base64.encodestring(f_v11.read())
+     
+    wiz.write({'file': str64_v11})
+    
+    # set the file in the wizard field
+    bank_statement_id = ref('v11_test_bank_statement')
+    
+    context['active_id'] = bank_statement_id 
+    context['active_ids'] = [bank_statement_id]
+    # launch the import
+    self.import_bvr(cr, uid, [wiz_id], context=context)
+    
+    
+-
+  I check my bank statement got a statement line
+-
+  !assert {model: account.bank.statement, id: v11_test_bank_statement, string: statement has 1 and only 1 statement line id}:
+   - len(line_ids) == 1
+   
+-
+  I check the voucher linked to the statement line contains a line with an amount of 888.00
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_test_bank_statement'))
+    
+    voucher_line_ids = statement.line_ids[0].voucher_id.line_ids
+    
+    assert voucher_line_ids, "No voucher line found"
+    
+    voucher_line_amount = voucher_line_ids[0].amount
+    assert voucher_line_amount == 888.00, "Amount isn't correct : %d" %(voucher_line_amount)
+
+-
+  I check amount of account voucher is equal to the bank statement line amount
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_test_bank_statement'))
+    
+    statement_line_amount = statement.line_ids[0].amount
+    voucher_amount = statement.line_ids[0].voucher_id.amount
+    
+    assert statement_line_amount == voucher_amount, "Mismatch of amounts"
+
+-
+  I enter the closing balance and press on compute button 
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_test_bank_statement'))
+    statement.write({'balance_end_real': 888.00})
+    self.button_dummy(cr, uid, [ref('v11_test_bank_statement')], context=context)
+
+-
+  I check that the statement Balance is 888.00
+-
+  !assert {model: account.bank.statement, id: v11_test_bank_statement, string: balance is 888.0}:
+   - balance_end == 888.0
+
+-
+  I confirm my bank statement
+-
+  !python {model: account.bank.statement}: |
+    self.button_confirm_bank(cr, uid, [ref('v11_test_bank_statement')], context=context)
+  
+-
+  I check my invoice is paid, reconciled and has no residual
+-
+  !assert {model: account.invoice, id: v11_test_invoice, string: 'invoice is paid, reconciled and has no residual'}:
+   - state == "paid"
+   - reconciled
+   - residual == 0.0
diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml
new file mode 100644
index 00000000000..af726ae97ea
--- /dev/null
+++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml
@@ -0,0 +1,292 @@
+-
+  In order to test the V11 import,
+  I will create an invoice with a specified reference that I will partialy reconcile with a 1st V11
+  And then I will complete the reconcile with a second V11
+-  
+  I create an invoice ref 2000999 of EUR 250.00
+-
+  !record {model: account.invoice, id: v11_part_test_invoice, view: False}:
+    name: V11 YAML invoice
+    number: 2000999
+    company_id: base.main_company
+    journal_id: account.bank_journal
+    currency_id: base.EUR
+    account_id: account.a_recv
+    type : out_invoice
+    partner_id: base.res_partner_agrolait
+    address_contact_id: base.res_partner_address_8
+    address_invoice_id: base.res_partner_address_8
+    reference_type: bvr
+    reference: 20009997
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    #invoice_line: 
+    partner_bank_id: main_partner_bank
+    check_total : 250.00
+    
+-
+  I create an invoice line
+-
+  !record {model: account.invoice.line, id: v11_part_test_invoice_line, view: False}:
+    account_id: account.a_expense
+    name: '[PC1] Basic PC'
+    price_unit: 250.00
+    quantity: 1.0
+    product_id: product.product_product_pc1
+    uos_id: product.product_uom_unit
+    invoice_id: v11_part_test_invoice
+
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: v11_part_test_invoice}  
+
+-
+  I specify the invoice number to fit with my v11
+-
+  !python {model: account.invoice}: |
+    invoice = self.browse(cr, uid, ref('v11_part_test_invoice'))
+    invoice.write({'number': 2000999})
+    
+
+-
+  I create a 1st bank statement
+  #########################################
+ #      Creating 1st bank statement      #
+#########################################
+-
+  !record {model: account.bank.statement, id: v11_part_test_bank_statement_1, view: False}:
+    #account_id:
+    #balance_end:
+    #balance_end_cash:
+    #balance_end_real:
+    #balance_start:
+    #closing_date:
+    #company_id:
+    #currency:
+    date: !eval "'%s-01-01' %(datetime.now().year)"
+    #ending_details_ids:
+    journal_id: account.bank_journal
+    #line_ids:
+    #move_line_ids
+    name: "/"
+    period_id: account.period_1
+    #starting_details_ids
+    state: draft
+    #total_entry_encoding
+    #user_id
+
+-
+  I import the 1st V11
+-
+  !python {model: bvr.import.wizard}: | 
+    import base64
+    import addons
+    import os
+    
+    # create our wizard
+    wiz_id = self.create(cr,uid,[])
+    wiz = self.browse(cr, uid, wiz_id)
+    
+    test_file_path = addons.get_module_resource(os.path.join('l10n_ch', 'test', 'test_part_1.v11'))
+    
+    # get our test file to test it
+    f_v11 = open(test_file_path)
+    
+    str64_v11 = base64.encodestring(f_v11.read())
+     
+    wiz.write({'file': str64_v11})
+    
+    # set the file in the wizard field
+    bank_statement_id = ref('v11_part_test_bank_statement_1')
+    
+    context['active_id'] = bank_statement_id 
+    context['active_ids'] = [bank_statement_id]
+    # launch the import
+    self.import_bvr(cr, uid, [wiz_id], context=context)
+    
+    
+-
+  I check my bank statement got a statement line
+-
+  !assert {model: account.bank.statement, id: v11_part_test_bank_statement_1, string: statement has 1 and only 1 statement line id}:
+   - len(line_ids) == 1
+   
+-
+  I check the voucher linked to the statement line contains a line with an amount of EUR 150.00
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_1'))
+    
+    voucher_line_ids = statement.line_ids[0].voucher_id.line_ids
+    
+    assert voucher_line_ids, "No voucher line found"
+    
+    voucher_line_amount = voucher_line_ids[0].amount
+    assert voucher_line_amount == 150.00, "Amount isn't correct : %d" %(voucher_line_amount)
+
+-
+  I check amount of account voucher is equal to the bank statement line amount
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_1'))
+    
+    statement_line_amount = statement.line_ids[0].amount
+    voucher_amount = statement.line_ids[0].voucher_id.amount
+    
+    assert statement_line_amount == voucher_amount, "Mismatch of amounts"
+    
+-
+  I enter the closing balance and press on compute button 
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_1'))
+    statement.write({'balance_end_real': 150.00})
+    self.button_dummy(cr, uid, [ref('v11_part_test_bank_statement_1')], context=context)
+
+-
+  I check that the statement Balance is EUR 150.00
+-
+  !assert {model: account.bank.statement, id: v11_part_test_bank_statement_1, string: balance is 150.0}:
+   - balance_end == 150.0
+
+-
+  I confirm my 1st bank statement
+-
+  !python {model: account.bank.statement}: |
+    self.button_confirm_bank(cr, uid, [ref('v11_part_test_bank_statement_1')], context=context)
+  
+
+-
+  I check that my invoice is partially paid in open state, not reconciled, with a residual amount of EUR 100.0
+  #########################################
+ #        Checking partial result        #
+#########################################
+-
+  !assert {model: account.invoice, id: v11_part_test_invoice, string: 'invoice is open, reconciled and has no residual'}:
+   - state == "open"
+   - not reconciled
+   - residual == 100.0
+
+
+
+-
+  I create a 2nd bank statement
+  #########################################
+ #      Creating 2nd bank statement      #
+#########################################
+-
+  !record {model: account.bank.statement, id: v11_part_test_bank_statement_2, view: False}:
+    #account_id:
+    #balance_end:
+    #balance_end_cash:
+    #balance_end_real:
+    #balance_start:
+    #closing_date:
+    #company_id:
+    #currency:
+    date: !eval "'%s-01-01' %(datetime.now().year)"
+    #ending_details_ids:
+    journal_id: account.bank_journal
+    #line_ids:
+    #move_line_ids
+    name: "/"
+    period_id: account.period_1
+    #starting_details_ids
+    state: draft
+    #total_entry_encoding
+    #user_id
+
+-
+  I import the 2nd V11
+-
+  !python {model: bvr.import.wizard}: | 
+    import base64
+    import addons
+    import os
+    
+    # create our wizard
+    wiz_id = self.create(cr,uid,[])
+    wiz = self.browse(cr, uid, wiz_id)
+    
+    test_file_path = addons.get_module_resource(os.path.join('l10n_ch', 'test', 'test_part_2.v11'))
+    
+    # get our test file to test it
+    f_v11 = open(test_file_path)
+    
+    str64_v11 = base64.encodestring(f_v11.read())
+     
+    wiz.write({'file': str64_v11})
+    
+    # set the file in the wizard field
+    bank_statement_id = ref('v11_part_test_bank_statement_2')
+    
+    context['active_id'] = bank_statement_id 
+    context['active_ids'] = [bank_statement_id]
+    # launch the import
+    self.import_bvr(cr, uid, [wiz_id], context=context)
+    
+    
+-
+  I check my bank statement got a statement line
+-
+  !assert {model: account.bank.statement, id: v11_part_test_bank_statement_2, string: statement has 1 and only 1 statement line id}:
+   - len(line_ids) == 1
+   
+-
+  I check the voucher linked to the statement line contains a line with an amount of EUR 100.00
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_2'))
+    
+    voucher_line_ids = statement.line_ids[0].voucher_id.line_ids
+    
+    assert voucher_line_ids, "No voucher line found"
+    
+    voucher_line_amount = voucher_line_ids[0].amount
+    assert voucher_line_amount == 100.00, "Amount isn't correct : %d" %(voucher_line_amount)
+
+-
+  I check amount of account voucher is equal to the bank statement line amount
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_2'))
+    
+    statement_line_amount = statement.line_ids[0].amount
+    voucher_amount = statement.line_ids[0].voucher_id.amount
+    
+    assert statement_line_amount == voucher_amount, "Mismatch of amounts"
+    
+
+-
+  I enter the closing balance and press on compute button 
+-
+  !python {model: account.bank.statement}: |
+    statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_2'))
+    statement.write({'balance_end_real': 100.00})
+    self.button_dummy(cr, uid, [ref('v11_part_test_bank_statement_2')], context=context)
+
+-
+  I check that the statement Balance is EUR 100.00
+-
+  !assert {model: account.bank.statement, id: v11_part_test_bank_statement_2, string: balance is 100.0}:
+   - balance_end == 100.0
+
+-
+  I confirm my 2nd bank statement
+-
+  !python {model: account.bank.statement}: |
+    self.button_confirm_bank(cr, uid, [ref('v11_part_test_bank_statement_2')], context=context)
+
+
+
+-
+  I check my invoice is paid, reconciled and has no residual
+  #########################################
+ #        Checking finale state          #
+#########################################
+-
+  !assert {model: account.invoice, id: v11_part_test_invoice, string: 'invoice is paid, reconciled and has no residual'}:
+   - state == "paid"
+   - reconciled
+   - residual == 0.0
diff --git a/addons/l10n_ch/test/test.v11 b/addons/l10n_ch/test/test.v11
new file mode 100755
index 00000000000..74f3e3217e7
--- /dev/null
+++ b/addons/l10n_ch/test/test.v11
@@ -0,0 +1,2 @@
+00201012162700000000000000000001234567600000888000001  000111010111010111010100000000010000000000000
+999010121627999999999999999999999999999000000088800000000000001110102000000000000000000
diff --git a/addons/l10n_ch/test/test_part_1.v11 b/addons/l10n_ch/test/test_part_1.v11
new file mode 100755
index 00000000000..0d20a3e631a
--- /dev/null
+++ b/addons/l10n_ch/test/test_part_1.v11
@@ -0,0 +1,2 @@
+00201012162700000000000000000002000999700000150000001  000111010111010111010100000000010000000000000
+999010121627999999999999999999999999999000000015000000000000001110102000000000000000000
diff --git a/addons/l10n_ch/test/test_part_2.v11 b/addons/l10n_ch/test/test_part_2.v11
new file mode 100755
index 00000000000..6a336dbd91e
--- /dev/null
+++ b/addons/l10n_ch/test/test_part_2.v11
@@ -0,0 +1,2 @@
+00201012162700000000000000000002000999700000100000001  000111010511010511010500000000010000000000000
+999010121627999999999999999999999999999000000010000000000000001110106000000000000000000
diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml
index 531202cc05d..084159aa36d 100644
--- a/addons/l10n_ch/wizard.xml
+++ b/addons/l10n_ch/wizard.xml
@@ -7,7 +7,6 @@
                 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="category_id" ref="account.category_accounting_configuration"/>
             <field name="type">automatic</field>
         </record>
     </data>
diff --git a/addons/l10n_ch/wizard/__init__.py b/addons/l10n_ch/wizard/__init__.py
index b8530855159..aa1d22666b6 100644
--- a/addons/l10n_ch/wizard/__init__.py
+++ b/addons/l10n_ch/wizard/__init__.py
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-import create_dta
-import bvr_import
+from . import create_dta
+from . import bvr_import
+from . import unicode2ascii
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 5fb7bda2a12..31c1e9ab96f 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -36,7 +36,9 @@ def _reconstruct_invoice_ref(cursor, user, reference, context=None):
     user_current=user_obj.browse(cursor, user, user)
 
     ##
-    cursor.execute("SELECT inv.id,inv.number from account_invoice AS inv where inv.company_id = %s" ,(user_current.company_id.id,))
+    cursor.execute("SELECT inv.id,inv.number from account_invoice "
+                   "AS inv where inv.company_id = %s and type='out_invoice'",
+                   (user_current.company_id.id,))
     result_invoice = cursor.fetchall()
     REF = re.compile('[^0-9]')
     for inv_id,inv_name in result_invoice:
@@ -60,7 +62,6 @@ def _reconstruct_invoice_ref(cursor, user, reference, context=None):
 def _import(self, cursor, user, data, context=None):
 
     statement_line_obj = self.pool.get('account.bank.statement.line')
-#    statement_reconcile_obj = pool.get('account.bank.statement.reconcile')
     voucher_obj = self.pool.get('account.voucher')
     voucher_line_obj = self.pool.get('account.voucher.line')
     move_line_obj = self.pool.get('account.move.line')
@@ -191,8 +192,8 @@ def _import(self, cursor, user, data, context=None):
                      voucher_line_dict = line_dict
         if voucher_line_dict:
              voucher_line_dict.update({'voucher_id':voucher_id})
-             voucher_line_obj.create(cursor, user, voucher_line_dict, context=context)                
-             
+             voucher_line_obj.create(cursor, user, voucher_line_dict, context=context)
+
         if not account_id:
             if record['amount'] >= 0:
                 account_id = account_receivable
@@ -204,10 +205,10 @@ def _import(self, cursor, user, data, context=None):
             if record['amount'] < 0:
                 name = "property_account_payable"
             prop = property_obj.search(
-                        cursor, 
+                        cursor,
                         user,
                         [
-                            ('name','=','property_account_receivable'),
+                            ('name','=',name),
                             ('company_id','=',statement.company_id.id),
                             ('res_id', '=', False)
                         ]
@@ -226,9 +227,9 @@ def _import(self, cursor, user, data, context=None):
         values['partner_id'] = partner_id
         statement_line_obj.create(cursor, user, values, context=context)
     attachment_obj.create(cursor, user, {
-        'name': 'BVR',
+        'name': 'BVR %s'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
         'datas': file,
-        'datas_fname': 'BVR.txt',
+        'datas_fname': 'BVR %s.txt'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
         'res_model': 'account.bank.statement',
         'res_id': statement_id,
         }, context=context)
@@ -238,7 +239,7 @@ def _import(self, cursor, user, data, context=None):
 class bvr_import_wizard(osv.osv_memory):
     _name = 'bvr.import.wizard'
     _columns = {
-        'file':fields.binary('BVR File', required=True)
+        'file':fields.binary('BVR File', readonly=True)
     }
 
     def import_bvr(self, cr, uid, ids, context=None):
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index add32f26e01..7abb1d7ca7c 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -26,6 +26,7 @@ import base64
 from osv import osv, fields
 import pooler
 from tools.translate import _
+import unicode2ascii
 
 TRANS=[
     (u'é','e'),
@@ -38,6 +39,24 @@ TRANS=[
     (u'ä','a'),
 ]
 
+def _u2a(text) :
+    """Tries to convert unicode charactere to asci equivalence"""
+    if not text : return ""
+    txt = ""
+    for c in text:
+        if ord(c) < 128 :
+            txt += c
+        elif c in unicode2ascii.EXTRA_LATIN_NAMES :
+            txt += unicode2ascii.EXTRA_LATIN_NAMES[c]
+        elif c in unicode2ascii.UNI2ASCII_CONVERSIONS :
+            txt += unicode2ascii.UNI2ASCII_CONVERSIONS[c]
+        elif c in unicode2ascii.EXTRA_CHARACTERS :
+            txt += unicode2ascii.EXTRA_CHARACTERS[c]
+        elif c in unicode2ascii.FG_HACKS :
+            txt += unicode2ascii.FG_HACKS[c]
+        else : txt+= "_"
+    return txt
+
 def tr(string_in):
     try:
         string_in= string_in.decode('utf-8')
@@ -339,7 +358,9 @@ def _create_dta(obj, cr, uid, data, context=None):
     if context is None:
         context = {}
     payment = payment_obj.browse(cr, uid, data['id'], context=context)
-
+    # if payment.state != 'done':
+        # raise osv.except_osv(_('Order not confirmed'),
+        #         _('Please confirm it'))
     if not payment.mode:
         raise osv.except_osv(_('Error'),
                 _('No payment mode'))
@@ -365,11 +386,13 @@ def _create_dta(obj, cr, uid, data, context=None):
     v['comp_name'] = co_addr.name
     v['comp_dta'] = bank.dta_code or '' #XXX not mandatory in pratice
 
-    v['comp_bank_number'] = bank.acc_number or ''
-    if bank.iban:
-        v['comp_bank_iban'] = bank.iban.replace(' ','') or ''
-    else:
-        v['comp_bank_iban'] = ''
+    # iban and account number are the same field and depends only on the type of account
+    v['comp_bank_iban'] = v['comp_bank_number'] = bank.acc_number or ''
+    
+    #if bank.iban:
+    #    v['comp_bank_iban'] = bank.iban.replace(' ','') or ''
+    #else:
+    #    v['comp_bank_iban'] = ''
     if not v['comp_bank_iban']:
         raise osv.except_osv(_('Error'),
                 _('No IBAN for the company bank account.'))
@@ -403,7 +426,7 @@ def _create_dta(obj, cr, uid, data, context=None):
                     'on the partner: %s\n' \
                     'on line: %s') % (pline.bank_id.state, pline.partner_id.name, pline.name))
 
-        v['partner_bank_iban'] =  pline.bank_id.iban or False
+        v['partner_bank_iban'] =  pline.bank_id.acc_number or False
         v['partner_bank_number'] =  pline.bank_id.acc_number  \
                 and pline.bank_id.acc_number.replace('.','').replace('-','') \
                 or  False
@@ -468,7 +491,7 @@ def _create_dta(obj, cr, uid, data, context=None):
         # si payment structure  -> bvr (826)
         # si non -> (827)
 
-        if elec_pay == 'dta_iban':
+        if elec_pay == 'iban':
             # If iban => country=country code for space reason
             v['comp_country'] = co_addr.country_id and co_addr.country_id.code+'-' or ''
             record_type = record_gt836
@@ -512,13 +535,10 @@ def _create_dta(obj, cr, uid, data, context=None):
 
         elif elec_pay == 'bvbank':
             if not v['partner_bank_number'] :
-                if v['partner_bank_iban'] :
-                    v['partner_bank_number']= v['partner_bank_iban']
-                else:
-                    raise osv.except_osv(_('Error'), _('You must provide ' \
-                            'a bank number \n' \
-                            'for the partner bank: %s\n' \
-                            'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
+                raise osv.except_osv(_('Error'), _('You must provide ' \
+                        'a bank number \n' \
+                        'for the partner bank: %s\n' \
+                        'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
             if not  v['partner_bank_clearing']:
                 raise osv.except_osv(_('Error'), _('You must provide ' \
                         'a Clearing Number\n' \
@@ -551,17 +571,17 @@ def _create_dta(obj, cr, uid, data, context=None):
     v['sequence'] = str(seq).rjust(5).replace(' ','0')
     if dta :
         dta = dta + record_gt890(v).generate()
-
+    dta_data = _u2a(dta)
     dta_data = base64.encodestring(dta)
     payment_obj.set_done(cr, uid, [data['id']], context)
     attachment_obj.create(cr, uid, {
-        'name': 'DTA',
+        'name': 'DTA%s'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
         'datas': dta_data,
-        'datas_fname': 'DTA.txt',
+        'datas_fname': 'DTA%s.txt'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
         'res_model': 'payment.order',
         'res_id': data['id'],
         }, context=context)
-    return {'dta': dta_data}
+    return dta_data
 
 class create_dta_wizard(osv.osv_memory):
     _name="create.dta.wizard"
@@ -572,6 +592,11 @@ class create_dta_wizard(osv.osv_memory):
     def create_dta(self, cr, uid, ids, context=None):
         if not context:
             context = {}
+        if isinstance(ids, list):
+            req_id = ids[0]
+        else:
+            req_id = ids
+        current = self.browse(cr, uid, req_id, context)
         data = {}
         active_ids = context.get('active_ids', [])
         active_id = context.get('active_id', [])
@@ -579,26 +604,9 @@ class create_dta_wizard(osv.osv_memory):
         data['ids'] = active_ids
         data['id'] = active_id
         dta_file = _create_dta(self, cr, uid, data, context)
-        context.update({'dta_file':dta_file})
-        return self.save_dta(cr, uid, ids, context)
-
-    def save_dta(self, cr, uid, ids, context=None):
-        obj_model = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'), ('name','=','dta_save_view')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'create.dta.wizard',
-            'views': [(resource_id, 'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'context': context,
-        }
-
+        current.write({'dta_file': dta_file})
+        return True
 
 create_dta_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_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 6a0732c56e9..11cd2095e28 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -9,10 +9,11 @@
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results">
                     <group width="300" colspan="4">
-                        <separator string="Create DTA" colspan="4"/>
+                        <separator string="Create DTA - (DTA file will appear after you click on create)" colspan="4"/>
+                        <field name="dta_file"/>
                         <group colspan="4">
                             <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
-                            <button name="create_dta" string="Create DTA" type="object" icon="gtk-ok"  colspan="2"/>
+                            <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
                         </group>
                     </group>
                 </form>
@@ -31,28 +32,11 @@
         
         <record model="ir.values" id="action_account_dtr_create_values">
             <field name="model_id" ref="model_create_dta_wizard" />
-            <field name="object" eval="1" />
             <field name="name">Create DTA</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_dta_create'))" />
             <field name="key">action</field>
             <field name="model">payment.order</field>
         </record>
-        
-        <!-- Save DTA -->
-        <record id="dta_save_view" model="ir.ui.view">
-            <field name="name">Save DTA</field>
-            <field name="model">create.dta.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="DTA file creation - Results">
-                    <group width="500" colspan="4">
-                        <separator colspan="4" string="Click on 'Save as' to save the DTA file :" />
-                        <field name="dta_file"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_ch/wizard/unicode2ascii.py b/addons/l10n_ch/wizard/unicode2ascii.py
new file mode 100644
index 00000000000..1cec519420c
--- /dev/null
+++ b/addons/l10n_ch/wizard/unicode2ascii.py
@@ -0,0 +1,594 @@
+# -*- encoding: utf-8 -*-
+
+"""Convert many unicode characters to ascii characters that are like them.
+
+I want to collate names, with the property that a last name starting with
+O-umlaut will be in with the last name's starting with O.    Horrors!
+
+So I want that many Latin-1 characters have their umlaute's, etc., stripped.
+Some of it can be done automatically but some needs to be done by hand, that
+I can tell.
+"""
+__version__='1.0.1'
+__author__='Jim Hefferon: ftpmaint at tug.ctan.org'
+__date__='2008-July-15'
+__notes__="""As sources, used effbot's web site, and
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/251871
+and
+    man uni2ascii
+"""
+
+import os, os.path, sys, re
+import unicodedata
+
+# These characters that are not done automatically by NFKD, and
+# have a name starting with "LATIN".    Some of these I found on the interwebs,
+# but some I did by eye.    Corrections or additions appreciated.
+EXTRA_LATIN_NAMES={
+    # First are ones I got off the interweb
+    u"\N{LATIN CAPITAL LETTER O WITH STROKE}": u"O",
+    u"\N{LATIN SMALL LETTER A WITH GRAVE}": u"a",
+    u"\N{LATIN SMALL LETTER A WITH ACUTE}": u"a",
+    u"\N{LATIN SMALL LETTER A WITH CIRCUMFLEX}": u"a",
+    u"\N{LATIN SMALL LETTER A WITH TILDE}": u"a",
+    u"\N{LATIN SMALL LETTER A WITH DIAERESIS}": u"ae",
+    u"\N{LATIN SMALL LETTER A WITH RING ABOVE}": u"a",
+    u"\N{LATIN SMALL LETTER C WITH CEDILLA}": u"c",
+    u"\N{LATIN SMALL LETTER E WITH GRAVE}": u"e",
+    u"\N{LATIN SMALL LETTER E WITH ACUTE}": u"e",
+    u"\N{LATIN SMALL LETTER E WITH CIRCUMFLEX}": u"e",
+    u"\N{LATIN SMALL LETTER E WITH DIAERESIS}": u"e",
+    u"\N{LATIN SMALL LETTER I WITH GRAVE}": u"i",
+    u"\N{LATIN SMALL LETTER I WITH ACUTE}": u"i",
+    u"\N{LATIN SMALL LETTER I WITH CIRCUMFLEX}": u"i",
+    u"\N{LATIN SMALL LETTER I WITH DIAERESIS}": u"i",
+    u"\N{LATIN SMALL LETTER N WITH TILDE}": u"n",
+    u"\N{LATIN SMALL LETTER O WITH GRAVE}": u"o",
+    u"\N{LATIN SMALL LETTER O WITH ACUTE}": u"o",
+    u"\N{LATIN SMALL LETTER O WITH CIRCUMFLEX}": u"o",
+    u"\N{LATIN SMALL LETTER O WITH TILDE}": u"o",
+    u"\N{LATIN SMALL LETTER O WITH DIAERESIS}": u"oe",
+    u"\N{LATIN SMALL LETTER O WITH STROKE}": u"o",
+    u"\N{LATIN SMALL LETTER U WITH GRAVE}": u"u",
+    u"\N{LATIN SMALL LETTER U WITH ACUTE}": u"u",
+    u"\N{LATIN SMALL LETTER U WITH CIRCUMFLEX}": u"u",
+    u"\N{LATIN SMALL LETTER U WITH DIAERESIS}": u"ue",
+    u"\N{LATIN SMALL LETTER Y WITH ACUTE}": u"y",
+    u"\N{LATIN SMALL LETTER Y WITH DIAERESIS}": u"y",
+    u"\N{LATIN SMALL LETTER A WITH MACRON}": u"a",
+    u"\N{LATIN SMALL LETTER A WITH BREVE}": u"a",
+    u"\N{LATIN SMALL LETTER C WITH ACUTE}": u"c",
+    u"\N{LATIN SMALL LETTER C WITH CIRCUMFLEX}": u"c",
+    u"\N{LATIN SMALL LETTER E WITH MACRON}": u"e",
+    u"\N{LATIN SMALL LETTER E WITH BREVE}": u"e",
+    u"\N{LATIN SMALL LETTER G WITH CIRCUMFLEX}": u"g",
+    u"\N{LATIN SMALL LETTER G WITH BREVE}": u"g",
+    u"\N{LATIN SMALL LETTER G WITH CEDILLA}": u"g",
+    u"\N{LATIN SMALL LETTER H WITH CIRCUMFLEX}": u"h",
+    u"\N{LATIN SMALL LETTER I WITH TILDE}": u"i",
+    u"\N{LATIN SMALL LETTER I WITH MACRON}": u"i",
+    u"\N{LATIN SMALL LETTER I WITH BREVE}": u"i",
+    u"\N{LATIN SMALL LETTER J WITH CIRCUMFLEX}": u"j",
+    u"\N{LATIN SMALL LETTER K WITH CEDILLA}": u"k",
+    u"\N{LATIN SMALL LETTER L WITH ACUTE}": u"l",
+    u"\N{LATIN SMALL LETTER L WITH CEDILLA}": u"l",
+    u"\N{LATIN CAPITAL LETTER L WITH STROKE}": u"L",
+    u"\N{LATIN SMALL LETTER L WITH STROKE}": u"l",
+    u"\N{LATIN SMALL LETTER N WITH ACUTE}": u"n",
+    u"\N{LATIN SMALL LETTER N WITH CEDILLA}": u"n",
+    u"\N{LATIN SMALL LETTER O WITH MACRON}": u"o",
+    u"\N{LATIN SMALL LETTER O WITH BREVE}": u"o",
+    u"\N{LATIN SMALL LETTER R WITH ACUTE}": u"r",
+    u"\N{LATIN SMALL LETTER R WITH CEDILLA}": u"r",
+    u"\N{LATIN SMALL LETTER S WITH ACUTE}": u"s",
+    u"\N{LATIN SMALL LETTER S WITH CIRCUMFLEX}": u"s",
+    u"\N{LATIN SMALL LETTER S WITH CEDILLA}": u"s",
+    u"\N{LATIN SMALL LETTER T WITH CEDILLA}": u"t",
+    u"\N{LATIN SMALL LETTER U WITH TILDE}": u"u",
+    u"\N{LATIN SMALL LETTER U WITH MACRON}": u"u",
+    u"\N{LATIN SMALL LETTER U WITH BREVE}": u"u",
+    u"\N{LATIN SMALL LETTER U WITH RING ABOVE}": u"u",
+    u"\N{LATIN SMALL LETTER W WITH CIRCUMFLEX}": u"w",
+    u"\N{LATIN SMALL LETTER Y WITH CIRCUMFLEX}": u"y",
+    u"\N{LATIN SMALL LETTER Z WITH ACUTE}": u"z",
+    u"\N{LATIN SMALL LETTER W WITH GRAVE}": u"w",
+    u"\N{LATIN SMALL LETTER W WITH ACUTE}": u"w",
+    u"\N{LATIN SMALL LETTER W WITH DIAERESIS}": u"w",
+    u"\N{LATIN SMALL LETTER Y WITH GRAVE}": u"y",
+    # Below are the ones that failed automated conversion
+    u'\N{LATIN CAPITAL LETTER AE}': u'AE',
+    u'\N{LATIN CAPITAL LETTER ETH}': u'D',
+    u"\N{LATIN CAPITAL LETTER A WITH DIAERESIS}": u"Ae",
+    u"\N{LATIN CAPITAL LETTER O WITH DIAERESIS}": u"Oe",
+    u"\N{LATIN CAPITAL LETTER U WITH DIAERESIS}": u"Ue",
+    u'\N{LATIN CAPITAL LETTER O WITH STROKE}': u'O',
+    u'\N{LATIN CAPITAL LETTER THORN}': u'TH',
+    u'\N{LATIN SMALL LETTER SHARP S}': u'ss',
+    u'\N{LATIN SMALL LETTER AE}': u'ae',
+    u'\N{LATIN SMALL LETTER ETH}': u'd',
+    u'\N{LATIN SMALL LETTER O WITH STROKE}': u'o',
+    u'\N{LATIN SMALL LETTER THORN}': 'th',
+    u'\N{LATIN CAPITAL LETTER D WITH STROKE}': u'D',
+    u'\N{LATIN SMALL LETTER D WITH STROKE}': u'd',
+    u'\N{LATIN CAPITAL LETTER H WITH STROKE}': u'H',
+    u'\N{LATIN SMALL LETTER H WITH STROKE}': u'h',
+    u'\N{LATIN SMALL LETTER DOTLESS I}': u'i',
+    u'\N{LATIN SMALL LETTER KRA}': u'q',
+    u'\N{LATIN CAPITAL LETTER L WITH STROKE}': u'L',
+    u'\N{LATIN SMALL LETTER L WITH STROKE}': u'l',
+    u'\N{LATIN CAPITAL LETTER ENG}': u'N',
+    u'\N{LATIN SMALL LETTER ENG}': u'n',
+    u'\N{LATIN CAPITAL LIGATURE OE}': u'OE',
+    u'\N{LATIN SMALL LIGATURE OE}': u'oe',
+    u'\N{LATIN CAPITAL LETTER T WITH STROKE}': u'T',
+    u'\N{LATIN SMALL LETTER T WITH STROKE}': u't',
+    u'\N{LATIN SMALL LETTER B WITH STROKE}': u'b',
+    u'\N{LATIN CAPITAL LETTER B WITH HOOK}': u'B',
+    u'\N{LATIN CAPITAL LETTER B WITH TOPBAR}': u'B',
+    u'\N{LATIN SMALL LETTER B WITH TOPBAR}': u'b',
+    # u'\N{LATIN CAPITAL LETTER TONE SIX}': u'',    # ?B
+    # u'\N{LATIN SMALL LETTER TONE SIX}': u'',    # ?b
+    u'\N{LATIN CAPITAL LETTER OPEN O}': u'O',
+    u'\N{LATIN CAPITAL LETTER C WITH HOOK}': u'C',
+    u'\N{LATIN SMALL LETTER C WITH HOOK}': u'c',
+    u'\N{LATIN CAPITAL LETTER AFRICAN D}': u'D',
+    u'\N{LATIN CAPITAL LETTER D WITH HOOK}': u'D',
+    u'\N{LATIN CAPITAL LETTER D WITH TOPBAR}': u'D',
+    u'\N{LATIN SMALL LETTER D WITH TOPBAR}': u'd',
+    # u'\N{LATIN SMALL LETTER TURNED DELTA}': u'',
+    u'\N{LATIN CAPITAL LETTER REVERSED E}': u'E',
+    # u'\N{LATIN CAPITAL LETTER SCHWA}': u'',
+    u'\N{LATIN CAPITAL LETTER OPEN E}': u'E',
+    u'\N{LATIN CAPITAL LETTER F WITH HOOK}': u'F',
+    u'\N{LATIN SMALL LETTER F WITH HOOK}': u'f',
+    u'\N{LATIN CAPITAL LETTER G WITH HOOK}': u'G',
+    # u'\N{LATIN CAPITAL LETTER GAMMA}': u'',
+    u'\N{LATIN SMALL LETTER HV}': u'hv',
+    u'\N{LATIN CAPITAL LETTER IOTA}': u'i',
+    u'\N{LATIN CAPITAL LETTER I WITH STROKE}': u'I',
+    u'\N{LATIN CAPITAL LETTER K WITH HOOK}': u'K',
+    u'\N{LATIN SMALL LETTER K WITH HOOK}': u'k',
+    u'\N{LATIN SMALL LETTER L WITH BAR}': u'l',
+    # u'\N{LATIN SMALL LETTER LAMBDA WITH STROKE}': u'',
+    # u'\N{LATIN CAPITAL LETTER TURNED M}': u'',
+    u'\N{LATIN CAPITAL LETTER N WITH LEFT HOOK}': u'N',
+    u'\N{LATIN SMALL LETTER N WITH LONG RIGHT LEG}': u'N',
+    u'\N{LATIN CAPITAL LETTER O WITH MIDDLE TILDE}': u'O',
+    u'\N{LATIN CAPITAL LETTER OI}': u'OI',
+    u'\N{LATIN SMALL LETTER OI}': u'oi',
+    u'\N{LATIN CAPITAL LETTER P WITH HOOK}': u'P',
+    u'\N{LATIN SMALL LETTER P WITH HOOK}': u'p',
+    # u'\N{LATIN LETTER YR}': u'',
+    # u'\N{LATIN CAPITAL LETTER TONE TWO}': u'',
+    # u'\N{LATIN SMALL LETTER TONE TWO}': u'',
+    u'\N{LATIN CAPITAL LETTER ESH}': u'SH',
+    # u'\N{LATIN LETTER REVERSED ESH LOOP}': u'',
+    u'\N{LATIN SMALL LETTER T WITH PALATAL HOOK}': u't',
+    u'\N{LATIN CAPITAL LETTER T WITH HOOK}': u'T',
+    u'\N{LATIN SMALL LETTER T WITH HOOK}': u't',
+    u'\N{LATIN CAPITAL LETTER T WITH RETROFLEX HOOK}': u'T',
+    # u'\N{LATIN CAPITAL LETTER UPSILON}': u'',
+    u'\N{LATIN CAPITAL LETTER V WITH HOOK}': u'V',
+    u'\N{LATIN CAPITAL LETTER Y WITH HOOK}': u'Y',
+    u'\N{LATIN SMALL LETTER Y WITH HOOK}': u'y',
+    u'\N{LATIN CAPITAL LETTER Z WITH STROKE}': u'Z',
+    u'\N{LATIN SMALL LETTER Z WITH STROKE}': u'z',
+    u'\N{LATIN CAPITAL LETTER EZH}': u'S',
+    # u'\N{LATIN CAPITAL LETTER EZH REVERSED}': u'',
+    # u'\N{LATIN SMALL LETTER EZH REVERSED}': u'',
+    u'\N{LATIN SMALL LETTER EZH WITH TAIL}': u's',
+    # u'\N{LATIN LETTER TWO WITH STROKE}': u'',
+    # u'\N{LATIN CAPITAL LETTER TONE FIVE}': u'',
+    # u'\N{LATIN SMALL LETTER TONE FIVE}': u'',
+    # u'\N{LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE}': u'',
+    u'\N{LATIN LETTER WYNN}': u'w',
+    # u'\N{LATIN LETTER DENTAL CLICK}': u'',
+    # u'\N{LATIN LETTER LATERAL CLICK}': u'',
+    # u'\N{LATIN LETTER ALVEOLAR CLICK}': u'',
+    # u'\N{LATIN LETTER RETROFLEX CLICK}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED E}': u'',
+    u'\N{LATIN CAPITAL LETTER AE WITH MACRON}': u'AE',
+    u'\N{LATIN SMALL LETTER AE WITH MACRON}': u'ae',
+    u'\N{LATIN CAPITAL LETTER G WITH STROKE}': u'G',
+    u'\N{LATIN SMALL LETTER G WITH STROKE}': u'g',
+    u'\N{LATIN CAPITAL LETTER EZH WITH CARON}': u'S',
+    u'\N{LATIN SMALL LETTER EZH WITH CARON}': u's',
+    u'\N{LATIN CAPITAL LETTER HWAIR}': u'HW',
+    u'\N{LATIN CAPITAL LETTER WYNN}': u'W',
+    u'\N{LATIN CAPITAL LETTER AE WITH ACUTE}': u'AE',
+    u'\N{LATIN SMALL LETTER AE WITH ACUTE}': u'AE',
+    u'\N{LATIN CAPITAL LETTER O WITH STROKE AND ACUTE}': u'O',
+    u'\N{LATIN SMALL LETTER O WITH STROKE AND ACUTE}': u'o',
+    u'\N{LATIN CAPITAL LETTER YOGH}': u'J',
+    u'\N{LATIN SMALL LETTER YOGH}': u'j',
+    u'\N{LATIN CAPITAL LETTER N WITH LONG RIGHT LEG}': u'N',
+    u'\N{LATIN SMALL LETTER D WITH CURL}': u'd',
+    u'\N{LATIN CAPITAL LETTER OU}': u'OU',
+    u'\N{LATIN SMALL LETTER OU}': u'ou',
+    u'\N{LATIN CAPITAL LETTER Z WITH HOOK}': u'Z',
+    u'\N{LATIN SMALL LETTER Z WITH HOOK}': u'z',
+    u'\N{LATIN SMALL LETTER L WITH CURL}': u'l',
+    u'\N{LATIN SMALL LETTER N WITH CURL}': u'n',
+    u'\N{LATIN SMALL LETTER T WITH CURL}': u't',
+    u'\N{LATIN SMALL LETTER DOTLESS J}': u'j',
+    u'\N{LATIN SMALL LETTER DB DIGRAPH}': u'db',
+    u'\N{LATIN SMALL LETTER QP DIGRAPH}': u'qp',
+    u'\N{LATIN CAPITAL LETTER A WITH STROKE}': u'A',
+    u'\N{LATIN CAPITAL LETTER C WITH STROKE}': u'C',
+    u'\N{LATIN SMALL LETTER C WITH STROKE}': u'C',
+    u'\N{LATIN CAPITAL LETTER L WITH BAR}': u'L',
+    u'\N{LATIN CAPITAL LETTER T WITH DIAGONAL STROKE}': u'T',
+    u'\N{LATIN SMALL LETTER S WITH SWASH TAIL}': u'S',
+    u'\N{LATIN SMALL LETTER Z WITH SWASH TAIL}': u'Z',
+    # u'\N{LATIN CAPITAL LETTER GLOTTAL STOP}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED A}': u'',
+    # u'\N{LATIN SMALL LETTER ALPHA}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED ALPHA}': u'',
+    u'\N{LATIN SMALL LETTER B WITH HOOK}': u'b',
+    u'\N{LATIN SMALL LETTER OPEN O}': u'o',
+    u'\N{LATIN SMALL LETTER C WITH CURL}': u'c',
+    u'\N{LATIN SMALL LETTER D WITH TAIL}': u'd',
+    u'\N{LATIN SMALL LETTER D WITH HOOK}': u'd',
+    # u'\N{LATIN SMALL LETTER REVERSED E}': u'',
+    # u'\N{LATIN SMALL LETTER SCHWA}': u'',
+    # u'\N{LATIN SMALL LETTER SCHWA WITH HOOK}': u'',
+    u'\N{LATIN SMALL LETTER OPEN E}': u'e',
+    # u'\N{LATIN SMALL LETTER REVERSED OPEN E}': u'',
+    # u'\N{LATIN SMALL LETTER REVERSED OPEN E WITH HOOK}': u'',
+    # u'\N{LATIN SMALL LETTER CLOSED REVERSED OPEN E}': u'',
+    u'\N{LATIN SMALL LETTER DOTLESS J WITH STROKE}': u'j',
+    u'\N{LATIN SMALL LETTER G WITH HOOK}': u'g',
+    u'\N{LATIN SMALL LETTER SCRIPT G}': u'g',
+    u'\N{LATIN LETTER SMALL CAPITAL G}': u'G',
+    # u'\N{LATIN SMALL LETTER GAMMA}': u'',
+    # u'\N{LATIN SMALL LETTER RAMS HORN}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED H}': u'',
+    u'\N{LATIN SMALL LETTER H WITH HOOK}': u'h',
+    u'\N{LATIN SMALL LETTER HENG WITH HOOK}': u'h',
+    u'\N{LATIN SMALL LETTER I WITH STROKE}': u'i',
+    # u'\N{LATIN SMALL LETTER IOTA}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL I}': u'I',
+    u'\N{LATIN SMALL LETTER L WITH MIDDLE TILDE}': u'L',
+    u'\N{LATIN SMALL LETTER L WITH BELT}': u'L',
+    u'\N{LATIN SMALL LETTER L WITH RETROFLEX HOOK}': u'L',
+    # u'\N{LATIN SMALL LETTER LEZH}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED M}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED M WITH LONG LEG}': u'',
+    u'\N{LATIN SMALL LETTER M WITH HOOK}': u'm',
+    u'\N{LATIN SMALL LETTER N WITH LEFT HOOK}': u'n',
+    u'\N{LATIN SMALL LETTER N WITH RETROFLEX HOOK}': u'n',
+    u'\N{LATIN LETTER SMALL CAPITAL N}': u'N',
+    u'\N{LATIN SMALL LETTER BARRED O}': u'o',
+    u'\N{LATIN LETTER SMALL CAPITAL OE}': u'OE',
+    # u'\N{LATIN SMALL LETTER CLOSED OMEGA}': u'',
+    # u'\N{LATIN SMALL LETTER PHI}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED R}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED R WITH LONG LEG}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED R WITH HOOK}': u'',
+    u'\N{LATIN SMALL LETTER R WITH LONG LEG}': u'r',
+    u'\N{LATIN SMALL LETTER R WITH TAIL}': u'r',
+    u'\N{LATIN SMALL LETTER R WITH FISHHOOK}': u'r',
+    # u'\N{LATIN SMALL LETTER REVERSED R WITH FISHHOOK}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL R}': u'R',
+    # u'\N{LATIN LETTER SMALL CAPITAL INVERTED R}': u'',
+    u'\N{LATIN SMALL LETTER S WITH HOOK}': u's',
+    u'\N{LATIN SMALL LETTER ESH}': u'sh',
+    u'\N{LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK}': u'j',
+    # u'\N{LATIN SMALL LETTER SQUAT REVERSED ESH}': u'',
+    u'\N{LATIN SMALL LETTER ESH WITH CURL}': u'sh',
+    # u'\N{LATIN SMALL LETTER TURNED T}': u'',
+    u'\N{LATIN SMALL LETTER T WITH RETROFLEX HOOK}': u't',
+    u'\N{LATIN SMALL LETTER U BAR}': u'u',
+    # u'\N{LATIN SMALL LETTER UPSILON}': u'',
+    u'\N{LATIN SMALL LETTER V WITH HOOK}': u'v',
+    # u'\N{LATIN SMALL LETTER TURNED V}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED W}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED Y}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL Y}': u'Y',
+    u'\N{LATIN SMALL LETTER Z WITH RETROFLEX HOOK}': u'z',
+    u'\N{LATIN SMALL LETTER Z WITH CURL}': u'z',
+    u'\N{LATIN SMALL LETTER EZH}': u's',
+    u'\N{LATIN SMALL LETTER EZH WITH CURL}': u's',
+    # u'\N{LATIN LETTER GLOTTAL STOP}': u'',
+    # u'\N{LATIN LETTER PHARYNGEAL VOICED FRICATIVE}': u'',
+    # u'\N{LATIN LETTER INVERTED GLOTTAL STOP}': u'',
+    u'\N{LATIN LETTER STRETCHED C}': u'c',
+    # u'\N{LATIN LETTER BILABIAL CLICK}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL B}': u'B',
+    u'\N{LATIN SMALL LETTER CLOSED OPEN E}': u'e',
+    u'\N{LATIN LETTER SMALL CAPITAL G WITH HOOK}': u'G',
+    u'\N{LATIN LETTER SMALL CAPITAL H}': u'H',
+    u'\N{LATIN SMALL LETTER J WITH CROSSED-TAIL}': u'j',
+    # u'\N{LATIN SMALL LETTER TURNED K}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL L}': u'L',
+    u'\N{LATIN SMALL LETTER Q WITH HOOK}': u'q',
+    # u'\N{LATIN LETTER GLOTTAL STOP WITH STROKE}': u'',
+    # u'\N{LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE}': u'',
+    # u'\N{LATIN SMALL LETTER DZ DIGRAPH}': u'',
+    # u'\N{LATIN SMALL LETTER DEZH DIGRAPH}': u'',
+    # u'\N{LATIN SMALL LETTER DZ DIGRAPH WITH CURL}': u'',
+    # u'\N{LATIN SMALL LETTER TS DIGRAPH}': u'',
+    # u'\N{LATIN SMALL LETTER TESH DIGRAPH}': u'',
+    # u'\N{LATIN SMALL LETTER TC DIGRAPH WITH CURL}': u'',
+    # u'\N{LATIN SMALL LETTER FENG DIGRAPH}': u'',
+    # u'\N{LATIN SMALL LETTER LS DIGRAPH}': u'',
+    # u'\N{LATIN SMALL LETTER LZ DIGRAPH}': u'',
+    # u'\N{LATIN LETTER BILABIAL PERCUSSIVE}': u'',
+    # u'\N{LATIN LETTER BIDENTAL PERCUSSIVE}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED H WITH FISHHOOK}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL A}': u'A',
+    u'\N{LATIN LETTER SMALL CAPITAL AE}': u'AE',
+    # u'\N{LATIN SMALL LETTER TURNED AE}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL BARRED B}': u'B',
+    u'\N{LATIN LETTER SMALL CAPITAL C}': u'C',
+    u'\N{LATIN LETTER SMALL CAPITAL D}': u'D',
+    u'\N{LATIN LETTER SMALL CAPITAL ETH}': u'D',
+    u'\N{LATIN LETTER SMALL CAPITAL E}': u'E',
+    # u'\N{LATIN SMALL LETTER TURNED OPEN E}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED I}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL J}': u'J',
+    u'\N{LATIN LETTER SMALL CAPITAL K}': u'K',
+    u'\N{LATIN LETTER SMALL CAPITAL L WITH STROKE}': u'L',
+    u'\N{LATIN LETTER SMALL CAPITAL M}': u'M',
+    # u'\N{LATIN LETTER SMALL CAPITAL REVERSED N}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL O}': u'O',
+    u'\N{LATIN LETTER SMALL CAPITAL OPEN O}': u'O',
+    # u'\N{LATIN SMALL LETTER SIDEWAYS O}': u'',
+    # u'\N{LATIN SMALL LETTER SIDEWAYS OPEN O}': u'',
+    # u'\N{LATIN SMALL LETTER SIDEWAYS O WITH STROKE}': u'',
+    # u'\N{LATIN SMALL LETTER TURNED OE}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL OU}': u'OU',
+    # u'\N{LATIN SMALL LETTER TOP HALF O}': u'',
+    # u'\N{LATIN SMALL LETTER BOTTOM HALF O}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL P}': u'P',
+    # u'\N{LATIN LETTER SMALL CAPITAL REVERSED R}': u'',
+    # u'\N{LATIN LETTER SMALL CAPITAL TURNED R}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL T}': u'T',
+    u'\N{LATIN LETTER SMALL CAPITAL U}': u'U',
+    # u'\N{LATIN SMALL LETTER SIDEWAYS U}': u'',
+    # u'\N{LATIN SMALL LETTER SIDEWAYS DIAERESIZED U}': u'',
+    # u'\N{LATIN SMALL LETTER SIDEWAYS TURNED M}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL V}': u'V',
+    u'\N{LATIN LETTER SMALL CAPITAL W}': u'W',
+    u'\N{LATIN LETTER SMALL CAPITAL Z}': u'',
+    u'\N{LATIN LETTER SMALL CAPITAL EZH}': u'S',
+    # u'\N{LATIN LETTER VOICED LARYNGEAL SPIRANT}': u'',
+    # u'\N{LATIN LETTER AIN}': u'',
+    u'\N{LATIN SMALL LETTER UE}': u'ue',
+    u'\N{LATIN SMALL LETTER B WITH MIDDLE TILDE}': u'b',
+    u'\N{LATIN SMALL LETTER D WITH MIDDLE TILDE}': u'd',
+    u'\N{LATIN SMALL LETTER F WITH MIDDLE TILDE}': u'f',
+    u'\N{LATIN SMALL LETTER M WITH MIDDLE TILDE}': u'm',
+    u'\N{LATIN SMALL LETTER N WITH MIDDLE TILDE}': u'n',
+    u'\N{LATIN SMALL LETTER P WITH MIDDLE TILDE}': u'p',
+    u'\N{LATIN SMALL LETTER R WITH MIDDLE TILDE}': u'r',
+    u'\N{LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE}': u'r',
+    u'\N{LATIN SMALL LETTER S WITH MIDDLE TILDE}': u's',
+    u'\N{LATIN SMALL LETTER T WITH MIDDLE TILDE}': u't',
+    u'\N{LATIN SMALL LETTER Z WITH MIDDLE TILDE}': u'z',
+    # u'\N{LATIN SMALL LETTER TURNED G}': u'',
+    # u'\N{LATIN SMALL LETTER INSULAR G}': u'',
+    u'\N{LATIN SMALL LETTER TH WITH STRIKETHROUGH}': u'th',
+    u'\N{LATIN SMALL CAPITAL LETTER I WITH STROKE}': u'I',
+    # u'\N{LATIN SMALL LETTER IOTA WITH STROKE}': u'',
+    u'\N{LATIN SMALL LETTER P WITH STROKE}': u'p',
+    u'\N{LATIN SMALL CAPITAL LETTER U WITH STROKE}': u'U',
+    # u'\N{LATIN SMALL LETTER UPSILON WITH STROKE}': u'',
+    u'\N{LATIN SMALL LETTER B WITH PALATAL HOOK}': u'b',
+    u'\N{LATIN SMALL LETTER D WITH PALATAL HOOK}': u'd',
+    u'\N{LATIN SMALL LETTER F WITH PALATAL HOOK}': u'f',
+    u'\N{LATIN SMALL LETTER G WITH PALATAL HOOK}': u'g',
+    u'\N{LATIN SMALL LETTER K WITH PALATAL HOOK}': u'k',
+    u'\N{LATIN SMALL LETTER L WITH PALATAL HOOK}': u'l',
+    u'\N{LATIN SMALL LETTER M WITH PALATAL HOOK}': u'm',
+    u'\N{LATIN SMALL LETTER N WITH PALATAL HOOK}': u'n',
+    u'\N{LATIN SMALL LETTER P WITH PALATAL HOOK}': u'p',
+    u'\N{LATIN SMALL LETTER R WITH PALATAL HOOK}': u'r',
+    u'\N{LATIN SMALL LETTER S WITH PALATAL HOOK}': u's',
+    u'\N{LATIN SMALL LETTER ESH WITH PALATAL HOOK}': u'sh',
+    u'\N{LATIN SMALL LETTER V WITH PALATAL HOOK}': u'v',
+    u'\N{LATIN SMALL LETTER X WITH PALATAL HOOK}': u'x',
+    u'\N{LATIN SMALL LETTER Z WITH PALATAL HOOK}': u'z',
+    u'\N{LATIN SMALL LETTER A WITH RETROFLEX HOOK}': u'a',
+    # u'\N{LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK}': u'',
+    u'\N{LATIN SMALL LETTER D WITH HOOK AND TAIL}': u'd',
+    u'\N{LATIN SMALL LETTER E WITH RETROFLEX HOOK}': u'e',
+    u'\N{LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK}': u'e',
+    u'\N{LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK}': u'e',
+    # u'\N{LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK}': u'',
+    u'\N{LATIN SMALL LETTER I WITH RETROFLEX HOOK}': u'i',
+    u'\N{LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK}': u'o',
+    u'\N{LATIN SMALL LETTER ESH WITH RETROFLEX HOOK}': u'sh',
+    u'\N{LATIN SMALL LETTER U WITH RETROFLEX HOOK}': u'u',
+    u'\N{LATIN SMALL LETTER EZH WITH RETROFLEX HOOK}': u's',
+    # u'\N{LATIN SUBSCRIPT SMALL LETTER SCHWA}': u'',
+    # u'\N{LATIN CROSS}': u''
+    }
+
+# Additional ones; see "man uni2ascii"
+UNI2ASCII_CONVERSIONS={
+    u'\N{NO-BREAK SPACE}': u' ',
+    u'\N{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'"',
+    u'\N{SOFT HYPHEN}': u'',    # Controversial: see http://www.cs.tut.fi/~jkorpela/shy.html
+    u'\N{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'"',
+    u'\N{ETHIOPIC WORDSPACE}': u' ',
+    u'\N{OGHAM SPACE MARK}': u' ',
+    u'\N{EN QUAD}': u' ',
+    u'\N{EM QUAD}': u' ',
+    u'\N{EN SPACE}': u' ',
+    u'\N{EM SPACE}': u' ',
+    u'\N{THREE-PER-EM SPACE}': u' ',
+    u'\N{FOUR-PER-EM SPACE}': u' ',
+    u'\N{SIX-PER-EM SPACE}': u' ',
+    u'\N{FIGURE SPACE}': u' ',
+    u'\N{PUNCTUATION SPACE}': u' ',
+    u'\N{THIN SPACE}': u' ',
+    u'\N{HAIR SPACE}': u' ',
+    u'\N{ZERO WIDTH SPACE}': u' ',
+    u'\N{ZERO WIDTH NO-BREAK SPACE}': u' ',
+    u'\N{HYPHEN}': u'-',
+    u'\N{NON-BREAKING HYPHEN}': u'-',
+    u'\N{FIGURE DASH}': u'-',
+    u'\N{EN DASH}': u'-',
+    u'\N{EM DASH}': u'-',
+    u'\N{LEFT SINGLE QUOTATION MARK}': u'`',
+    u'\N{RIGHT SINGLE QUOTATION MARK}': u"'",
+    u'\N{SINGLE LOW-9 QUOTATION MARK}': u'`',
+    u'\N{SINGLE HIGH-REVERSED-9 QUOTATION MARK}': u'`',
+    u'\N{LEFT DOUBLE QUOTATION MARK}': u'"',
+    u'\N{RIGHT DOUBLE QUOTATION MARK}': u'"',
+    u'\N{DOUBLE LOW-9 QUOTATION MARK}': u'"',
+    u'\N{DOUBLE HIGH-REVERSED-9 QUOTATION MARK}': u'"',
+    u'\N{SINGLE LEFT-POINTING ANGLE QUOTATION MARK}': u'`',
+    u'\N{SINGLE RIGHT-POINTING ANGLE QUOTATION MARK}': u"'",
+    u'\N{LOW ASTERISK}': u'*',
+    u'\N{MINUS SIGN}': u'-',
+    u'\N{ASTERISK OPERATOR}': u'*',
+    u'\N{BOX DRAWINGS LIGHT HORIZONTAL}': u'-',
+    u'\N{BOX DRAWINGS HEAVY HORIZONTAL}': u'-',
+    u'\N{BOX DRAWINGS LIGHT VERTICAL}': u'|',
+    u'\N{BOX DRAWINGS HEAVY VERTICAL}': u'|',
+    u'\N{HEAVY ASTERISK}': u'*',
+    u'\N{HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT}': u'"',
+    u'\N{HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT}': u'"',
+    u'\N{IDEOGRAPHIC SPACE}': u' ',
+    u'\N{SMALL AMPERSAND}': u'&',
+    u'\N{SMALL ASTERISK}': u'*',
+    u'\N{SMALL PLUS SIGN}': u'+',
+    u'\N{CENT SIGN}': u'cent',
+    u'\N{POUND SIGN}': u'pound',
+    u'\N{YEN SIGN}': u'yen',
+    u'\N{COPYRIGHT SIGN}': u'(c)',
+    u'\N{REGISTERED SIGN}': u'(R)',
+    u'\N{VULGAR FRACTION ONE QUARTER}': u'1/4',
+    u'\N{VULGAR FRACTION ONE HALF}': u'1/2',
+    u'\N{VULGAR FRACTION THREE QUARTERS}': u'3/4',
+    # u'\N{CAPITAL LETTER ASH}': u'AE',
+    u'\N{LATIN SMALL LETTER SHARP S}': u'ss',
+    # u'\N{SMALL LETTER ASH}': u'ae',
+    u'\N{LATIN CAPITAL LIGATURE IJ}': u'IJ',
+    u'\N{LATIN SMALL LIGATURE IJ}': u'ij',
+    u'\N{LATIN CAPITAL LIGATURE OE}': u'OE',
+    u'\N{LATIN SMALL LIGATURE oe}': u'oe',
+    u'\N{LATIN CAPITAL LETTER DZ}': u'DZ',
+    u'\N{LATIN CAPITAL LETTER DZ WITH CARON}': u'DZ',
+    u'\N{LATIN CAPITAL LETTER D WITH SMALL LETTER Z}': u'Dz',
+    u'\N{LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON}': u'Dz',
+    u'\N{LATIN SMALL LETTER DZ}': u'dz',
+    u'\N{LATIN SMALL LETTER TS DIGRAPH}': u'ts',
+    u'\N{HORIZONTAL ELLIPSIS}': u'...',
+    u'\N{MIDLINE HORIZONTAL ELLIPSIS}': u'...',
+    u'\N{LEFTWARDS ARROW}': u'<-',
+    u'\N{RIGHTWARDS ARROW}': u'->',
+    u'\N{LEFTWARDS DOUBLE ARROW}': u'<=',
+    u'\N{RIGHTWARDS DOUBLE ARROW}': u'=>',
+    }
+
+# More from "man uni2ascii", in a different category.
+EXTRA_CHARACTERS={
+    u'\N{ACUTE ACCENT}': u"'",
+    u'\N{BROKEN BAR}': u'|',
+    # u'\N{CEDILLA}': u'{cedilla}',
+    u'\N{CENT SIGN}': u' cents ',
+    u'\N{COPYRIGHT SIGN}': u'(C)',
+    u'\N{CURRENCY SIGN}': u' currency ',
+    u'\N{DEGREE SIGN}': u' degrees ',
+    # u'\N{DIAERESIS}': u'{umlaut}',
+    u'\N{DIVISION SIGN}': u'/',
+    # u'\N{FEMININE ORDINAL INDICATOR}': u'{^a}',
+    u'\N{INVERTED EXCLAMATION MARK}': u'!',
+    u'\N{INVERTED QUESTION MARK}': u'?',
+    # wrong? u'\N{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'<<',
+    u'\N{MACRON}': u'_',
+    # u'\N{MASCULINE ORDINAL INDICATOR}': u'{^o}',
+    u'\N{MICRO SIGN}': u'micro',
+    u'\N{MIDDLE DOT}': u'*',
+    u'\N{MULTIPLICATION SIGN}': u'*',
+    u'\N{NOT SIGN}': u'not',
+    u'\N{PILCROW SIGN}': u'paragraph',
+    u'\N{PLUS-MINUS SIGN}': u'+/-',
+    u'\N{POUND SIGN}': u'pound',
+    u'\N{REGISTERED SIGN}': u'(R)',
+    # wrong? u'\N{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'>>',
+    u'\N{SECTION SIGN}': u'section',
+    u'\N{SOFT HYPHEN}': u'',
+    u'\N{SUPERSCRIPT ONE}': u'^1',
+    u'\N{SUPERSCRIPT THREE}': u'^3',
+    u'\N{SUPERSCRIPT TWO}': u'^2',
+    u'\N{VULGAR FRACTION ONE HALF}': u'1/2',
+    u'\N{VULGAR FRACTION ONE QUARTER}': u'1/4',
+    u'\N{VULGAR FRACTION THREE QUARTERS}': u'3/4',
+    u'\N{YEN SIGN}': u'yen'
+}
+FG_HACKS={
+    u'\u0082': u'', # "break permitted here" symbol
+    u'\u2022': u'*', # Bullet
+}
+
+
+def build_dictionary():
+    'Return the translation dictionary.'
+    d = dict()
+    # First do what can be done automatically
+    for i in range(0xffff):
+        u=unichr(i)
+        try:
+            n=unicodedata.name(u)
+            if n.startswith('LATIN '):
+                k=unicodedata.normalize('NFKD', u).encode('ASCII', 'ignore')
+                if k: d[i]=unicode(k)    # i=ord(u)
+        except ValueError: pass
+    # Next, add some by-hand ones (overlap possible, so order matters)
+    for m in [EXTRA_LATIN_NAMES,EXTRA_CHARACTERS,UNI2ASCII_CONVERSIONS,FG_HACKS]:
+        for i in m:
+            try: d[ord(i)]=unicode(m[i])
+            except Exception, err: pass
+    return d
+
+
+
+udict = build_dictionary()
+convert = lambda s: s.translate(udict)
+
+def coroutine(func):
+    def start(*argz, **kwz):
+        cr = func(*argz, **kwz)
+        cr.next()
+        return cr
+    return start
+
+@coroutine
+def co_filter(drain, in_enc='utf-8', out_enc='ascii'):
+    bs = None
+    while True:
+        chunk = (yield bs)
+        bs = drain(convert(unicode(chunk)).encode('utf-8'))
+
+def uc_filter(sin, sout, bs=8192, in_enc='utf-8', out_enc='ascii'):
+    sout = co_filter(sout.write, in_enc, out_enc)
+    while True:
+        dta = sin.read(bs)
+        if not dta: break
+        else: sout.send(dta)
+
+
+if __name__ == '__main__':
+    from optparse import OptionParser
+    parser = OptionParser(usage='%prog [options]',
+        description='utf8 stdin -> ascii stdout')
+    parser.add_option('-s', '--src-enc',
+        action='store', type='str', dest='src_enc', metavar='ENC', default='utf-8',
+        help='source encoding (utf-8)')
+    parser.add_option('-d', '--dst-enc',
+        action='store', type='str', dest='dst_enc', metavar='ENC', default='ascii',
+        help='destination encoding (ascii)')
+    parser.add_option('-c', '--chunk',
+        action='store', type='int', dest='bs', metavar='BYTES', default=8192,
+        help='read/write in chunks of a given size (8192)')
+    optz, argz = parser.parse_args()
+    if argz: parser.error('Only stdin -> stdout conversion suported')
+
+    uc_filter(sys.stdin, sys.stdout, bs=optz.bs, in_enc=optz.src_enc, out_enc=optz.dst_enc)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 5674c95cd43..6a063505275 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "中国会计科目表",
     "version" : "1.0",
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "author" : "openerp-china.org",
     "maintainer":"openerp-china.org",
     "website":"http://openerp-china.org",
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index 624e76a190e..cadd288c810 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -12,13 +12,13 @@
 		<record id="user_type_capital" model="account.account.type">
 			<field name="name">资产类</field>
 			<field name="code">1</field>
-			<field name="close_method">balance</field>
+			<field name="close_method">unreconciled</field>
             <field name="report_type">asset</field>
 		</record>
 		<record id="user_type_debt" model="account.account.type">
 			<field name="name">负债类</field>
 			<field name="code">2</field>
-			<field name="close_method">balance</field>
+			<field name="close_method">unreconciled</field>
 			<field name="report_type">liability</field>
 		</record>
 		<record id="user_type_all" model="account.account.type">
@@ -767,7 +767,7 @@
 			<field name="code">4103</field>
 			<field eval="False" name="reconcile"/>
 			<field ref="cn_root" name="parent_id"/>
-			<field name="type">payable</field>
+			<field name="type">other</field>
 			<field name="name">本年利润</field>
             <field name="user_type" ref="user_type_equity"/>
 		</record>
diff --git a/addons/l10n_cn/i18n/ca.po b/addons/l10n_cn/i18n/ca.po
index e7797505eb1..14b516c3fd6 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cn
 #: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
diff --git a/addons/l10n_cn/i18n/es.po b/addons/l10n_cn/i18n/es.po
index e88b238ca12..e643b3c0053 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cn
 #: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
diff --git a/addons/l10n_cn/i18n/es_MX.po b/addons/l10n_cn/i18n/es_MX.po
new file mode 100644
index 00000000000..644264c1527
--- /dev/null
+++ b/addons/l10n_cn/i18n/es_MX.po
@@ -0,0 +1,58 @@
+# Spanish 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-07 05:27+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_cn
+#: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
+msgid "中国会计科目表"
+msgstr "Plan Contable Chino"
+
+#. module: l10n_cn
+#: model:ir.module.module,description:l10n_cn.module_meta_information
+msgid ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"    "
+msgstr ""
+"\n"
+"        Añadir datos de las provincias chinas\n"
+"        Sin perjuicio de tipo/Plantilla Plan Contable/Clases de liquidación "
+"del IVA/Auxiliar/Documentos de Gestión de Libros Contables/Libros de "
+"Documentos de Contabilidad Financiera\n"
+"    "
+
+#. 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 ""
+"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, "
+"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_cn/i18n/es_PY.po b/addons/l10n_cn/i18n/es_PY.po
index b767c36c82f..7cfd8eb0cb6 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cn
 #: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
diff --git a/addons/l10n_cn/i18n/es_VE.po b/addons/l10n_cn/i18n/es_VE.po
new file mode 100644
index 00000000000..644264c1527
--- /dev/null
+++ b/addons/l10n_cn/i18n/es_VE.po
@@ -0,0 +1,58 @@
+# Spanish 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-07 05:27+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_cn
+#: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
+msgid "中国会计科目表"
+msgstr "Plan Contable Chino"
+
+#. module: l10n_cn
+#: model:ir.module.module,description:l10n_cn.module_meta_information
+msgid ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"    "
+msgstr ""
+"\n"
+"        Añadir datos de las provincias chinas\n"
+"        Sin perjuicio de tipo/Plantilla Plan Contable/Clases de liquidación "
+"del IVA/Auxiliar/Documentos de Gestión de Libros Contables/Libros de "
+"Documentos de Contabilidad Financiera\n"
+"    "
+
+#. 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 ""
+"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, "
+"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_cn/i18n/gl.po b/addons/l10n_cn/i18n/gl.po
index 3cd51331a8d..0d1c1add8e7 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cn
 #: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
diff --git a/addons/l10n_cn/i18n/it.po b/addons/l10n_cn/i18n/it.po
index d9280819887..e7a6003c253 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cn
 #: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
diff --git a/addons/l10n_cn/i18n/pt_BR.po b/addons/l10n_cn/i18n/pt_BR.po
index d847200e2be..43d82f8f919 100644
--- a/addons/l10n_cn/i18n/pt_BR.po
+++ b/addons/l10n_cn/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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cn
 #: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
diff --git a/addons/l10n_cn/i18n/sr@latin.po b/addons/l10n_cn/i18n/sr@latin.po
new file mode 100644
index 00000000000..23892578f7a
--- /dev/null
+++ b/addons/l10n_cn/i18n/sr@latin.po
@@ -0,0 +1,55 @@
+# Serbian Latin 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-07 05:27+0000\n"
+"PO-Revision-Date: 2011-10-13 15:14+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_cn
+#: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
+msgid "中国会计科目表"
+msgstr ""
+
+#. module: l10n_cn
+#: model:ir.module.module,description:l10n_cn.module_meta_information
+msgid ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"    "
+msgstr ""
+"\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"    "
+
+#. 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 ""
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"\tTo je isti setup wizard koji se pokreće iz Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
diff --git a/addons/l10n_cn/i18n/tr.po b/addons/l10n_cn/i18n/tr.po
index a53ecd45663..8d27e16dba3 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cn
 #: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
diff --git a/addons/l10n_cr/__init__.py b/addons/l10n_cr/__init__.py
index c4c6ee3e380..88b86329a8d 100644
--- a/addons/l10n_cr/__init__.py
+++ b/addons/l10n_cr/__init__.py
@@ -32,3 +32,5 @@
 #    
 ##############################################################################
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index a2656e8dc59..5fc4d80d7f7 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -38,7 +38,7 @@
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of accounts for Costa Rica.
 =================================
diff --git a/addons/l10n_cr/data/account_account_type.xml b/addons/l10n_cr/data/account_account_type.xml
index 76e6c0bdf65..7961f6422a2 100644
--- a/addons/l10n_cr/data/account_account_type.xml
+++ b/addons/l10n_cr/data/account_account_type.xml
@@ -27,6 +27,7 @@
             <field name="code">Eq</field>
             <field name="name">Equity</field>
             <field name="sign" eval="-1"/>
+            <field name="report_type">liability</field>
             <field name="close_method">detail</field>
         </record>
         <record id="account_account_type_expense" model="account.account.type">
diff --git a/addons/l10n_cr/i18n/ca.po b/addons/l10n_cr/i18n/ca.po
index fdf8a619dd3..f2907573181 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cfe3a6e79c0..e70c8959541 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/es_MX.po b/addons/l10n_cr/i18n/es_MX.po
new file mode 100644
index 00000000000..e617367e0b4
--- /dev/null
+++ b/addons/l10n_cr/i18n/es_MX.po
@@ -0,0 +1,164 @@
+# Spanish 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-07 05:56+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_ing
+msgid "Ingeniero/a"
+msgstr "Ingeniero/a"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_dr
+msgid "Doctor"
+msgstr "Doctor"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_lic
+msgid "Licenciado"
+msgstr "Licenciado"
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_sal
+msgid "S.A.L."
+msgstr "S.A.L."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_dr
+msgid "Dr."
+msgstr "Dr."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_sal
+msgid "Sociedad Anónima Laboral"
+msgstr "Sociedad Anónima Laboral"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_licda
+msgid "Licenciada"
+msgstr "Licenciada"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_dra
+msgid "Doctora"
+msgstr "Doctora"
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_lic
+msgid "Lic."
+msgstr "Lic."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_gov
+msgid "Government"
+msgstr "Gobierno"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_edu
+msgid "Educational Institution"
+msgstr "Institución educativa"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_mba
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_mba
+msgid "MBA"
+msgstr "MBA"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_msc
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_msc
+msgid "Msc."
+msgstr "Msc."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_dra
+msgid "Dra."
+msgstr "Dra."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_indprof
+msgid "Ind. Prof."
+msgstr "Ind. Prof."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_ing
+msgid "Ing."
+msgstr "Ing."
+
+#. module: l10n_cr
+#: model:ir.module.module,shortdesc:l10n_cr.module_meta_information
+msgid "Costa Rica - Chart of Accounts"
+msgstr "Costa Rica - Plan Contable"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_prof
+msgid "Professor"
+msgstr "Profesor"
+
+#. module: l10n_cr
+#: model:ir.module.module,description:l10n_cr.module_meta_information
+msgid ""
+"Chart of accounts for Costa Rica\n"
+"Includes:\n"
+"* account.type\n"
+"* account.account.template\n"
+"* account.tax.template\n"
+"* account.tax.code.template\n"
+"* account.chart.template\n"
+"\n"
+"Everything is in English with Spanish translation. Further translations are "
+"welcome, please go to\n"
+"http://translations.launchpad.net/openerp-costa-rica\n"
+"    "
+msgstr ""
+"Plan Contable de Costa Rica\n"
+"    "
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_gov
+msgid "Gov."
+msgstr "Gob."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_licda
+msgid "Licda."
+msgstr "Licda."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_prof
+msgid "Prof."
+msgstr "Prof."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_asoc
+msgid "Asociation"
+msgstr "Asociación"
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_asoc
+msgid "Asoc."
+msgstr "Asoc."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_edu
+msgid "Edu."
+msgstr "Edu."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_indprof
+msgid "Independant Professional"
+msgstr "Profesional Independiente"
diff --git a/addons/l10n_cr/i18n/es_PY.po b/addons/l10n_cr/i18n/es_PY.po
index 58b3bcad533..2bea0865504 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/es_VE.po b/addons/l10n_cr/i18n/es_VE.po
new file mode 100644
index 00000000000..e617367e0b4
--- /dev/null
+++ b/addons/l10n_cr/i18n/es_VE.po
@@ -0,0 +1,164 @@
+# Spanish 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-07 05:56+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_ing
+msgid "Ingeniero/a"
+msgstr "Ingeniero/a"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_dr
+msgid "Doctor"
+msgstr "Doctor"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_lic
+msgid "Licenciado"
+msgstr "Licenciado"
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_sal
+msgid "S.A.L."
+msgstr "S.A.L."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_dr
+msgid "Dr."
+msgstr "Dr."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_sal
+msgid "Sociedad Anónima Laboral"
+msgstr "Sociedad Anónima Laboral"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_licda
+msgid "Licenciada"
+msgstr "Licenciada"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_dra
+msgid "Doctora"
+msgstr "Doctora"
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_lic
+msgid "Lic."
+msgstr "Lic."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_gov
+msgid "Government"
+msgstr "Gobierno"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_edu
+msgid "Educational Institution"
+msgstr "Institución educativa"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_mba
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_mba
+msgid "MBA"
+msgstr "MBA"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_msc
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_msc
+msgid "Msc."
+msgstr "Msc."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_dra
+msgid "Dra."
+msgstr "Dra."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_indprof
+msgid "Ind. Prof."
+msgstr "Ind. Prof."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_ing
+msgid "Ing."
+msgstr "Ing."
+
+#. module: l10n_cr
+#: model:ir.module.module,shortdesc:l10n_cr.module_meta_information
+msgid "Costa Rica - Chart of Accounts"
+msgstr "Costa Rica - Plan Contable"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_prof
+msgid "Professor"
+msgstr "Profesor"
+
+#. module: l10n_cr
+#: model:ir.module.module,description:l10n_cr.module_meta_information
+msgid ""
+"Chart of accounts for Costa Rica\n"
+"Includes:\n"
+"* account.type\n"
+"* account.account.template\n"
+"* account.tax.template\n"
+"* account.tax.code.template\n"
+"* account.chart.template\n"
+"\n"
+"Everything is in English with Spanish translation. Further translations are "
+"welcome, please go to\n"
+"http://translations.launchpad.net/openerp-costa-rica\n"
+"    "
+msgstr ""
+"Plan Contable de Costa Rica\n"
+"    "
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_gov
+msgid "Gov."
+msgstr "Gob."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_licda
+msgid "Licda."
+msgstr "Licda."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_prof
+msgid "Prof."
+msgstr "Prof."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_asoc
+msgid "Asociation"
+msgstr "Asociación"
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_asoc
+msgid "Asoc."
+msgstr "Asoc."
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_edu
+msgid "Edu."
+msgstr "Edu."
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_indprof
+msgid "Independant Professional"
+msgstr "Profesional Independiente"
diff --git a/addons/l10n_cr/i18n/fr.po b/addons/l10n_cr/i18n/fr.po
index 70e36586b57..62044959516 100644
--- a/addons/l10n_cr/i18n/fr.po
+++ b/addons/l10n_cr/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-07 05:56+0000\n"
 "PO-Revision-Date: 2011-05-22 16:53+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
@@ -102,7 +102,7 @@ msgstr ""
 #. module: l10n_cr
 #: model:ir.module.module,shortdesc:l10n_cr.module_meta_information
 msgid "Costa Rica - Chart of Accounts"
-msgstr ""
+msgstr "Costa Rica - Plan comptable"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_prof
@@ -125,6 +125,18 @@ msgid ""
 "http://translations.launchpad.net/openerp-costa-rica\n"
 "    "
 msgstr ""
+"Plan comptable du Costa Rica\n"
+"comprend :\n"
+"* account.type\n"
+"* account.account.template\n"
+"* account.tax.template\n"
+"* account.tax.code.template\n"
+"* account.chart.template\n"
+"\n"
+"Tout est en anglais avec traduction en espagnol. Les traductions sont les "
+"bienvenues, rendez-vous S.V.P. sur \n"
+"http://translations.launchpad.net/openerp-costa-rica\n"
+"    "
 
 #. module: l10n_cr
 #: model:res.partner.title,shortcut:l10n_cr.res_partner_title_gov
diff --git a/addons/l10n_cr/i18n/gl.po b/addons/l10n_cr/i18n/gl.po
index 26809c2eefe..c04c351345f 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 805ff24235b..3c87f6f093f 100644
--- a/addons/l10n_cr/i18n/it.po
+++ b/addons/l10n_cr/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-07 05:56+0000\n"
 "PO-Revision-Date: 2011-04-23 12:04+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b3a1015ac2d..fa415f9c6b7 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 9582ce185fa..646836eba2a 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -125,7 +125,7 @@
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
@@ -152,3 +152,5 @@ German accounting chart and localization.
     "certificate": "00517849017945584893",
     'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_de/account_chart_skr03.xml b/addons/l10n_de/account_chart_skr03.xml
index 187f0259dbb..7a7e1fb8ee0 100644
--- a/addons/l10n_de/account_chart_skr03.xml
+++ b/addons/l10n_de/account_chart_skr03.xml
@@ -1228,7 +1228,7 @@
 			<field name="code">1490</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1491">
@@ -1732,7 +1732,7 @@
 			<field name="code">1401</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1400">
@@ -1740,7 +1740,7 @@
 			<field name="code">1400</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1010">
@@ -3164,7 +3164,7 @@
 			<field name="code">1450</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2650">
@@ -3476,7 +3476,7 @@
 			<field name="code">1630</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1950">
@@ -3684,7 +3684,7 @@
 			<field name="code">1480</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1485">
@@ -3836,7 +3836,7 @@
 			<field name="code">1650</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1651">
@@ -4836,7 +4836,7 @@
 			<field name="code">1470</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1610">
@@ -4844,7 +4844,7 @@
 			<field name="code">1610</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4168">
@@ -5956,7 +5956,7 @@
 			<field name="code">1640</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4750">
@@ -7084,7 +7084,7 @@
 			<field name="code">1601</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1600">
@@ -7092,7 +7092,7 @@
 			<field name="code">1600</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_8720">
@@ -7108,7 +7108,7 @@
 			<field name="code">1605</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1607">
@@ -7116,7 +7116,7 @@
 			<field name="code">1607</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1606">
@@ -7124,7 +7124,7 @@
 			<field name="code">1606</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_8950">
@@ -7732,7 +7732,7 @@
 			<field name="code">1410</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2255">
@@ -8404,7 +8404,7 @@
 			<field name="code">1446</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_0240">
@@ -8844,7 +8844,7 @@
 			<field name="code">1447</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1569">
diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml
index 8ca8f35b98f..09af6c20e28 100644
--- a/addons/l10n_de/account_chart_skr04.xml
+++ b/addons/l10n_de/account_chart_skr04.xml
@@ -3313,7 +3313,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1210" model="account.account.template">
@@ -3367,7 +3367,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1216" model="account.account.template">
@@ -3376,7 +3376,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1217" model="account.account.template">
@@ -3385,7 +3385,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1218" model="account.account.template">
@@ -3394,7 +3394,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1219" model="account.account.template">
@@ -3403,7 +3403,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1220" model="account.account.template">
@@ -3412,7 +3412,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1221" model="account.account.template">
@@ -3546,7 +3546,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1251" model="account.account.template">
@@ -3670,7 +3670,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1271" model="account.account.template">
@@ -3794,7 +3794,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1291" model="account.account.template">
@@ -6214,7 +6214,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3305" model="account.account.template">
@@ -6223,7 +6223,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3306" model="account.account.template">
@@ -6232,7 +6232,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3307" model="account.account.template">
@@ -6241,7 +6241,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3309" model="account.account.template">
@@ -6268,7 +6268,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3335" model="account.account.template">
@@ -6304,7 +6304,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3341" model="account.account.template">
@@ -6445,7 +6445,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3421" model="account.account.template">
@@ -6525,7 +6525,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3471" model="account.account.template">
diff --git a/addons/l10n_de/i18n/ar.po b/addons/l10n_de/i18n/ar.po
index c29ca64dd85..ec00964b053 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5b8f021b541..6e38b8a2474 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9f3438cd056..431af98cf01 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 922f5915ed7..ce13095bbaf 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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_MX.po b/addons/l10n_de/i18n/es_MX.po
new file mode 100644
index 00000000000..55aff93ac40
--- /dev/null
+++ b/addons/l10n_de/i18n/es_MX.po
@@ -0,0 +1,65 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_de
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2011-01-14 00:32+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: 2011-09-05 05:57+0000\n"
+"X-Generator: Launchpad (build 13830)\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 "Clientes en el extranjero"
+
+#. 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 "Cliente particular intracomunitario (sin NIF)"
+
+#. 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 "Proveedor extranjero"
+
+#. module: l10n_de
+#: model:ir.module.module,shortdesc:l10n_de.module_meta_information
+msgid "Deutschland - SKR03 and SKR04"
+msgstr "Alemania - SKR03 y SKR04"
+
+#. 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 "Este módulo provee un plan contable alemán basado en la SKR03."
+
+#. 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 "Proveedor intracomunitario (con NIF)"
+
+#. 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 "Proveedor particular intracomunitario (sin NIF)"
+
+#. 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 "Cliente intracomunitario (con NIF)"
diff --git a/addons/l10n_de/i18n/es_PY.po b/addons/l10n_de/i18n/es_PY.po
index 3bbb503d4b5..270741a3724 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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_VE.po b/addons/l10n_de/i18n/es_VE.po
new file mode 100644
index 00000000000..55aff93ac40
--- /dev/null
+++ b/addons/l10n_de/i18n/es_VE.po
@@ -0,0 +1,65 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_de
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2011-01-14 00:32+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: 2011-09-05 05:57+0000\n"
+"X-Generator: Launchpad (build 13830)\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 "Clientes en el extranjero"
+
+#. 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 "Cliente particular intracomunitario (sin NIF)"
+
+#. 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 "Proveedor extranjero"
+
+#. module: l10n_de
+#: model:ir.module.module,shortdesc:l10n_de.module_meta_information
+msgid "Deutschland - SKR03 and SKR04"
+msgstr "Alemania - SKR03 y SKR04"
+
+#. 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 "Este módulo provee un plan contable alemán basado en la SKR03."
+
+#. 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 "Proveedor intracomunitario (con NIF)"
+
+#. 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 "Proveedor particular intracomunitario (sin NIF)"
+
+#. 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 "Cliente intracomunitario (con NIF)"
diff --git a/addons/l10n_de/i18n/et.po b/addons/l10n_de/i18n/et.po
index a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cfc0a50d1ce..9742e9c63cf 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ebf07373590..40577956f18 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c29ca64dd85..ec00964b053 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0e657786bde..e2640bd961d 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4ccf1959a13..131fa2d5beb 100644
--- a/addons/l10n_de/i18n/it.po
+++ b/addons/l10n_de/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
@@ -65,6 +65,3 @@ msgstr "Lieferant EU (ohne Ust-ID)"
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr04
 msgid "Kunde EU Unternehmen (mit USt-ID)"
 msgstr "Kunde EU Unternehmen (mit USt-ID)"
-
-#~ msgid "Tax"
-#~ msgstr "Imposte"
diff --git a/addons/l10n_de/i18n/ko.po b/addons/l10n_de/i18n/ko.po
index a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0e657786bde..e2640bd961d 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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/nl.po b/addons/l10n_de/i18n/nl.po
index 98a4fcbfbb8..343ffa5a61f 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c29ca64dd85..ec00964b053 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 79bd1d18e48..3fc5e453ca3 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a09628c6590..52b2bf2426b 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c29ca64dd85..ec00964b053 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 163addd808c..886053f0613 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0e657786bde..e2640bd961d 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c29ca64dd85..ec00964b053 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 271fa4bb004..5efcaa3bc19 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
@@ -64,9 +64,3 @@ msgstr ""
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr04
 msgid "Kunde EU Unternehmen (mit USt-ID)"
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
diff --git a/addons/l10n_de/i18n/zh_CN.po b/addons/l10n_de/i18n/zh_CN.po
index c29ca64dd85..ec00964b053 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c29ca64dd85..ec00964b053 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_ec/__init__.py b/addons/l10n_ec/__init__.py
index e59e7efc423..d9537494d6e 100644
--- a/addons/l10n_ec/__init__.py
+++ b/addons/l10n_ec/__init__.py
@@ -18,3 +18,5 @@
 #
 ##############################################################################
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 27c72e4b2e6..f3dbf88289b 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Ecuador - Accounting Chart',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Ecuador in OpenERP.
 ==============================================================================
@@ -47,3 +47,5 @@ Accounting chart and localization for Ecuador.
     'certificate' : '001226484516187330589',
     'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ec/i18n/ca.po b/addons/l10n_ec/i18n/ca.po
index 8c840c4e75b..e98fffb20e6 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_ec/i18n/es.po b/addons/l10n_ec/i18n/es.po
index d1c8795f61a..2f560205b9a 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_ec/i18n/es_EC.po b/addons/l10n_ec/i18n/es_EC.po
index 43339961060..7f7eac054e0 100644
--- a/addons/l10n_ec/i18n/es_EC.po
+++ b/addons/l10n_ec/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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_ec/i18n/es_MX.po b/addons/l10n_ec/i18n/es_MX.po
new file mode 100644
index 00000000000..b4d154c9030
--- /dev/null
+++ b/addons/l10n_ec/i18n/es_MX.po
@@ -0,0 +1,56 @@
+# Spanish 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-07 06:01+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ec
+#: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
+msgid "Ecuador - Accounting Chart"
+msgstr "Ecuador - Plan Contable"
+
+#. module: l10n_ec
+#: model:ir.module.module,description:l10n_ec.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar el plan contable para Ecuador en "
+"OpenERP.\n"
+"    "
+
+#. module: l10n_ec
+#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
+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ñía, 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_ec/i18n/es_PY.po b/addons/l10n_ec/i18n/es_PY.po
index 2d5a49606d3..edca1d4a807 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_ec/i18n/es_VE.po b/addons/l10n_ec/i18n/es_VE.po
new file mode 100644
index 00000000000..b4d154c9030
--- /dev/null
+++ b/addons/l10n_ec/i18n/es_VE.po
@@ -0,0 +1,56 @@
+# Spanish 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-07 06:01+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ec
+#: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
+msgid "Ecuador - Accounting Chart"
+msgstr "Ecuador - Plan Contable"
+
+#. module: l10n_ec
+#: model:ir.module.module,description:l10n_ec.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar el plan contable para Ecuador en "
+"OpenERP.\n"
+"    "
+
+#. module: l10n_ec
+#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
+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ñía, 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_ec/i18n/gl.po b/addons/l10n_ec/i18n/gl.po
index 5907b904ebe..3f1b19f07b3 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_ec/i18n/it.po b/addons/l10n_ec/i18n/it.po
index 7a0b5c502d1..3dcac7e6c19 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_ec/i18n/pt_BR.po b/addons/l10n_ec/i18n/pt_BR.po
index a884d27d972..08321ebcc9f 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_ec/i18n/tr.po b/addons/l10n_ec/i18n/tr.po
index c561f10beea..90647fe02fd 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ec
 #: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
diff --git a/addons/l10n_es/__init__.py b/addons/l10n_es/__init__.py
index 297d923f6bb..bec854aac95 100644
--- a/addons/l10n_es/__init__.py
+++ b/addons/l10n_es/__init__.py
@@ -24,3 +24,5 @@
 ##############################################################################
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index aa27dc73f6f..e2f5ad3402d 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -26,7 +26,7 @@
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
@@ -59,3 +59,5 @@ for yearly account reporting (balance, profit & losses).
     "certificate" : "00408828172062583229",
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index df0b218ae49..5147024deae 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -37,18 +37,18 @@
             <field name="name">Terceros - A Cobrar</field>
             <field name="code">terceros - rec</field>
             <field name="report_type">asset</field>
-            <field name="close_method">balance</field>
+            <field name="close_method">unreconciled</field>
         </record>
         <record id="terceros_-_pay" model="account.account.type">
             <field name="name">Terceros - A Pagar</field>
             <field name="code">terceros - pay</field>
             <field name="report_type">liability</field>
-            <field name="close_method">balance</field>
+            <field name="close_method">unreconciled</field>
         </record>
         <record id="tax" model="account.account.type">
             <field name="name">Impuestos</field>
             <field name="code">tax</field>
-            <field name="close_method">balance</field>
+            <field name="close_method">unreconciled</field>
         </record>
         <record id="financieras" model="account.account.type">
             <field name="name">Financieras</field>
diff --git a/addons/l10n_es/i18n/ca.po b/addons/l10n_es/i18n/ca.po
index 8e2e2b6fbcc..59082537f0f 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
@@ -48,40 +48,3 @@ msgstr ""
 "\n"
 "Nota: Hauríeu d'instal·lar el mòdul l10n_ES_account_balance_report\n"
 "per a reports de comptes anuals (balanç, perdudes i guanys).\n"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "Error! No podeu crear plantilles de comptes recursius."
-
-#~ msgid ""
-#~ "Spanish General Chart of Accounts 2008\n"
-#~ "\n"
-#~ "* Defines the following chart of account templates:\n"
-#~ "        * Spanish General Chart of Accounts 2008.\n"
-#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
-#~ "companies.\n"
-#~ "* Defines templates for sale and purchase VAT.\n"
-#~ "* Defines tax code templates.\n"
-#~ "\n"
-#~ "Note: You should install the l10n_ES_account_balance_report module\n"
-#~ "for yearly account reporting (balance, profit & losses).\n"
-#~ msgstr ""
-#~ "Pla general comptable espanyol 2008\n"
-#~ "* Defineix les plantilles dels plans comptables:\n"
-#~ "        * Pla General Comptable Espanyol 2008.\n"
-#~ "        * Pla General Comptable Espanyol PYMES 2008.\n"
-#~ "* Defineix la plantilla dels impostos IVA suportat, IVA repercutit, "
-#~ "recàrrecs d'equivalència, IRPF.\n"
-#~ "* Defineix la plantilla de codis d'impostos.\n"
-#~ "* Defineix la plantilla de posicions fiscals.\n"
-#~ "\n"
-#~ "Nota: Per a la impressió dels comptes anuals (balanç, pèrdues i guanys) \n"
-#~ "es recomana instal·lar el mòdul l10n_ES_account_balance_report.\n"
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "Error! No podeu crear codis d'impostos recursius."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ msgid "Spain - Chart of Accounts 2008"
-#~ msgstr "Espanya - Pla Comptable 2008"
diff --git a/addons/l10n_es/i18n/de.po b/addons/l10n_es/i18n/de.po
index 2b0f0031716..c0d03034b27 100644
--- a/addons/l10n_es/i18n/de.po
+++ b/addons/l10n_es/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
 msgid "Spanish Charts of Accounts (PGCE 2008)"
-msgstr ""
+msgstr "Spanischer Kontenrahmen (PGCE 2008)"
 
 #. module: l10n_es
 #: model:ir.module.module,description:l10n_es.module_meta_information
@@ -37,3 +37,15 @@ msgid ""
 "Note: You should install the l10n_ES_account_balance_report module\n"
 "for yearly account reporting (balance, profit & losses).\n"
 msgstr ""
+"Spanischer Kontenrahmen (PGCE 2008)\n"
+"\n"
+"* Stellt die folgenden Kontenrahmen bereit:\n"
+"        * Allgemeiner spanischer Kontenrahmen 2008\n"
+"        * Allgemeiner spanischer Kontenrahmen 2008 für kleine und "
+"mittelständische Unternehmen.\n"
+"* Definiert Vorlagen für die Umsatzsteuer für Verkauf und Einkauf\n"
+"* Definiert Vorlagen für Steuersätze\n"
+"\n"
+"Hinweis: Für jährliche Berichte zur Buchhaltung (Bilanz, Überschüsse & "
+"Verluste) sollten Sie das Modul l10n_ES_account_balance_report "
+"installieren.\n"
diff --git a/addons/l10n_es/i18n/es.po b/addons/l10n_es/i18n/es.po
index 7320999eff2..f19150251af 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
@@ -47,109 +47,3 @@ msgstr ""
 "\n"
 "Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
 "para reportes de cuentas anuales (balance, perdidas y ganancias).\n"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
-
-#~ msgid ""
-#~ "Spanish General Chart of Accounts 2008\n"
-#~ "\n"
-#~ "* Defines the following chart of account templates:\n"
-#~ "        * Spanish General Chart of Accounts 2008.\n"
-#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
-#~ "companies.\n"
-#~ "* Defines templates for sale and purchase VAT.\n"
-#~ "* Defines tax code templates.\n"
-#~ "\n"
-#~ "Note: You should install the l10n_ES_account_balance_report module\n"
-#~ "for yearly account reporting (balance, profit & losses).\n"
-#~ msgstr ""
-#~ "Plan general contable español 2008\n"
-#~ "* Define las plantillas de los planes contables:\n"
-#~ "        * Plan General Contable Español 2008.\n"
-#~ "        * Plan General Contable Español PYMES 2008.\n"
-#~ "* Define la plantilla de los impuestos IVA soportado, IVA repercutido, "
-#~ "recargos de equivalencia, IRPF.\n"
-#~ "* Define la plantilla de códigos de impuestos.\n"
-#~ "* Define la plantilla de posiciones fiscales.\n"
-#~ "\n"
-#~ "Nota: Para la impresión de cuentas anuales (balance, pérdidas y ganancias) \n"
-#~ "se recomienda instalar el módulo l10n_ES_account_balance_report.\n"
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Spain - Chart of Accounts 2008"
-#~ msgstr "España - Plan Contable 2008"
-
-#~ msgid "Terceros - A Cobrar"
-#~ msgstr "Terceros - A Cobrar"
-
-#~ msgid "Terceros - A Pagar"
-#~ msgstr "Terceros - A Pagar"
-
-#~ msgid "Retención IRPF 1%"
-#~ msgstr "Retención IRPF 1%"
-
-#~ msgid "Gastos patrimonio neto"
-#~ msgstr "Gastos patrimonio neto"
-
-#~ msgid "Terceros"
-#~ msgstr "Terceros"
-
-#~ msgid "Régimen Extracomunitario"
-#~ msgstr "Régimen Extracomunitario"
-
-#~ msgid "Recargo de Equivalencia"
-#~ msgstr "Recargo de Equivalencia"
-
-#~ msgid "Retención IRPF 15%"
-#~ msgstr "Retención IRPF 15%"
-
-#~ msgid "Existencias"
-#~ msgstr "Existencias"
-
-#~ msgid "Capital"
-#~ msgstr "Capital"
-
-#~ msgid "Impuestos"
-#~ msgstr "Impuestos"
-
-#~ msgid "Retención IRPF 18%"
-#~ msgstr "Retención IRPF 18%"
-
-#~ msgid "Inmobilizado"
-#~ msgstr "Inmobilizado"
-
-#~ msgid "Régimen Nacional"
-#~ msgstr "Régimen Nacional"
-
-#~ msgid "Retención IRPF 7%"
-#~ msgstr "Retención IRPF 7%"
-
-#~ msgid "View"
-#~ msgstr "Vista"
-
-#~ msgid "Ingresos"
-#~ msgstr "Ingresos"
-
-#~ msgid "Régimen Intracomunitario"
-#~ msgstr "Régimen Intracomunitario"
-
-#~ msgid "Ingresos patrimonio neto"
-#~ msgstr "Ingresos patrimonio neto"
-
-#~ msgid "Financieras"
-#~ msgstr "Financieras"
-
-#~ msgid "Retención IRPF 19%"
-#~ msgstr "Retención IRPF 19%"
-
-#~ msgid "Retención IRPF 2%"
-#~ msgstr "Retención IRPF 2%"
-
-#~ msgid "Gastos"
-#~ msgstr "Gastos"
diff --git a/addons/l10n_es/i18n/es_MX.po b/addons/l10n_es/i18n/es_MX.po
new file mode 100644
index 00000000000..f7a78849b28
--- /dev/null
+++ b/addons/l10n_es/i18n/es_MX.po
@@ -0,0 +1,49 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\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 07:52+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_es
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr "Plan Contable Español (PGCE 2008)"
+
+#. module: l10n_es
+#: model:ir.module.module,description:l10n_es.module_meta_information
+msgid ""
+"Spanish Charts of Accounts (PGCE 2008)\n"
+"\n"
+"* Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008.\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies.\n"
+"* Defines templates for sale and purchase VAT.\n"
+"* Defines tax code templates.\n"
+"\n"
+"Note: You should install the l10n_ES_account_balance_report module\n"
+"for yearly account reporting (balance, profit & losses).\n"
+msgstr ""
+"Plan General Contable Español (PGCE 2008)\n"
+"\n"
+"* Define las siguientes plantillas de planes de cuentas:\n"
+"        * Plan General Contable Español 2008.\n"
+"        * Plan General Contable Español 2008 para pequeñas y medianas "
+"empresas (PYMES).\n"
+"* Define plantillas de impuestos de ventas y compras.\n"
+"* Define plantillas de códigos de impuesto.\n"
+"\n"
+"Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
+"para reportes de cuentas anuales (balance, perdidas y ganancias).\n"
diff --git a/addons/l10n_es/i18n/es_PY.po b/addons/l10n_es/i18n/es_PY.po
index b185a4b373d..70c80b4413f 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
diff --git a/addons/l10n_es/i18n/es_VE.po b/addons/l10n_es/i18n/es_VE.po
new file mode 100644
index 00000000000..f7a78849b28
--- /dev/null
+++ b/addons/l10n_es/i18n/es_VE.po
@@ -0,0 +1,49 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\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 07:52+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_es
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr "Plan Contable Español (PGCE 2008)"
+
+#. module: l10n_es
+#: model:ir.module.module,description:l10n_es.module_meta_information
+msgid ""
+"Spanish Charts of Accounts (PGCE 2008)\n"
+"\n"
+"* Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008.\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies.\n"
+"* Defines templates for sale and purchase VAT.\n"
+"* Defines tax code templates.\n"
+"\n"
+"Note: You should install the l10n_ES_account_balance_report module\n"
+"for yearly account reporting (balance, profit & losses).\n"
+msgstr ""
+"Plan General Contable Español (PGCE 2008)\n"
+"\n"
+"* Define las siguientes plantillas de planes de cuentas:\n"
+"        * Plan General Contable Español 2008.\n"
+"        * Plan General Contable Español 2008 para pequeñas y medianas "
+"empresas (PYMES).\n"
+"* Define plantillas de impuestos de ventas y compras.\n"
+"* Define plantillas de códigos de impuesto.\n"
+"\n"
+"Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
+"para reportes de cuentas anuales (balance, perdidas y ganancias).\n"
diff --git a/addons/l10n_es/i18n/fr.po b/addons/l10n_es/i18n/fr.po
index 99e998ba921..f4aef641b9d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
@@ -50,33 +50,3 @@ msgstr ""
 "Remarque : Vous devriez installer le module l10n_es_account_balance_report "
 "pour le\n"
 "reporting comptable annuel (bilan, comptes de résultats).\n"
-
-#~ msgid "Retención IRPF 1%"
-#~ msgstr "Retenue IRPF 1%"
-
-#~ msgid "Retención IRPF 18%"
-#~ msgstr "Retenue IRPF 18%"
-
-#~ msgid "Régimen Nacional"
-#~ msgstr "Régime national"
-
-#~ msgid "Retención IRPF 7%"
-#~ msgstr "Retenue IRPF 7%"
-
-#~ msgid "Retención IRPF 19%"
-#~ msgstr "Retenue IRPF 19%"
-
-#~ msgid "Régimen Intracomunitario"
-#~ msgstr "Régime intra-communautaire"
-
-#~ msgid "Régimen Extracomunitario"
-#~ msgstr "Régime extra-communautaire"
-
-#~ msgid "Recargo de Equivalencia"
-#~ msgstr "Recharge d'équivalence"
-
-#~ msgid "Retención IRPF 15%"
-#~ msgstr "Retenue IRPF 15%"
-
-#~ msgid "Retención IRPF 2%"
-#~ msgstr "Retenue IRPF 12%"
diff --git a/addons/l10n_es/i18n/gl.po b/addons/l10n_es/i18n/gl.po
index 8d26a6ced55..70179483fe4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
diff --git a/addons/l10n_es/i18n/hu.po b/addons/l10n_es/i18n/hu.po
index 3ff87f7f508..4516d41d71e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
diff --git a/addons/l10n_es/i18n/it.po b/addons/l10n_es/i18n/it.po
index 0d9abcce759..e799519e6a2 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
@@ -37,6 +37,3 @@ msgid ""
 "Note: You should install the l10n_ES_account_balance_report module\n"
 "for yearly account reporting (balance, profit & losses).\n"
 msgstr ""
-
-#~ msgid "Régimen Extracomunitario"
-#~ msgstr "Sistema Extra comunitario"
diff --git a/addons/l10n_es/i18n/oc.po b/addons/l10n_es/i18n/oc.po
new file mode 100644
index 00000000000..3abe8d9ae4a
--- /dev/null
+++ b/addons/l10n_es/i18n/oc.po
@@ -0,0 +1,39 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-20 09:22+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: l10n_es
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr "Plan comptable espanhòl (PGCE 2008)"
+
+#. module: l10n_es
+#: model:ir.module.module,description:l10n_es.module_meta_information
+msgid ""
+"Spanish Charts of Accounts (PGCE 2008)\n"
+"\n"
+"* Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008.\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies.\n"
+"* Defines templates for sale and purchase VAT.\n"
+"* Defines tax code templates.\n"
+"\n"
+"Note: You should install the l10n_ES_account_balance_report module\n"
+"for yearly account reporting (balance, profit & losses).\n"
+msgstr ""
diff --git a/addons/l10n_es/i18n/pt.po b/addons/l10n_es/i18n/pt.po
index eeba343cf87..2a31c81c7f4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
@@ -37,18 +37,3 @@ msgid ""
 "Note: You should install the l10n_ES_account_balance_report module\n"
 "for yearly account reporting (balance, profit & losses).\n"
 msgstr ""
-
-#~ msgid "Impuestos"
-#~ msgstr "Impostos"
-
-#~ msgid "Terceros"
-#~ msgstr "Terceiros"
-
-#~ msgid "Régimen Extracomunitario"
-#~ msgstr "Regime extracomunitário"
-
-#~ msgid "Inmobilizado"
-#~ msgstr "Imobilizado"
-
-#~ msgid "Régimen Intracomunitario"
-#~ msgstr "Regime intracomunitário"
diff --git a/addons/l10n_es/i18n/pt_BR.po b/addons/l10n_es/i18n/pt_BR.po
index b364adb1058..cbe979dd4b1 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
diff --git a/addons/l10n_es/i18n/sr@latin.po b/addons/l10n_es/i18n/sr@latin.po
index 5d8c2cf1338..2a35480adda 100644
--- a/addons/l10n_es/i18n/sr@latin.po
+++ b/addons/l10n_es/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-10-13 15:18+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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
 msgid "Spanish Charts of Accounts (PGCE 2008)"
-msgstr ""
+msgstr "Računske tabele za Španiju (PGCE 2008)"
 
 #. module: l10n_es
 #: model:ir.module.module,description:l10n_es.module_meta_information
@@ -37,3 +37,13 @@ msgid ""
 "Note: You should install the l10n_ES_account_balance_report module\n"
 "for yearly account reporting (balance, profit & losses).\n"
 msgstr ""
+"Računske tabele za Španiju (PGCE 2008)\n"
+"\n"
+"*Definiše sledeće modele za računske tabele:\n"
+"        *Opšte računske tabele za Španiju 2008.\n"
+"        *OPšte računske tabele za Španiju za mala i srednja preduzeća.\n"
+"*Definiše modele za prodaju i nabavku VAT-a.\n"
+"*Definiše model za takseni kod.\n"
+"\n"
+"Beleška: Trebalo bi da instalirate modul ''l10n_ES_account_balance_report''\n"
+"za godišnje izveštaje o računu (balans, prihod i rashod).\n"
diff --git a/addons/l10n_es/i18n/tr.po b/addons/l10n_es/i18n/tr.po
index 9a8c2277421..c54839820e1 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index d0e8f481766..1bcb659c322 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -30,7 +30,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
diff --git a/addons/l10n_fr/fr_tax_demo.xml b/addons/l10n_fr/fr_tax_demo.xml
index 154765e9365..37ff4157c99 100644
--- a/addons/l10n_fr/fr_tax_demo.xml
+++ b/addons/l10n_fr/fr_tax_demo.xml
@@ -18,7 +18,7 @@
       <field name="tax_code_id" ref="tax_col_196"/>
 
       <field name="account_collected_id" ref="pcg_445711"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445711"/>
 
       <field name="ref_base_code_id" ref="tax_col_196_ht"/>
       <field name="ref_base_sign" eval="-1"/>
@@ -79,7 +79,7 @@
       <field name="ref_tax_code_id" ref="tax_col_21"/>
       <field name="ref_tax_sign" eval="-1"/>
       <field name="type_tax_use">sale</field>
-    </record> 
+    </record>
 
 
 <!-- ACHATS -->
diff --git a/addons/l10n_fr/i18n/ar.po b/addons/l10n_fr/i18n/ar.po
index e7860a3bdb3..4ce478c026d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/bg.po b/addons/l10n_fr/i18n/bg.po
index cdf85a3a00b..5f810509a19 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/bs.po b/addons/l10n_fr/i18n/bs.po
index e7860a3bdb3..4ce478c026d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/ca.po b/addons/l10n_fr/i18n/ca.po
index bcfe4074063..6b33e5a544f 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/cs.po b/addons/l10n_fr/i18n/cs.po
index e7860a3bdb3..4ce478c026d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/de.po b/addons/l10n_fr/i18n/de.po
index 8a78d7acf5c..56e0ad85bf0 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index c74454d341c..56c02bcf332 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/es_AR.po b/addons/l10n_fr/i18n/es_AR.po
index 9bc2dd9b854..42138217b76 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/es_MX.po b/addons/l10n_fr/i18n/es_MX.po
new file mode 100644
index 00000000000..b776cce1b2b
--- /dev/null
+++ b/addons/l10n_fr/i18n/es_MX.po
@@ -0,0 +1,212 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_fr
+#
+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:15+0000\n"
+"PO-Revision-Date: 2010-12-28 09: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: 2011-09-05 05:10+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_fr
+#: sql_constraint:l10n.fr.line:0
+msgid "The variable name must be unique !"
+msgstr "¡El nombre de la variable debe ser único!"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_fr
+#: field:l10n.fr.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_account_cdr_report
+msgid "Account CDR Report"
+msgstr "Informe cuenta CDR"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,name:0
+#: field:l10n.fr.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_fr
+#: model:ir.actions.act_window,name:l10n_fr.action_account_cdr_report
+msgid "Compte de resultat Report"
+msgstr "Informe de cuenta de resultados"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_l10n_fr_line
+msgid "Report Lines for l10n_fr"
+msgstr "Líneas informe para l10n_fr"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: model:ir.actions.act_window,name:l10n_fr.action_account_bilan_report
+msgid "Bilan Report"
+msgstr "Informe balance"
+
+#. module: l10n_fr
+#: model:ir.module.module,shortdesc:l10n_fr.module_meta_information
+msgid "France - Plan Comptable Général"
+msgstr "Francia - Plan contable general"
+
+#. module: l10n_fr
+#: field:l10n.fr.report,line_ids:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: view:account.cdr.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: l10n_fr
+#: field:account.bilan.report,fiscalyear_id:0
+#: field:account.cdr.report,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_l10n_fr_report
+msgid "Report for l10n_fr"
+msgstr "Informe para l10n_fr"
+
+#. module: l10n_fr
+#: view:account.cdr.report:0
+msgid "Compte de resultant"
+msgstr "Cuenta de resultado"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,code:0
+msgid "Variable Name"
+msgstr "Nombre variable"
+
+#. module: l10n_fr
+#: sql_constraint:l10n.fr.report:0
+msgid "The code report must be unique !"
+msgstr "El código del informe debe ser único"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: view:account.cdr.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_account_bilan_report
+msgid "Account Bilan Report"
+msgstr "Estado de situación patrimonial"
+
+#. module: l10n_fr
+#: model:ir.module.module,description:l10n_fr.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart for France in OpenERP.\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+msgstr ""
+"Este es el módulo para gestionar el plan contable francés en OpenERP.\n"
+"\n"
+"Créditos: Sistheo Zeekom CrysaLEAD\n"
+
+#~ msgid "Asset"
+#~ msgstr "Activo"
+
+#~ msgid "Income"
+#~ msgstr "Ingreso"
+
+#~ msgid "Expense"
+#~ msgstr "Gasto"
+
+#~ msgid "Fiscal year"
+#~ msgstr "Año Fiscal"
+
+#~ 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 "Equity"
+#~ msgstr "Patrimonio"
+
+#~ msgid "Cash"
+#~ msgstr "Efectivo"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
+#~ msgid "Cloture"
+#~ msgstr "Cierre"
+
+#~ msgid "Tax"
+#~ msgstr "Impuesto"
+
+#~ msgid "Receivable"
+#~ msgstr "A recibir"
+
+#~ msgid "Payable"
+#~ msgstr "A pagar"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#~ msgid "Zone Euro"
+#~ msgstr "Zona Euro"
+
+#~ msgid "Provisions"
+#~ msgstr "Provisiones"
+
+#~ msgid "Immobilisations"
+#~ msgstr "Inmobilizaciones"
+
+#~ msgid "France"
+#~ msgstr "Francia"
+
+#~ msgid "Stocks"
+#~ msgstr "Stocks"
+
+#~ msgid "Comptes spéciaux"
+#~ msgstr "Cuentas especiales"
+
+#~ msgid "TVA sur le débits"
+#~ msgstr "IVA sobre los débitos"
+
+#~ msgid "Actif circulant"
+#~ msgstr "Activo circulante"
+
+#~ msgid "Dettes long terme"
+#~ msgstr "Deudas a largo plazo"
+
+#~ msgid "DOM-TOM"
+#~ msgstr "DOM-TOM"
+
+#~ msgid "TVA sur les encaissements"
+#~ msgstr "IVA sobre cobros"
+
+#~ msgid "Hors Euro"
+#~ msgstr "Fuera Europa"
+
+#~ msgid "Engagements"
+#~ msgstr "Compromisos"
diff --git a/addons/l10n_fr/i18n/es_PY.po b/addons/l10n_fr/i18n/es_PY.po
index 2422e5b4d9c..0d656264394 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/es_VE.po b/addons/l10n_fr/i18n/es_VE.po
new file mode 100644
index 00000000000..b776cce1b2b
--- /dev/null
+++ b/addons/l10n_fr/i18n/es_VE.po
@@ -0,0 +1,212 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_fr
+#
+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:15+0000\n"
+"PO-Revision-Date: 2010-12-28 09: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: 2011-09-05 05:10+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_fr
+#: sql_constraint:l10n.fr.line:0
+msgid "The variable name must be unique !"
+msgstr "¡El nombre de la variable debe ser único!"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_fr
+#: field:l10n.fr.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_account_cdr_report
+msgid "Account CDR Report"
+msgstr "Informe cuenta CDR"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,name:0
+#: field:l10n.fr.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_fr
+#: model:ir.actions.act_window,name:l10n_fr.action_account_cdr_report
+msgid "Compte de resultat Report"
+msgstr "Informe de cuenta de resultados"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_l10n_fr_line
+msgid "Report Lines for l10n_fr"
+msgstr "Líneas informe para l10n_fr"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: model:ir.actions.act_window,name:l10n_fr.action_account_bilan_report
+msgid "Bilan Report"
+msgstr "Informe balance"
+
+#. module: l10n_fr
+#: model:ir.module.module,shortdesc:l10n_fr.module_meta_information
+msgid "France - Plan Comptable Général"
+msgstr "Francia - Plan contable general"
+
+#. module: l10n_fr
+#: field:l10n.fr.report,line_ids:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: view:account.cdr.report:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: l10n_fr
+#: field:account.bilan.report,fiscalyear_id:0
+#: field:account.cdr.report,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_l10n_fr_report
+msgid "Report for l10n_fr"
+msgstr "Informe para l10n_fr"
+
+#. module: l10n_fr
+#: view:account.cdr.report:0
+msgid "Compte de resultant"
+msgstr "Cuenta de resultado"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,code:0
+msgid "Variable Name"
+msgstr "Nombre variable"
+
+#. module: l10n_fr
+#: sql_constraint:l10n.fr.report:0
+msgid "The code report must be unique !"
+msgstr "El código del informe debe ser único"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: view:account.cdr.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_account_bilan_report
+msgid "Account Bilan Report"
+msgstr "Estado de situación patrimonial"
+
+#. module: l10n_fr
+#: model:ir.module.module,description:l10n_fr.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart for France in OpenERP.\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+msgstr ""
+"Este es el módulo para gestionar el plan contable francés en OpenERP.\n"
+"\n"
+"Créditos: Sistheo Zeekom CrysaLEAD\n"
+
+#~ msgid "Asset"
+#~ msgstr "Activo"
+
+#~ msgid "Income"
+#~ msgstr "Ingreso"
+
+#~ msgid "Expense"
+#~ msgstr "Gasto"
+
+#~ msgid "Fiscal year"
+#~ msgstr "Año Fiscal"
+
+#~ 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 "Equity"
+#~ msgstr "Patrimonio"
+
+#~ msgid "Cash"
+#~ msgstr "Efectivo"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
+#~ msgid "Cloture"
+#~ msgstr "Cierre"
+
+#~ msgid "Tax"
+#~ msgstr "Impuesto"
+
+#~ msgid "Receivable"
+#~ msgstr "A recibir"
+
+#~ msgid "Payable"
+#~ msgstr "A pagar"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#~ msgid "Zone Euro"
+#~ msgstr "Zona Euro"
+
+#~ msgid "Provisions"
+#~ msgstr "Provisiones"
+
+#~ msgid "Immobilisations"
+#~ msgstr "Inmobilizaciones"
+
+#~ msgid "France"
+#~ msgstr "Francia"
+
+#~ msgid "Stocks"
+#~ msgstr "Stocks"
+
+#~ msgid "Comptes spéciaux"
+#~ msgstr "Cuentas especiales"
+
+#~ msgid "TVA sur le débits"
+#~ msgstr "IVA sobre los débitos"
+
+#~ msgid "Actif circulant"
+#~ msgstr "Activo circulante"
+
+#~ msgid "Dettes long terme"
+#~ msgstr "Deudas a largo plazo"
+
+#~ msgid "DOM-TOM"
+#~ msgstr "DOM-TOM"
+
+#~ msgid "TVA sur les encaissements"
+#~ msgstr "IVA sobre cobros"
+
+#~ msgid "Hors Euro"
+#~ msgstr "Fuera Europa"
+
+#~ msgid "Engagements"
+#~ msgstr "Compromisos"
diff --git a/addons/l10n_fr/i18n/et.po b/addons/l10n_fr/i18n/et.po
index 3e6822e5a06..ee110794f68 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index 3a99bebe047..52ee4053012 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 05:52+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
@@ -684,26 +684,11 @@ msgstr ""
 #~ msgid "CHARGES EXCEPTIONNELLES"
 #~ msgstr "CHARGES EXCEPTIONNELLES"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle incorrect pour la définition de l'action"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML incorrect pour l'architecture de la vue !"
-
 #~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "La taille d'un champ ne peut jamais être inférieure à 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
 #~ msgid "TVA sur le débits"
 #~ msgstr "TVA sur les débits"
diff --git a/addons/l10n_fr/i18n/gl.po b/addons/l10n_fr/i18n/gl.po
index 4a2c2bd7ed6..271885d6c64 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/hr.po b/addons/l10n_fr/i18n/hr.po
index e7860a3bdb3..32a4955b63d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/hu.po b/addons/l10n_fr/i18n/hu.po
index e7860a3bdb3..32a4955b63d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/id.po b/addons/l10n_fr/i18n/id.po
index 39e2154a130..a7cae632515 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/it.po b/addons/l10n_fr/i18n/it.po
index d8a46dd7656..db59d312729 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/ko.po b/addons/l10n_fr/i18n/ko.po
index 73f4004ce03..ad150551b89 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/lt.po b/addons/l10n_fr/i18n/lt.po
index 92893ea106d..00a680c914d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
@@ -132,3 +132,9 @@ msgstr ""
 
 #~ msgid "View"
 #~ msgstr "Žiūrėti"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialiųjų "
+#~ "ženklų!"
diff --git a/addons/l10n_fr/i18n/nl.po b/addons/l10n_fr/i18n/nl.po
index 383e25d48a4..742ca181c53 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/nl_BE.po b/addons/l10n_fr/i18n/nl_BE.po
index b0dd2e12fd9..8fa06dedfef 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/oc.po b/addons/l10n_fr/i18n/oc.po
index 5d4718d0dfe..cb884b8c6f3 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 7e6314519e2..44ae2bade95 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/pt.po b/addons/l10n_fr/i18n/pt.po
index d6ec5d4ae7e..6452bea189c 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/pt_BR.po b/addons/l10n_fr/i18n/pt_BR.po
index 54dd4c3e744..164899abc6d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/ro.po b/addons/l10n_fr/i18n/ro.po
index e7860a3bdb3..32a4955b63d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/ru.po b/addons/l10n_fr/i18n/ru.po
index 800d14c5a36..b93e2c7306a 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/sl.po b/addons/l10n_fr/i18n/sl.po
index d5afd10cc51..31755d37da8 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/sq.po b/addons/l10n_fr/i18n/sq.po
index f0a1c752b2d..b9aa051b4a6 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/sr@latin.po b/addons/l10n_fr/i18n/sr@latin.po
index 8e7a7d0579d..590d4c464f5 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/sv.po b/addons/l10n_fr/i18n/sv.po
index e195c000357..c95495ceadf 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/tlh.po b/addons/l10n_fr/i18n/tlh.po
index 7f9cb1bdc68..63094ca0ee7 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index 40a141e9174..0fa2612da3e 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/uk.po b/addons/l10n_fr/i18n/uk.po
index a2d699d1bf5..ff34eee6c76 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/vi.po b/addons/l10n_fr/i18n/vi.po
index ae62619666a..607c0d91dd8 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/zh_CN.po b/addons/l10n_fr/i18n/zh_CN.po
index f40f362920c..5e474ec6bd2 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/i18n/zh_TW.po b/addons/l10n_fr/i18n/zh_TW.po
index 6d352f3226b..7038c4599be 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
diff --git a/addons/l10n_fr/plan_comptable_general_demo.xml b/addons/l10n_fr/plan_comptable_general_demo.xml
index e3684eb3d34..b78e1821720 100644
--- a/addons/l10n_fr/plan_comptable_general_demo.xml
+++ b/addons/l10n_fr/plan_comptable_general_demo.xml
@@ -94,7 +94,7 @@
         <record model="account.account.type" id="account_type_equity">
           <field name="name">Equity</field>
           <field name="code">equity</field>
-          <field name="report_type">asset</field>
+          <field name="report_type">liability</field>
           <field name="close_method">balance</field>
         </record>
 
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index e8615935b8c..eb66de9f012 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -31,7 +31,6 @@
 
         <record model="ir.values" id="action_account_bilan_report_values">
             <field name="model_id" ref="model_account_bilan_report" />
-            <field name="object" eval="1" />
             <field name="name">Bilan Report</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_bilan_report'))" />
@@ -40,4 +39,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index f50ec1ef308..5499e2fe1cf 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -30,7 +30,6 @@
 
         <record model="ir.values" id="action_account_cdr_report_values">
             <field name="model_id" ref="model_account_cdr_report" />
-            <field name="object" eval="1" />
             <field name="name">Compte de resultat Report</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_cdr_report'))" />
@@ -39,4 +38,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index b1bae1a1bfb..72b1d2c7cc4 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
diff --git a/addons/l10n_gr/i18n/ca.po b/addons/l10n_gr/i18n/ca.po
index d5dfc9426db..d1908bc3f92 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/de.po b/addons/l10n_gr/i18n/de.po
index 0858ea9eb6e..a9365fca0b1 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/el.po b/addons/l10n_gr/i18n/el.po
index bc6bde8cb8f..a44ae3b5c53 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
@@ -47,30 +47,3 @@ msgstr ""
 "\tΑυτός είναι ο ίδιος οδηγός που ενεργοποιήτε από την Οικονομική "
 "Διαχείριση/Παραμετροποίηση/Οικονομική Λογιστική/Δημιουργία Λογιστικού "
 "Σχεδίου από Πρότυπο Λογαριασμών."
-
-#~ msgid "Income"
-#~ msgstr "Έσοδο"
-
-#~ msgid "Receivable"
-#~ msgstr "Εισπρακτέα"
-
-#~ msgid "Cash"
-#~ msgstr "Μετρητά"
-
-#~ msgid "Tax"
-#~ msgstr "Φόρος"
-
-#~ msgid "Payable"
-#~ msgstr "Πληρωτέο"
-
-#~ msgid "View"
-#~ msgstr "Προβολή"
-
-#~ msgid "Expense"
-#~ msgstr "Έξοδο"
-
-#~ msgid "Other"
-#~ msgstr "Λοιπά"
-
-#~ msgid "Equity"
-#~ msgstr "Καθαρή θέση"
diff --git a/addons/l10n_gr/i18n/es.po b/addons/l10n_gr/i18n/es.po
index 3abce04075f..afd1404adc8 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
@@ -46,33 +46,3 @@ msgstr ""
 "\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 "Income"
-#~ msgstr "Ingreso"
-
-#~ msgid "Receivable"
-#~ msgstr "A cobrar"
-
-#~ msgid "Cash"
-#~ msgstr "Caja"
-
-#~ msgid "Tax"
-#~ msgstr "Impuesto"
-
-#~ msgid "Payable"
-#~ msgstr "A pagar"
-
-#~ msgid "Asset"
-#~ msgstr "Activo"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "View"
-#~ msgstr "Vista"
-
-#~ msgid "Equity"
-#~ msgstr "Patrimonio"
-
-#~ msgid "Expense"
-#~ msgstr "Gasto"
diff --git a/addons/l10n_gr/i18n/es_MX.po b/addons/l10n_gr/i18n/es_MX.po
new file mode 100644
index 00000000000..d2e2254dc67
--- /dev/null
+++ b/addons/l10n_gr/i18n/es_MX.po
@@ -0,0 +1,48 @@
+# 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:07+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_gr
+#: model:ir.module.module,description:l10n_gr.module_meta_information
+msgid "This is the base module to manage the accounting chart for Greece."
+msgstr "Este es el módulo base para gestionar el plan contable para Grecia."
+
+#. module: l10n_gr
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr "Grecia - mínimo"
+
+#. module: l10n_gr
+#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
+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ñía, 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_gr/i18n/es_PY.po b/addons/l10n_gr/i18n/es_PY.po
index 59f42053997..6c489f8e0ba 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/es_VE.po b/addons/l10n_gr/i18n/es_VE.po
new file mode 100644
index 00000000000..d2e2254dc67
--- /dev/null
+++ b/addons/l10n_gr/i18n/es_VE.po
@@ -0,0 +1,48 @@
+# 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:07+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_gr
+#: model:ir.module.module,description:l10n_gr.module_meta_information
+msgid "This is the base module to manage the accounting chart for Greece."
+msgstr "Este es el módulo base para gestionar el plan contable para Grecia."
+
+#. module: l10n_gr
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr "Grecia - mínimo"
+
+#. module: l10n_gr
+#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
+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ñía, 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_gr/i18n/fr.po b/addons/l10n_gr/i18n/fr.po
index 3130e0fb201..441a4f267a2 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/gl.po b/addons/l10n_gr/i18n/gl.po
index 6e2001abf1a..b8245c59d88 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/hu.po b/addons/l10n_gr/i18n/hu.po
index 984a47a7557..19fbefefaaa 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/it.po b/addons/l10n_gr/i18n/it.po
index e8f353fa39b..fa842cde1ca 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/nl.po b/addons/l10n_gr/i18n/nl.po
index 2be837ddddf..8b8af8f74f4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/pt.po b/addons/l10n_gr/i18n/pt.po
index 57fef5c779b..1826aac8249 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
@@ -38,9 +38,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Cash"
-#~ msgstr "Dinheiro"
-
-#~ msgid "Expense"
-#~ msgstr "Despesa"
diff --git a/addons/l10n_gr/i18n/pt_BR.po b/addons/l10n_gr/i18n/pt_BR.po
index 8cd184fe97f..7a9a23a30b3 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gr/i18n/sr@latin.po b/addons/l10n_gr/i18n/sr@latin.po
index 1da870b13f8..e6c76e04e36 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
@@ -38,6 +38,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Equity"
-#~ msgstr "Jednakost"
diff --git a/addons/l10n_gr/i18n/tr.po b/addons/l10n_gr/i18n/tr.po
index c5cdf9c74b5..60bf53d6d9b 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 8806479b69d..d80c1fa80a7 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Guatemala - Plan contable general',
     'version': '3.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Guatemala.
 =====================================================================
diff --git a/addons/l10n_gt/i18n/ca.po b/addons/l10n_gt/i18n/ca.po
index d90c277affe..78f1b0c1f40 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_gt/i18n/es.po b/addons/l10n_gt/i18n/es.po
index 3688349dce5..708c155db7f 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
@@ -41,36 +41,3 @@ msgid ""
 msgstr ""
 "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
 "la moneda del Quetzal."
-
-#~ msgid "Cuentas por Pagar"
-#~ msgstr "Cuentas por Pagar"
-
-#~ msgid "Cuentas por Cobrar"
-#~ msgstr "Cuentas por Cobrar"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "! Error ! No puede crear modelos de cuentas recursivas."
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "! Error ! No puede crear códigos de impuestos recursivos."
-
-#~ msgid "Gastos"
-#~ msgstr "Gastos"
-
-#~ msgid "Vista"
-#~ msgstr "Vista"
-
-#~ msgid "Pasivo"
-#~ msgstr "Pasivo"
-
-#~ msgid "Ingresos"
-#~ msgstr "Ingresos"
-
-#~ msgid "Activo"
-#~ msgstr "Activo"
-
-#~ msgid "Capital"
-#~ msgstr "Capital"
-
-#~ msgid "Efectivo"
-#~ msgstr "Efectivo"
diff --git a/addons/l10n_gt/i18n/es_MX.po b/addons/l10n_gt/i18n/es_MX.po
new file mode 100644
index 00000000000..3a4173d8588
--- /dev/null
+++ b/addons/l10n_gt/i18n/es_MX.po
@@ -0,0 +1,43 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_gt
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2010-11-15 11:59+0000\n"
+"Last-Translator: Nicolas Vanhoren (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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_gt
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - Plan contable general"
+msgstr "Guatemala - Plan contable general"
+
+#. module: l10n_gt
+#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#. module: l10n_gt
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also "
+"includes taxes and the Quetzal currency"
+msgstr ""
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal."
diff --git a/addons/l10n_gt/i18n/es_PY.po b/addons/l10n_gt/i18n/es_PY.po
index baf9d9eee20..5484f346064 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_gt/i18n/es_VE.po b/addons/l10n_gt/i18n/es_VE.po
new file mode 100644
index 00000000000..3a4173d8588
--- /dev/null
+++ b/addons/l10n_gt/i18n/es_VE.po
@@ -0,0 +1,43 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_gt
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2010-11-15 11:59+0000\n"
+"Last-Translator: Nicolas Vanhoren (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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_gt
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - Plan contable general"
+msgstr "Guatemala - Plan contable general"
+
+#. module: l10n_gt
+#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#. module: l10n_gt
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also "
+"includes taxes and the Quetzal currency"
+msgstr ""
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal."
diff --git a/addons/l10n_gt/i18n/fr.po b/addons/l10n_gt/i18n/fr.po
index 85cdf3e5bd4..7cf8544c22c 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_gt/i18n/gl.po b/addons/l10n_gt/i18n/gl.po
index 0d15f7269c2..3b6d3484c74 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_gt/i18n/hu.po b/addons/l10n_gt/i18n/hu.po
index 3996b2b3532..d74a3cc827c 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_gt/i18n/it.po b/addons/l10n_gt/i18n/it.po
index 8bbe1165113..02b7ddf1b7b 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_gt/i18n/oc.po b/addons/l10n_gt/i18n/oc.po
new file mode 100644
index 00000000000..e077ec6c3c0
--- /dev/null
+++ b/addons/l10n_gt/i18n/oc.po
@@ -0,0 +1,39 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-20 09:23+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: l10n_gt
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - Plan contable general"
+msgstr "Guatemala - Plan comptable general"
+
+#. module: l10n_gt
+#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
+msgid ""
+"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."
+msgstr ""
+
+#. module: l10n_gt
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also "
+"includes taxes and the Quetzal currency"
+msgstr ""
diff --git a/addons/l10n_gt/i18n/pt_BR.po b/addons/l10n_gt/i18n/pt_BR.po
index eddb9a3d25c..5879f793fbe 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_gt/i18n/sr@latin.po b/addons/l10n_gt/i18n/sr@latin.po
index ac9378c2fa7..b1ae84a41b6 100644
--- a/addons/l10n_gt/i18n/sr@latin.po
+++ b/addons/l10n_gt/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-10-13 15:20+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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
 msgid "Guatemala - Plan contable general"
-msgstr ""
+msgstr "Gvatemala - Plan contable general"
 
 #. module: l10n_gt
 #: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
@@ -29,6 +29,9 @@ msgid ""
 "una compañía, el modelo a utilizar, el número de digitos a usar en la "
 "nomenclatura, la moneda para crear los diarios."
 msgstr ""
+"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."
 
 #. module: l10n_gt
 #: model:ir.module.module,description:l10n_gt.module_meta_information
@@ -37,3 +40,6 @@ msgid ""
 "la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also "
 "includes taxes and the Quetzal currency"
 msgstr ""
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
+"la moneda del Quetzal. -- Dodaje računske tabele za Gvatemalu. Takođe "
+"uključuje porez i Kvetzal valutu."
diff --git a/addons/l10n_gt/i18n/tr.po b/addons/l10n_gt/i18n/tr.po
index d8824301f55..67e18d381cf 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_gt
 #: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
diff --git a/addons/l10n_hn/__init__.py b/addons/l10n_hn/__init__.py
new file mode 100644
index 00000000000..b4f408623f9
--- /dev/null
+++ b/addons/l10n_hn/__init__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2009-2010 Salvatore J. Trimarchi <salvatore@trimarchi.co.cc>
+# (http://salvatoreweb.co.cc)
+#
+# 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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
new file mode 100644
index 00000000000..31d9344cb65
--- /dev/null
+++ b/addons/l10n_hn/__openerp__.py
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2009-2010 Salvatore J. Trimarchi <salvatore@trimarchi.co.cc>
+# (http://salvatoreweb.co.cc)
+#
+# 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/>.
+#
+##############################################################################
+
+#
+# This module provides a minimal Honduran chart of accounts that can be use
+# to build upon a more complex one.  It also includes a chart of taxes and
+# the Lempira currency.
+#
+# This module is based on the Guatemalan chart of accounts:
+# Copyright (c) 2009-2010 Soluciones Tecnologócias Prisma S.A. All Rights Reserved.
+# José Rodrigo Fernández Menegazzo, Soluciones Tecnologócias Prisma S.A.
+# (http://www.solucionesprisma.com)
+#
+# This module works with OpenERP 6.0
+#
+
+{
+    'name': 'Honduras - Plan contable general',
+    'version': '0.1',
+    'category': 'Localization/Account Charts',
+    'description': """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': [
+        'account_types.xml',
+        'account_chart.xml',
+        'account_tax.xml',
+        'l10n_hn_base.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'certificate': '', 
+}
+# 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
new file mode 100644
index 00000000000..7bd17b0e82d
--- /dev/null
+++ b/addons/l10n_hn/account_chart.xml
@@ -0,0 +1,650 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Plantilla -->
+
+        <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>
+
+        <!-- Cuentas de Balance General -->
+
+        <record id="bal" model="account.account.template">
+            <field name="code">A</field>
+            <field name="name">Balance General</field>
+            <field ref="plan_raiz" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta1" model="account.account.template">
+            <field name="code">1</field>
+            <field name="name">Activo</field>
+            <field ref="bal" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta11" model="account.account.template">
+            <field name="code">1.1</field>
+            <field name="name">Activo Corriente</field>
+            <field ref="cta1" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta1101" model="account.account.template">
+            <field name="code">1.1.01</field>
+            <field name="name">Caja y Bancos</field>
+            <field ref="cta11" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta110101" model="account.account.template">
+            <field name="code">1.1.01.01</field>
+            <field name="name">Caja Chica</field>
+            <field ref="cta1101" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="cuenta_efectivo"/>
+        </record>
+
+        <record id="cta1102" model="account.account.template">
+            <field name="code">1.1.02</field>
+            <field name="name">Cuentas y Documentos por Cobrar</field>
+            <field ref="cta11" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta110201" model="account.account.template">
+            <field name="code">1.1.02.01</field>
+            <field name="name">Cuentas por Cobrar Generales</field>
+            <field ref="cta1102" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="reconcile" eval="True"/>
+            <field name="user_type" ref="cuenta_cxc"/>
+        </record>
+
+        <record id="cta110202" model="account.account.template">
+            <field name="code">1.1.02.02</field>
+            <field name="name">Cuentas por Cobrar Empresas Afilidas</field>
+            <field ref="cta1102" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="reconcile" eval="True"/>
+            <field name="user_type" ref="cuenta_cxc"/>
+        </record>
+
+        <record id="cta110203" model="account.account.template">
+            <field name="code">1.1.02.03</field>
+            <field name="name">Prestamos al Personal</field>
+            <field ref="cta1102" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="reconcile" eval="True"/>
+            <field name="user_type" ref="cuenta_cxc"/>
+        </record>
+
+        <record id="cta110204" model="account.account.template">
+            <field name="code">1.1.02.04</field>
+            <field name="name">Otras Cuentas por Cobrar</field>
+            <field ref="cta1102" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="reconcile" eval="True"/>
+            <field name="user_type" ref="cuenta_cxc"/>
+        </record>
+
+        <record id="cta1103" model="account.account.template">
+            <field name="code">1.1.03</field>
+            <field name="name">ISV por Cobrar</field>
+            <field ref="cta11" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta110301" model="account.account.template">
+            <field name="code">1.1.03.01</field>
+            <field name="name">ISV por Cobrar</field>
+            <field ref="cta1103" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta110302" model="account.account.template">
+            <field name="code">1.1.03.02</field>
+            <field name="name">Retenciones de ISV recibidas</field>
+            <field ref="cta1103" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta1104" model="account.account.template">
+            <field name="code">1.1.04</field>
+            <field name="name">Inventario</field>
+            <field ref="cta11" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta12" model="account.account.template">
+            <field name="code">1.2</field>
+            <field name="name">No Corriente</field>
+            <field ref="cta1" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta1201" model="account.account.template">
+            <field name="code">1.2.01</field>
+            <field name="name">Propiedad, Planta y Equipo</field>
+            <field ref="cta12" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta120101" model="account.account.template">
+            <field name="code">1.2.01.01</field>
+            <field name="name">Propiedad, Planta y Equipo</field>
+            <field ref="cta1201" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta1202" model="account.account.template">
+            <field name="code">1.2.02</field>
+            <field name="name">Depreciaciones Acumuladas</field>
+            <field ref="cta12" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta120201" model="account.account.template">
+            <field name="code">1.2.02.01</field>
+            <field name="name">Depreciaciones Acumuladas</field>
+            <field ref="cta1202" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta13" model="account.account.template">
+            <field name="code">1.3</field>
+            <field name="name">Diferido</field>
+            <field ref="cta1" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta1301" model="account.account.template">
+            <field name="code">1.3.01</field>
+            <field name="name">Gastos por Amortizar</field>
+            <field ref="cta13" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta130101" model="account.account.template">
+            <field name="code">1.3.01.01</field>
+            <field name="name">Gastos por Amortizar</field>
+            <field ref="cta1301" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta1302" model="account.account.template">
+            <field name="code">1.3.02</field>
+            <field name="name">Gastos Anticipados</field>
+            <field ref="cta13" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta130201" model="account.account.template">
+            <field name="code">1.3.02.01</field>
+            <field name="name">Gastos Anticipados</field>
+            <field ref="cta1302" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta1305" model="account.account.template">
+            <field name="code">1.3.03</field>
+            <field name="name">Gastos de Organización</field>
+            <field ref="cta13" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta130501" model="account.account.template">
+            <field name="code">1.3.03.01</field>
+            <field name="name">Gastos de Organización</field>
+            <field ref="cta1305" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta1306" model="account.account.template">
+            <field name="code">1.3.04</field>
+            <field name="name">Otros Activos</field>
+            <field ref="cta13" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta130601" model="account.account.template">
+            <field name="code">1.3.04.01</field>
+            <field name="name">Otros Activos</field>
+            <field ref="cta1306" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_activo"/>
+        </record>
+
+        <record id="cta2" model="account.account.template">
+            <field name="code">2</field>
+            <field name="name">Pasivo</field>
+            <field ref="bal" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta21" model="account.account.template">
+            <field name="code">2.1</field>
+            <field name="name">Pasivo Corto Plazo</field>
+            <field ref="cta2" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta2101" model="account.account.template">
+            <field name="code">2.1.01</field>
+            <field name="name">Cuentas y Documentos por Pagar</field>
+            <field ref="cta21" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta210101" model="account.account.template">
+            <field name="code">2.1.01.01</field>
+            <field name="name">Cuentas y Documentos por Pagar</field>
+            <field ref="cta2101" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="reconcile" eval="True"/>
+            <field name="user_type" ref="cuenta_cxp"/>
+        </record>
+
+        <record id="cta2102" model="account.account.template">
+            <field name="code">2.1.02</field>
+            <field name="name">ISV por Pagar</field>
+            <field ref="cta21" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta210201" model="account.account.template">
+            <field name="code">2.1.02.01</field>
+            <field name="name">ISV por Pagar</field>
+            <field ref="cta2102" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_pasivo"/>
+        </record>
+
+        <record id="cta2103" model="account.account.template">
+            <field name="code">2.1.03</field>
+            <field name="name">Impuestos</field>
+            <field ref="cta21" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta210301" model="account.account.template">
+            <field name="code">2.1.03.01</field>
+            <field name="name">Impuestos</field>
+            <field ref="cta2103" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_pasivo"/>
+        </record>
+
+        <record id="cta22" model="account.account.template">
+            <field name="code">2.2</field>
+            <field name="name">Pasivo a Largo Plazo</field>
+            <field ref="cta2" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta2201" model="account.account.template">
+            <field name="code">2.2.01</field>
+            <field name="name">Provisión para Indemnizaciones</field>
+            <field ref="cta22" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta220101" model="account.account.template">
+            <field name="code">2.2.01.01</field>
+            <field name="name">Provisión para Indemnizaciones</field>
+            <field ref="cta2201" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_pasivo"/>
+        </record>
+
+        <record id="cta23" model="account.account.template">
+            <field name="code">2.3</field>
+            <field name="name">Créditos Diferidos</field>
+            <field ref="cta2" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta2301" model="account.account.template">
+            <field name="code">2.3.01</field>
+            <field name="name">Créditos Diferidos</field>
+            <field ref="cta23" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta230101" model="account.account.template">
+            <field name="code">2.3.01.01</field>
+            <field name="name">Anticipos</field>
+            <field ref="cta2301" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_pasivo"/>
+        </record>
+
+        <record id="cta3" model="account.account.template">
+            <field name="code">3</field>
+            <field name="name">Patrimonio</field>
+            <field ref="bal" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta31" model="account.account.template">
+            <field name="code">3.1</field>
+            <field name="name">Patrimonio de los Accionistas</field>
+            <field ref="cta3" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta3101" model="account.account.template">
+            <field name="code">3.1.01</field>
+            <field name="name">Patrimonio de los Accionistas</field>
+            <field ref="cta31" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta310101" model="account.account.template">
+            <field name="code">3.1.01.01</field>
+            <field name="name">Capital Autorizado, Suscríto y Pagado</field>
+            <field ref="cta3101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_capital"/>
+        </record>
+
+        <record id="cta310102" model="account.account.template">
+            <field name="code">3.1.01.02</field>
+            <field name="name">Reservas</field>
+            <field ref="cta3101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_capital"/>
+        </record>
+
+        <record id="cta310103" model="account.account.template">
+            <field name="code">3.1.01.03</field>
+            <field name="name">Perdidas y Ganancias</field>
+            <field ref="cta3101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_capital"/>
+        </record>
+
+        <!-- Cuentas de Estado de Resultados -->
+
+        <record id="er" model="account.account.template">
+            <field name="code">B</field>
+            <field name="name">Estado de Resultados</field>
+            <field ref="plan_raiz" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta4" model="account.account.template">
+            <field name="code">4</field>
+            <field name="name">Ingresos</field>
+            <field ref="er" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta41" model="account.account.template">
+            <field name="code">4.1</field>
+            <field name="name">Ventas</field>
+            <field ref="cta4" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta4101" model="account.account.template">
+            <field name="code">4.1.01</field>
+            <field name="name">Ventas Netas</field>
+            <field ref="cta41" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta410101" model="account.account.template">
+            <field name="code">4.1.01.01</field>
+            <field name="name">Ventas</field>
+            <field ref="cta4101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_ingresos"/>
+        </record>
+
+        <record id="cta410102" model="account.account.template">
+            <field name="code">4.1.01.02</field>
+            <field name="name">Descuentos Sobre Ventas</field>
+            <field ref="cta4101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_ingresos"/>
+        </record>
+
+        <record id="cta42" model="account.account.template">
+            <field name="code">4.2</field>
+            <field name="name">Otros Ingresos</field>
+            <field ref="cta4" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta4201" model="account.account.template">
+            <field name="code">4.2.01</field>
+            <field name="name">Otros Ingresos</field>
+            <field ref="cta42" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta420101" model="account.account.template">
+            <field name="code">4.2.01.01</field>
+            <field name="name">Otros Ingresos</field>
+            <field ref="cta4201" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_ingresos"/>
+        </record>
+
+        <record id="cta5" model="account.account.template">
+            <field name="code">5</field>
+            <field name="name">Egresos</field>
+            <field ref="er" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta51" model="account.account.template">
+            <field name="code">5.1</field>
+            <field name="name">Costos</field>
+            <field ref="cta5" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta5101" model="account.account.template">
+            <field name="code">5.1.01</field>
+            <field name="name">Costos de Ventas</field>
+            <field ref="cta51" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta510101" model="account.account.template">
+            <field name="code">5.1.01.01</field>
+            <field name="name">Costos de Ventas</field>
+            <field ref="cta5101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_gastos"/>
+        </record>
+
+        <record id="cta6" model="account.account.template">
+            <field name="code">6</field>
+            <field name="name">Gastos</field>
+            <field ref="er" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta61" model="account.account.template">
+            <field name="code">6.1</field>
+            <field name="name">Gastos de Ventas</field>
+            <field ref="cta6" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta6101" model="account.account.template">
+            <field name="code">6.1.01</field>
+            <field name="name">Gastos de Ventas</field>
+            <field ref="cta61" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta610101" model="account.account.template">
+            <field name="code">6.1.01.01</field>
+            <field name="name">Gastos de Ventas</field>
+            <field ref="cta6101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_gastos"/>
+        </record>
+
+        <record id="cta62" model="account.account.template">
+            <field name="code">6.2</field>
+            <field name="name">Gastos de Operación</field>
+            <field ref="cta6" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta6201" model="account.account.template">
+            <field name="code">6.2.01</field>
+            <field name="name">Gastos de Administración</field>
+            <field ref="cta62" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta620101" model="account.account.template">
+            <field name="code">6.2.01.01</field>
+            <field name="name">Gastos de Administración</field>
+            <field ref="cta6201" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_gastos"/>
+        </record>
+
+        <record id="cta6202" model="account.account.template">
+            <field name="code">6.2.02</field>
+            <field name="name">Otros Gastos de Operación</field>
+            <field ref="cta62" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta620201" model="account.account.template">
+            <field name="code">6.2.02.01</field>
+            <field name="name">Otros Gastos de Operación</field>
+            <field ref="cta6202" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_gastos"/>
+        </record>
+
+        <record id="cta63" model="account.account.template">
+            <field name="code">6.3</field>
+            <field name="name">Gastos no Deducibles</field>
+            <field ref="cta6" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta6301" model="account.account.template">
+            <field name="code">6.3.01</field>
+            <field name="name">Gastos no Deducibles</field>
+            <field ref="cta63" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta630101" model="account.account.template">
+            <field name="code">6.3.01.01</field>
+            <field name="name">Gastos no Deducibles</field>
+            <field ref="cta6301" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_gastos"/>
+        </record>
+
+        <record id="cta7" model="account.account.template">
+            <field name="code">7</field>
+            <field name="name">Otros Gastos y Productos Financieros</field>
+            <field ref="er" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta71" model="account.account.template">
+            <field name="code">7.1</field>
+            <field name="name">Otros Gastos y Productos Financieros</field>
+            <field ref="cta7" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta7101" model="account.account.template">
+            <field name="code">7.1.01</field>
+            <field name="name">Otros Gastos y Productos Financieros</field>
+            <field ref="cta71" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="cuenta_vista"/>
+        </record>
+
+        <record id="cta710101" model="account.account.template">
+            <field name="code">7.1.01.01</field>
+            <field name="name">Otros Gastos Financieros</field>
+            <field ref="cta7101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_gastos"/>
+        </record>
+
+        <record id="cta710102" model="account.account.template">
+            <field name="code">7.1.01.02</field>
+            <field name="name">Intereses</field>
+            <field ref="cta7101" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="cuenta_gastos"/>
+        </record>
+
+    </data>
+
+</openerp>
diff --git a/addons/l10n_hn/account_tax.xml b/addons/l10n_hn/account_tax.xml
new file mode 100644
index 00000000000..64675ecde33
--- /dev/null
+++ b/addons/l10n_hn/account_tax.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+    <data>
+
+        <!-- Definiciones del ISV -->
+
+        <record id="impuestos_raiz" model="account.tax.code.template">
+            <field name="name">General Honduras</field>
+        </record>
+
+        <!-- Impuestos ISV -->
+
+        <record id="impuestos_balance" model="account.tax.code.template">
+            <field name="name">Balance del ISV</field>
+            <field name="parent_id" ref="impuestos_raiz"/>
+        </record>
+
+        <!-- ISV por Pagar -->
+
+        <record id="impuestos_isv_por_pagar_balance" model="account.tax.code.template">
+            <field name="name">ISV por Pagar Balance</field>
+            <field name="parent_id" ref="impuestos_balance"/>
+        </record>
+
+        <record id="impuestos_isv_por_pagar" model="account.tax.code.template">
+            <field name="name">ISV por Pagar</field>
+            <field name="parent_id" ref="impuestos_isv_por_pagar_balance"/>
+        </record>
+
+        <!-- ISV por Cobrar -->
+
+        <record id="impuestos_isv_por_cobrar_balance" model="account.tax.code.template">
+            <field name="name">ISV por Cobrar Balance</field>
+            <field name="parent_id" ref="impuestos_balance"/>
+        </record>
+
+        <record id="impuestos_isv_por_cobrar" model="account.tax.code.template">
+            <field name="name">ISV por Cobrar</field>
+            <field name="parent_id" ref="impuestos_isv_por_cobrar_balance"/>
+        </record>
+
+        <!-- Base ISV -->
+
+        <record id="impuestos_base_iva" model="account.tax.code.template">
+            <field name="name">Base Impositiva</field>
+            <field name="parent_id" ref="impuestos_balance"/>
+        </record>
+
+        <!-- Compras -->
+
+        <record id="impuestos_base_isv_compras_balance" model="account.tax.code.template">
+            <field name="name">Base Impositiva de Compras Balance</field>
+            <field name="parent_id" ref="impuestos_base_iva"/>
+        </record>
+
+        <record id="impuestos_base_isv_compras" model="account.tax.code.template">
+            <field name="name">Base Impositiva de Compras</field>
+            <field name="parent_id" ref="impuestos_base_isv_compras_balance"/>
+        </record>
+
+        <!-- Ventas -->
+
+        <record id="impuestos_base_isv_ventas_balance" model="account.tax.code.template">
+            <field name="name">Base Impositiva de Ventas Balance</field>
+            <field name="parent_id" ref="impuestos_base_iva"/>
+        </record>
+
+        <record id="impuestos_base_isv_ventas" model="account.tax.code.template">
+            <field name="name">Base Impositiva de Ventas</field>
+            <field name="parent_id" ref="impuestos_base_isv_ventas_balance"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_hn/account_types.xml b/addons/l10n_hn/account_types.xml
new file mode 100644
index 00000000000..aeb7a01964e
--- /dev/null
+++ b/addons/l10n_hn/account_types.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Aquí especificamos los tipos de las cuentas para nuestro catalago -->
+<openerp>
+    <data noupdate="1">
+
+	    <record model="account.account.type" id="cuenta_vista">
+	      <field name="name">Vista</field>
+	      <field name="code">Vista</field>
+	      <field name="close_method">none</field>
+	    </record>
+
+	    <record model="account.account.type" id="cuenta_activo">
+	      <field name="name">Activo</field>
+	      <field name="code">Activo</field>
+	      <field name="close_method">balance</field>
+              <field name="report_type">asset</field>
+	    </record>
+
+            <record model="account.account.type" id="cuenta_cxc" >
+	      <field name="name">Cuentas por Cobrar</field>
+	      <field name="code">cxc</field>
+	      <field name="close_method">unreconciled</field>
+              <field name="report_type">asset</field>
+	    </record>
+
+	    <record model="account.account.type" id="cuenta_pasivo">
+	      <field name="name">Pasivo</field>
+	      <field name="code">Pasivo</field>
+	      <field name="close_method">balance</field>
+              <field name="report_type">liability</field>
+	    </record>
+
+	    <record model="account.account.type" id="cuenta_cxp" >
+	      <field name="name">Cuentas por Pagar</field>
+	      <field name="code">cxp</field>
+	      <field name="close_method">unreconciled</field>
+              <field name="report_type">liability</field>
+	    </record>
+
+	    <record model="account.account.type" id="cuenta_capital">
+	      <field name="name">Capital</field>
+	      <field name="code">capital</field>
+	      <field name="close_method">balance</field>
+              <field name="report_type">asset</field>
+	    </record>
+
+	    <record model="account.account.type" id="cuenta_ingresos" >
+	      <field name="name">Ingresos</field>
+	      <field name="code">ingresos</field>
+	      <field name="close_method">none</field>
+              <field name="report_type">income</field>
+	    </record>
+
+	    <record model="account.account.type" id="cuenta_gastos">
+	      <field name="name">Gastos</field>
+	      <field name="code">gastos</field>
+	      <field name="close_method">none</field>
+              <field name="report_type">expense</field>
+	    </record>
+
+	    <record model="account.account.type" id="cuenta_efectivo">
+	      <field name="name">Efectivo</field>
+	      <field name="code">Efectivo</field>
+              <field name="report_type">asset</field>
+	      <field name="close_method">balance</field>
+	    </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po
new file mode 100644
index 00000000000..aad943ef40d
--- /dev/null
+++ b/addons/l10n_hn/i18n/ca.po
@@ -0,0 +1,44 @@
+# 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-10-12 06:36+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Pla general comptable"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"Genera la nomenclatura comptable a partir d'un model. Hauríeu de seleccionar "
+"una empresa, el model a utilitzar, el número de dígits a utilitzar en la "
+"nomenclatura, la moneda per crear els diaris."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Afegeix una nomenclatura comptable per a Honduras. També inclou impostos i "
+"la moneda del Lempira."
diff --git a/addons/l10n_hn/i18n/es.po b/addons/l10n_hn/i18n/es.po
new file mode 100644
index 00000000000..fa71768c797
--- /dev/null
+++ b/addons/l10n_hn/i18n/es.po
@@ -0,0 +1,43 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_hn
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-12 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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Plan contable general"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira."
diff --git a/addons/l10n_hn/i18n/es_PY.po b/addons/l10n_hn/i18n/es_PY.po
new file mode 100644
index 00000000000..ebb0a661769
--- /dev/null
+++ b/addons/l10n_hn/i18n/es_PY.po
@@ -0,0 +1,44 @@
+# 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:15+0000\n"
+"PO-Revision-Date: 2011-03-21 16:23+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-22 06:23+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Plan contable general"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira."
diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po
new file mode 100644
index 00000000000..9d2e759a734
--- /dev/null
+++ b/addons/l10n_hn/i18n/fr.po
@@ -0,0 +1,50 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-12 06:36+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-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Plan comptable général"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"Génère le plan comptable depuis un modèle de charte. Vous serez amener à "
+"entrer le nom de la compagnie, le modèle de charte à suivre, le nombre de "
+"chiffres pour générer les codes de vos comptes et de votre compte bancaire, "
+"la devise pour créer les journaux. Ainsi, une exacte copie du modèle de "
+"charte sera générée.\r\n"
+"\tC'est le même assistant qui s'exécute depuis "
+"Finances/Configuration/Comptabilité Financière/Comptes Financiers/Générer le "
+"plan comptable depuis un modèle de charte."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Ajoute le plan comptable pour le Honduras. Il inclut aussi les taxes et le "
+"lempira (devise)."
diff --git a/addons/l10n_hn/i18n/gl.po b/addons/l10n_hn/i18n/gl.po
new file mode 100644
index 00000000000..0c718c8e4eb
--- /dev/null
+++ b/addons/l10n_hn/i18n/gl.po
@@ -0,0 +1,44 @@
+# 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-10-12 06:36+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Plan contable xeral"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"Xera-la nomenclatura contable a partires dun modelo. Deberá seleccionar unha "
+"compañía, o modelo que vai a empregar, o número de díxitos a empregar na "
+"nomenclatura e a moeda para crea-los diarios."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Agrega unha nomenclatura contable para Honduras. Tamén inclúe taxas e a "
+"moeda do Lempira."
diff --git a/addons/l10n_hn/i18n/hu.po b/addons/l10n_hn/i18n/hu.po
new file mode 100644
index 00000000000..8cb0490fdaa
--- /dev/null
+++ b/addons/l10n_hn/i18n/hu.po
@@ -0,0 +1,39 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-12 06:34+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-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr ""
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
diff --git a/addons/l10n_hn/i18n/it.po b/addons/l10n_hn/i18n/it.po
new file mode 100644
index 00000000000..b2cbae2b860
--- /dev/null
+++ b/addons/l10n_hn/i18n/it.po
@@ -0,0 +1,45 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-12 06:36+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Piano dei conti generale"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"Generare il piano dei conti da un modello. È necessario selezionare una "
+"società, il modello utilizzato, il numero di cifre da utilizzare per i "
+"decimali, la valuta per creare i giornali."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Aggiunge il piano dei conti per il Honduras. "
+"Include inoltre le tasse e la moneta Lempira"
diff --git a/addons/l10n_hn/i18n/l10n_hn.pot b/addons/l10n_hn/i18n/l10n_hn.pot
new file mode 100644
index 00000000000..ca694f03e88
--- /dev/null
+++ b/addons/l10n_hn/i18n/l10n_hn.pot
@@ -0,0 +1,32 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_hn
+#
+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:31+0000\n"
+"PO-Revision-Date: 2011-01-11 11:15:31+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_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr ""
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid "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."
+msgstr ""
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid "Agrega una nomenclatura contable para Honduras. También icluye impuestos y la moneda del Lempira. -- Adds accounting chart for Honduras.  It also includes taxes and the Lempira currency"
+msgstr ""
+
diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po
new file mode 100644
index 00000000000..85231507ac5
--- /dev/null
+++ b/addons/l10n_hn/i18n/pt_BR.po
@@ -0,0 +1,45 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-12 06:36+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Plan contable general"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
diff --git a/addons/l10n_hn/i18n/sr@latin.po b/addons/l10n_hn/i18n/sr@latin.po
new file mode 100644
index 00000000000..60d3fcb2dec
--- /dev/null
+++ b/addons/l10n_hn/i18n/sr@latin.po
@@ -0,0 +1,45 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-10-13 15:22+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: l10n_hn
+#: model:ir.module.module,shortdesc:l10n_hn.module_meta_information
+msgid "Honduras - Plan contable general"
+msgstr "Honduras - Plan contable general"
+
+#. module: l10n_hn
+#: model:ir.actions.todo,note:l10n_hn.config_call_account_template_hn_minimal
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#. module: l10n_hn
+#: model:ir.module.module,description:l10n_hn.module_meta_information
+msgid ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Adds accounting chart for Honduras.  It also "
+"includes taxes and the Lempira currency"
+msgstr ""
+"Agrega una nomenclatura contable para Honduras. También icluye impuestos y "
+"la moneda del Lempira. -- Dodaje računske tabele za Gvatemalu. Takođe "
+"uključuje porez i lempira valutu."
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
new file mode 100644
index 00000000000..e86409f62b1
--- /dev/null
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"/>
+            <field name="state">open</field>
+        </record>
+
+        <!-- Plantilla de cuentas -->
+
+        <record id="cuentas_plantilla" model="account.chart.template">
+            <field name="name">Plantilla de cuentas de Honduras (sencilla)</field>
+            <field name="account_root_id" ref="plan_raiz"/>
+            <field name="tax_code_root_id" ref="impuestos_raiz"/>
+            <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>
+
+        <!-- Compras e ISV por Cobrar -->
+
+        <record id="impuestos_plantilla_isv_por_cobrar" model="account.tax.template">
+            <field name="chart_template_id" ref="cuentas_plantilla"/>
+            <field name="name">ISV por Cobrar</field>
+	    <field name="amount" eval="0.12"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="cta110301"/>
+            <field name="account_paid_id" ref="cta110301"/>
+            <field name="base_code_id" ref="impuestos_base_isv_compras"/>
+            <field name="tax_code_id" ref="impuestos_isv_por_cobrar"/>
+            <field name="ref_base_code_id" ref="impuestos_base_isv_compras"/>
+            <field name="ref_tax_code_id" ref="impuestos_isv_por_cobrar"/>
+            <field name="type_tax_use">purchase</field>
+	    <field name="price_include" eval="True"/>
+        </record>
+
+        <!-- Ventas e ISV por Pagar -->
+
+        <record id="impuestos_plantilla_isv_por_pagar" model="account.tax.template">
+            <field name="chart_template_id" ref="cuentas_plantilla"/>
+            <field name="name">ISV por Pagar</field>
+            <field name="amount" eval="0.12"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="cta210201"/>
+            <field name="account_paid_id" ref="cta210201"/>
+            <field name="base_code_id" ref="impuestos_base_isv_ventas"/>
+            <field name="tax_code_id" ref="impuestos_isv_por_pagar"/>
+            <field name="ref_base_code_id" ref="impuestos_base_isv_ventas"/>
+            <field name="ref_tax_code_id" ref="impuestos_isv_por_pagar"/>
+            <field name="type_tax_use">sale</field>
+	   <field name="price_include" eval="True"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index ab99941c379..9aaec061319 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -29,7 +29,7 @@ Indian Accounting : Chart of Account.
 Indian accounting chart and localization.
     """,
     "author": ['OpenERP SA', 'Axelor'],
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "depends": [
         "account",
         "account_chart"
diff --git a/addons/l10n_in/i18n/br.po b/addons/l10n_in/i18n/br.po
index 84a3986c3b7..5e3184760b6 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0714e4c942d..e3b7285ac96 100644
--- a/addons/l10n_in/i18n/ca.po
+++ b/addons/l10n_in/i18n/ca.po
@@ -7,18 +7,18 @@ 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-13 02:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 15:28+0000\n"
+"PO-Revision-Date: 2011-08-17 21:35+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
-#. module: l10n_in
-#: model:ir.module.module,description:l10n_in.module_meta_information
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
 msgid ""
 "\n"
 "    Indian Accounting : chart of Account\n"
@@ -28,13 +28,18 @@ msgstr ""
 "    Comptabilitat Índia : Pla de comptes\n"
 "    "
 
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
-msgid "Indian Chart of Account"
-msgstr "Pla de comptes d'Índia"
+#. module: l10n_chart_in
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Error! No podeu crear plantilles de comptes recursius."
 
-#. module: l10n_in
-#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
+#. module: l10n_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr "Obertura de diari"
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
@@ -52,3 +57,43 @@ msgstr ""
 "\t Aquest és el mateix assistent que s'executa des de "
 "Comptabilitat/Configuració/Comptabilitat financera/Comptes financers/Genera "
 "pla comptable des d'una plantilla de pla comptable."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr "Passiu"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr "Actiu"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr "Tancat"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr "Ingressos"
+
+#. module: l10n_chart_in
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Error! No podeu crear codis d'impostos recursius."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr "Despeses"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr "Pla de comptes d'Índia"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr "Visualitza"
diff --git a/addons/l10n_in/i18n/de.po b/addons/l10n_in/i18n/de.po
index 45f4e4dd335..a8f004a00de 100644
--- a/addons/l10n_in/i18n/de.po
+++ b/addons/l10n_in/i18n/de.po
@@ -7,31 +7,36 @@ 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-19 18:59+0000\n"
-"Last-Translator: silas <Unknown>\n"
+"POT-Creation-Date: 2009-11-25 15:28+0000\n"
+"PO-Revision-Date: 2011-01-12 20:15+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-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
-#. module: l10n_in
-#: model:ir.module.module,description:l10n_in.module_meta_information
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
 msgid ""
 "\n"
 "    Indian Accounting : chart of Account\n"
 "    "
 msgstr ""
 
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
-msgid "Indian Chart of Account"
-msgstr "Indischer Kontenplan"
+#. module: l10n_chart_in
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
 
-#. module: l10n_in
-#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
+#. module: l10n_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
@@ -41,3 +46,43 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr ""
+
+#. module: l10n_chart_in
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr ""
diff --git a/addons/l10n_in/i18n/es.po b/addons/l10n_in/i18n/es.po
index 4da732bdc87..1399656727b 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es_MX.po b/addons/l10n_in/i18n/es_MX.po
new file mode 100644
index 00000000000..44b1bb9e181
--- /dev/null
+++ b/addons/l10n_in/i18n/es_MX.po
@@ -0,0 +1,99 @@
+# 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: 2009-11-25 15:28+0000\n"
+"PO-Revision-Date: 2011-01-10 14:00+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+msgid ""
+"\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Contabilidad India : Plan de cuentas\n"
+"    "
+
+#. module: l10n_chart_in
+#: 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_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr "Diario de apertura"
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"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ñía, 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."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr "Pasivo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_chart_in
+#: 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_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr "Plan de cuentas de la India"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_in/i18n/es_PY.po b/addons/l10n_in/i18n/es_PY.po
index bb11fc8b9e6..095e35631cf 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_in
 #: model:ir.module.module,description:l10n_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es_VE.po b/addons/l10n_in/i18n/es_VE.po
new file mode 100644
index 00000000000..44b1bb9e181
--- /dev/null
+++ b/addons/l10n_in/i18n/es_VE.po
@@ -0,0 +1,99 @@
+# 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: 2009-11-25 15:28+0000\n"
+"PO-Revision-Date: 2011-01-10 14:00+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+msgid ""
+"\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Contabilidad India : Plan de cuentas\n"
+"    "
+
+#. module: l10n_chart_in
+#: 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_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr "Diario de apertura"
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"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ñía, 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."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr "Pasivo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_chart_in
+#: 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_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr "Plan de cuentas de la India"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_in/i18n/et.po b/addons/l10n_in/i18n/et.po
index 8fa7ce66637..69c3535a26e 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3b5d68e3e2f..1b5024523a6 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 71ba1802893..ece04bedc88 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_in
 #: model:ir.module.module,description:l10n_in.module_meta_information
diff --git a/addons/l10n_in/i18n/hu.po b/addons/l10n_in/i18n/hu.po
index 2b64d2fffac..b1f1b8a4c18 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6eaf3574a65..ab7008bdda5 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: 2011-05-10 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..f52b722a33a
--- /dev/null
+++ b/addons/l10n_in/i18n/oc.po
@@ -0,0 +1,46 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-20 09:23+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: l10n_in
+#: model:ir.module.module,description:l10n_in.module_meta_information
+msgid ""
+"\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Comptabilitat indiana : plan de comptes\n"
+"    "
+
+#. module: l10n_in
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr "Plan comptable indian"
+
+#. module: l10n_in
+#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"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_in/i18n/pt.po b/addons/l10n_in/i18n/pt.po
index 57aa21ac7e9..6a37d9bae37 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4147fa73dc6..0c9c8bc1cc2 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bababc9a251..cf2b7c94889 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8774bdfd5e5..95e93d8aeee 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 25f3d16aa29..60ff6b28c9e 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 60b900e9335..17fc14fd299 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_in
 #: model:ir.module.module,description:l10n_in.module_meta_information
diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml
index f6851050604..0253756838c 100644
--- a/addons/l10n_in/l10n_in_chart.xml
+++ b/addons/l10n_in/l10n_in_chart.xml
@@ -37,11 +37,13 @@
         <record model="account.account.type" id="account_type_asset1">
             <field name="name">Asset</field>
             <field name="code">asset</field>
+            <field name="close_method">unreconciled</field>
             <field name="report_type">asset</field>
         </record>
         <record model="account.account.type" id="account_type_liability1">
             <field name="name">Liability</field>
             <field name="code">liability</field>
+            <field name="close_method">unreconciled</field>
             <field name="report_type">liability</field>
         </record>
         <record model="account.account.type" id="account_type_expense1">
diff --git a/addons/l10n_it/__init__.py b/addons/l10n_it/__init__.py
index 026004bfa0f..491d2cc7b66 100644
--- a/addons/l10n_it/__init__.py
+++ b/addons/l10n_it/__init__.py
@@ -1,13 +1,15 @@
-# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010
-#    Italian OpenERP Community (<http://www.openerp-italia.com>)
+#    OpenERP Italian Community (<http://www.openerp-italia.org>)
 #    Servabit srl
 #    Agile Business Group sagl
 #    Domsense srl
-#    Albatos srl      
+#    Albatos srl
+#
+#    Copyright (C) 2011
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -23,6 +25,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import libroIVA
-import report
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 41161f67a70..2c5811a6915 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -3,12 +3,15 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010
-#    Italian OpenERP Community (<http://www.openerp-italia.org>)
+#    OpenERP Italian Community (<http://www.openerp-italia.org>)
 #    Servabit srl
 #    Agile Business Group sagl
 #    Domsense srl
 #    Albatos srl
 #
+#    Copyright (C) 2011
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
 #    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,12 +39,9 @@ Piano dei conti italiano di un'impresa generica.
 Italian accounting chart and localization.
     """,
     "license": "AGPL-3",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     'website': 'http://www.openerp-italia.org/',
     'init_xml': [
-        'report.xml',
-        'libroIVA_view.xml',
-        'libroIVA_menu.xml',
         ],
     'update_xml': [
         'data/account.account.type.csv',
@@ -51,7 +51,6 @@ Italian accounting chart and localization.
         'data/account.tax.template.csv',
         'data/account.fiscal.position.template.csv',
         'l10n_chart_it_generic.xml',
-        'security/ir.model.access.csv',
         ],
     'demo_xml': [
         ],
diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv
index ff91ccba79a..a1db05a3da9 100644
--- a/addons/l10n_it/data/account.account.template.csv
+++ b/addons/l10n_it/data/account.account.template.csv
@@ -1,234 +1,235 @@
 "id","code","name","parent_id:id","user_type:id","type","reconcile"
-0,0,"Azienda",,"account_type_view","view",FALSE
-1,1,"ATTIVO ",0,"account_type_view","view",TRUE
-11,11,"IMMOBILIZZAZIONI IMMATERIALI ",1,"account_type_view","view",TRUE
-1101,1101,"costi di impianto ",11,"account_type_view","other",TRUE
-1106,1106,"software ",11,"account_type_view","other",TRUE
-1108,1108,"avviamento ",11,"account_type_view","other",TRUE
-1111,1111,"fondo ammortamento costi di impianto ",11,"account_type_view","other",TRUE
-1116,1116,"fondo ammortamento software ",11,"account_type_view","other",TRUE
-1118,1118,"fondo ammortamento avviamento ",11,"account_type_view","other",TRUE
-12,12,"IMMOBILIZZAZIONI MATERIALI ",1,"account_type_view","view",TRUE
-1201,1201,"fabbricati ",12,"account_type_view","other",TRUE
-1202,1202,"impianti e macchinari ",12,"account_type_view","other",TRUE
-1204,1204,"attrezzature commerciali ",12,"account_type_view","other",TRUE
-1205,1205,"macchine d'ufficio ",12,"account_type_view","other",TRUE
-1206,1206,"arredamento ",12,"account_type_view","other",TRUE
-1207,1207,"automezzi ",12,"account_type_view","other",TRUE
-1208,1208,"imballaggi durevoli ",12,"account_type_view","other",TRUE
-1211,1211,"fondo ammortamento fabbricati ",12,"account_type_view","other",TRUE
-1212,1212,"fondo ammortamento impianti e macchinari ",12,"account_type_view","other",TRUE
-1214,1214,"fondo ammortamento attrezzature commerciali ",12,"account_type_view","other",TRUE
-1215,1215,"fondo ammortamento macchine d'ufficio ",12,"account_type_view","other",TRUE
-1216,1216,"fondo ammortamento arredamento ",12,"account_type_view","other",TRUE
-1217,1217,"fondo ammortamento automezzi ",12,"account_type_view","other",TRUE
-1218,1218,"fondo ammortamento imballaggi durevoli ",12,"account_type_view","other",TRUE
-1220,1220,"fornitori immobilizzazioni c/acconti ",12,"account_type_view","other",TRUE
-13,13,"IMMOBILIZZAZIONI FINANZIARIE ",1,"account_type_view","view",TRUE
-1301,1301,"mutui attivi ",13,"account_type_view","other",TRUE
-14,14,"RIMANENZE ",1,"account_type_view","view",TRUE
-1401,1401,"materie di consumo ",14,"account_type_view","other",TRUE
-1404,1404,"merci ",14,"account_type_view","other",TRUE
-1410,1410,"fornitori c/acconti ",14,"account_type_view","other",TRUE
-15,15,"CREDITI COMMERCIALI ",1,"account_type_view","view",TRUE
-1501,1501,"crediti v/clienti ",15,"account_type_receivable","receivable",TRUE
-1502,1502,"crediti commerciali diversi ",15,"account_type_receivable","other",TRUE
-1503,1503,"clienti c/spese anticipate ",15,"account_type_receivable","receivable",TRUE
-1505,1505,"cambiali attive ",15,"account_type_receivable","other",TRUE
-1506,1506,"cambiali allo sconto ",15,"account_type_receivable","other",TRUE
-1507,1507,"cambiali all'incasso ",15,"account_type_receivable","other",TRUE
-1509,1509,"fatture da emettere ",15,"account_type_receivable","other",TRUE
-1510,1510,"crediti insoluti ",15,"account_type_receivable","other",TRUE
-1511,1511,"cambiali insolute ",15,"account_type_receivable","other",TRUE
-1531,1531,"crediti da liquidare ",15,"account_type_receivable","other",TRUE
-1540,1540,"fondo svalutazione crediti ",15,"account_type_receivable","other",TRUE
-1541,1541,"fondo rischi su crediti ",15,"account_type_receivable","other",TRUE
-16,16,"CREDITI DIVERSI ",1,"account_type_view","view",TRUE
-1601,1601,"IVA n/credito ",16,"account_type_receivable","other",TRUE
-1602,1602,"IVA c/acconto ",16,"account_type_receivable","other",TRUE
-1605,1605,"crediti per IVA ",16,"account_type_receivable","other",TRUE
-1607,1607,"imposte c/acconto ",16,"account_type_receivable","other",TRUE
-1608,1608,"crediti per imposte ",16,"account_type_receivable","other",TRUE
-1609,1609,"crediti per ritenute subite ",16,"account_type_receivable","other",TRUE
-1610,1610,"crediti per cauzioni ",16,"account_type_receivable","other",TRUE
-1620,1620,"personale c/acconti ",16,"account_type_receivable","other",TRUE
-1630,1630,"crediti v/istituti previdenziali ",16,"account_type_receivable","other",TRUE
-1640,1640,"debitori diversi ",16,"account_type_receivable","receivable",TRUE
-18,18,"DISPONIBILITÀ LIQUIDE ",1,"account_type_view","view",TRUE
-1801,1801,"banche c/c ",18,"account_type_bank","liquidity",TRUE
-1810,1810,"c/c postali ",18,"account_type_cash","liquidity",TRUE
-1820,1820,"denaro in cassa ",18,"account_type_cash","liquidity",TRUE
-1821,1821,"assegni ",18,"account_type_cash","liquidity",TRUE
-1822,1822,"valori bollati ",18,"account_type_cash","liquidity",TRUE
-19,19,"RATEI E RISCONTI ATTIVI ",1,"account_type_view","view",TRUE
-1901,1901,"ratei attivi ",19,"account_type_view","other",TRUE
-1902,1902,"risconti attivi ",19,"account_type_view","other",TRUE
-2,2,"PASSIVO ",0,"account_type_view","view",TRUE
-20,20,"PATRIMONIO NETTO ",2,"account_type_view","view",TRUE
-2101,2101,"patrimonio netto ",20,"account_type_view","other",TRUE
-2102,2102,"utile d'esercizio ",20,"account_type_view","receivable",TRUE
-2103,2103,"perdita d'esercizio ",20,"account_type_view","payable",TRUE
-2104,2104,"prelevamenti extra gestione ",20,"account_type_view","other",TRUE
-2105,2105,"titolare c/ritenute subite ",20,"account_type_view","other",TRUE
-22,22,"FONDI PER RISCHI E ONERI ",2,"account_type_view","view",TRUE
-2201,2201,"fondo per imposte ",22,"account_type_view","other",TRUE
-2204,2204,"fondo responsabilità civile ",22,"account_type_view","other",TRUE
-2205,2205,"fondo spese future ",22,"account_type_view","other",TRUE
-2211,2211,"fondo manutenzioni programmate ",22,"account_type_view","other",TRUE
-23,23,"TRATTAMENTO FINE RAPPORTO DI LAVORO ",2,"account_type_view","view",TRUE
-2301,2301,"debiti per TFRL ",23,"account_type_view","other",TRUE
-24,24,"DEBITI FINANZIARI ",2,"account_type_view","view",TRUE
-2410,2410,"mutui passivi ",24,"account_type_payable","other",TRUE
-2411,2411,"banche c/sovvenzioni ",24,"account_type_payable","other",TRUE
-2420,2420,"banche c/c passivi ",24,"account_type_payable","other",TRUE
-2421,2421,"banche c/RIBA all'incasso ",24,"account_type_payable","other",TRUE
-2422,2422,"banche c/cambiali all'incasso ",24,"account_type_payable","other",TRUE
-2423,2423,"banche c/anticipi su fatture ",24,"account_type_payable","other",TRUE
-2440,2440,"debiti v/altri finanziatori ",24,"account_type_payable","other",TRUE
-25,25,"DEBITI COMMERCIALI ",2,"account_type_view","view",TRUE
-2501,2501,"debiti v/fornitori ",25,"account_type_payable","payable",TRUE
-2503,2503,"cambiali passive ",25,"account_type_payable","other",TRUE
-2520,2520,"fatture da ricevere ",25,"account_type_payable","other",TRUE
-2521,2521,"debiti da liquidare ",25,"account_type_payable","other",TRUE
-2530,2530,"clienti c/acconti ",25,"account_type_payable","payable",TRUE
-26,26,"DEBITI DIVERSI ",2,"account_type_view","view",TRUE
-2601,2601,"IVA n/debito ",26,"account_type_payable","other",TRUE
-2602,2602,"debiti per ritenute da versare ",26,"account_type_payable","other",TRUE
-2605,2605,"erario c/IVA ",26,"account_type_payable","other",TRUE
-2606,2606,"debiti per imposte ",26,"account_type_payable","other",TRUE
-2619,2619,"debiti per cauzioni ",26,"account_type_payable","other",TRUE
-2620,2620,"personale c/retribuzioni ",26,"account_type_payable","other",TRUE
-2621,2621,"personale c/liquidazioni ",26,"account_type_payable","other",TRUE
-2622,2622,"clienti c/cessione ",26,"account_type_payable","other",TRUE
-2630,2630,"debiti v/istituti previdenziali ",26,"account_type_payable","other",TRUE
-2640,2640,"creditori diversi ",26,"account_type_payable","payable",TRUE
-27,27,"RATEI E RISCONTI PASSIVI ",2,"account_type_view","view",TRUE
-2701,2701,"ratei passivi ",27,"account_type_view","other",TRUE
-2702,2702,"risconti passivi ",27,"account_type_view","other",TRUE
-28,28,"CONTI TRANSITORI E DIVERSI ",2,"account_type_view","view",TRUE
-2801,2801,"bilancio di apertura ",28,"account_type_view","other",TRUE
-2802,2802,"bilancio di chiusura ",28,"account_type_view","other",TRUE
-2810,2810,"IVA c/liquidazioni ",28,"account_type_view","other",TRUE
-2811,2811,"istituti previdenziali ",28,"account_type_view","other",TRUE
-2820,2820,"banca ... c/c ",28,"account_type_view","other",TRUE
-2821,2821,"banca ... c/c ",28,"account_type_view","other",TRUE
-2822,2822,"banca ... c/c ",28,"account_type_view","other",TRUE
-29,29,"CONTI DEI SISTEMI SUPPLEMENTARI ",2,"account_type_view","view",TRUE
-2901,2901,"beni di terzi ",29,"account_type_view","other",TRUE
-2902,2902,"depositanti beni ",29,"account_type_view","other",TRUE
-2911,2911,"merci da ricevere ",29,"account_type_view","other",TRUE
-2912,2912,"fornitori c/impegni ",29,"account_type_view","other",TRUE
-2913,2913,"impegni per beni in leasing ",29,"account_type_view","other",TRUE
-2914,2914,"creditori c/leasing ",29,"account_type_view","other",TRUE
-2916,2916,"clienti c/impegni ",29,"account_type_view","other",TRUE
-2917,2917,"merci da consegnare ",29,"account_type_view","other",TRUE
-2921,2921,"rischi per effetti scontati ",29,"account_type_view","other",TRUE
-2922,2922,"banche c/effetti scontati ",29,"account_type_view","other",TRUE
-2926,2926,"rischi per fideiussioni ",29,"account_type_view","other",TRUE
-2927,2927,"creditori per fideiussioni ",29,"account_type_view","other",TRUE
-2931,2931,"rischi per avalli ",29,"account_type_view","other",TRUE
-2932,2932,"creditori per avalli ",29,"account_type_view","other",TRUE
-3,3,"VALORE DELLA PRODUZIONE ",0,"account_type_view","view",TRUE
-31,31,"VENDITE E PRESTAZIONI ",3,"account_type_view","view",TRUE
-3101,3101,"merci c/vendite ",31,"account_type_income","other",TRUE
-3103,3103,"rimborsi spese di vendita ",31,"account_type_income","other",TRUE
-3110,3110,"resi su vendite ",31,"account_type_income","other",TRUE
-3111,3111,"ribassi e abbuoni passivi ",31,"account_type_income","other",TRUE
-3112,3112,"premi su vendite ",31,"account_type_income","other",TRUE
-32,32,"RICAVI E PROVENTI DIVERSI ",3,"account_type_view","view",TRUE
-3201,3201,"fitti attivi ",32,"account_type_income","other",TRUE
-3202,3202,"proventi vari ",32,"account_type_income","other",TRUE
-3210,3210,"arrotondamenti attivi ",32,"account_type_income","other",TRUE
-3220,3220,"plusvalenze ordinarie diverse ",32,"account_type_income","other",TRUE
-3230,3230,"sopravvenienze attive ordinarie diverse ",32,"account_type_income","other",TRUE
-3240,3240,"insussistenze attive ordinarie diverse ",32,"account_type_income","other",TRUE
-4,4,"COSTI DELLA PRODUZIONE ",0,"account_type_view","view",TRUE
-41,41,"COSTO DEL VENDUTO ",4,"account_type_view","view",TRUE
-4101,4101,"merci c/acquisti ",41,"account_type_expense","other",TRUE
-4102,4102,"materie di consumo c/acquisti ",41,"account_type_expense","other",TRUE
-4105,4105,"merci c/apporti ",41,"account_type_expense","other",TRUE
-4110,4110,"resi su acquisti ",41,"account_type_expense","other",TRUE
-4111,4111,"ribassi e abbuoni attivi ",41,"account_type_expense","other",TRUE
-4112,4112,"premi su acquisti ",41,"account_type_expense","other",TRUE
-4121,4121,"merci c/esistenze iniziali ",41,"account_type_expense","other",TRUE
-4122,4122,"materie di consumo c/esistenze iniziali ",41,"account_type_expense","other",TRUE
-4131,4131,"merci c/rimanenze finali ",41,"account_type_expense","other",TRUE
-4132,4132,"materie di consumo c/rimanenze finali ",41,"account_type_expense","other",TRUE
-42,42,"COSTI PER SERVIZI ",4,"account_type_view","view",TRUE
-4201,4201,"costi di trasporto ",42,"account_type_expense","other",TRUE
-4202,4202,"costi per energia ",42,"account_type_expense","other",TRUE
-4203,4203,"costi di pubblicità ",42,"account_type_expense","other",TRUE
-4204,4204,"costi di consulenze ",42,"account_type_expense","other",TRUE
-4205,4205,"costi postali ",42,"account_type_expense","other",TRUE
-4206,4206,"costi telefonici ",42,"account_type_expense","other",TRUE
-4207,4207,"costi di assicurazione ",42,"account_type_expense","other",TRUE
-4208,4208,"costi di vigilanza ",42,"account_type_expense","other",TRUE
-4209,4209,"costi per i locali ",42,"account_type_expense","other",TRUE
-4210,4210,"costi di esercizio automezzi ",42,"account_type_expense","other",TRUE
-4211,4211,"costi di manutenzione e riparazione ",42,"account_type_expense","other",TRUE
-4212,4212,"provvigioni passive ",42,"account_type_expense","other",TRUE
-4213,4213,"spese di incasso ",42,"account_type_expense","other",TRUE
-43,43,"COSTI PER GODIMENTO BENI DI TERZI ",4,"account_type_view","view",TRUE
-4301,4301,"fitti passivi ",43,"account_type_expense","other",TRUE
-4302,4302,"canoni di leasing ",43,"account_type_expense","other",TRUE
-44,44,"COSTI PER IL PERSONALE ",4,"account_type_view","view",TRUE
-4401,4401,"salari e stipendi ",44,"account_type_expense","other",TRUE
-4402,4402,"oneri sociali ",44,"account_type_expense","other",TRUE
-4403,4403,"TFRL ",44,"account_type_expense","other",TRUE
-4404,4404,"altri costi per il personale ",44,"account_type_expense","other",TRUE
-45,45,"AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ",4,"account_type_view","view",TRUE
-4501,4501,"ammortamento costi di impianto ",45,"account_type_view","other",TRUE
-4506,4506,"ammortamento software ",45,"account_type_view","other",TRUE
-4508,4508,"ammortamento avviamento ",45,"account_type_view","other",TRUE
-46,46,"AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ",4,"account_type_view","view",TRUE
-4601,4601,"ammortamento fabbricati ",46,"account_type_view","other",TRUE
-4602,4602,"ammortamento impianti e macchinari ",46,"account_type_view","other",TRUE
-4604,4604,"ammortamento attrezzature commerciali ",46,"account_type_view","other",TRUE
-4605,4605,"ammortamento macchine d'ufficio ",46,"account_type_view","other",TRUE
-4606,4606,"ammortamento arredamento ",46,"account_type_view","other",TRUE
-4607,4607,"ammortamento automezzi ",46,"account_type_view","other",TRUE
-4608,4608,"ammortamento imballaggi durevoli ",46,"account_type_view","other",TRUE
-47,47,"SVALUTAZIONI ",4,"account_type_view","view",TRUE
-4701,4701,"svalutazioni immobilizzazioni immateriali ",47,"account_type_view","other",TRUE
-4702,4702,"svalutazioni immobilizzazioni materiali ",47,"account_type_view","other",TRUE
-4706,4706,"svalutazione crediti ",47,"account_type_view","other",TRUE
-48,48,"ACCANTONAMENTI ",4,"account_type_view","view",TRUE
-481,481,"ACCANTONAMENTI PER RISCHI ",48,"account_type_view","view",TRUE
-4814,4814,"accantonamento per responsabilità civile ",481,"account_type_view","other",TRUE
-482,482,"ALTRI ACCANTONAMENTI ",48,"account_type_view","view",TRUE
-4821,4821,"accantonamento per spese future ",482,"account_type_view","other",TRUE
-4823,4823,"accantonamento per manutenzioni programmate ",482,"account_type_view","other",TRUE
-49,49,"ONERI DIVERSI ",4,"account_type_view","view",TRUE
-4901,4901,"oneri fiscali diversi ",49,"account_type_view","other",TRUE
-4903,4903,"oneri vari ",49,"account_type_view","other",TRUE
-4905,4905,"perdite su crediti ",49,"account_type_view","other",TRUE
-4910,4910,"arrotondamenti passivi ",49,"account_type_view","other",TRUE
-4920,4920,"minusvalenze ordinarie diverse ",49,"account_type_view","other",TRUE
-4930,4930,"sopravvenienze passive ordinarie diverse ",49,"account_type_view","other",TRUE
-4940,4940,"insussistenze passive ordinarie diverse ",49,"account_type_view","other",TRUE
-5,5,"PROVENTI E ONERI FINANZIARI ",0,"account_type_view","view",TRUE
-51,51,"PROVENTI FINANZIARI ",5,"account_type_view","view",TRUE
-5110,5110,"interessi attivi v/clienti ",51,"account_type_view","other",TRUE
-5115,5115,"interessi attivi bancari ",51,"account_type_view","other",TRUE
-5116,5116,"interessi attivi postali ",51,"account_type_view","other",TRUE
-5140,5140,"proventi finanziari diversi ",51,"account_type_view","other",TRUE
-52,52,"ONERI FINANZIARI ",5,"account_type_view","view",TRUE
-5201,5201,"interessi passivi v/fornitori ",52,"account_type_view","other",TRUE
-5202,5202,"interessi passivi bancari ",52,"account_type_view","other",TRUE
-5203,5203,"sconti passivi bancari ",52,"account_type_view","other",TRUE
-5210,5210,"interessi passivi su mutui ",52,"account_type_view","other",TRUE
-5240,5240,"oneri finanziari diversi ",52,"account_type_view","other",TRUE
-7,7,"PROVENTI E ONERI STRAORDINARI ",0,"account_type_view","view",TRUE
-71,71,"PROVENTI STRAORDINARI ",7,"account_type_view","view",TRUE
-7101,7101,"plusvalenze straordinarie ",71,"account_type_view","other",TRUE
-7102,7102,"sopravvenienze attive straordinarie ",71,"account_type_view","other",TRUE
-7103,7103,"insussistenze attive straordinarie ",71,"account_type_view","other",TRUE
-72,72,"ONERI STRAORDINARI ",7,"account_type_view","view",TRUE
-7201,7201,"minusvalenze straordinarie ",72,"account_type_view","other",TRUE
-7202,7202,"sopravvenienze passive straordinarie ",72,"account_type_view","other",TRUE
-7203,7203,"insussistenze passive straordinarie ",72,"account_type_view","other",TRUE
-7204,7204,"imposte esercizi precedenti ",72,"account_type_view","other",TRUE
-81,81,"IMPOSTE DELL'ESERCIZIO ",7,"account_type_view","view",TRUE
-8101,8101,"imposte dell'esercizio ",81,"account_type_view","other",TRUE
-91,91,"CONTI DI RISULTATO ",7,"account_type_view","view",TRUE
-9101,9101,"conto di risultato economico ",91,"account_type_view","other",TRUE
+"0","0","Azienda",,"account_type_view","view","FALSE"
+"1","1","ATTIVO ","0","account_type_view","view","TRUE"
+"11","11","IMMOBILIZZAZIONI IMMATERIALI ","1","account_type_view","view","TRUE"
+"1101","1101","costi di impianto ","11","account_type_asset","other","TRUE"
+"1106","1106","software ","11","account_type_asset","other","TRUE"
+"1108","1108","avviamento ","11","account_type_asset","other","TRUE"
+"1111","1111","fondo ammortamento costi di impianto ","11","account_type_asset","other","TRUE"
+"1116","1116","fondo ammortamento software ","11","account_type_asset","other","TRUE"
+"1118","1118","fondo ammortamento avviamento ","11","account_type_asset","other","TRUE"
+"12","12","IMMOBILIZZAZIONI MATERIALI ","1","account_type_view","view","TRUE"
+"1201","1201","fabbricati ","12","account_type_asset","other","TRUE"
+"1202","1202","impianti e macchinari ","12","account_type_asset","other","TRUE"
+"1204","1204","attrezzature commerciali ","12","account_type_asset","other","TRUE"
+"1205","1205","macchine d'ufficio ","12","account_type_asset","other","TRUE"
+"1206","1206","arredamento ","12","account_type_asset","other","TRUE"
+"1207","1207","automezzi ","12","account_type_asset","other","TRUE"
+"1208","1208","imballaggi durevoli ","12","account_type_asset","other","TRUE"
+"1211","1211","fondo ammortamento fabbricati ","12","account_type_asset","other","TRUE"
+"1212","1212","fondo ammortamento impianti e macchinari ","12","account_type_asset","other","TRUE"
+"1214","1214","fondo ammortamento attrezzature commerciali ","12","account_type_asset","other","TRUE"
+"1215","1215","fondo ammortamento macchine d'ufficio ","12","account_type_asset","other","TRUE"
+"1216","1216","fondo ammortamento arredamento ","12","account_type_asset","other","TRUE"
+"1217","1217","fondo ammortamento automezzi ","12","account_type_asset","other","TRUE"
+"1218","1218","fondo ammortamento imballaggi durevoli ","12","account_type_asset","other","TRUE"
+"1220","1220","fornitori immobilizzazioni c/acconti ","12","account_type_asset","other","TRUE"
+"13","13","IMMOBILIZZAZIONI FINANZIARIE ","1","account_type_view","view","TRUE"
+"1301","1301","mutui attivi ","13","account_type_asset","other","TRUE"
+"14","14","RIMANENZE ","1","account_type_view","view","TRUE"
+"1401","1401","materie di consumo ","14","account_type_asset","other","TRUE"
+"1404","1404","merci ","14","account_type_asset","other","TRUE"
+"1410","1410","fornitori c/acconti ","14","account_type_asset","other","TRUE"
+"15","15","CREDITI COMMERCIALI ","1","account_type_view","view","TRUE"
+"1501","1501","crediti v/clienti ","15","account_type_receivable","receivable","TRUE"
+"1502","1502","crediti commerciali diversi ","15","account_type_receivable","other","TRUE"
+"1503","1503","clienti c/spese anticipate ","15","account_type_receivable","receivable","TRUE"
+"1505","1505","cambiali attive ","15","account_type_receivable","other","TRUE"
+"1506","1506","cambiali allo sconto ","15","account_type_receivable","other","TRUE"
+"1507","1507","cambiali all'incasso ","15","account_type_receivable","other","TRUE"
+"1509","1509","fatture da emettere ","15","account_type_receivable","other","TRUE"
+"1510","1510","crediti insoluti ","15","account_type_receivable","other","TRUE"
+"1511","1511","cambiali insolute ","15","account_type_receivable","other","TRUE"
+"1531","1531","crediti da liquidare ","15","account_type_receivable","other","TRUE"
+"1540","1540","fondo svalutazione crediti ","15","account_type_receivable","other","TRUE"
+"1541","1541","fondo rischi su crediti ","15","account_type_receivable","other","TRUE"
+"16","16","CREDITI DIVERSI ","1","account_type_view","view","TRUE"
+"1601","1601","IVA n/credito ","16","account_type_tax","other","TRUE"
+"1602","1602","IVA c/acconto ","16","account_type_tax","other","TRUE"
+"1605","1605","crediti per IVA ","16","account_type_tax","other","TRUE"
+"1607","1607","imposte c/acconto ","16","account_type_tax","other","TRUE"
+"1608","1608","crediti per imposte ","16","account_type_tax","other","TRUE"
+"1609","1609","crediti per ritenute subite ","16","account_type_asset","other","TRUE"
+"1610","1610","crediti per cauzioni ","16","account_type_asset","other","TRUE"
+"1620","1620","personale c/acconti ","16","account_type_asset","other","TRUE"
+"1630","1630","crediti v/istituti previdenziali ","16","account_type_asset","other","TRUE"
+"1640","1640","debitori diversi ","16","account_type_receivable","receivable","TRUE"
+"18","18","DISPONIBILITÀ LIQUIDE ","1","account_type_view","view","TRUE"
+"1801","1801","banche c/c ","18","account_type_bank","liquidity","TRUE"
+"1810","1810","c/c postali ","18","account_type_cash","liquidity","TRUE"
+"1820","1820","denaro in cassa ","18","account_type_cash","liquidity","TRUE"
+"1821","1821","assegni ","18","account_type_cash","liquidity","TRUE"
+"1822","1822","valori bollati ","18","account_type_cash","liquidity","TRUE"
+"19","19","RATEI E RISCONTI ATTIVI ","1","account_type_view","view","TRUE"
+"1901","1901","ratei attivi ","19","account_type_asset","other","TRUE"
+"1902","1902","risconti attivi ","19","account_type_asset","other","TRUE"
+"2","2","PASSIVO ","0","account_type_view","view","TRUE"
+"20","20","PATRIMONIO NETTO ","2","account_type_view","view","TRUE"
+"2101","2101","patrimonio netto ","20","account_type_asset","other","TRUE"
+"2102","2102","utile d'esercizio ","20","account_type_asset","other","TRUE"
+"2103","2103","perdita d'esercizio ","20","account_type_asset","other","TRUE"
+"2104","2104","prelevamenti extra gestione ","20","account_type_asset","other","TRUE"
+"2105","2105","titolare c/ritenute subite ","20","account_type_asset","other","TRUE"
+"22","22","FONDI PER RISCHI E ONERI ","2","account_type_view","view","TRUE"
+"2201","2201","fondo per imposte ","22","account_type_asset","other","TRUE"
+"2204","2204","fondo responsabilità civile ","22","account_type_asset","other","TRUE"
+"2205","2205","fondo spese future ","22","account_type_asset","other","TRUE"
+"2211","2211","fondo manutenzioni programmate ","22","account_type_asset","other","TRUE"
+"23","23","TRATTAMENTO FINE RAPPORTO DI LAVORO ","2","account_type_view","view","TRUE"
+"2301","2301","debiti per TFRL ","23","account_type_asset","other","TRUE"
+"24","24","DEBITI FINANZIARI ","2","account_type_view","view","TRUE"
+"2410","2410","mutui passivi ","24","account_type_asset","other","TRUE"
+"2411","2411","banche c/sovvenzioni ","24","account_type_asset","other","TRUE"
+"2420","2420","banche c/c passivi ","24","account_type_asset","other","TRUE"
+"2421","2421","banche c/RIBA all'incasso ","24","account_type_asset","other","TRUE"
+"2422","2422","banche c/cambiali all'incasso ","24","account_type_asset","other","TRUE"
+"2423","2423","banche c/anticipi su fatture ","24","account_type_asset","other","TRUE"
+"2440","2440","debiti v/altri finanziatori ","24","account_type_asset","other","TRUE"
+"25","25","DEBITI COMMERCIALI ","2","account_type_view","view","TRUE"
+"2501","2501","debiti v/fornitori ","25","account_type_payable","payable","TRUE"
+"2503","2503","cambiali passive ","25","account_type_asset","other","TRUE"
+"2520","2520","fatture da ricevere ","25","account_type_asset","other","TRUE"
+"2521","2521","debiti da liquidare ","25","account_type_asset","other","TRUE"
+"2530","2530","clienti c/acconti ","25","account_type_payable","payable","TRUE"
+"26","26","DEBITI DIVERSI ","2","account_type_view","view","TRUE"
+"2601","2601","IVA n/debito ","26","account_type_tax","other","TRUE"
+"2602","2602","debiti per ritenute da versare ","26","account_type_tax","other","TRUE"
+"2605","2605","erario c/IVA ","26","account_type_tax","other","TRUE"
+"2606","2606","debiti per imposte ","26","account_type_tax","other","TRUE"
+"2619","2619","debiti per cauzioni ","26","account_type_asset","other","TRUE"
+"2620","2620","personale c/retribuzioni ","26","account_type_asset","other","TRUE"
+"2621","2621","personale c/liquidazioni ","26","account_type_asset","other","TRUE"
+"2622","2622","clienti c/cessione ","26","account_type_asset","other","TRUE"
+"2630","2630","debiti v/istituti previdenziali ","26","account_type_asset","other","TRUE"
+"2640","2640","creditori diversi ","26","account_type_payable","payable","TRUE"
+"27","27","RATEI E RISCONTI PASSIVI ","2","account_type_view","view","TRUE"
+"2701","2701","ratei passivi ","27","account_type_asset","other","TRUE"
+"2702","2702","risconti passivi ","27","account_type_asset","other","TRUE"
+"28","28","CONTI TRANSITORI E DIVERSI ","2","account_type_view","view","TRUE"
+"2801","2801","bilancio di apertura ","28","account_type_asset","other","TRUE"
+"2802","2802","bilancio di chiusura ","28","account_type_asset","other","TRUE"
+"2810","2810","IVA c/liquidazioni ","28","account_type_asset","other","TRUE"
+"2811","2811","istituti previdenziali ","28","account_type_asset","other","TRUE"
+"2820","2820","banca ... c/c ","28","account_type_asset","other","TRUE"
+"2821","2821","banca ... c/c ","28","account_type_asset","other","TRUE"
+"2822","2822","banca ... c/c ","28","account_type_asset","other","TRUE"
+"29","29","CONTI DEI SISTEMI SUPPLEMENTARI ","2","account_type_view","view","TRUE"
+"2901","2901","beni di terzi ","29","account_type_asset","other","TRUE"
+"2902","2902","depositanti beni ","29","account_type_asset","other","TRUE"
+"2911","2911","merci da ricevere ","29","account_type_asset","other","TRUE"
+"2912","2912","fornitori c/impegni ","29","account_type_asset","other","TRUE"
+"2913","2913","impegni per beni in leasing ","29","account_type_asset","other","TRUE"
+"2914","2914","creditori c/leasing ","29","account_type_asset","other","TRUE"
+"2916","2916","clienti c/impegni ","29","account_type_asset","other","TRUE"
+"2917","2917","merci da consegnare ","29","account_type_asset","other","TRUE"
+"2921","2921","rischi per effetti scontati ","29","account_type_asset","other","TRUE"
+"2922","2922","banche c/effetti scontati ","29","account_type_asset","other","TRUE"
+"2926","2926","rischi per fideiussioni ","29","account_type_asset","other","TRUE"
+"2927","2927","creditori per fideiussioni ","29","account_type_asset","other","TRUE"
+"2931","2931","rischi per avalli ","29","account_type_asset","other","TRUE"
+"2932","2932","creditori per avalli ","29","account_type_asset","other","TRUE"
+"3","3","VALORE DELLA PRODUZIONE ","0","account_type_view","view","TRUE"
+"31","31","VENDITE E PRESTAZIONI ","3","account_type_view","view","TRUE"
+"3101","3101","merci c/vendite ","31","account_type_income","other","TRUE"
+"3103","3103","rimborsi spese di vendita ","31","account_type_income","other","TRUE"
+"3110","3110","resi su vendite ","31","account_type_income","other","TRUE"
+"3111","3111","ribassi e abbuoni passivi ","31","account_type_income","other","TRUE"
+"3112","3112","premi su vendite ","31","account_type_income","other","TRUE"
+"32","32","RICAVI E PROVENTI DIVERSI ","3","account_type_view","view","TRUE"
+"3201","3201","fitti attivi ","32","account_type_income","other","TRUE"
+"3202","3202","proventi vari ","32","account_type_income","other","TRUE"
+"3210","3210","arrotondamenti attivi ","32","account_type_income","other","TRUE"
+"3220","3220","plusvalenze ordinarie diverse ","32","account_type_income","other","TRUE"
+"3230","3230","sopravvenienze attive ordinarie diverse ","32","account_type_income","other","TRUE"
+"3240","3240","insussistenze attive ordinarie diverse ","32","account_type_income","other","TRUE"
+"4","4","COSTI DELLA PRODUZIONE ","0","account_type_view","view","TRUE"
+"41","41","COSTO DEL VENDUTO ","4","account_type_view","view","TRUE"
+"4101","4101","merci c/acquisti ","41","account_type_expense","other","TRUE"
+"4102","4102","materie di consumo c/acquisti ","41","account_type_expense","other","TRUE"
+"4105","4105","merci c/apporti ","41","account_type_expense","other","TRUE"
+"4110","4110","resi su acquisti ","41","account_type_expense","other","TRUE"
+"4111","4111","ribassi e abbuoni attivi ","41","account_type_expense","other","TRUE"
+"4112","4112","premi su acquisti ","41","account_type_expense","other","TRUE"
+"4121","4121","merci c/esistenze iniziali ","41","account_type_expense","other","TRUE"
+"4122","4122","materie di consumo c/esistenze iniziali ","41","account_type_expense","other","TRUE"
+"4131","4131","merci c/rimanenze finali ","41","account_type_expense","other","TRUE"
+"4132","4132","materie di consumo c/rimanenze finali ","41","account_type_expense","other","TRUE"
+"42","42","COSTI PER SERVIZI ","4","account_type_view","view","TRUE"
+"4201","4201","costi di trasporto ","42","account_type_expense","other","TRUE"
+"4202","4202","costi per energia ","42","account_type_expense","other","TRUE"
+"4203","4203","costi di pubblicità ","42","account_type_expense","other","TRUE"
+"4204","4204","costi di consulenze ","42","account_type_expense","other","TRUE"
+"4205","4205","costi postali ","42","account_type_expense","other","TRUE"
+"4206","4206","costi telefonici ","42","account_type_expense","other","TRUE"
+"4207","4207","costi di assicurazione ","42","account_type_expense","other","TRUE"
+"4208","4208","costi di vigilanza ","42","account_type_expense","other","TRUE"
+"4209","4209","costi per i locali ","42","account_type_expense","other","TRUE"
+"4210","4210","costi di esercizio automezzi ","42","account_type_expense","other","TRUE"
+"4211","4211","costi di manutenzione e riparazione ","42","account_type_expense","other","TRUE"
+"4212","4212","provvigioni passive ","42","account_type_expense","other","TRUE"
+"4213","4213","spese di incasso ","42","account_type_expense","other","TRUE"
+"43","43","COSTI PER GODIMENTO BENI DI TERZI ","4","account_type_view","view","TRUE"
+"4301","4301","fitti passivi ","43","account_type_expense","other","TRUE"
+"4302","4302","canoni di leasing ","43","account_type_expense","other","TRUE"
+"44","44","COSTI PER IL PERSONALE ","4","account_type_view","view","TRUE"
+"4401","4401","salari e stipendi ","44","account_type_expense","other","TRUE"
+"4402","4402","oneri sociali ","44","account_type_expense","other","TRUE"
+"4403","4403","TFRL ","44","account_type_expense","other","TRUE"
+"4404","4404","altri costi per il personale ","44","account_type_expense","other","TRUE"
+"45","45","AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ","4","account_type_view","view","TRUE"
+"4501","4501","ammortamento costi di impianto ","45","account_type_p_l","other","TRUE"
+"4506","4506","ammortamento software ","45","account_type_p_l","other","TRUE"
+"4508","4508","ammortamento avviamento ","45","account_type_p_l","other","TRUE"
+"46","46","AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ","4","account_type_view","view","TRUE"
+"4601","4601","ammortamento fabbricati ","46","account_type_p_l","other","TRUE"
+"4602","4602","ammortamento impianti e macchinari ","46","account_type_p_l","other","TRUE"
+"4604","4604","ammortamento attrezzature commerciali ","46","account_type_p_l","other","TRUE"
+"4605","4605","ammortamento macchine d'ufficio ","46","account_type_p_l","other","TRUE"
+"4606","4606","ammortamento arredamento ","46","account_type_p_l","other","TRUE"
+"4607","4607","ammortamento automezzi ","46","account_type_p_l","other","TRUE"
+"4608","4608","ammortamento imballaggi durevoli ","46","account_type_p_l","other","TRUE"
+"47","47","SVALUTAZIONI ","4","account_type_view","view","TRUE"
+"4701","4701","svalutazioni immobilizzazioni immateriali ","47","account_type_p_l","other","TRUE"
+"4702","4702","svalutazioni immobilizzazioni materiali ","47","account_type_p_l","other","TRUE"
+"4706","4706","svalutazione crediti ","47","account_type_p_l","other","TRUE"
+"48","48","ACCANTONAMENTI ","4","account_type_view","view","TRUE"
+"481","481","ACCANTONAMENTI PER RISCHI ","48","account_type_view","view","TRUE"
+"4814","4814","accantonamento per responsabilità civile ","481","account_type_p_l","other","TRUE"
+"482","482","ALTRI ACCANTONAMENTI ","48","account_type_view","view","TRUE"
+"4821","4821","accantonamento per spese future ","482","account_type_p_l","other","TRUE"
+"4823","4823","accantonamento per manutenzioni programmate ","482","account_type_p_l","other","TRUE"
+"49","49","ONERI DIVERSI ","4","account_type_view","view","TRUE"
+"4901","4901","oneri fiscali diversi ","49","account_type_p_l","other","TRUE"
+"4903","4903","oneri vari ","49","account_type_p_l","other","TRUE"
+"4905","4905","perdite su crediti ","49","account_type_p_l","other","TRUE"
+"4910","4910","arrotondamenti passivi ","49","account_type_p_l","other","TRUE"
+"4920","4920","minusvalenze ordinarie diverse ","49","account_type_p_l","other","TRUE"
+"4930","4930","sopravvenienze passive ordinarie diverse ","49","account_type_p_l","other","TRUE"
+"4940","4940","insussistenze passive ordinarie diverse ","49","account_type_p_l","other","TRUE"
+"5","5","PROVENTI E ONERI FINANZIARI ","0","account_type_view","view","TRUE"
+"51","51","PROVENTI FINANZIARI ","5","account_type_view","view","TRUE"
+"5110","5110","interessi attivi v/clienti ","51","account_type_p_l","other","TRUE"
+"5115","5115","interessi attivi bancari ","51","account_type_p_l","other","TRUE"
+"5116","5116","interessi attivi postali ","51","account_type_p_l","other","TRUE"
+"5140","5140","proventi finanziari diversi ","51","account_type_p_l","other","TRUE"
+"52","52","ONERI FINANZIARI ","5","account_type_view","view","TRUE"
+"5201","5201","interessi passivi v/fornitori ","52","account_type_p_l","other","TRUE"
+"5202","5202","interessi passivi bancari ","52","account_type_p_l","other","TRUE"
+"5203","5203","sconti passivi bancari ","52","account_type_p_l","other","TRUE"
+"5210","5210","interessi passivi su mutui ","52","account_type_p_l","other","TRUE"
+"5240","5240","oneri finanziari diversi ","52","account_type_p_l","other","TRUE"
+"7","7","PROVENTI E ONERI STRAORDINARI ","0","account_type_view","view","TRUE"
+"71","71","PROVENTI STRAORDINARI ","7","account_type_view","view","TRUE"
+"7101","7101","plusvalenze straordinarie ","71","account_type_p_l","other","TRUE"
+"7102","7102","sopravvenienze attive straordinarie ","71","account_type_p_l","other","TRUE"
+"7103","7103","insussistenze attive straordinarie ","71","account_type_p_l","other","TRUE"
+"72","72","ONERI STRAORDINARI ","7","account_type_view","view","TRUE"
+"7201","7201","minusvalenze straordinarie ","72","account_type_p_l","other","TRUE"
+"7202","7202","sopravvenienze passive straordinarie ","72","account_type_p_l","other","TRUE"
+"7203","7203","insussistenze passive straordinarie ","72","account_type_p_l","other","TRUE"
+"7204","7204","imposte esercizi precedenti ","72","account_type_p_l","other","TRUE"
+"8","8","IMPOSTE DELL'ESERCIZIO ","0","account_type_view","view","TRUE"
+"8101","8101","imposte dell'esercizio ","8","account_type_p_l","other","TRUE"
+"9","9","CONTI DI RISULTATO ","0","account_type_view","view","TRUE"
+"9101","9101","conto di risultato economico ","9","account_type_p_l","other","TRUE"
+"9102","9102","stato patrimoniale","9","account_type_p_l","other","TRUE"
diff --git a/addons/l10n_it/data/account.account.type.csv b/addons/l10n_it/data/account.account.type.csv
index 273ff71eb05..36eeebbbe89 100644
--- a/addons/l10n_it/data/account.account.type.csv
+++ b/addons/l10n_it/data/account.account.type.csv
@@ -1,11 +1,11 @@
 "id","code","name","close_method","report_type"
-"account_type_receivable","receivable","Debiti","unreconciled","liability"
-"account_type_payable","payable","Crediti","unreconciled","asset"
+"account_type_receivable","receivable","Crediti","unreconciled","asset"
+"account_type_payable","payable","Debiti","unreconciled","liability"
 "account_type_view","view","Gerarchia","none",
 "account_type_income","income","Entrate","none","income"
 "account_type_expense","expense","Uscite","none","expense"
-"account_type_tax","tax","Tasse","none",
+"account_type_tax","tax","Tasse","balance",
 "account_type_cash","cash","Liquidità","balance","asset"
-"account_type_asset","asset","Beni","none","asset"
+"account_type_asset","asset","Beni","balance","asset"
 "account_type_bank","bank","Banca","balance","asset"
-"account_type_equity","equity","Capitale","none","asset"
+"account_type_p_l","p_l","Conto Economico","none",
diff --git a/addons/l10n_it/data/account.tax.code.template.csv b/addons/l10n_it/data/account.tax.code.template.csv
index 288f169f4ab..40f0545aff9 100644
--- a/addons/l10n_it/data/account.tax.code.template.csv
+++ b/addons/l10n_it/data/account.tax.code.template.csv
@@ -26,6 +26,8 @@
 "IVC4Idet50","template_impcode_pagata_4det50","IVA a credito 4% detraibile 50% (imponibile)","template_impcode_pagata"
 "IVC20","template_ivacode_pagata_20","IVA a credito 20%","template_ivacode_pagata"
 "IVC20I","template_impcode_pagata_20","IVA a credito 20% (imponibile)","template_impcode_pagata"
+"IVC21","template_ivacode_pagata_21","IVA a credito 21%","template_ivacode_pagata"
+"IVC21I","template_impcode_pagata_21","IVA a credito 21% (imponibile)","template_impcode_pagata"
 "IVC4","template_ivacode_pagata_4","IVA  a credito 4%","template_ivacode_pagata"
 "IVC4I","template_impcode_pagata_4","IVA  a credito 4% (imponibile)","template_impcode_pagata"
 "IVC12","template_ivacode_pagata_12","IVA  a credito 12%","template_ivacode_pagata"
@@ -40,9 +42,21 @@
 "IVD10I","template_impcode_riscossa_10","IVA a debito 10% (imponibile)","template_impcode_riscossa"
 "IVD20","template_ivacode_riscossa_20","IVA a debito 20%","template_ivacode_riscossa"
 "IVD20I","template_impcode_riscossa_20","IVA a debito 20% (imponibile)","template_impcode_riscossa"
+"IVD21","template_ivacode_riscossa_21","IVA a debito 21%","template_ivacode_riscossa"
+"IVD21I","template_impcode_riscossa_21","IVA a debito 21% (imponibile)","template_impcode_riscossa"
 "IVD4","template_ivacode_riscossa_4","IVA  a debito 4%","template_ivacode_riscossa"
 "IVD4I","template_impcode_riscossa_4","IVA  a debito 4% (imponibile)","template_impcode_riscossa"
 "IVD12","template_ivacode_riscossa_12","IVA  a debito 12%","template_ivacode_riscossa"
 "IVD12I","template_impcode_riscossa_12","IVA  a debito 12% (imponibile)","template_impcode_riscossa"
 "IVD2","template_ivacode_riscossa_2","IVA  a debito 2%","template_ivacode_riscossa"
 "IVD2I","template_impcode_riscossa_2","IVA  a debito 2% (imponibile)","template_impcode_riscossa"
+"IVC21ind","template_ivacode_pagata_21ind","IVA a credito 21% indetraibile","template_ivacode_pagata"
+"IVC21Iind","template_impcode_pagata_21ind","IVA a credito 21% indetraibile (imponibile)","template_impcode_pagata"
+"IVC21det10","template_ivacode_pagata_21det10","IVA a credito 21% detraibile 10%","template_ivacode_pagata"
+"IVC21Idet10","template_impcode_pagata_21det10","IVA a credito 21% detraibile 10% (imponibile)","template_impcode_pagata"
+"IVC21det15","template_ivacode_pagata_21det15","IVA a credito 21% detraibile 15%","template_ivacode_pagata"
+"IVC21Idet15","template_impcode_pagata_21det15","IVA a credito 21% detraibile 15% (imponibile)","template_impcode_pagata"
+"IVC21det40","template_ivacode_pagata_21det40","IVA a credito 21% detraibile 40%","template_ivacode_pagata"
+"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"
diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv
index cf9caeeb0d4..641f495dd72 100644
--- a/addons/l10n_it/data/account.tax.template.csv
+++ b/addons/l10n_it/data/account.tax.template.csv
@@ -1,40 +1,64 @@
-"id","description","chart_template_id:id","name","amount","parent_id:id","child_depend","type","account_collected_id:id","account_paid_id:id","type_tax_use","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id"
-"20a","20a","l10n_it_chart_template_generic","Iva al 20% (debito)","0.2",,"False","percent","2601","2601","sale","template_impcode_riscossa_20","template_ivacode_riscossa_20","template_impcode_riscossa_20","template_ivacode_riscossa_20"
-"20b","20b","l10n_it_chart_template_generic","Iva al 20% (credito)","0.2",,"False","percent","1601","1601","purchase","template_impcode_pagata_20","template_ivacode_pagata_20","template_impcode_pagata_20","template_ivacode_pagata_20"
-"10a","10a","l10n_it_chart_template_generic","Iva al 10% (debito)","0.1",,"False","percent","2601","2601","sale","template_impcode_riscossa_10","template_ivacode_riscossa_10","template_impcode_riscossa_10","template_ivacode_riscossa_10"
-"10b","10b","l10n_it_chart_template_generic","Iva al 10% (credito)","0.1",,"False","percent","1601","1601","purchase","template_impcode_pagata_10","template_ivacode_pagata_10","template_impcode_pagata_10","template_ivacode_pagata_10"
-"10AO","10AO","l10n_it_chart_template_generic","Iva al 10% indetraibile","1",,"True","percent",,,"purchase",,,,
-"10AOa","10AOa","l10n_it_chart_template_generic","Iva al 10% indetraibile (1)","0","10AO","False","percent","1601","1601","purchase","template_impcode_pagata_10ind","template_ivacode_pagata_10ind","template_impcode_pagata_10ind","template_ivacode_pagata_10ind"
-"10AOb","10AOb","l10n_it_chart_template_generic","Iva al 10% indetraibile (2)","0.1","10AO","False","percent",,,"purchase",,,,
-"12a","12a","l10n_it_chart_template_generic","Iva 12% (debito)","0.12",,"False","percent","2601","2601","sale","template_impcode_riscossa_12","template_ivacode_riscossa_12","template_impcode_riscossa_12","template_ivacode_riscossa_12"
-"12b","12b","l10n_it_chart_template_generic","Iva 12% (credito)","0.12",,"False","percent","1601","1601","purchase","template_impcode_pagata_12","template_ivacode_pagata_12","template_impcode_pagata_12","template_ivacode_pagata_12"
-"2010","2010","l10n_it_chart_template_generic","Iva al 20% detraibile 10%","1",,"True","percent",,,"purchase",,,,
-"2010a","2010a","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (1)","0.02","2010","False","percent","1601","1601","purchase","template_impcode_pagata_20det10","template_ivacode_pagata_20det10","template_impcode_pagata_20det10","template_ivacode_pagata_20det10"
-"2010b","2010b","l10n_it_chart_template_generic","Iva al 20% detraibile 10% (2)","0.18","2010","False","percent",,,"purchase",,,,
-"2015","2015","l10n_it_chart_template_generic","Iva al 20% detraibile 15%","1",,"True","percent",,,"purchase",,,,
-"2015a","2015a","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (1)","0.03","2015","False","percent","1601","1601","purchase","template_impcode_pagata_20det15","template_ivacode_pagata_20det15","template_impcode_pagata_20det15","template_ivacode_pagata_20det15"
-"2015b","2015b","l10n_it_chart_template_generic","Iva al 20% detraibile 15% (2)","0.17","2015","False","percent",,,"purchase",,,,
-"2040","2040","l10n_it_chart_template_generic","Iva al 20% detraibile 40%","1",,"True","percent",,,"purchase",,,,
-"2040a","2040a","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (1)","0.08","2040","False","percent","1601","1601","purchase","template_impcode_pagata_20det40","template_ivacode_pagata_20det40","template_impcode_pagata_20det40","template_ivacode_pagata_20det40"
-"2040b","2040b","l10n_it_chart_template_generic","Iva al 20% detraibile 40% (2)","0.12","2040","False","percent",,,"purchase",,,,
-"20AO","20AO","l10n_it_chart_template_generic","Iva al 20% indetraibile","1",,"True","percent",,,"purchase",,,,
-"20AOa","20AOa","l10n_it_chart_template_generic","Iva al 20% indetraibile (1)","0","20AO","False","percent","1601","1601","purchase","template_impcode_pagata_20ind","template_ivacode_pagata_20ind","template_impcode_pagata_20ind","template_ivacode_pagata_20ind"
-"20AOb","20AOb","l10n_it_chart_template_generic","Iva al 20% indetraibile (2)","0.2","20AO","False","percent",,,"purchase",,,,
-"20I5","20I5","l10n_it_chart_template_generic","IVA al 20% detraibile al 50%","1",,"True","percent",,,"purchase",,,,
-"20I5a","20I5a","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (1)","0.1","20I5","False","percent","1601","1601","purchase","template_impcode_pagata_20det50","template_ivacode_pagata_20det50","template_impcode_pagata_20det50","template_ivacode_pagata_20det50"
-"20I5b","20I5b","l10n_it_chart_template_generic","IVA al 20% detraibile al 50% (2)","0.1","20I5","False","percent",,,"purchase",,,,
-"22a","22a","l10n_it_chart_template_generic","Iva 2% (debito)","0.02",,"False","percent","2601","2601","sale","template_impcode_riscossa_2","template_ivacode_riscossa_2","template_impcode_riscossa_2","template_ivacode_riscossa_2"
-"22b","22b","l10n_it_chart_template_generic","Iva 2% (credito)","0.02",,"False","percent","1601","1601","purchase","template_impcode_pagata_2","template_ivacode_pagata_2","template_impcode_pagata_2","template_ivacode_pagata_2"
-"4a","4a","l10n_it_chart_template_generic","Iva 4% (debito)","0.04",,"False","percent","2601","2601","sale","template_impcode_riscossa_4","template_ivacode_riscossa_4","template_impcode_riscossa_4","template_ivacode_riscossa_4"
-"4b","4b","l10n_it_chart_template_generic","Iva 4% (credito)","0.04",,"False","percent","1601","1601","purchase","template_impcode_pagata_4","template_ivacode_pagata_4","template_impcode_pagata_4","template_ivacode_pagata_4"
-"4AO","4AO","l10n_it_chart_template_generic","Iva al 4% indetraibile","1",,"True","percent",,,"purchase",,,,
-"4AOa","4AOa","l10n_it_chart_template_generic","Iva al 4% indetraibile (1)","0","4AO","False","percent","1601","1601","purchase","template_impcode_pagata_4ind","template_ivacode_pagata_4ind","template_impcode_pagata_4ind","template_ivacode_pagata_4ind"
-"4AOb","4AOb","l10n_it_chart_template_generic","Iva al 4% indetraibile (2)","0.04","4AO","False","percent",,,"purchase",,,,
-"10I5","10I5","l10n_it_chart_template_generic","IVA al 10% detraibile al 50%","1",,"True","percent",,,"purchase",,,,
-"10I5a","10I5a","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (1)","0.05","10I5","False","percent","1601","1601","purchase","template_impcode_pagata_10det50","template_ivacode_pagata_10det50","template_impcode_pagata_10det50","template_ivacode_pagata_10det50"
-"10I5b","10I5b","l10n_it_chart_template_generic","IVA al 10% detraibile al 50% (2)","0.05","10I5","False","percent",,,"purchase",,,,
-"4I5","4I5","l10n_it_chart_template_generic","IVA al 4% detraibile al 50%","1",,"True","percent",,,"purchase",,,,
-"4I5a","4I5a","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (1)","0.02","4I5","False","percent","1601","1601","purchase","template_impcode_pagata_4det50","template_ivacode_pagata_4det50","template_impcode_pagata_4det50","template_ivacode_pagata_4det50"
-"4I5b","4I5b","l10n_it_chart_template_generic","IVA al 4% detraibile al 50% (2)","0.02","4I5","False","percent",,,"purchase",,,,
-"00a","00a","l10n_it_chart_template_generic","Esente IVA (debito)","0",,"False","percent","2601","2601","sale","template_impcode_riscossa_0","template_ivacode_riscossa_0","template_impcode_riscossa_0","template_ivacode_riscossa_0"
-"00b","00b","l10n_it_chart_template_generic","Esente IVA (credito)","0",,"False","percent","1601","1601","purchase","template_impcode_pagata_0","template_ivacode_pagata_0","template_impcode_pagata_0","template_ivacode_pagata_0"
+id,description,chart_template_id:id,name,sequence,amount,parent_id:id,child_depend,type,account_collected_id:id,account_paid_id:id,type_tax_use,base_code_id:id,tax_code_id:id,ref_base_code_id:id,ref_tax_code_id:id,ref_base_sign,ref_tax_sign,price_include,base_sign,tax_sign
+21a,21a,l10n_it_chart_template_generic,Iva al 21% (debito),,0.21,,False,percent,2601,2601,sale,template_impcode_riscossa_21,template_ivacode_riscossa_21,template_impcode_riscossa_21,template_ivacode_riscossa_21,-1,-1,False,,
+21b,21b,l10n_it_chart_template_generic,Iva al 21% (credito),,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,,,False,-1,-1
+20a,20a,l10n_it_chart_template_generic,Iva al 20% (debito),,0.2,,False,percent,2601,2601,sale,template_impcode_riscossa_20,template_ivacode_riscossa_20,template_impcode_riscossa_20,template_ivacode_riscossa_20,-1,-1,False,,
+20b,20b,l10n_it_chart_template_generic,Iva al 20% (credito),,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,,,False,-1,-1
+10a,10a,l10n_it_chart_template_generic,Iva al 10% (debito),,0.1,,False,percent,2601,2601,sale,template_impcode_riscossa_10,template_ivacode_riscossa_10,template_impcode_riscossa_10,template_ivacode_riscossa_10,-1,-1,False,,
+10b,10b,l10n_it_chart_template_generic,Iva al 10% (credito),,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,,,False,-1,-1
+10AO,10AO,l10n_it_chart_template_generic,Iva al 10% indetraibile,,0.1,,True,percent,,,purchase,template_impcode_pagata_10ind,,template_impcode_pagata_10ind,,,,False,-1,-1
+10AOa,10AOa,l10n_it_chart_template_generic,Iva al 10% indetraibile (D),2,0,10AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_10ind,,template_ivacode_pagata_10ind,,,False,,
+10AOb,10AOb,l10n_it_chart_template_generic,Iva al 10% indetraibile (I),1,1,10AO,False,percent,,,purchase,,,,,,,False,,
+12a,12a,l10n_it_chart_template_generic,Iva 12% (debito),,0.12,,False,percent,2601,2601,sale,template_impcode_riscossa_12,template_ivacode_riscossa_12,template_impcode_riscossa_12,template_ivacode_riscossa_12,-1,-1,False,,
+12b,12b,l10n_it_chart_template_generic,Iva 12% (credito),,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,,,False,-1,-1
+2010,2010,l10n_it_chart_template_generic,Iva al 20% detraibile 10%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det10,,template_impcode_pagata_20det10,,,,False,-1,-1
+2010a,2010a,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (D),2,0,2010,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det10,,template_ivacode_pagata_20det10,,,False,,
+2010b,2010b,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (I),1,0.9,2010,False,percent,,,purchase,,,,,,,False,,
+2015,2015,l10n_it_chart_template_generic,Iva al 20% detraibile 15%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det15,,template_impcode_pagata_20det15,,,,False,-1,-1
+2015a,2015a,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (D),2,0,2015,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det15,,template_ivacode_pagata_20det15,,,False,,
+2015b,2015b,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (I),1,0.85,2015,False,percent,,,purchase,,,,,,,False,,
+2040,2040,l10n_it_chart_template_generic,Iva al 20% detraibile 40%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det40,,template_impcode_pagata_20det40,,,,False,-1,-1
+2040a,2040a,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (D),2,0,2040,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det40,,template_ivacode_pagata_20det40,,,False,,
+2040b,2040b,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (I),1,0.6,2040,False,percent,,,purchase,,,,,,,False,,
+20AO,20AO,l10n_it_chart_template_generic,Iva al 20% indetraibile,,0.2,,True,percent,,,purchase,template_impcode_pagata_20ind,,template_impcode_pagata_20ind,,,,False,-1,-1
+20AOa,20AOa,l10n_it_chart_template_generic,Iva al 20% indetraibile (D),2,0,20AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_20ind,,template_ivacode_pagata_20ind,,,False,,
+20AOb,20AOb,l10n_it_chart_template_generic,Iva al 20% indetraibile (I),1,1,20AO,False,percent,,,purchase,,,,,,,False,,
+20I5,20I5,l10n_it_chart_template_generic,IVA al 20% detraibile al 50%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det50,,template_impcode_pagata_20det50,,,,False,-1,-1
+20I5b,20I5b,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (I),1,0.5,20I5,False,percent,,,purchase,,,,,,,False,,
+20I5a,20I5a,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (D),2,0,20I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det50,,template_ivacode_pagata_20det50,,,False,,
+22a,22a,l10n_it_chart_template_generic,Iva 2% (debito),,0.02,,False,percent,2601,2601,sale,template_impcode_riscossa_2,template_ivacode_riscossa_2,template_impcode_riscossa_2,template_ivacode_riscossa_2,-1,-1,False,,
+22b,22b,l10n_it_chart_template_generic,Iva 2% (credito),,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,False,-1,-1
+4a,4a,l10n_it_chart_template_generic,Iva 4% (debito),,0.04,,False,percent,2601,2601,sale,template_impcode_riscossa_4,template_ivacode_riscossa_4,template_impcode_riscossa_4,template_ivacode_riscossa_4,-1,-1,False,,
+4b,4b,l10n_it_chart_template_generic,Iva 4% (credito),,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,,,False,-1,-1
+4AO,4AO,l10n_it_chart_template_generic,Iva al 4% indetraibile,,0.04,,True,percent,,,purchase,template_impcode_pagata_4ind,,template_impcode_pagata_4ind,,,,False,-1,-1
+4AOa,4AOa,l10n_it_chart_template_generic,Iva al 4% indetraibile (D),2,0,4AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_4ind,,template_ivacode_pagata_4ind,,,False,,
+4AOb,4AOb,l10n_it_chart_template_generic,Iva al 4% indetraibile (I),1,1,4AO,False,percent,,,purchase,,,,,,,False,,
+10I5,10I5,l10n_it_chart_template_generic,IVA al 10% detraibile al 50%,,0.1,,True,percent,,,purchase,template_impcode_pagata_10det50,,template_impcode_pagata_10det50,,,,False,-1,-1
+10I5a,10I5a,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (D),2,0,10I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_10det50,,template_ivacode_pagata_10det50,,,False,,
+10I5b,10I5b,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (I),1,0.5,10I5,False,percent,,,purchase,,,,,,,False,,
+4I5,4I5,l10n_it_chart_template_generic,IVA al 4% detraibile al 50%,,0.04,,True,percent,,,purchase,template_impcode_pagata_4det50,,template_impcode_pagata_4det50,,,,False,-1,-1
+4I5a,4I5a,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (D),2,0,4I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_4det50,,template_ivacode_pagata_4det50,,,False,,
+4I5b,4I5b,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (I),1,0.5,4I5,False,percent,,,purchase,,,,,,,False,,
+00a,00a,l10n_it_chart_template_generic,Esente IVA (debito),,0,,False,percent,2601,2601,sale,template_impcode_riscossa_0,template_ivacode_riscossa_0,template_impcode_riscossa_0,template_ivacode_riscossa_0,-1,-1,False,,
+00b,00b,l10n_it_chart_template_generic,Esente IVA (credito),,0,,False,percent,1601,1601,purchase,template_impcode_pagata_0,template_ivacode_pagata_0,template_impcode_pagata_0,template_ivacode_pagata_0,,,False,-1,-1
+21a INC,21a INC,l10n_it_chart_template_generic,Iva al 21% (debito) INC,,0.21,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,-1,-1,True,,
+20a INC,20a INC,l10n_it_chart_template_generic,Iva al 20% (debito) INC,,0.2,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,-1,-1,True,,
+10a INC,10a INC,l10n_it_chart_template_generic,Iva al 10% (debito) INC,,0.1,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,-1,-1,True,,
+12a INC,12a INC,l10n_it_chart_template_generic,Iva 12% (debito) INC,,0.12,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,-1,-1,True,,
+22a INC,22a INC,l10n_it_chart_template_generic,Iva 2% (debito) INC,,0.02,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,-1,-1,True,,
+4a INC,4a INC,l10n_it_chart_template_generic,Iva 4% (debito) INC,,0.04,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,-1,-1,True,,
+00a INC,00a INC,l10n_it_chart_template_generic,Esente IVA (debito) INC,,0,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,-1,-1,True,,
+2110,2110,l10n_it_chart_template_generic,Iva al 21% detraibile 10%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det10,,template_impcode_pagata_21det10,,,,False,-1,-1
+2110a,2110a,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (D),2,0,2110,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det10,,template_ivacode_pagata_21det10,,,False,,
+2110b,2110b,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (I),1,0.9,2110,False,percent,,,purchase,,,,,,,False,,
+2115,2115,l10n_it_chart_template_generic,Iva al 21% detraibile 15%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det15,,template_impcode_pagata_21det15,,,,False,-1,-1
+2115a,2115a,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (D),2,0,2115,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det15,,template_ivacode_pagata_21det15,,,False,,
+2115b,2115b,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (I),1,0.85,2115,False,percent,,,purchase,,,,,,,False,,
+2140,2140,l10n_it_chart_template_generic,Iva al 21% detraibile 40%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det40,,template_impcode_pagata_21det40,,,,False,-1,-1
+2140a,2140a,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (D),2,0,2140,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det40,,template_ivacode_pagata_21det40,,,False,,
+2140b,2140b,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (I),1,0.6,2140,False,percent,,,purchase,,,,,,,False,,
+21AO,21AO,l10n_it_chart_template_generic,Iva al 21% indetraibile,,0.21,,True,percent,,,purchase,template_impcode_pagata_21ind,,template_impcode_pagata_21ind,,,,False,-1,-1
+21AOa,21AOa,l10n_it_chart_template_generic,Iva al 21% indetraibile (D),2,0,21AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_21ind,,template_ivacode_pagata_21ind,,,False,,
+21AOb,21AOb,l10n_it_chart_template_generic,Iva al 21% indetraibile (I),1,1,21AO,False,percent,,,purchase,,,,,,,False,,
+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,,
diff --git a/addons/l10n_it/i18n/ca.po b/addons/l10n_it/i18n/ca.po
index a17b5d542d4..13ba50a2b99 100644
--- a/addons/l10n_it/i18n/ca.po
+++ b/addons/l10n_it/i18n/ca.po
@@ -7,20 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:04+0000\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
 "PO-Revision-Date: 2011-02-15 15:37+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-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
-msgstr "Resgistre de compres"
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+"\n"
+"    Pla comptable italià d'una empresa genèrica\n"
+"    "
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr "Itàlia - Pla general comptable"
 
 #. module: l10n_it
 #: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
@@ -43,132 +54,63 @@ msgstr ""
 "pla comptable des d'una plantilla de pla comptable."
 
 #. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
-msgstr "Exercici fiscal"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr "Itàlia"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr "REGISTRE D'IVA"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr "Protocol"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr "Règim extra comunitari"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr "VENDES"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr "Taxa"
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr "Companyia"
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr "Exercici fiscal"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr "Número"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr "Proveïdor"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr "COMPRA"
-
-#. module: l10n_it
-#: model:ir.module.module,description:l10n_it.module_meta_information
-msgid ""
-"\n"
-"    Piano dei conti italiano di un'impresa generica\n"
-"    "
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
 msgstr ""
-"\n"
-"    Pla comptable italià d'una empresa genèrica\n"
-"    "
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr "Client"
+#~ msgid "VENDITE"
+#~ msgstr "VENDES"
 
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr "Registre de vendes"
+#~ msgid "Aliquota"
+#~ msgstr "Taxa"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr "Període"
+#~ msgid "Registro acquisti"
+#~ msgstr "Resgistre de compres"
 
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr "Registre d'IVA"
+#~ msgid "Protocollo"
+#~ msgstr "Protocol"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr "Impost"
+#~ msgid "REGISTRO IVA"
+#~ msgstr "REGISTRE D'IVA"
 
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr "Règim intra comunitari"
+#~ msgid "Fornitore"
+#~ msgstr "Proveïdor"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr "Data de la factura"
+#~ msgid "Numero"
+#~ msgstr "Número"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr "Imponible"
+#~ msgid "Cliente"
+#~ msgstr "Client"
 
-#. module: l10n_it
-#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
-msgid "Italy - Generic Chart of Accounts"
-msgstr "Itàlia - Pla general comptable"
+#~ msgid "Periodo"
+#~ msgstr "Període"
 
-#. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
-msgstr "Vista SQL pel llibre d'IVA"
+#~ msgid "Registro vendite"
+#~ msgstr "Registre de vendes"
+
+#~ msgid "Imposta"
+#~ msgstr "Impost"
+
+#~ msgid "Data fattura"
+#~ msgstr "Data de la factura"
+
+#~ msgid "Imponibile"
+#~ msgstr "Imponible"
+
+#~ msgid "SQL view for libro IVA"
+#~ msgstr "Vista SQL pel llibre d'IVA"
+
+#~ msgid "Company"
+#~ msgstr "Companyia"
+
+#~ msgid "Anno Fiscale"
+#~ msgstr "Exercici fiscal"
+
+#~ msgid "ACQUISTI"
+#~ msgstr "COMPRA"
+
+#~ msgid "Fiscal year"
+#~ msgstr "Exercici fiscal"
+
+#~ msgid "Registri IVA"
+#~ msgstr "Registre d'IVA"
diff --git a/addons/l10n_it/i18n/es.po b/addons/l10n_it/i18n/es.po
index a9e59c4ed43..ec8abd28572 100644
--- a/addons/l10n_it/i18n/es.po
+++ b/addons/l10n_it/i18n/es.po
@@ -7,20 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:04+0000\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
 "PO-Revision-Date: 2011-02-15 15:37+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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
-msgstr "Registro de compras"
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+"\n"
+"    Plan contable italiano de una empresa genérica\n"
+"    "
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr "Italia - Plan General Contable"
 
 #. module: l10n_it
 #: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
@@ -43,132 +54,63 @@ msgstr ""
 "Financiera/Generar Plan Contable a partir de una Plantilla de Plan."
 
 #. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
-msgstr "Año Fiscal"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr "Italia"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr "REGISTRO IVA"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr "Protocolo"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr "Régimen Extra comunitario"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr "VENTAS"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr "Tasa"
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr "Ejercicio fiscal"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr "Número"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr "Proveedor"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr "COMPRA"
-
-#. module: l10n_it
-#: model:ir.module.module,description:l10n_it.module_meta_information
-msgid ""
-"\n"
-"    Piano dei conti italiano di un'impresa generica\n"
-"    "
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
 msgstr ""
-"\n"
-"    Plan contable italiano de una empresa genérica\n"
-"    "
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr "Cliente"
+#~ msgid "Company"
+#~ msgstr "Compañía"
 
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr "Registro de ventas"
+#~ msgid "Aliquota"
+#~ msgstr "Tasa"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr "Período"
+#~ msgid "VENDITE"
+#~ msgstr "VENTAS"
 
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr "Registro del IVA"
+#~ msgid "Anno Fiscale"
+#~ msgstr "Año Fiscal"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr "Impuesto"
+#~ msgid "Protocollo"
+#~ msgstr "Protocolo"
 
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr "Régimen Intra Comunitario"
+#~ msgid "REGISTRO IVA"
+#~ msgstr "REGISTRO IVA"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr "Fecha de la factura"
+#~ msgid "Fornitore"
+#~ msgstr "Proveedor"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr "Imponible"
+#~ msgid "Numero"
+#~ msgstr "Número"
 
-#. module: l10n_it
-#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
-msgid "Italy - Generic Chart of Accounts"
-msgstr "Italia - Plan General Contable"
+#~ msgid "Cliente"
+#~ msgstr "Cliente"
 
-#. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
-msgstr "Vista SQL para el libro del IVA"
+#~ msgid "Periodo"
+#~ msgstr "Período"
+
+#~ msgid "Registro vendite"
+#~ msgstr "Registro de ventas"
+
+#~ msgid "Imposta"
+#~ msgstr "Impuesto"
+
+#~ msgid "Registri IVA"
+#~ msgstr "Registro del IVA"
+
+#~ msgid "Data fattura"
+#~ msgstr "Fecha de la factura"
+
+#~ msgid "Imponibile"
+#~ msgstr "Imponible"
+
+#~ msgid "SQL view for libro IVA"
+#~ msgstr "Vista SQL para el libro del IVA"
+
+#~ msgid "Registro acquisti"
+#~ msgstr "Registro de compras"
+
+#~ msgid "ACQUISTI"
+#~ msgstr "COMPRA"
+
+#~ msgid "Fiscal year"
+#~ msgstr "Ejercicio fiscal"
diff --git a/addons/l10n_it/i18n/es_MX.po b/addons/l10n_it/i18n/es_MX.po
new file mode 100644
index 00000000000..a3d53f9427a
--- /dev/null
+++ b/addons/l10n_it/i18n/es_MX.po
@@ -0,0 +1,174 @@
+# Spanish 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-07 06:04+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_it
+#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
+msgid "Registro acquisti"
+msgstr "Registro de compras"
+
+#. module: l10n_it
+#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
+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 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_it
+#: view:account.report_libroiva:0
+msgid "Anno Fiscale"
+msgstr "Año Fiscal"
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.it
+msgid "Italia"
+msgstr "Italia"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "REGISTRO IVA"
+msgstr "REGISTRO IVA"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Protocollo"
+msgstr "Protocolo"
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.extra
+msgid "Regime Extra comunitario"
+msgstr "Régimen Extra comunitario"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+msgid "VENDITE"
+msgstr "VENTAS"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Aliquota"
+msgstr "Tasa"
+
+#. module: l10n_it
+#: field:account.report_libroiva,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_it
+#: field:account.report_libroiva,name:0
+msgid "Fiscal year"
+msgstr "Ejercicio fiscal"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Numero"
+msgstr "Número"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Fornitore"
+msgstr "Proveedor"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "ACQUISTI"
+msgstr "COMPRA"
+
+#. module: l10n_it
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+"\n"
+"    Plan contable italiano de una empresa genérica\n"
+"    "
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+msgid "Cliente"
+msgstr "Cliente"
+
+#. module: l10n_it
+#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
+msgid "Registro vendite"
+msgstr "Registro de ventas"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Periodo"
+msgstr "Período"
+
+#. module: l10n_it
+#: view:account.report_libroiva:0
+#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
+#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
+msgid "Registri IVA"
+msgstr "Registro del IVA"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Imposta"
+msgstr "Impuesto"
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.intra
+msgid "Regime Intra comunitario"
+msgstr "Régimen Intra Comunitario"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Data fattura"
+msgstr "Fecha de la factura"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Imponibile"
+msgstr "Imponible"
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr "Italia - Plan General Contable"
+
+#. module: l10n_it
+#: model:ir.model,name:l10n_it.model_account_report_libroiva
+msgid "SQL view for libro IVA"
+msgstr "Vista SQL para el libro del IVA"
diff --git a/addons/l10n_it/i18n/es_PY.po b/addons/l10n_it/i18n/es_PY.po
index 656eba769f5..d05f707c30c 100644
--- a/addons/l10n_it/i18n/es_PY.po
+++ b/addons/l10n_it/i18n/es_PY.po
@@ -7,20 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:04+0000\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
 "PO-Revision-Date: 2011-03-21 16:24+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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
-msgstr "Registro de compras"
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+"\n"
+"    Plan contable italiano de una empresa genérica\n"
+"    "
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr "Italia - Plan General Contable"
 
 #. module: l10n_it
 #: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
@@ -43,132 +54,63 @@ msgstr ""
 "plan contable a partir de una plantilla de plan contable."
 
 #. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
-msgstr "Año Fiscal"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr "Italia"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr "REGISTRO IVA"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr "Protocolo"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr "Régimen Extra comunitario"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr "VENTAS"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr "Tasa"
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr "Ejercicio fiscal"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr "Número"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr "Proveedor"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr "COMPRA"
-
-#. module: l10n_it
-#: model:ir.module.module,description:l10n_it.module_meta_information
-msgid ""
-"\n"
-"    Piano dei conti italiano di un'impresa generica\n"
-"    "
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
 msgstr ""
-"\n"
-"    Plan contable italiano de una empresa genérica\n"
-"    "
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr "Cliente"
+#~ msgid "Aliquota"
+#~ msgstr "Tasa"
 
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr "Registro de ventas"
+#~ msgid "Company"
+#~ msgstr "Compañía"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr "Período"
+#~ msgid "VENDITE"
+#~ msgstr "VENTAS"
 
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr "Registro del IVA"
+#~ msgid "Anno Fiscale"
+#~ msgstr "Año Fiscal"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr "Impuesto"
+#~ msgid "Registro acquisti"
+#~ msgstr "Registro de compras"
 
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr "Régimen Intra Comunitario"
+#~ msgid "Protocollo"
+#~ msgstr "Protocolo"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr "Fecha de la factura"
+#~ msgid "REGISTRO IVA"
+#~ msgstr "REGISTRO IVA"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr "Imponible"
+#~ msgid "Fornitore"
+#~ msgstr "Proveedor"
 
-#. module: l10n_it
-#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
-msgid "Italy - Generic Chart of Accounts"
-msgstr "Italia - Plan General Contable"
+#~ msgid "ACQUISTI"
+#~ msgstr "COMPRA"
 
-#. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
-msgstr "Vista SQL para el libro del IVA"
+#~ msgid "Fiscal year"
+#~ msgstr "Ejercicio fiscal"
+
+#~ msgid "Numero"
+#~ msgstr "Número"
+
+#~ msgid "Cliente"
+#~ msgstr "Cliente"
+
+#~ msgid "Periodo"
+#~ msgstr "Período"
+
+#~ msgid "Registro vendite"
+#~ msgstr "Registro de ventas"
+
+#~ msgid "Imposta"
+#~ msgstr "Impuesto"
+
+#~ msgid "Registri IVA"
+#~ msgstr "Registro del IVA"
+
+#~ msgid "Data fattura"
+#~ msgstr "Fecha de la factura"
+
+#~ msgid "SQL view for libro IVA"
+#~ msgstr "Vista SQL para el libro del IVA"
+
+#~ msgid "Imponibile"
+#~ msgstr "Imponible"
diff --git a/addons/l10n_it/i18n/es_VE.po b/addons/l10n_it/i18n/es_VE.po
new file mode 100644
index 00000000000..a3d53f9427a
--- /dev/null
+++ b/addons/l10n_it/i18n/es_VE.po
@@ -0,0 +1,174 @@
+# Spanish 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-07 06:04+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_it
+#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
+msgid "Registro acquisti"
+msgstr "Registro de compras"
+
+#. module: l10n_it
+#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
+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 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_it
+#: view:account.report_libroiva:0
+msgid "Anno Fiscale"
+msgstr "Año Fiscal"
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.it
+msgid "Italia"
+msgstr "Italia"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "REGISTRO IVA"
+msgstr "REGISTRO IVA"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Protocollo"
+msgstr "Protocolo"
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.extra
+msgid "Regime Extra comunitario"
+msgstr "Régimen Extra comunitario"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+msgid "VENDITE"
+msgstr "VENTAS"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Aliquota"
+msgstr "Tasa"
+
+#. module: l10n_it
+#: field:account.report_libroiva,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_it
+#: field:account.report_libroiva,name:0
+msgid "Fiscal year"
+msgstr "Ejercicio fiscal"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Numero"
+msgstr "Número"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Fornitore"
+msgstr "Proveedor"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "ACQUISTI"
+msgstr "COMPRA"
+
+#. module: l10n_it
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+"\n"
+"    Plan contable italiano de una empresa genérica\n"
+"    "
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+msgid "Cliente"
+msgstr "Cliente"
+
+#. module: l10n_it
+#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
+msgid "Registro vendite"
+msgstr "Registro de ventas"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Periodo"
+msgstr "Período"
+
+#. module: l10n_it
+#: view:account.report_libroiva:0
+#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
+#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
+msgid "Registri IVA"
+msgstr "Registro del IVA"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Imposta"
+msgstr "Impuesto"
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.intra
+msgid "Regime Intra comunitario"
+msgstr "Régimen Intra Comunitario"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Data fattura"
+msgstr "Fecha de la factura"
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Imponibile"
+msgstr "Imponible"
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr "Italia - Plan General Contable"
+
+#. module: l10n_it
+#: model:ir.model,name:l10n_it.model_account_report_libroiva
+msgid "SQL view for libro IVA"
+msgstr "Vista SQL para el libro del IVA"
diff --git a/addons/l10n_it/i18n/fr.po b/addons/l10n_it/i18n/fr.po
index 42da9688556..1582f87c77c 100644
--- a/addons/l10n_it/i18n/fr.po
+++ b/addons/l10n_it/i18n/fr.po
@@ -7,19 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:04+0000\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
 "PO-Revision-Date: 2011-05-22 17:04+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
 msgstr ""
 
 #. module: l10n_it
@@ -35,129 +43,12 @@ msgid ""
 msgstr ""
 
 #. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
 msgstr ""
 
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr ""
+#~ msgid "Company"
+#~ msgstr "Société"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr ""
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr ""
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr "Exercice fiscal"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr ""
-
-#. module: l10n_it
-#: model:ir.module.module,description:l10n_it.module_meta_information
-msgid ""
-"\n"
-"    Piano dei conti italiano di un'impresa generica\n"
-"    "
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr ""
-
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr ""
-
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr ""
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr ""
-
-#. module: l10n_it
-#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
-msgid "Italy - Generic Chart of Accounts"
-msgstr ""
-
-#. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
-msgstr ""
+#~ msgid "Fiscal year"
+#~ msgstr "Exercice fiscal"
diff --git a/addons/l10n_it/i18n/gl.po b/addons/l10n_it/i18n/gl.po
index 4a30c15666f..a8cf6c6609e 100644
--- a/addons/l10n_it/i18n/gl.po
+++ b/addons/l10n_it/i18n/gl.po
@@ -7,20 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:04+0000\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
 "PO-Revision-Date: 2011-02-25 11:41+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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
-msgstr "Rexistro de compras"
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+"\n"
+"    Plan contable Italiano\n"
+"    "
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr "Italia - Plan Xeral Contable"
 
 #. module: l10n_it
 #: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
@@ -42,132 +53,63 @@ msgstr ""
 "financeira/Xerar Plan Contable a partir dun modelo de plan."
 
 #. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
-msgstr "Exercicio fiscal"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr "Italia"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr "REXISTRO IVE"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr "Protocolo"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr "Rexime Extra comunitario"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr "VENDAS"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr "Taxa"
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr "Exercicio fiscal"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr "Número"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr "Provedor"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr "Mercar"
-
-#. module: l10n_it
-#: model:ir.module.module,description:l10n_it.module_meta_information
-msgid ""
-"\n"
-"    Piano dei conti italiano di un'impresa generica\n"
-"    "
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
 msgstr ""
-"\n"
-"    Plan contable Italiano\n"
-"    "
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr "Cliente"
+#~ msgid "REGISTRO IVA"
+#~ msgstr "REXISTRO IVE"
 
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr "Rexistro de vendas"
+#~ msgid "Aliquota"
+#~ msgstr "Taxa"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr "Período"
+#~ msgid "Company"
+#~ msgstr "Compañía"
 
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr "Rexistro do IVE"
+#~ msgid "VENDITE"
+#~ msgstr "VENDAS"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr "Imposto"
+#~ msgid "Anno Fiscale"
+#~ msgstr "Exercicio fiscal"
 
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr "Rexime Intra Comunitario"
+#~ msgid "Registro acquisti"
+#~ msgstr "Rexistro de compras"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr "Data da factura"
+#~ msgid "Protocollo"
+#~ msgstr "Protocolo"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr "Impoñible"
+#~ msgid "Fornitore"
+#~ msgstr "Provedor"
 
-#. module: l10n_it
-#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
-msgid "Italy - Generic Chart of Accounts"
-msgstr "Italia - Plan Xeral Contable"
+#~ msgid "ACQUISTI"
+#~ msgstr "Mercar"
 
-#. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
-msgstr "Vista SQL para o libro do IVE"
+#~ msgid "Fiscal year"
+#~ msgstr "Exercicio fiscal"
+
+#~ msgid "Numero"
+#~ msgstr "Número"
+
+#~ msgid "Periodo"
+#~ msgstr "Período"
+
+#~ msgid "Cliente"
+#~ msgstr "Cliente"
+
+#~ msgid "Registro vendite"
+#~ msgstr "Rexistro de vendas"
+
+#~ msgid "Imposta"
+#~ msgstr "Imposto"
+
+#~ msgid "Registri IVA"
+#~ msgstr "Rexistro do IVE"
+
+#~ msgid "Data fattura"
+#~ msgstr "Data da factura"
+
+#~ msgid "Imponibile"
+#~ msgstr "Impoñible"
+
+#~ msgid "SQL view for libro IVA"
+#~ msgstr "Vista SQL para o libro do IVE"
diff --git a/addons/l10n_it/i18n/it.po b/addons/l10n_it/i18n/it.po
index 817a7e64b77..b12fa0ca4d3 100644
--- a/addons/l10n_it/i18n/it.po
+++ b/addons/l10n_it/i18n/it.po
@@ -1,110 +1,20 @@
-# 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.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_it
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:04+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian <it@li.org>\n"
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
+"PO-Revision-Date: 2011-11-24 10:54+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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
-
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
-msgstr "Registro acquisti"
-
-#. module: l10n_it
-#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
-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 ""
-"Genera il Piano dei Conti da un Modello. Vi verrà richiesto di passare il "
-"nome dell'azienda, il modello da seguire, il numero di decimali per generare "
-"il codice dei tuoi conti e, per il conto della Banca, la valuta per creare "
-"il Libro Giornale. Così una copia vergine del Piano dei Conti, derivatante "
-"dal modello, viene generata.\n"
-"\tQuesto è la stessa procedura automatica che viene lanciata da: Gestione "
-"Finanziaria / Configurazione / Contabilità / Conti finanziari / Genera il "
-"Piano dei conti da un modello."
-
-#. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
-msgstr "Anno Fiscale"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr "Italia"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr "REGISTRO IVA"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr "Protocollo"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr "Regime Extra comunitario"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr "VENDITE"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr "Aliquota"
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr "Azienda"
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr "Anno fiscale"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr "Numero"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr "Fornitore"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr "ACQUISTI"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: l10n_it
 #: model:ir.module.module,description:l10n_it.module_meta_information
@@ -117,58 +27,88 @@ msgstr ""
 "    Piano dei conti italiano di un'impresa generica\n"
 "    "
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr "Cliente"
-
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr "Registro vendite"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr "Periodo"
-
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr "Registri IVA"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr "Imposta"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr "Regime Intra comunitario"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr "Data fattura"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr "Imponibile"
-
 #. module: l10n_it
 #: model:ir.module.module,shortdesc:l10n_it.module_meta_information
 msgid "Italy - Generic Chart of Accounts"
 msgstr "Italia - Piano dei conti generico"
 
 #. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
-msgstr "Vista SQL per registro IVA"
+#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
+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 ""
+"Genera il piano dei conti da un template. Verrà chiesto di indicare il nome "
+"dell'azienda, il piano dei conti da seguire, il numero di cifre per generare "
+"il codice dei conti, la valuta per creare i sezionali. Quindi, una semplice "
+"copia del template verrà generata.\n"
+"\tQuesto è lo stesso wizard che viene eseguito da "
+"Contabilità/Configurazione/Contabilità Generale/Assetto finanziario della "
+"nuova azienda"
+
+#. module: l10n_it
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#~ msgid "Aliquota"
+#~ msgstr "Aliquota"
+
+#~ msgid "Company"
+#~ msgstr "Azienda"
+
+#~ msgid "VENDITE"
+#~ msgstr "VENDITE"
+
+#~ msgid "Anno Fiscale"
+#~ msgstr "Anno Fiscale"
+
+#~ msgid "Registro acquisti"
+#~ msgstr "Registro acquisti"
+
+#~ msgid "Protocollo"
+#~ msgstr "Protocollo"
+
+#~ msgid "REGISTRO IVA"
+#~ msgstr "REGISTRO IVA"
+
+#~ msgid "Fornitore"
+#~ msgstr "Fornitore"
+
+#~ msgid "ACQUISTI"
+#~ msgstr "ACQUISTI"
+
+#~ msgid "Fiscal year"
+#~ msgstr "Anno fiscale"
+
+#~ msgid "Numero"
+#~ msgstr "Numero"
+
+#~ msgid "Cliente"
+#~ msgstr "Cliente"
+
+#~ msgid "Periodo"
+#~ msgstr "Periodo"
+
+#~ msgid "Registro vendite"
+#~ msgstr "Registro vendite"
+
+#~ msgid "Imposta"
+#~ msgstr "Imposta"
+
+#~ msgid "Registri IVA"
+#~ msgstr "Registri IVA"
+
+#~ msgid "Data fattura"
+#~ msgstr "Data fattura"
+
+#~ msgid "Imponibile"
+#~ msgstr "Imponibile"
+
+#~ msgid "SQL view for libro IVA"
+#~ msgstr "Vista SQL per registro IVA"
diff --git a/addons/l10n_it/i18n/l10n_it.pot b/addons/l10n_it/i18n/l10n_it.pot
index 7f210e4cd75..1c46674bb28 100644
--- a/addons/l10n_it/i18n/l10n_it.pot
+++ b/addons/l10n_it/i18n/l10n_it.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Project-Id-Version: OpenERP Server 6.0.2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-07 06:04:30+0000\n"
-"PO-Revision-Date: 2011-01-07 06:04:30+0000\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
+"PO-Revision-Date: 2011-08-11 20:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,81 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
-msgstr ""
-
-#. module: l10n_it
-#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
-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 ""
-
-#. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
-msgstr ""
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr ""
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr ""
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr ""
-
 #. module: l10n_it
 #: model:ir.module.module,description:l10n_it.module_meta_information
 msgid "\n"
@@ -97,59 +22,19 @@ msgid "\n"
 "    "
 msgstr ""
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr ""
-
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr ""
-
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr ""
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr ""
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr ""
-
 #. module: l10n_it
 #: model:ir.module.module,shortdesc:l10n_it.module_meta_information
 msgid "Italy - Generic Chart of Accounts"
 msgstr ""
 
 #. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
+#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
+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 ""
+
+#. module: l10n_it
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
 msgstr ""
 
diff --git a/addons/l10n_it/i18n/pt_BR.po b/addons/l10n_it/i18n/pt_BR.po
index c4943ca17d7..df9315127ae 100644
--- a/addons/l10n_it/i18n/pt_BR.po
+++ b/addons/l10n_it/i18n/pt_BR.po
@@ -7,20 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:04+0000\n"
+"POT-Creation-Date: 2011-08-11 20:06+0000\n"
 "PO-Revision-Date: 2011-03-10 23:11+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-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-25 05:22+0000\n"
+"X-Generator: Launchpad (build 14376)\n"
 
 #. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
-msgid "Registro acquisti"
-msgstr "Registro acquisti"
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+"\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr "Italy - Generic Chart of Accounts"
 
 #. module: l10n_it
 #: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
@@ -42,132 +53,63 @@ msgstr ""
 "Chart of Accounts from a Chart Template."
 
 #. module: l10n_it
-#: view:account.report_libroiva:0
-msgid "Anno Fiscale"
-msgstr "Anno Fiscale"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.it
-msgid "Italia"
-msgstr "Italia"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "REGISTRO IVA"
-msgstr "REGISTRO IVA"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Protocollo"
-msgstr "Protocollo"
-
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.extra
-msgid "Regime Extra comunitario"
-msgstr "Regime Extra comunitario"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "VENDITE"
-msgstr "VENDITE"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Aliquota"
-msgstr "Aliquota"
-
-#. module: l10n_it
-#: field:account.report_libroiva,company_id:0
-msgid "Company"
-msgstr "Company"
-
-#. module: l10n_it
-#: field:account.report_libroiva,name:0
-msgid "Fiscal year"
-msgstr "Fiscal year"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Numero"
-msgstr "Numero"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Fornitore"
-msgstr "Fornitore"
-
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "ACQUISTI"
-msgstr "ACQUISTI"
-
-#. module: l10n_it
-#: model:ir.module.module,description:l10n_it.module_meta_information
-msgid ""
-"\n"
-"    Piano dei conti italiano di un'impresa generica\n"
-"    "
+#: model:ir.model,name:l10n_it.model_account_tax
+msgid "account.tax"
 msgstr ""
-"\n"
-"    Piano dei conti italiano di un'impresa generica\n"
-"    "
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-msgid "Cliente"
-msgstr "Cliente"
+#~ msgid "Aliquota"
+#~ msgstr "Aliquota"
 
-#. module: l10n_it
-#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
-msgid "Registro vendite"
-msgstr "Registro vendite"
+#~ msgid "VENDITE"
+#~ msgstr "VENDITE"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Periodo"
-msgstr "Periodo"
+#~ msgid "Company"
+#~ msgstr "Company"
 
-#. module: l10n_it
-#: view:account.report_libroiva:0
-#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
-#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
-msgid "Registri IVA"
-msgstr "Registri IVA"
+#~ msgid "Anno Fiscale"
+#~ msgstr "Anno Fiscale"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imposta"
-msgstr "Imposta"
+#~ msgid "Registro acquisti"
+#~ msgstr "Registro acquisti"
 
-#. module: l10n_it
-#: model:account.fiscal.position.template,name:l10n_it.intra
-msgid "Regime Intra comunitario"
-msgstr "Regime Intra comunitario"
+#~ msgid "Protocollo"
+#~ msgstr "Protocollo"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Data fattura"
-msgstr "Data fattura"
+#~ msgid "REGISTRO IVA"
+#~ msgstr "REGISTRO IVA"
 
-#. module: l10n_it
-#: report:l10n_it.report.libroIVA_credito:0
-#: report:l10n_it.report.libroIVA_debito:0
-msgid "Imponibile"
-msgstr "Imponibile"
+#~ msgid "Fiscal year"
+#~ msgstr "Fiscal year"
 
-#. module: l10n_it
-#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
-msgid "Italy - Generic Chart of Accounts"
-msgstr "Italy - Generic Chart of Accounts"
+#~ msgid "Fornitore"
+#~ msgstr "Fornitore"
 
-#. module: l10n_it
-#: model:ir.model,name:l10n_it.model_account_report_libroiva
-msgid "SQL view for libro IVA"
-msgstr "SQL view for libro IVA"
+#~ msgid "Numero"
+#~ msgstr "Numero"
+
+#~ msgid "Cliente"
+#~ msgstr "Cliente"
+
+#~ msgid "Imposta"
+#~ msgstr "Imposta"
+
+#~ msgid "Periodo"
+#~ msgstr "Periodo"
+
+#~ msgid "Registri IVA"
+#~ msgstr "Registri IVA"
+
+#~ msgid "ACQUISTI"
+#~ msgstr "ACQUISTI"
+
+#~ msgid "Data fattura"
+#~ msgstr "Data fattura"
+
+#~ msgid "Imponibile"
+#~ msgstr "Imponibile"
+
+#~ msgid "Registro vendite"
+#~ msgstr "Registro vendite"
+
+#~ msgid "SQL view for libro IVA"
+#~ msgstr "SQL view for libro IVA"
diff --git a/addons/l10n_it/libroIVA.py b/addons/l10n_it/libroIVA.py
deleted file mode 100644
index a78c81ffdb3..00000000000
--- a/addons/l10n_it/libroIVA.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010
-#    Italian OpenERP Community (<http://www.openerp-italia.com>)
-#    Servabit srl
-#    Agile Business Group sagl
-#    Domsense srl
-#
-#    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/>.
-#
-##############################################################################
-
-
-# ##################################################################################
-# Questa vista SQL viene usata solo per far scegliere l'anno di pianificazione all'utente
-# Viene infatti costruita una vista XML di tipo tree che contiene solo i diversi anni per i quali stata fatta almeno una pianificazione
-# ##################################################################################
-
-from osv import fields, osv
-
-class l10n_chart_it_report_libroIVA (osv.osv):
-    _name = "account.report_libroiva"
-    _description = "SQL view for libro IVA"
-    _auto = False
-    _rec_name = "name"
-    #_order = "fiscal_year";
-
-    _columns = {
-        'name': fields.char('Fiscal year',size=64),
-        'company_id': fields.many2one('res.company', 'Company'),
-    }
-
-    def init (self, cr) :
-        cr.execute("""DROP VIEW IF EXISTS account_report_libroiva""")
-        cr.execute("""
-                CREATE VIEW account_report_libroiva AS (
-                        SELECT  id, name, company_id FROM account_fiscalyear
-        )""")
-l10n_chart_it_report_libroIVA()
-
-
diff --git a/addons/l10n_it/libroIVA_menu.xml b/addons/l10n_it/libroIVA_menu.xml
deleted file mode 100644
index 51e581ac11c..00000000000
--- a/addons/l10n_it/libroIVA_menu.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE terp SYSTEM "openerp-view.dtd"> 
-<openerp>
-	<data> 
-			
-			<!-- ****************************
-				MENU REPORT LIBRI IVA
-				**************************** -->                                
-			<menuitem name="Registri IVA" 
-				id="menu_report_l10n_chart_it_libroIVA" 
-				sequence="20" 
-				parent="account.menu_finance_reporting" 
-				action="l10n_chart_it_report_libroIVA_action"
-			/>
-	</data>
-</openerp> 
diff --git a/addons/l10n_it/libroIVA_view.xml b/addons/l10n_it/libroIVA_view.xml
deleted file mode 100644
index bbc905e6da0..00000000000
--- a/addons/l10n_it/libroIVA_view.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-	
-		<!-- ****************************
-			REGISTRI IVA TREE VIEW
-			****************************-->
-		<record model="ir.ui.view" id="l10n_chart_it_report_libroIVA_tree">
-			<field name="name">l10n_chart_it_report_libroIVA_tree</field>
-			<field name="model">account.report_libroiva</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Registri IVA" limit="80">
-					<field name="name" string="Anno Fiscale" readonly="True" select="1" />
-				</tree>
-			</field>
-		</record>
-		
-		
-		<!-- ****************************
-			REGISTRI IVA FORM VIEW
-			****************************-->
-		<record model="ir.ui.view" id="l10n_chart_it_report_libroIVA_form">
-			<field name="name">l10n_chart_it_report_libroIVA_form</field>
-			<field name="model">account.report_libroiva</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Registri IVA" >
-					<field name="name" string="Anno Fiscale" readonly="True" />
-				</form>
-			</field>
-		</record>
-
-		<!-- ****************************
-			REGISTRI IVA ACTION
-			****************************-->
-		<record model="ir.actions.act_window" id="l10n_chart_it_report_libroIVA_action">
-			<field name="name">Registri IVA</field>
-			<field name="res_model">account.report_libroiva</field>
-			<field name="view_id" ref="l10n_chart_it_report_libroIVA_tree"/>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-		</record>
-
-
-    </data>
-</openerp>
diff --git a/addons/l10n_it/report.xml b/addons/l10n_it/report.xml
deleted file mode 100644
index e0ba4a33daf..00000000000
--- a/addons/l10n_it/report.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		
-		<report name="l10n_it.report.libroIVA_credito"
-			id="account_ita_libroIVA_credit"
-			string="Registro vendite"
-			model="account.report_libroiva"
-			rml="addons/l10n_it/report/libroIVA_credito.rml"
-			auto="False"
-			header="False"
-		/>
-		
-		<report name="l10n_it.report.libroIVA_debito"
-			id="account_ita_libroIVA_debit"
-			string="Registro acquisti"
-			model="account.report_libroiva"
-			rml="addons/l10n_it/report/libroIVA_debito.rml"
-			auto="False"
-			header="False"
-		/>
-		
-	</data>
-</openerp>
diff --git a/addons/l10n_it/report/__init__.py b/addons/l10n_it/report/__init__.py
deleted file mode 100644
index be32155c675..00000000000
--- a/addons/l10n_it/report/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import libroIVA_credito
-import libroIVA_debito
\ No newline at end of file
diff --git a/addons/l10n_it/report/libroIVA_credito.py b/addons/l10n_it/report/libroIVA_credito.py
deleted file mode 100644
index b48c81d2475..00000000000
--- a/addons/l10n_it/report/libroIVA_credito.py
+++ /dev/null
@@ -1,79 +0,0 @@
-import datetime
-import time
-from report import report_sxw
-from osv import osv
-import pooler
-            
-
-class l10n_chart_it_report_libroIVA_credito(report_sxw.rml_parse):
-	
-    def __init__(self, cr, uid, name, context):
-        super(l10n_chart_it_report_libroIVA_credito,self).__init__(cr,uid,name,context)
-        self.localcontext.update({
-            'time' : time,
-	    'get_company' : self.get_company,
-	    'get_periods' : self.get_periods,
-	    'get_lines' : self.get_lines,
-        })
-	
-	
-    def get_company(self,fiscal_year):
-	#print 'COMP = ',fiscal_year
-        return ""
-	
-    def get_periods(self,fiscal_year):
-	#print 'Fiscal year id:',fiscal_year.id
-	obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-	fy=obj.browse(self.cr,self.uid,fiscal_year.id)
-	#print 'Periods = ',fy.period_ids
-	res=[rec for rec in fy.period_ids]
-	#return fy.periods  => non funziona?!? bool object !?!?
-	return res
-	
-    def get_invoices(self,period):
-	#print 'PERIOD = ',period.name
-	obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
-	# Selezione tutte le fatture emesse nel periodo
-	self.cr.execute(	"""
-					SELECT id FROM account_invoice 
-					WHERE 	(state='open' OR state='paid') AND
-							period_id="""+str(period.id)+"""
-							AND (type='out_invoice' OR type='out_refund')
-					""")
-	ids=self.cr.fetchall()
-	#print 'IDS = ',
-	if ids:
-	    ids=[id[0] for id in ids ]
-	invoices=obj.browse(self.cr,self.uid,ids)
-	#print 'INVOICES = ',invoices
-	return invoices
-	
-    def get_lines(self,fiscal_year):
-	res=[]
-	obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-	fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
-	for period in fy.period_ids:
-	    invoices=self.get_invoices(period)
-	    for invoice in invoices:
-		d={'periodo': period.name}
-	        d['protocollo']=invoice.number
-		#print 'PARTNER ',invoice.partner_id.name
-		causale=invoice.partner_id.name
-		#print 'CAUSALE = ',causale
-		d['causale']=causale
-		d['numero']=invoice.reference
-		d['data_doc']=invoice.date_invoice
-		for tax in invoice.tax_line:
-		    #print '\tTAX: ',tax
-		    d['aliquota']=tax.tax_code_id.name
-		    d['imponibile']=tax.base
-		    d['imposta']=tax.amount
-		    res.append(d)
-		    d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
-	return res
-
-
-        
-report_sxw.report_sxw('report.l10n_it.report.libroIVA_credito','account.report_libroiva',
-                      'l10n_it/report/libroIVA_credito.rml',
-                       parser=l10n_chart_it_report_libroIVA_credito,header=False)
diff --git a/addons/l10n_it/report/libroIVA_credito.rml b/addons/l10n_it/report/libroIVA_credito.rml
deleted file mode 100644
index 2b282f760b4..00000000000
--- a/addons/l10n_it/report/libroIVA_credito.rml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
-    </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="#000000" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-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="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-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="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-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="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-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="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-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="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-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="LINEBEFORE" colorName="#000000" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,0" stop="7,-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="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,1" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
-      <blockBackground colorName="#ffcc99" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffcc99" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffcc99" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#ffcc99" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#ffcc99" start="4,0" stop="4,-1"/>
-      <blockBackground colorName="#ffcc99" start="5,0" stop="5,-1"/>
-      <blockBackground colorName="#ffcc99" start="6,0" stop="6,-1"/>
-      <blockBackground colorName="#ffcc99" start="7,0" stop="7,-1"/>
-      <blockBackground colorName="#ffffff" start="0,1" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,1" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,1" stop="2,-1"/>
-      <blockBackground colorName="#ffffff" start="3,1" stop="3,-1"/>
-      <blockBackground colorName="#ffffff" start="4,1" stop="4,-1"/>
-      <blockBackground colorName="#ffffff" start="5,1" stop="5,-1"/>
-      <blockBackground colorName="#ffffff" start="6,1" stop="6,-1"/>
-      <blockBackground colorName="#ffffff" start="7,1" stop="7,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P6" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" 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="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="MP1" fontName="Times-Roman" alignment="RIGHT"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="P2">[[ repeatIn(objects, 'o') ]]</para>
-    <blockTable colWidths="249.0,249.0" style="Table1">
-      <tr>
-        <td>
-          <para style="P10">
-            <font face="Times-Roman" size="10.0">[[ get_company(o) ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="P16">
-            <font face="Times-Roman">REGISTRO IVA </font>
-          </para>
-          <para style="P16">
-            <font face="Times-Roman">VENDITE </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P2">
-      <font color="white"> </font>
-    </para>
-    <para style="P11">[[ o.name ]] </para>
-    <para style="P2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="39.0,50.0,92.0,45.0,54.0,76.0,69.0,74.0" repeatRows="1" style="Table2">
-      <tr>
-        <td>
-          <para style="P7">Periodo</para>
-        </td>
-        <td>
-          <para style="P7">Protocollo</para>
-        </td>
-        <td>
-          <para style="P7">Cliente</para>
-        </td>
-        <td>
-          <para style="P7">Numero</para>
-        </td>
-        <td>
-          <para style="P7">Data fattura</para>
-        </td>
-        <td>
-          <para style="P7">Aliquota</para>
-        </td>
-        <td>
-          <para style="P7">Imponibile</para>
-        </td>
-        <td>
-          <para style="P7">Imposta</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P3">[[ repeatIn(get_lines(o), 'line') ]]</para>
-          <para style="P3">[[ line['periodo'] ]]</para>
-        </td>
-        <td>
-          <para style="P3">[[ line['protocollo'] ]]</para>
-        </td>
-        <td>
-          <para style="P3">[[ line['causale'] ]]</para>
-        </td>
-        <td>
-          <para style="P3">[[ line['numero'] ]]</para>
-        </td>
-        <td>
-          <para style="P3">[[ line['data_doc'] ]]</para>
-        </td>
-        <td>
-          <para style="P14">[[ line['aliquota'] ]]</para>
-        </td>
-        <td>
-          <para style="P15">[[ line['imponibile'] ]]</para>
-        </td>
-        <td>
-          <para style="P15">[[ line['imposta'] ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
-
diff --git a/addons/l10n_it/report/libroIVA_debito.py b/addons/l10n_it/report/libroIVA_debito.py
deleted file mode 100644
index c7720ab69a1..00000000000
--- a/addons/l10n_it/report/libroIVA_debito.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import datetime
-import time
-from report import report_sxw
-from osv import osv
-import pooler
-            
-
-class l10n_chart_it_report_libroIVA_debito(report_sxw.rml_parse):
-	
-    def __init__(self, cr, uid, name, context):
-        super(l10n_chart_it_report_libroIVA_debito,self).__init__(cr,uid,name,context)
-        self.localcontext.update({
-            'time' : time,
-	    'get_company' : self.get_company,
-	    'get_periods' : self.get_periods,
-	    'get_lines' : self.get_lines,
-        })
-	
-	
-    def get_company(self,fiscal_year):
-	#print 'COMP = ',fiscal_year
-        return ""
-	
-	
-    def get_periods(self,fiscal_year):
-	#print 'Fiscal year id:',fiscal_year.id
-	obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-	fy=obj.browse(self.cr,self.uid,fiscal_year.id)
-	#print 'Periods = ',fy.period_ids
-	res=[rec for rec in fy.period_ids]
-	#return fy.periods  => non funziona?!? bool object !?!?
-	return res
-	
-    def get_invoices(self,period):
-	#print 'PERIOD = ',period.name
-	obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
-	# Selezione tutte le fatture emesse nel periodo
-	self.cr.execute(	"""
-					SELECT id FROM account_invoice 
-					WHERE 	(state='open' OR state='paid') AND
-							period_id="""+str(period.id)+"""
-							AND (type='in_invoice' OR type='in_refund')
-					""")
-	ids=self.cr.fetchall()
-	#print 'IDS = ',
-	if ids:
-	    ids=[id[0] for id in ids ]
-	invoices=obj.browse(self.cr,self.uid,ids)
-	#print 'INVOICES = ',invoices
-	return invoices
-	
-    def get_lines(self,fiscal_year):
-	res=[]
-	obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-	fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
-	for period in fy.period_ids:
-	    invoices=self.get_invoices(period)
-	    for invoice in invoices:
-		d={'periodo': period.name}
-	        d['protocollo']=invoice.number
-		#print 'PARTNER ',invoice.partner_id.name
-		causale=invoice.partner_id.name
-		#print 'CAUSALE = ',causale
-		d['causale']=causale
-		d['numero']=invoice.reference
-		d['data_doc']=invoice.date_invoice
-		for tax in invoice.tax_line:
-		    #print '\tTAX: ',tax
-		    d['aliquota']=tax.tax_code_id.name
-		    d['imponibile']=tax.base
-		    d['imposta']=tax.amount
-		    res.append(d)
-		    d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
-	return res
-
-
-        
-report_sxw.report_sxw('report.l10n_it.report.libroIVA_debito','account.report_libroiva',
-                      'l10n_it/report/libroIVA_debito.rml',
-                       parser=l10n_chart_it_report_libroIVA_debito,header=False)
diff --git a/addons/l10n_it/report/libroIVA_debito.rml b/addons/l10n_it/report/libroIVA_debito.rml
deleted file mode 100644
index ced847722af..00000000000
--- a/addons/l10n_it/report/libroIVA_debito.rml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-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="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-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="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-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="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-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="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-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="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-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="LINEBEFORE" colorName="#000000" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,0" stop="7,-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="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,1" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
-      <blockBackground colorName="#ffcc99" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffcc99" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffcc99" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#ffcc99" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#ffcc99" start="4,0" stop="4,-1"/>
-      <blockBackground colorName="#ffcc99" start="5,0" stop="5,-1"/>
-      <blockBackground colorName="#ffcc99" start="6,0" stop="6,-1"/>
-      <blockBackground colorName="#ffcc99" start="7,0" stop="7,-1"/>
-      <blockBackground colorName="#ffffff" start="0,1" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,1" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,1" stop="2,-1"/>
-      <blockBackground colorName="#ffffff" start="3,1" stop="3,-1"/>
-      <blockBackground colorName="#ffffff" start="4,1" stop="4,-1"/>
-      <blockBackground colorName="#ffffff" start="5,1" stop="5,-1"/>
-      <blockBackground colorName="#ffffff" start="6,1" stop="6,-1"/>
-      <blockBackground colorName="#ffffff" start="7,1" stop="7,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
-    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" 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="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="MP1" fontName="Times-Roman" alignment="RIGHT"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="P7">[[ repeatIn(objects, 'o') ]]</para>
-    <blockTable colWidths="249.0,249.0" style="Table2">
-      <tr>
-        <td>
-          <para style="P10">
-            <font face="Times-Roman" size="10.0">[[ get_company(o) ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="P12">
-            <font face="Times-Roman">REGISTRO IVA</font>
-          </para>
-          <para style="P12">
-            <font face="Times-Roman">ACQUISTI</font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P7">
-      <font color="white"> </font>
-    </para>
-    <para style="P11">[[ o.name ]] </para>
-    <para style="P7">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="39.0,50.0,92.0,45.0,54.0,76.0,69.0,74.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="P8">Periodo</para>
-        </td>
-        <td>
-          <para style="P8">Protocollo</para>
-        </td>
-        <td>
-          <para style="P8">Fornitore</para>
-        </td>
-        <td>
-          <para style="P8">Numero</para>
-        </td>
-        <td>
-          <para style="P8">Data fattura</para>
-        </td>
-        <td>
-          <para style="P8">Aliquota</para>
-        </td>
-        <td>
-          <para style="P8">Imponibile</para>
-        </td>
-        <td>
-          <para style="P8">Imposta</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P2">[[ repeatIn(get_lines(o), 'line') ]]</para>
-          <para style="P2">[[ line['periodo'] ]]</para>
-        </td>
-        <td>
-          <para style="P2">[[ line['protocollo'] ]]</para>
-        </td>
-        <td>
-          <para style="P2">[[ line['causale'] ]]</para>
-        </td>
-        <td>
-          <para style="P2">[[ line['numero'] ]]</para>
-        </td>
-        <td>
-          <para style="P2">[[ line['data_doc'] ]]</para>
-        </td>
-        <td>
-          <para style="P3">[[ line['aliquota'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['imponibile'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">[[ line['imposta'] ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P5">
-      <font color="white"> </font>
-    </para>
-    <para style="P6">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
-
diff --git a/addons/l10n_it/report/normalized_oo2rml.xsl b/addons/l10n_it/report/normalized_oo2rml.xsl
deleted file mode 100644
index 14fcf598e54..00000000000
--- a/addons/l10n_it/report/normalized_oo2rml.xsl
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
-  version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:fo="http://www.w3.org/1999/XSL/Format"
-  xmlns:office="http://openoffice.org/2000/office"
-  xmlns:style="http://openoffice.org/2000/style"
-  xmlns:text="http://openoffice.org/2000/text"
-  xmlns:table="http://openoffice.org/2000/table"
-  xmlns:draw="http://openoffice.org/2000/drawing"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:number="http://openoffice.org/2000/datastyle"
-  xmlns:svg="http://www.w3.org/2000/svg"
-  xmlns:chart="http://openoffice.org/2000/chart"
-  xmlns:dr3d="http://openoffice.org/2000/dr3d"
-  xmlns:math="http://www.w3.org/1998/Math/MathML"
-  xmlns:form="http://openoffice.org/2000/form"
-  xmlns:script="http://openoffice.org/2000/script"
-  office:class="text" office:version="1.0"
-  exclude-result-prefixes = "xsl fo office style text table draw xlink number svg chart dr3d math form script">
-
-  <!--TODO's: indent, picture cache (trml2pdf) -->
-
-<xsl:output method="xml" indent="yes" />
-<xsl:strip-space elements="*"/>
-
-<xsl:key name="text_style" match="style:style[@style:family='text']" use="@style:name" />
-<xsl:key name="page_break_before" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-before='page']" use="@style:name" />
-<xsl:key name="page_break_after" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-after='page']" use="@style:name" />
-<xsl:key name="table_column_style" match="style:style[@style:family='table-column']" use="@style:name" />
-<xsl:key name="table_cell_style" match="style:style[@style:family='table-cell']" use="@style:name" />
-<xsl:key name="paragraph_style" match="style:style[@style:family='paragraph']" use="@style:name" />
-
-<xsl:template match="office:document-content">
-  <document filename="test.pdf">
-    <xsl:apply-templates select="office:automatic-styles" />
-    <xsl:apply-templates select="office:body" />
-  </document>
-</xsl:template>
-
-<xsl:template name="page_size">
-  <xsl:attribute name="pageSize">
-    <xsl:text>(</xsl:text>
-    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
-    <xsl:text>,</xsl:text>
-    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
-    <xsl:text>)</xsl:text>
-  </xsl:attribute>
-</xsl:template>
-
-<xsl:template name="fixed_frame">
-	<xsl:for-each select="//draw:text-box">
-		<frame>
-			<xsl:attribute name="id"><xsl:value-of select="./@draw:name" /></xsl:attribute>
-			<xsl:attribute name="x1"><xsl:value-of select="./@svg:x" /></xsl:attribute>
-			<xsl:attribute name="y1">
-				<xsl:value-of
-					select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height - ./@svg:y - ./@fo:min-height" />
-			</xsl:attribute>
-			<xsl:attribute name="width">
-				<xsl:value-of select="./@svg:width" />
-			</xsl:attribute>
-			<xsl:attribute name="height">
-				<xsl:value-of select="./@fo:min-height" />
-			</xsl:attribute>
-		</frame>
-	</xsl:for-each>
-</xsl:template>
-
-<xsl:template name="margin_sizes">
-  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
-  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
-  <xsl:variable name="margin_top" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-top" />
-  <xsl:variable name="margin_bottom" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-bottom" />
-  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
-  <xsl:variable name="page_height" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
-  <xsl:attribute name="x1"><xsl:value-of select="$margin_left" /></xsl:attribute>
-  <xsl:attribute name="y1"><xsl:value-of select="$margin_bottom" /></xsl:attribute>
-  <xsl:attribute name="width"><xsl:value-of select="$page_width - $margin_left - $margin_right"/></xsl:attribute>
-  <xsl:attribute name="height"><xsl:value-of select="$page_height - $margin_bottom - $margin_top"/></xsl:attribute>
-</xsl:template>
-
-<xsl:template name="text_width">
-  <!-- You need this for the workaround to make primitive outlines-->
-  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
-  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
-  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
-  <xsl:value-of select="$page_width - $margin_left - $margin_right - 18"/>
-</xsl:template>
-
-
-
-<xsl:template match="office:automatic-styles">
-  <!--<template pageSize="(21cm, 29.7cm)" leftMargin="1.0cm" rightMargin="2.0cm" topMargin="1.0cm" bottomMargin="1.0cm" title="Test" author="Martin Simon" allowSplitting="20">-->
-  <template pageSize="(21cm, 29.7cm)" title="Test" author="Martin Simon" allowSplitting="20">
-    <xsl:call-template name="page_size" />
-    <pageTemplate id="first">
-	  <xsl:call-template name="fixed_frame" />
-      <frame id="first" x1="2cm" y1="2cm" width="17cm" height="26cm">
-        <xsl:call-template name="margin_sizes" />
-      </frame>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <!--A table style to simulate primitive outlines -till the <addOutline> tag is implemented in trml2pdf -->
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <!--use two standard table grid styles like PyOpenOffice "Old Way": with and without a grid-->
-    <!--TODO insert table cell colors here, not within the <td> tag - otherwise
-         it will not work with flowables as cell content-->
-    <xsl:call-template name="make_blocktablestyle" />
-    <initialize>
-      <paraStyle name="all" alignment="justify" />
-    </initialize>
-    <xsl:apply-templates select="style:style" />
-  </stylesheet>
-</xsl:template>
-
-<xsl:template name="make_blocktablestyle">
-  <xsl:for-each select="//table:table">
-    <xsl:variable name="test">
-      <xsl:value-of select="./@table:name" />
-    </xsl:variable>
-    <xsl:if test="not(boolean(count(preceding-sibling::table:table[@table:name=$test])))">
-      <!--Test if this is the first table with this style, nested tables not counted-->
-      <blockTableStyle id="{@table:name}">
-	    <xsl:if test=".//draw:image">
-	      <blockTopPadding value="0"/>
-	      <blockBottomPadding value="0"/>
-	    </xsl:if>
-        <blockAlignment value="LEFT" />
-        <blockValign value="TOP" />
-        <xsl:call-template name="make_linestyle" />
-        <xsl:call-template name="make_tablebackground" />
-      </blockTableStyle>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="make_linestyle">
-	<xsl:for-each select=".//table:table-row">
-		<xsl:variable name="row" select="position() - 1"/>
-		<xsl:for-each select=".//table:table-cell">
-			<xsl:variable name="col" select="position() - 1"/>
-			<xsl:variable name="linebefore">
-				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-left"/>
-			</xsl:variable>
-			<xsl:if test="not($linebefore='') and not($linebefore='none')">
-				<xsl:variable name="colorname">
-					<xsl:value-of select="substring-after($linebefore,'#')"/>
-				</xsl:variable>
-				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
-			</xsl:if>
-			<xsl:variable name="lineafter">
-				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-right"/>
-			</xsl:variable>
-			<xsl:if test="not($lineafter='') and not($lineafter='none')">
-				<xsl:variable name="colorname">
-					<xsl:value-of select="substring-after($lineafter,'#')"/>
-				</xsl:variable>
-				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
-			</xsl:if>
-			<xsl:variable name="lineabove">
-				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-top"/>
-			</xsl:variable>
-			<xsl:if test="not($lineabove='') and not($lineabove='none')">
-				<xsl:variable name="colorname">
-					<xsl:value-of select="substring-after($lineabove,'#')"/>
-				</xsl:variable>
-				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
-			</xsl:if>
-			<xsl:variable name="linebelow">
-				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-bottom"/>
-			</xsl:variable>
-			<xsl:if test="not($linebelow='') and not($linebelow='none')">
-				<xsl:variable name="colorname">
-					<xsl:value-of select="substring-after($linebelow,'#')"/>
-				</xsl:variable>
-				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
-			</xsl:if>
-			<xsl:variable name="grid">
-				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border"/>
-			</xsl:variable>
-			<xsl:if test="not($grid='') and not($grid='none')">
-				<xsl:variable name="colorname">
-					<xsl:value-of select="substring-after($grid,'#')"/>
-				</xsl:variable>
-				<!-- Don't use grid because we don't need a line between each rows -->
-				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
-				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
-				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
-				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
-			</xsl:if>
-		</xsl:for-each>
-	</xsl:for-each>
-</xsl:template>
-
-<!-- Was needed to simulate bulleted lists:
-<xsl:template match="text:ordered-list|text:unordered-list">
-  <xsl:variable name = "text_width">
-    <xsl:call-template name="text_width" />
-  </xsl:variable>
-  <blockTable style="Standard_Outline" colWidths="18,{$text_width}">
-  <xsl:apply-templates match="text:list-item" />
-</blockTable>
-</xsl:template>
-
-<xsl:template match="text:list-item">
-  <tr>
-    <td><para><font face="Helvetica-Bold" size="10">*</font></para></td>
-    <td>
-      <xsl:apply-templates />
-    </td>
-  </tr>
-</xsl:template>
-
--->
-
-
-<xsl:template match="office:body">
-  <story>
-    <xsl:apply-templates />
-	<xsl:for-each select="//draw:text-box">
-		<currentFrame>
-			<xsl:attribute name="name">
-				<xsl:value-of select="./@draw:name" />
-			</xsl:attribute>
-		</currentFrame>
-		<xsl:apply-templates>
-			<xsl:with-param name="skip_draw" select="0" />
-		</xsl:apply-templates>
-		<frameEnd />
-	</xsl:for-each>
-	<xsl:for-each select="//text:ordered-list">
-		<para><seqReset id="{//text:ordered-list/@text:style-name}"/></para>
-	</xsl:for-each>
-  </story>
-</xsl:template>
-
-<xsl:template match="table:table">
-  <blockTable>
-    <xsl:attribute name="colWidths">
-      <xsl:call-template name="make_columns" />
-    </xsl:attribute>
-    <xsl:call-template name="make_tableheaders" />
-    <xsl:attribute name="style">
-      <xsl:value-of select="@table:name" />
-    </xsl:attribute>
-    <xsl:apply-templates />
-  </blockTable>
-</xsl:template>
-
-<xsl:template name="make_tableheaders">
-  <xsl:if test="boolean(count(table:table-header-rows))">
-    <xsl:attribute name="repeatRows">1</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make_tablebackground">
-  <xsl:for-each select=".//table:table-row">
-    <!--Be careful when there are table:table-header-rows as
-         parent node of table:table-row -->
-    <xsl:variable name="row" select="position() - 1" />
-    <xsl:for-each select="./table:table-cell">
-      <xsl:variable name="col" select="position() - 1" />
-      <xsl:variable name="background">
-        <xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:background-color" />
-      </xsl:variable>
-      <xsl:if test="not($background='') and boolean(key('table_cell_style',@table:style-name)/style:properties/@fo:background-color) and starts-with($background,'#')">
-        <!--only RGB hexcolors are accepted -->
-		<blockBackground colorName="{$background}" start="{$col},{$row}" stop="{$col},-1" />
-      </xsl:if>
-     </xsl:for-each>
-   </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="make_columns">
-  <xsl:variable name="columns" >
-    <xsl:for-each select="table:table-column">
-      <xsl:value-of select="key('table_column_style',@table:style-name)/style:properties/@style:column-width" />
-      <xsl:text>,</xsl:text>
-    </xsl:for-each>
-  </xsl:variable>
-  <xsl:value-of select="substring($columns,1,string-length($columns) - 1)" />
-  <!--strip the last comma-->
-</xsl:template>
-
-<xsl:template match="table:table-row">
-  <tr>
-    <xsl:apply-templates />
-  </tr>
-</xsl:template>
-
-<xsl:template match="table:table-cell">
-  <td>
-    <xsl:apply-templates />
-  </td>
-</xsl:template>
-
-<xsl:template match="text:section">
-  <section>
-    <xsl:apply-templates />
-  </section>
-</xsl:template>
-
-
-<xsl:template match="text:span">
-  <font>
-    <xsl:call-template name="make_fontnames_span" />
-    <xsl:call-template name="make_fontsize_span" />
-    <xsl:apply-templates />
-  </font>
-</xsl:template>
-
-<xsl:template name="make_fontsize_span">
-  <xsl:variable name ="fontsize">
-    <xsl:value-of select="key('text_style',@text:style-name)/style:properties/@fo:font-size" />
-  </xsl:variable>
-  <xsl:if test="not($fontsize='') and boolean(key('text_style',@text:style-name)/style:properties/@fo:font-size)" >
-    <xsl:attribute name="size">
-      <xsl:value-of select="$fontsize" />
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make_fontnames_span">
-  <xsl:attribute name="face">
-    <xsl:call-template name="make_fontnames">
-      <xsl:with-param name="fontName" select="key('text_style',@text:style-name)/style:properties/@style:font-name"  />
-      <xsl:with-param name="fontWeight" select="key('text_style',@text:style-name)/style:properties/@fo:font-weight"  />
-      <xsl:with-param name="fontStyle" select="key('text_style',@text:style-name)/style:properties/@fo:font-style" />
-    </xsl:call-template>
-  </xsl:attribute>
-</xsl:template>
-
-<xsl:template name="make_image">
-  <illustration height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}">
-    <image x="0" y="0" file="{substring-after(.//draw:image/@xlink:href,'#Pictures/')}" height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}" />
-  </illustration>
-</xsl:template>
-
-<xsl:template name="empty_paragraph">
-  <xsl:if test="not(boolean(count(descendant::node())))">
-    <xsl:call-template name="distance_point">
-      <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="distance_point">
-  <xsl:param name="background" />
-  <xsl:param name="tab_stop"></xsl:param>
-  <xsl:variable name="local_back">
-    <xsl:choose>
-      <xsl:when test="not(boolean($background)) or not(contains($background,'#'))">
-        <!-- Do not accept OO colors like "transparent", only hex-colors -->
-        <xsl:text>white</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$background" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <font color="{$local_back}">
-    <xsl:text> </xsl:text>
-    <xsl:if test="boolean($tab_stop)">
-      <!-- simulate a tabstop with white/background-color points -->
-      <xsl:text>.........</xsl:text>
-    </xsl:if>
-  </font>
-</xsl:template>
-
-<xsl:template match="text:ordered-list">
-  <xsl:apply-templates />
-
-  <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
-       so it needs a dummy paragraph to enclose it -->
-</xsl:template>
-
-<xsl:template name="make_listitem">
-  <xsl:if test="(name(..)='text:list-item')">
-    <xsl:attribute name="leftIndent">15</xsl:attribute>
-    <xsl:attribute name="bulletIndent">0</xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="(name(../..)='text:unordered-list')">
-        <xsl:variable name="fontsize">
-          <xsl:value-of select="number(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)" />
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="$fontsize='NaN'">
-            <!-- you should exclude non-numerical values for bulletFontSize. <== Sometimes the preprocessing went wrong.-->
-            <!--use a default bullet font size-->
-            <xsl:attribute name="bulletFontSize">6</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="bulletFontSize"><xsl:value-of select="floor(($fontsize div 2) + 1)" /></xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
-        <xsl:attribute name="bulletText">l</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- Generate the numbers for an ordered list -->
-        <xsl:variable name="size">
-          <xsl:value-of select="key('paragraph_style',@text:style-name)/style:properties/@fo:font-size" />
-        </xsl:variable>
-        <!-- For ordered lists we use the bullet tag from Platypus Intra Paragraph Markup -->
-        <bullet>
-          <xsl:if test="not($size='') and boolean(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)">
-            <xsl:attribute name="size">
-              <!-- adapt the fontsize to the fontsize of the current paragraph -->
-              <xsl:value-of select="$size" />
-            </xsl:attribute>
-          </xsl:if>
-          <seq id="{../../@text:style-name}"/>.</bullet>
-
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text:drop-down">
-    <xsl:value-of select="text:label[2]/@text:value" />
-</xsl:template>
-
-
-<xsl:template match="text:p|text:h">
-	<xsl:param name="skip_draw" select="1" />
-  <xsl:if test="boolean(key('page_break_before',@text:style-name))" >
-    <pageBreak />
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="boolean(.//draw:image)">
-      <xsl:call-template name="make_image" />
-    </xsl:when>
-	<xsl:when test="boolean(name(..) = 'draw:text-box') and boolean($skip_draw)">
-	</xsl:when>
-    <xsl:otherwise>
-      <para>
-        <xsl:attribute name="style">
-          <xsl:value-of select="@text:style-name" />
-        </xsl:attribute>
-        <xsl:call-template name="make_listitem" />
-        <xsl:apply-templates />
-        <xsl:call-template name="empty_paragraph" />
-      </para>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="boolean(key('page_break_after',@text:style-name))" >
-    <pageBreak />
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text:p/text:tab-stop">
-  <!-- simulate a tabstop -->
-  <xsl:call-template name="distance_point">
-    <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
-    <xsl:with-param name="tab_stop">yes</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- experimental - switched off
-<xsl:template match="text:h">
-  <para>
-    <xsl:attribute name="style">
-      <xsl:value-of select="@text:style-name" />
-    </xsl:attribute>
-    <xsl:call-template name="make_number" />
-    <xsl:apply-templates />
-    <xsl:call-template name="empty_paragraph" />
-  </para>
-</xsl:template>
-
-<xsl:template name="make_number">
-  <xsl:choose>
-    <xsl:when test="@text:level='1'">
-      <xsl:number format="1. " />
-    </xsl:when>
-    <xsl:when test="@text:level='2'">
-      <xsl:number count="text:h[@text:level='1']|text:h[text:level='2']" level="any" format="1.1." />
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
--->
-
-<xsl:template match="style:style[@style:family='paragraph']">
-  <paraStyle>
-    <xsl:attribute name="name">
-      <xsl:value-of select="@style:name" />
-    </xsl:attribute>
-    <xsl:call-template name="make_indent_paragraph" />
-    <xsl:call-template name="make_fontnames_paragraph" />
-    <xsl:call-template name="make_fontsize" />
-    <!--<xsl:call-template name="make_parent" /> not necessary -
-         parent styles processed by PyOpenOffice -->
-    <xsl:call-template name="make_alignment" />
-    <xsl:call-template name="make_background" />
-    <xsl:call-template name="make_space_beforeafter" />
-    <xsl:call-template name="make_fontcolor" />
-  </paraStyle>
-</xsl:template>
-
-<xsl:template name="make_indent_paragraph">
-  <xsl:variable name="right_indent"><xsl:value-of select="style:properties/@fo:margin-right" /></xsl:variable>
-  <xsl:variable name="left_indent"><xsl:value-of select="style:properties/@fo:margin-left" /></xsl:variable>
-  <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
-    <xsl:attribute name="rightIndent">
-      <xsl:value-of select="$right_indent" />
-    </xsl:attribute>
-  </xsl:if>
-  <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
-    <xsl:attribute name="leftIndent">
-      <xsl:value-of select="$left_indent" />
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make_background">
-  <xsl:variable name="background">
-    <xsl:value-of select="style:properties/@fo:background-color" />
-  </xsl:variable>
-  <xsl:if test="not($background='') and boolean(style:properties/@fo:background-color) and starts-with($background,'#')" >
-    <xsl:attribute name="backColor">
-      <xsl:value-of select="$background" />
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make_space_beforeafter">
-  <xsl:variable name="before">
-    <xsl:value-of select="style:properties/@fo:margin-top" />
-  </xsl:variable>
-  <xsl:variable name="after">
-    <xsl:value-of select="style:properties/@fo:margin-bottom" />
-  </xsl:variable>
-  <xsl:if test="not($before='') and boolean(style:properties/@fo:margin-top)" >
-    <xsl:attribute name="spaceBefore">
-      <xsl:value-of select="$before" />
-    </xsl:attribute>
-  </xsl:if>
-  <xsl:if test="not($after='') and boolean(style:properties/@fo:margin-bottom)" >
-    <xsl:attribute name="spaceAfter">
-      <xsl:value-of select="$after" />
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make_fontsize">
-  <xsl:variable name="fontSize">
-    <xsl:value-of select="style:properties/@fo:font-size" />
-  </xsl:variable>
-  <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
-    <xsl:attribute name="fontSize">
-      <xsl:value-of select="$fontSize" />
-    </xsl:attribute>
-    <xsl:attribute name="leading">
-      <xsl:value-of select="$fontSize + floor($fontSize div 5) + 1" />
-      <!--use a standard leading related to the font size -->
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!--this template is not needed anymore for "normalized" sxw files -->
-<xsl:template name="make_parent">
-  <xsl:variable name="parent">
-    <xsl:value-of select="@style:parent-style-name" />
-  </xsl:variable>
-  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">
-    <xsl:attribute name="parent">
-      <xsl:value-of select="$parent" />
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make_alignment">
-  <xsl:variable name="alignment">
-    <xsl:value-of select="style:properties/@fo:text-align" />
-  </xsl:variable>
-  <xsl:if test="not($alignment='') and boolean(style:properties/@fo:text-align)">
-    <xsl:choose>
-      <xsl:when test="$alignment='start'">
-        <xsl:attribute name="alignment">LEFT</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$alignment='center'">
-        <xsl:attribute name="alignment">CENTER</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$alignment='end'">
-        <xsl:attribute name="alignment">RIGHT</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$alignment='justify'">
-        <xsl:attribute name="alignment">JUSTIFY</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make_fontnames_paragraph">
-  <xsl:attribute name="fontName">
-    <xsl:call-template name="make_fontnames">
-      <xsl:with-param name="fontName" select="style:properties/@style:font-name" />
-      <xsl:with-param name="fontWeight" select="style:properties/@fo:font-weight" />
-      <xsl:with-param name="fontStyle" select="style:properties/@fo:font-style" />
-    </xsl:call-template>
-  </xsl:attribute>
-</xsl:template>
-
-<xsl:template name="make_fontnames">
-  <!--much too verbose, needs improvement-->
-<xsl:param name="fontName" />
-<xsl:param name="fontWeight" />
-<xsl:param name="fontStyle" />
-<xsl:choose>
-<xsl:when test="not($fontName='') and boolean($fontName)">
-  <xsl:choose>
-    <xsl:when test="contains($fontName,'Courier')">
-      <xsl:choose>
-        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Courier-BoldOblique</xsl:text>
-        </xsl:when>
-        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
-          <xsl:text>Courier-Bold</xsl:text>
-        </xsl:when>
-        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Courier-Oblique</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>Courier</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="contains($fontName,'Helvetica') or contains($fontName,'Arial') or contains($fontName,'Sans')">
-      <xsl:choose>
-        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Helvetica-BoldOblique</xsl:text>
-        </xsl:when>
-        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
-          <xsl:text>Helvetica-Bold</xsl:text>
-        </xsl:when>
-        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Helvetica-Oblique</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>Helvetica</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Times-BoldItalic</xsl:text>
-        </xsl:when>
-        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
-          <xsl:text>Times-Bold</xsl:text>
-        </xsl:when>
-        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Times-Italic</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>Times-Roman</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:when>
-<xsl:otherwise>
-  <!--Use this as default -->
-  <xsl:text>Times-Roman</xsl:text>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<xsl:template name="make_fontcolor">
-  <xsl:variable name="textColor">
-    <xsl:value-of select="style:properties/@fo:color"/>
-  </xsl:variable>
-  <xsl:if test="not($textColor='') and boolean(style:properties/@fo:color)">
-  <xsl:attribute name="textColor">
-      <xsl:value-of select="$textColor" />
-   </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!--
-This stylesheet is part of:
-PyOpenOffice Version 0.4
-Copyright (C) 2005: Martin Simon
-Homepage: www.bezirksreiter.de
-
-GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
--->
-
-</xsl:stylesheet>
-
-
diff --git a/addons/l10n_it/security/ir.model.access.csv b/addons/l10n_it/security/ir.model.access.csv
deleted file mode 100644
index 8a8908511db..00000000000
--- a/addons/l10n_it/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_l10n_it_report_manager","l10n_it.report account manager","model_account_report_libroiva","account.group_account_manager",1,1,1,1
-"access_l10n_it_report_user","l10n_it_report account user","model_account_report_libroiva","account.group_account_user",1,1,1,1
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 09d8dbfabe3..7a4436e31c1 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Luxembourg - Plan Comptable Minimum Normalise',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
 ======================================================================
diff --git a/addons/l10n_lu/i18n/ar.po b/addons/l10n_lu/i18n/ar.po
index a8ea4461db3..9f6e6b8f5d6 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 326d392d58c..41482918a3a 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8313bd078a3..fb690936ac2 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 67eaedec1b6..a839ffd0d3c 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a8ea4461db3..9f6e6b8f5d6 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ff4774c84e5..cec08c0f4b7 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 27393eebd5e..1c6a1ab16a3 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9e94fcc7a1e..93ebb687bc3 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es_MX.po b/addons/l10n_lu/i18n/es_MX.po
new file mode 100644
index 00000000000..6e2d043db98
--- /dev/null
+++ b/addons/l10n_lu/i18n/es_MX.po
@@ -0,0 +1,141 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_lu
+#
+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-13 18:12+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"Language-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:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
+msgstr "Impresión de la declaración de impuestos"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Luxemburgo"
+
+#. module: l10n_lu
+#: model:ir.module.module,description:l10n_lu.module_meta_information
+msgid ""
+"\n"
+"This module installs:\n"
+"\n"
+"    *the KLUWER Chart of Accounts,\n"
+"    *the Tax Code Chart for Luxembourg\n"
+"    *the main taxes used in Luxembourg"
+msgstr ""
+"\n"
+"Este módulo instala:\n"
+"\n"
+"    * El plan de cuentas KLUWER.\n"
+"    * El plan de códigos de impuestos para Luxemburgo\n"
+"    * Los impuestos principales impuestos usados en Luxemburgo"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:65
+#, python-format
+msgid "pdf not created !"
+msgstr "¡Pdf no creado!"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
+msgstr "Declaración de IVA"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:65
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr "¡Por favor compruebe si el paquete pdftk está instalado!"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_lu
+#: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
+msgid "Luxembourg - Plan Comptable Minimum Normalise"
+msgstr "Luxemburgo- Plan Contable Mínimo Normalizado"
+
+#. module: l10n_lu
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
+msgstr "Informe de declaración de IVA"
+
+#~ msgid "Income"
+#~ msgstr "Ingreso"
+
+#~ msgid "Cash"
+#~ msgstr "Efectivo"
+
+#~ msgid "Liability"
+#~ msgstr "Pasivo"
+
+#~ msgid "Asset"
+#~ msgstr "Activo"
+
+#~ msgid "Equity"
+#~ msgstr "Patrimonio"
+
+#~ msgid "Expense"
+#~ msgstr "Gasto"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
+#~ msgid ""
+#~ "Generate Chart of Accounts from a Chart Template. You will be asked to "
+#~ "select the company, the chart template, the no. of digits to generate the "
+#~ "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 ""
+#~ "Generar un gráfico de cuentas desde una plantilla de gráficos. Usted deberá "
+#~ "seleccionar la compania, la plantilla del grafico, el N° de digitos para "
+#~ "generar el código de las cuentas y las cuentas bancarias, tipo de moneda "
+#~ "para crear los diarios. Aun que, la copia fiel de las plantillas de graficos "
+#~ "es generada."
+
+#~ msgid "Print Taxes Statement"
+#~ msgstr "Imprimir Declaración de Impuestos"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Error ! Usted no puede crear plantillas de cuentas recursivas."
+
+#~ msgid "Créances"
+#~ msgstr "Reclamaciones"
+
+#~ msgid "Luxembourg VAT Declaration"
+#~ msgstr "Declaración de IVA en Luxemburgo"
+
+#~ msgid "VAT Legal Declaration"
+#~ msgstr "Declaración legal de IVA"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
diff --git a/addons/l10n_lu/i18n/es_PY.po b/addons/l10n_lu/i18n/es_PY.po
index 4e925979a33..5edf39ebab9 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es_VE.po b/addons/l10n_lu/i18n/es_VE.po
new file mode 100644
index 00000000000..6e2d043db98
--- /dev/null
+++ b/addons/l10n_lu/i18n/es_VE.po
@@ -0,0 +1,141 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_lu
+#
+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-13 18:12+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"Language-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:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Print Tax Statements"
+msgstr "Impresión de la declaración de impuestos"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,tax_code_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Luxemburgo"
+
+#. module: l10n_lu
+#: model:ir.module.module,description:l10n_lu.module_meta_information
+msgid ""
+"\n"
+"This module installs:\n"
+"\n"
+"    *the KLUWER Chart of Accounts,\n"
+"    *the Tax Code Chart for Luxembourg\n"
+"    *the main taxes used in Luxembourg"
+msgstr ""
+"\n"
+"Este módulo instala:\n"
+"\n"
+"    * El plan de cuentas KLUWER.\n"
+"    * El plan de códigos de impuestos para Luxemburgo\n"
+"    * Los impuestos principales impuestos usados en Luxemburgo"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:65
+#, python-format
+msgid "pdf not created !"
+msgstr "¡Pdf no creado!"
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
+msgstr "Declaración de IVA"
+
+#. module: l10n_lu
+#: code:addons/l10n_lu/wizard/print_vat.py:65
+#, python-format
+msgid "Please check if package pdftk is installed!"
+msgstr "¡Por favor compruebe si el paquete pdftk está instalado!"
+
+#. module: l10n_lu
+#: view:vat.declaration.report:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: l10n_lu
+#: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
+msgid "Luxembourg - Plan Comptable Minimum Normalise"
+msgstr "Luxemburgo- Plan Contable Mínimo Normalizado"
+
+#. module: l10n_lu
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
+msgstr "Informe de declaración de IVA"
+
+#~ msgid "Income"
+#~ msgstr "Ingreso"
+
+#~ msgid "Cash"
+#~ msgstr "Efectivo"
+
+#~ msgid "Liability"
+#~ msgstr "Pasivo"
+
+#~ msgid "Asset"
+#~ msgstr "Activo"
+
+#~ msgid "Equity"
+#~ msgstr "Patrimonio"
+
+#~ msgid "Expense"
+#~ msgstr "Gasto"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
+#~ msgid ""
+#~ "Generate Chart of Accounts from a Chart Template. You will be asked to "
+#~ "select the company, the chart template, the no. of digits to generate the "
+#~ "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 ""
+#~ "Generar un gráfico de cuentas desde una plantilla de gráficos. Usted deberá "
+#~ "seleccionar la compania, la plantilla del grafico, el N° de digitos para "
+#~ "generar el código de las cuentas y las cuentas bancarias, tipo de moneda "
+#~ "para crear los diarios. Aun que, la copia fiel de las plantillas de graficos "
+#~ "es generada."
+
+#~ msgid "Print Taxes Statement"
+#~ msgstr "Imprimir Declaración de Impuestos"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "Error ! Usted no puede crear plantillas de cuentas recursivas."
+
+#~ msgid "Créances"
+#~ msgstr "Reclamaciones"
+
+#~ msgid "Luxembourg VAT Declaration"
+#~ msgstr "Declaración de IVA en Luxemburgo"
+
+#~ msgid "VAT Legal Declaration"
+#~ msgstr "Declaración legal de IVA"
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡Error! No puede crear códigos de impuesto recursivos."
diff --git a/addons/l10n_lu/i18n/et.po b/addons/l10n_lu/i18n/et.po
index d77a606ab21..fdcfdc5650a 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f8f55493ba8..4bd6dfc4db2 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 73aa7873d48..fb64432fbc3 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c2982d70d00..4e04ca82281 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e6b5480688b..fb690936ac2 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1ab79bcd117..2d6e55f2667 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f0160b5556a..343684bea04 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e035f824a74..d7cf57e3729 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f53345a6b22..1bc0c4a46f6 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f9d1d80f656..416bd997196 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3103a94fe8c..e8e70e69f6b 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7b41ea121c4..29ed404eb56 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 253e5797b49..898fa304811 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 26b2e323275..876b6c9fd5b 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a70c68252f7..8968eb39fa5 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e6b5480688b..fb690936ac2 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 52435849793..8eb5306909a 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 367fcbed7ba..72fcc77e59a 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2deaca0fa6c..a4dab2eab8f 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3678e314329..3c3ab83a114 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1f916af0372..311c23c8ca7 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
@@ -29,7 +29,7 @@ msgstr "Företag"
 #. module: l10n_lu
 #: field:vat.declaration.report,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: l10n_lu
 #: model:ir.ui.menu,name:l10n_lu.legal_lu
@@ -92,5 +92,11 @@ msgstr ""
 #~ msgid "View"
 #~ msgstr "Visa"
 
+#~ msgid "Equity"
+#~ msgstr "Eget kapital"
+
 #~ msgid "Income"
 #~ msgstr "Intäkt"
+
+#~ msgid "Liability"
+#~ msgstr "Ansvar"
diff --git a/addons/l10n_lu/i18n/tlh.po b/addons/l10n_lu/i18n/tlh.po
index 6363f98bdcd..93a4e6d0f98 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ee7defd7474..08269eaf43c 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 75be2d6946f..678add08e08 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ff0d1eaf42d..ef9f7140e7e 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ebac0342903..28026464c6c 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e8f8607c40a..56e1ebc1853 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: 2011-04-29 05:33+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/l10n_lu_data.xml b/addons/l10n_lu/l10n_lu_data.xml
index 940da2177e5..36403f383b0 100644
--- a/addons/l10n_lu/l10n_lu_data.xml
+++ b/addons/l10n_lu/l10n_lu_data.xml
@@ -32,7 +32,7 @@
         <record id="account_type_cash_equity" model="account.account.type">
             <field name="name">Equity</field>
             <field name="code">equity</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
         <record id="account_type_income" model="account.account.type">
diff --git a/addons/l10n_ma/__init__.py b/addons/l10n_ma/__init__.py
index 35aef5a2c44..070b09bdf33 100644
--- a/addons/l10n_ma/__init__.py
+++ b/addons/l10n_ma/__init__.py
@@ -21,3 +21,5 @@
 import l10n_ma
 import report
 import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 3a26f6992dc..a9bd7ce557e 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Maroc - Plan Comptable Général",
     "version" : "1.0",
     "author" : "kazacube",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
diff --git a/addons/l10n_ma/account_type.xml b/addons/l10n_ma/account_type.xml
index 7d747a68886..d8e688b0b0f 100644
--- a/addons/l10n_ma/account_type.xml
+++ b/addons/l10n_ma/account_type.xml
@@ -5,7 +5,7 @@
 	<record id="cpt_type_cp" model="account.account.type">
 	    <field name="name">Capitaux Propres</field>
 	    <field name="code">equity</field>
-	    <field name="report_type">asset</field>
+	    <field name="report_type">liability</field>
 	    <field name="close_method">balance</field>
 	</record>
 	<record id="cpt_type_dlt" model="account.account.type">
diff --git a/addons/l10n_ma/i18n/ar.po b/addons/l10n_ma/i18n/ar.po
index b371d09a3e3..2fafc9b55a6 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/ca.po b/addons/l10n_ma/i18n/ca.po
index 0ca1e0480e5..c8e763aea41 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/de.po b/addons/l10n_ma/i18n/de.po
index 754ac577c2b..ad0c6a70627 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: 2011-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/es.po b/addons/l10n_ma/i18n/es.po
index 53a1f245134..422632f30a2 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
@@ -88,5 +88,67 @@ msgstr "Informe"
 msgid "Variable Name"
 msgstr "Nombre variable"
 
-#~ msgid "Taxes"
+#~ msgid "stocks"
+#~ msgstr "estoc"
+
+#~ msgid "Receivable"
+#~ msgstr "A cobrar"
+
+#~ 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ñía, 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 "Cash"
+#~ msgstr "Efectivo"
+
+#~ msgid "Tax"
 #~ msgstr "Impuestos"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#~ msgid "Expense"
+#~ msgstr "Gastos"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "Income"
+#~ msgstr "Ingreso"
+
+#~ msgid "Asset"
+#~ msgstr "Activo"
+
+#~ msgid "Payable"
+#~ msgstr "A pagar"
+
+#~ msgid "dettes long terme"
+#~ msgstr "deuda a largo plazo"
+
+#~ msgid "immobilisations"
+#~ msgstr "inmovilizado"
+
+#~ msgid "Maroc Plan comptable général pour les sociétés"
+#~ msgstr "Plan General de Contabilidad para las empresas de Marruecos"
+
+#~ msgid ""
+#~ "This is the module to manage the accounting chart for Morocco in Open ERP."
+#~ msgstr ""
+#~ "Este es el módulo para gestionar el Plan Contable de Marruecos en OpenERP."
diff --git a/addons/l10n_ma/i18n/es_MX.po b/addons/l10n_ma/i18n/es_MX.po
new file mode 100644
index 00000000000..68252da7e19
--- /dev/null
+++ b/addons/l10n_ma/i18n/es_MX.po
@@ -0,0 +1,154 @@
+# 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-12 17:15+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
+msgstr "¡El nombre de la variable debe ser único!"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr "Informe para l10n_ma_kzc"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,name:0
+#: field:l10n.ma.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_ma
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid ""
+"Ce  Module charge le modèle du plan de comptes standard Marocain et permet "
+"de 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"
+msgstr ""
+"Este módulo instala la plantilla del plan de cuentas estándar de Marruecos, "
+"y permite generar los estados contables de las normas marroquíes (Balance, "
+"CPC (cuentas de productos y cargos), balance general a 6 columnas, Libro "
+"major acumulativo...) La integración contable ha sido validada por el "
+"gabinete de expertos contables Seddik en el tercer trimestre de 2010"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
+msgstr "El código del informe debe ser único"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_line
+msgid "Report Lines for l10n_ma"
+msgstr "Líneas de informe para l10n_ma"
+
+#. module: l10n_ma
+#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
+msgid "Maroc - Plan Comptable Général"
+msgstr "Marruecos - Plan General Contable"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
+msgstr "Nombre variable"
+
+#~ msgid "stocks"
+#~ msgstr "estoc"
+
+#~ msgid "Receivable"
+#~ msgstr "A cobrar"
+
+#~ 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ñía, 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 "Cash"
+#~ msgstr "Efectivo"
+
+#~ msgid "Tax"
+#~ msgstr "Impuestos"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#~ msgid "Expense"
+#~ msgstr "Gastos"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "Income"
+#~ msgstr "Ingreso"
+
+#~ msgid "Asset"
+#~ msgstr "Activo"
+
+#~ msgid "Payable"
+#~ msgstr "A pagar"
+
+#~ msgid "dettes long terme"
+#~ msgstr "deuda a largo plazo"
+
+#~ msgid "immobilisations"
+#~ msgstr "inmovilizado"
+
+#~ msgid "Maroc Plan comptable général pour les sociétés"
+#~ msgstr "Plan General de Contabilidad para las empresas de Marruecos"
+
+#~ msgid ""
+#~ "This is the module to manage the accounting chart for Morocco in Open ERP."
+#~ msgstr ""
+#~ "Este es el módulo para gestionar el Plan Contable de Marruecos en OpenERP."
diff --git a/addons/l10n_ma/i18n/es_PY.po b/addons/l10n_ma/i18n/es_PY.po
index 06df34c8b84..5fa29e89d0f 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/es_VE.po b/addons/l10n_ma/i18n/es_VE.po
new file mode 100644
index 00000000000..68252da7e19
--- /dev/null
+++ b/addons/l10n_ma/i18n/es_VE.po
@@ -0,0 +1,154 @@
+# 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-12 17:15+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:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
+msgstr "¡El nombre de la variable debe ser único!"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr "Informe para l10n_ma_kzc"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,name:0
+#: field:l10n.ma.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_ma
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid ""
+"Ce  Module charge le modèle du plan de comptes standard Marocain et permet "
+"de 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"
+msgstr ""
+"Este módulo instala la plantilla del plan de cuentas estándar de Marruecos, "
+"y permite generar los estados contables de las normas marroquíes (Balance, "
+"CPC (cuentas de productos y cargos), balance general a 6 columnas, Libro "
+"major acumulativo...) La integración contable ha sido validada por el "
+"gabinete de expertos contables Seddik en el tercer trimestre de 2010"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
+msgstr "El código del informe debe ser único"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_line
+msgid "Report Lines for l10n_ma"
+msgstr "Líneas de informe para l10n_ma"
+
+#. module: l10n_ma
+#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
+msgid "Maroc - Plan Comptable Général"
+msgstr "Marruecos - Plan General Contable"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
+msgstr "Nombre variable"
+
+#~ msgid "stocks"
+#~ msgstr "estoc"
+
+#~ msgid "Receivable"
+#~ msgstr "A cobrar"
+
+#~ 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ñía, 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 "Cash"
+#~ msgstr "Efectivo"
+
+#~ msgid "Tax"
+#~ msgstr "Impuestos"
+
+#~ msgid "Error ! You can not create recursive account templates."
+#~ msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#~ msgid "Error ! You can not create recursive Tax Codes."
+#~ msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#~ msgid "Expense"
+#~ msgstr "Gastos"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "Income"
+#~ msgstr "Ingreso"
+
+#~ msgid "Asset"
+#~ msgstr "Activo"
+
+#~ msgid "Payable"
+#~ msgstr "A pagar"
+
+#~ msgid "dettes long terme"
+#~ msgstr "deuda a largo plazo"
+
+#~ msgid "immobilisations"
+#~ msgstr "inmovilizado"
+
+#~ msgid "Maroc Plan comptable général pour les sociétés"
+#~ msgstr "Plan General de Contabilidad para las empresas de Marruecos"
+
+#~ msgid ""
+#~ "This is the module to manage the accounting chart for Morocco in Open ERP."
+#~ msgstr ""
+#~ "Este es el módulo para gestionar el Plan Contable de Marruecos en OpenERP."
diff --git a/addons/l10n_ma/i18n/fr.po b/addons/l10n_ma/i18n/fr.po
index 0eec9c25248..6f8df121521 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
@@ -88,45 +88,3 @@ msgstr "Rapport"
 #: field:l10n.ma.line,code:0
 msgid "Variable Name"
 msgstr "Nom de variable"
-
-#~ msgid "Stocks"
-#~ msgstr "Stocks"
-
-#~ msgid "Dettes à court terme"
-#~ msgstr "Dettes à court terme"
-
-#~ msgid "Titres de placement"
-#~ msgstr "Titres de placement"
-
-#~ msgid "Vue"
-#~ msgstr "Vue"
-
-#~ msgid "Immobilisations"
-#~ msgstr "Immobilisations"
-
-#~ msgid "Dettes à long terme"
-#~ msgstr "Dettes à long terme"
-
-#~ msgid "Taxes"
-#~ msgstr "Taxes"
-
-#~ msgid "Régularisation"
-#~ msgstr "Régularisation"
-
-#~ msgid "Liquidité"
-#~ msgstr "Liquidité"
-
-#~ msgid "Produits"
-#~ msgstr "Produits"
-
-#~ msgid "Créances"
-#~ msgstr "Créances"
-
-#~ msgid "Charges Achats"
-#~ msgstr "Charges d'achats"
-
-#~ msgid "Charges Personnel"
-#~ msgstr "Charges personnel"
-
-#~ msgid "Charges Autres"
-#~ msgstr "Autres charges"
diff --git a/addons/l10n_ma/i18n/gl.po b/addons/l10n_ma/i18n/gl.po
index be650f3477d..2aafdda1f14 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/hu.po b/addons/l10n_ma/i18n/hu.po
index 13b88c49979..67975e9f338 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/it.po b/addons/l10n_ma/i18n/it.po
index c83ed350ea7..717aa15f936 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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/pt_BR.po b/addons/l10n_ma/i18n/pt_BR.po
index ed59fc2f53b..ef126926fd0 100644
--- a/addons/l10n_ma/i18n/pt_BR.po
+++ b/addons/l10n_ma/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
diff --git a/addons/l10n_ma/i18n/sr@latin.po b/addons/l10n_ma/i18n/sr@latin.po
index ee505121baf..5a07ec354fb 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
@@ -82,6 +82,3 @@ msgstr ""
 #: field:l10n.ma.line,code:0
 msgid "Variable Name"
 msgstr ""
-
-#~ msgid "Vue"
-#~ msgstr "Pregled"
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 17aea022d48..d56d5f570b1 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Mexico - Chart of Account",
     "version" : "1.0",
     "author" : "RelTek Mexico",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
diff --git a/addons/l10n_mx/account_chart.xml b/addons/l10n_mx/account_chart.xml
index ea7b534d503..9a86600101f 100644
--- a/addons/l10n_mx/account_chart.xml
+++ b/addons/l10n_mx/account_chart.xml
@@ -56,6 +56,7 @@
     <record model="account.account.type" id="account_type_equity">
       <field name="name">Equity</field>
       <field name="code">equity</field>
+      <field name="report_type">liability</field>
       <field name="close_method">balance</field>
     </record>
 	
diff --git a/addons/l10n_mx/i18n/bg.po b/addons/l10n_mx/i18n/bg.po
index 55e0b66638b..c3d475e804e 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_mx/i18n/ca.po b/addons/l10n_mx/i18n/ca.po
index 41f9af91618..bfe6b52451e 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_mx/i18n/es.po b/addons/l10n_mx/i18n/es.po
index d931510bea6..e4fdb5154ab 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_mx/i18n/es_MX.po b/addons/l10n_mx/i18n/es_MX.po
new file mode 100644
index 00000000000..e9822e23498
--- /dev/null
+++ b/addons/l10n_mx/i18n/es_MX.po
@@ -0,0 +1,50 @@
+# Spanish 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-07 06:07+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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."
+
+#. module: l10n_mx
+#: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_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 ""
+"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"
diff --git a/addons/l10n_mx/i18n/es_PY.po b/addons/l10n_mx/i18n/es_PY.po
index 3de3345ea9c..c119ebee098 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_mx/i18n/es_VE.po b/addons/l10n_mx/i18n/es_VE.po
new file mode 100644
index 00000000000..e9822e23498
--- /dev/null
+++ b/addons/l10n_mx/i18n/es_VE.po
@@ -0,0 +1,50 @@
+# Spanish 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-07 06:07+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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."
+
+#. module: l10n_mx
+#: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_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 ""
+"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"
diff --git a/addons/l10n_mx/i18n/gl.po b/addons/l10n_mx/i18n/gl.po
index 52bf8a61644..f65bf58180f 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_mx/i18n/it.po b/addons/l10n_mx/i18n/it.po
index b4856482667..a48e29c920f 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_mx/i18n/pt_BR.po b/addons/l10n_mx/i18n/pt_BR.po
index f795c747ed5..481836950a0 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_mx/i18n/sr@latin.po b/addons/l10n_mx/i18n/sr@latin.po
new file mode 100644
index 00000000000..219898f27e7
--- /dev/null
+++ b/addons/l10n_mx/i18n/sr@latin.po
@@ -0,0 +1,48 @@
+# Serbian Latin 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-07 06:07+0000\n"
+"PO-Revision-Date: 2011-10-13 15:04+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Ovo je modul za sređivanje računskih tabela za Meksiko u OPenERP-u."
+
+#. module: l10n_mx
+#: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_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 ""
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"\tTo je isti setup wizard koji se pokreće iz Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+
+#. module: l10n_mx
+#: model:ir.module.module,shortdesc:l10n_mx.module_meta_information
+msgid "Mexico - Chart of Account"
+msgstr "Meksiko - računske tabele"
diff --git a/addons/l10n_mx/i18n/tr.po b/addons/l10n_mx/i18n/tr.po
index e16ab74fb34..a6de9f05211 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_mx
 #: model:ir.module.module,description:l10n_mx.module_meta_information
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 849053fb0ad..5635e16d6c3 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -88,7 +88,7 @@
 {
     "name" : "Netherlands - Grootboek en BTW rekeningen",
     "version" : "1.5",
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
diff --git a/addons/l10n_nl/i18n/ca.po b/addons/l10n_nl/i18n/ca.po
index ef476d95e63..f8219dee71b 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_nl
 #: model:ir.actions.todo,note:l10n_nl.config_call_account_template
diff --git a/addons/l10n_nl/i18n/es.po b/addons/l10n_nl/i18n/es.po
index bdde77f0af7..0307d5c6aeb 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_nl
 #: model:ir.actions.todo,note:l10n_nl.config_call_account_template
diff --git a/addons/l10n_nl/i18n/es_MX.po b/addons/l10n_nl/i18n/es_MX.po
new file mode 100644
index 00000000000..3453b096b72
--- /dev/null
+++ b/addons/l10n_nl/i18n/es_MX.po
@@ -0,0 +1,123 @@
+# Spanish 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-07 06:11+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_nl
+#: model:ir.actions.todo,note:l10n_nl.config_call_account_template
+msgid ""
+"Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"* U krijgt een lijst met grootboektemplates 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"
+"    \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"
+"    \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"
+msgstr ""
+"Este módulo instalará un asistente de configuración de \"Contabilidad\" que "
+"será ejecutado.\n"
+"* Usted recibe una lista de plantillas planes contables que también le "
+"ofrecerá el holandés.\n"
+"* El asistente de configuración, le solicitará el nombre de la compañía, la "
+"plantilla de plan a seguir, y el núm. de dígitos para generar el código de "
+"sus cuentas, cuenta bancaria, y divisa para crear sus diarios.\n"
+"    \n"
+"¡Atención! -> La plantilla del plan contable holandés consta de cuatro "
+"dígitos. Este es el número mínimo que debe comtemplar, aunque puede aumentar "
+"el número. Los dígitos adicionales detrás de la cuenta se rellenan de "
+"\"ceros\"\n"
+"    \n"
+"* Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan.\n"
+
+#. module: l10n_nl
+#: model:ir.module.module,shortdesc:l10n_nl.module_meta_information
+msgid "Netherlands - Grootboek en BTW rekeningen"
+msgstr "Holanda - Plan Contable"
+
+#. module: l10n_nl
+#: model:ir.module.module,description:l10n_nl.module_meta_information
+msgid ""
+"\n"
+"Read changelog in file __terp__.py for version information.   \n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor "
+"Nederlandse bedrijven te installeren in OpenERP versie 5.\n"
+"    De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren, denk b.v. aan intracommunautaire verwervingen\n"
+"    waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als "
+"voorheffing weer mag aftrekken.\n"
+"    \n"
+"    Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het Nederlandse grootboekschema bevind.\n"
+"    \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"
+"    \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"
+"    \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"
+"\n"
+"    "
+msgstr ""
+"\n"
+"Lea los cambios de __terp__.py en la información de versión del archivo.\n"
+"Se trata de un módulo básico de plan general contable y régimen de IVA para "
+"las empresas holandesas para instalar en la versión 5 de OpenERP.\n"
+"     Las cuentas de IVA son vinculadas a la derecha cuando sea necesario "
+"para generar informes, por ejemplo, las adquisiciones intracomunitarias\n"
+"     El IVA es del 19%, pero al mismo tiempo, como la retención a cuenta es "
+"del 19% podrán deducir de nuevo.\n"
+"    \n"
+"     Después de instalar este módulo, el asistente de configuración de "
+"\"Contabilidad\" será ejecutado.\n"
+"     * Usted recibe una lista de plantillas planes contables que también le "
+"ofrecerá el holandés.\n"
+"    \n"
+"     * El asistente de configuración, le solicitará el nombre de la "
+"compañía, la plantilla de plan a seguir, y el núm. de dígitos para generar "
+"el código de sus cuentas, cuenta bancaria, y divisa para crear sus diarios.\n"
+"    \n"
+"     Atención! -> La plantilla del plan contable holandés consta de cuatro "
+"dígitos. Este es el número mínimo que debe comtemplar, aunque puede aumentar "
+"el número. Los dígitos adicionales detrás de la cuenta se rellenan de "
+"\"ceros\"\n"
+"    \n"
+"     * Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan.\n"
+"\n"
+"    "
diff --git a/addons/l10n_nl/i18n/es_PY.po b/addons/l10n_nl/i18n/es_PY.po
index 86b2ddfb770..613d3997adb 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_nl
 #: model:ir.actions.todo,note:l10n_nl.config_call_account_template
diff --git a/addons/l10n_nl/i18n/es_VE.po b/addons/l10n_nl/i18n/es_VE.po
new file mode 100644
index 00000000000..3453b096b72
--- /dev/null
+++ b/addons/l10n_nl/i18n/es_VE.po
@@ -0,0 +1,123 @@
+# Spanish 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-07 06:11+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_nl
+#: model:ir.actions.todo,note:l10n_nl.config_call_account_template
+msgid ""
+"Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"* U krijgt een lijst met grootboektemplates 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"
+"    \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"
+"    \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"
+msgstr ""
+"Este módulo instalará un asistente de configuración de \"Contabilidad\" que "
+"será ejecutado.\n"
+"* Usted recibe una lista de plantillas planes contables que también le "
+"ofrecerá el holandés.\n"
+"* El asistente de configuración, le solicitará el nombre de la compañía, la "
+"plantilla de plan a seguir, y el núm. de dígitos para generar el código de "
+"sus cuentas, cuenta bancaria, y divisa para crear sus diarios.\n"
+"    \n"
+"¡Atención! -> La plantilla del plan contable holandés consta de cuatro "
+"dígitos. Este es el número mínimo que debe comtemplar, aunque puede aumentar "
+"el número. Los dígitos adicionales detrás de la cuenta se rellenan de "
+"\"ceros\"\n"
+"    \n"
+"* Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan.\n"
+
+#. module: l10n_nl
+#: model:ir.module.module,shortdesc:l10n_nl.module_meta_information
+msgid "Netherlands - Grootboek en BTW rekeningen"
+msgstr "Holanda - Plan Contable"
+
+#. module: l10n_nl
+#: model:ir.module.module,description:l10n_nl.module_meta_information
+msgid ""
+"\n"
+"Read changelog in file __terp__.py for version information.   \n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor "
+"Nederlandse bedrijven te installeren in OpenERP versie 5.\n"
+"    De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren, denk b.v. aan intracommunautaire verwervingen\n"
+"    waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als "
+"voorheffing weer mag aftrekken.\n"
+"    \n"
+"    Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het Nederlandse grootboekschema bevind.\n"
+"    \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"
+"    \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"
+"    \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"
+"\n"
+"    "
+msgstr ""
+"\n"
+"Lea los cambios de __terp__.py en la información de versión del archivo.\n"
+"Se trata de un módulo básico de plan general contable y régimen de IVA para "
+"las empresas holandesas para instalar en la versión 5 de OpenERP.\n"
+"     Las cuentas de IVA son vinculadas a la derecha cuando sea necesario "
+"para generar informes, por ejemplo, las adquisiciones intracomunitarias\n"
+"     El IVA es del 19%, pero al mismo tiempo, como la retención a cuenta es "
+"del 19% podrán deducir de nuevo.\n"
+"    \n"
+"     Después de instalar este módulo, el asistente de configuración de "
+"\"Contabilidad\" será ejecutado.\n"
+"     * Usted recibe una lista de plantillas planes contables que también le "
+"ofrecerá el holandés.\n"
+"    \n"
+"     * El asistente de configuración, le solicitará el nombre de la "
+"compañía, la plantilla de plan a seguir, y el núm. de dígitos para generar "
+"el código de sus cuentas, cuenta bancaria, y divisa para crear sus diarios.\n"
+"    \n"
+"     Atención! -> La plantilla del plan contable holandés consta de cuatro "
+"dígitos. Este es el número mínimo que debe comtemplar, aunque puede aumentar "
+"el número. Los dígitos adicionales detrás de la cuenta se rellenan de "
+"\"ceros\"\n"
+"    \n"
+"     * Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan.\n"
+"\n"
+"    "
diff --git a/addons/l10n_nl/i18n/gl.po b/addons/l10n_nl/i18n/gl.po
index dae1b6199cb..2cd446f33f7 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_nl
 #: model:ir.actions.todo,note:l10n_nl.config_call_account_template
diff --git a/addons/l10n_nl/i18n/it.po b/addons/l10n_nl/i18n/it.po
index b9908ff16ea..f802dc0543c 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_nl
 #: model:ir.actions.todo,note:l10n_nl.config_call_account_template
diff --git a/addons/l10n_nl/i18n/nl.po b/addons/l10n_nl/i18n/nl.po
index 0ef019c7f3c..7fbf68db218 100644
--- a/addons/l10n_nl/i18n/nl.po
+++ b/addons/l10n_nl/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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_nl
 #: model:ir.actions.todo,note:l10n_nl.config_call_account_template
diff --git a/addons/l10n_nl/i18n/pt_BR.po b/addons/l10n_nl/i18n/pt_BR.po
index ce7d95a200b..dfa48810607 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_nl
 #: model:ir.actions.todo,note:l10n_nl.config_call_account_template
diff --git a/addons/l10n_nl/i18n/sr@latin.po b/addons/l10n_nl/i18n/sr@latin.po
new file mode 100644
index 00000000000..b603e0be58c
--- /dev/null
+++ b/addons/l10n_nl/i18n/sr@latin.po
@@ -0,0 +1,127 @@
+# Serbian Latin 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-07 06:11+0000\n"
+"PO-Revision-Date: 2011-10-13 15:02+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_nl
+#: model:ir.actions.todo,note:l10n_nl.config_call_account_template
+msgid ""
+"Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"* U krijgt een lijst met grootboektemplates 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"
+"    \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"
+"    \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"
+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 "
+"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"
+"    \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"
+"    \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"
+
+#. module: l10n_nl
+#: model:ir.module.module,shortdesc:l10n_nl.module_meta_information
+msgid "Netherlands - Grootboek en BTW rekeningen"
+msgstr "Holandija - Grootboek en BTW rekeningen"
+
+#. module: l10n_nl
+#: model:ir.module.module,description:l10n_nl.module_meta_information
+msgid ""
+"\n"
+"Read changelog in file __terp__.py for version information.   \n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor "
+"Nederlandse bedrijven te installeren in OpenERP versie 5.\n"
+"    De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren, denk b.v. aan intracommunautaire verwervingen\n"
+"    waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als "
+"voorheffing weer mag aftrekken.\n"
+"    \n"
+"    Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het Nederlandse grootboekschema bevind.\n"
+"    \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"
+"    \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"
+"    \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"
+"\n"
+"    "
+msgstr ""
+"\n"
+"Pročitajte spisak izmena u datoteci file __terp__.py za podatke o verziji.   "
+"\n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor "
+"Nederlandse bedrijven te installeren in OpenERP versie 5\n"
+"    De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren, denk b.v. aan intracommunautaire verwervingen\n"
+"    waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als "
+"voorheffing weer mag aftrekken.\n"
+"    \n"
+"    Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het Nederlandse grootboekschema bevind\n"
+"    \n"
+"\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"
+"    \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"
+"    \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"
+"\n"
+"    "
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 584a7d27832..0ec97ab7cb6 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
diff --git a/addons/l10n_pl/i18n/ca.po b/addons/l10n_pl/i18n/ca.po
index 56ce945432e..664395aba1b 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_pl
 #: model:ir.module.module,description:l10n_pl.module_meta_information
diff --git a/addons/l10n_pl/i18n/es.po b/addons/l10n_pl/i18n/es.po
index e80721d4d46..06dd93a4c20 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_pl
 #: model:ir.module.module,description:l10n_pl.module_meta_information
diff --git a/addons/l10n_pl/i18n/es_MX.po b/addons/l10n_pl/i18n/es_MX.po
new file mode 100644
index 00000000000..383291ab38c
--- /dev/null
+++ b/addons/l10n_pl/i18n/es_MX.po
@@ -0,0 +1,62 @@
+# Spanish 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-07 06:14+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_pl
+#: model:ir.module.module,description:l10n_pl.module_meta_information
+msgid ""
+"\n"
+"     This is the module to manage the accounting chart and taxes for Poland "
+"in Open ERP.\n"
+"     \n"
+"     To jest moduł do tworzenia wzorcowego planu kont i podstawowych "
+"ustawień do podatków\n"
+"     VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"     że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+"\n"
+"     Este es el módulo para gestionar el plan de cuentas e impuestos para "
+"Polonia en Open ERP\n"
+"    "
+
+#. module: l10n_pl
+#: model:ir.module.module,shortdesc:l10n_pl.module_meta_information
+msgid "Poland - Chart of Accounts"
+msgstr "Polonia - Plan Contable"
+
+#. module: l10n_pl
+#: model:ir.actions.todo,note:l10n_pl.config_call_account_template_pl_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 ""
+"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."
diff --git a/addons/l10n_pl/i18n/es_PY.po b/addons/l10n_pl/i18n/es_PY.po
index 992f01dbf03..606b327b4fb 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_pl
 #: model:ir.module.module,description:l10n_pl.module_meta_information
diff --git a/addons/l10n_pl/i18n/es_VE.po b/addons/l10n_pl/i18n/es_VE.po
new file mode 100644
index 00000000000..383291ab38c
--- /dev/null
+++ b/addons/l10n_pl/i18n/es_VE.po
@@ -0,0 +1,62 @@
+# Spanish 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-07 06:14+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_pl
+#: model:ir.module.module,description:l10n_pl.module_meta_information
+msgid ""
+"\n"
+"     This is the module to manage the accounting chart and taxes for Poland "
+"in Open ERP.\n"
+"     \n"
+"     To jest moduł do tworzenia wzorcowego planu kont i podstawowych "
+"ustawień do podatków\n"
+"     VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"     że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+"\n"
+"     Este es el módulo para gestionar el plan de cuentas e impuestos para "
+"Polonia en Open ERP\n"
+"    "
+
+#. module: l10n_pl
+#: model:ir.module.module,shortdesc:l10n_pl.module_meta_information
+msgid "Poland - Chart of Accounts"
+msgstr "Polonia - Plan Contable"
+
+#. module: l10n_pl
+#: model:ir.actions.todo,note:l10n_pl.config_call_account_template_pl_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 ""
+"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."
diff --git a/addons/l10n_pl/i18n/gl.po b/addons/l10n_pl/i18n/gl.po
index c126d2f330b..2cd246a49fb 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_pl
 #: model:ir.module.module,description:l10n_pl.module_meta_information
diff --git a/addons/l10n_pl/i18n/it.po b/addons/l10n_pl/i18n/it.po
index d7982ed69e3..4edb26937af 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_pl
 #: model:ir.module.module,description:l10n_pl.module_meta_information
diff --git a/addons/l10n_pl/i18n/pt_BR.po b/addons/l10n_pl/i18n/pt_BR.po
index 49d7c13a6f2..c294fdaf202 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_pl
 #: model:ir.module.module,description:l10n_pl.module_meta_information
diff --git a/addons/l10n_pl/i18n/sr@latin.po b/addons/l10n_pl/i18n/sr@latin.po
new file mode 100644
index 00000000000..9af0b4492ac
--- /dev/null
+++ b/addons/l10n_pl/i18n/sr@latin.po
@@ -0,0 +1,68 @@
+# Serbian Latin 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-07 06:14+0000\n"
+"PO-Revision-Date: 2011-10-13 14:58+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_pl
+#: model:ir.module.module,description:l10n_pl.module_meta_information
+msgid ""
+"\n"
+"     This is the module to manage the accounting chart and taxes for Poland "
+"in Open ERP.\n"
+"     \n"
+"     To jest moduł do tworzenia wzorcowego planu kont i podstawowych "
+"ustawień do podatków\n"
+"     VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"     że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+"\n"
+"     Ovo je modul za sređivanje računskih tabelai taksi za Poljsku u OpenERP-"
+"u.\n"
+"     \n"
+"     To jest moduł do tworzenia wzorcowego planu kont i podstawowych "
+"ustawień do podatków\n"
+"     VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"     że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+
+#. module: l10n_pl
+#: model:ir.module.module,shortdesc:l10n_pl.module_meta_information
+msgid "Poland - Chart of Accounts"
+msgstr "Poljska - računske tabele"
+
+#. module: l10n_pl
+#: model:ir.actions.todo,note:l10n_pl.config_call_account_template_pl_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 ""
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"\n"
+"\tTo je isti setup wizard koji se pokreće iz Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
diff --git a/addons/l10n_pl/i18n/tr.po b/addons/l10n_pl/i18n/tr.po
index 9ab8c30573f..7b162d585ec 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_pl
 #: model:ir.module.module,description:l10n_pl.module_meta_information
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 134a4aea679..647b4b35449 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
-    "category" : "Finance",
+    "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.
diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml
index f48cc0de7e4..aae1ca9faf8 100644
--- a/addons/l10n_ro/account_chart.xml
+++ b/addons/l10n_ro/account_chart.xml
@@ -61,6 +61,7 @@
 	    <record model="account.account.type" id="account_type_equity"> <!-- de capital -->
 	      <field name="name">Equity</field>
 	      <field name="code">equity</field>
+	      <field name="report_type">liability</field>
 	      <field name="close_method">balance</field>
 	    </record>
 
diff --git a/addons/l10n_ro/i18n/ca.po b/addons/l10n_ro/i18n/ca.po
index a62cdbbc629..8efbcdf1044 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ro
 #: help:res.partner,nrc:0
diff --git a/addons/l10n_ro/i18n/es.po b/addons/l10n_ro/i18n/es.po
index b5acc8f674f..91fcd96670f 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ro
 #: help:res.partner,nrc:0
diff --git a/addons/l10n_ro/i18n/es_MX.po b/addons/l10n_ro/i18n/es_MX.po
new file mode 100644
index 00000000000..ac016c5ddf7
--- /dev/null
+++ b/addons/l10n_ro/i18n/es_MX.po
@@ -0,0 +1,67 @@
+# Spanish 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-07 06:16+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ro
+#: help:res.partner,nrc:0
+msgid "Registration number at the Registry of Commerce"
+msgstr "Número de registro en el Registro de Comercio"
+
+#. module: l10n_ro
+#: field:res.partner,nrc:0
+msgid "NRC"
+msgstr "NRC"
+
+#. module: l10n_ro
+#: model:ir.actions.todo,note:l10n_ro.config_call_account_template_ro
+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 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_ro
+#: model:ir.module.module,shortdesc:l10n_ro.module_meta_information
+msgid "Romania - Chart of Accounts"
+msgstr "Rumanía - Plan Contable"
+
+#. module: l10n_ro
+#: model:ir.model,name:l10n_ro.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: l10n_ro
+#: model:ir.module.module,description:l10n_ro.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart, VAT structure and "
+"Registration Number for Romania in Open ERP."
+msgstr ""
+"Este es el módulo que gestiona el plan contable, estructura de Impuestos y "
+"Número de Registro para Rumanía en Open ERP."
diff --git a/addons/l10n_ro/i18n/es_PY.po b/addons/l10n_ro/i18n/es_PY.po
index 3922a9bd7f4..bce052c487d 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ro
 #: help:res.partner,nrc:0
diff --git a/addons/l10n_ro/i18n/es_VE.po b/addons/l10n_ro/i18n/es_VE.po
new file mode 100644
index 00000000000..ac016c5ddf7
--- /dev/null
+++ b/addons/l10n_ro/i18n/es_VE.po
@@ -0,0 +1,67 @@
+# Spanish 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-07 06:16+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_ro
+#: help:res.partner,nrc:0
+msgid "Registration number at the Registry of Commerce"
+msgstr "Número de registro en el Registro de Comercio"
+
+#. module: l10n_ro
+#: field:res.partner,nrc:0
+msgid "NRC"
+msgstr "NRC"
+
+#. module: l10n_ro
+#: model:ir.actions.todo,note:l10n_ro.config_call_account_template_ro
+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 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_ro
+#: model:ir.module.module,shortdesc:l10n_ro.module_meta_information
+msgid "Romania - Chart of Accounts"
+msgstr "Rumanía - Plan Contable"
+
+#. module: l10n_ro
+#: model:ir.model,name:l10n_ro.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: l10n_ro
+#: model:ir.module.module,description:l10n_ro.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart, VAT structure and "
+"Registration Number for Romania in Open ERP."
+msgstr ""
+"Este es el módulo que gestiona el plan contable, estructura de Impuestos y "
+"Número de Registro para Rumanía en Open ERP."
diff --git a/addons/l10n_ro/i18n/gl.po b/addons/l10n_ro/i18n/gl.po
index 22706e679ae..703f3af1296 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ro
 #: help:res.partner,nrc:0
diff --git a/addons/l10n_ro/i18n/it.po b/addons/l10n_ro/i18n/it.po
index eb19d75d890..e5a761e22e9 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ro
 #: help:res.partner,nrc:0
diff --git a/addons/l10n_ro/i18n/pt_BR.po b/addons/l10n_ro/i18n/pt_BR.po
index 48a6de3f80f..e0edc9a9375 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ro
 #: help:res.partner,nrc:0
diff --git a/addons/l10n_ro/i18n/ro.po b/addons/l10n_ro/i18n/ro.po
index e6fb1860e1e..515a279a3ca 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ro
 #: help:res.partner,nrc:0
diff --git a/addons/l10n_ro/i18n/sr@latin.po b/addons/l10n_ro/i18n/sr@latin.po
new file mode 100644
index 00000000000..80f66de2b5e
--- /dev/null
+++ b/addons/l10n_ro/i18n/sr@latin.po
@@ -0,0 +1,67 @@
+# Serbian Latin 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-07 06:16+0000\n"
+"PO-Revision-Date: 2011-10-13 14:55+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_ro
+#: help:res.partner,nrc:0
+msgid "Registration number at the Registry of Commerce"
+msgstr "Registracioni broj pri Trgovinskom registru"
+
+#. module: l10n_ro
+#: field:res.partner,nrc:0
+msgid "NRC"
+msgstr "NRC"
+
+#. module: l10n_ro
+#: model:ir.actions.todo,note:l10n_ro.config_call_account_template_ro
+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 ""
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"\n"
+"\tTo je isti setup wizard koji se pokreće iz Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+
+#. module: l10n_ro
+#: model:ir.module.module,shortdesc:l10n_ro.module_meta_information
+msgid "Romania - Chart of Accounts"
+msgstr "Rumunija - računske tabele"
+
+#. module: l10n_ro
+#: model:ir.model,name:l10n_ro.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: l10n_ro
+#: model:ir.module.module,description:l10n_ro.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart, VAT structure and "
+"Registration Number for Romania in Open ERP."
+msgstr ""
+"Ovo je model za sređivanje računskih tabela, VAT strukture i Registracioni "
+"broj za Rumuniju u OPenERP-u"
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index f5521844a49..009aa76b62f 100644
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -30,3 +30,5 @@ class res_partner(osv.osv):
         'nrc' : fields.char('NRC', size=16, help='Registration number at the Registry of Commerce'),
     }
 res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 6cf85ed5f19..0fa4631b1f1 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "OHADA - The accounting chart ",
     "version" : "1.0",
     "author" : "Baamtu Senegal",
-    "category" : "Localisation/Account Charts",
+    "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:
@@ -39,4 +39,4 @@
     "active": False,
     "installable": True
 }
-# 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_syscohada/i18n/ca.po b/addons/l10n_syscohada/i18n/ca.po
new file mode 100644
index 00000000000..85d39414a8f
--- /dev/null
+++ b/addons/l10n_syscohada/i18n/ca.po
@@ -0,0 +1,152 @@
+# 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: 2010-05-09 10:31+0000\n"
+"PO-Revision-Date: 2011-08-17 21:43+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_syscohada
+#: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
+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 ""
+"Genera el pla de comptes des d'una plantilla de pla. Se us demanarà el nom "
+"de l'empresa, la plantilla de pla a seguir, i el número de dígits per "
+"generar el codi dels vostres comptes, compte bancari, i divisa per crear els "
+"vostres diaris. Per tant, es genera una còpia directa de la plantilla del "
+"pla de comptes.\n"
+"\t Aquest és el mateix assistent que s'executa des de "
+"Comptabilitat/Configuració/Comptabilitat financera/Comptes financers/Genera "
+"pla comptable des d'una plantilla de pla comptable."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_asset
+msgid "Asset"
+msgstr "Actiu"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_income
+msgid "Income"
+msgstr "Ingressos"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stocks
+msgid "Actif circulant"
+msgstr "Actiu circulant"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_dettes
+msgid "Dettes long terme"
+msgstr "Deute a llarg termini"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_tax
+msgid "Tax"
+msgstr "Impost"
+
+#. module: l10n_syscohada
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Error! No podeu crear plantilles de comptes recursius."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_provision
+msgid "Provisions"
+msgstr "Provisions"
+
+#. module: l10n_syscohada
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Error! No podeu crear codis d'impostos recursius."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_commitment
+msgid "Engagements"
+msgstr "Compromisos"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,description:l10n_syscohada.module_meta_information
+msgid "This module implementes the accounting chart for OHADA area."
+msgstr ""
+"En aquest mòdul s'implementa el Pla Comptable per l'àrea de la OHADA."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_expense
+msgid "Expense"
+msgstr "Despesa"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_syscohada
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"El nom de l'objecte ha de començar per x_ i no pot contenir cap caràcter "
+"especial."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_immobilisations
+msgid "Immobilisations"
+msgstr "immobilitzat"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_equity
+msgid "Equity"
+msgstr "Patrimoni"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stock
+msgid "Stocks"
+msgstr "Estocs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cash
+msgid "Cash"
+msgstr "Efectiu"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_special
+msgid "Comptes spéciaux"
+msgstr "comptes especials"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_view
+msgid "View"
+msgstr "Visualitza"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,shortdesc:l10n_syscohada.module_meta_information
+msgid "OHADA - Plan comptable général"
+msgstr "OHADA - Pla General de Comptabilitat"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cloture
+msgid "Cloture"
+msgstr "tancament"
diff --git a/addons/l10n_syscohada/i18n/es.po b/addons/l10n_syscohada/i18n/es.po
new file mode 100644
index 00000000000..440db7058a9
--- /dev/null
+++ b/addons/l10n_syscohada/i18n/es.po
@@ -0,0 +1,151 @@
+# Spanish 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: 2010-05-09 10:31+0000\n"
+"PO-Revision-Date: 2011-09-17 23:20+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: l10n_syscohada
+#: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
+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ñía, 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."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stocks
+msgid "Actif circulant"
+msgstr "Activo circulante"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_dettes
+msgid "Dettes long terme"
+msgstr "Deudas a largo plazo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_tax
+msgid "Tax"
+msgstr "Impuestos"
+
+#. module: l10n_syscohada
+#: 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_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_provision
+msgid "Provisions"
+msgstr "Provisiones"
+
+#. module: l10n_syscohada
+#: 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_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_commitment
+msgid "Engagements"
+msgstr "Compromisos"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,description:l10n_syscohada.module_meta_information
+msgid "This module implementes the accounting chart for OHADA area."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_expense
+msgid "Expense"
+msgstr "Gastos"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_syscohada
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_immobilisations
+msgid "Immobilisations"
+msgstr "Inmobilizaciones"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stock
+msgid "Stocks"
+msgstr "Estocs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cash
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_special
+msgid "Comptes spéciaux"
+msgstr "Cuentas especiales"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_view
+msgid "View"
+msgstr "Ver"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,shortdesc:l10n_syscohada.module_meta_information
+msgid "OHADA - Plan comptable général"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cloture
+msgid "Cloture"
+msgstr "Cierre"
diff --git a/addons/l10n_syscohada/i18n/es_MX.po b/addons/l10n_syscohada/i18n/es_MX.po
new file mode 100644
index 00000000000..381414d791f
--- /dev/null
+++ b/addons/l10n_syscohada/i18n/es_MX.po
@@ -0,0 +1,151 @@
+# Spanish 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: 2010-05-09 10:31+0000\n"
+"PO-Revision-Date: 2011-09-17 23:20+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-19 04:41+0000\n"
+"X-Generator: Launchpad (build 13955)\n"
+
+#. module: l10n_syscohada
+#: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
+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ñía, 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."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stocks
+msgid "Actif circulant"
+msgstr "Activo circulante"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_dettes
+msgid "Dettes long terme"
+msgstr "Deudas a largo plazo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_tax
+msgid "Tax"
+msgstr "Impuestos"
+
+#. module: l10n_syscohada
+#: 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_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_provision
+msgid "Provisions"
+msgstr "Provisiones"
+
+#. module: l10n_syscohada
+#: 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_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_commitment
+msgid "Engagements"
+msgstr "Compromisos"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,description:l10n_syscohada.module_meta_information
+msgid "This module implementes the accounting chart for OHADA area."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_expense
+msgid "Expense"
+msgstr "Gastos"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_syscohada
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_immobilisations
+msgid "Immobilisations"
+msgstr "Inmobilizaciones"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stock
+msgid "Stocks"
+msgstr "Estocs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cash
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_special
+msgid "Comptes spéciaux"
+msgstr "Cuentas especiales"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_view
+msgid "View"
+msgstr "Ver"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,shortdesc:l10n_syscohada.module_meta_information
+msgid "OHADA - Plan comptable général"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cloture
+msgid "Cloture"
+msgstr "Cierre"
diff --git a/addons/l10n_syscohada/i18n/es_VE.po b/addons/l10n_syscohada/i18n/es_VE.po
new file mode 100644
index 00000000000..381414d791f
--- /dev/null
+++ b/addons/l10n_syscohada/i18n/es_VE.po
@@ -0,0 +1,151 @@
+# Spanish 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: 2010-05-09 10:31+0000\n"
+"PO-Revision-Date: 2011-09-17 23:20+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-19 04:41+0000\n"
+"X-Generator: Launchpad (build 13955)\n"
+
+#. module: l10n_syscohada
+#: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
+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ñía, 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."
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stocks
+msgid "Actif circulant"
+msgstr "Activo circulante"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_dettes
+msgid "Dettes long terme"
+msgstr "Deudas a largo plazo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_tax
+msgid "Tax"
+msgstr "Impuestos"
+
+#. module: l10n_syscohada
+#: 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_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_provision
+msgid "Provisions"
+msgstr "Provisiones"
+
+#. module: l10n_syscohada
+#: 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_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_commitment
+msgid "Engagements"
+msgstr "Compromisos"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,description:l10n_syscohada.module_meta_information
+msgid "This module implementes the accounting chart for OHADA area."
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_expense
+msgid "Expense"
+msgstr "Gastos"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_syscohada
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_immobilisations
+msgid "Immobilisations"
+msgstr "Inmobilizaciones"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_stock
+msgid "Stocks"
+msgstr "Estocs"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cash
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_special
+msgid "Comptes spéciaux"
+msgstr "Cuentas especiales"
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_view
+msgid "View"
+msgstr "Ver"
+
+#. module: l10n_syscohada
+#: model:ir.module.module,shortdesc:l10n_syscohada.module_meta_information
+msgid "OHADA - Plan comptable général"
+msgstr ""
+
+#. module: l10n_syscohada
+#: model:account.account.type,name:l10n_syscohada.account_type_cloture
+msgid "Cloture"
+msgstr "Cierre"
diff --git a/addons/l10n_syscohada/i18n/fr.po b/addons/l10n_syscohada/i18n/fr.po
index 8a58faab1fa..d9447b3e999 100644
--- a/addons/l10n_syscohada/i18n/fr.po
+++ b/addons/l10n_syscohada/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: 2011-06-21 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_syscohada
 #: model:ir.actions.todo,note:l10n_syscohada.config_call_account_template_syscohada
@@ -142,59 +142,3 @@ msgstr ""
 #: model:account.account.type,name:l10n_syscohada.account_type_cloture
 msgid "Cloture"
 msgstr "Clôture"
-
-#~ msgid "The journal must have centralised counterpart"
-#~ msgstr "Le journal attend une contrepartie centralisée"
-
-#~ msgid "Opening Entries Period"
-#~ msgstr "Période des écritures d'ouvertures"
-
-#~ msgid "Fiscal Year to close"
-#~ msgstr "Année fiscale à clôturer"
-
-#~ msgid "Generate Fiscal Year Opening Entries(Corrected)"
-#~ msgstr "Générer les écritures d'ouvertures d'exercice fiscal(Corrigé)"
-
-#~ msgid "Generated during fiscal year closing/opening process"
-#~ msgstr "Ecriture de report"
-
-#~ msgid "Opening Entries Journal"
-#~ msgstr "Journal des écritures d'ouverture"
-
-#~ 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"
-
-#~ msgid "Create entries"
-#~ msgstr "Créer les écritures"
-
-#~ msgid "Name of new entries"
-#~ msgstr "Nom des nouvelles entrées"
-
-#~ msgid "Closing of fiscal year cancelled, please check the box !"
-#~ msgstr "Clôture de l'exercice fiscal annulée, veuillez cocher la case !"
-
-#~ msgid "End of Fiscal Year Entry"
-#~ msgstr "Écriture de fin d'exercice fiscal"
-
-#~ msgid "The opening journal must not have any entry in the new fiscal year !"
-#~ msgstr ""
-#~ "Le journal d'ouverture ne doit pas contenir d'écriture dans le nouvel "
-#~ "exercice fiscal !"
-
-#~ msgid "Close Fiscal Year with new entries"
-#~ msgstr "Clôturer l'exercice fiscal avec de nouvelles écritures"
-
-#~ msgid "UserError"
-#~ msgstr "Erreur utilsateur"
-
-#~ msgid "New Fiscal Year"
-#~ msgstr "Nouvel exercice fiscal"
-
-#~ msgid "Check this box"
-#~ msgstr "Cocher cette case"
-
-#~ msgid "Are you sure you want to create entries?"
-#~ msgstr "Etes vous sûr de vouloir enrégistrer des écritures"
-
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml
index 1d8a1564348..c5a28dd95da 100644
--- a/addons/l10n_syscohada/l10n_syscohada_data.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_data.xml
@@ -74,7 +74,7 @@
  <record model="account.account.type" id="account_type_equity">
   <field name="name">Equity</field> 
   <field name="code">equity</field> 
-  <field name="report_type">asset</field>
+  <field name="report_type">liability</field>
   <field name="close_method">balance</field> 
   </record>
  <record model="account.account.type" id="account_type_provision">
diff --git a/addons/l10n_th/__init__.py b/addons/l10n_th/__init__.py
index 45de899ed49..a4a5d907c6b 100644
--- a/addons/l10n_th/__init__.py
+++ b/addons/l10n_th/__init__.py
@@ -18,3 +18,5 @@
 #    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/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 714fc959c4a..4ab8f7d355c 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Thailand - Thai Chart of Accounts',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of Accounts for Thailand.
 ===============================
@@ -38,3 +38,5 @@ Thai accounting chart and localization.
     'certificate' : '00722263103978957725',
     'images': ['images/config_chart_l10n_th.jpeg','images/l10n_th_chart.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_th/i18n/ca.po b/addons/l10n_th/i18n/ca.po
index 6e3bfc4d49d..9c1a02b782b 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1cbae9b3050..4dc52fd5eda 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/es_MX.po b/addons/l10n_th/i18n/es_MX.po
new file mode 100644
index 00000000000..d8f9cde1140
--- /dev/null
+++ b/addons/l10n_th/i18n/es_MX.po
@@ -0,0 +1,54 @@
+# Spanish 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-07 06:19+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"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_th
+#: model:ir.module.module,shortdesc:l10n_th.module_meta_information
+msgid "Thailand - Thai Chart of Accounts"
+msgstr "Tailandia - Plan Contable Tailandés"
+
+#. module: l10n_th
+#: model:ir.module.module,description:l10n_th.module_meta_information
+msgid ""
+"\n"
+"Chart of accounts for Thailand.\n"
+"    "
+msgstr ""
+"\n"
+"Plan Contable para Tailandia\n"
+"    "
diff --git a/addons/l10n_th/i18n/es_PY.po b/addons/l10n_th/i18n/es_PY.po
index 5c11cf6bea1..26554ea702e 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/es_VE.po b/addons/l10n_th/i18n/es_VE.po
new file mode 100644
index 00000000000..d8f9cde1140
--- /dev/null
+++ b/addons/l10n_th/i18n/es_VE.po
@@ -0,0 +1,54 @@
+# Spanish 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-07 06:19+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"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_th
+#: model:ir.module.module,shortdesc:l10n_th.module_meta_information
+msgid "Thailand - Thai Chart of Accounts"
+msgstr "Tailandia - Plan Contable Tailandés"
+
+#. module: l10n_th
+#: model:ir.module.module,description:l10n_th.module_meta_information
+msgid ""
+"\n"
+"Chart of accounts for Thailand.\n"
+"    "
+msgstr ""
+"\n"
+"Plan Contable para Tailandia\n"
+"    "
diff --git a/addons/l10n_th/i18n/gl.po b/addons/l10n_th/i18n/gl.po
index 90ee9f15248..b09ca33b206 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6ae768f4409..21345304c7a 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9914516348f..522e1375cb5 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..42bac9d391a
--- /dev/null
+++ b/addons/l10n_th/i18n/sr@latin.po
@@ -0,0 +1,54 @@
+# Serbian Latin 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-07 06:19+0000\n"
+"PO-Revision-Date: 2011-10-13 14:53+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"\n"
+"    To je isti setup wizard koji se pokreće iz Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+
+#. module: l10n_th
+#: model:ir.module.module,shortdesc:l10n_th.module_meta_information
+msgid "Thailand - Thai Chart of Accounts"
+msgstr "Tajland - tajlandske računske tabele"
+
+#. module: l10n_th
+#: model:ir.module.module,description:l10n_th.module_meta_information
+msgid ""
+"\n"
+"Chart of accounts for Thailand.\n"
+"    "
+msgstr ""
+"\n"
+"Računske tabele za Tajland.\n"
+"    "
diff --git a/addons/l10n_th/i18n/th.po b/addons/l10n_th/i18n/th.po
new file mode 100644
index 00000000000..d9b675d399b
--- /dev/null
+++ b/addons/l10n_th/i18n/th.po
@@ -0,0 +1,43 @@
+# 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-07 06:19+0000\n"
+"PO-Revision-Date: 2011-11-17 01:32+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: 2011-11-18 05:13+0000\n"
+"X-Generator: Launchpad (build 14299)\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 ""
+
+#. module: l10n_th
+#: model:ir.module.module,shortdesc:l10n_th.module_meta_information
+msgid "Thailand - Thai Chart of Accounts"
+msgstr ""
+
+#. module: l10n_th
+#: model:ir.module.module,description:l10n_th.module_meta_information
+msgid ""
+"\n"
+"Chart of accounts for Thailand.\n"
+"    "
+msgstr ""
diff --git a/addons/l10n_th/i18n/tr.po b/addons/l10n_th/i18n/tr.po
index fb1db0612bf..fe20afe4feb 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_uk/__init__.py b/addons/l10n_uk/__init__.py
index c417d8b0478..a95e47ee5d2 100644
--- a/addons/l10n_uk/__init__.py
+++ b/addons/l10n_uk/__init__.py
@@ -1,34 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2009 Seath Solutions Ltd. All Rights Reserved.
-# Geoff Gardiner, Seath Solutions Ltd (http://www.seathsolutions.com/)
-# $Id$
+#    Copyright (C) 2011 Smartmode LTD (<http://www.smartmode.co.uk>).
 #
+#    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.
 #
-# 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 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.
 #
-# 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.
+#    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/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index b87352e2c02..f6e253fffc2 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 Smartmode LTD (<http://www.smartmode.co.uk>).
 #
 #    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,68 +18,33 @@
 #
 ##############################################################################
 
-#
-# This module provides a minimal UK chart of accounts for building upon further
-# OpenERP's default currency and accounts are remapped to this chart
-#
-# This module works for OpenERP 4.1.0 (and, assumed, onwards).
-# This module does not work for OpenERP 4.0.2 and before.
-#
-# VAT is structured thus:
-#  - the user company is assumed to be non-VAT exempt (easy to modify, however)
-#  - categories OVATS (Standard), OVATR (Reduced), OVATZ (Zero) should be
-#    assigned to the customer taxes section of products (depending on the product)
-#  - categories IVATS (Standard), IVATR (Reduced), IVATZ (Zero) should be
-#    assigned to the supplier taxes section of products (depending on the product)
-#  - categories OVATX (eXempt), OVATO (Out of scope), or nothing at all should be
-#    assigned to default tax field of customers (depending on the customer)
-#  - customer categorization trumps product categorization (unchanged Tiny functionality)
-#  - on purchases, upon invoicing
-#    - the base amount (ex-VAT) appears in the appropriate input base category (S, R, Z)
-#    - the VAT amount appears in the appropriate input VAT category (S, R)
-#    - invoice lines can be traced in these VAT categories
-#    - refunds of invoices are deducted from the input category
-#  - on sales, upon invoicing
-#    - the base amount (ex-VAT) appears in the appropriate output base category (S, R, Z, X, O)
-#    - the VAT amount appears in the appropriate output VAT category (S, R)
-#    - invoice lines can be traced in these VAT categories
-#    - refunds of invoices are deducted from the output category
-#
-# This forms a basis for accrual tax accounting
-# Cash tax accounting can be accommodated with further processing in OpenERP
-#
-# Status beta 0.92 - tested on OpenERP 4.1.0
-# Status beta 0.93 - tested on OpenERP 4.1.0
-# - trivial change to depend only on 'account'
-#   (seemed to be important for importing with no demo data)
-# Status 1.0 - tested on OpenERP 4.1.0, 4.0.3
-# - COGS account type fixed
-#
 
 {
-    'name': 'United Kingdom - minimal',
-    'version': '1.1',
-    'category': 'Finance',
-    'description': """
-This is the base module to manage the accounting chart for United Kingdom in OpenERP.
-=====================================================================================
-
-British accounting chart and localization.
-    """,
-    'author': 'Seath Solutions Ltd',
-    'website': 'http://www.seathsolutions.com',
+    'name': 'UK Chart of Accounts - latest (Smartode/CT600)',
+    'version': '1.0',
+    'category': 'Localization/Account Charts',
+    'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with:
+    - a CT600-ready chart of accounts
+    - VAT100-ready tax structure
+    - InfoLogic UK counties listing
+    - a few other adaptations""",
+    'author': 'SmartMode LTD',
+    'website': 'http://www.smartmode.co.uk',
     'depends': ['base_iban', 'base_vat', 'account_chart'],
     'init_xml': [],
     'update_xml': [
-        'l10n_uk_types.xml',
-        'l10n_uk_chart.xml',
-        'l10n_uk_tax.xml',
-        'l10n_uk_wizard.xml'
+        'data/account.account.type.csv',
+        'data/account.account.template.csv',
+        'data/account.tax.code.template.csv',
+        'data/account.chart.template.csv',
+        'data/account.tax.template.csv',
+        'data/res.country.state.csv',
+        'l10n_uk_wizard.xml',
     ],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '008956603329629',
+    'demo_xml' : [
+        'demo/demo.xml'
+    ],
+    'installable': 'True',
     'images': ['images/config_chart_l10n_uk.jpeg','images/l10n_uk_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_uk/data/account.account.template.csv b/addons/l10n_uk/data/account.account.template.csv
new file mode 100644
index 00000000000..d07693fd022
--- /dev/null
+++ b/addons/l10n_uk/data/account.account.template.csv
@@ -0,0 +1,139 @@
+"id","code","name","parent_id:id","type","user_type:id","reconcile"
+"UK0","0","Company",,"view","account_type_view","FALSE"
+"BAL","BAL","Balance Sheet","UK0","view","account_type_view","FALSE"
+"A000","A000","Fixed assets","BAL","view","account_type_view","FALSE"
+"A010","A010","Intangible assets","A000","view","account_type_view","FALSE"
+"0010","0010","Software","A010","other","account_type_fixed_assets","FALSE"
+"0011","0011","Software Depreciation","A010","other","account_type_fixed_assets","FALSE"
+"0020","0020","Patents & Trademarks","A010","other","account_type_fixed_assets","FALSE"
+"0021","0021","Patents & Trademarks Depreciation","A010","other","account_type_fixed_assets","FALSE"
+"A020","A020","Tangible assets","A000","view","account_type_view","FALSE"
+"0030","0030","Fixtures and fittings","A020","other","account_type_fixed_assets","FALSE"
+"0031","0031","Fixtures and fittings Depreciation","A020","other","account_type_fixed_assets","FALSE"
+"0040","0040","Land and buildings","A020","other","account_type_fixed_assets","FALSE"
+"0041","0041","Land and buildings Depreciation","A020","other","account_type_fixed_assets","FALSE"
+"0050","0050","Motor vehicles","A020","other","account_type_fixed_assets","FALSE"
+"0051","0051","Motor vehicles Depreciation","A020","other","account_type_fixed_assets","FALSE"
+"0060","0060","Office equipment (inc computer equipment)","A020","other","account_type_fixed_assets","FALSE"
+"0061","0061","Office equipment (inc computer equipment) Depreciation","A020","other","account_type_fixed_assets","FALSE"
+"0070","0070","Plant and machinery","A020","other","account_type_fixed_assets","FALSE"
+"0071","0071","Plant and machinery Depreciation","A020","other","account_type_fixed_assets","FALSE"
+"A030","A030","Investments","A000","view","account_type_view","FALSE"
+"B000","B000","Current assets","BAL","view","account_type_view","FALSE"
+"B010","B010","Stocks & WIP","B000","view","account_type_view","FALSE"
+"1001","1001","Stock","B010","other","account_type_current_assets","TRUE"
+"1002","1002","Work in Progress","B010","other","account_type_current_assets","FALSE"
+"1003","1003","Finished Goods","B010","other","account_type_current_assets","FALSE"
+"B020","B020","Trade Debtors","B000","view","account_type_view","FALSE"
+"1100","1100","Debtors Control Account","B020","receivable","account_type_receivable","TRUE"
+"1101","1101","Sundry Debtors","B020","receivable","account_type_receivable","TRUE"
+"1102","1102","Other Debtors","B020","other","account_type_current_assets","FALSE"
+"B030","B030","Investment current assets","B000","view","account_type_view","FALSE"
+"B040","B040","Cash at bank and in hand","B000","view","account_type_view","FALSE"
+"1200","1200","Bank Accounts","B040","liquidity","account_type_current_assets","TRUE"
+"1240","1240","Company Credit Card","B040","liquidity","account_type_current_assets","TRUE"
+"B050","B050","Prepayments and accrued income","B000","view","account_type_view","FALSE"
+"1103","1103","Prepayments","B050","other","account_type_current_assets","FALSE"
+"C000","C000","Current Liabilities","BAL","view","account_type_view","FALSE"
+"C010","C010","Creditors due within one year","C000","view","account_type_view","FALSE"
+"2100","2100","Creditors Control Account","C010","payable","account_type_payable","TRUE"
+"2101","2101","Sundry Creditors","C010","other","account_type_current_liabilities","FALSE"
+"2102","2102","Other Creditors","C010","other","account_type_current_liabilities","FALSE"
+"2200","2200","Sales Tax Control Account","C010","other","account_type_output_tax","FALSE"
+"2201","2201","Purchase Tax Control Account","C010","other","account_type_input_tax","FALSE"
+"2202","2202","HMRC - VAT Account","C010","payable","account_type_payable","TRUE"
+"2204","2204","Manual Adjustments ﾖ VAT","C010","other","account_type_current_liabilities","FALSE"
+"2210","2210","P.A.Y.E. & NI","C010","payable","account_type_payable","TRUE"
+"2220","2220","Net Wages","C010","payable","account_type_payable","TRUE"
+"2230","2230","Pension Fund","C010","payable","account_type_payable","TRUE"
+"C020","C020","Provisions for liabilities and charges","C000","view","account_type_view","FALSE"
+"2150","2150","Bad debt provision","C020","other","account_type_current_liabilities","FALSE"
+"C030","C030","Accruals and deferred income","C000","view","account_type_view","FALSE"
+"2109","2109","Accruals","C030","other","account_type_current_liabilities","FALSE"
+"2320","2320","Corporation Tax","C030","payable","account_type_payable","TRUE"
+"D000","D000","Non Current Liabilities","BAL","view","account_type_view","FALSE"
+"D010","D010","Creditors due after one year","D000","view","account_type_view","FALSE"
+"2300","2300","Loans","D010","other","account_type_current_liabilities","FALSE"
+"2310","2310","Hire Purchase","D010","other","account_type_current_liabilities","FALSE"
+"2330","2330","Mortgages","D010","other","account_type_current_liabilities","FALSE"
+"E000","E000","Capital & Reserves","BAL","view","account_type_view","FALSE"
+"3000","3000","Called up share capital","E000","other","account_type_equity","FALSE"
+"3010","3010","Share premium account","E000","other","account_type_equity","FALSE"
+"3020","3020","Revaluation reserve","E000","other","account_type_equity","FALSE"
+"3030","3030","Other reserves","E000","other","account_type_equity","FALSE"
+"3200","3200","Profit and loss account","E000","other","account_type_profit_and_loss","FALSE"
+"PNL","PNL","Profit and Loss","UK0","view","account_type_view","FALSE"
+"F000","F000","Turnover","PNL","view","account_type_view","FALSE"
+"4000","4000","Sales category 1","F000","other","account_type_income","FALSE"
+"4001","4001","Sales category 2","F000","other","account_type_income","FALSE"
+"4002","4002","Sales category 3","F000","other","account_type_income","FALSE"
+"4003","4003","Sales category 4","F000","other","account_type_income","FALSE"
+"G000","G000","Cost of sales","PNL","view","account_type_view","FALSE"
+"5000","5000","Cost of sales 1","G000","other","account_type_expense","FALSE"
+"5001","5001","Cost of sales 2","G000","other","account_type_expense","FALSE"
+"5002","5002","Cost of sales 3","G000","other","account_type_expense","FALSE"
+"5003","5003","Cost of sales 4","G000","other","account_type_expense","FALSE"
+"H000","H000","Distribution costs","PNL","view","account_type_view","FALSE"
+"H010","H010","Advertising and promotions","H000","view","account_type_view","FALSE"
+"6000","6000","Marketing, POS","H010","other","account_type_expense","FALSE"
+"6001","6001","Exhibitions and events","H010","other","account_type_expense","FALSE"
+"6002","6002","PR","H010","other","account_type_expense","FALSE"
+"6010","6010","Distribution vehicles","H000","other","account_type_expense","FALSE"
+"6020","6020","Distribution salaries and wages","H000","other","account_type_expense","FALSE"
+"6030","6030","Shipping","H000","other","account_type_expense","FALSE"
+"I000","I000","Administrative expenses","PNL","view","account_type_view","FALSE"
+"I010","I010","Salaries & wages","I000","view","account_type_view","FALSE"
+"7000","7000","Directors pension","I010","other","account_type_expense","FALSE"
+"7001","7001","Directors remuneration","I010","other","account_type_expense","FALSE"
+"7010","7010","Admin gross salaries","I010","other","account_type_expense","FALSE"
+"7011","7011","Management gross salaries","I010","other","account_type_expense","FALSE"
+"7012","7012","Employers NIC","I010","other","account_type_expense","FALSE"
+"7020","7020","Subcontractors payments","I010","other","account_type_expense","FALSE"
+"I020","I020","Legal and professional costs","I000","view","account_type_view","FALSE"
+"7610","7610","Consultancy","I020","other","account_type_expense","FALSE"
+"7620","7620","Legal and professional charges","I020","other","account_type_expense","FALSE"
+"I025","I025","Accountancy and audit","I000","view","account_type_view","FALSE"
+"7601","7601","Accounting","I025","other","account_type_expense","FALSE"
+"7602","7602","Auditing","I025","other","account_type_expense","FALSE"
+"I030","I030","Property costs","I000","view","account_type_view","FALSE"
+"7110","7110","Light, heat and power","I030","other","account_type_expense","FALSE"
+"7100","7100","Rent and rates","I030","other","account_type_expense","FALSE"
+"7120","7120","Repairs, renewals and maintenance","I030","other","account_type_expense","FALSE"
+"I040","I040","Vehicle expenses","I000","view","account_type_view","FALSE"
+"7300","7300","Car hire","I040","other","account_type_expense","FALSE"
+"7301","7301","Car fuel","I040","other","account_type_expense","FALSE"
+"7302","7302","Car maintenance","I040","other","account_type_expense","FALSE"
+"I050","I050","Administration and office expenses","I000","view","account_type_view","FALSE"
+"7502","7502","Telephone","I050","other","account_type_expense","FALSE"
+"7503","7503","Internet & hosting","I050","other","account_type_expense","FALSE"
+"7504","7504","Mobiles","I050","other","account_type_expense","FALSE"
+"7505","7505","Stationery","I050","other","account_type_expense","FALSE"
+"7506","7506","Office consumables","I050","other","account_type_expense","FALSE"
+"7507","7507","Postage and Carriage","I050","other","account_type_expense","FALSE"
+"7508","7508","Books","I050","other","account_type_expense","FALSE"
+"7509","7509","Network costs","I050","other","account_type_expense","FALSE"
+"7510","7510","Software expenses","I050","other","account_type_expense","FALSE"
+"7511","7511","Other computer costs","I050","other","account_type_expense","FALSE"
+"7512","7512","Recruitment fees","I050","other","account_type_expense","FALSE"
+"7513","7513","Other admin expenses","I050","other","account_type_expense","FALSE"
+"I060","I060","Sundry expenses","I000","view","account_type_view","FALSE"
+"7700","7700","Exchange gains/losses","I060","other","account_type_expense","FALSE"
+"7710","7710","Other sundry expenses","I060","other","account_type_expense","FALSE"
+"7850","7850","Bad debts","I060","other","account_type_expense","FALSE"
+"7910","7910","Bank, credit card and other financial charges","I060","other","account_type_expense","FALSE"
+"I070","I070","Depreciation expense","I000","view","account_type_view","FALSE"
+"8000","8000","Intangible assets depn","I070","other","account_type_expense","FALSE"
+"8001","8001","Tangible assets depn","I070","other","account_type_expense","FALSE"
+"8200","8200","Donations","I060","other","account_type_expense","FALSE"
+"8300","8300","Entertaining","I060","other","account_type_expense","FALSE"
+"8400","8400","Insurance","I060","other","account_type_expense","FALSE"
+"8500","8500","Travel and subsistence","I050","other","account_type_expense","FALSE"
+"J000","J000","Other operating income","PNL","view","account_type_view","FALSE"
+"9000","9000","Profits/Losses on disposals of assets","J000","other","account_type_income","FALSE"
+"K000","K000","Interest receivable and similar income:","PNL","view","account_type_view","FALSE"
+"4900","4900","Bank Interest received","K000","other","account_type_income","FALSE"
+"4910","4910","Investment Interest received","K000","other","account_type_income","FALSE"
+"l000","l000","Interest payable and similar charges","PNL","view","account_type_view","FALSE"
+"7900","7900","Interest paid","l000","other","account_type_expense","FALSE"
+"M000","M000","Tax on profit or loss on ordinary activities","PNL","view","account_type_view","FALSE"
+"8800","8800","Corporation tax expense","M000","other","account_type_expense","FALSE"
diff --git a/addons/l10n_uk/data/account.account.type.csv b/addons/l10n_uk/data/account.account.type.csv
new file mode 100644
index 00000000000..0827975b22f
--- /dev/null
+++ b/addons/l10n_uk/data/account.account.type.csv
@@ -0,0 +1,13 @@
+"id","name","code","report_type","close_method"
+"account_type_current_assets","Current Assets","Current Assets","asset","Balance"
+"account_type_current_liabilities","Current Liabilities","Current Liabilities","liability","Balance"
+"account_type_equity","Equity","Equity","liability","Balance"
+"account_type_expense","Expense","Expense","expense","None"
+"account_type_fixed_assets","Fixed Assets","Fixed Assets","asset","Balance"
+"account_type_income","Income","Income","income","None"
+"account_type_payable","Payable","Payable","liability","Unreconciled"
+"account_type_receivable","Receivable","Receivable","asset","Unreconciled"
+"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"
diff --git a/addons/l10n_uk/data/account.chart.template.csv b/addons/l10n_uk/data/account.chart.template.csv
new file mode 100644
index 00000000000..9d1812a8df4
--- /dev/null
+++ b/addons/l10n_uk/data/account.chart.template.csv
@@ -0,0 +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"
diff --git a/addons/l10n_uk/data/account.tax.code.template.csv b/addons/l10n_uk/data/account.tax.code.template.csv
new file mode 100644
index 00000000000..eba760226e1
--- /dev/null
+++ b/addons/l10n_uk/data/account.tax.code.template.csv
@@ -0,0 +1,10 @@
+"id","name","code","parent_id:id","notprintable","sign"
+0,"UK HMRC VAT",0,,,1
+4,"Net VAT to be paid/reclaimed",5,0,"FALSE",1
+5,"Total value of sales ex VAT (box 8 included)",6,0,"FALSE",0
+6,"Total value of purchases ex VAT",7,0,"FALSE",0
+8,"Total value of EC purchases, ex VAT",9,0,"FALSE",0
+1,"VAT on Sales and other outputs",1,4,"FALSE",1
+2,"VAT on acquisitions from other EC Member states",2,4,"FALSE",1
+3,"VAT reclaimed on purchases (EC included)",4,4,"FALSE",-1
+7,"Total value of EC sales, ex VAT",8,5,"FALSE",1
diff --git a/addons/l10n_uk/data/account.tax.template.csv b/addons/l10n_uk/data/account.tax.template.csv
new file mode 100644
index 00000000000..2455b382818
--- /dev/null
+++ b/addons/l10n_uk/data/account.tax.template.csv
@@ -0,0 +1,14 @@
+"id","description","chart_template_id:id","type_tax_use","name","type","amount","account_collected_id:id","account_paid_id:id","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","tax_sign","base_sign","ref_base_sign","ref_tax_sign","parent_id:id"
+"ST0","ST0","l10n_uk","sale","Zero rated sales","percent",0,2200,2200,5,1,5,1,1,1,-1,-1,
+"ST1","ST1","l10n_uk","sale","Standard rate sales (17.5%)","percent",0.175,2200,2200,5,1,5,1,1,1,-1,-1,
+"ST2","ST2","l10n_uk","sale","Exempt sales","percent",0,2200,2200,5,1,5,1,1,1,-1,-1,
+"PT0","PT0","l10n_uk","purchase","Zero rated purchases","percent",0,2201,2201,6,3,6,3,1,1,-1,-1,
+"PT1","PT1","l10n_uk","purchase","Standard rate purchases (17.5%)","percent",0.175,2201,2201,6,3,6,3,1,1,-1,-1,
+"PT2","PT2","l10n_uk","purchase","Exempt purchases","percent",0,2201,2201,6,3,6,3,1,1,-1,-1,
+"PT8","PT8","l10n_uk","purchase","Standard rated purchases from EC","percent",0.175,2201,2201,8,2,8,2,1,1,-1,-1,
+"PT8R","PT8R","l10n_uk","purchase","Reverse EC Purchase VAT","percent",-1,2201,2201,,3,3,,-1,-1,1,1,"PT8"
+"PT5","PT5","l10n_uk","purchase","Lower rate purchases (5%)","percent",0.05,2201,2201,6,3,6,3,1,1,-1,-1,
+"ST4","ST4","l10n_uk","sale","Sales to customers in EC","percent",0,2200,2200,7,,7,,1,1,-1,-1,
+"PT7","PT7","l10n_uk","purchase","Zero rated purchases from EC","percent",0,2201,2201,8,,8,,1,1,-1,-1,
+"ST11","ST11","l10n_uk","sale","Standard rate sales (20%)","percent",0.2,2200,2200,5,1,5,1,1,1,-1,-1,
+"PT11","PT11","l10n_uk","purchase","Standard rate purchases (20%)","percent",0.2,2201,2201,6,3,6,3,1,1,-1,-1,
diff --git a/addons/l10n_uk/data/res.country.state.csv b/addons/l10n_uk/data/res.country.state.csv
new file mode 100644
index 00000000000..bce2f3c9f36
--- /dev/null
+++ b/addons/l10n_uk/data/res.country.state.csv
@@ -0,0 +1,120 @@
+"id","country_id:id","code","name"
+"state_uk_1","base.uk","A1","Aberdeenshire"
+"state_uk_2","base.uk","A5","Angus"
+"state_uk_3","base.uk","A7","Argyll"
+"state_uk_4","base.uk","A9","Avon"
+"state_uk_5","base.uk","B1","Ayrshire"
+"state_uk_6","base.uk","B3","Banffshire"
+"state_uk_7","base.uk","B5","Bedfordshire"
+"state_uk_8","base.uk","B7","Berkshire"
+"state_uk_9","base.uk","B9","Berwickshire"
+"state_uk_10","base.uk","C1","Buckinghamshire"
+"state_uk_11","base.uk","C3","Caithness"
+"state_uk_12","base.uk","C5","Cambridgeshire"
+"state_uk_13","base.uk","C6","Channel Islands"
+"state_uk_14","base.uk","C7","Cheshire"
+"state_uk_15","base.uk","C9","Clackmannanshire"
+"state_uk_16","base.uk","D1","Cleveland"
+"state_uk_17","base.uk","D3","Clwyd"
+"state_uk_18","base.uk","D5","County Antrim"
+"state_uk_19","base.uk","D7","County Armagh"
+"state_uk_20","base.uk","D9","County Down"
+"state_uk_21","base.uk","E1","County Durham"
+"state_uk_22","base.uk","E3","County Fermanagh"
+"state_uk_23","base.uk","E5","County Londonderry"
+"state_uk_24","base.uk","E7","County Tyrone"
+"state_uk_25","base.uk","E9","Cornwall"
+"state_uk_26","base.uk","F1","Cumbria"
+"state_uk_27","base.uk","F3","Derbyshire"
+"state_uk_28","base.uk","F5","Devon"
+"state_uk_29","base.uk","F7","Dorset"
+"state_uk_30","base.uk","F9","Dumfriesshire"
+"state_uk_31","base.uk","G1","Dunbartonshire"
+"state_uk_32","base.uk","G3","Dyfed"
+"state_uk_33","base.uk","G5","East Lothian"
+"state_uk_34","base.uk","G7","East Sussex"
+"state_uk_35","base.uk","G9","Essex"
+"state_uk_36","base.uk","H1","Fife"
+"state_uk_37","base.uk","H3","Gloucestershire"
+"state_uk_38","base.uk","H7","Gwent"
+"state_uk_39","base.uk","H9","Gwynedd"
+"state_uk_40","base.uk","I1","Hampshire"
+"state_uk_41","base.uk","I3","Herefordshire"
+"state_uk_42","base.uk","I5","Hertfordshire"
+"state_uk_43","base.uk","I7","Inverness-Shire"
+"state_uk_44","base.uk","I9","Isle of Arran"
+"state_uk_45","base.uk","J1","Isle of Barra"
+"state_uk_46","base.uk","J3","Isle of Benbecula"
+"state_uk_47","base.uk","J5","Isle of Bute"
+"state_uk_48","base.uk","J7","Isle of Canna"
+"state_uk_49","base.uk","J9","Isle of Coll"
+"state_uk_50","base.uk","K1","Isle of Colonsay"
+"state_uk_51","base.uk","K3","Isle of Cumbrae"
+"state_uk_52","base.uk","K5","Isle of Eigg"
+"state_uk_53","base.uk","K7","Isle of Gigha"
+"state_uk_54","base.uk","K9","Isle of Harris"
+"state_uk_55","base.uk","L1","Isle of Iona"
+"state_uk_56","base.uk","L2","Isle of Islay"
+"state_uk_57","base.uk","L5","Isle of Jura"
+"state_uk_58","base.uk","L7","Isle of Lewis"
+"state_uk_59","base.uk","L9","Isle of Man"
+"state_uk_60","base.uk","M1","Isle of Mull"
+"state_uk_61","base.uk","M3","Isle of North Uist"
+"state_uk_62","base.uk","M7","Isle of Rhum"
+"state_uk_63","base.uk","M9","Isle of Scalpay"
+"state_uk_64","base.uk","N1","Shetland Islands"
+"state_uk_65","base.uk","N3","Isle of Skye"
+"state_uk_66","base.uk","N5","Isle of South Uist"
+"state_uk_67","base.uk","N7","Isle of Tiree"
+"state_uk_68","base.uk","N9","Isle of Wight"
+"state_uk_69","base.uk","O5","Kent"
+"state_uk_70","base.uk","O7","Kincardineshire"
+"state_uk_71","base.uk","O9","Kinross-Shire"
+"state_uk_72","base.uk","P1","Kirkcudbrightshire"
+"state_uk_73","base.uk","P5","Lancashire"
+"state_uk_74","base.uk","P7","Leicestershire"
+"state_uk_75","base.uk","P9","Lincolnshire"
+"state_uk_76","base.uk","Q3","Merseyside"
+"state_uk_77","base.uk","Q5","Mid Glamorgan"
+"state_uk_78","base.uk","Q9","Middlesex"
+"state_uk_79","base.uk","R1","Morayshire"
+"state_uk_80","base.uk","R3","Nairnshire"
+"state_uk_81","base.uk","R7","North Humberside"
+"state_uk_82","base.uk","R9","North Yorkshire"
+"state_uk_83","base.uk","S1","Northamptonshire"
+"state_uk_84","base.uk","S3","Northumberland"
+"state_uk_85","base.uk","S5","Nottinghamshire"
+"state_uk_86","base.uk","S7","Oxfordshire"
+"state_uk_87","base.uk","S9","Peeblesshire"
+"state_uk_88","base.uk","T1","Perthshire"
+"state_uk_89","base.uk","T3","Powys"
+"state_uk_90","base.uk","T5","Renfrewshire"
+"state_uk_91","base.uk","T7","Ross-Shire"
+"state_uk_92","base.uk","T9","Roxburghshire"
+"state_uk_93","base.uk","U3","Selkirkshire"
+"state_uk_94","base.uk","U5","Shropshire"
+"state_uk_95","base.uk","U7","Somerset"
+"state_uk_96","base.uk","U9","South Glamorgan"
+"state_uk_97","base.uk","V1","South Humberside"
+"state_uk_98","base.uk","V3","South Yorkshire"
+"state_uk_99","base.uk","V5","Staffordshire"
+"state_uk_100","base.uk","V7","Stirlingshire"
+"state_uk_101","base.uk","V9","Suffolk"
+"state_uk_102","base.uk","W1","Surrey"
+"state_uk_103","base.uk","W3","Sutherland"
+"state_uk_104","base.uk","W5","Tyne and Wear"
+"state_uk_105","base.uk","W7","Warwickshire"
+"state_uk_106","base.uk","W9","West Glamorgan"
+"state_uk_107","base.uk","X1","West Lothian"
+"state_uk_108","base.uk","X3","West Midlands"
+"state_uk_109","base.uk","X5","West Sussex"
+"state_uk_110","base.uk","X7","West Yorkshire"
+"state_uk_111","base.uk","X9","Wigtownshire"
+"state_uk_112","base.uk","Y1","Wiltshire"
+"state_uk_113","base.uk","Y3","Worcestershire"
+"state_uk_114","base.uk","M5","Orkney"
+"state_uk_115","base.uk","O1","Isles of Scilly"
+"state_uk_116","base.uk","P3","Lanarkshire"
+"state_uk_117","base.uk","Q1","London"
+"state_uk_118","base.uk","Q7","Midlothian"
+"state_uk_119","base.uk","R5","Norfolk"
diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/demo.xml
new file mode 100644
index 00000000000..b23cd76ec6d
--- /dev/null
+++ b/addons/l10n_uk/demo/demo.xml
@@ -0,0 +1,24 @@
+<openerp>
+<data noupdate="1">       
+        <record id="smartmode" model="res.partner">
+            <field name="comment">UK OpenERP Partner</field>
+            <field name="ref">smartmode</field>
+            <field name="website">http://www.smartmode.co.uk</field>
+            <field name="name">SmartMode LTD</field>
+        </record>
+
+        <record id="res_partner_address_1" model="res.partner.address">
+            <field name="fax">08455274653</field>
+            <field name="name">Vadim Chobanu</field>
+            <field name="zip">HA4 7JW</field>
+            <field name="city">Ruislip</field>
+            <field name="partner_id" ref="smartmode"/>
+            <field name="country_id" model="res.country" search="[('code','=','uk')]"/>
+            <field name="email">vadim@smartmode.co.uk</field>
+            <field name="phone">+44 (0) 8456434548</field>
+            <field name="street">12, Hill Lane</field>
+            <field name="active">1</field>
+            <field name="type">default</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_uk/i18n/ar.po b/addons/l10n_uk/i18n/ar.po
index 6828e6dad3c..8529129285a 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/bg.po b/addons/l10n_uk/i18n/bg.po
index 773a361a6ce..a0e1a1054a9 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,18 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "Приход"
-
-#~ msgid "Cash"
-#~ msgstr "В брой"
-
-#~ msgid "Equity"
-#~ msgstr "Акции"
-
-#~ msgid "Expense"
-#~ msgstr "Разход"
-
-#~ msgid "View"
-#~ msgstr "Изглед"
diff --git a/addons/l10n_uk/i18n/bs.po b/addons/l10n_uk/i18n/bs.po
index f801cf2ae73..243383c844c 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/ca.po b/addons/l10n_uk/i18n/ca.po
index b7641551dba..eca1a414af7 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -50,18 +50,3 @@ msgstr ""
 "Aquest és el mateix assistent que s'executa des de "
 "Comptabilitat/Configuració/Comptabilitat financera/Comptes financers/Genera "
 "pla comptable des d'una plantilla de pla comptable."
-
-#~ msgid "Income"
-#~ msgstr "Ingrés"
-
-#~ msgid "Cash"
-#~ msgstr "Caixa"
-
-#~ msgid "Equity"
-#~ msgstr "Patrimoni"
-
-#~ msgid "Expense"
-#~ msgstr "Despesa"
-
-#~ msgid "View"
-#~ msgstr "Vista"
diff --git a/addons/l10n_uk/i18n/cs.po b/addons/l10n_uk/i18n/cs.po
index a51c757c759..4ec165a52d7 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/de.po b/addons/l10n_uk/i18n/de.po
index 8d17bf025f7..af40b097249 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: 2011-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/es.po b/addons/l10n_uk/i18n/es.po
index 3e51c9eb7bb..f0cbef6cc2a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -50,33 +50,3 @@ msgstr ""
 "    Este es el mismo asistente que se ejecuta desde Gestión "
 "financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
 "plan de cuentas desde una plantilla de plan."
-
-#~ msgid "Expense"
-#~ msgstr "Gasto"
-
-#~ msgid "Receivable"
-#~ msgstr "A cobrar"
-
-#~ msgid "Payable"
-#~ msgstr "A pagar"
-
-#~ msgid "Income"
-#~ msgstr "Ingreso"
-
-#~ msgid "Tax"
-#~ msgstr "Impuesto"
-
-#~ msgid "Cash"
-#~ msgstr "Caja"
-
-#~ msgid "Liability"
-#~ msgstr "Pasivo"
-
-#~ msgid "Equity"
-#~ msgstr "Patrimonio"
-
-#~ msgid "View"
-#~ msgstr "Vista"
-
-#~ msgid "Asset"
-#~ msgstr "Activo"
diff --git a/addons/l10n_uk/i18n/es_MX.po b/addons/l10n_uk/i18n/es_MX.po
new file mode 100644
index 00000000000..94686cffbf2
--- /dev/null
+++ b/addons/l10n_uk/i18n/es_MX.po
@@ -0,0 +1,52 @@
+# 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-12 15: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: 2011-09-05 05:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_uk
+#: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
+msgid "United Kingdom - minimal"
+msgstr "Reino Unido - mínimo"
+
+#. module: l10n_uk
+#: model:ir.module.module,description:l10n_uk.module_meta_information
+msgid ""
+"This is the base module to manage the accounting chart for United Kingdom in "
+"OpenERP."
+msgstr ""
+"Este es el módulo base para manejar el plan contable para el Reino Unido en "
+"OpenERP."
+
+#. module: l10n_uk
+#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_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"
+"    This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Genere el plan de cuentas desde una plantilla de plan. Se le solicitará el "
+"nombre de la compañía, la plantilla de plan a seguir, y el núm. de dígitos "
+"para generar el código de sus cuentas, cuenta bancaria, y divisa para crear "
+"sus diarios. Por tanto, se genera una copia directa de la plantilla del plan "
+"de cuentas.\n"
+"    Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan."
diff --git a/addons/l10n_uk/i18n/es_PY.po b/addons/l10n_uk/i18n/es_PY.po
index 1f87b6a1179..df288fbbf0d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/es_VE.po b/addons/l10n_uk/i18n/es_VE.po
new file mode 100644
index 00000000000..94686cffbf2
--- /dev/null
+++ b/addons/l10n_uk/i18n/es_VE.po
@@ -0,0 +1,52 @@
+# 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-12 15: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: 2011-09-05 05:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: l10n_uk
+#: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
+msgid "United Kingdom - minimal"
+msgstr "Reino Unido - mínimo"
+
+#. module: l10n_uk
+#: model:ir.module.module,description:l10n_uk.module_meta_information
+msgid ""
+"This is the base module to manage the accounting chart for United Kingdom in "
+"OpenERP."
+msgstr ""
+"Este es el módulo base para manejar el plan contable para el Reino Unido en "
+"OpenERP."
+
+#. module: l10n_uk
+#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_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"
+"    This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Genere el plan de cuentas desde una plantilla de plan. Se le solicitará el "
+"nombre de la compañía, la plantilla de plan a seguir, y el núm. de dígitos "
+"para generar el código de sus cuentas, cuenta bancaria, y divisa para crear "
+"sus diarios. Por tanto, se genera una copia directa de la plantilla del plan "
+"de cuentas.\n"
+"    Este es el mismo asistente que se ejecuta desde Gestión "
+"financiera/Configuración/Contabilidad financiera/Cuentas financieras/Generar "
+"plan de cuentas desde una plantilla de plan."
diff --git a/addons/l10n_uk/i18n/et.po b/addons/l10n_uk/i18n/et.po
index 687941fa90a..15b0344c6cb 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,33 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Receivable"
-#~ msgstr "Nõuded"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "Viga ! Sa ei saa luua rekrusiivseid kontomalle."
-
-#~ msgid "Income"
-#~ msgstr "Tulu"
-
-#~ msgid "Tax"
-#~ msgstr "Maks"
-
-#~ msgid "Cash"
-#~ msgstr "Kassa"
-
-#~ msgid "Payable"
-#~ msgstr "Võlad"
-
-#~ msgid "Equity"
-#~ msgstr "Omakapital"
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "Viga ! sa ei saa luua rekrusiivseid maksukoode."
-
-#~ msgid "Expense"
-#~ msgstr "Kulu"
-
-#~ msgid "View"
-#~ msgstr "Vaade"
diff --git a/addons/l10n_uk/i18n/fr.po b/addons/l10n_uk/i18n/fr.po
index 0b729721191..0001f951fd4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/gl.po b/addons/l10n_uk/i18n/gl.po
index bd2aad568e1..c98587d4c26 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/hr.po b/addons/l10n_uk/i18n/hr.po
index 8ebdcb55986..9c5f5f8c663 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/hu.po b/addons/l10n_uk/i18n/hu.po
index db23c558b21..185e8302b47 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/id.po b/addons/l10n_uk/i18n/id.po
index 9aea7110c19..68a98b05e92 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,15 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "Pendapatan"
-
-#~ msgid "Equity"
-#~ msgstr "Modal"
-
-#~ msgid "Expense"
-#~ msgstr "Biaya"
-
-#~ msgid "View"
-#~ msgstr "Tampilan"
diff --git a/addons/l10n_uk/i18n/it.po b/addons/l10n_uk/i18n/it.po
index 47214dae64b..1bfc9da7892 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/ko.po b/addons/l10n_uk/i18n/ko.po
index 69de65fb323..fa28530c60f 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/lt.po b/addons/l10n_uk/i18n/lt.po
index 2e4268aea1b..edc1ee3bb4d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,12 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "Pajamos"
-
-#~ msgid "Expense"
-#~ msgstr "Išlaidos"
-
-#~ msgid "View"
-#~ msgstr "Žiūrėti"
diff --git a/addons/l10n_uk/i18n/nl.po b/addons/l10n_uk/i18n/nl.po
index a43cc799e20..c4aab365a83 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,21 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "Inkomen"
-
-#~ msgid "Tax"
-#~ msgstr "Belasting"
-
-#~ msgid "Cash"
-#~ msgstr "Contanten"
-
-#~ msgid "Equity"
-#~ msgstr "Vermogen"
-
-#~ msgid "Expense"
-#~ msgstr "Uitgave"
-
-#~ msgid "View"
-#~ msgstr "Aanzicht"
diff --git a/addons/l10n_uk/i18n/oc.po b/addons/l10n_uk/i18n/oc.po
index b9bbdf257f2..60b44dfbe5d 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,18 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "Produches"
-
-#~ msgid "Tax"
-#~ msgstr "Impòstes e taxas"
-
-#~ msgid "Cash"
-#~ msgstr "Liquiditats"
-
-#~ msgid "Expense"
-#~ msgstr "Despensas"
-
-#~ msgid "View"
-#~ msgstr "Afichatge"
diff --git a/addons/l10n_uk/i18n/pl.po b/addons/l10n_uk/i18n/pl.po
index 65cf74a3050..ace7ea0f86a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/pt.po b/addons/l10n_uk/i18n/pt.po
index c2e921fd2bc..32add1534a8 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,18 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Expense"
-#~ msgstr "Despesa"
-
-#~ msgid "Income View"
-#~ msgstr "Visão das receitas"
-
-#~ msgid "Income"
-#~ msgstr "Receita"
-
-#~ msgid "Cash"
-#~ msgstr "Dinheiro"
-
-#~ msgid "Expense View"
-#~ msgstr "Visão das despesas"
diff --git a/addons/l10n_uk/i18n/pt_BR.po b/addons/l10n_uk/i18n/pt_BR.po
index 1afb81c106f..6c82a0cb458 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -49,15 +49,3 @@ msgstr ""
 "    This is the same wizard that runs from Financial "
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
-
-#~ msgid "Income"
-#~ msgstr "Receita"
-
-#~ msgid "Equity"
-#~ msgstr "Patrimônio Líquido"
-
-#~ msgid "Expense"
-#~ msgstr "Despesa"
-
-#~ msgid "View"
-#~ msgstr "Visualizar"
diff --git a/addons/l10n_uk/i18n/ro.po b/addons/l10n_uk/i18n/ro.po
index 1fddb7bffda..6ea435481f7 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/ru.po b/addons/l10n_uk/i18n/ru.po
index fb96c9c2186..f51321db58c 100644
--- a/addons/l10n_uk/i18n/ru.po
+++ b/addons/l10n_uk/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
 msgid "United Kingdom - minimal"
-msgstr ""
+msgstr "Соединённое королевство — минимальный."
 
 #. module: l10n_uk
 #: model:ir.module.module,description:l10n_uk.module_meta_information
@@ -28,6 +28,8 @@ msgid ""
 "This is the base module to manage the accounting chart for United Kingdom in "
 "OpenERP."
 msgstr ""
+"Базовый модуль управления планом счетов для Соединённого королевства в "
+"OpenERP."
 
 #. module: l10n_uk
 #: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
@@ -40,18 +42,10 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "Доход"
-
-#~ msgid "Cash"
-#~ msgstr "Наличные"
-
-#~ msgid "Equity"
-#~ msgstr "Собственные средства"
-
-#~ msgid "Expense"
-#~ msgstr "Расход"
-
-#~ msgid "View"
-#~ msgstr "Вид"
+"Генерация плана счетов по шаблону. От вас потребуется указать название "
+"организации, исходный шаблон плана счетов, число символов для генерации кода "
+"для ваших счетов и банковского счёта, валюту для создания журналов. Будет "
+"сгенерирована чистая копия шаблона плана счетов.\n"
+"    Этот тот же самый мастер, который запускается из меню Финансовый "
+"менеджмент/Настойка/Финансовый учёт/Финансовые счета/Сгенерировать план "
+"счетов по шаблону."
diff --git a/addons/l10n_uk/i18n/sl.po b/addons/l10n_uk/i18n/sl.po
index ed95a8a2c93..e120cc5955e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,56 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Receivable"
-#~ msgstr "Terjatev"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
-
-#~ msgid "Income"
-#~ msgstr "Prihodki"
-
-#~ msgid "Tax"
-#~ msgstr "Davek"
-
-#~ msgid "Cash"
-#~ msgstr "Gotovina"
-
-#~ msgid "Payable"
-#~ msgstr "Obveznosti"
-
-#~ msgid "Equity"
-#~ msgstr "Stanje bilance"
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "Napaka! Ne morete oblikovati rekurzivnih davčnih oznak."
-
-#~ msgid "Expense"
-#~ msgstr "Strošek"
-
-#~ msgid "View"
-#~ msgstr "Pogled:"
-
-#~ msgid ""
-#~ "This is the base module to manage the accounting chart for United Kingdom in "
-#~ "Open ERP."
-#~ msgstr ""
-#~ "To je Open ERP modul za urejanje kontnega načrta v Združenem kraljestvu."
-
-#~ 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 ""
-#~ "Ustvari kontni načrt iz predloge kontnega načrta. Vprašani boste za ime "
-#~ "podjetja, predlogo kontnega načrta, število znakov za oznako kotnov ter "
-#~ "bančni račun, valuto za dnevnike. Narejena je samo kopija predloge kontnega "
-#~ "načrta.\n"
-#~ "\tTo je isti čarovnik, kot se ga požene iz Finančno "
-#~ "uporavljanje/Nastavitve/Finančno računovodstvo/Ustvari kontni načrt iz "
-#~ "predloge kontnega načrta"
diff --git a/addons/l10n_uk/i18n/sq.po b/addons/l10n_uk/i18n/sq.po
index 5ba531b47aa..10d93363e7d 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/sr@latin.po b/addons/l10n_uk/i18n/sr@latin.po
index 035343b502b..de53d6d1b8d 100644
--- a/addons/l10n_uk/i18n/sr@latin.po
+++ b/addons/l10n_uk/i18n/sr@latin.po
@@ -8,19 +8,19 @@ 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:22+0000\n"
+"PO-Revision-Date: 2011-10-13 14:51+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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
 msgid "United Kingdom - minimal"
-msgstr ""
+msgstr "Ujedinjeno Kraljevstvo - minimalno"
 
 #. module: l10n_uk
 #: model:ir.module.module,description:l10n_uk.module_meta_information
@@ -28,6 +28,8 @@ msgid ""
 "This is the base module to manage the accounting chart for United Kingdom in "
 "OpenERP."
 msgstr ""
+"Ovo je osnovni modul za sređivanje računskih tabela za Ujedinjeno "
+"kraljevstvo u OpenERP-u."
 
 #. module: l10n_uk
 #: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
@@ -40,6 +42,11 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income View"
-#~ msgstr "Pregled Dohotka"
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"\n"
+"    To je isti setup wizard koji se pokreće iz Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
diff --git a/addons/l10n_uk/i18n/sv.po b/addons/l10n_uk/i18n/sv.po
index d2363c0efad..0341a131c20 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,56 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Receivable"
-#~ msgstr "Skulder"
-
-#~ msgid "Error ! You can not create recursive account templates."
-#~ msgstr "Fel! Du kan inte skapa rekursiva kontomallar."
-
-#~ msgid "Income"
-#~ msgstr "Intäkter"
-
-#~ msgid "Tax"
-#~ msgstr "Moms"
-
-#~ msgid "Cash"
-#~ msgstr "Kontant"
-
-#~ msgid "Payable"
-#~ msgstr "Betalningsbar"
-
-#~ msgid "Equity"
-#~ msgstr "Eget kapital"
-
-#~ msgid "Error ! You can not create recursive Tax Codes."
-#~ msgstr "Fel! Du kan inte skapa rekursiva skattekoder."
-
-#~ msgid "Expense"
-#~ msgstr "Utgift"
-
-#~ msgid "View"
-#~ msgstr "Visa"
-
-#~ msgid ""
-#~ "This is the base module to manage the accounting chart for United Kingdom in "
-#~ "Open ERP."
-#~ msgstr ""
-#~ "Detta är basmodulen för att hantera bokföring och kontoplaner för "
-#~ "Storbritannien i Open ERP."
-
-#~ 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 ""
-#~ "Generera kontoplan från en mall. Du kommer att bli ombedd att mata in namnet "
-#~ "på företaget, mallen för kontoplanen du tänker använda, antal siffror för "
-#~ "dina konton och bankkonto, valuta för grundböcker. Du får en jungfrulig "
-#~ "huvudbok och kontoplan från mallen.\n"
-#~ "Detta är samma guide som körs från Bokföring / Konfigurering / Finansiell "
-#~ "bokföring / Finansiella konton / Skapa kontoplan från mall."
diff --git a/addons/l10n_uk/i18n/tlh.po b/addons/l10n_uk/i18n/tlh.po
index 0b071c007c9..4b7a909a814 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/tr.po b/addons/l10n_uk/i18n/tr.po
index 95658e88c28..e61f53aa2f1 100644
--- a/addons/l10n_uk/i18n/tr.po
+++ b/addons/l10n_uk/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
 msgid "United Kingdom - minimal"
-msgstr ""
+msgstr "İngiltere - Minimal"
 
 #. module: l10n_uk
 #: model:ir.module.module,description:l10n_uk.module_meta_information
@@ -28,6 +28,8 @@ msgid ""
 "This is the base module to manage the accounting chart for United Kingdom in "
 "OpenERP."
 msgstr ""
+"Bu temel modül İngiltere muhasebe hesap planının OpenERP de yönetilmesi için "
+"kullanılır."
 
 #. module: l10n_uk
 #: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
@@ -40,18 +42,8 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Receivable"
-#~ msgstr "Alacak"
-
-#~ msgid "Tax"
-#~ msgstr "Vergi"
-
-#~ msgid "Payable"
-#~ msgstr "Borç (Ödenmesi Gereken)"
-
-#~ msgid "Expense"
-#~ msgstr "Gider"
-
-#~ msgid "View"
-#~ msgstr "Görünüm"
+"Bir Tablo Şablonundan Hesap Tablosu oluşturun. Sizden, firma adı, izlenecek "
+"tablo şablonu, hesabı oluşturacak koda ait rakam sayısı ve Banka hesabı ile "
+"yevmiyeleri oluşturmak için para cinsi sorulacaktır.\n"
+"Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Tablo Şablonundan Hesap "
+"Tablosu Oluştur menüsünden çalıştırılan sihirbaz ile aynıdır."
diff --git a/addons/l10n_uk/i18n/uk.po b/addons/l10n_uk/i18n/uk.po
index f49a95ceec5..c34c4100688 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,21 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "Дохід"
-
-#~ msgid "Tax"
-#~ msgstr "Податки"
-
-#~ msgid "Cash"
-#~ msgstr "Каса"
-
-#~ msgid "Equity"
-#~ msgstr "Акціонерний капітал"
-
-#~ msgid "Expense"
-#~ msgstr "Витрати"
-
-#~ msgid "View"
-#~ msgstr "Перегляд"
diff --git a/addons/l10n_uk/i18n/vi.po b/addons/l10n_uk/i18n/vi.po
index de31c42acf4..e49f5331e51 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/i18n/zh_CN.po b/addons/l10n_uk/i18n/zh_CN.po
index 3874e731ddf..a9f6c98fd7c 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
@@ -40,24 +40,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Income"
-#~ msgstr "收入"
-
-#~ msgid "Tax"
-#~ msgstr "税"
-
-#~ msgid "Cash"
-#~ msgstr "现金"
-
-#~ msgid "Payable"
-#~ msgstr "应付账款"
-
-#~ msgid "Equity"
-#~ msgstr "权益"
-
-#~ msgid "Expense"
-#~ msgstr "费用"
-
-#~ msgid "View"
-#~ msgstr "视图"
diff --git a/addons/l10n_uk/i18n/zh_TW.po b/addons/l10n_uk/i18n/zh_TW.po
index cbb98d38d73..79ce511d5ec 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
diff --git a/addons/l10n_uk/l10n_uk_chart.xml b/addons/l10n_uk/l10n_uk_chart.xml
deleted file mode 100644
index d82f9d40fde..00000000000
--- a/addons/l10n_uk/l10n_uk_chart.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Account Templates-->
-        <record id="chart0" model="account.account.template">
-            <field name="code">0</field>
-            <field name="name">Account Chart UK</field>
-            <field eval="0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
-
-        <!-- Balance Sheet -->
-        <record id="bal" model="account.account.template">
-            <field name="code">1</field>
-            <field name="name">Balance Sheet</field>
-            <field ref="chart0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
-
-        <record model="account.account.template" id="liabilities_view">
-            <field name="name">Liabilities</field>
-            <field name="code">11</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_liability_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="bal"/>
-        </record>
-
-        <record id="cli" model="account.account.template">
-            <field name="code">110</field>
-            <field name="name">Current Liabilities</field>
-            <field ref="liabilities_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_liability_view"/>
-        </record>
-
-        <record id="a_pay" model="account.account.template">
-            <field name="code">1111</field>
-            <field name="name">Creditors</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">payable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_liability"/>
-        </record>
-
-        <record id="iva" model="account.account.template">
-            <field name="code">1112</field>
-            <field name="name">Input VAT</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_liability"/>
-        </record>
-
-        <record id="a_reserve_and_surplus" model="account.account.template">
-            <field name="code">1113</field>
-            <field name="name">Reserve and Profit/Loss Account</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_liability"/>
-        </record>
-
-        <record model="account.account.template" id="assets_view">
-            <field name="name">Assets</field>
-            <field name="code">10</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_asset_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="bal"/>
-        </record>
-
-        <record id="fas" model="account.account.template">
-            <field name="code">100</field>
-            <field name="name">Fixed Assets</field>
-            <field ref="assets_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_asset_view"/>
-        </record>
-
-        <record id="xfa" model="account.account.template">
-            <field name="code">1000</field>
-            <field name="name">Fixed Asset Account</field>
-            <field ref="fas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="nca" model="account.account.template">
-            <field name="code">101</field>
-            <field name="name">Net Current Assets</field>
-            <field ref="assets_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_asset_view"/>
-        </record>
-
-        <record id="cas" model="account.account.template">
-            <field name="code">1100</field>
-            <field name="name">Current Assets</field>
-            <field ref="nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_asset_view"/>
-        </record>
-
-        <record id="stk" model="account.account.template">
-            <field name="code">11001</field>
-            <field name="name">Purchased Stocks</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="a_recv" model="account.account.template">
-            <field name="code">11002</field>
-            <field name="name">Debtors</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="ova" model="account.account.template">
-            <field name="code">11003</field>
-            <field name="name">Output VAT</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="bnk" model="account.account.template">
-            <field name="code">11004</field>
-            <field name="name">Bank Current Account</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_cash"/>
-        </record>
-
-        <record id="cash" model="account.account.template">
-            <field name="code">11005</field>
-            <field name="name">Cash</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">liquidity</field>
-            <field name="user_type" ref="account_type_cash"/>
-        </record>
-
-        <!-- Profit and Loss -->
-
-        <record id="gpf" model="account.account.template">
-            <field name="code">2</field>
-            <field name="name">Profit and Loss</field>
-            <field ref="chart0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
-
-        <record model="account.account.template" id="income_view">
-            <field name="name">Income</field>
-            <field name="code">20</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_income_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="gpf"/>
-        </record>
-
-        <record model="account.account.template" id="income_fx_income">
-            <field name="name">Foreign Exchange Gain</field>
-            <field name="code">X201</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="income_view"/>
-        </record>
-
-        <record id="rev" model="account.account.template">
-            <field name="code">200</field>
-            <field name="name">Revenue</field>
-            <field ref="income_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_income_view"/>
-        </record>
-
-        <record id="a_sale" model="account.account.template">
-            <field name="code">2001</field>
-            <field name="name">Product Sales</field>
-            <field ref="rev" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
-        </record>
-
-        <record model="account.account.template" id="expense_view">
-            <field name="name">Expense</field>
-            <field name="code">21</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_expense_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="gpf"/>
-        </record>
-
-        <record id="cos" model="account.account.template">
-            <field name="code">210</field>
-            <field name="name">Cost of Sales</field>
-            <field ref="expense_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_expense_view"/>
-        </record>
-
-        <record id="cog" model="account.account.template">
-            <field name="code">2100</field>
-            <field name="name">Cost of Goods Sold</field>
-            <field ref="cos" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-
-        <record id="ovr" model="account.account.template">
-            <field name="code">211</field>
-            <field name="name">Overheads</field>
-            <field ref="expense_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_expense_view"/>
-        </record>
-
-        <record id="a_expense" model="account.account.template">
-            <field name="code">2110</field>
-            <field name="name">Expenses</field>
-            <field ref="ovr" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-
-        <record model="account.account.template" id="income_fx_expense">
-            <field name="name">Foreign Exchange Loss</field>
-            <field name="code">2111</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="ovr"/>
-        </record>
-
-        <record id="a_salary_expense" model="account.account.template">
-            <field name="code">2112</field>
-            <field name="name">Salary Expenses</field>
-            <field ref="ovr" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/l10n_uk/l10n_uk_tax.xml b/addons/l10n_uk/l10n_uk_tax.xml
deleted file mode 100644
index 4d2206cdbc7..00000000000
--- a/addons/l10n_uk/l10n_uk_tax.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- VAT Code Definitions -->
-
-        <!-- Invoiced VAT -->
-
-        <!-- Input VAT -->
-
-        <record id="vat_code_chart_root" model="account.tax.code.template">
-            <field name="name">Plan Fees UK</field>
-        </record>
-
-        <record id="vat_code_balance_net" model="account.tax.code.template">
-            <field name="name">VAT Balance to Pay</field>
-            <field name="parent_id" ref="vat_code_chart_root"/>
-        </record>
-
-        <record id="vat_code_input" model="account.tax.code.template">
-            <field name="name">Input VAT</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
-            <field eval="-1" name="sign"/>
-        </record>
-
-        <record id="vat_code_input_S" model="account.tax.code.template">
-            <field name="name">Input VAT Rate S (15%)</field>
-            <field name="parent_id" ref="vat_code_input"/>
-        </record>
-
-        <record id="vat_code_input_R" model="account.tax.code.template">
-            <field name="name">Input VAT Rate R (5%)</field>
-            <field name="parent_id" ref="vat_code_input"/>
-        </record>
-
-        <!-- Output VAT -->
-
-        <record id="vat_code_output" model="account.tax.code.template">
-            <field name="name">Output VAT</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
-        </record>
-
-        <record id="vat_code_output_S" model="account.tax.code.template">
-            <field name="name">Output VAT Rate S (15%)</field>
-            <field name="parent_id" ref="vat_code_output"/>
-        </record>
-
-        <record id="vat_code_output_R" model="account.tax.code.template">
-            <field name="name">Output VAT Rate R (5%)</field>
-            <field name="parent_id" ref="vat_code_output"/>
-        </record>
-
-        <!-- Invoiced Base of VAT -->
-
-        <!-- Purchases -->
-
-        <record id="vat_code_base_net" model="account.tax.code.template">
-            <field name="name">Tax Bases</field>
-            <field name="parent_id" ref="vat_code_chart_root"/>
-        </record>
-
-        <record id="vat_code_base_purchases" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Base</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
-        </record>
-
-        <record id="vat_code_purch_S" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated S (15%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_R" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated R (5%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_Z" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated Z (0%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_X" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Type X (Exempt)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_O" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Type O (Out of scope)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <!-- Sales -->
-
-        <record id="vat_code_base_sales" model="account.tax.code.template">
-            <field name="name">Base of Taxable Sales</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
-        </record>
-
-        <record id="vat_code_sales_S" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated S (15%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_R" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated R (5%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_Z" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated Z (0%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_X" model="account.tax.code.template">
-            <field name="name">Taxable Sales Type X (Exempt)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_O" model="account.tax.code.template">
-            <field name="name">Taxable Sales Type O (Out of scope)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <!-- Chart Template -->
-
-        <record id="l10n_uk_chart_template" model="account.chart.template">
-            <field name="name">UK Minimal Account Chart Template</field>
-            <field name="account_root_id" ref="chart0"/>
-            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
-          	<field name="bank_account_view_id" ref="bnk"/>
-            <field name="property_account_receivable" ref="a_recv"/>
-            <field name="property_account_payable" ref="a_pay"/>
-            <field name="property_account_expense_categ" ref="a_expense"/>
-            <field name="property_account_income_categ" ref="a_sale"/>
-            <field name="property_reserve_and_surplus_account" ref="a_reserve_and_surplus"/>
-        </record>
-
-        <!-- VAT Codes -->
-        <!-- Purchases + Input VAT -->
-
-        <record id="ivats" model="account.tax.template">
-       	 	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">IVAT S</field>
-            <field eval="0.15" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="iva"/>
-            <field name="account_paid_id" ref="iva"/>
-            <field name="base_code_id" ref="vat_code_purch_S"/>
-            <field name="tax_code_id" ref="vat_code_input_S"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_S"/>
-            <field name="ref_tax_code_id" ref="vat_code_input_S"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivatr" model="account.tax.template">
-       		<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">IVAT R</field>
-            <field eval="0.05" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="iva"/>
-            <field name="account_paid_id" ref="iva"/>
-            <field name="base_code_id" ref="vat_code_purch_R"/>
-            <field name="tax_code_id" ref="vat_code_input_R"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_R"/>
-            <field name="ref_tax_code_id" ref="vat_code_input_R"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivatz" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">IVAT Z</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_purch_Z"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_Z"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivatx" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">IVAT X</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_purch_X"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_X"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivato" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">IVAT O</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_purch_O"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_O"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <!-- Sales + Output VAT -->
-
-        <record id="ovats" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">OVAT S</field>
-            <field eval="0.15" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="ova"/>
-            <field name="account_paid_id" ref="ova"/>
-            <field name="base_code_id" ref="vat_code_sales_S"/>
-            <field name="tax_code_id" ref="vat_code_output_S"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_S"/>
-            <field name="ref_tax_code_id" ref="vat_code_output_S"/>
-            <field name="type_tax_use">sale</field>
-        </record>
-
-        <record id="ovatr" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">OVAT R</field>
-            <field eval="0.05" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="ova"/>
-            <field name="account_paid_id" ref="ova"/>
-            <field name="base_code_id" ref="vat_code_sales_R"/>
-            <field name="tax_code_id" ref="vat_code_output_R"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_R"/>
-            <field name="ref_tax_code_id" ref="vat_code_output_R"/>
-            <field name="type_tax_use">sale</field>
-        </record>
-
-        <record id="ovatz" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">OVAT Z</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_sales_Z"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_Z"/>
-            <field name="type_tax_use">sale</field>
-        </record>
-
-        <record id="ovatx" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">OVAT X</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_sales_X"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_X"/>
-            <field name="type_tax_use">sale</field>
-        </record>
-
-        <record id="ovato" model="account.tax.template">
-        	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
-            <field name="name">OVAT O</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_sales_O"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_O"/>
-            <field name="type_tax_use">sale</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/l10n_uk/l10n_uk_types.xml b/addons/l10n_uk/l10n_uk_types.xml
deleted file mode 100644
index d9bfb5344ad..00000000000
--- a/addons/l10n_uk/l10n_uk_types.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record model="account.account.type" id="account_type_receivable" >
-          <field name="name">Receivable</field>
-          <field name="code">receivable</field>
-          <field name="report_type">income</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_payable" >
-          <field name="name">Payable</field>
-          <field name="code">payable</field>
-          <field name="report_type">expense</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_view">
-          <field name="name">View</field>
-          <field name="code">view</field>
-          <field name="close_method">none</field>
-        </record>
-
-	    <record model="account.account.type" id="acct_type_income_view">
-	        <field name="name">Income View</field>
-	        <field name="code">view</field>
-	        <field name="report_type">income</field>
-	    </record>
-	    
-	    <record model="account.account.type" id="acct_type_expense_view">
-	        <field name="name">Expense View</field>
-	        <field name="code">expense</field>
-	        <field name="report_type">expense</field>
-	    </record>
-	    
-	    <record model="account.account.type" id="acct_type_asset_view">
-	        <field name="name">Asset View</field>
-	        <field name="code">asset</field>
-	        <field name="report_type">asset</field>
-	    </record>
-	    
-	    <record model="account.account.type" id="acct_type_liability_view">
-	        <field name="name">Liability View</field>
-	        <field name="code">liability</field>
-	        <field name="report_type">liability</field>
-	    </record>
-	    
-        <record model="account.account.type" id="account_type_income" >
-          <field name="name">Income</field>
-          <field name="code">income</field>
-          <field name="close_method">none</field>
-          <field name="report_type">income</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_expense">
-          <field name="name">Expense</field>
-          <field name="code">expense</field>
-          <field name="close_method">none</field>
-          <field name="report_type">expense</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_tax">
-          <field name="name">Tax</field>
-          <field name="code">tax</field>
-          <field name="report_type">liability</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_cash">
-          <field name="name">Cash</field>
-          <field name="code">cash</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_liability">
-          <field name="name">Liability</field>
-          <field name="code">liability</field>
-          <field name="close_method">balance</field>
-          <field name="report_type">liability</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_asset">
-          <field name="name">Asset</field>
-          <field name="code">asset</field>
-          <field name="close_method">balance</field>
-          <field name="report_type">asset</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_equity">
-          <field name="name">Equity</field>
-          <field name="code">equity</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index 42b23bbf054..b7da2ee5c6b 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -1,14 +1,42 @@
-<openerp>
-    <data>
-
-        <record id="config_call_account_template_uk_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>
-            <field name="category_id" ref="account.category_accounting_configuration"/>
-        </record>
-
-    </data>
-</openerp>
+<?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="type">form</field>
+            <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
+            <field name="arch" type="xml">
+              <data>
+                    <xpath expr="//form/group/group/separator" position="attributes">
+                        <attribute name="string">
+                        Generate Your UK Accounting Chart from a Chart Template
+                        </attribute>
+                    </xpath>
+                    <xpath expr="//form/group/group/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="restart">onskip</field>
+            <field name="state">open</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index b48c208dd17..45ac68fc105 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -26,7 +26,7 @@
     "name" : "Venezuela -Chart of Account",
     "version" : "1.0",
     "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description":
 '''
 This is the module to manage the accounting chart for Venezuela in OpenERP.
diff --git a/addons/l10n_ve/account_chart.xml b/addons/l10n_ve/account_chart.xml
index b46ff29ef8a..aaa4fe91b08 100644
--- a/addons/l10n_ve/account_chart.xml
+++ b/addons/l10n_ve/account_chart.xml
@@ -56,6 +56,7 @@
     <record model="account.account.type" id="account_type_equity">
       <field name="name">Equity</field>
       <field name="code">equity</field>
+      <field name="report_type">liability</field>
       <field name="close_method">balance</field>
     </record>
 	
diff --git a/addons/l10n_ve/i18n/ca.po b/addons/l10n_ve/i18n/ca.po
index 4702e797d74..14ca7517f0a 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ve
 #: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
diff --git a/addons/l10n_ve/i18n/es.po b/addons/l10n_ve/i18n/es.po
index 65a73654c17..edec97d9548 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ve
 #: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
diff --git a/addons/l10n_ve/i18n/es_MX.po b/addons/l10n_ve/i18n/es_MX.po
new file mode 100644
index 00000000000..b45faaf1233
--- /dev/null
+++ b/addons/l10n_ve/i18n/es_MX.po
@@ -0,0 +1,64 @@
+# Spanish 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-07 06:21+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. 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 ""
+"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.\n"
+"            "
+
+#. module: l10n_ve
+#: model:ir.module.module,description:l10n_ve.module_meta_information
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Venezuela in Open "
+"ERP.\n"
+"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+msgstr ""
+"\n"
+"Este es el módulo para gestionar el plan de cuentas para Venezuela en Open "
+"ERP.\n"
+
+#. module: l10n_ve
+#: model:ir.module.module,shortdesc:l10n_ve.module_meta_information
+msgid "Venezuela -Chart of Account"
+msgstr "Venezuela - Plan Contable"
diff --git a/addons/l10n_ve/i18n/es_PY.po b/addons/l10n_ve/i18n/es_PY.po
index 6c9001fe84c..7b67d5d8cab 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ve
 #: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
diff --git a/addons/l10n_ve/i18n/es_VE.po b/addons/l10n_ve/i18n/es_VE.po
new file mode 100644
index 00000000000..b45faaf1233
--- /dev/null
+++ b/addons/l10n_ve/i18n/es_VE.po
@@ -0,0 +1,64 @@
+# Spanish 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-07 06:21+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. 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 ""
+"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.\n"
+"            "
+
+#. module: l10n_ve
+#: model:ir.module.module,description:l10n_ve.module_meta_information
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Venezuela in Open "
+"ERP.\n"
+"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+msgstr ""
+"\n"
+"Este es el módulo para gestionar el plan de cuentas para Venezuela en Open "
+"ERP.\n"
+
+#. module: l10n_ve
+#: model:ir.module.module,shortdesc:l10n_ve.module_meta_information
+msgid "Venezuela -Chart of Account"
+msgstr "Venezuela - Plan Contable"
diff --git a/addons/l10n_ve/i18n/gl.po b/addons/l10n_ve/i18n/gl.po
index fa1b6481d1d..02fa393908e 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ve
 #: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
diff --git a/addons/l10n_ve/i18n/it.po b/addons/l10n_ve/i18n/it.po
index 8ac4fdb4210..5d771357b38 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ve
 #: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
diff --git a/addons/l10n_ve/i18n/pt_BR.po b/addons/l10n_ve/i18n/pt_BR.po
index 792c012c78a..10fa7f010f5 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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ve
 #: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
diff --git a/addons/l10n_ve/i18n/sr@latin.po b/addons/l10n_ve/i18n/sr@latin.po
new file mode 100644
index 00000000000..d07b771849e
--- /dev/null
+++ b/addons/l10n_ve/i18n/sr@latin.po
@@ -0,0 +1,70 @@
+# Serbian Latin 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-07 06:21+0000\n"
+"PO-Revision-Date: 2011-10-13 15:23+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: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. 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 ""
+"Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
+"šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
+"naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
+"generiše čista kopija šablona tabelâ.\n"
+"To je isti setup wizard koji se pokreće iz 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"
+"            "
+
+#. module: l10n_ve
+#: model:ir.module.module,description:l10n_ve.module_meta_information
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Venezuela in Open "
+"ERP.\n"
+"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+msgstr ""
+"\n"
+"Ovo je modul za uređivanje računskih tabela za Venecuelu u OPenERP-u.\n"
+"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n"
+
+#. module: l10n_ve
+#: model:ir.module.module,shortdesc:l10n_ve.module_meta_information
+msgid "Venezuela -Chart of Account"
+msgstr "Venecuela - računske tabele"
diff --git a/addons/l10n_ve/i18n/tr.po b/addons/l10n_ve/i18n/tr.po
index 0e5f9ddf28c..34b1dd12d97 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: l10n_ve
 #: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index d2f91c6f040..6d5cd576912 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Lunch Module",
+    "name": "Lunch",
     "author": "OpenERP SA",
     'complexity': "easy",
     "Description": """
@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Tools",
+    "category" : "Human Resources",
     'description': """
     The base module to manage lunch
 
diff --git a/addons/lunch/i18n/bg.po b/addons/lunch/i18n/bg.po
index 8139796a161..be5e563c6fb 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/ca.po b/addons/lunch/i18n/ca.po
index 39b47a968f4..5dd6cd855fc 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/cs.po b/addons/lunch/i18n/cs.po
new file mode 100644
index 00000000000..99616eb9433
--- /dev/null
+++ b/addons/lunch/i18n/cs.po
@@ -0,0 +1,547 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* lunch
+#
+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: 2011-09-05 06:39+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: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr "Nulovat pokladnu"
+
+#. 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 "Obědnávky obědů"
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "Jste si jisti, že chcete zrušit tuto objednávku ?"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "Pohyby hotovosti"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Seskupit podle..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "potvrdit objednávku"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 dnů    "
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+"\n"
+"    Základní modul pro správu obědů\n"
+"\n"
+"   udržuje přehled o Obědnávkách obědů, Pohybech hotovosti, Pokladně, "
+"Výrobcích.\n"
+"    Používá různé kategorie pro výrobky.\n"
+"    "
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr "Dnes"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Březen"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Celkem :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Den"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr "Zrušit objednávku"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Částka"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr "Výrobky"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "Množství dostupné podle uživatele a balení"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Měsíc   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "Statistika obědnávek obědů"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "PohybyHotovosti"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Potvrzeno"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Potvrdit"
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr "Modul obědů"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "Hledat obědnávku obědu"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Stav"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr "Množství balení podle uživatele"
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Datum vytvoření"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "Jméno/Datum"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "Popis objednávky"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr "Potvrdit objednávku"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr "Červenec"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr "Krabice"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 dní  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Měsíc-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Datum vytvoření"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " Kategorie výrobku "
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr "Nastavit na nulu"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "Pohyb hotovosti"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr "Duben"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr "Září"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr "Prosinec"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Měsíc"
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr "Jméno balení"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr "Ano"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Kategorie"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  Rok  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Kategorie výrobku"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr "Ne"
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr "Potvrzení objednávek"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr "Jste si jisti, že chcete nulovat tuto pokladnu ?"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr "Koncept"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr "Srpen"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Analýza objednávek obědu"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr "Červen"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr "Uživatelské jméno"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Analýza prodeje"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr "Oběd"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr "Uživatel"
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr "Listopad"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr "Říjen"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr "Leden"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr "vyčistit pokladna"
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr "Aktivní"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Datum objednávky"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr "Pokladna pro obědy "
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr "Nastavit pokladnu na nulu"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr "Jméno balení"
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr "Zrušit"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr " Pokladny "
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr "Cena za kus"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Výrobek"
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Popis"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr "Květen"
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr "Hledat PohybyHotovosti"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr "Celkem balení"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "Výrobek obědu"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "Celkem zbývajících"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr "Celková cena"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr "Únor"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr "Jméno"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Celková částka"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr "Kategorie vztažená k výrobkům"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr "Pokladny"
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr "Objednávka"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Obědnávka obědu"
+
+#. 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 "Pozice hotovosti podle uživatele"
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Správce"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 dní   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr "K potvrzení"
+
+#. module: lunch
+#: field:report.lunch.amount,year:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "Rok"
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 1d812d99365..bce5216aed3 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -555,12 +555,6 @@ msgstr "Jahr"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Total:"
-#~ msgstr "Gesamt:"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
index a4d9077d2ae..806fb7fe1a9 100644
--- a/addons/lunch/i18n/es.po
+++ b/addons/lunch/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -546,3 +546,15 @@ msgstr "Para confirmar"
 #: field:report.lunch.order,year:0
 msgid "Year"
 msgstr "Año"
+
+#~ 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/lunch/i18n/es_MX.po b/addons/lunch/i18n/es_MX.po
new file mode 100644
index 00000000000..0b8220a1773
--- /dev/null
+++ b/addons/lunch/i18n/es_MX.po
@@ -0,0 +1,560 @@
+# 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-16 17:39+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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr "Resetear caja"
+
+#. 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 "Pedidos de comida"
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "¿Seguro que desea cancelar este pedido?"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "Movimientos de caja"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 días    "
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para manejar comidas.\n"
+"\n"
+"    Permite gestionar los pedidos de comida, los movimientos de efectivo, la "
+"caja y los productos.\n"
+"    Establece diferentes categorías para el producto.\n"
+"    "
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "Importe disponible por usuario y caja"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "Estadísticas de pedidos de comida"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "Movimientos de caja"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr "Módulo de comidas"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "Buscar pedido de comida"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr "Importe de caja por Usuario"
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "Nombre/Fecha"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "Descripción pedido"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr "Caja"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 días  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Fecha de creación"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " Categorías de producto "
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr "Establecer a cero"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "Movimiento de caja"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr "Nombre de la caja"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Categorías de producto"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr "No"
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr "Confirmación de pedido"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr "¿Está seguro que desea reiniciar esta caja de efectivo?"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Análisis pedidos de comida"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Análisis ventas"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr "Comidas"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr "Limpiar caja"
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr "Caja para la comida "
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr "Establecer caja a cero"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr "Nombre caja"
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr " Cajas "
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr "Buscar movimiento de caja"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr "Total caja"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "Producto comida"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "Total restante"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr "Precio total"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr "Categoría relacionada con los productos"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr "Cajas"
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Pedido de comida"
+
+#. 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 "Estado de la caja por usuario"
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Gerente"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 días   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+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 "Año"
+
+#~ 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/lunch/i18n/es_PY.po b/addons/lunch/i18n/es_PY.po
index 536d4e9cfdf..ff6ef962420 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/es_VE.po b/addons/lunch/i18n/es_VE.po
new file mode 100644
index 00000000000..0b8220a1773
--- /dev/null
+++ b/addons/lunch/i18n/es_VE.po
@@ -0,0 +1,560 @@
+# 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-16 17:39+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:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr "Resetear caja"
+
+#. 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 "Pedidos de comida"
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "¿Seguro que desea cancelar este pedido?"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "Movimientos de caja"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 días    "
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para manejar comidas.\n"
+"\n"
+"    Permite gestionar los pedidos de comida, los movimientos de efectivo, la "
+"caja y los productos.\n"
+"    Establece diferentes categorías para el producto.\n"
+"    "
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "Importe disponible por usuario y caja"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "Estadísticas de pedidos de comida"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "Movimientos de caja"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr "Módulo de comidas"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "Buscar pedido de comida"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr "Importe de caja por Usuario"
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "Nombre/Fecha"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "Descripción pedido"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr "Caja"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 días  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Fecha de creación"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " Categorías de producto "
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr "Establecer a cero"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "Movimiento de caja"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr "Nombre de la caja"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Categorías de producto"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr "No"
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr "Confirmación de pedido"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr "¿Está seguro que desea reiniciar esta caja de efectivo?"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Análisis pedidos de comida"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Análisis ventas"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr "Comidas"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr "Limpiar caja"
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr "Caja para la comida "
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr "Establecer caja a cero"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr "Nombre caja"
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr " Cajas "
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr "Buscar movimiento de caja"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr "Total caja"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "Producto comida"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "Total restante"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr "Precio total"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr "Categoría relacionada con los productos"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr "Cajas"
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Pedido de comida"
+
+#. 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 "Estado de la caja por usuario"
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Gerente"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 días   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+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 "Año"
+
+#~ 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/lunch/i18n/fi.po b/addons/lunch/i18n/fi.po
index c272d755193..70fb991efae 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index fffcc9bddb5..874d12fa2c7 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -549,12 +549,6 @@ msgstr "Année"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de modèle incorrect dans la définition de l'action"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML incorrect dans l'architecture de la vue !"
 
@@ -563,9 +557,3 @@ msgstr "Année"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer par x_ et ne doit contenir aucun caractère "
 #~ "spécial !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille d'un champ ne peut jamais être inférieure à 1 !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
diff --git a/addons/lunch/i18n/gl.po b/addons/lunch/i18n/gl.po
index 6209bd5b64f..e2234c9a535 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/hu.po b/addons/lunch/i18n/hu.po
index dbed810b7de..8c810596ddc 100644
--- a/addons/lunch/i18n/hu.po
+++ b/addons/lunch/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-31 13:51+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/it.po b/addons/lunch/i18n/it.po
index 528dd882cc3..ef5dd76528b 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/pt.po b/addons/lunch/i18n/pt.po
index ce76edb3623..898e625b35e 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -542,20 +542,11 @@ msgstr "Ano"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitetura da vista"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente."
-
 #~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
diff --git a/addons/lunch/i18n/pt_BR.po b/addons/lunch/i18n/pt_BR.po
index 2e653ad2ec9..2f4b81a825c 100644
--- a/addons/lunch/i18n/pt_BR.po
+++ b/addons/lunch/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/ru.po b/addons/lunch/i18n/ru.po
index fcd4dd55884..d319142c39b 100644
--- a/addons/lunch/i18n/ru.po
+++ b/addons/lunch/i18n/ru.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Reset cashbox"
-msgstr ""
+msgstr "Сброс кассы"
 
 #. 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 "Заказы на ланч"
 
 #. module: lunch
 #: wizard_view:lunch.order.cancel,init:0
 msgid "Are you sure you want to cancel this order ?"
-msgstr ""
+msgstr "Вы уверены, что хотите отменить этот заказ?"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
 msgid "Cash Moves"
-msgstr ""
+msgstr "Движение средств"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -45,17 +45,17 @@ msgstr ""
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_confirm
 msgid "confirm Order"
-msgstr ""
+msgstr "Подтвердить заказ"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 дней    "
 
 #. module: lunch
 #: model:ir.module.module,description:lunch.module_meta_information
@@ -67,409 +67,415 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Базовый модуль управления ланчами\n"
+"\n"
+"    Отслеживание заказов, движения средств, кассы, продукции.\n"
+"    Возможность разнесения продукции по категориям.\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:lunch.order:0
 msgid "Today"
-msgstr ""
+msgstr "Сегодня"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: lunch
 #: report:lunch.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Итого:"
 
 #. module: lunch
 #: field:report.lunch.amount,day:0
 #: view:report.lunch.order:0
 #: field:report.lunch.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.wizard_id_cancel
 #: wizard_view:lunch.order.cancel,init:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Отменить заказ"
 
 #. module: lunch
 #: field:lunch.cashmove,amount:0
 #: field:report.lunch.amount,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_product_form
 #: view:lunch.product:0
 msgid "Products"
-msgstr ""
+msgstr "Продукция"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_amount
 msgid "Amount available by user and box"
-msgstr ""
+msgstr "Доступные суммы по пользователям и кассам"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Месяц   "
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order
 msgid "Lunch Orders Statistics"
-msgstr ""
+msgstr "Статистика заказа ланчей"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 #: view:lunch.cashmove:0
 #: field:lunch.order,cashmove:0
 msgid "CashMove"
-msgstr ""
+msgstr "Движение Средств"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Подтверждено"
 
 #. module: lunch
 #: view:lunch.order.confirm:0
 msgid "Confirm"
-msgstr ""
+msgstr "Подтвердить"
 
 #. module: lunch
 #: model:ir.module.module,shortdesc:lunch.module_meta_information
 msgid "Lunch Module"
-msgstr ""
+msgstr "Модуль Ланч"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Search Lunch Order"
-msgstr ""
+msgstr "Поиск заказа"
 
 #. module: lunch
 #: field:lunch.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: lunch
 #: field:report.lunch.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Итоговая цена"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
 #: view:report.lunch.amount:0
 msgid "Box Amount by User"
-msgstr ""
+msgstr "Сумма в кассе по пользователям"
 
 #. module: lunch
 #: field:lunch.cashmove,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: lunch
 #: report:lunch.order:0
 msgid "Name/Date"
-msgstr ""
+msgstr "Название/Дата"
 
 #. module: lunch
 #: field:lunch.order,descript:0
 msgid "Description Order"
-msgstr ""
+msgstr "Описание заказа"
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.lunch_order_confirm
 #: wizard_button:lunch.order.confirm,init,go:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Подтвердить заказ"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Box"
-msgstr ""
+msgstr "Касса"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 Дней  "
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: lunch
 #: field:report.lunch.amount,date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_category_form
 msgid " Product Categories "
-msgstr ""
+msgstr " Категории продукции "
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,zero:0
 msgid "Set to Zero"
-msgstr ""
+msgstr "Обнулить"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
 msgid "Cash Move"
-msgstr ""
+msgstr "Движение средств"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: lunch
 #: field:report.lunch.amount,month:0
 #: view:report.lunch.order:0
 #: field:report.lunch.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: lunch
 #: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
 msgid "Name of box"
-msgstr ""
+msgstr "Название кассы"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,cancel:0
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_category
 #: view:lunch.category:0
 #: field:lunch.product,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Категория"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Год  "
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_category_form
 msgid "Product Categories"
-msgstr ""
+msgstr "Категории продукции"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,end:0
 msgid "No"
-msgstr ""
+msgstr "Нет"
 
 #. module: lunch
 #: wizard_view:lunch.order.confirm,init:0
 msgid "Orders Confirmation"
-msgstr ""
+msgstr "Подтверждение заказов"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Are you sure you want to reset this cashbox ?"
-msgstr ""
+msgstr "Вы уверены, что хотите сбросить состояние кассы?"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
 #: view:report.lunch.order:0
 msgid "Lunch Order Analysis"
-msgstr ""
+msgstr "Анализ заказов"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: lunch
 #: field:lunch.cashmove,user_cashmove:0
 #: field:lunch.order,user_id:0
 #: field:report.lunch.amount,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "Анализ продаж"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch
 msgid "Lunch"
-msgstr ""
+msgstr "Ланч"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:report.lunch.order:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: lunch
 #: field:lunch.order,date:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox_clean
 msgid "clean cashbox"
-msgstr ""
+msgstr "очистить кассу"
 
 #. module: lunch
 #: field:lunch.cashmove,active:0
 #: field:lunch.product,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: lunch
 #: field:report.lunch.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Дата заказа"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox
 msgid "Cashbox for Lunch "
-msgstr ""
+msgstr "Касса на ланч "
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
 msgid "Set CashBox to Zero"
-msgstr ""
+msgstr "Обнулить кассу"
 
 #. module: lunch
 #: field:lunch.cashmove,box:0
 #: field:report.lunch.amount,box:0
 msgid "Box Name"
-msgstr ""
+msgstr "Наименование кассы"
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,end:0
 #: wizard_button:lunch.order.confirm,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
 msgid " Cashboxes "
-msgstr ""
+msgstr " Кассы "
 
 #. module: lunch
 #: rml:lunch.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Цена единицы"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_form
 #: field:lunch.order,product:0
 msgid "Product"
-msgstr ""
+msgstr "Продукция"
 
 #. module: lunch
 #: rml:lunch.order:0
 #: field:lunch.product,description:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: lunch
 #: field:lunch.order,price:0
 #: field:lunch.product,price:0
 msgid "Price"
-msgstr ""
+msgstr "Стоимость"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "Search CashMove"
-msgstr ""
+msgstr "Поиск по движению средств"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Total box"
-msgstr ""
+msgstr "Итого касса"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "Lunch Product"
-msgstr ""
+msgstr "Продукция ланча"
 
 #. module: lunch
 #: field:lunch.cashbox,sum_remain:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Итоговый остаток"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Total price"
-msgstr ""
+msgstr "Итоговая цена"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: lunch
 #: field:lunch.cashbox,name:0
@@ -478,30 +484,30 @@ msgstr ""
 #: rml:lunch.order:0
 #: field:lunch.product,name:0
 msgid "Name"
-msgstr ""
+msgstr "Наименование"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "Total amount"
-msgstr ""
+msgstr "Итоговая сумма"
 
 #. module: lunch
 #: view:lunch.category:0
 msgid "Category related to Products"
-msgstr ""
+msgstr "Категория, связанная с продукцией"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
 #: view:lunch.cashbox:0
 msgid "Cashboxes"
-msgstr ""
+msgstr "Кассы"
 
 #. module: lunch
 #: view:lunch.category:0
 #: rml:lunch.order:0
 #: view:lunch.order:0
 msgid "Order"
-msgstr ""
+msgstr "Заказ"
 
 #. module: lunch
 #: model:ir.actions.report.xml,name:lunch.report_lunch_order
@@ -509,32 +515,32 @@ msgstr ""
 #: model:ir.ui.menu,name:lunch.menu_lunch
 #: report:lunch.order:0
 msgid "Lunch Order"
-msgstr ""
+msgstr "Заказ ланча"
 
 #. 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 "Расположение средств по пользователям"
 
 #. module: lunch
 #: field:lunch.cashbox,manager:0
 msgid "Manager"
-msgstr ""
+msgstr "Руководитель"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 Дней   "
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "To Confirm"
-msgstr ""
+msgstr "Ожидающие подтверждения"
 
 #. module: lunch
 #: field:report.lunch.amount,year:0
 #: view:report.lunch.order:0
 #: field:report.lunch.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
diff --git a/addons/lunch/i18n/sr@latin.po b/addons/lunch/i18n/sr@latin.po
index 09e08e5a8cf..1a6b9ea7ea4 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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index 4218f4bfefb..97e8e51eaf7 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Reset cashbox"
-msgstr "复位现金箱"
+msgstr "重设外卖现金"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
@@ -37,7 +37,7 @@ msgstr "您确定要取消此订单？"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
 msgid "Cash Moves"
-msgstr ""
+msgstr "现金划拨"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -45,7 +45,7 @@ msgstr ""
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_confirm
@@ -67,6 +67,11 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    这是一个管理午餐的模块\n"
+"保存对午餐订单，现金划拨，外卖现金，外卖品种等的跟踪信息。\n"
+"加入不同类型的外卖品种。\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -78,7 +83,7 @@ msgstr "今日"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: lunch
 #: report:lunch.order:0
@@ -108,12 +113,12 @@ msgstr "金额"
 #: model:ir.ui.menu,name:lunch.menu_lunch_product_form
 #: view:lunch.product:0
 msgid "Products"
-msgstr "产品列表"
+msgstr "品种列表"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_amount
 msgid "Amount available by user and box"
-msgstr ""
+msgstr "用户和外卖现金的可用金额"
 
 #. module: lunch
 #: view:report.lunch.amount:0
@@ -123,14 +128,14 @@ msgstr "   月   "
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order
 msgid "Lunch Orders Statistics"
-msgstr "午餐单统计"
+msgstr "午餐订单统计"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 #: view:lunch.cashmove:0
 #: field:lunch.order,cashmove:0
 msgid "CashMove"
-msgstr ""
+msgstr "现金划拨"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -160,13 +165,13 @@ msgstr "状态"
 #. module: lunch
 #: field:report.lunch.order,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "总价格"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
 #: view:report.lunch.amount:0
 msgid "Box Amount by User"
-msgstr ""
+msgstr "用户的外卖现金金额"
 
 #. module: lunch
 #: field:lunch.cashmove,create_date:0
@@ -181,7 +186,7 @@ msgstr "单号/日期"
 #. module: lunch
 #: field:lunch.order,descript:0
 msgid "Description Order"
-msgstr "说明"
+msgstr "订单说明"
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.lunch_order_confirm
@@ -193,14 +198,14 @@ msgstr "确认订单"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Box"
-msgstr ""
+msgstr "外卖现金"
 
 #. module: lunch
 #: view:report.lunch.order:0
@@ -220,7 +225,7 @@ msgstr "创建日期"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_category_form
 msgid " Product Categories "
-msgstr " 商品分类 "
+msgstr " 品种分类 "
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,zero:0
@@ -230,25 +235,25 @@ msgstr "设为0"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
 msgid "Cash Move"
-msgstr ""
+msgstr "现金划拨"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: lunch
 #: field:report.lunch.amount,month:0
@@ -260,7 +265,7 @@ msgstr "月"
 #. module: lunch
 #: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
 msgid "Name of box"
-msgstr ""
+msgstr "外卖现金名称"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,cancel:0
@@ -277,12 +282,12 @@ msgstr "分类"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_category_form
 msgid "Product Categories"
-msgstr "产品分类"
+msgstr "品种分类"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,end:0
@@ -297,7 +302,7 @@ msgstr "订单确认"
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Are you sure you want to reset this cashbox ?"
-msgstr ""
+msgstr "你确定要重置这外卖现金？"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -308,19 +313,19 @@ msgstr "草稿"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
 #: view:report.lunch.order:0
 msgid "Lunch Order Analysis"
-msgstr ""
+msgstr "午餐订单分析"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: lunch
 #: field:lunch.cashmove,user_cashmove:0
@@ -332,7 +337,7 @@ msgstr "用户名"
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "销售分析"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch
@@ -354,30 +359,30 @@ msgstr "日期"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox_clean
 msgid "clean cashbox"
-msgstr ""
+msgstr "外卖现金清零"
 
 #. module: lunch
 #: field:lunch.cashmove,active:0
 #: field:lunch.product,active:0
 msgid "Active"
-msgstr "激活"
+msgstr "生效"
 
 #. module: lunch
 #: field:report.lunch.order,date:0
@@ -387,18 +392,18 @@ msgstr "订单日期"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox
 msgid "Cashbox for Lunch "
-msgstr ""
+msgstr "午餐的外卖现金 "
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
 msgid "Set CashBox to Zero"
-msgstr ""
+msgstr "设置外卖现金为0"
 
 #. module: lunch
 #: field:lunch.cashmove,box:0
 #: field:report.lunch.amount,box:0
 msgid "Box Name"
-msgstr ""
+msgstr "外卖现金的名称"
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,end:0
@@ -409,7 +414,7 @@ msgstr "取消"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
 msgid " Cashboxes "
-msgstr ""
+msgstr " 外卖现金列表 "
 
 #. module: lunch
 #: rml:lunch.order:0
@@ -420,7 +425,7 @@ msgstr "单价"
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_form
 #: field:lunch.order,product:0
 msgid "Product"
-msgstr "货品"
+msgstr "品种"
 
 #. module: lunch
 #: rml:lunch.order:0
@@ -432,7 +437,7 @@ msgstr "说明"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: lunch
 #: field:lunch.order,price:0
@@ -443,22 +448,22 @@ msgstr "价格"
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "Search CashMove"
-msgstr ""
+msgstr "搜索外卖现金"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Total box"
-msgstr ""
+msgstr "总外卖现金"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "Lunch Product"
-msgstr ""
+msgstr "午餐品种"
 
 #. module: lunch
 #: field:lunch.cashbox,sum_remain:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "总剩余"
 
 #. module: lunch
 #: view:lunch.order:0
@@ -469,7 +474,7 @@ msgstr "总价"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: lunch
 #: field:lunch.cashbox,name:0
@@ -478,7 +483,7 @@ msgstr "二月"
 #: rml:lunch.order:0
 #: field:lunch.product,name:0
 msgid "Name"
-msgstr "品名"
+msgstr "名称"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -488,13 +493,13 @@ msgstr "总金额"
 #. module: lunch
 #: view:lunch.category:0
 msgid "Category related to Products"
-msgstr ""
+msgstr "该分类的品种"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
 #: view:lunch.cashbox:0
 msgid "Cashboxes"
-msgstr ""
+msgstr "外卖现金列表"
 
 #. module: lunch
 #: view:lunch.category:0
@@ -509,13 +514,13 @@ msgstr "订单"
 #: model:ir.ui.menu,name:lunch.menu_lunch
 #: report:lunch.order:0
 msgid "Lunch Order"
-msgstr ""
+msgstr "午餐订单"
 
 #. 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 "用户现金状况"
 
 #. module: lunch
 #: field:lunch.cashbox,manager:0
diff --git a/addons/lunch/i18n/zh_TW.po b/addons/lunch/i18n/zh_TW.po
new file mode 100644
index 00000000000..3ac18624215
--- /dev/null
+++ b/addons/lunch/i18n/zh_TW.po
@@ -0,0 +1,540 @@
+# Chinese (Traditional) 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-09-27 08:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr ""
+
+#. 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 "午膳訂單"
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "是否取消此訂單?"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "分組根據..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "確認訂單"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 天    "
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr "今日"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr "三月"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr ""
+
+#. 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 ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,year:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 771779310cb..3c658333e14 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -138,7 +138,7 @@ class lunch_order(osv.osv):
         'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
         'descript': fields.char('Description Order', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
-        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
+        'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
         'price': fields.function(_price_get, string="Price"),
         'category': fields.many2one('lunch.category','Category'),
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index a318df9eee0..716ba36a49c 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -1,18 +1,34 @@
 <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" ref="lunch.view_lunch_product_form"/>
-       </record>
-       
-       <record id="view_lunch_product_form_todo" model="ir.actions.todo">
-           <field name="action_id" ref="view_lunch_product_form_installer"/>
-           <field name="category_id" ref="base.category_tools_customization_config"/>
-           <field name="sequence">50</field>
-       </record>
+    <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">Define all products that the employees can order for the lunch time. If you order lunch at several places, you can use the product categories to split by supplier. It will be easier for the lunch manager to filter lunch orders by categories.</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="category_id" ref="base.category_tools_customization_config"/>
+            <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">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.</field>
+        </record>
+
+        <record id="action_create_cashbox_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_create_cashbox" />
+            <field name="category_id" ref="base.category_tools_customization_config" />
+            <field name="sequence">51</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 5c19c840b78..f695d994acd 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -34,7 +34,7 @@
                     <newline/>
                    <separator string="" colspan="4"/>
                     <group colspan="4" col="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                         <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
                         <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
                     </group>
@@ -49,7 +49,7 @@
             <field name="model">lunch.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirmed')" string="Order">
+                <tree colors="blue:state == 'draft';black:state == 'confirmed'" string="Order">
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="product"/>
@@ -87,7 +87,7 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
                     </group>
                 </search>
@@ -194,7 +194,7 @@
                     <field name="user_cashmove"/>
                     <field name="create_date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Box" icon="terp-dolar" domain="[]"  context="{'group_by':'box'}"/>
@@ -262,7 +262,7 @@
                 <form string="Products">
                      <group col="6">
                           <field name="name" select="1"/>
-                          <field name="category_id" widget="selection"/>
+                          <field name="category_id"/>
                           <field name="price" />
                      </group>
                      <notebook colspan="4">
@@ -300,7 +300,7 @@
             <field name="arch" type="xml">
                 <search string="Products">
                     <field name="name" />
-                    <field name="category_id" widget="selection"/>
+                    <field name="category_id"/>
                     <field name="price"/>
                 </search>
             </field>
@@ -371,25 +371,26 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
-                        <filter icon="terp-go-year" string="  Year  "
+                        <filter icon="terp-go-year" string="  Year  " name="year"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Box amount in current year"/>
+                    <separator orientation="vertical"/>
+
                         <filter icon="terp-go-month" string="   Month   "
                                 name="month"
                                 domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                                 help="Box amount in current month"/>
                         <filter icon="terp-go-month"
                          string="    Month-1    "
-                         separator="1"
                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Box amount in last month"/>
                     <separator orientation="vertical"/>
-                        <field name="user_id" select="1"/>
-                        <field name="box" select="1"/>
-                        <field name="amount" select="1"/>
+                        <field name="user_id"/>
+                        <field name="box"/>
+                        <field name="amount"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
                     </group>
                 </search>
@@ -403,6 +404,7 @@
             <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>
 
diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py
index 05f730db740..7e2b8de9f49 100644
--- a/addons/lunch/report/report_lunch_order.py
+++ b/addons/lunch/report/report_lunch_order.py
@@ -64,3 +64,5 @@ class report_lunch_order(osv.osv):
             )
             """)
 report_lunch_order()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index d65b8b01c1e..5dd25322d47 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -35,12 +35,11 @@
                         help="Tasks performed in last 30 days"/>
                     <filter icon="terp-go-week"
                          string="    7 Days    "
-                         separator="1"
                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                          help="Tasks during last 7 days"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
+                <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'}"/>
                     <separator orientation="vertical"/>
@@ -66,4 +65,4 @@
 <!--              id="menu_lunch_order_analysis" action="action_report_lunch_order_all"  sequence="1" />-->
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
new file mode 100644
index 00000000000..4787883ef9c
--- /dev/null
+++ b/addons/mail/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009-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 mail_message
+import mail_thread
+import res_partner
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
new file mode 100644
index 00000000000..1cb97ce182e
--- /dev/null
+++ b/addons/mail/__openerp__.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Email Subsystem',
+    'version': '1.0',
+    'category': 'Hidden',
+    'complexity': "easy",
+    'description': """
+A generic email subsystem with message storage and queuing
+==========================================================
+
+This email subsystem is not intended to be used as as standalone
+application, but to provide a unified email abstraction that all
+other applications can use.
+
+The main features are:
+
+    * Relies on the global Outgoing Mail Servers configured in the 
+      Administration menu for delivering outgoing mail
+    * Provides an API for sending messages and archiving them,
+      grouped by conversation
+    * Any OpenERP document can act as a conversation topic, provided
+      it includes the necessary support for handling incoming emails
+      (see the ``mail.thread`` class for more details). 
+    * Includes queuing mechanism with automated configurable
+      scheduler-based processing
+    * Includes a 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.
+      This generic assistant is easily extensible to provide advanced
+      features (see ``email_template`` for example, which adds email
+      templating features to this assistant)
+
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'base_tools'],
+    'data': [
+        "wizard/mail_compose_message_view.xml",
+        "mail_message_view.xml",
+        "mail_thread_view.xml",
+        "res_partner_view.xml",
+        'security/ir.model.access.csv',
+        'mail_data.xml',
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '001056784984222247309',
+    'images': ['images/customer_history.jpeg','images/messages_form.jpeg','images/messages_list.jpeg'],
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
new file mode 100644
index 00000000000..887d668afb9
--- /dev/null
+++ b/addons/mail/i18n/bg.po
@@ -0,0 +1,360 @@
+# 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-28 20:33+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Идентификатор на ресурса"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Методът не е внедрен"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "От"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Бележка"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Групиране по..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Подробности"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "До"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Име на обект"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Име на контрагент"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Възможности"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Имейли"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Етап"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Имейл от"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Нишка"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Съобщения"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Отговорности на потребителя"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Скрито копие"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "История"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Отпратки"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Прикачени файлове"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Отваряне на документ"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Копие до"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Собственик"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Съобщение"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Относно"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID на съобщение в пощенски сървър"
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " на "
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
new file mode 100644
index 00000000000..2222f9da37c
--- /dev/null
+++ b/addons/mail/i18n/ca.po
@@ -0,0 +1,367 @@
+# 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-05-26 05:41+0000\n"
+"Last-Translator: cubells <vicent@vcubells.net>\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-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID del registre"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Mètode no implementat"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Obre dades adjuntes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalls del missatge"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Id del missatge"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referència"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Històric passarel·la de correu"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupa per..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Error! No podeu crear membres associats recursius."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Id del missatge en email"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinataris email"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalls"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Històric passarel·la de correu"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Eines servidor correu"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Seguidors per email"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr " escrit el %s:\n"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Per"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Fa referència a emails"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinataris de l'email en còpia carbó (CC)."
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistema de passarel·la de correu"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nom de l'objecte"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nom d'empresa"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Fils passarel·la de correu"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunitat"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Correus electrònics"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Fase"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " nota afegida en "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Fil"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Missatge passarel·la de correu"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Missatges"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Usuari responsable"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertit en oportunitat"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "És històric?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destintaris de l'email en còpia carbó oculta (cco)."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Missatge de passarel·la de correu"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Històric"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referències"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Fil de la passarel·la de correu"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Adjunts"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Obre el document"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalls de l'email"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr " el %s:\n"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Cerca email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "rebre"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"La passarel·la de correu genèrica permet enviar i rebre emails\n"
+"* Històric d'emails\n"
+"* Integració fàcil amb qualsevol mòdul"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Estatus canviat a: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Mostra text"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Propietari"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Fase canviada a: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Missatge"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Assumpte"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Id del missatge en servidor de correu"
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrit en "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " a "
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
new file mode 100644
index 00000000000..73e5e576d06
--- /dev/null
+++ b/addons/mail/i18n/de.po
@@ -0,0 +1,366 @@
+# 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-04-03 09:21+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Ressource ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Methode ist nicht implementiert"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Von"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Öffne Anhang"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Details Nachricht"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Nachricht ID"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Referenz ID"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Historie Mailgateway"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Anmerkung"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Gruppierung..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Nachricht ID der Email"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Email Empfänger"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Details"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Historie Mailgateway"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Email Server Werkzeuge"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "EMail Verfolger"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr " geschrieben am %s:\n"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "An"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "EMail Referenzen"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Carbon Copy Email Empf."
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Email Gateway System"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Object Name"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Partner Name"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Mailgateway Beiträge"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Verkaufschance"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "EMails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Stufe"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " hinzugefügter Hinweis "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "EMail von"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Beitrag"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mailgateway Nachricht"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Nachrichten"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Verantwortlicher Benutzer"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Konvertiert zu Verkaufschance"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Historie EMail"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Blind Carbon Copy Email Empf."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Mailgateway Nachricht"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historie"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referenzen"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Mailgateway Beitrag"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Anhänge"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Öffne Dokument"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Email Details"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "CC"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr " am %s:\n"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Suche EMail"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "empfangen"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"Das allgemeine EMail Gateway ermöglicht Senden und Empfangen von EMails\n"
+"   * EMail Historie   * Einfache Integration anderer Module"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Ändere Status zu: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Textbereich"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Besitzer"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Ändere Bearbeitungsstufe auf: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Nachricht"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Betreff"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Nachricht ID Email Server."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " schreibe zu "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " EMail von "
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
new file mode 100644
index 00000000000..80124705ef2
--- /dev/null
+++ b/addons/mail/i18n/es.po
@@ -0,0 +1,368 @@
+# 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 23: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:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método no implementado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Abrir datos adjuntos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalles del mensaje"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID del mensaje"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referencia"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Histórico pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID del mensaje en el email."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatarios del email."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Histórico pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Herramientas servidor correo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Destinatarios del email"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Referencias de los emails."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatarios del email en copia carbón (CC)."
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistema de pasarela de correo"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nombre de empresa"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Hilos pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " añadida nota en "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Hilo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensaje pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Usuario responsable"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertido en oportunidad"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "¿Es histórico?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destintarios del email en copia carbón oculta (cco)."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Mensaje de pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Histórico"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Hilo de la pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Abrir documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalles del email"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Buscar email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "recibir"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"La pasarela de correo genérica permite enviar y recibir emails\n"
+"    * Histórico de emails\n"
+"    * Integración fácil con cualquier módulo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Estado cambiado a: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar texto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Etapa cambiada a: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID del mensaje en el servidor de correo."
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " en "
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrito el "
diff --git a/addons/mail/i18n/es_MX.po b/addons/mail/i18n/es_MX.po
new file mode 100644
index 00000000000..80124705ef2
--- /dev/null
+++ b/addons/mail/i18n/es_MX.po
@@ -0,0 +1,368 @@
+# 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 23: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:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método no implementado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Abrir datos adjuntos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalles del mensaje"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID del mensaje"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referencia"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Histórico pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID del mensaje en el email."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatarios del email."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Histórico pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Herramientas servidor correo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Destinatarios del email"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Referencias de los emails."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatarios del email en copia carbón (CC)."
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistema de pasarela de correo"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nombre de empresa"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Hilos pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " añadida nota en "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Hilo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensaje pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Usuario responsable"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertido en oportunidad"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "¿Es histórico?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destintarios del email en copia carbón oculta (cco)."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Mensaje de pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Histórico"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Hilo de la pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Abrir documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalles del email"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Buscar email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "recibir"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"La pasarela de correo genérica permite enviar y recibir emails\n"
+"    * Histórico de emails\n"
+"    * Integración fácil con cualquier módulo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Estado cambiado a: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar texto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Etapa cambiada a: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID del mensaje en el servidor de correo."
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " en "
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrito el "
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
new file mode 100644
index 00000000000..faa7dbcfac3
--- /dev/null
+++ b/addons/mail/i18n/es_PY.po
@@ -0,0 +1,356 @@
+# 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:15+0000\n"
+"PO-Revision-Date: 2011-03-22 10:43+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID del recurso"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método no implementado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/mail/i18n/es_VE.po b/addons/mail/i18n/es_VE.po
new file mode 100644
index 00000000000..80124705ef2
--- /dev/null
+++ b/addons/mail/i18n/es_VE.po
@@ -0,0 +1,368 @@
+# 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 23: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:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método no implementado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Abrir datos adjuntos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalles del mensaje"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID del mensaje"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referencia"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Histórico pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID del mensaje en el email."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatarios del email."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Histórico pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Herramientas servidor correo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Destinatarios del email"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Referencias de los emails."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatarios del email en copia carbón (CC)."
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistema de pasarela de correo"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nombre del objeto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nombre de empresa"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Hilos pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " añadida nota en "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Hilo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensaje pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Usuario responsable"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertido en oportunidad"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "¿Es histórico?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destintarios del email en copia carbón oculta (cco)."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Mensaje de pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Histórico"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Hilo de la pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Abrir documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalles del email"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Buscar email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "recibir"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"La pasarela de correo genérica permite enviar y recibir emails\n"
+"    * Histórico de emails\n"
+"    * Integración fácil con cualquier módulo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Estado cambiado a: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar texto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Etapa cambiada a: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID del mensaje en el servidor de correo."
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " en "
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrito el "
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
new file mode 100644
index 00000000000..1b95d6f05c1
--- /dev/null
+++ b/addons/mail/i18n/fi.po
@@ -0,0 +1,360 @@
+# 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-20 10:00+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Resurssi ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metodia ei ole toteutettu"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Lähettäjä"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Avaa liitteet"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Viestin yksityiskohdat"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Viestin ID"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Viite id"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Postiyhteyden historia"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Viestin id sähköpostissa"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Sähköpostin vastaanottajat"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Sähöpostivälittäjän historia"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Sähköpostipalvelimen työkalut"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Sähköpostin seuraajat"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Yhteistyökumppani"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Vastaanottaja"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Viittaavat sähköpostit"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Kopio viestistä vastaanottajille"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sähköpostivälitysjärjstelmä"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Objektin nimi"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Kumppanin Nimi"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "sähköpostivälittäjän keskustelut"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Mahdollisuus"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Sähköpostit"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Vaihe"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " lisäsi huomautuksen "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Sähköposti lähettäjältä"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Keskustelu"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "sähköpostivälittäjän viesti"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Vastuunalainen käyttäjä"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Muutettu mahdollisuudeksi"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Piilokopio"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "onko historiaa?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Piilokopion vastaanottajat"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Postinvälittäjän viesti"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historia"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Viitteet"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "sähköpostivälittäjän keskustelu"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Liitteet"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Avaa asiakirja"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Sähköpostin yksityiskohdat"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Kopio"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Kuukausi"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Sähköpostin haku"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "vastaanota"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Tila muutettu : "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Näytä teksti"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Omistaja"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Vaihe muutettu : "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Viesti"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Aihe"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Viestin ID sähköpostipalvelimella."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " kirjoitti "
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
new file mode 100644
index 00000000000..9906fc12ec4
--- /dev/null
+++ b/addons/mail/i18n/fr.po
@@ -0,0 +1,368 @@
+# 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:47+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Identifiant de la ressource"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Méthode non implémentée"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Ovrir les pièces jointes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Détails du message"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Identifiant du message"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID de référence"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Historique de la passerelle mail"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Note"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grouper par ..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Identifiant du courriel"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinataire du courriel"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Détails"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Historique de la passerelle mail"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Outils pour le serveur de courriel"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Faire suivre le courriel"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Description"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "À"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Courriels de références"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Envoyer un copie carbone aux destinataires"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Système de passerelle des courriels"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Date"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nom de l'objet"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nom du Partenaire"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Discussion de la passerelle courriel"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Opportunité"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Courriels"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Étape"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " note ajoutée "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Auteur du courriel"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Discussion"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Message pour la passerelle mail"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Messages"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Utilisateur responsable"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertir en opportunité"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Copie cachée à (BCC)"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Est historisé ?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Envoyer une copie caché aux destinataires"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Message de la passerelle mail"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historique"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Références"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Discussion de la passerelle mail"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Pièces jointes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Ouvrir le document"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Détails des emails"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Copie à (CC)"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Recherche des emails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "Reçu"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"Le système de passrelle mail générique autorise l'envoi et la réceptions de "
+"mails\n"
+"    * Historique des emails\n"
+"    * Intégration facilité avec les autres modules"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Changer l'état à: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Texte affiché"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Propriétaire"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Changer l'étape en: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Message"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Sujet"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Identifiant du message sur le serveur de mail"
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " sur "
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " écrit sur "
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
new file mode 100644
index 00000000000..04454211d35
--- /dev/null
+++ b/addons/mail/i18n/gl.po
@@ -0,0 +1,366 @@
+# 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-03-22 10:49+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID do Recurso"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método non aplicado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Desde"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Abrir datos anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalles da mensaxe"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID da Mensaxe"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referencia"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Rexistros pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erro! Non pode crear membros asociados recorrentes."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID da mensaxe no e-mail."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatarios do e-mail."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Rexistro da pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Ferramentas do servidor de correo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Destinatarios do e-mail"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Ata"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Referencias dos e-mails."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatarios do email en copia carbón (CC)."
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistema de pasarela de correo"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nome do obxecto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nome do socio"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Fíos pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidade"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Fase"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " nota engadida en "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "E-mail de"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Fío"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensaxe da pasarela de correo electrónico"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Usuario responsable"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertido en oportunidade"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "É o rexistro?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destinatarios do e-mail en copia carbón oculta (cco)."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Mensaxe da pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historia"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Fío da pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Abrir un documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalles do e-mail"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Buscar e-mail"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "recibir"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"A pasarela de correo xenérica permite enviar e recibir e-mails* Rexistro dos "
+"e-mails* Integración doada con calquera módulo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Estado cambiado a: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Amosar texto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Etapa cambiada a: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mensaxe"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID da mensaxe no servidor de correo."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrito o "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " en "
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
new file mode 100644
index 00000000000..e283e9d0e0c
--- /dev/null
+++ b/addons/mail/i18n/hu.po
@@ -0,0 +1,356 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#    * mail_gateway
+#
+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-21 12: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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Erőforrás ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Módszer nincs végrehajtva"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Mellékletek megnyitása"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Üzenet részletei"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Üzenet ID"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Hivatkozás ID"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Mailgateway előzmény"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Megjegyzés"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Csoportosítás..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Hiba! Nem hozhat létre rekurzív társult tagokat."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Részletek"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "E-mailszerver eszközök"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Leírás"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Dátum"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Partner neve"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Lehetőség"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mailek"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "E-mail innen"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Üzenetek"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Felelős felhasználó"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Titkos másolat"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Előzmény"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Hivatkozások"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Mellékletek"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Dokumentum megnyitása"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "E-mail részletek"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Másolat"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Hónap"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "E-mail keresésée"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Tulajdonos"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Üzenet"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Tárgy"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
new file mode 100644
index 00000000000..e37a2ced4de
--- /dev/null
+++ b/addons/mail/i18n/it.po
@@ -0,0 +1,356 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-15 19:32+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-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID Risorsa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Il metodo non è implementato"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Da"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Apri allegati"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Dettagli messaggio"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID messaggio"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID riferimento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Storico server di posta"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Errore! Non è possibile creare membri associati ricorsivi."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID messaggio su email"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatari email"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Dettagli"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Strumenti server email"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "A"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatario email in copia conforme"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nome Oggetto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nome Partner"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Opportunità"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Stadio"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Email da"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Argomento"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Messaggio server mail"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Messaggi"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Utente Responsabile"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertita a opportunità"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "CCN"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destinatario email in copia conforme nascosta"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Storico"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Allegati"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Apri documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Dettagli email"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "CC"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Cerca email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Stato cambiato a: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Proprietario"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Cambio stadio a: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Messaggio"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Oggetto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
new file mode 100644
index 00000000000..c73d287b878
--- /dev/null
+++ b/addons/mail/i18n/lt.po
@@ -0,0 +1,364 @@
+# Lithuanian 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-16 11:31+0000\n"
+"Last-Translator: Paulius Sladkevičius - inovera.lt <komsas@gmail.com>\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:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Resurso ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metodas nėra įgyvendintas"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Nuo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Atverti priedus"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Žinutės detalės"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Žinutės Id"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Nuorodos Id"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "El. pašto šliuzo istorija"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Pastabos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grupuoti pagal..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Klaida! Jūs negalite sukurti rekursiškai susijusio nario."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Žinutės id el. laiške"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "El. laiško gavėjai"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Informacija"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "El. pašto šliuzo istorija"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "El. pašto serverio įrankiai"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "El. laiško sekėjai"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Aprašymas"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Kam"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "El. laiškų nuorodos."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "El. laiško kopijos gavėjai"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "El. pašto šliuzo sistema"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Objekto pavadinimas"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Partnerio pavadinimas"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "El. pašto šliuzo gijos"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Pardavimo galimybė"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "El. laiškai"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Etapas"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " pridėta pastaba "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "El. laiškas nuo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Gija"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "El. pašto šliuzo žinutė"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Žinutė"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Atsakingas naudotojas"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Konvertuota į pardavimų galimybę"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Yra istorijoje?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Slapta el. pašto kopija gavėjams"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "el. pašto šliuzo žinutė"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Istorija"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Nuorodos"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "El. pašto šliuzo gija"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Priedai"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Atverti dokumentą"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "El. laiškas plačiau"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mėnuo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "El. pašto paieška"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "gauti"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Būsena pakeista į: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Rodomas tekstas"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Savininkas"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Būsena pakeista į: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Žinutė"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Tema"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Žinutės id el. pašto serveryje."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " įrašytas "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " ant "
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
new file mode 100644
index 00000000000..70f978a8d06
--- /dev/null
+++ b/addons/mail/i18n/lv.po
@@ -0,0 +1,360 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-13 23:09+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Resursa ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metode nav realizēta"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "No"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Atvērt piesaistnes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Ziņojuma sīkāka informācija"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Ziņojuma ID"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Atsauces ID"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "E-pasta vārtejas vēsture"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Piezīme"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grupēt pēc..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Kļūda! Nevar izveidot rekursīvus asociētos dalībniekus."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Ziņojuma ID e-pastā"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "E-pasta saņēmēji"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Sīkāka informācija"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "E-pasta vārtejas vēsture"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "E-pasta servera rīki"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "E-pasta sekotāji"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Apraksts"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Kam"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Atsauces e-pasti"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "E-pasta kopijas saņēmēji"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "E-pasta vārtejas sistēma"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Objekta nosaukums"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Partnera nosaukums"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "E-pasta vārtejas sarunas"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Izdevība"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-pasti"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Posms"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " piezīme pievienota "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "E-pasts no"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Sarakste"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "E-pasta vārtejas ziņojums"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Ziņojumi"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Atbildīgais lietotājs"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Pārveidots par izdevību"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Vai vēsture?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Slēptās e-pasta kopijas saņēmēji"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "e-pasta vārtejas ziņojums"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Vēsture"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Atsauces"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "E-pasta vārtejas sarakste"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Piesaistnes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Atvērt dokumentu"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "E-pasta sīkāka informācija"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "CC"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mēnesis"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Meklēt e-pastā"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "saņemt"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Mainīts statuss uz: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Teksts"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Īpašnieks"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Posms mainīts uz: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Ziņojums"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Temats"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Ziņojuma ID e-pasta serverī."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " uzrakstīts "
diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail/i18n/mail.pot
similarity index 100%
rename from addons/mail_gateway/i18n/mail_gateway.pot
rename to addons/mail/i18n/mail.pot
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
new file mode 100644
index 00000000000..c521e310fa9
--- /dev/null
+++ b/addons/mail/i18n/nl.po
@@ -0,0 +1,367 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-03-20 16:59+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Resource ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Methode is niet geïmplementeerd"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Van"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Open bijlagen"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Bericht details"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Bericht Id"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Referentie Id"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Mailgateway geschiedenis"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Notitie"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Fout ! U kunt geen recursieve aangesloten leden maken."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Bericht Id op Email."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Email ontvangers"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Details"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Mailgate geschiedenis"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Email Server Tools"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Email volgers"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr " schreef op %s:\n"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Aan"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "email referenties."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Carbon Copy email ontvangers"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Email gateway systeem"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Objectnaam"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Relatienaam"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Mailgateway conversatie"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Verkoopkans"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Stadium"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " notitie toegevoegd op "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Email van"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Conversatie"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mailgateway bericht"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Verantwoordelijke gebruiker"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Omgezet in verkoopkans"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "BCC"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Is geschiedenis?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Blind Carbon Copy email ontvangers"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "mailgate bericht"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Geschiedenis"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referenties"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Mailgateway conversatie"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Bijlagen"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Document openen"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Email details"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "CC"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr " op %s:\n"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Email zoeken"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "ontvangen"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"Het generieke email gateway systeem laat u emails zenden en ontvangen\n"
+"    * geschiedenis van emails\n"
+"    * eenvoudige integratie met elke module"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Status gewijzigd in: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Tekst afbeelden"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Eigenaar"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Stadium gewijzigd in: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Bericht"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Onderwerp"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Bericht Id in email server."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " schreef op "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " op "
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
new file mode 100644
index 00000000000..c8b9fa1eaae
--- /dev/null
+++ b/addons/mail/i18n/pl.po
@@ -0,0 +1,364 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-13 16:42+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID zasobu"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metoda nie zaimplementowana"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Otwórz załączniki"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Szczegóły wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID odnośnika"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Historia bramki pocztowej"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Notatka"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+"Błąd ! Tworzenie rekursywnych elementów skojarzonych jest zabronione."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID wiadomości w Emailu"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Odbiorcy wiadomości"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Szczegóły"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Historia bramki pocztowej"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Narzędzia serwera pocztowego"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Do"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Odnośniki."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Odbiorcy kopii wiadomości"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "System bramki pocztowej"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nazwa obiektu"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nazwa partnera"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Wątki bramki pocztowej"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Szansa"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emaile"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Etap"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " dodał uwagę do "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Wiadomość od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Wątek"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Wiadomość Mailgateway"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Użytkownik odpowiedzialny"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Skonwertował do szansy"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Ukryta kopia"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Istnieje historia?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Odbiorcy ukrytych kopii wiadomości"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historia"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Odnośniki"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Wątek bramki pocztowej"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Załączniki"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Otwórz dokument"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Szczegóły wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Kopia"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Przeszukaj wiadomości"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"Podstawowy system bramki pocztowej do wysyłania odbierania wiadomości\n"
+"    * Historia wiadomości\n"
+"    * Łatwa integracja z dowolnym modułem"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Zmienił stan na: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Wyświetla tekst"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Właściciel"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Zmienił etap na: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Wiadomość"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Temat"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID wiadomości w serwerze pocztowym"
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " napisał "
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
new file mode 100644
index 00000000000..6c6871f6e42
--- /dev/null
+++ b/addons/mail/i18n/pt.po
@@ -0,0 +1,367 @@
+# 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-12 19:10+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID do recurso"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "O método não está implementado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Abrir anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalhes da mensagem"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID da mensagem"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID da referência"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erro! Não pode criar membros associados recursivamente."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID da mensagem no email."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatários da mensagem"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Remetente e Destinatários"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nome do objeto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nome do parceiro"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidade"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Mensagens"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " nota adicionada em "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Remetente da mensagem"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Utilizador responsável"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertida em Oportunidade"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "CCO"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Histórico"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referências"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Abrir documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalhes da mensagem"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "CC"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Pesquisa de email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"O sistema de email genérico permite o envio e recepção de emails\n"
+"    * Histórico de mensagens\n"
+"    * Fácil integração com qualquer módulo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Estado mudado para: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar texto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Dono"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Estágio mudado para: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mensagem"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID da mensagem no servidor."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrito em "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " em "
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
new file mode 100644
index 00000000000..8dade6ce036
--- /dev/null
+++ b/addons/mail/i18n/pt_BR.po
@@ -0,0 +1,367 @@
+# 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-17 18:39+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-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID do recurso"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método não está implementado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Abrir Anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalhes da Mensagem"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Id da Mensagem"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Id de Referência"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Histórico do Gateway de Email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Anotação"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erro ! Você não pode criar membros recursivos associados."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Id da Mensagem no Email"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatários de Email"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Histórico do Gateway de Email"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Ferramentas do Servidor de Email"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Encaminhamentos de Email"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Emails relacionados"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatários de Email Com Cópia"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistema de Gateway de Email"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nome do objeto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nome do Parceiro"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Tópicos do Gateway de Email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidade"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " nota adicionada em "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Tópico"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensagem do Gateway de Email"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Usuário Responsável"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertido para Oportunidade"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Cópia Oculta"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "é Histórico?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destinatário de Email com Cópia Oculta"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Mensagem do Gateway de Email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Histórico"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referências"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Tópico do Gateway de Email"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Abrir Documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalhes do Email"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Pesquisar Email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "receber"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"O sistema genérico de gateway de email permite enviar e receber emails\n"
+"    * Histórico por Emails\n"
+"    * Integração Fácil com qualquer Módulo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Mudar Status para: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar o Texto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Dono"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Status Alterado para: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mensagem"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Id da Mensagem no Servidor de Email"
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrito em "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " em "
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
new file mode 100644
index 00000000000..e148b71e4f1
--- /dev/null
+++ b/addons/mail/i18n/ro.po
@@ -0,0 +1,366 @@
+# 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-01-24 15:23+0000\n"
+"Last-Translator: geopop65 <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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID resursă"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metodă neimplementată"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "De la"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Deschidere ataşamente"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalii mesaj"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID mesaj"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referinţă"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Istoric mesagerie"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Notă"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grupează după..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Eroare ! Nu puteţi crea membri asociaţi recursiv."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID mesaj în mesaj"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "destiantarii mesajului"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalii"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Istoric mesagerie"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Utilitare server e-mail"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Mesaje de continuare"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partener"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descriere"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Către"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Mesaje de referinţă"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatari copie carbon"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistem expediţie email"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Denumirea obiectului"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Numele partenerului"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Procese expeditie email"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunitate"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mail-uri"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Etapă"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " a adăugată note la data de "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "E-mail de la"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Proces"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mesaj de la mesagerie"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mesaje"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Utilizator responsabil:"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertit în oportunitate"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Este istoric?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destinatari copie carbon nevăzută"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "mesaj de la mesagerie"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Istoric"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referinţe"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Proces de expediţie email"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Atașamente"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Deschide documentul"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalii e-mail"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Luna"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Căutare e-mail"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "recepţie"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"* Istoricul mesageriei\n"
+"    * Integrare uşoară cu orice modul"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Starea a devenit: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Afişare text"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Proprietar"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Stadiul a devenit: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mesaj"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Subiect"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID al mesajului în serverul de e-mail"
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " a scris la data de "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " în data de "
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
new file mode 100644
index 00000000000..55126c0e127
--- /dev/null
+++ b/addons/mail/i18n/ru.po
@@ -0,0 +1,364 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-25 08:25+0000\n"
+"Last-Translator: Alexey Y. Fedotov <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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Идентификатор ресурса"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Метод не реализован"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "От"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Открыть вложения"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Подробности сообщения"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Идентификатор сообщения"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Идентификатор связанного сообщения"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "История почтового шлюза"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Примечание"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Объеденить по..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "Идентификатор сообщения эл. почты."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Получатели эл. почты"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Подробности"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Инструменты почтового сервера"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Кому"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Получатели копий эл. письма"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Система шлюзов эл. почты"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Название объекта"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Имя партнера"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Предложение"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Эл. почта"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Этап"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Эл. письмо от"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Цепочка"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Соообщение почтового шлюза"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Ответственный пользователь"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Преобразовано в предложение"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Скрытая копия"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "История?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Получатели скрытых копий эл. писем"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "История"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Ссылки"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Прикрепленные файлы"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Открыть документ"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Детали эл. письма"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Копия"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Искать эл. почту"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "получать"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"Общая система шлюзов электронной почты позволяет отправлять и получать "
+"электронную почту\n"
+"    * История электронных писем\n"
+"    * Легкая интеграция с любым модулем"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Статус изменен на: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Вывести текст"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Владелец"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Этап изменен на: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Сообщение"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Тема"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "Идентификатор сообщения на почтовом сервере."
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " на "
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
new file mode 100644
index 00000000000..737f23de680
--- /dev/null
+++ b/addons/mail/i18n/sl.po
@@ -0,0 +1,356 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2010-12-16 17:40+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Oznaka vira"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metoda ni implementirana"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Odprte priloge"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Podrobnosti sporočila"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Oznaka sporočila"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "Oznaka povezave"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Zgodovina posrednika za pošto"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Opomba"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Združi po ..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Napaka! Ni mogoče rekurzivno kreirati pridruženih članov"
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Prejemniki e-pošte"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Podrobnosti"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Stranka"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Za"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Naziv objekta"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Naziv partnerja"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Priložnost"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Elektronska pošta"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Stopnja"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Sporočilo od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Nit"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
new file mode 100644
index 00000000000..bb1e8c711a3
--- /dev/null
+++ b/addons/mail/i18n/sr@latin.po
@@ -0,0 +1,356 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2010-12-10 18:25+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
new file mode 100644
index 00000000000..4ce20b26290
--- /dev/null
+++ b/addons/mail/i18n/sv.po
@@ -0,0 +1,364 @@
+# 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: 2011-01-24 23:17+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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "Resurs ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Från"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Öppna bifogade filer"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "Meddelande id"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Anteckning"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Fel! Du kan inte skapa rekursivt kopplade medlemmar."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detaljer"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Email server verktyg"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Beskrivning"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Till"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Objektnamn"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Partner namn"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Tillfälle"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Epost"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "E-post från"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historik"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Månad"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Ändrad status till: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Visa text"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Ägare"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Meddelande"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Ämne"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " skrev på "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " på "
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
new file mode 100644
index 00000000000..7ea611a9a85
--- /dev/null
+++ b/addons/mail/i18n/zh_CN.po
@@ -0,0 +1,364 @@
+# 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-01-12 11:02+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "资源ID"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "未实现的方法"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "发件人"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "打开附件"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "消息详情"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "消息ID"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "相关ID"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "邮件网关日志"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "备注"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "错误！您不能创建递归的相关成员。"
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "电子邮件的消息ID"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "邮件收件人"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "详细信息"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "邮件网关日志"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "邮件服务器工具"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "电子邮件追随者"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "说明"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "收件人"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "相关的邮件列表"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "抄送邮件的收件人"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "电子邮件网关系统"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "对象名"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "业务伙伴名称"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "邮件网关线程"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "商机"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "电子邮件"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "阶段"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " 增加备注在 "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "邮件发件人"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "线程"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "邮件网关消息"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "责任人"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "转化为商机"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "密件抄送"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "是日志"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "密件抄送的收件人"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "邮件网关消息"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "日志"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "引用"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "邮件网关线程"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "打开文档"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "电子邮件详情"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "抄送"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "月"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "电子邮件搜索"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "接收"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr "通过电子邮件网关系统允许你发送和接受邮件"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "状态更改为： "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "显示文本"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "所有者"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "状态阶段为： "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "消息"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "主题"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "电子邮件消息ID"
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " 写在 "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " 在 "
diff --git a/addons/email_template/email_template_scheduler_data.xml b/addons/mail/mail_data.xml
similarity index 59%
rename from addons/email_template/email_template_scheduler_data.xml
rename to addons/mail/mail_data.xml
index 45a9be04ac7..964552b951a 100644
--- a/addons/email_template/email_template_scheduler_data.xml
+++ b/addons/mail/mail_data.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
-            <field name="name">Email Template scheduler</field>
+            <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
+            <field name="name">Email Queue Manager</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
-            <field eval="'email_template.mailbox'" name="model"/>
-            <field eval="'run_mail_scheduler'" name="function"/>
+            <field eval="'mail.message'" name="model"/>
+            <field eval="'process_email_queue'" name="function"/>
             <field eval="'()'" name="args"/>
         </record>
     </data>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
new file mode 100644
index 00000000000..159259f151d
--- /dev/null
+++ b/addons/mail/mail_message.py
@@ -0,0 +1,534 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 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 dateutil.parser
+import email
+import logging
+import re
+import time
+from email.header import decode_header
+from email.message import Message
+
+import tools
+from osv import osv
+from osv import fields
+from tools.translate import _
+from tools.safe_eval import literal_eval
+
+_logger = logging.getLogger('mail')
+
+def format_date_tz(date, tz=None):
+    if not date:
+        return 'n/a'
+    format = tools.DEFAULT_SERVER_DATETIME_FORMAT
+    return tools.server_to_local_timestamp(date, format, format, tz)
+
+def truncate_text(text):
+    lines = text and text.split('\n') or []
+    if len(lines) > 3:
+        res = '\n\t'.join(lines[:3]) + '...'
+    else:
+        res = '\n\t'.join(lines)
+    return res
+
+def decode(text):
+    """Returns unicode() string conversion of the the given encoded smtp header text"""
+    if text:
+        text = decode_header(text.replace('\r', ''))
+        return ''.join([tools.ustr(x[0], x[1]) for x in text])
+
+def to_email(text):
+    """Return a list of the email addresses found in ``text``"""
+    if not text: return []
+    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
+
+class mail_message_common(osv.osv_memory):
+    """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"""
+
+    _name = 'mail.message.common'
+    _rec_name = 'subject'
+    _columns = {
+        'subject': fields.char('Subject', size=512, required=True),
+        'model': fields.char('Related Document model', size=128, select=1, readonly=1),
+        'res_id': fields.integer('Related Document ID', select=1, readonly=1),
+        'date': fields.datetime('Date'),
+        'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences. If empty, this is not a mail but a message.'),
+        '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),
+        'subtype': fields.char('Message type', size=32, help="Type of message, usually 'html' or 'plain', used to "
+                                                             "select plaintext or rich text contents accordingly", readonly=1),
+        'body_text': fields.text('Text contents', help="Plain-text version of the message"),
+        'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message"),
+    }
+
+    _defaults = {
+        'subtype': 'plain'
+    }
+
+class mail_message(osv.osv):
+    '''Model holding RFC2822 email messages, and providing facilities
+       to parse, queue and send new messages
+
+       Messages that do not have a value for the email_from column
+       are simple log messages (e.g. document state changes), while
+       actual e-mails have the email_from value set.
+       The ``display_text`` field will have a slightly different
+       presentation for real emails and for log messages.
+       '''
+
+    _name = 'mail.message'
+    _inherit = 'mail.message.common'
+    _description = 'Email Message'
+    _order = 'date desc'
+
+    # XXX to review - how to determine action to use?
+    def open_document(self, cr, uid, ids, context=None):
+        action_data = False
+        if ids:
+            msg = self.browse(cr, uid, ids[0], context=context)
+            model = msg.model
+            res_id = msg.res_id
+
+            ir_act_window = self.pool.get('ir.actions.act_window')
+            action_ids = ir_act_window.search(cr, uid, [('res_model', '=', model)])
+            if action_ids:
+                action_data = ir_act_window.read(cr, uid, action_ids[0], context=context)
+                action_data.update({
+                    'domain' : "[('id','=',%d)]"%(res_id),
+                    'nodestroy': True,
+                    'context': {}
+                    })
+        return action_data
+
+    # XXX to review - how to determine action to use?
+    def open_attachment(self, cr, uid, ids, context=None):
+        action_data = False
+        action_pool = self.pool.get('ir.actions.act_window')
+        message = self.browse(cr, uid, ids, context=context)[0]
+        att_ids = [x.id for x in message.attachment_ids]
+        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')])
+        if action_ids:
+            action_data = action_pool.read(cr, uid, action_ids[0], context=context)
+            action_data.update({
+                'domain': [('id','in',att_ids)],
+                'nodestroy': True
+                })
+        return action_data
+
+    def _get_display_text(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+        tz = context.get('tz')
+        result = {}
+        for message in self.browse(cr, uid, ids, context=context):
+            msg_txt = ''
+            if message.email_from:
+                msg_txt += _('%s wrote on %s: \n Subject: %s \n\t') % (message.email_from or '/', format_date_tz(message.date, tz), message.subject)
+                if message.body_text:
+                    msg_txt += truncate_text(message.body_text)
+            else:
+                msg_txt = (message.user_id.name or '/') + _(' on ') + format_date_tz(message.date, tz) + ':\n\t'
+                msg_txt += message.subject
+            result[message.id] = msg_txt
+        return result
+
+    _columns = {
+        'partner_id': fields.many2one('res.partner', 'Related partner'),
+        'user_id': fields.many2one('res.users', 'Related user', readonly=1),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
+        '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'),
+                        ], 'State', readonly=True),
+        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
+        'original': fields.binary('Original', help="Original version of the message, as it was sent on the network", readonly=1),
+    }
+
+    _defaults = {
+        'state': 'received',
+    }
+
+    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 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,original=False,headers=False)
+        return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
+
+    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, 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 ``subtype`` (by default, plaintext).
+                               If html 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 string subtype: optional mime 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 = {}
+        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': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'user_id': uid,
+                'model': model,
+                'res_id': res_id,
+                'body_text': body if subtype != 'html' else False,
+                'body_html': body if 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 '',
+                'reply_to': reply_to,
+                'message_id': message_id,
+                'references': references,
+                'subtype': 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 fname, fcontent in attachments.iteritems():
+            attachment_data = {
+                    'name': fname,
+                    'datas_fname': fname,
+                    'datas': fcontent,
+                    '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)
+
+    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')]
+            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 parse_message(self, message, save_original=False):
+        """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...
+                                  },
+                      '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)
+
+        fields = msg_txt.keys()
+        msg['id'] = message_id
+        msg['message-id'] = message_id
+
+        if 'Subject' in fields:
+            msg['subject'] = decode(msg_txt.get('Subject'))
+
+        if 'Content-Type' in fields:
+            msg['content-type'] = msg_txt.get('Content-Type')
+
+        if 'From' in fields:
+            msg['from'] = decode(msg_txt.get('From') or msg_txt.get_unixfrom())
+
+        if 'To' in fields:
+            msg['to'] = decode(msg_txt.get('To'))
+        if 'Delivered-To' in fields:
+            msg['to'] = decode(msg_txt.get('Delivered-To'))
+
+        if 'CC' in fields:
+            msg['cc'] = decode(msg_txt.get('CC'))
+
+        if 'Reply-To' in fields:
+            msg['reply'] = decode(msg_txt.get('Reply-To'))
+
+        if 'Date' in fields:
+            date_hdr = decode(msg_txt.get('Date'))
+            msg['date'] = dateutil.parser.parse(date_hdr).strftime("%Y-%m-%d %H:%M:%S")
+
+        if 'Content-Transfer-Encoding' in fields:
+            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
+
+        if 'References' in fields:
+            msg['references'] = msg_txt.get('References')
+
+        if 'In-Reply-To' in fields:
+            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
+
+        msg['headers'] = {}
+        msg['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['subtype'] = 'html'
+                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['subtype'] = 'alternative'
+            else:
+                msg['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['subtype'] = 'html' # html version prevails
+                        body = tools.ustr(tools.html2plaintext(content))
+                    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['subtype'] or 'plain'
+        return msg
+
+    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
+        """
+        if context is None:
+            context = {}
+        ir_mail_server = self.pool.get('ir.mail_server')
+        self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
+        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)))
+
+                body = message.body_html if message.subtype == 'html' else message.body_text
+                body_alternative = None
+                subtype_alternative = None
+                if message.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
+                    subtype_alternative = 'plain'
+
+                msg = ir_mail_server.build_email(
+                    email_from=message.email_from,
+                    email_to=to_email(message.email_to),
+                    subject=message.subject,
+                    body=body,
+                    body_alternative=body_alternative,
+                    email_cc=to_email(message.email_cc),
+                    email_bcc=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.subtype,
+                    subtype_alternative=subtype_alternative,
+                    headers=message.headers and 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})
+                else:
+                    message.write({'state':'exception'})
+
+                # if auto_delete=True then delete that sent messages as well as attachments
+                message.refresh()
+                if message.state == 'sent' and message.auto_delete:
+                    self.pool.get('ir.attachment').unlink(cr, uid,
+                                                          [x.id for x in message.attachment_ids],
+                                                          context=context)
+                    message.unlink()
+            except Exception:
+                _logger.exception('failed sending mail.message %s', message.id)
+                message.write({'state':'exception'})
+
+            if auto_commit == True:
+                cr.commit()
+        return True
+
+    def cancel(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return True
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
new file mode 100644
index 00000000000..2bf2756869e
--- /dev/null
+++ b/addons/mail/mail_message_view.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <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="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email message">
+                    <group colspan="4" col="6">
+                       <field name="subject" colspan="4"/>
+                       <field name="date"/>
+                       <field name="user_id" string="User"/>
+                       <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Details">
+                            <group col="2" colspan="2">
+                                <separator string="Recipients" colspan="4"/>
+                                <field name="email_from"/>
+                                <field name="email_to"/>
+                                <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
+                                <field name="email_bcc" groups="base.group_extended" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+                                <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
+                            </group>
+                            <group col="4" colspan="2">
+                                <separator string="Message Details" colspan="4"/>
+                                <field name="model"/>
+                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
+                                <field name="res_id" groups="base.group_extended"/>
+                                <field name="message_id" groups="base.group_extended" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+                                <field name="references" colspan="4" widget="char" size="512" groups="base.group_extended" attrs="{'invisible':[('references', '=', False)]}"/>
+                            </group>
+
+                            <notebook colspan="4">
+                                <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
+                                    <field name="body_html" widget="text_html" nolabel="1" colspan="4"/>
+                                </page>
+                                <page string="Body (Plain)">
+                                    <field name="body_text" colspan="4" widget="text" nolabel="1"/>
+                                </page>
+                            </notebook>
+
+                            <separator string="" colspan="4"/>
+                            <group col="6" colspan="4">
+                                <field name="state" colspan="2"/>
+                                <group col="4" colspan="2">
+                                    <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'/>
+                                    <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'/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Attachments">
+                            <separator string="Attachments" colspan="4"/>
+                            <field name="attachment_ids" nolabel="1" colspan="4"/>
+                        </page>
+                        <page string="Advanced" groups="base.group_extended">
+                            <group col="2" colspan="4">
+                                <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
+                                <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
+                                <field name="auto_delete"/>
+                                <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
+                                <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </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="type">tree</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="state"/>
+                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" 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="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Email Search">
+                    <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')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-stop" string="Failed" domain="[('state','=','exception')]"/>
+                    <field name="email_from"/>
+                    <field name="email_to"/>
+                    <field name="subject"/>
+                    <field name="date"/>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="user_id" string="User"/>
+                    <field name="partner_id" string="Partner Name"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="State" 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'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </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="domain">[('email_from', '!=', False)]</field>
+             <field name="context">{'search_default_received':1}</field>
+            <field name="search_view_id" ref="view_email_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"/>
+
+        <menuitem name="Messages"
+            id="menu_email_message"
+            parent="base.menu_email"
+            action="action_view_mail_message" />
+
+    </data>
+</openerp>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
new file mode 100644
index 00000000000..c8f7da9a5bb
--- /dev/null
+++ b/addons/mail/mail_thread.py
@@ -0,0 +1,464 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009-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 time
+import tools
+import base64
+import email
+from email.utils import parsedate
+
+import logging
+import xmlrpclib
+from osv import osv, fields
+from tools.translate import _
+from mail_message import decode, to_email
+
+_logger = logging.getLogger('mail')
+
+class mail_thread(osv.osv):
+    '''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`` adds a one2many of mail.messages, acting as the
+       thread's history, and a few methods that may be overridden to
+       implement model-specific behavior upon arrival of new messages.
+
+       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.
+
+    '''
+    _name = 'mail.thread'
+    _description = 'Email Thread'
+
+    _columns = {
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', readonly=True),
+    }
+
+    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.user_email) or '')
+                l.add(message.email_from or '')
+                l.add(message.email_cc or '')
+            res[thread.id] = filter(None, l)
+        return res
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        """Overrides default copy method to empty the thread of
+           messages attached to this record, as the copied object
+           will have its own thread and does not have to share it.
+        """
+        if default is None:
+            default = {}
+        default.update({
+            'message_ids': [],
+        })
+        return super(mail_thread, self).copy(cr, uid, id, default, context=context)
+
+    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``).
+           Additional behavior may be implemented by overriding this method.
+
+           :param dict msg_dict: a map containing the email details and
+                                 attachments. See ``message_process`` and
+                                ``mail.message.parse`` for details.
+           :param dict custom_values: optional dictionary of additional
+                                      field values to pass to create()
+                                      when creating the new thread record.
+                                      Be careful, these values may override
+                                      any other values coming from the message.
+           :param dict context: if a ``thread_model`` value is present
+                                in the context, its value will be used
+                                to determine the model of the record
+                                to create (instead of the current model).
+           :rtype: int
+           :return: the id of the newly created thread object
+        """
+        if context is None:
+            context = {}
+        model = context.get('thread_model') or self._name
+        model_pool = self.pool.get(model)
+        fields = model_pool.fields_get(cr, uid, context=context)
+        data = model_pool.default_get(cr, uid, fields, context=context)
+        if 'name' in fields and not data.get('name'):
+            data['name'] = msg_dict.get('from','')
+        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, vals={}, default_act=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``)
+           Additional behavior may be implemented by overriding this
+           method.
+
+           :param dict msg_dict: a map containing the email details and
+                                attachments. See ``message_process`` and
+                                ``mail.message.parse()`` for details.
+           :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_dict(cr, uid, ids, msg_dict, context=context)
+
+    def message_append(self, cr, uid, threads, subject, body_text=None, email_to=False,
+                email_from=False, email_cc=None, email_bcc=None, reply_to=None,
+                email_date=None, message_id=False, references=None,
+                attachments=None, body_html=None, subtype=None, headers=None,
+                original=None, context=None):
+        """Creates a new mail.message 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.
+           If only the ``threads`` and ``subject`` parameters are provided,
+           a *event log* message is created, 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 if this
+                        is an *event log* entry.
+        :param email_to: Email-To / Recipient address
+        :param email_from: Email From / Sender address if any
+        :param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
+        :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
+        :param reply_to: reply_to header
+        :param email_date: email date string if different from now, in server timezone
+        :param message_id: optional email identifier
+        :param references: optional email references
+        :param body_text: plaintext contents of the mail or log message
+        :param body_html: html contents of the mail or log message
+        :param subtype: optional type of message: 'plain' or 'html', corresponding to the main
+                        body contents (body_text or body_html).
+        :param headers: mail headers to store
+        :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')
+        mail_message = self.pool.get('mail.message')
+
+        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))
+
+            partner_id = hasattr(thread, 'partner_id') 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
+            data = {
+                'subject': subject,
+                'user_id': uid,
+                'model' : thread._name,
+                'partner_id': partner_id,
+                'res_id': thread.id,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'message_id': message_id,
+                'body_text': body_text or (hasattr(thread, 'description') and thread.description or False),
+                'attachment_ids': [(6, 0, to_attach)],
+                'state' : 'received',
+            }
+
+            if email_from:
+                for param in (email_to, email_cc, email_bcc):
+                    if isinstance(param, list):
+                        param = ", ".join(param)
+                data = {
+                    'subject': subject or _('History'),
+                    'user_id': uid,
+                    'model' : thread._name,
+                    'res_id': thread.id,
+                    'date': email_date or time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'body_text': body_text,
+                    'email_to': email_to,
+                    'email_from': email_from or \
+                        (hasattr(thread, 'user_id') and thread.user_id and thread.user_id.user_email),
+                    'email_cc': email_cc,
+                    'email_bcc': email_bcc,
+                    'partner_id': partner_id,
+                    'references': references,
+                    'message_id': message_id,
+                    'attachment_ids': [(6, 0, to_attach)],
+                    'state' : 'received',
+                    'body_html': body_html,
+                    'subtype': subtype,
+                    'headers': headers,
+                    'reply_to': reply_to,
+                    'original': original,
+                }
+            mail_message.create(cr, uid, data, context=context)
+        return True
+
+    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'),
+                            email_to = msg_dict.get('to'),
+                            email_from = msg_dict.get('from'),
+                            email_cc = msg_dict.get('cc'),
+                            email_bcc = msg_dict.get('bcc'),
+                            reply_to = msg_dict.get('reply'),
+                            email_date = msg_dict.get('date'),
+                            message_id = msg_dict.get('message-id'),
+                            references = msg_dict.get('references')\
+                                      or msg_dict.get('in-reply-to'),
+                            attachments = msg_dict.get('attachments'),
+                            body_html= msg_dict.get('body_html'),
+                            subtype = msg_dict.get('subtype'),
+                            headers = msg_dict.get('headers'),
+                            original = msg_dict.get('original'),
+                            context = context)
+
+
+    def message_process(self, cr, uid, model, message, custom_values=None,
+                        save_original=False, strip_attachments=False,
+                        context=None):
+        """Process an incoming RFC2822 email message related to the
+           given thread model, relying on ``mail.message.parse()``
+           for the parsing operation, and then calling ``message_new``
+           (if the thread record did not exist) or ``message_update``
+           (if it did), then calling ``message_forward`` to automatically
+           notify other people that should receive this message.
+
+           :param string model: the thread model for which a new message
+                                must be processed
+           :param message: source of the RFC2822 mail
+           :type message: string or xmlrpclib.Binary
+           :type dict custom_values: optional dictionary of field values
+                                    to pass to ``message_new`` if a new
+                                    record needs to be created. Ignored
+                                    if the thread record already exists.
+           :param bool save_original: whether to keep a copy of the original
+               email source attached to the message after it is imported.
+           :param bool strip_attachments: whether to strip all attachments
+               before processing the message, in order to save some space.
+        """
+        # 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
+        # convert it to utf-8 for transport between the mailgate script and here.
+        if isinstance(message, xmlrpclib.Binary):
+            message = str(message.data)
+
+        model_pool = self.pool.get(model)
+        if self._name != model:
+            if context is None: context = {}
+            context.update({'thread_model': model})
+
+        mail_message = self.pool.get('mail.message')
+        res_id = False
+
+        # Parse 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)
+        msg = mail_message.parse_message(msg_txt, save_original=save_original)
+
+        if strip_attachments and 'attachments' in msg:
+            del msg['attachments']
+
+        # Create New Record into particular model
+        def create_record(msg):
+            if hasattr(model_pool, 'message_new'):
+                return model_pool.message_new(cr, uid, msg,
+                                              custom_values,
+                                              context=context)
+        res_id = False
+        if msg.get('references') or msg.get('in-reply-to'):
+            references = msg.get('references') or msg.get('in-reply-to')
+            if '\r\n' in references:
+                references = references.split('\r\n')
+            else:
+                references = references.split(' ')
+            for ref in references:
+                ref = ref.strip()
+                res_id = tools.reference_re.search(ref)
+                if res_id:
+                    res_id = res_id.group(1)
+                else:
+                    res_id = tools.res_re.search(msg['subject'])
+                    if res_id:
+                        res_id = res_id.group(1)
+                if res_id:
+                    res_id = int(res_id)
+                    if model_pool.exists(cr, uid, res_id):
+                        if hasattr(model_pool, 'message_update'):
+                            model_pool.message_update(cr, uid, [res_id], msg, {}, context=context)
+                    else:
+                        # referenced thread was not found, we'll have to create a new one
+                        res_id = False
+        if not res_id:
+            res_id = create_record(msg)
+        #To forward the email to other followers
+        self.message_forward(cr, uid, model, [res_id], msg_txt, context=context)
+        return res_id
+
+    # for backwards-compatibility with old scripts
+    process_email = message_process
+
+    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')
+        mail_message = self.pool.get('mail.message')
+        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 hasattr(res, '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.
+           
+           :param email: email address for which a partner
+                         should be searched for.
+           :rtype: dict
+           :return: a map of the following form::
+
+                      { 'partner_address_id': id or False,
+                        'partner_id': pid or False }
+        """
+        address_pool = self.pool.get('res.partner.address')
+        res = {
+            'partner_address_id': False,
+            'partner_id': False
+        }
+        if email:
+            email = to_email(email)[0]
+            address_ids = address_pool.search(cr, uid, [('email', '=', email)])
+            if address_ids:
+                address = address_pool.browse(cr, uid, address_ids[0])
+                res['partner_address_id'] = address_ids[0]
+                res['partner_id'] = address.partner_id.id
+        return res
+
+# 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
new file mode 100644
index 00000000000..bd10a72faf2
--- /dev/null
+++ b/addons/mail/mail_thread_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_mailgate_thread_form">
+            <field name="name">mail.thread.form</field>
+            <field name="model">mail.thread</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email Thread">
+                    <separator string="Communication History" colspan="4"/>
+                    <field name="message_ids" nolabel="1" colspan="4" mode="tree,form">
+                        <tree string="Communication History">
+                            <field name="display_text"/>
+                        </tree>
+                        <form string="Message">
+                            <field name="subject" widget="char"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                            <notebook colspan="4">
+                                <page string="Email Details">
+                                    <group col="4" colspan="4">
+                                        <separator string="Email Details" colspan="4"/>
+                                        <field name="email_from"/>
+                                        <field name="email_to"/>
+                                        <field name="email_cc"/>
+                                        <field name="email_bcc"/>
+                                   </group>
+                                </page>
+                                <page string="Attachments">
+                                    <field name="attachment_ids" nolabel="1" colspan="4" />
+                                </page>
+                            </notebook>
+                        </form>
+                    </field>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mailgate_thread_tree">
+            <field name="name">mail.thread.tree</field>
+            <field name="model">mail.thread</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Email Threads">
+                    <field name="message_ids" />
+                </tree>
+            </field>
+        </record>
+
+         <!-- Emails thread action -->
+        <record model="ir.actions.act_window" id="action_view_mailgate_thread">
+            <field name="name">Email Threads</field>
+            <field name="res_model">mail.thread</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_mailgate_thread_tree"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_mailgate_thread_tree"/>
+            <field name="act_window_id" ref="action_view_mailgate_thread"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_mailgate_thread_form"/>
+            <field name="act_window_id" ref="action_view_mailgate_thread"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail_gateway/res_partner.py b/addons/mail/res_partner.py
similarity index 86%
rename from addons/mail_gateway/res_partner.py
rename to addons/mail/res_partner.py
index c6f41ff0414..637922ff75c 100644
--- a/addons/mail_gateway/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -19,17 +19,16 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import osv
+from osv import fields
 
 class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
     _columns = {
-        'emails': fields.one2many('mailgate.message', 'partner_id',\
-                                        'Emails', readonly=True, domain=[('history','=',True)]),
+        'emails': fields.one2many('mail.message', 'partner_id', 'Emails', readonly=True, domain=[('email_from','!=',False)]),
     }
 
 res_partner()
 
-
 # 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
new file mode 100644
index 00000000000..21da7d735b7
--- /dev/null
+++ b/addons/mail/res_partner_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+         <!--  Partners inherited form -->
+        <record id="base.view_crm_partner_info_History" model="ir.ui.view">
+            <field name="name">res.partner.crm.history.inherit1</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="/form/notebook/page[@string='History']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_emails_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.emails.info.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">
+                <page string="History" position="inside">
+                    <field name="emails" colspan="4" nolabel="1"/>
+                </page>
+            </field>
+        </record>
+
+   </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
new file mode 100644
index 00000000000..b508cd68d83
--- /dev/null
+++ b/addons/mail/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mail_message","mail.message","model_mail_message",,1,0,0,0
+"access_mail_thread","mail.thread","model_mail_thread",,1,0,0,0
diff --git a/addons/mail_gateway/scripts/__init__.py b/addons/mail/static/scripts/__init__.py
similarity index 100%
rename from addons/mail_gateway/scripts/__init__.py
rename to addons/mail/static/scripts/__init__.py
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
similarity index 86%
rename from addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
rename to addons/mail/static/scripts/openerp_mailgate.py
index bcff408ef46..68ae20d35e3 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail/static/scripts/openerp_mailgate.py
@@ -46,13 +46,14 @@ class DefaultConfig(object):
     OPENERP_PORT = 8069
     OPENERP_DEFAULT_DATABASE = 'openerp'
     MAIL_ERROR = 'error@example.com'
-    MAIL_SERVER = 'localhost'
-    MAIL_ADMINS = ('admin@example.com',)
+    MAIL_SERVER = 'smtp.example.com'
+    MAIL_SERVER_PORT = 25
+    MAIL_ADMINS = ('info@example.com',)
 
 config = DefaultConfig()
 
 
-def send_mail(_from_, to_, subject, text, files=None, server=config.MAIL_SERVER):
+def send_mail(_from_, to_, subject, text, files=None, server=config.MAIL_SERVER, port=config.MAIL_SERVER_PORT):
     assert isinstance(to_, (list, tuple))
 
     if files is None:
@@ -74,7 +75,7 @@ def send_mail(_from_, to_, subject, text, files=None, server=config.MAIL_SERVER)
                        % file_name)
         msg.attach(part)
 
-    smtp = smtplib.SMTP(server)
+    smtp = smtplib.SMTP(server, port=port)
     smtp.sendmail(_from_, to_, msg.as_string() )
     smtp.close()
 
@@ -104,16 +105,15 @@ class EmailParser(object):
         self.email_default = email_default
 
 
-    def parse(self, message, custom_values=None):
-        if custom_values is None:
-            custom_values = {}
+    def parse(self, message, custom_values=None, save_original=None):
         # pass message as bytes because we don't know its encoding until we parse its headers
         # and hence can't convert it to utf-8 for transport
-        self.rpc('email.server.tools',
-                 'process_email',
-                 self.model,
-                 xmlrpclib.Binary(message),
-                 custom_values)
+        res_id = self.rpc('mail.thread',
+                          'message_process',
+                          self.model,
+                          xmlrpclib.Binary(message),
+                          custom_values or {},
+                          save_original or False)
 
 def configure_parser():
     parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.1')
@@ -145,6 +145,10 @@ def configure_parser():
     parser.add_option("--custom-values", dest="custom_values",
                       help="Add Custom Values to the object",
                       default=None)
+    parser.add_option("-s", dest="save_original",
+                      action="store_true",
+                      help="Attach a copy of original email to the message entry",
+                      default=False)
 
     return parser
 
@@ -171,10 +175,11 @@ def main():
     try:
         custom_values = dict(eval(options.custom_values or {} ))
     except:
-        pass
+        import traceback
+        traceback.print_exc()
 
     try:
-        email_parser.parse(msg_txt, custom_values)
+        email_parser.parse(msg_txt, custom_values, options.save_original or False)
     except Exception:
         msg = '\n'.join([
             'parameters',
@@ -191,6 +196,7 @@ def main():
             config.MAIL_ADMINS,
             subject, msg, files=[('message.txt', msg_txt)]
         )
+        sys.stderr.write("Failed to deliver email to OpenERP Server, sending error notification to %s\n" % config.MAIL_ADMINS)
 
 if __name__ == '__main__':
     main()
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/__init__.py b/addons/mail/static/scripts/openerp_mailgate/__init__.py
similarity index 100%
rename from addons/mail_gateway/scripts/openerp_mailgate/__init__.py
rename to addons/mail/static/scripts/openerp_mailgate/__init__.py
diff --git a/addons/mail/wizard/__init__.py b/addons/mail/wizard/__init__.py
new file mode 100644
index 00000000000..88b9581f68e
--- /dev/null
+++ b/addons/mail/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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/>
+#
+##############################################################################
+
+import mail_compose_message
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..93bf0b004d8
--- /dev/null
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -0,0 +1,272 @@
+# -*- 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/>
+#
+##############################################################################
+
+import re
+
+import tools
+from mail.mail_message import to_email
+from osv import osv
+from osv import fields
+from tools.safe_eval import safe_eval as eval
+from tools.safe_eval import literal_eval
+from tools.translate import _
+
+# main mako-like expression pattern
+EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
+
+class mail_compose_message(osv.osv_memory):
+    """Generic E-mail composition wizard. This wizard is meant to be inherited
+       at model and view level to provide specific wizard 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 mode and pre-populated with the original quote.
+                      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. Recipients will be derived from the
+                      records determined via  ``context['active_model']`` and
+                      ``context['active_ids']``.
+         * 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'``.
+    """
+    _name = 'mail.compose.message'
+    _inherit = 'mail.message.common'
+    _description = 'E-mail composition wizard'
+
+    def default_get(self, cr, uid, fields, context=None):
+        """Overridden to provide specific defaults depending on the context
+           parameters.
+
+           :param dict context: several context values will modify the behavior
+                                of the wizard, cfr. the class description.
+        """
+        if context is None:
+            context = {}
+        result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
+        vals = {}
+        reply_mode = context.get('mail.compose.message.mode') == 'reply'
+        if (not reply_mode) and context.get('active_model') and context.get('active_id'):
+            # normal mode when sending an email related to any document, as specified by
+            # active_model and active_id in context
+            vals = self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context)
+        elif reply_mode and context.get('active_id'):
+            # reply mode, consider active_id is the ID of a mail.message to which we're
+            # replying
+            vals = self.get_message_data(cr, uid, int(context['active_id']), context)
+        else:
+            # default mode
+            result['model'] = context.get('active_model', False)
+        for field in vals:
+            if field in fields:
+                result.update({field : vals[field]})
+
+        # link to model and record if not done yet
+        if not result.get('model') or not result.get('res_id'):
+            active_model = context.get('active_model')
+            res_id = context.get('active_id')
+            if active_model and active_model not in (self._name, 'mail.message'):
+                result['model'] = active_model
+                if res_id:
+                    result['res_id'] = res_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)
+            result['email_from'] = current_user.user_email or False
+        return result
+
+    _columns = {
+        '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"),
+        'filter_id': fields.many2one('ir.filters', 'Filters'),
+    }
+
+    def get_value(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.
+        """
+        return {}
+
+    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).
+           Should not be called unless ``context['mail.compose.message.mode'] == 'reply'``.
+
+           :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.
+                                When calling this method, the ``'mail'`` value
+                                in the context should be ``'reply'``.
+        """
+        if context is None:
+            context = {}
+        result = {}
+        mail_message = self.pool.get('mail.message')
+        if message_id:
+            message_data = mail_message.browse(cr, uid, message_id, context)
+            subject = tools.ustr(message_data.subject or '')
+            # we use the plain text version of the original mail, by default,
+            # as it is easier to quote than the HTML version.
+            # XXX TODO: make it possible to switch to HTML on the fly
+            current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            body = message_data.body_text or current_user.signature 
+            if context.get('mail.compose.message.mode') == 'reply':
+                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'))}
+                quoted_body = '> %s' % tools.ustr(body.replace('\n', "\n> ") or '')
+                body = '\n'.join(["\n", (sent_date + sender), quoted_body])
+                body += "\n" + current_user.signature
+                re_prefix = _("Re:")
+                if not (subject.startswith('Re:') or subject.startswith(re_prefix)):
+                    subject = "%s %s" % (re_prefix, subject)
+            result.update({
+                    'subtype' : 'plain', # default to the text version due to quoting
+                    'body_text' : body,
+                    'subject' : subject,
+                    'attachment_ids' : [],
+                    'model' : message_data.model or False,
+                    'res_id' : message_data.res_id or False,
+                    'email_from' : current_user.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' :  message_data.message_id or False,
+                    'references' : message_data.references and tools.ustr(message_data.references) or False,
+                })
+        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.
+
+           :param dict context: several context values will modify the behavior
+                                of the wizard, cfr. the class description.
+        '''
+        if context is None:
+            context = {}
+        mail_message = self.pool.get('mail.message')
+        for mail in self.browse(cr, uid, ids, context=context):
+            attachment = {}
+            for attach in mail.attachment_ids:
+                attachment[attach.datas_fname] = attach.datas
+            references = None
+            headers = {}
+
+            body =  mail.body_html if mail.subtype == 'html' else mail.body_text
+
+            # Reply Email
+            if context.get('mail.compose.message.mode') == 'reply' and mail.message_id:
+                references = (mail.references or '') + " " + mail.message_id
+                headers['In-Reply-To'] = mail.message_id
+
+            if context.get('mail.compose.message.mode') == 'mass_mail':
+                # Mass mailing: must render the template patterns
+                if context.get('active_ids') and context.get('active_model'):
+                    active_ids = context['active_ids']
+                    active_model = context['active_model']
+                else:
+                    active_model = mail.model
+                    active_model_pool = self.pool.get(active_model)
+                    active_ids = active_model_pool.search(cr, uid, literal_eval(mail.filter_id.domain), context=literal_eval(mail.filter_id.context))
+
+                for active_id in active_ids:
+                    subject = self.render_template(cr, uid, mail.subject, active_model, active_id)
+                    rendered_body = self.render_template(cr, uid, body, active_model, active_id)
+                    email_from = self.render_template(cr, uid, mail.email_from, active_model, active_id)
+                    email_to = self.render_template(cr, uid, mail.email_to, active_model, active_id)
+                    email_cc = self.render_template(cr, uid, mail.email_cc, active_model, active_id)
+                    email_bcc = self.render_template(cr, uid, mail.email_bcc, active_model, active_id)
+                    reply_to = self.render_template(cr, uid, mail.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.
+                    mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
+                        model=mail.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
+                        attachments=attachment, references=references, res_id=int(mail.res_id),
+                        subtype=mail.subtype, headers=headers, context=context)
+            else:
+                # normal mode - no mass-mailing
+                msg_id = mail_message.schedule_with_attach(cr, uid, mail.email_from, to_email(mail.email_to), mail.subject, body,
+                    model=mail.model, email_cc=to_email(mail.email_cc), email_bcc=to_email(mail.email_bcc), reply_to=mail.reply_to,
+                    attachments=attachment, references=references, res_id=int(mail.res_id),
+                    subtype=mail.subtype, headers=headers, context=context)
+                # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
+                mail_message.send(cr, uid, [msg_id], context)
+
+        return {'type': 'ir.actions.act_window_close'}
+
+    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:
+
+                * ``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.
+        """
+        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)
+        return template and EXPRESSION_PATTERN.sub(merge, template)
+
+# 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
new file mode 100644
index 00000000000..d559d679c8b
--- /dev/null
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+        <record model="ir.ui.view" id="email_compose_message_wizard_form">
+            <field name="name">mail.compose.message.form</field>
+            <field name="model">mail.compose.message</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Compose Email">
+                    <group col="6" colspan="4">
+                        <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" 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"/>
+                        <field name="references" invisible="1"/>
+                        <field name="message_id" invisible="1"/>
+                    </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>
+                    <group col="4" colspan="4">
+                        <label string="" name="placeholder" colspan="1"/>
+                        <button icon="gtk-close" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
+                    </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>
+            <field name="src_model">mail.compose.message</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+	    <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
+	    <act_window name="Mass Mailing"
+	            res_model="mail.compose.message"
+	            src_model="res.partner"
+	            view_mode="form"
+	            target="new"
+	            key2="client_action_multi"
+	            id="base.action_partner_mass_mail"
+	            context="{'mail.compose.message.mode':'mass_mail'}"/>
+	</data>
+</openerp>
diff --git a/addons/mail_gateway/i18n/bg.po b/addons/mail_gateway/i18n/bg.po
index e02faf9df22..4522a899341 100644
--- a/addons/mail_gateway/i18n/bg.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/ca.po b/addons/mail_gateway/i18n/ca.po
index a669c061652..30addc4b717 100644
--- a/addons/mail_gateway/i18n/ca.po
+++ b/addons/mail_gateway/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: 2011-05-27 04:46+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/de.po b/addons/mail_gateway/i18n/de.po
index 474c83c1c4e..8e8c743a3ae 100644
--- a/addons/mail_gateway/i18n/de.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
@@ -357,21 +357,6 @@ msgstr "Betreff"
 msgid "Message Id in Email Server."
 msgstr "Nachricht ID Email Server."
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
 #, python-format
 #~ msgid " wrote on "
 #~ msgstr " schreibe zu "
@@ -379,12 +364,3 @@ msgstr "Nachricht ID Email Server."
 #, python-format
 #~ msgid " on "
 #~ msgstr " EMail von "
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/mail_gateway/i18n/es.po b/addons/mail_gateway/i18n/es.po
index c842418e2fb..40a6afe9644 100644
--- a/addons/mail_gateway/i18n/es.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
@@ -359,27 +359,6 @@ msgstr "Asunto"
 msgid "Message Id in Email Server."
 msgstr "ID del mensaje en el servidor de correo."
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no vá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 "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #, python-format
 #~ msgid " on "
 #~ msgstr " en "
diff --git a/addons/mail_gateway/i18n/es_PY.po b/addons/mail_gateway/i18n/es_PY.po
index 837935c8151..a41a78c574c 100644
--- a/addons/mail_gateway/i18n/es_PY.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/fi.po b/addons/mail_gateway/i18n/fi.po
index fb05ccd2184..838a4d488b9 100644
--- a/addons/mail_gateway/i18n/fi.po
+++ b/addons/mail_gateway/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: 2011-06-21 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/fr.po b/addons/mail_gateway/i18n/fr.po
index 437fdf7909c..e62b6193089 100644
--- a/addons/mail_gateway/i18n/fr.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/gl.po b/addons/mail_gateway/i18n/gl.po
index 0dfa33e5ce1..8b57ccda6b5 100644
--- a/addons/mail_gateway/i18n/gl.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/hu.po b/addons/mail_gateway/i18n/hu.po
index 83b26055a46..ac884b9410f 100644
--- a/addons/mail_gateway/i18n/hu.po
+++ b/addons/mail_gateway/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-21 12:01+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/it.po b/addons/mail_gateway/i18n/it.po
index 4341b6b3fe9..d4eade16f0a 100644
--- a/addons/mail_gateway/i18n/it.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/lt.po b/addons/mail_gateway/i18n/lt.po
index 8890e224050..01aeac63913 100644
--- a/addons/mail_gateway/i18n/lt.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/lv.po b/addons/mail_gateway/i18n/lv.po
index a162bae8d37..bcd127afcb6 100644
--- a/addons/mail_gateway/i18n/lv.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/nl.po b/addons/mail_gateway/i18n/nl.po
index d5d6b4b63ad..4424ae794ea 100644
--- a/addons/mail_gateway/i18n/nl.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
@@ -358,23 +358,6 @@ msgstr "Onderwerp"
 msgid "Message Id in Email Server."
 msgstr "Bericht Id in email server."
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
 #, python-format
 #~ msgid " wrote on "
 #~ msgstr " schreef op "
@@ -382,6 +365,3 @@ msgstr "Bericht Id in email server."
 #, python-format
 #~ msgid " on "
 #~ msgstr " op "
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/mail_gateway/i18n/pl.po b/addons/mail_gateway/i18n/pl.po
index bc9ed5ea2e9..b7639b39098 100644
--- a/addons/mail_gateway/i18n/pl.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/pt.po b/addons/mail_gateway/i18n/pt.po
index 01fb93fdb4d..bcabec471ee 100644
--- a/addons/mail_gateway/i18n/pt.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/pt_BR.po b/addons/mail_gateway/i18n/pt_BR.po
index eb0df316478..b962ba53772 100644
--- a/addons/mail_gateway/i18n/pt_BR.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
@@ -358,31 +358,10 @@ msgstr "Assunto"
 msgid "Message Id in Email Server."
 msgstr "Id da Mensagem no Servidor de Email"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido 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 pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
 #, python-format
 #~ msgid " wrote on "
 #~ msgstr " escrito em "
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
 #, python-format
 #~ msgid " on "
 #~ msgstr " em "
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/mail_gateway/i18n/ro.po b/addons/mail_gateway/i18n/ro.po
index 2acd5749dca..11b9993dc24 100644
--- a/addons/mail_gateway/i18n/ro.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/ru.po b/addons/mail_gateway/i18n/ru.po
index 5e6933411da..64c88beabe2 100644
--- a/addons/mail_gateway/i18n/ru.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
@@ -80,17 +80,17 @@ msgstr "Ошибка! Вы не можете создать рекурсивно
 #. module: mail_gateway
 #: help:mailgate.message,message_id:0
 msgid "Message Id on Email."
-msgstr ""
+msgstr "Идентификатор сообщения эл. почты."
 
 #. module: mail_gateway
 #: help:mailgate.message,email_to:0
 msgid "Email Recipients"
-msgstr ""
+msgstr "Получатели эл. почты"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Details"
-msgstr ""
+msgstr "Подробности"
 
 #. module: mail_gateway
 #: view:mailgate.thread:0
@@ -100,7 +100,7 @@ msgstr ""
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_email_server_tools
 msgid "Email Server Tools"
-msgstr ""
+msgstr "Инструменты почтового сервера"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -112,7 +112,7 @@ msgstr ""
 #: view:mailgate.message:0
 #: field:mailgate.message,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:250
@@ -125,12 +125,12 @@ msgstr ""
 #: field:mailgate.message,description:0
 #: field:mailgate.message,message:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: mail_gateway
 #: field:mailgate.message,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Кому"
 
 #. module: mail_gateway
 #: help:mailgate.message,references:0
@@ -140,27 +140,27 @@ msgstr ""
 #. module: mail_gateway
 #: help:mailgate.message,email_cc:0
 msgid "Carbon Copy Email Recipients"
-msgstr ""
+msgstr "Получатели копий эл. письма"
 
 #. module: mail_gateway
 #: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
 msgid "Email Gateway System"
-msgstr ""
+msgstr "Система шлюзов эл. почты"
 
 #. module: mail_gateway
 #: field:mailgate.message,date:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: mail_gateway
 #: field:mailgate.message,model:0
 msgid "Object Name"
-msgstr ""
+msgstr "Название объекта"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Имя партнера"
 
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
@@ -171,7 +171,7 @@ msgstr ""
 #: code:addons/mail_gateway/mail_gateway.py:247
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Предложение"
 
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
@@ -179,13 +179,13 @@ msgstr ""
 #: view:mailgate.message:0
 #: field:res.partner,emails:0
 msgid "Emails"
-msgstr ""
+msgstr "Эл. почта"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:252
 #, python-format
 msgid "Stage"
-msgstr ""
+msgstr "Этап"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:250
@@ -196,49 +196,49 @@ msgstr ""
 #. module: mail_gateway
 #: help:mailgate.message,email_from:0
 msgid "Email From"
-msgstr ""
+msgstr "Эл. письмо от"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Thread"
-msgstr ""
+msgstr "Цепочка"
 
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr ""
+msgstr "Соообщение почтового шлюза"
 
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
 #: field:mailgate.thread,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: mail_gateway
 #: field:mailgate.message,user_id:0
 msgid "User Responsible"
-msgstr ""
+msgstr "Ответственный пользователь"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:248
 #, python-format
 msgid "Converted to Opportunity"
-msgstr ""
+msgstr "Преобразовано в предложение"
 
 #. module: mail_gateway
 #: field:mailgate.message,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Скрытая копия"
 
 #. module: mail_gateway
 #: field:mailgate.message,history:0
 msgid "Is History?"
-msgstr ""
+msgstr "История?"
 
 #. module: mail_gateway
 #: help:mailgate.message,email_bcc:0
 msgid "Blind Carbon Copy Email Recipients"
-msgstr ""
+msgstr "Получатели скрытых копий эл. писем"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -251,12 +251,12 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "History"
-msgstr ""
+msgstr "История"
 
 #. module: mail_gateway
 #: field:mailgate.message,references:0
 msgid "References"
-msgstr ""
+msgstr "Ссылки"
 
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_mailgate_thread
@@ -270,22 +270,22 @@ msgstr ""
 #: field:mailgate.message,attachment_ids:0
 #: view:mailgate.thread:0
 msgid "Attachments"
-msgstr ""
+msgstr "Прикрепленные файлы"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Open Document"
-msgstr ""
+msgstr "Открыть документ"
 
 #. module: mail_gateway
 #: view:mailgate.thread:0
 msgid "Email Details"
-msgstr ""
+msgstr "Детали эл. письма"
 
 #. module: mail_gateway
 #: field:mailgate.message,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Копия"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:254
@@ -301,13 +301,13 @@ msgstr "Месяц"
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Email Search"
-msgstr ""
+msgstr "Искать эл. почту"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:561
 #, python-format
 msgid "receive"
-msgstr ""
+msgstr "получать"
 
 #. module: mail_gateway
 #: model:ir.module.module,description:mail_gateway.module_meta_information
@@ -316,17 +316,21 @@ msgid ""
 "    * History for Emails\n"
 "    * Easy Integration with any Module"
 msgstr ""
+"Общая система шлюзов электронной почты позволяет отправлять и получать "
+"электронную почту\n"
+"    * История электронных писем\n"
+"    * Легкая интеграция с любым модулем"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:255
 #, python-format
 msgid "Changed Status to: "
-msgstr ""
+msgstr "Статус изменен на: "
 
 #. module: mail_gateway
 #: field:mailgate.message,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "Вывести текст"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -337,7 +341,7 @@ msgstr "Владелец"
 #: code:addons/mail_gateway/mail_gateway.py:253
 #, python-format
 msgid "Changed Stage to: "
-msgstr ""
+msgstr "Этап изменен на: "
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -353,4 +357,8 @@ msgstr "Тема"
 #. module: mail_gateway
 #: help:mailgate.message,ref_id:0
 msgid "Message Id in Email Server."
-msgstr ""
+msgstr "Идентификатор сообщения на почтовом сервере."
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " на "
diff --git a/addons/mail_gateway/i18n/sl.po b/addons/mail_gateway/i18n/sl.po
index fbcaaad88b8..1d87d467225 100644
--- a/addons/mail_gateway/i18n/sl.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/sr@latin.po b/addons/mail_gateway/i18n/sr@latin.po
index e7fea3322c3..70dd71f5058 100644
--- a/addons/mail_gateway/i18n/sr@latin.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/sv.po b/addons/mail_gateway/i18n/sv.po
index d76b5c31fd7..068a42fbc4c 100644
--- a/addons/mail_gateway/i18n/sv.po
+++ b/addons/mail_gateway/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
diff --git a/addons/mail_gateway/i18n/zh_CN.po b/addons/mail_gateway/i18n/zh_CN.po
index 5f241a65aef..75b4b81ebbf 100644
--- a/addons/mail_gateway/i18n/zh_CN.po
+++ b/addons/mail_gateway/i18n/zh_CN.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
 msgid "Resource ID"
-msgstr "资源标识符"
+msgstr "资源ID"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:68
@@ -44,22 +44,22 @@ msgstr "打开附件"
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Message Details"
-msgstr "邮件详情"
+msgstr "消息详情"
 
 #. module: mail_gateway
 #: field:mailgate.message,message_id:0
 msgid "Message Id"
-msgstr "信件 ID"
+msgstr "消息ID"
 
 #. module: mail_gateway
 #: field:mailgate.message,ref_id:0
 msgid "Reference Id"
-msgstr ""
+msgstr "相关ID"
 
 #. module: mail_gateway
 #: view:mailgate.thread:0
 msgid "Mailgateway History"
-msgstr "邮件网关历史记录"
+msgstr "邮件网关日志"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:249
@@ -70,7 +70,7 @@ msgstr "备注"
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: mail_gateway
 #: constraint:res.partner:0
@@ -80,12 +80,12 @@ msgstr "错误！您不能创建递归的相关成员。"
 #. module: mail_gateway
 #: help:mailgate.message,message_id:0
 msgid "Message Id on Email."
-msgstr "Email的邮件标识"
+msgstr "电子邮件的消息ID"
 
 #. module: mail_gateway
 #: help:mailgate.message,email_to:0
 msgid "Email Recipients"
-msgstr ""
+msgstr "邮件收件人"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -95,7 +95,7 @@ msgstr "详细信息"
 #. module: mail_gateway
 #: view:mailgate.thread:0
 msgid "Mailgate History"
-msgstr "邮件网关历史记录"
+msgstr "邮件网关日志"
 
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_email_server_tools
@@ -105,7 +105,7 @@ msgstr "邮件服务器工具"
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Email Followers"
-msgstr ""
+msgstr "电子邮件追随者"
 
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_res_partner
@@ -135,12 +135,12 @@ msgstr "收件人"
 #. module: mail_gateway
 #: help:mailgate.message,references:0
 msgid "References emails."
-msgstr ""
+msgstr "相关的邮件列表"
 
 #. module: mail_gateway
 #: help:mailgate.message,email_cc:0
 msgid "Carbon Copy Email Recipients"
-msgstr ""
+msgstr "抄送邮件的收件人"
 
 #. module: mail_gateway
 #: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
@@ -165,7 +165,7 @@ msgstr "业务伙伴名称"
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
 msgid "Mailgateway Threads"
-msgstr ""
+msgstr "邮件网关线程"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:247
@@ -191,28 +191,28 @@ msgstr "阶段"
 #: code:addons/mail_gateway/mail_gateway.py:250
 #, python-format
 msgid " added note on "
-msgstr ""
+msgstr " 增加备注在 "
 
 #. module: mail_gateway
 #: help:mailgate.message,email_from:0
 msgid "Email From"
-msgstr "发件人"
+msgstr "邮件发件人"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Thread"
-msgstr ""
+msgstr "线程"
 
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr "邮件网关信件"
+msgstr "邮件网关消息"
 
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
 #: field:mailgate.thread,message_ids:0
 msgid "Messages"
-msgstr "信件"
+msgstr "消息"
 
 #. module: mail_gateway
 #: field:mailgate.message,user_id:0
@@ -233,17 +233,17 @@ msgstr "密件抄送"
 #. module: mail_gateway
 #: field:mailgate.message,history:0
 msgid "Is History?"
-msgstr ""
+msgstr "是日志"
 
 #. module: mail_gateway
 #: help:mailgate.message,email_bcc:0
 msgid "Blind Carbon Copy Email Recipients"
-msgstr ""
+msgstr "密件抄送的收件人"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "mailgate message"
-msgstr ""
+msgstr "邮件网关消息"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:148
@@ -251,18 +251,18 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: mail_gateway
 #: field:mailgate.message,references:0
 msgid "References"
-msgstr "参照"
+msgstr "引用"
 
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_mailgate_thread
 #: view:mailgate.thread:0
 msgid "Mailgateway Thread"
-msgstr ""
+msgstr "邮件网关线程"
 
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
@@ -275,7 +275,7 @@ msgstr "附件"
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Open Document"
-msgstr "打开单据"
+msgstr "打开文档"
 
 #. module: mail_gateway
 #: view:mailgate.thread:0
@@ -315,7 +315,7 @@ msgid ""
 "The generic email gateway system allows to send and receive emails\n"
 "    * History for Emails\n"
 "    * Easy Integration with any Module"
-msgstr ""
+msgstr "通过电子邮件网关系统允许你发送和接受邮件"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:255
@@ -331,7 +331,7 @@ msgstr "显示文本"
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Owner"
-msgstr "属主"
+msgstr "所有者"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:253
@@ -342,7 +342,7 @@ msgstr "状态阶段为： "
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Message"
-msgstr "信件"
+msgstr "消息"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -353,4 +353,12 @@ msgstr "主题"
 #. module: mail_gateway
 #: help:mailgate.message,ref_id:0
 msgid "Message Id in Email Server."
-msgstr ""
+msgstr "电子邮件消息ID"
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " 写在 "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " 在 "
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
deleted file mode 100644
index 3afc3fb6ba0..00000000000
--- a/addons/mail_gateway/mail_gateway.py
+++ /dev/null
@@ -1,603 +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 time
-import tools
-import binascii
-import email
-from email.header import decode_header
-from email.utils import parsedate
-import base64
-import re
-from tools.translate import _
-import logging
-import xmlrpclib
-
-_logger = logging.getLogger('mailgate')
-
-class mailgate_thread(osv.osv):
-    '''
-    Mailgateway Thread
-    '''
-    _name = 'mailgate.thread'
-    _description = 'Mailgateway Thread'
-
-    _columns = {
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', readonly=True),
-    }
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        """
-        Overrides orm copy 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 id: Id of mailgate thread
-        @param default: Dictionary of default values for copy.
-        @param context: A standard dictionary for contextual values
-        """
-        if default is None:
-            default = {}
-
-        default.update({
-            'message_ids': [],
-            'date_closed': False,
-            'date_open': False
-        })
-        return super(mailgate_thread, self).copy(cr, uid, id, default, context=context)
-
-    def message_new(self, cr, uid, msg, context):
-        raise Exception, _('Method is not implemented')
-
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
-        raise Exception, _('Method is not implemented')
-
-    def message_followers(self, cr, uid, ids, context=None):
-        """ Get a list of emails of the people following this thread
-        """
-        res = {}
-        if isinstance(ids, (str, int, long)):
-            ids = [long(ids)]
-        for thread in self.browse(cr, uid, ids, context=context):
-            l=[]
-            for message in thread.message_ids:
-                l.append((message.user_id and message.user_id.user_email) or '')
-                l.append(message.email_from or '')
-                l.append(message.email_cc or '')
-            res[thread.id] = l
-        return res
-
-    def msg_send(self, cr, uid, id, *args, **argv):
-        raise Exception, _('Method is not implemented')
-
-    def history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, \
-                    email_from=False, message_id=False, references=None, attach=None, email_cc=None, \
-                    email_bcc=None, email_date=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 cases: a browse record list
-        @param keyword: Subject of the history item
-        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
-        @param email: Email-To / Recipient address
-        @param email_from: Email From / Sender address if any
-        @param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
-        @param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
-        @param email_date: Email Date string if different from now, in server Timezone
-        @param details: Description, Details of case history if any
-        @param atach: Attachment sent in email
-        @param context: A standard dictionary for contextual values"""
-        if context is None:
-            context = {}
-        if attach is None:
-            attach = []
-
-        if email_date:
-            edate = parsedate(email_date)
-            if edate is not None:
-                email_date = time.strftime('%Y-%m-%d %H:%M:%S', edate)
-
-        # The mailgate sends the ids of the cases and not the object list
-
-        if all(isinstance(case_id, (int, long)) for case_id in cases):
-            cases = self.browse(cr, uid, cases, context=context)
-
-        att_obj = self.pool.get('ir.attachment')
-        obj = self.pool.get('mailgate.message')
-
-        for case in cases:
-            attachments = []
-            for att in attach:
-                att_ids = att_obj.search(cr, uid, [('name','=',att[0]), ('res_id', '=', case.id)])
-                if att_ids:
-                    attachments.append(att_ids[0])
-                else:
-                    attachments.append(att_obj.create(cr, uid, {'res_model':case._name,'res_id':case.id, 'name': att[0], 'datas': base64.encodestring(att[1])}))
-
-            partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
-            if not partner_id and case._name == 'res.partner':
-                partner_id = case.id
-            data = {
-                'name': keyword,
-                'user_id': uid,
-                'model' : case._name,
-                'partner_id': partner_id,
-                'res_id': case.id,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'message_id': message_id,
-                'description': details,
-                'attachment_ids': [(6, 0, attachments)]
-            }
-
-            if history:
-                for param in (email, email_cc, email_bcc):
-                    if isinstance(param, list):
-                        param = ", ".join(param)
-
-                data = {
-                    'name': subject or _('History'),
-                    'history': True,
-                    'user_id': uid,
-                    'model' : case._name,
-                    'res_id': case.id,
-                    'date': email_date or time.strftime('%Y-%m-%d %H:%M:%S'),
-                    'description': details or (hasattr(case, 'description') and case.description or False),
-                    'email_to': email,
-                    'email_from': email_from or \
-                        (hasattr(case, 'user_id') and case.user_id and case.user_id.user_email),
-                    'email_cc': email_cc,
-                    'email_bcc': email_bcc,
-                    'partner_id': partner_id,
-                    'references': references,
-                    'message_id': message_id,
-                    'attachment_ids': [(6, 0, attachments)]
-                }
-
-            obj.create(cr, uid, data, context=context)
-        return True
-mailgate_thread()
-
-def format_date_tz(date, tz=None):
-    if not date:
-        return 'n/a'
-    format = tools.DEFAULT_SERVER_DATETIME_FORMAT
-    return tools.server_to_local_timestamp(date, format, format, tz)
-
-class mailgate_message(osv.osv):
-    '''
-    Mailgateway Message
-    '''
-    def open_document(self, cr, uid, ids, context=None):
-        """ To Open Document
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID of messages
-        @param context: A standard dictionary
-        """
-        action_data = False
-        if ids:
-            message_id = ids[0]
-            mailgate_data = self.browse(cr, uid, message_id, context=context)
-            model = mailgate_data.model
-            res_id = mailgate_data.res_id
-
-            action_pool = self.pool.get('ir.actions.act_window')
-            action_ids = action_pool.search(cr, uid, [('res_model', '=', model)])
-            if action_ids:
-                action_data = action_pool.read(cr, uid, action_ids[0], context=context)
-                action_data.update({
-                    'domain' : "[('id','=',%d)]"%(res_id),
-                    'nodestroy': True,
-                    'context': {}
-                    })
-        return action_data
-
-    def open_attachment(self, cr, uid, ids, context=None):
-        """ To Open attachments
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID of messages
-        @param context: A standard dictionary
-        """
-        action_data = False
-        action_pool = self.pool.get('ir.actions.act_window')
-        message_pool = self.browse(cr ,uid, ids, context=context)[0]
-        att_ids = [x.id for x in message_pool.attachment_ids]
-        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')])
-        if action_ids:
-            action_data = action_pool.read(cr, uid, action_ids[0], context=context)
-            action_data.update({
-                'domain': [('id','in',att_ids)],
-                'nodestroy': True
-                })
-        return action_data
-
-    def truncate_data(self, cr, uid, data, context=None):
-        data_list = data and data.split('\n') or []
-        if len(data_list) > 3:
-            res = '\n\t'.join(data_list[:3]) + '...'
-        else:
-            res = '\n\t'.join(data_list)
-        return res
-
-    def _get_display_text(self, cr, uid, ids, name, arg, context=None):
-        if context is None:
-            context = {}
-        tz = context.get('tz')
-        result = {}
-        for message in self.browse(cr, uid, ids, context=context):
-            msg_txt = ''
-            if message.history:
-                msg_txt += _('%s wrote on %s: \n Subject: %s \n\t') % (message.email_from or '/', format_date_tz(message.date, tz), message.name)
-                if message.description:
-                    msg_txt += self.truncate_data(cr, uid, message.description, context=context)
-            else:
-                msg_txt = _('%s on %s:\n\t') % (message.user_id.name or '/', format_date_tz(message.date, tz))
-                msg_txt += message.name
-            result[message.id] = msg_txt
-        return result
-
-    _name = 'mailgate.message'
-    _description = 'Mailgateway Message'
-    _order = 'date desc'
-    _columns = {
-        'name':fields.text('Subject', readonly=True),
-        'model': fields.char('Object Name', size=128, select=1, readonly=True),
-        'res_id': fields.integer('Resource ID', select=1, readonly=True),
-        'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'date': fields.datetime('Date', readonly=True),
-        'history': fields.boolean('Is History?', readonly=True),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'message': fields.text('Message', readonly=True),
-        'email_from': fields.char('From', size=128, help="Email From", readonly=True),
-        'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
-        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
-        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
-        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
-        'references': fields.text('References', readonly=True, help="References emails."),
-        'description': fields.text('Description', readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', required=False),
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
-        'display_text': fields.function(_get_display_text, type='text', size="512", string='Display Text'),
-    }
-
-    def init(self, cr):
-        cr.execute("""SELECT indexname
-                      FROM pg_indexes
-                      WHERE indexname = 'mailgate_message_res_id_model_idx'""")
-        if not cr.fetchone():
-            cr.execute("""CREATE INDEX mailgate_message_res_id_model_idx
-                          ON mailgate_message (model, res_id)""")
-
-mailgate_message()
-
-class mailgate_tool(osv.osv_memory):
-
-    _name = 'email.server.tools'
-    _description = "Email Server Tools"
-
-    def _decode_header(self, text):
-        """Returns unicode() string conversion of the the given encoded smtp header"""
-        if text:
-            text = decode_header(text.replace('\r', ''))
-            return ''.join([tools.ustr(x[0], x[1]) for x in text])
-
-    def to_email(self,text):
-        return re.findall(r'([^ ,<@]+@[^> ,]+)',text)
-
-    def history(self, cr, uid, model, res_ids, msg, attach, context=None):
-        """This function creates history for mails fetched
-        @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: OpenObject Model
-        @param res_ids: Ids of the record of OpenObject model created
-        @param msg: Email details
-        @param attach: Email attachments
-        """
-        if isinstance(res_ids, (int, long)):
-            res_ids = [res_ids]
-
-        msg_pool = self.pool.get('mailgate.message')
-        for res_id in res_ids:
-            case = self.pool.get(model).browse(cr, uid, res_id, context=context)
-            partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
-            if not partner_id and model == 'res.partner':
-                partner_id = res_id
-            msg_data = {
-                'name': msg.get('subject', 'No subject'),
-                'date': msg.get('date'),
-                'description': msg.get('body', msg.get('from')),
-                'history': True,
-                'partner_id': partner_id,
-                'model': model,
-                'email_cc': msg.get('cc'),
-                'email_from': msg.get('from'),
-                'email_to': msg.get('to'),
-                'message_id': msg.get('message-id'),
-                'references': msg.get('references') or msg.get('in-reply-to'),
-                'res_id': res_id,
-                'user_id': uid,
-                'attachment_ids': [(6, 0, attach)]
-            }
-            msg_pool.create(cr, uid, msg_data, context=context)
-        return True
-
-    def email_forward(self, cr, uid, model, res_ids, msg, email_error=False, context=None):
-        """Sends an email to all people following the thread
-        @param res_id: Id of the record of OpenObject model created from the email message
-        @param msg: email.message.Message to forward
-        @param email_error: Default Email address in case of any Problem
-        """
-        model_pool = self.pool.get(model)
-
-        for res in model_pool.browse(cr, uid, res_ids, context=context):
-            message_followers = model_pool.message_followers(cr, uid, [res.id])[res.id]
-            message_followers_emails = self.to_email(','.join(filter(None, message_followers)))
-            message_recipients = self.to_email(','.join(filter(None,
-                                                         [self._decode_header(msg['from']),
-                                                         self._decode_header(msg['to']),
-                                                         self._decode_header(msg['cc'])])))
-            message_forward = [i for i in message_followers_emails if (i and (i not in message_recipients))]
-
-            if message_forward:
-                # TODO: we need an interface for this for all types of objects, not just leads
-                if hasattr(res, 'section_id'):
-                    del msg['reply-to']
-                    msg['reply-to'] = res.section_id.reply_to
-
-                smtp_from = self.to_email(msg['from'])
-                if not tools.misc._email_send(smtp_from, message_forward, msg, openobject_id=res.id) 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
-                    tools.misc._email_send(smtp_from, self.to_email(email_error), msg, openobject_id=res.id)
-
-    def process_email(self, cr, uid, model, message, custom_values=None, attach=True, context=None):
-        """This function Processes email and create record for given OpenERP model
-        @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: OpenObject Model
-        @param message: Email details, passed as a string or an xmlrpclib.Binary
-        @param attach: Email attachments
-        @param context: A standard dictionary for contextual values"""
-
-        # 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
-        # convert it to utf-8 for transport between the mailgate script and here.
-        if isinstance(message, xmlrpclib.Binary):
-            message = str(message.data)
-
-        if context is None:
-            context = {}
-
-        if custom_values is None or not isinstance(custom_values, dict):
-            custom_values = {}
-
-        model_pool = self.pool.get(model)
-        res_id = False
-
-        # Create New Record into particular model
-        def create_record(msg):
-            att_ids = []
-            if hasattr(model_pool, 'message_new'):
-                res_id = model_pool.message_new(cr, uid, msg, context=context)
-                if custom_values:
-                    model_pool.write(cr, uid, [res_id], custom_values, context=context)
-            else:
-                data = {
-                    'name': msg.get('subject'),
-                    'email_from': msg.get('from'),
-                    'email_cc': msg.get('cc'),
-                    'user_id': False,
-                    'description': msg.get('body'),
-                    'state' : 'draft',
-                }
-                data.update(self.get_partner(cr, uid, msg.get('from'), context=context))
-                res_id = model_pool.create(cr, uid, data, context=context)
-
-                if attach:
-                    for attachment in msg.get('attachments', []):
-                        data_attach = {
-                            'name': attachment,
-                            'datas': binascii.b2a_base64(str(attachments.get(attachment))),
-                            'datas_fname': attachment,
-                            'description': 'Mail attachment',
-                            'res_model': model,
-                            'res_id': res_id,
-                        }
-                        att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
-
-            return res_id, att_ids
-
-        # 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 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('Message without message-id, generating a random one: %s', message_id)
-
-        fields = msg_txt.keys()
-        msg['id'] = message_id
-        msg['message-id'] = message_id
-
-        if 'Subject' in fields:
-            msg['subject'] = self._decode_header(msg_txt.get('Subject'))
-
-        if 'Content-Type' in fields:
-            msg['content-type'] = msg_txt.get('Content-Type')
-
-        if 'From' in fields:
-            msg['from'] = self._decode_header(msg_txt.get('From'))
-
-        if 'Delivered-To' in fields:
-            msg['to'] = self._decode_header(msg_txt.get('Delivered-To'))
-
-        if 'CC' in fields:
-            msg['cc'] = self._decode_header(msg_txt.get('CC'))
-
-        if 'Reply-to' in fields:
-            msg['reply'] = self._decode_header(msg_txt.get('Reply-To'))
-
-        if 'Date' in fields:
-            msg['date'] = self._decode_header(msg_txt.get('Date'))
-
-        if 'Content-Transfer-Encoding' in fields:
-            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-
-        if 'References' in fields:
-            msg['references'] = msg_txt.get('References')
-
-        if 'In-Reply-To' in fields:
-            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
-
-        if 'X-Priority' in fields:
-            msg['priority'] = msg_txt.get('X-Priority', '3 (Normal)').split(' ')[0]
-
-        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_txt.get('Content-Type', ''):
-                body = tools.html2plaintext(body)
-            msg['body'] = tools.ustr(body, encoding)
-
-        attachments = {}
-        has_plain_text = False
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
-            body = ""
-            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[filename] = content
-                    elif not has_plain_text:
-                        # main content parts should have 'text' maintype
-                        # and no filename. we ignore the html part if
-                        # there is already a plaintext part without filename,
-                        # because presumably these are alternatives.
-                        content = tools.ustr(content, encoding)
-                        if part.get_content_subtype() == 'html':
-                            body = tools.ustr(tools.html2plaintext(content))
-                        elif part.get_content_subtype() == 'plain':
-                            body = content
-                            has_plain_text = True
-                elif part.get_content_maintype() in ('application', 'image'):
-                    if filename and attach:
-                        attachments[filename] = part.get_payload(decode=True)
-                    else:
-                        res = part.get_payload(decode=True)
-                        body += tools.ustr(res, encoding)
-
-            msg['body'] = body
-            msg['attachments'] = attachments
-        res_ids = []
-        attachment_ids = []
-        new_res_id = False
-        if msg.get('references') or msg.get('in-reply-to'):
-            references = msg.get('references') or msg.get('in-reply-to')
-            if '\r\n' in references:
-                references = references.split('\r\n')
-            else:
-                references = references.split(' ')
-            for ref in references:
-                ref = ref.strip()
-                res_id = tools.misc.reference_re.search(ref)
-                if res_id:
-                    res_id = res_id.group(1)
-                else:
-                    res_id = tools.misc.res_re.search(msg['subject'])
-                    if res_id:
-                        res_id = res_id.group(1)
-                if res_id:
-                    res_id = int(res_id)
-                    model_pool = self.pool.get(model)
-                    if model_pool.exists(cr, uid, res_id):
-                        res_ids.append(res_id)
-                        if hasattr(model_pool, 'message_update'):
-                            model_pool.message_update(cr, uid, [res_id], {}, msg, context=context)
-                        else:
-                            raise NotImplementedError('model %s does not support updating records, mailgate API method message_update() is missing'%model)
-
-        if not len(res_ids):
-            new_res_id, attachment_ids = create_record(msg)
-            res_ids = [new_res_id]
-
-        # Store messages
-        context.update({'model' : model})
-        if hasattr(model_pool, 'history'):
-            model_pool.history(cr, uid, res_ids, _('receive'), history=True,
-                            subject = msg.get('subject'),
-                            email = msg.get('to'),
-                            details = msg.get('body'),
-                            email_from = msg.get('from'),
-                            email_cc = msg.get('cc'),
-                            message_id = msg.get('message-id'),
-                            references = msg.get('references', False) or msg.get('in-reply-to', False),
-                            attach = attachments.items(),
-                            email_date = msg.get('date'),
-                            context = context)
-        else:
-            self.history(cr, uid, model, res_ids, msg, attachment_ids, context=context)
-        self.email_forward(cr, uid, model, res_ids, msg_txt)
-        return new_res_id
-
-    def get_partner(self, cr, uid, from_email, context=None):
-        """This function returns partner Id based on email 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 from_email: email address based on that function will search for the correct
-        """
-        address_pool = self.pool.get('res.partner.address')
-        res = {
-            'partner_address_id': False,
-            'partner_id': False
-        }
-        from_email = self.to_email(from_email)[0]
-        address_ids = address_pool.search(cr, uid, [('email', 'like', from_email)])
-        if address_ids:
-            address = address_pool.browse(cr, uid, address_ids[0])
-            res['partner_address_id'] = address_ids[0]
-            res['partner_id'] = address.partner_id.id
-
-        return res
-
-mailgate_tool()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
deleted file mode 100644
index d05bfbc0d91..00000000000
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <menuitem id="base.menu_mail_gateway" name="Emails"
-            parent="base.menu_base_config" sequence="1" />
-
-        <record model="ir.ui.view" id="view_mailgate_message_form">
-          <field name="name">mailgate.message.form</field>
-            <field name="model">mailgate.message</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="mailgate message">
-                    <group colspan="4" col="6">
-                        <field name="name" string="Subject" required="1" select="1"  widget="char" size="512"/>
-                        <field name="date" required="1" select="1"/>
-                        <field name="user_id" string="Owner" select="1"/>
-                        <field name="partner_id" readonly="1" />
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Details">
-                            <group col="2" colspan="2">
-                                <separator string="Email Followers" colspan="4"/>
-                                <field name="email_from" />
-                                <field name="email_to" widget="char" size="512"/>
-                                <field name="email_cc" widget="char" size="512"/>
-                                <field name="email_bcc" widget="char" size="512" groups="base.group_extended"/>
-                           </group>
-                           <group col="2" colspan="2">
-                                <separator string="Message Details" colspan="4"/>
-                                <field name="model" readonly="1"/>
-                                <group col="3" colspan="2">
-                                    <field name="res_id"  readonly="1"/>
-                                    <button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
-                                </group>
-                                <field name="message_id" />
-                                <field name="ref_id" />
-                           </group>
-                           <separator string="Description" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="4" />
-                        </page>
-                        <page string="Attachments">
-                            <separator string="Attachments" colspan="4"/>
-                            <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mailgate_message_tree">
-            <field name="name">mailgate.message.tree</field>
-            <field name="model">mailgate.message</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Emails">
-                    <field name="date" />
-                    <field name="name" string="Subject"/>
-                    <field name="email_from" string="From"/>
-                    <field name="user_id" string="Owner"/>
-                    <field name="message_id" string="Message" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <button name="open_document" string="Open 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_mailgate_message_search">
-            <field name="name">mailgate.message.search</field>
-            <field name="model">mailgate.message</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Email Search">
-                    <field name="name" string="Subject"/>
-                    <field name="date" />
-                    <field name="user_id" string="Owner"/>
-                    <field name="partner_id" string="Partner Name"/>
-                    <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Owner" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                         <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
-                         <separator orientation="vertical"/>
-                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-
-
-
-        <record id="action_view_mail_message" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mailgate.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_mailgate_message_search"/>
-        </record>
-
-
-
-
-        <record model="ir.ui.view" id="view_mailgate_thread_form">
-            <field name="name">mailgate.thread.form</field>
-            <field name="model">mailgate.thread</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Mailgateway Thread">
-                    <separator string="History" colspan="4"/>
-                    <field name="message_ids" nolabel="1" colspan="4" mode="tree,form">
-                        <tree string="Mailgateway History">
-                            <field name="display_text" />
-                        </tree>
-                        <form string="Mailgate History">
-                            <field name="name" widget="char" size="512"/>
-                            <field name="date" />
-                            <field name="user_id" />
-                            <field name="message_id" />
-                            <field name="history" />
-                            <notebook colspan="4">
-                                <page string="Email Details">
-                                    <group col="4" colspan="4">
-                                        <separator string="Email Details" colspan="4"/>
-                                        <field name="email_from" />
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="email_bcc" widget="char" size="512"/>
-                                   </group>
-                                </page>
-                                <page string="Attachments">
-                                    <separator string="Attachments" colspan="4"/>
-                                    <field name="attachment_ids" nolabel="1" colspan="4" />
-                                </page>
-                            </notebook>
-                        </form>
-                    </field>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mailgate_thread_tree">
-            <field name="name">mailgate.thread.tree</field>
-            <field name="model">mailgate.thread</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Mailgateway Thread">
-                    <field name="message_ids" />
-                </tree>
-            </field>
-        </record>
-
-
-
-
-         <!--        Emails action-->
-        <record model="ir.actions.act_window" id="action_view_mailgate_thread">
-            <field name="name">Mailgateway Threads</field>
-            <field name="res_model">mailgate.thread</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_mailgate_thread_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_mailgate_thread_tree"/>
-            <field name="act_window_id" ref="action_view_mailgate_thread"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_mailgate_thread_form"/>
-            <field name="act_window_id" ref="action_view_mailgate_thread"/>
-        </record>
-
-        <!--        Emailsaction-->
-        <record model="ir.actions.act_window" id="action_view_mailgate_message">
-            <field name="name">Emails</field>
-            <field name="res_model">mailgate.message</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('history', '=', True)]</field>
-            <field name="view_id" ref="view_mailgate_message_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_mailgate_thread_tree"/>
-            <field name="act_window_id" ref="action_view_mailgate_thread"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_mailgate_thread_form"/>
-            <field name="act_window_id" ref="action_view_mailgate_thread"/>
-        </record>
-
-        <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
-            id="act_res_partner_emails" name="Emails"
-            res_model="mailgate.message"
-            src_model="res.partner"
-            view_id="view_mailgate_message_tree"
-            />
-
-    <act_window
-       id="act_res_partner_open_email" name="Attachments"
-       res_model="ir.attachment"
-       src_model="mailgate.message"
-       domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
-
-           <menuitem id="base.menu_email_gateway_form"
-               parent="base.menu_mail_gateway" action="action_view_mail_message" />
-
-    </data>
-</openerp>
diff --git a/addons/mail_gateway/res_partner_view.xml b/addons/mail_gateway/res_partner_view.xml
deleted file mode 100644
index b3d956f9fc1..00000000000
--- a/addons/mail_gateway/res_partner_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-         <!--  Partners inherited form -->
-         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-             <field name="name">res.partner.crm.history.inherit1</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="/form/notebook/page[@string='History']" position="attributes">
-                     <attribute name="invisible">False</attribute>
-                 </xpath>
-             </field>
-             </record>
-        <record id="view_emails_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.emails.info.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">
-                 <page string="History" position="inside">
-                      <field name="emails" colspan="4" nolabel="1"/>
-                 </page>
-            </field>
-       </record>
-   </data>
-</openerp>
-
diff --git a/addons/mail_gateway/security/ir.model.access.csv b/addons/mail_gateway/security/ir.model.access.csv
deleted file mode 100644
index 09f13d57b31..00000000000
--- a/addons/mail_gateway/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"mail_gateway_mailgate_message","mail_gateway.mailgate.message","model_mailgate_message","base.group_system",1,1,1,1
-"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","model_mailgate_thread","base.group_system",1,1,1,1
-"mail_gateway_message_internal_user","mail_gateway.mailgate.message.internal","model_mailgate_message","base.group_user",1,0,0,0
-"mail_gateway_mailgate_message_partner_manager","mail_gateway.mailgate.message.partner.manager","model_mailgate_message","base.group_partner_manager",1,1,1,1
diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py
index c83787a6ef7..e68279cad8d 100644
--- a/addons/marketing/__init__.py
+++ b/addons/marketing/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import marketing_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index d9845cd957d..1f1995c52da 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Marketing',
     'complexity': "expert",
     "description": """
 Menu for Marketing.
diff --git a/addons/marketing/i18n/bg.po b/addons/marketing/i18n/bg.po
index fb0a01fdc66..7c71087584e 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Инсталация на маркетингови модули"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Маркетингови кампании"
 
diff --git a/addons/marketing/i18n/ca.po b/addons/marketing/i18n/ca.po
index 9a96d1234f7..73a4ac8f230 100644
--- a/addons/marketing/i18n/ca.po
+++ b/addons/marketing/i18n/ca.po
@@ -8,19 +8,19 @@ 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-08-30 11:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 20:45+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
 msgid "Menu for Marketing"
-msgstr ""
+msgstr "Menú per màrqueting"
 
 #. module: marketing
 #: help:marketing.installer,marketing_campaign:0
@@ -28,31 +28,33 @@ msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
 msgstr ""
+"Li ajuda a gestionar campanyes de màrqueting i automatitzar les accions i "
+"passos de la comunicació."
 
 #. module: marketing
 #: field:marketing.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: marketing
 #: field:marketing.installer,email_template:0
 msgid "Automated E-Mails"
-msgstr ""
+msgstr "Correus automatitzats"
 
 #. module: marketing
 #: field:marketing.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure Your Marketing Application"
-msgstr ""
+msgstr "Configureu l'aplicació de màrqueting"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -60,21 +62,23 @@ msgid ""
 "Helps you to design templates of emails and integrate them in your different "
 "processes."
 msgstr ""
+"Li ajuda a dissenyar les plantilles de missatges de correu electrònic i "
+"integrar-les en els seus diferents processos."
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_installer
 msgid "marketing.installer"
-msgstr ""
+msgstr "màrqueting.instal·lador"
 
 #. module: marketing
 #: model:ir.module.module,shortdesc:marketing.module_meta_information
 msgid "Marketing"
-msgstr ""
+msgstr "Màrqueting"
 
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
 msgid "Profiling Tools"
-msgstr ""
+msgstr "Eines de perfils"
 
 #. module: marketing
 #: view:marketing.installer:0
@@ -82,19 +86,21 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
+"L'OpenERP proporciona extensions per gestionar les vendes i els processos de "
+"màrqueting. Seleccioneu el que us interessa."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "Configuració de màrqueting"
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
 msgid "Marketing Modules Installation"
-msgstr ""
+msgstr "Instal·lació dels mòduls de márqueting"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Campanyes de màrqueting"
 
@@ -104,11 +110,13 @@ msgid ""
 "Helps you to perform segmentation of partners and design segmentation "
 "questionnaires"
 msgstr ""
+"Li ajuda a realitzar segmentacions d'empreses i dissenyar qüestionaris per a "
+"les segmentacions."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom del model no vàlid a la definició de l'acció."
@@ -121,3 +129,6 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML no vàlid per a l'estructura de la vista!"
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Configuració de les aplicacions de màrqueting"
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index 27848879b6e..d5bc6a73a66 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -99,7 +99,7 @@ msgid "Marketing Modules Installation"
 msgstr "Installation Marketing Module"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Marketing Kampagnen"
 
@@ -126,35 +126,8 @@ msgstr "Konfigurieren"
 #~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
 #~ "Sonderzeichen haben!"
 
-#~ msgid ""
-#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
-#~ "mailings."
-#~ msgstr ""
-#~ "Dieses Modul integriert den mailchimp.com Service um mit OpenERP "
-#~ "automatisierteMailings zu senden."
-
-#~ msgid ""
-#~ "Helps you to perform segmentation within partners and design questionaires."
-#~ msgstr ""
-#~ "Hilfe für die Erstellung von Kundenzielgruppen durch gezielte Fragestellung."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Fehlerhafte Modellbezeichnung bei der Aktion"
 
-#~ msgid "Mailchimp Integration"
-#~ msgstr "Mailchimp Integration"
-
 #~ msgid "Marketing Applications Configuration"
 #~ msgstr "Konfiguration Marketing"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/marketing/i18n/el.po b/addons/marketing/i18n/el.po
index e401671e1c5..56b870a793e 100644
--- a/addons/marketing/i18n/el.po
+++ b/addons/marketing/i18n/el.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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
 msgid "Menu for Marketing"
-msgstr "Μενού για Μάρκετινγ"
+msgstr "Μενού για Μάρκετινγκ"
 
 #. module: marketing
 #: help:marketing.installer,marketing_campaign:0
@@ -28,8 +28,8 @@ msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
 msgstr ""
-"Σας βοηθά να διαχειριστήτε τις εκστρατείες μάρκετινγκ και να αυτοματοποιήστε "
-"δράσεις και βήματα επικοινωνίας."
+"Σας βοηθά να διαχειριστείτε τις εκστρατείες μάρκετινγκ και να "
+"αυτοματοποιήσετε δράσεις και βήματα επικοινωνίας."
 
 #. module: marketing
 #: field:marketing.installer,progress:0
@@ -98,7 +98,7 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Εκστρατεία Μάρκετινγκ"
 
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index 26d1d3fbc2d..82a5d2ffebd 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -101,7 +101,7 @@ msgid "Marketing Modules Installation"
 msgstr "Instalación de módulos de márqueting"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Campañas de marketing"
 
@@ -133,15 +133,3 @@ msgstr "Configurar"
 
 #~ msgid "Marketing Applications Configuration"
 #~ msgstr "Configuración aplicaciones marketing"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/marketing/i18n/es_MX.po b/addons/marketing/i18n/es_MX.po
new file mode 100644
index 00000000000..6880b86be85
--- /dev/null
+++ b/addons/marketing/i18n/es_MX.po
@@ -0,0 +1,135 @@
+# 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 23:07+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr "Menú para marqueting"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Le ayuda a gestionar campañas de marketing y automatizar las acciones y "
+"pasos de la comunicación."
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Correos automatizados"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr "Configure su marqueting"
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Le ayuda a diseñar las plantillas de mensajes de correo electrónico e "
+"integrarlas en sus distintos procesos."
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr "marketing.instalador"
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr "Herramientas de perfiles"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid ""
+"OpenERP provides Addons to better manage your sales and marketing processes. "
+"Select the ones you would be interested in."
+msgstr ""
+"OpenERP permite extensiones para manejar sus ventas y procesos de "
+"marqueting. Seleccione el que usted le interese."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr "Configuración de marqueting"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Instalación de módulos de márqueting"
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr "Campañas de marketing"
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Le ayuda a realizar segmentaciones de empresas y diseñar cuestionarios para "
+"las segmentaciones."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar por x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Configuración aplicaciones marketing"
diff --git a/addons/marketing/i18n/es_VE.po b/addons/marketing/i18n/es_VE.po
new file mode 100644
index 00000000000..6880b86be85
--- /dev/null
+++ b/addons/marketing/i18n/es_VE.po
@@ -0,0 +1,135 @@
+# 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 23:07+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr "Menú para marqueting"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Le ayuda a gestionar campañas de marketing y automatizar las acciones y "
+"pasos de la comunicación."
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Correos automatizados"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr "Configure su marqueting"
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Le ayuda a diseñar las plantillas de mensajes de correo electrónico e "
+"integrarlas en sus distintos procesos."
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr "marketing.instalador"
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr "Herramientas de perfiles"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid ""
+"OpenERP provides Addons to better manage your sales and marketing processes. "
+"Select the ones you would be interested in."
+msgstr ""
+"OpenERP permite extensiones para manejar sus ventas y procesos de "
+"marqueting. Seleccione el que usted le interese."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr "Configuración de marqueting"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Instalación de módulos de márqueting"
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr "Campañas de marketing"
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Le ayuda a realizar segmentaciones de empresas y diseñar cuestionarios para "
+"las segmentaciones."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar por x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Configuración aplicaciones marketing"
diff --git a/addons/marketing/i18n/fi.po b/addons/marketing/i18n/fi.po
index ca21700be66..4ee9bcb3b58 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -28,16 +28,18 @@ msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
 msgstr ""
+"Auttaa sinua hallitsemaan markkinointikampanjoita ja automatisoimaan "
+"toimintoja ja kommunikaatiovaiheita."
 
 #. module: marketing
 #: field:marketing.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: marketing
 #: field:marketing.installer,email_template:0
@@ -60,6 +62,8 @@ msgid ""
 "Helps you to design templates of emails and integrate them in your different "
 "processes."
 msgstr ""
+"Auttaa sinua suunnittelemaan sähköpostipohjia ja integroimaan niitä eri "
+"prosesseihin."
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_installer
@@ -74,7 +78,7 @@ msgstr "Markkinointi"
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
 msgid "Profiling Tools"
-msgstr ""
+msgstr "Profilointityökalut"
 
 #. module: marketing
 #: view:marketing.installer:0
@@ -82,11 +86,13 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
+"OpenERP sisältää lisäosia joilla voi paremmin hallita myynti ja "
+"markkinointiprosesseja. Valitse ne joista olet kiinnostunut."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "Markkinointi ohjelmien määritykset"
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
@@ -94,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Markkinointimodulien asennus"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Markkinointikampanjat"
 
@@ -104,8 +110,13 @@ msgid ""
 "Helps you to perform segmentation of partners and design segmentation "
 "questionnaires"
 msgstr ""
+"Auttaa sinua tekemään partnereiden segmentoinnin ja suunnittelemaan "
+"sekmentointikysymykset"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Markkinointi ohjelmien määritykset"
diff --git a/addons/marketing/i18n/fr.po b/addons/marketing/i18n/fr.po
index f33d2f2a150..28bd543ae28 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Installation des modules de marketing"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Campagnes marketing"
 
diff --git a/addons/marketing/i18n/gl.po b/addons/marketing/i18n/gl.po
index 2a6181bed01..e039a0b18ab 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Instalación dos módulos de Márketing"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Campañas de márketing"
 
@@ -117,3 +117,6 @@ msgstr ""
 #: view:marketing.installer:0
 msgid "Configure"
 msgstr "Configurar"
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Configuración aplicacións márketing"
diff --git a/addons/marketing/i18n/hu.po b/addons/marketing/i18n/hu.po
index 5a16a0f6256..02e8351bb27 100644
--- a/addons/marketing/i18n/hu.po
+++ b/addons/marketing/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-31 14:00+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -95,7 +96,7 @@ msgid "Marketing Modules Installation"
 msgstr "Marketing modul telepítése"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Marketingkampányok"
 
diff --git a/addons/marketing/i18n/id.po b/addons/marketing/i18n/id.po
index f573cf01557..1c34df5ee46 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Instalasi Modul Marketing"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Kampanye Pemasaran"
 
diff --git a/addons/marketing/i18n/it.po b/addons/marketing/i18n/it.po
index a6136f1bda9..2c173fdb6d1 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -98,7 +98,7 @@ msgid "Marketing Modules Installation"
 msgstr "Installazione modulo Marketing"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Campagne di Marketing"
 
@@ -116,13 +116,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Configura"
 
-#~ msgid ""
-#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
-#~ "mailings."
-#~ msgstr ""
-#~ "Questo modulo integra il servizio mailchimp.com con OpenERP per "
-#~ "automatizzare l'invio massiccio di mail."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per la struttura della vista!"
 
@@ -135,10 +128,5 @@ msgstr "Configura"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#~ msgid ""
-#~ "Helps you to perform segmentation within partners and design questionaires."
-#~ msgstr ""
-#~ "Ti aiuta a creare una segmentazione nei partner e creare questionari."
-
-#~ msgid "Mailchimp Integration"
-#~ msgstr "Integrazione Mailchimp"
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Configurazione Applicazioni Marketing"
diff --git a/addons/marketing/i18n/lv.po b/addons/marketing/i18n/lv.po
index 3c9c2ac8cc5..1b83ca295dc 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -94,7 +94,7 @@ msgid "Marketing Modules Installation"
 msgstr "Mārketinga moduļu uzstādīšana"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Mārketinga kampaņas"
 
diff --git a/addons/marketing/i18n/mn.po b/addons/marketing/i18n/mn.po
index 5d1ce5509ba..38f04055282 100644
--- a/addons/marketing/i18n/mn.po
+++ b/addons/marketing/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -97,7 +97,7 @@ msgid "Marketing Modules Installation"
 msgstr "Маркетинг модулиудын суулгац"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Маркетингийн компанит ажил"
 
@@ -122,20 +122,6 @@ msgstr "Тохируулга"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
-#~ msgid ""
-#~ "Helps you to perform segmentation within partners and design questionaires."
-#~ msgstr "Харилцагчдыг хувааж асуулга зохион байгуулахад туслана."
-
-#~ msgid ""
-#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
-#~ "mailings."
-#~ msgstr ""
-#~ "Энэ модуль нь бөөн имэйл илгээх ажлыг автоматжуулах mailchimp.com үйлчилгээг "
-#~ "OpenERP-тай нэгтгэнэ."
-
-#~ msgid "Mailchimp Integration"
-#~ msgstr "Mailchimp нэгтгэл"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
 
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index ba6cf3dd6e4..ef853c14485 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Marketing modules installatie"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Marketing Campagnes"
 
@@ -118,13 +118,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Configureren"
 
-#~ msgid ""
-#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
-#~ "mailings."
-#~ msgstr ""
-#~ "Deze module integreert mailchimp.com's service met OpenERP om bulk mailings "
-#~ "te automatiseren."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 
@@ -136,13 +129,5 @@ msgstr "Configureren"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de definitie van de actie."
 
-#~ msgid ""
-#~ "Helps you to perform segmentation within partners and design questionaires."
-#~ msgstr ""
-#~ "Helpt u om binnen relaties te segmenteren en vragenlijsten te ontwerpen."
-
-#~ msgid "Mailchimp Integration"
-#~ msgstr "Mailchimp Integratie"
-
 #~ msgid "Marketing Applications Configuration"
 #~ msgstr "Marketing applicatie configuratie"
diff --git a/addons/marketing/i18n/pl.po b/addons/marketing/i18n/pl.po
index 2f2a5373dcd..24a758e4b0a 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Instalacja modułów marketingowych"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Kampanie marketingowe"
 
@@ -118,13 +118,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#~ msgid ""
-#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
-#~ "mailings."
-#~ msgstr ""
-#~ "Ten moduł integruje serwis mailchimp.com z OpenERP do automatyzowania poczty "
-#~ "masowej."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Niewłaściwy XML dla architektury widoku!"
 
@@ -136,9 +129,3 @@ msgstr "Konfiguruj"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid ""
-#~ "Helps you to perform segmentation within partners and design questionaires."
-#~ msgstr ""
-#~ "Pomaga przeprowadzić segmentację wśród partnerów i projektować "
-#~ "kwestionariusze."
diff --git a/addons/marketing/i18n/pt.po b/addons/marketing/i18n/pt.po
index 836df123ef9..3ba36ca81f6 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -95,7 +95,7 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Campanhas de Marketing"
 
@@ -111,15 +111,6 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo deve ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
-
 #~ msgid "Marketing Applications Configuration"
 #~ msgstr "Configuração de aplicações de marketing"
 
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index cdda77352f5..d7e9675ab7c 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Instalação dos Módulos de Marketing"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Campanhas de Marketing"
 
@@ -118,9 +118,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Configurar"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para Arquitetura da View"
 
@@ -133,14 +130,5 @@ msgstr "Configurar"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
 
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo precisa ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
 #~ msgid "Marketing Applications Configuration"
 #~ msgstr "Configuração da Aplicação de Marketing"
diff --git a/addons/marketing/i18n/ro.po b/addons/marketing/i18n/ro.po
index 8eae1596877..6b44b9f3ebc 100644
--- a/addons/marketing/i18n/ro.po
+++ b/addons/marketing/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-25 14:47+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -94,7 +94,7 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr ""
 
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
index 9c0ecd0cf5b..5629512a45c 100644
--- a/addons/marketing/i18n/ru.po
+++ b/addons/marketing/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: 2010-10-10 07:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-08-28 14:15+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -28,8 +28,8 @@ msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
 msgstr ""
-"Помогает Вам настроить маркетинговые кампании и автоматизировать действия  и "
-"этапы взамодействия"
+"Помогает настроить маркетинговые кампании и автоматизировать действия и "
+"общение."
 
 #. module: marketing
 #: field:marketing.installer,progress:0
@@ -39,12 +39,12 @@ msgstr "Выполнение настройки"
 #. module: marketing
 #: view:marketing.installer:0
 msgid "title"
-msgstr "заголовок"
+msgstr "title"
 
 #. module: marketing
 #: field:marketing.installer,email_template:0
 msgid "Automated E-Mails"
-msgstr "Автоматизированные рассылки"
+msgstr "Автоматизированные сообщения"
 
 #. module: marketing
 #: field:marketing.installer,config_logo:0
@@ -63,7 +63,7 @@ msgid ""
 "processes."
 msgstr ""
 "Помогает разработать шаблоны сообщений электронной почты и интегрировать их "
-"в ваши процессы."
+"в существующие процессы."
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_installer
@@ -86,8 +86,8 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
-"OpenERP предоставляет дополнения для более лучшего управления вашими "
-"процессами продаж и маркетинга. Выберите те, которые вам интересны."
+"OpenERP предоставляет дополнения, улучшающие управление вашими процессами "
+"продаж и маркетинга. Выберите те, которые вам интересны."
 
 #. module: marketing
 #: view:marketing.installer:0
@@ -100,7 +100,7 @@ msgid "Marketing Modules Installation"
 msgstr "Установка модулей маркетинга"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Маркетинговые кампании"
 
@@ -110,7 +110,7 @@ msgid ""
 "Helps you to perform segmentation of partners and design segmentation "
 "questionnaires"
 msgstr ""
-"Помогает Вам выполнять сегментацию партнеров и проектировать сегментационные "
+"Помогает выполнить сегментацию партнеров и спроектировать сегментационные "
 "опросы."
 
 #. module: marketing
@@ -121,16 +121,6 @@ msgstr "Настроить"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Недопустимое имя модели в определении действия."
 
-#~ msgid "Mailchimp Integration"
-#~ msgstr "Интеграция с сервисом MailChimp"
-
-#~ msgid ""
-#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
-#~ "mailings."
-#~ msgstr ""
-#~ "Этот модуль интегрирует в OpenERP сервисы mailchimp.com для автоматизации "
-#~ "почтовых рассылок"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Некорректный формат XML для просмотра архитектуры!"
 
@@ -139,3 +129,6 @@ msgstr "Настроить"
 #~ msgstr ""
 #~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
 #~ "символов !"
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "Настройка приложения Маркетинг"
diff --git a/addons/marketing/i18n/sk.po b/addons/marketing/i18n/sk.po
index a88aa105805..341da65b0f6 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -99,7 +99,7 @@ msgid "Marketing Modules Installation"
 msgstr "Inštalácia marketingového modulu"
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Reklamné kampane"
 
@@ -116,9 +116,6 @@ msgstr ""
 msgid "Configure"
 msgstr "Nastaviť"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certifikát modulu musí byť jedinečný!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatné XML pre zobrazenie architektúry!"
 
@@ -127,15 +124,6 @@ msgstr "Nastaviť"
 #~ msgstr ""
 #~ "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
 
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Názov skupiny musí byť jedinečný!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Názov modulu musí byť jedinečný!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Veľkosť poľa nemôže byť nikdy menšia ako 1 !"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neplatný názov modelu v definícii akcie."
 
diff --git a/addons/marketing/i18n/sl.po b/addons/marketing/i18n/sl.po
new file mode 100644
index 00000000000..75b866d12b6
--- /dev/null
+++ b/addons/marketing/i18n/sl.po
@@ -0,0 +1,111 @@
+# Slovenian 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-10-11 16:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Potek konfiguracije"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr "Orodja za profiliranje"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid ""
+"OpenERP provides Addons to better manage your sales and marketing processes. "
+"Select the ones you would be interested in."
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr ""
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Nastavitve"
diff --git a/addons/marketing/i18n/sr.po b/addons/marketing/i18n/sr.po
index ce5c5859e20..c7f990d7eb7 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -98,7 +98,7 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Marketingske kampanje"
 
diff --git a/addons/marketing/i18n/sr@latin.po b/addons/marketing/i18n/sr@latin.po
index 732a3021a2a..8b1bba0e202 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -98,7 +98,7 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Marketingske kampanje"
 
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index e1b1debe106..e963fbb443f 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -96,7 +96,7 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr "Marknadsföringskampanjer"
 
@@ -118,18 +118,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Namned på gruppen måste vara unikt!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ogiltig XML för Vy-arkitektur!"
 
diff --git a/addons/marketing/i18n/th.po b/addons/marketing/i18n/th.po
index eae5f5467c3..50558382b53 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -94,7 +94,7 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
 msgstr ""
 
diff --git a/addons/marketing/i18n/tr.po b/addons/marketing/i18n/tr.po
index 8c77edf63be..895aca225ef 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
diff --git a/addons/marketing/i18n/zh_CN.po b/addons/marketing/i18n/zh_CN.po
index e615217c751..be4c262311a 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
@@ -27,17 +27,17 @@ msgstr "营销管理菜单"
 msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
-msgstr ""
+msgstr "帮你管理市场营销活动，自动活动和通讯步骤。"
 
 #. module: marketing
 #: field:marketing.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: marketing
 #: field:marketing.installer,email_template:0
@@ -52,14 +52,14 @@ msgstr "图片"
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure Your Marketing Application"
-msgstr "配置您的市场营销管理应用"
+msgstr "设置您的市场营销管理应用"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
 msgid ""
 "Helps you to design templates of emails and integrate them in your different "
 "processes."
-msgstr ""
+msgstr "帮你设计邮件模板并集成到各个不同的活动里面去。"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_installer
@@ -74,19 +74,19 @@ msgstr "市场营销管理"
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
 msgid "Profiling Tools"
-msgstr ""
+msgstr "性能评测工具"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
-msgstr ""
+msgstr "OpenERP提供插件来更好的管理你的销售和市场活动。请选择你感兴趣的。"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "市场应用程序设置"
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
@@ -94,18 +94,21 @@ msgid "Marketing Modules Installation"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
+#: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
-msgstr ""
+msgstr "市场营销活动"
 
 #. module: marketing
 #: help:marketing.installer,crm_profiling:0
 msgid ""
 "Helps you to perform segmentation of partners and design segmentation "
 "questionnaires"
-msgstr ""
+msgstr "帮助你细分业务伙伴并且设计细分的调查表"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
+
+#~ msgid "Marketing Applications Configuration"
+#~ msgstr "市场应用程序设置"
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index b4539cfef33..a697d586cd4 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -11,23 +11,5 @@
             web_icon="images/marketing.png"
             web_icon_hover="images/marketing-hover.png"/>
 
-
-        <record id="view_marketing_installer" model="ir.ui.view">
-            <field name="name">marketing.installer.view</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='marketing']" position="replace">
-                        <newline/>
-                        <separator  string="Marketing Features" colspan="4" />
-                        <field name="marketing_campaign" />
-                        <field name="email_template" />
-                        <field name="crm_profiling" />
-                    </xpath>                   
-                </data>
-            </field>
-        </record>
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
deleted file mode 100644
index cedba8151c9..00000000000
--- a/addons/marketing/marketing_wizard.py
+++ /dev/null
@@ -1,40 +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 marketing_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        'email_template':fields.boolean('Automated E-Mails',
-            help="Helps you to design templates of emails and integrate them in your different processes."),
-        'marketing_campaign':fields.boolean('Marketing Campaigns',
-            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
-        'crm_profiling':fields.boolean('Profiling Tools',
-            help="Helps you to perform segmentation of partners and design segmentation questionnaires")
-    }
-    _defaults = {
-        'marketing_campaign': lambda *a: 1,
-    }
-
-marketing_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 78060b1e571..44a2f1e30bd 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Marketing Campaign",
+    "name" : "Marketing Campaigns",
     "version" : "1.1",
     "depends" : ["marketing",
                  "document",
@@ -29,7 +29,7 @@
                  "decimal_precision"
                 ],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Marketing',
     'complexity': "expert",
     "description": """
 This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).
diff --git a/addons/marketing_campaign/i18n/bg.po b/addons/marketing_campaign/i18n/bg.po
index eea65347583..a30ee607764 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5d6e2799caa..e1f1e223ebd 100644
--- a/addons/marketing_campaign/i18n/ca.po
+++ b/addons/marketing_campaign/i18n/ca.po
@@ -14,29 +14,31 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Manual Mode"
-msgstr ""
+msgstr "Mode manual"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_from_id:0
 msgid "Previous Activity"
-msgstr ""
+msgstr "Activitat anterior"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:772
 #, python-format
 msgid "The current step for this item has no email or report to preview."
 msgstr ""
+"L'etapa actual per a aquest element no té email o informe per previsualitzar"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
+"L'activitat cap a / des de la transició ha de ser de la mateixa campanya "
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:144
@@ -45,16 +47,18 @@ msgid ""
 "The campaign cannot be started: it doesn't have any starting activity (or "
 "any activity with a signal and no previous activity)"
 msgstr ""
+"La campanya no pot ser iniciada: No té cap activitat d'inici (o alguna "
+"activitat amb un senyal i sense activitat prèvia)"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
 msgid "Time"
-msgstr ""
+msgstr "Temps"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "Custom Action"
-msgstr ""
+msgstr "Acció personalitzada"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:139
@@ -63,6 +67,7 @@ msgid ""
 "The campaign cannot be started: the email account is missing in email "
 "activity '%s'"
 msgstr ""
+"La campanya no pot ser iniciada: falta l'email en l'activitat email '%s'"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -70,7 +75,7 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: view:marketing.campaign.workitem:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,revenue:0
@@ -79,32 +84,35 @@ msgid ""
 "reached this point has generated a certain revenue. You can get revenue "
 "statistics in the Reporting section"
 msgstr ""
+"Especifiqueu un ingrés previst si considereu que cada element de la campanya "
+"que ha aconseguit en aquest punt ha generat un cert ingrés. Podeu obtenir "
+"estadístiques sobre ingressos en la secció d'informes."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,trigger:0
 msgid "Trigger"
-msgstr ""
+msgstr "Disparador"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
-msgstr ""
+msgstr "núm. d'accions"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Campaign Editor"
-msgstr ""
+msgstr "Editor de campanyes"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: view:marketing.campaign.workitem:0
 msgid "Today"
-msgstr ""
+msgstr "Avui"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_mode:0
@@ -112,11 +120,13 @@ msgid ""
 "Determines an additional criterion to add to the filter when selecting new "
 "records to inject in the campaign."
 msgstr ""
+"Determineu un criteri addicional per afegir al filtre en seleccionar nous "
+"registres per injectar en la campanya."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objecte"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,condition:0
@@ -130,76 +140,85 @@ msgid ""
 "   - transitions: list of campaign transitions outgoing from this activity\n"
 "...- re: Python regular expression module"
 msgstr ""
+"Expressió de Python per decidir si l'activitat es pot executar, en cas "
+"contrari serà eliminada o cancel·lada . L'expressió pot utilitzar les "
+"següents variables [navegables]:\n"
+"   - activitat: l'activitat de la campanya\n"
+"   - treball: l'element de treball de la campanya\n"
+"   - recurs: el recurs que representa aquesta campanya\n"
+"   - transicions: llista de les transicions de la campanya sortints des "
+"d'aquesta activitat\n"
+"...- re: Expressió regular de Python"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Canvia a esborrany"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,to_ids:0
 msgid "Next Activities"
-msgstr ""
+msgstr "Activitat següent"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Sincronització"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "This Year"
-msgstr ""
+msgstr "Aquest any"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:772
 #, python-format
 msgid "No preview"
-msgstr ""
+msgstr "Sense previsualització"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,date_run:0
 msgid "Launch Date"
-msgstr ""
+msgstr "Data de llançament"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Transicions sortints"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Reset"
-msgstr ""
+msgstr "Reinicia"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Escolliu el recurs sobre el qual desitgeu llançar aquesta campanya"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
 msgid "Last Synchronization"
-msgstr ""
+msgstr "Última sincronització"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Year(s)"
-msgstr ""
+msgstr "Any/s"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:209
 #, python-format
 msgid "Sorry, campaign duplication is not supported at the moment."
-msgstr ""
+msgstr "La duplicació de campanyes no està suportada actualment."
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
@@ -207,6 +226,8 @@ msgid ""
 "Date on which this segment was synchronized last time (automatically or "
 "manually)"
 msgstr ""
+"Data en la qual aquest segment es va sincronitzar per última vegada (de "
+"forma automàtica o manualment)."
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
@@ -219,7 +240,7 @@ msgstr "Cancel·lada"
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
 msgid "Automatic"
-msgstr ""
+msgstr "Automàtic"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,mode:0
@@ -233,11 +254,20 @@ msgid ""
 "Normal - the campaign runs normally and automatically sends all emails and "
 "reports (be very careful with this mode, you're live!)"
 msgstr ""
+"Test - Crea i processa totes les activitats directament (sense esperar pel "
+"retard de les transicions) però no s'envien correus ni es creen informes.\n"
+"Test en temps real - Crea i processa totes les activitats directament però "
+"no envien correus ni es creen informes.\n"
+"Confirmació manual - La campanya s'executa normalment, però l'usuari ha de "
+"validar tots els elements de treball manualment.\n"
+"Normal - La campanya s'executa amb normalitat i automàticament envia tots "
+"els correus correu-vos i informes (vagi amb compte amb aquesta manera, "
+"treballa \"en viu\"!)"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_run:0
 msgid "Initial start date of this segment."
-msgstr ""
+msgstr "Primera data d'inici d'aquest segment"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -249,12 +279,12 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,campaign_id:0
 msgid "Campaign"
-msgstr ""
+msgstr "Campanya"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,start:0
 msgid "Start"
-msgstr ""
+msgstr "Inicia"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,partner_field_id:0
@@ -262,6 +292,8 @@ msgid ""
 "The generated workitems will be linked to the partner related to the record. "
 "If the record is the partner itself leave this field empty."
 msgstr ""
+"Els elements de treball generats seran enllaçats a l'empresa relacionada amb "
+"el registre. Si el registre és la pròpia empresa deixeu buit aquest camp."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -270,12 +302,12 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,segment_id:0
 msgid "Segment"
-msgstr ""
+msgstr "Segment"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Cost / Revenue"
-msgstr ""
+msgstr "Cost / ingrés"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,type:0
@@ -288,16 +320,27 @@ msgid ""
 "of the resource record\n"
 "  "
 msgstr ""
+"El tipus d'acció a executar quan s'introdueix un registre en aquesta "
+"activitat, com:\n"
+"   - Correu: envia un correu utilitzant una plantilla predeterminada de "
+"correu\n"
+"   - Informe: imprimeix un informe existent definit en el recurs i ho guarda "
+"en el directori especificat\n"
+"   - Acció personalitzada: executa una acció predeterminada, per exemple per "
+"modificar els camps del recurs\n"
+"  "
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_next_sync:0
 msgid "Next time the synchronization job is scheduled to run automatically"
 msgstr ""
+"Propera vegada que el treball de sincronització està programat per executar-"
+"se automàticament."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Month(s)"
-msgstr ""
+msgstr "Mes/os"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -305,17 +348,17 @@ msgstr ""
 #: model:ir.model,name:marketing_campaign.model_res_partner
 #: field:marketing.campaign.workitem,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Transitions"
-msgstr ""
+msgstr "Transicions"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,keep_if_condition_not_met:0
 msgid "Don't delete workitems"
-msgstr ""
+msgstr "No eliminar elements de treball"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -327,22 +370,22 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Marketing Reports"
-msgstr ""
+msgstr "Informes de marketing"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Related Resource"
-msgstr ""
+msgstr "Recurs relacionat"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,name:0
@@ -350,44 +393,45 @@ msgstr ""
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.workitem,res_name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Nom del recurs"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_mode:0
 msgid "Synchronization mode"
-msgstr ""
+msgstr "Mode de sincronització"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Run"
-msgstr ""
+msgstr "Executa"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,from_ids:0
 msgid "Previous Activities"
-msgstr ""
+msgstr "Activitats prèvies"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_done:0
 msgid "Date this segment was last closed or cancelled."
 msgstr ""
+"Data en la qual aquest segment va ser tancat o cancel·lat per última vegada"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Marketing Campaign Activities"
-msgstr ""
+msgstr "Activitats campanya de màrqueting"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Missatge d'error"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
@@ -395,33 +439,33 @@ msgstr ""
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
 #: view:marketing.campaign:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Campanyes"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Unitat d'interval"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_id:0
 #: selection:marketing.campaign.activity,type:0
 msgid "Report"
-msgstr ""
+msgstr "Informes"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: marketing_campaign
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Configuració"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,variable_cost:0
@@ -430,23 +474,26 @@ msgid ""
 "reached this point has entailed a certain cost. You can get cost statistics "
 "in the Reporting section"
 msgstr ""
+"Indiqueu un cost variable si considereu que cada element de la campanya que "
+"ha arribat fins aquest punt ha suposat un cost determinat. Podeu obtenir "
+"estadístiques dels costos en la secció d'informes."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
-msgstr ""
+msgstr "Hora/es"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
 msgid "Campaign Segment"
-msgstr ""
+msgstr "Segment de la campanya"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 #: view:marketing.campaign.workitem:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,keep_if_condition_not_met:0
@@ -454,103 +501,108 @@ 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 ""
+"En activar aquesta opció, els elements de treball que no s'executen pel fet "
+"que la condició no es compleix, es marquen com cancel·lats en lloc de ser "
+"eliminats."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Exceptions"
-msgstr ""
+msgstr "Excepcions"
 
 #. module: marketing_campaign
 #: field:res.partner,workitem_ids:0
 msgid "Workitems"
-msgstr ""
+msgstr "Elements de treball"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
 msgid "Fixed Cost"
-msgstr ""
+msgstr "Cost fix"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Modified"
-msgstr ""
+msgstr "Recentment modificat"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_nbr:0
 msgid "Interval Value"
-msgstr ""
+msgstr "Interval dels valors"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,revenue:0
 #: field:marketing.campaign.activity,revenue:0
 msgid "Revenue"
-msgstr ""
+msgstr "Ingressos"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_to_id:0
 msgid "Next Activity"
-msgstr ""
+msgstr "Activitat següent"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
 msgid "Campaign Follow-up"
-msgstr ""
+msgstr "Seguiment de campanya"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,email_template_id:0
 msgid "The e-mail to send when this activity is activated"
-msgstr ""
+msgstr "L'email a enviar quan l'activitat és activada"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "This Month"
-msgstr ""
+msgstr "Aquest mes"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Test Mode"
-msgstr ""
+msgstr "Mode de prova"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records modified after last sync (no duplicates)"
 msgstr ""
+"Només registres actualitzats després de l'última sincronització (sense "
+"duplicats)"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.accions.informe.xml"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
 msgid "Campaign Statistics"
-msgstr ""
+msgstr "Estadístiques de la campanya"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
 msgid "The action to perform when this activity is activated"
-msgstr ""
+msgstr "L'acció a realitzar quan l'activitat és activada"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,partner_field_id:0
 msgid "Partner Field"
-msgstr ""
+msgstr "Camp empresa"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -558,37 +610,37 @@ 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 "Anàlisi de la campanya"
 
 #. module: marketing_campaign
 #: sql_constraint:marketing.campaign.transition:0
 msgid "The interval must be positive or zero"
-msgstr ""
+msgstr "L'interval ha de ser positiu o zero"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
-msgstr ""
+msgstr "Test en tiemps real"
 
 #. module: marketing_campaign
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "El nom de la plantilla ha de ser únic!"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
-msgstr ""
+msgstr "Test directament"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_directory_id:0
 msgid "Directory"
-msgstr ""
+msgstr "Directori"
 
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursius."
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -596,12 +648,12 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
-msgstr ""
+msgstr "Previsualitza"
 
 #. module: marketing_campaign
 #: model:ir.module.module,description:marketing_campaign.module_meta_information
@@ -629,21 +681,46 @@ msgid ""
 "application as it depends on CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul proporciona l'automatització d'iniciatives (clients potencials) "
+"a través de campanyes de màrqueting (campanyes, que en realitat, poden ser "
+"definides sobre qualsevol recurs, no només contactes del CRM).\n"
+"         Les campanyes són dinàmiques i multicanal. El procés és el "
+"següent:\n"
+"          * Dissenyeu les campanyes de màrqueting com a fluxos de treball, "
+"incloent plantilles de correu electrònic a enviar, informes a imprimir i "
+"envia per correu, accions personalitzades, etc.\n"
+"          * Defineix els segments d'entrada que seleccionaran els elements a "
+"introduir en la campanya (per exemple iniciatives de certs països, etc.)\n"
+"          * Llanceu la seva campanya en mode simulació per provar-la en "
+"temps real o accelerada, i ajusteu-la.\n"
+"          * També podeu iniciar la campanya real de forma manual, on cada "
+"acció necessita validació manual.\n"
+"          * Finalment llanceu la seva campanya en viu, i observeu les "
+"estadístiques mentre la campanya fa tot de forma completament "
+"automatitzada.\n"
+"          Per descomptat, mentre s'executa la campanya podeu continuar "
+"ajustant els paràmetres, segments d'entrada, flux, etc.\n"
+"\n"
+"          Nota: Si necessiteu dades de prova, podeu instal·lar el mòdul "
+"màrqueting_campanya_crm_demo, però això també instal·larà l'aplicació de CRM "
+"atès que depèn de les iniciatives del CRM.\n"
+"    "
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,start:0
 msgid "This activity is launched when the campaign starts."
-msgstr ""
+msgstr "Aquesta activitat és llançada quan la campanya comença"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,signal:0
@@ -651,55 +728,57 @@ msgid ""
 "An activity with a signal can be called programmatically. Be careful, the "
 "workitem is always created when a signal is sent"
 msgstr ""
+"Una activitat amb un senyal pot ser cridada mitjançant programació. Vés amb "
+"compte, l'element sempre es crea quan s'envia un senyal."
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "All records (no duplicates)"
-msgstr ""
+msgstr "Tots els registres (no duplicats)"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Created"
-msgstr ""
+msgstr "Creat novament"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,date:0
 #: view:marketing.campaign.workitem:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Condició"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_id:0
 msgid "The report to generate when this activity is activated"
-msgstr ""
+msgstr "L'informe a generar quan l'activitat és activada"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Excepció"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:141
@@ -708,37 +787,39 @@ msgid ""
 "The campaign cannot be started: the email account is not approved in email "
 "activity '%s'"
 msgstr ""
+"La campanya no pot ser iniciada: l'email no està aprovat en l'activitat "
+"email '%s'"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "Plantilla email"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,date:0
 msgid "Execution Date"
-msgstr ""
+msgstr "Data d'execució"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
 msgid "Campaign Workitem"
-msgstr ""
+msgstr "Element de treball de la campanya"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
 msgid "Campaign Activity"
-msgstr ""
+msgstr "Activitat campanya"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_directory_id:0
 msgid "This folder is used to store the generated reports"
-msgstr ""
+msgstr "Aquesta carpeta es utilitzada per desar els informes generats"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:125
@@ -748,47 +829,47 @@ msgstr ""
 #: code:addons/marketing_campaign/marketing_campaign.py:154
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,server_action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Acció"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:488
 #, python-format
 msgid "Automatic transition"
-msgstr ""
+msgstr "Transició automàtica"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: marketing_campaign
 #: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
 msgid "marketing_campaign"
-msgstr ""
+msgstr "Campanya de marketing"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Process"
-msgstr ""
+msgstr "Procés"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:490
 #: selection:marketing.campaign.transition,trigger:0
 #, python-format
 msgid "Cosmetic"
-msgstr ""
+msgstr "Cosmètic"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.transition,trigger:0
 msgid "How is the destination workitem triggered"
-msgstr ""
+msgstr "Com es dispara l'element de treball en destinació."
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
@@ -799,6 +880,11 @@ msgid ""
 "could be sending an email template that has previously been created in the "
 "system."
 msgstr ""
+"Una campanya de màrqueting és un esdeveniment o activitat que li ajudarà a "
+"gestionar i fer arribar missatges específics a les seves empreses. Una "
+"campanya pot tenir moltes activitats que s'activaran a partir d'una situació "
+"concreta. Una acció podria ser l'enviament d'una plantilla de correu "
+"electrònic prèviament creada en el sistema."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -807,51 +893,55 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:209
 #, python-format
 msgid "Operation not supported"
-msgstr ""
+msgstr "No s'admet l'operació"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Plantilles d'email per a models"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
+"El model del filtre ha de ser el mateix que el model del recurs de la "
+"campanya "
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronize Manually"
-msgstr ""
+msgstr "Sincronitza manualment"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:154
 #, python-format
 msgid "The campaign cannot be marked as done before all segments are done"
 msgstr ""
+"La campanya no pot ser finalitzada abans que tots els seus segments estiguin "
+"realitzats"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID del registre"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
-msgstr ""
+msgstr "Transició de la campanya"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -859,50 +949,50 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Pendent"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Campaign Step"
-msgstr ""
+msgstr "Etapa campanya"
 
 #. 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 "Segments"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
 msgid "All Segments"
-msgstr ""
+msgstr "Tots els segments"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Transicions entrants"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "E-mail"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Dia/es"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,activity_ids:0
 #: view:marketing.campaign.activity:0
 msgid "Activities"
-msgstr ""
+msgstr "Activitats"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -910,28 +1000,28 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr ""
+msgstr "Executant"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:489
 #, python-format
 msgid "After %(interval_nbr)d %(interval_type)s"
-msgstr ""
+msgstr "Després %(interval_nbr)d %(interval_type)s"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign
 msgid "Marketing Campaign"
-msgstr ""
+msgstr "Campanya de marketing"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_done:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -942,7 +1032,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,object_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurs"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,fixed_cost:0
@@ -951,39 +1041,44 @@ msgid ""
 "revenue on each campaign activity. Cost and Revenue statistics are included "
 "in Campaign Reporting."
 msgstr ""
+"Cost fix per al funcionament d'aquesta campanya. També podeu especificar els "
+"costos variables i els ingressos de cada activitat de la campanya. "
+"Estadístiques de costos i ingressos s'inclouen en l'Informe de la campanya."
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:746
 #, python-format
 msgid "Email Preview"
-msgstr ""
+msgstr "Vista prèvia email"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,signal:0
 msgid "Signal"
-msgstr ""
+msgstr "Senyal"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:125
 #, python-format
 msgid "The campaign cannot be started: there are no activities in it"
-msgstr ""
+msgstr "La campanya no pot ser iniciada: no té activitats"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.workitem,date:0
 msgid "If date is not set, this workitem has to be run manually"
 msgstr ""
+"Si no s'indica la data, aquest element de treball ha de ser executat "
+"manualment."
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: field:marketing.campaign,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Mode"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -992,7 +1087,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,activity_id:0
 msgid "Activity"
-msgstr ""
+msgstr "Activitat"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,ir_filter_id:0
@@ -1002,53 +1097,58 @@ 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 ""
+"Filtre per seleccionar els registres de recursos que pertanyen a aquest "
+"segment. Es poden crear i desar nous filtres amb la recerca avançada en la "
+"vista de llista dels recursos. Si no hi ha cap filtre establert, es "
+"seleccionen tots els registres sense filtrar. La manera de sincronització "
+"també podeu afegir un criteri per al filtre."
 
 #. 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 "Seguiment de campanya"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_next_sync:0
 msgid "Next Synchronization"
-msgstr ""
+msgstr "Següent sincronització"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,ir_filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtre"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "All"
-msgstr ""
+msgstr "Tots"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records created after last sync"
-msgstr ""
+msgstr "Només registres creats després de l'última sincronització"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,variable_cost:0
 msgid "Variable Cost"
-msgstr ""
+msgstr "Cost variable"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "With Manual Confirmation"
-msgstr ""
+msgstr "Amb configuració manual"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,total_cost:0
 #: view:marketing.campaign:0
 msgid "Cost"
-msgstr ""
+msgstr "Cost"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index 8cc3ac88ad1..f2fdb5d68de 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -1159,193 +1159,3 @@ msgstr "Kosten"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Jahr"
-
-#~ msgid ""
-#~ "The generated workitems will be linked to the partner related to the record. "
-#~ "If the record is the partner itself left this field empty."
-#~ msgstr ""
-#~ "Die erzeugten Positionen werden automatisch mit dem zum Datensatz "
-#~ "zugehörigen Partner verlinkt. Dieses Feld sollte dann leer bleiben, wenn "
-#~ "sich die Kampagne auf die 'Partner Ressource' selbst bezieht."
-
-#~ msgid ""
-#~ "Describe type of action to be performed on the Activity.Eg : Send email,Send "
-#~ "paper.."
-#~ msgstr ""
-#~ "Definieren Sie den Aktionstyp der ausgelöst wird. Z.B.: Sende EMail, "
-#~ "VersendePostbrief .."
-
-#~ msgid "Activity Definition"
-#~ msgstr "Beschreibung Aktivität"
-
-#~ msgid "Keep as cancelled when condition not met"
-#~ msgstr "Status Abgebrochen belassen, wenn Bedingung nicht erfüllt"
-
-#~ msgid "Workitem creation mode"
-#~ msgstr "Arbeitsauftrag Erstellungsmodus"
-
-#, python-format
-#~ msgid ""
-#~ "The campaign hasn't any starting activity nor any activity with a signal and "
-#~ "no previous activity."
-#~ msgstr ""
-#~ "Diese Kampagne hat weder eine Startaktion noch eine Aktion zur Signalis.  "
-#~ "einer vorgelagerten Aktion."
-
-#~ msgid "If record created after last sync"
-#~ msgstr "Wenn Datensatz nach letztem Abgleich erzeugt wurde"
-
-#~ msgid "Create After Sync"
-#~ msgstr "Erzeuge n. Synchronis."
-
-#~ msgid "Dates"
-#~ msgstr "Daten"
-
-#~ msgid ""
-#~ "Determines when new workitems should be created for records matching a "
-#~ "segment."
-#~ msgstr ""
-#~ "Hier definieren Sie, in welchen Fällen neue Arbeitspositionen füreine "
-#~ "gefilterte Kundengruppe der Kampagne erstellt werden sollen."
-
-#~ msgid ""
-#~ "\n"
-#~ "Allows you to setup leads automation through marketing campaigns. The "
-#~ "campaigns\n"
-#~ "are dynamic and multi-channels. The process:\n"
-#~ "* Design marketing campaigns that incluces mail templates, reports to "
-#~ "print,\n"
-#~ "  miscelleanous actions, etc.\n"
-#~ "* Define segments that are selections of target people\n"
-#~ "* Launch your campaign to automate communications.\n"
-#~ "\n"
-#~ "If you need demo data, you can install the module "
-#~ "marketing_campaign_crm_demo.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Ermöglicht die automatisierte Bearbeitung von Leads durch Marketing "
-#~ "Kampagnen. Die Kampagnen\n"
-#~ "sind dynamisch und Multi-Channel fähig. Der Prozess ist der folgende:\n"
-#~ "* Erstellen Sie die EMail Templates für die Kampagne, die auszudruckenden "
-#~ "Schreiben oder andere Werbemittel,\n"
-#~ " etc.\n"
-#~ "* Erstellen Sie Segmente, welche der Auswahl Ihrer Zielgruppe entspricht.* "
-#~ "Starten Sie Ihre Kampagne zur automatisierten Kundenkommunikation.\n"
-#~ "\n"
-#~ "Falls Sie Demo Daten benötigen, sollten Sie am Besten das Modul "
-#~ "marketing_campaign_crm_demo installieren.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Python expression to decide whether the activity can be executed, otherwise "
-#~ "it will be deleted or cancelled.The expression may use the following "
-#~ "[browsable] variables:\n"
-#~ "   - activity: the campaign activity\n"
-#~ "   - workitem: the campaign workitem\n"
-#~ "   - object: the object this campaign item represents\n"
-#~ "   - transitions: list of campaign transitions outgoing from this activity\n"
-#~ "...- re: Python regular expression module"
-#~ msgstr ""
-#~ "Python Ausdruck der entscheidet ob die Aktion ausgeführt oder ob sie "
-#~ "gelöscht oder abgebrochen wird. Der Ausdruck kann folgende durchsuchbare "
-#~ "Variablen nutzen:\n"
-#~ "   - Aktivität: Die Kampagnen Aktion\n"
-#~ "   - Kampagnenposition: Die Arbeitsliste der Kampagne\n"
-#~ "   - Objekt: Das Objekt auf dem die Kampagne basiert\n"
-#~ "   - Übergänge: Liste für weitere Folgeaktionen, die von dieser Aktion "
-#~ "ausgehen\n"
-#~ "...- re: Python Python regex Module (regular expression - zur Filterung)"
-
-#, python-format
-#~ msgid ""
-#~ "The campaign cannot be started: an email account is missing in the email "
-#~ "activity '%s'"
-#~ msgstr ""
-#~ "Die Kampagne kann nicht gestartet werden. Eine Email Konto fehlt in derEMail "
-#~ "Aktion '%s'"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Argumente"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht !"
-
-#~ msgid "Latest Synchronization"
-#~ msgstr "Letzte Synchronisierung"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen"
-
-#~ msgid "Launching Date"
-#~ msgstr "Start Datum"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen beinhalten."
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Run Date"
-#~ msgstr "Start Datum"
-
-#~ msgid ""
-#~ "Fixed cost for the campaign (used for campaign analysis), see also variable "
-#~ "cost on activities"
-#~ msgstr ""
-#~ "Fixe Kosten für die gesamte Kampagne (für die Analyse), beachten Sie dabei "
-#~ "auch die variablen Kosten für die Einzelaktivitäten"
-
-#~ msgid "Synchronize"
-#~ msgstr "Synchronisiere"
-
-#~ msgid "Choose the model on which you want this campaign to be run"
-#~ msgstr "Wähle Modell als Ausgangspunkt für die Kampagne"
-
-#, python-format
-#~ msgid ""
-#~ "The campaign cannot be started: the email account is not approved in the "
-#~ "email activity '%s'"
-#~ msgstr ""
-#~ "Die Kampagne kann nicht gestartet werden: Dieser EMail Account wurde nicht "
-#~ "freigegeben '%s'"
-
-#~ msgid "Modified after Sync"
-#~ msgstr "Angepasst nach Synchr."
-
-#~ msgid "Paper"
-#~ msgstr "Papier"
-
-#~ msgid "If date is not set, this workitem have to be run manually"
-#~ msgstr ""
-#~ "Wenn Datum nicht gesetzt wurde, kann der Arbeitsauftrag nur manuell "
-#~ "gestartet werden."
-
-#~ msgid "If record modified after last sync (no duplicates)"
-#~ msgstr "Falls Datensatz nach letzter Synch. geändert wurde (keine Duplikate)"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "A marketing campaign is an event or activity that will help you manage and "
-#~ "reach your partners with specific messages. A campaign can have many "
-#~ "activities that will be triggered based on a specific situation. One "
-#~ "possible action could be sending an email template that has previously been "
-#~ "created in the system."
-#~ msgstr ""
-#~ "Eine Marketingkampagne ist ein Termin oder eine Aktivität für die Verwaltung "
-#~ "der Erreichbarkeit von Partnern durch speziellen Nachrichtenformate. Eine "
-#~ "Kampagne kann dabei auch aus mehreren Mailvorlagen bestehen, die bereits "
-#~ "früher im System  erzeugt wurden."
diff --git a/addons/marketing_campaign/i18n/el.po b/addons/marketing_campaign/i18n/el.po
index 02d5b95c984..aca69770c3f 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4422c732659..c668b0278e6 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -1154,37 +1154,3 @@ msgstr "Coste"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Año"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo inválido en la definición de la acción"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argumentos inválidos"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear un menú recursivo"
-
-#~ msgid "Choose the model on which you want this campaign to be run"
-#~ msgstr "Seleccione el modelo sobre el cual quiere realizar la campaña"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar por x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid ""
-#~ "A marketing campaign is an event or activity that will help you manage and "
-#~ "reach your partners with specific messages. A campaign can have many "
-#~ "activities that will be triggered based on a specific situation. One "
-#~ "possible action could be sending an email template that has previously been "
-#~ "created in the system."
-#~ msgstr ""
-#~ "Una campaña de marketing es un evento o actividad que le ayudará a gestionar "
-#~ "y contactar sus empresas con mensajes específicos. Una campaña puede tener "
-#~ "muchas actividades que se ejecutarán en una situación específica. Una acción "
-#~ "posible podría ser el envío de una plantilla de correo electrónico que ha "
-#~ "sido creada previamente en el sistema."
diff --git a/addons/marketing_campaign/i18n/es_MX.po b/addons/marketing_campaign/i18n/es_MX.po
new file mode 100644
index 00000000000..e97456df7c8
--- /dev/null
+++ b/addons/marketing_campaign/i18n/es_MX.po
@@ -0,0 +1,1156 @@
+# 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 17:20+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:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "Modo manual"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "Actividad previa"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+"La etapa actual para este elemento no tiene email o informe para "
+"previsualizar"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+"La actividad hacia / desde de la transición debe de ser de la misma campaña "
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity (or "
+"any activity with a signal and no previous activity)"
+msgstr ""
+"La campaña no puede ser iniciada: No tiene ninguna actividad de inicio (o "
+"alguna actividad con una señal y sin actividad previa)"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Tiempo"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr "Acción personalizada"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is missing in email "
+"activity '%s'"
+msgstr ""
+"La campaña no puede ser iniciada: falta el email en la actividad email '%s'"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+"Especifique un ingreso previsto si considera que cada elemento de la campaña "
+"que ha alcanzado este punto ha generado un cierto ingreso. Puede obtener "
+"estadísticas sobre ingresos en la sección de informes"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr "Disparador"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr "nº de acciones"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr "Editor de campañas"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign."
+msgstr ""
+"Determina un criterio adicional para añadir al filtro al seleccionar nuevos "
+"registros para inyectar en la campaña."
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+"Expresión de Python para decidir si la actividad se puede ejecutar, de lo "
+"contrario será eliminada o cancelada.La expresión puede utilizar las "
+"siguientes variables [navegables]:\n"
+"   - actividad: la actividad de la campaña\n"
+"   - trabajo: el elemento de trabajo de la campaña\n"
+"   - recurso: el recurso que representa esta campaña\n"
+"   - transiciones: lista de las transiciones de la campaña salientes desde "
+"esta actividad\n"
+"...- re: Expresión regular de Python"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr "Siguientes actividades"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "No preview"
+msgstr "Sin vista previa"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr "Fecha de lanzamiento"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr "Transiciones salientes"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "Reiniciar"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr "Escoja el recurso sobre el que desea lanzar esta campaña"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr "Última sincronización"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "Año(s)"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr "Disculpe, la duplicación de campañas no está soportada actualmente."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+"Fecha en la que este segmento se sincronizó por última vez (de forma "
+"automática o manualmente)."
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "Automático"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+"Test - Crea y procesa todas las actividades directamente (sin esperar por el "
+"retardo de las transiciones) pero no se envían correos ni se crean "
+"informes.\n"
+"Test en tiempo real - Crea y procesa todas las actividades directamente pero "
+"no envían correos ni se crean informes.\n"
+"Confirmación manual - La campaña se ejecuta normalidad, pero el usuario "
+"tiene que validar todos los elementos de trabajo manualmente.\n"
+"Normal - La campaña se ejecuta con normalidad y automáticamente envía todos "
+"los correos correos e informes (tenga cuidado con este modo, ¡trabaja \"en "
+"vivo\"!)"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr "Primera fecha de inicio de este segmento"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "Campaña"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr "Inicio"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty."
+msgstr ""
+"Los elementos de trabajo generados serán enlazados a la empresa relacionada "
+"con el registro. Si el registro es la propia empresa deje vacío este campo."
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr "Segmento"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr "Coste / ingreso"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+"El tipo de acción a ejecutar cuando se introduce un registro en esta "
+"actividad, como:\n"
+"   - Correo: envía un correo usando una plantilla predeterminada de correo\n"
+"   - Informe: imprime un informe existente definido en el recurso y lo "
+"guarda en el directorio especificado\n"
+"   - Acción personalizada: ejecuta una acción predeterminada, por ejemplo "
+"para modificar los campos del 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 vez que el trabajo de sincronización está programado para ejecutarse "
+"automáticamente."
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr "Mes(es)"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr "No eliminar elementos de trabajo"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr "Informes de marketing"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr "Recurso relacionado"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr "Modo de sincronización"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr "Ejecutar"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr "Actividades previas"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+"Fecha en la cual este segmento fue cerrado o cancelado por última vez"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr "Actividades campaña de marketing"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr "Mensaje de error"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr "Campañas"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr "Unidad de intervalo"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+"Indique un coste variable si considera que cada elemento de campaña que ha "
+"llegado a este punto ha supuesto un coste determinado. Puede obtener "
+"estadísticas de los costes en la sección de informes."
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr "Hora(s)"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr "Segmento de campaña"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+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 ""
+"Al activar esta opción, los elementos de trabajo que no se han ejecutado "
+"debido a que la condición no se cumple, se marcan como cancelados en lugar "
+"de ser eliminados."
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr "Elementos de trabajo"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr "Coste fijo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr "Recientemente modificado"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr "Valor intervalo"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr "Ingreso"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr "Actividad sigiuiente"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr "Seguimiento campaña"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr "El email a enviar cuando la actividad es activada"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr "Modo Test"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+"Solo registros actualizados después de la útlima sincronización (sin "
+"duplicados)"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr "Estadísticas de la campaña"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr "La acción a realizar cuando la actividad es activada"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr "Campo empresa"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: 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 "Análisis campaña"
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr "El intervalo debe ser positivo o cero"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr "Test en tiempo real"
+
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr "¡El nombre de la plantilla debe ser único!"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr "Test directamente"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr "Vista previa"
+
+#. module: marketing_campaign
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"         The campaigns are dynamic and multi-channels. The process is as "
+"follows:\n"
+"          * Design marketing campaigns like workflows, including email "
+"templates to send, reports to print and send by email, custom actions, etc.\n"
+"          * Define input segments that will select the items that should "
+"enter the campaign (e.g leads from certain countries, etc.)\n"
+"          * Run you campaign in simulation mode to test it real-time or "
+"accelerated, and fine-tune it\n"
+"          * You may also start the real campaign in manual mode, where each "
+"action requires manual validation\n"
+"          * Finally launch your campaign live, and watch the statistics as "
+"the campaign does everything fully automatically. \n"
+"          While the campaign runs you can of course continue to fine-tune "
+"the parameters, input segments, workflow, etc.\n"
+"          \n"
+"          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.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo provee automatización de iniciativas (clientes potenciales) a "
+"través de campañas de marketing (campañas que, en realidad, pueden ser "
+"definidas sobre cualquier recurso, no sólo contactos del CRM).\n"
+"         Las campañas son dinámicas y multicanal. El proceso es el "
+"siguiente:\n"
+"          * Diseñe las campañas de marketing como flujos de trabajo, "
+"incluyendo plantillas de correo electrónico a enviar, informes a imprimir y "
+"enviar por correo, acciones personalizadas, etc.\n"
+"          * Defina los segmentos de entrada que seleccionarán los elementos "
+"a introducir en la campaña (por ejemplo iniciativas de ciertos países, "
+"etc.)\n"
+"          * Lance su campaña en modo simulación para probarla en tiempo real "
+"o acelerada, y ajústela.\n"
+"          * Tambien puede iniciar la campaña real en modo manual, donde cada "
+"acción necesita validación manual.\n"
+"          * Finalmente lance su campaña en vivo, y observe las estadísticas "
+"mientras la campaña hace todo de forma completamente automatizada.\n"
+"          Por supuesto, mientras se ejecuta la campaña puede continuar "
+"ajustando los parámetros, segmentos de entrada, flujo, etc.\n"
+"          \n"
+"          Nota: Si necesita datos de prueba, puede instalar el módulo "
+"marketing_campaign_crm_demo, pero esto también instalará la aplicación de "
+"CRM dado que depende de las iniciativas del CRM.\n"
+"    "
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr "Esta actividad es lanzada cuando la campaña empieza"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+"Una actividad con una señal puede ser llamada mediante programación. Tenga "
+"cuidado, el elemento siempre se crea cuando se envía una señal."
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr "Todos los registros (si duplicados)"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr "Creado nuevamente"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr "El informe a generar cuando la actividad es activada"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is not approved in email "
+"activity '%s'"
+msgstr ""
+"La campaña no puede ser iniciada: el email no está aprobado en la actividad "
+"email '%s'"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr "Plantilla email"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr "Fecha de ejecución"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr "Elemento de trabajo de campaña"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr "Actividad campaña"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr "Esta carpeta se utilza para guardar los informes generados"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:488
+#, python-format
+msgid "Automatic transition"
+msgstr "Transición automática"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: marketing_campaign
+#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
+msgid "marketing_campaign"
+msgstr "Campaña marketing"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr "Proceso"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:490
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr "Cosmético"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr "Como se dispara el elemento de trabajo destino."
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+"Una campaña de marketing es un evento o actividad que le ayudará a gestionar "
+"y hacer llegar mensajes específicos a sus empresas. Una campaña puede tener "
+"muchas actividades que se activarán a partir de una situación concreta. Una "
+"acción podría ser el envío de una plantilla de correo electrónico "
+"previamente creada en el sistema."
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Operation not supported"
+msgstr "La operación no está soportada"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates for Models"
+msgstr "Plantillas email para modelos"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+"El modelo del filtro debe ser el mismo que el modelo del recurso de la "
+"campaña "
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr "Sincronizar manualmente"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are done"
+msgstr ""
+"La campaña no puede ser finalizada antes de que todos sus segmentos estén "
+"realizados"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr "Transición campaña"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr "Etapa campaña"
+
+#. 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 "Segmentos"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr "Todos los segmentos"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr "Transicions entrantes"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr "E-mail"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr "Día(s)"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr "Actividades"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr "En progreso"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:489
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr "Después %(interval_nbr)d %(interval_type)s"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr "Campaña de marketing"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+"Coste fijo para el funcionamiento de esta campaña. También puede especificar "
+"los costes variables y los ingresos en cada actividad de la campaña. Se "
+"incluyen estadísticas de costes e ingresos en los informes de la campaña."
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:746
+#, python-format
+msgid "Email Preview"
+msgstr "Vista previa email"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr "Señal"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it"
+msgstr "La campaña no puede ser iniciada: no contiene actividades"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+"Si no se indica la fecha, este elemento de trabajo debe ser ejecutado "
+"manualmente."
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr "Modo"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr "Actividad"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"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 seleccionar los registros de recursos que pertenecen a este "
+"segmento. Se pueden crear y guardar nuevos filtros con la búsqueda avanzada "
+"en la vista de lista de los recursos. Si no hay ningún filtro establecido, "
+"se seleccionan todos los registros sin filtrar. El modo de sincronización "
+"también puede añadir un criterio para el 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 "Seguimiento campaña"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr "Siguiente sincronización"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr "Filtro"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr "Todos"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr "Solo registros creados después de la última sincronización"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr "Coste variable"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr "Con configuración manual"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr "Coste"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr "Año"
diff --git a/addons/marketing_campaign/i18n/es_VE.po b/addons/marketing_campaign/i18n/es_VE.po
new file mode 100644
index 00000000000..e97456df7c8
--- /dev/null
+++ b/addons/marketing_campaign/i18n/es_VE.po
@@ -0,0 +1,1156 @@
+# 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 17:20+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:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "Modo manual"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "Actividad previa"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+"La etapa actual para este elemento no tiene email o informe para "
+"previsualizar"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+"La actividad hacia / desde de la transición debe de ser de la misma campaña "
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity (or "
+"any activity with a signal and no previous activity)"
+msgstr ""
+"La campaña no puede ser iniciada: No tiene ninguna actividad de inicio (o "
+"alguna actividad con una señal y sin actividad previa)"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Tiempo"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr "Acción personalizada"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is missing in email "
+"activity '%s'"
+msgstr ""
+"La campaña no puede ser iniciada: falta el email en la actividad email '%s'"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+"Especifique un ingreso previsto si considera que cada elemento de la campaña "
+"que ha alcanzado este punto ha generado un cierto ingreso. Puede obtener "
+"estadísticas sobre ingresos en la sección de informes"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr "Disparador"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr "nº de acciones"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr "Editor de campañas"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign."
+msgstr ""
+"Determina un criterio adicional para añadir al filtro al seleccionar nuevos "
+"registros para inyectar en la campaña."
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+"Expresión de Python para decidir si la actividad se puede ejecutar, de lo "
+"contrario será eliminada o cancelada.La expresión puede utilizar las "
+"siguientes variables [navegables]:\n"
+"   - actividad: la actividad de la campaña\n"
+"   - trabajo: el elemento de trabajo de la campaña\n"
+"   - recurso: el recurso que representa esta campaña\n"
+"   - transiciones: lista de las transiciones de la campaña salientes desde "
+"esta actividad\n"
+"...- re: Expresión regular de Python"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr "Siguientes actividades"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "No preview"
+msgstr "Sin vista previa"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr "Fecha de lanzamiento"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr "Transiciones salientes"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "Reiniciar"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr "Escoja el recurso sobre el que desea lanzar esta campaña"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr "Última sincronización"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "Año(s)"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr "Disculpe, la duplicación de campañas no está soportada actualmente."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+"Fecha en la que este segmento se sincronizó por última vez (de forma "
+"automática o manualmente)."
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "Automático"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+"Test - Crea y procesa todas las actividades directamente (sin esperar por el "
+"retardo de las transiciones) pero no se envían correos ni se crean "
+"informes.\n"
+"Test en tiempo real - Crea y procesa todas las actividades directamente pero "
+"no envían correos ni se crean informes.\n"
+"Confirmación manual - La campaña se ejecuta normalidad, pero el usuario "
+"tiene que validar todos los elementos de trabajo manualmente.\n"
+"Normal - La campaña se ejecuta con normalidad y automáticamente envía todos "
+"los correos correos e informes (tenga cuidado con este modo, ¡trabaja \"en "
+"vivo\"!)"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr "Primera fecha de inicio de este segmento"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "Campaña"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr "Inicio"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty."
+msgstr ""
+"Los elementos de trabajo generados serán enlazados a la empresa relacionada "
+"con el registro. Si el registro es la propia empresa deje vacío este campo."
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr "Segmento"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr "Coste / ingreso"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+"El tipo de acción a ejecutar cuando se introduce un registro en esta "
+"actividad, como:\n"
+"   - Correo: envía un correo usando una plantilla predeterminada de correo\n"
+"   - Informe: imprime un informe existente definido en el recurso y lo "
+"guarda en el directorio especificado\n"
+"   - Acción personalizada: ejecuta una acción predeterminada, por ejemplo "
+"para modificar los campos del 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 vez que el trabajo de sincronización está programado para ejecutarse "
+"automáticamente."
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr "Mes(es)"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr "Transiciones"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr "No eliminar elementos de trabajo"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr "Informes de marketing"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr "Recurso relacionado"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr "Nombre del recurso"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr "Modo de sincronización"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr "Ejecutar"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr "Actividades previas"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+"Fecha en la cual este segmento fue cerrado o cancelado por última vez"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr "Actividades campaña de marketing"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr "Mensaje de error"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr "Campañas"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr "Unidad de intervalo"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+"Indique un coste variable si considera que cada elemento de campaña que ha "
+"llegado a este punto ha supuesto un coste determinado. Puede obtener "
+"estadísticas de los costes en la sección de informes."
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr "Hora(s)"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr "Segmento de campaña"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+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 ""
+"Al activar esta opción, los elementos de trabajo que no se han ejecutado "
+"debido a que la condición no se cumple, se marcan como cancelados en lugar "
+"de ser eliminados."
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr "Elementos de trabajo"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr "Coste fijo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr "Recientemente modificado"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr "Valor intervalo"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr "Ingreso"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr "Actividad sigiuiente"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr "Seguimiento campaña"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr "El email a enviar cuando la actividad es activada"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr "Modo Test"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+"Solo registros actualizados después de la útlima sincronización (sin "
+"duplicados)"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr "Estadísticas de la campaña"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr "La acción a realizar cuando la actividad es activada"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr "Campo empresa"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: 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 "Análisis campaña"
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr "El intervalo debe ser positivo o cero"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr "Test en tiempo real"
+
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr "¡El nombre de la plantilla debe ser único!"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr "Test directamente"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr "Vista previa"
+
+#. module: marketing_campaign
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"         The campaigns are dynamic and multi-channels. The process is as "
+"follows:\n"
+"          * Design marketing campaigns like workflows, including email "
+"templates to send, reports to print and send by email, custom actions, etc.\n"
+"          * Define input segments that will select the items that should "
+"enter the campaign (e.g leads from certain countries, etc.)\n"
+"          * Run you campaign in simulation mode to test it real-time or "
+"accelerated, and fine-tune it\n"
+"          * You may also start the real campaign in manual mode, where each "
+"action requires manual validation\n"
+"          * Finally launch your campaign live, and watch the statistics as "
+"the campaign does everything fully automatically. \n"
+"          While the campaign runs you can of course continue to fine-tune "
+"the parameters, input segments, workflow, etc.\n"
+"          \n"
+"          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.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo provee automatización de iniciativas (clientes potenciales) a "
+"través de campañas de marketing (campañas que, en realidad, pueden ser "
+"definidas sobre cualquier recurso, no sólo contactos del CRM).\n"
+"         Las campañas son dinámicas y multicanal. El proceso es el "
+"siguiente:\n"
+"          * Diseñe las campañas de marketing como flujos de trabajo, "
+"incluyendo plantillas de correo electrónico a enviar, informes a imprimir y "
+"enviar por correo, acciones personalizadas, etc.\n"
+"          * Defina los segmentos de entrada que seleccionarán los elementos "
+"a introducir en la campaña (por ejemplo iniciativas de ciertos países, "
+"etc.)\n"
+"          * Lance su campaña en modo simulación para probarla en tiempo real "
+"o acelerada, y ajústela.\n"
+"          * Tambien puede iniciar la campaña real en modo manual, donde cada "
+"acción necesita validación manual.\n"
+"          * Finalmente lance su campaña en vivo, y observe las estadísticas "
+"mientras la campaña hace todo de forma completamente automatizada.\n"
+"          Por supuesto, mientras se ejecuta la campaña puede continuar "
+"ajustando los parámetros, segmentos de entrada, flujo, etc.\n"
+"          \n"
+"          Nota: Si necesita datos de prueba, puede instalar el módulo "
+"marketing_campaign_crm_demo, pero esto también instalará la aplicación de "
+"CRM dado que depende de las iniciativas del CRM.\n"
+"    "
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr "Esta actividad es lanzada cuando la campaña empieza"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+"Una actividad con una señal puede ser llamada mediante programación. Tenga "
+"cuidado, el elemento siempre se crea cuando se envía una señal."
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr "Todos los registros (si duplicados)"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr "Creado nuevamente"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr "El informe a generar cuando la actividad es activada"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is not approved in email "
+"activity '%s'"
+msgstr ""
+"La campaña no puede ser iniciada: el email no está aprobado en la actividad "
+"email '%s'"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr "Plantilla email"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr "Fecha de ejecución"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr "Elemento de trabajo de campaña"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr "Actividad campaña"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr "Esta carpeta se utilza para guardar los informes generados"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:488
+#, python-format
+msgid "Automatic transition"
+msgstr "Transición automática"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: marketing_campaign
+#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
+msgid "marketing_campaign"
+msgstr "Campaña marketing"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr "Proceso"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:490
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr "Cosmético"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr "Como se dispara el elemento de trabajo destino."
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+"Una campaña de marketing es un evento o actividad que le ayudará a gestionar "
+"y hacer llegar mensajes específicos a sus empresas. Una campaña puede tener "
+"muchas actividades que se activarán a partir de una situación concreta. Una "
+"acción podría ser el envío de una plantilla de correo electrónico "
+"previamente creada en el sistema."
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Operation not supported"
+msgstr "La operación no está soportada"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates for Models"
+msgstr "Plantillas email para modelos"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+"El modelo del filtro debe ser el mismo que el modelo del recurso de la "
+"campaña "
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr "Sincronizar manualmente"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are done"
+msgstr ""
+"La campaña no puede ser finalizada antes de que todos sus segmentos estén "
+"realizados"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr "Transición campaña"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr "Etapa campaña"
+
+#. 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 "Segmentos"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr "Todos los segmentos"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr "Transicions entrantes"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr "E-mail"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr "Día(s)"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr "Actividades"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr "En progreso"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:489
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr "Después %(interval_nbr)d %(interval_type)s"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr "Campaña de marketing"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+"Coste fijo para el funcionamiento de esta campaña. También puede especificar "
+"los costes variables y los ingresos en cada actividad de la campaña. Se "
+"incluyen estadísticas de costes e ingresos en los informes de la campaña."
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:746
+#, python-format
+msgid "Email Preview"
+msgstr "Vista previa email"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr "Señal"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it"
+msgstr "La campaña no puede ser iniciada: no contiene actividades"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+"Si no se indica la fecha, este elemento de trabajo debe ser ejecutado "
+"manualmente."
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr "Modo"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr "Actividad"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"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 seleccionar los registros de recursos que pertenecen a este "
+"segmento. Se pueden crear y guardar nuevos filtros con la búsqueda avanzada "
+"en la vista de lista de los recursos. Si no hay ningún filtro establecido, "
+"se seleccionan todos los registros sin filtrar. El modo de sincronización "
+"también puede añadir un criterio para el 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 "Seguimiento campaña"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr "Siguiente sincronización"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr "Filtro"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr "Todos"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr "Solo registros creados después de la última sincronización"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr "Coste variable"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr "Con configuración manual"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr "Coste"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr "Año"
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index be63ec0b0d5..ac48f134a58 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -1153,21 +1153,3 @@ msgstr "Coût"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Année"
-
-#~ msgid "Choose the model on which you want this campaign to be run"
-#~ msgstr ""
-#~ "Choisissez le modèle selon lequel vous voulez faire fonctionner cette "
-#~ "campagne"
-
-#~ msgid ""
-#~ "A marketing campaign is an event or activity that will help you manage and "
-#~ "reach your partners with specific messages. A campaign can have many "
-#~ "activities that will be triggered based on a specific situation. One "
-#~ "possible action could be sending an email template that has previously been "
-#~ "created in the system."
-#~ msgstr ""
-#~ "Une campagne marketing est un événement ou une activité qui vous aide à "
-#~ "gérer et à rejoindre vos partenaires avec des messages spécifiques. Une "
-#~ "campagne peut avoir plusieurs activités qui seront appelées lors d'une "
-#~ "situation spécifique. Une action possible peut être d'envoyer un modèle de "
-#~ "courriel qui a été précédemment créer dans le système."
diff --git a/addons/marketing_campaign/i18n/hu.po b/addons/marketing_campaign/i18n/hu.po
index d5a38501554..ebadf601d50 100644
--- a/addons/marketing_campaign/i18n/hu.po
+++ b/addons/marketing_campaign/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 14:42+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fc38fd57d5d..4d3c5518b78 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: 2011-05-07 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7cb21120c2f..bb70bc0d83e 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6d214b5f27d..f6e1b5043ad 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -1106,93 +1106,3 @@ msgstr "Үнэ"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Жил"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Activity Definition"
-#~ msgstr "Үйлдлын тодорхойлолт"
-
-#~ msgid "Create After Sync"
-#~ msgstr "Дараагийн Синх үүсгэх"
-
-#~ msgid "Dates"
-#~ msgstr "Огноо"
-
-#~ msgid ""
-#~ "\n"
-#~ "Allows you to setup leads automation through marketing campaigns. The "
-#~ "campaigns\n"
-#~ "are dynamic and multi-channels. The process:\n"
-#~ "* Design marketing campaigns that incluces mail templates, reports to "
-#~ "print,\n"
-#~ "  miscelleanous actions, etc.\n"
-#~ "* Define segments that are selections of target people\n"
-#~ "* Launch your campaign to automate communications.\n"
-#~ "\n"
-#~ "If you need demo data, you can install the module "
-#~ "marketing_campaign_crm_demo.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Allows you to setup leads automation through marketing campaigns. The "
-#~ "campaigns\n"
-#~ "are dynamic and multi-channels. The process:\n"
-#~ "* Design marketing campaigns that incluces mail templates, reports to "
-#~ "print,\n"
-#~ "  miscelleanous actions, etc.\n"
-#~ "* Define segments that are selections of target people\n"
-#~ "* Launch your campaign to automate communications.\n"
-#~ "\n"
-#~ "If you need demo data, you can install the module "
-#~ "marketing_campaign_crm_demo.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Python expression to decide whether the activity can be executed, otherwise "
-#~ "it will be deleted or cancelled.The expression may use the following "
-#~ "[browsable] variables:\n"
-#~ "   - activity: the campaign activity\n"
-#~ "   - workitem: the campaign workitem\n"
-#~ "   - object: the object this campaign item represents\n"
-#~ "   - transitions: list of campaign transitions outgoing from this activity\n"
-#~ "...- re: Python regular expression module"
-#~ msgstr ""
-#~ "Python expression to decide whether the activity can be executed, otherwise "
-#~ "it will be deleted or cancelled.The expression may use the following "
-#~ "[browsable] variables:\n"
-#~ "   - activity: the campaign activity\n"
-#~ "   - workitem: the campaign workitem\n"
-#~ "   - object: the object this campaign item represents\n"
-#~ "   - transitions: list of campaign transitions outgoing from this activity\n"
-#~ "...- re: Python regular expression module"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Алдаатай аргумент"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Latest Synchronization"
-#~ msgstr "Сүүлчийн синхрончлол"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid "Launching Date"
-#~ msgstr "Эхэлж буй огноо"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Run Date"
-#~ msgstr "Огноо"
-
-#~ msgid "Synchronize"
-#~ msgstr "Синхрончлол"
-
-#~ msgid "Paper"
-#~ msgstr "Цаас"
diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po
index 21f3389223c..08ed345719b 100644
--- a/addons/marketing_campaign/i18n/nl.po
+++ b/addons/marketing_campaign/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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -1142,23 +1142,3 @@ msgstr "Kosten"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Jaar"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Ongeldige argumenten"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid "Choose the model on which you want this campaign to be run"
-#~ msgstr "Kies het model waarmee u deze campagne wilt laten lopen"
diff --git a/addons/marketing_campaign/i18n/pl.po b/addons/marketing_campaign/i18n/pl.po
index d9f7535f46c..3deefb141a1 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -1056,52 +1056,3 @@ msgstr "Koszt"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Rok"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Activity Definition"
-#~ msgstr "Definicja czynności"
-
-#~ msgid "Dates"
-#~ msgstr "Daty"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Nieprawidłowe parametry"
-
-#~ msgid "Run Date"
-#~ msgstr "Data uruchomienia"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Launching Date"
-#~ msgstr "Data uruchomienia"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Status"
-#~ msgstr "Stan"
-
-#~ msgid "Synchronize"
-#~ msgstr "Synchronizuj"
-
-#~ msgid ""
-#~ "Fixed cost for the campaign (used for campaign analysis), see also variable "
-#~ "cost on activities"
-#~ msgstr ""
-#~ "Koszt stały kampanii (stosowany do analizy). Patrz również koszt zmienny dla "
-#~ "czynności."
-
-#~ msgid "Choose the model on which you want this campaign to be run"
-#~ msgstr "Wybierz model, na podstawie którego chcesz uruchomić tę kampanię"
-
-#~ msgid "Paper"
-#~ msgstr "Papier"
diff --git a/addons/marketing_campaign/i18n/pt.po b/addons/marketing_campaign/i18n/pt.po
index 5bf372efd49..1e4606098d7 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9782c67ff81..96ddeea94c6 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2036b824418..f4c85881403 100644
--- a/addons/marketing_campaign/i18n/ru.po
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -8,19 +8,19 @@ 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-10-10 07:30+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 22:35+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Manual Mode"
-msgstr ""
+msgstr "Ручной режим"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_from_id:0
@@ -170,7 +170,7 @@ msgstr ""
 #: view:campaign.analysis:0
 #: field:campaign.analysis,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
@@ -190,7 +190,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
 msgid "Last Synchronization"
-msgstr ""
+msgstr "Последняя синхронизация"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -256,7 +256,7 @@ msgstr "Кампания"
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,start:0
 msgid "Start"
-msgstr ""
+msgstr "Старт"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,partner_field_id:0
@@ -339,7 +339,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,type:0
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -352,12 +352,12 @@ msgstr ""
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.workitem,res_name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Название ресурса"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_mode:0
@@ -389,7 +389,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Сообщение об ошибке"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
@@ -397,33 +397,33 @@ msgstr ""
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
 #: view:marketing.campaign:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Кампании"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Ед. изм. интервала"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Страна"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_id:0
 #: selection:marketing.campaign.activity,type:0
 msgid "Report"
-msgstr ""
+msgstr "Отчёт"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: marketing_campaign
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Настройка"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,variable_cost:0
@@ -436,7 +436,7 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
-msgstr ""
+msgstr "Час(ов)"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
@@ -448,7 +448,7 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: view:marketing.campaign.workitem:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,keep_if_condition_not_met:0
@@ -460,12 +460,12 @@ msgstr ""
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Exceptions"
-msgstr ""
+msgstr "Исключения"
 
 #. module: marketing_campaign
 #: field:res.partner,workitem_ids:0
 msgid "Workitems"
-msgstr ""
+msgstr "Рабочие элементы"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
@@ -486,23 +486,23 @@ msgstr ""
 #: field:campaign.analysis,revenue:0
 #: field:marketing.campaign.activity,revenue:0
 msgid "Revenue"
-msgstr ""
+msgstr "Доход"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_to_id:0
@@ -522,12 +522,12 @@ msgstr ""
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "This Month"
-msgstr ""
+msgstr "Этот месяц"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Test Mode"
-msgstr ""
+msgstr "Тестовый режим"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
@@ -575,7 +575,7 @@ msgstr ""
 #. module: marketing_campaign
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "Название шаблона  должно быть уникальным!"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
@@ -585,12 +585,12 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_directory_id:0
 msgid "Directory"
-msgstr ""
+msgstr "Каталог"
 
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -598,12 +598,12 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
-msgstr ""
+msgstr "Предпросмотр"
 
 #. module: marketing_campaign
 #: model:ir.module.module,description:marketing_campaign.module_meta_information
@@ -635,12 +635,12 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Normal"
-msgstr ""
+msgstr "Обычный"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,start:0
@@ -657,7 +657,7 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
@@ -673,18 +673,18 @@ msgstr ""
 #: field:campaign.analysis,date:0
 #: view:marketing.campaign.workitem:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Условие"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_id:0
@@ -696,12 +696,12 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Исключение"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:141
@@ -714,12 +714,12 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "Шаблон письма"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -750,13 +750,13 @@ msgstr "Сгенереированные отчеты будут сохране
 #: code:addons/marketing_campaign/marketing_campaign.py:154
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,server_action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:488
@@ -768,7 +768,7 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "История"
 
 #. module: marketing_campaign
 #: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
@@ -809,24 +809,24 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Done"
-msgstr ""
+msgstr "Выполнено"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:209
 #, python-format
 msgid "Operation not supported"
-msgstr ""
+msgstr "Операция не поддерживается"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Шаблоны писем для моделей"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.segment:0
@@ -848,7 +848,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Идентификатор ресурса"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
@@ -861,7 +861,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Сделать"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -873,12 +873,12 @@ msgstr ""
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
 #: view:marketing.campaign.segment:0
 msgid "Segments"
-msgstr ""
+msgstr "Сегменты"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
 msgid "All Segments"
-msgstr ""
+msgstr "Все сегменты"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
@@ -888,23 +888,23 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "E-mail"
-msgstr ""
+msgstr "Эл. почта"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Дней"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,activity_ids:0
 #: view:marketing.campaign.activity:0
 msgid "Activities"
-msgstr ""
+msgstr "Действия"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -912,7 +912,7 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:489
@@ -923,17 +923,17 @@ msgstr ""
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign
 msgid "Marketing Campaign"
-msgstr ""
+msgstr "Маркетинговая кампания"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_done:0
 msgid "End Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -944,7 +944,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,object_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Ресурс"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,fixed_cost:0
@@ -958,12 +958,12 @@ msgstr ""
 #: code:addons/marketing_campaign/marketing_campaign.py:746
 #, python-format
 msgid "Email Preview"
-msgstr ""
+msgstr "Предпросмотр письма"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,signal:0
 msgid "Signal"
-msgstr ""
+msgstr "Сигнал"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:125
@@ -979,13 +979,13 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: field:marketing.campaign,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Режим"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -1020,12 +1020,12 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,ir_filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Фильтр"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "All"
-msgstr ""
+msgstr "Все"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
@@ -1047,42 +1047,10 @@ msgstr ""
 #: field:campaign.analysis,total_cost:0
 #: view:marketing.campaign:0
 msgid "Cost"
-msgstr ""
+msgstr "Затраты"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,year:0
 msgid "Year"
-msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ""
-#~ "Describe type of action to be performed on the Activity.Eg : Send email,Send "
-#~ "paper.."
-#~ msgstr ""
-#~ "Опишите тип действия которое необходимо выполнить. Например: Отправить "
-#~ "электронную почту, отправить буклет ..."
-
-#~ msgid "Activity Definition"
-#~ msgstr "Определение действия"
-
-#~ msgid "Keep as cancelled when condition not met"
-#~ msgstr "Оставить как отмененное если условие не выполнено."
-
-#~ msgid ""
-#~ "Determines when new workitems should be created for records matching a "
-#~ "segment."
-#~ msgstr ""
-#~ "Определяет, должен ли рабочий элемент создаваться для записи соответствующей "
-#~ "сегменту"
-
-#~ msgid "Dates"
-#~ msgstr "Даты"
-
-#~ msgid "Create After Sync"
-#~ msgstr "Создать После Синхронизации"
-
-#~ msgid "If record created after last sync"
-#~ msgstr "Если запись сделана после последней синхронизации"
+msgstr "Год"
diff --git a/addons/marketing_campaign/i18n/sr@latin.po b/addons/marketing_campaign/i18n/sr@latin.po
index 21d5a3aebc3..b2e223a51ea 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a115c426d1e..09b9733230c 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: 2011-04-29 05:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/zh_CN.po b/addons/marketing_campaign/i18n/zh_CN.po
index 95aafae0f40..e066f1af336 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: 2011-07-02 05:06+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -78,45 +78,45 @@ msgid ""
 "Set an expected revenue if you consider that every campaign item that has "
 "reached this point has generated a certain revenue. You can get revenue "
 "statistics in the Reporting section"
-msgstr ""
+msgstr "设置一个期望的收入，即如果你认为每个达到这个点的活动项会产生一定的收入。你可以在报表里面查看到收入统计。"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,trigger:0
 msgid "Trigger"
-msgstr ""
+msgstr "触发器"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
-msgstr ""
+msgstr "活动#"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Campaign Editor"
-msgstr ""
+msgstr "营销活动编辑器"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: view:marketing.campaign.workitem:0
 msgid "Today"
-msgstr ""
+msgstr "今天"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "March"
-msgstr ""
+msgstr "3"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_mode:0
 msgid ""
 "Determines an additional criterion to add to the filter when selecting new "
 "records to inject in the campaign."
-msgstr ""
+msgstr "当选择新的纪录添加的营销活动中的时候，确定一个额外的标准添加到过滤器中。"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "主题"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,condition:0
@@ -130,83 +130,89 @@ msgid ""
 "   - transitions: list of campaign transitions outgoing from this activity\n"
 "...- re: Python regular expression module"
 msgstr ""
+"由Python表达式决定活动是否被执行的，或者被删除，或者被取消。表达式可以用以下[browsable]变量：\n"
+"   -activity：营销活动项\n"
+"   -workitem：营销活动工作项\n"
+"   -resource：营销活动代表的资源对象\n"
+"   -transitions：从此活动转出的营销活动列表\n"
+"...-re：Python正则表达式模块"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,to_ids:0
 msgid "Next Activities"
-msgstr ""
+msgstr "下一个活动"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronization"
-msgstr ""
+msgstr "同步"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "This Year"
-msgstr ""
+msgstr "本年"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:772
 #, python-format
 msgid "No preview"
-msgstr ""
+msgstr "无预览"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,date_run:0
 msgid "Launch Date"
-msgstr ""
+msgstr "发起日期"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "输出转换"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Reset"
-msgstr ""
+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
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Year(s)"
-msgstr ""
+msgstr "年"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:209
 #, python-format
 msgid "Sorry, campaign duplication is not supported at the moment."
-msgstr ""
+msgstr "对不起，暂时不支持营销活动复制。"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
 "Date on which this segment was synchronized last time (automatically or "
 "manually)"
-msgstr ""
+msgstr "这部分上次同步的日期（自动或手工）"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
@@ -214,12 +220,12 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
 msgid "Automatic"
-msgstr ""
+msgstr "自动的"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,mode:0
@@ -233,11 +239,15 @@ 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
@@ -249,19 +259,19 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,campaign_id:0
 msgid "Campaign"
-msgstr ""
+msgstr "营销活动"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,start:0
 msgid "Start"
-msgstr ""
+msgstr "开始"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,partner_field_id:0
 msgid ""
 "The generated workitems will be linked to the partner related to the record. "
 "If the record is the partner itself leave this field empty."
-msgstr ""
+msgstr "生成的工作项将会关联此记录相关的业务伙伴。如果此记录本身是业务伙伴，请留空。"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -270,12 +280,12 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,segment_id:0
 msgid "Segment"
-msgstr ""
+msgstr "段"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Cost / Revenue"
-msgstr ""
+msgstr "成本/利润"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,type:0
@@ -288,16 +298,21 @@ msgid ""
 "of the resource record\n"
 "  "
 msgstr ""
+"工作项进入此活动时执行的操作类型，比如：\n"
+"    - 邮件：通过预定义的邮件模板发送邮件\n"
+"    - 报表：打印定义在资源上的报表，并把它保存到指定的目录\n"
+"    - 自定义操作： 执行一个预定义的操作，比如，修改资源记录的字段\n"
+"  "
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_next_sync:0
 msgid "Next time the synchronization job is scheduled to run automatically"
-msgstr ""
+msgstr "下次同步工作将被设为自动执行"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Month(s)"
-msgstr ""
+msgstr "月"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -305,17 +320,17 @@ msgstr ""
 #: model:ir.model,name:marketing_campaign.model_res_partner
 #: field:marketing.campaign.workitem,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Transitions"
-msgstr ""
+msgstr "转换"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,keep_if_condition_not_met:0
 msgid "Don't delete workitems"
-msgstr ""
+msgstr "不要删除工作项"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -327,22 +342,22 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Marketing Reports"
-msgstr ""
+msgstr "市场报告"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Related Resource"
-msgstr ""
+msgstr "相关资源"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,name:0
@@ -350,44 +365,44 @@ msgstr ""
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.workitem,res_name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "资源名称"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_mode:0
 msgid "Synchronization mode"
-msgstr ""
+msgstr "同步模式"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Run"
-msgstr ""
+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
 msgid "Date this segment was last closed or cancelled."
-msgstr ""
+msgstr "此部分最近关闭或取消的日期"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Marketing Campaign Activities"
-msgstr ""
+msgstr "市场营销活动"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "错误消息"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
@@ -395,33 +410,33 @@ msgstr ""
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
 #: view:marketing.campaign:0
 msgid "Campaigns"
-msgstr ""
+msgstr "营销活动"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "间隔单位"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国家/地区"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_id:0
 #: selection:marketing.campaign.activity,type:0
 msgid "Report"
-msgstr ""
+msgstr "报表"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "July"
-msgstr ""
+msgstr "7"
 
 #. module: marketing_campaign
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "设置"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,variable_cost:0
@@ -429,128 +444,128 @@ msgid ""
 "Set a variable cost if you consider that every campaign item that has "
 "reached this point has entailed a certain cost. You can get cost statistics "
 "in the Reporting section"
-msgstr ""
+msgstr "设置一个可变成本，如果你认为每项到达这个点的营销活动项就会需要一定的成本。你可以在报表栏查看成本统计分析结果。"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
-msgstr ""
+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
 #: view:marketing.campaign.segment:0
 #: view:marketing.campaign.workitem:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,keep_if_condition_not_met:0
 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 ""
+msgstr "激活此选项，由于条件没有满足而未执行的工作项会被标记为已取消，而不是被删除。"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Exceptions"
-msgstr ""
+msgstr "异常"
 
 #. module: marketing_campaign
 #: field:res.partner,workitem_ids:0
 msgid "Workitems"
-msgstr ""
+msgstr "工作项"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
 msgid "Fixed Cost"
-msgstr ""
+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
 #: field:marketing.campaign.activity,revenue:0
 msgid "Revenue"
-msgstr ""
+msgstr "收入"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "December"
-msgstr ""
+msgstr "12"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_to_id:0
 msgid "Next Activity"
-msgstr ""
+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:campaign.analysis:0
 msgid "This Month"
-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
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
 msgid "Campaign Statistics"
-msgstr ""
+msgstr "营销活动统计"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
 msgid "The action to perform when this activity is activated"
-msgstr ""
+msgstr "活动激活时执行的操作"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,partner_field_id:0
 msgid "Partner Field"
-msgstr ""
+msgstr "业务伙伴字段"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -558,37 +573,37 @@ 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 "营销活动分析"
 
 #. module: marketing_campaign
 #: sql_constraint:marketing.campaign.transition:0
 msgid "The interval must be positive or zero"
-msgstr ""
+msgstr "时间间隔必须为正数或零"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
-msgstr ""
+msgstr "实时检验"
 
 #. module: marketing_campaign
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "模板名称必须唯一！"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
-msgstr ""
+msgstr "直接检验"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_directory_id:0
 msgid "Directory"
-msgstr ""
+msgstr "目录"
 
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "出错！不能创建循环关联的成员。"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -596,12 +611,12 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
-msgstr ""
+msgstr "预览"
 
 #. module: marketing_campaign
 #: model:ir.module.module,description:marketing_campaign.module_meta_information
@@ -629,77 +644,91 @@ msgid ""
 "application as it depends on CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"此模块通过市场营销活动自动提供线索（实际上营销活动可以定义在任何资源上，不仅仅是CRM线索）。\n"
+"         营销活动是自动的，多渠道的。有以下过程：\n"
+"          *像工作流一样设计市场营销活动，包括要发送的邮件模板，打印和通过邮件发送的报表，自定义操作等。\n"
+"          *定义应该进入营销活动的输入段（比如，某些国家/地区的线索等）\n"
+"          *在模拟模式下启动营销活动，以实时或加速测试它，并且对它进行调优\n"
+"          *也可以通过手工模式启动实时的营销活动，每个操作需要手工验证\n"
+"          *最后启动营销活动，由于营销活动会完全自动执行所有操作，你只需要观察统计数字。\n"
+"          当营销活动运行时，你可以继续对参数，输入段，工作流等进行调优。\n"
+"          \n"
+"          "
+"注意：如果你需要演示数据，你可以安装marketing_campaign_crm_demo模块，它同时也会安装CRM应用程序，因为它依赖CRM "
+"线索模块。\n"
+"    "
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "August"
-msgstr ""
+msgstr "8"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Normal"
-msgstr ""
+msgstr "正常"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,start:0
 msgid "This activity is launched when the campaign starts."
-msgstr ""
+msgstr "此活动在营销活动开始时启动。"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,signal:0
 msgid ""
 "An activity with a signal can be called programmatically. Be careful, the "
 "workitem is always created when a signal is sent"
-msgstr ""
+msgstr "带信号的活动可以通过编程方式访问。请小心，当信号发出去的时候工作项会自动创建好。"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "June"
-msgstr ""
+msgstr "6"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "All records (no duplicates)"
-msgstr ""
+msgstr "所有记录（不重复）"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Created"
-msgstr ""
+msgstr "新创建的"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,date:0
 #: view:marketing.campaign.workitem:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "November"
-msgstr ""
+msgstr "11"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "条件"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_id:0
 msgid "The report to generate when this activity is activated"
-msgstr ""
+msgstr "活动被激活时生成的报表"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Exception"
-msgstr ""
+msgstr "异常"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "October"
-msgstr ""
+msgstr "10"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:141
@@ -707,38 +736,38 @@ msgstr ""
 msgid ""
 "The campaign cannot be started: the email account is not approved in email "
 "activity '%s'"
-msgstr ""
+msgstr "营销活动无法开始：邮件活动'%s'的邮箱帐号还没有通过审批。"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "邮件模板"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "January"
-msgstr ""
+msgstr "1"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,date:0
 msgid "Execution Date"
-msgstr ""
+msgstr "执行日期"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
 msgid "Campaign Workitem"
-msgstr ""
+msgstr "营销活动工作项"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
 msgid "Campaign Activity"
-msgstr ""
+msgstr "营销活动活动项"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_directory_id:0
 msgid "This folder is used to store the generated reports"
-msgstr ""
+msgstr "此文件夹用于存储生成的报表"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:125
@@ -748,47 +777,47 @@ msgstr ""
 #: code:addons/marketing_campaign/marketing_campaign.py:154
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "出错"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,server_action_id:0
 msgid "Action"
-msgstr ""
+msgstr "操作"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:488
 #, python-format
 msgid "Automatic transition"
-msgstr ""
+msgstr "自动迁移"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: marketing_campaign
 #: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
 msgid "marketing_campaign"
-msgstr ""
+msgstr "marketing_campaign"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Process"
-msgstr ""
+msgstr "流程"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:490
 #: selection:marketing.campaign.transition,trigger:0
 #, python-format
 msgid "Cosmetic"
-msgstr ""
+msgstr "装饰"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.transition,trigger:0
 msgid "How is the destination workitem triggered"
-msgstr ""
+msgstr "如何触发目标工作项"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
@@ -799,6 +828,8 @@ msgid ""
 "could be sending an email template that has previously been created in the "
 "system."
 msgstr ""
+"一个市场营销活动是一个事件或者活动，能帮助你管理和传递特定的信息给你的业务伙伴。营销活动可以拥有许多在特定条件下触发的活动。一个操作可以是发送一条以前在系"
+"统里面创建好的邮件模板。"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -807,51 +838,51 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Done"
-msgstr ""
+msgstr "已完成"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:209
 #, python-format
 msgid "Operation not supported"
-msgstr ""
+msgstr "操作不支持"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "模型的邮件模板"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
-msgstr ""
+msgstr "模型的过滤器必须和营销活动的资源模型一致 "
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronize Manually"
-msgstr ""
+msgstr "手工同步"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:154
 #, python-format
 msgid "The campaign cannot be marked as done before all segments are done"
-msgstr ""
+msgstr "只有所有的活动片段完成之后才能把营销活动设置为已完成"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "资源ID"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
-msgstr ""
+msgstr "营销互动迁移"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -859,50 +890,50 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr ""
+msgstr "待办"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Campaign Step"
-msgstr ""
+msgstr "营销活动步骤"
 
 #. 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 "片段"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
 msgid "All Segments"
-msgstr ""
+msgstr "所有片段"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "转入迁移"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "E-mail"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Day(s)"
-msgstr ""
+msgstr "天"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,activity_ids:0
 #: view:marketing.campaign.activity:0
 msgid "Activities"
-msgstr ""
+msgstr "活动"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "May"
-msgstr ""
+msgstr "5"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -910,28 +941,28 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr ""
+msgstr "正在运行"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:489
 #, python-format
 msgid "After %(interval_nbr)d %(interval_type)s"
-msgstr ""
+msgstr "在%(interval_nbr)d %(interval_type)s之后"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign
 msgid "Marketing Campaign"
-msgstr ""
+msgstr "市场营销活动"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_done:0
 msgid "End Date"
-msgstr ""
+msgstr "截止日期"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "February"
-msgstr ""
+msgstr "2"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -942,7 +973,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,object_id:0
 msgid "Resource"
-msgstr ""
+msgstr "资源"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,fixed_cost:0
@@ -950,40 +981,40 @@ msgid ""
 "Fixed cost for running this campaign. You may also specify variable cost and "
 "revenue on each campaign activity. Cost and Revenue statistics are included "
 "in Campaign Reporting."
-msgstr ""
+msgstr "开展此营销活动的固定成本。你也可以为每个营销活动指定可变成本和收入。成本和收入统计包含在营销活动报表中。"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:746
 #, python-format
 msgid "Email Preview"
-msgstr ""
+msgstr "邮件预览"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,signal:0
 msgid "Signal"
-msgstr ""
+msgstr "信号"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:125
 #, python-format
 msgid "The campaign cannot be started: there are no activities in it"
-msgstr ""
+msgstr "营销活动无法启动：没有任何活动项"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.workitem,date:0
 msgid "If date is not set, this workitem has to be run manually"
-msgstr ""
+msgstr "如果没有设置日期，此工作项必须由手工启动"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "April"
-msgstr ""
+msgstr "4"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: field:marketing.campaign,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "模式"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -992,7 +1023,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,activity_id:0
 msgid "Activity"
-msgstr ""
+msgstr "活动"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,ir_filter_id:0
@@ -1002,53 +1033,55 @@ 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 ""
+"过滤器，选择属于此活动段的匹配的资源记录。可以通过资源的列表视图的高级查询来创建和保存新的过滤器。如果没有设置过滤器，所有的都会被选中。同步模式也可以添加"
+"条件到过滤器中。"
 
 #. 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 "营销活动追踪"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_next_sync:0
 msgid "Next Synchronization"
-msgstr ""
+msgstr "下一个同步"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,ir_filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "过滤器"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "All"
-msgstr ""
+msgstr "全选"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records created after last sync"
-msgstr ""
+msgstr "最近一次同步后创建的新记录"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,variable_cost:0
 msgid "Variable Cost"
-msgstr ""
+msgstr "可变成本"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "With Manual Confirmation"
-msgstr ""
+msgstr "通过手工确认"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,total_cost:0
 #: view:marketing.campaign:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index ae1ab2309e2..82832134c27 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -113,7 +113,7 @@ this campaign to be run"),
 Test in Realtime - It creates and processes all the activities directly but does not send emails or produce reports.
 With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.
 Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"""),
-        'state': fields.selection([('draft', 'Draft'),
+        'state': fields.selection([('draft', 'New'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled'),],
@@ -144,13 +144,6 @@ Normal - the campaign runs normally and automatically sends all emails and repor
             if activity.signal and len(activity.from_ids) == 0:
                 has_signal_without_from = True
 
-            if activity.type != 'email':
-                continue
-            if not activity.email_template_id.from_account:
-                raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is missing in email activity '%s'")%activity.name)
-            if activity.email_template_id.from_account.state != 'approved':
-                raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is not approved in email activity '%s'")%activity.name)
-
         if not has_start and not has_signal_without_from:
             raise osv.except_osv(_("Error"), _("The campaign cannot be started: it doesn't have any starting activity (or any activity with a signal and no previous activity)"))
 
@@ -274,7 +267,7 @@ class marketing_campaign_segment(osv.osv):
                                            '"No duplicates" prevents selecting records which have already entered the campaign previously.'\
                                            'If the campaign has a "unique field" set, "no duplicates" will also prevent selecting records which have '\
                                            'the same value for the unique field as other records that already entered the campaign.'),
-        'state': fields.selection([('draft', 'Draft'),
+        'state': fields.selection([('draft', 'New'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled')],
@@ -484,9 +477,9 @@ class marketing_campaign_activity(osv.osv):
         return True
 
     def _process_wi_email(self, cr, uid, activity, workitem, context=None):
-        return self.pool.get('email.template').generate_mail(cr, uid,
+        return self.pool.get('email.template').send_mail(cr, uid,
                                             activity.email_template_id.id,
-                                            [workitem.res_id], context=context)
+                                            workitem.res_id, context=context)
 
     def _process_wi_action(self, cr, uid, activity, workitem, context=None):
         if context is None:
@@ -807,7 +800,7 @@ class marketing_campaign_workitem(osv.osv):
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy':True,
-                'context': "{'template_id':%d,'default_rel_model_ref':%d}"%
+                'context': "{'template_id':%d,'default_res_id':%d}"%
                                 (wi_obj.activity_id.email_template_id.id,
                                  wi_obj.res_id)
             }
@@ -831,7 +824,7 @@ marketing_campaign_workitem()
 class email_template(osv.osv):
     _inherit = "email.template"
     _defaults = {
-        'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
+        'model_id': lambda obj, cr, uid, context: context.get('object_id',False),
     }
 
     # TODO: add constraint to prevent disabling / disapproving an email account used in a running campaign
@@ -851,3 +844,5 @@ class report_xml(osv.osv):
 
 report_xml()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 65c2397a3f7..a60b3943a41 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -36,7 +36,7 @@
                 <field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
                 <separator string="" colspan="4" />
                 <group col="10" colspan="4">
-                    <field name="state" readonly="1" />
+                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
@@ -51,7 +51,7 @@
         <field name="model">marketing.campaign</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('running');gray:state in ('done','cancelled')" string="Campaigns">
+            <tree colors="blue:state == 'draft';black:state == 'running';gray:state in ('done','cancelled')" string="Campaigns">
                 <field name="name" select="1"/>
                 <field name="object_id" select="1"/>
                 <field name="mode"/>
@@ -95,10 +95,10 @@
                <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
                <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
                <separator orientation="vertical"/>
-               <field name="name" select="1"/>
-               <field name="object_id" select="1" string="Resource"/>
+               <field name="name"/>
+               <field name="object_id" string="Resource"/>
                <newline/>
-               <group expand="0" string="Group By..." colspan="10" col="12">
+               <group expand="0" string="Group By...">
                    <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
                    <separator orientation="vertical"/>
                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
@@ -161,7 +161,7 @@
                 </group>
                 <separator string="" colspan="4"/>
                 <group col="6" colspan="4">
-                    <field name="state" readonly="1"/>
+                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
@@ -176,7 +176,7 @@
         <field name="model">marketing.campaign.segment</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('running');gray:state in ('done','cancelled')" string="Segments">
+            <tree colors="blue:state == 'draft';black:state == 'running';gray:state in ('done','cancelled')" string="Segments">
                 <field name="name"/>
                 <field name="campaign_id"/>
                 <field name="date_run"/>
@@ -200,12 +200,12 @@
                <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
                <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
                <separator orientation="vertical"/>
-               <field name="name" select="1"/>
-               <field name="campaign_id" select="1"/>
-               <field name="object_id" select="1"/>
-               <field name="date_run" select="1"/>
+               <field name="name"/>
+               <field name="campaign_id"/>
+               <field name="object_id"/>
+               <field name="date_run"/>
                <newline/>
-               <group expand="0" string="Group By..." colspan="10" col="12">
+               <group expand="0" string="Group By...">
                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                    <separator orientation="vertical"/>
                    <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
@@ -267,7 +267,7 @@
                     <field name="type"/>
                     <group colspan='2' col='1'>
                         <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
-                               context="{'default_object_name':object_id}" />
+                               context="{'default_model_id':object_id}" />
                         <group attrs="{'invisible':[('type','!=','report')]}" >
                             <field name="report_id" attrs="{'required':[('type','=','report')]}" context="{'object_id':object_id}"/>
                             <field name="report_directory_id" attrs="{'required':[('type','=','report')]}" />
@@ -334,7 +334,7 @@
         <field name="model">marketing.campaign.workitem</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="red:state in ('exception');black:state in ('todo');gray:state in ('cancelled')" string="Marketing Campaign Activities">
+            <tree colors="red:state == 'exception';black:state == 'todo';gray:state == 'cancelled'" string="Marketing Campaign Activities">
                 <field name="campaign_id"/>
                 <field name="segment_id"/>
                 <field name="activity_id" />
@@ -382,7 +382,7 @@
                 </group>
                 <separator string="" colspan="4"/>
                 <group colspan="4" col="11">
-                    <field name="state" readonly="True"/>
+                    <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
                     <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                     <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
                     <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
@@ -397,7 +397,7 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Marketing Campaign Activities">
-               <group colspan="4" col="10">
+               <group>
                 <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
                 <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
                 <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
@@ -412,7 +412,7 @@
                 <field name="partner_id"/>
                </group>
                <newline/>
-               <group expand="0" string="Group By..." colspan="10" col="12">
+               <group expand="0" string="Group By...">
                    <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index af04a7e6dff..ebbb6034a1a 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -99,3 +99,5 @@ class campaign_analysis(osv.osv):
             )
         """)
 campaign_analysis()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 745dd4047e5..1bfdf69acf0 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -32,12 +32,17 @@
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
                    <group>
-                    <filter icon="terp-go-year"
-                            string="This Year"
+                    <filter icon="terp-go-year" name="year"
+                            string="Year"
                             domain="[('year','=',time.strftime('%%Y'))]"/>
+                    <separator orientation="vertical"/>
+
                     <filter icon="terp-go-month"
-                            string="This Month"
+                            string="Month" name="This Month"
                             domain="[('month','=',time.strftime('%%m'))]"/>
+                    <filter icon="terp-go-month" string="    Month-1    "
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
+
                     <filter icon="terp-go-today"
                             string="Today"
                             domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
@@ -59,7 +64,7 @@
                     <field name="country_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
+                <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                     <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
@@ -81,7 +86,7 @@
         <field name="res_model">campaign.analysis</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year': 1,"search_default_This Month":1,'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index c2b7b4f4c86..b0157b76c51 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -7,7 +7,7 @@
 "access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0
 "access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
 "access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0
-"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,0,0
+"access_email_template_account_user","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_user",1,1,0,0
 "access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
 "access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
 "access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
@@ -18,4 +18,4 @@
 "access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1
 "access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1
 "access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
-"access_email_template_account_manager","email_template.account.manager","email_template.model_email_template_account","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_account_manager","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_manager",1,1,1,1
diff --git a/addons/marketing_campaign_crm_demo/__init__.py b/addons/marketing_campaign_crm_demo/__init__.py
index 50a14119520..4c241b72be9 100644
--- a/addons/marketing_campaign_crm_demo/__init__.py
+++ b/addons/marketing_campaign_crm_demo/__init__.py
@@ -1 +1,3 @@
 # Debian packaging removes blank files, so this comment is added.
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index 7fd9155bf9b..4841cc1a2e8 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -27,7 +27,7 @@
                  "crm",
                 ],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Hidden',
     "description": """
 Demo data for the module marketing_campaign.
 ============================================
diff --git a/addons/marketing_campaign_crm_demo/i18n/bg.po b/addons/marketing_campaign_crm_demo/i18n/bg.po
index d129a311c3a..35be1832895 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8fff7327d45..ad2a7a3ea44 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ca.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ca.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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+msgstr "Informe de demostració de campanya de màrqueting"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_1
@@ -28,11 +28,13 @@ msgid ""
 "Hello,Thanks for generous interest you have shown in the "
 "openERP.Regards,OpenERP Team,"
 msgstr ""
+"Hola, gràcies pel generós interès que heu mostrat per l'OpenERP. "
+"Salutacions, l'Equip de l'OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
 msgid "Demo data for the module marketing_campaign."
-msgstr ""
+msgstr "Dades de demostració per al mòdul marketing_campaign."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
@@ -42,31 +44,36 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Hola, Gràcies pel seu interès i compra del llibre d'OpenERP.\n"
+"            Si necessiteu més informació, tingueu l'amabilitat de tornar.\n"
+"            Sincerament agraïm la vostra cooperació.\n"
+"            Salutacions, l'equip de l'OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
 msgstr ""
+"Proposa subscriure's al Dia de Descobriment de l'OpenERP el maig de 2010"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
 msgid "Propose paid training to Silver partners"
-msgstr ""
+msgstr "Proposa formació de pagament als socis de Plata"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
 msgid "Thanks for showing interest in OpenERP"
-msgstr ""
+msgstr "Gràcies per mostrar interes per l'OpenERP"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
 msgid "Thanks for buying the OpenERP book"
-msgstr ""
+msgstr "Gràcies per comprar el llibre de l'OpenERP"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
-msgstr ""
+msgstr "Proposa una formació tècnica gratuïta als socis d'Or"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
@@ -77,11 +84,16 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Hola, tenim una excel·lent oferta que pot ser adequada per a vosaltres.\n"
+"            Per als socis de Plata, estem oferint fer-se socis d'Or.\n"
+"            Si necessiteu més informació, tingueu l'amabilitat de tornar.\n"
+"            Sincerament agraïm la vostra cooperació.\n"
+"            Salutacions, l'equip de l'OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
 msgid "Partner :"
-msgstr ""
+msgstr "Empresa :"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
@@ -91,21 +103,25 @@ msgid ""
 "appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Hola, Gràcies pel seu interès i subscripció a la formació tècnica. Si "
+"necessiteu més informació, no dubteu a escriure a aquesta adreça. "
+"Sincerament agraeixo la seva cooperació.\n"
+"            Salutacions, l'equip d'OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
 msgid "Company :"
-msgstr ""
+msgstr "Empresa :"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
 msgid "Thanks for subscribing to technical training"
-msgstr ""
+msgstr "Gràcies per subscriure-vos a la formació tècnica"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
 msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
+msgstr "Gràcies per subscriure-vos a l'OpenERP Discovery Day"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
@@ -117,6 +133,13 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Hola, Tenim una excel·lent oferta que pot ser adequada per a vostè.\n"
+"            Per als nostres associats Gold, estem oferint formació tècnica "
+"gratuïta al juny, 2010.\n"
+"            Si necessiteu més informació, no dubteu a escriure a aquesta "
+"adreça.\n"
+"            Sincerament agraeixo la seva cooperació.\n"
+"            Salutacions, l'equip d'OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
@@ -127,6 +150,11 @@ msgid ""
 "             I really appreciate your co-operation on this.\n"
 "             Regards,OpenERP Team,"
 msgstr ""
+"Hola, Gràcies pel seu interès i subscripció al OpenERP Discovery Day.\n"
+"            Si necessiteu mes informació, no dubteu a escriure a aquesta "
+"adreça.\n"
+"            Sincerament agraeixo la seva cooperació.\n"
+"            Salutacions, l'equip d'OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
@@ -138,6 +166,13 @@ msgid ""
 "            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Hola, Tenim una excel·lent oferta que us pot satisfer.\n"
+"            Us oferim subscriure-vos a l'OpenERP Discovery Day de maig de "
+"2010.\n"
+"            Si necessiteu mes informació, no dubteu a escriure a aquesta "
+"adreça.\n"
+"            Sincerament agraeixo la seva cooperació.\n"
+"            Salutacions, l'equip de OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
@@ -149,18 +184,25 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Hola, tenim una excel·lent oferta que us pot satisfer.\n"
+"            Per als nostres associats Plata, tenim formació tècnica pagada "
+"el juny de 2010.\n"
+"            Si necessiteu mes informació, no dubteu a escriure a aquesta "
+"adreça.\n"
+"            Sincerament agraeixo la seva cooperació.\n"
+"            Salutacions, l'equip de OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
 msgid "Dummy Action"
-msgstr ""
+msgstr "Acció de simulacre"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
 msgid "marketing_campaign_crm_demo"
-msgstr ""
+msgstr "marketing_campaign_crm_demo"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
-msgstr ""
+msgstr "Proposa associació or a associats plata"
diff --git a/addons/marketing_campaign_crm_demo/i18n/de.po b/addons/marketing_campaign_crm_demo/i18n/de.po
index 99a11023ffb..b8c792df5ac 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -208,37 +208,3 @@ msgstr "marketing_campaign_crm_demo"
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
 msgstr "Vorschlag der Gold Partnerschaft für Silber Partner"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Fehler ! Sie können keine rekursiven Verzeichnisse anlegen."
-
-#~ msgid "Model of filter must be same as resource model of Campaign "
-#~ msgstr ""
-#~ "Das Modul für den Filter sollte der Ressource für diese Kampagne entsprechen "
-
-#~ msgid "The template name must be unique !"
-#~ msgstr "Die Vorlage muss eindeutig sein !"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr ""
-#~ "Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
-#~ "haben"
-
-#~ msgid "The interval must be positive or zero"
-#~ msgstr "Das Intervall muss positiv oder 0 sein"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Das Verzeichnis kann nicht sich selbst übergeordnet werden"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Das Verzeichnis muss eindeutig sein"
-
-#~ msgid "The To/From Activity of transition must be of the same Campaign "
-#~ msgstr ""
-#~ "Ein- und ausgehende Verbindungen müssen zur gleichen Kampagne gehören "
diff --git a/addons/marketing_campaign_crm_demo/i18n/es.po b/addons/marketing_campaign_crm_demo/i18n/es.po
index 227fa974cf5..5fd0677e441 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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_MX.po b/addons/marketing_campaign_crm_demo/i18n/es_MX.po
new file mode 100644
index 00000000000..e6e9a12305b
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/es_MX.po
@@ -0,0 +1,210 @@
+# 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 17:13+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: 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 "Informe de campaña de marketing de demostración"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_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 ""
+"Hola, gracias por el generoso interés que ha mostrado en OpenERP. Saludos, "
+"el Equipo de OpenERP."
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr "Datos demo para el módulos marketing_campaign."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Gracias por su interés y compra del libro OpenERP.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Proponer subscribiese al OpenERP Discovery Day en mayo de 2010"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Proponer formación de pago a los asociados Plata"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Gracias por mostrar interes en OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "Gracias por comprar el libro de OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "Proponer una formación técnica a asociados Oro"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Para nuestros asociados Silver, estamos ofreciendo asociación "
+"Gold.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Empresa :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Gracias por su interés y suscripción a la formación técnica. Si "
+"requiriera mas información, no dude en escribir a esta dirección. "
+"Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Compañía :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Gracias por subscribirse a la formación técnica"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Gracias por subscribirse al OpenERP Discovery Day"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_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 ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Para nuestros asociados Gold, estamos ofreciendo formación "
+"técnica gratuita en junio, 2010.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_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 ""
+"Hola, Gracias por su interés y suscripción al OpenERP Discovery Day.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Le ofrecemos suscribirse al OpenERP Discovery Day de mayo, "
+"2010.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Para nuestros asociados Silver, tenemos formación técnica pagada "
+"en junio, 2010.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Acción de simulacro"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr "marketing_campaign_crm_demo"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Proponer asociación oro a asociados plata"
diff --git a/addons/marketing_campaign_crm_demo/i18n/es_VE.po b/addons/marketing_campaign_crm_demo/i18n/es_VE.po
new file mode 100644
index 00000000000..e6e9a12305b
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/es_VE.po
@@ -0,0 +1,210 @@
+# 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 17:13+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: 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 "Informe de campaña de marketing de demostración"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_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 ""
+"Hola, gracias por el generoso interés que ha mostrado en OpenERP. Saludos, "
+"el Equipo de OpenERP."
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr "Datos demo para el módulos marketing_campaign."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Gracias por su interés y compra del libro OpenERP.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Proponer subscribiese al OpenERP Discovery Day en mayo de 2010"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Proponer formación de pago a los asociados Plata"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Gracias por mostrar interes en OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "Gracias por comprar el libro de OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "Proponer una formación técnica a asociados Oro"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Para nuestros asociados Silver, estamos ofreciendo asociación "
+"Gold.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Empresa :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Gracias por su interés y suscripción a la formación técnica. Si "
+"requiriera mas información, no dude en escribir a esta dirección. "
+"Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Compañía :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Gracias por subscribirse a la formación técnica"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Gracias por subscribirse al OpenERP Discovery Day"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_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 ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Para nuestros asociados Gold, estamos ofreciendo formación "
+"técnica gratuita en junio, 2010.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_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 ""
+"Hola, Gracias por su interés y suscripción al OpenERP Discovery Day.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Le ofrecemos suscribirse al OpenERP Discovery Day de mayo, "
+"2010.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hola, Tenemos una excelente oferta que puede ser adecuada para usted.\n"
+"            Para nuestros asociados Silver, tenemos formación técnica pagada "
+"en junio, 2010.\n"
+"            Si requiriera mas información, no dude en escribir a esta "
+"dirección.\n"
+"            Sinceramente agradezco su cooperación.\n"
+"            Saludos, el equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Acción de simulacro"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr "marketing_campaign_crm_demo"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Proponer asociación oro a asociados plata"
diff --git a/addons/marketing_campaign_crm_demo/i18n/fr.po b/addons/marketing_campaign_crm_demo/i18n/fr.po
index 3074cd03ffd..81d2042be1a 100644
--- a/addons/marketing_campaign_crm_demo/i18n/fr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-12-25 10:31+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 914b23185a7..35808336efd 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a25cece8bce..aa2ee28129d 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hu.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-21 15:22+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8490eb6b517..45b05f59ccb 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -209,6 +209,3 @@ msgstr "marketing_campaign_crm_demo"
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
 msgstr "Proponi una parthership gold ai partner silver"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Errore! Non puoi creare Direcroty ricorsive"
diff --git a/addons/marketing_campaign_crm_demo/i18n/nl.po b/addons/marketing_campaign_crm_demo/i18n/nl.po
index b0c7a287ddd..83bbd499e9b 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -203,6 +203,3 @@ msgstr "marketing_campaign_crm_demo"
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
 msgstr "Stel goud partnerschap voor aan zilver partners"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Fout! U kunt geen recursieve mappen maken"
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt.po b/addons/marketing_campaign_crm_demo/i18n/pt.po
index 119cbfec54f..eb27fecb9b1 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 43917aa64e0..dc32b9b3e54 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1202b0ab258..eecdf73b57b 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ru.po
+++ b/addons/marketing_campaign_crm_demo/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: 2010-09-30 06:47+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-08-28 14:22+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -28,6 +28,8 @@ msgid ""
 "Hello,Thanks for generous interest you have shown in the "
 "openERP.Regards,OpenERP Team,"
 msgstr ""
+"Здавствуйте. Благодарим за интерес, проявленный к OpenERP. С наилучшими "
+"пожеланиями, команда OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
@@ -44,31 +46,35 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Здравствуйте! Благодарим за проявленный интерес и покупку книги об OpenERP.\n"
+"            Если Вам потребуется дополнительная информация - обращайтесь.\n"
+"            Надеемся на дальнейшее сотрудничество с Вами.\n"
+"            С наилучшими пожеланиями, команда OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr ""
+msgstr "Предложение подписки на OpenERP Discovery Day в мае 2010."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
 msgid "Propose paid training to Silver partners"
-msgstr ""
+msgstr "Предложить платный тренинг \"серебряным\" партнёрам."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
 msgid "Thanks for showing interest in OpenERP"
-msgstr ""
+msgstr "Спасибо за проявленный интерес к OpenERP"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
 msgid "Thanks for buying the OpenERP book"
-msgstr ""
+msgstr "Спасибо за покупку книги об OpenERP"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
-msgstr ""
+msgstr "Предложить бесплатный технический тренинг \"золотым\" партнёрам."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
@@ -79,11 +85,17 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Здравствуйте! Возможно, у нас есть для Вас подходящее предложение.\n"
+"            Мы предлагаем \"золотое\" партнёрство своим серебряным "
+"партнёрам.\n"
+"            Если Вам потребуется дополнительная информация - обращайтесь.\n"
+"            Надеемся на дальнейшее сотрудничество с Вами.\n"
+"            С наилучшими пожеланиями, команда OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
 msgid "Partner :"
-msgstr "Партнер:"
+msgstr "Контрагент:"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
@@ -166,6 +178,3 @@ msgstr ""
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
 msgstr ""
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Ошибка! Вы не можете созадавать вложенные директории."
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr.po b/addons/marketing_campaign_crm_demo/i18n/sr.po
index 35b0b5006bf..6086f8dc143 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -181,9 +181,3 @@ msgstr "marketing_campaign_crm_demo"
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
 msgstr "Predlazemo zlatno"
-
-#~ msgid "The To/From Activity of transition must be of the same Campaign "
-#~ msgstr "Za / Od Aktivnosti tranzicije moraju biti iz iste kampanje "
-
-#~ msgid "Model of filter must be same as resource model of Campaign "
-#~ msgstr "Model filtera mora biti isti kao resurs modela Kampanje "
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
index 8e1cde1a7b7..5017d888844 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -181,9 +181,3 @@ msgstr "marketing_campaign_crm_demo"
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
 msgstr "Predlazemo zlatno"
-
-#~ msgid "The To/From Activity of transition must be of the same Campaign "
-#~ msgstr "Za / Od Aktivnosti tranzicije moraju biti iz iste kampanje "
-
-#~ msgid "Model of filter must be same as resource model of Campaign "
-#~ msgstr "Model filtera mora biti isti kao resurs modela Kampanje "
diff --git a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
index 7723b72fe43..5a0fc2c7a04 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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -51,7 +51,7 @@ msgstr ""
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr "推荐订购2010年5月的OpenERP 发现日 （OpenERP Discovery Day）"
+msgstr "推荐订阅2010年5月的OpenERP探索 （OpenERP Discovery Day）"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
@@ -130,6 +130,12 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"您好，我们有非常好的服务可能适合您\n"
+"    对金牌业务伙伴我们将安排在2010年6月进行免费的技术培训\n"
+"    如果需要了解更多的信息请回复。\n"
+"    在此再次感谢您的合作。\n"
+"    \n"
+"            致敬                                        OpenErp小组"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
@@ -140,6 +146,11 @@ msgid ""
 "             I really appreciate your co-operation on this.\n"
 "             Regards,OpenERP Team,"
 msgstr ""
+"您好，感谢您订阅OpenErp探索感兴趣。\n"
+"    如果需要了解更多信息请回复。\n"
+"    在此感谢您的合作。\n"
+"    \n"
+"                  致敬                                OpenErp小组"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
@@ -151,6 +162,12 @@ msgid ""
 "            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"您好，我们有非常好的服务可能适合您\n"
+"    我们建议您在2010年5月订阅OpenErp探索\n"
+"    如果您想了解等多的信息请回复\n"
+"    在此感谢您的合作\n"
+"\n"
+"                 致敬                               OpenErp小组"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
@@ -162,18 +179,24 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"您好我们有非常好的服务可能适合您\n"
+"     对银牌业务伙伴我们将计划在2010年6月安排有偿的技术培训\n"
+"    如果您想了解等多的信息请回复\n"
+"    在此感谢您的合作\n"
+"\n"
+"                 致敬                                  OpenErp小组"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
 msgid "Dummy Action"
-msgstr ""
+msgstr "不执行任何动作"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
 msgid "marketing_campaign_crm_demo"
-msgstr ""
+msgstr "marketing_campaign_crm_demo"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
-msgstr ""
+msgstr "向银牌合作伙伴推荐金牌合作"
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index affcf0a0294..20d01b6a60e 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Membership',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module allows you to manage all operations for managing memberships.
 =========================================================================
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
index bf4d0c89da6..afaffa0f30b 100644
--- a/addons/membership/i18n/ar.po
+++ b/addons/membership/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
index fbe759473f3..f0bf8265625 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ca5d77a694d..313a58ebef1 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2eb239523e5..059550f76ca 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -38,27 +38,27 @@ msgstr "Soci pagat"
 #: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "Núm. pagat"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "Import guanyat"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "Anàlisi dels socis"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
@@ -75,7 +75,7 @@ msgstr "Factura està pagada."
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -90,17 +90,17 @@ msgstr "Esperant a facturar"
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "Data de finalització com a soci"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Proveïdors"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "Tots els socis"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
@@ -116,7 +116,7 @@ msgstr "Producte a soci"
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "Inscriu soci"
 
 #. module: membership
 #: field:res.partner,associate_member:0
@@ -131,7 +131,7 @@ msgstr "El soci és beneficiari."
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "Import pendent"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
@@ -141,17 +141,17 @@ msgstr "Empresa beneficiaria."
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "Núm. facturats"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "Anàlisi dels socis"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "Data de finalització com a soci"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -162,7 +162,7 @@ msgstr "Data des de"
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "L'empresa no té una direcció per a realitzar la factura."
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
@@ -208,6 +208,19 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Indica l'estat del soci.\n"
+"                    -No soci: Un membre que no ha sol·licitat la seva "
+"afiliació.\n"
+"                    -Soci cancel·lat: Un membre que ha cancel·lat la seva "
+"afiliació.\n"
+"                    -Soci antic: Un membre la data del qual de soci ha "
+"expirat.\n"
+"                    -Soci en espera: Un membre que ha sol·licitat la seva "
+"afiliació i la factura de la qual es va a crear.\n"
+"                    -Soci facturat: Un membre la factura del qual ha estat "
+"creada.\n"
+"                    -Soci pagat: Un membre que ha pagat l'import de la quota "
+"de soci."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -240,7 +253,7 @@ msgstr "Soci ha pagat"
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "Núm. esperant"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -264,12 +277,12 @@ msgstr "Factura oberta."
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "Soci or"
 
 #. module: membership
 #: help:res.partner,associate_member:0
@@ -277,13 +290,15 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Un membre amb el qual voleu associar la seva afiliació. Es tindrà en compte "
+"l'estat de soci del membre associat."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "Producte soci"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
@@ -298,13 +313,13 @@ msgstr "Soci facturat pot ser un soci beneficiari."
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "Uneix"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "Data fins a la qual el soci roman actiu."
 
 #. module: membership
 #: view:product.product:0
@@ -314,12 +329,12 @@ msgstr "Productes per socis"
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "Data d'inscripció"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "Marqueu aquesta opció si voleu que sigui soci sense cap cost."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
@@ -329,12 +344,12 @@ msgstr "Estableix associació"
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " Estat soci"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "Socis"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
@@ -344,12 +359,12 @@ msgstr "Factura de soci pagada."
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Plantilla de producte"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: membership
 #: model:ir.module.module,description:membership.module_meta_information
@@ -367,11 +382,23 @@ msgid ""
 "invoice and send propositions for membership renewal.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul li permet administrar totes les operacions de gestió de socis.\n"
+"És compatible amb diferents tipus de membres:\n"
+"* Soci gratuït\n"
+"* Soci associat (per exemple: un grup se subscriu com a soci per a tots\n"
+"  els membres subsidiaris)\n"
+"* Socis pagats\n"
+"* Preus especials de soci, ...\n"
+"\n"
+"S'integra amb vendes i comptabilitat per poder facturar automàticament\n"
+"i enviar propostes per a la renovació de la quota de soci.\n"
+"    "
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Línia de factura"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -390,23 +417,36 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Indica l'estat del soci.\n"
+"                        -No soci: Un membre que no ha sol·licitat la seva "
+"afiliació.\n"
+"                        -Soci cancel·lat: Un membre que ha cancel·lat la "
+"seva afiliació.\n"
+"                        -Soci antic: Un membre la data del qual de soci ha "
+"expirat.\n"
+"                        -Soci en espera: Un membre que ha sol·licitat la "
+"seva afiliació i la factura de la qual es va a crear.\n"
+"                        -Soci facturat: Un membre la factura del qual ha "
+"estat creada.\n"
+"                        -Soci pagat: Un membre que ha pagat l'import de la "
+"quota de soci."
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "L'empresa és un soci gratuït."
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
@@ -417,31 +457,31 @@ msgstr "Tarifa de venda per a socis"
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "Membre associat"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "Data des de la qual el soci està actiu."
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Empresa associada"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "Factura soci"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
@@ -451,13 +491,13 @@ msgstr "Defineix productes de soci."
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -482,22 +522,22 @@ msgstr ""
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "Previsió"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "Membre"
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursivament."
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Data des de"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
@@ -507,7 +547,7 @@ msgstr "Soci beneficiari"
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Informació comptable"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
@@ -517,12 +557,12 @@ msgstr "Data cancel·lació soci"
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Clients"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
@@ -534,7 +574,7 @@ msgstr "Productes per socis"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -558,7 +598,7 @@ msgstr "Soci facturat"
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "Data en la qual el membre s'ha convertit en soci."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -575,37 +615,37 @@ msgstr "Associació empresa"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: membership
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "Estat soci"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Descripció de la venda"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "Quota de soci"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
@@ -615,17 +655,17 @@ msgstr "Import soci"
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "El preu negociat per l'empresa"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "Soci bàsic"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "Marqueu aquesta opció si un producte és un producte per a socis."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -644,17 +684,17 @@ msgstr "Fins"
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "Estat actual soci"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Últims 365 dies"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -664,27 +704,27 @@ msgstr "Factura esborrany ara està oberta."
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "Inactiu"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Últims 30 dies"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "Tots no socis"
 
 #. module: membership
 #: view:product.product:0
@@ -699,7 +739,7 @@ msgstr "Línia factura"
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "Categorizació"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
@@ -717,17 +757,17 @@ msgstr "Preu soci"
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Descripció de compra"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Producte"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: membership
 #: field:res.partner,free_member:0
@@ -737,28 +777,28 @@ msgstr "Soci gratis"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "Soci plata"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Impostos de vendes"
 
 #. module: membership
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
@@ -768,12 +808,12 @@ msgstr "Soci facturat"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "Data en la qual el soci ha estat cancel·lat."
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
@@ -789,7 +829,7 @@ msgstr "Soci en espera"
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -799,14 +839,14 @@ msgstr "Producte per socis"
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "Import per ser soci."
 
 #. 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 "Membre cancel·lat"
 
 #. module: membership
 #: constraint:product.product:0
@@ -822,10 +862,7 @@ msgstr "Any"
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No podeu tenir 2 versions de tarifes que es superposin!"
+msgstr "Ingrés realitzat"
 
 #~ msgid "Currency"
 #~ msgstr "Moneda"
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
index ab1700748bf..14aad66209a 100644
--- a/addons/membership/i18n/cs.po
+++ b/addons/membership/i18n/cs.po
@@ -4,175 +4,176 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"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: 2009-09-30 08:29+0000\n"
-"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-11-25 12:33+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "faktura k přidružení"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
 msgid "Membership Process"
-msgstr ""
+msgstr "Proces členství"
 
 #. 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 "Zaplacený člen"
 
 #. module: membership
 #: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "# Zaplaceno"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "Vydělaná částka"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "Analýza členství"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
 msgid "Set an associate member of partner."
-msgstr ""
+msgstr "Nastavit přidruženého člena k partnerovi"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr ""
+msgstr "Faktura je zaplacena"
 
 #. module: membership
 #: field:membership.membership_line,company_id:0
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Společnost"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "Datum do"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr ""
+msgstr "Čekající na fakturu"
 
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "Datum ukončení členství"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Dodavatelé"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "Všichni členové"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "Datum pozastavení členství"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "Výrobek pro člena"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "Připojit členství"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "Přidružený člen"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "Člen je přidružený."
 
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "Čekající částka"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "Přidruženého partnera"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# Fakturováno"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "Analýza členů"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "Datum ukončení členství"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Partner nemá adresu pro vytvoření faktury."
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
 #: field:membership.membership_line,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "Faktura k zaplacení"
 
 #. module: membership
 #: view:res.partner:0
@@ -182,12 +183,12 @@ msgstr "Partneři"
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr ""
+msgstr "Chyba, tento výrobek členství je zastaralý"
 
 #. module: membership
 #: help:res.partner,membership_state:0
@@ -206,68 +207,77 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Označuje stav členství.\n"
+"                    -Nečlen: Člen, který nepožádál o žádné členství.\n"
+"                    -Zrušené členství: Člen, který má zrušené své členství.\n"
+"                    -Starý člen: Člen, kterému vypršelo členství.\n"
+"                    -Čekající člen: Člen, který požádal o členství, a "
+"kterému bude vytvořena faktura.\n"
+"                    -Fakturovaný člen: Člen, kterému byla vytvořena "
+"faktura.\n"
+"                    -Placený člen: Člen, který zaplatil částku za členství."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
-msgstr ""
+msgstr "Vytvořit"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
-msgstr ""
+msgstr "Řádek člena"
 
 #. module: membership
 #: help:report.membership,date_from:0
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
-msgstr ""
+msgstr "Počáteční datum členství"
 
 #. module: membership
 #: code:addons/membership/membership.py:410
 #: code:addons/membership/membership.py:413
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Chyba !"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
 msgid "Paid member"
-msgstr ""
+msgstr "Zaplacený člen"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "# Čekající"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
 #: view:res.partner:0
 msgid "Members"
-msgstr ""
+msgstr "Členové"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Non Member"
-msgstr ""
+msgstr "Nečlen"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
 msgid "Open invoice."
-msgstr ""
+msgstr "Otevřít fakturu"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "Zlaté členství"
 
 #. module: membership
 #: help:res.partner,associate_member:0
@@ -275,79 +285,81 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Člen, s kterým chcete asociovat vaše členství. Vezme v úvahu stav členství "
+"asociovaného člena."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "Výrobek členství"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "Určit výrobek pro členství."
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "Fakturovaný člen může být přidružený člen."
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "Připojit"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "Datum, do kterého členství zůstává aktivní."
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "Výrobky členství"
 
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "Datum připojení"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "Vyberte, pokud chcete dát členovi cenu zdarma."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "Nastavit přiřazení"
 
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " Stav členství"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "Členství"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "Faktura členství zaplacena."
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Šablona výrobku"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "Září"
 
 #. module: membership
 #: model:ir.module.module,description:membership.module_meta_information
@@ -365,11 +377,23 @@ msgid ""
 "invoice and send propositions for membership renewal.\n"
 "    "
 msgstr ""
+"\n"
+"Tento modul vám umožňuje spravovat všechny operace pro správu členství.\n"
+"Podporuje různé druhy členství:\n"
+"* volné členství\n"
+"* Přidružený člen (ex: skupinové zapsání pro členství pro všechnyl\n"
+"  pobočjy)\n"
+"* Zaplacený člen,\n"
+"* Speciální ceny členů, ...\n"
+"\n"
+"Je integrován s prodejem a účetnictvím, aby vám umožnil automaticky\n"
+"fakturovat a odesílat návrhy pro obnovení členství.\n"
+"    "
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Řádek faktury"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -388,149 +412,160 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Označuje stav členství.\n"
+"                       -Nečlen: Člen, který nepožádál o žádné členství.\n"
+"                       -Zrušené členství: Člen, který má zrušené své "
+"členství.\n"
+"                       -Starý člen: Člen, kterému vypršelo členství.\n"
+"                       -Čekající člen: Člen, který požádal o členství, a "
+"kterému bude vytvořena faktura.\n"
+"                       -Fakturovaný člen: Člen, kterému byla vytvořena "
+"faktura.\n"
+"                       -Placený člen: Člen, který zaplatil částku za "
+"členství."
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "Měsíc"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "Partner je volný člen."
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr ""
+msgstr "Prodejní ceník člena"
 
 #. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "Přiřadit člena"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "Datum, od kterého se stává členství aktivním."
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Přidruženého partnera"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "Členská faktura"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "Obchodník"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "Určit výrobek členství."
 
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Free Member"
-msgstr ""
+msgstr "Volný člen"
 
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr ""
+msgstr "Verze prodejního ceníku člena"
 
 #. module: membership
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Chyba: Výchozí MJ a nákupní MJ musí být ve stejné kategorii."
 
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "Předpověď"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "Člen"
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní asociované členy."
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Datum od"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "Přiřazený člen"
 
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Účetní informace"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr ""
+msgstr "Datum zrušení členství"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Zákazníci"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
 #: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership Products"
-msgstr ""
+msgstr "Výrobky členství"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -542,145 +577,145 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,member_lines:0
 msgid "Membership"
-msgstr ""
+msgstr "Členství"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Invoiced Member"
-msgstr ""
+msgstr "Fakturovaný člen"
 
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "Datum, kdy se člen připojil k členství"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
-msgstr ""
+msgstr "Čekající člen"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "Přiřazený partner"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: membership
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšířené filtry..."
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "Stav členství"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Popis prodeje"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "Členský poplatek"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
-msgstr ""
+msgstr "Částka členství"
 
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "Cena vyjednaná partnerem"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "Základní členství"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "Vyberte, pokud výrobek je výrobek členství."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Old Member"
-msgstr ""
+msgstr "Starý člen"
 
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "Do"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "Aktuální stav členství"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Posledních 365 dní"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "Obecný"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "Koncept faktury je nyní otevřen."
 
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "Neaktivní"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Posledních 30 dní"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Uzavřít"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "Všichni nečlenové"
 
 #. module: membership
 #: view:product.product:0
@@ -690,17 +725,17 @@ msgstr "Informace"
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
-msgstr ""
+msgstr "Účetní řádek faktury"
 
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "Členění"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr ""
+msgstr "Koncept faktury pro členství."
 
 #. module: membership
 #: field:membership.invoice,member_price:0
@@ -708,117 +743,123 @@ msgstr ""
 #: model:product.price.type,name:membership.product_price_type_memberprice
 #: field:product.template,member_price:0
 msgid "Member Price"
-msgstr ""
+msgstr "Cena člena"
 
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Popis nákupu"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Výrobek"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
-msgstr ""
+msgstr "Volný člen"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "Stříbrné členství"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Prodejní daně"
 
 #. module: membership
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Datum ukončení"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "Fakturovaný člen"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "Datum, kdy bylo zrušeno členství"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "Datum zrušení"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "Čekající člen"
 
 #. module: membership
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
 msgid "Membership product"
-msgstr ""
+msgstr "Výrobek členství"
 
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "Částka pro členství"
 
 #. 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 "Zrušený člen"
 
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Chyba: Neplatný kód ean"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "Příjem proveden"
 
 #~ msgid "Configuration"
 #~ msgstr "Konfigurace"
+
+#~ msgid "Confirm"
+#~ msgstr "Potvrdit"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index b275138b6f8..7c90bdfefa0 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -854,10 +854,6 @@ msgstr "Jahr"
 msgid "Revenue Done"
 msgstr "Generierter Umsatz"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Sie können keine sich zeitlich überlappende Versionen von Preislisten haben."
-
 #~ msgid "Currency"
 #~ msgstr "Währung"
 
@@ -972,21 +968,9 @@ msgstr "Generierter Umsatz"
 #~ "Fehler: Verkaufseinheit sollte in einer anderen Kategorie sein als "
 #~ "Mengeneinheit (ME)"
 
-#~ msgid "Active Membership since this date"
-#~ msgstr "Aktives Mitglied seit"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#~ msgid "Group By"
-#~ msgstr "Gruppierung"
-
-#~ msgid "Expired date of Membership"
-#~ msgstr "Mitgliedschaft abgelaufen am"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #~ msgid ""
 #~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 #~ "Item!"
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index 4fc58d7acd4..9c979eb1f6f 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -866,9 +866,6 @@ msgstr "Año"
 msgid "Revenue Done"
 msgstr "Ingreso realizado"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
-
 #~ msgid "Currency"
 #~ msgstr "Moneda"
 
@@ -990,24 +987,3 @@ msgstr "Ingreso realizado"
 #~ msgstr ""
 #~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
 #~ "elemento de la tarifa."
-
-#~ msgid "Active Membership since this date"
-#~ msgstr "Socio activo desde esta fecha."
-
-#~ msgid "Group By"
-#~ msgstr "Agrupar por"
-
-#~ msgid "Expired date of Membership"
-#~ msgstr "Fecha expiración de socio."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
index eb0e3064cd5..fc46f7e098b 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -911,9 +911,6 @@ msgstr ""
 #~ msgid "Invoice Membership"
 #~ msgstr "Facturar a socio"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de listas de precios que se superpongan!"
-
 #~ msgid "Current membership state"
 #~ msgstr "Estado actual del socio"
 
diff --git a/addons/membership/i18n/es_MX.po b/addons/membership/i18n/es_MX.po
new file mode 100644
index 00000000000..0739da12932
--- /dev/null
+++ b/addons/membership/i18n/es_MX.po
@@ -0,0 +1,989 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* membership
+#
+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-13 18:52+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:04+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetoassociate0
+msgid "invoice to associate"
+msgstr "facturar a socio beneficiario"
+
+#. module: membership
+#: model:process.process,name:membership.process_process_membershipprocess0
+msgid "Membership Process"
+msgstr "Proceso socios"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Paid Member"
+msgstr "Socio pagado"
+
+#. module: membership
+#: view:report.membership:0
+#: view:res.partner:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: membership
+#: field:report.membership,num_paid:0
+msgid "# Paid"
+msgstr "Núm. pagado"
+
+#. module: membership
+#: field:report.membership,tot_earned:0
+msgid "Earned Amount"
+msgstr "Importe ganado"
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_membership
+msgid "Membership Analysis"
+msgstr "Análisis socios"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_setassociation0
+msgid "Set an associate member of partner."
+msgstr "Establecer un socio beneficiario de una empresa."
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetopaid0
+msgid "Invoice is be paid."
+msgstr "Factura está pagada."
+
+#. module: membership
+#: field:membership.membership_line,company_id:0
+#: view:report.membership:0
+#: field:report.membership,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: membership
+#: field:product.product,membership_date_to:0
+msgid "Date to"
+msgstr "Fecha hasta"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_waitingtoinvoice0
+msgid "Waiting to invoice"
+msgstr "Esperando a facturar"
+
+#. module: membership
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Fecha finalización como socio."
+
+#. module: membership
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr "Proveedores"
+
+#. module: membership
+#: view:res.partner:0
+msgid "All Members"
+msgstr "Todos socios"
+
+#. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Stop membership date"
+msgstr "Fecha final de afiliación"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_producttomember0
+msgid "Product to member"
+msgstr "Producto a socio"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_invoice_view
+#: view:res.partner:0
+msgid "Join Membership"
+msgstr "Inscribir socio"
+
+#. module: membership
+#: field:res.partner,associate_member:0
+msgid "Associate member"
+msgstr "Socio beneficiario"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_associatedmember0
+msgid "Member is associated."
+msgstr "El socio es beneficiario."
+
+#. module: membership
+#: field:report.membership,tot_pending:0
+msgid "Pending Amount"
+msgstr "Importe pendiente"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_associationpartner0
+msgid "Associated partner."
+msgstr "Empresa beneficiaria."
+
+#. module: membership
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
+msgstr "Núm. facturado"
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_report_membership
+msgid "Members Analysis"
+msgstr "Análisis socios"
+
+#. module: membership
+#: view:res.partner:0
+msgid "End Membership Date"
+msgstr "Fecha finalización como socio."
+
+#. module: membership
+#: field:product.product,membership_date_from:0
+msgid "Date from"
+msgstr "Fecha desde"
+
+#. module: membership
+#: code:addons/membership/membership.py:414
+#, python-format
+msgid "Partner doesn't have an address to make the invoice."
+msgstr "Empresa no tiene una dirección para realizar la factura."
+
+#. module: membership
+#: model:ir.model,name:membership.model_res_partner
+#: field:membership.membership_line,partner:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetopaid0
+msgid "Invoice to paid"
+msgstr "Factura a pagar"
+
+#. module: membership
+#: view:res.partner:0
+msgid "Partners"
+msgstr "Socios"
+
+#. module: membership
+#: field:membership.membership_line,date_from:0
+msgid "From"
+msgstr "Desde"
+
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr ""
+"Error, este producto para socios está caducado (intervalo de fechas "
+"desfasado)"
+
+#. module: membership
+#: help:res.partner,membership_state:0
+msgid ""
+"It indicates the membership state.\n"
+"                    -Non Member: A member who has not applied for any "
+"membership.\n"
+"                    -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                    -Old Member: A member whose membership date has "
+"expired.\n"
+"                    -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                    -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                    -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+"Indica el estado del socio.\n"
+"                    -No socio: Un miembro que no ha solicitado su "
+"afiliación.\n"
+"                    -Socio cancelado: Un miembro que ha cancelado su "
+"afiliación.\n"
+"                    -Socio antiguo: Un miembro cuya fecha de socio ha "
+"expirado.\n"
+"                    -Socio en espera: Un miembro que ha solicitado su "
+"afiliación y cuya factura se va a crear.\n"
+"                    -Socio facturado: Un miembro cuya factura ha sido "
+"creada.\n"
+"                    -Socio pagado: Un miembro que ha pagado el importe de la "
+"cuota de socio."
+
+#. module: membership
+#: model:process.transition.action,name:membership.process_transition_action_create0
+msgid "Create"
+msgstr "Crear"
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_membership_line
+msgid "Member line"
+msgstr "Línea de socio"
+
+#. module: membership
+#: help:report.membership,date_from:0
+#: field:res.partner,membership_start:0
+msgid "Start membership date"
+msgstr "Fecha inicio afiliación"
+
+#. module: membership
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_paidmember0
+msgid "Paid member"
+msgstr "Socio ha pagado"
+
+#. module: membership
+#: field:report.membership,num_waiting:0
+msgid "# Waiting"
+msgstr "Núm. esperando"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
+#: view:res.partner:0
+msgid "Members"
+msgstr "Socios"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Non Member"
+msgstr "No socio"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_invoicedmember0
+msgid "Open invoice."
+msgstr "Factura abierta."
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: membership
+#: model:product.template,name:membership.membership_0_product_template
+msgid "Golden Membership"
+msgstr "Socio oro"
+
+#. 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 ""
+"Un miembro con el que desea asociar su afiliación. Se tendrá en cuenta el "
+"estado de socio de los miembros asociados."
+
+#. module: membership
+#: field:membership.membership_line,membership_id:0
+#: view:report.membership:0
+#: field:report.membership,membership_id:0
+msgid "Membership Product"
+msgstr "Producto socio"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_producttomember0
+msgid "Define product for membership."
+msgstr "Definir producto para socios."
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr "Socio facturado puede ser un socio beneficiario."
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Join"
+msgstr "Inscribir"
+
+#. module: membership
+#: help:product.product,membership_date_to:0
+#: help:res.partner,membership_stop:0
+msgid "Date until which membership remains active."
+msgstr "Fecha hasta la que el socio permanece activo."
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership products"
+msgstr "Productos para socios"
+
+#. module: membership
+#: field:membership.membership_line,date:0
+msgid "Join Date"
+msgstr "Fecha inscripción"
+
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give membership free of cost."
+msgstr "Marque esta opción si quiere que sea socio sin ningún coste."
+
+#. module: membership
+#: model:process.node,name:membership.process_node_setassociation0
+msgid "Set association"
+msgstr "Establecer asociación"
+
+#. module: membership
+#: view:res.partner:0
+msgid " Membership State"
+msgstr " Estado socio"
+
+#. module: membership
+#: view:res.partner:0
+msgid "Memberships"
+msgstr "Socios"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr "Factura de socio pagada."
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_template
+msgid "Product Template"
+msgstr "Plantilla producto"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: membership
+#: model:ir.module.module,description:membership.module_meta_information
+msgid ""
+"\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"It supports different kind of members:\n"
+"* Free member\n"
+"* Associated member (ex: a group subscribe for a membership for all\n"
+"  subsidiaries)\n"
+"* Paid members,\n"
+"* Special member prices, ...\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le permite administrar todas las operaciones de gestión de "
+"socios.\n"
+"Es compatible con diferentes tipos de miembros:\n"
+"* Socio gratuito\n"
+"* Socio asociado (por ejemplo: un grupo se suscribe como socio para todos\n"
+"  los miembros subsidiarios)\n"
+"* Socios pagados\n"
+"* Precios especiales de socio, ...\n"
+"\n"
+"Se integra con ventas y contabilidad para poder facturar automáticamente\n"
+"y enviar propuestas para la renovación de la cuota de socio.\n"
+"    "
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: membership
+#: help:membership.membership_line,state:0
+msgid ""
+"It indicates the membership state.\n"
+"                        -Non Member: A member who has not applied for any "
+"membership.\n"
+"                        -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                        -Old Member: A member whose membership date has "
+"expired.\n"
+"                        -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                        -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                        -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+"Indica el estado del socio.\n"
+"                    -No socio: Un miembro que no ha solicitado su "
+"afiliación.\n"
+"                    -Socio cancelado: Un miembro que ha cancelado su "
+"afiliación.\n"
+"                    -Socio antiguo: Un miembro cuya fecha de socio ha "
+"expirado.\n"
+"                    -Socio en espera: Un miembro que ha solicitado su "
+"afiliación y cuya factura se va a crear.\n"
+"                    -Socio facturado: Un miembro cuya factura ha sido "
+"creada.\n"
+"                    -Socio pagado: Un miembro que ha pagado el importe de la "
+"cuota de socio."
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: membership
+#: view:product.product:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: membership
+#: code:addons/membership/membership.py:411
+#, python-format
+msgid "Partner is a free Member."
+msgstr "La empresa es un socio gratis."
+
+#. module: membership
+#: model:product.pricelist,name:membership.list1m
+msgid "Member Sale Pricelist"
+msgstr "Tarifa de venta para socios"
+
+#. module: membership
+#: field:report.membership,associate_member_id:0
+#: view:res.partner:0
+msgid "Associate Member"
+msgstr "Miembro asociado"
+
+#. module: membership
+#: help:product.product,membership_date_from:0
+#: help:res.partner,membership_start:0
+msgid "Date from which membership becomes active."
+msgstr "Fecha desde la que el socio está activo."
+
+#. module: membership
+#: view:report.membership:0
+msgid "Associated Partner"
+msgstr "Empresa asociada"
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_invoice
+#: view:membership.invoice:0
+msgid "Membership Invoice"
+msgstr "Factura socio"
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr "Definir productos de socio."
+
+#. module: membership
+#: view:product.product:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice
+#: field:membership.membership_line,account_invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr "Socio gratis"
+
+#. module: membership
+#: model:product.pricelist.version,name:membership.ver1m
+msgid "Member Sale Pricelist Version"
+msgstr "Versión tarifa de venta para miembros"
+
+#. module: membership
+#: 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: membership
+#: view:report.membership:0
+msgid "Forecast"
+msgstr "Previsión"
+
+#. module: membership
+#: field:report.membership,partner_id:0
+msgid "Member"
+msgstr "Miembro"
+
+#. module: membership
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: membership
+#: view:product.product:0
+msgid "Date From"
+msgstr "Fecha desde"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_associatedmember0
+msgid "Associated member"
+msgstr "Socio beneficiario"
+
+#. module: membership
+#: view:product.product:0
+msgid "Accounting Info"
+msgstr "Información contable"
+
+#. module: membership
+#: field:res.partner,membership_cancel:0
+msgid "Cancel membership date"
+msgstr "Fecha cancelación socio"
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customers"
+msgstr "Clientes"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_products
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
+msgid "Membership Products"
+msgstr "Productos para socios"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: membership
+#: model:ir.module.module,shortdesc:membership.module_meta_information
+#: model:ir.ui.menu,name:membership.menu_membership
+#: field:membership.invoice,product_id:0
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:report.membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr "Socio"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr "Socio facturado"
+
+#. module: membership
+#: help:membership.membership_line,date:0
+msgid "Date on which member has joined the membership"
+msgstr "Fecha en la que el miembro se ha convertido en socio."
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Waiting Member"
+msgstr "Socio en espera"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_associationpartner0
+msgid "Association Partner"
+msgstr "Asociación empresa"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: membership
+#: view:product.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: membership
+#: field:membership.membership_line,state:0
+msgid "Membership State"
+msgstr "Estado socio"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Description"
+msgstr "Descripción venta"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership Fee"
+msgstr "Cuota socio"
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership amount"
+msgstr "Importe socio"
+
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negotiated by the partner"
+msgstr "El precio negociado por la empresa."
+
+#. module: membership
+#: model:product.template,name:membership.membership_2_product_template
+msgid "Basic Membership"
+msgstr "Socio básico"
+
+#. module: membership
+#: help:product.product,membership:0
+msgid "Select if a product is a membership product."
+msgstr "Marque esta opción si un producto es un producto para socios."
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Old Member"
+msgstr "Socio antiguo"
+
+#. module: membership
+#: field:membership.membership_line,date_to:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,membership_state:0
+#: field:res.partner,membership_state:0
+msgid "Current Membership State"
+msgstr "Estado actual socio"
+
+#. module: membership
+#: view:report.membership:0
+msgid "Last 365 Days"
+msgstr "Últimos 365 días"
+
+#. module: membership
+#: view:product.product:0
+msgid "General"
+msgstr "General"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
+msgid "Draft invoice is now open."
+msgstr "Factura borrador ahora está abierta."
+
+#. module: membership
+#: view:product.product:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: membership
+#: view:report.membership:0
+msgid "Last 30 Days"
+msgstr "Últimos 30 días"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: membership
+#: view:res.partner:0
+msgid "All non Members"
+msgstr "Todos no socios"
+
+#. module: membership
+#: view:product.product:0
+msgid "Information"
+msgstr "Información"
+
+#. module: membership
+#: field:membership.membership_line,account_invoice_line:0
+msgid "Account Invoice line"
+msgstr "Línea factura"
+
+#. module: membership
+#: view:product.product:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_waitingmember0
+msgid "Draft invoice for membership."
+msgstr "Factura borrador para socio."
+
+#. module: membership
+#: field:membership.invoice,member_price:0
+#: field:membership.membership_line,member_price:0
+#: model:product.price.type,name:membership.product_price_type_memberprice
+#: field:product.template,member_price:0
+msgid "Member Price"
+msgstr "Precio socio"
+
+#. module: membership
+#: view:product.product:0
+msgid "Purchase Description"
+msgstr "Descripción compra"
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: membership
+#: view:product.product:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: membership
+#: field:res.partner,free_member:0
+msgid "Free member"
+msgstr "Socio gratis"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: membership
+#: model:product.template,name:membership.membership_1_product_template
+msgid "Silver Membership"
+msgstr "Socio plata"
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr "Impuestos venta"
+
+#. module: membership
+#: field:report.membership,date_to:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_invoicedmember0
+msgid "Invoiced member"
+msgstr "Socio facturado"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: membership
+#: help:res.partner,membership_cancel:0
+msgid "Date on which membership has been cancelled"
+msgstr "Fecha en la que el socio ha sido cancelado."
+
+#. module: membership
+#: field:membership.membership_line,date_cancel:0
+msgid "Cancel date"
+msgstr "Fecha cancelación"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_waitingmember0
+msgid "Waiting member"
+msgstr "Socio en espera"
+
+#. module: membership
+#: field:report.membership,date_from:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_membershipproduct0
+msgid "Membership product"
+msgstr "Producto para socios"
+
+#. module: membership
+#: help:membership.membership_line,member_price:0
+msgid "Amount for the membership"
+msgstr "Importe para ser socio."
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Cancelled Member"
+msgstr "Miembro cancelado"
+
+#. module: membership
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: membership
+#: view:report.membership:0
+msgid "Revenue Done"
+msgstr "Ingreso realizado"
+
+#~ msgid "Currency"
+#~ msgstr "Moneda"
+
+#~ msgid "Error ! You can not create recursive accounts."
+#~ msgstr "¡Error! No se pueden crear cuentas recursivas."
+
+#~ msgid "Free members"
+#~ msgstr "Socios gratis"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Membership by Years"
+#~ msgstr "Socios por años"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ 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"
+
+#~ msgid "Future members (invoice not confirmed)"
+#~ msgstr "Socios futuros (facturas no confirmadas)"
+
+#~ msgid "Membership Product - 2"
+#~ msgstr "Producto para socios - 2"
+
+#~ msgid "Membership Product - 1"
+#~ msgstr "Producto para socios - 1"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Invoiced"
+#~ msgstr "Facturado"
+
+#~ msgid "The price negociated by the partner"
+#~ msgstr "El precio negociado por la empresa"
+
+#~ msgid "Paid"
+#~ msgstr "Pagado"
+
+#~ msgid "Specify if this product is a membership product"
+#~ msgstr "Indica si este producto es un producto para socios"
+
+#~ msgid "Invoiced members"
+#~ msgstr "Socios facturados"
+
+#~ msgid "Old members"
+#~ msgstr "Socios antiguos"
+
+#~ msgid "Choose invoice details"
+#~ msgstr "Escoger detalles factura"
+
+#~ msgid "Waiting"
+#~ msgstr "En espera"
+
+#~ msgid "Future members"
+#~ msgstr "Socios futuros"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Associated members"
+#~ msgstr "Socios beneficiarios"
+
+#~ msgid "Paid members"
+#~ msgstr "Socios pagados"
+
+#~ 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 "Canceled Member"
+#~ msgstr "Socio cancelado"
+
+#~ msgid "Current members"
+#~ msgstr "Socios actuales"
+
+#~ msgid "New Membership by Years"
+#~ msgstr "Nuevos socios por años"
+
+#~ msgid "Invoice Membership"
+#~ msgstr "Facturar a socio"
+
+#~ msgid "Current membership state"
+#~ msgstr "Estado actual del socio"
+
+#, python-format
+#~ msgid "No Address defined for this partner"
+#~ msgstr "No se ha definido una dirección para esta empresa"
+
+#~ msgid "Error: BVR reference is required."
+#~ msgstr "Error: La referencia BVR es necesaria."
+
+#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
+#~ msgstr "Error: Número BVR no válido (checksum erróneo)."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
+#~ "elemento de la tarifa."
diff --git a/addons/membership/i18n/es_VE.po b/addons/membership/i18n/es_VE.po
new file mode 100644
index 00000000000..0739da12932
--- /dev/null
+++ b/addons/membership/i18n/es_VE.po
@@ -0,0 +1,989 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* membership
+#
+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-13 18:52+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:04+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetoassociate0
+msgid "invoice to associate"
+msgstr "facturar a socio beneficiario"
+
+#. module: membership
+#: model:process.process,name:membership.process_process_membershipprocess0
+msgid "Membership Process"
+msgstr "Proceso socios"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Paid Member"
+msgstr "Socio pagado"
+
+#. module: membership
+#: view:report.membership:0
+#: view:res.partner:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: membership
+#: field:report.membership,num_paid:0
+msgid "# Paid"
+msgstr "Núm. pagado"
+
+#. module: membership
+#: field:report.membership,tot_earned:0
+msgid "Earned Amount"
+msgstr "Importe ganado"
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_membership
+msgid "Membership Analysis"
+msgstr "Análisis socios"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_setassociation0
+msgid "Set an associate member of partner."
+msgstr "Establecer un socio beneficiario de una empresa."
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetopaid0
+msgid "Invoice is be paid."
+msgstr "Factura está pagada."
+
+#. module: membership
+#: field:membership.membership_line,company_id:0
+#: view:report.membership:0
+#: field:report.membership,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: membership
+#: field:product.product,membership_date_to:0
+msgid "Date to"
+msgstr "Fecha hasta"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_waitingtoinvoice0
+msgid "Waiting to invoice"
+msgstr "Esperando a facturar"
+
+#. module: membership
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr "Fecha finalización como socio."
+
+#. module: membership
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr "Proveedores"
+
+#. module: membership
+#: view:res.partner:0
+msgid "All Members"
+msgstr "Todos socios"
+
+#. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Stop membership date"
+msgstr "Fecha final de afiliación"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_producttomember0
+msgid "Product to member"
+msgstr "Producto a socio"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_invoice_view
+#: view:res.partner:0
+msgid "Join Membership"
+msgstr "Inscribir socio"
+
+#. module: membership
+#: field:res.partner,associate_member:0
+msgid "Associate member"
+msgstr "Socio beneficiario"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_associatedmember0
+msgid "Member is associated."
+msgstr "El socio es beneficiario."
+
+#. module: membership
+#: field:report.membership,tot_pending:0
+msgid "Pending Amount"
+msgstr "Importe pendiente"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_associationpartner0
+msgid "Associated partner."
+msgstr "Empresa beneficiaria."
+
+#. module: membership
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
+msgstr "Núm. facturado"
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_report_membership
+msgid "Members Analysis"
+msgstr "Análisis socios"
+
+#. module: membership
+#: view:res.partner:0
+msgid "End Membership Date"
+msgstr "Fecha finalización como socio."
+
+#. module: membership
+#: field:product.product,membership_date_from:0
+msgid "Date from"
+msgstr "Fecha desde"
+
+#. module: membership
+#: code:addons/membership/membership.py:414
+#, python-format
+msgid "Partner doesn't have an address to make the invoice."
+msgstr "Empresa no tiene una dirección para realizar la factura."
+
+#. module: membership
+#: model:ir.model,name:membership.model_res_partner
+#: field:membership.membership_line,partner:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetopaid0
+msgid "Invoice to paid"
+msgstr "Factura a pagar"
+
+#. module: membership
+#: view:res.partner:0
+msgid "Partners"
+msgstr "Socios"
+
+#. module: membership
+#: field:membership.membership_line,date_from:0
+msgid "From"
+msgstr "Desde"
+
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr ""
+"Error, este producto para socios está caducado (intervalo de fechas "
+"desfasado)"
+
+#. module: membership
+#: help:res.partner,membership_state:0
+msgid ""
+"It indicates the membership state.\n"
+"                    -Non Member: A member who has not applied for any "
+"membership.\n"
+"                    -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                    -Old Member: A member whose membership date has "
+"expired.\n"
+"                    -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                    -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                    -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+"Indica el estado del socio.\n"
+"                    -No socio: Un miembro que no ha solicitado su "
+"afiliación.\n"
+"                    -Socio cancelado: Un miembro que ha cancelado su "
+"afiliación.\n"
+"                    -Socio antiguo: Un miembro cuya fecha de socio ha "
+"expirado.\n"
+"                    -Socio en espera: Un miembro que ha solicitado su "
+"afiliación y cuya factura se va a crear.\n"
+"                    -Socio facturado: Un miembro cuya factura ha sido "
+"creada.\n"
+"                    -Socio pagado: Un miembro que ha pagado el importe de la "
+"cuota de socio."
+
+#. module: membership
+#: model:process.transition.action,name:membership.process_transition_action_create0
+msgid "Create"
+msgstr "Crear"
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_membership_line
+msgid "Member line"
+msgstr "Línea de socio"
+
+#. module: membership
+#: help:report.membership,date_from:0
+#: field:res.partner,membership_start:0
+msgid "Start membership date"
+msgstr "Fecha inicio afiliación"
+
+#. module: membership
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_paidmember0
+msgid "Paid member"
+msgstr "Socio ha pagado"
+
+#. module: membership
+#: field:report.membership,num_waiting:0
+msgid "# Waiting"
+msgstr "Núm. esperando"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
+#: view:res.partner:0
+msgid "Members"
+msgstr "Socios"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Non Member"
+msgstr "No socio"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_invoicedmember0
+msgid "Open invoice."
+msgstr "Factura abierta."
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: membership
+#: model:product.template,name:membership.membership_0_product_template
+msgid "Golden Membership"
+msgstr "Socio oro"
+
+#. 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 ""
+"Un miembro con el que desea asociar su afiliación. Se tendrá en cuenta el "
+"estado de socio de los miembros asociados."
+
+#. module: membership
+#: field:membership.membership_line,membership_id:0
+#: view:report.membership:0
+#: field:report.membership,membership_id:0
+msgid "Membership Product"
+msgstr "Producto socio"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_producttomember0
+msgid "Define product for membership."
+msgstr "Definir producto para socios."
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr "Socio facturado puede ser un socio beneficiario."
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Join"
+msgstr "Inscribir"
+
+#. module: membership
+#: help:product.product,membership_date_to:0
+#: help:res.partner,membership_stop:0
+msgid "Date until which membership remains active."
+msgstr "Fecha hasta la que el socio permanece activo."
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership products"
+msgstr "Productos para socios"
+
+#. module: membership
+#: field:membership.membership_line,date:0
+msgid "Join Date"
+msgstr "Fecha inscripción"
+
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give membership free of cost."
+msgstr "Marque esta opción si quiere que sea socio sin ningún coste."
+
+#. module: membership
+#: model:process.node,name:membership.process_node_setassociation0
+msgid "Set association"
+msgstr "Establecer asociación"
+
+#. module: membership
+#: view:res.partner:0
+msgid " Membership State"
+msgstr " Estado socio"
+
+#. module: membership
+#: view:res.partner:0
+msgid "Memberships"
+msgstr "Socios"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr "Factura de socio pagada."
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_template
+msgid "Product Template"
+msgstr "Plantilla producto"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: membership
+#: model:ir.module.module,description:membership.module_meta_information
+msgid ""
+"\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"It supports different kind of members:\n"
+"* Free member\n"
+"* Associated member (ex: a group subscribe for a membership for all\n"
+"  subsidiaries)\n"
+"* Paid members,\n"
+"* Special member prices, ...\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo le permite administrar todas las operaciones de gestión de "
+"socios.\n"
+"Es compatible con diferentes tipos de miembros:\n"
+"* Socio gratuito\n"
+"* Socio asociado (por ejemplo: un grupo se suscribe como socio para todos\n"
+"  los miembros subsidiarios)\n"
+"* Socios pagados\n"
+"* Precios especiales de socio, ...\n"
+"\n"
+"Se integra con ventas y contabilidad para poder facturar automáticamente\n"
+"y enviar propuestas para la renovación de la cuota de socio.\n"
+"    "
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: membership
+#: help:membership.membership_line,state:0
+msgid ""
+"It indicates the membership state.\n"
+"                        -Non Member: A member who has not applied for any "
+"membership.\n"
+"                        -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                        -Old Member: A member whose membership date has "
+"expired.\n"
+"                        -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                        -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                        -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+"Indica el estado del socio.\n"
+"                    -No socio: Un miembro que no ha solicitado su "
+"afiliación.\n"
+"                    -Socio cancelado: Un miembro que ha cancelado su "
+"afiliación.\n"
+"                    -Socio antiguo: Un miembro cuya fecha de socio ha "
+"expirado.\n"
+"                    -Socio en espera: Un miembro que ha solicitado su "
+"afiliación y cuya factura se va a crear.\n"
+"                    -Socio facturado: Un miembro cuya factura ha sido "
+"creada.\n"
+"                    -Socio pagado: Un miembro que ha pagado el importe de la "
+"cuota de socio."
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: membership
+#: view:product.product:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: membership
+#: code:addons/membership/membership.py:411
+#, python-format
+msgid "Partner is a free Member."
+msgstr "La empresa es un socio gratis."
+
+#. module: membership
+#: model:product.pricelist,name:membership.list1m
+msgid "Member Sale Pricelist"
+msgstr "Tarifa de venta para socios"
+
+#. module: membership
+#: field:report.membership,associate_member_id:0
+#: view:res.partner:0
+msgid "Associate Member"
+msgstr "Miembro asociado"
+
+#. module: membership
+#: help:product.product,membership_date_from:0
+#: help:res.partner,membership_start:0
+msgid "Date from which membership becomes active."
+msgstr "Fecha desde la que el socio está activo."
+
+#. module: membership
+#: view:report.membership:0
+msgid "Associated Partner"
+msgstr "Empresa asociada"
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_invoice
+#: view:membership.invoice:0
+msgid "Membership Invoice"
+msgstr "Factura socio"
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr "Definir productos de socio."
+
+#. module: membership
+#: view:product.product:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice
+#: field:membership.membership_line,account_invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr "Socio gratis"
+
+#. module: membership
+#: model:product.pricelist.version,name:membership.ver1m
+msgid "Member Sale Pricelist Version"
+msgstr "Versión tarifa de venta para miembros"
+
+#. module: membership
+#: 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: membership
+#: view:report.membership:0
+msgid "Forecast"
+msgstr "Previsión"
+
+#. module: membership
+#: field:report.membership,partner_id:0
+msgid "Member"
+msgstr "Miembro"
+
+#. module: membership
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: membership
+#: view:product.product:0
+msgid "Date From"
+msgstr "Fecha desde"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_associatedmember0
+msgid "Associated member"
+msgstr "Socio beneficiario"
+
+#. module: membership
+#: view:product.product:0
+msgid "Accounting Info"
+msgstr "Información contable"
+
+#. module: membership
+#: field:res.partner,membership_cancel:0
+msgid "Cancel membership date"
+msgstr "Fecha cancelación socio"
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customers"
+msgstr "Clientes"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_products
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
+msgid "Membership Products"
+msgstr "Productos para socios"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: membership
+#: model:ir.module.module,shortdesc:membership.module_meta_information
+#: model:ir.ui.menu,name:membership.menu_membership
+#: field:membership.invoice,product_id:0
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:report.membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr "Socio"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr "Socio facturado"
+
+#. module: membership
+#: help:membership.membership_line,date:0
+msgid "Date on which member has joined the membership"
+msgstr "Fecha en la que el miembro se ha convertido en socio."
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Waiting Member"
+msgstr "Socio en espera"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_associationpartner0
+msgid "Association Partner"
+msgstr "Asociación empresa"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: membership
+#: view:product.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: membership
+#: field:membership.membership_line,state:0
+msgid "Membership State"
+msgstr "Estado socio"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Description"
+msgstr "Descripción venta"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership Fee"
+msgstr "Cuota socio"
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership amount"
+msgstr "Importe socio"
+
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negotiated by the partner"
+msgstr "El precio negociado por la empresa."
+
+#. module: membership
+#: model:product.template,name:membership.membership_2_product_template
+msgid "Basic Membership"
+msgstr "Socio básico"
+
+#. module: membership
+#: help:product.product,membership:0
+msgid "Select if a product is a membership product."
+msgstr "Marque esta opción si un producto es un producto para socios."
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Old Member"
+msgstr "Socio antiguo"
+
+#. module: membership
+#: field:membership.membership_line,date_to:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,membership_state:0
+#: field:res.partner,membership_state:0
+msgid "Current Membership State"
+msgstr "Estado actual socio"
+
+#. module: membership
+#: view:report.membership:0
+msgid "Last 365 Days"
+msgstr "Últimos 365 días"
+
+#. module: membership
+#: view:product.product:0
+msgid "General"
+msgstr "General"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
+msgid "Draft invoice is now open."
+msgstr "Factura borrador ahora está abierta."
+
+#. module: membership
+#: view:product.product:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: membership
+#: view:report.membership:0
+msgid "Last 30 Days"
+msgstr "Últimos 30 días"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: membership
+#: view:res.partner:0
+msgid "All non Members"
+msgstr "Todos no socios"
+
+#. module: membership
+#: view:product.product:0
+msgid "Information"
+msgstr "Información"
+
+#. module: membership
+#: field:membership.membership_line,account_invoice_line:0
+msgid "Account Invoice line"
+msgstr "Línea factura"
+
+#. module: membership
+#: view:product.product:0
+msgid "Categorization"
+msgstr "Categorización"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_waitingmember0
+msgid "Draft invoice for membership."
+msgstr "Factura borrador para socio."
+
+#. module: membership
+#: field:membership.invoice,member_price:0
+#: field:membership.membership_line,member_price:0
+#: model:product.price.type,name:membership.product_price_type_memberprice
+#: field:product.template,member_price:0
+msgid "Member Price"
+msgstr "Precio socio"
+
+#. module: membership
+#: view:product.product:0
+msgid "Purchase Description"
+msgstr "Descripción compra"
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: membership
+#: view:product.product:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: membership
+#: field:res.partner,free_member:0
+msgid "Free member"
+msgstr "Socio gratis"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: membership
+#: model:product.template,name:membership.membership_1_product_template
+msgid "Silver Membership"
+msgstr "Socio plata"
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr "Impuestos venta"
+
+#. module: membership
+#: field:report.membership,date_to:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_invoicedmember0
+msgid "Invoiced member"
+msgstr "Socio facturado"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: membership
+#: help:res.partner,membership_cancel:0
+msgid "Date on which membership has been cancelled"
+msgstr "Fecha en la que el socio ha sido cancelado."
+
+#. module: membership
+#: field:membership.membership_line,date_cancel:0
+msgid "Cancel date"
+msgstr "Fecha cancelación"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_waitingmember0
+msgid "Waiting member"
+msgstr "Socio en espera"
+
+#. module: membership
+#: field:report.membership,date_from:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_membershipproduct0
+msgid "Membership product"
+msgstr "Producto para socios"
+
+#. module: membership
+#: help:membership.membership_line,member_price:0
+msgid "Amount for the membership"
+msgstr "Importe para ser socio."
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Cancelled Member"
+msgstr "Miembro cancelado"
+
+#. module: membership
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: membership
+#: view:report.membership:0
+msgid "Revenue Done"
+msgstr "Ingreso realizado"
+
+#~ msgid "Currency"
+#~ msgstr "Moneda"
+
+#~ msgid "Error ! You can not create recursive accounts."
+#~ msgstr "¡Error! No se pueden crear cuentas recursivas."
+
+#~ msgid "Free members"
+#~ msgstr "Socios gratis"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Membership by Years"
+#~ msgstr "Socios por años"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ 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"
+
+#~ msgid "Future members (invoice not confirmed)"
+#~ msgstr "Socios futuros (facturas no confirmadas)"
+
+#~ msgid "Membership Product - 2"
+#~ msgstr "Producto para socios - 2"
+
+#~ msgid "Membership Product - 1"
+#~ msgstr "Producto para socios - 1"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Invoiced"
+#~ msgstr "Facturado"
+
+#~ msgid "The price negociated by the partner"
+#~ msgstr "El precio negociado por la empresa"
+
+#~ msgid "Paid"
+#~ msgstr "Pagado"
+
+#~ msgid "Specify if this product is a membership product"
+#~ msgstr "Indica si este producto es un producto para socios"
+
+#~ msgid "Invoiced members"
+#~ msgstr "Socios facturados"
+
+#~ msgid "Old members"
+#~ msgstr "Socios antiguos"
+
+#~ msgid "Choose invoice details"
+#~ msgstr "Escoger detalles factura"
+
+#~ msgid "Waiting"
+#~ msgstr "En espera"
+
+#~ msgid "Future members"
+#~ msgstr "Socios futuros"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Associated members"
+#~ msgstr "Socios beneficiarios"
+
+#~ msgid "Paid members"
+#~ msgstr "Socios pagados"
+
+#~ 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 "Canceled Member"
+#~ msgstr "Socio cancelado"
+
+#~ msgid "Current members"
+#~ msgstr "Socios actuales"
+
+#~ msgid "New Membership by Years"
+#~ msgstr "Nuevos socios por años"
+
+#~ msgid "Invoice Membership"
+#~ msgstr "Facturar a socio"
+
+#~ msgid "Current membership state"
+#~ msgstr "Estado actual del socio"
+
+#, python-format
+#~ msgid "No Address defined for this partner"
+#~ msgstr "No se ha definido una dirección para esta empresa"
+
+#~ msgid "Error: BVR reference is required."
+#~ msgstr "Error: La referencia BVR es necesaria."
+
+#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
+#~ msgstr "Error: Número BVR no válido (checksum erróneo)."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
+#~ "elemento de la tarifa."
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
index 4bc79f4aba8..de5516e5236 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -821,9 +821,6 @@ msgstr "Aasta"
 msgid "Revenue Done"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Sul ei saa olla 2 hinnakirja versiooni mis kattuvad!"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Viga: TÜ kategooria peab erinema MÜ kategooriast"
 
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
index 7527ad5ed7b..bdcc2c58810 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -75,7 +75,7 @@ msgstr ""
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index c7026a1543d..6f16f24a0b9 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -862,10 +862,6 @@ msgstr "Année"
 msgid "Revenue Done"
 msgstr "Revenu final"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Vous en pouvez pas avoir 2 listes de prix avec des dates qui se chevauchent"
-
 #~ msgid "Currency"
 #~ msgstr "Devise"
 
@@ -958,6 +954,3 @@ msgstr "Revenu final"
 #~ msgid "You cannot have 2 pricelist versions that overlap!"
 #~ msgstr ""
 #~ "Vous ne pouvez pas avoir 2 versions de liste de prix qui se chevauchent !"
-
-#~ msgid "Group By"
-#~ msgstr "Regrouper par"
diff --git a/addons/membership/i18n/gl.po b/addons/membership/i18n/gl.po
index 89d62927982..8f048c160ff 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -38,27 +38,27 @@ msgstr "Socio pagado"
 #: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "Nº pagado"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "Importe gañado"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "Análise socios"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
@@ -75,7 +75,7 @@ msgstr "A factura está para ser pagada."
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -90,17 +90,17 @@ msgstr "Esperando para facturar"
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "Data remate como socio."
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Provedores"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "Tódolos socios"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
@@ -116,7 +116,7 @@ msgstr "Produto para socio"
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "Inscribir socio"
 
 #. module: membership
 #: field:res.partner,associate_member:0
@@ -131,7 +131,7 @@ msgstr "O Socio está asociado."
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "Importe pendente"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
@@ -141,17 +141,17 @@ msgstr "Empresa asociada"
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "Nº facturado"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "Análise socios"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "Data remate como socio."
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -162,7 +162,7 @@ msgstr "Data dende"
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "A Empresa non ten un enderezo para elaborar a factura"
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
@@ -207,6 +207,12 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Indica o estado do socio.-Non socio: Un membro que non solicitou a súa "
+"afiliación.-Socio cancelado: Un membro que cancelou a súa afiliación.-Socio "
+"antigo: Un membro cuxa data de socio expirou.-Socio en espera: Un membro que "
+"solicitou a súa afiliación e cuxa factura vaise crear.-Socio facturado: Un "
+"membro cuxa factura se creou.-Socio pagado: Un membro que pagou o importe da "
+"cuota de socio."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -239,7 +245,7 @@ msgstr "Socio de pago"
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "Núm. esperando"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -263,12 +269,12 @@ msgstr "Abre factura."
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "Xullo"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "Socio ouro"
 
 #. module: membership
 #: help:res.partner,associate_member:0
@@ -276,13 +282,15 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Un membro co que desexa asociar a súa afiliación. Terase en conta o estado "
+"de socio dos membros asociados."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "Produto socio"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
@@ -297,13 +305,13 @@ msgstr "Socio facturado pode ser socio asociado."
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "Inscribirse"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "Data ata a que o socio permanece activo."
 
 #. module: membership
 #: view:product.product:0
@@ -313,12 +321,12 @@ msgstr "Produtos para socios"
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "Data de inscrición"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "Marque esta opción se quere que sexa socio sen ningún custo."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
@@ -328,12 +336,12 @@ msgstr "Definir asociación"
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " Estado socio"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "Socios"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
@@ -343,12 +351,12 @@ msgstr "Factura de socio pagada."
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Modelo de Produto"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: membership
 #: model:ir.module.module,description:membership.module_meta_information
@@ -366,11 +374,19 @@ msgid ""
 "invoice and send propositions for membership renewal.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo permítelle administrar tódalas operacións de xestión de socios. "
+"É compatible con diferentes tipos de membros:* Socio gratuíto* Socio "
+"asociado (por exemplo: subscríbese un grupo como socio para tódolos membros "
+"subsidiarios)* Socios pagados* Prezos especiais de socio, ... Intégrase con "
+"vendas e contabilidade para poder facturar automaticamente e enviar "
+"propostas para a renovación da cuota de socio.\n"
+"    "
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Liña de factura"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -389,23 +405,29 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Indica o estado do socio.-Non socio: Un membro que non solicitou a súa "
+"afiliación.-Socio cancelado: Un membro que cancelou a súa afiliación.-Socio "
+"antigo: Un membro cuxa data de socio expirou.-Socio en espera: Un membro que "
+"solicitou a súa afiliación e cuxa factura vaise crear.-Socio facturado: Un "
+"membro cuxa factura se creou.-Socio pagado: Un membro que pagou o importe da "
+"cuota de socio."
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "A empresa é un socio gratis."
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
@@ -416,31 +438,31 @@ msgstr "Tarifas de venta para socios"
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "Membro asociado"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "Data desde a que o socio está activo."
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Empresa asociada"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "Factura socio"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
@@ -450,13 +472,13 @@ msgstr "Definir produto para socio."
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -480,22 +502,22 @@ msgstr ""
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "Previsión"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "Membro"
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro! Non pode crear membros asociados recorrentes."
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Data desde"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
@@ -505,7 +527,7 @@ msgstr "Socio Asociado"
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Información contable"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
@@ -515,12 +537,12 @@ msgstr "Cancelar data de adhesión"
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Clientes"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
@@ -532,7 +554,7 @@ msgstr "Produtos para socios"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "Xuño"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -556,7 +578,7 @@ msgstr "Socio Facturado"
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "Data na que o membro se converteu en socio."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -573,37 +595,37 @@ msgstr "Empresa asociada"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: membership
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "Estado socio"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Descrición venda"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "Xaneiro"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "Cuota socio"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
@@ -613,17 +635,17 @@ msgstr "importe da cuota de socio"
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "O prezo negociado pola empresa."
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "Socio básico"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "Marque esta opción se un produto é un produto para socios."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -642,17 +664,17 @@ msgstr "Para"
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "Estado actual socio"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Últimos 365 días"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "Xeral"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -662,27 +684,27 @@ msgstr "Factura en borrador está agora aberta."
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "Inactivo"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Últimos 30 días"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembro"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Pechar"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "Todos non socios"
 
 #. module: membership
 #: view:product.product:0
@@ -697,7 +719,7 @@ msgstr "Liña da factura contable"
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "Categorización"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
@@ -715,17 +737,17 @@ msgstr "Prezo da cuota de socio"
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Descrición compra"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "Descrición"
 
 #. module: membership
 #: field:res.partner,free_member:0
@@ -735,28 +757,28 @@ msgstr "Membro gratis"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "Socio prata"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Impostos venda"
 
 #. module: membership
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de remate"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "Febreiro"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
@@ -766,12 +788,12 @@ msgstr "Socio facturado"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "Data na que e cancelou o socio"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
@@ -787,7 +809,7 @@ msgstr "Socio en espera"
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de comezo"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -797,14 +819,14 @@ msgstr "Produto para socios"
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "Importe para ser socio."
 
 #. 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 "Membro cancelado"
 
 #. module: membership
 #: constraint:product.product:0
@@ -820,7 +842,7 @@ msgstr "Ano"
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "Ingreso realizado"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definición da acción."
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index bf4d0c89da6..0ca00c8ee80 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -474,6 +474,8 @@ msgstr ""
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Greška: Zadana jedinica mjere i nabavna jedinica mjere moraju biti u istoj "
+"kategoriji."
 
 #. module: membership
 #: view:report.membership:0
@@ -807,7 +809,7 @@ msgstr ""
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Pogreška: Neispravna EAN šifra"
 
 #. module: membership
 #: view:report.membership:0
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
index d465e7a9714..701ff62a790 100644
--- a/addons/membership/i18n/hu.po
+++ b/addons/membership/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 15:05+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -821,6 +822,3 @@ msgstr "Év"
 #: view:report.membership:0
 msgid "Revenue Done"
 msgstr "Bevétel kész"
-
-#~ msgid "Group By"
-#~ msgstr "Csoportosít"
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
index 9958a91db9c..cb981fac59e 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ec9442d4633..8b7dc3eeeaa 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/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: 2011-05-07 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -822,10 +822,6 @@ msgstr "Anno"
 msgid "Revenue Done"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Non puoi avere due versioni dello stesso listino che si sovrappongono"
-
 #~ msgid "Currency"
 #~ msgstr "Valuta"
 
@@ -932,6 +928,3 @@ msgstr ""
 
 #~ msgid "Error: BVR reference is required."
 #~ msgstr "Errore: La referenza BVR è richiesta"
-
-#~ msgid "Group By"
-#~ msgstr "Raggruppa per"
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
index 5496e7f4932..1742706fdf1 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -915,8 +915,5 @@ msgstr ""
 #~ msgid "Invoice Membership"
 #~ msgstr "인보이스 멤버십"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "2개의 가격리스트 버전이 중첩되면 안됩니다."
-
 #~ msgid "Current membership state"
 #~ msgstr "현재 멤버십 날짜"
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
index 20c30b91289..9e56b865215 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 286acf42422..8997ac7c808 100644
--- a/addons/membership/i18n/mn.po
+++ b/addons/membership/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index b1baa4e01e6..45b83786bd7 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -862,9 +862,6 @@ msgstr "Jaar"
 msgid "Revenue Done"
 msgstr "Ontvangen inkomsten"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Twee overlappende prijslijsten is niet mogelijk!"
-
 #~ msgid "Error ! You can not create recursive accounts."
 #~ msgstr "Fout ! U kunt geen recursieve rekeningen aanmaken."
 
@@ -980,18 +977,6 @@ msgstr "Ontvangen inkomsten"
 #~ msgid "You cannot have 2 pricelist versions that overlap!"
 #~ msgstr "U kunt geen twee overlappende prijslijsten hebben!"
 
-#~ msgid "Active Membership since this date"
-#~ msgstr "Actief lidmaatschap sinds deze datum"
-
-#~ msgid "Expired date of Membership"
-#~ msgstr "Vervaldag lidmaatschap"
-
-#~ msgid "Group By"
-#~ msgstr "Groepeer op"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
 #~ msgid ""
 #~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 #~ "Item!"
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
index 92aeb314d5a..e625e05320e 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 48ccd6815d3..de44bfeb58d 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 65c8794705a..8d6d58052ec 100644
--- a/addons/membership/i18n/pt.po
+++ b/addons/membership/i18n/pt.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-12-12 07:51+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2011-11-23 12:23+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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-24 05:00+0000\n"
+"X-Generator: Launchpad (build 14336)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -474,7 +474,7 @@ msgstr "Versão da Lista de Preço de Venda do Membro"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Erro: O  UOM por defeito e o UOM de compra devem estar na mesma categoria."
+"Erro: A UdM pré-defenida e a UdM de compra devem ser da mesma categoria."
 
 #. module: membership
 #: view:report.membership:0
@@ -821,9 +821,6 @@ msgstr "Ano"
 msgid "Revenue Done"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter duas versões da lista de preços que se sobrepõem!"
-
 #~ msgid "Currency"
 #~ msgstr "Moeda"
 
@@ -945,6 +942,3 @@ msgstr ""
 
 #~ msgid "Current membership state"
 #~ msgstr "Estado atual da adesão"
-
-#~ msgid "Group By"
-#~ msgstr "Agrupar por"
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index 523d7088e9e..f1df3d8cb10 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/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: 2011-07-19 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -821,9 +821,6 @@ msgstr "Ano"
 msgid "Revenue Done"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter 2 listas de preços que sobrepoem!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
 
@@ -843,3 +840,33 @@ msgstr ""
 #~ msgstr ""
 #~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
 #~ "especial!"
+
+#~ msgid "Currency"
+#~ msgstr "Moeda"
+
+#~ msgid "Free members"
+#~ msgstr "Membros gratuitos"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome do modelo Inválido na definição da ação"
+
+#~ msgid "State"
+#~ msgstr "Situação"
+
+#~ msgid "Future members (invoice not confirmed)"
+#~ msgstr "Futuros membros (fatura não confirmada)"
+
+#~ msgid "Membership Product - 2"
+#~ msgstr "Filiação do Produto - 2 ou Associação do Produto - 2"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirme"
+
+#~ msgid "Membership by Years"
+#~ msgstr "Filiação por anos ou Associação por anos"
+
+#~ msgid "Error ! You can not create recursive accounts."
+#~ msgstr "Erro! Você não pode criar contas recursivas"
+
+#~ msgid "Error: BVR reference is required."
+#~ msgstr "Erro: a referência BVR é necessária"
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
index bf1a5f3afa9..b37f5cc128e 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c1ffa74a758..2b43e5bb560 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 07:25+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-08-29 07:21+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-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -37,12 +37,12 @@ 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
@@ -57,7 +57,7 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
@@ -67,14 +67,14 @@ 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
 #: field:product.product,membership_date_to:0
@@ -84,7 +84,7 @@ msgstr "Дата до"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr ""
+msgstr "Ожидание счета"
 
 #. module: membership
 #: help:report.membership,date_to:0
@@ -94,7 +94,7 @@ msgstr ""
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Поставщики"
 
 #. module: membership
 #: view:res.partner:0
@@ -140,7 +140,7 @@ msgstr ""
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# выставленных счетов"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_report_membership
@@ -161,7 +161,7 @@ msgstr "Дата с"
 #: 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
@@ -228,7 +228,7 @@ msgstr "Начало членства"
 #: code:addons/membership/membership.py:413
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
@@ -238,7 +238,7 @@ msgstr ""
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "# Ожидающих"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -262,7 +262,7 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
@@ -296,7 +296,7 @@ msgstr ""
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "Присоединиться"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
@@ -312,7 +312,7 @@ msgstr ""
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "Дата вступления"
 
 #. module: membership
 #: help:res.partner,free_member:0
@@ -342,12 +342,12 @@ 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 "Сентябрь"
 
 #. module: membership
 #: model:ir.module.module,description:membership.module_meta_information
@@ -369,7 +369,7 @@ msgstr ""
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Позиция счета"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -393,12 +393,12 @@ msgstr ""
 #: 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
@@ -426,7 +426,7 @@ msgstr ""
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Связанный контрагент"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
@@ -439,7 +439,7 @@ msgstr ""
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "Менеджер продаж"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
@@ -449,13 +449,13 @@ msgstr ""
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-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
 #: selection:membership.membership_line,state:0
@@ -474,26 +474,28 @@ msgstr ""
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 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
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Дата с"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
@@ -513,12 +515,12 @@ msgstr "Дата отмены членства"
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
@@ -530,7 +532,7 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -571,12 +573,12 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: membership
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: membership
 #: field:membership.membership_line,state:0
@@ -586,17 +588,17 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Описание продажи"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: membership
 #: view:product.product:0
@@ -645,37 +647,37 @@ msgstr ""
 #. module: membership
 #: view:report.membership:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Последние 365 дней"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "Общие"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "Черновик счета открыт."
 
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "Неактивен"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Последние 30 дней"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: membership
 #: view:res.partner:0
@@ -695,7 +697,7 @@ msgstr ""
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "Категоризация"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
@@ -713,17 +715,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
@@ -733,7 +735,7 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
@@ -743,18 +745,18 @@ 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 "Февраль"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
@@ -764,7 +766,7 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
@@ -785,7 +787,7 @@ msgstr ""
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -820,9 +822,6 @@ msgstr "Год"
 msgid "Revenue Done"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Невозможно использовать 2 перекрывающиеся версии каталогов!"
-
 #~ msgid "Currency"
 #~ msgstr "Валюта"
 
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
index 4f817fc68f2..78b605a1c33 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f2500542cbf..34204e318d4 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -820,9 +820,6 @@ msgstr "Leto"
 msgid "Revenue Done"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Ne morete imeti 2 različic cenika, ki se prekrivata."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
 
diff --git a/addons/membership/i18n/sq.po b/addons/membership/i18n/sq.po
index 5e506198a42..a195454377a 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 91f9e4abbb7..bd74ac36a98 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 198eb6d5598..87009992c14 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4d81905adad..e1cbdfd720f 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 71f7e6655f6..03d9dbd1d9d 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 966430b5eac..f4134c14697 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 76dcc31d10c..7b3fd67c01b 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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c5a5ce334b9..b28ebc6c210 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\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
@@ -37,32 +37,32 @@ 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
@@ -89,12 +89,12 @@ msgstr "等待发票"
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "会员资格结束日期"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr "供应商列表"
+msgstr "供应商"
 
 #. module: membership
 #: view:res.partner:0
@@ -120,12 +120,12 @@ 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
 #: field:report.membership,tot_pending:0
@@ -135,12 +135,12 @@ msgstr "未决金额"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr "准业务伙伴"
+msgstr "商会伙伴"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr "笔已开票"
+msgstr "# 已开票"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_report_membership
@@ -150,7 +150,7 @@ msgstr "会员分析"
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "会员资格结束日期"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -161,7 +161,7 @@ msgstr "日期格式"
 #: 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
@@ -182,12 +182,12 @@ msgstr "业务伙伴"
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr "格式"
+msgstr "来自"
 
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr ""
+msgstr "错误，这个会员产品已过期"
 
 #. module: membership
 #: help:res.partner,membership_state:0
@@ -206,6 +206,13 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"会员的状态：\n"
+"非会员：      该客户还没有会员资格\n"
+"已退会员：   该客户已退出会员资格\n"
+"旧会员：      该客户的会员资格已过期\n"
+"待办会员：   该客户已签署会员资料等待开发票\n"
+"已开票会员：该客户的发票已开\n"
+"已付款会员：该客户已付款"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -238,14 +245,14 @@ msgstr "付费会员"
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr "笔正在等待"
+msgstr "# 正在等待"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
 #: view:res.partner:0
 msgid "Members"
-msgstr "成员"
+msgstr "会员"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -262,7 +269,7 @@ msgstr "待处理发票"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
@@ -274,14 +281,14 @@ msgstr "金牌会员"
 msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
-msgstr ""
+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
@@ -291,7 +298,7 @@ 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
@@ -302,7 +309,7 @@ msgstr "加入"
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "会员资格到哪一天结束"
 
 #. module: membership
 #: view:product.product:0
@@ -317,12 +324,12 @@ 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
@@ -347,7 +354,7 @@ msgstr "产品模板"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: membership
 #: model:ir.module.module,description:membership.module_meta_information
@@ -365,6 +372,15 @@ msgid ""
 "invoice and send propositions for membership renewal.\n"
 "    "
 msgstr ""
+"\n"
+"此模块用于管理所有会员管理的日常运营。\n"
+"支持多种会员资格：\n"
+"  免费会员\n"
+"  附属会员（一组会员共用一个会员资格）\n"
+"  已付款会员特价会员\n"
+"\n"
+"与销售和财务系统集成并自动创建会员的发票和续费提醒\n"
+"    "
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
@@ -388,17 +404,24 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"会员的状态：\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
@@ -415,18 +438,18 @@ msgstr "会员售价表"
 #: 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
@@ -439,7 +462,7 @@ msgstr "会员发票"
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr "销售员"
+msgstr "业务员"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
@@ -473,7 +496,7 @@ msgstr "会员售价表版本"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误:采购单位和计量单位不能是同一类型"
+msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
 
 #. module: membership
 #: view:report.membership:0
@@ -488,7 +511,7 @@ msgstr "会员"
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+msgstr "错误！您不能创建递归的商会会员。"
 
 #. module: membership
 #: view:product.product:0
@@ -498,12 +521,12 @@ 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
 #: field:res.partner,membership_cancel:0
@@ -513,12 +536,12 @@ 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
@@ -530,7 +553,7 @@ msgstr "会员产品"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -554,7 +577,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
@@ -566,27 +589,27 @@ msgstr "等待会员"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr "协会业务伙伴"
+msgstr "商会业务伙伴"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: membership
 #: view:product.product:0
 msgid "Extended Filters..."
-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
@@ -596,7 +619,7 @@ msgstr "销售说明"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: membership
 #: view:product.product:0
@@ -611,17 +634,17 @@ msgstr "会员数"
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "客户协商后的价格"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr "基本会员"
+msgstr "基础会员"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "选择作为会员资格的产品"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -645,7 +668,7 @@ msgstr "当前会员状态"
 #. module: membership
 #: view:report.membership:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "最近365天"
 
 #. module: membership
 #: view:product.product:0
@@ -660,17 +683,17 @@ msgstr "发票现在是待处理"
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr "未活动的"
+msgstr "不活跃的"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "最近30天"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: membership
 #: view:membership.invoice:0
@@ -690,12 +713,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
@@ -718,7 +741,7 @@ msgstr "采购说明"
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr "货品"
+msgstr "产品"
 
 #. module: membership
 #: view:product.product:0
@@ -733,7 +756,7 @@ msgstr "免费会员"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
@@ -754,7 +777,7 @@ msgstr "结束日期"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
@@ -764,12 +787,12 @@ msgstr "已开发票会员"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. 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
@@ -785,7 +808,7 @@ msgstr "等待会员"
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr "起始日期"
+msgstr "开始日期"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -795,7 +818,7 @@ msgstr "会员产品"
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "会员资格的价格"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -807,7 +830,7 @@ msgstr "已取消的会员"
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误:无效EAN代码"
+msgstr "错误：无效的(EAN)条码"
 
 #. module: membership
 #: view:report.membership:0
@@ -818,7 +841,7 @@ msgstr "年"
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "已实现收入"
 
 #~ msgid "Reporting"
 #~ msgstr "报表"
@@ -925,6 +948,3 @@ msgstr ""
 
 #~ msgid "Error: BVR reference is required."
 #~ msgstr "错误：需要BVR参照"
-
-#~ msgid "Group By"
-#~ msgstr "分组于"
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index 23b0fd9f0eb..bfe97925f93 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 6384a255ac3..09d9d34f973 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -379,7 +379,7 @@ class Partner(osv.osv):
         return True
 
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive associated members.', ['associate_member'])
+        (_check_recursion, 'Error ! You cannot create recursive associated members.', ['associate_member'])
     ]
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -570,4 +570,4 @@ class account_invoice_line(osv.osv):
 
 account_invoice_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 74d1baa128f..a1c39165c82 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -107,7 +107,7 @@
             <field name="name">Membership Products</field>
             <field name="res_model">product.product</field>
             <field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
-            <field name="context">{'membership':True, 'type':'service'}</field>
+            <field name="context">{'membership':True, 'type':'service', 'default_membership': True, 'default_type': 'service'}</field>
             <field name="search_view_id" ref="membership_product_search_form_view"/>
         </record>
 
@@ -127,8 +127,12 @@
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
+        <menuitem name="Configuration" id="base.menu_marketing_config_association"
+            parent="base.menu_association" sequence="30" groups="base.group_extended"/>
+
+
         <menuitem name="Membership Products"
-                  parent="menu_membership"
+                  parent="base.menu_marketing_config_association"
                   id="menu_membership_products"
                   action="action_membership_products"
                   sequence="1"
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 9cff243e930..b0ac01ac89f 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -9,7 +9,7 @@
             <field name="model">report.membership</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:membership_state in ('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') " string="Membership">
                     <field name="partner_id"/>
                     <field name="membership_state"/>
                     <field name="associate_member_id" invisible="1"/>
@@ -35,21 +35,27 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership">
-                    <group col="8" colspan="4">
-                        <filter string="Last 365 Days" icon="terp-go-year"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="month"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                    <group>
+                        <filter string="Year" icon="terp-go-year" name="year"
+                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Events created in current year"/>
+                        <separator orientation="vertical"/>
+                        <filter string="   Month   " icon="terp-go-month" name="this_month"
+                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Events created in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    "
+                        domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Events created in last month"/>
                         <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                         <separator orientation="vertical"/>
+                        <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                         <field name="user_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Salesman" icon="terp-personal" name="salesman"
                             domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
@@ -91,7 +97,7 @@
             <field name="res_model">report.membership</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_report_membership_search"/>
-            <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_salesman':1, }</field>
+            <field name="context">{"search_default_year":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_membership_tree_view1">
diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
index 4f3f5c0d493..27b755f156b 100644
--- a/addons/membership/test/test_membership.yml
+++ b/addons/membership/test/test_membership.yml
@@ -1,48 +1,34 @@
 - |
   In Order to test the Membership in OpenERP, which allows us to manage all operations for managing memberships.
 - |
-  I'm creating "Golden Membership" which has Membership fee 80 EURO and It's started from 1st June to 31st Dec.
+  I'm creating "Gold Membership" which has Membership fee 80 EURO and It's started from 1st June to 31st Dec.
 -
   !record {model: product.product, id: product_product_membershipproduct0}:
     categ_id: product.cat1
     membership: 1
     membership_date_from: !eval datetime.today().strftime("%Y-%m-%d")
     membership_date_to: !eval "(datetime.now() + timedelta(6*31)).strftime('%Y-%m-%d')" 
-    name: Golden Membership
+    name: Gold Membership
     type: service
     list_price: 80.00
 
 - |
-  "Mark Johnson" want to join "Golden Membership".
-- |
-  I'm creating new member "Mark Johnson".
+  "Seagate" want to join "Gold Membership", so I'm checking  "Current Membership State" of "Seagate". It is an "Non Member" or not.
 -
-  !record {model: res.partner, id: res_partner_markjohnson0}:
-    address:
-      - city: paris
-        country_id: base.fr
-        name: Mark Johnson
-        street: 1 rue Rockfeller
-        type: invoice
-        zip: '75016'
-    name: Mark Johnson
-- |
-  I'm checking  "Current Membership State" of "Mark Johnson". It is an "Non Member" or not.
--
-  !assert {model: res.partner, id: res_partner_markjohnson0}:
+  !assert {model: res.partner, id: base.res_partner_seagate}:
       - membership_state == 'none', 'Member should be has "Current Membership State" in "Non Member".'
 - |
-  I'm doing to make membership invoice for "Mark Johnson" on joining "Golden Membership".
+  I'm doing to make membership invoice for "Seagate" on joining "Gold Membership".
 -
   !python {model: res.partner}: |
-    self.create_membership_invoice(cr, uid, [ref("res_partner_markjohnson0")], product_id=ref("product_product_membershipproduct0"), datas={"amount":80.00})
+    self.create_membership_invoice(cr, uid, [ref("base.res_partner_seagate")], product_id=ref("product_product_membershipproduct0"), datas={"amount":80.00})
 - |
-  I'm checking  "Current Membership State" of "Mark Johnson". It is an "Waiting Member" or not.
+  I'm checking  "Current Membership State" of "Seagate". It is an "Waiting Member" or not.
 -
-  !assert {model: res.partner, id: res_partner_markjohnson0}:
+  !assert {model: res.partner, id: base.res_partner_seagate}:
       - membership_state == 'waiting', 'Member should be has "Current Membership State" in "Waiting Member".'
 - |
-  I'm Opening that Invoice which is created for "Mark Johnson".
+  I'm Opening that Invoice which is created for "Seagate".
 -
   !python {model: res.partner}: |
         import netsvc
@@ -52,20 +38,20 @@
         membership_line_pool = self.pool.get('membership.membership_line')
         membership_pool = self.pool.get('product.product')
 
-        membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('res_partner_markjohnson0'))])
+        membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('base.res_partner_seagate'))])
         membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids)
         assert membership_lines, _('Membership is not registrated.')
         membership_line = membership_lines[0]
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'account.invoice', membership_line.account_invoice_id.id, 'invoice_open', cr)
 - |
-  I'm checking "Current membership state" of "Mark Johnson". It is an "Invoiced Member" or not.
+  I'm checking "Current membership state" of "Seagate". It is an "Invoiced Member" or not.
 -
-  !assert {model: res.partner, id: res_partner_markjohnson0}:
+  !assert {model: res.partner, id: base.res_partner_seagate}:
      - membership_state == 'invoiced', 'Member should be has "Current Membership State" in "Invoiced Member".'
 
 - |
-  I'm creating free member "Ms. Johnson" of "Golden Membership".
+  I'm creating free member "Ms. Johnson" of "Gold Membership".
 -
   !record {model: res.partner, id: res_partner_msjohnson0}:
     address:
@@ -85,10 +71,10 @@
      - membership_state == 'free', 'Member should be has "Current Membership State" in "Free Member".'
 
 - |
-  I'm set "Mark Johnson" as a associated member of "Ms. Johnson" and also set Non free member.
+  I'm set "Seagate" as a associated member of "Ms. Johnson" and also set Non free member.
 -
   !python {model: res.partner}: |
-    self.write(cr, uid, [ref("res_partner_msjohnson0")], {'free_member': False, 'associate_member': ref("res_partner_markjohnson0")})
+    self.write(cr, uid, [ref("res_partner_msjohnson0")], {'free_member': False, 'associate_member': ref("base.res_partner_seagate")})
 
 - |
   I'm checking "Current membership state" of "Ms. Johnson". It is an "Paid Member" or not.
@@ -97,28 +83,28 @@
      - membership_state == 'paid', 'Member should be has "Current Membership State" in "Paid Member".'
 
 - |
-  I'm creating new "Silver Membership" which has Membership fee 50 EURO and It's started from 1st June to 31st Dec.
+  I'm creating new "Regular Membership" which has Membership fee 50 EURO and It's started from 1st June to 31st Dec.
 -
   !record {model: product.product, id: product_product_membershipproduct1}:
     categ_id: product.cat1
     membership: 1
     membership_date_from: !eval datetime.today().strftime("%Y-%m-%d")
     membership_date_to: !eval "(datetime.now() + timedelta(6*31)).strftime('%Y-%m-%d')" 
-    name: Silver Membership
+    name: Regular Membership
     type: service
     list_price: 50.00
 - |
-  I'm making invoice of "Mark Johnson" member on joining new membership "Silver Membership".
+  I'm making invoice of "Seagate" member on joining new membership "Regular Membership".
 -
   !python {model: res.partner}: |
-    self.create_membership_invoice(cr, uid, [ref("res_partner_markjohnson0")], product_id=ref("product_product_membershipproduct1"), datas={"amount":50.00})
+    self.create_membership_invoice(cr, uid, [ref("base.res_partner_seagate")], product_id=ref("product_product_membershipproduct1"), datas={"amount":50.00})
 - |
-  I'm checking "Current membership state" of "Mark Johnson". It is an "Old Member" or not.
+  I'm checking "Current membership state" of "Seagate". It is an "Old Member" or not.
 -
-  !assert {model: res.partner, id: res_partner_markjohnson0}:
+  !assert {model: res.partner, id: base.res_partner_seagate}:
       - membership_state == 'old', 'Member should be has "Current Membership State" in "Old Member".'
 - |
-  I'm doing to make credit note of invoice which is paid by "Mark Johnson" to cancel membership.
+  I'm doing to make credit note of invoice which is paid by "Seagate" to cancel membership.
 -
   !python {model: account.invoice}: |
         from tools.translate import _
@@ -128,15 +114,15 @@
         membership_pool = self.pool.get('product.product')
         invoice_refund_pool = self.pool.get('account.invoice.refund')
 
-        membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('res_partner_markjohnson0'))])
+        membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('base.res_partner_seagate'))])
         membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids)
         assert membership_lines, _('Membership is not registrated.')
         membership_line = membership_lines[0]
         refund_id = invoice_refund_pool.create(cr, uid, {'description': 'Refund of Membership', 'filter_refund': 'refund'}, {'active_id': membership_line.account_invoice_id.id})
         invoice_refund_pool.invoice_refund(cr, uid, [refund_id], {'active_id': membership_line.account_invoice_id.id, 'active_ids': [membership_line.account_invoice_id.id]})
 - |
-  I'm checking "Current membership state" of "Mark Johnson". It is an "Cancelled Member" or not.
+  I'm checking "Current membership state" of "Seagate". It is an "Cancelled Member" or not.
 -
-  !assert {model: res.partner, id: res_partner_markjohnson0}:
+  !assert {model: res.partner, id: base.res_partner_seagate}:
       - membership_state == 'canceled', 'Member should be has "Current Membership State" in "Cancelled Member".'
 
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index b97926e564c..d0be223158f 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -35,7 +35,7 @@ class membership_invoice(osv.osv_memory):
         """This function returns value of  product's member price based on product id.
         """
         if not product_id:
-            return {'value': {'unit_price': False}}
+            return {'value': {'member_price': False}}
         return {'value': {'member_price': self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]}}
 
     def membership_invoice(self, cr, uid, ids, context=None):
@@ -67,4 +67,4 @@ class membership_invoice(osv.osv_memory):
 
 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 500885d35f1..dedecf1e9dc 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -10,7 +10,7 @@
                 <form string="Membership Invoice">
                 	<group colspan="4" >
                      	<field name="product_id" colspan="4" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
-                        <field name="member_price" colspan="4" readonly="1"/>
+                        <field name="member_price" colspan="4" />
                     </group>
                     <group colspan="4" col="6">
                         <button  icon="gtk-close" special="cancel" string="Close"/>
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 30367ec35f8..52a5bdda77b 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -22,7 +22,6 @@
 import mrp
 import stock
 import product
-import installer
 import wizard
 import report
 import company
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 0eb8c89c6c0..38c5fa9a9d1 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -75,7 +75,6 @@ Dashboard provided by this module:
         'wizard/change_production_qty_view.xml',
         'wizard/mrp_price_view.xml',
         'wizard/mrp_workcenter_load_view.xml',
-        'wizard/mrp_change_standard_price_view.xml',
         'mrp_view.xml',
         'mrp_report.xml',
         'company_view.xml',
@@ -97,6 +96,7 @@ Dashboard provided by this module:
          'test/mrp_packs.yml',
          'test/mrp_phantom_bom.yml',
          'test/mrp_production_order.yml',
+         'test/mrp_production_cancel.yml',
          'test/mrp_report.yml',
 
     ],
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 03d6947d215..427780f344c 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -7,17 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manufacturing board">
-                    <hpaned position="100">
-                        <child1>
-                            <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next Production Orders" width="510"/>
-                            <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
-                        </child1>
-                        <child2>
-                            <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future Load" groups="base.group_extended"/>
-
-                            <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
-                        </child2>
-                    </hpaned>
+                    <board style="1-2">
+                        <column>
+                            <action name="%(mrp.mrp_production_action2)d" string="Next Production Orders"/>
+                            <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
+                        </column>
+                        <column>
+                            <action name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future Load"/> <!--groups="base.group_extended"-->
+                            <action name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index 15703b430db..c8a56267090 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 59add3b6ce4..cc97c80360f 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -748,7 +748,7 @@ msgid "Per month"
 msgstr "За месец"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -761,7 +761,7 @@ msgid "Product Name"
 msgstr "Име на продукт"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Невалидно действие !"
@@ -1327,7 +1327,7 @@ msgid "Month -1"
 msgstr "Месец -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1338,7 +1338,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1567,7 +1567,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1657,7 +1657,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Копиране"
@@ -2146,7 +2146,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2490,14 +2490,5 @@ msgstr "Година"
 #~ msgid "Routing Workcenters"
 #~ msgstr "Маршрутизиране на цехове"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Натоварване на работните центрове"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Натоварване на работния центрър"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "MRP - Справки"
-
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Посочете разходите на работен център за цикъл."
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index dc6ae13c97b..f5106281e27 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 4519f8f92f1..c6d359150ec 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-26 18:50+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 22:02+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -32,21 +31,26 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"Les ordres de fabricació solen ser proposades automàticament per OpenERP "
+"sobre la base de la llista de materials i les regles de proveïment, però "
+"també podeu crear ordres de fabricació manualment. OpenERP controlarà el "
+"consum de les matèries primeres (disminució d'estoc) i la producció dels "
+"productes acabats (augment d'estoc) quan es processi l'ordre."
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr ""
+msgstr "Ubicació on el sistema buscarà els components."
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr ""
+msgstr "Utilització del centre de producció"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr ""
+msgstr "Ruta de centres de producció"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -61,7 +65,7 @@ msgstr "Núm. de cicles"
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
-msgstr ""
+msgstr "Número de cicles"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -69,35 +73,37 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
+"La 'regla d'estoc mínim' permet al sistema crear ordres de compra "
+"automàticament tan bon punt les existències mínimes s'assoleix."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Albarà"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Hourly Cost"
-msgstr ""
+msgstr "Cost horari"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Cost Price per Uom"
-msgstr ""
+msgstr "Preu de cost per Udm"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Rebutja productes"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -108,22 +114,22 @@ msgstr "Processos productius"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Centre de producció del producte"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr ""
+msgstr "Cerca llista de materials"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Per als productes inventariables i consumibles"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "Per produir"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -131,6 +137,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Número d'iteraccions que ha de realitzar aquest centre de producció en "
+"l'operació indicada de la ruta."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -149,12 +157,12 @@ msgstr "Productes finalitzats"
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr ""
+msgstr "Per comprar"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Raw Material Location"
-msgstr ""
+msgstr "Ubicació de matèries primeres"
 
 #. module: mrp
 #: help:mrp.installer,mrp_operations:0
@@ -162,16 +170,20 @@ msgid ""
 "Enhances production orders with readiness states as well as the start date "
 "and end date of execution of the order."
 msgstr ""
+"Millora les ordres de producció amb els estats de preparació, així com la "
+"data d'inici i final de l'execució de l'ordre."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
+"El sistema crea automàticament una petició de pressupost al proveïdor "
+"preferit."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Productes per acabar"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -181,7 +193,7 @@ msgstr "Conjunt / Paquet"
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
-msgstr ""
+msgstr "Subproductes MRP"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -189,7 +201,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -202,6 +214,8 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
+"En cas que el mètode de subministrament del producte és Produir, el sistema "
+"crea una ordre de producció."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -224,11 +238,13 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Introduïu aquest producte per realitzar fàcilment un seguiment dels seus "
+"costos de producció en la comptabilitat analítica."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr ""
+msgstr "Per material comprat"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -249,17 +265,17 @@ msgstr "Compte cicle"
 #: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Work Cost"
-msgstr ""
+msgstr "Cost del treball"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr ""
+msgstr "Proveïment de serveis"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -274,12 +290,12 @@ msgstr "Ubicació destí"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr ""
+msgstr "Dades principals"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -287,6 +303,9 @@ 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 ""
+"El sistema espera al fet que els productes estiguin disponibles en l'estoc. "
+"Aquests productes solen ser adquirits de forma manual o a través d'una regla "
+"d'estoc mínim."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -316,48 +335,48 @@ msgstr "Referència a una ubicació en una plan. externa"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Esteu intentant assignar un lot que no és del mateix producte"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
-msgstr ""
+msgstr "Informe d'ordre de producció"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Produeix producte"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:177
 #, python-format
 msgid "Components Cost of "
-msgstr ""
+msgstr "Cost dels components de "
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "Proveïment de producte inventariable"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr ""
+msgstr "UdM per defecte"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -371,7 +390,7 @@ msgstr "Quantitat"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr ""
+msgstr "Nº d'hores"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -384,6 +403,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"El sistema crea una ordre (de producció o de compra) en funció de la "
+"quantitat venuda i els paràmetres dels productes."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -391,16 +412,18 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"Això s'utilitza en cas d'un servei sense cap tipus d'impacte en el sistema, "
+"una sessió de formació, per exemple."
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
 msgid "Repairs"
-msgstr ""
+msgstr "Reparacions"
 
 #. module: mrp
 #: field:mrp.installer,stock_location:0
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Rutes avançades"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -418,13 +441,15 @@ msgid ""
 "Enables warranty and repair management (and their impact on stocks and "
 "invoicing)."
 msgstr ""
+"Activa la garantia i la gestió de reparacions (i el seu impacte sobre estocs "
+"i facturació)"
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Data prevista"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -446,7 +471,7 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Variació del valor d'estoc"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -456,7 +481,7 @@ msgstr "Estructura llista de materials"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
+msgstr "Producte de tipus servei"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -464,16 +489,18 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bill of materials."
 msgstr ""
+"Defineix grups específics de la propietat que es poden assignar a les "
+"propietats de la llista de materials."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Descomposició fabricació"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
+msgstr "Per serveis"
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -493,13 +520,13 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr ""
+msgstr "Nº de cicles"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr ""
+msgstr "Sol·licitud de pressupost."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -507,11 +534,13 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"La llista de materials està vinculada a una ruta, és a dir, la successió de "
+"centres de producció."
 
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Codi EAN erroni"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -547,42 +576,42 @@ msgstr "Estructura LdM del producte"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr ""
+msgstr "Cerca producció"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Supplier Price per Uom"
-msgstr ""
+msgstr "Preu proveïdor per UdM"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "Estructura LdM"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr ""
+msgstr "Produeix"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "Especifiqueu el cost de centre de treball per cicle."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Excepció albarà"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -600,11 +629,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar la ruta sense eliminar-la."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Ruta del material"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -624,7 +654,7 @@ msgstr "Error! No podeu crear Llistes de Material recursives"
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr ""
+msgstr "Carga centre de producción"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
@@ -636,17 +666,17 @@ msgstr "No s'ha definit LdM per aquest producte!"
 #: 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 "Components de la llista de materials"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# de línies"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr ""
+msgstr "Planificació"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -661,6 +691,10 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
+"Llista de les operacions (llista dels centres de treball) per produir els "
+"productes acabats. La ruta s'utilitza principalment per calcular els costos "
+"del centre de treball durant les operacions i planificar la càrrega en el "
+"futur en els centres de treball basada en la planificació de producció."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
@@ -670,7 +704,7 @@ msgstr "Temps en hores per realitzar un cicle."
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "Ref LdM"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -683,7 +717,7 @@ msgstr "En producció"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "Llista de materials mestra"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -691,6 +725,8 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"UdV (Unitat de Venda) del producte és la unitat de mesura per la facturació "
+"i la promoció d'existències."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -709,12 +745,12 @@ msgstr "Tipus"
 #: code:addons/mrp/report/price.py:201
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "Cost total de "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Vinculat al mètode de proveïment 'Regla d'estoc mínim'."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -722,7 +758,7 @@ msgid "Per month"
 msgstr "Per mes"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -735,7 +771,7 @@ msgid "Product Name"
 msgstr "Nom producte"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Acció no vàlida!"
@@ -744,6 +780,7 @@ msgstr "Acció no vàlida!"
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
+"Un factor de 0.9 indica una pèrdua del 10% en el procés de producció."
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -751,6 +788,8 @@ msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
 msgstr ""
+"Afegeix més funcionalitats en el nucli de l'aplicació de fabricació amb els "
+"següents mòduls."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -766,22 +805,22 @@ msgstr "Demana pressupost"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Regla de proveïment"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work center per hour."
-msgstr ""
+msgstr "Especifica costos del centre de treball per hora."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Partial"
-msgstr ""
+msgstr "Parcial"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -795,6 +834,10 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
+"Depenent del mètode triat per \"subministrar\" del servei, l'ordre de "
+"proveïment crea una sol·licitud de pressupost per una comanda de compra "
+"(subcontractació) o espera fins que el servei es realitzi (= el lliurament "
+"dels productes)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -805,17 +848,17 @@ msgstr "Urgent"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "Ús del Centre de Treball"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Ordre de fabricació"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
-msgstr ""
+msgstr "Proveïment de matèries primeres"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,hour_nbr:0
@@ -823,6 +866,8 @@ msgid ""
 "Time in hours for this work center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Temps en hores d'aquest centre de producció per aconseguir el funcionament "
+"d'un itinerari específic."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -847,7 +892,7 @@ msgstr "Nom de modificació"
 #: view:mrp.production:0
 #: field:mrp.production.order,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: mrp
 #: field:mrp.bom,type:0
@@ -857,20 +902,20 @@ msgstr "Tipus de llista de materials"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:47
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
-msgstr ""
+msgstr "Proveïment '%s' té una excepció: 'El producte no té LdM definida!'"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: view:mrp.property:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -880,13 +925,13 @@ msgstr "Núm. de cicle"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Estoc mínim"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -896,7 +941,7 @@ msgstr "Taulell"
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr ""
+msgstr "Carga futura del centre de producció"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -909,7 +954,7 @@ msgstr "Producte estocable"
 #: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Work Center name"
-msgstr ""
+msgstr "Nom del centre de producció"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -924,7 +969,7 @@ msgstr "Núm. d'hores"
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "Planificació 'Just in Time'"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -940,13 +985,13 @@ msgstr "Qtat."
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr ""
+msgstr "Pla de producció"
 
 #. module: mrp
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Inactive"
-msgstr ""
+msgstr "Inactiu"
 
 #. module: mrp
 #: help:mrp.installer,mrp_subproduct:0
@@ -954,6 +999,8 @@ msgid ""
 "Enables multiple product output from a single production order: without "
 "this, a production order can have only one output product."
 msgstr ""
+"Habilita la sortida de múltiples productes d'una sola ordre de producció: "
+"sense això, una ordre de producció només pot tenir un producte de sortida."
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -967,7 +1014,7 @@ msgstr "Cancel·la"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "Divideix en lots de producció"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -975,6 +1022,9 @@ 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 ""
+"Número d'operacions d'aquest centre de treball es pot fer en paral·lel. Si "
+"aquest centre de treball representa un equip de 5 treballadors, la capacitat "
+"de cada cicle és de 5."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -982,6 +1032,8 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Si el servei té un mètode de subministrament 'Comprar', es crea una "
+"sol·licitud de pressupost, per exemple, una petició de subcontractació."
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -991,7 +1043,7 @@ msgstr "Moviment producte"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr ""
+msgstr "Retardat"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -1003,11 +1055,13 @@ msgstr "Obtenir per estoc"
 msgid ""
 "Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
+"Proporciona l'ordre de seqüències quan es mostra una llista d'enrutament "
+"dels centres de treball."
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr ""
+msgstr "Nom LdM"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1018,17 +1072,17 @@ msgstr "Comença producció"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr ""
+msgstr "Taulell de producció"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Ubic. orígen"
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Referència interna"
 
 #. module: mrp
 #: help:mrp.installer,stock_location:0
@@ -1036,11 +1090,13 @@ msgid ""
 "Manages product routes and paths within and between locations (e.g. "
 "warehouses)."
 msgstr ""
+"Gestiona les rutes i camins dels productes dins i entre les ubicacions (per "
+"exemple, magatzems)."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr ""
+msgstr "Estructura de producte"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1054,7 +1110,7 @@ msgstr "Nom"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "Configuració aplicació MRP"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1065,16 +1121,22 @@ msgid ""
 "avoids having to wait for the procurement scheduler to run or having to run "
 "the procurement scheduler manually."
 msgstr ""
+"Permet el càlcul de les ordres de proveïment just a temps (Just In Time).\n"
+"\n"
+"Si bé consumeix més recursos que la configuració predeterminada, el càlcul "
+"JIT evita haver d'esperar al fet que s'executi el planificador de "
+"proveïments o haver d'executar el planificador de proveïments de forma "
+"manual."
 
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Mode"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
@@ -1091,16 +1153,23 @@ msgid ""
 "materials have been defined, OpenERP is capable of automatically deciding on "
 "the manufacturing route depending on the needs of the company."
 msgstr ""
+"Les ordres de fabricació descriuen les operacions que han de ser realitzades "
+"i les matèries primeres necessàries per a cada etapa de fabricació. "
+"Utilitzeu les especificacions (llistes de materials o LdM) per obtenir les "
+"necessitats de matèries primeres i les ordres de fabricació necessàries per "
+"als productes finals. Una vegada les llistes de materials hagin estat "
+"definides, OpenERP és capaç de decidir automàticament al ruta de fabricació "
+"en funció de les necessitats de la companyia."
 
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "La quantitat ordenada no pot ser negativa o zero!"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr ""
+msgstr "Odres de producció en progrés"
 
 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
@@ -1144,7 +1213,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr ""
+msgstr "Ordres de producció esperant productes"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1154,7 +1223,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -1177,7 +1246,7 @@ msgstr "Ubicació productes finalitzats"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr ""
+msgstr "Recursos"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1189,7 +1258,7 @@ msgstr "Diari analític"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr ""
+msgstr "Centres de producció"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1204,6 +1273,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Les rutes li permeten crear i gestionar les operacions de fabricació a "
+"realitzar en els seus centres de producció per fabricar un producte. Estan "
+"relacionades amb les llistes de materials que definiran les matèries "
+"primeres necessàries."
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1213,7 +1286,7 @@ msgstr "Núm. de hora"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr ""
+msgstr "Operacions del centre de producció"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1237,7 +1310,7 @@ msgstr "Selecciona unitat de temps"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "Carga centre de producció"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1250,16 +1323,18 @@ msgid ""
 "This is the internal picking list that brings the finished product to the "
 "production plan"
 msgstr ""
+"Aquest és l'albarà intern que porta el producte acabat cap al pla de "
+"producció."
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
 msgid "Change Parent Price"
-msgstr ""
+msgstr "Canvia preu pare"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Moviment d'estoc"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1268,6 +1343,9 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
+"La regla d'estoc mínim és una regla de proveïment automàtic basada en una "
+"quantitat mínima i màxima. Està disponible en el menú de gestió d'inventari "
+"i configurable per producte."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1283,6 +1361,7 @@ msgstr "Revisions"
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
 msgstr ""
+"Configureu la seva aplicació de planificació de recursos de fabricació (MRP)"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1293,18 +1372,18 @@ msgstr "Prioritat (0=Molt urgent)"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Albarà"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
-msgstr ""
+msgstr "Ordre de producció '%s' planificada pel '%s'"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1312,15 +1391,15 @@ msgid "Production Order N° :"
 msgstr "Núm. ordre producció :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
-msgstr ""
+msgstr "Ordre de fabricació '%s' està preparada per produir"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Fabricació planificada producte"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1337,7 +1416,7 @@ msgstr "Obtenir per estoc"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -1348,6 +1427,12 @@ msgid ""
 "product needs. You can either create a bill of materials to define specific "
 "production steps or define a single multi-level bill of materials."
 msgstr ""
+"Les llistes de materials mestres li permeten crear i gestionar la llista de "
+"les matèries primeres necessàries utilitzades per fabricar un producte "
+"acabat. OpenERP utilitzarà aquestes LdMs per proposar automàticament ordres "
+"de fabricació en funció de les necessitats de producte. Podeu crear una "
+"llista de materials per definir els passos de producció o definir una única "
+"llista de materials multi-nivell."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
@@ -1355,6 +1440,8 @@ msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
 msgstr ""
+"En cas que el mètode de subministrament del producte sigui Compra, el "
+"sistema crea una comanda de compra."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1371,34 +1458,34 @@ msgstr "Estructura dels costos del producte"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Components suppliers"
-msgstr ""
+msgstr "Proveïdors de components"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
-msgstr ""
+msgstr "mrp.instal·lador"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Centres de treball de producció"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:62
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "ID actiu no es troba"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Cerca per centre de producció mrp"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1419,17 +1506,17 @@ msgstr "Compte hores"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Ubic. destinació"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
 msgid "Product Consumed"
-msgstr ""
+msgstr "Producte consumit"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1446,7 +1533,7 @@ msgstr "Proveir products"
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Càrregues centre de producció"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1464,6 +1551,8 @@ msgstr "Propietats"
 msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
+"Referència al document que va generar aquesta sol·licitud d'ordre de "
+"producció."
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1472,6 +1561,9 @@ msgid ""
 "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
 #: view:mrp.production:0
@@ -1481,17 +1573,17 @@ msgstr "Informació extra"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Canvia quantitat de productes"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Guia les ordres de proveïment per matèries primeres."
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1513,14 +1605,14 @@ msgstr "Realitzat"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Canvi de preu estàndard"
 
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Document d'origen"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1534,17 +1626,19 @@ msgid ""
 "This will change the price of parent products also according to the BoM "
 "structure specified for the product."
 msgstr ""
+"Això canviarà el preu dels productes pare, d'acord a l'estructura de la "
+"llista de materials del producte."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr ""
+msgstr "Ordres de producció a iniciar"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
-msgstr ""
+msgstr "No es pot eliminar ordre/s de producció que estan en estat %s!"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1553,7 +1647,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Centre de treball"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1588,7 +1682,7 @@ msgstr "Ubicació matèries primeres"
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Imprimeix l'estructura de costos del producte"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -1603,11 +1697,14 @@ msgid ""
 "of one or more persons and/or machines that can be considered as a unit for "
 "capacity and planning forecasting."
 msgstr ""
+"Els centres de treball li permeten crear i administrar unitats de producció "
+"que consisteixen en una o més persones i / o màquines que es poden "
+"considerar com una unitat per la capacitat de planificació i previsió."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Consumeix productes"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1622,19 +1719,19 @@ msgstr "UdM producte"
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Obté sota comanda"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr ""
+msgstr "Anàlisi de producció"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Copieu"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1650,7 +1747,7 @@ msgstr "Data final"
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurs"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1667,7 +1764,7 @@ msgstr "UdV del producte"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Núm. línia ordres"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1683,11 +1780,15 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
+"La llista d'operacions (llista dels centres de treball) per produir els "
+"productes acabats. La ruta s'utilitza principalment per calcular els costos "
+"del centre de treball durant les operacions de càrrega i planificar el futur "
+"en els centres de treball basat en la planificació de la producció."
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprova"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1698,6 +1799,7 @@ msgstr "Categories de propietats"
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
 msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista d'ordres de treball."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1722,7 +1824,7 @@ msgstr "Consumició de productes produïts"
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr ""
+msgstr "Ordres de producció"
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1733,6 +1835,11 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"El mode 'Només consumir' només es consumeixen els productes amb la quantitat "
+"seleccionada.\n"
+"El mode 'Consum i Producció' es consumeixen i també es produeixen els "
+"productes amb la quantitat seleccionada i finalitzarà l'ordre de producció "
+"quan el total de les unitats sol·licitades s'han produït."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1749,13 +1856,13 @@ msgstr "Cost per cicle"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Servei"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1767,6 +1874,7 @@ msgstr "LdM"
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
 msgstr ""
+"UdM(Unitat de mesura) és la unitat de mesura per al control d'inventari"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1775,6 +1883,9 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"La llista de materials és la composició del producte. Els components (que "
+"són també productes) poden tenir les seves pròpies llistes de materials "
+"(multi-nivell)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1785,7 +1896,7 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1804,7 +1915,7 @@ msgstr "Ordre de producció"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "Regla de proveïment automàtica"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1821,7 +1932,7 @@ msgstr "Qtat. UdV del producte"
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "Components"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1847,7 +1958,7 @@ msgstr "LdM normal"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Termini de lliurament de fabricació"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1862,6 +1973,9 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"La variació setmanal del valor de l'estoc permet realitzar un seguiment de "
+"l'evolució del valor de l'estoc relatiu a les activitats de fabricació, "
+"recepció de productes i ordres d'entrega."
 
 #. module: mrp
 #: view:mrp.product.produce:0
@@ -1871,12 +1985,12 @@ msgstr "Confirmat"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "Eficiència de la producció"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No podeu crear companyies recursives."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1884,6 +1998,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar les llistes de material sense "
+"eliminar-les."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1894,7 +2010,7 @@ msgstr "Arrodoniment del producte"
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Ordre de treball"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -1902,11 +2018,13 @@ msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
 msgstr ""
+"Aquests informes li permeten analitzar les seves activitat productiva i el "
+"seu rendiment."
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Consumeix únicament"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1922,6 +2040,11 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"Si un sub-producte s'utilitza en diversos productes, pot ser útil crear la "
+"seva pròpia llista de materials. Encara que si no vol ordres de producció "
+"separades per aquest sub-producte, seleccioneu Conjunt/Fantasma com a tipus "
+"de LdM. Si una LdM fantasma s'utilitza per a un producte arrel, serà venuda "
+"i enviada com un conjunt de components, en comptes de ser produïda."
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1939,6 +2062,13 @@ msgid ""
 " 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'."
 msgstr ""
+"Quan es crea l'ordre de fabricació el seu estat és fixat a \"Esborrany\"\n"
+" Si l'ordre està confirmada, l'estat és fixat a \"Esperant mercaderia\"\n"
+" Si existeix alguna excepció, l'estat és fixat a \"Excepció de proveïment\"  "
+"                                  \n"
+"Si l'estoc està disponible, l'estat és fixat a \"Llest per produir\"\n"
+" Quan la fabricació comença, l'estat és fixat a \"En producció\"\n"
+" Quan la fabricació finalitza, l'estat és fixat a \"Realitzat\""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1974,7 +2104,7 @@ msgstr "Número d'hores"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Informació de costos"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
@@ -1984,12 +2114,12 @@ msgstr "Ordres de proveïment"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Arrodoniment aplicat sobre la quantitat de producte"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Assignació des de producció o comanda de compra."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -1999,7 +2129,7 @@ msgstr "Procés productiu pare"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2009,12 +2139,12 @@ msgstr "Temps en hores per la configuració."
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2032,7 +2162,7 @@ msgstr "Variació del valor de l'estoc"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Assignació des d'estoc."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2067,7 +2197,7 @@ msgstr "Setmana"
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -2078,24 +2208,24 @@ msgstr "Normal"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Etapes de producció."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Estructura de costos"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Consumeix i produeix"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
@@ -2109,19 +2239,22 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
+"Els component de llistes de materials són components i sub-productes "
+"utilitzats per crear llistes de materials mestres. Utilitzeu aquest menú per "
+"buscar en quin LdM és utilitzat un component específic."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Tipus de producte és emmagatzemable o consumible."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2131,7 +2264,7 @@ msgstr "Error"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Selecciona quantitat"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2148,11 +2281,15 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
+"Encaminament indica que tots els centres de treball utilitzats, per quant de "
+"temps i / o cycles.If enrutament s'indica a continuació, la fitxa de la "
+"tercera part d'una ordre de producció (centres de treball) seran "
+"automàticament pre-acabat."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Revisió de la llista de materials"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -2169,7 +2306,7 @@ msgstr "Produccions"
 #: code:addons/mrp/report/price.py:194
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Cost treball de "
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -2177,6 +2314,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
+"Descripció del centre de treball. Explicar aquí el que és un cicle d'acord "
+"amb aquest centre de treball."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2193,7 +2332,7 @@ msgstr "Procés productiu"
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Operacions de fabricació"
 
 #. module: mrp
 #: field:mrp.production,date_planned:0
@@ -2203,7 +2342,7 @@ msgstr "Data planificada"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Heu d'assignar un lot de producció per aquest producte"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -2214,6 +2353,12 @@ 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 the needs."
 msgstr ""
+"Les propietats en OpenERP s'utilitzen per seleccionar la llista de materials "
+"correcta per a la fabricació d'un dels productes quan es tenen diferents "
+"formes de fabricar el mateix producte. Podeu assignar diverses propietats "
+"per a cada llista de materials. Quan un venedor crea una comanda de client, "
+"ell pot relacionar-ho amb diverses propietats i OpenERP seleccionarà "
+"automàticament la llista de materials per utilitzar segons les necessitats."
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -2224,32 +2369,32 @@ msgstr "Producció"
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Proveïments en excepció"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "material 'regla estoc mínim'"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Preu del producte"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
 msgid "MRP Applications Configuration"
-msgstr ""
+msgstr "Configuració de les aplicacions MRP"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Divideix en lots de producció"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Canvia la quantitat"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2273,17 +2418,17 @@ msgstr "Descripció"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Taulell de fabricació"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Data de finalització planificada"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2292,11 +2437,14 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Les càrregues dels centres de producció mostren un pronòstic de la càrrega "
+"dels centres de producció respecte a un període determinat. Està expressat "
+"en número d'hores i cicles de màquina relacionats."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "La forma de proveir depèn del tipus de producte."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2306,23 +2454,23 @@ msgstr "Fabricació"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Properes ordres de producció"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Grups de propietats"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2330,6 +2478,9 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
+"Depenent del mètode triat per subministrar els productes enmagatzenables, "
+"l'ordre de proveïment crea una petició de pressupost, una ordre de "
+"producció, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2339,7 +2490,7 @@ msgstr "Temps en hores per la neteja."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Petició de pressupost automàtica"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2347,6 +2498,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Si el servei té un mètode de subministrament 'Produir', es crea una tasca en "
+"el mòdul de gestió de projectes d'OpenERP."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2355,6 +2508,10 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
+"Per poder subministrar matèries primeres (que han de ser comprades o "
+"produïdes), l'ordre de producció genera tantes ordres de proveïment com a "
+"components figurin en la llista de materials, a través d'una execució de les "
+"planificacions (MRP)."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2362,6 +2519,8 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Indiqueu la quantitat de productes a produir o comprar. L'informe de "
+"l'estructura de costos es mostra basant-se en aquesta quantitat."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -2379,12 +2538,14 @@ msgstr "Seqüència"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Absències de recursos"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
 msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista de llistes de "
+"materials."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2392,13 +2553,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Productes a consumir"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #~ msgid "Production Workcenters"
 #~ msgstr "Producció dels centres de producció"
@@ -3157,17 +3318,107 @@ msgstr ""
 #~ msgid "Status"
 #~ msgstr "Estat"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Càrrega centres de producció"
+#~ msgid "Workcenter Usage"
+#~ msgstr "Us del centre de producció"
 
-#~ msgid "Workcenter Load"
-#~ msgstr "Càrrega del centre de producció"
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr ""
+#~ "La ruta indica tots els centres de producció utilitzats, per quant temps i/o "
+#~ "cicles. Si s'indica la ruta, llavors la tercera pestanya d'una ordre de "
+#~ "producció (centres de producció) serà automàticament pre-completada."
 
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Informes - Gestió MRP"
+#~ msgid ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr ""
+#~ "Descripció del centre de treball. Expliqueu aquí el que és un cicle d'acord "
+#~ "amb aquest centre de treball."
 
-#~ msgid "Workcenter Loads"
-#~ msgstr "Càrregues centre de producció"
+#~ msgid "Specify Cost of Work center per cycle."
+#~ msgstr "Especificar el cost del centre de treball per cicle."
 
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "Planificador MRP & Logística"
+#~ 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 ""
+#~ "El número d'operacions d'aquest centre de treball es pot fer en paral·lel. "
+#~ "Si aquest centre de treball representa un equip de 5 treballadors, la "
+#~ "capacitat per cicle és de 5."
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and work center integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    Dashboard provided by this module::\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out picking)\n"
+#~ "    * Graph of work center load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Aquest és el mòdul bàsic per gestionar els processos de fabricació en "
+#~ "OpenERP.\n"
+#~ "\n"
+#~ "\n"
+#~ "    Característiques:\n"
+#~ "\n"
+#~ "    *Obtenir per estoc / Obtenir sota comanda (per línia)\n"
+#~ "    *BoMs multi-nivells, sense límit\n"
+#~ "    *Ubicacions multi-nivell, sense límit\n"
+#~ "    *Ubicacions i centres de treball integrats amb la comptabilitat "
+#~ "analítica\n"
+#~ "    *Execució periòdica del càlcul de la planificació / Mòdul 'Just In "
+#~ "Estafi'\n"
+#~ "    *Multi-pv, multi-magatzem\n"
+#~ "    *Diferents polítiques de comanda\n"
+#~ "    *Mètode de cost per producte: preu estàndard, preu mitjà\n"
+#~ "    *Fàcil anàlisi de problemes o necessitats\n"
+#~ "    *Molt flexible\n"
+#~ "    *Permet inspeccionar l'estructura completa de Factures de Materials\n"
+#~ "        que inclouen BoMs filles i fantasmes\n"
+#~ "    Suporta integració i planificació de mercaderies enmagatzenables,\n"
+#~ "    i consum de serveis. Els serveis s'integren completament amb la resta\n"
+#~ "    de l'aplicació. Per exemple, es pot establir una servei de "
+#~ "subcontractació\n"
+#~ "    en una BoM per encarregar automàticament el muntatge de la seva "
+#~ "producció.\n"
+#~ "\n"
+#~ "    Els informes que facilita aquest mòdul:\n"
+#~ "    *Components i estructura de la BoMs\n"
+#~ "    *Previsió de càrrega dels centres de treball\n"
+#~ "    *Previsió de magatzem\n"
+#~ "    *Taulers proporcionats en aquest mòdul:\n"
+#~ "    *Llista d'ordres de producció properes\n"
+#~ "    *Llista de lliuraments\n"
+#~ "    *Gràfic de càrrega del centre de treball\n"
+#~ "    *Llista d'ordres de fabricació amb excepcions\n"
+#~ "    "
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 38555a54d96..5244b3928c6 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-15 02:28+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\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: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp
@@ -2453,18 +2453,6 @@ msgstr "Rok"
 #~ msgid "Workcenter load"
 #~ msgstr "Načíst pracovní centrum"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Načtení pracovních center"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Načtení pracovních center"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "MRP Správa - Hlášení"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Pracovní centrum načteno"
-
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Zadejte cenu pracovního centra za cykl"
 
diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
new file mode 100644
index 00000000000..17a13380616
--- /dev/null
+++ b/addons/mrp/i18n/da.po
@@ -0,0 +1,2394 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-09 21:53+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: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:mrp.module_meta_information
+msgid "Manufacturing Resource Planning"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+#: field:mrp.production.order,picking_id:0
+msgid "Picking list"
+msgstr "Pluk liste"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Hourly Cost"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cost Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. 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 ""
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr "Søg stykliste"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Raw Material Location"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.installer,mrp_operations:0
+msgid ""
+"Enhances production orders with readiness states as well as the start date "
+"and end date of execution of the order."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,mrp_subproduct:0
+msgid "MRP Subproducts"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "Kost pr. time"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr ""
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+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 ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Rapportering"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Cost"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr "["
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "title"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+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 ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "August"
+msgstr "August"
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_order
+msgid "Production Order Report"
+msgstr "Produktionsordre rapport"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:177
+#, python-format
+msgid "Components Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,mrp_repair:0
+msgid "Repairs"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,stock_location:0
+msgid "Advanced Routes"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.installer,mrp_repair:0
+msgid ""
+"Enables warranty and repair management (and their impact on stocks and "
+"invoicing)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr "Stykliste"
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr "Stykliste struktur"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+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 ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr "Ændre antal"
+
+#. 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"
+msgstr "Lager værdi"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr "Søg produktion"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Picking Exception"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr "Stykliste linier"
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,consumed_products:0
+msgid "Consumed Products"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr ""
+
+#. 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 ""
+
+#. module: mrp
+#: field:mrp.production.order,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr "Planlægning"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "In Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:150
+#: code:addons/mrp/report/price.py:201
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr "Pr. måned"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid ""
+"Add more functionalities to the core Manufacturing Application with the "
+"following addons."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work center per hour."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "September"
+msgstr "September"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr "Indkøb af råmaterialer"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this work center to achieve the operation of the specified "
+"routing."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+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
+#: field:mrp.production.order,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:47
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+msgid "Search"
+msgstr "Søg"
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr "Virksomheder"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr "Minimum lager"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr "Oversigt"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Center name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,mrp_jit:0
+msgid "Just In Time Scheduling"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr "Antal"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr "Inaktiv"
+
+#. module: mrp
+#: help:mrp.installer,mrp_subproduct:0
+msgid ""
+"Enables multiple product output from a single production order: without "
+"this, a production order can have only one output product."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+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 ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing work centers."
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.installer,stock_location:0
+msgid ""
+"Manages product routes and paths within and between locations (e.g. "
+"warehouses)."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "MRP Application Configuration"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.installer,mrp_jit:0
+msgid ""
+"Enables Just In Time computation of procurement orders.\n"
+"\n"
+"While it's more resource intensive than the default setup, the JIT computer "
+"avoids having to wait for the procurement scheduler to run or having to run "
+"the procurement scheduler manually."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr "]"
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr "Igangværende produktionsordre"
+
+#. module: mrp
+#: model:ir.module.module,description:mrp.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the manufacturing process in OpenERP.\n"
+"\n"
+"    Features:\n"
+"    * Make to Stock / Make to Order (by line)\n"
+"    * Multi-level BoMs, no limit\n"
+"    * Multi-level routing, no limit\n"
+"    * Routing and work center integrated with analytic accounting\n"
+"    * Scheduler computation periodically / Just In Time module\n"
+"    * Multi-pos, multi-warehouse\n"
+"    * Different reordering policies\n"
+"    * Cost method by product: standard price, average price\n"
+"    * Easy analysis of troubles or needs\n"
+"    * Very flexible\n"
+"    * Allows to browse Bill of Materials in complete structure\n"
+"        that include child and phantom BoMs\n"
+"    It supports complete integration and planification of stockable goods,\n"
+"    consumable of services. Services are completely integrated with the "
+"rest\n"
+"    of the software. For instance, you can set up a sub-contracting service\n"
+"    in a BoM to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"    Reports provided by this module:\n"
+"    * Bill of Material structure and components\n"
+"    * Load forecast on Work Centers\n"
+"    * Print a production order\n"
+"    * Stock forecasts\n"
+"    Dashboard provided by this module::\n"
+"    * List of next production orders\n"
+"    * List of deliveries (out picking)\n"
+"    * Graph of work center load\n"
+"    * List of procurement in exception\n"
+"    "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Cycles Cost"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,location_dest_id:0
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr "Ressourcer"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr "Pr. uge"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr "Noter"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: field:mrp.production.order,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr "Stykliste"
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the internal picking list that brings the finished product to the "
+"production plan"
+msgstr ""
+
+#. module: mrp
+#: field:stock.change.standard.price,change_parent_price:0
+msgid "Change Parent Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure Your Manufacturing Resource Planning Application"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,priority:0
+#: field:mrp.production.order,priority:0
+msgid "Priority"
+msgstr "Prioritet"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Month -1"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:924
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:640
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr "Indkøb"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
+msgid "Product Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_installer
+msgid "mrp.installer"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:62
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+#: field:mrp.production.order,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.order,product_id2:0
+msgid "Product Consumed"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+
+#. module: mrp
+#: 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
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Current"
+msgstr "Nuværende"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Done"
+msgstr "Udført!"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_change_standard_price
+msgid "Change Standard Price"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: help:stock.change.standard.price,change_parent_price:0
+msgid ""
+"This will change the price of parent products also according to the BoM "
+"structure specified for the product."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_id:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+#: field:mrp.production.order,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units consisting "
+"of one or more persons and/or machines that can be considered as a unit for "
+"capacity and planning forecasting."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.order,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
+#: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
+msgid "Production Analysis"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:349
+#, python-format
+msgid "Copy"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+#: field:mrp.production.order,date_finished:0
+msgid "End Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "#Line Orders"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr "Godkend"
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "BOM"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr "Produktionsordre"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr "Gyldig indtil"
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr "Gyldig fra"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr ""
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"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. 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."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"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'.       "
+"                             \n"
+"If 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'."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "December"
+msgstr "December"
+
+#. module: mrp
+#: field:mrp.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. 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
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+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
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Uge"
+
+#. module: mrp
+#: field:mrp.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:136
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
+#, python-format
+msgid "Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "November"
+msgstr "November"
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Error"
+msgstr "Fejl"
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr "Stykliste"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr "Produktioner"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:194
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: field:mrp.production.order,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.installer,mrp_operations:0
+msgid "Manufacturing Operations"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the the needs."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr "Produktion"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_installer
+msgid "MRP Applications Configuration"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+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
+#: selection:mrp.production.order,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "April"
+msgstr "April"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr "På lager"
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr "Rækkefølge"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,products_to_consume:0
+msgid "Products to Consume"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,year:0
+msgid "Year"
+msgstr "År"
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 31aac6b0467..73f62cd257d 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -758,7 +758,7 @@ msgid "Per month"
 msgstr "Pro Monat"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -771,7 +771,7 @@ msgid "Product Name"
 msgstr "Produkt Bezeichnung"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Fehlerhafte Aktion !"
@@ -1382,7 +1382,7 @@ msgid "Month -1"
 msgstr "Monat -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Fertigungsauftrag '%s' ist geplant für %s."
@@ -1393,7 +1393,7 @@ msgid "Production Order N° :"
 msgstr "Fertigungsauftragsnr."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Fertigungsauftrag '%s' ist Startbereit."
@@ -1635,7 +1635,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Fertigungsaufträge (Startbereit)"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr "Fertigungsaufträge im Status %s können nicht gelöscht werden"
@@ -1728,7 +1728,7 @@ msgid "Production Analysis"
 msgstr "Statistik Fertigungsaufträge"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Duplizieren"
@@ -2257,7 +2257,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Produkttyp ist 'Lagerprodukt' oder 'Verbrauchsmaterial'."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -3311,106 +3311,15 @@ msgstr "Jahr"
 #~ "wird für die Berechnung der Kosten der Arbeitsplätze und für die Auslastung "
 #~ "aufgrund der Produktionsplanung verwendet."
 
-#~ msgid "Procurement Request"
-#~ msgstr "Einkaufs Anforderung"
-
-#~ msgid "Scheduled End"
-#~ msgstr "Geplantes Ende"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Arbeitsplatz Auslastung"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Reporting Materialbeschaffungsplanung (MRP)"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Arbeitsplatz Auslastung"
-
-#~ msgid "Next production orders"
-#~ msgstr "Nächste Produktionsaufträge"
-
 #~ msgid "Product UoM"
 #~ msgstr "Produkt ME"
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the bills of "
-#~ "material without removing it."
-#~ msgstr ""
-#~ "Wenn diese Option aktiviert wird, kann diese Stückliste ausgeblendet aber "
-#~ "trotzdem beibehalten werden."
-
-#, python-format
-#~ msgid "of "
-#~ msgstr "von "
-
-#~ msgid ""
-#~ "Specify quantity of products to produce or buy. Report of Cost structure "
-#~ "will be displayed base on this qunatity."
-#~ msgstr ""
-#~ "Spezifiziere herzustellende oder zu beschaffende Menge. Die "
-#~ "Kostenkalkulation bezieht sich dann auf diese herzustellende Menge."
-
-#~ msgid "Work Center Future load"
-#~ msgstr "Arbeitsplatz Auslastung"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the routing "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn dieses Feld aktiviert wird, kann ein Arbeitsgang deaktiviert werden, "
-#~ "ohne in aus der Liste zu entfernen."
-
-#, python-format
-#~ msgid "Cost "
-#~ msgstr "Kosten "
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
-#, python-format
-#~ msgid "Work Cost "
-#~ msgstr "Arbeitskosten "
-
-#, python-format
-#~ msgid "Total Cost "
-#~ msgstr "Gesamte Kosten "
-
-#~ msgid "Number of operations this workcenter can do."
-#~ msgstr "Maximale Anzahl an Fertigungsvorgängen dieser Fertigungsstelle."
-
-#~ msgid "Work Centers load"
-#~ msgstr "Auslastung Fertigungsstelle"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#, python-format
-#~ msgid "Component suppliers"
-#~ msgstr "Bauteile Lieferant"
-
-#~ msgid "Specify Cost of Workcenter per hour."
-#~ msgstr "Spezifiziere Stundensatz der Fertigungsstelle."
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Fertigungsstelle Auslastung"
-
-#~ msgid "Specify Cost of Workcenter per cycle."
-#~ msgstr "Spezifiziere Kosten der Fertigungsstelle pro Zyklus"
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Fertigungsstelle Auslastung"
 
-#, python-format
-#~ msgid "Component"
-#~ msgstr "Bauteil"
-
-#~ msgid ""
-#~ "Gives the sequence order when displaying a list of routing workcenters."
-#~ msgstr "Reihenfolge bei Anzeige der Liste für Fertigungsstellen"
-
 #~ msgid ""
 #~ "Description of the workcenter. Explain here what's a cycle according to this "
 #~ "workcenter."
@@ -3418,28 +3327,6 @@ msgstr "Jahr"
 #~ "Beschreibung der Fertigungsstelle. Beschreibe hier den Fertigungszyklus aus "
 #~ "der Perspektive dieser Fertigungsstelle."
 
-#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "plannification."
-#~ msgstr ""
-#~ "Liste der Fertigungsvorgänge (Liste Fertigungsstellen) für die Produktion "
-#~ "des Fertigprodukts. Die Fertigungsvorgänge werden primär genutzt um die "
-#~ "Kosten und die Auslastung der Fertigungsstellen auf Basis der "
-#~ "Fertigungsplanung zu kalkulieren."
-
-#~ msgid ""
-#~ "Number of operations this workcenter can do in parallel. If this workcenter "
-#~ "represents a team of 5 workers, the capacity per cycle is 5."
-#~ msgstr ""
-#~ "Anzahl Fertigungsvorgänge die bei einer Fertigungsstelle parallel bearbeitet "
-#~ "werden können. Wenn die Fertigungsstelle eine Gruppe von 5 Mitarbeitern "
-#~ "repräsentiert, ist die Kapazität je Zyklus 5."
-
-#~ msgid "Working Period"
-#~ msgstr "Arbeitszeit"
-
 #~ 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) "
@@ -3452,202 +3339,6 @@ msgstr "Jahr"
 #~ "Fertigungsvorgängen aufgelistet und ermöglicht die Bearbeitung von "
 #~ "Arbeitsaufträgen als Teilaufgaben zu einem Fertigungsauftrag."
 
-#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "planning."
-#~ msgstr ""
-#~ "Fertigungsvorgänge (Arbeitsauftragsliste) für die Herstellung des "
-#~ "Endprodukts. Die Arbeitsvorgänge werden primär genutzt, um die Auslastung "
-#~ "und die Kosten der ArFertigungsstellen aktuell und für die Zukunft auf Basis "
-#~ "von Fertigungsplänen der Zukunft zu kalkulieren."
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "Fertigungs- und Beschaffungsplanung"
-
-#~ msgid ""
-#~ "Routings allows you to create and manage the manufacturing operations that "
-#~ "should be followed within your work centers in order to produce a product. "
-#~ "They are attached to bills of materials that will define the required raw "
-#~ "materials."
-#~ msgstr ""
-#~ "Fertigungsvorgänge ermöglichen die Verwaltung und das Management von "
-#~ "Arbeitsaufträgen und deren Reihenfolge der Bearbeitung an bestimmten "
-#~ "Fertigungsstellen. Sie werden zugewiesen zu Stücklisten, die wiederum die "
-#~ "erforderlichen Bauteile für einen Fertigungsauftrag definieren."
-
-#~ msgid ""
-#~ "Define specific property groups that can be assigned to the properties of "
-#~ "your bills of materials."
-#~ msgstr ""
-#~ "Definition spezifischer Gruppen für Fertigungsmerkmale, die zu den "
-#~ "Eigenschaften einer Stückliste zuordenbar sind."
-
-#~ msgid ""
-#~ "The Properties in OpenERP are used to select the right bill of material in "
-#~ "order to manufacture a product, when you have different ways of building the "
-#~ "same product. You can assign several properties to each Bill of Materials. "
-#~ "When a sales person creates a sales order, he can relate it to several "
-#~ "properties and OpenERP will select automatically the BoM to use according "
-#~ "the the needs."
-#~ msgstr ""
-#~ "Die Eigenschaften in OpenERP werden genutzt, um die richtige Stückliste für "
-#~ "die Produktherstellung auszuwählen, vor allem wenn es verschiedene Verfahren "
-#~ "für die Fertigung eines Produkts gibt. Sie können durchaus mehrere "
-#~ "Eigenschaften zu einer Stückliste zuordnen. Wenn ein Verkaufsauftrag "
-#~ "erstellt wird, kann durch den Vertrieb Bezug auf die definierten "
-#~ "Eigenschaften genommen werden, damit OpenERP dann automatisch die richtige "
-#~ "Stückliste für die Fertigung vorschlagen kann."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
-#~ "\n"
-#~ "    Features:\n"
-#~ "    * Make to Stock / Make to Order (by line)\n"
-#~ "    * Multi-level BoMs, no limit\n"
-#~ "    * Multi-level routing, no limit\n"
-#~ "    * Routing and workcenter integrated with analytic accounting\n"
-#~ "    * Scheduler computation periodically / Just In Time module\n"
-#~ "    * Multi-pos, multi-warehouse\n"
-#~ "    * Different reordering policies\n"
-#~ "    * Cost method by product: standard price, average price\n"
-#~ "    * Easy analysis of troubles or needs\n"
-#~ "    * Very flexible\n"
-#~ "    * Allows to browse Bill of Materials in complete structure\n"
-#~ "        that include child and phantom BoMs\n"
-#~ "    It supports complete integration and planification of stockable goods,\n"
-#~ "    consumable of services. Services are completely integrated with the "
-#~ "rest\n"
-#~ "    of the software. For instance, you can set up a sub-contracting service\n"
-#~ "    in a BoM to automatically purchase on order the assembly of your "
-#~ "production.\n"
-#~ "\n"
-#~ "    Reports provided by this module:\n"
-#~ "    * Bill of Material structure and components\n"
-#~ "    * Load forecast on workcenters\n"
-#~ "    * Print a production order\n"
-#~ "    * Stock forecasts\n"
-#~ "    Dashboard provided by this module::\n"
-#~ "    * List of next production orders\n"
-#~ "    * List of deliveries (out picking)\n"
-#~ "    * Graph of work center load\n"
-#~ "    * List of procurement in exception\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Diese OpenERP Anwendung steuert Fertigungsaufträge.\n"
-#~ "\n"
-#~ "    Folgende Funktionalitäten werden angeboten:\n"
-#~ "    * Disposition vom Lager / Disposition vom Auftrag\n"
-#~ "    * Multidimensionale Stücklisten ohne Begrenzung der Dimensionen\n"
-#~ "    * Multidimensionaler Fertigungsablauf ohne Begrenzung der Dimensionen\n"
-#~ "    * Integration von Fertigungsabläufen und Fertigungsstellen mit "
-#~ "Analytische Konten (Kostenstellen)\n"
-#~ "    * Regelmässige Fertigungsterminplanung / Just In Time Fertigung\n"
-#~ "    * Multiple Point-of-Sales, Multiple Läger\n"
-#~ "    * Verschiedene Dispositionsverfahren für die Materialbeschaffung\n"
-#~ "    * Kostenermittlung durch Durchschnittspreise oder Standardpreise\n"
-#~ "    * Einfache Analyse von Engpassfaktoren bei Kapazität oder "
-#~ "Materialverfügbarkeit\n"
-#~ "    * Sehr flexible Anpassung\n"
-#~ "    * Möglichkeit der multidimensionalen Navigation in mehrstufigen "
-#~ "Stücklisten in einer Ansicht\n"
-#~ "\n"
-#~ "   durch die Anzeige von untergeordneten Bauteile- oder Phantomstücklisten.\n"
-#~ "\n"
-#~ "    Die Anwendung unterstützt eine vollständige Integration und Planung von "
-#~ "Beständen der Lagerprodukte, \n"
-#~ "    Verbrauchsprodukte oder Dienstleistungen. Dienstleistungen sind "
-#~ "vollständig integriert in andere Anwendungen. \n"
-#~ "    So können Sie zum Beispiel Dienstleistungen in Stücklisten der Fertigung "
-#~ "integrieren, wodurch dann durch \n"
-#~ "    einen Fertigungsauftrag entweder bei einem externen Dienstleister eine "
-#~ "Leistung beauftragt wird oder eine Aufgabe \n"
-#~ "    für das eigene Projektauftragsmanagement entsteht.\n"
-#~ "\n"
-#~ "    Folgende Auswertungen werden angeboten:\n"
-#~ "    * Produktstruktur und Produktbestandteile einer Stückliste\n"
-#~ "    * Auslastungsvorschau für Fertigungsstellen\n"
-#~ "    * Ausgabe eines Fertigungsauftrags\n"
-#~ "    * Vorschau von Lagerbeständen\n"
-#~ "\n"
-#~ "    Es existiert auch eine Pinnwand für die Fertigung:\n"
-#~ "    * Arbeitsliste anstehender Fertigungsaufträge\n"
-#~ "    * Arbeitsliste für den Versand / Auslieferung\n"
-#~ "    * Grafische Übersicht der Auslastung\n"
-#~ "    * Fehlerliste der Materialdisposition\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Manufacturing Orders are usually proposed automatically by OpenERP based on "
-#~ "the bill of materials and the procurement rules, but you can also create "
-#~ "manufacturing orders manually. OpenERP will handle the consumation of the "
-#~ "raw materials (stock decrease) and the production of the finished products "
-#~ "(stock increase) when the order is processed."
-#~ msgstr ""
-#~ "Fertigungsaufträge werden in OpenERP normalerweise automatisch auf Basis von "
-#~ "Stücklisten und Beschaffungsregeln vorgeschlagen. OpenERP steuert dabei dann "
-#~ "automatisch den Verbrauch von Lagerprodukten (Bestandsminderung) sowie die "
-#~ "\r\n"
-#~ "Fertigstellung von Endprodukten (Bestandserhöhung) im Rahmen der "
-#~ "Auftragsdurchführung."
-
-#~ msgid ""
-#~ "Bills of materials Components are components and sub-products used to create "
-#~ "master bills of materials. Use this menu to search in which BoM is used a "
-#~ "specific component."
-#~ msgstr ""
-#~ "Bauteilestücklisten repräsentieren die Stücklisten von Baugruppen als "
-#~ "Bestandteile von Endprodukten. Verwenden Sie diese Stücklisten zur Suche "
-#~ "nach spezifischen Baugruppen als Bestandteil in verschiedenen "
-#~ "Produktstücklisten."
-
-#~ msgid ""
-#~ "Manufacturing Orders describe the operations that need to be carried out and "
-#~ "the raw materials usage for each stage of production. You use specifications "
-#~ "(bills of materials or BoM) to work out the raw material requirements and "
-#~ "the manufacturing orders needed for the finished products. Once the bills of "
-#~ "materials have been defined, OpenERP becomes capable of automatically "
-#~ "deciding on the manufacturing route depending on the needs of the company."
-#~ msgstr ""
-#~ "Fertigungsaufträge beschreiben die einzelnen Vorgänge sowie die "
-#~ "erforderlichen Materialien jeder einzelnen Stufe der\r\n"
-#~ "Fertigungsabfolge. Stücklisten werden für die Ermittlung aller "
-#~ "erforderlichen Materialien sowie der erforderlichen Fertigungsvorgänge "
-#~ "eingesetzt. Sobald eine Stückliste definiert wurde, kann OpenERP bereits "
-#~ "automatisch Arbeitsaufträge und damit die Fertigungskapazität sowie den "
-#~ "Materialbedarf der Fertigung errechnen und sämtliche Auftragspositionen bis "
-#~ "hin zur Auslieferung planen."
-
-#~ msgid ""
-#~ "Work Centers allows you to create and manage manufacturing units consisting "
-#~ "of one or several people and/or machines that can be considered as a unit "
-#~ "for capacity and planning forecasting."
-#~ msgstr ""
-#~ "Fertigungsstellen ermöglichen die organisatorische Zusammenfassung von "
-#~ "Mitarbeitern oder Maschinen als zentrale Ressource für die Planung der "
-#~ "Kapazität und zur Überwachung der Auslastung."
-
-#, python-format
-#~ msgid "Component Cost of "
-#~ msgstr "Bauteilekosten von "
-
-#~ msgid ""
-#~ "Master Bill of Materials allows you to create and manage the list of "
-#~ "necessary raw materials used to make a finished product. OpenERP will use "
-#~ "these BoM in order to propose automatically manufacturing orders according "
-#~ "to products' needs. You can either create a bill of materials to define "
-#~ "specific production steps or define a single multi-level bill of materials."
-#~ msgstr ""
-#~ "Produktstücklisten ermöglichen Ihnen die Verwaltung aller erforderlichen "
-#~ "Produktbestandteile und Mengen für die Fertigung eines Endprodukts. OpenERP "
-#~ "benutzt außerdem die Produktstücklisten zur Errechnung automatischer "
-#~ "Beschaffungsvorschläge für den Materialbedarf. Sie können entweder jeweils "
-#~ "eine Stückliste für jeden einzelnen Produktionsschritt oder eine Stückliste "
-#~ "für sämtliche Produktionsschritte eines Produktes erstellen."
-
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Geben Sie die Kosten des Arbeitsplatz pro Zyklus an"
 
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 4cf0abf5f95..8120ac8bb2f 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -724,7 +724,7 @@ msgid "Per month"
 msgstr "Ανά μήνα"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -737,7 +737,7 @@ msgid "Product Name"
 msgstr "Όνομα Προϊόντος"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Άκυρη ενέργεια!"
@@ -1303,7 +1303,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1314,7 +1314,7 @@ msgid "Production Order N° :"
 msgstr "Νο Εντολής Παραγωγής:"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1543,7 +1543,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1633,7 +1633,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2123,7 +2123,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2491,9 +2491,6 @@ msgstr ""
 #~ msgid "Routing Workcenters"
 #~ msgstr "Κέντρα Εργασίας Γραμμής Παραγωγής"
 
-#~ msgid "UoM"
-#~ msgstr "ΜοΜ"
-
 #~ msgid "Not used in computations, for information purpose only."
 #~ msgstr "Μόνο για πληροφόρηση, δε χρησιμοποιείται στον υπολογισμό."
 
@@ -3149,15 +3146,9 @@ msgstr ""
 #~ "Αν ο τύπος του είδους είναι Υπηρεσία και μέθοδος προμήθειας είναι Προς "
 #~ "Παραγγελία"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Αίτηση Προμήθειας"
-
 #~ msgid "In procurement order, if product type is service"
 #~ msgstr "Σε εντολή προμήθειας, αν ο τύπος του είδους είναι υπηρεσία"
 
-#~ msgid "Scheduled End"
-#~ msgstr "Προγραμματισμένη Λήξη"
-
 #~ msgid "if Product type is Stockable in procurement order"
 #~ msgstr "Αν ο τύπος προϊόντος είναι Αποθηκεύσιμο σε εντολή προμήθειας"
 
@@ -3165,18 +3156,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Aν η μέθοδος προμήθειας είναι Προς Παραγγελία και η μέθοδος απόκτησης είναι "
 #~ "Αγορά"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Φόρτος κέντρων εργασίας"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Φόρτος κέντρου εργασίας"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Διαχείρηση παραγωγής - Αναφορές"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Φόρτος κέντρου εργασίας"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP & Προγραμματισμός Προμηθειών"
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index d4f9e709bfe..bb45000dc25 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -760,7 +760,7 @@ msgid "Per month"
 msgstr "Por mes"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -773,7 +773,7 @@ msgid "Product Name"
 msgstr "Nombre producto"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
@@ -1381,7 +1381,7 @@ msgid "Month -1"
 msgstr "Mes -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Órden de producción '%s' planificada para el '%s'"
@@ -1392,7 +1392,7 @@ msgid "Production Order N° :"
 msgstr "Núm. orden producción :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Orden fabricación '%s' está preparada para producir."
@@ -1635,7 +1635,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Órdenes de producción a iniciar"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1729,7 +1729,7 @@ msgid "Production Analysis"
 msgstr "Análisis de producción"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Copiar"
@@ -2258,7 +2258,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Tipo de producto es almacenable o consumible."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -3324,312 +3324,9 @@ msgstr "Año"
 #~ "futuras cargas de los centros de producción a partir de la planificación de "
 #~ "la producción."
 
-#~ msgid "Procurement Request"
-#~ msgstr "Fecha de entrega"
-
-#~ msgid "Scheduled End"
-#~ msgstr "Fin programado"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Carga centros de producción"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Catge centro de producción"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Informes - Gestión MRP"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Cargas centro de producción"
-
-#~ msgid "Work Centers load"
-#~ msgstr "Carga del centro de producción"
-
-#~ msgid "Number of operations this workcenter can do."
-#~ msgstr "Número de operaciones que este centro de producción puede realizar."
-
-#, python-format
-#~ msgid "of "
-#~ msgstr "de "
-
-#, python-format
-#~ msgid "Component"
-#~ msgstr "Componente"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#, python-format
-#~ msgid "Cost "
-#~ msgstr "Coste "
-
-#, python-format
-#~ msgid "Work Cost "
-#~ msgstr "Coste del trabajo "
-
-#, python-format
-#~ msgid "Total Cost "
-#~ msgstr "Coste total "
-
-#~ msgid "Working Period"
-#~ msgstr "Horario de trabajo"
-
-#~ msgid ""
-#~ "Number of operations this workcenter can do in parallel. If this workcenter "
-#~ "represents a team of 5 workers, the capacity per cycle is 5."
-#~ msgstr ""
-#~ "Número de operaciones que este centro de producción puede realizar en "
-#~ "paralelo. Si este centro de producción representa un equipo de 5 "
-#~ "trabajadores, la capacidad por ciclo es de 5."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the bills of "
-#~ "material without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar las listas de materiales sin "
-#~ "eliminarlas."
-
-#~ msgid ""
-#~ "Specify quantity of products to produce or buy. Report of Cost structure "
-#~ "will be displayed base on this qunatity."
-#~ msgstr ""
-#~ "Indica la cantidad de productos para producir o comprar. El informe de la "
-#~ "jerarquía de costes se muestra en esta base a esta cantidad."
-
-#, python-format
-#~ msgid "Component suppliers"
-#~ msgstr "Proveedores componentes"
-
-#~ msgid "Work Center Future load"
-#~ msgstr "Carga futura centro de trabajo"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the routing "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid ""
-#~ "Bills of materials Components are components and sub-products used to create "
-#~ "master bills of materials. Use this menu to search in which BoM is used a "
-#~ "specific component."
-#~ msgstr ""
-#~ "Los componentes de listas de materiales son componentes y sub-productos "
-#~ "utilizados para crear listas de materiales maestras. Utilice este menú para "
-#~ "buscar en qué LdM se utiliza un componente específico"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Routings allows you to create and manage the manufacturing operations that "
-#~ "should be followed within your work centers in order to produce a product. "
-#~ "They are attached to bills of materials that will define the required raw "
-#~ "materials."
-#~ msgstr ""
-#~ "Las rutas de producción le permiten crear y gestionar las operaciones de "
-#~ "fabricación que deben realizarse en los centros de producción para fabricar "
-#~ "un producto. Están relacionadas con las listas de materiales que definen las "
-#~ "materias primas necesarias."
-
-#, python-format
-#~ msgid "Component Cost of "
-#~ msgstr "Coste componente de "
-
-#~ msgid ""
-#~ "Define specific property groups that can be assigned to the properties of "
-#~ "your bills of materials."
-#~ msgstr ""
-#~ "Define los grupos específicos de propiedad que se pueden asignar a las "
-#~ "propiedades de sus listas de materiales."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "Planificador MRP & Logística"
-
-#~ msgid ""
-#~ "The Properties in OpenERP are used to select the right bill of material in "
-#~ "order to manufacture a product, when you have different ways of building the "
-#~ "same product. You can assign several properties to each Bill of Materials. "
-#~ "When a sales person creates a sales order, he can relate it to several "
-#~ "properties and OpenERP will select automatically the BoM to use according "
-#~ "the the needs."
-#~ msgstr ""
-#~ "En OpenERP, se utilizan las propiedades para seleccionar la Lista de "
-#~ "Materiales correcta con el fin de fabricar un producto cuando para ese "
-#~ "mismos producto existen diferentes maneras de hacerlo. Se pueden asignar "
-#~ "diferentes propiedades a cada Lista de Materiales. Cuando un "
-#~ "comercial/vendedor crea una orden de venta, el mismo puede relacionarla a "
-#~ "diferentes propiedades y OpenERP seleccionará automaticamente la Lista de "
-#~ "Materiales a utilizar acorde a sus necesidades."
-
-#~ msgid ""
-#~ "Manufacturing Orders describe the operations that need to be carried out and "
-#~ "the raw materials usage for each stage of production. You use specifications "
-#~ "(bills of materials or BoM) to work out the raw material requirements and "
-#~ "the manufacturing orders needed for the finished products. Once the bills of "
-#~ "materials have been defined, OpenERP becomes capable of automatically "
-#~ "deciding on the manufacturing route depending on the needs of the company."
-#~ msgstr ""
-#~ "Las Ordenes de Fabricación describen las operaciones que necesitan ser "
-#~ "realizadas y las materias primas consumidas para cada etapa de la "
-#~ "producción. Utiliza especificaciones (Lista de Materiales o LdM) para "
-#~ "calcular las necesidades de materias primas y las ordenes de fabricación "
-#~ "necesarias para los productos elaborados. Una vez la LdM ha sido definida, "
-#~ "OpenERP automaticamente puede decidir la ruta de fabricación dependiendo de "
-#~ "las necesidades de la empresa."
-
-#~ msgid ""
-#~ "Manufacturing Orders are usually proposed automatically by OpenERP based on "
-#~ "the bill of materials and the procurement rules, but you can also create "
-#~ "manufacturing orders manually. OpenERP will handle the consumation of the "
-#~ "raw materials (stock decrease) and the production of the finished products "
-#~ "(stock increase) when the order is processed."
-#~ msgstr ""
-#~ "Las ordenes de fabricación normalmente son propuestas automaticamente por "
-#~ "OpenERP basadas en la Lista de Materiales y las ordenes de abastecimiento, "
-#~ "pero se pueden crear tambien de manera manual. OpenERP manejara el consumo "
-#~ "the materias primas (su stock disminuirá) y la producción de los productos "
-#~ "elaborados (el stock aumentará) cuando la orden es procesada."
-
-#~ msgid ""
-#~ "Master Bill of Materials allows you to create and manage the list of "
-#~ "necessary raw materials used to make a finished product. OpenERP will use "
-#~ "these BoM in order to propose automatically manufacturing orders according "
-#~ "to products' needs. You can either create a bill of materials to define "
-#~ "specific production steps or define a single multi-level bill of materials."
-#~ msgstr ""
-#~ "La LdM maestra permite crear y gestionar la lista de materias primas "
-#~ "necesarias para fabricar un producto elaborado. OpenERP usará estas LdM para "
-#~ "proponer automáticamente ordenes de fabricación acordes a las necesidades de "
-#~ "los productos. Se puede bien crear una lista de materiales para definir los "
-#~ "pasos especificos de fabricacion o bien definir una única LdM multi-nivel."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
-#~ "\n"
-#~ "    Features:\n"
-#~ "    * Make to Stock / Make to Order (by line)\n"
-#~ "    * Multi-level BoMs, no limit\n"
-#~ "    * Multi-level routing, no limit\n"
-#~ "    * Routing and workcenter integrated with analytic accounting\n"
-#~ "    * Scheduler computation periodically / Just In Time module\n"
-#~ "    * Multi-pos, multi-warehouse\n"
-#~ "    * Different reordering policies\n"
-#~ "    * Cost method by product: standard price, average price\n"
-#~ "    * Easy analysis of troubles or needs\n"
-#~ "    * Very flexible\n"
-#~ "    * Allows to browse Bill of Materials in complete structure\n"
-#~ "        that include child and phantom BoMs\n"
-#~ "    It supports complete integration and planification of stockable goods,\n"
-#~ "    consumable of services. Services are completely integrated with the "
-#~ "rest\n"
-#~ "    of the software. For instance, you can set up a sub-contracting service\n"
-#~ "    in a BoM to automatically purchase on order the assembly of your "
-#~ "production.\n"
-#~ "\n"
-#~ "    Reports provided by this module:\n"
-#~ "    * Bill of Material structure and components\n"
-#~ "    * Load forecast on workcenters\n"
-#~ "    * Print a production order\n"
-#~ "    * Stock forecasts\n"
-#~ "    Dashboard provided by this module::\n"
-#~ "    * List of next production orders\n"
-#~ "    * List of deliveries (out picking)\n"
-#~ "    * Graph of work center load\n"
-#~ "    * List of procurement in exception\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este es el módulo base para gestionar el proceso de fabricación en "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "    Características:\n"
-#~ "    * Obtener para stock / Obtener bajo pedido (por línea)\n"
-#~ "    * Listas de materiales (LdM) multi-nivel, sin límite\n"
-#~ "    * Rutas multi-nivel, sin límite\n"
-#~ "    * Rutas y centro de producción integrado con contabilidad analítica\n"
-#~ "    * Cálculo de la planificación periódica / Módulo Just In Time\n"
-#~ "    * Multi-TPV, multi-almacén\n"
-#~ "    * Distintas políticas de volver a pedir\n"
-#~ "    * Método de coste por producto: precio estándar, precio promedio\n"
-#~ "    * Fácil análisis de problemas o necesidades\n"
-#~ "    * Muy flexible\n"
-#~ "    * Permite mostrar Listas de Materiales en una estructura completa\n"
-#~ "        que incluye LdMs hijas y fantasmas\n"
-#~ "    Soporta la integración y planificación completa de productos "
-#~ "almacenables,\n"
-#~ "    consumibles o servicios. Los servicios están completamente integrados "
-#~ "con el resto\n"
-#~ "    de la aplicación. Por ejemplo, puede configurar un servicio de sub-"
-#~ "contratación\n"
-#~ "    en una LdM para automáticamente comprar bajo pedido el montaje de su "
-#~ "producción.\n"
-#~ "\n"
-#~ "    Informes que proporciona este módulo:\n"
-#~ "    * Estructura y componentes de la Lista de Material\n"
-#~ "    * Previsión de carga en los centros de producción\n"
-#~ "    * Imprimir una orden de producción\n"
-#~ "    * Previsiones de stock\n"
-#~ "    Tableros que proporciona este módulo:\n"
-#~ "    * Lista de las próximas órdenes de producción\n"
-#~ "    * Lista de envíos (albaranes de salida)\n"
-#~ "    * Gráfico de la carga del centro de producción\n"
-#~ "    * Lista de abastecimientos en excepción\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Work Centers allows you to create and manage manufacturing units consisting "
-#~ "of one or several people and/or machines that can be considered as a unit "
-#~ "for capacity and planning forecasting."
-#~ msgstr ""
-#~ "Los centros de producción permiten crear y manejar unidades de fabricación "
-#~ "compuestas por una o varias personas y/o máquinas que pueden ser "
-#~ "consideradas como una unidad a efectos de capacidad y previsión de "
-#~ "planificación."
-
-#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "plannification."
-#~ msgstr ""
-#~ "La lista de las operaciones (lista de los centros de producción) para "
-#~ "producir el producto terminado. La ruta se utiliza principalmente para "
-#~ "calcular los costes del centro de producción durante las operaciones y para "
-#~ "planificar las futuras cargas en centros de producción basado en "
-#~ "planificación de la producción."
-
-#~ msgid ""
-#~ "Gives the sequence order when displaying a list of routing workcenters."
-#~ msgstr ""
-#~ "Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
-#~ "de producción."
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Uso centro de producción"
 
-#~ msgid "Specify Cost of Workcenter per cycle."
-#~ msgstr "Indica el coste del centro de producción por ciclo."
-
-#~ msgid "Specify Cost of Workcenter per hour."
-#~ msgstr "Indica el coste del centro de producción por hora."
-
 #~ 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) "
@@ -3639,18 +3336,6 @@ msgstr "Año"
 #~ "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 ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "planning."
-#~ msgstr ""
-#~ "La lista de las operaciones (lista de los centros de producción) para "
-#~ "producir el producto terminado. La ruta se utiliza principalmente para "
-#~ "calcular los costes del centro de producción durante las operaciones y para "
-#~ "planificar las futuras cargas en los centros de producción basado en la "
-#~ "planificación de la producción."
-
 #~ 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."
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index a37a5e875fa..f3c9ec67c23 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -749,7 +749,7 @@ msgid "Per month"
 msgstr "Por mes"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -762,7 +762,7 @@ msgid "Product Name"
 msgstr "Nombre del Producto"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
@@ -1353,7 +1353,7 @@ msgid "Month -1"
 msgstr "Mes -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1364,7 +1364,7 @@ msgid "Production Order N° :"
 msgstr "Orden de producción Nº :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1601,7 +1601,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1692,7 +1692,7 @@ msgid "Production Analysis"
 msgstr "Análisis de la producción"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Copiar"
@@ -2202,7 +2202,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Tipo de producto es almacenable o consumible."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/es_CL.po b/addons/mrp/i18n/es_CL.po
index 7daa37caf46..5b574d2578d 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -759,7 +759,7 @@ msgid "Per month"
 msgstr "Por mes"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -772,7 +772,7 @@ msgid "Product Name"
 msgstr "Nombre producto"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
@@ -1380,7 +1380,7 @@ msgid "Month -1"
 msgstr "Mes -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Órden de producción '%s' planificada para el '%s'"
@@ -1391,7 +1391,7 @@ msgid "Production Order N° :"
 msgstr "Núm. orden producción :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Orden fabricación '%s' está preparada para producir."
@@ -1628,7 +1628,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Órdenes de producción a iniciar"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1722,7 +1722,7 @@ msgid "Production Analysis"
 msgstr "Análisis de producción"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Copiar"
@@ -2251,7 +2251,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Tipo de producto es almacenable o consumible."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -3346,318 +3346,3 @@ msgstr "Año"
 #~ "costes de los centros de producción durante la fabricación y para prever "
 #~ "futuras cargas de los centros de producción a partir de la planificación de "
 #~ "la producción."
-
-#~ msgid "Procurement Request"
-#~ msgstr "Fecha de entrega"
-
-#~ msgid "Scheduled End"
-#~ msgstr "Fin programado"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Carga centros de producción"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Catge centro de producción"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Informes - Gestión MRP"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Cargas centro de producción"
-
-#~ msgid "Work Centers load"
-#~ msgstr "Carga del centro de producción"
-
-#~ msgid "Number of operations this workcenter can do."
-#~ msgstr "Número de operaciones que este centro de producción puede realizar."
-
-#, python-format
-#~ msgid "of "
-#~ msgstr "de "
-
-#, python-format
-#~ msgid "Component"
-#~ msgstr "Componente"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#, python-format
-#~ msgid "Cost "
-#~ msgstr "Coste "
-
-#, python-format
-#~ msgid "Work Cost "
-#~ msgstr "Coste del trabajo "
-
-#, python-format
-#~ msgid "Total Cost "
-#~ msgstr "Coste total "
-
-#~ msgid "Working Period"
-#~ msgstr "Horario de trabajo"
-
-#~ msgid ""
-#~ "Number of operations this workcenter can do in parallel. If this workcenter "
-#~ "represents a team of 5 workers, the capacity per cycle is 5."
-#~ msgstr ""
-#~ "Número de operaciones que este centro de producción puede realizar en "
-#~ "paralelo. Si este centro de producción representa un equipo de 5 "
-#~ "trabajadores, la capacidad por ciclo es de 5."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the bills of "
-#~ "material without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar las listas de materiales sin "
-#~ "eliminarlas."
-
-#~ msgid ""
-#~ "Specify quantity of products to produce or buy. Report of Cost structure "
-#~ "will be displayed base on this qunatity."
-#~ msgstr ""
-#~ "Indica la cantidad de productos para producir o comprar. El informe de la "
-#~ "jerarquía de costes se muestra en esta base a esta cantidad."
-
-#, python-format
-#~ msgid "Component suppliers"
-#~ msgstr "Proveedores componentes"
-
-#~ msgid "Work Center Future load"
-#~ msgstr "Carga futura centro de trabajo"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the routing "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid ""
-#~ "Bills of materials Components are components and sub-products used to create "
-#~ "master bills of materials. Use this menu to search in which BoM is used a "
-#~ "specific component."
-#~ msgstr ""
-#~ "Los componentes de listas de materiales son componentes y sub-productos "
-#~ "utilizados para crear listas de materiales maestras. Utilice este menú para "
-#~ "buscar en qué LdM se utiliza un componente específico"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Routings allows you to create and manage the manufacturing operations that "
-#~ "should be followed within your work centers in order to produce a product. "
-#~ "They are attached to bills of materials that will define the required raw "
-#~ "materials."
-#~ msgstr ""
-#~ "Las rutas de producción le permiten crear y gestionar las operaciones de "
-#~ "fabricación que deben realizarse en los centros de producción para fabricar "
-#~ "un producto. Están relacionadas con las listas de materiales que definen las "
-#~ "materias primas necesarias."
-
-#, python-format
-#~ msgid "Component Cost of "
-#~ msgstr "Coste componente de "
-
-#~ msgid ""
-#~ "Define specific property groups that can be assigned to the properties of "
-#~ "your bills of materials."
-#~ msgstr ""
-#~ "Define los grupos específicos de propiedad que se pueden asignar a las "
-#~ "propiedades de sus listas de materiales."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "Planificador MRP & Logística"
-
-#~ msgid ""
-#~ "The Properties in OpenERP are used to select the right bill of material in "
-#~ "order to manufacture a product, when you have different ways of building the "
-#~ "same product. You can assign several properties to each Bill of Materials. "
-#~ "When a sales person creates a sales order, he can relate it to several "
-#~ "properties and OpenERP will select automatically the BoM to use according "
-#~ "the the needs."
-#~ msgstr ""
-#~ "En OpenERP, se utilizan las propiedades para seleccionar la Lista de "
-#~ "Materiales correcta con el fin de fabricar un producto cuando para ese "
-#~ "mismos producto existen diferentes maneras de hacerlo. Se pueden asignar "
-#~ "diferentes propiedades a cada Lista de Materiales. Cuando un "
-#~ "comercial/vendedor crea una orden de venta, el mismo puede relacionarla a "
-#~ "diferentes propiedades y OpenERP seleccionará automaticamente la Lista de "
-#~ "Materiales a utilizar acorde a sus necesidades."
-
-#~ msgid ""
-#~ "Manufacturing Orders describe the operations that need to be carried out and "
-#~ "the raw materials usage for each stage of production. You use specifications "
-#~ "(bills of materials or BoM) to work out the raw material requirements and "
-#~ "the manufacturing orders needed for the finished products. Once the bills of "
-#~ "materials have been defined, OpenERP becomes capable of automatically "
-#~ "deciding on the manufacturing route depending on the needs of the company."
-#~ msgstr ""
-#~ "Las Ordenes de Fabricación describen las operaciones que necesitan ser "
-#~ "realizadas y las materias primas consumidas para cada etapa de la "
-#~ "producción. Utiliza especificaciones (Lista de Materiales o LdM) para "
-#~ "calcular las necesidades de materias primas y las ordenes de fabricación "
-#~ "necesarias para los productos elaborados. Una vez la LdM ha sido definida, "
-#~ "OpenERP automaticamente puede decidir la ruta de fabricación dependiendo de "
-#~ "las necesidades de la empresa."
-
-#~ msgid ""
-#~ "Manufacturing Orders are usually proposed automatically by OpenERP based on "
-#~ "the bill of materials and the procurement rules, but you can also create "
-#~ "manufacturing orders manually. OpenERP will handle the consumation of the "
-#~ "raw materials (stock decrease) and the production of the finished products "
-#~ "(stock increase) when the order is processed."
-#~ msgstr ""
-#~ "Las ordenes de fabricación normalmente son propuestas automaticamente por "
-#~ "OpenERP basadas en la Lista de Materiales y las ordenes de abastecimiento, "
-#~ "pero se pueden crear tambien de manera manual. OpenERP manejara el consumo "
-#~ "the materias primas (su stock disminuirá) y la producción de los productos "
-#~ "elaborados (el stock aumentará) cuando la orden es procesada."
-
-#~ msgid ""
-#~ "Master Bill of Materials allows you to create and manage the list of "
-#~ "necessary raw materials used to make a finished product. OpenERP will use "
-#~ "these BoM in order to propose automatically manufacturing orders according "
-#~ "to products' needs. You can either create a bill of materials to define "
-#~ "specific production steps or define a single multi-level bill of materials."
-#~ msgstr ""
-#~ "La LdM maestra permite crear y gestionar la lista de materias primas "
-#~ "necesarias para fabricar un producto elaborado. OpenERP usará estas LdM para "
-#~ "proponer automáticamente ordenes de fabricación acordes a las necesidades de "
-#~ "los productos. Se puede bien crear una lista de materiales para definir los "
-#~ "pasos especificos de fabricacion o bien definir una única LdM multi-nivel."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
-#~ "\n"
-#~ "    Features:\n"
-#~ "    * Make to Stock / Make to Order (by line)\n"
-#~ "    * Multi-level BoMs, no limit\n"
-#~ "    * Multi-level routing, no limit\n"
-#~ "    * Routing and workcenter integrated with analytic accounting\n"
-#~ "    * Scheduler computation periodically / Just In Time module\n"
-#~ "    * Multi-pos, multi-warehouse\n"
-#~ "    * Different reordering policies\n"
-#~ "    * Cost method by product: standard price, average price\n"
-#~ "    * Easy analysis of troubles or needs\n"
-#~ "    * Very flexible\n"
-#~ "    * Allows to browse Bill of Materials in complete structure\n"
-#~ "        that include child and phantom BoMs\n"
-#~ "    It supports complete integration and planification of stockable goods,\n"
-#~ "    consumable of services. Services are completely integrated with the "
-#~ "rest\n"
-#~ "    of the software. For instance, you can set up a sub-contracting service\n"
-#~ "    in a BoM to automatically purchase on order the assembly of your "
-#~ "production.\n"
-#~ "\n"
-#~ "    Reports provided by this module:\n"
-#~ "    * Bill of Material structure and components\n"
-#~ "    * Load forecast on workcenters\n"
-#~ "    * Print a production order\n"
-#~ "    * Stock forecasts\n"
-#~ "    Dashboard provided by this module::\n"
-#~ "    * List of next production orders\n"
-#~ "    * List of deliveries (out picking)\n"
-#~ "    * Graph of work center load\n"
-#~ "    * List of procurement in exception\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este es el módulo base para gestionar el proceso de fabricación en "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "    Características:\n"
-#~ "    * Obtener para stock / Obtener bajo pedido (por línea)\n"
-#~ "    * Listas de materiales (LdM) multi-nivel, sin límite\n"
-#~ "    * Rutas multi-nivel, sin límite\n"
-#~ "    * Rutas y centro de producción integrado con contabilidad analítica\n"
-#~ "    * Cálculo de la planificación periódica / Módulo Just In Time\n"
-#~ "    * Multi-TPV, multi-almacén\n"
-#~ "    * Distintas políticas de volver a pedir\n"
-#~ "    * Método de coste por producto: precio estándar, precio promedio\n"
-#~ "    * Fácil análisis de problemas o necesidades\n"
-#~ "    * Muy flexible\n"
-#~ "    * Permite mostrar Listas de Materiales en una estructura completa\n"
-#~ "        que incluye LdMs hijas y fantasmas\n"
-#~ "    Soporta la integración y planificación completa de productos "
-#~ "almacenables,\n"
-#~ "    consumibles o servicios. Los servicios están completamente integrados "
-#~ "con el resto\n"
-#~ "    de la aplicación. Por ejemplo, puede configurar un servicio de sub-"
-#~ "contratación\n"
-#~ "    en una LdM para automáticamente comprar bajo pedido el montaje de su "
-#~ "producción.\n"
-#~ "\n"
-#~ "    Informes que proporciona este módulo:\n"
-#~ "    * Estructura y componentes de la Lista de Material\n"
-#~ "    * Previsión de carga en los centros de producción\n"
-#~ "    * Imprimir una orden de producción\n"
-#~ "    * Previsiones de stock\n"
-#~ "    Tableros que proporciona este módulo:\n"
-#~ "    * Lista de las próximas órdenes de producción\n"
-#~ "    * Lista de envíos (albaranes de salida)\n"
-#~ "    * Gráfico de la carga del centro de producción\n"
-#~ "    * Lista de abastecimientos en excepción\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Work Centers allows you to create and manage manufacturing units consisting "
-#~ "of one or several people and/or machines that can be considered as a unit "
-#~ "for capacity and planning forecasting."
-#~ msgstr ""
-#~ "Los centros de producción permiten crear y manejar unidades de fabricación "
-#~ "compuestas por una o varias personas y/o máquinas que pueden ser "
-#~ "consideradas como una unidad a efectos de capacidad y previsión de "
-#~ "planificación."
-
-#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "plannification."
-#~ msgstr ""
-#~ "La lista de las operaciones (lista de los centros de producción) para "
-#~ "producir el producto terminado. La ruta se utiliza principalmente para "
-#~ "calcular los costes del centro de producción durante las operaciones y para "
-#~ "planificar las futuras cargas en centros de producción basado en "
-#~ "planificación de la producción."
-
-#~ msgid ""
-#~ "Gives the sequence order when displaying a list of routing workcenters."
-#~ msgstr ""
-#~ "Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
-#~ "de producción."
-
-#~ msgid "Specify Cost of Workcenter per cycle."
-#~ msgstr "Indica el coste del centro de producción por ciclo."
-
-#~ msgid "Specify Cost of Workcenter per hour."
-#~ msgstr "Indica el coste del centro de producción por hora."
-
-#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "planning."
-#~ msgstr ""
-#~ "La lista de las operaciones (lista de los centros de producción) para "
-#~ "producir el producto terminado. La ruta se utiliza principalmente para "
-#~ "calcular los costes del centro de producción durante las operaciones y para "
-#~ "planificar las futuras cargas en los centros de producción basado en la "
-#~ "planificación de la producción."
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index 084b29fbac5..a11178e0c8e 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -103,7 +103,7 @@ msgstr "Productos Desperdicio/Chatarra"
 #: view:mrp.production.order:0
 #: field:mrp.production.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -114,22 +114,22 @@ msgstr "Procesos productivos"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Producto centro de producción"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr ""
+msgstr "Buscar lista de materiales"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Para productos almacenables y consumibles"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "A producir"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -137,6 +137,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Número de iteraciones que debe realizar este centro de producción en la "
+"operación indicada de la ruta."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -155,12 +157,12 @@ msgstr "Productos finalizados"
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr ""
+msgstr "A comprar"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Raw Material Location"
-msgstr ""
+msgstr "Ubicación de materias primas"
 
 #. module: mrp
 #: help:mrp.installer,mrp_operations:0
@@ -168,16 +170,20 @@ msgid ""
 "Enhances production orders with readiness states as well as the start date "
 "and end date of execution of the order."
 msgstr ""
+"Mejora las órdenes de producción con los estados de preparación, así como la "
+"fecha de inicio y final de la ejecución de la orden."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
+"El sistema crea automáticamente una petición de presupuesto al proveedor "
+"preferido."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Productos a terminar"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -187,7 +193,7 @@ msgstr "Conjunto / Paquete"
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
-msgstr ""
+msgstr "Subproductos MRP"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -195,7 +201,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -208,6 +214,8 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
+"En caso de que el método de suministro del producto es Producir, el sistema "
+"crea una orden de producción."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -230,11 +238,13 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Introduzca este producto para realizar fácilmente un seguimiento de sus "
+"costes de producción en la contabilidad analítica."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr ""
+msgstr "Para material comprado"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -255,17 +265,17 @@ msgstr "Cuenta ciclo"
 #: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Work Cost"
-msgstr ""
+msgstr "Coste del trabajo"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr ""
+msgstr "Abastecimiento de servicios"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -280,12 +290,12 @@ msgstr "Ubicación destino"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr ""
+msgstr "Datos principales"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -293,6 +303,9 @@ 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 ""
+"El sistema espera a que los productos estén disponibles en el stock. Estos "
+"productos suelen ser adquiridos de forma manual o a través de una regla de "
+"stock mínimo."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -322,48 +335,48 @@ msgstr "Referencia a una ubicación en una plan. externa"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
-msgstr ""
+msgstr "Informe de órden de producción"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Producir producto"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:177
 #, python-format
 msgid "Components Cost of "
-msgstr ""
+msgstr "Coste de los componentes de "
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "Abastecimiento de producto almacenable"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr ""
+msgstr "UdM por defecto"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -377,7 +390,7 @@ msgstr "Cantidad"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr ""
+msgstr "Nº de horas"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -390,6 +403,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"El sistema crea una orden (de producción o de compra) en función de la "
+"cantidad vendida y los parámetros de los productos."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -397,16 +412,18 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"Esto se utiliza en caso de un servicio sin ningún tipo de impacto en el "
+"sistema, una sesión de formación, por ejemplo."
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
 msgid "Repairs"
-msgstr ""
+msgstr "Reparaciones"
 
 #. module: mrp
 #: field:mrp.installer,stock_location:0
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Rutas avanzadas"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -424,6 +441,8 @@ msgid ""
 "Enables warranty and repair management (and their impact on stocks and "
 "invoicing)."
 msgstr ""
+"Activa la garantía y la gestión de reparaciones (y su impacto sobre stocks y "
+"facturación)"
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -452,7 +471,7 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Variación del valor de stock"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -462,7 +481,7 @@ msgstr "Estructura lista de materiales"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
+msgstr "Producto de tipo servicio"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -470,16 +489,18 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bill of materials."
 msgstr ""
+"Definir grupos específicos de propiedad que se pueden asignar a las "
+"propiedades de su lista de materiales."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Descomposición fabricación"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
+msgstr "Para servicios"
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -499,13 +520,13 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr ""
+msgstr "Nº de ciclos"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr ""
+msgstr "Solicitud de presupuesto."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -513,11 +534,13 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"La lista de materiales está vinculada a una ruta, es decir, la sucesión de "
+"centros de producción."
 
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Código EAN erróneo"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -553,30 +576,30 @@ msgstr "Estructura LdM del producto"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr ""
+msgstr "Buscar producción"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Supplier Price per Uom"
-msgstr ""
+msgstr "Precio proveedor por UdM"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "Estructura LdM"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr ""
+msgstr "Producir"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
@@ -588,7 +611,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Excepción de Inventario"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -606,11 +629,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Ruta del material"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -630,29 +654,29 @@ msgstr "¡Error! No puede crear Listas de Material recursivas"
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr ""
+msgstr "Carga centro de producción"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr ""
+msgstr "¡No se ha definido LdM para este producto!"
 
 #. 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 "Componentes de lista de materiales"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Nº de líneas"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr ""
+msgstr "Planificación"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -667,6 +691,11 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
+"Lista de las operaciones (lista de los centros de trabajo) para producir los "
+"productos acabados. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones y planificar la carga "
+"en el futuro en los centros de trabajo basada en la planificación de "
+"producción."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
@@ -676,7 +705,7 @@ msgstr "Tiempo en horas para realizar un ciclo."
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "Ref LdM"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -689,7 +718,7 @@ msgstr "En producción"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "Lista de materiales maestra"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -697,6 +726,8 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"UdV del producto (Unidad de Venta) es la unidad de medida para la "
+"facturación y la promoción de existencias."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -715,12 +746,12 @@ msgstr "Tipo"
 #: code:addons/mrp/report/price.py:201
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "Coste total de "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Vinculado al método de abastecimiento 'Regla de stock mínimo'."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -728,12 +759,12 @@ msgid "Per month"
 msgstr "Por mes"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
 msgid "Couldn't find bill of material for product"
-msgstr ""
+msgstr "No se puede encontrar la lista de material para el producto"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -741,15 +772,16 @@ msgid "Product Name"
 msgstr "Nombre producto"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "¡Acción inválida!"
 
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
+"Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -757,6 +789,8 @@ msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
 msgstr ""
+"Añada más funcionalidades en el núcleo de la aplicación de fabricación con "
+"los siguientes módulos."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -772,22 +806,22 @@ msgstr "Petición presupuesto"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Regla de abastecimiento"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work center per hour."
-msgstr ""
+msgstr "Especificar costes del centro de trabajo por hora."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Partial"
-msgstr ""
+msgstr "Parcial"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -801,6 +835,10 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
+"Dependiendo del método elegido para \"suministrar\" del servicio, la orden "
+"de abastecimiento crea una solicitud de presupuesto para un pedido de compra "
+"(subcontratación) o espera hasta que el servicio se realice (= la entrega de "
+"los productos)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -816,12 +854,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Órden de producción"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
-msgstr ""
+msgstr "Abastecimiento de materias primas"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,hour_nbr:0
@@ -829,6 +867,8 @@ msgid ""
 "Time in hours for this work center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Tiempo en horas para este centro de producción para realizar la operación de "
+"la ruta indicada."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -853,7 +893,7 @@ msgstr "Nombre de modificación"
 #: view:mrp.production:0
 #: field:mrp.production.order,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: mrp
 #: field:mrp.bom,type:0
@@ -863,7 +903,7 @@ msgstr "Tipo de lista de materiales"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:47
@@ -871,12 +911,13 @@ msgstr ""
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
+"Abastecimiento '%s' tiene una excepción: 'El producto no tiene LdM definida!'"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: view:mrp.property:0
 msgid "Search"
-msgstr ""
+msgstr "Buscar"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -886,23 +927,23 @@ msgstr "Núm. de ciclo"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Stock mínimo"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
 msgid "Dashboard"
-msgstr ""
+msgstr "Panel de Control"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr ""
+msgstr "Carga futura del centro de producción"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -915,7 +956,7 @@ msgstr "Producto almacenable"
 #: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Work Center name"
-msgstr ""
+msgstr "Nombre del centro de producción"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -930,7 +971,7 @@ msgstr "Núm. de horas"
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "Planificación 'Just in Time'"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -941,18 +982,18 @@ msgstr "Grupo de propiedad"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Qty"
-msgstr ""
+msgstr "Cant."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr ""
+msgstr "Plan de producción"
 
 #. module: mrp
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Inactive"
-msgstr ""
+msgstr "Inactivo"
 
 #. module: mrp
 #: help:mrp.installer,mrp_subproduct:0
@@ -960,6 +1001,8 @@ msgid ""
 "Enables multiple product output from a single production order: without "
 "this, a production order can have only one output product."
 msgstr ""
+"Habilita la salida de múltiples productos de una sola orden de producción: "
+"sin ello, una orden de producción sólo puede tener un producto de salida."
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -973,7 +1016,7 @@ msgstr "Cancelar"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "Dividir en lotes de producción"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -988,6 +1031,8 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Si el servicio tiene un método de suministro 'Comprar', se crea una "
+"solicitud de presupuesto, por ejemplo, una petición de subcontratación."
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -997,7 +1042,7 @@ msgstr "Movimiento producto"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr ""
+msgstr "Retrasada"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -1009,11 +1054,13 @@ msgstr "Obtener para stock"
 msgid ""
 "Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
+"Proporciona el orden de secuencias cuando se muestra una lista de "
+"enrutamiento de los centros de trabajo."
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr ""
+msgstr "Nombre LdM"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1024,17 +1071,17 @@ msgstr "Empezar producción"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr ""
+msgstr "Tablero de producción"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Ubic. orígen"
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Referencia Interna"
 
 #. module: mrp
 #: help:mrp.installer,stock_location:0
@@ -1042,11 +1089,13 @@ msgid ""
 "Manages product routes and paths within and between locations (e.g. "
 "warehouses)."
 msgstr ""
+"Gestiona las rutas y caminos de los productos dentro y entre las ubicaciones "
+"(por ejemplo, almacenes)."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr ""
+msgstr "Estructura de producto"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1060,7 +1109,7 @@ msgstr "Nombre"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "Configuración aplicación MRP"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1071,16 +1120,23 @@ msgid ""
 "avoids having to wait for the procurement scheduler to run or having to run "
 "the procurement scheduler manually."
 msgstr ""
+"Permite el cálculo de las órdenes de abastecimiento justo a tiempo (Just In "
+"Time).\n"
+"\n"
+"Si bien consume más recursos que la configuración predeterminada, el cálculo "
+"JIT evita tener que esperar a que se ejecute el planificador de "
+"abastecimientos o tener que ejecutar el planificador de abastecimientos de "
+"forma manual."
 
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Modo"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
@@ -1097,16 +1153,23 @@ msgid ""
 "materials have been defined, OpenERP is capable of automatically deciding on "
 "the manufacturing route depending on the needs of the company."
 msgstr ""
+"Las órdenes de fabricación describen las operaciones que deben ser "
+"realizadas y las materias primas necesarias para cada etapa de fabricación. "
+"Utilice las especificaciones (listas de materiales o LdM) para obtener las "
+"necesidades de materias primas y las órdenes de fabricación necesarias para "
+"los productos finales. Una vez las listas de materiales hayan sido "
+"definidas, OpenERP es capz de decidir automáticamente al ruta de fabricación "
+"en función de las necesidades de la compañía."
 
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "¡Cantidad ordenada no puede ser negativa o cero!"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr ""
+msgstr "Órdenes de producción en progreso"
 
 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
@@ -1150,7 +1213,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr ""
+msgstr "Órdenes de producción en espera de productos"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1160,13 +1223,13 @@ msgstr ""
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupado por..."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Cycles Cost"
-msgstr ""
+msgstr "Coste ciclos"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
@@ -1183,7 +1246,7 @@ msgstr "Ubicación productos finalizados"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr ""
+msgstr "Recursos"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1195,7 +1258,7 @@ msgstr "Diario analítico"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr ""
+msgstr "Centros de producción"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1210,6 +1273,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Las rutas le permiten crear y gestionar las operaciones de fabricación a "
+"realizar en sus centros de producción para fabricar un producto. Están "
+"relacionadas con las listas de materiales que definirán las materias primas "
+"necesarias."
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1219,7 +1286,7 @@ msgstr "Núm. de hora"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr ""
+msgstr "Operaciones del centro de producción"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1243,7 +1310,7 @@ msgstr "Seleccionar unidad de tiempo"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "Carga centro de producción"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1256,16 +1323,18 @@ msgid ""
 "This is the internal picking list that brings the finished product to the "
 "production plan"
 msgstr ""
+"Este es el albarán interno que trae el producto terminado hacia el plan de "
+"producción."
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
 msgid "Change Parent Price"
-msgstr ""
+msgstr "Cambiar precio padre"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movimiento de stock"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1274,6 +1343,9 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
+"La regla de stock mínimo es una regla de abastecimiento automático basado en "
+"una cantidad mínima y máxima. Está disponible en el menú de gestión de "
+"inventario y configurable por producto."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1289,6 +1361,7 @@ msgstr "Revisiones"
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
 msgstr ""
+"Configure su aplicación de planificación de recursos de fabricación (MRP)"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1299,18 +1372,18 @@ msgstr "Prioridad"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Lista Movimientos"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
-msgstr ""
+msgstr "Órden de producción '%s' planificada para el '%s'"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1318,15 +1391,15 @@ msgid "Production Order N° :"
 msgstr "Núm. orden producción :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
-msgstr ""
+msgstr "Orden fabricación '%s' está preparada para producir."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Fabricación planificada producto"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1343,7 +1416,7 @@ msgstr "Obtener para stock"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -1354,6 +1427,12 @@ msgid ""
 "product needs. You can either create a bill of materials to define specific "
 "production steps or define a single multi-level bill of materials."
 msgstr ""
+"Las listas de materiales maestras le permiten crear y gestionar la lista de "
+"las materias primas necesarias utilizadas para fabricar un producto acabado. "
+"OpenERP utilizará estas LdMs para proponer automáticamente órdenes de "
+"fabricación en función de las necesidades de producto. Puede crear una lista "
+"de materiales para definir los pasos de producción o definir una única lista "
+"de materiales multi-nivel."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
@@ -1361,6 +1440,8 @@ msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
 msgstr ""
+"En caso de que el método de suministro del producto se Compra, el sistema "
+"crea un pedido de compra."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1377,34 +1458,34 @@ msgstr "Estructura de los costes del producto"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Components suppliers"
-msgstr ""
+msgstr "Proveedores de componentes"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
-msgstr ""
+msgstr "Instalador MRP"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Centros de trabajo de producción"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:62
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "ID activo no se encuentra"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Buscar por centro de producción mrp"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1425,17 +1506,17 @@ msgstr "Cuenta horas"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Ubic. destino"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
 msgid "Product Consumed"
-msgstr ""
+msgstr "Producto consumido"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1452,7 +1533,7 @@ msgstr "Abastecer productos"
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Cargas centro de producción"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1470,6 +1551,7 @@ msgstr "Propiedades"
 msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
+"Referencia al documento que generó esta solicitud de orden de producción."
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1478,6 +1560,9 @@ msgid ""
 "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
 #: view:mrp.production:0
@@ -1487,17 +1572,17 @@ msgstr "Información extra"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Cambiar cantidad de productos"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Guía las órdenes de abastecimiento para materias primas."
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1519,14 +1604,14 @@ msgstr "Realizado"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Cambiar precio estandar"
 
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Doc. Fuente"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1540,17 +1625,20 @@ msgid ""
 "This will change the price of parent products also according to the BoM "
 "structure specified for the product."
 msgstr ""
+"Esto cambiará el precio de los productos padre de acuerdo a la estructura de "
+"la lista de materiales del producto."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr ""
+msgstr "Órdenes de producción a iniciar"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
+"¡No se puede eliminar orden(es) de producción que están en estado %s!"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1559,7 +1647,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Centro de producción"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1594,7 +1682,7 @@ msgstr "Ubicación materias primas"
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Imprimir la estructura de costes del producto"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -1609,11 +1697,14 @@ msgid ""
 "of one or more persons and/or machines that can be considered as a unit for "
 "capacity and planning forecasting."
 msgstr ""
+"Los centros de trabajo le permiten crear y administrar unidades de "
+"producción que consisten en una o más personas y / o máquinas que se pueden "
+"considerar como una unidad para la capacidad de planificación y previsión."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Consumir productos"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1628,19 +1719,19 @@ msgstr "UdM del producto"
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Obtener bajo pedido"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr ""
+msgstr "Análisis de producción"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Copiar"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1656,7 +1747,7 @@ msgstr "Fecha final"
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurso"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1673,7 +1764,7 @@ msgstr "UdV del producto"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Nº línea órdenes"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1689,11 +1780,16 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
+"La lista de operaciones (lista de los centros de trabajo) para producir los "
+"productos terminados. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones de carga y planificar "
+"el futuro en los centros de trabajo basado en la planificación de la "
+"producción."
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1704,6 +1800,8 @@ msgstr "Categorías de propiedades"
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de órdenes de "
+"trabajo."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1728,7 +1826,7 @@ msgstr "Consumición de productos producidos"
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr ""
+msgstr "Órdenes de producción"
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1739,6 +1837,11 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"El modo 'Sólo consumir' sólo se consumen los productos con la cantidad "
+"seleccionada.\n"
+"El modo 'Consumo y Producción' se consumen y también se producen los "
+"productos con la cantidad seleccionada y finalizará la orden de producción "
+"cuando el total de las cantidades solicitadas se han producido."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1755,13 +1858,13 @@ msgstr "Coste por ciclo"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Servicio"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1773,6 +1876,7 @@ msgstr "LdM"
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
 msgstr ""
+"UdM(Unidad de medida) es la unidad de medida para el control de inventario"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1781,6 +1885,9 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"La lista de materiales es la composición del producto. Los componentes (que "
+"son también productos) pueden tener sus propias listas de materiales (multi-"
+"nivel)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1791,7 +1898,7 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1810,7 +1917,7 @@ msgstr "Orden de producción"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "Regla de abastecimiento automática"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1827,7 +1934,7 @@ msgstr "Cant. UdV del producto"
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "Componentes"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1853,7 +1960,7 @@ msgstr "LdM normal"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Plazo de entrega de fabricación"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1868,6 +1975,9 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"La variación semanal del valor del stock permite realizar un seguimiento de "
+"la evolución del valor del stock relativo a las actividades de fabricacion, "
+"recepciónd de productos y ordenes de entrega."
 
 #. module: mrp
 #: view:mrp.product.produce:0
@@ -1877,12 +1987,12 @@ msgstr "Confirmar"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "Eficiencia de la producción"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1890,6 +2000,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar las listas de material sin "
+"eliminarlas."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1908,11 +2020,13 @@ msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
 msgstr ""
+"Estos informes le permiten analizar sus actividad productiva y su "
+"rendimiento."
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Consumir únicamente"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1928,6 +2042,11 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"Si un sub-producto se utiliza en varios productos, puede ser útil crear su "
+"propia lista de materiales. Aunque si no quiere órdenes de producción "
+"separadas para este sub-producto, seleccione Conjunto/Fantasma como tipo de "
+"LdM. Si una LdM fantasma se utiliza para un producto raíz, será vendida y "
+"enviada como un conjunto de componentes, en vez de ser producida."
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1945,6 +2064,14 @@ msgid ""
 " 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'."
 msgstr ""
+"Cuando se crea la orden de fabricación su estado es fijado a \"Borrador\"\n"
+" Si la orden está confirmdada, el estado es fijado a \"Esperando "
+"mercancía\"\n"
+" Si existe alguna excepción, el estado es fijado a \"Excepcion de "
+"abastecimiento\"\n"
+"Si el stock está disponible, el estado es fijado a \"Listo para producir\"\n"
+" Cuando la fabricación comienza, el estado es fijado a \"En producción\"\n"
+" Cuando la fabricación finaliza, el estado es fijado a \"Realizado\""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1980,7 +2107,7 @@ msgstr "Número de horas"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Información de costes"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
@@ -1990,12 +2117,12 @@ msgstr "Órdenes de abastecimiento"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Redondeo aplicado sobre la cantidad de producto"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Asignación desde producción o pedido de compra."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2005,7 +2132,7 @@ msgstr "Proceso productivo padre"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2015,12 +2142,12 @@ msgstr "Tiempo en horas para la configuración."
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imágen"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2038,7 +2165,7 @@ msgstr "Variación del valor del stock"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Asignación desde stock."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2073,7 +2200,7 @@ msgstr "Semana"
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso de configuración"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -2084,24 +2211,24 @@ msgstr "Normal"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Etapas de producción."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Estructura de costes"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Consumir y Producir"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
@@ -2115,29 +2242,32 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
+"Los componente de listas de materiales son componentes y sub-productos "
+"utilizados para crear listas de materiales maestras. Utilice este menú para "
+"buscar en qué LdM es utilizado un componente específico."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Tipo de producto es almacenable o consumible."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Seleccionar cantidad"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2158,7 +2288,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Revisión de lista de materiales"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -2175,7 +2305,7 @@ msgstr "Producciones"
 #: code:addons/mrp/report/price.py:194
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Coste trabajo de "
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -2199,7 +2329,7 @@ msgstr "Proceso productivo"
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Operaciones de producción"
 
 #. module: mrp
 #: field:mrp.production,date_planned:0
@@ -2209,7 +2339,7 @@ msgstr "Fecha planificada"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Debe asignar un lote de producción para este producto"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -2220,6 +2350,13 @@ 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 the needs."
 msgstr ""
+"Las propiedades en OpenERP se utilizan para seleccionar la correcta lista de "
+"materiales para la fabricación de uno de los productos cuando se tienen "
+"diferentes formas de fabricar el mismo producto. Puede asignar varias "
+"propiedades para cada lista de materiales. Cuando un vendedor crea un pedido "
+"de cliente, él puede relacionarlo con varias propiedades y OpenERP "
+"seleccionará automáticamente la lista de materiales para utilizar según las "
+"necesidades."
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -2230,32 +2367,32 @@ msgstr "Producción"
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Abastecimientos en excepción"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "material 'regla stock mínimo'"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Precio del producto"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
 msgid "MRP Applications Configuration"
-msgstr ""
+msgstr "Configuración de las aplicaciónes MRP"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Dividir en lotes de producción"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Cambiar cantidad"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2279,17 +2416,17 @@ msgstr "Descripción"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Tablero fabricación"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Fecha de fin planificada"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2298,11 +2435,14 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Las cargas de los centros de producción muestran un pronóstico de la carga "
+"de los centros de producción respecto a un periodo determinado. Está "
+"expresado en número de horas y ciclos de máquina relacionados."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "La forma de abastecer depende del tipo de producto."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2312,23 +2452,23 @@ msgstr "Fabricación"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Próximas órdenes de producción"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Grupos de propiedades"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2336,6 +2476,9 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
+"Dependiendo del método elegido para suministrar los productos almacenables, "
+"la orden de abastecimiento crea una petición de presupuesto, una orden de "
+"producción, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2345,7 +2488,7 @@ msgstr "Tiempo en horas para la limpieza."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Petición de presupuesto automática"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2353,6 +2496,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Si el servicio tiene un método de suministro 'Producir', se crea una tarea "
+"en el módulo de gestión de proyectos de OpenERP."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2361,6 +2506,10 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
+"Para poder suministrar materias primas (que deben ser compradas o "
+"producidas), la orden de producción genera tantas órdenes de abastecimiento "
+"como componentes figuren en la lista de materiales, a través de una "
+"ejecución de las planificaciones (MRP)."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2368,6 +2517,8 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Indique la cantidad de productos a producir o comprar. El informe de la "
+"estructura de costes se muestra basándose en esta cantidad."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -2385,12 +2536,14 @@ msgstr "Secuencia"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Ausencias de recursos"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de listas de "
+"materiales."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2398,13 +2551,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Productos a consumir"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #~ msgid ""
 #~ "Triggers an automatic procurement for all products that have a virtual stock "
@@ -2813,9 +2966,6 @@ msgstr ""
 #~ msgid "Max Quantity"
 #~ msgstr "Cantidad máx"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Fecha de entrega"
-
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "Abastecer stock mínimo"
 
@@ -3088,20 +3238,108 @@ msgstr ""
 #~ msgstr ""
 #~ "Puede ver su lista de material que se utiliza para fabricar el producto"
 
-#~ msgid "Scheduled End"
-#~ msgstr "Fin programado"
-
 #~ msgid "Bill of Materials Components"
 #~ msgstr "Componentes de la lista de materiales"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Carga centros de producción"
+#~ msgid "Specify Cost of Work center per cycle."
+#~ msgstr "Especificar costes del centro de trabajo por ciclo."
 
-#~ msgid "Workcenter Load"
-#~ msgstr "Catge centro de producción"
+#~ msgid "Workcenter Usage"
+#~ msgstr "Uso centro de producción"
 
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Informes - Gestión MRP"
+#~ 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 ""
+#~ "El número de operaciones de este centro de trabajo se puede hacer en "
+#~ "paralelo. Si este centro de trabajo representa un equipo del 5 trabajadores, "
+#~ "la capacidad por ciclo es de 5."
 
-#~ msgid "Workcenter Loads"
-#~ msgstr "Cargas centro de producción"
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and work center integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    Dashboard provided by this module::\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out picking)\n"
+#~ "    * Graph of work center load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Este es el módulo base para gestionar los procesos de fabricación en "
+#~ "OpenERP.\n"
+#~ "\n"
+#~ "    Características:\n"
+#~ "    *Obtener para stock / Obtener bajo pedido (por línea)\n"
+#~ "    *BoMs multi-niveles, sin límite\n"
+#~ "    *Ubicaciones multi-nivel, sin límite\n"
+#~ "    *Ubicaciones y centros de trabajo integrados con la contabilidad "
+#~ "analítica\n"
+#~ "    *Ejecución periódica del cálculo de la planificación / Módulo 'Just In "
+#~ "Time'\n"
+#~ "    *Multi-pv, multi-almacén\n"
+#~ "    *Diferentes políticas de pedido\n"
+#~ "    *Método de coste por producto: precio estándar, precio medio\n"
+#~ "    *Fácil análisis de problemas o necesidades\n"
+#~ "    *Muy flexible\n"
+#~ "    *Permite inspeccionar la estructura completa de Facturas de Materiales\n"
+#~ "        que incluyen BoMs hijas y fantasmas\n"
+#~ "    Soporta integración y planificación de mercancías almacenables,\n"
+#~ "    y consumo de servicios. Los servicios se integran completamente con el "
+#~ "resto\n"
+#~ "    de la aplicación. Por ejemplo, se puede establecer una servicio de "
+#~ "subcontratación\n"
+#~ "    en una BoM para encargar automáticamente el montaje de su producción.\n"
+#~ "\n"
+#~ "    Los informes que facilita este módulo:\n"
+#~ "    *Componentes y estructura de la BoMs\n"
+#~ "    *Previsión de carga de los centros de trabajo\n"
+#~ "    *Previsión de almacén\n"
+#~ "    Tableros proporcionados en este módulo:\n"
+#~ "    *Lista de órdenes de producción próximas\n"
+#~ "    *Lista de entregas\n"
+#~ "    *Gráfico de carga del centro de trabajo\n"
+#~ "    *Lista de órdenes de fabricación con excepciones\n"
+#~ "    "
+
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr ""
+#~ "La ruta indica todos los centros de producción utilizados, por cuánto tiempo "
+#~ "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 ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr ""
+#~ "Descripción del centro de trabajo. Explique aquí lo que es un ciclo de "
+#~ "acuerdo con este centro de trabajo."
diff --git a/addons/mrp/i18n/es_MX.po b/addons/mrp/i18n/es_MX.po
new file mode 100644
index 00000000000..4504a8e2f95
--- /dev/null
+++ b/addons/mrp/i18n/es_MX.po
@@ -0,0 +1,3428 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* mrp
+#
+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-03-12 16:35+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 04:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Movimientos creados"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+"Las órdenes de fabricación suelen ser propuestas automáticamente por OpenERP "
+"en base a la lista de materiales y las reglas de abastecimiento, pero "
+"también puede crear órdenes de fabricación manualmente. OpenERP controlará "
+"el consumo de las materias primas (disminución de stock) y la producción de "
+"los productos terminados (aumento de stock) cuando se procese la orden."
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr "Ubicación donde el sistema buscará los componentes."
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr "Utilización del centro de producción"
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr "Ruta de centros de producción"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:mrp.module_meta_information
+msgid "Manufacturing Resource Planning"
+msgstr "Planificación de recursos de fabricación (MRP)"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr "Núm. de ciclos"
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr "Número de ciclos"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
+"La 'regla de stock mínimo' permite al sistema de crear órdenes  de "
+"abasteciemiento automáticamente cuando el stock mínimo es alcanzado"
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+#: field:mrp.production.order,picking_id:0
+msgid "Picking list"
+msgstr "Albarán"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Hourly Cost"
+msgstr "Coste horario"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cost Price per Uom"
+msgstr "Precio de coste pour Udm"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr "Productos de desecho"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,day:0
+msgid "Day"
+msgstr "Día"
+
+#. 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 "Procesos productivos"
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr "Producto centro de producción"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr "Buscar lista de materiales"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr "Para productos almacenables y consumibles"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr "A producir"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr ""
+"Número de iteraciones que debe realizar este centro de producción en la "
+"operación indicada de la ruta."
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr "Productos finalizados"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr "A comprar"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Raw Material Location"
+msgstr "Ubicación de materias primas"
+
+#. module: mrp
+#: help:mrp.installer,mrp_operations:0
+msgid ""
+"Enhances production orders with readiness states as well as the start date "
+"and end date of execution of the order."
+msgstr ""
+"Mejora las órdenes de producción con los estados de preparación, así como la "
+"fecha de inicio y final de la ejecución de la orden."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+"El sistema crea automáticamente una petición de presupuesto al proveedor "
+"preferido."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr "Productos a terminar"
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr "Conjunto / Paquete"
+
+#. module: mrp
+#: field:mrp.installer,mrp_subproduct:0
+msgid "MRP Subproducts"
+msgstr "Subproductos MRP"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "Coste por hora"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+"En caso de que el método de suministro del producto es Producir, el sistema "
+"crea una orden de producción."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "Ctdad producto"
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+msgstr ""
+"Introduzca este producto para realizar fácilmente un seguimiento de sus "
+"costes de producción en la contabilidad analítica."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+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.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr "Cuenta ciclo"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Cost"
+msgstr "Coste del trabajo"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr "["
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr "Abastecimiento de servicios"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr "Información de capacidad"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr "Ubicación destino"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr "Datos principales"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+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 ""
+"El sistema espera a que los productos estén disponibles en el stock. Estos "
+"productos suelen ser adquiridos de forma manual o a través de una regla de "
+"stock mínimo."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr "Ref. empresa"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr "Cantidad en horas"
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr "Bienes planificados"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr "Conjuntos / Fantasma"
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr "Referencia a una ubicación en una plan. externa"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: mrp
+#: 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: mrp
+#: model:ir.model,name:mrp.model_mrp_production_order
+msgid "Production Order Report"
+msgstr "Informe de órden de producción"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr "Producir producto"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:177
+#, python-format
+msgid "Components Cost of "
+msgstr "Coste de los componentes de "
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr "Abastecimiento de producto almacenable"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr "Nº de horas"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr "Confirmar producción"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+"El sistema crea una orden (de producción o de compra) en función de la "
+"cantidad vendida y los parámetros de los productos."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
+"Esto se utiliza en caso de un servicio sin ningún tipo de impacto en el "
+"sistema, una sesión de formación, por ejemplo."
+
+#. module: mrp
+#: field:mrp.installer,mrp_repair:0
+msgid "Repairs"
+msgstr "Reparaciones"
+
+#. module: mrp
+#: field:mrp.installer,stock_location:0
+msgid "Advanced Routes"
+msgstr "Rutas avanzadas"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr "Horario trabajo"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr "Variación del valor del stock semanal"
+
+#. module: mrp
+#: help:mrp.installer,mrp_repair:0
+msgid ""
+"Enables warranty and repair management (and their impact on stocks and "
+"invoicing)."
+msgstr ""
+"Activa la garantía y la gestión de reparaciones (y su impacto sobre stocks y "
+"facturación)"
+
+#. module: mrp
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,date_planned:0
+msgid "Scheduled Date"
+msgstr "Fecha programada"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr "Lista de Material"
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+"Dejarlo vacío si se produce en el mismo lugar en que los productos acabados "
+"son necesarios. Indique una ubicación si se produce en una ubicación fija. "
+"Puede ser una ubicación de otra empresa si subcontrata las operaciones de "
+"fabricación."
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr "Variación del valor de stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr "Estructura lista de materiales"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr "Producto de tipo servicio"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+"Definir grupos específicos de propiedad que se pueden asignar a las "
+"propiedades de su lista de materiales."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr "Descomposición fabricación"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct1
+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
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+"Rellenarlo sólo si desea crear entradas automáticas de contabilidad "
+"analítica según órdenes de producción."
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr "Nº de ciclos"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr "Solicitud de presupuesto."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+"La lista de materiales está vinculada a una ruta, es decir, la sucesión de "
+"centros de producción."
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr "Ubicación de producción"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr "Cambiar Ctd."
+
+#. module: mrp
+#: view:mrp.production:0
+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"
+msgstr "Valor del stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr "Estructura LdM del producto"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr "Buscar producción"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr "Precio proveedor por UdM"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr "Estructura LdM"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Picking Exception"
+msgstr "Excepción albarán"
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr "Líneas de las listas de materiales"
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr "Tiempo antes producción"
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr "Ruta del material"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,consumed_products:0
+msgid "Consumed Products"
+msgstr "Productos consumidos"
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "¡Error! No puede crear Listas de Material recursivas."
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr "Carga centro de producción"
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr "¡No se ha definido LdM para este producto!"
+
+#. 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 "Componentes de lista de materiales"
+
+#. module: mrp
+#: field:mrp.production.order,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"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."
+msgstr ""
+"Lista de las operaciones (lista de los centros de trabajo) para producir los "
+"productos acabados. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones y planificar la carga "
+"en el futuro en los centros de trabajo basada en la planificación de "
+"producción."
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr "Tiempo en horas para realizar un ciclo."
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr "Ref LdM"
+
+#. module: mrp
+#: view:mrp.production:0
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "In Production"
+msgstr "En producción"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr "Lista de materiales maestra"
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+"UdV del producto (Unidad de Venta) es la unidad de medida para la "
+"facturación y la promoción de existencias."
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:150
+#: code:addons/mrp/report/price.py:201
+#, python-format
+msgid "Total Cost of "
+msgstr "Coste total de "
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr "Vinculado al método de abastecimiento 'Regla de stock mínimo'."
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr "Por mes"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr "No se puede encontrar la lista de material para el producto"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr "Nombre producto"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+"Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid ""
+"Add more functionalities to the core Manufacturing Application with the "
+"following addons."
+msgstr ""
+"Añada más funcionalidades en el núcleo de la aplicación de fabricación con "
+"los siguientes módulos."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr "Fecha impresión"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr "Petición presupuesto"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr "Regla de abastecimiento"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work center per hour."
+msgstr "Especificar costes del centro de trabajo por hora."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr "Parcial"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr "Centro de producción"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
+"Dependiendo del método elegido para \"suministrar\" del servicio, la orden "
+"de abastecimiento crea una solicitud de presupuesto para un pedido de compra "
+"(subcontratación) o espera hasta que el servicio se realice (= la entrega de "
+"los productos)."
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Órden de producción"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr "Abastecimiento de materias primas"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this work center to achieve the operation of the specified "
+"routing."
+msgstr ""
+"Tiempo en horas para este centro de producción para realizar la operación de "
+"la ruta indicada."
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr "Total ciclos"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+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
+#: field:mrp.production.order,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr "Tipo de lista de materiales"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:47
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+"Abastecimiento '%s' tiene una excepción: 'El producto no tiene LdM definida!'"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr "Núm. de ciclo"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr "Stock mínimo"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr "Carga futura del centro de producción"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product"
+msgstr "Producto almacenable"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Center name"
+msgstr "Nombre del centro de producción"
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr "Núm. de horas"
+
+#. module: mrp
+#: field:mrp.installer,mrp_jit:0
+msgid "Just In Time Scheduling"
+msgstr "Planificación 'Just in Time'"
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr "Grupo de propiedad"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr "Plan de producción"
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: mrp
+#: help:mrp.installer,mrp_subproduct:0
+msgid ""
+"Enables multiple product output from a single production order: without "
+"this, a production order can have only one output product."
+msgstr ""
+"Habilita la salida de múltiples productos de una sola orden de producción: "
+"sin ello, una orden de producción sólo puede tener un producto de salida."
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+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 ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+"Si el servicio tiene un método de suministro 'Comprar', se crea una "
+"solicitud de presupuesto, por ejemplo, una petición de subcontratación."
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr "Movimiento producto"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr "Obtener para stock"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing work centers."
+msgstr ""
+"Proporciona el orden de secuencias cuando se muestra una lista de "
+"enrutamiento de los centros de trabajo."
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr "Nombre LdM"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr "Empezar producción"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr "Tablero de producción"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr "Ubic. orígen"
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr "Referencia interna"
+
+#. module: mrp
+#: help:mrp.installer,stock_location:0
+msgid ""
+"Manages product routes and paths within and between locations (e.g. "
+"warehouses)."
+msgstr ""
+"Gestiona las rutas y caminos de los productos dentro y entre las ubicaciones "
+"(por ejemplo, almacenes)."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr "Estructura de producto"
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "MRP Application Configuration"
+msgstr "Configuración aplicación MRP"
+
+#. module: mrp
+#: help:mrp.installer,mrp_jit:0
+msgid ""
+"Enables Just In Time computation of procurement orders.\n"
+"\n"
+"While it's more resource intensive than the default setup, the JIT computer "
+"avoids having to wait for the procurement scheduler to run or having to run "
+"the procurement scheduler manually."
+msgstr ""
+"Permite el cálculo de las órdenes de abastecimiento justo a tiempo (Just In "
+"Time).\n"
+"\n"
+"Si bien consume más recursos que la configuración predeterminada, el cálculo "
+"JIT evita tener que esperar a que se ejecute el planificador de "
+"abastecimientos o tener que ejecutar el planificador de abastecimientos de "
+"forma manual."
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr "Modo"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr "]"
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr "Importe unidad de medida"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
+msgstr ""
+"Las órdenes de fabricación describen las operaciones que deben ser "
+"realizadas y las materias primas necesarias para cada etapa de fabricación. "
+"Utilice las especificaciones (listas de materiales o LdM) para obtener las "
+"necesidades de materias primas y las órdenes de fabricación necesarias para "
+"los productos finales. Una vez las listas de materiales hayan sido "
+"definidas, OpenERP es capz de decidir automáticamente al ruta de fabricación "
+"en función de las necesidades de la compañía."
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡Cantidad ordenada no puede ser negativa o cero!"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr "Órdenes de producción en progreso"
+
+#. module: mrp
+#: model:ir.module.module,description:mrp.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the manufacturing process in OpenERP.\n"
+"\n"
+"    Features:\n"
+"    * Make to Stock / Make to Order (by line)\n"
+"    * Multi-level BoMs, no limit\n"
+"    * Multi-level routing, no limit\n"
+"    * Routing and work center integrated with analytic accounting\n"
+"    * Scheduler computation periodically / Just In Time module\n"
+"    * Multi-pos, multi-warehouse\n"
+"    * Different reordering policies\n"
+"    * Cost method by product: standard price, average price\n"
+"    * Easy analysis of troubles or needs\n"
+"    * Very flexible\n"
+"    * Allows to browse Bill of Materials in complete structure\n"
+"        that include child and phantom BoMs\n"
+"    It supports complete integration and planification of stockable goods,\n"
+"    consumable of services. Services are completely integrated with the "
+"rest\n"
+"    of the software. For instance, you can set up a sub-contracting service\n"
+"    in a BoM to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"    Reports provided by this module:\n"
+"    * Bill of Material structure and components\n"
+"    * Load forecast on Work Centers\n"
+"    * Print a production order\n"
+"    * Stock forecasts\n"
+"    Dashboard provided by this module::\n"
+"    * List of next production orders\n"
+"    * List of deliveries (out picking)\n"
+"    * Graph of work center load\n"
+"    * List of procurement in exception\n"
+"    "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr "Órdenes de producción en espera de productos"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Cycles Cost"
+msgstr "Coste ciclos"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr "Valor en ciclos"
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,location_dest_id:0
+msgid "Finished Products Location"
+msgstr "Ubicación productos finalizados"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr "Centros de producción"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr "Por semana"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"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."
+msgstr ""
+"Las rutas le permiten crear y gestionar las operaciones de fabricación a "
+"realizar en sus centros de producción para fabricar un producto. Están "
+"relacionadas con las listas de materiales que definirán las materias primas "
+"necesarias."
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr "Núm. de hora"
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr "Operaciones del centro de producción"
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: field:mrp.production.order,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr "Seleccionar unidad de tiempo"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr "Carga centro de producción"
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr "Ubicación donde el sistema almacenará los productos finalizados."
+
+#. 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 ""
+"Este es el albarán interno que trae el producto terminado hacia el plan de "
+"producción."
+
+#. module: mrp
+#: field:stock.change.standard.price,change_parent_price:0
+msgid "Change Parent Price"
+msgstr "Cambiar precio padre"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+"La regla de stock mínimo es una regla de abastecimiento automático basado en "
+"una cantidad mínima y máxima. Está disponible en el menú de gestión de "
+"inventario y configurable por producto."
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr "Día por día"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr "Revisiones"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure Your Manufacturing Resource Planning Application"
+msgstr ""
+"Configure su aplicación de planificación de recursos de fabricación (MRP)"
+
+#. module: mrp
+#: field:mrp.production,priority:0
+#: field:mrp.production.order,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:924
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr "Órden de producción '%s' planificada para el '%s'"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr "Núm. orden producción :"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:640
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr "Orden fabricación '%s' está preparada para producir."
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr "Fabricación planificada producto"
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr "Días de seguridad para cada operación de fabricación."
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Make to Stock"
+msgstr "Obtener para stock"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
+msgstr ""
+"Las listas de materiales maestras le permiten crear y gestionar la lista de "
+"las materias primas necesarias utilizadas para fabricar un producto acabado. "
+"OpenERP utilizará estas LdMs para proponer automáticamente órdenes de "
+"fabricación en función de las necesidades de producto. Puede crear una lista "
+"de materiales para definir los pasos de producción o definir una única lista "
+"de materiales multi-nivel."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
+"En caso de que el método de suministro del producto se Compra, el sistema "
+"crea un pedido de compra."
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
+msgid "Product Cost Structure"
+msgstr "Estructura de los costes del producto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Components suppliers"
+msgstr "Proveedores de componentes"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_installer
+msgid "mrp.installer"
+msgstr "mrp.instalador"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr "Centros de trabajo de producción"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:62
+#, python-format
+msgid "Active Id is not found"
+msgstr "ID activo no se encuentra"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr "Buscar por centro de producción mrp"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr "Despiece de la LdM"
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+#: field:mrp.production.order,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr "Cuenta horas"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr "Ubic. destino"
+
+#. module: mrp
+#: field:mrp.production.order,product_id2:0
+msgid "Product Consumed"
+msgstr "Producto consumido"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Abastecer productos"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr "Cargas centro de producción"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+"Referencia al documento que generó esta solicitud de orden de producción."
+
+#. module: mrp
+#: 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
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr "Información extra"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr "Cambiar cantidad de productos"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr "Guía las órdenes de abastecimiento para materias primas."
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr "Número venta"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_change_standard_price
+msgid "Change Standard Price"
+msgstr "Cambio de precio estándar"
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "No urgente"
+
+#. module: mrp
+#: help:stock.change.standard.price,change_parent_price:0
+msgid ""
+"This will change the price of parent products also according to the BoM "
+"structure specified for the product."
+msgstr ""
+"Esto cambiará el precio de los productos padre de acuerdo a la estructura de "
+"la lista de materiales del producto."
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr "Órdenes de producción a iniciar"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+"¡No se puede eliminar orden(es) de producción que están en estado %s!"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr "Centro de producción"
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr "Capacidad por ciclo"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_id:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+#: field:mrp.production.order,location_src_id:0
+msgid "Raw Materials Location"
+msgstr "Ubicación materias primas"
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr "Imprimir la estructura de costes del producto"
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr "UdV del producto"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units consisting "
+"of one or more persons and/or machines that can be considered as a unit for "
+"capacity and planning forecasting."
+msgstr ""
+"Los centros de trabajo le permiten crear y administrar unidades de "
+"producción que consisten en una o más personas y / o máquinas que se pueden "
+"considerar como una unidad para la capacidad de planificación y previsión."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr "Consumir productos"
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.order,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
+#: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
+msgid "Production Analysis"
+msgstr "Análisis de producción"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:349
+#, python-format
+msgid "Copy"
+msgstr "Copiar"
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr "Productos producidos"
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+#: field:mrp.production.order,date_finished:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+"Validez de esta LdM o componente. Dejarlo vacío si siempre es válido."
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "#Line Orders"
+msgstr "Nº línea órdenes"
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Very Urgent"
+msgstr "Muy urgente"
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"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."
+msgstr ""
+"La lista de operaciones (lista de los centros de trabajo) para producir los "
+"productos terminados. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones de carga y planificar "
+"el futuro en los centros de trabajo basado en la planificación de la "
+"producción."
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr "Categorías de propiedades"
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de órdenes de "
+"trabajo."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr "Productos planificados"
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr "Consumición de productos producidos"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr "Órdenes de producción"
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
+"El modo 'Sólo consumir' sólo se consumen los productos con la cantidad "
+"seleccionada.\n"
+"El modo 'Consumo y Producción' se consumen y también se producen los "
+"productos con la cantidad seleccionada y finalizará la orden de producción "
+"cuando el total de las cantidades solicitadas se han producido."
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr "Coste por ciclo"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr "Servicio"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "BOM"
+msgstr "LdM"
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+"UdM(Unidad de medida) es la unidad de medida para el control de inventario"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+"La lista de materiales es la composición del producto. Los componentes (que "
+"son también productos) pueden tener sus propias listas de materiales (multi-"
+"nivel)."
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr "Tiempo para 1 ciclo (horas)"
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr "Orden de producción"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr "Regla de abastecimiento automática"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr "Calcular datos"
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr "Cant. UdV del producto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr "Componentes"
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr "Despiece de la LdM"
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr "Válido hasta"
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr "Válido desde"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr "LdM normal"
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr "Tiempo entrega de fabricación"
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr "Ctdad UdV producto"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+"La variación semanal del valor del stock permite realizar un seguimiento de "
+"la evolución del valor del stock relativo a las actividades de fabricacion, "
+"recepciónd de productos y ordenes de entrega."
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr "Eficiencia de la producción"
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar las listas de material sin "
+"eliminarlas."
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr "Redondeo del producto"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr "Orden de trabajo"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+"Estos informes le permiten analizar sus actividad productiva y su "
+"rendimiento."
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr "Consumir únicamente"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr "Volver a crear albarán"
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"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. 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."
+msgstr ""
+"Si un sub-producto se utiliza en varios productos, puede ser útil crear su "
+"propia lista de materiales. Aunque si no quiere órdenes de producción "
+"separadas para este sub-producto, seleccione Conjunto/Fantasma como tipo de "
+"LdM. Si una LdM fantasma se utiliza para un producto raíz, será vendida y "
+"enviada como un conjunto de componentes, en vez de ser producida."
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr "Método"
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"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'.       "
+"                             \n"
+"If 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'."
+msgstr ""
+"Cuando se crea la orden de fabricación su estado es fijado a \"Borrador\"\n"
+" Si la orden está confirmdada, el estado es fijado a \"Esperando "
+"mercancía\"\n"
+" Si existe alguna excepción, el estado es fijado a \"Excepcion de "
+"abastecimiento\"\n"
+"Si el stock está disponible, el estado es fijado a \"Listo para producir\"\n"
+" Cuando la fabricación comienza, el estado es fijado a \"En producción\"\n"
+" Cuando la fabricación finaliza, el estado es fijado a \"Realizado\""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr "En orden"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr "Tiempo después producción"
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr "Tipo de período"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr "Ctdad total"
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr "Número de horas"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr "Información de costes"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr "Órdenes de abastecimiento"
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr "Redondeo aplicado sobre la cantidad de producto"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Asignación desde producción o pedido de compra."
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr "Proceso productivo padre"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr "Tiempo en horas para la configuración."
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: mrp
+#: field:mrp.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. 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
+msgid "Stock value variation"
+msgstr "Variación del valor del stock"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr "Asignación desde stock."
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+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
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: mrp
+#: field:mrp.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr "Etapas de producción."
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:136
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
+#, python-format
+msgid "Cost Structure"
+msgstr "Estructura de costes"
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr "Consumir y Producir"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr "Lista de materiales (LdM) padre"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
+msgstr ""
+"Los componente de listas de materiales son componentes y sub-productos "
+"utilizados para crear listas de materiales maestras. Utilice este menú para "
+"buscar en qué LdM es utilizado un componente específico."
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr "Tipo de producto es almacenable o consumible."
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr "Seleccionar cantidad"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr "Lista de materiales (LdM)"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
+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
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr "Producciones"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:194
+#, python-format
+msgid "Work Cost of "
+msgstr "Coste trabajo de "
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: field:mrp.production.order,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr "Proceso productivo"
+
+#. module: mrp
+#: field:mrp.installer,mrp_operations:0
+msgid "Manufacturing Operations"
+msgstr "Operaciones de producción"
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr "Fecha planificada"
+
+#. module: mrp
+#: 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: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the the needs."
+msgstr ""
+"Las propiedades en OpenERP se utilizan para seleccionar la correcta lista de "
+"materiales para la fabricación de uno de los productos cuando se tienen "
+"diferentes formas de fabricar el mismo producto. Puede asignar varias "
+"propiedades para cada lista de materiales. Cuando un vendedor crea un pedido "
+"de cliente, él puede relacionarlo con varias propiedades y OpenERP "
+"seleccionará automáticamente la lista de materiales para utilizar según las "
+"necesidades."
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr "Producción"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "Abastecimientos en excepción"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr "material 'regla stock mínimo'"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr "Precio del producto"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_installer
+msgid "MRP Applications Configuration"
+msgstr "Configuración de las aplicaciónes MRP"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr "Cambiar cantidad"
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+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
+#: selection:mrp.production.order,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr "Tablero fabricación"
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr "Fecha de fin planificada"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+"Las cargas de los centros de producción muestran un pronóstico de la carga "
+"de los centros de producción respecto a un periodo determinado. Está "
+"expresado en número de horas y ciclos de máquina relacionados."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr "La forma de abastecer depende del tipo de producto."
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr "Fabricación"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr "Próximas órdenes de producción"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr "Grupos de propiedades"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+"Dependiendo del método elegido para suministrar los productos almacenables, "
+"la orden de abastecimiento crea una petición de presupuesto, una orden de "
+"producción, ... "
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr "Tiempo en horas para la limpieza."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr "Petición de presupuesto automática"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+"Si el servicio tiene un método de suministro 'Producir', se crea una tarea "
+"en el módulo de gestión de proyectos de OpenERP."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
+"Para poder suministrar materias primas (que deben ser compradas o "
+"producidas), la orden de producción genera tantas órdenes de abastecimiento "
+"como componentes figuren en la lista de materiales, a través de una "
+"ejecución de las planificaciones (MRP)."
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+"Indique la cantidad de productos a producir o comprar. El informe de la "
+"estructura de costes se muestra basándose en esta cantidad."
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr "En stock"
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr "Ausencias recursos"
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de listas de "
+"materiales."
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,products_to_consume:0
+msgid "Products to Consume"
+msgstr "Productos a consumir"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,year:0
+msgid "Year"
+msgstr "Año"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid ""
+#~ "Triggers an automatic procurement for all products that have a virtual stock "
+#~ "under 0. You should probably not use this option, we suggest using a MTO "
+#~ "configuration on products."
+#~ msgstr ""
+#~ "Dispara un abastecimiento automático para todos los productos que tienen un "
+#~ "stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
+#~ "sugerimos utilizar una configuración de MTO en productos."
+
+#~ msgid "Compute Stock Minimum Rules Only"
+#~ msgstr "Calcular sólo reglas de stock mínimo"
+
+#~ msgid "Exceptions Procurements"
+#~ msgstr "Excepciones de abastecimientos"
+
+#~ msgid "UoS Quantity"
+#~ msgstr "Cantidad UdV"
+
+#~ msgid "Routing Workcenters"
+#~ msgstr "Procesos productivos de los centros de producción"
+
+#~ msgid "Not used in computations, for information purpose only."
+#~ msgstr "No utilizado en cálculos, sólo con la finalidad de informar."
+
+#~ msgid "Packing list"
+#~ msgstr "Albarán"
+
+#~ msgid "Stockable Stock"
+#~ msgstr "Stock productos almacenables"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Automatic orderpoint"
+#~ msgstr "Generación de orden automática"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "¡No se ha definido un proveedor para este producto!"
+
+#, python-format
+#~ msgid "Product name"
+#~ msgstr "Nombre producto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Éstos son los días añadidos a los que promete a los clientes por razones de "
+#~ "seguridad"
+
+#~ msgid "Best price (not yet active!)"
+#~ msgstr "Mejor precio (aún no activo!)"
+
+#~ msgid "Product & Location"
+#~ msgstr "Producto & Ubicación"
+
+#~ msgid "MRP & Logistic Scheduler"
+#~ msgstr "Planificador MRP & Logística"
+
+#~ msgid ""
+#~ "Number of operation this workcenter can do in parallel. If this workcenter "
+#~ "represent a team of 5 workers, the capacity per cycle is 5."
+#~ msgstr ""
+#~ "Número de operaciones que este centro de producción puede realizar en "
+#~ "paralelo. Si este centro de producción tuviera un equipo de 5 trabajadores, "
+#~ "la capacidad por ciclo sería de 5."
+
+#~ msgid "Ask New Products"
+#~ msgstr "Solicitar nuevos productos"
+
+#~ msgid "Automatic Procurements"
+#~ msgstr "Abastecimientos automáticos"
+
+#~ msgid "Products Consummed"
+#~ msgstr "Productos consumidos"
+
+#~ msgid "Packing Exception"
+#~ msgstr "Excepción de empaquetado"
+
+#~ msgid "A purchase order is created for a sub-contracting demand."
+#~ msgstr "Una orden de compra es creada para sub-contratar la demanda."
+
+#~ msgid "Analytic Accounting"
+#~ msgstr "Contabilidad analítica"
+
+#~ msgid "Do nothing"
+#~ msgstr "No hacer nada"
+
+#, python-format
+#~ msgid "products"
+#~ msgstr "productos"
+
+#~ msgid "If the stock of a product is under 0, it will act like an orderpoint"
+#~ msgstr "Si el stock de un producto es menor que 0, actuará como una orden"
+
+#~ msgid "you can see the minimum stock rules from product"
+#~ msgstr "puede ver las reglas de stock mínimo desde producto"
+
+#~ msgid "This wizard will schedule procurements."
+#~ msgstr "Este asistente planificará abastecimientos."
+
+#~ msgid "Internal Ref."
+#~ msgstr "Ref. interna"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Stockable Production Order"
+#~ msgstr "Orden producción almacenable"
+
+#~ msgid "Stockable Request"
+#~ msgstr "Solicitud almacenable"
+
+#, python-format
+#~ msgid "Workcenter name"
+#~ msgstr "Nombre centro de producción"
+
+#~ msgid "Service on Order"
+#~ msgstr "Servicio sobre orden"
+
+#~ msgid ""
+#~ "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
+#~ "procurement to bring the virtual stock to the Max Quantity."
+#~ msgstr ""
+#~ "Cuando el stock virtual disminuye por debajo de la cantidad mínima, OpenERP "
+#~ "genera un abastecimiento para que el stock virtual sea la cantidad máxima."
+
+#~ msgid "Stockable Make to Stock"
+#~ msgstr "Almacenable obtenido para stock"
+
+#~ msgid "Production Orders"
+#~ msgstr "Órdenes de producción"
+
+#~ msgid "Procure Service Product"
+#~ msgstr "Abastecer producto servicio"
+
+#, python-format
+#~ msgid "Product Quantity"
+#~ msgstr "Cantidad producto"
+
+#~ msgid "Procurements"
+#~ msgstr "Abastecimientos"
+
+#~ msgid "Production scheduled products"
+#~ msgstr "Producción planificada de productos"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Procurement Process"
+#~ msgstr "Proceso de abastecimiento"
+
+#, python-format
+#~ msgid "Product Standard Price"
+#~ msgstr "Precio estándar producto"
+
+#~ msgid ""
+#~ "Rounding applied on the product quantity. For integer only values, put 1.0"
+#~ msgstr ""
+#~ "Redondeo aplicado a la cantidad de producto. Para valores siempre enteros "
+#~ "introduzca 1.0"
+
+#~ msgid "Reservation"
+#~ msgstr "Reserva"
+
+#~ msgid "product"
+#~ msgstr "producto"
+
+#~ msgid "max"
+#~ msgstr "máx"
+
+#~ msgid "Product to stock rules"
+#~ msgstr "Producto a reglas de stock"
+
+#, python-format
+#~ msgid "from stock: products assigned."
+#~ msgstr "desde stock: productos asignados."
+
+#~ msgid "Print product price"
+#~ msgstr "Imprimir coste del producto"
+
+#~ msgid "Make Procurement"
+#~ msgstr "Realizar abastecimiento"
+
+#~ 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 "
+#~ "producir"
+
+#~ msgid "Purchase Lead Time"
+#~ msgstr "Plazo de tiempo de compra"
+
+#~ msgid "Stockable Product Stock"
+#~ msgstr "Stock de producto almacenable"
+
+#~ msgid "Production Procure Products"
+#~ msgstr "Productos para abastecer la producción"
+
+#~ msgid "Service Product Process"
+#~ msgstr "Proceso producto de servicios"
+
+#~ msgid "Procurement convert into the draft purchase order."
+#~ msgstr "Abastecimiento se convierte en la orden de compra borrador."
+
+#~ msgid "Latest error"
+#~ msgstr "Último error"
+
+#, python-format
+#~ msgid "from stock and no minimum orderpoint rule defined"
+#~ msgstr "desde stock y no se ha definido regla mínima generación orden"
+
+#~ msgid "Routing workcenter usage"
+#~ msgstr "Procesos productivos del centro de producción"
+
+#~ msgid "If Product type is Stockable and procure method is make to stock"
+#~ msgstr ""
+#~ "Si el tipo de producto es almacenable y el método de abastecimiento es "
+#~ "obtener para stock"
+
+#~ msgid "Manufacturity Lead Time"
+#~ msgstr "Plazo de entrega de fabricación"
+
+#~ msgid "Exceptions Procurements to Fix"
+#~ msgstr "Excepciones de abastecimientos a corregir"
+
+#~ msgid "Workcenter Operations"
+#~ msgstr "Operaciones del centro de producción"
+
+#~ msgid "Production Orders Planning"
+#~ msgstr "Planificación órdenes de producción"
+
+#~ msgid "Factor that multiplies all times expressed in the workcenter."
+#~ msgstr ""
+#~ "Factor que multiplica todos los tiempos expresados en el centro de "
+#~ "producción."
+
+#~ msgid ""
+#~ "This is the internal picking list take bring the raw materials to the "
+#~ "production plan."
+#~ msgstr ""
+#~ "Ésta es la lista de empaquetado interna que lleva las materias primas a la "
+#~ "producción planificada."
+
+#~ msgid "Qty Multiple"
+#~ msgstr "Ctdad múltiple"
+
+#~ msgid "Waiting"
+#~ msgstr "En espera"
+
+#~ msgid "For stockable and consumable"
+#~ msgstr "Para almacenables y consumibles"
+
+#~ msgid "indice type"
+#~ msgstr "Tipo de índice"
+
+#, python-format
+#~ msgid "Hours Cost"
+#~ msgstr "Coste horas"
+
+#~ msgid "Production orders are created for the product manufacturing."
+#~ msgstr "Se crean órdenes de producción para la fabricación del producto."
+
+#~ msgid "Min Quantity"
+#~ msgstr "Cantidad mín"
+
+#~ msgid "Production orders"
+#~ msgstr "Órdenes de producción"
+
+#~ msgid "BoM Hyerarchy"
+#~ msgstr "Jerarquía LdM"
+
+#~ msgid "Procurement Lines"
+#~ msgstr "Líneas de abastecimiento"
+
+#~ msgid "If Product type is service and procure method is Make to stock"
+#~ msgstr ""
+#~ "si el tipo de producto es servicio y el método de abastecimiento es obtener "
+#~ "para stock"
+
+#~ msgid "If Product type is service"
+#~ msgstr "Si el tipo de producto es servicio"
+
+#, python-format
+#~ msgid "SUBTOTAL"
+#~ msgstr "SUBTOTAL"
+
+#~ msgid "Security Days"
+#~ msgstr "Días de seguridad"
+
+#~ msgid "Exception"
+#~ msgstr "Excepción"
+
+#~ msgid ""
+#~ "This wizard will planify the procurement for this product. This procurement "
+#~ "may generate task, production orders or purchase orders."
+#~ msgstr ""
+#~ "Este asistente planificará el abastecimiento para este producto. El "
+#~ "abastecimiento puede generar tareas, órdenes de producción o órdenes de "
+#~ "compra."
+
+#~ msgid "The system waits for requested products in stock."
+#~ msgstr "El sistema espera los productos solicitados en stock."
+
+#~ msgid "Serivce Stockable Order"
+#~ msgstr "Orden servicio almacenable"
+
+#~ msgid "From minimum stock rules, it goes for procure product."
+#~ msgstr "Desde reglas de stock mínimo, va a abastecer el producto."
+
+#~ msgid "Production done"
+#~ msgstr "Producción realizada"
+
+#, python-format
+#~ msgid "Unit Product Price"
+#~ msgstr "Precio producto unidad"
+
+#~ msgid "References"
+#~ msgstr "Referencias"
+
+#~ msgid "Machine"
+#~ msgstr "Fabricación"
+
+#~ msgid "Workcenter Name"
+#~ msgstr "Nombre centro de producción"
+
+#~ msgid "min"
+#~ msgstr "mín"
+
+#~ msgid ""
+#~ "Description of the workcenter. Explain here what's a cycle according to this "
+#~ "workcenter."
+#~ msgstr ""
+#~ "Descripción del centro de producción. Describa aquí que es un ciclo según "
+#~ "este centro de producción."
+
+#~ msgid "Human Resource"
+#~ msgstr "Recurso humano"
+
+#~ msgid "Workcenters"
+#~ msgstr "Centros de producción"
+
+#~ msgid "on order"
+#~ msgstr "bajo pedido"
+
+#~ msgid "Compute All Schedulers"
+#~ msgstr "Calcular todas las planificaciones"
+
+#~ msgid "Create Procurement"
+#~ msgstr "Crear abastecimiento"
+
+#, python-format
+#~ msgid "Product uom"
+#~ msgstr "UdM producto"
+
+#~ msgid "Number of Cycle"
+#~ msgstr "Número de ciclos"
+
+#~ msgid "Run procurement"
+#~ msgstr "Ejecutar abastecimiento"
+
+#~ msgid ""
+#~ "This is the time frame analysed by the scheduler when computing "
+#~ "procurements. All procurement that are not between today and today+range are "
+#~ "skipped for futur computation."
+#~ msgstr ""
+#~ "Éste es el intervalo temporal analizado por el planificador al calcular "
+#~ "abastecimientos. Todos los abastecimientos que no estén entre hoy y "
+#~ "hoy+intervalo son omitidos para el cálculos futuros."
+
+#~ msgid "Time Efficiency"
+#~ msgstr "Eficiencia temporal"
+
+#~ msgid "Scheduler Parameters"
+#~ msgstr "Parámetros del planificador"
+
+#~ msgid "A cycle is defined in the workcenter definition."
+#~ msgstr "En la definición de un centro de producción se define un ciclo."
+
+#~ msgid "Unit of Measure"
+#~ msgstr "Unidad de medida"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Compute Procurements"
+#~ msgstr "Calcular abastecimientos"
+
+#~ msgid "Wait for available products for reservation"
+#~ msgstr "Esperar productos disponibles para reservarlos"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Procurement Purchase"
+#~ msgstr "Compra de abastecimiento"
+
+#~ msgid "Number of products to produce"
+#~ msgstr "Número de productos a producir"
+
+#~ msgid "Material routing"
+#~ msgstr "Procesos productivos del material"
+
+#~ msgid "Minimum stock rule"
+#~ msgstr "Regla de stock mínimo"
+
+#~ msgid "Product Efficiency"
+#~ msgstr "Eficiencia del producto"
+
+#~ msgid "Orderpoint minimum rule"
+#~ msgstr "Regla mínima generación orden"
+
+#~ msgid "Service Make to Stock"
+#~ msgstr "Servicio obtener para stock"
+
+#~ msgid "Sale Ref"
+#~ msgstr "Ref. venta"
+
+#~ msgid "Location"
+#~ msgstr "Ubicación"
+
+#~ msgid "New Procurement"
+#~ msgstr "Nuevo abastecimiento"
+
+#~ msgid "Tool"
+#~ msgstr "Maquinaria"
+
+#~ msgid ""
+#~ "Location where the system will look for products used in raw materials."
+#~ msgstr ""
+#~ "Ubicación donde el sistema buscará productos utilizados en las materias "
+#~ "primas."
+
+#~ msgid "Planned Date"
+#~ msgstr "Fecha prevista"
+
+#~ msgid "Procurement orders"
+#~ msgstr "Órdenes de abastecimiento"
+
+#~ msgid "If product type is service and procure method is Make to order"
+#~ msgstr ""
+#~ "si el tipo de producto es servicio y el método de abastecimiento es obtener "
+#~ "bajo pedido"
+
+#~ msgid "Scheduler Range"
+#~ msgstr "Margen planificador"
+
+#~ msgid "Max Quantity"
+#~ msgstr "Cantidad máx"
+
+#~ msgid "Minimum Stock Procure"
+#~ msgstr "Abastecer stock mínimo"
+
+#~ msgid "This is the leads/security time for each purchase order."
+#~ msgstr "Éste es el plazo/seguridad de tiempo para cada orden de compra."
+
+#~ msgid "alphabetical indices"
+#~ msgstr "índices alfabéticos"
+
+#~ msgid "Procurement for raw materials."
+#~ msgstr "Abastecimiento para materia primas."
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid "Procure Stockable Product"
+#~ msgstr "Abastecimiento producto almacenable"
+
+#~ msgid "Paid ?"
+#~ msgstr "¿Pagado?"
+
+#~ msgid "Define a routing to describe the manufacturing steps."
+#~ msgstr ""
+#~ "Definir un proceso productivo para describir los pasos de fabricación"
+
+#~ msgid "Define the product structure, with sub-products and/or components."
+#~ msgstr ""
+#~ "Definir la estructura del producto, con subproductos y/o componentes."
+
+#~ msgid ""
+#~ "Procurement is created if the product quantity is lower than the minimum "
+#~ "limit."
+#~ msgstr ""
+#~ "Se crea el abastecimiento si la cantidad de producto es menor que el límite "
+#~ "mínimo."
+
+#~ msgid "Date Closed"
+#~ msgstr "Fecha de cierre"
+
+#~ msgid "Properties composition"
+#~ msgstr "Composición de propiedades"
+
+#~ msgid "Production Orders Waiting Products"
+#~ msgstr "Órdenes de producción esperando productos"
+
+#~ msgid "Change Product Qty."
+#~ msgstr "Cambiar Ctd. producto"
+
+#~ msgid "The procurement quantity will by rounded up to this multiple."
+#~ msgstr "La cantidad abastecida será redondeada hacia arriba a este múltiplo."
+
+#~ msgid "Reordering Mode"
+#~ msgstr "Modo de pedir de nuevo"
+
+#~ 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 "Central document to procure products"
+#~ msgstr "Documento central para abastecer productos"
+
+#~ msgid "Production Orders in Progress"
+#~ msgstr "Órdenes de producción en proceso"
+
+#~ msgid "Minimum Stock Rules"
+#~ msgstr "Reglas de stock mínimo"
+
+#~ msgid ""
+#~ "Reference of the document that created this procurement.\n"
+#~ "This is automatically completed by Open ERP."
+#~ msgstr ""
+#~ "Referencia del documento que ha creado este abastecimiento.\n"
+#~ "Éste es completado automáticamente por OpenERP."
+
+#~ msgid "Product type is Stockable and procure method is make to stock"
+#~ msgstr ""
+#~ "Tipo de producto es almacenable y método de abastecimiento es obtener para "
+#~ "stock"
+
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producto"
+
+#~ msgid "Workcenter"
+#~ msgstr "Centro de producción"
+
+#~ msgid "Purchase Order"
+#~ msgstr "Orden de compra"
+
+#~ msgid ""
+#~ "If you encode manually a procurement, you probably want to use a make to "
+#~ "order method."
+#~ msgstr ""
+#~ "Si codifica manualmente un abastecimiento, probablemente desea usar un "
+#~ "método obtener bajo pedido."
+
+#~ msgid "Stockable Order Request"
+#~ msgstr "Solicitud orden almacenable"
+
+#~ msgid "numeric indices"
+#~ msgstr "índices numéricos"
+
+#~ msgid "If Procure method is Make to order and supply method is buy"
+#~ msgstr ""
+#~ "si método de abastecimiento es obtener bajo pedido y método de suministro es "
+#~ "comprar"
+
+#~ msgid "if Product type is Stockable in procurement order"
+#~ msgstr "si el tipo de producto es almacenable en orden de abastecimiento"
+
+#~ msgid "Bill of material revisions"
+#~ msgstr "Revisiones lista de material"
+
+#~ msgid "Planification"
+#~ msgstr "Planificación"
+
+#~ msgid ""
+#~ "Use a phantom bill of material in raw materials lines that have to be "
+#~ "automatically computed in on eproduction order and not one per level.If you "
+#~ "put \"Phantom/Set\" at the root level of a bill of material it is considered "
+#~ "as a set or pack: the products are replaced by the components between the "
+#~ "sale order to the picking without going through the production order.The "
+#~ "normal BoM will generate one production order per BoM level."
+#~ msgstr ""
+#~ "Utilice una lista de materiales fantasma en líneas de materias primas que se "
+#~ "deban calcular automáticamente en una orden de producción y no una por "
+#~ "nivel. Si indica \"Fantasma/Conjunto\" en el nivel raíz de una lista de "
+#~ "materiales es considerada como un conjunto o paquete: Los productos se "
+#~ "reemplazan por los componentes entre el pedido de venta y el empaquetado sin "
+#~ "generar la orden de producción. La LdM normal generará una orden de "
+#~ "producción por nivel de LdM."
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "No se ha definido dirección para el proveedor"
+
+#~ msgid "Your procurement request has been sent !"
+#~ msgstr "¡Su petición de abastecimiento ha sido enviada!"
+
+#~ msgid "Internal Procurement Request"
+#~ msgstr "Solicitud de abastecimiento interna"
+
+#~ msgid "Property Categories"
+#~ msgstr "Categorías de propiedades"
+
+#~ msgid "Compute Procurements Only"
+#~ msgstr "Calcular sólo abastecimientos"
+
+#~ msgid "Temporary Procurement Exceptions"
+#~ msgstr "Excepciones de abastecimiento temporales"
+
+#~ msgid "Confirmed"
+#~ msgstr "Confirmada"
+
+#~ msgid "Parameters"
+#~ msgstr "Parámetros"
+
+#~ msgid "Production workcenters used"
+#~ msgstr "Centros de producción utilizados"
+
+#~ msgid "Workcenters Utilisation"
+#~ msgstr "Utilización del centro de producción"
+
+#~ msgid ""
+#~ "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
+#~ "production."
+#~ msgstr ""
+#~ "Eficiencia en la producción. Un factor de 0.9 significa una pérdida del 10% "
+#~ "en la producción."
+
+#~ msgid "If procurement is make to order"
+#~ msgstr "si abastecimiento es obtener bajo pedido"
+
+#~ msgid "Minimum Stock Rule"
+#~ msgstr "Regla de stock mínimo"
+
+#~ msgid "New Bill of Materials"
+#~ msgstr "Nueva lista de materiales"
+
+#, python-format
+#~ msgid "Product quantity"
+#~ msgstr "Cantidad producto"
+
+#~ msgid "Property"
+#~ msgstr "Propiedad"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "plus"
+#~ msgstr "más"
+
+#~ msgid "Stockable Product Process"
+#~ msgstr "Proceso producto almacenable"
+
+#~ msgid "New Production Order"
+#~ msgstr "Nueva orden de producción"
+
+#~ msgid "A Request for Quotation is created and sent to the supplier."
+#~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
+
+#~ msgid "Retry"
+#~ msgstr "Volver a intentar"
+
+#~ msgid "When any procuere products, it comes into the prpcurement orders"
+#~ msgstr ""
+#~ "Cuando alguien abastece productos, se convierte en las órdenes de "
+#~ "abastecimiento"
+
+#~ msgid "Production Orders To Start"
+#~ msgstr "Órdenes de producción a iniciar"
+
+#~ msgid "Procurement Reason"
+#~ msgstr "Motivo del abastecimiento"
+
+#~ msgid "An entry is being made from billing material to routing."
+#~ msgstr "Se crea una entrada desde material facturable a proceso productivo."
+
+#~ msgid "The normal working time of the workcenter."
+#~ msgstr "El horario de trabajo normal del centro de producción."
+
+#~ msgid "Order to Max"
+#~ msgstr "Ordenar el máximo"
+
+#~ msgid "In procurement order, if product type is service"
+#~ msgstr "En orden de abastecimiento, si tipo de producto es servicio"
+
+#~ msgid "from stock"
+#~ msgstr "desde stock"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#, python-format
+#~ msgid "TOTAL"
+#~ msgstr "TOTAL"
+
+#~ msgid "Sale Name"
+#~ msgstr "Nombre venta"
+
+#, python-format
+#~ msgid "Product supplier"
+#~ msgstr "Proveedor producto"
+
+#~ msgid "Create minimum stock rules"
+#~ msgstr "Crear reglas de stock mínimo"
+
+#~ msgid "Warehouse"
+#~ msgstr "Almacén"
+
+#~ msgid "Service Product"
+#~ msgstr "Producto servicio"
+
+#~ msgid "Close Move at end"
+#~ msgstr "Movimiento de cierre al final"
+
+#~ msgid "Running"
+#~ msgstr "En proceso"
+
+#~ msgid "Unscheduled procurements"
+#~ msgstr "Abastecimientos no planificados"
+
+#~ msgid "Bill of Material Structure"
+#~ msgstr "Despiece de la lista de materiales"
+
+#~ msgid "Workcenter load"
+#~ msgstr "Carga del centro de producción"
+
+#~ msgid "Procurement Details"
+#~ msgstr "Detalles de abastecimiento"
+
+#~ msgid "You can see its bill of material which are used to make product"
+#~ msgstr ""
+#~ "Puede ver su lista de material que se utiliza para fabricar el producto"
+
+#~ msgid "Bill of Materials Components"
+#~ msgstr "Componentes de la lista de materiales"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Aviso!"
+
+#, python-format
+#~ msgid ""
+#~ "The production is in \"%s\" state. You can not change the production "
+#~ "quantity anymore"
+#~ msgstr ""
+#~ "La producción está en estado \"%s\". Ya no puede cambiar la cantidad a "
+#~ "producir."
+
+#~ msgid "Production Workcenters"
+#~ msgstr "Centros de producción"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "The list of operations (list of workcenters) to produce the finished "
+#~ "product. The routing is mainly used to compute workcenter costs during "
+#~ "operations and to plan futur loads on workcenters based on production "
+#~ "plannification."
+#~ msgstr ""
+#~ "La lista de operaciones (lista de centros de producción) para producir el "
+#~ "producto terminado. La ruta se utiliza principalmente para calcular los "
+#~ "costes de los centros de producción durante la fabricación y para prever "
+#~ "futuras cargas de los centros de producción a partir de la planificación de "
+#~ "la producción."
+
+#~ msgid "Workcenter Usage"
+#~ msgstr "Uso centro de producción"
+
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr ""
+#~ "La ruta indica todos los centros de producción utilizados, por cuánto tiempo "
+#~ "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 ""
+#~ "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 ""
+#~ "El número de operaciones de este centro de trabajo se puede hacer en "
+#~ "paralelo. Si este centro de trabajo representa un equipo del 5 trabajadores, "
+#~ "la capacidad por ciclo es de 5."
+
+#~ msgid ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr ""
+#~ "Descripción del centro de trabajo. Explique aquí lo que es un ciclo de "
+#~ "acuerdo con este centro de trabajo."
+
+#~ msgid "Specify Cost of Work center per cycle."
+#~ msgstr "Especificar costes del centro de trabajo por ciclo."
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and work center integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    Dashboard provided by this module::\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out picking)\n"
+#~ "    * Graph of work center load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Este es el módulo base para gestionar los procesos de fabricación en "
+#~ "OpenERP.\n"
+#~ "\n"
+#~ "    Características:\n"
+#~ "    *Obtener para stock / Obtener bajo pedido (por línea)\n"
+#~ "    *BoMs multi-niveles, sin límite\n"
+#~ "    *Ubicaciones multi-nivel, sin límite\n"
+#~ "    *Ubicaciones y centros de trabajo integrados con la contabilidad "
+#~ "analítica\n"
+#~ "    *Ejecución periódica del cálculo de la planificación / Módulo 'Just In "
+#~ "Time'\n"
+#~ "    *Multi-pv, multi-almacén\n"
+#~ "    *Diferentes políticas de pedido\n"
+#~ "    *Método de coste por producto: precio estándar, precio medio\n"
+#~ "    *Fácil análisis de problemas o necesidades\n"
+#~ "    *Muy flexible\n"
+#~ "    *Permite inspeccionar la estructura completa de Facturas de Materiales\n"
+#~ "        que incluyen BoMs hijas y fantasmas\n"
+#~ "    Soporta integración y planificación de mercancías almacenables,\n"
+#~ "    y consumo de servicios. Los servicios se integran completamente con el "
+#~ "resto\n"
+#~ "    de la aplicación. Por ejemplo, se puede establecer una servicio de "
+#~ "subcontratación\n"
+#~ "    en una BoM para encargar automáticamente el montaje de su producción.\n"
+#~ "\n"
+#~ "    Los informes que facilita este módulo:\n"
+#~ "    *Componentes y estructura de la BoMs\n"
+#~ "    *Previsión de carga de los centros de trabajo\n"
+#~ "    *Previsión de almacén\n"
+#~ "    Tableros proporcionados en este módulo:\n"
+#~ "    *Lista de órdenes de producción próximas\n"
+#~ "    *Lista de entregas\n"
+#~ "    *Gráfico de carga del centro de trabajo\n"
+#~ "    *Lista de órdenes de fabricación con excepciones\n"
+#~ "    "
diff --git a/addons/mrp/i18n/es_VE.po b/addons/mrp/i18n/es_VE.po
new file mode 100644
index 00000000000..4504a8e2f95
--- /dev/null
+++ b/addons/mrp/i18n/es_VE.po
@@ -0,0 +1,3428 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* mrp
+#
+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-03-12 16:35+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 04:59+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Movimientos creados"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+"Las órdenes de fabricación suelen ser propuestas automáticamente por OpenERP "
+"en base a la lista de materiales y las reglas de abastecimiento, pero "
+"también puede crear órdenes de fabricación manualmente. OpenERP controlará "
+"el consumo de las materias primas (disminución de stock) y la producción de "
+"los productos terminados (aumento de stock) cuando se procese la orden."
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr "Ubicación donde el sistema buscará los componentes."
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr "Utilización del centro de producción"
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr "Ruta de centros de producción"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:mrp.module_meta_information
+msgid "Manufacturing Resource Planning"
+msgstr "Planificación de recursos de fabricación (MRP)"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr "Núm. de ciclos"
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr "Número de ciclos"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
+"La 'regla de stock mínimo' permite al sistema de crear órdenes  de "
+"abasteciemiento automáticamente cuando el stock mínimo es alcanzado"
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+#: field:mrp.production.order,picking_id:0
+msgid "Picking list"
+msgstr "Albarán"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Hourly Cost"
+msgstr "Coste horario"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cost Price per Uom"
+msgstr "Precio de coste pour Udm"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr "Productos de desecho"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,day:0
+msgid "Day"
+msgstr "Día"
+
+#. 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 "Procesos productivos"
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr "Producto centro de producción"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr "Buscar lista de materiales"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr "Para productos almacenables y consumibles"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr "A producir"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr ""
+"Número de iteraciones que debe realizar este centro de producción en la "
+"operación indicada de la ruta."
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr "Productos finalizados"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr "A comprar"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Raw Material Location"
+msgstr "Ubicación de materias primas"
+
+#. module: mrp
+#: help:mrp.installer,mrp_operations:0
+msgid ""
+"Enhances production orders with readiness states as well as the start date "
+"and end date of execution of the order."
+msgstr ""
+"Mejora las órdenes de producción con los estados de preparación, así como la "
+"fecha de inicio y final de la ejecución de la orden."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+"El sistema crea automáticamente una petición de presupuesto al proveedor "
+"preferido."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr "Productos a terminar"
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr "Conjunto / Paquete"
+
+#. module: mrp
+#: field:mrp.installer,mrp_subproduct:0
+msgid "MRP Subproducts"
+msgstr "Subproductos MRP"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "Coste por hora"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+"En caso de que el método de suministro del producto es Producir, el sistema "
+"crea una orden de producción."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "Ctdad producto"
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+msgstr ""
+"Introduzca este producto para realizar fácilmente un seguimiento de sus "
+"costes de producción en la contabilidad analítica."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+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.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr "Cuenta ciclo"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Cost"
+msgstr "Coste del trabajo"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr "["
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr "Abastecimiento de servicios"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr "Información de capacidad"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr "Ubicación destino"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr "Datos principales"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+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 ""
+"El sistema espera a que los productos estén disponibles en el stock. Estos "
+"productos suelen ser adquiridos de forma manual o a través de una regla de "
+"stock mínimo."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr "Ref. empresa"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr "Cantidad en horas"
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr "Bienes planificados"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr "Conjuntos / Fantasma"
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr "Referencia a una ubicación en una plan. externa"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: mrp
+#: 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: mrp
+#: model:ir.model,name:mrp.model_mrp_production_order
+msgid "Production Order Report"
+msgstr "Informe de órden de producción"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr "Producir producto"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:177
+#, python-format
+msgid "Components Cost of "
+msgstr "Coste de los componentes de "
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr "Abastecimiento de producto almacenable"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr "Nº de horas"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr "Confirmar producción"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+"El sistema crea una orden (de producción o de compra) en función de la "
+"cantidad vendida y los parámetros de los productos."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
+"Esto se utiliza en caso de un servicio sin ningún tipo de impacto en el "
+"sistema, una sesión de formación, por ejemplo."
+
+#. module: mrp
+#: field:mrp.installer,mrp_repair:0
+msgid "Repairs"
+msgstr "Reparaciones"
+
+#. module: mrp
+#: field:mrp.installer,stock_location:0
+msgid "Advanced Routes"
+msgstr "Rutas avanzadas"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr "Horario trabajo"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr "Variación del valor del stock semanal"
+
+#. module: mrp
+#: help:mrp.installer,mrp_repair:0
+msgid ""
+"Enables warranty and repair management (and their impact on stocks and "
+"invoicing)."
+msgstr ""
+"Activa la garantía y la gestión de reparaciones (y su impacto sobre stocks y "
+"facturación)"
+
+#. module: mrp
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,date_planned:0
+msgid "Scheduled Date"
+msgstr "Fecha programada"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr "Lista de Material"
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+"Dejarlo vacío si se produce en el mismo lugar en que los productos acabados "
+"son necesarios. Indique una ubicación si se produce en una ubicación fija. "
+"Puede ser una ubicación de otra empresa si subcontrata las operaciones de "
+"fabricación."
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr "Variación del valor de stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr "Estructura lista de materiales"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr "Producto de tipo servicio"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+"Definir grupos específicos de propiedad que se pueden asignar a las "
+"propiedades de su lista de materiales."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr "Descomposición fabricación"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct1
+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
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+"Rellenarlo sólo si desea crear entradas automáticas de contabilidad "
+"analítica según órdenes de producción."
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr "Nº de ciclos"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr "Solicitud de presupuesto."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+"La lista de materiales está vinculada a una ruta, es decir, la sucesión de "
+"centros de producción."
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr "Ubicación de producción"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr "Cambiar Ctd."
+
+#. module: mrp
+#: view:mrp.production:0
+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"
+msgstr "Valor del stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr "Estructura LdM del producto"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr "Buscar producción"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr "Precio proveedor por UdM"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr "Estructura LdM"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Picking Exception"
+msgstr "Excepción albarán"
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr "Líneas de las listas de materiales"
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr "Tiempo antes producción"
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr "Ruta del material"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,consumed_products:0
+msgid "Consumed Products"
+msgstr "Productos consumidos"
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "¡Error! No puede crear Listas de Material recursivas."
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr "Carga centro de producción"
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr "¡No se ha definido LdM para este producto!"
+
+#. 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 "Componentes de lista de materiales"
+
+#. module: mrp
+#: field:mrp.production.order,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"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."
+msgstr ""
+"Lista de las operaciones (lista de los centros de trabajo) para producir los "
+"productos acabados. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones y planificar la carga "
+"en el futuro en los centros de trabajo basada en la planificación de "
+"producción."
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr "Tiempo en horas para realizar un ciclo."
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr "Ref LdM"
+
+#. module: mrp
+#: view:mrp.production:0
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "In Production"
+msgstr "En producción"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr "Lista de materiales maestra"
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+"UdV del producto (Unidad de Venta) es la unidad de medida para la "
+"facturación y la promoción de existencias."
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:150
+#: code:addons/mrp/report/price.py:201
+#, python-format
+msgid "Total Cost of "
+msgstr "Coste total de "
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr "Vinculado al método de abastecimiento 'Regla de stock mínimo'."
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr "Por mes"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr "No se puede encontrar la lista de material para el producto"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr "Nombre producto"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+"Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid ""
+"Add more functionalities to the core Manufacturing Application with the "
+"following addons."
+msgstr ""
+"Añada más funcionalidades en el núcleo de la aplicación de fabricación con "
+"los siguientes módulos."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr "Fecha impresión"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr "Petición presupuesto"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr "Regla de abastecimiento"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work center per hour."
+msgstr "Especificar costes del centro de trabajo por hora."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr "Parcial"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr "Centro de producción"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
+"Dependiendo del método elegido para \"suministrar\" del servicio, la orden "
+"de abastecimiento crea una solicitud de presupuesto para un pedido de compra "
+"(subcontratación) o espera hasta que el servicio se realice (= la entrega de "
+"los productos)."
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Órden de producción"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr "Abastecimiento de materias primas"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this work center to achieve the operation of the specified "
+"routing."
+msgstr ""
+"Tiempo en horas para este centro de producción para realizar la operación de "
+"la ruta indicada."
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr "Total ciclos"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+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
+#: field:mrp.production.order,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr "Tipo de lista de materiales"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:47
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+"Abastecimiento '%s' tiene una excepción: 'El producto no tiene LdM definida!'"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr "Núm. de ciclo"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr "Stock mínimo"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr "Carga futura del centro de producción"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product"
+msgstr "Producto almacenable"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Work Center name"
+msgstr "Nombre del centro de producción"
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr "Núm. de horas"
+
+#. module: mrp
+#: field:mrp.installer,mrp_jit:0
+msgid "Just In Time Scheduling"
+msgstr "Planificación 'Just in Time'"
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr "Grupo de propiedad"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr "Plan de producción"
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: mrp
+#: help:mrp.installer,mrp_subproduct:0
+msgid ""
+"Enables multiple product output from a single production order: without "
+"this, a production order can have only one output product."
+msgstr ""
+"Habilita la salida de múltiples productos de una sola orden de producción: "
+"sin ello, una orden de producción sólo puede tener un producto de salida."
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+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 ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+"Si el servicio tiene un método de suministro 'Comprar', se crea una "
+"solicitud de presupuesto, por ejemplo, una petición de subcontratación."
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr "Movimiento producto"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr "Obtener para stock"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing work centers."
+msgstr ""
+"Proporciona el orden de secuencias cuando se muestra una lista de "
+"enrutamiento de los centros de trabajo."
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr "Nombre LdM"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr "Empezar producción"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr "Tablero de producción"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr "Ubic. orígen"
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr "Referencia interna"
+
+#. module: mrp
+#: help:mrp.installer,stock_location:0
+msgid ""
+"Manages product routes and paths within and between locations (e.g. "
+"warehouses)."
+msgstr ""
+"Gestiona las rutas y caminos de los productos dentro y entre las ubicaciones "
+"(por ejemplo, almacenes)."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr "Estructura de producto"
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "MRP Application Configuration"
+msgstr "Configuración aplicación MRP"
+
+#. module: mrp
+#: help:mrp.installer,mrp_jit:0
+msgid ""
+"Enables Just In Time computation of procurement orders.\n"
+"\n"
+"While it's more resource intensive than the default setup, the JIT computer "
+"avoids having to wait for the procurement scheduler to run or having to run "
+"the procurement scheduler manually."
+msgstr ""
+"Permite el cálculo de las órdenes de abastecimiento justo a tiempo (Just In "
+"Time).\n"
+"\n"
+"Si bien consume más recursos que la configuración predeterminada, el cálculo "
+"JIT evita tener que esperar a que se ejecute el planificador de "
+"abastecimientos o tener que ejecutar el planificador de abastecimientos de "
+"forma manual."
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr "Modo"
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr "]"
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr "Importe unidad de medida"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
+msgstr ""
+"Las órdenes de fabricación describen las operaciones que deben ser "
+"realizadas y las materias primas necesarias para cada etapa de fabricación. "
+"Utilice las especificaciones (listas de materiales o LdM) para obtener las "
+"necesidades de materias primas y las órdenes de fabricación necesarias para "
+"los productos finales. Una vez las listas de materiales hayan sido "
+"definidas, OpenERP es capz de decidir automáticamente al ruta de fabricación "
+"en función de las necesidades de la compañía."
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡Cantidad ordenada no puede ser negativa o cero!"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr "Órdenes de producción en progreso"
+
+#. module: mrp
+#: model:ir.module.module,description:mrp.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the manufacturing process in OpenERP.\n"
+"\n"
+"    Features:\n"
+"    * Make to Stock / Make to Order (by line)\n"
+"    * Multi-level BoMs, no limit\n"
+"    * Multi-level routing, no limit\n"
+"    * Routing and work center integrated with analytic accounting\n"
+"    * Scheduler computation periodically / Just In Time module\n"
+"    * Multi-pos, multi-warehouse\n"
+"    * Different reordering policies\n"
+"    * Cost method by product: standard price, average price\n"
+"    * Easy analysis of troubles or needs\n"
+"    * Very flexible\n"
+"    * Allows to browse Bill of Materials in complete structure\n"
+"        that include child and phantom BoMs\n"
+"    It supports complete integration and planification of stockable goods,\n"
+"    consumable of services. Services are completely integrated with the "
+"rest\n"
+"    of the software. For instance, you can set up a sub-contracting service\n"
+"    in a BoM to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"    Reports provided by this module:\n"
+"    * Bill of Material structure and components\n"
+"    * Load forecast on Work Centers\n"
+"    * Print a production order\n"
+"    * Stock forecasts\n"
+"    Dashboard provided by this module::\n"
+"    * List of next production orders\n"
+"    * List of deliveries (out picking)\n"
+"    * Graph of work center load\n"
+"    * List of procurement in exception\n"
+"    "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr "Órdenes de producción en espera de productos"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:121
+#, python-format
+msgid "Cycles Cost"
+msgstr "Coste ciclos"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr "Valor en ciclos"
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,location_dest_id:0
+msgid "Finished Products Location"
+msgstr "Ubicación productos finalizados"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr "Centros de producción"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr "Por semana"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"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."
+msgstr ""
+"Las rutas le permiten crear y gestionar las operaciones de fabricación a "
+"realizar en sus centros de producción para fabricar un producto. Están "
+"relacionadas con las listas de materiales que definirán las materias primas "
+"necesarias."
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr "Núm. de hora"
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr "Operaciones del centro de producción"
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: field:mrp.production.order,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr "Seleccionar unidad de tiempo"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr "Carga centro de producción"
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr "Ubicación donde el sistema almacenará los productos finalizados."
+
+#. 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 ""
+"Este es el albarán interno que trae el producto terminado hacia el plan de "
+"producción."
+
+#. module: mrp
+#: field:stock.change.standard.price,change_parent_price:0
+msgid "Change Parent Price"
+msgstr "Cambiar precio padre"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+"La regla de stock mínimo es una regla de abastecimiento automático basado en "
+"una cantidad mínima y máxima. Está disponible en el menú de gestión de "
+"inventario y configurable por producto."
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr "Día por día"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr "Revisiones"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure Your Manufacturing Resource Planning Application"
+msgstr ""
+"Configure su aplicación de planificación de recursos de fabricación (MRP)"
+
+#. module: mrp
+#: field:mrp.production,priority:0
+#: field:mrp.production.order,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:924
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr "Órden de producción '%s' planificada para el '%s'"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr "Núm. orden producción :"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:640
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr "Orden fabricación '%s' está preparada para producir."
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr "Fabricación planificada producto"
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr "Días de seguridad para cada operación de fabricación."
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Make to Stock"
+msgstr "Obtener para stock"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
+msgstr ""
+"Las listas de materiales maestras le permiten crear y gestionar la lista de "
+"las materias primas necesarias utilizadas para fabricar un producto acabado. "
+"OpenERP utilizará estas LdMs para proponer automáticamente órdenes de "
+"fabricación en función de las necesidades de producto. Puede crear una lista "
+"de materiales para definir los pasos de producción o definir una única lista "
+"de materiales multi-nivel."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
+"En caso de que el método de suministro del producto se Compra, el sistema "
+"crea un pedido de compra."
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
+msgid "Product Cost Structure"
+msgstr "Estructura de los costes del producto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Components suppliers"
+msgstr "Proveedores de componentes"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_installer
+msgid "mrp.installer"
+msgstr "mrp.instalador"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr "Centros de trabajo de producción"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:62
+#, python-format
+msgid "Active Id is not found"
+msgstr "ID activo no se encuentra"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr "Buscar por centro de producción mrp"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr "Despiece de la LdM"
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+#: field:mrp.production.order,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr "Cuenta horas"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr "Ubic. destino"
+
+#. module: mrp
+#: field:mrp.production.order,product_id2:0
+msgid "Product Consumed"
+msgstr "Producto consumido"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Abastecer productos"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr "Cargas centro de producción"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+"Referencia al documento que generó esta solicitud de orden de producción."
+
+#. module: mrp
+#: 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
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr "Información extra"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr "Cambiar cantidad de productos"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr "Guía las órdenes de abastecimiento para materias primas."
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr "Número venta"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_change_standard_price
+msgid "Change Standard Price"
+msgstr "Cambio de precio estándar"
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "No urgente"
+
+#. module: mrp
+#: help:stock.change.standard.price,change_parent_price:0
+msgid ""
+"This will change the price of parent products also according to the BoM "
+"structure specified for the product."
+msgstr ""
+"Esto cambiará el precio de los productos padre de acuerdo a la estructura de "
+"la lista de materiales del producto."
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr "Órdenes de producción a iniciar"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:495
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
+msgstr ""
+"¡No se puede eliminar orden(es) de producción que están en estado %s!"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr "Centro de producción"
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr "Capacidad por ciclo"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_id:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+#: field:mrp.production.order,location_src_id:0
+msgid "Raw Materials Location"
+msgstr "Ubicación materias primas"
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr "Imprimir la estructura de costes del producto"
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr "UdV del producto"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units consisting "
+"of one or more persons and/or machines that can be considered as a unit for "
+"capacity and planning forecasting."
+msgstr ""
+"Los centros de trabajo le permiten crear y administrar unidades de "
+"producción que consisten en una o más personas y / o máquinas que se pueden "
+"considerar como una unidad para la capacidad de planificación y previsión."
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr "Consumir productos"
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.order,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
+#: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
+msgid "Production Analysis"
+msgstr "Análisis de producción"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:349
+#, python-format
+msgid "Copy"
+msgstr "Copiar"
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr "Productos producidos"
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+#: field:mrp.production.order,date_finished:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+"Validez de esta LdM o componente. Dejarlo vacío si siempre es válido."
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "#Line Orders"
+msgstr "Nº línea órdenes"
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Very Urgent"
+msgstr "Muy urgente"
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"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."
+msgstr ""
+"La lista de operaciones (lista de los centros de trabajo) para producir los "
+"productos terminados. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones de carga y planificar "
+"el futuro en los centros de trabajo basado en la planificación de la "
+"producción."
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr "Categorías de propiedades"
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de órdenes de "
+"trabajo."
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr "Productos planificados"
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr "Consumición de productos producidos"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr "Órdenes de producción"
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
+"El modo 'Sólo consumir' sólo se consumen los productos con la cantidad "
+"seleccionada.\n"
+"El modo 'Consumo y Producción' se consumen y también se producen los "
+"productos con la cantidad seleccionada y finalizará la orden de producción "
+"cuando el total de las cantidades solicitadas se han producido."
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr "Coste por ciclo"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr "Servicio"
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "BOM"
+msgstr "LdM"
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+"UdM(Unidad de medida) es la unidad de medida para el control de inventario"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+"La lista de materiales es la composición del producto. Los componentes (que "
+"son también productos) pueden tener sus propias listas de materiales (multi-"
+"nivel)."
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr "Tiempo para 1 ciclo (horas)"
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr "Orden de producción"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr "Regla de abastecimiento automática"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr "Calcular datos"
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr "Cant. UdV del producto"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr "Componentes"
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr "Despiece de la LdM"
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr "Válido hasta"
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr "Válido desde"
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr "LdM normal"
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr "Tiempo entrega de fabricación"
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr "Ctdad UdV producto"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+"La variación semanal del valor del stock permite realizar un seguimiento de "
+"la evolución del valor del stock relativo a las actividades de fabricacion, "
+"recepciónd de productos y ordenes de entrega."
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr "Eficiencia de la producción"
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar las listas de material sin "
+"eliminarlas."
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr "Redondeo del producto"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr "Orden de trabajo"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+"Estos informes le permiten analizar sus actividad productiva y su "
+"rendimiento."
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr "Consumir únicamente"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr "Volver a crear albarán"
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"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. 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."
+msgstr ""
+"Si un sub-producto se utiliza en varios productos, puede ser útil crear su "
+"propia lista de materiales. Aunque si no quiere órdenes de producción "
+"separadas para este sub-producto, seleccione Conjunto/Fantasma como tipo de "
+"LdM. Si una LdM fantasma se utiliza para un producto raíz, será vendida y "
+"enviada como un conjunto de componentes, en vez de ser producida."
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr "Método"
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"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'.       "
+"                             \n"
+"If 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'."
+msgstr ""
+"Cuando se crea la orden de fabricación su estado es fijado a \"Borrador\"\n"
+" Si la orden está confirmdada, el estado es fijado a \"Esperando "
+"mercancía\"\n"
+" Si existe alguna excepción, el estado es fijado a \"Excepcion de "
+"abastecimiento\"\n"
+"Si el stock está disponible, el estado es fijado a \"Listo para producir\"\n"
+" Cuando la fabricación comienza, el estado es fijado a \"En producción\"\n"
+" Cuando la fabricación finaliza, el estado es fijado a \"Realizado\""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr "En orden"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr "Tiempo después producción"
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr "Tipo de período"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr "Ctdad total"
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr "Número de horas"
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr "Información de costes"
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr "Órdenes de abastecimiento"
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr "Redondeo aplicado sobre la cantidad de producto"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Asignación desde producción o pedido de compra."
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr "Proceso productivo padre"
+
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr "Tiempo en horas para la configuración."
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: mrp
+#: field:mrp.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. 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
+msgid "Stock value variation"
+msgstr "Variación del valor del stock"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr "Asignación desde stock."
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+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
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: mrp
+#: field:mrp.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr "Etapas de producción."
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:136
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
+#, python-format
+msgid "Cost Structure"
+msgstr "Estructura de costes"
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr "Consumir y Producir"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr "Lista de materiales (LdM) padre"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
+msgstr ""
+"Los componente de listas de materiales son componentes y sub-productos "
+"utilizados para crear listas de materiales maestras. Utilice este menú para "
+"buscar en qué LdM es utilizado un componente específico."
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr "Tipo de producto es almacenable o consumible."
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:595
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr "Seleccionar cantidad"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr "Lista de materiales (LdM)"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
+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
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr "Producciones"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:194
+#, python-format
+msgid "Work Cost of "
+msgstr "Coste trabajo de "
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: field:mrp.production.order,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr "Proceso productivo"
+
+#. module: mrp
+#: field:mrp.installer,mrp_operations:0
+msgid "Manufacturing Operations"
+msgstr "Operaciones de producción"
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr "Fecha planificada"
+
+#. module: mrp
+#: 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: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the the needs."
+msgstr ""
+"Las propiedades en OpenERP se utilizan para seleccionar la correcta lista de "
+"materiales para la fabricación de uno de los productos cuando se tienen "
+"diferentes formas de fabricar el mismo producto. Puede asignar varias "
+"propiedades para cada lista de materiales. Cuando un vendedor crea un pedido "
+"de cliente, él puede relacionarlo con varias propiedades y OpenERP "
+"seleccionará automáticamente la lista de materiales para utilizar según las "
+"necesidades."
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr "Producción"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "Abastecimientos en excepción"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr "material 'regla stock mínimo'"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr "Precio del producto"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_installer
+msgid "MRP Applications Configuration"
+msgstr "Configuración de las aplicaciónes MRP"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr "Cambiar cantidad"
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+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
+#: selection:mrp.production.order,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr "Tablero fabricación"
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr "Fecha de fin planificada"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+"Las cargas de los centros de producción muestran un pronóstico de la carga "
+"de los centros de producción respecto a un periodo determinado. Está "
+"expresado en número de horas y ciclos de máquina relacionados."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr "La forma de abastecer depende del tipo de producto."
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr "Fabricación"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr "Próximas órdenes de producción"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr "Grupos de propiedades"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+"Dependiendo del método elegido para suministrar los productos almacenables, "
+"la orden de abastecimiento crea una petición de presupuesto, una orden de "
+"producción, ... "
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr "Tiempo en horas para la limpieza."
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr "Petición de presupuesto automática"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+"Si el servicio tiene un método de suministro 'Producir', se crea una tarea "
+"en el módulo de gestión de proyectos de OpenERP."
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
+"Para poder suministrar materias primas (que deben ser compradas o "
+"producidas), la orden de producción genera tantas órdenes de abastecimiento "
+"como componentes figuren en la lista de materiales, a través de una "
+"ejecución de las planificaciones (MRP)."
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+"Indique la cantidad de productos a producir o comprar. El informe de la "
+"estructura de costes se muestra basándose en esta cantidad."
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr "En stock"
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr "Ausencias recursos"
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de listas de "
+"materiales."
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,products_to_consume:0
+msgid "Products to Consume"
+msgstr "Productos a consumir"
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,year:0
+msgid "Year"
+msgstr "Año"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid ""
+#~ "Triggers an automatic procurement for all products that have a virtual stock "
+#~ "under 0. You should probably not use this option, we suggest using a MTO "
+#~ "configuration on products."
+#~ msgstr ""
+#~ "Dispara un abastecimiento automático para todos los productos que tienen un "
+#~ "stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
+#~ "sugerimos utilizar una configuración de MTO en productos."
+
+#~ msgid "Compute Stock Minimum Rules Only"
+#~ msgstr "Calcular sólo reglas de stock mínimo"
+
+#~ msgid "Exceptions Procurements"
+#~ msgstr "Excepciones de abastecimientos"
+
+#~ msgid "UoS Quantity"
+#~ msgstr "Cantidad UdV"
+
+#~ msgid "Routing Workcenters"
+#~ msgstr "Procesos productivos de los centros de producción"
+
+#~ msgid "Not used in computations, for information purpose only."
+#~ msgstr "No utilizado en cálculos, sólo con la finalidad de informar."
+
+#~ msgid "Packing list"
+#~ msgstr "Albarán"
+
+#~ msgid "Stockable Stock"
+#~ msgstr "Stock productos almacenables"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Automatic orderpoint"
+#~ msgstr "Generación de orden automática"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "¡No se ha definido un proveedor para este producto!"
+
+#, python-format
+#~ msgid "Product name"
+#~ msgstr "Nombre producto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Éstos son los días añadidos a los que promete a los clientes por razones de "
+#~ "seguridad"
+
+#~ msgid "Best price (not yet active!)"
+#~ msgstr "Mejor precio (aún no activo!)"
+
+#~ msgid "Product & Location"
+#~ msgstr "Producto & Ubicación"
+
+#~ msgid "MRP & Logistic Scheduler"
+#~ msgstr "Planificador MRP & Logística"
+
+#~ msgid ""
+#~ "Number of operation this workcenter can do in parallel. If this workcenter "
+#~ "represent a team of 5 workers, the capacity per cycle is 5."
+#~ msgstr ""
+#~ "Número de operaciones que este centro de producción puede realizar en "
+#~ "paralelo. Si este centro de producción tuviera un equipo de 5 trabajadores, "
+#~ "la capacidad por ciclo sería de 5."
+
+#~ msgid "Ask New Products"
+#~ msgstr "Solicitar nuevos productos"
+
+#~ msgid "Automatic Procurements"
+#~ msgstr "Abastecimientos automáticos"
+
+#~ msgid "Products Consummed"
+#~ msgstr "Productos consumidos"
+
+#~ msgid "Packing Exception"
+#~ msgstr "Excepción de empaquetado"
+
+#~ msgid "A purchase order is created for a sub-contracting demand."
+#~ msgstr "Una orden de compra es creada para sub-contratar la demanda."
+
+#~ msgid "Analytic Accounting"
+#~ msgstr "Contabilidad analítica"
+
+#~ msgid "Do nothing"
+#~ msgstr "No hacer nada"
+
+#, python-format
+#~ msgid "products"
+#~ msgstr "productos"
+
+#~ msgid "If the stock of a product is under 0, it will act like an orderpoint"
+#~ msgstr "Si el stock de un producto es menor que 0, actuará como una orden"
+
+#~ msgid "you can see the minimum stock rules from product"
+#~ msgstr "puede ver las reglas de stock mínimo desde producto"
+
+#~ msgid "This wizard will schedule procurements."
+#~ msgstr "Este asistente planificará abastecimientos."
+
+#~ msgid "Internal Ref."
+#~ msgstr "Ref. interna"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Stockable Production Order"
+#~ msgstr "Orden producción almacenable"
+
+#~ msgid "Stockable Request"
+#~ msgstr "Solicitud almacenable"
+
+#, python-format
+#~ msgid "Workcenter name"
+#~ msgstr "Nombre centro de producción"
+
+#~ msgid "Service on Order"
+#~ msgstr "Servicio sobre orden"
+
+#~ msgid ""
+#~ "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
+#~ "procurement to bring the virtual stock to the Max Quantity."
+#~ msgstr ""
+#~ "Cuando el stock virtual disminuye por debajo de la cantidad mínima, OpenERP "
+#~ "genera un abastecimiento para que el stock virtual sea la cantidad máxima."
+
+#~ msgid "Stockable Make to Stock"
+#~ msgstr "Almacenable obtenido para stock"
+
+#~ msgid "Production Orders"
+#~ msgstr "Órdenes de producción"
+
+#~ msgid "Procure Service Product"
+#~ msgstr "Abastecer producto servicio"
+
+#, python-format
+#~ msgid "Product Quantity"
+#~ msgstr "Cantidad producto"
+
+#~ msgid "Procurements"
+#~ msgstr "Abastecimientos"
+
+#~ msgid "Production scheduled products"
+#~ msgstr "Producción planificada de productos"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Procurement Process"
+#~ msgstr "Proceso de abastecimiento"
+
+#, python-format
+#~ msgid "Product Standard Price"
+#~ msgstr "Precio estándar producto"
+
+#~ msgid ""
+#~ "Rounding applied on the product quantity. For integer only values, put 1.0"
+#~ msgstr ""
+#~ "Redondeo aplicado a la cantidad de producto. Para valores siempre enteros "
+#~ "introduzca 1.0"
+
+#~ msgid "Reservation"
+#~ msgstr "Reserva"
+
+#~ msgid "product"
+#~ msgstr "producto"
+
+#~ msgid "max"
+#~ msgstr "máx"
+
+#~ msgid "Product to stock rules"
+#~ msgstr "Producto a reglas de stock"
+
+#, python-format
+#~ msgid "from stock: products assigned."
+#~ msgstr "desde stock: productos asignados."
+
+#~ msgid "Print product price"
+#~ msgstr "Imprimir coste del producto"
+
+#~ msgid "Make Procurement"
+#~ msgstr "Realizar abastecimiento"
+
+#~ 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 "
+#~ "producir"
+
+#~ msgid "Purchase Lead Time"
+#~ msgstr "Plazo de tiempo de compra"
+
+#~ msgid "Stockable Product Stock"
+#~ msgstr "Stock de producto almacenable"
+
+#~ msgid "Production Procure Products"
+#~ msgstr "Productos para abastecer la producción"
+
+#~ msgid "Service Product Process"
+#~ msgstr "Proceso producto de servicios"
+
+#~ msgid "Procurement convert into the draft purchase order."
+#~ msgstr "Abastecimiento se convierte en la orden de compra borrador."
+
+#~ msgid "Latest error"
+#~ msgstr "Último error"
+
+#, python-format
+#~ msgid "from stock and no minimum orderpoint rule defined"
+#~ msgstr "desde stock y no se ha definido regla mínima generación orden"
+
+#~ msgid "Routing workcenter usage"
+#~ msgstr "Procesos productivos del centro de producción"
+
+#~ msgid "If Product type is Stockable and procure method is make to stock"
+#~ msgstr ""
+#~ "Si el tipo de producto es almacenable y el método de abastecimiento es "
+#~ "obtener para stock"
+
+#~ msgid "Manufacturity Lead Time"
+#~ msgstr "Plazo de entrega de fabricación"
+
+#~ msgid "Exceptions Procurements to Fix"
+#~ msgstr "Excepciones de abastecimientos a corregir"
+
+#~ msgid "Workcenter Operations"
+#~ msgstr "Operaciones del centro de producción"
+
+#~ msgid "Production Orders Planning"
+#~ msgstr "Planificación órdenes de producción"
+
+#~ msgid "Factor that multiplies all times expressed in the workcenter."
+#~ msgstr ""
+#~ "Factor que multiplica todos los tiempos expresados en el centro de "
+#~ "producción."
+
+#~ msgid ""
+#~ "This is the internal picking list take bring the raw materials to the "
+#~ "production plan."
+#~ msgstr ""
+#~ "Ésta es la lista de empaquetado interna que lleva las materias primas a la "
+#~ "producción planificada."
+
+#~ msgid "Qty Multiple"
+#~ msgstr "Ctdad múltiple"
+
+#~ msgid "Waiting"
+#~ msgstr "En espera"
+
+#~ msgid "For stockable and consumable"
+#~ msgstr "Para almacenables y consumibles"
+
+#~ msgid "indice type"
+#~ msgstr "Tipo de índice"
+
+#, python-format
+#~ msgid "Hours Cost"
+#~ msgstr "Coste horas"
+
+#~ msgid "Production orders are created for the product manufacturing."
+#~ msgstr "Se crean órdenes de producción para la fabricación del producto."
+
+#~ msgid "Min Quantity"
+#~ msgstr "Cantidad mín"
+
+#~ msgid "Production orders"
+#~ msgstr "Órdenes de producción"
+
+#~ msgid "BoM Hyerarchy"
+#~ msgstr "Jerarquía LdM"
+
+#~ msgid "Procurement Lines"
+#~ msgstr "Líneas de abastecimiento"
+
+#~ msgid "If Product type is service and procure method is Make to stock"
+#~ msgstr ""
+#~ "si el tipo de producto es servicio y el método de abastecimiento es obtener "
+#~ "para stock"
+
+#~ msgid "If Product type is service"
+#~ msgstr "Si el tipo de producto es servicio"
+
+#, python-format
+#~ msgid "SUBTOTAL"
+#~ msgstr "SUBTOTAL"
+
+#~ msgid "Security Days"
+#~ msgstr "Días de seguridad"
+
+#~ msgid "Exception"
+#~ msgstr "Excepción"
+
+#~ msgid ""
+#~ "This wizard will planify the procurement for this product. This procurement "
+#~ "may generate task, production orders or purchase orders."
+#~ msgstr ""
+#~ "Este asistente planificará el abastecimiento para este producto. El "
+#~ "abastecimiento puede generar tareas, órdenes de producción o órdenes de "
+#~ "compra."
+
+#~ msgid "The system waits for requested products in stock."
+#~ msgstr "El sistema espera los productos solicitados en stock."
+
+#~ msgid "Serivce Stockable Order"
+#~ msgstr "Orden servicio almacenable"
+
+#~ msgid "From minimum stock rules, it goes for procure product."
+#~ msgstr "Desde reglas de stock mínimo, va a abastecer el producto."
+
+#~ msgid "Production done"
+#~ msgstr "Producción realizada"
+
+#, python-format
+#~ msgid "Unit Product Price"
+#~ msgstr "Precio producto unidad"
+
+#~ msgid "References"
+#~ msgstr "Referencias"
+
+#~ msgid "Machine"
+#~ msgstr "Fabricación"
+
+#~ msgid "Workcenter Name"
+#~ msgstr "Nombre centro de producción"
+
+#~ msgid "min"
+#~ msgstr "mín"
+
+#~ msgid ""
+#~ "Description of the workcenter. Explain here what's a cycle according to this "
+#~ "workcenter."
+#~ msgstr ""
+#~ "Descripción del centro de producción. Describa aquí que es un ciclo según "
+#~ "este centro de producción."
+
+#~ msgid "Human Resource"
+#~ msgstr "Recurso humano"
+
+#~ msgid "Workcenters"
+#~ msgstr "Centros de producción"
+
+#~ msgid "on order"
+#~ msgstr "bajo pedido"
+
+#~ msgid "Compute All Schedulers"
+#~ msgstr "Calcular todas las planificaciones"
+
+#~ msgid "Create Procurement"
+#~ msgstr "Crear abastecimiento"
+
+#, python-format
+#~ msgid "Product uom"
+#~ msgstr "UdM producto"
+
+#~ msgid "Number of Cycle"
+#~ msgstr "Número de ciclos"
+
+#~ msgid "Run procurement"
+#~ msgstr "Ejecutar abastecimiento"
+
+#~ msgid ""
+#~ "This is the time frame analysed by the scheduler when computing "
+#~ "procurements. All procurement that are not between today and today+range are "
+#~ "skipped for futur computation."
+#~ msgstr ""
+#~ "Éste es el intervalo temporal analizado por el planificador al calcular "
+#~ "abastecimientos. Todos los abastecimientos que no estén entre hoy y "
+#~ "hoy+intervalo son omitidos para el cálculos futuros."
+
+#~ msgid "Time Efficiency"
+#~ msgstr "Eficiencia temporal"
+
+#~ msgid "Scheduler Parameters"
+#~ msgstr "Parámetros del planificador"
+
+#~ msgid "A cycle is defined in the workcenter definition."
+#~ msgstr "En la definición de un centro de producción se define un ciclo."
+
+#~ msgid "Unit of Measure"
+#~ msgstr "Unidad de medida"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Compute Procurements"
+#~ msgstr "Calcular abastecimientos"
+
+#~ msgid "Wait for available products for reservation"
+#~ msgstr "Esperar productos disponibles para reservarlos"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Procurement Purchase"
+#~ msgstr "Compra de abastecimiento"
+
+#~ msgid "Number of products to produce"
+#~ msgstr "Número de productos a producir"
+
+#~ msgid "Material routing"
+#~ msgstr "Procesos productivos del material"
+
+#~ msgid "Minimum stock rule"
+#~ msgstr "Regla de stock mínimo"
+
+#~ msgid "Product Efficiency"
+#~ msgstr "Eficiencia del producto"
+
+#~ msgid "Orderpoint minimum rule"
+#~ msgstr "Regla mínima generación orden"
+
+#~ msgid "Service Make to Stock"
+#~ msgstr "Servicio obtener para stock"
+
+#~ msgid "Sale Ref"
+#~ msgstr "Ref. venta"
+
+#~ msgid "Location"
+#~ msgstr "Ubicación"
+
+#~ msgid "New Procurement"
+#~ msgstr "Nuevo abastecimiento"
+
+#~ msgid "Tool"
+#~ msgstr "Maquinaria"
+
+#~ msgid ""
+#~ "Location where the system will look for products used in raw materials."
+#~ msgstr ""
+#~ "Ubicación donde el sistema buscará productos utilizados en las materias "
+#~ "primas."
+
+#~ msgid "Planned Date"
+#~ msgstr "Fecha prevista"
+
+#~ msgid "Procurement orders"
+#~ msgstr "Órdenes de abastecimiento"
+
+#~ msgid "If product type is service and procure method is Make to order"
+#~ msgstr ""
+#~ "si el tipo de producto es servicio y el método de abastecimiento es obtener "
+#~ "bajo pedido"
+
+#~ msgid "Scheduler Range"
+#~ msgstr "Margen planificador"
+
+#~ msgid "Max Quantity"
+#~ msgstr "Cantidad máx"
+
+#~ msgid "Minimum Stock Procure"
+#~ msgstr "Abastecer stock mínimo"
+
+#~ msgid "This is the leads/security time for each purchase order."
+#~ msgstr "Éste es el plazo/seguridad de tiempo para cada orden de compra."
+
+#~ msgid "alphabetical indices"
+#~ msgstr "índices alfabéticos"
+
+#~ msgid "Procurement for raw materials."
+#~ msgstr "Abastecimiento para materia primas."
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid "Procure Stockable Product"
+#~ msgstr "Abastecimiento producto almacenable"
+
+#~ msgid "Paid ?"
+#~ msgstr "¿Pagado?"
+
+#~ msgid "Define a routing to describe the manufacturing steps."
+#~ msgstr ""
+#~ "Definir un proceso productivo para describir los pasos de fabricación"
+
+#~ msgid "Define the product structure, with sub-products and/or components."
+#~ msgstr ""
+#~ "Definir la estructura del producto, con subproductos y/o componentes."
+
+#~ msgid ""
+#~ "Procurement is created if the product quantity is lower than the minimum "
+#~ "limit."
+#~ msgstr ""
+#~ "Se crea el abastecimiento si la cantidad de producto es menor que el límite "
+#~ "mínimo."
+
+#~ msgid "Date Closed"
+#~ msgstr "Fecha de cierre"
+
+#~ msgid "Properties composition"
+#~ msgstr "Composición de propiedades"
+
+#~ msgid "Production Orders Waiting Products"
+#~ msgstr "Órdenes de producción esperando productos"
+
+#~ msgid "Change Product Qty."
+#~ msgstr "Cambiar Ctd. producto"
+
+#~ msgid "The procurement quantity will by rounded up to this multiple."
+#~ msgstr "La cantidad abastecida será redondeada hacia arriba a este múltiplo."
+
+#~ msgid "Reordering Mode"
+#~ msgstr "Modo de pedir de nuevo"
+
+#~ 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 "Central document to procure products"
+#~ msgstr "Documento central para abastecer productos"
+
+#~ msgid "Production Orders in Progress"
+#~ msgstr "Órdenes de producción en proceso"
+
+#~ msgid "Minimum Stock Rules"
+#~ msgstr "Reglas de stock mínimo"
+
+#~ msgid ""
+#~ "Reference of the document that created this procurement.\n"
+#~ "This is automatically completed by Open ERP."
+#~ msgstr ""
+#~ "Referencia del documento que ha creado este abastecimiento.\n"
+#~ "Éste es completado automáticamente por OpenERP."
+
+#~ msgid "Product type is Stockable and procure method is make to stock"
+#~ msgstr ""
+#~ "Tipo de producto es almacenable y método de abastecimiento es obtener para "
+#~ "stock"
+
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producto"
+
+#~ msgid "Workcenter"
+#~ msgstr "Centro de producción"
+
+#~ msgid "Purchase Order"
+#~ msgstr "Orden de compra"
+
+#~ msgid ""
+#~ "If you encode manually a procurement, you probably want to use a make to "
+#~ "order method."
+#~ msgstr ""
+#~ "Si codifica manualmente un abastecimiento, probablemente desea usar un "
+#~ "método obtener bajo pedido."
+
+#~ msgid "Stockable Order Request"
+#~ msgstr "Solicitud orden almacenable"
+
+#~ msgid "numeric indices"
+#~ msgstr "índices numéricos"
+
+#~ msgid "If Procure method is Make to order and supply method is buy"
+#~ msgstr ""
+#~ "si método de abastecimiento es obtener bajo pedido y método de suministro es "
+#~ "comprar"
+
+#~ msgid "if Product type is Stockable in procurement order"
+#~ msgstr "si el tipo de producto es almacenable en orden de abastecimiento"
+
+#~ msgid "Bill of material revisions"
+#~ msgstr "Revisiones lista de material"
+
+#~ msgid "Planification"
+#~ msgstr "Planificación"
+
+#~ msgid ""
+#~ "Use a phantom bill of material in raw materials lines that have to be "
+#~ "automatically computed in on eproduction order and not one per level.If you "
+#~ "put \"Phantom/Set\" at the root level of a bill of material it is considered "
+#~ "as a set or pack: the products are replaced by the components between the "
+#~ "sale order to the picking without going through the production order.The "
+#~ "normal BoM will generate one production order per BoM level."
+#~ msgstr ""
+#~ "Utilice una lista de materiales fantasma en líneas de materias primas que se "
+#~ "deban calcular automáticamente en una orden de producción y no una por "
+#~ "nivel. Si indica \"Fantasma/Conjunto\" en el nivel raíz de una lista de "
+#~ "materiales es considerada como un conjunto o paquete: Los productos se "
+#~ "reemplazan por los componentes entre el pedido de venta y el empaquetado sin "
+#~ "generar la orden de producción. La LdM normal generará una orden de "
+#~ "producción por nivel de LdM."
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "No se ha definido dirección para el proveedor"
+
+#~ msgid "Your procurement request has been sent !"
+#~ msgstr "¡Su petición de abastecimiento ha sido enviada!"
+
+#~ msgid "Internal Procurement Request"
+#~ msgstr "Solicitud de abastecimiento interna"
+
+#~ msgid "Property Categories"
+#~ msgstr "Categorías de propiedades"
+
+#~ msgid "Compute Procurements Only"
+#~ msgstr "Calcular sólo abastecimientos"
+
+#~ msgid "Temporary Procurement Exceptions"
+#~ msgstr "Excepciones de abastecimiento temporales"
+
+#~ msgid "Confirmed"
+#~ msgstr "Confirmada"
+
+#~ msgid "Parameters"
+#~ msgstr "Parámetros"
+
+#~ msgid "Production workcenters used"
+#~ msgstr "Centros de producción utilizados"
+
+#~ msgid "Workcenters Utilisation"
+#~ msgstr "Utilización del centro de producción"
+
+#~ msgid ""
+#~ "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
+#~ "production."
+#~ msgstr ""
+#~ "Eficiencia en la producción. Un factor de 0.9 significa una pérdida del 10% "
+#~ "en la producción."
+
+#~ msgid "If procurement is make to order"
+#~ msgstr "si abastecimiento es obtener bajo pedido"
+
+#~ msgid "Minimum Stock Rule"
+#~ msgstr "Regla de stock mínimo"
+
+#~ msgid "New Bill of Materials"
+#~ msgstr "Nueva lista de materiales"
+
+#, python-format
+#~ msgid "Product quantity"
+#~ msgstr "Cantidad producto"
+
+#~ msgid "Property"
+#~ msgstr "Propiedad"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "plus"
+#~ msgstr "más"
+
+#~ msgid "Stockable Product Process"
+#~ msgstr "Proceso producto almacenable"
+
+#~ msgid "New Production Order"
+#~ msgstr "Nueva orden de producción"
+
+#~ msgid "A Request for Quotation is created and sent to the supplier."
+#~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
+
+#~ msgid "Retry"
+#~ msgstr "Volver a intentar"
+
+#~ msgid "When any procuere products, it comes into the prpcurement orders"
+#~ msgstr ""
+#~ "Cuando alguien abastece productos, se convierte en las órdenes de "
+#~ "abastecimiento"
+
+#~ msgid "Production Orders To Start"
+#~ msgstr "Órdenes de producción a iniciar"
+
+#~ msgid "Procurement Reason"
+#~ msgstr "Motivo del abastecimiento"
+
+#~ msgid "An entry is being made from billing material to routing."
+#~ msgstr "Se crea una entrada desde material facturable a proceso productivo."
+
+#~ msgid "The normal working time of the workcenter."
+#~ msgstr "El horario de trabajo normal del centro de producción."
+
+#~ msgid "Order to Max"
+#~ msgstr "Ordenar el máximo"
+
+#~ msgid "In procurement order, if product type is service"
+#~ msgstr "En orden de abastecimiento, si tipo de producto es servicio"
+
+#~ msgid "from stock"
+#~ msgstr "desde stock"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#, python-format
+#~ msgid "TOTAL"
+#~ msgstr "TOTAL"
+
+#~ msgid "Sale Name"
+#~ msgstr "Nombre venta"
+
+#, python-format
+#~ msgid "Product supplier"
+#~ msgstr "Proveedor producto"
+
+#~ msgid "Create minimum stock rules"
+#~ msgstr "Crear reglas de stock mínimo"
+
+#~ msgid "Warehouse"
+#~ msgstr "Almacén"
+
+#~ msgid "Service Product"
+#~ msgstr "Producto servicio"
+
+#~ msgid "Close Move at end"
+#~ msgstr "Movimiento de cierre al final"
+
+#~ msgid "Running"
+#~ msgstr "En proceso"
+
+#~ msgid "Unscheduled procurements"
+#~ msgstr "Abastecimientos no planificados"
+
+#~ msgid "Bill of Material Structure"
+#~ msgstr "Despiece de la lista de materiales"
+
+#~ msgid "Workcenter load"
+#~ msgstr "Carga del centro de producción"
+
+#~ msgid "Procurement Details"
+#~ msgstr "Detalles de abastecimiento"
+
+#~ msgid "You can see its bill of material which are used to make product"
+#~ msgstr ""
+#~ "Puede ver su lista de material que se utiliza para fabricar el producto"
+
+#~ msgid "Bill of Materials Components"
+#~ msgstr "Componentes de la lista de materiales"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Aviso!"
+
+#, python-format
+#~ msgid ""
+#~ "The production is in \"%s\" state. You can not change the production "
+#~ "quantity anymore"
+#~ msgstr ""
+#~ "La producción está en estado \"%s\". Ya no puede cambiar la cantidad a "
+#~ "producir."
+
+#~ msgid "Production Workcenters"
+#~ msgstr "Centros de producción"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "The list of operations (list of workcenters) to produce the finished "
+#~ "product. The routing is mainly used to compute workcenter costs during "
+#~ "operations and to plan futur loads on workcenters based on production "
+#~ "plannification."
+#~ msgstr ""
+#~ "La lista de operaciones (lista de centros de producción) para producir el "
+#~ "producto terminado. La ruta se utiliza principalmente para calcular los "
+#~ "costes de los centros de producción durante la fabricación y para prever "
+#~ "futuras cargas de los centros de producción a partir de la planificación de "
+#~ "la producción."
+
+#~ msgid "Workcenter Usage"
+#~ msgstr "Uso centro de producción"
+
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr ""
+#~ "La ruta indica todos los centros de producción utilizados, por cuánto tiempo "
+#~ "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 ""
+#~ "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 ""
+#~ "El número de operaciones de este centro de trabajo se puede hacer en "
+#~ "paralelo. Si este centro de trabajo representa un equipo del 5 trabajadores, "
+#~ "la capacidad por ciclo es de 5."
+
+#~ msgid ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr ""
+#~ "Descripción del centro de trabajo. Explique aquí lo que es un ciclo de "
+#~ "acuerdo con este centro de trabajo."
+
+#~ msgid "Specify Cost of Work center per cycle."
+#~ msgstr "Especificar costes del centro de trabajo por ciclo."
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and work center integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    Dashboard provided by this module::\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out picking)\n"
+#~ "    * Graph of work center load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Este es el módulo base para gestionar los procesos de fabricación en "
+#~ "OpenERP.\n"
+#~ "\n"
+#~ "    Características:\n"
+#~ "    *Obtener para stock / Obtener bajo pedido (por línea)\n"
+#~ "    *BoMs multi-niveles, sin límite\n"
+#~ "    *Ubicaciones multi-nivel, sin límite\n"
+#~ "    *Ubicaciones y centros de trabajo integrados con la contabilidad "
+#~ "analítica\n"
+#~ "    *Ejecución periódica del cálculo de la planificación / Módulo 'Just In "
+#~ "Time'\n"
+#~ "    *Multi-pv, multi-almacén\n"
+#~ "    *Diferentes políticas de pedido\n"
+#~ "    *Método de coste por producto: precio estándar, precio medio\n"
+#~ "    *Fácil análisis de problemas o necesidades\n"
+#~ "    *Muy flexible\n"
+#~ "    *Permite inspeccionar la estructura completa de Facturas de Materiales\n"
+#~ "        que incluyen BoMs hijas y fantasmas\n"
+#~ "    Soporta integración y planificación de mercancías almacenables,\n"
+#~ "    y consumo de servicios. Los servicios se integran completamente con el "
+#~ "resto\n"
+#~ "    de la aplicación. Por ejemplo, se puede establecer una servicio de "
+#~ "subcontratación\n"
+#~ "    en una BoM para encargar automáticamente el montaje de su producción.\n"
+#~ "\n"
+#~ "    Los informes que facilita este módulo:\n"
+#~ "    *Componentes y estructura de la BoMs\n"
+#~ "    *Previsión de carga de los centros de trabajo\n"
+#~ "    *Previsión de almacén\n"
+#~ "    Tableros proporcionados en este módulo:\n"
+#~ "    *Lista de órdenes de producción próximas\n"
+#~ "    *Lista de entregas\n"
+#~ "    *Gráfico de carga del centro de trabajo\n"
+#~ "    *Lista de órdenes de fabricación con excepciones\n"
+#~ "    "
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index f2492566a77..8e2648993cb 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr "Kuus"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr "Toote nimi"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Vigane tegevus !"
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr "tootmiskorralduse N° :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2674,15 +2674,3 @@ msgstr ""
 
 #~ msgid "Workcenter load"
 #~ msgstr "Töökeskonna koormus"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Töökeskkonna koormus"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Töökeskkonna Koormus"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "TVP haldus - Aruandlus"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Töökeskuse Koormused"
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index d9f2b7e7e08..78a0b3583b9 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -45,7 +45,7 @@ msgstr "Varastopaikka, mistä järjestelmä etsii komponetit."
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr ""
+msgstr "Työpisteiden käyttöaste"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -65,7 +65,7 @@ msgstr "Kiertojen määrä"
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
-msgstr ""
+msgstr "Syklien lukumäärä"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -114,7 +114,7 @@ msgstr "Reititykset"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Työpisteen tuote"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -124,12 +124,12 @@ msgstr "Etsi osaluettelo"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Varastoitaville tuotteille ja käyttötavaroille"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "Tuotetaan"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -137,6 +137,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Kierrosten määrä joka työpisteen pitää tehdä suorittaakseen määritellyn "
+"toiminnon reitityksessä"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -155,7 +157,7 @@ msgstr "Valmiit tuotteet"
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr ""
+msgstr "Ostettava"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -168,6 +170,8 @@ msgid ""
 "Enhances production orders with readiness states as well as the start date "
 "and end date of execution of the order."
 msgstr ""
+"Parantaa tuotantotilauksia valmiusasteiden tilamerkinnöillä ja aloitus sekä "
+"lopetuspäivillä"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -178,7 +182,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Viimeisteltävät tuotteet"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -188,7 +192,7 @@ msgstr "Sarja / Pakkaus"
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
-msgstr ""
+msgstr "MRP alatuotteet"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -232,11 +236,13 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Täytä tämä tuote seurataksesi helposti tuotantokustannuksia analyyttisessä "
+"kirjanpidossa"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr ""
+msgstr "Ostettaville materiaaleille"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -346,7 +352,7 @@ msgstr "Kesäkuu"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Valmista tuote"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -357,7 +363,7 @@ msgstr "Lokakuu"
 #: code:addons/mrp/report/price.py:177
 #, python-format
 msgid "Components Cost of "
-msgstr ""
+msgstr "Komponenttien hinta "
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -403,6 +409,8 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"Tätä käytetään palveluiden yhteydessä jotka eivät vaikuta järjestelmään, "
+"esim. opetustilanteissa."
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
@@ -412,7 +420,7 @@ msgstr "Korjaukset"
 #. module: mrp
 #: field:mrp.installer,stock_location:0
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Kehittyneet reitit"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -430,6 +438,8 @@ msgid ""
 "Enables warranty and repair management (and their impact on stocks and "
 "invoicing)."
 msgstr ""
+"Mahdollistaa takuu ja korjaushallinnan (ja näiden vaikutuksen varastoihin ja "
+"laskutukseen)."
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -475,6 +485,8 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bill of materials."
 msgstr ""
+"Määrittele eritykset ominaisuusryhmät joita voidaan asettaa osaluetteloille "
+"(bom)."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -484,7 +496,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
+msgstr "Palveluille"
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -504,7 +516,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr ""
+msgstr "Syklien määrä"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
@@ -517,7 +529,7 @@ msgstr "Tarjouspyyntö"
 msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
-msgstr ""
+msgstr "BOM on linkitetty reititykseen, eli työpisteiden järjestykseen"
 
 #. module: mrp
 #: constraint:product.product:0
@@ -558,7 +570,7 @@ msgstr "Tuotteen osaluettelon rakenne"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr ""
+msgstr "Hae tuotannosta"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -611,11 +623,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"Jos kentän arvo on epätosi (false), sallii reitityksen piilottamisen ilman "
+"sen poistamista"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Materiaalien reititys"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -657,7 +671,7 @@ msgstr "Rivien lukumäärä"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr ""
+msgstr "Suunnittelu"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -681,7 +695,7 @@ msgstr "Yhden kierron kesto tunneissa."
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "BOM viite"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -702,6 +716,8 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"Tuotteen myyntierä (uos) on yksikkömääritelmä laskutusta ja varastointia "
+"varten."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -720,12 +736,12 @@ msgstr "Tyyppi"
 #: code:addons/mrp/report/price.py:201
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "Kokonaiskustannus "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Linkitetty 'minimivarasto sääntö' toimitus metodiin"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -733,7 +749,7 @@ msgid "Per month"
 msgstr "Kuukaudessa"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -746,7 +762,7 @@ msgid "Product Name"
 msgstr "Tuotteen nimi"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Virheellinen toiminto!"
@@ -762,6 +778,7 @@ msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
 msgstr ""
+"Lisää uusia toimintoja perus valmistus ohjelmistoon seuraavilla lisäosilla."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -834,6 +851,8 @@ msgid ""
 "Time in hours for this work center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Tämän työpisteen käyttämä tuntimäärä reitityksen vaatiman toiminnon "
+"suorittamiseen."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -868,7 +887,7 @@ msgstr "Osalistan tyyppi"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:47
@@ -876,12 +895,13 @@ msgstr ""
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
+"Hankinnalla '%s' on poikkeus: 'BoM:ia ei ole määritelty tuotteelle !'"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: view:mrp.property:0
 msgid "Search"
-msgstr ""
+msgstr "Hae"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -935,7 +955,7 @@ msgstr "Tuntimäärä"
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "Just in time ajoitus (JIT)"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -957,7 +977,7 @@ msgstr "Valmistussuunnitelma"
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Inactive"
-msgstr ""
+msgstr "Passiivinen"
 
 #. module: mrp
 #: help:mrp.installer,mrp_subproduct:0
@@ -980,7 +1000,7 @@ msgstr "Peruuta"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "Jaa tuotantoeriin"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -995,6 +1015,8 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Jos palvelulla on 'osta' hankintametodi, tämä luo hankintaehdotuksen, esim. "
+"alihankintatarpeen."
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -1004,7 +1026,7 @@ msgstr "Siirrä tuote"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr ""
+msgstr "Myöhässä"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -1016,6 +1038,7 @@ msgstr "Valmista varastoon"
 msgid ""
 "Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
+"Antaa järjestysnumeron kun näytetään lista reititettävistä työpisteistä."
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1036,7 +1059,7 @@ msgstr "Tuotannon Työtila"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Alkuperäinen sijainti"
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -1049,6 +1072,8 @@ msgid ""
 "Manages product routes and paths within and between locations (e.g. "
 "warehouses)."
 msgstr ""
+"Hallitsee tuotteiden reittejä paikkojen sisällä ja niiden välissä (esim. "
+"varastot)"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
@@ -1067,7 +1092,7 @@ msgstr "Nimi"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "MRP ohjelman konfiguraatio"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1082,7 +1107,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Toimintatapa"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1157,7 +1182,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr ""
+msgstr "Valmistustilaukset odottavat tuotteita"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1190,7 +1215,7 @@ msgstr "Valmiiden tuotteiden paikka"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr ""
+msgstr "Resurssit"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1226,7 +1251,7 @@ msgstr "Tuntinumero"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr ""
+msgstr "Työpisteen toiminnot"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1263,11 +1288,12 @@ msgid ""
 "This is the internal picking list that brings the finished product to the "
 "production plan"
 msgstr ""
+"Tämä on sisäinen keräilyslista joka tuo lopputuotteen tuontatosuunnitelmaan"
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
 msgid "Change Parent Price"
-msgstr ""
+msgstr "Muuta ylemmän tason tuotteen hintaa"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
@@ -1298,7 +1324,7 @@ msgstr "Revisiot"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
-msgstr ""
+msgstr "Määrittele valmistuksen suunnitteluohjelmasi (MRP)"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1314,13 +1340,13 @@ msgstr "Keräilylista"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "edellinen kk"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
-msgstr ""
+msgstr "Valmistustilaus '%s' on aikataulutettu '%s':lle."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1328,7 +1354,7 @@ msgid "Production Order N° :"
 msgstr "Tuotantotilaus nro:"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Valmistustilaus '%s'on valmis tuotantoon."
@@ -1336,7 +1362,7 @@ msgstr "Valmistustilaus '%s'on valmis tuotantoon."
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Tuotannon aikataulutettu tuote"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1399,7 +1425,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Tuotannon työpoisteet"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1411,12 +1437,12 @@ msgstr "Kuukausi"
 #: code:addons/mrp/wizard/change_production_qty.py:62
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "Aktiivisia tunnisteita (id) ei löydy"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Etsi valmistuksen MRP työpisteitä"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1437,17 +1463,17 @@ msgstr "Tuntitili"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Kohdepaikka"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
 msgid "Product Consumed"
-msgstr ""
+msgstr "Tuote käytetty"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottava"
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1490,6 +1516,8 @@ msgid ""
 "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
 #: view:mrp.production:0
@@ -1504,7 +1532,7 @@ msgstr "Muuta tuotteiden määrää"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Ohjaa raaka-aineiden hankintaa."
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1561,7 +1589,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Aloitettavat valmistustilaukset"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr "Valmistustilauksia, jotka ovat %s tilassa, ei voi poistaa!"
@@ -1623,11 +1651,14 @@ msgid ""
 "of one or more persons and/or machines that can be considered as a unit for "
 "capacity and planning forecasting."
 msgstr ""
+"Työpisteet mahdollistavat valmistusyksiköiden luomisen ja hallitsemisen. Ne "
+"voivat muodostua yhdestä tai useammasta henkilöstä ja/tai koneesta joita "
+"käsitellään kapasiteettiyksikkönä ja suunnittelussa sekä ennustamisessa."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Käytä tuotteet"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1648,10 +1679,10 @@ msgstr "Valmista tilaukselle"
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr ""
+msgstr "Tuotannon analyysi"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Kopioi"
@@ -1670,7 +1701,7 @@ msgstr "Lopetuspäivämäärä"
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurssi"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1688,7 +1719,7 @@ msgstr "Tuotteen myyntiyksikkö"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Tilausrivien määrä"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1718,7 +1749,7 @@ msgstr "Ominaisuuksien kategoriat"
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr ""
+msgstr "Antaa järjestyksenä kun näytetään luetteloa työtilauksista"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1787,7 +1818,7 @@ msgstr "Osaluettelo"
 #: help:mrp.bom,product_uom:0
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
-msgstr ""
+msgstr "UoM (määräyksikkö) on varastonhallinnan laskentayksikkö."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1796,6 +1827,8 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"BoM on tuotteen sisällön kuvaus (osaluettelo). Myös sen komponenteilla "
+"(jotka ovat myös tuotteita) voi olla omat osaluettelonsa (monitasoinen..)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1883,6 +1916,9 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"Viikottainen varastonarvon vaihtelu mahdollistaa varaston arvon muutosten "
+"seurannan joka on linkitetty valmistustoimintoihin, vastaanottoihin ja "
+"toimituksiin."
 
 #. module: mrp
 #: view:mrp.product.produce:0
@@ -1892,12 +1928,12 @@ msgstr "Vahvista"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "Valmistustehokkuus"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1905,6 +1941,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"Jos aktiivisen kentän tilaksi asetetaan epätosi (false), se sallii "
+"osaluettelon piilottamisen ilman sen poistamista."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1923,11 +1961,13 @@ msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
 msgstr ""
+"Tämä raportointi auttaa sinua analysoimaan valmistustoimintaa ja sen "
+"tehokkuutta"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Käytä vain"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1995,7 +2035,7 @@ msgstr "Tuntien lukumäärä"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Kustannustiedot"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
@@ -2005,12 +2045,12 @@ msgstr "Hankintatilaukset"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Tuotemäärää on pyöristetty"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Määritys tuotannosta tai ostotilaukselta."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2020,7 +2060,7 @@ msgstr "Ylempi reititys"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2047,13 +2087,13 @@ msgstr "Osaluettelo"
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr ""
+msgstr "Varaston arvon variaatio"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Varastosta otto"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2088,7 +2128,7 @@ msgstr "Viikko"
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -2099,7 +2139,7 @@ msgstr "Normaali"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Valmistusvaiheet"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
@@ -2111,7 +2151,7 @@ msgstr "Kustannusrakenne"
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Käytä ja tuota"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2130,6 +2170,9 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
+"Osaluettelon komponenetit ovat osia tai alatuotteita joista osaluettelo "
+"(bom) muodostuu. Käytä tätä valikkoa etsiäksesi mitä osaluetteloa käytetään "
+"tietylle komponentille."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2139,10 +2182,10 @@ msgstr "Tammikuu"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Tuotetyyppi on varastoitava tai käytettävä"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2190,7 +2233,7 @@ msgstr "Tuotannot"
 #: code:addons/mrp/report/price.py:194
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Työn kustannukset "
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -2245,12 +2288,12 @@ msgstr "Tuotanto"
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Poikkeavat hankinnat"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "'Minimivarasto' säännön mukaiset materiaalit"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
@@ -2260,7 +2303,7 @@ msgstr "Tuotteen hinta"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
 msgid "MRP Applications Configuration"
-msgstr ""
+msgstr "MRP ohjelmien konfigurointi"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
@@ -2299,7 +2342,7 @@ msgstr "Toukokuu"
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Valmistuksen työpöytä"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
@@ -2313,11 +2356,14 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Työpisteiden kuormistus antaa käsityksen työpisteiden kuormitustilanteesta "
+"valitulla ajanjaksolla. Se kerrotaan tuntimäärinä ja koneisiin liittyvinä "
+"työkertojen määrinä."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Hankintatapa riippuu tuotteen tyypistä"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2338,7 +2384,7 @@ msgstr "Helmikuu"
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Omaisuusryhmät"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2360,7 +2406,7 @@ msgstr "Siivoukseen kuluva aika tunneissa."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Automaattinen tarjouspyyntö"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2368,6 +2414,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Jos palvelulla on 'valmista' toimitustapa, tämä luo tehtävän OpenERPin "
+"projektinhallintamoduuliin."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2402,7 +2450,7 @@ msgstr "Sarja"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Resurssin lomat"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
@@ -2504,9 +2552,6 @@ msgstr "Vuosi"
 #~ msgid "Max Quantity"
 #~ msgstr "Maksimimäärä"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Hankintapyyntö"
-
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "Varaston minimihankinta"
 
@@ -2546,9 +2591,6 @@ msgstr "Vuosi"
 #~ msgid "Service Product"
 #~ msgstr "Palvelutuote"
 
-#~ msgid "Scheduled End"
-#~ msgstr "Ajoitettu loppu"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
@@ -3164,5 +3206,29 @@ msgstr "Vuosi"
 #~ msgstr ""
 #~ "Paikka josta järjestelmä etsii tuotteita joita on käytetty raaka-aineissa."
 
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "Tuotanto- ja logistiikka-aikataulut"
+#~ msgid "Specify Cost of Work center per cycle."
+#~ msgstr "Määrittele työpisteen kulut sykliä kohden"
+
+#~ msgid "Workcenter Usage"
+#~ msgstr "Työpisteen käyttöaste"
+
+#~ 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 ""
+#~ "Työpisteen suorittavien rinnakkaisten tehtävien lukumäärä. Jos työpisteen "
+#~ "henkilöstö on 5 työntekijää, kapasiteetti sykliä kohti on 5."
+
+#~ msgid ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr "Työpisteen kuvaus. Kuvaa tähän mikä on työpisteen työnkulku."
+
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr ""
+#~ "Reititys kertoo käytetyt työpisteet, kestoajat ja työkertojen määrät. Jos "
+#~ "reititys on määritelty, niin kolmas alasivu tuotantotilauksissa (työpisteet) "
+#~ "esitäytetään automaattisesti."
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index fe37da84f0d..884c885b019 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-05-24 16:08+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2011-09-26 12:16+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: 2011-05-25 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -91,8 +91,8 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
-"La \"règle de stock minimum\" permet au système d'enregistrer "
-"automatiquement les besoins dès que le stock minimum est atteint."
+"La \"règle de stock minimum\" permet au système de créer automatiquement les "
+"approvisionnements dès que le stock minimum est atteint."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
@@ -232,8 +232,8 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
-"Dans le cas où la méthode d'approvisionnement de ce produit est Produire, le "
-"système crée un ordre de fabrication"
+"Dans le cas où la méthode de fourniture de ce produit est \"Produire\", le "
+"système crée un ordre de fabrication."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -293,7 +293,7 @@ msgstr "["
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr "Besoin de services"
+msgstr "Approvisionnement de services"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -322,8 +322,8 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 "Le système attend que les produits soient disponibles en stock. Typiquement, "
-"les besoins en ces produits sont traités manuellement ou avec une règle de "
-"stock minimum."
+"les approvisionnements de ces produits sont traités manuellement ou avec une "
+"règle de stock minimum."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -389,7 +389,7 @@ msgstr "Coût des composants de "
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr "Besoin de produit stocké"
+msgstr "Approvisionnement de produit stocké"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -621,7 +621,7 @@ msgstr "Fabriquer"
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "Précisez le coût du poste de charge par cycle"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -806,7 +806,7 @@ msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
 msgstr ""
-"Ajouter plus de fonctionnalités au module de production de bases grâce à ces "
+"Ajouter plus de fonctionnalités au module de production de base grâce à ces "
 "différents modules"
 
 #. module: mrp
@@ -852,9 +852,9 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
-"En fonction de la méthode choisie pour \"l'approvisionnement\" du service, "
-"le besoin va générer un appel d'offres pour une commande de sous-traitance, "
-"ou va attendre jusqu'à ce que le service soit effectué (= la livraison des "
+"En fonction de la méthode de fourniture du service, l'approvisionnement va "
+"générer un appel d'offres pour une commande de sous-traitance, ou va "
+"attendre jusqu'à ce que le service soit effectué (= la livraison des "
 "produits)."
 
 #. module: mrp
@@ -866,7 +866,7 @@ msgstr "Urgent"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "Utilisation du poste de charge"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -876,7 +876,7 @@ msgstr "Ordre de fabrication"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
-msgstr "Besoin de matière première"
+msgstr "Approvisionnement de matière première"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,hour_nbr:0
@@ -1043,6 +1043,9 @@ 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 ""
+"Nombre d'opérations simultanées que ce poste de charge peut réaliser. Si ce "
+"poste de charge représente une équipe de 5 personnes, la capacité par cycle "
+"est de 5."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -1050,8 +1053,8 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
-"Si la méthode d'approvisionnement du service est \"Acheter\", ceci va créer "
-"un appel d'offres, par exemple une demande de sous-traitance."
+"Si la méthode de fourniture du service est \"Acheter\", ceci va créer un "
+"appel d'offres, par exemple une demande de sous-traitance."
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -1066,7 +1069,7 @@ msgstr "En retard"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr "Sur stock"
+msgstr "Production sur stock"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
@@ -1139,7 +1142,7 @@ msgid ""
 "avoids having to wait for the procurement scheduler to run or having to run "
 "the procurement scheduler manually."
 msgstr ""
-"Permet le calcul en Juste-à-temps des besoins.\n"
+"Permet le calcul en Juste-à-temps des approvisionnements.\n"
 "\n"
 "Bien que cela soit plus gourmand en ressources que le fonctionnement "
 "standard, le calcul en Juste-à-Temps permet d'éviter d'attendre l'activation "
@@ -1225,6 +1228,41 @@ msgid ""
 "    * List of procurement in exception\n"
 "    "
 msgstr ""
+"\n"
+"    Ceci est la module de base de la gestion de fabrication d'OpenERP.\n"
+"\n"
+"    Fonctionnalités :\n"
+"    * Fabrication pour stockage / Fabrication pour commande (par ligne)\n"
+"    * Nomenclatures multi-niveaux (sans limitations)\n"
+"    * Gammes multi-niveaux (sans limitations)\n"
+"    * Gamme et poste de charge intégrés avec la comptabilité analytique\n"
+"    * Re-planification périodique / module juste à temps\n"
+"    * Multi-points de vente, multi-stocks\n"
+"    * Différentes Stratégies d'ordonnancement\n"
+"    * Méthode des coûts par produit : prix standard , prix moyen\n"
+"    * Analyse facilitée des besoins et des incidents\n"
+"    * Grande flexibilité\n"
+"    * Permet de parcourir la totalité des nomenclatures\n"
+"        y compris les nomenclatures filles et les nomenclatures fantômes\n"
+"    Il intègre complètement la planification des marchandises stockables,\n"
+"    et des services consommables. Les services sont integratés avec le "
+"reste\n"
+"    du logiciel. Par exemple, on peut placer un service dans une "
+"nomenclature\n"
+"    afin de déclencher automatiquement un achat lors d'un ordre de "
+"fabrication.\n"
+"\n"
+"    Rapports fournis par ce module :\n"
+"    * Structure et composants de nomenclature\n"
+"    * Pévision de la charge pour les postes de charge\n"
+"    * Impression des ordres de fabrication\n"
+"    * Prévision des stocks\n"
+"    Tableau de bord de ce module :\n"
+"    * Liste des prochains ordres de production\n"
+"    * Liste des livraisons (en sortie de colisage)\n"
+"    * Graphique de charge des postes de charge\n"
+"    * Liste des approvisionnements en défaut\n"
+"    "
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1359,9 +1397,10 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
-"La règle du stock minimum est une règle de gestion automatique des besoins, "
-"basée sur des quantités minimum et maximum. Cette règle est disponible dans "
-"le menu de gestion des stocks, et paramétrable pour chaque produit."
+"La règle du stock minimum est une règle de gestion automatique des "
+"approvisionnements, basée sur des quantités minimum et maximum. Cette règle "
+"est disponible dans le menu de gestion des stocks, et paramétrable pour "
+"chaque produit."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1455,13 +1494,13 @@ msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
 msgstr ""
-"Dans le cas où la méthode d'approvisionnement est \"Acheter\", le système va "
-"créer un Ordre d'Achat"
+"Dans le cas où la méthode de fourniture est \"Acheter\", le système va créer "
+"un ordre d'achat."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
-msgstr "Besoin"
+msgstr "Approvisionnement"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
@@ -1542,7 +1581,7 @@ msgstr "Actif"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "Satisfaire le besoin de produit"
+msgstr "Approvisionner les produits"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
@@ -1592,7 +1631,7 @@ msgstr "Modifier les quantités de produit"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr "Pilote la gestion des besoins de matières premières"
+msgstr "Pilote la gestion des approvisionnement en matières premières"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1719,7 +1758,7 @@ msgstr "Produits consommés"
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr "Fabrication à la commande"
+msgstr "Production à la demande"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
@@ -1914,7 +1953,7 @@ msgstr "Ordre de Production"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr "Règle de gestion automatique des besoins"
+msgstr "Règle de gestion automatique des approvisionnements"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2110,7 +2149,7 @@ msgstr "Information de coût"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
-msgstr "Besoins"
+msgstr "Ordre d'approvisionnement"
 
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
@@ -2315,6 +2354,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
+"Description du poste de charge. Expliquer ici ce qu'est un cycle pour un tel "
+"poste de charge."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2368,7 +2409,7 @@ msgstr "Production"
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr "Besoins en exception"
+msgstr "Approvisionnements en exception"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
@@ -2443,7 +2484,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr "Le moyen de satisfaire le besoin dépend du type de produit"
+msgstr "Le moyen d’approvisionnement dépend du type de produit"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2477,8 +2518,8 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
-"Selon la méthode d'approvisionnement choisie pour les produits suivis en "
-"stock, le besoin générera un appel d'offres, un ordre de fabrication, ... "
+"Selon la méthode de fourniture choisie pour les produits suivis en stock, "
+"l'approvisionnement générera un appel d'offres, un ordre de fabrication, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2496,8 +2537,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
-"Si la méthode d'approvisionnement du service est \"Produire\", ceci va créer "
-"une tâche dans le module de gestion de projets."
+"Si la méthode de fourniture du service est \"Produire\", ceci va créer une "
+"tâche dans le module de gestion de projets."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2506,9 +2547,9 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
-"Afin de s'approvisionner en matières premières (à acheter ou à fabriquer), "
-"l'ordre de fabrication crée autant de besoins que de composants présents "
-"dans la nomenclature, par le biais des planificateurs (MRP)."
+"Afin de fournir les matières premières (à acheter ou à fabriquer), l'ordre "
+"de fabrication crée autant d'ordres d'approvisionnement que de composants "
+"présents dans la nomenclature, par le biais des planificateurs (MRP)."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -3273,18 +3314,6 @@ msgstr "Année"
 #~ "Si le stock d'un produit est négatif, il est considéré comme un point de "
 #~ "commande"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Demande d'approvisionnement"
-
-#~ msgid "Scheduled End"
-#~ msgstr "Planification terminée"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Charge des centres de travail"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Charges du Centre de Travail"
-
 #~ msgid ""
 #~ "Description of the workcenter. Explain here what's a cycle according to this "
 #~ "workcenter."
@@ -3302,117 +3331,21 @@ msgstr "Année"
 #~ msgid "MRP & Logistic Scheduler"
 #~ msgstr "Planificateur MRP & logistique"
 
-#~ msgid "Number of operations this workcenter can do."
-#~ msgstr "Nombre d'opérations simultanées du poste de charge"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the bills of "
-#~ "material without removing it."
-#~ msgstr ""
-#~ "Si la coche Active est validée, la nomenclature n'est pas visible sans pour "
-#~ "autant la supprimer"
-
-#, python-format
-#~ msgid "Component suppliers"
-#~ msgstr "Fournisseurs de composant"
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Utilisation du poste de charge"
 
-#, python-format
-#~ msgid "Component"
-#~ msgstr "Composant"
-
-#~ msgid ""
-#~ "Number of operations this workcenter can do in parallel. If this workcenter "
-#~ "represents a team of 5 workers, the capacity per cycle is 5."
-#~ msgstr ""
-#~ "Nombre d'opérations que ce poste de charge peut réaliser en parallèle. Si ce "
-#~ "poste de charge représente une équipe de 5 personnes, la capacité par cycle "
-#~ "est de 5."
-
-#~ msgid "Specify Cost of Workcenter per hour."
-#~ msgstr "Précisez le coût horaire du centre de charge"
-
-#~ msgid ""
-#~ "Specify quantity of products to produce or buy. Report of Cost structure "
-#~ "will be displayed base on this qunatity."
-#~ msgstr ""
-#~ "Précisez la quantité de produits à fabriquer ou acheter. Le rapport de la "
-#~ "structure de coût sera affiché en fonction de cette quantité"
-
-#~ msgid "Specify Cost of Workcenter per cycle."
-#~ msgstr "Précisez le coût par cycle du poste de charge"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de menu récursif."
-
 #~ 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 ""
-#~ "Manufacturing Orders are usually proposed automatically by OpenERP based on "
-#~ "the bill of materials and the procurement rules, but you can also create "
-#~ "manufacturing orders manually. OpenERP will handle the consumation of the "
-#~ "raw materials (stock decrease) and the production of the finished products "
-#~ "(stock increase) when the order is processed."
-#~ msgstr ""
-#~ "Les ordres de fabrication sont généralement proposés automatiquemet par "
-#~ "OpenERP selon les nomenclatures et les règles de traitement des besoins, "
-#~ "mais il est également possible d'enregistrer des ordres de fabrication "
-#~ "manuellement.\r\n"
-#~ "OpenERP se chargera de la consommation des matières premières (sortie de "
-#~ "stock) et de la production des produits finis (entrée de stock) quand "
-#~ "l'ordre sera traité."
-
 #~ msgid "A cycle is defined in the workcenter definition."
 #~ msgstr "Un cycle est défini dans la définition du Centre de Production."
 
 #~ msgid "Production Orders To Start"
 #~ msgstr "Ordres de Production pour démarrer"
 
-#~ msgid "Work Centers load"
-#~ msgstr "Occupation des postes de charge"
-
-#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "plannification."
-#~ msgstr ""
-#~ "La liste des opérations (liste des postes de charge) pour fabriquer le "
-#~ "produit fini. La gamme est principalement utilisée pour calculer les coûts "
-#~ "des postes de charges pendant les opérations et pour prévoir l'occupation "
-#~ "des postes de charge en fonction de la planification de la production."
-
-#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan future loads on workcenters based on production "
-#~ "planning."
-#~ msgstr ""
-#~ "La liste des opérations (liste des postes de charge) pour fabriquer le "
-#~ "produit fini. La gamme est principalement utilisée pour calculer les coûts "
-#~ "des postes de charges pendant les opérations et pour prévoir l'occupation "
-#~ "des postes de charge en fonction de la planification de la production."
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Occupation du poste"
-
-#~ msgid ""
-#~ "Gives the sequence order when displaying a list of routing workcenters."
-#~ msgstr "Détermine l'ordre d'affichage des postes de charge d'une gamme."
-
-#~ msgid ""
-#~ "Define specific property groups that can be assigned to the properties of "
-#~ "your bills of materials."
-#~ msgstr ""
-#~ "Défini des groupes de propriétés spécifiques pouvant être assignées aux "
-#~ "propriété de vos nomenclatures."
-
 #~ msgid ""
 #~ "Description of the work center. Explain here what's a cycle according to "
 #~ "this work center."
@@ -3431,6 +3364,15 @@ msgstr "Année"
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Spécifie le coût par cycle d'un poste de charges."
 
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr ""
+#~ "La gamme indique tous les postes de charge utilisés, la durée et/ou le "
+#~ "nombre de cycles. Quand \"Gamme\" est indiqué, le troisième onglet des "
+#~ "ordres de fabrication (postes de charge) est automatiquement pré-rempli."
+
 #~ msgid ""
 #~ "\n"
 #~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
@@ -3472,7 +3414,7 @@ msgstr "Année"
 #~ "fabrication.\n"
 #~ "\n"
 #~ "    Fonctionnalités:\n"
-#~ "    * Fabrication pour stock/ Fabrication à la commande (par ligne)\n"
+#~ "    * Production sur stock / à la demande (par ligne)\n"
 #~ "    * Nomenclatures multi-niveaux, sans limitation\n"
 #~ "    * Gammes multi-niveaux, sans limitation\n"
 #~ "    * Gammes et postes de charge intégrés dans la comptabilité analytique\n"
@@ -3504,12 +3446,3 @@ msgstr "Année"
 #~ "    * Graphique de la charge des postes\n"
 #~ "    * Liste des approvisionnements ayant subit un incident\n"
 #~ "    "
-
-#~ 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) "
-#~ "will be automatically pre-completed."
-#~ msgstr ""
-#~ "La gamme indique tous les postes de charge utilisés, la durée et/ou le "
-#~ "nombre de cycles. Quand \"Gamme\" est indiqué, le troisième onglet des "
-#~ "ordres de fabrication (postes de charge) est automatiquement pré-rempli."
diff --git a/addons/mrp/i18n/gl.po b/addons/mrp/i18n/gl.po
index 5799fdeae1c..3ba7c6c8c85 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: 2011-06-10 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -1456,77 +1456,77 @@ msgstr "Provedores de compoñentes"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
-msgstr ""
+msgstr "mrp.instalador"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Centros de traballo de produción"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:62
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "Non se atopa ningún ID activo"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Buscar por centro de produción mrp"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr ""
+msgstr "Despiece da LdM"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 #: field:mrp.production.order,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de comezo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
-msgstr ""
+msgstr "Conta horas"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Lugar destino"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
 msgid "Product Consumed"
-msgstr ""
+msgstr "Produto consumido"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Abastecer produtos"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Cargas centro de produción"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1537,13 +1537,14 @@ msgstr ""
 #: view:procurement.order:0
 #: field:procurement.order,property_ids:0
 msgid "Properties"
-msgstr ""
+msgstr "Propiedades"
 
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
+"Referencia ó documento que xerou esta solicitude de orde de produción."
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1552,61 +1553,63 @@ msgid ""
 "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
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Información adicional"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Cambiar cantidade de produtos"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Guía as ordes de abastecemento para materias primas."
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Conta xeral"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "SO Number"
-msgstr ""
+msgstr "Número venda"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Feito"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Cambio de prezo estándar"
 
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento orixe"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Non urxente"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1614,17 +1617,20 @@ msgid ""
 "This will change the price of parent products also according to the BoM "
 "structure specified for the product."
 msgstr ""
+"Isto cambiará o prezo dos produtos pai de acordo coa estrutura da lista de "
+"materiais do produto."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr ""
+msgstr "Ordes de produción a iniciar"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
+"Non se pode eliminar a(s) orde(s) de produción que está(n) en estado %s!"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1633,12 +1639,12 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Centro de produción"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
-msgstr ""
+msgstr "Capacidade por ciclo"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_product_product
@@ -1651,30 +1657,30 @@ msgstr ""
 #: field:mrp.production.order,product_id:0
 #: field:mrp.production.product.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total de horas"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 #: field:mrp.production.order,location_src_id:0
 msgid "Raw Materials Location"
-msgstr ""
+msgstr "Lugar materias primas"
 
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Imprimir a estrutura de custos do produto"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "UdV do produto"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -1683,11 +1689,14 @@ msgid ""
 "of one or more persons and/or machines that can be considered as a unit for "
 "capacity and planning forecasting."
 msgstr ""
+"Os centros de traballo permítenlle crear e administrar unidades de produción "
+"que consisten nunha ou máis persoas e/ou máquinas que se poden considerar "
+"como unha unidade para a capacidade de planificación e previsión."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Consumir produtos"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1695,64 +1704,64 @@ msgstr ""
 #: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "UdM do produto"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Fabricado baixo pedido"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr ""
+msgstr "Análise de produción"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Copiar"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
-msgstr ""
+msgstr "Produtos producidos"
 
 #. module: mrp
 #: field:mrp.production,date_finished:0
 #: field:mrp.production.order,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de remate"
 
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurso"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr ""
+msgstr "Validez desta LdM ou compoñente. Se sempre é válido, déixeo baleiro."
 
 #. module: mrp
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "UdV do produto"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Nº liña ordes"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Very Urgent"
-msgstr ""
+msgstr "Moi urxente"
 
 #. module: mrp
 #: help:mrp.bom,routing_id:0
@@ -1762,37 +1771,42 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
+"A lista de operacións (lista dos centros de traballo) para producir os "
+"produtos rematados. A ruta utilízase principalmente para calcular os custos "
+"do centro de traballo durante as operacións de carga e para planificar o "
+"futuro nos centros de traballo baseado na planificación da produción."
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: mrp
 #: view:mrp.property.group:0
 msgid "Properties categories"
-msgstr ""
+msgstr "Categorías das propiedades"
 
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
 msgstr ""
+"Indica a orde de secuencia cando se amosa unha lista de ordes de traballo."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Source Location"
-msgstr ""
+msgstr "Lugar de orixe"
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr ""
+msgstr "Produtos planificados"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr ""
+msgstr "Consumo de produtos producidos"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -1801,7 +1815,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr ""
+msgstr "Ordes de produción"
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1812,40 +1826,45 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"O modo 'Só consumir' consumirá  os produtos coa cantidades seleccionada. O "
+"modo 'Consumo e Produción' consumirá e fabricará os produtos coa cantidade "
+"seleccionada e rematará a orde de produción cando se fabrique o total das "
+"cantidades pedidas."
 
 #. module: mrp
 #: view:mrp.production:0
 #: report:mrp.production.order:0
 msgid "Work Orders"
-msgstr ""
+msgstr "Ordes de traballo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
 msgid "Cost per cycle"
-msgstr ""
+msgstr "Custo por ciclo"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Servizo"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulado"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "BOM"
-msgstr ""
+msgstr "LdM"
 
 #. module: mrp
 #: help:mrp.bom,product_uom:0
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
 msgstr ""
+"UdM (Unidade de medida) é a unidade de medida para o control do inventario"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1854,6 +1873,8 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"A lista de materiais é a composición do produto. Os compoñentes (que son "
+"tamén produtos) poden ter as súas propias listas de materiais (multi-nivel)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1864,12 +1885,12 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr ""
+msgstr "Tempo para 1 ciclo (horas)"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -1878,61 +1899,61 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Orde de produción"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "Regra de abastecemento automática"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
-msgstr ""
+msgstr "Calcular datos"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr ""
+msgstr "Cant. UdV do produto"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "Compoñentes"
 
 #. module: mrp
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr ""
+msgstr "Despezamento da LdM"
 
 #. module: mrp
 #: field:mrp.bom,date_stop:0
 msgid "Valid Until"
-msgstr ""
+msgstr "Valido ata"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
 msgid "Valid From"
-msgstr ""
+msgstr "Válido desde"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr ""
+msgstr "LdM normal"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Tempo de fabricación"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr ""
+msgstr "Ctdade UdV produto"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
@@ -1941,21 +1962,24 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"A variación semanal do valor do stock permite realizar un seguimento da "
+"evolución deste valor relativo ás actividades de fabricacion, á recepción de "
+"produtos e ás ordes de entrega."
 
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "Eficiencia da produción"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Non pode crear compañías recorrentes."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1963,17 +1987,19 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"Se se desmarca o campo activo, permite ocultar as listas de material sen "
+"eliminalas."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr ""
+msgstr "Redondeo do produto"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Orde de traballo"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -1981,16 +2007,18 @@ msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
 msgstr ""
+"Estes informes permítenlle analizar as súas actividades productivas e o seu "
+"rendemento."
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Consumir unicamente"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
-msgstr ""
+msgstr "Volver crear albará"
 
 #. module: mrp
 #: help:mrp.bom,type:0
@@ -2001,11 +2029,16 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"Se se utiliza un subproduto en varios produtos, pode ser útil crear a súa "
+"propia lista de materiais. Aínda que se non quere ordes de produción "
+"separadas para este subproduto, seleccione Conxunto/Pantasma como tipo de "
+"LdM. Se se utiliza unha LdM pantasma para un produto raíz, no canto de "
+"producirse, venderase e enviarase como un conxunto de compoñentes."
 
 #. module: mrp
 #: field:mrp.bom,method:0
 msgid "Method"
-msgstr ""
+msgstr "Método"
 
 #. module: mrp
 #: help:mrp.production,state:0
@@ -2018,168 +2051,175 @@ msgid ""
 " 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'."
 msgstr ""
+"Cando se crea a orde de fabricación o seu estado configúrase como "
+"\"Borrador\" Se a orde está confirmdada, o estado configúrase como "
+"\"Agardando mercancía\" Se existe algunha excepción, o estado configúrase "
+"como \"Excepcion de abastecemento\" Se o stock está dispoñible, o estado "
+"configúrase como \"Listo para producir\" Cando comeza a fabricación, o "
+"estado configúrase como \"En produción\" Cando remata a fabricación, o "
+"estado configúrase como \"Realizado\""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr ""
+msgstr "Por encarga"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
 msgid "Time after prod."
-msgstr ""
+msgstr "Tempo despois produción"
 
 #. module: mrp
 #: field:mrp.workcenter.load,time_unit:0
 msgid "Type of period"
-msgstr ""
+msgstr "Tipo de período"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr ""
+msgstr "Ctdade total"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
 msgid "Number of Hours"
-msgstr ""
+msgstr "Número de horas"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Información de custos"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
-msgstr ""
+msgstr "Ordes de abastecemento"
 
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Redondeo aplicado á cantidade de produto"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Asignación desde produción ou pedido de compra."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr ""
+msgstr "Proceso produtivo pai"
 
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr ""
+msgstr "Tempo en horas para a configuración."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembro"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imaxe"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr ""
+msgstr "Lista de materiais"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr ""
+msgstr "Variación do valor do stock"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Asignación desde stock."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Esperando mercancía"
 
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr ""
+msgstr "Último índice"
 
 #. module: mrp
 #: field:mrp.bom,revision_ids:0
 #: view:mrp.bom.revision:0
 msgid "BoM Revisions"
-msgstr ""
+msgstr "Revisións lista de materiais"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Proxecto"
 
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr ""
+msgstr "Semana"
 
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso da configuración"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Etapas de produción."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Estrutura de custos"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Consumir e Producir"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr ""
+msgstr "Lista de materiais (LdM) pai"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
@@ -2188,16 +2228,19 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
+"Os compoñentes das listas de materiais son compoñentes e subprodutos "
+"utilizados para crear listas de materiais mestres. Utilice este menú para "
+"buscar en que LdM se utiliza un compoñente específico."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Xaneiro"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "O Tipo de produto é almacenable ou consumible."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:595
@@ -2205,12 +2248,12 @@ msgstr ""
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Seleccionar a cantidade"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2218,7 +2261,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr ""
+msgstr "Lista de materiais"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -2231,24 +2274,24 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Revisión da lista de materiais"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 #: view:mrp.workcenter:0
 msgid "General Information"
-msgstr ""
+msgstr "Información xeral"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr ""
+msgstr "Producións"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:194
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Custo do traballo de "
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -2267,22 +2310,22 @@ msgstr ""
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr ""
+msgstr "Encamiñamento"
 
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Operacións de produción"
 
 #. module: mrp
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Data planificada"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Debe asignar un lote de produción para este produto"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -2293,48 +2336,54 @@ 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 the needs."
 msgstr ""
+"As propiedades en OpenERP utilízanse para seleccionar a correcta lista de "
+"materiais para a fabricación dun dos produtos cando se teñen diferentes "
+"xeitos de fabricar o mesmo produto. Pode asignar varias propiedades para "
+"cada lista de materiais. Cando un vendedor crea un pedido de cliente, pode "
+"relacionalo con varias propiedades e OpenERP seleccionará automaticamente a "
+"lista de materiais para utilizar segundo as necesidades."
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Produción"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Abastecementos en excepción"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "material 'regra stock mínimo'"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Prezo do produto"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
 msgid "MRP Applications Configuration"
-msgstr ""
+msgstr "Configuración das aplicacións MRP"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Dividir en lotes de produción"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Cambiar cantidade"
 
 #. module: mrp
 #: view:change.production.qty:0
 #: model:ir.actions.act_window,name:mrp.action_change_production_qty
 msgid "Change Product Qty"
-msgstr ""
+msgstr "Cambiar Ctde producto"
 
 #. module: mrp
 #: view:mrp.bom.revision:0
@@ -2347,22 +2396,22 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
-msgstr ""
+msgstr "Descrición"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Taboleiro de fabricación"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Data de remate planificada"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2371,37 +2420,40 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"\"Cargas dos centros de produción\" amosa un prognóstico da carga dos "
+"centros de produción nun período determinado. Exprésase en número de horas e "
+"ciclos de máquina relacionados."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "A forma de abastecer depende do tipo de produto."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 msgid "Manufacturing"
-msgstr ""
+msgstr "Fabricación"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Próximas ordes de produción"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Febreiro"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Grupos de propiedades"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2409,16 +2461,19 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
+"Dependendo do método elixido para subministrar os produtos almacenables, a "
+"orde de abastecemento crea unha petición de orzamento, unha orde de "
+"produción, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
 msgid "Time in hours for the cleaning."
-msgstr ""
+msgstr "Tempo en horas para a limpeza."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Petición de orzamento automática"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2426,6 +2481,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Se o servizo ten un método de subministración 'Producir', créase unha tarefa "
+"no módulo de xestión de proxectos de OpenERP."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2434,6 +2491,10 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
+"Para poder subministrar materias primas (que deben mercarse ou producirse), "
+"a orde de produción xera tantas ordes de abastecemento como compoñentes "
+"figuren na lista de materiais, a través dunha execución das planificacións "
+"(MRP)."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2441,11 +2502,13 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Indique a cantidade de produtos a producir ou mercar. O informe da estrutura "
+"de custos amósase baseándose nesta cantidade."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr ""
+msgstr "En stock"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
@@ -2453,17 +2516,19 @@ msgstr ""
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Permisos de ausencia dos empregados"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
 msgstr ""
+"Indica a orde de secuencia cando se amosa unha lista coas listas de "
+"materiais."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2471,13 +2536,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Produtos a consumir"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Especificar custos do centro de traballo por ciclo."
@@ -2548,3 +2613,19 @@ msgstr ""
 #~ "próximas*Lista de entregas*Gráfico de carga do centro de traballo*Lista de "
 #~ "ordes de fabricación con excepcións\n"
 #~ "    "
+
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr ""
+#~ "A ruta indica tódolos centros de produción utilizados, por canto tempo e/ou "
+#~ "ciclos. Se se indica a ruta, a terceira pestana dunha orde de produción "
+#~ "(centros de produción) preencherase automaticamente."
+
+#~ msgid ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr ""
+#~ "Descrición do centro de traballo. Explique aquí o que é un ciclo de acordo "
+#~ "con este centro de traballo."
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 0f6941ae57e..40199555bbc 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -716,7 +716,7 @@ msgid "Per month"
 msgstr "प्रति माह"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -729,7 +729,7 @@ msgid "Product Name"
 msgstr "वस्तु का नाम"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1295,7 +1295,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1306,7 +1306,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1535,7 +1535,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1625,7 +1625,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2114,7 +2114,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2426,9 +2426,6 @@ msgstr ""
 #~ msgid "Procurement Details"
 #~ msgstr "खरीद के विवरण"
 
-#~ msgid "Scheduled End"
-#~ msgstr "अनुसूचित समाप्ति"
-
 #~ msgid "Packing list"
 #~ msgstr "पैकिंग सूची"
 
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 6fa413c21dc..0f488328de2 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -717,7 +717,7 @@ msgid "Per month"
 msgstr "Mjesečno"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -730,7 +730,7 @@ msgid "Product Name"
 msgstr "Ime Proizvoda"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Pogrešna akcija !"
@@ -1296,7 +1296,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Nalog za Proizvodnju '%s' je planiran za %s."
@@ -1307,7 +1307,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Nalog za Proizvodnju '%s' je spreman za proizvodnju."
@@ -1536,7 +1536,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Naloz za Proizvodnju Za Pokrenuti"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1626,7 +1626,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2115,7 +2115,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2411,17 +2411,5 @@ msgstr ""
 #~ msgid "Workcenter load"
 #~ msgstr "Teret Radnog Centra"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Teret Radnih Centara"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Teret Radnog Centra"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Upravljanje Proizvodnjom - Izvještavanje"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Tereti Radnog Centra"
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Upotreba Radnog Centra"
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 736c8a75dab..85e7187ff40 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-09 14:35+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -721,7 +722,7 @@ msgid "Per month"
 msgstr "Havonta"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -734,7 +735,7 @@ msgid "Product Name"
 msgstr "Termék neve"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Érvénytelen művelet !"
@@ -1300,7 +1301,7 @@ msgid "Month -1"
 msgstr "Előző hónap"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1311,7 +1312,7 @@ msgid "Production Order N° :"
 msgstr "Gyártási rendelés száma"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1542,7 +1543,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1632,7 +1633,7 @@ msgid "Production Analysis"
 msgstr "Gyártás elemzése"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Másolás"
@@ -2121,7 +2122,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "A termék típusa készletezhető vagy felhasználható."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 8fe93116c28..f59cf77019d 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 04177fdab03..3b238fffc78 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-17 09:33+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@domsense.com>\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -763,7 +763,7 @@ msgid "Per month"
 msgstr "Mensile"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -776,7 +776,7 @@ msgid "Product Name"
 msgstr "Descrizione Prodotto"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Azione non valida !"
@@ -1375,7 +1375,7 @@ msgid "Month -1"
 msgstr "Mese -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "L'ordine di produzione '%s' è pianificato per il %s."
@@ -1386,7 +1386,7 @@ msgid "Production Order N° :"
 msgstr "Ordine di produzione N° :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "L'ordine di produzione '%s' è pronto per essere eseguito."
@@ -1627,7 +1627,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Ordini di Produzione da Eseguire"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1721,7 +1721,7 @@ msgid "Production Analysis"
 msgstr "Analisi della produzione"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Copia"
@@ -2252,7 +2252,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Il tipo prodotto è Stoccabile o Consumabile"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -3238,76 +3238,12 @@ msgstr "Anno"
 #~ "Puoi vedere la distinta base dei materiali che sono utilizzati per ottenere "
 #~ "il prodotto"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Carico Laboratori"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Carico Laboratorio"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Carichi Laboratorio"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP e Schedulatore Logistico"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Il nome del gruppo deve essere univoco !"
-
-#~ msgid "Specify Cost of Workcenter per hour."
-#~ msgstr "Specificare il costo orario per il centro di lavoro."
-
-#~ msgid "Specify Cost of Workcenter per cycle."
-#~ msgstr "Specificare il costo per ciclo per il centro di lavoro."
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Utilizzo del centro di lavoro"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate dagli oggetti osv_memory !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare menu ricorsivi."
-
-#~ msgid ""
-#~ "Number of operations this workcenter can do in parallel. If this workcenter "
-#~ "represents a team of 5 workers, the capacity per cycle is 5."
-#~ msgstr ""
-#~ "Numero di operazioni che questo centro di lavoro può fare in parallelo. Se "
-#~ "questo centro di lavoro rappresenta una squadra di 5 operai, la capacità per "
-#~ "ciclo sarà di 5."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1 !"
-
-#~ msgid ""
-#~ "Master Bill of Materials allows you to create and manage the list of "
-#~ "necessary raw materials used to make a finished product. OpenERP will use "
-#~ "these BoM in order to propose automatically manufacturing orders according "
-#~ "to products' needs. You can either create a bill of materials to define "
-#~ "specific production steps or define a single multi-level bill of materials."
-#~ msgstr ""
-#~ "La distinta base principale, permette di creare e gestire l'elenco delle "
-#~ "materie prime necessarie, utilizzate per realizzare un prodotto finito. "
-#~ "OpenERP utilizzerà queste distinte base, al fine di proporre automaticamente "
-#~ "gli ordini di produzione in base alle esigenze dei prodotti. È possibile "
-#~ "creare una distinta base per definire specifiche fasi di produzione, o una "
-#~ "distinta base multi-livello."
-
-#~ msgid "Number of operations this workcenter can do."
-#~ msgstr "Numero di operazioni che questo centro di lavoro può fare."
-
-#~ msgid "Work Centers load"
-#~ msgstr "Carico dei centri di lavoro"
-
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Specifica il costo di ogni ciclo del Centro di Lavoro"
 
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 3cfbeec99f1..3fbc4c82d4c 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -718,7 +718,7 @@ msgid "Per month"
 msgstr "월별"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -731,7 +731,7 @@ msgid "Product Name"
 msgstr "상품 이름"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "유효하지 않은 액션 !"
@@ -1297,7 +1297,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1308,7 +1308,7 @@ msgid "Production Order N° :"
 msgstr "생산 주문 번호:"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1537,7 +1537,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1627,7 +1627,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2116,7 +2116,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -3099,6 +3099,3 @@ msgstr ""
 
 #~ msgid "Running"
 #~ msgstr "작동 중"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP 및 물류 스케줄러"
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 83b2a34274e..44665d98443 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: lt\n"
 
 #. module: mrp
@@ -722,7 +722,7 @@ msgid "Per month"
 msgstr "Per mėnesį"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -735,7 +735,7 @@ msgid "Product Name"
 msgstr "Produkto pavadinimas"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Neleistinas veiksmas!"
@@ -1301,7 +1301,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1312,7 +1312,7 @@ msgid "Production Order N° :"
 msgstr "Gamybos užsakymo Nr. :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1541,7 +1541,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1631,7 +1631,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2121,7 +2121,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/nb.po b/addons/mrp/i18n/nb.po
index ca98c392397..2bd9cc375b1 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -756,7 +756,7 @@ msgid "Per month"
 msgstr "Per måned"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -769,7 +769,7 @@ msgid "Product Name"
 msgstr "Produktnavn"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Ugyldig hendelse !"
@@ -873,7 +873,7 @@ msgstr "Totalt Sykluser"
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Ready to Produce"
-msgstr "Klar til å pprodusere"
+msgstr "Klar for produksjon"
 
 #. module: mrp
 #: field:mrp.bom.revision,name:0
@@ -1364,7 +1364,7 @@ msgid "Month -1"
 msgstr "Måned -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Produksjonsordren '%s' er planlagt for %s."
@@ -1375,7 +1375,7 @@ msgid "Production Order N° :"
 msgstr "Produksjonsordre nr :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Produksjonsordre '%s' er klar for produksjon ."
@@ -1617,7 +1617,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Produksjonsordre å starte"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr "Kan ikke slette Produksjonsordre(r) som er i %s Status!"
@@ -1710,7 +1710,7 @@ msgid "Production Analysis"
 msgstr "Produktanalyser"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Kopier"
@@ -1984,7 +1984,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Arbeidsordre"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -2059,7 +2059,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
 msgid "Number of Hours"
-msgstr ""
+msgstr "Antall timer"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -2099,7 +2099,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
@@ -2152,7 +2152,7 @@ msgstr ""
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr ""
+msgstr "Uke"
 
 #. module: mrp
 #: field:mrp.installer,progress:0
@@ -2163,7 +2163,7 @@ msgstr ""
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
@@ -2185,7 +2185,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
@@ -2203,7 +2203,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
@@ -2211,17 +2211,17 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Velg antall"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2229,7 +2229,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr ""
+msgstr "Stykklister"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -2242,7 +2242,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Stykkliste revisjoner"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -2309,7 +2309,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Produksjon"
 
 #. module: mrp
 #: view:board.board:0
@@ -2339,7 +2339,7 @@ msgstr ""
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Endre antall"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2358,12 +2358,12 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: mrp
 #: view:board.board:0
@@ -2391,7 +2391,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 msgid "Manufacturing"
-msgstr ""
+msgstr "Produksjon"
 
 #. module: mrp
 #: view:board.board:0
@@ -2401,7 +2401,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
@@ -2412,7 +2412,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2464,7 +2464,7 @@ msgstr ""
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
@@ -2488,7 +2488,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Spesifiser Kostnad på Arbeidssenter per syklus."
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index 1468aaab912..a54013b441c 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -720,7 +720,7 @@ msgid "Per month"
 msgstr "Per maand"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -733,7 +733,7 @@ msgid "Product Name"
 msgstr "Naam product"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Ongeldige actie!"
@@ -1299,7 +1299,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1310,7 +1310,7 @@ msgid "Production Order N° :"
 msgstr "Productie opdracht nr :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1539,7 +1539,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1629,7 +1629,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2120,7 +2120,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2990,9 +2990,6 @@ msgstr ""
 #~ msgid "Max Quantity"
 #~ msgstr "Max hoeveelheid"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Verwervingsverzoek"
-
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "Verwervingspunt minimale voorraad"
 
@@ -3065,9 +3062,6 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Sluit boeking aan einde"
 
-#~ msgid "Scheduled End"
-#~ msgstr "Gepland einde"
-
 #~ msgid "Procurement Details"
 #~ msgstr "Details verwerving"
 
@@ -3164,21 +3158,3 @@ msgstr ""
 
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Voorraad productvoorraad"
-
-#~ msgid "Next production orders"
-#~ msgstr "Volgende productieorders"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Werkcentersbelasting"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Werkcenterbelasting"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "MRP beheer - Rapportage"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Werkcenterbelastingen"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP & logistieke planning"
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index 9d8e035b541..bf55c83626f 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 51f5d96b4bc..fd8dd6e2272 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -746,7 +746,7 @@ msgid "Per month"
 msgstr "Na miesiąc"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -759,7 +759,7 @@ msgid "Product Name"
 msgstr "Nazwa produktu"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Niedozwolona akcja !"
@@ -1339,7 +1339,7 @@ msgid "Month -1"
 msgstr "Miesiąc -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Zamówienie produkcji '%s' zostało zaplanowane dla %s."
@@ -1350,7 +1350,7 @@ msgid "Production Order N° :"
 msgstr "Nr zamówienia produkcji"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Zamówienie produkcji '%s' jest gotowe do produkcji."
@@ -1583,7 +1583,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Zamówienia produkcji do rozpoczęcia"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr "Nie można usuwać zamówień produkcji, które są w stanie %s !"
@@ -1673,7 +1673,7 @@ msgid "Production Analysis"
 msgstr "Analiza produkcji"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Kopiuj"
@@ -2164,7 +2164,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -3004,21 +3004,6 @@ msgstr "Rok"
 #~ msgid "Service Product Process"
 #~ msgstr "Proces usługi"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Obciążenie centrów roboczych"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Obciążenie centrum roboczego"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Zarządzanie MRP - Raportowanie"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Obciążenia centrum roboczego"
-
-#~ msgid "Next production orders"
-#~ msgstr "Następne zamówienie produkcji"
-
 #~ msgid "Procure Service Product"
 #~ msgstr "Zapotrzebowanie na usługę"
 
@@ -3158,85 +3143,15 @@ msgstr "Rok"
 #~ "których daty są poza zakresem od (dzisiaj) do (dzisiaj + zakres planowania) "
 #~ "są pomijane w obliczeniach."
 
-#~ msgid "Procurement Request"
-#~ msgstr "Utwórz zapotrzebowanie"
-
 #~ msgid "Procurement for raw materials."
 #~ msgstr "Zapotrzebowanie na materiały do produkcji."
 
 #~ msgid "Procure Stockable Product"
 #~ msgstr "Zapotrzebowanie na produkty rejestrowane"
 
-#~ msgid "Number of operations this workcenter can do."
-#~ msgstr "Liczba operacji, którą to centrum może wykonać."
-
-#~ msgid "Work Centers load"
-#~ msgstr "Obłożenie centrum roboczego"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the bills of "
-#~ "material without removing it."
-#~ msgstr ""
-#~ "Jeśli pole Aktywne jest wyłączone, to pozwala ci na ukrycie zestawienia "
-#~ "materiałowego bez jego usuwania."
-
-#, python-format
-#~ msgid "of "
-#~ msgstr "z "
-
-#~ msgid "Specify Cost of Workcenter per hour."
-#~ msgstr "Podaj godzinowy koszt centrum roboczego"
-
-#, python-format
-#~ msgid "Component suppliers"
-#~ msgstr "Dostawca komponentu"
-
-#~ msgid ""
-#~ "Specify quantity of products to produce or buy. Report of Cost structure "
-#~ "will be displayed base on this qunatity."
-#~ msgstr ""
-#~ "Podaj ilości produktów do wyprodukowania lub zakupu. Raport struktury "
-#~ "kosztów będzie bazował na tych ilościach."
-
-#~ msgid "Specify Cost of Workcenter per cycle."
-#~ msgstr "Podaj koszt centrum roboczego na cykl"
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Użycie centrum roboczego"
 
-#, python-format
-#~ msgid "Component"
-#~ msgstr "Komponent"
-
-#~ msgid ""
-#~ "Gives the sequence order when displaying a list of routing workcenters."
-#~ msgstr "Ustala kolejność wyświetlania na liście centrów roboczych."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the routing "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Jeśli pole Aktywne jest nieaktywne, to możesz ukryć marszrutę bez jej "
-#~ "usuwania."
-
-#, python-format
-#~ msgid "Work Cost "
-#~ msgstr "Koszt pracy "
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#, python-format
-#~ msgid "Cost "
-#~ msgstr "Koszt "
-
-#, python-format
-#~ msgid "Total Cost "
-#~ msgstr "Suma kosztów "
-
 #~ msgid "Packing list"
 #~ msgstr "Pobranie"
 
@@ -3247,9 +3162,6 @@ msgstr "Rok"
 #~ "To jest pobranie (przesunięcie wewnętrzne), które dostarcza materiały do "
 #~ "produkcji wg planu."
 
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP i planowanie logistyczne"
-
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Podaj koszt centrum roboczego na cykl."
 
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 3e8608008d2..9574e9dc573 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.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-12-21 06:10+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-23 11:53+0000\n"
+"Last-Translator: Daniel Reis <Unknown>\n"
 "Language-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-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-24 05:00+0000\n"
+"X-Generator: Launchpad (build 14336)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -376,7 +376,7 @@ msgstr "Quantidade"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr "Número de horas"
+msgstr "N.º de horas"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -734,7 +734,7 @@ msgid "Per month"
 msgstr "Por mês"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -747,7 +747,7 @@ msgid "Product Name"
 msgstr "Nome de produção"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Acção inválida !"
@@ -1313,7 +1313,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1324,7 +1324,7 @@ msgid "Production Order N° :"
 msgstr "Nº de Ordem de Produção :"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1553,7 +1553,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1643,7 +1643,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -1801,7 +1801,7 @@ msgstr "Empresa"
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr "Tempo de um ciclo"
+msgstr "Tempo por ciclo (horas)"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -2132,7 +2132,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2742,12 +2742,6 @@ msgstr "Ano"
 #~ msgstr ""
 #~ "Se o stock de um produto é inferior a 0, vai tornar-se um ponto de encomenda."
 
-#~ msgid "Workcenters load"
-#~ msgstr "Carregar centro de trabalho"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Carregamento do centro de trabalho"
-
 #~ msgid ""
 #~ "Triggers an automatic procurement for all products that have a virtual stock "
 #~ "under 0. You should probably not use this option, we suggest using a MTO "
@@ -3163,36 +3157,3 @@ msgstr "Ano"
 #~ msgid "You can see its bill of material which are used to make product"
 #~ msgstr ""
 #~ "Pode ver as compras do material que são utilizadas para fazer o produto"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "Planificador Logístico e de Produção"
-
-#, python-format
-#~ msgid "Component"
-#~ msgstr "Componente"
-
-#~ msgid "Number of operations this workcenter can do."
-#~ msgstr "Número de operacões que este centro de produção pode realizar."
-
-#~ msgid "Work Centers load"
-#~ msgstr "Carga dos centros de produção"
-
-#~ msgid "Specify Cost of Workcenter per hour."
-#~ msgstr "Indica o custo do centro de trabalho por hora."
-
-#, python-format
-#~ msgid "Component suppliers"
-#~ msgstr "Fornecedores de componentes"
-
-#~ msgid ""
-#~ "Specify quantity of products to produce or buy. Report of Cost structure "
-#~ "will be displayed base on this qunatity."
-#~ msgstr ""
-#~ "Indique a quantidade de artigos a produzir ou a comprar. O relatório da "
-#~ "estrutura de custos, terá em conta esta quantidade."
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Carga do centro de trabalho"
-
-#~ msgid "Specify Cost of Workcenter per cycle."
-#~ msgstr "Especifique o custe do centro de trabalho por ciclo"
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 9215e7b2b1e..e55389cc1ec 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -758,7 +758,7 @@ msgid "Per month"
 msgstr "Por mês"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -771,7 +771,7 @@ msgid "Product Name"
 msgstr "Nome do Produto"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação inválida!"
@@ -1375,7 +1375,7 @@ msgid "Month -1"
 msgstr "Mês -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "A Ordem de Produção '%s' esta agendada para %s"
@@ -1386,7 +1386,7 @@ msgid "Production Order N° :"
 msgstr "Ordem Produção N °:"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "A Ordem de Produção '%s' está pronta para produzir."
@@ -1628,7 +1628,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Ordens de Produção para Iniciar"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1722,7 +1722,7 @@ msgid "Production Analysis"
 msgstr "Análise de Produção"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Copiar"
@@ -2249,7 +2249,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Produto é Estocável ou Consumível."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -3163,16 +3163,9 @@ msgstr "Ano"
 #~ msgid "Procurements"
 #~ msgstr "Compras"
 
-#, python-format
-#~ msgid "Component suppliers"
-#~ msgstr "Fornecedores de componentes"
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Uso do Centro de Trabalho"
 
-#~ msgid "Working Period"
-#~ msgstr "Horário de trabalho"
-
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Indicar o custo do Centro de Trabalho por ciclo."
 
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 3303c906652..e8e13f497d1 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -462,6 +462,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 ""
+"Păstraţi gol dacă produceţi la locul în care produsele finite sunt necesare. "
+"Stabiliţi un amplasament în cazul în care se produc la un punct fix. Acest "
+"loc poate fi un amplasament partener dacă se subcontractează operaţiunile de "
+"fabricaţie."
 
 #. module: mrp
 #: view:board.board:0
@@ -488,7 +492,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Descompunerea fabricaţiei"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
@@ -752,7 +756,7 @@ msgid "Per month"
 msgstr "Pe lună"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -765,7 +769,7 @@ msgid "Product Name"
 msgstr "Nume produs"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Acţiune invalidă !"
@@ -1218,7 +1222,7 @@ msgstr "Cost ciclu"
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
-msgstr ""
+msgstr "Valoarea in cicluri"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
@@ -1311,7 +1315,7 @@ msgstr ""
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
 msgid "Change Parent Price"
-msgstr ""
+msgstr "Schimbă preţul părinte"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
@@ -1361,7 +1365,7 @@ msgid "Month -1"
 msgstr "Luna - 1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Comanda de producție '%s' este programată pentru  %s."
@@ -1372,7 +1376,7 @@ msgid "Production Order N° :"
 msgstr "Nr comandă producţie"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Comanda de producție '%s' este gata să producă."
@@ -1614,7 +1618,7 @@ msgid "Manufacturing Orders To Start"
 msgstr "Comenzi de producție gata de start"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1708,7 +1712,7 @@ msgid "Production Analysis"
 msgstr "Analize producție"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Copiaţi"
@@ -2088,7 +2092,7 @@ msgstr "Rotunjirea aplicată pe cantitatea de produs."
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Repartizarea din producţie sau Ordin de achiziţie."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2131,7 +2135,7 @@ msgstr "Variatia valorii stocului"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Repartizarea din stoc."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2223,7 +2227,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Tipul produsului este stocabil sau consumabile."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2504,7 +2508,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr ""
+msgstr "Dă ordinea atunci când afişează o listă a reţetelor de fabricaţie."
 
 #. module: mrp
 #: view:mrp.production:0
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 65888805b81..0c804f401be 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -155,7 +155,7 @@ msgstr "Конечный продукт"
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr ""
+msgstr "Купить"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -483,7 +483,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Декомпозиция производства"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
@@ -568,7 +568,7 @@ msgstr "Поиск продукции"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Supplier Price per Uom"
-msgstr ""
+msgstr "Цена поставщика за ед. изм."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -578,7 +578,7 @@ msgstr "Март"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "Иерархия спецификаций"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
@@ -745,7 +745,7 @@ msgid "Per month"
 msgstr "В месяц"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -758,7 +758,7 @@ msgid "Product Name"
 msgstr "Название продукции"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr "Неверное действие !"
@@ -1040,7 +1040,7 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr ""
+msgstr "Наименование спецификации"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1089,7 +1089,7 @@ msgstr "Название"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "Конфигурация модуля ПРП"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1330,7 +1330,7 @@ msgstr "Ревизии"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
-msgstr ""
+msgstr "Настройте модуль планирования ресурсов производства"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1349,7 +1349,7 @@ msgid "Month -1"
 msgstr "Месяц -1"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr "Производственный заказ '%s' запланирован на %s."
@@ -1360,7 +1360,7 @@ msgid "Production Order N° :"
 msgstr "Заказ на производство  №"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr "Производственный заказ '%s' готов для производства."
@@ -1431,7 +1431,7 @@ msgstr "mrp.installer"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Рабочие центры производства"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1592,7 +1592,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1684,7 +1684,7 @@ msgid "Production Analysis"
 msgstr "Анализ производства"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr "Копировать"
@@ -2177,7 +2177,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr "Тип продукта — Складируемый или Потребляемый."
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2208,7 +2208,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Пересмотр спецификации"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -2665,18 +2665,6 @@ msgstr "Год"
 #~ msgid "Do nothing"
 #~ msgstr "Ничего не делать"
 
-#~ msgid "Workcenters load"
-#~ msgstr "Загрузка рабочей области"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Загрузка рабочей области"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "Управление MRP - Отчёт"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Загрузка рабочих областей"
-
 #, python-format
 #~ msgid "Product name"
 #~ msgstr "Название изделия"
@@ -2763,9 +2751,6 @@ msgstr "Год"
 #~ "Список операций и участков обработки для производства готового изделия. "
 #~ "Обычно используется для расчёта и планирования загрузки участков."
 
-#~ msgid "Next production orders"
-#~ msgstr "Ближайшие заказы на производство"
-
 #~ msgid "You can see its bill of material which are used to make product"
 #~ msgstr "Посмотреть спецификацию, по которой изготовляется изделие"
 
@@ -2830,9 +2815,6 @@ msgstr "Год"
 #~ msgstr ""
 #~ "Описание участка обработка. Укажите здесь, что соответствует циклу участка."
 
-#~ msgid "OTK"
-#~ msgstr "Предъявление продукции ОТК"
-
 #~ msgid "Create minimum stock rules"
 #~ msgstr "Создать правила мин. запасов"
 
@@ -2855,9 +2837,6 @@ msgstr "Год"
 #~ "Location where the system will look for products used in raw materials."
 #~ msgstr "Местоположение расходных материалов для производства"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Запланировать снабжение"
-
 #~ msgid "Note"
 #~ msgstr "Примечания"
 
@@ -2887,9 +2866,6 @@ msgstr "Год"
 #~ msgid "Internal Procurement Request"
 #~ msgstr "Внутренняя заявка на снабжение"
 
-#~ msgid "Error!"
-#~ msgstr "Ошибка!"
-
 #~ msgid "Minimum Stock Rule"
 #~ msgstr "Правило минимальных запасов"
 
@@ -2955,9 +2931,6 @@ msgstr "Год"
 #~ msgid "Your procurement request has been sent !"
 #~ msgstr "Заявка на снабжение отправлена!"
 
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "ПМР и Логистическое планирование"
-
 #~ msgid "Workcenter Usage"
 #~ msgstr "Использование Рабочего центра"
 
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index 7ae5df49e76..c74a1d09c53 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -716,7 +716,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -729,7 +729,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1295,7 +1295,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1306,7 +1306,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1535,7 +1535,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1625,7 +1625,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2114,7 +2114,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2416,6 +2416,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatné XML pre zobrazenie architektúry!"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP a plánovač logistiky"
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 3b5838dc94b..29d4f7054ae 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -716,7 +716,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -729,7 +729,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1295,7 +1295,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1306,7 +1306,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1535,7 +1535,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1625,7 +1625,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2114,7 +2114,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index 49d0246c1de..b6dea6d1b6c 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -716,7 +716,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -729,7 +729,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1295,7 +1295,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1306,7 +1306,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1535,7 +1535,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1625,7 +1625,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2114,7 +2114,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/sr@latin.po b/addons/mrp/i18n/sr@latin.po
index 3b597507107..3fac861858b 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -716,7 +716,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -729,7 +729,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1295,7 +1295,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1306,7 +1306,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1535,7 +1535,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1625,7 +1625,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2114,7 +2114,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 8f094a54517..f9a8fa1318b 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.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: 2011-08-05 04:39+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 #: field:mrp.production,move_created_ids2:0
 msgid "Moves Created"
-msgstr "Moves Created"
+msgstr "Flytt skapad"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -55,7 +55,7 @@ msgstr "Manufacturing Resource Planning"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr "No. Of Cycles"
+msgstr "Antal cykler"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
@@ -90,7 +90,7 @@ msgstr "Kostnad per enhet"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Kassera produkt"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Produkter att slutföra"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -188,7 +188,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -1891,7 +1891,7 @@ msgstr "Product Rounding"
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr "Work Order"
+msgstr "Arbetsorder"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -2623,9 +2623,6 @@ msgstr ""
 #~ msgid "Stockable Production Order"
 #~ msgstr "Stockable Production Order"
 
-#~ msgid "Caution!"
-#~ msgstr "Caution!"
-
 #~ msgid "Stockable Request"
 #~ msgstr "Stockable Request"
 
@@ -2646,9 +2643,6 @@ msgstr ""
 #~ msgid "Stockable Make to Stock"
 #~ msgstr "Stockable Make to Stock"
 
-#~ msgid "Qty Multiple must be greater than zero."
-#~ msgstr "Qty Multiple must be greater than zero."
-
 #~ msgid "Procure Service Product"
 #~ msgstr "Procure Service Product"
 
@@ -2702,15 +2696,6 @@ msgstr ""
 #~ msgid "Procurement convert into the draft purchase order."
 #~ msgstr "Procurement convert into the draft purchase order."
 
-#~ msgid ""
-#~ "Before splitting the production lots,make sure this move or its Production "
-#~ "Order has a Picking attached !\n"
-#~ "You must save the move before performing this operation."
-#~ msgstr ""
-#~ "Before splitting the production lots,make sure this move or its Production "
-#~ "Order has a Picking attached !\n"
-#~ "You must save the move before performing this operation."
-
 #, python-format
 #~ msgid "from stock and no minimum orderpoint rule defined"
 #~ msgstr "from stock and no minimum orderpoint rule defined"
@@ -2820,25 +2805,6 @@ msgstr ""
 #~ msgid "Compute All Schedulers"
 #~ msgstr "Beräkna alla schemaläggare"
 
-#~ msgid ""
-#~ "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-#~ "        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-#~ "\n"
-#~ "    def copy(self, cr, uid, id, default=None,context=None):\n"
-#~ "        if not default:\n"
-#~ "            default = {}\n"
-#~ "        default.update({\n"
-#~ "            'name': self.pool.get('ir.sequence"
-#~ msgstr ""
-#~ "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-#~ "        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-#~ "\n"
-#~ "    def copy(self, cr, uid, id, default=None,context=None):\n"
-#~ "        if not default:\n"
-#~ "            default = {}\n"
-#~ "        default.update({\n"
-#~ "            'name': self.pool.get('ir.sequence"
-
 #, python-format
 #~ msgid "Product uom"
 #~ msgstr "Product uom"
@@ -2911,9 +2877,6 @@ msgstr ""
 #~ msgid "Procurement orders"
 #~ msgstr "Anskaffningsorders"
 
-#~ msgid "No production sequence defined"
-#~ msgstr "No production sequence defined"
-
 #~ msgid "If product type is service and procure method is Make to order"
 #~ msgstr "If product type is service and procure method is Make to order"
 
@@ -2923,9 +2886,6 @@ msgstr ""
 #~ msgid "Max Quantity"
 #~ msgstr "Max Quantity"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Procurement Request"
-
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "Minimum Stock Procure"
 
@@ -2966,9 +2926,6 @@ msgstr ""
 #~ msgid "Production Orders Waiting Products"
 #~ msgstr "Production Orders Waiting Products"
 
-#~ msgid "Data Insufficient !"
-#~ msgstr "Data Insufficient !"
-
 #~ msgid "The procurement quantity will by rounded up to this multiple."
 #~ msgstr "The procurement quantity will by rounded up to this multiple."
 
@@ -3050,13 +3007,6 @@ msgstr ""
 #~ msgid "No address defined for the supplier"
 #~ msgstr "No address defined for the supplier"
 
-#~ msgid ""
-#~ "Please check the Quantity of Procurement Order(s), it should not be less "
-#~ "than 1!"
-#~ msgstr ""
-#~ "Please check the Quantity of Procurement Order(s), it should not be less "
-#~ "than 1!"
-
 #~ msgid "Your procurement request has been sent !"
 #~ msgstr "Your procurement request has been sent !"
 
@@ -3069,9 +3019,6 @@ msgstr ""
 #~ msgid "Compute Procurements Only"
 #~ msgstr "Beräkna endast anskaffningar"
 
-#~ msgid "Error!"
-#~ msgstr "Error!"
-
 #~ msgid "Temporary Procurement Exceptions"
 #~ msgstr "Temporary Procurement Exceptions"
 
@@ -3094,9 +3041,6 @@ msgstr ""
 #~ msgid "New Bill of Materials"
 #~ msgstr "New Bill of Materials"
 
-#~ msgid "Invalid arguments"
-#~ msgstr "Invalid arguments"
-
 #, python-format
 #~ msgid "Product quantity"
 #~ msgstr "Product quantity"
@@ -3182,23 +3126,5 @@ msgstr ""
 #~ msgid "You can see its bill of material which are used to make product"
 #~ msgstr "You can see its bill of material which are used to make product"
 
-#~ msgid "Scheduled End"
-#~ msgstr "Scheduled End"
-
 #~ msgid "Bill of Materials Components"
 #~ msgstr "Bill of Materials Components"
-
-#~ msgid ""
-#~ "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-#~ "        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-#~ "\n"
-#~ "    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-#~ "        if product_id:\n"
-#~ "            w=self.pool.get('product.product"
-#~ msgstr ""
-#~ "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-#~ "        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-#~ "\n"
-#~ "    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-#~ "        if product_id:\n"
-#~ "            w=self.pool.get('product.product"
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index a0641a3e034..fd83fcb2f40 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 372460e0167..21e0a1a9dfc 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: 2011-06-28 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -2755,9 +2755,6 @@ msgstr "Yıl"
 #~ msgid "Max Quantity"
 #~ msgstr "Max Miktar"
 
-#~ msgid "Procurement Request"
-#~ msgstr "Satın Alma Talebi"
-
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "Minimum Stok Üretimi"
 
@@ -2912,21 +2909,6 @@ msgstr "Yıl"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "İşlem tanımlamasında geçersiz model adı."
 
-#~ msgid "Workcenters load"
-#~ msgstr "İş Merkezi Yükü"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "İş Merkezi Yükü"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "MRP Yönetimi - Raporlama"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "İş Merkezi Yükü"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP & Lojistik Planlaması"
-
 #~ msgid "Specify Cost of Work center per cycle."
 #~ msgstr "Çevrim başına İş Merkezi Maliyetini belirtin."
 
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index a92be926a0e..1d2995b8ad3 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr "Назва Продукту"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2603,12 +2603,3 @@ msgstr ""
 
 #~ msgid "Workcenter load"
 #~ msgstr "Завантаження робочого центру"
-
-#~ msgid "Workcenters load"
-#~ msgstr "Завантаження робочого центру"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "Завантаження робочого центру"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "Навантаження робочих центрів"
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 368763e6d5a..59662a9b576 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: 2011-04-29 04:50+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -32,36 +32,41 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"Đơn đặt hàng sản xuất thường được đề xuất tự động bởi OpenERP dựa trên các "
+"hóa đơn nguyên vật liệu và quy định mua sắm, nhưng bạn cũng có thể tạo ra "
+"các đơn đặt hàng sản xuất thủ công. OpenERP sẽ xử lý việc tiêu thụ nguyên "
+"liệu thô (cổ phiếu giảm) và sản xuất các sản phẩm hoàn thành (cổ phiếu tăng) "
+"khi đơn đặt hàng được xử lý."
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr ""
+msgstr "Địa điểm nơi mà hệ thống sẽ tìm kiếm các thành phần."
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr ""
+msgstr "Trung tâm làm việc Utilisation"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr ""
+msgstr "định hướng trung tâm làm việc"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "quản lý kế hoạch sản xuất"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr ""
+msgstr "số vòng của sản phẩm sản xuất"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
-msgstr ""
+msgstr "số vòng của sản phẩm sản xuất"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -74,7 +79,7 @@ msgstr ""
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Chọn danh sách"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -716,7 +721,7 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -729,7 +734,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1295,7 +1300,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1306,7 +1311,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1535,7 +1540,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1625,7 +1630,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2114,7 +2119,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 0a8750fa20b..ebad1e0e44c 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/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: 2011-07-03 04:45+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -31,6 +31,7 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"生产订单一般是由OpenERP根据BOM和补货规则自动生成的，但也可以手工输入。在生产订单处理过程中OpenERP负责原材料的消耗和产成品的产出。"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
@@ -40,12 +41,12 @@ msgstr "系统用于查找部件的位置。"
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr ""
+msgstr "工序所在工作中心"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -67,13 +68,13 @@ msgstr "周期数"
 msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
-msgstr ""
+msgstr "最小库存规则允许系统在达到最小库存数量的时候立即创建补货单"
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr "分拣单"
+msgstr "移库单"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -90,7 +91,7 @@ msgstr "单位成本"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "原料消耗"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -117,7 +118,7 @@ msgstr "搜索物料表"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "可库存的物料或消耗品"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
@@ -129,7 +130,7 @@ msgstr "待生产"
 msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
-msgstr ""
+msgstr "工作中心完成这道工序需要执行的次数"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -137,12 +138,12 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr "参照"
+msgstr "生产订单编号"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr "成品"
+msgstr "已完工数量"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -160,7 +161,7 @@ msgstr "原料位置"
 msgid ""
 "Enhances production orders with readiness states as well as the start date "
 "and end date of execution of the order."
-msgstr ""
+msgstr "增强了生产订单功能，订单状态的可读性更强了，并增加了订单执行的开始日期和结束日期"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -170,7 +171,7 @@ msgstr "系统将自动向首选供应商发起询价单。"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr "预期成品"
+msgstr "未完工数量"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -200,7 +201,7 @@ msgstr "每小时成本"
 msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
-msgstr ""
+msgstr "如果产品的供应方法是自制，则系统创建生产订单。"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -215,14 +216,14 @@ msgstr "计量单位"
 #: field:mrp.production.order,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr "产品数量"
+msgstr "数量"
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
 msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
-msgstr ""
+msgstr "输入一个费用产品用于跟踪辅助核算会计中的成本"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -237,7 +238,7 @@ msgstr "版本"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报告"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -285,7 +286,7 @@ msgstr "控制数据"
 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 ""
+msgstr "系统等待原材料在对应库位可用。这些原材料一般是手工输入独立需求或通过最小库存规则触发需求。"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -295,7 +296,7 @@ msgstr "业务伙伴参考"
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in hours"
-msgstr "每小时金额"
+msgstr "工时数"
 
 #. module: mrp
 #: field:mrp.production,product_lines:0
@@ -346,12 +347,12 @@ msgstr "十月"
 #: code:addons/mrp/report/price.py:177
 #, python-format
 msgid "Components Cost of "
-msgstr ""
+msgstr "产品成本构成 "
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "可库存产品的补货"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -370,7 +371,7 @@ msgstr "数量"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr "小时数"
+msgstr "工时数"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -382,14 +383,14 @@ msgstr "确认生产"
 msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
-msgstr ""
+msgstr "系统根据销售的数量和产品的参数创建一张订单（生产订单或采购订单）"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
 msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
-msgstr ""
+msgstr "用于对系统无任何影响的服务，例如一次培训。"
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
@@ -416,14 +417,14 @@ msgstr "每周库存值变动"
 msgid ""
 "Enables warranty and repair management (and their impact on stocks and "
 "invoicing)."
-msgstr ""
+msgstr "实现质保期和维修管理（极其对库存和发票的影响）"
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
-msgstr "安排日期"
+msgstr "下单日期"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -441,7 +442,7 @@ msgstr "如果你在本地生产这成品你需要留空"
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "库存值预测"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -458,12 +459,12 @@ msgstr "产品的类型是服务"
 msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bill of materials."
-msgstr ""
+msgstr "定义属性组用于分配给物料清单上的属性"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "产品数量结构分解"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
@@ -499,7 +500,7 @@ msgstr "询价单"
 msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
-msgstr ""
+msgstr "物料清单绑定到工艺，即工作中心的集合"
 
 #. module: mrp
 #: constraint:product.product:0
@@ -592,12 +593,12 @@ msgstr "生产准备时间"
 msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
-msgstr ""
+msgstr "如果去掉这个启用的勾，工艺不需要删除就可以隐藏"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "产品工艺"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -605,7 +606,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,consumed_products:0
 msgid "Consumed Products"
-msgstr "已消耗原料"
+msgstr "已投料数量"
 
 #. module: mrp
 #: constraint:mrp.bom:0
@@ -629,7 +630,7 @@ msgstr "该产品尚未定义物料清单！"
 #: 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 "物料清单组件"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
@@ -653,7 +654,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "制造产成品需要的工序列表（也就是工作中心的列表）。工艺主要用于计算工作中心在制造过程中的成本和在生产计划过程中规划工作中心的工作负载"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
@@ -683,7 +684,7 @@ msgstr "主物料表"
 msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
-msgstr ""
+msgstr "销售单位是用于开发票和推销产品的计量单位"
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -736,14 +737,14 @@ msgstr "无效动作"
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
-msgstr ""
+msgstr "指标值为0.9意味着生产过程中损耗了10%"
 
 #. module: mrp
 #: view:mrp.installer:0
 msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
-msgstr ""
+msgstr "安装以下模块可以在核心制造功能上增加更多的功能"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -759,17 +760,17 @@ msgstr "要求报价"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "补货规则"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work center per hour."
-msgstr ""
+msgstr "输入工作中心每小时的成本"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Partial"
-msgstr ""
+msgstr "部分"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -787,7 +788,7 @@ msgid ""
 "Depending on the chosen method to 'supply' the service, the procurement "
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
-msgstr ""
+msgstr "根据服务供应方法的不同，补货单创建外包的采购订单或等待服务完成（等同于产品交货）"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -808,14 +809,14 @@ msgstr "生产单"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
-msgstr ""
+msgstr "原材料补货"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,hour_nbr:0
 msgid ""
 "Time in hours for this work center to achieve the operation of the specified "
 "routing."
-msgstr ""
+msgstr "这个工作中心在这个工序上需要花费的工时数"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -857,7 +858,7 @@ msgstr "扩展过滤器..."
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
-msgstr ""
+msgstr "补货单 '%s' 发生错误：'没有为产品定义物料清单！'"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -884,7 +885,7 @@ msgstr "最小库存"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
 msgid "Dashboard"
-msgstr "仪表盘"
+msgstr "控制台"
 
 #. module: mrp
 #: view:board.board:0
@@ -912,7 +913,7 @@ msgstr "代码"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "小时编号"
+msgstr "工时数"
 
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
@@ -946,7 +947,7 @@ msgstr "未活动的"
 msgid ""
 "Enables multiple product output from a single production order: without "
 "this, a production order can have only one output product."
-msgstr ""
+msgstr "可以让一张生产订单产出多种产品。没有这个模块，一张生产订单只能产出一种产品。"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -974,7 +975,7 @@ msgstr ""
 msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
-msgstr ""
+msgstr "如果这个服务的供应方法是'外购'，这里会创建一个采购申请，比如外包请求。"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -984,7 +985,7 @@ msgstr "产品调拨"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr ""
+msgstr "延迟"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -995,7 +996,7 @@ msgstr "按库存生产"
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing work centers."
-msgstr ""
+msgstr "指定序号用于在工艺中显示工作中心的顺序"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1011,12 +1012,12 @@ msgstr "启动生产"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr "生产仪表盘"
+msgstr "生产控制台"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr "来源位置"
+msgstr "原料库位"
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -1028,7 +1029,7 @@ msgstr "内部单号"
 msgid ""
 "Manages product routes and paths within and between locations (e.g. "
 "warehouses)."
-msgstr ""
+msgstr "管理产品在仓库内和仓库间的流转路径"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
@@ -1047,7 +1048,7 @@ msgstr "名称"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "生产功能配置"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1058,16 +1059,18 @@ msgid ""
 "avoids having to wait for the procurement scheduler to run or having to run "
 "the procurement scheduler manually."
 msgstr ""
+"能够即时地计算补货单。\n"
+"虽然这比定期运行MRP的方式需要更多材料，即时运算避免了等待MRP运行或手动触发MRP运行。"
 
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "模式"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
@@ -1084,16 +1087,18 @@ msgid ""
 "materials have been defined, OpenERP is capable of automatically deciding on "
 "the manufacturing route depending on the needs of the company."
 msgstr ""
+"生产订单描述了制造产品过程中需要的生产过程和消耗的原材料。你用物料清单描述了原料的需求以及生产订单要生产的产成品。选择了物料清单后，OpenERP就能根据"
+"企业的需求自动决定制造的工艺。"
 
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "订单数量不能为0或者负数!"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr ""
+msgstr "未完成的生产订单"
 
 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
@@ -1137,7 +1142,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr ""
+msgstr "等待原材料的生产订单"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1147,7 +1152,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -1170,19 +1175,19 @@ msgstr "成品库位"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr ""
+msgstr "资源"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr "分析日记账"
+msgstr "辅助核算账薄"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1196,17 +1201,17 @@ msgid ""
 "should be followed within your work centers in order to produce a product. "
 "They are attached to bills of materials that will define the required raw "
 "materials."
-msgstr ""
+msgstr "工艺允许创建或管理在工作中心上要执行的操作。它被指定给物料清单。"
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr "小时数"
+msgstr "工时数"
 
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr ""
+msgstr "工作中心操作"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1230,7 +1235,7 @@ msgstr "选择时间单位"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "工作中心负载"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1242,17 +1247,17 @@ msgstr "系统存储成品的库位"
 msgid ""
 "This is the internal picking list that brings the finished product to the "
 "production plan"
-msgstr ""
+msgstr "这是一张移库单的编号，是把产成品从生产线上移动到库房里"
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
 msgid "Change Parent Price"
-msgstr ""
+msgstr "修改标准价"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "库存调拨"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1260,7 +1265,7 @@ msgid ""
 "The Minimum Stock Rule is an automatic procurement rule based on a mini and "
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
-msgstr ""
+msgstr "最小库存规则是基于最小和最大库存数量定义的自动补货规则。菜单在库存管理菜单下，是针对每产品来配置的。"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1275,7 +1280,7 @@ msgstr "修改"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
-msgstr ""
+msgstr "配置你的制造模块"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1286,18 +1291,18 @@ msgstr "优先级"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "移库单"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "上个月"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
-msgstr ""
+msgstr "生产订单 '%s' 已创建，要生产的是 %s"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1308,12 +1313,12 @@ msgstr "生产单号:"
 #: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
-msgstr ""
+msgstr "生产订单 '%s' 已可以开始生产"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "要生产的产品"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1330,7 +1335,7 @@ msgstr "按库存生产"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -1341,13 +1346,15 @@ msgid ""
 "product needs. You can either create a bill of materials to define specific "
 "production steps or define a single multi-level bill of materials."
 msgstr ""
+"主物料清单允许创建和管理生产此产品必需的原材料。OpenERP将根据这些物料清单针对产品需求创建生产订单。可以创建一个描述生产步骤的订单也可以定义一个多层"
+"的物料清单。"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
-msgstr ""
+msgstr "如果产品的供应方法是外购，系统创建采购订单。"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1364,34 +1371,34 @@ msgstr "产品成本构成"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Components suppliers"
-msgstr ""
+msgstr "部件供应商"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
-msgstr ""
+msgstr "mrp.installer"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "生产工作中心"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:62
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "没找到对应的记录"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "工作中心列表"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1412,17 +1419,17 @@ msgstr "时间科目"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "成品库位"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
 msgid "Product Consumed"
-msgstr ""
+msgstr "原材料"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "等待中"
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1439,7 +1446,7 @@ msgstr "生产产品"
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "工作中心负载"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1456,7 +1463,7 @@ msgstr "属性"
 #: help:mrp.production,origin:0
 msgid ""
 "Reference of the document that generated this production order request."
-msgstr ""
+msgstr "生成这张生产订单的前置单据编号"
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1465,6 +1472,8 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"所有产品的数量必须大于0。\n"
+"如果需要管理带副产品的BOM请安装 mrp_subproduct 模块"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1474,17 +1483,17 @@ msgstr "额外信息"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "修改产成品数量"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "生成原材料的补货单"
 
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1506,14 +1515,14 @@ msgstr "完成"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr ""
+msgstr "更改标准价"
 
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源单据"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1526,18 +1535,18 @@ msgstr "不紧急"
 msgid ""
 "This will change the price of parent products also according to the BoM "
 "structure specified for the product."
-msgstr ""
+msgstr "这样也会根据这个材料所在的BOM去修改最终产成品的标准价"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr ""
+msgstr "未开始的生产订单"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
-msgstr ""
+msgstr "不能删除状态是 %s 的生产订单"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1546,7 +1555,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1570,7 +1579,7 @@ msgstr "产品"
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr "总小时数"
+msgstr "总工时"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
@@ -1581,7 +1590,7 @@ msgstr "原料库位"
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "打印产品成本结构"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -1595,12 +1604,12 @@ msgid ""
 "Work Centers allow you to create and manage manufacturing units consisting "
 "of one or more persons and/or machines that can be considered as a unit for "
 "capacity and planning forecasting."
-msgstr ""
+msgstr "工作中心允许你创建和管理生产单元，这些单元可以是一个或多个工人或机器。这个单元的能力和计划可供分析。"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "消耗的产品"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1608,26 +1617,26 @@ msgstr ""
 #: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr "产品计量单位"
+msgstr "计量单位"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "按订单生产"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr ""
+msgstr "生产分析"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "副本"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1643,7 +1652,7 @@ msgstr "结束日期"
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "资源"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1659,7 +1668,7 @@ msgstr "产品销售单位"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "行号"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1674,12 +1683,12 @@ msgid ""
 "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."
-msgstr ""
+msgstr "生产产成品需要的一系列操作（发生在一系列工作中心上）。工艺主要用于计算工作中心成本和根据生产计划来规划工作中心负载。"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "核准"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1689,7 +1698,7 @@ msgstr "属性分类"
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr ""
+msgstr "输入序号用于显示工作中心列表"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1714,7 +1723,7 @@ msgstr "产品生产消耗"
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr ""
+msgstr "生产订单"
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1725,12 +1734,14 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"'废料' 模式会仅消耗对应成品数量的原材料而无产成品产出。\n"
+"'报工' 模式会消耗对应成品数量的原材料而且产出对应数量的产成品。"
 
 #. module: mrp
 #: view:mrp.production:0
 #: report:mrp.production.order:0
 msgid "Work Orders"
-msgstr "工作单"
+msgstr "工票"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1741,13 +1752,13 @@ msgstr "每循环成本"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "服务"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1758,7 +1769,7 @@ msgstr "物料清单"
 #: help:mrp.bom,product_uom:0
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
-msgstr ""
+msgstr "基本计量单位是库存控制的计量单位"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1766,7 +1777,7 @@ msgid ""
 "The Bill of Material is the product's decomposition. The components (that "
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
-msgstr ""
+msgstr "物料清单是产品的数量结构。部件也可以有自己的物料清单"
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1777,7 +1788,7 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1796,7 +1807,7 @@ msgstr "生产单"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "自动补货规则"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1813,7 +1824,7 @@ msgstr "产品销售单位数量"
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "部件"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1839,7 +1850,7 @@ msgstr "普通物料清单"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "生产提前期"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1853,7 +1864,7 @@ msgid ""
 "Weekly Stock Value Variation enables you to track the stock value evolution "
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
-msgstr ""
+msgstr "库存周报能帮您监控由生产、收货、发货引起的库存值的变化"
 
 #. module: mrp
 #: view:mrp.product.produce:0
@@ -1863,19 +1874,19 @@ msgstr "确定"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "生产效率"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "错误！您不能创建递归公司."
 
 #. module: mrp
 #: help:mrp.bom,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
-msgstr ""
+msgstr "如果去掉“启用”的勾，可以不用删除就隐藏物料清单"
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1886,24 +1897,24 @@ msgstr "产品舍入"
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr "工作单"
+msgstr "工票"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
 msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
-msgstr ""
+msgstr "此报告可以分析你的生产状况和绩效"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "废料"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
-msgstr "重新创建分拣单"
+msgstr "重建领料/提货"
 
 #. module: mrp
 #: help:mrp.bom,type:0
@@ -1914,6 +1925,8 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"如果一个部件用在很多产品上，给它建个物料清单就会很有用。如果你不想系统为这个部件单独创建生产订单，可以在它的物料清单类型上选择虚拟物料。这样，使用了这个部"
+"件的产品就会把这个部件当作一个整体来处理，而不是单独生产。"
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1931,6 +1944,12 @@ msgid ""
 " 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'."
 msgstr ""
+"新建的生产订单是草稿状态\n"
+"确认后的订单是待料状态\n"
+"如果领料出了问题，订单是领料出错状态\n"
+"如果原材料可用订单是可以生产状态\n"
+"生产开始后订单是正在生产状态\n"
+"生产结束的订单是完成状态"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1961,12 +1980,12 @@ msgstr "总数量"
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
 msgid "Number of Hours"
-msgstr "小时数"
+msgstr "工时数"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "成本信息"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
@@ -1976,12 +1995,12 @@ msgstr "产品需求单"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "生产数量的小数位数"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "生成生产订单或采购订单"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -1991,7 +2010,7 @@ msgstr "上级工艺路线"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2001,12 +2020,12 @@ msgstr "准备小时数"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图片"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2024,7 +2043,7 @@ msgstr "库存值变化"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "按库存预留"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2059,7 +2078,7 @@ msgstr "周"
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "设置进度"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -2070,24 +2089,24 @@ msgstr "一般"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "生产步骤"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "成本结构"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "报工"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
@@ -2100,17 +2119,17 @@ msgid ""
 "Bills of materials components are components and sub-products used to create "
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
-msgstr ""
+msgstr "物料清单部件是组成这个物料清单的部件或子产品。用这个菜单可以找到指定部件在哪个物料清单上被使用了。"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "产品类型是可库存或消耗品"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:595
@@ -2118,12 +2137,12 @@ msgstr ""
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "选择数量"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2144,7 +2163,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "物料清单版本"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -2161,7 +2180,7 @@ msgstr "生产"
 #: code:addons/mrp/report/price.py:194
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "制造费用属于： "
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -2185,17 +2204,17 @@ msgstr "工艺路线"
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "生产工序"
 
 #. module: mrp
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr "安排日期"
+msgstr "下单日期"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "必须为此产品赋予一个生产批次"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -2206,6 +2225,8 @@ 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 the needs."
 msgstr ""
+"OpenERP中的属性用于在一个产品有多个BOM的时候在自动创建生产订单时选择正确的物料清单。可以在物料清单上选择多个属性。在销售订单里输入属性后生成的需"
+"求会自动找到适合的物料清单。"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -2216,32 +2237,32 @@ msgstr "生产单编码"
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "出错的补货单"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "适用最小库存规则的物料"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "产品价格"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
 msgid "MRP Applications Configuration"
-msgstr ""
+msgstr "制造功能配置"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "拆分生产批次"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "修改数量"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2265,17 +2286,17 @@ msgstr "说明"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "生产控制台"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "计划结束日期"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2283,12 +2304,12 @@ msgid ""
 "Work Center Loads gives you a projection of work center loads over a "
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
-msgstr ""
+msgstr "工作中心负载报表展示了一个阶段内的工作中心工作强度。单位是小时或加工次数。"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "根据产品类型确定补货"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2298,30 +2319,30 @@ msgstr "生产管理"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "未开始的生产订单"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "属性组"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
 msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
-msgstr ""
+msgstr "根据可库存产品的供应方法不同，补货单创建询价单或生产订单。 "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2331,14 +2352,14 @@ msgstr "清理小时数"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "自动询价"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
 msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
-msgstr ""
+msgstr "如果这个服务的供应方法是自制，会创建一个项目管理功能中的任务。"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2346,14 +2367,14 @@ msgid ""
 "In order to supply raw material (to be purchased or produced), the "
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
-msgstr ""
+msgstr "MRP的计算过程中，生产订单生成所有部件的补货单直到原材料级别，触发后续的采购订单或生产订单"
 
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
-msgstr ""
+msgstr "输入要生产或采购的产品数量。报表会列出这些数量该产品的成本结构"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -2371,12 +2392,12 @@ msgstr "序列"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "成员请假"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr ""
+msgstr "输入序号用于物料清单列表排序"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2384,13 +2405,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr "原料"
+msgstr "未投料数量"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #, python-format
 #~ msgid "Product name"
@@ -2712,64 +2733,6 @@ msgstr ""
 #~ msgid "Not used in computations, for information purpose only."
 #~ msgstr "不是用来计算.仅仅是信息"
 
-#~ msgid ""
-#~ "\n"
-#~ "    This is the base module to manage the manufacturing process in Open "
-#~ "ERP.\n"
-#~ "\n"
-#~ "    Features:\n"
-#~ "    * Make to Stock / Make to Order (by line)\n"
-#~ "    * Multi-level BoMs, no limit\n"
-#~ "    * Multi-level routing, no limit\n"
-#~ "    * Routing and workcenter integrated with analytic accounting\n"
-#~ "    * Scheduler computation periodically / Just In Time module\n"
-#~ "    * Multi-pos, multi-warehouse\n"
-#~ "    * Different reordering policies\n"
-#~ "    * Cost method by product: standard price, average price\n"
-#~ "    * Easy analysis of troubles or needs\n"
-#~ "    * Very flexible\n"
-#~ "    * Allows to browse Bill of Materials in complete structure\n"
-#~ "        that include child and phantom BoMs\n"
-#~ "    It supports complete integration and planification of stockable goods,\n"
-#~ "    consumable of services. Services are completely integrated with the "
-#~ "rest\n"
-#~ "    of the software. For instance, you can set up a sub-contracting service\n"
-#~ "    in a BoM to automatically purchase on order the assembly of your "
-#~ "production.\n"
-#~ "\n"
-#~ "    Reports provided by this module:\n"
-#~ "    * Bill of Material structure and components\n"
-#~ "    * Load forecast on workcenters\n"
-#~ "    * Print a production order\n"
-#~ "    * Stock forecasts\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这基础模块用来管理系统的生产过程的管理:\n"
-#~ "\n"
-#~ " 特征:\n"
-#~ "    *按库存生产/按单生产(明细)\n"
-#~ "    *多层物料清单(没限制)\n"
-#~ "    *多层工艺路线(没限制)\n"
-#~ "    *工艺路线和生产中心整合与辅助核算项目\n"
-#~ "    *定期调度计算/准时生产模块\n"
-#~ "    *多POS和多仓库\n"
-#~ "    *不同的再下单策略\n"
-#~ "    *产品的成本计算方法:平均价、标准价\n"
-#~ "    *困难和需要的简单分析\n"
-#~ "    *非常灵活\n"
-#~ "    *允许浏览产品清单的完整的结构包括子物料清单和虚项\n"
-#~ "    \n"
-#~ "    它支持完整的整和的和规划的可库存货物,可订购服务.服务是完全集成在软件上.比如,你能设定一个子合同服务,\n"
-#~ "    在物料清单上自动采购你生产的订单组合\n"
-#~ "\t\n"
-#~ "    这模块提供的报表:\n"
-#~ "    *物料清单的结构和组成\n"
-#~ "    *工作中心的工作负荷\n"
-#~ "    *打印生产单\n"
-#~ "    *库存预测\n"
-#~ "    "
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
 
@@ -2955,9 +2918,6 @@ msgstr ""
 #~ msgid "Scheduler Range"
 #~ msgstr "调度范围"
 
-#~ msgid "Procurement Request"
-#~ msgstr "产品需求"
-
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "最低库存采购"
 
@@ -3117,9 +3077,6 @@ msgstr ""
 #~ msgid "Procurement Details"
 #~ msgstr "产品需求详情"
 
-#~ msgid "Scheduled End"
-#~ msgstr "安排结束"
-
 #, python-format
 #~ msgid "Product Standard Price"
 #~ msgstr "产品成本价格"
@@ -3139,26 +3096,97 @@ msgstr ""
 #~ msgid "Exceptions Procurements"
 #~ msgstr "异常备货单"
 
-#~ msgid "Workcenters load"
-#~ msgstr "工作中心负荷"
-
-#~ msgid "Workcenter Load"
-#~ msgstr "工作中心负荷"
-
-#~ msgid "MRP Management - Reporting"
-#~ msgstr "MRP管理 - 报表"
-
-#~ msgid "Workcenter Loads"
-#~ msgstr "工作中心负荷"
-
-#~ msgid ""
-#~ "A module that adds new reports based on MRP cases.\n"
-#~ "    Workcenter loads, Weekly Stock value variation"
-#~ msgstr "这模块增加新的报表基于MRP业务个案,工作中心负荷,每周的库存变化"
-
 #, python-format
 #~ msgid "No address defined for the supplier"
 #~ msgstr "供应商地址未定义"
 
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "MRP&物流调度"
+#~ msgid "Specify Cost of Work center per cycle."
+#~ msgstr "输入工作中心每个循环的成本"
+
+#~ 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 "这个工作中心可以并行工作的数量。如果一个工作中心是一个5个工人组成的团队，每个循环的能力就是5"
+
+#~ msgid "Workcenter Usage"
+#~ msgstr "使用的工作中心"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in OpenERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and work center integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    Dashboard provided by this module::\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out picking)\n"
+#~ "    * Graph of work center load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这是OpenERP中管理生产过程的基本模块。\n"
+#~ "功能：\n"
+#~ "按订单生产或按库存生产\n"
+#~ "多层物料清单，层数不限\n"
+#~ "多层工艺，层数不限\n"
+#~ "工艺和工作中心与辅助核算会计集成\n"
+#~ "定期运行MRP或使用即时计算模块\n"
+#~ "多地点，多仓库\n"
+#~ "多种补货规则\n"
+#~ "每个产品的成本计价方式：标准价或移动平均价\n"
+#~ "容易诊断问题和需求\n"
+#~ "非常灵活\n"
+#~ "能够以复杂的结构展示物料清单\n"
+#~ "支持子BOM和虚拟BOM\n"
+#~ "支持可库存产品、消耗品和服务的完全集成和计划\n"
+#~ "服务也与软件的其他功能很好地集成了。例如，你\n"
+#~ "可以在BOM里添加一个外包的服务产品，这样就能\n"
+#~ "自动创建装配的外包订单。\n"
+#~ "\n"
+#~ "此模块提供的报表：\n"
+#~ "BOM结构和部件\n"
+#~ "工作中心的负载计划\n"
+#~ "打印生产订单\n"
+#~ "库存规划\n"
+#~ "\n"
+#~ "此模块提供的控制台：\n"
+#~ "未完成的生产订单列表\n"
+#~ "发货单列表\n"
+#~ "工作中心负载图\n"
+#~ "补货错误的列表\n"
+#~ "    "
+
+#~ 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) "
+#~ "will be automatically pre-completed."
+#~ msgstr "工艺指定了哪些工作中心要做多少时间或次数。如果选定了工序，生产订单的第三个标签页（工作中心）就会被自动填充。"
+
+#~ msgid ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr "工作中心的描述。说明此工作中心的细节。"
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index d9fec21436d..5c395b63b99 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -716,7 +716,7 @@ msgid "Per month"
 msgstr "每月"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -729,7 +729,7 @@ msgid "Product Name"
 msgstr "貨品名稱"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1295,7 +1295,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1306,7 +1306,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1535,7 +1535,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1625,7 +1625,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2114,7 +2114,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2647,6 +2647,3 @@ msgstr ""
 
 #~ msgid "References"
 #~ msgstr "參照"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "物料需求計劃 & 物流調度"
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index f069201a047..7afc22bac08 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: 2011-04-29 04:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -715,7 +715,7 @@ msgid "Per month"
 msgstr "每月"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -728,7 +728,7 @@ msgid "Product Name"
 msgstr "貨品名稱"
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -1294,7 +1294,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:914
+#: code:addons/mrp/mrp.py:924
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1305,7 +1305,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:630
+#: code:addons/mrp/mrp.py:640
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1534,7 +1534,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:491
+#: code:addons/mrp/mrp.py:495
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1624,7 +1624,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:345
+#: code:addons/mrp/mrp.py:349
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -2113,7 +2113,7 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/mrp.py:595
 #: code:addons/mrp/wizard/change_production_qty.py:77
 #: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
@@ -2640,6 +2640,3 @@ msgstr ""
 
 #~ msgid "Machine"
 #~ msgstr "機器"
-
-#~ msgid "MRP & Logistics Scheduler"
-#~ msgstr "物料需求計劃 & 物流調度"
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
deleted file mode 100644
index 7fc7fea9c1e..00000000000
--- a/addons/mrp/installer.py
+++ /dev/null
@@ -1,52 +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 osv import fields, osv
-
-class mrp_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Manufacturing Resource Planning
-        'stock_location': fields.boolean('Advanced Routes',
-            help="Manages product routes and paths within and between "
-                 "locations (e.g. warehouses)."),
-        'mrp_jit': fields.boolean('Just In Time Scheduling',
-            help="Enables Just In Time computation of procurement orders."
-                 "\n\nWhile it's more resource intensive than the default "
-                 "setup, the JIT computer avoids having to wait for the "
-                 "procurement scheduler to run or having to run the "
-                 "procurement scheduler manually."),
-        'mrp_operations': fields.boolean('Manufacturing Operations',
-            help="Enhances production orders with readiness states as well "
-                 "as the start date and end date of execution of the order."),
-        'mrp_subproduct': fields.boolean('MRP Subproducts',
-            help="Enables multiple product output from a single production "
-                 "order: without this, a production order can have only one "
-                 "output product."),
-        'mrp_repair': fields.boolean('Repairs',
-            help="Enables warranty and repair management (and their impact "
-                 "on stocks and invoicing)."),
-        }
-
-    _defaults = {
-        'mrp_jit': lambda self,cr,uid,*a: self.pool.get('res.users').browse(cr, uid, uid).view == 'simple',
-    }
-mrp_installer()
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index ec429488914..356a762c0c5 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -21,6 +21,7 @@
 
 from datetime import datetime
 from osv import osv, fields
+import decimal_precision as dp
 from tools.translate import _
 import netsvc
 import time
@@ -205,7 +206,7 @@ class mrp_bom(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uos_qty': fields.float('Product UOS Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
-        'product_qty': fields.float('Product Qty', required=True),
+        'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product UoM')),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"),
         'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."),
         'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
@@ -258,7 +259,7 @@ class mrp_bom(osv.osv):
         return check_bom(boms)
 
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive BoM.', ['parent_id']),
+        (_check_recursion, 'Error ! You cannot create recursive BoM.', ['parent_id']),
         (_check_product, 'BoM line product should not be same as BoM product.', ['product_id']),
     ]
 
@@ -274,9 +275,7 @@ class mrp_bom(osv.osv):
             
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            v = {'product_uom': prod.uom_id.id}
-            if not name:
-                v['name'] = prod.name
+            v = {'name': prod.name, 'product_uom': prod.uom_id.id}
             return {'value': v}
         return {}
 
@@ -301,7 +300,7 @@ class mrp_bom(osv.osv):
                 max_prop = prop
         return result
 
-    def _bom_explode(self, cr, uid, bom, factor, properties=[], addthis=False, level=0):
+    def _bom_explode(self, cr, uid, bom, factor, properties=[], addthis=False, level=0, 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.
@@ -311,6 +310,7 @@ class mrp_bom(osv.osv):
         @return: result: List of dictionaries containing product details.
                  result2: List of dictionaries containing Work Center details.
         """
+        routing_obj = self.pool.get('mrp.routing')
         factor = factor / (bom.product_efficiency or 1.0)
         factor = rounding(factor, bom.product_rounding)
         if factor < bom.product_rounding:
@@ -338,8 +338,9 @@ class mrp_bom(osv.osv):
                     'product_uos_qty': bom.product_uos and bom.product_uos_qty * factor or False,
                     'product_uos': bom.product_uos and bom.product_uos.id or False,
                 })
-            if bom.routing_id:
-                for wc_use in bom.routing_id.workcenter_lines:
+            routing = (routing_id and routing_obj.browse(cr, uid, routing_id)) or bom.routing_id or False
+            if routing:
+                for wc_use in routing.workcenter_lines:
                     wc = wc_use.workcenter_id
                     d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
                     mult = (d + (m and 1.0 or 0.0))
@@ -447,7 +448,7 @@ class mrp_production(osv.osv):
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority'),
 
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_qty': fields.float('Product Qty', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
@@ -465,21 +466,21 @@ class mrp_production(osv.osv):
 
         '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."),
-
         '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', 'Move product', 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', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Moves Created', 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','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+        'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
         'hour_total': fields.function(_production_calc, 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'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
@@ -490,6 +491,9 @@ class mrp_production(osv.osv):
         '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),
     }
+    _sql_constraints = [
+        ('name_uniq', 'unique(name, company_id)', 'Reference must be unique per Company!'),
+    ]
     _order = 'priority desc, date_planned asc';
 
     def _check_qty(self, cr, uid, ids, context=None):
@@ -500,7 +504,7 @@ class mrp_production(osv.osv):
         return True
 
     _constraints = [
-        (_check_qty, 'Order quantity cannot be negative or zero !', ['product_qty']),
+        (_check_qty, 'Order quantity cannot be negative or zero!', ['product_qty']),
     ]
 
     def unlink(self, cr, uid, ids, context=None):
@@ -510,7 +514,7 @@ class mrp_production(osv.osv):
             if s['state'] in ['draft','cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Production Order(s) which are in %s State!') % s['state'])
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a manufacturing order in the state \'%s\'!') % s['state'])
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -612,9 +616,8 @@ class mrp_production(osv.osv):
 
             if not bom_id:
                 raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
-
             factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_point.product_uom.id)
-            res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
+            res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties, routing_id=production.routing_id.id)
             results = res[0]
             results2 = res[1]
             for line in results:
@@ -681,6 +684,17 @@ class mrp_production(osv.osv):
                 res = False
         return res
 
+    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 if the 
+            module mrp_subproduct is installed, then we must use the move_id to identify the product to produce 
+            and its quantity.
+        :param production_id: ID of the mrp.order
+        :param move_id: ID of the stock move that needs to be produced. Will be used in mrp_subproduct.
+        :return: The factor to apply to the quantity that we should produce for the given production order.
+        """
+        return 1
+
     def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
         """ To produce final product based on production mode (consume/consume&produce).
         If Production mode is consume, all stock move lines of raw materials will be done/consumed.
@@ -694,44 +708,50 @@ class mrp_production(osv.osv):
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id, context=context)
 
-
         produced_qty = 0
-        if production_mode == 'consume_produce':
-            produced_qty = production_qty
-
         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']:
-            consumed_products = {}
-            check = {}
-            scrapped = map(lambda x:x.scrapped,production.move_lines2).count(True)
+            consumed_data = {}
 
-            for consumed_product in production.move_lines2:
-                consumed = consumed_product.product_qty
-                if consumed_product.scrapped:
+            # Calculate already consumed qtys
+            for consumed in production.move_lines2:
+                if consumed.scrapped:
                     continue
-                if not consumed_products.get(consumed_product.product_id.id, False):
-                    consumed_products[consumed_product.product_id.id] = consumed_product.product_qty
-                    check[consumed_product.product_id.id] = 0
-                for f in production.product_lines:
-                    if f.product_id.id == consumed_product.product_id.id:
-                        if (len(production.move_lines2) - scrapped) > len(production.product_lines):
-                            check[consumed_product.product_id.id] += consumed_product.product_qty
-                            consumed = check[consumed_product.product_id.id]
-                        rest_consumed = produced_qty * f.product_qty / production.product_qty - consumed
-                        consumed_products[consumed_product.product_id.id] = rest_consumed
+                if not consumed_data.get(consumed.product_id.id, False):
+                    consumed_data[consumed.product_id.id] = 0
+                consumed_data[consumed.product_id.id] += consumed.product_qty
 
-            for raw_product in production.move_lines:
-                for f in production.product_lines:
-                    if f.product_id.id == raw_product.product_id.id:
-                        consumed_qty = consumed_products.get(raw_product.product_id.id, 0)
-                        if consumed_qty == 0:
-                            consumed_qty = production_qty * f.product_qty / production.product_qty
-                        if consumed_qty > 0:
-                            stock_mov_obj.action_consume(cr, uid, [raw_product.id], consumed_qty, raw_product.location_id.id, context=context)
+            # Find product qty to be consumed and consume it
+            for scheduled in production.product_lines:
+
+                # total qty of consumed product we need after this consumption
+                total_consume = ((production_qty + produced_qty) * scheduled.product_qty / production.product_qty)
+
+                # qty available for consume and produce
+                qty_avail = scheduled.product_qty - consumed_data.get(scheduled.product_id.id, 0.0)
+
+                if qty_avail <= 0.0:
+                    # there will be nothing to consume for this raw material
+                    continue
+
+                raw_product = [move for move in production.move_lines if move.product_id.id==scheduled.product_id.id]
+                if raw_product:
+                    # qtys we have to consume
+                    qty = total_consume - consumed_data.get(scheduled.product_id.id, 0.0)
+
+                    if qty > qty_avail:
+                        # if qtys we have to consume is more than qtys available to consume
+                        prod_name = scheduled.product_id.name_get()[0][1]
+                        raise osv.except_osv(_('Warning!'), _('You are going to consume total %s quantities of "%s".\nBut you can consume upto total %s quantities.' % (qty, prod_name, qty_avail)))
+                    if qty < 0.0:
+                        # we already have more qtys consumed than we need 
+                        continue
+
+                    raw_product[0].action_consume(qty, raw_product[0].location_id.id, context=context)
 
         if production_mode == 'consume_produce':
             # To produce remaining qty of final product
@@ -749,11 +769,14 @@ class mrp_production(osv.osv):
 
             for produce_product in production.move_created_ids:
                 produced_qty = produced_products.get(produce_product.product_id.id, 0)
-                rest_qty = production.product_qty - produced_qty
-                if rest_qty <= production_qty:
-                    production_qty = rest_qty
+                subproduct_factor = self._get_subproduct_factor(cr, uid, production.id, produce_product.id, context=context)
+                rest_qty = (subproduct_factor * production.product_qty) - produced_qty
+
+                if rest_qty < production_qty:
+                    prod_name = produce_product.product_id.name_get()[0][1]
+                    raise osv.except_osv(_('Warning!'), _('You are going to produce total %s quantities of "%s".\nBut you can produce upto total %s quantities.' % (production_qty, prod_name, rest_qty)))
                 if rest_qty > 0 :
-                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, context=context)
+                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], (subproduct_factor * production_qty), context=context)
 
         for raw_product in production.move_lines2:
             new_parent_ids = []
@@ -983,7 +1006,7 @@ class mrp_production_product_line(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Product Qty', required=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_uos_qty': fields.float('Product UOS Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 8d82d16a7ec..b4d4551bda8 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -1,23 +1,43 @@
 <openerp>
   <data>
-    <record id="view_mrp_installer" model="ir.ui.view">
-      <field name="name">mrp.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='mrp']" position="replace">
-            <newline/>
-            <separator  string="Manufacturing Features" colspan="4" />
-            <field name="stock_location" />
-            <field name="mrp_jit" />
-            <field name="mrp_operations" />
-            <field name="mrp_subproduct" />
-            <field name="mrp_repair" />            
-          </xpath>
-        </data>
-      </field>
+    <record id="category_mrp_config" model="ir.actions.todo.category">
+        <field name="name">MRP Management</field>
+        <field name="sequence">6</field>
     </record>
-  </data>
+
+    <record id="action_configure_workcenter" model="ir.actions.act_window">
+        <field name="name">Configure your work centers</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workcenter</field>
+        <field name="view_mode">form,tree</field>
+        <field name="view_type">form</field>
+    </record>
+
+    <record id="todo_action_configure_workcenter" model="ir.actions.todo">
+        <field name="action_id" ref="action_configure_workcenter" />
+        <field name="category_id" ref="category_mrp_config" />
+        <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
+    </record>
+
+    <record id="todo_action_create_bill_of_materials" model="ir.actions.todo">
+        <field name="action_id" ref="mrp_bom_form_action" />
+        <field name="category_id" ref="category_mrp_config" />
+    </record>
+
+    <record id="product_form_config_action" model="ir.actions.act_window">
+        <field name="name">Create or Import Products</field>
+        <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</field>
+        <field name="view_id" ref="product.product_product_tree_view"/>
+        <field name="help">Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.</field>
+    </record>
+
+    <record id="config_wizard_res_product_installer" model="ir.actions.todo">
+        <field name="action_id" ref="product_form_config_action"/>
+        <field name="category_id" ref="category_mrp_config" />
+        <field name="sequence">20</field>
+    </record>
+</data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5d23608769b..dafe399b583 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -79,13 +79,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name"/>
                        <field name="composition"/>
                        <field name="group_id"  widget="selection" />
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                         <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                     </group>
                </search>
@@ -183,7 +183,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
-                   <group col='15' colspan='4'>
+                   <group>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
@@ -191,7 +191,7 @@
                         <field name="resource_type"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                   <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -289,7 +289,7 @@
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
                 </search>
@@ -304,7 +304,7 @@
             <field name="search_view_id" ref="mrp_routing_search_view"/>
             <field name="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.</field>
         </record>
-        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="1"/>
 
         <!--
           Bill of Materials
@@ -420,14 +420,14 @@
            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
-                    <group col='4' colspan='4'>
+                    <group>
                          <field name="name"/>
                          <field name="code" string="Reference"/>
                          <field name="product_id"/>
                          <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
                         <separator orientation="vertical"/>
@@ -529,7 +529,6 @@
             <field eval="'mrp.bom'" name="model"/>
             <field name="name">Bill of Materials Structure</field>
             <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <record id="mrp_bom_revision_tree" model="ir.ui.view">
@@ -660,7 +659,7 @@
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                <tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                <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="Qty"/>
                                     <field name="product_uom"  string="UOM"/>
@@ -684,7 +683,7 @@
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                        widget="one2many_list" mode="tree,form" height="275">
-                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel') " string="Consumed Products" editable="bottom">
+                                   <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" string="Qty"/>
                                        <field name="product_uom" readonly="1" string="UOM"/>
@@ -700,7 +699,7 @@
                                </field>
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                                 <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
@@ -731,7 +730,7 @@
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                        widget="one2many_list" mode="tree,form" height="275">
-                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
+                                   <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" string="Qty"/>
                                        <field name="product_uom" readonly="1" string="UOM"/>
@@ -777,6 +776,7 @@
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
+                            <field name="user_id"/> 
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
@@ -796,7 +796,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Production">
-                   <group col='9' colspan='4'>
+                   <group>
                        <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
                            domain="[('state','=','confirmed')]"
                            help="Manufacturing Orders which are waiting for raw materials."/>
@@ -808,7 +808,7 @@
                            help="Manufacturing Orders which are currently in production."/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                           domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                            help="Production started late" />
                        <separator orientation="vertical"/>
                        <field name="name"/>
@@ -817,7 +817,7 @@
                        <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
@@ -985,6 +985,7 @@
             id="action_product_bom_structure"
             name="Product BoM Structure"
             domain="[('product_id', '=', active_id),('bom_id','=',False)]"
+            context="{'default_product_id': active_id}"
             view_type="tree"
             view_id="mrp_bom_tree_view"
             res_model="mrp.bom"
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 41a9d7993a2..4086a401f56 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -100,8 +100,9 @@ class procurement_order(osv.osv):
             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)
-            move_obj.write(cr, uid, [res_id],
-                    {'location_id': procurement.location_id.id})
+            if res_id:
+                move_obj.write(cr, uid, [res_id],
+                        {'location_id': procurement.location_id.id})
         return res
     
 procurement_order()
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 7301527f68e..c3f9ee855df 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -53,42 +53,8 @@ class product_product(osv.osv):
     _columns = {
         "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
     }
-
-    def do_change_standard_price(self, cr, uid, ids, datas, context=None):
-        """ Changes the Standard Price of Product and parent products and creates an account move accordingly.
-        @param datas: dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
-        @param context: A standard dictionary
-        @return:
-        """
-        if context is None:
-            context = {}
-        res = super(product_product, self).do_change_standard_price(cr, uid, ids, datas, context=context)
-        bom_obj = self.pool.get('mrp.bom')
-        change = context.get('change_parent_price', False)
-        def _compute_price(bom):
-            price = 0.0
-            if bom.bom_id and change:
-                if bom.bom_id.bom_lines:
-                    for bom_line in bom.bom_id.bom_lines:
-                        prod_price = self.read(cr, uid, bom_line.product_id.id, ['standard_price'])['standard_price']
-                        price += bom_line.product_qty * prod_price
-
-                    accounts = self.get_product_accounts(cr, uid, bom.bom_id.product_id.id, context)
-
-                    datas = {
-                        'new_price': price,
-                        'stock_output_account': accounts['stock_account_output'],
-                        'stock_input_account': accounts['stock_account_input'],
-                        'stock_journal': accounts['stock_journal']
-                    }
-                    super(product_product, self).do_change_standard_price(cr, uid, [bom.bom_id.product_id.id], datas, context)
-                _compute_price(bom.bom_id)
-            return price
-
-        bom_ids = bom_obj.search(cr, uid, [('product_id', 'in', ids)])
-
-        for bom in bom_obj.browse(cr, uid, bom_ids, context=context):
-            _compute_price(bom)
+    
+#    Removed do_change_standard_price for the fix of lp:747056
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -100,3 +66,5 @@ class product_product(osv.osv):
 
 
 product_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/report/custom_default.xsl b/addons/mrp/report/custom_default.xsl
index aa5eb22d8e0..d98cd940942 100644
--- a/addons/mrp/report/custom_default.xsl
+++ b/addons/mrp/report/custom_default.xsl
@@ -39,7 +39,7 @@
 
 	<xsl:template name="first_page_frames">
 		<xsl:if test="$page_format='a4_normal'">
-			<frame id="main" x1="1cm" y1="2.5cm" width="21.0cm" height="29.0cm"/>
+			<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="25.0cm"/>
 		</xsl:if>
 
 		<xsl:if test="$page_format='a4_letter'">
@@ -49,7 +49,7 @@
 	</xsl:template>
 
 	<xsl:template name="other_pages_frames">
-		<frame id="main" x1="1cm" y1="2.5cm" width="21.0cm" height="29cm"/>
+		<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="25.0cm"/>
 	</xsl:template>
 
 </xsl:stylesheet>
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index 3ad4184c413..d0ff7ba7970 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -19,118 +19,6 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import tools
 
 
-class mrp_production_order(osv.osv):
-    _name = "mrp.production.order"
-    _description = "Production Order Report"
-    _auto = False
-    _columns = {
-        'year': fields.char('Year',size=64,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=64,readonly=True),
-        'origin': fields.char('Source Document', size=64),
-        'nbr': fields.integer('# of Lines', readonly=True),
-        'products_to_consume': fields.integer('Products to Consume', readonly=True),
-        'consumed_products': fields.integer('Consumed Products', readonly=True),
-        'date': fields.date('Date', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'product_id2': fields.many2one('product.product', 'Product Consumed', readonly=True),
-        'product_qty': fields.float('Product Qty', readonly=True),
-        'state': fields.selection([('draft','Draft'),
-                                   ('picking_except', 'Picking Exception'),
-                                   ('confirmed','Waiting Goods'),
-                                   ('ready','Ready to Produce'),
-                                   ('in_production','In Production'),
-                                   ('cancel','Cancelled'),
-                                   ('done','Done')],
-                                    'State', readonly=True),
-        'date_planned':fields.date('Scheduled Date'),
-        'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True),
-        'date_start': fields.datetime('Start Date',readonly=True),
-        'date_finished': fields.datetime('End Date',readonly=True),
-        'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True),
-        'company_id': fields.many2one('res.company','Company',readonly=True),
-        'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True),
-        'routing_id': fields.many2one('mrp.routing', string='Routing',readonly=True),
-        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', readonly=True),
-        'priority': fields.selection([('0','Not urgent'),
-                                      ('1','Normal'),
-                                      ('2','Urgent'),
-                                      ('3','Very Urgent')],
-                                       'Priority',readonly=True),
-
-
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'mrp_production_order')
-        cr.execute("""
-            create or replace view mrp_production_order as (
-                select
-                     min(l.id) as id,
-                     to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
-                     to_char(s.create_date, 'YYYY') as year,
-                     to_char(s.create_date, 'MM') as month,
-                     to_char(s.create_date, 'YYYY-MM-DD') as day,
-                     s.product_id as product_id,
-                     l.product_id as product_id2,
-                     l.product_uom,
-                     sum(l.product_qty * u.factor) as product_qty,
-                     s.company_id as company_id,
-                     (select 1) as nbr,
-                     (select sum(sm.product_qty) from stock_move as sm
-                        left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
-                        left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
-                        where sm.product_id=ll.product_id and ll.id=l.id
-                        and sm.state not in ('done','cancel')
-                        group by sm.product_id) as products_to_consume,
-                    (select sum(sm.product_qty)/2 from stock_move as sm
-                        left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
-                        left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
-                        where sm.product_id=ll.product_id and ll.id=l.id
-                        and sm.state in ('done','cancel')
-                        group by sm.product_id) as consumed_products,
-                     s.location_src_id,
-                     s.location_dest_id,
-                     s.bom_id,
-                     s.routing_id,
-                     s.picking_id,
-                     s.date_start,
-                     s.date_finished,
-                     to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_planned,
-                     s.origin,
-                     s.priority,
-                     s.state
-                 from mrp_production_product_line l
-                 left join mrp_production s on (s.id=l.production_id)
-                 left join product_uom u on (u.id=l.product_uom)
-                 group by
-                     to_char(s.create_date, 'YYYY'),
-                     to_char(s.create_date, 'MM'),
-                     to_char(s.create_date, 'YYYY-MM-DD'),
-                     to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY'),
-                     l.product_id,
-                     s.product_id,
-                     l.product_uom,
-                     s.id,
-                     l.id,
-                     s.bom_id,
-                     s.routing_id,
-                     s.picking_id,
-                     s.priority,
-                     s.location_src_id,
-                     s.location_dest_id,
-                     s.state,
-                     to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'),
-                     s.origin,
-                     s.date_start,
-                     s.date_finished,
-                     s.company_id
-            )""")
-mrp_production_order()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 624db57bcf3..140170e4906 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -1,134 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!--
-	Production Order Report
-	-->
-
-        <record id="view_report_mrp_production_order_tree" model="ir.ui.view">
-            <field name="name">mrp.production.order.tree</field>
-            <field name="model">mrp.production.order</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-               <tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('done','cancel') " string="Production">
-                      <field name="date_planned"/>
-                      <field name="bom_id" invisible="1"/>
-                      <field name="product_id" invisible="1"/>
-                      <field name="product_qty" sum='Product Qty'/>
-                      <field name="nbr" string="#Line Orders" sum='#Line Orders'/>
-                      <field name="state" invisible="1"/>
-                      <field name="picking_id" invisible="1"/>
-                      <field name="priority" invisible="1"/>
-                      <field name="day" invisible="1" />
-                      <field name="month" invisible="1" />
-                      <field name="year" invisible="1" />
-                      <field name="location_src_id" invisible="1"/>
-                      <field name="location_dest_id" invisible="1"/>
-                      <field name="company_id" groups="base.group_multi_company" invisible="1"/>
-				</tree>
-            </field>
-        </record>
-
-        <record id="view_report_mrp_production_order_graph" model="ir.ui.view">
-            <field name="name">mrp.production.order.graph</field>
-            <field name="model">mrp.production.order</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Production" type="bar">
-                    <field name="state"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-		<record id="view_report_mrp_production_order_filter" model="ir.ui.view">
-            <field name="name">mrp.production.order.select</field>
-            <field name="model">mrp.production.order</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search">
-                  <group col="16" colspan="6">
-	                    <filter icon="terp-go-year" string="Year"
-	                    	    domain="[('year','=',time.strftime('%%Y'))]"
-	                    	    help="Production performed during current year"/>
-	                    <filter icon="terp-go-month" string="Month"
-	                    		name="month"
-	                    		domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-	                    		help="Production performed during current month"/>
-		                <filter icon="terp-go-week"
-	                            string="Month -1"
-	                            separator="1"
-	                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-	                            help="Production during last month"/>
-                      <separator orientation="vertical"/>
-                        <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
-                        <filter icon="terp-check" string="In Production" domain="[('state','=','in_production')]"/>
-                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
-                      <separator orientation="vertical"/>
-                        <field name="location_src_id" />
-                        <field name="location_dest_id" />
-                   </group>
-                   <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
-                        <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
-                        <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
-                        <separator orientation="vertical"/>
-                      <field name="priority"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" groups="base.group_multi_company"/>
-                      <newline/>
-                        <field name="date_start"/>
-                      <field name="date_planned"/>
-                      <field name="date_finished"/>
-                    </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
-                    	<filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
-                    	<filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
-                    	<separator orientation="vertical"/>
-                        <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
-                    	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
-                    	<separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    	<separator orientation="vertical" groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
-                   </group>
-                  </search>
-            </field>
-        </record>
-        <record id="action_report_mrp_production_order" model="ir.actions.act_window">
-            <field name="name">Production Analysis</field>
-            <field name="res_model">mrp.production.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="view_id" ref="view_report_mrp_production_order_tree"/>
-            <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
-            <field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="help">This reporting allows you to analyse your manufacturing activities and performance.</field>
-        </record>
-
-       	<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_mrp_production_order_tree"/>
-	        <field name="act_window_id" ref="action_report_mrp_production_order"/>
-	    </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_mrp_production_order_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_mrp_production_order_graph"/>
-	        <field name="act_window_id" ref="action_report_mrp_production_order"/>
-	    </record>
-
-        <menuitem name="Production Analysis" action="action_report_mrp_production_order" id="menu_report_mrp_production_orders_tree" parent="next_id_77"/>
 
   </data>
 </openerp>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 733312ba799..c072b821196 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -19,16 +19,14 @@
 #
 ##############################################################################
 
+import time
 import pooler
 from report.interface import report_rml
-#from report.interface import toxml
 from tools import to_xml
 from report import report_sxw
 from datetime import datetime
 from tools.translate import _
 
-
-#FIXME: we should use toxml
 class report_custom(report_rml):
     def create_xml(self, cr, uid, ids, datas, context=None):
         number = (datas.get('form', False) and datas['form']['number']) or 1
@@ -39,6 +37,7 @@ class report_custom(report_rml):
         workcenter_pool = pool.get('mrp.workcenter')
         user_pool = pool.get('res.users')
         bom_pool = pool.get('mrp.bom')
+        pricelist_pool = pool.get('product.pricelist')
         rml_obj=report_sxw.rml_parse(cr, uid, product_pool._name,context)
         rml_obj.localcontext.update({'lang':context.get('lang',False)})
         company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id
@@ -48,29 +47,38 @@ class report_custom(report_rml):
             sum_strd = 0
             prod = product_pool.browse(cr, uid, bom['product_id'])
 
-            prod_name = bom['name']
+            prod_name = to_xml(bom['name'])
             prod_qtty = factor * bom['product_qty']
             product_uom = product_uom_pool.browse(cr, uid, bom['product_uom'], context=context)
+            product_uom_name = to_xml(product_uom.name)
             main_sp_price, main_sp_name , main_strd_price = '','',''
             sellers, sellers_price = '',''
 
             if prod.seller_id:
-                main_sp_name = "<b>%s</b>\r\n" %(prod.seller_id.name)
-                price = supplier_info_pool.price_get(cr, uid, prod.seller_id.id, prod.id, number*prod_qtty)[prod.seller_id.id]
-                price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
+                main_sp_name = '- <b>'+ to_xml(prod.seller_id.name) +'</b>\r\n'
+                pricelist =  prod.seller_id.property_product_pricelist_purchase
+                price = pricelist_pool.price_get(cr,uid,[pricelist.id],
+                     prod.id, number*prod_qtty or 1.0, prod.seller_id.id, {
+                        'uom': prod.uom_po_id.id,
+                        'date': time.strftime('%Y-%m-%d'),
+                        })[pricelist.id]
                 main_sp_price = """<b>"""+rml_obj.formatLang(price)+' '+ company_currency.symbol+"""</b>\r\n"""
                 sum += prod_qtty*price
             std_price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, prod.standard_price, to_uom_id=product_uom.id)
             main_strd_price = str(std_price) + '\r\n'
             sum_strd = prod_qtty*std_price
             for seller_id in prod.seller_ids:
-                sellers +=  '- <i>'+ seller_id.name.name +'</i>\r\n'
-                price = supplier_info_pool.price_get(cr, uid, seller_id.name.id, prod.id, number*prod_qtty)[seller_id.name.id]
-                price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
+                sellers +=  '- <i>'+ to_xml(seller_id.name.name) +'</i>\r\n'
+                pricelist = seller_id.name.property_product_pricelist_purchase
+                price = pricelist_pool.price_get(cr,uid,[pricelist.id],
+                     prod.id, number*prod_qtty or 1.0, seller_id.name.id, {
+                        'uom': prod.uom_po_id.id,
+                        'date': time.strftime('%Y-%m-%d'),
+                        })[pricelist.id]
                 sellers_price += """<i>"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""</i>\r\n"""
             xml += """<col para='yes'> """+ prod_name +""" </col>
                     <col para='yes'> """+ main_sp_name + sellers + """ </col>
-                    <col f='yes'>"""+ rml_obj.formatLang(prod_qtty) +' '+ product_uom.name +"""</col>
+                    <col f='yes'>"""+ rml_obj.formatLang(prod_qtty) +' '+ product_uom_name +"""</col>
                     <col f='yes'>"""+ rml_obj.formatLang(float(main_strd_price)) +' '+ company_currency.symbol +"""</col>
                     <col f='yes'>""" + main_sp_price + sellers_price + """</col>'"""
 
@@ -83,7 +91,7 @@ class report_custom(report_rml):
             cost_hour = wrk['hour']*workcenter.costs_hour
             total = cost_cycle + cost_hour
             xml = '<row>'
-            xml += "<col para='yes'>" + workcenter.name + '</col>'
+            xml += "<col para='yes'>" + to_xml(workcenter.name) + '</col>'
             xml += "<col/>"
             xml += """<col f='yes'>"""+rml_obj.formatLang(cost_cycle)+' '+ company_currency.symbol + """</col>"""
             xml += """<col f='yes'>"""+rml_obj.formatLang(cost_hour)+' '+ company_currency.symbol + """</col>"""
@@ -132,9 +140,10 @@ class report_custom(report_rml):
         purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
 
         for product in product_pool.browse(cr, uid, ids, context=context):
+            product_uom_name = to_xml(product.uom_id.name)
             bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
             title = "<title>%s</title>" %(_("Cost Structure"))
-            title += "<title>%s</title>" %product.name
+            title += "<title>%s</title>" % (to_xml(product.name))
             xml += "<lines style='header'>" + title + prod_header + "</lines>"
             if not bom_id:
                 total_strd = number * product.standard_price
@@ -147,7 +156,7 @@ class report_custom(report_rml):
                     <col para='yes'>-</col>
                     </row></lines>"""
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost of %s %s') % (str(number), product.uom_id.name) + """: </col>
+                    <col> """ + _('Total Cost of %s %s') % (str(number), product_uom_name) + """: </col>
                     <col/>
                     <col f='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -174,7 +183,7 @@ class report_custom(report_rml):
 
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                 xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Components Cost of %s %s') % (str(number), product.uom_id.name) + """: </col>
+                    <col> """ + _('Components Cost of %s %s') % (str(number), product_uom_name) + """: </col>
                     <col/>
                     <col t='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -191,14 +200,14 @@ class report_custom(report_rml):
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                     xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Work Cost of %s %s') % (str(number), product.uom_id.name) +""": </col>
+                    <col> """ + _('Work Cost of %s %s') % (str(number), product_uom_name) +""": </col>
                     <col/>
                     <col/>
                     <col/>
                     <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
                     </row></lines>'"""
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost of %s %s') % (str(number), product.uom_id.name) + """: </col>
+                    <col> """ + _('Total Cost of %s %s') % (str(number), product_uom_name) + """: </col>
                     <col/>
                     <col t='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -210,3 +219,5 @@ class report_custom(report_rml):
         return xml
 
 report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/report/price.xsl b/addons/mrp/report/price.xsl
index edf98a08e9a..5d00cb5045b 100644
--- a/addons/mrp/report/price.xsl
+++ b/addons/mrp/report/price.xsl
@@ -3,6 +3,8 @@
 
 	<xsl:import href="custom_default.xsl"/>
 	<xsl:import href="custom_rml.xsl"/>
+	<xsl:variable name="page_format">a4_normal</xsl:variable>
+
 
 	<xsl:template match="/">
 		<xsl:call-template name="rml"/>
@@ -11,7 +13,7 @@
 	<!-- stylesheet -->
 
 	<xsl:template name="stylesheet">
-		<paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" leftIndent="-8.0cm" alignment="center"/>
+		<paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" alignment="center"/>
 		<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
 		<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
 		<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 4af31e9c902..1d93fb460b5 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -29,7 +29,6 @@
 "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_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
 "access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
 "access_product_product_manager","product.product manager","product.model_product_product","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 94f79769268..fb83f8c4a62 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -37,5 +37,19 @@
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
+    <record model="ir.rule" id="mrp_routing_rule">
+        <field name="name">mrp_routing multi-company</field>
+        <field name="model_id" search="[('model','=','mrp.routing')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+    </record>
+
+    <record model="ir.rule" id="mrp_routing_workcenter_rule">
+        <field name="name">mrp_routing_workcenter multi-company</field>
+        <field name="model_id" search="[('model','=','mrp.routing.workcenter')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 0c1454edf98..a486e0b332a 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -46,6 +46,7 @@ class StockMove(osv.osv):
         procurement_obj = self.pool.get('procurement.order')
         product_obj = self.pool.get('product.product')
         wf_service = netsvc.LocalService("workflow")
+        processed_ids = [move.id]
         if move.product_id.supply_method == 'produce' and move.product_id.procure_method == 'make_to_order':
             bis = bom_obj.search(cr, uid, [
                 ('product_id','=',move.product_id.id),
@@ -55,11 +56,10 @@ class StockMove(osv.osv):
                 factor = move.product_qty
                 bom_point = bom_obj.browse(cr, uid, bis[0], context=context)
                 res = bom_obj._bom_explode(cr, uid, bom_point, factor, [])
-                dest = move.product_id.product_tmpl_id.property_stock_production.id
                 state = 'confirmed'
                 if move.state == 'assigned':
                     state = 'assigned'
-                for line in res[0]:                    
+                for line in res[0]: 
                     valdef = {
                         'picking_id': move.picking_id.id,
                         'product_id': line['product_id'],
@@ -70,12 +70,12 @@ class StockMove(osv.osv):
                         'move_dest_id': move.id,
                         'state': state,
                         'name': line['name'],
-                        'location_dest_id': dest,
                         'move_history_ids': [(6,0,[move.id])],
                         'move_history_ids2': [(6,0,[])],
                         'procurements': [],
                     }
                     mid = move_obj.copy(cr, uid, move.id, default=valdef)
+                    processed_ids.append(mid)
                     prodobj = product_obj.browse(cr, uid, line['product_id'], context=context)
                     proc_id = procurement_obj.create(cr, uid, {
                         'name': (move.picking_id.origin or ''),
@@ -92,7 +92,7 @@ class StockMove(osv.osv):
                     })
                     wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
                 move_obj.write(cr, uid, [move.id], {
-                    'location_id': move.location_dest_id.id,
+                    'location_dest_id': move.location_id.id, # dummy move for the kit
                     'auto_validate': True,
                     'picking_id': False,
                     'state': 'confirmed'
@@ -100,7 +100,7 @@ class StockMove(osv.osv):
                 for m in procurement_obj.search(cr, uid, [('move_id','=',move.id)], context):
                     wf_service.trg_validate(uid, 'procurement.order', m, 'button_confirm', cr)
                     wf_service.trg_validate(uid, 'procurement.order', m, 'button_wait_done', cr)
-        return True
+        return processed_ids
     
     def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None): 
         """ Consumed product with specific quatity from specific source location.
@@ -112,6 +112,7 @@ class StockMove(osv.osv):
         production_obj = self.pool.get('mrp.production')
         wf_service = netsvc.LocalService("workflow")
         for move in self.browse(cr, uid, ids):
+            move.action_confirm(context)
             new_moves = super(StockMove, self).action_consume(cr, uid, [move.id], product_qty, location_id, context=context)
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
             for prod in production_obj.browse(cr, uid, production_ids, context=context):
@@ -137,14 +138,15 @@ class StockMove(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         for move in self.browse(cr, uid, ids, context=context):
             new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
-            self.write(cr, uid, [move.id], {'prodlot_id': False, 'tracking_id': False})
+            #If we are not scrapping our whole move, tracking and lot references must not be removed
+            #self.write(cr, uid, [move.id], {'prodlot_id': False, 'tracking_id': False})
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
             for prod_id in production_ids:
                 wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)
             for new_move in new_moves:
                 production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
                 res.append(new_move)
-        return {}
+        return res
 
 StockMove()
 
@@ -155,16 +157,13 @@ class StockPicking(osv.osv):
     #
     # Explode picking by replacing phantom BoMs
     #
-    def action_explode(self, cr, uid, picks, *args):
-        """ Explodes picking by replacing phantom BoMs
-        @param picks: Picking ids. 
-        @param *args: Arguments
-        @return: Picking ids.
-        """  
+    def action_explode(self, cr, uid, move_ids, *args):
+        """Explodes moves by expanding kit components"""
         move_obj = self.pool.get('stock.move')
-        for move in move_obj.browse(cr, uid, picks):
-            move_obj._action_explode(cr, uid, move)
-        return picks
+        todo = move_ids[:]
+        for move in move_obj.browse(cr, uid, move_ids):
+            todo.extend(move_obj._action_explode(cr, uid, move))
+        return list(set(todo))
 
 StockPicking()
 
diff --git a/addons/mrp/test/mrp_packs.yml b/addons/mrp/test/mrp_packs.yml
index eb386ef6b85..800d4f56476 100644
--- a/addons/mrp/test/mrp_packs.yml
+++ b/addons/mrp/test/mrp_packs.yml
@@ -1,7 +1,7 @@
 -
   In order to test the Packs in OpenERP, we will try to sell a "Pack of 24
   beers" which is composed of 24 "Beers" and a "Beers Pack".
-- |
+-
   I start by creating the Beers product.
 - 
   !record {model: product.product, id: product_product_beers0}:
@@ -16,7 +16,7 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-- |
+-
   I create the "Beers Pack" product.
 - 
   !record {model: product.product, id: product_product_beerspack0}:
@@ -31,7 +31,7 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-- |
+-
   I create the "Pack of 24 beers" product
 - 
   !record {model: product.product, id: product_product_packofbeers0}:
@@ -42,7 +42,7 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-- |
+-
   I define the Phantom Bill of Material for the "Pack of 24 beers"
 - 
   !record {model: mrp.bom, id: mrp_bom_packofbeers0}:
@@ -64,10 +64,10 @@
     product_qty: 1.0
     product_uom: product.product_uom_unit
     type: phantom
-- |
+-
   As all my data are created, I will create an outgoing order picking for a
   "Pack of 24 Beers"
-- 
+-
   !record {model: stock.picking, id: picking_out}:
     address_id: base.res_partner_address_tang
     company_id: base.main_company
@@ -82,15 +82,15 @@
         product_uom: product.product_uom_unit
     move_type: direct
     type: out
-- |
+-
   I validate the newly created picking.
-- 
+-
   !python {model: stock.picking}: |
     self.draft_validate(cr, uid, [ref("picking_out")], {
         "active_ids": [ref("stock.menu_action_picking_tree")],
         "active_id": ref("stock.menu_action_picking_tree"), }
     )
-- |
+-
   I check that my Picking of a "Pack of 24 beers" has been automatically
   converted to a picking of 24 beers and a pack of beer, so that my
   stock of beers remains exact.
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 6bb297fbcfb..ca29b24ea23 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -96,6 +96,12 @@
     product_qty: 1.0
     product_uom: product_uom_litre0
     type: phantom
+-
+ changes UOM and name if product change.
+-
+  !python {model: mrp.bom}: |
+    production_id = self.browse(cr, uid, [ref('mrp_bom_orangejuice0')], context=context)[0]
+    self.onchange_product_id(cr, uid, [ref('mrp_bom_orangejuice0')], production_id.product_id.id, False)
 -
   I create bom lines for BoM for Orange Juice.
 -
@@ -173,11 +179,9 @@
 -
   !record {model: mrp.production, id: mrp_production_mo0}:
     bom_id: mrp.mrp_bom_orangejuice0
-    company_id: base.main_company
     date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_output
     location_src_id: stock.stock_location_stock
-    name: MO/00002
     product_id: mrp.product_product_orangejuice0
     product_lines:
       - name: Orange
@@ -205,9 +209,8 @@
   I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water.
 -
   !python {model: procurement.order}: |
-    from tools.translate import _
     proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_orange0'),ref('product_product_sugar0'),ref('product_product_water0')])])
-    assert proc_ids, _('No Procurements!')
+    assert proc_ids, 'No Procurements!'
 -
   The scheduler runs.
 -
@@ -219,9 +222,8 @@
   stock moves for Oranges, Sugar and Water made correctly.
 -
   !python {model: stock.picking}: |
-    from tools.translate import _
     pick_ids = self.search(cr, uid, [('type','=','internal')])
-    assert pick_ids, _('No Internal Pickings!')
+    assert pick_ids, 'No Internal Pickings!'
 -
   According to minimum stock rules. I have 2 purchase orders for
   Sugar with 6 Kg from Axelor and Orange 60 Kg from ASUStek.
@@ -229,50 +231,24 @@
   I confirm the purchase order of Sugar and Orange.
 -
   !python {model: purchase.order}: |
-    from tools.translate import _
     import netsvc
     purch_ids = self.search(cr, uid, [('state','=','draft')])
-    assert purch_ids, _('No Purchase Orders were made!')
+    assert purch_ids, 'No Purchase Orders were made!'
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
         wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
 -
-  I see two incoming pickings for Orange and Sugar.
+  I see two incoming pickings for Orange and Sugar, and receive them.
 -
   !python {model: stock.picking}: |
-    from tools.translate import _
     pick_ids = self.search(cr, uid, [('type','=','in')])
-    assert pick_ids, _('No Incoming Shipments found!')
--
-  I receive both the products. My incoming pickings are done.
--
-  I create record for the incoming picking wizard.
--
-  !record {model: stock.partial.picking, id: stock_partial_picking0}:
-    date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
--
-  I make my pickings done.
--
-  !python {model: stock.partial.picking}: |
-     pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('type','=','in'),('state','=','assigned')])
-     partial = self.browse(cr, uid, 1, context)
-     partial_datas = {
-            'delivery_date': partial.date
-     }
-     for pick in pick_obj.browse(cr, uid, picking_ids):
-        for m in pick.move_lines:
-           partial_datas['move%s'%(m.id)] = {
-                    'product_id': m.product_id.id,
-                    'product_qty': m.product_qty,
-                    'product_uom': m.product_uom.id
-           }
-           if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
-                    partial_datas['move%s'%(m.id)].update({
-                        'product_price': m.product_price,
-                        'product_currency': m.product_currency
-                    })
-     pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+    assert pick_ids, 'No Incoming Shipments found!'
+    stock_partial_picking = self.pool.get('stock.partial.picking')
+    for pick_id in pick_ids:
+        partial_id = stock_partial_picking.create(cr, uid, {},
+                context={'active_model': 'stock.picking',
+                         'active_ids': [pick_id]})
+        stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   Again the scheduler runs.
 -
@@ -283,19 +259,15 @@
   I check my internal picking of "Orange Juice" is done.
 -
   !python {model: stock.picking}: |
-    from tools.translate import _
     pick_ids = self.search(cr, uid, [('type','=','internal'),('state','=','done')])
-    assert pick_ids, _('Internal Picking is not done yet!')
+    assert pick_ids, 'Internal Picking is not done yet!'
 -
   I check my manufacturing order for "Orange Juice" is ready or not.
 -
   !python {model: mrp.production}: |
-    from tools.translate import _
-    pick_ids = self.search(cr, uid, [('state','=','ready'),('id','=',ref('mrp_production_mo0'))])
-    assert pick_ids, _('Manufacturing order is not ready!')
+    prod_ids = self.search(cr, uid, [('state','=','ready'),('id','=',ref('mrp_production_mo0'))])
+    assert prod_ids, 'Manufacturing order is not ready!'
 -
   I start the production order.
 -
   !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
-
-
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 568a5f0b0e8..f5bcf4f767a 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -195,74 +195,26 @@
   I Check incoming shipments for cloth. And receive products.
 -
   !python {model: stock.picking}: |
-    from tools.translate import _
     pick_ids = self.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
-    assert pick_ids, _('No Incoming Shipments found!')
--
-  I create record for partial picking.
--
-  !record {model: stock.partial.picking, id: stock_partial_picking0}:
-    date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-
--
-  I make my picking done.
--
-  !python {model: stock.partial.picking}: |
-     pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
-     partial = self.browse(cr, uid, 1, context)
-     partial_datas = {
-            'delivery_date' : partial.date
-     }
-     for pick in pick_obj.browse(cr, uid, picking_ids):
-        for m in pick.move_lines:
-           partial_datas['move%s'%(m.id)] = {
-                    'product_id' : m.product_id.id,
-                    'product_qty' : m.product_qty,
-                    'product_uom' : m.product_uom.id
-           }
-           if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
-                    partial_datas['move%s'%(m.id)].update({
-                        'product_price' : m.product_price,
-                        'product_currency': m.product_currency
-                    })
-     pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+    assert pick_ids, 'No Incoming Shipments found!'
+    stock_partial_picking = self.pool.get('stock.partial.picking')
+    for pick_id in pick_ids:
+        partial_id = stock_partial_picking.create(cr, uid, {},
+                context={'active_model': 'stock.picking',
+                         'active_ids': [pick_id]})
+        stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I Check incoming shipments for buttons and receive products.
 -
   !python {model: stock.picking}: |
-    from tools.translate import _
     pick_ids = self.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
-    assert pick_ids, _('No Incoming Shipments found!')
--
-  I create record for partial picking.
--
-  !record {model: stock.partial.picking, id: stock_partial_picking0}:
-    date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-
--
-  I make my picking done.
--
-  !python {model: stock.partial.picking}: |
-     pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
-     partial = self.browse(cr, uid, 1, context)
-     partial_datas = {
-            'delivery_date': partial.date
-     }
-     for pick in pick_obj.browse(cr, uid, picking_ids):
-        for m in pick.move_lines:
-           partial_datas['move%s'%(m.id)] = {
-                    'product_id': m.product_id.id,
-                    'product_qty': m.product_qty,
-                    'product_uom': m.product_uom.id
-           }
-           if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
-                    partial_datas['move%s'%(m.id)].update({
-                        'product_price': m.product_price,
-                        'product_currency': m.product_currency
-                    })
-     pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+    assert pick_ids, 'No Incoming Shipments found!'
+    stock_partial_picking = self.pool.get('stock.partial.picking')
+    for pick_id in pick_ids:
+        partial_id = stock_partial_picking.create(cr, uid, {},
+                context={'active_model': 'stock.picking',
+                         'active_ids': [pick_id]})
+        stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   Run scheduler again.
 -
@@ -291,13 +243,12 @@
   I create record for producing products with quantity 5.00.
 -
   !record {model: mrp.product.produce, id: mrp_product_produce0}:
-    product_qty: 5.00
+    product_qty: 2.00
     mode: 'consume_produce'
 -
   I produce 2 products with 5.00 quantities each.
 -
   !python {model: mrp.product.produce}: |
-    from tools.translate import _
     prod_obj = self.pool.get('mrp.production')
     prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
     self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
@@ -321,8 +272,7 @@
   And finally production order is done.
 -
   !python {model: mrp.product.produce}: |
-    from tools.translate import _
     prod_obj = self.pool.get('mrp.production')
     prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
-    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+    self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
 
diff --git a/addons/mrp/test/mrp_production_cancel.yml b/addons/mrp/test/mrp_production_cancel.yml
new file mode 100644
index 00000000000..1dc20a215d1
--- /dev/null
+++ b/addons/mrp/test/mrp_production_cancel.yml
@@ -0,0 +1,29 @@
+-
+  In order to test the manufacturing order in Openerp,
+  I am creating one manufacturing order
+-
+  !record {model: mrp.production, id: mrp_production_mo1}:
+    company_id: base.main_company
+    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
+    location_dest_id: stock.stock_location_stock
+    location_src_id: stock.stock_location_stock
+    product_id: product.product_product_pc1
+    name: MO/01234
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+-
+  I confirm the order.
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
+-
+  In order to cancel the MO, I first cancel its picking.
+-
+  !python {model: stock.picking}: |
+    mrp_obj = self.pool.get('mrp.production')
+    mo = mrp_obj.browse(cr, uid, ref("mrp_production_mo1"))
+    self.action_cancel(cr, uid, [mo.picking_id.id], context=None)
+-
+  Then I Cancel the production order and related stock moves.
+-
+  !workflow {model: mrp.production, action: button_cancel, ref: mrp_production_mo1}
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 6c1a2a4403e..57d75e1c1a5 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -11,6 +11,7 @@
     location_dest_id: stock.stock_location_stock
     location_src_id: stock.stock_location_stock
     product_id: product.product_product_pc1
+    name: MO/0123
     product_qty: 5.0
     product_uom: product.product_uom_unit
     product_uos_qty: 0.0
@@ -18,14 +19,28 @@
   I compute the data.
 -
   !python {model: mrp.production}: |
-    self.action_compute(cr, uid, [ref("mrp_production_mo1")], {"lang": "en_US", "tz":
-      False, "search_default_current": 1, "active_model": "ir.ui.menu", "active_ids":
-      [ref("mrp.menu_mrp_production_action")], "active_id": ref("mrp.menu_mrp_production_action"),
-      })
+    self.action_compute(cr, uid, [ref("mrp_production_mo1")])
 -
   I confirm the order.
 -
   !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
+-
+  I create record for changing production quantity to 6.00
+-
+  !record {model: change.production.qty, id: mrp_production_qty}:
+    product_qty: 6.0
+-
+  Changes the Quantity of Product.
+-
+  !python {model: change.production.qty}: |
+    context = {"lang": 'en_US', "active_model":"mrp.production", "active_ids": [ref("mrp_production_mo1")], "tz": False, "active_id":ref('mrp_production_mo1')}
+    self.default_get(cr, uid, ["product_qty"], context)
+    self.change_prod_qty(cr, uid, [ref("mrp_production_qty")], context=context)
+-
+  I check now quantity of the production order is 6 or not.
+-
+  !assert {model: mrp.production, id: mrp_production_mo1}:
+    - product_qty == 6
 -
   I am checking Procurement orders for components of PC1.
 -
@@ -50,28 +65,28 @@
     pick_ids = self.search(cr, uid, [('type','=','internal')])
     assert pick_ids, _('No Internal Pickings!')
 -
-  I see that there is a manufacturing order for the sub product of PC1 with ready state.
+  I see that there is a manufacturing order for the sub product CPU_GEN with ready state and I start production of it.
 -
   !python {model: mrp.production}: |
     from tools.translate import _
-    order_ids = self.search(cr, uid, [('state','=','ready')])
+    order_ids = self.search(cr, uid, [('state','=','ready'), ('product_id', '=', ref('product.product_product_cpu_gen'))])
     assert order_ids, _('No manufacturing order in Ready state!')
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    for order in order_ids:
+        wf_service.trg_validate(uid, 'mrp.production', order, 'button_produce', cr)
 -
-  I start producing that product first. So I marked it as started.
--
-  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo1}
--
-  I create record for producing products with quantity 5.00.
+  I create record for producing products with quantity 1.00.
 -
   !record {model: mrp.product.produce, id: mrp_product_produce0}:
-    product_qty: 5.00
+    product_qty: 1.00
     mode: 'consume_produce'
 -
   I produce the product.
 -
   !python {model: mrp.product.produce}: |
     prod_obj = self.pool.get('mrp.production')
-    prod_ids = prod_obj.search(cr, uid, [('state','=','confirmed')])
+    prod_ids = prod_obj.search(cr, uid, [('state','=','in_production'), ('product_id', '=', ref('product.product_product_cpu_gen'))])
     self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
 -
   Now the manufacturing order for subproduct CPU_GEN is done and manufacturing
@@ -79,23 +94,26 @@
 -
   !python {model: mrp.production}: |
     from tools.translate import _
-    prod_ids = self.search(cr, uid, [('state','=','done')])
-    assert prod_ids, _('Manufacturing order is yet not done!')
+    prod_ids = self.search(cr, uid, [('state','=','done'), ('product_id', '=', ref('product.product_product_cpu_gen'))])
+    assert prod_ids, _('Manufacturing order for CPU_GEN is yet not done!')
 -
   I start producing the product PC1.
 -
   !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo1}
 -
-  I create record for producing products with quantity 5.00.
+  I create record for producing products with quantity 6.00.
 -
   !record {model: mrp.product.produce, id: mrp_product_produce1}:
-    product_qty: 5.00
+    product_qty: 6.00
     mode: 'consume_produce'
 -
   Finally my production order is done.
 -
   !python {model: mrp.product.produce}: |
-    from tools.translate import _
-    prod_obj = self.pool.get('mrp.production')
-    prod_ids = prod_obj.search(cr, uid, [('product_id.default_code','=','PC1')])
-    self.do_produce(cr, uid, [ref('mrp_product_produce1')], context={'active_ids': prod_ids})
+    context = {"lang": 'en_US', "active_model":"mrp.production", "active_ids": [ref("mrp_production_mo1")], "tz": False, "active_id":ref('mrp_production_mo1')}
+    self.do_produce(cr, uid, [ref('mrp_product_produce1')], context=context)
+-
+  I check now the production order for PC1 is done.
+-
+  !assert {model: mrp.production, id: mrp_production_mo1}:
+    - state == 'done'
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index fec48938222..83dd1971c5b 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -23,7 +23,7 @@ import mrp_product_produce
 import mrp_price
 import mrp_workcenter_load
 import change_production_qty
-import mrp_change_standard_price
+#import mrp_change_standard_price
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 87b6d00190e..fa1549458cf 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -21,13 +21,14 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class change_production_qty(osv.osv_memory):
     _name = 'change.production.qty'
     _description = 'Change Quantity of Products'
     
     _columns = {
-        'product_qty': fields.float('Product Qty', required=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True),
     }
 
     def default_get(self, cr, uid, fields, context=None):
diff --git a/addons/mrp/wizard/mrp_change_standard_price.py b/addons/mrp/wizard/mrp_change_standard_price.py
deleted file mode 100644
index 4ee92aac16b..00000000000
--- a/addons/mrp/wizard/mrp_change_standard_price.py
+++ /dev/null
@@ -1,53 +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 change_standard_price(osv.osv_memory):
-    _inherit = "stock.change.standard.price"
-    _description = "Change Standard Price"
-    
-    _columns = {
-        'change_parent_price': fields.boolean('Change Parent Price', help="This will change the price of parent products also "
-                                              "according to the BoM structure specified for the product."),
-    }
-    
-    
-    def change_price(self, cr, uid, ids, context=None):
-        """ Changes the Standard Price of Parent Product according to BoM 
-            only when the field 'change_parent_price' is True.
-            And creates an account move accordingly.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: List of IDs selected
-        @param context: A standard dictionary
-        @return:
-        """
-        if context is None:
-            context = {}
-        res = self.browse(cr, uid, ids, context=context) 
-        context.update({'change_parent_price': res[0].change_parent_price})
-        return super(change_standard_price, self).change_price(cr, uid, ids, context=context)
-    
-change_standard_price()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/mrp_change_standard_price_view.xml b/addons/mrp/wizard/mrp_change_standard_price_view.xml
deleted file mode 100644
index 6c9b2059aca..00000000000
--- a/addons/mrp/wizard/mrp_change_standard_price_view.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_change_standard_price_inherit" model="ir.ui.view">
-            <field name="name">Change Standard Price (Inherit)</field>
-            <field name="model">stock.change.standard.price</field>
-            <field name="inherit_id" ref="stock.view_change_standard_price"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <field name="new_price" position="after">                 
-                    <field name="change_parent_price"/>
-              </field>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 69fc3a9dd7d..dc9a235ff63 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -49,8 +49,9 @@ class mrp_product_produce(osv.osv_memory):
                                 context['active_id'], context=context)
         done = 0.0
         for move in prod.move_created_ids2:
-            if not move.scrapped:
-                done += move.product_qty
+            if move.product_id == prod.product_id:
+                if not move.scrapped:
+                    done += move.product_qty
         return (prod.product_qty - done) or prod.product_qty
 
     _defaults = {
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 77bece7cfd6..72ef35ebc4b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'MRP JIT',
+    'name': 'Just In Time Scheduling',
     'version': '1.0',
     'category': 'Manufacturing',
     'complexity': "easy",
diff --git a/addons/mrp_jit/i18n/ar.po b/addons/mrp_jit/i18n/ar.po
index a79eb710454..dd51e82de2c 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1ce98d7b946..bdf7ab89b87 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a79eb710454..dd51e82de2c 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3565c0555c4..1a55f6dbfdb 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9aa2cc0b8c4..c018013b4ee 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2dfd8d5bd05..e7887542f67 100644
--- a/addons/mrp_jit/i18n/da.po
+++ b/addons/mrp_jit/i18n/da.po
@@ -8,19 +8,19 @@ 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: 2009-11-17 07:31+0000\n"
-"Last-Translator: SmartWi <kurt@smartwi.net>\n"
+"PO-Revision-Date: 2011-11-08 11:44+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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
-msgstr "MRP JIT"
+msgstr "MRP Just In Time"
 
 #. module: mrp_jit
 #: model:ir.module.module,description:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index 2799e5b93fc..8db0b8432f6 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -72,9 +72,3 @@ msgstr ""
 "    \n"
 "    \n"
 "    "
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/mrp_jit/i18n/el.po b/addons/mrp_jit/i18n/el.po
index 4e0440f56ec..b756ec2d6ab 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 867661e2f68..429591ac870 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -67,9 +67,3 @@ msgstr ""
 "    \n"
 "    \n"
 "    "
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/mrp_jit/i18n/es_AR.po b/addons/mrp_jit/i18n/es_AR.po
index 4a956f54957..1a6c9cfd5e6 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/es_EC.po b/addons/mrp_jit/i18n/es_EC.po
index 5cdab976a23..71b5e6b2453 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,3 +46,24 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo permite el cálculo sobre la marcha (just in time) de las "
+"órdenes de abastecimiento.\n"
+"\n"
+"    Si instala este módulo, no tendrá que ejecutar el planificador de "
+"abastecimientos\n"
+"    nunca más (pero todavía tendrá que ejecutar el planificador de pedidos "
+"por reglas\n"
+"    de stock mínimo, o por ejemplo dejar que se ejecute diariamente.)\n"
+"    Todos las órdenes de abastecimiento se procesarán inmediatamente, lo que "
+"en\n"
+"    algunos casos puede conllevar un pequeño impacto en el rendimiento.\n"
+"\n"
+"    También podría incrementar su stock porque los productos se reservan\n"
+"    tan pronto posible, y el rango de tiempo del planificador no se tiene "
+"más en cuenta.\n"
+"    En ese caso, ya no podrá usar prioridades en las diferentes entregas "
+"(albaranes).\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_jit/i18n/es_MX.po b/addons/mrp_jit/i18n/es_MX.po
new file mode 100644
index 00000000000..c96b106aea0
--- /dev/null
+++ b/addons/mrp_jit/i18n/es_MX.po
@@ -0,0 +1,69 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_jit
+#
+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 09:09+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: 2011-09-05 05:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_jit
+#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
+msgid "MRP JIT"
+msgstr "Abastecimiento inmediato. MRP JIT (Just In Time)"
+
+#. module: mrp_jit
+#: model:ir.module.module,description:mrp_jit.module_meta_information
+msgid ""
+"\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"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite el cálculo sobre la marcha (just in time) de las "
+"órdenes de abastecimiento.\n"
+"\n"
+"    Si instala este módulo, no tendrá que ejecutar el planificador de "
+"abastecimientos\n"
+"    nunca más (pero todavía tendrá que ejecutar el planificador de pedidos "
+"por reglas\n"
+"    de stock mínimo, o por ejemplo dejar que se ejecute diariamente.)\n"
+"    Todos las órdenes de abastecimiento se procesarán inmediatamente, lo que "
+"en\n"
+"    algunos casos puede conllevar un pequeño impacto en el rendimiento.\n"
+"\n"
+"    También podría incrementar su stock porque los productos se reservan\n"
+"    tan pronto posible, y el rango de tiempo del planificador no se tiene "
+"más en cuenta.\n"
+"    En ese caso, ya no podrá usar prioridades en las diferentes entregas "
+"(albaranes).\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_jit/i18n/es_VE.po b/addons/mrp_jit/i18n/es_VE.po
new file mode 100644
index 00000000000..c96b106aea0
--- /dev/null
+++ b/addons/mrp_jit/i18n/es_VE.po
@@ -0,0 +1,69 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_jit
+#
+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 09:09+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: 2011-09-05 05:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_jit
+#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
+msgid "MRP JIT"
+msgstr "Abastecimiento inmediato. MRP JIT (Just In Time)"
+
+#. module: mrp_jit
+#: model:ir.module.module,description:mrp_jit.module_meta_information
+msgid ""
+"\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"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite el cálculo sobre la marcha (just in time) de las "
+"órdenes de abastecimiento.\n"
+"\n"
+"    Si instala este módulo, no tendrá que ejecutar el planificador de "
+"abastecimientos\n"
+"    nunca más (pero todavía tendrá que ejecutar el planificador de pedidos "
+"por reglas\n"
+"    de stock mínimo, o por ejemplo dejar que se ejecute diariamente.)\n"
+"    Todos las órdenes de abastecimiento se procesarán inmediatamente, lo que "
+"en\n"
+"    algunos casos puede conllevar un pequeño impacto en el rendimiento.\n"
+"\n"
+"    También podría incrementar su stock porque los productos se reservan\n"
+"    tan pronto posible, y el rango de tiempo del planificador no se tiene "
+"más en cuenta.\n"
+"    En ese caso, ya no podrá usar prioridades en las diferentes entregas "
+"(albaranes).\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_jit/i18n/et.po b/addons/mrp_jit/i18n/et.po
index 2d7c45bf3b2..26ec1ddc82b 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c3a7b9c7efb..d14de28753f 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a843a3e8986..d1aa1086087 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -68,6 +68,3 @@ msgstr ""
 "    \n"
 "    \n"
 "    "
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
diff --git a/addons/mrp_jit/i18n/gl.po b/addons/mrp_jit/i18n/gl.po
index f416bc8eed2..ca8d1cbc5bc 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 09c23064cf0..6c845797ba4 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c5136386529..49c7e5f1354 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ce3b4227dc2..8f65757c3ce 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 caa2afcb092..1bdf49dc57c 100644
--- a/addons/mrp_jit/i18n/it.po
+++ b/addons/mrp_jit/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-11-29 07:52+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@domsense.com>\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,9 +46,3 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere univoco!"
diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po
index b0f9d74f819..f0dffc8db0b 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e18bcdf8e3a..dda174910ec 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 be764160088..58eb05b916a 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 85441a339cd..e9e6118b275 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e930fb1bcf0..67c5d8ca60d 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ef6cb6f446a..4d6e3fe0afb 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 898b8d3d694..8d0b587148d 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0752e7e985d..de906b4d6bf 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 939a116aa18..21341cd517b 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 102976166f2..3330c800aee 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 14a05ac5667..81c3f274da1 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,9 +46,3 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
diff --git a/addons/mrp_jit/i18n/pt_BR.po b/addons/mrp_jit/i18n/pt_BR.po
index 98dd740ff3e..83f475cd066 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -68,9 +68,3 @@ msgstr ""
 "    \n"
 "    \n"
 "    "
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/mrp_jit/i18n/ro.po b/addons/mrp_jit/i18n/ro.po
index 83b5b614c4f..b39b8048e7f 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 336e0d4c6a2..02039590846 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,9 +46,25 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+"\n"
+"    Этот модуль позволяет обрабатывать заказы на снабжение в реальном "
+"времени.\n"
+"\n"
+"    После установки этого модуля не нужно будет больше запускать планировщик "
+"поставок \n"
+"    (однако всё равно потребуется выполнять правило минимального заказа "
+"вручную или\n"
+"    позволить ему выполняться ежедневно).\n"
+"    Все заказы на снабжение будут обрабатываться немедленно, что в некоторых "
+"случаях может\n"
+"    повлиять на производительность системы.\n"
+"\n"
+"    Также может увеличиться размер склада, потому что продукция "
+"резервируется\n"
+"    как только это становится возможным, а временные интервалы планировщика\n"
+"    больше не учитываются. В этом случае нельзя будет использовать "
+"приоритеты \n"
+"    при комплектовании.\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_jit/i18n/sk.po b/addons/mrp_jit/i18n/sk.po
index a3f15814578..9ef00479040 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 00cfa3649be..e4dbd193bb0 100644
--- a/addons/mrp_jit/i18n/sl.po
+++ b/addons/mrp_jit/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,9 +46,3 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
diff --git a/addons/mrp_jit/i18n/sq.po b/addons/mrp_jit/i18n/sq.po
index 2363856c068..61d686c83e9 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d2ea7a2fc6e..7600af28705 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3c19b46147d..5710ddae247 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 078d5d2d79e..c556fb94a05 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,9 +46,3 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
diff --git a/addons/mrp_jit/i18n/ta.po b/addons/mrp_jit/i18n/ta.po
index 4c1edffe70b..bc2426e240e 100644
--- a/addons/mrp_jit/i18n/ta.po
+++ b/addons/mrp_jit/i18n/ta.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
-"Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
+"Last-Translator: ஆமாச்சு <ramadasan@amachu.net>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 003f236ba00..3c2c14c3491 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e630a8bb86c..aa5043cca8d 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cd13e8ffcfa..ca07cc79527 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 47078f164f8..7eba4b7147e 100644
--- a/addons/mrp_jit/i18n/zh_CN.po
+++ b/addons/mrp_jit/i18n/zh_CN.po
@@ -8,18 +8,18 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-03-20 08:34+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
-msgstr "精益制造资源计划管理（MRP JIT）"
+msgstr "MRP JIT"
 
 #. module: mrp_jit
 #: model:ir.module.module,description:mrp_jit.module_meta_information
@@ -46,32 +46,15 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module allows Just In Time computation of all procurement.\n"
-#~ "\n"
-#~ "    If you install this module, you will not have to run the schedulers "
-#~ "anymore.\n"
-#~ "    Each document is computed in real time. Note that this module can slow "
-#~ "down your\n"
-#~ "    system a little bit.\n"
-#~ "\n"
-#~ "    It may also increase your stock size because products are reserved as "
-#~ "soon\n"
-#~ "    as possible. In that case, you can not use priorities any more on the "
-#~ "different\n"
-#~ "    picking.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这模块允许JIT(准时生产)计算所有的产品需求.\n"
-#~ "\n"
-#~ "如果你安装这模块,你将不用再运行调度.\n"
-#~ "    每个单据是实际计算的.\n"
-#~ "注意:这将稍稍降低你系统的速度.\n"
-#~ "\n"
-#~ "    它可能也加大你库存的大小因为产品是立即储存的.\n"
-#~ "如果是那样的话你不能使用优先选项\n"
-#~ "不同的包装\n"
-#~ "    "
+"\n"
+"    这个模块允许补货单的即时（JIT）计算。\n"
+"    安装了这个模块以后，就不需要定期运行按单生产的MRP了（但最小库存规则\n"
+"    的计算仍要定期运行，比如每天运行一次）。\n"
+"    所有的计划订单会立即处理，可能会对系统性能有些影响。\n"
+"    \n"
+"    另一个负面影响是这可能造成你库存占用的增加。因为产品立即被预留了，不再\n"
+"    等待每日计划运行的时点，这样就少了个缓冲期。所以，你也不能针对移库单的\n"
+"    优先级按顺序处理了。\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_jit/i18n/zh_TW.po b/addons/mrp_jit/i18n/zh_TW.po
index 2dc34993c68..6317bfb0b94 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 08f8f5b7f5b..d965ca5160c 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Work Center Production start end workflow',
+    'name': 'Manufacturing Operations',
     'version': '1.0',
     'category': 'Manufacturing',
     'complexity': "easy",
@@ -65,7 +65,7 @@ So that we can compare the theoretic delay and real delay.
         'process/mrp_operation_process.xml'
     ],
     'demo_xml': ['mrp_operation_data.xml'],
-    'test': ['test/mrp_operations.yml', 'test/mrp_operations_report.yml'],
+    'test': ['test/mrp_operations.yml', 'test/mrp_operations_report.yml','test/mrp_operation_test.yml'],
     'installable': True,
     'active': False,
     'certificate': '0056233813133',
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index 7efe02a89dd..483f3a8c662 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index 23419ee2f2b..9fa1e677b26 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr "Създаване на работна поръчка"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr "Не може да прекъснете операцията, само Старт / Възобновяване!"
@@ -138,10 +138,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Грешка!"
@@ -238,7 +238,7 @@ msgstr ""
 "\"Приключена\"."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Не може да завършите операцията, без Стартиране/ Възобновяване!"
@@ -249,7 +249,7 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Тази операция не може да бъде отменена!"
@@ -301,7 +301,7 @@ msgid "Future Work Orders"
 msgstr "Бъдещи работни поръчки"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -423,7 +423,7 @@ msgid "Production Operation Code"
 msgstr "Код производствена дейност"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr " Не можете да възобновите операция, в различно от Пауза състояние!"
@@ -477,7 +477,7 @@ msgid "June"
 msgstr "Юни"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Операцията вече е завършена"
@@ -535,7 +535,7 @@ msgid "Finish the operation."
 msgstr "Завърши операцията."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Операцията не е започнала все още!"
@@ -546,10 +546,10 @@ msgid "Information from the production order."
 msgstr "Информация от производствената поръчка."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Съжаляваме!"
@@ -566,7 +566,7 @@ msgid "Code"
 msgstr "Код"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Операцията е вече Отменена!"
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index 3498fff69c1..d1cadca0d6a 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Oprostite!"
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index 4076b5d2e30..cb9f4c881e8 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -29,7 +29,7 @@ msgstr "Ordres de producció"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Cancel·la l'operació"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -46,23 +46,23 @@ msgstr "Ordre de producció no pot començar en estat [%s]"
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Informació sobre la definició de la ruta"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "Centres de producció"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -79,7 +79,7 @@ msgstr "("
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "Producte per produir"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
@@ -89,18 +89,18 @@ msgstr "Operació de producció"
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "Serialització lliure"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Operacions Mrp"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -110,15 +110,15 @@ msgstr "Ordre de producció"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Excepció albarà"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "Creació de l'ordre de treball"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -134,14 +134,14 @@ msgstr "Centre de producció"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "Les ordres de treball son creades en base a l'ordre de producció"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -151,7 +151,7 @@ msgstr "Error!"
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
@@ -167,12 +167,12 @@ msgstr "Operacions"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Moviment d'estoc"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# de línies"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -185,7 +185,7 @@ msgstr "Esborrany"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "In Production"
-msgstr ""
+msgstr "En producció"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -193,13 +193,13 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "Ordre de treball"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -207,11 +207,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"Hi ha una ordre de treball per centre de treball. La informació sobre el "
+"número de cicles o el temps de cicle."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -224,9 +226,18 @@ 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 ""
+"*Quan una ordre de treball és creada, el seu estat és 'Esborrany'.\n"
+"*Quan un usuari inicia l'ordre de treball, el seu estat passarà a 'En "
+"curs'.\n"
+"*Quan l'ordre de treball està en manera 'En funcionament', si un usuari vol "
+"detenir-la o realitzar canvis sobre ella, ha de passar-la a l'estat "
+"'Pausa'.\n"
+"*Quan l'usuari cancel·la l'ordre de treball passarà a l'estat "
+"'Cancel·lada'.\n"
+"*Quan l'ordre és completament processada, passarà a l'estat 'Acabada'."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "No podeu finalitzar l'operació sense iniciar-la o continuar-la!"
@@ -234,10 +245,10 @@ msgstr "No podeu finalitzar l'operació sense iniciar-la o continuar-la!"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Data prevista"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "No hi ha operació a cancel·lar!"
@@ -246,12 +257,12 @@ msgstr "No hi ha operació a cancel·lar!"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Qtat producte"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
@@ -272,6 +283,11 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"Per fabricar o ensamblar productes, i utilitzar matèries primeres i "
+"productes acabats també heu de controlar les operacions de fabricació. Les "
+"operacions de fabricació normalment, es diuen ordres de treball. Les "
+"diferents intervencions tindran diferents impactes en els costos de "
+"fabricació i la planificació en funció de la càrrega de treball disponible."
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
@@ -284,33 +300,35 @@ msgid "Future Work Orders"
 msgstr "Ordres de producció futures"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
 "operation"
 msgstr ""
+"L'operació ha estat iniciada! Podeu posar-la en pausa / finalitza/cancel·la "
+"operació"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operació cancel·lada"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -325,7 +343,7 @@ msgstr "mrp_operations.operation"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr ""
+msgstr "Informe ordre de treball"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -337,7 +355,7 @@ msgstr "Data inicial"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Esperant mercaderia"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -358,7 +376,7 @@ msgstr "En procés"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Ordre de fabricació"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -378,6 +396,8 @@ msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
 msgstr ""
+"Quan l'operació necessita ser cancel·lada, podeu fer-ho en el formulari de "
+"l'ordre de treball."
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -389,12 +409,12 @@ msgstr "Canvia a esborrany"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Cicles totals"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
@@ -402,7 +422,7 @@ msgid "Production Operation Code"
 msgstr "Codi operació de producció"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr " No podeu continuar les operacions que no estiguin en estat Aturada!"
@@ -410,12 +430,12 @@ msgstr " No podeu continuar les operacions que no estiguin en estat Aturada!"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Iniciat"
 
 #. module: mrp_operations
 #: model:ir.module.module,description:mrp_operations.module_meta_information
@@ -449,14 +469,48 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Aquest mòdul afegeix estat, data de començament, data de finalització a "
+"les línies d'operació de les ordres de producció\n"
+"(en la pestanya \"Centres de Treball\")\n"
+"    Estat: esborrany, confirmat, fet, cancel·lat\n"
+"    Quan es finalitzen, confirmen o cancel·len les ordres de producció "
+"s'estableixen tots les línies a l'estat corresponent\n"
+"    Menús creats:\n"
+"        Gestió de productes > Totes les operacions\n"
+"        Gestió de productes > Totes les operacions > Operacions a realitzar "
+"(estat=\"confirmada\")\n"
+"    La qual és una vista en les línies de \"Centres de Treball\" en les "
+"ordres de producció,\n"
+"    arbre editable\n"
+"\n"
+"    Afegeix botons a la vista formulari de les ordres de producció sota la "
+"pestanya de centres de treball:\n"
+"    * comença (canvia l'estat a 'confirmada'), omple la data d'inici\n"
+"    * finalitza (canvia l'estat a 'finalitzada'), omple la data de "
+"finalització\n"
+"    * canvia a esborrany (canvia l'estat a 'esborrany')\n"
+"    * cancel·la (canvia l'estat a cancel·lada)\n"
+"\n"
+"    Quan les ordress de producció estiguin \"preparades per produir-se\", "
+"les operacions han de\n"
+"    confirmar-se. Quan es realitzi l'ordre de producció, totes les "
+"operacions\n"
+"    quedar realitzades.\n"
+"\n"
+"    El camp 'retard' és el retard (data de finalització - data de "
+"començament).\n"
+"    Així podreu comparar el retard teòric amb el retard real.\n"
+"\n"
+"    "
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "L'operació ja està finalitzada!"
@@ -464,56 +518,58 @@ msgstr "L'operació ja està finalitzada!"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "Llest per produir"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "Fills es mouen"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr ""
+msgstr "Planificació d'ordres de treball"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is lead time between operation start and stop in this workcenter"
 msgstr ""
+"Aquest és el termini d'execució entre les operacions d'inici i parada en "
+"aquest centre de producció."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Finalitza l'operació"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "L'operació encare no s'ha iniciat!"
@@ -521,13 +577,13 @@ msgstr "L'operació encare no s'ha iniciat!"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Informació de l'ordre de fabricació"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Disculpeu!"
@@ -535,7 +591,7 @@ msgstr "Disculpeu!"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
@@ -544,7 +600,7 @@ msgid "Code"
 msgstr "Codi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "L'operació ja està cancel·lada!"
@@ -552,12 +608,12 @@ msgstr "L'operació ja està cancel·lada!"
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
-msgstr ""
+msgstr "Flux d'inici-final de la producció en els centres de producció"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "codis d'operació"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
@@ -567,7 +623,7 @@ msgstr "Qtat."
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operació realitzada"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -596,6 +652,11 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"Les ordres de treball és la llista d'operacions que es realitzaran per a "
+"cada ordre de producció. Una vegada que s'inicia el primer treball d'una "
+"ordre de producció, aquesta es marca automàticament com iniciada. Una vegada "
+"que acabi l'última operació d'una ordre de producció, aquesta es realitza "
+"automàticament i els productes relacionats són produïts."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -605,22 +666,22 @@ msgstr "Operació inici"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr ""
+msgstr "Informació"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "Codi de barra de centres de producció"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Heu d'assignar un lot de producció per aquest producte"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Retardat"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
@@ -638,7 +699,7 @@ msgstr "Producció"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "Cerca ordres de treball"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
@@ -649,12 +710,12 @@ msgstr "Centre de treball"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "Real"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Data planificada"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
@@ -667,7 +728,7 @@ msgstr "Producte"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total d'hores"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -675,6 +736,8 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
+"Seleccioneu aquesta opció per poder moure independentment totes les ordres "
+"de producció, sense moure els seus dependents"
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
@@ -684,7 +747,7 @@ msgstr ")"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Anàlisi d'ordres de treball"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -702,12 +765,12 @@ msgstr "UdM"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Hores per centre de producció"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Hores de treball"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -719,32 +782,32 @@ msgstr "Data final"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "S'ha cancel·lat l'operació"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Inicia l'operació"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operació realitzada"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Núm. línia ordres"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -752,42 +815,44 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"Quan es finalitza l'operació, l'operador actualitza el seu sistema "
+"finalitzant l'ordre de treball"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Detalls de l'ordre de treball"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Estat producció"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr ""
+msgstr "Duració"
 
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "La quantitat ordenada no pot ser negativa o zero!"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Esteu intentant assignar un lot que no és del mateix producte"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index 0bc4312a4aa..bd6b63ebb12 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/i18n/cs.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-07-15 02:29+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\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: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp_operations
@@ -807,9 +807,3 @@ msgstr "Množství objednávky nemůže být záporné nebo nulové !"
 #: 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"
-
-#~ msgid ""
-#~ "This is lead time between operation start and stop in this Work Center"
-#~ msgstr ""
-#~ "Toto je čekací čas mezi započetím a zastavením operace v tomto pracovním "
-#~ "centru"
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index c02f8a2fdee..06a72e831b1 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr "Erstellung von Arbeitsaufträgen"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -140,10 +140,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Fehler !"
@@ -241,7 +241,7 @@ msgstr ""
 "Fertigungsauftrag automatisch zu 'Erledigt'."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Es gibt keinen Arbeitsauftrag der zu beenden wäre !"
@@ -306,7 +306,7 @@ msgid "Future Work Orders"
 msgstr "Zukünftige Arbeitsaufträge"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -428,7 +428,7 @@ msgid "Production Operation Code"
 msgstr "Arbeitsauftragsnummer"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -512,7 +512,7 @@ msgid "June"
 msgstr "Juni"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Arbeitsauftrag ist bereits abgeschlossen !"
@@ -571,7 +571,7 @@ msgid "Finish the operation."
 msgstr "Arbeitsauftrag erledigen."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Arbeitsauftrag wurde noch nicht gestartet !"
@@ -582,10 +582,10 @@ msgid "Information from the production order."
 msgstr "Information zum Fertigungsauftrag."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Entschuldigung!"
@@ -602,7 +602,7 @@ msgid "Code"
 msgstr "Kürzel"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Arbeitsauftrag wurde bereits storniert !"
@@ -951,18 +951,6 @@ msgstr ""
 #~ msgid "All Work Orders"
 #~ msgstr "alle Arbaitsaufträge"
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Stunden je Arbeitsplatz"
-
-#~ msgid "Packing Exception"
-#~ msgstr "Packvorgang Fehlerliste"
-
-#~ msgid "Resources"
-#~ msgstr "Ressourcen"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
@@ -973,26 +961,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Fertigungsvorgang wurde bereits gestartet !' ' Sie können fortfahren mit "
 #~ "entweder Pause / Ende / Abbruch"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "To manufacture or assemble products, as well as using raw materials and "
-#~ "finished product you must also handle manufacturing operations. "
-#~ "Manufacturing operations are often called work orders. The different "
-#~ "operations will have different impacts on the costs of manufacture and "
-#~ "planning depending on the available workload."
-#~ msgstr ""
-#~ "Für die Fertigung oder die Montage von Produkten müssen Sie nicht nur die "
-#~ "Bauteile verwenden und das Endprodukt erstellen , sondern auch die "
-#~ "Fertigungsvorgänge bearbeiten. Die Fertigungsvorgänge werden oftmals auch "
-#~ "als Arbeitsaufträge deklariert. Fertigungsvorgänge haben unterschiedliche "
-#~ "Auswirkungen auf die Fertigungskosten und die Fertigungsplanung in "
-#~ "Abhängigkeit von den verfügbaren Ressourcen."
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index ae573c4a5e2..e2ad086707a 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr "Creación de órden de trabajo"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -138,10 +138,10 @@ msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -237,7 +237,7 @@ msgstr ""
 "*Cuando la orden es completamente procesada, pasará al estado 'Terminada'."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "¡No puede finalizar la operación sin iniciarla o reanudarla!"
@@ -248,7 +248,7 @@ msgid "Planned Date"
 msgstr "Fecha planeada"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "¡No hay operación a cancelar!"
@@ -300,7 +300,7 @@ msgid "Future Work Orders"
 msgstr "Órdenes de trabajo futuras"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -422,7 +422,7 @@ msgid "Production Operation Code"
 msgstr "Código operación de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr " ¡No puede reanudar las operaciones que no estén en estado Detenida!"
@@ -509,7 +509,7 @@ msgid "June"
 msgstr "Junio"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "¡La operación ya está finalizada!"
@@ -568,7 +568,7 @@ msgid "Finish the operation."
 msgstr "Terminar la operación."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "¡La operación todavía no se ha iniciado!"
@@ -579,10 +579,10 @@ msgid "Information from the production order."
 msgstr "Inforamción de la orden de fabricación"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "¡Disculpe!"
@@ -599,7 +599,7 @@ msgid "Code"
 msgstr "Código"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "¡La operación ya está cancelada!"
@@ -953,22 +953,3 @@ msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Horas por centro de trabajo"
-
-#~ msgid "Packing Exception"
-#~ msgstr "Excepción de empaque"
-
-#~ msgid ""
-#~ "To manufacture or assemble products, as well as using raw materials and "
-#~ "finished product you must also handle manufacturing operations. "
-#~ "Manufacturing operations are often called work orders. The different "
-#~ "operations will have different impacts on the costs of manufacture and "
-#~ "planning depending on the available workload."
-#~ msgstr ""
-#~ "Para fabricar o ensamblar productos, así como usar materias primas y el "
-#~ "producto terminado, debe gestionar operaciones de producción. Las "
-#~ "operaciones de producción a menudo se llaman órdenes de trabajo. Las "
-#~ "distintas operaciones tienen diferentes efectos sobre los costes de "
-#~ "fabricación y la planificación depende de la carga de trabajo disponible."
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index 69555bc4f34..46d1e0b975c 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -138,10 +138,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -226,7 +226,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "¡No puede finalizar la operación sin iniciarla o reanudarla!"
@@ -237,7 +237,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "¡No hay operación para cancelar!"
@@ -284,7 +284,7 @@ msgid "Future Work Orders"
 msgstr "Ordenes de trabajo futuras"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -402,7 +402,7 @@ msgid "Production Operation Code"
 msgstr "Código operación de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -457,7 +457,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "¡La operación ya está finalizada!"
@@ -514,7 +514,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "¡La operación todavía no se ha iniciado!"
@@ -525,10 +525,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "¡Disculpe!"
@@ -545,7 +545,7 @@ msgid "Code"
 msgstr "Código"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "¡La operación ya está cancelada!"
diff --git a/addons/mrp_operations/i18n/es_EC.po b/addons/mrp_operations/i18n/es_EC.po
index 2401a45576c..b222e505464 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -29,7 +29,7 @@ msgstr "Órdenes de producción"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Cancelar la operación"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -40,29 +40,29 @@ msgstr "mrp_operations.operation.code"
 #: code:addons/mrp_operations/mrp_operations.py:133
 #, python-format
 msgid "Production Order Cannot start in [%s] state"
-msgstr ""
+msgstr "Orden de producción no puede empezar en estado [%s]"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupado por..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Información sobre la definición de la ruta"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "Centros de producción"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -94,13 +94,13 @@ msgstr "Serializado Libre"
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Operaciones MRP"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -110,18 +110,20 @@ msgstr "Orden de producción"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Excepción de Inventario"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "Creación de órden de trabajo"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
+"¡No puede detener las operaciones que no estén en estado iniciada o "
+"reanudada!"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -133,24 +135,24 @@ msgstr "Centro de producción"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
@@ -166,12 +168,12 @@ msgstr "Operaciones"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movimiento de stock"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Nº de líneas"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -192,13 +194,13 @@ msgstr "En Producción"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "Orden de trabajo"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -206,11 +208,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"Hay una orden de trabajo por centro de producción. La información sobre el "
+"número de ciclos o duración del ciclo."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -223,12 +227,21 @@ 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 ""
+"*Cuando una orden de trabajo es creada, su estado es 'Borrador'.\n"
+"*Cuando un usuario inicia la orden de trabajo, su estado pasará a 'En "
+"curso'.\n"
+"*Cuando la orden de trabajo está en modo 'En funcionamiento', si un usuario "
+"quiere detenerla o realizar cambios sobre ella, debe pasarla al estado "
+"'Pausa'.\n"
+"*Cuando el usuario cancela la orden de trabajo pasará al estado "
+"'Cancelada'.\n"
+"*Cuando la orden es completamente procesada, pasará al estado 'Terminada'."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
-msgstr ""
+msgstr "¡No puede finalizar la operación sin iniciarla o reanudarla!"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -236,21 +249,21 @@ msgid "Planned Date"
 msgstr "Fecha planeada"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
-msgstr ""
+msgstr "¡No hay operación a cancelar!"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Cantidad producto"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
@@ -271,6 +284,11 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"Para fabricar o ensamblar productos, y usar materias primas y productos "
+"acabados también debe controlar las operaciones de fabricación. Las "
+"operaciones de fabricación a menudo se llaman órdenes de trabajo. Las "
+"diferentes intervenciones tendrán diferentes impactos en los costes de "
+"fabricación y la planificación en función de la carga de trabajo disponible."
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
@@ -283,33 +301,35 @@ msgid "Future Work Orders"
 msgstr "Órdenes de producción futuras"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
 "operation"
 msgstr ""
+"¡La operación ha sido iniciada! Puede ponerla en pausa / finalizar/cancelar "
+"la operación"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operación cancelada"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -324,7 +344,7 @@ msgstr "mrp_operations.operation"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr ""
+msgstr "Informe orden de trabajo"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -357,7 +377,7 @@ msgstr "En proceso"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Órden de producción"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -377,6 +397,8 @@ msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
 msgstr ""
+"Cuando la operación necesita ser cancelada, puede hacerlo en el formulario "
+"de la orden de trabajo."
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -388,12 +410,12 @@ msgstr "Cambiar a borrador"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Total ciclos"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
@@ -401,20 +423,20 @@ msgid "Production Operation Code"
 msgstr "Código operación de producción"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
-msgstr ""
+msgstr " ¡No puede reanudar las operaciones que no estén en estado Detenida!"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Iniciada"
 
 #. module: mrp_operations
 #: model:ir.module.module,description:mrp_operations.module_meta_information
@@ -448,17 +470,50 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Este módulo añade estado, fecha de comiento, fecha de fin a las lineas "
+"de operación de las órdenes de producción\n"
+"     (en la pestaña \"Centros de Trabajo\")\n"
+"     Estado: borrador, confirmado, hecho, cancelado\n"
+"     Cuando se finalizan, confirman o cancelan las órdenes de producción se "
+"establecen todos las líneas al estado correspondiente\n"
+"     Menús creados:\n"
+"         Gestión de productos > Todas las operaciones\n"
+"         Gestión de productos > Todas las operaciones > Operaciones a "
+"realizar (estado=\"confirmada\")\n"
+"     La cual es una vista en las líneas de \"Centros de Trabajo\" en las "
+"órdenes de producción,\n"
+"     árbol editable\n"
+"\n"
+"     Añade botones a la vista formulario de las órdenes de producción bajo "
+"la pestaña de centros de trabajo:\n"
+"     * comenzar (cambia el estado a 'confirmada'), rellena la fecha de "
+"comienzo\n"
+"     * finalizar (cambia el estado a 'finalizada'), rellena la fecha de fin\n"
+"     * cambiar a borrador (cambia el estado a 'borrador')\n"
+"     * cancelar (cambia el estado a cancelada)\n"
+"\n"
+"    Cuando las órdenes de producción estén \"preparadas para producirse\", "
+"las operaciones deben\n"
+"    confirmarse. Cuando se realice la órden de producción, todas las "
+"operaciones\n"
+"    quedar realizadas.\n"
+"\n"
+"    El campo 'retraso' es el retraso (fecha de fin - fecha de comienzo).\n"
+"    Así podremos compara el retraso teórico con el retraso real.\n"
+"\n"
+"    "
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
-msgstr ""
+msgstr "¡La operación ya está finalizada!"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -479,62 +534,64 @@ msgstr "Planeación de Ordenes de Trabajo"
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is lead time between operation start and stop in this workcenter"
 msgstr ""
+"Este es el plazo de ejecución entre las operaciones de inicio y parada en "
+"este centro de producción."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Buscar"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Terminar la operación."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
-msgstr ""
+msgstr "¡La operación todavía no se ha iniciado!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Información de la orden de fabricación"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
-msgstr ""
+msgstr "¡Lo siento!"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
@@ -543,20 +600,20 @@ msgid "Code"
 msgstr "Código"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
-msgstr ""
+msgstr "¡La operación ya está cancelada!"
 
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
-msgstr ""
+msgstr "Flujo de inicio-final de la producción en los centros de producción"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Códigos de operaciones"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
@@ -566,7 +623,7 @@ msgstr "Ctd."
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operación realizada"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -595,6 +652,11 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"Las órdenes de trabajo es la lista de operaciones que se realizarán para "
+"cada orden de producción. Una vez que se inicia el primer trabajo de una "
+"orden de producción, esta se marca automáticamente como iniciada. Una vez "
+"que termine la última operación de una orden de producción, esta se realiza "
+"automáticamente y los productos relacionados son producidos."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -609,22 +671,22 @@ msgstr "Información"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "Códigos de barra de centros de producción"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Debe asignar un lote de producción para este producto"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Retrasado"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Retraso"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -637,7 +699,7 @@ msgstr "Producción"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "Buscar órdenes de trabajo"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
@@ -666,7 +728,7 @@ msgstr "Producto"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total horas"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -685,7 +747,7 @@ msgstr ")"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Análisis de órdenes de trabajo"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -703,7 +765,7 @@ msgstr "UdM"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Horas por centro de producción"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
@@ -720,32 +782,32 @@ msgstr "Fecha final"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operación cancelada"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Iniciar la operación"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operación realizada"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Nº línea órdenes"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -753,27 +815,29 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"Cuando se finaliza la operación, el operador actualiza el sistema "
+"finalizando la orden de trabajo."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Detalles de la orden de trabajo"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Estado producción"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -783,12 +847,12 @@ msgstr "Duración"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "¡Cantidad ordenada no puede ser negativa o cero!"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -823,9 +887,6 @@ msgstr ""
 #~ msgid "From production order, create the workorder"
 #~ msgstr "Desde orden de producción, crear la orden de trabajo"
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Horas por centro de trabajo"
-
 #~ msgid "All Work Orders"
 #~ msgstr "Todas las órdenes de producción"
 
@@ -862,9 +923,6 @@ msgstr ""
 #~ msgid "Production start Operation"
 #~ msgstr "Operación inicio de producción"
 
-#~ msgid "Packing Exception"
-#~ msgstr "Excepción de empaque"
-
 #~ msgid "Work Orders to Do"
 #~ msgstr "Órdenes de producción a realizar"
 
diff --git a/addons/mrp_operations/i18n/es_MX.po b/addons/mrp_operations/i18n/es_MX.po
new file mode 100644
index 00000000000..cd49b107ad9
--- /dev/null
+++ b/addons/mrp_operations/i18n/es_MX.po
@@ -0,0 +1,955 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_operations
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-01-13 10:26+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:35+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_order
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_canceloperation0
+msgid "Cancel the operation."
+msgstr "Cancelar la operación"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
+msgid "mrp_operations.operation.code"
+msgstr "mrp_operations.operation.code"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:133
+#, python-format
+msgid "Production Order Cannot start in [%s] state"
+msgstr "Orden de producción no puede empezar en estado [%s]"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_workorder0
+msgid "Information from the routing definition."
+msgstr "Información sobre la definición de la ruta"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
+msgid "Work Centers"
+msgstr "Centros de producción"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Resume"
+msgstr "Reanudar"
+
+#. module: mrp_operations
+#: report:mrp.code.barcode:0
+msgid "("
+msgstr "("
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Product to Produce"
+msgstr "Producto a producir"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Production Operation"
+msgstr "Operación de producción"
+
+#. module: mrp_operations
+#: field:mrp.production,allow_reorder:0
+msgid "Free Serialisation"
+msgstr "Serializado Libre"
+
+#. module: mrp_operations
+#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
+msgid "Mrp Operations"
+msgstr "Operaciones Mrp"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_productionorder0
+msgid "Production Order"
+msgstr "Orden de producción"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Picking Exception"
+msgstr "Excepción albarán"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_productionstart0
+msgid "Creation of the work order"
+msgstr "Creación de órden de trabajo"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:463
+#, python-format
+msgid "You cannot Pause the Operation other then Start/Resume state !"
+msgstr ""
+"¡No puede detener las operaciones que no estén en estado iniciada o "
+"reanudada!"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,workcenter_id:0
+msgid "Workcenter"
+msgstr "Centro de producción"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_productionstart0
+msgid "The work orders are created on the basis of the production order."
+msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:133
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
+msgid "Confirmed Work Orders"
+msgstr "Órdenes de trabajo confirmadas"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
+#: view:mrp.production.workcenter.line:0
+msgid "Operations"
+msgstr "Operaciones"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: mrp_operations
+#: field:mrp.workorder,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "In Production"
+msgstr "En Producción"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.production.workcenter.line,state:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
+#: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
+msgid "Work Order"
+msgstr "Orden de trabajo"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
+msgid ""
+"There is 1 work order per work center. The information about the number of "
+"cycles or the cycle time."
+msgstr ""
+"Hay una orden de trabajo por centro de producción. La información sobre el "
+"número de ciclos o duración del ciclo."
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,state:0
+msgid ""
+"* 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 'Pause' 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."
+msgstr ""
+"*Cuando una orden de trabajo es creada, su estado es 'Borrador'.\n"
+"*Cuando un usuario inicia la orden de trabajo, su estado pasará a 'En "
+"curso'.\n"
+"*Cuando la orden de trabajo está en modo 'En funcionamiento', si un usuario "
+"quiere detenerla o realizar cambios sobre ella, debe pasarla al estado "
+"'Pausa'.\n"
+"*Cuando el usuario cancela la orden de trabajo pasará al estado "
+"'Cancelada'.\n"
+"*Cuando la orden es completamente procesada, pasará al estado 'Terminada'."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:472
+#, python-format
+msgid "You cannot finish the operation without Starting/Resuming it !"
+msgstr "¡No puede finalizar la operación sin iniciarla o reanudarla!"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Planned Date"
+msgstr "Fecha planeada"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:479
+#, python-format
+msgid "There is no Operation to be cancelled !"
+msgstr "¡No hay operación a cancelar!"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,product_qty:0
+msgid "Product Qty"
+msgstr "Ctdad producto"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,name:0
+msgid "Operation Name"
+msgstr "Nombre operación"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,start_stop:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid ""
+"To manufacture or assemble products, and use raw materials and finished "
+"products you must also handle manufacturing operations. Manufacturing "
+"operations are often called Work Orders. The various operations will have "
+"different impacts on the costs of manufacturing and planning depending on "
+"the available workload."
+msgstr ""
+"Para fabricar o ensamblar productos, y usar materias primas y productos "
+"acabados también debe controlar las operaciones de fabricación. Las "
+"operaciones de fabricación a menudo se llaman órdenes de trabajo. Las "
+"diferentes intervenciones tendrán diferentes impactos en los costes de "
+"fabricación y la planificación en función de la carga de trabajo disponible."
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,order_date:0
+msgid "Order Date"
+msgstr "Fecha orden"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
+msgid "Future Work Orders"
+msgstr "Órdenes de trabajo futuras"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:459
+#, python-format
+msgid ""
+"Operation has already started !You  can either Pause /Finish/Cancel the "
+"operation"
+msgstr ""
+"¡La operación ha sido iniciada! Puede ponerla en pausa / finalizar/cancelar "
+"la operación"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_canceloperation0
+msgid "Operation Cancelled"
+msgstr "Operación cancelada"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Canceled"
+msgstr "Cancelada"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation
+msgid "mrp_operations.operation"
+msgstr "mrp_operations.operation"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_workorder
+msgid "Work Order Report"
+msgstr "Informe orden de trabajo"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_start:0
+#: field:mrp.production.workcenter.line,date_start_date:0
+#: field:mrp_operations.operation,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Waiting Goods"
+msgstr "Esperando mercancía"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Pause"
+msgstr "Detener"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Start"
+msgstr "Iniciar"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
+msgid ""
+"When the operation needs to be cancelled, you can do it in the work order "
+"form."
+msgstr ""
+"Cuando la operación necesita ser cancelada, puede hacerlo en el formulario "
+"de la orden de trabajo."
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Set Draft"
+msgstr "Cambiar a borrador"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,total_cycles:0
+msgid "Total Cycles"
+msgstr "Ciclos totales"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation.code:0
+msgid "Production Operation Code"
+msgstr "Código operación de producción"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:467
+#, python-format
+msgid " You cannot Resume the operation other then Pause state !"
+msgstr " ¡No puede reanudar las operaciones que no estén en estado Detenida!"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Started"
+msgstr "Iniciada"
+
+#. module: mrp_operations
+#: model:ir.module.module,description:mrp_operations.module_meta_information
+msgid ""
+"\n"
+"     This module adds state, date_start,date_stop in production order "
+"operation lines\n"
+"     (in the \"Work Centers\" tab)\n"
+"     State: draft, confirm, done, cancel\n"
+"     When finishing/confirming,cancelling production orders set all state "
+"lines to the according state\n"
+"     Create menus:\n"
+"         Production Management > All Operations\n"
+"         Production Management > All Operations > Operations To Do "
+"(state=\"confirm\")\n"
+"     Which is a view on \"Work Centers\" lines in production order,\n"
+"     editable tree\n"
+"\n"
+"    Add buttons in the form view of production order under workcenter tab:\n"
+"    * start (set state to confirm), set date_start\n"
+"    * done (set state to done), set date_stop\n"
+"    * set to draft (set state to draft)\n"
+"    * cancel set state to cancel\n"
+"\n"
+"    When the production order becomes \"ready to produce\", operations must\n"
+"    become 'confirmed'. When the production order is done, all operations\n"
+"    must become done.\n"
+"\n"
+"    The field delay is the delay(stop date - start date).\n"
+"    So that we can compare the theoretic delay and real delay.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"     Este módulo añade estado, fecha de comiento, fecha de fin a las lineas "
+"de operación de las órdenes de producción\n"
+"     (en la pestaña \"Centros de Trabajo\")\n"
+"     Estado: borrador, confirmado, hecho, cancelado\n"
+"     Cuando se finalizan, confirman o cancelan las órdenes de producción se "
+"establecen todos las líneas al estado correspondiente\n"
+"     Menús creados:\n"
+"         Gestión de productos > Todas las operaciones\n"
+"         Gestión de productos > Todas las operaciones > Operaciones a "
+"realizar (estado=\"confirmada\")\n"
+"     La cual es una vista en las líneas de \"Centros de Trabajo\" en las "
+"órdenes de producción,\n"
+"     árbol editable\n"
+"\n"
+"     Añade botones a la vista formulario de las órdenes de producción bajo "
+"la pestaña de centros de trabajo:\n"
+"     * comenzar (cambia el estado a 'confirmada'), rellena la fecha de "
+"comienzo\n"
+"     * finalizar (cambia el estado a 'finalizada'), rellena la fecha de fin\n"
+"     * cambiar a borrador (cambia el estado a 'borrador')\n"
+"     * cancelar (cambia el estado a cancelada)\n"
+"\n"
+"    Cuando las órdenes de producción estén \"preparadas para producirse\", "
+"las operaciones deben\n"
+"    confirmarse. Cuando se realice la órden de producción, todas las "
+"operaciones\n"
+"    quedar realizadas.\n"
+"\n"
+"    El campo 'retraso' es el retraso (fecha de fin - fecha de comienzo).\n"
+"    Así podremos compara el retraso teórico con el retraso real.\n"
+"\n"
+"    "
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:482
+#, python-format
+msgid "Operation is already finished !"
+msgstr "¡La operación ya está finalizada!"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Ready to Produce"
+msgstr "Listo para producir"
+
+#. module: mrp_operations
+#: field:stock.move,move_dest_id_lines:0
+msgid "Children Moves"
+msgstr "Hijo se mueve"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
+msgid "Work Orders Planning"
+msgstr "Planificación de órdenes de trabajo"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.workorder,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,delay:0
+msgid "This is lead time between operation start and stop in this workcenter"
+msgstr ""
+"Este es el plazo de ejecución entre las operaciones de inicio y parada en "
+"este centro de producción."
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_doneoperation0
+msgid "Finish the operation."
+msgstr "Terminar la operación."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:452
+#, python-format
+msgid "Operation is not started yet !"
+msgstr "¡La operación todavía no se ha iniciado!"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_productionorder0
+msgid "Information from the production order."
+msgstr "Inforamción de la orden de fabricación"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
+#, python-format
+msgid "Sorry!"
+msgstr "¡Disculpe!"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,code_id:0
+#: field:mrp_operations.operation.code,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:475
+#, python-format
+msgid "Operation is Already Cancelled  !"
+msgstr "¡La operación ya está cancelada!"
+
+#. module: mrp_operations
+#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
+msgid "Work Center Production start end workflow"
+msgstr "Flujo de inicio-final de la producción en los centros de producción"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
+msgid "Operation Codes"
+msgstr "Códigos de operaciones"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,qty:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_doneoperation0
+msgid "Operation Done"
+msgstr "Operación realizada"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: view:mrp.workorder:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
+msgid "Start/Stop Barcode"
+msgstr "Código de barras Iniciar/Parar"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
+msgid ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
+msgstr ""
+"Las órdenes de trabajo es la lista de operaciones que se realizarán para "
+"cada orden de producción. Una vez que se inicia el primer trabajo de una "
+"orden de producción, esta se marca automáticamente como iniciada. Una vez "
+"que termine la última operación de una orden de producción, esta se realiza "
+"automáticamente y los productos relacionados son producidos."
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_startoperation0
+msgid "Start Operation"
+msgstr "Operación inicio"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Information"
+msgstr "Información"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
+msgid "Work Centers Barcode"
+msgstr "Códigos de barra de centros de producción"
+
+#. module: mrp_operations
+#: 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: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: mrp_operations
+#: field:mrp.workorder,delay:0
+msgid "Delay"
+msgstr "Retraso"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,production_id:0
+#: field:mrp_operations.operation,production_id:0
+msgid "Production"
+msgstr "Producción"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Search Work Orders"
+msgstr "Buscar órdenes de trabajo"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,workcenter_id:0
+#: model:process.node,name:mrp_operations.process_node_workorder0
+msgid "Work Center"
+msgstr "Centro de producción"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Real"
+msgstr "Real"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Fecha programada"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,product:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: mrp_operations
+#: help:mrp.production,allow_reorder:0
+msgid ""
+"Check this to be able to move independently all production orders, without "
+"moving dependent ones."
+msgstr ""
+"Selecciona esta opcion para poder mover independientemente todas las ordenes "
+"de producción, sin mover sus dependientes"
+
+#. module: mrp_operations
+#: report:mrp.code.barcode:0
+msgid ")"
+msgstr ")"
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
+msgid "Work Order Analysis"
+msgstr "Análisis de órdenes de trabajo"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "Finished"
+msgstr "Finalizada"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,uom:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Hours by Work Center"
+msgstr "Horas por centro de producción"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,delay:0
+msgid "Working Hours"
+msgstr "Horas laborales"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_finished:0
+#: field:mrp.production.workcenter.line,date_planned_end:0
+#: field:mrp_operations.operation,date_finished:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
+msgid "Operation cancelled"
+msgstr "Operación cancelada"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_startoperation0
+msgid "Start the operation."
+msgstr "Iniciar la operación"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
+msgid "Operation done"
+msgstr "Operación realizada"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "#Line Orders"
+msgstr "Nº línea órdenes"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
+msgid ""
+"When the operation is finished, the operator updates the system by finishing "
+"the work order."
+msgstr ""
+"Cuando se finaliza la operación, el operador actualiza el sistema "
+"finalizando la orden de trabajo."
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
+msgid "Details of the work order"
+msgstr "Detalles de la orden de trabajo"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,production_state:0
+msgid "Production State"
+msgstr "Estado producción"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: mrp_operations
+#: 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_operations
+#: 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"
+
+#~ 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 "Operation is started"
+#~ msgstr "Operación es iniciada"
+
+#~ msgid "Start working"
+#~ msgstr "Iniciar producción"
+
+#~ msgid "Operations Code"
+#~ msgstr "Código operaciones"
+
+#~ msgid "Mrp Operation Process"
+#~ msgstr "Proceso operación MRP"
+
+#~ msgid "Work Order Events Using Bar Codes"
+#~ msgstr "Eventos de órdenes de producción usando códigos de barras"
+
+#~ msgid "Date Planned"
+#~ msgstr "Fecha prevista"
+
+#~ msgid "Start - Stop Codes"
+#~ msgstr "Códigos Iniciar - Parar"
+
+#~ msgid "From production order, create the workorder"
+#~ msgstr "Desde orden de producción, crear la orden de trabajo"
+
+#~ msgid "Start Cancel Operation"
+#~ msgstr "Operación cancelación inicio"
+
+#~ msgid "Workcenters Barcode"
+#~ msgstr "Código de barras centros de producción"
+
+#~ msgid "Operation is done"
+#~ msgstr "Operación es realizada"
+
+#~ msgid "Start Done Operation"
+#~ msgstr "Operación realizado inicio"
+
+#~ msgid "Production order for any products"
+#~ msgstr "Orden de producción para cualquier producto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "This is delay between operation start and stop in this workcenter"
+#~ msgstr ""
+#~ "Este es el retraso entre las operaciones de inicio y finalización en este "
+#~ "centro de producción"
+
+#~ msgid "Production Work Center"
+#~ msgstr "Centro de trabajo de producción"
+
+#~ msgid "Production start Operation"
+#~ msgstr "Operación inicio de producción"
+
+#~ msgid "Graph view in hours by workcenter"
+#~ msgstr "Vista gráfica en horas por centro de producción"
+
+#~ msgid "Work Orders to Do"
+#~ msgstr "Órdenes de producción a realizar"
+
+#~ msgid "Cancel Operation"
+#~ msgstr "Operación cancelación"
+
+#~ msgid "Work start Operation"
+#~ msgstr "Operación inicio de trabajo"
+
+#~ msgid "Done Operation"
+#~ msgstr "Operación realizado"
+
+#~ msgid "Operation is cancelled"
+#~ msgstr "Operación es cancelada"
+
+#, python-format
+#~ msgid ""
+#~ "Operation has already started !' 'You  can either Pause /Finish/Cancel the "
+#~ "operation"
+#~ msgstr ""
+#~ "¡La operación ya se ha iniciado! Puede Detener/Finalizar/Cancelar la "
+#~ "operación"
+
+#~ msgid "From work order, define the cycles and hour for creating product"
+#~ msgstr ""
+#~ "Desde orden de producción, define los ciclos y hora para crear producto"
+
+#~ msgid "Prod.State"
+#~ msgstr "Estado producción"
+
+#~ msgid "Workcenter Production start end workflow"
+#~ msgstr "Flujo de inicio y fin producción del centro de producción"
+
+#~ msgid "All Work Orders"
+#~ msgstr "Todas las órdenes de producción"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/mrp_operations/i18n/es_VE.po b/addons/mrp_operations/i18n/es_VE.po
new file mode 100644
index 00000000000..cd49b107ad9
--- /dev/null
+++ b/addons/mrp_operations/i18n/es_VE.po
@@ -0,0 +1,955 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_operations
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-01-13 10:26+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:35+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_order
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+msgid "Work Orders"
+msgstr "Órdenes de trabajo"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_canceloperation0
+msgid "Cancel the operation."
+msgstr "Cancelar la operación"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
+msgid "mrp_operations.operation.code"
+msgstr "mrp_operations.operation.code"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:133
+#, python-format
+msgid "Production Order Cannot start in [%s] state"
+msgstr "Orden de producción no puede empezar en estado [%s]"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_workorder0
+msgid "Information from the routing definition."
+msgstr "Información sobre la definición de la ruta"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
+msgid "Work Centers"
+msgstr "Centros de producción"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Resume"
+msgstr "Reanudar"
+
+#. module: mrp_operations
+#: report:mrp.code.barcode:0
+msgid "("
+msgstr "("
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Product to Produce"
+msgstr "Producto a producir"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Production Operation"
+msgstr "Operación de producción"
+
+#. module: mrp_operations
+#: field:mrp.production,allow_reorder:0
+msgid "Free Serialisation"
+msgstr "Serializado Libre"
+
+#. module: mrp_operations
+#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
+msgid "Mrp Operations"
+msgstr "Operaciones Mrp"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_productionorder0
+msgid "Production Order"
+msgstr "Orden de producción"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Picking Exception"
+msgstr "Excepción albarán"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_productionstart0
+msgid "Creation of the work order"
+msgstr "Creación de órden de trabajo"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:463
+#, python-format
+msgid "You cannot Pause the Operation other then Start/Resume state !"
+msgstr ""
+"¡No puede detener las operaciones que no estén en estado iniciada o "
+"reanudada!"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,workcenter_id:0
+msgid "Workcenter"
+msgstr "Centro de producción"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_productionstart0
+msgid "The work orders are created on the basis of the production order."
+msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:133
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
+msgid "Confirmed Work Orders"
+msgstr "Órdenes de trabajo confirmadas"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
+#: view:mrp.production.workcenter.line:0
+msgid "Operations"
+msgstr "Operaciones"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: mrp_operations
+#: field:mrp.workorder,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "In Production"
+msgstr "En Producción"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.production.workcenter.line,state:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
+#: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
+msgid "Work Order"
+msgstr "Orden de trabajo"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
+msgid ""
+"There is 1 work order per work center. The information about the number of "
+"cycles or the cycle time."
+msgstr ""
+"Hay una orden de trabajo por centro de producción. La información sobre el "
+"número de ciclos o duración del ciclo."
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,state:0
+msgid ""
+"* 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 'Pause' 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."
+msgstr ""
+"*Cuando una orden de trabajo es creada, su estado es 'Borrador'.\n"
+"*Cuando un usuario inicia la orden de trabajo, su estado pasará a 'En "
+"curso'.\n"
+"*Cuando la orden de trabajo está en modo 'En funcionamiento', si un usuario "
+"quiere detenerla o realizar cambios sobre ella, debe pasarla al estado "
+"'Pausa'.\n"
+"*Cuando el usuario cancela la orden de trabajo pasará al estado "
+"'Cancelada'.\n"
+"*Cuando la orden es completamente procesada, pasará al estado 'Terminada'."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:472
+#, python-format
+msgid "You cannot finish the operation without Starting/Resuming it !"
+msgstr "¡No puede finalizar la operación sin iniciarla o reanudarla!"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Planned Date"
+msgstr "Fecha planeada"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:479
+#, python-format
+msgid "There is no Operation to be cancelled !"
+msgstr "¡No hay operación a cancelar!"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,product_qty:0
+msgid "Product Qty"
+msgstr "Ctdad producto"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,name:0
+msgid "Operation Name"
+msgstr "Nombre operación"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,start_stop:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid ""
+"To manufacture or assemble products, and use raw materials and finished "
+"products you must also handle manufacturing operations. Manufacturing "
+"operations are often called Work Orders. The various operations will have "
+"different impacts on the costs of manufacturing and planning depending on "
+"the available workload."
+msgstr ""
+"Para fabricar o ensamblar productos, y usar materias primas y productos "
+"acabados también debe controlar las operaciones de fabricación. Las "
+"operaciones de fabricación a menudo se llaman órdenes de trabajo. Las "
+"diferentes intervenciones tendrán diferentes impactos en los costes de "
+"fabricación y la planificación en función de la carga de trabajo disponible."
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,order_date:0
+msgid "Order Date"
+msgstr "Fecha orden"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
+msgid "Future Work Orders"
+msgstr "Órdenes de trabajo futuras"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:459
+#, python-format
+msgid ""
+"Operation has already started !You  can either Pause /Finish/Cancel the "
+"operation"
+msgstr ""
+"¡La operación ha sido iniciada! Puede ponerla en pausa / finalizar/cancelar "
+"la operación"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_canceloperation0
+msgid "Operation Cancelled"
+msgstr "Operación cancelada"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Canceled"
+msgstr "Cancelada"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation
+msgid "mrp_operations.operation"
+msgstr "mrp_operations.operation"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_workorder
+msgid "Work Order Report"
+msgstr "Informe orden de trabajo"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_start:0
+#: field:mrp.production.workcenter.line,date_start_date:0
+#: field:mrp_operations.operation,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Waiting Goods"
+msgstr "Esperando mercancía"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Pause"
+msgstr "Detener"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Start"
+msgstr "Iniciar"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
+msgid ""
+"When the operation needs to be cancelled, you can do it in the work order "
+"form."
+msgstr ""
+"Cuando la operación necesita ser cancelada, puede hacerlo en el formulario "
+"de la orden de trabajo."
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Set Draft"
+msgstr "Cambiar a borrador"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,total_cycles:0
+msgid "Total Cycles"
+msgstr "Ciclos totales"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation.code:0
+msgid "Production Operation Code"
+msgstr "Código operación de producción"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:467
+#, python-format
+msgid " You cannot Resume the operation other then Pause state !"
+msgstr " ¡No puede reanudar las operaciones que no estén en estado Detenida!"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Started"
+msgstr "Iniciada"
+
+#. module: mrp_operations
+#: model:ir.module.module,description:mrp_operations.module_meta_information
+msgid ""
+"\n"
+"     This module adds state, date_start,date_stop in production order "
+"operation lines\n"
+"     (in the \"Work Centers\" tab)\n"
+"     State: draft, confirm, done, cancel\n"
+"     When finishing/confirming,cancelling production orders set all state "
+"lines to the according state\n"
+"     Create menus:\n"
+"         Production Management > All Operations\n"
+"         Production Management > All Operations > Operations To Do "
+"(state=\"confirm\")\n"
+"     Which is a view on \"Work Centers\" lines in production order,\n"
+"     editable tree\n"
+"\n"
+"    Add buttons in the form view of production order under workcenter tab:\n"
+"    * start (set state to confirm), set date_start\n"
+"    * done (set state to done), set date_stop\n"
+"    * set to draft (set state to draft)\n"
+"    * cancel set state to cancel\n"
+"\n"
+"    When the production order becomes \"ready to produce\", operations must\n"
+"    become 'confirmed'. When the production order is done, all operations\n"
+"    must become done.\n"
+"\n"
+"    The field delay is the delay(stop date - start date).\n"
+"    So that we can compare the theoretic delay and real delay.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"     Este módulo añade estado, fecha de comiento, fecha de fin a las lineas "
+"de operación de las órdenes de producción\n"
+"     (en la pestaña \"Centros de Trabajo\")\n"
+"     Estado: borrador, confirmado, hecho, cancelado\n"
+"     Cuando se finalizan, confirman o cancelan las órdenes de producción se "
+"establecen todos las líneas al estado correspondiente\n"
+"     Menús creados:\n"
+"         Gestión de productos > Todas las operaciones\n"
+"         Gestión de productos > Todas las operaciones > Operaciones a "
+"realizar (estado=\"confirmada\")\n"
+"     La cual es una vista en las líneas de \"Centros de Trabajo\" en las "
+"órdenes de producción,\n"
+"     árbol editable\n"
+"\n"
+"     Añade botones a la vista formulario de las órdenes de producción bajo "
+"la pestaña de centros de trabajo:\n"
+"     * comenzar (cambia el estado a 'confirmada'), rellena la fecha de "
+"comienzo\n"
+"     * finalizar (cambia el estado a 'finalizada'), rellena la fecha de fin\n"
+"     * cambiar a borrador (cambia el estado a 'borrador')\n"
+"     * cancelar (cambia el estado a cancelada)\n"
+"\n"
+"    Cuando las órdenes de producción estén \"preparadas para producirse\", "
+"las operaciones deben\n"
+"    confirmarse. Cuando se realice la órden de producción, todas las "
+"operaciones\n"
+"    quedar realizadas.\n"
+"\n"
+"    El campo 'retraso' es el retraso (fecha de fin - fecha de comienzo).\n"
+"    Así podremos compara el retraso teórico con el retraso real.\n"
+"\n"
+"    "
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:482
+#, python-format
+msgid "Operation is already finished !"
+msgstr "¡La operación ya está finalizada!"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Ready to Produce"
+msgstr "Listo para producir"
+
+#. module: mrp_operations
+#: field:stock.move,move_dest_id_lines:0
+msgid "Children Moves"
+msgstr "Hijo se mueve"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
+msgid "Work Orders Planning"
+msgstr "Planificación de órdenes de trabajo"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.workorder,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,delay:0
+msgid "This is lead time between operation start and stop in this workcenter"
+msgstr ""
+"Este es el plazo de ejecución entre las operaciones de inicio y parada en "
+"este centro de producción."
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_doneoperation0
+msgid "Finish the operation."
+msgstr "Terminar la operación."
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:452
+#, python-format
+msgid "Operation is not started yet !"
+msgstr "¡La operación todavía no se ha iniciado!"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_productionorder0
+msgid "Information from the production order."
+msgstr "Inforamción de la orden de fabricación"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
+#, python-format
+msgid "Sorry!"
+msgstr "¡Disculpe!"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,code_id:0
+#: field:mrp_operations.operation.code,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:475
+#, python-format
+msgid "Operation is Already Cancelled  !"
+msgstr "¡La operación ya está cancelada!"
+
+#. module: mrp_operations
+#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
+msgid "Work Center Production start end workflow"
+msgstr "Flujo de inicio-final de la producción en los centros de producción"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
+msgid "Operation Codes"
+msgstr "Códigos de operaciones"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,qty:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_doneoperation0
+msgid "Operation Done"
+msgstr "Operación realizada"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: view:mrp.workorder:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
+msgid "Start/Stop Barcode"
+msgstr "Código de barras Iniciar/Parar"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
+msgid ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
+msgstr ""
+"Las órdenes de trabajo es la lista de operaciones que se realizarán para "
+"cada orden de producción. Una vez que se inicia el primer trabajo de una "
+"orden de producción, esta se marca automáticamente como iniciada. Una vez "
+"que termine la última operación de una orden de producción, esta se realiza "
+"automáticamente y los productos relacionados son producidos."
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_startoperation0
+msgid "Start Operation"
+msgstr "Operación inicio"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Information"
+msgstr "Información"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
+msgid "Work Centers Barcode"
+msgstr "Códigos de barra de centros de producción"
+
+#. module: mrp_operations
+#: 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: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: mrp_operations
+#: field:mrp.workorder,delay:0
+msgid "Delay"
+msgstr "Retraso"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,production_id:0
+#: field:mrp_operations.operation,production_id:0
+msgid "Production"
+msgstr "Producción"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Search Work Orders"
+msgstr "Buscar órdenes de trabajo"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,workcenter_id:0
+#: model:process.node,name:mrp_operations.process_node_workorder0
+msgid "Work Center"
+msgstr "Centro de producción"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Real"
+msgstr "Real"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Fecha programada"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,product:0
+#: view:mrp.workorder:0
+#: field:mrp.workorder,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: mrp_operations
+#: help:mrp.production,allow_reorder:0
+msgid ""
+"Check this to be able to move independently all production orders, without "
+"moving dependent ones."
+msgstr ""
+"Selecciona esta opcion para poder mover independientemente todas las ordenes "
+"de producción, sin mover sus dependientes"
+
+#. module: mrp_operations
+#: report:mrp.code.barcode:0
+msgid ")"
+msgstr ")"
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
+msgid "Work Order Analysis"
+msgstr "Análisis de órdenes de trabajo"
+
+#. module: mrp_operations
+#: view:mrp.production:0
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp.workorder,state:0
+msgid "Finished"
+msgstr "Finalizada"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,uom:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Hours by Work Center"
+msgstr "Horas por centro de producción"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,delay:0
+msgid "Working Hours"
+msgstr "Horas laborales"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_finished:0
+#: field:mrp.production.workcenter.line,date_planned_end:0
+#: field:mrp_operations.operation,date_finished:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
+msgid "Operation cancelled"
+msgstr "Operación cancelada"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_startoperation0
+msgid "Start the operation."
+msgstr "Iniciar la operación"
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
+msgid "Operation done"
+msgstr "Operación realizada"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+msgid "#Line Orders"
+msgstr "Nº línea órdenes"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
+msgid ""
+"When the operation is finished, the operator updates the system by finishing "
+"the work order."
+msgstr ""
+"Cuando se finaliza la operación, el operador actualiza el sistema "
+"finalizando la orden de trabajo."
+
+#. module: mrp_operations
+#: selection:mrp.workorder,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
+msgid "Details of the work order"
+msgstr "Detalles de la orden de trabajo"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,production_state:0
+msgid "Production State"
+msgstr "Estado producción"
+
+#. module: mrp_operations
+#: view:mrp.workorder:0
+#: field:mrp.workorder,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: mrp_operations
+#: 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_operations
+#: 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"
+
+#~ 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 "Operation is started"
+#~ msgstr "Operación es iniciada"
+
+#~ msgid "Start working"
+#~ msgstr "Iniciar producción"
+
+#~ msgid "Operations Code"
+#~ msgstr "Código operaciones"
+
+#~ msgid "Mrp Operation Process"
+#~ msgstr "Proceso operación MRP"
+
+#~ msgid "Work Order Events Using Bar Codes"
+#~ msgstr "Eventos de órdenes de producción usando códigos de barras"
+
+#~ msgid "Date Planned"
+#~ msgstr "Fecha prevista"
+
+#~ msgid "Start - Stop Codes"
+#~ msgstr "Códigos Iniciar - Parar"
+
+#~ msgid "From production order, create the workorder"
+#~ msgstr "Desde orden de producción, crear la orden de trabajo"
+
+#~ msgid "Start Cancel Operation"
+#~ msgstr "Operación cancelación inicio"
+
+#~ msgid "Workcenters Barcode"
+#~ msgstr "Código de barras centros de producción"
+
+#~ msgid "Operation is done"
+#~ msgstr "Operación es realizada"
+
+#~ msgid "Start Done Operation"
+#~ msgstr "Operación realizado inicio"
+
+#~ msgid "Production order for any products"
+#~ msgstr "Orden de producción para cualquier producto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "This is delay between operation start and stop in this workcenter"
+#~ msgstr ""
+#~ "Este es el retraso entre las operaciones de inicio y finalización en este "
+#~ "centro de producción"
+
+#~ msgid "Production Work Center"
+#~ msgstr "Centro de trabajo de producción"
+
+#~ msgid "Production start Operation"
+#~ msgstr "Operación inicio de producción"
+
+#~ msgid "Graph view in hours by workcenter"
+#~ msgstr "Vista gráfica en horas por centro de producción"
+
+#~ msgid "Work Orders to Do"
+#~ msgstr "Órdenes de producción a realizar"
+
+#~ msgid "Cancel Operation"
+#~ msgstr "Operación cancelación"
+
+#~ msgid "Work start Operation"
+#~ msgstr "Operación inicio de trabajo"
+
+#~ msgid "Done Operation"
+#~ msgstr "Operación realizado"
+
+#~ msgid "Operation is cancelled"
+#~ msgstr "Operación es cancelada"
+
+#, python-format
+#~ msgid ""
+#~ "Operation has already started !' 'You  can either Pause /Finish/Cancel the "
+#~ "operation"
+#~ msgstr ""
+#~ "¡La operación ya se ha iniciado! Puede Detener/Finalizar/Cancelar la "
+#~ "operación"
+
+#~ msgid "From work order, define the cycles and hour for creating product"
+#~ msgstr ""
+#~ "Desde orden de producción, define los ciclos y hora para crear producto"
+
+#~ msgid "Prod.State"
+#~ msgstr "Estado producción"
+
+#~ msgid "Workcenter Production start end workflow"
+#~ msgstr "Flujo de inicio y fin producción del centro de producción"
+
+#~ msgid "All Work Orders"
+#~ msgstr "Todas las órdenes de producción"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index 1cf85580c12..15887bc8f7f 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Viga!"
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Sa ei saa lõpetada operatsiooni enne, kui sa ei alusta/jätka seda !"
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr "Planeeritud kuupäev"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Siin ei ole operatsiooni mida tühistada !"
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr "Tulevased töökorraldused"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr "Tootmisoperatsiooni kood"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Operatsioon on juba lõpetatud !"
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operatsiooni pole veel alustatud !"
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Vabandust!"
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr "Kood"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Operatsioon on juba tühistatud !"
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index ac97e15369c..6b922f2153d 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -29,7 +29,7 @@ msgstr "Työtilaukset"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Peruuta toiminto"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -51,7 +51,7 @@ msgstr "Ryhmittele"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Tiedot reitityksen määrittelystä"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -69,7 +69,7 @@ msgstr "Työpisteet"
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "Jatka"
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
@@ -94,7 +94,7 @@ msgstr "Vapaa sarjoitus"
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "MRP toiminnot"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -110,7 +110,7 @@ msgstr "Valmistustilaus"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Poikkeus keräilyssä"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
@@ -118,10 +118,10 @@ msgid "Creation of the work order"
 msgstr "Työtilauksen luonti"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
-msgstr ""
+msgstr "Et voi pysäyttää toimintoa paitsi käynnistä/jatka tilassa!"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -137,10 +137,10 @@ msgstr "Työtilaukset on tehty valmistustilausten perusteella."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Virhe!"
@@ -161,7 +161,7 @@ msgstr "Vahvistetut työmääräykset"
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr ""
+msgstr "Toiminnot"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
@@ -171,7 +171,7 @@ msgstr "Varastosiirto"
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Rivien lukumäärä"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -192,7 +192,7 @@ msgstr "Tuotannossa"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
@@ -206,11 +206,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"Joka työpisteelle on 1 työtilaus. Tiedot toistokertojen lukumäärästä tai "
+"kierron ajasta."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "edellinen kk"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -225,21 +227,23 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
+"Et voi merkitä toimintoa valmiiksi ennenkuin sen tila on "
+"käynnistetty/jatkettu !"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Suunniteltu päivämäärä"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
-msgstr ""
+msgstr "Peruutettavaa toimintoa ei ole !"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -260,7 +264,7 @@ msgstr "Toiminnon nimi"
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
@@ -271,6 +275,11 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"Valmistaaksesti tai kokoonpannaksesi tuotteita sekä käyttääksesi raaka-"
+"aineita ja lopputuotteita sinun pitää hoitaa myös tuotannolliset toiminnot. "
+"Tuotannolliset toiminnot ovat työtilauksia. Eri toimenpiteillä on erilaisia "
+"vaikutuksia valmistuskustannuksiin ja suunnitteluun riippuen käytettävissä "
+"olevasta kuormituksesta."
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
@@ -283,7 +292,7 @@ msgid "Future Work Orders"
 msgstr "Tulevat työmääräykset"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -337,7 +346,7 @@ msgstr "Alkupäivä"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Odottaa tuotteita"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -353,7 +362,7 @@ msgstr "Tauko"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Käynnissä"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
@@ -365,7 +374,7 @@ msgstr "Valmistustilaus"
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Start"
-msgstr ""
+msgstr "Aloita"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
@@ -377,7 +386,7 @@ msgstr "Kalenterinäkymä"
 msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
-msgstr ""
+msgstr "Kun toiminto tulee peruuttaa, voit tehdä sen tuötilaus lomakkeella."
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -389,12 +398,12 @@ msgstr "Aseta luonnos"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Kierrot yhteensä"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottava"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
@@ -402,10 +411,10 @@ msgid "Production Operation Code"
 msgstr "Tuotannontoiminto koodi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
-msgstr ""
+msgstr " Et voi jatkaa toimintoa jonka tila on joku muu kuin pysäytetty !"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -456,7 +465,7 @@ msgid "June"
 msgstr "Kesäkuu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Vaihe on jo päätetty!"
@@ -480,7 +489,7 @@ msgstr "Työmääräysten suunnittelu"
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Päiväys"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -495,7 +504,7 @@ msgstr "Tämä on vaiheen läpimenaika tässä työpisteessä"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Hae"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -510,10 +519,10 @@ msgstr "Tammikuu"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Toiminto on valmis."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Vaihetta ei ole vielä aloitettu!"
@@ -521,16 +530,16 @@ msgstr "Vaihetta ei ole vielä aloitettu!"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Tiedot tuotantotilaukselta"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
-msgstr ""
+msgstr "Anteeksi!"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -541,10 +550,10 @@ msgstr "Nykyinen"
 #: field:mrp_operations.operation,code_id:0
 #: field:mrp_operations.operation.code,code:0
 msgid "Code"
-msgstr ""
+msgstr "Koodi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Vaihe on jo peruttu!"
@@ -552,12 +561,12 @@ msgstr "Vaihe on jo peruttu!"
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
-msgstr ""
+msgstr "Työpisteen tuotannon työnvirtauksen alku ja loppu"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Toimintokoodit"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
@@ -596,6 +605,11 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"Työtilaukset ovat luettelo jokaiselle tuotantotilaukselle tehtävistä "
+"toiminnoista. Kun käynnistät ensimmäisen työtilauksen valmistustilaukselta, "
+"valmistustilauksen tila muuttu automaattisesti käynnissä olevaksi. Kun "
+"merkitset valmistustilauksen viimeisen toiminnon valmiiksi, valmistustila "
+"muuttuu automaattisesti valmiiksi"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -605,7 +619,7 @@ msgstr "Käynnistä toiminto"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr ""
+msgstr "Tiedot"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
@@ -620,12 +634,12 @@ msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Myöhässä"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Viive"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -649,12 +663,12 @@ msgstr "Työkeskus"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "Todellinen"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Suunniteltu päivämäärä"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
@@ -686,7 +700,7 @@ msgstr ")"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Työtilauksen analyysi"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -699,7 +713,7 @@ msgstr "Valmis"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "UOM"
-msgstr ""
+msgstr "Mittayksikkö"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -726,7 +740,7 @@ msgstr "Helmikuu"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Toiminto peruttu"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
@@ -746,7 +760,7 @@ msgstr "Vaihe on valmis"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Tilausrivien määrä"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -763,12 +777,12 @@ msgstr "Toukokuu"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Työtilauksen yksityiskohdat"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Valmistuksen tila"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -784,12 +798,12 @@ msgstr "Kesto"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Tilattu määrä ei voi olle negatiivinen tai nolla !"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Erä ei ole samaa tuotetta"
 
 #~ msgid "Start Cancel Operation"
 #~ msgstr "Aloita Peruutus -toiminto"
@@ -818,9 +832,6 @@ msgstr ""
 #~ msgid "From production order, create the workorder"
 #~ msgstr "Luo tuotantomääräyksestä työmääräys"
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Tunnit työkeskuksittain"
-
 #~ msgid "Production order for any products"
 #~ msgstr "Tuotantomääräys mille tahansa tuotteelle"
 
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index e778cd11383..1ab8b879d42 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-01-13 02:59+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr "Création de l'ordre de travail"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -138,10 +138,10 @@ msgstr "Les ordres de travail sont créés à partir de l'ordre de fabrication"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Erreur !"
@@ -235,7 +235,7 @@ msgstr ""
 "* Quand l'ordre est complétement terminé, l'état passe à \"Terminé\"."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -247,7 +247,7 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Il n'y a aucune opération à annuler !"
@@ -300,7 +300,7 @@ msgid "Future Work Orders"
 msgstr "Ordres de travail à venir"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -422,7 +422,7 @@ msgid "Production Operation Code"
 msgstr "Code d'Opération de Production"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -508,7 +508,7 @@ msgid "June"
 msgstr "Juin"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Opération déjà terminée !"
@@ -567,7 +567,7 @@ msgid "Finish the operation."
 msgstr "Terminer l'opération."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "L'Opération n'est pas encore commencée !"
@@ -578,10 +578,10 @@ msgid "Information from the production order."
 msgstr "Information concernant l'ordre de fabrication."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Désolé !"
@@ -598,7 +598,7 @@ msgid "Code"
 msgstr "Code"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "L'Opération est déjà annulée !"
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index eb54f587d4f..2e51c4e26ec 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr "भविष्य के कार्य आदेश"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr "कोड"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
@@ -830,9 +830,6 @@ msgstr ""
 #~ msgid "Production Work Center"
 #~ msgstr "उत्पादन कार्य केंद्र"
 
-#~ msgid "Packing Exception"
-#~ msgstr "पैकिंग अपवाद"
-
 #~ msgid "Production start Operation"
 #~ msgstr "उत्पादन ऑपरेशन शुरू"
 
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index efe81bb7b4b..e9745098516 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index 8584824a5ac..3d94baca731 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-02-02 11:45+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +118,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Hiba!"
@@ -224,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +236,7 @@ msgid "Planned Date"
 msgstr "Tervezett időpont"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +283,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +401,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +455,7 @@ msgid "June"
 msgstr "Június"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Művelet már befejeződött !"
@@ -511,7 +512,7 @@ msgid "Finish the operation."
 msgstr "Művelet befejezése"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "A művelet még nem kezdődött el !"
@@ -522,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +543,7 @@ msgid "Code"
 msgstr "Kód"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "A művelet már törölve van !"
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 8e31131e27f..bef09083bf7 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index b0fe2688192..9f1997fcd84 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr "Creazione di un ordine di lavoro"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Non puoi completare la lavorazione senza averla Avviata/Riavviata !"
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr "Data pianificata"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Non c'è nessuna lavorazione da annullare !"
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr "Ordini di lavorazione futuri"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr "Codice Lavorazione"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -456,7 +456,7 @@ msgid "June"
 msgstr "Giugno"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "La lavorazione è già stata completata !"
@@ -513,7 +513,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "La lavorazione non è ancora iniziata !"
@@ -524,10 +524,10 @@ msgid "Information from the production order."
 msgstr "Informazione per ordine di produzione"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Spiacente!"
@@ -544,7 +544,7 @@ msgid "Code"
 msgstr "Codice"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "La lavorazione è già stata annullata !"
@@ -879,3 +879,15 @@ msgstr ""
 #~ msgstr ""
 #~ "Dall'ordine di lavorazione, definire i cicli e le ore necessarie alla "
 #~ "produzione del prodotto"
+
+#~ msgid "Start Cancel Operation"
+#~ msgstr "Inizia l'Operazione di Annullamento"
+
+#~ msgid "Start Done Operation"
+#~ msgstr "Inizia l'Operazione di Completamento"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome non valido del modello nella definizione dell'azione."
+
+#~ msgid "Work start Operation"
+#~ msgstr "Operazione di inizio lavori"
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index ca7cafa2943..dd7891873dd 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr "시작/재개 상태 이외에는 오퍼레이션을 중지할 수 없습니다."
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "에러!"
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "시작/재개 없이 오퍼레이션을 마칠 수는 없습니다."
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "취소될 오퍼레이션이 없음 !"
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr "향후 작업 주문"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr "생산 오퍼레이션 코드"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr " 중지 상태 이외는 오퍼레이션을 재개할 수 없습니다."
@@ -455,7 +455,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "오퍼레이션이 이미 완료되었습니다 !"
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "오퍼레이션이 아직 시작되지 않았습니다!"
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "죄송합니다!"
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr "코드"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "오퍼레이션이 이미 취소됨 !"
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index 7efe02a89dd..483f3a8c662 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index 13d4a63f76f..03826141a84 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "U kunt de bewerking niet voltooien zonder te starten/verder te gaan!"
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Er is geen bewerking om te annuleren!"
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr "Toekomstige werkorders"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Bewerking is al klaar!"
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Bewerking is nog niet gestart!"
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Sorry!"
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr "Code"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Bewerking is al geannuleerd!"
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index 2d2f5d33bc4..76f87676e54 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 6c6d5789582..411a9c90741 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr "Utworzenie zlecenia operacji"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr "Zlecenia operacji są tworzone na podstawie zamówienia produkcji"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -227,7 +227,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Nie możesz zakończyć operacji bez uruchomienia/wznowienia !"
@@ -238,7 +238,7 @@ msgid "Planned Date"
 msgstr "Planowana data"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Nie ma żadnych operacji do anulowania !"
@@ -285,7 +285,7 @@ msgid "Future Work Orders"
 msgstr "Przyszłe zlecenia operacji"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -405,7 +405,7 @@ msgid "Production Operation Code"
 msgstr "Kod operacji produkcyjnej"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr " Nie możesz wznowić operacji ze stanu innego niż Wstrzymana !"
@@ -459,7 +459,7 @@ msgid "June"
 msgstr "Czerwiec"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Operacja jest już skończona !"
@@ -518,7 +518,7 @@ msgid "Finish the operation."
 msgstr "Skończ operację."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operacja nie została jeszcze uruchomiona !"
@@ -529,10 +529,10 @@ msgid "Information from the production order."
 msgstr "Infromacja z zamówienia produkcji."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Przepraszamy!"
@@ -549,7 +549,7 @@ msgid "Code"
 msgstr "Kod"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Operacja została już anulowana !"
@@ -876,11 +876,5 @@ msgstr "Próbujesz powiązac z numerem partii z innego produktu"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Godzin na centrum robocze"
-
 #~ msgid "Start working"
 #~ msgstr "Rozpocznij pracę"
-
-#~ msgid "Packing Exception"
-#~ msgstr "Wyjątek przesunięcia"
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index 502ac945699..406f037db0b 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr "Não pode Pausar outra Operação então Iniciar/Resumir estado !"
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Erro !"
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Não pode acabar a operação sem Iniciar/Resume-o !"
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr "Data agendada"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Não existe nenhuma Operação para ser cancelada !"
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr "Fututas Ordens de Trabalho"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr "Código de operação da produção"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr "Junho"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "A Operação já se encontra terminada !"
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr "Terminar a operação"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "A Operação ainda não foi iniciada !"
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Desculpe Q"
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr "Código"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "A Operação já está Cancelada !"
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index dda1fa1e043..66463b0a08c 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr "Criação da Ordem de Serviço"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr "As Ordens de Serviço são criadas com base na ordem de Produção."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -236,7 +236,7 @@ msgstr ""
 "definida como \"Terminada\""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Você não pode terminar a operação sem Começar/Recomeçar a mesma!"
@@ -247,7 +247,7 @@ msgid "Planned Date"
 msgstr "Data Planejada"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Não há nenhuma operação a ser cancelada!"
@@ -299,7 +299,7 @@ msgid "Future Work Orders"
 msgstr "Ordens de Serviço Futuras"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -420,7 +420,7 @@ msgid "Production Operation Code"
 msgstr "Código de Operação de Produção"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr " Você não pode continuar a operação que não está em estado de pausa!"
@@ -474,7 +474,7 @@ msgid "June"
 msgstr "Junho"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "A operação já terminou!"
@@ -532,7 +532,7 @@ msgid "Finish the operation."
 msgstr "Terminar a Operação."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "A operação ainda não foi iniciada!"
@@ -543,10 +543,10 @@ msgid "Information from the production order."
 msgstr "Informação da ordem de Produção."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Desculpe!"
@@ -563,7 +563,7 @@ msgid "Code"
 msgstr "Código"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "A Operação já foi Cancelada!"
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index 5795a2c5b51..a03e86af98b 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-02-04 20:57+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr "Ordine de lucru sunt create pe baza de ordine de producție."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Eroare!"
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Nu poți termina operațiunea, fără a o Începe / Relua !"
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr "Dată planificată"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -287,7 +287,7 @@ msgid "Future Work Orders"
 msgstr "Ordine de lucru viitoare"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -406,7 +406,7 @@ msgid "Production Operation Code"
 msgstr "Cod de operare producţie"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -460,7 +460,7 @@ msgid "June"
 msgstr "Iunie"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -517,7 +517,7 @@ msgid "Finish the operation."
 msgstr "Finalizează operaţiunea."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Operaşiunea nu este incă pornită."
@@ -528,10 +528,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Ne pare rău!"
@@ -548,7 +548,7 @@ msgid "Code"
 msgstr "Cod"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Operaţiunea este deja anulată !"
@@ -839,9 +839,6 @@ msgstr ""
 #~ msgid "From production order, create the workorder"
 #~ msgstr "Din ordin de producţie, creare ordine de lucru"
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Ore pe centre de operaţii"
-
 #~ msgid "Production order for any products"
 #~ msgstr "Ordine de producţie pentru orice produs"
 
@@ -870,9 +867,6 @@ msgstr ""
 #~ msgid "Production Work Center"
 #~ msgstr "Centru de operaţii de producţie"
 
-#~ msgid "Packing Exception"
-#~ msgstr "Excepţie ambalare"
-
 #~ msgid "Production start Operation"
 #~ msgstr "Început operaţie producţie"
 
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index c724b62c5cf..e7f8ea9afba 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr "Создание наряда на работу"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr "Вы не можете приостановить операцию в запущен.состоянии!"
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr "Вы не можете завершить операцию не запустив её !"
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr "Запланированная дата"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr "Нет операций для отмены !"
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr "Будущие наряды"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr "Код производственной операции"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "June"
 msgstr "Июнь"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr "Операция уже завершена!"
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr "Завершить операцию."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr "Операция еще не началась !"
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr "Информация из производственного заказа."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr "Извините!"
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr "Код"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr "Операция уже отменена!"
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index 32ffe135e52..192045071e6 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr "Načrtovani datum"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr "Bodoči delovni nalogi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr "Oznaka"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/sq.po b/addons/mrp_operations/i18n/sq.po
index 06b13399654..8bc7e774f8d 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/sr.po b/addons/mrp_operations/i18n/sr.po
index f751efb8d24..db4efc9eb6a 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr "Planirani datum"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr "Buduci Radni Nalozi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr "Operaciona Sifra Proizvodnje"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr "Šifra"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
@@ -825,9 +825,6 @@ msgstr ""
 #~ msgid "From production order, create the workorder"
 #~ msgstr "Iz Naloga proizvodnje kreiraj Radni Nalog"
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Radionicki Sati"
-
 #~ msgid "Operation is done"
 #~ msgstr "Postupak je zavrsen"
 
@@ -856,9 +853,6 @@ msgstr ""
 #~ msgid "Production Work Center"
 #~ msgstr "Proizvodna Radionica"
 
-#~ msgid "Packing Exception"
-#~ msgstr "Izuzetak Pakovanja"
-
 #~ msgid "Production start Operation"
 #~ msgstr "Pocetak Operacije Proizvodnje"
 
diff --git a/addons/mrp_operations/i18n/sr@latin.po b/addons/mrp_operations/i18n/sr@latin.po
index 5dfe099a750..ee091b27ea2 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr "Planirani datum"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr "Buduci Radni Nalozi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr "Operaciona Sifra Proizvodnje"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr "Šifra"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
@@ -828,9 +828,6 @@ msgstr ""
 #~ msgid "From production order, create the workorder"
 #~ msgstr "Iz Naloga proizvodnje kreiraj Radni Nalog"
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "Radionicki Sati"
-
 #~ msgid "Operation is done"
 #~ msgstr "Postupak je zavrsen"
 
@@ -856,9 +853,6 @@ msgstr ""
 #~ msgid "Production Work Center"
 #~ msgstr "Proizvodna Radionica"
 
-#~ msgid "Packing Exception"
-#~ msgstr "Izuzetak Pakovanja"
-
 #~ msgid "Production start Operation"
 #~ msgstr "Pocetak Operacije Proizvodnje"
 
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index 17486cd5542..7e986d8b65b 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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 63b5e5bfb41..01a855b4199 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 7090057f31e..ca5f3a49bee 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -28,52 +28,52 @@ msgstr "İş Emirleri"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Operasyonları iptal et."
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
 #, python-format
 msgid "Production Order Cannot start in [%s] state"
-msgstr ""
+msgstr "Ürün Siparişi [%s] durumunda başlatılamaz"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Şuna göre grupla"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Yönlendirme tanımlamasından gelen bilgiler."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "İş Merkezleri"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "Devam et"
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -83,23 +83,23 @@ msgstr "Üretilecek Ürün"
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr ""
+msgstr "Üretim Operasyonu"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "Serbest Serileştirme"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Mrp Operasyonları"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Gün"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -109,18 +109,18 @@ msgstr "Üretim Emri"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Toplama İstisnası"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "İş emrinin oluşturulması"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
-msgstr ""
+msgstr "Operasyonu Başlat/Devam et durumu dışında Duraklatamazsınız!"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -132,24 +132,24 @@ msgstr "İş Merkezi"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "İş emirleri ürün siparişi bazında oluşturulur."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "İptal edildi"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
@@ -165,12 +165,12 @@ msgstr "Operasyonlar"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Stok Hareketi"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# / Satır"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -191,13 +191,13 @@ msgstr "Üretimde"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "İş Emri"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -205,11 +205,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"İş merkezi başına 1 iş emri mevcut. Çevrim sayısı veya çevrim süresi ile "
+"ilgili bilgi."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Ay -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -222,12 +224,19 @@ 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' durumuna geçer.\n"
+"* Kullanıcı iş emrini başlatma modunda ayarladığında ise, 'İşlemde' durumuna "
+"geçecektir.\n"
+"* İş emri çalışma modunda olduğunda, kullanıcı iş emrini durdurmak veya "
+"üzerinde değişiklik yapmak istediğinde, 'Duraklatma' durumuna geçebilir.\n"
+"* Kullanıcı iş emrini iptal ettiğinde,'İptal edildi' durumuna geçecektir.\n"
+"* İş emri tamamen işlendiğinde, 'Tamamlandı' durumuna gececektir."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
-msgstr ""
+msgstr "İşlemi Başlatmadan/Devam ettirmeden sonlandıramazsınız!"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -235,26 +244,26 @@ msgid "Planned Date"
 msgstr "Planlama Tarihi"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
-msgstr ""
+msgstr "İptal edilecek hiçbir Operasyon yok!"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Ürün Mik."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr ""
+msgstr "Operasyon Adı"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,start_stop:0
@@ -270,6 +279,11 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"Ürün üretimi veya montajı, hammadde veya tamamlanmış ürün kullanımı için, "
+"üretim operasyonlarını da ele almanız gerekir. Üretim operasyonları "
+"çoğunlukla İş Emri olarak adlandırılır. Çeşitli operasyonlar mevcut iş "
+"yüküne bağlı olarak planlama ve üretim maliyetleri üzerinde farklı etkilere "
+"sahip olacaktır."
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
@@ -282,33 +296,35 @@ msgid "Future Work Orders"
 msgstr "Gelecekteki İş Emirleri"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
 "operation"
 msgstr ""
+"Operasyon zaten başladı! Oparasyonu Duraklat /Tamamla/İptal et arasından "
+"seçim yapabilirsiniz"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operasyon İptal Edildi"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Ay"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -318,12 +334,12 @@ msgstr "İptal Edildi"
 #. 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
 msgid "Work Order Report"
-msgstr ""
+msgstr "İş Emri Raporu"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -344,7 +360,7 @@ msgstr "Malzeme Bekleniyor"
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Pause"
-msgstr ""
+msgstr "Duraklat"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -356,7 +372,7 @@ msgstr "İşlemde"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Üretim Emri"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -376,23 +392,25 @@ msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
 msgstr ""
+"Operasyonun iptal edilmesi gerektiğinde, bunu iş emri formundan "
+"yapabilirsiniz."
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Set Draft"
-msgstr ""
+msgstr "Taslak Ayarla"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Toplam Çevrim"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Beklemede"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
@@ -400,20 +418,20 @@ msgid "Production Operation Code"
 msgstr "Üretim Operasyon Kodu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
-msgstr ""
+msgstr " Duraklatma durumu dışında operasyonu Devam ettiremezsiniz!"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Başlatıldı"
 
 #. module: mrp_operations
 #: model:ir.module.module,description:mrp_operations.module_meta_information
@@ -447,17 +465,46 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Bu modül üretim emri operasyon satırlarına durum, date_start,date_stop "
+"ekler\n"
+"     (\"İş Merkezleri\" sekmesinde)\n"
+"     Durum: taslak, onayla, yapıldı, iptal et\n"
+"     Üretim siparişlerini tamamlarken/onaylarken, iptal ederken, tüm durum "
+"satırlarını duruma göre ayarlayın\n"
+"     Menü oluştur:\n"
+"         Üretim Yönetimi > Tüm Operasyonlar\n"
+"         Üretim Yönetimi > Tüm Operasyonlar > Gereçekleştirilecek "
+"Operasyonlar (durum=\"onayla\")\n"
+"     Üretim Emrinde \"İş Merkezleri\" satırlarında bir görünüm,\n"
+"     düzenlenebilir ağaç\n"
+"\n"
+"    İş merkezi sekmesinde üretim emri form görünümüne buton ekleyin:\n"
+"    * başlat (durumu onaylamak için ayarlayın), date_start'ı ayarlayın\n"
+"    * yapıldı (durumu yapıldı olarak ayarlayın), date_stop'u ayarlayın\n"
+"    * taslak olarak ayarlayın (durumu taslak olarak ayarlayın)\n"
+"    * iptal et durumu iptal etmek için ayarlayın\n"
+"\n"
+"    Üretim emri \"üretime hazır\" hale geldiğinde, operasyonlar\n"
+"    'onaylandı' durumuna geçer. Üretim siparişi yapıldığında, tüm "
+"operasyonlar\n"
+"    yapıldı durumuna geçmelidir.\n"
+"\n"
+"    Gecikme, alan gecikmesidir(stop date - start date).\n"
+"    Böylece teorik gecikme ve gerçek gecikmeyi kıyaslayabiliriz.\n"
+"\n"
+"    "
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
-msgstr ""
+msgstr "Operasyon zaten tamamlandı!"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -467,7 +514,7 @@ msgstr "Üretim için Hazır"
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "Çocuk Hareketleri"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
@@ -478,62 +525,63 @@ msgstr "İş Emri Planlaması"
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is lead time between operation start and stop in this workcenter"
 msgstr ""
+"Bu, bu iş merkezinde operayon başlama ve bitişi arasındaki tedarik süresidir"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Ara"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Operasyonu tamamlayın."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
-msgstr ""
+msgstr "Operasyon henüz başlatılmadı!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Üretim emrinden bilgiler."
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
-msgstr ""
+msgstr "Üzgünüz!"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Geçerli"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
@@ -542,20 +590,20 @@ msgid "Code"
 msgstr "Kodu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
-msgstr ""
+msgstr "Operasyon Zaten İptal Edildi!"
 
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
-msgstr ""
+msgstr "İş Merkezi Üretim başlatma bitirme iş akışı"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Operasyon Kodları"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
@@ -565,7 +613,7 @@ msgstr "Mik."
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operasyon Yapıldı"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -577,7 +625,7 @@ msgstr "Bitti"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr ""
+msgstr "Başlatma/Durdurma Barkodu"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -594,6 +642,11 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"İş Emirleri her bir üretim emri için gerçekleştirilecek operasyonların "
+"listesidir. Bir üretim emrini ilk iş emrini başlattığınızda, üretim emri "
+"otomatik olarak başlatıldı şeklinde işaretlenir. Bir üretim emrinin en son "
+"operasyonunu tamamladığınızda, MO (üretim emri) otomaqtik olarak yapıldı "
+"durumuna geçer ve ilgili ürünler üretilir."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -608,22 +661,22 @@ msgstr "Bilgi"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "İş Merkezleri Barkodu"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Bu ürün için bir üretim lot numarası atamanız gerekir"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Son"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Gecikme"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -636,13 +689,13 @@ msgstr "Üretim"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "İş Emri Ara"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr ""
+msgstr "İş Merkezi"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -665,7 +718,7 @@ msgstr "Ürün"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Toplam Saat"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -673,16 +726,18 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
+"Bunun, tüm üretim emirlerini bağımlı olanları taşımaksızın, bağımsız bir "
+"şekilde taşıyabileceğini kontrol edin."
 
 #. 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
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "İş Emri Analizi"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -690,7 +745,7 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Tamamlandı"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
@@ -700,7 +755,7 @@ msgstr "Birim"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "İş Merkezi Saatleri"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
@@ -717,32 +772,32 @@ msgstr "Bitiş Tarihi"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operasyon iptal edildi"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Operasyonu başlatın."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operasyon yapıldı"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "#Line Emir"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -750,27 +805,28 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"Operasyon tamamlandığında, operatör iş emrini tamamlayarak sistemi günceller."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "İş emri detayları"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Üretim Durumu"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -780,12 +836,12 @@ msgstr "Süre"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Sipariş miktarı negatif veya sıfır olamaz!"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Aynı üründn olmayan bir lot atamaya çalışıyorsunuz"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
@@ -817,9 +873,6 @@ msgstr ""
 #~ msgid "Production start Operation"
 #~ msgstr "Üretim Operasyonu Başlat"
 
-#~ msgid "Packing Exception"
-#~ msgstr "Paketleme İstisnası"
-
 #~ msgid "Work Orders to Do"
 #~ msgstr "Yapılacak İş Emirleri"
 
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index a4d95620a07..c3581d9170d 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/vi.po b/addons/mrp_operations/i18n/vi.po
index 511df31bcc6..8b067a3fe6c 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -118,7 +118,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -137,10 +137,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr "Lỗi!"
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -236,7 +236,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -401,7 +401,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -455,7 +455,7 @@ msgid "June"
 msgstr "Tháng Sáu"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -512,7 +512,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -523,10 +523,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -543,7 +543,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 627a3296f50..765d461b0fa 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2010-03-20 08:34+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -23,45 +23,45 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Work Orders"
-msgstr "工单"
+msgstr "工票"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "工票作废"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr "运作代码"
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
 #, python-format
 msgid "Production Order Cannot start in [%s] state"
-msgstr ""
+msgstr "生产订单无法从 [%s] 状态开始"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "信息来源于工艺定义"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -73,7 +73,7 @@ msgstr "重新开始"
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -83,7 +83,7 @@ msgstr "产品到产品"
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr "生产运作"
+msgstr "生产工单"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
@@ -93,13 +93,13 @@ msgstr "自由排序生产"
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "工单"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -109,18 +109,18 @@ msgstr "生产单"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "领料异常"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "新建工票"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
-msgstr ""
+msgstr "只有开始或继续状态的工单才可以暂停"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -132,45 +132,45 @@ msgstr "工作中心"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "工票基于生产订单创建"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr "确认工作单"
+msgstr "已确认的工票"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr "运作"
+msgstr "工单"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "库存调拨"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# 明细"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -183,7 +183,7 @@ msgstr "草稿"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "In Production"
-msgstr "在生产"
+msgstr "生产中"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -191,25 +191,25 @@ msgstr "在生产"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "工票"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
 msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
-msgstr ""
+msgstr "每个加工中心有一个工票。有加工的次数或工时数"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "上月"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -222,12 +222,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 ""
+"新建的工票状态为“草稿”\n"
+"当用户点击开始按钮后状态变为“进行中”\n"
+"进行中的工票，如果用户需要暂停或修改，可以设为“暂停”状态\n"
+"用户点击取消按钮后状态变为“取消”\n"
+"完成的工票状态为“已结束”"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
-msgstr ""
+msgstr "没有开始或继续的工单不能直接完成"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -235,26 +240,26 @@ msgid "Planned Date"
 msgstr "计划日期"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
-msgstr ""
+msgstr "没有需要作废的工单"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "产品数量"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr "运作名称"
+msgstr "工单名称"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,start_stop:0
@@ -270,60 +275,62 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"对于制造或装配的产品，不止要管理材料的投入和产品的产出，还要管理生产的过程。生产过程一般用工单来管理。不同的过程因工作中心负载不同对成本和工期的影响也不同"
+"。"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
-msgstr "订单日期"
+msgstr "单据日期"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr "未来工单"
+msgstr "未开工工票"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
 "operation"
-msgstr ""
+msgstr "工票单开始，你可以暂停、完成或作废这张工单。"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "工单已作废"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "已作废"
 
 #. 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
 msgid "Work Order Report"
-msgstr ""
+msgstr "工票报表"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -335,7 +342,7 @@ msgstr "开始日期"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr "等待"
+msgstr "等待原料"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -351,12 +358,12 @@ msgstr "暂停"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "In Progress"
-msgstr "进展"
+msgstr "进行中"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "生产单"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -368,14 +375,14 @@ msgstr "开始"
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Calendar View"
-msgstr "日程表视图"
+msgstr "日历视图"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
-msgstr ""
+msgstr "可以在工单界面作废这样工单"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -387,33 +394,33 @@ msgstr "设为草稿"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "总加工次数"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "等待中"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr "运作代码"
+msgstr "工单编号"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
-msgstr ""
+msgstr " 只有暂停的工单才能继续"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "开始"
 
 #. module: mrp_operations
 #: model:ir.module.module,description:mrp_operations.module_meta_information
@@ -447,22 +454,31 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     此模块在生产单的工单明细上增加了状态、开始日期、结束日期几个字段状态有：\n"
+"  草稿、已确认、完成、已取消\n"
+"  完成、确认、取消生产单的同时这些行的状态也会跟着变化\n"
+"  有独立的未开工单菜单，也可以在生产单的工作中心标签页上编辑工单。\n"
+"  还有对应的按钮用于改变状态工单都是已确认状态，生产单才能准备就绪。\n"
+"  所有工单都完成了生产单才能完成。加工天数为结束日期减去开始日期，用于计算理论工时和实际工时\n"
+"\n"
+"    "
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
-msgstr ""
+msgstr "工单已完成"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr "准备生产"
+msgstr "生产准备就绪"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
@@ -472,90 +488,90 @@ msgstr "子调拨"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr "工单计划"
+msgstr "工票计划"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is lead time between operation start and stop in this workcenter"
-msgstr ""
+msgstr "这个工作中心开始和结束工作的提前期"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "查询"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "结束工单"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
-msgstr ""
+msgstr "工单还未开始"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "源自生产单的信息"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
-msgstr ""
+msgstr "抱歉!"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
 #: field:mrp_operations.operation.code,code:0
 msgid "Code"
-msgstr "代码"
+msgstr "编号"
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
-msgstr ""
+msgstr "工单已作废"
 
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
-msgstr ""
+msgstr "工作中心生产起止工作流"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "工单编号"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
@@ -565,25 +581,25 @@ msgstr "数量"
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "工单完成"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: view:mrp.workorder:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Done"
-msgstr "完成"
+msgstr "已完成"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr "开始/停止条码"
+msgstr "用条码输入开工/完工"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Cancel"
-msgstr "取消"
+msgstr "取消(&C)"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
@@ -594,6 +610,7 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"工票列表体现了生产单的加工过程。一旦生产单中的第一个工票开始了，生产单就自动标识为已开始。一旦生产单中的最后一个工票结束了，生产单就会自动标识为已完成。"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -608,22 +625,22 @@ msgstr "信息"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "工作中心条码"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "必须为此产品赋予一个生产批次"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "延迟"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "天数"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -636,7 +653,7 @@ msgstr "生产"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "查询工票："
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
@@ -647,12 +664,12 @@ msgstr "工作中心"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr "真"
+msgstr "实际"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr "预定日期"
+msgstr "计划日期"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
@@ -665,24 +682,24 @@ msgstr "产品"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "总小时数"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
 msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
-msgstr "检查这能独立所有生产单的调拨"
+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
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "工票分析"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -700,12 +717,12 @@ msgstr "计量单位"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "按工作中心工时合计"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr "工作时间"
+msgstr "工时"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -717,75 +734,75 @@ msgstr "结束日期"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "工单已作废"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "开始这工单"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "工单完成"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "明细"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
 msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
-msgstr ""
+msgstr "加工结束后，操作者在系统中完成工票以报工"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "工票明细"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "生产阶段"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr "持续时间"
+msgstr "时长"
 
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "订单数量不能为0或者负数!"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "你尝试分配一个来自其它产品的批次"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -818,64 +835,6 @@ msgstr ""
 #~ msgid "From production order, create the workorder"
 #~ msgstr "从生产单创建工单"
 
-#~ msgid "Hours by Workcenter"
-#~ msgstr "工作中心"
-
-#~ msgid ""
-#~ "\n"
-#~ "     This module adds state, date_start,date_stop in production order "
-#~ "operation lines\n"
-#~ "     (in the \"Workcenters\" tab)\n"
-#~ "     State: draft, confirm, done, cancel\n"
-#~ "     When finishing/confirming,cancelling production orders set all state "
-#~ "lines to the according state\n"
-#~ "     Create menus:\n"
-#~ "         Production Management > All Operations\n"
-#~ "         Production Management > All Operations > Operations To Do "
-#~ "(state=\"confirm\")\n"
-#~ "     Which is a view on \"Workcenters\" lines in production order,\n"
-#~ "     editable tree\n"
-#~ "\n"
-#~ "    Add buttons in the form view of production order under workcenter tab:\n"
-#~ "    * start (set state to confirm), set date_start\n"
-#~ "    * done (set state to done), set date_stop\n"
-#~ "    * set to draft (set state to draft)\n"
-#~ "    * cancel set state to cancel\n"
-#~ "\n"
-#~ "    When the production order becomes \"ready to produce\", operations must\n"
-#~ "    become 'confirmed'. When the production order is done, all operations\n"
-#~ "    must become done.\n"
-#~ "\n"
-#~ "    The field delay is the delay(stop date - start date).\n"
-#~ "    So that we can compare the theoretic delay and real delay.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "     这模块在生产单操作明细的中增加了状态,开始日期,结束日期\n"
-#~ "在工作中心标签中    状态:草稿,确认,完成,取消\n"
-#~ "    当完成/确认,取消了生产单设定的所有状态明细根据状态\n"
-#~ "创建菜单:\n"
-#~ "\t\t生产管理>所有操作\n"
-#~ "\t\t生产管理>所有操作>操作要做 (状态=确认)\n"
-#~ "     在生产单视图\"工作中心\"明细\n"
-#~ "     可编辑树\n"
-#~ "\n"
-#~ "\t在生产单下的视图增加工作中心标签增加一个按钮:\n"
-#~ "\t*开始(设为确认状态) 设定开始日期\n"
-#~ "\t*完成(设为完成)设定结束日期\n"
-#~ "   *设为草稿\n"
-#~ "\t*取消 设为取消状态\n"
-#~ "\t\n"
-#~ "\t当生产单变为\"准备生产\",操作必须变为\n"
-#~ "   确认.\n"
-#~ "\t当生产单完成所有操作必须变为完成.\n"
-#~ "\n"
-#~ "\t延迟字段是延迟(结束日期 - 开始日期).\n"
-#~ "   这样我们能比较理论延迟和实际延迟.\n"
-#~ "\n"
-#~ "    "
-
 #~ msgid "Workcenters Barcode"
 #~ msgstr "工作中心条码"
 
@@ -906,9 +865,6 @@ msgstr ""
 #~ msgid "Production start Operation"
 #~ msgstr "生产开始运作"
 
-#~ msgid "Packing Exception"
-#~ msgstr "包装异常"
-
 #~ msgid "Work Orders to Do"
 #~ msgstr "工单列表"
 
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index a4a12ebe0ec..a9fdb1a83e8 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -117,7 +117,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:463
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -136,10 +136,10 @@ msgstr ""
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
-#: code:addons/mrp_operations/mrp_operations.py:461
-#: code:addons/mrp_operations/mrp_operations.py:465
-#: code:addons/mrp_operations/mrp_operations.py:477
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:463
+#: code:addons/mrp_operations/mrp_operations.py:467
+#: code:addons/mrp_operations/mrp_operations.py:479
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:472
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -235,7 +235,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:479
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -282,7 +282,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:459
 #, python-format
 msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
@@ -400,7 +400,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:467
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -454,7 +454,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:480
+#: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -511,7 +511,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:452
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -522,10 +522,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:457
-#: code:addons/mrp_operations/mrp_operations.py:470
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:452
+#: code:addons/mrp_operations/mrp_operations.py:459
+#: code:addons/mrp_operations/mrp_operations.py:472
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -542,7 +542,7 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:473
+#: code:addons/mrp_operations/mrp_operations.py:475
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index fe926d30ac1..7dc93731b03 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -131,7 +131,7 @@ class mrp_production_workcenter_line(osv.osv):
                elif prod_obj.state =='in_production':
                    return
                else:
-                   raise osv.except_osv(_('Error!'),_('Production Order Cannot start in [%s] state') % (prod_obj.state,))
+                   raise osv.except_osv(_('Error!'),_('Manufacturing order cannot start in state "%s"!') % (prod_obj.state,))
         else:
             oper_ids = self.search(cr,uid,[('production_id','=',prod_obj.id)])
             obj = self.browse(cr,uid,oper_ids)
@@ -235,6 +235,8 @@ class mrp_production(osv.osv):
         obj = self.browse(cr, uid, ids)[0]
         wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:
+            if workcenter_line.state == 'draft':
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
             wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_done', cr)
         return super(mrp_production,self).action_production_end(cr, uid, ids)
 
@@ -243,9 +245,11 @@ class mrp_production(osv.osv):
         @return: True
         """
         obj = self.browse(cr, uid, ids)[0]
+        workcenter_pool = self.pool.get('mrp.production.workcenter.line')
         wf_service = netsvc.LocalService("workflow")
-        for workcenter_line in obj.workcenter_lines:
-            wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
+        for prod in self.browse(cr, uid, ids):
+            if prod.workcenter_lines:
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', prod.workcenter_lines[0].id, 'button_start_working', cr)
         return super(mrp_production,self).action_in_production(cr, uid, ids)
     
     def action_cancel(self, cr, uid, ids, context=None):
@@ -458,30 +462,30 @@ class mrp_operations_operation(osv.osv):
                  code_lst.append(oper.code_id.start_stop)
             if code.start_stop=='start':
                     if 'start' in code_lst:
-                        raise osv.except_osv(_('Sorry!'),_('Operation has already started !' 'You  can either Pause /Finish/Cancel the operation'))
+                        raise osv.except_osv(_('Sorry!'),_('Operation has already started !' 'Youcan either Pause/Finish/Cancel the operation'))
                         return False
             if code.start_stop=='pause':
                     if  code_lst[len(code_lst)-1]!='resume' and code_lst[len(code_lst)-1]!='start':
-                        raise osv.except_osv(_('Error!'),_('You cannot Pause the Operation other then Start/Resume state !'))
+                        raise osv.except_osv(_('Error!'),_('In order to Pause the operation, it must be in the Start or Resume state!'))
                         return False
             if code.start_stop=='resume':
                 if code_lst[len(code_lst)-1]!='pause':
-                   raise osv.except_osv(_('Error!'),_(' You cannot Resume the operation other then Pause state !'))
+                   raise osv.except_osv(_('Error!'),_('In order to Resume the operation, it must be in the Pause state!'))
                    return False
 
             if code.start_stop=='done':
                if code_lst[len(code_lst)-1]!='start' and code_lst[len(code_lst)-1]!='resume':
-                  raise osv.except_osv(_('Sorry!'),_('You cannot finish the operation without Starting/Resuming it !'))
+                  raise osv.except_osv(_('Sorry!'),_('In order to Finish the operation, it must be in the Start or Resume state!'))
                   return False
                if 'cancel' in code_lst:
-                  raise osv.except_osv(_('Sorry!'),_('Operation is Already Cancelled  !'))
+                  raise osv.except_osv(_('Sorry!'),_('Operation is Already Cancelled!'))
                   return False
             if code.start_stop=='cancel':
                if  not 'start' in code_lst :
-                   raise osv.except_osv(_('Error!'),_('There is no Operation to be cancelled !'))
+                   raise osv.except_osv(_('Error!'),_('There is no Operation to be cancelled!'))
                    return False
                if 'done' in code_lst:
-                  raise osv.except_osv(_('Error!'),_('Operation is already finished !'))
+                  raise osv.except_osv(_('Error!'),_('Operation is already finished!'))
                   return False
         return True
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b39619ead6f..377a57d6121 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -17,7 +17,7 @@
 	               <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
 	               <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
 	               <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
-	               <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close" help="Finish Order"/>
+	               <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
                </group>
 	       </xpath>
 	    </field>
@@ -35,7 +35,7 @@
                 <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                 <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
                 <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
-                <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
+                <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
                 <field name="state"/>
            </xpath>
         </field>
@@ -63,7 +63,7 @@
                 <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
                 <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                 <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
-                <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close" help="Finish Order"/>
+                <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
             </tree>
         </field>
     </record>
@@ -117,7 +117,7 @@
                         <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                         <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
                         <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
-                        <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
+                        <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
                     </group>
                 </page>
                 </notebook>
@@ -131,7 +131,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             <search string="Search Work Orders">
-                        <group col='9' colspan='4'>
+                        <group>
 	                       <filter icon="terp-document-new" string="Draft"
 	                           domain="[('state','=','draft')]"/>
 	                       <filter icon="terp-check" string="In Progress" name="Current"
@@ -140,17 +140,17 @@
 	                           domain="[('state','=','pause')]"/>
 	                       <separator orientation="vertical"/>
 	                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-	                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+	                           domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
 	                           help="Production started late" />
 	                       <separator orientation="vertical"/>
 	                		<field name="name"/>
 	                		<field name="workcenter_id" widget="selection"/>
 	                		<field name="production_id" />
 	                		<field name="state" />
-	                		<field name="date_planned" widget="date"/>
+	                		<field name="date_planned"/>
 	                	</group>
                 	<newline/>
-                    <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
                         <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
                         <separator orientation="vertical"/>
@@ -268,8 +268,6 @@
         <field name="model" eval="'mrp.production.workcenter.line'"/>
         <field name="name">Work Orders</field>
         <field name="value" eval="'ir.actions.act_window,'+str(mrp_production_wc_action_form)"/>
-        <field name="object" eval="True"/>
-
     </record>
 
     <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing"
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis.py b/addons/mrp_operations/report/mrp_workorder_analysis.py
index e559f97fbed..545ce73656d 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis.py
+++ b/addons/mrp_operations/report/mrp_workorder_analysis.py
@@ -21,6 +21,7 @@
 
 from osv import fields,osv
 import tools
+import decimal_precision as dp
 
 class mrp_workorder(osv.osv):
     _name = "mrp.workorder"
@@ -34,7 +35,7 @@ class mrp_workorder(osv.osv):
         'nbr': fields.integer('# of Lines', readonly=True),
         'date': fields.date('Date', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'product_qty': fields.float('Product Qty', readonly=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), readonly=True),
         'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
         'total_cycles': fields.float('Total Cycles', readonly=True),
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index d25ec5132f6..45b6ffd9be9 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -46,23 +46,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="6">
+                  <group>
                         <filter icon="terp-go-year" string="Year"
+                                name="year"
                                 domain="[('year','=',time.strftime('%%Y'))]"
                                 help="Work orders made during current year"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-go-month" string="Month"
                                 name="month"
                                 domain="[('month','=',time.strftime('%%m'))]"
                                 help="Work orders made during current month"/>
                         <filter icon="terp-go-week"
                                 string="Month -1"
-                                separator="1"
                                 domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
                                 help="Work orders during last month"/>
                       <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
                         <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
-                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
                       <separator orientation="vertical"/>
                         <field name="product_id" />
                         <field name="workcenter_id"/>
@@ -92,7 +93,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_report_mrp_workorder_tree"/>
             <field name="search_view_id" ref="view_report_mrp_workorder_filter"/>
-            <field name="context">{'search_default_Workcenter': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_Workcenter': 1,'search_default_year':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_mrp_workorder_tree">
diff --git a/addons/mrp_operations/test/mrp_operation_test.yml b/addons/mrp_operations/test/mrp_operation_test.yml
new file mode 100644
index 00000000000..9cb81abebde
--- /dev/null
+++ b/addons/mrp_operations/test/mrp_operation_test.yml
@@ -0,0 +1,56 @@
+-
+  In order to test mrp_operations module in OpenERP,
+  I create a production order.
+-
+  !record {model: mrp.production, id: mrp_production_mo1}:
+    company_id: base.main_company
+    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
+    location_dest_id: stock.stock_location_stock
+    location_src_id: stock.stock_location_stock
+    name: MO/01234567
+    product_id: product.product_product_pc1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 5.0
+-
+  Now I confirm the production order.
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
+-
+  I check that there is one Work order generated related to the production order.
+-
+  !python {model: mrp.production.workcenter.line}: |
+    from tools.translate import _
+    order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo1')),('state','=','draft')])
+    assert order_id, _('No work order defined for this production order!')
+-
+  The scheduler runs.
+-
+  !function {model: procurement.order, name: run_scheduler}:
+    - model: procurement.order
+      search: "[('state','=','confirmed')]"
+-
+  I am checking Internal picking.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    pick_ids = self.browse(cr, uid, ref("mrp_production_mo1"))
+    assert pick_ids.picking_id.id, _('No Internal Picking generated!')
+-
+  In order to cancel the MO, first cancel its picking
+-
+  !python {model: stock.picking}: |
+    mrp_obj = self.pool.get('mrp.production')
+    mo = mrp_obj.browse(cr, uid, ref("mrp_production_mo1"))
+    self.action_cancel(cr, uid, [mo.picking_id.id], context=None)
+-
+  Then cancel The Manufacturing order.
+-
+  !workflow {model: mrp.production, action: button_cancel, ref: mrp_production_mo1}
+-
+  I check that there is one Work order generated related to the production order that is cancelled or not.
+-
+  !python {model: mrp.production.workcenter.line}: |
+    from tools.translate import _
+    order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo1')),('state','=','cancel')])
+    assert order_id, _('Work order is not cancelled for this production order!')
diff --git a/addons/mrp_operations/test/mrp_operations.yml b/addons/mrp_operations/test/mrp_operations.yml
index dc193186341..ce6aac5cdbf 100644
--- a/addons/mrp_operations/test/mrp_operations.yml
+++ b/addons/mrp_operations/test/mrp_operations.yml
@@ -14,6 +14,7 @@
     product_qty: 5.0
     product_uom: product.product_uom_unit
     product_uos_qty: 5.0
+    allow_reorder: True
 -
   I am computing the data.
 -
@@ -32,7 +33,7 @@
   !python {model: mrp.production.workcenter.line}: |
     from tools.translate import _
     order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','draft')])
-    assert order_id, _('No Work order!')
+    assert order_id, _('No Work order define for this production order!')
 -
   The scheduler runs.
 -
@@ -61,7 +62,7 @@
     prod_obj = self.pool.get('mrp.production')
     prod_order_ids = prod_obj.search(cr, uid, [('state','=','ready'),('origin','like','%MO/0123456')])
     workorder_id = self.search(cr, uid, [('production_id','=', prod_order_ids[0]),('state','=','draft')])
-    assert workorder_id, _('No Work order!')
+    assert workorder_id, _('No Work order define for this production order!')
 -
   I start the second production order of the CPU_GEN product.
 -
@@ -144,3 +145,14 @@
     from tools.translate import _
     order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','done')])
     assert order_id, _('Work order not done yet!')
+-
+  Calculates start date for stock moves finding interval from resource calendar.
+-
+  !python {model: mrp.production}: |
+    self._move_pass(cr, uid, [ref('mrp_production_mo0')], context=None)
+-
+  Calculates planned end date of production order.
+-
+  !python {model: mrp.production}: |
+    mo = self.browse(cr, uid, ref("mrp_production_mo0"))
+    self._production_date_end(cr, uid, [ref("mrp_production_mo0")], mo.date_planned, False, context=None)
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 134b16542a5..a1f060cf7c3 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Products Repairs Module - Manage All products Repairs',
+    'name': 'Repairs',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Manufacturing',
     'description': """
 The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module:
 ===========================================================================================================================
@@ -40,6 +40,7 @@ The aim is to have a complete module to manage all products repairs. The followi
     'depends': ['mrp', 'sale', 'account'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'security/mrp_repair_security.xml',
         'mrp_repair_sequence.xml',
         'wizard/mrp_repair_cancel_view.xml',
         'wizard/mrp_repair_make_invoice_view.xml',
@@ -48,7 +49,7 @@ The aim is to have a complete module to manage all products repairs. The followi
         'mrp_repair_report.xml',
     ],
     'demo_xml': [],
-    'test': ['test/test_mrp_repair.yml', 'test/mrp_repair_report.yml'],
+    'test': ['test/test_mrp_repair.yml', 'test/mrp_repair_report.yml','test/mrp_repair_cancel.yml'],
     'installable': True,
     'active': False,
     'certificate': '0060814381277',
diff --git a/addons/mrp_repair/i18n/ar.po b/addons/mrp_repair/i18n/ar.po
index 82f23c7b999..d0c2445ee72 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/bg.po b/addons/mrp_repair/i18n/bg.po
index 4389011a472..5c7c7aa3efc 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Общо нето :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Предупреждение!"
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Трансфер"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Чернова"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Адрес за доставка :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Грешка!"
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Няма контрагент!"
diff --git a/addons/mrp_repair/i18n/bs.po b/addons/mrp_repair/i18n/bs.po
index 0daec6d5282..67e9afa424f 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/ca.po b/addons/mrp_repair/i18n/ca.po
index 5e46d8caf19..c73828ebe62 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -36,6 +36,19 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" L'estat 'Esborrany' s'utilitza quan un usuari està introduint una nova "
+"ordre de reparació sense confirmar             \n"
+"L'estat 'Confirmat' s'utilitza quan un usuari confirma l'ordre de reparació. "
+"            \n"
+"L'estat 'Llest per reparar' s'utilitza per iniciar la reparació, l'usuari "
+"pot iniciar la reparació sol després de la confirmació de l'ordre de "
+"reparació             \n"
+"L'estat 'A facturar' s'utilitza per generar la factura abans o després de la "
+"realització de la reparació.             \n"
+"L'estat 'Realitzat' s'utilitza quan la reparació ha estat acabada.           "
+"  \n"
+"L'estat 'Cancel·lat' s'utilitza quan un usuari cancel·la l'ordre de "
+"reparació."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -51,11 +64,17 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"Les ordres de reparació li permeten organitzar les seves reparacions del "
+"producte. En una ordre de reparació, podeu detallar els components que "
+"elimina, afegeix o substitueix i registrar el temps que heu consumit en les "
+"diferents operacions. L'ordre de reparació utilitza la data de garantia del "
+"lot de producció per saber si la reparació ha de ser facturada al client o "
+"no."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -70,12 +89,16 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Marqueu aquesta opció si desitgeu gestionar el lliurament una vegada que el "
+"producte és reparat. Si està marcada, es crearà un albarà amb el producte "
+"seleccionat. Tingueu en compte que podeu seleccionar les ubicacions en la "
+"pestanya Informació, si teniu la vista estesa."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Cancel·la ordre reparació"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
@@ -94,10 +117,10 @@ msgid "Group by partner invoice address"
 msgstr "Agrupa per adreça facturació"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "No s'ha definit cap producte en honoraris!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -140,7 +163,7 @@ msgstr "Límit de garantia"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -155,6 +178,15 @@ msgid ""
 "           * Repair quotation report\n"
 "           * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"           L'objectiu és tenir un mòdul complet per gestionar totes les "
+"reparacions de productes. Aquest mòdul cobreix els següents assumptes:\n"
+"           * Afegir/treure productes en la reparació.\n"
+"           * Impacte en l'estoc.\n"
+"           * Facturació (productes i/o serveis).\n"
+"           * Concepte de garantia.\n"
+"           * Informe de pressupost de reparació.\n"
+"           * Notes per al tècnic i el client final.\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -169,10 +201,10 @@ msgid "Net Total :"
 msgstr "Total net :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avís!"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -190,10 +222,12 @@ msgid "Move"
 msgstr "Moviment"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
+"Heu de seleccionar una adreça de factura d'empresa en el formulari de "
+"reparació!"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -215,7 +249,7 @@ msgstr "Informació extra"
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Referència ordre reparació"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -223,10 +257,10 @@ msgid "Draft"
 msgstr "Esborrany"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
-msgstr ""
+msgstr "No s'ha definit un compte per l'empresa \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -247,6 +281,7 @@ msgstr "Comanda reparació nº"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Número de lot"
@@ -277,12 +312,12 @@ msgid "Shipping address :"
 msgstr "Adreça d'enviament:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Error !"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
@@ -300,6 +335,14 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * L'estat 'Esborrany' s'estableix automàticament quan crea una ordre de "
+"reparació.                         \n"
+"* L'estat 'Confirmat' s'estableix automàticament quan es confirma l'ordre de "
+"reparació.                         \n"
+"* L'estat 'Fet' s'estableix automàticament quan es completa l'ordre de "
+"reparació.                         \n"
+"* L'estat 'Cancel·lat' s'estableix automàticament quan l'usuari cancel·la "
+"l'ordre de reparació."
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -312,6 +355,8 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Aquesta operació cancel·larà el procés de reparació, però no cancel·larà la "
+"factura. Desitgeu continuar?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -328,17 +373,17 @@ msgstr "Notes del pressupost"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avís!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Cerca ordres reparació"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Afegeix)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -366,6 +411,7 @@ msgstr "Reparat"
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module - Manage All products Repairs"
 msgstr ""
+"Mòdul reparació de productes - Gestiona totes les reparacions de productes"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
@@ -413,7 +459,7 @@ msgstr "Crea factures"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Suprimeix)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -423,17 +469,17 @@ msgstr "Afegeix"
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Desitgeu crear la/es factura/es?"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Referència de la reparació"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Ordre de reparació"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -443,7 +489,7 @@ msgstr "En reparació"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Preparat per reparar"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
@@ -458,7 +504,7 @@ msgstr "Límit de garantia"
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "desconegut"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
@@ -479,12 +525,12 @@ msgstr "Per defecte s'utilitzarà la tarifa del client seleccionat."
 #. 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 "Línies honoraris reparació"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -512,16 +558,16 @@ msgid "End Repair"
 msgstr "Fi reparació"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr ""
+msgstr "No s'ha definit un compte per al producte \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Cites"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -539,7 +585,7 @@ msgstr "Inici reparació"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -567,6 +613,11 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"El termini de garantia es calcula com: Data de l'últim moviment + Garantia "
+"definida en el producte seleccionat. Si la data actual està per sota del "
+"límit de garantia, cada operació i honorari que s'afegeixin es marcaran com "
+"\"No a facturar\" per defecte. Tingueu en compte que després podeu canviar-"
+"ho manualment."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -618,7 +669,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Crea factura"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -635,7 +686,7 @@ msgstr "Línies d'operacions"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "Facturat"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -673,7 +724,7 @@ msgstr "Impostos:"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Albarà"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -684,13 +735,13 @@ msgstr "Base imposable"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
 #, python-format
 msgid "Active ID is not Found"
-msgstr ""
+msgstr "ID no es troba actiu"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "Ordre de reparació no està facturada."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -768,7 +819,7 @@ msgid "Ready to Repair"
 msgstr "Preparat per reparació"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "No existeix empresa!"
diff --git a/addons/mrp_repair/i18n/cs.po b/addons/mrp_repair/i18n/cs.po
index 58c16f29c4b..f86f7a0f089 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index 1f2413be413..ed2047ee820 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -116,7 +116,7 @@ msgid "Group by partner invoice address"
 msgstr "Gruppiere nach Adressen"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Kein Produkt für den Reparaturaufwand definiert !"
@@ -203,7 +203,7 @@ msgid "Net Total :"
 msgstr "Nettobetrag :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Warnung !"
@@ -224,7 +224,7 @@ msgid "Move"
 msgstr "Lieferauftrag"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -258,7 +258,7 @@ msgid "Draft"
 msgstr "Entwurf"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Kein Finanzkonto definiert für den Partner \"%s.\""
@@ -282,6 +282,7 @@ msgstr "Reparaturnummer"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Losnummer"
@@ -312,9 +313,9 @@ msgid "Shipping address :"
 msgstr "Versandadresse :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Fehler !"
@@ -556,8 +557,8 @@ msgid "End Repair"
 msgstr "Ende Reparatur"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Kein Finanzkonto für das Produkt \"%s\" definiert!"
@@ -817,7 +818,7 @@ msgid "Ready to Repair"
 msgstr "Fertig zur Reparatur"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Kein Partner"
@@ -926,30 +927,3 @@ msgstr "Kein Partner"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Repair orders allows you to organize your reparations on the products. On a "
-#~ "repair order, you can detail the components you remove, add or replace and "
-#~ "record the time you spent on the different operations. The repair order uses "
-#~ "the warranty date on the production lot in order to know if you have to "
-#~ "invoice the reparation to the customer or not."
-#~ msgstr ""
-#~ "Reparaturaufträge ermöglichen die Organisation von Reparaturen. Sie können "
-#~ "bei einer Reparatur definieren welche Bauteile demontiert werden, welche "
-#~ "Bauteile anstatt dessen als Ersatz verwendet werden und welche Vorgänge mit "
-#~ "welchem Zeitaufwand für die Reparatur benötigt wird. Ein Reparaturauftrag "
-#~ "prüft die Garantiezeiten von Produkten über das Fertigungslos, um zu "
-#~ "erkennen, inwieweit die Reparatur abrechenbar ist oder im Zuge der "
-#~ "Gewährleistung kostenfrei erfolgen muss."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index f466ca3b034..ae3faf81498 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -115,7 +115,7 @@ msgid "Group by partner invoice address"
 msgstr "Agrupar por dirección de facturación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "¡No se ha definido ningún producto en honorarios!"
@@ -199,7 +199,7 @@ msgid "Net Total :"
 msgstr "Total neto :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "¡Aviso!"
@@ -220,7 +220,7 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "No se ha definido una cuenta para la empresa \"%s\"."
@@ -279,6 +279,7 @@ msgstr "Orden de reparación Nº :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Número de lote"
@@ -309,9 +310,9 @@ msgid "Shipping address :"
 msgstr "Dirección de envío :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -555,8 +556,8 @@ msgid "End Repair"
 msgstr "Fin reparación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "No se ha definido una cuenta para el producto \"%s\"."
@@ -816,7 +817,7 @@ msgid "Ready to Repair"
 msgstr "Listo para reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "¡No existe empresa!"
@@ -926,28 +927,3 @@ msgstr "¡No existe empresa!"
 
 #~ msgid "Repairs Ready to Start"
 #~ msgstr "Reparaciones listas para comenzar"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "Repair orders allows you to organize your reparations on the products. On a "
-#~ "repair order, you can detail the components you remove, add or replace and "
-#~ "record the time you spent on the different operations. The repair order uses "
-#~ "the warranty date on the production lot in order to know if you have to "
-#~ "invoice the reparation to the customer or not."
-#~ msgstr ""
-#~ "Las órdenes de reparación le permiten organizar la reparación de los "
-#~ "productos. En una orden de reparación, puede indicar los componentes que va "
-#~ "a sacar, añadir o remplazar e imputar el tiempo empleado en cada operación. "
-#~ "La orden de reparación utiliza la fecha de garantía del lote de producción "
-#~ "para averiguar si se debe facturar la reparación al cliente o no."
diff --git a/addons/mrp_repair/i18n/es_AR.po b/addons/mrp_repair/i18n/es_AR.po
index 42fed97d697..da4846e26ff 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr "Agrupar por dirección de facturación del partner"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Total neto :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Mover"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr "Repair Order N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Número de lote"
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Dirección de envío :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr "Fin de la reparación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -766,7 +767,7 @@ msgid "Ready to Repair"
 msgstr "Listo para reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Sin Partner !"
diff --git a/addons/mrp_repair/i18n/es_EC.po b/addons/mrp_repair/i18n/es_EC.po
index d4253bb5ab0..6a39d2b55af 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr "Agrupar por dirección de facturación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Total neto :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr "Orden de reparación Nº :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Número de lote"
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Dirección de envío :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr "Fin reparación"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -767,7 +768,7 @@ msgid "Ready to Repair"
 msgstr "Listo para reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/es_MX.po b/addons/mrp_repair/i18n/es_MX.po
new file mode 100644
index 00000000000..54bbc28fa84
--- /dev/null
+++ b/addons/mrp_repair/i18n/es_MX.po
@@ -0,0 +1,929 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_repair
+#
+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-13 04:36+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: 2011-09-05 05:42+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees Line"
+msgstr "Línea de cargo"
+
+#. module: mrp_repair
+#: help:mrp.repair,state:0
+msgid ""
+" * 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."
+msgstr ""
+" *El estado 'Borrador' se utiliza cuando un usuario está introduciendo una "
+"nueva orden de reparación sin confirmar             \n"
+"*El estado 'Confirmado' se utiliza cuando un usuario cofnirma la orden de "
+"reparación.             \n"
+"*El estado 'Listo para reparar' se utiliza para iniciar la reparación, el "
+"usuario puede iniciar la reparación solo depués de la confirmación de la "
+"orden de reparación \n"
+"*El estado 'A facturar' se utiliza pra generar la factura antes o depués de "
+"la realización de la reparación.\n"
+"*El estado 'Realizado' se utiliza cuando la reapración ha sido terminada.\n"
+"*El estado 'Cancelado' se utiliza cuando un usuario cancela la orden de "
+"reparación."
+
+#. module: mrp_repair
+#: field:mrp.repair.line,move_id:0
+msgid "Inventory Move"
+msgstr "Movimiento de inventario"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
+msgid ""
+"Repair orders allow you to organize your product repairs. In a repair order, "
+"you can detail the components you remove, add or replace and record the time "
+"you spent on the different operations. The repair order uses the warranty "
+"date on the production lot in order to know if whether the repair should be "
+"invoiced to the customer or not."
+msgstr ""
+"Las órdenes de reparación le permiten organizar sus reparaciones del "
+"producto. En una orden de reparación, puede detallar los componentes que "
+"elimina, añade o sustituye y registrar el tiempo que consumido en las "
+"diferentes operaciones. La orden de reparación utiliza la fecha de garantía "
+"de el lote de producción para saber si la reparación debe ser facturada al "
+"cliente o no."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Recrear factura"
+
+#. module: mrp_repair
+#: help:mrp.repair,deliver_bool:0
+msgid ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a picking with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
+msgstr ""
+"Marque esta opción si desea gestionar la entrega una vez que el producto es "
+"reparado. Si esta marcada, se creará un albarán con el producto "
+"seleccionado. Tenga en cuenta que puede seleccionar las ubicaciones en la "
+"pestaña Información, si tiene la vista extendida."
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
+#: view:mrp.repair.cancel:0
+msgid "Cancel Repair Order"
+msgstr "Cancelar orden reparación"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,to_invoice:0
+#: field:mrp.repair.line,to_invoice:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Printing Date"
+msgstr "Fecha de impresión"
+
+#. module: mrp_repair
+#: field:mrp.repair.make_invoice,group:0
+msgid "Group by partner invoice address"
+msgstr "Agrupar por dirección de facturación"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:430
+#, python-format
+msgid "No product defined on Fees!"
+msgstr "¡No se ha definido ningún producto en honorarios!"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: mrp_repair
+#: field:mrp.repair,address_id:0
+msgid "Delivery Address"
+msgstr "Dirección de entrega"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
+#: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
+#: view:mrp.repair:0
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_subtotal:0
+#: field:mrp.repair.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: mrp_repair
+#: field:mrp.repair,guarantee_limit:0
+msgid "Guarantee limit"
+msgstr "Límite de garantía"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: mrp_repair
+#: model:ir.module.module,description:mrp_repair.module_meta_information
+msgid ""
+"\n"
+"           The aim is to have a complete module to manage all products "
+"repairs. The following topics should be covered by this module:\n"
+"           * Add/remove products in the reparation\n"
+"           * Impact for stocks\n"
+"           * Invoicing (products and/or services)\n"
+"           * Warranty concept\n"
+"           * Repair quotation report\n"
+"           * Notes for the technician and for the final customer\n"
+msgstr ""
+"\n"
+"           El objetivo es tener un módulo completo para gestionar todas las "
+"reparaciones de productos. Este módulo cubre los siguientes asuntos:\n"
+"           * Añadir/quitar productos en la reparación.\n"
+"           * Impacto en stocks.\n"
+"           * Facturación (productos y/o servicios).\n"
+"           * Concepto de garantía.\n"
+"           * Informe de presupuesto de reparación.\n"
+"           * Notas para el técnico y el cliente final.\n"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_tax:0
+#: field:mrp.repair.fee,tax_id:0
+#: field:mrp.repair.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:430
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Operations"
+msgstr "Operaciones"
+
+#. module: mrp_repair
+#: field:mrp.repair,move_id:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:365
+#, python-format
+msgid "You have to select a Partner Invoice Address in the repair form !"
+msgstr ""
+"¡Debe seleccionar una dirección de factura de empresa en el formulario de "
+"reparación!"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
+msgid "Repair Orders"
+msgstr "Órdenes de reparación"
+
+#. module: mrp_repair
+#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,repair_id:0
+#: field:mrp.repair.line,repair_id:0
+msgid "Repair Order Reference"
+msgstr "Referencia orden reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:379
+#, python-format
+msgid "No account defined for partner \"%s\"."
+msgstr "No se ha definido una cuenta para la empresa \"%s\"."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repairs order"
+msgstr "Órdenes de reparación"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Repair Order N° :"
+msgstr "Orden de reparación Nº :"
+
+#. module: mrp_repair
+#: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
+#: report:repair.order:0
+msgid "Lot Number"
+msgstr "Número de lote"
+
+#. module: mrp_repair
+#: field:mrp.repair,fees_lines:0
+msgid "Fees Lines"
+msgstr "Líneas de cargos"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Fees Line(s)"
+msgstr "Línea(s) cargo"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "To be Invoiced"
+msgstr "Para ser facturado"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: mrp_repair
+#: help:mrp.repair.line,state:0
+msgid ""
+" * 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."
+msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea una orden "
+"de reparación.                         \n"
+"* El estado 'Confirmado' se establece automáticamente cuando se confirma la "
+"orden de reparación.                         \n"
+"* El estado 'Hecho' se establece automáticamente cuando se completa la orden "
+"de reparación.                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela la orden de reparación."
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid ""
+"This operation will cancel the Repair process, but will not cancel it's "
+"Invoice. Do you want to continue?"
+msgstr ""
+"Esta operación cancelará el proceso de reparación, pero no cancelará la "
+"factura. ¿Desea continuar?"
+
+#. module: mrp_repair
+#: field:mrp.repair,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,quotation_notes:0
+msgid "Quotation Notes"
+msgstr "Notas del presupuesto"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Search Reair Orders"
+msgstr "Buscar órdenes reparación"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "(Add)"
+msgstr "(Añadir)"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_line
+#: view:mrp.repair:0
+msgid "Repair Line"
+msgstr "Línea reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_method:0
+msgid "Invoice Method"
+msgstr "Método facturación"
+
+#. module: mrp_repair
+#: field:mrp.repair,repaired:0
+msgid "Repaired"
+msgstr "Reparado"
+
+#. module: mrp_repair
+#: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
+msgid "Products Repairs Module - Manage All products Repairs"
+msgstr ""
+"Módulo reparación de productos - Gestiona todas las reparaciones de productos"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,invoice_line_id:0
+#: field:mrp.repair.line,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Canceled"
+msgstr "Cancelada"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "Before Repair"
+msgstr "Antes de reparación"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_id:0
+msgid "Current Location"
+msgstr "Ubicación actual"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoiced:0
+#: field:mrp.repair.fee,invoiced:0
+#: field:mrp.repair.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid "No"
+msgstr "No"
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "(Remove)"
+msgstr "(Eliminar)"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+msgid "Add"
+msgstr "Añadir"
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: mrp_repair
+#: field:mrp.repair,name:0
+msgid "Repair Reference"
+msgstr "Referencia reparación"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair
+msgid "Repair Order"
+msgstr "Orden reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "En reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Ready To Repair"
+msgstr "Preparado para reparar"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Guarantee Limit"
+msgstr "Límite de garantía"
+
+#. module: mrp_repair
+#: field:mrp.repair,default_address_id:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: mrp_repair
+#: field:mrp.repair,product_id:0
+#: report:repair.order:0
+msgid "Product to Repair"
+msgstr "Producto a reparar"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "N° :"
+msgstr "N° :"
+
+#. module: mrp_repair
+#: help:mrp.repair,pricelist_id:0
+msgid "The pricelist comes from the selected partner, by default."
+msgstr "Por defecto se utilizará la tarifa del cliente seleccionado."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
+msgid "Repair Fees Line"
+msgstr "Líneas honorarios reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar reparación"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Repair Quotation"
+msgstr "Presupuesto de reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "End Repair"
+msgstr "Fin reparación"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
+#, python-format
+msgid "No account defined for product \"%s\"."
+msgstr "No se ha definido una cuenta para el producto \"%s\"."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom_qty:0
+#: report:repair.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Start Repair"
+msgstr "Iniciar reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,state:0
+#: field:mrp.repair.line,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Qty"
+msgstr "Cant."
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_unit:0
+#: field:mrp.repair.line,price_unit:0
+#: report:repair.order:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Done"
+msgstr "Finalizada"
+
+#. module: mrp_repair
+#: help:mrp.repair,guarantee_limit:0
+msgid ""
+"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."
+msgstr ""
+"El plazo de garantía se calcula como: Fecha del último movimiento + Garantía "
+"definida en el producto seleccionado. Si la fecha actual está por debajo del "
+"límite de garantía, cada operación y honorario que se añadan se marcarán "
+"como \"No a facturar\" por defecto. Tenga en cuenta que después puede "
+"cambiarlo manualmente."
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees"
+msgstr "Cargos"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: view:mrp.repair.make_invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Ubicación destino"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Operation Line(s)"
+msgstr "Línea(s) operación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "History"
+msgstr "Historial"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_dest_id:0
+msgid "Delivery Location"
+msgstr "Ubicación de entrega"
+
+#. module: mrp_repair
+#: help:mrp.repair,invoice_method:0
+msgid ""
+"This field allow you to change the workflow of the repair order. If value "
+"selected is different from 'No Invoice', it also allow you to select the "
+"pricelist and invoicing address."
+msgstr ""
+"Este campo le permite cambiar el flujo del pedido de reparación. Si el valor "
+"seleccionado es distinto de \"No facturar\", también le permitirá "
+"seleccionar la tarifa y la dirección de facturación."
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,name:0
+#: field:mrp.repair.line,name:0
+#: report:repair.order:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: mrp_repair
+#: field:mrp.repair,operations:0
+msgid "Operation Lines"
+msgstr "Líneas de operaciones"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "invoiced"
+msgstr "facturado"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair.fee,product_id:0
+#: field:mrp.repair.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoice Corrected"
+msgstr "Factura corregida"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: mrp_repair
+#: field:mrp.repair,deliver_bool:0
+msgid "Deliver"
+msgstr "Enviar"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,internal_notes:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: mrp_repair
+#: field:mrp.repair,picking_id:0
+msgid "Picking"
+msgstr "Albarán"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:41
+#, python-format
+msgid "Active ID is not Found"
+msgstr "ID activo no se encuentra"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
+#, python-format
+msgid "Repair order is not invoiced."
+msgstr "Orden de reparación no está facturada."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+msgid "Remove"
+msgstr "Eliminar"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom:0
+#: field:mrp.repair.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_invoice_id:0
+msgid "Invoicing Address"
+msgstr "Dirección de facturación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "After Repair"
+msgstr "Después de la reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_id:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
+#: view:mrp.repair:0
+msgid "Cancel Repair"
+msgstr "Cancelar reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "No Invoice"
+msgstr "No facturar"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "States"
+msgstr "Estados"
+
+#. module: mrp_repair
+#: help:mrp.repair,partner_id:0
+msgid ""
+"This field allow you to choose the parner that will be invoiced and delivered"
+msgstr ""
+"Este campo le permite seleccionar la empresa a la que se facturará y "
+"entregará el producto."
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Ready to Repair"
+msgstr "Listo para reparar"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:365
+#, python-format
+msgid "No partner !"
+msgstr "¡No existe empresa!"
+
+#~ msgid "Repair Order Ref"
+#~ msgstr "Referencia pedido reparación"
+
+#~ msgid "Repair State"
+#~ msgstr "Estado de reparación"
+
+#~ msgid "Repairs"
+#~ msgstr "Reparaciones"
+
+#~ msgid "Repairs in progress"
+#~ msgstr "Reparaciones en progreso"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "New Repair"
+#~ msgstr "Nueva reparación"
+
+#~ msgid "Repairs in quotation"
+#~ msgstr "Reparaciones en presupuesto"
+
+#~ msgid "Repair Fees line"
+#~ msgstr "Línea cargo de reparación"
+
+#~ msgid "Repair Operations Lines"
+#~ msgstr "Líneas de operaciones de reparación"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Cancel Repair...??"
+#~ msgstr "¿Cancelar reparación... ?"
+
+#~ msgid "Quality"
+#~ msgstr "Calidad"
+
+#~ 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 "Make invoices"
+#~ msgstr "Realizar facturas"
+
+#, python-format
+#~ msgid "You have to select a partner in the repair form !"
+#~ msgstr "¡Debe seleccionar una empresa en el formulario de reparación!"
+
+#~ msgid "Repairs to be invoiced"
+#~ msgstr "Reparaciones para ser facturadas"
+
+#~ msgid "Products Repairs Module"
+#~ msgstr "Módulo de reparación de productos"
+
+#~ msgid ""
+#~ "Check this box if you want to manage the delivery once the product is "
+#~ "repaired. If cheked, it will create a packing with selected product. Note "
+#~ "that you can select the locations in the Info tab, if you have the extended "
+#~ "view."
+#~ msgstr ""
+#~ "Seleccione esta opción si desea gestionar la entrega una vez el producto "
+#~ "esté reparado. Si la selecciona, se creará un albarán con el producto "
+#~ "seleccionado. Es posible seleccionar la ubicación en la pestaña \"Info\" si "
+#~ "se tiene activa la vista extendida."
+
+#~ msgid "Repair Ref"
+#~ msgstr "Ref. reparación"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Gives the state of the Repair Order"
+#~ msgstr "Indica el estado de la orden de reparación"
+
+#~ msgid ""
+#~ "The garantee limit is computed as: last move date + warranty defined on "
+#~ "selected product. If the current date is below the garantee limit, each "
+#~ "operation and fee you will add will be set as 'not to invoiced' by default. "
+#~ "Note that you can change manually afterwards."
+#~ msgstr ""
+#~ "El límite de garantía es calculado como: fecha del último movimiento + "
+#~ "garantía definida para el producto seleccionado. Si la fecha actual es "
+#~ "inferior al límite de garantía, cada operación y cargo que añada se "
+#~ "establecerá como \"no facturable\" por defecto. Destacar que puede "
+#~ "cambiarlos manualmente a posteriori."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid ""
+#~ "This operation  will  cancel the  Repair process, but  will not cancel it's "
+#~ "Invoice. Do you want to continue?"
+#~ msgstr ""
+#~ "Esta operación cancelará el proceso de reparación, pero no su factura. "
+#~ "¿Desea continuar?"
+
+#~ msgid "Repairs Order"
+#~ msgstr "Orden de reparaciones"
+
+#~ msgid "Repairs Ready to Start"
+#~ msgstr "Reparaciones listas para comenzar"
diff --git a/addons/mrp_repair/i18n/es_VE.po b/addons/mrp_repair/i18n/es_VE.po
new file mode 100644
index 00000000000..54bbc28fa84
--- /dev/null
+++ b/addons/mrp_repair/i18n/es_VE.po
@@ -0,0 +1,929 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_repair
+#
+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-13 04:36+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: 2011-09-05 05:42+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees Line"
+msgstr "Línea de cargo"
+
+#. module: mrp_repair
+#: help:mrp.repair,state:0
+msgid ""
+" * 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."
+msgstr ""
+" *El estado 'Borrador' se utiliza cuando un usuario está introduciendo una "
+"nueva orden de reparación sin confirmar             \n"
+"*El estado 'Confirmado' se utiliza cuando un usuario cofnirma la orden de "
+"reparación.             \n"
+"*El estado 'Listo para reparar' se utiliza para iniciar la reparación, el "
+"usuario puede iniciar la reparación solo depués de la confirmación de la "
+"orden de reparación \n"
+"*El estado 'A facturar' se utiliza pra generar la factura antes o depués de "
+"la realización de la reparación.\n"
+"*El estado 'Realizado' se utiliza cuando la reapración ha sido terminada.\n"
+"*El estado 'Cancelado' se utiliza cuando un usuario cancela la orden de "
+"reparación."
+
+#. module: mrp_repair
+#: field:mrp.repair.line,move_id:0
+msgid "Inventory Move"
+msgstr "Movimiento de inventario"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
+msgid ""
+"Repair orders allow you to organize your product repairs. In a repair order, "
+"you can detail the components you remove, add or replace and record the time "
+"you spent on the different operations. The repair order uses the warranty "
+"date on the production lot in order to know if whether the repair should be "
+"invoiced to the customer or not."
+msgstr ""
+"Las órdenes de reparación le permiten organizar sus reparaciones del "
+"producto. En una orden de reparación, puede detallar los componentes que "
+"elimina, añade o sustituye y registrar el tiempo que consumido en las "
+"diferentes operaciones. La orden de reparación utiliza la fecha de garantía "
+"de el lote de producción para saber si la reparación debe ser facturada al "
+"cliente o no."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Recrear factura"
+
+#. module: mrp_repair
+#: help:mrp.repair,deliver_bool:0
+msgid ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a picking with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
+msgstr ""
+"Marque esta opción si desea gestionar la entrega una vez que el producto es "
+"reparado. Si esta marcada, se creará un albarán con el producto "
+"seleccionado. Tenga en cuenta que puede seleccionar las ubicaciones en la "
+"pestaña Información, si tiene la vista extendida."
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
+#: view:mrp.repair.cancel:0
+msgid "Cancel Repair Order"
+msgstr "Cancelar orden reparación"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,to_invoice:0
+#: field:mrp.repair.line,to_invoice:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Printing Date"
+msgstr "Fecha de impresión"
+
+#. module: mrp_repair
+#: field:mrp.repair.make_invoice,group:0
+msgid "Group by partner invoice address"
+msgstr "Agrupar por dirección de facturación"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:430
+#, python-format
+msgid "No product defined on Fees!"
+msgstr "¡No se ha definido ningún producto en honorarios!"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: mrp_repair
+#: field:mrp.repair,address_id:0
+msgid "Delivery Address"
+msgstr "Dirección de entrega"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
+#: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
+#: view:mrp.repair:0
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_subtotal:0
+#: field:mrp.repair.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: mrp_repair
+#: field:mrp.repair,guarantee_limit:0
+msgid "Guarantee limit"
+msgstr "Límite de garantía"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: mrp_repair
+#: model:ir.module.module,description:mrp_repair.module_meta_information
+msgid ""
+"\n"
+"           The aim is to have a complete module to manage all products "
+"repairs. The following topics should be covered by this module:\n"
+"           * Add/remove products in the reparation\n"
+"           * Impact for stocks\n"
+"           * Invoicing (products and/or services)\n"
+"           * Warranty concept\n"
+"           * Repair quotation report\n"
+"           * Notes for the technician and for the final customer\n"
+msgstr ""
+"\n"
+"           El objetivo es tener un módulo completo para gestionar todas las "
+"reparaciones de productos. Este módulo cubre los siguientes asuntos:\n"
+"           * Añadir/quitar productos en la reparación.\n"
+"           * Impacto en stocks.\n"
+"           * Facturación (productos y/o servicios).\n"
+"           * Concepto de garantía.\n"
+"           * Informe de presupuesto de reparación.\n"
+"           * Notas para el técnico y el cliente final.\n"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_tax:0
+#: field:mrp.repair.fee,tax_id:0
+#: field:mrp.repair.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:430
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Operations"
+msgstr "Operaciones"
+
+#. module: mrp_repair
+#: field:mrp.repair,move_id:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:365
+#, python-format
+msgid "You have to select a Partner Invoice Address in the repair form !"
+msgstr ""
+"¡Debe seleccionar una dirección de factura de empresa en el formulario de "
+"reparación!"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
+msgid "Repair Orders"
+msgstr "Órdenes de reparación"
+
+#. module: mrp_repair
+#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,repair_id:0
+#: field:mrp.repair.line,repair_id:0
+msgid "Repair Order Reference"
+msgstr "Referencia orden reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:379
+#, python-format
+msgid "No account defined for partner \"%s\"."
+msgstr "No se ha definido una cuenta para la empresa \"%s\"."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repairs order"
+msgstr "Órdenes de reparación"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Repair Order N° :"
+msgstr "Orden de reparación Nº :"
+
+#. module: mrp_repair
+#: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
+#: report:repair.order:0
+msgid "Lot Number"
+msgstr "Número de lote"
+
+#. module: mrp_repair
+#: field:mrp.repair,fees_lines:0
+msgid "Fees Lines"
+msgstr "Líneas de cargos"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Fees Line(s)"
+msgstr "Línea(s) cargo"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "To be Invoiced"
+msgstr "Para ser facturado"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: mrp_repair
+#: help:mrp.repair.line,state:0
+msgid ""
+" * 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."
+msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea una orden "
+"de reparación.                         \n"
+"* El estado 'Confirmado' se establece automáticamente cuando se confirma la "
+"orden de reparación.                         \n"
+"* El estado 'Hecho' se establece automáticamente cuando se completa la orden "
+"de reparación.                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela la orden de reparación."
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid ""
+"This operation will cancel the Repair process, but will not cancel it's "
+"Invoice. Do you want to continue?"
+msgstr ""
+"Esta operación cancelará el proceso de reparación, pero no cancelará la "
+"factura. ¿Desea continuar?"
+
+#. module: mrp_repair
+#: field:mrp.repair,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,quotation_notes:0
+msgid "Quotation Notes"
+msgstr "Notas del presupuesto"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Search Reair Orders"
+msgstr "Buscar órdenes reparación"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "(Add)"
+msgstr "(Añadir)"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_line
+#: view:mrp.repair:0
+msgid "Repair Line"
+msgstr "Línea reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_method:0
+msgid "Invoice Method"
+msgstr "Método facturación"
+
+#. module: mrp_repair
+#: field:mrp.repair,repaired:0
+msgid "Repaired"
+msgstr "Reparado"
+
+#. module: mrp_repair
+#: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
+msgid "Products Repairs Module - Manage All products Repairs"
+msgstr ""
+"Módulo reparación de productos - Gestiona todas las reparaciones de productos"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,invoice_line_id:0
+#: field:mrp.repair.line,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Canceled"
+msgstr "Cancelada"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "Before Repair"
+msgstr "Antes de reparación"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_id:0
+msgid "Current Location"
+msgstr "Ubicación actual"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoiced:0
+#: field:mrp.repair.fee,invoiced:0
+#: field:mrp.repair.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: mrp_repair
+#: view:mrp.repair.cancel:0
+msgid "No"
+msgstr "No"
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "(Remove)"
+msgstr "(Eliminar)"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+msgid "Add"
+msgstr "Añadir"
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: mrp_repair
+#: field:mrp.repair,name:0
+msgid "Repair Reference"
+msgstr "Referencia reparación"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair
+msgid "Repair Order"
+msgstr "Orden reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "En reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Ready To Repair"
+msgstr "Preparado para reparar"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Guarantee Limit"
+msgstr "Límite de garantía"
+
+#. module: mrp_repair
+#: field:mrp.repair,default_address_id:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: mrp_repair
+#: field:mrp.repair,product_id:0
+#: report:repair.order:0
+msgid "Product to Repair"
+msgstr "Producto a reparar"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "N° :"
+msgstr "N° :"
+
+#. module: mrp_repair
+#: help:mrp.repair,pricelist_id:0
+msgid "The pricelist comes from the selected partner, by default."
+msgstr "Por defecto se utilizará la tarifa del cliente seleccionado."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
+msgid "Repair Fees Line"
+msgstr "Líneas honorarios reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Confirmar reparación"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Repair Quotation"
+msgstr "Presupuesto de reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "End Repair"
+msgstr "Fin reparación"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
+#, python-format
+msgid "No account defined for product \"%s\"."
+msgstr "No se ha definido una cuenta para el producto \"%s\"."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom_qty:0
+#: report:repair.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Start Repair"
+msgstr "Iniciar reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,state:0
+#: field:mrp.repair.line,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Qty"
+msgstr "Cant."
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_unit:0
+#: field:mrp.repair.line,price_unit:0
+#: report:repair.order:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Done"
+msgstr "Finalizada"
+
+#. module: mrp_repair
+#: help:mrp.repair,guarantee_limit:0
+msgid ""
+"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."
+msgstr ""
+"El plazo de garantía se calcula como: Fecha del último movimiento + Garantía "
+"definida en el producto seleccionado. Si la fecha actual está por debajo del "
+"límite de garantía, cada operación y honorario que se añadan se marcarán "
+"como \"No a facturar\" por defecto. Tenga en cuenta que después puede "
+"cambiarlo manualmente."
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees"
+msgstr "Cargos"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: view:mrp.repair.make_invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Ubicación destino"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Operation Line(s)"
+msgstr "Línea(s) operación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "History"
+msgstr "Historial"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_dest_id:0
+msgid "Delivery Location"
+msgstr "Ubicación de entrega"
+
+#. module: mrp_repair
+#: help:mrp.repair,invoice_method:0
+msgid ""
+"This field allow you to change the workflow of the repair order. If value "
+"selected is different from 'No Invoice', it also allow you to select the "
+"pricelist and invoicing address."
+msgstr ""
+"Este campo le permite cambiar el flujo del pedido de reparación. Si el valor "
+"seleccionado es distinto de \"No facturar\", también le permitirá "
+"seleccionar la tarifa y la dirección de facturación."
+
+#. module: mrp_repair
+#: view:mrp.repair.make_invoice:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,name:0
+#: field:mrp.repair.line,name:0
+#: report:repair.order:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: mrp_repair
+#: field:mrp.repair,operations:0
+msgid "Operation Lines"
+msgstr "Líneas de operaciones"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "invoiced"
+msgstr "facturado"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair.fee,product_id:0
+#: field:mrp.repair.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoice Corrected"
+msgstr "Factura corregida"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: mrp_repair
+#: field:mrp.repair,deliver_bool:0
+msgid "Deliver"
+msgstr "Enviar"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,internal_notes:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: mrp_repair
+#: report:repair.order:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: mrp_repair
+#: field:mrp.repair,picking_id:0
+msgid "Picking"
+msgstr "Albarán"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:41
+#, python-format
+msgid "Active ID is not Found"
+msgstr "ID activo no se encuentra"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
+#, python-format
+msgid "Repair order is not invoiced."
+msgstr "Orden de reparación no está facturada."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+msgid "Remove"
+msgstr "Eliminar"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom:0
+#: field:mrp.repair.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_invoice_id:0
+msgid "Invoicing Address"
+msgstr "Dirección de facturación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "After Repair"
+msgstr "Después de la reparación"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_id:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
+#: view:mrp.repair:0
+msgid "Cancel Repair"
+msgstr "Cancelar reparación"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "No Invoice"
+msgstr "No facturar"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "States"
+msgstr "Estados"
+
+#. module: mrp_repair
+#: help:mrp.repair,partner_id:0
+msgid ""
+"This field allow you to choose the parner that will be invoiced and delivered"
+msgstr ""
+"Este campo le permite seleccionar la empresa a la que se facturará y "
+"entregará el producto."
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Ready to Repair"
+msgstr "Listo para reparar"
+
+#. module: mrp_repair
+#: code:addons/mrp_repair/mrp_repair.py:365
+#, python-format
+msgid "No partner !"
+msgstr "¡No existe empresa!"
+
+#~ msgid "Repair Order Ref"
+#~ msgstr "Referencia pedido reparación"
+
+#~ msgid "Repair State"
+#~ msgstr "Estado de reparación"
+
+#~ msgid "Repairs"
+#~ msgstr "Reparaciones"
+
+#~ msgid "Repairs in progress"
+#~ msgstr "Reparaciones en progreso"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "New Repair"
+#~ msgstr "Nueva reparación"
+
+#~ msgid "Repairs in quotation"
+#~ msgstr "Reparaciones en presupuesto"
+
+#~ msgid "Repair Fees line"
+#~ msgstr "Línea cargo de reparación"
+
+#~ msgid "Repair Operations Lines"
+#~ msgstr "Líneas de operaciones de reparación"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Cancel Repair...??"
+#~ msgstr "¿Cancelar reparación... ?"
+
+#~ msgid "Quality"
+#~ msgstr "Calidad"
+
+#~ 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 "Make invoices"
+#~ msgstr "Realizar facturas"
+
+#, python-format
+#~ msgid "You have to select a partner in the repair form !"
+#~ msgstr "¡Debe seleccionar una empresa en el formulario de reparación!"
+
+#~ msgid "Repairs to be invoiced"
+#~ msgstr "Reparaciones para ser facturadas"
+
+#~ msgid "Products Repairs Module"
+#~ msgstr "Módulo de reparación de productos"
+
+#~ msgid ""
+#~ "Check this box if you want to manage the delivery once the product is "
+#~ "repaired. If cheked, it will create a packing with selected product. Note "
+#~ "that you can select the locations in the Info tab, if you have the extended "
+#~ "view."
+#~ msgstr ""
+#~ "Seleccione esta opción si desea gestionar la entrega una vez el producto "
+#~ "esté reparado. Si la selecciona, se creará un albarán con el producto "
+#~ "seleccionado. Es posible seleccionar la ubicación en la pestaña \"Info\" si "
+#~ "se tiene activa la vista extendida."
+
+#~ msgid "Repair Ref"
+#~ msgstr "Ref. reparación"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Gives the state of the Repair Order"
+#~ msgstr "Indica el estado de la orden de reparación"
+
+#~ msgid ""
+#~ "The garantee limit is computed as: last move date + warranty defined on "
+#~ "selected product. If the current date is below the garantee limit, each "
+#~ "operation and fee you will add will be set as 'not to invoiced' by default. "
+#~ "Note that you can change manually afterwards."
+#~ msgstr ""
+#~ "El límite de garantía es calculado como: fecha del último movimiento + "
+#~ "garantía definida para el producto seleccionado. Si la fecha actual es "
+#~ "inferior al límite de garantía, cada operación y cargo que añada se "
+#~ "establecerá como \"no facturable\" por defecto. Destacar que puede "
+#~ "cambiarlos manualmente a posteriori."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid ""
+#~ "This operation  will  cancel the  Repair process, but  will not cancel it's "
+#~ "Invoice. Do you want to continue?"
+#~ msgstr ""
+#~ "Esta operación cancelará el proceso de reparación, pero no su factura. "
+#~ "¿Desea continuar?"
+
+#~ msgid "Repairs Order"
+#~ msgstr "Orden de reparaciones"
+
+#~ msgid "Repairs Ready to Start"
+#~ msgstr "Reparaciones listas para comenzar"
diff --git a/addons/mrp_repair/i18n/et.po b/addons/mrp_repair/i18n/et.po
index 47caaba5c02..a7a0e7796c9 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -105,7 +105,7 @@ msgid "Group by partner invoice address"
 msgstr "Grupeeri partneri arve aadressi järgi"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -173,7 +173,7 @@ msgid "Net Total :"
 msgstr "Neto :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -194,7 +194,7 @@ msgid "Move"
 msgstr "Suuna"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Draft"
 msgstr "Mustand"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -251,6 +251,7 @@ msgstr "Remondikorralduse N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Seerianumber"
@@ -281,9 +282,9 @@ msgid "Shipping address :"
 msgstr "Tarneaadress :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr "Remondi lõpp"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -767,7 +768,7 @@ msgid "Ready to Repair"
 msgstr "Valmis remondiks"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Partner puudub!"
diff --git a/addons/mrp_repair/i18n/fi.po b/addons/mrp_repair/i18n/fi.po
index b99c79e2143..3be5022bb78 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -98,7 +98,7 @@ msgid "Group by partner invoice address"
 msgstr "Ryhmitä kumppanin laskutusosoitteen mukaisesti"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -144,7 +144,7 @@ msgstr "Takuuraja"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -173,7 +173,7 @@ msgid "Net Total :"
 msgstr "Yhteensä veroton"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Varoitus !"
@@ -194,10 +194,10 @@ msgid "Move"
 msgstr "Siirrä"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
-msgstr ""
+msgstr "Sinun pitää valita kumppanin laskutusosoite korjauslomakkeella !"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -227,7 +227,7 @@ msgid "Draft"
 msgstr "Vedos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Kumppanille ei ole määritetty tiliä \"%s\"."
@@ -251,6 +251,7 @@ msgstr "Korjaustilauksen nro"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Eränumero"
@@ -281,9 +282,9 @@ msgid "Shipping address :"
 msgstr "Toimitusosoite:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Virhe !"
@@ -344,7 +345,7 @@ msgstr "Etsi korjaustilaus"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(lisää)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -371,7 +372,7 @@ msgstr "Korjattu"
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module - Manage All products Repairs"
-msgstr ""
+msgstr "Tuotteiden korjausmoduuli - Hallitse kaikkia tuotekorjauksia"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
@@ -419,7 +420,7 @@ msgstr "Luo laskut"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(poista)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -490,7 +491,7 @@ msgstr "Päivämäärä"
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Korjauskulujen rivi"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -518,8 +519,8 @@ msgid "End Repair"
 msgstr "Päätä korjaus"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Tuotteelle \"%s\" ei ole määritetty tiliä"
@@ -545,7 +546,7 @@ msgstr "Aloita korjaus"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -624,7 +625,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Luo lasku"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -641,7 +642,7 @@ msgstr "Toimintorivit"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "laskutettu"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -679,7 +680,7 @@ msgstr "Verot:"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Keräily"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -690,13 +691,13 @@ msgstr "Veroton määrä"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
 #, python-format
 msgid "Active ID is not Found"
-msgstr ""
+msgstr "Aktiivista ID:tä ei löytynyt"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "Korjaustilausta ei ole laskutettu"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -772,7 +773,7 @@ msgid "Ready to Repair"
 msgstr "Valmis korjattavaksi"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Ei kumppania!"
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index 64f0dd6924e..fafaee191fb 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 18:55+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -115,7 +115,7 @@ msgid "Group by partner invoice address"
 msgstr "Grrouper par Adresse de Facturation Partenaire"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Aucun produit défini avec des frais !"
@@ -199,7 +199,7 @@ msgid "Net Total :"
 msgstr "Total Net :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -220,7 +220,7 @@ msgid "Move"
 msgstr "Mouvement"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Draft"
 msgstr "Brouillon"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Pas de compte défini pour le partenaire \"%s\"."
@@ -279,6 +279,7 @@ msgstr "N° de la Commande de Réparation"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Numéro du Lot"
@@ -309,9 +310,9 @@ msgid "Shipping address :"
 msgstr "Adresse de Livraison"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -555,8 +556,8 @@ msgid "End Repair"
 msgstr "Terminer la Réparation"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Pas de compte défini pour le produit \"%s\"."
@@ -816,7 +817,7 @@ msgid "Ready to Repair"
 msgstr "Prêt à Réparer"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Pas de partenaire !"
@@ -922,17 +923,3 @@ msgstr "Pas de partenaire !"
 
 #~ msgid "Cancel Repair...??"
 #~ msgstr "Annuler la Réparation ?"
-
-#~ msgid ""
-#~ "Repair orders allows you to organize your reparations on the products. On a "
-#~ "repair order, you can detail the components you remove, add or replace and "
-#~ "record the time you spent on the different operations. The repair order uses "
-#~ "the warranty date on the production lot in order to know if you have to "
-#~ "invoice the reparation to the customer or not."
-#~ msgstr ""
-#~ "Les ordres de réparation vous permettent d'organiser vos réparations de "
-#~ "produits. Sur un ordre de réparation, vous pouvez détailler les composants "
-#~ "que vous enlevez, que vous ajoutez ou que vous remplacez et enregistrer le "
-#~ "temps que vous passez sur les différentes opérations. L'ordre de réparation "
-#~ "utilise la date de garantie sur le lot de production pour savoir si vous "
-#~ "devez facturer ou non la réparation à votre client."
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 2083df654a2..eef3c32c510 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -94,7 +94,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -169,7 +169,7 @@ msgid "Net Total :"
 msgstr "नेट कुल:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -190,7 +190,7 @@ msgid "Move"
 msgstr "स्थानान्तर"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -223,7 +223,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -247,6 +247,7 @@ msgstr "मरम्मत के आदेश N °:"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -277,9 +278,9 @@ msgid "Shipping address :"
 msgstr "शिपिंग का पता"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -512,8 +513,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -763,7 +764,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index 82f23c7b999..f70205f2e7f 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/hu.po b/addons/mrp_repair/i18n/hu.po
index 90805c2afc2..cd3f982581f 100644
--- a/addons/mrp_repair/i18n/hu.po
+++ b/addons/mrp_repair/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 12:20+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +94,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +169,7 @@ msgid "Net Total :"
 msgstr "Nettó érték:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Vigyázat!"
@@ -189,7 +190,7 @@ msgid "Move"
 msgstr "Mozgatás"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +223,7 @@ msgid "Draft"
 msgstr "Tervezet"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Nincs számla definiálva \"%s\" partnerhez."
@@ -246,6 +247,7 @@ msgstr "Javítás/Szervíz rendelés száma"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Tételszám"
@@ -276,9 +278,9 @@ msgid "Shipping address :"
 msgstr "Szállítási cím :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Hiba !"
@@ -511,8 +513,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Nincs számla definiálva \"%s\" termékhez."
@@ -762,7 +764,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Nincs partner!"
diff --git a/addons/mrp_repair/i18n/id.po b/addons/mrp_repair/i18n/id.po
index 15512493a34..7c90a2ffcfe 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index 981abcb08dd..3ee4b1f49ab 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-23 12:05+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr "Raggruppa per l'indirizzo di fatturazione del cliente"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Totale netto :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Attenzione!"
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Sposta"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Bozza"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr "Riparazione Ordine N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Numero Lotto"
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Indirizzo Spedizione:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Errore!"
@@ -513,8 +514,8 @@ msgid "End Repair"
 msgstr "Fine Riparazione"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -764,7 +765,7 @@ msgid "Ready to Repair"
 msgstr "Prodo da Riparare"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Nessun partner!"
diff --git a/addons/mrp_repair/i18n/ko.po b/addons/mrp_repair/i18n/ko.po
index 41ec902cd50..fbb772e5332 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -94,7 +94,7 @@ msgid "Group by partner invoice address"
 msgstr "파트너 인보이스 주소 별로 그룹화"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -169,7 +169,7 @@ msgid "Net Total :"
 msgstr "순 합계:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -190,7 +190,7 @@ msgid "Move"
 msgstr "이동"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -223,7 +223,7 @@ msgid "Draft"
 msgstr "초안"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -247,6 +247,7 @@ msgstr "수리 주문 N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "로트 번호"
@@ -277,9 +278,9 @@ msgid "Shipping address :"
 msgstr "선적 주소:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -512,8 +513,8 @@ msgid "End Repair"
 msgstr "수리 완료"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -765,7 +766,7 @@ msgid "Ready to Repair"
 msgstr "수리 준비됨"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "파트너가 없음 !"
diff --git a/addons/mrp_repair/i18n/lt.po b/addons/mrp_repair/i18n/lt.po
index 82f23c7b999..f70205f2e7f 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/nl.po b/addons/mrp_repair/i18n/nl.po
index d6ec9959ddb..0b18c264cac 100644
--- a/addons/mrp_repair/i18n/nl.po
+++ b/addons/mrp_repair/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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Groepeer op..."
 
 #. 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 "Reparatie annuleren"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
@@ -93,10 +93,10 @@ msgid "Group by partner invoice address"
 msgstr "Groupeer op relatie factuuradres"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "Geen producten bij vergoedingen gedefineerd"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -139,7 +139,7 @@ msgstr "Garantietermijn"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Opmerkingen"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -168,10 +168,10 @@ msgid "Net Total :"
 msgstr "Netto totaal :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Waarschuwing !"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Verplaatsing"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Concept"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr "Reparatie order N°:"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Lot Nummer"
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Afleveradres :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr "Stop reparatie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -765,7 +766,7 @@ msgid "Ready to Repair"
 msgstr "Gereed voor reparatie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Geen relatie !"
diff --git a/addons/mrp_repair/i18n/nl_BE.po b/addons/mrp_repair/i18n/nl_BE.po
index 2ff72da901b..b33f7a66a92 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/pl.po b/addons/mrp_repair/i18n/pl.po
index fbeafca8b13..c002a4e8153 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr "Grupuj wg adresów partnera do faktur"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Suma netto :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Przesunięcie"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Projekt"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr "Zamówienie naprawy nr :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Numer partii"
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Adres do wysyłki :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr "Koniec naprawy"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr "Gotowe do naprawy"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index e392c2c2bde..fb80a8409de 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr "Agrupado por endereço da factura do terceiro"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Total Líquido :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Atenção!"
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Rascunho"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr "Ordem de Reparação Nº :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Número do Lote"
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Endereço de recolha :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr "Fim da Reparação"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -766,7 +767,7 @@ msgid "Ready to Repair"
 msgstr "Pronto para Reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Nenhum Terceiro !"
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index e2d36c7fb0d..32bda9cb030 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr "Agrupar pelo Endereço de Faturamento do Parceiro"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Total Líquido"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Atenção !"
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -224,7 +224,7 @@ msgid "Draft"
 msgstr "Rascunho"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "Sem conta definida para o Parceiro \"%s\"."
@@ -248,6 +248,7 @@ msgstr "Ordem de Reparo N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Número do Lote"
@@ -278,9 +279,9 @@ msgid "Shipping address :"
 msgstr "Endereço de Entrega :"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
@@ -515,8 +516,8 @@ msgid "End Repair"
 msgstr "Finalizar Reparo"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Sem conta definida para o produtot \"%s\"."
@@ -771,7 +772,7 @@ msgid "Ready to Repair"
 msgstr "Pronto para Reparar"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Sem parceiro !"
diff --git a/addons/mrp_repair/i18n/ro.po b/addons/mrp_repair/i18n/ro.po
index 82f23c7b999..f70205f2e7f 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/ru.po b/addons/mrp_repair/i18n/ru.po
index a0c77ef1875..313853487e9 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/sl.po b/addons/mrp_repair/i18n/sl.po
index bbff58f3853..4804a761001 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr "Združi po naslovu za račun partnerja"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr "Skupaj neto:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr "Prenos"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr "Osnutek"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr "Naslov za dostavo:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr "Pripravljeno na popravilo"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/sq.po b/addons/mrp_repair/i18n/sq.po
index 11c937620fa..a95e84698f8 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -94,7 +94,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -169,7 +169,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -190,7 +190,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -223,7 +223,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -247,6 +247,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -277,9 +278,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -512,8 +513,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -763,7 +764,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
index 6f6dfd3d994..92488497826 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -110,7 +110,7 @@ msgid "Group by partner invoice address"
 msgstr "Grupisano po adresama faktura partnera"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Nema proizvoda definisanih za Naknadne intervencije"
@@ -185,7 +185,7 @@ msgid "Net Total :"
 msgstr "Ukupno neto"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -206,7 +206,7 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "TRebas izabrati Partnerovu adresu fakture u formi za popravku!"
@@ -239,7 +239,7 @@ msgid "Draft"
 msgstr "Priprema"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "NIjedan nalog nije definisan kao partner \"%s\" ."
@@ -263,6 +263,7 @@ msgstr "Nalog Br :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Serijski Broj"
@@ -293,9 +294,9 @@ msgid "Shipping address :"
 msgstr "Adresa isporuke:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -539,8 +540,8 @@ msgid "End Repair"
 msgstr "Kraj Popravke"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Ni jedan nalog nije kreiran za proizvod \"%s\" ."
@@ -800,7 +801,7 @@ msgid "Ready to Repair"
 msgstr "Spremno za Popravku"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Nema partnera !"
@@ -904,6 +905,3 @@ msgstr "Nema partnera !"
 
 #~ msgid "Repairs in quotation"
 #~ msgstr "Popravke u Najavi"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni ."
diff --git a/addons/mrp_repair/i18n/sr@latin.po b/addons/mrp_repair/i18n/sr@latin.po
index 41d43e7a99f..c9ee80ab537 100644
--- a/addons/mrp_repair/i18n/sr@latin.po
+++ b/addons/mrp_repair/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -110,7 +110,7 @@ msgid "Group by partner invoice address"
 msgstr "Grupisano po adresama faktura partnera"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr "Nema proizvoda definisanih za Naknadne intervencije"
@@ -185,7 +185,7 @@ msgid "Net Total :"
 msgstr "Ukupno neto"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -206,7 +206,7 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr "TRebas izabrati Partnerovu adresu fakture u formi za popravku!"
@@ -239,7 +239,7 @@ msgid "Draft"
 msgstr "Priprema"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr "NIjedan nalog nije definisan kao partner \"%s\" ."
@@ -263,6 +263,7 @@ msgstr "Nalog Br :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Serijski Broj"
@@ -293,9 +294,9 @@ msgid "Shipping address :"
 msgstr "Adresa isporuke:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -539,8 +540,8 @@ msgid "End Repair"
 msgstr "Kraj Popravke"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr "Ni jedan nalog nije kreiran za proizvod \"%s\" ."
@@ -800,7 +801,7 @@ msgid "Ready to Repair"
 msgstr "Spremno za Popravku"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr "Nema partnera !"
@@ -811,9 +812,6 @@ msgstr "Nema partnera !"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni ."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index bac9167e5bd..672e8ea4e33 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: 2011-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\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 92181e8de0e..92e4876045a 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 73051f4a724..02f5df9b3de 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: 2011-06-24 04:59+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\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 58f6e98bd91..49cffef2dfe 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/vi.po b/addons/mrp_repair/i18n/vi.po
index 8abb327747d..ca8d79d7049 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -94,7 +94,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -169,7 +169,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -190,7 +190,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -223,7 +223,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -247,6 +247,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -277,9 +278,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -512,8 +513,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -763,7 +764,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index 7ad821eb983..d7e59d73a70 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-03-20 08:36+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -35,6 +35,12 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" “草稿”状态表示用户输入了新的维修单但未确认\n"
+" “已确认”状态表示用户已确认这张维修单\n"
+" “正在维修”状态表示产品正在维修中，只有已确认的维修单才能开始维修\n"
+" “待开票”状态用于在维修前或维修后生成发票\n"
+" “完成”状态表示维修已完成\n"
+" “已作废”状态表示用户已作废这样维修单"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -50,11 +56,13 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"维修单用于管理你的产品维修过程。在维修单中，你可以详细记录你要拆掉、增加或更换的部件，记录你花费的工时。维修单使用产品批号的保修期字段判断这次维修是否需要"
+"给客户开发票。"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -68,13 +76,13 @@ msgid ""
 "repaired. If cheked, it will create a picking with selected product. Note "
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
-msgstr ""
+msgstr "如果需要产品维修后送货请勾上这个勾，移库单会自动生成。注意如果你使用了扩展视图，可以在“信息”标签页选择目的地库位。"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "作废维修单"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
@@ -93,10 +101,10 @@ msgid "Group by partner invoice address"
 msgstr "业务伙伴发票地址组"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "没有定义费用产品"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -139,7 +147,7 @@ msgstr "保修期限"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -154,6 +162,14 @@ msgid ""
 "           * Repair quotation report\n"
 "           * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"           目标是有个模块能管理所有的产品维修。模块的功能有：\n"
+"           在维修过程中增加或拆卸部件\n"
+"           影响库存\n"
+"           针对部件或人工开发票\n"
+"           参照质保期\n"
+"           维修报价\n"
+"           对工程师和最终用户的注释\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -168,10 +184,10 @@ msgid "Net Total :"
 msgstr "净合计:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -189,10 +205,10 @@ msgid "Move"
 msgstr "调拨"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
-msgstr ""
+msgstr "必须在维修单上输入业务伙伴的发票地址"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -214,7 +230,7 @@ msgstr "额外信息"
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "维修单编号"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -222,10 +238,10 @@ msgid "Draft"
 msgstr "草稿"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
-msgstr ""
+msgstr "业务伙伴 \"%s\" 没有指定应收账款科目"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -246,6 +262,7 @@ msgstr "修理单编号:"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "批号"
@@ -276,12 +293,12 @@ msgid "Shipping address :"
 msgstr "运输地址:"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
@@ -298,7 +315,7 @@ msgid ""
 "* The 'Done' state is set automatically when repair order is completed.      "
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
-msgstr ""
+msgstr " 维修单有四个状态：草稿、已确认、已完成和已作废"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -310,7 +327,7 @@ msgstr "总价:"
 msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
-msgstr ""
+msgstr "将作废这张维修单，但对应的发票不会作废，继续么？"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -327,17 +344,17 @@ msgstr "报价单备注"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "维修单列表"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "（增加）"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -364,7 +381,7 @@ msgstr "已修理"
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module - Manage All products Repairs"
-msgstr ""
+msgstr "产品维修模块 - 管理所有产品的维修过程"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
@@ -412,7 +429,7 @@ msgstr "创建发票"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "（拆除）"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -422,17 +439,17 @@ msgstr "增加"
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成发票吗 ？"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "维修单编号"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "维修单"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -442,7 +459,7 @@ msgstr "不修理"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "正在维修"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
@@ -457,7 +474,7 @@ msgstr "保证限制"
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "未知的"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
@@ -478,12 +495,12 @@ msgstr "定义选择业务伙伴的价格表"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "维修费行"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -511,16 +528,16 @@ msgid "End Repair"
 msgstr "结束修理"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr ""
+msgstr "产品 \"%s\" 没有指定科目"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "报价单"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -538,7 +555,7 @@ msgstr "开始修理"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -566,6 +583,7 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"过保日期的计算规则：发货日期+产品上的质保期。如果当前日期在过保日期之前，你添加的所有材料和人工行都默认为不开发票。当然能你可以手工修改。"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -614,7 +632,7 @@ msgstr "这字段允许你修改修理单的工作流.如果你选的值不是
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "创建发票"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -631,7 +649,7 @@ msgstr "操作明细"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "已开票"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -669,7 +687,7 @@ msgstr "税:"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "领料/提货"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -680,13 +698,13 @@ msgstr "不含税金额"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
 #, python-format
 msgid "Active ID is not Found"
-msgstr ""
+msgstr "记录ID不存在"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "未开发票的维修单"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -762,10 +780,10 @@ msgid "Ready to Repair"
 msgstr "准备修理"
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
-msgstr ""
+msgstr "没有输入业务伙伴"
 
 #~ msgid "Status"
 #~ msgstr "状态"
@@ -782,25 +800,6 @@ msgstr ""
 #~ msgid "Repairs in quotation"
 #~ msgstr "修理报价单"
 
-#~ msgid ""
-#~ "\n"
-#~ "           The aim is to have a complete module to manage all products "
-#~ "repairs. The following topics should be covered by this module:\n"
-#~ "           * Add/remove products in the reparation\n"
-#~ "           * Impact for stocks\n"
-#~ "           * Invoicing (products and/or services)\n"
-#~ "           * Warranty concept\n"
-#~ "           * Repair quotation report\n"
-#~ "           * Notes for the technician and for the final customer           \n"
-#~ msgstr ""
-#~ "\n"
-#~ "           目的是有一个完整模块来管理所有的产品修理.以下的主题将覆盖这模块:\t*增加和删除产品的修理\n"
-#~ "\t*作用于仓库\n"
-#~ "\t*发票(产品或者服务)\n"
-#~ "\t*保修\n"
-#~ "\t*修理报价单\n"
-#~ "\t*记录技术员和最终客户           \n"
-
 #~ msgid "Repair Fees line"
 #~ msgstr "修理费用明细"
 
diff --git a/addons/mrp_repair/i18n/zh_TW.po b/addons/mrp_repair/i18n/zh_TW.po
index d701014315c..c85cc354a45 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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -93,7 +93,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -168,7 +168,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:427
+#: code:addons/mrp_repair/mrp_repair.py:430
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -189,7 +189,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:379
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -246,6 +246,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
+#: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
@@ -276,9 +277,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -511,8 +512,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:405
-#: code:addons/mrp_repair/mrp_repair.py:434
+#: code:addons/mrp_repair/mrp_repair.py:408
+#: code:addons/mrp_repair/mrp_repair.py:437
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -762,7 +763,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:362
+#: code:addons/mrp_repair/mrp_repair.py:365
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 3a538590d10..e1216332ae4 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -68,12 +68,15 @@ class mrp_repair(osv.osv):
             val = 0.0
             cur = repair.pricelist_id.currency_id
             for line in repair.operations:
+                #manage prices with tax included use compute_all instead of compute
                 if line.to_invoice:
-                    for c in tax_obj.compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
+                    tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)
+                    for c in tax_calculate['taxes']:
                         val += c['amount']
             for line in repair.fees_lines:
                 if line.to_invoice:
-                    for c in tax_obj.compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
+                    tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)
+                    for c in tax_calculate['taxes']:
                         val += c['amount']
             res[repair.id] = cur_obj.round(cr, uid, cur, val)
         return res
@@ -105,8 +108,6 @@ class mrp_repair(osv.osv):
         return res
 
     def _get_lines(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         result = {}
         for line in self.pool.get('mrp.repair.line').browse(cr, uid, ids, context=context):
             result[line.repair_id.id] = True
@@ -121,7 +122,7 @@ class mrp_repair(osv.osv):
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
-            ('confirmed','Confirmed, to repair'),
+            ('confirmed','Confirmed'),
             ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
             ('2binvoiced','To be Invoiced'),
@@ -153,6 +154,7 @@ class mrp_repair(osv.osv):
         'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes': fields.text('Internal Notes'),
         'quotation_notes': fields.text('Quotation Notes'),
+        'company_id': fields.many2one('res.company', 'Company'),
         'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired': fields.boolean('Repaired', readonly=True),
@@ -178,6 +180,7 @@ class mrp_repair(osv.osv):
         'deliver_bool': lambda *a: True,
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'mrp.repair'),
         'invoice_method': lambda *a: 'none',
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.repair', context=context),
         'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr, uid, [('type','=','sale')])[0]
     }
 
@@ -462,13 +465,6 @@ class mrp_repair(osv.osv):
             self.write(cr, uid, [repair.id], {'state': 'ready'})
         return True
 
-    def action_invoice_cancel(self, cr, uid, ids, context=None):
-        """ Writes repair order state to 'Exception in invoice'
-        @return: True
-        """
-        self.write(cr, uid, ids, {'state': 'invoice_except'})
-        return True
-
     def action_repair_start(self, cr, uid, ids, context=None):
         """ Writes repair order state to 'Under Repair'
         @return: True
@@ -480,22 +476,6 @@ class mrp_repair(osv.osv):
             repair.write({'state': 'under_repair'})
         return True
 
-    def action_invoice_end(self, cr, uid, ids, context=None):
-        """ Writes repair order state to 'Ready' if invoice method is Before repair.
-        @return: True
-        """
-        repair_line = self.pool.get('mrp.repair.line')
-        for order in self.browse(cr, uid, ids, context=context):
-            val = {}
-            if (order.invoice_method == 'b4repair'):
-                val['state'] = 'ready'
-                repair_line.write(cr, uid, [l.id for
-                        l in order.operations], {'state': 'confirmed'}, context=context)
-            else:
-                pass
-            self.write(cr, uid, [order.id], val, context=context)
-        return True
-
     def action_repair_end(self, cr, uid, ids, context=None):
         """ Writes repair order state to 'To be invoiced' if invoice method is
         After repair else state is set to 'Ready'.
@@ -685,7 +665,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
      'product_uom_qty': lambda *a: 1,
     }
 
-    def onchange_operation_type(self, cr, uid, ids, type, guarantee_limit):
+    def onchange_operation_type(self, cr, uid, ids, type, guarantee_limit, company_id=False, context=None):
         """ On change of operation type it sets source location, destination location
         and to invoice field.
         @param product: Changed operation type.
@@ -696,27 +676,32 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
             return {'value': {
                 'location_id': False,
                 'location_dest_id': False
-                }
-            }
+                }}
+        warehouse_obj = self.pool.get('stock.warehouse')
+        location_id = self.pool.get('stock.location').search(cr, uid, [('usage','=','production')], context=context)
+        location_id = location_id and location_id[0] or False
+
+        if type == 'add':
+            # TOCHECK: Find stock location for user's company warehouse or 
+            # repair order's company's warehouse (company_id field is added in fix of lp:831583)
+            args = company_id and [('company_id', '=', company_id)] or []
+            warehouse_ids = warehouse_obj.search(cr, uid, args, context=context)
+            stock_id = False
+            if warehouse_ids:
+                stock_id = warehouse_obj.browse(cr, uid, warehouse_ids[0], context=context).lot_stock_id.id
+            to_invoice = (guarantee_limit and datetime.strptime(guarantee_limit, '%Y-%m-%d') < datetime.now())
 
-        product_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
-        if type != 'add':
             return {'value': {
-                'to_invoice': False,
-                'location_id': product_id,
-                'location_dest_id': False
-                }
-            }
+                'to_invoice': to_invoice,
+                'location_id': stock_id,
+                'location_dest_id': location_id
+                }}
 
-        stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
-        to_invoice = (guarantee_limit and
-                      datetime.strptime(guarantee_limit, '%Y-%m-%d') < datetime.now())
         return {'value': {
-            'to_invoice': to_invoice,
-            'location_id': stock_id,
-            'location_dest_id': product_id
-            }
-        }
+                'to_invoice': False,
+                'location_id': location_id,
+                'location_dest_id': False
+                }}
 
 mrp_repair_line()
 
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 16cdfc86b3d..098bc638110 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -15,6 +15,7 @@
                 <field name="address_id"/>
                 <field name="location_id"/>
                 <field name="location_dest_id"/>
+                <field name="company_id" groups="base.group_multi_company" invisible="1"/>
                 <field name="guarantee_limit"/>
                 <field name="state"/>
             </tree>
@@ -58,7 +59,7 @@
                                         <field name="location_id"/>
                                         <field name="location_dest_id"/>
                                         <newline/>
-                                        <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
+                                        <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
                                         <group colspan="2">
                                             <field name="to_invoice"/>
                                             <field name="invoiced"/>
@@ -76,7 +77,7 @@
                                  </notebook>
                             </form>
                             <tree string="Operations" editable="bottom">
-                                <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
+                                <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
                                 <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
                                 <field name='name'/>
                                 <field name="prodlot_id" />
@@ -159,6 +160,7 @@
                         <field name="picking_id"/>
                         <field name="location_id"/>
                         <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </page>
                     <page string="Notes">
                         <separator colspan="4" string="Internal Notes"/>
@@ -179,7 +181,7 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
-                  <group col='4' colspan='4'>
+                  <group>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
@@ -192,13 +194,15 @@
                        <field name="state" />
                   </group>
                   <newline/>
-                  <group expand="0" string="Group By..." colspan="10" col="8">
+                  <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit"/>
+                      <separator orientation="vertical" groups="base.group_multi_company"/>
+                      <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                   </group>
              </search>
           </field>
diff --git a/addons/mrp_repair/security/mrp_repair_security.xml b/addons/mrp_repair/security/mrp_repair_security.xml
new file mode 100644
index 00000000000..0b34310fc4e
--- /dev/null
+++ b/addons/mrp_repair/security/mrp_repair_security.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+<!-- Multi -->
+    <record model="ir.rule" id="mrp_repair_rule">
+        <field name="name">mrp_repair multi-company</field>
+        <field name="model_id" search="[('model','=','mrp.repair')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+    </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_repair/test/mrp_repair_cancel.yml b/addons/mrp_repair/test/mrp_repair_cancel.yml
new file mode 100644
index 00000000000..682a70fde5f
--- /dev/null
+++ b/addons/mrp_repair/test/mrp_repair_cancel.yml
@@ -0,0 +1,100 @@
+-
+  In order to test repair orders I have created stock move line record.
+-
+  !record {model: stock.move, id: stock_move_pcbasicpc0}:
+    company_id: base.main_company
+    date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
+    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'
+    product_id: product.product_product_pc1
+    product_qty: 1.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 1.0
+
+-
+  I start by creating new Repair order for "Basic PC" product and Invoice Method is "No Invoice".
+-
+  !record {model: mrp.repair, id: mrp_repair_rma2}:
+    address_id: base.res_partner_address_1
+    guarantee_limit: !eval datetime.today().strftime("%Y-%m-%d")
+    invoice_method: 'none'
+    partner_invoice_id: base.res_partner_address_1
+    location_dest_id: stock.stock_location_14
+    location_id: stock.stock_location_14
+    move_id: 'stock_move_pcbasicpc0'
+    name: RMA000055
+    operations:
+      - location_dest_id: stock.location_production
+        location_id: stock.stock_location_stock
+        name: '[HDD1] HDD Seagate 7200.8 80GB'
+        price_unit: 50.0
+        product_id: product.product_product_hdd1
+        product_uom: product.product_uom_unit
+        product_uom_qty: 1.0
+        state: draft
+        to_invoice: 1
+        type: add
+    fees_lines:
+      - name: 'HDD1 Seagate repair fees'
+        product_id: product.product_product_hdd1
+        product_uom_qty: 1.0
+        product_uom: product.product_uom_unit
+        price_unit: 50.0
+    partner_id: base.res_partner_9
+    product_id: product.product_product_pc1
+-
+  I confirm this Repair order.
+-
+  !workflow {model: mrp.repair, action: repair_confirm, ref: mrp_repair_rma2}
+-
+  I Cancel this Repair order.
+-
+  !python {model: mrp.repair.cancel}: |
+    context = {"lang": 'en_US', "active_model":"mrp.repair", "active_ids": [ref("mrp_repair_rma2")], "tz": False, "active_id":ref('mrp_repair_rma2')}
+    self.fields_view_get(cr, uid, False, "form", context)
+    self.cancel_repair(cr, uid, [ref("mrp_repair_rma2")], context=context)
+-
+  I check that Repair order is in "Cancel" state.
+-
+  !assert {model: mrp.repair, id: mrp_repair_rma2}:
+      - state == 'cancel'
+-
+  I Reopen the repair order as new.
+-
+  !python {model: mrp.repair}: |
+    self.action_cancel_draft(cr, uid, [ref('mrp_repair_rma2')])
+-
+  I change the Invoice method of the repair order to Before repair.
+-
+  !python {model: mrp.repair}: |
+    self.write(cr, uid, [ref('mrp_repair_rma2')], {'invoice_method': 'b4repair'})
+-
+  I confirm the Repair order again.
+-
+  !workflow {model: mrp.repair, action: repair_confirm, ref: mrp_repair_rma2}
+-
+  Repair order state to 'Ready'.
+-
+  !python {model: mrp.repair}: |
+    self.action_repair_ready(cr, uid, [ref('mrp_repair_rma2')], context=None)
+-
+  I click on "Create Invoice" button of this wizard to make invoice.
+-
+  !workflow {model: mrp.repair, action: action_invoice_create, ref: mrp_repair_rma2}
+-
+  I check that Invoice is created for this repair order.
+-
+  !python {model: mrp.repair}: |
+     repair_id = self.browse(cr, uid, [ref('mrp_repair_rma2')], context=context)[0]
+     assert repair_id.invoice_id.id, _("No invoice exists for this repair order.")
+-
+  I start the repairing process by click on "Start Repair" Button.
+-
+  !workflow {model: mrp.repair, action: action_repair_start, ref: mrp_repair_rma2}
+-
+  Repairing Process for product is Done and I End Repair process by click on "End Repair" button For Invoice Type b4repair.
+-
+  !workflow {model: mrp.repair, action: action_repair_end, ref: mrp_repair_rma2}
+
diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
index 881ef449405..27cc94da3a8 100644
--- a/addons/mrp_repair/test/test_mrp_repair.yml
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -1,14 +1,13 @@
-- |
+-
   In order to test "mrp_repair" module, I start with creating repair order, confirm it, and start repair.
-
-- |
+-
   Given that I have already  stock move line created.
 -
   !record {model: stock.move, id: stock_move_pcbasicpc0}:
     company_id: base.main_company
     date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_14
     location_id: stock.stock_location_stock
     name: '[PC1] Basic PC'
     product_id: product.product_product_pc1
@@ -16,8 +15,8 @@
     product_uom: product.product_uom_unit
     product_uos_qty: 1.0
 
-- |
-  I start by creating new Repair order for "Basic Pc" product.
+-
+  I start by creating new Repair order for "Basic PC" product.
 -
   !record {model: mrp.repair, id: mrp_repair_rma0}:
     address_id: base.res_partner_address_1
@@ -39,53 +38,81 @@
         state: draft
         to_invoice: 1
         type: add
+    fees_lines:
+      - name: 'HDD1 Seagate repair fees'
+        product_id: product.product_product_hdd1
+        product_uom_qty: 1.0
+        product_uom: product.product_uom_unit
+        price_unit: 50.0
     partner_id: base.res_partner_9
     product_id: product.product_product_pc1
-
-- |
+-
+  On change of product sets some values
+-
+  !python {model: mrp.repair}: |
+    self.onchange_product_id(cr, uid, [ref('mrp_repair_rma0')], product_id=False)
+-
+  On change of move id sets values of guarantee limit, source location, destination location, partner and partner address.
+-
+  !python {model: mrp.repair}: |
+    repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0]
+    self.onchange_move_id(cr, uid, [ref('mrp_repair_rma0')], False, repair_id.move_id)
+-
+  On change of operation type it sets source location, destination location and to invoice field
+-
+  !python {model: mrp.repair.line}: |
+    self.onchange_operation_type(cr, uid, [ref('mrp_repair_rma0')], type, False, ref('base.main_company'), {})
+-
+  On change of partner sets the values of partner address, partner invoice address and pricelist.
+-
+  !python {model: mrp.repair}: |
+    repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0]
+    self.onchange_partner_id(cr, uid, [ref('mrp_repair_rma0')], False, repair_id.address_id)
+-
+  On change of production lot sets the values of source location, destination location, move and guarantee limit
+-
+  !python {model: mrp.repair}: |
+    repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0]
+    self.onchange_lot_id(cr, uid, [ref('mrp_repair_rma0')], False, repair_id.product_id)
+-
   I check that Repair order is in "Draft" state.
 -
   !assert {model: mrp.repair, id: mrp_repair_rma0}:
       - state == 'draft'
-
-- |
+-
   I confirm This Repair order.
 -
   !workflow {model: mrp.repair, action: repair_confirm, ref: mrp_repair_rma0}
 
-- |
-  I start the repairing  process by   click on "Start Repair" Button.
+-
+  I start the repairing  process by click on "Start Repair" Button For Invoice Type After repair.
 -
   !workflow {model: mrp.repair, action: repair_ready, ref: mrp_repair_rma0}
 
-- |
+-
   I check that state is "Under Repair".
 -
   !assert {model: mrp.repair, id: mrp_repair_rma0}:
       - state == 'under_repair'
-- |
+-
   Repairing Process for product is Done and I End Repair process by click on "End Repair" button.
 -
   !workflow {model: mrp.repair, action: action_repair_end, ref: mrp_repair_rma0}
-- |
+
+-
   I select invoiced after repair option in this "RMA00004" Repair order.
   so I create Invoice by click on "Make Invoice" wizard.
 -
   !record {model: mrp.repair.make_invoice, id: mrp_repair_make_invoice_0}:
     group: 1
-- |
+-
   I click on "Create Invoice" button of this wizard to make invoice.
 -
   !python {model: mrp.repair.make_invoice}: |
     self.make_invoices(cr, uid, [ref("mrp_repair_make_invoice_0")], {"active_ids": [ref("mrp_repair.mrp_repair_rma0")]})
-- |
+-
   I check that Invoice is created for this repair order.
 -
   !python {model: mrp.repair}: |
-     obj_lines = self.pool.get('account.invoice.line')
-     inv_obj = self.pool.get('account.invoice')
      repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0]
-     invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_id.id)])
-     invoice_id = inv_obj.browse(cr, uid, invoice_ids)[0]
-
-     assert repair_id.partner_id.id == invoice_id.partner_id.id, "No invoice existing for the same partner"
+     assert repair_id.invoice_id.id, _("No invoice exists for this repair order")
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index 52fd3758fbc..5c3db5436d5 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'MRP Sub Product - To produce several products from one production order',
+    'name': 'MRP Subproducts',
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
diff --git a/addons/mrp_subproduct/i18n/ab.po b/addons/mrp_subproduct/i18n/ab.po
index 73c1a89e2ec..1971e166b9c 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 32265c67d33..446818abac0 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ee4feca3076..1ae0eae07a5 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fa45fa3d051..64a19ac8b11 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e46560d8f56..1a0678cb275 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -29,6 +29,9 @@ msgid ""
 "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
@@ -38,13 +41,15 @@ msgstr "sub productes"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Ordre de fabricació"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 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ó"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -64,7 +69,7 @@ msgstr "Tipus de quantitat"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Llista de material"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -79,6 +84,15 @@ msgid ""
 "    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"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
@@ -93,7 +107,7 @@ msgstr "Llista de materials (LdM)"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Error! No podeu crear llistes de material recursives."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -108,12 +122,12 @@ msgstr "Variable"
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "La quantitat ordenada no pot ser negativa o zero!"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "Sub producte"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_subproduct/i18n/cs.po
index 618670d3d54..13af1d67a76 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9d3b67aae41..140e9edd42f 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -147,12 +147,3 @@ msgstr "Fixiert"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "MRP untergeordnetes Produkt"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index 823b5315f7d..7adedb5d09e 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -147,12 +147,3 @@ msgstr "Fijo"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "Subproducto MRP"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_subproduct/i18n/es_AR.po
index 8af44440bfd..4ebcec2a64d 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/es_EC.po b/addons/mrp_subproduct/i18n/es_EC.po
index b6ceffe1713..0779333330b 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -28,6 +28,9 @@ msgid ""
 "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
@@ -37,13 +40,15 @@ msgstr "sub productos"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Órden de producción"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 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"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -63,7 +68,7 @@ msgstr "Tipo de cantidad"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Lista de material"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -78,6 +83,15 @@ msgid ""
 "    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"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
@@ -92,7 +106,7 @@ msgstr "Lista de materiales (LdM)"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "¡Error! No puede crear Listas de Material recursivas"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -107,12 +121,12 @@ msgstr "Variable"
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "¡Cantidad ordenada no puede ser negativa o cero!"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "Sub producto"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/mrp_subproduct/i18n/es_MX.po b/addons/mrp_subproduct/i18n/es_MX.po
new file mode 100644
index 00000000000..adafa31e20b
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/es_MX.po
@@ -0,0 +1,149 @@
+# 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: 2011-01-03 16:58+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: 2011-09-05 05:41+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. 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
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+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"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidad producto"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products: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
+#: model:ir.module.module,description:mrp_subproduct.module_meta_information
+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"
+"    "
+
+#. 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
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "¡Error! No puede crear Listas de Material recursivas."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub producto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#~ 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"
diff --git a/addons/mrp_subproduct/i18n/es_VE.po b/addons/mrp_subproduct/i18n/es_VE.po
new file mode 100644
index 00000000000..adafa31e20b
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/es_VE.po
@@ -0,0 +1,149 @@
+# 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: 2011-01-03 16:58+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: 2011-09-05 05:41+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. 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
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+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"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidad producto"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products: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
+#: model:ir.module.module,description:mrp_subproduct.module_meta_information
+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"
+"    "
+
+#. 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
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "¡Error! No puede crear Listas de Material recursivas."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub producto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#~ 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"
diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_subproduct/i18n/et.po
index 9924feaf4ea..a8a7cb5f027 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b34fa2de266..a76277ff17b 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -29,16 +29,18 @@ msgid ""
 "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 ""
+msgstr "Alatason tuotteet"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Valmistustilaus"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
@@ -59,12 +61,12 @@ msgstr ""
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
 msgid "Quantity Type"
-msgstr ""
+msgstr "Määrän tyyppi"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Osaluettelo"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -83,37 +85,37 @@ msgstr ""
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Tuotteen mittayksikkö"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,bom_id:0
 msgid "BoM"
-msgstr ""
+msgstr "Osaluettelo"
 
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Virhe! Et voi luoda itseään toistavaa osaluetteloa."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "Sub Products"
-msgstr ""
+msgstr "Alituotteet"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Variable"
-msgstr ""
+msgstr "Muuttuja"
 
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Tilattu määrä ei voi olle negatiivinen tai nolla !"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "Alatason tuote"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_subproduct/i18n/fr.po
index b47b07b2251..57c27193ecb 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -139,9 +139,3 @@ msgstr "Fixe"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
 #~ "spéciaux !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/mrp_subproduct/i18n/gl.po b/addons/mrp_subproduct/i18n/gl.po
index 3d8970268b4..e9686d761b0 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f60457b4361..fc2966f7950 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6a549086fed..82f50303320 100644
--- a/addons/mrp_subproduct/i18n/hu.po
+++ b/addons/mrp_subproduct/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-02-02 12:30+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2bc5a346c19..2242d4be54f 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2a6e56812ed..4ec73307669 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 235793a9736..ecb70e93e1d 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 32265c67d33..446818abac0 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 249719378da..9258b81417e 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_subproduct/i18n/nl.po
index d4e740cf6f9..54c7baadbec 100644
--- a/addons/mrp_subproduct/i18n/nl.po
+++ b/addons/mrp_subproduct/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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_subproduct/i18n/nl_BE.po
index 0cb0e8a9189..79d89d508f3 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ade465ba93c..b0b9170c1c3 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c69dde066ff..acf569f534c 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c064d46cac7..8ec1ced1ec6 100644
--- a/addons/mrp_subproduct/i18n/pt.po
+++ b/addons/mrp_subproduct/i18n/pt.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-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-09 08:35+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-09 17:33+0000\n"
+"Last-Translator: DReis <Unknown>\n"
 "Language-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-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -97,7 +97,7 @@ msgstr "UOM"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Erro! Não pode criar BoM's recursivos."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -130,15 +130,6 @@ msgstr "Fixo"
 #~ msgid "MRP Sub Product"
 #~ msgstr "Sub Produto MRP"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitetura de vista"
 
diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_subproduct/i18n/pt_BR.po
index 0ac514ef92c..abfc1e85e04 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_subproduct/i18n/ro.po
index 3d8bc719c10..925032ea80d 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a7c608520cf..a7ce713d567 100644
--- a/addons/mrp_subproduct/i18n/ru.po
+++ b/addons/mrp_subproduct/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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
 msgid "Product"
-msgstr "Продукт"
+msgstr "Продукция"
 
 #. module: mrp_subproduct
 #: sql_constraint:mrp.bom:0
diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_subproduct/i18n/sk.po
index d50db7aa5d0..3a6add247db 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ad85077180b..bad4303c9aa 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -132,12 +132,3 @@ msgstr "Stalno"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "Načrtovanje virov materiala za polproizvod"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
diff --git a/addons/mrp_subproduct/i18n/sq.po b/addons/mrp_subproduct/i18n/sq.po
index 66be9dc40a8..fb63e640a22 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 185ce9acbb4..de6c2648332 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3a2205ed3b1..ac2c8961b0c 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0969994dd47..758860e7d00 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d680f2fd382..0cb37ffa670 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f08acb1d088..94189a14167 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -28,6 +28,9 @@ msgid ""
 "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
@@ -37,13 +40,13 @@ msgstr "Alt Ürünler"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Üretim Emri"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 msgid ""
 "MRP Sub Product - To produce several products from one production order"
-msgstr ""
+msgstr "MRP Alt Ürünü - Bir üretim emrinden birden fazla ürün üretimi için"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -63,7 +66,7 @@ msgstr "Miktar Tipi"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Malzeme Faturası"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -78,6 +81,14 @@ msgid ""
 "    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"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
@@ -87,12 +98,12 @@ msgstr "Birim"
 #. module: mrp_subproduct
 #: field:mrp.subproduct,bom_id:0
 msgid "BoM"
-msgstr ""
+msgstr "BoM (Malzeme Faturası)"
 
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Hata! Yinelemeli BoM oluşturamazsınız."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -102,17 +113,17 @@ msgstr "Alt Ürünler"
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Variable"
-msgstr ""
+msgstr "Değişken"
 
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Sipariş miktarı negatif veya sıfır olamaz!"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "Alt Ürün"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_subproduct/i18n/uk.po
index 947c67df23f..932424dbbd3 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e127fc40d59..795dd5a3208 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dac27c69c3b..9a0cab63ca1 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2010-08-03 09:02+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -28,6 +28,8 @@ msgid ""
 "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
@@ -37,13 +39,13 @@ msgstr "子产品"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "生产单"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 msgid ""
 "MRP Sub Product - To produce several products from one production order"
-msgstr ""
+msgstr "MRP副产品 - 一张生产单产出多种产品"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -63,7 +65,7 @@ msgstr "数量类型"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "物料清单"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -100,7 +102,7 @@ msgstr "物料清单"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "错误!你不能创建递归的物料清单"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -115,12 +117,12 @@ msgstr "可变的"
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "订单数量不能为0或者负数!"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_subproduct/i18n/zh_TW.po
index 37f3db4fe08..6c4a25555e4 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 130411987c1..f6e18ead5e9 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -21,19 +21,23 @@
 
 from osv import fields
 from osv import osv
+import decimal_precision as dp
 
 class mrp_subproduct(osv.osv):
     _name = 'mrp.subproduct'
     _description = 'Sub Product'
     _columns={
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Product Qty', required=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', 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.\
+  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.)'"),
         'bom_id': fields.many2one('mrp.bom', 'BoM'),
     }
     _defaults={
-        'subproduct_type': lambda *args: 'fixed'
+        'subproduct_type': 'variable',
     }
 
     def onchange_product_id(self, cr, uid, ids, product_id, context=None):
@@ -97,5 +101,27 @@ class mrp_production(osv.osv):
                 self.pool.get('stock.move').create(cr, uid, data)
         return picking_id
 
+    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'.
+        :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.
+        """
+        sub_obj = self.pool.get('mrp.subproduct')
+        move_obj = self.pool.get('stock.move')
+        production_obj = self.pool.get('mrp.production')
+        production_browse = production_obj.browse(cr, uid, production_id, context=context)
+        move_browse = move_obj.browse(cr, uid, move_id, context=context)
+        subproduct_factor = 1
+        sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id), ('subproduct_type', '=', 'variable')], context=context)
+        if sub_id:
+            subproduct_record = sub_obj.browse(cr ,uid, sub_id[0], context=context)
+            if subproduct_record.bom_id.product_qty:
+                subproduct_factor = subproduct_record.product_qty / subproduct_record.bom_id.product_qty
+                return subproduct_factor
+        return super(mrp_production, self)._get_subproduct_factor(cr, uid, production_id, move_id, context=context)
+
 mrp_production()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 9fc5955a18b..70b3ea8efaa 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <notebook>
+             <notebook position="inside">
                  <page string="Sub Products" position="inside">
                      <field colspan="4" name="sub_products" nolabel="1" widget="one2many_list">
                          <tree string="sub products"  editable="top">
diff --git a/addons/mrp_subproduct/test/mrp_subproduct.yml b/addons/mrp_subproduct/test/mrp_subproduct.yml
index 43bb6e7247e..2d05a448cde 100644
--- a/addons/mrp_subproduct/test/mrp_subproduct.yml
+++ b/addons/mrp_subproduct/test/mrp_subproduct.yml
@@ -106,14 +106,11 @@
 -
   !record {model: mrp.production, id: mrp_production_mo0}:
     bom_id: mrp_bom_woodenchair0
-    company_id: base.main_company
     date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_stock
     location_src_id: stock.stock_location_stock
-    name: MO/00004
     product_id: product_product_woodenchair0
     product_qty: 10.0
-    product_uom: product.product_uom_unit
     product_uos_qty: 0.0
 -
   I compute the data of production order.
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index d82f0e1eb7c..636ff1cac29 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Multi-Company',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "expert",
     'description': """
 This module is for managing a multicompany environment.
diff --git a/addons/multi_company/i18n/ar.po b/addons/multi_company/i18n/ar.po
index 2d32200dac3..ef7b4b5c784 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 802a86ed69d..f6f119eb88c 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9f20b05c87c..9c76c0e53b9 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d0a1e08bbd6..21f9b6d516a 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ef887e3a7a8..450fb8379b3 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 04a19efe4ab..73a6618eb20 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -113,190 +113,3 @@ msgstr ""
 "    Dieses Modul bietet dabei die Grundlage für erweiterte Multicompany "
 "Anwendungen.\n"
 "    "
-
-#~ msgid "Default Company"
-#~ msgstr "Standard Mandant"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Die USt. scheint falsch zu sein."
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Sollten Sie zwischenzeitlichn bezahlt haben, beachten Sie bitte dieses Mail "
-#~ "als hinfällig. Bei Fragen kontaktieren Sie bitte usere Buchhaltung."
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "Von dieser Regel betroffenes Objekt"
-
-#~ 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 ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "Mit dieses Module können die Standardwerte jedes Objektes leicht verwaltet "
-#~ "werden.\n"
-#~ "    "
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Der Datensatz kann über das Name Feld leicht gefunden werden"
-
-#~ msgid "Multi company"
-#~ msgstr "Mehrere Mandanten"
-
-#~ msgid "Main Company"
-#~ msgstr "Hauptfirma"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Mandant, in dem dieser Datensatz gespeichert wrden soll"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Fehler! Sie können keine rekursiven Betriebe erzeugen."
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_company.default"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Die mit dem Benutzer verbundene Gesellschaft"
-
-#~ msgid "Sequence"
-#~ msgstr "Reihenfolge"
-
-#~ msgid "Expression"
-#~ msgstr "Ausdruck"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Fehler! Sie können keine rekursive Kategorien definieren."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Fehler: Falscher EAN code"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Standard Mandant für dieses Objekt"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Ausdruck, muss wahr sein um zu stimmen."
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (Kopie)"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Fehler: Verkauseinheit (VE) sollte in einer anderen Kategorie sein als "
-#~ "Mengeneinheit (ME)"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fehler: Die Standard Mengeneinheit sowie die  Mengeneinheit bei der "
-#~ "Beschaffung muss in derselben Kategorie sein."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Die ausgew. Firma ist nicht zugelassen für diesen Benutzer"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Sales Credit Note Journal - (OpenERP US)"
-#~ msgstr "Journal Kundengutschriften - (OpenERP US)"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "2 Benuzter können nicht den gleichen Login Code haben."
-
-#~ msgid "Checks Journal - (OpenERP IN)"
-#~ msgstr "Journal Schecks - (OpenERP IN)"
-
-#~ msgid "Cash Journal - (OpenERP IN)"
-#~ msgstr "Journal Barkasse - (OpenERP IN)"
-
-#~ msgid "Expenses Journal - (OpenERP IN)"
-#~ msgstr "Journal Aufwendungen - (OpenERP IN)"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Expenses Journal - (OpenERP US)"
-#~ msgstr "Journal Aufwendungen (OpenERP US)"
-
-#~ msgid "Expenses Journal - (OpenERP BE)"
-#~ msgstr "Journal Aufwendungen - (OpenERP BE)"
-
-#~ msgid "Sales Journal - (OpenERP US)"
-#~ msgstr "Journal Verkauf - (OpenERP US)"
-
-#~ msgid "Sales Journal - (OpenERP BE)"
-#~ msgstr "Journal Verkauf  - (OpenERP BE)"
-
-#~ msgid "Bank Journal - (OpenERP US)"
-#~ msgstr "Journal Bank - (OpenERP US)"
-
-#~ msgid "Sales Credit Note Journal - (OpenERP IN)"
-#~ msgstr "Journal Kundengutschriften - (OpenERP IN)"
-
-#~ msgid "Checks Journal - (OpenERP US)"
-#~ msgstr "Journal Schecks - (OpenERP US)"
-
-#~ msgid "Cash Journal - (OpenERP US)"
-#~ msgstr "Journal Barkasse - (OpenERP US)"
-
-#~ msgid "Checks Journal - (OpenERP BE)"
-#~ msgstr "Journal Schecks - (OpenERP BE)"
-
-#~ msgid "Cash Journal - (OpenERP BE)"
-#~ msgstr "Journal Barkasse - (OpenERP BE)"
-
-#~ msgid "Expenses Credit Notes Journal - (OpenERP US)"
-#~ msgstr "Journal Lieferantengutschriften - (OpenERP US)"
-
-#~ msgid "The code of the journal must be unique per company !"
-#~ msgstr ""
-#~ "Die Kurzbezeichnung des Journals sollte eindeutig sein je Unternehmen "
-#~ "(Mandant)."
-
-#~ msgid "Sales Journal - (OpenERP IN)"
-#~ msgstr "Journal Verkauf - (OpenERP US)"
-
-#~ msgid "Expenses Credit Notes Journal - (OpenERP BE)"
-#~ msgstr "Journal Lieferantengutschriften - (OpenERP BE)"
-
-#~ msgid "Sales Credit Note Journal - (OpenERP BE)"
-#~ msgstr "Journal Kundengutschriften - (OpenERP BE)"
-
-#~ msgid "Expenses Credit Notes Journal - (OpenERP IN)"
-#~ msgstr "Journal Lieferantengutschriften - (OpenERP IN)"
-
-#~ msgid "Bank Journal - (OpenERP IN)"
-#~ msgstr "Journal Bank - (OpenERP IN)"
-
-#~ msgid "The name of the journal must be unique per company !"
-#~ msgstr "Die Journalbezeichnung sollte pro Unternehmen eindeutig sein."
-
-#~ msgid "Bank Journal - (OpenERP BE)"
-#~ msgstr "Journal Bank - (OpenERP BE)"
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index 38c9927d85d..8de436cb1a5 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -110,159 +110,3 @@ msgstr ""
 "    El módulo de multicompañía permite gestionar un entorno multicompañía.\n"
 "    Este módulo sirve de base a los otros módulos multicompañía.\n"
 "    "
-
-#~ msgid "Default Company"
-#~ msgstr "Compañía por defecto"
-
-#~ msgid "Object"
-#~ msgstr "Objeto"
-
-#~ 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 "The VAT doesn't seem to be correct."
-#~ msgstr "El IVA no parece ser correcto"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Su pago se ha llevado a cabo después de este mensaje fue enviado, por favor "
-#~ "considere el actual como nulas. No dude en ponerse en contacto con nuestro "
-#~ "departamento de contabilidad"
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "El objeto afectado por estas reglas."
-
-#~ 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 ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo añade la posibilidad de administrar fácilmente \n"
-#~ "   el valor por defecto para cada objeto\n"
-#~ "    "
-
-#~ msgid "Multi company"
-#~ msgstr "Multi compañía"
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Dele un nombre para encontrar fácilmente un registro."
-
-#~ msgid "Main Company"
-#~ msgstr "Empresa Principal"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Compañía donde se guardará el registro actual."
-
-#~ 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 "Name"
-#~ msgstr "Nombre"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "¡Error! No se pueden crear compañías recursivas."
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_compañía.defecto"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Compañía en la que pertenece el usuario."
-
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
-#~ msgid "Expression"
-#~ msgstr "Expresión"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "¡Error! No puede crear categorías recursivas."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Código EAN erróneo"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Compañía por defecto por objeto"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Una expresión, debe ser cierta para concordar."
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (copia)"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "La compañía seleccionada no está entre las compañías permitidas para este "
-#~ "usuario."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivos."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Sales Journal - (OpenERP US)"
-#~ msgstr "Diario de ventas - (OpenERP US)"
-
-#~ msgid "Sales Credit Note Journal - (OpenERP US)"
-#~ msgstr "Diario de notas de crédito - (OpenERP US)"
-
-#~ msgid "Checks Journal - (OpenERP IN)"
-#~ msgstr "Diario de cheques - (OpenERP IN)"
-
-#~ msgid "Cash Journal - (OpenERP IN)"
-#~ msgstr "Diario de efectivo - (OpenERP IN)"
-
-#~ msgid "Cash Journal - (OpenERP US)"
-#~ msgstr "Diario de efectivo -  (OpenERP US)"
-
-#~ msgid "Checks Journal - (OpenERP BE)"
-#~ msgstr "Diario de cheques -  (OpenERP BE)"
-
-#~ msgid "Expenses Journal - (OpenERP US)"
-#~ msgstr "Diario de gastos - (OpenERP US)"
-
-#~ msgid "Expenses Journal - (OpenERP BE)"
-#~ msgstr "Diario de gastos - (OpenERP BE)"
-
-#~ msgid "Expenses Journal - (OpenERP IN)"
-#~ msgstr "Diario de gastos - (OpenERP IN)"
-
-#~ msgid "Sales Journal - (OpenERP IN)"
-#~ msgstr "Diario de ventas -  (OpenERP IN)"
-
-#~ msgid "Sales Journal - (OpenERP BE)"
-#~ msgstr "Diario de ventas -  (OpenERP BE)"
-
-#~ msgid "Bank Journal - (OpenERP US)"
-#~ msgstr "Diario de bancos -  (OpenERP US)"
-
-#~ msgid "Cash Journal - (OpenERP BE)"
-#~ msgstr "Diario de efectivo -  (OpenERP BE)"
-
-#~ msgid "Checks Journal - (OpenERP US)"
-#~ msgstr "Diario de cheques -  (OpenERP US)"
-
-#~ msgid "Bank Journal - (OpenERP IN)"
-#~ msgstr "Diario de bancos -  (OpenERP IN)"
-
-#~ msgid "Bank Journal - (OpenERP BE)"
-#~ msgstr "Diario de bancos -  (OpenERP BE)"
diff --git a/addons/multi_company/i18n/es_EC.po b/addons/multi_company/i18n/es_EC.po
index a4e1cc287f8..975b99366d9 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -92,100 +92,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "El objeto afectado por estas reglas."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid ""
-#~ "Error: 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 "The VAT doesn't seem to be correct."
-#~ msgstr "El IVA no parece ser correcto"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Su pago se ha llevado a cabo después de este mensaje fue enviado, por favor "
-#~ "considere el actual como nulas. No dude en ponerse en contacto con nuestro "
-#~ "departamento de contabilidad"
-
-#~ msgid "Default Company"
-#~ msgstr "Compañía por defecto"
-
-#~ msgid "Object"
-#~ msgstr "Objeto"
-
-#~ msgid ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo añade la posibilidad de administrar fácilmente \n"
-#~ "   el valor por defecto para cada objeto\n"
-#~ "    "
-
-#~ msgid "Main Company"
-#~ msgstr "Empresa Principal"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Compañía donde se guardará el registro actual."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Name"
-#~ msgstr "Nombre"
-
-#~ 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 "Error! You can not create recursive companies."
-#~ msgstr "¡Error! No se pueden crear compañías recursivas."
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Dele un nombre para encontrar fácilmente un registro."
-
-#~ msgid "Multi company"
-#~ msgstr "Multi compañía"
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_compañía.defecto"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Compañía en la que pertenece el usuario."
-
-#~ msgid "Expression"
-#~ msgstr "Expresión"
-
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "¡Error! No puede crear categorías recursivas."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Código EAN erróneo"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Una expresión, debe ser cierta para concordar."
-
-#~ msgid "Default company per Object"
-#~ msgstr "Compañía por defecto por objeto"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (copia)"
diff --git a/addons/multi_company/i18n/es_MX.po b/addons/multi_company/i18n/es_MX.po
new file mode 100644
index 00000000000..91c72f3ccd2
--- /dev/null
+++ b/addons/multi_company/i18n/es_MX.po
@@ -0,0 +1,112 @@
+# 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:13+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:44+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"\n"
+"Fecha: %(date)s\n"
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"En el archivo adjunto encontrará un recordatorio de todas las facturas "
+"pendientes de pago, por un importe total a pagar de:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Gracias,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr "Ofertas Odoo"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Returning"
+msgstr "Retorno"
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr "Multi-Compañías"
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr "Multi compañía"
+
+#. 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 "Compañía por defecto por objeto"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr "Oferta Odoo"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "Concordancia"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid ""
+"\n"
+"    Multicompany module is for managing a multicompany environment.\n"
+"    This module is the base module for other multicompany modules.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de multicompañía permite gestionar un entorno multicompañía.\n"
+"    Este módulo sirve de base a los otros módulos multicompañía.\n"
+"    "
diff --git a/addons/multi_company/i18n/es_VE.po b/addons/multi_company/i18n/es_VE.po
new file mode 100644
index 00000000000..91c72f3ccd2
--- /dev/null
+++ b/addons/multi_company/i18n/es_VE.po
@@ -0,0 +1,112 @@
+# 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:13+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:44+0000\n"
+"X-Generator: Launchpad (build 13830)\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 ""
+"\n"
+"Fecha: %(date)s\n"
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"En el archivo adjunto encontrará un recordatorio de todas las facturas "
+"pendientes de pago, por un importe total a pagar de:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Gracias,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr "Ofertas Odoo"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Returning"
+msgstr "Retorno"
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr "Multi-Compañías"
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr "Multi compañía"
+
+#. 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 "Compañía por defecto por objeto"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr "Oferta Odoo"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "Concordancia"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid ""
+"\n"
+"    Multicompany module is for managing a multicompany environment.\n"
+"    This module is the base module for other multicompany modules.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de multicompañía permite gestionar un entorno multicompañía.\n"
+"    Este módulo sirve de base a los otros módulos multicompañía.\n"
+"    "
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index f91209a4bc1..7b3efef7d8a 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -91,56 +91,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Viga: vaikimisi mõõtühik ja ostu mõõtühik peavad olema samast kategooriast."
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Käibemaksukohuslase numbris on viga"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ 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 "Main Company"
-#~ msgstr "Emaettevõte"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Viga: TÜ kategooria peab erinema MÜ kategooriast"
-
-#~ msgid "Name"
-#~ msgstr "Nimi"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Viga! Sa ei saa luua rekursiivseid ettevõtteid."
-
-#~ msgid "Sequence"
-#~ msgstr "Tsükkel"
-
-#~ msgid "Expression"
-#~ msgstr "Avaldis"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Viga! Sa ei saa luua rekursiivseid kategooriaid."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Viga: Vigane EAN kood"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (koopia)"
-
-#~ msgid "Default Company"
-#~ msgstr "Vaikimisi kompanii"
diff --git a/addons/multi_company/i18n/fi.po b/addons/multi_company/i18n/fi.po
index e1d757d21c7..d5165e0c699 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -91,38 +91,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "ALV ei vaikuta olevan oikea."
-
-#~ 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 nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
-#~ msgid "Name"
-#~ msgstr "Nimi"
-
-#~ msgid "Sequence"
-#~ msgstr "Jakso"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Virhe! Et voi luoda rekursiivisia kategorioita."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Virhe: Virheellinen EAN-koodi"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (kopio)"
-
-#~ msgid "Main Company"
-#~ msgstr "Pääyritys"
-
-#~ msgid "Expression"
-#~ msgstr "Ilmaus"
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index e41c5b0a586..199a74ba90d 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-11 16:49+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -111,90 +111,3 @@ msgstr ""
 "société.\n"
 "    Ce module est la base pour les autres modules multi-société.\n"
 "    "
-
-#~ msgid "Default Company"
-#~ msgstr "Société par défaut"
-
-#~ msgid "Object"
-#~ msgstr "Objet"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
-#~ "faire partie de la même catégorie"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "La TVA ne semble pas correcte"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de l'objet invalide dans l'action défini"
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "Objet affecté par cette règle"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
-#~ "caractères spéciaux !"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Société physique ou sera stocké cet enregistrement"
-
-#~ msgid "Main Company"
-#~ msgstr "Société Principale"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue !"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_company.default"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Société ou l'utilisateur sera connecté"
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Nommer le facilement pour trouver l'enregistrement"
-
-#~ msgid "Multi company"
-#~ msgstr "Multi société"
-
-#~ msgid "Sequence"
-#~ msgstr "Séquence"
-
-#~ msgid "Expression"
-#~ msgstr "Expression"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de catégories récursives"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Erreur: code EAN non valide"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Société par défaut par Objet"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Expression, doit être Vrai pour correspondre"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (copie)"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "La société choisie ne fait pas partie des sociétés autorisées pour cet "
-#~ "utilisateur"
-
-#~ msgid "Sales Credit Note Journal - (OpenERP US)"
-#~ msgstr "Journal des avoirs sur commandes de vente - (OpenERP US)"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "VOus ne pouvez pas avoir deux utilsiateurs avec le même login !"
diff --git a/addons/multi_company/i18n/gl.po b/addons/multi_company/i18n/gl.po
index ee89f547143..e0b7f6501f5 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c41eaeac5df..024de2fcf48 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dafe8326cec..00706206f40 100644
--- a/addons/multi_company/i18n/hu.po
+++ b/addons/multi_company/i18n/hu.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-02 12:36+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 30ecab16c4a..fbfd252bf37 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ac1b5422641..83d1a85fe30 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -64,7 +64,7 @@ msgstr "Offerte ODOO"
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Ritorno"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
@@ -111,102 +111,3 @@ msgstr ""
 "aziendale.\n"
 "    Questo modulo è il modulo base per gli altri moduli multiaziendali.\n"
 "    "
-
-#~ msgid "Default Company"
-#~ msgstr "Azienda predefinita"
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_azienda.default"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Azienda con la quale l'utente è connesso"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Azienda predefinitaa per Oggetto"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Espressione, deve essere Vero per corrispondere"
-
-#~ msgid "Object"
-#~ msgstr "Oggetto"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Errore: l'unità di misura predefinita e l'unità di misura d'acquisto devono "
-#~ "trovarsi nella stessa categoria"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "La Partita IVA non sembra essere corretta."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome modello non valido nella definizione dell'azione."
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Se il vostro pagamento è già stato effettuato prima della spedizione di "
-#~ "questa mail, per favore considerate nullo il presente avviso. Non esitate a "
-#~ "contattare i nostri uffici contabili."
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "Oggetti interessati da queste regole"
-
-#~ 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 ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "Questo modulo aggiunge la possibilità di gestire facilmente \n"
-#~ "    il valore predefinito per ogni oggetto\n"
-#~ "    "
-
-#~ msgid "Main Company"
-#~ msgstr "Azienda Principale"
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Assegna un nome per trovare facilmente un record"
-
-#~ msgid "Multi company"
-#~ msgstr "Multi azienda"
-
-#~ msgid "Expression"
-#~ msgstr "Espressione"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Azienda dove salvare il record corrente"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Errore: L'Unità di misura per la Vendita deve essere in una categoria "
-#~ "diversa da quella dell'Unità di misura"
-
-#~ msgid "Name"
-#~ msgstr "Nome"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Attenzione: non puoi creare aziende ricorsive"
-
-#~ msgid "Sequence"
-#~ msgstr "Sequenza"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Errore: non puoi creare Categorie ricorsive"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Errore: codice EAN non valido"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (copia)"
diff --git a/addons/multi_company/i18n/lt.po b/addons/multi_company/i18n/lt.po
index 17686bb952b..cc49852b8ad 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b69e7d83cbc..87de6ffb43d 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 64afe3dc298..255e38ee4e2 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -91,98 +91,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Default Company"
-#~ msgstr "Үндсэн компани"
-
-#~ msgid "Object"
-#~ msgstr "Объект"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "НӨАТ буруу байж магадгүй."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "Энэ дүрэмд хамрагдах объект"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "Энэ модуль нь объект бүрт үндсэн утгыг хялбар \n"
-#~ "     удирдах боломж нэмнэ.\n"
-#~ "    "
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Бичлэгийг хялбар олохын тулд нэрлэх хэрэгтэй"
-
-#~ msgid "Multi company"
-#~ msgstr "Олон компани"
-
-#~ msgid "Main Company"
-#~ msgstr "Үндсэн компани"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Алдаа: Борлуулах нэгжийн ангилал хэмжих нэгжийнхээс өөр байх ёстой"
-
-#~ msgid "Name"
-#~ msgstr "Нэр"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_company.default"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Хэрэглэгч холбогдсон компани"
-
-#~ msgid "Sequence"
-#~ msgstr "Дугаарлалт"
-
-#~ msgid "Expression"
-#~ msgstr "Илэрхийлэл"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Алдаа! Рекурсив ангилал үүсгэж болохгүй."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Алдаа: Буруу зураасан код"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Тулгахын тулд илэрхийлэл True байх ёстой"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (Хуулах)"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Энэ бичлэгийг хадгалах компани"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Объект бүрийн үндсэн компани"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Энэ имэйлийн дараа таны төлбөр хийгдэх болно, одоогийнхийг хүчингүйд тооцно "
-#~ "уу. Манай санхүүгийн хэлтэст санаа зоволгүй хандаарай."
diff --git a/addons/multi_company/i18n/nl.po b/addons/multi_company/i18n/nl.po
index bd3138b66f8..751e8225c83 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -110,37 +110,3 @@ msgstr ""
 "    Multicompany module is voor het beheren van een multicompany omgeving.\n"
 "    Deze module is de basis module voor andere multicompany modules.\n"
 "    "
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fout: de standaardeenheid en de inkoopeenheid moet in de zelfde categorie "
-#~ "liggen."
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Fout ! U kunt geen recursieve categorieën maken."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw !"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Fout: verkoopeenheid moet in andere categorie staan dan standaardeenheid"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Fout ! U kunt geen recursieve bedrijven maken."
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "De gekozen bedrijf is niet toegestaan voor deze gebruiker"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Fout: ongeldige ean code"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Fout ! U kunt geen recursieve deelnemers maken."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
diff --git a/addons/multi_company/i18n/oc.po b/addons/multi_company/i18n/oc.po
index ca52086700a..307ed008b8e 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -91,28 +91,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Object"
-#~ msgstr "Objècte"
-
-#~ msgid "Multi company"
-#~ msgstr "Multisocietat"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid per l'arquitectura de la vista"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_company.default"
-
-#~ msgid "Sequence"
-#~ msgstr "Sequéncia"
-
-#~ msgid "Expression"
-#~ msgstr "Expression"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (còpia)"
diff --git a/addons/multi_company/i18n/pl.po b/addons/multi_company/i18n/pl.po
index 01469217a1c..c6c42a34336 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -91,122 +91,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
-
-#~ msgid "Default Company"
-#~ msgstr "Domyślna firma"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr ""
-#~ "Numer NIP wygląda na niepoprawny. Wpisuj numer z PL na początku. Bez kresek "
-#~ "i spacji."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "Obiekt podlegający tej regule"
-
-#~ 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 "Object"
-#~ msgstr "Obiekt"
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Nazwij to, aby łatwiej odszukać rekord"
-
-#~ msgid "Multi company"
-#~ msgstr "Wielofirmowość"
-
-#~ msgid "Main Company"
-#~ msgstr "Główna firma"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Błąd: JS musi być innej kategorii niż JM."
-
-#~ msgid "Name"
-#~ msgstr "Nazwa"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Firma, do której użytkownik jest podłączony"
-
-#~ msgid "Sequence"
-#~ msgstr "Numeracja"
-
-#~ msgid "Expression"
-#~ msgstr "Wyrażenie"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych kategorii."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Błąd: Niedozwolony kod EAN"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Domyślna firma dla obiektu"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Wyrażenie, musi być Prawdą aby było spełnione"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (kopia)"
-
-#~ msgid ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ten moduł daje możliwość łatwego zarządzania \n"
-#~ "   standardową wartością dla każdego objektu\n"
-#~ "    "
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Wybrana firma nie jest dozwolona dla tego użytkownika"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Sales Credit Note Journal - (OpenERP US)"
-#~ msgstr "Dziennik korekt sprzedaży - (OpenERP US)"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Nie może być dwóch użytkowników o tym samym loginie !"
-
-#~ msgid "Checks Journal - (OpenERP IN)"
-#~ msgstr "Dziennik czeków - (OpenERP IN)"
-
-#~ msgid "Cash Journal - (OpenERP IN)"
-#~ msgstr "Dziennik kasowy - (OpenERP IN)"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr ""
-#~ "Błąd ! Tworzenie rekursywnych elementów skojarzonych jest zabronione."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "Expenses Journal - (OpenERP US)"
-#~ msgstr "Dziennik wydatków - (OpenERP US)"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "The code of the journal must be unique per company !"
-#~ msgstr "Kod dziennika musi być unikalny w ramach firmy !"
-
-#~ msgid "The name of the journal must be unique per company !"
-#~ msgstr "Nazwa dziennika musi być unikalna w ramach firmy !"
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index 9f2db54a4c9..0f51a69b25f 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: 2011-07-31 04:38+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -91,6 +91,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Cash Journal - (OpenERP IN)"
-#~ msgstr "Diário de Caixa - (OpenERP IN)"
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
index ad75eb8ccb4..7842c733142 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -111,121 +111,3 @@ msgstr ""
 "empresas.\n"
 "    Este módulo é a base para outros módulos multi-empresas.\n"
 "    "
-
-#~ msgid "Default Company"
-#~ msgstr "Empresa Padrão"
-
-#~ msgid "Object"
-#~ msgstr "Objeto"
-
-#~ 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 devem ser da mesma categoria."
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "O imposto não parece estar correto."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "Objeto afetado por esta regra"
-
-#~ msgid "Multi company"
-#~ msgstr "Multi empresa"
-
-#~ msgid "Main Company"
-#~ msgstr "Empresa principal"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Erro: Unidade de venda deve ser de categoria diferente da unidade de medida"
-
-#~ msgid "Name"
-#~ msgstr "Nome"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Erro! Você não pode criar empresas recursivas."
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Empresa onde o usuário está conectado"
-
-#~ msgid "Sequence"
-#~ msgstr "Seqüência"
-
-#~ msgid "Expression"
-#~ msgstr "Expressão"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Erro!  Você não pode criar categorias recursivas."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Erro: Código EAN inválido"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Empresa padrão por Objeto"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (cópia)"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "Expressão, deve ser verdadeira para validar"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Por favor desconsidere esta mensagem, caso o seu pagamento tenha sido "
-#~ "efetuado após o envio deste e-mail. Em caso de dúvida, entre em contato com "
-#~ "nosso departamento contábil"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto deve começar com x_ e não deve conter caracteres especiais!"
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "Dê um nome a este registro, a fim de localizá-lo facilmente"
-
-#~ msgid "Company to store the current record"
-#~ msgstr "Empresa onde será armazenado o registro atual"
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_company.default"
-
-#~ msgid ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo acrescenta a possibilidade de se gerenciar facilmente \n"
-#~ "    o valor padrão para cada objeto\n"
-#~ "    "
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ 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"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Não é permitido criar dois usuários com o mesmo login!"
-
-#~ msgid "Cash Journal - (OpenERP IN)"
-#~ msgstr "Livro Caixa - (OpenERP IN)"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Erro! Você não pode criar membros recursivos associados."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/multi_company/i18n/ro.po b/addons/multi_company/i18n/ro.po
index aa3f75cc3ca..f128cc48aa3 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 26b209e439b..65b05d6bb2e 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -105,79 +105,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Object"
-#~ msgstr "Объект"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "НДС выглядит неправильно"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Multi company"
-#~ msgstr "Концерн"
-
-#~ msgid "Main Company"
-#~ msgstr "Головная компания"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML структуры для просмотра."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Ошибка. UOS и UOM должны принадлежать к разным категориям."
-
-#~ msgid "Name"
-#~ msgstr "Имя"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Ошибка! Невозможно создать рекурсивную компанию."
-
-#~ msgid "Sequence"
-#~ msgstr "Последовательность"
-
-#~ msgid "Expression"
-#~ msgstr "Выражение"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Ошибка ! Невозможно создать рекурсивную категорию."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Ошибка: Неправильный штрих-код"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (копия)"
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "Объект затрагивает эти правила"
-
-#~ msgid "Default Company"
-#~ msgstr "Компания по умолчанию"
-
-#~ msgid "Company where the user is connected"
-#~ msgstr "Компании, в составе которых находиться пользователь"
-
-#~ msgid "Default company per Object"
-#~ msgstr "Компания по умолчанию для объекта"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "Выбранной компании нет в разрешенных компаниях для этого пользователя"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 70a8cd0c2b2..0265818fa44 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -91,42 +91,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Default Company"
-#~ msgstr "Privzeto podjetje"
-
-#~ msgid "Object"
-#~ msgstr "Predmet"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Napaka pri obračunu DDV"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ 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 "Multi company"
-#~ msgstr "Za več podjetij"
-
-#~ msgid "Main Company"
-#~ msgstr "Glavna družba"
-
-#~ 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 "Name"
-#~ msgstr "Ime"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Napaka. Ne morete ustvariti rekurzivnih družb."
diff --git a/addons/multi_company/i18n/sr.po b/addons/multi_company/i18n/sr.po
index 20f6afa5ae8..90b75cb1656 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -106,35 +106,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Greska: POdrazumevani UOM i kupljeni UOM moraju biti u istoj kategoriji."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno IMe modeka u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne kategorije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Greska: UOS mora biti drugacije kategorije nego UOM"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivna Preduzeca."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Greska: Neispravan EAN kod"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne asocirane clanove."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! NE mozes kreirati rekursivni Meni."
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Izabrano preduzece ne spada u dozvoljena preduzeca za ovog korisnika"
diff --git a/addons/multi_company/i18n/sr@latin.po b/addons/multi_company/i18n/sr@latin.po
index f845c942172..3a0255d6190 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -106,35 +106,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno IMe modeka u definiciji akcije."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Greska: UOS mora biti drugacije kategorije nego UOM"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Greska: POdrazumevani UOM i kupljeni UOM moraju biti u istoj kategoriji."
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne kategorije."
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivna Preduzeca."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled Arhitekture"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne asocirane clanove."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Greska: Neispravan EAN kod"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Izabrano preduzece ne spada u dozvoljena preduzeca za ovog korisnika"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! NE mozes kreirati rekursivni Meni."
diff --git a/addons/multi_company/i18n/sv.po b/addons/multi_company/i18n/sv.po
index c79c85cbdc7..a3ef6ed390a 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: 2011-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -105,27 +105,3 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "Name"
-#~ msgstr "Namn"
-
-#~ msgid "Sequence"
-#~ msgstr "Sekvens"
-
-#~ msgid "Expression"
-#~ msgstr "Uttryck"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (kopia)"
diff --git a/addons/multi_company/i18n/tr.po b/addons/multi_company/i18n/tr.po
index 51ee8aef139..d6992ac3b67 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -44,23 +44,23 @@ msgstr ""
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
 msgid "Odoo Offers"
-msgstr ""
+msgstr "Odoo Teklifleri"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Dönüş"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi-Companies"
-msgstr ""
+msgstr "Çoklu-Firmalar"
 
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Çoklu Firma"
 
 #. module: multi_company
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
@@ -81,7 +81,7 @@ msgstr ""
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Koşul"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
diff --git a/addons/multi_company/i18n/uk.po b/addons/multi_company/i18n/uk.po
index 604c0a7a051..8cc629bb607 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 38db07dd390..7b687cfa300 100644
--- a/addons/multi_company/i18n/vi.po
+++ b/addons/multi_company/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-23 16:31+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-24 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ba759aa49b5..1d3533802f6 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -109,89 +109,3 @@ msgstr ""
 "    多公司模块用于多个公司（机构）环境的管理。\n"
 "此模块是其它多公司模块的基础模块。\n"
 "    "
-
-#~ msgid "Default Company"
-#~ msgstr "默认公司"
-
-#~ msgid "Object"
-#~ msgstr "对象"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr "错误：默认计量单位和采购计量单位必须在同一分类下。"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "增值税似乎不正确。"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "在操作定义中的模式名称无效"
-
-#~ msgid "Object affect by this rules"
-#~ msgstr "受此规则影响的对象"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#~ msgid "Multi company"
-#~ msgstr "多公司"
-
-#~ msgid "Main Company"
-#~ msgstr "母公司"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效XML视图结构!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "错误：销售单位必须和计量单位在不同的分类。"
-
-#~ msgid "Name"
-#~ msgstr "名称"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "错误！您不能创建循环的公司。"
-
-#~ msgid "Sequence"
-#~ msgstr "顺序"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "错误！您不能创建循环分类。"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "错误：无效的(EAN)条码"
-
-#~ msgid "Expression"
-#~ msgstr "表达式"
-
-#, python-format
-#~ msgid " (copy)"
-#~ msgstr " (副本)"
-
-#~ msgid "multi_company.default"
-#~ msgstr "multi_company.default"
-
-#~ msgid "Name it to easily find a record"
-#~ msgstr "为了方便索搜请命名记录"
-
-#~ msgid ""
-#~ "This module add the possibility to easily manage \n"
-#~ "    the default value for each object\n"
-#~ "    "
-#~ msgstr ""
-#~ "此模块提供了管理每个对象的默认值的可能性。\n"
-#~ "    "
-
-#~ msgid "Company to store the current record"
-#~ msgstr "保存当前记录的公司"
-
-#~ msgid "Default company per Object"
-#~ msgstr "每个对象的默认公司"
-
-#~ msgid "Expression, must be True to match"
-#~ msgstr "表达式（为真则匹配）"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "模块名重复!"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "用户名必须唯一！"
diff --git a/addons/multi_company/i18n/zh_TW.po b/addons/multi_company/i18n/zh_TW.po
index 96a197038ee..e49146bac28 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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d3b46e6d112..063ee9b8544 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -267,7 +267,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
         </record>
-
+        
         <record id="refund_expenses_journal_multi_in" model="account.journal">
             <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>
             <field name="code">ECNJ-OpenERP IN</field>
@@ -548,52 +548,6 @@
         <record id="project.project_task_190" model="project.task">
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="project.project_task_192" model="project.task">
-        <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_193" model="project.task">
-            <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_194" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_195" model="project.task">
-        <field name="company_id" ref="res_company_oerp_in"/>
-        </record>
-        <record id="project.project_task_196" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_197" model="project.task">
-        <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_198" model="project.task">
-        <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_199" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_200" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_201" model="project.task">
-        <field name="company_id" ref="res_company_oerp_in"/>
-        </record>
-        <record id="project.project_task_202" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_203" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_204" model="project.task">
-        <field name="company_id" ref="res_company_oerp_us"/>
-        </record>
-        <record id="project.project_task_205" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-        <record id="project.project_task_206" model="project.task">
-        <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
-
 
 
         <!--
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index 42b60e13729..b246a1914d7 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -49,10 +49,10 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="company_dest_id" select="1" widget="selection"/>
-                    <field name="object_id" select="1"/>
+                    <field name="name"/>
+                    <field name="company_id" widget="selection"/>
+                    <field name="company_dest_id" widget="selection"/>
+                    <field name="object_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/outlook/__init__.py b/addons/outlook/__init__.py
index 0190f2f396f..7f5a7a9a9f1 100644
--- a/addons/outlook/__init__.py
+++ b/addons/outlook/__init__.py
@@ -20,3 +20,5 @@
 ##############################################################################
 import installer
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index 53bd587583c..beab5aca648 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -21,21 +21,19 @@
 
 
 {
-    'name' : 'Outlook Interface',
+    'name' : 'Outlook Plug-In',
     'version' : '1.0',
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
-    'depends' : ['base', 'mail_gateway'],
-    'category' : 'Tools',
+    'depends' : ['base', 'mail'],
+    'category' : 'Customer Relationship Management',
     'description': '''
 This module provides the Outlook Plug-in.
 =========================================
-
 Outlook plug-in allows you to select an object that you’d 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 in mailgate.messages with attachments.
-
+mail into email.messages with attachments.
       ''',
     'init_xml' : [],
     'demo_xml' : [],
diff --git a/addons/outlook/i18n/bg.po b/addons/outlook/i18n/bg.po
index 70e398d1ef7..43cede7e2b4 100644
--- a/addons/outlook/i18n/bg.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/ca.po b/addons/outlook/i18n/ca.po
index 12a44303a8f..5c850755314 100644
--- a/addons/outlook/i18n/ca.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/de.po b/addons/outlook/i18n/de.po
index c637cfeb6e5..fd2897bca82 100644
--- a/addons/outlook/i18n/de.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -161,33 +161,3 @@ msgstr ""
 #: view:outlook.installer:0
 msgid "Configure"
 msgstr "Konfiguration"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Sie können ein Objekt auswählen und als Anhang zu Ihren EMails hinzufügen."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/outlook/i18n/el.po b/addons/outlook/i18n/el.po
index 5d9f74f5900..be300cd8aa4 100644
--- a/addons/outlook/i18n/el.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/es.po b/addons/outlook/i18n/es.po
index 472356f0a8c..280a16a662f 100644
--- a/addons/outlook/i18n/es.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -160,34 +160,3 @@ msgstr ""
 #: view:outlook.installer:0
 msgid "Configure"
 msgstr "Configurar"
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Le permite seleccionar un objeto al que quiera añadir su correo y sus "
-#~ "adjuntos."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/outlook/i18n/es_MX.po b/addons/outlook/i18n/es_MX.po
new file mode 100644
index 00000000000..12be7cec937
--- /dev/null
+++ b/addons/outlook/i18n/es_MX.po
@@ -0,0 +1,162 @@
+# 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 23:06+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: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Manual de instalación"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Omitir"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Interfaz Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Conector Outlook "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived "
+"selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Este módulo provee el conector (plug-in) de Outlook. \n"
+"\n"
+"      El conector de Outlook le permite seleccionar un objeto que desearía "
+"adjuntar\n"
+"      a su correo y sus adjuntos desde MS Outlook. Puede seleccionar una "
+"empresa, una tarea,\n"
+"      un proyecto, una cuenta analítica, o cualquier otro objeto, y archivar "
+"el correo seleccionado\n"
+"      en mensajes de correo con adjuntos.\n"
+"\n"
+"      "
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "El fichero de documentación: Como instalar el conector Outlook."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.instalador"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Configuración conector Outlook"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Este conector permite vincular su correo electrónico con documentos OpenERP. "
+"Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Le permite seleccionar un objeto al que desee agregar su correo electrónico "
+"y archivos adjuntos."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Fichero del conector Outlook. Guarde este fichero e instale este conector en "
+"la aplicación Outlook."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Configurar"
diff --git a/addons/outlook/i18n/es_VE.po b/addons/outlook/i18n/es_VE.po
new file mode 100644
index 00000000000..12be7cec937
--- /dev/null
+++ b/addons/outlook/i18n/es_VE.po
@@ -0,0 +1,162 @@
+# 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 23:06+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: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Manual de instalación"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Omitir"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Interfaz Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Conector Outlook "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived "
+"selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Este módulo provee el conector (plug-in) de Outlook. \n"
+"\n"
+"      El conector de Outlook le permite seleccionar un objeto que desearía "
+"adjuntar\n"
+"      a su correo y sus adjuntos desde MS Outlook. Puede seleccionar una "
+"empresa, una tarea,\n"
+"      un proyecto, una cuenta analítica, o cualquier otro objeto, y archivar "
+"el correo seleccionado\n"
+"      en mensajes de correo con adjuntos.\n"
+"\n"
+"      "
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "El fichero de documentación: Como instalar el conector Outlook."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.instalador"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Configuración conector Outlook"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Este conector permite vincular su correo electrónico con documentos OpenERP. "
+"Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Le permite seleccionar un objeto al que desee agregar su correo electrónico "
+"y archivos adjuntos."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Fichero del conector Outlook. Guarde este fichero e instale este conector en "
+"la aplicación Outlook."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Configurar"
diff --git a/addons/outlook/i18n/et.po b/addons/outlook/i18n/et.po
index 8d7ecb4377d..a071d129aa0 100644
--- a/addons/outlook/i18n/et.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -141,22 +141,3 @@ msgstr ""
 #: view:outlook.installer:0
 msgid "Configure"
 msgstr "Seadistused"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objekti nimi peab algama x_ ja ei tohi sisaldada erimärke!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Mooduli nimi peab olema unikaalne !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Viga! Te ei saa luua rekursiivset menüüd."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Välja suurus ei saa olla kunagi väiksem kui 1"
diff --git a/addons/outlook/i18n/fi.po b/addons/outlook/i18n/fi.po
index c99b602787c..e5f5415b375 100644
--- a/addons/outlook/i18n/fi.po
+++ b/addons/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: 2011-06-21 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/fr.po b/addons/outlook/i18n/fr.po
index 78a02fc73ee..15e591508a1 100644
--- a/addons/outlook/i18n/fr.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -162,16 +162,3 @@ msgstr ""
 #: view:outlook.installer:0
 msgid "Configure"
 msgstr "Configurer"
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Vous permet de sélectionner un objet que vous souhaitez ajouter à votre "
-#~ "courriel et à ses pièces jointes"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/outlook/i18n/gl.po b/addons/outlook/i18n/gl.po
index 645bf42259e..e8aaa5ea2f9 100644
--- a/addons/outlook/i18n/gl.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -25,7 +25,7 @@ msgstr "Manual de instalación"
 #. module: outlook
 #: field:outlook.installer,plugin_file:0
 msgid "Outlook Plug-in"
-msgstr "Conector Outlook"
+msgstr "Conectador Outlook"
 
 #. module: outlook
 #: field:outlook.installer,description:0
@@ -36,7 +36,7 @@ msgstr "Descrición"
 #: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
 #: view:outlook.installer:0
 msgid "Outlook Plug-In"
-msgstr "Conector Outlook"
+msgstr "Conectador Outlook"
 
 #. module: outlook
 #: view:outlook.installer:0
@@ -52,12 +52,12 @@ msgstr "Interface Outlook"
 #: field:outlook.installer,doc_name:0
 #: field:outlook.installer,name:0
 msgid "File name"
-msgstr "Nome do arquivo"
+msgstr "Nome do ficheiro"
 
 #. module: outlook
 #: field:outlook.installer,outlook:0
 msgid "Outlook Plug-in "
-msgstr "Conector Outlook "
+msgstr "Conectador Outlook "
 
 #. module: outlook
 #: model:ir.module.module,description:outlook.module_meta_information
@@ -75,18 +75,22 @@ msgid ""
 "      "
 msgstr ""
 "\n"
-"      Este módulo prové o conector (plug-in) de Outlook. O conector de "
-"Outlook permítelle seleccionar un obxecto que desexaría achegar ó seu correo "
-"e os seus anexos desde MS Outlook. Pode seleccionar unha empresa, unha "
-"tarefa, un proxecto, unha conta analítica, ou calquera outro obxecto, e "
-"arquivar o correo seleccionado en mensaxes de correo con anexos.\n"
+"      Este módulo prové o conectador (engadido) de Outlook.\n"
+"\n"
+"      O conectador de Outlook permítelle seleccionar un obxecto que "
+"desexaría achegar\n"
+"      ao seu correo e os seus anexos desde MS Outlook. Pode seleccionar unha "
+"empresa,\n"
+"      unha tarefa, un proxecto, unha conta analítica, ou calquera outro "
+"obxecto, e\n"
+"      arquivar o correo seleccionado en mensaxes de correo con anexos.\n"
 "\n"
 "      "
 
 #. module: outlook
 #: help:outlook.installer,doc_file:0
 msgid "The documentation file :- how to install Outlook Plug-in."
-msgstr "O arquivo de documentación: Como instalar o conector Outlook."
+msgstr "O ficheiro de documentación: Como instalar o conectador Outlook."
 
 #. module: outlook
 #: model:ir.model,name:outlook.model_outlook_installer
@@ -98,7 +102,7 @@ msgstr "outlook.instalador"
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
 #: view:outlook.installer:0
 msgid "Outlook Plug-In Configuration"
-msgstr "Configuración do conector Outlook"
+msgstr "Configuración do conectador Outlook"
 
 #. module: outlook
 #: field:outlook.installer,progress:0
@@ -111,7 +115,7 @@ 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 ""
-"Este conector permítelle vincular o seu correo electrónico con documentos "
+"Este conectador permítelle ligar o seu correo electrónico con documentos "
 "OpenERP. Pódeo achegar á calquera elemento de OpenERP ou crear un novo."
 
 #. module: outlook
@@ -121,7 +125,7 @@ msgid ""
 "its attachments."
 msgstr ""
 "Permítelle seleccionar un obxecto ó que desexe engadir o seu correo "
-"electrónico e os arquivos anexos."
+"electrónico e os ficheiros anexos."
 
 #. module: outlook
 #: view:outlook.installer:0
@@ -148,8 +152,8 @@ msgstr "Imaxe"
 msgid ""
 "outlook plug-in file. Save as this file and install this plug-in in outlook."
 msgstr ""
-"Arquivo do conector Outlook. Garde este arquivo e instale este conector na "
-"aplicación Outlook."
+"Ficheiro do conectador de Outlook. Garde este ficheiro e instale este "
+"conectador no Outlook."
 
 #. module: outlook
 #: view:outlook.installer:0
diff --git a/addons/outlook/i18n/hu.po b/addons/outlook/i18n/hu.po
index 952d83feb3c..bfaea561259 100644
--- a/addons/outlook/i18n/hu.po
+++ b/addons/outlook/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-24 11:35+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/it.po b/addons/outlook/i18n/it.po
index 1a09a1e6d15..d4e734acd30 100644
--- a/addons/outlook/i18n/it.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -159,10 +159,3 @@ msgstr ""
 #: view:outlook.installer:0
 msgid "Configure"
 msgstr "Configura"
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Permette di selezionare un oggetto che vorrete aggiungere alla email e il "
-#~ "suoi allegati."
diff --git a/addons/outlook/i18n/mn.po b/addons/outlook/i18n/mn.po
index 6b3a073ae8f..804172daabf 100644
--- a/addons/outlook/i18n/mn.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/nl.po b/addons/outlook/i18n/nl.po
index c280dd0d4ac..380dcbb50b9 100644
--- a/addons/outlook/i18n/nl.po
+++ b/addons/outlook/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/pl.po b/addons/outlook/i18n/pl.po
index 83b0e2fc2cb..7e4165c25f1 100644
--- a/addons/outlook/i18n/pl.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/pt.po b/addons/outlook/i18n/pt.po
index 423d3f60e39..0c73c19513c 100644
--- a/addons/outlook/i18n/pt.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/pt_BR.po b/addons/outlook/i18n/pt_BR.po
index ebc9c361bbc..598f1c66b07 100644
--- a/addons/outlook/i18n/pt_BR.po
+++ b/addons/outlook/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: 2011-05-25 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/ru.po b/addons/outlook/i18n/ru.po
index 4ce64b60984..fec93d13b55 100644
--- a/addons/outlook/i18n/ru.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/sl.po b/addons/outlook/i18n/sl.po
index 61899a296e5..5f015269e96 100644
--- a/addons/outlook/i18n/sl.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/sr@latin.po b/addons/outlook/i18n/sr@latin.po
index ab4229980b8..459ae9e9b77 100644
--- a/addons/outlook/i18n/sr@latin.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/sv.po b/addons/outlook/i18n/sv.po
index bf287b00181..7e683f2abd4 100644
--- a/addons/outlook/i18n/sv.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -143,10 +143,3 @@ msgstr ""
 #: view:outlook.installer:0
 msgid "Configure"
 msgstr "Konfigurera"
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Ger dig möjlighet att välja ett objekt som du kan lägg till ditt mail och "
-#~ "dess bilagor."
diff --git a/addons/outlook/i18n/tr.po b/addons/outlook/i18n/tr.po
index def5a6b18e1..2cc140ca6cf 100644
--- a/addons/outlook/i18n/tr.po
+++ b/addons/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -100,12 +100,12 @@ msgstr "outlook.yükleyicisi"
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
 #: view:outlook.installer:0
 msgid "Outlook Plug-In Configuration"
-msgstr "Outlook eklenti-içe özel yapılandırma ayarları"
+msgstr "Outlook Eklenti Ayarları"
 
 #. module: outlook
 #: field:outlook.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Yapılandırma Aşaması"
+msgstr "Yapılandırma gidişatı"
 
 #. module: outlook
 #: view:outlook.installer:0
@@ -122,14 +122,12 @@ msgstr ""
 msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
-msgstr ""
-"Size, e-postanıza ve eklerine eklemeniz için begendiğiniz bir nesneyi "
-"seçmeyi sağlar."
+msgstr "İstediğiniz bir nesneyi e-postanıza ve ekine eklemenizi sağlar."
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "title"
-msgstr "Başlık"
+msgstr "başlık"
 
 #. module: outlook
 #: view:outlook.installer:0
diff --git a/addons/outlook/i18n/zh_CN.po b/addons/outlook/i18n/zh_CN.po
index d9c32fa4352..abdcb5868cc 100644
--- a/addons/outlook/i18n/zh_CN.po
+++ b/addons/outlook/i18n/zh_CN.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
 msgid "Installation Manual"
-msgstr ""
+msgstr "安装手册"
 
 #. module: outlook
 #: field:outlook.installer,plugin_file:0
 msgid "Outlook Plug-in"
-msgstr ""
+msgstr "Outlook插件"
 
 #. module: outlook
 #: field:outlook.installer,description:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: outlook
 #: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
 #: view:outlook.installer:0
 msgid "Outlook Plug-In"
-msgstr ""
+msgstr "Outlook插件"
 
 #. module: outlook
 #: view:outlook.installer:0
@@ -46,18 +46,18 @@ msgstr "忽略"
 #. module: outlook
 #: model:ir.module.module,shortdesc:outlook.module_meta_information
 msgid "Outlook Interface"
-msgstr ""
+msgstr "Outlook 接口"
 
 #. module: outlook
 #: field:outlook.installer,doc_name:0
 #: field:outlook.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "文件名"
 
 #. module: outlook
 #: field:outlook.installer,outlook:0
 msgid "Outlook Plug-in "
-msgstr ""
+msgstr "Outlook 插件 "
 
 #. module: outlook
 #: model:ir.module.module,description:outlook.module_meta_information
@@ -74,70 +74,77 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      这模块提供Outlook插件\n"
+"    Outlook插件允许你从微软的Outlook和它的附件选择添加的对象。\n"
+"    你能选择在邮件网关中的一个业务伙伴，一个任务，一个计划，一个帐户分析，或任何对象和附件里选择邮件。\n"
+"    附件带消息。\n"
+"\n"
+"      "
 
 #. module: outlook
 #: help:outlook.installer,doc_file:0
 msgid "The documentation file :- how to install Outlook Plug-in."
-msgstr ""
+msgstr "文件里的文档： 如何安装Outlook插件"
 
 #. module: outlook
 #: model:ir.model,name:outlook.model_outlook_installer
 msgid "outlook.installer"
-msgstr ""
+msgstr "outlook.installer"
 
 #. module: outlook
 #: model:ir.actions.act_window,name:outlook.action_outlook_installer
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
 #: view:outlook.installer:0
 msgid "Outlook Plug-In Configuration"
-msgstr ""
+msgstr "Outlook插件设置"
 
 #. module: outlook
 #: field:outlook.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "设置进度"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid ""
 "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
-msgstr ""
+msgstr "这插件允许你把你的电子邮件链接到系统的文档到中，你能附属在系统中任何现有的文档或创建一个新的文档。"
 
 #. module: outlook
 #: help:outlook.installer,outlook:0
 msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
-msgstr ""
+msgstr "允许你选择一个你想链接到你电子邮件和它的附件的对象"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "关闭(_C)："
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "安装和设置步骤"
 
 #. module: outlook
 #: field:outlook.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
 #. module: outlook
 #: help:outlook.installer,plugin_file:0
 msgid ""
 "outlook plug-in file. Save as this file and install this plug-in in outlook."
-msgstr ""
+msgstr "Outlook插件文件。保存这文件并安装这插件到Outlook"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 4d0ac1e1971..061c27da5e5 100644
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -41,7 +41,7 @@ class outlook_installer(osv.osv_memory):
         'doc_name':fields.char('File name', size=64),
         'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you would like to add to your email and its attachments."),
         'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'doc_file':fields.char('Installation Manual',size="264",help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
+        'doc_file':fields.char('Installation Manual',size=264,help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
         }
 
@@ -65,3 +65,5 @@ Please refer to the README file for dependencies (external link: openobject-addo
 """
         }
 outlook_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 7eb6e2b0d68..7e2b7cd6d58 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -8,20 +8,18 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Load Outlook Plug-In</attribute>
+                        <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Load Outlook Plug-In</attribute>
+                        <attribute name="string">Install Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
                         <attribute name="string">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.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
                     </xpath>
-                    <xpath expr="//button[@string='Skip']" position="replace">
-                        <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+                    <xpath expr="//button[@string='Cancel']" position="replace">
                     </xpath>
                     <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                         <attribute name="string"/>
@@ -46,7 +44,7 @@
         </record>
 
         <record id="action_outlook_installer" model="ir.actions.act_window">
-            <field name="name">Load Outlook Plug-In</field>
+            <field name="name">Install Outlook Plug-In</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -59,10 +57,11 @@
             <field name="action_id" ref="action_outlook_installer"/>
             <field name="category_id" ref="base.category_sales_management_config"/>
             <field name="sequence">4</field>
+            <field name="type">automatic</field>
         </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
-            <field name="name">Load Outlook Plug-In</field>
+            <field name="name">Install Outlook Plug-In</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -73,7 +72,7 @@
         </record>
 
         <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
+        <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
 
-        <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" name="Load Outlook Plug-In" parent="base.menu_base_config_plugins" sequence="10"/>
     </data>
 </openerp>
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
index 5872ed0291a..c720c5e417d 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -297,3 +297,5 @@ if __name__ == '__main__':
 
 #mngr = manager.GetManager()
 #mngr.ShowManager("IDD_MANAGER")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
index 1afd9f85fdd..3aa329807ef 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
@@ -5605,3 +5605,5 @@ CkDirTree_swigregister(CkDirTree)
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
index 3b3d8973497..a19f2d59cff 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
@@ -79,3 +79,5 @@ def MakePropertyPage(parent, manager, config, idd, yoffset=24):
 
 import dlgutils
 SetWaitCursor = dlgutils.SetWaitCursor
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index a05220ad7e0..8576a3526ff 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -186,7 +186,6 @@ def check():
         win32ui.MessageBox("No server running on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
         return False
     if str(NewConn.getitem('_login')) == 'False':
-        win32ui.MessageBox("Please login to the database first", "OpenERP Connection", flag_excl)
         return False
     return True
 
@@ -1807,3 +1806,5 @@ dialog_map = {
                     (CommandButtonProcessor,     "IDPB_SELECT_STATE IDC_LIST_STATE IDD_SELECT_STATE" , SelectStateFromList,()),
                 ),
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
index efccf4f494e..bce802b5ed1 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
@@ -321,3 +321,5 @@ class ProcessorPage(ProcessorDialog):
         self.template[0][2] = self.template[0][2] & ~(win32con.DS_MODALFRAME|win32con.WS_POPUP|win32con.WS_OVERLAPPED|win32con.WS_CAPTION)
         self.template[0][2] = self.template[0][2] | win32con.WS_CHILD
         return win32gui.CreateDialogIndirect(self.hinst, self.template, self.parent, message_map)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
index 8ffc4e62d22..bede3cd63c2 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
@@ -16,3 +16,5 @@ def SetWaitCursor(wait):
     else:
         hCursor = win32gui.LoadCursor(0, 0)
     win32gui.SetCursor(hCursor)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
index 7a4970491b0..0a129423e29 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
@@ -316,3 +316,5 @@ class ProtocolComboProcessor(ComboProcessor):
         if sel == -1:
             win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 1, 0)
         self.active_control_id = self.control_id
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
index 0b427852c89..34af9e073a4 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
@@ -143,3 +143,5 @@ class CommandButtonProcessor(ButtonProcessor):
         if doc is None:
             return ""
         return " ".join(doc.split())
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
index abeff9ae69b..cf3e416c209 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
@@ -28,3 +28,5 @@ def GetImageParamsFromBitmapID(rc_parser, bmpid):
             filename = os.path.join( os.path.dirname( __file__ ), filename)
         return 0, filename, win32con.LR_LOADFROMFILE
     assert 0, "not reached"
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
index 247b9c7a533..e1e8bac21d7 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,7 +1,7 @@
-#C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.py
-#This is a generated file. Please edit C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
+#C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.py
+#This is a generated file. Please edit C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.rc instead.
 _rc_size_=16350
-_rc_mtime_=1296563638
+_rc_mtime_=1296608638
 class FakeParser:
 	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Fed. State', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, 'Connection Parameters', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 154, 40), 1344339971], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 343, 32), 1342177287], [130, 'Title:', -1, (5, 16, 30, 17), 1342177280], [129, '', 2013, (22, 14, 57, 12), 1350631552], [130, 'Document Name:', -1, (83, 16, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image:', -1, (200, 16, 22, 17), 1342177280], [129, '', 2015, (223, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (289, 13, 50, 15), 1342242816], [128, 'Add', 2011, (350, 13, 38, 15), 1342242816], [128, 'Delete', 2012, (392, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 80), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 50, 45, 14), 1342242816], [128, 'OK', 2091, (50, 50, 50, 14), 1342242817], [128, 'SSL (https)', 2111, (20, 35, 100, 14), 1342242819]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 134, 50, 15), 1342177280], [129, '', 2106, (76, 135, 54, 12), 1350568064], [128, 'Search', 2107, (135, 136, 40, 12), 1342242816], [130, 'Country :', -1, (18, 121, 35, 15), 1342177280], [129, '', 2108, (76, 122, 54, 12), 1350568064], [128, 'Search', 2109, (135, 121, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 90), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (45, 3, 100, 12), 1350631552], [130, '  Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (45, 18, 100, 12), 1350631552], [128, '', 2024, (5, 35, 150, 5), 1342177287], [130, 'Protocol Connection :', -1, (5, 45, 80, 17), 1342177280], [133, '', 2110, (75, 43, 75, 50), 1344339971], [128, 'Close', 2, (60, 70, 45, 14), 1342242816], [128, 'OK', 1, (110, 70, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a New Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a New Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
 	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'ID_DROPDOWNLIST_PROTOCOL': 2110, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDCB_WEB_SECURE': 2111, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
@@ -9,3 +9,5 @@ class FakeParser:
 	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
 def ParseDialogs(s):
 	return FakeParser()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
index d944fc2dd99..68d62fc7060 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
@@ -37,3 +37,5 @@ if __name__=="__main__":
         convert(sys.argv[1], sys.argv[2])
     else:
         convert()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
index 0b05af3f0be..ed20f80e3d4 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
@@ -375,3 +375,5 @@ if __name__=='__main__':
         print "Dialog %s (%d controls)" % (id, len(ddef))
         pprint.pprint(ddef)
         print
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/eml.py b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
index fe455c91117..47e66689c71 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/eml.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
@@ -90,4 +90,6 @@ def generateEML(mail):
     if (success == False):
         print cemail.lastErrorText()
         sys.exit()
-    return new_mail, eml_path
\ No newline at end of file
+    return new_mail, eml_path
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
index 0c7e0e640fe..643a5c40e58 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/manager.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
@@ -191,3 +191,5 @@ if __name__=='__main__':
         else:
             usage()
     sys.exit(main(verbose))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 7ecb2aea81f..9cbcb14d40e 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -20,6 +20,8 @@
 ##############################################################################
 
 import xmlrpclib
+import binascii
+import base64
 import sys
 import socket
 import os
@@ -146,6 +148,7 @@ class XMLRpcConn(object):
     	flag = False
     	new_msg =  ext_msg =""
     	message_id = referances  = None
+        context = {}
     	try:
             session = win32com.client.Dispatch("MAPI.session")
             session.Logon('Outlook')
@@ -177,15 +180,15 @@ class XMLRpcConn(object):
     	for rec in recs: #[('res.partner', 3, 'Agrolait')]
             model = rec[0]
             res_id = rec[1]
-            #Check if mailgate installed
-            object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mailgate.message')])
+            #Check if mail installed
+            object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mail.message')])
             if not object_id:
-            	win32ui.MessageBox("Mailgate is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mailgate not installed",win32con.MB_ICONERROR)
+            	win32ui.MessageBox("Mail is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mail not installed",win32con.MB_ICONERROR)
             	return
             object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',model)])
             object_name  = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
             #Reading the Object ir.model Name
-            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mailgate.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])
+            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])
             if ext_ids:
             	name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
             	ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)
@@ -201,14 +204,30 @@ class XMLRpcConn(object):
             	'message-id':message_id,
             	'references':ustr(referances),
             }
-            obj_list= ['crm.lead','project.issue','hr.applicant','res.partner']
-            if rec[0] not in obj_list:
-                self.CreateEmailAttachment(rec,mail)
             result = {}
+            context['thread_model'] = model
             if attachments:
             	result = self.MakeAttachment([rec], mail)
-            attachment_ids = result.get(model, {}).get(res_id, [])
-            execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','history',model, res_id, msg, attachment_ids)
+            execute(conn, 'execute', self. _dbname, int(self._uid), self._pwd,
+                    'mail.thread','message_append',[res_id],
+                    msg.get('subject', False),
+                    msg.get('body', False),
+                    msg.get('to', False),
+                    msg.get('from', False),
+                    msg.get('cc', False),
+                    False, # BCC
+                    False, #reply-to
+                    msg.get('date', False),
+                    msg.get('message-id'),\
+                    msg.get('references', False),
+                    result, #attachments
+                    #FIXME: properly handle plaintext/html body variants?
+                    False, #body_html
+                    False, #subtype
+                    False, #headers
+                    False, #original
+                    context)
+
             new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
             flag = True
 
@@ -298,7 +317,7 @@ class XMLRpcConn(object):
             endCut = message_id.find(">")
             message_id = message_id[startCut:endCut+1]
             email.replace_header('Message-Id',message_id)
-            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(email))
+            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.thread','message_process',section, str(email))
             if id > 0:
             	flag = True
             	return flag
@@ -310,39 +329,28 @@ class XMLRpcConn(object):
     		return flag
 
     def MakeAttachment(self, recs, mail):
-    	attachments = mail.Attachments
-    	result = {}
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
-    	if not os.path.exists(att_folder_path):
+        attachments = mail.Attachments
+        attachment = {}
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
+        if not os.path.exists(att_folder_path):
     		os.makedirs(att_folder_path)
     	for rec in recs: #[('res.partner', 3, 'Agrolait')]
-    		obj = rec[0]
-    		obj_id = rec[1]
-    		res={}
-    		res['res_model'] = obj
-    		attachment_ids = []
-    		if obj not in result:
-    			result[obj] = {}
-    		for i in xrange(1, attachments.Count+1):
-    			fn = ustr(attachments[i].FileName)
-    			if len(fn) > 64:
-    				l = 64 - len(fn)
-    				f = fn.split('.')
-    				fn = f[0][0:l] + '.' + f[-1]
-    			att_path = os.path.join(att_folder_path,fn)
-    			attachments[i].SaveAsFile(att_path)
-    			f=open(att_path,"rb")
-    			content = "".join(f.readlines()).encode('base64')
-    			f.close()
-    			res['name'] = ustr(attachments[i].DisplayName)
-    			res['datas_fname'] = ustr(fn)
-    			res['datas'] = content
-    			res['res_id'] = obj_id
-    			id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
-    			attachment_ids.append(id)
-    		result[obj].update({obj_id: attachment_ids})
-    	return result
+            obj = rec[0]
+            obj_id = rec[1]
+            for i in xrange(1, attachments.Count+1):
+            	fn = ustr(attachments[i].FileName)
+            	if len(fn) > 64:
+            		l = 64 - len(fn)
+            		f = fn.split('.')
+            		fn = f[0][0:l] + '.' + f[-1]
+                att_path = os.path.join(att_folder_path,fn)
+                attachments[i].SaveAsFile(att_path)
+                f=open(att_path,"rb")
+                content = "".join(f.readlines())
+                f.close()
+                attachment[fn] = content
+        return attachment
 
     def CreateContact(self, res=None):
     	res=eval(str(res))
@@ -456,17 +464,17 @@ class XMLRpcConn(object):
         import win32ui
     	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
     	res_vals = []
-    	mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)])
+    	mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('message_id','=',message_id)])
         ref_mail_id = None
     	if not mail_id:
-            ref_mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('references','=',message_id)])
+            ref_mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('references','like','%'+message_id+'%')])
             if ref_mail_id:
-                address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message','read',ref_mail_id[0],['model','res_id'])
+                address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',ref_mail_id[0],['model','res_id'])
                 for key, vals in address.items():
                     res_vals.append([key,vals])
                 return res_vals
             return None
-    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message','read',mail_id[0],['model','res_id'])
+    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',mail_id[0],['model','res_id'])
     	for key, vals in address.items():
     		res_vals.append([key,vals])
     	return res_vals
@@ -561,3 +569,5 @@ class XMLRpcConn(object):
             name = ustr(rec['name'])
             res.append((obj,rec['id'],name,obj))
         return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/LICENSE b/addons/pad/LICENSE
index cff5dae3a7b..ff64be448e9 100644
--- a/addons/pad/LICENSE
+++ b/addons/pad/LICENSE
@@ -1,5 +1,5 @@
 OpenERP, Open Source Management Solution
-Copyright © 2010 OpenERP SA (<http://openerp.com>).
+Copyright © 2010-2011 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
@@ -12,4 +12,4 @@ 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/>.
\ No newline at end of file
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/pad/__init__.py b/addons/pad/__init__.py
index 6a60bdb9799..663cac2cbf0 100644
--- a/addons/pad/__init__.py
+++ b/addons/pad/__init__.py
@@ -1,2 +1,5 @@
 # -*- coding: utf-8 -*-
-import company_pad
+import res_company
+import ir_attachment
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index b3429dde329..9630e74c27a 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 {
-    'name': 'Enhanced support for (Ether)Pad attachments',
-    'version': '1.0.3',
-    'category': 'Tools',
+    'name': 'Collaborative Note Pad',
+    'version': '2.0',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
@@ -15,11 +15,17 @@ Lets the company customize which Pad installation should be used to link to new
     'website': 'http://openerp.com',
     'depends': ['base'],
     'data': [
-        'company_pad.xml'
+        'res_company.xml'
     ],
     'installable': True,
     'active': False,
     'web': True,
     'certificate' : '001183545978470526509',
-    'images': ['images/pad_link_companies.jpeg'],
+    'js': ['static/src/js/pad.js'],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
+    'images': ['static/src/img/pad_link_companies.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/company_pad.py b/addons/pad/company_pad.py
deleted file mode 100644
index 08590688df6..00000000000
--- a/addons/pad/company_pad.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-from osv import fields, osv
-
-class company_pad(osv.osv):
-    _inherit = 'res.company'
-    _columns = {
-        'pad_index': fields.char('Pad root URL', size=64, required=True,
-                                 help="The root URL of the company's pad "
-                                      "instance"),
-    }
-    _defaults = {
-        'pad_index': 'http://ietherpad.com/'
-    }
-
-company_pad()
diff --git a/addons/pad/i18n/bg.po b/addons/pad/i18n/bg.po
index a205a83a140..937acbefeb2 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/ca.po b/addons/pad/i18n/ca.po
index 742c7f6b0e3..23811215347 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index 64ceaddecaa..340c5b81eb5 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
@@ -82,21 +82,3 @@ msgstr "Pad"
 #: model:ir.module.module,shortdesc:pad.module_meta_information
 msgid "Enhanced support for (Ether)Pad attachments"
 msgstr "Unterstützung für (Ether) Pad Anhänge"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po
index a8871fdb4d5..2328e6196f8 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
@@ -82,21 +82,3 @@ msgstr "Pad"
 #: model:ir.module.module,shortdesc:pad.module_meta_information
 msgid "Enhanced support for (Ether)Pad attachments"
 msgstr "Soporte mejorado para adjuntos (Ether)Pad"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura 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 "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/pad/i18n/es_MX.po b/addons/pad/i18n/es_MX.po
new file mode 100644
index 00000000000..d282ef3be54
--- /dev/null
+++ b/addons/pad/i18n/es_MX.po
@@ -0,0 +1,84 @@
+# 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 06:38+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:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Nombre"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "La URL raíz de la instancia pad de la compañía."
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Escribir"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+"    "
+msgstr ""
+"\n"
+"Añade soporte mejorado para adjuntos (Ether)Pad en el cliente web, permite "
+"que la\n"
+"compañía personalice que instalación Pad debe ser utilizada para conectar a "
+"los nuevos pads\n"
+"(por defecto, pad.openerp.com)\n"
+"    "
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr "URL raíz pad"
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr "Soporte mejorado para adjuntos (Ether)Pad"
diff --git a/addons/pad/i18n/es_VE.po b/addons/pad/i18n/es_VE.po
new file mode 100644
index 00000000000..d282ef3be54
--- /dev/null
+++ b/addons/pad/i18n/es_VE.po
@@ -0,0 +1,84 @@
+# 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 06:38+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:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Nombre"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "La URL raíz de la instancia pad de la compañía."
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Escribir"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+"    "
+msgstr ""
+"\n"
+"Añade soporte mejorado para adjuntos (Ether)Pad en el cliente web, permite "
+"que la\n"
+"compañía personalice que instalación Pad debe ser utilizada para conectar a "
+"los nuevos pads\n"
+"(por defecto, pad.openerp.com)\n"
+"    "
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr "URL raíz pad"
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr "Soporte mejorado para adjuntos (Ether)Pad"
diff --git a/addons/pad/i18n/fi.po b/addons/pad/i18n/fi.po
index fbec40b9370..935f74e9a55 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: 2011-06-21 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/fr.po b/addons/pad/i18n/fr.po
index 9f8512266b4..6371f29d853 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/gl.po b/addons/pad/i18n/gl.po
index 3c6664e97b9..c9ca94b29e9 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/hu.po b/addons/pad/i18n/hu.po
index 4415cdfbbfb..2fd86897c1e 100644
--- a/addons/pad/i18n/hu.po
+++ b/addons/pad/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 15:07+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/it.po b/addons/pad/i18n/it.po
index b5762d868e8..785c332a411 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/mn.po b/addons/pad/i18n/mn.po
index 553b1f49ce7..0f5fdf30fbd 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/nl.po b/addons/pad/i18n/nl.po
index b34f6e0d58d..f947de1364f 100644
--- a/addons/pad/i18n/nl.po
+++ b/addons/pad/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/pt.po b/addons/pad/i18n/pt.po
index 63faac07bfe..5feebe53af2 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index 283d7c79068..faf9509f70a 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/ru.po b/addons/pad/i18n/ru.po
index e10041e0047..15eaa2f7784 100644
--- a/addons/pad/i18n/ru.po
+++ b/addons/pad/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/sl.po b/addons/pad/i18n/sl.po
index 1dc6ea8baee..ff93b51e93c 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/sr@latin.po b/addons/pad/i18n/sr@latin.po
index d9d5c4a57a1..32419fcd6d4 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
diff --git a/addons/pad/i18n/tr.po b/addons/pad/i18n/tr.po
index 39cfd9f874d..75a5d6738cf 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: 2011-05-29 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
@@ -32,17 +32,17 @@ msgstr "Ad"
 #. module: pad
 #: help:res.company,pad_index:0
 msgid "The root URL of the company's pad instance"
-msgstr ""
+msgstr "Şirketin pad örneğinin kök adresi (URL)"
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
 msgid "Companies"
-msgstr "Firmalar"
+msgstr "Şirketler"
 
 #. module: pad
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+msgstr "Hata! özyinelemeli şirketler oluşturamazsınız."
 
 #. module: pad
 #: code:addons/pad/web/editors.py:17
@@ -64,14 +64,14 @@ msgstr ""
 #. module: pad
 #: field:res.company,pad_index:0
 msgid "Pad root URL"
-msgstr ""
+msgstr "Pad kök adresi (URL)"
 
 #. module: pad
 #: view:res.company:0
 msgid "Pad"
-msgstr ""
+msgstr "Pad"
 
 #. module: pad
 #: model:ir.module.module,shortdesc:pad.module_meta_information
 msgid "Enhanced support for (Ether)Pad attachments"
-msgstr ""
+msgstr "(Ether)Pad ekleri için gelişmiş destek"
diff --git a/addons/pad/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
index 1f7644a6c9e..9c764c673a0 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: 2011-07-08 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: pad
 #: code:addons/pad/web/editors.py:32
@@ -72,7 +72,7 @@ msgstr "PAD根网址"
 #. module: pad
 #: view:res.company:0
 msgid "Pad"
-msgstr ""
+msgstr "Pad"
 
 #. module: pad
 #: model:ir.module.module,shortdesc:pad.module_meta_information
diff --git a/addons/pad/ir_attachment.py b/addons/pad/ir_attachment.py
new file mode 100644
index 00000000000..ba8c88632dd
--- /dev/null
+++ b/addons/pad/ir_attachment.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+from osv import fields, osv
+import random
+import string
+
+class ir_attachment(osv.osv):
+    _inherit = 'ir.attachment'
+
+    def pad_generate_url(self, cr, uid, model, id):
+        pad_url_template = self.pool.get('res.users').browse(cr,uid,[uid])[0].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' : model,
+            'id' : id,
+            'salt' : salt,
+            'name' : '',
+        }
+        return pad_url_template % template_vars
+
+    def pad_get(self, cr, uid, model, id):
+        attachment = self.search(cr, uid, [('res_model', '=', model), ('res_id', '=', id), ('type', '=', 'url'), ('name', '=', 'Pad')])
+        if attachment:
+            return self.read(cr, uid, attachment)[0]['url']
+        else:
+            url = self.pad_generate_url(cr, uid, model, id)
+            self.create(cr, uid, {
+                'res_model' : model,
+                'res_id' : id,
+                'type' : 'url',
+                'name' : 'Pad',
+                'url' : url,
+            })
+            return url
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/res_company.py b/addons/pad/res_company.py
new file mode 100644
index 00000000000..0c1dc7c4929
--- /dev/null
+++ b/addons/pad/res_company.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from osv import fields, osv
+
+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': 'http://ietherpad.com/%(db)s-%(model)s-%(id)d-%(salt)s-%(name)s'
+    }
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/company_pad.xml b/addons/pad/res_company.xml
similarity index 92%
rename from addons/pad/company_pad.xml
rename to addons/pad/res_company.xml
index 754776715d7..20b6f52d853 100644
--- a/addons/pad/company_pad.xml
+++ b/addons/pad/res_company.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <xpath expr="//page[@string='Configuration']" position="inside">
           <separator string="Pad" colspan="4"/>
-          <field name="pad_index"/>
+          <field name="pad_url_template"/>
         </xpath>
       </field>
     </record>
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
new file mode 100644
index 00000000000..acc91f2273e
--- /dev/null
+++ b/addons/pad/static/src/js/pad.js
@@ -0,0 +1,29 @@
+openerp.pad = function(instance) {
+
+instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
+    on_attachments_loaded: function(attachments) {
+        this._super(attachments);
+        var self = this;
+        var $padbtn = self.$element.find('button.pad');
+        var is_pad = function(a) {
+            return a.type == 'url' && a.name == 'Pad';
+        };
+        if (_.any(attachments, is_pad)) {
+            $padbtn.hide();
+        } else {
+            $padbtn.show().click(self.on_add_pad);
+        }
+    },
+    on_add_pad: function() {
+        var self = this;
+        var $padbtn = this.$element.find('button.pad');
+        $padbtn.attr('disabled', 'true').find('img, span').toggle();
+        this.view.dataset.call_button('pad_get', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
+            $padbtn.hide();
+            self.do_update();
+            self.do_action(r.result);
+        });
+    }
+});
+
+};
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
new file mode 100644
index 00000000000..c17464e6646
--- /dev/null
+++ b/addons/pad/static/src/xml/pad.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+    <t t-extend="FormView.sidebar.attachments">
+        <t t-jquery="div.oe-binary-file-set" t-operation="append">
+                <button class="button pad" type="button">
+                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
+                    <span>Add Pad</span>
+                </button>
+        </t>
+    </t>
+</templates>
diff --git a/addons/pad/web/__init__.py b/addons/pad/web/__init__.py
deleted file mode 100644
index 95542e91e3e..00000000000
--- a/addons/pad/web/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import controllers
-import editors
diff --git a/addons/pad/web/controllers.py b/addons/pad/web/controllers.py
deleted file mode 100644
index 082ab69b35a..00000000000
--- a/addons/pad/web/controllers.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import urlparse
-
-import cherrypy
-
-from openobject import rpc
-from openobject.tools import expose
-
-import openerp.controllers
-from openerp.utils import TinyDict
-
-class Piratepad(openerp.controllers.SecuredController):
-    _cp_path = "/piratepad"
-
-    def get_root(self):
-        return rpc.RPCProxy('res.company').read(
-                [rpc.get_session().company_id], ['pad_index'])[0]['pad_index']
-
-    def make_url(self, pad_name):
-        return urlparse.urljoin(
-            self.get_root(), '-'.join(pad_name.split())
-        )
-
-    @expose('json', methods=('POST',))
-    def link(self, pad_name):
-        params, data = TinyDict.split(cherrypy.session['params'])
-        ctx = dict(rpc.get_session().context,
-                   default_res_model=params.model, default_res_id=params.id,
-                   active_id=False, active_ids=[])
-
-        pad_name = pad_name.decode('utf8')
-        pad_link = self.make_url(pad_name)
-        attachment_id = rpc.RPCProxy('ir.attachment').create({
-            'name': pad_name,
-            'url': pad_link,
-            'type': 'url'
-            }, ctx)
-        return {'id': attachment_id, 'name': pad_name, 'url': pad_link}
diff --git a/addons/pad/web/editors.py b/addons/pad/web/editors.py
deleted file mode 100644
index e303dc4b3d7..00000000000
--- a/addons/pad/web/editors.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-import openobject.templating
-
-class SidebarTemplateEditor(openobject.templating.TemplateEditor):
-    templates = ['/openerp/widgets/templates/sidebar.mako']
-    ADD_ATTACHMENT_BUTTON = u'id="add-attachment"'
-    BINARY_ATTACHMENTS_FORM = u'<form id="attachment-box"'
-
-    def insert_pad_link(self, output):
-        # Insert the link on the line right after the link to open the
-        # attachment form
-        form_opener_insertion = output.index(
-                '\n',
-                output.index(self.ADD_ATTACHMENT_BUTTON)) + 1
-        output = output[:form_opener_insertion] + \
-                 '''<a href="#" id="add-pad" class="button-a
-                 attachment-button">${_("Write")}</a>\n''' + \
-                 output[form_opener_insertion:]
-        return output
-
-    def edit(self, template, template_text):
-        output = super(SidebarTemplateEditor, self).edit(template, template_text)
-
-        output = self.insert_pad_link(output)
-
-        form_insertion_point = output.index(self.BINARY_ATTACHMENTS_FORM)
-        return output[:form_insertion_point] + '''
-            <form id="pad-form" action="/piratepad/link" method="post">
-                <label for="sidebar_pad_datas">${_("Name")}:</label>
-                <input id="sidebar_pad_datas"
-                       name="pad_name" size="5" />
-                <button>${_("Ok")}</button>
-            </form>
-            <script type="text/javascript">
-                jQuery(document).ready(function() {
-                    var $padForm = jQuery('#pad-form')
-                            .hide()
-                            .submit(createAttachment);
-                    jQuery('#add-pad').click(function(e){
-                        $padForm.show();
-                        jQuery('#sidebar_pad_datas').focus();
-                        e.preventDefault();
-                    });
-                });
-            </script>
-        ''' + output[form_insertion_point:]
diff --git a/addons/sale_margin/report/__init__.py b/addons/pad_project/__init__.py
similarity index 98%
rename from addons/sale_margin/report/__init__.py
rename to addons/pad_project/__init__.py
index 2ec61a1e939..d6bf9f9551c 100644
--- a/addons/sale_margin/report/__init__.py
+++ b/addons/pad_project/__init__.py
@@ -19,5 +19,6 @@
 #
 ##############################################################################
 
-import report_margin
+import models
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/__openerp__.py b/addons/pad_project/__openerp__.py
similarity index 69%
rename from addons/mail_gateway/__openerp__.py
rename to addons/pad_project/__openerp__.py
index af1e28e0c2c..a9ec6282ab7 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -20,30 +20,21 @@
 ##############################################################################
 
 {
-    'name': 'Email Gateway System',
+    'name': 'Project PAD',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
-The generic email gateway system allows to send and receive emails.
-===================================================================
-
-    * History of emails
-    * Easy integration with any module""",
+This module adds a PAD in all project kanban views
+==================================================
+    """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
+    'depends': ['project', 'pad'],
     'init_xml': [],
-    'update_xml': [
-        "mail_gateway_view.xml",
-        "res_partner_view.xml",
-        'security/ir.model.access.csv'
-
-    ],
+    'update_xml': ['models/project_task.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '001056784984222247309',
-    'images': ['images/customer_history.jpeg','images/messages_form.jpeg','images/messages_list.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad_project/models/__init__.py b/addons/pad_project/models/__init__.py
new file mode 100644
index 00000000000..098de31a5a4
--- /dev/null
+++ b/addons/pad_project/models/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import project_task
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad_project/models/project_task.py b/addons/pad_project/models/project_task.py
new file mode 100644
index 00000000000..c215aed1325
--- /dev/null
+++ b/addons/pad_project/models/project_task.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from tools.translate import _
+from osv import fields, osv
+
+class task(osv.osv):
+    _inherit = "project.task"
+
+    def pad_get(self, cr, uid, ids, context=None):
+        """Get pad action
+        """
+        url = self.pool.get("ir.attachment").pad_get(cr, uid, self._name, ids[0])
+        return {
+            'type': 'ir.actions.act_url',
+            'url': url
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad_project/models/project_task.xml b/addons/pad_project/models/project_task.xml
new file mode 100644
index 00000000000..5fa113e9b54
--- /dev/null
+++ b/addons/pad_project/models/project_task.xml
@@ -0,0 +1,15 @@
+<openerp>
+    <data>
+        <record id="view_task_kanban_with_pad" model="ir.ui.view">
+            <field name="name">project.task.kanban.pad</field>
+            <field name="model">project.task</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="project.view_task_kanban"/>
+            <field name="arch" type="xml">
+                <xpath expr="//span[@class='oe_kanban_project_times']/t" position="before">
+                    <a name="pad_get" string="Pad" type="object" class="oe_kanban_button"><b>PAD</b></a>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/mail_gateway/__init__.py b/addons/plugin/__init__.py
similarity index 96%
rename from addons/mail_gateway/__init__.py
rename to addons/plugin/__init__.py
index 6526541a068..1844c42011c 100644
--- a/addons/mail_gateway/__init__.py
+++ b/addons/plugin/__init__.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-import mail_gateway
-import res_partner
+import plugin_handler
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
new file mode 100644
index 00000000000..b598690cbf2
--- /dev/null
+++ b/addons/plugin/__openerp__.py
@@ -0,0 +1,45 @@
+# -*- 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': 'Common interface for CRM plugin (Thunderbird and Outlook)',
+    'version': '1.0',
+    'category': 'Hidden',
+    'complexity': "easy",
+    'description': """
+The common interface for pugin.
+=====================================================
+
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': [
+        'base',
+    ],
+    'data': [],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+    'images': [],
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
new file mode 100644
index 00000000000..c4859771e35
--- /dev/null
+++ b/addons/plugin/plugin_handler.py
@@ -0,0 +1,153 @@
+'''
+Created on 18 oct. 2011
+
+@author: openerp
+'''
+
+from osv import osv, fields
+
+
+class plugin_handler(osv.osv_memory):
+    _name = 'plugin.handler'
+
+    def _make_url(self, cr, uid, res_id, model, context=None):
+        """
+            @param id: on which document the message is pushed
+            @param model: name of the document linked with the mail
+            @return url
+        """
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
+        if base_url:
+            base_url += '/?id=%s&model=%s'%(res_id,model)
+        return base_url
+
+    def is_installed(self, cr, uid):
+        return True
+
+    def partner_get(self, cr, uid, address_email):
+        ids = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '!=', False), ('email', 'like', address_email)])
+        res_id = ids and self.pool.get('res.partner.address').browse(cr, uid, ids[0]).partner_id.id or 0
+        url = self._make_url(cr, uid, res_id, 'res.partner')
+        return ('res.partner', res_id , url)
+
+    def document_get(self, cr, uid, email):
+        """
+            @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, name_get, url) 
+        """
+        mail_message_obj = self.pool.get('mail.message')
+        model = False
+        res_id = 0
+        url = False
+        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])
+            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)[1]
+        return (model, res_id, url, name)
+
+    def document_type(self, cr, uid, context=None):
+        """
+            Return the list of available model to push
+            res.partner is a special case
+            otherwise all model that inherit from mail.thread
+            ['res.partner', 'project.issue']
+        """
+        mail_thread_obj = self.pool.get('mail.thread')
+        doc_dict = mail_thread_obj.message_capable_models(cr, uid, context)
+        doc_dict['res.partner'] = "Partner"
+        return doc_dict.items()
+
+    # 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 : the name of the document
+            @return : the result of name_search a list of tuple 
+            [(id, '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 
+            @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)
+        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'
+            else:
+                res_id = model_obj.message_new(cr, uid, msg)
+                notify = "Mail succefully pushed, a new %s has been created " % model
+        else:
+            model_obj.message_append_dict(cr, uid, [res_id], msg)
+            notify = "Mail succefully 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):
+        """
+            @param data : the data use to create the res.partner.address
+                [('field_name', value)], field name is required
+            @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.address').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, body_text, body_html, attachments):
+        pass
+        # ----------------------------------------
+        # solution 1
+        # construct a fake rfc822 from the separated arguement
+        #m = email.asdfsadf
+        # use the push_message method
+        #self.push_message(m)
+        # ----------------------------------------
+        # solution 2
+        # use self.pushmessage only with header and body
+        # add attachemnt yourself after
+
+        #ir_attachment_obj = self.pool.get('ir.attachment')
+        #attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', data.get('res_model')), ('res_id', '=', data.get('res_id')), ('datas_fname', '=', data.get('datas_fname'))])
+        #if attachment_ids:
+        #    return attachment_ids[0]
+        #else:
+        #    vals = {"res_model": data.get('res_model'), "res_id": data.get('res_id'), "name": data.get('name'), "datas" : data.get('datas'), "datas_fname" : data.get('datas_fname')}
+        #    return ir_attachment_obj.create(cr, uid, vals)
+        #return (model, res_id, url, notify)
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 3bd0f188581..4daeabb9129 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -22,8 +22,8 @@
 
 {
     'name': 'Point Of Sale',
-    'version': '1.0',
-    'category': 'Sales',
+    'version': '1.0.1',
+    'category': 'Point Of Sale',
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
@@ -39,17 +39,15 @@ Main features :
     """,
     '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', 'delivery'],
+    'depends': ['sale'],
     'init_xml': [],
 
     'update_xml': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
         'wizard/pos_details.xml',
-        'wizard/pos_add_product.xml',
         'wizard/pos_confirm.xml',
         'wizard/pos_discount.xml',
-        'wizard/pos_get_sale.xml',
         'wizard/pos_open_statement.xml',
         'wizard/pos_close_statement.xml',
         'wizard/pos_box_entries.xml',
@@ -57,15 +55,10 @@ Main features :
         'wizard/pos_payment_report_date_view.xml',
         'wizard/pos_box_out.xml',
         'wizard/pos_sales_user.xml',
-        'wizard/all_closed_cashbox_of_the_day.xml',
-        'wizard/pos_sales_user_current_user.xml',
-        'wizard/pos_sale_user_today.xml',
         'wizard/pos_receipt_view.xml',
         'wizard/pos_payment_report_user.xml',
         'wizard/pos_payment_report.xml',
         'wizard/pos_payment.xml',
-        'wizard/pos_scan_product_view.xml',
-        'wizard/pos_return_view.xml',
         'point_of_sale_report.xml',
         'point_of_sale_view.xml',
         'report/pos_order_report_view.xml',
@@ -75,11 +68,20 @@ Main features :
         'account_statement_view.xml',
         'account_statement_report.xml',
     ],
-    'demo_xml': ['point_of_sale_demo.xml','account_statement_demo.xml'],
-    'test': ['test/point_of_sale_test.yml',
-            'test/point_of_sale_report.yml',
+    'demo_xml': [
+        'point_of_sale_demo.xml',
+        'account_statement_demo.xml',
+        'test/00_register_open.yml'
+    ],
+    'test': [
+        'test/01_order_to_payment.yml',
+        'test/02_order_to_invoice.yml',
+        'test/point_of_sale_report.yml'
     ],
     'installable': True,
     'certificate' : '001156338024966477869',
+    # Web client
+    'js': ['static/lib/backbone/backbone-0.5.3.js', 'static/src/js/pos.js'],
+    'css': ['static/src/css/pos.css']
 }
 # 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 706cd50a84b..9cc39ced45c 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -25,10 +25,9 @@ from osv import fields, osv
 class account_journal(osv.osv):
     _inherit = 'account.journal'
     _columns = {
-        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
-        'special_journal': fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
-        'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
-        'journal_users': fields.many2many('res.users', 'pos_journal_users', 'journal_id', 'user_id', 'Users'),
+        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox, without control of the initial balance."),
+        'check_dtls': fields.boolean('Control Balance Before Closing', help="This field authorize Validation of Cashbox without controlling the closing balance."),
+        '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."),
     }
     _defaults = {
         'check_dtls': False,
@@ -49,14 +48,6 @@ class account_cash_statement(osv.osv):
         else:
             return True
 
-    def _user_allow(self, cr, uid, statement_id, context=None):
-        statement = self.browse(cr, uid, statement_id, context=context)
-        if (not statement.journal_id.journal_users) and uid == 1: return True
-        for user in statement.journal_id.journal_users:
-            if uid == user.id:
-                return True
-        return False
-
     def _get_cash_open_box_lines(self, cr, uid, context=None):
         res = super(account_cash_statement,self)._get_cash_open_box_lines(cr, uid, context)
         curr = [0.01, 0.02, 0.05, 0.10, 0.20, 0.50]
diff --git a/addons/point_of_sale/account_statement_demo.xml b/addons/point_of_sale/account_statement_demo.xml
index 7cdbbf99596..e8ee0a7c349 100644
--- a/addons/point_of_sale/account_statement_demo.xml
+++ b/addons/point_of_sale/account_statement_demo.xml
@@ -1,75 +1,17 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        <record id="pos_visa_journal" model="account.journal">
-            <field name="name">Visa Journal</field>
-            <field name="code">VIJ</field>
-            <field name="type">cash</field>
-            <field eval="1" name="check_dtls"/>
-            <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
-
-        <!-- <record id="pos_cash_journal" model="account.journal">
-            <field name="name">Cash Journal</field>
-            <field name="code">CAJ</field>
-            <field name="type">cash</field>
-            <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
-        -->
-
-        <record id="pos_bankcard_journal" model="account.journal">
-            <field name="name">Bancontact Journal</field>
-            <field name="code">BACJ</field>
-            <field name="type">cash</field>
-            <field eval="1" name="check_dtls"/>
-            <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
-
-        <record id="account.sales_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
-
-        <record id="account.refund_sales_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
-
-        <record id="account.expenses_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
-
-        <record id="account.refund_expenses_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
 
         <record id="account.bank_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+            <field eval="True" name="journal_user"/>
         </record>
 
         <record id="account.check_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
-        </record>
-
-        <record id="stock.stock_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+            <field eval="True" name="journal_user"/>
         </record>
 
         <record id="account.cash_journal" model="account.journal">
-            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+            <field eval="True" name="journal_user"/>
             <field eval="1" name="check_dtls"/>
         </record>
 
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index 45f89c5062c..d6c4b3f244a 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -11,35 +11,22 @@
                     <page string="Point of Sale">
                         <group col="6" colspan="4">
                             <separator colspan="6" string="Extended Configuration"/>
-                            <field name="check_dtls" groups="point_of_sale.group_pos_manager" string="Check Cash Balance"/>
+                            <field name="journal_user"/>
                             <field name="auto_cash"/>
-                            <field name="special_journal"/>
+                            <field name="check_dtls"/>
                         </group>
-                        <separator colspan="4" string="POS Users"/>
-                        <field name="journal_users" nolabel="1" colspan="4"/>
                     </page>
                 </xpath>
             </field>
         </record>
 
-        <menuitem name="Cash Register" parent="point_of_sale.menu_point_root" id="menu_cash_register" 
-                sequence="4" groups="point_of_sale.group_pos_manager"/>
-
-        <!--<menuitem
-            name="All Cash Registers"
-            parent="menu_cash_register"
-            action="account.action_view_bank_statement_tree"
-            id="menu_all_menu_cash_register"
-            sequence="4"
-        />-->
-        
         <record id="view_pos_open_cash_statement_filter" model="ir.ui.view">
             <field name="name">account.bank.statement.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
@@ -64,9 +51,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
-                        <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                        <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="name"/>
@@ -141,16 +128,8 @@
             <field name="act_window_id" ref="action_new_bank_statement_all_tree"/>
         </record>
 
-        <menuitem
-            name="Cash Registers"
-            parent="menu_cash_register"
-            action="action_new_bank_statement_all_tree"
-            id="menu_all_menu_all_register"
-            sequence="4"
-        />
-
         <menuitem name="Cash Register Management" parent="point_of_sale.menu_point_root"
-            id="menu_point_open_config" sequence="1"/>
+            id="menu_point_open_config" sequence="10"/>
         <menuitem
             name="Open Cash Registers" parent="menu_point_open_config"
             string="Open Cash Registers"
@@ -163,5 +142,20 @@
             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/account_statement_wizard.xml b/addons/point_of_sale/account_statement_wizard.xml
deleted file mode 100644
index 25f099810b4..00000000000
--- a/addons/point_of_sale/account_statement_wizard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<openerp>
-    <data>
-
-       <menuitem icon="STOCK_PRINT"
-                    action="action_report_all_closed_cashbox_of_the_day"
-                 id="menu_all_closed_cashbox_of_the_day"
-                 parent="menu_point_report_register"/>
-    </data>
-</openerp>
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index 877d9a3f010..9cdcf365f19 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index e813d277ec6..3e1e3d26c50 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Управление на касови апарати"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Не е намерена валидна ценова листа !"
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr "Общо :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Невъзможно създаване на ред !"
@@ -853,7 +853,6 @@ 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 "неизвестен"
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Няма ценова листа !"
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Грешка !"
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr "Юли"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr "Да"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Няма зададена приходна сметка за продукта: \"%s\" (id:%d)"
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr "Дата на фактура"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr "Фактура към доставчик"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Невъзможна промяната на ред!"
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr "Дата на валидиране"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "Проформа"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Моля, изберете партньор за тази продажба."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index 9ed2903f1ac..41ee461bd5c 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index 1c5eb9e2f23..c0dbf363ea0 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.po
@@ -7,30 +7,29 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-10-30 13:43+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 22:31+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
 msgid "Discount Notes"
-msgstr ""
+msgstr "Notes del descompte"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "Vendes per dia"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Point of Sale Confirm"
-msgstr ""
+msgstr "Punt de Venda confirmeu"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
@@ -46,7 +45,7 @@ msgstr "Canvia a esborrany"
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Núm. de producte"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -56,7 +55,7 @@ msgstr "Terminal punt de venda (TPV)"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Avui"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -66,18 +65,18 @@ msgstr "Afegeix producte :"
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
 msgid "All Cashboxes Of the day :"
-msgstr ""
+msgstr "Totes les caixes d'efectiu del dia:"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Introduir diners"
 
 #. 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 "Anàlisi del registre"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
@@ -89,7 +88,7 @@ msgstr "Detalls de vendes"
 #. module: point_of_sale
 #: view:pos.close.statement:0
 msgid "Are you sure you want to close the statements ?"
-msgstr ""
+msgstr "Esteu segur de voler tancar els comptes?"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
@@ -104,7 +103,7 @@ msgstr "Escanneja producte"
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
@@ -115,17 +114,17 @@ msgstr "Afegeix pagament :"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "Les meves vendes"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
 msgid "Box Out"
-msgstr ""
+msgstr "Caixa tancada"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
 msgid "Today's Sales By Current User"
-msgstr ""
+msgstr "Vendes d'avui per l'usuari actual"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -146,7 +145,7 @@ msgstr "IVA"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Orígen"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -161,7 +160,7 @@ msgstr "Total transacció"
 #. module: point_of_sale
 #: help:account.journal,special_journal:0
 msgid "Will put all the orders in waiting status till being accepted"
-msgstr ""
+msgstr "Posarà totes les ordres en espera fins que siguin acceptades"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -179,7 +178,7 @@ msgstr "Total del dia"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Preu mitjà"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -207,84 +206,84 @@ msgstr "Estat"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 msgid "Add payment"
-msgstr ""
+msgstr "Afegeix pagament"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Vendes per mes"
 
 #. 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 "Vendas per usuari"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 #: report:pos.payment.report:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desc.(%)"
 
 #. module: point_of_sale
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Preu total"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Varis"
 
 #. 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 ""
+msgstr "Informe de vendes"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
 #, python-format
 msgid "No Order Lines"
-msgstr ""
+msgstr "Nº línies comanda"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Altres informacions"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Type"
-msgstr ""
+msgstr "Tipus de producte"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
 msgid "Max Discount(%)"
-msgstr ""
+msgstr "Descompte màxim (%)"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash register management"
-msgstr ""
+msgstr "Gestió de la caixa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "S'ha trobat una línia de tarifa no vàlida!"
@@ -297,13 +296,13 @@ msgstr "S'ha trobat una línia de tarifa no vàlida!"
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "["
-msgstr ""
+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 ""
+msgstr "Marge"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -318,7 +317,7 @@ msgstr "Qtat. total"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr ""
+msgstr "Vendes mensuals per usuari"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
@@ -327,54 +326,56 @@ msgid ""
 "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
 msgstr ""
+"No podeu obrir una caixa registradora per \"%s\".\n"
+"Tanqueu el registre de caixa relacionat."
 
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
 msgid "User who is logged into the system."
-msgstr ""
+msgstr "Usuari connectat al sistema"
 
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Product for Input"
-msgstr ""
+msgstr "Producte per entrada"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Forma de pagament"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Operacions diàries"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Cerca extractes d'efectiu"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Are you sure you want to close your sales ?"
-msgstr ""
+msgstr "Esteu segur de voler tancar les seves vendes?"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. 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 "Vendes mensuals per usuari"
 
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
@@ -386,18 +387,18 @@ msgstr "Data pagament"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Data límit"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
 msgid "To count"
-msgstr ""
+msgstr "Per comptar"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -408,12 +409,12 @@ msgstr "Resum"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Quotations"
-msgstr ""
+msgstr "Cotitzacions"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_payment:0
 msgid "Delay Payment"
-msgstr ""
+msgstr "Retarda pagament"
 
 #. module: point_of_sale
 #: field:pos.add.product,quantity:0
@@ -428,12 +429,12 @@ msgstr "Quantitat"
 #. module: point_of_sale
 #: help:account.journal,auto_cash:0
 msgid "This field authorize the automatic creation of the cashbox"
-msgstr ""
+msgstr "Aquest camp autoritza la creació automàtica de la caixa."
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Període"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -449,12 +450,12 @@ msgstr "Descipció línia"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Codis"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Sortides de caixa"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -466,7 +467,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Imprimeix informe"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -482,7 +483,7 @@ msgstr "Preu unitat"
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr ""
+msgstr "Comproveu que el compte d'ingressos estigui %s"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:56
@@ -492,12 +493,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "Afegeix producte"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
 msgid "Invoice Amount"
-msgstr ""
+msgstr "Import de la factura"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -529,17 +530,17 @@ msgstr "Pagament"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Saldo final"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
 msgid "Products for Output Operations"
-msgstr ""
+msgstr "Producte per operacions de sortida"
 
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
 msgid "Sale by Date and User"
-msgstr ""
+msgstr "Vendes per data i usuari"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -548,6 +549,8 @@ msgid ""
 "Cannot delete a point of sale which is closed or contains confirmed "
 "cashboxes!"
 msgstr ""
+"No es pot eliminar un punt de venda que estigui tancat o tingui caixes "
+"registradores confirmades!"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -559,29 +562,29 @@ msgstr "Mode d'impostos"
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #, python-format
 msgid "Cash registers are already closed."
-msgstr ""
+msgstr "Els registres de caixa ja estan tancats."
 
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Codi EAN erroni"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Obre extractes"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & New"
-msgstr ""
+msgstr "Desa i Nou"
 
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "Total vendes (ingressos)"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -592,7 +595,7 @@ msgstr "Total pagat"
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
 msgid "Check Details"
-msgstr ""
+msgstr "Verifica detalls"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -603,28 +606,30 @@ msgstr "Qtat. producte"
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
 msgid "Contract Number"
-msgstr ""
+msgstr "Número de contracte"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. 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 ""
+msgstr "Producte del usuari"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Heu de seleccionar una tarifa en el formulari de vendes!\n"
+"Si us plau, seleccioneu una abans de seleccionar un producte."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -637,50 +642,52 @@ msgstr "Subtotal"
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "Tanca extractes"
 
 #. module: point_of_sale
 #: view:account.journal:0
 msgid "Extended Configureation"
-msgstr ""
+msgstr "Configuració estesa"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Saldo inicial"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "Pagament per usuari"
 
 #. module: point_of_sale
 #: field:pos.order,type_rec:0
 msgid "Type of Receipt"
-msgstr ""
+msgstr "Tipus de rebut"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# de línies"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
 msgid "Accepted Sales"
-msgstr ""
+msgstr "Vendes acceptades"
 
 #. module: point_of_sale
 #: help:account.journal,check_dtls:0
 msgid ""
 "This field authorize Validation of Cashbox without checking ending details"
 msgstr ""
+"Aquest camp autoritza la validació de la caixa registradora sense comprovar "
+"els detalls finals"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "Nom del extracte"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
@@ -710,7 +717,7 @@ msgstr "Data creació"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr ""
+msgstr "Vendes d'avui"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -726,10 +733,10 @@ msgstr "TPV "
 #: report:pos.sales.user.today.current.user:0
 #: report:pos.user.product:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Ha fallat la creació de línia!"
@@ -738,7 +745,7 @@ msgstr "Ha fallat la creació de línia!"
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr ""
+msgstr "Nom del producte"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -762,17 +769,17 @@ msgstr "Total facturat"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "Nº de qtat"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
 msgid "Point of sale return"
-msgstr ""
+msgstr "Devolució punt de venda"
 
 #. 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 "Vendes per marge mensual"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -781,12 +788,12 @@ msgstr ""
 #: field:report.sales.by.user.pos,date_order:0
 #: field:report.sales.by.user.pos.month,date_order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Data comanda"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Caixa registradora tancada avui"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -799,44 +806,46 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"L'import del rebut ha de ser del mateix import que el de la línia del "
+"extracte"
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Product for Output"
-msgstr ""
+msgstr "Producte de sortida"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
 #: view:pos.sales.user.today.current_user:0
 msgid "Sales for Current User"
-msgstr ""
+msgstr "Vendes per l'usuari actual"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Observació posició fiscal :"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Data d'obertura"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Impostos :"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "Desc."
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -851,10 +860,9 @@ msgstr "Línies de venda TPV"
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "Rebut"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconegut"
@@ -868,17 +876,17 @@ msgstr "Data"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: point_of_sale
 #: field:pos.order,num_sale:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Nota interna"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -889,12 +897,12 @@ msgstr "transacció del TPV"
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "UserError "
-msgstr ""
+msgstr "ErrorUsuari "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "Entrades caixa TPV"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -906,12 +914,12 @@ msgstr "No podeu modificar aquesta venda. Ja ha estat pagada."
 #: field:pos.details,date_end:0
 #: field:pos.sale.user,date_end:0
 msgid "Date End"
-msgstr ""
+msgstr "Data final"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "La seva referència"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -933,7 +941,7 @@ msgstr "Cancel·la"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Return Picking"
-msgstr ""
+msgstr "Retorna albarà"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -943,33 +951,33 @@ msgstr "Vendes (resum)"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Information"
-msgstr ""
+msgstr "Informació"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
 msgid "Input Operations"
-msgstr ""
+msgstr "Operacions d'entrada"
 
 #. 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 ""
+msgstr "Punt de venda. Anàlisis registre de caixa"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
 msgid "Sale by Users"
-msgstr ""
+msgstr "Vendes per usuari"
 
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Pagament per venda"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: point_of_sale
 #: view:res.company:0
@@ -991,13 +999,13 @@ msgstr "Import total"
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Cash Registers"
-msgstr ""
+msgstr "Registres de caixa"
 
 #. module: point_of_sale
 #: view:account.journal:0
 #: field:account.journal,journal_users:0
 msgid "Users"
-msgstr ""
+msgstr "Usuaris"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1023,18 +1031,18 @@ msgstr "Punt de venda"
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Output Operations"
-msgstr ""
+msgstr "Operacions de sortida"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Start Period"
-msgstr ""
+msgstr "Període inicial"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1042,12 +1050,12 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "Obre registre de caixa"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1057,12 +1065,12 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "El nom del diari ha de ser únic per companyia!"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1075,7 +1083,7 @@ msgstr "Factura d'abonament de proveïdor"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1085,11 +1093,11 @@ msgstr "Vendes TPV"
 #. 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 "Totes les caixes registradores tancades"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "No existeix tarifa!"
@@ -1103,7 +1111,7 @@ msgstr "Seleccioneu una comanda de venda oberta"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Data de comanda"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1113,12 +1121,12 @@ msgstr "Base"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #. module: point_of_sale
 #: field:pos.order,sale_manager:0
 msgid "Salesman Manager"
-msgstr ""
+msgstr "Responsable de vendes"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1156,27 +1164,27 @@ msgstr "Codi"
 #: 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 ""
+msgstr "Productes"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Informe de pagament per a la venda"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
 msgid "Special Journal"
-msgstr ""
+msgstr "Diari especial"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
 msgid "All closed cashbox of the day"
-msgstr ""
+msgstr "Totes les caixes registradores tancades del dia"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informació extra"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1186,7 +1194,7 @@ msgstr "Fax :"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Comercial connectat"
 
 #. module: point_of_sale
 #: model:ir.module.module,description:point_of_sale.module_meta_information
@@ -1203,21 +1211,32 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Característiques principals:\n"
+" - Ràpida codificació de la venda.\n"
+" - Permet seleccionar una manera de pagament (la forma més ràpida) o dividir "
+"el pagament entre diverses maneres de pagament.\n"
+" - Càlcul de la quantitat de diners a retornar.\n"
+" - Crea i confirma l'albarà automàticament.\n"
+" - Permet a l'usuari crear factura de forma automàtica.\n"
+" - Permet la devolució de vendes anteriors.\n"
+"\n"
+"    "
 
 #. module: point_of_sale
 #: field:pos.order,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Mètode del preu"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print the receipt of the sale"
-msgstr ""
+msgstr "Imprimeix tiquet de venda"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Albarà"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1235,25 +1254,25 @@ msgstr "Qtat"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. 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 "Vendes per usuari"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Error!"
@@ -1261,34 +1280,34 @@ msgstr "Error!"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
 msgid "Sale Confirm"
-msgstr ""
+msgstr "Confirma venda"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "estat"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Prices"
-msgstr ""
+msgstr "Preus"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
-msgstr ""
+msgstr "Si us plau informeu d'una compte per al producte: %s"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Retard validació"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1298,34 +1317,34 @@ msgstr "Nombre de copies"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "Punt de venda. Pagament"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Període final"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "Obertura automàtica"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
 msgid "Discount(Amount)"
-msgstr ""
+msgstr "Descompte (import)"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:51
 #, python-format
 msgid "Active ID is not found"
-msgstr ""
+msgstr "No es troba ID actiu"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
 msgid "Is accompte"
-msgstr ""
+msgstr "Bestreta"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1333,7 +1352,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1343,7 +1362,7 @@ msgstr "Vendes TPV"
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Nom del extracte"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1352,36 +1371,36 @@ msgstr ""
 #: field:pos.box.out,journal_id:0
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "Registre de caixa"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "Punt de venda. Rebut"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "No order lines defined for this sale "
-msgstr ""
+msgstr "Nº de línies de la comanda definida en aquesta venda "
 
 #. 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 "Vendes per marge diari de l'usuari"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
 msgid "Customer Note"
-msgstr ""
+msgstr "Nota client"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No s'han afegit línies en aquesta venda."
@@ -1389,7 +1408,7 @@ msgstr "No s'han afegit línies en aquesta venda."
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo d'obertura"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1402,13 +1421,13 @@ msgstr "Pagat"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Totes les línies de venda"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Pressupost"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1422,17 +1441,17 @@ msgstr "Total:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Vendes per marge"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Configuració diari"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Línies extracte"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1440,11 +1459,13 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Persona que utilitza la caixa registradora. Podria ser un substitut, un "
+"estudiant o un treballador provisional."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Nº factura"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
@@ -1473,13 +1494,13 @@ msgstr "Factura"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
 msgid "Get From Sale"
-msgstr ""
+msgstr "Obtén des de venda"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obert"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
@@ -1490,30 +1511,30 @@ msgstr "Ref. venda"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
 msgid "Sales lines Report"
-msgstr ""
+msgstr "Informe línies vendes"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: view:pos.box.entries:0
 msgid "Box Entries"
-msgstr ""
+msgstr "Assentaments de caixa"
 
 #. module: point_of_sale
 #: selection:pos.order,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Impostos exclosos"
 
 #. 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 ""
+msgstr "Marge net per qtat"
 
 #. 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 "Vendes per marge usuari"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1523,7 +1544,7 @@ msgstr "Impostos:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Punt de venda. Estadístiques comandes"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1548,23 +1569,23 @@ msgstr "Línies TPV"
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
 msgid "Discount Control"
-msgstr ""
+msgstr "Control descompte"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Saldo de tancament"
 
 #. 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 ""
+msgstr "Detalls de vendes"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1575,46 +1596,48 @@ msgstr "Data venda"
 #: 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 "Línies de vendes per usuaris"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
 msgid "Max Difference for Cashboxes"
-msgstr ""
+msgstr "Màxima diferència per a caixes registradores"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, 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: point_of_sale
 #: view:pos.make.payment:0
 msgid "The cash register must be opened to be able to execute a payment."
 msgstr ""
+"El registre de caixa ha d'estar obert per poder efectuar un pagament."
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total net :"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Description"
-msgstr ""
+msgstr "Descripció del producte"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1630,18 +1653,18 @@ msgstr "Total"
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "Vendes per usuari"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Obre registre de caixa"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Extracte"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1651,7 +1674,7 @@ msgstr "Ref. venda"
 #. module: point_of_sale
 #: field:pos.make.payment,num_sale:0
 msgid "Num.File"
-msgstr ""
+msgstr "Núm. fitxer"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
@@ -1659,12 +1682,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Informe pagament"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
 msgid "Return lines"
-msgstr ""
+msgstr "Línies de devolució"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1691,36 +1714,39 @@ msgid "Invoice Date"
 msgstr "Data factura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, 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 s'ha trobat cap línia de tarifa que concordi amb aquest producte i "
+"quantitat.\n"
+"Ha de canviar el producte, la quantitat o la tarifa."
 
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Número de sèrie"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Reimprimeix"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
-msgstr ""
+msgstr "Heu d'obrir al menys una caixa"
 
 #. 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 "Pagaments d'avui per usuari"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
@@ -1732,7 +1758,7 @@ msgstr "Venda TPV"
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -1763,39 +1789,39 @@ msgstr "Últim albarà de sortida"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Línia d'extracte bancari"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracte bancari"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. 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 "Informe TPV"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add Discount"
-msgstr ""
+msgstr "Afegeix descompte"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Tanca registre de caixa"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
 msgid "Refunded Quantity"
-msgstr ""
+msgstr "Quantitat retornada"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -1806,27 +1832,27 @@ msgstr "Escanneja codi de barres"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Operació"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 msgid "Sales Order"
-msgstr ""
+msgstr "Comanda de venda"
 
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Assentament comptable"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmat"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancel·lada"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1838,17 +1864,17 @@ msgstr "Confirma"
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Línies de vendes"
 
 #. module: point_of_sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No podeu crear companyies recursives."
 
 #. module: point_of_sale
 #: field:pos.discount,discount:0
 msgid "Discount "
-msgstr ""
+msgstr "Descompte "
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1856,7 +1882,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de proveïdor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Ha fallat la modificació de la línia!"
@@ -1874,22 +1900,22 @@ msgstr "Informe"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products for Input Operations"
-msgstr ""
+msgstr "Productes per operacions d'entrada"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
 msgid "Today's Sales by Current User"
-msgstr ""
+msgstr "Vendes d'avui per l'usuari actual"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "TPV. Caixa de sortida"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "El codi del diari ha de ser únic per companyia!"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1899,60 +1925,60 @@ msgstr "Configuració"
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
 #: field:report.pos.order,date_validation:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Data de validació"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
-msgstr ""
+msgstr "No teniu suficients permisos per validar aquesta venda!"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Factures"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "Descompte total"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Agafa diners"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "Detalls de venda"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
 msgid "Control for Output Operations"
-msgstr ""
+msgstr "Control de les operacions de sortida"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
 #, python-format
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -1989,12 +2015,12 @@ msgstr "Facturat"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Nota de descompte"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -2015,12 +2041,12 @@ msgstr "Línia de venda TPV"
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Are you sure you want to open the statements ?"
-msgstr ""
+msgstr "Esteu segurs que desitgeu obrir els extractes?"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
 msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "TPV. Informe de pagaments segons la data"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2028,22 +2054,22 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Si us plau, indiqueu una empresa per la venda."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
-msgstr ""
+msgstr "No s'ha definit un compte a cobrar per aquest diari : \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
 msgid "Cashier"
-msgstr ""
+msgstr "Caixer"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -2073,32 +2099,32 @@ msgstr "Vendes per usuari"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print Receipt"
-msgstr ""
+msgstr "Imprimeix rebut"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "TPV Línies comanda"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -2106,7 +2132,7 @@ msgstr "Error"
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "Diari de vendes"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2124,19 +2150,19 @@ msgstr "Creeu una factura per aquesta venda."
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Data de comanda"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Tanca registres de caixa"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Disc(%)"
-msgstr ""
+msgstr "Desc(%)"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -2160,44 +2186,44 @@ msgstr "Línies de venda"
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Subtotal net"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Add product"
-msgstr ""
+msgstr "Afegeix producte"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Informe de pagaments"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Diaris de caixa"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "Detalls TPV:"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Vendes d'avui per usuari"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 #: view:pos.box.out:0
 msgid "Please fill these fields for entries to the box:"
-msgstr ""
+msgstr "Introduïu aquests camps per als assentaments de la caixa:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
-msgstr ""
+msgstr "Comproveu que el compte esta establert a %s"
 
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
@@ -2212,39 +2238,39 @@ msgstr "Descripció"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Línies vendes"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notes internes"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & Close"
-msgstr ""
+msgstr "Desa i Tanca"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Running"
-msgstr ""
+msgstr "Executant"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
 msgid "All Cashboxes Of the day"
-msgstr ""
+msgstr "Totes les caixes registradores del dia"
 
 #. 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 ""
+msgstr "Anàlisis del punt de venda"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2252,7 +2278,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2260,18 +2286,18 @@ msgstr ""
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Advance"
-msgstr ""
+msgstr "Avança"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Avui    "
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:95
@@ -2280,22 +2306,24 @@ msgid ""
 "The maximum value you can still withdraw is exceeded. \n"
 " Remaining value is equal to %d "
 msgstr ""
+"El valor màxim que podeu rebaixar s'ha excedit.\n"
+"El valor restant és igual a %d "
 
 #. module: point_of_sale
 #: field:pos.order,remboursed:0
 msgid "Remboursed"
-msgstr ""
+msgstr "reemborsat"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
 msgid "Opened Sales"
-msgstr ""
+msgstr "Vendes obertes"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
@@ -2319,12 +2347,12 @@ msgstr "Data impressió"
 #. 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 "Vendes per marge mensual del usuari"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Cerca comanda de venda"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2338,13 +2366,13 @@ msgstr "Assentament de compte"
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "Realitza pagament"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 #: view:pos.sales.user.today:0
 msgid "Sales User Today"
-msgstr ""
+msgstr "Vendes del usuari d'avui"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2352,7 +2380,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #~ msgid ","
 #~ msgstr ","
@@ -2563,3 +2591,6 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
+#~ msgid "Product for expenses"
+#~ msgstr "Productes per despeses"
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index e8f4f21e3d5..702c579819c 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 34ee3cb04d5..01d46f5590e 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -854,7 +854,6 @@ 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 ""
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index c72109f8bcc..2d17860b295 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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr "Barkassen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Keine gültige Preisliste gefunden"
@@ -623,8 +623,8 @@ msgid "User's Product"
 msgstr "Produkte des Benutzers"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -736,7 +736,7 @@ msgid "Total :"
 msgstr "Summe :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Erzeuge Buchung gescheitert !"
@@ -863,7 +863,6 @@ msgid "Receipt :"
 msgstr "Quittung :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "unbekannt"
@@ -1097,8 +1096,8 @@ msgid "All Closed CashBox"
 msgstr "Alle abgeschlossenen Kassen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Keine Preisliste!"
@@ -1265,15 +1264,15 @@ msgid "Sale by User"
 msgstr "Verkäufe nach Benutzer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Fehler!"
@@ -1300,7 +1299,7 @@ msgid "July"
 msgstr "Juli"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Bitte geben Sie ein Konto für Produkt %s an"
@@ -1401,7 +1400,7 @@ msgid "Customer Note"
 msgstr "Mitteilung Kunde"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Keine Auftragszeilen für diesen Verkauf definiert"
@@ -1612,7 +1611,7 @@ msgid "Yes"
 msgstr "Ja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1716,8 +1715,8 @@ msgid "Invoice Date"
 msgstr "Rechnungsdatum"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1738,9 +1737,9 @@ msgid "Reprint"
 msgstr "Wiederholung Druck"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "Sie sollten mindestens eine Kasse eröffnen für Ihre Barverkäufe etc."
@@ -1884,7 +1883,7 @@ msgid "Supplier Invoice"
 msgstr "Lieferantenrechnung"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Fehler bei Modifiziere Buchung !"
@@ -1938,8 +1937,8 @@ msgid "Validation Date"
 msgstr "Datum des Abschlusses"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "Sie haben nicht genug Zugriffsrechte um den Verkauf zu validieren."
@@ -2058,13 +2057,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Bitte Partner für Verkauf definieren"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2123,13 +2122,13 @@ msgid "POS Orders lines"
 msgstr "POS Kaufpositionen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Fehler"
@@ -2225,7 +2224,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "Bitte füllen Sie diese Felder aus für Kassenbuchungen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "bitte prüfen Sie, daß das Konto auf %s gesetzt wird."
@@ -2597,168 +2596,5 @@ msgstr "Jahr"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "ungültiger Modelnamme in der Aktionsdefinition"
 
-#~ msgid "Logged in User"
-#~ msgstr "Eingebuchter Benutzer"
-
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr ""
-#~ "Das ist der eingebuchte Benutzer (nicht notwendigerweise der Verkäufer)"
-
-#~ msgid "OPERATION N° :"
-#~ msgstr "Geschäftsfall Nr :"
-
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Das ist der tatsächliche Verkäufer"
-
-#~ msgid "Close Registers"
-#~ msgstr "Beende Kassenblatt"
-
-#~ msgid "Open Register"
-#~ msgstr "Öffne Kasse"
-
-#~ msgid ""
-#~ "Person who uses the the register. It could be a reliever, a student or an "
-#~ "interim employee."
-#~ msgstr ""
-#~ "Mitarbeiter der die Kasse benutzt, z.B. Aushilfspersonal, oder "
-#~ "Leihmitarbeiter."
-
-#~ msgid "Sortie de caisse"
-#~ msgstr "Hauptkasse"
-
-#~ msgid "Register management"
-#~ msgstr "Kassenblätter verwalten"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr ""
-#~ "Sie versuchen eine Seriennummer zuzuweisen, die nicht zu dem Produkt gehört."
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                'Please set one before choosing a product."
-#~ msgstr ""
-#~ "Sie müssen eine Preisliste im Verkaufsauftrag wählen !\n"
-#~ "' \\n                'Bitte wählen Sie diese aus, bevor sie ein Produkt "
-#~ "wählen."
-
-#~ msgid "Register"
-#~ msgstr "Barkasse"
-
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                   "
-#~ " \" and quantity.\n"
-#~ "You have to change either the product,\"                    \" the quantity "
-#~ "or the pricelist."
-#~ msgstr ""
-#~ "Konnte keinen gültigen Preis passend zu diesem Produkt\"\\n    \"und der "
-#~ "Verkaufsmenge ermitteln\" \\n Entweder wechseln Sie auf ein anderes "
-#~ "Produkt\"\\n    \"oder passen Ihre Preisliste an."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Fehler: Ungültige Steuernummer (falsche checksum)"
-
 #~ msgid "Product for expenses"
 #~ msgstr "Produkt für Ausgaben"
-
-#~ msgid "Bancontact Journal"
-#~ msgstr "Journal EC Cash Verfahren"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Fehler: VAT Referenz wird benötigt"
-
-#, python-format
-#~ msgid ""
-#~ "You can not open a Cashbox for \"%s\".\n"
-#~ "Please close its related Register.' %(journal.name)))\n"
-#~ "            \n"
-#~ "            number = ''\n"
-#~ "            if journal.sequence_id:\n"
-#~ "                number = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "            else:\n"
-#~ "                number = sequence_obj.get(cr, uid, 'account.cash.statement"
-#~ msgstr ""
-#~ "Sie können keine Kasse öffnen für  \"%s\".\n"
-#~ "Bitte beenden Sie die zugehörigen Kassenbücher' %(journal.name)))\n"
-#~ "            \n"
-#~ "            number = ''\n"
-#~ "            if journal.sequence_id:\n"
-#~ "                number = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "            else:\n"
-#~ "                number = sequence_obj.get(cr, uid, 'account.cash.statement"
-
-#, python-format
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                \" "
-#~ "and quantity.\n"
-#~ "You have to change either the product,\" \\n                \" the quantity "
-#~ "or the pricelist."
-#~ msgstr ""
-#~ "Konnte keinen gültigen Preis passend zu diesem Produkt\"\"\\n    \"und der "
-#~ "Verkaufsmenge ermitteln\" \\n Entweder wechseln Sie entweder auf ein anderes "
-#~ "Produkt\"\\n    \"oder passen Ihre Preisliste an."
-
-#~ msgid "Open Registers"
-#~ msgstr "Öffne Kasse"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen"
-
-#~ msgid "The register must be opened to be able to execute a payment."
-#~ msgstr ""
-#~ "Die Kasse muss geöffnet werden, um in der Lage zu sein, einen "
-#~ "Zahlungsvorgang zu erfassen."
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                    'Please set one before choosing a product."
-#~ msgstr ""
-#~ "You have to select sale form !\n"
-#~ "' \\n                    'Please set one before choosing a product."
-
-#~ msgid "Close Register"
-#~ msgstr "Kassenabschluss"
-
-#, python-format
-#~ msgid ""
-#~ "There is no receivable account defined for this journal:'\\n                 "
-#~ "   ' \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Es ist kein Debitorenkonto für dieses Journal definiert:'\\n                 "
-#~ "  ' \"%s\" (id:%d)"
-
-#~ msgid "Registers"
-#~ msgstr "Kassen"
-
-#~ msgid "Visa Journal"
-#~ msgstr "Visa Journal"
-
-#, python-format
-#~ msgid "Registers are already closed."
-#~ msgstr "Kassen sind schon abgeschlossen."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income '\\n                        'account defined for this "
-#~ "product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Es ist kein definiertes '\\n                        'Ertragskonto für dieses "
-#~ "Produkt: \"%s\" (id:%d)"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Sie müssen eine Seriennummer für das Produkt zuweisen"
-
-#~ msgid "Cash Journal"
-#~ msgstr "Kassen Journal"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "Must be after setLang()"
-#~ msgstr "Sollte nach setLang() folgen"
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index f1e3786a5c1..fb04c27cc41 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Κανένας έγκυρος τιμοκατάλογος γραμμής δεν βρέθηκε!"
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Ανεπιτυχής δημιουργία γραμμής!"
@@ -854,7 +854,6 @@ 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 "άγνωστο"
@@ -1089,8 +1088,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Κανένας Τιμοκατάλογος !"
@@ -1246,15 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Σφάλμα !"
@@ -1281,7 +1280,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1382,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Καμία γραμμή εντολής δεν καθορίστηκε για αυτήν την πώληση"
@@ -1591,7 +1590,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1692,8 +1691,8 @@ msgid "Invoice Date"
 msgstr "Ημερομηνία Τιμολόγησης"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1711,9 +1710,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1857,7 +1856,7 @@ msgid "Supplier Invoice"
 msgstr "Τιμολόγιο Προμηθευτή"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Ανεπιτυχής τροποποίηση γραμμής!"
@@ -1909,8 +1908,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2029,13 +2028,13 @@ msgid "PRO-FORMA"
 msgstr "ΠΡΟ-ΦΟΡΜΑ"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Παρακαλώ καθορίστε έναν συνεργάτη για πώληση."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2093,13 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Σφάλμα"
@@ -2195,7 +2194,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index f63e239fe2e..5e6c9a7bc5a 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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Gestión de la caja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "¡Se ha encontrado una línea de tarifa no válida!"
@@ -621,8 +621,8 @@ msgid "User's Product"
 msgstr "Producto del usuario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -736,7 +736,7 @@ msgid "Total :"
 msgstr "Total:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "¡Ha fallado la creación de línea!"
@@ -863,7 +863,6 @@ msgid "Receipt :"
 msgstr "Recibo"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconocido"
@@ -1097,8 +1096,8 @@ msgid "All Closed CashBox"
 msgstr "Todas cajas registradoras cerradas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No existe tarifa!"
@@ -1265,15 +1264,15 @@ msgid "Sale by User"
 msgstr "Ventas por usuario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -1300,7 +1299,7 @@ msgid "July"
 msgstr "Julio"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Por favor informe una cuenta para el producto: '%s'"
@@ -1401,7 +1400,7 @@ msgid "Customer Note"
 msgstr "Nota cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No se han añadido líneas en esta venta."
@@ -1612,7 +1611,7 @@ msgid "Yes"
 msgstr "Sí"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1714,8 +1713,8 @@ msgid "Invoice Date"
 msgstr "Fecha factura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1736,9 +1735,9 @@ msgid "Reprint"
 msgstr "Reimprimir"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "Debe abrir por lo menos una caja"
@@ -1882,7 +1881,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "¡Ha fallado la modificación de la línea!"
@@ -1934,8 +1933,8 @@ msgid "Validation Date"
 msgstr "Fecha de validación"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "¡No tiene suficientes permisos para validar esta venta!"
@@ -2054,13 +2053,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por favor indique una empresa para la venta."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2119,13 +2118,13 @@ msgid "POS Orders lines"
 msgstr "TPV Líneas pedido"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -2221,7 +2220,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "Introduzca estos campos para asientos de la caja:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "Compruebe que la cuenta esté establecida a %s"
@@ -2593,41 +2592,5 @@ msgstr "Año"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
 
-#~ msgid "Logged in User"
-#~ msgstr "Usuario conectado"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
-
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Este es el usuario conectado (no necesariamente el vendedor)."
-
-#~ msgid "OPERATION N° :"
-#~ msgstr "Operación N°:"
-
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Este es el vendedor actualmente preparando la orden."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Intenta asignar un lote que no pertenece al mismo producto"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Sortie de caisse"
-#~ msgstr "Salidas de caja"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Debe asignar un lote de producción para este producto"
-
 #~ msgid "Product for expenses"
 #~ msgstr "Producto para gastos"
-
-#~ msgid "Must be after setLang()"
-#~ msgstr "Debe estar después de setLang()"
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index a853670cad9..fc11cd1b385 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "No valid pricelist line found !"
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "¡Ha fallado la creación de línea!"
@@ -853,7 +853,6 @@ 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 "desconocido"
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sin lista de precio !"
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No order lines defined for this sale."
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr "Fecha factura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "¡Ha fallado la modificación de la línea!"
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Please provide a partner for the sale."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2512,18 +2511,9 @@ msgstr ""
 #~ msgid "Net Total"
 #~ msgstr "Total neto"
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Este es el usuario del sistema (no necesariamente el vendedor)."
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
-
 #~ msgid "Select default journals"
 #~ msgstr "Seleccione los diarios por omisión"
 
-#~ msgid "Logged in User"
-#~ msgstr "Usuario conectado"
-
 #~ msgid "VAT(%)"
 #~ msgstr "IVA(%)"
 
@@ -2569,11 +2559,5 @@ msgstr ""
 #~ msgid "Default gift journal"
 #~ msgstr "Diario de los vales por omisión"
 
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Éste es el vendedor efectivo para la realización de la orden."
-
-#~ msgid "OPERATION N° :"
-#~ msgstr "Operación N° :"
-
 #~ msgid "Get From Order"
 #~ msgstr "Importar orden de venta"
diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po
index 131265819a8..20cdf1f95af 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Gestión de Caja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "No valid pricelist line found !"
@@ -621,8 +621,8 @@ msgid "User's Product"
 msgstr "User's Product"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -735,7 +735,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Create line failed !"
@@ -862,7 +862,6 @@ msgid "Receipt :"
 msgstr "Recibo :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "unknown"
@@ -1096,8 +1095,8 @@ msgid "All Closed CashBox"
 msgstr "Todas las cajas cerradas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "No hay list de precios"
@@ -1263,15 +1262,15 @@ msgid "Sale by User"
 msgstr "Ventas por usuario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -1298,7 +1297,7 @@ msgid "July"
 msgstr "Julio"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Por favor configure una cuenta para el producto: %s"
@@ -1399,7 +1398,7 @@ msgid "Customer Note"
 msgstr "Observaciones de cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No order lines defined for this sale."
@@ -1610,7 +1609,7 @@ msgid "Yes"
 msgstr "Si"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1712,8 +1711,8 @@ msgid "Invoice Date"
 msgstr "Fecha Facturacion"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1734,9 +1733,9 @@ msgid "Reprint"
 msgstr "Reimprimir"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "You have to open at least one cashbox"
@@ -1880,7 +1879,7 @@ msgid "Supplier Invoice"
 msgstr "Supplier Invoice"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Modify line failed !"
@@ -1932,8 +1931,8 @@ msgid "Validation Date"
 msgstr "Validation Date"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "You don't have enough access to validate this sale!"
@@ -2052,13 +2051,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Please provide a partner for the sale."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2117,13 +2116,13 @@ msgid "POS Orders lines"
 msgstr "POS Orders lines"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -2219,7 +2218,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "Please fill these fields for entries to the box:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "please check that account is set to %s"
@@ -2396,15 +2395,9 @@ msgstr "Year"
 #~ msgid "Orders of the day"
 #~ msgstr "Ventas del día"
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Este es el usuario conectado (no necesariamente el vendedor)."
-
 #~ msgid ","
 #~ msgstr ","
 
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
-
 #~ msgid "Ok"
 #~ msgstr "Aceptar"
 
@@ -2417,9 +2410,6 @@ msgstr "Year"
 #~ msgid "Select default journals"
 #~ msgstr "Seleccione los diarios por defecto"
 
-#~ msgid "Logged in User"
-#~ msgstr "Usuario conectado"
-
 #~ msgid "VAT(%)"
 #~ msgstr "IVA(%)"
 
@@ -2552,166 +2542,20 @@ msgstr "Year"
 #~ msgid "Actions"
 #~ msgstr "Acciones"
 
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Este es el vendedor actualmente preparando la orden."
-
 #~ msgid "Print Date:"
 #~ msgstr "Fecha impresión:"
 
 #~ msgid "Company:"
 #~ msgstr "Compañía:"
 
-#~ msgid "OPERATION N° :"
-#~ msgstr "Operación N°:"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
 #~ msgid "Net Total"
 #~ msgstr "Total Neto"
 
-#~ msgid "Close Registers"
-#~ msgstr "Cerrar registradores"
-
-#~ msgid "Open Register"
-#~ msgstr "Abrir registrador"
-
-#~ msgid ""
-#~ "Person who uses the the register. It could be a reliever, a student or an "
-#~ "interim employee."
-#~ msgstr ""
-#~ "Person who uses the the register. It could be a reliever, a student or an "
-#~ "interim employee."
-
-#~ msgid "Sortie de caisse"
-#~ msgstr "Sortie de caisse"
-
-#~ msgid "Register management"
-#~ msgstr "Administracion de Registradores"
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                'Please set one before choosing a product."
-#~ msgstr ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                'Please set one before choosing a product."
-
 #~ msgid "Partner Ref."
 #~ msgstr "Partner Ref."
 
-#~ msgid "Register"
-#~ msgstr "Registrador"
-
-#, python-format
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                   "
-#~ " \" and quantity.\n"
-#~ "You have to change either the product,\" \\n                    \" the "
-#~ "quantity or the pricelist."
-#~ msgstr ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                   "
-#~ " \" and quantity.\n"
-#~ "You have to change either the product,\" \\n                    \" the "
-#~ "quantity or the pricelist."
-
 #~ msgid "Product for expenses"
 #~ msgstr "Product for expenses"
-
-#, python-format
-#~ msgid ""
-#~ "You can not open a Cashbox for \"%s\".\n"
-#~ "Please close its related Register.' %(journal.name)))\n"
-#~ "            \n"
-#~ "            number = ''\n"
-#~ "            if journal.sequence_id:\n"
-#~ "                number = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "            else:\n"
-#~ "                number = sequence_obj.get(cr, uid, 'account.cash.statement"
-#~ msgstr ""
-#~ "You can not open a Cashbox for \"%s\".\n"
-#~ "Please close its related Register.' %(journal.name)))\n"
-#~ "            \n"
-#~ "            number = ''\n"
-#~ "            if journal.sequence_id:\n"
-#~ "                number = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "            else:\n"
-#~ "                number = sequence_obj.get(cr, uid, 'account.cash.statement"
-
-#, python-format
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                \" "
-#~ "and quantity.\n"
-#~ "You have to change either the product,\" \\n                \" the quantity "
-#~ "or the pricelist."
-#~ msgstr ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                \" "
-#~ "and quantity.\n"
-#~ "You have to change either the product,\" \\n                \" the quantity "
-#~ "or the pricelist."
-
-#, python-format
-#~ msgid ""
-#~ "There is no receivable account defined for this journal:'\\n                 "
-#~ "   ' \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no receivable account defined for this journal:'\\n                 "
-#~ "   ' \"%s\" (id:%d)"
-
-#~ msgid "Open Registers"
-#~ msgstr "Abrir registradores"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! No puedes crear menus recursivos"
-
-#~ msgid "The register must be opened to be able to execute a payment."
-#~ msgstr "The register must be opened to be able to execute a payment."
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                    'Please set one before choosing a product."
-#~ msgstr ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                    'Please set one before choosing a product."
-
-#~ msgid "Close Register"
-#~ msgstr "Cerrar Registrador"
-
-#~ msgid "Registers"
-#~ msgstr "Registradores"
-
-#, python-format
-#~ msgid "Registers are already closed."
-#~ msgstr "Registers are already closed."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income '\\n                        'account defined for this "
-#~ "product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no income '\\n                        'account defined for this "
-#~ "product: \"%s\" (id:%d)"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Debe asignar un paquete a este producto"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Error: referencia BVR es requerida"
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Error número Bvr invalido"
-
-#~ msgid "Cash Journal"
-#~ msgstr "Diario de Efectivo"
-
-#~ msgid "Bancontact Journal"
-#~ msgstr "Diario de Banco"
-
-#~ msgid "Visa Journal"
-#~ msgstr "Diario de Visa"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Trata de asignar un paquete que nos es del mismo producto"
diff --git a/addons/point_of_sale/i18n/es_MX.po b/addons/point_of_sale/i18n/es_MX.po
new file mode 100644
index 00000000000..9baadbbecde
--- /dev/null
+++ b/addons/point_of_sale/i18n/es_MX.po
@@ -0,0 +1,2597 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* point_of_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-07-23 03:02+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: 2011-09-05 05:05+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: point_of_sale
+#: field:pos.discount,discount_notes:0
+msgid "Discount Notes"
+msgstr "Notas del descuento"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr "Ventas por día"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Point of Sale Confirm"
+msgstr "Punto de venta. Confirmar"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
+msgstr "Aplicar descuento"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr "Nº de producto"
+
+#. module: point_of_sale
+#: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
+msgid "Point Of Sale"
+msgstr "Punto de Venta"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Add product :"
+msgstr "Añadir producto :"
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+msgid "All Cashboxes Of the day :"
+msgstr "Todas las cajas de efectivo del día:"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr "Introducir dnero"
+
+#. 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 "Análisis registro"
+
+#. 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 "Detalles de ventas"
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Are you sure you want to close the statements ?"
+msgstr "¿Está seguro de querer cerrar las declaraciones?"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
+msgid "Scan product"
+msgstr "Escanear producto"
+
+#. 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 "Día"
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr "Añadir pago :"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+msgid "Box Out"
+msgstr "Caja cerrada"
+
+#. module: point_of_sale
+#: report:pos.sales.user.today.current.user:0
+msgid "Today's Sales By Current User"
+msgstr "Ventas de hoy por usuario actual"
+
+#. 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 "Importe"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: point_of_sale
+#: view:report.transaction.pos:0
+msgid "Total Transaction"
+msgstr "Total transacción"
+
+#. module: point_of_sale
+#: help:account.journal,special_journal:0
+msgid "Will put all the orders in waiting status till being accepted"
+msgstr "Pondrá todas las órdenes en espera hasta que sean aceptadas"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total of the day"
+msgstr "Total del día"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,average_price:0
+msgid "Average Price"
+msgstr "Precio promedio"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Total descuento"
+
+#. 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
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+msgid "Add payment"
+msgstr "Añadir pago"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr "Ventas por mes"
+
+#. 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 "Ventas por usuario"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+#: field:pos.box.out,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 "Precio total"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Miscelleanous"
+msgstr "Varios"
+
+#. 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 "Informe de ventas"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
+#, python-format
+msgid "No Order Lines"
+msgstr "Nº líneas pedido"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Product Type"
+msgstr "Tipo de producto"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: view:pos.payment.report.date:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: point_of_sale
+#: field:res.company,company_discount:0
+msgid "Max Discount(%)"
+msgstr "Descuento máximo (%)"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Cash register management"
+msgstr "Gestión de la caja"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
+#, python-format
+msgid "No valid pricelist line found !"
+msgstr "¡Se ha encontrado una línea de tarifa no válida!"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date: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 "Margen"
+
+#. module: point_of_sale
+#: field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "Ctd. total"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr "Ventas mensuales por usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
+#, python-format
+msgid ""
+"You can not open a Cashbox for \"%s\".\n"
+"Please close its related cash register."
+msgstr ""
+"No puede abrir una caja registradora para \"%s\".\n"
+"Cierre el registro de caja relacionado."
+
+#. module: point_of_sale
+#: help:pos.order,user_salesman_id:0
+msgid "User who is logged into the system."
+msgstr "Usuario conectado al sistema"
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "Product for Input"
+msgstr "Producto para entrada"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr "Método de pago"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr "Operaciones diarias"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr "Buscar extractos de efectivo"
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Are you sure you want to close your sales ?"
+msgstr "¿Está seguro de querer cerrar sus ventas?"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "June"
+msgstr "Junio"
+
+#. 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 "Ventas mensuales por usuario"
+
+#. module: point_of_sale
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
+msgid "Payment Date"
+msgstr "Fecha de pago"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr "Fecha de cierre"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,am_out:0
+msgid "To count"
+msgstr "Para contar"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_payment:0
+msgid "Delay Payment"
+msgstr "Retrasar pago"
+
+#. module: point_of_sale
+#: field:pos.add.product,quantity:0
+#: 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 "Cantidad"
+
+#. module: point_of_sale
+#: help:account.journal,auto_cash:0
+msgid "This field authorize the automatic creation of the cashbox"
+msgstr "Este campo autoriza la creación automática de la caja."
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "Período"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
+msgid "Net Total:"
+msgstr "Base:"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line Description"
+msgstr "Descipción línea"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Codes"
+msgstr "Códigos"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr "Salidas de caja"
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+msgid "Print Report"
+msgstr "Imprimir informe"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr "Compruebe que la cuenta de ingresos esté %s"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:56
+#: code:addons/point_of_sale/wizard/pos_return.py:166
+#: code:addons/point_of_sale/wizard/pos_return.py:327
+#: model:ir.actions.act_window,name:point_of_sale.action_add_product
+#: model:ir.model,name:point_of_sale.model_pos_add_product
+#, python-format
+msgid "Add Product"
+msgstr "Añadir producto"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr "Importe factura"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id: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 "Diario"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
+msgstr "Saldo final"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products for Output Operations"
+msgstr "Producto para operaciones de salida"
+
+#. module: point_of_sale
+#: view:pos.payment.report.date:0
+msgid "Sale by Date and User"
+msgstr "Ventas por fecha y usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:69
+#, python-format
+msgid ""
+"Cannot delete a point of sale which is closed or contains confirmed "
+"cashboxes!"
+msgstr ""
+"¡No se puede eliminar un punto de venta que esté cerrado o contenga cajas "
+"registradoras confirmadas!"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr "Modo de impuestos"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
+#, python-format
+msgid "Cash registers are already closed."
+msgstr "Registros de caja ya están cerrados."
+
+#. module: point_of_sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr "Abrir extractos"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Save & New"
+msgstr "Guardar y Nuevo"
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr "Total ventas (ingresos)"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total paid"
+msgstr "Total pagado"
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Check Details"
+msgstr "Verificar detalles"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Qty of product"
+msgstr "Ctd. producto"
+
+#. module: point_of_sale
+#: field:pos.order,contract_number:0
+msgid "Contract Number"
+msgstr "Número de contrato"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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 "Producto del usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"¡Debe seleccionar una lista de precios en el formulario de ventas!\n"
+"Por favor seleccione una antes de seleccionar un producto."
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. 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
+#: view:pos.close.statement:0
+msgid "Close Statements"
+msgstr "Cerrar extractos"
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configureation"
+msgstr "Configuración extendida"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr "Saldo inicial"
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr "Pago por usuario"
+
+#. module: point_of_sale
+#: field:pos.order,type_rec:0
+msgid "Type of Receipt"
+msgstr "Tipo de recibo"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
+msgid "Accepted Sales"
+msgstr "Ventas aceptadas"
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without checking ending details"
+msgstr ""
+"Este campo autoriza la validación de la caja registradora sin comprobar los "
+"detalles finales"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr "Nombre extracto"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr "Total ventas"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr "Suma de subtotales"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment date"
+msgstr "Fecha de pago"
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "Líneas de venta"
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
+msgstr "Ventas de hoy"
+
+#. 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 "TPV "
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#, python-format
+msgid "Create line failed !"
+msgstr "¡Ha fallado la creación de línea!"
+
+#. 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 "Nombre del Producto"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:69
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr "Total facturado"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_return
+msgid "Point of sale return"
+msgstr "Punto de venta. Devolución"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr "Ventas por margen mensual"
+
+#. 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 "Fecha pedido"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr "Caja registradora cerrada hoy"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. 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 ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "Product for Output"
+msgstr "Producto para gastos"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
+#: view:pos.sales.user.today.current_user:0
+msgid "Sales for Current User"
+msgstr "Ventas para el usuario actual"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr "Fecha de apertura"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr "Desc."
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr "Líneas de venta TPV"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr "Recibo"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: point_of_sale
+#: field:pos.order,num_sale:0
+msgid "Internal Note"
+msgstr "Nota interna"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr "transacción del TPV"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
+#, python-format
+msgid "UserError "
+msgstr "ErrorUsuario "
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
+msgstr "Entradas caja TPV"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
+#, python-format
+msgid "You can't modify this order. It has already been paid"
+msgstr "No puede modificar esta venta. Ya ha sido pagada."
+
+#. module: point_of_sale
+#: field:pos.details,date_end:0
+#: field:pos.sale.user,date_end:0
+msgid "Date End"
+msgstr "Fecha final"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr "Número de transacción"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
+#: selection:pos.order,state:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Return Picking"
+msgstr "Devolver albarán"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr "Ventas (resumen)"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Information"
+msgstr "Información"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Input Operations"
+msgstr "Operaciones de entrada"
+
+#. 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 "Punto de venta. Análisis registro caja"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
+msgid "Sale by Users"
+msgstr "Ventas por usuarios"
+
+#. module: point_of_sale
+#: report:pos.payment.report:0
+msgid "Payment For Sale"
+msgstr "Pago por venta"
+
+#. module: point_of_sale
+#: field:pos.order,first_name:0
+msgid "First Name"
+msgstr "Nombre"
+
+#. module: point_of_sale
+#: view:res.company:0
+msgid "Other"
+msgstr "Varios"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr "Líneas del Terminal Punto de Venta"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: view:report.transaction.pos:0
+msgid "Amount total"
+msgstr "Importe total"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+msgid "Cash Registers"
+msgstr "Registros de caja"
+
+#. module: point_of_sale
+#: view:account.journal:0
+#: field:account.journal,journal_users:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: point_of_sale
+#: field:pos.scan.product,gencod:0
+msgid "Barcode"
+msgstr "Código de barras"
+
+#. 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 "TPV"
+
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Output Operations"
+msgstr "Operaciones de salida"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Start Period"
+msgstr "Periodo inicial"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Cash Registers"
+msgstr "Abrir registros de caja"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr "]"
+
+#. module: point_of_sale
+#: 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: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr "Devolución proveedor"
+
+#. 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 "Agrupar por..."
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr "Ventas TPV"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr "Todas cajas registradoras cerradas"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
+#, python-format
+msgid "No Pricelist !"
+msgstr "¡No existe tarifa!"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
+msgid "Select an Open Sale Order"
+msgstr "Seleccione una orden de venta abierta"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order date"
+msgstr "Fecha pedido"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr "Base"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: point_of_sale
+#: field:pos.order,sale_manager:0
+msgid "Salesman Manager"
+msgstr "Responsable de ventas"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: point_of_sale
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. 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 "Línea de venta"
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+#: report:pos.details:0
+msgid "Code"
+msgstr "Código"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.actions.act_window,name:point_of_sale.action_product_output
+#: 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 "Productos"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
+msgid "Payment Report For Sale"
+msgstr "Informe de pago para venta"
+
+#. module: point_of_sale
+#: field:account.journal,special_journal:0
+msgid "Special Journal"
+msgstr "Diario especial"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
+msgid "All closed cashbox of the day"
+msgstr "Todas cajas registradoras cerradas del día"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: point_of_sale
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr "Comercial conectado"
+
+#. module: point_of_sale
+#: model:ir.module.module,description:point_of_sale.module_meta_information
+msgid ""
+"\n"
+"Main features :\n"
+" - Fast encoding of the sale.\n"
+" - Allow to choose one payment mode (the quick way) or to split the payment "
+"between several payment mode.\n"
+" - Computation of the amount of money to return.\n"
+" - Create and confirm picking list automatically.\n"
+" - Allow the user to create invoice automatically.\n"
+" - Allow to refund former sales.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"Características principales:\n"
+" - Rápida codificación de la venta.\n"
+" - Permite seleccionar un modo de pago (la forma más rápida) o dividir el "
+"pago entre varios modos de pago.\n"
+" - Cálculo de la cantidad de dinero a devolver.\n"
+" - Crea y confirma el albarán automáticamente.\n"
+" - Permite al usuario crear factura de forma automática.\n"
+" - Permite la devolución de ventas anteriores.\n"
+"\n"
+"    "
+
+#. module: point_of_sale
+#: field:pos.order,price_type:0
+msgid "Price method"
+msgstr "Método de precio"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the receipt of the sale"
+msgstr "Imprimir ticket de la venta"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. 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 "Ventas por usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+msgid "Sale Confirm"
+msgstr "Confirmar venta"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr "estado"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Prices"
+msgstr "Precios"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:544
+#, python-format
+msgid "Please provide an account for the product: %s"
+msgstr "Por favor informe una cuenta para el producto: '%s'"
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr "Retraso validación"
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr "Número de copias"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr "Punto de venta. Pago"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "End Period"
+msgstr "Periodo final"
+
+#. module: point_of_sale
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+msgstr "Apertura automática"
+
+#. module: point_of_sale
+#: field:pos.order.line,price_ded:0
+msgid "Discount(Amount)"
+msgstr "Descuento (importe)"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:51
+#, python-format
+msgid "Active ID is not found"
+msgstr "Active ID no encontrado"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,is_acc:0
+msgid "Is accompte"
+msgstr "Anticipo"
+
+#. 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 "Mes"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Sales Order POS"
+msgstr "Ventas TPV"
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr "Nombre extracto"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: model:ir.ui.menu,name:point_of_sale.menu_cash_register
+#: field:pos.box.entries,journal_id:0
+#: field:pos.box.out,journal_id:0
+#: field:pos.make.payment,journal:0
+msgid "Cash Register"
+msgstr "Registro de caja"
+
+#. module: point_of_sale
+#: field:pos.payment.report.date,date_start:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr "Punto de venta. Recibo"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
+#, python-format
+msgid "No order lines defined for this sale "
+msgstr "Nº de líneas del pedido definido en esta venta "
+
+#. 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 "Ventas por margen diario del usuario"
+
+#. module: point_of_sale
+#: field:pos.order,note_2:0
+msgid "Customer Note"
+msgstr "Nota cliente"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:337
+#, python-format
+msgid "No order lines defined for this sale."
+msgstr "No se han añadido líneas en esta venta."
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start:0
+msgid "Opening Balance"
+msgstr "Saldo de apertura"
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0
+#: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr "Todas las líneas de venta"
+
+#. module: point_of_sale
+#: selection:pos.order,state:0
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr "Ventas por margen"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+msgstr "Configuración diario"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr "Líneas extracto"
+
+#. 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 ""
+"Persona que usa la caja registradora. Podría ser un sustituto, un estudiante "
+"o un empleado provisional."
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr "Nº factura"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+msgid "Receipt"
+msgstr "Tiquet"
+
+#. module: point_of_sale
+#: field:pos.order,invoice_wanted:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: point_of_sale
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
+#: field:pos.order,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_get_sale
+msgid "Get From Sale"
+msgstr "Obtener desde venta"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: selection:report.cash.register,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: point_of_sale
+#: field:pos.order.line,order_id:0
+msgid "Order Ref"
+msgstr "Ref. venta"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
+msgid "Sales lines Report"
+msgstr "Informe líneas ventas"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: view:pos.box.entries:0
+msgid "Box Entries"
+msgstr "Asientos caja"
+
+#. module: point_of_sale
+#: selection:pos.order,price_type:0
+msgid "Tax excluded"
+msgstr "Impuesto excluido"
+
+#. 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 "Margen neto por ctdad"
+
+#. 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 "Ventas por margen usuario"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
+msgstr "Punto de venta. Estadísticas pedidos"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
+#: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr "Líneas TPV"
+
+#. module: point_of_sale
+#: field:product.product,disc_controle:0
+msgid "Discount Control"
+msgstr "Control descuento"
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. 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 "Detalles de ventas"
+
+#. module: point_of_sale
+#: field:pos.payment.report.date,date_end:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: point_of_sale
+#: field:pos.order,date_order:0
+msgid "Date Ordered"
+msgstr "Fecha venta"
+
+#. 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 "Líneas de ventas por usuarios"
+
+#. module: point_of_sale
+#: field:res.company,max_diff:0
+msgid "Max Difference for Cashboxes"
+msgstr "Máxima diferencia para cajas registradoras"
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:743
+#, 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: point_of_sale
+#: view:pos.make.payment:0
+msgid "The cash register must be opened to be able to execute a payment."
+msgstr "El registro de caja debe estar abierto para poder efectuar un pago."
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Product Description"
+msgstr "Descripción del producto"
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0
+#: field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr "Fecha inicial"
+
+#. module: point_of_sale
+#: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+msgid "Total"
+msgstr "Total"
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr "Ventas por usuario"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Cash Register"
+msgstr "Abrir registro de caja"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr "Extracto"
+
+#. module: point_of_sale
+#: field:pos.order,name:0
+msgid "Order Description"
+msgstr "Ref. venta"
+
+#. module: point_of_sale
+#: field:pos.make.payment,num_sale:0
+msgid "Num.File"
+msgstr "Núm. fichero"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_date
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr "Informe pago"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
+msgid "Return lines"
+msgstr "Líneas de devolución"
+
+#. 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:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
+#, 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: point_of_sale
+#: field:pos.order.line,serial_number:0
+msgid "Serial Number"
+msgstr "Número de serie"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Reprint"
+msgstr "Reimprimir"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#, python-format
+msgid "You have to open at least one cashbox"
+msgstr "Debe abrir por lo menos una caja"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr "Pagos de hoy por usuario"
+
+#. module: point_of_sale
+#: field:stock.picking,pos_order:0
+msgid "Pos order"
+msgstr "Venta TPV"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr "Núm. de artículos"
+
+#. module: point_of_sale
+#: field:pos.order,date_validity:0
+msgid "Validity Date"
+msgstr "Fecha validez"
+
+#. module: point_of_sale
+#: field:pos.order,pickings:0
+msgid "Picking"
+msgstr "Albarán"
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Last Output Picking"
+msgstr "Último albarán de salida"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. 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 "Informe TPV"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add Discount"
+msgstr "Añadir descuento"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Cash Register"
+msgstr "Cerrar registro de caja"
+
+#. module: point_of_sale
+#: field:pos.order.line,qty_rfd:0
+msgid "Refunded Quantity"
+msgstr "Cantidad devuelta"
+
+#. module: point_of_sale
+#: view:pos.scan.product:0
+msgid "Scan Barcode"
+msgstr "Escanear código de barras"
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0
+#: field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: point_of_sale
+#: field:pos.order,journal_entry:0
+msgid "Journal Entry"
+msgstr "Asiento contable"
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: point_of_sale
+#: report:pos.payment.report.date:0
+msgid "Sales Lines"
+msgstr "Líneas ventas"
+
+#. module: point_of_sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0
+msgid "Discount "
+msgstr "Descuento "
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1214
+#, python-format
+msgid "Modify line failed !"
+msgstr "¡Ha fallado la modificación de la línea!"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment name"
+msgstr "Descripción pago"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products for Input Operations"
+msgstr "Productos para operaciones de entrada"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
+msgid "Today's Sales by Current User"
+msgstr "Ventas de hoy por usuario actual"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
+msgstr "TPV. Caja salida"
+
+#. module: point_of_sale
+#: 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: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: point_of_sale
+#: field:pos.order,date_validation:0
+#: field:report.pos.order,date_validation:0
+msgid "Validation Date"
+msgstr "Fecha de validación"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#, python-format
+msgid "You don't have enough access to validate this sale!"
+msgstr "¡No tiene suficientes permisos para validar esta venta!"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "Descuento total"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr "Coger dinero"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
+msgid "Sales Details"
+msgstr "Detalles de ventas"
+
+#. module: point_of_sale
+#: field:product.product,am_out:0
+msgid "Control for Output Operations"
+msgstr "Control de las operaciones de salida"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
+#, python-format
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: point_of_sale
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
+#: model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "Point of Sale"
+msgstr "Terminal Punto de Venta"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id: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 "Vendedor"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "No"
+msgstr "No"
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr "Nota de descuento"
+
+#. module: point_of_sale
+#: view:pos.scan.product:0
+msgid "Add"
+msgstr "Añadir"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "Línea de venta TPV"
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Are you sure you want to open the statements ?"
+msgstr "¿Seguro que desea abrir los extractos?"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_date
+msgid "POS Payment Report according to date"
+msgstr "TPV. Informe de pago según la fecha"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:637
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr "Por favor indique una empresa para la venta."
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:852
+#, python-format
+msgid ""
+"There is no receivable account defined for this journal: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta a cobrar para este diario : \"%s\" (id:%d)"
+
+#. module: point_of_sale
+#: field:pos.order,user_salesman_id:0
+msgid "Cashier"
+msgstr "Cajero"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user: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
+msgid "User"
+msgstr "Usuario"
+
+#. 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 "Ventas por usuario"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr "Imprimir recibo"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr "TPV Líneas pedido"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr "Diario de ventas"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr "Devolución"
+
+#. 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 "Por favor, cree una factura para esta venta."
+
+#. 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 "Fecha pedido"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+msgid "Close Cash Registers"
+msgstr "Cerrar registros de caja"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr "Desc(%)"
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr "Líneas de venta"
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr "Subtotal neto"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Add product"
+msgstr "Añadir producto"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr "Informe de pagos"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr "Diarios de caja"
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details :"
+msgstr "Detalles TPV:"
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr "Ventas de hoy por usuario"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+msgid "Please fill these fields for entries to the box:"
+msgstr "Introduzca estos campos para asientos de la caja:"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#, python-format
+msgid "please check that account is set to %s"
+msgstr "Compruebe que la cuenta esté establecida a %s"
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
+#: field:pos.config.journal,name:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr "Líneas ventas"
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Save & Close"
+msgstr "Guardar y Cerrar"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Running"
+msgstr "En progreso"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
+msgid "All Cashboxes Of the day"
+msgstr "Todas las cajas registradoras del día"
+
+#. 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 "Análisis punto de venta"
+
+#. module: point_of_sale
+#: field:pos.make.payment,partner_id:0
+#: view:pos.order:0
+#: field:pos.order,partner_id:0
+#: view:report.pos.order:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: point_of_sale
+#: field:pos.make.payment,is_acc:0
+#: field:pos.make.payment,product_id:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Advance"
+msgstr "Adelanto"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr "    Hoy    "
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#, python-format
+msgid ""
+"The maximum value you can still withdraw is exceeded. \n"
+" Remaining value is equal to %d "
+msgstr ""
+"El valor máximo que puede rebajar se ha excedido.\n"
+"  El valor restante es igual a %d "
+
+#. module: point_of_sale
+#: field:pos.order,remboursed:0
+msgid "Remboursed"
+msgstr "Reembolsado"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
+msgid "Opened Sales"
+msgstr "Ventas abiertas"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: point_of_sale
+#: field:pos.order,statement_ids:0
+msgid "Payments"
+msgstr "Pagos"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+msgid "Print Date"
+msgstr "Fecha impresión"
+
+#. 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 "Ventas por margen mensual de usuario"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Account Entry"
+msgstr "Asiento contable"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:84
+#: code:addons/point_of_sale/wizard/pos_return.py:407
+#: view:pos.make.payment:0
+#: view:pos.order:0
+#, python-format
+msgid "Make Payment"
+msgstr "Realizar pago"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+#: view:pos.sales.user.today:0
+msgid "Sales User Today"
+msgstr "Ventas usuario de hoy"
+
+#. 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 "Año"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "Discount :"
+#~ msgstr "Descuento :"
+
+#~ msgid "Piece number"
+#~ msgstr "Número referencia"
+
+#~ msgid "Scan Product"
+#~ msgstr "Escanear producto"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
+#~ msgid "Orders of the day"
+#~ msgstr "Ventas del día"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref. empresa"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "Detail of Sales"
+#~ msgstr "Detalle de ventas"
+
+#~ msgid "Operation N° :"
+#~ msgstr "Operación Num. :"
+
+#~ msgid "Refund Orders"
+#~ msgstr "Devoluciones"
+
+#~ msgid "Select default journals"
+#~ msgstr "Seleccione los diarios por defecto"
+
+#~ msgid "VAT(%)"
+#~ msgstr "IVA(%)"
+
+#~ msgid "Disc"
+#~ msgstr "Desc."
+
+#~ msgid "Order Payments"
+#~ msgstr "Pagos de la venta"
+
+#~ msgid "Date :"
+#~ msgstr "Fecha :"
+
+#~ msgid "Disc :"
+#~ msgstr "Desc. :"
+
+#~ msgid "User :"
+#~ msgstr "Usuario :"
+
+#~ msgid "Total :"
+#~ msgstr "Total :"
+
+#~ msgid "Point of Sale journal configuration."
+#~ msgstr "Configuración Terminal Punto de Venta"
+
+#~ msgid "Default journal"
+#~ msgstr "Diario por defecto"
+
+#~ msgid "Default Receivable"
+#~ msgstr "A cobrar por defecto"
+
+#~ msgid "Get From Order"
+#~ msgstr "Importar pedido venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "POS Lines of the day"
+#~ msgstr "Líneas TPV del día"
+
+#~ msgid "Default journals"
+#~ msgstr "Diarios por defecto"
+
+#~ msgid "Add products"
+#~ msgstr "Añadir productos"
+
+#~ msgid "POS Lines"
+#~ msgstr "Líneas TPV"
+
+#~ msgid "Define default journals"
+#~ msgstr "Definir diarios por defecto"
+
+#~ msgid "Tel :"
+#~ msgstr "Tel :"
+
+#~ msgid "Default rebate journal"
+#~ msgstr "Diario de devoluciones por defecto"
+
+#~ msgid "Wizard default journals"
+#~ msgstr "Asistente diarios por defecto"
+
+#~ msgid "Ma_ke Payment"
+#~ msgstr "_Realizar pago"
+
+#~ msgid "E-mail :"
+#~ msgstr "E-mail :"
+
+#~ msgid "Sales of the day"
+#~ msgstr "Ventas del día"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid "Discount"
+#~ msgstr "Descuento"
+
+#~ msgid "_Add product"
+#~ msgstr "_Añadir producto"
+
+#~ msgid "Period:"
+#~ msgstr "Periodo:"
+
+#~ msgid "All the sales"
+#~ msgstr "Todas las ventas"
+
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#~ msgid "Create _Invoice"
+#~ msgstr "Crear _Factura"
+
+#~ msgid "Mode of payment"
+#~ msgstr "Modo de pago"
+
+#~ msgid "Ma_ke payment"
+#~ msgstr "_Realizar pago"
+
+#~ msgid "Discount percentage"
+#~ msgstr "Porcentaje descuento"
+
+#~ msgid "Refund order :"
+#~ msgstr "Devolución :"
+
+#, python-format
+#~ msgid "Cannot delete a point of sale which is already confirmed !"
+#~ msgstr "¡No se puede eliminar una venta que ya está confirmada!"
+
+#~ 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 "Pos Payment"
+#~ msgstr "Pago TPV"
+
+#~ msgid "Refund "
+#~ msgstr "Devolución "
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "Default gift journal"
+#~ msgstr "Diario de vales por defecto"
+
+#~ msgid "All orders"
+#~ msgstr "Todas las ventas"
+
+#~ msgid "Sales of the month"
+#~ msgstr "Ventas del mes"
+
+#~ msgid "D_iscount"
+#~ msgstr "D_escuento"
+
+#~ msgid "Ce bon est valide jusqu'au"
+#~ msgstr "Este bono es válido hasta"
+
+#~ msgid "Payment Term"
+#~ msgstr "Plazo de pago"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Print Date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Company:"
+#~ msgstr "Compañía:"
+
+#, python-format
+#~ msgid "Cannot create invoice without a partner."
+#~ msgstr "No se puede crear una factura sin una empresa."
+
+#~ msgid "Net Total"
+#~ msgstr "Total neto"
+
+#~ msgid "Payment Name"
+#~ msgstr "Descripción pago"
+
+#~ msgid "Piece Number"
+#~ msgstr "Número ref."
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Error del usuario"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Product for expenses"
+#~ msgstr "Producto para gastos"
diff --git a/addons/point_of_sale/i18n/es_VE.po b/addons/point_of_sale/i18n/es_VE.po
new file mode 100644
index 00000000000..9baadbbecde
--- /dev/null
+++ b/addons/point_of_sale/i18n/es_VE.po
@@ -0,0 +1,2597 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* point_of_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-07-23 03:02+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: 2011-09-05 05:05+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: point_of_sale
+#: field:pos.discount,discount_notes:0
+msgid "Discount Notes"
+msgstr "Notas del descuento"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr "Ventas por día"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Point of Sale Confirm"
+msgstr "Punto de venta. Confirmar"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
+msgstr "Aplicar descuento"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr "Nº de producto"
+
+#. module: point_of_sale
+#: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
+msgid "Point Of Sale"
+msgstr "Punto de Venta"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Add product :"
+msgstr "Añadir producto :"
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+msgid "All Cashboxes Of the day :"
+msgstr "Todas las cajas de efectivo del día:"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr "Introducir dnero"
+
+#. 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 "Análisis registro"
+
+#. 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 "Detalles de ventas"
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Are you sure you want to close the statements ?"
+msgstr "¿Está seguro de querer cerrar las declaraciones?"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
+msgid "Scan product"
+msgstr "Escanear producto"
+
+#. 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 "Día"
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr "Añadir pago :"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+msgid "Box Out"
+msgstr "Caja cerrada"
+
+#. module: point_of_sale
+#: report:pos.sales.user.today.current.user:0
+msgid "Today's Sales By Current User"
+msgstr "Ventas de hoy por usuario actual"
+
+#. 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 "Importe"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: point_of_sale
+#: view:report.transaction.pos:0
+msgid "Total Transaction"
+msgstr "Total transacción"
+
+#. module: point_of_sale
+#: help:account.journal,special_journal:0
+msgid "Will put all the orders in waiting status till being accepted"
+msgstr "Pondrá todas las órdenes en espera hasta que sean aceptadas"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total of the day"
+msgstr "Total del día"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,average_price:0
+msgid "Average Price"
+msgstr "Precio promedio"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Total descuento"
+
+#. 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
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+msgid "Add payment"
+msgstr "Añadir pago"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr "Ventas por mes"
+
+#. 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 "Ventas por usuario"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+#: field:pos.box.out,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 "Precio total"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Miscelleanous"
+msgstr "Varios"
+
+#. 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 "Informe de ventas"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
+#, python-format
+msgid "No Order Lines"
+msgstr "Nº líneas pedido"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Product Type"
+msgstr "Tipo de producto"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: view:pos.payment.report.date:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: point_of_sale
+#: field:res.company,company_discount:0
+msgid "Max Discount(%)"
+msgstr "Descuento máximo (%)"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Cash register management"
+msgstr "Gestión de la caja"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
+#, python-format
+msgid "No valid pricelist line found !"
+msgstr "¡Se ha encontrado una línea de tarifa no válida!"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date: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 "Margen"
+
+#. module: point_of_sale
+#: field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "Ctd. total"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr "Ventas mensuales por usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
+#, python-format
+msgid ""
+"You can not open a Cashbox for \"%s\".\n"
+"Please close its related cash register."
+msgstr ""
+"No puede abrir una caja registradora para \"%s\".\n"
+"Cierre el registro de caja relacionado."
+
+#. module: point_of_sale
+#: help:pos.order,user_salesman_id:0
+msgid "User who is logged into the system."
+msgstr "Usuario conectado al sistema"
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "Product for Input"
+msgstr "Producto para entrada"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr "Método de pago"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr "Operaciones diarias"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr "Buscar extractos de efectivo"
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Are you sure you want to close your sales ?"
+msgstr "¿Está seguro de querer cerrar sus ventas?"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "June"
+msgstr "Junio"
+
+#. 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 "Ventas mensuales por usuario"
+
+#. module: point_of_sale
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
+msgid "Payment Date"
+msgstr "Fecha de pago"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr "Fecha de cierre"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,am_out:0
+msgid "To count"
+msgstr "Para contar"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_payment:0
+msgid "Delay Payment"
+msgstr "Retrasar pago"
+
+#. module: point_of_sale
+#: field:pos.add.product,quantity:0
+#: 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 "Cantidad"
+
+#. module: point_of_sale
+#: help:account.journal,auto_cash:0
+msgid "This field authorize the automatic creation of the cashbox"
+msgstr "Este campo autoriza la creación automática de la caja."
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "Período"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
+msgid "Net Total:"
+msgstr "Base:"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line Description"
+msgstr "Descipción línea"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Codes"
+msgstr "Códigos"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr "Salidas de caja"
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+msgid "Print Report"
+msgstr "Imprimir informe"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr "Compruebe que la cuenta de ingresos esté %s"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:56
+#: code:addons/point_of_sale/wizard/pos_return.py:166
+#: code:addons/point_of_sale/wizard/pos_return.py:327
+#: model:ir.actions.act_window,name:point_of_sale.action_add_product
+#: model:ir.model,name:point_of_sale.model_pos_add_product
+#, python-format
+msgid "Add Product"
+msgstr "Añadir producto"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr "Importe factura"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id: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 "Diario"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
+msgstr "Saldo final"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products for Output Operations"
+msgstr "Producto para operaciones de salida"
+
+#. module: point_of_sale
+#: view:pos.payment.report.date:0
+msgid "Sale by Date and User"
+msgstr "Ventas por fecha y usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:69
+#, python-format
+msgid ""
+"Cannot delete a point of sale which is closed or contains confirmed "
+"cashboxes!"
+msgstr ""
+"¡No se puede eliminar un punto de venta que esté cerrado o contenga cajas "
+"registradoras confirmadas!"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr "Modo de impuestos"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
+#, python-format
+msgid "Cash registers are already closed."
+msgstr "Registros de caja ya están cerrados."
+
+#. module: point_of_sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr "Abrir extractos"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Save & New"
+msgstr "Guardar y Nuevo"
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr "Total ventas (ingresos)"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total paid"
+msgstr "Total pagado"
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Check Details"
+msgstr "Verificar detalles"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Qty of product"
+msgstr "Ctd. producto"
+
+#. module: point_of_sale
+#: field:pos.order,contract_number:0
+msgid "Contract Number"
+msgstr "Número de contrato"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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 "Producto del usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"¡Debe seleccionar una lista de precios en el formulario de ventas!\n"
+"Por favor seleccione una antes de seleccionar un producto."
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. 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
+#: view:pos.close.statement:0
+msgid "Close Statements"
+msgstr "Cerrar extractos"
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configureation"
+msgstr "Configuración extendida"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr "Saldo inicial"
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr "Pago por usuario"
+
+#. module: point_of_sale
+#: field:pos.order,type_rec:0
+msgid "Type of Receipt"
+msgstr "Tipo de recibo"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
+msgid "Accepted Sales"
+msgstr "Ventas aceptadas"
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without checking ending details"
+msgstr ""
+"Este campo autoriza la validación de la caja registradora sin comprobar los "
+"detalles finales"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr "Nombre extracto"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr "Total ventas"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr "Suma de subtotales"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment date"
+msgstr "Fecha de pago"
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "Líneas de venta"
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
+msgstr "Ventas de hoy"
+
+#. 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 "TPV "
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#, python-format
+msgid "Create line failed !"
+msgstr "¡Ha fallado la creación de línea!"
+
+#. 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 "Nombre del Producto"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:69
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr "Total facturado"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_return
+msgid "Point of sale return"
+msgstr "Punto de venta. Devolución"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr "Ventas por margen mensual"
+
+#. 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 "Fecha pedido"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr "Caja registradora cerrada hoy"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. 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 ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "Product for Output"
+msgstr "Producto para gastos"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
+#: view:pos.sales.user.today.current_user:0
+msgid "Sales for Current User"
+msgstr "Ventas para el usuario actual"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr "Fecha de apertura"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr "Desc."
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr "Líneas de venta TPV"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr "Recibo"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: point_of_sale
+#: field:pos.order,num_sale:0
+msgid "Internal Note"
+msgstr "Nota interna"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr "transacción del TPV"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
+#, python-format
+msgid "UserError "
+msgstr "ErrorUsuario "
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
+msgstr "Entradas caja TPV"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
+#, python-format
+msgid "You can't modify this order. It has already been paid"
+msgstr "No puede modificar esta venta. Ya ha sido pagada."
+
+#. module: point_of_sale
+#: field:pos.details,date_end:0
+#: field:pos.sale.user,date_end:0
+msgid "Date End"
+msgstr "Fecha final"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr "Número de transacción"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
+#: selection:pos.order,state:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Return Picking"
+msgstr "Devolver albarán"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr "Ventas (resumen)"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Information"
+msgstr "Información"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Input Operations"
+msgstr "Operaciones de entrada"
+
+#. 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 "Punto de venta. Análisis registro caja"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
+msgid "Sale by Users"
+msgstr "Ventas por usuarios"
+
+#. module: point_of_sale
+#: report:pos.payment.report:0
+msgid "Payment For Sale"
+msgstr "Pago por venta"
+
+#. module: point_of_sale
+#: field:pos.order,first_name:0
+msgid "First Name"
+msgstr "Nombre"
+
+#. module: point_of_sale
+#: view:res.company:0
+msgid "Other"
+msgstr "Varios"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr "Líneas del Terminal Punto de Venta"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: view:report.transaction.pos:0
+msgid "Amount total"
+msgstr "Importe total"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+msgid "Cash Registers"
+msgstr "Registros de caja"
+
+#. module: point_of_sale
+#: view:account.journal:0
+#: field:account.journal,journal_users:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: point_of_sale
+#: field:pos.scan.product,gencod:0
+msgid "Barcode"
+msgstr "Código de barras"
+
+#. 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 "TPV"
+
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Output Operations"
+msgstr "Operaciones de salida"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Start Period"
+msgstr "Periodo inicial"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Cash Registers"
+msgstr "Abrir registros de caja"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr "]"
+
+#. module: point_of_sale
+#: 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: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr "Devolución proveedor"
+
+#. 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 "Agrupar por..."
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr "Ventas TPV"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr "Todas cajas registradoras cerradas"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
+#, python-format
+msgid "No Pricelist !"
+msgstr "¡No existe tarifa!"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
+msgid "Select an Open Sale Order"
+msgstr "Seleccione una orden de venta abierta"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order date"
+msgstr "Fecha pedido"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr "Base"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: point_of_sale
+#: field:pos.order,sale_manager:0
+msgid "Salesman Manager"
+msgstr "Responsable de ventas"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: point_of_sale
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. 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 "Línea de venta"
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+#: report:pos.details:0
+msgid "Code"
+msgstr "Código"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.actions.act_window,name:point_of_sale.action_product_output
+#: 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 "Productos"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
+msgid "Payment Report For Sale"
+msgstr "Informe de pago para venta"
+
+#. module: point_of_sale
+#: field:account.journal,special_journal:0
+msgid "Special Journal"
+msgstr "Diario especial"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
+msgid "All closed cashbox of the day"
+msgstr "Todas cajas registradoras cerradas del día"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: point_of_sale
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr "Comercial conectado"
+
+#. module: point_of_sale
+#: model:ir.module.module,description:point_of_sale.module_meta_information
+msgid ""
+"\n"
+"Main features :\n"
+" - Fast encoding of the sale.\n"
+" - Allow to choose one payment mode (the quick way) or to split the payment "
+"between several payment mode.\n"
+" - Computation of the amount of money to return.\n"
+" - Create and confirm picking list automatically.\n"
+" - Allow the user to create invoice automatically.\n"
+" - Allow to refund former sales.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"Características principales:\n"
+" - Rápida codificación de la venta.\n"
+" - Permite seleccionar un modo de pago (la forma más rápida) o dividir el "
+"pago entre varios modos de pago.\n"
+" - Cálculo de la cantidad de dinero a devolver.\n"
+" - Crea y confirma el albarán automáticamente.\n"
+" - Permite al usuario crear factura de forma automática.\n"
+" - Permite la devolución de ventas anteriores.\n"
+"\n"
+"    "
+
+#. module: point_of_sale
+#: field:pos.order,price_type:0
+msgid "Price method"
+msgstr "Método de precio"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the receipt of the sale"
+msgstr "Imprimir ticket de la venta"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Month -1"
+msgstr "Mes -1"
+
+#. 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 "Ventas por usuario"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+msgid "Sale Confirm"
+msgstr "Confirmar venta"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr "estado"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Prices"
+msgstr "Precios"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:544
+#, python-format
+msgid "Please provide an account for the product: %s"
+msgstr "Por favor informe una cuenta para el producto: '%s'"
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr "Retraso validación"
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr "Número de copias"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr "Punto de venta. Pago"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "End Period"
+msgstr "Periodo final"
+
+#. module: point_of_sale
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+msgstr "Apertura automática"
+
+#. module: point_of_sale
+#: field:pos.order.line,price_ded:0
+msgid "Discount(Amount)"
+msgstr "Descuento (importe)"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:51
+#, python-format
+msgid "Active ID is not found"
+msgstr "Active ID no encontrado"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,is_acc:0
+msgid "Is accompte"
+msgstr "Anticipo"
+
+#. 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 "Mes"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Sales Order POS"
+msgstr "Ventas TPV"
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr "Nombre extracto"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: model:ir.ui.menu,name:point_of_sale.menu_cash_register
+#: field:pos.box.entries,journal_id:0
+#: field:pos.box.out,journal_id:0
+#: field:pos.make.payment,journal:0
+msgid "Cash Register"
+msgstr "Registro de caja"
+
+#. module: point_of_sale
+#: field:pos.payment.report.date,date_start:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr "Punto de venta. Recibo"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
+#, python-format
+msgid "No order lines defined for this sale "
+msgstr "Nº de líneas del pedido definido en esta venta "
+
+#. 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 "Ventas por margen diario del usuario"
+
+#. module: point_of_sale
+#: field:pos.order,note_2:0
+msgid "Customer Note"
+msgstr "Nota cliente"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:337
+#, python-format
+msgid "No order lines defined for this sale."
+msgstr "No se han añadido líneas en esta venta."
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start:0
+msgid "Opening Balance"
+msgstr "Saldo de apertura"
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0
+#: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr "Todas las líneas de venta"
+
+#. module: point_of_sale
+#: selection:pos.order,state:0
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr "Ventas por margen"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+msgstr "Configuración diario"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr "Líneas extracto"
+
+#. 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 ""
+"Persona que usa la caja registradora. Podría ser un sustituto, un estudiante "
+"o un empleado provisional."
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr "Nº factura"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+msgid "Receipt"
+msgstr "Tiquet"
+
+#. module: point_of_sale
+#: field:pos.order,invoice_wanted:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: point_of_sale
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
+#: field:pos.order,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_get_sale
+msgid "Get From Sale"
+msgstr "Obtener desde venta"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: selection:report.cash.register,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: point_of_sale
+#: field:pos.order.line,order_id:0
+msgid "Order Ref"
+msgstr "Ref. venta"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
+msgid "Sales lines Report"
+msgstr "Informe líneas ventas"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: view:pos.box.entries:0
+msgid "Box Entries"
+msgstr "Asientos caja"
+
+#. module: point_of_sale
+#: selection:pos.order,price_type:0
+msgid "Tax excluded"
+msgstr "Impuesto excluido"
+
+#. 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 "Margen neto por ctdad"
+
+#. 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 "Ventas por margen usuario"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
+msgstr "Punto de venta. Estadísticas pedidos"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
+#: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr "Líneas TPV"
+
+#. module: point_of_sale
+#: field:product.product,disc_controle:0
+msgid "Discount Control"
+msgstr "Control descuento"
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. 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 "Detalles de ventas"
+
+#. module: point_of_sale
+#: field:pos.payment.report.date,date_end:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: point_of_sale
+#: field:pos.order,date_order:0
+msgid "Date Ordered"
+msgstr "Fecha venta"
+
+#. 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 "Líneas de ventas por usuarios"
+
+#. module: point_of_sale
+#: field:res.company,max_diff:0
+msgid "Max Difference for Cashboxes"
+msgstr "Máxima diferencia para cajas registradoras"
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:743
+#, 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: point_of_sale
+#: view:pos.make.payment:0
+msgid "The cash register must be opened to be able to execute a payment."
+msgstr "El registro de caja debe estar abierto para poder efectuar un pago."
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Product Description"
+msgstr "Descripción del producto"
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0
+#: field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr "Fecha inicial"
+
+#. module: point_of_sale
+#: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+msgid "Total"
+msgstr "Total"
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr "Ventas por usuario"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Cash Register"
+msgstr "Abrir registro de caja"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr "Extracto"
+
+#. module: point_of_sale
+#: field:pos.order,name:0
+msgid "Order Description"
+msgstr "Ref. venta"
+
+#. module: point_of_sale
+#: field:pos.make.payment,num_sale:0
+msgid "Num.File"
+msgstr "Núm. fichero"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_date
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr "Informe pago"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
+msgid "Return lines"
+msgstr "Líneas de devolución"
+
+#. 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:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
+#, 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: point_of_sale
+#: field:pos.order.line,serial_number:0
+msgid "Serial Number"
+msgstr "Número de serie"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Reprint"
+msgstr "Reimprimir"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#, python-format
+msgid "You have to open at least one cashbox"
+msgstr "Debe abrir por lo menos una caja"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr "Pagos de hoy por usuario"
+
+#. module: point_of_sale
+#: field:stock.picking,pos_order:0
+msgid "Pos order"
+msgstr "Venta TPV"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr "Núm. de artículos"
+
+#. module: point_of_sale
+#: field:pos.order,date_validity:0
+msgid "Validity Date"
+msgstr "Fecha validez"
+
+#. module: point_of_sale
+#: field:pos.order,pickings:0
+msgid "Picking"
+msgstr "Albarán"
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Last Output Picking"
+msgstr "Último albarán de salida"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. 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 "Informe TPV"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add Discount"
+msgstr "Añadir descuento"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Cash Register"
+msgstr "Cerrar registro de caja"
+
+#. module: point_of_sale
+#: field:pos.order.line,qty_rfd:0
+msgid "Refunded Quantity"
+msgstr "Cantidad devuelta"
+
+#. module: point_of_sale
+#: view:pos.scan.product:0
+msgid "Scan Barcode"
+msgstr "Escanear código de barras"
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0
+#: field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: point_of_sale
+#: field:pos.order,journal_entry:0
+msgid "Journal Entry"
+msgstr "Asiento contable"
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: point_of_sale
+#: report:pos.payment.report.date:0
+msgid "Sales Lines"
+msgstr "Líneas ventas"
+
+#. module: point_of_sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0
+msgid "Discount "
+msgstr "Descuento "
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1214
+#, python-format
+msgid "Modify line failed !"
+msgstr "¡Ha fallado la modificación de la línea!"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment name"
+msgstr "Descripción pago"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products for Input Operations"
+msgstr "Productos para operaciones de entrada"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
+msgid "Today's Sales by Current User"
+msgstr "Ventas de hoy por usuario actual"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
+msgstr "TPV. Caja salida"
+
+#. module: point_of_sale
+#: 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: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "Fecha inicial"
+
+#. module: point_of_sale
+#: field:pos.order,date_validation:0
+#: field:report.pos.order,date_validation:0
+msgid "Validation Date"
+msgstr "Fecha de validación"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#, python-format
+msgid "You don't have enough access to validate this sale!"
+msgstr "¡No tiene suficientes permisos para validar esta venta!"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "Descuento total"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr "Coger dinero"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
+msgid "Sales Details"
+msgstr "Detalles de ventas"
+
+#. module: point_of_sale
+#: field:product.product,am_out:0
+msgid "Control for Output Operations"
+msgstr "Control de las operaciones de salida"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
+#, python-format
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: point_of_sale
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
+#: model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "Point of Sale"
+msgstr "Terminal Punto de Venta"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id: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 "Vendedor"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+#: view:pos.confirm:0
+#: view:pos.open.statement:0
+msgid "No"
+msgstr "No"
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr "Nota de descuento"
+
+#. module: point_of_sale
+#: view:pos.scan.product:0
+msgid "Add"
+msgstr "Añadir"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "Línea de venta TPV"
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Are you sure you want to open the statements ?"
+msgstr "¿Seguro que desea abrir los extractos?"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_date
+msgid "POS Payment Report according to date"
+msgstr "TPV. Informe de pago según la fecha"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:637
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr "Por favor indique una empresa para la venta."
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:852
+#, python-format
+msgid ""
+"There is no receivable account defined for this journal: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta a cobrar para este diario : \"%s\" (id:%d)"
+
+#. module: point_of_sale
+#: field:pos.order,user_salesman_id:0
+msgid "Cashier"
+msgstr "Cajero"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user: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
+msgid "User"
+msgstr "Usuario"
+
+#. 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 "Ventas por usuario"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr "Imprimir recibo"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr "TPV Líneas pedido"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr "Diario de ventas"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr "Devolución"
+
+#. 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 "Por favor, cree una factura para esta venta."
+
+#. 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 "Fecha pedido"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+msgid "Close Cash Registers"
+msgstr "Cerrar registros de caja"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr "Desc(%)"
+
+#. module: point_of_sale
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr "Líneas de venta"
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr "Subtotal neto"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Add product"
+msgstr "Añadir producto"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr "Informe de pagos"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr "Diarios de caja"
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details :"
+msgstr "Detalles TPV:"
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr "Ventas de hoy por usuario"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+msgid "Please fill these fields for entries to the box:"
+msgstr "Introduzca estos campos para asientos de la caja:"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#, python-format
+msgid "please check that account is set to %s"
+msgstr "Compruebe que la cuenta esté establecida a %s"
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
+#: field:pos.config.journal,name:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr "Líneas ventas"
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr "Notas internas"
+
+#. module: point_of_sale
+#: view:pos.add.product:0
+msgid "Save & Close"
+msgstr "Guardar y Cerrar"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Running"
+msgstr "En progreso"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
+msgid "All Cashboxes Of the day"
+msgstr "Todas las cajas registradoras del día"
+
+#. 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 "Análisis punto de venta"
+
+#. module: point_of_sale
+#: field:pos.make.payment,partner_id:0
+#: view:pos.order:0
+#: field:pos.order,partner_id:0
+#: view:report.pos.order:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: point_of_sale
+#: field:pos.make.payment,is_acc:0
+#: field:pos.make.payment,product_id:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Advance"
+msgstr "Adelanto"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr "    Hoy    "
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#, python-format
+msgid ""
+"The maximum value you can still withdraw is exceeded. \n"
+" Remaining value is equal to %d "
+msgstr ""
+"El valor máximo que puede rebajar se ha excedido.\n"
+"  El valor restante es igual a %d "
+
+#. module: point_of_sale
+#: field:pos.order,remboursed:0
+msgid "Remboursed"
+msgstr "Reembolsado"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
+msgid "Opened Sales"
+msgstr "Ventas abiertas"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: point_of_sale
+#: field:pos.order,statement_ids:0
+msgid "Payments"
+msgstr "Pagos"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+msgid "Print Date"
+msgstr "Fecha impresión"
+
+#. 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 "Ventas por margen mensual de usuario"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Account Entry"
+msgstr "Asiento contable"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_add_product.py:84
+#: code:addons/point_of_sale/wizard/pos_return.py:407
+#: view:pos.make.payment:0
+#: view:pos.order:0
+#, python-format
+msgid "Make Payment"
+msgstr "Realizar pago"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+#: view:pos.sales.user.today:0
+msgid "Sales User Today"
+msgstr "Ventas usuario de hoy"
+
+#. 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 "Año"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "Discount :"
+#~ msgstr "Descuento :"
+
+#~ msgid "Piece number"
+#~ msgstr "Número referencia"
+
+#~ msgid "Scan Product"
+#~ msgstr "Escanear producto"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
+#~ msgid "Orders of the day"
+#~ msgstr "Ventas del día"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref. empresa"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "Detail of Sales"
+#~ msgstr "Detalle de ventas"
+
+#~ msgid "Operation N° :"
+#~ msgstr "Operación Num. :"
+
+#~ msgid "Refund Orders"
+#~ msgstr "Devoluciones"
+
+#~ msgid "Select default journals"
+#~ msgstr "Seleccione los diarios por defecto"
+
+#~ msgid "VAT(%)"
+#~ msgstr "IVA(%)"
+
+#~ msgid "Disc"
+#~ msgstr "Desc."
+
+#~ msgid "Order Payments"
+#~ msgstr "Pagos de la venta"
+
+#~ msgid "Date :"
+#~ msgstr "Fecha :"
+
+#~ msgid "Disc :"
+#~ msgstr "Desc. :"
+
+#~ msgid "User :"
+#~ msgstr "Usuario :"
+
+#~ msgid "Total :"
+#~ msgstr "Total :"
+
+#~ msgid "Point of Sale journal configuration."
+#~ msgstr "Configuración Terminal Punto de Venta"
+
+#~ msgid "Default journal"
+#~ msgstr "Diario por defecto"
+
+#~ msgid "Default Receivable"
+#~ msgstr "A cobrar por defecto"
+
+#~ msgid "Get From Order"
+#~ msgstr "Importar pedido venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "POS Lines of the day"
+#~ msgstr "Líneas TPV del día"
+
+#~ msgid "Default journals"
+#~ msgstr "Diarios por defecto"
+
+#~ msgid "Add products"
+#~ msgstr "Añadir productos"
+
+#~ msgid "POS Lines"
+#~ msgstr "Líneas TPV"
+
+#~ msgid "Define default journals"
+#~ msgstr "Definir diarios por defecto"
+
+#~ msgid "Tel :"
+#~ msgstr "Tel :"
+
+#~ msgid "Default rebate journal"
+#~ msgstr "Diario de devoluciones por defecto"
+
+#~ msgid "Wizard default journals"
+#~ msgstr "Asistente diarios por defecto"
+
+#~ msgid "Ma_ke Payment"
+#~ msgstr "_Realizar pago"
+
+#~ msgid "E-mail :"
+#~ msgstr "E-mail :"
+
+#~ msgid "Sales of the day"
+#~ msgstr "Ventas del día"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid "Discount"
+#~ msgstr "Descuento"
+
+#~ msgid "_Add product"
+#~ msgstr "_Añadir producto"
+
+#~ msgid "Period:"
+#~ msgstr "Periodo:"
+
+#~ msgid "All the sales"
+#~ msgstr "Todas las ventas"
+
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#~ msgid "Create _Invoice"
+#~ msgstr "Crear _Factura"
+
+#~ msgid "Mode of payment"
+#~ msgstr "Modo de pago"
+
+#~ msgid "Ma_ke payment"
+#~ msgstr "_Realizar pago"
+
+#~ msgid "Discount percentage"
+#~ msgstr "Porcentaje descuento"
+
+#~ msgid "Refund order :"
+#~ msgstr "Devolución :"
+
+#, python-format
+#~ msgid "Cannot delete a point of sale which is already confirmed !"
+#~ msgstr "¡No se puede eliminar una venta que ya está confirmada!"
+
+#~ 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 "Pos Payment"
+#~ msgstr "Pago TPV"
+
+#~ msgid "Refund "
+#~ msgstr "Devolución "
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "Default gift journal"
+#~ msgstr "Diario de vales por defecto"
+
+#~ msgid "All orders"
+#~ msgstr "Todas las ventas"
+
+#~ msgid "Sales of the month"
+#~ msgstr "Ventas del mes"
+
+#~ msgid "D_iscount"
+#~ msgstr "D_escuento"
+
+#~ msgid "Ce bon est valide jusqu'au"
+#~ msgstr "Este bono es válido hasta"
+
+#~ msgid "Payment Term"
+#~ msgstr "Plazo de pago"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Print Date:"
+#~ msgstr "Fecha impresión:"
+
+#~ msgid "Company:"
+#~ msgstr "Compañía:"
+
+#, python-format
+#~ msgid "Cannot create invoice without a partner."
+#~ msgstr "No se puede crear una factura sin una empresa."
+
+#~ msgid "Net Total"
+#~ msgstr "Total neto"
+
+#~ msgid "Payment Name"
+#~ msgstr "Descripción pago"
+
+#~ msgid "Piece Number"
+#~ msgstr "Número ref."
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Error del usuario"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Product for expenses"
+#~ msgstr "Producto para gastos"
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index b37023c69f1..97cda6524ff 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.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: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-10-30 09:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-11 18:22+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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Rea loomine ebaõnnestus!"
@@ -29,7 +29,7 @@ msgid "Invalid action !"
 msgstr "Vigane tegevus !"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Rea muutmine ebaõnnestus!"
@@ -73,7 +73,7 @@ msgstr "Kassa"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Täna"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -121,7 +121,7 @@ msgstr "Scanneeri toodet"
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päev"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
@@ -132,7 +132,7 @@ msgstr "Lisa maksmine :"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "Minu müügid"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
@@ -163,7 +163,7 @@ msgstr "Käibemaks"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Päritolu"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -196,7 +196,7 @@ msgstr "Päevasumma"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Keskmine hind"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -248,24 +248,24 @@ msgstr ""
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Viide"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Hind kokku"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Mitmesugune"
 
 #. 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 ""
+msgstr "Müügiaruanne"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
@@ -276,18 +276,18 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Muu info"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Type"
-msgstr ""
+msgstr "Toote tüüp"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Kuupäevad"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
@@ -300,8 +300,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Kehtiv hinnakirja rida ei ole leitud !"
@@ -314,13 +314,13 @@ msgstr "Kehtiv hinnakirja rida ei ole leitud !"
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "["
-msgstr ""
+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 ""
+msgstr "Kate"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -380,13 +380,13 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Juuni"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
@@ -409,7 +409,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktoober"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
@@ -425,7 +425,7 @@ msgstr "Üldistus"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Quotations"
-msgstr ""
+msgstr "Pakkumised"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_payment:0
@@ -450,7 +450,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Periood"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -466,7 +466,7 @@ msgstr "Rea kirjeldus"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Koodid"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
@@ -483,7 +483,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Trüki aruanne"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -509,7 +509,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "Lisa toode"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
@@ -581,7 +581,7 @@ msgstr ""
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Viga: vigane EAN kood"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
@@ -626,7 +626,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Märts"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
@@ -635,8 +635,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -749,7 +749,7 @@ msgstr "Kokku :"
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr ""
+msgstr "Toote nimi"
 
 #. module: point_of_sale
 #: field:pos.make.payment,pricelist_id:0
@@ -767,7 +767,7 @@ msgstr "Kokku arves"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "Kogus"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
@@ -786,7 +786,7 @@ msgstr ""
 #: field:report.sales.by.user.pos,date_order:0
 #: field:report.sales.by.user.pos.month,date_order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Tellimuse Kuupäev"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -825,7 +825,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -836,7 +836,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Maksud :"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
@@ -859,7 +859,6 @@ 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 "teadmata"
@@ -878,7 +877,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,num_sale:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Sisemine märkus"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_res_company
@@ -916,7 +915,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Teie viide"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -948,7 +947,7 @@ msgstr "Müük (üldistus)"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Information"
-msgstr ""
+msgstr "informatsioon"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
@@ -974,7 +973,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Eesnimi"
 
 #. module: point_of_sale
 #: view:res.company:0
@@ -1002,7 +1001,7 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,journal_users:0
 msgid "Users"
-msgstr ""
+msgstr "Kasutajad"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1028,7 +1027,7 @@ msgstr "POS"
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Loomise kuupäev"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
@@ -1047,7 +1046,7 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
@@ -1062,7 +1061,7 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
@@ -1080,7 +1079,7 @@ msgstr "Tarnija tagasimakse"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupeeri..."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1093,8 +1092,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Puudub hinnakiri !"
@@ -1118,7 +1117,7 @@ msgstr "Baas"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: point_of_sale
 #: field:pos.order,sale_manager:0
@@ -1161,7 +1160,7 @@ msgstr "Tootekood"
 #: 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 ""
+msgstr "Tooted"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
@@ -1250,15 +1249,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Viga !"
@@ -1282,10 +1281,10 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Juuli"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1338,7 +1337,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuu"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1386,7 +1385,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1595,7 +1594,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1696,8 +1695,8 @@ msgid "Invoice Date"
 msgstr "Arve Kuupäev"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1715,9 +1714,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "Ettemaks"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Palun lisa müügipartnerit"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Viga"
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2555,6 +2554,3 @@ msgstr ""
 
 #~ msgid "Net Total"
 #~ msgstr "Netosumma"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index 597c1f61723..21d47cdb527 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
 msgid "Discount Notes"
-msgstr ""
+msgstr "Alennuksen huomautukset"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "Myynti päivittäin"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Point of Sale Confirm"
-msgstr ""
+msgstr "Vahvista myyntipste"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
@@ -46,7 +46,7 @@ msgstr "Aseta luonnokseksi"
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Tuotteen huomautus"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -56,7 +56,7 @@ msgstr "Kassapääte"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Tänään"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -66,18 +66,18 @@ msgstr "Lisää tuote:"
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
 msgid "All Cashboxes Of the day :"
-msgstr ""
+msgstr "Päivän kaikki kassakoneet :"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Laita rahaa"
 
 #. 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 "Kassakoneen analyysi"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
@@ -89,7 +89,7 @@ msgstr "Myynnin yksityiskohdat"
 #. module: point_of_sale
 #: view:pos.close.statement:0
 msgid "Are you sure you want to close the statements ?"
-msgstr ""
+msgstr "Oletko varma että haluat sulkea merkinnät ?"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
@@ -104,7 +104,7 @@ msgstr "Skannaa tuote"
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
@@ -115,17 +115,17 @@ msgstr "Lisää maksu:"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "Omat Myynnit"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
 msgid "Box Out"
-msgstr ""
+msgstr "Laatikko ulos"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
 msgid "Today's Sales By Current User"
-msgstr ""
+msgstr "Nykyisen käyttäjän päivän myynnit"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -146,7 +146,7 @@ msgstr "ALV"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Alkuperä"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -161,7 +161,7 @@ msgstr "Kauppa yhteensä"
 #. module: point_of_sale
 #: help:account.journal,special_journal:0
 msgid "Will put all the orders in waiting status till being accepted"
-msgstr ""
+msgstr "Laittaa tilaukset odotustilaan kunnes hyväksytty"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -179,7 +179,7 @@ msgstr "Päivän loppusumma"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Keskimääräinen hinta"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -207,19 +207,19 @@ msgstr "Tila"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 msgid "Add payment"
-msgstr ""
+msgstr "Lisää maksu"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Myynnit kuukausittain"
 
 #. 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 "Myynnit käyttäjittäin"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -231,51 +231,51 @@ msgstr "Alennus (%)"
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Viite"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Hinta Yhteensä"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Muut"
 
 #. 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 ""
+msgstr "Myyntiraportti"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
 #, python-format
 msgid "No Order Lines"
-msgstr ""
+msgstr "Ei tilausrivejä"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Lisätiedot"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Type"
-msgstr ""
+msgstr "Tuotteen tyyppi"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Päivämäärät"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
 msgid "Max Discount(%)"
-msgstr ""
+msgstr "Alennus korkeintaan (%)"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Kelvollista hinnaston riviä ei löydy!"
@@ -303,7 +303,7 @@ msgstr ""
 #: field:report.sales.by.margin.pos,total:0
 #: field:report.sales.by.margin.pos.month,total:0
 msgid "Margin"
-msgstr ""
+msgstr "Kate"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -318,7 +318,7 @@ msgstr "Lukumäärä yht."
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr ""
+msgstr "Myynti käyttäjittäin ja kuukausittain"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
@@ -327,54 +327,56 @@ msgid ""
 "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
 msgstr ""
+"Et voi avata kassakonetta \"%s\".\n"
+"Sulje ensin liittyvä kassakone."
 
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
 msgid "User who is logged into the system."
-msgstr ""
+msgstr "Sisäänkirjautunut käyttäjä"
 
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Product for Input"
-msgstr ""
+msgstr "Syötettävä tuote"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Maksutapa"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Päivittäiset toiminnot"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Etsi käteiskirjanpitoa"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Are you sure you want to close your sales ?"
-msgstr ""
+msgstr "Oletko varma että haluat sulkea myynnit?"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. 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 "Myynti käyttäjittäin kuukausittain"
 
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
@@ -386,13 +388,13 @@ msgstr "Maksun päivämäärä"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Päättymispäivämäärä"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
@@ -408,12 +410,12 @@ msgstr "Yhteenveto"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Quotations"
-msgstr ""
+msgstr "Tarjoukset"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_payment:0
 msgid "Delay Payment"
-msgstr ""
+msgstr "Viivästä maksua"
 
 #. module: point_of_sale
 #: field:pos.add.product,quantity:0
@@ -428,12 +430,12 @@ msgstr "Määrä"
 #. module: point_of_sale
 #: help:account.journal,auto_cash:0
 msgid "This field authorize the automatic creation of the cashbox"
-msgstr ""
+msgstr "Tämä kenttä mahdollistaa kassakoneen automaattisen luonnin"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Jakso"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -449,12 +451,12 @@ msgstr "Rivin kuvaus"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Koodit"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Vientitapahtuma"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -466,7 +468,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Tulosta raportti"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -482,7 +484,7 @@ msgstr "Yksikköhinta"
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr ""
+msgstr "Tarkista että tulotiliksi on määritelty %s"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:56
@@ -492,12 +494,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "Lisää tuote"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
 msgid "Invoice Amount"
-msgstr ""
+msgstr "Laskun määrä"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -529,17 +531,17 @@ msgstr "Maksu"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Loppusaldo"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
 msgid "Products for Output Operations"
-msgstr ""
+msgstr "Tuotteet vientitapahtumille"
 
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
 msgid "Sale by Date and User"
-msgstr ""
+msgstr "Myynti päivittäin ja käyttäjittäin"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -547,7 +549,7 @@ msgstr ""
 msgid ""
 "Cannot delete a point of sale which is closed or contains confirmed "
 "cashboxes!"
-msgstr ""
+msgstr "Ei voi poistaa myyntipistettä jolla on vahvistettuja kassakoneita!"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -559,29 +561,29 @@ msgstr "Verotustapa"
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #, python-format
 msgid "Cash registers are already closed."
-msgstr ""
+msgstr "Kassakoneet on jo suljettu"
 
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Virhe: Väärä EAN-koodi"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Avaa tiliotteet"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & New"
-msgstr ""
+msgstr "Tallenna & Uusi"
 
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "Myynti yht (liikevaihto)"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -592,7 +594,7 @@ msgstr "Yhteensä maksettu"
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
 msgid "Check Details"
-msgstr ""
+msgstr "Tarkista yksityiskohdat"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -603,28 +605,30 @@ msgstr "Tuotteen määrä"
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
 msgid "Contract Number"
-msgstr ""
+msgstr "Sopimusnumero"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. 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 ""
+msgstr "Käyttäjän tuote"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Sinun pitää valita hinnasto myyntilomakkeella !\n"
+"Valitse ensin se ennenkuin valitset tuotteen."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -637,45 +641,47 @@ msgstr "Välisumma"
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "Sulje tiliotteet"
 
 #. module: point_of_sale
 #: view:account.journal:0
 msgid "Extended Configureation"
-msgstr ""
+msgstr "Laajennettu konfiguraatio"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Alkusaldo"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "Käyttäjän maksu"
 
 #. module: point_of_sale
 #: field:pos.order,type_rec:0
 msgid "Type of Receipt"
-msgstr ""
+msgstr "Kuitin tyyppi"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Rivien lukumäärä"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
 msgid "Accepted Sales"
-msgstr ""
+msgstr "Hyväksytty myynti"
 
 #. module: point_of_sale
 #: help:account.journal,check_dtls:0
 msgid ""
 "This field authorize Validation of Cashbox without checking ending details"
 msgstr ""
+"Tämä kenttä mahdollistaa kassakoneen tarkastamisen ilman lopputietojen "
+"tarkastusta."
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -710,7 +716,7 @@ msgstr "Luontipäivämäärä"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr ""
+msgstr "Päivän myynti"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -729,7 +735,7 @@ msgid "Total :"
 msgstr "Yhteensä:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Rivin luonti epäonnistui!"
@@ -738,7 +744,7 @@ msgstr "Rivin luonti epäonnistui!"
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr ""
+msgstr "Tuotteen nimi"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -762,17 +768,17 @@ msgstr "Laskutettu yhteensä"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "Määrä"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
 msgid "Point of sale return"
-msgstr ""
+msgstr "Myyntipisteen palautus"
 
 #. 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 "Myynnit katteittain kuukausittain"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -781,12 +787,12 @@ msgstr ""
 #: field:report.sales.by.user.pos,date_order:0
 #: field:report.sales.by.user.pos.month,date_order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Tilauksen päivämäärä"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Päivän suljettu kassakone"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -798,7 +804,7 @@ msgstr "Luonnoslasku"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Kupongin määrä tulee olla sama kuin tiliotteen rivillä"
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -809,7 +815,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
 #: view:pos.sales.user.today.current_user:0
 msgid "Sales for Current User"
-msgstr ""
+msgstr "Nykyisen käyttäjän myynti"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -820,23 +826,23 @@ msgstr "Tilikausiposition huomautus :"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Avauspäivä"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Verot:"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "Ale."
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -851,10 +857,9 @@ msgstr "Kassapäätteen tilausrivit"
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "Kuitti :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "tuntematon"
@@ -868,17 +873,17 @@ msgstr "Päivämäärä"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: point_of_sale
 #: field:pos.order,num_sale:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Sisäinen huomautus"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Yritykset"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -889,7 +894,7 @@ msgstr "Kassapäätteen tapahtuma"
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "UserError "
-msgstr ""
+msgstr "Käyttäjän virhe "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
@@ -906,12 +911,12 @@ msgstr "Et voi muokata tätä tilausta. Se on jo maksettu."
 #: field:pos.details,date_end:0
 #: field:pos.sale.user,date_end:0
 msgid "Date End"
-msgstr ""
+msgstr "Loppupäiväys"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Viitteenne"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -933,7 +938,7 @@ msgstr "Peruuta"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Return Picking"
-msgstr ""
+msgstr "Palauta keräily"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -943,33 +948,33 @@ msgstr "Myynti (yhteenveto)"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Information"
-msgstr ""
+msgstr "Tiedot"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
 msgid "Input Operations"
-msgstr ""
+msgstr "Tuonnin operaatiot"
 
 #. 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 ""
+msgstr "Myyntipisteen kassakoneen analyysi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
 msgid "Sale by Users"
-msgstr ""
+msgstr "Myynti käyttäjittäin"
 
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Maksu myynnille"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Etunimi"
 
 #. module: point_of_sale
 #: view:res.company:0
@@ -991,13 +996,13 @@ msgstr "Summa yhteensä"
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Cash Registers"
-msgstr ""
+msgstr "Kassakoneet"
 
 #. module: point_of_sale
 #: view:account.journal:0
 #: field:account.journal,journal_users:0
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1023,18 +1028,18 @@ msgstr "Kassapääte"
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Output Operations"
-msgstr ""
+msgstr "Viennin operaatiot"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Start Period"
-msgstr ""
+msgstr "Aloita jakso"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1042,12 +1047,12 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "Avaa kassakoneet"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1062,7 +1067,7 @@ msgstr ""
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Päiväkirjan nimen tulee olla uniikki yrityskohtaisesti !"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1075,7 +1080,7 @@ msgstr "Toimittajan hyvitys"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1085,11 +1090,11 @@ msgstr "Kassapääte tilaukset"
 #. 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 "Kaikki suljetut kassakoneet"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ei hinnastoa!"
@@ -1103,7 +1108,7 @@ msgstr "Valitse avoin myyntitilaus"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Tilauksen Päiväys"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1113,12 +1118,12 @@ msgstr "Pohja"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Account"
-msgstr ""
+msgstr "Tili"
 
 #. module: point_of_sale
 #: field:pos.order,sale_manager:0
 msgid "Salesman Manager"
-msgstr ""
+msgstr "Myyntihenkilön esimies"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1156,27 +1161,27 @@ msgstr "Koodi"
 #: 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 ""
+msgstr "Tuotteet"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Maksuraportti myynnille"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
 msgid "Special Journal"
-msgstr ""
+msgstr "Erityis päiväkirja"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
 msgid "All closed cashbox of the day"
-msgstr ""
+msgstr "Kaikki päivän suljetut kassakoneet"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Lisätiedot"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1186,7 +1191,7 @@ msgstr "Faksi:"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Liittyvä myyntihenkilö"
 
 #. module: point_of_sale
 #: model:ir.module.module,description:point_of_sale.module_meta_information
@@ -1207,17 +1212,17 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Hinnan tyyppi"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print the receipt of the sale"
-msgstr ""
+msgstr "Tulosta kuitti myynnistä"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Keräilylista"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1235,25 +1240,25 @@ msgstr "Määrä"
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "edellinen kk"
 
 #. 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 "Myynti käyttäjittäin"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Virhe!"
@@ -1261,34 +1266,34 @@ msgstr "Virhe!"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
 msgid "Sale Confirm"
-msgstr ""
+msgstr "Vahvista myynti"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "tila"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Prices"
-msgstr ""
+msgstr "Hinnat"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
-msgstr ""
+msgstr "Ole hyvä ja syötä tili tuotteelle : %s"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Lykkää tarkistusta"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1298,29 +1303,29 @@ msgstr "Tulosteiden määrä"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "Myyntipisteen maksu"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Lopeta jaso"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "Automaattinen avaus"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
 msgid "Discount(Amount)"
-msgstr ""
+msgstr "Alennus (määrä)"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:51
 #, python-format
 msgid "Active ID is not found"
-msgstr ""
+msgstr "Aktiivista ID:tä ei löydy"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
@@ -1333,7 +1338,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1343,7 +1348,7 @@ msgstr "Myyntitilaus kassapääte"
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Tiliotteen nimi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1352,36 +1357,36 @@ msgstr ""
 #: field:pos.box.out,journal_id:0
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "Kassakone"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspvm"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "Myyntipisteen kuitti"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "No order lines defined for this sale "
-msgstr ""
+msgstr "Myynnille ei ole määritelty tilausrivejä "
 
 #. 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 "Myynti käyttäjittäin, päivittäinen kate"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
 msgid "Customer Note"
-msgstr ""
+msgstr "Asiakkaan huomautus"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Ei tilausrivejä määritetty tälle myynnille."
@@ -1389,7 +1394,7 @@ msgstr "Ei tilausrivejä määritetty tälle myynnille."
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Alkusaldo"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1402,13 +1407,13 @@ msgstr "Maksettu"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Kaikki myyntirivit"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Tarjous"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1422,29 +1427,29 @@ msgstr "Yhteensä:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Myynnit katteittain"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Päiväkirjan konfiguraatio"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Tilioterivit"
 
 #. 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 ""
+msgstr "Käyttäjä kuka käyttää kassakonetta."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Laskujen määrä"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
@@ -1473,13 +1478,13 @@ msgstr "Lasku"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
 msgid "Get From Sale"
-msgstr ""
+msgstr "Hae myynnistä"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Avaa"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
@@ -1490,30 +1495,30 @@ msgstr "Tilauksen viite"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
 msgid "Sales lines Report"
-msgstr ""
+msgstr "Myyntirivien raportti"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: view:pos.box.entries:0
 msgid "Box Entries"
-msgstr ""
+msgstr "Laatikkoviennit"
 
 #. module: point_of_sale
 #: selection:pos.order,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Ilman veroa"
 
 #. 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 ""
+msgstr "Nettokate määrää kohti"
 
 #. 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 "Myynnin kate käyttäjittäin"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1523,7 +1528,7 @@ msgstr "Verot:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Myyntipisteen tilastot"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1548,23 +1553,23 @@ msgstr "Kassapääte rivit"
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
 msgid "Discount Control"
-msgstr ""
+msgstr "Alennuskontrolli"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Loppusaldo"
 
 #. 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 ""
+msgstr "Myynnin yksityiskohdat"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1575,46 +1580,46 @@ msgstr "Tilauspäivämäärä"
 #: 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 "Myyntirivit käyttäjittäin"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
 msgid "Max Difference for Cashboxes"
-msgstr ""
+msgstr "Suurin sallittu ero kassakoneissa"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Kyllä"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Tulotiliä ei ole määritelty tälle tuotteelle: \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "The cash register must be opened to be able to execute a payment."
-msgstr ""
+msgstr "Kassakone pitää olla avattuna jotta maksu voidaan suorittaa"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Yhteensä veroton"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Description"
-msgstr ""
+msgstr "Tuotteen kuvaus"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1630,18 +1635,18 @@ msgstr "Yhteensä"
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "Myynti käyttäjittäin"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Avaa kassakone"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Tiliote"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1659,12 +1664,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Maksuraportti"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
 msgid "Return lines"
-msgstr ""
+msgstr "Palautuksen rivit"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1691,8 +1696,8 @@ msgid "Invoice Date"
 msgstr "Laskun päivämäärä"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1702,25 +1707,25 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Sarjanumero"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Tulosta uudelleen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
-msgstr ""
+msgstr "Sinun pitää avata vähintään yksi kassakone"
 
 #. 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 "Päivän maksut käyttäjittäin"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
@@ -1732,7 +1737,7 @@ msgstr "Kassapäätetilaus"
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Virhe!"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -1763,39 +1768,39 @@ msgstr "Viimeisin keräily ulos"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Pankin tiliotteen rivi"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Pankin tiliote"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. 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 "Myyntipisteen raportti"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add Discount"
-msgstr ""
+msgstr "Lisää alennus"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Sulje kassakone"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
 msgid "Refunded Quantity"
-msgstr ""
+msgstr "Hyvitetty määrä"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -1806,27 +1811,27 @@ msgstr "Skannaa viivakoodi"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 msgid "Sales Order"
-msgstr ""
+msgstr "Myyntitilaus"
 
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Päiväkirjavienti"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Peruutettu lasku"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1838,17 +1843,17 @@ msgstr "Hyväksy"
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Myyntirivit"
 
 #. module: point_of_sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
 #. module: point_of_sale
 #: field:pos.discount,discount:0
 msgid "Discount "
-msgstr ""
+msgstr "Alennus "
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1856,7 +1861,7 @@ msgid "Supplier Invoice"
 msgstr "Toimittajan lasku"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Rivin muokkaus epäonnistui!"
@@ -1874,12 +1879,12 @@ msgstr "Raportointi"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products for Input Operations"
-msgstr ""
+msgstr "Tuotavat tuotteet"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
 msgid "Today's Sales by Current User"
-msgstr ""
+msgstr "Päivän myynti nykyisellä käyttäjällä"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
@@ -1889,7 +1894,7 @@ msgstr ""
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Päiväkirjan koodi tulee olla joka yrityksellä uniikki!"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1899,60 +1904,60 @@ msgstr "Konfiguraatio"
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
 #: field:report.pos.order,date_validation:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Vahvistuspäivämäärä"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
-msgstr ""
+msgstr "Sinulla ei ole tarpeeksi oikeuksia tämän myynnin vahvistamiseen"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Laskut"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "Alennus yhteensä"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Ota rahaa"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "Myynnin yksityiskohdat"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
 msgid "Control for Output Operations"
-msgstr ""
+msgstr "Valvonta vientioperaatioille"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
 #, python-format
 msgid "Message"
-msgstr ""
+msgstr "Viesti"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -1989,12 +1994,12 @@ msgstr "Laskutettu"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Alennuksen huomautus"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -2015,12 +2020,12 @@ msgstr "Kassapääte tilausrivi"
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Are you sure you want to open the statements ?"
-msgstr ""
+msgstr "Oletko varma että haluat avata tiliotteet?"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
 msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "Myyntipisteen maksuraportti päiväkohtaisesti"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2028,22 +2033,22 @@ msgid "PRO-FORMA"
 msgstr "Proforma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Anna kumppani myyntiä varten."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Tälle päiväkirjalle ei ole määritelty tulotiliä %s\" (id:%d)"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
 msgid "Cashier"
-msgstr ""
+msgstr "Kassahenkilö"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -2073,32 +2078,32 @@ msgstr "Käyttäjäkohtaiset myynti"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print Receipt"
-msgstr ""
+msgstr "Tulosta kuitti"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "Myyntipisteen tilausrivit"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Virhe"
@@ -2106,7 +2111,7 @@ msgstr "Virhe"
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "Myyntipäiväkirja"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2124,19 +2129,19 @@ msgstr "Luo lasku tälle myynnille."
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Päivämääräjärjestys"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Sulje kassakoneet"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Disc(%)"
-msgstr ""
+msgstr "Alennus (%)"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -2160,44 +2165,44 @@ msgstr "Tilausrivit"
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Alasumma ilman veroa"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Add product"
-msgstr ""
+msgstr "Lisää tuote"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Maksuraportti"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Käteispäiväkirja"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "Myyntipisteen yksityiskohda"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Päivän myynnit käyttjittäin"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 #: view:pos.box.out:0
 msgid "Please fill these fields for entries to the box:"
-msgstr ""
+msgstr "Ole hyvä ja täytä nämä kentät laatikkoon"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
-msgstr ""
+msgstr "Tarkista etä tili on asetettu %s"
 
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
@@ -2212,39 +2217,39 @@ msgstr "Kuvaus"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Myyntirivit"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Sisäiset huomautukset"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & Close"
-msgstr ""
+msgstr "Tallenna & Sulje"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Running"
-msgstr ""
+msgstr "Käynnissä olevat"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
 msgid "All Cashboxes Of the day"
-msgstr ""
+msgstr "Päivän kaikki kassakoneet"
 
 #. 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 ""
+msgstr "Myyntipisteen analyysi"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2252,7 +2257,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "Asiakas"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2260,18 +2265,18 @@ msgstr ""
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Advance"
-msgstr ""
+msgstr "Ennakko"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Tänään    "
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:95
@@ -2280,6 +2285,8 @@ msgid ""
 "The maximum value you can still withdraw is exceeded. \n"
 " Remaining value is equal to %d "
 msgstr ""
+"Maksimimäärä jonka voit nostaa on ylitetty \n"
+" Jäljelläoleva arvo on %d "
 
 #. module: point_of_sale
 #: field:pos.order,remboursed:0
@@ -2289,13 +2296,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
 msgid "Opened Sales"
-msgstr ""
+msgstr "Avatut myynnit"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
@@ -2319,12 +2326,12 @@ msgstr "Tulostuspäivämää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 "Käyttäjäkohtainen myyntikate kuukausittain"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Hae myyntitilausta"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2338,13 +2345,13 @@ msgstr "Tilimerkintä"
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "Tee maksu"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 #: view:pos.sales.user.today:0
 msgid "Sales User Today"
-msgstr ""
+msgstr "Käyttäjän myynti tänään"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2352,7 +2359,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #~ msgid "Scan Product"
 #~ msgstr "Skannaa tuote"
@@ -2366,21 +2373,12 @@ msgstr ""
 #~ msgid "Orders of the day"
 #~ msgstr "Päivän tilaukset"
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Tämä on kirjautunut käyttäjä (ei välttämättä myyjä)."
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Puh : + 32 (0) 2 231 04 35"
-
 #~ msgid "Partner Ref."
 #~ msgstr "Kumppanin viite"
 
 #~ msgid "Refund Orders"
 #~ msgstr "Hyvitystilaukset"
 
-#~ msgid "Logged in User"
-#~ msgstr "Kirjautunut käyttäjä"
-
 #~ msgid "VAT(%)"
 #~ msgstr "ALV(%)"
 
@@ -2439,15 +2437,9 @@ msgstr ""
 #~ msgid "Payment Term"
 #~ msgstr "Maksuehto"
 
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Tämä myyjä tekee tilausta."
-
 #~ msgid "Company:"
 #~ msgstr "Yritys:"
 
-#~ msgid "OPERATION N° :"
-#~ msgstr "OPERAATIO N° :"
-
 #~ msgid "Piece number"
 #~ msgstr "Kappalenumero"
 
@@ -2576,3 +2568,6 @@ msgstr ""
 
 #~ msgid "Print Date:"
 #~ msgstr "Tulostettu:"
+
+#~ msgid "Product for expenses"
+#~ msgstr "Tuote kuluille"
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index ff5e9ab78d9..fddb3956369 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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -284,8 +284,8 @@ msgid "Cash register management"
 msgstr "Gestion des caisses enregistreuses"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Aucune ligne de Liste de Prix valide trouvée !"
@@ -623,8 +623,8 @@ msgid "User's Product"
 msgstr "Produit utilisateur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -738,7 +738,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Échec de création de ligne !"
@@ -865,7 +865,6 @@ msgid "Receipt :"
 msgstr "Reçu :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "inconnu"
@@ -1099,8 +1098,8 @@ msgid "All Closed CashBox"
 msgstr "Fermer toute les caisses"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Pas de Liste de Prix !"
@@ -1267,15 +1266,15 @@ msgid "Sale by User"
 msgstr "Ventes par Utilisateur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -1302,7 +1301,7 @@ msgid "July"
 msgstr "Juillet"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Veuillez spécifier un comtpe pour ce produit: %s"
@@ -1403,7 +1402,7 @@ msgid "Customer Note"
 msgstr "Note client"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Aucune lignes de commande pour cette vente."
@@ -1614,7 +1613,7 @@ msgid "Yes"
 msgstr "Oui"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1717,8 +1716,8 @@ msgid "Invoice Date"
 msgstr "Date de Facture"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1739,9 +1738,9 @@ msgid "Reprint"
 msgstr "Réimprimer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "Vous devez ouvrir au moins une caisse"
@@ -1885,7 +1884,7 @@ msgid "Supplier Invoice"
 msgstr "Facture fournisseur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Échec de modification de ligne !"
@@ -1937,8 +1936,8 @@ msgid "Validation Date"
 msgstr "Date de validation"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2058,13 +2057,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Veuiller renseigner un client"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2124,13 +2123,13 @@ msgid "POS Orders lines"
 msgstr "Ligne de commandes du point de vente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -2226,7 +2225,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "Veuillez entrer ces champs pour les entrées de caisse"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "Vérifier que le compte comptable est mis à %s"
@@ -2584,173 +2583,15 @@ msgstr "Année"
 #~ msgid "UserError"
 #~ msgstr "Error Utilisateur"
 
-#~ msgid "Return Goods"
-#~ msgstr "Retourner les marchandises"
-
-#~ msgid "Sales by User Monthly Margin"
-#~ msgstr "Marges des Ventes Mensuelles par utilisateur"
-
 #, python-format
 #~ msgid "Cannot create invoice without a partner."
 #~ msgstr "Veuillez renseigner le client pour créer votre facture"
 
-#~ msgid "Error ! The duration of the Period(s) is/are invalid. "
-#~ msgstr "Erreur ! La durée de la ou des Périodes est invalide. "
-
-#~ msgid ""
-#~ "You can not set discount greater than company discount ! Discount should be "
-#~ "less or equal to %s "
-#~ msgstr ""
-#~ "Cette remise n'est pas autorisée. Votre remise doit être inférieure ou égale "
-#~ "à %s "
-
-#~ msgid "Details Of Operations"
-#~ msgstr "Détails des Opérations"
-
-#~ msgid "Error ! You can not create recursive accounts."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer d'écritures récursives."
-
-#~ msgid "All Sales"
-#~ msgstr "Toutes les ventes"
-
-#~ msgid "Error ! You can not create recursive categories."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de catégories récursives"
-
-#~ msgid "Discount Controle "
-#~ msgstr "Contrôle de Remise "
-
-#~ msgid "Sales by User Daily Margin"
-#~ msgstr "Marges des Ventes Quotidiennes par Magasin"
-
-#~ msgid "Accepted"
-#~ msgstr "Accepté"
-
-#~ msgid "Sales by Users"
-#~ msgstr "Ventes par Magasins"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Erreur: l'unité de vente doit appartenir à une catégorie différente que "
-#~ "l'unité de mesure"
-
-#~ msgid "Return goods and Exchange"
-#~ msgstr "Retour & Échange de Marchandises"
-
-#~ msgid "To Verify"
-#~ msgstr "À vérifier"
-
-#~ msgid "Miscelleanous Operations"
-#~ msgstr "Opérations diverses"
-
 #~ msgid "Product for expenses"
 #~ msgstr "Produits pour Sortie de Caisse"
 
-#~ msgid ""
-#~ "You can not set discount greater than company discount on %s! Discount "
-#~ "Should be less than %d %s"
-#~ msgstr ""
-#~ "Vous ne pouvez pas accorder une remise supérieure à celle autorisée %s! La "
-#~ "remise doit être inférieure à %d %s"
-
-#~ msgid "All Sales Lines"
-#~ msgstr "Toutes les Lignes de Ventes"
-
-#~ msgid "Sales Waiting Validation"
-#~ msgstr "Ventes en Attente de Validation"
-
-#~ msgid "Sales encoding"
-#~ msgstr "Nouvelle vente"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
-#~ "faire partie de la même catégorie"
-
-#~ msgid ""
-#~ "Quantities you enter, match to products that will return to the stock."
-#~ msgstr ""
-#~ "Les quantités que vous avez entré correspondent à celles qui retournent en "
-#~ "stock"
-
-#~ msgid "_Reprint"
-#~ msgstr "_Réimprimer"
-
-#~ msgid "Return Packing"
-#~ msgstr "Retour de marchandises"
-
-#~ msgid "The maximum value you can still enter is equal to %d "
-#~ msgstr "La valeur maximum que vous pouvez entrer est égale à %d "
-
 #~ msgid "Payment Name"
 #~ msgstr "Libellé du paiement"
 
-#~ msgid "Order Information"
-#~ msgstr "Information sur la vente"
-
-#~ msgid "Shipping cost"
-#~ msgstr "Frais de Port"
-
-#~ msgid "Receipt Notice"
-#~ msgstr "Note du ticket"
-
-#~ msgid "Make entries in the Cashbox"
-#~ msgstr "Entrées dans la caisse"
-
-#~ msgid "Refloat Box entries"
-#~ msgstr "Renflouer les caisses"
-
-#~ msgid "Subtotal w/o tax"
-#~ msgstr "Sous-total sans Taxes"
-
-#~ msgid ""
-#~ "Invalid period ! Some periods overlap or the date period is not in the scope "
-#~ "of the fiscal year. "
-#~ msgstr ""
-#~ "Période non valide ! Certaines périodes se chevauchent ou la date de la "
-#~ "période n'est pas incluse dans l'année fiscale. "
-
-#~ msgid "All Invoices"
-#~ msgstr "Toutes les Factures"
-
-#~ msgid "Error ! The duration of the Fiscal Year is invalid. "
-#~ msgstr "Erreur ! La durée de l'Année Fiscale n'est pas valide. "
-
-#~ msgid "Sales Lines of the day"
-#~ msgstr "Détails de des ventes du jour"
-
-#~ msgid "Sales Reports"
-#~ msgstr "Rapports de ventes"
-
-#~ msgid "Open Sales Line"
-#~ msgstr "Ouvrir des lignes de vente"
-
 #~ msgid "Piece Number"
 #~ msgstr "Nb."
-
-#~ msgid "Validation of the Sale"
-#~ msgstr "Validation de la vente"
-
-#~ msgid "Payments by Users"
-#~ msgstr "Paiement par utilisateur"
-
-#~ msgid "Payments and Sales"
-#~ msgstr "Paiements et Ventes"
-
-#~ msgid "Box entries"
-#~ msgstr "Entrées de caisse"
-
-#~ msgid "Logged in User"
-#~ msgstr "Connecté en tant qu'utilisateur"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tél : + 32 (0) 2 231 04 35"
-
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Ceci est l'utilisateur connecté (pas nécessairement le vendeur)."
-
-#~ msgid "OPERATION N° :"
-#~ msgstr "OPÉRATION N° :"
-
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Indiquer le vendeur de cette vente"
diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po
index 344b0f1515d..f7f3b5ae46c 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -854,7 +854,6 @@ 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 ""
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 8181deb09c1..b440f1101d9 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr "Ukupno :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 "nepoznato"
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr "Datum računa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr "Ulazni račun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2362,21 +2361,12 @@ msgstr ""
 #~ msgid "Orders of the day"
 #~ msgstr "Današnje narudžbe"
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Ovo je prijavljeni korisnik (ne nužno i prodavač)"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "+ 32 (0) 2 231 04 35"
-
 #~ msgid "Ok"
 #~ msgstr "U redu"
 
 #~ msgid "Refund Orders"
 #~ msgstr "Storno"
 
-#~ msgid "Logged in User"
-#~ msgstr "Prijavljeni korisnik"
-
 #~ msgid "VAT(%)"
 #~ msgstr "PDV(%)"
 
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index cd321f02519..db339428273 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-02-08 21:19+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +283,8 @@ msgid "Cash register management"
 msgstr "Pénztárkezelés"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "A rendszer nem talált érvényes árlista sort."
@@ -617,8 +618,8 @@ msgid "User's Product"
 msgstr "Felhasználó termékei"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +729,7 @@ msgid "Total :"
 msgstr "Összesen :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -854,7 +855,6 @@ msgid "Receipt :"
 msgstr "Bevétel :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "Ismeretlen"
@@ -1088,8 +1088,8 @@ msgid "All Closed CashBox"
 msgstr "Minden lezárt pénztár"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nincs árlista !"
@@ -1245,15 +1245,15 @@ msgid "Sale by User"
 msgstr "Értékesítés felhasználónként"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Hiba !"
@@ -1280,7 +1280,7 @@ msgid "July"
 msgstr "Július"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Kérem, adjon meg egy főkönyvi számlát a(z) %s termékre."
@@ -1381,7 +1381,7 @@ msgid "Customer Note"
 msgstr "Vásárlói megjegyzés"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1590,7 +1590,7 @@ msgid "Yes"
 msgstr "Igen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1692,8 +1692,8 @@ msgid "Invoice Date"
 msgstr "Számla kelte"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1711,9 +1711,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1857,7 +1857,7 @@ msgid "Supplier Invoice"
 msgstr "Bejövő számla"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1909,8 +1909,8 @@ msgid "Validation Date"
 msgstr "Érvényesség dátuma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2029,13 +2029,13 @@ msgid "PRO-FORMA"
 msgstr "Pro forma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2093,13 +2093,13 @@ msgid "POS Orders lines"
 msgstr "Értékesítési pont rendelési tételek"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Hiba"
@@ -2195,7 +2195,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index e2671f42a2a..a6106a7823e 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.po
@@ -13,34 +13,34 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
 msgid "Discount Notes"
-msgstr ""
+msgstr "Nota Diskon"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "Penjualan Per Hari"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Point of Sale Confirm"
-msgstr ""
+msgstr "POS Konfirmasi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
 #: view:pos.discount:0
 msgid "Apply Discount"
-msgstr ""
+msgstr "Terapkan Diskon"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Set ke draft"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -50,17 +50,17 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
 msgid "Point Of Sale"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Hari Ini"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Add product :"
-msgstr ""
+msgstr "Tambahkan Produk"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -76,14 +76,14 @@ msgstr ""
 #: 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 "Daftar Analisis"
 
 #. 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 ""
+msgstr "Detil Penjualan"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -95,7 +95,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_scan_product
 #: view:pos.scan.product:0
 msgid "Scan product"
-msgstr ""
+msgstr "Memindai Produk"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -103,7 +103,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Hari"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
 msgid "Today's Sales By Current User"
-msgstr ""
+msgstr "Penjualan Hari ini per Pengguna"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -135,27 +135,27 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Jumlah"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "VAT"
-msgstr ""
+msgstr "PPN"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Sumber"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tax"
-msgstr ""
+msgstr "PPN"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "Total Transaction"
-msgstr ""
+msgstr "Total Transaksi"
 
 #. module: point_of_sale
 #: help:account.journal,special_journal:0
@@ -166,19 +166,19 @@ msgstr ""
 #: report:account.statement:0
 #: field:report.pos.order,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Rekanan"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total of the day"
-msgstr ""
+msgstr "Total Per Hari"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Harga Rata-rata"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -189,7 +189,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "Total Diskon"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -201,17 +201,17 @@ msgstr ""
 #: field:report.cash.register,state:0
 #: field:report.pos.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Provinsi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 msgid "Add payment"
-msgstr ""
+msgstr "Masukkan  Pembayaran"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Penjualan Per Bulan"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
@@ -224,57 +224,57 @@ msgstr ""
 #: report:pos.invoice:0
 #: report:pos.payment.report:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Diskon (%)"
 
 #. module: point_of_sale
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Harga"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Lain lain"
 
 #. 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 ""
+msgstr "Laporan Penjualan"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
 #, python-format
 msgid "No Order Lines"
-msgstr ""
+msgstr "Nomor Baris Order"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Informasi lainnya"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Type"
-msgstr ""
+msgstr "Tipe Produk"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Tanggal"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
 msgid "Max Discount(%)"
-msgstr ""
+msgstr "Diskon Maksimal (%)"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
 #: field:report.sales.by.margin.pos,total:0
 #: field:report.sales.by.margin.pos.month,total:0
 msgid "Margin"
-msgstr ""
+msgstr "Batas"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -335,23 +335,23 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Product for Input"
-msgstr ""
+msgstr "Input untuk Produk"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Cara Pembayaran"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Operasi harian"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Mencari laporan kas"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -362,57 +362,57 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Agustus"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. 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 "Penjualan per pengguna bulanan"
 
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
 #: field:report.pos.order,date_payment:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Tanggal Pembayaran"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Tutup Tanggal"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
 msgid "To count"
-msgstr ""
+msgstr "untuk dihitung"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Ringkasan"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Quotations"
-msgstr ""
+msgstr "Penawaran"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_payment:0
 msgid "Delay Payment"
-msgstr ""
+msgstr "Pembayaran terlambat"
 
 #. module: point_of_sale
 #: field:pos.add.product,quantity:0
@@ -422,7 +422,7 @@ msgstr ""
 #: field:report.sales.by.user.pos,qty:0
 #: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Kuantitas"
 
 #. module: point_of_sale
 #: help:account.journal,auto_cash:0
@@ -432,28 +432,28 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Periode"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 #: report:pos.payment.report:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Total Bersih"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line Description"
-msgstr ""
+msgstr "Baris Keterangan"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Kode"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Operasi keluaran"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -465,7 +465,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Cetak Laporan"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -475,13 +475,13 @@ msgstr ""
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Harga Satuan"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr ""
+msgstr "Tolong di cek bahwa akun masukkan di set ke %s"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:56
@@ -491,12 +491,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "Tambahkan Produk"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
 msgid "Invoice Amount"
-msgstr ""
+msgstr "NIlai Faktur"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -510,30 +510,30 @@ msgstr ""
 #: field:report.cash.register,journal_id:0
 #: field:report.pos.order,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Jurnal"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "telepon"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Payment"
-msgstr ""
+msgstr "Pembayaran"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Saldo Akhir"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
 msgid "Products for Output Operations"
-msgstr ""
+msgstr "Produk untuk Operasi Keluaran"
 
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
@@ -547,23 +547,25 @@ msgid ""
 "Cannot delete a point of sale which is closed or contains confirmed "
 "cashboxes!"
 msgstr ""
+"Tidak Dapat menghapus POS jika ditutup atau mengandung box uang yang sudah "
+"di konfirmasi."
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "Tipe PPn"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #, python-format
 msgid "Cash registers are already closed."
-msgstr ""
+msgstr "Mesin Kas sudah di tutup"
 
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ada Kesalahan !! kode EAN tidak sah"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
@@ -575,50 +577,50 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & New"
-msgstr ""
+msgstr "Simpan & Buat Baru"
 
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "Total Penjualan"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total paid"
-msgstr ""
+msgstr "Total Pembayaran"
 
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
 msgid "Check Details"
-msgstr ""
+msgstr "Cek Detil"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Qty of product"
-msgstr ""
+msgstr "Kuantitas produk"
 
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
 msgid "Contract Number"
-msgstr ""
+msgstr "Nomor Kontrak"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
 #. 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 ""
+msgstr "Produk Pengguna"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -629,7 +631,7 @@ msgstr ""
 #: view:pos.order:0
 #: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
@@ -641,34 +643,34 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.journal:0
 msgid "Extended Configureation"
-msgstr ""
+msgstr "Konfigurasi Lanjutan/Tambahan"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Saldo Awal"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "Pembayaran Per Pengguna"
 
 #. module: point_of_sale
 #: field:pos.order,type_rec:0
 msgid "Type of Receipt"
-msgstr ""
+msgstr "Tipe Penerimaan"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Baris"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
 msgid "Accepted Sales"
-msgstr ""
+msgstr "Penjualan yang diterima"
 
 #. module: point_of_sale
 #: help:account.journal,check_dtls:0
@@ -679,37 +681,37 @@ msgstr ""
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "Nama Standar"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Sales total"
-msgstr ""
+msgstr "Penjualan Total"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Sum of subtotals"
-msgstr ""
+msgstr "Jumlah dari sub total"
 
 #. module: point_of_sale
 #: field:pos.make.payment,payment_date:0
 msgid "Payment date"
-msgstr ""
+msgstr "Tanggal Pembayaran"
 
 #. module: point_of_sale
 #: field:pos.order,lines:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Baris Order"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Tanggal Pembuatan"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr ""
+msgstr "Penjualan hari ini"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -718,60 +720,60 @@ msgstr ""
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
-msgstr ""
+msgstr "POS "
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:pos.sales.user.today.current.user:0
 #: report:pos.user.product:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
-msgstr ""
+msgstr "Pembuatan baris detil gagal !!"
 
 #. 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 ""
+msgstr "Nama Produk"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Tindakan tidak valid !"
 
 #. module: point_of_sale
 #: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Daftar Harga"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total invoiced"
-msgstr ""
+msgstr "Total Faktur"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# of Qty"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
 msgid "Point of sale return"
-msgstr ""
+msgstr "Retur POS"
 
 #. 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 "Penjualan berdasarkan batas limit per bulan"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -780,17 +782,17 @@ msgstr ""
 #: field:report.sales.by.user.pos,date_order:0
 #: field:report.sales.by.user.pos.month,date_order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Tanggal Order"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Box Uang yang ditutup hari ini"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Draf Faktur"
 
 #. module: point_of_sale
 #: constraint:account.bank.statement.line:0
@@ -808,18 +810,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
 #: view:pos.sales.user.today.current_user:0
 msgid "Sales for Current User"
-msgstr ""
+msgstr "Penjualan pengguna saat ini"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Keterangan Posisi fiskal"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -830,92 +832,91 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "PPn"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "Diskon"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "PPn"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr ""
+msgstr "POS Baris order"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "Penerimaan :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
-msgstr ""
+msgstr "tidak diketahui"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
-msgstr ""
+msgstr "Tanggal"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filter Tambahan"
 
 #. module: point_of_sale
 #: field:pos.order,num_sale:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Catatan Internal"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Perusahaan"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr ""
+msgstr "Transaksi POS"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "UserError "
-msgstr ""
+msgstr "Kesalahan Pengguna "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "Masukkan Box POS"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
-msgstr ""
+msgstr "Anda tidak dapat merubah order ini, order ini sudah dibayar !"
 
 #. module: point_of_sale
 #: field:pos.details,date_end:0
 #: field:pos.sale.user,date_end:0
 msgid "Date End"
-msgstr ""
+msgstr "Tanggal Akhir"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Referensi Anda"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "Angka transaksi"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -927,7 +928,7 @@ msgstr ""
 #: view:pos.receipt:0
 #: selection:report.pos.order,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -937,78 +938,78 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr ""
+msgstr "Penjualan(ringkas)"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Information"
-msgstr ""
+msgstr "Informasi"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
 msgid "Input Operations"
-msgstr ""
+msgstr "Operasi Masukan"
 
 #. 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 ""
+msgstr "POS Analisis Mesin Kas"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
 msgid "Sale by Users"
-msgstr ""
+msgstr "Penjualan per Pengguna"
 
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Pembayaran Penjualan"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Nama Depan"
 
 #. module: point_of_sale
 #: view:res.company:0
 msgid "Other"
-msgstr ""
+msgstr "Lain-lain"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "Baris POS"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr ""
+msgstr "Total Nilai"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Cash Registers"
-msgstr ""
+msgstr "Mesin Kas"
 
 #. module: point_of_sale
 #: view:account.journal:0
 #: field:account.journal,journal_users:0
 msgid "Users"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.invoice:0
 #: report:pos.lines:0
 msgid "Price"
-msgstr ""
+msgstr "Harga"
 
 #. module: point_of_sale
 #: field:pos.scan.product,gencod:0
 msgid "Barcode"
-msgstr ""
+msgstr "barcode"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -1017,17 +1018,17 @@ msgstr ""
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Tanggal Pembuatan"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Output Operations"
-msgstr ""
+msgstr "Operasi Keluaran"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1041,12 +1042,12 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "Nama"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "Buka Mesin Kas"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1061,12 +1062,12 @@ msgstr ""
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Nama Jurnal harus unik per perusahaan"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Retur Pembelian"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1074,12 +1075,12 @@ msgstr ""
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Dikelompokan berdasarkan ..."
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr ""
+msgstr "POS order"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
@@ -1087,67 +1088,67 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "Tidak ada daftar harga !"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
 #: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "Pilih Order Penjualan yang masih terbuka"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Tanggal order"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Base"
-msgstr ""
+msgstr "Basis"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Account"
-msgstr ""
+msgstr "Akun"
 
 #. module: point_of_sale
 #: field:pos.order,sale_manager:0
 msgid "Salesman Manager"
-msgstr ""
+msgstr "Manajer Sales"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: point_of_sale
 #: field:pos.get.sale,picking_id:0
 #: view:pos.order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Penjualan"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
-msgstr ""
+msgstr "PPn"
 
 #. 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 ""
+msgstr "Baris Penjualan"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
 #: report:pos.details:0
 msgid "Code"
-msgstr ""
+msgstr "Kode"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_product_input
@@ -1155,37 +1156,37 @@ msgstr ""
 #: 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 ""
+msgstr "Produk"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Laporan Pembayaran penjualan"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
 msgid "Special Journal"
-msgstr ""
+msgstr "Jurnal khusus"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
 msgid "All closed cashbox of the day"
-msgstr ""
+msgstr "Semua box uang yang ditutup hari ini"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Info tambahan"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Sales yang terhubung"
 
 #. module: point_of_sale
 #: model:ir.module.module,description:point_of_sale.module_meta_information
@@ -1202,11 +1203,22 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Fasilitas Utama :\n"
+" Pembuatan penjualan yang cepat\n"
+" Dapat memilih satu model pembayaran (cara cepat), atau membagi pembayaran "
+"menjadi beberapa model pembayaran\n"
+" Perhitungan nilai uang yang kembali\n"
+" Membuat dan mengkonfirmasi \"picking List\" secara otomatis\n"
+" Mengijinkan pengguna membuat invoice otomatis\n"
+" Mengijinkan pengembalian penjualan\n"
+"\n"
+"    "
 
 #. module: point_of_sale
 #: field:pos.order,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Metode Harga"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -1216,7 +1228,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Daftar pengambilan"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1228,58 +1240,58 @@ msgstr ""
 #: field:report.sales.by.margin.pos,qty:0
 #: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Qty"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Bulan-1"
 
 #. 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 "Penjualan per Pengguna"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Ada Kesalahan !!!"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
 msgid "Sale Confirm"
-msgstr ""
+msgstr "Konfirmasi Penjualan"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "negara bagian"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Prices"
-msgstr ""
+msgstr "Harga"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1287,44 +1299,44 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "validasi yang terlambat"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
 msgid "Number of Print"
-msgstr ""
+msgstr "Jumlah cetakan"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "Pembayaran POS"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Akhir periode"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "Pembukaan Otomatis"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
 msgid "Discount(Amount)"
-msgstr ""
+msgstr "Diskon (Nilai)"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:51
 #, python-format
 msgid "Active ID is not found"
-msgstr ""
+msgstr "ID Aktif tidak ditemukan"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
 msgid "Is accompte"
-msgstr ""
+msgstr "Deposito"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1332,12 +1344,12 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Bulan"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Sales Order POS"
-msgstr ""
+msgstr "POS Order Penjualan"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1351,17 +1363,17 @@ msgstr ""
 #: field:pos.box.out,journal_id:0
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "Mesin Kas"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Tanggal Awal"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "Penerimaan POS"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
@@ -1377,18 +1389,18 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,note_2:0
 msgid "Customer Note"
-msgstr ""
+msgstr "Catatan pelanggan"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
-msgstr ""
+msgstr "Tidak ada baris order yang didefinisikan dalam penjualan ini"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo Awal"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1396,18 +1408,18 @@ msgstr ""
 #: view:report.pos.order:0
 #: selection:report.pos.order,state:0
 msgid "Paid"
-msgstr ""
+msgstr "Terbayar"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Semua baris Penjualan"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Penawaran"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1416,22 +1428,22 @@ msgstr ""
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Penjualan berdasarkan batasan"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Konfigurasi Jurnal"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Baris Statemen"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1439,6 +1451,7 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Pengguna yang menggunakan mesin kas, bisa pelajar, atau karyawan sementara"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
@@ -1448,18 +1461,18 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
-msgstr ""
+msgstr "Penerimaan"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Buat Faktur"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Selesai"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
@@ -1467,29 +1480,29 @@ msgstr ""
 #: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktur"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
 msgid "Get From Sale"
-msgstr ""
+msgstr "Dapat dari Penjualan"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Terbuka"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "Referesi order"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
 msgid "Sales lines Report"
-msgstr ""
+msgstr "Laporan Baris penjualan"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
@@ -1500,29 +1513,29 @@ msgstr ""
 #. module: point_of_sale
 #: selection:pos.order,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Tidak termasuk pajak"
 
 #. 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 ""
+msgstr "Keuntungan bersih per kuantitas"
 
 #. 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 "Penjualan berdasarkan keuntungan pengguna"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "PPn"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Statistik Penjualan POS"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1537,83 +1550,84 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produk"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr ""
+msgstr "Baris POS"
 
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
 msgid "Discount Control"
-msgstr ""
+msgstr "Kontrol Diskon"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Neraca akhir"
 
 #. 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 ""
+msgstr "Penjualan Detil"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Tanggal Akhir"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Tanggal pemesanan"
 
 #. 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 ""
+msgstr "Baris Penjualan per pengguna"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
 msgid "Max Difference for Cashboxes"
-msgstr ""
+msgstr "Perbedaan maksimal dari Box Uang"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Ya"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, 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: point_of_sale
 #: view:pos.make.payment:0
 msgid "The cash register must be opened to be able to execute a payment."
-msgstr ""
+msgstr "Mesin Kas harus dibuka untuk dapat menjalankan pembayaran"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total bersih"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Description"
-msgstr ""
+msgstr "Deskripsi Produk"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Tanggal awal"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1624,28 +1638,28 @@ msgstr ""
 #: field:report.sales.by.user.pos,amount:0
 #: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "Penjualan Per pengguna"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Buka Mesin Kas"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Pernyataan"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
 msgid "Order Description"
-msgstr ""
+msgstr "Keterangan Order"
 
 #. module: point_of_sale
 #: field:pos.make.payment,num_sale:0
@@ -1658,12 +1672,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Laporan Pembayaran"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
 msgid "Return lines"
-msgstr ""
+msgstr "Baris Pengembalian"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1682,157 +1696,160 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.pos.order,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Perusahaan:"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Tanggal Faktur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, 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 ""
+"Tidak dapat menemukan daftar harga dan quantity yang cocok dengan produk "
+"ini.\n"
+"Anda harus merubah entah produk, quantity, atau harganya."
 
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Nomor Seri"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Cetak Ulang"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
-msgstr ""
+msgstr "Anda harus membuka minimal 1 box uang"
 
 #. 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 "Total Pembayaran per pengguna"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
 msgid "Pos order"
-msgstr ""
+msgstr "POS Order"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Gagal!"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "No. Of Articles"
-msgstr ""
+msgstr "No. Artikel"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
 msgid "Validity Date"
-msgstr ""
+msgstr "Tanggal Validasi"
 
 #. module: point_of_sale
 #: field:pos.order,pickings:0
 msgid "Picking"
-msgstr ""
+msgstr "Pengambilan"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
 #: field:report.pos.order,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Toko"
 
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
 msgid "Last Output Picking"
-msgstr ""
+msgstr "Pengaturan Keluaran terakhir"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Transaksi buku bank"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Rekening Koran"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Tanggal Akhir"
 
 #. 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 "Laporan POS"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add Discount"
-msgstr ""
+msgstr "Tambahkan Diskon"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Tutup Kas Register"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
 msgid "Refunded Quantity"
-msgstr ""
+msgstr "Pengembalian Quantity"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
 msgid "Scan Barcode"
-msgstr ""
+msgstr "Memindai Barcode"
 
 #. module: point_of_sale
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Operasi"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 msgid "Sales Order"
-msgstr ""
+msgstr "Order Penjualan"
 
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Jurnal Masukan"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Dikonfirmasi"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Pembatalan Faktur"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 #: view:pos.get.sale:0
 #: view:report.cash.register:0
 msgid "Confirm"
-msgstr ""
+msgstr "Konfirmasi"
 
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
@@ -1847,23 +1864,23 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.discount,discount:0
 msgid "Discount "
-msgstr ""
+msgstr "Diskon "
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Faktur Pembelian"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
-msgstr ""
+msgstr "Baris yang termodifikasi gagal !!"
 
 #. module: point_of_sale
 #: field:pos.make.payment,payment_name:0
 msgid "Payment name"
-msgstr ""
+msgstr "Nama Pembayaran"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
@@ -1873,85 +1890,85 @@ msgstr "Pelaporan"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products for Input Operations"
-msgstr ""
+msgstr "Produk untuk Operasi masukan"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
 msgid "Today's Sales by Current User"
-msgstr ""
+msgstr "Penjualan hari ini per pengguna yang aktif"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "Keluaran box POS"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Kode Jurnal harus unik per perusahaan"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurasi"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Tanggal Awal"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
 #: field:report.pos.order,date_validation:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Tanggal Validasi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
-msgstr ""
+msgstr "Anda tidak punya cukup akses untuk memvalidasi penjualan ini !!"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Faktur"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "Total Diskon"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Ambil Uang"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "Detail penjualan"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
 msgid "Control for Output Operations"
-msgstr ""
+msgstr "Kontrol untuk operasi keluaran"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
 #, python-format
 msgid "Message"
-msgstr ""
+msgstr "Pesan"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -1962,7 +1979,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_order
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1973,7 +1990,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Penjualan"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1981,40 +1998,40 @@ msgstr ""
 #: view:report.pos.order:0
 #: selection:report.pos.order,state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Difakturkan"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "Tidak"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Pemberitahuan diskon"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
 msgid "Add"
-msgstr ""
+msgstr "Tambahkan"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 #: selection:report.pos.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Draf"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr ""
+msgstr "POS Baris Order"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Are you sure you want to open the statements ?"
-msgstr ""
+msgstr "Anda yakin mau membuka ini?"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
@@ -2024,20 +2041,21 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
-msgstr ""
+msgstr "Mohon Masukkan Pelanggan di penjualan"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
 msgstr ""
+"Tidak ada Akun Penerimaan yang didefinisikan untuk jurnal :\"%s\"(id:%d)"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
@@ -2091,13 +2109,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2211,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2352,3 +2370,6 @@ msgstr ""
 #: field:report.pos.order,year:0
 msgid "Year"
 msgstr ""
+
+#~ msgid "Product for expenses"
+#~ msgstr "Produk untuk Biaya"
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index 9a94257066b..7f35eacf4ad 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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr "Gestione registro di cassa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Non è stata trovata nessuna riga valida nel listino!"
@@ -623,8 +623,8 @@ msgid "User's Product"
 msgstr "Prodotto dell'utente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -738,7 +738,7 @@ msgid "Total :"
 msgstr "Totale :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Fallita la creazione della linea !"
@@ -864,7 +864,6 @@ msgid "Receipt :"
 msgstr "Ricevuta:"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "Sconosciuto"
@@ -1098,8 +1097,8 @@ msgid "All Closed CashBox"
 msgstr "Tutti i registratori di cassa chiusi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nessun Listino Prezzi !"
@@ -1255,15 +1254,15 @@ msgid "Sale by User"
 msgstr "Vendita per utente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Errore !"
@@ -1290,7 +1289,7 @@ msgid "July"
 msgstr "Luglio"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Prego fornire un conto per il prodotto: %s"
@@ -1391,7 +1390,7 @@ msgid "Customer Note"
 msgstr "Note cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nessuna riga ordine definita in questa vendita."
@@ -1600,7 +1599,7 @@ msgid "Yes"
 msgstr "Sì"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1702,8 +1701,8 @@ msgid "Invoice Date"
 msgstr "Data della fattura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1721,9 +1720,9 @@ msgid "Reprint"
 msgstr "Ristampa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1867,7 +1866,7 @@ msgid "Supplier Invoice"
 msgstr "Fattura Fornitore"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Modifica riga fallita!"
@@ -1919,8 +1918,8 @@ msgid "Validation Date"
 msgstr "Data di convalida"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "Non avete abbastanza diritti per convalidare questa vendita!"
@@ -2039,13 +2038,13 @@ msgid "PRO-FORMA"
 msgstr "Pro-Forma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Prego fornire un partner per la vendita"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2103,13 +2102,13 @@ msgid "POS Orders lines"
 msgstr "Righe ordini POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Errore"
@@ -2205,7 +2204,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "prego verificare che il conto sia impostato su %s"
@@ -2552,21 +2551,12 @@ msgstr "Anno"
 #~ msgid "Net Total"
 #~ msgstr "Totale netto"
 
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel: + 32 (0) 2 231 04 35"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
 #~ msgid "Partner Ref."
 #~ msgstr "Rif. Partner"
 
-#~ msgid "Logged in User"
-#~ msgstr "Utente autenticato"
-
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Questo è l'utente loggato (non necessariamente il venditore)."
-
 #~ msgid "Payment Name"
 #~ msgstr "Nome del Pagamento"
 
@@ -2576,12 +2566,6 @@ msgstr "Anno"
 #~ msgid "Payment Term"
 #~ msgstr "Termini di pagamento"
 
-#~ msgid "OPERATION N° :"
-#~ msgstr "N° operazione"
-
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Questo è il venditore che attualmente sta facendo l'ordine"
-
 #~ msgid "Product for expenses"
 #~ msgstr "Prodotto per spese"
 
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 4fda7ee9c1d..2ea0e54718a 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "유효한 가격리스트 라인이 없습니다!"
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "라인 생성 실패!"
@@ -854,7 +854,6 @@ 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 "알려지지 않음"
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "가격리스트가 없음!"
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "에러 !"
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "이 판매에 정의된 주문 라인이 없음."
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr "인보이스 날짜"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr "공급자 인보이스"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "라인 수정 실패!"
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr "프로포마"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "이 판매의 파트너를 기입하십시오."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "에러"
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 12ef589a7b7..c1ff38487d9 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index 8c2e85d76c1..b5e9554b9af 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Зөв үнийн жагсаалт олдсонгүй!"
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr "Нийт :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Мөр нэмэхэд алдаа гарлаа!"
@@ -854,7 +854,6 @@ 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 "тодорхойгүй"
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Үнийн жагсаалт алга!"
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Алдаа!"
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr "Нэхэмжилсэн Огноо"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr "Нийлүүлэгчийн Нэхэмжлэл"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Харилцагчийг сонгоно уу."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Алдаа"
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2516,15 +2515,9 @@ msgstr ""
 #~ msgid "Net Total"
 #~ msgstr "Цэвэр дүн"
 
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Утас : + 32 (0) 2 231 04 35"
-
 #~ msgid "Refund Orders"
 #~ msgstr "Гүйлгээ буцаалт"
 
-#~ msgid "Logged in User"
-#~ msgstr "Нэвтэрсэн хэрэглэгч"
-
 #~ msgid "Default Receivable"
 #~ msgstr "Үндсэн авлага"
 
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index 6097a3784a6..0ca6e8265d8 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Kasregister beheer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Geen geldige prijslijst regel gevonden!"
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Aanmaken regel mislukt!"
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Geen prijslijst!"
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Fout!"
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Geen orderregels aanwezig voor deze verkoop"
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Wijzig foutieve regel!"
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Kies een relatie voor deze verkoop"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Fout"
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index 960ae6b4ea7..869b99da38c 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index 526d807ac62..d32da09af08 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Zarządzanie kasą"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Nie znaleziono poprawnej pozycji cennika !"
@@ -619,8 +619,8 @@ msgid "User's Product"
 msgstr "Produkt użytkownika"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -732,7 +732,7 @@ msgid "Total :"
 msgstr "Suma :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Tworzenie pozycji nieudane !"
@@ -857,7 +857,6 @@ msgid "Receipt :"
 msgstr "Paragon :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "nieznany"
@@ -1091,8 +1090,8 @@ msgid "All Closed CashBox"
 msgstr "Wszystkie zamknięte kasy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Brak cennika !"
@@ -1248,15 +1247,15 @@ msgid "Sale by User"
 msgstr "Sprzedaż wg użytkowników"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Błąd !"
@@ -1283,7 +1282,7 @@ msgid "July"
 msgstr "Lipiec"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Wprowadź konto dla produktu: %s"
@@ -1384,7 +1383,7 @@ msgid "Customer Note"
 msgstr "Notatka klienta"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nie ma pozycji zamówienia dla tej sprzedaży."
@@ -1593,7 +1592,7 @@ msgid "Yes"
 msgstr "Tak"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Brak konta przychodu dla produktu: \"%s\" (id:%d)"
@@ -1694,8 +1693,8 @@ msgid "Invoice Date"
 msgstr "Data wystawienia faktury"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1713,9 +1712,9 @@ msgid "Reprint"
 msgstr "Wydrukuj Ponownie"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "Musisz otworzyć co najmniej jedną kasę"
@@ -1859,7 +1858,7 @@ msgid "Supplier Invoice"
 msgstr "Faktura dostawcy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Modyfikacja pozycji nieudana !"
@@ -1911,8 +1910,8 @@ msgid "Validation Date"
 msgstr "Data zatwierdzenia"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "Nie masz ospowiednich praw do zatwierdzenia tej sprzedaży !"
@@ -2031,13 +2030,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Proszę wprowadzić partnera dla sprzedaży."
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2095,13 +2094,13 @@ msgid "POS Orders lines"
 msgstr "Pozycje zamówienia PS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Błąd"
@@ -2197,7 +2196,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index 7b58d420cbb..1582dc08727 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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Gestão de Folhas de Caixa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Não foi possível encontrar uma linha de lista de preços válida !"
@@ -621,8 +621,8 @@ msgid "User's Product"
 msgstr "Produto do Utilizador"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -734,7 +734,7 @@ msgid "Total :"
 msgstr "Total:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "A criação da linha falhou !"
@@ -859,7 +859,6 @@ msgid "Receipt :"
 msgstr "Recibo:"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconhecido"
@@ -1093,8 +1092,8 @@ msgid "All Closed CashBox"
 msgstr "Todas as Caixas Fechadas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem Lista de Preços !"
@@ -1261,15 +1260,15 @@ msgid "Sale by User"
 msgstr "Venda por Utilizador"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
@@ -1296,7 +1295,7 @@ msgid "July"
 msgstr "Julho"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Por favor, providencie uma conta para o produto %s"
@@ -1397,7 +1396,7 @@ msgid "Customer Note"
 msgstr "Nota de Cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Não estão definidas linhas para esta ordem de venda"
@@ -1608,7 +1607,7 @@ msgid "Yes"
 msgstr "Sim"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Não há conta de receitas definida para este produto:\"%s\" (id:%d)"
@@ -1710,8 +1709,8 @@ msgid "Invoice Date"
 msgstr "Data da Factura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1732,9 +1731,9 @@ msgid "Reprint"
 msgstr "Reimprimir"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "Tem de abrir pelo menos uma caixa"
@@ -1878,7 +1877,7 @@ msgid "Supplier Invoice"
 msgstr "Factura de fornecedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Falha na Modificação da linha !"
@@ -1930,8 +1929,8 @@ msgid "Validation Date"
 msgstr "Data de Validação"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "Não tem permissões suficientes para validar esta venda!"
@@ -2050,13 +2049,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por Favor forneça um terceiro para a venda"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2115,13 +2114,13 @@ msgid "POS Orders lines"
 msgstr "Linhas de Ordem de Venda de POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -2217,7 +2216,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "Por favor, preencher estes campos para movimentos de caixa:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "Verificar se a conta está definida para %s"
@@ -2588,8 +2587,5 @@ msgstr "Ano"
 #~ msgid "D_iscount"
 #~ msgstr "Desconto"
 
-#~ msgid "Sortie de caisse"
-#~ msgstr "Saída de caixa"
-
 #~ msgid "Product for expenses"
 #~ msgstr "Produto para despesas"
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 5f611f8e931..96718d3ad0d 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Gerenciamento do Registro de Caixa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Nenhuma linha de lista de preços válida encontrada!"
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr "Produto do Usuário"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Falha na criação da linha !"
@@ -853,7 +853,6 @@ 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 "Desconhecido"
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem Lista de Preços !"
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Sem linhas de pedido definidas nesta venda."
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr "Data da Fatura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr "Fatura do Fornecedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Falha na modificação da Linha!"
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index 4aaf0856f6f..0f3f022bd5c 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 "necunoscut"
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr "Data facturii"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr "Factură furnizor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "Proformă"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2365,12 +2364,6 @@ msgstr ""
 #~ msgid "Orders of the day"
 #~ msgstr "Comenzi azi"
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Utilizator conectat (nu neapărat agentul)"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
-
 #~ msgid "Ok"
 #~ msgstr "Ok"
 
@@ -2383,9 +2376,6 @@ msgstr ""
 #~ msgid "Refund Orders"
 #~ msgstr "Restituire comenzi"
 
-#~ msgid "Logged in User"
-#~ msgstr "Utilizator conectat"
-
 #~ msgid "Disc"
 #~ msgstr "Disc"
 
@@ -2530,17 +2520,11 @@ msgstr ""
 #~ msgid "Payment Term"
 #~ msgstr "Termen de plată"
 
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Acest agent face de fapt comanda"
-
 #~ msgid "Company:"
 #~ msgstr "Companie:"
 
 #~ msgid "Print Date:"
 #~ msgstr "Data tipăririi:"
 
-#~ msgid "OPERATION N° :"
-#~ msgstr "Număr operaţie:"
-
 #~ msgid "Discount :"
 #~ msgstr "Discount"
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index 8ad47f7abbf..c7c7b9a689e 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -284,8 +284,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Не найдено действительной строки прайс-листа!"
@@ -621,8 +621,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -732,7 +732,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -857,7 +857,6 @@ 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 "неизвестен"
@@ -1091,8 +1090,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Нет прейскуранта!"
@@ -1248,15 +1247,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1283,7 +1282,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1384,7 +1383,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1593,7 +1592,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1694,8 +1693,8 @@ msgid "Invoice Date"
 msgstr "Дата выставления счета"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1713,9 +1712,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1859,7 +1858,7 @@ msgid "Supplier Invoice"
 msgstr "Счета поставщиков"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1911,8 +1910,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2031,13 +2030,13 @@ msgid "PRO-FORMA"
 msgstr "Проформа"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2095,13 +2094,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2197,7 +2196,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2516,9 +2515,6 @@ msgstr ""
 #~ msgid "Company:"
 #~ msgstr "Организация:"
 
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Тел : + 32 (0) 2 231 04 35"
-
 #~ msgid "Piece number"
 #~ msgstr "Пример числа"
 
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index 04dd69f60d1..f986a8360cb 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr "Skupaj:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 "neznano"
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ni cenika!"
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Napaka!"
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr "Datum računa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr "Račun dobavitelja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Napaka"
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2548,21 +2547,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Napačno ime modela v definiciji dejanja."
 
-#~ msgid "Logged in User"
-#~ msgstr "Prijavljeni uporabnik"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
-
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "To je prijavljeni uporabnik (ne pa nujno tudi prodajalec)."
-
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "To je prodeajalec, ki je dejansko izvedel naročilo."
-
-#~ msgid "OPERATION N° :"
-#~ msgstr "Št. operacije:"
-
 #~ msgid "Piece Number"
 #~ msgstr "Številka dela"
 
diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po
index 5555ef9227e..43183d1b449 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -854,7 +854,6 @@ 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 ""
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 7b8b565f3ae..8b187b7219a 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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "NIje pronadjen odgovarajuci cenovnik"
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr "Korisnicki Proizvod"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr "Ukupno:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Neuspesno Kreiranje linije"
@@ -854,7 +854,6 @@ msgid "Receipt :"
 msgstr "Racun :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "nepoznato"
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr "Sve zatvorene Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nema Cenovnika !"
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr "Prodaja po Korisniku"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr "Juli"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Molim prosledite nalog za proizvod: %s"
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr "Napomena Musterije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nema narudzbenica definisanih za ovu prodaju."
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr "Da"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr "Datum Fakture"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr "Reprint"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "Trebas otvoriti makar jednu Kasu"
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr "Faktura Dobavljaca"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Neuspesno modifikovanje linije !"
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr "Datum Validacije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "Nemate dovoljan status da pristupite i da potvrdite ovu prodaju !"
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Molim postavi partnera za prodaju"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr "Linije POS ZAhteva"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Greska"
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "Molim popunite ova polja za sadrzaj kutije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "molim proveri da li je dati nalog postavljen na %s"
@@ -2377,21 +2376,12 @@ msgstr "Godina"
 #~ msgid "Net Total"
 #~ msgstr "Neto Ukupno"
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Ovo je prijavljeni korisnik( ne nuzno prodavac)"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
-
 #~ msgid "Ok"
 #~ msgstr "U redu"
 
 #~ msgid "Detail of Sales"
 #~ msgstr "Detalji Prodaje"
 
-#~ msgid "Logged in User"
-#~ msgstr "Logovani korisnik"
-
 #~ msgid "VAT(%)"
 #~ msgstr "PDV(%)"
 
@@ -2481,9 +2471,6 @@ msgstr "Godina"
 #~ msgid "Print Date:"
 #~ msgstr "Datum Stampe"
 
-#~ msgid "OPERATION N° :"
-#~ msgstr "Br.OPERACIJE :"
-
 #~ msgid "Orders of the day"
 #~ msgstr "Današnje narudžbe"
 
@@ -2541,145 +2528,8 @@ msgstr "Godina"
 #~ msgid "Default gift journal"
 #~ msgstr "Glavna Knjiga Poklona"
 
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Ovaj prodavac upravo pravi nalog"
-
-#~ msgid "Close Registers"
-#~ msgstr "Zatvori Registre"
-
-#~ msgid "Open Register"
-#~ msgstr "Otvori Registre"
-
-#~ msgid ""
-#~ "Person who uses the the register. It could be a reliever, a student or an "
-#~ "interim employee."
-#~ msgstr ""
-#~ "Osoba koja koristi registre. To mogu biti volonteri, studenti ili privremeni "
-#~ "radnici."
-
-#~ msgid "Sortie de caisse"
-#~ msgstr "Gotovina Van"
-
-#~ msgid "Register management"
-#~ msgstr "Menadzment Registara"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Pokusavate da pridodate lot koji nije iz istog proizvoda"
-
 #~ msgid "Partner Ref."
 #~ msgstr "Ref. Partner"
 
-#, python-format
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                   "
-#~ " \" and quantity.\n"
-#~ "You have to change either the product,\" \\n                    \" the "
-#~ "quantity or the pricelist."
-#~ msgstr ""
-#~ "Ne mogu naci u cenovniku proizvod \" \\n \" i kolicinu.\n"
-#~ "treba da promenis ili proizvod, \" \\n \" kolicine, ili cenovnik,"
-
-#~ msgid "Register"
-#~ msgstr "Registar"
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                'Please set one before choosing a product."
-#~ msgstr ""
-#~ "Trebas selektovati cenovnik u formi prodaje !\n"
-#~ "' \\n 'Molim selektujte jedan pre izbora proizvoda."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Greska: Neispravan Bvr Borj ( pogresan cheksum)"
-
 #~ msgid "Product for expenses"
 #~ msgstr "Proizvodi za Troskove"
-
-#~ msgid "Bancontact Journal"
-#~ msgstr "Dnevnik kontakata Banke"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "GRESKA: BVR referenca je neophodna"
-
-#, python-format
-#~ msgid ""
-#~ "You can not open a Cashbox for \"%s\".\n"
-#~ "Please close its related Register.' %(journal.name)))\n"
-#~ "            \n"
-#~ "            number = ''\n"
-#~ "            if journal.sequence_id:\n"
-#~ "                number = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "            else:\n"
-#~ "                number = sequence_obj.get(cr, uid, 'account.cash.statement"
-#~ msgstr ""
-#~ "Ne mozete otvoriti kasu za \"%s\".\n"
-#~ "Molim zatvorite dati Registar.' %(journal.name)))\n"
-#~ "             \n"
-#~ "             broj = \"\n"
-#~ "             ako je journal.sequence_id:\n"
-#~ "                 broj = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "             inace\n"
-#~ "                 broj = sequence_obj.get(cr, uid, 'account.cash.statement"
-
-#, python-format
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                \" "
-#~ "and quantity.\n"
-#~ "You have to change either the product,\" \\n                \" the quantity "
-#~ "or the pricelist."
-#~ msgstr ""
-#~ "Ne mogu naci u cenovniku proizvod \" \\n\"  date kolicine.\n"
-#~ "Moras promeniti ili proizvod, \" \\n \" kolicinu ili cenovnik."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Open Registers"
-#~ msgstr "Otvori Registre"
-
-#~ msgid "The register must be opened to be able to execute a payment."
-#~ msgstr "REgistar mora biti otvoren da bi bio u mogucnosti da primi uplatu."
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                    'Please set one before choosing a product."
-#~ msgstr ""
-#~ "Trebas selektovati cenovnik iz forme prodaje !\n"
-#~ " ' \\n ' Molim izaberi neki pre nego izaberis proizvod."
-
-#~ msgid "Close Register"
-#~ msgstr "Zatvori Registar"
-
-#, python-format
-#~ msgid ""
-#~ "There is no receivable account defined for this journal:'\\n                 "
-#~ "   ' \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Ne postoji prijemni nalog definisan za ovaj dnevnik: '\\n ' \"%s\" (id:%d)"
-
-#~ msgid "Registers"
-#~ msgstr "Registri"
-
-#, python-format
-#~ msgid "Registers are already closed."
-#~ msgstr "Registri su vec zatvoreni"
-
-#~ msgid "Visa Journal"
-#~ msgstr "Visa Dnevnik"
-
-#, python-format
-#~ msgid ""
-#~ "There is no income '\\n                        'account defined for this "
-#~ "product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Ne postoji ulazni '\\n ' nalog definisan za ovaj proizvod: \"%s\" (id:%d)"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Moras da pridodas produkcionu seriju za ovaj prozivod"
-
-#~ msgid "Cash Journal"
-#~ msgstr "Dnevnik Gotovine"
diff --git a/addons/point_of_sale/i18n/sr@latin.po b/addons/point_of_sale/i18n/sr@latin.po
index 4c4ec800d36..9c481bd8a06 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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "NIje pronadjen odgovarajuci cenovnik"
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr "Korisnicki Proizvod"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr "Ukupno:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "Neuspesno Kreiranje linije"
@@ -854,7 +854,6 @@ msgid "Receipt :"
 msgstr "Racun :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "nepoznato"
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr "Sve zatvorene Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nema Cenovnika !"
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr "Prodaja po Korisniku"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr "Juli"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Molim prosledite nalog za proizvod: %s"
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr "Napomena Musterije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nema narudzbenica definisanih za ovu prodaju."
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr "Da"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr "Datum Fakture"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr "Reprint"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "Trebas otvoriti makar jednu Kasu"
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr "Faktura Dobavljaca"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "Neuspesno modifikovanje linije !"
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr "Datum Validacije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "Nemate dovoljan status da pristupite i da potvrdite ovu prodaju !"
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Molim postavi partnera za prodaju"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr "Linije POS ZAhteva"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Greska"
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "Molim popunite ova polja za sadrzaj kutije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "molim proveri da li je dati nalog postavljen na %s"
@@ -2362,157 +2361,23 @@ msgstr "Godina"
 #~ msgid "Net Total"
 #~ msgstr "Neto Ukupno"
 
-#~ msgid "Close Registers"
-#~ msgstr "Zatvori Registre"
-
-#~ msgid "Open Register"
-#~ msgstr "Otvori Registre"
-
-#~ msgid ""
-#~ "Person who uses the the register. It could be a reliever, a student or an "
-#~ "interim employee."
-#~ msgstr ""
-#~ "Osoba koja koristi registre. To mogu biti volonteri, studenti ili privremeni "
-#~ "radnici."
-
-#~ msgid "Sortie de caisse"
-#~ msgstr "Gotovina Van"
-
-#~ msgid "Register management"
-#~ msgstr "Menadzment Registara"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Pokusavate da pridodate lot koji nije iz istog proizvoda"
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                'Please set one before choosing a product."
-#~ msgstr ""
-#~ "Trebas selektovati cenovnik u formi prodaje !\n"
-#~ "' \\n 'Molim selektujte jedan pre izbora proizvoda."
-
 #~ msgid "Partner Ref."
 #~ msgstr "Ref. Partner"
 
-#~ msgid "Register"
-#~ msgstr "Registar"
-
-#, python-format
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                   "
-#~ " \" and quantity.\n"
-#~ "You have to change either the product,\" \\n                    \" the "
-#~ "quantity or the pricelist."
-#~ msgstr ""
-#~ "Ne mogu naci u cenovniku proizvod \" \\n \" i kolicinu.\n"
-#~ "treba da promenis ili proizvod, \" \\n \" kolicine, ili cenovnik,"
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Greska: Neispravan Bvr Borj ( pogresan cheksum)"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
 #~ msgid "Product for expenses"
 #~ msgstr "Proizvodi za Troskove"
 
-#~ msgid "Bancontact Journal"
-#~ msgstr "Dnevnik kontakata Banke"
-
 #~ msgid "Document"
 #~ msgstr "Dokument"
 
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "GRESKA: BVR referenca je neophodna"
-
-#, python-format
-#~ msgid ""
-#~ "You can not open a Cashbox for \"%s\".\n"
-#~ "Please close its related Register.' %(journal.name)))\n"
-#~ "            \n"
-#~ "            number = ''\n"
-#~ "            if journal.sequence_id:\n"
-#~ "                number = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "            else:\n"
-#~ "                number = sequence_obj.get(cr, uid, 'account.cash.statement"
-#~ msgstr ""
-#~ "Ne mozete otvoriti kasu za \"%s\".\n"
-#~ "Molim zatvorite dati Registar.' %(journal.name)))\n"
-#~ "             \n"
-#~ "             broj = \"\n"
-#~ "             ako je journal.sequence_id:\n"
-#~ "                 broj = sequence_obj.get_id(cr, uid, "
-#~ "journal.sequence_id.id)\n"
-#~ "             inace\n"
-#~ "                 broj = sequence_obj.get(cr, uid, 'account.cash.statement"
-
-#, python-format
-#~ msgid ""
-#~ "Couldn't find a pricelist line matching this product\" \\n                \" "
-#~ "and quantity.\n"
-#~ "You have to change either the product,\" \\n                \" the quantity "
-#~ "or the pricelist."
-#~ msgstr ""
-#~ "Ne mogu naci u cenovniku proizvod \" \\n\"  date kolicine.\n"
-#~ "Moras promeniti ili proizvod, \" \\n \" kolicinu ili cenovnik."
-
-#~ msgid "Open Registers"
-#~ msgstr "Otvori Registre"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "The register must be opened to be able to execute a payment."
-#~ msgstr "REgistar mora biti otvoren da bi bio u mogucnosti da primi uplatu."
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the sale form !\n"
-#~ "' \\n                    'Please set one before choosing a product."
-#~ msgstr ""
-#~ "Trebas selektovati cenovnik iz forme prodaje !\n"
-#~ " ' \\n ' Molim izaberi neki pre nego izaberis proizvod."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
-#~ msgid "Close Register"
-#~ msgstr "Zatvori Registar"
-
-#, python-format
-#~ msgid ""
-#~ "There is no receivable account defined for this journal:'\\n                 "
-#~ "   ' \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Ne postoji prijemni nalog definisan za ovaj dnevnik: '\\n ' \"%s\" (id:%d)"
-
-#~ msgid "Registers"
-#~ msgstr "Registri"
-
-#~ msgid "Visa Journal"
-#~ msgstr "Visa Dnevnik"
-
-#, python-format
-#~ msgid "Registers are already closed."
-#~ msgstr "Registri su vec zatvoreni"
-
-#, python-format
-#~ msgid ""
-#~ "There is no income '\\n                        'account defined for this "
-#~ "product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Ne postoji ulazni '\\n ' nalog definisan za ovaj proizvod: \"%s\" (id:%d)"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Moras da pridodas produkcionu seriju za ovaj prozivod"
-
-#~ msgid "Cash Journal"
-#~ msgstr "Dnevnik Gotovine"
-
 #~ msgid "Piece number"
 #~ msgstr "Br.Komada"
 
@@ -2525,21 +2390,12 @@ msgstr "Godina"
 #~ msgid ","
 #~ msgstr ","
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "Ovo je prijavljeni korisnik( ne nuzno prodavac)"
-
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "Tel : + 32 (0) 2 231 04 35"
-
 #~ msgid "Ok"
 #~ msgstr "U redu"
 
 #~ msgid "Detail of Sales"
 #~ msgstr "Detalji Prodaje"
 
-#~ msgid "Logged in User"
-#~ msgstr "Logovani korisnik"
-
 #~ msgid "VAT(%)"
 #~ msgstr "PDV(%)"
 
@@ -2621,9 +2477,6 @@ msgstr "Godina"
 #~ msgid "Print Date:"
 #~ msgstr "Datum Stampe"
 
-#~ msgid "OPERATION N° :"
-#~ msgstr "Br.OPERACIJE :"
-
 #~ msgid "Orders of the day"
 #~ msgstr "Današnje narudžbe"
 
@@ -2680,6 +2533,3 @@ msgstr "Godina"
 
 #~ msgid "Default gift journal"
 #~ msgstr "Glavna Knjiga Poklona"
-
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "Ovaj prodavac upravo pravi nalog"
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index d2e938df447..e97246a667b 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/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: 2011-08-05 04:39+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "Kassaregister administration"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr "Totalt :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ msgid "Receipt :"
 msgstr "Kvitto :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "okänd"
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ingen prislista !"
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Fel !"
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr "Juli"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "Vänligen ange ett konto för produkten: %s"
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr "Kundnotering"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr "Ja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, 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)"
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr "Fakturadatum"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr "Leverantörsfaktura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Vänligen välj en kund för försäljningen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Fel"
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2364,15 +2363,9 @@ msgstr "År"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unikt!"
-
 #~ msgid "Document"
 #~ msgstr "Dokument"
 
-#~ msgid "Visa Journal"
-#~ msgstr "Visa journal"
-
 #~ msgid "Discount :"
 #~ msgstr "Rabatt"
 
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index 3bb34b4f496..d3e4a200fa1 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index decda4ee268..a2db8f732ef 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr "Kasa Kaydı Yönetimi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Geçerli bir fiyat listesi satırı bulunamadı !"
@@ -620,8 +620,8 @@ msgid "User's Product"
 msgstr "Kullanıcının Ürünleri"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -733,7 +733,7 @@ msgid "Total :"
 msgstr "Toplam :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -858,7 +858,6 @@ 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 "bilinmiyor"
@@ -1092,8 +1091,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1249,15 +1248,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1284,7 +1283,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1385,7 +1384,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1594,7 +1593,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1695,8 +1694,8 @@ msgid "Invoice Date"
 msgstr "Fatura Tarihi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1714,9 +1713,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1860,7 +1859,7 @@ msgid "Supplier Invoice"
 msgstr "Tedarikçi Faturası"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1912,8 +1911,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2032,13 +2031,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2096,13 +2095,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2198,7 +2197,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2361,297 +2360,12 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
-#~ msgid "Invoiced & Paid"
-#~ msgstr "Faturalanmış & Ödenmiş"
-
-#~ msgid "Destination"
-#~ msgstr "Hedef"
-
-#~ msgid "From Picking"
-#~ msgstr "İrsaliyeden"
-
-#~ msgid "Validated By"
-#~ msgstr "Onaylayan"
-
-#~ msgid "Supplier"
-#~ msgstr "Tedarikçi"
-
-#~ msgid "Delivery"
-#~ msgstr "Teslimat"
-
-#~ msgid "From Order"
-#~ msgstr "Siparişten"
-
-#~ msgid "Confirmed Purchase"
-#~ msgstr "Onaylanan Alış"
-
-#~ msgid "Invoice Exception"
-#~ msgstr "Fatura Muafiyeti"
-
-#~ msgid "Default Purchase Pricelist"
-#~ msgstr "Varsayılan Alış Fiyat Listesi"
-
-#~ msgid "Create invoice"
-#~ msgstr "Fatura Oluştur"
-
-#~ msgid "Create invoice from product recept"
-#~ msgstr "Alış İrsaliyesinden Fatura Oluştur"
-
-#~ msgid "Purchase Process"
-#~ msgstr "Alış Prosesi"
-
-#~ msgid "Invoice from Packing list"
-#~ msgstr "Çeki Listesinden Fatura"
-
-#~ msgid "Approve Purchase"
-#~ msgstr "Alış Onayla"
-
-#~ msgid "Approved"
-#~ msgstr "Onaylanmış"
-
-#~ msgid "Purchase Orders in Progress"
-#~ msgstr "İşlemdeki Alış Siparişleri"
-
-#~ msgid "Untaxed Amount"
-#~ msgstr "Tutar"
-
-#~ msgid "Purchase Order"
-#~ msgstr "Satınalma Siparişi"
-
-#~ msgid "Cancelled"
-#~ msgstr "İptal Edildi"
-
-#~ msgid "Incoming Products"
-#~ msgstr "Gelen Ürünler"
-
-#~ msgid "Reference"
-#~ msgstr "Referans"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Analiz Hesabı"
-
-#~ msgid "Purchase Order lines"
-#~ msgstr "Alış Siparişi Kalemleri"
-
-#~ msgid "Validated by"
-#~ msgstr "Onaylayan"
-
-#~ msgid "Invoice based on deliveries"
-#~ msgstr "Teslimata Bağlı Faturalandır"
-
-#~ msgid "Net Price"
-#~ msgstr "Net Fiyat"
-
-#~ msgid "Order Line"
-#~ msgstr "Sipariş Kalemi"
-
-#~ msgid "Invoice Control"
-#~ msgstr "Fatura Kontrolü"
-
-#~ msgid "RFQ"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid "Waiting"
-#~ msgstr "Bekliyor"
-
-#~ msgid "Warehouse"
-#~ msgstr "Depo"
-
-#~ msgid "Fax:"
-#~ msgstr "Fax:"
-
-#~ msgid "Untaxed amount"
-#~ msgstr "Tutar"
-
-#~ msgid "Expected Date"
-#~ msgstr "Tahmini Tarih"
-
-#~ msgid "Shipping address :"
-#~ msgstr "Sevk Adresi :"
-
-#~ msgid "Purchase Pricelist"
-#~ msgstr "Alış Fiyat Listesi"
-
-#~ msgid "Planned Date"
-#~ msgstr "Planlama Tarihi"
-
-#~ msgid "Packing"
-#~ msgstr "Sevkiyat Paketlemesi"
-
-#~ msgid "Merge purchases"
-#~ msgstr "Alışları Birleştir"
-
-#~ msgid "Reservation Destination"
-#~ msgstr "Rezervasyon Yeri"
-
-#~ msgid "Order Reference"
-#~ msgstr "Sipariş Referansı"
-
-#~ msgid "Invoice from Purchase"
-#~ msgstr "Satınalmadan Faturaya"
-
-#~ msgid "Manual"
-#~ msgstr "Manuel"
-
-#~ msgid "Confirming Purchase"
-#~ msgstr "Alışı Onaylayan"
-
-#~ msgid "Shipping Exception"
-#~ msgstr "İstisnai Sevkiyat"
-
-#~ msgid "Purchase orders"
-#~ msgstr "Alış Siparişleri"
-
-#~ msgid "Request for Quotation :"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid "Confirm Purchase Order"
-#~ msgstr "Alış Siparişini Onayla"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Satınalma Yönetimi"
-
 #~ msgid "Partner Ref."
 #~ msgstr "Cari Kart"
 
-#~ msgid "Destination Address"
-#~ msgstr "Gönderilen Adres"
-
-#~ msgid "Purchase Order Line"
-#~ msgstr "Alış Sipariş Kalemi"
-
-#~ msgid "Calendar View"
-#~ msgstr "Takvimi Göster"
-
-#~ msgid "Set to Draft"
-#~ msgstr "Taslak olarak Ayarla"
-
-#~ msgid "Purchase order is approved by supplier."
-#~ msgstr "Tedarikçinin Onayladığı Alış Siparişleri"
-
-#~ msgid "Purchase order"
-#~ msgstr "Alış Siparişi"
-
-#~ msgid "Packing Invoice"
-#~ msgstr "Paketleme Sevkiyat Faturası"
-
-#~ msgid "Delivery & Invoices"
-#~ msgstr "Teslimat & Faturalar"
-
-#~ msgid "After Purchase order , Create invoice."
-#~ msgstr "Alış Siparişinden Sonra Fatura Yarat."
-
-#~ msgid "Scheduled date"
-#~ msgstr "Planlanan Tarih"
-
-#~ msgid "Our Order Reference"
-#~ msgstr "Bizim Sipariş Referansımız"
-
 #~ msgid "Compute"
 #~ msgstr "Hesapla"
 
-#~ msgid "Cancel Purchase Order"
-#~ msgstr "Alış Siparişini İptal Et"
-
-#~ msgid "Create Packing list"
-#~ msgstr "Çeki Listesi Oluştur"
-
-#~ msgid "History"
-#~ msgstr "Geçmiş Bilgisi"
-
-#~ msgid "Order Status"
-#~ msgstr "Sipariş Durumu"
-
-#~ msgid "Default Purchase Pricelist Version"
-#~ msgstr "Varsayılan Alış Fiyat Listesi Vers."
-
-#~ msgid "Fiscal Position"
-#~ msgstr "Mali Durum"
-
-#~ msgid "Request for Quotation N°"
-#~ msgstr "Teklif İsteği No"
-
-#~ msgid "Purchases Properties"
-#~ msgstr "Alış Özellikleri"
-
-#~ msgid "Purchase Orders"
-#~ msgstr "Alış Siparişleri"
-
-#~ msgid "New Purchase Order"
-#~ msgstr "Yeni Alış Siparişi Oluştur"
-
-#~ msgid "Received"
-#~ msgstr "Alınan"
-
-#~ msgid "Request for Quotation"
-#~ msgstr "Teklif İsteği"
-
-#~ msgid "Out Packing"
-#~ msgstr "İrsaliyesiz (Paketlemesiz)"
-
-#~ msgid "Date Approved"
-#~ msgstr "Onaylanmış Tarih"
-
-#~ msgid "Product recept invoice"
-#~ msgstr "Ürün İrsaliye Faturası"
-
-#~ msgid "Expected Delivery address:"
-#~ msgstr "Tahmini Teslimat Adresi"
-
-#~ msgid "Purchase Order Waiting Approval"
-#~ msgstr "Onay Bekleyen Alış Siparişi"
-
-#~ msgid "Confirming Purchase Order"
-#~ msgstr "Alış Siparişini Onaylayan"
-
-#~ msgid "Product UOM"
-#~ msgstr "Birim"
-
-#~ msgid "Reservation"
-#~ msgstr "Rezervasyon"
-
-#~ msgid "Purchase order is confirmed by the user."
-#~ msgstr "Kulanıcının Onayladığı Alış Siparişleri"
-
-#~ msgid "Purchase Invoice"
-#~ msgstr "Alış Faturası"
-
-#~ msgid "Your Order Reference"
-#~ msgstr "Sizin Sipariş Referansınız"
-
-#~ msgid "Purchase Order Confirmation N°"
-#~ msgstr "Alış Siparişi Onay N°"
-
-#~ msgid "Total amount"
-#~ msgstr "Toplam Tutar"
-
-#~ msgid "Purchase Control"
-#~ msgstr "Alış Kontrolü"
-
-#~ msgid "Request For Quotations"
-#~ msgstr "Teklif İstekleri"
-
-#~ msgid "Invoicing Control"
-#~ msgstr "Faturalama Kontrolü"
-
-#~ msgid "Approve"
-#~ msgstr "Onayla"
-
-#~ msgid "Approved Purchase"
-#~ msgstr "Onaylanmış Alış"
-
-#~ msgid "From Packing list, Create invoice."
-#~ msgstr "Çeki Listesinden Fatura Oluştur."
-
-#~ msgid "Approving Purchase Order"
-#~ msgstr "Alış Sipariş Onaylaması"
-
-#~ msgid "Stock Moves"
-#~ msgstr "Stok Hareketi"
-
-#~ msgid "Purchase Order Lines"
-#~ msgstr "Alış Sipariş Kalemleri"
-
 #~ msgid "Invoicing"
 #~ msgstr "Faturalama"
 
@@ -2738,6 +2452,3 @@ msgstr ""
 
 #~ msgid "Company:"
 #~ msgstr "Firma :"
-
-#~ msgid "OPERATION N° :"
-#~ msgstr "OPERASYON N° :"
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index ff38dbf9842..6c8407389ce 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index 00f64bbf9c1..58a0c001609 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-01-14 01:04+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr "Tổng :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -854,7 +854,6 @@ 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 "chưa rõ"
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "Không có bảng giá !"
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "Lỗi !"
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr "Tháng Bảy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr "Có"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr "Ngày hóa đơn"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr "In lại"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr "Hóa đơn Nhà cung cấp"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr "Ngày xác nhận"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "Lỗi"
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 2c3be8c9beb..742477037e1 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "现金登记管理"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "没找到有效的价格表明细。"
@@ -512,7 +512,7 @@ msgstr "发票金额"
 #: field:report.cash.register,journal_id:0
 #: field:report.pos.order,journal_id:0
 msgid "Journal"
-msgstr "分类帐"
+msgstr "账簿"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -619,8 +619,8 @@ msgid "User's Product"
 msgstr "用户的产品"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -732,7 +732,7 @@ msgid "Total :"
 msgstr "合计:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr "明细创建失败！"
@@ -857,7 +857,6 @@ 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 "未知"
@@ -1065,7 +1064,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
 #: report:pos.invoice:0
@@ -1091,8 +1090,8 @@ msgid "All Closed CashBox"
 msgstr "所有关闭的钱箱"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr "没有价格表！"
@@ -1169,7 +1168,7 @@ msgstr "销售的支付报表"
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
 msgid "Special Journal"
-msgstr "专用日记账"
+msgstr "专用账簿"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
@@ -1258,15 +1257,15 @@ msgid "Sale by User"
 msgstr "用户的销售订单"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -1293,7 +1292,7 @@ msgid "July"
 msgstr "7月"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "请为产品%s提供一个科目"
@@ -1394,7 +1393,7 @@ msgid "Customer Note"
 msgstr "客户备注"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "订单没有订单明细"
@@ -1440,7 +1439,7 @@ msgstr "按利润率查看销售"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr "日记账配置"
+msgstr "账簿设置"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1603,7 +1602,7 @@ msgid "Yes"
 msgstr "是"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "没有为此产品定义收入类科目： \\\"%s\\\" (id:%d)"
@@ -1704,8 +1703,8 @@ msgid "Invoice Date"
 msgstr "发票日期"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1725,9 +1724,9 @@ msgid "Reprint"
 msgstr "重新打印"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr "你必须开启至少一个钱箱"
@@ -1871,7 +1870,7 @@ msgid "Supplier Invoice"
 msgstr "供应商发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr "明细修改失败！"
@@ -1884,7 +1883,7 @@ msgstr "付款名称"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
-msgstr "报表"
+msgstr "报告"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
@@ -1904,7 +1903,7 @@ msgstr "pos上缴"
 #. 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
@@ -1923,8 +1922,8 @@ msgid "Validation Date"
 msgstr "审核日期"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "你没有权限审核此销售订单！"
@@ -2043,17 +2042,17 @@ msgid "PRO-FORMA"
 msgstr "形式发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "请提供业务伙伴。"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
-msgstr "没有为此日记账：\"%s\" (id:%d)定义应收账款科目"
+msgstr "没有为：\"%s\" (id:%d)定义应收账款科目"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
@@ -2107,13 +2106,13 @@ msgid "POS Orders lines"
 msgstr "POS订单明细"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr "错误"
@@ -2121,7 +2120,7 @@ msgstr "错误"
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr "销售日记账"
+msgstr "销售账簿"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2209,7 +2208,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr "请填充这些钱箱的字段"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr "请检查科目是否设置为%s"
@@ -2413,24 +2412,15 @@ msgstr "年"
 #~ msgid "Orders of the day"
 #~ msgstr "单据日期"
 
-#~ msgid "This is the logged in user (not necessarily the salesman)."
-#~ msgstr "这是登录用户不一定是销售员"
-
 #~ msgid "Partner Ref."
 #~ msgstr "业务伙伴参考"
 
-#~ msgid "Tel : + 32 (0) 2 231 04 35"
-#~ msgstr "电话:"
-
 #~ msgid "Refund Orders"
 #~ msgstr "退货单"
 
 #~ msgid "Select default journals"
 #~ msgstr "默认分类帐"
 
-#~ msgid "Logged in User"
-#~ msgstr "登录用户"
-
 #~ msgid "VAT(%)"
 #~ msgstr "增值税(%)"
 
@@ -2546,17 +2536,11 @@ msgstr "年"
 #~ msgid "Actions"
 #~ msgstr "生效"
 
-#~ msgid "This is the salesman actually making the order."
-#~ msgstr "这是销售员实际产生的订单"
-
 #~ msgid "Print Date:"
 #~ msgstr "打印日期:"
 
 #~ msgid "Company:"
 #~ msgstr "公司:"
 
-#~ msgid "OPERATION N° :"
-#~ msgstr "操作员:"
-
 #~ msgid "Product for expenses"
 #~ msgstr "产品费用"
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index df15241ca9f..b08c42d0c1b 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -618,8 +618,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -729,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -854,7 +854,6 @@ 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 ""
@@ -1088,8 +1087,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1245,15 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1280,7 +1279,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1381,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1590,7 +1589,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1691,8 +1690,8 @@ msgid "Invoice Date"
 msgstr "發票日期"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1710,9 +1709,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1908,8 +1907,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2028,13 +2027,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2092,13 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2194,7 +2193,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index 32e4bb10289..ca7437e1145 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: 2011-07-23 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:01+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -617,8 +617,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1043
+#: code:addons/point_of_sale/point_of_sale.py:1068
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -728,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1202
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -853,7 +853,6 @@ 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 ""
@@ -1087,8 +1086,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1244,15 +1243,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:852
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:97
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1279,7 +1278,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:547
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1380,7 +1379,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:340
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1589,7 +1588,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:744
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1690,8 +1689,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1058
+#: code:addons/point_of_sale/point_of_sale.py:1077
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1709,9 +1708,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:558
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/wizard/pos_box_out.py:103
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1855,7 +1854,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1907,8 +1906,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2027,13 +2026,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:638
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:853
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2091,13 +2090,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:507
+#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1210
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2193,7 +2192,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 31c580ba506..b19405bd43f 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -42,117 +42,23 @@ class pos_config_journal(osv.osv):
 
 pos_config_journal()
 
-
-class pos_company_discount(osv.osv):
-    """ Company Discount and Cashboxes """
-    _inherit = 'res.company'
-
-    _columns = {
-        'company_discount': fields.float('Max Discount(%)', digits_compute=dp.get_precision('Point Of Sale')),
-        'max_diff': fields.float('Max Difference for Cashboxes', digits_compute=dp.get_precision('Point Of Sale Discount')),
-    }
-
-pos_company_discount()
-
 class pos_order(osv.osv):
-    """ Point of sale gives business owners a convenient way of checking out customers
-        and of recording sales """
-
     _name = "pos.order"
     _description = "Point of Sale"
-    _order = "date_order, create_date desc"
+    _order = "id desc"
 
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
-            for rec_statement in rec.statement_ids:
-                if (rec_statement.statement_id and rec_statement.statement_id.state == 'confirm') or rec.state == 'done':
-                    raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is closed or contains confirmed cashboxes!'))
+            if rec.state not in ('draft','cancel'):
+                raise osv.except_osv(_('Unable to Delete !'), _('In order to delete a sale, it must be new or cancelled.'))
         return super(pos_order, self).unlink(cr, uid, ids, context=context)
 
-    def onchange_partner_pricelist(self, cr, uid, ids, part=False, context=None):
-
-        """ Changed price list on_change of partner_id"""
+    def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         if not part:
             return {'value': {}}
         pricelist = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_product_pricelist.id
         return {'value': {'pricelist_id': pricelist}}
 
-    def _amount_total(self, cr, uid, ids, field_name, arg, context=None):
-        """ Calculates amount_tax of order line
-        @param field_names: Names of fields.
-        @return: Dictionary of values """
-        cr.execute("""
-            SELECT
-                p.id,
-                COALESCE(SUM(
-                    l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0
-                    ) AS amount
-            FROM pos_order p
-            LEFT OUTER JOIN pos_order_line l ON (p.id = l.order_id)
-            WHERE p.id IN %s GROUP BY p.id """,(tuple(ids),))
-        res = dict(cr.fetchall())
-        for rec in self.browse(cr, uid, ids, context=context):
-            if rec.partner_id \
-               and rec.partner_id.property_account_position \
-               and rec.partner_id.property_account_position.tax_ids:
-                res[rec.id] = res[rec.id] - rec.amount_tax
-            else :
-                res[rec.id] = res[rec.id] + rec.amount_tax
-        return res
-
-    def _get_date_payment2(self, cr, uid, ids, context=None, *a):
-        # Todo need to check this function
-        """ Find payment Date
-        @param field_names: Names of fields.
-        @return: Dictionary of values """
-        res = {}
-        val = None
-        for order in self.browse(cr, uid, ids, context=context):
-            cr.execute("SELECT date_payment FROM pos_order WHERE id = %s", (order.id,))
-            date_p = cr.fetchone()
-            date_p = date_p and date_p[0] or None
-            if date_p:
-                res[order.id] = date_p
-                return res
-            cr.execute(" SELECT MAX(l.date) "
-                        " FROM account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o "
-                        " WHERE i.move_id = m.id AND l.move_id = m.id AND l.reconcile_id = r.id AND o.id = %s AND o.invoice_id = i.id",
-                        (order.id,))
-            val = cr.fetchone()
-            val = val and val[0] or None
-            if val:
-                res[order.id] = val
-        return res
-
-    def _get_date_payment(self, cr, uid, ids, context, *a):
-        """ Find  Validation Date
-        @return: Dictionary of values """
-        res = {}
-        val = None
-        for order in self.browse(cr, uid, ids):
-            cr.execute("SELECT date_validation FROM pos_order WHERE id = %s", (order.id,))
-            date_p = cr.fetchone()
-            date_p = date_p and date_p[0] or None
-            if date_p:
-                res[order.id] = date_p
-                return res
-            discount_allowed = order.company_id.company_discount
-            for line in order.lines:
-                if line.discount > discount_allowed:
-                    return {order.id: None }
-            if order.amount_paid == order.amount_total and not date_p:
-                cr.execute("SELECT MAX(date) FROM account_bank_statement_line WHERE pos_statement_id = %s", (order.id,))
-                val = cr.fetchone()
-                val = val and val[0] or None
-            if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
-                for o in order.invoice_id.move_id.line_id:
-                    if o.balance == 0:
-                        if val < o.date_created:
-                            val = o.date_created
-            if val:
-                res[order.id] = val
-        return res
-
     def _amount_all(self, cr, uid, ids, name, args, context=None):
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
@@ -163,324 +69,147 @@ class pos_order(osv.osv):
                 'amount_return':0.0,
                 'amount_tax':0.0,
             }
-            val = val1 = 0.0
+            val1 = val2 = 0.0
             cur = order.pricelist_id.currency_id
             for payment in order.statement_ids:
                 res[order.id]['amount_paid'] +=  payment.amount
                 res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
             for line in order.lines:
                 val1 += line.price_subtotal_incl
-                if order.price_type != 'tax_excluded':
-                    res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
-                        tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
-                            line.price_unit * \
-                            (1-(line.discount or 0.0)/100.0), line.qty),
-                            res[order.id]['amount_tax'])
-                elif line.qty != 0.0:
-                    for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, \
-                                                 line.price_unit * (1-(line.discount or 0.0)/100.0), \
-                                                 line.qty,  line.product_id, line.order_id.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_total'] = res[order.id]['amount_tax'] + cur_obj.round(cr, uid, cur, val1)
+                val2 += line.price_subtotal
+            res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val1-val2)
+            res[order.id]['amount_total'] = cur_obj.round(cr, uid, cur, val1)
         return res
 
-    def _sale_journal_get(self, cr, uid, context=None):
-        """ To get  sale journal for this order
-        @return: journal  """
-        journal_obj = self.pool.get('account.journal')
-        res = journal_obj.search(cr, uid, [('type', '=', 'sale')], limit=1)
+    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
 
-    def _shop_get(self, cr, uid, context=None):
-        """ To get  Shop  for this order
-        @return: Shop id  """
+    def _default_shop(self, cr, uid, context=None):
         res = self.pool.get('sale.shop').search(cr, uid, [])
         return res and res[0] or False
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        default.update({
+        d = {
             'state': 'draft',
-            'partner_id': False,
             'invoice_id': False,
             'account_move': False,
             'picking_id': False,
             'statement_ids': [],
             'nb_print': 0,
-            'pickings': []
-        })
-        return super(pos_order, self).copy(cr, uid, id, default, context=context)
-
-    def _get_v( self, cr, uid, ids, *args):
-        """ Changed the Validation state of order
-        @return: State  """
-        res_obj = self.pool.get('res.users')
-        company_disc = self.browse(cr, uid, ids)
-        list_jrnl = []
-        r = {}
-        if not company_disc:
-            comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0
-        else:
-            comp = company_disc[0] and company_disc[0].company_id and company_disc[0].company_id.company_discount or 0.0
-        cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount <= %s", (ids[0], comp))
-        res = cr.fetchone()
-        cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount > %s", (ids[0], comp))
-        res2 = cr.fetchone()
-        cr.execute("SELECT journal_id FROM account_bank_statement_line WHERE pos_statement_id = %s ", (ids[0], ))
-        res3 = cr.fetchall()
-        for r in res3:
-            cr.execute("SELECT id FROM account_journal WHERE name = '%s' AND special_journal = 't'", (r[0], ))
-            res3 = cr.fetchone()
-            is_special = res3 and res3[0] or None
-            if is_special:
-                list_jrnl.append(is_special)
-        for order in self.browse(cr, uid, ids):
-            if order.state in ('paid', 'done', 'invoiced') and res and not res2 and not len(list_jrnl):
-                r[order.id] = 'accepted'
-        return r
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
+        }
+        d.update(default)
+        return super(pos_order, self).copy(cr, uid, id, d, context=context)
 
     _columns = {
-        'name': fields.char('Order Description', size=64, required=True,
+        'name': fields.char('Order Ref', size=64, required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True),
-        'num_sale': fields.char('Internal Note', size=64),
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True, select=True),
-        'date_validation': fields.function(_get_date_payment,
-                                           string='Validation Date',
-                                           type='date', select=True, store=True),
-        'date_payment': fields.function(_get_date_payment2,
-                                        string='Payment Date',
-                                        type='date', select=True, store=True),
-        'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
-        'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
-        'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_all, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_total': fields.function(_amount_all, string='Total', multi='all'),
         'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_return': fields.function(_amount_all, 'Returned', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
-        'price_type': fields.selection([
-                                ('tax_excluded','Tax excluded')],
-                                 'Price Method', required=True),
         'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
-        'state': fields.selection([('draft', 'Quotation'),
-                                   ('payment', 'Payment'),
-                                   ('advance','Advance'),
-                                   ('paid', 'Paid'),
-                                   ('done', 'Done'),
+
+        'state': fields.selection([('draft', 'New'),
+                                   ('paid', 'Done'),
+                                   ('done', 'Posted'),
                                    ('invoiced', 'Invoiced'),
-                                   ('cancel', 'Cancel')],
+                                   ('cancel', 'Cancelled')],
                                   'State', readonly=True),
+
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
-        'account_move': fields.many2one('account.move', 'Account Entry', readonly=True),
-        'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
-        'picking_id': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
-        'first_name': fields.char('First Name', size=64),
+        'account_move': fields.many2one('account.move', 'Journal Entry', readonly=True),
+        'picking_id': fields.many2one('stock.picking', 'Picking', readonly=True),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
         'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True),
-        'invoice_wanted': fields.boolean('Create Invoice'),
-        'note_2': fields.char('Customer Note', size=64),
-        'type_rec': fields.char('Type of Receipt', size=64),
-        'remboursed': fields.boolean('Remboursed'),
-        'contract_number': fields.char('Contract Number', size=512, select=1),
-        'journal_entry': fields.boolean('Journal Entry'),
     }
 
-    def _select_pricelist(self, cr, uid, context=None):
-        """ To get default pricelist for the order
-        @param name: Names of fields.
-        @return: pricelist ID
-        """
+    def _default_pricelist(self, cr, uid, context=None):
         res = self.pool.get('sale.shop').search(cr, uid, [], context=context)
         if res:
             shop = self.pool.get('sale.shop').browse(cr, uid, res[0], context=context)
             return shop.pricelist_id and shop.pricelist_id.id or False
         return False
 
-    def _journal_default(self, cr, uid, context=None):
-        """ To get default pricelist for the order
-        @param name: Names of fields.
-        @return: journal ID
-        """
-        journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
-        return journal_list and journal_list[0] or False
-
     _defaults = {
-        'user_salesman_id':lambda self, cr, uid, context: uid,
         'user_id': lambda self, cr, uid, context: uid,
-        'sale_manager': lambda self, cr, uid, context: uid,
         'state': 'draft',
-        'price_type': 'tax_excluded',
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
         'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'date_validity': lambda *a: (datetime.today() + relativedelta(months=+6)).strftime('%Y-%m-%d'),
         'nb_print': 0,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-        'sale_journal': _sale_journal_get,
-        'invoice_wanted': False,
-        'shop_id': _shop_get,
-        'pricelist_id': _select_pricelist,
+        'sale_journal': _default_sale_journal,
+        'shop_id': _default_shop,
+        'pricelist_id': _default_pricelist,
     }
 
-
-    def test_order_lines(self, cr, uid, order, context=None):
-        """ Test order line is created or not for the order
-        @param name: Names of fields.
-        @return: True
-        """
-        if not order.lines:
-            raise osv.except_osv(_('Error'), _('No order lines defined for this sale.'))
-
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'pos.order', order.id, 'paid', cr)
-        return True
-
-    def dummy_button(self, cr, uid, order, context=None):
-        return True
-
     def test_paid(self, cr, uid, ids, context=None):
-        """ Test all amount is paid for this order
+        """A Point of Sale is paid when the sum
         @return: True
         """
         for order in self.browse(cr, uid, ids, context=context):
             if order.lines and not order.amount_total:
                 return True
             if (not order.lines) or (not order.statement_ids) or \
-                Decimal(str(order.amount_total)) != Decimal(str(order.amount_paid)):
+                (abs(order.amount_total-order.amount_paid) > 0.00001):
                 return False
         return True
 
-    def _get_qty_differences(self, orders, old_picking):
-        """check if the customer changed the product quantity """
-        order_dict = {}
-        for order in orders:
-            for line in order.lines:
-                order_dict[line.product_id.id] = line
-
-        # check the quantity differences:
-        diff_dict = {}
-        for line in old_picking.move_lines:
-            order_line = order_dict.get(line.product_id.id)
-            if not order_line:
-                deleted = True
-                qty_to_delete_from_original_picking = line.product_qty
-                diff_dict[line.product_id.id] = (deleted, qty_to_delete_from_original_picking)
-            elif line.product_qty != order_line.qty:
-                deleted = False
-                qty_to_delete_from_original_picking = line.product_qty - order_line.qty
-                diff_dict[line.product_id.id] = (deleted, qty_to_delete_from_original_picking)
-
-        return diff_dict
-
-    def _split_picking(self, cr, uid, ids, context, old_picking, diff_dict):
-        """if the customer changes the product quantity, split the picking in two"""
-        # create a copy of the original picking and adjust the product qty:
-        picking_model = self.pool.get('stock.picking')
-        defaults = {
-            'note': "Partial picking from customer", # add a note to tell why we create a new picking
-            'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out'), # increment the sequence
-        }
-
-        new_picking_id = picking_model.copy(cr, uid, old_picking.id, defaults) # state = 'draft'
-        new_picking = picking_model.browse(cr, uid, new_picking_id, context=context)
-
-        for line in new_picking.move_lines:
-            p_id = line.product_id.id
-            if p_id in diff_dict:
-                diff = diff_dict[p_id]
-                deleted = diff[0]
-                qty_to_del = diff[1]
-                if deleted: # product has been deleted (customer didn't took it):
-                    # delete this product from old picking:
-                    for old_line in old_picking.move_lines:
-                        if old_line.product_id.id == p_id:
-                            old_line.write({'state': 'draft'}, context=context) # cannot delete if not draft
-                            old_line.unlink(context=context)
-                elif qty_to_del > 0: # product qty has been modified (customer took less than the ordered quantity):
-                    # subtract qty from old picking:
-                    for old_line in old_picking.move_lines:
-                        if old_line.product_id.id == p_id:
-                            old_line.write({'product_qty': old_line.product_qty - qty_to_del}, context=context)
-                    # add qty to new picking:
-                    line.write({'product_qty': qty_to_del}, context=context)
-                else: # product hasn't changed (customer took it without any change):
-                    # delete this product from new picking:
-                    line.unlink(context=context)
-            else:
-                # delete it in the new picking:
-                line.unlink(context=context)
-
     def create_picking(self, cr, uid, ids, context=None):
         """Create a picking for each order and validate it."""
         picking_obj = self.pool.get('stock.picking')
-        property_obj = self.pool.get("ir.property")
-        move_obj = self.pool.get('stock.move')
-        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
-        orders = self.browse(cr, uid, ids, context=context)
         partner_obj = self.pool.get('res.partner')
-        for order in orders:
+        move_obj = self.pool.get('stock.move')
+
+        for order in self.browse(cr, uid, ids, context=context):
             addr = order.partner_id and partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery']) or {}
-            if not order.picking_id:
-                new = True
-                picking_id = picking_obj.create(cr, uid, {
-                    'name': pick_name,
-                    'origin': order.name,
-                    'address_id': addr.get('delivery',False),
-                    'type': 'out',
+            picking_id = picking_obj.create(cr, uid, {
+                'origin': order.name,
+                'address_id': addr.get('delivery',False),
+                'type': 'out',
+                'company_id': order.company_id.id,
+                'move_type': 'direct',
+                'note': order.note or "",
+                'invoice_state': 'none',
+                'auto_picking': True,
+            }, context=context)
+            self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
+            location_id = order.shop_id.warehouse_id.lot_stock_id.id
+            output_id = order.shop_id.warehouse_id.lot_output_id.id
+
+            for line in order.lines:
+                if line.product_id and line.product_id.type == 'service':
+                    continue
+                if line.qty < 0:
+                    location_id, output_id = output_id, location_id
+
+                move_obj.create(cr, uid, {
+                    'name': line.name,
+                    'product_uom': line.product_id.uom_id.id,
+                    'product_uos': line.product_id.uom_id.id,
+                    'picking_id': picking_id,
+                    'product_id': line.product_id.id,
+                    'product_uos_qty': abs(line.qty),
+                    'product_qty': abs(line.qty),
+                    'tracking_id': False,
                     'state': 'draft',
-                    'move_type': 'direct',
-                    'note': 'POS notes ' + (order.note or ""),
-                    'invoice_state': 'none',
-                    'auto_picking': True,
-                    'pos_order': order.id,
+                    'location_id': location_id,
+                    'location_dest_id': output_id,
                 }, context=context)
-                self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
-            else:
-                picking_id = order.picking_id.id
-                picking_obj.write(cr, uid, [picking_id], {'auto_picking': True}, context=context)
-                picking = picking_obj.browse(cr, uid, [picking_id], context=context)[0]
-                new = False
-
-                # split the picking (if product quantity has changed):
-                diff_dict = self._get_qty_differences(orders, picking)
-                if diff_dict:
-                    self._split_picking(cr, uid, ids, context, picking, diff_dict)
-
-            if new:
-                for line in order.lines:
-                    if line.product_id and line.product_id.type == 'service':
-                        continue
-                    prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')], context=context)
-                    val = property_obj.browse(cr, uid, prop_ids[0], context=context).value_reference
-                    cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w WHERE w.lot_stock_id = s.id AND w.id = %s", (order.shop_id.warehouse_id.id, ))
-                    res = cr.fetchone()
-                    location_id = res and res[0] or None
-                    stock_dest_id = val.id
-                    if line.qty < 0:
-                        location_id, stock_dest_id = stock_dest_id, location_id
-                    move_obj.create(cr, uid, {
-                            'name': '(POS %d)' % (order.id, ),
-                            'product_uom': line.product_id.uom_id.id,
-                            'product_uos': line.product_id.uom_id.id,
-                            'picking_id': picking_id,
-                            'product_id': line.product_id.id,
-                            'product_uos_qty': abs(line.qty),
-                            'product_qty': abs(line.qty),
-                            'tracking_id': False,
-                            'pos_line_id': line.id,
-                            'state': 'waiting',
-                            'location_id': location_id,
-                            'location_dest_id': stock_dest_id,
-                            'prodlot_id': line.prodlot_id and line.prodlot_id.id or False
-                        }, context=context)
+                if line.qty < 0:
+                    location_id, output_id = output_id, location_id
 
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
@@ -488,36 +217,27 @@ class pos_order(osv.osv):
         return True
 
     def set_to_draft(self, cr, uid, ids, *args):
-        """ Changes order state to draft
-        @return: True
-        """
         if not len(ids):
             return False
+        for order in self.browse(cr, uid, ids, context=context):
+            if order.state<>'cancel':
+                raise osv.except_osv(_('Error!'), _('In order to set to draft a sale, it must be cancelled.'))
         self.write(cr, uid, ids, {'state': 'draft'})
         wf_service = netsvc.LocalService("workflow")
         for i in ids:
             wf_service.trg_create(uid, 'pos.order', i, cr)
         return True
 
-    def button_invalidate(self, cr, uid, ids, *args):
-        """ Check the access for the sale order
-        @return: True
-        """
-        res_obj = self.pool.get('res.company')
-        try:
-            part_company = res_obj.browse(cr, uid, uid) and res_obj.browse(cr, uid, uid).parent_id and res_obj.browse(cr, uid, uid).parent_id.id or None
-        except Exception:
-            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
-        if part_company:
-            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
-        return True
-
     def cancel_order(self, cr, uid, ids, context=None):
         """ Changes order state to cancel
         @return: True
         """
+        stock_picking_obj = self.pool.get('stock.picking')
+        for order in self.browse(cr, uid, ids, context=context):
+            wf_service.trg_validate(uid, 'stock.picking', order.picking_id.id, 'button_cancel', cr)
+            if stock_picking_obj.browse(cr, uid, order.picking_id.id, context=context).state <> 'cancel':
+                raise osv.except_osv(_('Error!'), _('Unable to cancel the picking.'))
         self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
-        self.cancel_picking(cr, uid, ids, context=context)
         return True
 
     def add_payment(self, cr, uid, order_id, data, context=None):
@@ -529,31 +249,29 @@ class pos_order(osv.osv):
         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)
-        if not order.num_sale and data['num_sale']:
-            self.write(cr, uid, order_id, {'num_sale': data['num_sale']}, context=context)
         ids_new = []
         args = {
             'amount': data['amount'],
         }
         if 'payment_date' in data.keys():
             args['date'] = data['payment_date']
-        if 'payment_name' in data.keys():
-            args['name'] = data['payment_name'] + ' ' + order.name
+        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.id or curr_c.account_receivable.id
-        if data.get('is_acc', False):
-            args['is_acc'] = data['is_acc']
-            args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income \
-                                 and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id
-            if not args['account_id']:
-                raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')% \
-                                     (prod_obj.browse(cr, uid, data['product_id'], context=context).name))
+        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
         args['partner_id'] = order.partner_id and order.partner_id.id or None
-        args['ref'] = order.contract_number or None
+
+        if not args['account_id']:
+            if not args['partner_id']:
+                msg = _('There is no receivable account defined to make payment')
+            else:
+                msg = _('There is no receivable account defined to make payment for the partner: "%s" (id:%d)') % (order.partner_id.name, order.partner_id.id,)
+            raise osv.except_osv(_('Configuration Error !'), msg)
 
         statement_id = statement_obj.search(cr,uid, [
-                                                     ('journal_id', '=', data['journal']),
+                                                     ('journal_id', '=', int(data['journal'])),
                                                      ('company_id', '=', curr_company),
                                                      ('user_id', '=', uid),
                                                      ('state', '=', 'open')], context=context)
@@ -563,7 +281,7 @@ class pos_order(osv.osv):
             statement_id = statement_id[0]
         args['statement_id'] = statement_id
         args['pos_statement_id'] = order_id
-        args['journal_id'] = data['journal']
+        args['journal_id'] = int(data['journal'])
         args['type'] = 'customer'
         args['ref'] = order.name
         statement_line_obj.create(cr, uid, args, context=context)
@@ -575,58 +293,39 @@ class pos_order(osv.osv):
 
         return statement_id
 
-    def add_product(self, cr, uid, order_id, product_id, qty, context=None):
-
-        """Create a new order line the order"""
-
-        line_obj = self.pool.get('pos.order.line')
-        values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id'])
-
-        pricelist = values['pricelist_id'] and values['pricelist_id'][0]
-        product = values['partner_id'] and values['partner_id'][0]
-
-        price = line_obj.price_by_product(cr, uid, [],
-                pricelist, product_id, qty, product)
-
-        order_line_id = line_obj.create(cr, uid, {
-            'order_id': order_id,
-            'product_id': product_id,
-            'qty': qty,
-            'price_unit': price,
-        }, context=context)
-        return order_line_id, price
-
     def refund(self, cr, uid, ids, context=None):
-
         """Create a copy of order  for refund order"""
-
         clone_list = []
         line_obj = self.pool.get('pos.order.line')
-
         for order in self.browse(cr, uid, ids, context=context):
             clone_id = self.copy(cr, uid, order.id, {
                 'name': order.name + ' REFUND',
-                'date_order': time.strftime('%Y-%m-%d'),
-                'state': 'draft',
-                'note': 'REFUND\n'+ (order.note or ''),
-                'invoice_id': False,
-                'nb_print': 0,
-                'statement_ids': False,
-                }, context=context)
+            }, context=context)
             clone_list.append(clone_id)
 
-
         for clone in self.browse(cr, uid, clone_list, context=context):
             for order_line in clone.lines:
                 line_obj.write(cr, uid, [order_line.id], {
                     'qty': -order_line.qty
-                    }, context=context)
-        return clone_list
+                }, context=context)
+
+        new_order = ','.join(map(str,clone_list))
+        abs = {
+            #'domain': "[('id', 'in', ["+new_order+"])]",
+            'name': _('Return Products'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.order',
+            'res_id':clone_list[0],
+            'view_id': False,
+            'context':context,
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+        }
+        return abs
 
     def action_invoice(self, cr, uid, ids, context=None):
-
-        """Create a invoice of order  """
-
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
         product_obj = self.pool.get('product.product')
@@ -666,35 +365,51 @@ class pos_order(osv.osv):
                     'quantity': line.qty,
                 }
                 inv_name = product_obj.name_get(cr, uid, [line.product_id.id], context=context)[0][1]
-
                 inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
                                                                line.product_id.id,
                                                                line.product_id.uom_id.id,
                                                                line.qty, partner_id = order.partner_id.id,
                                                                fposition_id=order.partner_id.property_account_position.id)['value'])
+                if line.product_id.description_sale:
+                    inv_line['note'] = line.product_id.description_sale
                 inv_line['price_unit'] = line.price_unit
                 inv_line['discount'] = line.discount
                 inv_line['name'] = inv_name
                 inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
                     and [(6, 0, inv_line['invoice_line_tax_id'])] or []
                 inv_line_ref.create(cr, uid, inv_line, context=context)
+            inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
 
-        for i in inv_ids:
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'account.invoice', i, 'invoice_open', cr)
-        return inv_ids
+        if not inv_ids: return {}
+        mod_obj = self.pool.get('ir.model.data')
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        res_id = res and res[1] or False
+        return {
+            'name': _('PoS Invoices'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': res_id,
+            'res_model': 'account.invoice',
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': inv_ids and inv_ids[0] or False,
+        }
 
     def create_account_move(self, cr, uid, ids, context=None):
-        """Create a account move line of order  """
+        """Create a account move line of order grouped by products or not."""
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
+        period = account_period_obj.find(cr, uid, context=context)[0]
         account_tax_obj = self.pool.get('account.tax')
         res_obj=self.pool.get('res.users')
         property_obj=self.pool.get('ir.property')
-        period = account_period_obj.find(cr, uid, context=context)[0]
 
         for order in self.browse(cr, uid, ids, context=context):
+            if order.state<>'paid': continue
+
             curr_c = res_obj.browse(cr, uid, uid).company_id
             comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id
             comp_id = comp_id and comp_id.id or False
@@ -707,19 +422,14 @@ class pos_order(osv.osv):
             # Create an entry for the sale
             move_id = account_move_obj.create(cr, uid, {
                 'journal_id': order.sale_journal.id,
-                'period_id': period,
-                }, context=context)
+            }, context=context)
 
             # Create an move for each order line
             for line in order.lines:
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
-                if order.price_type == 'tax_excluded':
-                    computed_taxes = account_tax_obj.compute_all(
-                        cr, uid, taxes, line.price_unit, line.qty)['taxes']
-                else:
-                    computed_taxes = account_tax_obj.compute_inv(
-                        cr, uid, taxes, line.price_unit, line.qty)
+                computed = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)
+                computed_taxes = computed['taxes']
 
                 for tax in computed_taxes:
                     tax_amount += round(tax['amount'], 2)
@@ -731,10 +441,7 @@ class pos_order(osv.osv):
                         group_tax[group_key] += round(tax['amount'], 2)
                     else:
                         group_tax[group_key] = round(tax['amount'], 2)
-                if order.price_type != 'tax_excluded':
-                    amount = line.price_subtotal - tax_amount
-                else:
-                    amount = line.price_subtotal
+                amount = line.price_subtotal
 
                 # Search for the income account
                 if  line.product_id.property_account_income.id:
@@ -764,11 +471,12 @@ class pos_order(osv.osv):
                     if tax_code_id:
                         break
 
+
                 # Create a move for the line
                 account_move_line_obj.create(cr, uid, {
-                    'name': "aa"+order.name,
+                    'name': line.name,
                     'date': order.date_order[:10],
-                    'ref': order.contract_number or order.name,
+                    'ref': order.name,
                     'quantity': line.qty,
                     'product_id': line.product_id.id,
                     'move_id': move_id,
@@ -795,9 +503,9 @@ class pos_order(osv.osv):
                         continue
 
                     account_move_line_obj.create(cr, uid, {
-                        'name': "bb" + order.name,
+                        'name': "Tax" + line.name,
                         'date': order.date_order[:10],
-                        'ref': order.contract_number or order.name,
+                        'ref': order.name,
                         'product_id':line.product_id.id,
                         'quantity': line.qty,
                         'move_id': move_id,
@@ -816,9 +524,9 @@ class pos_order(osv.osv):
             (tax_code_pos, base_code_pos, account_pos)= (0, 1, 2)
             for key, amount in group_tax.items():
                 account_move_line_obj.create(cr, uid, {
-                    'name': "cc" + order.name,
+                    'name': 'Tax',
                     'date': order.date_order[:10],
-                    'ref': order.contract_number or order.name,
+                    'ref': order.name,
                     'move_id': move_id,
                     'company_id': comp_id,
                     'quantity': line.qty,
@@ -834,9 +542,9 @@ class pos_order(osv.osv):
 
             # counterpart
             to_reconcile.append(account_move_line_obj.create(cr, uid, {
-                'name': "dd" + order.name,
+                'name': order.name,
                 'date': order.date_order[:10],
-                'ref': order.contract_number or order.name,
+                'ref': order.name,
                 'move_id': move_id,
                 'company_id': comp_id,
                 'account_id': order_account,
@@ -848,71 +556,16 @@ class pos_order(osv.osv):
                 'period_id': period,
                 'partner_id': order.partner_id and order.partner_id.id or False
             }, context=context))
-
-
-            # search the account receivable for the payments:
-            account_receivable = order.sale_journal.default_credit_account_id.id
-            if not account_receivable:
-                raise  osv.except_osv(_('Error !'),
-                    _('There is no receivable account defined for this journal:'\
-                    ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
-            for payment in order.statement_ids:
-                # Create one entry for the payment
-                if payment.is_acc:
-                    continue
-                account_move_obj.create(cr, uid, {
-                    'journal_id': payment.statement_id.journal_id.id,
-                    'period_id': period,
-                }, context=context)
-
-            for stat_l in order.statement_ids:
-                if stat_l.is_acc and len(stat_l.move_ids):
-                    for st in stat_l.move_ids:
-                        for s in st.line_id:
-                            if s.credit:
-                                account_move_line_obj.copy(cr, uid, s.id, {
-                                                        'debit': s.credit,
-                                                        'statement_id': False,
-                                                        'credit': s.debit
-                                                    })
-                                account_move_line_obj.copy(cr, uid, s.id, {
-                                                        'statement_id': False,
-                                                        'account_id': order_account
-                                                     })
-
-            self.write(cr, uid, order.id, {'state':'done'}, context=context)
+            self.write(cr, uid, order.id, {'state':'done', 'account_move': move_id}, context=context)
         return True
 
-    def cancel_picking(self, cr, uid, ids, context=None):
-        stock_picking_obj = self.pool.get('stock.picking')
-        for order in self.browse(cr, uid, ids, context=context):
-            for picking in order.pickings:
-                stock_picking_obj.unlink(cr, uid, [picking.id], context=context)
-        return True
-
-
     def action_payment(self, cr, uid, ids, context=None):
-        vals = {'state': 'payment'}
-        sequence_obj = self.pool.get('ir.sequence')
-        for pos in self.browse(cr, uid, ids, context=context):
-            create_contract_nb = False
-            for line in pos.lines:
-                if line.product_id.product_type == 'MD':
-                    create_contract_nb = True
-                    break
-            if create_contract_nb:
-                seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
-                vals['contract_number'] = '%s-%s' % (pos.user_salesman_id.login, seq)
-        self.write(cr, uid, ids, vals, context=context)
+        return self.write(cr, uid, ids, {'state': 'payment'}, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        if context.get('flag', False):
-            self.create_picking(cr, uid, ids, context=None)
-            self.write(cr, uid, ids, {'state': 'paid'}, context=context)
-        else:
-            context['flag'] = True
+        context = context or {}
+        self.create_picking(cr, uid, ids, context=None)
+        self.write(cr, uid, ids, {'state': 'paid'}, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -920,43 +573,25 @@ class pos_order(osv.osv):
         return True
 
     def action_done(self, cr, uid, ids, context=None):
-        for order in self.browse(cr, uid, ids, context=context):
-            if not order.journal_entry:
-                self.create_account_move(cr, uid, ids, context=None)
+        self.create_account_move(cr, uid, ids, context=context)
         return True
 
-    def compute_state(self, cr, uid, id):
-        cr.execute("SELECT act.id, act.name FROM wkf_activity act "
-                   "INNER JOIN wkf_workitem item ON act.id = item.act_id "
-                   "INNER JOIN wkf_instance inst ON item.inst_id = inst.id "
-                   "INNER JOIN wkf ON inst.wkf_id = wkf.id "
-                   "WHERE wkf.osv = 'pos.order' AND inst.res_id = %s "
-                   "ORDER BY act.name", (id, ))
-        return [name for id, name in cr.fetchall()]
-
 pos_order()
 
 class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
     _columns= {
-        'user_id': fields.many2one('res.users', ondelete='cascade', string='User', readonly=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True),
     }
     _defaults = {
-        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
+        'user_id': lambda self,cr,uid,c={}: uid
     }
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
-    def _get_statement_journal(self, cr, uid, ids, context, *a):
-        res = {}
-        for line in self.browse(cr, uid, ids):
-            res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
-        return res
     _columns= {
-        'journal_id': fields.function(_get_statement_journal,store=True, string='Journal', type='char', size=64),
-        'am_out': fields.boolean("To count"),
-        'is_acc': fields.boolean("Is accompte"),
+        'journal_id': fields.related('statement_id','journal_id','name', store=True, string='Journal', type='char', size=64),
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
 account_bank_statement_line()
@@ -964,287 +599,104 @@ account_bank_statement_line()
 class pos_order_line(osv.osv):
     _name = "pos.order.line"
     _description = "Lines of Point of Sale"
-
-    def _get_amount(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
-            res[line.id] = price
-        return res
-
-    def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict.fromkeys(ids, 0.0)
-        account_tax_obj = self.pool.get('account.tax')
-        self.price_by_product_multi(cr, uid, ids)
-        for line in self.browse(cr, uid, ids, context=context):
-            tax_amount = 0.0
-            taxes = [t for t in line.product_id.taxes_id]
-            if line.qty == 0.0:
-                continue
-            computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
-            for tax in computed_taxes:
-                tax_amount += tax['amount']
-            if line.discount != 0.0:
-                res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-            else:
-                res[line.id] = line.price_unit*line.qty
-            res[line.id] = res[line.id] + tax_amount
-        return res
-
-    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        self.price_by_product_multi(cr, uid, ids)
-        for line in self.browse(cr, uid, ids, context=context):
-            if line.discount!=0.0:
-                res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-            else:
-                res[line.id] = line.price_unit * line.qty
-        return res
+    _rec_name = "product_id"
 
     def _amount_line_all(self, cr, uid, ids, field_names, arg, context=None):
         res = dict([(i, {}) for i in ids])
         account_tax_obj = self.pool.get('account.tax')
-
-        self.price_by_product_multi(cr, uid, ids)
+        cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
-            for f in field_names:
-                if f == 'price_subtotal':
-                    if line.discount != 0.0:
-                        res[line.id][f] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-                    else:
-                        res[line.id][f] = line.price_unit * line.qty
-                elif f == 'price_subtotal_incl':
-                    taxes = [t for t in line.product_id.taxes_id]
-                    if line.qty == 0.0:
-                        res[line.id][f] = 0.0
-                        continue
-                    price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
-                    computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, price, line.qty)
-                    cur = line.order_id.pricelist_id.currency_id
-                    res[line.id][f] = self.pool.get('res.currency').round(cr, uid, cur, computed_taxes['total'])
+            taxes = line.product_id.taxes_id
+            price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+            taxes = account_tax_obj.compute_all(cr, uid, line.product_id.taxes_id, price, line.qty, product=line.product_id, partner=line.order_id.partner_id or False)
+
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id]['price_subtotal'] = cur_obj.round(cr, uid, cur, taxes['total'])
+            res[line.id]['price_subtotal_incl'] = cur_obj.round(cr, uid, cur, taxes['total_included'])
         return res
 
-    def price_by_product_multi(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        res = {}.fromkeys(ids, 0.0)
-        lines = self.browse(cr, uid, ids, context=context)
+    def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False, context=None):
+       context = context or {}
+       if not product_id:
+            return {}
+       if not pricelist:
+           raise osv.except_osv(_('No Pricelist !'),
+               _('You have to select a pricelist in the sale form !\n' \
+               'Please set one before choosing a product.'))
 
-        pricelist_ids = [line.order_id.pricelist_id.id for line in lines]
-        products_by_qty_by_partner = [(line.product_id.id, line.qty, line.order_id.partner_id.id) for line in lines]
+       price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
+               product_id, qty or 1.0, partner_id)[pricelist]
 
-        price_get_multi_res = self.pool.get('product.pricelist').price_get_multi(cr, uid, pricelist_ids, products_by_qty_by_partner, context=context)
+       result = self.onchange_qty(cr, uid, ids, product_id, 0.0, qty, price, context=context)
+       result['value']['price_unit'] = price
+       return result
 
-        for line in lines:
-            pricelist = line.order_id.pricelist_id.id
-            product_id = line.product_id
+    def onchange_qty(self, cr, uid, ids, product, discount, qty, price_unit, context=None):
+        result = {}
+        if not product:
+            return result
+        account_tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
 
-            if not product_id:
-                res[line.id] = 0.0
-                continue
-            if not pricelist:
-                raise osv.except_osv(_('No Pricelist !'),
-                    _('You have to select a pricelist in the sale form !\n' \
-                    'Please set one before choosing a product.'))
+        prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
 
-            #old_price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product_id.id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
-            #print "prod_id: %s, pricelist: %s, price: %s" % (product_id.id, pricelist, price)
-            price = price_get_multi_res[line.product_id.id][pricelist]
-            #print "prod_id: %s, pricelist: %s, price2: %s" % (product_id.id, pricelist, price2)
+        taxes = prod.taxes_id
+        price = price_unit * (1 - (discount or 0.0) / 100.0)
+        taxes = account_tax_obj.compute_all(cr, uid, prod.taxes_id, price, qty, product=prod, partner=False)
 
-            #if old_price != price:
-            #    raise Exception('old_price != price')
-
-            unit_price = price or product_id.list_price
-            res[line.id] = unit_price
-            if unit_price is False:
-                raise osv.except_osv(_('No valid pricelist line found !'),
-                    _("Couldn't find a pricelist line matching this product" \
-                    " and quantity.\nYou have to change either the product," \
-                    " the quantity or the pricelist."))
-        return res
-
-    def price_by_product(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
-        if not product_id:
-            return 0.0
-        if not pricelist:
-            raise osv.except_osv(_('No Pricelist !'),
-                _('You have to select a pricelist in the sale form !\n' \
-                'Please set one before choosing a product.'))
-        p_obj = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
-        uom_id = p_obj.uom_po_id.id
-        price = self.pool.get('product.pricelist').price_get(cr, uid,
-            [pricelist], product_id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
-        unit_price=price or p_obj.list_price
-        if unit_price is False:
-            raise osv.except_osv(_('No valid pricelist line found !'),
-                _("Couldn't find a pricelist line matching this product" \
-                " and quantity.\nYou have to change either the product," \
-                " the quantity or the pricelist."))
-        return unit_price
-
-    def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
-        price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
-        self.write(cr, uid, ids, {'price_unit':price})
-        pos_stot = (price * qty)
-        return {'value': {'price_unit': price, 'price_subtotal_incl': pos_stot}}
-
-    def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist, qty,partner_id, product_id, *a):
-        prod_obj = self.pool.get('product.product')
-        price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
-        prod_id = ''
-        if product_id:
-            prod_id = prod_obj.browse(cr, uid, product_id).disc_controle
-        disc = 0.0
-        if (disc != 0.0 or prod_id) and price_f > 0:
-            disc = 100 - (price/price_f*100)
-            return {'value': {'discount': disc, 'price_unit': price_f}}
-        return {}
-
-    def onchange_ded(self, cr, uid, ids, val_ded, price_u, *a):
-        res_obj = self.pool.get('res.users')
-        comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0
-        val = 0.0
-        if val_ded and price_u:
-            val=100.0 * val_ded / price_u
-        if val > comp:
-            return {'value': {'discount': val, 'notice': '' }}
-        return {'value': {'discount': val}}
-
-    def onchange_discount(self, cr, uid, ids, discount, price, *a):
-        pos_order = self.pool.get('pos.order.line')
-        res_obj = self.pool.get('res.users')
-        company_disc = pos_order.browse(cr,uid,ids)
-        if discount:
-            if not company_disc:
-                comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
-            else:
-                comp= company_disc[0] and company_disc[0].order_id.company_id and  company_disc[0].order_id.company_id.company_discount  or 0.0
-
-            if discount > comp :
-                return {'value': {'notice': '', 'price_ded': price * discount * 0.01 or 0.0  }}
-            else:
-                return {'value': {'notice': 'Minimum Discount', 'price_ded': price * discount * 0.01 or 0.0  }}
-        else :
-            return {'value': {'notice': 'No Discount', 'price_ded': price * discount * 0.01 or 0.0}}
-
-    def onchange_qty(self, cr, uid, ids, discount, qty, price, context=None):
-        subtotal = qty * price
-        if discount:
-            subtotal = subtotal - (subtotal * discount / 100)
-        return {'value': {'price_subtotal_incl': subtotal}}
+        result['price_subtotal'] = taxes['total']
+        result['price_subtotal_incl'] = taxes['total_included']
+        return {'value': result}
 
     _columns = {
-        'name': fields.char('Line Description', size=512),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'notice': fields.char('Discount Notice', size=128, required=True),
-        'serial_number': fields.char('Serial Number', size=128),
+        'name': fields.char('Line No', size=32, required=True),
+        'notice': fields.char('Discount Notice', size=128),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-        'price_unit': fields.function(_get_amount, string='Unit Price', store=True),
-        'price_ded': fields.float('Discount(Amount)', digits_compute=dp.get_precision('Point Of Sale')),
-        'qty': fields.float('Quantity'),
-        'qty_rfd': fields.float('Refunded Quantity'),
-        'price_subtotal': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal w/o Tax'),
-        'price_subtotal_incl': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal'),
+        'price_unit': fields.float(string='Unit Price', digits=(16, 2)),
+        'qty': fields.float('Quantity', digits=(16, 2)),
+        'price_subtotal': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal w/o Tax', store=True),
+        'price_subtotal_incl': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal', store=True),
         'discount': fields.float('Discount (%)', digits=(16, 2)),
         'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
-        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="You can specify Production lot for stock move created when you validate the pos order"),
     }
 
     _defaults = {
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order.line'),
         'qty': lambda *a: 1,
         'discount': lambda *a: 0.0,
-        'price_ded': lambda *a: 0.0,
-        'notice': lambda *a: 'No Discount',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-        }
+    }
 
-    def create(self, cr, user, vals, context=None):
-        if vals.get('product_id'):
-            return super(pos_order_line, self).create(cr, user, vals, context=context)
-        return False
-
-    def write(self, cr, user, ids, values, context=None):
-        if 'product_id' in values and not values['product_id']:
-            return False
-        return super(pos_order_line, self).write(cr, user, ids, values, context=context)
-
-    def _scan_product(self, cr, uid, ean, qty, order):
-        # search pricelist_id
-        product_obj = self.pool.get('product.product')
-        pricelist_id = self.pool.get('pos.order').read(cr, uid, [order], ['pricelist_id'] )
-        if not pricelist_id:
-            return False
-
-        new_line = True
-
-        product_id = product_obj.search(cr, uid, [('ean13','=', ean)])
-        if not product_id:
-           return False
-
-        # search price product
-        product = product_obj.read(cr, uid, product_id)
-        product_name = product[0]['name']
-        price = self.price_by_product(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
-
-        order_line_ids = self.search(cr, uid, [('name', '=', product_name), ('order_id', '=' ,order)])
-        if order_line_ids:
-            new_line = False
-            order_line_id = order_line_ids[0]
-            qty += self.read(cr, uid, order_line_ids[0], ['qty'])['qty']
-
-        if new_line:
-            vals = {'product_id': product_id[0],
-                    'price_unit': price,
-                    'qty': qty,
-                    'name': product_name,
-                    'order_id': order,
-            }
-            line_id = self.create(cr, uid, vals)
-            if not line_id:
-                raise osv.except_osv(_('Error'), _('Create line failed !'))
-        else:
-            vals = {
-                'qty': qty,
-                'price_unit': price
-            }
-            line_id = self.write(cr, uid, order_line_id, vals)
-            if not line_id:
-                raise osv.except_osv(_('Error'), _('Modify line failed !'))
-            line_id = order_line_id
-
-        price_line = float(qty) * float(price)
-        return {
-            'name': product_name,
-            'product_id': product_id[0],
-            'price': price,
-            'price_line': price_line ,
-            'qty': qty
-        }
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'pos.order.line')
+        })
+        return super(pos_order_line, self).copy_data(cr, uid, id, default, context=context)
 
 pos_order_line()
 
+class pos_category(osv.osv):
+    _name = 'pos.category'
+    _inherit = 'product.category'
+    _columns = {
+        'parent_id': fields.many2one('pos.category','Parent Category', select=True),
+        'child_id': fields.one2many('pos.category', 'parent_id', string='Child Categories'),
+    }
+pos_category()
+
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
         'income_pdt': fields.boolean('Product for Input'),
         'expense_pdt': fields.boolean('Product for Output'),
-        'am_out': fields.boolean('Control for Output Operations'),
-        'disc_controle': fields.boolean('Discount Control'),
-    }
-    _defaults = {
-        'disc_controle': True,
+        'img': fields.binary('Pos Image, must be 50x50'),
+        'pos_categ_id': fields.many2one('pos.category','POS Category', change_default=True, domain="[('type','=','normal')]" ,help="Select a pos category for the current product")
     }
 product_product()
 
-class stock_picking(osv.osv):
-    _inherit = 'stock.picking'
-    _columns = {
-        'pos_order': fields.many2one('pos.order', 'Pos order'),
-    }
-
-stock_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index e95ce05256f..5e9c00ace54 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -4,185 +4,174 @@
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
         </record>
-    	<record id="account.cash_journal" model="account.journal">
-            <field eval="[(6, 0, [ref('base.user_root')])]" name="journal_users"/>
+        <record id="account.cash_journal" model="account.journal">
+            <field eval="True" name="journal_user"/>
+        </record>
+        <record id="product_product_putmoneyforchange0" model="product.product">
+            <field name="supply_method">buy</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="name_template">Cash In</field>
+            <field name="property_account_income" ref="account.cash"/>
+            <field name="name">Cash In</field>
+            <field eval="1" name="income_pdt"/>
         </record>
         
-        <record id="product_product_putmoneyforchange0" model="product.product">
-			<field name="supply_method">buy</field>
-			<field name="uom_id" ref="product.product_uom_unit"/>
-			<field name="name_template">Cash In</field>
-			<field name="property_account_income" ref="account.cash"/>
-			<field name="name">Cash In</field>
-			<field eval="1" name="income_pdt"/>
-		</record>
-		
-		<record id="product_product_putmoneyforchange1" model="product.product">
-			<field name="supply_method">buy</field>
-			<field name="uom_id" ref="product.product_uom_unit"/>
-			<field name="name_template">Cash Out</field>
-			<field name="property_account_income" ref="account.cash"/>
-			<field name="name">Cash Out</field>
-			<field eval="1" name="expense_pdt"/>
-		</record>
+        <record id="product_product_putmoneyforchange1" model="product.product">
+            <field name="supply_method">buy</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="name_template">Cash Out</field>
+            <field name="property_account_income" ref="account.cash"/>
+            <field name="name">Cash Out</field>
+            <field eval="1" name="expense_pdt"/>
+        </record>
 
-    	 <record id="account_invoice_invoicefrompospos0" model="account.invoice">
-			<field name="origin">POS/019</field>
-			<field name="reference">POS/019</field>
-			<field name="number">SAJ/2010/010</field>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_8invoice"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="address_contact_id" ref="base.res_partner_address_8"/>
-			<field name="reference_type">none</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="state">open</field>
-			<field name="type">out_invoice</field>
-			<field name="internal_number">SAJ/2010/010</field>
-			<field name="account_id" ref="account.a_recv"/>
-			<field eval="0" name="reconciled"/>
-			<field eval="450.0" name="residual"/>
-			<field name="move_name">/</field>
-			<field name="date_invoice" eval="time.strftime('%Y-%m-%d')"/>
-			<field name="period_id" ref="account.period_10"/>
-			<field eval="450.0" name="amount_untaxed"/>
-			<field model="account.move" name="move_id" search="[('name', '=', u'SAJ/2010/010')]"/>
-			<field eval="450.0" name="amount_total"/>
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="name">Invoice from POS: POS/019</field>
-		</record>
-		<record id="account_invoice_line_pcbasicpc0" model="account.invoice.line">
-			<field name="uos_id" ref="product.product_uom_unit"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="name">[PC1] Basic PC</field>
-			<field model="account.invoice" name="invoice_id" search="[('name', '=', 'Invoice from POS: POS/019')]"/>
-			<field eval="450.0" name="price_unit"/>
-			<field eval="450.0" name="price_subtotal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
-			<field eval="1.0" name="quantity"/>
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="product_id" ref="product.product_product_pc1"/>
-		</record>
-    	<record id="pos_order_pos11" model="pos.order">
-			<field name="sale_journal" ref="account.sales_journal"/>
-			<field eval="0" name="journal_entry"/>
-			<field name="date_validity">2011-04-07</field>
-			<field name="shop_id" ref="sale.shop"/>
-			<field name="user_salesman_id" ref="base.user_root"/>
-			<field name="date_order" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field eval="1" name="nb_print"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field eval="1" name="invoice_wanted"/>
-			<field name="state">paid</field>
-			<field name="sale_manager" ref="base.user_root"/>
-			<field name="pricelist_id" ref="product.list0"/>
-			<field name="date_validation" eval="time.strftime('%Y-%m-%d')"/>
-			<field name="name">POS/019</field>
-			<field name="price_type">tax_excluded</field>
-			<field model="account.invoice" name="invoice_id" search="[('name', '=', u'Invoice from POS: POS/019')]"/>
-			<field eval="0" name="remboursed"/>
-			<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
-		</record>
-		<record id="account_bank_statement_0" model="account.bank.statement">
-			<field name="user_id" ref="base.user_root"/>
-			<field name="name">10</field>
-			<field name="state">open</field>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="period_id" ref="account.period_10"/>
-			<field name="date" eval="time.strftime('%Y-%m-%d')"/>
-		</record>
-		<record id="account_bank_statement_line_paymentpos0" model="account.bank.statement.line">
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field model="account.bank.statement" name="statement_id" search="[('name', '=', u'10')]"/>
-			<field name="type">general</field>
-			<field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="journal_id">Cash Journal - (test)</field>
-			<field eval="[(6,0,[])]" name="move_ids"/>
-			<field name="date" eval="time.strftime('%Y-%m-%d')"/>
-			<field eval="450.0" name="amount"/>
-			<field eval="0" name="is_acc"/>
-			<field eval="0" name="am_out"/>
-			<field name="name">Payment POS/019</field>
-			
-		</record>
-	
-		<record id="stock_picking_out0" model="stock.picking">
-			<field name="origin">POS/019</field>
-			<field model="pos.order" name="pos_order" search="[('name', '=', u'POS/019')]"/>
-			<field name="date_done" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-			<field eval="1" name="auto_picking"/>
-			<field name="move_type">direct</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="note">POS notes </field>
-			<field name="state">done</field>
-			<field name="type">out</field>
-			<field name="min_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-			<field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-			<field name="name">OUT/00019</field>
-			<field name="invoice_state">none</field>
-			<field name="max_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-		</record>
-		<record id="stock_move_stockmovepos0" model="stock.move">
-			<field name="origin">POS/019</field>
-			<field eval="1.0" name="product_uos_qty"/>
-			<field name="product_uom" ref="product.product_uom_unit"/>
-			<field eval="1.0" name="product_qty"/>
-			<field name="product_uos" ref="product.product_uom_unit"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="priority">1</field>
-			<field eval="0" name="auto_validate"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="state">done</field>
-			<field eval="[(6,0,[])]" name="move_history_ids"/>
-			<field name="date_expected" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-			<field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-			<field name="name">Stock move (POS 12)</field>
-			<field eval="[(6,0,[])]" name="move_history_ids2"/>
-			<field name="product_id" ref="product.product_product_pc1"/>
-			<field name="date_planned" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-			<field name="location_dest_id" ref="stock.stock_location_customers"/>
-			<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
-		</record>
-		<record id="pos_order_line_orderline0" model="pos.order.line">
-			<field name="notice">No Discount</field>
-			<field name="product_id" ref="product.product_product_pc1"/>
-			<field model="pos.order" name="order_id" search="[('name', '=', u'POS/019')]"/>
-			<field eval="450.0" name="price_unit"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field eval="1.0" name="qty"/>
-			<field name="name">Order Line/07</field>
-		</record>
-	
+         <record id="account_invoice_invoicefrompospos0" model="account.invoice">
+            <field name="origin">POS/019</field>
+            <field name="reference">POS/019</field>
+            <field name="number">SAJ/2010/010</field>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="address_invoice_id" ref="base.res_partner_address_8invoice"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="reference_type">none</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="state">open</field>
+            <field name="type">out_invoice</field>
+            <field name="internal_number">SAJ/2010/010</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field eval="0" name="reconciled"/>
+            <field eval="450.0" name="residual"/>
+            <field name="move_name">/</field>
+            <field name="date_invoice" eval="time.strftime('%Y-%m-%d')"/>
+            <field name="period_id" ref="account.period_10"/>
+            <field eval="450.0" name="amount_untaxed"/>
+            <field model="account.move" name="move_id" search="[('name', '=', u'SAJ/2010/010')]"/>
+            <field eval="450.0" name="amount_total"/>
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="name">Invoice from POS: POS/019</field>
+        </record>
+        <record id="account_invoice_line_pcbasicpc0" model="account.invoice.line">
+            <field name="uos_id" ref="product.product_uom_unit"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="name">[PC1] Basic PC</field>
+            <field model="account.invoice" name="invoice_id" search="[('name', '=', 'Invoice from POS: POS/019')]"/>
+            <field eval="450.0" name="price_unit"/>
+            <field eval="450.0" name="price_subtotal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="product_id" ref="product.product_product_pc1"/>
+        </record>
+        <record id="pos_order_pos11" model="pos.order">
+            <field name="sale_journal" ref="account.sales_journal"/>
+            <field eval="0" name="journal_entry"/>
+            <field name="shop_id" ref="sale.shop"/>
+            <field name="date_order" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field eval="1" name="nb_print"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="state">paid</field>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="name">POS/019</field>
+            <field name="price_type">tax_excluded</field>
+            <field model="account.invoice" name="invoice_id" search="[('name', '=', u'Invoice from POS: POS/019')]"/>
+            <field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
+        </record>
+        <record id="account_bank_statement_0" model="account.bank.statement">
+            <field name="user_id" ref="base.user_root"/>
+            <field name="name">10</field>
+            <field name="state">open</field>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="period_id" ref="account.period_10"/>
+            <field name="date" eval="time.strftime('%Y-%m-%d')"/>
+        </record>
+        <record id="account_bank_statement_line_paymentpos0" model="account.bank.statement.line">
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field model="account.bank.statement" name="statement_id" search="[('name', '=', u'10')]"/>
+            <field name="type">general</field>
+            <field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="journal_id">Cash Journal - (test)</field>
+            <field eval="[(6,0,[])]" name="move_ids"/>
+            <field name="date" eval="time.strftime('%Y-%m-%d')"/>
+            <field eval="450.0" name="amount"/>
+            <field name="name">Payment POS/019</field>
+            
+        </record>
+    
+        <record id="stock_picking_out0" model="stock.picking">
+            <field name="origin">POS/019</field>
+            <field model="pos.order" name="pos_order" search="[('name', '=', u'POS/019')]"/>
+            <field name="date_done" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field eval="1" name="auto_picking"/>
+            <field name="move_type">direct</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="note">POS notes </field>
+            <field name="state">done</field>
+            <field name="type">out</field>
+            <field name="min_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="name">OUT/00019</field>
+            <field name="invoice_state">none</field>
+            <field name="max_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+        </record>
+        <record id="stock_move_stockmovepos0" model="stock.move">
+            <field name="origin">POS/019</field>
+            <field eval="1.0" name="product_uos_qty"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field eval="1.0" name="product_qty"/>
+            <field name="product_uos" ref="product.product_uom_unit"/>
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="priority">1</field>
+            <field eval="0" name="auto_validate"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="state">done</field>
+            <field eval="[(6,0,[])]" name="move_history_ids"/>
+            <field name="date_expected" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="name">Stock move (POS 12)</field>
+            <field eval="[(6,0,[])]" name="move_history_ids2"/>
+            <field name="product_id" ref="product.product_product_pc1"/>
+            <field name="date_planned" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="location_dest_id" ref="stock.stock_location_customers"/>
+            <field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
+        </record>
+        <record id="pos_order_line_orderline0" model="pos.order.line">
+            <field name="notice">No Discount</field>
+            <field name="product_id" ref="product.product_product_pc1"/>
+            <field model="pos.order" name="order_id" search="[('name', '=', u'POS/019')]"/>
+            <field eval="450.0" name="price_unit"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="1.0" name="qty"/>
+            <field name="name">Order Line/07</field>
+        </record>
+    
      <!--Resource: pos.order-->
      
-    	<record id="order_pos1" model="pos.order">
+        <record id="order_pos1" model="pos.order">
             <field model="sale.shop" name="shop_id" search="[]"/>
-            <field model="res.users" name="user_salesman_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
             <field name="price_type">tax_excluded</field>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-		</record>
-		
-		<record id="order_pos2" model="pos.order">
+        </record>
+        
+        <record id="order_pos2" model="pos.order">
             <field model="sale.shop" name="shop_id" search="[]"/>
-            <field model="res.users" name="user_salesman_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
             <field name="price_type">tax_excluded</field>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-		</record>
-		
-	<!--Resource: pos.order.line-->
-		
-		<record id="line1_pos" model="pos.order.line">
+        </record>
+        
+    <!--Resource: pos.order.line-->
+        
+        <record id="line1_pos" model="pos.order.line">
             <field name="order_id" ref="order_pos1"/>
             <field name="date_planned" eval="time.strftime('%Y-%m-%d')"/>
             <field name="name">[PC3] Medium PC</field>
@@ -218,6 +207,739 @@
             <field name="discount">0.10</field>
             <field name="notice">Discount Applied</field>
         </record>
-		
+
+        <!-- Resource: pos.category -->
+
+        <record id="beverage" model="pos.category">
+          <field name="name">Beverages</field>
+        </record>
+
+        <record id="water" model="pos.category">
+          <field name="parent_id" ref="beverage"/>
+          <field name="name">Water</field>
+        </record>
+        <record id="plain_water" model="pos.category">
+          <field name="parent_id" ref="water"/>
+          <field name="name">Plain Water</field>
+        </record>
+        <record id="sparkling_water" model="pos.category">
+          <field name="parent_id" ref="water"/>
+          <field name="name">Sparkling Water</field>
+        </record>
+        
+        <record id="soda" model="pos.category">
+          <field name="parent_id" ref="beverage"/>
+          <field name="name">Soda</field>
+        </record>
+        <record id="coke" model="pos.category">
+            <field name="parent_id" ref="soda"/>
+            <field name="name">Coke</field>
+        </record>
+        <!--<record id="soda_lemon" model="pos.category">-->
+            <!--<field name="parent_id" ref="soda"/>-->
+            <!--<field name="name">Lemon</field>-->
+        <!--</record>-->
+        <record id="soda_orange" model="pos.category">
+            <field name="parent_id" ref="soda"/>
+            <field name="name">Orange</field>
+        </record>
+
+        <record id="beers" model="pos.category">
+          <field name="parent_id" ref="beverage"/>
+          <field name="name">Beers</field>
+        </record>
+        <record id="pils" model="pos.category">
+            <field name="parent_id" ref="beers"/>
+            <field name="name">Pils</field>
+        </record>
+        <record id="fruity_beers" model="pos.category">
+            <field name="parent_id" ref="beers"/>
+            <field name="name">Fruity Beers</field>
+        </record>
+        <record id="special_beers" model="pos.category">
+            <field name="parent_id" ref="beers"/>
+            <field name="name">Special Beers</field>
+        </record>
+
+        <!--<record id="juice" model="pos.category">-->
+          <!--<field name="parent_id" ref="beverage"/>-->
+          <!--<field name="name">Juice</field>-->
+        <!--</record>-->
+
+        <!--<record id="energy_drinks" model="pos.category">-->
+          <!--<field name="parent_id" ref="beverage"/>-->
+          <!--<field name="name">Energy Drinks</field>-->
+        <!--</record>-->
+
+        <record id="food" model="pos.category">
+          <field name="name">Food</field>
+        </record>
+        <record id="pizza" model="pos.category">
+          <field name="parent_id" ref="food"/>
+          <field name="name">Pizza</field>
+        </record>
+        <record id="ice_cream" model="pos.category">
+          <field name="parent_id" ref="food"/>
+          <field name="name">Ice Cream</field>
+        </record>
+        <record id="chips" model="pos.category">
+          <field name="parent_id" ref="food"/>
+          <field name="name">Chips</field>
+        </record>
+
+        <!-- Resource: product.product -->
+        
+        <record id="coca_regular_1l" model="product.product">
+          <field name="list_price">1.49</field>
+          <field name="name">Coca-Cola Regular 1L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHHfEPXNS0W3sjp0zRGUvvKqD0246g+tc+InKNrHqZVhaVdy5+ljlPCfjPxBf65aW1xevLFJOqOCi8gn6cVnGrPnSPRxuW4elRlJLWx65XWfNENusizXJcMFaUFMngjYo4+Y8ZB7L34/iKW7NKjTjG3b9X5L9fXopqozMPX9Kt9YvtPtp9+AZHbbj7oA9fcrUyipbmtGvOldxdjPPhPS9G1PT7q2EiKbkK3Ixkqdp4H97ApKnFO9jWpja1SNpSOsqzlCgAoArwx77mS6JyGUJH7KOSfxP8hSAW9thd2rRZ2tkMjf3WByp/AgUASROZIwxG1v4l9D3FAD6YHLeN/FqeHFsLSMj7VqMxRSULhEAyzFQRnqB17+1IaKUnjCyaBmHiSOHaMk+SqY/wC+gaGmBHY+NLCWUr/wlUE5AztAjb/0FaSuN2J7PxvAfFNnpj3Kzw3yskcyxFMSDkAknnIyBxT2EdnTEeQ/EzzW8eRSNG7Rw6avl4GQCXbd+PSlzJM1jRqShzJNo4TVZlawmRchihzuBH86pmRz+hXH2bUN57rjHryKSA7RLl7i805rdJfNivoJI2CHghx/TNKTRpCnOeyufQtMzPMvH8ck3jWyjQqubQl2Y4CqNxJPsAP0rlrrmkkfSZI4xw1RvuvvOQ1jRb2S58mGzmmQkKD5RBZiM4xzyKy5ZR0R69OthpQvNxKFt4fZIvtV1ss4wCy7kyzD1A9O2TjJ49cP3t2yFKgp8sIJv5HQabZJb+INMiNys7M+4IsZXCkcE5789O1OEUpIxxc+fC1Go2S8/P8AI9rrtPjThvFMFtc+Kmha4SC+axQ2pkfarne+VyQQD909OcVhUScj2MvlOFHmSvHm1t6b/mcnfalqOk2k8F9ptxb3e3y0meMMm3LHgjA6uemRwOOKxcnFao9inh6NealCacd7Xs+nr28iD/hINMnu/Mj0ySaNGjWNTCPljHDLwTzjAB7jPAycnPG+wLA1oxs5pb9evQ07RpNV8R6fcxyQxrEwHkyTqZXy3zPtHT6HFVH3pI5sRy0MJOLTd+ttF2V2epW/2jz7rzs+X5o8jgfc2Lnp/tbuvP4YrojzXd++n3L9bnztTk5Ycu9tfW7/AEtt+Z458X9Xaw8ZRwTQxvFLYIUZs5U73yQR9KmpT5zuy7M3hNLO1+hx8fim5ih2pqF1GmMbUnOPyBrH2NRdT2f7Wy+erhr5pFV9eS4bDzyyn/bJP86n2M2aRznBw2/I2YPFLat4u0JIIFidbi3t9qvnOJBzxxznpWypu6b6Hj1MypqjOnFN8zbu/P7z6Lrc8c8S/aBtNuoaLegf6yKWIn/dKkf+hGkB5ZkGIY9KBobH1pgdJ8NLM6h8SdJTGRHMZT7bFLD9QKQj6epgeQftAzxCy0W3JBmMkrj2UBQf1I/KkB44n+pH0oGgi5NAHafBiWKL4jQLKQGkglVM/wB7Gf5A0CPo6mB4P8ab42/jy286FZol09Aqt2y75IpDOEuZ7CaycwwBJCOMKP6UwKWnNCs5NwhdMdMZ7ikgOi8J3UMnjrQ/sNsIdt/EC4PJBYAj8iaGB9PUxHkXx50Ca4srDXYI2cWxaCcgZ2q3Kk+2cj8RSYHj39najb6d/aD2c62bSeWJmjIRm54DdCeDQncbTTG2lle6iJhY2k0/kx+ZL5SFiq5AycdByKLgdr8H9BuNS8ZwXJhb7PYjzpHK8A4+UZ9SSD9AaSdxuLW59F1RIjKrqVdQykYIIyDQBR1nRNP13SJdL1C3EtrKACg4xjkEEdCKTApeGPBuieEYpk0i2MZuGBkd3LscdBk9vb3oSA2Y4YoQwijSPcdzbVAyfU0wH0AA/9k=</field>
+        </record>
+        <record id="coca_regular_2l" model="product.product">
+          <field name="list_price">2.38</field>
+          <field name="name">Coca-Cola Regular 2L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHKeOdRv7GK2FlPLDvDljH1OMY/nXNiJyjax6OXUKdRy5l2K3gPVdSv5JUvriWZfL3AyHODkDiihOUnqXmWHp0rcqtqdpXQeWFMCpe6Za6gyfaYlkCggAj1pWuVGco7MbZaTZ6c+61hWP5duABRZIc6kp7su9aZByuv+IZ4NbOm283kJDCJJpNuT8xOAPToe1Azlde8S6vYW5vLTVA8a/eV3OR9ORSaQIreGvGep6xesk+qhFiUNsVjlv16UJAdlp3iGceIbawnm86C9VxGxXBR1G7Ge4IBoA5/xE2PFWtEnnbbr/wCOE/1poDjvFsv/ABI5V+n86GCOc8FTGLXOD1iYH8xSQHqNrITq+guOv9ogfgY5KbAm8UWzDxLqjgg+ckBA+ikf0rJ1VGVmdMMJKdNSj5nDeKIpTpciBCWyOPxp+1g+oLBV7/CzD8H6feNrJ2W7ttjZjgZwOOaanEJYOtFXcbHp2lxGXVtFBbGy+D49cRuP61Htk2kingpxhKUuiLPiiYjxhcxBdxMMWF9f85rCu/fPQwUf9mT82Z+uWFpPNOZ0BjC7H2yY8uQYySwHHQ8kY/XbSimx0604xVnr6br+vn+uRZWQ0DXjsdvLurKTAYYK5Q8cEjt6/wCNElyv5G3tniaOu6kvzNrQZhJ4l0mMHpMx/wDHDWdJ++icVG1Cb8l+YeNrg2njZ5v7scZP5f8A1qqu7VAy2PPhWvNmdLIsGtNcRFxHJEZA6k7QhIw3Xkc4I7c/SqirSuE7yo8r3Tt8/wBO6MbULh1121Qz28q+WFxboFVd2QR0HPfp3FE9zowsF7GTs1r18vvNvwXJ5vizTBn7rt1/3GrKj/EROZK2Gl8vzRP8SCF8US88mGP+Rq8R8ZGT/wAD5soaRJOdOh8gxTgMw8l2MbK/+zJn5SR+fvzi6WxONUfaO91trvp5rr/Wxi+Yl5r+liOy+yRkoqRl97EGQ8k4HqfwxSerR0QTp0al5Xev5G54DU/8JhYIeqvJn8Eaoor94iczf+zSfp+Za+JK48VyZ4DQx8/gaeI+Mzyd/uPmyvZxmwhKR3N032eXapgiBJB52lScEHgqffjPStIKxjiJe0d2lqur/Xy6ozdAZtV8WaTx+7gt028YICA9f+BA0L3pI0xFqOGqebf4/wDANXwIQ3jq3x/flI/74as6X8QrMf8AdPuKfxY1FrPxuUZd8bW0ZwOo61vUpKep5mBzB4dcrV0Ydn4vtPIEd6buIxLtiubVtsqL/dPZh9elKMJLc3q4uhN3j13TWnrpsyzo3jHQNFmkmt4b2WQQ+VEzquTkliW545I4GenvVxjY58RiVVSTa3u7X9C38MtSN18QLGNFwmyUknqf3bVNOjyu5WNzF148qVkS/G21aPxXa3H8M1moB9wzZ/mK1POR5pJ900AiOL71AM7z4RKW+INmQOFilJ/74I/rQDPQfjLoEmpeHYdUgUtJpzEuB18tsAn8CB+GaGCPFNO0q+1a4a3sLOW6kCFmWNckAdTRcbRVtrWa4ult4I2klkYIiKMliTgDFAHt/wAL/Adz4evbjVdQUrM0XkxqRjqQWOPwA/OsMPVlVu3FpX0ua14U4JKLu+p6RJGksbRyIro4KsrDIYHqCK6DApaXoelaKsi6ZYQWokOX8tcFvx/pSsNtsyLD4feH9O8Rya7Bbv8AaWdnVGb93Gx6lVx9fpQFzpqYgAD/2Q==</field>
+        </record>
+        <record id="coca_regular_50cl" model="product.product">
+          <field name="list_price">0.97</field>
+          <field name="name">Coca-Cola Regular 50cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAKAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqAKesX50vR7q+CBzBEXCk9T2pSfKmzWhT9pUjHuzzmD4o6nNcgNBbKndQpz/Oub28/I9tZRQtu7nfeHdYbW9MN00YjYSFCF6cYP8AWt6VTnjc8rG4ZYepyp9LmpWhyBSAralaJfabcWknKTRlSM4zkUmroqE3CSa6HExfDKBZEJniAGMgRZP51n7JHasxqpbs63QNLTR9N+yp2kYtzkZz/gBVxiorQ5a9edaXNJ3NKqMgoAY5ywT15P0oYB/H+NIBR8shH97mmA6mAdKAPIbPxXd3uveINZF5KLaElLeIOdu1c4OOnIUH8all20OCTxp4jEmf7avOv/PU1Vh2R6x4g1u9n8C6Z4gsbuSO4t/KmkVXwJOgYEdxk/pRYjqd7ZXcd/YwXkJzHPGsi/QjNAiSVN8LoDjcpGRQB83SeGrv7GssUhIfjYoOWwSM4Hbj+foaw9v5HtxynXlc1oV7TwlfXEhBzEoGS8qFVH+P0FUq/kOeUxiv4ifp/wAOX38MXMVgJ21WCWIfKoUtk8kEAHHT8qTxFlsEMncp8t2n6f8ABPdPCEP2fwjpcRbdttkGT34rSMuZXPIr0vZVJQvezsbDfdP0pmR5Je2+paRDbbbOW6sjGDvhTcPvBux9uhA6tzXLZxsfT06lHEc3vKMr9fS39eiMgayWGLjTJXzIzNui4b5QE656Y/LPPJBG/I6YYXX3ZpaLr56/eXbu/t9U0xbdEgszH8xMkq9QD8qhQTyT371EmmjSjQnQquTblfyf3tvQ9S8NADw1pwXp9mT+VddP4EfKY7/eZ/4maErbYXbGcKTVHMfNT+IbtYswzSQIQT5aTFR17DNY+xa6nvQzWlZc1O/3f5Cf8JarsWewjd/7z/MafsWxU80hHpL7xZNfNwokNrChxn5GVf0FS8PfqdEc9jBWUG/V/wDAPoHwjIZvCOlSFdpa1jOPTit4x5VY+erVfa1JS7u5r9fxoMz5f8TWS2fiDVLUKMQ3Thc56bjimaR2MHHPAoG0W7aNpCkQABcgDj1oE9j6ssLZbPT7e2QYWGJUA+gxQZk9ID5w+JCiPx1qwA4aUHp6qDSZtT+E5HvVIbNfw/GJdc06Nvuvcxqf++hSJlsfU1BkFAHzT44uVu/F+qyBsg3bjPsDgfyoNY6I5sLzTC5pWEv2PUrO45xHKj/k30HpQDeh9TqwZQQeCMikZEV1N9mtJp8Z8qNnx9BmgD5WuZWuJ5Lh+spLMSe5PNBoVA3zZzVAW1miaHaEYycHfuAH5Y/rSCx9O+Hblr3w3pl033prSJz9SopGbL1xCLi2lhbpIhU/iMUAfPt/oM0cVxZvBt8ligOOVIOKnnXNY1UJcnN0OTstPmub8WwQgqcvx0A61oQ2dINH+23EVtBEI8rtVY15JJAH1qblbH0LptoLDTLWzU5FvCkQ/wCAgD+lBmyxmlcCvJp9lM5kls4HdurNGCT+OKWm47u1rmdZeENC0+++2W1giTc4JYkDPsTVXAuQ6Nplvci5h0+3jmGcOkYBFAF6lcQAAP/Z</field>
+        </record>
+        <record id="coca_regular_33cl" model="product.product">
+          <field name="list_price">0.51</field>
+          <field name="name">Coca-Cola Regular 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZSQoJJwByTQBCt1HIxVOSOvtQBBe36WkDyySLGqAse5wKB2M1fEqHDYkZCu7ds4xQFi/Zaql7brPCVdGzjBweDjvQFix9ujVgsmULdM9/oelAiwrB1DKcgjINAFTVL6DT9PluLggIqnI9amUlFXZrQoyrTUY7s5OLWpJbINIs1ozjO6ICRfy4IrGOIT3R3VsslGTUJJ/g/8jPkngaXzZ9Wif2nDrn8wRWqq031OZ4LEL7D+Wo0ahp6uP8AiYaf5f8Ac81cflt/pT9pDuifqtf+SX3MVby2kuPMg1aBPRYSzlfYYGKTq0+5SwWJ/kf3WNy4muLTTUkJkvGlQspYCNcYHXqT1/8A1UqlTlV0h4fC+1m1J2szY8NanHquiQTLtWRB5cqD+Fhwf8fxopT543FjsK8PWcenT0OU8dXUlx4gtNK8wJF5aytlsbiWI/p+PHpXPipNySPZyWlGGHnVtd3t+A6bakaqvQDArJhC7d2Ub1AkJ3gcrke4qZaG9F3locBfMr3blVGAalI+joxtBHVeFirWwIUD6CnHc8fMk1I76JkudJj3n/Uttb6dv6V2RtKHofNyTp13bqZWgXMVp4xbT7NgIZomeRAcjI6GppSSqWR242nKpg/aT3TsjG+IJ2+NLY562i/+hNWeJ+M7sj1wUv8AF+iOTGq3trd7VuJDGH5TOQRmsEe08NTnDZXsdHrtzLcaLbm2eJmMzCBVJHmxMMgjnOQwYEZJycdxW9SKcVY8bBJQry5r7a+TWmvk1Zp9vmZFjoNlqGhwXEt6LK7mkdUeUZicg8KT/C1KMFKCd7M66+ZVqOIlFR5opLbdefmixPpuqeH7Ge4VZ4kDKoUhXVSe+7HzAjoeOeo6ZU6TimzOljKOMqRi2np5p/d0f9INK1u9udL1qKe6dybVWUdMfOAcY/3qVOXuy9C8ThKcK1Fxj9r9H/kaPw+H/FXRe1q9PC/GYZ4/9jf+JFj4h/8AI52h/wCnVf8A0JqrE/GjPIv9yn/i/RHGSQNPfCNMbnfaM+5rnWrse4pqFO76I39X1TSdL1A6GbQ3OnQoI5+fmEo6uno3r64ronOMXy20PHw2GxFel7fm5Zt3Xa3Z9127Fy2tZlsprvSpIdas3wZrdx88o/2l7SD+8OuOmetxi7Nx1X9ficdWrH2ihVTpyWz6L0f8r7dPTavqlzYf8Ii8dn/aUQFwgNtOTtgP905/h7jryO1TUcfZO1zbCU6v11OfI/deq6+fr38jn9PJR7he0tuy/lhv/Za5oPf0PZrK6i+0l/l+p1Xw7GfFg9rVv5itsL8Z5We/7p/28S/Ec7PF1m3/AE7L/wChNV4n40TkCvhJr+9+hyDTJFeq8jFVWQEkdRzXNH4j2nFyptLsXte0uOXVJwkPkSPKQGVyyFzyA2c7d2chuhyOnONqsLs4MFipRoxu7pL52XVd7dVuvuvL4UiSVEax2LqFqWeSA5WS4XqArZGPQjp3welOgrrTdGGaScW1P4JWs+i9VZ+qf5Brl/4hutFf7S9wLRZQk0U8IV0bquWAG4e/HPXtkqSqOOuw8DQwdOuuVLmtdNO6a66X0fkZNm25tw/55t/6Ca51uepU0XzX5nWfDZt/it/a1b+a1vhfj+R5Gfq2FX+L/MsfEqPzPFOnrnG63A/8eNaYle+jPh+XLhaj8/0PPrknz5Of4j/Oudn0kPhXodLpUyeIrKKx+1my1i2TZbXAcqJ0/uMR3Hatov2itezPExcHg6jny81OTu1vZ90NstMaCJbGY2+n6rBIzYu0AW4B6bZOoI6cGiELK2zM6+JU5c6vODX2Xt6r/NEGq6vq2paNKj3Mnk28qpc28gBKNztO7GSuR3OQcdampOco7muEwuHo101FXabT799Nr+n4GXo5LX8cQ/jyv5g1lBXaPSxNlSb7HW/C47vFEv8A16v/AOhLW2G+P5HlcR6YVf4v0ZpfEhf+Km0pvWIj/wAerTEfGjkyF/7NV9Tzi5/4+JM/3j/OuZn1EPhXoafhq1mu5b6KGW3jLWpXNwPlyWULhv4WyQQfUVdKLd/Q87M6saag2m/e6b7O+nVW3RuJrerafbNZ+INMj1JIRl0mH7xF/vZIIYe4/E1sqk0rSVzyZYPD1Z8+HqOF+23p3T8vuMzVvEdpe6VJp+kaQllA7LJOwxlsHgce+KzqVU42irHbg8vqU6yqVajk9kUfC8XneI7KPrmT+hqKKvNHdmMuXCzfkdP8K+fFEx7C0b/0JK0w3x/I83iP/do/4v0Zp/EzP9u6QV67G7e4q8T8SOTh+3sK1/L9Tzi9QR3cqhg2G6iuaW59PSleCZo+GEuPt8skLwCOOL9+lxnZIhIBBwOnIOe2M1VK/McGaSh7NJp3b0tunvp/l12Oy0W4t5fM+yalA1rEGVrS+Ic2zYI+V8/Mvb0wetddNp7PTz6HzuMhONueD5nb3o6c3quj/U5e401IfAQvFaJXmvizYP3lG5QF9ccn8a55w/dX8z2KWIcsx5NbKH52eongGEzeLrQ44jDuf++SP5kVOGV6iNs7ny4Kfnb8zc+FA/4qS79rVv8A0Na0wy/efI5OJH/s8P8AF+jND4mNjxBpABx8jc/jV4j4kc+QL9xV+R59er5upugO3e4GW7Z71yvVn0dJ8tFPyNa10uXStUeay1FWktUdnjERMnysEZWjz05z16c1pGDjK6Z5lbExxFFKcNJNa301V00/61NaaDwta3gv5RcWnygSwxLuhcsuSmMZXr0OOlbctNO+x50amPqQ5FaXZvRqz38/VXOYvLoz+HrKGMkRW9xMAp9DtIz+ZrCbvBep69Cny4mbe7jH9U/0Oj+GNsDf318w4ghCA+7HP/staYRe82cHEdT91CHd/l/w5rfC3TZba/kvJAdtzbNs9MB1zVYaOt/Iw4hxMZpQX2WvyY74lRyHxLpUgU7PKOGxnkNk/pijEfGgyGUfq1VeZ57qY238w56965pbn0lB3pI6W1jm1+KLWNIl8vXLJQJ4sj9+AMBxnjJHBHf+eyTn70d0eHWccJJ0aqvSls+3l/kEGseG2upptV0y4srxlZLiGIHy5SeuVPQ559jzmqjOm3qrEVMJjVFKlNSj0b3XzOdtoTNpGpOisIYXikBPY5Kgfkx/KsbXiz1JS5a9NPdpr8L/AKHoHhi0/sXwBc3kg2yTwyTn6bcKP6/jXVQjyUmz57Mav1nMowWyaX46mv4Jkid7ZIoyPL06Pe/GCSE/wP5GrpWtH0OLMIy9rVb61P8AP/gHTappNnrFqba8i3qDlWBwyH1B7GrnBSVmcmHxFShLmgzzTxJ8OprWRri3vg6N084Yx9SOK5pYZ9GfQ4XiNRjacPu/yf8Amc1BpuoaTdJdW9zGssZyro+B/wCPYzUKjUi7o6amc4HEQcZ3s+6/yN3/AISa11CMJ4g0S2uZFGPNhljyfwzkfnW2sviieW1Sou9DEWXZ3/y/QjnuLXVUh0uysU0zS/NEk77wWkx9M/5xSlTcvdSsi6eMp0G6sqvPO1lo7I7prBPEejvp8BNvauFQyDBwoI4XqO2K3lFSjY8nD4mVGsqlrtfmbOi6HYaDZi1sItinlmJyzn1JpU6cYKyFisXVxM+abuaB6mrZziEBhggEHsaAM668PaPekm406Bye+3H8qVkO7M5vAPhlm3HTh9PMb/GiwcxetPDGh2JBt9MgUjoSu4/rmiyC7NQAKAFAAHQCmIUUIAAA/9k=</field>
+        </record>
+
+        <record id="coca_light_1l" model="product.product">
+          <field name="list_price">1.49</field>
+          <field name="name">Coca-Cola Light 1L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZsUAYviC8ubZoUtrgw7lYkhQc9PUUwRnaDq2o3F1CtzdmVXcqRsABGDQM6ukIRAQvPqf51jhoyjB8380vu5nb8BsWtxGXqemDUb+AtMypFG25QBySRjqPY/lSGinDoS6fqVnNBOyxB2DqQMklTjnH4UAdBTEFABQBBH87vL2bhfoP8mkMWZC8R2/eBDL9RyKAJVYOoYdCKYhaAOP8AiH4rl0CztLCwP+n6jJtQgAmOMcu2Dx04GfX2o3GjCuPHFrDa7p9W1GIoPmZY07cnoPapaY1Yi0r4g6ZeO8dvruozsvOGiX+qihJg7Gv4T8ZS3XiifRL12aOdPNspHUKWwPnQ44PHI+hp7CZ3dMR5B8QmkX4gSzSxyvHDp8YjZUJVAWbd07k0IGcTrF7DNYyRxtlij54I/hI/rQwMHw3M1rqDuwKqY+eOvIPH5UIDv9LvPtHifQnto5tyX8Y83yyFAJwQSfVS1DA90oA5G/1R7Px5JAEwJbFPnI3D757dzkgAepFTJ2OnD0PaJt7L+vyTb9BNcl0W90toXtbd5p1wp+zhtzZwccdm4o5kN4OprZbf8P8Akcz4WsI49d8+CwtVi8xow7W4AHrwAOn/ANakpXHLDxpxvN69l/XX/gm1rWotc6poMG+AoNTjwIuM43fNjsD26007k16UaaWj+f5Hd1RzHA+IEeLx59tdFa3jt4Y33LuUEsxGR9Vz+FK1zanXcItL+t1+TZUS5sZ/ElxEJ4kSC1OyQbwI25x1Yg43k9utRynX9evTUbPfXbXbyT6EQs0WzEcNwqGFSrFdx+cBQGB4+UZ7/wB7v1pKBcswhzuVm/e8tr3a/r8tCWGwmk8QaO9vNHMkd35jlQB5aDgDGTgZOB9auMbHLicT7Zqytp6/M9IQEKd3XJ/nWOGjUjB8+/NL7uZ2/C3oc0rXPKvHHjR/C3jueCa2Se3urOHKPyCAX7Hj9RXQIqaT4v8ABjXc13dRPZhgrA5MgYg/7IJH50MEX7rx54IGm3MNlP5k0iYXFvJknoBkgYHA79qSGc/4f8YvqXi7SNLtgTG18rkAKuAA2c7c569Se1NiPcqAPDvj/a7NY0i8x/rbd4s/7rA/+z0gPPBgxDAwCKBoI+KAZ0vwhtvtvxNtpiMi3SWU/wDfJUf+hCgR9HimB47+0BNCYNEt8gzBpnx3C4Ufqf5UgPKYDm2TkHA7GgaHp0OO1AM7T4FTQxeNrmOXAllsnWLPchlJH5A/lQI+gRTA8L+MN8+neP4JJI/MjewjVQew3tnH5UkM4y/urOa0YQRfOyH5go44pgZukOILh3miMi7cYI9x/TNIDqfBWqrc/EfRFtYBCEnKlgBlgVIPTtgmhgfSApiPJPjx4fludPsdegjLC0JhuCB0RiCp+gOR/wACFJgeP6dpmq3lvc3VjZzTW9rGZLiRVyiKPU0XGMg+138otbK2lmmcHCRIXY4GTgD2oA9A+DXhS/m8Yf2tdWksFvpytzKhXdIwKgDPoCT7cetAHv1MQ2SNJo2jlRXRxhlYZBHoRQBCun2SWLWMdrDHaupRoUQKhU8EYHFIDD8P/D/w14Y1B7/S7Ax3DKU3vKz7QeoGTxRYLnSUwCgAAP/Z</field>
+        </record>
+        <record id="coca_light_2l" model="product.product">
+          <field name="list_price">2.38</field>
+          <field name="name">Coca-Cola Light 2L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGN4he6ESrbXktscE5jC5P5g0AN8OS3TwkXN3LckqDmQAYP4CgDboACccmgCne6bFfSI7u6FVK/IxGc/5/WkMSw0yKwJZHdyVCguScCgRdpgcX4o8TXdvr39l2lx9njghWS4kVAWJYnAGenApDOK1rxPrmn5ubfWZngzyHlYFf1osFx2heLNR1W4y2vzhY8F0BIJ/U8Ukhnb+HPEdzL4g/sq6nNxFPA0sErIAwZSMqcdeDnPtTEzmfFDZ8Wa23+1Av4CMf4mmgOM8UyZ0hx7r/OhgjJ8GymPVJBngx/1FJAz0/w45PizRD6tOp+nlMf6UAa2r+FZ9X1/V5bSdFkYwkpJkD7mOCPpTEcb4l8BeI305hDZrPkjGyZOfzIpDM3wp8PPE637SS2CxLsIy8yeo9CaEDPQNO8O3Oj+JdCe6mjLtJP8kfP/ACybqTQI6LT5x/wmGswE9Ibd/wBGz/SgDN1G/uIbBI45JI/Nk8yB3A/eKe3PGT1wcfrkc7k0j0Y0oyk7paLXy/r+vOXw/qU00E7TABkkMWdrKTxnoQMGrpybMMTRjBq3VXLWqS7vGWhQg8Bbhz/3wB/WtTlM97g2Xj++lbiOS3iVj+Bx/KhjILi8N5pdxbySRnyWWLa54PB6+insfX8q52/dsd8IpVFJX110/rddf6ZTkvhpOjylbUQsJdxjaQlnGAMgjOCPQ44GeKumrLYxxUryWt9DQsLkah4p028Qlo9k6qfUbV5/WtUcxY1e187VtScD5lhi/wDZqUgSuzEuI4rWDFyjAsN6ywyYcDuMHgj2/TqRz1LX1PSwyk4+732a0/rzH6jBA+jXNmk8lzcLLvLumSCFA4ABx07DseR1rSCt1OTEScmtEtDc0nTmsp9JRkVWjSUNt6ZIHP44rRGDLssYfWr1SOGgi/8AZ6JAtzm9UmLwh5pLeFHTZKXi3puB6EE8Mv68da5pO+56lGNnZJvXTWz/AOGf9WNiy0mymhmhmhVz57yFhwcsc8EexA/CtopK5wVpuTTfZfgamR/aFoo7Bz+n/wBerRkebeM/HOoeEvH13HFDHc200MRaJ8gg7f4T2/WnYCnN8UdHu2+0Ja6hY3TgCQRrHLHJ/vAkZPvwazlT1umb08RaPLJXX4r0Y+0+MGmWMUgWzvrud3LO0gSIZwBgYLYGAKqMWt2RVmpNWVkjT8BeN7/xd41dJoo7e2gs5HjiTk5LIMknr19qozOW+NFu0XjVZSOJrSNh74LD+lAI89LFeR1FADEyzE+poA9L+CCFvF9246LYvk/V0oBnTfGjw7Nf6Xa6zbIXayykwHXYxGD+B/nQxxPIrbQtRutKutSitJGtbXAlk2nC54H9PzouDTQzRNEvtbvfstjbyTOAWYIpJCjvx9R+dTUnyRbs2VCPNJK9j2/4WeDJ/DVpd3t6pS5uiFVCMFUH+JP6CpoVHUjzNWHXjGErRdzvXRZEKOoZWGCpGQRWpkQNYWjWL2RtohbOpRoQgClT1GBSAzfD3hDRfC/nHSrUxvPje7uWYgdsnoKLDbNqmIAA/9k=</field>
+        </record>
+        <record id="coca_light_50cl" model="product.product">
+          <field name="list_price">0.97</field>
+          <field name="name">Coca-Cola Light 50cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYFC/vZLd9kZUHbuyRnvQBlWniC7a8ihkEbrI4UkLgjJ+tAHSUAFAGVq2mTX0oMV00H7sgkAH6YyPrUu4zN03w5Na3EMkuoPMqtnGxRz27Ule4aHT1Yg6UAV3kyGb14qRkanCg56UgLUbiRAwPWqQjnvHWrPpXh1/JcrNcN5SkHkA9T/n1pjR5j4tOo6T4Wsbv7fOr3JJwJCOKVlYaepz1jqupNZRl7+4YnJyZT60rIZ6j8L9cmu1udPuJWkZQJELnJ9D/ShCkX/iHo97rEdhHZtHmNnLB2xnpimxJnC+LfDviTUdMt4ZDavBaqwG2cdutF7lcrRj6P4W1S8jW3i8nzFUnBkHNLYEmzuvAXhvUdI8Q+dcNAYxEwPlybs5HtQglodl4iSWSKNYc7yHC4ODkjinLYUGlJX7nK+M7O6trKIKzokh2AgABB83GN3ptHQ8L71HKzrp1Yat/wBfh6mN4IN5b6lMYIQ0pB6jOADwPx6/n+BqFSVOSSv2/Hf+vQ77RllW7H2iMxuVYhTjIGe+O9OJzVbc2gzxP4jsvD8tob1HZZtwGxQcYxzVmdrnIeMPFnh3ULJFnvZY32nYUjLYz9D7UMdmY3hjWtB0q6W8F9MUYfxQnOPw+lILM7vw74o0jWNaMFi0rSFGbLIQAB9aAaZR+K9r5mjWtyBzFKV/76H/ANahhE8avYhMgEnUdKBiWpKQiPqB0oY0ejfCO0Mmt3V0RxDBgfViP8DSW4SOy+JCq3hCYt/DIhH54/rTZMdzwnU2MUaEDqfWhlDLTc0W5hgmkwPXfhBGosNRk7mRB+hoiKRqfFC4EXhZYs/NNOoH0AJ/wpsS3PGNfgaK0tyVA3HNDKTILbJt0GeQMUgPVfg/cr5Wo22eco4/UH+lCFId8WpGDaYjMRFlyfTPFUJHnni6a2MNtBFIrbIwcg5z/nP6UMEZNm4a1U5zxz9aQzvvhROyeKXiDfLLbsCPXGDS6g9jpPi3YyzaLa3iAlIJCr47bgME/wDfOPxpsSR4vdzHcXI3dBSbKURInwoZflyM4piPR/hFYyzeIZ7xgfLt7cjP+0xGP0B/KojK8rGtSmo00+rPX5Yo54XhmRZI3UqyMMhgeoNaGBz9t4A8K2l59ri0eEyDkeYWdR9FYkfpSsO5HdfDrwreXxvJNLVXJyUjdkQn/dBxRYLnQWtlaWMZjs7WG3QnJWKMID+AoSSBtvcAAP/Z</field>
+        </record>
+        <record id="coca_light_33cl" model="product.product">
+          <field name="list_price">0.51</field>
+          <field name="name">Coca-Cola Light 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZWYKpZjgAZJoAqjUInYrH85U4OOg/Hpn2oHYpXetx2+4F1BXqP/wBY5/CkFiifEyJKFlmMQOD86469O1AWNW21NLhA0c0Ugxn5W/8ArUwsSPqUMJUS5XccA9j+PSgLFtHV0V1OVYZBHcUCKesXsdjYMXI3S/u41P8AEx4pN2HFNsx/sM8loEWeW3cj70YDD8jyPzoAzV0jU7ZmI1GOVW6+arAn69c09Auynd2FzLMu68tY1HVA6AH8NtF0GpNb6LdSyb1v0A7BCXA/Oi6DU2Y9MkSEfaLmW5Zc43DYp9jjk/nSA2dLuFntFQBVeHCOoGMY6fpTQMwNUT7Z43ghklOy2tVkWMj5cszAn68VNrstTUYNW3N9lWJAW4GQPz4pshK4ksfymgDktWuraC8CSBCSe9JjOi0pEe3VkAwfQU0Jmg0IZcUxGHHvtfF1sqOwS5idXTs2BkH6j+tLqPoQX2P+E6lHHOnRn/yI9A+gzWGuLezLQzvFEQyvtxhSRwxz2B/nntWdS9jpwfK52au/6uhJNcvBoElwzhbqNFLpKu3BOPTHHv8A4UOb5L9Rxw0XiOXeLb2ONvrW2vr0y3s9zZ3PV4ZGB49UJ+8Pbr6ZpKr3VjSWXu14vmXRr9ex1dh9t062ia11PzLQqOZFDHnoQcdK0urXOL2cubltqa9rNcSxP9onaQiRhngcZ9BTJI/+Zm0sDskv/oIo6jXwsg1AoPHBADbzpyZPbHmNj+tLW5WnJ53ItZ+0zS2ljbNs89y0j4zhFxke+cioqXbSR04PkjGc5a2WnqzImS40vzoxG1zYryONzwAjlSP4k9v8KiScPNG9KpDEPfll+D8/JmZcQvcaSz2Pl39ltJ8iU5ltj/snrgfyqGrx01R1wkoVkp3jLutpep0FnG8Xhu2jEXluUUBEYtjn1/Wtor3EeZWkniJO99TXsVZYW3ZyXJyepqzkYic+JtP9opj+gpgV9SVx46DYOw6aozjjIkb/ABoe4+gmps8d3aOrsgO9MoBkk4OOfYE++Kzno0dOGSlCat2Yxmkltrk2jD7TtVgyHAkGe2c4JwR7Gm22tBRpwhNOW35f1v5nNLY6dqT3F2yuhQ4kjVgk0YHUkAYP5dupPFYcsZXZ6cq1aiowXye6fbzN1rjTdO0+ytTcbIJSqxOxOG6Hlug61ukuVJHlVKknVlKS1Na1ZMyBG3fvGJ4xg9f5EVRgMiI/4SmxGeTBMf8A0D/GmgJtRlhOveTk+cLZWx2KlmH8x+tDBEV9Zpf2b27sV3YKuOqsOhH41Mo8ysa0KzpTUkYqajK8Vxps/l2uq4GH+6txg8Yb3HH4/lkpPVPc75YeKcakbyh99vl5GdNZWuseY81rMs8H+tilOJQvqrfxfjn8KlxU+hpGrVw9kpKz2a2+a6fL8Se9uk03T47SOOCSxmCLbyXSFocHHLke+eD6jHQitopKOh5leU5VJOW99SbSFlsE+yraR2SljLiGXzFbdgDB9DtbA9AKozNuHB8XWA7i1uD+sdMQarGy+MIZPNO2SwKmPtlX4P8A48aGCJZnDKYlP7w4IHqM0mXBWd+hz0x0rUFuLK7gkSVp5GgYt975sHy2PuCdvrWHuSumepH6xS5Zxaa5Vf7uq/UgXRNaaLZZ675lq4IBkB3AdCO5H5ij2c+khyxeGTvOlaXlsaV3atZeGBb207bYAqvKIhJ8oPzEp3HXI9M1tFWjY8yvUdSq5NWuyj4dntzO0BtYfJkbEc9oxMLsuSeP4OGHHTPvTM2btuc+NbMelhMf/H46Yg1twni6xB6tZyAf99KaGCJVz9uGMH93z7c1PU0/5d/M529SS6lu5LewaeDefPtXPDMCRuQj7r8Zx3BB5rCWt7I9WlJQUFKdnbR/o+68zPsdQex8P6pcQNdAmRREZ+27jIPr/gKUZ8sG9TWtQVXE04y5dtbeRcmuzFDbSXM01rbeUptrpMrsBC5B7ZyOjDkdD2roi9EePXi1Vkn3Zs6EqvZvvuYLxo7hissSKFGQDxjPJByfcmmZMsWhB8bW3tp0p/8AIiU+wu5R8X3P2Xxdo0pPylGjYf7xA/nimBcup5ILuAwQLLI6NkFsFgCOB2zgk8+lZybTVjpowjOD5nZJ/wCf/DGNfXF2NSN1pxign3OlxGWLKwU4BdQOO3PuOayk3zXR3UoU/ZctS7Wln69n19Aa0v7vSb46lDFFG8iTJHGwYAAgse/Bxn8TT5ZOLuSqtKnWh7NtuzV3+H3HTKiNHsZQUIwVI4xW55T3IxDbabZOIY0hijDOQqgAdz0oSBmfoqmLxlawP9+PRyW+pkXP6in2AzPiYxj1XTJVyCqMQe2QymgOhoeYmu6NHcWMwWdCJIm/uSDqD+o/Gs6kW1ob4atGnP3ldPR+hTjm/teY3Flcf2drEQ2TwuOHx6juPftWafNqtGd0o/V48s1zU3s+xa0i01CO1uotVMISRiUWM8KD976D/wCvVQUrO5z4qpSc4unfTuaOkz/adLtps7i8Skn1OOauDvFHPiIclWS8ynrGoQyXUGjRyBri6cB0ByVjHLE+mQMfjV2MhmjF5/iXeuASlvpqxk9gWcMP60PcXQ6XWNFstctPs17HuCncjqcMh9QaGhp2POtY8HazoLvPpuokQv1KSGM/j2/HNK7Q7JnH6i+oeeLi5luHuF6So2/p7iolTUtTqw+MnRXLuuwx/GGvGBraW9nkiYYIKHJH1xmp5JtWubLF4eL5lT1NOHxLreo20NpBvtIIgFURAxZA6ZYnP61qlZWRwTm5ycn1Z13gXwzcJPPqNxtMsox5hbfgHk4I69u9CdyXod5ZadbWDTPCmJJ2DSuerkDAz9BxTQi0aGAhAIwRkGgDNu/Dei32Tc6ZbuT1OzB/SlZDuzOPw98Kl9x0lPp5r4/nRyj5i/Z+GNDsCDbaXboR0JTcf1oshXZqABQAAAB0ApiFFCAAAP/Z</field>
+        </record>
+        <record id="coca_light_decaf_33cl" model="product.product">
+          <field name="list_price">0.53</field>
+          <field name="name">Coca-Cola Light Decaf 33cl</field> 
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZicAk9qYEAukKlmIjUDOWPalcCKTUEEoiTczHuF4H1oAonWmW4MLsoYDONpyR7etAGlb3cc8YZZ42z6UASvJsQscMB6HFMBysHUMOhGRQAJ93j1P8AOsMMkoO380v/AEpjZU1W8WxsJJSQGIwufWtZyshxjdmDpE1xdhQbmbYeRnnj8a41Wmna5tKmkJrqm1j3A20p9JIBn+dVPESj2FGmmcs2tI0wD6dZFx0fyuan61LsP2SOs0Sd7uMEyRIAOFEeQPzNOOJk+xLpJFi4kkS6WJpiY3yuAoHJ6VVOu3OzCUEo3RqaXcefZqrcSRfI49xXTB3RlJFten4n+dZ0ElF27v8AN/1/kDOc8SW8l3crEZWEYUEoOh60qyb2NaU+UpQTLZ2jSQ3EaOvyoHJGSOcdD1rgi22dMY8z2MzWtRa8hEkMolRl3Ar0xSe+pLi07HNC3nLhvLfnpx1ouTZnVaBPcQoA7eWP9ogUr66DNW/KMDuuEZ15KqckU0ndWBvQtaPcNLqEUgBUzwkyKePmUlf6V6MG+bXscztY306fif50sM24O/8ANL/0pks5/XopWvFMUxjO0ZyAyn8DTqmlNpboxZwq6dcytIIjEwdXPQHpz7HOPxrzY7nXT+KxzVnIqWcturkbVKsjj5os5wfdeetXJa3NqivK/wDTKMKyxjyYHxIn3rWRu/qjVTt1+80lZ6v7/wDM3tKuJ7rSTNIpSRScE98HrWcklI56sFGdkapcSec2CS23PBOTjHT/AAqqavOPqYVNLmj4a/4/IVxjy45FwBjHzHt2rtp/H9/5mEtjqU+7+J/nTwytB/4pf+lMhnL+J47j7cJLZ9kmwAfPt3dePSisbUXHZmPdxrc2sMUrBIZJcyZOAcAkD9K8+OjZ2Uny3a3sZ+oafDcJ5wcwSx/dlTjA9/ampNE06rjpujBkYeX5F9B56ryk1vyUH07Vol1R1Ja3i7eTN7w4sY0ZtgkAyxO8ZJ9xWdS/MYV7uoa7hWZwoJz5YwV68CnTV5L1OafUveFhtvinPyIw5/CuyjpN/MxnsdYAQOfWtacXFa93+f8AX6GbOZ8QyKupxiSPK7Qd3pz6VlXtdXNKa0MS4UrYJPg4gbc2ByB0J/Dr+FcMdztpP3rdyiq4hYOgFu6EsQw2fUdwCM/lTYpfjcxzO1tMfN8y5QAeXNH9+Me4/r3q7XRvy8y008uhrWl7eXWitNawq844Mb8bx049DU8qUrM560fZysi5DqKXzTq1tJbmN03iVApz3BJ4OAOucYIrSnBqcTCcrpmz4UH+nNzn5DyPw9K6KPxsznsjrK6ErGRha19ma/hSaQxsXQDkgMOcj/P/ANak5RvZjs+hkW5UQvv+7zn6V5HU7EcrcyHTJLiGNTcWIJDoPvRZ/pzWqXN6nVb2iT2f5kNpPHJ+7e8jlgA/duzbZIz+NEk+wqkWteWz/Bk5WfUNPN1avGZVDRvubYGAJ5Dfw5yfz7YBpxtF2Zz1qbjInsFddQRYJLxmVWY29yDvjIxgAjr1OD6AVtC/MtvkYS2Ou8Lg/bZWPXDjrnuvetKPxP1ZE9kdRXSZnP68ITd5Z18xIw2xhnjPUVlVjpcqL6GKjYtynPzkgEdfy715nU7Io5+9vbm11G6VoxLFkBgo+dBjhsfxDrWiimjdU4yitbfkUobfSdSdiFUSLy3lkqGHrim3KI5VKtI1Yfsn9lPArRQwy5ijMn3CeevtwaSvzXOaq23ruVbQX1rd5EE0dsjiEwTPv8stg5Rv7vA61pJq2+pkrnb+FVxlvXeP/QK3wy0/ryM6m50tdJmcz4lnSK7O9M7YSxbbnA5qKvwMcfiRkR8+WAxUljg8V5SO6Oxh6pFJe6pJCzrDLFzE44bHt/eHXPpWqdkaxahC9rp7mRDDdW/2+aZIlkEeMpwc+v49fwpuzsaScJciV9zQ0+1vBYQXEUAkzFskg4JZecEA8Hg8qevYg0+ZXsc2It7R2LOmC3Wd/s1rc26n+CYMNhxyoz2B9PWipe2tjGJ3HhldtvEf7wkP6qP6V1Yde4jGpubytuGcY5I/I08PW9rFu1vekvubX6EtWOT8VJuv22Z3m2YADr+FXU+BhHcyJ5JkSARMiF5SoZ1yA2DgH0yeOK8uPU9Ckk737GNrKyXmofZZTsuEbfHtG35cdVb6/wCRWkXZXNadoR5lsQWdhLILhp7tpi8Zi2suCv19+aJSRNSqlaytrc6LRyGt4WHdB/Ks5bmElaTLV7Em7ftG4Z5/z9BSTEdDosflQ2qH/n3ZvzYGvTpK0Y+hyy1bNetSTA123BvhcB13CIqVPXvgj8j+vrSezBGGLSO+sZbeTgPnBHUHPBrx1KzPQpycGmjm7ueOZ/7P1n91cxf6u4Bxu9we1arTWJ08jXv09U+hJp+nSWlxLPJetOJFA+YenQ5zSlO62MKtVTSSjaxq+H5Fmt9yfc81wp9RuOKmegqsXGWvZGrcRmWRYl6uQB+NTBOTSMpaI6KAquq+SvSO2HHp83/1q9faVvI5OhfqhFLUtKg1OMCQski/dkQ4I/xFROCkNSaOVmt7rSpWikDFcnDbeDXHLB9mbqv5GTqdvFqSbJlRh2OcFfoahYepHY1p4nkd0zGHhg7tq3rrEeq7hWnJU7HR/aC7K50NgkdjAkMbKqIMADms3hqknrY5ZV1J3Zr6Wk91fo8cZIXqzA7R71tQwzhK7ZlUq8ysdTDbrEzP96R8bmx1x0H0rr6mJLTAKAEZVdSrKGB7EZoAqSaRp8v37SP8Bj+VKwEP/CO6Xuz9m/De3+NFkBNHpGnxfctU/Hn+dFkBbRFjXaihR6AYpgLQAUAA/9k=</field>
+        </record>
+
+        <record id="coca_zero_1l" model="product.product">
+          <field name="list_price">1.49</field>
+          <field name="name">Coca-Cola Zero 1L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAJAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGH4y11/Dfhu41OKNJJYyqorg7clgOcc96Bo8+0z4q6vPqTRXFvaGAMoAELqxBYA87vQntTFc9dpAFABQBl+I9Li1nRpbCZQySleCeDhge30oGjl4Ph3ptvdySeTEP3iElQwPDg+p9KQHeUxBQAUAQTyL5iIT0OTQNEMkm4sRwDQBbicSRhh+NAmOoAp6rqdrpGnTX15KIoIVyzGgaMPTPE+k6tp8+p212ZIIf8AWOY2AXjPcehFIZnj4k+EXOF1mEn3BH86AL2i+N9A1DUUsbXUYpJJ/wDVrnkmmJnVUCPNfjlNLH4NiRHYLJcqHA7jHegZ5OnjbVbPw5LokDRJazpsfCfMRjb1+gFLdFzjynLo2x1b+6c8jNCMztLrxUdd8Q6Pc22lxWE1s6orQcAjdleABjGTWnQEfSw6CoA86+NcAn8IwLkg/akH50m7K5rRp+0qKPdniFxZwyhdrhABzgjj6/nWKqNLY9itgaVRq0ktPLy318yulmExhPMZhkbj09KandmEcEoLRcza69O33/8AAN/QIFj8SaWojAJnXJUn26VpTle5jj6EaSjaKTfb+tj6dFUeecD8WbQahodtafa4bUtNuWSZtqggZAzQXBuLTR5Va6Rb6elx/bSpOjNHsMFyhBXPzdHHbHUflU8sbI6JV6yvZuzIrg+HvKmW1VlkKYhIn3ENlsZOccfu+x43d8GmoRI+t1l9p9Pw2NHwpozzaxZXrX0cpiuEVUWJ2y3XGSoXpk9e1WklsZ1a9Ss05O9j6HHSpMzzT4xtMdHsligScecxZH6HimhniVwLt5GSFJQVPKqT8tTZWNpVqieknYW0vNbQokFxeKqHgK7ADPWmjGTcndnYeGr/AFeHV7W0O+SOS9SZ5JPvMR8uc59Ksk+hx0qBnCfE+AtoEcmP9XMP1BoGeNgBZXP940ASR43CmhHV+DoBdeJ7BCMgShj+HNDA9wpAcb8UbiC08HzSzttBkUD3OaENHhB1S0DFixAPQ4oBiwarZmVR5pGT3U00I774ZXtpdeMYY0clljdhlSM8e9NrQD2qpA8s+Nsc93Z6dZxzbELNIVI4Y8CmnYaPIdjW+mXFl/ZsUskhG25JO6PnPHbnpQxt6WKljaXkV3DOkCsY3DgORg4PektyT0nSNSvNa+J1lrC2kdm0siLIiPuDAfL+oAqnsB7nUgcF8VtJlvNMtLyJSfs7Mr47BsYP6frUVJcqubUIKcrM8jnjaMYdSDinCakromrTcJWZQN2I7sQMh+YcNjjNURY9C+F+nve+I47hsmO1QyH69B+p/SgGezUCGyxJNG0cqB0YYKkZBpPUE7GBqXgXw/qmwy2flFOhgOzP1xQkkNtsqv8ADPwrIqrJYOwU5A89+D+dO4JtG3pOhaZocJi061WBW+8QSS31JouI0KAA/9k=</field>
+        </record>
+        <record id="coca_zero_2l" model="product.product">
+          <field name="list_price">2.38</field>
+          <field name="name">Coca-Cola Zero 2L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHD/ABJ1/VtFSyXS7gweaJC5CBt2NuByD69qQ0QfDXxJrGuSXEeqXDThYg6koF2nOOw/nQDO/piCgChqWjWerMovIVlRVIAYZ64/woAZpeg2OjOfsMKxIU27QMd8/wCfpQBpUAcn4h8SXFrryabazCFIoRLPJsDHk8KM/T9aLXGjltd8Ya7p0TXVpqCSw5+YSAZXJ7YxxUuI0yHw3481jWLh1nvkRIwDiPGT+eeKFEG0ddofiK7k8SLpt3MJorqFpIH2BSrJjKnHB4Oenaq2EznvEjf8VdrR9I7ZR/3wT/WhAcb4qlzosq9uP50MDC8DzGPWJADwYj/MUIGeoaPKf+Ep0F+5nmX8DC3+FDAh8XTLb+LtWDZ/eRW7DA6fKR/Si4WucN4luopdKkRXyxIwPxoYGV4NilbV5AqMxWFmO0ZwBgk0kB6X4dmE/irQAobHmzMCRjOImoYWIfG8yp8QrmM4Ia0jYg+2f6VM9jXD/GjitXtIpYliBIZskMDnI/r/AJ/DJ1WmdtHBQqJLv1/r+vLtQ8KXf2PV5jnAktZoyfqh/wAK3PN6npXh3VrfUvG/hyG2QgWttKrsRjc3lkZxQDMv4oP9m8fpI5AV7VFyTwAdw/nUzvY1oNc6ucZLO3zozBMP/wAtFyP/ANf9Kylq7npYe8Itba9V/wAPr+nYtWukafFpdvdCdjdTJkfvVIbO4Mvl43DAGdx4rc8jqbfwtfzfHdif7sUo/wDHD/jQDJvjGf8AirR/17oP50AcdcM6oG2CVSw27vlI9OnUD9K5lZ+R7knKKWnNrpfR+W26X4HRWAhvNH0eJLtGn82NGRYk3qpccE7dwXBbnOCT711Hhsm+EXzeOLf2hlP/AI7SAtfF9FfxtGhX71onfGTlsf0qZOyNKMVKaTOLuHMduHRWzuALbu+COR61kld6nqubgk4p77362a1XfuanhPW9Uur23tAI5be0j3eW2FwFPB3YJHJB9631PIiot6ux0/wrsIYPFsEsU4mbypg7ICUXgcbuhPsM/Wkk+o5uFrRTKPxnYp42X0NpH/NqZBwkl8GQmWFXcYw+cH8fWo5LbM7I4taOUE2uv+fct6Frkek2t2qQM9xcIUEm7AUEf/Xq0cb1Oy+DlxI/jFYA58pLaVwvbJ2gn+VACfGyNk8ZQORw9khB/wCBMKAR5zKPlNADIhg0DZ6Z8EoC/i+5lx8sVk2T7l0H+NAmd18S/BL+KIbS8tQTcWu5Cg/jU/4EfqayxE5wjeKv5GtBU5StN2PD9d0S80K+lsb6FopVwVDDG5T0NXCXNFO1iJJJtLUW98M6rpemWWoXVo6QXqb4nwcY7Z9MjkD05qmwSbPY/g34cl0vQp9Vuoykt+w8sMMERrnB/Ek/gBQhSPRqZJka34U0PxFLFNqunpcyQjCOWZSBnOOCMj6+9JoLmnJbQSwCCSCN4gABGygqMdOKAJAABgDAFMAA/9k=</field>
+        </record>
+        <record id="coca_zero_50cl" model="product.product">
+          <field name="list_price">0.97</field>
+          <field name="name">Coca-Cola Zero 50cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHkfjnxxr+meIr2zs7420FuyhQsad1B6kE9aQy38PfGWuaxr0NpfXjXNvLG5+aNRggZzkAUXA9RpiCgDm9a8H6dqs9xcyogeTbk7cnI79ahq7GmS6H4VsdHninhVd6xsoIBHU/WiKswbN+rEIxCgk0gIJSfLGe5qRiITsBB+6aALKkMAR0NWI4f4jX8h+xaXE5Uyt5j4PboP60DRwHxLWbR5rK2gu5gTCC2JCOaTQIT4debqwvIJ7qUuIyU3OTzjNCQM9K+Ht88unXGnysWa0k+XP90//XoQM5f4oXElr4mtGjBJaFce3JzQ3YqEHN2R514r1OfUb0PcMzMg2jPai9wacXYm8G3lxp97I8IO5kxjqfyyKXOkafVqjS0/r0PT/hjO82paizIwyg5IwMg007mUk07MzPixMIfEFoT18lccf7VTONzfC1VTbb7HGarpOpX3lT21hLJG6hsoMjkkL07ZH6Gs1Bo71jqVkvv/AE+V7f1ch0e0fTrrdfQSQ+amULA8jvj9Pz96coy6EKvhnq73+fXc9S+GFxJLbGFoQiRI5RwwJfLjt2xitUeZLcp/EbUoYNcitLnT7a8haND++3AocnkMpyKYkcJ4h8QXdiyW1o8aQBV2rHIXAxyOvpmkyo8vW4eEr+fUr7/SfIkWCPCCbBwMdAGBHYdu1CuOXJbRP+vkemeAbn7ZrOoSmOOPEKLtRVAOCeflUD9KOpDMz4sWgW8srsD/AFiFCfcH/wCvTBHmeoRI5AkANDGR6bH9kn82Esp54zxSA9f+FVs32K9vX5MjqgP0yT/MUCY74sgf2TZHv5xAwM9hTBHkHiAtBKACCMDBHfikxoNFElysmRnAzkD39qBnuXw3jVPCaEdWmcn9KETLcxPivcBjp9mp+YFpD9Mgf0NMEeXeLoXhnjV23EjOaTGi14Mt/PtrpSAQuDzj39TjtQgZ658NbgNoU9t/FBOePYj/AOsaEJnKfEa42eM4TIGaOMRg4PIHX+tMEcN40vIr3U8W4OxRx1oYIn8B3qWd9NFMSgkQjJB9P160IGelfDCUy3mpsmREduM+uTS6gzM+K+mzRarBqKKxhmiCMQOA6/8A1jUSlaSNYQUoPujzO5kLMzhdzY4HrVtmaQlrKwYORtbkEUkxtHtHwq02e20e4vZ0ZBcuojDDGVGeR9ScfhQtRSsjunRZFKuoZT1BGQaokyrXwroFjeC8tdJtYp15V1jHy/T0/CkAtz4W0G7vDeXGkWks7HLO0QJY+p9aLAaoAVQqgAAYAHamAP/Z</field>
+        </record>
+        <record id="coca_zero_33cl" model="product.product">
+          <field name="list_price">0.51</field>
+          <field name="name">Coca-Cola Zero 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZWYKCzHAAyaAIBeRvnZzjr7fj0oAr3F/5S7jKiD3oGVBrWZCgcuQM4C9R+VAWLNvq0czBQykn0oCxZa+iTG/K56e/9KBFhWDAMDkEZBoQGdr2qQaVpkkszAFgVUH6cn6Af4d6TGkc3aatNLZI88EtszjIaHEi4+hwQaAsQzTwbt76gBjk+YjJTugsyouuaTDLltcsQB/AZUx+WKLhYsxatY3Z3W+pRyY4zAGf+VK6CzL9/JdWdswjgeeUIWUzMET8QMk0Aa3hXW4te0GC6QBZFHlzRj+B14I/qPrTQNHF+OpGvPG9rprz+XCIEdgxwuNxz/L8cD0pAbbKuwKvQDjFJspK5RvtgtJCxwMHqKTBHiGrXCS6lK0eCu7g+tUtiWepfD5vM0NGwo+Yjil1K6HoN3iewt5+uBsf60yTkPBJfTvH1/p0FwsltPCZmVeVDAjBz64PSi+o7O1zU1fTlvvGt4SMMLKFVYsQACZM8Dg9B1p23BOzTPJ9P1e/s9RligupIf3hIRGO3GeQBWNW9rnZgeRzs0n/l1Rcg8Ta1LMbe4vhNFIr7T5ag8fQDmiUvduKlQi61nqtdvL9TkpbFpGZ4380MeGHr6Edqaq99DSWXtq8HzLo1+TXQ0fD+u6vphktrO8aBACxTYrc8eoNaPU4GmnZnQp4h1C+8O3cV5fTSYuIjy3A3Buw91qZJ20NKLiprm8/y0/E6z4fRRR+LVxOjStYbzGoyQPk5Y+p9KIxs7l1aylBRS679yfxhrS6T4/QODh7JXVgDwQX9COtWc551MkP2q4uoYzhmCxq3Ue/171jO7aR3YZwp0pzer2Xq+v4FWSeOW4C7/LnQDPYOfX2NTJOK7o2o1IV3vyy/B+fkymGVLvEytDLn76D5ZKlq8dNV+R1QkoVvfTjLutpFazk26qSGJDMRkjBOa6EvdR41d3qyd76m9bxhba8jPQhHH4Nj/wBmouZ2Ox+Fg3eN7o/3dPH846YdCD4tyiDxraSEcfYwpP1LD+tAjmIZo0tZmcKduG+Yf5/yayn8SOzDpSpyXp/X9dzDlVUuRJMMLJn7wztP9e1VdtaCjTjTqJy2ffp/mK8t1CyRRknI+VsZVj/SskoS1Z6LqYik1CPye6f+X3/cXfDmlW159s1bWLiSCzsmXzPKXLu7HhR6V0JKx41SUnNuW9zo9Y061trZL7TmlezurZXXzB8y5YcH8jSaJNf4QyifxfqDZ6WeB+DIP6U0LoU/jST/AMJZajt9iX/0NqYdDz2C6kglDbiyjqpPBFTOKkrG2HrujUUl/wAOi3Jboji4jBeAggjGTH+FZc7as9/zO94aMJKpG7h97j8vIredLbusccyFX+46j5SfQjtRyqWrQ41alGSjGS12a2+a6HS+CP7U+xavLa28V/goJrGaEsspz1B6Ajnito2toeXVcnNuW99SfV59Zzc/2zAlrNLCpgt1IAjjVX6KCcAEd6ZJs/BMA+JL89/sZ/8AQ1pdQ6EXxqGPFVqf+nNf/QmoDoebGmBqSLcRSebFNuAUBwR044yP61ze7JWaPZar0p88JXVlf7uq/UpyX8KSbpLJRKOcjHX1qlSlb4tCJY6lGV5UlzI6r4f20k8l1d3F1dx27XMULQWsrR73c4BYgg7R/WtoqyPMqycptvdsTVdOS3v4iHnM82lSzSrNIXKnDY68gEY4pkG78ER/xUOoH/p0/wDZxR1BjPjWP+KktD/06L/6E1IDzNjimBplkiEUbzkNj5JQMYHofUVzNN3aXyPZjKNNxjKdnbSXl5912I5I1m1SMMyNsTJ2+o9aE3Gm/U0lTjVxcbtO0enkb3ge01JbXUL3Ttai0+ZJFiImCmKYnOASehz0OO9dK2PDmrSaZq32lz2uqzTXrvJeSaM0lyzNuzISRxjgDC8AUMRf+CA/4nmon/p1H/oQo6h0Ifjb/wAjLZj/AKdB/wChNS6js7XPOkiieB3kLAqcZHb0qZSadjopUqcqUpSvoy7shW2EUwLoceWSRk5HY/0rK8m7o71GkqahNNrp3+X+RReaJbnbBv8A9UyEt1Jxx/SrUXy69zB1qaq2p3+BrXfYjt7+6isJbFJSLeZw8keB8xHQ+tannHXeG2mfw3q13cSySBbdoYt7E7VCk4Gegy1AHSfA/wD5DGpn/p3X/wBCo6g9jT+KWnQX2v2yPKkM72oWHzuElwzZXPYjI/OplG+xtRrez3V0zyRiLHUZYZVygZo5F696Uotx8zTD14U6jurxejXl/wAAllVrSLa6faLRuVPdayT53poztnF4ePLJc9N7PsUJ5Ypr2JoEYEFRz1JrSMWou5y1atOpXi6afQYIgLpotwUByuT25q7+7c55U0qrjfrY7O0h1JNDOmW1quxwA7NwXLN7njrUJyfQ1lToQXxXZ3Pwp05LPVL/AMuaOUpAiyiLlY2LEhd3c4GaqMbGVaqp7KyWx3ev+HtN8SaebLUofMTOUZThoz6g1TRknY8g8SfB7ULBmk06+huICcqJgUYexOMfypXaDRnKPo2vaTmN7Myp3EbBx+hqJ04yOzC46rh1Zarsyu8d0h3R6NKkh6N5Z4/So9k3vLQ6XmNKOsKSUi94X0TVf7VE72xiQqys0zbM5GPX3rY8ttt3Z6XD4CudftFS6vjBG0geaRMsz9flHbHPv9KLti0O70LQdO8O6ctjpsHlRA5Yk5Zz6k9zTSBu5o0xAQCMHmgCjc6Jpd5n7RYQPn/YApWQ7soHwT4bLbjpUWf95v8AGlyoLsv2uh6VZY+zWEEeO4QE/rT5UF2XgAOlMQUAAP/Z</field>
+        </record>
+        <record id="coca_zero_decaf_33cl" model="product.product">
+          <field name="list_price">0.67</field>
+          <field name="name">Coca-Cola Zero Decaf 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAGgAFIBpdV6sKLgQSahbRfek/IUXHYYmqW0jYUt/3zRcLFoSowyDRcQoZScBgT6UALQAUAGaAA0AFMAoADSYFDXNRh0rRbq8nk8tY4zgjqWPAA9ycUMaOfi8WWiwIszC3fA3eahGBjscEZqITUldFOLTHXevaVNCWt9ZjWTOcOQVx6cEVV0IyI9biNw32rULN4jxt8xiCPdd2DRoBpQeItMi+dNSt044SJMA/qaQDLzxXZ201leytIIJLhYTIq7VTPUnPbHtS5lew7aHa9elWQFABQAUAFMAoAKAPPfHV7Nc6/DYMpa1tI1mEKgkyynIGfYD+ZrnruT91bv8ApmlOy1ZkXwVVweT3PqauKUVZDepjaqI4beUTBVKr0amncTPPGlQ3JbaNu7pWhB6XoEMRs4yEUZHpWbZaOiuNLTWdCu9L4EsqboD6SLyPz6VlVfLaXb8hpdDZ+GesXereF/Lvg3n2MptmLdSAARn3GcfhW6M2dfimIKYAaTAKYBQAUAeTfES3+3+NrfT1IDziIAk4xncBWdr1F/XYr7JzOvfaPDptpY7i5aGSUKVcluAMsp3DIPK4+p54qpx00GmrGf4lv7q8tLdt8UhMRUhV++gPysPXgge2PY1y4eVm0+5c1oY7aVbu6CCRt7IG8snBOR1Unhh7VX1iSvddf6uLkROuqa1pBNuLgqUxtO0Hjt1raEozV0S7xdixpet6ld6zafab6Z1EyEruwOvoKVWK5JegRfvI9a+EH/Iv6ifXUZP/AEFauJLO+qhBQAGkwCmAUAFAHlPjmeOy+JNndydI7dGyegwTg/mazbfMUloYHiq7XXo9Ptbq5iV/PBQoBl95A6Z+pz06VPNUjBuVtB2i2rHO3msWxuJ4PsqmwRgI1ThoyON6nseKxhQlyp397+tC3NXt0IEQSKpttt9b5y0edrxn1Hof8is5Oz191/gylrtqR6wD/aLgo65Vcb2yTxW+F/h/Mip8Q7RbKZ7wyjCCJDMC+RuAOOPXmtKk1FK/V2JirnsnwiXHhu/PrqMv/oK1UBSO8qyQoADSYBTAKACgDx34psB4xiUkg/Yhx2+8azfxFrY85gkS21SGaRdyxShiPUA0TTlBpdhJ2Zqa9bxKlx58kYdk8yJ8YLjqCMcMp/MH2FcuHm7K3o/66W+5ms0ihEZLmBeTDP8ALuWYkKwA42n+GiVoy7ry/rUFqja0DSUfWLvzYxqMsNuZYYZHz5jcYB9cZPHeujDyU4XtYzqKzL+pr5OomX7LBayjTx9phjGUicsTgDPykgZ/HvSr2vFeYQ2Z6B8IufCl0397UJT+i1rDYmR3VUIKAA0mAUwCgAoA8b+Lpx4lXB5FirfTDGsZaTLWx5uQZCrn+LrWgjahmhufD81pqhQwQsBDIG/eQlvbuv8An6cdWEo1VKG737P/AIJrFpxszMnsrho1eGNJ5VACXELD516YYHg8Uo1Y3s3Zdn+gcrtobvhuyso9RuLW43q8sP7vyELvHIQPu46Y559K6cPPnjczmrMrajYWNrfXPkx3koFoXL3i7W8zcRuGByPc9806racbPqEFdM9a+Eq7fCc4/wCn6X/2Wqp/CKW529WSFAAaTAKYBQAUAePfFlN3ibGOmmk/q1c9V2kvVGkNjzBJWSMAelb2IubOlSW1xpN7ZTQxzzOQ6I5wxAHOw9mHp3rkxKkpRkm1/XXyNadmmjGuofs1v59ldPGwcI0YyjH6j1/nRCXNK0o3/ETVlozpfB91DpGoXSXkkqfuwJLlFL7GypOcc4PTNdFKakromSsWvE08dxK0sSN9n+xYgdiA0gLMd2OuMlhj25FTWfvR9Qhsz0/4XLs8MTj/AKfpf6U6LvBBPc7KtSAoADSYBTAKACgDyP4o4bxPODnjSCfb7zVy4j4o/wCJGtPZ+h5jDZyTCNYlLu+AqqMkn0rocrakWua+nxXcdhe6dNbzQeZjExiJCNjgN7HqD2NcuIcW4zTTt0uaQTV0Zc51BLaP7aUKRTJmTIPmDPXP+etRH2bl7vVP5DfNbU19F186dfancLH+9lUwx/KCMgj734CunDrkpr0M56sk1LWBq1wFMEVsPsohMSybUJ3Egqvf73TtSra2fYcOqPXvhr/yLlwfW+m/mKeH/hr0FU+I66tiAoADSYBTAKACgDyb4ort127lP/QLVR+LSVyYjWpBeZtT+F+h5zptw9pPbzrgmMqwB745recVKLT6kJ2dze1VhZwNcSb7jTLhQ0EvVrZh0H4cjHt7VwwTl7u0lv5/8ObPTXp+Rx+o20YsRKt7HMQ+FCnG4epHrXRSm+e3K0ZyStuWoR8/mYx5oEn4kAn9c1rT+G3YT3LFpD9o16yTqA24/hz/AEqcRLlpS9AgryR7h8Mm3eGJm9b2b/0KqoK1Negp/EdfWpAUABpMApgFABSA8n+MG6C580qcT2qRqfUhzkfkf1rmnG9aJrF+4zzaADYn+6K6GQjQt9Ru7ayuoIoGu7ZlzLDtyB7+1c9ajCbTbs+5cJNGK8OiysXYXEBH3otp/wADS5q600Zappq9mWZfOkRbn7K8NuT5cW4Y4ArSlZK17szlqanh6DN7JdvwsUe0E+p/+sD+dYY2XuJd2aUVrc9e+Fsci+CopZFKieeWRc9wWPP6V1wVkYy3OwqyQoADSYBTAKACkBQ1jRNO1+way1K2WeI8jPBU+oPY0mkxp2PIde+GWqaXcyNp6yXNrnMbAByB6EDFK9txmFff25seK4hi3HqWtQp79wKUrSQK6MaK0vYZzL5Fm5IxteEsOuc4I604pIblI2tOtvENywSzhIJ7W9oAfw44qZRg3qgTkj0Lwh8Prgg3fiDewZzIIGb5nY93x9OlT7CMnew+dpHoqosaKiKFVRgADAArYzHChAFMANJgFMAoADQAUAFADJIYpeJIkcf7Sg0mkFyEafYg5Fnbg+vlL/hS5V2HdlhVVFwqhQOwGKaVhC0ABoYBTAKAA0mAAP/Z</field>
+        </record>
+
+        <record id="coca_light_lemon_2l" model="product.product">
+          <field name="list_price">2.83</field>
+          <field name="name">Coca-Cola Light Lemon 2L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGTq8kgkCpLImAD8jlf5V4ObYmvSn7kmlY6KMYtalvTXZ7c7nZ8Hqxya7csq1KlNubvqZ1Uk9B98s726C3Lh/OiJ2kA7RIpbr225z7dK7p81tO6/PX8CqDgpPmtblf32dvxsWCcVRiV2sreSdp5IUZ2UL8yg8D/9dFkO4Q28Vl5jRR4WRtxCr0PTt2oWgblgEEAg5BpiOKn8cxxa/qNrMZY7azlEKtEisWYKC2c+hJHFFhi3fxL0CwVTcXsyhuBugJ/kKTuGg+x+Iug6jGz219PJg4wsGOfxFCQMveGfEq6xqWoWPllfsoSSNioXerZ7AnoR+tMGeXXcrPqerOTy2pXBP/fZprYTOW8XOTHAP9o0mNEvgyQrHOP9ofyoQM9O+H7/APFW3fvp65x/10/+vQwK8Xgm71cX95Y3EQD39xmOUkEESEHkCs4zldq2zBo4/wAa+DdUsYLd7l7aNGdlVvNyCR1HSiVRr7LGokvgPwZqep288tpLavGrhWbzCMHGfSnGbf2X+H+YSVj0nwxoQ8P+I53uruNpXs0QheFXMmAMnqScD8qXO+azGoOWyuafgw5sdRH93VLkf+RDVRVmyWcP8SxJKsRVnNu92+13PBZRhvfHbP8As+3MX3O+jBSlG9rpbf1/X6XPg3I40zUolGEEiMDjuQQf5U4t3YsbTpx5XH+v1Or02Tf421FM/cs4u+erN/hU017zZxPYr+Bpw7a7BnmPVpzj2LVr1JZyPj+eRL2O2d2/0WZpAAecMcgj29f8kyna6OyMFJxklf8Arb/Ib8O9Q/sbT7wPHGJJWjaMyBiXHPy/KCfccHv+Cgi8dPmtq3+h03hi5XU/GGszHgCC2PyMR3Zhzwce3fvRCFm79X/kcanbYoWV2PDur6nIZdyXN7M5IHQ5Bx+tTGd6jXkvzZLWhiX10NYikvLiAvFJOyxtvwykAdPf+fv0pzO3C3SaT/D8/wCv8ynJNbadGIhNLJ9qgVlEiD5MHcBjH9D1pwJxcpO10lq9jpPhr51zf6tMZdjsttllXqFL8YPqBj8ap3bOaLS3V/8Ahv03MzWIykd8T/y01K6K/wDfeP6VzUpXxM/JJfmwkvdRHZxeT4fsyY4FJd1eSU7kIPO1wcbT0xz/ADxW0mdtKNur2T0/T9RdW0O3m0VLlRHIV8tt8YwNpUqMenI/WqgkYYmcpaO+jZ0fw7t2gW/eFFO7yVwzYGOST0PY59/brUqX7xryX5sxSVtfM4nW/F8CeIdR0y9tW2W1/MEkhwSQXJ5BI/PNRCj7OcpR15t7ibukjRvPFvh2SKJ7O5ntJljEbB4N6SqBwGXv9etU+Zvb8jelWUVaWq/FegyPxvpI066iu2knaWMRoltBsRAucY3H1NOPP2/r8Sa04S0jf57m18LvEX9qJq0iWjrDFJbxoqfM/wAxZdx9hwT6AHrSjBxk5PVuxEY8+l0tHv5K/wCOy8zyzxSSnxA1gNxm9m/9CNaogpTdqYADiFz7GgD1D4GBYdL1aeRlRHnijDMcAnkAfUlgPxpN2GouWyuct8V9AubLxvcXsUZ8m7RZ0IHGcAN+oz+IqJVFFpPqXCm5xbXQ5D7UjqNx2sOqnrmtDMqy3krsY9u1T+dK40j6F+E2jPpPga3eVNst85uWB64OAv8A46AfxoJZ11zZ2t4oW6toZ1XoJUDAfnQ4p7oabWx5PqfgrRZPizDAYnFvcP58kIICE7SxGMdCR09zR1Dod3qvw/8ADGs38d9eaZH5yEEmMlBJ7MB1osF2b0lrBLAkLRjy0ZGVRwAVIZenoQKGkyoVJQd12a+9Wf4M/9k=</field>
+        </record>
+        <record id="coca_light_lemon_50cl" model="product.product">
+          <field name="list_price">1.16</field>
+          <field name="name">Coca-Cola Light Lemon 50cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGRrOrTWEqRQqvzLklhnvXlZlmFTDyUYpbHRQoxmrsTTdVnuCol2ncQOBiuTC5vVqVIqSWrSNKmHildGxX0BxhQBj61pEmpTxuk5jCqQR6+n9a48VhIVmm0a06jgitpeiXFo8UhvCyCTLL7Y47etYUMtpU2mlsy513JWOhr0znDpQBXZ9244PFRuxiRFthUduaALCMGUEVSEcz4/1h9K8PlYZCk1w2wMpwQOpx+n50MaPHbnXNXWCQJqd4vynGJ2/wAaSKLXgPVtX1PWDaTateMHXADTsefzpoTPSfAmo3K6hfaTeTPKyHzEMjEn0I5/CgTJPiJolxrFvZi3ljQxF8iQnnOOmAfSpqScVsVCN2cJffDvWoLOaZ5bMIiFmPmkYAHPUVn7V/yv8P8AMrkuyj4V8E61DPa6nBcW0aTAGMszDdz24HP401V1+F/h/mU6L8j0Twx4Z1XTPEzXt/LAwaJhhGJJJq1Jt7NfcZO1jo9atTdtbxZx8xJwcH+RoqaoqnPldzlb8QJYzM06ZUsSuc5AGEI+Uccnr7HPFZqLOj6xH8P+H6lnwZaX7aRpMxnjFuIVwNx3BcA4xjuevPTHpTs+YU6lJxdkdWGzqBAYHC9NuMf41ok7nL0Oc8deII9CaxZo5GZy5BRgCMY9etc+KozqJOLs0XSkle5zc3xK01rGZJtOkZmjKh9ikjg46t70owr2tLlf3ob5L6XKnhr4iaSYLSyYahE8KgFg6rHx6DJ49qiOHqrq/wDwL/gFOa/pHZ6D4ws9c1n7FbxzbkjZt8hHPPt9a6KUZx0evz/4CM5WMz4sWfm6Ja3YHMMpUn2Yf/WrVijueP3XMftSQ2QWigv8vWmB6h8I7Itf3t4w4jjCD6k//WpIUjqviOFPg65LfwupH1zTYo7nhlyCYGx6ZpIpkGjq00r4x8o5ycZoA9n+E0YXRrx8ctMAfwH/ANemhSLXxRuBD4T8vPMs6jHsAT/hQxLc8WuDiEn0FJFFnwXE0s9z0xs/WmhM9V+FkuLfUrcnlZFb8wf8KEJmf8YbpgNOtR0+dz+goYI8suHU27/MPunvSGXvA+o21jPcm5coGjIBA/z/ACpoGegfDO/WTxLdxxnKTQFvxBH/ANejqD2J/jNYyvY2GoRqSkTNHIR2zgj+RpSCJ4+shYsCOBSTKkrD1fy0O0dTim3YUVc9N+DVjLJqF7qLKfKji8oHsWJz/IfrQtQkesTQxXETQzxJLG4wyOoYEe4NUQUJvDmiT2L2T6VaC3kILRpCFBI6HjHNKw7sjs/CugWFu9vbaTarFIwZ1aMPuI6Z3Z96LBdmjbWtvZwiG1gigiHRIkCqPwFMQAD/2Q==</field>
+        </record>
+        <record id="coca_light_lemon_33cl" model="product.product">
+          <field name="list_price">0.53</field>
+          <field name="name">Coca-Cola Light Lemon 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZWYKpY9AMmmBFFcLMm9SFHuaVwGXF0kEZYzRAj1P8A9ehsDMbWboOQYiqg43PGcGi4y/Z6jHc5Tz4PMHVVbP8AWhMRJcXgtmAdSwPUr2ouBYVg6Bl6MMimAL0/E1lRacfm/wA2NlPVr1bGxd/42+VB70601CDY4q7OQt9VvI22CYlPQqG/nXmwxNRdTZwRFqOsSqCB5UoIwQ8WP61csbNdhKmjMTWpYzlLWBMf3MqP0NR/aEuyD2SNLTdUdgcpBHnnCxZz+taRxsn0QvZonm1m934WbA/2VAqJYqo+o1BHXaReC80+N8jco2sK9CjU54JmUlZlxOn4n+dLD/A/8Uv/AEp+b/rothM5jxGzyamIeoWMEe2Sc/yrPE4eVVaOxcJ8pjwwQvqP2QXMYlwcqSRggZx07g/pXGsHUWl0dG8Oaxn6hAUuDEGEj4yAh3cevFclbDYm+kfxQlKNrlIW0h4ET/8AfBrD6vi/5GHNHuXrK2cKzvhET7zOdoH510UsPiesfyE5x7l29t1s2jWWSMNINyqp3Ej14FazoVE0nZX/AK6CUkbHheZvtWwE7GQnBrswUJRvfzX3GdRpnUr0/E/zrpw7vF/4n+b/AK/y2M2czrg/4nf/AGxX+ZrURzd95UGqPcNMVACSybOWjxld+O4wcH8DWc7JnbQUpU2reXr1t/kZmrKJPs95JI6LGCDPbnJjyRiQf3lPQjt/NS3uXQ0TiuvR/l6jLO9v7bUreF41uYrlv9fAco4/vY7Ed/8AJoTaYVKVOUG72a6M09WX/SrZScK3B7d/Wr6nGkuW5o69u+22vlNJGwt0zhj843cLx+NcuJlapG3/AA+uwQ2Zo+GBi+jBGD5PTHTpW9FWv6smR1g4H4mqppJad3+Ymc3rn/IVXj/lmOfxNVrcOhnaPb27alq0kjxvPIFQISCQgQHp7k81KS5mb1JS9lBLb9bnOalp8mjmKTTriMo2XNnM3GCedpPQH0P+FTJcr0OilVVVe+vmv1Mi1bTX12ykht7y0d5ATDjCg9iPb19jUq10bzVRUZJtPTc6vUI0eSAvu+VlOCBt+937/lWvU8v7PzJdeCNqFqjAFI4FKiQEhckjqvfge3Fctd/vYptfP+tRx+Fmp4X5vEJJJ8jv+FdUVqyGdWOBThGy+b/MRzWvAjVlbsYgP1NPqBkQ/u9Xmt2XP2lRLEAdpYgYO09mHX3DGofxHVHWkn20/ryZR8QJOtrbslwLe+SEB4yRiRO4JGQvse2TzSlcqjy3ateNzMsddjjv7ayW0mg807GhYZVD2Kn0/Tv9Upal1MM3Byunbr/maV3qrWM8w1CyAtl2NFcBS6HBztfAyuencVocXQfrMx1TUIJraGZ4kjA/1fCnrn24I/L8a466lOrG19N/62LjZRZv+GQVvyCMEQ8j8q7I7mbOpppWEc34gAGpIfVB/M0r62Ay9VhtrjTHM0rQSQASxTKCTGQcZ47c81M0mjowspRnor30sczfatctPHDeyjT9UtgUErDMM6+/p9ajmfXc640Y2vFc0X96JxeQRtbxeZEPtxMUsMUgYAkH5lx0Gf5jvTTsc7pSkpaPTr+hVuI76zufIuruW1gK4iuIhvgAOc+ZH2B49gc4OOBZzHV2Ess+nPLLKJd00gWQfxqrFQfx25piZoeHP+QlJ/1zP8xSi9WDOmqxHL+Ih/xN0O7/AJZAY/E0mBm3Ms7aRdT27NG8a43Bd3y7gScd8DJx3FRJux0UUudJnN6nq8Luket2sRjdeHQZSQf342HT3H/6qlu+50woyTbpt/qvJomtdH0bTbiK6hG+RziLc+R0zkfhk0KMUZTxNapFp/Mj1OUy3bajbtP+4j8rzrU7miYEnDp/EpyPpirOU3dLnuFt5LC7hSOaA7spwGDEt93+Hr0/yGJm14Z5v5j/ANM/6is6TvOfr+iHLZHS1sScr4k/5C6Yznyh/M0mBSgluI9HupbX5pUYnaq5OAfmwD1OM9e9S72djeKi5pM4/V9NuG0oS2M9vNaz/NJEP9XG2fvLnlfcdvpWbTtod1OtH2tpJpr7/R9yvJaTPr9pY7CFW0w4jbAi3AgkH24p/aRl7rw83feRZkRbdympLPayBCsV9AGK9OhIzw3TDZIPTI6WcKOsjk33NwBJKyqkWFkPIyv+fxzTEavhj/j9m/65/wBa58O7zqf4v0RU9kdIrbhnGOSP1rWjVdSLbVtWvubV/na5LVjl/Eg/4m8f/XMfzNaMRlQz36yah9mmJ8gKxhCgtt+U5TPGSN457gVDb1OqMYWjdb9f8/wOXn05roS3dlqEltbXjkZAGw54wyj7pJz+fbpUJX2Op1VFqMo3a/rTv/W5qQ2q2uowfMWY2vlbz1O0j/E1drM4pTcoP/Ff7zfsI1kYKwyMg/iDkVRiWLyCKN5JUjAeTG9u7Y6UAT+GP+Pyb/rn/WuHLpc8Zy7yZpWVrLyOkr0DI5TxJxrMfvEP5mpY0Z19b3kIj1fTU33FspWSH/ntH3H1HUVMk1qjpw8oNOE9n+DOdubLTfEJln0q+eykn5uLcdCfdcj8xxU2UtjpdWph2lOPNbZ/8Eu3TLaSabE8m+XzQgJ6t8hBP9ap6WOSEXNTdtLfqdJpq/OKowLGpEKhPtWGJqezpSl5FQV5JB4ZP+nTj0jH8658qVqHzLr/ABHS16JiU9R0uDUUAkG10+646ik1cDn3uJdIlMVzDIB0DqMq3uKnYZy2taLpOq3LXUUxtbgnJaMYyfUj/DFQ4pnZRxtSmrbrzINL0G2sLwXc2oG6mUYRpDwtCVgr4x1I8qSSOkttSt7c5aYN7KtVc47FlHl1udYbdHCA/M7DAFc+Jw7rxUb2RcJqLudJp+mwadGyxAln++56mt6NGNKCiuhMpOTuW61JCgBGRXUq6hlPUEZFAFOXRdNm+/Zxf8BG3+VKyC5X/wCEZ0jdn7J+G9v8aOVDuTxaJpkP3LOP/gXzfzoshXLqIkahURVUdAowKYC0AFAAAP/Z</field>
+        </record>
+
+        <record id="pepsi_2l" model="product.product">
+          <field name="list_price">1.70</field>
+          <field name="name">Pepsi 2L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHIeNJtbS8gXS5pY4/IYt5b7fmyK7MIqVnz23Mqrkti74Ll1OXTrj+1HkeRZ8J5hydu1e/1zUYtU1NcnYdNtrU6L04rkbaa0/wCAaBnAzVAREB3D88DA5p2AVCEJ6/McnmhoCSkBz3inxhp3hdrZL4SsbjcQIlBwBjryPX9KEAy78aaRYaTDqdwZkgmA2Zj+Y59qoLif8Jtoz6G2ro0z2y9cR8+nSizsK5oeHPEFl4k0z7bYl9iuY2EgwwI/+sRUsZ5T8YLoyeLYYScrDbIMfUkn+lMQ34gXbL4c0y24ABHA9gf/AK1XLRCRkaXq62/ge8tpWJEjlEAHcj/9dCfuh1O2+Ck5ax1SAnhJI3A+oYf+y1myjmPi2rL42lYc5hjI9uP/AK1MRy+ra9qGr28MN5sYQklWVcH6U22wsVIry4SxezXb5TtuORk5ou7AepfBJSDq7dsQj/0OpYGV8WlA8XhvW3T+tbUtiJ7mCNEhSBTdO5kIyY48Db7EkHn2xWNXFxi7JXPWwmSzqwUpStcbe+G5rfRxq8AZrQy+W24Dcp/qPf1rWjVVRXscWNwn1apy819DvPguMR6ufeL/ANnpVDngZfxYj8rxXbXLgMhiUbfXacn+dVT2CehWS3tZ7gve6hDbW5O4uzbnZTyCFGTyK5qGWYms7qLt3PpMRnmEoU1aSbtt/mS+JPElhd6QNL0qN1sLZDl3GDIxBCgfmW59PavYeB+q0G5bvRL8T5WeMlia1/mza+DA/wBH1Y/7UX8mrzqhtAw/i0T/AMJYgzwLdP61dJ6Ez3MqKxZV+zNeWspU7FjlGdpyR95TkAnpz36Cumli6tJe62jKdGE90UL+LdaNI9zGAh+S3VQuDx1AJycfU4xz2qKladR3k7lQhGKsj0f4Ow7NN1CXB/eOn6bq5qq2NYHP/FoD/hJlbPPkqKqm0kKaOCZumDWt0RZiKR60m0NI9h+D2DpF9j/novf/AHqwqM0ic/8AFWyNz4kLBypESY9OlJLQfU8+uNPuoSMjcp6EGnYQQafcSDOAo9zRYD2T4SW32bSr0bi26RP5GpkNGP8AEvnxHj/piv8AWnETOI1DzGgQxnGKYD4ARAM9aaA9V+FwP9kXbesoH6VMhoyvihp0/wDaVrexKfLki2FscBgen5H9DUSqKCuzSnSdSVkefTbvLCsBkHt0qoSUlciceWVgcXFu8aywPGjqGjZ1I3j1HqKdwUdD2X4eWT2nhaN3Qq1xI0gBHbgD+VKT1Ejp3RJFKuoZT2YZFIZnap4d0nWTEb+ySYw/cOSuB6cEce1CYFt7CzlgjgktYXijACI0YKrjpgHpQBOAAAAMAdqAAP/Z</field>
+        </record>
+        <record id="pepsi_33cl" model="product.product">
+          <field name="list_price">0.43</field>
+          <field name="name">Pepsi 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGJqHiRLW6NvFD5jKdrMTgA/SlcCy+pEhfLkDkgEiMbsZ9fShsZnS6vdyD/RHZ3BwybQSp9DjgUJiZLFquoIMTqu4duD/I0XAkXxA0Z/0m2ZUH8S/wCFMDaUhlDDoRkUAV9QvoNMsJ725bbFChZj/ShK4N2PFT8Rb2XVpbhtNhuI2kJQA7WUZ6Z5zXUsI5LQ43i4xeprL44gSMvc6BfwBuSwg+U59wf6VDwlRGscTTa3K3/CfaGAEAvI8HO1d6g/UDFR9Wqdi/bQ7mlZeObf7OY7HSdQlT/phb5H1OapYWoQ8VTXUydW+IVyXVYdJ8kp/FO2T/3yP8a1WCktzH69B/Ceo+Fddi8Q6FBepgPjbIo7MK5ZRcXY64SUlcwviqtzJ4UEds5G6UFlzjcADxV0viIrX5DxOwuEgv0juMx/NyW4xXrUJpPU8qvSlKDset3utaFZeH2cXsMmU2IFYNk4pLmc7vYxV7WR5Neazam8LIUAzVyqwvuawwlRx2PVPAmrafc6O6SXMcewZJZgBissTdtOJz04uF4y0OB8YT2S6vKlncx3CluDG24H8q0nUTirmmHoSTfY7r4OQXsUd602Vt3A2oT/ABDv+Rry8RbmPXwyaidJ8RB/xT6/9df6GopfEaVfhPEb9FcurqCCK9KFmjy5txndGZb+FJ3iW5v7qPT7dxmPzQWkkHqqDnHucD3ry8ROMJP3j3cLha2IXuxJv7D0JflOoahJ/tC2RR+W81yvEw8z0VkldreP9fImt/CNveyqmmasJ5D0tp4/Jd/ZTkqT+Irow+IpuSu2ceMyzE0YOXKn5oljshaK1u8BjkQ/MrAhgR6162ltD5uUpubuev8AwvU/YJm7dP5VwV9z08PsafxDGfDo9pR/I1nS+I0qfCeSadbxSahJcXEYkhtI2mZD0YjAUH2LFa6q1X2dNsxweF+s4mMPMxby5mu7qS4uJDJJIcsxr56Um22z9DjSjSioxVkiAUmNHa/DfRmutVbU5F/dWowhP8Tkf0H8xXRhoXlfseTnOKUKXs1vL8jR8f2kD3q3UahZo9iS4/iDBipPuNrfpXtULqHqfGYhRc/NHSfDEYspx7/4VhX3OijsafxB/wCRcP8A10H8jUU/iLqbHk2nNldSh/ie2BHvh1J/TJ/CtcYr0jbJZqONjfzOfkGGNeHLdn3kzU8P+G73X7oJCpSBT+9nYfKo/qfarp0nNnDjMbTw0bvfoj1q3j07w1o6x7lgtoF+8x5Y/wBSTXpUaLk1GKPkMTiXOTqTZwOq6i+pxX1842rPcRLGp7KFb+Qx+dexWpKlCEOyZ4tKo6s5y80dx8M8fY7j6/4V5lbc9KjsaXxB/wCRbP8A11H8jUU/iLqfCeMR3ZsNTjuNm9VJDp/eUjDD8QTXfyKcGmcKrSo1VJdGXL2PR9LZLkWM+oxyjfE7zBI2HphRnI6EZrmo5RCpq5fI9zEcTV5aRiku5GfiTrZVbXT7OysIl4URxElR+Jx+ld8MtpR7nm1cS5Xk3dldbrU9dv0FxPNdzHhQTnH0HQV204U6Mb6JHl1ZTqabst31xF5sNhbuHit87nB4eQ43Ee3AA+me9cNabqScv6sXSSglFdPzPS/hmP8AQ7g+4rzq256VHY1PHsbSeG3CjOJAT9MGop/EXPY8SmglubpYYY2kkc4VVGSa9GDSV2eZVi27IY8upaM5t5IN0cvJt503JJ2yB6+4596rR6pjpuUdGiN7/TIZCJ9AmilP8K3RUfkyk/rTVar3X3GrjDsXVu7+QLZ2mnfYEn4EcSN5ko9Cx5I9hge1Lm5tZO5jUbWkVa47+zpbSMSzAq/mmMpwcYUHqD/tVMpJvQmnBrc9R+GhH2O5HuK4a256VDY2vGRP9hMFOCXAB9Mg1FJXkXUdonjFpcQW2otJcgmIwyqQDgnKMAAe2c13pNx0OCUkpa9iew1iw05Y7dEmmjJkPmyrtMRZQvyhWz25IYE+1OdOUtSKdaMNNSzaXlhNJHD5qEwRzzrNGsh8kiM4K+YxOc8445A5rOVOSNY1YvS5XsdRisoxCmoz3DNKJDN5O8RYVgcK5GS27B6DA71r7Ny6GDrKP2nuR3epQ3ZWC3thDGspfIAXcSqqTtHAyVzgetLka3Y41FLRI9I+GZ/0W6HuK4q256FHY1/F1ybbQ3lK7gGwR9VNRDc0nseHXf369KnseVXK79BWpzrcYKBlq0XcTx0FNESHxACY/Ws6htQ3PVvhocW119RXm1tz1aOx0PiOyuL3RpEtEWSZCHWM/wAeOo/Koi7M1kro8M1SGSK6dZYmicMcowwRXo0pKx5eIgym4+UGtzlIx1oGy5ZfxfSmieo+BS0+ACSTwAOtZVHob0Is9g+H+kXen6bLPdxmIzkbEYYOB3NebVkmz1KUWkdZsx0NZmpi614ej1T52ht5Tj7k6Bl/A9R+FVGTWxMop7nJ3nga0XPmeH5wPW0uSR+AbJrVYia6mMsNTfQzh4H0gt/yDPEAPpxj/wBF1X1ufkR9Tp+Zq2HgbT14TRb1gepuJ9v8gDUvE1GVHC010On0rw1a6fIJEtLa3I7RLkn6seaylOUt2bRhGOyN3FSWBoATJzQAoNABmgAoAM0AFAAA/9k=</field>
+        </record>
+        <record id="pepsi_max_2l" model="product.product">
+          <field name="list_price">1.71</field>
+          <field name="name">Pepsi Max 2L</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZKYjifHmreJbC9tYtC8wRtCzyFIQ/zAgDqDXpZdSw803Utv3sZVZSWxoeBdQ1q/wBMuTrm8zxXGxC8YQ7dqnoAO5PNZZhTowqL2drW9SqTbWp0UzMseVjaQ5AwuM4JAJ5I4HX8OMniuFmsUm9Xb+v12JKZJC8KXDgkkBRgYA5z9aL2GLHGkBZR/Ec9KLgSP900AYnibxdo/hSGB9WnaIXBIjCIWJxjPT6igEZF58T/AA9plrb3NwLxIbpd0L+R98eo5pANT4p+H59Ll1OOK+a1hYI8ghHynjtuz3p2A6LQ9e0/xJpC6jpspkgZiuWUqQR1BBoA8i+PNyX1/TLbPEdqz492bH/stAIwviHL/wASPwxbnjyrHj8cZ/kKGBN8Pwl34R8UWUq7l+zb1z/CcNg/mP0poDsvgTdM+gapak5WK4VwPTcuP/ZaQHNfHKMjxjbSb87rJAF9PmegEeeXuoXuoeV9rnaURLtTcfuigCXTtX1HSkuEsbloUuV2SgAEMPx+p/OgD1j4CqRa64/YtCMf99/40AZPx1H/ABVdnx/y5Lz/AMDekBxN5op+2B4BstXGd3Xb7e/qPY1HtElc7IYCrOcYx6pO/S3/AADe03wtY395JYqsyymNnknLgJAAuTkY5A78jPbFaUcW/acqitTpq5TCnhXVlP08+33nbfA2FoLTXYnGGSeNT9QGpyVmeSY3xtt5brxdaxwpvZbFWIyBxuepGc3LAiRosZLBFVGOCAg4A569uf0rl5nGo2j6alTU8HGDuk1fR6y6v/gEbeJXgtWYwzJvbyyqShElZAP9YuMnqOM4+lethsRClF+6rvrbU+cxFSdWyu+VbLsj0H4FsZNO1qRiSzTxkk9+Grlk7u5mU/iyEPjqzDnC/wBnknHU8vx+PT9KQzjpCrW0EewKojDKB8z9Pukk1yTXNO2h9Ng5qhhFUSk7bpuy9Vf9DJuTb3enzToGAV2ZARglv3QYn8zXTFWR87WnGdRySsmz1v4IW3leHL6faR50qnJPBxuHFXayRlfU5/42zyW/i6ylhcpItmuGH+89SM8+i1y5QYlVZOMbh8rY+o/qKh0ot3OylmFaEVF2lHs1cjl1BJLeWFbfYHdmBDfdztzxj/Z/WrRySd23sexfA2UPoOpRhAPLlQZB+91NMRkfGzTmm1+2uBJjNsFAPsW/xoEeWT2csJGSpz6GhoY6Gxlm3EbQB6miwHtvwVsDZ6LqUhfd5sqfQYB/xo2Ap/GEbtUtVHXyM/qaEI8kvoJHmQ4JDChjLtnCIoWHc+9NAe1/CVNvhW4kP8VwR+QH+NJiMf4x2lyJrHUIVOwI0RbGQDnIz9cn8qic+U1pUudtHltwGG0MhXHUEdKtO6uRKPK7EHmTw3bQXELQsv8AC4wcUXEfQfw7tDZeCrQOpV5t0pB9zx+gFDA6O6t4bmPy54kkQ/wuMigDFuPBvh25uBPNpcLSAjnJA/IHFFwHnwj4daYyvo1m8n954VY/rQBtKiRwhEUKqjAAGABQAP/Z</field>
+        </record>
+        <record id="pepsi_max_33cl" model="product.product">
+          <field name="list_price">0.40</field>
+          <field name="name">Pepsi Max 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqAM6bWIElaNPn2nDNnABpXAnbULSOLzJruKMYydzgYpjMgeL9NMhKzySxEna0UTOGx1wQKBFiTxPpsduJ/PIjY4D7dy59CRnH40XGLF4itmYB+FP8SnIouI11YMoZSCCMgjvQB85+KePFesf9f03/AKGaGrDR9B6lqFtpWnT3924SC3Qu59h2HuelAjwaTxuuo3U5uhNbJJKzI0J3bVJJAI9s0wLNvHBd7ZItfXA6faVdf8aANyLVLWzSIC80ZmUYf5gQx9TxnNKwXFutWa/XP9t6dEg6Ja75GH4AYo2Gc3eeKoNM3w2ktzdzD+KVPLVT9OtMR7N4Q1238Q+G7W9t8AhBHKn9xwOR/X6GkB4b4o58V6x/1/Tf+hmhtvdjR6B8b7yeHQtPtkcrFPOxkA/i2gYz+dAjxeI5kUeppge8eH9GEPhiJmA3qgypUU+W6uJzSdjidT0C2l19pbiNVgccBRjJz1rswuBlWV+hy4nGxou3U7nSdKW202KK3hXG3sB+H51x1KfLJo6qdRSjc8l8d2T2PiKUlMCYBxUopndfB/WDc6jJYQoIoEst0iD+KQMo3fkf1NAN3OM8UnPizWP+v6b/ANDNVOXM/kvy9X/XRbCR3Px050nSv+u0n8hUgeMws4kUoSGyMfWmgPTPDnjHxNJttPtcZRU3PJNEpCKOSTgA11xjGlBucX5GDhKvUUYPXsR3nimymumeWwa9bp5ryGLP0Ven4k1hDM61NWg7I95cJUqyvVepuX2r+IdP8MW+rafIIoJlwIpI1Z41zgHOOR9R3rWFWNf4o6s8fE4T6pUcIyukeW6/quoapemS/uWmZSducYH0A4rGpDkk0EJc0Uzu/gfj/hILzjn7I3P/AANKhjOf8U/8jZrGP+f6b/0M06lr6dl+Xq/66LZCO5+Of/IG0s/9N3/9BFSgPGIiBIpIyM9KpbgdtoQaa11C1iOZprYeWByW2sGIH1ANd+YRcsPFoMlqxpY9c5a0bQ7JZ0ufEF/BZWqHcYWfMsnttHIFeZTwtWo9Is+nzDPaFGLjTkm/wRva74ot9atbpbGEx6baW5hQsu3e7EYAHYAKSPpXqUsN7Hl5t2/uSPjald1eZrt97Z5fqufNXKFdw3ZK43e49elc2KqRnO8TahGUYWZ3/wAEDjxBen/pzP8A6Gtc5qYHikY8Wav/ANfsx/8AHzWlen7OSXkn96T/AFBO53Xxy50PTD/08N/6DWYHiqcNmgDp9FvGMEjgmOWPb5UgbG1ucH2Fb/WWo2YqeFdST5d7X+4nm1WylkZ7zSYnnB+dkkaME+6jj8sV3wlppU09DinHXWH4l2PUpGt3jwlvCbeTy7eJflUFc7iTyScdc5/Dry4ivTTsnd9WdlDBVnSdVq0Vp8zE8Wv5k2ntlSP7PhAKnI4yP6Vx9Sjrvgj/AMhy+9rU/wDoa0MDB8UHd4q1Y/8AT7MP/HzVVantHfyS+5W/QErHdfHEf8SHTT/08t/6DUAeKr1pgzV0mQea8B6zLhf94HIH48j8RUzV0dmAxCoV4ye3UtvFE8vnMCXwMg/dJ9fr/wDrrP2zUbHsPJIyxDk37m//AAPQfLMyW8yQhpZ2jO/aM+WncsfXt+NOEGtWc2aY+nOKo0l7q/rTyK/idZY7q1ilkMhitUQHYFGBkYGPT8ec1ojxTs/gif8AidX/AP17f+zLTYjn/E3PinVv+v6b/wBDNTcZ6D8a7d5/DdmyDPl3BJHfGwk/oKaEeLWdldXsjJawSTuo3FY1LHH0FMDV0eCVJLgCNlnVQuCMFcnn6f4ZqZ3todmA9kq6dTZFqRBC4AkVyBztPAPpn+orD4GnufTJyx1GcXFwT2f/AABizR2llKu8IrRsqoOrsQRn369T6VpByk7s8fHUsLhqPso6zvq/629Ct4ktzbXNsGuGuC9sj7279fc1qjxjtPgmcaxfn/p2/wDZhSYjA8S8+KNW/wCv2b/0M0hnpXxYuXh8NIEAJlZ4+egBRiT+QNUkI8b8MmJdZV50R4UjkeQOCcqEJOMd+KANK5nB1m6D9Joom8xEO0/KpDYA4B64xxkCpkrqx14LELD1lNq9g2skZZogyuOGzwPoRWPK47o+ieJp4pxdOtytdH1/r1KN7FvgLY+dOR/X9P5U6Muhy57hVyqqt9mSeKGlD2EUsscmyyj27FA2gjpnJz061sj50634MNjV9Q9rYf8AoQoYjD8R5/4SXVMjH+mTf+hmlZrdWGekfFG5ig8MHzlDCQsi9MhipwR/npmmhHkXhERN4ms1lUsCxAA3dcHGdvOM/wCcUwNHVdQ/4n1zE8ke7Yke5AqjcAMqSAM4ORk+g5qZJtaHVgq1OlWUpq6IX3b/AC5CQO+ecVzu6dmz6mMqMqfPRhGX3L9Cne3sds5i2OxxkHgAj1rWFJJ3ueNjM4q1IypuCXR/1oQ+IUjhmsxDEIt1nEzKFx8xHX8etaHina/BbnVNRJ/54D/0KhgYviH/AJGTVMf8/kv/AKGaSGd/4s1KLxB4DXVLa1a4hifNxD3QbSCffBKn6U0I8c0+9FldCUoXUo0bqGwSrKVOD2ODTA1XvbG51FriGSWIPAifvxkgqAv3h1zjOcDkmpkm1odODq06dZSmrol2HO8YdO5U5B/EVg4NPVH00Mbh6sbU6ii/T/MpalaCeNrhCV8tfuHkYz6/jWsJp6I8XMcDVpfvJTUrvcXxVg3dlg5YWMW7jHOKs8o6v4aGbSNE1nXXXbEsYhhJ/jk64H04/OhjOcmZnmkdiSzMSSe5zStYDpPB3i0+H7p7e6XzLC4OJVxkoem4Dv7imxG5qPwx0PxGjah4b1CKEuc7Ad0WfTjlfpQmBy178LvFVkSFskuV7NDIDn8OtAGZ/wAIN4sjkymjXqsP4lQ/zpgalp4C8a30Zge1aONxhjcOBx+PNJsd2dLpvwiSMi78R6n5wjUfuo2IUAdi57D0FK4DPGmsab9ks9E0h4fskA3FYT8qkcAfXrQgOEk/1jfU0AQymmIksr66spxLa3EsD/3o3Kn9KAOmtPiJ4ntkC/2gJV/6axK364zSsMsN8TvEzdJ7dfpAtFgKtz8QvFFwuDqZjH/TKJF/kKLAYWo6xqd+T9sv7i4HXEkpYD8KaAyXvpYJNqBfxFAF2NzJErt1YAmkAAD/2Q==</field>
+        </record>
+        <record id="pepsi_max_50cl" model="product.product">
+          <field name="list_price">0.61</field>
+          <field name="name">Pepsi Max 50cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYzgfHvxBufDGqw6ZZwwF3gEzSygkDJIAAyPT1pO/QqPLfW5kaF8Wbu91mxsrmGCSO6lWFiilSjM2Mjk8ciq05fMmVubTY9VpAfL/AIuOfGet/wDYQn/9GNV1Jczv5L8vV/10Wwj6gqBnk/xS8KaprXiW3urG1aRBaiMlT3BY++OtIDm/DHgXXLfX9Mup7JhHDdo75J6KwPpgfjQB75TA+XvFv/I5a3/2EJ//AEY1Aj6ekkSGNpJGCogJYnsKBmZY6/pN89ybe/hme3G6fY24RjnqRx2NIQy38U6DfadcXtvqMUltbn97IM4TPrxRcZoWF9bajarcWlxHPE3R42DA/iKYHzP4s/5HLW/+whP/AOjGoEez/F7WG0zwd5EZ+e9mWIj/AGR8zfyA/GkBw/hXVINI+F2v3OQLi5LRj5hkAqFHH1ZjQV1I/hheQTaTr+lT8i7tcDJAAOGH9RSQMufBPWXTW7vSm4jnh8xRn+NT/gT+QpoRxPi3/kctb/7CE/8A6MamxHpnx2V/7H0px90TuD9Sox/I0ho8Y86ZIHjR8RyfeUDrjpmkUh1ldXFs7GCQpvXa2CRkenFAM7T4PI5+IFuV6JDKW+m0j+ZFMlmJ4t/5HLW/+whP/wCjGpiPX/jTEkvgZXON0d3GV/Jh/WkB4EQdtMYkYNAHpvwMhVvE9/KRlksyAfTLr/hSYjkPFv8AyOWt/wDYQn/9GNT0A9k+MY3eA3P925jP86QHhtnbJdWU6cLKrqVc9hzkf59qUpWOjDYaVe6jujf0vQbbZbCZEId2Ek0zFVjUYznBHPoM/wA61pSrOSUI6+h1PCYOnCcqtS9uie78u52Hwjht4PGuupabvISLCbuoG8cGitfndzy4bHn3iz/kctb/AOwhcf8AoxqhFHsvxaJPgC6/66xf+hCkgPJLSGO3tkAiWNZYY3YlgSSQc49CaipserlDlzysnt/V+tiOS5vI7eQ280ijblQrY5HLH64Aq6FWUVozLN6HLXs0rW0t0O8+DdqLa/uZvm3XFkrsWPX94w4/ACqlfd9TzlY898Wc+MdaP/UQn/8ARjUhnsXxclSPwFMr9ZJ41X65z/Q0kB4pDqpSNUuIiMRqgdeu0cjg/XtilKN0deCxSw8+ZxuSy6hbM9xKs7sZo8AYJ2nDDHP1FCvYyryhKbcb2f8AXQ9A+Dd5DPqt7DGjjybQAM77iw35/ADPT3pmJwXirnxfrX/X/P8A+jGpgenfGqc/8IxZRA8NeAn8Eb/GpGtzxmWR5I13uzbRtXcc4HpTKYyHknNAHffBycw+MJ0z8slm4P4MppCZzfig7vFusH1v5/8A0Y1USeq/FexN54MM462k6SH6H5f/AGYVLHHVnh7H5cUymrDFco2aBHf/AAktpm8Qz3uMRpbMufclaVwa0Ob8RnPifVT63s3/AKGaok6y01rxB4odtCN/HLHcQmN1lCjjHUcZLDg0mNHK3/hPV9MumhurN8L91hwrfiaVinK5Vfw5qovRarZSvIwDDaMgg+9Amdtoeu2Xg+ObTYLR7i7AVbiRm2KGA5A4JIyTSUeo5SukuxxWp3H2zVry6K7POneTbnOMsTj9asgdO7IQyMUZTkFTgikBFeXt3fSCS7uZrhwNoaVyxx6ZNAyxZa9q2nWzW1lqNxbxOclY5CvP9KGIgS6lMrSOxkdjlmckkn3NMCF23Sux6kk0AP/Z</field>
+        </record>
+        <record id="pepsi_max_lemon_33cl" model="product.product">
+          <field name="list_price">0.40</field>
+          <field name="name">Pepsi Max Cool Lemon 33cl</field>
+          <field name="pos_categ_id" ref="coke"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGPea75N7JawCJ3j+8C/I+o7VLbAnttT82EtI8KN/d3D/Gmmw0I4NX8+N5FJwmfl8plbj2bGfwouA8ak7E+WY2x25BouAw6y6Nh4lP8AwLFFxGlBKJ4VkAwG7Uxnz/rmf+EvfIx/xOLz/wBDatMa5OpVurf7Mvy0fzWph/y4qf8AX2H5HuutarBomkXGo3LARwIW+p7Csmbs8Ag8P3fjr+1fFFzdGH53Me0jqozznoOnevOxWZU8PWjTe8v10KhBtXLHgXRr/Wba9b7bqcjWxKqLS/KBiPc8H8K9CU4xhzPREa3sdLYeB9eeCQXniTVbWYMwGboyDgnBHIyCNvXnrXgYriKlSnaKv/X5m0aLaMo6Dry6P9ql17Wjc7yuxLgrnsOhPfjr/hXrwxEZvTsQ4nnuo6lriTNFeahqDA9BNO5yPXk810Ik9x+DnildX8ODS5T/AKRYjaOeq9qaEjgtax/wlz4GP+Jxe/8AoxqvFKCnV5Vb/Zl9+t/vZj/y4qf9fYfkejfGRHk8EtGjEEzLwO/XioZszlfh5qUFvp8+kXTy+bHl1ilJwIwoBA5wRnJ4655r5TPcNUdWNWCVtr+b/r5HRTeljr49ZtdD+1Otpbw+c5kaRed57k8jHbnplq0y/G1p4dUlDmst27W/T9dA9neem77FKHxjpt3KYlUR7ieAyHOevCsT75rz8Rk+Lk+e8W/J/wCZ0zoVacbyhJL0L8V1BG6yLAJIkiCgM42kc89CScHr34rXB5rOjBxmuZtv/hjncbnkvj69t9dlllsrQRixOHMbZUbiSS3AAYtnpnOO2K+lwkmrOT+L9O3kZSNT4N6ZqNr4qhu2Xy7aa3LZ3D5genFdiepMotWv1K+tY/4S58HI/ti9/wDRjVeJUFKryu6+r/jrft1v/wAHc59fYVP+vsPyPWfiHGkmhwq+3H2leGIAPXIOfbNc+IlaD9DosUZbGOWJAMJLGcxyhBuT6Z6ccfSvz5YmUZu+z3V9/wCtzqscP8Q7iUarFaBj5XlLIR6k5H6Y/U19RgYKnhaaXVXfqz3skox5JT63t8kN8BeHJNQ1JNUuE22do24M3R3HQD2HU16OHpOTuPOMdGlTdNPV/gjo9IvodYF4bV9tuZ3MLR4xt8xl4yDwdmf+BV4XEFGNDExmktVr6nzdJ3ViDXdDln0KeximGJGOExjdnd8uTnGdw6dx2zXLgsbF4lTa6f5drdvu9C5R0Kfws054dWgkkkll8uPajM2Vxjgr6j8+MelfaJ3SOXqc/rhz4vf/ALDF7/6G1bY2TlUq3/6Bl/Wy/rZvd4/8uKn/AF9h+R6Z8VJPK8O2771jxcqdzdBj19qwmrxZuwsrtLiJOHVto++pUtxnODz+dfnOKw7hN7Wv+p1xZz/jDS/7Ws4NR05be4uIlwrOGdGXqB8p9Tx1HPPByPqcrrUqCjRxOjtdPbR9H6Munja9GDVN6NnESR+ONexpt1dmG0+60UDIqBfTZH1H149SK+gqYzCUIczkrHC3Kbu7tnfeHLOHR7VtPVQgt9o3Fwc5Ge3Q5zn1JJHBFfE5viJYyrGor2eiVuzOimuXQ57x54wvNLcW1kIlYbWJILEgg4PQBTx65rvynKaUoc87v+vxFUqPoanwru5bjUIPMY4aFT1zk7eTmvpUrHP1OZ1sY8XP/wBhi9/9DatcZBwnVX/UMvx17L+t293jf9xU/wCvsPyPQ/jIceEF/wCuv9KzNpHi+keLL3S7CW3W9lKzON6SL5gAwQSMn0PT1AORjnjr4GlWmpOOq+X9f8P3LjJpHceHPEMVtdCCFGFnd2sTW6yMWIkWIL1H94qQcdwK4cywTxMVF/EtV+q/rsehHDp4RVY9G0/0LfiHxg9mjWdlGBdnIZzkiIZ4PIGSRz6e5ry8Jk6TU6m3Rd/XsvxfkVg8HUxUtNF1f+XmYekeIJtGtGtorKTU7/UXaZYyDIzqOMkDnqGP0FepjMDCuoTnLkUV6ehljI06VeUKeyt+WpyvifVLi9byb37VDcpMzNbTSs4iB5xluc89P8TXo4WnTjBclmrbq2v3HFJs9K+EiqNQiKDgwA5zkH5QPw9K6SOpzutnPi5z/wBRi9/9GNWmLm5zqv8A6hkvu07v+ui2MbfuKn/X2H5HoHxmP/FJxj/pr/SoNpHzsaQzrrON7bRLOOaTM3MqY48qNsMoJ9c5YY6bupJ45MVJJq259FkNGcozcrcj0+Zcit55oXuxH9pkaQrmV8Rq3BLSsTnnPAHLEH0wVRpqXvyZeZ4ypQaw9GNtOn6f5hpdiYPFmmXf2xb+4mEzPvh+ViicLGuVzxgLnb24GKnMJJ4WTTfTbTr6PTvpseDOjOlU5ZqzOb8U8eJ9Q+dHPnHJTOM/iTz68nnNa4L/AHeGnT+u35GU92er/CRCl5BngfZxgFgf4RyMV0ojqc5rnHi9v+wxef8AobVvj42qVP8AsFj+Rj/y4qf9fYHoHxihln8LRpFGzsJCxCjOAByaxZtI8Ig0lLnSJb5JZQ8WdyGNdpx2Db8k45+70B7AmkM62G+t9PhgmW2jnufsdv8APcLuSIeQnRe5x3PT07nlq1FCeiuz6DL8JUxGFSlO0E3ot36kD6fLZz2yX6PbRzqriQgMfLJxu4P146+1c/s3GSUtEz1ljIVaUpUfelFdf6uRaXcmfxtbWlxpw8my8xPs7xi4JPOWPQE5xggYAAwD30x0eTCyUXbzvbr3PkKledeq5y3ZheJkd/EWoSLG2xZMn5cbQemeOK2wf8CPoZS3PWPhKp+1wts2/wCjDnPX5a6CepzWu/8AI3t/2F7z/wBDaujMf4tT/sFj+Rgv4FT/AK+wPV/HVtLd2dtFAEaQMzIrttBYY2jODj5tv/1utclWrGmrs3aueAaXFLNoFxChjVUeUuXuNjKxQBQqlgCW+YHAJxn0FWBs6bb28djbRaneK/7mNlaKNhIisoZVJ+6wAYdRntkACuet7Ju0tz2ssWYQhzUVeN+trfncr3ARJhHDO80CZKFgUHPX5ckAnArjm1ayldH0OFjJy5p01GVt01qR3FxHYXdjrLvcjZG1tMbWTy5NwzsIbB42YX/gB9q6HF16HLp81dfcfK5ph/q+Klpo9V8ypqlzLdrrs0kEtu0k8LNHMxZ16jBPrz6VrhYKFKKTTst1sefJ6npXwk/5CCZOT9mx+lbkrc5vXP8Akb2/7C95/wChtXRmP8Wp/wBgsfyMV/Aqf9fYHrvivVLbSmtbi7O2LbJlsE4xtbPAJ6A1xYijGtDlZ0Xsz59s7hf+ETvIycyPM7xxb/vrtAYkY/hyD1zx/smtRGnaQF9Egkv5ooLoQr5SglmlTHybhjCnbjBycjHyjrXJiIU29XZnv5NiMXCNow5o39PxHWbwG3kt/scT3JRnimkeQ8gFtpUMAQcYyMY681nQcZOzidmaxr0aftIVWvL/ACK3hbXbm98Q21u3lQD52jSKPaHk2EKGbDMB708wglhpWXb89ex81KtUqzvOTb8ylrrs0+tyxzh4Zb0J++B8xipPTOOBn0z9K2waaoQ0S0RlLc9K+E5H9pR4xzbDp9K6Ooluc3rn/I3N/wBhe8/9DaujMf4tT/sFj+Rgv4FT/r7A774ttbroMDXXmBCzqroDgMR0OOxGawZvI8Ih1RrJZ7aGOGe3cuF82PkA4BIIwRkAd6QGrbeILC5ghivUmtpYokiEsQEiMFUKMqcEHAGSCfpWFXDxm79T1cBnFXCx5LJr8TZ064uPs0lrpl5b3cEww8ETBi4PUeWwD/kBWfLXp7anbKvleLd5pwf9drr8CGy0mew8RJLpttDHLNZM7WE0kiFss8TKjdQflyMnIz1NRjHGVFKd1drXtbXW/T5M8WtTjTrSUHdLZ9zH8WXpXWL62jlSVZpBJKykkbyAWA7YBHufc851watRirbfl/X/AAyMZbnovwm1GC71pIraN/3dqfMdlxkjA9Txn6V0rclbmFrZz4tP/YXvP/Q2rfHu9Wp/2Cx/Iw/5cVP+vsD3a7tre8tnt7qBJ4XGGR1DA/hWTOhnAar8O/DDzvu0Aqv8L27uv6KcfpUk3sYNx8N/Bo+9LqEHslzH/JgTQFyk/wAOvBw6alqw/wC/Z/ktK4XHP4C8LTOhl1jVpCi7V3yRggegyOBS5kM0NP8Ahv4UaRFSzv7wE8tLPx+aAD9aOYD0nQvD+k6DbmLS7GK2DfeKD5m+p6mrQ0jxjW/+RtP/AGF7z/0Nq3zH+LU/7BY/kc6/gVP+vsD3qQ4FYs6GRVICEA9QDTAhaytHOWtYSfUxg0gHpbwx/chjT/dUCgCQADoKaAljPNNAjwXXP+Rub/sL3n/obVtmP8Wp/wBgsfyOdfwKn/X2AP/Z</field>
+        </record>
+
+        <record id="spa_et_fruit_50cl" model="product.product">
+          <field name="list_price">0.75</field>
+          <field name="name">Spa et Fruit Orange 50cl</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWgKYHIeIfEOoWF/NBbybEjIA+UHsD3FeZiMZUhUcV0PYwmBpVKSlLqM0DxLqN5qlvb3EgeOQkH5QOx9BSoYypKoovqGKwNKFJyW6Os1O4ez0m8uord7mSGB5FgjHzSkKSFHXk4xXqHjNXRZAoGc7qmhx6jfXBe4aMnafkGO2P6CuSthFUk3do7KGNlSilZMNM8PRaff20q3LyMm44YZHTH9TRRwcack7t2HWx0qsHGyVzo5B+6f/dNdZxDZGxhF++3SgBhj8s4yPrQA9Ywy53c/WgBd+6GRSfmVTmgGZOuXaafd287Sqm8FBuOP8/WuHFRrupF04t6GkJQS95mfdahPvBeRlyMha4ZyxslzK9n5o1/dLRiWeqvJuVZySOzHb/Oso4jFRvzX+ZTpxeqNTSxI8lxNI2SYyBzmvQwEakm5ye5jVaWiK3ibSxq1zBC0rRqkbMSBnIJGRXoQrSp1dNuUylTjOHzKVxfRJcyWQhGVKqCGyXyVGeAcY3dOvtXPOqouxhOtZ2EsrqG4nkt5Lcq8a7kMg5yMZX8MileNRWa2NKNZ3sro3bFtz3IxjbHwMVtDm5nfboaO1iTU5RFNGSowQdzE4xRUqKEbgk20jEu9SFo67pMxgZUpgnB6cf561zzxMYWuaxpt9CFdTaVihYiPO92cjIUdeB0rnr4275Ip+foaRo31+429JmFxatLjHmQhvpmvRpS5oJ+RzVI8s2ir4nt47ia38wZ289eOvevIzitOny8rOnCzcb2MS9gS7fMsaggYG3pXhVs0rt6pfI3hHl2ZEdPWSMopZFP3gpxu/8ArUoZhXa0SLjLldzotCLCGaMkbUi2rx0Ar38nxNWqpc722OLEJXv3JdXHmMnGcCnm8bpCosyJoxnoBXy+KgrnVFiQoSSOQKnDRbYSZq6SNpuB6p0r6fJlZyOavqiTUD8yc9jW2afZJpGZMm7vivm8VT5jpi7CRLjPOanDxa6hJmhp3Al/3a+iydfEc9YdfH50x3GKvNN4hSKEuQ2K+er6M3Q2Mk53L9Oaig273Q2X9P6S/Svoco+0c9YLw5dMehrTNPsipFJxya+fqx1OhAtKCBluwPMo74r3cofxIwrbBOSVDehrozKF4J9mTSepUfBbkZzXz1SN5bHQgUbQccVVOFtgbLVsuzLDkHivdyylyps56zLLIpHSvQnFSVmQnYiNnA3Vf1rjlgaL6F+0kKLWNGyM/iaIYGlGV1cHUbRIkagH2rshFRWhm9QA/9k=</field>
+        </record>
+        <record id="orangina_33cl" model="product.product">
+          <field name="list_price">0.72</field>
+          <field name="name">Orangina 33cl</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APXpJEhieWRtqIpZj6AUAYEHiyO9umgtlSMD7rTvgt+Hb86nmHYu3N7cQQb3niQnphlpcw7GVbeJfMuUja8Uq54ZIyy/mFx+tVcRstqcCxM5voRsHO7j9MUXAybDxtZ3N0YJVAXftEqHIz7jqP1ouI6emBk+KNTh0rw/d3EpXJjKqp7kjFVCPNKwm7I8U03xhYQ3LvPZyb2P+sTDfoeldksunb3WjP266mxLrmlXse+5vZ0c452SRD8gStc7wdZdClVh3F/tzS5EVH1kRRoMBYE2HHu2Mml9UrfysftYdy1/wluiwW6xxzyShFwAI2bP44qlg6z6CdaHcxo/FOnzazC1ppzCRmADNxnnpgVt9QlGN5MlV03oe4WV3FfWcV1CcpIoYe3tXG1Zmp5T8Z9QvEuYLOPJhMQbA7Ek5P6V3YCnFyuzOozy6yt/O3HzooyvaRsZ+letJ26GEtTrTqFy2lraQwEnaB8sqkH9a50o3u2TrYwEsL55BtgZiT7Y64/mK6HUgluRyPsdtDNG+gG1dFjkC8kkAdK42/eNlscFcI9pdq0cqO6ncDG2QDmunSUdjNaHt/wvv7q/0m5kuMKCyssY6KTnP0zivFxMFGdkdcG2jA+Kixt4jshM22MwqGI7Dc2a1wjaTsTUWxLD4I8NveQxpa3sqTDclyjBoumeWHSl9aq23Qeyj2Od8Wjwwlk9npFrOb2Oba8j9MDOeTXXhpVua8noZVFBLQ5uHRpG2M6qisT95+eP5ZIIz61tLGR1S1t/X/BM1Sl1N2LQ/sTPGXYDy92VI6eqnjd06Dj3riljKs0tOv8AV97ff8jdUYp6lBLCydizzlGDEMSy8n1GcE/lW7qVLaolQiepfC9VXTLoIxZdygZ7D5v/ANf415+J+I3hsc78XP8AkNWv/XsP/QmrbB9SKpreFbLFjHPb299pQKBmR5FaFz3IViSM9egrOtL3tbMqK0IfEtxoly8cVn5M19vzcPbIcGPBzvI4POOCeuOlXRU0tdiZNMZoNhbTWwDKJnh4G8chcnHHYEH6da8DNMZiKNWSj7q9N+/4nZRpwcE3qOlmja4na1u/KG/DxOG25HGRgHriuOpUm3Zv59D0407QScb6GebSK7gMs6xXA3ld6pjHTuQDWrzKth3FKRjWw1KUrcttDrfh/bLaWV3CnKq64+nNe37ZVoqfdHmShyNo5T4uj/ic2v8A17D/ANCau3BdTGqaOgajttrSzMuoW1wbZZRE8XnoydNwwCwB9CRis6kNW9Hr6Diyv4rmt9lp513pnyzb3McJhnXCsRwSTjPt1xwaugnrZPb5CmaWj3MdvolxdlTmNndmdcCRicjHr1Ar5zG0m8VKUnpp1vp+n/BO7DLn5YozIFs5IWkMVxCzddjBl/XmvOnLml0/H/g/oerPnTtdMnt1tRpMn2YysgkIzKACTx6U8VGNotHPNz9r71tuh0ngof6NdH/poB+le9hP4MfQ86v/ABGcd8Wx/wATqz/69x/6E1etgupy1S7oVpcXWnW923m2tytr9mju7fEoaPPAK9QwI9PxqKskpNbq97Dirob4gKvZWdgz3d9fRSl/tMtt5bKuCCACBu65xz05NFN8t5W0tsgavZFWPWS2nRWLW25S7tcRvyykuSBk9we/0718/mcnGrKz3t08kexl+Hbp897PoXPs+nNbgJdywK3Z0JA/T+teVSvOXvKN/W34WbOhzqp7J/16kELWkcMltaXDzjeHdmXaMkdu/atMYrRjbuRJTcryVtDrvBqlbO6/66/0r3sJ/Bj6I8qs7zZxfxc41izP/Tt/7Ma9bBdTmqmj4OjktrKKX+wZ0edA32pZUYSAjIOC+RxjjFZ4hpyfvDhotiLxra31pHZajcapNND9rRBbeWqhNwPIx1IGcZz1pU5pQlZWtFu/oUoOU4ruyrFZ6fKS8V6sTHn5/X3HFfJ4nEVa1RynBfJr8mz36UZ0IKNm0i1Jau9uEW+smA9JuT+lYQoRjLm1+7/ISqJP4ZfcQWGnmGeSVp4pF28rG27nPH+fetarXstU/uJrVeaysztvC3/HlMNqriTov06n3r6DDq1GH+FfkeRU+J+pwnxd/wCQtZf9e/8A7Ma9PBdTnql3SitlaWdtJKNTvLWBJ1ttpSVEwDhG6OB/dPX9KifvNvZNjWhV8YaSLe6s9QW5nlmvbgYsbghmjyCSVweMfj9axrPnw81e1o77fJ+pvhpqnWi7X1G6bFG0wSQ4YHlWHSvj6rZ79aTtdGhqawIu3CnC9awpKSluYUXJnPwny75JAOh5x9K9mjh51oSS7F4mtGEbPc9I8JAjT5yRjM5/kK9akrU4/wCFfkeHP4n6nOeONNg1XxnpNncsVikgbcV68bjj9K7KE3CEmjKSu0WrOWIbbXRtXtLuW3G1YLhg7KBxgMuCPqQ1S095Jq4LyZzGvTy/2zbbtJbStTWTLTfaCyzR98ZHP+c1OMcFhZ8z5k122fS5vhIt1la3+aN6G7ZogLy0juFA+8AM/ka+LjOnSlo2r9N19x6kqav7rsRTXOlgFmspSTx/q0H9a0inJ6T+5JFRhV/mX3szknspXZ3s0iUEqAi/MfXJ6Cvdy3DSqRfvvocmYTdLlT1b+47vwpI0ukmRgBukzgf7or0JRUXZdDgvc5n4mW19bXen65aKxW2+ViBnYQcjPsckV04Rxd4vqZ1LrU5iz0jw74gvlv7XWW0i6L75LZyAVbqdjEjj8/wrolOrSVnG6ISjJ3TOm+IGqaN/wjD273cU16CpthG4aRXBHzcdOM1z4WlOU9tHuXUmoq99Tn7HWYpbZGW9QfKMhwQwP4Z/nXh4vhqtztxs0epTzTDzXvXTG3GsQOxUTCR+yQozn8OMfrRh+H68fisl6mkszw8F7t2ylb63iKeK4twob/UbyMqSDk46knjn+Qr6GlhI0YKMPmePWxEq83KXyPWfCyzDQoXngMBk+ZYz1C4AGfc4z+NcVS3M7FrY1pI0ljaORQ6MMFWGQRUDOF174a6fdStcWEHlluSkb7SD7Z4x+VdEMZVh1uZypRZyl38PZ48r5s0fs9v/AFB5rohmdt4kSw3N1KI8A3Jbi9Q/9szmtP7Vj/KzP6n5mpYfD6+AKLcXLK5G4JHsB+pJxWVTMebaJpHD8vU7Tw54A0zSGFzPAs1yDlTId23+mfwrmqYmpU3ZpGnGOx1tYlhQAUAFABQAUAFABQAAAP/Z</field>
+        </record>
+        <record id="orangina_1,5l" model="product.product">
+          <field name="list_price">2.42</field>
+          <field name="name">Orangina 1.5L</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAGwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APXzQgZ574g8W6tYa9d2kDRiKJgFBVc42g9/rXs4XA0alFSd7s5Z1pRm0dL4X1C41Tw/bXl0QZpN24gYBwxA/lXnYunGnWcY7G9OTlFNm/B90+ua52WNNCBmZJY28ss05iXMj4J9cDFO4DtMhitrNbeJQixsV2jtzn+RoA0LeaJpXgWVDKih2jDDcqnIBI7AlWx9D6UgIrqYQxdcFjtFROpGC1dhpNkMssUcMShh68UvbU+6DlZUiuUivgM/LL8p+vb/AAqViKfNa6HyuxrwRRiR5hGokYBWcDkgZIBPoMn8zWwru1jG1WcveiLPyxr+p/yK+Vz7GNYiNNbJfizpox925WU15ka9jRoiuCduQcEdDSeLcWmnqCjc6TT5vtFpHN/fUE/WvuqFVVaUZ91c4pKzsc/fNnUbjP8AeH8hXxGd3eNn8vyR20fgRErYry7tF2GSnK0022CN/QDnSYyfVv8A0I1+gZVf6nT9P1OKt8bMnWQsOpk5/wBYoYj07f0r57iChGOJUr/EtfyOjDu8bECmM9JAK8p0KV/iNLshvJEjUlDnA9aKlKnGSUWONzqNJiEOnxxqcgDr6mvv8PSVKlGK6I4JO7bOJ1XxHpw8U3+nzSus8G3IKEjBUHgj614ua5TiqtX2qjeL21X5G1KtBK19Rh13SIX2TX0ET4ztkfafyNeWsoxT2ozfyZq69NfaRVvvFWhwxFmv4mAH8GW/lXRSyLGzatRl89PzJeKpL7SO28I3qaj4btLuMt5ci5XcOcdBX09GlOlTUJ7pHLKSk7o8k120kv8A4wanbxxPIXEfKyFNn7tPmyCOMZr2IuMcHzNpJX3MJP30kr3Opj8IabaQfaZ9skjMoXCAYOf72CT35NeM8+UabcFdLrsdEMB7Ser6GdregL/Z897Eiz25DFrdlAKKCQSpB9q6suz2jiKkaTvGTV12Zz4vAToNtO6O5+H0Yi8F6fGrblVCAfUZ4oxDvUl6mkL8qOLWJH+JniAjcszmCNXB+UDygxBHuFPPbFPFUViMHGnJuz7eo4Plqcy3OkeOSUILjUlgigkGAAqknDZ9cfKMjPueRiuJYGj7NQs7I2VeUW3pqVHFlLAkVzqGyTyyTH5pAGX5UgHOeQuPc1p9ToqUZKCvHZ9iZVZSvd7m54BOfB1gPSMfyrar8b9TOOxwcjyj4o63D9pMEN35UUhA6nykIGe2eRn611VYTlgrw+JXsZe0UaqT2Zo2Wj2ktq8lym+QkYM7sWUjjAbnp0HTFfJVswxSm7VEmun9aHuVcPSuoqP3Fe4srez028mMccvGyCNSWBkIOBgdexPsK7sFPF4ivTvJ8q1lt06fMwx8KNKmlGNmztfAsXk+FLNM5HlqR/3yK9Wq7zfqefHY828VxXun+LbrVIrSSa3uVQNhcjhQO3Q8V2YXF0eX2bkk0YVqLlrYzX8WyqSIy+T1Egwf0PNOtk+DxEueUNe6NKONxNFcqlou6uRvqGoaldQMiT3EkJJiijT5FyCDn8+taSVDC0uVcsV6ik51p80rtns/hGGWDw3ZxzqFlWJQ6g9DgV5jnGfvR2ZrZrQoXEAyCwrxs2pXcZG1FlRPsr3PkEoZAM7T1rw3J3sdHQtzxIpAjTLHAAAraMW5aIm5u6bEYbYRnsf6CvqqMOSml2RySd2PltYJiPMiB/T+VOpShUVpK4JtFZtD017gT/ZlWVejqSDXNLL8O/sle0kupZS0ihBCbhnrz1rSjhadJe6JzbJo1CjAroJA/9k=</field>
+        </record>
+        <record id="fanta_orange_50cl" model="product.product">
+          <field name="list_price">0.98</field>
+          <field name="name">Fanta Orange 50cl</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAUAFABQBz3irVbvTTbLbSbBJuLHA5xj/GvKzTF1KHLyu17np5Zhadbm5le1jnB4n1JWyt42ffB/nXlRzLE3+I9SWXYe3wnoUTF4kYjBZQTX1MXdI+ZkrMdTEFABQAUAeZ/Fv/AJDHhr63X/oKUp/wK3/Xt/nEJ/w4/wDXyH5nplMAoAKACgAoAx9Ygtr64t4nyTG2WKn7o9KwrQpzsmrmtKpOGzM+fRbJInZVZmyCoPpnvWP1aivso2eJqvqzpLeWKaFWibK4x15H1rsi01ocrJKYgoAKACgDzP4t/wDIY8NfW6/9BSlP+BW/69v84hP+HH/r5D8z0ymAUAFABQBDeSNHbnacMeAfSubGV/Y07ounHmZUt0gSMl2w1ctHGU3C8tGXKDvoNWWJnAYEL3NRHMYN6obpMVdlveK0TZV+DjvV/XIqqktbi5G4mlXpmIUAFABQB5n8W/8AkMeGvrdf+gpSn/Arf9e3+cQn/Dj/ANfIfmemUwCgAoAKAIrmPzIT3xzXNjKXtKTRdOVpGewXHIrwuRHRdjAq5pciHcmgjEky8dOa6sJR56i8iJysjSr3TmCgAoAKAPM/i3/yGPDX1uv/AEFKU/4Fb/r2/wA4hP8Ahx/6+Q/M9MpgFABQAUAFAGVKwErqOxIr5ytaNSSXc646pEQfmslIdi/p5DBz3BxXrZak1JmNboW69IxCgAoAKAPM/i3/AMhjw19br/0FKU/4Fb/r2/ziE/4cf+vkPzPTKYBQAUAFAAxCqWPQDNKTSV2CVzKtozcPJIenJ/Gvn8PTdecpHVN8qSI4cGbBGfXH9Kxo2c7MqWxZsSY7uWE969DL58laUGZVVeKZoV65gFABQAUAeZ/Fv/kMeGvrdf8AoKUp/wACt/17f5xCf8OP/XyH5nplMAoAKACgCtqDlbUhf4jiuHMqjhh3bqaUVeRUtbmO3iZWU5POa8vB4yFCDTTuzapTcmQxTBLnzCCRntXNTrqFXm8y5QvGxJJMGvEljBHIrZ4hSxKnHuSoWhZmtX0pyBQAUAFAHmfxb/5DHhr63X/oKUp/wK3/AF7f5xCf8OP/AF8h+Z6ZTAKACgAoAo6xMbewMgUNhgME461w5nf6u/kdGEhz1EjGN+yQ+ZLEsanuzdT7dzXz7p1Ixu7Jep3+wTdk7kSaqsn+pjWRh/CGwfyOM1klOXw2foW8Lbd2GjXCL2OA2rglgCSeOa1ouXtYXtqweEXI3fY66vrjxQoAKACgDzP4t/8AIY8NfW6/9BSlP+BW/wCvb/OIT/hx/wCvkPzPTKYBQAUAFAGb4gYJpTMRkB1JH41x5h/AfqvzOvAq9ZLyZxl/eJ9quUZcJbRIxbIyd3OQvGQM8kH8K5f7DWJpxqKWvRdLL9Wbzx8qbcFp59SpELg3USW0i3GFLOSuDnLqDwRjDJyOeD+WkspwdGF6rs76NadtiIY2vJ2hqrddTaumzPauyqC5QlR2ORk/qa8luP1uNno3/X3nfTv7GV+x21fUHghQAUAFAHmfxb/5DHhr63X/AKClKf8AArf9e3+cQn/Dj/18h+Z6ZTAKACgAoAoa2gfTGUnALqCfxFcmOipUWvT8zpwcnGqn6/kcxcadBPP50ThplQIcttDgdPxwSOexPWuOdfFUqLp0WnZ691/l0f6nSo0Z1OaomrjNrxziEOqFFDEnB3EjJH07cV50Yuy5ndtat6noxUOW6Wl/QkEySXdr54OBgkKMDgkf0FaUqlJVYxlvp/X4HJWoVOZuOyv9/wDTO1r6Q8cKACgAoA8z+Lf/ACGPDX1uv/QUpT/gVv8Ar2/ziE/4cf8Ar5D8z0ymAUAFABQBXv0EloyMoYEjIIrhzLXDtGtBtTujG/s+36+VyeuGIr5uNNxd1v62PQdeTVmxn9m2xIJhztGBlz0/OpXMtNfvK+s1O5NFZwxyq6xLkHgnnFaU4NVE7dTOVack1c3hyK+vR5gUwCgAoA8z+Lf/ACGPDX1uv/QUpT/gVv8Ar2/ziE/4cf8Ar5D8z0ymAUAFABQBHcIXgYDr1rnxdNzpNIum7SM3IxXzjOsjEilivpULfYZNGvmSKoGcnn6V0Yen7SokiJOyualfTHGFABQAUAeZ/Fv/AJDHhr63X/oKUp/wK3/Xt/nEJ/w4/wDXyH5nplMAoAKACgAoAje3ikOWQZ9uK56mEo1HeUS1UkuorQRMgQoNo6D0qpYelKKi4qyEpyTvcVI0jGEUCqpUYUlaKsKUnLcdWggoAKACgDzP4t/8hjw19br/ANBSlP8AgVv+vb/OIT/hx/6+Q/MAAP/Z</field>
+        </record>
+        <record id="fanta_orange_2l" model="product.product">
+          <field name="list_price">2.28</field>
+          <field name="name">Fanta Orange 2L</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAUAZ+uXk9jprTW2PMyACwyBXNi60qVPmidGFpxqVLSMXw1rup6jqDQ3jRsm0n5VAx+VcmCxlStO0rHVjMLTpQvG51VeoeaFABQAyP78vJPz/l8oqIu7fr+i83+np1dy2Xp+rH1ZAUAFAFW5cTL5ajIzkselZyaehS0IolEMgkCk4BBFKOg27l5HWRdynIrRO5AtMAoAjiz5k2Tn5+Pb5RUxer9f66v9PTq7lsvT9WSVRAUAV72RkiCrw0jba58VVcIq27ZcFdlBrxomK7Q2OM15k8xlB2tc1VNMY2oMRjywPxpf2pJ/ZD2S7k9jM/noSRtlyCPQjmuzDYiU2r7MicUkadegZBQBDAYzLcbANwkG/AxzsX+mKlNtu/9fj/AJenV6Tvyxv2/Vk1UZhQBTvziS3/AN41wY52cPU1p7Mx5X+dvqa+cqz95+p0JaEZaoUxl2xfLQD/AKa/0NezgZaQ/wAX+ZjUW5t17hzhQBDAgWW4OMb5AevX5VH9KlO7f9fr/l6dXpN3jHyX6smqjMKAMjXXZJrLa5XLkYHfpXm5jvT9TrwiTUtOhwmqavdQzmOKZyxycKfevCWGbk2z0lRja9ijHq+p/wDLS5cEngZpVKMY7ISp029EdPoF5PLcWaySMwaf+hr0cvXwf4jHEU4qMtOh3Ne+eSFAEcQ/eTfMx+foVwB8o6eo9/XI7Uk9X/wf6+7T53LlsvT9WSUyAoAyNcx5tmeOHJ57dK4cdDm5ddmdWF2kef6zOUeTdMwUE/xYrwXXnKbjHY9JuEEm0ZUFwZCuyTzFPRSd2f8APtWqdVLVXQJ05eX4HY+Hgnm6e0YwrTE/Q4PFdmEUeaDj1ZhXvyyT7Hd17Z5QUANRFVnIUAs2SQOpwB/ShtsbbaQ6gQUAYPiyY29pFOACUJPP1WuetTVSUUzejJxjJo8w1meMTpFKwuldHYShiMsMnBGB9B7YNc9XBQcnJafcawrPqrmaIku7y3EYV/LSOYcYXBI3KR/k8VUeSjF9AfNUZ6D4SidDarNJvcXBdfmJ25B4yeeKXPTqVYuPT/glOM4U5X6/8A76u84QoAam/dJuAA3fLg5yMDrxxzn1/oCyXV/5FO1lb+v6+X6jqCQoAwvFSLLaRQP92Zmjz6Ejj9RXLip8ji/M6cNDmUvQ83ubI28xMsrSMoHyH7qsABuAPQ4AFebis05m4wVvM7KODSs5MzpbxoJvIhjVmTAJPRT6AVkou15O51wpxtfZHY+C71ri8tonULIrnO3o2Qf8K6sIl7RWXU58dBRg3fc9Fr1zxwoAKACgAoAx/E23+zl3DJ3jHtXBmU1CldpbnVg03Oy7HBX029sTIkmMDceD+OP/AK9eb7TD1db2fZ/5/wCZ28tWH/A/y/yOYnD2t+0u3927FlbHHNXdTV0dsEpRt1R2fgaFn1VLgrgEnb+Rz+HNdGDdqljkzG3skux6TXrHjBQAUAFABQBU1Jd1uPY1w5hHmpfM0pOzMSW0gf78EbfVAa+flCx1KpLuQnT7Tp9lh/79ips11H7SXdmjpUCR3KlVC+wGK9LLIWqXMa0m0bde8cwUAFABQAUAQ3S7oufWsMTHmgVB6mS8ZB4rw6lF3N0xhjOaj2LHcuWEeJgfQV6OBp2lczqPQ069UxCgAoAKACgBsi70I79qmceZWGnYzmjbzdhU7vSvPlSfNY0TElgaLG5cZolQcdwUrlu0hKDewxnoK6sPS5VciTuWa6CQoAKACgAoAKACgAoAKACgAoAKAP/Z</field>
+        </record>
+        <record id="fanta_orange_33cl" model="product.product">
+          <field name="list_price">0.51</field>
+          <field name="name">Fanta Orange 33cl</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APYaAMW98WaXZTGDzGmkU4IjHAP1pNoCW21tbuBpo1WNAPvSMAKXMOxhxeOJJNQFsbePYW27wD/jTuI6HVdUXSbVbiRRKjcZU4ouBU07xbpeoSrCJGglY4VZRgMfY9KdwNugCC9uIrWylnnbbGikkjr+FKUlFXY4xcnZHkEN1Z/bHZ5DjPAJ4FcsMVSl1sdU8FWjsrmztmubUmznjJHKkFePwPWt1KL2ZzyhKO6KsU7SExuktvcKxYOrEox9uensaokvTahcG3+y30ismc7gwVfyznP4VLlFbspQlLZGKzWC3sZSdiobJRTwaxli6Udnc6IYKrLVqx69bTx3NtHPE25HUEGumLTV0csouLszjPiTqFxbW0FvHkRuCxx65xzXHjZtJI78upqUmzza2V5pAEG5ieleVKPQ9tpRWpsNIsFuI5YLdm6coM/mKhppEw956XKZ2Fs7AB6VneXc35UdBZW1jNppZLRDJj7xUmumEU0c821Lc5mfIlJA24P5VktGauOh6T8PNQmu7KaF87I8EZ7HvXsYGo5RaPCzGkoSTIPiJ/rLPgHg8ntyKnHq9isu+0cdDAiLKsULLIoJ3HuRz+WMnHtXnQaba8rnpuTbV3p/X6iSwi4TcYkDeo3Z/nj9KUmrG8Z8pWeJoyQxUED1+99KxaNIzuXYLq5tbQIsigNhht5IrSEmloZtRlIpOFkcu4/eFiW//VUt3Y3f5HoPw7TFtdt7qP517GAXus8PM37yF8dx+ZJaDaWyCMAc9RU4+9kTgJWucpbTLAyzXG6W3VGkaEEqQCCgX8Sc/QZrgpKMZcz2SPRnFy0jo72v+P4Ex1ywVPk0KED0aYk/yq3iqK2gUsHVe9V/cRnVdFnP+kaGU/2obgk/keKn2+HlvC3zK+rYmPw1L+qJINM0u+cf2XfvFLnIgulAJ+hHB+lXGjSqL93LXsyZ4ivTX7yF13RmXFnNbX7W82UbOG3da55U5U3Z6G0asZ0+ZHd/D9SlrdKRjGzP1y/+Fexg1ameJmEr1B3jdlj8qR1LKkLtgHHO5QOR060YppK77Bgk27Lq/wDM8/ubp5kVBF5MRO7GSS59ST1NeLVquStayPbpU1F3vdluPTD9kWa5mW3Rvu7gST+FOOHbjduxxYjN6dKVoq5XeywwMMySxkEl87QoAySc9OAT+FJYeUpKMdbm+GzSjWg29LAlrK0PnRBZoiCRJEwZTjryPTuO1XUwdek3eL0NoYyhUStJamiJJNS0x4rtG+02qh45GX5njyMjJ9OOa3hJ1adpbr8jmlFUqqcdpOz9TrvAS4sbhj13AHJz3Y/1r0cI7wPNx/8AE+RF4+cx2gkADMkEjgEZGQVIz+OK0nBTnFP+tUZUZOMZNf1ozzfRk1J7e51nUbycWABX5iXMknQbV9jznjpj1ruxdGNWn7OKV/yMKNTlneWq6+ZpQzW+oWst0t8GigUGV5VbcgJAGVGTjntmvHqZXieZR0d+psqeCa5nzb7ENzKbXSUvHtJ7ayvswx37FJcKwIOYuMbhnueld+EyynRqXvzSXyFWxXNDljFRXl+rKGlafD4f1q8+2s06W9t5tvNA20NvKhXBwcDD/h+FejUftIq3VnKtDU8Nx3MGoXtvNK00bu3lkuXDKY3OQT1BG05xzivOzBpuGm9/yO3Br3Zvtb8z0LwUEFncCN96hlwcY7VzYVJRdisbfn1IPG6CUQQtgLLDKD9BtJ/QVVWXLOL/AK01JoR5oyX9a3R5b4fv59Ha8n+1SRSWxWNYmyY1LttZmXvtA6euK9ecVO2m5xbFiLTJbPU57S3uI7mC/t5YYbiLAjlYrlV9AdwAx24puaaTfRjsWJ4tVvPAdro06JDcQXZZY53WNvKAOD8xHdj74ArCWLw1Ku7yWxrHC16kLqLepftvlgjt7YiR4rdIZHC7/NC9gCPu5J65zgeleLicxnWm1Tdkmeth8vhSheortr7h9tJc/bJpZxKgghcqHyMFvlGAen3q5acpubcr6J7+eh01I01BKNtWtvLX9Dt/BRiNrd+UW2rKANwwelelhrcrt3PJxqlzK/YreOJRDcabJgHaznB7j5c/pWeMnycrKwUeZSXkcJfWFpY6hdyOplS8hCeWR8si7gwcNng/L+fPtSlmcqNNRW6ej7o3p5eq83LZPddmNimFjZC208zW8WSzZmyzE4ByQAMYA4xXFjMxqYhp7eh34TL6dFO+vqi7Y6dDDbJe3qGQSf6mAHG73J9P8/XKjQVuaX3FV8TJycIdN2aYlvJI9sIW3jA4SMbR9a0lXUdNjiahe71fmMhmnLC0nclXOFYnlWzwfzrSlW5tLkyjFe8jpvAibdLmOOWkyfyruwitA4cXV9pVfloReO7X7UloBncqyFcevy08TS9orF4St7J3tu0chBcWs1utpdo7W5IMci/fhY9ceoOD8v8A+s806NOpSTim4/jF/wCXl9x2Rq1KdVptKX4SX+fn95I/hu6lTdYyQ3sfrE4DD6qeRXFLBza91qR3Rx9NfGnF+f8AmXrsL/bLwsAEhwiL6AdP8+1VXk4t+RxQv7K/cvRCMqdzbeOMCuJOMt2Yu5nSlPtsRJwFbcSPbn+lbYVe+Xrys6jwQ+/SpWxjMvP/AHyK9zDO8Dz69L2c2vMi8dJKtraXaFgkLkMy9s4xn24xRXm4RvY0wtNVJctzzcSmN2CgFGz8rcgivEpYipQneLPoKuHhWhaaLy3Me1S24Yx975u475+vbv1r0FmFCa/eQ18jheX14P8Adz07GhFI2qQpcQtuuolCyx55IH8Q9feuJS9pG/3/AOZpUp+xk09ns/0Jo7qQfuzG2/0xWHsexjKC3uU76Y26OH4nlG0L/cU9SfQnp9K3iuRebNKNPnd+i/Fnb+Brd4dBLupAllLLnuMAZ/Q162Ei1TPOzCSdb5HQSxRzxNFKivG4wysMgiulq5yJtO6OI13wEm4z6XvAP3os5x9M9fzrgrZdCbvHQ9GhmtSCtJXOZuNFu4fkkAQjs6sp/lXJPL6nSx3QzWi900Qppt4jh42VWByGD4IrNYGunp+Zq8zwzVm/wNO3j124/dJcu5P9xSzfnj+tdMMLiHu0cc8Xg07qFzf0TwLEr/atV3SPnIiJ6/72P8a6KWBhF3epz1syqSVoqyOzVVRAiKFVRgADAArtPObuLQAUAIyq4wyhh6EZoAi+x2uc/Zos+uwUASqqoMKoUegGKAFoAKAAAP/Z</field>
+        </record>
+        <record id="fanta_orange_25cl" model="product.product">
+          <field name="list_price">0.84</field>
+          <field name="name">Fanta Orange 25cl</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqACgAoAKAIbq8t7KISXMyRITgFjjJqZzjBXbsXTpTqO0Vcq/29p3abPuBms/rNPubfU63YcdasAobzhz2703XppXuiVhKzduVktpqNpesyW8yuycso6inCtCb913FVw9Skk5KxZrQxCgAoAKACgAoAKACgAoA4X4mysiaeq9MyE/+O15eaPSK9T3MiWs36fqcZbzvtAzxx2ryLn0PKX4rhgCASBnsKpSM5QudD4LkLa2RzgxNn8xXdlr/AH3yPLziP7j5ne17Z80FABQAUAFABQAUAFABQBxvxFtp7iytnhs5pvKYlmjXIAOPf2FceOoSqxVuh6OWYuOHm+bqcXFpN6QCI2XI6FTn+VeTLA1l0PdhmuHfctRaXed1Yf8AAW/wqYYKu3sKea4dLqdD4Mtr2HWJXlsJ0iVNvmMABk4969LA4WdKbb7HlZlj6deCjHud3XpHjhQAUAFABQAUAFABQAEgDJoAz9QvIGiMCSKzkjKqwyBmk2BSbULSLcksyKwHA3is3Xgt2ilCT6CRapZuGBlXd2Abg0liKb6jdOS6Fi11G2gmZZZUQOAVy45/WtFJMlqxqJIkgyjBh7GqEOoAKACgAoAKACgBk8yW8TSOcAUpSUVdjSuczfa/LOzLCqhAD1PWvPnmEb6G8cO+pBDbWMUrS3kcBLjkEZPP4Vr9apr4mifZS6D5LpRMPs06RxKuFiwCv+Pp3rN42nfRopUnbVEMojnm3yahOnP3YnCjt+OOPWk8ZTvrIFTdtjQd9KuYBFKsUmABudRuz659a3ji6DW6IdKfYha/fTnUQjMR4B5yMdutZ1Maqb7lRo8xu6fqCXsfo46j1rpo1o1FdGU4OLLlakhQAUAFABQBwniPxLjUJbR1fykfaCPpzXj4/ESu4ns4TLXOmppq9jNj1OzOCJwD7g15TlqaywNdfZLcEpulYwOZP7xTn86aVSV7XZjOjKn8SsRyFYm2yMFb0Y4NYyUouzHGnJq6TEEsf/PRfzFSmw9lPsy9BBPcR4jRnX1HIrrp0qs1omYy916kd1P9nAhuGCY5ANObnFcsjSlh6lTWMWw03UvLu0+zeZK2eiKTXRhKsozVtSquAny3lZerO5t5hcW8cy9HUGvfi7q55Eo8raJKZIUAFABQB5vqcaza7Jv+7HKzEbc7uOlfPZlCUpy5Vq9D6HDyccOrdUihqd7p1vs02Ga0Oo3P31ALHb1AU4wCevJBxj1rreArfV+aKvpq/LyM6GNprEKM5PTb18zOt/EF3pMGy1j8x2P3SvA/xrz6E5xejSRnmVfEVa3LCnLTy3Gahq+LddU1dZLdWdIxsTeOc89RlRg5xk/WuvCZbVx1R2fTR20fkdazB4KjGNSK5r6pNbdzVxpl5YwahZPburyGGRUnBQOAPu8575wfanispqpK0Gn1S1/pMKOaxbcXU06O2vo/62NGDVNQ0lfsqRLEDkqs4PHPQHP8686jj6lJNLWzt5/PY1lh6OI95u/oZt7fXOouHuCo25wFGKqpVlVd2dtGjToq0TrrV7hraFd5Vdq8BuP/AB0D9Sa+mopKnH0PjsQ26svVm/pn/IOhGc4B/nTh8JNT4mWqogKACgAoA8y1eYwa7Pg/MZSNu3Of8jNePXc1WaSvqfRUFF4ZN7JHJeFv7MPifU5L6V11IyTCGV4w8MAwxaV+R05/z0+nrqTpRSXu2X/DHzUHad+pVsPEEyQ66ssltey6fGJLWfyAiuPORDlQBkEMCM9KxqZRhZyg+S1+h1wzTFRi1ztl3VorKXUU0uST+0lv9DN1BPOqmS3mCPINrAAqpC/d6DdXVRThC6XLaVrLaxyyk5O7d7kF5aTXXhey0saUIp7WyiuYHjsiz3G45k/eDhdoIyD1I+lawmlVcubRtrfbtoRNPlOxiEovbOGWTebeGJWLkfMQg3Hnsc+/Wvhsxw0K2KqKKtd6nvRxUMNg4q15SRJeWtpHbTTKjhg5UAsMBs8Yx2xzWMqfs1bfTc0wGYV8RWUdLLcx7X/hNJr2Ez38UcIYbURlUbewO0c8ev419LSi+Reh49Zr2kvVnq+m/wDIPi6Ywen1NENianxMtVRAUAFABQB5p4keBL5sL+9EzCTqMjnnI+lebi2ocs/7x7eBg6sZQvvBWOUl0O5bXNTjgcImp2RlWQj5PMWRHZSe3zKfwYGvbp4mCoRbfwv8O54sqM3VaS1ZcGmXGoSXWq69bgXF7CYbiCzZdroCpRy2TtbKDpnhRwM1y4nNaeHSVP3ranXhcsnXfvvl6al2Cz0vTZ4rxbCRb37KsEa7vMxFjA3bhjcV4PHQ9BmvOq51WlT5Xpd30PRpZPT57p3S0d+/lb/M07K48y2uEiknE0sgklR+WKDk7cYBP5dK4aVTmTSbu3dnXWhyzjdKyVlba77+RXgv5Lu9uLmSN1LjnYxjGOAScA88enc1KxDdRt9TkzLK7xhyPW1rX+Yl/dRSttjJC5DNls84A9Bx/jWdapzvQ6srwLw0W5bs3bd7GAIX1KDdgfLAxZvoduB+de/HFU4wSv0PDlhK06jtF7vyOusF2WEA5+4Dz781rD4Uc1T4mWKokKACgAoA5rxTo1vdsk7oRngsvBzXm5jSuuY7sFi6lF2TOe/sqaHH2W/lhxjoOuOmcYzXlyxFVWtJ6HdHFU9eamndkjWQmjCzRpkdTExQH328gfhQ8RGS1j92hUcVyO8W/nZ/joxv2SQXj3DJG29s7fMPT06VjVnGb+ZaxUPZqN393/BHLBIt8lykaKEbds8w8j0ztpUaipyul1E8TB03Ft6rt/wSkdAllRQ8yKVYMCvPI+orSnPlubVcwpTto9H5Edt4UjgZj9pJ3YyNo54x7VUqkpmMcdCntF/f/wAA29H8P232mNCGk+bcdx4FdmEpc80cuJx85J20O4AAAA6CvbPJCgAoAKACgCK5t0uoGifoe/oamcFOLTGnZ3OSvIXtLhopOoPB9a+bxVB0p2Z3U5cyIN9cbZYbs0mwsAahMB27ArRMTHpljgcmuinFtkt2Om0ux+yw+Y4xI45B7CvewtH2cfM46k+Zl6ukgKACgAoAKACgCK4tYLpNk8SuPccj6GoqUoVFaSuOMnHYwL3wvKDusbhf9yb/ABH+FeXWylN3g/vOmGJ7oonQdZU/6iJvpIK5nlVUv6xAcugauTzFEv1lzVLKqnkDxES1D4avCR51xCg77AWP9K2p5U1u0Q8QuiNux0y3sF/dgs56u3Jr0aOHhRWhhObluW63ICgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAA/9k=</field>
+        </record>
+        <record id="fanta_zero_orange_1,5l" model="product.product">
+          <field name="list_price">2.08</field>
+          <field name="name">Fanta Zero Orange 1.5L</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWgKAACgBQtAC7aAFxQByvxA8SX3hnSLW5sEVnmuliYsm7C4J/PimgZz/gX4g6z4h1+HT76GPZIkjMyxbcbcY7/AIfjQxI9LpDDFABigAxQAuKAGuMCgBooAcBQAtMApAFAGbqdta6mkcE8CzpHIHwwyMjP+NK9xlW10vTdKu0urexSNtpQtGnIz9KFoI3FIZQVOQe9MBaAAUDFxQAYoAY/agTEAoAWmAtJgFAyrfytHCAvBY4zXDmOIlRp+7uy6cU2Vlytv5gnXP8AcxXAsXVVLm9or9rF8qvsLBJ5rFZJhGMdcVWHxtSo7Sml8hSglsiSxlYTNCW3Dkg10YLFTnUcJO4pxSVy/XpmYtABQAUAMftQJi0AFABigBcUAV7yPfDn+6a48wp89L0LpuzKAUY6V4FkbihF7irjGIizZQgO0gHtXq5dRSbkZ1H0LtemZBQAUDCgBr9qBCigBaACgBaBjXAKEHpipmk4tAjI3dfavknPVnVYA/y5qoVdLisalqB9nQjuM19LhElRj6HPPclxXQIMUAJQAUCGv2oAUUAKKACgBRQMrX1wILdjn5m4FcWY4lUKDfV7F0480jPjOyyYkfePBr5ynLlwsm1u/wCv6sbte8S2yCSzl+XJ9a6sFBVMNPQmbtJFjTZg8Hln7ycV6mVV1Ojy9UZ1Y2dy6a9IyEoAKBiGgBr9qBC0AAoAWgAoBGVrBYuijoBXzfEPO+VI6cPbUje8zZLAseMdT1rhq4+2FVJRLVP3r3Es71rXdhN4btRl2Plh72je4VKakSaczG+Y7SoYHiu7KJyeJlpZNEVkuU16+kOcKACgBKBDXoAQNQA4GgBRQAUAc34ig87UYyryIRGAWRyvc9x9a8bM3+9gu56eCUHTd1fUwzOIPkS9vpiOpR1A/DcrE/pXnSeHho05emiO6WDha7tBebv+q/Up3r6xL+807WblAqktbtDGXf8A3WwAT7ED2yeK68FHB1Hbls33/wCHOXF4OpSXMtV5EngC+1S/8QSm8ku2jijwfOOBuxyNo7816tGnRpytG13+RwTjJxbtZL8z0muowENAATQISmA1qQEYNADg1ADwaAFBoA5vxHK63bKihnFuWTI75NcVZRdeKktNPzPRw11h5Nb3f5HJW7i5s7bfG1wJE3SkYBDbuflU9MZx06fUV3V8swqk5P3Uvkjhjiq1S11zPpfVr5bfgTLayTpcpFMUaUkR8lgpXdgjGcZUKflBNOVXDy5Yxjey0fRad99B8laCblK1+nf5HWaUjJrcm5s/Kcj39vavLwtFQxEmlpqduIrRlQjHqdBmvSPOEJoAaWoAQtQAmc0AVw9AEiuKAJA1ADwc0Acx4iuzHq0duzARugLDoe44Pbg152Nq8s0tLafqergqPNRclur2/A5b7JrNrqCho0v9NKOuYVRZBkHGQRwQTnIBHWulqMnebb8m9Pl/mcrnUStFW81v8/8AIvmKW8eGW+iUy24SQxhioGM7RgHrhjnHHJ4rjxGYShPljY68Pl8JU1Kbd2dBochbUmQjhEbB7nJHWqwVVyny9kZYrD8kHPuzoScV6R5wwtQAhNACZoAVTkGgCkcigBPMI60APW4FAEyzg96AMnVbK2vrrfLGCyqAGBIOPqOa8LM5T9rZPodeHnKCunYz30VSgVJ5lX03A4/MGvOlWrcvLo18zpjiZqXNfX0Q5dFUkFrmYkDHVeR7/LVwnUa1UfxG8ZV7/kaWlWUNpctIgYuwOWZixP516mWuTqO/Y5MRUlOKuzVLivXOUaZKAE3E0AKKAHp0NAC+SDQAw2ymgCN7P0oAha3dO2aTGQzxNjcMn19q8rMqLlaSNqTtoRqTjkYrzFF21NWN80ebs9BUp+/YOhetojt3nv0r3cBScY8z6nPUld2JvLJ7V3GY4QmgB4ixQAuzFAABigB+aADNABQAYpgIyr/dH5UmrgMaKN/vRqceorOVGnLdIak0LsT+4vHtT9nDsgux4NWhC0wCgBMUABFACEUgAAD/2Q==</field>
+        </record>
+        <record id="fanta_zero_orange_33cl" model="product.product">
+          <field name="list_price">0.53</field>
+          <field name="name">Fanta Zero Orange 33cl</field>
+          <field name="pos_categ_id" ref="soda_orange"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYASFBJIAHc0ARpcwSNtjlRz/ALJzQAT3MVtE0szFUUZJ2nigCla+INKvZvJt7xXf+7tI/mKTaQFya6t7cZmmSMertilzLuFh0U0U67opEkX1VgRVAPoAaPvPz3/oKkch1UI5f4ha9HoXhmWTcPOkIEak9cdaTA850L4k6xcECLTw5HHySqM/mBUuVuo0rl3VviJexDbe2F9GmMFG8t1PvwwpJ36haxX0bxvYtPmHS7lpifldFRSD+L1VhGprWv3sNgJbnTLxkIGGluo8n8iaXIh3Y74aeMLfUtdubKS2Fq8ifux5m7cR+AppJCZ6nVANH3m+v9KkGOqgPGPicJtX1predZPIiYquw9h/9euCrieSbV0d9KhGUVoZPhfQ4bO4Lx3YIBxh2HX2P0FZrGc+jRVTBqEU1cyfEOoxap4jTTYpkEfmFGeRgqjHUkjOOldlJNxucTaUtUMt9Lis9txHqFghUBsfa8ngK3Qjvux+Bq+Wfcpzp9I/idBqOsLe6PHBJf6Yp2gnddox6eikml7OX8w1Vivso5jTbhLK7gu7bUYRdRNlI4YWJdvQt0x7/SqUUne5EpuStZH0rp88lzp1vPKu2SSJWYehI5qou6IkrOxKrKzyAHlWw31wD/IipUk27dAkmkh9WI8l8WxSTa5cFc4WVsjsea8LG2VVtnt4SSjTV+xnJEiSqwkKspRggHVt4/z+NctGUnUjp1L5m09O/wCTKWq/DqbWJ2njglhlJ+8AMMO2QTXpUZ4inooXRxVlh6mvNZmTL8L9QsSjzQXN0pYBvKTaEHqTk9K2lia1n7jX4/kTSw1B/bvr6fPU5tvD2o2d8YntZJFyQrqhIb/Ct6eKpTje9jGpg60JW5W/Q7Xwr4YktFS5mCLOzZIBG5FyOP05rz62KVaqoRvY9TC4ZYem5T0e/wDwD3axG2xgHpGP5V662PDluSKgV5CBgs2T78Af0qVFJvzCTbSH1YjzPX4XfWLplV2VZju8tdzAZ9PTmvFxdH2tR21serRaUEn26mFM5tIA8o2TJkxgjEjN2JHYDsD1IFZqKoq736HZThzystuvb/g3M1bm7lbLXE7nuTIxrGVWb6s7o06ceiRctdT1C2YNDfXCewkOPyqViKsdpMqWGozWsV9x0el6/DfSCLWYY3JGBdqgDr9cdRW3to4lctT71ucVfAypq9Jv06EzWSWWoSpKEIZA8Tqcq47EY9RTjTlh60L62IlN4jD+6/JnoNrzaxf7or3lsfPy3ZJjBJ9TQxNi0wPMvFDstzfIjbPNuSGYnAVV5PPpyPyrzKsJSlJR3bsevh5QilKWyj+ZyEE1hdyusV20nl/NJiMg4yBkZ68kdcVnXy+dGPNJ6GtPM1UbUItu2hpf2o4MdtpkPlKOBhQzuawlXeigrfmeRUo43ETu015vRIra1ez6dphvhbwPdvIq7fLLrtGdxbHCnp3z1r08ty720260en9aHRWxlTD0owhU5mnuvyJtPvY7nw/LrUumT29ukojBhfzAT3znG0AkY69fbNa1cjpKajCVjSjnta15RT/A2NHuTfaUYAxl+w3GyJyOfJlXzEBHbHIrmxtFwjFPdaGuX4hSqT6J6nqNsCLaIHrsH8q7YO8UeXP4n6kNrOstzeoGYmGcIQegPlo3HPT5vbv9aSd2y60HGMH3jf8AFr9C1VmR5L8Q9wivCuQPNkzj/fjrnw1vrH3/AKHZVv8AV/u/U5zS2sF8O3H9n3slneJH5k88kQIdv4Y1OeMn0Gfyr0JpuS5ldHCnbZmeuu3k/hm/DSsLmKSPMqYDSRtuVlYjr1HPWtIYWlCqpKK1FPEVJQ5XJ6G9qk+nad4p8Pz6BbpDBqFsguIEGFljdtuGHc4yPqKuF3TlzPYzfxKxPDpdtZ2A097jfEWmHkLGJD85AQpzjeNq/nj1rinmdP2lkm3psd0ctqKnzSslrub3h7Q7jRXv57rypLaVrdAqSqWVo1IKsATtIyDjJ+tc2MkpRbfcvAp89l2PSIjmJD/sitIK0V6HPL4mIkQjeVgzHzG3EMcgcAYHoOPzJp2FKV0l2X/BH1QjzDxfEtw97GxCg3DoSe28YB/AgV56qclbm7S/BnpRhz0+XvHT1RxGlrqVvYuLNQLqwvRJ5TAZJKkdO+MdPevYnUpqSu90eZGnOV7LY0IbW2eWXzLAyXl9Fi4tIssm7dnIVfmB4B4PBJ+lcVbH1FLlpq9up20cDT5VKrLlv06m1o+mS6pDFIJraxhjLW9sz2xd12j5gOhRRzkk9c+vOMFiKsZc8mr9DSrVw1KcfZwTt1YyTVo9K8M2Wp2MFvcG21AR3z4JZ2RtyFSfuqQPTvW8KcYRskcdWrKrK8mbOh3mkz6Q1zpVlcxwXd5LPILlxuZgoBIwegLAD6GsMXKySOvL4Xcnfsv6+49Dg5t4z/sj+VdMPhRxT+J+o802QwpjPL/EHkT6xqNnO/lx3DMjSZ+4c5VvwIBrypVOTEO+z0PU9lKdCLW62PO7/UtZ0q6fT75UaSI9WX7w7HI6jHSuuphYTSV3ZHPSx1Sm27K7N/4f69eNrTwzXsFtaiN5nVgqh3wFAJPJ9cZ7VrSpqnGyOetVdWbkzQsNVu9KH9h2j2+vRXTkuJUaLbISS4904yc4zzVtpK5CVzVk023vpp7i7j+3TzsGlLFkhyBgBUB6AcAnJrycRmTT93Q9KlgIpe+y9HBEtnbxW8CwLbYiESfdAZicj8SfzrL27rq73OuhGNC66av7kegRDbCg9FAr247I8Jy5nccabJYUxnlHiOzkbWb+7JLRrK3yhemDjOenccV5tSnHmc3smevSrS5Y046NxM2VrG/t0tdWtfPgGRDKrfvIhjPDensfyrrg7q8NV26o46sLO1TR9+jK9t4S023meaz1po9yY2Twtlc8jLIfQfjVOoktU18jJYeUtmn80amk6TFp/wBquY9YW9lMe0RRQsiRgkZYZ6njH41xYvERnSagzsw+DqU6kXNWR0th5PkqDwMdq+dq6vU2rc3MAZVldu2UGPqwP9DXXlycU7/1qOprTt3v+R20f+rX6CvqI7I8a1hxoYmFMZ5H4ov5rbXdRsizKJXbCOABgkHPP0HSuCs2oyTW7PSw6jKpCSa0RiI7xklGx7etedGcoO8XY9mdOFRWkrkqTnABUHHTk8cEdOn8Rrd5hWcHF2d0c8ctoqakrqzuWtOuvsk+8rvjYFZE/vKa44S5Wdtal7SNuvQ6C3aMKGt76Lyz2lO1l/Dv+FKdCMuxxSjL7UHfy1K91qNuskVuk4b59zN0MjdsDrx/WtqdJu0Yq5pHlpJym0tNEemwgiCMEEHaMg/SvfirJHzMneTFWRXd1AbKNtOVIBOAeCeo56j3HUGlcJRat5/18h1UIo6to9lrFq0N3bRTHHyl1B2mpkroaPPNR8BJbSEpp0oX+9byP/TNYtX+JGkZyWzaMv8A4Rm1U4Mmpxn3nH9VpexpP7KLWLrr7bLVv4PhlYYu9SPt56f/ABNP6tS/lQ/ruI/nZs2ngG3lA81LuRf+mk7c/lirjRpraKIliKst5P7zqdF8LaVo37y3sYUnP8YXLD8TzWiRi3c2aYAaTEwpjCgAoAKACgAoAKACgANJiYD/2Q==</field>
+        </record>
+
+        <record id="evian_50cl" model="product.product">
+          <field name="list_price">0.52</field>
+          <field name="name">Evian 50cl</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAMQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGZ4h1yHw/pn22aNpAXCKoOOTn/CqhBzdkJtI4eb4o3Y5W3t4weg2M365H8q1+ryJ50RxfFieJwZ4reWPuFRlb+ZodBhzo9F0vUI9V0u2v4lKpcRhwp6jPasWrOxaLVIBF4H4n+dY0FaL9X+bGxa2Ech8TQD4UBLBcXCHk47Gt8L/EM6vwnkdzaylV2q7AjqFJFegYNlJrOYDc8ciqP4mUgfnUNX2GpI9/8AB6hPCOmKM8QL1rzanxM6Y7GzUjEXp17msqN+XV31f5v+v8xsWtRGL4qvre20iSCby2a5GxVfp7n8Kukm5aEVGkjizBon2dVMdvuzkkoB/SuvnmcvLEljg0kWzGNbYMhycICQPrjNS5zKUYncaJqcWo2Q2MvmRfK6jt6GuWcXFnTCSaNGpKETp+J/nWOH+B/4pfmxsJHWKNpHIVVBJJ7CthHAahfxaxdtcTLgKxWIE4wvauhwcFoc/MpvUha3VsbWIx6qf6VPOyuUsWcS+aUd0YSKVPH+JNJzfYaih9hfRaNeBg3LNtYetXyyqLUm6gzuY5FliWRDlXAIPtXObjh0/Gopqy+b/MbM/XpBHo1wCQPMXYPx4rWGjInscvpFrbwzKDEZFAxsJJH171c6jkRCCiN1TT4Tes0W6OPAwmNv4+tKM7IbhqOsEaGdQgUj0PP9alu40rBeQpPJ5zKQ7DDcY/CqjUaFKCZ1GhSiTS41zlo/lb+dRLVlx2NADFRGPKtxnP8AirzGNpGrYQliwx1xj/GtYNJMid9CDR2MBkbbHzj7zgf/AF6ljiU79/MvZGOM5xwcigBluxWZSCBz1NAFi52SsuG3e+c0IGaPh5PJuJ0y3zKGORjvTk7pBFWN2pKMLxMAPsr5IwzDj6D/AAq4K9yJ6WMVpwqkEdqfIxcxXEu4nik42BSuSI47j9KLDuTI4JxnaPoaFEVzW8PlTez7ckBByeM80SVkOJv1BZh+KCRbW5Az+8/pV07XInsYiRGXgDr0qyUjH1XVG025hiESy+c5UHzMBenoD61pTo+0vraxLlylnR78anaJOV2bmYbd2ehI/pWdWn7OVioy5kaDxFB8rD+dSmNo0vC4xd3PzEkqM+1KbvYcDpKgsxvEyhrOEE4Hm/0NXTdmRPYyIIVG0ocMOhAquYSRg+JnkE9lEgVUNzuOw4JwPw966aFrS9DOW6DwzHtsVB4IkfOP941niX7/AMiqa0NyYpHC0m5gFBJwOwrnW5bLnhXeLq43hclAfl7c9Kc2ELHTVBZl6+gezjDDP7wcH6Gqi7MmexkxIMEKrEY5x2obYkjnvFUTlLTykdgs4YheSMDP4V04WWrv2IqLYXw3DKLEmRWT985wRjv71OJa5/kOmtDdeETRPEwADgqfoa507Mtl7w/ataXTo0hdmjJJ247inOV9RQjY36ksoazF5lohzgLICf1H9acRS2MOSIxtkN16GgkgkYA5Yk/rTSBsarI3K8/hQ0wuXrBFZ2Yrkr0FIZc0dzc6lczhspGgQfXOf6Vc48qSJg7ts2qzNCO4hFxbyQscB1xn0oTsJq5xGr391pTeXd27DaOHxlW9wa6IUoy2ZjKconJ32uy3cu6QMkI4wv8A+sV106SjojGbcitDqwtnWSAzsQSCD39KupFbNExjLozotK1++1FTBb2UrTMMZiU8e/t+NckqcI6m/NJ6HeaBpsmmaYsMzbpnJdz6E9q56k+aVzWEeWNjSqCwoAbJGkqFJEV1PUMMg0AZ03hvRJyS+l22T/djC/yq1VmurJ5I9hI/DGhxY26Xbcf3kz/Oh1ZvqHJHsaMNvDbR+XBCkSD+FFCj9Khu5Q+gAoAAAP/Z</field>
+        </record>
+        <record id="evian_1l" model="product.product">
+          <field name="list_price">0.70</field>
+          <field name="name">Evian 1L</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQALgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZKZICgZwcWqXj3lxm7b5ZmXG4kcGvWUKfKtOh4kqtTnfvdToPDl3JcXF5G83mbNvG7OOtcuLjFKNjtwUpNyuzerjO4awJAwSORyPrQOO4uKYiOaVYImkboo/OhK4pOyKNnp6sGmlJ3SuXI44JOfSrc2tjKNNPVi28aWF9IuTsnYZJ7HtSb5kOK5HY0qg1GvtCjcMjI7Z5zQio3uOxQSUrthJMsechOSPftVR2IlqyzDgRikykU75oXlMJdd5UHbnmqjdEzs2WLC4+0WwLHLoSj/Uf48H8amSsyou6JLhZWjAhdVbehJYZG3cNw+pGRUs1puKfvLo/y0/EWR/LjZyCdoJwKZmYugXj6rpqX8ibGnZ2x0wNxAH5AVpJJPQzhdq7NUjjk5xSKK99YWt9BtnhDEdGzgj6Ec0KTTFKCktSro0KadfS2UKsI5Q0uWfccjavHfFE25aipxUXZGw+dowxHI5H1qEbR3EkAaNh6gigk57w/cJa6WtusR/csy4JUE5JPT8a1cTOD0NcXKeT5shCKFLEk4AH40lFt2Q5SUVqMa8ja3SRCrpKMowYYYde/tTcGm0+hKqKSTXUq6dJ9o1p5MYEUBUHcDncw/wDiamSsi47m0QGGCM85qC07Ebn5G+hpiZxmlSC3tJZbpcrHnO0cnk//AFq6JtCoxcrJbss2mqWdzMZrjTJhLLAEiWUEpKCyfKAwHOWUn6HrjNc6xk1HlWmt/wCvvOiWTwc3JyT0s+tlq9texHDqFpNJp62+mq0zRgwusrKgJ27lJ2kD754BY9elNY6rJNb8w55HRpvmvbkb+7Xz/NI0vDreZM1wUEfnQhwmckAmqk7xTMalL2dSSXc3weazERvyhHtVCORsrKURlkgZ4pCQVUZ7/wCOa1crsqk7L0NSwtI7ZIlFgoMTb03RklTgjg9OhIrJ04GksRUd9Xqv+CSLpNpE6SQ6fDEyDCtt+6OOnp0H5Uo04IJ4uvNWcmGmB01GQGERr5eEAXAABHAq5WtYibTtrc2FPzCoZKGE5p2EZ1i5RXs4VkYxOQXYHAGc9T149M02iE+hfAI//XSKGyLuUqSwz6HFMGipaRFdQc+azqsePmxwSf8A61DZMVZ7mih+YVL2NEMpiKkK+TeXDD/lowJ/IUydmyx5j+nH0osO412O33oEyKzjKyzyf3yPzxQES4n3xSexSG0AU7eVbjdMvRmIH4cVTViE76k+RjofzpDBgPLzQD2I7Z8TPH6jcKAiyzhyV8tlU7hksuRjPI6jnGee3v0qZXsaRavqG00yTO0xCtuUC4XexXBz1JP9auT1Mqasi0VNSXYGVyuAcfSgGmU7aIR6tg72dojzgkAZHGSf84pt6ExVpGsikMDUNmiJMCkMy7LTpbZ5kWVgN5KhuVIPI+npV8xmotFGfVWj1JoDHA+xCS+5gRgjjGPetY07xuYTruMrWTLdhcteqytNCsgOdsZJwMep6n6VE48ppTqc4/T7KQahLePKzoRtjB4wOO1KclaxUIvmbNSszUKADFAEMlnazSCSW3idx0ZkBNNSktmQ6cW9Uh6wRIQViQEdCFFK7KUUh9AwoAD/2Q==</field>
+        </record>
+        <record id="evian_2l" model="product.product">
+          <field name="list_price">1.26</field>
+          <field name="name">Evian 2L</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APVdtUIztVuxZNb7nZFkYrkZwTjpW1CKle5jWbVrFPTdRN1rBgSZ3QQliCDjqK0rQiofMijKTlr2NsrXKdJUu1ww+lJqwo7s0iKYzMvIEvbqMsrkW7ZQqxA3Yxng81cdCXqRpZLbXa3cUTFwNjfMfunGeM+wobuhJWNTAIzUFlC7OZSPSkwReunMcJ2/eY7RTQMI7cJbhunYU7isPjjD5HtQCRCpMc5hY9RuX+v86TBFS7z5zZ/D8qTGi3dg+ZFxkAk1SEyQMxQZPA7UgHRthhg4oBFa5VjqFs+GCjcCe3Ip9A6le8BEzZP0/KpY0XbkHz0OeMGmhMUsFOCQPQUwJUZWwGHOe1IERXZI8pQRu8xfyzz+lAFG8XE7nJO4g8npwKTKvcv3QHysQDzjketUiWMaNCVfYCV6Gi4EkZ5HFIEPlMbbBzuzkUDMaWaKW9vEjDBoZQkmehby0bj2ww/WoTTuazhKMYt9Vdfe1+aZqXThVQHqzccVaMWLtIiDFxz2pgLD8zYDAH3pMCP5hcjhsDIJwMU3sHUzZbYwXt5IZC32iUSAYxsxGi49/u5/Gs7Wv5m06nOoq3wq3rq3+poXshQx4Xcea1ijFlS8unS3EiQGQ915/oDRYRDp95vmYtatE4GR1/maY1G5pLcea67QSM4JL9PwpNDaaZVvf9cf89qhgtya/GTEMA5Jq4ha5Tufs8gFvLqCwuSBtY8c9vTJ9KaqQjLUqeGrzp+4vmNdbG0luxDqRhKYBJUMIjz0x0HBzVLEQsk4rQy/s7Eu8oyfvbX6eglldxT38UKzee8SfPLtI3YOO4weQenQg1Mpxk3ym/sKtKkuff8Ar7ize/64/wCe1ZvYzW5Nfsq+VvXKlquBcFd2Kf8AY0E00srvujn+98gLg7dvB7cY/KplT5nc7FjZQil1X3b3Irrw7FcQshvZ/wB5D5UgZAd55y+P72WJ9smo9jfqVDMuV35Vo7r/AC9NCO1tYrPVII0kZmC4O703Mf5sa0jDlRz1qzqRu1u/0X+RfvOZjUvY5luT3R3SxL2yciqQh20ADacfQ0XHdhuY9WZh6GmK40hVlVtgVieuOaQXZXu/9axzn/8AVUsaJ59rMjEDjgc4qkJla41G1tsNLcBVPYoSf0qlBslySH21/a3RPlzD5Tjn5f50Sg47gpJliTblSCCeuN2SR61LKKtzy5PPPrUsaJpOw7HrTQMx9S0Sz1NAtyHKf3VfArSNWUdiXTjLcqw+G9Pg1FbqMTLKRgnzCePxpOvN6AqUVqb6KIwir0Oc1LdxpWIZecn1qXsUgP/Z</field>
+        </record>
+        <record id="spa_33cl" model="product.product">
+          <field name="list_price">0.40</field>
+          <field name="name">Spa Reine 33cl</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAJAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGP4m106Bpq3KQCeWSTZGhbaOhJJP0BrpwmFeIny3toZVqypRva5zOg/EuXU9ch06701LcTNsDpIWIbtxjpXZXymVOk5qV7GFPGqU1Gx31eSdgUwCgDzn4maiV1OytI87oY2kbJABDcD/wBB/WveyWj7kpPq7fceZmFW0or5nB6Rc/Y9SE3lrgSAkjAIAOeK9jEw56dr9Dio1FGSZ79bTpdWsVwmdkqB1z6EZr4qcXGTT6HvxaauiSkMKAPLviNZTXHiZGWOXBtV2lULA4J9Acde9fQZRiFCi0+55OYUuaonfocYmn3is7NbSgLz/q2P9OPxr1J4inbQ4o0m3ue86VE0OkWcTqVaOBFIPYhQK+OrS5qkn3bPoYR5YpeRbqCiC+vYdOsprudsRxKWPqfYe56U4RcpJLqKUlFXZx9pZaprzNrcd7GDOmI4WQERgfw55/lXd7WNJcln5nI6bqPmun2HPoHiCeKRJJrRARwV5z/44KaxMFbf+vmT9Xk77Gp4c1CeCd9B1KYSXltGHSTGPMjP8yOn+TXNXjF+9FafqdFGTS5ZbnQ1gbHK+OZGkXTdPIIiu7ghnBOVIHyng+prpw1kpS7Iwr62Xdm5AkkUakWY3KoBIcb2/wAfxIrFu73LS0FW/gJ2MJkf+40TA/oOfwo5GF0Zuup9jl028t0KyLdqpVRyytkEflVQ966fYHpY36yNDmPG+YYLG8ywEUxUgDOcjP4cr1rowy5m15GNd2SZz7a/qdxFvSKQuD8tx5rDb9APl/MVv7KEXqzLnm1oid/E2uOBG0YiwMs6RHLcdf8A9VEaNLuKVWp2J4NQutY1DT4p5AwS4SQYyCcHPP5UTpRhCVuwQqSlJHc1wHYY/iizF5pSowyEnjYj2zj+taUpcsvkRUjzIxbe80ty6wzRb49ys7/JjbweTjIHqOBW7w1ZJNp6/qZ+1hshl1NZrC8zy28kKfebzFKrzxk9qHSm2lZ39GJTS10J9EtVfWreaJt0SxtIMHIPGB/OsnNqDi+5fIuZNHXVialXVONMuHxny0MmPXbzj9KcNZIT2OHvvD08oupLW/Cw3UT5QxnDM3dsZGR6gAnvnrXrUMfCKipR1i1r6f1texx1MNJt2e6K1z4WDPGn21juVVuC0Q5Cg7VChQCM5OT6Cn/aWj930+e/W4vqvn6nReDrY2gNmZvOa1gVC+3HBJwMfRa8/Ez9pJzta7OqkuVct9kdTXOaEdyUFrKZD8gQ7vpjmhXvoDOM0VHuPD9kwdvMVAskbkkkjjcCAeDjP+FdVRNSZhCSsWWsJzdKN0iR9pG3En2Ax/Oo3RV0i54YRUv9WCq6p5sYQSAg42Dnn/a3VNa9kh07as6KsjQxfFt4bTw9OEI8y4xAmTjJbj+Wa1w8b1F5GdV2gyvpcwi0+GKWEQ7FCssgbaCB2bGDVz1ZEVZFyOMTozLJG+4EZVt2PoRSvYLXKtgktn4mcSSoI7uHCx5+bcpznH0J5oqe9T9GOGkvU6CsDY5nxgTNLptkzKsU0xZ9wHOOgyfqa6MPZXfkY1r6I1ba2e3QRrcluuFkAI/Doahu5SQMiIwVoojk5IB5PvjHWhCZmawjWt1ZXVspj23CKdo5YE4Ix+NXF3TT7Ca1R0lc5sZHiIxw2a3Utu8yRZDeWgZlBH3hn0IFaUruVr2Inaxx7eMJbOJI9QsluFDKrRkbmGe4I6cdjXpRwfPqnY4ZYnl0auW08Z2NhEi2mn7GnY4wu1RgdWIznp/+qiWAnLWUv1JhjoaqKs7X7Fyw1E+I7y0Cbt0Ewll4G1VAPTr1OBXNXpexTR00KntbM7CuI6gIzkHpSAzbvw7o99MJrnT4ZJAMZxj+VaKrNdWTyR7FWHwX4dt5Xlj0yPL5yGJI59icU/b1P5mDhF9DWtbO2sYBBawRwxL0VFwKzbbeo0ktiagYAP/Z</field>
+        </record>
+        <record id="spa_50cl" model="product.product">
+          <field name="list_price">0.46</field>
+          <field name="name">Spa Reine 50cl</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHC+O/FmqaHqkNpYSJGrwByxjDHJJHf6V6+W5dTxNNylfexwYzGSozUUuhzWn/ETxE97Ck1zFIjSKGBhUZGeeldtXJqCi2r7GEcxm2lZHr9fNHrCKME89TQNi0xHnfja2s9Y12MreSL5MPlybF3AHOQMDk9TXrZfiJ0IPTRu5wYumqkl5GBaaBZ2V3DMbu4wkiswWIpwCM/eyOldlbMJVINJdDnp0OWSbPX7e4iuoEngkEkbjIYd6+daadmesmmiSgZjeK9QbTtDkZJfJeZ1hEndAxwWHuBk/hV04czJlJRQ+z06ygs47VbP7QsKKm90U7sD1brTcpdyeVdhTbWUPzPYWUTdg7KD/I0c0n1YWXYz9KvJIPE8tn5cMdvdQ+aqxyFhvUgEjIHUHnH933q6kI8l763FCT5rdDpawNTnvG0CXGiRpIWCC4Qtjrxn+tb4aXLP5GVeKcdSoniINGFbTo7kqMEqp4+vBpulZ72BTv0GL4guo3Pk6VDbL13Kmfx4xTVKL3kS5yXQm0uVr3xFDdStvkWF1BIxgcdqVSKjD5jhJuR1Nc5sY/iqLztCkHpIn6sB/WtKLtMiorxMMXelxGS1DKXgyHLodqELuPzEY6cnBrdUKrSlbf8A4Yz9pBadivLqekiJ7hrm1kjjwGYMDsz096bw1ZtLldxKrBK90a+hQhNaYjJHkEgk+pWsJSbh8zRRtL5HS96yNDO8Q8aDeNwNke/n2Of6VdP40TP4WcfeaRDqDNfpcyxG5hZWC7RkMhAz0yMEEA/pXdRxjpxUOVOzT+5nPOgpvmvuiCbw5YyGGMyTNtj2SHzcmTCkDqxwACeB/e9qf9oVFd2W91ptrf8Ay1D6tHQ6HwqgS7mhWRpBbW8cYZ+p68n8q5Kzur922bQ3t2R09YGhQ11Q3h/UVJwDay84z/Caulfnj6k1PhfoYWgWEV7oFmbh545I4EXPykHj6HP0PStaztJ7GVL4epcbRrZLmN2cbCSPLZdvmfTv/jWadzQt6ZBEmq6hcBAs0oiV9rZXCg7foeTx9KmWyHEu2scyXF40pba8waLL7sL5aDgfw8huPqe9ZRUk3fvp9y/U3qyi4wt0WunW7+/S2vy6FTxKxXw5f4baWhZAfrx/WtqVudXMJ35WLplv/oVsHTyzGg4Vupx3x1om9RRLU0JkYZY7ADlc43enNJOw2ZulybPEGoWvyriOOTavTncM9Bzx79qqa91MUXq0bXesyzJ8UMF8P3G4bgTGuPq6j+tXS+JEz2LtpxboNu3CjilLcSJycAk9qlDMLT5YZPGF4YySTapk44OGP+NbTTVNepEbc79Df71iamV4meRNEl8p0Qs6KS/TaXAP44zV0leS0uTN+6Sx3HliODz4dxUfxZbP0oaEmSt5ecM0kxIz04x+HFLUDMtfPXxQmY0iia1cBR1+8v8A9b86uVuT5ijfmN6sjQxPFsZk0mMK6IVuYmBcZHDZ6fStKPxEVPhL9kjrCDvjYEDGxSox+ZpT3CI545y7MjxqD2Kn/GldBqZENuyeLIJZJt0htpMhRgDleOp/n2rST9zbqJL3tzoR1rA0M/XLKS/0uSKEAzIVkiz/AH1OR/Krg0pakyV0cXrGrarZ2LhYDayhgpcFoljOM5ODgjr2NelQjRlJXdziqyqpOysZmk+J9anu2iml+1PIAISsr7euPu8E59a2r0cPy+7p9xnSnW5tUzt/DEGpHzJ9TtxE65WMg/eBOScZPHAAz/WvNxLhe0WdtBTt7x0Fc5sBpAIwBBBGR70AAVR0AGOOlAC0AHemAP/Z</field>
+        </record>
+        <record id="spa_1l" model="product.product">
+          <field name="list_price">0.65</field>
+          <field name="name">Spa Reine 1L</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHPeMPEsvhuzgmhgSZ5pCuHJwAB7V24DBfWpNXtZHNisT7BJ2vc5vSviZe3mo29tPYQBZpVjJRiCMnGa7q2SqEHJT2XY5oZkpSS5d2ei14h6QClfUApgcx4ug07VBbQT6jb25t5Szb51XgqRjB/Cu3A1Z0ZNpPVHLioxmkm1uc5p2gaJYX8dxBrto5SZZCv2qM5AYGu/EY2rVptOL27HLRowhO/Mj0eGeK5iEsMiyI3RlOQa8Npp2Z6aaa0HBVDFgo3EAE45I/yTQMzNeu57ey8m0eNLmf5VZ32hB3bPtn9aqmk3qTJ6GNBpemW8IEurxRykZeRQoZj75zk+9dDqSb0izFU0lq0aENlpVyAsepiY+gaIk/htqHOa6fmUoRfX8ia2tbXRZA0Ez+VM+14zjAY9Gx2/+v7VMpSqFRSga9ZGhzPjBIt9lLKWOCwCp1PQn8OMV0YfqY1uhizToqEwwInbccn/AOt+lapa6sh+RFaNIkirMlud3K4GM/kBVSatoyYqXVGtvRkit42kjDyKu3dlevrWdt2XfodfXIdBgeLIRLFZKQvNxt3Y5GQen5VtQdr+hlVV7epnW95pXmPDBcRebHuVixwRt68nGQPbgVcsPWsm07P9RKrC9kx0ktq8Tt50MsajL4kVgB71LpTTSs0/Qamu6IoYYGv9OmiKyRvMpUA5X1yMfTinFySlF9hSSbi0dnXObGR4kk8qwhkIBVbhC2ew5/ritaMeaTXkRUdlfzOXutAuhLcS218iQ3Mc25PLcB2ZTgkDIBH94AZ9MmvSpY6nyxUottNa6aWfyfyexyTw8rtp7p/iVpPC7BbaMXimXykimLRjaqLztCqBuyygZJ6CreZpuT5dLtr1fXVu2nbqL6o7LXpY1/DtpJpc+n6c8izFJJCrbSMJtbH48gVwYmoq0pTSte33nRSi6aUXqdjXIbmH4yRW8M3LMm/YyMBnHO4Vthm1UWpnWScGIbKSS1ia34TAJjLbSDjsen4frSbswWxG1hdiQbJG2j+KSXK/TA5P6fWloxiW9rDF4ptwP3kiW8jFz1B+Uflz+tW21SfqSknO/ka0Ut2dbuonU/ZFtoWiOzAMhaXf83fgJx2/GuZX5n6G7iuVO/V/oU/Fgjfw/PHIwUSPGvzdD868VvQupoyqfCWrFitqiyfLtG0ntxxUz30FHYsNIm04dWPoCMmpsUZEKyf8JPBLLsRXtpFRB1+8prWTXs7LuRH4jdrE1Of8XvutbK28syGa6XKDuoBJrbD7t36GdXZLzNa0BSGNRgADGDwazluOJKxk2glVB7gt/wDWpaDMS6mSPxHp8uSxd2jO3GFBU9e/XFbJN02Rf3kdBWBqYWuS7Nb0gbVJLSfeOB0ArWnG8ZGc3Zo143G0qQw2nHKms2ikOIU87QxHTigZi6vGwuLK4Iddt3EMbgActjoOvWtYPRryM2tUb1Ympiaunma7pql9vEhGMZzgZ6g9q0p/CyJ7o11VgBhgRjuKhlIVd/O7Htxj+tJ2Aytd2hLVpJNpN1EFA7tvB/pWlPr6ES6epsVmaGXrdu5NrfRRtI9pLuKqMkqeGx+FXTe67kTXU5/VPGMFqEeyaZN6lmTbkjHsQQPzHeuylhOb4rHPOvba5nWXj2WeYLOl0wBGUIVOD3+Xmt54CPL7rX9epmsU09b/ANeh1KfZdantmtw5htpvNLY4ZgOOTznkVwS5qad92dKtNqxuVgbBSAq3emWF8pW7soJwTn95GDVKco7NicU90Qw+H9Gt5BLDpdojqAAwhXIx07VTqzfVi5I9kX1VUUKqhQOgAxUFC0AAAP/Z</field>
+        </record>
+        <record id="spa_2l" model="product.product">
+          <field name="list_price">1.30</field>
+          <field name="name">Spa Reine 2L</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGD4u8QzeHdPiuLe3SZ5ZNmHzgcE9vpXZgMGsTNpu1kc2LxPsIp2vqZXhHxveeIdUazubOGJRGWDxk9Rj1+tdOPyyOGp8ylfUywuNdafLy20OzryTuAUwA8cnigDk/EF7pWtJHCJZJEt5dxaKB33HBGARxjmu3C89F83ddzlruNRW8yhosek6DfC5gWdV2MpU2snfHPGfStsVVq4iNn+Zlh4xpPr9x29vcQ3cCzwSLJG4yGFea007M7k01dElIZgeKdWNiLSzWAzfa3Idc4yoxkfjkfhmtqFLnu+xlVqclvMzJNUihQNb+HbaQjjAUf4VsoSe82ZtpLSI+DV4Z223XhtI1x95owB+q0OlJbTEpp7wL+nazEb60tra0ENtcl04wNrqMjj0wrfpWdSlKzbeqLp1FdJLQ6Cuc3OX8YO0V5pkqzlCGdQinDMTj9P8a6cMk1LQwrtpooXWn6jfxjzZWVD1DtnP0//AFVUakIvRBKEmtWJBp9zZPmB3ZRxlWwfrjj+ZolVi90KNN9GW7CeWbX7BJJH3IZD+8cncNh6Z75I/I0TUfZtoIt86TOtrkOgxNcjDarprbWYoJW2gAhgAOPrnGPxral8EvkZzXvRMeTxNEdOkvZbdgkZUGOKVWZSTjBzgg59R+NdkcBJ1FFPfumZ1KqjG7KkviWGNrhFtrgXFuyq0JZTuypbIZSRgBST6U5YGVk7qzW+ve3W3UVOqm2tbmxabZ9a0u5jY+XJHIwxjkleCfwz0rjs4wnF9zWS9+L9TpqwNDmvEtz5eu6PAJVHmGXfERy6kAcH2zXVQX7ub9DGq/fj8yle6Bps+/zWkKzKq7muMnaGBAGRyPr6Y71rSx1WFrW08vIKlKM1ZjJtN0y4u4j9kttkanbGjLsyQMkqByeMVH1qsov3nr16gqUeZOxNYKlp4g0q2hbyoBHKqJy2/wCUnqemMVLbnTlJ73QSf7yJ19cpsYHiOCFtS0e4ldI1juGDM2BwVPHPuFrajKSTS6mdSKbTZZm06K6/ewyeWCTkMuVJ9ce/sRU3tuNEZ0e3WR5JJf3KDOxAFz7E9/wxRdsHoOFrC/iK2mSRT5du7KoPA5VQR+BIpuTULeYkk5F6zS4S5vzPu8t7gGDLZ+TykBwM8fMG449e9c8U7u/f9EddaUHCny7qOvrzP79LfkZGvXbJ4g0e2EQYFpJMk45C4A/X+VdFKN02clR7G2m9kU5UHvxxWbGhSWAOcHjjtQBii4MHia0jFqieekqMyNnnAbPQddtbSV4XuRF2laxv1gbHN63JGnijT1kuRCpgkJywG7kdCelb0k3F2MqjV0bdu0Tx4SQSKO4ct+tZyTTGnoPbailgSMfU/pS3GYklwH8UaeqXWVbzMxKo/uHqe1bONqT0M0/fR0Nc5uYWpxRyeJrHzGAxbyFAUzk5XPPbitad+VmdS10agfbGCkbOPQYH86loB5PqKQzJykniCzPlzqVEmCwUL93n3rWStB7ERfvdTcrA2MXUto8RWGQSTDIAvqcrz+HP51pTT5WZz3Rp5IxhCfcYqRinIB4/KgDMaTd4itEHGEkOCcE8Dt6c1o17jJXxGzWJqZOu20u2C/tomkmtWztUAkqeDjNa0Wr2fUzqrS/Y5+78dLp6fMkNw4GTGrFH64IxyMg/hXZHA873aOZ4my7hYfEWzunETWrxMT1eQY9e2e1Opl0o6p3FDFp7o3dI83ULptSuLfyiqmOHI6qeSf0FcldKHupnRSbl7zRs1gbBSAqXelaffDF3Y284zn95EG/nVKco7NicU+g2HR9Mtpnmg061jkkOWdYVBP6U3Um1uxckexdFQUFMAP/Z</field>
+        </record>
+        <record id="chaudfontaine_33cl" model="product.product">
+          <field name="list_price">0.34</field>
+          <field name="name">Chaudfontaine 33cl</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAMQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGZ4h1yHw/pn22aNpAXCKoOOTn/CqhBzdkJtI4eb4o3Y5W3t4weg2M365H8q1+ryJ50RxfFieJwZ4reWPuFRlb+ZodBhzo9F0vUI9V0u2v4lKpcRhwp6jPasWrOxaLVIBF4H4n+dY0FaL9X+bGxa2Ech8TQD4UBLBcXCHk47Gt8L/EM6vwnkdzaylV2q7AjqFJFegYNlJrOYDc8ciqP4mUgfnUNX2GpI9/8AB6hPCOmKM8QL1rzanxM6Y7GzUjEXp17msqN+XV31f5v+v8xsWtRGL4qvre20iSCby2a5GxVfp7n8Kukm5aEVGkjizBon2dVMdvuzkkoB/SuvnmcvLEljg0kWzGNbYMhycICQPrjNS5zKUYncaJqcWo2Q2MvmRfK6jt6GuWcXFnTCSaNGpKETp+J/nWOH+B/4pfmxsJHWKNpHIVVBJJ7CthHAahfxaxdtcTLgKxWIE4wvauhwcFoc/MpvUha3VsbWIx6qf6VPOyuUsWcS+aUd0YSKVPH+JNJzfYaih9hfRaNeBg3LNtYetXyyqLUm6gzuY5FliWRDlXAIPtXObjh0/Gopqy+b/MbM/XpBHo1wCQPMXYPx4rWGjInscvpFrbwzKDEZFAxsJJH171c6jkRCCiN1TT4Tes0W6OPAwmNv4+tKM7IbhqOsEaGdQgUj0PP9alu40rBeQpPJ5zKQ7DDcY/CqjUaFKCZ1GhSiTS41zlo/lb+dRLVlx2NADFRGPKtxnP8AirzGNpGrYQliwx1xj/GtYNJMid9CDR2MBkbbHzj7zgf/AF6ljiU79/MvZGOM5xwcigBluxWZSCBz1NAFi52SsuG3e+c0IGaPh5PJuJ0y3zKGORjvTk7pBFWN2pKMLxMAPsr5IwzDj6D/AAq4K9yJ6WMVpwqkEdqfIxcxXEu4nik42BSuSI47j9KLDuTI4JxnaPoaFEVzW8PlTez7ckBByeM80SVkOJv1BZh+KCRbW5Az+8/pV07XInsYiRGXgDr0qyUjH1XVG025hiESy+c5UHzMBenoD61pTo+0vraxLlylnR78anaJOV2bmYbd2ehI/pWdWn7OVioy5kaDxFB8rD+dSmNo0vC4xd3PzEkqM+1KbvYcDpKgsxvEyhrOEE4Hm/0NXTdmRPYyIIVG0ocMOhAquYSRg+JnkE9lEgVUNzuOw4JwPw966aFrS9DOW6DwzHtsVB4IkfOP941niX7/AMiqa0NyYpHC0m5gFBJwOwrnW5bLnhXeLq43hclAfl7c9Kc2ELHTVBZl6+gezjDDP7wcH6Gqi7MmexkxIMEKrEY5x2obYkjnvFUTlLTykdgs4YheSMDP4V04WWrv2IqLYXw3DKLEmRWT985wRjv71OJa5/kOmtDdeETRPEwADgqfoa507Mtl7w/ataXTo0hdmjJJ247inOV9RQjY36ksoazF5lohzgLICf1H9acRS2MOSIxtkN16GgkgkYA5Yk/rTSBsarI3K8/hQ0wuXrBFZ2Yrkr0FIZc0dzc6lczhspGgQfXOf6Vc48qSJg7ts2qzNCO4hFxbyQscB1xn0oTsJq5xGr391pTeXd27DaOHxlW9wa6IUoy2ZjKconJ32uy3cu6QMkI4wv8A+sV106SjojGbcitDqwtnWSAzsQSCD39KupFbNExjLozotK1++1FTBb2UrTMMZiU8e/t+NckqcI6m/NJ6HeaBpsmmaYsMzbpnJdz6E9q56k+aVzWEeWNjSqCwoAbJGkqFJEV1PUMMg0AZ03hvRJyS+l22T/djC/yq1VmurJ5I9hI/DGhxY26Xbcf3kz/Oh1ZvqHJHsaMNvDbR+XBCkSD+FFCj9Khu5Q+gAoAAAP/Z</field>
+        </record>
+        <record id="chaudfontaine_50cl" model="product.product">
+          <field name="list_price">0.44</field>
+          <field name="name">Chaudfontaine 50cl</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAJAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHnfj34gaj4a1xdPtYU8vyVkLkckkn1+ld2EwsKsbswq1XF2Oa/4XBqwmUxwqVHVWAwf6/rXQ8DTSIVeVz2KxuGurC3uGXa0sSuR6EjNeVJWbR0rYnpDCgDjvFfhCw8Qaul1PJIJEiEeF6dSR05712Yau6cLW6nLXg5S0ZjS/DLS127pJl7jk5/Umt/rjfQy9jJPc9Ht0WK3jjQ5VVAB9gK8x7neh9AEVxN5SD1PApxVxN2M6Kzja5EsjMxJyd2TWzm7GSpJu5NfWkE6qehHGRkVMJtDnTUh1o/kAQlmYE8Fj0pT11Kh7uheFZllG/fFzChHBBOffitILRkyeqEQ9xxTAVizD5jxRawEEj7GTC7jvUYzzyadrkt2NWsTQp34O6I4yMkGrh1JkInTjiqBDj065pAQMf38YC/xin0F1NIVkWUdVuBbQxOy5UyYJ/u8HmtKUeZsipLlRQj1WFpBGJV3HoCwAP0zWrpSS2M1VVy5HOZc8AAdwwNQ1YtSuRifddQBFMgdyCw6LgHn9KbjowUtUaorA0KGsqr2O1hkFhWtF+8Z1fhOM8Q38+lWEUtoUWR5QnIz8pB/wr08LSjVk1LscdRuK0LHhi9uzqd7b3dzHMsUalWRcA5J/wAKjFwhyRcVbU0otxk02dJFJvvIdvIyc4PHSuGStFnRF3ZrVgaFLVl3WWP9qtKPxGdX4Th/Elk11p8fzJEsEnms7HBAAPAHfqK9TCVFGb63VjkqQukL4fkeTxDqIJP3IhyMdvTJ/nRiElRh8xxbdRnWWg/02PA9ea86psdNPc2KwNSrqS7rNuM4NXS+Iip8JwvimSKKxhMi7gJRhcZ5wSMj0yK9XBpuTt2OOrbQk8NKy+JNRXbjbHFngZ6Z55NTiv4EPVl0v4jOsgx9uiA9D0rz5fCzoW5qViaFe9lSKEbj944qoK7Jk0jkvFGmTahZW4trbzylwruowCVwc9cZ/OvQwdZU5O7toc1aDklZdSPwxp99aahfXN5bvH5qxhS5zkgHOOTxVYurCUIqL2uFGMlJto6W3KLex5IBOQAK4ZX5WbppM1KxNDP1faYUDlQuTkscCtKZnUa6meiyKoUF9o7A5qxaj2LqNyll/wA+9AbDLfbFfRscb5HHfJNNq8WSnaR0Fc5uVdRhaa3wq7sHp61dN2ZM1dGBftLDAipByuemRg4rqppNnJVbtYjmYyuskI81VOMEkD8hjNacqWj0MeZ3utTWsIJXlVzEyqDksx61y1Gl1Oyld62NesDcOtAAQD1FAAFA6AUBYKACgAD/2Q==</field>
+        </record>
+        <record id="chaudfontaine_1,5l" model="product.product">
+          <field name="list_price">0.86</field>
+          <field name="name">Chaudfontaine 1.5l</field>
+          <field name="pos_categ_id" ref="plain_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHmfiLxF4rtvE1/aWMsgtoZEEYEKngqD1Iyetelh6FGVNORw1684TaOr8EahqWp6AbnVWLTee6qxQLlQcDoB3zXLioQhUtHsdGHm5wuzoa5zYhurlbaPcQSTwqjuaaVxN2MsNckvKyIDIwJ69ulappaGLTepNYzNaZjkQLEzFgR2JNTPXUqHu6GpWZqYbSmTxFdpM3yRRRiMHoM5JP8An0rVK0EZN+8zQcrsHTFQi2JKEMQDY6UIGN0Od7jSIZHOT8y59QGIH8qUlZhF3RWlt/tGr3LSMV2KqoVYqcYz2PrmrTtFENXkyX7MEAxJIf8Ato3+NHMPlsPltUeHBdwCOf3h/wAaVxuI7RARpUKk8LlR9ASB+lKe44bAy7b6VgvVVJOfrTWwnuK/3RSGx7nEI47UA9hukrt0yEf7OfzOaUtwjsNuJAl2QDyUBxg8cmqiroUnZkbSkqMjHviiwXHyy7YCf9k9jQlqDehZssfY4cNuGwc+vFTLdlR2Rn3x/wCJlx18n19zVw2InuZPii+ubHw1cXVtKY5owu1gAcZYDv8AWujB04zrpNaGGKnKFJtbmLoGranc3/lXl9Lco+nibYyhQrFl9B6GurF0acYXjFL3rGFCpOUrN392539lzZQY/wCea/yrypbs9FbIp3YzqHXjyhx+Jq4bET3MjxDp8uqaFPZQMivKVG52wFAYEk/gDXThaip1VJ9DDEQdSm4o5rQcnV1VWLAaYAHYAbxuBz1P9DXZil+7f+M5aD9//t09Is+LSEHr5a/yrx5bnqLZFG4P+nE8/wCr/qauGxE9zL8RyRJoFwZnKxkKHYHsWA/rXRhU3VVtzDENKm7mB4fzLqqP5SoDp6sAqkAAsOOT04rrxOlN6/aOehrLb7J6BZn9yg/2BXky3PSWyK9wo84/7lVDYie5znjGF5fDF1HCjO7bMKoyT84rswLSrxb8/wAjlxibouxQ8LWs630srW8kcK2wjQmJ1XAbgfMBk461vjJR5Ur63uRhovfyO7txhUAx93mvHnzcyta19fSz2+dvlc9FbFa4UNcvnGMDH5VtHYzktRkiDauBQmDRI4Gwj0FCE0TWR/coD121Mty47IqXMLm6kAJVHUEOGxz6ZqotWIknzGPean9kmEBuZdy/eI2Y9v4TXRCnzK9kc1Styu13/XyNSCeK5iGJCRnB3HnP4YrGUXFm0ZKS3NG1jEaKqqQAuM1nJm0VZEzKrDDKCPcVJVirNpVhcPvltI3bjkj06VaqTWzIdOD6E8VtBD/qoUTP91QKlyb3Y1FLZEgpFAD/2Q==</field>
+        </record>
+
+        <record id="spa_gazeuse_33cl" model="product.product">
+          <field name="list_price">0.38</field>
+          <field name="name">Spa Barisart 33cl</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAPAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHEap4snh1Oe1TUoIDE+0rsHH1JqedGyw1ZxuouxYsfGFn9lzdaxbO5OAysmP0p3Qnh6q3i/uK3/AAlNruWR9Zc/3lSRMD9OaLi9jU/lf3FqHxppzqyvqcMJB+UtIrbv5YouHsKv8r+4z5/HsULEpqsEig9RsI/Si6LWErv7D+46/RdQOqaXDeEqfMGQVzg/nQncylFxdmXxTJKOr6lFpenS3MjAbVOKmTsi6VNzkkjw64d9Q1J7g4fzZgXYHlRj/wCvn8qxZ9NBKnTt2R19j4dsV0iETWMTEPkttwc45P5ViubT1OOpiZc7s+hwv9nq73I2KEiVlDBhjOVxz3PP+cVqr2PTdWyj5/8ABOq0bw9pD26PLaK5cZ3FiTWHO7nFWr1NbM5PW7SOx1Sa3WIxxnBUL29/yzWtKV0ddJucEz0r4W64ZbA6VMRui5j9xjNbwfQ8PM6PLU5l1PQhWh5pxPxKaVdPtTET/rMEdiO4rKo7HflyTm79jiNN0OaSSO4DfY7RGAVpRv8AMPOQigBic+npUKNz0q2LUU18T+63q9jrIkYRx2ptr2SFzgyTzCPPGOFB3fnirjSR5lSu9XeN/JX/AB2J10KwFv5TW8bxnjY2XHX6+1acqMfrdXmvfUhJMDCCz0q1dVGCBO0bD6cEH9KzlRi+hrGu2rym/uuc74i0STU5DcK0thcFduy5UNG/GMCRSQOvfrmkqaWx2YbG8mjSkvLf7mZvgm2vrLxrBb3EbwOr7XTp6kfUcdaFudGPqU54e8Xc90FbHzxy3jOzW+l02F9xj84s4U4yoUnH49PxrOau0dWFqOCk12MSfxPoWkXht5pGM6DazRxlljH90Y6Aegp80UaxwWIrR5ktPXclXXdM1CQzW16jLEm4ledv1HaqUkYzwtWnpKL1Gf8ACW6P5f8AyEbffjGd/FLnj3H9Qr/yMSDUtNv/ACorS9huHU5dUbnk01JPYmdCrT1lFob/AMJNpNvetps91umMvlBNhPJ4wT0pOSuUsFWlDnS0tcuJpccWvWFzGMeXJhfZSD8v0BIx6ZNDWqJjWbhJPqdyKo5zG1sA3dpnqCSPzFS90aR+Fnm1xDrPhfWrm9tdP+32dySSVXdkE5HTkGsknFs9mMqGLoxjKXK0FprOjalaXn2W0NpfGB/MXGA4H064q00zOrhq9KUeaV43Rh+FrzQ7W2nGrKrMzjZmAycY+nFRBxW52ZhSxE5L2fbvYiszEviKfVLCGSPT7bc5JGBjGMfiegoXxXQ6qk8Oqc2nJlO5hRtKj1Q3MZvZbhnZBINwB6HHXqP1pPa5pTk/aunZ8qietaFf/wBqWtlckfNIUfj8M/rW97o+crUvZVJR7HaimYHP+KblbU2bsduZCN3ZcjGfzIrObtY3oQcuZeRy11Y6zZLJdaZqsflyuzvDcp8sZySQD7UJSWqZ0xq0J2jOD06rqYWmeGZ7Z7y7uLqCW5uI5FQIflBbqc//AFqFB7nViMfGSjFRaSa/Au+EdKOk2l3DetbypKQyyI24Lj1/SnCNjHMMSq8ouN1Yk8S2V1qujxWVlJBFBv3yM74DAemB0H+FE02tDPBVYUajlJNsil8J6O9q0FtDAZniIDB9zKemevY0ckSo4+up3k3a5r+F7M6U9pYG583Y+BxjjOSPzIpR93S5liqntpOdrXPQxWhxHLeOQxsI9ozg5z6cisa2x14L4zkLbWHe3uYbjLSxRMx44lUDlW9DjgMO3Ws4VHZ3O2rhlzRa2b+7+uxFBrvh6eVFuZJLRv8AbLEDOc4IyOc961hOLFPB4qKfKkzVE/hnyy0Gq2ytzjdcrn+E/wAX+4PpV3j3OZ08VfWD+71/zK82peF7cb5tRjYhGQ+XKZCwOcjC8dz/AJApXiupUaGLltB/db8yGDxVp8s/lWEUsMSozGXGWbJyQo7ZJ6n8qj2ivoaSwFSMbzabvt/mTeF75rzxDG7KV7BT0Vc+/wDPv+NRTleQsVS5KVj1AV0nmHN+Mxu09VBwzZUHHrWdX4TpwjtUOJurN7SzuSNqRzI5HJLEAYA+lYuNkz0IVFOce6aOelFv5Mbboi4QDDbOvvkf1pQasdq5+Z7/AI/oymRaYZgIMAbsfuz/AF/SrNP3m2v4jljsyAN8Ay3IXYR/j/kUm7Et1PP8S9AiPcOIyD+5wu3GM5BxwBWe7MZtqKv3/rudb4btTBr6SLh4ixGSMbTnkY7c9K1hG0jzcTU5qVup6UK6DzzB8UBTBDuxt3jOfTNRPY2oX5jjrmSO4uoC2ArfLGNw5yTng9eOOPasnZtHbFOMWNX7PexFIJLdLhF2mBoVIkx0wWB6j05zmqVmEuam7u9u99jGv4oY7fzH0yGBw5GPLyPc46468A8cUn6HRSlJyspt6dxINPtRcIZIFVWYEqRt8sgcjP8AFk44Hr2xSsrhOtPldn/wf8jSWWBolkRI1gR23qq8nCnqB6Dn8+tF0czjK9ne5seFTPIIJpUVFdifLC4OSwwfyq6V7GOM5VJpHoIrQ4zB8UZMcABx83ripnsa0d2cOmmXsklwEchYpdwLA5KnkgcevSsVBu56Uq9NJeaGaBYudZVZyVFuhPUMMAYIz9SeD0p0k+YMXVXstOpa124jgXyR5aXdyCI5ypOFz8pA559+/wDK5OxhhoOWvRbr8ytdXkzp5s8SK9vgT/vMBeM8cY6jj6j61MmyoU4p2T320ILe0Y3BubZnlW64wDuyM5yO/r271KWt11LlU93llpY6fQoLi2eD7SyNOzguV6AZOB9ef1raCa3OKvKMn7ux3AqznMnWQxmhAAPBOCM546CkyomcXt1yAFLOBlV5JI9u3T9PajQdpGWLi0syIfKlaaVihMy4aXGDk57HNQmkbOM563Vl+BBLcFoTILRblol++ArkHd0Byc49OKL+Q1Gzte1ysNLXWJrgXEhWCWNXZCMFWBzkjPHf60uXm3L9s6KVt0zRtdJSyt1EMpd1yQzcevPv1+neqULIwnWc5XaLOmTXF3dW7zwNbgsMRPjKkE+nqMU029xVIxjonc7GqMhksKTLtcZ9D6UAc5qVvJaTkt5mzO5X6j9cgUrD5rGRd7bknz5pHQj7hjQ/qBmk43NIVeXZDBJao2d82AQVQRjaoGMAD8PWnyidVsJLyIwNFBJNCG5LKnzZzzySaGtCVPW7VxbS4kaMW0Rurl92dzMC3/jo6UJWQSnd3skdfpulRWqrM6fvyOec7c9f/wBdFhNtmhTEFABQBBJY2k3+ttYX/wB6MGgCu2haQxydMtCf+uK/4UAPj0bS4jmPTrVT6iFf8KALaoqLtRQo9AMUAKaAAHmgAAD/2Q==</field>
+        </record>
+        <record id="spa_gazeuse_50cl" model="product.product">
+          <field name="list_price">0.49</field>
+          <field name="name">Spa Barisart 50cl</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHEePvGl74ZvLW2s1j/fRs7My5PXA/rWc21sehgcHGum30OW0v4r6zLeQpcxwujyqhATGQTg8ioU5HXVyqEYtp9D2CtzxCAAgnd13H+dc2FjOMGpb80vucnb8LFMnrpJOE8eeG7nXdZs2iaJVSB1LPuwORwTjHfjn1pOCl1OvC4x0E1a9zl7L4eXun3ltJJdWkp+0xsFVm5wwPp09aSpx7nVWzVzVlG2nc9jHIFM8oib7xoGiDUtQTT4A7Kzs5wqoMk/nQIpx6svlb3tZkPcMVJ/Q0MY9NVilziGQ8dOP8aQDrDVo7i5Nq0UsT4JUOBg/QgmmIvN940DRgeMEYiycfwu39KYjmmvrh0KxyTEHjIyQPx6VLkjVU31shIr6W2k/ezyqo4LkMF/PpRzIPZvobWjs82vW779wAYknJ/hNMzOrb7xoBGF4wUG1ss9GuAh/FT/AIUMcdzhZvEqRidJ4RGIThY43yWXeFBHAGOfU49qxdQ9COBcrWd7/wCVxjeJ7WGWJGSQB5NjbyuAMgbgc8jnt6GkqqQngJtN3W39L1Ot8KKi6u8KjiNGZfYccfrW6OCTuda33jQJGJ4zUtpVso43Xcabv7u7K5/WhhF2ZyksCSXktvcQRJdLgSRsi5bB6jI5HcH+RqNGdPvQimm7DJ9kM5EyK8s+FEYVWeX0AGMn+lDsiYKUlpsvwOj8L2slnrNxBOB9oW3V5dpyFLHIX8AKpXMZtN6HTN940xIwvHLGPw8JB1S6gP8A5EA/rTEaV1pVhqcarfWcNwF5HmIDipaT3LhUlB3i2htloml6bI8tlYQQO/3mRACaFFLZDnVnPdtlHRMv4r19yQdpgQY7fJn+tMzNrnJz1yazpc/K+be7+67t+Fh6GN40QSeH9hOA1zCP/IgrURsxn5RSAcTxQBz3hjP9u+ISe90n/oFMDoG+8aQ0YfjJz9i0+EDIm1GBCPbdn+lMRtJwopAY9/4v0LTrhoLnUEEiHDhFZ9h9yAcVLnFdTohhK01dRH6PNBNrd9NbujxXFvBKrpyH5cZz9MVSMJRcXZmu33jQCMXxIpm1HRIOxuzIeP7qMf50+gibxBPcWvh2/mtc+dHAxQjqDjrUSbUWbYeMZVYp7No8Xsraa+AgRcBlLHLjnAyST6f5OelcsE2fRYipGld/1/X9I9F+G9tcWUCQ3IIYxSBOcgqsnY+nzGummmkeFj5xnWco9bHbt941Zyor3VoJtQtrhj/qVcKPdsc/kD+dAiZwpRg+CuOc+lAzlYPh9osWqDUbWSWNHB/cqw2EHng9QM88Gs1SSdzsnmFWpT5JWfn1NmFI7fXba3iUKotZAAOwDJWhxGm33qBkV+88USSQIjYb5w5IAX1z+VCsIxdR1K7ubG4S2RoWSN90gXeoIxxn357dqtWuJ3sZXh3xJcDydLmiWSXPBUncqdclMZ/H3qpxW5MX0OmttOK60+otI7kweWATwuTnAH4D86zbLsXm+9SGLIeg9TQA10V02MoKsMEHoRQBQtdG0zT52uLSxhhmYbWkVBuI9M0XbFYvRMeeaQxx+9TAAP/Z</field>
+        </record>
+        <record id="spa_gazeuse_1,5l" model="product.product">
+          <field name="list_price">1.00</field>
+          <field name="name">Spa Barisart 1.5l</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAGwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHk3jjxl4l03xNc2dhe/Z7aJlVQEjPVQe4z3rGcmme3g8FQqUVKS1+Z3vg3UL7VPC9peaid1xJv3NgDcAxAOBx0FaQbaPLxVOMKrUdjcqjAZLKIlyeSegHegDn5dBgubye6uIbV2mbdg24yvGOuefxouUpNbM0dIhGnWqWZEYAJKskYQHJzyBRcTJotQEmtXOmeWQbe2hn8zP3vMaVcY9vK/WgRz2qeJJbfW7m1JWOOEqqt5e4ngE9/U+lIZSl8YCKQqbtc4zgQGkNK5Yh8SS3NsZI5I22g5UwnJ/WmhM6PR5FvLGLUHhjW5mjCSOFwzBS2AT1wCWIHbcfWmI4vVbA3Xiu/JYqisCxAyfurjFSy42WrIJbS1GdqSMmOTvbn8jx+lQ2aJvy/AIrZYYy8TmSE5DI3Vfof55qkS7PpZnc+H1CaHbKBgbT/M1SMmcb4hga71zU4IyA8c0UnLYyPLHsc89qiaudGHqKDuzCl07VZpWJvxbqsS4MUzH5gSTgbgM9vmyKz5JN7nX7ehFfDfV7pf5fkW9Li1C0iupb6VJFmjLbVk3bHJPygdhyBx6VUFJXuY150pWUFt5dD0Tw/k6DZk9481qcRyk9hcX/jLX2tWHn2/2cojHCuDH8y57ZwOe2PrSkjSEktHsVLiR4yRPp+pRSA4Ki2d+fYqCP1qb+TNFTfRx+//ADNHStDutQQz6hby2tmvKxSHEkp7EgfdA9OufTFNXZMuWOl7s6Pw0Wbw1pzMclrdST+FWYmPpLf8XB8Rrj+G2P1/d0mNHUgigGQXjhbSU+iH+VDAqeFyG8LaWwyA1pEefdRTEYmm7v8AhZOvkk7RBb8f8BpMDqhQBW1FgthOScARtk/hQwGeHFCeGdLUdBZwj/xwUwOH17xHJ4c8baoYLZJ57pYFXexAAVOTx16jis6k+Wx1YTCqu3d2SLegfEmG+1JNP1O3jt5JCFSaJ90ZY9jnp6d+azhXTdmdOIyyVOnzxd1+J1msEDSLonoIX/ka3Z5hJoYA0HTwP+fWL/0EUwPJviDHI3jG/uQXWGFoo5GXP8UakA4/3f8AOawr7I9TKpK8o21e3yKsPhqTVbG2eynxcSKHSPysD6Z7HB+n86yVLmSaOuWOVKpKMlptuevamjNpc8Y5YwsufwrrPAJdCOdA04/9OsX/AKAKYGVBpttcazrhuIllS5mjWRHGQQIkx/Ok1ccZOLujQsNI0/TIljsrVIVXO0DnGevJpJJFTqSm7yd2WZwGiYHuKZAumw/Z9LtIB/yzhRPyUCmBjT/2lY+KJjDHE9ldxiVixIYMoCsF98BeP5UaAUrrx1pum3JtLyO6SYckNHjryOuD0I7VSg2LmSL02sXM0cK2tmy+fJ5e+YY2EjI+XqePw96mwzfjUpEikglVAJFADqAMvUPDGi6repe32nRT3CABXbOeOmcHn8aak0JpM1MCkMKAAAD/2Q==</field>
+        </record>
+        <record id="chaudfontaine_petillante_33cl" model="product.product">
+          <field name="list_price">0.41</field>
+          <field name="name">Chaudfontaine Petillante 33cl</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAMAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYEF9dCysJ7pl3CGNnx64GcUpOyuXThzyS7s83ufiFrPkmZRDEGPCqoJH51ze3bPW/suCdrldPifqsIV5BFKAcMjJtz+QpqsyXlkb2ueo2dyt5ZQXSDCzxrIv0Iz/AFroTujypR5ZNdiamSFAGfr8TTeH7+NTgmB8flUTV4s2w8lGrFvueI3Mm60X94MelcSifTK3OZrAOMbwTnpWiiyJySZ9BaHF5Gg6fCSCY7aNSR7KBXXFWSPmasuacn5l6mQFAFDWZbFdNmjvipikUgoW27vamk29BNpHncPh3Q201VaUicN0WYgYro5tdjNTqJaSf3kdx4b0dLPKHzJA2drzHBHpVc66IlyqPeTPSNIubCWxiisCixxqAIlOdv8An1rlaa3Nk0y/SGQXtx9ls5Z+MouRn17UAziZ7KTVrgPKxlkbs3+eK1jUcUZyhdiCwSIhTaRfL6sf8Knnb6hy2JI7ET/ultIef9r/AOtRzNdR8twTT30u43o2xxyNnAFOVRyEoWOzsrj7VZxzd2HP171mzRGf4kdlsEQHh5Bn6YNCEyjoQXz3bcOFxgmhgiHU5N18/tgUIGQQyeXMrHsfWmImvJo5iCMZHXihAzV8OuTbyxk5CsCPbI/+tQxxF8R4FnCxXcPNA/Q0kDOfM0JypOD2pgkyAXCO5UNlh1FANNEueM0xMkR1TrHv/GgDc8PNuW4PliMblGAc9qTGh3iQD+zFz/z1X+tIZyy7Xl2LuJyQQBnFUUloZ899BYai0TxyFnTcCF6gdamU0tzenhKlaF420Zo208V7BG6fdkUOuR2NUndHNUhKnNxe6Y2+kms1TyIfNZsjPZfrUybWyNKMIzvd2Oh8IPNJYzvOQXMn8PQcUlfqKoop+6XdfXdppyM4daa3M3sYdrEkbb0X5jwR61a0JbbOd8Tqg1KBIoBuMcu9jzu4wBn0/qaxr7o9fLH+7ld9UWPD6Z0+23doVGKun8KOLHf7xP1Zp3Sp5JZgoC8kkZ/Kq2OeF2zZ8LAizmBXafM5Gc1N7lSVmXNcIGmtn+8KcdyZbGJbvhTiqZKOf8Sybb+0I4wj5I6ngDH61z13qj1ctV6c/VFjQs/2bbHP/LIfzrSn8COTHfx5epevIftNq8QbaT0P45q2rqxhSnyTTNjwnCbewkiY5YMCTU8tip1PaSbLmuoX0xgvBDKacdzOWxz0LtGeDg1TJQ2bEjZYA/hRYLtDFI6A9KdhNkqEbxuPGeaLAdBo3l4m8r7uRz71Mty4Fu9jaWzlRV3Ntyqk4yRyKlbjaujhYNV+03kkbwmDA+XPf1zXTKlZXOeM9R2oXsdpavPI3AHAzyT6VMItuxTZm+H9Ta7WaJ0Z5NxcMegB45rWrCxEZGxcTw2q7pJlUAZ61lytl3Oo0FANJilAI84eZyMHB6fpisZbmsdjRpFGVL4fge5lmRyomO5kK5Ge+Kv2jsQ4K5xHibwXfw3ofToZbq3YDAHzMh7giuinXVtTKdJ30NXwx4RlOkTx6nG9s0rfu/LbbIPc8/kPrUVK3vaFRp6aliDwKFmCTzxNb7stsjw7jPAz2pSr3Wgo0bPU69VCqFUAADAA7VgbhQAUAFABQAUAFAD/2Q==</field>
+        </record>
+        <record id="chaudfontaine_petillante_50cl" model="product.product">
+          <field name="list_price">0.57</field>
+          <field name="name">Chaudfontaine Petillante 50cl</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHG6/wDES10XWpNL+zF3i275CeASAf5GspVVGVj18Hk08TR9opJDdD+JFpq+tw6WbZkackJIDxkAn+lEKqk7DxeTTw9Jzclp0O0rU8caD+8YZ7Dv9aAHUAeRePfDl/d+Mp7m1s3kjljRidwGTjHHPtQ8D7X3ro9fBcQUcJSVKalddlf9Sv4L8OahaeNbCe6s3jiQu2dwODtPv70RwPslzXQ8ZxDRxVN04KV33Vv1PZaDxwoArX1/FYRB5MkscKqjJJpxjzEylZGStxHdXRlNlKZSPvFFzgfjWvwrcydpPYbJJDFOsjWcokTkNsBK/rRdtbisovY1tP1CK+jbYSHTh1ZSCKzlFxNoyUi3UlGVftu1IRnosQI/EnP8hVx2IluPgCxvvVQDjrim9RIJkWRy7IpPrihaAyKzOzVkRQArRNn8CuKUtgjua9QaGRqWV1WI9nhI/I//AF6uGxnPckjORVCTHN0pA2MsRu1En+7Ef1I/wpT2HDc1Kg0MnWB/plo3+y4/9Bq4dTOp0EiaqZCHO4HHFCBiaUwOoXA7iNf5mlPZFU9zWrM1MnXDte2PfLD+VXAzqFRpWERCHDkcE1ZMdznNV8Wx6feT2rxzzyQJ5knlqCqrgHOTj1FZTxEISas9D1MPldStTjNOKTdlc6Pww5lmnlZt2+NCPbOeKubTSOBx5ZNdjfCMJmfzGKlQBGcbVIzyOM5OR3xwMY5zmMydfGTa8fxN+HFXAia0KZztHzEdqtEJpHnniBQ3iDWJjveNrLaJVbAztHGe/Tp+lcFeLVSV10PqcvqJ4Sik1fn/AFPQvBwzAz4xmKP+VdcvhR89U/iy9Tpakkyde6Wp/wCmh/8AQTVQ3JnsUD8y4IByOhrVMytc4zxPJ5l9NHNKSgtpNiAqDyAWJz3OOOvSubFtN28j3spg407pbyX9f5nY+Cxi2Y5Y5ijPP0rRu8UeXWVqsvV/mdPUkGXreSsIAzyaqBFQoKgYDI5xWhnc4DxMHi8UXnlk7nsxGFwDkMDk479O3PNcFdP2r9D6nLWngoX6Tv8AcegeE4zDbIrKVYwRkg9egzXU1aKPn6sr1p+r/M6KkSUtQi3tGfTOaqBEzKuruG2uLeJyoMzFVB6nA7Vqotpmbkk0WGj/AIguAakbJLB1W/CfxMh/IYpT2HB6mtWZqQXsbvbsY03uvIXOM+1OLsyZbGLHCmoOsxsX8yEHa0qAFCfT8q2b5dLnPF8/QdZ6tbzTm0hmSSfnMQOWGPUdqcqckrtaFRqRbsmXdP01YL6e9ZD5sqhSxPJ65+nb8qznO6SLhTtJyNKszUKACgCOK2ggZmigjjZvvFVAJ+tNyk92SoRWyJKRQUAA/9k=</field>
+        </record>
+        <record id="chaudfontaine_petillante_1,5l" model="product.product">
+          <field name="list_price">0.98</field>
+          <field name="name">Chaudfontaine Petillante 1.5l</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAJgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGN4o119A05LlIRKzyBAGzgcE9vpUzk0jty/CRxNRxbtpczPDXjKbXNXexktFiAiLgjOeCOufrUxk2zfHZdDD0lJSvqdZWh5Y1/ujnHI/nSHHcdTEZPiHS7fWLNLS5zs3h+D6f8A66um7O9kxOc4/DJp90U9H8M2Gh6s09qGDPHs5P0Pb6VU5qUdkhe0qyl785S9Xc6IVkUNc4UH3H86THFXY40xGXJepJd7UWRwG2ZVcjrg/rWii0jJyTY6+uRDckeXITgHKrkURV0OTsy9bzpcQJNGcq4yDUNWdi4tNXJCoYYYAjOealpPcpNojuJfJgd/QcfXtTSuyW9DPs40j2AcAGtJO5nFJE13hnyDnilEctyPSXCPPagYCEOPo2f6g/nRPXUKemhpVBoUtWJ+xYB6yJ/6EKqG5M9iGH7oqiEOfpQDINOG3WJeCN8I/HB/+vSnsOG5sVBoUtUbEcS/3n/oaqO5MtiGLgCqZKHP0oBkVrxqsfHWNh/I/wBKUtgjua1QaGfrR2WiSgZZHBAJx1BH9acdxSV0U4LweVukwnHTdmtGiEncyYPG+j3k0MUEkzGeQRIxhIUse2TWKrQbPRq5RiqUW5JaK+62N2wO7UeR0jPP4itJbHnQ3NWoNDO13A04k9nFOO4nsYiyo1uf3oHy98iteViUkpI860JWji0dmjdf+JkrDPRuO35V51NNcvqfZY+Sk61mv4Z61pPNyT/0z/rXdLY+Mjua9QWZuvxiXSpEbOCV6fWnDcL2MGOJIoSAp5BGSc1vGRnLU43zPtGp2E80ytK2oIcJGAFGOAD2G0D/ADmuKes0/M+otyYecUtPZv5/0z0rST/pZ/65n+ddEtj5iO5sVBZR1hd9gVHdl/nTjuKTsjDkt8QMdx4U9q0ZMJe8jzXQSDNpCEli98rknHuMdc9v1FcNPePqfZ5gvdqv+40euaUuy7IPUx/1rslsfGRepsVBZT1MZtx/vU47kz2M9Yy69BgdSa0M0R28dm8Ye3iiHJAdVAyQcfzFDVivaykt2y7YoTdbv7qmpnsENzTqDQhvIDc2skSttYj5T6GnF2dyZq6aOP1VNf0vQHKRCVlTDOGLMme4HfH+eldlL2U6m5wVnXp0tFcreEo9XTQi5sXeKFiIkyA7nueT2/z0qsVye03IwntVS2Ow0pLgxGW4i8pm6J3A9646jV7I9ClzWuy7I7IoKxtIdwGFxkAnGeSOB1/DjJ4rNmsUm97f1+o6mIKACgAoAKAAAP/Z</field>
+        </record>
+        <record id="perrier_50cl" model="product.product">
+          <field name="list_price">0.71</field>
+          <field name="name">Perrier 50cl</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAKAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGb4jvJ9P8O393bHE0ULMhxnB9aGKTsjxceNvERkUtqlwSDz+8YZ/AGkcjqy7np/w91m/wBZ0id7+UyvFLtVyOcYBxQjejJyWp1dM1CgCnrKCXRb2MhSGgcENnBGDnpSYM+aSLwyk+Vnk/wVi6iT3OOXJc9x+FYb/hC4pHQK0k0hbqCSDjkduAK1i7o6aaSjodjVFhQBmeILgW+iXjnvEUH1bj+tRN2iyZu0Wzzi30APLaoFjH2nlTjp9a4mjzGm2dv4JCwaVNZ4CtBO2R9cH+ea6cO/dsd2Gd4HR1ubgaGByvjOWSZYLCJypOZHwM+y/wBfyrCu9LGGJlaNig8E0Gp6codcRbV+5749axe6OP7SLWjzS2HjC5tZGHlXOdoxjDfeH6ZrSk7TsdFB2k0dfXSdYGhgcjNm/wBaeY4KtKEX/dXj/E/jXJUfNM4qzvIlvlA1ONv7u3+dKW5k9yDX0a21aK8j+8m1x747fpTl7s7mvwzudejrJGrqcqwBFdR2kGoTm2sJ5h1VDj69qJOyE3ZHCrc3Vu6bZMbRwRg1xrc4XuPN7PJJueRmPckChisSX17LeNvkbtgDHSlJ3G9TqPDtwbjRYCTkoCh/Cuqk7xOym7xQeIn2aPIP7zKP1oqfCFT4WcJfX0NmAzFnkfO2MADOO5PYdOffuTiudI5YwbZjxeIJbm9S2iubeJ2JwPs7SL/30WH8hTjyt6XNFTiX7bVJp7VZ5LKd45MiOSCFjuIOOV5x9QSPUg03C+wnS7HbeC3kfSXMkTRgyEqGYEkHvwTWtG1tzenFxjqW/EsckmjuInCPvXBK7u/pRXnGEG3sinHm0PNr/RLq4uUS4vcrOCSwUEqBwFIAUY5ds+gbrisoJVIJrRMhx5dBhkFrayx2UUNislskkMgOd7KcOu48k5Jx/uLwK00REpWNWz1aze4jjhd4x5p+5GRwxJPJ6BRJKB/wH8BSTCNSLeh2/h6RprIuYjGOFCnrgD/P/wBas8HQVGDV763OhzUy1q0fmaZMMZIAP5EVpiIc9KS8gi7M4C9nt5oLh0KObdcMnUux4C4B75ZcdfnNc+Cp1KdO0xVWm9DnYRJdSmedss7EgEnCZJOAD0GTVTmrnnV1OTNzS7ESTKm3hhlv93uf6D3P1pQ1dy6MORXZ6Ho6kWZc9XcmumkvdOql8JauEWS3kR/ushB+mKtmjOJube2uNPa1jjiEZTAQ/KAeoOPqAa5YuzOFS5ZNlEaQvmEpLKgz03Rvu/FkJ/Wm2nukV7U0YIDaRHykjUdXZ5cs2OmSf5dqTdxOXMzr7ABbCDacgoDkd8810w+FHZHZBfsVs3wM54P0pVHaJFV2gzmxKkc+54S6gYxXKnY4luL5kTz71i2rkfKaegnuXLqSCdgYYtvHNObT2Km1J6Iv6NcGW0aMlSYW28HPHatqN+U66N+UuXCGWB0XBYjjPrVyV1YuSurHFz69p0SyGS4ELx5DJKNpB9K5WmcTTQ/TNSttVtPtFu6tglXUHO1h2oTEtS25eUGNZPLwMkgZwKG7D2NTw3YfYtPdizuZ5DJufqR0B/TP41009jsppqJrVZZk33hbRNSkeS7sFkZ/vHcwz+RqXCLIdOL6Edn4R0fTg4soHtw+NwSQ84+ual04sXsolyDRNOt/u2yu2cl5PmY/iafs49h+zj2L1WWAAP/Z</field>
+        </record>
+        <record id="perrier_1l" model="product.product">
+          <field name="list_price">0.96</field>
+          <field name="name">Perrier 1L</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHmPxc1jWNKvNO+w3s9vBIjZEMmCzA9wOemPakzmxHNdWZB8Jtb1nVtavUvL2e4to7fJWaQnDlhggH2B6f4UIWH5ru7PVaZ1BQB558VdEt9WfTDJI8ToJfmjxkj5a58RVdNKxyYyq6aVkiv8K9Dg0nU9ReOWSVnhQZkwSBuP/wBb8qKFZ1L3JwdZ1L6I9LroO0KAOF+IEhOo2UY/hhdj+JH+FcWM6HnZg9hngCQLq91GTy0AYfg3/wBelg3qxZe9Wd6TgE4z7Cu49IKAOA1tjq/iWVIgWCstujduDz+pNefX9+pY8rFvnq2XoQaUX0TxRB56FVDmGRuw3cD8M4oo3hUsycLenVsz0Vy4jYxqrOAdoY4BPbJwcflXoK19T1ytql6unaZc3jf8sYyw9z2H54qZOyuTOXLFs4PS7iS28icoGZTuOe5rgi7SuePzWlcbq00l9JNKUClxnA7GlN3lcTk5T5judLvJNS0SC5jdVmkiwSy7gHHByARkZHTIr0ISTSZ7NOXNFMyvG0pOmwWY/wCXicBh7Dn+eKyxErRMMXK0LGMIAFAx0rlseawaAFTx1FDQJGx4SZnsL2w8xoyjZV1xuUMOo7cEGurDS909HByvFrsVfF027WbKDPEaFz+J/wDrVGJeqM8Y9UiAHn8KxOJsRpVH8S0XC47QLi2OrXkFyYjbzWp80SY2FR1znjGCc5rXCt8+h14N3k13GeJQZPE55+5CopYj4ycW/wB4Zl7q9vYsUYGWRfvAHCqfQn19gD71Cilq2ZQoykR2uu287hJrfZuQPujcybVJxkjAOMg9M1fsuxUsPJFrw/qdufE8bwiR4xG+WWFuQFzwMZbp2Bp0YSU9TXC05RndlzxHZ3d34mm8i5ECpArEhQW79yCP0rnzDFQw7jdXu7b2OiWHVWbb6HMS6RBA0080sd3KodImn+WNSFDbyM8EkgHdxmQccGuz2aTuKySFn1uOFZ3VZ5Flz5ZjjC+UpA+QZ9CGA4/iJ9Kn6xC+5gsXBysbmh3F1PrdtdG2/cxeayqGHmSsQcjk465AJI/rWOHw8YYic7tuX4G6rqUlHsa2vXEtp4hPkW7zyzQqAAOByeSen61lmeBWKUU5WSZq6qpSbZx3iO0v3ubeJVMUezzJgCzJI+49wOgOeSB1HPArpmm6aS7dTjqyU42va5HZ2E99IiKgfHXHKD3Zhxj2BzXJDDyb97RHJToRpyu2dlpdnby38Nm8aywCNkdZFDB12kEMOhz3+tdtCUlU5k7NHVhlzVLs0de/dajDIejx4H1B/wDr06/RmuLWzKm+IsX2LvIALd6xvc4nqNdxjpxQCLXh8CTUZHH/ACzj5+pP/wBY1tQ1bOzCK7bE8bRKNIju2maD7PKCZFXOAeOn1xWlVXibYmN4HP6fqlteSfZYrmOadEDME4yPXHauPW55jTDUNVtrGRbee4SGaRSUD/zxQ7gkzd8DRo2lz3izPP58pHmOuMheOB6ZJrropqJ6WGVoHQ3VrBeWz21zGJIpBhlPQitGrm7SasYh8DaAu94bV4J3GPPjlYSAegJPAqfZxSM/YQUbJBH4I0HCtcWrXUq5xNPIxkx6ZGOPb3NHs4tAqEOWzRt2tpb2NsltaxLFEn3UXoKpKxokkrIAAP/Z</field>
+        </record>
+        <record id="san_pellegrino_1l" model="product.product">
+          <field name="list_price">0.98</field>
+          <field name="name">San Pellegrino 1L</field>
+          <field name="pos_categ_id" ref="sparkling_water"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APXgTVDIZL6G1nCTsFDrldxAz+dDE3YSG+jurlkgYMqLzggjP4UIEywScUMGKAKAOW8W6Tp+qX1oL23WYxo23LMMZI9CPSqjBSM6srC+DNLsdNnvktIFh3bCQGJz19SaJRUdgpu51Lj5TioZoxmaoZw/i25ml1zy4nwsUSqQGI5PP9a5K8mpHHiJvmJ/BlxKNSuYpnzviDDLE9D/APXqsPJtseGlds7IkkYroZ1Mb9aYzhBazarfT3YwqzOSpbPI7fpXK6cqkmzhnBzk2S6XHLpuvWzOPlkbyyR0OeP54opxcJ2Y6KcJnbnpXS9jsZQ1y5FppMz7trPiNSOoLHGfwzn8KUnZCk7K5mWn2qBwtssZAA/LHHFaaWVjKLimVtR3Nbu7FVkQhhgfxDkdKzqtKOpMmk2zp7aZbmzinU4EiBh+NPdHRfQwfFTmR7W3zwCZD9eg/mayrvSxjiJaWM6CWSNNgbKjoGAOPzrGMpLY5lNobOXlOZGJ/pSbbBtvc3/DcpfSRExz5TlR9Oo/n+ldMHeJ2U3eJmeIZY01YB3VcIMZOKyrfEYV9ymksZHDr+dZmAPImPvr+dAI1/DbqILg/eG9enPXit6Xws7MOm0yj4iFtLrKxT+SSYwQJAP61v7OMtxVXrsMTT7MBR9ntwxJAA3jOOv8fapeGg+hh7r6Fee2swn+ptxkZGSxyPX79Cw0F0GlHsa/hVkWyn8lUYeYowmMf55ocVFaHTSSa7EOuWUN7qfzDDhMbg2CARWsNjKs9SpJowmkUyyzyBfMxgrx5n3hnHNXczI5dBj+SSQSO4Tbncq4G4nGAMDr2H9aLhc1/D8UGnWMiRFI085VG9sDkgAc9+cAetYVXY6qEXNPrv8Agr/8OJfE/wBq7uqlRkVrTV0c2IbUipfw3TTwta7dinc4KdPp61nVjUuuU7MFVwqhJVFq9F+fyLM5RIcKMkjrjGa3UTzpVU3oixoAYRSBurSZ/Ssam51UL8mpSvbqOPUSrsASB1IH8+v4Uo1EtGya0bsmWUEjYHbHcRsa1VVdzH2BFdTxxKdxI/3oyv8AOh1F3GqNuhNoFwszsqtnDnPI9PbisHJPY6aatExvFksdleQvNlQ2VLYzisqsWyK8GzHmurK5xAkiPIwyuOc1grpnMrpkNjatHc5MYDDoCO9XJltnZeFbJoEkYuX3SMxYjqcVtD4Tqp/Cbuo6dZ6gqpeW0cyjkbh0qmipJNGXL4V0OUbDp0S+6jB/Op5UR7OIkHhLRbO4E0dpuf1dy2PwNHKgUEbcSKlsFVQAOAAKo06A/9k=</field>
+        </record>
+
+        <record id="stella_50cl" model="product.product">
+          <field name="list_price">1.19</field>
+          <field name="name">Stella Artois 50cl</field>
+          <field name="pos_categ_id" ref="pils"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQALQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWtTuzY6bcXQxuijLDIzk9hSk7JglqcEfG+uySERQ554AhH+NcjrVO5tyRLaeJPFjoCulyMPXyhzS9tU7hyRIZ/FPiWA/vbaSEejRKaPbVO4+SJ0PhTXbnWEnW7G14sYGzaSDmuijOUr3M5xS2N2bOF+v8AQ06jfNC3f9H/AF0JiYHiy8eIQ2/k+ZGw3MPXmtGK9jAheAqH+zlCe3SpsilUl3NOLVIo0C+S3Ax9+iyD2jILm5guGDGHoO5zRZB7SXcZp1+bfVIFigjQu4QkHqpOPSmkJybO1l6L9f6VE0+aNn1/RjRzXipQdQtiSMiM4HfrWjJZzt3fQWUYMrHLfdVRkmockgSbMz/hIz5vlrZNnI+84B559Kn2jvsPl0LlrrlrOypIDCzdN/Kn8f8AGmprqDiX7dUi1mwSONVDSgnAAzyP8/hVknfTD7ns39DWVaN5w8pf+2v7v6Rcepzfi9hFNDKeixNgepzWknZE2ucHLDNeruZtuSd7nsPb0rFas0JE0i3yisjszk/MwY5/HI/lVcoWdiO50toQWhbcuSpB5x7D0PHT9amUWgRs+H3W5vbVZHbMEqlM9xnj8qunLoRJHpE3Rf8Ae/oadRtSh6/oxxOW8dALHFI4YqqHIXrjIp1NhROIbWbO108CIiVi3zA8H/8AXmslJJGzo1FrZmI+r3Mkbhr+UjIOC3P5ZobZHK+xo6Vr6xO0N9MGiZAC2CWHXoevehSS0ZSpTktEzd8OSW9xrEX2dmYB1YkLhR8w4pwSuKpGUdGrHp0w+UHPQ1rKPM077P8ASxnE4/4jztBYxbBkupX8Kmq7I1w9NTqJM87uWshaMRHCW+z5VSvRwQODxnIyeayfLb5Ho2q33fxfgRtHppucKLcRfZ22nd/y02DH0+ahqN+hPPWSe979ulyIW1qqWZaSIGMMZwvJbBJH14xUcq0NvazvKyeux0vhaaODxQsEAxBNIrKCpG3vjmtIO0rI4sVBumpPfY9Zl+6PrXScSON+JULSWNuy5wNwOPpx+tY1lobYaXLNM4FtUW1gVjbyb40MS/McEZBHIPqD09azU0kd3snPXmVm7lX+3FDSEJM6PdrPscgArzlTj3P6UnUKWGva7Wiav+Q4avGVKATyErIPMkxu+YggdTwMfrS515gqD7xW3Xt1N/w0Te+Kra4SIplgzcYBxnJx257VUXzTRy12o01G6dj1qb7o+tdRxo53xopNjG4/hOfw71lV2HE5eFEuNPIZUDjPJQHp/n9amDugkrMrx2kTMN0yjOfl+zr6/wCHFPQWpPY28KRtKzJKAAOYlXn8PWmrAzQ8OBpdYWTACqeMDGew/rUQd5FNWR3c33R9a6CUZHiWIS2qKRkc8VnUWg4nDXu/T1DI2B1APf8AwNYp2ZTIo9Tt2A3W53IcYA6H8Ov6VfN5E2GG+a7by0Xy4z0UDBbPoP8A69TJ33KSOt0K3ENzGD94sCadNO+omzq5vuj610EozNdBKR49D/Sone2gKxzV1ZpPGUlCshOSD/nip5L7hzGKum6fKGZZ7iJc/dJHP0/KotHuyrvsaWn6dZRlZbVtzH+Njlv/AK1Uox3QnJm/pyFLlPTIpxTTC6Z0E2do+tW73VhIzNccIYy3TB/pQwSb2MCW4gdWUgsPQDNK6Dla6GdNbwGeIQgoucOPLY5/SocNdBpl+1NrAv7tGUAd1I/nVJJC1ZqWFxG9ygX1HPFUmg5X2Ohm+6PrVAinqFobpBtIBX1FTKKYIwrnRZpMg+Ww/wB8ip9kiuaSKKeGysmfJB+spI/nR7NDUp9y9BoskeMCJf8AgRo9kgcp9zUs9OdHDl14PamoJEts05Pu/jViQhJoAjMaN1UUDGmGP+7+tAxRFGP4RQIkX5RwAKABiSKAQP/Z</field>
+        </record>
+        <record id="stella_33cl" model="product.product">
+          <field name="list_price">0.82</field>
+          <field name="name">Stella Artois 33cl</field>
+          <field name="pos_categ_id" ref="pils"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAPAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHKeIvFF9pmpfY7ZLVQFDFpiSTn0ANYVasovRFximU/+EwvmQbJ7PPfcrcVz+3q3NOSJIPE8xbDatAv0tjj+dN1qncShEk/4SqZCAt9aTjGSWRkP9abrVEt7hyRIp/G80IJAtnI7Yb+dEcRUb2QOnE6bR9ROq6ZFeGMR+ZngNkfnXXF3Rk1Znn3xg/5Cfhn/AK6z/wAkq/8Al3V/69S/QVf/AHWX+OP6npksixRtI5wqjJpAcDfLaanqL3jTQuXIAVjjjt1z/Ksp0lIqMkjat9NsDY/vdJspDjqR/XFJUUkU5JmHc+HdOllLiwijGeit/wDWqPq77j54mrZeFNCWAF9Ljdj3ZzVRo23YnJGRrGgWKTssVrDbqPSTH8xQqPmDnE6DwfNHb2racJVbyzlQDnGe1bJWRDdzlfjB/wAhPwz/ANdZ/wCSVX/Lur/16l+gq/8Ausv8cf1O/wBbVm01gjFSGB4OMjPSkDOdeNP4o0b1yoNAiw2qNHAVMUSpjk4xx+dAGFJquixu26a3DN1w2f5VPPHuOzNC016JLc/YxDOqgDbG2T/OmmmBj3esS3jsXitgyg/KEXK46E5kPuOlMRc0CST+2bRAxQ+aQVUYBQA9sdMkfnQMp/GD/kJ+Gf8ArrP/ACSn/wAu6v8A16l+gV/91l/jj+p6Fq3/AB4P9aQM5e8uYrWGSWRvljGTj+VJuyEcbqF3cX9wPNyw+8kKHKge/wDU/wCRk3fcpFb+xb2bMqQRqpYMF2sRwPYc0Wb6AQPDNaTh3RoGVv8AWJn5c5PsR6DNGgG5YXbajC0cgYXiqGQliA4z1xnGauEr7iaNjQbaSLW7IkAnzGOUIwVx3wBzx7/WrAp/GD/kJ+Gf+us/8kp/8u6v/XqX6BX/AN1l/jj+p6Dq526e59Oal6Aef675i2sCMrEY8yQgHBbtz+dZN6K4yG0s1srIzsIzOwyFfHbqcd8dh+NVFdRpq+pmXHifTlHnNNfFoZB/rMIGJIHA7DGeg6GmNTt0RcsNVsNc/wBHMy72jLKkpHmJzjHuP889jcltFDypdO1NQoJaJtyqMkkdx+Xc9sVGwHa6HHjWAufkDrKmPcEVonqw6GL8YP8AkJ+Gf+us/wDJKv8A5d1f+vUv0FX/AN1l/jj+p3+tKG09t3QHmpewHnHjNpIprSa2mdbkDACnHBrObsa0Ic80uhzOoDX7pZI5nEgt/vbZVBjwcdj60rzOl0MN0k0ZL2espm3NsWklA2ksC20DI79hyM09exP1an/z8RBaXd/p6w38CmNMGON85BI5PXqc8nP+FHMzaGXxcuVz1Nv7frF5qMNpqkzQedtPyIqkg4weMfqe1K7b1Ma+HpwhzQd9bHqekbTqseCD8oIPqM1r1OPoc58YP+Qn4Z/66z/ySq/5d1f+vUv0Cv8A7rL/ABx/U77XDjTXx3NRLYaPM/EZ83VDk7irYCewwBXPUfvHo5etH+ZT1W2v7ie6twkGXto4y+9jld4IOcEk5wOa01v8iYumoxd38XYoyS3b3i35tI2eB2tDELofeKGPaBt6nGe/61RPLGzjzb67P1Kwsme1itBZRyQwTSMCLvcFcKC6thfRSeKVuhp7WSk581tO3Ty1Lt5FPL9he9WNZQmQ6Aj5Sdw7YOM9qio3oVRjFRmlqrfid94akaS7smf7xjKkjpwSK0i72PNZi/GD/kJ+Gf8ArrP/ACStf+XdX/r1L9Ca/wDusv8AHH9Tv9aANgw98j8KmWwI4HV7Cd9R862XcWZXyBnBx6fX1rCSvLQ6KVXkTv2MnUYfEcUIaCGR3ChQ4G5sBtw5781S5zfmwrfX0OeeDxIgdY9IliDXQugY4D8rjpjnpyeKPe7GiqYa6vJuyt8ieBfEbS4j0doVdnZ1WFgGZl2ljk9cE9OOelO8uxLlhmtZN6W+X3GwljqJjgjmtSqRZCoE4GRyf5VDUn0InWp+9yt6naeHbfybq0iByIo+vua1itjjk7swvjB/yE/DP/XWf+SVp/y7q/8AXqX6E1/91l/jj+p3+tLusSB1qJbAjkr5PkhlUdPkPsRWMkmWiUsLi0Iz27HnjnirjK6E0Y5tIdxDRTNuJ+6+B1J/r+tJSQWZY061RCZ8OrDI5bsST/WnGSeomhZd11dhF6E4/wAazfvP1L2N3R1U6sGXovyj8v8A61bR+JkPY5r4wf8AIT8M/wDXWf8Aklaf8u6v/XqX6Cr/AO6y/wAcf1O+1p2S0DJjIPepk7IDnnj3qVZflfkj39azaKuZ8ols3+UEjGc9jWe3qMQ3kbDLxqSO+2qu+wrEb3TTnagwD6Ch67jXkWbeFoV3H/WHgf7IoirA2aujFl1CKID5epPvitI6aEs5n4wf8hPwz/11n/klaf8ALur/ANepfoKv/usv8cf1O91xZGtVMRwQ3NS79BppGD5l0pAMaMPbjH86nma6FWgyKaZiuJbcMPY5/mBSck90CiujKUi2z9beYe25f8an3fMdvNfiSRPGn+rtnz6kr/jTTig5fNE3nzdVhB+rH/Cq5/IXLFdS9o/2h9TiLBQM84GO34/0oV2J8vQ5r4wf8hPwz/11n/klaf8ALur/ANepfoTX/wB1l/jj+p6cyK6lWGQeopAYOp2k1rJvigMsR9BnH5UCMmTUIEJWSF1Ps1AEDapZDr5v5CgBBqtl12zN9SBQBYtpmvHC2tkz5PXJIH5UDOss7GO0TIGZCPmagDzn4wf8hPwz/wBdZ/5JT/5d1f8Ar1L9Ar/7rL/HH9T0+kAUANkhilGJI0cejKDQBXbStNc5bT7VvrCp/pQA6PTrGI5jsrdD/sxKP6UAWAMDAoAKAPMPjB/yE/DP/XWf+SU/+XdX/r1L9Ar/AO6y/wAcf1AA/9k=</field>
+        </record>
+        <record id="maes_50cl" model="product.product">
+          <field name="list_price">0.95</field>
+          <field name="name">Maes 50cl</field>
+          <field name="pos_categ_id" ref="pils"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAUAFABQAUAFABQB4p8Q5kl+I8aK+4xEow/unyVbHQdmB79evYZ1OXlrW/586/+Bf5EKDjTba3rwf4RXfy8vTq/a60LCgCO5nW2t3mZWYKPuoMk0AZWoeI49Ph817V34+6DyP0pXAyrf4g2890sH9m3KljjdtOB+JApgdFDqUc1ykAQkupIZTkcetK4FymAUAeF+OVYfE+4JBAa4yMjqPssVYN6Yj/AK9f+3F1GnQj/wBfY/mj3StyAoAwfEGrJa6lYae7FBcEuXwcYXHHH1z+FaU6UpptdCJzUdyHWPE3h20aGG/vrYLIeQ/YetDoVEtUwjVhLZme3irwHAhlgvrASDptU5J/Ko9nJ9C7odrviewtrO11SyvFl8t1O1AfnU8envWkcLU7GbrQva52QO5QfUZrI0CgDxT4hhB8R49p5JO7nv5K+w7Y9fr2GU6ajGu11o3/APJrfoQr+zd/+f8AD8o/10/V+11qWFAHC+PiI9f0OQ9N0i/mBXfgPtHLi/hR538RUzfW20ZPlnp9a6qvwGGG3ZxkUEzhpUido0PzMFJC/U1xprmOx7HokoB8IWox/DF/MV2vY4IfxPme2R/6tfoK8U9QWgDxX4iMp+I0QBGVJBwO/kr7D+v17BVlaFX/AK8f+3szimqb/wCv8Pyj5/5enV+1UzQKAOA+JzeXcaTN/cdj/KvQy74n6HNi17pymr3Mf9sxhpJIhNYyxieNCxhzj5sDnHbPvW+LXuL1OfCbsy9O1WKHUYdI06VpNNgtpDORCSbpipycYzjOMewrz2tLvc7S7v3eGbNR0KpXqW935Hnx/ifM9vj/ANWv0FeIeoOoA8X+I0Jj+IsD4A83Ldc5/dKPQenv9ewVZ+5V/wCvH/t7MoT5qcl2rw/KL/Xy/V+0UzUKAOE+JkJnXT0AySXA/IV35c7Tfoc2K+E4HWrqLS9WijvYpbhHtHiZIeGO7HSujEvnpp7amOGVmye1S3kMN+ui3tstpbGGOa6mVFVMMOh5P3jXnPe1zsG2sRk8M2kgcHG1Qnf616kp2VvI8+Mf3jfme5R/6tfoK8U9MdQB418SSD8QrQDOQpBy2f8AlmPypVvgq/8AXj/29mFNPkn/ANhEP/SYHstM3CgDk/GqFr/RsLuPntx+VdeEfxehhiNl6nA+Jbq8s/FcD6LZie6Ebgqw3A889MVvVi3STk9DGi1zOxWurWXVNPeLW9PlsQrmYSG9U/Ntx0ck49q407PQ6mXrcp/wg1k/lbWGFB6ZyeT712tP2jV+hyK1/mexx/6tfoK8w7h1AHjfxKDj4g2e5lIKHaAuMDy+/PPOfT+pmr8Fb/rz/wC3mFK3JO3/AEEQ/wDSYHslUbhQByHj15Yv7OmhfYyPJzn2FdmBUXNpnPim1A851B1/tizkm1J7BER83C5JGe34mu7GR/d6I5cJLVkesw22rIsdlPpc0i8m5e4UTyfUAL/WvLSaep3PYsi6nn0y1gbCLGqoqKMAcivU9nGEGzgjNudj26P/AFSf7orxT0x1AHjnxM/5KBYf9c2/9AqavwVf+vP/ALezno/DU/7CIf8ApMD2OqOgKAOU+IAB060O0Eibg+nFdmA/i/I58V/DPN7wz+fiCBJ28pzsfpwM5/8Are9ejiopw1fU4sM2pGNp7Sz3eI9LZHhjO/nZxtRT/DkHK5698VxezV1d9TtctDViBWyix22/zrvqfCzhp/Ge6x/6pf8AdFeAesOoA8c+Jn/JQLD/AK5t/wCgVNX4Kv8A15/9vZz0fhqf9hEP/SYHsdUdAUAcr4+Zo9MtnVipWbgg4PSuvApOpbyOfEtqB5vqV68a71fEpBQHaOFPXn9PxNerKkn6HBTqMyoJUszL5EuTLmNm2fwcdPr/AErmp4VqTbbfU7K2KU4pKKVuxqPKxtUQSFkyAOwPPHFbSglG9jmhJuZ7jH/qk/3RXhHqDqAPHPiZ/wAlAsP+ubf+gVNX4Kv/AF5/9vZz0fhqf9hEP/SYHsdUdAUAYvifw/8A8JBZRxrOYZYX3ocZB46GtsPX9jK9rmdWnzxseaax4S1FCqmeBdueJNyn+VeksxptapnJ9UknuZKeF78uB9otM5/vk/yFJ4+l5j+qyOr0fwBd33li6ufKgXBZkjPPsC2P5VjVzBSVoounheV3bPUFAVQo6AYrzjrCgDxz4mf8lAsP+ubf+gVNX4Kv/Xn/ANvZz0fhqf8AYRD/ANJgex1R0BQAUABGetACBFU5VQPoKAFoAKACgDxz4mf8lAsP+ubf+gVNX4Kv/Xn/ANvZz0fhqf8AYRD/ANJgex1R0BQAUAFABQAUAFABQB458TP+SgWH/XNv/QKmr8FX/rz/AO3s56Pw1P8AsIh/6TAAAP/Z</field>
+        </record>
+        <record id="maes_33cl" model="product.product">
+          <field name="list_price">0.77</field>
+          <field name="name">Maes 33cl</field>
+          <field name="pos_categ_id" ref="pils"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAUAFABQAUAFABQBDA2Zrgbs4kAxnOPkX3OPyH07kNJr3Y+n6vy/z9eimoMwoARnVF3OwUepOKAIXvrWMZadcevWldAQnWtOAybtP1ougsTpeW8kYkWVdh5BPApgSo6SLuRlZT3U5FAC0ARxY8yb5s/OOM5x8o9zj9Pp3IXPaPp+r/AK6/opKCAoAzNVjS8nhtc4KncT6UWuBT1HSZ2tWWKVjxjaDt/l/jSSQ2zj5fBd9dSfNHeMnX/Xr/AD6072EdNo3h6SxsmhDuiuPmEjmQ/maltjNLQvKtjNZA4YNvHuOlNCNemBBbvumuhk/JKBzn+4p45Pr7fTuQ1qRtGPmv1fl/n69FPQZBQB5w/i240vxbqEd3ALiBJmVCowyjPAPPT8K76WEVWmmnZnPOq4SLl58SbFbqCyhsLqa4nPypFg/zIqKmCcFdyRUK3Psi3p3xF07U5JorPS9RleDiT5IwAfTJfGa5pU7LdGtyhb/FDT5tRuLM6ddxyRkjEu1cY4wRk1tTwjmrpmc63L0Kdp4lm1DxvYpaRrBBJJhxyWPtn/61VUwqpwvcUKvOz0uuQ2I40RZJivV3y3PfaB/ICkXJtpX6L9WSUyAoA8e8QL/xVWpf9dj/ADr2cH/DRxYjcxPMlt/F+mSwQG4bDDywwBYFSDgnjOCaeNV6YYZ6la6vYY4dO07R47y205rvc9zLgNNJnGMg4OB7+n1rzkt297HUx0jtN431F2jMR3EbSQSMYHOOK68F8Bz4k6Dwyv8AxWen+0lPGfAGH3PY68o6xkYkDylwoUt8mGJyMDrnpzngf1oaRUrWVu36j6CQoA8h8QKT4t1BR3lNexg3+7RxYjcwtVuf7I8Q6feRQtdGLcRGDgsSCMdD608R79J30Jw71NCzQ3dnDGfBhtrS3kMqNc37RqjHqeRmvLdk9JHcZMLJdeL9QmDxlXcndG25e3Q9x7134a8aZyYh6nQeGFP/AAmOnkjq3FGMfuBh9z2GvLOwQEEnAPB54oG0LQIKAPJtbB/4TS82jJ82vVwv8E4sTuY+sT3UGs20mm2wlvVJMYxuycY6fSqqRTpavQihfmLsQ1bVYbiHWPD8kS3SBZporkJwDkfK5IFebLlT0Z3epkaTYwWOtXlpAS8SEhWYgnHuRxXdTb5E2cdf4jc8NuG8aWBxgbsAUYpWpl4fc9frzDrGIH3ybwMFvkw2eMD245zxz+uA2kVK1lbt/X9aD6RIUAeUeI2li8WahJEcYIyfwFerhEnTSZxYncwgZH1ez/0oWxDMfPY/c45NdGIS9m9DOj8W5u6pp41Gy8lYodXn/huTJHGV9D8p5x7148fdld3R2vVaanMWkc1jey2jx+U65D85NenRSmkziqRadmb3hhWPjLT2OBlz/KssZ8Bth9z2CvMOsKACgAoA8m8VE/8ACVX69twP6CvWwS9xHHiNzDDKNQgWSAzq+5diqCSSOMA++K6K6vDexjS3GQy6XcTxiKyKTGRCIgu7PzPlevoU/KuaUaiTu+n+X/BNrxfQijYPqcrru2EnbvABx26cflW9JWikZT3N3ww5/wCEv09MZw5x+Vc2LXuM2obnsFeYdYUAFABQB5j4o02/h8TXV59kaSGTBVlXcMY7ivSwk4OHK3Y5q0ZXvY5+a8S0nS9WGIPb5wm8gsTwOOcj8q6akG1y3epjCVnexWtrx7W4+2Tjf5YDBNwAbcPlHuPXA7dq5fZ1JSaurHVKdFU1ZPm/ASGb/T98io7SLvBLZyD0HH8vauiEdN2csn5HQeFdLv5fFNpdJaOII23M7rtAHtmufF1I8trm1CLvex6xXnHSFABQAUARzwJcRlHH0I6igDIutBlm4EsUg7CWPNNSa2FYoN4Wud3ywaZj18rn+VPnn3Ycq7Fq18OzxH5p4Yh38mMf/WqW292NJI27a2jtYvLjB9yeSfrQBLQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAAP/Z</field>
+        </record>
+        <record id="jupiler_50cl" model="product.product">
+          <field name="list_price">0.97</field>
+          <field name="name">Jupiler 50cl</field>
+          <field name="pos_categ_id" ref="pils"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQALQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APXwvFMDmrfxXBeXDRRXMCMrFSn3iMe/Sp5rlOnKO6ZYm8RRxOY1d3+XIdFUqT6cZI/Ki5JD/wAJBILSRjIPMA+VnAC5/n+lO47B4a8Ry6rfPZzm2MiIW/dPz1A5H40lJMqVOcVdp2OpI5X2P9Kzqq8of4v0fl/l69HK2Zh+LNRn0zw3cz2sbyTMNibBkjPf8qqrUjTjduxrh4KdRJngFpBNd6tFEIg8skoASQcE56GuKL5pI+sSjGn5WLuvtLDqjwNaxWjRgApASF+tOq/etsPDQg4X39RbeW9u9LmhitYXjiXdJL5IMgH+91qVKTiaunShNO9m/uJ/B99eaZ4ktrqziklKth0RSdynqKVOqqbu3Y58xpQnRadkfQudwRsdTn6cV21NZQ06/oz5DuYPi9Xbw1OIwxfjaFbaSfY9vrWWOt7PXa5UNzzmxNwLzTy8ly7OqFgwDjoc87MjGB3HXpXzddqKny2Vr7advP8AQ9Sk70en9fP9Do5NJsLiQyz2NtK56s8SsT+JFeU8bX/nl97IjWqRVlJr5nDa94h1TRNZ1DTNMjtbezzGAyQINuQhbIxg/f719Jl2HjXw8JzlK7vfV66vzOatiKrlq2XLTUbzUNbvbONp3hW+XyUhAC+WrSKw47EKDz3xRRw1Omqcmlfl1v3dmiZzlJu9z25Qdie2M/lXuSUm4276/cznMDxntHha7LoHUKSVOeeDxxWWKvyL1Q4bnlWjx2w12yZJnR/kBCxgj/VjC7gRwf8Ad7V4WPc/ZTur7/n2/wCCe3S5vqm3T9T0RVG2vlW9TiOK1SeeHxZIh8oWzXECPsiiZjkD72RuPT/PFe/hop4Rb3s+r/4Y9OhhqMqF+Vc1n36fgWdBvryXVZmN1KyyMwZB8wjPmMAAvQZAA/GumGHp+7otPx0XUWLpQjTSUV/SR652T/Pavo6iXND1/R+X+Xr0fz3c5vxyXXwxIY2KsJFIIOCKdVJxszfC29qrnj39ranZzrcL5EjAgqXhUuD064z+vevJr4OlNNa/ez6KlSozXLqvnoXh8QNaj+VobQnHeNv6NXnvJsP5/eaLLKEldN/18iqfE9zdaml49jY/aQwIlEJJyOh5PUV0U8vhGHIpSt2ubLCQhTceaVvU0dK1i9ub4q8oQSSkusKKgbnvtAz+NdmHwdOm1pt31/M5MXCjGGmunqe4gDavtXqOKdrrY+WOa8c8eF5SecOv86VT4Towv8RHik9zGrBN2ACc5XsevT8K4qi6n0dKlJ6lCZg0pIII4AI78Vkzvpq0TpfCPg6bxAzSrdRwJGoY5UknJYf+ymumjSlLW55uOx1LDu3Jd3/yf6nZR+B7fQ0juWu3uJDKoxsCrz+dbSpKKvc8qrmk6ysopKx6SOgrY8w5vxtG0vhqWNBlmdAB6kmplqjfDNKomcDZ+EdLaxW51Z2SWJmMkUcqt5i9gMdD0qVRi1qd1TM60G+Ta3YoyeEYLzRSdH06+N55+0m9dIiE5OQN2D2Gfc1EsNHldtzSjm9Z1Y89lHrodL4O03UND02/guIzDeC03xquHOQ0mCMZB6jitKEHCNmcuZ4mnXneLvr+i/yNODVptU0SGae2nidJIkZpgF8xgDlgoJxzmqqaxOGnuzuPSmIwPFH/ACBx7Tx/+hCkzSlv8meT2FnaXhu4pJ3ja1Clo4YleWYnrjcRwOmBz3pRgrHRXxlTnaW3Yy9W0F7PbdWt1DdWroXByFkHGSGTOVP4EVjKiuY9WjmLlRck9V0a/U7vSb2O18LWLSvIDNY3UCsiFm3eYoXgc9zW9P4Tx8waeIk11s/wJvDts9toJjdJ1Iu12iWHygFwThVyTjJPJ9aKnwnPT3foelUxHOeLZPK0B5P7kiN+TCpk7I1oK87Hil+iS3rKjpG8cjNC0mNrjeeCTxnIPXgiqMm7sztRR555Z1IaGBxCrD+Ic857/wD1x7UwR6xplpEPDsUc5Iks9OafZuKjMhZsNjnHy0oqyNcVJzqN/wBaIg8OzRrp32aG2CoblJBPFE6xt8p+XLnJIpVPhM6e79D06mI5bxW/meHZlC7juX5fXkVMtjbD/wARHmM+nfbtMimhUFYHBvI0HzcZww9jk596nm0Ov6q+aMZNeXn5XHaPoouDJqGoqsGmxfNMzD5WH9xfXoBx/OiN5O/Q0qqlQouLScpHV6Hqo1C31a/fEAmhAQBwm0DzAoBPAOAPxrRO7POqwcEl5/5DtEnEtg6faDK321GIa689gNhHLDjt2pVNiKe79D0cMCcUCOZ15tmjvIQcKyk4/wB4UnsaUVedjy62uLqxvvtFm5R1zg9iPQ+tc/M0z6BwhOHLMXUbjUdZkDX87yLGMqp+VF+gAxTdVsiGFw1LVanV+D9LttQ00w3MavHEY5AhGVJDScEd+prelseZmSSnZd/0R0N/YQW7Wz28Sx7pUTaigDADkcD6mnU2OKn19Dp04b8KBFSayZoGTaHDDBU96AOMv/C1qs7ObK6hBP3rY8fipB/SpdOLOqnjqsVZ2fqUG8M2Z3BdRukDDBDWwJ/mKj2MToWZW+wvvN3QbeHR4XigFzdFlAz5W3oWPqf71axtFHHicQ60r2t/S/yN+1WaZ1aW3CBTlQeSD65ptnOjTCkNk0FDhQAGgBMD0oAXFIApgFAAAP/Z</field>
+        </record>
+        <record id="jupiler_33cl" model="product.product">
+          <field name="list_price">0.77</field>
+          <field name="name">Jupiler 33cl</field>
+          <field name="pos_categ_id" ref="pils"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAPQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGdqet2+myJE6tJK4yFXgAepNACJqrPD5reTEvbc+aVwKU2vyR7mDx7FOCxUj+dMC3Z61bzxF5LuFAOu4hcfnQBZmv444fNSSKVc4+Vuv40gH2l7Hdq20FXX7yt1FMCduq/X+hrCs7Tp6/a/9tf9df1TXUWtxHlnjvxjFDrotYbWG6jiUBw5Iyc+oNc1XEckrI9vA5OsRS5pNrsT6ZrM2q2izw6LdqgGP9HuQR+RIq41m1sYYjK1Slb2i+af/BM+58UwaTcukkWqW7scssipyfzxSdeK3TFDJ681eLi/n/wCH/hOLa/22wtbmY9gIkGfxzmhYiL2uOWT14q7cV/XoQax4pvbWJ3fT3O8/wDLWXp+A/xode3QKWVqb1kbPwv8YG/1G6sL3y0lmw0RGecdsk06VXm3IxuCVGKcT05vvJ9f6GprtKdP/F/7bLz/AM/TqvPWzKmsySQ6PdyRNtdYjg1tLYuik6kU+58838N4buSW5Us7sSWHIry5KV9T7yg6fIlE9M8JXsen+H4kKHcFy2EJH5gV2UmlE+fzCnKdZtHCeM9QF/rDPECwAxjpzWNWze56GB56VKzgzM0afyNRjlcbcHpmpgkpbmuIc50n7up0Wul9TtnjghZnK/KAh6/lW7SaPLp88HrZfMx9K8O+ILO4g1EW0losci/vJPl6kDp170owknew8RiqDg4tpu3Q+homZoYWJySASfXitat+aFv5v/bX56/j3t1Xz3cr60M6Ld/9cjWstmXQ/iR9TxS6P71vrXDI+upbGTqSkBJF4PQkVnJaHXRe6MwmoNGy3owDa7YqwyDcICD3+YVrRXvo4ce2qEj2Hw8Uj8L6YzFUBtYuTxztFejT+Beh8ljP48/8T/Mi190bTmQMCyzRbh6fOKU/hIpb/I7WH/UQf7o/lWVX46f+L/21+f8An6dVK6kGsDOkXQ/6ZGtpbF0vjXqeXaZ4f1K71CC7TTftNoJfnDFQrKDg9T9a5I05N3sfQVcZShTceazsdhqWhaBoqTakdKNwXQQpaxoH3seyqe5/kK6lSgnseJLHYiUbOTOZ8PQ21zo+owaX4PvLO8jjkMU2pxKMyH7qhm5wM+nQeppRpQjsgqY7EVLc02YGl/D3xDY6nZzSwR+XDKjM3nKTgEZNYRoz57nq1cwoPDezTbdkburo1z8MrAQW0106Jb/u4SQxKldwyBkdDz2rpirRR4uIkp1pNbNsWHUtW1Pw9LcarZRWZNxH5KRybyU3DknJ759OlKfwip7v0PUIR+4i/wB0fyqZptxt3/R+a/X06qSDVf8AkFXX/XI/yq5bFU/jXqeY6tPdJHYQQ3j2sCWrSyuHKqo8x8scdew9+BXM1JtJHuUp0qcJzmk9f0RVXSfEGsWC3OnWV89rIuY557tAz88OEJ4/M8d619k0tGcX1+M5WcUtdLLb17nHajNr2l3T292buKVeShmYE/nXLKLT1bR7sainDmjTjJeVv1sbPgDWLyfxbaRS3VwyP5iPHJITg7CeQT64rSkpRqJNnBjJUK+EnKEbNNdLNanRatb3E3w/ms4LaW4KX8kbwxEgui3DZGe3A611vY+e6lLw1Hcx+D5Eu3jEsd1FGIo5Ffy1XbgEgnBPJx71MvhNIbv0PYoT+4i91H8qUpNOPm/0ZJDqn/ILuf8Ark38qp7Dh8SPJ/EsTXel2VvE+17tUtwScLxLITk+nCn8Kzprr5HbjJWjy/3r/gjF/wCElN5pVroOq2Yc2JKQXK3PkFAOMHPB6Y5x0FanCVNZ8aXceiadp+o6ba3v+jbkmuA/nINzAHII4KhSCRzU1KfMjpweKeHldX+T/wCAxvw/lF740tLhE27mAK5zjbERn8cGs7WlFHWqiqUa89rtafM3NY0qLUXurlrPUrsxySukMEmyJs3Eg5O089z7YrZnlFvQ7c23hSbdY21mjXiYjgm80nkZ3NuPze3H0qJfCaQ+J+h69EMwxc9FB/SpnTcpRd9nf8GvluRfcS72/ZJdy7l2HK+taivY8f8AEjJNbQadE2xlvrhY+efu/uxn/eJH41nT6rzO3Gp+4+8UcncPZalCj30/2K8OS8phJSYdmOOQ3XoMHj3NaI4zIuYF1rWb+5UMIHaTyAeMsQxjTH0XAHtincVjp/hParFqF5qk3ENjAzsfQ4I/kT+VRb3jojLloyXdr/M63V4vtPw8s4xazXLS+TI0UOdzksGb6ZyeardGEo8smjI0611Kz0+7VtOj0/TmuIylv5xkkWT5Ov1HPOOtRPYunu/Q9oh/1Ef+6P5VZmNu/wDj0lz/AHDQB5JNHZ3Pis219lYnaZRMT/qpXOFb8MD8zWF46q+7PWUKzcJqN1GK+fcxNa0ud/EHkajClvDZKwIUZLrlm4Hc/Mfr+NNztp1M44duXtOW8fLr8vzMfyZ7283xwt9onYBIkB+QfwoBWdWbbsj08twsKdN1Zqzf4I7O/wDJ8MaTa6CRG2papKkt+V7LkcH3OMe/zHvW6fKknueNVjGtVnOCtFFzUvL/AOEBsvOe8SPyoQfsY/eNwOBVR+FHPW/iS9WZ+nW32XwpdqlhcWSNfRskdy2ZCMKMngdSD2qanwhT3foewwf6iP8A3R/KrM2Nuji0lPohoA8W17jVrv8A67P/AOhGuGp8TPrcD/Bj6I1LTV9L1uyjsPEJaOWJdsN8n3gPRvX/AD9auMozVpfec1bD1cPJzo6p7x/yIZfEPh7w0jjw7aSXt8wx9ruV+VPp0P5AfWrUqdPY55Ucbi/j91djlbFp9R8R29xeytLLNcKXYnk81EZ80zorYRUsO0tEdwNF1XVf7Nt4dWudP08aZE2Lfgu/RhnIxwR611Q+Feh4GI0qy9WR3nhyPw/bTrbSTSQTmAs0r7maQO2SfwIqanwipbv0PUrf/j2i/wBwfyqzNjpE3xsp/iGKAPHfEqyWus3aXNu2Gkcpu9CSQQT1riqpqTPp8DaVGPK+xjEQvKRuKR46kZNZna3NR7spSQQszE3IHJH3fyoKdSaXwk2kRxrq1kwlDN56ZXB45q6fxI5cbKToyTX9XPXNGH/Eh0//AK9Y/wD0EV2w+FHzGJ/jT/xP8yvr1jcajZx2tsm+Rpk/AZ5NE1dEUmk36HXRp5capnO0AZpkjqAKt/p1tqEJjuIY5R6SKGFJpMuFSUHeLaOUvvAmkuWJtJ4Ae9vJkfrmsnRh2O2nmuIj1T9TDn+H+kBj/p92nsyg/wBKn2MfM6Fndb+VDLXwZpFldxXC3t5K8ThgoQDJH4U404p31M6+bVasHFxSudbYwXn2WG1tLORYoY1jWS5O3gDAPv8AhWqemh5s5OcnJ9Wb9naC1j+Zt8h+82MfkPSqJLFABQAUAFAAQD1GaACgAoAKACgA/9k=</field>
+        </record>
+
+        <record id="boon_framboise_37,5cl" model="product.product">
+          <field name="list_price">2.53</field>
+          <field name="name">Boon Framboise 37.5cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAHQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHDeMvEWuWV9LBpF1b28cCDeZId7M2N3BJxjBHasp1eV2sVGF0aXg7W9U1ETW+rNBJKqK8UsSFd6nrntkEjp606dRTCUeU6etCQoA8Q8aai0+v6wouJlEDhFAYAbt2DgdSNvXrzXJWvzkuTTNr4cahL/AMJc1kJZJIGsQy7nDAEhSehPOR0z+FXQVmxqTZ6rXQMKAPL/ABtY2c3iucyW0TEQR5yg6ktk15mNnKM9Gc9WTTLvwyt4IdV1gRwxphYsbVAwMGtcDJtO5dFto9DruNQoA8r8bvfReJL+5S3/AHQSJI2cEByBzg/Vq4cTQjOV2ynhPaR5k9exq/Dy1vLfWL+WaHEFxAhSQDgkEgj9a0wkFBaMPYKnHfXqjv66iQoA80n+IGkT2d5f3VtKq2180CsqiTdjOGGSMdKwnTbZSk0jS0vxxa3fifSNNggkCX9s0glk+XsSAACf7p/SrjGzE2dzVtoRmeJtTGjeGtQ1EnBgt2Zf97GB+uKYHzvKxg+HMBJ5uNQZz74XFIDVuNRbTYfBuupnEChWPqFfkflmgD6EWRXRHUgq4ypHfjNTKcYtJ9XZfc3+SCx558bNTNn4Njs1bDXtwqn3VeT+uKsDyfX7m3TwXoVpDKjuPMkkCsCQSe/50gEvNQtbj4e6ba+av2m3uZP3eedp5z+Zpge++AtTOq+B9IumO5zAI2PumVOf++aiU+VpWer/AEb1+4Dz74+Skto0GeB5j/yFWB41M2XKg5UHAPtQAiMcFe1AH0V8GJ2k8AQocny7mVR7DOf61nObjKKSvd/do3+lvmCM/wCLnh651u4sGghlkEKNkxpuxk960uupvQp0535pWPINU8MXVlOAySDdk4aMjAH1pOUe4VqCp2tJO/Ym03wnd3UIuUDPGWKpiMnd74pKcW2rjoUI1U7ySPdPhdp1xpfhU280bITcu2GTbwQO1TNyUo8uqvr6Wf62Iq04wlZO5vatcQ288ZmcIGGAT9aVR6maPOvGlveanqDrBbSSRqgRCnR+MnJ/GsHpK5106dF0m29bFzwhoc1gGurl1swAojRmBPv+HbrScLtO5lV9npydj0HS5Elgd42DLu4IORXVB3RiyprVpFdzIsoPC8YPTrU1ECOSkjtTdbC1wPJmJGCCD8wX0GfujisGhEllaWlzPFABPzg7sjA+XI7eg/PNOCY9DstHt0tbQwxliqt/EcmuiGwmYXjLxJD4durRrq3kkhuEYb4z90gj/GicWwuYMnxI0OIqE+0OGGckYIP41CizSEVLqkTJ8RfD7QGV3njIOAgXJP5VVmKSSe6Z1fhbVI9Z0o38MTxxSSEJv6kDAz+eataEF7UtKsNYtja6hax3EWc7XHQ+oPamBzM3wr8LStkW9wg9FnOP1zQBLbfDHwrauHNlJNt6CWZiPyGKAOot4IbaBIIIliijG1UQYCj2FAD/2Q==</field>
+        </record>
+        <record id="timmermans_geuze_37,5cl" model="product.product">
+          <field name="list_price">1.54</field>
+          <field name="name">Timmermans Geuze 37.5cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQASQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAUAMmnhto/MnlSJM43OwAoAbBd29yWEE8cpX72xgcUAPkkWKNpHOFQFmPoBQBy1t8RtFurmGBY7lWlkCfNGPlyQAxGcgHNK4WOrpgFACIMD8T/OsMPHlg1/el+Mm+n9d9RsWtxHB+KPFmuaZ4ims7JLc28aJjcPm+YZyf8KylVjF2ZcabktDqPDOpT6v4ftb25CCaQMHCdMhiP6VpF3VyWrOxzPxRu4YtNtYZlLKZN2NwHODg4J56H86zqtpaDi4p6nN/D7X9L0++nuZ5zCn2YCV5GB3fNwTznOcAex+lKm5Nu4Sceh2mteMNHk0W+S0vVknWAuI1UlmGQOnfr/OtJbE3PJrDXpYdUDSBMfu2c7Qx28Z4B965Yx1RbrSsd7qfjvXbfXJ7O2t7Yxh/LQsM7SACc8j36Vu6sVuNUpPY7zSrqS+0mzu5lVJJ4EkZVOQCQCcVondGb0LKnI/E1nRlzR+b/NjYtaiPDfGltq7+Mb4pZ3BBuRk28bOpTHBOO+OormquPNq0T7Tle5Dp9zqOnQW8Flq8kaOD5kZbaE6ZGB0PJ65pqty6WN401JJ3Otu9MtvEvhXTZby8ea8tneA3UbDLKQfqOhH5VNao1BM568uTY5DU9IsvC0luyyyXU3ARZDjqTnAAOeSD+FRTnKpfoKhVvLVDfBuv2kGrkrbCPzS6ozN0JXBAGOSc1q4ySu30N6k04uyOx0+bR5NTt1g0kRzNNHmRrYKDhh3rzqGJjKcVzde5xxUro4DUp9QHii780SQO13KZQisyocnpjrXoT5W90dHO1sz27wT9o/4Q3TPtUTRS+Tgq2c4ycdfbBreOyGjbUYGPc1FGHLG3m/xbY2LWojitSYyeINQA4Cso+vyKf615mJ/iM4q3xnlt5pOpHUlt4YJJXt5GkkdGUKFyCCM9Dj1rbng1ubxqRtudLZC8sfBdlE92Ua6uZpYTG2WRFwuDkYznPSscfWdOlFruOdnE5rxOkklms09xJcSRD5Hc4K5I6Y+lZYDEym5aJBTVtjO0IWMOoFx+9CKDGN3Ac8Z/DNdUqk/Yy5uzLbdjtP7T+xqLnP8AqSH/AC5r53DQtXi/NGSvoWbe5W5m1ieI7la8kIx9Aa9Sv/E+ZjU+I9O0STzdC0+T+9bRn/x0V7UFaKOyOyLiEkZPqf51lh5ynBt2+KS+6TS/4JTQtbiPFtfuTqOv31wl5cxqZ3AEUpVSAdoOPoBXhYrFThWkkkzNwTZTttXtLTUL+K5unXfZLCjEM2W2jqR3rqUZSjF27GU4FKDVZby2tLZQ2yyjdR7lpGYn8itRjk5RjGxso3Rm+I7hzYIp/jkGPwB/+tRl9FxcilForWLJFqcCKFCOCSAO/aqld0Jjtc6KQpJBKJCQioS2Pp0rz6FJuafmWqLtczJS1tbSXMN3cRsx3FVkIBY10QqylOzSOflu9T27wFfDUPBOlz7txWHy2+qkr/Svah8KNdjoAMClCPKvm/z+f9bWWgEN5N9ms5puuxCQPU4oqS5YtlRV2kePXVrbuCyx+UxY9O9eHJKctVe52PDw32POrq/Ml1dsoBExIBPYZz/IYr1vY6p32OJmz4YuQRPGWVSMEE9PT+lc2Lg7pnThpKzE12yvNQu40tlEyhSwIcY5+p9q0w8oU4WbsTWUpvQZYeG9akmSVokTyyMFn9PpTlVoKLV9yVRqN7F65LEGDdtLnB+oNcGH0Tb6fqaKLfumgNEtbmJIp5pNrEZCEf4UQkoyukCwiXU9N+Htvb2Gjy6fb7vLjk3jccn5uv8AKvRwld1U79CK9JQtY6tcEcDua2otOLsur/NmLOe8eXUtp4VuGgcpIzKoYdRzn+lLEO1NgnZnldlqtxq90tnclCCrbnXhsYrzIyd+ZrY6YScvd7lW58JaPCcgzMR1XzK1jjZvoi3hYrqO1LRrLTtCnudPh2SoAxYkkkZGevtUKtKtNRlsE6MYwbRX0a9tZGDS3cceFHLMB2qp0JXskOnUio7m5b6ppVpCd2qW7c5wH5qJ4apLZFxrwXU5DUdXtl1iSaJjJFuyvGMg81vHDSUbHN7VKbaNKLxpbxoMWKOR/ffFQsNboU8Q2dl8MvEt1qviOaKRI44Xhbai9cgg5z+ddWGoqDbsY1Ksp2ueqIcjn1P86vDzcoNv+aX4SaIZheM7F9Q0FoY2CuJAwz34NVWTcGkEUmzxiS0ufCtzdapNAr7sKqhsbgc55/KsI01UpuOxom6ckyvL4+DDjTEb/fkz/SohgIrqayxTZUvvF17qVhPBHbwwxmPDYyTg1rDCU4yuZyryascwWJrpRkTW4LyBBzmmIt3FjNNchIlySOPyqJSUS4xciwnhfVXkAW2JHrkVm61Puh+yn2PUPhh4bvNO1Zbu5QRqEKgZyTxVQqKWwpQcdz1VRgY9yf1oo0+SLXm397bJbuUtaaNNLlkl+6g3dOmK0YkeZeKdPfVrdYbVlZhlgp4zwv8Aj+lQ6sYq7LVNt6Hl914d1S3mKGylYZ4KjP8AKkq1Puh+zkuhr6L4R1K6idZIfKV1IJY9B9KTrx2WrBUpddB2l+H9PvZZYZGKlWK988GsqdSclozWUIrodLpvgHTIZWLGSQjsxPPftiteWq+qMr010ZV8RWKQ+IbG0tIvIAj6EfTJrn153a5urcmp2FrB5KoskylmG4ZAByvJ7V1RaW5zu7eh0+hiL7REwYsxQkdcYwP8RVaNk7I6CqEZXiWaOHQ5nlfZHwrH0B4/rUVL8uhULX1OCgRFnRYJA+Uwrd+2K45yk4/NHTFJS+TL09jLEhedozkgnC/dOfWumMVb3kjCUtdLj4oohZy+dLsVQQSp5GMD+eKqXLytIUW7nIeFtqfapBEZGDvlV6tyeKwoKyNarudFpGrR3JicqqrlgzEcLzkfpxW3OzLlOZ8Sag7eLYJWG7YrBAeMrmuaU25NrU6IwXKk9DbCPe3MF1G3k7UKyKWJz6f1p+2bWxPsknudb4WkDaj5RmDtHCdqj+EZH+ea1ouUn5EVFFI6tVCjA9SaujSjSjZd2/vbf6mTdypq+mx6xpVxp8rFFnXbuA5U9QfzrUR5na+GNR8K6oVvHjmhl/1Mkbfex1yOx6VzYlWhfzRrh171vIs69O+pWyrbb45o3DbWI2n6/wBKhYiMlszR0XF7ohaSWLTrhJJFRJATI27p6nPaonVly2SHGnG+rPP9E123tb+YvvVS7EMvQjPFX9Xkkmg9utU0dND4p0mBCYISx64VMc/jQqEm9ROrFbFCXwj4k8aD+27C2j8mNvLji80IxxzkE4B5PrW9OjGmrIxnUc3dk1r4M8crIITZXa9v9eu3892KbpxvsiXKXc9L8CeErjw7bzXGoSq95cYDBTkIvpnuatKwjraYBQBzvjfQbnXtECWRxd27+ZEN23d6jPb/AOtQB5JeDxbZS+XLaX6bePmtyf1xzWbpRfQpVJIuaX4W8UeJ3jiuYbiG0J/eS3C+WoHsON34VUYRj0E5N7nc3fwh8K3IUwx3NqwABMMv3vchgf0qhC2Pwk8NWcoeQ3l0B/BLKAp/75AP60Adnb28Npbpb28SRRRjaiIMBR9KAJKACgAoAKACgAoAKACgAoAKACgAoAKAAAD/2Q==</field>
+        </record>
+        <record id="timmermans_kriek_37,5cl" model="product.product">
+          <field name="list_price">1.7</field>
+          <field name="name">Timmermans Kriek 37.5cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQASwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHOeJ/E17ok8cFlpyXTNC0rNJNsVQD06VEpqO5UYOWweHfGNrrAkiu2tbO5R9qxi6V/MHqvQ/pTTuJqx0ZOAT6VQjz6Xx1r0Ki9kstPWzIBAZ2B5OB82fQ56Viq0W7GjpNK51eneKdE1Wdbez1GGSds4iBIYkDJwD1xWtzMyvHGs6lpn2CHTbpLd7lnDM0YY8AYxnNTOfKXCPMYuj/EC4snkh1kXN+pIWOaC2C4I4bPIzyRjj86UZ6ag4HoNtcJd2sVzHu2SoHXcpBwRnkHoatO5B5X8Vrcr4y0O5y37yCRMc4G3J9MfxevpwOMupNvD1V0VN/nH/Iqo/wB1Ff8AT2H59v6/A9YoJPMPiDqhh8X28HztDFaqZoyow6l8kD14x+VZVY3KjPlZgy6vorXLKtnIilI1XC/cYdCBnsMflWEVU016mrqU+x63d37L4Yl1AJIzfYzLtj4b7mePeuswPEbHUxaXdsZpXvInhBaJiSqMT0wepAxXNKHYuFWz11N3w14jtJNftI1tCkkl1u34UEbmGfzFOEHzJ3KlUi1ZI0Pi2sratYCSJmt/s0mDGed3PX0HStZ2MW7HKweINQhsIoooYTCcopKkn92Ac9fpk4rGVNXNfbtKx7J4Qv31PwtY3chUs6EHb0GGI/pXRBWiiG7u55n8UP8Akp+nf9g5P/Qp6c/4Fb/r2/ziKf8ADj/18h+Z7LTA8o+K5jbxBaxlirm0GCBn+J+Kym7SJd73OLWSTU5pV2W8IeWKDcsfKFQFBX06c+tRzK4ubVHvkkH2Lw61u0hk8i0KGQjBbamM/pW72LZ4Zch7M2d9E5Wa3dWQEZGR83T8K5IStcwhK1zQ8G6W1/4s0u3nuX2RlrkYAByPmIJ7g4xWtOfMzSE7s6r4nzQjVbGKaRFH2dyQxxnJ/wDrUq/Qmrc84jgR3khy3lxBmjUMcLk84+uBUObTE5tHungyCO28IaYkSBFMAcgep5J/M10x2NVsef8AxUs2Txzo18cbZrVoh1zlN5Pt/wAtB7+vaqqNfV6vfkf5xKm4+yira+1h+f8Aw563QI8a+J1ysvjdIyf9RAqn24Lf+zVjU1kO2jOOs9St7W6MYfcTcLITjGMEVCi20zPld0z37xdd/YvCepz5xi3ZQfdvlH866JbFnzuLydlkDSO/ZdzEgcGuVIJU0dd8NNWF3440+JowrLFJHnPXCE/0rWnC2pMYcrD4uXn2vxmLZW/1ESRfQn5v/ZqmrqzSJw17ctHcZikZC7diRxSgrsVlY+jfA032jwTpMmc/6OF/Ikf0roQji/ixCF8S+H5stl0nXGeOADxx1+b19OneZx/dV3/07/8AbkKa9xf9fIfmeoswRCzHAUZJqxngvi/fdapf621xGVllKxx87sdu2OgrCM1OTOmrhqlKKclucMvzXDMe+a0MLHunjfVU1DwBp6+aR/aSRuxX0ABP64qas7I1w9B1W/I8c1WGGylEVu7sCC2Xxx27VMFdBWp8krFzwJqEel+LdOvJG2xpcAOx7K3yk/ka0TM2jQ1u5h1XVb7UGtvMnlkLoctkHtwDj0rG7bOmpQjCF9bmC3h7W5pUY6bOu7ld67ePxqlKKW5ioN9D3P4WyzDwillcKUltJWTaSDwTuH8z+VaxkmtDOcHF6owfiyD/AMJB4dPGNtx35+6vt/X8u7mv3Nb/AK9v84kz+Bf9fIfmd74kvl07w7fXTOECxFQx7E8D9TSnfldi6XLzq+1zyMR2F3GhAW6iLZ+YHGenTNcbbg7I9yMaeLjzO9kMksdNM8u3S7ZRjjCdKHOaW4LA0G7WZR1jX0t00/TriJzbWsbCNU9CxPc/5xWkW5pXOSslhZtR6o1NNPlI0kcC8pj5kBP61k229zsp4ek4JuN20NkZpLfa8S4ySPkH+FJtp6MuOGpNaxRz8F08mqSWrIihHwCBgkf5xWsvgucFH/eeV9GzqprG4ZUwVC7ARlgDWUY9T0Z146q50vgB5LLVrqylZSJ49wwc8qf8Ca3oaNo83MJxqRi09UZfxYjnHijQJWdTA0cyomOQwHzEnHQgr37Hp36J/wACt/17f5xPMn/Dj/18h+Z0HxVnMXg10B/1s6Kfpyf6UMaPKrfxENDijg+xLNsTBy+OTye3rWUqSbudNPFzpw5V3Ix4+dnYf2bDtY9M+2PSl7FFfXqn9XMbWdX/ALRuYpDAsRjyflPXP/6qqNNRM62IlVtfoXbfxtqtrZmOLyVGf7nf160lSSFLE1JbsE8b6vMvlPJGVPGNvb86fskH1ipe9zDu9SuTqL3IkMcu7rGdv+egqlFJWM5TlJ3e5HPqN3LJmS6nc/7UhNCiiWzs/hhdNB4005s/fdkPvuUiqA634rTRt4z0SEPOZEt5GZWI8oA7gCo/vHac+wWif8Gt/wBe3+cRT+CP/XyH5nZ+ONPi1PSobWZlUNLwWOBnBqZX6GtJRd7pngviGMxXs/BC7ziqMzAUnINICzdW8wZCIycoOg96TY0mxsltPBCPNhkTJz8ykUJ3BpoS0glmnVYo2cn0GadxFu40O9a+8sxbGkG4BuDip50aRozlbQlPhXVtx/0ZCPXzk/xqfbQ7mn1St/Kzr/A3h29tNesLiXaPLmRjtOccj04pqom9BSw04q8tDo/ivDKvi7QpzJKYnhlRUJGxWGSSOepDLngdF5PbSf8ABrf9e3+cTCf8OP8A18h+Z2fjWJZtMhRsY8wn74T+E9zxU1DSlJq9jjLmy0a/yt4wUj72+IOPc81nGCktHY660uR+9BP+vIpJ4Z8OovmF7Zcglf3SsCeMfrmqdJ/zGKrUv+ff4sy/FpsYLW3WxYSIJVJ+XAPIx2xWbSUlrc6I3lSbslqrG7aXWmXNtGEsXR9m07XON+OpAPSrjThJXsZVMTVg7XT+X+ZZb+z1kyllcyKCMEMSD6jrx9acqNOIo4uq9NPuRyWrXLL4ugktognygKjdsH/61Zxlq7HRWWkeZ30/zOq/tm6R83MaRlgN37rng8Yx1H8q3U11OGSd9C5pF9c6hf2swuVMRnVWQR4P3gcZ/DNTKV3oEFZO/Yj+Lf8AyGPDX1uv/QUq5/wK3/Xt/nExn/Dj/wBfIfmdR42CtpsCu20NKR16/Kaipsb0OW7TONuUhEW5pEWQf7LK2CwBwQcHg55rOOiNa7vN3IdHguLnUohLfpbwAZYyvkDuR6Z/wq+aT6nPePQxvG8kDmKOIhgsifMMAFTyOlZ2tI6oNum15r9TS3x3SRRIszO24ASYY5GMAHAyOtPSxk730Vy5ph03TLW4W5uZvtUmWRANqgYPP1+vrTVmifeT1VjlNQmM3iy3lEQJZRhCMg/pUrRs6ZRcoR9P1Z0LHzpNskUUaCPnaDjILe/+1jNDmkTHDVJPsbGlT3i6hYaeLdI7aC5Qh1UqWyRnP5iqUr9DN0JJNtrYZ8W/+Qx4a+t1/wCgpW0/4Fb/AK9v84nLP+HH/r5D8zqPHui3Wt+HGhsk33EUgkVAcFsAgge/P6UwOLzZ3XBkzICQcYJH1zzXM00elz06j2Q+WG3njaOd3ZVf5SAPugYHP6VKST3Lm4tK6Wxx/i65sreOCKOTe+4MyA5PB/TiqUG2Zzr04wskr3NvT9e0q5tBJlVJBBBBXnH5U3T8gjio97FhtY0gqjO8bOiBMgsc478dO9JU/IcsTC90/wADi9U1or4nW4tY8rHgDPHvx6dauNOxz1cU5yuux0jeLJSDG9qSMbSDMcEflTdN9wWKtrbX+vI1PDWs3Wp+KLCHZtHmgnJLHA5P8qpQsZzrykrbF/4szRNr/hyASoZUFw7RhhuVWVQCR2BKtg+x9Kqf8Ct/17f5xMZ/w4/9fIfmen0wPIPEvgnVrTU55bezkurWRiyPCu4gHnBA54oQHOx+H9Wkl2rpV4T6CBj/AEoA37L4SXutWzT6jOdOkAxEpXeW/wB4Z4/nSYEkvwm1eyj8q0ltrlOx3FD+IP8AjTAba/C3XpHAm+zQDPLNJnj8AaAOxh+GXh37BFDd25muVHz3KOUZj9AcY+tADG+Fvh9n3eZeD281cf8AoNAG3ovhbSNBYyWNtiVhgyuxZsf0/CgDhPixZwJ4m8P3qx4uJo54nfJ5VACox04Lt+f0pT/gVv8Ar2/ziE/4cf8Ar5D8z1KmAUAFABQAUAFABQAUAFAHmfxa/wCQx4a+t1/6ClKf8Ct/17f5xCf8OP8A18h+YP/Z</field>
+        </record>
+        <record id="timmermans_faro_37,5cl" model="product.product">
+          <field name="list_price">1.56</field>
+          <field name="name">Timmermans Faro 37.5cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQASwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGB4g8YWXh64FvNa3VxL5XmlYEBwucZ5I79qlySGk2XtE1y1161kntkmj8qQxukqYIYdfY/UU00xNWL80qwwvK/3UUsfoKGBxCfEiU3BEugTxW6sA0hnXIzjtjHQ561CqxfUt05I7G11CyvgTaXcFwB18qQNj8q0IOT8XeI9b0/V0sdLe1iXylcvKhYklsHvwMfy/LKdVReppCm5Ij0j4lacLYxa1cgXau+Wt7dyhQfxcA496uMrohqzO1gnjubeO4hcPFKgdGH8QIyDVCPLPitDt8X6FP8AN88MqclscZPAxjPzdjnpnHGSo/8AZ63/AF7f5xFO3ItP+XkPzPVqBnmHjXUHbxhc2quBBHZos8iZDRgnjJzxy4/MVz1o3d+xpTnbQwtLl0/TZYr6HVpftCTK7KbjggE/KR6HvmpVSfNaxbhTte56x4mn8nwzfzK3AhOSBng9frxXS9jA8Y03Wrea7b+1VE6DEiYX7r4xn8gK5XFxXu6GsaqfxHS+AdQ05dfs47WNllaJo5G2H7vJwT/vY6+o9qunz8+rFOUGtDL+JU0h8XXodpYGSOIRYyfMGBk5HTvVzSbM+ZrqZlv4jdPMUWIkDx7Q+cfdB5xj3/CsJU9dzZYi3Q9h8FXf23wlYS8Z2FcBs4wTgfliuqOiRk3d3PNvih/yU/Tv+wcn/oU9Of8AArf9e3+cRT/hx/6+Q/M9lpgeQfEu2VPFU8kI2PLaxl8HAcgkc/gB+VYzlaViJSszi4P3nmNFCwmLxiJiwwrjGdwxzz09KnS+4XVz6ESKRfDqw3ar5q2gWVc5G7Zz9ea3exZ4CEWwaG+jhjfby0bjIY4PJrmjPuYxn3Og+HtjcXfi6xQyRwi0haVjGvMw3Zw3vkjn2FaU5JvQuMkzR+IAWXxbdox48mNTz/s//XrOs7TM6rtI4i0gaK4nEU8sYiVgCrY4YEMPxHFDqNDc2e6+CLCHT/CGnRwbsSQiZtxz8zDJ/U10x2NlscD8VLRk8d6Pe/wzWrRDg9ULn0x/GOhz69s1Ua+r1e/I/wA4lVGvZR7+1h+Z65SJPIfiRcg+LZowoO2BEPPTgn+tc1V++ZyV2cNDfG1vDC6Kf3qvuB6YOamOruLl6n0Trc4tdCv5yeI7eQ/+OmuqWxqz5+urlZbVU2FMHAzzniuKOtzBRZ1nwyvYZfGcYjbJazdPxBBraimmXTi0Zvji5W78Z6g4IOJRHn/dAX+lY123MbWpz63aWks7yo22ZgFI/Gn8T0IcWz3vwbMtx4P0qRen2ZV/Lj+ldcdjVbHC/FiEL4p0CfBy8UyE54+UZ9P9r1P0HcnH91Wf/Tv/ANuQTfupf9PIfmz1QkAZJwBVDPCvFkk95r2oas0TfZWm2JIejAfKuPwGa5JSUpuzBwktbHHGKSa8eXIAYk/hUqoo6Cse5eJ9WN78PoFtiWuNSt4yo9vlLZ/l+Na1q0IQu3a5cacp7HjmpwzafcLbSFfM2lsqcgZGKwpuMoX8yXTcXZl7wJfroviizvZXyil1YexQgfqRW0KgJalq8tbZ4Z7+WeR52YvgEYyT3/GuT2rnU2NZ0YqN7mFcRyTMg8l2A5GFNVFtMxUT2v4W3n2jwdHbtkPaSvGQRg4J3D/0L9K76bvEZh/Fof8AE78Nn1+0/wDoKU5r9zW/69v80Of8OP8A18h+Z6DrE6W2j3crnAETAfUjA/U1NV2g35DiryR55rGkf8JBaw2ouxHCj722jJJxgfzNfNYXEfV7txd2ejWp+0W5ij4e2ounii1NyyDODHXVLHWV3E5lh0+pcu71NI0ux0i8ul32yOI3IxuUtn9On4U6tV4uEXFbM0hFUW03uTWPh7SLxDe31s1xJImcksR09un41j9bqp8itZFToxau+oqeFtDmtwVs2icMRlWJ6e9KeNrQelhQoQfQ57RJDcaz9gmiB8hyrbuQSDit68uWjzRe4qT5p2a2O8ukn/cCOJBsz0wePxxjrXHDmkur0NJWTNPw3L9n1Oa32KonXd8vqv8A9Y125RWftJQbexni4e6mct8WFnHiPw8zODAUnCJjkNgbj+IK/lXuTv7Gt/17f5xOKf8ADj/18h+Z0/xKnMPgu5UHHmyRp/48D/Spn8IjznQvE+laJpwtb5ZGZm3uQu4c4x+mK8rE4CpWmpRdtDqo14whZl9fH/ho3DHMoDAg7oyRjOelZzy6o46PX+vIpV4pnO+MfEGmau1rJZuzPEG3bkIyOMfyNaYTBVKF+a2pGIqxqWsPs/iZcWtl5Q0+JiBjO8irWWU+bmuweJk1aw+L4n3kg2HT4Rn0c05ZXSn3COJkjmrzxBdHVZNQt2+zSySFmCHjNbQw8Yrk3SMnUlzNjbjxXrs0u59TnJHTBArRUKa+yhOpLudJ4B16+PjHTWubuSVXl8tgzZHzAr/WtYU4ReiQnJvqdN8VZUPjbRYRLMXS2djGSPLUHcAR/tHac+wWtJ/wa3/Xt/nEmfwL/r5D8zs/iBp0uqeHltIWVWadTljgcBqyr1VTSbV7uxcIczPBteiMN5LEf+WZ2/lxV9CTCGQ1AiefIiifnnNJjIgf3Z+tCAfbqzTKAMk9KaAsyabez3WyC3aQseAo61nKcY6t2HGLexaXwxrjPgaXOc9MpWbxFH+ZfeV7KfZnU+FfCmsW2qWlzcQLAIpVc7iMjB9qmOKp393UfsZLfQ6f4rxSr4r0GYySGJ4plVD9wMBkkc9TuXPA6Dk9uuf8Gt/17/8AbkZT/hx/6+Q/M73xPkaam0kHzRjAyfutXLj0/ZK3dG2Htz/I4C+8JaRrEYeUGGZ0DMVfHJxk4P1rKnKu0+WSer0ZclBbpmP/AMKt00yso1KcAHBztx37/hWjeKX2Y/f/AMAi1Lux+s+EdL0jQXkQNLKiApvb7ucc4/Gs6s6y5eay16FRjB3sW7DRfDF1plq11bQCRlG9iNuD9cinCnKd3Go0EpKO8UW7bw94ahMbw2MLM/AK5cbvTPryKt4eqt6r/AlVI/ylHxFLDZazpht1VIUZsDaAP4e1ctOaVSfLrtubSj7qvobB1qcyQQC2UTScxpyGfJyOAOQcetehThTsrxVznk5X3ZMLyYTEuXEXnQQjCjHzHPXr/dqKusfd0HHR6kPxb/5DHhr63X/oKV0z/gVv+vb/ADiZT/hx/wCvkPzO08TMUsIWABKzg4Jxn5Wrlx0uWlfs1+ZrQV52ONv4Tm3lmYRRTQsy46F1XOCc8+nIrHDRjdz7tmtRv4TN0y6860kZpi100jRRxHLH7oIPJ9c9uxrrdR22MVFXE8UQz22lTxKiPbpAqSTKMDzcq2Ov91h+VceKppzjLrf9DWlLRryKUe220V4FZvtIZGWQHqhUkj65x2rePu6Il6nQaWnmtbzPaTRRwQx3DbmYeaxTg5z03KT6dPWtG5X30IsrGDrFvHa6lp0c85uY2MjBowW4bBA49M9q404RrT9EbWbgi6lre3Ooaa0u6MwlFEoAyqKxPP4etaqvT6yRLpy7GvZh7Y20FvFIfKmKu1zj5lywDDB5IXaOR2rN4ykmkne41Rnuyv8AFv8A5DHhr63X/oKV6M/4Fb/r2/zic0/4cf8Ar5D8zqvHqXX/AAilzNZ7vOgZZBtGSADz+hNTOCnGzHFtO6OXWBdW0yzaW5ZgsQIVcYViuCa8ipXq0ZNct1dnbGEJpa62JLWxNhbKlv5JlS484vIgYNxjGOD0960eNcVstPMj2NzM8VB4tCvpJrlvLfDCL+FTkcj9axWIqVpxXLZXLcIwi9Q8PxaVe6MiLJG5xyVfkHH6dacvrFOerugTpyjobEz20biZp/LAjEZAfYpA6ZAPP1NE54iWkX+C/wCCJKmt0cH4m8RadZ6tZx2KLKtqTuCcLzjoe/StqOCm+b2jvciddK3Kbf8AwncAiVRZS5GDywqo5byPRieJutUMtfFV3qWrWttDAIhJMik53E5YVvTwcYvmerM5Vm1ZGt8WZom1/wAOQCVDKguHaMMNyqyqASOwJVsH2PpXXP8AgVv+vb/OJlP+HH/r5D8z0/r1pgeH+KUvtE8UXscTyW6vK0ke3hSpOQR29vwqJU4y3Q1JrYzv+Ek1oHH20+mdq5/lWf1en2K9pIBomv8AjXNtayPO0XzMZG2oPx6Zq1TjHZCcm9wh8A+JNOgaOXSLlmzn92of/wBBzVoRPa+DfEVw+xdHulJOMyRlB+bYoEdha/B2xuLJJdRupYr88v5JDIB2GCOT7jFAEjfCGIsCNacAcYNsP/iqYG5oHw+0zQ7xL0yy3VwnKF8BVPqAO/1NAHL/ABYs4E8TeH71Y8XE0c8Tvk8qgBUY6cF2/P6Up/wK3/Xt/nEJ/wAOP/XyH5nqVMCveafZahGI720huUHQSxhsfnQBnL4O8OK+8aPa590yPyoA1be1t7SIRW0EcEY6JGgUD8BQBJQAUAFABQAUAeZ/Fv8A5DHhr63X/oKUp/wK3/Xt/nEJ/wAOP/XyH5gA/9k=</field>
+        </record>
+        <record id="lindemans_pecheresse_37,5cl" model="product.product">
+          <field name="list_price">1.94</field>
+          <field name="name">Lindemans Pecheresse 37.5cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAUAFABQAhZV6sB9TSuAoIIyDmmAUANMsYOC6g+maV0A4HIyKYBQAUAFABQAUAcvr1w0OqsH3FdihQc4Ge+K56quy4kdhqwsrwxB0lU8naDURk4O42rnWA7lB9a6zM4++lA1G4iZgshkIO5clR2Oa5Jr3marYt6fq0lvMtp8ki+ynJohOUdBNJnRyZ8ttvXBxXUzM4yBhNEkaSbiCSwCfOD2Ge9cb1NTS0rV5/tSWjqQucAMhB64/rV05TTSFJJnR11GYUAFABQAUAcj4kmI1sEdYo0K898msKu5cdjHudSlgv/N8wLIR82wDp9KyexSPRYwBGoX7uBiutGRxWrSuNYnEZ2uJvlYdelc1T4max2KiXtwNYjDTHdI4ViO+TiptqB6Cx2qT6CuwyOAhdvNjdJWjbeeVrivqbFjw/mbXi0nzMGJDdz9auPxIl7Hb11GYUAFABQAUAcPr8nma9cbedrIn6CsJ/EWtjE1dNt+yg84HTtwKyew1uen2zbraJh3QH9K61sZs4O6kE+tyMD9+5bH0GRXLJ3kzVbFS8Ji1+Et0WUN07Zo7CPRrtxHZzOTgLGx/Sup7GaPPrQmRkI7tmuJbmzLvhw414Z4yTWkfiRL2O5rqMwoAKACgAoA87ku0vdaudhyftJHHsSK5XJOTLiyvrKj+13XAHT8eBUy2KW53Gn3yp4ZivHPEVuSx/3Rg/yrog7wTM5aM4fw9cLqV3HIgY4Ylsjuea5U7stSuiTWIj/a7ZGCRkfTmnPRDW51PiXVUtvCL3e7mdEC477sf0zXRUlanczvZnN+HCt3FG6qRgk8+1csHc0vdFjTX8vXSc9GzVydrMDuwcjNdhkFABQAUAVNWvBp+k3V4f+WMTMPrjj9aTdkB4Rc61fadcRNazmOQDexwDkk+/+eawpQTTb6sV7Fa58V6vczmaS6G89xGo/pVuCHzM7W08Tmb4WXMbP/pHnmA+pDHdn8sj8KUrQg7Ck7nFReI9R0q6/wBAumh2YHAB578EVNOCUUNNobdeMdau5/NluwX6bhGoP8qrkT3HzM3rzxU2q+FNMsHctLbu/mn1x939DWOJmoxSE9TCXX9QsLlzZXksGPl+RsA/hV04WiFxU8UaxvZhfOGbqwAB/PGavkTHdnu3hfUP7U8NWF4TlnhAf/eHB/UVqhGrTAKACgDmvH8xi8KzKvWWRE/XP9Kzqv3WDPDNTk3XkxzwrbR9Bx/SqirJIRnlqYFu0vHSJrfefLJDlc8EjOD+RNY102l6gUWkLFmJ5JzWtgGFuaQy7Z3ASNzn7ozXNiIc04+oIg83Iznqa6UgHK+DQkB7X8JL43PhiW2JybacgewIz/jVIDu6YBQAUAc147t2uNEiVWC7bhWOe+M1E2uo1G54Jck+Y+eu45qySq1ADCSrcHtSYDCeKAGDkigY8MVVgD1qWrsBQeKoCSPBYc0mB698GgyW2oAk4cowH5ihAem1QBQAUAYvikbtPhGM5nXj86yq7GlLc8v1PQdOJlkFoA2cna7D+uKxVWV9zaVOPYwxpFi0gAgfBP8Az0NW6kiFCI/VdKt7CdI0gVeUOeWzk+9ZqpKXU2VOKWxcl0awlt3f7DEWDkcZXA/AiphUl3CdON9ijBotm84BsEHsGf8A+KrRymZKMBb6wgstWggijjCGReAOuR0NZ8zd7myilaxoS6RZTWay/Y4WbnJC7e/tiiE5dyZwj2I7DQ7VpctYpx67v5E1cpTIjGHkeneCrWK0+0RRIiqFX7igZqsO273JrJJKx1VdJgFABQBj+JV3WEXX/XL0rKtsa0fiOIl2/vohlnboAuQPrXKpNHX7LmVzKjtrkTGSYALngY61cqzM1RiZXiJiHikJB5XgfWpi+ZluKijYsRmOaMLIzMxA2jO335rOEnHU1lR5tWENrcQzrK54HQe9W6rZl7KPYxdUw+s2rMTkyjP5Uk20/QrlSaN6wVpNOMSRSEsclhjA/OlGbj1KlSTV2S20MlsSzncSOM9qHUb6kqEex2fhHlp2ySdqg5/Gt8M73ObEJKx0tdRzhQAUAY3il3j0tJEj37Z0DewJxn9aipHmRdOVmcmWkjYlQChPzcc1wNJnbdoo3DuzZJQAdP8A9VFkPmZzPiPeqqyqp+ZcL361dNJyJm2onTadHdJYhgCu9txGM5rJWLk2EyzSZLMQM9PL5FNWFdnMaqpXV7UscZmGB07VUdn6Btb1OqtIriGxi252qOUxms1Ycr3GMkpfe7Ngeq4/pT0FdnXeEFKi4DNk4X+tdWF6nNiOh0tdRzhQAUAMniE9vJC3R1Kn8aAPHNSHifRLt4ZFuPLUkK5j3qR6g4rN0YPoWqs11M1tf1mXKBic+kQJqfq8Ow/bzI18LeJvEs6iK1nKYwXlXy4x+Jx+lWoRjsiXOUt2W18PeM9EQwNDfFFPBhJkT9M0nTi+iBVJrqVjF4snYqLXU2PtA3+FL2UOw/az7klv8M/FOuTmaeL7MpH37t8H8uTVqKWxLbe5abwX400tBDFFcSKvRoJ8qfwz/Sk6cX0GpyXUZH4c8azuIzaX4yf4n2j880vZR7B7Sfdnpfgrw9daDp0v25w1zOwLAHO0DoM9zzVpWJOkpgFABQAUAFABgDoBQAUAFABQAUAFABQAUAFABQAAAP/Z</field>
+        </record>
+        <record id="lindemans_kriek_37,5cl" model="product.product">
+          <field name="list_price">1.51</field>
+          <field name="name">Lindemans Kriek 37.5cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAUQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZhTA5zWvHOk6HqD2FyszTIoZgijHIyOpqJVFE3pYadRXRLpHjHS9YkZIvMhwu4NMAqnnGAc9aIzUhVMPOnvY245YphmKRHA7qwNUY2OL1T4lwadq1zpy6eztbyFCxkA3Y69qylVSdrHZSwUqkU00aui+NNP1S3eW4KWTI2AJJAd3uKqNRSRlWw0qbtuW9U8QWttoN9qNlcQXDWsRYANkBui5x71TkrERptySfU4KL4la1hnkigG0biBCcD9elc/t3c9J5dBK92dFbfEzSZ0Utb3AO3LHAAB/E1p7aJy/Uar2Oo0vUYNX06K+tgwilB27xg8Eg/qK1i01c5ZwcJNM+f/EIx4zn/AOwje/8Aoxq2xsVGdZL/AJ8Q/FRZjD+G/wDr9H/20+ihWRoeP/FCP7L4r8w/vDcWyOA38JBK/wBM/jXNWWp6eBn7jVupy9tK+CPNRVY/xDP0rJtnbCMWuh6J8NHkGq6jCZI5VEMZLQnKA88fXr+RrbD9ThzG1o7HH+NUbTfGuoQ2sjRo8okbvncqsf1NRVS5mb4OUnSWpjxTj7RIJHYkv/CoH41DRvCS6nZ+HpzcaF4oKqWgFlktKMHdhscA/WtKK0ZyY13nD1OHilmPmgSykmPbzIcEen0rI7Hez9Ce0nVYI90CkAZzuOTRYadlse4+D4Db+E9OUtu3ReZ0xjcS2PwziuymrRR4WIlzVJPzPDNd/wCRxuP+wnff+jXqelf/AK9/+3HOvgf/AF+j+UT6MFalnkvxYw3iW0HcWYP/AI+1c9bc9HALRnDfduAAew/pWT2O1aTZ6V8KMpearGRjKQkD/vqtaHU4sxWsTkvHsnmeOtQI5AdR+SKP6VFX4jfBL92jCIxcH8sfhUHRbX5nW6FP9m8J+Kt3ykwQKAf9osv9a0pv3WcmKTdWByluMGXIwQlZHdJaP0FgTEEY/wBn+lFxNaHvfhVt/hXSz/06xj/x0V2x+FHgVfjfqeE+IP8Akcp/+wle/wDox6vEO7rf9eY/oYQ/hv8A6/R/9tPosUjQ8g+I8n2nxjKowRbW8aH2PLf+zVy137x62XQ9xs41QPtXTp0/Ks3sdMfjZ3/wyuBF4juYWb/XWgYe5Vh/ia1oPU5cyj7qZxGsXf8AaevX18G+WW4ZgfbPH6VnN3kzpwsOWmiHaTJuA431N9TW2ifmXL3UHtLe7shgC9MW45/uEnH6j8qqD91mVaCdWLZUTCx3RwMrH1+v/wCuoOiVmmWI4T5CggAqBSTHKJ7N4DuBceDdPOeURoz7bWIrupu8UfO4hWqM8U8QDHjKf/sJXv8A6Merrxs63/XmP6HND+G/+v0f/bT6LoND551vxJFf+KtYl2Fg0khjYH7yrwB+S1z1KTk7no4bGRpQs0QW673aQjABNYyPQo6q5rJqU3h+ddRiBJEEqL/wJCAfwOD+FFKVpE46nzUmcdHfubCGMTDzXnO7gZCgLj+Z/KtnTVzz4Yqola+hvWZjksxLvUjfng1ztO568ZRcFZkfiBrXzYP30ZIZWIDA4GRWlFO5x46cOS19TnbW4VJ2uJAWyQMD3P8A9atpRckcNCqqdRNnQjxNphnZTFcKmwgfKOuPr61j7CR6EsypPoz074QaxHqOiX9sgI+z3O4Buu1hx+oNdNOLirHk4ioqk20ebeIePGc//YRvf/RjV0Y1NTra/wDLiH5ROWH8N/8AX6P/ALae9a/enTvD9/eA4aG3d1+u04/WsTQ+WYmIvN3OQSze4AyaRTEGqXkSGNLhguenWpdOLexrHFVYqykTTand3qQxz3EkgRSoDMcZye1ChFbIUq9Se8mVY22s7dlXAprcmT0L9xp8cOhW98bhHlllKeUpyUAHf65FVbQi7H6jaRQQ6fNFIrC7tQzKOqMCVwfrtz+NDBMzS2ERO4yTSHcRDl6APR/gtqZtfFc9gT8l5CQB/tLyP0zTQmZOv8+Mrjkn/iZX3X/ro9FaV/bat/uY7+q/LZeXYyj/AA3/ANfo/wDtp7R8QXMfgXVGHeID82AoNEfOAiZnuHAP3AFPucf0zSKZntz+NBI5G24I6g5oAUsC/oGPNA+gO5ZjzxnNAh6yE7QSfl6UwGbyGJ6kjFIY0EqeKAOr+G8jxeO9LkXOPOCt9CMf1pgy3r5z4xuD/wBRK+/9GPRWm5+2b/58xX3NIyirU3/1+j/7ae1+O4/N8E6kv/TMH8mBoZqkeAT2rxwM3HLKePxqVJM0nScLX6nOyo0b7WGDTMiS3ged8Jj3JoAbcQmK4ZOuD1oGSG0m2qwXcGGeKBFyz03eN02Rz0FNAQvZk6gYlXqcge2alySNY0ZSdjSi0J5JRtty3PTNT7SPct4SrvY63whpMtt4m013QRgXCcceo9KaqxbsgeFmotvSxla+c+Mbjkn/AImV91/66PV1pX9tq3+5jv6r8FsvI44/w3/1+j/7ae5eL13+EdTGM/6Ox/Lmhmq3PCX2z2/lYAIKgke4rNaXZu/f5VfqUn0Rp+Bsb6npSdVGn1KXdFuz8Psqn54xjspyaXtl2HHAvq0jF1y1W2vUVc8jJzThNyJr0oQskzftbGB4IWkVFUqDktj+tZOUu50r2D3ia0NlaQxZKW4Udy4c/oafvvdhekto/h/mcpdOn/CSFsEqBzniqjH3bGFapL2l2dFb3UcZKmEEdwGI/wA9KzSR0+/32/4P+Ru+HLoSeJtPjVEQeeOB1JzWkFrsYYiSUWnK/wDw5y/iIg+M58H/AJiN7/6Mau3GyjKdVp3/AHEPwUTy6f8ADf8A1+j/AO2nu/iRd/hjU1/6dZD/AOOmsWbLc8CgXK71K5+XIzzwTUNmkU73LKX2FDAR45JUjj8aycbPY64STS94tx3srQyeWiIAuSVToMn6+lCV+hUpRW8vx9Tk9bl+036tuLDOAT+FUlymNo1JO2xq2zystvAiEmVV2847f/rpuKauTCtKPupXNmO32y+VMWCjl3UcKPqfrUJKxc6tZ3905ORD/b7ROwc7yCwPB681paxg580dTodMihhiKTo4ldvviPdsH+cmpnJ30LpU6co+82mdF4VmV/EmnW5ywjnDB2YZJwc4Hp0/Kqhe5nVhBP3TmPEXHjOf/sI3v/oxq6sakp1v+vEPyic0P4b/AOv0f/bT6DvLYXthPascCeJoyfTIx/WsjQ8A1Dw9q/hu9uItRtXVDxHMBlH57N/TrUtXNIStcS0SO3lkmePep+7sOdvrWUm2rF0o02/fuWra5FqWkhLu7YP747VHqCKE2y6lOio6NtnIa0US8URtwPQ8D6HvVrUxUnFGpZ3cSWsBMbblQgMCM859frScWOMrO6LZ1J5bfa5LAHI3Nn+WKShY1nXlJWcjIudN1EXaahNaypaysdkpQhWAOOD0rRI52yzFuMgBPA9+lPlGptHd/DjQ7268QRakYXW0t8kyMMBjggAetFrCcmzlvEX/ACOc/wD2Eb3/ANDat8f8dX/rxD8omFP+G/8Ar9H9D6JHSsTU5vx9o1xrXheWG0jMlxC4lRB1bHBA/AmkB4NMJoC8UqMjqcFWBBH4UrFKTQtq00zGNIy7NwqquST9KLDdRs9C8O/CaHVdGnuNdSa2upivkYPzRAZ5Kn1z0PPHamS2R3Xwb1SMbLPU7WWMdPMVozj6DNMRc0v4PTq6/wBpapGIwclLdCSfxOMfkaAPSrKxttPsYrK2iCQRLtVevFAANPslbcLOAMe4iXP8qALAAAwBgDsKAPnbxF/yOc//AGEb3/0Nq2x/x1f+weH5RMqf8N/9fo/ofRIPFYGoZoAqXWladfNuu7C2uG9ZYVY/qKAFtdL0+xObSwtrc+sUKr/IUAWs0AGaADNABmgBM80ALmgD518Rc+Mp/wDsIXn/AKG1dGP/AIlX/sHh+UTKn/Df/X6P6AD/2Q==</field>
+        </record>
+        <record id="grisette_cerise_25cl" model="product.product">
+          <field name="list_price">1.04</field>
+          <field name="name">Grisette Cerise 25cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAYgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGd/wkOkf8/8QG7bk5AJpXR0fVK/8rLVpe2t/EZbSdJkDbSyHOD6UzGcJQdmrEOq6ta6PbLPdlgjOEG0Z5pN2Lo0JVpWiZq+N9DaZIftDhncIPk4yf6e9LmRvLL60Vdo36o4znNa8Z2miak9lPCxZIhJneBkH2/rUuVjqoYVVY350iXRfF1jrVxNCimExKDudhg57D3pp3FVwrhs0/Qta3r1touly3xKTCPGUEgHU46/jQ2Z06XNK0nYwB8SLTzRG1k6/vFjJ8zGC31FJSOh4SFtJo6Vdc0lwCupWuCMj96OlO6MHhqy+y/uLkUsc8SyxOskbjKspyCPY0zJpp2Z4z8RmB+IsADZxkEZ6ful4rKUbRr6PWl/7d07r9broYwX7uX/AF/h+UT2itTU+frzVJ4JDE8QkuIbyQzlX+V1z90eg49KyqThF6nbSrYhr4mXNN8W3tpol1LBPJbiKVVEaztuOe4HT605aK9zeGMpzaUqabSE1bxDd6vpt7HJqjyrbTW8iJnzEkzn1PGCRn1xTk+VNs5qtWFWSUIW1Me61O5ad5hHGC9wZ1VRypwflHt/hXPRxEakmrGs4TopS3saP/CUPiDbesFNrlyq8K+D8uB9OvvXRZc1rl/2hJwb5FuVdUvZZVgeOaYNd6fGtx5pzn5icD0HyjHtWOIrezSRhTj7abk9CDTdWlivQ1zNIytvUlODkIAvQZxwBVxqKUOZlQq1aMnGPcS61FpoI4Sj7hGxkyeFOflI/SiE04XLxGJqzlyvZkM93cyTmSSd3eaQMcnALgHaTisqGIdSTTMqtP2aTTLSau3kQsqyEC2KuS+P3mT8w9unFbc0OexSxWI5L3PdfCsckXhXTElVVk+zIW2nIJIzn8etanFKTk7s8o+IMiP8SQqlSY32tjqD5CHngc4I7ntz2Gc3eNb/AK8/+3EcrVLXrXh/7b5v9PTq/ba0KPmmWTz7i4mz/rJWb8yTXmYt/vD0sMvcKFszNcyIxyqgYB7VrXm1TiZUIp1JF3Trof2LfWhxulvYG98Ksuf1IrStK1H5E0Y3rBeDZEH/ALnNcWEf71Hbi1+6ZRVj/ZW729PeulybxH9djlUUqH9dy3eatHLJCX3HZawxjH+zGo/nmniaUpyVh4WSjEjs71IJ45vMMeS5B9iAP8aipTmqVkVCcfa3Yy6u1kuXdH3KIx0/3qvDUpKk0yK9ROqmhBdrPhQpBAY5+imihQdOV79ArT5o7D4ubBfcGpv/ALQwS/cn0d4bbf4Y0pv71lCf/HBXezhPIfHsDRfEt3OcTS7xkY4+zxr+P3awd7Yi6/5dL/0pA5qVFLtWgvyf6ntV5L5FlPL08uNm/IVuB8tSXcsQ2owAHtXNOjGTuzuhKUVoxLe5SK4maRsZ6cVOJpuSikicPUUXJtkMNy6GV42wS4I/WtJwTppMKDvVZIb64mDq8mV2t29jWdGjCMrpG+KbVN6kAnkMHl7zsx0rX2cee9jmV3S3FYMUDgEqABu7f54NXJajoySiOmyotwQQRGcg/wC81Nr3SIyvVFgUyyNGoyzLhR6nOaIrQKz/AHiJLcOIp5ApwqYJx0ycfyzQkE3pYck8gjCZGAMdKhUo81xuclG1z6U8Itv8H6Of+nKIfkgFas5keX/Ef/kolv8AOG4PG3G390OPf1z747VNW/JV/wCvP/t7MofBLT/mIh+UT0nxxqqaP4Q1G4ZgHeIwxj1Z/lH88/hVGp4BrGiGw03TbvezNfIzbT2xjH86TjobRqMxJUfLyhG8tmwHxwfxokiaUrMv+G4Uutfs7eZd0TzpvGP4QQT+maViue0m12FVLd9K1CY4EvmxrEPY7if5CiKRVebaSK76ddxXItGhJmKBgg5OCM/yquXUzVT3bF4xovhWN8jzHvCMA9AF/wAWoaFBk2oWo1W81K8i/dxWUStjHU5Ax+ZY03qSpNO4zSrNrO/0y/utot55MgnoADg5oSsEpczuQO+23niiGFuZwVHsuf8A4r9DSKk7M0H8Ph9Z1GxgkOLKNmB67iMcfzqlEmU20e3fDjUo9S8E2Ow/PbL5Eg9CvT9MH8alko8++IpB+IsODkjOeW4/cr68flx+OaVaV4VfKh/7eyI39nL/AK/w7do/1rr8rFj4w6pJda/Y6Jv8uCNVdiTgbmOMn6AfqaZtFHPePbi1Q6fBbSpIltBxtORk9P5GqYk7FbXbFbH4eaSjrtllmMh/EE/1pdCepHrKtpy6NqlmAhktRHnHcLj9QTVSWiBPUw7K2N7eW1hD80k8ig49T/gP61CRpUnzM6yaSM/E4DAwmIwO33MVoviMuhzuow/2Xq11Cyk+RKzIvbn7p/Dg1MlqUpWRdto0g8CXl0ZF33dysZGeflwR/M0dBdSe88q48CWEyuu+2mKlc84PX+lN6oRk6TJbv4gsftsqx2ySoXY9AoOaS3KbNfQ9Zs4fFV7c3UgW3uDJhj0wTkfpTi1cVjq/hBqTQ+I7/TIXL2k0bSJ9VPB/In9KlgV/iLJJJ8RYVfZtjyqbTzjylPPPXJPpxj6nOp8Fb/rz/wC3kRjFU5NX1rw/KO39bkfxkhZvEavtP+qXBx145q2ro2hJJnnhtnbTFuQN2JmVh9Ap/wAaEtAnJNmh4k8Wy+ILSztjbLbpaAgBWyGP5U27ohIgl1y51HRrTSPIUi3ORJnnvj6cGne6sFiha6hcWGope27BJon3KcdDSGObVLp9SOoGTFwZPM3D1zRd3FYfd3Nzfia+uZS8jsAxIxn/ADih6gVhI/l+XvbZnO3PGfWgBybmKoCTk9KAHywuksgCsVRiM4osFxFoGeqfBe0kGq3Ny0TBPJKhyvHUd6b2F1Kfj/P/AAso5VB+84Kvkn/R06jJwfbjjBxzk4SXu1/+vP8A7cH/AC66/wAaH/tu2mv466X0su08VKf7fZp7hlt9g/d7Ay9BljkHjoOhzWt7I2p0nNN9jjtb0GO5d4rY28LJMyNGYlhBbAB5Ubc/XFUncmrScWvNHn+oeHNRs7l0eGNhuIUxzo4/8dJpNEWZb0XQbsu8sr20CAYzJOuf++QSf0poGmUo9Lha9ME9yYgWA37M498cGkNK5Zh8O+dMqxXJZWbCt5J5/WnYOVmje6VZ2WlOscs0ssZG4SQiMA89skn9KBcoyx0y3vLISzW1sm4kA72DnA54BwB9aV0aKk2ro07bSLaziM8em286oQHkYuzRt/u7sY9+adxTpuNr9SnaLcz+Idlq627eYWLr8qqO5wOw5obFGOpvaakKXG7zJppBkod20yc449Oeg5qec6fqrTV/+GO28CWs8GrTNLLNKjwFo3mJLD5hkH3H+etPocs48srHE+PGB+JkoCKpWbBIzlv9Gj5Pv249BWMvhr/9ev8A24JK1Fa/8vofod/4l1CO01R0li8xSVJU4PGB0Bq5Ox24Si5rR2Obu7eLXbuOKJBa2yD5xt24yxxgZ65IHv14FNPQivTaq2bu7GXq2mSpMUi04QJk7EQbmXjqW/iJ478UJs0dKnpZrz/4BCnh24i02S7SMLNGf3iK2RIOpwPUAciqVznrRipe63Y5zQbRJ/EsSyL5mZRhCM5wM9O/pSYoRbbfY60+H5TdMDcgk5EjFT15HAHpxxS5WdLqRTVla39akHjSyitdMQM8kk6qBukTBKAdD7gn8qexjOHNLmSsVdIGmppERukDM/LuN3tgccZ4NJtdTenCo1ZfobcV5pMVk6xwq7yAhlKud6lu5PX+lHMhzoVJK0v0Oa0lhZeLVVg7RRTSAkdT8uM9uxzTbOejBNM6Wy1m784vHbGUEk+ZuOBznHI7ZA+nSp5mdTw8Fu7HX+DJp57y7edVVlUKFViQOeev4VXQ48Qopqx5147I/wCFmzdOJ/8A22irGXw1/wDr1/7cZT/gx/6/Q/Q7TxZK416QxkAxqoY4zgFeP5fyrSZ24BxleLMeCaZ3JVvNcXMZ+fjI5HPtlh+dK75fmbyjCNe23ulfUL3Ubp5J4NnkuTuaRAoHHTryMAf5PIpPoW6VKNlLcYs14Z7ZJ5ofkn37EQBgAcsSeo4/lTu7mUlTVOVk9jj9EdY/E0bhjH5coJ9uB/Xj8acjnw8k3Jd0dCohZxLPcsH3ZMcRJ78nJyOhP5VB6HvbJfNlLX/KGjvNGjBMhCz9XPUn/PqKqKOTFTcdG9RNGkCWiM8CSblG0yHKkAY6fh/+qk9Ga0VzwumasE7+Q0s3lpBEw3BUAEj9lz747dsmnG7ZOJcaUerbOa0q6Q685uXdY5C3zj+BiMZI7j1HpVtXOCnUcJXOngsNRJEHlysPvIV/1eOPmBHGMZ5rNpnqRq0bc11+p2nw/KFrxISGji2rvH8Z5yfpkcewFXayPKrVfaTbOP8AiZ/yUCw/65t/6BU1fgq/9ef/AG9nHR+Gp/2EQ/8ASYG3471C50XxIl19mV4poxtckg+hGRweg4INX0OhNpmF/bT3pTUhbMY1kMLIxG1hjO0bVGOvp15zSexcJy5rrcmvNLubiMS2qTXlvLzG6ZPrww7EE9Pb3rPlZ7FPE0pRTdkzNvCulWZtVKNdyg+eQc+Uv9zPqe/5etXCNjhxmJ9q7R2Ob0RZ18TRm1aJ5lk4ViMPx0OeoIqmcqeu53S6H5rF1FzbRv8AM0LwM5HsGHB/Eio5DujmGmquzmfFpMEQEsaJEuEigE6s4HJy20nBJyefb0q0rI4alVzk2x2ia1ptvpEdvOk7RhywieESBPowdCPp0otcIVpQfu6Fu61bTrtIgDdssZPlwpEkKLnvnc5z7nJppWJnUcndmBaPqlhfvNJbFVbcQs8Acc/7w9O4p2J5ma9prt+UMEVvbYb+BbcMD/wE8fpRYXMz1TwJb36aVJc6gpSSZhsjMYQKo9FAAGc+lKQROE+Jn/JQLD/rm3/oFZ1fgq/9ef8A29mNH4an/YRD/wBJget3lha38ZjuoI5kPVZFDD9atOxu1c4rxX4cudIhjvPDUDwIM+fFb5OemCV7imncWxw9z4j1CM4a3tC+MMWs0BP1wBTsh8zGW+q61qBW1sYlQnjbZ2qRnn3UZ/Wiwmya3+EfiBJxcRmBu+Hcqf5UWSDUsr8MfEvmZNvCPfzlxRdBqbuk/ClmVjrEkTg9I42Jx7545ougszXT4UeHVUDddj/dlH9QaXMHKXrH4d+HrGVZRBLOynI86TI/IYo5mPlOjjt4YRiOJV+gpOTYWRIAB0AFIYUAeOfEz/koFh/1zb/0Cpq/BV/68/8At7Oej8NT/sIh/wCkwPY6o6AoAiltLaY5lt4pD6sgNAMdHDFCu2KNIx6KoFAIfQAUAGaACgAoAKACgAoA8c+Jn/JQLD/rm3/oFTV+Cr/15/8Ab2c9H4an/YRD/wBJgAD/2Q==</field>
+        </record>
+        <record id="belle_vue_kriek_25cl" model="product.product">
+          <field name="list_price">0.83</field>
+          <field name="name">Belle-Vue Kriek 25cl</field>
+          <field name="pos_categ_id" ref="fruity_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAYAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZhTAKACgBGZV+8wH1NACghhkEEe1AGPrHirR9CuUtr+52TOhkCKpY7R34+hpAJo/i3Rtdu2tbG5LzLH5uxkK5XpkZ60AVPGviO98N2FrPY2aXLzziIqx5GR2FDBHP+GviFqus6/Z2E9hDHFctIu4tgjYOcc9R6Uk7jasdzqWrWGj26z6hdR28bMEUueregqhFCLxhoMsyRLqEe55BEuQcbz0XPrSugNo0wOd8ea3e+HvCs+pWDQrLE6A+aCeC2OB68/wA6TdkNK55rL8T/ABLE8rGazURSIDyG4b6Hke46VKkNxZ2//C1vDhCbZZGLHA+Qjn8uPxqrknlvi3xUbvxFqN3Z394sM2wxJk8EABh2x04xUsaRr+GfGV5oel6nfWYlu4pb6KJJLjgYZXPC5+9wM4PpTuFit4n8UT67uuL/AExHe1c2yOykbCwPUZwG44yD0pXuhq6NT4MvLceI7uUtEix2IjKRpjfhhhj7/wA80RQSZzF54mvE1eaObWLpUGoMrb9xKx56nnn6ChvUEtDf+Gi/2h4ztr65fznVZQjSE7sgHBAPtQnqVyPlbOu+MaSnwnbyIkbIl4hcN16HgU5bER3PNvCP2m78U6bFHZQR7tQWUFskBByU+mBUxLlY+iDWhmc38Q4Yp/A+orLGrgKpAYdDuHNJ7DW54Q3h7y5mDCFXU9N/BrPn1N1QbjcgiF5Z3MaKltMIZt67o87vY8cjjpRLfczWxAyyRxsJMbixOF7e1VcSRtadCLnwXqkEyOrrdW8kPbnDqeO/Wi6DlZXTw/fG2klcT7Qwd1YkZxn5sE9v61Ckk7GrpSauzqfgxPBH4ruI45ixmtH+XbjGGU+tVCVyalPlW6Zl3OnwX3iDUbqWZQDfS7l2kngk5/n+VRUnYuhR9o7eRqeDfI074g6bAtwzBwwVdvHIbvmiDTaHUg4Rav1Ox+L0mPD1lFtLhrtWZR3AU5/nWsnoc8Fqcr4SvbE+ItMW2tkUPPgHByDzg9f85rGLfOdUnT9j5+h7Oa6DjOc+IE0cHgjUXlBKYQEA4PMiiplsVBJyVzwOW9tX3SHUpWHYMnz/AIc+1YW12OzllGPLzaGxZ3VjDFGJLfE4U8suc5OQc/Q/pSm2PDundqWnyMjX9Qkiu99mht4ZB91cgEjrTtzLUUXq+Xb0K2l6tLi4gmmKrKqkOcnaVOQf51SXKiZqUmrs6R7q8lsppZri3VByZBKDwfbOc8elZaX3NoqrGnycvzKHw01NdL8e6e7sBHK5hYn/AGgVH6kVtHRmVfWJTl1+xGs3EtzFMC1w7CSBwCQT6EdaUoNmcJU13TJNO1yKDxVpuowRtFDBcqcM2SRuBJJ/E0RVrFzUeVpHoPxx1Ex2+kQQyYYs82VPbgA/zq6mxnhtJXOC8L+Jr+PxFpguLlmiW7jLZ7jcM5NZxilJHTXfuPRH0tXQeccF8ZL77L4INuDhrq4RMewyx/kKmWxdNe8fPbAis0dDZsJ4gu7OVYdsUqIPlEsYbH50p00OlV5tJJMo3uoXGpXQluZN7YwB0AHoBQo2RXtLzaIYiBHISeo2/nVRMqz0RFHIwGwk4PvQ1qTGp7rRNbsyzoykgg5yDjHvStqa814Fa4fdJuPUkmtEcjLEEm+EnPKkH/P6VMlZG9KV215G74t8Ry+I7mxeTP8Ao1nHCMnqQOT+JzSk7l0Y8tzDhkMcyyKcFTkGpW5pPWLPq7Q78aroNjfg5+0W6SH6kDP61scB5d8c70mTTLEHhEeZh9SFH8jUy2NKS1PIEXfKR+J/OpRtJ2RXkcmdmzzVtXOeMuV3H24LHJPvQ1oVCT5rjycRBfUlv04/rUoqq7srMSCCKpGTLKuAu/p8tJrU0U/csQTDG36U0Zsdbkjd70PYqDsyYtlifQYFZs60tBqnkUDPon4Q37XngaKJzk2szxD6dR/OtIvQ4pq0jhPjIHl8UPkEhLeMJ+ZJ/nUzNKTsecWqlpJCB0TH5miJdVrlKDDkk96o5h0DbZPqKYEgcEtzwFwKktu5DwxwTTRJI4PlDHQcUMAZJJAGCEjGBgUIC1babM0ZZl2gqTzQC0G2lu1xMUJ4pWRp7WRrWXh2acnbHLIVGSFHSpaRaqOx7X8JLb7J4fuodu3FxyP+AitFsYzd2cr8WY/+KpQkcNboc/iRQxI4yXSZbS3MzxbN+CuQAT/nNSpJ7DadjmZ7GaNyNpYeopiJLHTZJGLSgoo/M0wGR2oN55J6bsc+makZr2Xhae7uVWCGSbJ6D+tDkluFibXdHm02wAntzCd3AKYzRzJ7BZou6Ho0M2mpcXkiwxsflGMs30FZzqqLsa06MqmyN2XSdJNsBbmaNmQhXkGQT+XFT7V31HGg5JtdDl/COlfbdVmLxtKkOcopA3HsM56VpNu2hEI3ep3Ef21Y3UMtrCozsTAGOO4+orns76nc8PDlTiz0LwRby22m3CTOHkEvLDvwK6aasjir8rlojl/iHBC/jHT2nICfZgcnGMhmx14pz2Ipq7ON1tE5dbgTsxGSGBHQHj8SfyrOnFJ6G9aV4rSw1NDtIIUfUnKyOMiGNfmx7/8A6qUqutkTToSkmy6um6NLCPKjntmf7jEZH48f1qVVkmONBzjdHJWWltP4w+xt+8CvkhD94Dng1rzXWhnyWep3SxXzTxwxbbWIEBUXAxkqOf8AvoVzNSvqdyo03S0f9a/5Gb4utZB4blneYOjMGVPvbfmxwfru/KtKcbamdVRStbYNKudPGnQObeY7flzs4yMHH5Aj8e9FRwKw3Neysabapb28ZZbTeoAHI2nIz16+oqYyV9EbVKcmm2zjPC0zLqV5smMR35JDgcZOTnHpmtajaVzzedRudS82xVA1CSaKTtnARemK57t9T2o0IqKbSTPQvhyMaLcNkkNcEgn0wK6qXwnk4y3tXYwPijIttrelzsuVMTKw9Rnn+dVNXRhF2ONuiiTrD5O1wqlWyuXHrx61hTTszpUlyRu9bmxd3mm/alkNvMilvu+UOSCM45pTcGzow/PytKwkeqWsED/6NujKKpIXBBAw3qOetTGS2SNpwlLVvqcZNdOPGkk8BMLyfMgznGRnGSK2v7tzzZySkzrZJ5UQyJqMjYOPL3chsDJyOvT9K53OXc9PC0VUpqTSMLxOwfTJHVywIG7P94n/APXWlJamWOSjBJMTQ9Re20yNoiuXLLIgHzZwOfypzg7s58HWjSk3JXuXnuXSDEgbyyS20jGcCphDzOivj1JNJbnIaJemz1N51JDAk9Mg/hXQ1dWPN0WpuQ6jFtfKue+AcAVPsy/ayta56/8AC9jJ4YlkIxm4YD/vla1SsjJmP8YYpI7fTrtVyoLxtkZHYj+RoaBM8xguZJZdnomRgnjFK1h3udANUZbdZEMeyYNvVRyrZGSR+VcsqbuztwVeFO/P1II7gyQNE5xEXBLY6UKDOmrj4tNJbnI6hcgeIXnGU+fK8ZwO36V0JaHlSd2bzanHLcs7MFL4yEXjOPpUOkaRrzirJsp6xJJe2zW9pDJIzMPlUZJwD2H41cYWM5SuZ1k88VqELsp3Hg1VkTc19Ps7zVbiCzt0knklONq807Bc725+CEce2XTdU2OUAdJ0yM45ww7Z9qBCWfwavg2LrV4FQnnyo2Y/rigD0nQ9FtvD+lR6falmRMks55Zj1JpgTajptnq1k9nf26zwP1Rv5+xoA8+8T/DXSNJ0W61LSxcieFdwjaTcu3Iz2z096QHlzXU6A4IJHcjmlyod2Kl5cPE26QjpjFCiguzoLT4R6vrGmQ6zbXESvOxYW82UO3sc+/4cYp2ETj4V+KvPB+yQbc9fPXH86BnceCfh5LoN+NU1K4SS5UHy4ouVTIwSSepxQI7C50bS7yQyXWm2k7nq0kCsfzIpgTW1laWSlbW1hgU9RFGFH6UATUAFAAaAAGkAhAIIIBB6g0Ac5ffD/wAMX8plk0xI2bk+SzID+AOKAJNP8C+GtMcSW+lRM4OQ0pMn/oRIoA6AcDAoAM0AGaADNABmgAzQAZoACeKAAP/Z</field>
+        </record>
+
+        <record id="leffe_brune_33cl" model="product.product">
+          <field name="list_price">1.00</field>
+          <field name="name">Leffe Brune 33cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAF8AZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGRr3iTT9Dgf7RdRx3BjLRo4Jye2cdqmUrFRjc4JPiRrZuE2NZzRscDbA3+PFZOpJbo09nHueoW8jS20UjABnQMQDwCRWxizmvFHjOHR1SKwns57jeVkR3zsx2IHQ1Ep22LjC+5S8KeOb3XdVSyubSBQ4b54N2BgZ6nilGo27WHKmkr3O1ZgqlmICgZJPatDM4LxD8RpNP1B4NMWxu4lAw5kJ3cc9OOvvUSm09jSNNNbm/4U8QzeILaZ5oYkaEgFomJVic8cjtj9acJ8wpx5TbnnhtYWmnlSKNfvM5wBVEHn978TLtNQeCztbOSIS7EZ5W+Zc/eyOKhza6Gqpp9TstB1VtY0tLt4ljYsVIUkg47jIBqoy5kROPK7GlVEhQB558RTi/X5ZS3kKV2LkHlutc1fc6aOx5410slsj750b+PPAc5+6PbHp6CoirFyPfdNdZdLtZEGFeFCB6AqK6zke54vr8kMd5cNsLSrcyIQ8W4RneRwcc/rXJK/MdcdjX8EXEcnjK1jE8rIEfYjDb82089B7jHtWlLczqbHputAnQ78AEn7NJgA4z8prd7GEdzxNpbaO/tyk9wdy8ymL7mfTjrXFrc7Eei/Dpw0eoL5rSENGRu7Ag4H866KPU56vQ0fHsixeFJ3fcFEsWWU8qN4596up8LJp/EeW6Y1v/aksKpIiYyhWLDOT0J46Vy3dzqex614Qz/YSFpDI5c7mx1PArppfCc1X4jbrQzCgDzz4gtJJeSRoSSsYwoGSe9cld+8dVD4Tzu9kkW2WYlQyx/cH8HzDp79amFi+Vydkj3fw+6yeHdNdPutaxkf98iuxbHHLdnj2rSyyXazOBOHnZjHjgEseT7964pbnZHYueFmaHxzYlmB3ynGOBnaRj6YzWtLdGdT4Weq6/J5Ph7UZMZxbSYHr8preWzOeO6PFl3rq0aMvmMU+UdQn9K4WdvQ7v4aSsbrUomIOI4WyD97O7mumic9ZbGv8QZGTw0FQhS9xGuT25z/AEq6vwMml8R5xpXmm+lQooOOZCOW9q5FudT2PUPBr7tEPAG2UjA7cCuqj8JzVviN6tTIKAPKPH9+y6velF+4nBzjouD+oNYzpczub06llY8+W5M+mQEjZ5ySAd/ukN/Ss5U7XXkdeHkrqXnb8Ge5/D6/S88C6dMW/wBTGY39tpI/kBXRH4V6HFWVqkvU8Z1DVnj0u2kVCBPLhgG6jJNYuhd7miq+Rf0+9+yeJbe4f5Us7uKRj6KWjB/RjRGPLJGzalRfy/X/ACPXPHdyLTwTqs5PSDH5kD+tbSV0cUdGeMXGqGLXbWxKtsYA4zxzXP7DXc6PbLsdx8N70DxM8O7i504OP95H2kfzq6atIeIX7teprfFK78rTtLthyZr3OM9gjZ/nWk48ysc9OXK7nm2iak1x4luIGBzGdqkt05rH2Nupuqt+h6n4AujJb3UBOCCkuPQnIP8A6CPzrWCsZ1tWmdfWhiIzBFLMQABkk9qWwHi3iaO4vZL+5DRN5iuw/eqME5OMEj1qOdWNFFnJQ2c8eg2c0ixAQXJVwJUY7GHPGaHOLLXMjsfB/iddK8HeIdNklVbiINJApIz8+E7ehwaSkuUUoyck31OU1/TriPSLGFBGWjK5/er2H1qnNE8rLN1BcR38uPL/ANMs1IBKPlgCPw9c+1TKUWXHmR23i3XjrPwy0iGBhJNqbxxyDeB/qz8/fn5gKrmSSM+V3Z5/qFlff8JhbOtnOygoNwQkdf8A69JzjfdD5XbY6Lw1dS6Pr9rcTKUFrfvDIcLhYpTwSeo5JwPaoclzF6uNjd+JFzJqHjLTrCHaUsIHlky4GGcYHBPoB+dauSWhnGLscJoVnef8JReymBgCxIbjH3vWp54t7js0eoeE5ns9TjEgVY5C0BOFHXleR1PA/Okn7w5axO+rUyMrxNe/YdEmcDJkKxgeoJ+b/wAdzUy2Gtzy6/aO7sbmSCVdmw5R4gXUnPA9e/Oe1c9R8i1OqjF1JWRzoNvH4bvobiRGki2uI4UG7nkEt26/X2pwvJXQqvuSafQwNMnhfWbd5Y2dLkhXVWwRyMnP1Fayg2rIUqi5Udh4iWOW3SSK5jeLdxmEbweCcjtj6nr9a56suS10b4Wg67aTsUfEc9va6RYyySiS4jYxMIlAVOxyccng/wCNaRTlZrY53PlZmeFbwTalBYXdwwity7w8bkUnrkdfyqpxk2mh1JR52bF9bTHX0ZY7X5mGza5PmdvXA59cdKwlUUZWdzanRnOm5LZFHxfJFFeeTFMDLNEshEY+QMucc9zjdzW8Yu92ZU5rmsaGhawPEOoalqt3II7yQjPmDKMOcAHtwAOaJRlczUlawuj28kWrzGX7MmDmQcgJgn8+uOM9qxjNOVlc6alGUKak9mdDJfw293bTRyMQJEKNjAZ1dTwOw+7XQlZHMne565Whicf8TrmSz8NQ3EfPl3alh6jY4IpMaPHLzxEqW8i2jMsrjHzoCvXuDkUpQUlZlwnKDunZmNFqEq2t6HDTNcqNzse4701FJWRLd2VNMuVt9St5pFJSInp+P+NMDW1PxBJIyCwlaNeS29Qcntwe45596znTjPdF06s4fC2inf6kJ9BhtWR2kWQu0jHr97/GqtYgg0DUItPv3uJ1dl2EfKM8nFMC1da/dPdSvBLtiJ+QMoLLxg4Pb+mazlSjKV2jWFecIOKejG6zqiX17bPEh+RNh3d+v+NaGQ7QNWi062nSSJ3MhBBXpwKBEuna3cRzxi7uS8I6gIMnjjJ6n8ahUoqV0jWVacoqLeiOlsdTTVr20ijUrHDIDz1JLL/h+tVLRER3PoCqIOQ+JqPJ4YjjjTe73SKq4zklW4qJuyuXDc84bwNZ2ti1xqUq+ZjJSLhV/Hv+FeVPNVKpyU9X/XyOlUNLsoXfgtY7CaaylVvk3BH6N9D2P1/OqpZmnNwno0xOhePNHVHMaLYzX1+tpDAHlYkbWA4+uelejUqKMbt6GUI3udbceBLK1hRry4XeTj5CQoJ9OCT+leYszdWbjSTdv68jZ0FFXloUPEHg9tN0prq2dZY05ZSPmUeo9RWuFzKnXduop0HAw/DWjz6zMbeCFXI5Z24CD3NddatGkrtmcYcyOlk8CQLMsU90d7k7QpwCfYf/AKq8/wDtTmTlGLaW7Nfq6Vk+pj+I/DcuhSQOdkkLsAJF659COxrrw+MhiFeLInS5N0T+GfDE+r2Jn2pDCMjzGHLfQd6MRjadDdhGk59DTh8C20rvFFdfvEODuORn3A6frXN/anKlKSaT2ZX1dN2W6Nbwhoclpr0+n3MCqwh3LjkNhlIIP4VvXxF4RlHVXRMYJNo9trvOYyfENutxbW24ZEdwH/8AHWH9a4Mzk1h2l10NsOvfOLkubG9WRb6TylW6aBFAYHIOASR2II9AM15uGyyMI3XVHROvd69zI0vUba7tY7Zbcxb1BQBt4GVVsZx2Drk+pqcZl1rzT1Lp4jmepmeD9NS38R6zOy5EBwuPfJ4/Kox9SVWjSpp77/IdOKjKTNu+u9PudFS+upPnMDypAjEbtoJIz9VI98HFdGHy32V1F9V/wPzMpYhNptDma31CxlsSm11jcEfeUhSVJDY9QcdzjNceIwEqE1OL6/8ABNoVlPRmD4Kgj0fwvPfyJuJlPGcZ+baK0xyli8Wqaelv+CTTtSp3NzV/sEciTvOklzG8f7pJMbATkEnrjBz+I9a6KOXyjDlTaWv46Mh14817f0jP8WfZ9T8LTzw5zCUYgjlTkfh+Vc+Fws8Lio22ZpOoqlNl/SUi06303TVVQ00RwzHAG0An+dYU8M8ZUnNvqVKoqSSGJcaZZaoskMvnrLH80quNvLHtntsJJPYd8131svnUp8rfy9FYxhXjHZHRwNaQXVpqbyqkbxmNGPG7cy4GOueOlYYOjWpJ0/O/3bjqyjLU7qvpTgMPxbqkej6VHdSxNJGJwrBOoG1uf0rlxlH2sEr9TSlKzOI/tLw2sYvLd2gfd5w3eYFBIwc4yBnv61z0/aRVmaySZkpqGhaRp+RctdSxqAJEjYcBFTA7dEXr3FZ1oVq0XHuVDli7mV4Z8WWEOo3v22GWOG8OQ6846jnHP5VlUy2aUGmm4ov2ylfQ6K/GgfYHt4L9bcyRPAPOkYgKxz39M5HSuqnOdtUYuKINS13R9KsXmEzzzybtzRqwDkszdDwOWPvXLiMPWxMVHT1NacowdzL8I+INJvtIOlX3mwMxY8MwDAkn7y/XvSng6lKu6kbPYbqqcbGzexaTIxW11e2VpJFkfz5VJBVNmQMZ6BeOnB6V2c8uXYx5VcyvFmsaRY6PLp9nK0sk+OASR1GTnoBxXM8PVrYiE3okaqcYQaNHSNY0PWbaGeWaWCW2GCGdl25BB9u/Wow+Hq4ZtbphUlGeo6K20drlB/alo1pFCsO0TL5jABxg7cdnHPXiuyVSatZf1p/kZKKLl3rWmXhsbC0drlkvIgDyADuwOe557VlhMPUjUlN6XRc5KyR6pXqnIcl8S5JIfCTToMiKdGcEAjHI5B4PUVE4plQdmeNSataSWzJJaRRq3V4QwYH1wTg/Tj8Kh0muppzoqf2rb/ZZVisoeBhWfc7fjk4/ShUn1YOaJpLObSLDSdQuYA8WoRyNtkT5eHIHTGOMdPWqlTTFGQt5qenTRxrNAYschoWJzjt82fzzx71m6UlsyudFa81a3k08CGyhVjwrEFmH5nH6U1S7thzj0iOgapLp1/bB5I1VhvyGG5Q3BBHr3zTdO+wlIWfUdMe681lmjZOPKWTIfPocfL78HNT7KQ+ZFq1gj8Ra/bada2ihpw2SGZm4UnvwOnpVRp2tqKUtCrpWowRW7rPaIXHDFSUY/wBP0odJ9GHOiS1v9MjmLoJpN/OwybdnsTj5v04x+E+zkx8yO7+GdnZ6zqsjm2CR2JWZdhPMmfl3E59zxjpWkYWerIlLQ9crQzIL2yttRs5bO7iWWCZdro3cUmrgcJd/BvQ5mb7NeXdujfwZVwPpkZo1Hcfp/wAHfD1o2bme6uxkEozBFP1wM/rRqFzpNd8IaRr+jw6XcwmKG3x5BhO0xYGOPw7UNAmcRdfBC2mI8rXHRR2a2DH89wpajujR0X4P6Ppt3Dc3l3NfNAwZUKhELA5yRkk/nRYLm14n8AaN4puUvLkSw3aLtE0R6gdAQeDTsJM5N/gbaPOZBrkqj0+zj+e6lZjujqvC3w+0jwrcNd27S3F2ylfOlI+UdwAOn607CbKms/CzQdUupbuAy2U0xLP5eChPc7T0/AigLmJD8EbKOXc2tTMvoIAD+eaNR3O38OeF9N8L2bW2no+ZCDJJI2WcjpmhITdzYpiAAP/Z</field>
+        </record>
+        <record id="leffe_blonde_33cl" model="product.product">
+          <field name="list_price">1.00</field>
+          <field name="name">Leffe Blonde 33cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAXAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqAGebHv2eYu7+7uGaLgPoAy9V8QWekuI5kuJX27isMRfaPfsKmU1HcpRbHaRr1prSsbZLhNvOJoiufoehojNS2BxaJNY1BtM02S7RFdlIADthRk4yTROXKriiruxzml+ML+81NbaePTtm8KfKmJbn065rKNe7NHTsdZLc28BxNPHGfR3A/nW7aRlY4fXdQ1VtVkFpqNykIbgwvGEx2ArlqVnGRvGmmjdh1+20jSo5NVu5nZ3YIzpudgMddgx3rWFS8bszlDXQn0nxXpOsziG0llLkcB4WUH8cYq1NMTi0bNUSUdbx/Y11lto2cn0HepqfCyo7nlz6dp9vqgG2y9QBIxHfkiuL2ku5vyo72+8Tf2TDbxLYT3T+UpZkIABwD9c11Oqo6GKg2YGpaw2rj7WdMvIo3QINkoBYgk56jisK0uZ3NYK2g7Qr57exupbaN45YoPlLP5hALKOB60qUnFNhNXsVBqGr6lcy20ur3LxAgsoswDgHPp7UOq5KzBQSY3Qry7fW2aSRdnmLlUXB/Hk9qzg0pIuS0GeJTaf25dKy2zuLj5/NJBAPr7YrSrJqbJgvdRR1NLRJbJIltjwGzCMLye/PP1rKUmyoo0teuEttP0wKGYM8vzx4DDhPXtk1o3emvUlfEy/4LkM08JPnk7iC0jDB4PYU6PxoVTY7w12nOUNbbZo1ycgfJjJGepAqKvwMqG55vqKwRXqkReVkEnAG564Lu50o29eud0EQNu0wa2icbH2nJXGD+Va1Xr8iIGF9tQ6ftMYt2C4Zw5bPJ4H1/wAayaLRJpt2psbxXBUNbfKV6n94gz/n0qoaKXoKW6G2LS/bHb7ROzFcAA9O3JqNBmTol48eq3IG4BWySTyxFU1azAu69OsvirUGOGxcFCMenrV1fjZMPhRBrlvcT3lm8QEgUDftIAwOnU1zVMRTpr3nY1hSnPZEmv3Je5sIM+YUDtk8AZ2/4CtKVWNSndbXJnBxlqdD4OkDXFs5GWDBS3bkdBWlLSaM5/CehV3nOZHim7js9BlkkzgyRqAO+XWs63wMukryR5pqVwJL3ckjONhO48EcV5TxNNaHcsNNmg+oefoiSpIoCRJG2RliVGCPzrpqO7Xoc6Vr+pStmWTRlVlA5JAPUn1rmxVSVODaNqEVOaTKayS28iRRsdrLhvXGc/zArPCV5VL37G2IoxhFW7lrSyXv2jVSi7TuHGWrqexylLZtErbQCQc47815XtGqu+zPT5E6e3QrWjTTiS5aXdvmJkOOSc4J/Q16tevThNpvU8+FGcoppG1e3tnFcxxtME2xLjIwOSen5V5uNhKrCMoq+51YZ+zbUtDF1O883xNDZhVKLbbie/TP+FdeHjKjg1JrW5jO1Wu1fobvh/VWs3tE8pBGk6szHOQAwyfyzWuEqe0ndixFBQiz1o16p5xx/jxri7fTdItEMkkzvcOoPOxFx/6E4/KsMTK1Nm2Hsp3ZxN7aTWuoxQXEbRyPgKrd88V4E6c3LRHrxrU+XcXTS0mlT28kSjyppFU9xzz+ua3r4mVCMdN0jnjRjUk3fqOaQ2tlBHldrSbHdhzznH64op1PrUJJqwpQ9g01qZUdyl/JYspxMs0m9ccBFUEH8yKPYqhSm79ClVdWolY6aFFWfKqA2MZA5rxo16l1eT37nW6cbbI41dSl0vVpo5BviiWRAjk4wARnH619DGhCck7bnnzqTimrs0dLhePQopGBwzAFyOCcc/zrgxfNOq3Z7nZQcYxSutg8VaVqC2VvqC2kvlJhScbckkbceveuzCL93yvQ5q7i5aMz/DtmdU1PVdUM4EdtEUUnncAAM5+grfGpcsaaMMPU5JOVjsfD/h6DVdOM8l+EU5LRouWA6dc/0rDDp0maV8Qpq1j0qwlM1hC7EltoDE9dw4P6g17FOXNFM8+Sszh9R102/j2+maPzEtYY7RcHpkeYxH4kD8K4cbUs7HXQoc8LnK+N9Thkv7e7hkkwuB8xOR37/SsMO1NtIuVCcVqb8Hhy80/w6Lq4lRnaPzpV5BDN8zfqTXLjqDqy91rTQ0w+IjBWdyrbeHj4k0Nyl0luuflLDJBB44+vvTwcJUG76hia8ZqyOc06zji8QNDEz7RKsDFuxOGbn8h+FOpOU6cYyS11/HQqKUOaUTqLR4m8ZvYtG7WwOAv9c+lZfU6SSdvzIeKqW3M74iWaWt9aWsEAgjvpAWGcn5ep/EYrqjFQcqnaOhNKbqWi+rEvW/4pmzsoS4aJ8ttA5469K5qGIp3d3qaVcNUT01NvVdWs9Q8E3UKSzST28OACNoZsHkY64wfyrrj7tr9zH2MrnnngWaZNLvgHKpO5Uj8v8ajMqzhVjbsb4ShGdPXudvpGv3Wm2kNvblBHC5Mu7GXHHHPtnpzwKnD1Y1E29GOphVF9zq/AepvqWm3zSMS0d4wAPYFVb+bGvYotOCsebWjyzaPLvFfiCXSvGesQmESKbktycHoK58Rhfau9zpoV+SNrGXa62dc1S2tHt1RZJkyc5OAcn9K5VhFh7z5nombvEe0Sjbqem6jqZvNJlguYEkfb8rbR1ry6OZKTtJW1Kng+sTE8DeIVjsbuA2fzxsPLYjI5znPpj+td+JqqjZvqKWD21MbStTgjv777VdwpN9scnc4Unng4+lcuYUpylFwTtyrY3wzioNN9WXLm7smkkuLa/tkuWON/2gLkZ6ZB4474rPD1a8GueMmvQcqVJ6q1zL8Xa3E66XP9qiu5bQ7SFlDfw46/hXZQU68ppppNdUZS5admrblH/hNVEahrI4GcYl6/pU/2Q7/F+H/BL+updBD4wgW2kiisDH5udx8zgnn2963WArOyc9F5GbxUL3sc/aw6pDAzW3nKmM/umP8AIV2TdGcrStfzOWNScVoyzbx+ILhf3QvGz1LEgfmaHTwy6RD29V9Wez/Cayu7Lw/dre4857ncQG3Y+ReprehKEl7uxzVeZu7MnWtOhvPEWoC4t4Z4/Ob/AFig7e/cV5+KnKNV2ZrTV4o5HX9NXS5Yr3TLTY8cgIaNc4GD29Kzo1o15SpylfQ6OR00peZmt4z1hkx58ZA6/uhR/ZOHXT8TRYmfciXxZq3IjeNd3XESir/syhLe+nmxPEyWxnrp99eagXddkk58zEg27snr0rodWnTil0Whg5Ntsl/sC/kujEfLB3Y5bimq8LC1ZfvfCkthZtczTrK4ZQI0X5Rk45JrJ4pN2SBxZdfw3byWlufsx81s5Csef1xXPDGNRbctClTbdka+maBp8Z8tLOIzxjJ3Ddj6Z71lXxsowUpX5X1/4BcaSbsQaXpqmO5CjLO7Ag/7xrKpilGV32HGi2jbh0me1hQQxlxndIzABQv49B/hRRlVrqTaflb8/kVJRhZHfeFrT7JYzLjG6XIH/ARXp5V7VUmqm6Zx4rl5tOxgXFv5/iDUV7CbJ/IVx5jGU6/Iuv5G+HsoXZgCVr+N3KmB4btogpQjAAyDnPOf88Up4Onhopx6j9tKpdMdeaZb3ULb7eGSU8bnjB/XFZTxaorWT9EOFJyKWh6dbW1zIsaIXUZ4jC8eo9qrEYiVOKcldPs9V6jjTUtilfW6jxcMJybdT/49UOsnR5k7rm/QFTfNY17bSvtTy/Ztj3OcElvudM/Tg/ypUVXrTTa93t+XrqXJwhHR6jNYt438NSYnjmmhdA23r/rFHftyOfoaueEq0q/Pok73S9P8yY1IzXKhYpVgn06Bl4un2eYVJCnjA/EmssLgvrF3J6IutV9noi4L+ygv4WsbcSJLuVpJVZdxJPIPTbx1wevTjFetPAUXCzV9PyONV5X0KFnCWj1GODeXZ5QhTG4Ek4IyQOPrXl06UHX12R2TbVMvQLq0ej21vPbvBCqRB0SNGLuJQDnBJ+6FII6857V70XFI86V7nb+ErOSx0NLeVg0iud3OccDj8Kuk7p+v6ImatY5jUtXTTfE+pwtF5mXDYHU5Ra87Ex5cQ5+Vjopu8EjGW+025vY7awsVtZXcPIVjVcjHt35rHFVX7FvsXTiuY0ppxa6xb2UqFbeSB5C6rnleSD6DAP4kVGBy+Eoc09Wx1a7TsikdYt7W5WaysBBb+QJGWSIAkYlYnIODkRcY/vEnOMV6f1Wm+hh7aRHqgiXxRbuVVXezQsFbIB3NnB7ivHrYeEHyx25v8jspTbi2x2m6dqsZuwk6xW810s52XTBtvO4AhBg8g/8AAQPWvXoyjyq3Y46kXcg1W1/s3wvcXFyTHNPKgVHxkruj6+n3TxWeKlzJRLoe47jVv9KjjtpNQtzI0ZBRgM4I9K5MJJxjoaVWpM1oL/TIvLvrOF9yqRCmNqpnPPr/ABGumpidNLmMYanI2GozeTdvHOI5fMZsr/vVyezaqX8jZz03N2w1TVZtObddjdnAZWHAx7Vq5yWzItc7jwPIZdFmZpPMb7S25s55wtd+Dv7PXuYVviPN/iTqV1onja5LQCSG5SOWM9P4Qp5+qmnVw6qO9xwqWRj+H/EJudZ3rAEaOIvzg9wMcfWuTFYP9002aQq+8dmda0u4YTX2mo0kXKs0Yc/UH8amlVcRyVyPTdT0g3y3FrHLmNAkUYQKiBd+Px/eMPxrWeIIUDnvEOoNL4vQuwRjAFAHUfN/+uuZQcoX/vGvNZ/IZb316NS2JqDom77u4j+laWtHQi9x/jTUkh0sr5iy3LuGEeckAEH8qKFF1JoHLlRzR8VLLZwxy2pJXOeQR+tdEcFy7Mh1bmraeLpbiKHT9P07dcTERoc9zx0Ao+pa3bD2pd1D4P8Ai2wuJW06eK8STndFN5THnPIYgfqa7OVW2MuYjs/hn4+mAgmja3jJ5Mt6pUfgrH+VL2cOyDmfc9j8JeHl8L+HrfTBL5zplpJAMBmPX8O34VaE2XdT0fTtZg8jUrKG6jHIEqA7T7HqPwoYjhfGXg3SvDnhy61bQNOENzEVMv7x2DR55GCTjsfwrOpTU42ZcJWZ5uvi2E27LPaPyOgwwz+OK5Xg2nozT2oWHi+2sy7xWLFj2JAGf1xQ8HJ9Q9qjbX4da7400q28SwXUEU8+dltKGTagJAIbnOevOOtdNOkqcbIzlK7KQ+EnjQ3HMUYUnljdLj+eauy7CuehfD/4byeF57i+1O4huLmeLyvKjG5FUnJySOScDt+dMRuXXw/8J3khkl0K2DE5Plgxj8lIFOwXL2leF9D0R/M03S7e3kxjzFXL4/3jzRYLmrQIKACgANADXRZEZHUMrDDKRkEelAHK3/wx8JahKZG0zyGbr9nkZB/3yDgfgKVh3DTvhj4R02USppazuDkfaHaQf98k4/SnYLnVKqooVVCqowABgAUCHUAFABQAUAFABQAUAAD/2Q==</field>
+        </record>
+        <record id="leffe_9_33cl" model="product.product">
+          <field name="list_price">1.16</field>
+          <field name="name">Leffe Brune "9" 33cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAWgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqACgBCcDJoA4uX4n6XHcmIWlwwJIRgV+bHfGePxrp+qTtdkc6Ol0PWbfXtMTULVHSNyV2yYyCDjsTWE4OErMpO6MH4g6nfaXYWstlNJGGdg/lttJ4459q1w8IylqKTaOP8MeMtT/ty1/tLUphand5xmbcm0KeldNajHkbUbO5MZO53/8Awm/h3zfLOoANxnMTgD68Vx+xn2L5kXde1VtI0K41KGEXBiUMF3YBBIGc+nOamEeaVhs4IfFW8L/La2jKMFsBx9RknrXV9US3ZHOelwS+dBHKFKiRQ2D1GRmuNljLYnzrrLA/vRgADj5F4OP6/wCFKO79f69fw7dDWp8MPT9WT0zI8k+JF5OniOeISlUWOPadxyvGeACM5Jrvw0YuKdrszm3cb8Ob24/4S6OB5WUSW7blLFi5AyCc9KMVGPs01bfoKDdzlNSIXUpI5YQU3vggkbznqa2WqTirsXqbrXd1B4P0ZIpWCmSfdAHKLnI5JBGevFZKMJVJXKu7Iwri6nlsyZpPNXcQWLk9unJ/WtuRLol+ZNytbN/o4kYkFEONp5AqZcsVdLqCuPtrp51nxNKgCHLSN8z+3603KVtU3r8vUFY9k8VzLbfDmYyKATbRqFXpuO2vPhf2mnc1ex4rbXLyO/nYkLLgKOxr0FdxbT/4Jl1Po61Ci0hCfdEa4z6Yry3ubBb4825wAP3ozhcZ+RevPP6fpkzG2tmaVPhj6fq/66/oTUzM8f8AidGJvEkpUMWSBAdvQZ7k16GFdoW01ZlNalf4eSG38XQyTf6w28gORjGFJ59+KWIjFQXLtccG76nM38qyXivGu5m5JPZs81urxVpO3+RG+xrXM8Nx4P0y2/iS7nLYGSflQ/1rKCcasinqkYjeZ9hljAKqpJXIGc8/nVzULc3Wwld6EEE0aWLAH5gvIJ68jtUqrGorcyKcJR3QtpJvzli/GVAAxV0ruLtoS9z1zxtcZ+F1vIH/ANbFBz65XNcNJfvdTR7HkOnMXidlAQAYJJ6/SuynZXvqQz6R01/M0u0f+9Ah/wDHRXmy3Zqh9szma6DEELKAuGzgbF6jtznj8e9JGtRJRhbt+r+/+kT0GR4v8RJ5n8U6hGuPLKxq2e2FFehQUfZp9TKV7sxNAv10/Vra5LkqqyBif4sqR/WrxEm6eoQWuhz9xdvLLuOMKeABwfrXnfXZ36HYsNFrqaFnfytaQKi5aKWQjA9VH+FdeFmq0Zc3U560OSSsNDZikcnD5Pyr0X6/nXRJ3ptdLb9zKOkkzPA220rHI3EKD69/6V49GTpO7R6FdKdkmPs7oWaMACdw5I610xx0eqf6GDwsu56H4p1dJvhVoMKN804HGeyZU/rWFSo9ZLqVSgnKzPOFd4+FYrj0NZRxFRaXZ0OjDsfR/hO8F/4U0u4BzutkB+oGD+ora9zjkrM0bdCstySuN8oIPr8ij+lRTTTl6/oi6krxj5L9WTVZmfPHjPUFvPHOqMjEhZSnsdvH9KzrynFaM6MOosxXbBU5xgj8KypSbnqzatFKGiC4tEhmKCXIGMnFd1TBxjJJSvc5o4p22FnQWpSOOQnjfnp1/wD1VjiYexlyxkaUZe1u2iheTbQoJIGcnBqKU5u+rHWjFW0LF1eFrW1jJO3BYAep4/p+tbVE6isjGDUJXZJZWE+pOy2yhtoycnGKyWEqX6GzxEC6sWoX+nQWImXZabxGp6YJ3ED8SfzrSpBUmlNX0MoycruLsXtC0eOSSY6pC3l+W3luCdpfsMjv7GqpfVZbWv5jk66PW/hzHPaeHPsFyNkkErFYz1RGOR+uah1ac5Pk2RnKEo77nUwhBJMVCZLgttxnO0dffGPwxQhzbtG99v1e39b3GXtwlrZyzPIsYVfvMcAHoM/jQQeF634b/s+S6nmUTSiY7548kYJ6kdq6I1cLWp2atLsUoVabutUVrTQ11CzUQw4Zjt82QnaSfT169qTeEo07tXl26lXr1HvoZ2vq+ma+LR/Kna02qWQAiQgcg/y/CuON3F62v57G65e17HQXnhWZ7BNVkEUy3sIlhWJuRnHy+/XpW9CphlHlqq1uplJVb3g/kYtlottewSJJayS3SkgJkjZ65H+etdFJYaDcna39eZlN1Z6a3E1HT00NrSCdop1uot7InWP5iO/Xgfj+tedUq+0k3FWXQ6adNJWvqPsrnTbaeM2RkKyJi4DfKMZwQvXBx+FaUcRXW9t9DRYWE/INe1u1uRFZ6ZAY7O2lLo7DDMT/ACHH1P6VzXnK8pu7KhFJ2WxVXXbtolguZpJokO5VJHUjHPrVU4wV7mt3F3R6B8J7+7u9evnupHfzbcY3nOApGB+ANbU0tbI4sR0PU4owjysEVTI+4kHlvlAyffjH4CrirNmUpNpK+y/VnM/EeVk8G3KKcGVlT+v9KpOxMY3djxi28Q6ra6e+mm6dofugNyygHoG6ge1ckoxlPU9KiuRXQo8R6jDp40+0naGAMT8v3uewbqB9KicI811qy5e96HP3byGVcE+9bU9Ys5qt1JJdTX0/XdT0lAlrcMImwTEw3I3/AAE8fj1rGS5lZmygiwfFN/Ddz6nHLtvJAw3YyoB7bTxgdq0VGly26dhzqPktrc564nupQ1/dSSTSyvhmc8nj/wCtW7ppqyOGFTldxYpZmICxkZ/2qSpyWzLddPdGiLB7uzaGFfnLKdxPFJxVNXZLm6jsjQtfBV3vQu8SkgZDP09z6URr05JtKT+QnCSdm1956j8P/CdxoOoSXFxKrM8JXao4HI71FLFQqytFP5hUpcsb3udtaAC4vCAozMCdrZJ/dp15OD7ccY45ydou7fr+gVX7sP8AD+r/AK6/osTx5p0+p+GXt7fBk8xWAJxnGaUqkYK8tiKcHN2R4bqnhnVoi0gsrjI67QSKSnRltKP3/wCZo4VYbplbTvDesTPuaynyOgKmh1KMd5R+9B7OtLZMgm0C9tbtLObCzXOAgJ6c96yWIpSTa2Rq8PUTSfUtXfhvVoLRVe1n3p3UE/yrSFSjNXTiZzp1oPVMoWujanNcbXtrjaOo2mtLQXVfeiE6j2v+J1Nv4ZnS283UbXy4FOcOOenpXNiMRGyUJa36G1GhKN5SWnmaOnWGmSXkcQsUJEe8IQTuHXGc9cc9MCtY06jfJ7RqXy37GcpxjD2nKrf1qdhq2kWFr4fWazgSOOTyyCqgEgkHmvKcqjqWk2zoVRODSSRztoLppoJUSTzYyT5ZGA+Tz9eOK75V+SUeXZL/AIcxowjKElLq/wDhj03w+rjTbfzl2yiPDDHI54H5Vnh3zVpPa5nOKirIt2OftWoZIP8ApAx7fuo67YpK5db4Kf8Ah/8AbpC34D2+31YVhi/4ZFB+98jg/FTyCSa3iZcxBAqnpyMk47+nPSsacadKip2Tbf3GtOTqVuVt2SJfDF1FfNNbL8wWNXGc/IT1XJ6ioxkaNlKCV2tV5lQVeDam9L6ehyfi6KODxnpqgDG8f+hCuWgv3NQ6ZSvOB3eoqLTTIXTCmeRU3cZXIJJGeM8VeBw8K0lzbWOfFYicL27nM6XqBgvt03yuZQAhYsJFY4/MetdlsPVpyvFJrb/IVSnXg04Ntdb/AJm543igtdFLSNsV32kgZwCDXDRX71WL57wd2YVtoMeyN7u+jSJxlGdgrNgfXkY9/wAK6puUpN9SKU/ZxsmbXjOT7B4AXyCrrGIlRuoZQRz+VYwj++Vyea6kzMsNWl+xQ29qqOyEBp2KFmAiaTpgjsBnvz0611OEXqRzyO38OXVxPBsuQA6KAMLjIwOc4APOegpYdxdV27EzT5bvubKRohZlRVLncxAxuOAMn14AH4V2pJGbk2ld7FKaXKqP9oVjjV+6ZdH4vkcpJNpepwT3l8Vgw7iNyw8xwg5GOORjoQe3rXNKi7JIuM0ncbot/o8E0pizbFQiszlSTuAIXh27YOQMdfSs50nYv2iZx3jhwvjLTT6yAf8Ajwrmwybo1fQ6pfFA7m7uLW+uINIljMu1Flk5wIhg/N1HGOvpkVthIP2XMc1dxc2mupnrb6Pa6ikIL3LeYihkA27iu4ANuAPy889vU1r7JoHVuuo7x7Ml54ftpra4jkUXKsHzgNgnI/SueD5K2vYqEXODsYlrZz3S7pJnkZoZQCJTjLsm0ew2qePauh4qC6EfV5k3jTVE0vQJokuEeaa68xdzEsQTxnJzwoAz7Vnh4PE1U2mkkaSj7GDvuzBsvF0i2wEkduzIPl3HOcjHT6E16H9lU7/xDD63/dO3+Hes3es6heSzupSKIABBgAk//WrSOFo0FaF35kVK06m53w6VSMzntdvRpulSXZUsIyuQDzjIFFai60HFF0pqErvY4wXWi3cbiC6MTMkoVJ3BAMgGfvZPUA+tedOGLov3ofcdXs6M17sh63WjW8jSPqESusySx+Uy5BWIR8jnryfxrKX1mptB7dio0qUd5I4HxZ4lt77xHaTwhnjt5AWbGN3PbP0rfDZfVp05Rlo5Cq4mm6kWtkdxHqWka0n2kajLDJNbmB1YLwCO2Rx+BrFUsVhopOGhUo0a0m1IspFp6XYmlntFXzxIcEA7RD5eOc/xEn/69DxNSasov+mSsKk9Wjn/AB3rlmPD0GmWkzXHlSKN4xwAPUDBP0rowmGqqbqTjZE1p04w5Iu7OYt9WKwCINIen8VeonRTvyI4+adviZf07QrzxcZLW1McbRjzC0pIB7YyAfWidTn0SshWsatr8Ktb8zEtzZovqHZv021nYD03wb4Zj8NWDwLIZZJSGkkIxn0AHpSkM6QVKA5zxJYzXehXdsq/O8Z2n3HI/lWifYTPD5rm7tJSjrskjbBDLgitvrM7WepPKiBL2V2JKqD3OKf1qpbQORFB9L1CZ5JRZzSLJ9xghrmk5Sd2aJqxoQvPa2qwzJiROGDDBrohiZxViHBMlF9LIVBA+UYFUsU1eyQuRM6bwp4Vj8TiZtQSZbZB8jR/LlvbjnispTlPVjSSOotvhJoyvvL3jD0aRQP0Ws3ZDOt0jw1p+jW/kWUCxKeWxyW+pPJpcw7GqkKJ2zUuTAeAB0pAKKaAQjIwaQFC90HSNQObzTbac+rxAn86d2BBb+FfD9q++HR7NWHQ+UCR+dF2BpC2gC7RDGB6BRRdgUr3w7o2of8AH3pltKfUxjP50XYFOLwR4Zhfemj2+f8Aayw/Imi7A2oYIbeMRwxJGijAVFAAouwJKQBQAUAFAAKaAP/Z</field>
+        </record>
+        <record id="orval_33cl" model="product.product">
+          <field name="list_price">1.59</field>
+          <field name="name">Orval 33cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAWAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZh0pgYsni7R0laMSyyFZDESkLEbvTOKANKyvre/hMtuxIVirBlIII7EGgCxQBh3/iywsNQlsminklhAL7QAOfTJGfwoAvafq9rqKOY8xmMgMHK9/oSKALqsrDKsD9DQBzup+M7TTNSnsXtpGeEKSSyqGz6ZpAXrDxFY3tvJO8scCRvsLPIME4zjPr7UAW4dV0+5kEcF7byOeirICTTAtGgAHSgD558S3WpWPizVLY3O7Zf+YdjEfKTkL6AYI7dqzk7M1jG6NPSfHNoDaRSNKnmyMrs104CehfBH6VdzOx6j4G1ca14cW6DyNiZ0IdtxXB6Z78EUxHlnxSa6t/HV4sdycXFtG2AMbAB0B+q5/GsqkrFwVzHtPFU1vJN59tDK8kTEHYTuYt0x0H1FVGV1cTWp6P8OfEY1jWJbZIFjSOzDtsj2hWyMqfXrwfrVJ3JZx3xPUxePrxEmfE9vGZAenAGAPb5Qaxqs1pogN/dWfhODVELSSS6qfNc4+U7AeB6nJ59quD925Mlqang/wARaheeIbCw8o7ZbwuyjG3Zjj/gQwTnvTjK4pRse1GrJAdKAPnTxrKH8ca6Qek+PywKwm9Top7GJb/NFOSMkM2Pyq3sZI92+FjK3gW1CgDbLKDj/fNWiGebfFOYSfEG6UH/AFduif8Ajuf61jVeprT2OPibddwf9cm/macPhFLc9N+Dcn/E81RO5hB/Jv8A69XAmRzXxIvUk+IeoksMRqkY/BB/Wsqqdy6exSuLxW8E21oGGTqayY9vLxTV1AHrI1/ATBfHenfVh+atRT+IJ7Hu5rcyDoKAPlnXL9r3xLqFwr/LcXTt9QXJrCUbs3jKyIbadUtZmc43O2PxFaNXRmme2fBu7E/ha5t88wXRP4Mqkf1qlsSzyTxzqI1Dxtq1ypyv2hkU+y/KP5VEo3ZUWrGVG621yhY/di/UjP8AWnayDdnffCPU44PE1zJIcI9pKT/wEq38gaIqwpHE69qL6nrt9fuCDPcM/wBMngVMotsqLsiKeZkht+D8p3bT+FEthrc6DwRqm3xhp0zrtAnQE57E4/rSgtbhN6H0aa2MjO8Q3Uln4fvJoceb5RWPJx8x4H6mkwR4bc+F9I03wzPfSvNcXaH5Zlfam/HA245GaGrFHDKJHcRoCxY8KO5pWC56T8O/EJ8Nwa1FckxObISIrcHzEO3H/jw/KmIw7LRLaKH7fqqmR5Zdyw5+97t+fShK42c9cwz6hqUptrZmMknyRxJwMnAAApWuLY6hfC+veHLGHUGgKB1ZZDG4Yx7gVw2DxkGgDnzasVjh25aRuMc5NJO5Q++sp77UvItkMpRVQBB1wMcDvTEdVoPw+v4LZb26vo7O7DAxwMpbB6jcwPyn86aQN3PdrSYz2kUzLtZ0BYehxyKZJx3xOvLqLRoLW1BxJJulIPRQP8f5Uteg42OF1hZL/QtO0ODe087tIOfl2Z6t6e/09am0r6srQ2fD/h7TvD89tFYhXvpcB7pzgr6hc/dH6/yq7aXZJe8UWNrdT77uKMXMYzFckZ/4C3qOO/p+FFlYdjhrp571rewto0lfJ+ZTyzc9T7c/lWai77judboOkwaLo8j2cYluHOZZ/TnGF9ByP6+lNTgt2Fmzbbc2j2l1abnDxnfuAwwPUEd+oH40/aRW4lFnjt4zW3iG5gVSE3fuxnlVPOP6UtOg2j0Lwzo6aLZzXMro95GhYyHkRcZKj3x379B7jlyvULXNKxdZ9JvfuSyEAqeTyGYYGD6jNCqSlrYHFI6nwfqBu9MkgZizWz7QxHVTyP61Sbe6sTJWZ558Vteu9L8X2zWzArHaqrxsMq4JJII/Khginpl9a61FJ9lkhtb2Tb/o5b59uAQFPcbiTgc8ClJXQ09Tobxp5bq3imt/s0UbZDINwX5iefTg4pRopu7dyubsXtRW41VYrWCRHB5kZV4B6ADnsB0/+vT9kurEpWPKRq1j4f8AGl09un2y0MhjYq+0t03FT9c/hT6ktnc2GpaXrdkItO1Pyn3DEFx8mTkHA7HkA9T0pKMVuh8zN/7HJJZf2e0AhIwXkLcBV789B06+n0q/dFc8k8cajp8uvhdIx5dvGIzMox5jZJJHt2zUMdzZ0j4gXkimLVLOG9hAAaQDy5M+vAwT9Rn3p9RHWaLrOjSQP/Z+qLas5yYbtgm3jsScH8DVc1wNrwdr9jPr82laefMhSFneb/no4I6e3J570m7gzi/jBAG8UqWGQ1uh/nSYI86v4n+3BVB6AAjtQB1+meMdU0tI4vPF1Aox5dwN2B7N1H50AWdc8c3t5AtlYwLYW0ynzmjcsz+27jC+1AHnLjbKQD0pCN21dVs0UY6c0wNCfWNTl0tbH7fP5AYHyfNO0j0x6e1AHNagQ10xHekxot2TFLbpwT1FAFk4lgaPB5wQcdKYHc/CZt3iwgdoHz+lAMu/GOHbrNlNjh7bb+TH/Ghgjz+5UNJ06gUxEDmRTggMB0JpATLlkBc5J49hTA5+b/j5b6mkBtxIjWsRIH3RQBOiKI22imBiahxdt7YqWNF2yP8AoQ+tMC1EeD9KAO/+EFvu8RXM2PuWzc/VloBmt8Z7bOnabdgfcd0P4gEfyNDBHlUrZWNvVRQgYyYgMMHqKBD0YeUufWgZi3FvIkUd0w+SZ3VT/u4z/OkI1YGzZxeyimBNG2UagCjeWEj2E+p5/dpcrBjHUlSf6frSY0Osj/oX40AWYjw1MD1X4O2pCajdEcYRAfzJ/kKBM63xv4dk8S+G5bK3Ki4RhJDuOAWHbPuCaYHhWp6RfaM4s9Rtmt50HKEg8ZODkUgKEq5IJ9KAJMfu146UAaeuaM6fC/w7qSofmurkMQP7zcf+izQBjQfJZRqxwQKYE0ZHlnnqaAOsXwvdXfwgubiGF5JTqhutqjJMYXZkD2yTSA4m2Qx22w+tAyxF9w+5oA9y+GFg1n4SWV0KtcyFxkdV4A/kaBM7EdKYHm3xW8NX+oSW2q2Fs84jjMcyxjLAZyDjqRyaQHk00cyNsdGVhwQwwRQBr6L4a1jW544rKyldSeZGUhF9y3SmB7U3g3TrjwfB4buwXgiRRvTgq453D05J/OkBw938F7kHFlq8LpngTRlSPyzQBJp3wamWVTqGqx+UDkrAhJP4np+VAHpun2FvpdhDZWkeyGFdqrTAztQ8H+HdUdpLzSLZ3b7zquxj9SuCaAK9p4C8LWUgkh0eEsDkeYzSD8mJFAHQBQqhVAAAwAO1ABnAFIAzQAxkjc5eNGPqRmgB+ccAdKAAGgBc0AGaADNABmgAJoATPFAA/9k=</field>
+        </record>
+        <record id="rochefort_8_33cl" model="product.product">
+          <field name="list_price">1.75</field>
+          <field name="name">Rochefort "8" 33cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQBzQ8aWzTvCkILo5RlEgyMHFBh7We/Ixz+M7WJgslpNz1K4IHGaQ1Wb+yzf84Na+eqkgpvCng9M456UzW+hy0fj2GUrstkKtuOVlBwB+FIwlWqRV3Bln/hONPWTy5IZgQMkqNw/Cgca6fR/cbl7eC006a8C7lijMmCdvAGe/SmbSbS0OWi+IVtI67rdQpTcSJOfw9aV0ZOpUiruDLKePbCSZY0tp23Z5UA/hgc0XCNZv7LOoByM0zYKACgAoAKAPDdQRl0m5xIfK+3SFR3PTkmsvaK9jf2bUblfU2vE1WacBIJIwoxEeANg/oaidWMaiTKhTcqbPawA3h4CSQsDafM44J+Tk1uc1jwi7E66XCHl3RqpMaD+HLDP61hGredjolStC4/V2mt9anbcIXUgEQjaANoBA/A1pKS57EKN4HtfiYIfB+oB2LL9kbnpnirbsjNK7PD7kzeQrSy+b5caqgIwAoPSuanX5p2OqpR5YF6cXaa+00pW2lMo3CBsBc4Bx+FU60fa8pPs26Vz3odK6DmCgAoAKAGyOI42c9FBNAHh13OreGYjuyZLlyfr8tc3I7nW5xSItdljh1a9haQA5Xbk9tgrOvTk60WkOjUiqbTZ6yt6D8Pvtecf8S3dn38uuvocv2jxm8dDYwRLIrEgcDtkg1y0oS9q20dVWS5NyTxCQ2u3y+kmP0FFVuNYVJXpHrXiO6H/CuJbgniSzj5/wB7b/jXTP4Wc8PjR45d3CPAER8lig/z+VcWGpzU22jtrzi4pIu6zdRrq12hkAZZSKqVKft27aEQqR9jZs95tpPOtYZf76K35iu44iSgAoAKAKOuXK2ehX9wxwI7dz+O04oBHissG7w3pmf+W926/UcCpsat6md4tiW28SXECDCRBEUE9AEFUZ3uekjUFHwV84tybUw/jv2UnsOO55YFLyQDruljH/jopLc0mxfFeV8VagPSYiqe5l0PRtf1RX+DdgwbmdYoev8AdPP/AKDUvYqn8R5pBGZ5YYxy0kiqB6/5yKmK0NpvUs+JgI/FF6gGMSnir6mMnoj3zw5cC68NabODnfax5+u0ZpkGlQAUAFAHH/E7UvsPhN4FbD3cixj6Dk/y/Wga3POElDyeGtP/ALrq7j3eT/AChBJ6mf41kD+K7xh/eUf+OihiRO/iT/i366Fu/eC93Ef7GM/+hZpMqG5V0pPtWt6ZaDnNwpJ9eVH/ALLRFDqPUreLW3eLNSb/AKbtTZCFvNeluPDNjo5+5bTySZz1zjH5c/nUs0p7kmgDdr2kovJM6Ofxf/CiKHUlqxnieXzvFmoyf9PDj8jiqZkj2H4YaiL3wjHAWy9pI0Z+h+Yfz/SkgOwpgFABQB5P8XL9pNWtLEH5YYt5Hux/wAoKRzfh2M3njOxi/hicD6BB/wDWoRLMnxPJu8RXx/6akflxQxGQ7ZP+etIuL1Om8Cx/a/GdmSciNtxP0U/1polu7MbxJKJPEmoMP+fh/wCZoYIzWYtgDvSZcHZnVeAYBfeMLYj7kOX/AAVTj+lOJEncxNWn8zWr18/euHP/AI8aGCO/+EGqmLW7jTmPy3MW4D/aX/6xNID2CmAUAFAHjHxJG7x4qnoViFA09DlNN1ibRdW+3RRpI67hh896CTNv7try9muWGGlcuQO2TmgZVdiE+tAFrSNZu9GuvtVmVEmMZZcjFCYinc3Ml3dyTvjfM5ZsepOaBjC5VB/tD+tIDS0DxBeaBdG5s1jMhUqfMXIwf/1U07AUZJWmmeVvvOxY/jQB1/w2cx+NtOwfvFgf++TSA+gKYBQAUAeOfEGMS/EaBGO0MYVJ9OlJuyAkf4aWFzPIttru5wTlBErkevRq5/bvsXyFWb4WeX11Rz9Lb/7Kk8S+wchkah4LgsoJWe6mfy1JHyBc/qaX1lt7D9mjXtvhro94ESDW5POYAlAiMQcZxjINCxEuwnBDZ/hNDGCf7TnPt5Cj/wBnoeJa6ByGRqHgm1sLeVmnnkMSEgkKP5ZpfWZPoVyI27T4caBdhFh1G88wqCQACASM+lONefYTih83wtsYhn7Xd/QhKTxMuwciNTwl4PsdM122u0ad5Im+Xc4x6dAP604V5SkkDgkj1CuszCgAoA8g8fKR8Q7Z8Zw8PHr0qZbAdY39oeXdnTpowY2JMYILDg9sHk8dfSuNW6mpSli1+QTGS7jTy8BSwGM7QSfu9MnH51MnEFc57Vba6t7W5Ms4dfKfaoOcg/h9fzqG02ikdLpqXMyCOzukhk8qNihJGRsj56fUfjVREysbXXZXIuLwKFiUkFhkMWPt1AAok4iVzndTtZobG5le6EqtEx+U5DE5JP6/pUuSutCkjrNOhmubcQ2139nm+zIQAGx91OewOOnfrVREyo+nas9xKLjUWUBA+zeTty59/Rev+FEmuwJFrw1ZeTqVvP8AbDMHIx1wxOcnrj/9VVTlea0E1od5XeZBQAUAeSeOlJ+IdsQM/vIf6VMtg6nWvbX4uZmtpliEsqsGJzlQDx0Pt+tcSaNTMvdM1NhdQ/aA0UgBZAw+ZipB5wO+D2pNpAc/qVrKltcPPc+YViYDOcd//rVDe1ikjp7WyuZbdbi1uVjWeBArqx9E5GPofrxVQdhMgvNNvvtrD+0AWeP94okOXw2Rx9Cf5UP0FdXtc5vULNreyuTNOzbY2C7skLwQACTUyd2ioo6u1s3u7JLm3ugsdzbqvmRknpt9x6EfjTg7CZWvtNP9oiNtVBmaMhoy5DMA+4DG70JH/wCum9tieZXtfUn8MaatpqMJZmZlYY44HGMCqpyvNDa0O8rvMgoAKAPJvHmF8eREnGWi5/KpezA7e2s3jiixKxSMAYI5IA9K4d2amQulz2t80+5OA4DhW3Sljkb/AKU5zTVjClRlGd7mF4jbyrK6W4dB+7O3ooJx2rJJ3VjpOk0DT4zolp5FwxVIgOuc9z0NWrtiIbrSHGqG635TzfO+58+cY259KqVT3bGCoP2nNfqc54lnjt7G6S5uY8mI4yQuT7CslFtqyOi9jpNA/suTR7VLfUIWEcQGBMrHrnn8TWiUuqE2iK9trYag10LxPLMglMZZc7wNv3s9MCm5vltYx9iufmuT6LfWo1aGH7fHNI5AVQ4JJ+goowlzp2NZNWO1rvMgoAKAOP8AF/geXxBqEWoWl0kMqKAyyA4bHTkUAeW3BvtI1OW3mM1uysQVyVpWQijcahdyOc3UxGenmGlyrsFzNukmuGXYGkYdupp2As6bBeWMvmSwTRgjglSKLAE8zu5/eOcnoSaLICpcWd3dBBBbyyEH+GMnNAFzS9L1SwJeawuFDDr5ZpoGONldvIdttMST/wA8zQB23w50K/8A+Ehgup7SaKGEFi7xlQTjgDP1pDPYKYBQAUABoAZLBDOMTRJIP9tQaAKsmj6Y4ydPtc+vkr/hSYDo9Os4+I7WJR6KgFAEq2dsOkCf980IA+x2wOfIjz/uigB4hiHSNfyoAUIo6KPyoAdtHoKYABigAoAKAP/Z</field>
+        </record>
+        <record id="chimay_bleu_33cl" model="product.product">
+          <field name="list_price">1.46</field>
+          <field name="name">Chimay Bleu 33cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYBQAUAFABQAUAFABQAUAFABQAUAeZ/Fz/kLeGP8Arrcf+gpRL+FV/wCvUv0Ct/uz/wAcP1PTKACgAoAKACgAoAKACgAoAKACgAoA8z+Ln/IW8Mf9dbj/ANBSiX8Kr/16l+gVv92f+OH6nplABQAUAFABQAUAFABQAUAFABQAUAeZ/Fz/AJC3hj/rrcf+gpRL+FV/69S/QK3+7P8Axw/U9MoAKAK1/qVlpdsbi+uY7eIfxO2M/T1oE3Ywl+Ifhpn2i9b6+U2P5UE+0iWF8b+HTj/iYgZ9Y2/woD2kR8fjPw5KMrq8GP8AayP5igfPHuTp4o0F/u6xZfjMo/rQPmRZTV9Nkxs1C1bPpMv+NAXRMt3bP9y4ib6ODQO5IHU9GB/GgBaACgDzP4uf8hbwx/11uP8A0FKJfwqv/XqX6BW/3Z/44fqeiXd/bWMbPcShdqltoBLEewHJosJux594j+Jt5Evl6Rp8kStkC4uIzn8F7fj+VOxEpvocDf6lPfg32q3/ANp3kAhmbeoyc4+XA6Hp6Vahpd7fIizZmnUWnujaaWuY5lUBp5FBU4yRuIUe34VV1e0Vf5F8isWkul060kFxeMbtcsIEMboQCuPmDH17e/pS9mo/Fv2J5EzZ07SbjVNCn1xrm3tIopNvksBvIGASAAAeSfyqbqb0VvvHKiZl/f2trmKBGuMsqCRk24YgEjhiOM0uemny6N2uHsGotsW0a4aB5LpYrdYgQFnRwz4GeMDpgNThT5u33kezE0u3l165aDSbESsASFB2khQMnk+4pS5XtccoO464MFhbebJKrMw+UQSZwcZ5wPp+dX7OMF791f0CNNsZYarcT3C28MsikZy5uRGAPqSB+tZxhKTslcmzNnSptY1HUTa2ep3ixxYE8yzEqh9FIJBNaTpqLtcpRa6lrxxPPJquhwzStILeeWNSxyT+7jOSe5yazn/Dq/8AXqX6Gk23hpf9fIfqb3xQ41KzbH/LHr/wI/41LM625xOZgpdS4APUE0GWorXMuzDTz8/9NDilcfMyNJGBDBtxByCecfnRdhzy7k9rbC8uw4S0RkALSvAnyjIH93nqKUp2V2bUIVa0+WO5ffRFcTRqLdvLXLiSAIAOvVTx0pLEu1rux2yy6vFJpxd9v6sZFxBFE7QyWMSlZS5AZ+HIAzw3sKcEo2aOCdapdpjLi3t7uSOWaLJiOVG9z3J7k+taSqSluSqrRLZyjTZ5JrN7q3aQkv5Nxszk5/u/hRCpydEN1WynJZW0hly9z+9XaxaUN/7L7D8qylFSd33uaLEtLboWLe2s/sotGaUJ0Zo44w7DnPzbc1uqqtayM/a2OwGoaboGh2rqgiDj91Ap5Y+57+pNF9B3urmT4zydV0diQSbyf/0XHUz/AIdX/r1L9C5f7tL/AK+Q/U6f4opm4sW9Y3H6ipZNbdHld5dXMV4sYRvs+/O7b7oW59sD8/erVWaja41G8CWedhchM8E4qEZJaGQmn3ccDSG3mU4HAQ+p/pT0Om6Oy0S6t57SASRmRhaiF4myhLK4wM9ztAPv061lWV4m+AqRp4pNytpuapGmOZYxaXJnYEMqSjJ5B6Fc9q5Pd7H0idVJPmVvT/gmFrCvJPOsMmyTACkc4YADH58V2wWiPka7jLES6ptmQmovHotpeOd8n2ySOZOBlAqMPp1cZq7B7KPY0gkkccQm/wBYYkdvqyg/1qTnmrSYw8tQIdBy49zQgZranodxrOoaQiErHBAWkf8Augkf4VZtH4bFnxuu3VdHHpfXI/JIxSl/Cq/9epfoaT/3aX/XyH6nVfFErHDYzOPlRZSfoNtJk1Fdo8+tLeO5i0K1mKsdQiunII53PlUx6gFRTW5rayMxZAogiSOCRlJ3vImSRxg/iCOKT0CFNyaSOh08wXiApDZyAHDZjZSPptYZ5x/9es3Jrcp0ISfuOL37rZXJkghmjWVrKIBmK8SycYBPv6UOSRnToupa0Vq7biytEY47doJyjHaBFc8A+hyvT8fX3oursJQlyQVnZ7a/LsQxwWiTHYLlGTBz5keBnp83SnzJK9xRw8nUcVGV121Kkuh6QJlV0lSRuQGtgc/irf0p3ZLTTWstfL/gkl5Z7o5btbkTGNlWQFChXOcdfpQjOcdG7mcOWpmY63H7xf8AeFCBnoumrixZhgYhAz+FW+h1Ufhfocr4xYyXuiy4OH1C7xn/AHUpT/h1f+vUv0CT/wBml/18h+p2vxKiWW0sgwypMinjPUChK7SCe6PLDojNer576jHJAuLZcOdpzwq4+7z2FdTwy0s799UPmK91pd5aXSPHaSrv+cKRgspxggHn+dZ4ilCOzCE5KSaWxu6BG8CkNptypLAk+W2Rznj8q5JRbN4VKdKSlGMk9fysaq3UixqLkv5gYnLg9NpA/U1Lha9uw6eMvy872lfboKs1omEBVkB5yvUc8fmSPoaUoNsujjKdOnFbuKbXrf8AyGFLUbgzId4I+UjglQP0wfzpSg2vka0cVSpzk+b4p3v5LXX1uRyBNtw4KEox2nrkHj/DPqB9c043fqYwxKhTltzR0i/X/Lp6lWK3Y6Rf5bcWeIknvy1aHnL4H6r9TM8hgeRTM7BbRkSp/vUIGd3DM0dpFBCm+aYKqKPX/CtDeMmo27mX8RNPGmTeFbctucy3DyN6sVTNTL+FV/69S/Q0nG2Ff/XyH6noPijSrfUtIleYuGtUeWMqe4U9fahaNMbVzy//AISG/heHy9UjUR5KldgKk9T93jOT+ddqdB/0yfeM250TWPFl89xp/wDp0kSKJNzhdvXAGfp2rKtKMklHoJxbLun+D/FVj8r6NcgZ6xzIR/6FXM0LlktjXWx8TWwwbPU0GOi5YfkCamwfvF1ZE8+sxD97b3gH/TW0bH/jy0WE3UK0mplT+8jtN3o0Kqfy4oJcpdV+Ai30EnWxtX/3WZT+jYoE5r+VfiEt0n2WSCK0EIkKljuJzjOOv1oE6iaskU/LJzx2oIuFvATIoFNA2el+FdDaEjUbsZkKhYVI+6vr+NWzopx6nNfFz/kLeGP+utx/6ClKX8Kr/wBepfoa1v8Adn/jh+p6Wyq6lWAZWGCD0IoA5ib4ceGJpjIbJ0yc7UmYD+dAG1peiabosBh0+1SBScnGSSfcnk0XAvUAFABQAjKrDDKCPcUAVpdL0+cETWFtJn+/Cp/pSsBUk8K6BKMNpFov+5EE/liiwrIqv4H8PN0s5E/3LiQD8t2KLCdOL6BaeCtGs7gTJHK+P4JJCy/rQkT7KHY3wAAABgDoKZoeZ/Fz/kLeGP8Arrcf+gpRL+FV/wCvUv0Ct/uz/wAcP1PTKACgAoAKACgAoAKACgAoAKACgAoA8z+Ln/IW8Mf9dbj/ANBSiX8Kr/16l+gVv92f+OH6nplABQAUAFABQAUAFABQAUAFABQAUAeZ/Fz/AJC3hj/rrcf+gpRL+FV/69S/QK3+7P8Axw/UAP/Z</field>
+        </record>
+        <record id="chimay_bleu_75cl" model="product.product">
+          <field name="list_price">3.57</field>
+          <field name="name">Chimay Bleu 75cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQASgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APYaYHn/AI78S3+laqtta6i1qojVwqqpzkn15rOVRxdrItRTW51XhfUJdS0C1uriUSSyqWJwBkZ9BVp3RLNjrQI881zxVfw61eRx6qLOK1lCCMxqdwwOeee9ZyquMrWuWoJq9zuNJuXu9Mt5ZTmUoPM4x82OeO1aJ6EFtiAMkge5pgeX2njHWG8QrE+peYjS+X5OxADzjHqOlZe1bdrF8ituepCtCDDmIOo3mMZEq5wf+mae5/p9O5p7I0qX5Y+n6vy/z9ei2KRmeJ/EaxL69dEMx23CAgDdgspYc9en4ColNR3LjBs9E+HkEq+GIZZWzvZ9v/fZz9On6VV7kNWOqpgeA+JdNn/4SOZlIcvfyqMrnkMOCcc9R1yKzc4p6suMZNbHsXgyF4vDVszsWEo8xSTk7TyKtEPQ1r6GSeyliiOHZflOcc0AfPkNjJb6jFcSFiBAzFlUcDLL6juPrUe0je1y/ZytsfQ9rGYbWGInJRFUnOeg9asgybhmN/dAkELIoGGzgbF7ZOPpx645ya0si5pJR9P1flr+Pa/Ra1Ig8u8W+TNqWoOqBWF8iMz7SGIiXpnp3rGry9Tpw+7v2O18FBF8NQxpGYxHJIm1jyCHNaR2MJbm/VEnkmszwS6uVihId9QmRZQcEvuUH2HXGfb3rmnKHMrnVSTtfpY9I8NOsnhywKHgQqPy4Nbxehzz+JmmxCqSewzTJPGkELQwnyMxtYyOYC2SQCx64zzg9OlYc0Ob5HWv4bvvc9jgcSW8bjoyAj8q3OQx5vM/tC88wkr5i7MsDgbF9+Oc8cfrku6f9f8AB/y9Or0ny8sbdtfvf6WNj3oMzwvV/EVpPp4ka4UzT6jLcOndegGfwFcVeE5LRdTspOK+49K8B6va6pDqgs5PMgS8LocYwHAOPzzXVC+pz1N0dTNIIYJJT0RSx/AVZmeGya3Ywf2NcS3SO/nvczL1wWkB/pXn1ac3KLS6nbGUbNHp/gDUYdQ0GUW8nmQwXUkcbYxlc7h/6FXZTvbU5aluY1PEt4dP8NahdKcGOBiD6HGP61Ur2Jjujx6LX9JttVsQ1zvgFiIZCBnbuVs/qa4lSmqidtLHY5xcX6nrXg6+/tLwlptyTuJhCk+u35f6V2xvZXOSfxMZJ/yEr794W/erwSDs/dpx1P15A69O5aa7L+u/9Iup8MNOn36vyX6+vRO8UeIrPw1o8t5dONxBWJO7tQZHzfc3i3UEEXkRxtDu3SKPmkyc8/Sixam0ei/CjxTp2n311p84W1W8dTEAxKggYxknNCJbb3PRfGHiSy8O6LNJcuDLKjLFGOrEjH5UxHzzcX4u0s43iQLapswCf3nzE8/njilYpTaPTvhP4s02zSXRbgrbvcTmSHJ+XJAG3J+lAm2zd+KXii003Qp9HVi13eJjav8AAvqfyoEjxJbwLeQ3Bt7c+SFHllPkfH94d896LFc7PYvhR4rtLjS00CY+VdwlmjUjAZSc4H0zQSzrriIR39yw6yuGPysP4FHc4PTtgfiCS9erLnNyUV2Xl3b/AF63fysjyn4t6ir+OLa1uixtLWNCyjnIJyeKRBwuu3mn3F8W0yBo4NoA8wAMSO+Bx+VMCYaxYf2EluNOVL5JSwuEwBt449eoP50ATXPiltW1ixutYEl1b2sccTRZ++FXBP1J5oAz9ev7G81eW50y1+yWrY2RYxt45/WgC5c+ILa50O2tF06OG6hdma4jIXcD0GMfTvQADxH9v1sXutJJdxsAsiq2GIAxkH14FIDPvr1bi8eWFPKQuWVfTnigDft/EYuvEGk3cFotrPDJGHlVyTJ0H4D2pge93ZJvZgTIcEY3qAB8o+76j655zSTG1tt/Xfz/AEseNfGCJn8dSbBkmCP+VAjh3066VsNCyn/a4qlGT2TC41rG5ji8xoyE/vdqTi1ugK6oXfauKAJjp10SFKYJ6AnGapU5yWiYnJIlfTLuJCWQcdQCCR+AodOSV7MLorRRmSXYDzmoGWl06ZpAhG1icYPX8utaKjNq6WhLkrmjb6Pc2Wo2vnDa3mo20qQcZ96SpyautUO6R9DTSrJf3SqZCY3VW3kYB2Kfl9sEfjmoujScXFRemq/VrXz/AEsea/Em0urnxxL9kt5JXS3R2MSFmVQOTx0Fd2FhT5eaXcwm3fQ5uyiurS4YvpdweNhKxNnOcfnnitMVSVWKSmhQlyvYqzWd9emaa306ZcgynZGxwhJ5Pt1FbQjCEVGUk+hEm3dpGXpenXt1q5s7W2d7kkjy1X5hjr9Mc1hRp0k5N7JlSctEjbt9J1exvhI+lXDGPLODGQwGG/LhWP8AwE1vW9nVpuPNa5MeaMr2LurWGsatc/JpE0TAELuT5/lAJOeP76/mKnCRpUIWcr/lqFVym9jmNJ06+utbextoibnewKghcY65PYCsqcaSlJtK1xvmaSN6Dwxr0N+ghsld9wZcSoVb5lUYbPTcwHXvW1SrRnBpv8xRjNO6NWfR9f1W7sbp9PWKFlQxkSKQyj5s5z/tfriuakqNGDSdzSXNJo9Zmt44by4kTO6dld8nPOxV4/BRXClY3lUckk+it+Lf6nA+O9Y/srxnchoPOSa3jGBI0ZDDkHK8/h3ruw1L2lPfqYSlZmbcePpHuPNaxgLCbzl2SBAG3hxnCjPIHJ596tYPTd/d/wAETqEl18RLkwSTxWFtHI3lqSkh6IxZRjGMc4P1ohg03Ztg6mhw+jai+n6u0/kLcLNGySxOSA6sCCMg5/GtKdNSc1e2pLlax1Mnjq6MHkG2thEY/L8sB/lXa68HqeH7nsPemsGr3u/wB1C7e/ELU5rPd5NkGEbIhVHyEbsD+A/75qaeChzW1/Abquxwuland2/iF76Db57yMSCuVbdncCD2IJFOEI3nF7XE29GdHH4w1iBlSApAinKQRw4jGGVx8vTqvXr19ap4am99fmLnkWo/FutGG2t0uCIAFiRBbrhUGBjnPp+lZOhTTd/zL5mevXBzID/sL/IV5xoebfEeN28YSlAhJijAD9OnpXZhpLl1ZMjjrmKZsoY7dA3JKqR/n/69dcHFO92Q79iw4uGtHykK56tt/wAazThF7j1Zj2SFL7hlLbMDIBBO49qzhUhzSu+oNPQ0bn7UW+Z4+eOEAraM6Pf8SWpE26dbMRtOqqq4DbB0+tJ1KPNe6+8aUrGBYSRw6tI5nTAY4ckAH35rBVoc0vNj5XoaUtzHnjUVY/7wrVV6AnGZYt5rdTbp9syu/gK465qJ4ik7jUZHu0hB2Ed41/8AQRXAaHkvxaR5vGQ8vP8Aq0BI7fKKQzz+ZrlHKs8g/wCBGiyA0Y1caRIHYsSCee1AFHyw0tkpGQ0Yz/321AEVxZzRTmMKTzwfWgDRjsxHpjBuWwWP1xTAyrZA91GjdCwB/OkBYbTpRcNGMYHOT6UwNi1so42t+MmM5z70Ae9xlmijZmBDRoVwMYG0deeec0g0PMfiDubxM0jj70aEflj+lCA5GUZb1oAZNk2kigclTTAqy20kEumllI3wBx9N7UgLkp3PkUwFYFrd1HUggUAZcdlNbXsRlQrnD8+lIDUYgtkUwLllBPcSxpDDJIxOMKpNAHt8CGO2hRuqxqD+AxQIZqOh6ZqJH2uzjmKjgsORSGZbeCvDpP8AyDE/77b/ABoAki8I6BEcrpcBx/eBb+dMC02iaUwAbTbVgBgZhU4H5UgIm8OaGTn+yLL/AL8L/hQBPBo+mQkGLT7WMjukKj+lMC6sEQ6IPyoAcIYwc7Bn6UgJEQelMCKcYlNAAAD/2Q==</field>
+        </record>
+        <record id="chimay_rouge_33cl" model="product.product">
+          <field name="list_price">1.02</field>
+          <field name="name">Chimay Rouge 33cl</field>
+          <field name="pos_categ_id" ref="special_beers"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAFoAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZhTAx/Eniay8M20M94krid9iCMZ5xnnNJuxUIOT0MRPihohwXinRPM8st8pwfz5HuKnnRp7CR2YIIyOhqzEKAOA1H4pJY6pd2R0mTNtMYiWfk4PXpxWbqJM3hQ5le5v+GPFcXiNLo/ZmtjbOEJY8Me4GQOR3HuKqMrkVKfJ1N9WVvusD9DVGZ5ZrHxD8QWmuala2y2bQ2tz5K8e5x1IyePwrGdXlZ006MZJbnR+G/GZuLTUJ9euLa1W0uRbhs7fmxyOpB6cEdeauMrrUznBXSibC+LvD7Z/wCJrbjHX5+lPmRPsp9mbIIYAggg8giqIPMPjB/yFvDn0u//AEFKJ/7vW/wf+3RB/Y/6+Q/M9PFAHDfFmFpPDdrIsu3y7xDsIyHOGrHENKBrQT5jzJNSuLXUIFSK3D3E+8AxoMEYxgsPlxniubCzc035nXW5U0n2N2x8feIZPss7XyBHu0t8sV2f8CHJx711RlJmElSR7TWpzHgHiGBh4o1hYJ3MbXrMdxzlgx5/DJrysVWtOyPSw9O8Vcz21W8XUbgTajMjupYlSfncnOOOnXr9a6IVX7NSfYhxSna3U7D4fai8vjSztv7RmuA1m7OvzAK/Pytnrjrn6VvSlzJMxru11ZHP+IYoLvxLqVxGoVJLpyNvQ8nmvNxNduozsoU0oIdIqR/Du6EUKeYNVXe/8QUxkj+tddGpzUrnPOPLV0KRuMxTLBayedcPGIsz/d55Bz97P6VFOtzTaNppxjc+h4V2QRptC7VA2jtx0r0DzGeZ/GD/AJC3hz6Xf/oKUT/gVv8AB/7dEH9j/r5D8z08UAeb/FrVIYzpumPIFLOZ2BPpwv8AM1x41SlFJHThbJts8w12S2eJAuJGDsoPTpisMHGdOMrmtdxm1Yr6RHanVNNkuEzB9pj835iPl3DP6V0U5++0Zzj7tz6YvruOwsLi8lOI4I2kY+wGa6zlPnmTVIXhN7KJGe4uHzwOT1P/AKEK8arh5zbldHqQqqKtYNS+yL4hEdvJ5kKthGIwWBFVOLhTaXQUZKUrs0/DOuR+H9Z1S8bhksnSP2bCkfrW2Dk7K76GWJSe3cyZL2RNDtrto0865uXG72AH9SaU8NBq+pcasr20LevCSwurzTcgW0txHIg6fwkg8+zYqp0/Zq0fUmE+Z3YyV9qb0YExOGwD0IOf6V51K8Zo65tOLPoS2nW5tYbhOVlRXH0IzX0Cd0eM1Znmnxg/5C3hz6Xf/oKU5/wK3+D/ANuiJ/Y/6+Q/M9P6DmgD568T6unij4gXEiSHyI38uFhzhEB5+hPP41lNXZvSfKmYF3Ekl68MSsUDyMpQfU5x6YApcgSqaiWNtJcaFdXcfIspo9+OyvuGfzH60ey964vaaWPS/F3jhJ/hhYRQybrrUIQk2DyoU7Wz9SK0b0M4xbZ55ewvFp+kwt8okR5mPpliCfyQGsOS+h1c9rsYlzIbW9v/ACvmR0AO4ADntx/KiVCLjYyVZ3uWtSTNjY6lGjLFfRNFMW7OO/8A3yR+RpwoRglboDquTY3W9i6Ro9rbyBjFC0r4P8TP0/SnJaFwerLf2p/E3iu3Ey4Ecaqyj0RcH8yKUlsKLVmU7DT5NWstckiLCS0xOoHcAnI/I/pVQgiZytse2fDHWF1fwTZ5bMtoPs7/APAen/juK1RiznfjB/yFvDn0u/8A0FKc/wCBW/wf+3RE/sf9fIfmdP8AETX28P8AhK4miz50/wC5jI/hJByfyzSY0eH+F5xFNeX6t5L28QPmDnOTyvIPJHtU8po5KxJ4aik1K81W7L7UjtndzjnnsPTvz9aozuW/h5bLqVh4i0zI8yey3RqTyWXJGPzoA5V3d0ijZ8Rqc4PQev6j9alq5cJNbF7WLtbi6/0WTfDHCsETYxuCqATz6nP50Jag5O1i2YGg8EfK+55rjDx+WcjGf4unvimSaheK8+GFtBuAurO9Lbdp4U5HX06/lQBzlzqElxcQvckZtIVijHrjOCfpnP4Uiky94Wt72WS+1CzOz7LAxDn19OlTZlOStZG18Ppolm1GCGH7TLc2+0ruPAx8x6c8mnsKTuavwh1f+yfEM2kTuypeDAVuMSL2+vUVaIaN34wf8hbw59Lv/wBBSnP+BW/wf+3RJf2P+vkPzNP4uR+Z4btQRn/SR/6CaTGjxa8jOn2ZKKwa4bLZ6AD2+v8AKhAzofC1m0fg/VtWLLGGieMKVPzAAHOc9+RQBF8NLpZPFcSRRJC4jc5A3b+nGPwP60IRieJ7H+z9f1G027RFOxUHj5SeP0IoY0Ym/LhSxCr3pIbOo1vXNNPhywsdLkkFwvNwShXJ24P1zmncRc0LX9HXwXqWnag8hvpSxh2RFiTj5TnoOSfzNAHIXG/YpZWDA8lvSkx9DS0vVNSs9LurO08oRXAxISPm6Y4NA7E3h2+1fQ783GnxRvIylSJF3D64pOwWZp+HLS/fxrZXtyNsj3YkbaMZJbn+dHMrj5XY9A+MH/IW8OfS7/8AQUq5/wACt/g/9uiZv7H/AF8h+Zs/FQZ8N259Lkf+gtUy2Lp7nlF7YTpbRJPAwLLuAI/hPQ0k7IqauzIk0gGMqsvlBuwfIP4ChyBUpMdbeHLiArO0zIOzBWX9cVKqIfsJDr3SoobVmXbIcjJB5/XmnzIPZNGLbpvuHGQOT1obsKEW2dB9igkUbx5hA7AD+dJyZoqK6m3ovh+1uLV5fkiAJAB5JI/EetZyqtMp0oo5zxBEiBMIBkjoTWibFOEUg0tQtuT5a5OMEjNDuUoRNixki+1RGfcYgwLKemO/FQ07GlrLQ6LTjBeeMdMW1UMqTJkouB1B9B6UU01uZz0izZ+MH/IW8OfS7/8AQUron/Arf4P/AG6Jxv7H/XyH5m38UuPDEJ/6el/9BapexdP4jzJvtGtNEILcvcFdrBOd+0fe9uBUmy0ZRktrqA7ZbZ0Kkg7kIPBwf14qWaxZpPqJuIBBHbyeZIcEbR1zn0yayjCzGlYrXGlX91p73C2zCBVY+YV2rhevPfFahzJM5PRrVr7VorVGVWnlCKWOACSBTZjTdm2d2nhVrtZzpl4Lz7Mo8xBCyuDu24C9+569BUs0U7bmvY+EtXjebToL+MOyy5jUkA7GUde2dwxS5bvYTqrc57xx4fg0XS4i87S3D3LohGApRTjOOvUH8MVZEpuQ3wnc2KaPJHI1jFOJMu15C0ivHj7q4BIOfTHbnikymnc6izk8KKSQINwWHb5i5XIiO7jGfvYznvikD5zX8Paloh1XTrXT4M3AVVlkRNqswUAt09FP/fVXEzqKVncqfGD/AJC3hz6Xf/oKVpP+BW/wf+3RMH9j/r5D8zb+KhC+E43IyFukJ/75akyouzPLrC/hiQSeWzwSB45EVtpII7Hseh/CoZsnzG9B4nsYrUwPazIRbSwrK5LuCz7hzkAjnPTqBUlcjNax8a6PaTzM8E9w8l7JcoWjAMe4hQBz12bvxxRcTpyf3GBr/icNoqWFjayRQxQtCXkb74YLuyo/2lz170XNIw1uzzix3LdkoSGDZBHbmqZFLdnczeINTubfypr8yK6hWR0GDghh265A5qGWootx+JdVkVmbUdj7mJZYlBOWDHnHcgH8KB8kTlvE8kszRyzSySEYXfIfY/pTRM2kvmS6XbN9lDo49yelDGpXNGGNxIuHhyefl/z70WLudR4HjH/CVWas4J+YhQMfwmqitTCrJWL/AMYP+Qt4c+l3/wCgpWk/4Fb/AAf+3ROZ/Y/6+Q/M73xBokHiHRZtNnYoJBlXHJRh0NAHimreH5fC9w2mX0sbuf3iPGTgqenXoeKlo1hJIpeWTCRHKWB4wOR+dZtI3jJElukqnIkbOM8J/wDXpWRTaK+pyW8Fu7TP5jdhuz+naqSIdVI5rbcaVq01tKmJEkKMPx7VTVzCM2jpG1JFIDQ59yd1HKy1W8iSDUkSNtkJ+ucUKDB1/Ip3Wia34k8yXTrGS4itUDOIhkjJI6dSfpTtYiU3Iz7eGa0hMTho5FbkHIIoJLlvPcYYee+CMEbutFkFz0L4W6Fetq/9qywPHbxI213XAckY49etNCZa+MH/ACFvDn0u/wD0FKc/4Fb/AAf+3RE/sf8AXyH5np46UAef/E3wpe6uIdS06EzyRJsliX7xXqCB378UgPI57ea2LRTwyRSKeVdSp/I0xkUCkyDhjQB1fh7wHqXiK5UT2klvYkjfNICvH+z6mkI9D8R/DDR9eujexSSWV2QA0iDcr4AAyp74A6EUAcvdfB7Vd37jVLSQDvIrIf0BoHclsvhBqGdt5qtvGhPPkoXP64oC56F4f8O2Phuw+y2SsdxzJI5yzn1P+FMRduLCzuzm5tIJj6yRhv50AQx6JpML74tLs0b1WBQf5UAXQMDAoA8w+MH/ACFvDn0u/wD0FKJ/wK3+D/26IP7H/XyH5np4pAFADJIo5RiSNXHowzQAyO0toW3RW0SH1VAKAJqACgAoAKACgAoAKACgDy/4v/8AIW8OfS7/APQUpz/3et/g/wDbog/sf9fIfmD/2Q==</field>
+        </record>
+
+        <record id="oetker_mozzarella" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Mozzarella</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSpJEiXc5wPpmsjSMXJ2RF9vtv+eh/74P8AhSuaewqdhq6jaMSFl3EdQFJx+lF0N4eoug77db/32/74b/Ci4vYz7B9ut/77f98N/hRcXsZ/1YPt9v8A3m/79t/hRcPYz/poT7fb/wB5v+/bf4UXH7Gf9NB9vtv77f8Aftv8KLi9jP8ApoPt9t/fb/v23+FFw9jPy+9B9vtv77f9+2/wouHsZ+X3oX7fb/32/wC+G/wouHspeX3ofHcRSnCEn6qR/OmTKDjuS0EkN1brcxCN92M5+Vip/MVUNxqTi76fmczdafaSa4bO4kZo2QFIZrx41cdyDu+Y56j0x603GEm1Jv7z0adatCip04xvd3fKrrt00K8GmaEw8xNPsYR5ZkWVb54iV3Y3AlunB9fr6r2WG6MuWLzPZ3etrWT17Wsa+i6dBcaesrSXEil22O875Zdxweo4x0PcYpw1W7+9nNi6jjVtyxTsrpJb216GkmjWjH7sx9/Pk/xp/N/ezmdaXaP3L/IkOh2npL/3/f8Axos+7+9h7eXaP3L/ACFTRbInlZf+/wDJ/wDFUW8397D28u0fuX+RO2iacqAlJAScDNxJ1/76p/N/ewVab6L7l/keZ674sk0/VrmzhslUQSFMtPKd2D1+9Xn1MTU5mk/z/wAz6jB5TSqUYzk91faP+QzTfGE95OkX2GE4YeYWuZV+XIBIO7tnNEcVNPX9SMVlVOEOaL/Bf5Hp6aLp7KGCSYIyP37/AONd6V+r+9nzTrTT2X3L/IG06ztv3kKOGHcysf0JpSWgnVlLTT7l/kJUEiqu5wKqG4mQ3ukWmoQ+Vd28cyA5AYdD6g9jVyipKzRpRr1KMrwbRzt5a6HaahFp8dmt5dQqCInkLJAvUZznHfAAJ7471PsaaV3/AF8jpWOxUk7S33e34lv+27kX01vFbCZbOETXQEbL5ankKCSMsQCeQOg9a0UU0nZ6s42rPc1rXVH1DzV06OCQwMFk3TY2kqGAOAexFRJVF0HFU+rf3f8ABK76hqaaxDpkkmnJczRtKkQEjMUUgEk4wOvejlquN9DR/V0vtfgaYi1BUzi2L/VgKXv+Rn+7v1M/Uh4gmt2ijg088gq3nupBBz/d9qiam420OmhLDRkm+b7l/meZeIPC+u3mpTXJs0RpSCwWUMM469j+lee4yUtT6Shj8PGgopvTyI9I8M3elL52qKtvCWMk1wxyI4lGT75PP14q/ZSqSiktzleOpxjKTldpaI9is7hL+yhurZwbeaNXjOCMqRkcHkcetek01ofNPcWdFVfvZNRJDTuQVIDXcxgMO1VDcTGyXFqlobu+uWWAAE/MVHPQccknpjvWii5D5uUq6ObTQNMvJbuPyCJp7maXyiFKbmZTnGOE2jHUYxWklzNJENt6s5zwxP8A2lpGqS6tIbRtRzqd0v8AG1q25UQH+EbYyD1OD2zmtqq5ZK3TT5kouWGuX0WiaDJILe1utZv0F15MSho0dXaPj+8VRRkj1pSgnKXkh3IG1Ca28Q6rrgf7Tc+dFolghACPJ9589wodiTz0Q801G8VH5sVy3rniXV7NU0+wQvdy3kdrHLOFDMcb5GCjgLs5yefm6VlGEdW9rXKV2ytLqurJqWpxTakv2XSoPtF1MIVXDFSyxKDnjAyScnkDioVJSinbf+rmnNysdaX+tSxeHdPkMLajfRPd3rPECIoQOBj6sg/A1To01zO2i2J9rLuVbu+u/EXhC2017ncdZ1RrWCREVGktUclnIH+yh6Y6j1rWMIwne2y/Ehts2dAf+1b6aeyX7PYQyvChhUIJAmV3sQACS3QYwFXn7wrGpTUV5lqrJ7u5sSSYuWhDl9mMsR+lc0visaW924tBBBdyGOIELk5xiqhuNK5nxz/JCsirutJ/M8tiFLAqwGM46bs/hVxmtUOUOpg+KNdi1bUYtEuoLhbIMr3EcRQtc9wmd2Avc85PTiksVGlKyV2d1DKataj7TmSXnf8AyM7UtYtrrWr6WSzvIbC60Y2TiMLvjxIwzjPTkj68d6IY2MYLR3TuVLJqnMlzR19e1+3Y0bjxJprz2kl3a3vkafOlyIo4kA83YQhJDHgDOB9OeMVH15RT0ZcciqztacdfXp8hltqmk29vaEWeoP5F3JeW0kiJjc29mz83zcOee2B6ct46+vK9V/X5E/2JO7XtI3Xr6diY63pcmu2epPZ6g0tsJo4428sAyNjex+brjj0AqfrnuuPK9X+Q/wCxam/PHa/Xr8itcano+ojVQ1rqZt9UjE8sYWPA2AJuBzkj5Rx6inHH2taL0HLI6ietSO9uu/3FoeINMTU7q/ltdTknvLaO0Ukxjy0bcwC4PG4kn8BSeOSilyvuCyOo/tx69+m/Qo2utaLYx6TKINSxpkb2sUmyMDaVAI4PDYHXryfbBLMU7uz1ZS4fqt2543tfrt9x1+hixsdHthZ3LC2KmSGGRlHlBzu28dcZxzmqniFNX7nmTw0qdSUH0dixbYYGQ5LyMWJ9PasYu7KqKyLFaGI+LaJVLAHHTNVDcTJJ0hk/1sQPuwrSwk2jCvvCGnX18b5jLHKQPuPtAwMelYyoRlK530M0r0aXs1a3mjMl8PaBaRmKaW6K427Vk4xknHT1J/Osp06UFqzphmeLqO6UfuK/9m6PeXclnBBeyyOf3oM3fOfm4wOnc1Fqcm0rm31vFU4qb5Uumn5GtH4L08xJvuJ9ijCqspIXjBH6mrVKLW7OZ5tWu9I6+QDwfpTsdk92zLnky+uc/nk/nQ6UO7D+1q/aP3djM1XQ9O0UoJHuHiZCoKTkEDjII9OB+Vc9W1N/8E6sPja2IvZRvfsU9LttJ1a6EMMN9jAbzfPBUKvCnj3yB+NOMVJrcuti61KLbcN9rd9zRn8F2U0b+TeXBVWy0RbIJ9fyNOdFNaNmEM3rRd3GP3GxDataWMUAClYUCKAOwGBnNUlZHJKqqk3J7tliFbneu9QsY7DvxWkIyT1Mqrhy6blmtTmAP5bBqqG4mRzXDNIEQFmPYVoCQSC+mi8uLyoV6MWPzfpWE5ze2hpBU476mDe+Gb0OZ1vmYk9AO30zXLWjJK/Lc3pVbPcxpLJtCgefTDI90f8AWB5MMc8DFc9Nv0Z6UsS6uk1zLpY6rRdVt9Q0mHZdbriMATAgA7h1yO1dja5UlLU8qpF8792xca5DLlMnihzuSo2OS1rxBb6iF06zBmllIUOy/LnPTHWsasW9DswilCXPZ2RsaZZWujWC6fHChlkO+Z0XClv8B0FW6iilDVmNRKc3NKyLqSFEEceArfNuUcdeaepAskRdd6L83TIHapkm9gi0jI0bxDINZk0GdJJFwXgmJzwO30461dCq/hZ0YnDRdJVU15o6Oug88VFDuARkVUdxMZbTwTAsjiNmZgu7AY7Tg4FT7TmRbpyiSB2UMBg7iB8xxUJg0SeWpj5YrgdemKrli0K7ucP4ylhurwRRTGONVVZZVwdxJ469R1rlqJVJ+69j0MLUnho87juXoPDix6XDC0kvPJIbKj69M1FTC+ZUcwlzuVkaX9nWj2xR9zIB8zqxQfpRHDwSOeVaTkcnq+n2WiiC7trdo5JGMUMasSCD/Fg9Cen/AOulW0S8z0svc6t4t6Lcm0TxXYSTNYanmOdG2CTGRk9jVUqfu3Zw4qUFVagzooXRIT+9Gcsw3MOmeP0962jaxhJO5GIr++ilS0uikgTIXICk+nTOPcZFN0nO6TsCmoWbVzlPBdndzavb3txOi7C48svlidpGMdsHmsqdKcKuq0PTxuNw9TDcsOtuh6LXWeIBbZHI3ojY/KjowW6PM5jrXnQTRxyhN+EUKSeSfx/SuCnS527M9+riaFKm1a7PQ7MXskAe/SGNiv3FBY59+1dfLpqzxG1fQp6tpuoXy+VbXo+VfmH3Tg/TNYVaMpbPY6sNiKVPWUTmNR0vVNImSSWGS8gfAc2+SD/vDHufWl7Bx2kayx6muXkVjrLW/g1axUpIYym0vG5wVPpx/nmtPaKatc43Bwe25HeX0awrK80KWaH58nGTz39M4onVikiqdKUpWW5WafSr9hLOyXSKPmyAyjnj2rCVSnOd3qdEY1qKstDkde0rTdU1tJdNu/nzlobUBy3OeSDgfjR7WSbilow+rPlUpaCwPrtuzpDpc88bZBjuZVKEdD+7GQTnvn8KqlCUPM1qVKbirNJrr1+82NE8ZTWDtZap4flslxlJLYFkP1U/d/CuqFanFa6HnVacpS01IPBk8qXcdvPHGZXZ5Hckhvm3Hjjn0pQxMKrdip4aVOF3/XqdzWhgGAwKnoQQaqO4mZOj20UF1Is8qGdSwT5vmQE9Poe1cVGKpzlFs7a83UimloajAQtGHfJI5ycDP41tJKNtTnTuOW9YqB5e3kjH40e0dg5DP1m51SK2A0u3WaZjkqWGVHrzxWdSVS1onRhoUHL942kcveaXr0oWNbny45zmRPLHyfiMMawjBqNrHfHEUI3aWq2/rYpahpniDRkt4I4F1SADlhErbeScYOT361VWm3K9icFOi0+abT+4PDNtZ392418C7cOfs0bsWUHJzlenH5UUZQUtR46MrJwVl3O2itLGGcZFvFK/3QFAJ/xro5Fe7PMdSTVtSZprazkJ8jeO5QAnJpqSTJs2iOWOG43FlUAZ5J6CspxjUVmVFuJyvh+5juPEiC3y6LvLPnIHykYH1rmwi5ZpHpYym44e78jt69M8YZLIYk34zjqKqG4mUNR0s6kq3dlIUuI/ukHGfY1lisMqy80b4fEeydmrpnOWus6zGZbS98oyxAlJJI/un1I/rXGqrpu0j0K2HpTjzU+pHrOv61Z2izeZFJCwwTbQ7se+48CrddSVkZYfBc89ZJWN/Q9VW/0i3lSxa3EoOEfGPTP0q4yXLZIyxFH2dRrmuaT7RAG3AP3AHSqTVjHW4lvIoALjGRyD96mmgaOc1/TbSG+W9tESG8Ugl1OPXqB/hmuPESUZabnfhqtScOWTdiufF8NrCgkjXzWbA3SdfU0/rL7F0stlUk1sjTsdWg1KyW7ikXazlWG4YJ7iuunGVSN7HDXh7Gbi2U9Wv73UALK1jjt7c/fczDJqa1CtKNkjXDVcPD3pSu/QteHtIh08xvEYznI+ToODwD3q6OG9krvVvcyxWLliJa7HR1qcpHMCU4GaqLswZVCXEDb4ARnqp6Gr5kIbNaxahhri2aOVekg6ioqU6dRWlqXCpOm/dZiap4bv5YWht7geUTn5DsbP8v5VwTwTi7wl8md9HHQ+3EzLaPxXpIEIs2vYB0XI6elZunVTta34o6ZTwdVXvZmvFLcbAF0W8QD+E4wvfoc1MI1Keigc8owk9aiILrW9YgYrZ+HL53PWRgAB79ea6Up22sTGlSb1mjM8zxLdRvHPo9yC4YMxAHX05rnlSmnezZ2ReGi01NaGSvhbxDcxyQT25SBjx8uWApck7q0H+RtLHUU78x1Xh7wzLp2kfY54hIPNaQeYcEZAHb6etenhuaMPetc8bH144irzLsWLjTktztGmNKT2jDED8c1vzrucip3IbKzuZtf06b7DPa29oJSVYYXcy4z1+v51E5XNkoxg1odXWZmFABQAUAFABQAUAFABQAUAFABQAUAFAAD/2Q==</field>
+        </record>
+        <record id="oetker_bolognese" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Bolognese</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSZp47ePfISFzjhSf0FZGkVdlZtWs0UszyADkkwvgfpQ7rozSNCcnZWfzX+ZDF4j0ieTy4b1ZH/ALqKxP8AKpU0zaWAxEVdxt9xY/tO1/vSf9+X/wAKqz7P7jD2T7r71/mH9p2v96T/AL9N/hRZ9n9weyfdfev8xf7Rtv7z/wDfpv8ACiz7P7g9k+6+9f5h/aNt/ef/AL9N/hRZ9n9wvZvuvvX+Yf2jbf3n/wC/bf4UWfZ/cP2b7r71/mH9o2395/8Av23+FFn2f3C9m+6+9f5i/wBo2395/wDv23+FFn2f3B7N9196/wAw/tC2/vt/37b/AAos+z+4PZvuvvX+Y6O8glcIjMWPqhH8xRZ9mJwaXT70T0EkNxBHcIqSorruzhhkdKqKTY1OUXdOxzV9aaZFrgW+js44nVfK+1qRC3qBjjdn19RSapKXvr0PSpVcXKgnSk7pu9t/Lzt6FdTobRK80OgxxPF5kbPbFS67tucjBJyDxwfanfCtbDSzRSaUpNp23v5/10NjRdNtn05Xe0QKzsUEsfzbdxx97np0zzjFKEY22OfF16vtbc2tlez0vbXY1I9Ks25FlB9TGP8ACq5YvoczxFX+Z/eyT+ybEdbSD8Il/wAKOSPYPrFX+Z/exyaZYZ/48rf/AL9L/hRyR7C+sVf5n95M+naaiAvZWoycAmFev5UOMV0Q1WrP7UvvPLPEPii6s9YurWG0skSGRkGLdTkZ4NebUqS5mtPuPrMDl9OdCM5Sk7ruyHSvFl5dXKRNb6aFUguZLYfMuRnp3xk/hRGvKL1sLF5dTjC8ZSv6nrCaZppQP9htsMM/6lf8K9JQi1sj5R4isn8T+9jXs7KH54bSCNx0ZYwDSlGK6CdWpJWcm16jakkVV3OAaqG4mNuLGC6iaKeKOWM9VdQQfwNW0mtRwqSg7xbTOelNkdSFnplhHdzQYLzbC8duewBAPzd8DHHUjIyezgkm/kbe3ryuuZrvrb/hxw1XUBfXsSpE0WmQiW6Zk2ckbgg+ZsfKCSe2R61ooXSdt2YOy6mxY6jJqpuFsJYB9mkEcheNzhtobHbPDCs5wqLsVF0+qbKz3V8PEEWjvqURuJIGuNsdnwqAgZJL9ycCl7Opy3uvu/4JbqUNuR/f/wAA1xaXSp/x9Ju9TF/TNK0u5HNC+34mfqNprM9u0S6lZBSQRutWyCDkch/b0rOcZOLTa/r5nRRq0IyT5Jff/wAA871zwZrF5fyTtJblpPvFSRn3/wAmuB05RZ9DQzSiqKjZjbHwpc6BatdakdtmhM1zLGpOEUZC9Op5/OtI4edWcVbQ5qmZUlGTW9tD1LT7uLU7KK6gkHlyIrBcjK5GcH0PtXoNa2ufPSTjuh8yoo4OT61MkkCbIqkCOZzGgZeSD/SqhuDGPeWcVmLq7DSocAJguWY9FCjqfwrSMeYXM47EFrcxeGtHvJ76JkijknupJsrhgzMwGM5zghcY7Vo1zySXkiTmPDkyto2o/wBvsUe4iOs3kI48yNywCMfQCMZXjqB0yK3qL3ly+iEi9b6tqsWjeG0vrtjc6hfIl8UUKVEiO6R5A4wAoOOePepcIuUrdFoBV+3Tw6xqOrW0xlvb2+j0awZ8EAIP3j47qG3nHqop8q5UnsldiLOuazrMcsGk6fIYZ7i+W3jeRhJIUVQ8jnsBjAwP73bpWcYxs5Pov+GLSuyrPe3tve6zJNqtwbLR4RLM7lcyzsm5UGAMKBjjuWrNUlKMdNX+RbnyvQntJdZVvD+jSXzLePbPfanMyqWWPGAvIx95sf8AAK0dOmlJpabIjnk+pUe6ufEfhjTNLnupJBrepP5e7Ac2UbliWwB/Co/76FaJKE27bL8SNze8Pyy69cvqrArZiR47Y427o1JUHIwSWILZ6AAAdTWNWEY6dS4zkluajSr9reFCxVMAknPOOlcjfvWNre5ckpmZXvGdYR5almLYAAzVReoJXM5JZYFjWdNkltMZEDqVDAqw64P9404ztdMtwT2OT8TeKDqHiO20W7sBNaI6N5An2rM5wV3naflH93ua0jW5Nt+500sv56fO5WKl9r/2vW7y6udORrS60t7WaOO76BJD8wYJjnOAO5I9cU4V3GKXVO4SwHvbv7v+CaE3jJJJ4bmbRpbldPQXqxfbAFRj8ocjywd2GJA6YOcVPtmk/MtZana8+ttv+CNtPEltFplncwaE3kxSy3UDtegmA5kLf8s++X9SfwGB15P5oTy6Kk48+q8v+COl8WQQa5BeS6AftNtFcIub7KoASZGPyck7etL2r5WhrLk1dT7dO/zGXfiG1kuLyK70FlXUpV81DfHyywxGJOIzjoOvpnFNV5K3kSsvi1fn/D/gk/8AwlMMN5d3M2hYuLwJZzGbUOi43YB2YA/eZJBx6dqTrOyXYFgIvaXTt/wSjN4ssdIj02STQ5d1rE9tCDe4YRg7CrDyxgfu/Y/macsQ9fMunlim7Kf4f8E7fRriwj0WzmtVaGKSISxwsSwh3/MVBx6k8/0rKpiLnI8O4zcezLVoPl3kHdISzE+9Ywd2OorIs1qYjoiBKpIz6VUdxMlkKkYdAR781oIw7/wjouoX51Ge1P2nj96srqeBgYwRik4pm8MVVhHlT0+RlHQ/Ddm3kJYuQFPAu5UXbnJ/i6Z/WsZ1acFqdEauJnrf8F/kZ18uhoWVdN3SE7Cn2udycjGDhumCeeR1FYPFw7G0fbfzfgv8iN9KsPscTQ2cMIAYRRPdTMRweiox4JJ59zkVi8dG/oUpT5mm236L9TGtfKitYDe2kDqzP+9gvJDhskH5dwA6kdeefeqeIlZ2NFzSlZP8F/kW9N/sm5u7qL7CJbeM+aZI7qVSD1yRu9e/PSo+ttLX/I1rUK1NJt2+SZtf2ZoEEIZ9OkFu0SyK0d3KfmwBjGQOABznt7U3jIx0Zzx9tUlZNXv2RzepW2jyWsd8S/lO5VbUyOVjOSQxLNznJ6VgsRWnKyZ1qM6U3F29TqtP8Q6cTa6SjeVIIkSJBnYeOAD34Fa06vMrtHFOk03I6K3guldXkYeWOgXpXVThK6fQ5Ks4OLS3LdbHMIXMZDD1xVR3EyvcXTKThScck1UpcquOMeZnOal4suGuRY26JEQeROxQyeqjGa86rjHK6XQ9Sll/LT53r+hl2tzHFaxvdyEI7kGBJAGiBP8AE2c9T+ArhmnOVlc2dObu7fOwstvYTfaobKSeEyKFKB98jP65Ofbn396n2so1EnHQcZuMVte+5Xh8qCO2VxbqyL5YeM4lYDqzEA5yc9TVSctdeonNuTeupDrItru3VbK02Qj53ugpVmOM8EkZPHb9MVcHOM/ed+woU5XuyHw9Y21taSwC3F5cT42b2MeMngZ/izx29fairU55JWNarbersl8ye01f7FFPDqmJ42QiO3QAsGz0Jzz9P8KUoRkrGlWne0oWVhLNNEisRNcWTmWblrUOWCdeT+fGa46zxHtPckrLr3M6lSrWdrlW/vEu762/s23eRodoWKOPeQQcgA8Y/pXTQpySfM9/MqdKdOPvo6vw1rOow3q6PfbpVcsqM2NyFQTyR1HH6iuzCV3zcnQ4MVRhKDqLc6yvQPOHRqGcAjNVHcTOT1jUDd3VxCI5HgtnDkow2gL1DfU+tedipzqN8r0PUw9FU4x7soXENzqc1rdpp5QcJBJvOwAj1B6cYrkp0qkfi6nVH2UYSXNqUb2xVdUbMsHlo3ln94Bt7n0/L/GiU7OyNaNZOk07j5reOOdbbSrhbOeU7CiFuSQBg8EHgD06DmlTb+07/wBeRnGjNw55R0WvQjutQj0q5Fs+lRSTDAd/MIwemB0x06/Wtk7vS1ghShNXcmipf6bqF5JIp1PTzagk7y5YRcDA6dailOmpX1HHEWjbl1LGkxahg+INQu2a1tDtii3bfmAxnBHGPYc+grWbjFeZjNK/IupS1LUbSd1hezCIse5pFk37QD2z3JJJx/8AXqFTa1TNIwb3Zv8Ah2OxuNLjZkzHcKzM8qDAPYA49O2ePSuh0oq17f1/Xc5qjkneL2elv+H/AENHRfD1mrzzWVvFHMozHMd5BJ/T8QePSqeFjXg1t/X9dTKvi6js5O/lp/X4D9Gu7LUL62udgW62MrqVO5XAIPPToMZ549KzwuX1KFRNyukjGeIU6bS6s6WvQOYN5jR2HUIcfXFJtpO3YaV2jy6DU9NsZ76GW/uDPeyBGUr8u7Ocso6dxkmvOanJbaWPerLWLSSt/W5asNRW4jhsrnU/sqQjLxR8Kx5zyPXPPvWdRNruglh3GHMle5poY5byOGyjRrmKMvF5oyDxnjjBPTGa56VKfM2tL9DFwtC8trmJP4hNrdSJEj4dyfOiHOeOpHGP610xo7s6HFNJPsV4LJbZ5ZJJZhIlwCWaMfOxz3JJIA/DPeiev3GXOnokW4Vkv7c3EkUbuG8wRQwnzZT0weAVxk55rFzhSdv+GKmoJrluvUilsNdCJFK0FvakkCK6mMec8DGT8xrSMYy6McqlJpWWvlqMntdK09pII4LvUXQKrRwIEjUkYGXIJ78cd6uCb1lJfIhSm9kl6i6Zrn2OY2tnb22mJIPmVFLy8HHzFif0rT2/JqkVVwc6sbttnV6R4vEzNElpJcOW2F0UKQQOrYOAK3p4yzs42PMq4NpXuYXga9um1KK1m3xDdIWEsODKec4PUEHsccVsq8aj0ZM8K6dO+/6HotWcwq9fqKqO4mcRqVpb6NrMl5NZQz2042zb1GRnoea8mtzUpcnbbzX/AAD26E/rNGydmirbx6e2lSotisKzznbNMR8zZ+UDAyV/Cs3UezQpJqavLYu6emnxSxm6/wBDvLYFzMsm4henX056Gpu3oFeEkuaOsWY9q0N5NcX3nJqeZmMCOMBBnqOQB9DxWlSU1K1raFSqXio7adDbj8QTzXM6/Z0W0hRB5brkDOc4xx29+lZzc+W+jOf2Ubbu5U1rV/7Pt4prC4ht3ByYIoQiyISehHODz3xV0puS1WpcIJvVN+rM37G/iCe3uUtDLsILTr8isOu35uSeo4qZVYxfK5avodEcR7FNIzfsdmmtuPtV7YOwKp9ojBErAjCqdw9Rg1a96n0f6B9YcWpSs9S5dSQWbl9SRbyVI8eYjNtZfmIDHOA2SBznofwmnBy0V7BKq5u8dCDTk+zzm9shDBgiQrHKX84HqSo+7jPaqd/hbuRKm0tU7G14T1Ke48S+VcRRxFix2hvmztJPHpWuGpqNRO5GKp2w97M9Ar0TxxkrmOPeBnHaqhuJlS8sIdZsnjDAEggE/wAJqa9CNVa7rY1w9eVCakjj9Wtf7F0sQRRXX2kc/wCj5K7gfvbSep/GvKqLllyzVvyPYoyWJk5Jq3nuNu9W0nUrWK2R44rgphjIpM2/rj3596Vp2VtUQqVSD6/oZ2s6j9m8Ow2iKkiM4MU8OBtPdW/unGa0pqUpa2NIU1Kd9n/WxUkWy/sYREusrP5jHH7st/e57kHGCKz5pe0ui5U3G76I6jRNT0270JIJZGeC0UA/aIgcgg9D3H/1qirVdN2k93ojidNyndLUy9M12yvbmbSrqISxXB8uL7LHuwo5PI9PYUU8PCLvbU7sRh0oKcHbTr1GS6Pb2863V7ZXGpKiFY7eSFg4A43E/TAH51cvar4dPysZSxCqwUdFYtz28WveHIotPhjsYC+Nk7YYY7dD+ZrbD4Obm5p9TklXjRl7zYyy0iSw8pofIZ42HltJO2APTgDI/rVyy+rKd21+Jf8AakHDld7eiNzQdMgsLtJvtCSz3DsWlJ+aRsE4HsOeKujg5wnzza8kv63OfE432yUYqyR09dRxjJQxTCjJpxdmDKZtp0bzIPkbuM8GtOZCsOeKS6TZdWwPuCKiapzjaSuhxcou6Zkah4Thu5N5SOQ4x+8HzD6MORXnVMuS1pTcfLdHoUcyqQVmv69NjnZPAWo2cjPpLCMH70Urh0bHTrzWcYYracU/NM6ljcPJa3NGW18TxWRtotLinWRCJFaaNQzep+tFPB1bu7sYyqYd6834Mo2mj+I44mgfw7axRvxmKaMBV44AB6cfrVVsFKdnfVBGvQi/if4lS68Ga3ba20+jWAtIQch47lcN68E5FaujOULSVyoYmk1aUvwJP+EP8W3k3mX95FkZ2lZWO36c/wCe9ZSpzS92n+KLhicLHdt/Kx0mjeHrnS7EWh2y/OXLygHkgDsfQV1YOdZK04pfP+vzPPxtSnWnePYnvbK+h2iz06G5J+8TtRR+Zzn8K7edHKoRe5Ws9J1GXxDY311ZR28dokgGyQEZZcdBUzmmtDRNRg0up1FZkBQAUAFABQAUAFABQAUAFABQAUAFABQA/9k=</field>
+        </record>
+        <record id="oetker_funghi" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Funghi</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSpZUgjLyHCj2J/lWVjRK5WXVLRjhWlOBniB/8ACh3XRlqjJ9vvX+Y2PWbCV9kczO391Y2J/lUqSZcsLVirtfih39q2f99/+/T/AOFVZ9n9xn7N9196/wAxf7UtP77/APfp/wDCiz7P7g9m+6+9f5h/adp/ff8A79t/hRZ9n9wezfdfev8AMP7TtP77f9+2/wAKLPs/uD2b7r71/mL/AGla/wB9v+/bf4UWfZ/cHs33X3r/ADD+0rX++/8A37b/AAos+z+4PZvuvvX+Yf2la/33/wC/bf4UWfZ/cHs33X3r/MP7Stf77/8Aftv8KLPs/uD2b7r71/mOjvreVwiOxY9Mow/mKLPsxODXb70cT8SP+QtoX/XO8/8ARYq1/Arf4P8A26JyY/8A3b/uJD8zuLqFZ4djZxnPBI/lUxV2dSk4u6OW1G0sv7cjgv2j+zSIuxbqZ1iY5O7HIBbGOD7e9DjT5nz9tD0aNXE+xvS3Td7JXtpb5blRYNEdI2NloqIVZw7O8e5VbaSDns3GO/UU+XCMr2uaJ7yetu+6v+RtaJZwz2RkHmNC0hMTOz5K/wDAjnGc4z2xShGNvIwxdapGaTavZXtbf5fj5mpHplsx/wBVn3yarlT6HM69RdSX+yrQdYh+Zo5EL6zU7irplnkf6Op+tHJEHiavcnbTtPSPc9vGBkDJHcnAo5Ygq9VvdnmnifxTdabrlzY29paokDYB2ZLAgH1964KtWSm0j6fL8vp1cPGcpS18ynYeM9QuHES21gXHOZUIBHccGpjXknqXiMspqN4ykeqw6fYSwpKtvGVcBhx2r0Ixi1ex8tKtVi2m2K1lZw/PHAisDwQOaHFJEutUlo2zgfiR/wAhbQv+ud5/6LFNfwK3+D/26JyY/wD3b/uJD8zvtobg0obnQyG5063vITDcQxzRnqrqGFW0pLUqnVnTleLaZzt7FpNvfx6fbWCXlzENxjOWWAE9W4bBPYAE9+OtL2UErv8AzOhYrEyvaT136FgarfnU3sYIUka2hE9xujKbFP3VyWPJweo4A6c1oopxvZ7nM9HuaNhq7av5q6abctEEMgctlN6hlzxjoQeDUThUj2HH2fW5DPe6nDrFrpkl7YrPdq7xxpayMdq4ySd+B1FJQqOLd1/XzNOfDpfDL71/kay298E5lhL+uw4/LNK0u5neF9n9/wDwCjf2+uTW7wrc6ftYcExOGB6g53evtUyjNq10b0amHjJPll96/wAjz3xF4Q1y+1B7lhbl3ADFHPOOM8j0rglTkpan0OGzLDxo8iuVtM8G6hpiPNd7UjdsyzqCfKjAyT0/zgVTozm0kjD6/RTk29loj1PSL621XS4LuxlBt3QFB3AxxkduK9FxcXbsfOyve7W5YlVVHXJzUSSBNnn3xI/5C2hf9c7z/wBFimv4Fb/B/wC3RObH/wC7f9xIfmd1M5SMsO1KG50sga5tVsjd3kjeSBlgScemMDrzxjnNaKPMHM47EOlNb6Ja309xCYInmkunmKBVEZGVyOowoC4xnirkr2SIbb1ZzXhe4/taDU5dUka0Org6jJj77WuSipn+EBVHPUh+CK2qrlat00+YkWLLXtQTw3o9y8scNxqmpQrKscSBoYJCRGMYxnaqDJGcGh04ubXZBcZdahPa+IdV1tZDc3FuYdHsEYALJM+GfPHQMwzjn5TQopxUfmwLHiHXtasbdtPsXJvJbiG1hnlCFmkbLOwUAgLsGeemRxUQjFu72tceoxrzUv7evLWbV5RaWFuLq9m8uMBCQdsaccDALEnJ4Az1qFBSgnbVuy/zNHLlZHYajrs2meHbV7lRqWqytdTs0SkR24BbGMehQevPWtHSppydtF+ZHPJkV7qV9qnhO8sVvXlOqaqdPsZSqBnhyFcnaACBiTnHQCrjCMZp22V3/X3Et3NfRidT1SUWy7LDTpTaIyoFLiMYJ3gAn5sKAOMKSeorGpBJa7vUqM5LRPQ2pHVbryVZmAAJJPT2rlluarWNzhfiR/yFtC/653n/AKLFWv4Fb/B/7dE48f8A7t/3Eh+Z2167R2xZV3HIAFKO51JXMhJmQLHOm1rebzljcbQwwRjnuM5+uKpTs2XKndXRW1tzryx2c+6LTtwa4iRhvnx0QkHhfXHJ9q87FZ1TwdXl5W3Y0p4NzV72Ib6yFxrhuWRls59JlsJIojhlUkNkfhxRDPEqa9z+8tV0WonhNdy95FrM1ks/nNFaulysOVVS6LhScDOAADj2HWpWeq9lDdX36A8HpuMW106KMHyZzm8a9hZnU+XKW3MRxzycc54rOXEVoKTpuzVt+xSwN21zbE80NjLqlpqEkUxms98iAuNrNIApZuOTjgegq/7baTjybpPfo7W/Mn6p5kdxZafey30kkVwY9VjWKeJZFCthSoPTIIB9cdDinDPJOEGqe7016/0geE1a5ie3Szi1VtTWKeSdLYWwLyDaqcvwABjOP0FKOeOomlT6338n5eQPCW3kUbbT9MsINMiiW6H9mlmtmMikqGDAj7uP4jz16c1nU4lS1dP4lff+uxSwLf2tjV06LT9Ptv8ARXaKJ5XmWFmysbMSWxx6k9fWvSp4329KM9roxdBxk0T2xEjNKclpGzn0HakncuasrHGfEj/kLaF/1zvP/RYrZfwK3+D/ANuicGP/AN2/7iQ/M79CAwLDpSjudDHS7GX95GCPcZrQSKU2m28x8wDHHrxXFiMtw+InzTjd+rNoYipBWTMue+0q1maJyZZFGCqOc49K53l2Ci9b7W3e3bc3g68l/wAAa160iedb6Y+wpne0zHj0wPp0rKeGwy1UZbd3/n5GqjLZyW/YyBrnm2zOlvCuz/lnJIy4PH9P6VyyoYdqzjp6v/M29nJPf8EatrI09mt0yqqmMGQlyAox69COlXChh9XyO9tfee3TqZS5lKyfpojHj8SxoZGNqJoo2++kxXHp1qKVDD8qvF/ezedGfNZP8DYs9X0m7SMq7iSUZ2hi3YgdPauuOEwu/vJ+r/zOeUKyvorIb59u93PBIrw+Udil2+8e20c5Fc0sDhm/eVraLVlKc0k1qWorkuzQLE6KnQjBX8TXbQcYx5YrRESit29y5bxXIkQtgRg5wO9dcYyMakoWdtzj/iR/yFtC/wCud5/6LFbr+BW/wf8At0Tzcf8A7t/3Eh+Z3jOY13DtShudDKV1feWMntyWJwBVtpIqMLmReeIp57J47Jxajd800ke4uvfaO31rgqY2+kTvo4OMJXnr5f5mDcrDbxRzWGptLHJgSDeJOQDzk9DjmuOrojrg3OTukinaX91ptxFJaiS9ZjtbzZtxfJwBgHj6mlCrzaNDnh092bF0r7i11DFG7cH93kKfTceh5rD2coNpIUXDpdmpdG0bQGHmMYsASfPgtjnHPFdKUfZ3776nNHn9ttr0KAEmnWCz2NvC5IBCSe/pjofxqVL2fwotrnlaTJINbWFI3nX/AEoDDRxkBY/Yse/0pTxfLotX5A8NdvXTz/yKura00llLfWW1ZomRmjYqysAex9af1jmd9UVDD2dnroUbbXW+zNcGMiRm3+Wpzk1hSnGFRmk6Mtjb8Oa/I11FYPFI3nA7snPl4GRn9R+Vd2ErO9lqmc+Kwy9nz9vxM34kf8hbQv8Arnef+ixXpr+BW/wf+3RPDx/+7f8AcSH5nfBQxwRn2pR3OhnO6xq9jDd+VIjSojBSqLkluOffFcleupT5XsdtHDyUObuYZivJ7toIrsKsoPlhwOfoMZHHua8+0pO0Tr5oRjdozp/D02m2BnkKmVzjySRjHt9aclyxTZvTxHPKyLWm3MUdu8j6ZNCoH7tihcM2eRjrUqOl7+hNXm5rXv3JppbjUrryLtiIZQBGe6H157fypQqurKzuTyqnG6Ks8WpK8kbSvOjyBY44QAcE49MfU804yhUmlYNErpl7V7ybS5poRASgTbC6DKwkjqRnLH+VdFVxgmjKjF1LO5l6PchrWSG8G7zckAINuO+T6flXHJwhqjecJyZYsbOJbM2a2irC7khWHDAdOu3P4Nz6V2Q9+KlL8f6X5mUr05aPX+vX8jZ0rRTcxsFZYnC5BjPy5H1DY/BjWscDSm9Fb+v66nPPFzj5/wBeVvyG6G2nPqStEZYbsXDpPE53EsoKnn044/lWkcJKnJW2RnLFOpTaf/DFH4kf8hbQv+ud5/6LFdi/gVv8H/t0Ty8f/u3/AHEh+Z3rP5aPIP4VJ/SovY6bXOROmC7tC8jCJw+UYsT5fXkdOOK8zkTgm2etOryystdDM1DR7SKN/Mum+1qi+XPGoaQnPGFHPr1NU4cr8hU6jl0Q/VdTjig+y3qCUoCA/lHAI5BPp6VlUld2uaUqL3iFla2sjRDdNNcPGsgaOQoqggkA85OfpSVKMYW6sc68r7KxLb6jHY3k1rcwKiNGxaVySSB23E9Paphzwg721JmlUs43uhkcN3NqzR28gSOL96rA8bccAdsnNFNe9q9hza9mn30KaWl/IZHvpR5ZmboASoznBYHAp1Yc+qRcJKKsv6+Ran1nSrOPMcTyFRtxBHvPXuTgfkTWcsPBtczS/EiMZv8Ar+mNa+1Gyuv9HsFgM4yXklLFh7gYX9DV08VTorRMJU1VWslp5f0zW03xBfWN2YdT0opGwG2eD0/2l/wrthj4R0cbHJUwnOrxlcqeFLe6i1K4muUQm5uXl3NwRuJOF9cZxziumOKp1NEc0sPKmtSv8SP+QtoX/XO8/wDRYrZfwK3+D/26Jw4//dv+4kPzO9OMHPQipjudDOJLXmmSXttPIhMh/dZJ5APGPXg/nXlVounzQZ7cHTrxhJX03LkOmW1zKEmUysgBWRmC47gEAZ4+uKdOEr2v+JhUnZXMe60iCCKSaJpGHV5HkLDPoK5qiUlojenUknqS6BrQmRbe9WQSYOGYDIAOOc9q0jBp6t6E1qSa5olyfTLTUdVjS9s3SNlODgBWHXqPU9quMU566ExnKFJuLVx2rBrObyo5xCkmWQJCGb6c+mPyFKrTcW2rE0ZqS1/Mx/7Ke/vYPtMV7LwX86QMpXjgD9KzVWVrS7G3PGN7WLEWnokT3C+c723yhM7jnPYev+Nc9P312KqSadu42wsLmf7Rdukybyqlu2BnOPQ9M/SrteK7Jmc5pNK5q2ctpbaX5VxKnlqTgTsScjry3NdTUZRs7GDU3LRMzNI1KDUfE1pHZxiVI5Gk80HhV2kYx65xSwq5Kiv1Z24nDOnhpSk9bfqO+JH/ACFtC/653n/osV7K/gVv8H/t0T5jH/7t/wBxIfmd1O5jgZwMkdqUdzpZn3OnwaxAGABdehPVfxqcRQjWjZl0K86Mro5+6urnQ7draODdGjbmR13Ajpx3NeVzVKD5JL/Jnr0o08U+a+pqW8ltHJHLPCqlMFY1OFD4/wATVudKnO76HJJTlFpFXxDJAtuNzf6xxswOo71wuTvJp6N6G2Gg5O1tkVBrNpaQNdTzRCYptBDgufQAVtTq8ye9xyoS5rWHvdLq6rM5Yq6oAqj542PAPA9R+Fbe1TfvGbpunoaemt5MbPcnfIONxXBJ9OO2frWanRT5rGc03ojI1G40+RDC1yqzOyuyhfm4PfHT8/zpK1OHMjaKm2kLHf38lm9tbGAW6MFLzPjqM4FLD0cRiKT5WrDqOhTmnO9/Ixta0Se/nhEF5GsY4ffISAc9vWumll9aC1SNcNmeHp3bR0HhfRLfS2jMLo3z/MwOdxx/niujD4SUPfqW5vyOPG494l2Wxn/Ej/kLaF/1zvP/AEWK7F/Arf4P/bonkY//AHb/ALiQ/M7qYFoWCjJNTHc6TP8AstzE/mQAq3cZ4NacyELJA97Hsu7Qg/3gRUzVOorSVxxlKDvFmdeeG5Z2TEheNeNuccV5s8sgneEreTO6lmEorVFCfQtVSB1jt1lY/KrGTlU9ACcZ461g8HUiuVRW+rR1wxlCUk22v8/kVI/D+otHCIdNkt3iBJeZkfJ9OG/Wl9VqRvaO5tPGUru8079rr9C5Ba6xZt5KaVNJHIMvIJIxg+wzVLDVeVqxhKeHlrzq/wAyKa38R28CLa2M0x8zcwYxjgdvvf59qmGDmtErCUsPNvmml6X/AMjOl0PxNf3zzf2eLUO2cyTAhfoATTeDnrdXN44jCU4/Hf0Ru6L4butPs3t5AHDP5h3gdcdua9LBxlTg1K255ePrwrzTitkWrnTp4h+5sElY88KAPz3V1c6ONQRVt9Mv5tZ06WWwNvDaSvISGXGShUcA+9TOSsbRUYxepmfEj/kLaF/1zvP/AEWKS/gVv8H/ALdE4sf/ALt/3Eh+Z31QdIUAFABQAUAFABQAUAFABQAUAFAHA/Ej/kLaF/1zvP8A0WKtfwK3+D/26JzY/wD3b/uJD8wA/9k=</field>
+        </record>
+        <record id="oetker_hawaii" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Hawaii</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSpJUiTe5wo74rI0SbZB/aNqTgOxPtG3+FIv2M/6aEXVLN2KpKWI6gIxx+lHMinh6iWqF/tK1/56N/37b/CmT7KXl96D+0bX/no3/ftv8KNezD2UvL70H9o2v8Afb/v23+FGvZi9nLy+9B/aNr/AM9G/wC/bf4Ua9mHs35feg/tG1/vt/37b/Ciz7MPZvy+9B/aNr/fb/v23+FFn2Yezfl96D+0bX++3/ftv8KLPsw9m/L70H9o2v8Afb/v23+FFn2Yezfl96Hx3kErhEclj0ypH8xRZ9mJxa7feiegkgu4FuYPLfdgnPysVP5iqjuNScXc5i+06yOux2t05+zyRrsjmu3RHOTuwdwyQMcfT60SjByak3tpqehRrV40ealFXTd2oq62t023KkenaGyxsmn6cmVZ/MF08fyqdpZWLdm460eywvct4rNFo7vW1rJ7q+1jX0TTre5sjIJLiWIyN5TtO/zL9c8jOcHuMUQs1u7epz4upKE0nGKdldJLf7jVj0i1PRZT/wBtn/xqrJ9/vOZ1peX3L/Il/se1H8Mn/f1/8aOX1F7eXl9y/wAhy6TZ55R/+/r/AONHKvMPbz8vuX+RKdKsFTLRsOcAmVuv50uVD9tN9vuX+R5x4k8Vz6ZrNxYwWcYWBtu5nc7u/wDe964ateak0j6XAZXTrUIzk912X+RVsPGd3cyCIWdsWHLF5ZFG3v8AxcUo4iSev6lYnKqcI3jJ/cv8j1CLS7B0V1jYqwyP3rf413qKaPmHWqJ20+5CmwtIDvjjIYdDvY/zNDikhOrKWj/JC1BIBdxAqo7iZDe6Xa38BhureOaM/wALrn8auUVJWaLpVp0pXi2mc7f2ei2t9Fp8dkt5dIN6wtIzJCpPVs5xk9gCT1x3qfY00rs6VjsVK9pb7vRfiWhq12NQezgt0lNvCJ7hfLKiNT91QSRycNjIHStVFNXszkkrPc07LVhqfmLpvkSGIJvDyEbdyhlzgehBqJRnHoEfZ9WyGa/1CLVrfTZZ7BLi5R3jiEcjkquMknoOo69aSjUab0NL4e20vw/yNRY70Jy0Bf6ECl73kZ3hfqUb9NcmgeKMWGDgglnUgg5B6HuKmSm1bQ6KMsPGSb5vwPOfEXhTXb/U5Lo28QeQDdsmyCQMZ5A9K4Z05c2p9Fhcxw0KHIm/u/4craZ4Sv8ATEaXUFWGNm3SXGciKNRkn155/IU3RnNpJGLx9Jc0r3stEes6ddQ6jp1vd2cmbaWMNEcEEqRxwelei4tadj5qW92TSoqrnOTUyQJkVQMZK5jTcO1VDcGRNc2y2hu7ydlgVcsdxUD245PpjvWijcXNYraQbXR7a+nuI/IEk8t08xjKr5XVST2wgUYPPB4q2r2SJbb1Zzfhi5/te21SbUZDZnVs6hKf4zaZMaoD/DhU5PXD8YPI2qLlat00+YkWLDXb2Pw9o1yTBb3Gr6jEkqxRoGihk3eXxjqVRBkjofaplBczXZBcjuNQmtfEWq64HNzPbmHR7FCAqyzNhnzxwAzDOOflPNNRvFR+bAt694h1mwtzY2QL3slxDaxTShAWkPzOQoyAuwZ55GRwaiEIvV7WGRvqOq/21fWsmqYtrC3F1eTCFAI8glY1BB4wCxJyemMZqVBSinbfYtuzGWOp65PY+HbZ3i/tHVGe6uC8QxFbgE4x/wACQeuc1TpQTlpovzJ55Fe91G91rwjLp/2su2q6q1haTKiqZIA2HYgDGAFk5GO1XGKjO9tlclu5raG39o6lMbNRFYWczWwMahDKEBUszADJ3cADspJ6ispwSWu7LVSVrXNx5AtwYQxfABJP8q55PWxaV43H0iSC8kMduWAycjiqhuFrmWk3CJMoDW84lEbnbuGD69wTn6gdK0UtWipQ0ujK8T6mmqNHptwJYtPJD3KxspecDomQcBT3OcnpxXNVzGnhp2s2zpoZdUrQ5k0ipdyJe6z9pW2mj0+90x9L2xFQyFmyCOeBjIop5knBNRfxeQ55c4yaclovP/Iv/a7O6OnebFO0EFwk0UKhF3yooVc85wOMD17npUrM420i9dOg3lslf3lp6kaTaXBDv8m6kEOoNdRO2xgkrMWPQ/N1Iz6Yx60pZqkm+V226DWVybtzK9r9Sea70+TUbHWZLa8Y2xcxjKbXkkBUse+cKQPQfhS/tNezvyuzF/Zsua3Mrr1/rqMu0sL59XeWC8WHUEEV1GHjADKuzdnqMAj2rSOYP+R+6/L/ADIeA299a+v+RLFf2EGqSaq8N48rWKwqGZAqRbs5UDpkkfkKzeZrltyvuWssk38S3t13KED6Vpf9mQKt7v0kMkLEpwrKQRxxnnr1oqZxFSacXqVDKZyjdSR0ejR2Fhp0YtJ3S3ZnljgkdcRbyWIGBnqx65610/WVUipd0cc6EoTcX0LVsQ+6U5LSNuz6DtWadxzVlYs1RmKm3eCwGB61UdxMfMsUg/exgj/aFaCuZN94esb6bz3DA4xw2BXNWwdKrK8jqo46rSjyxM97DSLN0DCdmjOUCN0NR9RoxtvobfXa877aldm05PL2WsqKoIRnl7c5wAPc/nUPD0I21ehoquIlfbz0HTWthHpMlxMHiyDIsTErnGcZz0rGcMOo2d/QqFWu6qSt2vuZSfb2sluE0jfCrgKqzkt1ODjHTk/nUKnFLZ29TqlKHO06mvp/wTVWKxSD/TnMEsgHmxi5yBgcDPc1EauHc3F3131OZyrN+6k0ttCWOPQboiNbpmZl2bS/bOcfnXT7LDy0uyXUxUNeVfcQXtvoiXHzF2ZjgsZMDP1rir+x5k1Fu/W5tRq4nl6L5FjT9UtZYVtkBiKABVODkfX8a7aU4qNtjGtRkpOT1ua8C3O5NwAjB7d66YxkcdRws7blurMBC/l4b0NVDcTK1xdkMAAST+lagkUr/wARw2K/Z1CGZ+hc/KP8a5auJjB2R2YfAzqLmexgS3rC/jaSOe+YcOigKme2B/jXFWqTb0d3+B306EVTe0fz+80hfQXEKpK62rAYCOAWTPb2rOjOTTUnb8TB0ZRd0rlGbUo4NQEMyG7jlG0iUBQv4Y/nR7N82mvqdEKDnTuvd9Cxda1MYGSxhVNjbMAAgEcYrOSrue9kZQw8E/e1KLabFNp00+s3UBdVJRIcAZ55Pc9cY+tXCFKintc0dWXtEqadvMmtI7HSdNgaK0TzTGCzyMRyR15PFZ169aLtGKJalVm05aX2Mi5iudSkWBLJym/P7ofLj8/85q6Dk4pOJ1qdOmvi+83Vu4dMJsrmxEcRTPK5yDwOR+VFSrVpy+HQ43T9t70ZahoviJI9eOiBnlimJMLM2SmBnH04NdeGqt6dH+BOLwl6PtNmtzrK6zyg2hmAIzzVR3Eznde1G5/tOHTNPtS8jsDLKeFRc85PbvWVeq78qO/CUIcjqTfogurezhcbYXupTlnYE5HpgZ/zivNr1p869mr9zSnObWrsiMXlhaQfbGjkn7jd95PqB159aJVWoqShd+fQapVJy5bpCwS/2vbSmUKszDfErHlQAcE/59K0oxlKL5nqOa9hJW26kOjw2M7bJZIWJPBRTlyOOvHp0xThWpyai9OxeKlVirpMlvNQuop5IbG1htVhYozuMMfdcDp3qasqspNRtGxlTp0+VObbuc/KHt7/APtDUjb+VF8wXH329fpUqHLq9WjvivaQ5IX1Hx6QninVGnbzjZf6zz1fOP8AZB9c9q0jecm7aESxH1Wly/a/rU21QafH5dkWW3QkAMc8dByWB5+v4VXIparb+vQ4V7797f8Aryf5EUNjNr0h8x/uJwGOFb2IK5HXqC1bQwsG+v8AXqJ1/Yx0s/68n+iMvw/ZQz+JbO+ido2geWKSOZgXYhSMYHTBzz3ojh506m2hpUx0KmGcer/DU9BroPMFRgrhj2px3Ezhvstxqms3c5upIooG2lQ2Nx6E8e+etefKHtL3Pc9pGjRirJtkdjf3GmardqkyTyPgBN/TGef1rD3qWkXqXWpQrUotqyNpDPqOI7qVFPO8q/GfQeopqpHmtOWpw6U9YorRJpehMTexMHlJUSmTdx+ZxVe25H8F/NM3ftsSvce3Qa1klxawf2fdfacPtLoBux3JPSiVN1IpLXUPa8k3zxtoPks4olEU99LGQS0rSNhnHJ2j2PFJUofDJvQj2k5O8YpnP3FgdXkk+0xSWsSPwzfcK9u3FVCV9kejGqqMVZp6fMsSeIdH8P2SwW0rvv8AvCBN3PTt8v8A49VuCk9zklTnUleS/r8/wNJdQuZ7Ym1so7YTYZhOCWb3I6D9al4ynTdrHPKg7/FexPp3iaOwkSC5siu87C9up2ggZ5HTkdxXTTxkL2tZGc8DOeqld+Zi+CbuV9YkjmjXzJJ5JWZwQfm3NhfXHQ10yxEZuyMqmAq0KfNL/hvU9DpHMIelOO4mcfJp81lqv/HwIrW6ys204wQPp1Irhn+5vzbHrwrRq0truOwW/h+7sr/7RbQWU0R+YSnO8j0Oe/5j6VCU5x9xryKqYunONpOSfboW7iK31WOMQXAtpo84CkDjuPzrKNOFeCU1ZoyjKdFvS6ZU1mx05dOVJpmNyOELucFvf/61R7SjB8kNzfDVazntoYujauulWdzblokeaQKroGAU+mT36Vs5OVNxs9TpxOG9pOMuy8jVBvzasbqSO4iTAZo1Bk5PQ5rLlnFeX3s5U6d9Lp/gTXPhiO7QSPdMk4H7uSY7mA9CM4reUY9ZEQxjg9I3XkQ6do+kaeDPqFujSMQRvHyg+wPesamJVFXcbmlepVru0NkWdQitbpomgvTauSFClQVYf571hCdOrq48pFN1KaaauZ+oaXePF5dtta3zwYZMtnuW9c10KcJaRs/Q2w9aEdZb+YnhfVof7cttLhikd13B5nOein+ZxXVSkuZWQY+hJ0ZTb+XzO+rrPCI55DFEXAzjtVQ3EzJ1bSF1u03QOBMvKk9PoanEUFVjbqb4TEuhO/QwLqTXdIiTyVjmt4QDJFnDr/iPpmvLjF0XaR6sHhsQ+qb6mVYTyajcR3SqEkOTuVhtUDtgcD6VXNeWqTOupGNKDj0N+wthEix3ypLDOWMcm0MV/Ek9gDUtRoPmaVn2PPq1PaO8NGhyW1/pliVlaC9jEm9U6t1yOMcnvUynUTUoyT8hynSrT2cdDO1XWUsHLPZLFIwyWdcsc+/Sq1e8dTow+GU18V0V7DVhqEe65R442yqssYZm96xnQUXdx+4qrT5H7r/E1YYreeyFot6Z4ZJANk68j6EcjpV0qsZ+5+DOaUpRlzctml0KF5oF01+ryxxOkbAqzTFVPttNdlPDzvsmaLMaUYWu1fy/UkaO7tyWtWjy424ZsAcd/wAaweWVPac63MVjcPLSTLfhnQhY6iLtnjaR3O5kPGdp4H6110sNKD5pdNjLG49VoqMdjsa3POI5wTEQBk+lVF2YmUPIuYWMluGBPVexrTmQCyRfbU2XNowPripnGnNWeo4ylB3TMG48EQyTSMryFJB0VtrD8R1/GuCeBivglY9Onm1VRSaMN9G8VaXcMlpBJcW54CNg7fcc/wCc1lKjOUHCS+461iMLUs27M2fteuwW0bxaHcfakPMnysGHpjPSpp0pxtaOvcycMNJu9RW7amdqo1rVJI2n8OXMpXkEkJt9uDyK1lSnJ3aLw86NFNKqhEi8VRjbbaFFbr03KBux9Salxq9Eac2CfxVG/wAilceHPF15IHYNCEO5dpGQfwqVCa+y2ynicHD4WdNoek6pHYNHqG6aRn3ZlAGOAOMH2rvwl4QfNpqePmFSnVqLkWli1dWMsKgJpwlY9kXj8810qa7nGoJla1sb2fXdNmfT5LaC0eR2JIwSYyo4z7/rSnJWNIpRizq6xJCgAoAKACgAoAKACgAoAKACgAoAKACgAP/Z</field>
+        </record>
+        <record id="oetker_pollo" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Pollo</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APR5bqKF9rZz7CsrPsaqN+qK02s2FsMzziL/AH+KmUlHc0hhqk/hVwh1rT7gZhuBJ/uDd/KhTUtgnhqkPiViX+0bb+8//ftv8Kqz7Mjkfdfeg/tG1/vt/wB+2/wos+zFyPy+9B/aVr/fb/v23+FFn2Ycj8vvQn9p2nH7xuf+mbf4UWfZhyPy+9C/2laf89G/79t/hRZ9mHI+6+9B/aVp/wA9G/79t/hRZ9mHI/L70H9pWv8Afb/v23+FFn2Ycj8vvQf2la/89G/79t/hRZ9mHI+6+9CrqFqxwJG/FGH9KLPswcGu33osAhgCDkHoaCSC5sIJw0jQxNIRgFkBNHKmti41ZRsruxztrHpscCRmPT/tJlRPKuYN0oY8YOR06c9PfpUwdBJXWp3Vfrjk2pPl1d09LfL/AIcbcpp80LKkWmNOxdEitoGWbcOONvTkdTxRJ0GtFqFL65GScpPl6tvS3z/4c3k0y1Cjfbwk45/dj/CnaKOR1qjejf3kqaVaH/lzg/GMUct+gvbTX2n94raVZDraQf8Afpf8KXs0Cr1O7+8F0yyz/wAecH/fsU1Bdgdap/MyY6dpyJue0twMgZMQ6k4Haq5YpbEqrVb0bOA8T67NpmsTWdvaWaJHjDeSOQQDXHVk1JpHvYHCRq0VOUpa+ZnWniu7kkEf2eyJY4DPCMD64qFUkjargadm03956FocNtqOkwXM1rbiVl/eCNflDd8V2UuWcbng4iVSnNxuzQOnWKji2j/75q3GJj7Wp3YgAVQqjAAwAKRL3LMMYeIGrjsQyteafZMDcXUcQ8sZ818AqP8Ae7UnBM0hVnFWTZkWUqTM8+n2IiiPInaElpB69sD6tn2pWinoi5SqSXvS/H9BbHWLiWCK/khj+yXEvlQHGwn0c8ngkH8Oarlt0M7ruaNpc3ep2Ud5YPamCUZR2VzkZx04qWp+Q06XW5ViuNQm1abThe2rTwxrJIq2zYUHpyW60OFS26L56PSL+/8A4BpG2vQvEkO71KnFHLLuiOaHZlG+g1uW3khEmnlXGB8rqQexzk1Mua1m0bUpUVJO0vw/yOE8QeHNZvLwzPDEX2gEpJwffkCuNxaep7WGxlGNOyuULDwlqlpI9xLAH42pg5wT1P8An1pyTcdEQ8TTc9WekeG5baTTPs9lOJvszmKZwDgyDlsZ69eorrpwcYpHjYioqlRyNRohjLN+FNx7syUuxD9KSEx6SlSke4ruOMirT0CxW1aC1u4GsVTzbltrlTlj5YYFhk8LuAIGcZq0luJyexB4s1N10YWForLd6i4toVYYOD95vYAfzqo2uSZ95MI/Dtnc2TATxutnYwbQVilyYyxz94gBsE8Y7c00tQNH7dIfEMGl292iWyWDSh41Uh3VwpB9APQYpW0AxtJvbhF+2wOWvfEF4whLgERwJwHIxzhRwOnzCm1+AE+reINTj8mzsUK3FxeCGNptu8qFDOxAGMDn356cVDtrfsVFEKXepza5c2DakfJtoxPdTCJQI85wijnqBkk54FZcicb2Nb2ZFaapq0vhuxnIjfUNVusQIyACOLJPT0CrnPvWnsYJvyIdRmgmr3NmmvPNNG8GnovlyJGF/elclB1zyVHPrVRgtLEybZT0+1ewjtdFt1BvhbC4uJto8wO5OEBHP3skk9APcU5JPUFOS0udPdD7Kq4kZ9xwqtyfzrnqKyNKb5mMHQU0Q9yC6lkUDYhYxkPkAmhvQuEbjhfx2zXE6qJRKRJlXXPCgYwSPT9abmrXEqbvY5631u1fVW1W/ilknA2QRqBsgTvjnknufwrneNhayTOtZfU7oisrmK1hiS7inDW91Ldw7QrBkYE5PzDBAbPt71q8Uuz2MVhZXtdb+ZaGo6fLcCaZbp5J7M2luI1jXbGTgkfN94nv7dOtL65HTR6jeCnrqtPX/Ir2+taRarZ3Ijud9lGbZJfJXbtIA2gbuvGc59aTxsLXsylgKl7XQv8AaOlf2pa6ssN/IqxmCGPy1I3uxJf72dxwR+dT9ci47PVh9Tmna60K0up6VLJqsrtfRwahCpnRYk4wvlght3Tpx6/iKpY2CS0egfUqj6ot2eqaWmpWV273b/ZbUrDF5KqqggAsPm4+VcYqvrkNrMn6lU8iFrjSPsU9jLcXWHvDdEPAOW3hsN83zDjHbih42CfUawNVq6sbulta3U93qNpdSL9p2pOHUBiyg4KnPAw2Pw4xVRxEZxujKph5U5WZclcXF0CWysY4wepNZSldlxjyokHStUYMvWZUQYxyTzirhsSyOa0tpwymJQWGCQMGhwTQ4zaZhyeErCMFmll2jvvA/pXM8HT8zsWPqvoiNtE06QFg97ISnl5TbjGMYyR6VLpUl1Y1iKnZb/11MeW20xZolU3gJHlI5ZMHjG0fJ1xUcsG9L/h/kaSqThH3ravz/wAyvf6Xb2dq6s9wI5HACOUADcnOMe55rP2d42aa8tCliGpX0fmrjIdPjjtYpTetI0HMa27qcckjsffrWKSUrNvTXyNXXU27JalCG7shbmR/PaKTMW4NGVwGzg/LxyM1sqWtr9P66GH12Pbr/XU2dNtNNvrSK4S/lUbDGBtQ4A4IOB/OnyRW7KVeUlovzCz0zS9VuisV9O0ikh8gc46fQUKipu9y6ledCyaRr2cdpppksUdtxO/MyHngDg4xVxioaGMpSq+8W4zKn+qh6/xf/WqkmS1Hqy4M4Ga6UcTLMM2yEjoM81cdiWUrrVvIV3jgkuGQZ8tOWNZVcRGG5rGg2rmB/b+p63HutoF2M5Up08vGT8xPTp+dY1ql07vQ1VOUYqStqQWnjSW187T7y3Mk0chUybgij/ZHXPQ06bjyK3UwlKV9SrYmw1c3G2c2qgbowZOYiO/P1P51nP8Adpvodnt/bRSe5h30No99Fb/21JJbkjzZn5K844we/P5mopylVTbjY0hiFh48m9zr0uPD9rbQw208fltwqKg+Y9Bk0nGLet2ZpyjqrI5jZBa30NlFPbNDGuxxLHu3yH+ID6d/r603S5ldNpg69rJpWI4rdv7TjsLK6JAb95OMjC5yTjpjjGaunBJ3ZeJxE6j5VoaVvNphvX8qJFkt+F2ttEnbqf8APHvWdBSu+Z3NMVCdOmvP7/QNY1cELaxwlZ1XJZZW2qBgfeIAP/166/ZxOBV5wZp+EtaufKl+2l2iQgAFcbR6j8KylWhRkk9maJOvG/U6jIPI6V0nMFxcRWtiZHYKWO0Me3vSnPliXSpucrGIsenXiM7ao67mys0TiMjjHp2+tcSqc17rQ6q1KporNW6FKGK7sBIunagt3GCWDMgP1AIBolXS0egqdBRtzXGXFxpuowql1ok0OcF51hxtx/tYz/8ArocpxjdIJUIN/Eija6LBcXRENmhjBOZJWZS4POMDGKpV24pNWZn7Dlk3dNF2+Gg6VGVvdMtUQgAGNQ56+/vURrTdRprTp3NoYTnimnr5mdaajYXs6C183Kr8iKAqAc9sf0NZzi3dO+p0+yUVutCK2gm17Uti26R28M2HmZhmR8H7uB0A/pWqg4U0kzGMoKbbjsjXn0WOO7a3s5RFe3BC+cyBvkweMdO3pShOftFF7GdWzi5LS5Us9MfSWlMscVxd79okjRiD3PYnPI6A9PwrSVGE9L9ejCeJqSjHm1siFdH/ALWvQkU7RSIeVGHB47jhgP8AgNaU6ai92GJkp01ovXb/AIH4j7Lwv5NxPBNfMl3GC5tw20OCflbPcf54pVoyW6RjQcVJas7aIFYUBOSFAzW62MZbsyvEckgtoxHIq7AzbXHD8EEZ+lY1XqkdWG0jJnJ6fr9/p6/ZYRCsTvl49u8dskn3HpTsoqyMZ151ppzZrwa9ZaqyQalHDaNF/q2QbR/+quapNztdaHoTwqpP3ZXb8yv4mjvIFX7DI80U6bG2NuYZ7ge/rg1pSaa1OKtzdChpaXNg0U94JY0fP+rBJI5xnGO/aidSnexeGwtWSbTS9R02q6YdWTTruzltkmXK3LzkSlv9r0/OrlyxjzJbGSc3LlK9ppRS/kgtbd7tYjvmlibkZ6KCSevXoOAaylUU6alHqb0Vyy5ZOx00M1y0EUosBaNuxidlVWz3+XmsmpWRtaF3rcr3mtppyySXElv9obH35PKXbyBtJ59+Aa1pRldsyqShpG9kjLj1+IwJK8yXELHkiDchbPXc+MemQKinCUJNX/U3moOF0vnex0WjX1sLlQbCSN25+V2kVeM85GB+ddcKsb6nFOnK2jINSgudR8VmeO0kltIrcJuA2hzkk4J443VvOrFJHPGLTOjTAjXAIGBwakCjrcE02nnyoUmByrRuPvemPTvWNdPlujpwkoKdpOxlQatpujWNvb+RDceUcklP9Wc9Oc4IyfSuDDTjzSnyvmff9P8AgHU8HKo9NEWr6y0rWovtMrQsJF2h0Ytj04z1/CrqTlJp3sYKHLeNjDmI0aXy/uoT+7l2urtnkgY4xVQpzc+bZdhzrJK0ndl2K5uY5mLXFpHaYyjSctn06frVxp83Uc6sUthdYlsbjTpIrmVJS65V0YMVB4ztyKc4OCvZtmdOfO+XRGfa/atP0iOy0u0VkkX95MTgye5Awf1rNVHNXat5GsaUYPco3djqTac4jvHRo8J5MLeUV9s9SMfWiNWCmlfVlTTcbJHOX/htbG8L3Pn+YyhipO4E4PBP4da7FKTRxSiuZKzdzotP8Qaemlvp2oaULKFU2qqHcCD74rjqxnzJx1O1JxXvaFvQdXlbT/ItbyCG3iYqCqNKxJzgYAP8+1a+ym3q7Eyq0Uk7Xf4HTLry27+Us8c00o3BSxUj8D09cdq2nKUI3OaEY1JWNSJi8KMSCWUEkdDWid0ZSVpMfvjZTBJ0f1q4pNWJ1Tucnreh3Ft5nkQCRZjkOc5D9j/THeuKrSdN33R6dHEqrDlbs7HMwpc6RM1zcESBG3kIwwGz3HXPH04odRWVjOlgakpWbsjsLLVYNTsIri/a3EZbMYYDggnnnoeO1ZvEc03FPYmeHUHbc52/uLxdcljsklmDMZUeGM4K+49uRn2reCW5zVOdOxmWtvDPrXnXtveNcHDiKFXfaB1zycVFWpO3u2ZpCi07yuvkdTd6nNpkaCPTJMImRK+cIp7H3FYS5r6HXTjCSu5FKLxxZSahFby6dEqZJed2yRnv04raKtH4R1KMOW6qr0NLUdK0/WZIrl0t2CgCMFScD88d6zqVJSVk7GUIqErtO6M6ystGN/caXFBLcKD+9kVzsjDdjz0xW1CDlEnEVpuWvYBoVnpV9L5CzvAyfuVhwhj55BPBJ6Yz+OaeIWIsuRGVGFNvWVhLDRZt4k8vyzJgvgKC/HcjtUSo1pux2+2w9GPu2bO3gXbBGvTCgcfSutKyseZJ3bYk6eYNuD9RVxJZELq4jTypomlj6Ahc1V0KxmajoEGoxsYgyEjowxXLUwsHrF2OyhjalLR6o5uXRtYsruELbPJbwn5DEORWKozptyS1Oh1qFbd2N2W4vba0by9KknAQhVQbScnvxn1qVVlJ2cX9zJhRpX0mkchbrqdhq7ajBpd6oYENbi2kIOevOMdhV+zbidU6sXHklJPzNa91LX57NmfTbpFcY2R27Fj9eM/yrJ0qknZmcFQi9GvmzPt9BjGjrA2k3rtu3P8AuHjZ+fbjp7026yq31t2sZ/VqNrOUfW5Pe6FBLpypa6DdQT5yMiUkfXt+tVzVG/hCKpwfx3S8zS8OaHe20NwLm2YGfbnf8vTPXqe9dOHUo3urHPjKlObXKacuniNNxtGOeyF2/kK6bo4+UpSieOKUW2l3kcrRlUcK3ykjj/GjmRcIK+50umxvDpdpFJnekKK27rkKM5rIJbss0CCgAoAKACgAoAKACgAoAKACgAoAKAAA/9k=</field>
+        </record>
+        <record id="oetker_prosciutto" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Prosciutto</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSZplgjLsCR6DrWRpFXZSl1q3hQvMjxIOrSOij8y1J6LX9DeGGnN2jr8n/kVI/F+kSyeWtzHu95owPzLVCqxZvLK8Sldxf3P/IujVoyMi3m5/3f/iq0s/6a/wAzm9g+/wCD/wAhf7Vj/wCfeb/x3/4qiz/pr/MPYPv+D/yD+1Y/+feb/wAd/wDiqLP+mv8AMPYPv+D/AMg/tWP/AJ4Tf+O//FUa/wBNf5h7B9/wf+Qf2rF/zxl/Nf8A4qjX+mv8w9g+/wCD/wAg/taL/njL+a//ABVGv9Nf5h7CX9J/5B/asX/PGX81/wDiqNf6a/zD2D7/AIP/ACD+1Yv+eMv5r/8AFUa/01/mHsH3/B/5D4dRimlWMRupb1K/0NGv9WFKi4q/6P8AyLdBkQ3MSTRhJFVlJ6MMiqik2NScdUc3qcGn2Orx3V5BFFa7FUTPbCVEIZtwIwduQRzjt7UpezhK8o6WPQoPEVqXLTm+a7ur2bWn3210IDqVh5EJnmto4pA5QyacreZhtu3AGck8j2qvbYbrEaweOu+WbbVr691f/hzV0bToBavIbFYEkkLRxPGFKjA/h/hyQTjtmphGNm7W1MMXWm5pc/M0rN33f9aXNWPT4D0togPUoKrlT6HM6s/5mSHT7YdbeP8A74FPkj2F7Wfdjks7YH/j3i/74FHJHsL2s+7J5ILOGHfJBEFyBnYOpIA/U0NRSHGVSTsmzyjxb4j1Ky8QXVpBMiRRMNm2NRkEA+nvXm1pS52rn1uXYTDyw0ZyV2/Nmdp3izWLuYQR36Iy/NuMCv07EYpRnOGr2FicJhpxfJo/X/gns9tFazW8c3kR4dQw+Qd69KKTSdj5Scpxk1d6CSpbqPkijVuxCgGlLlFzTe7ZHUiEIBKg+tVDcTFkjiEbGQqEA5LdMVoCvfQ56S7jm1E2mhWMdw0P+uuUhzHESMhQRgFsc9RgEfSjlilexq51JXUpfe2RLeapLq11ZxTeUmnQia7kmKbQx5VPlXgYBJ5zgjmqSdr23Mnyrrc1dL1C81oSCEtaGJY2bzLYkHegfCknnAIB461E4SXVDjKHb8StdSX0PiKy0g6xcSTXcckpEdtGFiRMctnnknAxSVKTi3zfka+2pWt7Nfe/8zbXT7lEx9vJb+8YxS5X3M+eN/hX4lC/03U54ZIv7dxG4wVa1Q/rwaicXazkb0a9OLT9mtPNnDa94E1PULppmvYZWIALiIrn9TzXE6TTvue3RzSmqXJy2+f/AACpYeAbnQ7WW7unY2wPm3LhACsagnAGT7/pWkqM6tlbQ5KeOpUnJ9eh6Poer2us6dbTo32dpYg4tnOHVSOOPpXa4pO19jyWpW5rF+URqML19ah2ROrI6QEU5KoCOuaqG4Mrm5tYbNby4hadsgKmN7M+cAKDxnP0961UeZicmiOG7Hh3Tr27vY1jtt8l3JIZBuG75tpA6kH5Rg4OB9KtrnaSJOY8LzBor1fEIKnUYH1m4iHHybiux+5UKE44HJBzWlRbcvTQRNBqepx+FdFkuru6+0X+qwNd/Mw2RTOSsat2wpTgHp9aOWLk/JfkA27u5LfWdW1e0d5Lszw6JprSOTh+DIxHcBmz6ZShK6SfqwJfEt7q8EZ0bT7x4pbq5hs4ZfNZ5CeXkkLHGPkxkD1GD2qI8u7GkMl3R+INQW41C9/s/S7Rbm9Y3LgySEMVUYI2qFBOFxkkZzWaheK0V2y3Kz0GaaurtYeGtIk1G5XUL521C+l8wl0hHzbPYEsi46cHitHGK5nbRaEXbIZrmXVvDE1hFdXDx69q5trHzJmdlt1IEjZJJK4SQ4PHzCrStK/ZCNvRR/bmoTXByNMs7l7a1jZ8oyxgqcAn5iWycnoFAHU1nNJKzHFtPQ2mZFvTBEDsVRnLE4P41ySa5rI31cLsmpmZXvN/k/uxuYsAAKqG4GbtubfAnjZWil82JimVyQQRx7E/nVKTTZTinsYmvXsmo6jb217CklpGyyC23MFkfPBc4BIHXGMeuauNTl2O7DZdGrT53Ir301zd+IF1A2sE8EllNYXEIkYBoyQx5x74pxqNRt53HLL4XTu/w6l0aiG+yyS6ckhtgtwkb3DlQ4GA2DwWC8j2GR0qfaS1KWW0usnvYfb3sDhVi02BTPO1yuZn+STcWLD0ywzx1+lHtJMJ5bShe8np5Dm1JJbyzvm0yAz2wkaBjM/y7h85x0JI4zye1T7SVrdweXUk37z08iOW/huby4mm0uBnu4UjnBmkCSKflGR90kBuvX3pqpJIr+zKX8z69ul/8h9pq0cWofbotNgS7ZFtTI8sjHaTuA5z36nrx9KHUlawnllJa3ezfTp8yrHd2VnZ2hh0qFY7VybfbcS7o8h1IBznbgtx056UOtIqOVU5StzP+v8AhzodMnsls1uoLUwNMzSsibigdjyQDwCe+PU1lOu2cNXCqnVcexatPmLSFfmkYsSf5VlB3Yqisi3WpgKp2yKcZ5qo7iZJJJt4YDn3rQko3GlWN43nS26M2MbiuaLG1PE1aatGTRju2jxXbW0dlbzSqcFTgEfhXPUrwjotWdcJYuUeZykkU7y8sYLgQtZWcRPUrFuCj3zXP7arJ9F+J0Q9ry355feT2dnp91LMHmhzG4BURKMEgEL09DVe0nd3exM61aKVr7d2VF0qW0imku1hB3HDbRsXPT34+lc/1iyu2bvEOTSjJ/qMjtNyF4zHKqj52a3UBTj6cD61NOvOorqQ3Xknrf72XrRdOuZRFDZ28/XcyJkZHYHoT/KuiNVt23MKlStBXcmvmRNHZxySxiyRmi6nyywz2BwKj26V9TTnrNJ82/mW7S+jkEdq1tLasU3Ir/KmP8faqU09znknrK9/zNSC0uI5FeSQlV7dK2jSknc5qlWDi0kXK1OcZI5QBh61UNxMqXl4Yhk8e5/pTq1FTjdlU6bm7IzG1e4uPl8x4UVgeOAQO2f8ivPq1q0tVpqd8cLCC7uxMIrIiTU3uVDSDkxgYOOKUavVvViftNIKOxVkWymYyk/bAzAgsoYRkcZB9sVCU03Jtsu0rW2sLKvlRFgIw27oWCBif6960jiItbajjFtmZqEmpRqHaG3kij/1gywWM9sev19c1yunCpJttaHTQjS21uwhnc6fJaxybFLFpJCfkOeg7Egc9K2jyx0S0CdO0ubr07m1p9pEbK3itr0oEUhio+Z89SSfeiVS9lsclSTUm3G5UvMwXsVs7+XAq7tqfx9st61FOUVUszWHv03Jb3Kl5q8U5+wQZkY/3s7QPr2qq9pR90cKDh70ifw94iv01NdF1AB0kTEMrMN29eox3GBmtsLXk/dZli8LB0/aR+Z1ldh5oAAsMjoc1UdxM5a7uBea8gaU7OcKCPkA9uuSf0rzalX2tQ9SnB06O3zK99Kq3H2a1wrRvwsinaeOeR/Km51IvRXNqUbxvI0jYzTaagMkYlbBPlj5COuP5flSc3KSaRzKooze9vxMu7hnudOH2CVo1UlzIjYY+3P405SqNe6rI3jywnaQj6bJbyvdXty89ptyskh+42BkUoRSu5fea/WOdKMFZ+Raa+vNVsJGtYpLb5QIZXxliOp244B6CoqNTaaVjKMKdGfvNPuZ89rNa25UXAa9f/WlsttfHAPtnFOUo09L6m8JKbu4+7+hFfwagJI0hmRTEi75N+3Dd+Owo+JttlUpw5dtya2d7wHbNHcLktM6tuAxwMjDfqv4mtUlZNf1+f5HLVi6ctrf18vzLmj6VHqE8jtEY3MXy3Gzg56dDg/QqDW8KSqLVf1/XkYVq8qa0fXb/h9fxZneHIY5fEiy3jzSX1rNLAQABECuVLDvyBUwwjpyvcdXH+0ouCilc76ug88a7bUJ9j/KhAcb5N1Nq00loqeXHk+bICBzzjjqa8yF0/dR7LlCNJKXUuw6HcSTGSXVVD7v9WI+x/HitIqb6mU8TFLSBo3FzFpcMSDb5RAiG7JPoBWfO4uyRjCm6rffcoWZgZjbSTukMuVA3DoR6irp860b0OiqnbmSV0XINLFkQ0tw10qKdu89vp0rWM6cHqc860qmytcqzaxDDcRTfY55mLERIgLBcDqQO/auZ1kpXir9jeGFlKLXMl3MK58TR29xNNdJDAXK4WeQBwB6oMtn8KhU6knqjp+rx5UlJv0/qxi33idWLMLe4vBIdwwPJReAOvJI/KtI0ov4maRhJW5Ul+LM5LjULWaCWzgtrETuAXhQvIAe+5iSPqMVspRhsFSnKr8TbPSNE1RrWMC6v47xiMGUqoIHuR1/GrhiZxV5anl18LfVKxkaFZ/2X4gSObUC813cyzEKvyuzBmK59s/p2pwxXtZ2s/67kfVpRpOWn9Pod1XScgh54PSqjuJ7HPSPNZXjxpbxKrERozE4wfbtXFKHs5ONt9j0YNVoJ3d1uZ0urq+oSQb0LbsYiYHaPfnrRGoktjdYd8if5ktheROJY7gMInlOwFclPQk5/wAetZpXbZNWnNNNW2FWxunlEMKIZBn5nfAI7HGKU583upBzxS5m2Wri11JgsjxnKja3lH7w+lTQut0Sp00rJmVfaRf6ygtba8ljTd+/Qsygjj0PXrVSqLm900hOFL3pL0KF74M0/TnjM11awRISULgln6f571LqWZvRxEqi0i2/yNqyisjbGRo1e3ij+Z0A+bnpj3z+lKcZVNWtDnnzKfKt2y1e/wBi3OmSOxVVCZQ7MMmCMfhntSaUFcimq8anzOclks9O0l7pt+QmVxGcZ9z0rRVYuOh2L2k520IfD92NR8YadFakzW9iHZpyzEEtGRxn/PWnQ92aQsXBRw0m93/memV3ngkc7MkRZOo5qobiZWaGDU4iMhXHY/56U6tKNSNmOFSVOV0Ycun/ANkebLbRoGKkeW3GT2w3ccnivNrUqlKPdHpUsRGu0paHKza/q+lxnzbAA7+DImMcdc9D/nmlCppZM9F4alU1TudtoV7aRWUUzyhmuE3+c7cuT1AB7VUZQp6N6s8mvCpKTVtip4htptQ1a3NvfSW7QJ91GIyCevH0qlFSlqbYeoqdFpxvdjPNayvlBuGIjQtNKRzknge+cGqlGEb32Hd1I7eiH6pd2OpaWqXqqsm7dGp657D64rieIV9FsFKE6U/dehnQWtxcWUlqtw1vu5VEIzwe+ccZPP8AOtY15TXY0qNU581rkxdY7Mx6hPbskciiQoS3PUKQAcdq6IUp1o9Dnq14U3dJ6oxNVjg1QrA17FBabgWSKNsk9D/nFCy+S1TVyqeZU4LZtm/4WsdL08Q/ZblG3yMiZ+Xc20kgA8ngZ+lb0sMqSu3dvdnLiMVKu79Dr6s5xkys0RC9acXZgyk1nNuDxnY47g1pzoVh6pdOpS4iRwe+RRzoViCbRopRtCgKf4HAZfyNYToUZa2NoV6kNmVJdClEeyNIiBwuz5MfhXFUwF3dSOmONfVFWbQL6aJk3uC2PmZwSMD8Kz+qVr7o1hjKSd7Gbb+C9atJ/Nh1Yn/rsgf19T71r9XqPojZ5hh5LWH3MD4V8UFWQ6yOf41iUN/Pij6vNPRIFj8Kl/Df3k48NauqQqX850j8tpZZBlhnPvWcsJVnu0kZyx1K7aiaWneH5reF45FiQOdxCncScY5J9q78LT9jFpu5w4mu6zTtsSXOl3S8W8ETk87m2gZ6dMeldPOjBRRXtdG1FtYsbm5igSK0Z3Gx+clCvTHvUymmrI1i4xi0up01ZmYUAFABQAUAFABQAUAFABQAUAFABQAUAAD/2Q==</field>
+        </record>
+        <record id="oetker_4formaggi" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Quattro Formaggi</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSZpkgjMkhIUeik/oKyNIq7sQLqdqxwrSk+ghf/AApXt0f3Mv2UvL71/mImrWcjFUkdmHUCJyf5UlNMp4aoldr8UH9q2f8Aff8A79P/AIVWvZ/cyfZS8vvX+Yv9qWn99/8Av0/+FGvZ/cw9lLy+9f5h/alp/ff/AL9P/hRr2f3MPZS7r71/mH9qWn99/wDv0/8AhRr2f3MPZS7r71/mH9p2n99/+/T/AOFGvZ/cw9k+6+9f5h/adp/ff/v0/wDhRr2f3MPZPuvvX+Yf2naf3pP+/T/4Ua9n9zD2T7r71/mH9p2v99/+/T/4Ua9n9zD2T7r71/mPivreaQRozFj0zGw/mKNezE4NLp96LFBBBeQieDy2zgnsxH8qqKuxqTi7o5i7s7Q62lreOpgkRdqXNw6I/J3Y+YAt04PtSlCk5NTb201PQpVcQqPNSSum7tJXW1um25WjtNEcI4sdJRCjSCTz3iJUNt3Bs9jx1o9ng31KdfNU7avW1t+l9vQ1dGso57LzN87xl2MbPK+Sv4nOOuM9sUU4prd2McXUnGdmop2V7JbmpFpcDHhZD7+a3+NVyp9zmdaS7fciX+ybcdQ/4SN/jRyIXt5eX3IemmWufuP/AN/G/wAaOReYPET8vuROdMsUj3OhHIAJkbqenehxSBVpv/hkea+IvFt1pusXFlBbQqsD7clnOfT+KuCpWmptI+mwWWUqlCM5N6ry/wAirZeN764dY1tLRiDljJI6grnnB3cGlHEST1DE5XTjC8G/uX+R6nHpljJGsgRirDI/eN0/OvQUU1c+ZlVmnbT7kDWNpCQ8UZDDoS7H+ZpSSSE6spaO33IKkkQqGwD61UNxMr3emW17CYrmBJkP8LrkVpJKSs0XSrTpyvFtM52+XSLbUI9PgskvLmEbvLZmZYAemfvcnsACe/HWp9jTSu/8zoWLxMr2lvvsvxJl1i9N9PbQ2wmWyhE11mIx7AeVUFm6kAnkdAPXjRRTinZ6s5no9zWstWm1Tzl01LZjAVWTzJG+UlQwBwPQjvUTjUj0QR9n1bIZb7Vo9Yt9LkuNOW4uUeRI1hlY7Vxkk5wOvekoVXG+n9fM0csN2l96/wAjVWDUlTJa1L/8CApWnboZ3p32f9fIo6jH4gmtnhU6dg4Knc6kEHIPfuKiam42ujoozw8ZJ2l+B5r4j8L67e6jLcNaxh5MbikuQTjGecelcDhJS1PosPj6CocibXy/yKmleE9Q0799qCiGF33S3B6RRqMn355/IVcqcqjikjmhjKcOaTldpaI9i027i1LTbe7spAbaWMNGcEErjjg9K9BxcXbsfOyet2Syoq/xbmzUSVgu2R0gIrhzHFuHUGqhuDKxuLT7F9rv53MGASASBzxjC8sc8Y5zWqjzML8uxHpL2nh7TL2S5h8hBNPdSShAq+WWLL+ITauOvFXJczSXoQ23qzm/DE41DTdTfWHNq2oqdUulH3ntmLKqZ/hAWPnvhuozW9VWa5emnzJRcstc1GLQNCllligutV1CJbnyo0DRRyBjGMYxkqqDJGcVLpx5pdkh3IZtQmtfEGq64shubmOSHRdPVgAskpwz546Bmycf3DzTUU4KPzYi14g8Q6zYwnT7ElruW5itIppgm5nPzOwVQQF2c88jPSohCD1e1rlJNkD3+q/21fW0uqsLXT7cXV3MIUAQkErGoIPGAWJOT0HFZ+zjKCdtW7L/ADNeblYllqGtz2Ph20kkiOo6mXurgvEpEVuATjH/AAJB65zzVujSTk7aL8yPay7kN5qF5rPg+XTxdmQ6rqrWFnMEVWkgDYdiAMYAWTkAdq0hCMJp22V/mQ22a2iBdS1OZrJPJsLOZrUNEoQyhAVLMwAyd+AAOyknqKxqQilru9S1UltfQ2WcLeGAO0m0ZLED8uK5ZaSsabwuS0EFa/cx2pZV3HI4qobjSuY8NwY1jjnVVe2n81Y3OzcCpHGe43E/gOlWppNoqUL7GB4n8Qrquo/2RNaTtYQKJ7mOKRN04GMKTnAXOM4yT7V34fD3hzprXRHNOfLLlsUL/W0u9buZpNMuksrvSTYPHDJHvXMhAIGfUkfhVxw7jFLmW9+vYTqp9DSPiW1upLSSfTL9obKYXCwfukHmqrKGPOcDa2B6jvij6q1f3lr6k+18hkGt6bFFEq6XfFo703duZZIvlkkLP6jdnJGfQe1Dw8v5ltbr0D2nkSXPiOw/tOy1abStQLWsbyxjzIyrmQcueck7R26DtUrCtpxUlr69B+2trZjbzVbG9u9Til0jUwNUQR3EKyxAEqrKGBznop9srTjQaSfMtPUHV12ZLD4ns4tXbUjpGqyzy2i2yAtHhI9yn5QOmS6fp6Gk8K+W3NHfz/roL2vkyhaa7pNhb6X5djqX/ErR/IcvDnYVYN09s/MOc5rR4acm/eWvqL2y7M7DQJdOh0eCWxmeK2lLTx28rr+6LksRx7sepPWvMxNRwm4u11odVKHMky3aEO7THJaRi30HauWMrs3qK0bF2tDAVSocFgCAaqO4mLOInGJYgR/tLmtBXsc/qPg7StTu3vJBKjyKFbZKVUgYI6e4H5V0U8VUpx5VYiUIyd2Z0mg6JC/lySX8rFhwty/J7ck+5pSx0o9vuNI4XmIpNJsdjrBp98dz5y12SSec88Huc89zXPPNZp6JP5G0MDHrKxG/hRnKYtJ1Ctkbrt8rjOCPfk/maf8AaOK6RX3C+rYbrJkcfhYOfLuo50hwFCNcPwB074x6CsHnOIhL3opfIt4LDuPutsfH4ftGYtFHfuQ2dwuXUZ5yQSeep/M1cM2rzWkV9wngqUd3+JHFpWnrMsVzbapD/wA82W8LjJ4PQ5FV/adZbxX3IbwVK3uyv96Ita8P2UbRx2l+SpcCWOW6c7lwRgY744+lZzzaspaOP3FUMDTknzRl95padqttb2yaf5TQLbqEA+8B6ZNck8S6knKW7OuOEUIrl2N+y+0O8bfL5PUFeQeK0ppuz6HNX5En3NGtzkGvIYl3jtVQ3Eyhd33l8nPHJJ6AVo3ZDjByZHFqzXWyC0KfOcFyvX6VySxPNJRidH1fkTciZ9Mg3DzpGduvHH/1609gurI+sSWyGmxNrmeOQKoOdhUfzrkrYWUHzQdi41lPSSJba93hZGCgZ+bsT74rehiFOCbM6tJxlZFPUdRDMwMirGvTnkn2rlxc3P0RvQp29TOuPFNpbQeUpVZyAu0HgH0Bq4Y2LXKlr+Bf1Go3foNsL1DdE3bAXDr3cbYuOg9/Wo9vzVOV9glRahdbF6wtIbZMrErPI26R35z/AJHaujD0IQglYxr1pTe+xLfWNpeW7x7IkcHIYYG0062GhOLSSTFRxE4SvdmfoOpywaqNJkKEOhbbnlGGc8dcHFYYack+W+h1YqlGVP2iOortPODaHIBGeelVHcTMPVFF9dPZQY/djLngjcemR3A6/lWNepd8qOqhHkjzvqRWMP2GAW0CDZAM+ay7EGO/PFckqE3L3TWdRS96T3HRJdsTMJ1EbHIZZN4P0POO1XD20Pi2/r1Il7KWwtrbf2jP50tw4MJA2J8xB7c9PfpVxoe2d3JhKp7JWS3Lt7pFtMgWQuGb+6/P51pLBUpGUMVUizn7uCysbZlVf4sZdiSfxrz8RBQ93zO6lUnUdy9pVgBJHeXEDCUfLCjjJVcdT3yefwrsw1FxSlLc5cRXbvFPQbqukpqE5uEMUsa53RtwQynsQP50sVh+d8yHhsTyR5SLSryRrUl2kVtzFVY4wAeMZ/oaMPX91X3CvRtLQ0LeS5vEeKGaIuF3AHGD/PA9xmuiSlNNRdjCyjq0Ymh3qatrFlcNFFazwTTK8YPzNhWBGB07HPtWUac4z1XzN/bRdGSvv/mdrW5yAHEeXPYE047iZxs2rS2q5Wyu5prh3DGJBwATyST3z7Vw3Uo36s9VUU3bmSSOgjuo44d0pSKNQMqRtAJ7Dse/Su11FGN5HnezblZaj7y/tobbZBE1y0ny7UHf3z0FZTxNOUbLW5dOhLm1drFKxfUH8xbZYkRTnznJK5xzj1+tZ0HUastu5tWVJWcr+hNPbaqqFjexOGbIITH9elXNYhbNMzjKg+jRzGo3djpl/BJqUxlAOfKVeWbqDj0z3rjS/e80uh30qU6tNqmvmbC+I4ZIftFuGMbnG4gADHvXTPFP7KZy/U3F2kZWpa7Lapugd9mceYkXmH8ckLz9TWU601q2b0cNCenX7v8AMgs73WNUilbT7IYkYgiTDKfUleFH45rGjKTnaCv+RrWp06dlKVrff/mdHpNxeabAVvdNjj+QEm0+6Mf7Of5V6EKk6a96Onl/kedVjCpL3ZN+v+Zg+DbPUI79Z5hARJNLLKTneNwY4HbgkA04YiNW/KRKi6S1O8qzIRunPT3qobiexxb3l9pmuSW10jSWUrkwyIPmQ4zg8dDXDWilNp6dT04RhVoprdbmrJbf2jJFtYRyhsjaM/KR/wDWqJS9pJQvr+hnCXsk30L09nHJbtZpdPGT1KuCxPvmut4eHJy3sc8a7U+ayZHjVbOHy/3cwU5zjAI9D6VnevSVrXRf7io76opXupNLcwIxlEq/MVVgE+hOaiONT3TuP6rpdNWM2axlmvWvL21VQgHzRxq5P0YjI69qzcm5OTjZfedEajjDljL9C3DY2TuZZo3mGfld/m49zk11RjTtc5ZTqXsTTzwXES2yBfJZgsqYztHbjFZYmacLLa5dBOMnLr0L1ncWlpALSEGDZgbSM9f/ANda0JwjFRRlWU5y5nrcralqclkpWGMStNkAjgr7/wA6nF13TjZdS8NQVSV27WMfw7c3N34nYByltbBkYbAPMkwf0A5/KubDNqSTO7GQhGh5v8EdvXoHkEN1IYrdnAztxx+NVDcTMzUNMTW7TdAwEi8jPY+9TiKCqxtez6GuHxDoyv0MefUdRsg1tbRqtyijc5iIGM/U5A9a8+lz0pWloz0FClVXNfTtcuaRqk10Fln8v5ud6qDu9+pNdEsUofEc1TDcrdifUNUiRpfIllcqcHCkg5/pUzxVPlbi7k06Em1dWItNtR5hed0aV/mKKeWHpjt25rnoU5ydna2/m/KxtWqJLRM0nhjt41aSNMk9P7vtXoKlCK2ONzlJ7lK8jtbpQimS3ycK0R2kf4is54enJ3Wnoa0604b2fqYNxbYmaJ7pmlQ/KxYEge4FeTiKU1USbuj0aVRON1GxfgS2NuzxzDJbDEyHG7HOM/yr0MPQ543iclaryySkc9fQ6nc3arBIsNuDtAeYH15/Oqng6jXf5nTQxeFhHXf0Ok8M6YtnNG4lV8ls4bIyQcn61eHwrpJylu/6scWLxXt5abI6qtzlIrlWaBgoyT2pxdmJmd9luoX8y3Uqe69jWvMhWHS27X8RjurRlOMblNTNU5xs9SoylB3Rz8/hG9s940u5dVc5IDbWGeuDXDVwfWEvkz0qWZJpKpG/mZ0tj4whmfybYSxKflRwgJ9+OP0rNUprRx/yNnVwsuv5k1nc+JrcPJN4ala4ByjRtGFb681apSTujOf1aWinoJJqXjSSY50KZY+wRlGPc889q1vVI9ng9PeIvK8Z3ZjVdONuwPzO5Ugg+2cisZe2XdnRFYFXvIy7nw14smk8gWiBQ+7zgoBJ/OojTk1flZv9aw0dVL8zqNA8OX9ppjW97GsjGUyfOfUAdvpXfhrwhaXc8jH1oV6icV0LN1pTRYCaYJSeyA4H45ro513ORQRHY6feSa9p07afJawWnmsckbSWTaOMn3/OonJNGiSjFo6ysiQoAKACgAoAKACgAoAKACgAoAKACgAoAP/Z</field>
+        </record>
+        <record id="oetker_speciale" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Speciale</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APS3dY0LscAdcDNZGiV2VxqNsTgM5PtE3+FK5fsZeX3oRdUs3YqsjMw6gRsT/KlzIp4aoldr8UL/AGja/wB9/wDv23+FO5PspeX3oP7Rtf77/wDftv8ACi4exl5feg/tG2/vv/37b/Ci4eyl5fehf7Qtv7z/APftv8KLh7KXl96D+0Lb+8//AH7b/Ci4eyl5feg/tC2/vP8A9+2/wouHspeX3oP7Qtv7z/8Aftv8KL+oeyl5feg/tC2/vN/37b/Cj7w9lLy+9Do7yCVwiMxY9MoR/MUxOm0r6feiegghuoRPAY2LYOM7WKn8xTjuNS5Xc5m+sbL+2ora7k/cSRrtSe6dEc7jv53DJA28f/XIcowcrTb201O+jVrqjzUoq6erUVdLS3T1KyafobLGyafpafK7+Z9pkjyqnaWVi3ZuOtL2WE7lvFZqt7vysnur7Gro1hBcWjSCSeSEyHynaZ+V46EnkZzg9xiiGqdm7X7swxdSUZpNRTtqklv9xqR6TbN0WU/9tn/xqvm/vZzOrLy+5f5E39j23dZB/wBtX/xo5fN/exe3l2X3L/IcmkWmfuSf9/X/AMafL5v72Ht5eX3L/ImOk2CJlkYcgZMr9T070NLu/vYKrN9vuX+R534k8UyaVq89lFaxgQtjcZJDu4z/AHvevOq4ioptLp6n0mByynWoRnJ7+S/yKVn41urk+XHZ2zuOTvmkUEd+d3FKOKqJ+9+v+ZWIyqnGN4v8F/keoRaXYSxLIqMVYZBEr9Pzr0YpNXu/vZ81KrOLa0+5f5A2n2kH7yJGDjoTIx/QmiS06idSUtNPuQlQSG3dgVUdxMiu9Mtr6Aw3UEc0Z/hdcirlFSVmiqVadKXNFtM53UINGtL6LT47JLu5QbxCzllhUnq2c4yewBJ6470vYU0rvb7/ALkdKxmJle0t99l+JYXV7w6i1lb2yytBCJp1MZQRqfurknqcHGQOlaKKcb2e9jlas9zVsdXbVBIumpA5iVC4eQgrvUMucDuCDUThUj0QR9n1bIpr7VIdTttPlm09J7oO0UYSRyQoyxJ6Dr3qVCq03poaXw/aX4f5GosOoBMk2xb/AIEBR79uhH7u/UpX6a7LbyRKun4I4O9wQRyD09RUTU3FrQ3oyoRkn734Hm/ifwvrt/qD3P2WMSOAGKS5BxxnnHavPcJKWp9Dhcfh40ORN/cUNJ8Jalp5Mt6ixLI43Tk8RIOSfX/9VVOnKpZJbmKxtJOTcr2W3c9g0q7g1LTLe6sJN1rJGDE2CMr24PIr03Bw93sfOSd3d9SWZFVfvZNRJAmQ1IEczlIyw6jFVDcTIvPtvsZu724ZYAuW+YqB2xxyfTHetFFyYc1tiHSPsmi219NNF5CyTS3LzeXtXy+qknthQBg88dK0kuayXoS23qznfC1wdYt9Um1GQ2bavm/kOfnNpkxqgP8ADhU69cPxg8jorLlaS1tp8yUWrDXbuPw7pN1mC3uNV1GJHWKNQ0MEhIj49dqqASO/tUyprnkuy/HqCeg261CW18Q6nrRc3MtmIdKso8BVmnfDMOnHLLnHPBoUbwUe+r9AvqWPEHiLWNNtHs7QGS9kmhtoZpQo3ysSW2qM/KFGeeRx161EIQbu9rNlakZv9VfX7ixk1Pbb2tuLq8mWFQIQc7Y1znqASSc8DjGax9nGUE7buy/zNHLldiGy1TWrjSvD8TtEdR1eZp3DxjbFbAFjx9Cg9eetavD0k5aaJfiR7SRDf6pf6j4R1CyS68x7/UzptjKqKpkQkK5IAxgYk5HYVrCnGFRO2yu/6+4lts1NFVLzVJYNPXybHTpTaF41CtJsXDFmAGcNhQP9kk9qxqQSV3u9S1Ula19DbkcJdGDe0mACSQOPbiuOXxWNN43HUyCC8cx2rMBkjHH41UdwtcyYpyoWKZVVrecTLG527gQfXHIJz9QKqM0m0Nw0uZfiPVRrF3DoskUqWcjKZ1jdN1xzxHkHCqT1Oc9uK7KELRc00NUHKNylf3qTa8ZTZXEdldaZJpbJCV3ISQwIwfQ4/KrhBqG6uncboa79C/JqljJHam4huGtrG5jk8qMRgNKi7U5DH5RtBwPTripVOWtnug+rttagl5py3D232S9eaO9a+QPsOyTcXJ6/N3H06etDhK17rawfV9L3RNJfWN5qem6m1peM0JmliXfHiRyuGZuc5CjAqfZyUWroHQs99iCe90u/ubxmgvQmtRLDJCrxjeQGQMDnI/lkVSpyilqvdG8O9dSez1fT01aHVFtr6WRrU2kIYoEVQQzbRng/dH4CiVKXK43W9w+rNdUZ9tcaVp9hpDRx35TTZH+zu3ln7wYNkevzE7vWqcZylLbUFhXe10dLoY0+109ZLO4eO3mledLeV1/ds5JbpyeSepPX6VxYitaVna6J9i07Fq2Ikd5ySWkbP0HauSEru5c1ZWLVamQqbQ4LYxnvTjuJ7EkyxOP3sQI/2lrSwr2Mi78OWN3drefOki4wVbAGOlawqyjGyNI1ZJWM19N0XTh85n/dtvAR+h9aU8W1vY1g6lR6IhltbJkiW00+aUM+VAnGV6fNjHTgflWEsxl0VzaNOWvNJL5EU1lFbzmeaFYikYYyNc8qB/hgfpWbzOrtyouNLmWj/Awm1ez8wGzsZZFjXYHeXA2nOR09zTeZVLbI6lgX1l+A+31ewQobixnQRtlXSXO3nPcepJxR/aNV9EKeCa2l+Bu28OmiKMvDcRKG/dKJlYknuAOxoWZSvqc0qUr6NMx9QEbb2ihdLeL5gkjDc59BQ8fW3VkdNOhHZ6s6e2nhtdPiiYeRGigDdjBJ561yzrObbkc3s25aamjbC4LISFEXUbTnPFaU4yun0MKrhZ9y5W5zBv8AL+b0px3E9iC4u9v19c4ArRtJAlcxr3xRLDcJaW1ozKW2yycfL7/SuSeJctIHdTwS5byZyGq6nd6hNLZWcrxLnaZD8zt+J6D2GK5999T06VOFNJtf5FSwk1Kxldp7yWdcAACQgHp2qkoMdVKS2RfYC8t91xOOBiQ7juA6gEelY1JqMrWM1OSehXk0mWSN47JpJlUhV8sevscUKSZoq2q5tBiabqEMYmks5BGo5aQhRkevPrVR01NZ1qctFIjOs3VtJ5VmzRnGGmP3lJ6/SphF3bbE8PFr3lcqqjM/myPNI4PykOap9jWCikblhPqyB1u7VmjIwr3H3SOuAcc9/wAqVVcsfU4qvs7+6/uOr0PVmZhZSrsLfcQjpwT2+lXhask+VnnYmmmuZG7XccYqqGYAjIpx3E9jmvEf2vULuPT7HzAgJaZ4+OmOM/j9awr1HJ8qV7HdhoRhByk9ehjsJi8lkCFdACjvcLu/MmuNqSavodsErX1t6MT/AIR6SEo1u8SL1dt+d57dDxVNyiyvrEGrO5Tj0t5pZDJKg2HkoAxPf1ojUb6DnVjHoWoLPRngkljkkhaAk3EkrBc46A+n/wCuqcefUzjUqReqWuxC2v2H2RjY6iqxIpZg6bGPPBBNDg1pY0UG3eSJbSa71GxSSNGtoeHVnXl+eGHYUqnuoiUoc/cpXWkfYhJKqtOTlygG4hdwAPA46/pWcKinsdFOtzNXLmiWEcijzY93zFgCuM4PUcjP4ZraCVlf+vyMcTVkpOz/AK/H9DZi0uTV0ASfY8WZI4yfkzjA4IyB7jPWt5UlVVr2OD27pu9r3/rdFDwtL5mrBJgyyJLICGJLbwCDnHAA5rOnh5QndrYdevTnT93d/gdvXUcIqttO70B/lTjuJnlviK+vW1uW2+1OttKxO1XIU84/HpXnqTZ9LhaUFSTtr+JSEHlRh0UrCSMyAd/XNT8TNlUUVYuFdRhjRLWJGhL7nRl4IPUg9u1XyqK1MpSjN+Z0lppmj26vMLxndiAyRvnb+FQ0nuzz51ajlZRXzOZi0m3upJ0uJmysm4KzH5s9yKafmd6nZXSKN5pBg1GGCFRIiKJGULk7jnA/TNU58iNIyVVanUaXZTGMG8eS2twh3+a5QE9sCpbU46HHXlGL0s35ajIprGHUk+zXUl2kLZKIpJLe7Zx+I9KyjBwlfoEnKdN3VmyQarcy3rGAyQA/KxZGkAx6/wAP5g10U5QTu5M5alKfLay/U17DxPZW0zRzRv5jkBjGhAJ/3Sf5V0xxFJbGH1GtJX0+8yfCE0g1WdbuIJcTXEkmJcqw3bmwoxzgdav2sZOxnLC1IQ5nsdxTMAHX6047iexyF1pNvG9yl5bQTRBw1urEKfM4+UH35rzZwcJSj9x61PEOcY8rd9n6d/kZVpqdvd3lzb3UAi3JhVeHcYx9OlZ2cHodMqElFNO/zJItS+wzOUmhmjClQC6kEVoq2vdg6fPFaNEJ13Q2u4UkMrXD/Kyxx5Uc8c9fwodOTjcmVKor7E01vA2leU9x9lmS5xDLKCu7nlRnsamCTeooVHGd0umo/OoAyQwyJYwA/vZmKqScdu9S3y6XE1Fu7V2ZepxPBNDesXniP+rErljLg9weQK1pxfLeR0Utbx2Gwa/La3Lz29tb+YTk7o/vce1Vo3cqWF54pXZetdWudblks7qDyPOUhGRuN3Xj86iSSMauFdJcyexJHANIkSCCLzZYU/eSNLvYN36j3oUnFt3RMFzw1e7NrS2nn1W2P2E26Jvd2bDFiVxkt1B5Fa0pXqLQ5sQoxpS96+35nT12HmDJXMcZcDOKcdxMz9S0uHXLMhdrEc7W6H2P+NKvRVRea2NKFeVGV0cxc2yJbzwailwJl48yNd8mPf8AvD3/ADrzqi5NJ7/gevQquUk4NW7PQy30e0k0x7rTpTcspy0ZyCV5HTrnI6VMW1qdirSVTlmreZgxvGkrOVwTnjoQfetbuR0tWRYikS7u1hJYuBkMckcfjSiuRXMpq/Sx1lx/aElksmUREYASOv3cn+Qpz5viWhwxjTg7atlDWo/tcEcFs019d27ZHkoWQ569BUwm5O17jhzL3naKfcw5hLAzCWGSN/4lZSAD70Pex3U6l4pvU0tN0vUr6SO4ldbW3RgN0h2EkcjArSFKU17pzYrGUaSs9zQtrH7PNIAiOZTt8yScDAz1yO/b0q5YapytKKOR46k0ve/A6bSLfy5I2jMYXJ3+WR8xwfSnQw0oe9Lc4K+I9o7LY266DnGTAmJgoyfSnF6gygIrmF/MtwVJ6qehrTmQh5DXQxPbOjjow7UpKElZgrp6GNceFU+2rcrH52CTgNsb8+/41588Dyv3Jadn/mehTzKoo8r/AK+RNe+F7TUgJmhImUbQZgN2M5IOBz1pSoNrqXRzCVPS+gxPDVrZxs6WS+cV2hkQcD275qFRmlre5Tx0py+LQy9c0q8urMwCC9uWDbhhMA8dOSB+lNUq3V3OjD4qnGV7xX9eg3SRrGk2/lQ+H7gPtILqyAtn8adONSPQnEToVZa1F+JnQeHtfe6+2Saeq3CNlGkkYn8hWfJNfZbOl43DcvLzOx1lvaX95AsV/bKWByXI2rn2A9M134SU1F86tqeFivZuXuXsQ6hp32VR5WlG5Zj92EdPxYiunmXcwjTTG2VndSaxp0n9ny2sFu8jtkjGWQr6n1/WpnK5olGMWjqKzICgAoAKACgAoAKACgAoAKACgAoAKACgAAD/2Q==</field>
+        </record>
+        <record id="oetker_spinaci" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Spinaci</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSpZooE3yyKi5xljisW0jWMZSdkiH+0rL/n6i/76pcy7l+wqfysP7Rs+1wh/GjmQewqfysP7RtP+ew/I0cyD2FTsH2+1/56/wDjp/wo5kHsKnYPt9t/fP8A3w3+FHMg9hPsH9oWw/jb/v23+FO4vYz/AKaE/tK1H8bf9+2/wouHsZ+X3oP7Stf77/8Aftv8KL+TD2MvL70J/adp/ff/AL9N/hRfyf3B7KXl96/zD+07T++//fpv8KevZ/cw9lLy+9f5j4r63nkEcbMWPTMbD9SKNezE4NLp96OJ+JH/ACFtC/653n/osVa/gVv8H/t0Tjx/+7f9xIfmdpfwC5gEbbsbs/KxXsfSlFXZ1KXL2/M5qaxjm1o2UkszIUBEP2wxBx3Oc5bnsPQetJwhKTUpNdtTuhWqU6KnCEW7u7stO3oV7fSdKLb4dPji+QuJk1NkLLnG/JJGM59fr6ioYXdS/MqWOzHaUb62tZfdsaWj2UV1YiRpZ5FLtsdp3yy5ODkEA/XHPWnDVbv72Y4qbhUtyxTsrqy0dtehpR6RbMeBMf8Atu/+NV8397Od1ZLpH7l/kSnRrXuJfwnf/Glyvu/vYvbPtH7l/kOj0ezJ5WU/9t3/AMaaj5v72DrS7R+5f5FhtG05UyyOCTgZnfr+dFvN/ewVWT6L7l/kea674rm0/VbizhtEUQOUyZZDn3+9XnVK9TmaT/P/ADPpsJldKpRjOT3XZf5EWn+M7q6lSMWlscMN5eaRflyAcHdwRnNEcRNP3v1/zFicrpxheD/Bf5HqMelWLIHCMQwyP3rf416Cimj5t1pp20+5f5AbK1gYPEhDDoS7H+ZpSikJ1JSVn+SOD+JH/IW0L/rnef8AosU1/Arf4P8A26JyY/8A3b/uJD8zvGXfge9KG50MpX+i2moxCO7t0lUHK56qfUHqKqUYyVmjShiKlGV4Ssc9f2OiWV5BYtbrdXEaZjgZxtjXPG72znjBJ5wDzU+wppXZ0rMMVK/K997f5lxdbmF5JbRWYlFtCJrgKGxGvYDIGSQGxwOlaqKavqcbunq0attqkt95i6bbwymEgPunA2kqGAOAexBqJKoug4qn1b+7/gld9Q1ZdWh06Q6bHcTo0kcQaRyVXGTkDA696XLVavoaf7Ov5vwNRYdTVM7bUv8A7zAfyo9/yM/3d+pn6kPEU1s8SQad1BVhO4IIII/h9qzmpuLWh0UZYeMk3zfh/meaeIPDOu3moTXBs1R5CC2yUEZxjPY1w8rjLU+ipY6gqCgm9PIi0fwxeaWPO1MCCEtvluG6RxqMn355/SrlTlVlFJaHJHFwgpSbu0tEexWFzHqNhBd2kgNvNGHjOCMqRxweleg4taHz7tfUfIiqR82WqGkgu2jz/wCJH/IW0L/rnef+ixVL+BW/wf8At0Tmx/8Au3/cSH5nc3Ehij3jsaUNzoZB50BtDdXl20duF3MQ3lqB7kc/rWnK2F7EGirY6Pa3s9xH5LtNNcSTmI4MeSUO7HaMLxnqDVyV7Jf1/TJbb3Od8M3H9safqs+oSfYzqZN/Of4zaHKIgP8ACNsZ564PHXI2qLlat00+ZKLen63dRaFotwY7a0uNZv41nEMSho43DGMkdyVRRk/0pSguaS7ILkMl/Na+I9V1zd9pnieHRrGPAVZJWwzg9wAzZPsp5oUbxUfmwuWte8SatYxCxsU8y7luorWOWYKCzn5nIUfw7BnJ5Ge9ZxjF6vaxSuV5NT1b+1dQt5dRUW2nW/2m6mEKqEJBKxKDnjA3EnJ6Dis/ZqUU7b/1c15uVhZ3+szWnh2zkMJ1HUQ91dF4gRFAASBj/gSD6g1bo01zO2iI9rLuQXd9d654QGnm53nVtUaytpVRVMluH+ZiAMfdV+RjtWsYxhO9tlchts1tEC6nqU0tmnkWNtM9uGhUJ5oQFSzMAMkt0A4AXJ6ispwil5stVJbX0NjzAt6YA7SbRksQOuOnFcr0lY03jc4j4kf8hbQv+ud5/wCixWi/gVv8H/t0Tjx/+7f9xIfmdpqMnlWpfGeQKUNzpSuY0F0rRRxSqpNrceZ5ZYDcMHHXA4Jz+Aq1NJtFSpuxj+K/EFvqEyaRc/aIbE4e5MWC8w6hBzwD3PXtihYiNJ92ctStGErO5U1G/t5dZuJDbXUGnXWhNaHylTcg3ZBA3Yxtfp19qqGJSjtre4SrRffY031jTbiexWaG58q0db1YY4413MibVJPmH5QBnHXpzio+s2vpuhe2jcqLrWiWsFszwX7bLx762d40+8zsWz83zH5iM8cAfiPF+W6IeIgujLc2qac+tQ6lLZ35k05JJDGfLwWkXlz83J2jAx0FL2/utWL9ur7PQgvr3S7o6y01tqAgv1VbqNWi+VlQAMDnOMAe2frimsQ1bTYTrLXRk6a/psOq3GpS2uoGV7JLcF2jVY42JYbeeMk/hj2pPEe7a3mHt12ZmwazoumR6Ooi1Ddp0TC3b93ny3XaenQ+/Xr7YcsXe+m5DxMVbRnWaLLp1rpUBs7hktm3SxQSOv7reSxHHux65qKmIvqdtGHMky1YkOxmOS8rFifQdhWMXdm1RWRyHxI/5C2hf9c7z/0WK6F/Arf4P/bonBj/APdv+4kPzO+ATcC4BAOefWlHc6GNuYrab/XQq2ehZf61dhJtHP6l4N07Ubo3LNIjEAYVgF4/ColSi3cynRjOV3cpNoGjxTMss15I7RiMrGwYlQAAOnsKl04IpYRMbNplgJyFtrzMqBSzypyoxjIC9OB+QrO8L2Rf1KKTbZVGkabdx+U/mbIidmJldcdCcrnH3RxUzaitiY4OnPS7M/VLUR27mGzmmX5S+JcrsBOAMAc+w6c1Ea1NvcqpgUls2SWunXF/p7zfZvJnm4CyTnBBA64HoBxx2q3KK6gsJFrqaC2eksY1uUvkkkxENx3IWznaCBz82cUXL+pU2r3/AB1Of/sa+1DVSVsxbWUDmIfaJSSwHToP8+/NKbhGN2zJYKMpbM7Jf+Jbpii4QQ28GEVlO5cdASeo/Gsr+Z6NCEdIxRpWIuWkiY7fJ6gqcgjHHNa04yumTWcLNdTlPiR/yFtC/wCud5/6LFdS/gVv8H/t0Ty8f/u3/cSH5nePJ5a78A49aUNzoZn3morECzNwBliTgAe9W2khxg5PQyX8W2s0qWcF1Hbo5INzIuVY4+6O34n9awnUk1obqlCn8Wr7f5nPa7p2pOVuLG4FxDMhjmkZirpySOnUcZ454qI2e5nPm76DdFS4XRLqymspZp44j/pEbMMpzgKSODznBxmlOnzP0CErKxXuPC+oaZYXCjWdsZ+aOONDiQYzgkZI4HTv+NHtFzWEqTSvcWHxNq1tp0No+iRTuv8Aq2liZfMTt/LHPNOVCMtWkONWUdE2VRq/iSPUla709QrgbZfJIVRyQeB0AI+uBTlTg9eooymirb6jMZrjztVUXqxMIXkO5IlHOV5zuPIz1H40cl4pWCNSzbOp0zVpJbGzjntY5Q8aGSaB9wVhnluMAcDp61E6EZLU0jWktjO8TeKRHBJbLJ5UkoHm7hkRjr15yw49hShQ1uTUq+7ZF3wDr1680GnyHzradCyEgAxnk/lxjkDmtFJRaiNRlODlJ7fiP+JH/IW0L/rnef8AosVuv4Fb/B/7dE4cf/u3/cSH5nelA42kZFKO50M5XxZDcTp5FpcRQAHc+6TYXI525xj8+Kyq1FzpXN6V4xbte/4HIXmpXdtfyqyT3VrDkFnchN2MlV4+mPWueWHk1rJmssbbSMEkbum+I1u7OO00/wDdSqzSznynYGMDHUD73StqKcY2ZzTmqjulYfoQ1S2v7qS/u44Jf41b5Q556ZxgCoqubXuuzKhFJ3lsW7nWDay+VdywTuXzuiy/kf7bnGFx15qKFOqtZNM1rTpW9y5lnxLDZXsdvdRIwMYZJnCHBxwcpnGT2I5z2rob0uYRetjDubPU9cB1Sxhkmgdtrzyuo3AcbVBwMZ9KmmuSPvMup7791Gx4e8KWQ8uWa0aG5+ZmJIIA+hyM4x0pKtzSaQvY8quWLa2t7PzIraJ2AdnKE8uAcZxlQR9Mj27VUZ3G4cpBJ4CsdXWV7WFbe4kUus3mEqTnpt7duRmtY3ehnNLcXwpZWza9a3UMr28kTyRyW7tuLsFYHp0wec9+ax5ZuprHbqapxVN2e5P8SP8AkLaF/wBc7z/0WK6F/Arf4P8A26JwY/8A3b/uJD8zvvMEQMh6KCf0qY7nSec3t1H/AGreRXt1DBKASy3DExvGQOcZAzzjnrXK1N6xte52OVJO0k9u5ZsEtY7mQ3M9tctsDxqZQh5XAJGffp/KhOcdWZuMJu0TV0XTINItWu7ZEtYZ8tMu8sAe556VcKkpJPYicFBtGXqS6pPC/wBouJba0lRllkaLJUZG3ockn8ODTaWlyLto5R4rbRImjm1KKSS7Q5c4YKn3cjj3I5NW79CFZbmTYaNLqszRWr77aNx5od9p25PUkHA7VMqsYPXcqNNy1Ru6hHq8uq28ukz262UUQQJZvmKEf3T6ccnjmicouLuVGEnLQS71aS2vprw3iW0rqFP2WIzMvYH+4Dz/AHvwrChSkldpHTiJwTspNm5pGs6jeWBntrQR20KESXtyww5Ud0Xvz71tZrVvQxUoy2NfRPELW8eZ7CAQuP8AW2knDEdSUOPzFXTr09kKrRqLdGT4K+1nW8zRoWmeW4kyDlNxOMMOM84weefatHK6MYk3xI/5C2hf9c7z/wBFimv4Fb/B/wC3ROfH/wC7f9xIfmd44DIynoRipjudDPJPGMMMuryyTiFJY1BKMdvmMox6Ecgg/hjvWEZckuU7qlJ1KKknsapexEcTXsluRNwgVg7oAM4G3GefXvWUZTvoiKnsrLXU6Nrt7fUILS3jdLeQhgVXfv45B9P/ANRzWySVrGMm5bjpjLAzyXM7eTu4kBOHX0x0/EGuWrzxm76I6KSjKNlucV4wE41KQW1jG8ZQGG6MSnk+hzx369OtdULSV07pnLO6dminoMNxLItnEVjj2kzzGEys+evGSuPwz+dOdKLd2io1ZKPKilPby21xFLqN5/adtE7iOCNvLVgBk5BxgjI4AOelXp2Ibfc2tJ0LQNUt3R42meSTEZNwY145DDk9M4PXmlzNaWCyZu6Zod9YRTtYvbpEN6fZ5WJVxnq24df93HUVO/YErbGTrV1qsU/+g6bFeWc0ZjkLRhgcg5Ck9cYyB7nikoRvcrnlsT+Co/N1aBLaC4tbO0cuY7ljv8x4zkAdMY2n2qJVP3sVfc2jSUaLbTv0LfxI/wCQtoX/AFzvP/RYrrX8Ct/g/wDbonm4/wD3b/uJD8zuriTyoGfGcdqmO50MwNX8P2ethb1LWG5njUhVlHB44B/GitS51dOzNsPiHTvF7Pc4q/8ADdtbQSyxwvFOHBCbtxTPUkDk4xXnxxLhO09Gds8PGrFKml67Gst7PBYxLeAHaVMpRlUOvYNk8DvjvWsavM/dsc0qfKveezOdvNft10ufQp5rl1klMiy7htY7hheDyCAPTB7V1JHK3Y2tLitNY0NbV0a6WIDYqM8Y4PG48c/Ssqk3BaK5rTpqe7sjSglOnw2EMMojtgxLt5pc498jPUAVyxrqpJXdvQ3nSdO9lc57VNEt9Y1S5nk1sANK4XawJAPzYySAAM9vWuipWcXZK5lGjGSvexa0+H+yIWlOpTvDA2AXQksuO2fXk596zxE7pNOxrh6d200vmLr8GpatHFqGkyrCUAjWMyBBjkg5PU8/rW2Gjzx2sY4hcktzM0rR9dMwTVNWkEAIJH2reTg8Adh9aqvSqtWikbYWpQpxvJ3f4HaeG9MFrNC4lDqrHA37scY69zUUcK6a5pbixOK9q7LYzviR/wAhbQv+ud5/6LFdK/gVv8H/ALdE8zH/AO7f9xIfmdzcAmBwAScdBUx3OlmWsV3buZLZHGeqlTg1rzIQS266gMzWksUuMCQJ0/Gs6tOnVVpalU6k6bvFnP3PgiPyZoxD5jS/8tQPm6Y/D8K4pYWrB3hPTszteLp1X+8j9xzFp4c8TaZLNbW9pNJblSqJOm9BnuOPrweKfPVsrp/I6J08JPVTtoPt9L8b2kzPFZLludscXlj07DHSlU/eWupGUYUqcHaUWyTUNI8ZXGkG2i0dYHkGJZI3BZl9MH7vPPFVShThK6i/uMJynU0ckZdh4O8UR7Q9jcjkcM+1OP7w53d+taTqv+VlfVqV/wCIrGtdeDtfuYd1zLOHJGI7WLaB9TwK5vaVpS0h99jojDCcnvPXvc6PQfDt7b6X9mvYTId27M75YnGB0/xruwycE+a2r6HBiZQm0o3sl1LdzpRgHyaWJWPOEDEfnmt+dGCgitaadfS67pkn9my2tvayvI5JG0koVHf3qJyTRrFRjFlP4kf8hbQv+ud5/wCixSX8Ct/g/wDbonHj/wDdv+4kPzO+qDpCgAoAKACgAoAKACgAoAKACgAoA4H4kf8AIW0L/rnef+ixVr+BW/wf+3RObH/7t/3Eh+YAAP/Z</field>
+        </record>
+        <record id="oetker_tonno" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Tonno</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APSZ5TDHvEbSHPRQSf0BrI1jHmdv6/GxnTa6kMnlNbTtNjcIkikZyPoF9qmUkv6f+R008HKavdJd21b8yFfENxu/eaBqsaf32tWwPyGan2j/AJWavL420qwfzRZt9Zjuo/MggldckEiN+COo+7Vpp9fz/wAjnnhpQdpafNf5kv8AaD/8+k//AH6f/wCJp/11/wAifY+f4r/MP7Qf/nzuP+/T/wDxNH9df8g9j5r71/mH9oSnpZXH/fp//iaV/wCtf8g9iu/4r/MX7bOelhcf9+n/APiaf9df8g9ku/4r/Ma1/MvWxmH1jf8A+JpX/rX/ACGqKfX8v/khBqE7dLGU/wDAH/8AiaL/ANa/5B7Bd/y/+SHC9uj/AMw+X/vh/wD4ij+uv+Qexj3/AC/+SHJd3LSKrWUiqTgsQ4x+a0f11/yE6UUt/wAv8zjPiR/yFtC/653n/osVov4Fb/B/7dE4Mf8A7t/3Eh+Z6DCN0mKmO50MytTt7q11MX0dnLdQMAGW3k2yRkd8fxDHYe/XNPnlTbaV0zqpQpVqajKXK1e19nf8jMja8xCRpV+7shJRJWjEb7sbSxGMY54/L0f1qp/KavBYfX96lZ+t16LzOh0uzmt7Ym5KmeVt77MkA4AAyevAHPc1Kvu92ctecZNKN7JWVzQWI9TxTszG4pjHpRYdxQvNADpX8m3klC7tilsDvgU27K4RXNJI8n+I13Ouur5NzIIHhVlVXO3PIP8AIV5mJd56M+rySnD6u7xV0zmtJ1G5uL0Wwubgx/ekCSEYUdTmoUZR1OrEOi01ZX6aHt3h2UyeH7J3Z2IiC7pG3M2OMk984zXpUZc0E2fIYuHJWkl3L8zgxMB6GqbMUjzH4kf8hbQv+ud5/wCixVL+BW/wf+3ROfH/AO7f9xIfmeiWuPO59KUdzoZZkkjU45Zv7qAsf0qrgotmHF/aOvTvLAfsmnRu0aneRJMykhidvRcggYIJxnOOKuV4rzGuXr/X9ehmK0VxdarePNts9LP2eJoUw01xgFsHksQSqgc5JNXyySSb1f5EuS6I2NP+03UdxJq7JDDEI1WRLrAZto35wflwxIx7VlOlF7XHGo1tYzr+LT08V6ZpFrCszXKSTXDyXMjeXGoGCPm6liBSWGhyNu5r9bq7J/gjpI7SySN1RsKnDYkPy/XnipVNIzdSTdzPurDRmZmkuXRlTeSL11wvrw3T3qXTXRP8TWGIqR7fcv8AIwdQ8FaLqKsyXsxSEc5udwjBGerZxxXNLC3eiO+jm9anfb7v8itZ/DjTLYTvbXhWTAWUmQfKuc4PXGePypvCylGwnm0ue7SNrwtrn23RRdXNstvaec0dq0XzL5QO1M8k5OPQDpXZOmqbUddjzm3NuV1ds6B5IngYxkMMHkHNZtomz6nmfxI/5C2hf9c7z/0WKtfwK3+D/wBuic2P/wB2/wC4kPzPQI8gnb1wamO50ks13NHFDHZxRvNP90OcKgH3mOPTI47kjp1GkbdSWZmr3zeFdDdLVhNJIzR2VuE+d5XJKjOeQCT26CtILnlr8xWMPSWXwnDe2FwBcy2GmDUC7/MfPYvvI+vyjP8AjWkv3jT7uwrWGy2M+leHfD9gUzNHq9q053ZM0rEvJkeg3df9n2pqSlKT8mA2+eU3Ot6lYJ5d1c3cWkWTqvMChwryD0+d259QKFa0U+1wHeKraaK1/sexndI714tOtkQbQu7JlY93wmck92PeppvXmfTX/IdieTSrCLxja2Bt40tLGxF2/wAoLXEm/YgY9W24JA9ce1ZxcvZt31bsU3qZtpaC+8OWOncpceJ9Qa6uVHVIM+ZjPb5FQY/2q2+GTf8AKrElq8nFqPE+oWUAR3aPSrSNRjLDAZz6/PL1Pp70oq/Kn6iNCwsYn1p7AMI7DR7SG3j4OXZgQzAdyQu3PX72OtTKXu36tgdNduPNCIBkqSxxziuST1NYrQ82+JH/ACFtC/653n/osVa/gVv8H/t0Tlx/+7f9xIfmegRxySttjOD9amO503Q1ra6hUAKweMnZIhB4PUHPb/AVSuhtxZlzI6amLuVjJcxqVRpAD5YPXaOgz69feu6lTjKC0OSpUkpNIjkty+rLqQkUyzWxt51dQVaPcTjHTP19afJFRat1F7SWmpOkuyWCULbiZRgSCJAUHTg4yPp9KPZx10/MXtJaaifa3CTMEgBlfMi+UmX9zxyelHso3Wge0lbcd9saQ27sId8bNsYxrmPgcjjjOSPwpOhFX0BVZaaiteM9ys7mFpo1xHIY1LLkZIBxxR7GKWwe1d9xIrtkaBkMEbK23IhQFAc5I46HApulHXQSqS01GyXLESAxwN5+GlBhQ7j/ALXHPQU40YhKrJdTQsJzNH50lujSp8iyBACq46D2rjxVoSsux04duauydGL+bIVwSMcnPFckXdnRJWR558SP+QtoX/XO8/8ARYrdfwK3+D/26JxY/wD3b/uJD8z0ayz55x/dNKO50MuM+Djg1ZIx40Klyv5UXBFGa4njBMaxooGdzHNZSrKPU1jTTMyXUZDhmvNyhgrbFxtz6+lc0sbK+i/E3WGT6EUt3d21zKJYyUAHlAuS0h9eBwKU8RVi9SlRpSirPUqXmq6l96Kxlt1U/fkX5WIGeR1A+gqJ16u5VOjR6u4w+JY9oIuo0bqUZwpyMcDIPBJqY4qo/wCv+HNPqkU9v6/AtWviaSSQo9qEJcIglXaW4yTnoQPb8q1jiJ9TOeFiloyDWLm2vvLb7QEk6IU+dRx3GMfnSnUlIqivZ9Co+oXeluJEuI2tBwiSkbWA69OnqKSqNvuaKEJqzVmdLp1xBqlp9pt59yhclPStqdpapnJWjKm7NHD/ABI/5C2hf9c7z/0WK6V/Arf4P/bonnY//dv+4kPzPQ7YkSnHpSjudDFuLho/mOB2UEgbj6c0VJqKuyoQ5mZt9rEltJ5dzOkKy/JGkXzsT6+/biuKdWU+unkdMKUbKyv6mTd2ZuHtBNqTo5OyMoWIdsccH0JFZqkk97myq8qaSFihvDFC+57g+fudonRt2OPmyB2xx7ClLRBeN300I9Xj1O1gjIWW9WWb548qSVzkAZI/SoUZ33KjKnK+yshLG+ubiaURlMwr8iBGPUtjcSAAcY4x+NF7u1wnBRWpja1qIuLhLez8u2uZJVHmXKYRgDyoHTqB9c0QV5a/eUoSUbov2i+Sj/bNPLXvllRNHEVQADt7E9+K0jeN0tRSfNZ3t5A1hJNpZW1dJ4gzfKBsI56jp705Jtkc3K9dyg1hH9mcWmr3MdwuHMUTEEZ4+6TkjHtnpTTSY7ytqjTQX1jcWU7an5aySpE8ITO7ceef06U4N8wNwcGmuhm/Ej/kLaF/1zvP/RYrvX8Ct/g/9uieLj/92/7iQ/M9DgkEPmyt91Iyx/CpTtqdNrtI5621C61OeS7tIYnDS7d7Sn5EA5GD0z7VyNueqPQqU1RSi+xQ1VNJXYNQL/aYVL4jlI2E9vmJ9BjoDWa00sEZSvozSs7eFkiZZmjAfJbzPMZvcnHHb2oTi2uhErpa6/gQtmxunggV1jjQCN2V3DjvnnGfesal7lxtOKuSLYzymRzfRxziPgAFiCec7e309zxUqDel7PsDqxj9m6MHUtS1GKwlVEBjtXIe6jnALk+qgdOn/wBahU3az3RtB0+a/fp2FgttRlsI5LO2SWeBQ1uZui99+G/ibJ69MfjVxk1Ky/4YmUo9Xu/v8iSyk1R5XbUCLJwU+dgPmIz36Y9veqSS0vuJyi17qN20iubm4mLIseVQLJE/UDr0Of5iuiD5jmm1Ejh0+1vNUaNrZHKuVaRFGc46krtIOD71rFKWhEpOKvf+vxKLW76f4jOmrPLujMUiS7id0RJ+Ur0zkYJ9OetKWFs013HHFKSakuhlfEj/AJC2hf8AXO8/9FiuhfwK3+D/ANuiedj/APdv+4kPzO3vjH/Z1yJWZUaPDFeuMis5fCztoXVSNu5hvdy2t3b2dqAV8stK6xjfnb8uRjHP15xXE5ana48ybYxrm11XU0iFnbzpb5G6R8Etn+EAHPTNO7RHLZXbJreyt7q/muDJJGiMubbcy5cngnn6dB2rO3Ne6sU5uCSWvmX9RgNm6zCIluBukkJA74A6nr3qa1Nxs2iKVRSTVyhHqemWqTO8c0xkH71o4WYjI5+Yc4H6VNLljvd3NJU6k2rNK22pzkn2HRrsXdnB59rINys5YDO7IPToCBxjnihys2kzojTlVWujNVda1i6uLed7doLR1+dZSqk9ecnGO1LllJGTpUopq+pYuNS/tiGaxjxKjNwApLHHbLYH5Zra8tmzOMY02pEUd/qzbLR9NfT40O1Gk+bdgfTb+YrRRtYh2d3c0otTv7Py3P8ApOWACTYDc8EhsdOa0+stO1jL2EX1Mya6YeN3v2dvLuNkCbU3hdo6H0JLE/41osVGTskQsLKzdzN+JH/IW0L/AK53n/osVuv4Fb/B/wC3ROHH/wC7f9xIfmd5NbC7tZoDxvTj65BFRy8ya8jrhPkkpdmcZcalfW9/PYRvapO3/LaVDwpxnnGTxnj/AArzot66HrSpwlCMlsaP2i6ksIpLSFRlcqkf7sY9c449QMfnUtyb1MOWKepO11LuWe8O8lwgSJsY68nOPf8ALiqdnu9URaytFFafXo9YiIlSZI1bYYyg3c9x3GMHn+dKpUcn7w4UuVadSlNFNasosoJoYQeY8fIVwTnnrz7g+2KnVp3NFZ7sji1i1klW03XMDAEtEYjHk8D5WxxyQOvU+9Dg0rpBZvsS6nNothpwuGs9x4xcpNu6+5yTVqalpbUmEal99Owlrc6Y7RyLGI4WBZXErAOoPJAHcntUbbjfM9nqI2uaaYWkuJ7aQoQbdY5cYHQHBPX6iqirR21JcXcurpjr50+oai1xKJBIHwP3YXoPlx68/Shu0dP8yVLVJIzor3yNTtrRpPtMMk6us4JwXPp7c1pH3WtTb2fNCTtayIfiR/yFtC/653n/AKLFeiv4Fb/B/wC3RPCx/wDu3/cSH5noEcgibLdDxShudEjK1zwzDqrpdxSNHIpyWQ9azxFBz1jv+Z04XGSo6NXRnay82l2BnVWkBOW28qpxgnHUV5c207S0Z2YdRrSsmYeh35OqRXMt0JIgAohiViAzHknt09fwramlForEUppNNGleos+pPdLciS3bOzGVG/pgnof05FRV5ZXaIpz5YKNtSpqfi8aKYY2EsxcbtilSRjHGOvr+Rp005K8SHTjfU0b68j1bS4Zw89tMRlZFjzyP8+tE5qcNbihTcJtaNGR9oL2Ba1uo5obXG5pACr8c5BPHPp0xUcqctzZtLdANO0+4aO80q4W2lmULswGToTkZ6DJ9utOUtbdmZxbS1XzJIbY3Il0+aGK6kQZe4jcR8flx979K1p051NEiZuMI3b3Ibiy1nHkLJCYxJv3/AGj5iu3AUkdfU+uBW31SpbZDhicOndtmxomksZvPuJIWmLCQ+W+7HsPTvU08FNT5pvYjEY2Mo8sNjK+JH/IW0L/rnef+ixXcv4Fb/B/7dE8nH/7t/wBxIfmd62MYIzmlF2OhkayT2/CZdP7vpVcyFYJY47tDlWjYjrioq06dVWkVGUoO6Oan8IAySNFdzwSlw8ckfKg+6/4Vwyw1SD0ldfiehHMLqzijlr7w/wCIkkeE2UlwpbMjw/Kshzndjsf8KyjGX8r+47Y1sNKOrNaRLi2WN7bQNQLrhpHwQz4HTA6/yqlSk1szlla/xRGWq6vqUr/adLuoILcGWKKZGw8mcgnAz+ArOdOqlazY0qcdeZa+hW1ttbuLiD7DoV7F5RyWiVkH6g01Rbd7NaeZpGNKMdai/AzLXQdclvW/4lVxCsjiQiVCEDDvx+H5VVTmSvyt/I0jKhFfGjuLG3vnuHiuLX9y8QVsL5aZ/n+NbYD2ik5SVtDzcW6bilF3dyzNpsEKbjY59oy7E/kK9LnXc4FTTKZLNtht9Iu4GeRN0mw4ADgnPPoKmU00awpqLvoZHxI/5C2hf9c7z/0WKlfwK3+D/wBuic2P/wB2/wC4kPzO+qDpCgAoAKACgAoAKACgAoAKACgAoA4H4kf8hbQv+ud5/wCixVr+BW/wf+3RObH/AO7f9xIfmAD/2Q==</field>
+        </record>
+        <record id="oetker_vegetale" model="product.product">
+          <field name="list_price">2.86</field>
+          <field name="name">Dr. Oetker Ristorante Vegetale</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APQ7y8NqUARG3Z+8+3+hrFtLqjopUnO+/wDXzRRk8QxRsUKxM4/gjdnP/jqHH41Lml1T/r0OmGAnLuvWy/UaviOMj95EIT280uoP4lMfrSVRPy/r0Kll0ls7+lv8ywNVYjISDBGQRP8A/Y1fMu6/r5GP1V9pfcv8xrauy9Utx9bj/wCxouu6/r5B9VfaX3L/ADGHXUHU2g/7ev8A7Gj5r+vkP6pLtL7v+CN/4SGH/npZf+BY/wDiafzX9fIPqcu0vu/4If8ACQxE4Elif+3wf/E0m0t2vvGsFPtL7v8AgjhrqkkZtOOT/pXT/wAdo62uifqr7S+7/gijXYy23fZ59PtXP/oNHW1194/qcrXtL/wH/gi/25FnHmWefT7UP8Kf3feL6q+0v/Af+CPg1qCedIlmtCznACXIYn6DFFn5Ezw7im7S+45P4kf8hbQv+ud5/wCixVr+BW/wf+3RPOx/+7f9xIfmdlfdU/Guer0PUwvUxftjaaJllS8UHe0Zt2+SQli2G9Dzj6VdLEKnGzR01cE8RJSUl0TT6dNO5N/ajK8kIudQuZMrjbICjjGfmP8ACOcfhVyxcf5TKOWydnzJL8R8Mfk28UZcZRQDjpXGlc65u7bK95cqFIzXRCJmkc9d3OSQDiuiEDaKKiTQx7pJvmC4+XPU/wCFaxhdlSbtoOu763lurRFZVDLICicdQOw+lcePUdEjowX2110GQ6x5dxMjOiPxukZuBnGFA/p61ze1mqnN1LqwoxUYyf8AXqT2puElklYhCxwJZDyR7LjP6VMKsoNyvq+ppOMJxSS07IuPfNcX6CC2WV2+QRpnDZ4I556VpPEzm1ZdTkeCpwg3Nv17EVpZCw8W2kan5WdXC5zt56Z716nO5UrtdDiqu9Jk3xI/5C2hf9c7z/0WK51/Arf4P/bong4//dv+4kPzOw1EkbPxrnqnq4NblMNngZJ9AMms0mzplUjDdleztdT1ZBcQoYLN+YnON8o/vc5wD24z3rX2LM54pRdkitbxF7WbUlmZoVuBBbxlywm+YKT+JJA+lWqKW4pVptpeRo2+mpqELyS281riRkCuuCQDgNzng9avkt1MJynf4mU7TR7G58STaWsEkgt7dZZZmdcKzE7U27e4BOc0+XzZMueMObnlv3NxvDOkrGUeBMEYP7tOf0obt1ZmqlV/af3mTdeBNDknF3EHSZOjADP6AVhKimtGaUp1qcrqTTM6PwMsG6O1eMIx3bmB3A98E5x9RWToNs1qVKlSXNN8z8/+BYZL4Zk061nuWn83yEZ2Ei/KAB1PrQqC5tDsp4+fIoNW6XRBp2nrYabHf3fmoWjWQKQR7jJPWtoYZOerLnjlP3I2XruZ+lXL3vim3nk+80y4HoM16E1aDMq0eWk15F34kf8AIW0L/rnef+ixXKv4Fb/B/wC3RPAx/wDu3/cSH5nX6lIsUlu7gGMP8+f7uRmsJ7o9PD35JWNO8SGJFsILdma4UhjGQvlp0LE/jwOp/PGyVjni23cyNavrnR9AWzjVGu5VW1tRExJZyMZxjjA5701ubQipyuZJKaZ4cvbRcy3emsLW2PbzJFXDAf3sueevHvVLVmvxTT7lkxbdW8P6c0sstt5c8bs7H946ID5me/8AFg+vI7UbkuXuzZSsZZJRHJaForjxDqDsZVJDR2iAjg9iVTg/7RxQ3Ycktn9lfiM1ea/utQtNKt7kW63F2Xxb8BYogN3PU5YY9OvBrJvdmtGMUm2uhVncWlzrF0Zp1tNNUBVMzsZZyoO4kntlQB05zUK+nmbJJpLuWLKO/Emi6I13KskUbXt7IHO702k+m5j/AN81opt3f3Gc+WzlbyHRyPqOgx2aySFdZ1BvIDOzMsAOSck5xhT/AN9VotH6GMvdk32X4m5pbtql3LcM5FlBO0MCM+VKpkcDuS2Tk9AAB1NDOaaUVbrYxtX+wQ+NNPgsraOJgytK0Yxkk8D9P1qlfkZ0U3L2MrszviR/yFtC/wCud5/6LFZr+BW/wf8At0Tysf8A7t/3Eh+Z12qrvVVPcGsKh6uD2YsOrBI4n2u04jEcgKEhsdDkfU/nVqehMqDuzNi1CQ6m2oyxxXE6Fo4A4IESgc7V9T3J57dKhVWedPFT1ikt/wAiq8kiXt9M9tFOl3Ks+0sy+W8Y4YEc8kfpT9pKxTxlSyslpcsQ6mEuVu0sYGl2iNC0jsFD9QATheQQcelL20rdBRxM5roRLfraW8MUNhFGsClogJJNygZXaDnOOTx0rKVefZHVCbk9epWm1V4Lxr5dOtvOhtiiyBmx5YYcDtycGpdaprojvowjNJXerKUurea08radaP8AaVRpl82Q5yhIO3pu2rjI5pxqzaT0O2OEp3tzS38u6X6lmw1mRLqW4XTbZZZYo1lkLucqTwOf97Jx61cakyauDpW+KXXt0/4Yniv0t7eMJpsC/Yw3lgTyEoAACAfT5umcVp7aXZGLwcJP4pa+S8/8ia38T6NDHuJ+zyuxd41VyqsepHYZ9vWuimnOKZzVsNKFRx3sc9ZXX27xjFdEk+Zcjbn+6DgfpitpK0GVKFqT9C38SP8AkLaF/wBc7z/0WK51/Arf4P8A26J4uP8A92/7iQ/M7iZHkkRViVx/EW7CoOyFieJbdXKI5JH8KdvyqYq7NZXSvYo31hpPmbXZIZpDwOGZj9KUnSi9TKNKMteRMoXMEFtmOPSHnaMZLysEBH4dfpXPUr04q/LY1hg6UtXy69lcx5fEGi+YYnslEpwsaRJksa4q9WvU0ppL+vR/od0cnhBczSMjU9f0d7W4tIoXhvPMUI+4ZB9MelRTp1kmqln8jtoYCEJKb5eWxtQaLZrbxo1zHd+ZkJmNUZz7Mc5xg8Gun6upRspHJUxF5e7Hl+ZYsNE0SJGWeOGd95HzoOMfT3zXmYnMKmFq8qp8yQ1XxGymzOvL3RdJuDBLpcNwvOWQMhHPbGfX9K9HBYj2lNPl+/Rm0VXnvVaf3mmug6FqMEcltcT2TyLkRs27H1B5/Wu+NWj1Vjlni8XTlZtMzL/wRqUAMlsUvE9UOG/I/wBK76c4pWRmsZGb97RmVo8Mtv4js45Y2jcTqCrDBHNVN3ix1nem7djR+JH/ACFtC/653n/osVzL+BW/wf8At0TxMf8A7t/3Eh+Z3rMqRO8kmyNRlscE/jWcmoxbeyOyne9ktWY82spIFgtd9sC5XhQM/U9h71wf2hzaRVkdywjWstTBaSwdZZ76N5nc7VlRmTy27qMD06nmqnKVttzSpCUmopaGs18t1b+XDM7CI/fZy24n15rxXLEOXvu/l2No0VTd2tyLRfD9tozXOqXg89hE2No6ISMgj1A9O2a9jDSTV322M8ViJ12oLucjp3hptcnku0+yW1sZDgOpyeTxk1E5edj0p1aGEjyKLbsdmw086fExK28sIVf3TlQoYheMjpz6U4LndkzxeWVSpZ3uQagsF/dRpBdSW+4KDBbxAke5I5H15FKrRjJ6o66EvZRbcU/NmZY6ZcxXSvfxi4BxFIGjU7VJIyD144OMdqzjVhGSjc3rThOHu6feaGmW9rpd6fOnup5hlYvOQgY6HGOv/wCqs8VUxKa5FZdW+pxKPNG2mn3mhFr+bhEj+RYuHyQM/mc100K84pXYSwcZQvvc0Uk03WFiuWijeaI7o5OhBHv1/CvSp11NW2Zw1aVSi2mcX8SP+QtoX/XO8/8ARYq1/Arf4P8A26JwY/8A3b/uJD8zrtTEkrxRLIAoy7oRw4BHH615WZ4hUIJva56uDS1Zh2uktJcywz6hDHHK+eF2sPXH4VzYerTrNPY6lKdON3eRW1TSxFviS5eJdz7FKghlXB6nnH5/Su1RfLua0MQ4rZMdp+rSafZbIbVWeQ5lVG3SPx/n0pOMIq1yakOeXvS9CDWLy5aygv1t7jYr+Y5WVl3J3BAxjHvSVWh8KaTFTw8KkrNjbXUoLlYLbSbeYWbyY+0lwPLJ6q4zknPf6VxY6m1FttWX9f11CFCVKo+bdL1OhWWGGxez1OT7VE64cFRg88cZySK48vxbjPlStF/h8iZQlKSlBWZzOnafaafbpqX21bmKWQNBLcy+UyIMg45z1z7Gu3FRxNR+7LlVt+7OyU5VJOHK7rdLU3Z7e4uYDPaTRyxvgllk3E+mPXvxXPh8HWhC8mvkc7rRp6OLuvIbDG0ul/ZcRW11MOZfNKHIYHJUjrj3r0KEoW5dTnnWjKd9fSwk+m6ZbvsuggZlx5jMuCcZycHIraMehdKvVWkE7eQ3Sr2e3aO3FjiGSZVWYBiuM+pH5VrClK6duoYv2druWttvMyviR/yFtC/653n/AKLFdi/gVv8AB/7dE8HH/wC7f9xIfmb3ieX7O9vKwbyyrIzK+0rkjnNedjoxlZM9zLYuSklvp+pnXEqABLd7Zo3QMGaNpWIyRk8f7J4pUoJR92yN+Sbeqe/e39bk8MnhtzCZpZ7l05X5GAwT2A7Z/OtUvMmVDEq9kkXftHh66uo5LUtDPhkRkQr1B/wP5VlXoxnTauZexrw1kkzAvrnVNNvwk6ymBn2id03KR9VOPwrzFg6bimkvkenSjSqU9N+3UsaXfR6q11ZSWNuZFXeskK+X5mOCGJ64z37j8a67c0LNXZzYqg6HLUi36P8AQZd6RdzjyZrxYofvthz5gHUgEce1ZU8MoVE9tDP215qS+7oUrixtpoLUWfl272qCMmaQSYUkkHHXOSenrXW6V1e50Qrzi5KV3d3001LsDX1vO8UsskUSxKrToCU6ljIFHfk8n0o5+WSWhlKMKiut7/8AAsQ3LWM6GVL0ahKknmbzEfu+w9MmuZynGpyrZ9TOhQ9lK0lrbbqaAkW4gE1uUVQN275cKO45+Vf/AB4+1d9CLgtXcxrSb0/r/N/gjoNDvHFg8d1vjDH920xI3n2LHLfgAK7FLQ4KkNdDjviR/wAhbQv+ud5/6LFUv4Fb/B/7dE48f/u3/cSH5nT+IYxNaLG+ADypIyNw6D8eRXDi4uykum562BnyzONu82ttZbw0LLCchFK4w79voTUQfurUqrVxTxTpUpJ311s+3f5FRbmJUXDkK4CjAxwScD86pPQz9vmTjOWnuN326bl/RZY5tXij8xsncxz/AMC5/Mn86Lcyt3QqtfHQjB1LcsvTsv0sdHLpmnu7addTXLmWXzVeNipU46Z7D3rkg40/cZ1LF1FLmiltYjfT7G3nhj+zyyANsS5km6E9ABn8Se/rSk6ig7L0ZXt5ybV16EerR2VvGv225WOVFOx5GIx7bc8148cTiXVs7tLpbYaqRWuxjWN9JdbbW40+PyHba80a7Q3zfK49vXH/ANevXbbp83T8TXlfPzKfT+kWL3TLa71a4BvbhLPbuSH+Bmxzzn8cVyzxikrwX3nTRrSp0l7q5u5maZ9h8PNJbXsUs0sjsI7hCQCh7AA8HrXfRrRrRvYis51ZXTRu294kCLHZtkBC6Y5IBP3c8nP0reOKvsrWPPVH2ju+4WivLq9pc3SO0jSAIHckgjqee3WilKVWpp03NK6hTpOKKXxI/wCQtoX/AFzvP/RYr0F/Arf4P/bongY//dv+4kPzOo1rUrC2eGxvpRELoMEZuFyMcZ7HmpVup6OHpyldrocl4tjkgNpCCJW8japxnI3N/Q1yVKUaekdjTD1oU8Y6k3ZKP3vsYnlnzY4gMpEFLMR3Gf8AGoMljFHCVLv3qknp2T3uX/DoJ1VZpI8r8wVcYLDDH+tNOw8biYylRpRd+VK787JfhY3dY8RyWs6QWOBKMsImYAgd+TyT7V5L9pWb5tFfTud1KFPn5Xq2Z2ka9JPexxvbx3d08mVkLbCCMnGCOwArelFRiorS2x24jC8sG9l951Gs/YbyDyr2dJJOGHlxg8+gBJrWdSmpd35Hl04S/l08znrO4QySpBDJ5UEYXJTKBiOoY8jHpU0q6hd7m8V7Rdtf60Llrb2mo6dhB5R3ZJGSUPcEAjIrSdCm1zxWn4r/AIBTrVKVS0v+HMmHSNUOsG5tRBc20ZMZKyKMHGcdc+hrehGMoe7D8TedWlGFpNpvUvQaReXMzS3sEcQJCiOFsEj0JzwDTnRrTkklb9DGWLpQVots6XTNLhtD57hGlPA2/dQegrthTjThZHm1aspvVnKfEj/kLaF/1zvP/RYql/Arf4P/AG6J5+P/AN2/7iQ/M1vGmmzailukds8wCtnahbHSlBpPU9XB1FC93Y5C2t/FWjHFpb3s9uv/AC7yRSFQPYjkVs4QezsdUpUKj96xoRX13dsDPpviDTZv70ccssf5f/WrGaWz/BmTp0o7OLNL7FrksGYZBOv/AE0EsbEe4J/pXLLC821SSJVSjF/CjJutDvC+5/Du9yMM0c7NkfjXO8vq9Ki+47YY+C6/kUv7HljkV10PV4WU5zAoz/31zUPB4rvB/ebrMo2tdP1Haja38/7xLHX3lyDmRQRkdM8c0qeExSevJ95MMZSWnur+vUHg1O8cG70zWJowcrB5YWMHGOhpfUMTaycECxtGC923r1NjQLfUYbtUXQ3soGGHLN1HpjpXVg8HWozblUTT6HHiq8KsdXdnTXFrbW9swaEBC5kO0HJb1wASTXZCMad7dWcM5ylbW9kZbXtgH2ppt64HcROB+oFaqTZnzSfUpTXUl7qujW1lYahDDDeiWdnidUIxjkntnmqcFyttrY19n7rba2IviR/yFtC/653n/osVkv4Fb/B/7dE87H/7t/3Eh+Z31QdIUAFABQAUAFABQAUAFABQAUAFAHA/Ej/kLaF/1zvP/RYq1/Arf4P/AG6JzY//AHb/ALiQ/MAA/9k=</field>
+        </record>
+        <record id="oetker_margherita" model="product.product">
+          <field name="list_price">2.67</field>
+          <field name="name">Dr. Oetker La Margherita</field>
+          <field name="pos_categ_id" ref="pizza"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGIAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AO78R+KH0vVfsiNcLhA37tEI5/3qxqV4wdnc7MPhvaRvp+P6FFNf168hElm6xqQDuuZYUOD0O0KTjnrVfvJJOKZv7LCUpNVJK67J/wCYq6p4mj3edLBNjqLe4i3D8CvP0zRy1VumDWBl8Mreqf6MWPXdSlhSVJ7ja4BH+rB/9BrB4qPn+H+QSwsYtp8v3P8AzGN4g1Nf+Wtyf+/f/wATR9bh5/gNYWH937n/AJjT4l1IDIa4P4p/hR9bh5/h/kH1SPl9z/zGHxZfr1M/5p/hR9bj5/gP6nHy+5/5jD4xvlBP78491/8AiaPrUez/AK+QPCQSu2vuf+Yx/G9/GxV4bpSOobaCP0pvExXR/wBfISwkWrpr7n/mRt4/u1/5ZXB9fmX/AApfWo9n/XyH9Sj3X3f8EF8fXzsqpbXDljhcEHJ9uKpYlPo/6+RDw1NJtyWnl/wRp+ItyCR5EuR6uB/Sl9aj2f3/APAK+pR7r7v+Cdz4f1NtY0WC+dNjSZyuc9CR/SuiEuaNzz60OSbRy/i61EmumQgf6tRmuHFv3/kd+Df7v5mfH/advbNaxWsFwhVUSZuHRRjgjOCMDH86uljZxjY3nQw1WXPK6fVdH/kPmmu0u3jgsoIl8wNHcumZIkyNvyjjIOcZ/Wtni6kk0mczp4OnZybvbZf59i7cR/2fpLrGGzHHtUnrnoP6VxRjeWpOKrNRlLqNucH7FEh+e6KE47LwSa0VFc/kc88TL2cUt2TPDbG68gEeYc4UDOOM1k6Tep0/WIppX1KpSCYKY0MiOdsZAxvPoP69hTVCQvrsOlysscZmiPl4xK/y5yH2c/lnH61pTpNSuc9fG88eWz31+QxrI3EiZBaWSIStgZwW6DP9T70vY3k7s0+vy5EktWiF9MikL7csvm+VGFABkfv9AKI0o373CeLqtO2lt/N9kMSJo53lV444bQskTHJ2ls4IwOTjnn2qotWvfyRnVcnPlUUravXf1/yKFzo4jB2lyVXe29QCAeBwCSOtZVKairo7MNi5TlyyW60PSPBabPC1ov8Av/8AoRrvw/8ADRyYv+Kyh4hTOr8AE7F6/jXJi/j+RvhX7nzIUO1C7YCqMnPYVzpNmkmkitBcmO3e4aIySSYncZxsTog+uBnH1rr5NEjzoVrXla9/yLeoIHuLW0xks5kYY/hUZ/niiMbO5deXNyx7szLMzSRWN0qEu4YRKfRIyAPxbJrQ5IXai/60Rdgtb4iLbbsg+zPtLkA+a2Ms315oaNIqemnT8RL6FLH7JHFNtkt4WVUEZO/IAznoOh5PrStdlSi4qKW6K0F5oVrblX1KOQrCISyAsFzktyAeSc/lUykrWR2UssrK14vb/hxyXGmQkgS3DPEiITJDLgf3SRtA78ZqZN9hwwMo2d/xXT5kP2vS1S1ZL4KkTHDN8u8kHPJ4zyfpUOTTvbS1ilgKiilrdO5GYo5IwYZ42Hn+aejL249+nrURqqNrrYmrhJvm13a38iKSDetzkP8APIpLvgF+Dnj6n+VE5xcNO5WHpzhXblrovQ7bwsoTw/bKBgDdgf8AAjXfhv4SOfFfxWYHizVotN1+FJ8COWNfm/u8nOf0rmxS99eh2YLDzq0m49GV7y6t5oVgDsFlI3uEYgJ35x3wQKmnTd7tHFiK0WuVPcj86xuEu1fUYY4pn3JtJDDAAAIOOBjpWt9NjBqF2uZWZatdQhkvBIizXEz4hEjAIhA5yCcdT6c0asuLTldXk7djZ/s+KSO3GPKNuwZPL7HGCPpyapblOCsvI4PxVrOuwaxLp4u9iggotsCpIPTPfOPesZuV7H0mX4XDSoqfL9/9WG6Poms3NpKWtbqGV5FcTuq5cAH5TuYEDODxn6VUE7CxeJoRmrNNJbfrombkfhe+jjuooIrdIrp2kkMsrbl7pjaMfKeec/hV2teyPPeMhJxbbvFWVl997vqD6RdwzmUx2znekgUnqykEt90fMcYyMe4NZ+1s9UJVoNWu+v3PpvsU/wCz762mhv3t1mkt41jVRcYQEDG4Lt4OM/ic01VW5p7SnJOCdrvtr6XuclfWMyX9xLbfJHvZowGAbGeBgHOelZycWzvWJhCmufyJtHv9WmuxarMXHVll5OMgcHrnn1qXSix4iFKMeax7D4eG3RIAQARuyPTk13Yf+Gj5vEO9RnnXxNSaTxSixttUWaEkn/afj6nFZ4hLmR6OAxCpUGn3/wAjGvdQE2mWRkuMSIMBRwc45YkdD0HriuduTOihhqUpcqsk9dDMg1y4sN6C8YYjwAzkbhuHT3/wqtXsdUqdGm1GVn56Gxp9tres3/2qKIgy7SrzMF4BBGM89u1ZvezeppOthqVO3bsd2ursZ/s0k+ZsdIl+XPpuPvWaqzk9zxnh0lzW08zM0S9nv9RnDWDRTn/WSN8pJGBgnHNSozcrNnRiIQhTXvXRZ1DVzpt4lq8LMXGS6vwvv0pSUotoijQVWDkmTafrwFs5kyeMlt+7n2xVQxDpqz6mdbCXloSS6ikrALPGxPRc8mk8RfczVBroZXiDW7nRhDMsGc7gCegbjB9+M1rGbvodODw0K102cmouJbB9bu52K3E5RlU4ZvU+3XFOSejPSlGnUl7Hl2RY8M3Bu9biiuJXIVCYlUjAA7dPx49KfM7HNjqUadNuJ6zoP/IJi5B5bkf7xrtoSUqaZ8/Ud5M4T4mWtjLqJlvbySNhaqIoEH323N19uf51nXdpfI9PLaPtFtdX1fY8zHn3Gopb2sZleU7EVeg9/b61ldKOp1VYRoVuZX1OsTRbPSliJEV/qgUtliDFEPYHgn6/lXM6rk9HZA71Zc01oiOO5u7+/wDKjkaa4kJdmSTAUDgZx2o5NLs6G4Qj2R06WM2nPCwUMrqXLx/eDY5PJ5GKjlur3ON1lUuWZNO3xQ3U9zKl0oydoGXJ703LvchVbNxSVgluLiGB51gdn8vDALncfXPQA4FSpNvcSjFu3mZDaTeK5e3NtAowVXdxnH59fWleEmdSxC5bSTYtjo67EuZL1zMpLu5Y474IqpNdERUry2toFx4kezQW9wIb+OVsbJBnj1pxT3RUMMp66xZLquix3Hhpm0xR5ZcymFTkIeNwX8s4/wD1VSm2k2LDV/Z4j338zjtJmuNO1QTxxudiNiXblB2PPrWkmmtzHMMdCpHlh3PZPBczXPha1nbG6RpGOP8Afau+grU0jxm7u55p8ZLtYPFdoHZgBZKcAZH337fhSqxudFCrKC0djE8PRS2Vqby/iaJr6Ipauw6DueOea4a7vouh6tC9Rp9jTmnj+xJp9vYRtuOZZ8lieOMc5qVrqbeynKbd9DT0CKztJEilAi3S8kjBbpx6e1Dld2exnXozSvHXQ7S7i82aNfLPzjLDbkKOw9qmtH300cFKVosddW0U0oZ1OIyGDA/Nn+VTOOtxQm0iCF5MvCnMiyASZAwFIJ/LtxUu623Ldt3tYprAokmRXVXGOhzjjGeSawbsbczsinc215HE6QxwiGQEsmSMue/TkVpGou5cZRbV90Z+n2EemW7T3c8REzBMJxjHVRx7dav2l3tc0qSlUnaK2GW+qS6NeS3T24azkTLFThWwQBjsT1zVcraKlSVZct9UZ3ifS5LK4S/s1kSxvTlwM4VyCcY6AHNOm01qtjyp0Xzqx6N8PlKeDLIHrmQ/+PtXqUXeCOatFRm0cP8AFHRjq3jrTIm+5Jbxxn8ZHz+lZ4ifKbYeF02Hi2S4RlhhiWVEG2CJVGYu2R6V50Je0lrc9XDckI3Zn6b5ml24kvFCXIjYbHODuz3z7YraVr6HRTTqwSXcr32oefOZTteThVCdF/HuaUYG6SpQ/rU7Swlng01JpZQH2ADzGY5J7VjOOp5LtKW33F+0uJLl1AkB+QEtgYbI7VEZu9jKpBR1Eu7qJJhawrGHP+uXuOP8irlJpijTfLd/IhGyWREguAGMnzjflm/zis3FTZpdxWqGSEwOsCedcYU5bIIPqOvBpNNSKT5lfRGHd3FlaRlbaP7Q6jCl2yF57HtyauzvudNOMpbuxXv7eUaVCrkQhhtIkcASc7jg8ng4FUtJXKptObtqXbK//tXRp9Jv7mOW5b/VeWCRyMqc49qHJR16HPWpWneKsjtfBP8AyKVlkbTh8j0O9q9ah/DR5WJ/iMxvF8Sf8JVptyw/1aLz6fM1cmNb/A6MLrB+v6GZ4g0iQXJuYZUldxh43Y4RT1bj0rkS5d2duHrJpJooG+gurs215Gk0cPzOVQEH0A9CapPS5r7OUFeLtctQ6dCoS7TT7eCFZApaYkYUnqPf/wCtTTbTbZnKpd8t23Yt3ghsLlJ55SY5m2phsxhRzkg0raXM05TVl0L9vADNFNA0YiIA2qu3jt9KjluzJz0aZFremrKFlRVVy2S6jDMewyKc7oqjU6EWn2unXUjNGs1tcRH54vMJJ49T/Shcr6FVJzitbNDbzT7a2YCC3m8x23blmIIOD70m7O1gjVlJasyrXSrKKzmkiFyEZtrKTjJB55olNvdG/tJcyWgpFvI8LPEsjRn5ftDMWUeg7c1Lk+WxV2r6/dYq6fILfxDHOyKiM7Q7ugJ9s/lQ78tjSpFSpHpfh1ETRYhH93fIR/321evhf4UfQ8Cv/EZgeMmQ6rbxllyYeh69W5rnxi95eh0YT4fmZN/pcWu28V6ty6MV2uNuQCAcjjnrXGmo7nbSrOk7WucxbJBb3aQvd8+ePMCsN3BA647VtfS9jebckzrxqEMaiJIUltpD8rM/3hk88+9RK0XY5PZy3e5JBaWsyEXXlkRghI1PG0E4GaWncUpSvoiVpoWuIoyjCI4IxwFOBgVLmmhKnJJst3pj8xSspSXaNrAZyM9+1XNLuZ079jA1UGC6a9tpsTxYbYVIEh7jJ9hWaeup0QvKNrDJ9Xi1j7PcBisayBZ4V+8M9TxyMcVT+PUdOCUWupa1O5xGkUcPmJMPlY5HJ9T9Khx1ClC7d3sVkstLmvBYzTSSfIFC+Z14JJzWkU2xSqVEuZIzbq3gvNbS3geP7LHI085Dk9DgcdvT8aaa1OjnnClruej+E5BN4btpB0Yyf+htXp0FamvQ8TEfxGc/4yyPEFuQAQbYAg/7zdK58WtV6HRhNvmZ1g4tLlrWU/6PdDPPZsdPx/pXDJXOqSur9UYWu2X9iTZ02JpfNbc0hUMwOcgZx0q6b5pavY66DU4u61Oih1K1mhtoJoZY5pMANJtDA9cnn+lOTTZy+xmrtbEMEMsV1LJIHlaRi7sWAI9PwqJ3Zo5JpeRZFz9kdIbqNXmkl+VYxle5646d6Iw97Qya5ldaaGhPcRyRfvi0ax8lchWGOxq5NWsYwjK+nU5suLrVIXjTzI2xtaTPynPUetRa3kdmsabuZN4Et79r2wl2upOY5ABvxxnHpVraz2G4tq/U2I71dWs0e03tcx4zat90n14HGOtJU3zWRlGXLe+hUu9P1VbaVI7Z3nDBUIClSPrnirWH12NI4ino+ZETWep2GkSrFpZN0wIbZjkfTPNNUG5GdbExezuegfD4sfA2mFjlijEk/wC+1elD4UeTU+Nmf49sZ5pILq3DeZCmVI79ciubErVHThZaW8zBgKarY7trqe+eCDXE4uLOtSSEs9cktHGn6jGSD92Urw/pn0NDpt6pA0r3TM7U9P1G3vft1uPtFuxDEZyRznFVCEWrHXTrxlHlukX9D1O4jJS5ZoFZ8qsiDrgnI/Gqs1sc9eEb3Mi51XVIb5buYeWjtjOdwYfhRGC6G3LBwtoJc3jX18rz3crRvJ+8ZEAXGOcetCp90OD5Ye6kWXurSBfPsrceSGx85YuGPQnk8Y9qzlBydhxXNpKWpRk1O51i8NshSJZMAbuAoH045rRQ5I3Y17Onrua3h9I9LujcX1ygBV4WZM9xxx/WinNc3kcuKtNe7uXJ9U8LWoBlu5EycAYYnj2xnrWyhTltc5JSqx3sPs9V8Ob/AD4LyQkKcbkcA5BB6jvRaEX1E/aTWyOy8HxeR4UsI9pUBDgEY43HFdVK/IrnPXt7R2NqtDIKACgAoAKACgAoAMD0oATav90flQAnlp/cX8qADyo/+ea/lQAeVH/zzX8qAHUAAAD/2Q==</field>
+        </record>
+
+        <record id="croky_paprika_45g" model="product.product">
+          <field name="list_price">0.33</field>
+          <field name="name">Croky Paprika 45g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAUwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZHljjxvdVz0ycUwG/aYP8AntH/AN9CgCCXVbCFyj3cYYDJAOSB+FAGe3i3TPOSKFLu4Z2Cgx2r7R7liAMe9AFj+21zgW0v4kUWAd/bUIHzwSr9AD/Wh6AB1u1xkJIc9sD/ABosAq6xC3WNx+VOwC/2xbl9iJIxHU4GBSsADWIP4o5V/wCAg/1p2C5aQH7XI2TgxpgY46tSutgEuoUngZWXdjkUIDnNSkOl2c93lpIYIzIUA5IAzx70OVlcqnBzmorqziLn4jxzLkWLxwbgGImAk+o4+v8AiK5/rSb2PTeT1oyS6Nb6W/O/4D9b+JNjahYtGiN5KwyZZM7E9sdSfyr2MLgXVipSdkzxa03Tk49UZUmu3Wt2bPpdnfNPJJskmVciPjJCHPLH9BXLhsoVCq5VZJ9V5+pvVxrnBRgrF2HWLmxsVtW0vUbYIuDLdQud/qS+Dk1zY3B4mc3KLjK/RP8AQ1w1SgklK6MC4u5dU1azgs5nlkMoDpEx27c85xwK3y+nVw9Go6i5VbS/fyLx0qNSUFDV31t2KWta3f2GuXUNlcXdmI5Noj81uOPr36/jXs5fRVTDQlO0m1/X3bHmV21UdtEJbeN/EVv8g1WT5uV3BW/MEVs8FRf2TN1JHbfDvxhquv68mmapFFKrIzLIqbWBAzzjjH4Vx43A06VLnia06rcrHq6gC7kI6+Wg6e7d68i7sdGpLQBxnijVILPTp4/MgdJg0JQnc3zAg/KPQdeRTcJvW2iWvQcHLnXLvfQ8VXUo7GV1eGC8BUAGRTwQfY/gfanQymvUSm0kn3Z69XNouPJaSa3SMfeAa+opzpUoKK6Kx4M6VWrNya3Z1Oh+NrXRtM/s9tH8+LzGl3faNrByoG4HBwRtBHoea468I1J83M18v+CXGjOKtZGxa+PPDp8tWsr+wCyhswyCQBR/B1XC8nkcj1rGVGT+0n6r8eoezkuh1uk3MGrrHeWF5ZXZaWNpHdQJEQBQy46gnlskn0A715mIlQfuzVrX9L9zSMakdV1OX+KWn2ZittSiCrOZTC20feXBIJ+mP1rfh3EuVSdNfCtV95OLpuMU3ueeRRGWUIuMsep6D3r6fRHC2e1/CLRLWCyu9X4a4d/s6nH3UCqePrkH8K8LNq8nJQ6bm+HirXPQlP8Apcgx/wAs05/Fq8mzN7K/mS0DPn3W4ZpPF+tiJA8YuZRIpbA27z/KvoOdRw0L72RzUablWkaOn+A9G0PRP7f8YXLmFj+5tITgyZ6ZPUkjnAxjua46mKqVZ8sfvO1NLSKFuPDF9q19bTaF4Mt7S0e3YpJc3AljkBwQxIPB9BznJ9OJVWMU+abvcd0lqzI0Lwz4g1mxe4tvDllJbO2VlmHl7unCktyOOvueaqpUhF/EwbS6mv4V8I6drOp6zaa7orWNxZQKyxJKygfey3Xn+HHbisqtWUUnF3uKTaR57bwanbyRXFrDdRuQWjkjRgSB1IIrepySTUrMq9i1earqertC2pSSPlf3TMu0MOhI7Hp19q3ymjQw/NGEbNnLjJTlZt6Is2WnBtNursybGQqkYPR+5GfXAH616rlaaRwOScWe3fCuyls/BUTzZBuZnmAPYcKP/Qc/jXzuazUsQ7dFY7MMrUzqUX/iZTN52cwxjys/d5f5uvfp0/h79vMUZczetrL063/NX+R0crtcsVYjwfXbZ7L4kXSyTiEPfF2bGRtf5sHHqDXtOXNhYvyIw2lSaNv44RT/AGbR5FB+zq0qtjoGIXGfwDfrXJgWrs3pdQub/UE+A9jc6fcyxPEwWV4mKsEEjLjI567aVo/WXcNOcf8AFDT9T1PTvD3/AAj1vNcadt/dragkKxC7CcdOOh7c1OGnGLlzbig7XudQrxQ+IrkXRMk1toI+2GM/MfmJ6+vDH8ayfw6dyenzOP8AFeq3vhPWvDWrachk8OQ2qxwKvO5GA3hj/eIwR9PY1pTipqSe41qZHxKsbLTLnQNM0+TfEqzTxj+7HLJuUfQfMB7CujASbq380Y1/4UvQfa2kI8BbHXMkuoZGByMJ/wDX/WvWcn9Z9I/qeda9H5ns2gR+T4e06PaF220fA7fKK+bxDvVl6s9Kn8K9C8FImZ88FQMc9s/41jrcqyvf+v6/roOpjPC/HVjLeeKdVjDgO0o2H3wMZ/CveoWeHic0Kns6zbNq18b2y+G0sPHFj9ojk/dhowrlsfxMMjB9x6etcE8O1P3NDsST1izm9e1bwYmitY6Dfa1FHJKpe2ErCLbn5vlY4Jx+tXGNW95WHr1MnS/F1zo1uLTTdb1S0ttrEoVRwG4wFB6Z554onT5tWkDRFbeKJrGO/eDW78z6lB/pTGFG8x8EbSWJIHJ5HY9KThe2i0EN/wCEot47C102SXUtQ02GUM1nPMsaMo5xlQSOffj+S5He+lwL1sl94i1ObxDqSBDIAtvEowqKBgBR2AHA/OurC01DU5MTUTXKjpreFV0uCIn7srvtHckKP6V0uXvt+RzJaI9gsQRp9sCu0+Uvy+nA4r56fxP1PQWwyMj+1rgeYhPkRfIHyw+aTkrngHscc4PXHE2lv0/r/gBrctUDPJr20GpeK7uQH71y3GM5GcD69q9DEV1TwyhzJNrQyo0nKpzcraTLl9Z250qZnmSUE48t49rAjjpXkYPB4mhiYtapvX0O2viaVSk1azWxykejQ6jeS29no8FzJCitKfkQDccKMnGScHAr6KrUp07c3U82DqS2ZPpHhqz1KEXDaZFBG33VZAWPuR2rwc0z+nhans4RTa3fQ9DDYOpVhzSk1cs6l4Q06NRE9nblJVISSNAhB/DvXZl+Y0sZHS17XOfEUqlF3u7GNpnge1snWW8f7VKOQuMIPw7/AI/lXeooxnWb2OjFtlelaqRg0aWnacLlIUXBcThcd8N3/T9aidTlu/IqMb2PTAAAAOgrxTtKUTsdcukKpsFtCQRJliS0ucrngcDBxzz128KyuLS/mXaYzyPXbG5stdkktnaMm7MaybSVjzk7j7KoLfhU42j7apCV18Oq6nThcSqVGcOXdnH+JrLVtM08XS+KBdSIPMmUXJLOzN1VQSMDcBj2PFaRnKOzOVxT3LFxreoaFq2dOu2SSW1RZZCinzOuCRjGR2PvXuRoQqxXNrY4Z1ZU9jtPDcj3Ol2oVk8zyxlTIAxxweCc9a/Pcxy+rPF1VFXtJ9uup9NQqqWGhLyRLqdzGs4s5nVbgqJFQnnGcZrbJ8JicNiYT5Xa9n8zHFSpzoyjdXtf7jlGj8UXF28tgEnt2uWhjDY6g/y56+1fdudJaPseByyeqNPTLy9LxwanZfZpJHZI2DAh2UAsPbGR/kVL5X8LFqtzpdPZrK6SZDgg/nWNRc8Wi4uzO+ByAfWvKOwhUSfbpSVPl+Wm1uxOWyOv07Dr1PQLm1t/X9f16u2hNTEedeLF1I6rdppohEgYczKSpBQgg49m/SuGriI06+vax2wo82H0etzkrrWNe1LVFil8NQSYDr9saJ41jLDG4Ek5IBPqTmuyhOFaVotM46kZQV2jnfFiy2ushEiIjEKqrHvjjP619FRdlY8+cFJXZDFrM8cIi+SSMchXHQ+xHNY4nLaFefO7p90a4PMMThE1B6eZt+E57zVvEEt7cO0git/LLHoORhf0NVKlChTUYkyqzqycpGmt5caLeyW8mgx3SPMZFuADlgzliCQPQ4/AUvZKprz2IlUcfs3Ni0aXVLqG4k042UNuxZFaRmLHG0degA/nUOKpp63uCk5dLG9bRFsyEdOB9ayky0dqnCL9BXmHYLQAUAcRfvK2ozzsjKsjHB9R2/SrxODVaEbWuu//AABUq7pt3vYi/s+Y2jSwEbW5YFcH2+orkrV54ZctOEVY3pwhWd5ybK93oEd7YyJdhHXbkqQOlGEzGrJ2qS367NBWoU46wX6mFH8MNOnAeKWcDP3fNH9RXqrN6b0Uvmcbw007uJu2OgRaPai3t7byowckgZyfUnvVxxEai+K5EoNPaxaG1Bg9fpROpGO7SJUW9kOUK/3SDTTuriNC1gyIkH8bfzOKicrJsqK1R1FcJ1BQAUAcebu3tLpLbULlIkcuY0J+/g859q6KlRJabmcYt7mw8drcxrOsqfIPlYNxg1yVKaqRszWMuVnPeILGRdOkZLneC4BVR90epP1x+deViMG6Uea9z0sHXjKolY5S11y702+2wOWOQrITwa543WqZ6s8LCpDVHW22o3l1EDJhFPXB5+lehllN1pty2X5nhY9Qoq0d2VdQvf7L0261TyHnNuOEUdsj/H8hXLndWWIxUcNeyX52/pEYKCjBze7INB17/hINLF+1m1qwk2DJyG6dDgZHP6VOVxqYLHKjGXNGS1XbR/cLFKM6fN1OijulhlgaMglWGeM8d6+omnKLOCLSZ0qMroHU5VhkGuN6HQLQAyYsEwgOT3HagDGvdJ+0CNVtVYKCMOeMH25qlIlorf8ACNhrGe0ezTy5gAyiTqc5z0FHMuwWZFa+G3s7ouLeV0ePy2UzbhjHck5Pb6VMlGSaaKi5Rd7mfF4Lit7h5Ilk+btIeg+oFc0cDRvq3Y7quZ15xSVkXV06aBRGiIFHYE16FN06cbRVkeZU55yvJ3Giyu1kZkCqOpz0rnxWGw2Js5xuODqQ2YgguVdWcg7c9B1qsNhsNhr8kbCm6s92ShzGdzoB6kCun2sSORm3o93HcQmON94TuARjPauebTdzaCsi6I2E7yGZyrKqiMgbVIJyRxnJyM5OPlGAOcyUPoAKACgAoAKAEKqeqg/hQAbFxjaPyoAY1tAxy0EZ+qCgBPslt/z7xf8AfAoAkREjXaihR6AYoAWgAAD/2Q==</field>
+        </record>
+        <record id="croky_naturel_45g" model="product.product">
+          <field name="list_price">0.39</field>
+          <field name="name">Croky Naturel 45g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAUwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYEBv7JTg3cAPvIKxeJorecfvRXLLsINQsmOBeQE+gkFJYqg/tx+9ByS7Eonhb7sqH6MK0VSD2aFZjHvLWM4e5iU+7gVEsTRjvJfeg5X2I/7TsB/y9w/99io+u4f+eP3j5Jdhy6jYt0vIP+/gprF0H9uP3oOSXYet1bucJcRN9HBq1XpPaS+8XK+wrXEK/emjH1YU3WpreS+8LMdHLHKCY5FcDrtOacKkZ/C0waaPKvitEo8YaJMMbmtplPz54AJHy9up57/hVVOf6vXvtyaevNG/6Cd/c7e1h/6Uer0wOFvbAW120ckpGWOOlfF4nDVqdRq3U7oPmVyJrIg4JcVhLD4iO8X9zBSj3E+zhekjfiKztOPkPQr/AGm2ZjmaQEEdUI69O1W8PVRp7NkiS2rdLjnvk4oWHr2vysTg10JFihcZWTd7hgazamtyWmh32RDyXapdwHx2QkdURmJPvThCUnZCbOp0SzW0tXCkks3JNfV5NS9nRfmzlrO7PNfipFeDx5pE0hf7E9lIsQL5XzBvL4XPBwY8nHPHpx6tT/d63+D/ANuiZP7H/X2H/pR65TA5TxFAFmumY5ygdR36f45rzK9HmrO+253YeXuo8xudeuJNStxpU8s14ZGj2qOOO23HT3yenNU7u3KehGnBQamlY6G/1o6TZRm/mEl7jJSE4AP171LpQpu7bbOelh/bSfKrR8zN0TUB4hNwYg0MsLqeGzn0z+X8q5K1NKV7bm1VKklrcfqCS6fbTSTXFubgKBbRINm4+nUkn2GOTW+j6NX7aIUailsnbqS6HpGs6inm6hBHZxgYUMxZ2464zx+PrW0cJzq7dzGti4wdonRWGmXlvN5bSRtbkknDfN+WP61jVyinU309DnqYqElonf8ArzN6ytArblOcetZRyb2bvGVzH21zdtU2W6g9Tyfxr08JRdGkovcym7s8s+KtzM/jPRbVkAgitZpEbB5ZgwYZ6cBF/P3rqqJfVaz/ALn/ALdAJRXLTf8A0+h/6Uj1ikSc34rtCo+3pnIh8p/TG4Ef1rGutLnXg5e/bzPK1hj8I6i9+Sri8MkUB242HAbP1PSudS5Yto9CUfayUXocxrGqyTyu7sS7fpWVODm7s7qko0YWRV07W77R45Y7SZozOB5m0DJ9Oeo/CtJ0lN3OS8VZSV2dr4Jtzd2Ul7IBLctIVyxyUXA/LvXBir83Kia1R310Ozs47iBiwkj2jhlJ4rTCRq0nzdPM4q0oTVrM1EmQkYYc8c16ka9OT0ZxOEl0Nm2jxEo/vcVqSagGAB6UwPJ/isjjxjokhdihtZgFJG0EA5I56nI7dhye0TT9hXf/AE7X/pcTWU4unSjZXVaOvq4/5Pr1fz9YqzIqarbC70u4hxndGcVM1eLRpSlyzT8zw/xghvtGgMsojNvKVbd69jXBCT0PdlCF395hWmhWk4WWbUQU6bIo2kY++cYH4muylhalRXSOSti405W3sWJNO0OI48q7b13FAT+O410xyyb3kc7zB9Ik9lfaXppIhbUrcNw3lMpB+vzCiWUyfVCePb3ijpdK8RaXIogTVEVz0W4UxH8zwfzrhxeVVrXQLFQk9UaU91PFIqMCO4xXkSpzg7M6Y8kldHf2e4iFWB3AAmvfV7HlPc06oR5Z8WIpR4n0GUlfKaG4VRk53BRnjpjlffrntU1F/s9d3/5d/wDt0Qaj+7fX2sP/AEr/AIc9TpgHUUAebaj4dtrjV73TLtV+zndcOxXooI24/X9KVChGMZNq+p2VsVJqNuxxwvE1qxu00jwsZ7eINGshuisqnHB2gYH0rvXPBK8reRxNuTuYEHg/xNeXs9mkC+Zb7RKTJ8oJUMBnpnBFdX1mmop3FZmx4O8Ms3iC70nxDZcpB5qBuM/MBkMOorLEV/cUoPqCOei8Maxdp5lvGjQvK0UZZ8bmGfl+vBrZYiCWr6CszofA9zrWi6zHa38fmafFcCGVJDk27nO0r6ZPboa5MXTpVVdb9C4Skj2vTpjJemMnJVC2PTkCvEw1ecqjjLsb1KaUbmtXcjA8s+LDSHxPoCFX8sQ3BViPlJKjIHvwM/UUqif1es/7n/t0fL9X6LqPl9zv7WHf+b7u/n36HqVIYopoTMPxJag20s8WBNLA9uOcbiRlR+Y/WmpW+8pJtHl/htZbTRfFZg3RyAyPGV4Kkxlhj867MU7uJCKcJuNf+FH2fTGe4vUlAuUD5kc7889zxg/QUpJRra7BujrNMZYr3R7O5bdqEOnv5mTllX5B831I/Q1jP7Vtrgc14ui3aNpet6O7Rw6ZdHzYc8I2/BY+4Yfk1a0XabUuqBkvinUoYtT0lbJWeTVpRPIi9fuBF/Un8qzjdOz6AeraNbgSTXJfc7fLx2/zivOoU488p33OirN8qj2NauswPKPisP8AisNEOJ/+Pabll/d9D904+9689NvTPJUf+zVlb7H/ALdETWsHb/l7T1/7e+//AIfTqer0DCgDy34ia+93qqadZzkLbNtYocZfqefbj8jXDiarcrI9vLsKlDnktznPE2uQ2N8JtQ8MPdeZEjNdwXEkSSHHOcDGa9Sg5Tpr3jyK8VCo0l1PPbnV5f7Tmu9O36akhwkUErDYo6DIxmunpaWpiVhqF4JnmW7nEj/ecSHc31PepbjtYDd8JaXd6nqitdQTzWJy0u9yqufr3NcuKxccPG7WvQ1pUnUZ6Zomgwt4mXVmgDvbwiO2jY/JAo9B1J5JyT1NeV/alSV1ZanS8NCOt2ej6Uu1XOAN/OAMAV04WPu83c56j1saFdJmeVfFeIjxXoU2yQBredd5kyhwM4C9iM8nvkelFRf7NW/wf+3RE780P+vtP/0o9VoGRXdwLWzmuD0iQtj1wKmTsmyoR5pJdzx+PRJppmuXO7zM9eu7PU15sad9z6Gddx0XQq3FzqFpdFLZ3kA4JGQOuPf/ACK0jeOzMZ8s/iiPtS99Oq3Gk2rkhs+ZaqxJyMc4+tbrEVEviZyzw9LsbcGm2tqu/wCw2UTD/nnboMfiBXPUzGa2dzD2VNvRDv7SVpQkqn0V+wrirV5VdWbKlyrQ0tPcLcqVGOxrKD94Ulodbp+VdQeuzFe/STUEn2OCTu2aFaEnmHxaijGv+HZRGokaO6VnA5ICqQCfQZP5mlU/3et/g/8Abog1rD/r7T/9KPT6YGV4gmX7ELTeFkuDwPUDk/0/OuTGV/ZRWl7s3w696/Y4qe5a2tCjoUHQlR0yM1lztaNWPStzO6Zmxi3J5kAHqRj+dL2kOjQnzdjTga1hQ7CGJH3s9a5a1ST0asYOM5Mr315vQKDgegrnd2a06aiUBhiO9Nls6nR4YhaxS7MORySTXqYShT5FK2p52IqS5mr6HT2jL5incOeBXac5oUwPM/i1/wAhnw5/u3f/AKAlKp/u1b/B/wC3RB/Y/wCvsP8A0o9MJxQByPiSIy65DeSy+Xb2kfdsZJJJ/p+VeZj60dY9TqoRaVzlLycveAGRRHcuViKjIC7SDkkjPH41zwxc1F6bHTz2smZt5eT2lx5EthI/OFkQcNknn9ensKHJV0pXS0L9qo9GTG4t7J4Dd/u3foDnpzjI7YyB/wDqrH3pp8upU6qsabw2LBftJtwXX5d74PqO36ZpRjifsPRs45S1dx0dhp8nllVhbkiUg5wcfp+nWnKWLjdu+n+YrrQs2lvaROYz5RkD5Ucbtv5ZrTnxiXK77X/pkWjuaepeIbLQ4FaWOZpNuQB7eprvhj41L8qfz2J9g+p0Xh/Vf7Z0W2vinltMmWTOdp9K6qM+aNyJx5XY4X4tf8hnw3/u3n/oCVpU/wB2rf4P/bokP7H/AF9h/wClHpEmSOKBnM674ZfWSVnu3VN2dqDGR6H1rjeFvUcrmsato2KjeD9sEUMF3JFHH0AUH+YNZfUY3bZft3bYmPhg+XtFy4bu2Bz+lR/Z0b7j9v5ELeDreYqbhvOZPulwMj9KpYK2zaD2/kLL4Ot7ggzNvA6AgcU6eEcF7raJdVPdET+CItoWOd4x32gc/pWqoSvqxe0XYsxeEYYnWRJCsi9GCjNZywbkrOTsP2qXQsN4ZS4tTb3NxJMjZB3AZ596FgEtm0Ht/I2tM0+PT7dYYc7AAAPQCumhQVJNJt3Mpz5mcB8Wv+Qz4b/3bv8A9ASt6n+7Vv8AB/7dEh/Y/wCvsP8A0o9NIoAaVB7UAIUX0oGIUX0osAhRfSlYA2L6UWAAi+lMBwRc9KBC7R6UAOAoQHmfxa/5DPhv/dvP/QEoqf7tW/wf+3RB/Y/6+w/9KAD/2Q==</field>
+        </record>
+        <record id="croky_bolognaise_250g" model="product.product">
+          <field name="list_price">1.78</field>
+          <field name="name">Croky Bolognaise 250g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQASAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APYLmfyFztLZ96aVwZQOqOWwsWPrzTsIrS3uptcFYbuBFYZSNrcluOvO4fyosguMk1S9s23XFysuekaRAH8eawrV40kr6s0pwc3oJH4p824a1jgZpIxmRsAKnseetT9Zjy3sybXnyrUgvfFzWQbEQl29lPNZxxsHK1jWWHmoOXYrHx8scMc01nLGkudrFQc4+hrdV4N2OV1LRTa3HxfEHTpGCmRUJ7OjD9elWpx7gq0H1Oj06++3xmVdpjxwynIP41Whadya7iMsBAHzDkUJjOJ1rxLbabJJBH+8nA+ZVYDZkcdjz3xUVayhoaU6E6jSSevUy/8AhJblbf7XCVaRoyFMuCy8jccfh9PauRYifP5HTVwKhC1/e7lHSpL261VEgumSa6cBpH569zmr5VNq54lOc1Kye5vW2jTwLiPWSuSWKS25GTnnvyac8PGS1Nqcp09pfgR3eky3A8tLu0DtwW2SA8nHAxWMcEk9zqljqkocumvqUdZ0RzpUctrcealmmHXB+pI461oqco6uxz1YKUFyvY5/SdPGr6tHp2XDSdCmOPz9q1grs54R5me0aZp8Ol6fDZQZ8uJcAnqfetjtirKxapjPJfG2mQ6Xr13dmRkilw5I5IyOnTI71hKk5T0NFjq0EoRSOdsIdY1yA/2NpDyQocCechYwB15JA/Wt4YOEPiYVPaVGnUm9uhl3F5rNlNPG+r21vJDIY2WFgSSPQgHI/H+tdcMNS7McMLSXRmja6h4pKStpvitLkxQPK6LOQcL1wGAJOOaJUqX8rQ3Sp9mi7qviXx74GuYYtWu4rn7Qm9VlbzQQOD0IxWXsKVTVNr5hCFOzsOi+Jq6tbtZzWa2k0w2lkOUbIx6ZB/OuOrhakXfmuiKyUYPlR0Hw50/ztde+K5EcbHPoTwP6/lVU0cdBanqArQ6QoA8z8Z3EkXxL0m1aOOW2uo0SSKVcqwLEH8R2rWlFWbHBLVmR8QNSmstZ0/TYo0XSYGjzbhRsk9Qw9MEDH1Na0Yppvqa00mmdHqOkaEfFNj4TTRraK0nT7fM6jBcruAQeg+Xn2qFKXK5XJUpWvcx9Lvk17xVrnhy40m0tLK0imWCW3hEUkG07Adw7EE5Hf6U5K0U7jkrRTubGv6bFr+gQa5JaR6jfx6OGismXOWfad/vjnjvWcW4u3mQnZ2OV8PT6LLoieIEsbW3uLFEtL2ERABmMibJV44bGfx+lObYTvqj1HwxaNBppnkjWN7lt+0Dovb/H8axRlTVkbNMsKAPOPiPbL/bthfqWE9miyR4HBw5OP0pwqKLs+pHtOWdu6DWLXQfHeix30GpW9pNCdjPKwADdg3IPGWx9TW0JSgzaLcTmfF+s6gmuaZOfEGkNdWKEx3NmrHr1V+WB6dPfpVwSs9GXBKz0ZR1Hx5qOq2clu+o6bZLdEx3E1tbOJHUA8k88Hpx60uRIOSzKy+PbsXFlP/a0sDWlsIY1tLVRx6MGOG4AqXElxKdpqUmuMbCC3cLNcm71C4ZhmbBJQYAAUDPQdSSayqysjOrLlifQmjzm50azmbq0K5+uOaiLuiYu6RcplBQBzHjTTTdQW9yuB5ZKMT2B5H8v1rGvJRjciVF1Gkjjl0bSbfzzdWQaO4iIkkjmdCwyCcgHB6CsqWJqSWjLnJ0WotHI69pOm2clsbXRLkpecwGWVgH7cetdCxNW2rN487+fRf5mzZ+AbKWNGljjt3IGQN0gB98nmvPlmtRytfQ7ZYZRjq23/Xaw3Vfh/YzXEKQMtoU/1rR5IkHYgE8V1UsZeLbZ5dTnpSs9b7Gna6Lb6XaGC1tpVXqT5bEsfUnHNYSxtOT1Zk6NSWrPRvC77/DtofRSPyJrtptOKaLgmlY1qsoKAM7XiBpEzEj5RuGRkHHP9KiolJWY1zLY8li8TTeILmXTv7MeD5WVmibPljuxzWPsFBOxNSUrqT6GhB4knvdKs7CW1iHl+UrTDOXCcLx296nEO9NryHhK7VaK8yzH4ijUmOLT76dxxhbcgfm2B+teT9Xk+qPXqyu9mRT6zGLmNLqKSzZ1wDLjb8w6bgSMj0rWjRd2r7nPiEvZ3a21I7/RrWUtMzTrLMWbMTrgEknkYHTP5fjVwp1U7JLQ4/awte53/hF92hIuclXcH88/1r1KEeWmkQpc12bgrUANAGX4hjmk0mX7PtMqjcit0c4Py/jUyV0NSaPOZr2Ge+tZ7ZoYbqNXM1uE2Nko3JHcZA+lOpsZ1PhZj2+oCeYSSbN0nOEUKPyHFc81c5W2pXNA67dWzCSO7kQf882+ZT9M9M1hCnKOiPYhmOHnD34u/kUo9UfUNYvLuSIPuhyExuAwVC/Wt+XRHnzrSlJtaXNy8tbcsWinv93z7A6NkkBugC46gf56acquZ8qudX4FmMmlyKTzuV8egYf/AFqqGxtS2OoFWaAaBGB4xcpo6qDgtMo49MGs6rtFiaTaT7nGXGgwvrLalJcvI8sLRqgUL5QJJ4I78ms/a88bsmuraI5y68N3umHzLcfaEJPyp1UZ4478UnNGSg53KEttqVyQi2dwP96IgfmabaSFCndnRaT4ektdNl3zeVdTgfOoz5YByBz196L31G9GWXh8QTP+/wBUg25Jylsu7nrjI4PPWq52PmZ13geMRW1yg7OB+Qq6exdM6sVZowoAyfEFk97bRKpX5Xyd30qZw51YmSd0YI0pIJssTxwRn8jXBXpuLs3odNOSWqQTmBWQbSCT27is4VeRaFTw3tHckWOzmiLJ/PFaKuZSwqi7WKtzBHESFkJPpitYVOYwnSUVuU1JbALqGbop71zfW3zPTQ2+q+7e50XhNDGtwrDBL5/QV6FGSlG6MYJptM6QVqWFAGN4hmuo4UFo0YcMCVk6MO4z601oJmRHql0Yj9q00kqm7Mcg559D0qJxhNajU7D7yGOWzhu0iaJGXlWOSGya4MVRULOK0OzDVXLQzbWKSSTeSVT1BrlOyo4pFqeAbSF79z6V2KnKNJpbnjyqKVW72OdvfCNy+vR6smpZjQqwjwcggdAemCc/nUQ540+Tkdzoc1e99Df8PXs9vq4N3ITHKpHHQH1/SuujHkXKcineVzuB0rctjJZPLXO0sewAoSuBnSJLM5eUAE9BjgCrEJ9m9EH4cUgI7q0eWzaJUzznHrUzjzRsK7WqMz7PJH8giK7e2K540Yx2RM61Se7EKbhuAzkYIqrGZE0IychuRjr2q+eXcnkQ1VeP/VZVsY4Hap1LR0ukXM01oFuF2uvCkjBYeuO1aK9tTWOxfplCHpQA0Yz0oAeKADA9KAE8tMk7FyfagLCMiY+4p/ChCIwqA8Iv5UwJFRRghQD7CkxoAP/Z</field>
+        </record>
+        <record id="lays_pickles_250g" model="product.product">
+          <field name="list_price">1.48</field>
+          <field name="name">Lays Pickels 250g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AO/8Q6vqOn6xHBBOEilh3oCgIJBII/lXBi8RUpTVno0RJtPQhj8TaoAA0Vs/qcEf1rD+0qi6IFKRcj8USnAfTyT6q/8A9atYZi5fYYcxbh8QwyZ32twmBycAj+ddMMTzfZaHzGe/im+Z28nSflBwC8vJ/ACsXjZ30gLmKs/inXF4j021T3d2P9BWM8fWj9gOYj/4SnXtozaWi+p+bj8zU/2lU7f194nJkdl4k1y71S2tzLEFllVSqRdup5PtmijjqtSokurBSbZ2qDDynnl89Mdh7c/r/Qeqra2RtJ6L0/V/10/UwPGVsGsre94zbS4JPZW4P67a4M0hekpdn+ZDMSKNpGAA5rzqNJzZJPFfW8EjRoslzMv3lgXft+p6CvThT5Fors6IYaVry0XmVx4usGYBlmXPTKjH865ajqyerO1ZfNLSxPba9pt2Mx3W3nA3nZ/PGa460sQndOWnmS8JOG8S4t3u+U7JQw4Zf64q8NmVRtQqJu/lqY1MNG11oVn8i5DBHUsg+dQ2dufpXZVoxnG6OWpSlDcf4QtGm1Ke9KnyYQUjLf3j1/T+dZZTTlzyk9loiUjrItvmT4TafMGTtxuO1eegz6Z56Yzxge173X5f101v+ZrO9o69P1fn/l6dXm+K4TP4ZvkXOQgbj/ZYH+lc+NjzUJLyIZxEeoNaaNczM2GSMBGPYkhR/OvNy1txuy8PHmqpEuiA2vhi+ulH7yf5Ix6n7q/+PNXpUlaDZ342XPWjHsEWn2sOsWujRQRzIkfmXcki7i3HAHpzj86FTipKNr9yZV6k6cqnM10SM+TyLfQtY1KSzgKm4MVmu3oOFBH5k/hUOMVCTt10No1KkqlKHM9Vd/16GkNPsoLvT7W5f7NKbYmQoxQSOcABiD0JDcd+laKMINLyMJVatWM2tVf7kZ8X2+x8SQ2xsbaEmKRJZIMqHGMrgFj3HpWTTTat0LrqM8O5czfqeh6BtazkZSMeYQQOgI6/rWuGtyu3c8yJehfdLcDI+WQDjt8qn0Hr7/XsNkkr6ms1aMfT9X5/5enVs1PH9lXeRkeQ+R6/Kamr/Dl6GbPK7uNLzwzfwlXD+UDlOc7WB/pXj5a1yteRrhJcteLL0TFvDem2MWpWyTx7JZd7biDyxHHfJ/SvTk4qCXMkdTlbESm4trX/ACLUk18moC+h1DRY42TEmWO6TjjJ7YpKqm7qUfvM7UuRxan5EGjx3k7RW10tk9iLjfaqIWBO3n5V9O+4+veilPmtta+hVb2cUpRcua2pQ8R3tzJrlzHNpUF7asViTcrlhgc4K9OSayr1bTasmdmBpL2SaqOL+X5DbWC9vPE6Xd3Gg8gDEgj4jjwRtBJz3/WhVLybZFf2VLDuKe/5nqmnJFHYQiHGwrkEd666SSgrHkLYLUYuL3gjM46kc/u06Y/rVJ7/ANf18vzub1fgh/h/VhqTbNLu3/uwuf8Ax01NV8sJPyMWeZaYEkL2zqXjkUo4HcEYNfP5dU5ZakpuMk0aVjZDToYrIQmQY4mC7gx/2vQ+9Xj8vrVI3i22vuZ3rEqTu2WTdC3QpKrKOxA4FeAvaU047GvIpaopXGpOsge1WMyhCgkZCSAfTnFenhM0qUqajKKbWzJeFTerG6VpjyTLLLuIByWY8seuT755pYWnXxda62vq+hpWrQpQsjcu/msnHG1VIAr6CtFRhyroeVKTlds6PSYmg0uCJzllXBrpox5aaQLYlhULLckOjFpASF6r8ijB9+M/QitLI1m24x0e36vb+txL9PN0+5j/AL0TD8wamorwa8jNnl1gWUAqcD27mvmcInzXIZtyXZs7YNgNtAyCcdSB1/Gvcp1XFJeQDYdTS4JjkhDN/CFO7cMZyCQOOD+IpThRrr34plxnKOzIhqNivzCEDEhRufukZx17nHTtmueGCwcXdU1+L/Mp16j6luLVIpm8qMn26cf5x16V2OolGy0Mr3G6hcyQ2sJRVdpJ0UqTj5d3Pcdq8eWKqOtyyel+iN1Ti43O3txi3j/3RXvw+FGYy3k3zXS5HySheAePkU/17Vb+f9dv63ua1I2jDzX6smYZUg+lIyPJrG8WK7S0RAzqu53P8I4/x/SvmYS5I6HTQoKUeZmylws6FXXcp2nB9c5H9KuGJkuZmk6KZK1tDI28qQwHGGI9ehB9zXdQm5LZo5Z0ktin9mg3AGMDGcdRjqf6n6ZqU2mYE0ccKSowBzg9WJ555+vPWqdaKaTfQuNOUuhbltI7uWB5EDRwfNkkgbsf/qrCNDnre0jI0cnBcrR2Vtj7LFjpsH8q9uPwogIUkWS4LnKtICnsNqj+YNOyXf8Art/W5pNxcY27a/e/0JaDM8Zm26dr0gkIHm5QZ9Vbp+lfLV4SUWl0bPRwclKFuxp205FwIgT93j6gCuaM2zacdC3DcvtyvP1FdFHE1EtDnnTVyWSUtFzgH19K2qYiXJroZqmuYgcE7QhOfUVxTmtLM2Xmbdm/mtFaupxIMKw9a9bCV7tQa32OavTurnV20ZhtYoi24ogXPrgV7UFaKRzokPSqAKAPJvE+lJc61dxsBgyEgN7nNfN4yp7Ku7EptO6ZnRaNcxurJqUiFDlQV34/E1ze1hLeKOiOLqrd3NbbdEqwkj3fxYBUN79alqL2djaFacvskyrfXK7MQCPI3NuJI+grWNN1INN6B7RqWkbBJuibah49uprz53g2kdMbS3LsV1JDY+eoPmQMGU575ruwtblp3fRmNdJI7uznNzZxTEAF1BOK+ppy5op9zgJj0qwEdlRC7HCqMk+gpN2A81vtQj1TVHuoxHDEzfKGUkkev49a+XxmJhXq32sIRrCfO5QrD0XArklQm3oXTipSSYkasZMFGOOq46VNKlNy2Z6crJaFlIuc7Cvrk13woO+xi5Fe6vFhkVIkimJHOJlDD8Kqp7OCvJIydRolidriyljVAjYywzn8vyrCM6c6clBEVK/MrHb6DIJdDtGH/PMA/hX0eClzUIPyMEaB6V0gY/im5NvocyI2158RKfQHr/47muTHVHChK270E2cpbxwRRptePaBw2RzXgwpWWwE7RpOCrESZ9Diq5WNOxE1rNgeVcyIoGMDaR/Kmqskae2mynLp8z4SS7lYM23/V5AJ9cfzoqTcUrx3V9/Ow4xnVv7xBFotukySvJ5rqcgghdv4Zr0JZTiKsLLlSa87/AJHHzRT6k8jRQuQrDkYIDZzU0uHKyd+eP4/5CliYrodj4VuoptPlgVyZLeUq4IxjPI/DH8jXp0YRhHli72N0pJao3D0rUZyHi9kvL2GzkYhIBvwp5LH/AAH868zMffaj21M5syUiuoW/0bTpJFP8XlyEn61zRnVgrKDf3gpMtxWmqvz/AGc/PbymXp05JrVfWJL4B3fYWWx1hCWXTpueSBg/1rkeBrpt23C77GfI+rCdhFoups3QjyflP4mu3D1sTTgoezTttdMhwbbd2Pg0/wATXDknQ/LjPeSSMH/Gu6nisY370Y/j/mL2JZk8O6tsJNo6k9drowH5HNa/X8Ul/DRnLDXE0aa90PVjJdWtwsc2Ec+UeeeCfcZNefTxE4VPehZPsdHtJOyZ3x6V6RYUAFABQAGgAoAKAAUAFAAaGAAA/9k=</field>
+        </record>
+        <record id="lays_ketchup_250g" model="product.product">
+          <field name="list_price">1.48</field>
+          <field name="name">Lays Ketchup 250g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQARAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOy8SePLzw5rr2MulLNCyh4X80qXXHJ6Hocj8qYFNfixbFctpMoPoJCf/ZaAFPxUUqTHocz/APbXH/stF0GpA3xQ1V2C23hN3JPRrsD/ANlpXQWY4fFHU4ci88H3KY6mK5V/0Kii47Dv+FvWiH974f1RPoEP/s1FxFm1+MPhW4Dh2vYJFUny5LYlmPoNueaYGPP8TdV1LU7O20+yTToLm4SKJpyHll3MB90cKOef50Aeo0AY3ibw5beI7BYZG8q4hO+CcDJQ9/qD0I/woA8dsZItSdltH3lW2kd6TGjrtJ0O2tl8y/niiLDlJGAP61lVqxprU0hSnLZM37f+zFCrA9uxHQhwTXnVMZWb0VjX6u1umTyxI3JiRvqtcdTMcTTe41TgzMv9MstQjYS2yiUDA+XJ/CuvB5vCt7slZk1MO46rY4vW9HbTZRcxrGUK8FgcfjXqRmpK6MHGwnw/sptb8cw3LurxWaiZwynKkD5cenLepzz6VYj2+mIzvEUk8PhrU5bb/XJaStHz3CnFAHgnhVZbW3ur63Zi8SbQApyCxA4/DP5VlVbUXY6sHBTrRT2O/wBPgSDwI0scck13eOVQTDMpZm24yenAzWUY2pep14mpzYxK9krbbaakFvpVnJrC6JNPKb5IPOneJR5adPl5Oc8ioVCPNy31NJY2fs3UUfdvbXcr27SjQL3Vbe4ukWC5MMCLJgSgMAG/X9KxnhoSg29SpVk6sIuK1Sb8rm4kF3b3sdo1/JNM9m00iOoZk5AGzpznIyaIZbQjL4Vexx1MQpRbUbLm/q5z4ubKbVmtGku5Jr1CHS7T/VuoJGP1HbrW9GUVKyua4mjN0btKy7G58JrSC3TVGiCs7GISPnJJ+bj+XHvXWjzGeiUxEV3DHc2c0E3+qljZHz6EYNAHzlZyyW2i3SupLxXSbx0JHzDr9SKwrfCd+XWdZeh6XqMNzp9noEdrZz3C2rrJMsMZYjCbfzyxP4USvFR02FS5a1Wo3JK6drkUGo2EXiC+mFnqInvYsfazZuAhwAF24yemc+wFJSSk3Z6jlTqyoKN42i9rrXzI9KmsNRsLXQreG8h+w3IMqND98DPLN0UHOcZzxilDlklFX0ZVeNWjL2rtqtNfl+BU169sF8WT3dxq0lhdWirFAREXVhjccheerEY6cVFSS9pvZo6MFSqvDWVPmUnqVLnVrDV/EMepLhVijwhZMGYoGLOR2HYfT2xRGSnVuKdCph8LKMv+Gv0O9+Hp3eHI2fiUgFlAwFHJA+uDXWjxzqaYEF9vOn3HljL+U20e+DQB83+HD9r+16cGKyXEY8ons6kMv6jH41lU+Fm+HqKnUTPTNNsrqC3D3OrXlxIQN5M7Db+AOBXzOOzDF0mrPR/1Y7JKlN6RSNNVZkK/bLhlI7ykn8+orihnmMju7mboQ7FZV03SHhZDKI7ZCY7dFZi8jZBYnoTg45PHNe7hMyoypxk52stV1uZTp1Jtq3/DGANFt9Uu3nuLOKWeZy8jMzjBJzjg9un4V508xqzqe6r3eh6lOtOhTUVJpL0/yLWoWtj4f0pp7OzhEowrEgnIJGRz2NfQ4ehyRTl8Vjy8Ri6lbRttHbeCPJfw9HPBny5WLLnriupHKdBTAOtAHzVo4Gm67OzxnNvIy7c4wwNSykei2uqQlo5p4lWZ48swPUeh9axq4WlVTUop3KU5LZmhm1uAGEhQsM8GvErcP6/u5fJ/5nRDFtbohMFrvy9yW+lZwyGv1lFel3/kW8auiCa9t7SBjDjKnBHc16+Dy2lhtVq+7OarWlU3KF/azap4furjzESJTuZjkkAYPQD0q8TjI0pqFm29iIxurnb+CbD+zfCdnamXzSoYlsY6sTjqemcfhW+HqurTUmrEyVmb1bCCgDwbT9BuNX8QalcSyLbIbyUlSuWJ3ZOB6DI5rmq11GfKld9jSMbxv0NK68P3VvEZ4tUiBWNUYycBW6dR0HvWUcaudxkmminT0umUkkvLKYJdysn7shlcgZO3OMEdMc11xkpLQzasVLe6k3tHDOiDdkhWHTOfTrimIle4mlLp9ujZWQMTvHJxg9B60AdHpF+I/CdyklzDFtcYeT5gwJGeMH+XpXj5nQnOonGLej2/4dGtNpI9F8PsW0eEmQScfeC7Qfw7V6mHg400mrGTd2aVbCCgDwnw9dGGe7a8vGAjkaJZGc5XDY259On6V5tVr63HpodkISdDTU6PS3tr2yClxNEXMhY85w2R9e1eRmFTkxLs3/SNYU5KCTWpdOi6bcxujhiHB6vyMjHB+n8q6sNjIpaP8TGdJnO3Hg26t5laO5jkjZj+8JIYZ9vwruqZlSp0+ZmUaMpOyL9h4esLHHnNJO5GMkkADJOAB9a8itnVZy933V950xwsba6iappcEWkSxwy+VHK4Vt/O3kHjuenSu/LMxniPdna5lXoKCuj0Lw1ereWMm2Ix+U+3HY8DpXsI5UbFMAoA+abG5D6pPDOrtb+c0hCkA8ZJz+VceIhFzT6nqZfGThJnSaDqRhtJGitrhUKfuwwz24/D5f1FeZjMJ7SSf3m9e8Vfsb+kaza6mgJLRy4DbCecdia8urhfYS9538zKLc4cyWhq3EyJGpBVstgc81Fe3LdWZME7kRdSwLnDdAo5rmbvuy0n0LN1pkGqaa1o5dVdeSMDnr/OvZwUVHllHoYVbtNM2PBELW+itCzq5jlZdytnIHTn1xivoqNRVIKS6nBKPK7HRVoIR2CIzscBRk0AfPXhjTobjU79bkqzRswDA5Xk4JHr1/I1hKKlU+R1Qqzp0fddryLOtwvZXsCWV1KBPlVRZCS3TAwenXpWWJXKtDuy6vF83tPkalj4QAjDXN7ci4I5Ns+zb7ZxzXzsszTlZQTXnr/wx04qv7WPKtEbOleHrHT5RO4uLq5Gdk11KZCv07D8q1+ue0hy8ijftoec6dne7ZoSWZZ93A7gCuCeEqp6WNo1VYz9Tu/7OsJJGujCxZVRt3Uk4x+Wa7MqhL26UldEYl+5dG98MGb/AIRlkkUqwmYgE8lSThj9eTX1UUkrI8xu7OyqgK2pS+Tpd3L/AHIHb8lNAHz14a1KSznd7a0KL5ZV2Zsq2eO/f2rGSaldHRTcJQcZO2pvx3kd/rdnd3vlokBIyoyF4O36c4rnxlKdahKK3aLhKnTaSd9TrI7iwGG/tC3XIzxKK8Cnlso73+5nVKsmZ+peMNE0gESXLXMo6JCN2fx6frXbRy+Tez+ehzzqpdjj9d8Xf2k6y20d9ZPtwjw33yN/vKBXoUsHyaaNelzF1b7XOcvb+6uwpurmWdh90yOWx+ddcKUIfCkjOUnLdntPwtvXurS8Lz+ar7GizjKqF5B/E1oiGd7TA5nxr4jg0jSpLSK5jGoXQ8uKM4YgHqxHsM9aAPNbXQ9MsLcbtZjZScYeZcZ9AM4pDuRTtokO8xaraySJ1QPgn6UBcgS6spchJVLYyFBGTQB1VlJpNtokck/lxxlT528Da5Ixhsjn6VzYnL/bTUudLReq9AhiHBNctzPiPhSZmS1g0xnT+9GR+PPX8K9WLpX6HHJVLdS2sOiI6PHLpsY/iUBR+VU5xUXa1+mxChJyV72LXg2/a18VQWcksTiVJEDRkYbgMM44z8px9fevNhOrOTlM9BwpwilE9NrUkjltoJ2DSwRyEdC6A4oArR6JpMUrTR6XZpI/3nW3QE/U4oAY3h7RHbc2j2DH1Nsh/pQBYg06xtf+Peyt4f8ArnEq/wAhQBOVUrtKgr6Y4oAo3Gg6Ndkm50ixmz/z0tkb+YoAzLj4f+Ebk5k0CzH/AFzTZ/6DigAtPAfh+wuUuLO2lgkQ5UpcPx+tAWOioAAA/9k=</field>
+        </record>
+        <record id="lays_poivre_sel_oven_150g" model="product.product">
+          <field name="list_price">1.58</field>
+          <field name="name">Lays Sel et Poivre Oven Baked 150g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOp8Q+MtX0TxHeW0f2d7aIIVSRDwGUY5HPLbhTKUbkLfEm+njE9tp0McY4Ics5z3PGOOfQ0rj5GQS+P9dkTMMVip9SrD+pouHIEPjnxLHGfMgsJT2+Vh/Wi4chDdfEbXo2SN7e0hd+VVEZifzOKa1Fy2In8e+IY3jYzQ7Gba+6EEJnoePfA/GizCyGXXjvXoMD+0o3eVtscaW65JPT8KltopRR6XAWGsXCM+4i1hzz33SZOM8dPQfU9mZW1OM8daDNqHiezmhmSGOezdJ96kh1RgcYA64c4+lDWpcXZFSx8H/Zwlr/aAZFUsj+SQWHXGM9cY70WK5ye68K21np73ME7uyOoZDGFHJ64ycVEtFccZX0M37KyD7vSs/aI05SrLaxvPG8se5SNpPcfSjna2DlTIp7eWyR3VfNiGGZH46VrGqnuZum+hj+H7dPEHj3TJYVkw0oaVNhARVyfwHFU9Sdj3KIL/AGxctvyxt4QV9Bukwf5/lR1MrLmMrxeJIrS1vYQpkt5vusOGVlZSD+Y/Ks603CPMawjzOxxM/iTVPtYis4mu3WRVmit1EaR7u7Ng84Pv+Fcn1icldtJGnJFbK5qWd/Jqtirx3EgHmmOWFnHysp+YY6E8VM6kldN3Vhxt0I0Kjes1xATFgSDdja3XnPtSk2krJ6lJ92U0ay1PM8MySLEeSDwv1BqXOUHZoaaY7UU07yYyZI2efCxt5mQ5PQDnmjnd3psO6H+CdJk/4TNr0/uxDbtuCjAYn5Rn8M11YWpz3RjWR6FEy/2xcqM7hbxE88Y3SY/rXQpXm15L9f8AIw0vsVfEiCTR3XGTvXb9c1nif4ZpT+I4Hw+9tpfhWPULhvlaNri4YjksSS2ffPFcVWHNU/A0TsilBZw2EukXl5IbYyyXN7IGfbhmAwMdzyOPwrSceZSUPJErS1x+r2zy6Nd6leIsU15KnMkWTbxZC89845P19qmnNqoo32X3sGtLiXm+TRb5dPD38lwoE1xHFtRhwoSMd+D15wM5NTBL2kebS2y/VjbdnYdd6e9lqem3s9tJcMgkEhgjL+WSoCKoHRQNwz68ms5N8k47bb/iC3TO08FxSkXdzcRiKRyoEeclF5wCfXufr7V0ZdZp2FVvobcWf7cuvvbfs0OPT70vv/QduT27zHqQ+IGKaaGGOJF6j8K5sa2qV/M0p/Eeb3IV7p7G2hur63SbzJLSOMLEr53YMjYAXPO0Z5/KuaMpct3bbctrUtSzz3civfyafbmCT91ttzO8beznABzx061nzKK0Tf4AOMkX2OS+l1u8eBBl/lRBj6BQax9pJz5VFI1pUnUkktWyX/hIINNS1hNheT/aIBcIciR9h6EjPFa14VVZQ0uvmddHL+fmvNe67O+1yZPEmmTjOZYpDkeXNCwPHUZAI4+teZN5hSqXV5LqnqVLANLVL1TOi8LTLI9zsOVbBB+hxXt4GLhKSatdXsedWjaxtIU/tGYDbvEMZODzjL4zx069/Xp39A57a3KviAZ0l/Z1/mK5cb/Bfy/M0p/Ec1DNHySrlecYGAT6ZNY+yjylc2oCW1QIrbYm5JYkFmJ9h/jXJiUktGyomB4oWS40aWGP+OWJT6cuAP1Irjy/3qkl5fqejgpKFaMn0v8AkzSvIt9+Y4re4MMFxbBXgCv5sMYzt68AOST9K+ger+a+45oS927au1Lfo31+7YpPND/ZVxfGeWP7N9oSR5Ihy80oUuBk5AGQPofpUOS5W+1/xZrGMnUjCyd+XZ9EtvK50PgS8hv5tRuYOUdlYkZ2s5Hzlc8gEjpRQlGcm0YY2jKlyxf9Lpex08asNTnc52GGMDjjIZ8/zFdFtTju7EOuKW0mYDrlf/QhWGMi5UWvT8yqbtI5b7LI2TmL64LH8jxWFOo1GxTWoSQyqGUFuRgHcAO3YClWtJaoEVX06GeKSC5jVo5RhlyTn868aUvZVbq5005OOq3RaRIRCEMcChOFUjC47fSuSvgJVJOdKd/K9mvv/wAy1Vu/euRXCGcr5kkcUQILBGGWwMD+tbQninSVOTUV366fPUpezg7q7Zq+GbgSanIgG1fJO0Z7Aj/GvWyupzTaV7W0ObELS/mdBGso1OdmixCYYwsm4fM259wx7Ar+ftXrpPmb8v8AM53y8q73/r9SHW5Ej0mdnztwBx7kCsMZNQoSbCmryRzCGR0EiKWB6ZBGa8VyqWvE64wV9SpNcXBABkKN6EDFcEsViU9ZM6FSp9iOO8dkYsQxUdx3op1p1JqMtRSpRSujzm81G8lnae7dzKGyYpD8oA9O3r+n4/R0MNSjBWSZzzqyvpoVbbVryEh42KvgBFjbcH56d+aqrhKNRaoUas11PVfAE/8AaGqy3X3fLtFV48nCu20n8iCKjA0Ywba9CcRJtJHf16BzGP4omEWlopbBlmVR+p/pXDmcnHDv5fmbYdXqI5OWe8gUhHDQjnYeSPpXiQr2Vnsd3ImVxq8VxCd1hdKc4G1AVP4nFFVQa1GotdRI7e7uHVnhjWL+7/ER9QR/L8aypwSd0OTTVjB8U2mmaLEZp5popWyY4Y5AQ+R1IIPHNd2HVVu0SXUX2rGJpsN1qtu00Cs/JCxxjAYgdTj610T5+bk1b6lRlT30SOv+GOoTWmu/2XdSRNM6PuVFUbehAJHU/Kfzrqwkffcle1rHJimtker13HIcV8UJmXRrCFGZWe8BDKcEYRu/4iscRFShZmlJ2kcrDeailmD9sikwMGQLgge+QefwrzlgKKd7HV7aViWLVxYQxC6QPGQR56MMk9RkDgfjWdTLrybi9+41X7iXV/qd15kWmL5IQ/MWcbieeAPwPQmtcNlyi7z18uhFSvpoVL7QG1eyDXUMhmwG3d8n+delZWskYddTKEeqWejy2VhALEIvmTSq3zyD0GBxxz9O9Q4prVDUmupD4EmFj4vtCG4eRQW+pGf0zVxIkfQNaEHFfEdVmGkW/wDGZ3kHz4OFTn9SKiZcNzj1vJLCbzhbeZGAcAMqhSeDkn1zSSLbJFle5SSKSO0hV1GzOfMzjqTkg9APf86LCMm6dtO1Mve3o3ttcyQpt3NnrxjsW/SnYR0F/cqLImGSYuMnLccdu/8AnFMDLfw7daloKK7ASf6xGyT27/hWbaKs7Gfp+i3On6va3GQGSeMEEf7QHGOvWhNXE4ux73WxkcL8QLlUvrZZHVFigZgT1JZgOP8Avipki4Hnuo3rPAUWSJUB2vlup9uPT/IoHcl0XULeS0AmeNMZEYY4ITPfNCQXK9xLHNrP71x5IIjUhgQ2ehz6U7CuX7vV7JYJImu4kfbwGcf0p2C5RtPEkVrGbcXsRXHUuP0NICnfa7DPJFv1BVWIjaEkPzemRnseR6UmB7/pF6mo6RaXqOHWeFXyDnORzVIgh1Lw/pOsSrLqFhFcOg2qXHQZzigCEeEvDqoUGiWIBx/ywXtQFxr+DvDbjDaLaH/tmKAGDwV4aAIGj24B9Af8aAuM/wCEF8Mf9AeD82/xoHcH8C+GJCN2jQcemR/WlYLiL4D8LqCBo8P4sxx9OeKLBc2bCxg02yis7VNkMQwi5zgUxAD/2Q==</field>
+        </record>
+
+        <record id="lays_paprika_oven_150g" model="product.product">
+          <field name="list_price">1.54</field>
+          <field name="name">Lays Paprika Oven Baked 150g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APYrhJJLaRIZfKlKkI+M7T2ODTQHjTePPF8EzRz6ogZTjH2aPH8q71hYWOd1WmWB8TPEsfWaxkH+1AwJ/I0vqiH7Ymi+LWtxjE1hYy+6b1/qah4TzH7Yvw/FucKDNpEbnuI5iv8AMGj6p5h7ZGpY/FfQp5RHdxz2eersu5QffHP6VlKg0WppnXWOqafqcYksb2C5X1ikDY+uOlYtNFlqgAHA/GoppJad3+fy/rvuNgasR5ha+EGvrm8W5ESxC5lVWZsMfmPQDn/9ddrr8qXoYqnckj+GenENIdTuHXdjakY4/E9frip+tvsHsEUfEHg6z0mC1ks5ZJRLuDCQjIxjHT61pSruV7kypW2ML7AAcBdtaqZLgytdaVHJksxB7EcGh2YK6KlnY2tvc+Xdhw5YGORXK/h7f/WrComjSLuej+C7rWYteTTJNRluLLyDMPPXc23OMZzwckf4VhPlcb21LV7noY6fjXNTvb5v8/Rf11e5bCrA5Ke+mtteubL7OCrTearFiAMqOePcfqavSwJamddeIrgzSRBgiIm8yRW4KKAcDk5P4ijRAU71NRuto815EVcrnoMkdOw4z09qFVSDlKkNlNIjSOqKnUNuBGPXNXGsDiOt9LTzlcIJMn5QOQa09tdE8hT8UaVG+2WJdssYAYqOMjpRGd0KUTu/Bmiy2Fh9uvMG9u0TfhtwVQOAD05zk445rCcrlJHRr0/E1z0bcvzf5vyX9dXuUxa1Ect4qUPq2lW4XH2qUiVwediqWx+JAH40m7DSuM8T20Y0g20KbpbsiGKPPHPX8AKzi7sqSMaALYXmqSyTSTRQCK1hg67mCDgD1JP86iTbsNGfPohsf7K05YhNNKXllje4ZYzt52gcjGT6c496FVvdhy7FqKGG2tYrCAG5EtxiZ4OEyxJKJ/L2pwk22/ITVipqKOuvSR3MuY7eJCYgcLudiAAOrcLjJ6k0o19rdwcT1G0Qx2cKHgrGoP5V0EEowBx61FNJLTu/zBhVgcp41W6SawvbRI5HtWZmSR9gKkEHntjrWVWSWhUUV9I1IX0DXrI19coCoMAxDEPRWbGT6kVm/htsV1KzW00epS6glrpttO/LPLOzsOMZxgAfhWTmrW1HYmvLF7tIzqs2nuit8mbZjyewy/OfSppyu9LotQcjUtb7SoP9HBjjeAcK8Rj2HHYEcUSk4vRfeaKhO17GNLb2d/rUUzQRtOD8kmAeM9j+NZU63tG47MiUOXU7scCvVOYRRgfiazpRcY283+LbGxa0Ec/4osoNQWO3uI/MjIDFCeDg559qwqt82hcSta3MMZjtVAKkgFFHQA9gPwrCzTLHNZWZds2oGPlG/k4wP8K56k2nuUkUpoftfibSLcAeVHvlI7fLg/0H51vhldL1Noy5Kc/Qlc2k1nPdoLeTz4Jpm8wruZ+dq89ABiuiyeorzhpdq1jM0bTYrLV4Y4ldT5ikYc7WQbFLenLbj7iiNGCle2oqlWU07/1uehVucYi9PxPb3rKgkou3d9LdX/V+u42LWojD8RRndFJvKjGDj65rnraSTLjsYMKySsvlKyLjBxlEPv6ms24tlItycSMY0bfk7mWLk8+9c9WxaE+xySSWs4nmilg3A7GCs4bGRkfQUqVRpNJ2LTstVcu6s0S6e8Vy8mJEKnIBJBHqRxWc8TVpu0hxjf4TI8PQNca3DcxpJBZwqIok6K+M9vqTXfRre0ei0FV92Fnuzuq6jkAVMU0gCqAw/EkqRJEZPugEn9K5sQ7NGlNXMNNVTzU8jHHO6uaU7G8KfcrvJdTuW+0yZHocfpXO7tnQlCPQu/bCvDMAw7jpUyi0zJpFW614MH80hY0z15BxWkXOSsZztHUg8MaxPq/iqCNEcWkSMyuB8rYGPp1NenTgkl5HLzSbueiVqAUAFAGR4ltFudJmc8NGjEN3HFZ1IJo0pO0keaaXqJVSZVbnrmvLldM9Vw00J7vWLmYrHYqYlU/M8g5Yeg9qfMkSqXct21zLKmJWVWAwSBQpx7GU6NnozK8TIbQLcIpkULh1IzuB6it6SVr+ZhKDb06L8Cx4A1NH8QWaKWdmBjUA/Kq4Pbt/9at4JqWppKUJ0XyqyR67XScAUAFAGN4ouRHphtw2Gm7eoHWplFyVioSUXc8s1o3MFtvskRVLYY/ePtjt7VEcDFvU3eNmloQ22oMkgh1CP7JNxkSKVDH8en41x18DOnqtUdVLGQmrPRmj/atrbIXaaPCDLFTmsIUpt2SZpOUUtWZkviFbzduSRLNiVDHG5yOvHpyK7Y0ZUY3ZjTnCs3Ff13NTwKLKDxZZtFtWP5wGI+8SpA//AFVpG7lcVSEadFxR7BW554UAFAHBeLdWij8TJavLgxxjKnjrz/Wt6cXyEN6nN6hqNpGEQBnAlDMu8HC5BxkfStKdOT1JnJbDZZxdQG/msIbh2XJUvnADdQuOMsckZ55q+VJ2uTfqU4TdBlFpp4gQlWG5GK9WIPGP73/jo9KUqce4KTKup2eqXMXlvGnl26LIcKBs3Afj/nNZ8kXdGkZyi00ZOmtcm+giti6SGQZ2n36+3Fc0sPyvQ6linJao+j6DAKACgDx3xncJrOvzSWoOxGAWUdTgAH9RXdRhaOphOV2ZkFlK4RWAkkI6qOv/ANfpWlybG9YaXr0iIttYSALHsXfH8uCcnrxnk1nKUOrKSfQkv/DXi17hpBARETlVjdTtHIAwPYkVCnTKakY0+n6jBexw6ibmJZGGRKWGcnmrXLfSxOppRabp+mSNOkseWXaWRWJXnryBwfX61nJplpHo2m+IdK1ExQW99E87Lny93zcDmudxaLTRqVIyvfWMOo2zW9wZPLbr5crIT+KkU02mDVzJ/wCEJ8PFdpsnIxjH2mXn/wAeqvaz7k8qLmleHdH0NNum6fDb/wC0oy3/AH0ealybKsaVIAoAZNBDcxmOeJJUPVXUMD+BoAgfTLCU5ksrd+MfNGDTUpLqKyFs9MsNP3GysoLYv94xRhd31x1obb3HYs0gAAD/2Q==</field>
+        </record>
+        <record id="lays_paprika_300g" model="product.product">
+          <field name="list_price">1.55</field>
+          <field name="name">Lays Paprika XXL 300g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWK0AKAAUwFxQAlAgoAKACkBZj+4MVlBJLTu/z/AK9RkG2tRnLaJ4mTVWntPtJhvbeRo5IXAJypwSvHI4/Cu6eH5UpW0ZzRq3bV9TT86dmKpqOGXqDCOKy5F2L533I7qbVo4TJaXEMxXHyvFjPPPIPp7VUIU27NNEynJK6Ft5NQmwZLwxMPvRtbjI/HPI96UoQWy/EalJ9Rz35jn+z/ANoK8oH3FRcimqV1flBz1tcztW8Tx6NNbW8ty8t5dyLHDb4XPzHG44HApxoqSbtsJza6nU4rjNiZOFFZpW+8CMCtCjxjxPZSWXjzUUhZ0d5BMhQkEblBOCPcmvfy+anQszw8xbhVujrfDEviK4KrdGO4t1H35l+YenIxn8c1yY1UKSbTsb4Odapujr0KADzIVLL0K9jXz1XNacW+W7PVjQ7lad5ZFZDcrCTwgKjn8ajDZ7hZTUZJp+YTw1Rp2ZyOsprGiQMbC5S3hU8KEVmc+udvP4/nX0+HnRrvXU8msq1JaaHK+F7S+134hWc1zI0zRP8AaZ3b/Z6frtGK1x0lSo8sdLjwbdWd2e24rw7npj0xtGKxpuLTt3f56/iNgorVjOF8V6XH/wAJvYXsgxFLbMJD/uHJ/Qj8q78LX5KE/I4MTQ9pXgu5LYXdzqXhzUL4NJEEYR2kUDFAGPA6deWWvClOWIjKU9ddD6WeHo4WpTpxS21vqUXt9esILyY69uksUV54SS+0t91ckYJrneEVntodHtsLUlFey0k7J7GmZNXEtxb3ZspTb2ouJGKMMZz8vB68VxV8lp1ZPVqyMG8PyqUVJXlboVNZ1B7TVIbK7lgiiZlSS1ETEsGGN28jBx14+nNerhE8JKKUnp/W5g8LHEYeTUW99fTyNDwToKae2oX7AGSeXy19lXr+ufyFe1jq3PJLsjwsHS5It92dURiuM6xV6Cs4JJfN/mMVatjMTxdZmfTRMo+eISKCPR0Zf57aqL92S7oUUvaQfaSMrQd8PhXSI7MwTy+atxPGZlU7eT3PX7v5VxQ92CSsenXlGeIm53StZaBqKm1sdQeTSZ2inuVuC32mMmUhshDgk4zgADJok0k3br3Cm+eUEprRW2enmP1ue1h0C/1C4hnjbUZo45U3qXVRjKjHA4Dce/NObSg2+osLCcq8YRafLe3Y4/WdZGs2Npp1lHd3L27ExzTqpk5wAvHb3+lYSqqVkenHDSoylOXKk1stvU9E8Kzedp1yc523ko/XP9a9aumpL0R8rSd0/VmyRWRoC8Cogml83+f9f8HcYq1TGzI8V6gdO0QyDG6SVEGfrk/oDW2HhzzsY1p8sTN8OWdrbWiR2tsixtlg4wGB9D614mZ5TUnfk3OyOMdXWTNYusL7mtRuHQhQa+dWIxOFmlKGzNVFSWjMy6hur544Y18qGPJUKCME9STnk/412PF4nGWjTg16fqzWHs6N23djNSaPTNNaKGRjIw5cnJzX1WVYB0Y+++Z9f+AeXjMS57aDvh6S2g3DE/eu3P6LXXjf4nyMcJ8HzOnNcx0CKcj8aiEuZfN/n5/091oMVatgzC8bxPJ4akMcRlZJY2CgZP3gP61vhJqFVNuxhioc1O1jn0+32NrA0JkZ8fNhQeoJ9fat/b0KkmuZGSp1YRWhcTxXMF2PEoYD+8ecHGBx19qcsJCQ1Xkhi+JbhixkiwuFIPIAJ7Zx/nmmsNFbC9tJlTVLhrjRftXyKwmTPmZPynGRwDzz6V8xnGPxWHx6pQk1FwvpbfXq/wDM6sPShOndrqdB4GAHhxOF3GRt5WMpk8c4IFdeCqzqU+aTb16u5bjGOiRvtXYSIKlK3UAWqYzL8U3ZsvD9xKqbydqgfUis6rtBvyLppOaRzVpq3k28m4sqqM8HJxXhOqt0dvsnJpBNcW19GNjLFJnOe5+tejhc3dFe9qjlxGActtCkZ2hDpncE4yvQ1ric/i9Ka+bJoZU38bILvU327EkkTzB/CSOcUsHiaWMrxVanGTto7fgPF4F0aTlCT03R1ngIP/wjKs7FmaaQ5Y5PXH9K9LFQjCpaKSVuhx4Vt07s6NqwRsNFAAtNlHL/ABCvDb6RaRAkedcgEg9gpq4JezqN9Is5sRPl5fU88tHuptvnOfsyygBuQ+0Hk+9eNKjG90j18qc3CTfyOguDawWqSWo3IoA243Fj2wax+rRqO0XZl2k5N1P+GK7SXChpp4JI42bIRxyRXFiML7GfLdP0OmhUjVjpdDY5YLhXknxHGg+93/CurLsNXlVThujLGuFOm1J6M7fwLcQ3HhmNrff5ayyKpYY3fN1/WvpsUpKprvZHhYdxcNNrnQNXOjZjRQALTY2cV8T9q2OnO5baszfd652114KiqynB9UcWOmoKLfc4qy230iJ5j4jA3ArgMfb+eK8nH5dXozk9eU97K8fh5UIxi1zWOmt4AUwyDA6EnFeZKPRG85EzpHcKVZll2cZ38Zrqp5TOrBNu1/U4J4+NObSWxm32lpd2nlSwzKHchfKIKrgcFvb8quFSrluKglytW8+r/MipKOOoSTurPy6fodV8O5hJ4caJQQsE7RgNjI4B7fWvbx8Wqt+6PPwck6dl0djqGrkR0saKYCqKTGch8RbX+0LOzsonUT+YZQrHGVAwf1YV35dNU5tvaxxY+k6kElvc5MaTLZ2+No2p1Oa7vbRmzkVGVOPoRMm4ckn8aFSgn8KL9tUt8TLdnfG0txEjYw2eVBGPyrgxVDESq3jtY1o1YJajL3XrplcLJGA3dkAyPwrGWAxE2ndaFuvBXt1Og+F80jQ6pA+3Cyo42jAGQen5CunMV8De9hYCLjzLzO6NecdzG0CFFDGc/regapqs0UsWrxW5iUhQtrnrjP8AF7Ct6daMFblMp03Lqc7d/DjXL18zeKyUB+4LTA/9CrZY3l2ijN4ZPdsgX4V6uOP+ErwPayH9WoePm+iBYSCGr8KNWB58WFh/tWY/+KoWYTXRA8JBk6/Cm4KES+IWY9iLUDH/AI9Q8fN9ENYaKL+gfDcaJqyaj/bdzNIvGwII1bnvg81E8W5xs0io0VF3R25rlNhh60CAGmxikkUgYgY0NCDcaLALk0WAQsaLAKpJoBCmgY09aEIAAP/Z</field>
+        </record>
+        <record id="lays_paprika_170g" model="product.product">
+          <field name="list_price">1.48</field>
+          <field name="name">Lays Light Paprika 170g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTr3XmtLx7Y23zJyNzfeX1FdlLCqcb3OSrinCVrFb/hJZyeIEI/GtfqUe5l9el2FTxDdMwAtFYnsM0ng4JfENYybfwlg6xeGFttiBJj5d8mBn3rlqfV6b96okbxqVpLSBRXWdZlBIijQDriMn+eK6lQod/xOf6xXfT8Bn9t6mWI8xeOoEYrT6rSsR9aq3F/tfVG/wCWoX6KtL6tSXQPrFZlnw/qd5qN5OskhaGFQMlRyxP/ANY1jiqUKaVlqzbCVZ1G7vRG8vT8T/OvNoO8X/if5vzf5/JbLuZV1DT7W9i3TxBmjBKODhl+hrqp1ZQejMqtKM1qjkrG7+2QI2MMeCBXqzjynl05c6FsdUNy+otAwht7JCxlABZyM+vAHBrxa9eVa62SPoI4GGHhBvVyIFvtejileae03ww+fJFKMMiepwP0zmvNeBjLc7n9WvZJ72uh4vNRMgE1tabxa/ayyyMuxPfg81yPJ48/NGTTsJukk9XvbYW51OSDUora5aGNZGVTGzMZVLDg9NuM9cE17WEnOjJKUrnDWwsKtJySd+/Qlmd1QhRlzwoHrXuRseDK6Rv+GbRrTSF343yuznBzjt/SvPxdTnqHdhKfJTNYVyxVl8zpIL+VYdPuZWOFSJmP4CtKavJLzJqO0W/I8+0F/LniB+6cV7NfWLPGw2kkN0eJofDl7DHJCbua52+XJKqEqrDOcn/er57ZM+sqzUqkL3skO1aWQR6tNJp7PDexoZHF7FkbQBsABJwcdsk56UpSSTf6k07e4ude6+z+8fd6lENB1HVLi1mt5Jo4rd4N4ZkHGVAA44bPPPqBRKS5W2OnTbrxpqSerdzn77XotUsrS0toby4likJieSPMg9FyO2eck1i68dEeh9UlTcpScUmuj09Tt4hHPqTM4wEJKL6mvf5mqaPjrJ1GdRaKFtIwF2jbnHpXnzd5M74K0USqcj8TWNKTlHXu/wA36/10WxbEliSaF4pBlHUqw9Qa1TadyWk1Y4Z9N/sy6EKtvA5Unrj3r0lW54nmujySJBpqR3UlzbQRs1w+6XJwwPcj155/Gvm81yupiE+WVj2aGM91J9CSVp7c/NbFsdCtfIVMFisPK0lJfl/kd0ZU6mzM6a21DVHWPy/KgEhkAVcZY5yxPc8n869b6xi8XHljDrd2VlfzbFFUaD5m7sv2a2kSTWlpN5k0LBZyCSQcZA/WvpsrwDwsLzd2+v8AkeXjcRKs/IfMyWUUE0hCjzQOe+eAPxzXqKXM2jg5bWOwj/1Sf7orge53rYVen4n+dY0bcr9X+b/r/LYpi1qI5LXHNvqd1PMNscab8/7IXJP866qb9xJHNOL52YUWt3th4Qj1G7US3ly2LeLHUu3yLwOcDn6Cr5FKpZbFWsbkV29vaia6H2a2ij+aS4kG8njk44H559hWTjd2Q0UD4qs5rG7ubVJ5RABsLRMqzMxwoUnrk4H41fsWmkxXH+HILazt5bP7THPfK3m3zKcnzHyTn8sD6UVZNu9tOgWG3kGo3+rwW7G3jtrO5SbgFmYcgA9Bnv7cUoysn6DcVY7tRhQPQVys2QKMDrnk1nShyRte+r/Ft/hsNi1oI4rxpdDULN7CJSrTTpabjwSGYBvw2hq6KC5Xf5mUndlDV9Nl1i/gsYblrKOwCXCvGgJLncqY9htbI75FaU5qCbavclmZcXV9fau8Fytvdf2d94tGyQwnbnzXBzuPPC57E8ZzWiUVG60v/VhFLTbXUtYuorNLmaMI5vL65ONwdx+7VewYJj6Z9QKuTjBXt5IDR06807w9d6pBZWbh0kHmsQQkMaqMMzHqSSTjqSwHFZTUppNsaR12nW0v2SCWZcXE7iSXHYnt+AwPwrnbLep0tYmgDpxUQSS07v8AMAqwPO/Ez6iNft00/TzdGK4kmYu22MHDKMn23E/lXXSUeXVmTWrI5tRvNJhl1TVTAzAIhS3RsIm7k5JySASeg6VSp82iEU9Q16DX0SxsmZ7NyGup9pVSoP3Fz1Jxg+grSnRlF3Ym0iK91xYtQBtLyGBGbM4V15bGORtPoBnP0FVGhpqJzC21qWdBFeMjxTZ875Rk4PHYZ4A7Ch4fsCqHVWOqs+q2lv5rHzGJIPYAf/qrCdL3Wyr6o6+uM2AUoqyAKYHmmqa5ImtzwIVw87jJboBnt36Vlm1Wrh8PFw6rf7i8HTjUm79C3CEuo2SeMOGHQnn3/wAPwr5vD5niKMrqTfqdtXDwkrNGJrWkXVlb+fYl7iNT80WPmUeox1H4V9flWe0MVLkqWi/XR/5HkYrC1KSvHUxY9dtgkUM8OCFPmsRg7tzEdBnoR3/Cvf8Aq8ndxfp+B531juh0urabGx2K0gwuGG7jIGc89fvUlRqPfQbrI6jQLy2v9TS+gjdRFH1boNxxj/x39a8/EQlTjys7KUlN38j0sdK8s6woAKAPArjUpm1y/lFqkjx3L4baDjLEAH1rbOqEXSpxvo1t9xz4XESjz97nQPqs87CGBTGS6oz9jk8kc8D8a+QxeDp0prXdbHvZfN1oyclsaLTS2NsD9paRRku3A2AVxezd/dKcHUna1kS6qmlyWT3GrxQtGgyXdcNj2PWuzLsfj4VFGjJ3b2/rQ5K+HoyTckrI546RHfW8cskb29guGitYevP8TMfvH+VexW4iq4WpKMLTqbOb8ukUtl+e9jCnlkKyV9I9Ev1fc1LO8tdDs7W2W2kNvNP5bkH5lJPGfX867sszGrj21Ua5rP8AAWKwcMLBOO1z1QDAAHatDIKACgDxm10NfPluhKQ9xIGYyfck3EtheO3Q5rlrY+rjsW8PZJQvbe+lt/J9DJ4aNOiql9/60NObSZvIWOCOJgBzmQAn1/OsK2T16kuZuP4/5Hp4bMqFGCik/wAP8yk9jgMt28rxlh+7Mny8dB16VjLI8anePJ9//ANXntBPRNP0Qup6F/wkdspNzKpRfkGTsz7j8Otc+Cxk8nxDjOEZLrbe3k/0OevTji6V4tr+uqG22pNYOlnrEot3iAG10JVwOAQR1FFXJZ4qpKphlzwbez1V9bNbpmkMdRp01Gp7sktf80aY1XRZ7K4USpdYAcRop+8ORg4GOldWCybH0JJ8ri76Nv8Ar5mVXGUKkWr3R6bG4kjVx0YAivV2OUWgBHYJGzMQAASSe1CBnk+m3aQRKbi3kMijA/djAH4HmvVlCN3ZrU4YQdi42o2jDDW4XPqjD+tSqTe1i3oMaXS2Llo8+YMMGDEYI9CanEYadWk4hRahUUjP/wCEhbRFlTT7MXARl8ySQ8Ip6fL19a8+lkEqs05uy7d/69Drq49RXur/AIBS1ubUdVnSBpomDKzCNol+UDHIOMjr616eBy6jhp88U183r6rZnJiasqq5dH8ippNg0E0jSPtITblTkMCc5x+X+c16OIqKSVjnoQcW7npvw6v7q78OGC9ZmntZWTc3VlJypx26kY9q8XHwjGreOzR24dycNTq65DY5T4iag1poUVskzRPdzqhK9So5I/HAH4114GClUu1sjHEStE5n/hLbSPbHLDnthWyR+JGK7PqNV7GDxMFoQXvifT5LVoltNu8csCDitKWDqKV20RLFQtY5+TULC1jSS1uHJRv9Vycg9sV2f4rGLmlrFkdjeqrXct8joLhBuQqQQRwAPqDVStKMeV7ERqpN36jbnULeW4t7mJtuz5DE/GQf5VUYWi0wlUUmmidrWO4WRft+J/u/f+U85B471nzW6aFqN1vqdr8M7tLWS6sLufddzENHzuDqoPIP4/pXmZnC9pJaHVhHa6b1PQq8s7CrdaZY3sqzXNrHLIg2q7DkD0zVwqzgtGROnGe6Im0LSn+/p8Df7yZq/rNX+ZkfVqX8qGHw3ohcMdKtSV6ZiGPyo+sVbfEw+r0r/CizFplhA4eGxto2HQpEoI/Ss3Um+rNFCK6IZcaPpl5KZbnTrWaRuryQqzH8SKca1SKspNEyo05O7iis3hfQ2OTpkA+gxWixVZfaIeFpP7IHwtoR66VbH/gFH1qt/MH1Wl2JrbQdKs51ntrCGKRPusq8jjFTKvUkrNlxowi7pF+sjQD/2Q==</field>
+        </record>
+        <record id="lays_light_paprika_170g" model="product.product">
+          <field name="list_price">1.48</field>
+          <field name="name">Lays Light Paprika 170g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTr3XmtLx7Y23zJyNzfeX1FdlLCqcb3OSrinCVrFb/hJZyeIEI/GtfqUe5l9el2FTxDdMwAtFYnsM0ng4JfENYybfwlg6xeGFttiBJj5d8mBn3rlqfV6b96okbxqVpLSBRXWdZlBIijQDriMn+eK6lQod/xOf6xXfT8Bn9t6mWI8xeOoEYrT6rSsR9aq3F/tfVG/wCWoX6KtL6tSXQPrFZlnw/qd5qN5OskhaGFQMlRyxP/ANY1jiqUKaVlqzbCVZ1G7vRG8vT8T/OvNoO8X/if5vzf5/JbLuZV1DT7W9i3TxBmjBKODhl+hrqp1ZQejMqtKM1qjkrG7+2QI2MMeCBXqzjynl05c6FsdUNy+otAwht7JCxlABZyM+vAHBrxa9eVa62SPoI4GGHhBvVyIFvtejileae03ww+fJFKMMiepwP0zmvNeBjLc7n9WvZJ72uh4vNRMgE1tabxa/ayyyMuxPfg81yPJ48/NGTTsJukk9XvbYW51OSDUora5aGNZGVTGzMZVLDg9NuM9cE17WEnOjJKUrnDWwsKtJySd+/Qlmd1QhRlzwoHrXuRseDK6Rv+GbRrTSF343yuznBzjt/SvPxdTnqHdhKfJTNYVyxVl8zpIL+VYdPuZWOFSJmP4CtKavJLzJqO0W/I8+0F/LniB+6cV7NfWLPGw2kkN0eJofDl7DHJCbua52+XJKqEqrDOcn/er57ZM+sqzUqkL3skO1aWQR6tNJp7PDexoZHF7FkbQBsABJwcdsk56UpSSTf6k07e4ude6+z+8fd6lENB1HVLi1mt5Jo4rd4N4ZkHGVAA44bPPPqBRKS5W2OnTbrxpqSerdzn77XotUsrS0toby4likJieSPMg9FyO2eck1i68dEeh9UlTcpScUmuj09Tt4hHPqTM4wEJKL6mvf5mqaPjrJ1GdRaKFtIwF2jbnHpXnzd5M74K0USqcj8TWNKTlHXu/wA36/10WxbEliSaF4pBlHUqw9Qa1TadyWk1Y4Z9N/sy6EKtvA5Unrj3r0lW54nmujySJBpqR3UlzbQRs1w+6XJwwPcj155/Gvm81yupiE+WVj2aGM91J9CSVp7c/NbFsdCtfIVMFisPK0lJfl/kd0ZU6mzM6a21DVHWPy/KgEhkAVcZY5yxPc8n869b6xi8XHljDrd2VlfzbFFUaD5m7sv2a2kSTWlpN5k0LBZyCSQcZA/WvpsrwDwsLzd2+v8AkeXjcRKs/IfMyWUUE0hCjzQOe+eAPxzXqKXM2jg5bWOwj/1Sf7orge53rYVen4n+dY0bcr9X+b/r/LYpi1qI5LXHNvqd1PMNscab8/7IXJP866qb9xJHNOL52YUWt3th4Qj1G7US3ly2LeLHUu3yLwOcDn6Cr5FKpZbFWsbkV29vaia6H2a2ij+aS4kG8njk44H559hWTjd2Q0UD4qs5rG7ubVJ5RABsLRMqzMxwoUnrk4H41fsWmkxXH+HILazt5bP7THPfK3m3zKcnzHyTn8sD6UVZNu9tOgWG3kGo3+rwW7G3jtrO5SbgFmYcgA9Bnv7cUoysn6DcVY7tRhQPQVys2QKMDrnk1nShyRte+r/Ft/hsNi1oI4rxpdDULN7CJSrTTpabjwSGYBvw2hq6KC5Xf5mUndlDV9Nl1i/gsYblrKOwCXCvGgJLncqY9htbI75FaU5qCbavclmZcXV9fau8Fytvdf2d94tGyQwnbnzXBzuPPC57E8ZzWiUVG60v/VhFLTbXUtYuorNLmaMI5vL65ONwdx+7VewYJj6Z9QKuTjBXt5IDR06807w9d6pBZWbh0kHmsQQkMaqMMzHqSSTjqSwHFZTUppNsaR12nW0v2SCWZcXE7iSXHYnt+AwPwrnbLep0tYmgDpxUQSS07v8AMAqwPO/Ez6iNft00/TzdGK4kmYu22MHDKMn23E/lXXSUeXVmTWrI5tRvNJhl1TVTAzAIhS3RsIm7k5JySASeg6VSp82iEU9Q16DX0SxsmZ7NyGup9pVSoP3Fz1Jxg+grSnRlF3Ym0iK91xYtQBtLyGBGbM4V15bGORtPoBnP0FVGhpqJzC21qWdBFeMjxTZ875Rk4PHYZ4A7Ch4fsCqHVWOqs+q2lv5rHzGJIPYAf/qrCdL3Wyr6o6+uM2AUoqyAKYHmmqa5ImtzwIVw87jJboBnt36Vlm1Wrh8PFw6rf7i8HTjUm79C3CEuo2SeMOGHQnn3/wAPwr5vD5niKMrqTfqdtXDwkrNGJrWkXVlb+fYl7iNT80WPmUeox1H4V9flWe0MVLkqWi/XR/5HkYrC1KSvHUxY9dtgkUM8OCFPmsRg7tzEdBnoR3/Cvf8Aq8ndxfp+B531juh0urabGx2K0gwuGG7jIGc89fvUlRqPfQbrI6jQLy2v9TS+gjdRFH1boNxxj/x39a8/EQlTjys7KUlN38j0sdK8s6woAKAPArjUpm1y/lFqkjx3L4baDjLEAH1rbOqEXSpxvo1t9xz4XESjz97nQPqs87CGBTGS6oz9jk8kc8D8a+QxeDp0prXdbHvZfN1oyclsaLTS2NsD9paRRku3A2AVxezd/dKcHUna1kS6qmlyWT3GrxQtGgyXdcNj2PWuzLsfj4VFGjJ3b2/rQ5K+HoyTckrI546RHfW8cskb29guGitYevP8TMfvH+VexW4iq4WpKMLTqbOb8ukUtl+e9jCnlkKyV9I9Ev1fc1LO8tdDs7W2W2kNvNP5bkH5lJPGfX867sszGrj21Ua5rP8AAWKwcMLBOO1z1QDAAHatDIKACgDxm10NfPluhKQ9xIGYyfck3EtheO3Q5rlrY+rjsW8PZJQvbe+lt/J9DJ4aNOiql9/60NObSZvIWOCOJgBzmQAn1/OsK2T16kuZuP4/5Hp4bMqFGCik/wAP8yk9jgMt28rxlh+7Mny8dB16VjLI8anePJ9//ANXntBPRNP0Qup6F/wkdspNzKpRfkGTsz7j8Otc+Cxk8nxDjOEZLrbe3k/0OevTji6V4tr+uqG22pNYOlnrEot3iAG10JVwOAQR1FFXJZ4qpKphlzwbez1V9bNbpmkMdRp01Gp7sktf80aY1XRZ7K4USpdYAcRop+8ORg4GOldWCybH0JJ8ri76Nv8Ar5mVXGUKkWr3R6bG4kjVx0YAivV2OUWgBHYJGzMQAASSe1CBnk+m3aQRKbi3kMijA/djAH4HmvVlCN3ZrU4YQdi42o2jDDW4XPqjD+tSqTe1i3oMaXS2Llo8+YMMGDEYI9CanEYadWk4hRahUUjP/wCEhbRFlTT7MXARl8ySQ8Ip6fL19a8+lkEqs05uy7d/69Drq49RXur/AIBS1ubUdVnSBpomDKzCNol+UDHIOMjr616eBy6jhp88U183r6rZnJiasqq5dH8ippNg0E0jSPtITblTkMCc5x+X+c16OIqKSVjnoQcW7npvw6v7q78OGC9ZmntZWTc3VlJypx26kY9q8XHwjGreOzR24dycNTq65DY5T4iag1poUVskzRPdzqhK9So5I/HAH4114GClUu1sjHEStE5n/hLbSPbHLDnthWyR+JGK7PqNV7GDxMFoQXvifT5LVoltNu8csCDitKWDqKV20RLFQtY5+TULC1jSS1uHJRv9Vycg9sV2f4rGLmlrFkdjeqrXct8joLhBuQqQQRwAPqDVStKMeV7ERqpN36jbnULeW4t7mJtuz5DE/GQf5VUYWi0wlUUmmidrWO4WRft+J/u/f+U85B471nzW6aFqN1vqdr8M7tLWS6sLufddzENHzuDqoPIP4/pXmZnC9pJaHVhHa6b1PQq8s7CrdaZY3sqzXNrHLIg2q7DkD0zVwqzgtGROnGe6Im0LSn+/p8Df7yZq/rNX+ZkfVqX8qGHw3ohcMdKtSV6ZiGPyo+sVbfEw+r0r/CizFplhA4eGxto2HQpEoI/Ss3Um+rNFCK6IZcaPpl5KZbnTrWaRuryQqzH8SKca1SKspNEyo05O7iis3hfQ2OTpkA+gxWixVZfaIeFpP7IHwtoR66VbH/gFH1qt/MH1Wl2JrbQdKs51ntrCGKRPusq8jjFTKvUkrNlxowi7pF+sjQD/2Q==</field>
+        </record>
+        <record id="lays_paprika_45g" model="product.product">
+          <field name="list_price">0.39</field>
+          <field name="name">Lays Paprika 45g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQARQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APS9Y8X6NoV0ba/uSk2wOECk7h9emeK2p0JzV0S5JFG2+I/hu5Td9pkiH/TSPH8q0lg6i7CVRCn4jeG/N2LdOw7MsZwf6/pQsHVsJ1oomXx5oDHC3Mh9/Kal9UqB7WIw+P8AQg7KZJgF/iMfB/XNH1WfkHtUK/xA8NouTet9PLahYSr2B1ooSD4heG5m2/bHQ/7ULf0BoeEqroCrQfUkn8eeHIYi4vzKccLHE5J/TFJYWq3sP2ke5vRSCaKKUAgOAwBHIyK5akVzRv0f6Py0/DtfWztHB/EjTz9s0+9Cjy5QYJGK52kfMh9v4v0r08BPeJz19LM42HToZZJIRJvlP3gzcj8K73NLWxy2crq5vaf4eFvte6uFjixwJTjP51xYnHRijpoYWb7s2xZaRGoRXids5wXBzXi1s1n9lHbHCtbonktYJUV47eJzjAyM8V51bNcZTV42ZaoU+pFPptlOCk1sFbGAR0rfC59K9p6Cng4taGJfaHaQhjFsygBZM/MuemRX0OGxvtThq4blV7EWi6TFcXtuxVSHlCgAe+CT+tdVWpaL9DKmtT1b04rw5brTr+j/AK6fo+053x6jnwlcyoNxgKybcZ3YI/xz+FdeE/ipGOIdqbZ57oklrfZup4Xha1RpN5B6KM8HvXfi5OnFnPhEqsloanhRrpLXUtV1CSO6KpnlMdiT1/Cvn6Kvds+gxzSUIR0BNFhgksbaRDNdX3zSAPtEK9+xyf8AA0vZRTV+o3iptPltaK+8gGmrCdcuBD5cNn8luQ/VwOd2OvzYo9lD3geJqNU9rs0reGO3OlRTXUkVxdQs0h804Y4HyjPTr9eKUaNOLi7K5lUqSnz2WiZifbZbDXobO40dbJ5j5DsJy6y7zhSM++P/AK1VRn7OqlaxtWpe1w7kpc2na1jr/BFkrPNKwANq3l4x0bHNevi6nupdzw6MdfQ7A9V+teZUdpR83+j8v8vXo+lFDX1ifQL1ZwTF5LeZg4IXuR7gc10Um1NW3uZ1LcrueReH783FnexSSEzLbyhHJ6jaePrXp5hD927HNl9S81fuakMpuvAhtrK5ghu707sSTBCBuH/sq/rXhJfu9Gj25TX1lOSdkWPtutSX9tfLaaa1xEnlyyfbvvrzwBjC8nOeT2p3ldOy+8hKhaUeeVn5BYahNctd2N5Z2IsprkDfHcMwaQkHbnHznPpgDHpUxlzNqysOahGMZKbbXkZfi7W7ePxLJFcab9rSGFETbM0ZjY5YkEAjoV6jtWdeUVOzVzry3DzlRcoz5de17kNjPf8AirxFYyS27xw2jRlAGJ2qpzksep9/as41faVEjadGnhqM/eTbPTfC5XN6FAGZQ3H417GIWkT52G7N1uq/X+lcNVXnD/F+j+/+n0NV1KWuW73eg6hbRf6yW2kRfqVIFdNKSjNPzM6ivBryPCvDd19lvA7Y25wR6j0r3sRDng0eXhpqMzqNO0TT9IwUh3eax2TYzgdgT2r4TMsHiLPlbTv+B9KsW6iV3oaZW2TiWBB9UBr5tVa1NmnLzbDJ76OIwvDBHK8OTGGYqFJ74AOf0r1MHmfs4cs4Xs7r/gmcsNKT3KlrZ3NzM0ssrhnYvI4JXJP9O1TGpiMZWahu/uRtJ06MLOx08araaWgiOS4yxzyRX1uCwqoxUd7dTy6tRydyz4UYi8u0PdQw/OurFL3UY0/iZ0x6iuGSd16/ozYKsD562JBrFx5a4jimcIo9icCvpL3pL0PEgrVW/M6e21SWytoQcB5n/jbaAK8+dOM2z0YyaRcj8QWzxA3KDOTkjkYGeh79K4MTlNGu/ein+ZtCvKOwPq1lGzAWpEgUttbsB3+lcceG8Le9m/mzR42oRy6/G9oWVQBtBIUjAOMkZ9q9OhgYUVywSSMZ1XLc09Mu2ubER9SGwPxrWUeWQk7o6fw5brD556twCfzrnxMr2KpLc2zjI+tcVRR5o376fczZC1oI8qsbiNZLiKCJUVbhlJHVznkn8c14uNxdWrW5W9DrpUI04aI0v3d2QsqB1Q7lB/KnRxc6c/dfQmdJNamVdaDbSb3t5zlhzGXzn6ev0r2sJm7nZTVvM5KmH5dUZQRPOYkElgVOWJOD2r2b6HLfUmSCF3iOw4KeWSGI47D3rjxGPoUNJSV77dTanQqVNka2hsY7h4gcYAIHPUfWuaGaYfES5U2n5mrwtSmrtaHoOkou2SZDxKFOPQ80VnsiYI0CMkH0Nc04czi+z/Rr9et/vNEMuJPJt5JcZ2IWx64FaJXZLdkeJ6NqEUemPcTORiTc2OScnP8A8VXgY6hOni5QR2wrxdCM31RpQajFNpl1JbzqWWMDOfb5q5nSqU279S6VWFWSSKVhqbSSbEj8whtpz2OM9fzrWHNBX3OmtQUVduxcuJfMUg2y7gcF+4oWNrUk0pOPocShGpK/KmivKhWFdrEndnIrhjVbep3JK5f0WF21AvuJKpkiujDyTqXCTXKeheHnLWTBhjY5A+lfVympxjJdUeLy8smvM1akYyYboJFPdSP0oW4nsfPmmpbCzmiMbTStjuQATngfy/GtM+jGM4SUdXu/uOPC1L0+W+xXVXk1F5WLiK24ALcegX8+1eJiZctPl6s9XK6DqVubojb0bVbfS4WtZTtcne7EZGTjj6jA/WsqdR20PXxeGlWfMthdU1K3kUNaLJLdTEBURmOFB67emev860hRjWfLovPt5t+RzRg8PFylsvvb7ImPm2iq0iuXAztPQexrx2k5NGytPYvaLq6pctHK+3zQFDY/StqMFF+op0tND07RdhtNyYIPcd6+iwsZRpq55FZpzdjQroMxJEDxshJAYEEihAeLX+h/2Z4gljgCSQHEisrgeWSOmPxz9CK7MTRjjKcW7pryumcMYezm0rWZajtYTbeXHFGxyTsyCSxIH414WLw8oVGpH0WXyiqKt8zMv9Ejsx58oXHaIn5nP9BWVLCyqSUYLU7Z45RjdvT+vxGaGfst+8zuEMgwAR09BmuzMsolSpR5Hfv/AF2PMhjvrE2pWXb+u5ryiC4GZZ4s91DjNeB9UrbqL+43VVRe5VuLe2hw4kjUDn72cUlh66duV39DWNeNtWj07wjqEOo6DDJCwJUBW4xyB1/HmvqIUqlKnBTVnY8ac4znJxd1c26oRj+KtZi0TRJJ3yXlIiiVTgsx9PwyfwrSlBzlYmcrI4O300SIrSys08+ZHbsT3H6fpXcsQ1okYewvrcG0q2cI6mT5zgEHHPvUVKiqJc0UzSmp037smitJpiRzRbmLgzBGVh6n6+1aUJRjdRiloTWlOVnKTZsS6dEyMsrF7cxhVtmjG1WH8Wa+Yo5di1i1Ub1Ur81912sdU61J0eW3TYqHw9phkD/2XHGQOoYAGvpvrFTued7KNwuNGtjECmmwMVPHTpRCtO+7CdNNGl4f1GfStUS12RfYGHzOi4VM9BnOCcntXluvUrVuV+Z3QpRp0ro76qA88+Jctw+qaTHEGEdruuGKrkljwuPpg/nXoYGEXGV+uhz1m+ZGCut60yYWznkTOchMZ/T+VdH1einuZudRlmLWNbmZh/Zc5ZhyFUnP4bf5VHsKK+0PmqspXN3rs0sUc9vcbkbKqsYBHp2ya2hChG7RnP2st2S28Pi9JC66dM6McjdbEflxSf1Xv+JKhXTLaW3imU7V0efJ7mMKP1FZv6supqo1OxKNM8X4+XTpFB9WQUvaYbuP2c+w19F8UZy+nynPJUbGB/LFTzYe97lxjNI9C0F7ptHt1vIHgnjXYyv146H8q4K3LzuxvHY0KzGFABQAUAFABQAUAFABQAD/2Q==</field>
+        </record>
+
+        <record id="lays_naturel_oven_150g" model="product.product">
+          <field name="list_price">1.54</field>
+          <field name="name">Lays Naturel Oven Baked 150g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APRPHcl/D4aebTrl7aaOVCXRip25xjP4ipqNqJvhoqVSzPMk8XeIoVxJqtzuH9585+nFcjqTT3PVWGpNfCiRfHXiVTuGqHHoVU5/MU/bS7i+p0uxcg8f+J2LBbmKbaMkmNOPyApqtMiWCpdiST4n6/axoWSzkctgq0LcfkRVqszGeDpruXE+KeqCNXk023II6qGA/mav2kuxk8NT7sn/AOFrXEahpdITBGeZGTP5rR7VroH1RPaRs6D4/Gt6hBZHSpIHmJAYTBgMAnPQHtVRqpuxnUwrhFu51y8D8T/OlRVov1f5vyX9dXu+dmd4isptQ0G7trfHnMoZM9ypDAfjirmrxNKE1ComcO/geENJDPqCmJxvX9y2Vz3B/EcVj9Xb6nb/AGgl0C3+GlrlN2qOwfBUrbnBB981P1XzB5n2j+Jg6zpi6Zfy6dbuzLE/zPjG44/+vXLU9xtHZSq88VJmf5JP38Ow/vc5+vrU8zLbIb97iK02W7mNGP7wIeQPYVvTrX0ZzTp21RDFptvcAiFySTuSdjwM/wB4+mRj8a6LJowTadzpPh1Cx8U2xZYd0e8llPJ+Rh/WopxamViKilSfc9fXp+JrWirR26v835L+ur3fmsWtRHAtr91Z2h8/7MUtT5ZMqElh0z15PA/L2rj9vUvZHZ7Kna7IP+EukljURQRoxYhQYyFJHJx798fpTnWqxV9AjSoydtTJdbvU5pbucL5kp3DAzv5Iz+lc0oubudUJqCsJNo15Eu9oGx6gZrOzRop3IrXRpruQlkKAd2GM0WuNzsSXmkGwUNaEIOSyHhXPuK6IVeXcylFSLPw0sh/wk00zu6vFA2EI68qM/rXTSs3c5cTdRsepr0/E1VF3j83+b8l/XV7vkYtaiPMrdVuvGt1DKA0Vkg2qf77k8/kK4paRfmzpTu/Qm1y2D3VnYgDfEzzuf7qqOCfqaiEbQk36DlK7RV0Oa9k0/TYVusXVyfN+7wVwScj0wR+NCjGMpaaD55NLU1rWS/ub0qbsusUxRlSHamwdSSe+emD2q5RjGPyFGpJy3ITqhLX8sKxusOdhIOFCrksx9Ceg74qfY2tfqV7Zu9h2POsrdLp1eaYA4VepPPA9h/KsppOTtsi4VGkrl7w1ZC213cP+eTL07cH+la4V++TiZc0PmdgowPxNdVGKUfm/zfp/Xfc42KelaiPKtYFxpesT6tbXdnCtyAsguCeq9CoHJ4PSuJe9pbqb7Gjps8b2txKttfXk8yENNKgjEmR0XcRge1Kab6pWGmLo1m9naxlNOnMqLsWSWZGYKOijB4FROSluxpW6F620ySSYtK80ETuWaDzwUJPPPGce2arnur/iLlNOHTLaCKeJU+W4Zmkyud2e30qJVlpvoNRIY9KtYiGQM7gbVdmyVHp7UpvnV1sVFcpY0SPGqyk/wof5irwi99+hFZ+6b69O3U9K7KXw9N3t6v8AHv5mDFrQRwM9ravOs08cZeItsdgMrzziuCKZ0EyzxGSPdl4wCCFBPUe3tUuLjqO9yxFp0UAjljjdMElW3HvWUpvYpIhgP2w6os/yfvYoI3bnbuYDI9K7acVymkp8qjbzZbgtFiTfF9ogAWZiAx5VOBnjqetN0ovoJ1297Pb8SDUZ7iG3mhhkme6iiWQqSE3Hbk4O3nHHHXGaiNGENlqCfM76WvY0PCUxvYpb1uSyoM++Mn+lPDw5ZSOevo7HQr0/E/zrSgrRet9X+bMmLWwjgpwhJcJmQnIITcevb868+EjoaGRiRYmDB1Rjxvkxt+gH4VT5WBcspmhUxRqzRnBICk8/UniueSRaZeSzjlaZgymKcqzRNErfMBjJyD6CtY1ZclojdiJrC1EyMCI5YmLDy+Mk8HOPb+mc1EMZ71paD5ZNaale+h+1/a7yWa4hhfP7vfjnGAMevAq/rHPJ22NI2pxSsmza8J28dr4fghjXbtyDnkn6++MV10HeBxVnebNkVpFNLUzBs4OOtUBxOx0B4yR1xzXlt2OqxXuppfKBt22tnriplJ20LhFX1IIr+7hkyzq3qNtYtvqaqEWatrf/AGoYZypU8gcZFOLYpQHy+IbWIFIU3Mo9OPzqnUv0RPs2jnr3V5rtiXkIUdF7ClzSZoqdjsvBzNJ4fSVmLb5HOSffH9K9TD/AcVdWnY3K2MQoA4K/vYob3BYqDIVJAz0OK86rFbndBFi6ugsW3yvtCspIY8c1CSY+U5261cwEMNNyCM5EhH9KzfI3Y0VN23Gp4jswh8y0nikYYwDn9afIhcsu5VuJhIvmR8L296za1NqfZlRpix2jPvVxia8tj0/wOyt4WtwpztZwf++if616dD4EeVi1+9Zv1qc4UAecaqscmt3KyqNqSMNozlRnqR3z1rklFNu53K/KrdiG91yLRYRuiZ1bhSE+U/j1qPY66MV5HGahr13dSn7M8ltDuJwHzk/lwKaowWr1K959LFKO+1GORZHc3CqckPz+tJ06b8jXlqrzNo6pa3UWFikB28qeNv8AjWKp2eppTjK5TN/822JQuPWtPQ6bdz1zwDk+E7dyQS7ueOn3iP6V2UlaJ4+Md6rOjrQ5goA888U6xbJ4llU7SscYjJ2bgW7g/TNc9SS5tT0KGHm6aaZhzXVtqF1BbywqbWMl2BJXcACT344BFYud3psdKoOEW29WQT6VpjQDyp4QGUupLfNznCnPTAX/AMe+lT8yldPWJFJYaL5jh7sxKH2qqkt8oKjOQOpG44qrDTmloh9gdHt4ZZCziSWJ02YzwSO/TkDt607JE2nJnMzwCG8WKSVI0ONpYZPPYAdaIrUqpJJHvvh/Tf7I0K0scAGKP5h7k5P6muyKsjxqkuaTZo0yClrN+NM0i5vD1jT5f948D9TUzdk2aUafPNI8Xu7wzO25C27ksTkk+tcauz3tIoZDEzruPGO3rRYV+xZjgecYHAHU9qpQuKU0hw09MEiRX9jVchn7S24+0t40dt8JdQDgIAeabg2ZuoktCPUBaIEaO3WKVTxJLjCj2Xpn86OWxF77na/DzxRb3MA0Oe8SS4iyYCXBMi8kj6j+X0raD6HHiYJO6O5qzmM/WdEtNdtltr1pvJDbikchQMffHWplFSNKdV03dGVD8PvDsLhhbSsB/C87EfzqVSibPG1X1HyeBNBlJzBMqn+FLh0/UEH9afJEh4mq+pLb+CvD9rG0cViwRuoa4kb+bVVkZ+1n3HTeDPD1wqrLpqOq9AZHx/PmiyF7SXcIPBfhq2IMWjWvHZl3D8jxRZA5yfUni8L+H4c+XomnjJyT9mQn+VFkLmfcvLZWiMjJawqY/uERgbfp6UwuyagQ/9k=</field>
+        </record>
+        <record id="lays_naturel_300g" model="product.product">
+          <field name="list_price">1.55</field>
+          <field name="name">Lays Naturel XXL 300g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAOwMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOx8QazrFnrstnb36wqEWSNBEpyp45JHqDXHXq1ITsmenhaFGdK7jf5mavibxMj8zpIB32Jg/oKx+s1U9zo+p4Zrb8x3/CX66JgTJgd1NuMH8c5prFTE8BRt/wAEvQeMdclV86ZCx7MMgD6881Sxk/5TKeAor7ZB/wAJV4jVjut48dvk/wDr0vrVTsV9Sw76kUPjfXVuGEtojKB0KEAfiKI4yd9UVPLqPLoyhqni7W47Yzx35ByBgxhVGenIpPETfUung6N7cp2fg+6u73RYLm+lWW4eP5mVsg/vJAMfgBXVQberfRfr5/p8308vFxjGo1Faf8BHL/FKKS1vNM1WAlXCvExHcAggfq1YY5W5Welk7UlODKulldSjSSFwwYDIB5B9K5YrmNq37ptM6q00iKKNTKOfbvXQ1CmtdzzKleUnoXBFFEuxYx9KyeKa2SMtXuyCSOAZDxBc98ZqY42F7SiWlLozI1DT9pJiIYAZ46/WtpQTV4u5vSr9GeY+K7iaS9MTMxRThFB4JrKCvI9qhyqnc910KwGl6fa2IGPs9pFGfqAcn8816cFZ28l+p8vVm5ycu7Mb4j2P23wuXGAbeZZMnsOVP/oVY4yPNS+Z2ZXU5MR6o8+tb660LRftdvH5crSpHuZcjBDE4/KuCneEW0etUhGvX5ZbWZ3N/ardy2cNkSsjw+bNI8jHA4wTk/WuurR5rJbs8qjX5OZy2TsZEt7JZ6N/allqTXEJlESBQRvYnHAP5/SsZUbQck7m8ZRqVVCULOxbN9rR1ttID2c0i24nZ3DAKM4wcd6yqYBzny6bGadD2XtLSWtjLv8AVr5rC3c31rpfnw+bGX3MzjrkcEKDxgE5PtVUcN7CK977/wBC4whKcvdcrPp+pz6wRa34n8P+WgCXc0crqOcDOXH4bSK6KcF7S/c0lVdOjOL6aHtMU6tq1xbgHdHBE59MM0gH/oJrsT99ryX6nkOm1TU+jbX3W/zJ5Yo54XhmRZI3UqyMMhgeoNU1dEJtO6PN71Bb67ZabDBEth9raB/mORyMD3yAfyNcHJFvlX8x6sZvklNt35bk1/rEMmra9aXEps1a3W3tp/KO0YU56D+8x/KtnUXPJPTQyjhpOjTmlfVtrr0/yMtdR0FdH0e3F+ywWN0JJUMLb3YE4JHZcnPPbjrxWalSVOKvs9TeVLEutOXJrKNl2X9I053hhttf8QRXiS/aYxHA6g7UG0KOcc/MR0zWzsuad+hyrmk6dFxas9f69DDku7aLw1Ppmo39hfrFGBYtBJukVuwIxkAe/biudySpOMmn2O+UZPEKdOMotv3k1oN+Fti9/wCI4bl8FNMhkYHsWdmA/Qsa3ox29Dkx01eSXVnr6EfbJBkZ8tOM+7VutzzuhLTEeM6ZaX15loL14riG93NKRuKqA6nAP+8K8fnlDma3uj3sRKCaurrl2+47ONbuKNQdTnfj75Cnd+YryK2c4ulUcW0rHA6VOWqiQ3NlHqBjTUbmW4t0cOYmChSR0ztAJHtW+Hzl1qkY1Wkr6kqLpXcNGZWrSRXOjR6U1x9peRxJctGflXHIVT064wB2Fd+Kxyp0VG6bb6bWNMJCSrc9rW7mRH4UsEge5lWdVAOMyA5P5Vz4OpLFSatZLdnbiMxqxVk1f0Nf4PrGt1rarn5TCqg9lG+vcpbHlYm7tc9ITb9sk/eAt5aZTPIGW5x78/lWi3OezsTUxHkmgSyQatdkgjzLmQKCP4dxry0+Wsz3MTFTpR8kjqYHtfLMSoFVmOMHv7elLEYHDYlWas+55t6kGV5bZW+5c7QexNeTPIaifuyi/XQ2jiV1REtlaxtveTea2o5I7/vJq3Zf5/8AACWKk9EjO1y5eW3eOBSRECxC9Me9em50cPBQVorp/XUzhHXmkanwngVNG1G4IXzJbwglSDwFGBx7k114ealHQyxEk5aHboD9rkbPBRRj8W/z/njZfEY9CWmI84hsopNXvrtZhhrmUooGeC5wa8OriIQqyfmerOo1TjG3RFbUNJuldp7UiTcqqwzgsMnt7Z/n61vTqJpWfQiNRPfQz5Xv0eJ3L/KOm/vkbu/t+vatJTsiowTbEaTUHjdvMYDJIUEZ2847j27/ANaFMHBJjonMUNxHO67pYnPUAHJ/+vXnZnFy5GltIia92x2nw4tYbbwopiMZklmdpvLJIDZxjJ68AfnXtYP+Et/mcNSLUrM6sV0EDJS4hcx/f2nb9aBq1zynw7dB7UAgq5UHBOc9uv5V8djbKTtoz3MTTtNnQCYbAcZz/KihXineVzjlBle8sob4o4kaNwOo5H4160cRSmtJEwnKn0KkFh5auZSXxkccDFcdXGyUmo/eayncxtct0u4A0XyNGDgA9aVDGzUlzC1Ov+FK7fC87b2YtduSG7fKo/pX0dBe6cmKfv8AyOwS7ge8ks1kBnijSV0weFYsFP4lG/KtjnuTUgPFLPTtSi1mV4m228UrxsH6MAxGB+XWvBr4aNVuL77n0lVxlTi+rSOgudRhtIkM0bRDop6g+xxzXHiMClblOSFGcnoNi13T2jDecEPo2c1nTi4OziTPDVL7E0F2l3C00TloSSAxQjOPrXJXU4zd9mxOHLo9zH1AxvHJGpMJHKtniurDyjKa00M5RdjW+Emom4m1izVt0MTRuvORuO4MR+Q/Kvp8MrROfFJ2i3uejLDEs7TrEgldVRpAo3MoJIBPcAs2B7n1roOUh1G6Fjpl1dnGIIXk59gTSlLli2XThzzUe7PEzZazaMlxC0jPPyRGdxyQD8w985r5+nOVSpKKTut/v/zPqVicLKKTa+en3HVaLpV1dWrzavIsxPCQFQFBHc8cmqre05bann4nEU4ytT08y82n2z4LRxPjkBkBx+dcFKFRa8zOV1ZLYlnRY7ZnlYJEi8tjAArpqYd1o+8zOLfNZHJatqmlQozrdRybRwqHJNZQwTUtGdcKFaenKWvglzea0QNq7YuPTlq+jobGGZx5Zo9bFbnmmH41mMHg/UXHeIJ+DMF/rWWIdqUvQ6sDG+Ih6nM6dqFr9iWUsyggY2qd2Og7VVF4KE5Tp2Tlvv8Aqc88Ji1aMle3oXo9RgmHyXBUD+/iupV6X8y+8yeHrfyv7irdTiGUzwzIwI+7gHDdjXBi6s5XXMmjrwuHV1eLTMuaW/mk8xryUeqhiB+Qrz2eqqcErWRxXiOweK8M8DFgwyw64Pepg4x0PSoyvE674KXULXesQkKJnSJwB3Clgf8A0IV6WGVkzxs31lFnrIroPJMDxheWiaBd2sssZmeMFYcjc3II49OOtY15R5Wm0dWDhP2ikk9zzJddu1EjTafHGgK7QoI2r6HByfrXnuXkj3FhV/MzV/tqwkt1mjiaPjkBg3NTOpFK9rERw9RNpu5NDcw3EIlRvlPrxg+lTGSkroUoSi7McssRJHmL8v3uelWk2Q7mfLLIoMdxDDew/wB5GAcD3H+FTZ9dTRLqm0zIsryPwh4ttdYsMtZTDbcR90RuoP6H6iuuhVSdjDFUJVYts92UggEHIPQiu48Mq3WmWF64kurKCZwMBpIwSB6ZqXCL3RcKs4KybQx9G0uRdr6baMPQwKf6UckeyH7ap/M/vFj0fTISDFp1qhUYBWFQQPTpRyRXRA61R7yf3kj2FnINr2kDD0aMH+lPlXYSqTXVkR0XSy4b+zbUMOjCFQR+OKXJHsh+2qfzP7xG0TS5BhrGDHsmKOSL6Aq1RdWVLnwjoV2hWawUjpw7D+tS6MH0NI4utHaRq20CW1tFbx52RIEXJycAYHNaIwbu7gAA/9k=</field>
+        </record>
+        <record id="lays_naturel_170g" model="product.product">
+          <field name="list_price">1.48</field>
+          <field name="name">Lays Light Naturel 170g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APUda1abTHhWKKNvNB5c+mP8a6cPRjUvdnPiK0qdrIqweKUyBc2zJ6sjZ/StJYJ9GZRxq+0jTfVrGO3E73ChSOB/F+XWudUZt2sdLrQSvcrN4l04LkGY/SM1p9VqeRm8VT8xjeKLFVyI5yfTaP8AGmsHU8hPGQXcRfFFkRkxTj/gI/xpvBz7oSxsOzIZPFK/8sbRm92fH8s1SwT6sh41dETaVrc+o3xgNuiKqFmIJOPSorUI043uXQxEqkrWK/jW38zSY5x1glBJ9ARj+eKrAytUt3ROPjenfszk9PnMnmRyEkjkeuK9GasedT97cuCSH7Vb22+SSaUfIiAEgZPXJGB1rirYyNOXLa7PRw2XVKsHO6SXce19bpK0aWd1cSxvsKpHuG4dsg4/WvDx2YZhOXLQil3b1PQo5XTSTnJffb/giLrdqgWQ29xG8jmNQIA25x1UAZJPB4rzW82um6t/L+kdiwFFbKO19+gsmqW7xrP9nmCHh3WBlEXODuz0x3HUV7OCx2K09qkcVfLoNvlaT9d/QJ5HjUjHz9MV7sUmeLK6Oi8LWhismuWGDNgD1wuf65rhxc7zt2O7CRtC/cu67bm60O7hUZYxllHqRyP5VnQly1E/M0rx5qbXkebWrNFdo5BXAwc+9ezLVHiw0kWLERv4yvrp4pGews1dAhJzlB0H/fVfP1v48n2PqaUrYKMV9pjbO9j+06Pc3H22P7NA4eBrOXiZhy7YH8s9axTV09fuOidKUVUiuV3trdbL5l3RGtGtbKW1mMkOmJO8xaJlLSHqeR7k+vtTg1ZW6Gdfni2mviSt6GVc6lbT6N9mubu3mvUA8poN2QCcsHBHQVn7RNavU644ecZ3jF2638uqNS3VryK0Zl3ySwR8MerED+te7hqn7lM+WxlJfWJLzPQbS3W0tIrdeRGgXPrXnzlzSbO6EeWKRKRkYNSUebXukvpl/JbMVYJyhB6qen0r14VlONzyJ0OSVhDYvJdpfbpXCxqjxQtgkgnDEdT1IxXg5xRxEtaXU9jA4iKp8srF94FUEOLiPcOcSuoP4Zr4uri8fRk4ynJM9BQhPVJGfOEWCS1srcJHKixMQ33UHVVXHc5z9a9KObP2HKk1KyX3dV6jjQfPdvZjbXw5p1tGZJrO3aYjKoY1yPevWynBVqnv1r26L/Myx2Z1LcsJP7zf0lF89JXIMgYBQw4A6ZFfQ1LKNlseJTV5Xe511cJ3BQBwF+fM1m9kfczNKV454U4H6CvQg7QXocMlebKtjqqXEl/NgJaWJ2eZjBLqCX/AcY/Gpknou5aSLmlat/aVpFIsbuJfmyUwsa9gT0J+mfwrnxGGpz0nFP11NYTa2ZMNQsRdPbJc24nRC7orDcoHUkdqypYCjS96NNLzsVKtOWjZm6LbveT3GtXG4Pe4EKN/BCv3ePU/eP1rtnJRtFdDC19TRWeYa/YWMVqxQgyPKxwuBjp68kfkazbvFlRjZo7iuU6QoA881S7+xQ6jeY3GN5GUepycD8Tiu2KvZHL1Zm3OlvH4ctvDkAXz7pCZpn6Lghnb3JJAA9/aqjP3+Z9BtaWI77VL5Wh0i5jKOdqymycb5geAEBwVBwST2HfnNEYL4l+INmXH57GTT7GztxJfS+XHDHwkUEZw7M2MkM2VJ74OO1aO27e35kmpYm10jxFdT32ovc3vlJAsY+9IzfMQqDouNoHbrzWc25QSSsikrPc6nQpft1xFqBXC3BxF7Rr0/M5P4iuaWl0adjsKxNQoA8u8STTRzR28NjNdmS8LskY42o+7k9Bzt6+9dsLWu3bQ5rNvRXJTfXibtR1C2htorWJ38pJTJIeO+AAOnvWLqQbUYu7bNlRla70IdQ12wlYrpLwT6jcp5azR4Yxp/eYjoBnOPWhSlFXmrRXf8kP2UW7Rd2yMyR6PLB/Z0SbpFSB3kG7Cr0/iB7k8A+pxXOsaqid3tr/Wh0PCctrIhjvo7u4kuJrOJLmcNA0yj5lXGOuT79D2/ClPF8m0tFqEcKpdDqdGuUguNOso8bI4gqj2AwP5VksW5y9SpYVRi32Ozrc5woA8v1jVjba9NbxAM73DqAf4QDk/pmvIzHF1Emk7WPQoUIqCfcuQTrOoSRVkDg5VhnOf/wBdeHSxlWEr3bZcqaKV1oa2cDy6ZAqdzEigZ+mOv0r1HjKtf4m7+t/1Kw7pwdrJGE1xpZJF5HHFcH/WGRDkjIAB47Dn/IrenVlypOTX3na8G5NyjFP7hRe6UHTy7gKiqNxA6dfbt8o/GiUYt/Ey1haqXwf1/Vzb0vU7Y+K9KtopCXaL5lPYlcgVrTS9pG3YxrYeaw85NdT1KvTPACgDyC/ha88banliFtrhh7ktnj8q+azWfJJ36nuxio4am+6NVLd45FZFG3ByO4PGK8aU04mV7liGWQsAH2kdVNEJ1IysnYmUVYdqK2D2TyapHC0CDLNKo4+ld9LE1e936E0nUjP3G0zzm5un1u5Gn6Pa+VahsxwR9W/2nP8Aj0r0runHmmz6OioUI89Sacu/6L+tTrNF8MPbatazveObpnVt6qu1AOvUEnAz6Vnhcd7StFKOj6nmYrHKdNxUdD1qvoT5sKAPNNUsZLPxdqTqjTR3LrKpRMYPAILHgnJ/IV4WY4SVfEQhHd/1+h6f1uP1eN18Jaeee3TNvZCR84zLIAo/DvV0OH6kXql95zrG0HvJ/cVELmaS+vUMT/dCRsSmPXGetRi8hxU2o04xsOWZYeMbJv7hXMWowNG8azRkcq6ZB/OvCxGFr4Kpyy0fkzpw9eFSKlFmLY6pb+FbmfTZrdo4GbzInRMllPUH1wciu5KpioRlzeTPQnhZ4mKnG19jVsPF2mXFzGkEdyrefGu5lAxuO3PXpzXRhcE6clZ9Tnq4CvGLcrbP8D06J/MhR/7yg19Gjw2rMpa9qqaJol3qTrv8iMsq5+83QD8TilOXLFs1w9F1qsYLqzzHR7u4XT1kvkkeaUl3OOefX8KdDFU4pNx1tubYzLXKrLknG19ti19otjy8Cde4bP8AOt/r1Pz+45f7Jrt6WfzHi4tGXGztg5yRjGO9TWxdGpTceZq6HDK8TCalyrfuVNJuLPTfPjY3Mqlht2qAqjHAHPvXz+Kwca1tb2PWp4Wq+liLX79dTsxBBYI5J4knxuT/AHcf41jSwjpyumd+DoSpTu5fcYWjRyWt+zbCsycgHGD3/wAkeldlO6Z3YtqdO19D3DRZ47nRbOaI/I8Kn9K9SDvFHx1eLjUkn3OL+KF20rWOmLdJbxAmed2bH+yo/wDQvyFc2Klokepk9NJym1fov1MC11+yhhWKW5ilKrjeCckfnj06VzqcEtUzoqYCcpNx2C48UWDxMsbQksCMlj1olJW0THSwEoyTk0Y8+sxuvliZWA6si4GfzrOUaslomd69lF6yX3lu21GJkSPcJGxnAPNOKnGKumQ+WTdmiUXMD5ysi/VD/SnzoORrsMZcTLLG6sADww5GfQ/0NCYXvGzO3+G+rNd2V3Yz5E0UnmqvZUbgAfQqfzFduHnzKx4ma0OSaktnp8zq7nTbG8YNdWcE7AYBkjDH9a6ozlHZnlOEXuip/wAIxoJOTo9kfrAp/pT9rPuxKnFdA/4RjQc/8gey/CBf8KPaz7sfJHsOHhvQxx/ZFnj08lf8KPaz7sOSPYmh0bS7Y5g020iP+xAq/wAhS55d2PlXYlfT7KX/AFlpA/8AvRg/0pczHYrvoOkyDDadbn6IBRzAm1s397H2Wj6dp0jSWdpHC7DBZRzj0pWV9l9xTnNqzk36tv8AMP/Z</field>
+        </record>
+        <record id="lays_light_naturel_170g" model="product.product">
+          <field name="list_price">1.48</field>
+          <field name="name">Lays Light Naturel 170g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAQAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APUda1abTHhWKKNvNB5c+mP8a6cPRjUvdnPiK0qdrIqweKUyBc2zJ6sjZ/StJYJ9GZRxq+0jTfVrGO3E73ChSOB/F+XWudUZt2sdLrQSvcrN4l04LkGY/SM1p9VqeRm8VT8xjeKLFVyI5yfTaP8AGmsHU8hPGQXcRfFFkRkxTj/gI/xpvBz7oSxsOzIZPFK/8sbRm92fH8s1SwT6sh41dETaVrc+o3xgNuiKqFmIJOPSorUI043uXQxEqkrWK/jW38zSY5x1glBJ9ARj+eKrAytUt3ROPjenfszk9PnMnmRyEkjkeuK9GasedT97cuCSH7Vb22+SSaUfIiAEgZPXJGB1rirYyNOXLa7PRw2XVKsHO6SXce19bpK0aWd1cSxvsKpHuG4dsg4/WvDx2YZhOXLQil3b1PQo5XTSTnJffb/giLrdqgWQ29xG8jmNQIA25x1UAZJPB4rzW82um6t/L+kdiwFFbKO19+gsmqW7xrP9nmCHh3WBlEXODuz0x3HUV7OCx2K09qkcVfLoNvlaT9d/QJ5HjUjHz9MV7sUmeLK6Oi8LWhismuWGDNgD1wuf65rhxc7zt2O7CRtC/cu67bm60O7hUZYxllHqRyP5VnQly1E/M0rx5qbXkebWrNFdo5BXAwc+9ezLVHiw0kWLERv4yvrp4pGews1dAhJzlB0H/fVfP1v48n2PqaUrYKMV9pjbO9j+06Pc3H22P7NA4eBrOXiZhy7YH8s9axTV09fuOidKUVUiuV3trdbL5l3RGtGtbKW1mMkOmJO8xaJlLSHqeR7k+vtTg1ZW6Gdfni2mviSt6GVc6lbT6N9mubu3mvUA8poN2QCcsHBHQVn7RNavU644ecZ3jF2638uqNS3VryK0Zl3ySwR8MerED+te7hqn7lM+WxlJfWJLzPQbS3W0tIrdeRGgXPrXnzlzSbO6EeWKRKRkYNSUebXukvpl/JbMVYJyhB6qen0r14VlONzyJ0OSVhDYvJdpfbpXCxqjxQtgkgnDEdT1IxXg5xRxEtaXU9jA4iKp8srF94FUEOLiPcOcSuoP4Zr4uri8fRk4ynJM9BQhPVJGfOEWCS1srcJHKixMQ33UHVVXHc5z9a9KObP2HKk1KyX3dV6jjQfPdvZjbXw5p1tGZJrO3aYjKoY1yPevWynBVqnv1r26L/Myx2Z1LcsJP7zf0lF89JXIMgYBQw4A6ZFfQ1LKNlseJTV5Xe511cJ3BQBwF+fM1m9kfczNKV454U4H6CvQg7QXocMlebKtjqqXEl/NgJaWJ2eZjBLqCX/AcY/Gpknou5aSLmlat/aVpFIsbuJfmyUwsa9gT0J+mfwrnxGGpz0nFP11NYTa2ZMNQsRdPbJc24nRC7orDcoHUkdqypYCjS96NNLzsVKtOWjZm6LbveT3GtXG4Pe4EKN/BCv3ePU/eP1rtnJRtFdDC19TRWeYa/YWMVqxQgyPKxwuBjp68kfkazbvFlRjZo7iuU6QoA881S7+xQ6jeY3GN5GUepycD8Tiu2KvZHL1Zm3OlvH4ctvDkAXz7pCZpn6Lghnb3JJAA9/aqjP3+Z9BtaWI77VL5Wh0i5jKOdqymycb5geAEBwVBwST2HfnNEYL4l+INmXH57GTT7GztxJfS+XHDHwkUEZw7M2MkM2VJ74OO1aO27e35kmpYm10jxFdT32ovc3vlJAsY+9IzfMQqDouNoHbrzWc25QSSsikrPc6nQpft1xFqBXC3BxF7Rr0/M5P4iuaWl0adjsKxNQoA8u8STTRzR28NjNdmS8LskY42o+7k9Bzt6+9dsLWu3bQ5rNvRXJTfXibtR1C2htorWJ38pJTJIeO+AAOnvWLqQbUYu7bNlRla70IdQ12wlYrpLwT6jcp5azR4Yxp/eYjoBnOPWhSlFXmrRXf8kP2UW7Rd2yMyR6PLB/Z0SbpFSB3kG7Cr0/iB7k8A+pxXOsaqid3tr/Wh0PCctrIhjvo7u4kuJrOJLmcNA0yj5lXGOuT79D2/ClPF8m0tFqEcKpdDqdGuUguNOso8bI4gqj2AwP5VksW5y9SpYVRi32Ozrc5woA8v1jVjba9NbxAM73DqAf4QDk/pmvIzHF1Emk7WPQoUIqCfcuQTrOoSRVkDg5VhnOf/wBdeHSxlWEr3bZcqaKV1oa2cDy6ZAqdzEigZ+mOv0r1HjKtf4m7+t/1Kw7pwdrJGE1xpZJF5HHFcH/WGRDkjIAB47Dn/IrenVlypOTX3na8G5NyjFP7hRe6UHTy7gKiqNxA6dfbt8o/GiUYt/Ey1haqXwf1/Vzb0vU7Y+K9KtopCXaL5lPYlcgVrTS9pG3YxrYeaw85NdT1KvTPACgDyC/ha88banliFtrhh7ktnj8q+azWfJJ36nuxio4am+6NVLd45FZFG3ByO4PGK8aU04mV7liGWQsAH2kdVNEJ1IysnYmUVYdqK2D2TyapHC0CDLNKo4+ld9LE1e936E0nUjP3G0zzm5un1u5Gn6Pa+VahsxwR9W/2nP8Aj0r0runHmmz6OioUI89Sacu/6L+tTrNF8MPbatazveObpnVt6qu1AOvUEnAz6Vnhcd7StFKOj6nmYrHKdNxUdD1qvoT5sKAPNNUsZLPxdqTqjTR3LrKpRMYPAILHgnJ/IV4WY4SVfEQhHd/1+h6f1uP1eN18Jaeee3TNvZCR84zLIAo/DvV0OH6kXql95zrG0HvJ/cVELmaS+vUMT/dCRsSmPXGetRi8hxU2o04xsOWZYeMbJv7hXMWowNG8azRkcq6ZB/OvCxGFr4Kpyy0fkzpw9eFSKlFmLY6pb+FbmfTZrdo4GbzInRMllPUH1wciu5KpioRlzeTPQnhZ4mKnG19jVsPF2mXFzGkEdyrefGu5lAxuO3PXpzXRhcE6clZ9Tnq4CvGLcrbP8D06J/MhR/7yg19Gjw2rMpa9qqaJol3qTrv8iMsq5+83QD8TilOXLFs1w9F1qsYLqzzHR7u4XT1kvkkeaUl3OOefX8KdDFU4pNx1tubYzLXKrLknG19ti19otjy8Cde4bP8AOt/r1Pz+45f7Jrt6WfzHi4tGXGztg5yRjGO9TWxdGpTceZq6HDK8TCalyrfuVNJuLPTfPjY3Mqlht2qAqjHAHPvXz+Kwca1tb2PWp4Wq+liLX79dTsxBBYI5J4knxuT/AHcf41jSwjpyumd+DoSpTu5fcYWjRyWt+zbCsycgHGD3/wAkeldlO6Z3YtqdO19D3DRZ47nRbOaI/I8Kn9K9SDvFHx1eLjUkn3OL+KF20rWOmLdJbxAmed2bH+yo/wDQvyFc2Klokepk9NJym1fov1MC11+yhhWKW5ilKrjeCckfnj06VzqcEtUzoqYCcpNx2C48UWDxMsbQksCMlj1olJW0THSwEoyTk0Y8+sxuvliZWA6si4GfzrOUaslomd69lF6yX3lu21GJkSPcJGxnAPNOKnGKumQ+WTdmiUXMD5ysi/VD/SnzoORrsMZcTLLG6sADww5GfQ/0NCYXvGzO3+G+rNd2V3Yz5E0UnmqvZUbgAfQqfzFduHnzKx4ma0OSaktnp8zq7nTbG8YNdWcE7AYBkjDH9a6ozlHZnlOEXuip/wAIxoJOTo9kfrAp/pT9rPuxKnFdA/4RjQc/8gey/CBf8KPaz7sfJHsOHhvQxx/ZFnj08lf8KPaz7sOSPYmh0bS7Y5g020iP+xAq/wAhS55d2PlXYlfT7KX/AFlpA/8AvRg/0pczHYrvoOkyDDadbn6IBRzAm1s397H2Wj6dp0jSWdpHC7DBZRzj0pWV9l9xTnNqzk36tv8AMP/Z</field>
+        </record>
+        <record id="lays_naturel_45g" model="product.product">
+          <field name="list_price">0.39</field>
+          <field name="name">Lays Naturel 45g</field>
+          <field name="pos_categ_id" ref="chips"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQATQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APUvEOux+H7BbuWFpQz7AAwXnBPJP0qZz5Fc3w2HdefKnY49/iwoB26Wox63Gf5LXM8Yux6ayVv7X4f8EzpvihrMySSwW9rFGpxllOf1PNZvGSe1jeOTUk0m2UV8f+LLxsQXCrnoEiT+oqPrdRmzyrCwWq/FlyLxR45gUySMJ0Hbyk/oBVxxUupyzweEbsgl8c+MNny26L/tCIfyNU8XoEcuw7e5nN8RPF0TYeWP8Yk/wpLGnQsmoy2/McPH/iidcNdKue6ooP6Cl9cuH9kUo9Drvh9faxqVzcz311LNAqbRvbIDEg8fhXRQnKerPOzKjSpJKKVzuPStmldHlmL4usre98N3n2gkCGNpVIGcEA1FaKlB3OrBVJQrxt1djwyQZJ2nIPSvF6n2kNjU0fw9dahKAylYz39auMLs5cVjqdJeZ6RpPhmx0+FC0Y3gcj1rqcadJXlv2Pmq+Nq1pPU10jhjUqsS7T1BrGWOUVpHQ57NvcqmKyidg0BAP8XXFcaznDRnyyg15mlqjWjMvVPDdpdD9wqNlc47n3r0fZwmlKm00zehjqlN6nDahpMljdbRnaTj6Vly3Z71DEqrE9K8EQ/ZrO6tgOIXVSfVtuW/U4r0qCsmj5/Mpc01Luv+GOnPatJN3Xr/AF/Wh55jeMGK+EtSI/54kfmQKmt/DfodWBV8RD1PB9MhuLzUY7WGJpi7Y2qMmvK5b9D7KtNU6bk9DutW1i48NPZ6PYRIL6dV3u4DeUCcAAdM8VvC9OyW7PEw2Fji+epN+6vxH+L7bWLfWrHTdF1HUp7q5RpHUz4AGcA8AADrTrYdc9lqLLa1CVOc6sIJK3T/AIczZW8aaRpsmpvqsc1tEwQsJlm3NnbgcHnNZSw1o30OqMsur1FBQab8mjoobvxSmpw6TdwafNcSwmbIZl2qOOf/ANVclfJlVly7aHDKOCdN1IuaSdugmoajfDTIR9rs9J8/eomuHJ3MDgmPA4HufyrfC4FYamoqT17/AKdjKlTpOq/dlO1tv1E06WHXtOt7+QpI1u5W4ZejMnJI+owfxrsSu1L7xvmoVHFXV9vn/kdL4Ky+iPO33p7h3Y+p4H9K6aPwnLmWla3ZI6A9V+tFT4o+v6M4kVdWtBf6Rd2hGfOhZB9SOP1q5x5otF0Z+zqRl2ZwHge2061WVYQPtMZ/fFxh/wAj0FcVGMUn3PazGdSdm9nsY95C2pfF61Qgld0Uo+ioH/mDTiuaqv66GlCr7PLp/Nfe7HWPOLzXfEa2bK2o29kkEALAEZVm4z/tMPyFbN8znbc8tQcaFJy+Fybf4f8ABMtNNtovB2j2B1C0FtDeCS9m80bchmJUep3YH60lFcsVdWTOqWIcsXOai9Y2ireVl/mbzQNba7q+vSSRtHDZBIQrAnaBuJPpyKt6OcvI41NOhCkt3K7/ACRzdhLJH4dksPFRsZ9OEBeG5S4RnVuygA5J54I+nNZX9y0rbaHo1lFVlLD8ylezVn95S8EM9v4a1hWIKFoypByBkHP44AqI6U36m2Yq+Jpvqeh+D4/L8MWgIwTvJ/77NdVNWijx8wd8RL+uhst1Xjv/AEqaqvKGn2v0ZyrqLWwjzLxfbXWha/8AareMJBeZHmL15+8v51xYhOOvc93AyjWouLeq6FaWafTvFunava2BvXuLIwBfM2BXB5JOD/CRUe2VO0vIziozoTpuVrSub40y1upXu7rR7EXM5JkJZmzn34z+VefUzempaQ+/Q5/a1Yx5YzdkNuPCem6hALVbCxs43Yb5IY/3mAc4Unpn1ranjYVpRikldjhjsRTlzc7du+xNfWUNl4XuNNVEtBdkxRRRKMqnAJPqcZJJ9a6cViVQw7clbXRGVKrOpiFN6tanKWHw9s7qYA3F0U7nCjH8683C4tYmooxi/wDI9mvnVWEdo/idI+mWOh6N/Z9mhKs+9y5yWNezGCiuW9zzY4ipiKvPI67SIRBpNtGBjEYOPrz/AFrpirI8+tLmqN+Zbbqv1/pWVV+/D/F+j8/8/TqoXUWthHJ+PyJdNitW4DtuB7gjvWNdJxsd+W3VS5leH54/IWO4jDBW+Qn19a44JfDLvoXi4WldHQ+R9pBMk4Z8/KQuMD0rmxuUrE+8panJGo49CtJa30R/dsGFeNPKcZTeiuaqrTZCukySSeZNtUnqR3rSnk+MrP33ZeZTxEYrQvK0VqnkxY6Z9zX0OEwlLCQ5Y79Wc0nKbuzG1rfNEgRiGBwDTcm5HfhLRep3EKeXCif3VA/Su48xu7FPVee/rWVR2lHXr38n9/p8+gIWtRHKeOrd3tredATsJUj64xWVVaHdgJpSaMuw0+eBYhIUTbywzyK4Paw57XLrVVK4urzXYFy1nblUZTHtDE+ZleGGe4Pb0z3xW3MYwSZA19qcrq7tOqBw2MD5TyMdOnI9uOvWqdR2DkiSm41O6clDLGvkYAJAzJ+f1o9o2JwihbNLlZpJps4YKE3HJGC2R1Pr61Db3KstizeRSSxp5a5YuAMnFFtUa0JJXudtXeecB6jjvWc0m46dfu0f/DDQVoIy/ENxaW+ls126rz+7Dd27VnUaUXc2oQnKfunM208stoJH25Y4BBPIrwKul3F7nROKTsXYFDoFL4P866qcrJXkYyEubNmjwgAOc4rrcW4hCdnqV445EIV/lIPrXLUrqnK3U0bT2LdtGjkgjIByc1jTxfM2uzJdxlxLmVBGflRhmtsPjI1pNLoXBHXA5Ga9g4gOeKmSldWAKoDlPiHKseiQgSLHKZwU3HjAB3fp/MVhiXaB35bFuq9NLHKaTrCXNuRI6iRDwSCFP0z1rwa2Hm5JpaHRiKPJI3/P87ZKrAKVwCvFZ1qcpO/lY5bWLsTEp97OOozXTQcrb3M5EDuonKkHNclfExp1nFp3KUbotkiGDG4Bm9a0bUaeskmxdRlvarKTg4J9a0wWGUJqUb6g5tHTxAiJAeoUZr6JbHM9x1MQUAcB8RZVuL+0tW5WBC7D1LHj+Vc2ISk0j18rTjGUl1ORJXAyox2FZ7Hc6d9zS0pLucsls5RP4iT8v5VhWlTj8RzV404bo1xb6tGoFvcRP/vA5rh9lSk7xbRzKVFv3kzR06wuYS897d+fIw4VQNqfpVVMJTXv3u+5jUqwekVZDplkeQtzivFrRqzm3ZjTSQebeRQj7Pgktg8ZOD6V6mWTknyy2HGNNy9466EhoI2U5BUYPrxX0qOF7j6YgoA8u8Wx6hca1dXMNo06b9q7WHRfl6dccVx1W+Z2PbwdSlGmk3Y5W4l1SEMXsJI1XgsY2IH4jisJSn2PSg8PK3vnX+H4mbS4d332Xe/HQn2rxsTh61as+ZOx5GLqRdV2N6JNoHyjPrXo0cPypaHE5Dbq9S1jZPOjEzDCoTyT9K66FJOok+5E1P2bklsiubmVhgXLk+gVBXpPDUHvFficfPU7/kWrAzbGHmlpWxgNxgZ5/SvJzamqMouELK34m+Ek2nzSuzb8Ptt077KTlrZjHz6dV/Qiu6hzezXMtbGtdqU+ZdTTrYxEd1jRndgqqMkk8CgFqea6a2pESefZ3VyTK22WENtYEnkALjHJ71yKMm3dHqVY0tGpJabGmwnC5TS9SYoCFUwEZB96r2ZzXXVoisbTVdQkEMWkXdoFOTNdsEX6YBJP5VSp3FKUFrdMW48J+I/MZVvYpI+xWZlJ/DHH5mpeHRrDFUUtYmHe6NrOjXUUsulXtwN2Q9qol/PByPxFHs5R2NamJp1KbSZZtbrVrh2eLSdSVVBzvt9pz681SVW2rPN9ml1RFF4j1ISbfsV7nPV7ST/Cm1UfUPZvyOs8I37TvcG4Dq8xXaGQjJAOaqmrblSg4xWqZ1FaGYUAHSkAUAFABTAKACgANABQAUAAAP/Z</field>
+        </record>
+
+        <record id="ijsboerke_chocolat_2,5l" model="product.product">
+          <field name="list_price">7.60</field>
+          <field name="name">ijsboerke Chocolat 2.5L</field>
+          <field name="pos_categ_id" ref="ice_cream"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTayLCgAoAKACgAoAKACgAoAKACgAoAKACgAoAME9jRYBdreh/KnZhcNrf3W/KizC4bW/ut+VFmFw2t/db8qLMVw2P/AHW/KizC4bH/ALp/KizC4vlv/dNFmFxpGOtIYUAFABQBX1LUrPRrU3F7KEA6L1JPoB3NOyW4JN7HA6h8SNRknP2G3jiiHTzCWY/kQBUubNVRXUqf8LD1zv8AZ/8Avg/41PtGV7GIn/CwtbP/AD7f9+//AK9L2rH7CIDx/rTNgC2J9ov/AK9HtZFLDxbJ5/GXiO2UNPbRxBuhe3Iz+dDqTW6D6tH+mQf8LA1odPs3/fr/AOvR7WQvYRE/4WDrnY2//fr/AOvT9oxexiI3xC10fxQfgmP60e0YvYxOg0H4iw3Trbauiwk8CZTx+Oen+elUp33M50mtjtOCoZWDIwyrDoapqxncKQxlxcxWFlLezttjiUtn/P8Anmmhbnketapda5etczsQvSOMHhB6Cok7nRGKijJdMDjmpZoiNkOM1I0aGkaDc6vFLLDNDEkTqhMrEZLcADANceJxkaDSabv+hvTpqSvc6jwpodnpWqi81S7tZYwmIvLYn5zg55A7H9amjmlOMruEtPJf5hWw83Bxjfz9DfvX0fUNHvreeSHdJkxOAfk443HGcgg89eK1/tam004y18l/mZrC1Y1ItLb+n+BxUXgy7mkEcd7ZO5JXCsx5HUfd/wA5rmeZQSu4y/r5mzopK9393/BOeKfMRxkV6K1MJrlbQvlbu9UkQ2IYiPenYVzu/h94kfzxoV7JlJATbOx+6R/D+XT/APVVxfQxqR6o70ggkHqKZmRaroSa/psdnJcPBHuDuUGSwGePzwfwqrXQlKzKVv8ADnQYECyLcT+u+XH8gKORFe0kWH8FaBEMxaZGcdmZm/mafKhOcu4waHo8fA0ix49bdCf5U7IXM+5UvdJiDN9khggjkCZVIyuGUkhvlHv39K4MZl/1mcZKVrJr7zqw+KVONnf/AIcrDw7C+zfDExXAG4y88YHb0WuX+x6vSp+COj+0vX8CUeGInR90URDY3ZMpJPJz9eTTWUVV/wAvPwQv7R9fwJoPDzW92JYvLVw7EDbIVDN94/jge3FDyeUo2dT8OxMsepKzT/A2IfD+kx20UMmnWcxRApd7dSWwMZPFevGKSscU6jlJvuxr+FfD8o+bR7MZ/uxBf5U+VEqcu5Um8BeGpv8AmHbD6pK4/rilyIftJdzOf4baVb3MV5Z3N1BJDIsigsGGQc+mf1pciH7RtWN+f/XN9aT3JRdtThE/3T/OqjsJk+6qAijnjnTzInV1yRlTkZBwf1FICKcRFSzDn1FMRmLcxtO8SOrOmCyg8jPSgZegKuDhgcHBAPQ0CJw4HAoAzNX1+30u2kdpovMTorNgZ9yAf5VLkkVGLZh2/jZrvcUiTnHlkS/K/OCA2M5zxggVHtS/ZGtFrkMtkLxboLCRks7AbcdQfQitFJNEOLuPh1+N2Ki4jcgA49j0pc8R8kjQF8rxHcuM+lUSRT/65vrWctxrYtW33F/3T/OrjsJlXVILi4ltQkfmwK5MsYk2Z44J9QOePpQxrQ53+xtVgRNi70KoZoRcld7fvSeewBaPp1waVmVdEf8AZWsJDsmDXUiPGHl+0lfOiCgFAO3IyfXn1pWYroz5vDmuLbSxKwlaSPYWFwUO4RqFYnqQCX474BoaY+aJ0fhzTpNOa+8yDy/NuXdX8zdvUk7fpxiqSsTJ3GeJtdGkWM0iSqswXKjgkDIBOKU3ZBFXZ4ze6jdXV9PI8rglg4PUglRn68j9a5G7nYo6CDUwALdcbZ9u4KSAGyMNjt/+qqiiZG3catKHaOJ9qy7i8agYOcZJA785z7009BW1F0/UnEoZXOdoIHtj/Fc//rpPQdrne6Pe3E9ztLKbcoMqeqsD1H19K0pTb0MqsUjo5v8AXN9at7mSLVsf3afQ/wA6qOwnuQX/AJbFBIqsDkDL7cnsB65oaGmU5lJVQLToxOPMxj5gc/X/APVRbyC/mVYYWB2Gz2qy7WImJ4I54/AChLyG35h9hkcfPYgZ6jzzz/nn/PRW8gv5mpFJM7FJIVRMcEPnNUrk6HJ+MfBsHiOWOU3clrdRKQrgbldT2Ze/50pR5hxlys4a+8Aa9aMHgiiuwnRoJQGI9wwB/nWDoyR0KtE5m80LXre7WV9HvkMTZBFs2CM+uMGrjBpWJlNN3uaAstRnKyR6fdDODjyWyOnt/nNQotaFOSZtaX4d16dvl0m6XOceYhQdT3bHtScJMfPFdT0HQPDeoWj/AGm+kSPC4EaNuOc9+36mrp0nF3ZlUqqSsjfl/wBa31q3uZosWjgrtPVf5VUWJmN4o8Pz601oYZlj8gsTuHUnGD+GKJJsqMki62nndnz2x6Yp2JuENs0LMfM3AjGMd6YiNLOdHjY3btsVVwQcNjqTz1OaVh3MXxPPPBo7Jb3FwWz87RsVfGMcEd/bjND0BWucl4O16+S/+y3eqNf2LHGZnzLAfXnnHqDSUi5QVj0CVJIk8xSssfXehHT6VRmRR3auQAaYFyFiSKQF+KNj2oAmfakfP1pMCgzbmLepzWbLBWZGDL1H60J2E0XYpVmXg4I6g9RWiZIjjb14pgQM47DNAELO59qAIZIFlBDqGB65FAGJf+FNLuZPONpH5n97bzSdhptHOX41zwruksXe8088vbuctH7qf8+/rS1RStIt6Bq0fiGYm2kjLqu5lJKuvPQr/UEimmmS4tHa2EbxKNyjP1zTEaoIRMscUAU55zIcD7v86iTKSIqkYUAJyCGUlWHQihOwWHm5nxgoj++SP8avmJsIbmcdLeL/AL+n/wCJo5gsJ9pn/wCfaP8A7+//AGNHMFhDcTf8+qf9/f8A61HMFhpmlPW1T/v7/wDWo5kFiKWPz12yWcZB/wCmp/wpcwWMmPwlpMN79sh04RTg7g8d06kH8BS0uVeVjfSaVQB5SD38wn+lVzE2Bnd/vtn2HSpbuNISkMKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAAD/2Q==</field>
+        </record>
+        <record id="ijsboerke_moka_2,5l" model="product.product">
+          <field name="list_price">7.60</field>
+          <field name="name">ijsboerke Moka 2.5L</field>
+          <field name="pos_categ_id" ref="ice_cream"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTayLCgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAMUAGKLAGKLAGKLAGD6UWAKACgAoAKAHhAq75DgUm1FXYavYgkv1Bwi5A/CuKeP191Gqo9xn24n+H9aaxsuwexQ8XZ/u/8AjxqlipdheyQPeJFGZJWEaL1ZnIA/HNUsTLsCpXdkNh1K3uSVgnSRlGSFkJI/DNVKvNboboOO6Y9rlh2P/fR/xqHiZC9mhhvHHQf+PH/GoeLn5D9khjahIOw/M/41DxtRdEP2MSWK7inO18I56Hsa6KOKhU0ejIlTcSVlKnBGDXQQJQA+JQSWbotHmBRu7kzORn5R0HrXjYnEurLyOmnDlRXHvWMWWxyAHiuiCuSyG5v/ALNKUWNWChSzNIFAznA+vBqKteNJ2d/ka06DqK9yGHULG4vVk1GWGOGJG8tBKDucdTn2H8zWuGzGlBtuMvuHVwlTktG+u/p0+8a1zp5skkiuIBfRzjYwbCnJ3bCfdTWs80pSptOMvuCOFqKps7W1/K9vUVdbMqNJHFDIixmVvLn3HaOpHy4/WuT63G6TTWti3g7Pd/d/wS+zKejA/jWjkjlSInrORSI+9ZspGlY3BnQwSHMqDKn+8K9TB4j2seV7o5qsOV3Jq6zMsRw+db7N23cxyampDng1e1wTs7jBpUA5ZnY/XFcscvpLuzR1pMf/AGdaAf6rP1Y1qsJRXQn2su45bO2XpBH+K1oqNNfZQnOXcyNZ0UXUhMexUlVVwI2+VlLYPyj/AGu/pXJicvVaaknay7HVh8X7JWdzObwxbu/mPCjMMjJE3cBT+gFc6yqol/E/BG6zJpW1/AenheJWDCKLIlWQcSn5wMBuv+e9H9kzf/LzpbZA8xfntboLa+GUhzDAViV4zCP3UhCKeSBk49Tz3NX/AGW3JNzvZ32FLMebdPe/9aGxc3unW8pikjjZh1AQGuybop2aRwpTfUnhisbhdyQx4/3QKI06MvsoG5rqOOm2jf8ALHH0Y03hKL6C9pLuIumwQzxTRlwVbpng8UqeEhTmpK4SqNqzIm4Y/WtyS3a/6sf7xqlsIlbqaQDScCgBodTgBgcjI56ikpJjsLmmIjkmjiIDuq56ZOKmU4x3Y0mxysGAIOQeRTTvsIoXmtWlqzRtJlwOcduv+FZVK0Y6Fxg2ZM2kpeMbu0uGkbGTG3fgjgjvzXK6alrFmynbRlnTJjGc5+9wO3T/AAwaVKdgnG5sw3sEz7UfnP513RqxbMHFosN/D/vVoSZ7/fP1qWMtWv8Aqx/vGqWwuoXiNIm1X285POO1ZVYOSsmVF2ZTMEuCFuFwOcmQ8dP5/wBaw9jU7/iy+ZdiMW0q423CZVSB83Xr/Lj8qn2FRbPoPnXYk2SbFVZU3DfxvPBJ4PvgfzrT2c7aPv8A8D7hXVyBrSYu2G528HeSMZ5GfoKyeHm2/wDPz2HzouOxitsDPygDrmuyC5UkZPVnn99Z6g145xmPcSpVs989OtcU6MkdEZxOl0aKaFEyWHA+Xb7f/rpU1KPRhJpjpZJ4tUlS1tZGjyCf3fyknk8/j+dDU/aaRYK3LqzWjszOEfyxbvnnHcfQV0xouWrVjFzSL7/wgf3q6CCg33j9aljLNsfkH+9/SmthPcj1B4UiVp2iWMOMmVto/wD10pFIgeJ3g2rDAR1XLEj7uKVh31IY7eVJBmCAKchiGOcE+n40kmDYn2V8geTbgcdCaLBcniecSFZFjEY4XYTn2p6idizLCTCQe4q+Um5ymoRMkjDHQ1nJFJi6fKQMZIxSiNm/bPkDmt0Qy+jhRuNAh24MEI/vVLVh3KTfeP1qWMlt3wdp78j600JkOraeNTt0iZygWQPx3xnj9amUblQlYijshFbxRtIXMaBd2MZwMZ/Siw73Y5IljfI7CgVxq26oMB24GAfTnP8AOgdzGuvFel6ReRW1wJ43mmCIWiOGYnHB9OOtVy21Jvcf4q1XV00tH8PmKWbeCwk7r3X2NVzIViV1km0S2vdRCW19JGGlhHTPoKUkgRkRXEZf5Gz9KzWgzcsbhtoyp56e9apiNS5uHhVY4rfzpT1G7AX60OVmKwsTzD55WGAOABxmgCOoKCgCeOYNhX4P86e4thXT8qTGmRMu3k0h3KWowvd2U1vHM8JlUqJEOGXjqDSbaA5i08JrZq0k00l5MCGWSb5iCO+fWocpNajSSMrVLjVbKRnheSMjuorBzaZqkmjJl+IGvRnyr7T47tF6NgqcVsp8y3IcEPh8aWcjZk0GYOe64NF2uwuU6LR/GdpEjNHpNwZsfJwAPzpfWIwXmHs2zptO1HUtRHmPapaQn+JvmZvpmnTqVanSyFKMY+Zps5b6DpW7ZCG0hhQAdaADLgYWQgemAf507isNPmn/AJa/+OCi4WD97/z0H/fAouFhMSY++v8A3wKLhYY0G/73lt9YxSsuw9SI6fA3Jhtz/wBsBRZdg17gNNtx/wAsLf8ACBaNOwaj0s4kORHEPpEo/pRaPYNe5P7nk+9DYWFoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAAP/Z</field>
+        </record>
+        <record id="ijsboerke_vanille_2,5l" model="product.product">
+          <field name="list_price">7.40</field>
+          <field name="name">ijsboerke Vanille 2.5L</field>
+          <field name="pos_categ_id" ref="ice_cream"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTayLCgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAxQAYPpQAYPpRYBcH0NFgDB9DRYAwfQ0WASgAoAKACgB20KAW6noKuEHImUkgyfXHsvFbqmkZObFBOPvN+dHIhc7FBPq3/fRo5EPmZHPcw20fmTSlFJwMsck+gHc+1S4xRUFKTshltqFrdOUilbeBnY4ZGx64ODihRiVOE4q7/wA/yLBb3P8A30aagjPmYhb3P/fRp8iFzMQsfVh/wI0+RBzsTcDw/How/rWc6RcagjKVODWDVjUSgByAAF26L+pqoxuxSdkLySSfvHrXUlZHO3diYpiDgdxQBmX2sfYpHG2Ly04LySMMnaWwAFPYV5mMzNYaqocjbtf8bHfhcD7aN7/h/wAFFSPXNOe/aS/kTcsbRwxJvIyCd5ztHPAHHpx1rl/tlvX2b+9dTqeXTULR73e3y6kY1XSzZQiO5Q3iXA2SCJlDEnO04X+42PxpLN3Ffw333RcsDUc22tLa/wBeupND4lW4UvEIJVEXnHY78pkgkZQDqD+VaQzluai6bV3bdGM8r5N297bLf7zcyp7j869qx5NxDQAn1piHx/MDEeoGUP8ASsKsDanIZWBqWreJZY1DZxuzxVwdiZK5Y+yxD+En6mrc5E8iF8iIf8s1/EUuZ9w5UKEQdEX8qTkx2Ri6xoYv5H/eAJKPmUwlsEArwQwxkEiuLE4CNeopuTTS/wCCdmHxbopaf19xRbwujSGRlgZySSTaMSSRjP8ArPTiub+yFa3tJfh/kbLMmlaz+/8A4A5fC6qV2/Z1wwZf9FbggAZ/1nHAFH9kR/5+S/ATzFvo/v8A+AFt4YETFFdYkkXY2y3K4XOSBlyB1PbqTWkcqgpJubdnfoKeYOXR/f8A8A6bap7D8q9O559hDFGesan8KOZhyoabeE/wAfTinzyFyIY1tGjI6gghvWhzbQKCRSf/AFjfU1izRFyz+4PqaqJLLLOqn5mAz0yaoCNrmAEgzRggZPzDpRZgU7rW7CzJ86UgYLBgpIIC7uMe1NRbAuLLHIzqjqzIcMAclT70gFJpAGccmk3YLAGB5Ug0KSewWGvLsXNZVK3KilG42KcueRUQrtsHElZsDIrbnsKxRdnuLpJN7JHGcBQfvn3q+YRHJ/rG+pqHuUi1Zn5R/vGqiJlfWtOfUoYUjuBAySZLYySpVlYD3w1aRdiWY6eFWFwryz27xrIDtMXLgM5AbJ5+8o+i1XOBDH4SdIUj+3RkIiqflPQJCv8A7Tf/AL6p8/kI0vDujjRIZhLNHLNK2WlG7LjJPOT15PT171M3zAbBYKCTwBWTKRSmlMrHa2V7Y/z9a4qlXmkzRKw62cx/ePFRCfJqNq5LP87qQ4CY5OaK0HOSaegRdkPiRcfK4NXCmlsxNkN7M8UDAHDHgVrDmcrMTtYbDgRRIeoIz9atSvIVhkn+sb6mre4Is2Z+Uf739KqImR6pqllpUSS3s4hR22qSpbJx7VpFN7EskM0ZH+uj/MUgBWUsQJEbA5AxTuKw0OjEASxkkAgDHIPT+RoCwpYSIw3BgRjik0mO9jOVo7ciPlNvABOQK45YS3wspVO5Hc3DgZiUuf8AY5rgxFKstos2hKL6l4ofJRcnIHJrZQaikTe7HxqyD5evahKXQCBCbzUzvkUR2w2snqxGR/n2rtoRfJqRJ6lvy8OvII3cetaKFiWys/32+ppMpEttJtbae/IppiZHrWiWmu26RXYYqhJG046qQf0Naxk47ElgWUIxgHj3pXAQW8cLEoCCRjrQDIEsII3V1QhlwFO88ADgdfc/nTuIUBLdNkahQOwoEzD1C8ZJixUsvt1qlG5DlqUhqMTthZBn070rDuTx6g44ErD6GiwXZciu3fGZGP40rDuWoIbYXAuSiiXGN1AXNISrs3AHA/U1LKjqVicnNZmgUAWYLkcK/wCfrVJktFnGeRzVIQ1kJ5pgMKHHSgCtNESDTRLMq5s9xORVJmbRmzaTDKfniDfUVXMTYjXRYwfl8wewdv8AGlcepct9OVO8n/fZpMNTVtrRYwGIC/zqXIuMblhm3cDgDoKybubJWG0hhQAUAKHkUYWRlH4H+dO4rC+bN/z2b8h/hRcLB50//PY/kKLhYPOn/wCep/Ki4WE82b/nr+lFwsJ5k3/PQf8AfNHMFg3S/wDPQf8AfNHMHKAaTvJ+go5mLlQcnqc0m7lBQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAAD/2Q==</field>
+        </record>
+        <record id="ijsboerke_stracciatella_2,5l" model="product.product">
+          <field name="list_price">8.40</field>
+          <field name="name">ijsboerke Stracciatella 2.5L</field>
+          <field name="pos_categ_id" ref="ice_cream"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTayLCgAoAKACgAoAKACgAoAKACgAoAKACgAoAUAnoDQAbG/un8qLAL5b/3TRZhcPLf+6admFw8p/7h/KizFcXypP7hoswuJ5Un9w0WYXF8qT+4aLMLjCCOCMUhhQAUAFAEV9e2mk2pub6VUUdAe59Mdz7U9FuOMXN2Rwuo/Ee/e4IsLdI4h08wksfyIA/X61lKq+h2Qwcbasqf8LB1wjOYB+Df41LrSK+qU/MUeP8AXD/HD/3yf8an20g+q0ySPx1rkrqiOjMxwFWPJJ9hQq029BfVYEtx4u8RWoHnr5Wem+DGfzqpTqx3QLDQautfmU38da52niH/AGyWo9tMaw1PsQP468Qf8/SD/tiv+FP20ilhafYhfx54hBH+mr+EKf4U/ayGsLS7HSeH/iTFcyJaa4ixFuBcL93Pv6fWtI1b7nPVwjjrE7dlAAZSGRhlWHQitGrHKNpAKZI7aCS6mYLHEpYk9sc5poLNux5Pr+tz65qDTSFliUkRR54Uf4nuaylK7PSpUlTiYkhO7ArNmyEDAdWA+pqGmJyRr6Nop1eCaZbuKGOJ0QlgWyzcAcVzYjE+xaVm7lJJr7/wOl8NWWlaDftd315HPujKxgROMcAk8j0I/OlRzFwbfI/vRFfDTqQ5Yp76mnf3Wk3+i3NjNKBLJJtSTyW/dvyQMYzwQ1V/ajcWuR6ruiI4SpGqpJdPvRyqeFY7gN5GqI7bHZR5LAHaOefxxXO8a47x/HudLpqO6f4dTmZCq/eIX68V6HKzHnjfchYqw4IP0NFilJCFOOlUh3PQPhx4kdpP+EevpCyspa0djyMdU/LkfjW9OV9DhxdG3vL5ndkEEg9RVHIF3pUes6YbKWWSKOQ/MYyASAc45+lUldDjPllcpQfD/wAOw/etZJj6ySt/QikqcS3iKj6lyLwp4fh+7pFo3+/EH/nmq5Y9iHUm+rLcek6bD/qtPtY/92FR/SnZE3ZU1LRluX3RMsYZVVlEO7G0kgjBGDk/yrkxOBjiJJttWOijifZq1rlD/hG04ysLbQAN1qTxj3f2H6Vz/wBkx/nkbf2g+z+//gDl8Nrt6RAAg4+zDrzz9/ryefej+yYfzyD6++z+/wD4A6Pw2ElOxtm8FSyQAYBGDj5uPy7U/wCyqfWTYnj2+n4m4zwRoEYqQOMHmvRbSOLVsrvbaZMVEttbMXOAHjXk+nIoug1IJfDGgzff0ey57rAqn8wKOVPoNVJLZsp/8IR4ft7uC9trIwTwSB0aOVsZHsTilyJFuvNqzZen/wBc/wBaT3M0W7P7i/U1UdhMsE0wGhgwypBHqDQAjyLHGzucKoyT6CmAb1DBCwDEZAzyfWkBGt3bvcPbrMhlT7yA8jgH/wBmH50XCxL0HNFwIXuADgUrhYwWuXkdRKGYkjIGOOx/UZrC7ZZd0+QuIw0pLR/KwJBw2M4OPQEfpT2sI0kLxoSxzzxznitU7ITB5wUwR3FHMKxTn/17/Wk9xrYtWZ+RfqacdhMi1W1+128cfnRw4lVgzruBx2xkA/jTY07GE/hpGsTEmp28YMYj3LH8u3D9t3XLq31UVNlbcrm1JRoKuzbtSt3BEmT5OW5Od2d33scE+gxxRZBzFb/hGItpZ9WgeVgytK0PLbhGM535yfLOTnnew4o5V3DmfYkm8GRzRMsd4EjkQKV8rcuNhXu3upGc4KijkD2h0sj/AClc84qiEcX4j0+41S8RrPU7uzuYQVTyScHvyBj+dZN6lp2RwerQ+MNJ1MRG9uLx5TvAhVpP6cdOlNWZWjN7w58SIooja6pbulwufnAG1vTOSCP/AK3Ws2rMOS53Nh4ksNQmEMc8bPjIGQQ3Hr2/+tVc+tiXFo1Zo1eMPGcEMCR+NaWvsSVpv9c31oluC2LFmflH+9/SnEGR6peWtlBHNeTRxReYBmRc5ODwPf8AwpyYJXG7fMgXa9rtPK4AIAwB+P8A9f8ANAJFE4lA325H8QVRkj/P86EgbA27NwJYMHniMf560WC5PGZELGSVCg6AD7tNXEQ3bCWLfE+WX0PIpgYy3wt5XdoVZm4ZhwTS5UArXmnSsJfICzLggsMZx05FLlHcp6zomla1NDdCOE3Awsm9eGH5dR2rKrRctVuVGdi5o+hWum2jW1uEijJJUR8Yz79z7mqUJdRNmzbxyxWqJNN5jjAJAxn9TVKFhNjJTmVvrQ9wRJayBW2nv0+tOLBlbX9Gg16zS2nZgscgkG0452sP5Maco3QRlysnhtIreCOEOxEahQSRk44p2FcljiVGDDdnpRYLiC0hHIQ/UsfUH+fNFkF2PVY4wfkADHJA796LAY14moS6lbPpkETQK2J3eUD5e4x1pgM1PTHAMsCs6n+EDJFAGAzFWxzn0oAu2shyKAN21OVFIC9namT0HNDArEkkk96zZSCgCxHMrfLLjPr61akS0P2ZI7n/APVVCE2kdmPIP8qABS20Zz7cfSgBGfehDYz3H50AY97pFhdSvJHH5NxztmhJRgfm54IzzRYY59TkjUoX3OpIBzjPLDr+B60WA5vVLt7q5keOFnIyThSCv3uuM/3R+dADrG4EcmJoZ/lznj03f/En8xSA6mxmyCVgEcYyN7ck8kcZ+g/Oi4FiSQyHngdhUN3GkNpDCgA60AAaRRhJWUenB/nTuxWELTH/AJbt/wB8r/hRzMLC75/+e7f98r/hRzMLBvuP+e7f98j/AAo5mFhN8/8Az3P/AHyKOZhYYySP96QH6ov+FHMwsJ5Lbt28Z9fLX/CjmYWFEZBzvz/wBf8ACjmYWH45ySSfU0m7jsLQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQA/9k=</field>
+        </record>
+        <record id="ijsboerke_dame_blanche_2,5l" model="product.product">
+          <field name="list_price">7.60</field>
+          <field name="name">ijsboerke Dame Blanche 2.5L</field>
+          <field name="pos_categ_id" ref="ice_cream"/>
+          <field name="img">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APTayLCgAoAKACgAoAKACgAoAKACgAoAKACgAoAMH0oAMH0osFxdp9DRYA2n0NFmAbT6H8qLMLhtPofyoswuG0+hoswEwfSizAKACgAoAKAIry7g0+HzLhuT91O5qZzjTV2OMXN2RgTeI7yWXMWIlHQA1wzxk29NDqjh4paiLrd+f+W5qfrVXuP2EOxMmsXp6zGmsVU7kujDsPfWbiJQ0k5GTgAckn0AHU1rCtVk7IXsYsYmvSSvsWdw/wDddCpP0yOauc60N9A9hG1/1B9VvR0nNYvEVO4KlDsV5NZ1AdLlhU/WavcpUYditJrupr0u3pfWavcfsIdjQ03xUkrrBqQWMngTr0/Ef1rqpYpS0kY1KDjqjoSNp9c9CO9dDRiJQAPKltbyXMpwsYzQ2oq7BJt2OKvLyW/uGnlPXoufuj0ryqtRzldnfCCgrEIOOprJlj1mjXrIg+rCizEyVJwyvIssSxxkKWbJySCccD0FZ1a3s5JWbZpCjzrqWLHUdMtb9pdQnSUhGSKNUfgjlj09MVthsxlSu/Zvp1QVsDOcEo7Xu/0HTalpV1pgt1nAuxcKI5fKYAOfmCnjPQkH681pLNJOm4um9r7r7yVgqkavNbS34bFOO6+0wtLBPDKBC0wAV13KOuCR+H1rkeJd0nFrW26NXheV2d1rboNknhPSVP8AvquhpnOirIynowP0NKw0V3XIOaYzpfCWrtMTpNy+5lUtbsfQdVr0MNV5lys469Pld0dJW5iSPYQ6jarbz7thbJCnGcUSgpxswjNxd0JH4c0mLpaBv95if61Kw1JdCnWm+pOuk6cn3bC2Hv5S5/lVqlBdES6kn1ZMttbp9yCNfogFUorsK7MnWNEF/KWD7VkUKy+VuxjPI5GOCa5MTgIV5qTbTSOmhi3SVrGe/hZGJdkiZiT1tAScjB/j9Biuf+yIfzyNlmMl0f3/APAHJ4WVSCvlDDqwxa9GAwD9/qABzR/Y8P55A8xb6P7/APgCweGFiYorCJHUxtsg24XHIHznGfp1q1lVO6bk3Z3JlmDl0/H/AIBuXEycgxofqM16VkcNyhJZwznL2UTj3hB/pU8kX0Q1OXcmXw/pU0Q8ywhBP9xdv8qh0Kb6IpVZrqQDwrpdtdw3dvHJFJC4ZdshI/XNSqEIu6G60mrMsyf6xvqat7kIt2f3U/GqjsJ7lh2VFLOwVVGSScAUwEJoAazqi7nYKOmScUAIJFYsFYEqcMAeh64P50ANkmSMAu4UEgAk4yTwBRcNyKRpFVjGRnrgimIrfb3ZCrYVuzYz+lAzFMmo2FzJNqF8LpZmCQRwwbNg6knJOTjpzWFWbiWkmPGuXEFyhLb4cYcvww56k8AAVkqkilFNG1pl2l1LKYrkzICQQVwQR6f554reEnexEloXpfuj6itGSZ8n+tb6moe40W7T7qfU1UdhMh1WJJo0WS5SFM5Ifo36ipnHmRUHYzf7NQorS6kjZbrkgMflB79SR/49UKl5l+08hI7SD7LOn9pwSsxRy7NkBEIbkZ6Yxz701T0eonPXYgfTYlG3+2I9oUg5bn7hUnO70I/75pey8x+08iSTQywZHuVZC+5coSVG4ttBz0yR+VP2XmL2ha0qxNm8pknaZpMfMQRhRnA6+9XCHKTOXMJPfxJcSLFGvyLlpMj5evP04qZ1OUSRkappNxdG6uI75nuD/qo3ICK20cD8KxqRU2awlY4DQtev9T1SKyu7dFRJQboSOMBV45yMAbgO/OMYoVKy0HJ2PV9N1JbyZGtoJDEikbvlAbnqMnOOO4Gc1pDRmbNV5A64HBDYIPatWQUZP9Y31NS9ykWrT7q/U1UdiWVdavbSwiimvJ44o9xUb4y+SQcdOnr+FDHFN7CODIgxNa8ElflBAGQcfoefpTAht7Z1cAyWjrtAYJGMkbec+xODRYGyu1vJIVxNaMOG4iALA9OfqD27+3JYLlqAzb2MssciYAAUYwe/9KYiRpdoOOMjFJ7AZE1vPCHmPz4VslVzkH/IrjdOaepaaZjnULvS9LghuLYSXFz8gDHcCSeh+mf0NJxZorXOX0GGw1HVdZ1gLvAvyIkydq7Rw+OhOWJHv0qp1HGy8hLVnfeGDcpo9mGRzKygyEjJznnJz/jQlroKRvyxu1xHKxC4bbgHqPf8a3ip9SG1Yhblj9ab3BE1tJtbafqKcWJkOt6La65bxxXO/bGxZdrY6qV/kabVwjJx2JhaRIAF3Db05p2FcEt0jbcu7JGOtCAgGmWq9IyOFUfOeApyO/rTC7KzXdlZN5GFjI52Z5x0zj04rOVRRLUHIrT6zZEbfMZfotZyrJlqkxLXVI5VyknzKeR3q4VEzOUHEtSahC4G9Vf6jNVeLFqNtBZQjFtZ28IznEcSr/IU7RYtTRjlyAAMD0qgHM4Hzddv86lsCvUMoKALMNyPuvwfX1q0yWicqG5HNMQmw0wI5OmME0DMPWPD8WqBWZ5IpE5SSM4K1EoKQ4yaOZvdI1rTFJ8ldSiXo0fySj8Oh/SuedE2jV7nLXF7cfaWNpNJDcJ/yycFGH4Hr/Ks7OL1Nk1JDk8T6/AwSWy8/H8SjrWvNFrcydNmxp3ivU5BltLdcHB5z+lHOl1D2R0+nS69qWGmA0+17tgeY30HOPrWkW5Gckom8oCoqLkKo4BOT9SfWquSLSAKADrQAAuBhZGUfgf507sVg3Tf893/ACX/AAo5mFhN03/Pdv8Avlf8KOZhYN0//Pc/98ijmYWDM5/5bf8Ajoo5gsRtCXbczIx9SgouFhPIJ7p/37FFw1HLEQeq8eiCi4D8c56n1NJsdhaACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAAAP/Z</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale_report.xml b/addons/point_of_sale/point_of_sale_report.xml
index 3e6a265b34e..b8d5456f1cd 100644
--- a/addons/point_of_sale/point_of_sale_report.xml
+++ b/addons/point_of_sale/point_of_sale_report.xml
@@ -96,17 +96,6 @@
             menu="False"
             rml="point_of_sale/report/pos_payment_report_user.rml"
              />
-        <report
-            id="pos_sales_user_today_current_user"
-            string="Today's Sales by Current User"
-            model="pos.order"
-            name="pos.sales.user.today.current.user"
-            auto="False"
-            multi="True"
-            menu="False"
-            rml="point_of_sale/report/pos_sales_user_today_current_user.rml"
-             />
-
 
     </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale_sequence.xml b/addons/point_of_sale/point_of_sale_sequence.xml
index 399dccc634f..bf83fe17942 100644
--- a/addons/point_of_sale/point_of_sale_sequence.xml
+++ b/addons/point_of_sale/point_of_sale_sequence.xml
@@ -13,8 +13,8 @@
     <record model="ir.sequence" id="seq_pos_order">
         <field name="name">POS Order</field>
         <field name="code">pos.order</field>
-        <field name="prefix">POS/</field>
-        <field name="padding">3</field>
+        <field name="prefix">POS</field>
+        <field name="padding">4</field>
     </record>
 
     <record model="ir.sequence.type" id="seq_type_pos_order_line">
@@ -24,8 +24,8 @@
     <record model="ir.sequence" id="seq_pos_order_line">
         <field name="name">POS order line</field>
         <field name="code">pos.order.line</field>
-        <field name="prefix">Order Line/</field>
-        <field name="padding">2</field>
+        <field name="prefix">POSL</field>
+        <field name="padding">4</field>
     </record>
 
 </data>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b0434718a8c..1c3dceedc68 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -13,51 +13,47 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order POS">
-                    <group col="6" colspan="4">
+                    <group col="7" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="shop_id" widget="selection"/>
-                        <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)" groups="base.group_extended"/>
-                        <field name="contract_number" groups="base.group_extended"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" groups="base.group_extended"/>
+                        <button name="invoice" string="Invoice" icon="gtk-apply" type="workflow" states="paid" attrs="{'invisible': ['|',('partner_id','=',False),('state','&lt;&gt;','paid')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sale Order">
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
-                                    <field name="qty" on_change="onchange_qty(discount, qty, price_unit)"/>
-                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_subtotal_incl,price_unit)" invisible="1"/>
-                                    <field name="price_unit"/>
-                                    <field name="discount" on_change="onchange_discount(discount,price_unit)" />
-                                    <field name="price_subtotal" />
-                                    <field name="price_subtotal_incl" sum="Subtotal"/>
+                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
+                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal_incl"/>
                                 </tree>
                                 <form string="Order lines">
-                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275"/>
-                                    <field name="qty"/>
-                                    <field name="qty_rfd" groups="base.group_extended"/>
-                                    <field name="discount" on_change="onchange_discount(discount,price_unit)" />
-                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
-                                    <field name="price_unit"/>
+                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
+                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="price_subtotal" invisible="1"/>
+                                    <field name="price_subtotal_incl" invisible="1"/>
                                     <field name="notice"/>
-                                    <field name="serial_number"/>
-                                    <field name="prodlot_id" domain="[('product_id','=',product_id)]"/>
                                 </form>
                             </field>
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
+                                <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
+                                <button name="%(action_pos_discount)d" string="Discount" icon="gtk-remove" type="action" states="draft" />
                             </group>
 
                             <separator colspan="4"/>
                             <group colspan="4" col="8">
                                 <field name="state" />
-                                <button name="%(action_add_product)d" string="Add product" type="action" icon="gtk-ok" states="advance" groups="base.group_extended"/>
-                                <button name="%(action_pos_payment)d" string="Make Payment" icon="terp-dolar" type="action" states="draft,advance" />
+                                <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
+                                <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                                    attrs="{'invisible':[('state','=','draft')]}"/>
                                 <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                                <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
-                                <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
-                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}" context="{'return':'return'}" />
                             </group>
                         </page>
                         <page string="Payment">
@@ -74,22 +70,25 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Extra Info">
-                            <group colspan="2" col="2" name="Type">
-                                <separator string="Other Information" colspan="4"/>
-                                <field name="user_salesman_id" />
+                        <page string="Extra Info" groups="base.group_extended">
+                            <group colspan="2" col="2">
+                                <separator string="General Information" colspan="2"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
-                                <field name="price_type" />
-                                <field name="user_id" string="Salesman" groups="base.group_extended"/>
+                                <field name="shop_id" widget="selection"/>
+                                <field name="user_id"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]"/>
+                                <field name="picking_id" readonly="1" groups="base.group_extended"/>
                             </group>
-                            <group colspan="2" col="2" name="Type">
-                                <separator string="Dates" colspan="4"/>
-                                <field name="date_validation" />
-                                <field name="date_payment" groups="base.group_extended"/>
-                            </group>
-                            <group colspan="4">
-                                <field name="sale_journal" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
-                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection" invisible="0"/>
+                            <group colspan="2" col="3">
+                                <separator string="Accounting Information" colspan="3"/>
+                                <field name="sale_journal" domain="[('type','=','sale')]"/>
+                                <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/>
+                                <field name="invoice_id" colspan="2" readonly="1"
+                                    attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
+                                <button name="%(pos_invoice_report)d" string="Re-Print"
+                                    icon="gtk-print" type="action" attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
+                                <field name="account_move" colspan="3" readonly="1"
+                                    attrs="{'invisible':[('state','&lt;&gt;','done')]}"/>
                             </group>
                         </page>
                         <page string="Notes" >
@@ -116,8 +115,6 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="date_order"/>
-                    <field name="date_validation"/>
-                    <field name="date_payment"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
                     <field name="amount_total" sum="Amount total"/>
@@ -132,15 +129,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-check" string="Running" domain="[('state','in',('payment','advance'))]"/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
+                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
+                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="Today" domain="[('date_order','&gt;=',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&lt;=',datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59'))]"/>
+                    <filter icon="gtk-go-forward" string="Yesterday" domain="[('date_order','&lt;',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&gt;=',(datetime.date.today() - relativedelta(days=1)).strftime('%%Y-%%m-%%d 00:00:00'))]"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="date_order" string="Order date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator string="" orientation="vertical"/>
@@ -152,66 +153,12 @@
             </field>
         </record>
 
-        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
-        <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user"/>
+        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="10" />
+        <menuitem name="New Sale Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
         <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
 
-        <!--  POS Order view (date_payment)  -->
-         <record model="ir.actions.act_window" id="action_pos_pos_form_user">
-            <field name="name">Point of Sale</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
-            <field name="domain">['|',('state','=','advance')]</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>
-
-        </record>
-
-        <record model="ir.actions.act_window" id="action_pos_order_accepted">
-            <field name="name">Accepted Sales</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=', 'paid')]</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>
-        </record>
-        <record model="ir.actions.act_window" id="action_pos_order_tree2">
-            <field name="name">Point of Sale</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_pos_order_tree3">
-            <field name="name">Point of Sale</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>
-        </record>
-        <record model="ir.actions.act_window" id="action_pos_order_tree_open">
-            <field name="name">Opened Sales</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>
-        </record>
-
         <record model="ir.ui.view" id="view_pos_order_line">
             <field name="name">Sale lines</field>
             <field name="model">pos.order.line</field>
@@ -235,11 +182,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Order line">
-                    <field name="product_id"  select="1"/>
-                    <field name="qty"  select="1"/>
+                    <field name="product_id" />
+                    <field name="qty" />
                     <field name="discount" />
                     <field name="price_unit" />
-                    <field name="create_date"  select="1"/>
+                    <field name="create_date" />
                 </form>
             </field>
         </record>
@@ -282,10 +229,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="user_id" select="1"/>
-                    <field name="journal_id" select="1"/>
-                    <field name="jl_id" select="1"/>
-                    <field name="date_create" select="1" widget="date"/>
+                    <field name="user_id"/>
+                    <field name="journal_id"/>
+                    <field name="jl_id"/>
+                    <field name="date_create" widget="date"/>
                     <field name="no_trans"/>
                     <field name="amount"/>
                     <field name="invoice_id"/>
@@ -373,7 +320,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="amount"/>
                     <field name="user_id"/>
@@ -388,7 +335,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="amount"/>
                     <field name="user_id"/>
@@ -439,7 +386,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="amount"/>
                     <field name="user_id"/>
@@ -454,7 +401,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="amount"/>
                     <field name="user_id"/>
@@ -507,7 +454,7 @@
                 <form string="POS ">
                     <field name="user_id"/>
                     <field name="product_name"/>
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="net_margin_per_qty"/>
                     <field name="total"/>
@@ -524,7 +471,7 @@
                 <tree string="POS">
                     <field name="user_id"/>
                     <field name="product_name"/>
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="net_margin_per_qty"/>
                     <field name="total"/>
@@ -574,7 +521,7 @@
                 <form string="POS ">
                     <field name="user_id"/>
                     <field name="product_name"/>
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="net_margin_per_qty"/>
                     <field name="total"/>
@@ -591,7 +538,7 @@
                 <tree string="POS">
                     <field name="user_id"/>
                     <field name="product_name"/>
-                    <field name="date_order" select="1" widget="date"/>
+                    <field name="date_order" widget="date"/>
                     <field name="qty"/>
                     <field name="net_margin_per_qty"/>
                     <field name="total"/>
@@ -632,20 +579,6 @@
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
         </record>
-        <!--  Sales by margin ends -->
-        <record model="ir.ui.view" id="view_company_form_pos">
-            <field name="name">view.company.form.pos</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                    <separator string="Point of Sale" colspan="4"/>
-                    <field  name="company_discount" />
-                    <field  name="max_diff" />
-                </field>
-            </field>
-           </record>
 
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
@@ -657,12 +590,34 @@
                   <separator string="Point of Sale" colspan="2"/>
                       <field name="income_pdt"/>
                       <field name="expense_pdt"/>
-                      <field name="am_out"/>
-                      <field name="disc_controle"/>
                   </field>
             </field>
         </record>
 
+        <!-- Categories tree view -->
+        <record id="pos_category_tree_view" model="ir.ui.view">
+            <field name="name">pos.category.tree</field>
+            <field name="model">pos.category</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree toolbar="True" string="Product Pos Categories">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+        <record id="pos_category_action" model="ir.actions.act_window">
+            <field name="name">Products by POS-Category</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.category</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="pos_category_tree_view"/>
+            <field name="help">Here is a list of all your products classified by POS category. You can click a category to get the list of all products linked to this category or to a child of this       category.</field>
+        </record>
+        <menuitem action="pos_category_action" id="menu_pos_category" parent="menu_point_of_sale_product" sequence="0" />
+        <!-- END -->
+
         <record id="product_input_output_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
@@ -672,12 +627,12 @@
                    <group colspan="4" col="6">
                     <group colspan="4" col="2">
                         <separator string="Product Description" colspan="4"/>
-                        <field name="name" select="1"  />
+                        <field name="name"  />
                         <field groups="base.group_extended" name="variants" />
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Codes" colspan="2"/>
-                        <field name="default_code" select="1"/>
+                        <field name="default_code"/>
                         <field groups="base.group_extended" name="ean13"/>
                     </group>
                    </group>
@@ -685,16 +640,14 @@
                         <page string="Information">
                           <group colspan="2" col="2" name="Type">
                             <separator string="Product Type" colspan="2"/>
-                              <field name="categ_id" select="1"/>
-                              <field name="property_account_income" select="1" string="Account" required="1"/>
+                              <field name="categ_id"/>
+                              <field name="property_account_income" string="Account" required="1"/>
                               <field name="type"/>
                             </group>
                             <group colspan="2" col="2" name="Miscelleanous">
                               <separator string="Miscelleanous" colspan="2"/>
                                   <field name="income_pdt"/>
                                   <field name="expense_pdt"/>
-                            <field name="am_out"/>
-                          <field name="disc_controle"/>
                                   <field name="company_id" groups="base.group_extended,base.group_multi_company"/>
                               </group>
                               <group colspan="2" col="2" name="Prices">
@@ -712,12 +665,13 @@
             id="menu_point_config_product" sequence="25" groups="group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_input">
-            <field name="name">Products</field>
+            <field name="name">Products 'Take Money Out'</field>
             <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</field>
-            <field name="domain">[('income_pdt','=',True)]</field>
+            <field name="domain">[('expense_pdt','=',True)]</field>
+            <field name="context">{'default_expense_pdt': True}</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_product_input_tree_tag">
             <field name="sequence" eval="1"/>
@@ -731,19 +685,20 @@
             <field name="view_id" ref="product_input_output_form_view"/>
             <field name="act_window_id" ref="action_product_input"/>
         </record>
-        <menuitem name="Products for Input Operations"
-                    parent="menu_point_config_product"
-                    action="action_product_input"
-                    id="products_for_input_operations"
-                    groups="group_pos_manager"/>
+        <menuitem
+            parent="menu_point_config_product"
+            action="action_product_input"
+            id="products_for_input_operations"
+            groups="group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_output">
-            <field name="name">Products</field>
+            <field name="name">Products 'Put Money In'</field>
             <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</field>
-            <field name="domain">[('expense_pdt','=',True)]</field>
+            <field name="domain">[('income_pdt','=',True)]</field>
+            <field name="context">{'default_income_pdt': True}</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_product_output_tree_tag">
             <field name="sequence" eval="1"/>
@@ -757,34 +712,46 @@
             <field name="view_id" ref="product_input_output_form_view"/>
             <field name="act_window_id" ref="action_product_output"/>
         </record>
-        <menuitem name="Products for Output Operations"
-                    parent="menu_point_config_product"
-                    action="action_product_output"
-                    id="products_for_output_operations"
-                    groups="group_pos_manager"/>
+        <menuitem
+            parent="menu_point_config_product"
+            action="action_product_output"
+            id="products_for_output_operations"
+            groups="group_pos_manager"/>
 
         <menuitem
-            name="Input Operations" parent="menu_point_of_sale"
-            string="Refloat"
+            parent="menu_point_of_sale"
             action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="2" />
 
         <menuitem
-            name="Output Operations" parent="menu_point_of_sale"
-            string="Refloat"
+            parent="menu_point_of_sale"
             action="action_box_out"
             id="menu_wizard_enter_jrnl2" sequence="3" />
 
+        <record id="action_account_journal_form" model="ir.actions.act_window">
+            <field name="name">Payment Methods</field>
+            <field name="res_model">account.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'default_journal_user': 1}</field>
+            <field name="domain">[('journal_user','=', 1)]</field>
+            <field name="help">Payment methods are defined by accounting journals having the field Payment Method checked.</field>
+        </record>
+
+        <menuitem action="action_account_journal_form"
+            id="menu_action_account_journal_form_open"
+            parent="menu_point_config_product"
+            sequence="20"/>
+
         <record model="ir.ui.view" id="view_pos_order_tree_all_sales_lines">
             <field name="name">POS Sales Lines</field>
             <field name="model">pos.order.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders lines">
-                    <field name="order_id" select="1" />
-                    <field name="serial_number" select="1" />
-                    <field name="create_date" select="1" />
-                    <field name="product_id" select="1" />
+                    <field name="order_id" />
+                    <field name="create_date" />
+                    <field name="product_id" />
                     <field name="qty" />
                     <field name="price_unit" />
                 </tree>
@@ -802,6 +769,16 @@
         <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager"/>
         <!-- Invoice -->
 
+        <record model="ir.actions.act_window" id="action_pos_sale_all">
+            <field name="name">All Sales Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[]</field>
+        </record>
+        <menuitem parent="menu_point_rep" id="menu_point_ofsale_all" action="action_pos_sale_all" sequence="1"/>
+
         <record model="ir.actions.act_window" id="action_pos_invoice">
             <field name="name">Invoices</field>
             <field name="type">ir.actions.act_window</field>
@@ -816,6 +793,16 @@
         <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
                 id="menu_pos_details" parent="menu_point_rep" sequence="6" />
 
+        <record model="ir.actions.client" id="action_pos_pos">
+          <field name="name">Start Point of Sale</field>
+          <field name="tag">pos.ui</field>
+        </record>
 
+        <record id="menu_pos_pos" model="ir.ui.menu">
+          <field name="name">Start Point of Sale</field>
+          <field name="sequence" eval="5"/>
+          <field name="parent_id" ref="menu_point_root"/>
+          <field name="action" ref="action_pos_pos"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
index c325c4951c9..4058af2696f 100644
--- a/addons/point_of_sale/point_of_sale_workflow.xml
+++ b/addons/point_of_sale/point_of_sale_workflow.xml
@@ -69,7 +69,7 @@
     </record>
 
     <record model="workflow.transition" id="trans_paid_cancel">
-      <field name="act_from" ref="act_paid"/>
+      <field name="act_from" ref="act_draft"/>
       <field name="act_to" ref="act_cancel"/>
       <field name="signal">cancel</field>
     </record>
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index d7355af0357..171f323e337 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -32,11 +32,8 @@ import pos_sales_user
 import pos_sales_user_today
 import pos_payment_report_date
 import pos_payment_report_user
-import pos_sales_user_today_current_user
-import pos_receipt_with_remboursment
-import pos_receipt_without_remboursment
 import pos_report
 import pos_order_report
 import report_cash_register
 
-# 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_details.py b/addons/point_of_sale/report/pos_details.py
index 84f3de8258f..4c23a005674 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -97,7 +97,7 @@ class pos_details(report_sxw.rml_parse):
 
     def _get_sum_dis_2(self,form,user):
         res4=[]
-        self.cr.execute ("select sum(pol.price_ded * pol.qty)" \
+        self.cr.execute ("select sum(pol.qty)" \
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, res_users as ru,res_company as rc " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('paid')  " \
                          "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
@@ -215,4 +215,4 @@ class pos_details(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, 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_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 7a89b101956..0e1cd98fb47 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -55,4 +55,4 @@ class pos_invoice(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'addons/account/report/account_print_invoice.rml', parser= pos_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/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index 00681457495..ceb20a11a36 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -35,9 +35,7 @@ class pos_order_report(osv.osv):
         'day': fields.char('Day', size=128, readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('payment', 'Payment'),
-                                    ('advance','Advance'),
-                                   ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
+        'state': fields.selection([('draft', 'New'), ('paid', 'Closed'), ('done', 'Synchronized'), ('invoiced', 'Invoiced'), ('cancel', 'Cancelled')],
                                   'State'),
         'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
@@ -49,9 +47,6 @@ class pos_order_report(osv.osv):
         'product_qty':fields.integer('# of Qty', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal'),
         'delay_validation': fields.integer('Delay Validation'),
-        'delay_payment': fields.integer('Delay Payment'),
-        'date_validation': fields.date('Validation Date', required=True),
-        'date_payment': fields.date('Payment Date', required=True),
     }
     _order = 'date desc'
 
@@ -65,10 +60,9 @@ 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.price_ded) as total_discount,
+                    sum(l.qty * l.discount) as total_discount,
                     (sum(l.qty*l.price_unit)/sum(l.qty * u.factor))::decimal(16,2) as average_price,
-                    sum(cast(to_char(date_trunc('day',s.date_validation) - date_trunc('day',s.date_order),'DD') as int)) as delay_validation,
-                    sum(cast(to_char(date_trunc('day',s.date_payment) - date_trunc('day',s.date_order),'DD') as int)) as delay_payment,
+                    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,
                     to_char(s.date_order, 'MM') as month,
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
@@ -78,9 +72,7 @@ class pos_order_report(osv.osv):
                     s.shop_id as shop_id,
                     s.company_id as company_id,
                     s.sale_journal as journal_id,
-                    l.product_id as product_id,
-                    s.date_validation,
-                    s.date_payment
+                    l.product_id as product_id
                 from pos_order_line as l
                     left join pos_order s on (s.id=l.order_id)
                     left join product_template pt on (pt.id=l.product_id)
@@ -88,11 +80,10 @@ class pos_order_report(osv.osv):
                 group by
                     to_char(s.date_order, 'dd-MM-YYYY'),to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),
                     to_char(s.date_order, 'YYYY-MM-DD'), s.partner_id,s.state,
-                    s.user_id,s.shop_id,s.company_id,s.sale_journal,l.product_id,s.date_validation,
-                    s.date_payment
+                    s.user_id,s.shop_id,s.company_id,s.sale_journal,l.product_id,s.create_date
                 having
                     sum(l.qty * u.factor) != 0)""")
 
 pos_order_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/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index c72a6b6d415..494dceec93e 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -2,67 +2,63 @@
 <openerp>
     <data>
         <record id="view_report_pos_order_tree" model="ir.ui.view">
-	        <field name="name">report.pos.order.tree</field>
-	        <field name="model">report.pos.order</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Point of Sale Analysis">
-	                <field name="date" invisible="1"/>
-	                <field name="user_id" invisible="1"/>
-	                <field name="year" invisible="1"/>
-	                <field name="day" invisible="1"/>
-	                <field name="month" invisible="1"/>
-	                <field name="partner_id" invisible="1"/>
-	                <field name="product_id" invisible="1"/>
-	                <field name="shop_id" invisible="1"/>
-	                <!--<field name="journal_id" invisible="1"/>-->
-	                <field name="date_validation" invisible="1"/>
-	                <field name="date_payment" invisible="1"/>
+            <field name="name">report.pos.order.tree</field>
+            <field name="model">report.pos.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Point of Sale Analysis">
+                    <field name="date" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="year" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
+                    <field name="product_id" invisible="1"/>
+                    <field name="shop_id" invisible="1"/>
+                    <!--<field name="journal_id" invisible="1"/>-->
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-	                <field name="nbr" sum="# of Lines"/>
-	                <field name="product_qty" sum="# of Qty"/>
-	                <field name="average_price" sum="Average Price"/>
-	                <field name="total_discount" sum="Total Discount"/>
-	                <field name="price_total" sum="Total Price"/>
-	                <field name="delay_validation"/>
-	                <field name="delay_payment"/>
-	                <!--<field name="state" invisible="1"/>-->
-	            </tree>
-	        </field>
+                    <field name="nbr" sum="# of Lines"/>
+                    <field name="product_qty" sum="# of Qty"/>
+                    <field name="average_price" sum="Average Price"/>
+                    <field name="total_discount" sum="Total Discount"/>
+                    <field name="price_total" sum="Total Price"/>
+                    <field name="delay_validation"/>
+                    <!--<field name="state" invisible="1"/>-->
+                </tree>
+            </field>
         </record>
 
         <record id="view_report_pos_order_search" model="ir.ui.view">
-	        <field name="name">report.pos.order.search</field>
-	        <field name="model">report.pos.order</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Point of Sale Analysis">
-	                <group>
-	                    <filter icon="terp-go-year" string="Year"
-	                        domain="[('year','=',time.strftime('%%Y'))]"
-	                        help="POS ordered created during current year"/>
-	                    <filter icon="terp-go-month" string="Month"
-	                       domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-	                        help="POS ordered created during current month"/>
-	                    <filter icon="terp-go-month"
-	                         string="Month -1"
-	                         separator="1"
-	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-	                         help="POS ordered created last month"/>
-	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-go-today"
+            <field name="name">report.pos.order.search</field>
+            <field name="model">report.pos.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Point of Sale Analysis">
+                    <group>
+                        <filter icon="terp-go-year" string="Year" name="year"
+                            domain="[('year','=',time.strftime('%%Y'))]"
+                            help="POS ordered created during current year"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-month" string="Month" name="This Month"
+                           domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="POS ordered created during current month"/>
+                        <filter icon="terp-go-month"
+                             string="Month -1"
+                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                             help="POS ordered created last month"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-today"
                              string="Today"
                              name="today"
-                             separator="1"
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
                              help="POS ordered created by today"/>
-	                    <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar"
                             string="Invoiced"
                             domain="[('state','=',('invoiced'))]"/>
-	                    <filter icon="terp-dolar"
-	                        string="Paid"
-	                        domain="[('state','=',('paid'))]"/>
+                        <filter icon="terp-dolar"
+                            string="Paid"
+                            domain="[('state','=',('paid'))]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection">
@@ -71,36 +67,31 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
                     </field>
-	                </group>
-	                <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="date_validation"/>
-                        <field name="date_payment"/>
                     </group>
-	                <newline/>
-	                <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-	                    <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                        <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of order date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of order date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of order date"/>
-	                </group>
-	            </search>
-	        </field>
+                    </group>
+                </search>
+            </field>
         </record>
 
         <record id="action_report_pos_order_all" model="ir.actions.act_window">
-	        <field name="name">Point of Sale Analysis</field>
-	        <field name="res_model">report.pos.order</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,graph</field>
-	        <field name="search_view_id" ref="view_report_pos_order_search"/>
-	        <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
-	    </record>
+            <field name="name">Point of Sale Analysis</field>
+            <field name="res_model">report.pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_report_pos_order_search"/>
+            <field name="context">{'search_default_year':1,'search_default_This Month':1,'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        </record>
 
-	    <menuitem action="action_report_pos_order_all" id="menu_report_pos_order_all" parent="menu_point_rep" sequence="3"/>
-	</data>
+        <menuitem action="action_report_pos_order_all" id="menu_report_pos_order_all" parent="menu_point_rep" sequence="3"/>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index b9da3f5e9a6..e3b5583a499 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -77,7 +77,6 @@
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
     <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
-    <para style="terp_default_Centre_9">Vendeur : [[ o.user_salesman_id.name ]]</para>
     <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
     <para style="P4">
       <font color="white"> </font>
@@ -85,12 +84,10 @@
     <para style="P4">
       <font color="white"> </font>
     </para>
-    <para style="P4">[[o.type_rec]]</para>
     <para style="P4">
       <font color="white"> </font>
     </para>
     <para style="P4">N° : [[ o.name ]]</para>
-    <para style="P4">Contract : [[ o.contract_number ]]</para>
     <blockTable colWidths="68.0,68.0,68.0" style="Table3">
       <tr>
         <td>
@@ -165,6 +162,5 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P3">[[o.note_2]]</para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
deleted file mode 100644
index c600a9e2754..00000000000
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.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/>.
-#
-##############################################################################
-
-import time
-from report import report_sxw
-import pooler
-
-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)
-        partner = user.company_id.partner_id
-
-        self.localcontext.update({
-            'time': time,
-            'disc': self.discount,
-            'net': self.netamount,
-            'get_journal_amt': self._get_journal_amt,
-            'address': partner.address and partner.address[0] or False,
-        })
-
-    def netamount(self, order_line_id):
-        sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
-        self.cr.execute(sql, (order_line_id,))
-        res = self.cr.fetchone()
-        return res[0]
-
-    def discount(self, order_id):
-        sql = 'select discount, price_unit, qty from pos_order_line where order_id = %s '
-        self.cr.execute(sql, (order_id,))
-        res = self.cr.fetchall()
-        dsum = 0
-        for line in res:
-            if line[0] != 0:
-                dsum = dsum +(line[2] * (line[0]*line[1]/100))
-        return dsum
-
-    def _get_journal_amt(self, order_id):
-        lst=[]
-        sql = """ select aj.name from account_bank_statement as abs
-                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
-                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
-                    WHERE absl.pos_statement_id = %d"""%(order_id.id)
-        self.cr.execute(sql)
-        res = self.cr.fetchone()
-        if not res:
-            return ['', 0.0]
-        lst.append(res[0]) # todo: improve
-        sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
-                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
-                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
-                    where aj.name = '%s' """%(res[0])
-        self.cr.execute(sql2)
-        res1 = self.cr.fetchone()
-        if res1:
-            lst.append(res1[0])
-        else:
-            lst.append(0.0)
-        return lst
-
-report_sxw.report_sxw('report.pos.receipt.with.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_with_remboursment.rml', parser=order, header=False)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
deleted file mode 100644
index 9c25d5f4a89..00000000000
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Receipt with reimbursement " author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-        <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_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
-    <paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
-    <paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="30"/>
-    <paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/>
-    <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <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"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-  </stylesheet>
-  <story>
-    [[ repeatIn(objects,'o') ]]
-    <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">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
-    <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
-    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
-	  <para style="P5">Refund Receipt: [[o.name]]</para>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="118.0,30.0,38.0" repeatRows="1" style="Tableau2">
-
-      <tr>
-        <td>
-          <para style="P5">Description</para>
-        </td>
-        <td>
-          <para style="P11">Qty</para>
-        </td>
-        <td>
-          <para style="P12">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
-      <blockTable colWidths="100.0,30.0,55.0" style="Tableau3">
-
-        <tr>
-          <td>
-            <para style="P9">[[ line.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
-          </td>
-          <td>
-            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.f' % line.discount ]]%)</font></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="149.0,37.0" style="Table1">
-      <tr>
-        <td>
-          <para style="P13">Disc : </para>
-        </td>
-        <td>
-          <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P6">Total :</para>
-        </td>
-        <td>
-          <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para>
-  </story>
-</document>
-
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
deleted file mode 100644
index d2fe0f1d542..00000000000
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.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/>.
-#
-##############################################################################
-
-import time
-from report import report_sxw
-import pooler
-
-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)
-        partner = user.company_id.partner_id
-
-        self.localcontext.update({
-            'time': time,
-            'disc': self.discount,
-            'net': self.netamount,
-            'get_journal_amt': self._get_journal_amt,
-            'address': partner.address and partner.address[0] or False,
-        })
-
-    def netamount(self, order_line_id):
-        sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
-        self.cr.execute(sql, (order_line_id,))
-        res = self.cr.fetchone()
-        return res[0]
-
-    def discount(self, order_id):
-        sql = 'select discount, price_unit, qty from pos_order_line where order_id = %s '
-        self.cr.execute(sql, (order_id,))
-        res = self.cr.fetchall()
-        dsum = 0
-        for line in res:
-            if line[0] != 0:
-                dsum = dsum +(line[2] * (line[0]*line[1]/100))
-        return dsum
-
-    def _get_journal_amt(self, order_id):
-        lst=[]
-        sql = """ select aj.name from account_bank_statement as abs
-                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
-                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
-                    WHERE absl.pos_statement_id = %d"""%(order_id.id)
-        self.cr.execute(sql)
-        res = self.cr.fetchone()
-        if not res:
-            return ['', 0.0]
-        lst.append(res[0]) # todo: improve
-        sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
-                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
-                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
-                    where aj.name = '%s' """%(res[0])
-        self.cr.execute(sql2)
-        res1 = self.cr.fetchone()
-        if res1:
-            lst.append(res1[0])
-        else:
-            lst.append(0.0)
-        return lst
-
-report_sxw.report_sxw('report.pos.receipt.without.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_without_remboursment.rml', parser=order, header=False)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
deleted file mode 100644
index ff6ebc3132c..00000000000
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Receipt without reimbursement  " author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-        <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_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
-    <paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
-    <paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/>
-    <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <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"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-  </stylesheet>
-  <story>
-    [[ repeatIn(objects,'o') ]]
-    <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">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
-    <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
-    <para style="terp_default_Centre_9">Sale Date : [[ str(o.date_order) ]]</para>
-	  <para style="P5">Purchase Voucher : [[o.name]]</para>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="118.0,30.0,38.0" repeatRows="1" style="Tableau2">
-
-      <tr>
-        <td>
-          <para style="P5">Description</para>
-        </td>
-        <td>
-          <para style="P11">Qty</para>
-        </td>
-        <td>
-          <para style="P12">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
-      <blockTable colWidths="100.0,30.0,55.0" style="Tableau3">
-
-        <tr>
-          <td>
-            <para style="P9">[[ line.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
-          </td>
-          <td>
-            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.f' % line.discount ]]%)</font></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="149.0,37.0" style="Table1">
-      <tr>
-        <td>
-          <para style="P13">Disc : </para>
-        </td>
-        <td>
-          <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P6">Total :</para>
-        </td>
-        <td>
-          <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
-
-<!--	<section>-->
-<!--		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]-->
-<!--		<para style="P31">-->
-<!--			Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].-->
-<!--		</para>-->
-<!--	</section>-->
-  </story>
-</document>
-
diff --git a/addons/point_of_sale/report/pos_report.py b/addons/point_of_sale/report/pos_report.py
index cd41eb92944..1ecf80ea519 100644
--- a/addons/point_of_sale/report/pos_report.py
+++ b/addons/point_of_sale/report/pos_report.py
@@ -49,7 +49,7 @@ class report_transaction_pos(osv.osv):
                     min(absl.id) as id,
                     count(absl.id) as no_trans,
                     sum(absl.amount) as amount,
-                    sum(line.price_ded) as disc,
+                    sum((100.0-line.discount) * line.price_unit * line.qty / 100.0) as disc,
                     to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
                     po.user_id as user_id,
                     po.sale_journal as journal_id,
@@ -236,4 +236,4 @@ class report_sales_by_margin_pos_month(osv.osv):
         """)
 report_sales_by_margin_pos_month()
 
-# 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_sales_user_today_current_user.py b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
deleted file mode 100644
index 07cbdcbc488..00000000000
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.py
+++ /dev/null
@@ -1,68 +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 report import report_sxw
-
-class pos_sales_user_today_current_user(report_sxw.rml_parse):
-
-    def __init__(self, cr, uid, name, context):
-        super(pos_sales_user_today_current_user, self).__init__(cr, uid, name, context=context)
-        self.total = 0.0
-        self.qty = 0.0
-        self.localcontext.update({
-            'time': time,
-            'get_user':self._get_user,
-            'get_data_current_user':self._get_data_current_user,
-            'get_data_current_user_tot':self._get_data_current_user_tot,
-            'get_data_current_user_qty':self._get_data_current_user_qty,
-        })
-
-    def _get_user(self, user):
-        pos_user={}
-        self.cr.execute("select name from res_users where id = %s",str(self.uid))
-        pos_user=self.cr.dictfetchone()
-        return pos_user['name']
-
-    def _get_data_current_user(self, user):
-        data={}
-        self.cr.execute("select po.name,po. state,sum(pol.qty)as Qty,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
-                        "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, res_users as ru,res_company as rc  " \
-                        "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
-                        "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date  and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
-                        "group by po.name, po.state " \
-                ,(str(user.company_id.id),str(self.uid)))
-
-        data = self.cr.dictfetchall()
-        for d in data:
-            self.total += d['total']
-            self.qty += d['qty']
-        return data
-
-    def _get_data_current_user_tot(self, user):
-        return self.total
-
-    def _get_data_current_user_qty(self, user):
-        return self.qty
-
-report_sxw.report_sxw('report.pos.sales.user.today.current.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today_current_user.rml', parser=pos_sales_user_today_current_user,header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
deleted file mode 100644
index 7a94f5d6632..00000000000
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Todays Sales By Current User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
-    </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="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="LINEAFTER" 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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <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="LINEAFTER" 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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <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="Table6">
-      <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="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <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"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" 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="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="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="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="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="P2">Today's Sales By Current User</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="170.0,170.0,170.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Company</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Print Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">User</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="170.0,170.0,170.0" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_default_Centre_8">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ (get_user(user)) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">State</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Total</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_1">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
-      <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table6">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line_ids['state'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table5">
-      <tr>
-        <td>
-          <para style="P1">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Total : </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 167851986cb..b5ef398ceb3 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -2,56 +2,56 @@
 <openerp>
     <data>
         <record id="view_report_cash_register_tree" model="ir.ui.view">
-	        <field name="name">report.cash.register.tree</field>
-	        <field name="model">report.cash.register</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Point of Sale Cash Register Analysis">
-	                <field name="date" invisible="1"/>
-	                <field name="user_id" invisible="1"/>
-	                <field name="state" invisible="1"/>
-	                <field name="year" invisible="1"/>
-	                <field name="month" invisible="1"/>
-	                <field name="day" invisible="1"/>
-	                <field name="journal_id" invisible="1"/>
-	                <field name="balance_start" />
-	                <field name="balance_end_real" />
-	            </tree>
-	        </field>
+          <field name="name">report.cash.register.tree</field>
+          <field name="model">report.cash.register</field>
+          <field name="type">tree</field>
+          <field name="arch" type="xml">
+              <tree string="Point of Sale Cash Register Analysis">
+                  <field name="date" invisible="1"/>
+                  <field name="user_id" invisible="1"/>
+                  <field name="state" invisible="1"/>
+                  <field name="year" invisible="1"/>
+                  <field name="month" invisible="1"/>
+                  <field name="day" invisible="1"/>
+                  <field name="journal_id" invisible="1"/>
+                  <field name="balance_start" />
+                  <field name="balance_end_real" />
+              </tree>
+          </field>
         </record>
 
         <record id="view_report_cash_register_search" model="ir.ui.view">
-	        <field name="name">report.cash.register.search</field>
-	        <field name="model">report.cash.register</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Point of Sale Cash Register Analysis">
-	                <group>
-	                    <filter icon="terp-go-year" string="Year"
-	                        domain="[('year','=',time.strftime('%%Y'))]"
-	                        help="Cash Analysis created during this year"/>
-	                    <filter icon="terp-go-month" string="Month"
-	                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-	                        help="Cash Analysis created in current month"/>
-	                    <filter icon="terp-go-month"
-	                         string="Month -1"
-	                         separator="1"
-	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-	                         help="Cash Analysis created in last month"/>
-	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-go-today"
+          <field name="name">report.cash.register.search</field>
+          <field name="model">report.cash.register</field>
+          <field name="type">search</field>
+          <field name="arch" type="xml">
+              <search string="Point of Sale Cash Register Analysis">
+                  <group>
+                      <filter icon="terp-go-year" string="Year" name="year"
+                          domain="[('year','=',time.strftime('%%Y'))]"
+                          help="Cash Analysis created during this year"/>
+                      <separator orientation="vertical"/>
+
+                      <filter icon="terp-go-month" string="Month" name="This Month"
+                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                          help="Cash Analysis created in current month"/>
+                      <filter icon="terp-go-month"
+                           string="Month -1"
+                           domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                           help="Cash Analysis created in last month"/>
+                      <separator orientation="vertical"/>
+                      <filter icon="terp-go-today"
                              string="    Today    "
                              name="today"
-                             separator="1"
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Cash Analysis created by today"/>	                    
-	                    <separator orientation="vertical"/>
+                             help="Cash Analysis created by today"/>
+                      <separator orientation="vertical"/>
                         <filter icon="terp-document-new"
                             string="Draft"
                             domain="[('state','=',('draft'))]"/>
-	                    <filter icon="terp-camera_test"
-	                        string="Confirm"
-	                        domain="[('state','=',('confirm'))]"/>
+                      <filter icon="terp-camera_test"
+                          string="Confirm"
+                          domain="[('state','=',('confirm'))]"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
@@ -59,31 +59,31 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
                         </field>
-                    </group>  
+                    </group>
                     <newline/>
-	                <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                  <group expand="1" string="Group By...">
+                      <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                      <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-	                    <separator orientation="vertical"/>
+                      <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of cash register"/>
-	                </group>                                  
-	            </search>
-	        </field>
+                  </group>
+              </search>
+          </field>
         </record>
 
         <record id="action_report_cash_register_all" model="ir.actions.act_window">
-	        <field name="name">Register Analysis</field>
-	        <field name="res_model">report.cash.register</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="search_view_id" ref="view_report_cash_register_search"/>
-	        <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
-	    </record>
+          <field name="name">Register Analysis</field>
+          <field name="res_model">report.cash.register</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,form</field>
+          <field name="search_view_id" ref="view_report_cash_register_search"/>
+          <field name="context">{'search_default_year':1,'search_default_This Month':1,'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+      </record>
 
-	    <menuitem action="action_report_cash_register_all" id="menu_report_cash_register_all" parent="menu_point_rep" sequence="1"/>
-	</data>
+      <menuitem action="action_report_cash_register_all" id="menu_report_cash_register_all" parent="menu_point_rep" sequence="1"/>
+  </data>
 </openerp>
diff --git a/addons/point_of_sale/static/lib/backbone/backbone-0.5.3.js b/addons/point_of_sale/static/lib/backbone/backbone-0.5.3.js
new file mode 100644
index 00000000000..8958c798466
--- /dev/null
+++ b/addons/point_of_sale/static/lib/backbone/backbone-0.5.3.js
@@ -0,0 +1,1158 @@
+//     Backbone.js 0.5.3
+//     (c) 2010 Jeremy Ashkenas, DocumentCloud Inc.
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://documentcloud.github.com/backbone
+
+(function(){
+
+  // Initial Setup
+  // -------------
+
+  // Save a reference to the global object.
+  var root = this;
+
+  // Save the previous value of the `Backbone` variable.
+  var previousBackbone = root.Backbone;
+
+  // The top-level namespace. All public Backbone classes and modules will
+  // be attached to this. Exported for both CommonJS and the browser.
+  var Backbone;
+  if (typeof exports !== 'undefined') {
+    Backbone = exports;
+  } else {
+    Backbone = root.Backbone = {};
+  }
+
+  // Current version of the library. Keep in sync with `package.json`.
+  Backbone.VERSION = '0.5.3';
+
+  // Require Underscore, if we're on the server, and it's not already present.
+  var _ = root._;
+  if (!_ && (typeof require !== 'undefined')) _ = require('underscore')._;
+
+  // For Backbone's purposes, jQuery or Zepto owns the `$` variable.
+  var $ = root.jQuery || root.Zepto;
+
+  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
+  // to its previous owner. Returns a reference to this Backbone object.
+  Backbone.noConflict = function() {
+    root.Backbone = previousBackbone;
+    return this;
+  };
+
+  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option will
+  // fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and set a
+  // `X-Http-Method-Override` header.
+  Backbone.emulateHTTP = false;
+
+  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
+  // `application/json` requests ... will encode the body as
+  // `application/x-www-form-urlencoded` instead and will send the model in a
+  // form param named `model`.
+  Backbone.emulateJSON = false;
+
+  // Backbone.Events
+  // -----------------
+
+  // A module that can be mixed in to *any object* in order to provide it with
+  // custom events. You may `bind` or `unbind` a callback function to an event;
+  // `trigger`-ing an event fires all callbacks in succession.
+  //
+  //     var object = {};
+  //     _.extend(object, Backbone.Events);
+  //     object.bind('expand', function(){ alert('expanded'); });
+  //     object.trigger('expand');
+  //
+  Backbone.Events = {
+
+    // Bind an event, specified by a string name, `ev`, to a `callback` function.
+    // Passing `"all"` will bind the callback to all events fired.
+    bind : function(ev, callback, context) {
+      var calls = this._callbacks || (this._callbacks = {});
+      var list  = calls[ev] || (calls[ev] = []);
+      list.push([callback, context]);
+      return this;
+    },
+
+    // Remove one or many callbacks. If `callback` is null, removes all
+    // callbacks for the event. If `ev` is null, removes all bound callbacks
+    // for all events.
+    unbind : function(ev, callback) {
+      var calls;
+      if (!ev) {
+        this._callbacks = {};
+      } else if (calls = this._callbacks) {
+        if (!callback) {
+          calls[ev] = [];
+        } else {
+          var list = calls[ev];
+          if (!list) return this;
+          for (var i = 0, l = list.length; i < l; i++) {
+            if (list[i] && callback === list[i][0]) {
+              list[i] = null;
+              break;
+            }
+          }
+        }
+      }
+      return this;
+    },
+
+    // Trigger an event, firing all bound callbacks. Callbacks are passed the
+    // same arguments as `trigger` is, apart from the event name.
+    // Listening for `"all"` passes the true event name as the first argument.
+    trigger : function(eventName) {
+      var list, calls, ev, callback, args;
+      var both = 2;
+      if (!(calls = this._callbacks)) return this;
+      while (both--) {
+        ev = both ? eventName : 'all';
+        if (list = calls[ev]) {
+          for (var i = 0, l = list.length; i < l; i++) {
+            if (!(callback = list[i])) {
+              list.splice(i, 1); i--; l--;
+            } else {
+              args = both ? Array.prototype.slice.call(arguments, 1) : arguments;
+              callback[0].apply(callback[1] || this, args);
+            }
+          }
+        }
+      }
+      return this;
+    }
+
+  };
+
+  // Backbone.Model
+  // --------------
+
+  // Create a new model, with defined attributes. A client id (`cid`)
+  // is automatically generated and assigned for you.
+  Backbone.Model = function(attributes, options) {
+    var defaults;
+    attributes || (attributes = {});
+    if (defaults = this.defaults) {
+      if (_.isFunction(defaults)) defaults = defaults.call(this);
+      attributes = _.extend({}, defaults, attributes);
+    }
+    this.attributes = {};
+    this._escapedAttributes = {};
+    this.cid = _.uniqueId('c');
+    this.set(attributes, {silent : true});
+    this._changed = false;
+    this._previousAttributes = _.clone(this.attributes);
+    if (options && options.collection) this.collection = options.collection;
+    this.initialize(attributes, options);
+  };
+
+  // Attach all inheritable methods to the Model prototype.
+  _.extend(Backbone.Model.prototype, Backbone.Events, {
+
+    // A snapshot of the model's previous attributes, taken immediately
+    // after the last `"change"` event was fired.
+    _previousAttributes : null,
+
+    // Has the item been changed since the last `"change"` event?
+    _changed : false,
+
+    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
+    // CouchDB users may want to set this to `"_id"`.
+    idAttribute : 'id',
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize : function(){},
+
+    // Return a copy of the model's `attributes` object.
+    toJSON : function() {
+      return _.clone(this.attributes);
+    },
+
+    // Get the value of an attribute.
+    get : function(attr) {
+      return this.attributes[attr];
+    },
+
+    // Get the HTML-escaped value of an attribute.
+    escape : function(attr) {
+      var html;
+      if (html = this._escapedAttributes[attr]) return html;
+      var val = this.attributes[attr];
+      return this._escapedAttributes[attr] = escapeHTML(val == null ? '' : '' + val);
+    },
+
+    // Returns `true` if the attribute contains a value that is not null
+    // or undefined.
+    has : function(attr) {
+      return this.attributes[attr] != null;
+    },
+
+    // Set a hash of model attributes on the object, firing `"change"` unless you
+    // choose to silence it.
+    set : function(attrs, options) {
+
+      // Extract attributes and options.
+      options || (options = {});
+      if (!attrs) return this;
+      if (attrs.attributes) attrs = attrs.attributes;
+      var now = this.attributes, escaped = this._escapedAttributes;
+
+      // Run validation.
+      if (!options.silent && this.validate && !this._performValidation(attrs, options)) return false;
+
+      // Check for changes of `id`.
+      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
+
+      // We're about to start triggering change events.
+      var alreadyChanging = this._changing;
+      this._changing = true;
+
+      // Update attributes.
+      for (var attr in attrs) {
+        var val = attrs[attr];
+        if (!_.isEqual(now[attr], val)) {
+          now[attr] = val;
+          delete escaped[attr];
+          this._changed = true;
+          if (!options.silent) this.trigger('change:' + attr, this, val, options);
+        }
+      }
+
+      // Fire the `"change"` event, if the model has been changed.
+      if (!alreadyChanging && !options.silent && this._changed) this.change(options);
+      this._changing = false;
+      return this;
+    },
+
+    // Remove an attribute from the model, firing `"change"` unless you choose
+    // to silence it. `unset` is a noop if the attribute doesn't exist.
+    unset : function(attr, options) {
+      if (!(attr in this.attributes)) return this;
+      options || (options = {});
+      var value = this.attributes[attr];
+
+      // Run validation.
+      var validObj = {};
+      validObj[attr] = void 0;
+      if (!options.silent && this.validate && !this._performValidation(validObj, options)) return false;
+
+      // Remove the attribute.
+      delete this.attributes[attr];
+      delete this._escapedAttributes[attr];
+      if (attr == this.idAttribute) delete this.id;
+      this._changed = true;
+      if (!options.silent) {
+        this.trigger('change:' + attr, this, void 0, options);
+        this.change(options);
+      }
+      return this;
+    },
+
+    // Clear all attributes on the model, firing `"change"` unless you choose
+    // to silence it.
+    clear : function(options) {
+      options || (options = {});
+      var attr;
+      var old = this.attributes;
+
+      // Run validation.
+      var validObj = {};
+      for (attr in old) validObj[attr] = void 0;
+      if (!options.silent && this.validate && !this._performValidation(validObj, options)) return false;
+
+      this.attributes = {};
+      this._escapedAttributes = {};
+      this._changed = true;
+      if (!options.silent) {
+        for (attr in old) {
+          this.trigger('change:' + attr, this, void 0, options);
+        }
+        this.change(options);
+      }
+      return this;
+    },
+
+    // Fetch the model from the server. If the server's representation of the
+    // model differs from its current attributes, they will be overriden,
+    // triggering a `"change"` event.
+    fetch : function(options) {
+      options || (options = {});
+      var model = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        if (!model.set(model.parse(resp, xhr), options)) return false;
+        if (success) success(model, resp);
+      };
+      options.error = wrapError(options.error, model, options);
+      return (this.sync || Backbone.sync).call(this, 'read', this, options);
+    },
+
+    // Set a hash of model attributes, and sync the model to the server.
+    // If the server returns an attributes hash that differs, the model's
+    // state will be `set` again.
+    save : function(attrs, options) {
+      options || (options = {});
+      if (attrs && !this.set(attrs, options)) return false;
+      var model = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        if (!model.set(model.parse(resp, xhr), options)) return false;
+        if (success) success(model, resp, xhr);
+      };
+      options.error = wrapError(options.error, model, options);
+      var method = this.isNew() ? 'create' : 'update';
+      return (this.sync || Backbone.sync).call(this, method, this, options);
+    },
+
+    // Destroy this model on the server if it was already persisted. Upon success, the model is removed
+    // from its collection, if it has one.
+    destroy : function(options) {
+      options || (options = {});
+      if (this.isNew()) return this.trigger('destroy', this, this.collection, options);
+      var model = this;
+      var success = options.success;
+      options.success = function(resp) {
+        model.trigger('destroy', model, model.collection, options);
+        if (success) success(model, resp);
+      };
+      options.error = wrapError(options.error, model, options);
+      return (this.sync || Backbone.sync).call(this, 'delete', this, options);
+    },
+
+    // Default URL for the model's representation on the server -- if you're
+    // using Backbone's restful methods, override this to change the endpoint
+    // that will be called.
+    url : function() {
+      var base = getUrl(this.collection) || this.urlRoot || urlError();
+      if (this.isNew()) return base;
+      return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
+    },
+
+    // **parse** converts a response into the hash of attributes to be `set` on
+    // the model. The default implementation is just to pass the response along.
+    parse : function(resp, xhr) {
+      return resp;
+    },
+
+    // Create a new model with identical attributes to this one.
+    clone : function() {
+      return new this.constructor(this);
+    },
+
+    // A model is new if it has never been saved to the server, and lacks an id.
+    isNew : function() {
+      return this.id == null;
+    },
+
+    // Call this method to manually fire a `change` event for this model.
+    // Calling this will cause all objects observing the model to update.
+    change : function(options) {
+      this.trigger('change', this, options);
+      this._previousAttributes = _.clone(this.attributes);
+      this._changed = false;
+    },
+
+    // Determine if the model has changed since the last `"change"` event.
+    // If you specify an attribute name, determine if that attribute has changed.
+    hasChanged : function(attr) {
+      if (attr) return this._previousAttributes[attr] != this.attributes[attr];
+      return this._changed;
+    },
+
+    // Return an object containing all the attributes that have changed, or false
+    // if there are no changed attributes. Useful for determining what parts of a
+    // view need to be updated and/or what attributes need to be persisted to
+    // the server.
+    changedAttributes : function(now) {
+      now || (now = this.attributes);
+      var old = this._previousAttributes;
+      var changed = false;
+      for (var attr in now) {
+        if (!_.isEqual(old[attr], now[attr])) {
+          changed = changed || {};
+          changed[attr] = now[attr];
+        }
+      }
+      return changed;
+    },
+
+    // Get the previous value of an attribute, recorded at the time the last
+    // `"change"` event was fired.
+    previous : function(attr) {
+      if (!attr || !this._previousAttributes) return null;
+      return this._previousAttributes[attr];
+    },
+
+    // Get all of the attributes of the model at the time of the previous
+    // `"change"` event.
+    previousAttributes : function() {
+      return _.clone(this._previousAttributes);
+    },
+
+    // Run validation against a set of incoming attributes, returning `true`
+    // if all is well. If a specific `error` callback has been passed,
+    // call that instead of firing the general `"error"` event.
+    _performValidation : function(attrs, options) {
+      var error = this.validate(attrs);
+      if (error) {
+        if (options.error) {
+          options.error(this, error, options);
+        } else {
+          this.trigger('error', this, error, options);
+        }
+        return false;
+      }
+      return true;
+    }
+
+  });
+
+  // Backbone.Collection
+  // -------------------
+
+  // Provides a standard collection class for our sets of models, ordered
+  // or unordered. If a `comparator` is specified, the Collection will maintain
+  // its models in sort order, as they're added and removed.
+  Backbone.Collection = function(models, options) {
+    options || (options = {});
+    if (options.comparator) this.comparator = options.comparator;
+    _.bindAll(this, '_onModelEvent', '_removeReference');
+    this._reset();
+    if (models) this.reset(models, {silent: true});
+    this.initialize.apply(this, arguments);
+  };
+
+  // Define the Collection's inheritable methods.
+  _.extend(Backbone.Collection.prototype, Backbone.Events, {
+
+    // The default model for a collection is just a **Backbone.Model**.
+    // This should be overridden in most cases.
+    model : Backbone.Model,
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize : function(){},
+
+    // The JSON representation of a Collection is an array of the
+    // models' attributes.
+    toJSON : function() {
+      return this.map(function(model){ return model.toJSON(); });
+    },
+
+    // Add a model, or list of models to the set. Pass **silent** to avoid
+    // firing the `added` event for every new model.
+    add : function(models, options) {
+      if (_.isArray(models)) {
+        for (var i = 0, l = models.length; i < l; i++) {
+          this._add(models[i], options);
+        }
+      } else {
+        this._add(models, options);
+      }
+      return this;
+    },
+
+    // Remove a model, or a list of models from the set. Pass silent to avoid
+    // firing the `removed` event for every model removed.
+    remove : function(models, options) {
+      if (_.isArray(models)) {
+        for (var i = 0, l = models.length; i < l; i++) {
+          this._remove(models[i], options);
+        }
+      } else {
+        this._remove(models, options);
+      }
+      return this;
+    },
+
+    // Get a model from the set by id.
+    get : function(id) {
+      if (id == null) return null;
+      return this._byId[id.id != null ? id.id : id];
+    },
+
+    // Get a model from the set by client id.
+    getByCid : function(cid) {
+      return cid && this._byCid[cid.cid || cid];
+    },
+
+    // Get the model at the given index.
+    at: function(index) {
+      return this.models[index];
+    },
+
+    // Force the collection to re-sort itself. You don't need to call this under normal
+    // circumstances, as the set will maintain sort order as each item is added.
+    sort : function(options) {
+      options || (options = {});
+      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
+      this.models = this.sortBy(this.comparator);
+      if (!options.silent) this.trigger('reset', this, options);
+      return this;
+    },
+
+    // Pluck an attribute from each model in the collection.
+    pluck : function(attr) {
+      return _.map(this.models, function(model){ return model.get(attr); });
+    },
+
+    // When you have more items than you want to add or remove individually,
+    // you can reset the entire set with a new list of models, without firing
+    // any `added` or `removed` events. Fires `reset` when finished.
+    reset : function(models, options) {
+      models  || (models = []);
+      options || (options = {});
+      this.each(this._removeReference);
+      this._reset();
+      this.add(models, {silent: true});
+      if (!options.silent) this.trigger('reset', this, options);
+      return this;
+    },
+
+    // Fetch the default set of models for this collection, resetting the
+    // collection when they arrive. If `add: true` is passed, appends the
+    // models to the collection instead of resetting.
+    fetch : function(options) {
+      options || (options = {});
+      var collection = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
+        if (success) success(collection, resp);
+      };
+      options.error = wrapError(options.error, collection, options);
+      return (this.sync || Backbone.sync).call(this, 'read', this, options);
+    },
+
+    // Create a new instance of a model in this collection. After the model
+    // has been created on the server, it will be added to the collection.
+    // Returns the model, or 'false' if validation on a new model fails.
+    create : function(model, options) {
+      var coll = this;
+      options || (options = {});
+      model = this._prepareModel(model, options);
+      if (!model) return false;
+      var success = options.success;
+      options.success = function(nextModel, resp, xhr) {
+        coll.add(nextModel, options);
+        if (success) success(nextModel, resp, xhr);
+      };
+      model.save(null, options);
+      return model;
+    },
+
+    // **parse** converts a response into a list of models to be added to the
+    // collection. The default implementation is just to pass it through.
+    parse : function(resp, xhr) {
+      return resp;
+    },
+
+    // Proxy to _'s chain. Can't be proxied the same way the rest of the
+    // underscore methods are proxied because it relies on the underscore
+    // constructor.
+    chain: function () {
+      return _(this.models).chain();
+    },
+
+    // Reset all internal state. Called when the collection is reset.
+    _reset : function(options) {
+      this.length = 0;
+      this.models = [];
+      this._byId  = {};
+      this._byCid = {};
+    },
+
+    // Prepare a model to be added to this collection
+    _prepareModel: function(model, options) {
+      if (!(model instanceof Backbone.Model)) {
+        var attrs = model;
+        model = new this.model(attrs, {collection: this});
+        if (model.validate && !model._performValidation(attrs, options)) model = false;
+      } else if (!model.collection) {
+        model.collection = this;
+      }
+      return model;
+    },
+
+    // Internal implementation of adding a single model to the set, updating
+    // hash indexes for `id` and `cid` lookups.
+    // Returns the model, or 'false' if validation on a new model fails.
+    _add : function(model, options) {
+      options || (options = {});
+      model = this._prepareModel(model, options);
+      if (!model) return false;
+      var already = this.getByCid(model);
+      if (already) throw new Error(["Can't add the same model to a set twice", already.id]);
+      this._byId[model.id] = model;
+      this._byCid[model.cid] = model;
+      var index = options.at != null ? options.at :
+                  this.comparator ? this.sortedIndex(model, this.comparator) :
+                  this.length;
+      this.models.splice(index, 0, model);
+      model.bind('all', this._onModelEvent);
+      this.length++;
+      if (!options.silent) model.trigger('add', model, this, options);
+      return model;
+    },
+
+    // Internal implementation of removing a single model from the set, updating
+    // hash indexes for `id` and `cid` lookups.
+    _remove : function(model, options) {
+      options || (options = {});
+      model = this.getByCid(model) || this.get(model);
+      if (!model) return null;
+      delete this._byId[model.id];
+      delete this._byCid[model.cid];
+      this.models.splice(this.indexOf(model), 1);
+      this.length--;
+      if (!options.silent) model.trigger('remove', model, this, options);
+      this._removeReference(model);
+      return model;
+    },
+
+    // Internal method to remove a model's ties to a collection.
+    _removeReference : function(model) {
+      if (this == model.collection) {
+        delete model.collection;
+      }
+      model.unbind('all', this._onModelEvent);
+    },
+
+    // Internal method called every time a model in the set fires an event.
+    // Sets need to update their indexes when models change ids. All other
+    // events simply proxy through. "add" and "remove" events that originate
+    // in other collections are ignored.
+    _onModelEvent : function(ev, model, collection, options) {
+      if ((ev == 'add' || ev == 'remove') && collection != this) return;
+      if (ev == 'destroy') {
+        this._remove(model, options);
+      }
+      if (model && ev === 'change:' + model.idAttribute) {
+        delete this._byId[model.previous(model.idAttribute)];
+        this._byId[model.id] = model;
+      }
+      this.trigger.apply(this, arguments);
+    }
+
+  });
+
+  // Underscore methods that we want to implement on the Collection.
+  var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find', 'detect',
+    'filter', 'select', 'reject', 'every', 'all', 'some', 'any', 'include',
+    'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex', 'toArray', 'size',
+    'first', 'rest', 'last', 'without', 'indexOf', 'lastIndexOf', 'isEmpty', 'groupBy'];
+
+  // Mix in each Underscore method as a proxy to `Collection#models`.
+  _.each(methods, function(method) {
+    Backbone.Collection.prototype[method] = function() {
+      return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
+    };
+  });
+
+  // Backbone.Router
+  // -------------------
+
+  // Routers map faux-URLs to actions, and fire events when routes are
+  // matched. Creating a new one sets its `routes` hash, if not set statically.
+  Backbone.Router = function(options) {
+    options || (options = {});
+    if (options.routes) this.routes = options.routes;
+    this._bindRoutes();
+    this.initialize.apply(this, arguments);
+  };
+
+  // Cached regular expressions for matching named param parts and splatted
+  // parts of route strings.
+  var namedParam    = /:([\w\d]+)/g;
+  var splatParam    = /\*([\w\d]+)/g;
+  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
+
+  // Set up all inheritable **Backbone.Router** properties and methods.
+  _.extend(Backbone.Router.prototype, Backbone.Events, {
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize : function(){},
+
+    // Manually bind a single named route to a callback. For example:
+    //
+    //     this.route('search/:query/p:num', 'search', function(query, num) {
+    //       ...
+    //     });
+    //
+    route : function(route, name, callback) {
+      Backbone.history || (Backbone.history = new Backbone.History);
+      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
+      Backbone.history.route(route, _.bind(function(fragment) {
+        var args = this._extractParameters(route, fragment);
+        callback.apply(this, args);
+        this.trigger.apply(this, ['route:' + name].concat(args));
+      }, this));
+    },
+
+    // Simple proxy to `Backbone.history` to save a fragment into the history.
+    navigate : function(fragment, triggerRoute) {
+      Backbone.history.navigate(fragment, triggerRoute);
+    },
+
+    // Bind all defined routes to `Backbone.history`. We have to reverse the
+    // order of the routes here to support behavior where the most general
+    // routes can be defined at the bottom of the route map.
+    _bindRoutes : function() {
+      if (!this.routes) return;
+      var routes = [];
+      for (var route in this.routes) {
+        routes.unshift([route, this.routes[route]]);
+      }
+      for (var i = 0, l = routes.length; i < l; i++) {
+        this.route(routes[i][0], routes[i][1], this[routes[i][1]]);
+      }
+    },
+
+    // Convert a route string into a regular expression, suitable for matching
+    // against the current location hash.
+    _routeToRegExp : function(route) {
+      route = route.replace(escapeRegExp, "\\$&")
+                   .replace(namedParam, "([^\/]*)")
+                   .replace(splatParam, "(.*?)");
+      return new RegExp('^' + route + '$');
+    },
+
+    // Given a route, and a URL fragment that it matches, return the array of
+    // extracted parameters.
+    _extractParameters : function(route, fragment) {
+      return route.exec(fragment).slice(1);
+    }
+
+  });
+
+  // Backbone.History
+  // ----------------
+
+  // Handles cross-browser history management, based on URL fragments. If the
+  // browser does not support `onhashchange`, falls back to polling.
+  Backbone.History = function() {
+    this.handlers = [];
+    _.bindAll(this, 'checkUrl');
+  };
+
+  // Cached regex for cleaning hashes.
+  var hashStrip = /^#*/;
+
+  // Cached regex for detecting MSIE.
+  var isExplorer = /msie [\w.]+/;
+
+  // Has the history handling already been started?
+  var historyStarted = false;
+
+  // Set up all inheritable **Backbone.History** properties and methods.
+  _.extend(Backbone.History.prototype, {
+
+    // The default interval to poll for hash changes, if necessary, is
+    // twenty times a second.
+    interval: 50,
+
+    // Get the cross-browser normalized URL fragment, either from the URL,
+    // the hash, or the override.
+    getFragment : function(fragment, forcePushState) {
+      if (fragment == null) {
+        if (this._hasPushState || forcePushState) {
+          fragment = window.location.pathname;
+          var search = window.location.search;
+          if (search) fragment += search;
+          if (fragment.indexOf(this.options.root) == 0) fragment = fragment.substr(this.options.root.length);
+        } else {
+          fragment = window.location.hash;
+        }
+      }
+      return decodeURIComponent(fragment.replace(hashStrip, ''));
+    },
+
+    // Start the hash change handling, returning `true` if the current URL matches
+    // an existing route, and `false` otherwise.
+    start : function(options) {
+
+      // Figure out the initial configuration. Do we need an iframe?
+      // Is pushState desired ... is it available?
+      if (historyStarted) throw new Error("Backbone.history has already been started");
+      this.options          = _.extend({}, {root: '/'}, this.options, options);
+      this._wantsPushState  = !!this.options.pushState;
+      this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
+      var fragment          = this.getFragment();
+      var docMode           = document.documentMode;
+      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
+      if (oldIE) {
+        this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
+        this.navigate(fragment);
+      }
+
+      // Depending on whether we're using pushState or hashes, and whether
+      // 'onhashchange' is supported, determine how we check the URL state.
+      if (this._hasPushState) {
+        $(window).bind('popstate', this.checkUrl);
+      } else if ('onhashchange' in window && !oldIE) {
+        $(window).bind('hashchange', this.checkUrl);
+      } else {
+        setInterval(this.checkUrl, this.interval);
+      }
+
+      // Determine if we need to change the base url, for a pushState link
+      // opened by a non-pushState browser.
+      this.fragment = fragment;
+      historyStarted = true;
+      var loc = window.location;
+      var atRoot  = loc.pathname == this.options.root;
+      if (this._wantsPushState && !this._hasPushState && !atRoot) {
+        this.fragment = this.getFragment(null, true);
+        window.location.replace(this.options.root + '#' + this.fragment);
+        // Return immediately as browser will do redirect to new url
+        return true;
+      } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
+        this.fragment = loc.hash.replace(hashStrip, '');
+        window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
+      }
+
+      if (!this.options.silent) {
+        return this.loadUrl();
+      }
+    },
+
+    // Add a route to be tested when the fragment changes. Routes added later may
+    // override previous routes.
+    route : function(route, callback) {
+      this.handlers.unshift({route : route, callback : callback});
+    },
+
+    // Checks the current URL to see if it has changed, and if it has,
+    // calls `loadUrl`, normalizing across the hidden iframe.
+    checkUrl : function(e) {
+      var current = this.getFragment();
+      if (current == this.fragment && this.iframe) current = this.getFragment(this.iframe.location.hash);
+      if (current == this.fragment || current == decodeURIComponent(this.fragment)) return false;
+      if (this.iframe) this.navigate(current);
+      this.loadUrl() || this.loadUrl(window.location.hash);
+    },
+
+    // Attempt to load the current URL fragment. If a route succeeds with a
+    // match, returns `true`. If no defined routes matches the fragment,
+    // returns `false`.
+    loadUrl : function(fragmentOverride) {
+      var fragment = this.fragment = this.getFragment(fragmentOverride);
+      var matched = _.any(this.handlers, function(handler) {
+        if (handler.route.test(fragment)) {
+          handler.callback(fragment);
+          return true;
+        }
+      });
+      return matched;
+    },
+
+    // Save a fragment into the hash history. You are responsible for properly
+    // URL-encoding the fragment in advance. This does not trigger
+    // a `hashchange` event.
+    navigate : function(fragment, triggerRoute) {
+      var frag = (fragment || '').replace(hashStrip, '');
+      if (this.fragment == frag || this.fragment == decodeURIComponent(frag)) return;
+      if (this._hasPushState) {
+        var loc = window.location;
+        if (frag.indexOf(this.options.root) != 0) frag = this.options.root + frag;
+        this.fragment = frag;
+        window.history.pushState({}, document.title, loc.protocol + '//' + loc.host + frag);
+      } else {
+        window.location.hash = this.fragment = frag;
+        if (this.iframe && (frag != this.getFragment(this.iframe.location.hash))) {
+          this.iframe.document.open().close();
+          this.iframe.location.hash = frag;
+        }
+      }
+      if (triggerRoute) this.loadUrl(fragment);
+    }
+
+  });
+
+  // Backbone.View
+  // -------------
+
+  // Creating a Backbone.View creates its initial element outside of the DOM,
+  // if an existing element is not provided...
+  Backbone.View = function(options) {
+    this.cid = _.uniqueId('view');
+    this._configure(options || {});
+    this._ensureElement();
+    this.delegateEvents();
+    this.initialize.apply(this, arguments);
+  };
+
+  // Element lookup, scoped to DOM elements within the current view.
+  // This should be prefered to global lookups, if you're dealing with
+  // a specific view.
+  var selectorDelegate = function(selector) {
+    return $(selector, this.el);
+  };
+
+  // Cached regex to split keys for `delegate`.
+  var eventSplitter = /^(\S+)\s*(.*)$/;
+
+  // List of view options to be merged as properties.
+  var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
+
+  // Set up all inheritable **Backbone.View** properties and methods.
+  _.extend(Backbone.View.prototype, Backbone.Events, {
+
+    // The default `tagName` of a View's element is `"div"`.
+    tagName : 'div',
+
+    // Attach the `selectorDelegate` function as the `$` property.
+    $       : selectorDelegate,
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize : function(){},
+
+    // **render** is the core function that your view should override, in order
+    // to populate its element (`this.el`), with the appropriate HTML. The
+    // convention is for **render** to always return `this`.
+    render : function() {
+      return this;
+    },
+
+    // Remove this view from the DOM. Note that the view isn't present in the
+    // DOM by default, so calling this method may be a no-op.
+    remove : function() {
+      $(this.el).remove();
+      return this;
+    },
+
+    // For small amounts of DOM Elements, where a full-blown template isn't
+    // needed, use **make** to manufacture elements, one at a time.
+    //
+    //     var el = this.make('li', {'class': 'row'}, this.model.escape('title'));
+    //
+    make : function(tagName, attributes, content) {
+      var el = document.createElement(tagName);
+      if (attributes) $(el).attr(attributes);
+      if (content) $(el).html(content);
+      return el;
+    },
+
+    // Set callbacks, where `this.callbacks` is a hash of
+    //
+    // *{"event selector": "callback"}*
+    //
+    //     {
+    //       'mousedown .title':  'edit',
+    //       'click .button':     'save'
+    //     }
+    //
+    // pairs. Callbacks will be bound to the view, with `this` set properly.
+    // Uses event delegation for efficiency.
+    // Omitting the selector binds the event to `this.el`.
+    // This only works for delegate-able events: not `focus`, `blur`, and
+    // not `change`, `submit`, and `reset` in Internet Explorer.
+    delegateEvents : function(events) {
+      if (!(events || (events = this.events))) return;
+      if (_.isFunction(events)) events = events.call(this);
+      $(this.el).unbind('.delegateEvents' + this.cid);
+      for (var key in events) {
+        var method = this[events[key]];
+        if (!method) throw new Error('Event "' + events[key] + '" does not exist');
+        var match = key.match(eventSplitter);
+        var eventName = match[1], selector = match[2];
+        method = _.bind(method, this);
+        eventName += '.delegateEvents' + this.cid;
+        if (selector === '') {
+          $(this.el).bind(eventName, method);
+        } else {
+          $(this.el).delegate(selector, eventName, method);
+        }
+      }
+    },
+
+    // Performs the initial configuration of a View with a set of options.
+    // Keys with special meaning *(model, collection, id, className)*, are
+    // attached directly to the view.
+    _configure : function(options) {
+      if (this.options) options = _.extend({}, this.options, options);
+      for (var i = 0, l = viewOptions.length; i < l; i++) {
+        var attr = viewOptions[i];
+        if (options[attr]) this[attr] = options[attr];
+      }
+      this.options = options;
+    },
+
+    // Ensure that the View has a DOM element to render into.
+    // If `this.el` is a string, pass it through `$()`, take the first
+    // matching element, and re-assign it to `el`. Otherwise, create
+    // an element from the `id`, `className` and `tagName` proeprties.
+    _ensureElement : function() {
+      if (!this.el) {
+        var attrs = this.attributes || {};
+        if (this.id) attrs.id = this.id;
+        if (this.className) attrs['class'] = this.className;
+        this.el = this.make(this.tagName, attrs);
+      } else if (_.isString(this.el)) {
+        this.el = $(this.el).get(0);
+      }
+    }
+
+  });
+
+  // The self-propagating extend function that Backbone classes use.
+  var extend = function (protoProps, classProps) {
+    var child = inherits(this, protoProps, classProps);
+    child.extend = this.extend;
+    return child;
+  };
+
+  // Set up inheritance for the model, collection, and view.
+  Backbone.Model.extend = Backbone.Collection.extend =
+    Backbone.Router.extend = Backbone.View.extend = extend;
+
+  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
+  var methodMap = {
+    'create': 'POST',
+    'update': 'PUT',
+    'delete': 'DELETE',
+    'read'  : 'GET'
+  };
+
+  // Backbone.sync
+  // -------------
+
+  // Override this function to change the manner in which Backbone persists
+  // models to the server. You will be passed the type of request, and the
+  // model in question. By default, uses makes a RESTful Ajax request
+  // to the model's `url()`. Some possible customizations could be:
+  //
+  // * Use `setTimeout` to batch rapid-fire updates into a single request.
+  // * Send up the models as XML instead of JSON.
+  // * Persist models via WebSockets instead of Ajax.
+  //
+  // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
+  // as `POST`, with a `_method` parameter containing the true HTTP method,
+  // as well as all requests with the body as `application/x-www-form-urlencoded` instead of
+  // `application/json` with the model in a param named `model`.
+  // Useful when interfacing with server-side languages like **PHP** that make
+  // it difficult to read the body of `PUT` requests.
+  Backbone.sync = function(method, model, options) {
+    var type = methodMap[method];
+
+    // Default JSON-request options.
+    var params = _.extend({
+      type:         type,
+      dataType:     'json'
+    }, options);
+
+    // Ensure that we have a URL.
+    if (!params.url) {
+      params.url = getUrl(model) || urlError();
+    }
+
+    // Ensure that we have the appropriate request data.
+    if (!params.data && model && (method == 'create' || method == 'update')) {
+      params.contentType = 'application/json';
+      params.data = JSON.stringify(model.toJSON());
+    }
+
+    // For older servers, emulate JSON by encoding the request into an HTML-form.
+    if (Backbone.emulateJSON) {
+      params.contentType = 'application/x-www-form-urlencoded';
+      params.data        = params.data ? {model : params.data} : {};
+    }
+
+    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
+    // And an `X-HTTP-Method-Override` header.
+    if (Backbone.emulateHTTP) {
+      if (type === 'PUT' || type === 'DELETE') {
+        if (Backbone.emulateJSON) params.data._method = type;
+        params.type = 'POST';
+        params.beforeSend = function(xhr) {
+          xhr.setRequestHeader('X-HTTP-Method-Override', type);
+        };
+      }
+    }
+
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET' && !Backbone.emulateJSON) {
+      params.processData = false;
+    }
+
+    // Make the request.
+    return $.ajax(params);
+  };
+
+  // Helpers
+  // -------
+
+  // Shared empty constructor function to aid in prototype-chain creation.
+  var ctor = function(){};
+
+  // Helper function to correctly set up the prototype chain, for subclasses.
+  // Similar to `goog.inherits`, but uses a hash of prototype properties and
+  // class properties to be extended.
+  var inherits = function(parent, protoProps, staticProps) {
+    var child;
+
+    // The constructor function for the new subclass is either defined by you
+    // (the "constructor" property in your `extend` definition), or defaulted
+    // by us to simply call `super()`.
+    if (protoProps && protoProps.hasOwnProperty('constructor')) {
+      child = protoProps.constructor;
+    } else {
+      child = function(){ return parent.apply(this, arguments); };
+    }
+
+    // Inherit class (static) properties from parent.
+    _.extend(child, parent);
+
+    // Set the prototype chain to inherit from `parent`, without calling
+    // `parent`'s constructor function.
+    ctor.prototype = parent.prototype;
+    child.prototype = new ctor();
+
+    // Add prototype properties (instance properties) to the subclass,
+    // if supplied.
+    if (protoProps) _.extend(child.prototype, protoProps);
+
+    // Add static properties to the constructor function, if supplied.
+    if (staticProps) _.extend(child, staticProps);
+
+    // Correctly set child's `prototype.constructor`.
+    child.prototype.constructor = child;
+
+    // Set a convenience property in case the parent's prototype is needed later.
+    child.__super__ = parent.prototype;
+
+    return child;
+  };
+
+  // Helper function to get a URL from a Model or Collection as a property
+  // or as a function.
+  var getUrl = function(object) {
+    if (!(object && object.url)) return null;
+    return _.isFunction(object.url) ? object.url() : object.url;
+  };
+
+  // Throw an error when a URL is needed, and none is supplied.
+  var urlError = function() {
+    throw new Error('A "url" property or function must be specified');
+  };
+
+  // Wrap an optional error callback with a fallback error event.
+  var wrapError = function(onError, model, options) {
+    return function(resp) {
+      if (onError) {
+        onError(model, resp, options);
+      } else {
+        model.trigger('error', model, resp, options);
+      }
+    };
+  };
+
+  // Helper function to escape a string for HTML rendering.
+  var escapeHTML = function(string) {
+    return string.replace(/&(?!\w+;|#\d+;|#x[\da-f]+;)/gi, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
+  };
+
+}).call(this);
\ No newline at end of file
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
new file mode 100644
index 00000000000..24eb704b7dc
--- /dev/null
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -0,0 +1,480 @@
+
+.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%;
+}
+.point-of-sale table {
+    border-spacing: 0;
+    border-collapse: collapse;
+}
+.point-of-sale td { 
+    border: 1px solid #e9eaec;
+}
+.point-of-sale input {
+    color: #555555;
+}
+.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;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    background: #e2e2e2;
+    background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background: -webkit-gradient(linear, left top, left bottom, from(#f0f0f0), to(#e2e2e2));
+}
+.point-of-sale ul, .point-of-sale ol {
+    padding: 0;
+    margin: 0;
+}
+.point-of-sale li {
+    list-style-type: none;
+}
+.point-of-sale button img {
+    vertical-align: bottom;
+}
+.point-of-sale .pos-rigth-align {
+    text-align: right;
+}
+.point-of-sale .pos-rigth-align input {
+    text-align: right;
+}
+.point-of-sale #container {
+    width: 100%;
+    height: 100%;
+}
+.point-of-sale #topheader {
+    width: 100%;
+    height: 54px;
+    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));
+}
+.point-of-sale #topheader button {
+    color: black;
+    border: 1px solid black;
+    background: #7f82ac;
+    background: -moz-linear-gradient(#b2b3d7, #7f82ac);
+    background: -webkit-gradient(linear, left top, left bottom, from(#b2b3d7), to(#7f82ac));
+}
+.point-of-sale #branding, .point-of-sale #steps, .point-of-sale #rightheader {
+    float: left;
+    overflow: hidden;
+    height: 35px;
+    padding: 10px;
+}
+.point-of-sale #branding {
+    border-right: 1px solid #373737;
+    text-align: center;
+}
+.point-of-sale #branding img {
+    height: 32px;
+    width: 116px;
+}
+.point-of-sale #steps {
+    padding: 10px 17px;
+    border-right: solid 1px #3b3b3b;
+    vertical-align: top;
+}
+.point-of-sale #steps label {
+    width: 80px;
+    color: #A5A5A5;
+    font-weight: bold;
+    border-color: #454545;
+    background-color: #454545;
+    background-image: none;
+    border-bottom: solid 1px #5c5c5c;
+    border-top: solid 1px #373737;
+    vertical-align: top;
+}
+.point-of-sale #steps label:first-child {
+    border-left: solid 1px #373737;
+}
+.point-of-sale #steps label:last-child {
+    border-right: solid 1px #373737;
+}
+.point-of-sale #steps span {
+    padding: 2px 6px;
+}
+.point-of-sale #steps img {
+    height: 32px;
+}
+.point-of-sale #steps .ui-button, .point-of-sale #steps .ui-button-text-only {
+    padding-top: 4px;
+    height: 26px;
+    margin: 0 -4px;
+}
+.point-of-sale #neworder-button {
+    width: 32px;
+    padding: 1px;
+    font-size: 23px;
+}
+.point-of-sale #loggedas {
+    float: right;
+    padding: 5px 9px;
+    text-align: center;
+    color: white;
+    border-left: 1px solid #373737;
+}
+.point-of-sale #loggedas p {
+    margin: 0 0 3px 0;
+}
+.point-of-sale #content {
+    width: 100%;
+    position: absolute;
+    top: 56px;
+    bottom: 0;
+}
+.point-of-sale #leftpane {
+    height: 100%;
+    width: 440px;
+    position: relative;
+    border-right: solid 1px #afafb6;
+    background-color: white;
+}
+.point-of-sale #leftpane footer {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background-color: #e0e0e0;
+    background-image: url(../img/headerbackground.jpg);
+}
+.point-of-sale #current-order {
+    width: 100%;
+    position: absolute;
+    top: 0;
+    bottom: 271px;
+    overflow: auto;
+}
+.point-of-sale #current-order thead {
+    background-color: #cccccc;
+    background-image: url(../img/headerbackground.jpg);
+    border: 0px;
+    font-size: 12px;
+    width: 440px;
+}
+.point-of-sale #current-order thead td {
+    text-align: center;
+    padding: 8px 0px;
+    min-width: 40px;
+    font-size: 12px;
+}
+.point-of-sale #current-order td {
+    padding: 6px 4px;
+    font-size: 11px;
+    text-align: right;
+    min-width: 40px;
+    white-space: nowrap;
+}
+.point-of-sale #current-order td:first-child {
+    width: 320px;
+    padding: 6px;
+    text-align: left;
+    text-overflow: ellipsis;
+}
+.point-of-sale #current-order td:last-child {
+    border-right: none;
+}
+.point-of-sale #current-order tr.selected {
+    background-color: #e9eaf2;
+}
+.point-of-sale #current-order tr.selected td {
+    border-top: 2px solid #d5d6e0;
+    border-bottom: 1px solid #d5d6e0;
+    padding-top: 5px;
+    color: #555555;
+}
+.point-of-sale #amounts {
+    background: white;
+    border-bottom: solid 1px #d2d2d2;
+    border-top: solid 1px #e9eaec;
+    font-weight: bold;
+    text-align: right;
+    -webkit-margin-before: 0;
+    -webkit-margin-after: 0;
+}
+.point-of-sale #amounts li {
+    display: inline-block;
+    padding: 8px;
+    width: 29%;
+}
+.point-of-sale #paypad {
+    padding: 8px;
+    float: left;
+    text-align: center;
+}
+.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;
+}
+.point-of-sale #paypad button:hover {
+    color: white;
+    background: #7f82ac;
+    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
+}
+.point-of-sale #numpad {
+    padding: 7px;
+    float: right;
+    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 button:hover {
+    color: white;
+    background: #7f82ac;
+    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
+}
+.point-of-sale #numpad .selected-mode {
+    color: white;
+    background: #7f82ac;
+    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
+}
+.point-of-sale .payment-button {
+    font-size: 14px;
+}
+.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;
+}
+.point-of-sale #rightpane {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 441px;
+    right: 0;
+    height: 100%;
+    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));
+}
+.point-of-sale .product-list {
+    overflow: auto;
+    position: absolute;
+    top: 72px;
+    bottom: 0;
+}
+.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;
+}
+.point-of-sale .searchbox {
+    position: absolute;
+    right: 2px;
+}
+.point-of-sale .searchbox input {
+    width: 130px;
+    -moz-border-radius: 11px;
+    -webkit-border-radius: 11px;
+    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;
+}
+.point-of-sale #categories {
+    border-bottom: 1px solid #cecbcb;
+}
+.point-of-sale #categories h4 {
+    display: inline-block;
+    margin: 9px 5px;
+}
+.point-of-sale #categories ol {
+    display: inline;
+}
+.point-of-sale #categories li {
+    display: inline-block;
+}
+.point-of-sale #categories .button {
+    padding: 6px 14px;
+    margin: 4px 0;
+    font-size: 12px;
+}
+.point-of-sale .product {
+    vertical-align: top;
+    display: inline-block;
+    font-size: 11px;
+    margin: 5px;
+    max-width: 120px;
+    border: 1px solid lightgray;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0px 1px 4px #777777;
+    -webkit-box-shadow: 0px 1px 4px #777777;
+    -box-shadow: 0px 1px 4px #777777;
+}
+.point-of-sale .product-img {
+    position: relative;
+    width: 120px;
+    height: 100px;
+    background: white;
+    text-align: center;
+}
+.point-of-sale .price-tag {
+    position: absolute;
+    top: 2px;
+    right: 2px;
+    vertical-align: top;
+    color: white;
+    background: #7f82ac;
+    padding: 2px 5px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+}
+.point-of-sale .product-name {
+    padding: 3px;
+}
+.point-of-sale #login-form label, .point-of-sale #login-form input {
+    display: block;
+}
+.point-of-sale #login-form input {
+    margin: 4px 0 12px;
+    padding: 4px;
+    width: 96%;
+}
+.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;
+}
+
+.point-of-sale .step-screen {
+    text-align: center;
+}
+.point-of-sale .step-screen header h2 {
+    margin-top: 0px;
+    padding-top: 7px;
+}
+
+.point-of-sale .pos-step-container {
+    display: inline-block;
+    font-size: 1.5em;
+}
+.point-of-sale .pos-payment-container {
+    text-align: left;
+}
+.point-of-sale .pos-payment-container .payment-due {
+    display: block;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    padding: 3px 6px 0px 6px;
+    background-color: white;
+    border:1px solid grey;
+    border-radius: 3px;
+}
+.point-of-sale .pos-payment-container table {
+    width: 100%;
+    margin-bottom: 20px;
+}
+.point-of-sale .pos-payment-container .paymentline-type {
+    font-size: 0.8em;
+    font-weight: bold;
+}
+.point-of-sale .step-screen button {
+    width: 50%;
+    text-align: center;
+    padding: 7px 0 7px 0;
+    font-size: 0.8em;
+    font-weight: bold;
+}
+.point-of-sale .pos-sale-ticket {
+    text-align: left;
+    width: 300px;
+    background-color: white;
+    margin: 20px;
+    padding: 10px;
+    display: inline-block;
+}
+.point-of-sale .pos-sale-ticket table {
+    width: 100%;
+    border: 0;
+}
+.point-of-sale .pos-sale-ticket table td {
+    border: 0;
+}
+.point-of-sale .pos-sale-ticket table td.receiptline-amount {
+    text-align: right;
+}
+.point-of-sale .pos-receipt-container {
+    font-size: 0.75em;
+}
diff --git a/addons/point_of_sale/static/src/img/backspace.png b/addons/point_of_sale/static/src/img/backspace.png
new file mode 100644
index 00000000000..705051d925e
Binary files /dev/null and b/addons/point_of_sale/static/src/img/backspace.png differ
diff --git a/addons/point_of_sale/static/src/img/barcode.png b/addons/point_of_sale/static/src/img/barcode.png
new file mode 100644
index 00000000000..fc780b9346b
Binary files /dev/null and b/addons/point_of_sale/static/src/img/barcode.png differ
diff --git a/addons/point_of_sale/static/src/img/bc-arrow.png b/addons/point_of_sale/static/src/img/bc-arrow.png
new file mode 100644
index 00000000000..0485c5977aa
Binary files /dev/null and b/addons/point_of_sale/static/src/img/bc-arrow.png differ
diff --git a/addons/point_of_sale/static/src/img/headerbackground.jpg b/addons/point_of_sale/static/src/img/headerbackground.jpg
new file mode 100644
index 00000000000..cec8fa7ccff
Binary files /dev/null and b/addons/point_of_sale/static/src/img/headerbackground.jpg differ
diff --git a/addons/point_of_sale/static/src/img/home.png b/addons/point_of_sale/static/src/img/home.png
new file mode 100644
index 00000000000..53d0b22d50d
Binary files /dev/null and b/addons/point_of_sale/static/src/img/home.png differ
diff --git a/addons/point_of_sale/static/src/img/logo.png b/addons/point_of_sale/static/src/img/logo.png
new file mode 100644
index 00000000000..9cf5eb05312
Binary files /dev/null and b/addons/point_of_sale/static/src/img/logo.png differ
diff --git a/addons/point_of_sale/static/src/img/search.png b/addons/point_of_sale/static/src/img/search.png
new file mode 100644
index 00000000000..d1705e9a24a
Binary files /dev/null and b/addons/point_of_sale/static/src/img/search.png differ
diff --git a/addons/point_of_sale/static/src/img/search_reset.gif b/addons/point_of_sale/static/src/img/search_reset.gif
new file mode 100644
index 00000000000..9d4253e018b
Binary files /dev/null and b/addons/point_of_sale/static/src/img/search_reset.gif differ
diff --git a/addons/point_of_sale/static/src/img/steps-arrow.png b/addons/point_of_sale/static/src/img/steps-arrow.png
new file mode 100644
index 00000000000..fe86913d78e
Binary files /dev/null and b/addons/point_of_sale/static/src/img/steps-arrow.png differ
diff --git a/addons/point_of_sale/static/src/img/steps-bg.png b/addons/point_of_sale/static/src/img/steps-bg.png
new file mode 100644
index 00000000000..cfe810a77a4
Binary files /dev/null and b/addons/point_of_sale/static/src/img/steps-bg.png differ
diff --git a/addons/point_of_sale/static/src/img/validate-icon.png b/addons/point_of_sale/static/src/img/validate-icon.png
new file mode 100644
index 00000000000..a7d02604e43
Binary files /dev/null and b/addons/point_of_sale/static/src/img/validate-icon.png differ
diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
new file mode 100644
index 00000000000..d1611cd87d8
--- /dev/null
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -0,0 +1,1174 @@
+openerp.point_of_sale = function(db) {
+    db.point_of_sale = {};
+
+    /* Some utility functions defined by Coffee script */
+    var __bind = function(fn, me) {
+        return function() {
+            return fn.apply(me, arguments);
+        };
+    };
+    var __hasProp = Object.prototype.hasOwnProperty;
+    var __extends = function(child, parent) {
+        for (var key in parent) {
+            if (__hasProp.call(parent, key))
+                child[key] = parent[key];
+        }
+        function ctor() {
+            this.constructor = child;
+        }
+
+        ctor.prototype = parent.prototype;
+        child.prototype = new ctor;
+        child.__super__ = parent.prototype;
+        return child;
+    };
+    var __indexOf = Array.prototype.indexOf ||
+    function(item) {
+        for (var i = 0, l = this.length; i < l; i++) {
+            if (this[i] === item)
+                return i;
+        }
+        return -1;
+    };
+    /* end */
+
+    var QWeb = db.web.qweb;
+    QWeb.add_template("/point_of_sale/static/src/xml/pos.xml");
+    var qweb_template = function(template) {
+        return function(ctx) {
+            return QWeb.render(template, ctx);
+        };
+    };
+
+    /*
+     Local store access. Read once from localStorage upon construction and persist on every change.
+     There should only be one store active at any given time to ensure data consistency.
+     */
+    var Store = (function() {
+        function Store() {
+            var store;
+            store = localStorage['pos'];
+            this.data = (store && JSON.parse(store)) || {};
+        }
+
+        Store.prototype.get = function(key) {
+            return this.data[key];
+        };
+        Store.prototype.set = function(key, value) {
+            this.data[key] = value;
+            return localStorage['pos'] = JSON.stringify(this.data);
+        };
+        return Store;
+    })();
+    /*
+     Gets all the necessary data from the OpenERP web client (session, shop data etc.)
+     */
+    var Pos = (function() {
+        function Pos(session) {
+            this.build_tree = __bind(this.build_tree, this);
+            this.session = session;
+            $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
+                this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]),
+                this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name']),
+                this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']))
+                .then(this.build_tree);
+        }
+
+        Pos.prototype.ready = $.Deferred();
+        Pos.prototype.store = new Store;
+        Pos.prototype.fetch = function(osvModel, fields, domain) {
+            var dataSetSearch;
+            var self = this;
+            var callback = function(result) {
+                return self.store.set(osvModel, result);
+            };
+            dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain);
+            return dataSetSearch.read_slice(fields, 0).then(callback);
+        };
+        Pos.prototype.push = function(osvModel, record, callback, errorCallback) {
+            var dataSet;
+            dataSet = new db.web.DataSet(this, osvModel, null);
+            return dataSet.create(record, callback, errorCallback);
+        };
+        Pos.prototype.categories = {};
+        Pos.prototype.build_tree = function() {
+            var c, id, _i, _len, _ref, _ref2;
+            _ref = this.store.get('pos.category');
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                c = _ref[_i];
+                this.categories[c.id] = {
+                    id: c.id,
+                    name: c.name,
+                    children: c.child_id,
+                    parent: c.parent_id[0],
+                    ancestors: [c.id],
+                    subtree: [c.id]
+                };
+            }
+            _ref2 = this.categories;
+            for (id in _ref2) {
+                c = _ref2[id];
+                this.current_category = c;
+                this.build_ancestors(c.parent);
+                this.build_subtree(c);
+            }
+            this.categories[0] = {
+                ancestors: [],
+                children: (function() {
+                    var _j, _len2, _ref3, _results;
+                    _ref3 = this.store.get('pos.category');
+                    _results = [];
+                    for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
+                        c = _ref3[_j];
+                        if (!(c.parent_id[0] != null)) {
+                            _results.push(c.id);
+                        }
+                    }
+                    return _results;
+                }).call(this),
+                subtree: (function() {
+                    var _j, _len2, _ref3, _results;
+                    _ref3 = this.store.get('pos.category');
+                    _results = [];
+                    for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
+                        c = _ref3[_j];
+                        _results.push(c.id);
+                    }
+                    return _results;
+                }).call(this)
+            };
+            return this.ready.resolve();
+        };
+        Pos.prototype.build_ancestors = function(parent) {
+            if (parent != null) {
+                this.current_category.ancestors.unshift(parent);
+                return this.build_ancestors(this.categories[parent].parent);
+            }
+        };
+        Pos.prototype.build_subtree = function(category) {
+            var c, _i, _len, _ref, _results;
+            _ref = category.children;
+            _results = [];
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                c = _ref[_i];
+                this.current_category.subtree.push(c);
+                _results.push(this.build_subtree(this.categories[c]));
+            }
+            return _results;
+        };
+        return Pos;
+    })();
+
+    /* global variable */
+    var pos;
+
+    var App, CashRegister, CashRegisterCollection, Category, CategoryCollection, CategoryWidget,
+    NumpadState, NumpadWidget, Order, OrderButtonView, OrderCollection, OrderWidget, Orderline,
+    OrderlineCollection, OrderlineWidget, PaymentButtonWidget, PaymentWidget, Paymentline,
+    PaymentlineCollection, PaymentlineWidget, PaypadWidget, Product, ProductCollection,
+    ProductListWidget, ProductWidget, ReceiptLineWidget, ReceiptWidget, Shop, ShopView, StepsWidget;
+
+    /*
+     ---
+     Models
+     ---
+     */
+    CashRegister = (function() {
+        __extends(CashRegister, Backbone.Model);
+        function CashRegister() {
+            CashRegister.__super__.constructor.apply(this, arguments);
+        }
+
+        return CashRegister;
+    })();
+    CashRegisterCollection = (function() {
+        __extends(CashRegisterCollection, Backbone.Collection);
+        function CashRegisterCollection() {
+            CashRegisterCollection.__super__.constructor.apply(this, arguments);
+        }
+
+        CashRegisterCollection.prototype.model = CashRegister;
+        return CashRegisterCollection;
+    })();
+    Product = (function() {
+        __extends(Product, Backbone.Model);
+        function Product() {
+            Product.__super__.constructor.apply(this, arguments);
+        }
+
+        return Product;
+    })();
+    ProductCollection = (function() {
+        __extends(ProductCollection, Backbone.Collection);
+        function ProductCollection() {
+            ProductCollection.__super__.constructor.apply(this, arguments);
+        }
+
+        ProductCollection.prototype.model = Product;
+        return ProductCollection;
+    })();
+    Category = (function() {
+        __extends(Category, Backbone.Model);
+        function Category() {
+            Category.__super__.constructor.apply(this, arguments);
+        }
+
+        return Category;
+    })();
+    CategoryCollection = (function() {
+        __extends(CategoryCollection, Backbone.Collection);
+        function CategoryCollection() {
+            CategoryCollection.__super__.constructor.apply(this, arguments);
+        }
+
+        CategoryCollection.prototype.model = Category;
+        return CategoryCollection;
+    })();
+    /*
+     Each Order contains zero or more Orderlines (i.e. the content of the "shopping cart".)
+     There should only ever be one Orderline per distinct product in an Order.
+     To add more of the same product, just update the quantity accordingly.
+     The Order also contains payment information.
+     */
+    Orderline = (function() {
+        __extends(Orderline, Backbone.Model);
+        function Orderline() {
+            Orderline.__super__.constructor.apply(this, arguments);
+        }
+
+        Orderline.prototype.defaults = {
+            quantity: 1,
+            list_price: 0,
+            discount: 0
+        };
+        Orderline.prototype.incrementQuantity = function() {
+            return this.set({
+                quantity: (this.get('quantity')) + 1
+            });
+        };
+        Orderline.prototype.getTotal = function() {
+            return (this.get('quantity')) * (this.get('list_price')) * (1 - (this.get('discount')) / 100);
+        };
+        Orderline.prototype.exportAsJSON = function() {
+            var result;
+            result = {
+                qty: this.get('quantity'),
+                price_unit: this.get('list_price'),
+                discount: this.get('discount'),
+                product_id: this.get('id')
+            };
+            return result;
+        };
+        return Orderline;
+    })();
+    OrderlineCollection = (function() {
+        __extends(OrderlineCollection, Backbone.Collection);
+        function OrderlineCollection() {
+            OrderlineCollection.__super__.constructor.apply(this, arguments);
+        }
+
+        OrderlineCollection.prototype.model = Orderline;
+        return OrderlineCollection;
+    })();
+    /*
+     Every PaymentLine has all the attributes of the corresponding CashRegister.
+     */
+    Paymentline = (function() {
+        __extends(Paymentline, Backbone.Model);
+        function Paymentline() {
+            Paymentline.__super__.constructor.apply(this, arguments);
+        }
+
+        Paymentline.prototype.defaults = {
+            amount: 0
+        };
+        Paymentline.prototype.getAmount = function() {
+            return this.get('amount');
+        };
+        Paymentline.prototype.exportAsJSON = function() {
+            var result;
+            result = {
+                name: "Payment line",
+                statement_id: this.get('id'),
+                account_id: (this.get('account_id'))[0],
+                journal_id: (this.get('journal_id'))[0],
+                amount: this.getAmount()
+            };
+            return result;
+        };
+        return Paymentline;
+    })();
+    PaymentlineCollection = (function() {
+        __extends(PaymentlineCollection, Backbone.Collection);
+        function PaymentlineCollection() {
+            PaymentlineCollection.__super__.constructor.apply(this, arguments);
+        }
+
+        PaymentlineCollection.prototype.model = Paymentline;
+        return PaymentlineCollection;
+    })();
+    Order = (function() {
+        __extends(Order, Backbone.Model);
+        function Order() {
+            Order.__super__.constructor.apply(this, arguments);
+        }
+
+        Order.prototype.defaults = {
+            validated: false
+        };
+        Order.prototype.initialize = function() {
+            this.set({
+                orderLines: new OrderlineCollection
+            });
+            this.set({
+                paymentLines: new PaymentlineCollection
+            });
+            this.bind('change:validated', this.validatedChanged);
+            return this.set({
+                name: "Order " + this.generateUniqueId()
+            });
+        };
+        Order.prototype.events = {
+            'change:validated': 'validatedChanged'
+        };
+        Order.prototype.validatedChanged = function() {
+            if (this.get("validated") && !this.previous("validated")) {
+                $('.step-screen').hide();
+                $('#receipt-screen').show();
+            }
+        }
+        Order.prototype.generateUniqueId = function() {
+            return new Date().getTime();
+        };
+        Order.prototype.addProduct = function(product) {
+            var existing;
+            existing = (this.get('orderLines')).get(product.id);
+            if (existing != null) {
+                return existing.incrementQuantity();
+            } else {
+                return (this.get('orderLines')).add(new Orderline(product.toJSON()));
+            }
+        };
+        Order.prototype.addPaymentLine = function(cashRegister) {
+            var newPaymentline;
+            newPaymentline = new Paymentline(cashRegister);
+            /* TODO: Should be 0 for cash-like accounts */
+            newPaymentline.set({
+                amount: this.getDueLeft()
+            });
+            return (this.get('paymentLines')).add(newPaymentline);
+        };
+        Order.prototype.getName = function() {
+            return this.get('name');
+        };
+        Order.prototype.getTotal = function() {
+            return (this.get('orderLines')).reduce((function(sum, orderLine) {
+                return sum + orderLine.getTotal();
+            }), 0);
+        };
+        Order.prototype.getTotalTaxExcluded = function() {
+            return this.getTotal() / 1.21;
+        };
+        Order.prototype.getTax = function() {
+            return this.getTotal() / 1.21 * 0.21;
+        };
+        Order.prototype.getPaidTotal = function() {
+            return (this.get('paymentLines')).reduce((function(sum, paymentLine) {
+                return sum + paymentLine.getAmount();
+            }), 0);
+        };
+        Order.prototype.getChange = function() {
+            return this.getPaidTotal() - this.getTotal();
+        };
+        Order.prototype.getDueLeft = function() {
+            return this.getTotal() - this.getPaidTotal();
+        };
+        Order.prototype.exportAsJSON = function() {
+            var orderLines, paymentLines, result;
+            orderLines = [];
+            (this.get('orderLines')).each(__bind( function(item) {
+                return orderLines.push([0, 0, item.exportAsJSON()]);
+            }, this));
+            paymentLines = [];
+            (this.get('paymentLines')).each(__bind( function(item) {
+                return paymentLines.push([0, 0, item.exportAsJSON()]);
+            }, this));
+            result = {
+                name: this.getName(),
+                amount_paid: this.getPaidTotal(),
+                amount_total: this.getTotal(),
+                amount_tax: this.getTax(),
+                amount_return: this.getChange(),
+                lines: orderLines,
+                statement_ids: paymentLines
+            };
+            return result;
+        };
+        return Order;
+    })();
+    OrderCollection = (function() {
+        __extends(OrderCollection, Backbone.Collection);
+        function OrderCollection() {
+            OrderCollection.__super__.constructor.apply(this, arguments);
+        }
+
+        OrderCollection.prototype.model = Order;
+        return OrderCollection;
+    })();
+    Shop = (function() {
+        __extends(Shop, Backbone.Model);
+        function Shop() {
+            Shop.__super__.constructor.apply(this, arguments);
+        }
+
+        Shop.prototype.initialize = function() {
+            this.set({
+                orders: new OrderCollection(),
+                products: new ProductCollection()
+            });
+            this.set({
+                cashRegisters: new CashRegisterCollection(pos.store.get('account.bank.statement')),
+            });
+            return (this.get('orders')).bind('remove', __bind( function(removedOrder) {
+                if ((this.get('orders')).isEmpty()) {
+                    this.addAndSelectOrder(new Order);
+                }
+                if ((this.get('selectedOrder')) === removedOrder) {
+                    return this.set({
+                        selectedOrder: (this.get('orders')).last()
+                    });
+                }
+            }, this));
+        };
+        Shop.prototype.addAndSelectOrder = function(newOrder) {
+            (this.get('orders')).add(newOrder);
+            return this.set({
+                selectedOrder: newOrder
+            });
+        };
+        return Shop;
+    })();
+    /*
+     The numpad handles both the choice of the property currently being modified
+     (quantity, price or discount) and the edition of the corresponding numeric value.
+     */
+    NumpadState = (function() {
+        __extends(NumpadState, Backbone.Model);
+        function NumpadState() {
+            NumpadState.__super__.constructor.apply(this, arguments);
+        }
+
+        NumpadState.prototype.defaults = {
+            buffer: "0",
+            mode: "quantity"
+        };
+        NumpadState.prototype.initialize = function(options) {
+            this.shop = options.shop;
+            return this.shop.bind('change:selectedOrder', this.reset, this);
+        };
+        NumpadState.prototype.appendNewChar = function(newChar) {
+            var oldBuffer;
+            oldBuffer = this.get('buffer');
+            if (oldBuffer === '0') {
+                this.set({
+                    buffer: newChar
+                });
+            } else if (oldBuffer === '-0') {
+                this.set({
+                    buffer: "-" + newChar
+                });
+            } else {
+                this.set({
+                    buffer: (this.get('buffer')) + newChar
+                });
+            }
+            return this.updateTarget();
+        };
+        NumpadState.prototype.deleteLastChar = function() {
+            var tempNewBuffer;
+            tempNewBuffer = (this.get('buffer')).slice(0, -1) || "0";
+            if (isNaN(tempNewBuffer)) {
+                tempNewBuffer = "0";
+            }
+            this.set({
+                buffer: tempNewBuffer
+            });
+            return this.updateTarget();
+        };
+        NumpadState.prototype.switchSign = function() {
+            var oldBuffer;
+            oldBuffer = this.get('buffer');
+            this.set({
+                buffer: oldBuffer[0] === '-' ? oldBuffer.substr(1) : "-" + oldBuffer
+            });
+            return this.updateTarget();
+        };
+        NumpadState.prototype.changeMode = function(newMode) {
+            return this.set({
+                buffer: "0",
+                mode: newMode
+            });
+        };
+        NumpadState.prototype.reset = function() {
+            return this.set({
+                buffer: "0"
+            });
+        };
+        NumpadState.prototype.updateTarget = function() {
+            var bufferContent, params;
+            bufferContent = this.get('buffer');
+            if (bufferContent && !isNaN(bufferContent)) {
+                params = {};
+                params[this.get('mode')] = parseFloat(bufferContent);
+                return (this.shop.get('selectedOrder')).selected.set(params);
+            }
+        };
+        return NumpadState;
+    })();
+    /*
+     ---
+     Views
+     ---
+     */
+    NumpadWidget = db.web.Widget.extend({
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.state = options.state;
+        },
+        start: function() {
+            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));
+        },
+        clickDeleteLastChar: function() {
+            return this.state.deleteLastChar();
+        },
+        clickSwitchSign: function() {
+            return this.state.switchSign();
+        },
+        clickAppendNewChar: function(event) {
+            var newChar;
+            newChar = event.currentTarget.innerText;
+            return this.state.appendNewChar(newChar);
+        },
+        clickChangeMode: function(event) {
+            var newMode;
+            $('.selected-mode').removeClass('selected-mode');
+            $(event.currentTarget).addClass('selected-mode');
+            newMode = event.currentTarget.attributes['data-mode'].nodeValue;
+            return this.state.changeMode(newMode);
+        }
+    });
+    /*
+     Gives access to the payment methods (aka. 'cash registers')
+     */
+    PaypadWidget = db.web.Widget.extend({
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.shop = options.shop;
+        },
+        start: function() {
+            this.$element.find('button').click(_.bind(this.performPayment, this));
+        },
+        performPayment: function(event) {
+            var cashRegister, cashRegisterCollection, cashRegisterId;
+            /* set correct view */
+            $('.step-screen').hide();
+            $('#payment-screen').show();
+
+            cashRegisterId = event.currentTarget.attributes['cash-register-id'].nodeValue;
+            cashRegisterCollection = this.shop.get('cashRegisters');
+            cashRegister = cashRegisterCollection.find(__bind( function(item) {
+                return (item.get('id')) === parseInt(cashRegisterId, 10);
+            }, this));
+            return (this.shop.get('selectedOrder')).addPaymentLine(cashRegister);
+        },
+        render_element: function() {
+            this.$element.empty();
+            return (this.shop.get('cashRegisters')).each(__bind( function(cashRegister) {
+                var button = new PaymentButtonWidget();
+                button.model = cashRegister;
+                button.appendTo(this.$element);
+            }, this));
+        }
+    });
+    PaymentButtonWidget = db.web.Widget.extend({
+        template_fct: qweb_template('pos-payment-button-template'),
+        render_element: function() {
+            this.$element.html(this.template_fct({
+                id: this.model.get('id'),
+                name: (this.model.get('journal_id'))[1]
+            }));
+            return this;
+        }
+    });
+    /*
+     There are 3 steps in a POS workflow:
+     1. prepare the order (i.e. chose products, quantities etc.)
+     2. choose payment method(s) and amount(s)
+     3. validae order and print receipt
+     It should be possible to go back to any step as long as step 3 hasn't been completed.
+     Modifying an order after validation shouldn't be allowed.
+     */
+    StepsWidget = db.web.Widget.extend({
+        init: function(parent, element_id) {
+            this._super(parent, element_id);
+            this.step = "products";
+        },
+        start: function() {
+            this.$element.find('input.step-button').click(_.bind(this.clickChangeStep, this));
+        },
+        clickChangeStep: function(event) {
+            var newStep;
+            newStep = event.currentTarget.attributes['data-step'].nodeValue;
+            $('.step-screen').hide();
+            $('#' + newStep + '-screen').show();
+            return this.step = newStep;
+        }
+    });
+    /*
+     Shopping carts.
+     */
+    OrderlineWidget = db.web.Widget.extend({
+        tagName: 'tr',
+        template_fct: qweb_template('pos-orderline-template'),
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.model = options.model;
+            this.model.bind('change', __bind( function() {
+                this.$element.hide();
+                this.render_element();
+            }, this));
+            this.model.bind('remove', __bind( function() {
+                return this.$element.remove();
+            }, this));
+            this.order = options.order;
+            this.numpadState = options.numpadState;
+        },
+        start: function() {
+            this.$element.click(_.bind(this.clickHandler, this));
+        },
+        clickHandler: function() {
+            this.numpadState.reset();
+            return this.select();
+        },
+        render_element: function() {
+            this.select();
+            return this.$element.html(this.template_fct(this.model.toJSON())).fadeIn(400, function() {
+                return $('#current-order').scrollTop($(this).offset().top);
+            });
+        },
+        select: function() {
+            $('tr.selected').removeClass('selected');
+            this.$element.addClass('selected');
+            return this.order.selected = this.model;
+        },
+    });
+    OrderWidget = db.web.Widget.extend({
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.shop = options.shop;
+            this.numpadState = options.numpadState;
+            this.shop.bind('change:selectedOrder', this.changeSelectedOrder, this);
+            this.bindOrderLineEvents();
+        },
+        changeSelectedOrder: function() {
+            this.currentOrderLines.unbind();
+            this.bindOrderLineEvents();
+            return this.render_element();
+        },
+        bindOrderLineEvents: function() {
+            this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
+            this.currentOrderLines.bind('add', this.addLine, this);
+            this.currentOrderLines.bind('change', this.render_element, this);
+            return this.currentOrderLines.bind('remove', this.render, this);
+        },
+        addLine: function(newLine) {
+            var line = new OrderlineWidget(null, null, {
+                    model: newLine,
+                    order: this.shop.get('selectedOrder'),
+                    numpadState: this.numpadState
+            });
+            line.appendTo(this.$element);
+            return this.updateSummary();
+        },
+        render_element: function() {
+            this.$element.empty();
+            this.currentOrderLines.each(__bind( function(orderLine) {
+                var line = new OrderlineWidget(null, null, {
+                        model: orderLine,
+                        order: this.shop.get('selectedOrder'),
+                        numpadState: this.numpadState
+                });
+                line.appendTo(this.$element);
+            }, this));
+            return this.updateSummary();
+        },
+        updateSummary: function() {
+            var currentOrder, tax, total, totalTaxExcluded;
+            currentOrder = this.shop.get('selectedOrder');
+            total = currentOrder.getTotal();
+            totalTaxExcluded = currentOrder.getTotalTaxExcluded();
+            tax = currentOrder.getTax();
+            $('#subtotal').html(totalTaxExcluded.toFixed(2)).hide().fadeIn();
+            $('#tax').html(tax.toFixed(2)).hide().fadeIn();
+            return $('#total').html(total.toFixed(2)).hide().fadeIn();
+        },
+    });
+    /*
+     "Products" step.
+     */
+    CategoryWidget = db.web.Widget.extend({
+        start: function() {
+            this.$element.find(".oe-pos-categories-list a").click(_.bind(this.changeCategory, this));
+        },
+        template_fct: qweb_template('pos-category-template'),
+        render_element: function() {
+            var self = this;
+            var c;
+            this.$element.html(this.template_fct({
+                breadcrumb: (function() {
+                    var _i, _len, _results;
+                    _results = [];
+                    for (_i = 0, _len = self.ancestors.length; _i < _len; _i++) {
+                        c = self.ancestors[_i];
+                        _results.push(pos.categories[c]);
+                    }
+                    return _results;
+                })(),
+                categories: (function() {
+                    var _i, _len, _results;
+                    _results = [];
+                    for (_i = 0, _len = self.children.length; _i < _len; _i++) {
+                        c = self.children[_i];
+                        _results.push(pos.categories[c]);
+                    }
+                    return _results;
+                })()
+            }));
+        },
+        changeCategory: function(a) {
+            var id = $(a.target).data("category-id");
+            this.on_change_category(id);
+        },
+        on_change_category: function(id) {},
+    });
+    ProductWidget = db.web.Widget.extend({
+        tag_name:'li',
+        template_fct: qweb_template('pos-product-template'),
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.model = options.model;
+            this.shop = options.shop;
+        },
+        start: function(options) {
+            $("a", this.$element).click(_.bind(this.addToOrder, this));
+        },
+        addToOrder: function(event) {
+            /* Preserve the category URL */
+            event.preventDefault();
+            return (this.shop.get('selectedOrder')).addProduct(this.model);
+        },
+        render_element: function() {
+            this.$element.addClass("product");
+            this.$element.html(this.template_fct(this.model.toJSON()));
+            return this;
+        },
+    });
+    ProductListWidget = db.web.Widget.extend({
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.model = options.model;
+            this.shop = options.shop;
+            this.shop.get('products').bind('reset', this.render_element, this);
+        },
+        render_element: function() {
+            this.$element.empty();
+            (this.shop.get('products')).each(__bind( function(product) {
+                var p = new ProductWidget(null, null, {
+                        model: product,
+                        shop: this.shop
+                });
+                p.appendTo(this.$element);
+            }, this));
+            return this;
+        },
+    });
+    /*
+     "Payment" step.
+     */
+    PaymentlineWidget = db.web.Widget.extend({
+        tag_name: 'tr',
+        template_fct: qweb_template('pos-paymentline-template'),
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.model = options.model;
+            this.model.bind('change', this.render_element, this);
+        },
+        start: function () {
+            this.$element.addClass('paymentline');
+            $('input', this.$element).keyup(_.bind(this.changeAmount, this));
+        },
+        changeAmount: function(event) {
+            var newAmount;
+            newAmount = event.currentTarget.value;
+            if (newAmount && !isNaN(newAmount)) {
+                return this.model.set({
+                    amount: parseFloat(newAmount)
+                });
+            }
+        },
+        render_element: function() {
+            this.$element.html(this.template_fct({
+                name: (this.model.get('journal_id'))[1],
+                amount: this.model.get('amount')
+            }));
+            return this;
+        },
+    });
+    PaymentWidget = db.web.Widget.extend({
+        init: function(parent, element_id, options) {
+            this._super(parent, element_id);
+            this.model = options.model;
+            this.shop = options.shop;
+            this.shop.bind('change:selectedOrder', this.changeSelectedOrder, this);
+            this.bindPaymentLineEvents();
+            this.bindOrderLineEvents();
+        },
+        paymentLineList: function() {
+            return this.$element.find('#paymentlines');
+        },
+        start: function() {
+            $('button#validate-order', this.$element).click(_.bind(this.validateCurrentOrder, this));
+        },
+        validateCurrentOrder: function() {
+            var callback, currentOrder;
+            currentOrder = this.shop.get('selectedOrder');
+            callback = __bind(function() {
+                return currentOrder.set({
+                    validated: true
+                });
+            }, this);
+            pos.push('pos.order', currentOrder.exportAsJSON(), callback);
+        },
+        bindPaymentLineEvents: function() {
+            this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines');
+            this.currentPaymentLines.bind('add', this.addPaymentLine, this);
+            this.currentPaymentLines.bind('all', this.updatePaymentSummary, this);
+        },
+        bindOrderLineEvents: function() {
+            this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
+            this.currentOrderLines.bind('all', this.updatePaymentSummary, this);
+        },
+        changeSelectedOrder: function() {
+            this.currentPaymentLines.unbind();
+            this.bindPaymentLineEvents();
+            this.currentOrderLines.unbind();
+            this.bindOrderLineEvents();
+            this.render_element();
+        },
+        addPaymentLine: function(newPaymentLine) {
+            var x = new PaymentlineWidget(null, null, {
+                    model: newPaymentLine
+                });
+            x.appendTo(this.paymentLineList());
+        },
+        render_element: function() {
+            this.paymentLineList().empty();
+            this.currentPaymentLines.each(__bind( function(paymentLine) {
+                var x = new PaymentlineWidget(null, null, {
+                    model: paymentLine
+                });
+                this.paymentLineList().append(x);
+            }, this));
+            this.updatePaymentSummary();
+        },
+        updatePaymentSummary: function() {
+            var currentOrder, dueTotal, paidTotal, remaining, remainingAmount;
+            currentOrder = this.shop.get('selectedOrder');
+            paidTotal = currentOrder.getPaidTotal();
+            dueTotal = currentOrder.getTotal();
+            this.$element.find('#payment-due-total').html(dueTotal.toFixed(2));
+            this.$element.find('#payment-paid-total').html(paidTotal.toFixed(2));
+            remainingAmount = dueTotal - paidTotal;
+            remaining = remainingAmount > 0 ? 0 : (-remainingAmount).toFixed(2);
+            $('#payment-remaining').html(remaining);
+        },
+    });
+    /*
+     "Receipt" step.
+     */
+    ReceiptLineWidget = db.web.Widget.extend({
+        tag_name: 'tr',
+        template_fct: qweb_template('pos-receiptline-template'),
+        init: function(parent, options) {
+            this._super(parent);
+            this.model = options.model;
+            this.model.bind('change', this.render_element, this);
+        },
+        render_element: function() {
+            this.$element.addClass('receiptline');
+            this.$element.html(this.template_fct(this.model.toJSON()));
+        },
+    });
+    ReceiptWidget = db.web.Widget.extend({
+        init: function(parent, options) {
+            this._super(parent);
+            this.model = options.model;
+            this.shop = options.shop;
+            this.shop.bind('change:selectedOrder', this.changeSelectedOrder, this);
+            this.bindOrderLineEvents();
+            this.bindPaymentLineEvents();
+        },
+        start: function () {
+            $('button#pos-finish-order', this.$element).click(_.bind(this.finishOrder, this));
+        },
+        finishOrder: function() {
+            $('.step-screen').hide();
+            $('#products-screen').show();
+            this.shop.get('selectedOrder').destroy();
+        },
+        receiptLineList: function() {
+            return this.$element.find('#receiptlines');
+        },
+        bindOrderLineEvents: function() {
+            this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
+            this.currentOrderLines.bind('add', this.addReceiptLine, this);
+            this.currentOrderLines.bind('change', this.render_element, this);
+            this.currentOrderLines.bind('remove', this.render_element, this);
+        },
+        bindPaymentLineEvents: function() {
+            this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines');
+            this.currentPaymentLines.bind('all', this.updateReceiptSummary, this);
+        },
+        changeSelectedOrder: function() {
+            this.currentOrderLines.unbind();
+            this.bindOrderLineEvents();
+            this.currentPaymentLines.unbind();
+            this.bindPaymentLineEvents();
+            this.render_element();
+        },
+        addReceiptLine: function(newOrderItem) {
+            var x = new ReceiptLineWidget(null, {
+                    model: newOrderItem
+            });
+            x.appendTo(this.receiptLineList());
+            this.updateReceiptSummary();
+        },
+        render_element: function() {
+            this.$element.html(qweb_template('pos-receipt-view'));
+            this.currentOrderLines.each(__bind( function(orderItem) {
+                var x = new ReceiptLineWidget(null, {
+                        model: orderItem
+                });
+                x.appendTo(this.receiptLineList());
+            }, this));
+            this.updateReceiptSummary();
+        },
+        updateReceiptSummary: function() {
+            var change, currentOrder, tax, total;
+            currentOrder = this.shop.get('selectedOrder');
+            total = currentOrder.getTotal();
+            tax = currentOrder.getTax();
+            change = currentOrder.getPaidTotal() - total;
+            $('#receipt-summary-tax').html(tax.toFixed(2));
+            $('#receipt-summary-total').html(total.toFixed(2));
+            $('#receipt-summary-change').html(change.toFixed(2));
+        },
+    });
+    OrderButtonView = (function() {
+        __extends(OrderButtonView, Backbone.View);
+        function OrderButtonView() {
+            OrderButtonView.__super__.constructor.apply(this, arguments);
+        }
+
+        OrderButtonView.prototype.tagName = 'li';
+        OrderButtonView.prototype.className = 'order-selector-button';
+        OrderButtonView.prototype.template = qweb_template('pos-order-selector-button-template');
+        OrderButtonView.prototype.initialize = function(options) {
+            this.order = options.order;
+            this.shop = options.shop;
+            this.order.bind('destroy', __bind( function() {
+                return $(this.el).remove();
+            }, this));
+            return this.shop.bind('change:selectedOrder', __bind( function(shop) {
+                var selectedOrder;
+                selectedOrder = shop.get('selectedOrder');
+                if (this.order === selectedOrder) {
+                    return this.setButtonSelected();
+                }
+            }, this));
+        };
+        OrderButtonView.prototype.events = {
+            'click button.select-order': 'selectOrder',
+            'click button.close-order': 'closeOrder'
+        };
+        OrderButtonView.prototype.selectOrder = function(event) {
+            return this.shop.set({
+                selectedOrder: this.order
+            });
+        };
+        OrderButtonView.prototype.setButtonSelected = function() {
+            $('.selected-order').removeClass('selected-order');
+            return $(this.el).addClass('selected-order');
+        };
+        OrderButtonView.prototype.closeOrder = function(event) {
+            return this.order.destroy();
+        };
+        OrderButtonView.prototype.render = function() {
+            return $(this.el).html(this.template(this.order.toJSON()));
+        };
+        return OrderButtonView;
+    })();
+    ShopView = (function() {
+        __extends(ShopView, Backbone.View);
+        function ShopView() {
+            ShopView.__super__.constructor.apply(this, arguments);
+        }
+
+        ShopView.prototype.initialize = function(options) {
+            this.shop = options.shop;
+            (this.shop.get('orders')).bind('add', this.orderAdded, this);
+            (this.shop.get('orders')).add(new Order);
+            this.numpadState = new NumpadState({
+                shop: this.shop
+            });
+            this.productListView = new ProductListWidget(null, "products-screen-ol", {
+                shop: this.shop
+            });
+            this.productListView.render_element();
+            this.productListView.start();
+            this.paypadView = new PaypadWidget(null, 'paypad', {
+                shop: this.shop
+            });
+            this.paypadView.render_element();
+            this.paypadView.start();
+            this.orderView = new OrderWidget(null, 'current-order-content', {
+                shop: this.shop,
+                numpadState: this.numpadState
+            });
+            this.orderView.start();
+            this.paymentView = new PaymentWidget(null, 'payment-screen', {
+                shop: this.shop
+            });
+            this.paymentView.render_element();
+            this.paymentView.start();
+            this.receiptView = new ReceiptWidget(null, {
+                shop: this.shop,
+            });
+            debugger;
+            this.receiptView.replace($('#receipt-screen'));
+            this.numpadView = new NumpadWidget(null, 'numpad', {
+                state: this.numpadState
+            });
+            this.numpadView.start();
+            this.stepsView = new StepsWidget(null, 'steps');
+            this.stepsView.start();
+            this.start();
+        };
+        ShopView.prototype.events = {
+            'click button#neworder-button': 'createNewOrder'
+        };
+        ShopView.prototype.start = function() {
+            this.productListView.start();
+        };
+        ShopView.prototype.createNewOrder = function() {
+            var newOrder;
+            newOrder = new Order;
+            (this.shop.get('orders')).add(newOrder);
+            return this.shop.set({
+                selectedOrder: newOrder
+            });
+        };
+        ShopView.prototype.orderAdded = function(newOrder) {
+            var newOrderButton;
+            newOrderButton = new OrderButtonView({
+                order: newOrder,
+                shop: this.shop
+            });
+            $('#orders').append(newOrderButton.render());
+            return newOrderButton.selectOrder();
+        };
+        return ShopView;
+    })();
+    App = (function() {
+        function App($element) {
+            this.initialize($element);
+        }
+
+        App.prototype.initialize = function($element) {
+            this.shop = new Shop;
+            this.shopView = new ShopView({
+                shop: this.shop,
+                el: $element
+            });
+            this.categoryView = new CategoryWidget(null, 'products-screen-categories');
+            this.categoryView.on_change_category.add_last(_.bind(this.category, this));
+            this.category();
+        };
+        App.prototype.category = function(id) {
+            var c, products;
+            if (id == null) {
+                id = 0;
+            }
+            c = pos.categories[id];
+            this.categoryView.ancestors = c.ancestors;
+            this.categoryView.children = c.children;
+            this.categoryView.render_element();
+            this.categoryView.start();
+            products = pos.store.get('product.product').filter( function(p) {
+                var _ref;
+                return _ref = p.pos_categ_id[0], __indexOf.call(c.subtree, _ref) >= 0;
+            });
+            (this.shop.get('products')).reset(products);
+            var self = this;
+            $('.searchbox input').keyup(function() {
+                var m, s;
+                s = $(this).val().toLowerCase();
+                if (s) {
+                    m = products.filter( function(p) {
+                        return p.name.toLowerCase().indexOf(s);
+                    });
+                    $('.search-clear').fadeIn();
+                } else {
+                    m = products;
+                    $('.search-clear').fadeOut();
+                }
+                return (self.shop.get('products')).reset(m);
+            });
+            return $('.search-clear').click( function() {
+                (this.shop.get('products')).reset(products);
+                $('.searchbox input').val('').focus();
+                return $('.search-clear').fadeOut();
+            });
+        };
+        return App;
+    })();
+
+    db.web.client_actions.add('pos.ui', 'db.point_of_sale.PointOfSale');
+    db.point_of_sale.PointOfSale = db.web.Widget.extend({
+        template: "PointOfSale",
+        start: function() {
+            var self = this;
+            this.$element.find("#loggedas button").click(function() {
+                self.stop();
+            });
+
+            if (pos)
+                throw "It is not possible to instantiate multiple instances "+
+                    "of the point of sale at the same time.";
+            pos = new Pos(this.session);
+
+            this.$element.find('#steps').buttonset();
+
+            return pos.ready.then( function() {
+                pos.app = new App(self.$element);
+            });
+        },
+        stop: function() {
+            pos = undefined;
+            this._super();
+        }
+    });
+}
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
new file mode 100644
index 00000000000..74ff2229729
--- /dev/null
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+    <t t-name="PointOfSale">
+    <div class="point-of-sale">
+        <div id="topheader">
+            <div id="branding">
+                <img src="/point_of_sale/static/src/img/logo.png" />
+            </div>
+            <div id="steps">
+                <input type="radio" id="products-step-button" class="step-button" data-step='products' name="radio" checked="checked" />
+                <label for="products-step-button">Products</label>
+                <img src="/point_of_sale/static/src/img/steps-arrow.png" />
+                <input type="radio" id="payment-step-button" class="step-button" data-step='payment' name="radio" />
+                <label for="payment-step-button">Payment</label>
+                <img src="/point_of_sale/static/src/img/steps-arrow.png" />
+                <input type="radio" id="receipt-step-button" class="step-button" data-step='receipt' name="radio" />
+                <label for="receipt-step-button">Receipt</label>
+            </div>
+            <div id="rightheader">
+                <div id="order-selector">
+                    <button id="neworder-button">+</button>
+                    <ol id="orders"></ol>
+                </div>
+            </div>
+            <div id="loggedas">
+                <button>Back</button>
+            </div>
+        </div>
+        <div id="content">
+
+            <div id="leftpane">
+                <div id="current-order">
+                    <table>
+                        <thead>
+                            <tr>
+                                <td>Product</td>
+                                <td>Price</td>
+                                <td>Disc (%)</td>
+                                <td>Qty</td>
+                                <td>Total</td>
+                            </tr>
+                        </thead>
+                        <tbody id="current-order-content"></tbody>
+                    </table>
+                </div>
+                <footer>
+                    <ul id="amounts">
+                        <li>
+                            Subtotal:
+                            <span id="subtotal">0</span> €
+                        </li>
+                        <li>
+                            Tax:
+                            <span id="tax">0</span> €
+                        </li>
+                        <li>
+                            Total:
+                            <span id="total">0</span> €
+                        </li>
+                    </ul>
+                    <div id="paypad"></div>
+                    <div id="numpad">
+                        <button class="input-button number-char">1</button>
+                        <button class="input-button number-char">2</button>
+                        <button class="input-button number-char">3</button>
+                        <button class="mode-button selected-mode" data-mode='quantity'>Qty</button>
+                        <br />
+                        <button class="input-button number-char">4</button>
+                        <button class="input-button number-char">5</button>
+                        <button class="input-button number-char">6</button>
+                        <button class="mode-button" data-mode='discount'>Disc</button>
+                        <br />
+                        <button class="input-button number-char">7</button>
+                        <button class="input-button number-char">8</button>
+                        <button class="input-button number-char">9</button>
+                        <button class="mode-button" data-mode='list_price'>Price</button>
+                        <br />
+                        <button class="input-button" id="numpad-minus" >+/-</button>
+                        <button class="input-button number-char">0</button>
+                        <button class="input-button number-char">.</button>
+                        <button class="input-button" id="numpad-backspace">
+                            <img src="/point_of_sale/static/src/img/backspace.png" width="24" height="21" />
+                        </button>
+                        <br />
+                    </div>
+                </footer>
+            </div>
+            <div id="rightpane">
+                <div id="products-screen" class="step-screen selected-step">
+                    <div id="products-screen-categories"/>
+                    <ol id="products-screen-ol" class="product-list"></ol>
+                </div>
+                <div id="payment-screen" class="step-screen" style="display:none">
+                    <header><h2>Payment</h2></header>
+                    <div class="pos-step-container">
+                        <div class="pos-payment-container">
+                            <span id="payment-due-total" class="payment-due pos-rigth-align"></span>
+                            <table id="paymentlines">
+                            </table>
+                            <table>
+                                <tr>
+                                    <td class="paymentline-type">Paid:</td>
+                                    <td class="paymentline-amount pos-rigth-align"><span id="payment-paid-total"></span> €</td>
+                                </tr>
+                                <tr>
+                                    <td class="paymentline-type">Change:</td>
+                                    <td class="paymentline-amount pos-rigth-align"><span id="payment-remaining"></span> €</td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="pos-payment-buttons">
+                            <button id="validate-order">
+                                <img src="/web/static/src/img/icons/gtk-apply.png"></img>
+                                Validate</button>
+                        </div>
+                    </div>
+                </div>
+                <span id="receipt-screen"></span>
+            </div>
+        </div>
+    </div>
+    </t>
+    <t t-name="pos-category-template">
+        <header>
+            <ol class="breadcrumb">
+                <li class="oe-pos-categories-list">
+                    <a href="javascript:void(0)">
+                        <img src="/point_of_sale/static/src/img/home.png" class="homeimg" />
+                    </a>
+                </li>
+                <t t-foreach="breadcrumb" t-as="category">
+                    <li class="oe-pos-categories-list">
+                        <img src="/point_of_sale/static/src/img/bc-arrow.png" class="bc-arrow" />
+                        <a href="javascript:void(0)" t-att-data-category-id="category.id">
+                            <t t-esc="category.name"/>
+                        </a>
+                    </li>
+                </t>
+            </ol>
+            <div class="searchbox">
+                <input placeholder="Search Products" />
+                <img class="search-clear" src="/point_of_sale/static/src/img/search_reset.gif" />
+            </div>
+        </header>
+        <div id="categories">
+            <h4>Categories:</h4>
+            <ol>
+                <t t-foreach="categories" t-as="category">
+                    <li class="oe-pos-categories-list">
+                        <a href="javascript:void(0)" t-att-data-category-id="category.id" class="button">
+                            <t t-esc="category.name"/>
+                        </a>
+                    </li>
+                </t>
+            </ol>
+        </div>
+    </t>
+    <t t-name="pos-product-template">
+        <a href="#">
+            <div class="product-img">
+                <img t-att-src="'data:image/gif;base64,'+ img" />
+                <span class="price-tag">
+                    <t t-esc="list_price"/>
+                    €
+                </span>
+            </div>
+            <div class="product-name">
+                <t t-esc="name"/>
+            </div>
+        </a>
+    </t>
+    <t t-name="pos-orderline-template">
+        <td>
+            <t t-esc="name"/>
+        </td>
+        <td>
+            <t t-esc="list_price.toFixed(2)"/>
+            €
+        </td>
+        <td>
+            <t t-esc="discount.toFixed(2)"/>
+        </td>
+        <td>
+            <t t-esc="quantity.toFixed(0)"/>
+        </td>
+        <td>
+            <t t-esc="(list_price * (1 - discount/100) * quantity).toFixed(2)"/>
+            €
+        </td>
+    </t>
+    <t t-name="pos-paymentline-template">
+        <td class="paymentline-type">
+            <t t-esc="name"/>
+        </td>
+        <td class="paymentline-amount pos-rigth-align">
+            <input type="text" t-att-value="amount.toFixed(2)" />
+        </td>
+    </t>
+    <t t-name="pos-receiptline-template">
+        <td class="receiptline-quantity pos-rigth-align">
+            <t t-esc="quantity.toFixed(0)"/>
+        </td>
+        <td class="receiptline-name">
+            <t t-esc="name"/>
+        </td>
+        <td class="receiptline-amount">
+            <t t-esc="(list_price * (1 - discount/100) * quantity).toFixed(2)"/> €
+        </td>
+    </t>
+    <t t-name="pos-payment-button-template">
+        <button class="payment-button" t-att-cash-register-id="id">
+            <t t-esc="name"/>
+        </button>
+        <br />
+    </t>
+    <t t-name="pos-order-selector-button-template">
+        <button class="select-order">Order</button>
+        <button class="close-order">X</button>
+    </t>
+    <t t-name="pos-receipt-view">
+        <div id="receipt-screen" class="step-screen" style="display:none">
+            <header><h2>Receipt</h2></header>
+            <div class="pos-step-container">
+                <div class="pos-receipt-container">
+                    <div class="pos-sale-ticket">
+                        OpenERP Point of Sale<br />
+                        <br />
+                        <div class="pos-rigth-align"><t t-esc="new Date().toString(Date.CultureInfo.formatPatterns.shortDate + ' ' +
+                            Date.CultureInfo.formatPatterns.longTime)"/></div>
+                        <br />
+                        <table id="receiptlines"></table>
+                        <br />
+                        <table>
+                            <tr><td>Total:</td><td class="pos-rigth-align"><span id="receipt-summary-total"></span> €</td></tr>
+                            <tr><td>Tax:</td><td class="pos-rigth-align"><span id="receipt-summary-tax"></span> €</td></tr>
+                            <tr><td>Change:</td><td class="pos-rigth-align"><span id="receipt-summary-change"></span> €</td></tr>
+                        </table>
+                    </div>
+                </div>
+                <button id="pos-finish-order">Next Order</button>
+            </div>
+        </div>
+    </t>
+</templates>
\ No newline at end of file
diff --git a/addons/point_of_sale/test/00_register_open.yml b/addons/point_of_sale/test/00_register_open.yml
new file mode 100644
index 00000000000..7d5aabbcdc3
--- /dev/null
+++ b/addons/point_of_sale/test/00_register_open.yml
@@ -0,0 +1,17 @@
+-
+  In order to test the Point of Sale module, I will open all cash registers through the wizard
+-
+  I go to the window to open the cash registers as admin
+-
+  !record {model: pos.open.statement, id: new_statement_open}:
+- 
+  I click on the button to open all statements/cash registers
+- 
+  !python {model: pos.open.statement}: |
+    self.open_statement(cr, uid, [ref('new_statement_open')], context={})
+- 
+  I check that I have some bank statements open for the admin user
+- 
+  !python {model: account.bank.statement}: |
+    ids = self.search(cr, uid, [('state', 'in', ('open','new')), ('user_id', '=', 1)])
+    assert (len(ids)>0), 'No statement open for the admin user!'
diff --git a/addons/point_of_sale/test/01_order_to_payment.yml b/addons/point_of_sale/test/01_order_to_payment.yml
new file mode 100644
index 00000000000..7c6b4817666
--- /dev/null
+++ b/addons/point_of_sale/test/01_order_to_payment.yml
@@ -0,0 +1,124 @@
+- |
+  In order to test the Point of Sale in module, I will do a full flow from the sale to the payment and invoicing.
+  I will use two products, one with price including a 10% tax, the other one with 5% tax excluded from the price.
+- |
+  I create a VAT tax of 10%, included in the public price
+- 
+  !record {model: account.tax, id: account_tax_10_incl}:
+    name: VAT 10 perc Incl
+    type: percent
+    amount: 0.10
+    account_paid_id: account.iva
+    account_collected_id: account.iva
+    price_include: 1
+-
+  I assign this 10 percent tax on the PC1 product as a sale tax
+-
+  !record {model: product.product, id: product.product_product_pc1}:
+    taxes_id: [account_tax_10_incl]
+- |
+  I create a VAT tax of 5%, which is added to the public price
+- 
+  !record {model: account.tax, id: account_tax_05_incl}:
+    name: VAT 05 perc Excl
+    type: percent
+    amount: 0.05
+    account_paid_id: account.iva
+    account_collected_id: account.iva
+    price_include: 0
+-
+  I assign this 5 percent tax on the PC2 product as a sale tax
+-
+  !record {model: product.product, id: product.product_product_pc2}:
+    taxes_id: [account_tax_05_incl]
+-
+  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)
+-
+  !record {model: pos.order, id: pos_order_pos0}:
+    company_id: base.main_company
+    lines:
+      - name: OL/0001
+        product_id: product.product_product_pc1
+        price_unit: 450
+        discount: 0.0
+        qty: 2.0
+      - name: OL/0002
+        product_id: product.product_product_pc2
+        price_unit: 300
+        discount: 0.0
+        qty: 3.0
+- 
+  I check that the total of the order is equal to 450*2 + 300*3*1.05 and the tax of the order is equal to 900 -(450 * 2 / 1.1) + 300*0.05*3
+- 
+  !python {model: pos.order}: |
+    order = self.browse(cr, uid, ref('pos_order_pos0'))
+    assert(abs(order.amount_total - (450*2 + 300*3*1.05)) < 0.01), "The order has a wrong amount, tax included"
+    assert(abs(order.amount_tax - (900-(450*2/1.1) + 300*0.05*3)) < 0.01), "The order has a wrong tax amount"
+- 
+  I want to add a global discount of 5 percent using the wizard
+- 
+  !record {model: pos.discount, id: pos_discount_0}:
+    discount: 5.0
+- 
+  I click the apply button to set the discount on all lines
+- 
+  !python {model: pos.discount}: |
+    self.apply_discount(cr, uid, [ref("pos_discount_0")], {"active_model": "pos.order",
+      "active_ids": [ref("pos_order_pos0")], "active_id": ref("pos_order_pos0"), })
+- 
+  I check that the total of the order is now equal to (450*2 + 300*3*1.05)*0.95
+- 
+  !python {model: pos.order}: |
+    order = self.browse(cr, uid, ref('pos_order_pos0'))
+    assert(abs(order.amount_total - (450*2 + 300*3*1.05)*0.95) < 0.01), "The order has a wrong total including tax and discounts"
+-
+  I click on the "Make Payment" wizard to pay the PoS order with a partial amount of 100.0 EUR
+- 
+  !record {model: pos.make.payment, id: pos_make_payment_0, context: '{"active_id": ref("pos_order_pos0"), "active_ids": [ref("pos_order_pos0")]}' }:
+    amount: 100.0
+-
+  I click on the validate button to register the payment.
+-
+  !python {model: pos.make.payment}: |
+    self.check(cr, uid, [ref('pos_make_payment_0')], context={'active_id': ref('pos_order_pos0'), 'lang':'en_US', 'active_model': 'pos.order', 'tz': False, 'active_ids': [ref('pos_order_pos0')]} )
+- |
+  I check that the order is not marked as paid yet
+-
+  !assert {model: pos.order, id: pos_order_pos0}:
+     - state == 'draft'
+- |
+  On the second payment proposition, I check that it proposes me the remaining balance which is 1790.0 EUR
+- 
+  !python {model: pos.make.payment}: |
+     defs = self.default_get(cr, uid, ['amount'], {'active_id': ref('pos_order_pos0')})
+     assert abs(defs['amount'] - ((450*2 + 300*3*1.05)*0.95-100.0)) < 0.01, "The remaining balance is incorrect"
+-
+  I pay the remaining balance.
+- 
+  !record {model: pos.make.payment, id: pos_make_payment_1, context: '{"active_id": ref("pos_order_pos0"), "active_ids": [ref("pos_order_pos0")]}' }:
+    amount: !eval >
+      (450*2 + 300*3*1.05)*0.95-100.0
+-
+  I click on the validate button to register the payment.
+-
+  !python {model: pos.make.payment}: |
+    self.check(cr, uid, [ref('pos_make_payment_1')], context={'active_id': ref('pos_order_pos0')} )
+- |
+  I check that the order is marked as paid
+-
+  !assert {model: pos.order, id: pos_order_pos0}:
+     - state == 'paid'
+- 
+  I generate the journal entries
+-
+  !python {model: pos.order}: |
+    self.create_account_move(cr, uid, [ref('pos_order_pos0')], {})
+-
+  I test that the generated journal entry is attached to the PoS order
+-
+  !assert {model: pos.order, id: pos_order_pos0}:
+     - bool(account_move)
+  
+
+
+
diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml
new file mode 100644
index 00000000000..0de4e518ebd
--- /dev/null
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -0,0 +1,47 @@
+-
+  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)
+-
+  !record {model: pos.order, id: pos_order_pos1}:
+    company_id: base.main_company
+    partner_id: base.res_partner_asus
+    lines:
+      - name: OL/0001
+        product_id: product.product_product_pc1
+        price_unit: 450
+        discount: 5.0
+        qty: 2.0
+      - name: OL/0002
+        product_id: product.product_product_pc2
+        price_unit: 300
+        discount: 5.0
+        qty: 3.0
+-
+  I click on the "Make Payment" wizard to pay the PoS order
+- 
+  !record {model: pos.make.payment, id: pos_make_payment_2, context: '{"active_id": ref("pos_order_pos1"), "active_ids": [ref("pos_order_pos1")]}' }:
+    amount: !eval >
+        (450*2 + 300*3*1.05)*0.95
+-
+  I click on the validate button to register the payment.
+-
+  !python {model: pos.make.payment}: |
+    self.check(cr, uid, [ref('pos_make_payment_2')], context={'active_id': ref('pos_order_pos1')} )
+- |
+  I check that the order is marked as paid and there is no invoice attached to it
+-
+  !python {model: pos.order}: |
+    order = self.browse(cr,uid,ref('pos_order_pos1'))
+-
+  !assert {model: pos.order, id: pos_order_pos1, string: State not correct}:
+     - state == 'paid'
+     - not invoice_id
+- 
+  I generate the invoice by pressing the Invoice button that calls the workflow
+-
+  !workflow {model: pos.order, action: invoice, ref: pos_order_pos1}
+-
+  I test that the total of the attached invoice is correct
+-
+  !assert {model: pos.order, id: pos_order_pos1, string: Invoice not correct}:
+     - bool(invoice_id)
+     - invoice_id.amount_total == (450*2 + 300*3*1.05)*0.95
diff --git a/addons/point_of_sale/test/point_of_sale_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
index b821dc899df..f3ea5995b9e 100644
--- a/addons/point_of_sale/test/point_of_sale_report.yml
+++ b/addons/point_of_sale/test/point_of_sale_report.yml
@@ -35,23 +35,10 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt report'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt With Reimbursement Report
+ Create a record for the root user in pos.payment.report.user (used by the next python block).
 -
-  !python {model: pos.order}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.pos.receipt.with.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt with reimbursement report'+format), 'wb+').write(data)
-
--
-  In order to test the PDF reports defined on a point of sale, we will print a POS Receipt Without Reimbursement Report
--
-  !python {model: pos.order}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.pos.receipt.without.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
-
+  !record {model: pos.payment.report.user, id: pos_payment_report_user_1}:
+    user_id: []
 -
  Print the POS Payment Report through the wizard
 -
@@ -74,56 +61,6 @@
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_report_pos_details',wiz_data=data_dict, context=ctx, our_module='point_of_sale')
 
--
-  I create a cash journal.
--
-  !record {model: account.journal, id: account_journal_cash0}:
-    name: 'Cash Journal'
-    code: 'CSJ'
-    type: 'cash'
-    view_id: account.account_journal_bank_view
-    sequence_id: account.sequence_journal
--
-  I create a record for Bank Statement.
--
-  !record {model: account.bank.statement, id: account_bank_statement_st0}:
-    name: St.05/19
-    balance_end_real: 0.0
-    date: !eval time.strftime('%Y-%m-%d')
-    journal_id: account_journal_cash0
-    line_ids:
-        - name: statement
-          date: !eval "(datetime.now() + timedelta(5*31)).strftime('%Y-%m-%d')" 
-          type: customer
-          account_id: account_pos_account_sales
-          amount: 100
-          partner_id: base.res_partner_agrolait
-    period_id: account.period_5
-    state: 'draft'
--
-  In order to test the PDF reports defined on a Point Of Sale, we will print a Account Statement Report
--
-  !python {model: account.bank.statement}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.account.statement').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-account_statement_report'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS User Product Report
--
-  !python {model: account.bank.statement}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.user.product').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-user_product_report'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS All Close Cashbox Of the Day Report
--
-  !python {model: account.bank.statement}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.all.closed.cashbox.of.the.day').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-all_closed_cash_box_of_the_day_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Report
 -
@@ -133,15 +70,6 @@
     (data, format) = netsvc.LocalService('report.pos.sales.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_report'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Today Report
--
-  !python {model: pos.order}: |
-    import netsvc, tools, os, time
-    data_dict = {'model':'ir.ui.menu', 'form':{'user_id':[ref('base.user_root')] }}
-    (data, format) = netsvc.LocalService('report.pos.sales.user.today').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_today_report'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Point of Sale, we will print a POS Payment Report
 -
@@ -159,11 +87,3 @@
     (data, format) = netsvc.LocalService('report.pos.payment.report.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_user_report'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on a Point of Sale, we will print a POS Today's Sales of Current User Report
--
-  !python {model: pos.order}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.sales.user.today.current.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)
diff --git a/addons/point_of_sale/test/point_of_sale_test.yml b/addons/point_of_sale/test/point_of_sale_test.yml
deleted file mode 100644
index 18498cb40c1..00000000000
--- a/addons/point_of_sale/test/point_of_sale_test.yml
+++ /dev/null
@@ -1,452 +0,0 @@
--
-  In order to test the POS in module, To give business owners a convenient way of checking out customers and of recording sales.
-
--
-  I  configure all details for the Customer, Salesman and Product, Account.
--
-  I create View Account Type.
--
-  !record {model: account.account.type, id: account_account_type_view0}:
-    close_method: none
-    code: View
-    name: View
-    sign: 1
--
-  I create Income Account Type.
--
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: Income
-    name: Income
-    sign: 1
--
-  I create Expense Account Type.
--
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: Expense
-    name: Expense
-    sign: 1
--
-  I create Cash Account Type.
--
-  !record {model: account.account.type, id: account_account_type_cash0}:
-    close_method: balance
-    code: Cash
-    name: Cash
-    sign: 1
--
-  I create Minimal Chart Account.
--
-  !record {model: account.account, id: account_pos_account_minimalchart}:
-    code: 'x_0'
-    company_id: base.main_company
-    currency_mode: current
-    name: Minimal Chart
-    parent_left: 1
-    parent_right: 12
-    type: view
-    user_type: account_account_type_view0
--
-   I create Payable Account.
--
-  !record {model: account.account, id: account_pos_account_payable}:
-    code: AP
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_id: account_pos_account_minimalchart
-    parent_left: 2
-    parent_right: 3
-    reconcile: true
-    type: payable
-    user_type: account_account_type_expense0
--
-   I create Receivable Account.
--
-  !record {model: account.account, id: account_pos_account_receivable}:
-    code: AR
-    company_id: base.main_company
-    currency_mode: current
-    name: Receivable
-    parent_id: account_pos_account_minimalchart
-    parent_left: 4
-    parent_right: 5
-    reconcile: true
-    type: receivable
-    user_type: account_account_type_income0
--
-  I create Cash Account.
--
-  !record {model: account.account, id: account_pos_account_cash}:
-    code: C
-    company_id: base.main_company
-    currency_mode: current
-    name: Cash
-    parent_id: account_pos_account_minimalchart
-    parent_left: 6
-    parent_right: 7
-    type: other
-    user_type: account_account_type_cash0
--
-  I create Purchases Account.
--
-  !record {model: account.account, id: account_pos_account_purchases}:
-    code: P
-    company_id: base.main_company
-    currency_mode: current
-    name: Purchases
-    parent_id: account_pos_account_minimalchart
-    parent_left: 8
-    parent_right: 9
-    type: other
-    user_type: account_account_type_expense0
--
-  I create Sales Account.
--
-  !record {model: account.account, id: account_pos_account_sales}:
-    code: Sale
-    company_id: base.main_company
-    currency_mode: current
-    name: Sales
-    parent_id: account_pos_account_minimalchart
-    parent_left: 10
-    parent_right: 11
-    type: other
-    user_type: account_account_type_income0
--
-  I create Purchase Journal - (test).
--
-  !record {model: account.journal, id: account_pos_account_journal_purchasejournal}:
-    code: PUJ
-    company_id: base.main_company
-    default_credit_account_id: account_pos_account_purchases
-    default_debit_account_id: account_pos_account_purchases
-    name: Purchase Journal - (test)
-    sequence_id: account.sequence_purchase_journal
-    type: purchase
-    view_id: account.account_journal_view
--
-  I create Sale Journal.
--
-  !record {model: account.journal, id: account_pos_account_journal_salejournal}:
-    code: SJ
-    company_id: base.main_company
-    default_credit_account_id: account_pos_account_sales
-    default_debit_account_id: account_pos_account_sales
-    name: Sale Journal
-    sequence_id: account.sequence_sale_journal
-    type: sale
-    view_id: account.account_journal_view
--
-  I create Bank Journal.
--
-  !record {model: account.journal, id: account_pos_account_journal_bankjournal}:
-    code: BNK
-    company_id: base.main_company
-    default_credit_account_id: account_pos_account_cash
-    default_debit_account_id: account_pos_account_cash
-    name: Bank Journal
-    sequence_id: account.sequence_journal
-    type: cash
-    view_id: account.account_journal_bank_view
--
-  I create property for account payable.
--
-  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_payable
-    name: property_account_expense_categ
-    value_reference: account.account,5
--
-  I create property for account receivable.
--
-  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_receivable
-    name: property_account_income_categ
-    value_reference: account.account,6
--
-  I create Partner category Customers.
--
-  !record {model: res.partner.category, id: res_partner_category_customers0}:
-    name: Customers
--
-  I create partner
--
-  !record {model: res.partner, id: res_partner_cleartrail0}:
-    category_id:
-      - res_partner_category_customers0
-    name: Cleartrail
--
-  I create partner address.
--
-  !record {model: res.partner.address, id: res_partner_address_1}:
-    partner_id: res_partner_cleartrail0
-    street: onam plaza, 14 B palasia A B Road
-    type: contact
--
-  I create partner  invoice address.
--
-  !record {model: res.partner.address, id: res_partner_address_2}:
-    partner_id: res_partner_cleartrail0
-    type: invoice
--
-  I create partner delivery address.
--
-  !record {model: res.partner.address, id: res_partner_address_3}:
-    partner_id: res_partner_cleartrail0
-    street: sangam house 15 B palasia, A B Road
-    type: delivery
--
-  I create product category.
--
-  !record {model: product.category, id: product_category_allproductssellable0}:
-    name: Mobile Products Sellable
--
-   I create partner.
--
-  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
-    address:
-      - street: Kailash Vaibhav, Parksite
-    name: Micro Link Technologies
-    property_account_payable: account_pos_account_payable
-    property_account_receivable: account_pos_account_receivable
-    supplier: true
--
-  I create partner address .
--
-  !record {model: res.partner.address, id: res_partner_address_0}:
-    country_id: base.in
-    partner_id: res_partner_microlinktechnologies0
-    street: Ash House, Ash Road
-    title: base.res_partner_title_miss
--
-  I create product category .
--
-  !record {model: product.category, id: product_category_services0}:
-    name: Mobile Services
--
-  I create product template .
--
-  !record {model: product.template, id: product_template_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    procure_method: make_to_order
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create product  LG Viewty Smart.
--
-  !record {model: product.product, id: product_product_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    procure_method: make_to_order
-    property_account_expense: account_pos_account_payable
-    property_account_income: account_pos_account_receivable
-    seller_delay: '1'
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create product category .
--
-  !record {model: product.category, id: product_category_computer0}:
-    name: Computer
--
-  I create product  HP Pavilion Desktop PCs
--
-  !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
-    categ_id: product_category_computer0
-    cost_method: standard
-    mes_type: fixed
-    list_price: 1000.0    
-    name: HP Pavilion Desktop PCs
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: res_partner_microlinktechnologies0
-        min_qty: 5.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    property_account_expense: account_pos_account_payable
-    property_account_income: account_pos_account_receivable
--
-  I create New Order by adding the details of Salesman and  "Product" as LG Viewty Smart Quantity as 10.
--
-  !record {model: pos.order, id: pos_order_pos0}:
-    company_id: base.main_company
-    date_order: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    date_validity: !eval "(datetime.now() + timedelta(6*1)).strftime('%Y-%m-%d')" 
-    lines:
-      - company_id: base.main_company
-        name: Order Line/01
-        notice: No Discount
-        product_id: product_product_lgviewtysmart0
-        qty: 10.0
-        qty_rfd: 0.0
-    partner_id: base.res_partner_agrolait
-    name: POS/001
-    price_type: tax_excluded
-    pricelist_id: product.list0
-    sale_journal: account.sales_journal
-    shop_id: sale.shop
-    user_salesman_id: base.user_root
-- 
-  I add discount. 
-- 
-  !record {model: pos.discount, id: pos_discount_0}:
-    discount: 5.0
-    discount_notes: More then 5 product
-- 
-  I Apply the discount. 
-- 
-  !python {model: pos.discount}: |
-    self.apply_discount(cr, uid, [ref("pos_discount_0")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id":
-      ref("pos_order_pos0"), })
-- 
-  I open the register.
-- 
-  !record {model: pos.open.statement, id: pos_open_statement_0}:
-    {}
-- 
-  I open the statement.
-- 
-  !python {model: pos.open.statement}: |
-    jou_obj = self.pool.get('account.journal')
-    statement_obj = self.pool.get('account.bank.statement')
-    cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
-                    "WHERE user_id = %s ORDER BY journal_id"% (uid, ))
-    jou_ids = map(lambda x1: x1[0], cr.fetchall())
-    journal_ids = jou_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', jou_ids)], context=context)
-    ids = statement_obj.search(cr, uid, [('state', '=', 'open'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)], context=context)
-    if not ids:
-        self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
-          "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz":
-          False, "active_id": ref("point_of_sale.menu_open_statement"), })
--
-  I click on the "Make Payment" wizard.  
-- 
-  !record {model: pos.make.payment, id: pos_make_payment_0}:
-    amount: 1615.0
-    journal: 7
-    payment_date: !eval time.strftime("%Y-%m-%d")
-    payment_name: Payment
-    product_id: product_product_hppaviliondesktoppcs0
-    pricelist_id: product.list0
-    partner_id: base.res_partner_agrolait
-- 
-  I make the payment.
-- 
-  !python {model: pos.make.payment}: |
-    self.check(cr, uid, [ref("pos_make_payment_0")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("point_of_sale.pos_order_pos0")], "tz":
-      False, "active_id": ref("point_of_sale.pos_order_pos0"), })
--
-  I check the Statement lines are created automatically when payment is done.
--
-  !python {model: pos.order}: |
-   order=self.browse(cr,uid,ref("pos_order_pos0"))
-   assert(order.statement_ids!=[]), "Statement lines not created"    
--
-  When I click on Return picking button , I get three option.
--
-  1. Cancel 2.Return Goods and Exchange 3.Return without Refund
--
-  When I click on  Return Goods and Exchange.  
--  
-  Then it allows me to define the quantity of products, which will return to the stock. 
-- 
-  I click on Return Picking button.
-- 
-  !record {model: pos.return, id: pos_return_0}:
-    pos_moves_ids:
-      - product_id: product_product_hppaviliondesktoppcs0
-        quantity: 5.0
-- 
-  I Return the product.
-- 
-  !python {model: pos.return}: |
-    self.create_returns(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("point_of_sale.pos_order_pos0")], "tz":
-      False, "active_id": ref("point_of_sale.pos_order_pos0"), })
-- 
-  Then it allows me to define the quantity of products, which will return to the stock.
--
-  I select the  HP Pavilion Desktop PCs for exchange.   
-- 
-  !record {model: pos.add.product, id: pos_add_product_0}:
-    product_id: product_product_hppaviliondesktoppcs0
-    quantity: 5.0
--    
-  I click on close button.
-- 
-  !python {model: pos.add.product}: |
-    return_obj = self.pool.get('pos.return')
-    context['active_ids'] = [ref("pos_order_pos0")] 
-    return_obj.view_init(cr, uid, [],context=context)
-    self.close_action(cr, uid, [ref("pos_add_product_0")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"),
-      })
--    
-  I create payment.
-- 
-  !record {model: pos.make.payment, id: pos_make_payment_1}:
-    amount: 680.0
-    journal: 7
-    payment_date: !eval time.strftime("%Y-%m-%d")
-    payment_name: Payment
-    product_id: product_product_hppaviliondesktoppcs0
-    pricelist_id: product.list0
-    partner_id: base.res_partner_agrolait
-- 
-  For payment, I click on  Make Payment. 
-- 
-  !python {model: pos.make.payment}: |
-    self.check(cr, uid, [ref("pos_make_payment_1")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz":
-      False, "active_id": ref("pos_order_pos0"), })    
-- 
-  To check the Return without Refund . I click button "Return without Refund ".
-- 
-  !record {model: pos.return, id: pos_return_0}:
-   {}
--
-  The quantity which is selected in Return lines wizard is refunded.
-- 
-  !python {model: pos.return}: |
-    self.create_returns2(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz":
-      False, "active_id": ref("pos_order_pos0"), })
-- 
-  To Close order, I use the wizard "Sale Confirm".
-- 
-  !record {model: pos.confirm, id: pos_confirm_0}:
-    {}
-- 
-  I close this order.
-- 
-  !python {model: pos.confirm}: |
-    self.action_confirm(cr, uid, [ref("pos_confirm_0")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"),
-      })
-- 
-  I check order state is done.
-- 
-  !python {model: pos.order}: |
-    order=self.browse(cr,uid,ref("pos_order_pos0"))    
-    assert(order.state=='done'), "Order is not done"    
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 4a131d5894b..0985ae906be 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -19,10 +19,8 @@
 #
 ##############################################################################
 
-import pos_add_product
 import pos_confirm
 import pos_discount
-import pos_get_sale
 import pos_open_statement
 import pos_close_statement
 import pos_box_entries
@@ -30,15 +28,11 @@ import pos_box_out
 import pos_details
 import pos_sales_user
 import pos_sales_user_today
-import pos_sales_user_current_user
-import all_closed_cashbox_of_the_day
 import pos_receipt
 import pos_payment_report_user
 import pos_payment_report_date
 import pos_payment_report
 import pos_payment
-import pos_scan_product
-import pos_return
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml
deleted file mode 100644
index e78ef5c6d6a..00000000000
--- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-        <!--   pos.details -->
-        
-		<record id="view_all_closed_cashbox_of_the_day" model="ir.ui.view">
-            <field name="name">all closed cashbox of the day</field>
-            <field name="model">all.closed.cashbox.of.the.day</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="All Cashboxes Of the day :">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-print" />				  
-                </form>
-            </field>
-        </record>
-
- 
-       
-  		<record id="action_report_all_closed_cashbox_of_the_day" model="ir.actions.act_window">
-            <field name="name">All Cashboxes Of the day</field>
-            <field name="res_model">all.closed.cashbox.of.the.day</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/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
deleted file mode 100644
index dfbb96a4514..00000000000
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-
-
-class add_product(osv.osv_memory):
-    _name = 'pos.add.product'
-    _description = 'Add Product'
-
-    _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True),
-        'quantity': fields.float('Quantity', required=True),
-    }
-    _defaults = {
-        'quantity': 1,
-    }
-
-    def select_product(self, cr, uid, ids, context=None):
-        """
-             To get the product and quantity and add in order .
-             @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 the add product form again for adding more product
-        """
-        if context is None:
-            context = {}
-        this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('active_id', False)
-        assert record_id, _('Active ID is not found')
-        if record_id:
-            order_obj = self.pool.get('pos.order')
-            order_obj.add_product(cr, uid, record_id, this.product_id.id, this.quantity, context=context)
-        return {
-            'name': _('Add Product'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'pos.add.product',
-            'view_id': False,
-            'target': 'new',
-            'views': False,
-            'type': 'ir.actions.act_window',
-        }
-
-    def close_action(self, cr, uid, ids, context=None):
-        """
-             To get the product and Make the payment .
-             @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 the Make Payment
-        """
-        if context is None:
-            context = {}
-        record_id = context and context.get('active_id', False)
-        order_obj= self.pool.get('pos.order')
-        this = self.browse(cr, uid, ids[0], context)
-        order_obj.add_product(cr, uid, record_id, this.product_id.id, this.quantity, context=context)
-
-        order_obj.write(cr, uid, [record_id], {'state': 'done'}, context=context)
-        return {
-            'name': _('Make Payment'),
-            'context': context and context.get('active_id', False),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'pos.make.payment',
-            'view_id': False,
-            'target': 'new',
-            'views': False,
-            'type': 'ir.actions.act_window',
-        }
-
-add_product()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_add_product.xml b/addons/point_of_sale/wizard/pos_add_product.xml
deleted file mode 100644
index ac5fd1c6f65..00000000000
--- a/addons/point_of_sale/wizard/pos_add_product.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-        <!--  Add  Product -->
-        
-		<record id="view_add_product" model="ir.ui.view">
-            <field name="name">Add Product</field>
-            <field name="model">pos.add.product</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Add product :">
-				    <group col="6" colspan="4">
-				    	<field name="product_id"/>
-				    	<field name="quantity"/>
-				    	<separator string="" colspan="4"/>
-				    	<newline/>
-				    	<group colspan="4" col="4">
-				    	    <label string="" colspan="1"/>
-					    	<button icon="gtk-stop" special="cancel"
-	                            string="Cancel"/>
-	                		<button icon="gtk-ok" name="close_action"
-	                			string="Save &amp; Close" type="object"/>
-	                		<button name="select_product" string="Save &amp; New"
-	                			colspan="1" type="object" icon="gtk-add"/>
-	                    </group>
-                	</group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_add_product" model="ir.actions.act_window">
-            <field name="name">Add Product</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.add.product</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/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index dcc9779a903..8313b345834 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -37,14 +37,13 @@ def get_journal(self, cr, uid, context=None):
 
     journal_obj = self.pool.get('account.journal')
     statement_obj = self.pool.get('account.bank.statement')
-    cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users WHERE user_id = %s ORDER BY journal_id", (uid, ))
-    j_ids = map(lambda x1: x1[0], cr.fetchall())
-    ids = journal_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
-    obj_ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', ids)], context=context)
-    res_obj = journal_obj.read(cr, uid, ids, ['journal_id'], context=context)
-    res_obj = [(r1['id']) for r1 in res_obj]
+
+    j_ids = journal_obj.search(cr, uid, [('journal_user','=',1)], context=context)
+    obj_ids = statement_obj.search(cr, uid, [('state', '=', 'open'), ('user_id', '=', uid), ('journal_id', 'in', j_ids)], context=context)
     res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context=context)
     res = [(r['journal_id']) for r in res]
+    if not len(res):
+        raise osv.except_osv(_('Error !'), _('You do not have any open cash register. You must create a payment method or open a cash register.'))
     res.insert(0, ('', ''))
     return res
 
@@ -69,12 +68,11 @@ class pos_box_entries(osv.osv_memory):
 
         return res
 
-
     _columns = {
-        'name': fields.char('Description', size=32, required=True),
+        'name': fields.char('Reason', size=32, required=True),
         'journal_id': fields.selection(get_journal, "Cash Register", required=True),
         'product_id': fields.selection(_get_income_product, "Operation", required=True),
-        'amount': fields.float('Amount', digits=(16, 2)),
+        'amount': fields.float('Amount', digits=(16, 2), required=True),
         'ref': fields.char('Ref', size=32),
     }
     _defaults = {
@@ -98,11 +96,11 @@ class pos_box_entries(osv.osv_memory):
         for data in  self.read(cr, uid, ids, context=context):
             vals = {}
             curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
-            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
+            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', int(data['journal_id'])), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
             if not statement_id:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
 
-            acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income
+            acc_id = product_obj.browse(cr, uid, int(data['product_id'])).property_account_income
             if not acc_id:
                 raise osv.except_osv(_('Error !'), _('Please check that income account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name))
             if statement_id:
@@ -122,11 +120,10 @@ class pos_box_entries(osv.osv_memory):
             vals['amount'] = data['amount'] or 0.0
             vals['ref'] = "%s" % (data['ref'] or '')
             vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
-            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
-            if address_u:
-                vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None
             bank_statement.create(cr, uid, vals, context=context)
         return {}
 
 pos_box_entries()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index e0af60a1f73..2db10e36aa8 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -3,31 +3,31 @@
     <data>
         <!--  Box Entries -->
 
-		<record id="view_box_entries" model="ir.ui.view">
+        <record id="view_box_entries" model="ir.ui.view">
             <field name="name">Box Entries</field>
             <field name="model">pos.box.entries</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Box Entries">
-				    <separator string="Please fill these fields for entries to the box:" colspan="4"/>
-			    	<field name="name"/>
-			    	<field name="journal_id"/>
-			    	<field name="product_id"/>
-			    	<field name="amount"/>
-			    	<separator colspan="4"/>
-			    	<group colspan="4" col="4">
-			    	    <group col="2" colspan="2"/>
-				 		<button icon="gtk-stop" special="cancel"
-                			string="Cancel" />
-                		<button name="get_in" string="Put Money"
-                			colspan="1" type="object" icon="terp-dolar_ok!" />
-          			</group>
+                <form string="Put Money">
+                    <separator string="Fill in this form if you put money in the cash register:" colspan="4"/>
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="journal_id"/>
+                    <field name="amount"/>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="4">
+                        <group col="2" colspan="2"/>
+                         <button icon="gtk-stop" special="cancel"
+                            string="Cancel" />
+                        <button name="get_in" string="Put Money"
+                            colspan="1" type="object" icon="gtk-apply" />
+                      </group>
                 </form>
             </field>
         </record>
 
         <record id="action_box_entries" model="ir.actions.act_window">
-         	<field name="name">Box Entries</field>
+             <field name="name">Put Money In</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.box.entries</field>
             <field name="view_type">form</field>
@@ -35,5 +35,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index 74f1a968bc7..46f710c7882 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -49,11 +49,10 @@ class pos_box_out(osv.osv_memory):
         return res
 
     _columns = {
-        'name': fields.char('Description', size=32, required=True),
+        'name': fields.char('Description / Reason', size=32, required=True),
         'journal_id': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True),
         'product_id': fields.selection(_get_expense_product, "Operation", required=True),
-        'amount': fields.float('Amount', digits=(16, 2)),
-        'ref': fields.char('Ref', size=32),
+        'amount': fields.float('Amount', digits=(16, 2), required=True),
     }
     _defaults = {
          'journal_id': 1,
@@ -81,18 +80,8 @@ class pos_box_out(osv.osv_memory):
             sunday = (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
             done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)], context=context)
             stat_done = statement_obj.browse(cr, uid, done_statmt, context=context)
-            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
             am = 0.0
             product = product_obj.browse(cr, uid, data['product_id'], context=context)
-            amount_check = product.am_out or False
-            for st in stat_done:
-                for s in st.line_ids:
-                    if address_u and s.partner_id == address_u.partner_id and s.am_out:
-                        am += s.amount
-            if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid, context=context).company_id.max_diff or 0.0) and amount_check:
-                val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am
-                raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
-
             acc_id = product.property_account_income
             if not acc_id:
                 raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product.name))
@@ -115,15 +104,11 @@ class pos_box_out(osv.osv_memory):
             if data['amount'] > 0:
                 amount = -data['amount']
             vals['amount'] = amount
-            if product.am_out:
-                vals['am_out'] = True
-            vals['ref'] = data['ref'] or ''
             vals['name'] = "%s: %s " % (product.name, data['name'])
-            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
-            if address_u:
-                vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None
             statement_line_obj.create(cr, uid, vals, context=context)
         return {}
 
 pos_box_out()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 4647b1e66a7..4f19a407a38 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -3,31 +3,31 @@
     <data>
         <!--  Box Entries -->
 
-		<record id="view_pos_box_out" model="ir.ui.view">
+        <record id="view_pos_box_out" model="ir.ui.view">
             <field name="name">Box Out</field>
             <field name="model">pos.box.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Output Operation">
-				    	<separator string="Please fill these fields for entries to the box:" colspan="4"/>
-				    	<field name="name"/>
-				    	<field name="journal_id"/>
-				    	<field name="product_id"/>
-				    	<field name="amount"/>
-				    	<separator colspan="4"/>
-				    	<group colspan="4" col="4">
-				    	    <group col="2" colspan="2"/>
-					 		<button icon="gtk-stop" special="cancel"
-	                			string="Cancel" />
-	                		<button name="get_out" string="Take Money"
-	                			colspan="1" type="object" icon="terp-dolar" />
-                	    </group>
+                        <separator string="Describe why you take money from the cash register:" colspan="4"/>
+                        <field name="name"/>
+                        <field name="product_id"/>
+                        <field name="journal_id"/>
+                        <field name="amount"/>
+                        <separator colspan="4"/>
+                        <group colspan="4" col="4">
+                            <group col="2" colspan="2"/>
+                             <button icon="gtk-stop" special="cancel"
+                                string="Cancel" />
+                            <button name="get_out" string="Take Money"
+                                colspan="1" type="object" icon="gtk-apply" />
+                        </group>
                 </form>
             </field>
         </record>
 
         <record id="action_box_out" model="ir.actions.act_window">
-         	<field name="name">Box Out</field>
+            <field name="name">Take Money Out</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.box.out</field>
             <field name="view_type">form</field>
@@ -35,5 +35,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index 222338f6e10..92dee2f8e4c 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -38,27 +38,27 @@ class pos_close_statement(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
-        cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
-                    "WHERE user_id=%s ORDER BY journal_id", (uid, ))
-        j_ids = map(lambda x1: x1[0], cr.fetchall())
-        journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
-        ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)], context=context)
-        for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
-            if not ids:
-                raise osv.except_osv(_('Message'), _('Cash registers are already closed.'))
-            else:
-                if not journal.check_dtls:
-                    statement_obj.button_confirm_cash(cr, uid, ids, context=context)
 
-        tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_tree')
+        j_ids = journal_obj.search(cr, uid, [('journal_user','=',1)], context=context)
+        ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', j_ids)], context=context)
+        if not ids:
+            raise osv.except_osv(_('Message'), _('Cash registers are already closed.'))
+        for statement in statement_obj.browse(cr, uid, ids, context=context):
+            statement_obj.write(cr, uid, [statement.id], {
+                'balance_end_real': statement.balance_end
+            }, context=context)
+            if not statement.journal_id.check_dtls:
+                statement_obj.button_confirm_cash(cr, uid, [statement.id], context=context)
+
+        tree_res = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_cash_statement_pos_tree')
         tree_id = tree_res and tree_res[1] or False
         form_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_form2')
         form_id = form_res and form_res[1] or False
         search_id = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_pos_confirm_cash_statement_filter')
-        
+
         return {
             'domain': "[('id', 'in', " + str(ids) + ")]",
-            'name': 'Close Statements',
+            'name': _('Close Cash Registers'),
             'view_type': 'form',
             'view_mode': 'tree, form',
             'search_view_id': search_id and search_id[1] or False,
@@ -66,7 +66,6 @@ class pos_close_statement(osv.osv_memory):
             'views': [(tree_id, 'tree'), (form_id, 'form')],
             'type': 'ir.actions.act_window'
         }
-
 pos_close_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 7a9a5a0e23d..61c984c873e 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>        
+    <data>
         <!--  Point of Sale Confirm -->
-        
-		<record id="view_pos_close_statement" model="ir.ui.view">
+
+        <record id="view_pos_close_statement" model="ir.ui.view">
             <field name="name">Close Statements</field>
             <field name="model">pos.close.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Close Statements">
-				    <label string="Are you sure you want to close the statements ?"/>
+                <form string="Close Cash Registers">
+                    <separator colspan="4" string="Do you want to close your cash registers ?"/>
+                    <label string="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."/>
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
                         <group col="2" colspan="2"/>
@@ -22,15 +23,14 @@
             </field>
         </record>
 
-		<act_window name="Close Statements"
-				res_model="pos.close.statement"
-				src_model="account.bank.statement"
-				view_mode="form"
-				target="new"
-				key2="client_action_multi"    
-			id="act_pos_open_statement"/>
-   	
-   	
+        <act_window name="Close Statements"
+            res_model="pos.close.statement"
+            src_model="account.bank.statement"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="act_pos_open_statement"/>
+
         <record id="action_pos_close_statement" model="ir.actions.act_window">
             <field name="name">Close Cash Register</field>
             <field name="type">ir.actions.act_window</field>
@@ -38,6 +38,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-        </record>        
-	</data>
-</openerp>	        
+        </record>
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
index c55209650ca..c80f3ed1dd6 100644
--- a/addons/point_of_sale/wizard/pos_confirm.py
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -25,36 +25,21 @@ from osv import osv
 
 class pos_confirm(osv.osv_memory):
     _name = 'pos.confirm'
-    _description = 'Point of Sale Confirm'
+    _description = 'Post POS Journal Entries'
 
     def action_confirm(self, cr, uid, ids, context=None):
-        """
-             Confirm the order and close the sales.
-             @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 :Blank dictionary
-        """
-        if context is None:
-            context = {}
-        record_id = context and context.get('active_id', False)
-        if record_id:
-            if isinstance(record_id, (int, long)):
-                record_id = [record_id]
-            if record_id:
-                order_obj = self.pool.get('pos.order')
-
-                for order_id in order_obj.browse(cr, uid, record_id, context=context):
-                    if  order_id.state == 'paid':
-                        order_obj.write(cr, uid, [order_id.id], {'journal_entry': True}, context=context)
-                        order_obj.create_account_move(cr, uid, [order_id.id], context=context)
-
-                wf_service = netsvc.LocalService("workflow")
-                for i in record_id:
-                    wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
+        wf_service = netsvc.LocalService("workflow")
+        order_obj = self.pool.get('pos.order')
+        ids = order_obj.search(cr, uid, [('state','=','paid')], context=context)
+        for order in order_obj.browse(cr, uid, ids, context=context):
+            todo = True
+            for line in order.statement_ids:
+                if line.statement_id.state <> 'confirm':
+                    todo = False
+                    break
+            if todo:
+                wf_service.trg_validate(uid, 'pos.order', order.id, 'done', cr)
         return {}
-
 pos_confirm()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 1ea769cae49..85b43bd115d 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>        
+    <data>
         <!--  Point of Sale Confirm -->
-        
-		<record id="view_pos_confirm" model="ir.ui.view">
-            <field name="name">Sale Confirm</field>
+        <record id="view_pos_confirm" model="ir.ui.view">
+            <field name="name">Post Journal Entries</field>
             <field name="model">pos.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Open Statements">
-				     	<label string="Are you sure you want to close your sales ?" colspan="2"/>
-				     	<newline/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="No" />
-                		<button name="action_confirm" string="Yes"
-                			colspan="1" type="object" icon="gtk-ok"/>
+                <form string="Post All Orders">
+                <separator string="Generate Journal Entries" colspan="4"/>
+                <label string="This wizard will generate all journal entries for orders linked to a closed cash register or statement." colspan="4" align="0.0"/>
+                <newline/>
+                <separator colspan="4"/>
+                <group colspan="4" col="4">
+                    <group colspan="2" col="2">
+                    <button icon='gtk-cancel' special="cancel"
+                        string="Cancel" />
+                    <button name="action_confirm" string="Generate Entries"
+                        colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
                 </form>
             </field>
         </record>
 
         <record id="action_pos_confirm" model="ir.actions.act_window">
-            <field name="name">Sale Confirm</field>
+            <field name="name">Post Journal Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.confirm</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
-	</data>
-</openerp>	        
\ No newline at end of file
+
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index 928fe396f0b..aadd85b48eb 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -23,34 +23,28 @@ from osv import osv, fields
 
 class pos_discount(osv.osv_memory):
     _name = 'pos.discount'
-    _description = 'Add Discount'
-
+    _description = 'Add a Global Discount'
     _columns = {
-        'discount': fields.float('Discount ', required=True),
-        'discount_notes': fields.char('Discount Notes', size= 128, required=True),
+        'discount': fields.float('Discount (%)', required=True, digits=(16,2)),
     }
     _defaults = {
         'discount': 5,
     }
 
-
-    def view_init(self, cr, uid, fields_list, context=None):
-        """
-         Creates view dynamically and adding fields at runtime.
-         @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: New arch of view with new columns.
-        """
-        if context is None:
-            context = {}
-        super(pos_discount, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False) or False
-        order = self.pool.get('pos.order').browse(cr, uid, record_id, context=context)
-        if not order.lines:
-                raise osv.except_osv(_('Error!'), _('No Order Lines'))
-        True
+#    def view_init(self, cr, uid, fields_list, context=None):
+#        """
+#         Creates view dynamically and adding fields at runtime.
+#         @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: New arch of view with new columns.
+#        """
+#        if context is None:
+#            context = {}
+#        super(pos_discount, self).view_init(cr, uid, fields_list, context=context)
+#        record_id = context and context.get('active_id', False) or False
+#        True
 
     def apply_discount(self, cr, uid, ids, context=None):
         """
@@ -70,33 +64,8 @@ class pos_discount(osv.osv_memory):
         record_id = context and context.get('active_id', False)
         if isinstance(record_id, (int, long)):
             record_id = [record_id]
-
         for order in order_ref.browse(cr, uid, record_id, context=context):
-            for line in order.lines:
-                company_discount = order.company_id.company_discount
-                applied_discount = this.discount
-
-                if applied_discount == 0.00:
-                    notice = 'No Discount'
-                elif company_discount >= applied_discount:
-                    notice = 'Minimum Discount'
-                else:
-                    notice = this.discount_notes
-                res_new = {}
-                if this.discount <= company_discount:
-                    res_new = {
-                        'discount': this.discount,
-                        'notice': notice,
-                        'price_ded': line.price_unit * line.qty * (this.discount or 0) * 0.01 or 0.0
-                    }
-                else:
-                    res_new = {
-                        'discount': this.discount,
-                        'notice': notice,
-                        'price_ded': line.price_unit * line.qty * (this.discount or 0) * 0.01 or 0.0
-                    }
-
-                order_line_ref.write(cr, uid, [line.id], res_new, context=context)
+            order_line_ref.write(cr, uid, [x.id for x in order.lines], {'discount':this.discount}, context=context)
         return {}
 
 pos_discount()
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index a0a7c534a95..bb198e29acf 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>        
+    <data>
         <!--  Add  Product -->
-        
-		<record id="view_pos_discount" model="ir.ui.view">
+
+        <record id="view_pos_discount" model="ir.ui.view">
             <field name="name">Apply Discount</field>
             <field name="model">pos.discount</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Apply Discount">
-				    <group col="2" colspan="4">
-				    	<field name="discount"/>
-				    	<field name="discount_notes"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="apply_discount" string="Apply Discount"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <field name="discount" colspan="4"/>
+                    <separator colspan="4" string=""/>
+                    <group colspan="2"/>
+                    <button icon='gtk-cancel' special="cancel"
+                        string="Close" />
+                    <button name="apply_discount" string="Apply Discount"
+                        colspan="1" type="object" icon="gtk-ok" />
                 </form>
             </field>
         </record>
@@ -29,6 +28,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
-	</data>
-</openerp>	        
\ No newline at end of file
+
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py
deleted file mode 100644
index 48bd89bce7f..00000000000
--- a/addons/point_of_sale/wizard/pos_get_sale.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/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-
-
-class pos_get_sale(osv.osv_memory):
-    _name = 'pos.get.sale'
-    _description = 'Get From Sale'
-
-    _columns = {
-        'picking_id': fields.many2one('stock.picking', 'Sale Order', domain=[('state', 'in', ('assigned', 'confirmed')), ('type', '=', 'out')], context="{'contact_display': 'partner'}", required=True),
-    }
-
-    def sale_complete(self, cr, uid, ids, context=None):
-        """
-             Select the picking order and add the in Point of sale order
-             @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 : nothing
-        """
-        proxy_pos = self.pool.get('pos.order')
-        proxy_pick = self.pool.get('stock.picking')
-        proxy_order_line = self.pool.get('pos.order.line')
-        if context is None:
-            context = {}
-        this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('active_id', False)
-
-        if record_id:
-            order = proxy_pos.browse(cr, uid, record_id, context=context)
-            if order.state in ('paid', 'invoiced'):
-                raise osv.except_osv(_('UserError '), _("You can't modify this order. It has already been paid"))
-
-            for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context=context):
-                proxy_pos.write(cr, uid, record_id, {
-                    'picking_id': this.picking_id.id,
-                    'partner_id': pick.address_id and pick.address_id.partner_id.id
-                }, context=context)
-
-            order = proxy_pick.write(cr, uid, [this.picking_id.id], {
-                                        'invoice_state': 'none',
-                                        'pos_order': record_id
-                                    }, context=context)
-
-            for line in pick.move_lines:
-                proxy_order_line.create(cr, uid, {
-                    'name': line.sale_line_id.name,
-                    'order_id': record_id,
-                    'qty': line.product_qty,
-                    'product_id': line.product_id.id,
-                    'price_unit': line.sale_line_id.price_unit,
-                    'discount': line.sale_line_id.discount,
-                }, context=context)
-        return {}
-
-pos_get_sale()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_get_sale.xml b/addons/point_of_sale/wizard/pos_get_sale.xml
deleted file mode 100644
index 9a28da548d2..00000000000
--- a/addons/point_of_sale/wizard/pos_get_sale.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <!--  Select an Open Sale Order -->
-        
-		<record id="view_pos_get_sale" model="ir.ui.view">
-            <field name="name">Open Sale Order</field>
-            <field name="model">pos.get.sale</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Select an Open Sale Order">
-				    <field name="picking_id"/>
-				    <newline/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="sale_complete" string="Confirm"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
-                </form>
-            </field>
-        </record>
-        <record id="action_pos_get_sale" model="ir.actions.act_window">
-            <field name="name">Select an Open Sale Order</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.get.sale</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-	</data>
-</openerp>	
-        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 241f0a6e1d0..47c5348943b 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -42,46 +42,48 @@ class pos_open_statement(osv.osv_memory):
         journal_obj = self.pool.get('account.journal')
         if context is None:
             context = {}
-        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
-                    "WHERE user_id = %s ORDER BY journal_id"% (uid, ))
-        j_ids = map(lambda x1: x1[0], cr.fetchall())
-        journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
 
-        for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
+        st_ids = []
+        j_ids = journal_obj.search(cr, uid, [('journal_user','=',1)], context=context)
+
+        for journal in journal_obj.browse(cr, uid, j_ids, context=context):
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
             if len(ids):
-                raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related cash register.') %(journal.name))
+                st_ids += ids
+                continue
 
-            number = ''
             if journal.sequence_id:
-                number = sequence_obj.get_id(cr, uid, journal.sequence_id.id)
+                number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id)
             else:
-                number = sequence_obj.get(cr, uid, 'account.cash.statement')
+                number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement')
 
-            data.update({'journal_id': journal.id,
-                         'company_id': company_id,
-                         'user_id': uid,
-                         'state': 'draft',
-                         'name': number })
+            data.update({
+                'journal_id': journal.id,
+                'user_id': uid,
+                'state': 'draft',
+                'name': number 
+            })
             statement_id = statement_obj.create(cr, uid, data, context=context)
-            statement_obj.button_open(cr, uid, [statement_id], context)
+            st_ids.append(statement_id)
 
-        tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_tree')
+            if journal.auto_cash:
+                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')
         tree_id = tree_res and tree_res[1] or False
         form_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_form2')
         form_id = form_res and form_res[1] or False
         search_id = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter')
 
         return {
-            'domain': "[('state', '=', 'open'),('user_id', '=', "+ str(uid) +")]",
-            'name': 'Open Statement',
+            'domain': "[('id', 'in',[ "+','.join(map(str,st_ids))+"])]",
+            'name': _('Open Cash Registers'),
             'view_type': 'form',
             'view_mode': 'tree, form',
             'search_view_id': search_id and search_id[1] or False ,
             'res_model': 'account.bank.statement',
             'views': [(tree_id, 'tree'), (form_id, 'form')],
-            'context': {'search_default_open': 1},
+            'context': {},
             'type': 'ir.actions.act_window'
         }
 pos_open_statement()
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 870d8f71e47..54a66c3c5f7 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -3,31 +3,31 @@
     <data>        
         <!--  Point of Sale Confirm -->
         
-		<record id="view_pos_open_statement" model="ir.ui.view">
+        <record id="view_pos_open_statement" model="ir.ui.view">
             <field name="name">Open Statements</field>
             <field name="model">pos.open.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Statements">
-                    <label string="Are you sure you want to open the statements ?"/>
-		     	    <separator colspan="4"/>
-		     	    <group col="4" colspan="4">
-			     	    <group col="2" colspan="2"/>
-	               		<button icon='gtk-stop' special="cancel"
-	               			string="No" />
-	               		<button name="open_statement" string="Yes"
-	               			 type="object" icon="gtk-ok"/>
-                   </group>
+                    <separator colspan="4" string="Do you want to open cash registers ?"/>
+                    <label string="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." colspan="4" align="0.0"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                         <group col="2" colspan="2"/>
+                         <button icon='gtk-stop' special="cancel" string="Cancel"/>
+                         <button name="open_statement" string="Open Registers"
+                             type="object" icon="gtk-ok"/>
+                    </group>
                 </form>
             </field>
         </record>
-		<act_window name="Open Statements"
-				res_model="pos.open.statement"
-				src_model="account.bank.statement"
-				view_mode="form"
-				target="new"
-				key2="client_action_multi"    
-			id="act_pos_open_statement"/>
+        <act_window name="Open Statements"
+            res_model="pos.open.statement"
+            src_model="account.bank.statement"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"    
+            id="act_pos_open_statement"/>
 
         <record id="action_pos_open_statement" model="ir.actions.act_window">
             <field name="name">Open Cash Register</field>
@@ -38,5 +38,5 @@
             <field name="target">new</field>
         </record>
         
-	</data>
-</openerp>	        
+    </data>
+</openerp>            
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index ea5bd2639d7..3a50ac0f7c9 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -29,188 +29,44 @@ import pos_box_entries
 class pos_make_payment(osv.osv_memory):
     _name = 'pos.make.payment'
     _description = 'Point of Sale Payment'
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-         To get default values for the object.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param fields: List of fields for which we want default values
-         @param context: A standard dictionary
-         @return: A dictionary which of fields with values.
-        """
-        if context is None:
-            context = {}
-        journal_obj = self.pool.get('account.journal')
-        order_obj = self.pool.get('pos.order')
-        res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
-        active_id = context and context.get('active_id', False)
-        if active_id:
-            cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
-                        "WHERE user_id = %d ORDER BY journal_id"% (uid, ))
-            j_ids = map(lambda x1: x1[0], cr.fetchall())
-            journal = journal_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)], context=context)
-            journal = journal and journal[0] or False
-            order = order_obj.browse(cr, uid, active_id, context=context)
-            #get amount to pay
-            amount = order.amount_total - order.amount_paid
-            if amount <= 0.0:
-                context.update({'flag': True})
-                order_obj.action_paid(cr, uid, [active_id], context)
-            elif order.amount_paid > 0.0:
-                order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context)
-            invoice_wanted_checked = False
-
-            current_date = time.strftime('%Y-%m-%d')
-
-            if 'journal' in fields:
-                res.update({'journal': journal})
-            if 'amount' in fields:
-                res.update({'amount': amount})
-            if 'invoice_wanted' in fields:
-                res.update({'invoice_wanted': invoice_wanted_checked})
-            if 'payment_date' in fields:
-                res.update({'payment_date': current_date})
-            if 'payment_name'  in fields:
-                res.update({'payment_name': 'Payment'})
-            if 'partner_id' in fields:
-                res.update({'partner_id': order.partner_id.id or False})
-            if 'pricelist_id' in fields:
-                res.update({'pricelist_id': order.pricelist_id.id or False})
-        return res
-
-    def view_init(self, cr, uid, fields_list, context=None):
-        if context is None:
-            context = {}
-        super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
-        active_id = context and context.get('active_id', False) or False
-        if active_id:
-            order = self.pool.get('pos.order').browse(cr, uid, active_id, context=context)
-            if not order.lines:
-                raise osv.except_osv(_('Error!'),_('No order lines defined for this sale '))
-        return True
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """
-             Changes the view dynamically
-
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary
-
-             @return: New arch of view.
-
-        """
-        result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        if context is None:
-            context = {}
-        active_model = context.get('active_model')
-        active_id = context and context.get('active_id', False) or False
-        if not active_id or (active_model and active_model != 'pos.order'):
-            return result
-
-        order = self.pool.get('pos.order').browse(cr, uid, active_id, context=context)
-        if order.amount_total == order.amount_paid:
-            result['arch'] = """ <form string="Make Payment" colspan="4">
-                            <group col="2" colspan="2">
-                                <label string="Do you want to print the Receipt?" colspan="4"/>
-                                <separator colspan="4"/>
-                                <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                <button name="print_report" string="Print Receipt" type="object" icon="gtk-print"/>
-                            </group>
-                        </form>
-                    """
-        return result
-
-    def onchange_product_id(self, cr, uid, ids, product_id, amount):
-        """ Changes amount if product_id changes.
-        @param product_id: Changed product_id
-        @param amount: Amount to be paid
-        @return: Dictionary of changed values
-        """
-        prod_obj = self.pool.get('product.product')
-        if product_id:
-            product = prod_obj.browse(cr, uid, product_id)
-            amount = product.list_price
-        return {'value': {'amount': amount}}
-
     def check(self, cr, uid, ids, context=None):
         """Check the order:
         if the order is not paid: continue payment,
-        if the order is paid print invoice (if wanted) or ticket.
+        if the order is paid print ticket.
         """
+        context = context or {}
         order_obj = self.pool.get('pos.order')
         obj_partner = self.pool.get('res.partner')
-        if context is None:
-            context = {}
         active_id = context and context.get('active_id', False)
+
         order = order_obj.browse(cr, uid, active_id, context=context)
         amount = order.amount_total - order.amount_paid
-        data =  self.read(cr, uid, ids, context=context)[0]
-        for m2o_field in ['product_id','pricelist_id','partner_id']:
-            data[m2o_field] = data.get(m2o_field, False) and data[m2o_field][0] or False
-        if data['is_acc']:
-            amount = self.pool.get('product.product').browse(cr, uid, data['product_id'], context=context).list_price
+        data = self.read(cr, uid, ids, context=context)[0]
+        # this is probably a problem of osv_memory as it's not compatible with normal OSV's
+        #data['journal'] = data['journal'][0]
 
         if amount != 0.0:
-            order_obj.write(cr, uid, [active_id], {'invoice_wanted': data['invoice_wanted'], 'partner_id': data['partner_id']}, context=context)
             order_obj.add_payment(cr, uid, active_id, data, context=context)
 
         if order_obj.test_paid(cr, uid, [active_id]):
-            if data['partner_id'] and data['invoice_wanted']:
-                partner = obj_partner.browse(cr, uid, data['partner_id'], context=context)
-                if not partner.address:
-                    raise osv.except_osv(_('Error!'),_("Customer doesn't have an address to make the invoice"))
-                order_obj.action_invoice(cr, uid, [active_id], context=context)
-                order_obj.create_picking(cr, uid, [active_id], context=context)
-                if context.get('return', False):
-                    order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context)
-                else:
-                    order_obj.write(cr, uid, [active_id],{'state':'paid'}, context=context)
-                return self.create_invoice(cr, uid, ids, context=context)
-            else:
-                context.update({'flag': True})
-                order_obj.action_paid(cr, uid, [active_id], context=context)
-                if context.get('return', False):
-                    order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context)
-                else:
-                    order_obj.write(cr, uid, [active_id], {'state':'paid'}, context=context)
-                return self.print_report(cr, uid, ids, context=context)
+            order_obj.action_paid(cr, uid, [active_id], context=context)
+            return self.print_report(cr, uid, ids, context=context)
 
-        context.update({'flag': True})
-        # Todo need to check
-        order_obj.action_paid(cr, uid, [active_id], context=context)
-        order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context)
-        return self.print_report(cr, uid, ids, context=context)
+        return self.launch_payment(cr, uid, ids, context=context)
 
-
-    def create_invoice(self, cr, uid, ids, context=None):
-        """
-          Create  a invoice
-        """
-        if context is None:
-            context = {}
-        active_ids = [context and context.get('active_id', False)]
-        datas = {'ids': active_ids}
+    def launch_payment(self, cr, uid, ids, context=None):
         return {
-            'type' : 'ir.actions.report.xml',
-            'report_name':'pos.invoice',
-            'datas' : datas,
+            'name': _('Paiement'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.make.payment',
+            'view_id': False,
+            'target': 'new',
+            'views': False,
+            'type': 'ir.actions.act_window',
         }
 
     def print_report(self, cr, uid, ids, context=None):
-        """
-         @summary: To get the date and print the report
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param context: A standard dictionary
-         @return : retrun report
-        """
-        if context is None:
-            context = {}
         active_id = context.get('active_id', [])
         datas = {'ids' : [active_id]}
         return {
@@ -219,19 +75,31 @@ class pos_make_payment(osv.osv_memory):
             'datas': datas,
         }
 
+    def _default_journal(self, cr, uid, context=None):
+        res = pos_box_entries.get_journal(self, cr, uid, context=context)
+        return len(res)>1 and res[1][0] or False
+
+    def _default_amount(self, cr, uid, context=None):
+        order_obj = self.pool.get('pos.order')
+        active_id = context and context.get('active_id', False)
+        if active_id:
+            order = order_obj.browse(cr, uid, active_id, context=context)
+            return order.amount_total - order.amount_paid
+        return False
+
     _columns = {
-        'journal': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True),
-        'product_id': fields.many2one('product.product', "Advance"),
+        'journal': fields.selection(pos_box_entries.get_journal, "Payment Mode", required=True),
         'amount': fields.float('Amount', digits=(16,2), required= True),
-        'payment_name': fields.char('Payment name', size=32, required=True),
-        'payment_date': fields.date('Payment date', required=True),
-        'is_acc': fields.boolean('Advance'),
-        'invoice_wanted': fields.boolean('Invoice'),
-        'num_sale': fields.char('Num.File', size=32),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
-        'partner_id': fields.many2one('res.partner', 'Customer'),
+        'payment_name': fields.char('Payment Reference', size=32),
+        'payment_date': fields.date('Payment Date', required=True),
+    }
+    _defaults = {
+        'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'amount': _default_amount,
+        'journal': _default_journal
     }
 
 pos_make_payment()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index a6757be6b78..212c0d8c412 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -2,57 +2,37 @@
 <openerp>
     <data>
 
-        <!--  Select an Open Sale Order -->
-
-		<record id="view_pos_payment" model="ir.ui.view">
+        <record id="view_pos_payment" model="ir.ui.view">
             <field name="name">Add payment :</field>
             <field name="model">pos.make.payment</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Add payment :">
-				<group colspan="6" col="6" >
-					<group colspan="3" >
-						<separator string="The cash register must be opened to be able to execute a payment."  />
-					</group>
-					<newline/>
-					<group colspan="6">
-						<field name="journal"/>
-						<field name="payment_date"/>
-						<field name="num_sale" />
-						<field name="amount" />
-						<!--field name="payment_name" /-->
-						<field name="invoice_wanted" />
-						<field name="is_acc" />
-					</group>
-					<group attrs="{'invisible':[('is_acc','=',False)]}" colspan="3" >
-						<field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]" on_change="onchange_product_id(product_id, amount)"/>
-					</group>
-					<newline/>
-					<group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="3">
-						<field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
-						<field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
-					</group>
-					<separator colspan="6"/>
-					<group colspan="3"/>
-					<group colspan="3">
-						<group colspan="2"/>
-						<group  colspan="2">
-							<button icon="gtk-stop" special="cancel" string="Cancel"/>
-							<button name="check" string="Make Payment" colspan="1" type="object" icon="terp-dolar"/>
-						</group>
-					</group>
-				</group>
-			</form>
+            <form string="Add payment :">
+                <group colspan="4" col="4" >
+                    <group colspan="4">
+                        <field name="journal"/>
+                        <field name="amount" />
+                        <field name="payment_name" groups="base.group_extended"/>
+                    </group>
+                    <newline/>
+                    <separator colspan="4"/>
+                    <group colspan="2"/>
+                    <group colspan="2">
+                        <button icon="gtk-stop" special="cancel" string="Cancel"/>
+                        <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
         <record id="action_pos_payment" model="ir.actions.act_window">
-            <field name="name">Add payment</field>
+            <field name="name">Payment</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.make.payment</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-	</data>
+    </data>
 </openerp>
 
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
index e498eef6697..f97391c7f7d 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_date.py
@@ -55,7 +55,7 @@ class pos_payment_report_date(osv.osv_memory):
     _columns = {
         'date_start': fields.date('Start Date', required=True),
         'date_end': fields.date('End Date', required=True),
-        'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
+        'user_id': fields.many2many('res.users', 'res_user_sale_date', 'user_id', 'sale_id', 'Salesman')
     }
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
index 748e606f422..7c74ae1d9be 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="pos_payment_report_date_form" model="ir.ui.view">
-			<field name="name">pos.payment.report.date.form</field>
-		    <field name="model">pos.payment.report.date</field>
-		    <field name="type">form</field>
-		    <field name="arch" type="xml">
-		    <form string="Sale by Date and User">
-			     <group col="4" colspan="4">
-			        <separator string="Dates" colspan="4"/>
-					<field name="date_start"/>
-	                <field name="date_end"/>
-	                <separator string="User" colspan="4"/>
-	                <field name="user_id" nolabel="1" colspan="4"/>
-	                <separator string="" colspan="4"/>
+    <data>
+        <record id="pos_payment_report_date_form" model="ir.ui.view">
+            <field name="name">pos.payment.report.date.form</field>
+            <field name="model">pos.payment.report.date</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Sale by Date and User">
+                 <group col="4" colspan="4">
+                    <separator string="Dates" colspan="4"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <separator string="User" colspan="4"/>
+                    <field name="user_id" nolabel="1" colspan="4"/>
+                    <separator string="" colspan="4"/>
                     <label string="" colspan="2"/>
-	                <group colspan="2" col="2">
-						<button icon='gtk-cancel' special="cancel"
-						        string="Close" />
-						<button name="print_report" string="Print Report"
-						        colspan="1" type="object" icon="gtk-print" />
-		            </group>
-			     </group>            
-		    </form>
-		    </field>
-		</record>
+                    <group colspan="2" col="2">
+                        <button icon='gtk-cancel' special="cancel"
+                                string="Close" />
+                        <button name="print_report" string="Print Report"
+                                colspan="1" type="object" icon="gtk-print" />
+                    </group>
+                 </group>            
+            </form>
+            </field>
+        </record>
 
         <record id="action_report_pos_payment_repport_date" model="ir.actions.act_window">
-            <field name="name">Sales lines Report</field>
+            <field name="name">Sales by Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.payment.report.date</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-		</data>
+        </data>
 </openerp>              
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
index 02db921618b..05d06f4df29 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -51,3 +51,5 @@ class pos_payment_report_user(osv.osv_memory):
 
 pos_payment_report_user()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index 71efee85b7c..f4feee85504 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -56,3 +56,5 @@ class pos_receipt(osv.osv_memory):
         }
 
 pos_receipt()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 24af966cb1c..a7678cc4965 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -24,19 +24,6 @@ from osv import osv,fields
 from tools.translate import _
 import time
 
-class pos_return_memory(osv.osv_memory):
-    _name = "pos.return.memory"
-    _rec_name = 'product_id'
-    _columns = {
-        'product_id' : fields.many2one('product.product', string="Product", required=True),
-        'quantity' : fields.float("Quantity", required=True),
-        'pos_moves_id' : fields.many2one('pos.return', string="Move"),
-        'line_id': fields.integer('Line Id'),
-    }
-    
-pos_return_memory()
-
-
 class pos_return(osv.osv_memory):
     _name = 'pos.return'
     _description = 'Point of sale return'
@@ -290,7 +277,6 @@ class add_product(osv.osv_memory):
             res=cr.fetchone()
             location_id=res and res[0] or None
 
-            order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
             if order_id.invoice_id:
                 invoice_obj.refund(cr, uid, [order_id.invoice_id.id], time.strftime('%Y-%m-%d'), False, order_id.name)
             new_picking=picking_obj.create(cr, uid, {
@@ -305,7 +291,6 @@ class add_product(osv.osv_memory):
                     if data.has_key(key):
                         qty = data[key]
                         lines_obj.write(cr,uid,[line.id], {
-                                'qty_rfd':(line.qty or 0.0) + data[key],
                                 'qty':line.qty-(data[key] or 0.0)
                         })
                     else:
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index 7509b55b5d8..d89eb8f8745 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,15 +7,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines">
-                    <label string=" Enter the quantities which you want to return." colspan="4"/>
-                    <separator colspan="4"/>
-                    <field name="pos_moves_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" >
-                    </field>
-                    <newline/>
-                    <separator colspan="4"/>
                     <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                    <button icon='gtk-ok' name= "create_returns" string="Return With Exchange" type="object"/>
-                    <button icon='gtk-ok' name="create_returns2" string="Refund Without Exchange" type="object"/>
+                    <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object"/>
                  </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_sale_user_today.xml b/addons/point_of_sale/wizard/pos_sale_user_today.xml
deleted file mode 100644
index 78f01a4650f..00000000000
--- a/addons/point_of_sale/wizard/pos_sale_user_today.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-        <!--   pos.details -->
-        
-		<record id="view_pos_sales_user_today" model="ir.ui.view">
-            <field name="name">Sales User Today</field>
-            <field name="model">pos.sales.user.today</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales User Today">
-				    <group col="2" colspan="4">
-				    	<field name="user_id"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
-                </form>
-            </field>
-        </record>
-        <record id="action_pos_sales_user_today" model="ir.actions.act_window">
-            <field name="name">Sale by Users</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.sales.user.today</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-       
-	</data>
-</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.xml b/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
deleted file mode 100644
index e51ecfee760..00000000000
--- a/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-        <!--   Sales for Current User -->
-        
-		<record id="view_pos_sales_user_today_current_user" model="ir.ui.view">
-            <field name="name">Sales for Current User</field>
-            <field name="model">pos.sales.user.today.current_user</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales for Current User">
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="action_report_pos_sales_user_today_current_user" model="ir.actions.act_window">
-            <field name="name">Sales for Current User</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.sales.user.today.current_user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        
-	</data>
-</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_scan_product.py b/addons/point_of_sale/wizard/pos_scan_product.py
deleted file mode 100644
index 8e1e4aace86..00000000000
--- a/addons/point_of_sale/wizard/pos_scan_product.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import osv,fields
-
-
-class pos_scan_product(osv.osv_memory):
-    _name = 'pos.scan.product'
-    _description = 'Scan product'
-    
-    _columns = {
-        'gencod': fields.char('Barcode', size=13, required=True)
-    }
-    
-    def scan(self, cr, uid, ids, context=None):
-        """ 
-         To get the gencod and scan product         
-         @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 : retrun gencod
-        """
-        if context is None:
-            context = {}
-        data=self.read(cr, uid, ids)[0]
-        record_id = context and context.get('active_id', False)
-        self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
-        return {'gencod': False}
-
-pos_scan_product()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_scan_product_view.xml b/addons/point_of_sale/wizard/pos_scan_product_view.xml
deleted file mode 100644
index 3957c6c0415..00000000000
--- a/addons/point_of_sale/wizard/pos_scan_product_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-		<record id="view_pos_scan_product" model="ir.ui.view">
-            <field name="name">Scan product</field>
-            <field name="model">pos.scan.product</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Scan product">
-				    <group col="2" colspan="4">
-				    	<label string="Scan Barcode" colspan="4"/>
-						<field name="gencod" colspan="4" nolabel="1"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="scan" string="Add"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="action_pos_scan_product" model="ir.actions.act_window">
-            <field name="name">Scan product</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.scan.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            
-        </record>
-        
-	</data>
-</openerp>	        
\ No newline at end of file
diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 89397d2eab5..b35d11bac45 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -24,3 +24,5 @@ import wizard
 import res_user
 import ir_ui_menu
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 6bb69cd91c9..1b3be74c79f 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -24,7 +24,7 @@
     'version' : "1.0",
     'depends' : ["base", "share"],
     'author' : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module defines 'portals' to customize the access to your OpenERP database
 for external users.
diff --git a/addons/portal/i18n/ar.po b/addons/portal/i18n/ar.po
index f9a2bed5e9a..56e8e4a0880 100644
--- a/addons/portal/i18n/ar.po
+++ b/addons/portal/i18n/ar.po
@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-07-04 14:16+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-11-04 13:45+0000\n"
+"Last-Translator: Ahmad Khayyat <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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
 #, python-format
 msgid "Please select at least one user to share with"
-msgstr ""
+msgstr "اختر مستخدم واحد على الأقل للمشاركة"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:59
 #, python-format
 msgid "Please select at least one group to share with"
-msgstr ""
+msgstr "اختر مجموعة واحدة على الأقل للمشاركة"
 
 #. module: portal
 #: field:res.portal,group_id:0
@@ -48,12 +48,12 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
 msgid "Portal User Config"
-msgstr ""
+msgstr "إعدادات مستخدم البوابة"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal User"
-msgstr ""
+msgstr "مستخدم البوابة"
 
 #. module: portal
 #: help:res.portal,override_menu:0
@@ -68,7 +68,7 @@ msgstr ""
 #. module: portal
 #: view:res.portal:0
 msgid "Other Groups assigned to Users"
-msgstr ""
+msgstr "مجموعات أخري مخصصة للمستخدمين"
 
 #. module: portal
 #: constraint:res.users:0
@@ -103,17 +103,17 @@ msgstr ""
 #. module: portal
 #: view:share.wizard:0
 msgid "Who do you want to share with?"
-msgstr ""
+msgstr "من تودّ أن تشارك؟"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "أرسل دعوات"
 
 #. module: portal
 #: help:res.portal,url:0
 msgid "The url where portal users can connect to the server"
-msgstr ""
+msgstr "عنوان البوابة الإلكتروني (URL) للمستخدمين"
 
 #. module: portal
 #: field:res.portal.widget,widget_id:0
@@ -133,17 +133,17 @@ msgstr ""
 #. module: portal
 #: field:res.portal,parent_menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "القائمة الأم"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Name"
-msgstr ""
+msgstr "اسم البوابة"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal Users"
-msgstr ""
+msgstr "مستخدمو البوابة"
 
 #. module: portal
 #: field:res.portal,override_menu:0
@@ -172,13 +172,13 @@ msgstr ""
 #: field:res.portal.widget,portal_id:0
 #: field:res.portal.wizard,portal_id:0
 msgid "Portal"
-msgstr ""
+msgstr "البوابة الإلكترونية"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:35
 #, python-format
 msgid "Your OpenERP account at %(company)s"
-msgstr ""
+msgstr "حساب OpenERP الخاص بك لدى %(company)s"
 
 #. module: portal
 #: code:addons/portal/portal.py:110
@@ -190,7 +190,7 @@ msgstr ""
 #. module: portal
 #: help:res.portal.wizard,portal_id:0
 msgid "The portal in which new users must be added"
-msgstr ""
+msgstr "البوابة الإلكترونية التي يجب إضافة المستخدمين الجدد إليها"
 
 #. module: portal
 #: help:res.portal,widget_ids:0
@@ -207,7 +207,7 @@ msgstr ""
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "المستخدمون الحاليّون"
 
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
@@ -229,7 +229,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "العنوان الإلكتروني (URL)"
 
 #. module: portal
 #: view:res.portal:0
@@ -239,7 +239,7 @@ msgstr ""
 #. module: portal
 #: help:res.portal.wizard.user,lang:0
 msgid "The language for the user's user interface"
-msgstr ""
+msgstr "لغة واجهة المستخدم للمستخدم الحالي"
 
 #. module: portal
 #: view:res.portal.wizard:0
@@ -254,7 +254,7 @@ msgstr ""
 #. module: portal
 #: view:res.portal:0
 msgid "Create Parent Menu"
-msgstr ""
+msgstr "أنشئ القائمة الأم"
 
 #. module: portal
 #: view:res.portal.wizard:0
@@ -266,7 +266,7 @@ msgstr ""
 #: code:addons/portal/wizard/portal_wizard.py:135
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "لا بدّ من ذكر عنوان بريد إلكتروني"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
@@ -284,6 +284,8 @@ msgstr ""
 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
@@ -305,7 +307,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal,other_group_ids:0
 msgid "Other User Groups"
-msgstr ""
+msgstr "مجموعات المستخدم الأخرى"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.portal_list_action
@@ -313,7 +315,7 @@ msgstr ""
 #: model:ir.ui.menu,name:portal.portal_menu
 #: view:res.portal:0
 msgid "Portals"
-msgstr ""
+msgstr "البوابات الإلكترونية"
 
 #. module: portal
 #: help:res.portal,parent_menu_id:0
@@ -328,23 +330,23 @@ msgstr ""
 #. module: portal
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "الشريك المرتبط"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Menu"
-msgstr ""
+msgstr "قائمة البوابة الإلكترونية"
 
 #. module: portal
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "لا يمكن ان يكون هناك مستخدمين بنفس اسم الدخول!"
 
 #. module: portal
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,message:0
 msgid "Invitation message"
-msgstr ""
+msgstr "رسالة الدعوة"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:36
@@ -374,7 +376,7 @@ msgstr ""
 #. module: portal
 #: help:res.portal.wizard.user,name:0
 msgid "The user's real name"
-msgstr ""
+msgstr "الاسم الحقيقي للمستخدم"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.address_wizard_action
@@ -402,4 +404,4 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_share_wizard
 msgid "Share Wizard"
-msgstr ""
+msgstr "معالج المشاركة"
diff --git a/addons/portal/i18n/bg.po b/addons/portal/i18n/bg.po
index 768a3665a17..5a41a942eab 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/bs.po b/addons/portal/i18n/bs.po
index 8f28bfa5eb2..13ab4e3efa4 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/ca.po b/addons/portal/i18n/ca.po
index bd8d3d72ec8..71faf20e85f 100644
--- a/addons/portal/i18n/ca.po
+++ b/addons/portal/i18n/ca.po
@@ -8,78 +8,81 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-07-04 14:16+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 22:26+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
 #, python-format
 msgid "Please select at least one user to share with"
-msgstr ""
+msgstr "Si us plau, seleccioneu almenys un usuari per compartir amb"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:59
 #, python-format
 msgid "Please select at least one group to share with"
-msgstr ""
+msgstr "Si us plau, seleccioneu almenys un grup per compartir amb"
 
 #. module: portal
 #: field:res.portal,group_id:0
 msgid "Group"
-msgstr ""
+msgstr "Agrupa"
 
 #. module: portal
 #: help:res.portal,other_group_ids:0
 msgid "Those groups are assigned to the portal's users"
-msgstr ""
+msgstr "Aquests grups s'assignen als usuaris del portal"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Grups actuals"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
 msgid "Portal User Config"
-msgstr ""
+msgstr "Portal de configuració d'usuari"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal User"
-msgstr ""
+msgstr "Portal d'usuari"
 
 #. module: portal
 #: help:res.portal,override_menu:0
 msgid "Enable this option to override the Menu Action of portal users"
 msgstr ""
+"Activeu aquesta opció per anul·lar l'acció de menú dels usuaris del portal"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
 msgid "E-mail"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Other Groups assigned to Users"
-msgstr ""
+msgstr "Altres grups assignats als usuaris"
 
 #. module: portal
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La companyia seleccionada no està en les companyies permeses per aquest "
+"usuari"
 
 #. module: portal
 #: view:res.portal:0
 #: field:res.portal,widget_ids:0
 msgid "Widgets"
-msgstr ""
+msgstr "Widgets"
 
 #. module: portal
 #: model:ir.module.module,description:portal.module_meta_information
@@ -99,36 +102,53 @@ msgid ""
 "module 'share'.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul defineix 'portals' per personalitzar l'accés a la seva base de "
+"dades d'OpenERP\n"
+"per als usuaris externs.\n"
+"\n"
+"Un portal defineix el menú d'usuari personalitzat i drets d'accés per a un "
+"grup d'usuaris\n"
+"(Els associats a aquest portal). També els grups d'usuaris associats a la\n"
+"els usuaris del portal (l'addició d'un grup al portal l'afegeix "
+"automàticament al portal\n"
+"els usuaris, etc.) Aquesta característica és molt útil quan s'utilitza en "
+"combinació amb el\n"
+"'share' del mòdul.\n"
+"    "
 
 #. module: portal
 #: view:share.wizard:0
 msgid "Who do you want to share with?"
-msgstr ""
+msgstr "Amb qui vols compartir?"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "Envia invitacions"
 
 #. module: portal
 #: help:res.portal,url:0
 msgid "The url where portal users can connect to the server"
-msgstr ""
+msgstr "La URL on els usuaris del portal poden connectar amb el servidor"
 
 #. module: portal
 #: field:res.portal.widget,widget_id:0
 msgid "Widget"
-msgstr ""
+msgstr "Widget"
 
 #. module: portal
 #: help:res.portal.wizard,message:0
 msgid "This text is included in the welcome email sent to the users"
 msgstr ""
+"Aquest text està inclòs en el correu electrònic de benvinguda enviat als "
+"usuaris"
 
 #. module: portal
 #: help:res.portal,menu_action_id:0
 msgid "If set, replaces the standard menu for the portal's users"
 msgstr ""
+"Si s'estableix, substitueix el menú estàndard per als usuaris del portal"
 
 #. module: portal
 #: field:res.portal,parent_menu_id:0
@@ -143,27 +163,27 @@ msgstr "Nom portal"
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal Users"
-msgstr ""
+msgstr "Usuaris del portal"
 
 #. module: portal
 #: field:res.portal,override_menu:0
 msgid "Override Menu Action of Users"
-msgstr ""
+msgstr "Anul·lar l'acció del menú d'Usuaris"
 
 #. module: portal
 #: field:res.portal,menu_action_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Acció de menú"
 
 #. module: portal
 #: field:res.portal.wizard.user,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Nom d'usuari"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_widget
 msgid "Portal Widgets"
-msgstr ""
+msgstr "Portal Widgets"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal
@@ -178,41 +198,41 @@ msgstr "Portal"
 #: code:addons/portal/wizard/portal_wizard.py:35
 #, python-format
 msgid "Your OpenERP account at %(company)s"
-msgstr ""
+msgstr "El seu compte de OpenERP en %(company)s"
 
 #. module: portal
 #: code:addons/portal/portal.py:110
 #: code:addons/portal/portal.py:184
 #, python-format
 msgid "%s Menu"
-msgstr ""
+msgstr "Menú %s"
 
 #. module: portal
 #: help:res.portal.wizard,portal_id:0
 msgid "The portal in which new users must be added"
-msgstr ""
+msgstr "El portal en què els nous usuaris cal afegir"
 
 #. module: portal
 #: help:res.portal,widget_ids:0
 msgid "Widgets assigned to portal users"
-msgstr ""
+msgstr "Widgets assignats als usuaris del portal"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:163
 #, python-format
 msgid "(missing url)"
-msgstr ""
+msgstr "(Falta URL)"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "Usuaris existents"
 
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Assistent"
 
 #. module: portal
 #: help:res.portal.wizard.user,user_email:0
@@ -220,26 +240,28 @@ msgid ""
 "Will be used as user login.  Also necessary to send the account information "
 "to new users"
 msgstr ""
+"S'utilitzarà com a connexió de l'usuari. També és necessari enviar la "
+"informació del compte als nous usuaris"
 
 #. module: portal
 #: field:res.portal.wizard.user,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Llengua"
 
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "Adreça URL"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Widgets assigned to Users"
-msgstr ""
+msgstr "Widgets assignats als usuaris"
 
 #. module: portal
 #: help:res.portal.wizard.user,lang:0
 msgid "The language for the user's user interface"
-msgstr ""
+msgstr "L'idioma de la interfície d'usuari de l'usuari"
 
 #. module: portal
 #: view:res.portal.wizard:0
@@ -249,34 +271,36 @@ msgstr "Canceŀla"
 #. module: portal
 #: view:res.portal:0
 msgid "Website"
-msgstr ""
+msgstr "Pàgina web"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Create Parent Menu"
-msgstr ""
+msgstr "Crea menú pare"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid ""
 "The following text will be included in the welcome email sent to users."
 msgstr ""
+"El següent text s'inclourà en el correu electrònic de benvinguda enviat als "
+"usuaris."
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:135
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "Correu electrònic requerit"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuaris"
 
 #. module: portal
 #: constraint:res.portal.wizard.user:0
 msgid "Invalid email address"
-msgstr ""
+msgstr "L'adreça de correu no és vàlida"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:136
@@ -284,28 +308,30 @@ msgstr ""
 msgid ""
 "You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Heu de tenir una adreça de correu electrònic a les preferències de l'usuari "
+"per enviar missatges."
 
 #. module: portal
 #: model:ir.model,name:portal.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menú"
 
 #. module: portal
 #: help:res.portal,group_id:0
 msgid "The group extended by this portal"
-msgstr ""
+msgstr "El grup ampliat per aquest portal"
 
 #. module: portal
 #: view:res.portal:0
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Usuaris/es"
 
 #. module: portal
 #: field:res.portal,other_group_ids:0
 msgid "Other User Groups"
-msgstr ""
+msgstr "Altres grups d'usuaris"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.portal_list_action
@@ -318,33 +344,33 @@ msgstr "Portals"
 #. module: portal
 #: help:res.portal,parent_menu_id:0
 msgid "The menu action opens the submenus of this menu item"
-msgstr ""
+msgstr "L'acció s'obre el menú dels submenús d'aquest element de menú"
 
 #. module: portal
 #: field:res.portal.widget,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: portal
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "empresa relacionada"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Menu"
-msgstr ""
+msgstr "Menú del portal"
 
 #. module: portal
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "No podeu tenir dos usuaris amb el mateix identificador!"
 
 #. module: portal
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,message:0
 msgid "Invitation message"
-msgstr ""
+msgstr "Missatge d'invitació"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:36
@@ -365,28 +391,42 @@ msgid ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 msgstr ""
+"Benvolgut %(name)s,\n"
+"\n"
+"Se li ha creat un compte OpenERP en %(url)s.\n"
+"\n"
+"Dades del seu compte d'inici de sessió és la següent:\n"
+"Base de dades: %(db)s\n"
+"Usuari: %(login)s\n"
+"Contrasenya: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard
 msgid "Portal Wizard"
-msgstr ""
+msgstr "Assistent portal"
 
 #. module: portal
 #: help:res.portal.wizard.user,name:0
 msgid "The user's real name"
-msgstr ""
+msgstr "Nom real de l'usuari"
 
 #. 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 ""
+msgstr "Afegeix accés al portal"
 
 #. module: portal
 #: field:res.portal.wizard.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: portal
 #: model:ir.actions.act_window,help:portal.portal_list_action
@@ -398,8 +438,15 @@ msgid ""
 "the portal's users.\n"
 "            "
 msgstr ""
+"\n"
+"Un portal ajuda a la definició de punts de vista i normes específiques per a "
+"un grup d'usuaris (el\n"
+"portal del grup). Un menú del portal, widgets i grups específics poden ser "
+"assignats a\n"
+"el portal dels usuaris.\n"
+"            "
 
 #. module: portal
 #: model:ir.model,name:portal.model_share_wizard
 msgid "Share Wizard"
-msgstr ""
+msgstr "Assistent de compartició"
diff --git a/addons/portal/i18n/cs.po b/addons/portal/i18n/cs.po
index 39d91ff4e53..3be439be9b6 100644
--- a/addons/portal/i18n/cs.po
+++ b/addons/portal/i18n/cs.po
@@ -8,78 +8,80 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-07-04 14:16+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech <cs@li.org>\n"
+"PO-Revision-Date: 2011-11-25 13:27+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:50+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
 #, python-format
 msgid "Please select at least one user to share with"
-msgstr ""
+msgstr "Prosíme vyberte nejméně jednoho uživatele, s kterým chcete sdílet"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:59
 #, python-format
 msgid "Please select at least one group to share with"
-msgstr ""
+msgstr "Prosíme vyberte nejméně jednu skupinu, s kterou chcete sdílet"
 
 #. module: portal
 #: field:res.portal,group_id:0
 msgid "Group"
-msgstr ""
+msgstr "Skupina"
 
 #. module: portal
 #: help:res.portal,other_group_ids:0
 msgid "Those groups are assigned to the portal's users"
-msgstr ""
+msgstr "Tyto skupiny jsou přiřazeny k uživatelům portálu"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Existující skupiny"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
 msgid "Portal User Config"
-msgstr ""
+msgstr "Nastavení uživatele portálu"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal User"
-msgstr ""
+msgstr "Uživatel portálu"
 
 #. module: portal
 #: help:res.portal,override_menu:0
 msgid "Enable this option to override the Menu Action of portal users"
-msgstr ""
+msgstr "Povolte tuto volbu k přepsání Akcí nabídky uživatelů portálu"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Other Groups assigned to Users"
-msgstr ""
+msgstr "Jiné skupiny přiřazené uživatelům"
 
 #. module: portal
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Vybraná společnost není v povolených společnostech pro tohoto uživatele"
 
 #. module: portal
 #: view:res.portal:0
 #: field:res.portal,widget_ids:0
 msgid "Widgets"
-msgstr ""
+msgstr "Udělátka"
 
 #. module: portal
 #: model:ir.module.module,description:portal.module_meta_information
@@ -99,71 +101,85 @@ msgid ""
 "module 'share'.\n"
 "    "
 msgstr ""
+"\n"
+"Tento modul určuje 'portály' k přizpůsobení přístupu k vaší databázi "
+"OpenERP\n"
+"pro vnější uživatele.\n"
+"\n"
+"Portál určuje přizpůsobení nabídky uživatele a jeho přístupových práv pro "
+"skupinu uživatelů\n"
+"(těch přiřazených k portálu).  Také přidružuje uživatelské skupiny k\n"
+"uživatelům portálu (přidáním skupiny v portálu automaticky je přidáte k "
+"uživatelům\n"
+"portálu, atd.).  Tato funkce je velmi užitečný v kombinaci s\n"
+"modulem 'sdílení'.\n"
+"    "
 
 #. module: portal
 #: view:share.wizard:0
 msgid "Who do you want to share with?"
-msgstr ""
+msgstr "S kým chcete sdílet?"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "Poslat pozvání"
 
 #. module: portal
 #: help:res.portal,url:0
 msgid "The url where portal users can connect to the server"
-msgstr ""
+msgstr "URL, kde uživatelé portálu se mohou připojit k serveru"
 
 #. module: portal
 #: field:res.portal.widget,widget_id:0
 msgid "Widget"
-msgstr ""
+msgstr "Udělátko"
 
 #. module: portal
 #: help:res.portal.wizard,message:0
 msgid "This text is included in the welcome email sent to the users"
-msgstr ""
+msgstr "Tento text je zahrnut v uvítacím emailu zaslatném uživatelům"
 
 #. module: portal
 #: help:res.portal,menu_action_id:0
 msgid "If set, replaces the standard menu for the portal's users"
 msgstr ""
+"Pokud je nastaveno, nahrazuje standardní nabídku pro uživatele portálu"
 
 #. module: portal
 #: field:res.portal,parent_menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Nadřazené menu"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Name"
-msgstr ""
+msgstr "Jméno portálu"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal Users"
-msgstr ""
+msgstr "Uživatelé portálu"
 
 #. module: portal
 #: field:res.portal,override_menu:0
 msgid "Override Menu Action of Users"
-msgstr ""
+msgstr "Přepsat Akce nabídky pro uživatele"
 
 #. module: portal
 #: field:res.portal,menu_action_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Akce nabídky"
 
 #. module: portal
 #: field:res.portal.wizard.user,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Uživatelské jméno"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_widget
 msgid "Portal Widgets"
-msgstr ""
+msgstr "Pomůcky portálu"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal
@@ -172,47 +188,47 @@ msgstr ""
 #: field:res.portal.widget,portal_id:0
 #: field:res.portal.wizard,portal_id:0
 msgid "Portal"
-msgstr ""
+msgstr "Portál"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:35
 #, python-format
 msgid "Your OpenERP account at %(company)s"
-msgstr ""
+msgstr "Váš účet OpenERP v %(company)s"
 
 #. module: portal
 #: code:addons/portal/portal.py:110
 #: code:addons/portal/portal.py:184
 #, python-format
 msgid "%s Menu"
-msgstr ""
+msgstr "%s Nabídka"
 
 #. module: portal
 #: help:res.portal.wizard,portal_id:0
 msgid "The portal in which new users must be added"
-msgstr ""
+msgstr "Portál, ve kterém musí být přidání noví uživatelé"
 
 #. module: portal
 #: help:res.portal,widget_ids:0
 msgid "Widgets assigned to portal users"
-msgstr ""
+msgstr "Pomůcky přiřazené k těmto uživatelům portálu"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:163
 #, python-format
 msgid "(missing url)"
-msgstr ""
+msgstr "(chybějící url)"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "Existující uživatelé"
 
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Průvodce"
 
 #. module: portal
 #: help:res.portal.wizard.user,user_email:0
@@ -220,63 +236,66 @@ msgid ""
 "Will be used as user login.  Also necessary to send the account information "
 "to new users"
 msgstr ""
+"Bude použito jako přihlašovací jméno uživatele. Také je zapotřebí zaslat "
+"informace účtu novým uživatelům"
 
 #. module: portal
 #: field:res.portal.wizard.user,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Jazyk"
 
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Widgets assigned to Users"
-msgstr ""
+msgstr "Pomůcky přiřazené uživatelům"
 
 #. module: portal
 #: help:res.portal.wizard.user,lang:0
 msgid "The language for the user's user interface"
-msgstr ""
+msgstr "Jazyk pro uživatelské rozhraní uživatelů"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Website"
-msgstr ""
+msgstr "Webová stránka"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Create Parent Menu"
-msgstr ""
+msgstr "Vytvořit nadřazenou nabídku"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid ""
 "The following text will be included in the welcome email sent to users."
 msgstr ""
+"Následující text bude zahrnut v uvítacím emailu zalsatném uživatelům."
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:135
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "Požadován email"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: portal
 #: constraint:res.portal.wizard.user:0
 msgid "Invalid email address"
-msgstr ""
+msgstr "Neplatná emailová adresa"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:136
@@ -284,28 +303,30 @@ msgstr ""
 msgid ""
 "You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Musíte mít emailovou adresu ve vašich uživatelských předvolbách pro zasílání "
+"emailů."
 
 #. module: portal
 #: model:ir.model,name:portal.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: portal
 #: help:res.portal,group_id:0
 msgid "The group extended by this portal"
-msgstr ""
+msgstr "Skupina rozšířená tímto portálem"
 
 #. module: portal
 #: view:res.portal:0
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
 
 #. module: portal
 #: field:res.portal,other_group_ids:0
 msgid "Other User Groups"
-msgstr ""
+msgstr "Jiné skupiny uživatelů"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.portal_list_action
@@ -313,38 +334,38 @@ msgstr ""
 #: model:ir.ui.menu,name:portal.portal_menu
 #: view:res.portal:0
 msgid "Portals"
-msgstr ""
+msgstr "Portály"
 
 #. module: portal
 #: help:res.portal,parent_menu_id:0
 msgid "The menu action opens the submenus of this menu item"
-msgstr ""
+msgstr "Akce nabídky otevírající podnabídku této položky nabídky"
 
 #. module: portal
 #: field:res.portal.widget,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Posloupnost"
 
 #. module: portal
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "Vztažený partner"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Menu"
-msgstr ""
+msgstr "Nabídka portálu"
 
 #. module: portal
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Nemůžete mít dva uživatele se stejným přihlašovacím jménem !"
 
 #. module: portal
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,message:0
 msgid "Invitation message"
-msgstr ""
+msgstr "Zpráva pozvánky"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:36
@@ -365,28 +386,42 @@ msgid ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 msgstr ""
+"Vážený %(name)s,\n"
+"\n"
+"Byl vám vytvořen OpenERP účet na %(url)s.\n"
+"\n"
+"Váše přihlašovací údaje účtu jsou:\n"
+"Databáze: %(db)s\n"
+"Uživatel:     %(login)s\n"
+"Heslo: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard
 msgid "Portal Wizard"
-msgstr ""
+msgstr "Průvodce portálu"
 
 #. module: portal
 #: help:res.portal.wizard.user,name:0
 msgid "The user's real name"
-msgstr ""
+msgstr "Skutečné jméno uživatele"
 
 #. 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 ""
+msgstr "Přidat přístup portálu"
 
 #. module: portal
 #: field:res.portal.wizard.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: portal
 #: model:ir.actions.act_window,help:portal.portal_list_action
@@ -398,8 +433,14 @@ msgid ""
 "the portal's users.\n"
 "            "
 msgstr ""
+"\n"
+"Portál pomáhá stanovit určité pohledy a pravidla pro skupiny uživatelů\n"
+"(skupinu protálu).  Nabídka portálu, pomůcky a určité skupiny mohou být "
+"přiřazeny k\n"
+"uživatelům portálu.\n"
+"            "
 
 #. module: portal
 #: model:ir.model,name:portal.model_share_wizard
 msgid "Share Wizard"
-msgstr ""
+msgstr "Průvodce sdílením"
diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po
index baa5dc72539..8fbe9e1e388 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/es.po b/addons/portal/i18n/es.po
index 0e91b778ea5..d73378f4150 100644
--- a/addons/portal/i18n/es.po
+++ b/addons/portal/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: 2011-07-04 14:16+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-09-17 23:24+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
@@ -32,7 +32,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal,group_id:0
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
 #. module: portal
 #: help:res.portal,other_group_ids:0
@@ -43,7 +43,7 @@ msgstr ""
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Grupos existentes"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
@@ -63,7 +63,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
 msgid "E-mail"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: portal
 #: view:res.portal:0
@@ -74,12 +74,14 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
 
 #. module: portal
 #: view:res.portal:0
 #: field:res.portal,widget_ids:0
 msgid "Widgets"
-msgstr ""
+msgstr "Widgets"
 
 #. module: portal
 #: model:ir.module.module,description:portal.module_meta_information
@@ -108,7 +110,7 @@ msgstr ""
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "Enviar invitaciones"
 
 #. module: portal
 #: help:res.portal,url:0
@@ -118,7 +120,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.widget,widget_id:0
 msgid "Widget"
-msgstr ""
+msgstr "Widget"
 
 #. module: portal
 #: help:res.portal.wizard,message:0
@@ -153,12 +155,12 @@ msgstr ""
 #. module: portal
 #: field:res.portal,menu_action_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Acción de menú"
 
 #. module: portal
 #: field:res.portal.wizard.user,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Nombre de usuario"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_widget
@@ -185,7 +187,7 @@ msgstr ""
 #: code:addons/portal/portal.py:184
 #, python-format
 msgid "%s Menu"
-msgstr ""
+msgstr "Menú de %s"
 
 #. module: portal
 #: help:res.portal.wizard,portal_id:0
@@ -207,12 +209,12 @@ msgstr ""
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "Usuarios existentes"
 
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Asistente"
 
 #. module: portal
 #: help:res.portal.wizard.user,user_email:0
@@ -224,12 +226,12 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: portal
 #: view:res.portal:0
@@ -249,7 +251,7 @@ msgstr "Cancelar"
 #. module: portal
 #: view:res.portal:0
 msgid "Website"
-msgstr ""
+msgstr "Sitio web"
 
 #. module: portal
 #: view:res.portal:0
@@ -266,17 +268,17 @@ msgstr ""
 #: code:addons/portal/wizard/portal_wizard.py:135
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "Correo electrónico requerido"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuarios"
 
 #. module: portal
 #: constraint:res.portal.wizard.user:0
 msgid "Invalid email address"
-msgstr ""
+msgstr "Dirección email invalida"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:136
@@ -288,7 +290,7 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: portal
 #: help:res.portal,group_id:0
@@ -300,7 +302,7 @@ msgstr ""
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #. module: portal
 #: field:res.portal,other_group_ids:0
@@ -323,7 +325,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.widget,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: portal
 #: field:res.users,partner_id:0
@@ -338,13 +340,13 @@ msgstr ""
 #. module: portal
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
 
 #. module: portal
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,message:0
 msgid "Invitation message"
-msgstr ""
+msgstr "Mensaje de invitación"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:36
@@ -386,7 +388,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: portal
 #: model:ir.actions.act_window,help:portal.portal_list_action
@@ -402,4 +404,4 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_share_wizard
 msgid "Share Wizard"
-msgstr ""
+msgstr "Asistente de compartición"
diff --git a/addons/portal/i18n/es_MX.po b/addons/portal/i18n/es_MX.po
new file mode 100644
index 00000000000..f4fca48ead1
--- /dev/null
+++ b/addons/portal/i18n/es_MX.po
@@ -0,0 +1,407 @@
+# Spanish 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-07-04 14:16+0000\n"
+"PO-Revision-Date: 2011-09-17 23:24+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-19 04:41+0000\n"
+"X-Generator: Launchpad (build 13955)\n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:59
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr "Grupo"
+
+#. module: portal
+#: help:res.portal,other_group_ids:0
+msgid "Those groups are assigned to the portal's users"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr "Grupos existentes"
+
+#. 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
+#: 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 "E-mail"
+msgstr "Correo electrónico"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Other Groups assigned to Users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr "Widgets"
+
+#. module: portal
+#: model:ir.module.module,description:portal.module_meta_information
+msgid ""
+"\n"
+"This module defines 'portals' to customize the access to your OpenERP "
+"database\n"
+"for external users.\n"
+"\n"
+"A portal defines customized user menu and access rights for a group of "
+"users\n"
+"(the ones associated to that portal).  It also associates user groups to "
+"the\n"
+"portal users (adding a group in the portal automatically adds it to the "
+"portal\n"
+"users, etc).  That feature is very handy when used in combination with the\n"
+"module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Who do you want to share with?"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr "Enviar invitaciones"
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr "Widget"
+
+#. 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,parent_menu_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr "Nombre portal"
+
+#. 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 "Acción de menú"
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+#. 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.module,shortdesc:portal.module_meta_information
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr "Portal"
+
+#. 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:110
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr "Menú de %s"
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+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 "Usuarios existentes"
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. 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.wizard.user,lang:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr "URL"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets assigned to Users"
+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 "Cancelar"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr "Sitio web"
+
+#. 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 "Correo electrónico requerido"
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr "Dirección email invalida"
+
+#. 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 "ir.ui.menu"
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group extended by this portal"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: portal
+#: field:res.portal,other_group_ids:0
+msgid "Other User Groups"
+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 "Portales"
+
+#. 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 "Secuencia"
+
+#. 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 "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr "Mensaje de invitación"
+
+#. 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:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+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 "Empresa"
+
+#. 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 "Asistente de compartición"
diff --git a/addons/portal/i18n/es_VE.po b/addons/portal/i18n/es_VE.po
new file mode 100644
index 00000000000..f4fca48ead1
--- /dev/null
+++ b/addons/portal/i18n/es_VE.po
@@ -0,0 +1,407 @@
+# Spanish 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-07-04 14:16+0000\n"
+"PO-Revision-Date: 2011-09-17 23:24+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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-19 04:41+0000\n"
+"X-Generator: Launchpad (build 13955)\n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:59
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr "Grupo"
+
+#. module: portal
+#: help:res.portal,other_group_ids:0
+msgid "Those groups are assigned to the portal's users"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr "Grupos existentes"
+
+#. 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
+#: 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 "E-mail"
+msgstr "Correo electrónico"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Other Groups assigned to Users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr "Widgets"
+
+#. module: portal
+#: model:ir.module.module,description:portal.module_meta_information
+msgid ""
+"\n"
+"This module defines 'portals' to customize the access to your OpenERP "
+"database\n"
+"for external users.\n"
+"\n"
+"A portal defines customized user menu and access rights for a group of "
+"users\n"
+"(the ones associated to that portal).  It also associates user groups to "
+"the\n"
+"portal users (adding a group in the portal automatically adds it to the "
+"portal\n"
+"users, etc).  That feature is very handy when used in combination with the\n"
+"module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Who do you want to share with?"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr "Enviar invitaciones"
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr "Widget"
+
+#. 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,parent_menu_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr "Nombre portal"
+
+#. 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 "Acción de menú"
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+#. 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.module,shortdesc:portal.module_meta_information
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr "Portal"
+
+#. 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:110
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr "Menú de %s"
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+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 "Usuarios existentes"
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. 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.wizard.user,lang:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr "URL"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets assigned to Users"
+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 "Cancelar"
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr "Sitio web"
+
+#. 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 "Correo electrónico requerido"
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr "Dirección email invalida"
+
+#. 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 "ir.ui.menu"
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group extended by this portal"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: portal
+#: field:res.portal,other_group_ids:0
+msgid "Other User Groups"
+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 "Portales"
+
+#. 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 "Secuencia"
+
+#. 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 "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr "Mensaje de invitación"
+
+#. 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:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+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 "Empresa"
+
+#. 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 "Asistente de compartición"
diff --git a/addons/portal/i18n/et.po b/addons/portal/i18n/et.po
index c32d4aec230..41824c3ed1c 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/fi.po b/addons/portal/i18n/fi.po
index dfd1097c466..31c44509b96 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index d64b529ac56..4ba51b3d9be 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-07-04 14:16+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-09-26 12:28+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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
@@ -73,7 +73,7 @@ msgstr ""
 #. module: portal
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "La société choisie n'est pas autorisée pour cet utilisateur."
 
 #. module: portal
 #: view:res.portal:0
@@ -207,12 +207,12 @@ msgstr ""
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "Utilisateurs existants"
 
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Assistant"
 
 #. module: portal
 #: help:res.portal.wizard.user,user_email:0
@@ -224,12 +224,12 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Langue"
 
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: portal
 #: view:res.portal:0
@@ -249,7 +249,7 @@ msgstr "Annuler"
 #. module: portal
 #: view:res.portal:0
 msgid "Website"
-msgstr ""
+msgstr "Site web"
 
 #. module: portal
 #: view:res.portal:0
@@ -271,7 +271,7 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: portal
 #: constraint:res.portal.wizard.user:0
@@ -288,7 +288,7 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: portal
 #: help:res.portal,group_id:0
@@ -323,7 +323,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.widget,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
 
 #. module: portal
 #: field:res.users,partner_id:0
@@ -386,7 +386,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: portal
 #: model:ir.actions.act_window,help:portal.portal_list_action
diff --git a/addons/portal/i18n/hr.po b/addons/portal/i18n/hr.po
index d25d95171ac..737a6990153 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/hu.po b/addons/portal/i18n/hu.po
index 161885dabc1..94a05d71a30 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/id.po b/addons/portal/i18n/id.po
index 113140387a4..3eb9b26b75b 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/it.po b/addons/portal/i18n/it.po
index f2db7baa3f5..c74fe28664a 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/lt.po b/addons/portal/i18n/lt.po
index 347df2f98ec..5c8cb2d31df 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/nl.po b/addons/portal/i18n/nl.po
index f77953fa118..6c6fde8b34e 100644
--- a/addons/portal/i18n/nl.po
+++ b/addons/portal/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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/pl.po b/addons/portal/i18n/pl.po
index 88a7e5d10ce..b740c2c9c15 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/pt.po b/addons/portal/i18n/pt.po
index eb239c2b790..499f6c07a0a 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/pt_BR.po b/addons/portal/i18n/pt_BR.po
index 6fbe73060ab..7de00b8d68a 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/ro.po b/addons/portal/i18n/ro.po
index f93f1796039..ee31cd287ab 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/ru.po b/addons/portal/i18n/ru.po
index e301ba64e86..58ea572e3da 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/sl.po b/addons/portal/i18n/sl.po
index b7f2bcce4b0..e996f6b2470 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/sv.po b/addons/portal/i18n/sv.po
index c7148e73d36..13c18c6b339 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/tr.po b/addons/portal/i18n/tr.po
index d0b27bbc940..b64d3a452b1 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/uk.po b/addons/portal/i18n/uk.po
index 1f74a92ac37..8f83ec52772 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/zh_CN.po b/addons/portal/i18n/zh_CN.po
index aafe4499ed2..f420ee74856 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/i18n/zh_TW.po b/addons/portal/i18n/zh_TW.po
index de63d441d58..2ea5e8f808a 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: 2011-07-12 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
diff --git a/addons/portal/ir_ui_menu.py b/addons/portal/ir_ui_menu.py
index a4fe364a4fd..c8f59ca8bd1 100644
--- a/addons/portal/ir_ui_menu.py
+++ b/addons/portal/ir_ui_menu.py
@@ -56,3 +56,5 @@ class portal_menu(osv.osv):
 
 portal_menu()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 1c7f84c363a..de39944e69f 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -226,3 +226,5 @@ portal_widget()
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/res_user.py b/addons/portal/res_user.py
index 2f32a65b761..127c3079b29 100644
--- a/addons/portal/res_user.py
+++ b/addons/portal/res_user.py
@@ -32,3 +32,5 @@ class res_users(osv.osv):
 
 res_users()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/wizard/__init__.py b/addons/portal/wizard/__init__.py
index 90b71a62c30..9d52ae0db6d 100644
--- a/addons/portal/wizard/__init__.py
+++ b/addons/portal/wizard/__init__.py
@@ -22,3 +22,5 @@
 import portal_wizard
 import share_wizard
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index a18ecb2c33e..706d6fd4a7f 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -23,10 +23,10 @@ import logging
 import random
 
 from osv import osv, fields
-from tools.misc import email_re, email_send
+from tools.misc import email_re
 from tools.translate import _
 
-from base.res.res_user import _lang_get
+from base.res.res_users import _lang_get
 
 
 
@@ -163,6 +163,7 @@ class wizard(osv.osv_memory):
                 '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:
@@ -175,7 +176,7 @@ class wizard(osv.osv_memory):
                 email_to = dest_user.user_email
                 subject = _(WELCOME_EMAIL_SUBJECT) % data
                 body = _(WELCOME_EMAIL_BODY) % data
-                res = email_send(email_from, [email_to], subject, body)
+                res = mail_message_obj.schedule_with_attach(cr, uid, email_from , [email_to], subject, body, context=context)
                 if not res:
                     logging.getLogger('res.portal.wizard').warning(
                         'Failed to send email from %s to %s', email_from, email_to)
@@ -224,3 +225,5 @@ wizard_user()
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py
index c1366b5dbf0..b5c9d165cc6 100644
--- a/addons/portal/wizard/share_wizard.py
+++ b/addons/portal/wizard/share_wizard.py
@@ -40,10 +40,6 @@ class share_wizard_portal(osv.osv_memory):
     _columns = {
         'user_ids': fields.many2many('res.users', 'share_wizard_res_user_rel', 'share_id', 'user_id', 'Existing users', domain=[('share', '=', True)]),
         'group_ids': fields.many2many('res.groups', 'share_wizard_res_group_rel', 'share_id', 'group_id', 'Existing groups', domain=[('share', '=', False)]),
-
-        # no clean way to extend selection yet, copy the field. 
-        'user_type': fields.selection(_user_type_selection,'Users to share with',
-             help="Select the type of user(s) you would like to share data with."),
     }
 
     def is_portal_manager(self, cr, uid, context=None):
@@ -188,3 +184,5 @@ class share_wizard_portal(osv.osv_memory):
 
 share_wizard_portal()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/wizard/share_wizard_view.xml b/addons/portal/wizard/share_wizard_view.xml
index f16334b68a3..9bee027c3e2 100644
--- a/addons/portal/wizard/share_wizard_view.xml
+++ b/addons/portal/wizard/share_wizard_view.xml
@@ -8,11 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="share.share_step1_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group[@name='emails_group']" position="before">
-                    <group name="groups_group" colspan="4" col="4" groups="portal.group_portal_manager">
-	                    <separator colspan="4" string="Who do you want to share with?"/>
-	                    <field name="user_type" />
-                    </group>
+                <xpath expr="/form/group[@name='emails_group']" position="after">
                     <group name="user_group" colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
                         <field colspan="4" nolabel="1" name="user_ids" mode="tree">
                             <tree string="Existing users">
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 4af045ff6bb..e35ae2b06ae 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Enterprise Process',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module shows the basic processes involved in the selected modules and in the sequence they occur.
 ======================================================================================================
diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po
index 1328117d9c7..39c16e00f38 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a0bd5e18a4f..ffdf999f410 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d9b5f5812bf..4e0c6b22fd1 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dcd2cc86d33..fac8fde1e77 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 690200525c6..f74c19be940 100644
--- a/addons/process/i18n/cs.po
+++ b/addons/process/i18n/cs.po
@@ -1,10 +1,10 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* process
+# * process
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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-05-09 08:59+0000\n"
@@ -13,8 +13,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-10 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -29,6 +30,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
 msgstr ""
+"Pokud je pole aktivní nastaveno na Nepravda, umožní vám to skrýt procesy bez "
+"jejich odebrání."
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -95,7 +98,7 @@ msgstr "Uzel"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Workflow Trigger"
-msgstr "Spouštěč workflow"
+msgstr "Spouštěč pracovního toku"
 
 #. module: process
 #: field:process.transition,note:0
@@ -125,7 +128,7 @@ msgstr "Zdrojový uzel"
 #: view:process.transition:0
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr "Přechody workflow"
+msgstr "Přechody pracovního toku"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -231,6 +234,15 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Tento modul ukazuje základní procesy zapojené\n"
+"     ve vybraných modulech a posloupnosti, ve kterých\n"
+"     nastávají\n"
+"\n"
+"     Poznámka: Toto platí pro moduly obsahující modulename_process_xml\n"
+"     např.pro product/process/product_process_xml\n"
+"\n"
+"    "
 
 #. module: process
 #: field:process.condition,model_states:0
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index 47a06ac7fb5..4f250af7282 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -367,22 +367,3 @@ msgstr "Objekt Methode"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn dieses Feld aktiviert ist , kann ein Prozess ausgeblendet werden, ohne "
-#~ "ihn vollständig zu entfernen."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index 455f778c5e4..73f7e670653 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 13272ffcb1d..c1ea541dae7 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -366,21 +366,3 @@ msgstr "Método objeto"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el proceso sin eliminarlo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/process/i18n/es_AR.po b/addons/process/i18n/es_AR.po
index b0600d38ce1..504cd12ff06 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 18053827bde..66f9cba0fc4 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -366,21 +366,3 @@ msgstr "Método objeto"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el proceso sin eliminarlo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/process/i18n/es_MX.po b/addons/process/i18n/es_MX.po
new file mode 100644
index 00000000000..9a99ea402ee
--- /dev/null
+++ b/addons/process/i18n/es_MX.po
@@ -0,0 +1,368 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* process
+#
+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:42+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: 2011-09-05 05:10+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: process
+#: model:ir.model,name:process.model_process_node
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Node"
+msgstr "Nodo proceso"
+
+#. module: process
+#: help:process.process,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the process "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el proceso sin eliminarlo."
+
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr "Menú relacionado"
+
+#. module: process
+#: field:process.transition,action_ids:0
+msgid "Buttons"
+msgstr "Botones"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: process
+#: selection:process.node,kind:0
+msgid "State"
+msgstr "Estado"
+
+#. module: process
+#: view:process.node:0
+msgid "Kind Of Node"
+msgstr "Tipo de nodo"
+
+#. module: process
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr "URL de ayuda"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_node_form
+#: model:ir.ui.menu,name:process.menu_process_node_form
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Nodes"
+msgstr "Nodos proceso"
+
+#. module: process
+#: view:process.process:0
+#: field:process.process,node_ids:0
+msgid "Nodes"
+msgstr "Nodos"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,condition_ids:0
+#: view:process.process:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: process
+#: view:process.transition:0
+msgid "Search Process Transition"
+msgstr "Buscar transición proceso"
+
+#. module: process
+#: field:process.condition,node_id:0
+msgid "Node"
+msgstr "Nodo"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Workflow Trigger"
+msgstr "Disparador del flujo de trabajo"
+
+#. module: process
+#: field:process.transition,note:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition_action
+msgid "Process Transitions Actions"
+msgstr "Acciones transiciones proceso"
+
+#. module: process
+#: field:process.condition,model_id:0
+#: view:process.node:0
+#: field:process.node,model_id:0
+#: view:process.process:0
+#: field:process.process,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: process
+#: field:process.transition,source_node_id:0
+msgid "Source Node"
+msgstr "Nodo origen"
+
+#. module: process
+#: view:process.transition:0
+#: field:process.transition,transition_ids:0
+msgid "Workflow Transitions"
+msgstr "Transiciones flujo de trabajo"
+
+#. module: process
+#: field:process.transition.action,action:0
+msgid "Action ID"
+msgstr "ID de la acción"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition
+#: view:process.transition:0
+msgid "Process Transition"
+msgstr "Transición proceso"
+
+#. module: process
+#: model:ir.model,name:process.model_process_condition
+msgid "Condition"
+msgstr "Condición"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Dummy"
+msgstr "De relleno"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.ui.menu,name:process.menu_process_form
+msgid "Processes"
+msgstr "Procesos"
+
+#. module: process
+#: field:process.condition,name:0
+#: field:process.node,name:0
+#: field:process.process,name:0
+#: field:process.transition,name:0
+#: field:process.transition.action,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: process
+#: field:process.node,transition_in:0
+msgid "Starting Transitions"
+msgstr "Transiciones iniciales"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,note:0
+#: view:process.process:0
+#: field:process.process,note:0
+#: view:process.transition:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: process
+#: field:process.transition.action,transition_id:0
+msgid "Transition"
+msgstr "Transición"
+
+#. module: process
+#: view:process.process:0
+msgid "Search Process"
+msgstr "Buscar proceso"
+
+#. module: process
+#: selection:process.node,kind:0
+#: field:process.node,subflow_id:0
+msgid "Subflow"
+msgstr "Subflujo"
+
+#. module: process
+#: field:process.process,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: process
+#: view:process.transition:0
+msgid "Associated Groups"
+msgstr "Grupos asociados"
+
+#. module: process
+#: field:process.node,model_states:0
+msgid "States Expression"
+msgstr "Expresión de los estados"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: process
+#: field:process.node,flow_start:0
+msgid "Starting Flow"
+msgstr "Inicio flujo de trabajo"
+
+#. module: process
+#: model:ir.module.module,description:process.module_meta_information
+msgid ""
+"\n"
+"     This module shows the basic processes involved\n"
+"     in the selected modules and in the sequence they\n"
+"     occur\n"
+"\n"
+"     Note: This applies to the modules containing modulename_process_xml\n"
+"     for e.g product/process/product_process_xml\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"     Este módulo muestra los procesos básicos en los\n"
+"     que intervienen los módulos seleccionados, y\n"
+"     la secuencia en la que ocurren.\n"
+"\n"
+"     Note: Esto es aplicable a los módulos conteniendo "
+"nombredelmodulo_process_xml\n"
+"     por ejemplo product/process/product_process_xml\n"
+"\n"
+"    "
+
+#. module: process
+#: field:process.condition,model_states:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: process
+#: field:process.transition,group_ids:0
+msgid "Required Groups"
+msgstr "Grupos requeridos"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Incoming Transitions"
+msgstr "Transiciones entrantes"
+
+#. module: process
+#: field:process.transition.action,state:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: process
+#: field:process.node,transition_out:0
+msgid "Ending Transitions"
+msgstr "Transiciones finales"
+
+#. module: process
+#: model:ir.model,name:process.model_process_process
+#: field:process.node,process_id:0
+#: view:process.process:0
+msgid "Process"
+msgstr "Proceso"
+
+#. module: process
+#: view:process.node:0
+msgid "Search ProcessNode"
+msgstr "Buscar nodo proceso"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Other Conditions"
+msgstr "Otras condiciones"
+
+#. module: process
+#: model:ir.module.module,shortdesc:process.module_meta_information
+#: model:ir.ui.menu,name:process.menu_process
+msgid "Enterprise Process"
+msgstr "Proceso empresa"
+
+#. module: process
+#: view:process.transition:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_transition_form
+#: model:ir.ui.menu,name:process.menu_process_transition_form
+msgid "Process Transitions"
+msgstr "Transiciones proceso"
+
+#. module: process
+#: field:process.transition,target_node_id:0
+msgid "Target Node"
+msgstr "Nodo destino"
+
+#. module: process
+#: field:process.node,kind:0
+msgid "Kind of Node"
+msgstr "Clase de nodo"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Outgoing Transitions"
+msgstr "Transiciones salientes"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Transitions"
+msgstr "Transiciones"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Object Method"
+msgstr "Método objeto"
+
+#~ 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 "Roles from Workflow"
+#~ msgstr "Roles desde flujo"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Roles"
+#~ msgstr "Roles"
+
+#~ msgid "Roles Required"
+#~ msgstr "Roles necesarios"
+
+#~ msgid "Extra Information"
+#~ msgstr "Información extra"
+
+#~ msgid "Enterprise Processes"
+#~ msgstr "Procesos de empresa"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/process/i18n/es_VE.po b/addons/process/i18n/es_VE.po
new file mode 100644
index 00000000000..9a99ea402ee
--- /dev/null
+++ b/addons/process/i18n/es_VE.po
@@ -0,0 +1,368 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* process
+#
+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:42+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: 2011-09-05 05:10+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: process
+#: model:ir.model,name:process.model_process_node
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Node"
+msgstr "Nodo proceso"
+
+#. module: process
+#: help:process.process,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the process "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el proceso sin eliminarlo."
+
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr "Menú relacionado"
+
+#. module: process
+#: field:process.transition,action_ids:0
+msgid "Buttons"
+msgstr "Botones"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: process
+#: selection:process.node,kind:0
+msgid "State"
+msgstr "Estado"
+
+#. module: process
+#: view:process.node:0
+msgid "Kind Of Node"
+msgstr "Tipo de nodo"
+
+#. module: process
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr "URL de ayuda"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_node_form
+#: model:ir.ui.menu,name:process.menu_process_node_form
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Nodes"
+msgstr "Nodos proceso"
+
+#. module: process
+#: view:process.process:0
+#: field:process.process,node_ids:0
+msgid "Nodes"
+msgstr "Nodos"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,condition_ids:0
+#: view:process.process:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: process
+#: view:process.transition:0
+msgid "Search Process Transition"
+msgstr "Buscar transición proceso"
+
+#. module: process
+#: field:process.condition,node_id:0
+msgid "Node"
+msgstr "Nodo"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Workflow Trigger"
+msgstr "Disparador del flujo de trabajo"
+
+#. module: process
+#: field:process.transition,note:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition_action
+msgid "Process Transitions Actions"
+msgstr "Acciones transiciones proceso"
+
+#. module: process
+#: field:process.condition,model_id:0
+#: view:process.node:0
+#: field:process.node,model_id:0
+#: view:process.process:0
+#: field:process.process,model_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: process
+#: field:process.transition,source_node_id:0
+msgid "Source Node"
+msgstr "Nodo origen"
+
+#. module: process
+#: view:process.transition:0
+#: field:process.transition,transition_ids:0
+msgid "Workflow Transitions"
+msgstr "Transiciones flujo de trabajo"
+
+#. module: process
+#: field:process.transition.action,action:0
+msgid "Action ID"
+msgstr "ID de la acción"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition
+#: view:process.transition:0
+msgid "Process Transition"
+msgstr "Transición proceso"
+
+#. module: process
+#: model:ir.model,name:process.model_process_condition
+msgid "Condition"
+msgstr "Condición"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Dummy"
+msgstr "De relleno"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.ui.menu,name:process.menu_process_form
+msgid "Processes"
+msgstr "Procesos"
+
+#. module: process
+#: field:process.condition,name:0
+#: field:process.node,name:0
+#: field:process.process,name:0
+#: field:process.transition,name:0
+#: field:process.transition.action,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: process
+#: field:process.node,transition_in:0
+msgid "Starting Transitions"
+msgstr "Transiciones iniciales"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,note:0
+#: view:process.process:0
+#: field:process.process,note:0
+#: view:process.transition:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: process
+#: field:process.transition.action,transition_id:0
+msgid "Transition"
+msgstr "Transición"
+
+#. module: process
+#: view:process.process:0
+msgid "Search Process"
+msgstr "Buscar proceso"
+
+#. module: process
+#: selection:process.node,kind:0
+#: field:process.node,subflow_id:0
+msgid "Subflow"
+msgstr "Subflujo"
+
+#. module: process
+#: field:process.process,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: process
+#: view:process.transition:0
+msgid "Associated Groups"
+msgstr "Grupos asociados"
+
+#. module: process
+#: field:process.node,model_states:0
+msgid "States Expression"
+msgstr "Expresión de los estados"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: process
+#: field:process.node,flow_start:0
+msgid "Starting Flow"
+msgstr "Inicio flujo de trabajo"
+
+#. module: process
+#: model:ir.module.module,description:process.module_meta_information
+msgid ""
+"\n"
+"     This module shows the basic processes involved\n"
+"     in the selected modules and in the sequence they\n"
+"     occur\n"
+"\n"
+"     Note: This applies to the modules containing modulename_process_xml\n"
+"     for e.g product/process/product_process_xml\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"     Este módulo muestra los procesos básicos en los\n"
+"     que intervienen los módulos seleccionados, y\n"
+"     la secuencia en la que ocurren.\n"
+"\n"
+"     Note: Esto es aplicable a los módulos conteniendo "
+"nombredelmodulo_process_xml\n"
+"     por ejemplo product/process/product_process_xml\n"
+"\n"
+"    "
+
+#. module: process
+#: field:process.condition,model_states:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: process
+#: field:process.transition,group_ids:0
+msgid "Required Groups"
+msgstr "Grupos requeridos"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Incoming Transitions"
+msgstr "Transiciones entrantes"
+
+#. module: process
+#: field:process.transition.action,state:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: process
+#: field:process.node,transition_out:0
+msgid "Ending Transitions"
+msgstr "Transiciones finales"
+
+#. module: process
+#: model:ir.model,name:process.model_process_process
+#: field:process.node,process_id:0
+#: view:process.process:0
+msgid "Process"
+msgstr "Proceso"
+
+#. module: process
+#: view:process.node:0
+msgid "Search ProcessNode"
+msgstr "Buscar nodo proceso"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Other Conditions"
+msgstr "Otras condiciones"
+
+#. module: process
+#: model:ir.module.module,shortdesc:process.module_meta_information
+#: model:ir.ui.menu,name:process.menu_process
+msgid "Enterprise Process"
+msgstr "Proceso empresa"
+
+#. module: process
+#: view:process.transition:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_transition_form
+#: model:ir.ui.menu,name:process.menu_process_transition_form
+msgid "Process Transitions"
+msgstr "Transiciones proceso"
+
+#. module: process
+#: field:process.transition,target_node_id:0
+msgid "Target Node"
+msgstr "Nodo destino"
+
+#. module: process
+#: field:process.node,kind:0
+msgid "Kind of Node"
+msgstr "Clase de nodo"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Outgoing Transitions"
+msgstr "Transiciones salientes"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Transitions"
+msgstr "Transiciones"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Object Method"
+msgstr "Método objeto"
+
+#~ 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 "Roles from Workflow"
+#~ msgstr "Roles desde flujo"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Roles"
+#~ msgstr "Roles"
+
+#~ msgid "Roles Required"
+#~ msgstr "Roles necesarios"
+
+#~ msgid "Extra Information"
+#~ msgstr "Información extra"
+
+#~ msgid "Enterprise Processes"
+#~ msgstr "Procesos de empresa"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/process/i18n/et.po b/addons/process/i18n/et.po
index e40a75954ea..1e3fefd9499 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a5c7f8ee876..291dc93fbfc 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -30,6 +30,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
 msgstr ""
+"Jos aktiivisen kentän arvo on epätosi (false), voit piilottaa prosessin "
+"poistamatta sitä."
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -45,7 +47,7 @@ msgstr "Painikkeet"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: process
 #: selection:process.node,kind:0
@@ -55,7 +57,7 @@ msgstr "Tila"
 #. module: process
 #: view:process.node:0
 msgid "Kind Of Node"
-msgstr ""
+msgstr "Noodin tyyppi"
 
 #. module: process
 #: field:process.node,help_url:0
@@ -86,7 +88,7 @@ msgstr "Ehdot"
 #. module: process
 #: view:process.transition:0
 msgid "Search Process Transition"
-msgstr ""
+msgstr "Hae prosessisiirtymiä"
 
 #. module: process
 #: field:process.condition,node_id:0
@@ -153,7 +155,7 @@ msgstr "Tyhjä"
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
-msgstr ""
+msgstr "Prosessit"
 
 #. module: process
 #: field:process.condition,name:0
@@ -186,7 +188,7 @@ msgstr "Siirtymä"
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr ""
+msgstr "Hae prosessia"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -202,7 +204,7 @@ msgstr "Aktiivinen"
 #. module: process
 #: view:process.transition:0
 msgid "Associated Groups"
-msgstr ""
+msgstr "Liittyvät ryhmät"
 
 #. module: process
 #: field:process.node,model_states:0
@@ -241,13 +243,13 @@ msgstr "Lauseke"
 #. module: process
 #: field:process.transition,group_ids:0
 msgid "Required Groups"
-msgstr ""
+msgstr "Vaaditut ryhmät"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Saapuvat siirtymät"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -269,13 +271,13 @@ msgstr "Prosessi"
 #. module: process
 #: view:process.node:0
 msgid "Search ProcessNode"
-msgstr ""
+msgstr "Hae prosessinoodia"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Other Conditions"
-msgstr ""
+msgstr "Muut ehdot"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
@@ -292,7 +294,7 @@ msgstr "Toiminnot"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Properties"
-msgstr ""
+msgstr "Ominaisuudet"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index e04afded4fb..37b5659468c 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 418cd66fdc0..2fdf0a1613f 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -30,6 +30,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
 msgstr ""
+"Se se desmarca o campo activo, permite ocultar o proceso sen eliminalo."
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -45,7 +46,7 @@ msgstr "Botóns"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: process
 #: selection:process.node,kind:0
@@ -55,7 +56,7 @@ msgstr "Estado"
 #. module: process
 #: view:process.node:0
 msgid "Kind Of Node"
-msgstr ""
+msgstr "Tipo de nodo"
 
 #. module: process
 #: field:process.node,help_url:0
@@ -86,7 +87,7 @@ msgstr "Condicións"
 #. module: process
 #: view:process.transition:0
 msgid "Search Process Transition"
-msgstr ""
+msgstr "Buscar transición do proceso"
 
 #. module: process
 #: field:process.condition,node_id:0
@@ -153,7 +154,7 @@ msgstr "Dummy"
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
-msgstr ""
+msgstr "Procesos"
 
 #. module: process
 #: field:process.condition,name:0
@@ -186,7 +187,7 @@ msgstr "Transición"
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr ""
+msgstr "Buscar proceso"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -202,7 +203,7 @@ msgstr "Activo"
 #. module: process
 #: view:process.transition:0
 msgid "Associated Groups"
-msgstr ""
+msgstr "Grupos asociados"
 
 #. module: process
 #: field:process.node,model_states:0
@@ -232,6 +233,13 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Este módulo amosa os procesos básicos nos que participan os módulos "
+"seleccionados, e a secuencia na que ocorren. Nota: Isto é aplicable ós "
+"módulos que conteñen o nomedomódulo_process_xml por exemplo "
+"product/process/product_process_xml\n"
+"\n"
+"    "
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -241,13 +249,13 @@ msgstr "Expresión"
 #. module: process
 #: field:process.transition,group_ids:0
 msgid "Required Groups"
-msgstr ""
+msgstr "Grupos requiridos"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Transicións entrantes"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -269,13 +277,13 @@ msgstr "Proceso"
 #. module: process
 #: view:process.node:0
 msgid "Search ProcessNode"
-msgstr ""
+msgstr "Buscar nodo proceso"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Other Conditions"
-msgstr ""
+msgstr "Outras condicións"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
@@ -292,7 +300,7 @@ msgstr "Accións"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Properties"
-msgstr ""
+msgstr "Propiedades"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
diff --git a/addons/process/i18n/hi.po b/addons/process/i18n/hi.po
index a1663464b63..2343287141c 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c977382aaae..52c0f140817 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: process
diff --git a/addons/process/i18n/hu.po b/addons/process/i18n/hu.po
index 25477b8d150..ed925902714 100644
--- a/addons/process/i18n/hu.po
+++ b/addons/process/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 15:08+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 531c1d4cc67..29b61ba1258 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 568917764f7..9d58db595b1 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -366,21 +366,3 @@ msgstr "Metodo Oggetto"
 
 #~ msgid "Enterprise Processes"
 #~ msgstr "Processi Aziendali"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non è possibile creare menu ricorsivi."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Il campo: \"attivo\" permette di nascondere il processo senza eliminarlo."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/process/i18n/ko.po b/addons/process/i18n/ko.po
index 41d62c5a029..17358d4419c 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e16515cf5ce..6bb53ff9d03 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7847939f9e4..1a3af166296 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -364,6 +364,3 @@ msgstr "Объектын метод"
 
 #~ msgid "Extra Information"
 #~ msgstr "Нэмэлт Мэдээлэл"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
diff --git a/addons/process/i18n/nl.po b/addons/process/i18n/nl.po
index bcd93820aba..0f1cc01db01 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/nl_BE.po b/addons/process/i18n/nl_BE.po
index d95c7cd4b5c..363bed7d3e4 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 56d73594ebe..d319c9e284f 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 24cefb47faf..b20322095af 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -355,12 +355,3 @@ msgstr "Método do Objecto"
 
 #~ msgid "Enterprise Processes"
 #~ msgstr "Processos da Empresa"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index 3b91415c2b3..92acb22a3d0 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2ebc93c875e..8645e145eff 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7b49431e751..4fa6bf6640d 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -29,8 +29,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
 msgstr ""
-"Если активное поле имеет значение \"Ложь\", это позволит скрыть процесс не "
-"удаляя его."
+"Если поле \"Активно\" имеет значение \"Ложь\", это позволит скрыть процесс "
+"не удаляя его."
 
 #. module: process
 #: field:process.node,menu_id:0
diff --git a/addons/process/i18n/sk.po b/addons/process/i18n/sk.po
index ac4563fa132..d265d62c7d2 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d98d82d5f45..bb0d4835c05 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 844af991646..94fcdfc90e0 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9362ad8f7df..4743daca541 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -355,13 +355,3 @@ msgstr "Metoda Objekta"
 
 #~ msgid "Enterprise Processes"
 #~ msgstr "Preocesi Preduzeca"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes proces "
-#~ "bez njegovog uklanjanja."
diff --git a/addons/process/i18n/sr@latin.po b/addons/process/i18n/sr@latin.po
index 76060c0d849..6e05c99c7f5 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -335,16 +335,6 @@ msgstr "Metoda Objekta"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the process "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes proces "
-#~ "bez njegovog uklanjanja."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 09f14ed5d1e..08a79ba5db6 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4963f445852..2bb2f92317a 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 34c8fc656fe..01595113967 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr ""
+msgstr "İşlem Node"
 
 #. module: process
 #: help:process.process,active:0
@@ -29,6 +29,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
 msgstr ""
+"Aktif alan Yanlış olarak ayarlanırsa, bu özellik işlemi kaldırmadan "
+"gizlemenize olanak sağlayacaktır."
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -38,13 +40,13 @@ msgstr "Bağlı Menü"
 #. module: process
 #: field:process.transition,action_ids:0
 msgid "Buttons"
-msgstr ""
+msgstr "Butonlar"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "Şuna göre grupla"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -54,12 +56,12 @@ msgstr "Durum"
 #. module: process
 #: view:process.node:0
 msgid "Kind Of Node"
-msgstr ""
+msgstr "Node Türü"
 
 #. module: process
 #: field:process.node,help_url:0
 msgid "Help URL"
-msgstr ""
+msgstr "Yardım URL'si"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_node_form
@@ -67,13 +69,13 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr ""
+msgstr "İşlem Nodeleri"
 
 #. module: process
 #: view:process.process:0
 #: field:process.process,node_ids:0
 msgid "Nodes"
-msgstr ""
+msgstr "Nodeler"
 
 #. module: process
 #: view:process.node:0
@@ -85,17 +87,17 @@ msgstr "Koşullar"
 #. module: process
 #: view:process.transition:0
 msgid "Search Process Transition"
-msgstr ""
+msgstr "Proses Geçişi Ara"
 
 #. module: process
 #: field:process.condition,node_id:0
 msgid "Node"
-msgstr ""
+msgstr "Node"
 
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Workflow Trigger"
-msgstr ""
+msgstr "İş Akışı Tetikleyici"
 
 #. module: process
 #: field:process.transition,note:0
@@ -105,7 +107,7 @@ msgstr "Açıklama"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr ""
+msgstr "Proses Geçiş İşlemleri"
 
 #. module: process
 #: field:process.condition,model_id:0
@@ -125,18 +127,18 @@ msgstr "Kaynak Node"
 #: view:process.transition:0
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr ""
+msgstr "İş Akış Geçişleri"
 
 #. module: process
 #: field:process.transition.action,action:0
 msgid "Action ID"
-msgstr ""
+msgstr "İşlem Kimliği"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr ""
+msgstr "Proses Geçişi"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -146,13 +148,13 @@ msgstr "Koşul"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Dummy"
-msgstr ""
+msgstr "Sahte"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
-msgstr ""
+msgstr "İşlemler"
 
 #. module: process
 #: field:process.condition,name:0
@@ -166,7 +168,7 @@ msgstr "Adı"
 #. module: process
 #: field:process.node,transition_in:0
 msgid "Starting Transitions"
-msgstr ""
+msgstr "Geçişlerin Başlatılması"
 
 #. module: process
 #: view:process.node:0
@@ -180,18 +182,18 @@ msgstr "Notlar"
 #. module: process
 #: field:process.transition.action,transition_id:0
 msgid "Transition"
-msgstr ""
+msgstr "Geçiş"
 
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr ""
+msgstr "İşlem Arama"
 
 #. module: process
 #: selection:process.node,kind:0
 #: field:process.node,subflow_id:0
 msgid "Subflow"
-msgstr ""
+msgstr "Alt akış"
 
 #. module: process
 #: field:process.process,active:0
@@ -201,7 +203,7 @@ msgstr "Aktif"
 #. module: process
 #: view:process.transition:0
 msgid "Associated Groups"
-msgstr ""
+msgstr "İlgili Gruplar"
 
 #. module: process
 #: field:process.node,model_states:0
@@ -216,7 +218,7 @@ msgstr "İşlem"
 #. module: process
 #: field:process.node,flow_start:0
 msgid "Starting Flow"
-msgstr ""
+msgstr "Akış Başlatma"
 
 #. module: process
 #: model:ir.module.module,description:process.module_meta_information
@@ -231,22 +233,31 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Bu modül seçilen modüllerde ve meydana\n"
+"     geldiği dizide kapsanan temel işlemleri\n"
+"     gösterir\n"
+"\n"
+"     Not: Bu, modulename_process_xml içeren modüller için geçerlidir\n"
+"     örn. product/process/product_process_xml\n"
+"\n"
+"    "
 
 #. module: process
 #: field:process.condition,model_states:0
 msgid "Expression"
-msgstr ""
+msgstr "İfade"
 
 #. module: process
 #: field:process.transition,group_ids:0
 msgid "Required Groups"
-msgstr ""
+msgstr "Gerekli Gruplar"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Gelen Geçişler"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -256,7 +267,7 @@ msgstr "Tipi"
 #. module: process
 #: field:process.node,transition_out:0
 msgid "Ending Transitions"
-msgstr ""
+msgstr "Sonlanan Geçişler"
 
 #. module: process
 #: model:ir.model,name:process.model_process_process
@@ -268,19 +279,19 @@ msgstr "İşlem"
 #. module: process
 #: view:process.node:0
 msgid "Search ProcessNode"
-msgstr ""
+msgstr "İşlem Node Arama"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Other Conditions"
-msgstr ""
+msgstr "Diğer Koşullar"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
 #: model:ir.ui.menu,name:process.menu_process
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Kurumsal İşlem"
 
 #. module: process
 #: view:process.transition:0
@@ -291,7 +302,7 @@ msgstr "İşlemler"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Properties"
-msgstr ""
+msgstr "Özellikler"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
@@ -307,13 +318,13 @@ msgstr "Hedef Node"
 #. module: process
 #: field:process.node,kind:0
 msgid "Kind of Node"
-msgstr ""
+msgstr "Node Türü"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Giden Geçişler"
 
 #. module: process
 #: view:process.node:0
@@ -324,7 +335,7 @@ msgstr "Geçişler"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Object Method"
-msgstr ""
+msgstr "İtiraz Metodu"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/process/i18n/uk.po b/addons/process/i18n/uk.po
index 39d8c2fe517..af3fbde4611 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 66ef2461035..d2849192baf 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b4c5d80bbe3..58a7e301abc 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -44,7 +44,7 @@ msgstr "按钮"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: process
 #: selection:process.node,kind:0
@@ -54,7 +54,7 @@ msgstr "状态"
 #. module: process
 #: view:process.node:0
 msgid "Kind Of Node"
-msgstr "节点种类"
+msgstr "节点类型"
 
 #. module: process
 #: field:process.node,help_url:0
@@ -85,7 +85,7 @@ msgstr "条件"
 #. module: process
 #: view:process.transition:0
 msgid "Search Process Transition"
-msgstr "搜索流程转换"
+msgstr "搜索节点迁移"
 
 #. module: process
 #: field:process.condition,node_id:0
@@ -105,7 +105,7 @@ msgstr "说明"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr "处理转换生效"
+msgstr "节点迁移操作"
 
 #. module: process
 #: field:process.condition,model_id:0
@@ -125,7 +125,7 @@ msgstr "源节点"
 #: view:process.transition:0
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr "工作流转换"
+msgstr "工作流迁移"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -136,7 +136,7 @@ msgstr "动作ID"
 #: model:ir.model,name:process.model_process_transition
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr "处理转换"
+msgstr "节点迁移"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -152,7 +152,7 @@ msgstr "哑元"
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
-msgstr "流程列表"
+msgstr "节点"
 
 #. module: process
 #: field:process.condition,name:0
@@ -166,7 +166,7 @@ msgstr "名称"
 #. module: process
 #: field:process.node,transition_in:0
 msgid "Starting Transitions"
-msgstr "开始转换"
+msgstr "启动迁移"
 
 #. module: process
 #: view:process.node:0
@@ -175,17 +175,17 @@ msgstr "开始转换"
 #: field:process.process,note:0
 #: view:process.transition:0
 msgid "Notes"
-msgstr "节点"
+msgstr "备注"
 
 #. module: process
 #: field:process.transition.action,transition_id:0
 msgid "Transition"
-msgstr "转换"
+msgstr "迁移"
 
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr "搜索流程"
+msgstr "搜索节点"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -216,7 +216,7 @@ msgstr "动作"
 #. module: process
 #: field:process.node,flow_start:0
 msgid "Starting Flow"
-msgstr "开始流程"
+msgstr "启动流程"
 
 #. module: process
 #: model:ir.module.module,description:process.module_meta_information
@@ -231,6 +231,13 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     此模块显示指定模块的基本流程和工作顺序。\n"
+"\n"
+"注意：这些信息来自对应模块的 modulename_process.xml文件\n"
+"例如 product/process/product_process.xml\n"
+"\n"
+"    "
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -240,13 +247,13 @@ msgstr "表达"
 #. module: process
 #: field:process.transition,group_ids:0
 msgid "Required Groups"
-msgstr "要求的用户组"
+msgstr "请求的用户组"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Incoming Transitions"
-msgstr "传入转换"
+msgstr "迁移入口"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -256,14 +263,14 @@ msgstr "类型"
 #. module: process
 #: field:process.node,transition_out:0
 msgid "Ending Transitions"
-msgstr "结束转换"
+msgstr "结束迁移"
 
 #. module: process
 #: model:ir.model,name:process.model_process_process
 #: field:process.node,process_id:0
 #: view:process.process:0
 msgid "Process"
-msgstr "处理"
+msgstr "节点"
 
 #. module: process
 #: view:process.node:0
@@ -297,7 +304,7 @@ msgstr "属性"
 #: model:ir.actions.act_window,name:process.action_process_transition_form
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr "处理转换"
+msgstr "处理迁移"
 
 #. module: process
 #: field:process.transition,target_node_id:0
@@ -307,19 +314,19 @@ msgstr "目标节点"
 #. module: process
 #: field:process.node,kind:0
 msgid "Kind of Node"
-msgstr "分类节点"
+msgstr "节点类型"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Outgoing Transitions"
-msgstr "输出转换"
+msgstr "迁移出口"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Transitions"
-msgstr "转换"
+msgstr "迁移"
 
 #. module: process
 #: selection:process.transition.action,state:0
@@ -345,15 +352,6 @@ msgstr "对象方法"
 #~ msgid "Roles from Workflow"
 #~ msgstr "工作流角色"
 
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to manage your process for the end-users.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "这模块允许你管理你的最终用户处理\n"
-#~ "    "
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
 
diff --git a/addons/process/i18n/zh_TW.po b/addons/process/i18n/zh_TW.po
index 1328117d9c7..39c16e00f38 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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/process.py b/addons/process/process.py
index 72c8bce10b4..524a3236e7b 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -84,12 +84,12 @@ class process_process(osv.osv):
         process = pool.get('process.process').browse(cr, uid, id, context=context)
 
         name = process.name
-        resource = None
+        resource = False
         state = 'N/A'
 
         expr_context = {}
         states = {}
-        perm = None
+        perm = False
 
         if res_model:
             states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {}))
@@ -242,7 +242,9 @@ class process_process(osv.osv):
         for k, v in nodes.items():
             y = v['y']
             v['y'] = min(y - miny + 10, y)
-
+        
+        nodes = dict([str(n_key), n_val] for n_key, n_val in nodes.iteritems())
+        transitions = dict([str(t_key), t_val] for t_key, t_val in transitions.iteritems())
         return dict(name=name, resource=resource, state=state, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index d158dd83425..de92b9c6c60 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -108,12 +108,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Process">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="model_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
                 </search>
@@ -213,13 +213,13 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
-                <group col="10" colspan="4">
+                <group>
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="kind" />
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="4" col="4">
+                <group expand="0" string="Group By...">
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
                 </group>
@@ -302,7 +302,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Process Transition">
-                <group col="10" colspan="4">
+                <group>
                     <field name="name"/>
                     <field name="source_node_id"/>
                     <field name="target_node_id" />
diff --git a/addons/procurement/__init__.py b/addons/procurement/__init__.py
index 3420ef1f75e..4634166a9bd 100644
--- a/addons/procurement/__init__.py
+++ b/addons/procurement/__init__.py
@@ -22,4 +22,6 @@
 import procurement
 import wizard
 import schedulers
-import company
\ No newline at end of file
+import company
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index e590163f8a7..87a766a009f 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Warehouse",
+    "category" : "Warehouse Management",
     "depends" : ["base","process", "product", "stock"],
     "description": """
 This is the module for computing Procurements.
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index bf11fe79166..b45edd3cbdd 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -16,8 +16,8 @@
 			<field name="inherit_id" ref="stock.board_warehouse_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1/action[@string='Incoming Product']" position="before">
-				<action colspan="4" name="%(procurement_action_board)d" string="Procurements in Exception" width="510" />
+      		<xpath expr="/form/board/column/action[@string='Incoming Product']" position="before">
+				<action name="%(procurement_action_board)d" string="Procurements in Exception"/>
 			</xpath>
             </field>
         </record>
diff --git a/addons/procurement/i18n/bg.po b/addons/procurement/i18n/bg.po
index 460069a7337..23b8705904c 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -71,7 +71,7 @@ msgid "Procurement Method"
 msgstr "Начин на снабдяване"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Не е дефиниран адрес за този доставчик"
@@ -310,7 +310,7 @@ msgid "Quantity"
 msgstr "Количество"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -441,7 +441,7 @@ msgid "plus"
 msgstr "плюс"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -605,7 +605,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Недостатъчни данни !"
@@ -829,7 +829,7 @@ msgid "Product UoS"
 msgstr "Прод. единици на продукт"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
diff --git a/addons/procurement/i18n/ca.po b/addons/procurement/i18n/ca.po
index e0ade06ad01..d8c5636358b 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -72,7 +72,7 @@ msgid "Procurement Method"
 msgstr "Mètode proveïment"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "No s'ha definit adreça per al proveïdor"
@@ -327,7 +327,7 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "No hi ha suficient estoc i no s'ha definit una regla d'estoc mínim."
@@ -465,7 +465,7 @@ msgid "plus"
 msgstr "més"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -624,7 +624,7 @@ msgstr "Ordenar el màxim"
 #. module: procurement
 #: field:procurement.order,date_close:0
 msgid "Date Closed"
-msgstr "Data tancament"
+msgstr "Data de tancament"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:372
@@ -639,7 +639,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "No es pot eliminar ordre(s) de proveïment que estan en estat %s!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dades insuficients!"
@@ -871,7 +871,7 @@ msgid "Product UoS"
 msgstr "UdV del producte"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "des d'estoc: productes assignats."
diff --git a/addons/procurement/i18n/cs.po b/addons/procurement/i18n/cs.po
index 19ed4d5d448..80195932734 100644
--- a/addons/procurement/i18n/cs.po
+++ b/addons/procurement/i18n/cs.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-15 02:33+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\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: 2011-07-16 04:57+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/da.po b/addons/procurement/i18n/da.po
new file mode 100644
index 00000000000..095fdc96e25
--- /dev/null
+++ b/addons/procurement/i18n/da.po
@@ -0,0 +1,890 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-18 16:11+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: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Foretag indkøb"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Gruppér efter..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Ingen leverandør er valgt til denne vare!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Måleenhed"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:304
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Årsag"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr ""
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Seneste indkøb"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Noter"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Lager flytning"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Klar"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Bekræftet"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Forsøg igen"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parametre"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Bekræft"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioritet"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Placering"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkeliste"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varehus"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Bedst pris (endnu ikke aktiv!)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Indkøb"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Planlagt dato"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Gruppér efter"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Mængde"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:377
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Indstillinger"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Indkøb"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Indkøbs ordre"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Undtagelser"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+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
+msgid "Min Quantity"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Haster"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "plus"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:325
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Indkøbs linier"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Status"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr "Virksomheder"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:324
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr "Diverse"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "Fra lager"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr "Annullér"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr "Nuværende"
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr "Vare"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr "Midlertidig"
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr "min."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr "Kører"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Venter"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "maks"
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:353
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. 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)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr "Søg indkøb"
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 30ba3eb6a83..f3417e5ccd1 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -71,7 +71,7 @@ msgid "Procurement Method"
 msgstr "Dispositionsverfahren"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Keine Adresse bei Lieferant hinterlegt"
@@ -333,7 +333,7 @@ msgid "Quantity"
 msgstr "Menge"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Nicht genug Bestand und keine Meldebestandregel definiert"
@@ -471,7 +471,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -652,7 +652,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "Beschaffungsauftrag im Zustand %s kann nicht gelöschet werden!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Unstimmige Daten !"
@@ -888,7 +888,7 @@ msgid "Product UoS"
 msgstr "Produkt ME VK"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "vom Lager: Produkte entnommen"
@@ -969,149 +969,3 @@ msgstr "Details zur Beschaffung"
 #, python-format
 msgid "SCHEDULER"
 msgstr "DISPOSITION"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung bei dieser Aktion."
-
-#~ msgid "Temporary Procurement Exceptions"
-#~ msgstr "Temporäre Fehlerliste"
-
-#, python-format
-#~ msgid "has an exception."
-#~ msgstr "hat Fehler verursacht"
-
-#~ msgid "Procurement Exceptions to Fix"
-#~ msgstr "Fehlerliste Beschaffungsvorschläge"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Argumente"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "Assitent Beschaffungsvorschlag"
-
-#~ msgid ""
-#~ "Wizard run all the procurements, and generate task, production order or "
-#~ "purchase order based on the product type"
-#~ msgstr ""
-#~ "Assistent prüft vorhandene Bestände, und generiert Aufgabe, "
-#~ "Fertigungsauftrag oder Bestellvorschlag bei Lieferanten in Abhängigkeit vom "
-#~ "konfigurierten Produkttyp"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "haben!"
-
-#, python-format
-#~ msgid "Procurement "
-#~ msgstr "Beschaffung "
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "In diesem maximalen Zeitfenster prüft der Scheduler auf autom. zu erzeugende "
-#~ " Beschaffungsaufträge. Alle Beschaffungsaufträge die ausserhalb dieses "
-#~ "Zeitfensters liegen werden für die Berechnung nicht herangezogen ."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn dieses Feld aktiviert wird kann die Beschaffungsregel verborgen werden "
-#~ "ohne die Regel komplett zu löschen."
-
-#, python-format
-#~ msgid "is running."
-#~ msgstr "ist in Bearbeitung"
-
-#, python-format
-#~ msgid "Not enough stock "
-#~ msgstr "Nicht genug Bestand "
-
-#, python-format
-#~ msgid "Project_mrp module not installed !"
-#~ msgstr "Modul project_mrp ist nicht installiert!"
-
-#, python-format
-#~ msgid "is done."
-#~ msgstr "ist erledigt"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "A procurement order is used to record a need in a specific product at a "
-#~ "specific location. They are usually created automatically by the sales "
-#~ "orders, the Pull Logistics rules or the minimum stock rules. When the "
-#~ "procurement order is confirmed, it creates automatically the necessary "
-#~ "operations to fullfil the need: purchase order proposition, manufacturing "
-#~ "order, etc."
-#~ msgstr ""
-#~ "Ein Beschaffungsauftrag wird erzeugt, um den Bedarf eines Produktes zu einer "
-#~ "bestimmten Zeit an einem bestimmten Ort zu decken. Üblicherweise wird ein "
-#~ "Beschaffungsauftrag automatisch durch einen Verkaufsauftrag, durch eine Pull "
-#~ "Regel einer Lieferkette oder durch eine Meldebestandsregel ausgelöst. Durch "
-#~ "Bestätigung eines Beschaffungsauftrags werden automatisch alle weiteren "
-#~ "Bearbeitungsschritte für die Bedarfsdeckung erzeugt: Beschaffungsvorschlag, "
-#~ "Fertigungsauftrag, etc."
-
-#~ msgid ""
-#~ "You can define your minimum stock rules, so that OpenERP will trigger "
-#~ "automatically the propositions of manufacturing or purchase orders according "
-#~ "to the stock level. Once the virtual stock of a product (=stock on hand "
-#~ "minus all confirmed orders and reservations) is bellow the minimum quantity, "
-#~ "OpenERP will generate a procurement request in order to fullfil the stock up "
-#~ "to the maximum quantity."
-#~ msgstr ""
-#~ "Sie können Meldebestandregeln definieren, damit OpenERP in Abhängigkeit von "
-#~ "der Bestandssituation automatisch Fertigungsaufträge oder "
-#~ "Beschaffungsaufträge vorschlägt. Sobald der fiktive Bestand (=verfügbarer "
-#~ "Bestand abzüglich bestätigte Verkaufsaufträge und Bestandsreservierungen) "
-#~ "geringer als der Meldebestand ist, erzeugt OpenERP einen "
-#~ "Beschaffungsauftrag, um den Bestand wieder aufzufüllen bis zum angegebenen "
-#~ "Max. Bestand."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
-
-#~ msgid ""
-#~ "Procurement Orders represent the need for a certain quantity of products, at "
-#~ "a given time, in a given location. Sale Orders are one typical source of "
-#~ "Procurement Orders (but these are distinct documents). Depending on the "
-#~ "procurement parameters and the products configuration, the procurement "
-#~ "engine will attempt to satisfy the need by reserving products from stock, or "
-#~ "ordering products from a supplier, or passing a manufacturing order, etc. A "
-#~ "Procurement Exception occurs when the system cannot find a way to fulfill a "
-#~ "procurement. Some exceptions will resolve themselves automatically, but "
-#~ "others require manual intervention (those are identified by a specific error "
-#~ "message)"
-#~ msgstr ""
-#~ "Beschaffungsaufträge repräsentieren den Bedarf an Produkten, zu einer "
-#~ "bestimmten Zeit an einem bestimmten Ort. Verkaufsaufträge sind eine typische "
-#~ "Quelle für Beschaffungsaufträge (es handelt sich allerdings um verschiedene "
-#~ "Belege). In Abhängigkeit der Konfiguration für die Beschaffung, wird die "
-#~ "Beschaffungsdisposition automatisch berechnen, wie der jeweilige Bedarf zu "
-#~ "decken ist, sei es durch eine Entnahme von verfügbaren Beständen, eine "
-#~ "Bestellung bei Lieferanten oder durch die Fertigung von Produkten, etc. Ein "
-#~ "Beschaffungsfehler tritt auf, wenn das System nicht in der Lage ist eine "
-#~ "geeignete Beschaffungsmöglichkeit vorzuschlagen. Einige Fehler lösen sich "
-#~ "dabei von selbst, andere erfordern einen Eingriff (diese sind "
-#~ "gekennzeichnet)."
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index 9f7108c9812..b11d735975b 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -72,7 +72,7 @@ msgid "Procurement Method"
 msgstr "Método abastecimiento"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "No se ha definido una dirección para el proveedor"
@@ -331,7 +331,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -470,7 +470,7 @@ msgid "plus"
 msgstr "más"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -647,7 +647,7 @@ msgstr ""
 "¡No se puede eliminar orden(es) de abastecimiento que están en estado %s!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "¡Datos insuficientes!"
@@ -880,7 +880,7 @@ msgid "Product UoS"
 msgstr "UdV del producto"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "desde stock: productos asignados"
@@ -959,108 +959,3 @@ msgstr "Detalles de abastecimiento"
 #, python-format
 msgid "SCHEDULER"
 msgstr "PLANIFICADOR"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "Planificador MRP y Logística"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argumentos no válidos"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "Este es el período de tiempo analizado por el planificador al calcular los "
-#~ "abastecimientos. Todos los abastecimientos que no están entre hoy y "
-#~ "hoy+intervalo se omiten para el cálculo futuro."
-
-#~ 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 ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la orden sin eliminarla."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "You can define your minimum stock rules, so that OpenERP will trigger "
-#~ "automatically the propositions of manufacturing or purchase orders according "
-#~ "to the stock level. Once the virtual stock of a product (=stock on hand "
-#~ "minus all confirmed orders and reservations) is bellow the minimum quantity, "
-#~ "OpenERP will generate a procurement request in order to fullfil the stock up "
-#~ "to the maximum quantity."
-#~ msgstr ""
-#~ "Puede definir sus reglas de stock mínimo, de forma que OpenERP lance "
-#~ "automáticamente propuestas de órdenes de fabricación o de compra en función "
-#~ "de los niveles de stock. Una vez que el stock virtual de un producto (= "
-#~ "stock disponible menos todas las órdenes confirmadas y reservas) esté debajo "
-#~ "de la cantidad mínima, OpenERP generará una solicitud de abastecimiento para "
-#~ "satisfacer el stock hasta la cantidad máxima establecida para dicho producto."
-
-#~ msgid ""
-#~ "A procurement order is used to record a need in a specific product at a "
-#~ "specific location. They are usually created automatically by the sales "
-#~ "orders, the Pull Logistics rules or the minimum stock rules. When the "
-#~ "procurement order is confirmed, it creates automatically the necessary "
-#~ "operations to fullfil the need: purchase order proposition, manufacturing "
-#~ "order, etc."
-#~ msgstr ""
-#~ "Una orden de abastecimiento se utiliza para registrar una necesidad de un "
-#~ "producto específico en una ubicación específica. Normalmente son creadas "
-#~ "automáticamente por los pedidos de venta, las reglas de abastecimiento o "
-#~ "reglas de stock mínimo. Cuando la orden de abastecimiento es confirmada, se "
-#~ "crean automáticamente las operaciones necesarias para satisfacer dicha "
-#~ "necesidad: proposición de compra, orden de fabricación, etc."
-
-#~ msgid ""
-#~ "Procurement Orders represent the need for a certain quantity of products, at "
-#~ "a given time, in a given location. Sale Orders are one typical source of "
-#~ "Procurement Orders (but these are distinct documents). Depending on the "
-#~ "procurement parameters and the products configuration, the procurement "
-#~ "engine will attempt to satisfy the need by reserving products from stock, or "
-#~ "ordering products from a supplier, or passing a manufacturing order, etc. A "
-#~ "Procurement Exception occurs when the system cannot find a way to fulfill a "
-#~ "procurement. Some exceptions will resolve themselves automatically, but "
-#~ "others require manual intervention (those are identified by a specific error "
-#~ "message)"
-#~ msgstr ""
-#~ "Las órdenes de abastecimiento representan la necesidad de una determinada "
-#~ "cantidad de productos, en un momento dado, en una ubicación determinada. Los "
-#~ "pedidos de venta son una fuente típica de las órdenes de abastecimiento "
-#~ "(pero estos son documentos distintos). Dependiendo de los parámetros de "
-#~ "abastecimiento y la configuración de productos, el motor de abastecimientos "
-#~ "tratará de satisfacer la necesidad de reservar los productos del stock, u "
-#~ "ordenar productos de un proveedor, o crear una orden de producción, etc. Se "
-#~ "produce una excepción de abastecimiento cuando el sistema no puede encontrar "
-#~ "una manera de cumplir un abastecimiento. Algunas excepciones se resolverán "
-#~ "de forma automática, pero otras requieren intervención manual (las que se "
-#~ "identifican con un mensaje de error específico)."
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
index 8169f751667..e13fffd37ff 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -72,7 +72,7 @@ msgid "Procurement Method"
 msgstr "Método de abastecimiento"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "No se ha definido dirección para el proveedor"
@@ -331,7 +331,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -470,7 +470,7 @@ msgid "plus"
 msgstr "más"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -573,33 +573,33 @@ msgstr "Fecha planificada"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Excepción"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:179
 #, python-format
 msgid "Automatic OP: %s"
-msgstr ""
+msgstr "Ord. abastecimiento automática: %s"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Regla de stock mínimo automática"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Regla de inventario mínimo"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Información extra"
 
 #. module: procurement
 #: help:procurement.order,name:0
@@ -644,7 +644,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -719,7 +719,7 @@ msgstr ""
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Calcular todos los planificadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -868,7 +868,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
diff --git a/addons/procurement/i18n/es_MX.po b/addons/procurement/i18n/es_MX.po
new file mode 100644
index 00000000000..5a33adc9fce
--- /dev/null
+++ b/addons/procurement/i18n/es_MX.po
@@ -0,0 +1,961 @@
+# 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:40+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Solicitar nuevos productos"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Planificaciones"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Realizar abastecimientos"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Dispara un abastecimiento automático para todos los productos que tienen un "
+"stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
+"sugerimos utilizar una configuración de \"Obtener bajo pedido\" en productos."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "¡No se ha definido un proveedor para este producto!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:304
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "No se ha definido una dirección para el proveedor"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Calcular sólo reglas de stock mínimo"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Cantidad UdV"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Calcular abastecimientos"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Último error"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "No se utiliza en los cálculos, sólo sirve como información."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Último abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "Bajo pedido"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+"Ha ocurrido una excepción mientras se calculaban órdenes de abastecimiento."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+"Cuando se crea una orden de abastecimiento, su estado es 'Borrador'. \n"
+"Si el abastecimiento se confirma, el estado cambia a 'Confirmada'.           "
+" \n"
+"Después de confirmar el estado se establece como 'En curso'.\n"
+"Si surge cualquier excepción con la orden, el estado pasa a 'Excepción'.\n"
+"Una vez la excepción es solucionada, el estado cambia a 'Preparada'.\n"
+"Está en estado 'En espera' cuando está esperando a que acabe otro "
+"abastecimiento."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Buscar reglas de stock mínimo"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual está por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para aumentar el stock virtual a la cantidad máxima."
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Parámetros planificador"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr "Planificación"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Preparada"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Regla de stock mínimo automática"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Propiedades composición"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Reintentar"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parámetros"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+"Referencia del documento que ha creado este abastecimiento.\n"
+"OpenERP lo completa automáticamente."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr "Órdenes de abastecimiento a procesar"
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Mejor precio (¡todavía no activo!)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Producto y Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Calcular abastecimiento"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Día rango planificador"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+"Una orden de abastecimiento se utiliza para registrar una necesidad de un "
+"producto específico en una ubicación específica. Una orden de abastecimiento "
+"es generalmente creada automáticamente a partir de órdenes de venta, reglas "
+"logísticas Pull o regals de stck mínimo. Cuando la orden de abastecimiento "
+"es confirmada, crea automáticamente las operaciones necesarias para "
+"satisafacer al necesidad: propuesta de orden de compra, orden de fabricaión, "
+"etc."
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:377
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+"No hay suficiente stock y no se ha definido una regla de stock mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Ctdad múltiple"
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+"Si codifica manualmente un abastecimiento, seguramente quiere usar un método "
+"\"Obtener bajo pedido\"."
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Abastecimientos automáticos"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Cantidad máx"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Órdenes de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr "Para corregir"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Asignación desde producción o pedido de compra."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Propiedad"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Solicitud de abastecimiento"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Calcular stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Retrasada"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo para calcular abastecimientos.\n"
+"    "
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr "Órdenes de abastecimiento relacionadas"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+"El asistente comprobará todas las reglas de stock mínimo y generará orden de "
+"abastecimiento."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Cantidad mín"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "más"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:325
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"¡Compruebe la cantidad en la(s) orden(es) de abastecimiento, no debería ser "
+"inferior a 1!"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin "
+"eliminarla."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual se sitúa por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para situar el stock virtual a la cantidad máxima."
+
+#. 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 ""
+"Si el stock de un producto es menor que 0, actuará como una regla de stock "
+"mínimo."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Líneas de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+"Este asistente le permite ejecutar todos los abastecimientos, órdenes de "
+"producción y/o compra que deben de ser procesadas en función de su "
+"configuración. Por defecto, el planificador es ejecutado automáticamente "
+"cada noche por OpenERP. Puede utilizar este menú para ejecutarlo ahora. "
+"Tenga en cuenta que, como se ejecuta en segundo plano, puede que tenga que "
+"esperar unos minutos hasta que termine el proceso."
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Este asistente planificará abastecimientos."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: procurement
+#: 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: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Abastecer productos"
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr "Ord. abastecimiento automática: %s"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr "Regla de stock mínimo automática"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr "Regla de inventario mínimo"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr "Información extra"
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr "Nombre del abastecimiento."
+
+#. module: procurement
+#: 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: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr "Motivo del abastecimiento"
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr "El múltiplo de la cantidad debe ser más grande que cero."
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr "Ordenar el máximo"
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr "Fecha de cierre"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr "El abastecimiento '%s' está en excepción: no suficiente stock."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+"¡No se puede eliminar orden(es) de abastecimiento que están en estado %s!"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:324
+#, python-format
+msgid "Data Insufficient !"
+msgstr "¡Datos insuficientes!"
+
+#. 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 "Grupo de propiedad"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr "Ubicaciones"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr "Ejecutar abastecimiento"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr "La cantidad abastecida será redondeada hacia arriba a este múltiplo."
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr "Modo de reordenar"
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr "No urgente"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular todos los planificadores"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "Abastecimientos en excepción"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr "Excepciones abastecimiento"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr "Reglas de stock mínimo"
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr "Cerrar movimiento al final"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr "Temporal"
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr "mín"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr "Reglas de cantidad"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr "En ejecucion"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+"Puede definir sus reglas de stock mínimo, para que OpenERP cree "
+"automáticamente órdenes de fabricación en borrador o presupuestos de compra "
+"en función del nivel de stock. Cuando el stock virtual de un producto (= "
+"stock físico menos todos los pedidos confirmados y reservas) esté por debajo "
+"de la cantidad mínima, OpenERP generará una solicitud de abastecimiento para "
+"incrementar el stock hasta la cantidad máxima indicada."
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr "Reserva"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr "La forma de abastecer depende del tipo de producto."
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+"Este asistente planificará el abastecimiento de este producto. Este "
+"abastecimiento puede generar tareas, órdenes de producción o pedidos de "
+"compra."
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr "Planificador de MRP y logística"
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "máx"
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:353
+#, python-format
+msgid "from stock: products assigned."
+msgstr "desde stock: productos asignados"
+
+#. 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 "Calcular planificadores"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. 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)."
+msgstr ""
+"Las órdenes de abastecimiento representan la necesidad de una cierta "
+"cantidad de productos en un momento y lugar dado. Los pedidos de venta son "
+"una de las típicas fuentes de órdenes de abastecimiento (pero aquí son "
+"documentos distintos). En función de los parámetros del abastecimiento y la "
+"configuración del producto, el motor de abastecimientos intentará satisfacer "
+"la demanda reservando productos del stock, encargando productos a un "
+"proveedor, elaborando una orden de producción, etc. Una 'Excepción de "
+"abastecimiento' ocurre cuando el sistema no puede encontrar la forma de "
+"satisfacer un abastecimiento. Algunas excepciones se resolverán "
+"automáticamente, pero otras necesitarán intervención manual (éstas se "
+"identificarán por un mensaje de error específico)."
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr "Buscar abastecimiento"
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+"Este es el marco temporal analizado por el planificar al calcular los "
+"abastecimientos. Todas los abastecimientos que no se encuentren entre hoy y "
+"'hoy+rango' se aplazarán a futuros cálculos."
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr "Muy urgente"
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr "Regla de stock mínimo automática"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr "Detalles de abastecimiento"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr "PLANIFICADOR"
diff --git a/addons/procurement/i18n/es_VE.po b/addons/procurement/i18n/es_VE.po
new file mode 100644
index 00000000000..5a33adc9fce
--- /dev/null
+++ b/addons/procurement/i18n/es_VE.po
@@ -0,0 +1,961 @@
+# 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:40+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Solicitar nuevos productos"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Planificaciones"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Realizar abastecimientos"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Dispara un abastecimiento automático para todos los productos que tienen un "
+"stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
+"sugerimos utilizar una configuración de \"Obtener bajo pedido\" en productos."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "¡No se ha definido un proveedor para este producto!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:304
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "No se ha definido una dirección para el proveedor"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Calcular sólo reglas de stock mínimo"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Cantidad UdV"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Calcular abastecimientos"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Último error"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "No se utiliza en los cálculos, sólo sirve como información."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Último abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "Bajo pedido"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+"Ha ocurrido una excepción mientras se calculaban órdenes de abastecimiento."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+"Cuando se crea una orden de abastecimiento, su estado es 'Borrador'. \n"
+"Si el abastecimiento se confirma, el estado cambia a 'Confirmada'.           "
+" \n"
+"Después de confirmar el estado se establece como 'En curso'.\n"
+"Si surge cualquier excepción con la orden, el estado pasa a 'Excepción'.\n"
+"Una vez la excepción es solucionada, el estado cambia a 'Preparada'.\n"
+"Está en estado 'En espera' cuando está esperando a que acabe otro "
+"abastecimiento."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Buscar reglas de stock mínimo"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual está por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para aumentar el stock virtual a la cantidad máxima."
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Parámetros planificador"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr "Planificación"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Preparada"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Regla de stock mínimo automática"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Propiedades composición"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Reintentar"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parámetros"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+"Referencia del documento que ha creado este abastecimiento.\n"
+"OpenERP lo completa automáticamente."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr "Órdenes de abastecimiento a procesar"
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Mejor precio (¡todavía no activo!)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Producto y Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Calcular abastecimiento"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Día rango planificador"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+"Una orden de abastecimiento se utiliza para registrar una necesidad de un "
+"producto específico en una ubicación específica. Una orden de abastecimiento "
+"es generalmente creada automáticamente a partir de órdenes de venta, reglas "
+"logísticas Pull o regals de stck mínimo. Cuando la orden de abastecimiento "
+"es confirmada, crea automáticamente las operaciones necesarias para "
+"satisafacer al necesidad: propuesta de orden de compra, orden de fabricaión, "
+"etc."
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:377
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+"No hay suficiente stock y no se ha definido una regla de stock mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Ctdad múltiple"
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+"Si codifica manualmente un abastecimiento, seguramente quiere usar un método "
+"\"Obtener bajo pedido\"."
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Abastecimientos automáticos"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Cantidad máx"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Órdenes de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr "Para corregir"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Asignación desde producción o pedido de compra."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Propiedad"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Solicitud de abastecimiento"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Calcular stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Retrasada"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo para calcular abastecimientos.\n"
+"    "
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr "Órdenes de abastecimiento relacionadas"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+"El asistente comprobará todas las reglas de stock mínimo y generará orden de "
+"abastecimiento."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Cantidad mín"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "más"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:325
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"¡Compruebe la cantidad en la(s) orden(es) de abastecimiento, no debería ser "
+"inferior a 1!"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin "
+"eliminarla."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual se sitúa por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para situar el stock virtual a la cantidad máxima."
+
+#. 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 ""
+"Si el stock de un producto es menor que 0, actuará como una regla de stock "
+"mínimo."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Líneas de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+"Este asistente le permite ejecutar todos los abastecimientos, órdenes de "
+"producción y/o compra que deben de ser procesadas en función de su "
+"configuración. Por defecto, el planificador es ejecutado automáticamente "
+"cada noche por OpenERP. Puede utilizar este menú para ejecutarlo ahora. "
+"Tenga en cuenta que, como se ejecuta en segundo plano, puede que tenga que "
+"esperar unos minutos hasta que termine el proceso."
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Este asistente planificará abastecimientos."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: procurement
+#: 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: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Abastecer productos"
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr "Ord. abastecimiento automática: %s"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr "Regla de stock mínimo automática"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr "Regla de inventario mínimo"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr "Información extra"
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr "Nombre del abastecimiento."
+
+#. module: procurement
+#: 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: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr "Motivo del abastecimiento"
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr "El múltiplo de la cantidad debe ser más grande que cero."
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr "Ordenar el máximo"
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr "Fecha de cierre"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr "El abastecimiento '%s' está en excepción: no suficiente stock."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+"¡No se puede eliminar orden(es) de abastecimiento que están en estado %s!"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:324
+#, python-format
+msgid "Data Insufficient !"
+msgstr "¡Datos insuficientes!"
+
+#. 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 "Grupo de propiedad"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr "Ubicaciones"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr "Ejecutar abastecimiento"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr "La cantidad abastecida será redondeada hacia arriba a este múltiplo."
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr "Modo de reordenar"
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr "No urgente"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular todos los planificadores"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "Abastecimientos en excepción"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr "Excepciones abastecimiento"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr "Reglas de stock mínimo"
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr "Cerrar movimiento al final"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr "Temporal"
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr "mín"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr "Reglas de cantidad"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr "En ejecucion"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+"Puede definir sus reglas de stock mínimo, para que OpenERP cree "
+"automáticamente órdenes de fabricación en borrador o presupuestos de compra "
+"en función del nivel de stock. Cuando el stock virtual de un producto (= "
+"stock físico menos todos los pedidos confirmados y reservas) esté por debajo "
+"de la cantidad mínima, OpenERP generará una solicitud de abastecimiento para "
+"incrementar el stock hasta la cantidad máxima indicada."
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr "Reserva"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr "La forma de abastecer depende del tipo de producto."
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+"Este asistente planificará el abastecimiento de este producto. Este "
+"abastecimiento puede generar tareas, órdenes de producción o pedidos de "
+"compra."
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr "Planificador de MRP y logística"
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "máx"
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:353
+#, python-format
+msgid "from stock: products assigned."
+msgstr "desde stock: productos asignados"
+
+#. 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 "Calcular planificadores"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. 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)."
+msgstr ""
+"Las órdenes de abastecimiento representan la necesidad de una cierta "
+"cantidad de productos en un momento y lugar dado. Los pedidos de venta son "
+"una de las típicas fuentes de órdenes de abastecimiento (pero aquí son "
+"documentos distintos). En función de los parámetros del abastecimiento y la "
+"configuración del producto, el motor de abastecimientos intentará satisfacer "
+"la demanda reservando productos del stock, encargando productos a un "
+"proveedor, elaborando una orden de producción, etc. Una 'Excepción de "
+"abastecimiento' ocurre cuando el sistema no puede encontrar la forma de "
+"satisfacer un abastecimiento. Algunas excepciones se resolverán "
+"automáticamente, pero otras necesitarán intervención manual (éstas se "
+"identificarán por un mensaje de error específico)."
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr "Buscar abastecimiento"
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+"Este es el marco temporal analizado por el planificar al calcular los "
+"abastecimientos. Todas los abastecimientos que no se encuentren entre hoy y "
+"'hoy+rango' se aplazarán a futuros cálculos."
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr "Muy urgente"
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr "Regla de stock mínimo automática"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr "Detalles de abastecimiento"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr "PLANIFICADOR"
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
index 6895606767f..93ab86cf8c7 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: 2011-06-21 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index 8dad86efb8e..146680e928f 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-14 01:05+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -71,7 +71,7 @@ msgid "Procurement Method"
 msgstr "Méthode d'approvisionnement"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Aucune adresse définie pour le fournisseur"
@@ -308,10 +308,10 @@ msgid ""
 msgstr ""
 "Un ordre d'approvisionnement est utilisé pour enregistrer le besoin d'un "
 "produit spécifique à un endroit spécifique. Un ordre d'approvisionnement est "
-"habituellement créé automatiquement à partir des bons de commande, des "
+"habituellement créé automatiquement à partir des commandes de vente, des "
 "règles de logistique ou des règles de stock minimum. Quand l'ordre "
 "d'approvisionnement est confirmé, il crée automatiquement les opérations "
-"nécessaires pour combler le besoin : proposition de bon de commande, ordre "
+"nécessaires pour combler le besoin : proposition de commandes d'achat, ordre "
 "de fabrication, etc."
 
 #. module: procurement
@@ -331,7 +331,7 @@ msgid "Quantity"
 msgstr "Quantité"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Pas assez de stock, et aucun point de commande minimum défini."
@@ -363,8 +363,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
-"Si vous saisissez manuellement un approvisionnement, vous voulez "
-"probablement utiliser une méthode de fabrication à la commande."
+"Si vous saisissez manuellement un approvisionnement, vous voudrez "
+"probablement choisir \"Production à la demande\"."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
@@ -402,7 +402,7 @@ msgstr "Exceptions"
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
 msgstr ""
-"Affectation à partir d'un ordre de fabrication ou d'un bon de commande."
+"Affectation à partir d'un ordre de fabrication ou d'une commande d'achat."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -470,7 +470,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -501,7 +501,7 @@ msgstr ""
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
-"Si le stock d'un produit est négatif, il est considéré comme un point de "
+"Si le stock d'un produit est négatif, cela sera considéré comme un point de "
 "commande"
 
 #. module: procurement
@@ -650,7 +650,7 @@ msgstr ""
 "l'état %s !"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Données insuffisantes"
@@ -675,7 +675,7 @@ msgstr "Emplacements"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr "du stock"
+msgstr "Sur stock"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -737,7 +737,7 @@ msgstr "Actuel"
 #. module: procurement
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr "Besoins en exception"
+msgstr "Approvisionnements en exception"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -814,7 +814,7 @@ msgstr "UdM du produit"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr "Fabrication à la commande"
+msgstr "Production à la demande"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -852,7 +852,7 @@ msgstr "Réservation"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr "Le moyen de satisfaire le besoin dépend du type de produit"
+msgstr "Le moyen d’approvisionnement dépend du type de produit"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -886,10 +886,10 @@ msgid "Product UoS"
 msgstr "UdV du produit"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
-msgstr "à partir du stock : produits affectés."
+msgstr "Sur stock : produits affectés."
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
@@ -913,16 +913,17 @@ msgid ""
 "message)."
 msgstr ""
 "Les ordres d'approvisionnement représentent le besoin d'une certaine "
-"quantité de produit, à un moment et pour un emplacement donnés. Les bons de "
-"commande sont une source typique d'ordres d'approvisionnement (mais ce sont "
-"des documents distincts). Selon les paramètres d'approvisionnement et la "
-"configuration du produit, le moteur d'approvisionnement essaiera de "
-"satisfaire le besoin en allouant des produits à partir du stock, en "
-"commandant les produits à un fournisseur, ou en passant un ordre de "
-"fabrication, etc. Un incident d'approvisionnement arrive quand le système ne "
-"trouve pas de moyen pour satisfaire le besoin. Quelques incidents se "
-"résoudront automatiquement, mais d'autres nécessiteront une intervention "
-"manuelle (ceux-ci sont identifiés par un message d'erreur particulier)."
+"quantité de produit, à un moment et pour un emplacement donnés. Les "
+"commandes de vente sont une source typique d'ordres d'approvisionnement "
+"(mais ce sont des documents distincts). Selon les paramètres "
+"d'approvisionnement et la configuration du produit, le moteur "
+"d'approvisionnement essaiera de satisfaire le besoin en allouant des "
+"produits à partir du stock, en commandant les produits à un fournisseur, ou "
+"en passant un ordre de fabrication, etc. Un incident d'approvisionnement "
+"arrive quand le système ne trouve pas de moyen pour satisfaire le besoin. "
+"Quelques incidents se résoudront automatiquement, mais d'autres "
+"nécessiteront une intervention manuelle (ceux-ci sont identifiés par un "
+"message d'erreur particulier)."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -965,70 +966,3 @@ msgstr "Détails de l'approvisionnement"
 #, python-format
 msgid "SCHEDULER"
 msgstr "PLANIFICATEUR"
-
-#~ msgid ""
-#~ "Procurement Orders represent the need for a certain quantity of products, at "
-#~ "a given time, in a given location. Sale Orders are one typical source of "
-#~ "Procurement Orders (but these are distinct documents). Depending on the "
-#~ "procurement parameters and the products configuration, the procurement "
-#~ "engine will attempt to satisfy the need by reserving products from stock, or "
-#~ "ordering products from a supplier, or passing a manufacturing order, etc. A "
-#~ "Procurement Exception occurs when the system cannot find a way to fulfill a "
-#~ "procurement. Some exceptions will resolve themselves automatically, but "
-#~ "others require manual intervention (those are identified by a specific error "
-#~ "message)"
-#~ msgstr ""
-#~ "Un ordre d'approvisionnement représente un besoin pour une quantité donnée "
-#~ "de produits, à un instant donné, dans un emplacement donné. Les commandes de "
-#~ "vente sont typiquement une source d'ordres d'approvisionnement (mais ce sont "
-#~ "deux entités distinctes). En fonction des paramètres d'approvisionnement et "
-#~ "de la configuration des produits, le calcul d'approvisionnement va essayer "
-#~ "de couvrir le besoin soit par une réservation sur le stock, soit par une "
-#~ "commande auprès d'un fournisseur, soit par un ordre de fabrication, etc... "
-#~ "Une exception d'approvisionnement est déclenchée quand le système ne "
-#~ "parvient pas à trouver de façons de couvrir le besoin. Certaines exceptions "
-#~ "se résolvent automatiquement, mais d'autres nécessitent une intervention "
-#~ "manuelle (celles-ci sont identifiées par un message d'erreur spécifique)."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
-
-#~ msgid ""
-#~ "A procurement order is used to record a need in a specific product at a "
-#~ "specific location. They are usually created automatically by the sales "
-#~ "orders, the Pull Logistics rules or the minimum stock rules. When the "
-#~ "procurement order is confirmed, it creates automatically the necessary "
-#~ "operations to fullfil the need: purchase order proposition, manufacturing "
-#~ "order, etc."
-#~ msgstr ""
-#~ "Un ordre d'approvisionnement est utilisé pour enregistrer un besoin sur un "
-#~ "produit donné dans un emplacement donné. Ils sont en général créés "
-#~ "automatiquement par les commandes de vente, les règles de flux tirés ou les "
-#~ "règles de stock minimum. Quand l'ordre d'approvisionnement est confirmé, il "
-#~ "génère automatiquement les opérations nécessaires pour remplir le besoin : "
-#~ "proposition de bon de commande, ordre de fabrication, etc..."
-
-#~ msgid ""
-#~ "You can define your minimum stock rules, so that OpenERP will trigger "
-#~ "automatically the propositions of manufacturing or purchase orders according "
-#~ "to the stock level. Once the virtual stock of a product (=stock on hand "
-#~ "minus all confirmed orders and reservations) is bellow the minimum quantity, "
-#~ "OpenERP will generate a procurement request in order to fullfil the stock up "
-#~ "to the maximum quantity."
-#~ msgstr ""
-#~ "Vous pouvez définir vos règles de stock minimum, de telle façon qu'OpenERP "
-#~ "déclenche les propositions de bon de commande ou les ordre de fabrication en "
-#~ "fonction du niveau de stock. Lorsque le stock virtuel (=le stock disponible "
-#~ "moins tous les ordres confirmés et les réservations) passe sous la quantité "
-#~ "minimale, OpenERP va générer une demande d'approvisionnement pour remonter "
-#~ "le stock jusqu'à la quantité maximale."
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "Ceci est l'intervalle de temps analysé par le calcul des besoins lors du "
-#~ "calcul des approvisionnements. Tous les approvisionnements qui ne se situent "
-#~ "pas entre \"aujourd'hui\" et \"aujourd'hui + intervalle\" sont ignorés lors "
-#~ "des calculs."
diff --git a/addons/procurement/i18n/gl.po b/addons/procurement/i18n/gl.po
index f6efc0a6272..ae6612231e0 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: 2011-05-14 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -611,7 +611,7 @@ msgstr "Debe asignar un lote de produción para este produto"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Reason"
-msgstr ""
+msgstr "Motivo do abastecemento"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
diff --git a/addons/procurement/i18n/hu.po b/addons/procurement/i18n/hu.po
index ef69ed8ffe2..a2f8bf847a1 100644
--- a/addons/procurement/i18n/hu.po
+++ b/addons/procurement/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-04 15:02+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -66,7 +67,7 @@ msgid "Procurement Method"
 msgstr "Beszerzési módszer"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Nincs cím megadva a szállítóhoz"
@@ -305,7 +306,7 @@ msgid "Quantity"
 msgstr "Mennyiség"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -436,7 +437,7 @@ msgid "plus"
 msgstr "plusz"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -598,7 +599,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Elégtelen adat !"
@@ -822,7 +823,7 @@ msgid "Product UoS"
 msgstr "Termék eladási egysége"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
diff --git a/addons/procurement/i18n/id.po b/addons/procurement/i18n/id.po
index 0b8f6d7c463..372902b7aff 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -70,7 +70,7 @@ msgid "Procurement Method"
 msgstr "Metode Pengadaan"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Tidak ada alamat yang ditetapkan  untuk  suplier"
@@ -317,7 +317,7 @@ msgid "Quantity"
 msgstr "Kuantitas"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -453,7 +453,7 @@ msgid "plus"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -630,7 +630,7 @@ msgstr ""
 "Tidak dapat menghapus Procurement Order (s) yang berada di% s Negara!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Data tidak memadai"
@@ -856,7 +856,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index 7ec14705aef..b0d36d1c06e 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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -70,7 +70,7 @@ msgid "Procurement Method"
 msgstr "Metodo approvvigionamento"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Nessun indirizzo definito per il fornitore"
@@ -323,7 +323,7 @@ msgid "Quantity"
 msgstr "Quantità"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -462,7 +462,7 @@ msgid "plus"
 msgstr "più"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -640,7 +640,7 @@ msgstr ""
 "Impossibile eliminare Ordini di approvvigionamento che sono nella stato %s!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dati insufficienti !"
@@ -868,7 +868,7 @@ msgid "Product UoS"
 msgstr "Unità di vendita del prodotto"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "Da magazzino: prodotto assegnato."
@@ -933,70 +933,3 @@ msgstr "Dettagli approvvigionamento"
 #, python-format
 msgid "SCHEDULER"
 msgstr "PIANIFICATORE"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid ""
-#~ "A procurement order is used to record a need in a specific product at a "
-#~ "specific location. They are usually created automatically by the sales "
-#~ "orders, the Pull Logistics rules or the minimum stock rules. When the "
-#~ "procurement order is confirmed, it creates automatically the necessary "
-#~ "operations to fullfil the need: purchase order proposition, manufacturing "
-#~ "order, etc."
-#~ msgstr ""
-#~ "Un ordine di approvvigionamento è utilizzato per registrare la necessità di "
-#~ "uno specifico prodotto in una specifica locazione. Solitamente sono generati "
-#~ "automaticamente dagli ordini di vendita, dalle regole logistiche 'Pull' o "
-#~ "dalle regole di stock minimo. Quando l'ordine di approvvigionamento è "
-#~ "confermato, crea automaticamente le operazioni necessarie per rispondere "
-#~ "alla richiesta: proposta di ordine d'acquisto, ordine di produzione, ecc."
-
-#~ msgid ""
-#~ "You can define your minimum stock rules, so that OpenERP will trigger "
-#~ "automatically the propositions of manufacturing or purchase orders according "
-#~ "to the stock level. Once the virtual stock of a product (=stock on hand "
-#~ "minus all confirmed orders and reservations) is bellow the minimum quantity, "
-#~ "OpenERP will generate a procurement request in order to fullfil the stock up "
-#~ "to the maximum quantity."
-#~ msgstr ""
-#~ "E' possibile definire regole di stock minimo, di modo che OpenERP genererà "
-#~ "automaticamente le proposte di ordini di produzione o di acquisto a seconda "
-#~ "del livello di giacenza. Una volta che la giacenza virtuale di un prodotto "
-#~ "(=giacenza a disposizione meno tutti gli ordini confermati e le riserve) "
-#~ "scende sotto la quantità minima, OpenERP genererà una richiesta di "
-#~ "approvvigionamento per riempire il magazzino fino alla quantità massima."
-
-#~ msgid ""
-#~ "Procurement Orders represent the need for a certain quantity of products, at "
-#~ "a given time, in a given location. Sale Orders are one typical source of "
-#~ "Procurement Orders (but these are distinct documents). Depending on the "
-#~ "procurement parameters and the products configuration, the procurement "
-#~ "engine will attempt to satisfy the need by reserving products from stock, or "
-#~ "ordering products from a supplier, or passing a manufacturing order, etc. A "
-#~ "Procurement Exception occurs when the system cannot find a way to fulfill a "
-#~ "procurement. Some exceptions will resolve themselves automatically, but "
-#~ "others require manual intervention (those are identified by a specific error "
-#~ "message)"
-#~ msgstr ""
-#~ "Gli ordini di approvvigionamento rappresentano la necessità di avere una "
-#~ "certa quantità di prodotti, in un momento stabilito, in un posto stabilito. "
-#~ "Gli ordini di vendita sono una tipica origine di ordini di "
-#~ "approvvigionamento (ma sono documenti diversi). A seconda dei parametri di "
-#~ "approvvigionamento e della configurazione dei prodotti, il motore di "
-#~ "approvvigionamento cercherà di soddisfare le necessità conservando i "
-#~ "prodotti in magazzino, ordinando prodotti ad un fornitore, proponendo un "
-#~ "ordine di produzione, ecc... Gli errori di approvvigionamento si verificano "
-#~ "quando il sistema non trova il modo di soddisfare un approvvigionamento. "
-#~ "Qualche errore si risolve automaticamente, ma altri richiedono l'intervento "
-#~ "manuale (questi sono identificati da un messaggio di errore specifico)"
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "Questa è la cornice di tempo analizzata dal pianificatore al momento di "
-#~ "calcolare gli approvvigionamenti. Tutti gli approvvigionamenti che non si "
-#~ "trovano nell'intervallo fra oggi e oggi+range vengono saltati per un calcolo "
-#~ "futuro."
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index ca02ffb25a2..a3e363e9c39 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -69,7 +69,7 @@ msgid "Procurement Method"
 msgstr "Нөхөн дүүргэх хэлбэр"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Нийлүүлэгчийн хаяг байхгүй"
@@ -320,7 +320,7 @@ msgid "Quantity"
 msgstr "Тоо хэмжээ"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Хангалттай бараа байхгүй, зохистой нөөцийн дүрэм байхгүй."
@@ -458,7 +458,7 @@ msgid "plus"
 msgstr "нэмэх"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -631,7 +631,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "%s төлөвтэй нөхөн дүүргэлтийн захиалгыг устгах боломжгүй!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Өгөгдөл хангалтгүй !"
@@ -860,7 +860,7 @@ msgid "Product UoS"
 msgstr "Хоёрдогч х.нэгж"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "агуулахаас: бараа хувиарлагдсан."
@@ -925,106 +925,3 @@ msgstr "Нөхөн дүүргэлтийн дэлгэрэнгүй"
 #, python-format
 msgid "SCHEDULER"
 msgstr "ТӨЛӨВЛӨГЧ"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Алдаатай аргумент"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
-
-#, python-format
-#~ msgid "Project_mrp module not installed !"
-#~ msgstr "Project_mrp модуль суугаагүй !"
-
-#, python-format
-#~ msgid "is done."
-#~ msgstr "дууссан."
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "Үйлдвэрлэл & Логистик"
-
-#, python-format
-#~ msgid "has an exception."
-#~ msgstr "алдаатай."
-
-#, python-format
-#~ msgid "is running."
-#~ msgstr "ажиллаж байна."
-
-#, python-format
-#~ msgid "Not enough stock "
-#~ msgstr "Нөөц хүрэлцэхгүй "
-
-#~ msgid ""
-#~ "Wizard run all the procurements, and generate task, production order or "
-#~ "purchase order based on the product type"
-#~ msgstr ""
-#~ "Визард нь татан авалтыг ажиллуулдаг ба даалгавруудыг биелүүлдэг, барааны "
-#~ "захиалга эсвэл худалдан авалтын захиалга нь барааны төрлөөс хамаарна."
-
-#, python-format
-#~ msgid ""
-#~ "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-#~ "        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-#~ "\n"
-#~ "    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-#~ "        \"\"\" Finds UoM and UoS of changed product.\n"
-#~ "        @param product_id: Changed id of product.\n"
-#~ "        @return: Dictionary of values.\n"
-#~ "        \"\"\"\n"
-#~ "        if product_id:\n"
-#~ "            w = self.pool.get('product.product"
-#~ msgstr ""
-#~ "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-#~ "        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-#~ "\n"
-#~ "    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-#~ "        \"\"\" Finds UoM and UoS of changed product.\n"
-#~ "        @param product_id: Changed id of product.\n"
-#~ "        @return: Dictionary of values.\n"
-#~ "        \"\"\"\n"
-#~ "        if product_id:\n"
-#~ "            w = self.pool.get('product.product"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "Энэ бол автомат төлөвлөгч ямар цар хүрээнд төлөвлөгдсөн захиалгуудыг "
-#~ "автоматаар шалгаж гүйцэтгэж байх вэ гэдгийг тохируулах өдрийн тоо юм. "
-#~ "Өнөөдөр + цар хүрээ = Захиалгын төлөвлөсөн огнооны хязгаар байх бөгөөд энэ "
-#~ "хязгаараас давж буй захиалгыг шалгахгүй орхино."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Системд зөвхөн идэвхитэй дүрмүүд хэрэглэгдэх бөгөөд энэ талбарын "
-#~ "тусламжтайгаар тухайн нөөцийн дүрмийг түр хугацаагаар ашиглагдахааргүй "
-#~ "болгох боломжтой."
-
-#~ msgid "Temporary Procurement Exceptions"
-#~ msgstr "Нөхөн дүүргэлтийн түр саналууд"
-
-#~ msgid "Procurement Exceptions to Fix"
-#~ msgstr "Нөхөн дүүргэлтийн засах саналууд"
-
-#, python-format
-#~ msgid "Procurement "
-#~ msgstr "Нөхөн дүүргэлт "
diff --git a/addons/procurement/i18n/nb.po b/addons/procurement/i18n/nb.po
index b4cb27bbb3f..9f6a2d32e43 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -67,7 +67,7 @@ msgid "Procurement Method"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr ""
@@ -306,7 +306,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -437,7 +437,7 @@ msgid "plus"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -599,7 +599,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -823,7 +823,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index e683d4c928a..41f2b1030aa 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -70,7 +70,7 @@ msgid "Procurement Method"
 msgstr "Verwervingswijze"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Geen adres gedefinieerd voor de leverancier"
@@ -329,7 +329,7 @@ msgid "Quantity"
 msgstr "Aantal"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Onvoldoende voorraad en geen minimum bestelpunt gedefinieerd."
@@ -467,7 +467,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -644,7 +644,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "Kan geen verwervingsopdracht(en) verwijderen die in status %s zijn!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Onvoldoende gegevens !"
@@ -878,7 +878,7 @@ msgid "Product UoS"
 msgstr "Verkoopeenheid"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "uit voorraad: producten toegewezen."
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index 2ebf589dca1..2a9d251506c 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -70,7 +70,7 @@ msgid "Procurement Method"
 msgstr "Metoda zapotrzebowania"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Nie zdefiniowano adresu dla dostawcy"
@@ -323,7 +323,7 @@ msgid "Quantity"
 msgstr "Ilość"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Brak zapasu i brak reguły minimalnego zapasu"
@@ -460,7 +460,7 @@ msgid "plus"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -631,7 +631,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "Nie mozna usunąć Zapotrzebowania, które jest w stanie %s !"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Zbyt mało danych !"
@@ -857,7 +857,7 @@ msgid "Product UoS"
 msgstr "JS produktu"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "z zapasu: produkty przypisano."
@@ -922,143 +922,3 @@ msgstr "Szczegóły zapotrzebowania"
 #, python-format
 msgid "SCHEDULER"
 msgstr ""
-
-#, python-format
-#~ msgid "has an exception."
-#~ msgstr "ma wyjątek."
-
-#~ msgid "Temporary Procurement Exceptions"
-#~ msgstr "Tymczasowe wyjątki zapotrzebowania"
-
-#~ msgid "Procurement Exceptions to Fix"
-#~ msgstr "Wyjątki zapotrzebowania do poprawy"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "MRP i planowanie logistyczne"
-
-#~ msgid ""
-#~ "Wizard run all the procurements, and generate task, production order or "
-#~ "purchase order based on the product type"
-#~ msgstr ""
-#~ "Kreator uruchomi wszystkie zapotrzebowania, wygeneruje zadania, zamówienia "
-#~ "produkcji lub zamówienia zakupu w oparciu o typ produktu."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Nieprawidłowe parametry"
-
-#, python-format
-#~ msgid "Procurement "
-#~ msgstr "Zapotrzebowanie "
-
-#~ 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 "is running."
-#~ msgstr "jest uruchomione."
-
-#, python-format
-#~ msgid "Not enough stock "
-#~ msgstr "Brak zapasu "
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "To jest czasowa rama obliczeń planisty zapotrzebowań. Zapotrzebowania poza "
-#~ "datą dzisiejszą i dzisiejszą+zakres są pomijane w tym obliczeniu (będą "
-#~ "obliczone później)."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Jeśli pole Aktywne jest zaznaczone, to punkt zamawiania zostanie ukryty bez "
-#~ "konieczności jego usuwania."
-
-#, python-format
-#~ msgid "Project_mrp module not installed !"
-#~ msgstr "Nie zainstalowano modułu Project_mrp !"
-
-#, python-format
-#~ msgid "is done."
-#~ msgstr "zostało wykonane."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane w obiektach osv_memory !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid ""
-#~ "A procurement order is used to record a need in a specific product at a "
-#~ "specific location. They are usually created automatically by the sales "
-#~ "orders, the Pull Logistics rules or the minimum stock rules. When the "
-#~ "procurement order is confirmed, it creates automatically the necessary "
-#~ "operations to fullfil the need: purchase order proposition, manufacturing "
-#~ "order, etc."
-#~ msgstr ""
-#~ "Zapotrzebowanie jest stosowane do zarejestrowania potrzeby posiadania "
-#~ "konkretnego produktu w konkretnej strefie magazynowej. Zwykle "
-#~ "zapotrzebowania są tworzone automatycznie przez zamówienia sprzedaży, reguły "
-#~ "zapotrzebowań wewnętrznych (Pull Logistics) lub reguły minimalnych zapasów. "
-#~ "Kiedy Zapotrzebowanie jest potwierdzone, to tworzy ono automatycznie "
-#~ "operacje spełniające zapotrzebowanie: propozycję zamówienia zakupu, "
-#~ "zamówienie produkcji itp."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid ""
-#~ "You can define your minimum stock rules, so that OpenERP will trigger "
-#~ "automatically the propositions of manufacturing or purchase orders according "
-#~ "to the stock level. Once the virtual stock of a product (=stock on hand "
-#~ "minus all confirmed orders and reservations) is bellow the minimum quantity, "
-#~ "OpenERP will generate a procurement request in order to fullfil the stock up "
-#~ "to the maximum quantity."
-#~ msgstr ""
-#~ "Możesz zdefiniować regułę minimalnego zapasu, aby OpenERP automatycznie "
-#~ "wyzwolił propozycję produkcji lub zakupu w zależności od poziomu zapasu. "
-#~ "Kiedy zapas wirtualny (=zapas rzeczywisty minus potwierdzone zamówienia "
-#~ "sprzedaży) będzie poniżej ilości minimalnej, OpenERP wygeneruje "
-#~ "Zapotrzebowanie, aby uzupełnić zapas do ilości maksymalnej."
-
-#~ msgid ""
-#~ "Procurement Orders represent the need for a certain quantity of products, at "
-#~ "a given time, in a given location. Sale Orders are one typical source of "
-#~ "Procurement Orders (but these are distinct documents). Depending on the "
-#~ "procurement parameters and the products configuration, the procurement "
-#~ "engine will attempt to satisfy the need by reserving products from stock, or "
-#~ "ordering products from a supplier, or passing a manufacturing order, etc. A "
-#~ "Procurement Exception occurs when the system cannot find a way to fulfill a "
-#~ "procurement. Some exceptions will resolve themselves automatically, but "
-#~ "others require manual intervention (those are identified by a specific error "
-#~ "message)"
-#~ msgstr ""
-#~ "Zapotrzebowania reprezentują potrzebę dostarczenia pewnej ilości produktu w "
-#~ "określonym czasie do określonej strefy. Typowym źródłem utworzenia "
-#~ "Zapotrzebowania jest Zamówienie sprzedaży. Zależnie od konfiguracji "
-#~ "Zapotrzebowanie spowoduje rezerwację produktu w zapasie, zamówienie zakupu "
-#~ "produktu u dostawcy lub wygeneruje zamówienie produkcji na dany produkt. "
-#~ "Wyjątki zapotrzebowania występują kiedy system nie może wykonać "
-#~ "zapotrzebowania. Niektóre wyjątki rozwiążą się same, ale do niekŧórych "
-#~ "wymagana jest ręczna interwencja."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index adc75715971..7fbcfb0ec74 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -67,7 +67,7 @@ msgid "Procurement Method"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Não há um endereço definido para este fornecedor!"
@@ -306,7 +306,7 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -437,7 +437,7 @@ msgid "plus"
 msgstr "mais"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -599,7 +599,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Insuficiência de dados!"
@@ -823,7 +823,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
diff --git a/addons/procurement/i18n/pt_BR.po b/addons/procurement/i18n/pt_BR.po
index 3a28aed75ba..c0ec50bf4c8 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -71,7 +71,7 @@ msgid "Procurement Method"
 msgstr "Método de Aquisição"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Nenhum endereço definido para o fornecedor"
@@ -328,7 +328,7 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Estoque insuficiente e sem mínimo definido para ponto de pedido."
@@ -466,7 +466,7 @@ msgid "plus"
 msgstr "mais"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -643,7 +643,7 @@ msgstr ""
 "Pedidos de Aquisição não podem ser excluídos quando estão com status %s!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dados insuficientes!"
@@ -875,7 +875,7 @@ msgid "Product UoS"
 msgstr "Unid. de Venda do Produto"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "do estoque: produtos atribuídos."
diff --git a/addons/procurement/i18n/ro.po b/addons/procurement/i18n/ro.po
index 68c2c05ab6a..b52b867e75f 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -70,7 +70,7 @@ msgid "Procurement Method"
 msgstr "Metodă de planificare"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Nici o adresa definită pentru funizor"
@@ -327,7 +327,7 @@ msgid "Quantity"
 msgstr "Cantitate"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -462,7 +462,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -633,7 +633,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "Nu puteți șterge Comanda(e) Planificate ce sunt în starea %s"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Date insuficiente !"
@@ -866,7 +866,7 @@ msgid "Product UoS"
 msgstr "UdV produs"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "din stoc: produse asignate."
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 73276b43bfd..e2f5dbc2840 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -43,23 +43,23 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Group By..."
-msgstr "Объединять по..."
+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:288
 #, python-format
 msgid "No supplier defined for this product !"
-msgstr "Для этого изделия/материала не задан поставщик!"
+msgstr "Не задан поставщик для ТМЦ!"
 
 #. module: procurement
 #: field:make.procurement,uom_id:0
 msgid "Unit of Measure"
-msgstr "Ед. изм."
+msgstr "Единица измерения"
 
 #. module: procurement
 #: field:procurement.order,procure_method:0
@@ -67,10 +67,10 @@ msgid "Procurement Method"
 msgstr "Метод снабжения"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
-msgstr "Нет адрес поставщика"
+msgstr "Нет адреса поставщика"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -122,12 +122,12 @@ msgstr "Примечания"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr "в заказе"
+msgstr "по заказу"
 
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr "Исключительная ситуация во время создания заказа на снабжение."
+msgstr "Исключительная ситуация во время вычисления заказа на снабжение."
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -290,7 +290,7 @@ msgstr "Снабжение"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Предел планировщика в днях"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
@@ -320,7 +320,7 @@ msgid "Quantity"
 msgstr "Количество"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -381,7 +381,7 @@ msgstr "Заказы на снабжение"
 #. module: procurement
 #: view:procurement.order:0
 msgid "To Fix"
-msgstr ""
+msgstr "Исправить"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -458,7 +458,7 @@ msgid "plus"
 msgstr "плюс"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -473,6 +473,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Если поле \"Активно\" имеет значение \"Ложь\", это позволит скрыть точку "
+"заказа не удаляя её."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -630,7 +632,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "Нельзя удалить заказ(ы) на снабжение в состоянии %s !"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Недостаточно данных !"
@@ -728,7 +730,7 @@ msgstr "Детали"
 #: model:ir.actions.act_window,name:procurement.procurement_exceptions
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 msgid "Procurement Exceptions"
-msgstr "Исключитель"
+msgstr "Проблемы снабжения"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -814,6 +816,12 @@ msgid ""
 "will generate a procurement request to increase the stock up to the maximum "
 "quantity."
 msgstr ""
+"Вы можете определить правило минимальных запасов так, что OpenERP будет "
+"автоматически создавать черновики заказов на производство или  закупку в "
+"соответствии с количеством запасов. Если минимальное количество ТМЦ (= "
+"остаток на складе минус все подтвержденные заказы и зарезервированное) "
+"меньше минимального количества, OpenERP будет генерировать запрос на "
+"снабжение для увеличения остатка до максимального количества."
 
 #. module: procurement
 #: field:procurement.order,move_id:0
@@ -856,7 +864,7 @@ msgid "Product UoS"
 msgstr "Вторая ед. изм."
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "со склада: ТМЦ определены."
@@ -933,50 +941,3 @@ msgstr "Детали снабжения"
 #, python-format
 msgid "SCHEDULER"
 msgstr "ПЛАНИРОВЩИК"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Temporary Procurement Exceptions"
-#~ msgstr "Временные исключения снабжения"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "ПМР и Логистическое планирование"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Недопустимые аргументы"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#, python-format
-#~ msgid "Procurement "
-#~ msgstr "Снабжение "
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "Это временные рамки, обрабатываемые планировщиком при расчете снабжения. Все "
-#~ "снабжение, которое не находится между сегодня и сегодня+срок оставляется для "
-#~ "будущих расчетов."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Если значение активного поля \"истина\", то это позволит вам скрыть точку "
-#~ "заказа"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Для объектов osv_memory правила не поддерживаются !"
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index a05a919c2cb..318f255794d 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -70,7 +70,7 @@ msgid "Procurement Method"
 msgstr "Metod Nabavke"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Adresa za ovog dobavljaca nije definisana"
@@ -320,7 +320,7 @@ msgid "Quantity"
 msgstr "Kolicina"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Nedovoljno definisana pravila za lager i minimalnu tacku narucivanja"
@@ -455,7 +455,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -627,7 +627,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "Ne mogu izbrisati Zahtev za Nabavku koji se nalazi u %s Stanju!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Nedovoljno podataka !"
@@ -853,7 +853,7 @@ msgid "Product UoS"
 msgstr "JU Proizvoda"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "iz lagera: dodeljeni proizvodi"
@@ -918,42 +918,3 @@ msgstr "detalji Nabavke"
 #, python-format
 msgid "SCHEDULER"
 msgstr "ROKOVNIK ( Scheduler)"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravmo ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "MRP & Zakazivanje Logistike"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni argumenti"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes tacku "
-#~ "Narucivanja bez uklanjanja."
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "Ovo je vreme , fragment, analiziran od strane sheduler-a kada izracunava "
-#~ "nabavke. Sve nabavke koje nisu izmedju danas i danas + opseg, su preskocene "
-#~ "za buduca izracunavanja."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index 5e3e6761ded..5e8c017db82 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -70,7 +70,7 @@ msgid "Procurement Method"
 msgstr "Metod Nabavke"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Adresa za ovog dobavljaca nije definisana"
@@ -320,7 +320,7 @@ msgid "Quantity"
 msgstr "Kolicina"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Nedovoljno definisana pravila za lager i minimalnu tacku narucivanja"
@@ -455,7 +455,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -627,7 +627,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr "Ne mogu izbrisati Zahtev za Nabavku koji se nalazi u %s Stanju!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Nedovoljno podataka !"
@@ -853,7 +853,7 @@ msgid "Product UoS"
 msgstr "JU Proizvoda"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr "iz lagera: dodeljeni proizvodi"
@@ -918,42 +918,3 @@ msgstr "detalji Nabavke"
 #, python-format
 msgid "SCHEDULER"
 msgstr "ROKOVNIK ( Scheduler)"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravmo ime modela u definiciji akcije."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
-
-#~ msgid "MRP & Logistic Scheduler"
-#~ msgstr "MRP & Zakazivanje Logistike"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid ""
-#~ "This is the time frame analysed by the scheduler when computing "
-#~ "procurements. All procurements that are not between today and today+range "
-#~ "are skipped for futur computation."
-#~ msgstr ""
-#~ "Ovo je vreme , fragment, analiziran od strane sheduler-a kada izracunava "
-#~ "nabavke. Sve nabavke koje nisu izmedju danas i danas + opseg, su preskocene "
-#~ "za buduca izracunavanja."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the orderpoint "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes tacku "
-#~ "Narucivanja bez uklanjanja."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 3f407069920..1432f86af9e 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index c118b212264..234d5b50a44 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr "Yeni Ürün Oluştur"
+msgstr "Yeni Ürün İste"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr "Zamanlayıcılar"
+msgstr "Planlayıcılar"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr "Sipariş Oluştur"
+msgstr "Tedarik Oluştur"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -46,18 +46,18 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Group By..."
-msgstr "Grupla..."
+msgstr "Gruplandır..."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
-msgstr ""
+msgstr "Sipariş noktası konumunun ve ürünün taslak tedariki"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:288
 #, python-format
 msgid "No supplier defined for this product !"
-msgstr "Bu ürün için tedarikçi tanımı bulunamadı!"
+msgstr "Bu ürün için tedarikçi tanımı yok!"
 
 #. module: procurement
 #: field:make.procurement,uom_id:0
@@ -67,13 +67,13 @@ msgstr "Ölçü Birimi"
 #. module: procurement
 #: field:procurement.order,procure_method:0
 msgid "Procurement Method"
-msgstr "Satınalma Yöntemi"
+msgstr "Tedarik Yöntemi"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
-msgstr "Bu tedarikçi için bir adres tanımı bulunamadı!"
+msgstr "Tedarikçi için bir adres tanımlanmaış!"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -89,18 +89,18 @@ msgstr "Firma"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr ""
+msgstr "2.Br. Miktarı"
 
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,name:0
 msgid "Reason"
-msgstr "Sebep"
+msgstr "Neden"
 
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Tedarikleri Hesapla"
 
 #. module: procurement
 #: field:procurement.order,message:0
@@ -115,7 +115,7 @@ msgstr "Sadece bilgi amaçlıdır, hesaplamalarda kullanılmaz."
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr "Son satınalma"
+msgstr "Son tedarik"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -125,12 +125,12 @@ msgstr "Notlar"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr "Sipariş"
+msgstr "sipariş üzerine"
 
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr "Satınalma emirlerini işlerken bir istisna oluştu."
+msgstr "Tedarik emirlerini işlerken bir kuraldışılık oluştu."
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -144,12 +144,12 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
-"Satınalma ilk  'Taslak' durumunda oluşturulur.\n"
-" Satınalma onaylandığında durumu 'Onaylandı' olur.            \n"
+"Tedarik ilk  'Taslak' durumunda oluşturulur.\n"
+" Tedarik onaylandığında durumu 'Onaylandı' olur.            \n"
 "Onaylandıktan sonra durumu 'Yolda' olur.\n"
 " Bir istisna oluşursa durumu 'İstisna' olur.\n"
 " İstisna kaldırıldıktan sonra 'Hazır' durumuna geçer.\n"
-" Başka bir satınalmanın tamamlanmasını bekliyorsa 'Beklemede' durumundadır."
+" Başka bir tedariğin tamamlanmasını bekliyorsa 'Beklemede' durumundadır."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -168,7 +168,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr "Zamanlayıcı Parametreleri"
+msgstr "Planlamacı Katsayıları"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
@@ -178,7 +178,7 @@ msgstr "Stok Hareketi"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Planification"
-msgstr ""
+msgstr "Planlama"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -193,7 +193,7 @@ msgstr "Otomatik Sipariş Noktası"
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr "Özellik Birleşimi"
+msgstr "Bileşim Özellikleri"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -209,7 +209,7 @@ msgstr "Yeniden Dene"
 #: view:procurement.order.compute:0
 #: view:procurement.orderpoint.compute:0
 msgid "Parameters"
-msgstr "Parametreler"
+msgstr "Katsayılar"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -221,18 +221,17 @@ msgstr "Onayla"
 msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
-msgstr ""
-"Open ERP, bu satınalmayı başlatan belgeyi otomatik olarak kapamıştır."
+msgstr "Open ERP, bu tedariği başlatan belgeyi otomatik olarak kapamıştır."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "İşlenecek Tedarik Emirleri"
 
 #. module: procurement
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -300,6 +299,12 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
+"Bir satınalma emri belirli bir lokasyondaki belirli bir ürün için gerekli "
+"olan şeyi kaydetmek için kullanılır. Satınalma emri genellikle satış "
+"emirlerinden, Pull Logistics kuralı veya Minimum Stok Kurallarından otomatik "
+"olarak oluşturulur. Satınalma emri onaylandığında, satınalma emri teklifi, "
+"üretim emri vb. gereklilikleri sağlamak için gerekli operasyonları otomatik "
+"olarak oluşturur."
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -318,7 +323,7 @@ msgid "Quantity"
 msgstr "Miktar"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "Yeterli stok yok ve minimum sipariş noktası kuralı tanımlı değil!"
@@ -342,7 +347,7 @@ msgstr "Yapılandırma"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Mkt. Çarpanı"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -350,6 +355,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Bir Satınalmayı manuel olarak kodlarsanız, sipariş yöntemi kullanmak "
+"isteyebilirsiniz."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
@@ -376,22 +383,22 @@ msgstr "Satınalma Siparişleri"
 #. module: procurement
 #: view:procurement.order:0
 msgid "To Fix"
-msgstr ""
+msgstr "Sabitlemek"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Exceptions"
-msgstr ""
+msgstr "İstisnalar"
 
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Üretim veya Satınalma Emrinden Atama"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
 msgid "Property"
-msgstr ""
+msgstr "Özellik"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_make_procurement
@@ -402,7 +409,7 @@ msgstr "Satınalma İsteği"
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid "Compute Stock"
-msgstr ""
+msgstr "Stok Hesapla"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -421,17 +428,22 @@ msgid ""
 "    This is the module for computing Procurements.\n"
 "    "
 msgstr ""
+"\n"
+"    Bu modül Satınalmaları hesaplamak içindir.\n"
+"    "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "İlgili Satınalma Emirleri"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"Sihirbaz tüm stok minimum kurallarını kontrol eder ve satınalma emti "
+"oluşturur."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -449,7 +461,7 @@ msgid "plus"
 msgstr "artı"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -473,11 +485,14 @@ msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Sanal stok Max Miktara ulaşırken, OpenERP sanal stoğu Max Miktara getirmek "
+"için bir satınalma oluşturur."
 
 #. 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 ""
+"Bir ürün stoğu 0'ın altındaysa, bir sipariş noktası gibi görev yapacaktır"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -494,6 +509,12 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
+"Bu sihirbaz, yapılandırmaları bazında işlenmeleri gereken satınalma, ürün "
+"ve/veya satınalma siparişlerini çalıştırmanıza olanak sağlar. Varsayılan "
+"olarak, zamanlayıcı OpenERP tarafından her gece otomatik olarak başlatılır. "
+"Bu menüyü şimdi başlatmaya zorlamak için kullanabilirsiniz. Arkaplanda "
+"çalıştığını unutmayın, hesaplama işlemini tamamlayana kadar kadar birkaç "
+"dakika beklemek zorunda kalabilirsiniz."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -544,58 +565,58 @@ msgstr "Planlanan Tarih"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Exception"
-msgstr ""
+msgstr "İstisna"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:179
 #, python-format
 msgid "Automatic OP: %s"
-msgstr ""
+msgstr "Otomatik OP: %s"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Otomatik Sipariş Noktası"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Minimum Envanter Kuralı"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Şirketler"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Ekstra Bilgi"
 
 #. module: procurement
 #: help:procurement.order,name:0
 msgid "Procurement name."
-msgstr ""
+msgstr "Satınalma adı."
 
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Bu ürün için bir üretim grubu atamanız gerekir"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Reason"
-msgstr ""
+msgstr "Satınalma Nedeni"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "Mkt. Çarpanı 0'dan büyük olmalıdır."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "Maks.'a Sipariş"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -606,16 +627,16 @@ msgstr "Kapanış Tarihi"
 #: code:addons/procurement/procurement.py:372
 #, python-format
 msgid "Procurement '%s' is in exception: not enough stock."
-msgstr ""
+msgstr "Satınalma '%s'istisna durumundadır: yetersiz stok."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s State!"
-msgstr ""
+msgstr "%s Durumunda olan Satınalma Emirleri silinemez!"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Yetersiz Bilgi !"
@@ -630,7 +651,7 @@ msgstr "Özellik Grubu"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Misc"
-msgstr ""
+msgstr "Çeşitli"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -650,7 +671,7 @@ msgstr "Genel Bilgi"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "Satınalmayı Çalıştır"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -660,7 +681,7 @@ msgstr "Tamamlandı"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "Satınalma miktarı bu çarpana yuvarlanacaktır."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -675,7 +696,7 @@ msgstr "Vazgeç"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Tekrar Sipariş Verme Modu"
 
 #. module: procurement
 #: field:procurement.order,origin:0
@@ -690,7 +711,7 @@ msgstr "Acil Değil"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Tüm Planlamacıları Hesapla"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -713,7 +734,7 @@ msgstr "Detaylar"
 #: model:ir.actions.act_window,name:procurement.procurement_exceptions
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 msgid "Procurement Exceptions"
-msgstr ""
+msgstr "Satınalma İstisnaları"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -723,7 +744,7 @@ msgstr ""
 #: model:ir.ui.menu,name:procurement.menu_stock_order_points
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Minimum Stok Kuralları"
 
 #. module: procurement
 #: field:procurement.order,close_move:0
@@ -733,7 +754,7 @@ msgstr "Son Hareketi Kapat"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Zamanlanan Tarih"
 
 #. module: procurement
 #: field:make.procurement,product_id:0
@@ -762,27 +783,27 @@ msgstr "dk"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "Miktar Kuralları"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Running"
-msgstr ""
+msgstr "Çalışma"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Birim"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr ""
+msgstr "Sipariş Ver"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "UOM"
-msgstr ""
+msgstr "UOM"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -799,6 +820,12 @@ msgid ""
 "will generate a procurement request to increase the stock up to the maximum "
 "quantity."
 msgstr ""
+"Minimum stok kurallarını tanımlayabilirsiniz, böylece OpenERP stok "
+"seviyesine göre taslak üretim emirlerini veya satınalma kotasyonlarını "
+"otomatik olarak oluşturacaktır. Bir ürünün sanal stoğu (= tüm anaylanan "
+"sipariş ve rezervasyonlar çıkarıldıktan sonra elde edilen stok) minimum "
+"miktarın altına düştüğünde, OpenERP stoğu maksimum miktara çıkarmak için bir "
+"satınalma talebi oluşturacaktır."
 
 #. module: procurement
 #: field:procurement.order,move_id:0
@@ -808,7 +835,7 @@ msgstr "Rezervasyon"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Satınalma yöntemi ürün tipine göre değişiklik gösterir."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -816,11 +843,13 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Bu sihirbaz bu ürün için satınalmayı planlayacaktır. Bu satınalma görev, "
+"üretim emirleri veya satınalma emirleri oluşturabilir."
 
 #. module: procurement
 #: view:res.company:0
 msgid "MRP & Logistics Scheduler"
-msgstr ""
+msgstr "MRP ve Lojistik Zamanlayıcı"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -839,17 +868,17 @@ msgid "Product UoS"
 msgstr "Stok 2.Birim"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
-msgstr ""
+msgstr "stoktan: ürünler atandı."
 
 #. 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 "Zamanlayıcıları Hesapla"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -865,6 +894,16 @@ msgid ""
 "others require manual intervention (those are identified by a specific error "
 "message)."
 msgstr ""
+"Satınalma Emirleri belirli bir tarih ve belirli bir lokasyondaki belirli bir "
+"ürün miktarını temsil eder. Satış Emirleri Satınalma Emirleri için tipik bir "
+"kaynaktır (ancak bunlar ayrı belgelerdir). Satınalma parametrelerine ve ürün "
+"yapılandırmasına bağlı olarak, satınalma motoru stoktan ürünleri rezerve "
+"ederek, bir tedarikçiden ürünleri sipariş ederek, bir üretim emri geçerek "
+"vb. şekilde ihtiyacı karşılama girişiminde bulunacaktır. Sistem bir "
+"satınalma karşılama yöntemi bulamadığında bir Satınalma İstisnası meydana "
+"gelir. Bazı istisnalar kendi kendilerini otomatik olarak çözecektir, ancak "
+"bazıları manuel müdahale gerektirir (bunlar özel bir hata mesajıyla "
+"belirtilir)."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -874,7 +913,7 @@ msgstr "Birim"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Search Procurement"
-msgstr ""
+msgstr "Satınalma Arama"
 
 #. module: procurement
 #: help:res.company,schedule_range:0
@@ -883,6 +922,9 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for future computation."
 msgstr ""
+"Bu, satınalmaları hesaplarken zamanlayıcı tarafından analiz edilen zaman "
+"dilimidir. Bugün ve bugün+ilgili zaman aralığı dışında olan tüm satınalmalar "
+"sonraki hesaplama için atlanır."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -892,7 +934,7 @@ msgstr "Çok Acil"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Otomatik Sipariş Noktası"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 23ca03a1d9c..1566b14dc6c 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -67,7 +67,7 @@ msgid "Procurement Method"
 msgstr "Phương pháp mua hàng"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "Không có địa chỉ nào được gán cho nhà cung cấp"
@@ -306,7 +306,7 @@ msgid "Quantity"
 msgstr "Số lượng"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
@@ -440,7 +440,7 @@ msgid "plus"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
@@ -602,7 +602,7 @@ msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
 msgstr "Dữ liệu không đầy đủ !"
@@ -826,7 +826,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index 05833653cac..de4d34aba0c 100644
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr ""
+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
 msgid "Make Procurements"
-msgstr "进行采购"
+msgstr "生成需求"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -48,7 +48,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:288
@@ -64,10 +64,10 @@ msgstr "计量单位"
 #. module: procurement
 #: field:procurement.order,procure_method:0
 msgid "Procurement Method"
-msgstr "采购方式"
+msgstr "引起需求的方式"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:298
+#: code:addons/procurement/procurement.py:304
 #, python-format
 msgid "No address defined for the supplier"
 msgstr "供应商地址未定义"
@@ -112,7 +112,7 @@ msgstr "没有在计算中使用，只为了提供信息。"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr "上次采购"
+msgstr "最近需求"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -140,7 +140,7 @@ msgid ""
 " Once the exception is removed the state becomes 'Ready'.\n"
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
-msgstr ""
+msgstr "新建的需求单状态是草稿"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -152,12 +152,12 @@ msgstr "使用最少库存法则搜寻"
 msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
-msgstr "当可售库存降到最低库存以下， OpenERP 会自动生成订货单，把可售库存提升到最高库存数量。"
+msgstr "当可售库存降到最低库存以下， OpenERP 会自动生成需求单，把可售库存提升到最高库存数量。"
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr "计划工具参数"
+msgstr "排程参数"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
@@ -240,12 +240,12 @@ msgstr "状态"
 #: view:stock.warehouse.orderpoint:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr "位置"
+msgstr "库位"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
 msgid "Picking List"
-msgstr "领料/提货单"
+msgstr "移库单"
 
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
@@ -262,7 +262,7 @@ msgstr "最优价(尚未激活!)"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Product & Location"
-msgstr "产品与库位"
+msgstr "产品&库位"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
@@ -278,7 +278,7 @@ msgstr "需求单"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "排程期间"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
@@ -290,6 +290,8 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
+"需求单是用于记录指定产品在指定库位的需求。需求单一般由销售订单、拉式物流规则或最小库存规则自动创建。当需求单确认后，会自动生成对应的满足需求的操作：采购申"
+"请或生产订单。"
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -308,7 +310,7 @@ msgid "Quantity"
 msgstr "数量"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:370
+#: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr "没有足够库存且没有定义最小订货点规则。"
@@ -327,7 +329,7 @@ msgstr "单号"
 #. module: procurement
 #: view:res.company:0
 msgid "Configuration"
-msgstr "配置"
+msgstr "设置"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
@@ -339,7 +341,7 @@ msgstr "数量倍数"
 msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
-msgstr ""
+msgstr "如果你要手工输入需求单，需要使用按单生产的方式"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
@@ -366,7 +368,7 @@ msgstr "需求单"
 #. module: procurement
 #: view:procurement.order:0
 msgid "To Fix"
-msgstr ""
+msgstr "待解决"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -376,7 +378,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
@@ -387,7 +389,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
@@ -397,7 +399,7 @@ msgstr "计算库存"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr ""
+msgstr "延迟"
 
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -418,50 +420,50 @@ 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 ""
+msgstr "向导检查所有最小库存规则并生成需求单"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
-msgstr ""
+msgstr "最小数量"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "紧急的"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "plus"
-msgstr ""
+msgstr "加"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:319
+#: code:addons/procurement/procurement.py:325
 #, python-format
 msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
 "than 1!"
-msgstr ""
+msgstr "请检查需求单中的数量，不应该小于1！"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
-msgstr "如果没有选中“可用”字段，那么将隐藏订货单记录且不会删除它。"
+msgstr "如果没有选中“可用”字段，那么将隐藏需求单记录且不会删除它。"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
 msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
-msgstr ""
+msgstr "如果虚拟库存小于最小数量，OpenERP生成需求单以补充到最大数量。"
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
@@ -471,7 +473,7 @@ msgstr "如果产品的库存量小于0，将会像一个订货点规则一样
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Lines"
-msgstr ""
+msgstr "需求单明细"
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
@@ -483,113 +485,115 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
+"此向导允许你根据单据的参数运行所有的需求单、生产订单或采购订单。OpenERP默认的这个计划任务会在每天晚上自动运行。你可以用这个菜单手动触发需求计算。注"
+"意它是在后台运行的，你需要等几分钟能看到结果。"
 
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,note:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "This wizard will schedule procurements."
-msgstr ""
+msgstr "这向导将安排产品需求"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "一般"
 
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "你尝试分配一个来自其它产品的批次"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "生产产品"
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "计划日期"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Exception"
-msgstr ""
+msgstr "异常"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:179
 #, python-format
 msgid "Automatic OP: %s"
-msgstr ""
+msgstr "补足负库存：%s"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "补足负库存"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "最小库存规则"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Extra Information"
-msgstr ""
+msgstr "额外信息"
 
 #. module: procurement
 #: help:procurement.order,name:0
 msgid "Procurement name."
-msgstr ""
+msgstr "需求单名称"
 
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "必须为此产品赋予一个生产批次"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Reason"
-msgstr ""
+msgstr "产品需求原因"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "批量数量必须大于0"
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "补货到最大值"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "结束日期"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:372
@@ -601,55 +605,55 @@ 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
-#: code:addons/procurement/procurement.py:318
+#: code:addons/procurement/procurement.py:324
 #, python-format
 msgid "Data Insufficient !"
-msgstr ""
+msgstr "数据不足!"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property_group
 #: field:mrp.property,group_id:0
 #: field:mrp.property.group,name:0
 msgid "Property Group"
-msgstr ""
+msgstr "属性组"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Misc"
-msgstr ""
+msgstr "杂项"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Locations"
-msgstr ""
+msgstr "库位"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "按库存生产"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "General Information"
-msgstr ""
+msgstr "一般信息"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "计算需求"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "已完成"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "需求单数量取整为此数量的倍数."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -659,42 +663,42 @@ msgstr ""
 #: view:procurement.order.compute.all:0
 #: view:procurement.orderpoint.compute:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消(&C)"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "再订货模式"
 
 #. module: procurement
 #: field:procurement.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源单据"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "不紧急"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "计算所有排程"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: procurement
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "出错的需求单"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Details"
-msgstr ""
+msgstr "详细信息"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action5
@@ -702,7 +706,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:procurement.procurement_exceptions
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 msgid "Procurement Exceptions"
-msgstr ""
+msgstr "需求异常"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -712,17 +716,17 @@ msgstr ""
 #: model:ir.ui.menu,name:procurement.menu_stock_order_points
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "最小库存规则"
 
 #. module: procurement
 #: field:procurement.order,close_move:0
 msgid "Close Move at end"
-msgstr ""
+msgstr "最后关闭调拨"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "计划日期"
 
 #. module: procurement
 #: field:make.procurement,product_id:0
@@ -730,53 +734,53 @@ msgstr ""
 #: field:procurement.order,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary"
-msgstr ""
+msgstr "临时"
 
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
-msgstr ""
+msgstr "最小值"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "最小库存规则"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Running"
-msgstr ""
+msgstr "正在处理"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr ""
+msgstr "按订单生产"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "UOM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "等待中"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
@@ -788,57 +792,59 @@ msgid ""
 "will generate a procurement request to increase the stock up to the maximum "
 "quantity."
 msgstr ""
+"可以定义最小库存规则以便OpenERP根据现有库存数量自动创建生产订单或采购订单。一旦产品的虚拟库存（等于当前库存减去已确认的订单或预留的出库单）低于最小"
+"数量，OpenERP会生成一张需求单使库存数量增加到最大库存数量。"
 
 #. module: procurement
 #: field:procurement.order,move_id:0
 msgid "Reservation"
-msgstr ""
+msgstr "预留"
 
 #. module: procurement
 #: model:process.node,note:procurement.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "根据产品类型确定需求的方式"
 
 #. module: procurement
 #: view:make.procurement:0
 msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
-msgstr ""
+msgstr "此向导将运行此产品的计划需求。需求单会生成任务、生产订单或采购订单。"
 
 #. module: procurement
 #: view:res.company:0
 msgid "MRP & Logistics Scheduler"
-msgstr ""
+msgstr "MRP和物流计划"
 
 #. module: procurement
 #: field:mrp.property,name:0
 #: field:stock.warehouse.orderpoint,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "max"
-msgstr ""
+msgstr "最大数量"
 
 #. module: procurement
 #: field:procurement.order,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "产品销售单位"
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:347
+#: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
-msgstr ""
+msgstr "按库存：产品已预留"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "计划运行"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -854,16 +860,18 @@ 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
 msgid "Search Procurement"
-msgstr ""
+msgstr "搜索需求单"
 
 #. module: procurement
 #: help:res.company,schedule_range:0
@@ -871,12 +879,12 @@ msgid ""
 "This is the time frame analysed by the scheduler when computing "
 "procurements. All procurements that are not between today and today+range "
 "are skipped for future computation."
-msgstr ""
+msgstr "这是计划运行的日期范围。不在今天到今天加指定日数的日期范围内的需求单会留到下次计算。"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Very Urgent"
-msgstr ""
+msgstr "非常紧急"
 
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
@@ -886,10 +894,10 @@ msgstr "自动计算订货点"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Details"
-msgstr ""
+msgstr "需求单细节"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:180
 #, python-format
 msgid "SCHEDULER"
-msgstr ""
+msgstr "SCHEDULER"
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index f05ca64144d..9556b1aa081 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -23,6 +23,7 @@ from osv import osv, fields
 from tools.translate import _
 import netsvc
 import time
+import decimal_precision as dp
 
 # Procurement
 # ------------------------------------------------------------------
@@ -91,7 +92,7 @@ class procurement_order(osv.osv):
         'date_planned': fields.datetime('Scheduled date', required=True),
         'date_close': fields.datetime('Date Closed'),
         'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         '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),
@@ -165,6 +166,10 @@ class procurement_order(osv.osv):
         """
         return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids, context=context))
 
+    #This Function is create to avoid  a server side Error Like 'ERROR:tests.mrp:name 'check_move' is not defined' 
+    def check_move(self, cr, uid, ids, context=None):
+        pass
+
     def check_move_done(self, cr, uid, ids, context=None):
         """ Checks if move is done or not.
         @return: True or False.
@@ -371,11 +376,10 @@ class procurement_order(osv.osv):
             id = procurement.move_id.id
             if not (procurement.move_id.state in ('done','assigned','cancel')):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
-                cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
-                res = cr.fetchone()[0]
-                if not res and not ok:
+                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 res:
+                elif not order_point_id:
                     message = _("No minimum orderpoint rule defined.")
                 elif not ok:
                     message = _("Not enough stock.")
@@ -466,14 +470,6 @@ class procurement_order(osv.osv):
             wf_service.trg_trigger(uid, 'procurement.order', id, cr)
         return res
 
-    def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
-        ''' Runs through scheduler.
-        @param use_new_cursor: False or the dbname
-        '''
-        self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
-        self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
-                use_new_cursor=use_new_cursor, context=context)
-
 procurement_order()
 
 class StockPicking(osv.osv):
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index ed353f996f8..400412298cc 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<!--
+    <data>
+        <!--
         Procurement
         -->
 
@@ -11,7 +11,7 @@
             <field name="model">procurement.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
                     <field name="date_planned" widget="date"/>
                     <field name="origin"/>
                     <field name="product_id"/>
@@ -30,7 +30,7 @@
             <field name="type">tree</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
                     <field name="date_planned" widget="date"/>
                     <field name="origin"/>
                     <field name="product_id"/>
@@ -100,27 +100,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Procurement">
-                    <group col='10' colspan='4'>
-                       <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
-                           help="Procurement started late" />
-                       <separator orientation="vertical"/>
+                    <group>
                        <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
                        <separator orientation="vertical"/>
+                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+                           domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
+                           help="Procurement started late" />
+                       <separator orientation="vertical"/>
                        <field name="origin"/>
                        <field name="product_id" />
-                       <field name="date_planned" widget="date"/>
+                       <field name="date_planned"/>
                        <field name="state" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By" groups="base.group_extended">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
                         <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
-                    	<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -181,7 +180,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Minimum Stock Rules Search">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id"/>
@@ -189,7 +188,7 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
+                    <group expand="0" string="Group By...">
                         <filter string="Warehouse" icon="terp-go-home" domain="[]"  context="{'group_by':'warehouse_id'}"/>
                         <filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 3a6e3336472..eca6981118d 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -31,6 +31,14 @@ import pooler
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
 
+    def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+        ''' Runs through scheduler.
+        @param use_new_cursor: False or the dbname
+        '''
+        self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
+        self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
+                use_new_cursor=use_new_cursor, context=context)
+
     def _procure_confirm(self, cr, uid, ids=None, use_new_cursor=False, context=None):
         '''
         Call the scheduler to check the procurement order
@@ -53,7 +61,7 @@ class procurement_order(osv.osv):
 
             procurement_obj = self.pool.get('procurement.order')
             if not ids:
-                ids = procurement_obj.search(cr, uid, [], order="date_planned")
+                ids = procurement_obj.search(cr, uid, [('state', '=', 'exception')], order="date_planned")
             for id in ids:
                 wf_service.trg_validate(uid, 'procurement.order', id, 'button_restart', cr)
             if use_new_cursor:
@@ -67,17 +75,16 @@ class procurement_order(osv.osv):
             report_except = 0
             report_later = 0
             while True:
-                cr.execute("select id from procurement_order where state='confirmed' and procure_method='make_to_order' order by priority,date_planned limit 500 offset %s", (offset,))
-                ids = map(lambda x: x[0], cr.fetchall())
+                ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority, date_planned', context=context)
                 for proc in procurement_obj.browse(cr, uid, ids, context=context):
                     if maxdate >= proc.date_planned:
                         wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
                     else:
                         offset += 1
                         report_later += 1
-                for proc in procurement_obj.browse(cr, uid, ids, context=context):
+
                     if proc.state == 'exception':
-                        report.append('PROC %d: on order - %3.2f %-5s - %s' % \
+                        report.append(_('PROC %d: on order - %3.2f %-5s - %s') % \
                                 (proc.id, proc.product_qty, proc.product_uom.name,
                                     proc.product_id.name))
                         report_except += 1
@@ -98,12 +105,13 @@ class procurement_order(osv.osv):
                     else:
                         report_later += 1
                     report_total += 1
-                for proc in procurement_obj.browse(cr, uid, report_ids, context=context):
+
                     if proc.state == 'exception':
-                        report.append('PROC %d: from stock - %3.2f %-5s - %s' % \
+                        report.append(_('PROC %d: from stock - %3.2f %-5s - %s') % \
                                 (proc.id, proc.product_qty, proc.product_uom.name,
                                     proc.product_id.name,))
                         report_except += 1
+
                 if use_new_cursor:
                     cr.commit()
                 offset += len(ids)
@@ -111,15 +119,15 @@ class procurement_order(osv.osv):
             end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
             if uid:
                 request = self.pool.get('res.request')
-                summary = '''Here is the procurement scheduling report.
+                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
+        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)
+        Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later)
                 summary += '\n'.join(report)
                 request.create(cr, uid,
                     {'name': "Procurement Processing Report.",
@@ -156,11 +164,7 @@ class procurement_order(osv.osv):
         wf_service = netsvc.LocalService("workflow")
 
         warehouse_ids = warehouse_obj.search(cr, uid, [], context=context)
-
-        cr.execute('select p.id from product_product p \
-                        join product_template t on (p.product_tmpl_id=t.id) \
-                        where p.active=True and t.purchase_ok=True')
-        products_id = [x for x, in cr.fetchall()]
+        products_id = product_obj.search(cr, uid, [('purchase_ok', '=', True)], order='id', context=context)
 
         for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
             context['warehouse'] = warehouse
@@ -183,6 +187,7 @@ class procurement_order(osv.osv):
                     'product_qty': -product.virtual_available,
                     'product_uom': product.uom_id.id,
                     'location_id': location_id,
+                    'company_id': warehouse.company_id.id,
                     'procure_method': 'make_to_order',
                     })
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
@@ -241,8 +246,7 @@ class procurement_order(osv.osv):
                         if op.procurement_draft_ids:
                         # Check draft procurement related to this order point
                             pro_ids = [x.id for x in op.procurement_draft_ids]
-                            cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
-                            procure_datas = cr.dictfetchall()
+                            procure_datas = procurement_obj.read(cr, uid, pro_ids, ['id','product_qty'], context=context, order='product_qty desc')
                             to_generate = qty
                             for proc_data in procure_datas:
                                 if to_generate >= proc_data['product_qty']:
@@ -259,6 +263,7 @@ class procurement_order(osv.osv):
                             'date_planned': newdate.strftime('%Y-%m-%d'),
                             'product_id': op.product_id.id,
                             'product_qty': qty,
+                            'company_id': op.company_id.id,
                             'product_uom': op.product_uom.id,
                             'location_id': op.location_id.id,
                             'procure_method': 'make_to_order',
diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml
index 433078263c1..a8df2e0b142 100644
--- a/addons/procurement/stock_orderpoint.xml
+++ b/addons/procurement/stock_orderpoint.xml
@@ -7,7 +7,7 @@
         <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">20.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
             <field model="product.product" name="product_id" ref="product.product_product_mb1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
@@ -15,7 +15,7 @@
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
             <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
@@ -23,7 +23,7 @@
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">20.0</field>
             <field name="product_min_qty">10.0</field>
-            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
             <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
@@ -31,7 +31,7 @@
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
             <field model="product.product" name="product_id" ref="product.product_product_fan"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
@@ -39,7 +39,7 @@
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">5.0</field>
             <field name="product_min_qty">3.0</field>
-            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
             <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
@@ -47,7 +47,7 @@
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
             <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 293a195b4ed..2eed5381efc 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import threading
+import pooler
 
 from osv import osv, fields
 
@@ -44,9 +45,13 @@ class procurement_compute_all(osv.osv_memory):
         @param context: A standard dictionary
         """
         proc_obj = self.pool.get('procurement.order')
-        for proc in self.browse(cr, uid, ids, context=context):
-            proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
+        #As this function is in a new thread, i need to open a new cursor, because the old one may be closed
+        new_cr = pooler.get_db(cr.dbname).cursor()
+        for proc in self.browse(new_cr, uid, ids, context=context):
+            proc_obj.run_scheduler(new_cr, uid, automatic=proc.automatic, use_new_cursor=new_cr.dbname,\
                     context=context)
+        #close the new cursor
+        new_cr.close()
         return {}
 
     def procure_calculation(self, cr, uid, ids, context=None):
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index bcddcc93bdf..46740140bbe 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Products & Pricelists",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Hidden",
     "depends" : ["base", "process", "decimal_precision"],
     "init_xml" : [],
     "demo_xml" : ["product_demo.xml"],
@@ -61,7 +61,7 @@ Print product labels with barcode.
         'partner_view.xml',
         'process/product_process.xml'
     ],
-    'test':['test/product_report.yml'],
+    'test':['test/product_report.yml','test/product_test.yml'],
     'installable': True,
     'active': False,
     'certificate': '0068861431437',
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index ec99158668b..190b779751e 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -106,8 +106,8 @@ msgstr "ثابت"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -253,7 +253,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -521,7 +521,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1232,7 +1232,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1618,7 +1618,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
@@ -1699,7 +1699,7 @@ msgstr ""
 "السعر الأساسي (لحساب سعر البيع للعميل/المستهلك و يسمي أحيانا سعر الكاتالوج)"
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2117,7 +2117,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2164,7 +2164,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index b5b79eba2fb..65331e56263 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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -113,8 +113,8 @@ msgstr "Фиксиран"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Предупреждение !"
@@ -264,7 +264,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Продукти: "
@@ -545,7 +545,7 @@ msgid "Metal Cleats"
 msgstr "Метални Ключалки"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1290,7 +1290,7 @@ msgid "Pallet Dimension"
 msgstr "Размери на пале"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (копие)"
@@ -1689,7 +1689,7 @@ msgstr "Продукти по категория"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Категории продукти"
 
 #. module: product
@@ -1771,7 +1771,7 @@ msgstr ""
 "цена."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Секця за партньор в продуктовата форма"
@@ -2205,7 +2205,7 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2254,7 +2254,7 @@ msgid "Shelves"
 msgstr "Рафтове"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Друга ценова листа"
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 217394ebe16..0a58371bc55 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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -108,8 +108,8 @@ msgstr "Fiksno"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -532,7 +532,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1253,7 +1253,7 @@ msgid "Pallet Dimension"
 msgstr "Dimenzije palete"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1643,7 +1643,7 @@ msgstr "Proizvodi po kategoriji"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorije proizvoda"
 
 #. module: product
@@ -1725,7 +1725,7 @@ msgstr ""
 "cena."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2149,7 +2149,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2196,7 +2196,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index e74a68f8f01..dcea39c2350 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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Fix"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Atenció!"
@@ -267,7 +267,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  per ex.: 1 * (aquesta unitat) = ràtio * (unitat referencia)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Productes: "
@@ -555,7 +555,7 @@ msgid "Metal Cleats"
 msgstr "Tacs de metall"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1337,7 +1337,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensió del palet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (còpia)"
@@ -1752,7 +1752,7 @@ msgstr "Productes per categoria"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categories de productes"
 
 #. module: product
@@ -1833,7 +1833,7 @@ msgstr ""
 "Preu base per calcular el preu de client. També dit el preu de catàleg."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Secció empresa del formulario de producte"
@@ -2275,7 +2275,7 @@ msgid "Description"
 msgstr "Descripció"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2325,7 +2325,7 @@ msgid "Shelves"
 msgstr "Prestatges"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Altra tarifa"
@@ -2413,125 +2413,6 @@ msgstr "El volum en m3."
 msgid "Price Discount"
 msgstr "Descompte preu"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Categories filles"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Marge preu mín."
-
-#~ msgid "Palet"
-#~ msgstr "Palet"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensió palet"
-
-#~ msgid "Paletization"
-#~ msgstr "Paletització"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Marge preu màx."
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No podeu tenir 2 versions de tarifes que es superposin!"
-
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "És la mitja de temps entre la confirmació de la comanda del client i el "
-#~ "lliurament dels productes finalitzats. És el temps que promet als seus "
-#~ "clients."
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Canviarà la forma en que els abastaments són processats: Els consumibles són "
-#~ "productes amb  estoc infinit o sense una gestió de l'estoc en el sistema."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "El coeficient per la fórmula:\n"
-#~ "coef (unitat base) = 1 (aquesta unitat)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "El coeficient per la fórmula:\n"
-#~ "1 (unitat base) = coef (aquesta unitat)"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Obtenir per estoc': Quan és necessari, s'agafa dels estocs o espera fins al "
-#~ "re-proveïment. 'Obtenir sota comanda': Quan és necessari, es compra o es "
-#~ "produeix per a la petició de proveïment."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "El mode de calcular el preu per aquesta regla."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Data inicial per validar aquesta versió de tarifa."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Proveïdor del producte"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Data final per validar aquesta versió de tarifa."
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "La regla només s'aplica si l'empresa compra/vent més que aquesta quantitat."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Podeu veure la llista de proveïdors per aquest producte."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Fixa el preu per que sigui un múltiple d'aquest valor.\n"
-#~ "S'aplica arrodoniment després del descompte i abans de l'increment.\n"
-#~ "Per tenir preus que acabin en 9.99, fixeu arrodoniment 10, increment -0.01"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "El cost del producte per la valorització comptable de l'estoc. Pot servir "
-#~ "com un preu base pel preu de proveïdor."
-
-#~ msgid "Packagings"
-#~ msgstr "Empaquetament"
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unitats de mesura de la mateixa categoria pot ser convertides entre elles."
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "La quantitat calculada serà un múltiple d'aquest valor. Utilitzeu 1.0 per "
-#~ "productes que no es poden partir."
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unitat"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unitats"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2785,9 +2666,6 @@ msgstr "Descompte preu"
 #~ "El coeficient per la fórmula:\n"
 #~ "coef. (unitat base) = 1 (aquesta unitat). Factor = 1 / Rati."
 
-#~ msgid "Rentable product"
-#~ msgstr "Pot ser llogat"
-
 #~ msgid "Rentable Product"
 #~ msgstr "Pot ser llogat"
 
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 52f33fe5437..3d998b718ce 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -1,10 +1,10 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* product
+# * product
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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: 2009-02-03 19:45+0000\n"
@@ -13,18 +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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\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 "Počet vrstev"
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -32,6 +33,7 @@ msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
 msgstr ""
+"Chyba ! Nemůžete přiřadit Hlavní ceník jako jiný ceník v položce ceníku!"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -39,36 +41,38 @@ msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
 msgstr ""
+"Nastavit šablonu, pokud je toto pravidlo platné pouze pro šablonu výrobku. "
+"Nechejte prázdné pro všechny výrobky"
 
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
-msgstr ""
+msgstr "Prodejné"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr ""
+msgstr "Základní deska ASUStek A7V8X-X"
 
 #. module: product
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
-msgstr ""
+msgstr "Nejmenší množství k objednání od Hlavního dodavatele"
 
 #. module: product
 #: model:product.uom,name:product.uom_day
 msgid "Day"
-msgstr ""
+msgstr "Den"
 
 #. module: product
 #: view:product.product:0
 msgid "UoM"
-msgstr ""
+msgstr "MJ"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "Základ + PC (složení na požádání)"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -78,7 +82,7 @@ msgstr "Příchozí"
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr ""
+msgstr "Měrný typ"
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
@@ -97,20 +101,20 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Množství dodavatele"
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Fixed"
-msgstr "Fixní"
+msgstr "Pevné"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varování !"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
@@ -125,23 +129,23 @@ msgstr "Ceník"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Base Prices"
-msgstr ""
+msgstr "Základní ceny"
 
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Název pravidla"
 
 #. module: product
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Reference"
-msgstr ""
+msgstr "Odkaz"
 
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní kategorii."
 
 #. module: product
 #: help:pricelist.partnerinfo,min_quantity:0
@@ -149,16 +153,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 ""
+"Nejmenší množství k vyvolání tohoto pravidla, vyjádřeno v MJ dodavatele "
+"pokud nějaký je nebo jinak ve výchozí MJ výrobku."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Keyboard"
-msgstr ""
+msgstr "Klávesnice"
 
 #. module: product
 #: model:ir.model,name:product.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: product
 #: help:product.template,supply_method:0
@@ -166,57 +172,59 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Purchase will trigger purchase orders when requested."
 msgstr ""
+"Vyrobit vygeneruje výrobní příkaz nebo úkol, podle typu výrobku. Koupit "
+"vyvolá na požádání kupní příkaz."
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
-msgstr ""
+msgstr "Průměrná cena"
 
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "Jméno explicitního pravidla pro tento řádek ceníku."
 
 #. 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 "Units of Measure Categories"
-msgstr ""
+msgstr "Kategorie měrných jednotek"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
 msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "Procesor AMD Athlon XP 1800+"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr ""
+msgstr "HDD na požádání"
 
 #. module: product
 #: field:product.price_list,price_list:0
 msgid "PriceList"
-msgstr ""
+msgstr "Ceník"
 
 #. module: product
 #: view:product.template:0
 msgid "UOM"
-msgstr ""
+msgstr "MJ"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr ""
+msgstr "ks"
 
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Různé"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "Pracovník"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -228,35 +236,35 @@ msgstr ""
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "Výchozí verze veřejného ceníku"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Standard Price"
-msgstr ""
+msgstr "Běžná cena"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "Obchodní ceník"
 
 #. module: product
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr "Typ produktu"
+msgstr "Typ výrobku"
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  např.: 1 * (tato jednotka) = koeficient * (referenční jednotka)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "Výrobky: "
 
 #. module: product
 #: field:product.category,parent_id:0
@@ -281,22 +289,22 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "Jméno dodavatele, cena, kód výrobku, ..."
 
 #. 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 "Hlavní dodavatel"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -312,45 +320,46 @@ msgstr "Balení"
 #: view:product.product:0
 #: field:product.template,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
+"Pravidlo platí pouze pokud partner kupuje/prodává více než toto množství."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "Dřevo 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "Množství-1"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "Počet balíků na vrstvu"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr ""
+msgstr "Množství dle balíku"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stav"
 
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "Vyberte kategorii pro tento výrobek"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -360,38 +369,38 @@ msgstr "Odchozí"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "Referenční MJ pro tuto kategorii"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
 #: field:product.product,lst_price:0
 msgid "Public Price"
-msgstr ""
+msgstr "Veřejný ceník"
 
 #. module: product
 #: field:product.price_list,qty5:0
 msgid "Quantity-5"
-msgstr ""
+msgstr "Množství-5"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr ""
+msgstr "Součástí IT"
 
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr ""
+msgstr "Správce výrobku"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "Jméno výrobku dodavatele"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr ""
+msgstr "Střední PC"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -405,41 +414,41 @@ msgstr ""
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "Hledání ceny výrobku"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Popis obchodu"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr ""
+msgstr "Umístění úložiště"
 
 #. module: product
 #: help:product.packaging,length:0
 msgid "The length of the package"
-msgstr ""
+msgstr "Délka balíku"
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr ""
+msgstr "Čistá váha v Kg."
 
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr ""
+msgstr "Řekne uživateli jestli může nebo nemůže výrobek použít."
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
 #: field:product.supplierinfo,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Množství"
 
 #. module: product
 #: field:product.packaging,height:0
@@ -449,32 +458,32 @@ msgstr "Výška"
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "Datum platnosti pro tuto verzi ceníku do kdy je platný."
 
 #. module: product
 #: model:product.category,name:product.cat0
 msgid "All products"
-msgstr ""
+msgstr "Všechny výrobky"
 
 #. 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 "Množství-2"
 
 #. module: product
 #: field:product.price_list,qty3:0
 msgid "Quantity-3"
-msgstr ""
+msgstr "Množství-3"
 
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Kódy"
 
 #. module: product
 #: help:product.supplierinfo,product_uom:0
@@ -486,17 +495,17 @@ msgstr ""
 #. module: product
 #: field:product.price_list,qty4:0
 msgid "Quantity-4"
-msgstr ""
+msgstr "Množství-4"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Prodej & Nákup"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Pracovní doba"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -518,15 +527,17 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "Kovové lišty"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
 "Please create or activate one."
 msgstr ""
+"Žádná aktivní verze pro vybraný ceník !\n"
+"Prosím vytvořte jednu aktivní."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -536,12 +547,12 @@ msgstr ""
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "Krabice 20x20x40"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Price Computation"
-msgstr ""
+msgstr "Výpočet ceny"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -551,7 +562,7 @@ msgstr "Lze koupit"
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
 msgid "High speed processor config"
-msgstr ""
+msgstr "Nastavit vysokorychlostní procesor"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -559,6 +570,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"1 nebo několik dodavatel(ů) může být navázáno na výrobek. Všechny informace "
+"zůstávají ve formuláři výrobku."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -570,7 +583,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,width:0
 msgid "The width of the package"
-msgstr ""
+msgstr "Šířka balíku"
 
 #. module: product
 #: field:product.product,virtual_available:0
@@ -580,23 +593,23 @@ msgstr "Virtuální sklad"
 #. module: product
 #: selection:product.category,type:0
 msgid "View"
-msgstr ""
+msgstr "Pohled"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr ""
+msgstr "Šablony výrobků"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Náklady restaurace"
 
 #. module: product
 #: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Chyba: Neplatný kód ean"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
@@ -606,7 +619,7 @@ msgstr "Min. množství"
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
 msgid "Price Type"
-msgstr ""
+msgstr "Typ ceny"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -616,17 +629,17 @@ msgstr "Max. marže"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr ""
+msgstr "Základní cena"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr ""
+msgstr "Tichý ventilátor"
 
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr ""
+msgstr "Dodavatel tohoto výrobku"
 
 #. module: product
 #: help:product.pricelist.version,active:0
@@ -635,26 +648,28 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"Když je verze zdvojená, tak je nastaveno na neaktivní, takže data se "
+"nepřekrávají s původní verzí. Měli byste změnit data a znovu aktivovat ceník"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "Souprava regál 100cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dodavatel"
 
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr ""
+msgstr "Boční panel"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr ""
+msgstr "Souprava Klávesnice + Myš"
 
 #. module: product
 #: field:product.price.type,name:0
@@ -664,7 +679,7 @@ msgstr "Název ceny"
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
-msgstr ""
+msgstr "Procesor AMD Athlon XP 2200+"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -679,12 +694,12 @@ msgstr "Ceník"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Dodavatelé"
 
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "K nákupu"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -697,7 +712,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "New Price ="
-msgstr ""
+msgstr "Nová cena ="
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
@@ -705,21 +720,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 ""
+"Cena bude považována jako cena MJ dodavatele pokud nějaký je nebo jinak jako "
+"výchozí Měrná jednotka pro výrobek"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
 msgid "Accessories"
-msgstr ""
+msgstr "Příslušenství"
 
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Čekací lhůta zákazníka"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "Dodavatel výrobku"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -737,7 +754,7 @@ msgstr "Min. marže"
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Podřízené kategorie"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
@@ -747,7 +764,7 @@ msgstr "Koncové datum"
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
-msgstr ""
+msgstr "Tisk"
 
 #. module: product
 #: view:product.product:0
@@ -760,7 +777,7 @@ msgstr "Typ"
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_main
 msgid "Pricelists"
-msgstr ""
+msgstr "Ceníky"
 
 #. module: product
 #: field:product.product,partner_ref:0
@@ -770,7 +787,7 @@ msgstr "Zákazník"
 #. module: product
 #: view:product.product:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Různé"
 
 #. module: product
 #: field:product.pricelist.type,key:0
@@ -780,7 +797,7 @@ msgstr "Klíč"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rules Test Match"
-msgstr ""
+msgstr "Testovací podmínka pravidel"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -793,17 +810,17 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr ""
+msgstr "Zásobování & Místa"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Projekt návrhu kuchyně"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Hodina"
 
 #. module: product
 #: selection:product.template,state:0
@@ -813,34 +830,34 @@ msgstr "Ve vývoji"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Regál 200cm"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Činitel & Přesnost"
 
 #. 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 "Soupravy IT komponent"
 
 #. module: product
 #: selection:product.category,type:0
 #: selection:product.template,state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normální"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr ""
+msgstr "Informace o dodavateli"
 
 #. module: product
 #: field:product.price.type,currency_id:0
@@ -852,7 +869,7 @@ msgstr "Měna"
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
 msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "DDR 256MB PC400"
 
 #. module: product
 #: view:product.category:0
@@ -871,11 +888,14 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"Vytváří a spravujte měrné jednotky, které chcete používat ve vašem systému. "
+"Můžete definovat převodní poměry mezi několik Měrnými jednotkami ze stejné "
+"kategorie."
 
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
-msgstr ""
+msgstr "Celková hmotnost balíku"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -892,7 +912,7 @@ msgstr ""
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr "Typ ceny produktu"
+msgstr "Typ ceny výrobku"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -902,29 +922,29 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "Běžný skříňový ventilátor 80mm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "Informace o dodavateli výrobku"
 
 #. module: product
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšířené filtry..."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Popis nákupu"
 
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Nemůžete mít dvě překrývající se verze ceníku!"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -941,11 +961,13 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"Může být více než jedna verze ceníku. Zde můžete vytvořit a spravovat nové "
+"verze ceníku. Některé příklady verzí: 2010, 2011, Letní slevy, aj."
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "Skladovatelný produkt"
+msgstr "Skladovatelný výrobek"
 
 #. module: product
 #: field:product.packaging,code:0
@@ -955,22 +977,22 @@ msgstr "Kód"
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr ""
+msgstr "Poř."
 
 #. module: product
 #: view:product.price_list:0
 msgid "Calculate Product Price per unit base on pricelist version."
-msgstr ""
+msgstr "Spočítat cenu výrobku na základní jednotku dle verze ceníku."
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr ""
+msgstr "Jednotka zásilky"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr "Informace partnera(Partner Information)"
+msgstr "Informace partnera"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -987,12 +1009,12 @@ msgstr "Informace"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Products Listprices Items"
-msgstr ""
+msgstr "Ceníkové položky výrobků"
 
 #. module: product
 #: view:product.packaging:0
 msgid "Other Info"
-msgstr ""
+msgstr "Jiné info"
 
 #. module: product
 #: field:product.pricelist.version,items_id:0
@@ -1011,37 +1033,37 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Větší než referenční MJ"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
 msgid "Products & Pricelists"
-msgstr ""
+msgstr "Výrobky & Ceníky"
 
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "K prodeji"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "Obchodovatelné služby"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr ""
+msgstr "Cenová přirážka"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr ""
+msgstr "Základní deska ASUStek A7N8X"
 
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr ""
+msgstr "Logistické jednotky"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1060,12 +1082,12 @@ msgstr "Název"
 #. module: product
 #: view:product.product:0
 msgid "Stockable"
-msgstr ""
+msgstr "Skladovatelné"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Dřevěné překlady 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1079,12 +1101,12 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "kg"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1094,7 +1116,7 @@ msgstr "Zastaralý"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -1114,7 +1136,7 @@ msgstr ""
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
 msgid "Ratio"
-msgstr ""
+msgstr "Násobek"
 
 #. module: product
 #: help:product.template,purchase_ok:0
@@ -1122,11 +1144,13 @@ msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
 msgstr ""
+"Určí jestli je výrobek viditelný v seznamu výrobků v sekci z řádku nákupního "
+"příkazu."
 
 #. module: product
 #: field:product.template,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Čistá hmotnost"
 
 #. module: product
 #: field:product.packaging,width:0
@@ -1136,27 +1160,27 @@ msgstr "Šířka"
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr ""
+msgstr "Přidružené pole ve formuláři výrobku."
 
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Měrná jednotka"
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Metoda zásobování"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Datum tisku"
 
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr ""
+msgstr "Jednotka obchodu"
 
 #. module: product
 #: model:ir.module.module,description:product.module_meta_information
@@ -1193,18 +1217,18 @@ msgstr ""
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "Hlavní dodavatel, který má nejvyšší prioritu v Seznamu dodavatelů."
 
 #. module: product
 #: model:product.category,name:product.product_category_services
 #: view:product.product:0
 msgid "Services"
-msgstr ""
+msgstr "Služby"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "Pokud jiný ceník"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -1213,29 +1237,29 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_products
 #: view:product.product:0
 msgid "Products"
-msgstr ""
+msgstr "Výrobky"
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Počet vrstev na paletě nebo v krabici"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "Režim výpočtu ceny pro toto pravidlo."
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr ""
+msgstr "Rozměry palety"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopie)"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -1249,18 +1273,20 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Toto je průměrná prodleva ve dnech mezi potvrzením objednávky zákazníka a "
+"doručením hotových výrobků. Je to čas, který slibujete vašim zákazníkům."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr ""
+msgstr "Druhá MJ"
 
 #. module: product
 #: code:addons/product/product.py:142
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Chyba !"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1268,17 +1294,17 @@ msgstr ""
 #: model:ir.ui.menu,name:product.next_id_16
 #: view:product.uom:0
 msgid "Units of Measure"
-msgstr ""
+msgstr "Měrné jednotky"
 
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr ""
+msgstr "Minimální množství"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
 msgid "PC"
-msgstr ""
+msgstr "PC"
 
 #. module: product
 #: help:product.supplierinfo,product_code:0
@@ -1290,7 +1316,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Udělat na sklad"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -1313,38 +1339,38 @@ msgstr "Spotřební zboží"
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "Pole měny je vyjádřeno v."
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "Hrubá váha v Kg."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr "Dodání"
+msgstr "Zásobování"
 
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "Kategorie MJ"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Police"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Měrná jednotka nákupu"
 
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply method"
-msgstr ""
+msgstr "Metoda zásobování"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1357,12 +1383,12 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "Běžná konfigurace procesoru"
 
 #. module: product
 #: code:addons/product/product.py:142
@@ -1396,7 +1422,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr ""
+msgstr "Základní PC"
 
 #. module: product
 #: help:product.pricelist,active:0
@@ -1408,23 +1434,23 @@ msgstr ""
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Skutečné zásoby"
 
 #. 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 "Měrná jednotka výrobku"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Chyba: Výchozí MJ a nákupní MJ musí být ve stejné kategorii."
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1434,22 +1460,22 @@ msgstr "Přesnost zaokrouhlení"
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Vlastnosti Měrné jednotky"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "Police 200cm"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Buy"
-msgstr "Nákup"
+msgstr "Koupit"
 
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr ""
+msgstr "Kategorie měrných jednotek"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1459,7 +1485,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Menší než referenční MJ"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1478,28 +1504,28 @@ msgstr ""
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Převodní poměr mezi měrnými jednotkami nemůže být 0!"
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "EAN kód jednotky balíku"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr ""
+msgstr "Váha prázdného balíku"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr ""
+msgstr "Pole výrobku"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
 msgid "Pricelists Types"
-msgstr ""
+msgstr "Typy ceníků"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1511,22 +1537,22 @@ msgstr ""
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Výchozí Měrná jednotka použitá pro všechny skladové operace."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "Různé"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
 msgid "Customizable PC"
-msgstr ""
+msgstr "Upravitelné PC"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena za kus"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1537,32 +1563,32 @@ msgstr ""
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr ""
+msgstr "Veřejný ceník"
 
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Obchodovatelné výrobky"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Kód výrobku dodavatele"
 
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr ""
+msgstr "Výchozí MJ"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr ""
+msgstr "Paleta"
 
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr ""
+msgstr "Balík dle vrstvy"
 
 #. module: product
 #: field:product.template,warranty:0
@@ -1587,22 +1613,22 @@ msgstr ""
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr "Produkt"
+msgstr "Výrobek"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr "Produkce"
+msgstr "Vyrobit"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Vytvořit objednávku"
 
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Celkový počet výrobků, který můžete dát na paletu nebo do krabice."
 
 #. module: product
 #: field:product.product,variants:0
@@ -1613,13 +1639,13 @@ msgstr "Varianty"
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr "Produkty podle kategorie"
+msgstr "Výrobky podle kategorie"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
-msgstr ""
+msgid "Product Categories"
+msgstr "Kategorie výrobků"
 
 #. module: product
 #: field:product.template,uos_coeff:0
@@ -1629,37 +1655,37 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Přiřadí prioritu k seznamu dodavatelů výrobku."
 
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit Of Measure"
-msgstr ""
+msgstr "Výchozí Měrná jednotka"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
 msgid "ATX Mid-size Tower"
-msgstr ""
+msgstr "Středně velká skříň ATX"
 
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr ""
+msgstr "EAN"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rounding Method"
-msgstr ""
+msgstr "Zaokrouhlovací metoda"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr ""
+msgstr "Štítky výrobků"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
 msgid "Box 30x40x60"
-msgstr ""
+msgstr "Krabice 30x40x60"
 
 #. module: product
 #: selection:product.template,type:0
@@ -1669,12 +1695,12 @@ msgstr "Služba"
 #. module: product
 #: help:product.packaging,height:0
 msgid "The height of the package"
-msgstr ""
+msgstr "Výška balíku"
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr "Ceník produktů"
+msgstr "Ceník výrobků"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1683,7 +1709,7 @@ msgstr "Ceník produktů"
 #: field:product.supplierinfo,company_id:0
 #: field:product.template,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Společnost"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
@@ -1698,25 +1724,25 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
-msgstr ""
+msgstr "Sekce partnera ve formuláři výrobku"
 
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr ""
+msgstr "Název tohoto druhu ceny."
 
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "MJ dodavatele"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Počáteční datum pro započetí platnosti této verzi ceníku."
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1738,7 +1764,7 @@ msgstr "Délka"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Délka / Vzdálenost"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
@@ -1755,7 +1781,7 @@ msgstr "Typ ceníku"
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "Jiné výrobky"
 
 #. module: product
 #: view:product.product:0
@@ -1765,17 +1791,17 @@ msgstr ""
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "Prodejné"
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Výrobní čekací lhůta"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
 msgid "Supplier Pricelist"
-msgstr ""
+msgstr "Ceník dodavatele"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -1785,7 +1811,7 @@ msgstr "Založeno na"
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "Surový materiál"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -1798,7 +1824,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "Název ceníku"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
@@ -1810,43 +1836,43 @@ msgstr "Verze ceníku"
 #. 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 "Váha celého balíku, palety nebo krabice."
 
 #. 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 "Zaměstnanec"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Regál 100cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr "Kategorie produktu"
+msgstr "Kategorie výrobku"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "Název ceníku"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Dodací čekací lhůta"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1854,11 +1880,13 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Odškrtnutím aktivního pole můžete zakázat měrnou jednotku bez jejího "
+"odstranění."
 
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "Čekací lhůta dodavatele"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1871,11 +1899,13 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Vytváří a sparvuje vaše rozměry a typy balení, které chcete udržovat v "
+"systému."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Přední panel SHE200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -1883,51 +1913,53 @@ msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
 msgstr ""
+"Použito v kódu k výběru určitých cen založených na kontextu. Nechejte bez "
+"změny."
 
 #. 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 "Toto množství je převedeno na Výchozí MJ."
 
 #. module: product
 #: field:product.packaging,ul:0
 msgid "Type of Package"
-msgstr ""
+msgstr "Typ balíku"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr ""
+msgstr "Balík"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr ""
+msgstr "Počítač Dello"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
 msgid "Weight"
-msgstr ""
+msgstr "Váha"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr ""
+msgstr "Procesor na požádání"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Mouse"
-msgstr ""
+msgstr "Myš"
 
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Typ MJ"
 
 #. module: product
 #: help:product.template,product_manager:0
@@ -1950,17 +1982,17 @@ msgstr "Popisy"
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Řádek"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Přední panel SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr ""
+msgstr "Celý PC včetně periférií"
 
 #. module: product
 #: view:product.product:0
@@ -1971,12 +2003,12 @@ msgstr ""
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní asociované členy."
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Hotelové náklady"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -1988,12 +2020,12 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "Police 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
-msgstr ""
+msgstr "Dává pořadí posloupnosti, když zobrazuje seznam balení."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -2003,7 +2035,7 @@ msgstr "Zaoukrouhlení ceny"
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "Max. marže ceny"
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
@@ -2011,47 +2043,49 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Jméno výrobku dodavatele bude použito při tisku požadavku na cenu. Nechejte "
+"prázdné pro použití vnitřního."
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Variable"
-msgstr "Variabilní"
+msgstr "Proměnné"
 
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "Může být pronajmuto"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
 #: field:product.template,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Výrobní cena"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr ""
+msgstr "Min. marže ceny"
 
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross weight"
-msgstr ""
+msgstr "Hrubá váha"
 
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Sekce sestavení"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr ""
+msgstr "Počítačové věci"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr ""
+msgstr "Telefonická pomoc"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2064,7 +2098,7 @@ msgstr ""
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "Uzavřít"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -2074,28 +2108,28 @@ msgstr "Položka ceníku"
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr ""
+msgstr "RAM na požádání"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Vlastnosti obchodu"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "tonne"
-msgstr ""
+msgstr "tuna"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr ""
+msgstr "Prodlevy"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "Vytvoření výrobku"
 
 #. module: product
 #: help:product.template,type:0
@@ -2116,22 +2150,24 @@ msgid "Description"
 msgstr "Popis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
 "products!"
 msgstr ""
+"Nelze rozpoznat kategorii výrobku, máte definovány cyklické kategorie "
+"výrobků!"
 
 #. module: product
 #: view:product.template:0
 msgid "Product Description"
-msgstr ""
+msgstr "Popis výrobku"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid " ) + "
-msgstr ""
+msgstr " ) + "
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -2143,28 +2179,28 @@ msgstr ""
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Objem"
 
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Případ"
 
 #. module: product
 #: view:product.product:0
 msgid "Product Variant"
-msgstr "Varianta produktu"
+msgstr "Varianta výrobku"
 
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Regály"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
-msgstr ""
+msgstr "Jiný ceník"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -2172,18 +2208,18 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr "Šablona produktu"
+msgstr "Šablona výrobku"
 
 #. module: product
 #: field:product.template,cost_method:0
 msgid "Costing Method"
-msgstr ""
+msgstr "Metoda ocenění"
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr ""
+msgstr "Paletizace"
 
 #. module: product
 #: selection:product.template,state:0
@@ -2202,7 +2238,7 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action
 #: field:product.pricelist,version_id:0
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Verze ceníku"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2210,22 +2246,22 @@ msgstr ""
 #: field:product.pricelist.item,sequence:0
 #: field:product.supplierinfo,sequence:0
 msgid "Sequence"
-msgstr "Sekvence"
+msgstr "Posloupnost"
 
 #. module: product
 #: field:product.template,list_price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "Prodejní cena"
 
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Typ kategorie"
 
 #. module: product
 #: model:product.category,name:product.cat2
 msgid "Private"
-msgstr ""
+msgstr "Soukromé"
 
 #. module: product
 #: help:product.template,uos_coeff:0
@@ -2244,21 +2280,6 @@ msgstr ""
 msgid "Price Discount"
 msgstr "Sleva"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Podřízená kategorie"
-
-#~ msgid "Rentable product"
-#~ msgstr "Rentabilní produkt"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Maximální marže"
-
-#~ msgid "Palet"
-#~ msgstr "Paleta"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Minimální marže"
-
 #~ msgid "Customer Price"
 #~ msgstr "Zákazníkova cena"
 
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 5abef5218a2..ec2920ec288 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -116,8 +116,8 @@ msgstr "Fest"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Warnung !"
@@ -271,7 +271,7 @@ msgstr ""
 "  z.B: 1 * (diese Mengeneinheit) = Umrechnungsfaktor * (Grundeinheit)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produkte: "
@@ -561,7 +561,7 @@ msgid "Metal Cleats"
 msgstr "Metallwaren"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1347,7 +1347,7 @@ msgid "Pallet Dimension"
 msgstr "Packdimensionen"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (Kopie)"
@@ -1765,7 +1765,7 @@ msgstr "Produkte nach Kategorien"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Produkte Kategorien"
 
 #. module: product
@@ -1845,7 +1845,7 @@ msgid ""
 msgstr "Grundpreis für die Berechnung des Verkaufspreises (Listenpreis)."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partner Sektion im Produktformular"
@@ -2292,7 +2292,7 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2341,7 +2341,7 @@ msgid "Shelves"
 msgstr "Regale"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Andere Preisliste"
@@ -2429,132 +2429,6 @@ msgstr "Volumen in m³"
 msgid "Price Discount"
 msgstr "Rabatt"
 
-#~ msgid "Price Min. Margin"
-#~ msgstr "Min. Preisspanne"
-
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Dieses ist der mittlere Zeitbedarf zwischen Auftragsannahme durch den Kunden "
-#~ "und die Auslieferung der Fertigware. Dieses ist die Lieferzeit, die Sie "
-#~ "ihren Kunden versprechen."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Der Modus der Preisberechnung für diese Regel."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Gültig ab Datum der Preislisten Version"
-
-#~ msgid "Childs Categories"
-#~ msgstr "(Unter-) Kategorie"
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Sie können keine sich zeitlich überlappende Versionen von Preislisten haben."
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Wird den Beschaffungsvorgang bestimmen. Verbrauchswaren sind Lagerprodukte "
-#~ "mit unendlichem Lagerbestand, oder komplett ohne Anbindung an die "
-#~ "Lagerwirtschaft."
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Palette Dimension"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "Produziere vom Lager (Make to Stock). Wenn das Produkt erforderlich ist,  "
-#~ "wird die Ware direkt vom Lager genommen oder es wird auf einen Warenzugang "
-#~ "des Produktes gewartet. Falls erforderlich wird die Ware eingekauft oder "
-#~ "produziert für eine Anfrage die durch einen automatische "
-#~ "Beschaffungsvorschlag ausgelöst wurde."
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Gültig bis Datum für die Preisliste."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Lieferant Produkt"
-
-#~ msgid "Palet"
-#~ msgstr "Palette"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Die Regel wird nur angewendet wenn der Partner mehr als diese Menge einkauft "
-#~ "/ verkauft."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Sie können die Liste der Lieferanten für das Produkt einsehen."
-
-#~ msgid "Rentable product"
-#~ msgstr "Produkt wird vermietet"
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Setze Preis als mehrfaches dieses Wertes.\n"
-#~ "Rundung wird nach Rabatt und Zuschlag angewendet.\n"
-#~ "Um Preise endend auf .99 zu haben setze Rundung auf 10, Zuschlag -0.01"
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unit"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Die Kosten des Produktes für die Bestandsbewertung. Der Eintrag dient als "
-#~ "Grundpreis für den Lieferantenpreis."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Der Koeffizient für diese Formel:\n"
-#~ "Koeff (Grundeinheit) = 1 (diese Einheit)"
-
-#~ msgid "Packagings"
-#~ msgstr "Packeinheiten"
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "UoM derselben Kategorie können untereinander konvertiert werden."
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d Einheiten"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Der Koeffizient für diese Formel:\n"
-#~ "1 (Grundeinheit) = Koeff (diese Einheit)"
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Die berechnete Menge wird ein Vielfaches dieses Wertes sein. Benutze 1.0 für "
-#~ "Produkte, die nicht gesplittet werden können."
-
-#~ msgid "Paletization"
-#~ msgstr "Palettierung"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Preis Max. Gewinn"
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2778,14 +2652,6 @@ msgstr "Rabatt"
 #~ "Der Koeffizient für diese Formel:\n"
 #~ "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Wird für unterschiedliche Masseinheiten für Lager und Verkauf (Rechnungen) "
-#~ "verwendet. zB Stück und Kilo. Leer lassen für Standard ME."
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2819,60 +2685,9 @@ msgstr "Rabatt"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Konnte die Produktkategorie nicht auflösen, ' \\n                            "
-#~ "' die sie innerhalb von regelmässigen zyklischen Abläufen definiert haben!"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn das Aktiv Feld ausgewählt wurde, ermöglicht dieses die Preisliste zu "
-#~ "verbergen, ohne diese gleich zu entfernen."
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Reihenfolge bei Anzeige der Liste"
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "Ausgewählte Preisliste ist zur Zeit nicht aktiviert !\n"
-#~ "' \\n                                'Bitte erzeugen oder aktivieren Sie "
-#~ "eine Preisliste."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #~ msgid "List Price"
 #~ msgstr "Verkaufspreis"
 
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Mengeneinheit beim Lieferanten."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn dieses Feld aktiviert ist , kann ein Produkt ausgeblendet werden, ohne "
-#~ "es vollständig zu entfernen."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "Die minimale Bestellmenge bei einem Lieferanten, angezeigt in der Standard "
-#~ "Mengeneinheit für dieses Produkt."
-
 #~ msgid ""
 #~ "Set a category of product if this rule only apply to products of a category "
 #~ "and his childs. Keep empty for all products"
@@ -2880,102 +2695,3 @@ msgstr "Rabatt"
 #~ "Definiere eine Produkt Kategorie, wenn diese Regel nur auf die Produkte "
 #~ "einer Kategorie und seinen zugeordneten Produkten angewendet werden soll. "
 #~ "Lasse den Eintrag leer für alle Produkte."
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Die Verknüpfung existiert bereits für dieses Menü!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Create and manage the units of measure you want to be used in your system. "
-#~ "You can define a conversion rate to be used between the several Unit of "
-#~ "Measure within the same category."
-#~ msgstr ""
-#~ "Erstellen und verwalten Sie Mengeneinheiten, die Sie in Ihrem System nutzen "
-#~ "wollen. Sie können Umrechnungsfaktoren definieren, die eine Umrechnung "
-#~ "zwischen Einheiten derselben Kategorie ermöglicht. \r\n"
-#~ "Beispiel: m --> km Faktor 1000"
-
-#~ msgid ""
-#~ "Create and manage the units of measure categories you want to be used in "
-#~ "your system. If several units of measures are in the same category, they can "
-#~ "be converted within each other. For example, in the unit of measure category "
-#~ "\"Time\", you will have the following UoM: Hours, Days."
-#~ msgstr ""
-#~ "Erstellen und verwalten Sie Mengeneinheiten, die Sie in Ihrem System nutzen "
-#~ "wollen. Existieren mehrere Megeneinheiten zu einer Kategorie können diese "
-#~ "über Faktoren umgerechnet werden.\r\n"
-#~ "Für die Kategorie \"Zeit\" beispielsweise könnten Sie folgende Einheiten "
-#~ "anlegen: Minuten, Stunden, Tage,..."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "You must define a Product for everything you buy or sell. They can be raw "
-#~ "materials, stockable products, consumables or services. The Product form "
-#~ "contains a detailed information of your products related to procurement "
-#~ "logistics, sales price, product category, suppliers and so on."
-#~ msgstr ""
-#~ "Alle Produkte, die Sie ein- oder verkaufen, müssen definiert werden. "
-#~ "Produkte können Rohstoffe, Lagerprodukte, Verbrauchswaren oder "
-#~ "Dienstleistungen sein. Das Eingabeformular für die Erstellung von Produkten "
-#~ "beinhaltet detaillierte Informationen z.B. über die Beschaffung, Preise, "
-#~ "Kategoriezuordnung, Lieferanten, Lieferzeiten etc."
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "Sie finden hier Ihre Produkte nach Kategorien zusammengefasst. Sie können "
-#~ "eine Kategorie auswählen und erhalten eine Liste aller Produkte, die zu "
-#~ "dieser Kategorie oder einer der Unterkategorien gehören."
-
-#~ msgid ""
-#~ "Products can be purchased and/or sold. They can be raw materials, stockable "
-#~ "products, consumables or services. The Product form contains a detailed "
-#~ "information on your  products related to procurement logistics, sales price, "
-#~ "product category, suppliers and so on."
-#~ msgstr ""
-#~ "Produkte können ge- und/oder verkauft werden. Produkte können Rohstoffe, "
-#~ "Lagerprodukte, Verbrauchswaren, oder Dienstleistungen sein. Die Produktmaske "
-#~ "enthält detailierte Informationen über Ihre Produkte. Zum Beispiel: "
-#~ "Verkaufspreis, Produktkategorie, Lieferant(en) und so weiter.."
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Sie können nicht zwei identische Benutzeranmeldungen definieren!"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "Das ausgewählte Unternehmen gehört nicht zu den zulässigen Unternehmen für "
-#~ "diesen Benutzer"
-
-#~ msgid ""
-#~ "There can be more than one version of a pricelist. If you need to create new "
-#~ "versions of a pricelist, you can do it and manage them from here. Some "
-#~ "examples of versions: 2010, 2011, Promotion of February 2010, etc."
-#~ msgstr ""
-#~ "Es kann mehr als eine Version einer Preisliste geben. Wenn Sie weitere "
-#~ "Versionen einer Preisliste benötigen, können Sie hier erstellen und "
-#~ "Verwalten. Ein paar Beispiele: 2010, 2011, Promotion Februar 2010, etc."
-
-#~ msgid ""
-#~ "A pricelist contains rules to be evaluated in order to compute the purchase "
-#~ "or sale price for all the partners assigned to a pricelist. Pricelists have "
-#~ "several versions (2010, 2011, Promotion of February 2010, etc.) and each "
-#~ "version has several rules. Example: the customer price of this category of "
-#~ "product will be based on the supplier price multiplied by 1.80."
-#~ msgstr ""
-#~ "Eine Preisliste besteht aus Regeln die genutzt werden, um den Einkaufs- oder "
-#~ "Verkaufspreis für alle Partner oder Produkte (oder deren Kategorien) die der "
-#~ "Liste zugeordnet sind zu berechnen. Preislisten können aus mehreren "
-#~ "Versionen (2010, 2011, Promotion Februar 2010, etc.) bestehen und jede "
-#~ "Version hat eigene Regeln. Beispiel: Der Verkaufspreis für Produkte der "
-#~ "Produktkategorie \"Büromaterial\" basiert auf dem Einkaufspreis "
-#~ "multipliziert mit 1.80 und gilt nur für Kunden der Kategorie "
-#~ "\"Norddeutschland\"."
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index 7527d09e0b7..9c1e97debf1 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -117,8 +117,8 @@ msgstr "Σταθερό"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Προσοχή!"
@@ -270,7 +270,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  π.χ.: 1 *(αυτήν την μονάδα)=αναλογία* (αναφερόμενη μονάδα)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Προϊόντα: "
@@ -545,7 +545,7 @@ msgid "Metal Cleats"
 msgstr "Μεταλικά Στηρίγματα"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1279,7 +1279,7 @@ msgid "Pallet Dimension"
 msgstr "Διαστάσεις παλέτας"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (αντίγραφο)"
@@ -1674,7 +1674,7 @@ msgstr "Προϊόντα κατα Κατηγορία"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Κατηγορίες Προϊόντων"
 
 #. module: product
@@ -1756,7 +1756,7 @@ msgstr ""
 "και τιμή τιμοκαταλόγου."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Τομέας συνεργάτη στην φόρμα προϊόντος"
@@ -2195,7 +2195,7 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2242,7 +2242,7 @@ msgid "Shelves"
 msgstr "Ράφια"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Άλλος Τιμοκατάλογος"
@@ -2332,15 +2332,6 @@ msgstr "Έκπτωση Τιμής"
 #~ "Η μικρότερη ποσότητα αγοράς απο αυτόν τον προμηθευτή, εκφρασμένο στην "
 #~ "προκαθορισμένη μονάδα μέτρησης."
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Αυτός είναι ο μέσος χρόνος μεταξύ της επιβεβαίωσης της παραγγελίας του "
-#~ "πελάτη και της παράδοσης των τελικών προϊόντων. Είναι ο υποσχόμενος χρόνος "
-#~ "παράδοσης στον πελάτη σας."
-
 #~ msgid "Product Process"
 #~ msgstr "Επεξεργασία Προϊόντος"
 
@@ -2350,50 +2341,21 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Customer Price"
 #~ msgstr "Τιμή Πελάτη"
 
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Η κατάσταση υπολογισμού για την τιμή για αυτόν τον κανόνα"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Προμηθευτής του Προϊόντος"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr ""
-#~ "Ημερομηνία έναρξης για την ενεργοποίηση αυτής της έκδοσης τιμοκαταλόγου."
-
-#~ msgid "Rentable product"
-#~ msgstr "Ενοικιαζόμενο προϊόν"
-
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "Ο αριθμός των επιπέδων σε μιά παλέτα ή κούτι."
 
-#~ msgid "Palette Dimension"
-#~ msgstr "Διαστάσεις Παλέτας"
-
 #~ msgid "Prices Computations"
 #~ msgstr "Υπολογισμοί Τιμών"
 
 #~ msgid "Configuration"
 #~ msgstr "Παραμετροποίηση"
 
-#~ msgid "Price Max. Margin"
-#~ msgstr "Μέγιστο Περιθώριο Τιμής"
-
 #~ msgid "Default UoM"
 #~ msgstr "Προκαθορισμένη ΜΜ"
 
 #~ msgid "Number of Layer"
 #~ msgstr "Αριθμός του Επιπέδου"
 
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Καθορίζει την τιμή ώστε να είναι πολλαπλάσια αυτής της αξίας.\n"
-#~ "Η στρογγυλοποίηση εφαρμόζεται μετά την έκπτωση και πριν την προσαύξηση.\n"
-#~ "Για να δημιουργηθούν τιμές που καταλήγουν σε 9.99, καθορίστε την "
-#~ "στρογγυλοποίηση σε 10, προσαύξηση -0.01"
-
 #~ msgid "Create new Product"
 #~ msgstr "Δημιουργία Νέου Προϊόντος"
 
@@ -2403,9 +2365,6 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Priority"
 #~ msgstr "Προτεραιότητα"
 
-#~ msgid "Palet"
-#~ msgstr "Παλέτα"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Περιγραφή Προϊόντος Συνεργάτη"
 
@@ -2416,24 +2375,6 @@ msgstr "Έκπτωση Τιμής"
 #~ "Αυτός ο τιμοκατάλογος θα χρησιμοποιηθεί αντί για τον προκαθορισμένο για "
 #~ "πωλήσεις στον τρέχοντα συνεργάτη."
 
-#~ msgid "Price Min. Margin"
-#~ msgstr "Ελάχιστο Περιθώριο Τιμής"
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Μπορείτε να δείτε την λίστα των προμηθευτών για εκείνο το προϊόν."
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Το κόστος του προϊόντος που θα αξιολογηθεί λογιστικά το απόθεμα. Μπορεί να "
-#~ "χρησιμοποιηθεί ως τιμή χονδρικής του προμηθευτή."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Η Μονάδα Μέτρησης της ίδιας κατηγορίας μπορούν να μετατραπούν μεταξύ τους"
-
 #~ msgid ""
 #~ "Name of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
@@ -2455,10 +2396,6 @@ msgstr "Έκπτωση Τιμής"
 #~ "τροφίμων, θα διαχειριζόσασταν ένα απόθεμα ζαμπόν αλλα θα τιμολογούσατε σε "
 #~ "κιλά. Διατηρήστε κενό για προκαθορισμένη μονάδα μέτρησης."
 
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d μονάδα"
-
 #~ msgid "Purchase UoM"
 #~ msgstr "ΜΜ Αγορών"
 
@@ -2473,19 +2410,12 @@ msgstr "Έκπτωση Τιμής"
 #~ "έχει καμία επίπτωση στην κατανομή των συσκευασιών και κυρίως χρησιμοποιείται "
 #~ "απο το υποσύστημα EDI."
 
-#~ msgid "Packagings"
-#~ msgstr "Συσκευασίας"
-
 #~ msgid "Partner Product Code"
 #~ msgstr "Κωδικός Προϊόντος Συνεργάτη"
 
 #~ msgid "Cancel"
 #~ msgstr "Άκυρο"
 
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d μονάδες"
-
 #~ msgid "The total number of products you can put by palet or box."
 #~ msgstr ""
 #~ "Ο συνολικός αριθμός των προϊότων που μπορείτε να βάλετε σε παλέτα ή κουτί"
@@ -2507,36 +2437,12 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Product suppliers, with their product name, price, etc."
 #~ msgstr "Προμηθευτές προϊόντων με τις περιγραφές των προϊόντων, τιμές, κλπ"
 
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Ο κανόνας αυτός εφαρμόζεται μόνον εάν ο συνεργάτης πουλάει/αγοράζει "
-#~ "περισσότερο απο αυτήν την ποσότητα."
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Η υπολογιζόμενη ποσότητα θα είναι πολλαπλάσια αυτής της αξίας. "
-#~ "Χρησιμοποιήστε 1.0 για προϊόντα που δεν μπορούν να χωριστούν."
-
 #~ msgid "The weight of a full of products palet or box."
 #~ msgstr "Το βάρος μιάς πλήρους παλέτας ή κούτας προϊόντων"
 
-#~ msgid "Paletization"
-#~ msgstr "Παλετοποίηση"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Ημερομηνία λήξης για τον καθορισμό αυτής της έκδοσης τιμοκαταλόγου"
-
 #~ msgid "Prices & Suppliers"
 #~ msgstr "Τιμές & Προμηθευτές"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Δεν μπορείτε να έχετε 2 εκδόσεις τιμοκαταλόγουν που να συμπίπτουν ο ένας με "
-#~ "τον άλλον!"
-
 #~ msgid "Delivery Delay"
 #~ msgstr "Καθυστέρηση Παράδοσης"
 
@@ -2563,20 +2469,9 @@ msgstr "Έκπτωση Τιμής"
 #~ "όλες εσωτερικά εάν καμία δεν επιλεγεί. Υπολογιζόμενο ως: Πραγματικό Στόκ - "
 #~ "Εξερχόμενες + Εισερχόμενες."
 
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Θα αλλάξει τον τρόπο που επεξεργαζονται οι προμήθειες, τα αναλώσιμα είναι "
-#~ "αποθηκευόμενα προϊόντα με απεριόριστο στόκ ή χωρίς διαχείριση αποθήκευσης "
-#~ "στο σύστημα."
-
 #~ msgid "Procure Method"
 #~ msgstr "Μέθοδος Προμήθειας"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Υποκατηγορίες"
-
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2621,20 +2516,6 @@ msgstr "Έκπτωση Τιμής"
 #~ "Συντελεστής για την μετατροπή πρώτης μονάδας μέτρησης στην δεύτερη\n"
 #~ "1η ΜΜ = 2η ΜΜ * Συντελεστή"
 
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Ο συντελεστής για αυτήν την φόρμουλα:\n"
-#~ "συντ (βασική μονάδα) = 1 (αυτή η μονάδα)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Ο συντελεστής για αυτήν την φόρμουλα:\n"
-#~ "1 (βασική μονάδα) = συντ (αυτή η μονάδα)"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Σφάλμα: 2η ΜΜ πρέπει να είναι σε διαφορετική κατηγορία απο την πρώτη ΜΜ"
@@ -2648,15 +2529,6 @@ msgstr "Έκπτωση Τιμής"
 #~ "reception of the products in your warehouse. Used by the scheduler for "
 #~ "automatic computation of the purchase order planning."
 
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-
 #~ msgid "You can see the list of suppliers for that product."
 #~ msgstr "Μπορείτε να δείτε τους προμηθευτές του προϊόντος."
 
@@ -2676,16 +2548,6 @@ msgstr "Έκπτωση Τιμής"
 #~ msgid "Suppliers of Product"
 #~ msgstr "Προμηθευτές του προϊόντος"
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Χρησιμοποιήται από εταιρείες που έχουν δύο μονάδες μέτρησης: για τιμολόγηση "
-#~ "και για έλεγχο αποθεμάτων. Για παράδειγμα, στην βιομηχανία τροφίμων, θα "
-#~ "χρησιμοποιούσατε στο απόθεμα το τεμάχιο αλλά θα πουλάγατε με το κιλό. Αφήστε "
-#~ "το άδειο για να χρησιμοποιηθεί η προκαθορισμένη ΜΜ."
-
 #~ msgid ""
 #~ "Unit of Measure of a category can be converted between each others in the "
 #~ "same category."
@@ -2721,53 +2583,3 @@ msgstr "Έκπτωση Τιμής"
 #~ "Αυτός είναι ο μέσος χρόνος μεταξύ της επιβεβαίωσης της παραγγελίας του "
 #~ "πελάτη και την παράδοση των έτοιμων προϊόντων. Είναι ο χρόνος που υπόσχεστε "
 #~ "στους πελάτες σας."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Εάν το ενεργό πεδίο είναι επιλεγμένο, επιτέπεται να κρύψετε τον τιμοκατάλογο "
-#~ "χωρίς να τον αφαιρέσετε."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "Η ελάχιστη ποσότητα προς αγορά από τον προμηθευτή, εκφραζόμενο στην "
-#~ "προεπιλεγμένη μονάδα μέτρησης."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Εάν το ενεργό πεδίο είναι επιλεγμένο, επιτρέπετε να αποκρήψετε το προϊόν "
-#~ "χωρίς να το αφαιρέσετε."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Το όνομα του πακέτου πρέπει να είναι μοναδικό!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Το όνομα του στοιχείου πρέπει να είναι μοναδικό !"
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Μονάδα Μέτρησης Προϊόντος Προμηθευτή"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Δεν μπορεί να υπάρχουν δύο χρήστες με το ίδιο όνομα χρήστη!"
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "Εδώ είναι μια λίστα όλων των προϊόντων ταξινομιμένα κατά κατηγορία. Μπορείτε "
-#~ "να κάνετε κλικ σε μια κατηγορία για να πάρετε μια λίστα όλων των προϊόντων "
-#~ "συνδεδεμένα με αυτή την κατηγορία ή την υπο-κατηγορία"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "Η επιλεγμένη εταιρία δεν είναι στις επιτρεπόμενες εταιρίες γι' αυτόν τον "
-#~ "χρήστη"
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 2a2af6c8b9b..5eee21b4203 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -115,8 +115,8 @@ msgstr "Fijo"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -268,7 +268,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  por ej.: 1 * (esta unidad) = ratio * (unidad referencia)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -556,7 +556,7 @@ msgid "Metal Cleats"
 msgstr "Tacos de metal"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1340,7 +1340,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensión del palet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -1754,7 +1754,7 @@ msgstr "Productos por categoría"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorías de productos"
 
 #. module: product
@@ -1836,7 +1836,7 @@ msgstr ""
 "catálogo."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -2280,7 +2280,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2330,7 +2330,7 @@ msgid "Shelves"
 msgstr "Estantes"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Otra tarifa"
@@ -2418,125 +2418,6 @@ msgstr "El volumen en m3."
 msgid "Price Discount"
 msgstr "Descuento precio"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Categorías hijas"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Margen precio mín."
-
-#~ msgid "Palet"
-#~ msgstr "Palet"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensión palet"
-
-#~ msgid "Paletization"
-#~ msgstr "Paletización"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Margen precio máx."
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
-
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Tiempo promedio entre la confirmación del pedido del cliente y la entrega "
-#~ "del producto terminado. Es el tiempo que se le promete a los clientes."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "coef (unidad base) = 1 (esta unidad)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "1 (unidad base) = coef (esta unidad)"
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "El modo de calcular el precio para esta regla."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Fecha inicial para validar esta versión de tarifa."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Proveedor del producto"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Fecha final para validar esta versión de tarifa."
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "La regla sólo se aplica si la empresa compra/vende más que esta cantidad."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Puede ver la lista de proveedores para este producto."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unidades de medida de la misma categoría puede ser convertidas entre ellas."
-
-#~ msgid "Packagings"
-#~ msgstr "Empaquetado"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "El coste del producto para la valorización contable del stock. Puede servir "
-#~ "como un precio base para precio de proveedor."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Fija el precio para que sea un múltiplo de este valor.\n"
-#~ "Se aplica redondeo después del descuento y antes del incremento.\n"
-#~ "Para tener precios que terminen en 9.99, fije redondeo 10, incremento -0.01"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Cambiará la forma en que los abastecimientos son procesados: Los consumibles "
-#~ "son productos almacenables con stock infinito o sin una gestión del stock en "
-#~ "el sistema."
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Obtener para stock': Cuando sea necesario, coger desde el stock o esperar "
-#~ "el abastecimiento. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
-#~ "producir para la solicitud de abastecimiento."
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para "
-#~ "productos que no se pueden partir."
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unidad"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unidades"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2799,174 +2680,3 @@ msgstr "Descuento precio"
 #~ msgstr ""
 #~ "El coeficiente para la fórmula:\n"
 #~ "coef. (unidad base) = 1 (esta unidad). Factor = 1 / Ratio."
-
-#~ msgid "Rentable product"
-#~ msgstr "Puede ser alquilado"
-
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Usado por compañías que manejan dos unidades de medida: facturación y "
-#~ "administración de inventarios. Por ejemplo, en las industrias alimentaria, "
-#~ "se administra el almacén de jamón pero se factura en Kg. Dejar sin llenar "
-#~ "para usar UOM por defecto."
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr ""
-#~ "Indica el orden de secuencia cuando se muestra una lista de elementos de "
-#~ "tarifa."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
-
-#~ msgid "res.users"
-#~ msgstr "res.usuarios"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "UdM del producto del proveedor."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "La cantidad mínima a comprar a este proveedor, expresado en la unidad de "
-#~ "medida por defecto."
-
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "¡No se puede resolver la categoría de producto, ' \\n                        "
-#~ "            'ha definido categorías cíclicas' \\n                            "
-#~ "        'de productos!"
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "¡No existe versión activa para la tarifa seleccionada!\n"
-#~ "' \\n                                'Debe crear o activar una."
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "¡El acceso rápido para este menú ya existe!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Only one value can be defined for each given usage!"
-#~ msgstr "¡Sólo se puede definir un valor para cada uso dado!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid ""
-#~ "There can be more than one version of a pricelist. If you need to create new "
-#~ "versions of a pricelist, you can do it and manage them from here. Some "
-#~ "examples of versions: 2010, 2011, Promotion of February 2010, etc."
-#~ msgstr ""
-#~ "Pueden existir varias versiones de una lista de precios. SI necesita crear "
-#~ "una nueva versión de lista de precio, lo puede hacer y gestionar desde aquí, "
-#~ "Algunos ejemplos de versiones: 2010, 2011, promoción de febrero 2010, etc"
-
-#~ msgid ""
-#~ "Create and manage the units of measure you want to be used in your system. "
-#~ "You can define a conversion rate to be used between the several Unit of "
-#~ "Measure within the same category."
-#~ msgstr ""
-#~ "Cree y gesitone las unidades de medida que quiera utilizar en su sistema. "
-#~ "Puede definir una tasa de conversión que será utilizada entre las diferentes "
-#~ "unidades de medida dentro de la misma categoría."
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "Auquí tiene una lista de todos sus productos clasificados por categoría. "
-#~ "Puede seleccionar una categoría para obtener la lista de todos los productos "
-#~ "relacionados con dicha categoría o un hijo de la categoría."
-
-#~ msgid ""
-#~ "A pricelist contains rules to be evaluated in order to compute the purchase "
-#~ "or sale price for all the partners assigned to a pricelist. Pricelists have "
-#~ "several versions (2010, 2011, Promotion of February 2010, etc.) and each "
-#~ "version has several rules. Example: the customer price of this category of "
-#~ "product will be based on the supplier price multiplied by 1.80."
-#~ msgstr ""
-#~ "Una lista de precios contiene las reglas para calcular el precio de compra o "
-#~ "de venta para todas las empresas que tenga dicha lista de precios asignada. "
-#~ "Las listas de precios tienen varias versiones (2010, 2011, promoción de "
-#~ "febrero 2010, etc.) y cada versión tiene varias reglas. Ejemplo: el precio "
-#~ "de venta de esta categoría de productos se basará en el precio de compra "
-#~ "muliplicado por 1,80."
-
-#~ msgid ""
-#~ "Products can be purchased and/or sold. They can be raw materials, stockable "
-#~ "products, consumables or services. The Product form contains a detailed "
-#~ "information on your  products related to procurement logistics, sales price, "
-#~ "product category, suppliers and so on."
-#~ msgstr ""
-#~ "Los productos pueden ser comprados y/o vendidos.Pueden ser materias primas, "
-#~ "productos estocables, consumibles o servicios. El formulario del producto "
-#~ "contiene información detallada de sus productos en relación con el "
-#~ "abastecimiento logístico, precio de venta, categoría, proveedores etc."
-
-#~ msgid ""
-#~ "You must define a Product for everything you buy or sell. They can be raw "
-#~ "materials, stockable products, consumables or services. The Product form "
-#~ "contains a detailed information of your products related to procurement "
-#~ "logistics, sales price, product category, suppliers and so on."
-#~ msgstr ""
-#~ "Debe definir un producto para cualquier cosa que compre o venda. Pueden ser "
-#~ "materias primas, productos almacenables, consumibles o servicios. El "
-#~ "formulario del producto contiene información detallada de sus productos en "
-#~ "relación con el abastecimiento logístico, precio de venta, categoría, "
-#~ "proveedores, ..."
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "La compañía seleccionada no está en las compañías permitidas para este "
-#~ "usuario"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
-
-#~ msgid ""
-#~ "Create and manage the units of measure categories you want to be used in "
-#~ "your system. If several units of measures are in the same category, they can "
-#~ "be converted within each other. For example, in the unit of measure category "
-#~ "\"Time\", you will have the following UoM: Hours, Days."
-#~ msgstr ""
-#~ "Cree y gestione las unidades de medida y categorías  que queira utilizar en "
-#~ "su sistema. Si varias uniddades de miedida están en la misma categoría, se "
-#~ "pueden convertir entre ellas. P.ej, en la categría de la unidad de medida "
-#~ "\"Tiempo\", tendrá las siguienes UdM: Horas, Días."
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index f8c0ad3fe39..62f5dd1a34d 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -109,8 +109,8 @@ msgstr "Fijo"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -258,7 +258,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -532,7 +532,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1257,7 +1257,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensión de la paleta"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1649,7 +1649,7 @@ msgstr "Productos por categoría"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorías de productos"
 
 #. module: product
@@ -1731,7 +1731,7 @@ msgstr ""
 "catálogo."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -2154,7 +2154,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2202,7 +2202,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Otro Precio"
@@ -2285,14 +2285,6 @@ msgstr "El volumen en m3."
 msgid "Price Discount"
 msgstr "Descuento precio"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Tiempo promedio entre la confirmación del pedido del cliente y la entrega "
-#~ "del producto terminado. Es el tiempo que se le promete a los clientes."
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2308,59 +2300,18 @@ msgstr "Descuento precio"
 #~ msgid "Procure Method"
 #~ msgstr "Método de adquisición"
 
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "El modo de calcular el precio para esta regla."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Proveedor del producto"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Fecha inicial para validar esta versión de tarifa."
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Cambiará la forma en que los abastecimientos son procesados: Los consumibles "
-#~ "son productos almacenables con stock infinito o sin una gestión del stock en "
-#~ "el sistema."
-
-#~ msgid "Rentable product"
-#~ msgstr "Producto rentable"
-
-#~ msgid "Childs Categories"
-#~ msgstr "Categorías hijas"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensión de paleta"
-
 #~ msgid "Prices Computations"
 #~ msgstr "Cálculos de precios"
 
 #~ msgid "Configuration"
 #~ msgstr "Configuración"
 
-#~ msgid "Price Max. Margin"
-#~ msgstr "Margen precio máx."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Fija el precio para que sea un múltiplo de este valor.\n"
-#~ "Se aplica redondeo después del descuento y antes del incremento.\n"
-#~ "Para tener precios que terminen en 9.99, fije redondeo 10, incremento -0.01"
-
 #~ msgid "Number of Layer"
 #~ msgstr "Número de piso"
 
 #~ msgid "Create new Product"
 #~ msgstr "Crear nuevo producto"
 
-#~ msgid "Palet"
-#~ msgstr "Paleta"
-
 #~ msgid "In Production"
 #~ msgstr "En producción"
 
@@ -2373,22 +2324,9 @@ msgstr "Descuento precio"
 #~ msgid "Partner Product Name"
 #~ msgstr "Nombre producto empresa"
 
-#~ msgid "Price Min. Margin"
-#~ msgstr "Margen precio mín."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Puede ver la lista de proveedores para este producto."
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "El coste del producto para la valorización contable del inventario. Puede "
-#~ "servir como un precio base para precio de proveedor."
-
 #~ 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"
 
@@ -2399,11 +2337,6 @@ msgstr "Descuento precio"
 #~ "Indica si el producto es visible en la lista de productos dentro de una "
 #~ "selección desde una línea de un pedido de venta."
 
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unidades de medida de la misma categoría puede ser convertidas entre ellas."
-
 #~ msgid ""
 #~ "Name of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
@@ -2411,13 +2344,6 @@ msgstr "Descuento precio"
 #~ "Nombre del producto para esta empresa, se utilizará al imprimir una petición "
 #~ "de presupuesto. Dejarlo vacío para utilizar el nombre interno."
 
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "coef (unidad base) = 1 (esta unidad)"
-
 #~ msgid "Can be sold"
 #~ msgstr "Puede ser vendido"
 
@@ -2431,41 +2357,21 @@ msgstr "Descuento precio"
 #~ "gestionar un stock de unidades de jamón pero realizar la facturación en Kg. "
 #~ "Dejarlo vacío para utilizar la UdM por defecto."
 
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unidad"
-
 #~ msgid "Rate"
 #~ msgstr "Velocidad"
 
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Obtener existencia: Cuando sea necesario, coger desde el stock o esperar el "
-#~ "abastecimiento. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
-#~ "producir para la solicitud de abastecimiento."
-
 #~ msgid "Purchase UoM"
 #~ msgstr "UdM de compra"
 
 #~ msgid "Price list"
 #~ msgstr "Precio"
 
-#~ msgid "Packagings"
-#~ msgstr "Empaquetado"
-
 #~ msgid "Partner Product Code"
 #~ msgstr "Código producto proveedor"
 
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unidades"
-
 #~ msgid "The total number of products you can put by palet or box."
 #~ msgstr "El número total de productos que puede poner por paleta o caja."
 
@@ -2491,25 +2397,6 @@ msgstr "Descuento precio"
 #~ msgid "Product suppliers, with their product name, price, etc."
 #~ msgstr "Proveedores del producto, con su nombre de producto, precio, etc."
 
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "La regla sólo se aplica si la empresa compra/vende más que esta cantidad."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "1 (unidad base) = coef (esta unidad)"
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para "
-#~ "productos que no se pueden partir."
-
 #~ msgid ""
 #~ "Coefficient to convert UOM to UOS\n"
 #~ " uom = uos * coeff"
@@ -2517,18 +2404,9 @@ msgstr "Descuento precio"
 #~ "Coeficiente para convertir UdM a UdV\n"
 #~ " udm = udv * coef"
 
-#~ msgid "Paletization"
-#~ msgstr "Paletización"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Fecha final para validar esta versión de tarifa."
-
 #~ msgid "Prices & Suppliers"
 #~ msgstr "Precios & Proveedores"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 precios que se superpongan!"
-
 #~ msgid "Delivery Delay"
 #~ msgstr "Plazo de entrega"
 
@@ -2653,16 +2531,6 @@ msgstr "Descuento precio"
 #~ "Esta lista de precios será usada en lugar de la lista por omisión para las "
 #~ "ventas a la empresa actual."
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Usado por empresas que utilizan dos unidades de medida: una para facturación "
-#~ "yotra para manejo de inventario.  Por ejemplo, en la industria gastronómica "
-#~ "sepueden utilizar unidades para el inventario del jamón, pero se lo vende "
-#~ "porkilo.  Dejarlo vacío para usar la UdM por omisión."
-
 #~ msgid ""
 #~ "Gives the different ways to package the same product. This has no impact on "
 #~ "the packing order and is mainly used if you use the EDI module."
diff --git a/addons/product/i18n/es_CL.po b/addons/product/i18n/es_CL.po
index 00dea6ff121..94bd3d3bdce 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Fijo"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -267,7 +267,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  por ej.: 1 * (esta unidad) = ratio * (unidad referencia)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -544,7 +544,7 @@ msgid "Metal Cleats"
 msgstr "Tacos de metal"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1312,7 +1312,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensión del palet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -1723,7 +1723,7 @@ msgstr "Productos por categoría"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorías de productos"
 
 #. module: product
@@ -1805,7 +1805,7 @@ msgstr ""
 "catálogo."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -2249,7 +2249,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2299,7 +2299,7 @@ msgid "Shelves"
 msgstr "Estantes"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Otra tarifa"
@@ -2387,125 +2387,6 @@ msgstr "El volumen en m3."
 msgid "Price Discount"
 msgstr "Descuento precio"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Categorías hijas"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Margen precio mín."
-
-#~ msgid "Palet"
-#~ msgstr "Palet"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensión palet"
-
-#~ msgid "Paletization"
-#~ msgstr "Paletización"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Margen precio máx."
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
-
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Tiempo promedio entre la confirmación del pedido del cliente y la entrega "
-#~ "del producto terminado. Es el tiempo que se le promete a los clientes."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "coef (unidad base) = 1 (esta unidad)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "1 (unidad base) = coef (esta unidad)"
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "El modo de calcular el precio para esta regla."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Fecha inicial para validar esta versión de tarifa."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Proveedor del producto"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Fecha final para validar esta versión de tarifa."
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "La regla sólo se aplica si la empresa compra/vende más que esta cantidad."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Puede ver la lista de proveedores para este producto."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unidades de medida de la misma categoría puede ser convertidas entre ellas."
-
-#~ msgid "Packagings"
-#~ msgstr "Empaquetado"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "El coste del producto para la valorización contable del stock. Puede servir "
-#~ "como un precio base para precio de proveedor."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Fija el precio para que sea un múltiplo de este valor.\n"
-#~ "Se aplica redondeo después del descuento y antes del incremento.\n"
-#~ "Para tener precios que terminen en 9.99, fije redondeo 10, incremento -0.01"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Cambiará la forma en que los abastecimientos son procesados: Los consumibles "
-#~ "son productos almacenables con stock infinito o sin una gestión del stock en "
-#~ "el sistema."
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Obtener para stock': Cuando sea necesario, coger desde el stock o esperar "
-#~ "el abastecimiento. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
-#~ "producir para la solicitud de abastecimiento."
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para "
-#~ "productos que no se pueden partir."
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unidad"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unidades"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2768,174 +2649,3 @@ msgstr "Descuento precio"
 #~ msgstr ""
 #~ "El coeficiente para la fórmula:\n"
 #~ "coef. (unidad base) = 1 (esta unidad). Factor = 1 / Ratio."
-
-#~ msgid "Rentable product"
-#~ msgstr "Puede ser alquilado"
-
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Usado por compañías que manejan dos unidades de medida: facturación y "
-#~ "administración de inventarios. Por ejemplo, en las industrias alimentaria, "
-#~ "se administra el almacén de jamón pero se factura en Kg. Dejar sin llenar "
-#~ "para usar UOM por defecto."
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr ""
-#~ "Indica el orden de secuencia cuando se muestra una lista de elementos de "
-#~ "tarifa."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
-
-#~ msgid "res.users"
-#~ msgstr "res.usuarios"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "UdM del producto del proveedor."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "La cantidad mínima a comprar a este proveedor, expresado en la unidad de "
-#~ "medida por defecto."
-
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "¡No se puede resolver la categoría de producto, ' \\n                        "
-#~ "            'ha definido categorías cíclicas' \\n                            "
-#~ "        'de productos!"
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "¡No existe versión activa para la tarifa seleccionada!\n"
-#~ "' \\n                                'Debe crear o activar una."
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "¡El acceso rápido para este menú ya existe!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Only one value can be defined for each given usage!"
-#~ msgstr "¡Sólo se puede definir un valor para cada uso dado!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid ""
-#~ "There can be more than one version of a pricelist. If you need to create new "
-#~ "versions of a pricelist, you can do it and manage them from here. Some "
-#~ "examples of versions: 2010, 2011, Promotion of February 2010, etc."
-#~ msgstr ""
-#~ "Pueden existir varias versiones de una lista de precios. SI necesita crear "
-#~ "una nueva versión de lista de precio, lo puede hacer y gestionar desde aquí, "
-#~ "Algunos ejemplos de versiones: 2010, 2011, promoción de febrero 2010, etc"
-
-#~ msgid ""
-#~ "Create and manage the units of measure you want to be used in your system. "
-#~ "You can define a conversion rate to be used between the several Unit of "
-#~ "Measure within the same category."
-#~ msgstr ""
-#~ "Cree y gesitone las unidades de medida que quiera utilizar en su sistema. "
-#~ "Puede definir una tasa de conversión que será utilizada entre las diferentes "
-#~ "unidades de medida dentro de la misma categoría."
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "Auquí tiene una lista de todos sus productos clasificados por categoría. "
-#~ "Puede seleccionar una categoría para obtener la lista de todos los productos "
-#~ "relacionados con dicha categoría o un hijo de la categoría."
-
-#~ msgid ""
-#~ "A pricelist contains rules to be evaluated in order to compute the purchase "
-#~ "or sale price for all the partners assigned to a pricelist. Pricelists have "
-#~ "several versions (2010, 2011, Promotion of February 2010, etc.) and each "
-#~ "version has several rules. Example: the customer price of this category of "
-#~ "product will be based on the supplier price multiplied by 1.80."
-#~ msgstr ""
-#~ "Una lista de precios contiene las reglas para calcular el precio de compra o "
-#~ "de venta para todas las empresas que tenga dicha lista de precios asignada. "
-#~ "Las listas de precios tienen varias versiones (2010, 2011, promoción de "
-#~ "febrero 2010, etc.) y cada versión tiene varias reglas. Ejemplo: el precio "
-#~ "de venta de esta categoría de productos se basará en el precio de compra "
-#~ "muliplicado por 1,80."
-
-#~ msgid ""
-#~ "Products can be purchased and/or sold. They can be raw materials, stockable "
-#~ "products, consumables or services. The Product form contains a detailed "
-#~ "information on your  products related to procurement logistics, sales price, "
-#~ "product category, suppliers and so on."
-#~ msgstr ""
-#~ "Los productos pueden ser comprados y/o vendidos.Pueden ser materias primas, "
-#~ "productos estocables, consumibles o servicios. El formulario del producto "
-#~ "contiene información detallada de sus productos en relación con el "
-#~ "abastecimiento logístico, precio de venta, categoría, proveedores etc."
-
-#~ msgid ""
-#~ "You must define a Product for everything you buy or sell. They can be raw "
-#~ "materials, stockable products, consumables or services. The Product form "
-#~ "contains a detailed information of your products related to procurement "
-#~ "logistics, sales price, product category, suppliers and so on."
-#~ msgstr ""
-#~ "Debe definir un producto para cualquier cosa que compre o venda. Pueden ser "
-#~ "materias primas, productos almacenables, consumibles o servicios. El "
-#~ "formulario del producto contiene información detallada de sus productos en "
-#~ "relación con el abastecimiento logístico, precio de venta, categoría, "
-#~ "proveedores, ..."
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "La compañía seleccionada no está en las compañías permitidas para este "
-#~ "usuario"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
-
-#~ msgid ""
-#~ "Create and manage the units of measure categories you want to be used in "
-#~ "your system. If several units of measures are in the same category, they can "
-#~ "be converted within each other. For example, in the unit of measure category "
-#~ "\"Time\", you will have the following UoM: Hours, Days."
-#~ msgstr ""
-#~ "Cree y gestione las unidades de medida y categorías  que queira utilizar en "
-#~ "su sistema. Si varias uniddades de miedida están en la misma categoría, se "
-#~ "pueden convertir entre ellas. P.ej, en la categría de la unidad de medida "
-#~ "\"Tiempo\", tendrá las siguienes UdM: Horas, Días."
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index b0049c1ce9c..d8a8c4bae38 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Fijo"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -157,6 +157,8 @@ 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 ""
+"La cantidad mínima para disparar esta regla, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -226,7 +228,7 @@ msgstr "Miscelleanous"
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "Trabajador"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -234,6 +236,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Indica si el producto será visible en la lista de productos que aparece al "
+"seleccionar un producto en una línea de pedido de venta."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -260,10 +264,10 @@ msgstr "Tipo de producto"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  por ej.: 1 * (esta unidad) = ratio * (unidad referencia)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -296,7 +300,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "Nombre proveedor, precio, código producto, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -311,7 +315,7 @@ msgstr "EAN13"
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "Proveedor principal"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -339,7 +343,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "Madera 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
@@ -349,7 +353,7 @@ msgstr "Cantidad-1"
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "El número de paquetes por capa."
 
 #. module: product
 #: field:product.packaging,qty:0
@@ -366,7 +370,7 @@ msgstr "Estado:"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "Seleccione la categoría para el producto actual."
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -376,7 +380,7 @@ msgstr "Salida"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "Referencia UdM para esta categoría"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
@@ -402,7 +406,7 @@ msgstr "Responsable de producto"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "Nombre producto proveedor"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
@@ -417,11 +421,16 @@ msgid ""
 "information about your products related to procurement logistics, sales "
 "price, product category, suppliers and so on."
 msgstr ""
+"Los productos pueden ser comprados y / o vendidos. Pueden ser materias "
+"primas, productos inventariable, material fungible o servicios. El "
+"formulario del producto contiene información detallada sobre sus productos "
+"relacionados con la logística de contratación, precio de venta, categoría de "
+"los productos, proveedores, etc."
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "Buscar precio productos"
 
 #. module: product
 #: view:product.product:0
@@ -498,6 +507,8 @@ msgid ""
 "Choose here the Unit of Measure in which the prices and quantities are "
 "expressed below."
 msgstr ""
+"Seleccione aquí la unidad de medida en que se expresarán los precios y las "
+"cantidades listadas."
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -512,7 +523,7 @@ msgstr "Ventas & Compras"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Horario de trabajo"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -523,6 +534,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 ""
+"Una lista de precios contiene normas que deben evaluarse con el fin de "
+"calcular precio de compra o de venta para todos los terceros asignados con "
+"una lista de precios. Las listas de precios tienen varias versiones (2010, "
+"2011, promoción de febrero de 2010, etc) y cada versión tiene varias reglas. "
+"Ejemplo: precio de los clientes de una categoría de producto se basará en "
+"precio del proveedor multiplicado por 1,80."
 
 #. module: product
 #: help:product.product,active:0
@@ -530,19 +547,22 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "Tacos de metal"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
 "Please create or activate one."
 msgstr ""
+"¡No hay una versión activa de la tarifa seleccionada!\n"
+"Cree o active una."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -575,6 +595,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -582,6 +604,9 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Conversiones de cantidad pueden realizarse de forma automática entre "
+"unidades de medida en la misma categoría, de acuerdo con sus coeficientes de "
+"conversión respectivos."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -596,17 +621,17 @@ msgstr "Existencia virtual"
 #. module: product
 #: selection:product.category,type:0
 msgid "View"
-msgstr ""
+msgstr "Vista"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr ""
+msgstr "Plantillas producto"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Gastos restaurante"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -622,7 +647,7 @@ msgstr "Cantidad mín."
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
 msgid "Price Type"
-msgstr ""
+msgstr "Tipo de precio"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -651,21 +676,24 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"Cuando se duplica una versión se cambia a no activa, de modo que las fechas "
+"no se superpongan con la versión original. Deberá cambiar las fechas y "
+"reactivar la tarifa."
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "KIT estante de 100cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr ""
+msgstr "Panel lateral"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -695,12 +723,12 @@ msgstr "Lista de precios"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Proveedores"
 
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "A comprar"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -709,6 +737,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"La cantidad mínima a comprar a este proveedor, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -721,6 +751,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 ""
+"Este precio se considerará como el precio para la UdM del proveedor si "
+"existe o en la UdM por defecto del producto en caso contrario."
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -735,7 +767,7 @@ msgstr "Plazo de entrega del cliente"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "Proveedor del producto"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -744,6 +776,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 ""
+"Utilizado por las compañías que gestionan dos unidades de medida: "
+"facturación y gestión de inventario. Por ejemplo, en industrias "
+"alimentarias, puede gestionar un stock de unidades de jamón, pero facturar "
+"en Kg. Déjelo vacío para usar la UdM por defecto."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -786,7 +822,7 @@ msgstr "Ref. cliente"
 #. module: product
 #: view:product.product:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscelanea"
 
 #. module: product
 #: field:product.pricelist.type,key:0
@@ -816,12 +852,12 @@ msgstr "Abastecimiento & Ubicaciones"
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Proyecto diseño cocina"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Hora"
 
 #. module: product
 #: selection:product.template,state:0
@@ -831,17 +867,17 @@ msgstr "En desarrollo"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Estante de 200cm"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Ratio y precisión"
 
 #. 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
@@ -852,7 +888,7 @@ msgstr "Kits de componentes TI"
 #: selection:product.category,type:0
 #: selection:product.template,state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
@@ -880,7 +916,7 @@ msgstr "Categorías de producto"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  por ej.: 1 * (unidad referencia) = ratio * (esta unidad)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -889,6 +925,9 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"Cree y gestione las unidades de medida que desea utilizar en su sistema. "
+"Puede definir una tipo de conversión entre diferentes unidades de medida en "
+"la misma categoría."
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -906,6 +945,8 @@ msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
 msgstr ""
+"Coste del producto para la valoración contable de las existencias. Es el "
+"precio base para el precio del proveedor."
 
 #. module: product
 #: view:product.price.type:0
@@ -930,7 +971,7 @@ msgstr "Información de un proveedor de producto"
 #. module: product
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: product
 #: view:product.product:0
@@ -942,7 +983,7 @@ msgstr "Descripción de compra"
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -951,6 +992,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Plazo de entrega en días entre la confirmación del pedido de compra y la "
+"recepción de los productos en su almacén. Utilizado por el planificador para "
+"el cálculo automático de la planificación del pedido de compra."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action
@@ -959,6 +1003,9 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"No puede haber más de una versión de una lista de precios. Aquí puede crear "
+"y administrar nuevas versiones de una lista de precios. Algunos ejemplos de "
+"versiones: 2010, 2011, promoción de verano, etc"
 
 #. module: product
 #: selection:product.template,type:0
@@ -979,6 +1026,7 @@ msgstr "Seq"
 #: view:product.price_list:0
 msgid "Calculate Product Price per unit base 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
@@ -1025,11 +1073,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 ""
+"Cree y gestione las categorías de unidades de medida que quiera utilizar en "
+"su sistema. SI varias unidades de medida están en la misma categoría, pueden "
+"ser convertidas entre ellas. Por ejemplo, en al unidad de medida \"Tiempo\", "
+"tendrá las sigueinte UdM: horas, días."
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Mayor que la UdM de referencia"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
@@ -1039,12 +1091,12 @@ msgstr "Productos y tarifas"
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "A vender"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "Servicios negociables"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1078,12 +1130,12 @@ msgstr "Nombre"
 #. module: product
 #: view:product.product:0
 msgid "Stockable"
-msgstr ""
+msgstr "Almacenable"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Dintel madera 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1093,16 +1145,21 @@ 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 cosa 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 logística de abastecimiento, precio de venta, categoría de "
+"producto, proveedores, etc."
 
 #. 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
@@ -1112,7 +1169,7 @@ msgstr "Obsoleto"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "Km"
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -1130,12 +1187,14 @@ msgstr ""
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de categorías de "
+"producto."
 
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
 msgid "Ratio"
-msgstr ""
+msgstr "Proporción"
 
 #. module: product
 #: help:product.template,purchase_ok:0
@@ -1164,17 +1223,17 @@ msgstr "Campo asociado en el formulario de producto."
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidad de Medida"
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Método de abastecimiento"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Fecha de impresión"
 
 #. module: product
 #: field:product.template,uos_id:0
@@ -1204,6 +1263,25 @@ msgid ""
 "    Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"    Este es el módulo base para gestionar productos y tarifas en OpenERP.\n"
+"\n"
+"    Los productos soportan variantes, distintos métodos de precios, "
+"información\n"
+"    de proveedor, obtener para stock/pedido, distintas unidades de medida,\n"
+"    empaquetado y propiedades.\n"
+"\n"
+"    Soporte de tarifas:\n"
+"    * Múltiple-nivel de descuento (por producto, categoría, cantidades)\n"
+"    * Cálculo del precio basado en distintos criterios:\n"
+"        * Otra tarifa,\n"
+"        * Precio coste,\n"
+"        * Precio lista,\n"
+"        * Precio proveedor, ...\n"
+"    Preferencias de tarifas por producto y/o empresas.\n"
+"\n"
+"    Imprimir etiquetas de productos con códigos de barras.\n"
+"    "
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1221,6 +1299,8 @@ msgstr ""
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
 msgstr ""
+"Proveedor principal que tenga la prioridad más alta en la lista de "
+"proveedores."
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -1245,7 +1325,7 @@ msgstr "Productos"
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "El número de capas en un palet o caja."
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -1259,10 +1339,10 @@ msgid "Pallet Dimension"
 msgstr "Dimensión del palet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (copia)"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -1276,6 +1356,9 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Esta es la demora media en días entre la confirmación del pedido del cliente "
+"y la entrega de los productos acabados. Es el tiempo que prometen a sus "
+"clientes."
 
 #. module: product
 #: view:product.product:0
@@ -1287,7 +1370,7 @@ msgstr "UdM secundaria"
 #: code:addons/product/product.py:142
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1313,6 +1396,8 @@ msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Este código de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el código interno."
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -1331,6 +1416,9 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Indica el orden en que los elementos de la tarifa serán comprobados. En la "
+"evaluación se da máxima prioridad a la secuencia más baja y se detiene tan "
+"pronto como se encuentra un elemento coincidente."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1366,7 +1454,7 @@ msgstr "Estante"
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida compra"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1380,11 +1468,14 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Aquí se muestra una lista de todos los productos clasificados por "
+"categorías. Puede hacer clic en una categoría para obtener la lista de todos "
+"los productos vinculados con esta categoría o con una categoría hija."
 
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -1398,6 +1489,8 @@ msgid ""
 "Conversion from Product UoM m to Default UoM PCE is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"¡La conversión de la UdM m a la UdM PCE no es posible ya que ambas "
+"pertenecen a categorías diferentes!"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1412,6 +1505,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Demora media en días para producir este producto. Esto es sólo para la orden "
+"de fabricación y, si se trata de un lista de material multi-nivel, es sólo "
+"para el nivel de este producto. Diferentes tiempos de demora se suman para "
+"todos los niveles y pedidos de compra."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -1433,6 +1530,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
 
 #. module: product
 #: field:product.product,qty_available:0
@@ -1442,7 +1540,7 @@ msgstr "Inventario real"
 #. 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
@@ -1465,12 +1563,12 @@ msgstr "Precisión de redondeo"
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Propiedades unidad de medida"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "Estantería 200cm"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1490,7 +1588,7 @@ msgstr "El peso del UL vacío"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Menor que la UdM de referencia"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1509,7 +1607,7 @@ msgstr "Margen de precio variante"
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "¡El ratio de conversión para una unidad de medida no puede ser 0!"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1538,6 +1636,9 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Cuantas veces esta UdM es más pequeña que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (unidad de referencia) = ratio * (esta unidad)"
 
 #. module: product
 #: help:product.template,uom_id:0
@@ -1549,7 +1650,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "Misc."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
@@ -1575,17 +1676,17 @@ msgstr "Precio publico"
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Productos negociables"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Código producto proveedor"
 
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr ""
+msgstr "UdM por defecto"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1608,6 +1709,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 ""
+"Establecer una categoría de producto si esta regla sólo se aplicará a los "
+"productos de una categoría y sus hijos. Dejar vacío para todos los productos"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1635,7 +1738,7 @@ msgstr "Obtener bajo pedido"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "El número total de productos que puede poner por palet o caja."
 
 #. module: product
 #: field:product.product,variants:0
@@ -1651,7 +1754,7 @@ msgstr "Productos por categoría"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorías de productos"
 
 #. module: product
@@ -1662,12 +1765,12 @@ msgstr "Coef. UdM -> UdV"
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+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
@@ -1733,7 +1836,7 @@ msgstr ""
 "catálogo."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sección empresa del formulario de producto"
@@ -1746,7 +1849,7 @@ msgstr "Nombre de este tipo de precio."
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "UdM proveedor"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -1759,11 +1862,14 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"Unidad de medida por defecto utilizada para los pedidos de compra. Debe "
+"estar en la misma categoría que la unidad de medida por defecto."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
 msgstr ""
+"Este producto está configurado con ejemplo de flujos empujar/estirar."
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1773,7 +1879,7 @@ msgstr "Longitud"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Longitud / Distancia"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
@@ -1790,17 +1896,17 @@ msgstr "Tipo de precio"
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "Otros productos"
 
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "Características"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "Puede ser vendido"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -1820,7 +1926,7 @@ msgstr "Basado en"
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "Materia Prima"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -1829,6 +1935,9 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"Stock futuro de este producto conforme a las ubicaciones seleccionadas o "
+"todas las internas, si ninguna de ellas ha sido seleccionada. Calculo como: "
+"Stock real - Saliente + Entrante."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -1850,7 +1959,7 @@ msgstr "* ( 1 + "
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "El peso de un paquete, palet o caja completo/a."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
@@ -1860,12 +1969,12 @@ msgstr "HDD Seagate 7200.8 120GB"
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
 msgid "Employee"
-msgstr ""
+msgstr "Empleado(a)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Estante de 100cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
@@ -1876,12 +1985,12 @@ msgstr "Categoría de producto"
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "Nombre tarifa"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Tiempo de entrega"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1889,6 +1998,8 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar una unidad de medida sin "
+"eliminarla."
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -1906,11 +2017,13 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Cree y gestione las unidades y tipos de embalaje que quiera utilizar en su "
+"sistema."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Panel posterior SHE200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -1929,7 +2042,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 "Esta es una cantidad que será convertida en UdM por defecto."
 
 #. module: product
 #: field:product.packaging,ul:0
@@ -1964,12 +2077,12 @@ msgstr "Ratón"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Tipo UdM"
 
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "Se utiliza como responsable de tarea."
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -1977,6 +2090,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 ""
+"La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para una "
+"Unidad de Medida que no pueda dividirse aún más, como una pieza."
 
 #. module: product
 #: view:product.product:0
@@ -1992,7 +2107,7 @@ msgstr "Fila"
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Panel posterior SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -2008,12 +2123,12 @@ msgstr "Pesos"
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error ! No puedes crear miembros asociados recursivos"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Gastos hotel"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2021,16 +2136,20 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Cuantas veces esta UdM es más grande que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (esta unidad) = ratio * (unidad de referencia)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "Estantería 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de paquetes."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -2048,6 +2167,8 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Este nombre de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el nombre interno."
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -2057,7 +2178,7 @@ msgstr "Variable"
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "Puede ser alquilado"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -2078,7 +2199,7 @@ msgstr "Peso bruto"
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Sección montaje"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
@@ -2104,7 +2225,7 @@ msgstr ""
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrado"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -2124,7 +2245,7 @@ msgstr "Propiedades de venta"
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "tonne"
-msgstr ""
+msgstr "tonelada"
 
 #. module: product
 #: view:product.product:0
@@ -2135,7 +2256,7 @@ msgstr "Plazos"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "Creación del producto"
 
 #. module: product
 #: help:product.template,type:0
@@ -2144,6 +2265,9 @@ msgid ""
 "products with infinite stock, or for use when you have no inventory "
 "management in the system."
 msgstr ""
+"Cambiará la forma en que las compras son procesadas. Los Consumibles son "
+"productos almacenables y con infinita capacidad de almacenamiento, o para "
+"usarse cuando no hay administración de inventarios en el sistema."
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2156,12 +2280,14 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
 "products!"
 msgstr ""
+"¡No se pudo resolver la categoría del producto, ha definido categorías de "
+"producto cíclicas!"
 
 #. module: product
 #: view:product.template:0
@@ -2201,10 +2327,10 @@ msgstr "Variantes de producto"
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Contenedor"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Otro Precio"
@@ -2239,6 +2365,9 @@ 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 ""
+"Indica las diferentes formas de empaquetar el mismo producto. Esto no tiene "
+"ningún impacto en la preparación de albaranes y se utiliza principalmente si "
+"utiliza el módulo EDI."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2263,7 +2392,7 @@ msgstr "Precio de venta"
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Tipo de categoría"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -2276,6 +2405,8 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Coeficiente para convertir UdM a UdV\n"
+" UdV = UdM * coef"
 
 #. module: product
 #: help:product.template,volume:0
@@ -2528,80 +2659,6 @@ msgstr "Descuento precio"
 #~ msgid "KGM"
 #~ msgstr "Kg."
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Tiempo promedio entre la confirmación del pedido del cliente y la entrega "
-#~ "del producto terminado. Es el tiempo que se le promete a los clientes."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "El modo de calcular el precio para esta regla."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Proveedor del producto"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Fecha inicial para validar esta versión de tarifa."
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Cambiará la forma en que los abastecimientos son procesados: Los consumibles "
-#~ "son productos almacenables con stock infinito o sin una gestión del stock en "
-#~ "el sistema."
-
-#~ msgid "Rentable product"
-#~ msgstr "Producto rentable"
-
-#~ msgid "Childs Categories"
-#~ msgstr "Categorías hijas"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensión de paleta"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Margen precio máx."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Fija el precio para que sea un múltiplo de este valor.\n"
-#~ "Se aplica redondeo después del descuento y antes del incremento.\n"
-#~ "Para tener precios que terminen en 9.99, fije redondeo 10, incremento -0.01"
-
-#~ msgid "Palet"
-#~ msgstr "Paleta"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Margen precio mín."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Puede ver la lista de proveedores para este producto."
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "El coste del producto para la valorización contable del inventario. Puede "
-#~ "servir como un precio base para precio de proveedor."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unidades de medida de la misma categoría puede ser convertidas entre ellas."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "coef (unidad base) = 1 (esta unidad)"
-
 #~ msgid ""
 #~ "Used by companies that manages two unit of measure: invoicing and stock "
 #~ "management. For example, in food industries, you will manage a stock of ham "
@@ -2612,53 +2669,5 @@ msgstr "Descuento precio"
 #~ "gestionar un stock de unidades de jamón pero realizar la facturación en Kg. "
 #~ "Dejarlo vacío para utilizar la UdM por defecto."
 
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unidad"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Obtener existencia: Cuando sea necesario, coger desde el stock o esperar el "
-#~ "abastecimiento. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
-#~ "producir para la solicitud de abastecimiento."
-
-#~ msgid "Packagings"
-#~ msgstr "Empaquetado"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unidades"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "La regla sólo se aplica si la empresa compra/vende más que esta cantidad."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "El coeficiente para la fórmula:\n"
-#~ "1 (unidad base) = coef (esta unidad)"
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para "
-#~ "productos que no se pueden partir."
-
-#~ msgid "Paletization"
-#~ msgstr "Paletización"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Fecha final para validar esta versión de tarifa."
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 precios que se superpongan!"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/product/i18n/es_MX.po b/addons/product/i18n/es_MX.po
new file mode 100644
index 00000000000..447181cb6d5
--- /dev/null
+++ b/addons/product/i18n/es_MX.po
@@ -0,0 +1,2682 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product
+#
+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:15+0000\n"
+"PO-Revision-Date: 2011-01-13 22:39+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:23+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram512_product_template
+msgid "DDR 512MB PC400"
+msgstr "DDR 512MB PC400"
+
+#. module: product
+#: field:product.packaging,rows:0
+msgid "Number of Layers"
+msgstr "Número de capas"
+
+#. module: product
+#: constraint:product.pricelist.item:0
+msgid ""
+"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+"Item!"
+msgstr ""
+"¡Error! No puede asignar la tarifa principal como Otra tarifa en un elemento "
+"de la tarifa!"
+
+#. module: product
+#: help:product.pricelist.item,product_tmpl_id:0
+msgid ""
+"Set a template if this rule only apply to a template of product. Keep empty "
+"for all products"
+msgstr ""
+"Indicar una plantilla si esta regla sólo se aplica a una plantilla de "
+"producto. Dejarlo vacío para todos los productos"
+
+#. module: product
+#: model:product.category,name:product.cat1
+msgid "Sellable"
+msgstr "Vendible"
+
+#. module: product
+#: model:product.template,name:product.product_product_mb2_product_template
+msgid "Mainboard ASUStek A7V8X-X"
+msgstr "Placa madre ASUStek A7V8X-X"
+
+#. module: product
+#: help:product.template,seller_qty:0
+msgid "This is minimum quantity to purchase from Main Supplier."
+msgstr "Esta es la mínima cantidad a comprar al proveedor principal."
+
+#. module: product
+#: model:product.uom,name:product.uom_day
+msgid "Day"
+msgstr "Día"
+
+#. module: product
+#: view:product.product:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc2_product_template
+msgid "Basic+ PC (assembly on order)"
+msgstr "PC Básico+ (ensamblado bajo pedido)"
+
+#. module: product
+#: field:product.product,incoming_qty:0
+msgid "Incoming"
+msgstr "Entrante"
+
+#. module: product
+#: field:product.template,mes_type:0
+msgid "Measure Type"
+msgstr "Tipo de medida"
+
+#. module: product
+#: help:res.partner,property_product_pricelist:0
+msgid ""
+"This pricelist will be used, instead of the default one, for sales to the "
+"current partner"
+msgstr ""
+"Esta tarifa se utilizará, en lugar de la por defecto, para las ventas de la "
+"empresa actual."
+
+#. module: product
+#: constraint:product.supplierinfo:0
+msgid ""
+"Error: The default UOM and the Supplier Product UOM must be in the same "
+"category."
+msgstr ""
+"Error: La UdM por defecto y la UdM del proveedor del producto deben estar en "
+"la misma categoría."
+
+#. module: product
+#: field:product.template,seller_qty:0
+msgid "Supplier Quantity"
+msgstr "Cantidad proveedor"
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: product
+#: code:addons/product/pricelist.py:186
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
+#, python-format
+msgid "Warning !"
+msgstr "¡Atención!"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_pricelist
+#: model:ir.model,name:product.model_product_pricelist
+#: field:product.product,price:0
+#: field:product.product,pricelist_id:0
+#: view:product.supplierinfo:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Base Prices"
+msgstr "Precios base"
+
+#. module: product
+#: field:product.pricelist.item,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. module: product
+#: field:product.product,code:0
+#: field:product.product,default_code:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: product
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: product
+#: help:pricelist.partnerinfo,min_quantity:0
+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 ""
+"La cantidad mínima para disparar esta regla, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
+
+#. module: product
+#: model:product.template,name:product.product_product_24_product_template
+msgid "Keyboard"
+msgstr "Teclado"
+
+#. module: product
+#: model:ir.model,name:product.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: product
+#: help:product.template,supply_method:0
+msgid ""
+"Produce will generate production order or tasks, according to the product "
+"type. Purchase will trigger purchase orders when requested."
+msgstr ""
+"Producir generará órdenes de producción o tareas, de acuerdo al tipo de "
+"producto. Comprar generará pedidos de compras cuando sea necesario."
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: product
+#: help:product.pricelist.item,name:0
+msgid "Explicit rule name for this pricelist line."
+msgstr "Nombre de regla explícita para esta línea de tarifa."
+
+#. 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 "Units of Measure Categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu1_product_template
+msgid "Processor AMD Athlon XP 1800+"
+msgstr "Procesador AMD Athlon XP 1800+"
+
+#. module: product
+#: model:product.template,name:product.product_product_20_product_template
+msgid "HDD on demand"
+msgstr "HDD bajo pedido"
+
+#. module: product
+#: field:product.price_list,price_list:0
+msgid "PriceList"
+msgstr "Tarifa"
+
+#. module: product
+#: view:product.template:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "PCE"
+msgstr "Unidad"
+
+#. module: product
+#: view:product.template:0
+msgid "Miscelleanous"
+msgstr "Miscelánea"
+
+#. module: product
+#: model:product.template,name:product.product_product_worker0_product_template
+msgid "Worker"
+msgstr "Trabajador"
+
+#. module: product
+#: help:product.template,sale_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from a sale order line."
+msgstr ""
+"Indica si el producto será visible en la lista de productos que aparece al "
+"seleccionar un producto en una línea de pedido de venta."
+
+#. module: product
+#: model:product.pricelist.version,name:product.ver0
+msgid "Default Public Pricelist Version"
+msgstr "Versión de tarifa pública por defecto"
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Standard Price"
+msgstr "Precio estándar"
+
+#. module: product
+#: model:product.pricelist.type,name:product.pricelist_type_sale
+#: field:res.partner,property_product_pricelist:0
+msgid "Sale Pricelist"
+msgstr "Tarifa de venta"
+
+#. module: product
+#: view:product.template:0
+#: field:product.template,type:0
+msgid "Product Type"
+msgstr "Tipo de producto"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
+msgstr "  por ej.: 1 * (esta unidad) = ratio * (unidad referencia)"
+
+#. module: product
+#: code:addons/product/product.py:380
+#, python-format
+msgid "Products: "
+msgstr "Productos: "
+
+#. module: product
+#: field:product.category,parent_id:0
+msgid "Parent Category"
+msgstr "Categoría padre"
+
+#. module: product
+#: help:product.product,outgoing_qty:0
+msgid ""
+"Quantities of products that are planned to leave in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Cantidades de productos que están previstos dejar en las ubicaciones "
+"seleccionadas o todas las internas si no se ha seleccionado ninguna."
+
+#. module: product
+#: help:product.template,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Obtener para stock': Cuando sea necesario, coger del stock o esperar hasta "
+"que sea reabastecido. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
+"producir para la petición de abastecimiento."
+
+#. module: product
+#: model:process.node,note:product.process_node_supplier0
+msgid "Supplier name, price, product code, ..."
+msgstr "Nombre proveedor, precio, código producto, ..."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd3_product_template
+msgid "HDD Seagate 7200.8 160GB"
+msgstr "HDD Seagate 7200.8 160GB"
+
+#. module: product
+#: field:product.product,ean13:0
+msgid "EAN13"
+msgstr "EAN13"
+
+#. module: product
+#: field:product.template,seller_id:0
+msgid "Main Supplier"
+msgstr "Proveedor principal"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_ul_form_action
+#: model:ir.model,name:product.model_product_packaging
+#: model:ir.ui.menu,name:product.menu_product_ul_form_action
+#: view:product.packaging:0
+#: view:product.product:0
+#: view:product.ul:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: product
+#: view:product.product:0
+#: field:product.template,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: product
+#: help:product.pricelist.item,min_quantity:0
+msgid ""
+"The rule only applies if the partner buys/sells more than this quantity."
+msgstr ""
+"La regla sólo se aplica si la empresa compra/vende más de esta cantidad."
+
+#. module: product
+#: model:product.template,name:product.product_product_woodmm0_product_template
+msgid "Wood 2mm"
+msgstr "Madera 2mm"
+
+#. module: product
+#: field:product.price_list,qty1:0
+msgid "Quantity-1"
+msgstr "Cantidad-1"
+
+#. module: product
+#: help:product.packaging,ul_qty:0
+msgid "The number of packages by layer"
+msgstr "El número de paquetes por capa."
+
+#. module: product
+#: field:product.packaging,qty:0
+msgid "Quantity by Package"
+msgstr "Cantidad por paquete"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: product
+#: help:product.template,categ_id:0
+msgid "Select category for the current product"
+msgstr "Seleccione la categoría para el producto actual."
+
+#. module: product
+#: field:product.product,outgoing_qty:0
+msgid "Outgoing"
+msgstr "Saliente"
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Reference UoM for this category"
+msgstr "Referencia UdM para esta categoría"
+
+#. module: product
+#: model:product.price.type,name:product.list_price
+#: field:product.product,lst_price:0
+msgid "Public Price"
+msgstr "Precio al público"
+
+#. module: product
+#: field:product.price_list,qty5:0
+msgid "Quantity-5"
+msgstr "Cantidad-5"
+
+#. module: product
+#: model:product.category,name:product.product_category_10
+msgid "IT components"
+msgstr "Componentes TI"
+
+#. module: product
+#: field:product.template,product_manager:0
+msgid "Product Manager"
+msgstr "Responsable de producto"
+
+#. module: product
+#: field:product.supplierinfo,product_name:0
+msgid "Supplier Product Name"
+msgstr "Nombre producto proveedor"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc3_product_template
+msgid "Medium PC"
+msgstr "PC Medio"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action_puchased
+msgid ""
+"Products can be purchased and/or sold. They 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 ""
+"Los productos pueden ser comprados y / o vendidos. Pueden ser materias "
+"primas, productos inventariable, material fungible o servicios. El "
+"formulario del producto contiene información detallada sobre sus productos "
+"relacionados con la logística de contratación, precio de venta, categoría de "
+"los productos, proveedores, etc."
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price Search"
+msgstr "Buscar precio productos"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_sale:0
+msgid "Sale Description"
+msgstr "Descripción de venta"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Storage Localisation"
+msgstr "Ubicación en el almacén"
+
+#. module: product
+#: help:product.packaging,length:0
+msgid "The length of the package"
+msgstr "La longitud del paquete."
+
+#. module: product
+#: help:product.template,weight_net:0
+msgid "The net weight in Kg."
+msgstr "El peso neto en Kg."
+
+#. module: product
+#: help:product.template,state:0
+msgid "Tells the user if he can use the product or not."
+msgstr "Informa al usuario si puede usar el producto o no."
+
+#. module: product
+#: field:pricelist.partnerinfo,min_quantity:0
+#: field:product.supplierinfo,qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: product
+#: field:product.packaging,height:0
+msgid "Height"
+msgstr "Altura"
+
+#. module: product
+#: help:product.pricelist.version,date_end:0
+msgid "Ending date for this pricelist version to be valid."
+msgstr "Fecha de fin de validez de esta versión de tarifa."
+
+#. module: product
+#: model:product.category,name:product.cat0
+msgid "All products"
+msgstr "Todos los productos"
+
+#. module: product
+#: model:ir.model,name:product.model_pricelist_partnerinfo
+msgid "pricelist.partnerinfo"
+msgstr "pricelist.partnerinfo"
+
+#. module: product
+#: field:product.price_list,qty2:0
+msgid "Quantity-2"
+msgstr "Cantidad-2"
+
+#. module: product
+#: field:product.price_list,qty3:0
+msgid "Quantity-3"
+msgstr "Cantidad-3"
+
+#. module: product
+#: view:product.product:0
+msgid "Codes"
+msgstr "Códigos"
+
+#. module: product
+#: help:product.supplierinfo,product_uom:0
+msgid ""
+"Choose here the Unit of Measure in which the prices and quantities are "
+"expressed below."
+msgstr ""
+"Seleccione aquí la unidad de medida en que se expresarán los precios y las "
+"cantidades listadas."
+
+#. module: product
+#: field:product.price_list,qty4:0
+msgid "Quantity-4"
+msgstr "Cantidad-4"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_wtime
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action2
+msgid ""
+"A price list contains rules to be evaluated in order to compute the purchase "
+"or sales price for all the partners assigned to a price list. Price lists "
+"have several versions (2010, 2011, Promotion of February 2010, etc.) and "
+"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 ""
+"Una lista de precios contiene normas que deben evaluarse con el fin de "
+"calcular precio de compra o de venta para todos los terceros asignados con "
+"una lista de precios. Las listas de precios tienen varias versiones (2010, "
+"2011, promoción de febrero de 2010, etc) y cada versión tiene varias reglas. "
+"Ejemplo: precio de los clientes de una categoría de producto se basará en "
+"precio del proveedor multiplicado por 1,80."
+
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
+
+#. module: product
+#: model:product.template,name:product.product_product_metalcleats0_product_template
+msgid "Metal Cleats"
+msgstr "Tacos de metal"
+
+#. module: product
+#: code:addons/product/pricelist.py:343
+#, python-format
+msgid ""
+"No active version for the selected pricelist !\n"
+"Please create or activate one."
+msgstr ""
+"¡No hay una versión activa de la tarifa seleccionada!\n"
+"Cree o active una."
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product uom categ"
+msgstr "Categ. UdM de producto"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_box
+msgid "Box 20x20x40"
+msgstr "Caja 20x20x40"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Price Computation"
+msgstr "Cálculo del precio"
+
+#. module: product
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr "Puede ser comprado"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu2_product_template
+msgid "High speed processor config"
+msgstr "Config. Procesador alta velocidad"
+
+#. module: product
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
+
+#. module: product
+#: help:product.uom,category_id:0
+msgid ""
+"Quantity conversions may happen automatically between Units of Measure in "
+"the same category, according to their respective ratios."
+msgstr ""
+"Conversiones de cantidad pueden realizarse de forma automática entre "
+"unidades de medida en la misma categoría, de acuerdo con sus coeficientes de "
+"conversión respectivos."
+
+#. module: product
+#: help:product.packaging,width:0
+msgid "The width of the package"
+msgstr "La anchura del paquete."
+
+#. module: product
+#: field:product.product,virtual_available:0
+msgid "Virtual Stock"
+msgstr "Stock virtual"
+
+#. module: product
+#: selection:product.category,type:0
+msgid "View"
+msgstr "Vista"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_template_action_tree
+msgid "Product Templates"
+msgstr "Plantillas producto"
+
+#. module: product
+#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
+msgid "Restaurant Expenses"
+msgstr "Gastos restaurante"
+
+#. module: product
+#: constraint:product.packaging:0
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: product
+#: field:product.pricelist.item,min_quantity:0
+msgid "Min. Quantity"
+msgstr "Cantidad mín."
+
+#. module: product
+#: model:ir.model,name:product.model_product_price_type
+msgid "Price Type"
+msgstr "Tipo precio"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Max. Margin"
+msgstr "Margen máx."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Base Price"
+msgstr "Precio base"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan2_product_template
+msgid "Silent fan"
+msgstr "Ventilador silencioso"
+
+#. module: product
+#: help:product.supplierinfo,name:0
+msgid "Supplier of this product"
+msgstr "Proveedor de este producto."
+
+#. module: product
+#: help:product.pricelist.version,active:0
+msgid ""
+"When a version is duplicated it is set to non active, so that the dates do "
+"not overlaps with original version. You should change the dates and "
+"reactivate the pricelist"
+msgstr ""
+"Cuando se duplica una versión se cambia a no activa, de modo que las fechas "
+"no se superpongan con la versión original. Deberá cambiar las fechas y "
+"reactivar la tarifa."
+
+#. module: product
+#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
+msgid "KIT Shelf of 100cm"
+msgstr "KIT estante de 100cm"
+
+#. module: product
+#: field:product.supplierinfo,name:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: product
+#: model:product.template,name:product.product_product_sidepanel0_product_template
+msgid "Side Panel"
+msgstr "Panel lateral"
+
+#. module: product
+#: model:product.template,name:product.product_product_26_product_template
+msgid "Kit Keyboard + Mouse"
+msgstr "Kit Teclado + Ratón"
+
+#. module: product
+#: field:product.price.type,name:0
+msgid "Price Name"
+msgstr "Nombre precio"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu3_product_template
+msgid "Processor AMD Athlon XP 2200+"
+msgstr "Procesador AMD Athlon XP 2200+"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.action_product_price_list
+#: model:ir.model,name:product.model_product_price_list
+#: view:product.price_list:0
+#: report:product.pricelist:0
+#: field:product.pricelist.version,pricelist_id:0
+msgid "Price List"
+msgstr "Lista de precios"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Suppliers"
+msgstr "Proveedores"
+
+#. module: product
+#: view:product.product:0
+msgid "To Purchase"
+msgstr "A comprar"
+
+#. module: product
+#: help:product.supplierinfo,min_qty:0
+msgid ""
+"The minimal quantity to purchase to this supplier, expressed in the supplier "
+"Product UoM if not empty, in the default unit of measure of the product "
+"otherwise."
+msgstr ""
+"La cantidad mínima a comprar a este proveedor, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "New Price ="
+msgstr "Nuevo Precio ="
+
+#. module: product
+#: help:pricelist.partnerinfo,price:0
+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 ""
+"Este precio se considerará como el precio para la UdM del proveedor si "
+"existe o en la UdM por defecto del producto en caso contrario."
+
+#. module: product
+#: model:product.category,name:product.product_category_accessories
+msgid "Accessories"
+msgstr "Accesorios"
+
+#. module: product
+#: field:product.template,sale_delay:0
+msgid "Customer Lead Time"
+msgstr "Plazo de entrega del cliente"
+
+#. module: product
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Supplier of the product"
+msgstr "Proveedor del producto"
+
+#. module: product
+#: help:product.template,uos_id:0
+msgid ""
+"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 UOM."
+msgstr ""
+"Utilizado por las compañías que gestionan dos unidades de medida: "
+"facturación y gestión de inventario. Por ejemplo, en industrias "
+"alimentarias, puede gestionar un stock de unidades de jamón, pero facturar "
+"en Kg. Déjelo vacío para usar la UdM por defecto."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Min. Margin"
+msgstr "Margen mín."
+
+#. module: product
+#: field:product.category,child_id:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: product
+#: field:product.pricelist.version,date_end:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: product
+#: view:product.price_list:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: product
+#: view:product.product:0
+#: field:product.ul,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_main
+msgid "Pricelists"
+msgstr "Tarifas"
+
+#. module: product
+#: field:product.product,partner_ref:0
+msgid "Customer ref"
+msgstr "Ref. cliente"
+
+#. module: product
+#: view:product.product:0
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. module: product
+#: field:product.pricelist.type,key:0
+msgid "Key"
+msgstr "Clave"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rules Test Match"
+msgstr "Reglas test de concordancia"
+
+#. module: product
+#: help:product.pricelist.item,product_id:0
+msgid ""
+"Set a product if this rule only apply to one product. Keep empty for all "
+"products"
+msgstr ""
+"Indicar un producto si esta regla sólo se aplica a un producto. Dejarlo "
+"vacío para todos los productos"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr "Abastecimiento-Ubicación"
+
+#. module: product
+#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
+msgid "Kitchen Design Project"
+msgstr "Proyecto diseño cocina"
+
+#. module: product
+#: model:product.uom,name:product.uom_hour
+msgid "Hour"
+msgstr "Hora"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Development"
+msgstr "En desarrollo"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm1_product_template
+msgid "Shelf of 200cm"
+msgstr "Estante de 200cm"
+
+#. module: product
+#: view:product.uom:0
+msgid "Ratio & Precision"
+msgstr "Ratio y precisión"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_gram
+msgid "g"
+msgstr "g"
+
+#. module: product
+#: model:product.category,name:product.product_category_11
+msgid "IT components kits"
+msgstr "Kits de componentes TI"
+
+#. module: product
+#: selection:product.category,type:0
+#: selection:product.template,state:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: product
+#: model:process.node,name:product.process_node_supplier0
+#: view:product.supplierinfo:0
+msgid "Supplier Information"
+msgstr "Información del proveedor"
+
+#. module: product
+#: field:product.price.type,currency_id:0
+#: report:product.pricelist:0
+#: field:product.pricelist,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram_product_template
+msgid "DDR 256MB PC400"
+msgstr "DDR 256MB PC400"
+
+#. module: product
+#: view:product.category:0
+msgid "Product Categories"
+msgstr "Categorías de producto"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
+msgstr "  por ej.: 1 * (unidad referencia) = ratio * (esta unidad)"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_form_action
+msgid ""
+"Create and manage the units of measure you want to be used in your system. "
+"You can define a conversion rate between several Units of Measure within the "
+"same category."
+msgstr ""
+"Cree y gestione las unidades de medida que desea utilizar en su sistema. "
+"Puede definir una tipo de conversión entre diferentes unidades de medida en "
+"la misma categoría."
+
+#. module: product
+#: field:product.packaging,weight:0
+msgid "Total Package Weight"
+msgstr "Total peso paquete"
+
+#. module: product
+#: help:product.packaging,code:0
+msgid "The code of the transport unit."
+msgstr "El código de la unidad de transporte."
+
+#. module: product
+#: help:product.template,standard_price:0
+msgid ""
+"Product's cost for accounting stock valuation. It is the base price for the "
+"supplier price."
+msgstr ""
+"Coste del producto para la valoración contable de las existencias. Es el "
+"precio base para el precio del proveedor."
+
+#. module: product
+#: view:product.price.type:0
+msgid "Products Price Type"
+msgstr "Tipo de precios de productos"
+
+#. module: product
+#: field:product.product,price_extra:0
+msgid "Variant Price Extra"
+msgstr "Precio extra variante"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan_product_template
+msgid "Regular case fan 80mm"
+msgstr "Ventilador normal 80mm"
+
+#. module: product
+#: model:ir.model,name:product.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr "Información de un proveedor de producto"
+
+#. module: product
+#: view:product.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_purchase:0
+msgid "Purchase Description"
+msgstr "Descripción de compra"
+
+#. module: product
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#. module: product
+#: help:product.supplierinfo,delay:0
+msgid ""
+"Lead time in days between the confirmation of the purchase order and the "
+"reception of the products in your warehouse. Used by the scheduler for "
+"automatic computation of the purchase order planning."
+msgstr ""
+"Plazo de entrega en días entre la confirmación del pedido de compra y la "
+"recepción de los productos en su almacén. Utilizado por el planificador para "
+"el cálculo automático de la planificación del pedido de compra."
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action
+msgid ""
+"There can be more than one version of a pricelist. Here you can create and "
+"manage new versions of a price list. Some examples of versions: 2010, 2011, "
+"Summer Promotion, etc."
+msgstr ""
+"No puede haber más de una versión de una lista de precios. Aquí puede crear "
+"y administrar nuevas versiones de una lista de precios. Algunos ejemplos de "
+"versiones: 2010, 2011, promoción de verano, etc"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr "Almacenable"
+
+#. module: product
+#: field:product.packaging,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Seq"
+msgstr "Seq"
+
+#. module: product
+#: view:product.price_list:0
+msgid "Calculate Product Price per unit base 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
+msgid "Shipping Unit"
+msgstr "Unidad de envío"
+
+#. module: product
+#: field:pricelist.partnerinfo,suppinfo_id:0
+msgid "Partner Information"
+msgstr "Información de empresa"
+
+#. module: product
+#: selection:product.ul,type:0
+#: model:product.uom.categ,name:product.product_uom_categ_unit
+msgid "Unit"
+msgstr "Unidad"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Information"
+msgstr "Información"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Products Listprices Items"
+msgstr "Elementos de las tarifas de productos"
+
+#. module: product
+#: view:product.packaging:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. module: product
+#: field:product.pricelist.version,items_id:0
+msgid "Price List Items"
+msgstr "Elementos de la tarifa"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
+msgid ""
+"Create and manage the units of measure categories you want to be used in "
+"your system. If several units of measure are in the same category, they can "
+"be converted to each other. For example, in the unit of measure category "
+"\"Time\", you will have the following UoM: Hours, Days."
+msgstr ""
+"Cree y gestione las categorías de unidades de medida que quiera utilizar en "
+"su sistema. SI varias unidades de medida están en la misma categoría, pueden "
+"ser convertidas entre ellas. Por ejemplo, en al unidad de medida \"Tiempo\", "
+"tendrá las sigueinte UdM: horas, días."
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Bigger than the reference UoM"
+msgstr "Mayor que la UdM de referencia"
+
+#. module: product
+#: model:ir.module.module,shortdesc:product.module_meta_information
+msgid "Products & Pricelists"
+msgstr "Productos y tarifas"
+
+#. module: product
+#: view:product.product:0
+msgid "To Sell"
+msgstr "A vender"
+
+#. module: product
+#: model:product.category,name:product.product_category_services0
+msgid "Marketable Services"
+msgstr "Servicios negociables"
+
+#. module: product
+#: field:product.pricelist.item,price_surcharge:0
+msgid "Price Surcharge"
+msgstr "Recargo precio"
+
+#. module: product
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
+msgstr "Placa madre ASUStek A7N8X"
+
+#. module: product
+#: field:product.product,packaging:0
+msgid "Logistical Units"
+msgstr "Unidades de logística"
+
+#. module: product
+#: field:product.category,complete_name:0
+#: field:product.category,name:0
+#: field:product.pricelist.type,name:0
+#: field:product.pricelist.version,name:0
+#: view:product.product:0
+#: field:product.product,name_template:0
+#: field:product.template,name:0
+#: field:product.ul,name:0
+#: field:product.uom,name:0
+#: field:product.uom.categ,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: product
+#: view:product.product:0
+msgid "Stockable"
+msgstr "Estocable"
+
+#. module: product
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
+msgstr "Dintel madera 4m"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.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 ""
+"Debe definir un producto por cada cosa 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 logística de abastecimiento, precio de venta, categoría de "
+"producto, proveedores, etc."
+
+#. module: product
+#: model:product.uom,name:product.product_uom_kgm
+msgid "kg"
+msgstr "kg"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_meter
+msgid "m"
+msgstr "m"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "Obsolete"
+msgstr "Obsoleto"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_km
+msgid "km"
+msgstr "km"
+
+#. module: product
+#: help:product.template,cost_method:0
+msgid ""
+"Standard Price: the cost price is fixed and recomputed periodically (usually "
+"at the end of the year), Average Price: the cost price is recomputed at each "
+"reception of products."
+msgstr ""
+"Precio estándar: El precio de coste es fijo y se recalcula periódicamente "
+"(normalmente al finalizar el año), Precio medio: El precio de coste se "
+"recalcula en cada recepción de productos."
+
+#. module: product
+#: help:product.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de categorías de "
+"producto."
+
+#. module: product
+#: field:product.uom,factor:0
+#: field:product.uom,factor_inv:0
+msgid "Ratio"
+msgstr "Ratio"
+
+#. module: product
+#: help:product.template,purchase_ok:0
+msgid ""
+"Determine if the product is visible in the list of products within a "
+"selection from a purchase order line."
+msgstr ""
+"Indica si el producto es visible en la lista de productos que aparece al "
+"seleccionar un producto en una línea de pedido de compra."
+
+#. module: product
+#: field:product.template,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
+
+#. module: product
+#: field:product.packaging,width:0
+msgid "Width"
+msgstr "Ancho"
+
+#. module: product
+#: help:product.price.type,field:0
+msgid "Associated field in the product form."
+msgstr "Campo asociado en el formulario de producto."
+
+#. module: product
+#: view:product.product:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: product
+#: field:product.template,procure_method:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Printing Date"
+msgstr "Fecha impresión"
+
+#. module: product
+#: field:product.template,uos_id:0
+msgid "Unit of Sale"
+msgstr "Unidad de venta"
+
+#. module: product
+#: model:ir.module.module,description:product.module_meta_information
+msgid ""
+"\n"
+"    This is the base module for managing products and pricelists in "
+"OpenERP.\n"
+"\n"
+"    Products support variants, different pricing methods, suppliers\n"
+"    information, make to stock/order, different unit of measures,\n"
+"    packaging and properties.\n"
+"\n"
+"    Pricelists support:\n"
+"    * Multiple-level of discount (by product, category, quantities)\n"
+"    * Compute price based on different criteria:\n"
+"        * Other pricelist,\n"
+"        * Cost price,\n"
+"        * List price,\n"
+"        * Supplier price, ...\n"
+"    Pricelists preferences by product and/or partners.\n"
+"\n"
+"    Print product labels with barcode.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar productos y tarifas en OpenERP.\n"
+"\n"
+"    Los productos soportan variantes, distintos métodos de precios, "
+"información\n"
+"    de proveedor, obtener para stock/pedido, distintas unidades de medida,\n"
+"    empaquetado y propiedades.\n"
+"\n"
+"    Soporte de tarifas:\n"
+"    * Múltiple-nivel de descuento (por producto, categoría, cantidades)\n"
+"    * Cálculo del precio basado en distintos criterios:\n"
+"        * Otra tarifa,\n"
+"        * Precio coste,\n"
+"        * Precio lista,\n"
+"        * Precio proveedor, ...\n"
+"    Preferencias de tarifas por producto y/o empresas.\n"
+"\n"
+"    Imprimir etiquetas de productos con códigos de barras.\n"
+"    "
+
+#. module: product
+#: help:product.template,seller_delay:0
+msgid ""
+"This is the average delay in days between the purchase order confirmation "
+"and the reception of goods for this product and for the default supplier. It "
+"is used by the scheduler to order requests based on reordering delays."
+msgstr ""
+"Éste es el plazo promedio en días entre la confirmación del pedido de compra "
+"y la recepción de la mercancía para este producto y para el proveedor por "
+"defecto. El planificador lo utiliza para generar solicitudes basado en los "
+"plazos de los pedidos."
+
+#. module: product
+#: help:product.template,seller_id:0
+msgid "Main Supplier who has highest priority in Supplier List."
+msgstr ""
+"Proveedor principal que tenga la prioridad más alta en la lista de "
+"proveedores."
+
+#. module: product
+#: model:product.category,name:product.product_category_services
+#: view:product.product:0
+msgid "Services"
+msgstr "Servicios"
+
+#. module: product
+#: field:product.pricelist.item,base_pricelist_id:0
+msgid "If Other Pricelist"
+msgstr "Lista Precios Base"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_normal_action
+#: model:ir.actions.act_window,name:product.product_normal_action_puchased
+#: model:ir.actions.act_window,name:product.product_normal_action_tree
+#: model:ir.ui.menu,name:product.menu_products
+#: view:product.product:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: product
+#: help:product.packaging,rows:0
+msgid "The number of layers on a pallet or box"
+msgstr "El número de capas en un palet o caja."
+
+#. module: product
+#: help:product.pricelist.item,base:0
+msgid "The mode for computing the price for this rule."
+msgstr "El modo de calcular el precio para esta regla."
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Pallet Dimension"
+msgstr "Dimensión del palet"
+
+#. module: product
+#: code:addons/product/product.py:618
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: product
+#: field:product.template,seller_ids:0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: product
+#: help:product.template,sale_delay:0
+msgid ""
+"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."
+msgstr ""
+"Esta es la demora media en días entre la confirmación del pedido del cliente "
+"y la entrega de los productos acabados. Es el tiempo que prometen a sus "
+"clientes."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Second UoM"
+msgstr "UdM secundaria"
+
+#. module: product
+#: code:addons/product/product.py:142
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_form_action
+#: model:ir.ui.menu,name:product.next_id_16
+#: view:product.uom:0
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+#. module: product
+#: field:product.supplierinfo,min_qty:0
+msgid "Minimal Quantity"
+msgstr "Cantidad mínima"
+
+#. module: product
+#: model:product.category,name:product.product_category_pc
+msgid "PC"
+msgstr "PC"
+
+#. module: product
+#: help:product.supplierinfo,product_code:0
+msgid ""
+"This supplier's product code will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
+msgstr ""
+"Este código de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el código interno."
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr "Obtener para stock"
+
+#. module: product
+#: field:product.pricelist.item,price_version_id:0
+msgid "Price List Version"
+msgstr "Versión de tarifa"
+
+#. module: product
+#: help:product.pricelist.item,sequence:0
+msgid ""
+"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."
+msgstr ""
+"Indica el orden en que los elementos de la tarifa serán comprobados. En la "
+"evaluación se da máxima prioridad a la secuencia más baja y se detiene tan "
+"pronto como se encuentra un elemento coincidente."
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Consumable"
+msgstr "Consumible"
+
+#. module: product
+#: help:product.price.type,currency_id:0
+msgid "The currency the field is expressed in."
+msgstr "La moneda en que se expresa el campo."
+
+#. module: product
+#: help:product.template,weight:0
+msgid "The gross weight in Kg."
+msgstr "El peso bruto en Kg."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: product
+#: field:product.uom,category_id:0
+msgid "UoM Category"
+msgstr "Categoría UdM"
+
+#. module: product
+#: field:product.template,loc_rack:0
+msgid "Rack"
+msgstr "Estante"
+
+#. module: product
+#: field:product.template,uom_po_id:0
+msgid "Purchase Unit of Measure"
+msgstr "Unidad de medida compra"
+
+#. module: product
+#: field:product.template,supply_method:0
+msgid "Supply method"
+msgstr "Método suministro"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_category_action
+msgid ""
+"Here is a list of all your products classified by category. You can click a "
+"category to get the list of all products linked to this category or to a "
+"child of this category."
+msgstr ""
+"Aquí se muestra una lista de todos los productos clasificados por "
+"categorías. Puede hacer clic en una categoría para obtener la lista de todos "
+"los productos vinculados con esta categoría o con una categoría hija."
+
+#. module: product
+#: view:product.product:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu_gen_product_template
+msgid "Regular processor config"
+msgstr "Config. procesador normal"
+
+#. module: product
+#: code:addons/product/product.py:142
+#, python-format
+msgid ""
+"Conversion from Product UoM m to Default UoM PCE is not possible as they "
+"both belong to different Category!."
+msgstr ""
+"¡La conversión de la UdM m a la UdM PCE no es posible ya que ambas "
+"pertenecen a categorías diferentes!"
+
+#. module: product
+#: field:product.pricelist.version,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: product
+#: help:product.template,produce_delay:0
+msgid ""
+"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."
+msgstr ""
+"Demora media en días para producir este producto. Esto es sólo para la orden "
+"de fabricación y, si se trata de un lista de material multi-nivel, es sólo "
+"para el nivel de este producto. Diferentes tiempos de demora se suman para "
+"todos los niveles y pedidos de compra."
+
+#. module: product
+#: help:product.product,qty_available:0
+msgid ""
+"Current quantities of products in selected locations or all internal if none "
+"have been selected."
+msgstr ""
+"Cantidades actuales de productos en las ubicaciones seleccionadas o todas "
+"las internas si no se ha seleccionado ninguna."
+
+#. module: product
+#: model:product.template,name:product.product_product_pc1_product_template
+msgid "Basic PC"
+msgstr "PC Básico"
+
+#. module: product
+#: help:product.pricelist,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the pricelist "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
+
+#. module: product
+#: field:product.product,qty_available:0
+msgid "Real Stock"
+msgstr "Stock real"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_cm
+msgid "cm"
+msgstr "cm"
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom
+msgid "Product Unit of Measure"
+msgstr "Unidad de medida del producto"
+
+#. module: product
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+"categoría."
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Precisión de redondeo"
+
+#. module: product
+#: view:product.uom:0
+msgid "Unit of Measure Properties"
+msgstr "Propiedades unidad de medida"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelf1_product_template
+msgid "Rack 200cm"
+msgstr "Estantería 200cm"
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Buy"
+msgstr "Comprar"
+
+#. module: product
+#: view:product.uom.categ:0
+msgid "Units of Measure categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: product
+#: help:product.packaging,weight_ul:0
+msgid "The weight of the empty UL"
+msgstr "El peso de la unidad logística vacía."
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Smaller than the reference UoM"
+msgstr "Menor que la UdM de referencia"
+
+#. module: product
+#: field:product.price.type,active:0
+#: field:product.pricelist,active:0
+#: field:product.pricelist.version,active:0
+#: field:product.product,active:0
+#: field:product.uom,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: product
+#: field:product.product,price_margin:0
+msgid "Variant Price Margin"
+msgstr "Margen de precio variante"
+
+#. module: product
+#: sql_constraint:product.uom:0
+msgid "The conversion ratio for a unit of measure cannot be 0!"
+msgstr "¡El ratio de conversión para una unidad de medida no puede ser 0!"
+
+#. module: product
+#: help:product.packaging,ean:0
+msgid "The EAN code of the package unit."
+msgstr "El código EAN de la unidad del paquete."
+
+#. module: product
+#: field:product.packaging,weight_ul:0
+msgid "Empty Package Weight"
+msgstr "Peso paquete vacío"
+
+#. module: product
+#: field:product.price.type,field:0
+msgid "Product Field"
+msgstr "Campo de producto"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_type_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
+msgid "Pricelists Types"
+msgstr "Tipos de tarifas"
+
+#. module: product
+#: help:product.uom,factor:0
+msgid ""
+"How many times this UoM is smaller than the reference UoM in this category:\n"
+"1 * (reference unit) = ratio * (this unit)"
+msgstr ""
+"Cuantas veces esta UdM es más pequeña que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (unidad de referencia) = ratio * (esta unidad)"
+
+#. module: product
+#: help:product.template,uom_id:0
+msgid "Default Unit of Measure used for all stock operation."
+msgstr ""
+"Unidad de medida por defecto utilizada para todas las operaciones de stock."
+
+#. module: product
+#: model:product.category,name:product.product_category_misc0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc4_product_template
+msgid "Customizable PC"
+msgstr "PC personalizable"
+
+#. module: product
+#: field:pricelist.partnerinfo,price:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: product
+#: model:product.category,name:product.product_category_7
+#: model:product.template,name:product.product_product_1_product_template
+msgid "Onsite Intervention"
+msgstr "Intervención en el mismo lugar"
+
+#. module: product
+#: model:product.pricelist,name:product.list0
+msgid "Public Pricelist"
+msgstr "Tarifa pública"
+
+#. module: product
+#: model:product.category,name:product.product_category_marketableproduct0
+msgid "Marketable Products"
+msgstr "Productos negociables"
+
+#. module: product
+#: field:product.supplierinfo,product_code:0
+msgid "Supplier Product Code"
+msgstr "Código producto proveedor"
+
+#. module: product
+#: view:product.product:0
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pallet"
+msgstr "Palet"
+
+#. module: product
+#: field:product.packaging,ul_qty:0
+msgid "Package by layer"
+msgstr "Paquetes por piso"
+
+#. module: product
+#: field:product.template,warranty:0
+msgid "Warranty (months)"
+msgstr "Garantía (meses)"
+
+#. module: product
+#: help:product.pricelist.item,categ_id:0
+msgid ""
+"Set a category of product if this rule only apply to products of a category "
+"and his children. Keep empty for all products"
+msgstr ""
+"Establecer una categoría de producto si esta regla sólo se aplicará a los "
+"productos de una categoría y sus hijos. Dejar vacío para todos los productos"
+
+#. module: product
+#: model:ir.model,name:product.model_product_product
+#: model:ir.ui.menu,name:product.prod_config_main
+#: model:process.node,name:product.process_node_product0
+#: model:process.process,name:product.process_process_productprocess0
+#: field:product.packaging,product_id:0
+#: field:product.pricelist.item,product_id:0
+#: view:product.product:0
+#: field:product.supplierinfo,product_id:0
+#: model:res.request.link,name:product.req_link_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by pallet or box."
+msgstr "El número total de productos que puede poner por palet o caja."
+
+#. module: product
+#: field:product.product,variants:0
+msgid "Variants"
+msgstr "Variantes"
+
+#. 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 "Productos por categoría"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action_form
+#: model:ir.ui.menu,name:product.menu_product_category_action_form
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: product
+#: field:product.template,uos_coeff:0
+msgid "UOM -> UOS Coeff"
+msgstr "Coef. UdM -> UdV"
+
+#. module: product
+#: help:product.supplierinfo,sequence:0
+msgid "Assigns the priority to the list of product supplier."
+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 "Unidad de medida por defecto"
+
+#. module: product
+#: model:product.template,name:product.product_product_tow1_product_template
+msgid "ATX Mid-size Tower"
+msgstr "Torre de tamaño medio ATX"
+
+#. module: product
+#: field:product.packaging,ean:0
+msgid "EAN"
+msgstr "EAN"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rounding Method"
+msgstr "Método redondeo"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_label
+msgid "Products Labels"
+msgstr "Etiquetas de productos"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_big_box
+msgid "Box 30x40x60"
+msgstr "Caja 30x40x60"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: product
+#: help:product.packaging,height:0
+msgid "The height of the package"
+msgstr "La altura del paquete."
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price List"
+msgstr "Tarifa de productos"
+
+#. module: product
+#: field:product.pricelist,company_id:0
+#: field:product.pricelist.item,company_id:0
+#: field:product.pricelist.version,company_id:0
+#: field:product.supplierinfo,company_id:0
+#: field:product.template,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_price_type_action
+msgid "Prices Types"
+msgstr "Tipos de precios"
+
+#. module: product
+#: help:product.template,list_price:0
+msgid ""
+"Base price for computing the customer price. Sometimes called the catalog "
+"price."
+msgstr ""
+"Precio base para calcular el precio de cliente. También llamado el precio de "
+"catálogo."
+
+#. module: product
+#: code:addons/product/pricelist.py:518
+#, python-format
+msgid "Partner section of the product form"
+msgstr "Sección empresa del formulario de producto"
+
+#. module: product
+#: help:product.price.type,name:0
+msgid "Name of this kind of price."
+msgstr "Nombre de este tipo de precio."
+
+#. module: product
+#: field:product.supplierinfo,product_uom:0
+msgid "Supplier UoM"
+msgstr "UdM proveedor"
+
+#. module: product
+#: help:product.pricelist.version,date_start:0
+msgid "Starting date for this pricelist version to be valid."
+msgstr "Fecha inicial de validez para esta versión de tarifa."
+
+#. module: product
+#: help:product.template,uom_po_id:0
+msgid ""
+"Default Unit of Measure used for purchase orders. It must be in the same "
+"category than the default unit of measure."
+msgstr ""
+"Unidad de medida por defecto utilizada para los pedidos de compra. Debe "
+"estar en la misma categoría que la unidad de medida por defecto."
+
+#. module: product
+#: model:product.template,description:product.product_product_cpu1_product_template
+msgid "This product is configured with example of push/pull flows"
+msgstr ""
+"Este producto está configurado con ejemplo de flujos empujar/estirar."
+
+#. module: product
+#: field:product.packaging,length:0
+msgid "Length"
+msgstr "Longitud"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_length
+msgid "Length / Distance"
+msgstr "Longitud / Distancia"
+
+#. module: product
+#: model:product.template,name:product.product_product_0_product_template
+msgid "Onsite Senior Intervention"
+msgstr "Intervención en el mismo lugar consultor senior"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_type
+#: field:product.pricelist,type:0
+#: view:product.pricelist.type:0
+msgid "Pricelist Type"
+msgstr "Tipo de tarifa"
+
+#. module: product
+#: model:product.category,name:product.product_category_otherproducts0
+msgid "Other Products"
+msgstr "Otros productos"
+
+#. module: product
+#: view:product.product:0
+msgid "Characteristics"
+msgstr "Características"
+
+#. module: product
+#: field:product.template,sale_ok:0
+msgid "Can be Sold"
+msgstr "Puede ser vendido"
+
+#. module: product
+#: field:product.template,produce_delay:0
+msgid "Manufacturing Lead Time"
+msgstr "Plazo de entrega de fabricación"
+
+#. module: product
+#: field:product.supplierinfo,pricelist_ids:0
+msgid "Supplier Pricelist"
+msgstr "Tarifa de proveedor"
+
+#. module: product
+#: field:product.pricelist.item,base:0
+msgid "Based on"
+msgstr "Basado en"
+
+#. module: product
+#: model:product.category,name:product.product_category_rawmaterial0
+msgid "Raw Materials"
+msgstr "Materias primas"
+
+#. module: product
+#: help:product.product,virtual_available:0
+msgid ""
+"Future stock for this product according to the selected locations or all "
+"internal if none have been selected. Computed as: Real Stock - Outgoing + "
+"Incoming."
+msgstr ""
+"Stock futuro de este producto conforme a las ubicaciones seleccionadas o "
+"todas las internas, si ninguna de ellas ha sido seleccionada. Calculo como: "
+"Stock real - Saliente + Entrante."
+
+#. module: product
+#: field:product.pricelist,name:0
+msgid "Pricelist Name"
+msgstr "Nombre tarifa"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_version
+#: view:product.pricelist:0
+#: view:product.pricelist.version:0
+msgid "Pricelist Version"
+msgstr "Versión tarifa"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "* ( 1 + "
+msgstr "* ( 1 + "
+
+#. module: product
+#: help:product.packaging,weight:0
+msgid "The weight of a full package, pallet or box."
+msgstr "El peso de un paquete, palet o caja completo/a."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd2_product_template
+msgid "HDD Seagate 7200.8 120GB"
+msgstr "HDD Seagate 7200.8 120GB"
+
+#. module: product
+#: model:product.template,name:product.product_product_employee0_product_template
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm0_product_template
+msgid "Shelf of 100cm"
+msgstr "Estante de 100cm"
+
+#. module: product
+#: model:ir.model,name:product.model_product_category
+#: field:product.pricelist.item,categ_id:0
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Price List Name"
+msgstr "Nombre tarifa"
+
+#. module: product
+#: field:product.supplierinfo,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo de entrega"
+
+#. module: product
+#: help:product.uom,active:0
+msgid ""
+"By unchecking the active field you can disable a unit of measure without "
+"deleting it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar una unidad de medida sin "
+"eliminarla."
+
+#. module: product
+#: field:product.template,seller_delay:0
+msgid "Supplier Lead Time"
+msgstr "Plazo de entrega del proveedor"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Box"
+msgstr "Caja"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_ul_form_action
+msgid ""
+"Create and manage your packaging dimensions and types you want to be "
+"maintained in your system."
+msgstr ""
+"Cree y gestione las unidades y tipos de embalaje que quiera utilizar en su "
+"sistema."
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm1_product_template
+msgid "Rear Panel SHE200"
+msgstr "Panel posterior SHE200"
+
+#. module: product
+#: help:product.pricelist.type,key:0
+msgid ""
+"Used in the code to select specific prices based on the context. Keep "
+"unchanged."
+msgstr ""
+"Utilizado en el código para seleccionar precios específicos basados en el "
+"contexto. Dejarlo tal como está."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd1_product_template
+msgid "HDD Seagate 7200.8 80GB"
+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 "Esta es una cantidad que será convertida en UdM por defecto."
+
+#. module: product
+#: field:product.packaging,ul:0
+msgid "Type of Package"
+msgstr "Tipo de empaquetado"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pack"
+msgstr "Paquete"
+
+#. module: product
+#: model:product.category,name:product.product_category_4
+msgid "Dello Computer"
+msgstr "Ordenador Dello"
+
+#. module: product
+#: model:product.uom.categ,name:product.product_uom_categ_kgm
+msgid "Weight"
+msgstr "Peso"
+
+#. module: product
+#: model:product.template,name:product.product_product_22_product_template
+msgid "Processor on demand"
+msgstr "Procesador bajo pedido"
+
+#. module: product
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Mouse"
+msgstr "Ratón"
+
+#. module: product
+#: field:product.uom,uom_type:0
+msgid "UoM Type"
+msgstr "Tipo UdM"
+
+#. module: product
+#: help:product.template,product_manager:0
+msgid "This is use as task responsible"
+msgstr "Se utiliza como responsable de tarea."
+
+#. module: product
+#: help:product.uom,rounding:0
+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 ""
+"La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para una "
+"Unidad de Medida que no pueda dividirse aún más, como una pieza."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Descriptions"
+msgstr "Descripciones"
+
+#. module: product
+#: field:product.template,loc_row:0
+msgid "Row"
+msgstr "Fila"
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm0_product_template
+msgid "Rear Panel SHE100"
+msgstr "Panel posterior SHE100"
+
+#. module: product
+#: model:product.template,name:product.product_product_23_product_template
+msgid "Complete PC With Peripherals"
+msgstr "PC completo con periféricos"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Weigths"
+msgstr "Pesos"
+
+#. module: product
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: product
+#: model:product.template,name:product.product_product_hotelexpenses0_product_template
+msgid "Hotel Expenses"
+msgstr "Gastos hotel"
+
+#. module: product
+#: help:product.uom,factor_inv:0
+msgid ""
+"How many times this UoM is bigger than the reference UoM in this category:\n"
+"1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+"Cuantas veces esta UdM es más grande que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (esta unidad) = ratio * (unidad de referencia)"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelf0_product_template
+msgid "Rack 100cm"
+msgstr "Estantería 100cm"
+
+#. module: product
+#: help:product.packaging,sequence:0
+msgid "Gives the sequence order when displaying a list of packaging."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de paquetes."
+
+#. module: product
+#: field:product.pricelist.item,price_round:0
+msgid "Price Rounding"
+msgstr "Redondeo precio"
+
+#. module: product
+#: field:product.pricelist.item,price_max_margin:0
+msgid "Max. Price Margin"
+msgstr "Máx. margen de precio"
+
+#. module: product
+#: help:product.supplierinfo,product_name:0
+msgid ""
+"This supplier's product name will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
+msgstr ""
+"Este nombre de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el nombre interno."
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: product
+#: field:product.template,rental:0
+msgid "Can be Rent"
+msgstr "Puede ser alquilado"
+
+#. module: product
+#: model:product.price.type,name:product.standard_price
+#: field:product.template,standard_price:0
+msgid "Cost Price"
+msgstr "Precio de coste"
+
+#. module: product
+#: field:product.pricelist.item,price_min_margin:0
+msgid "Min. Price Margin"
+msgstr "Mín. margen de precio"
+
+#. module: product
+#: field:product.template,weight:0
+msgid "Gross weight"
+msgstr "Peso bruto"
+
+#. module: product
+#: model:product.template,name:product.product_product_assemblysection0_product_template
+msgid "Assembly Section"
+msgstr "Sección montaje"
+
+#. module: product
+#: model:product.category,name:product.product_category_3
+msgid "Computer Stuff"
+msgstr "Complementos de ordenador"
+
+#. module: product
+#: model:product.category,name:product.product_category_8
+msgid "Phone Help"
+msgstr "Ayuda telefónica"
+
+#. module: product
+#: help:product.pricelist.item,price_round:0
+msgid ""
+"Sets the price so that it is a multiple of this value.\n"
+"Rounding is applied after the discount and before the surcharge.\n"
+"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgstr ""
+"Calcula el precio de modo que sea un múltiplo de este valor.\n"
+"El redondeo se aplica después del descuento y antes del incremento.\n"
+"Para que los precios terminen en 9,99, redondeo 10, incremento -0,01."
+
+#. module: product
+#: view:product.price_list:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr "Elemento de la tarifa"
+
+#. module: product
+#: model:product.template,name:product.product_product_21_product_template
+msgid "RAM on demand"
+msgstr "RAM bajo pedido"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales Properties"
+msgstr "Propiedades de venta"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_ton
+msgid "tonne"
+msgstr "tonelada"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Delays"
+msgstr "Plazos"
+
+#. module: product
+#: model:process.node,note:product.process_node_product0
+msgid "Creation of the product"
+msgstr "Creación del producto"
+
+#. module: product
+#: help:product.template,type:0
+msgid ""
+"Will change the way procurements are processed. Consumables are stockable "
+"products with infinite stock, or for use when you have no inventory "
+"management in the system."
+msgstr ""
+"Cambiará la forma en que las compras son procesadas. Los Consumibles son "
+"productos almacenables y con infinita capacidad de almacenamiento, o para "
+"usarse cuando no hay administración de inventarios en el sistema."
+
+#. module: product
+#: field:pricelist.partnerinfo,name:0
+#: field:product.packaging,name:0
+#: report:product.pricelist:0
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: product
+#: code:addons/product/pricelist.py:361
+#, python-format
+msgid ""
+"Could not resolve product category, you have defined cyclic categories of "
+"products!"
+msgstr ""
+"¡No se pudo resolver la categoría del producto, ha definido categorías de "
+"producto cíclicas!"
+
+#. module: product
+#: view:product.template:0
+msgid "Product Description"
+msgstr "Descripción del producto"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid " ) + "
+msgstr " ) + "
+
+#. module: product
+#: help:product.product,incoming_qty:0
+msgid ""
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Cantidades de productos que está previsto que lleguen en las ubicaciones "
+"seleccionadas o en todas las ubicaciones internas si ninguna ha sido "
+"seleccionada."
+
+#. module: product
+#: field:product.template,volume:0
+msgid "Volume"
+msgstr "Volumen"
+
+#. module: product
+#: field:product.template,loc_case:0
+msgid "Case"
+msgstr "Caja"
+
+#. module: product
+#: view:product.product:0
+msgid "Product Variant"
+msgstr "Variantes de producto"
+
+#. module: product
+#: model:product.category,name:product.product_category_shelves0
+msgid "Shelves"
+msgstr "Estantes"
+
+#. module: product
+#: code:addons/product/pricelist.py:517
+#, python-format
+msgid "Other Pricelist"
+msgstr "Otra tarifa"
+
+#. module: product
+#: model:ir.model,name:product.model_product_template
+#: field:product.pricelist.item,product_tmpl_id:0
+#: field:product.product,product_tmpl_id:0
+#: view:product.template:0
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: product
+#: field:product.template,cost_method:0
+msgid "Costing Method"
+msgstr "Método de coste"
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Palletization"
+msgstr "Paletización"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "End of Lifecycle"
+msgstr "Fin del ciclo de vida"
+
+#. module: product
+#: help:product.product,packaging:0
+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 ""
+"Indica las diferentes formas de empaquetar el mismo producto. Esto no tiene "
+"ningún impacto en la preparación de albaranes y se utiliza principalmente si "
+"utiliza el módulo EDI."
+
+#. 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 "Versiones de tarifa"
+
+#. module: product
+#: field:product.category,sequence:0
+#: field:product.packaging,sequence:0
+#: field:product.pricelist.item,sequence:0
+#: field:product.supplierinfo,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: product
+#: field:product.template,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
+
+#. module: product
+#: field:product.category,type:0
+msgid "Category Type"
+msgstr "Tipo categoría"
+
+#. module: product
+#: model:product.category,name:product.cat2
+msgid "Private"
+msgstr "Privado"
+
+#. module: product
+#: help:product.template,uos_coeff:0
+msgid ""
+"Coefficient to convert UOM to UOS\n"
+" uos = uom * coeff"
+msgstr ""
+"Coeficiente para convertir UdM a UdV\n"
+" UdV = UdM * coef"
+
+#. module: product
+#: help:product.template,volume:0
+msgid "The volume in m3."
+msgstr "El volumen en m3."
+
+#. module: product
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
+msgstr "Descuento precio"
+
+#~ msgid ""
+#~ "The minimal quantity to purchase for this supplier, expressed in the default "
+#~ "unit of measure."
+#~ msgstr ""
+#~ "La cantidad mínima a comprar a este proveedor, expresada en la unidad de "
+#~ "medida por defecto."
+
+#~ msgid ""
+#~ "Futur stock for this product according to the selected location or all "
+#~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
+#~ "Incoming."
+#~ msgstr ""
+#~ "Stock futuro para este producto según la ubicación seleccionada o todas las "
+#~ "internas si no se ha seleccionado ninguna. Calculado como: Stock real - "
+#~ "Saliente + Entrante."
+
+#~ msgid "Procure Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Product Process"
+#~ msgstr "Proceso producto"
+
+#~ msgid "Customer Price"
+#~ msgstr "Precio cliente"
+
+#~ msgid "List Price"
+#~ msgstr "Precio lista"
+
+#~ msgid "The number of layer on a palet or box"
+#~ msgstr "El número de piso en un palet o caja"
+
+#~ msgid "Prices Computations"
+#~ msgstr "Cálculos de precios"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Number of Layer"
+#~ msgstr "Número de piso"
+
+#~ msgid "Default UoM"
+#~ msgstr "UdM por defecto"
+
+#~ msgid "Create new Product"
+#~ msgstr "Crear nuevo producto"
+
+#~ msgid "In Production"
+#~ msgstr "En producción"
+
+#~ msgid "Priority"
+#~ msgstr "Prioridad"
+
+#~ msgid "Factor"
+#~ msgstr "Factor"
+
+#~ msgid "Supplier Info"
+#~ msgstr "Info. proveedor"
+
+#~ msgid "Partner Product Name"
+#~ msgstr "Nombre producto proveedor"
+
+#~ msgid ""
+#~ "This pricelist will be used, instead of the default one,                     "
+#~ "for sales to the current partner"
+#~ msgstr ""
+#~ "Esta tarifa será usada en lugar de la tarifa por defecto para las ventas a "
+#~ "la empresa actual."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "Determine if the product can be visible in the list of product within a "
+#~ "selection from a sale order line."
+#~ msgstr ""
+#~ "Indica si el producto es visible en la lista de productos dentro de una "
+#~ "selección desde una línea de un pedido de venta."
+
+#~ 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 ""
+#~ "Name of the product for this partner, will be used when printing a request "
+#~ "for quotation. Keep empty to use the internal one."
+#~ msgstr ""
+#~ "Nombre del producto para esta empresa, se utilizará al imprimir una petición "
+#~ "de presupuesto. Dejarlo vacío para utilizar el nombre interno."
+
+#~ msgid "Can be sold"
+#~ msgstr "Puede ser vendido"
+
+#~ msgid "Rate"
+#~ msgstr "Tasa"
+
+#~ msgid ""
+#~ "Used by companies that manages two unit of measure: invoicing and stock "
+#~ "management. For example, in food industries, you will manage a stock of ham "
+#~ "but invoice in Kg. Keep empty to use the default UOM."
+#~ msgstr ""
+#~ "Utilizado por las compañías que utilizan dos unidades de medida: facturación "
+#~ "y gestión de stocks. Por ejemplo, en industrias de alimentación, podría "
+#~ "gestionar un stock de unidades de jamón pero realizar la facturación en Kg. "
+#~ "Dejarlo vacío para utilizar la UdM por defecto."
+
+#~ msgid "Purchase UoM"
+#~ msgstr "UdM de compra"
+
+#~ msgid "Price list"
+#~ msgstr "Tarifa"
+
+#~ msgid ""
+#~ "Gives the different ways to package the same product. This has no impact on "
+#~ "the packing order and is mainly used if you use the EDI module."
+#~ msgstr ""
+#~ "Indica diferente maneras de empaquetar el mismo producto. No influye en el "
+#~ "albarán y es utilizado si se usa el módulo EDI."
+
+#~ msgid "Partner Product Code"
+#~ msgstr "Código producto proveedor"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "The total number of products you can put by palet or box."
+#~ msgstr "El número total de productos que puede poner por palet o caja."
+
+#~ 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 ""
+#~ "Code of the product for this partner, will be used when printing a request "
+#~ "for quotation. Keep empty to use the internal one."
+#~ msgstr ""
+#~ "Código del producto para esta empresa, se utilizará al imprimir una "
+#~ "petición de presupuesto. Dejarlo vacío para utilizar el código interno."
+
+#~ msgid "Product suppliers, with their product name, price, etc."
+#~ msgstr "Proveedores del producto, con su nombre de producto, precio, etc."
+
+#~ msgid "Price type"
+#~ msgstr "Tipo de precio"
+
+#~ msgid ""
+#~ "Coefficient to convert UOM to UOS\n"
+#~ " uom = uos * coeff"
+#~ msgstr ""
+#~ "Coeficiente para convertir UdM a UdV\n"
+#~ " udm = udv * coef"
+
+#~ msgid "Prices & Suppliers"
+#~ msgstr "Precios & Proveedores"
+
+#~ msgid "The weight of a full of products palet or box."
+#~ msgstr "El peso de un palet o caja llena de productos."
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Plazo de entrega"
+
+#~ msgid ""
+#~ "Average time to produce this product. This is only for the production order "
+#~ "and, if it is a multi-level bill of material, it's only for the level of "
+#~ "this product. Different delays will be summed for all levels and purchase "
+#~ "orders."
+#~ msgstr ""
+#~ "Tiempo promedio para producir este producto. Sólo se utiliza para la orden "
+#~ "de producción y, si es contiene una lista de materiales multi-nivel, sólo "
+#~ "para el nivel de este producto. Diferentes plazos serán sumados para todos "
+#~ "los niveles y pedidos de compra."
+
+#~ msgid ""
+#~ "Delay in days between the confirmation of the purchase order and the "
+#~ "reception of the products in your warehouse. Used by the scheduler for "
+#~ "automatic computation of the purchase order planning."
+#~ msgstr ""
+#~ "Plazo en días entre la confirmación de la orden de compra y la recepción de "
+#~ "los productos en su almacén. Utilizado por el planificador para el cálculo "
+#~ "automático de la orden de compra."
+
+#~ msgid ""
+#~ "Default Unit of Measure used for purchase orders. It must in the same "
+#~ "category than the default unit of measure."
+#~ msgstr ""
+#~ "Unidad de medida por defecto utilizada en las órdenes de compra. Debe "
+#~ "estar en la misma categoría que la unidad de medida por defecto."
+
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
+#~ msgid "KGM"
+#~ msgstr "Kg."
+
+#~ msgid "Suppliers of Product"
+#~ msgstr "Proveedores del producto"
+
+#~ msgid "Rentable Product"
+#~ msgstr "Producto alquilable"
+
+#~ msgid ""
+#~ "The cost of the product for accounting stock valuation. It can serves as a "
+#~ "base price for supplier price."
+#~ msgstr ""
+#~ "El coste del producto para la valorización contable del inventario. Puede "
+#~ "servir como precio base para el precio de proveedor."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You can see the list of suppliers for that product."
+#~ msgstr "Puede ver la lista de proveedores de dicho producto."
+
+#~ msgid ""
+#~ "Unit of Measure of a category can be converted between each others in the "
+#~ "same category."
+#~ msgstr ""
+#~ "La unidad de medida de una categoría puede ser convertida a otras de la "
+#~ "misma categoría."
+
+#~ msgid ""
+#~ "The coefficient for the formula:\n"
+#~ "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
+#~ msgstr ""
+#~ "El coeficiente para la fórmula:\n"
+#~ "1 (unidad base) = coef. (esta unidad). Ratio = 1 / Factor."
+
+#~ msgid ""
+#~ "Will change the way procurements are processed. Consumables are stockable "
+#~ "products with infinite stock, or for use when you have no stock management "
+#~ "in the system."
+#~ msgstr ""
+#~ "Modifica la forma en que se procesan los abastecimientos. Consumibles son "
+#~ "productos almacenables con stock infinito, o puede utilizarlos cuando no "
+#~ "gestione las existencias en el sistema."
+
+#~ msgid ""
+#~ "This is the average time between the confirmation of the customer order and "
+#~ "the delivery of the finished products. It's the time you promise to your "
+#~ "customers."
+#~ msgstr ""
+#~ "Este es el tiempo promedio entre la confirmación del pedido del cliente y la "
+#~ "entrega de los productos acabados. Es el tiempo que promete a sus clientes."
+
+#~ msgid ""
+#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
+#~ "that can not be split."
+#~ msgstr ""
+#~ "La cantidad calculada será un múltiplo de este valor. Use 1.0 para los "
+#~ "productos que no se puedan dividir."
+
+#~ msgid ""
+#~ "The coefficient for the formula:\n"
+#~ "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
+#~ msgstr ""
+#~ "El coeficiente para la fórmula:\n"
+#~ "coef. (unidad base) = 1 (esta unidad). Factor = 1 / Ratio."
diff --git a/addons/product/i18n/es_PY.po b/addons/product/i18n/es_PY.po
index 875ddfccc21..8779774cdec 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -109,8 +109,8 @@ msgstr "Fijo"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "¡ Advertencia !"
@@ -256,7 +256,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  por ej.: 1 * (esta unidad) = ratio * (unidad referencia)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Productos: "
@@ -542,7 +542,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1326,7 +1326,7 @@ msgid "Pallet Dimension"
 msgstr "Dimención del Palet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (copiar)"
@@ -1813,7 +1813,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2231,7 +2231,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2276,7 +2276,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/es_VE.po b/addons/product/i18n/es_VE.po
new file mode 100644
index 00000000000..447181cb6d5
--- /dev/null
+++ b/addons/product/i18n/es_VE.po
@@ -0,0 +1,2682 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product
+#
+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:15+0000\n"
+"PO-Revision-Date: 2011-01-13 22:39+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:23+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram512_product_template
+msgid "DDR 512MB PC400"
+msgstr "DDR 512MB PC400"
+
+#. module: product
+#: field:product.packaging,rows:0
+msgid "Number of Layers"
+msgstr "Número de capas"
+
+#. module: product
+#: constraint:product.pricelist.item:0
+msgid ""
+"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+"Item!"
+msgstr ""
+"¡Error! No puede asignar la tarifa principal como Otra tarifa en un elemento "
+"de la tarifa!"
+
+#. module: product
+#: help:product.pricelist.item,product_tmpl_id:0
+msgid ""
+"Set a template if this rule only apply to a template of product. Keep empty "
+"for all products"
+msgstr ""
+"Indicar una plantilla si esta regla sólo se aplica a una plantilla de "
+"producto. Dejarlo vacío para todos los productos"
+
+#. module: product
+#: model:product.category,name:product.cat1
+msgid "Sellable"
+msgstr "Vendible"
+
+#. module: product
+#: model:product.template,name:product.product_product_mb2_product_template
+msgid "Mainboard ASUStek A7V8X-X"
+msgstr "Placa madre ASUStek A7V8X-X"
+
+#. module: product
+#: help:product.template,seller_qty:0
+msgid "This is minimum quantity to purchase from Main Supplier."
+msgstr "Esta es la mínima cantidad a comprar al proveedor principal."
+
+#. module: product
+#: model:product.uom,name:product.uom_day
+msgid "Day"
+msgstr "Día"
+
+#. module: product
+#: view:product.product:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc2_product_template
+msgid "Basic+ PC (assembly on order)"
+msgstr "PC Básico+ (ensamblado bajo pedido)"
+
+#. module: product
+#: field:product.product,incoming_qty:0
+msgid "Incoming"
+msgstr "Entrante"
+
+#. module: product
+#: field:product.template,mes_type:0
+msgid "Measure Type"
+msgstr "Tipo de medida"
+
+#. module: product
+#: help:res.partner,property_product_pricelist:0
+msgid ""
+"This pricelist will be used, instead of the default one, for sales to the "
+"current partner"
+msgstr ""
+"Esta tarifa se utilizará, en lugar de la por defecto, para las ventas de la "
+"empresa actual."
+
+#. module: product
+#: constraint:product.supplierinfo:0
+msgid ""
+"Error: The default UOM and the Supplier Product UOM must be in the same "
+"category."
+msgstr ""
+"Error: La UdM por defecto y la UdM del proveedor del producto deben estar en "
+"la misma categoría."
+
+#. module: product
+#: field:product.template,seller_qty:0
+msgid "Supplier Quantity"
+msgstr "Cantidad proveedor"
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: product
+#: code:addons/product/pricelist.py:186
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
+#, python-format
+msgid "Warning !"
+msgstr "¡Atención!"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_pricelist
+#: model:ir.model,name:product.model_product_pricelist
+#: field:product.product,price:0
+#: field:product.product,pricelist_id:0
+#: view:product.supplierinfo:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Base Prices"
+msgstr "Precios base"
+
+#. module: product
+#: field:product.pricelist.item,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. module: product
+#: field:product.product,code:0
+#: field:product.product,default_code:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: product
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: product
+#: help:pricelist.partnerinfo,min_quantity:0
+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 ""
+"La cantidad mínima para disparar esta regla, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
+
+#. module: product
+#: model:product.template,name:product.product_product_24_product_template
+msgid "Keyboard"
+msgstr "Teclado"
+
+#. module: product
+#: model:ir.model,name:product.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: product
+#: help:product.template,supply_method:0
+msgid ""
+"Produce will generate production order or tasks, according to the product "
+"type. Purchase will trigger purchase orders when requested."
+msgstr ""
+"Producir generará órdenes de producción o tareas, de acuerdo al tipo de "
+"producto. Comprar generará pedidos de compras cuando sea necesario."
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: product
+#: help:product.pricelist.item,name:0
+msgid "Explicit rule name for this pricelist line."
+msgstr "Nombre de regla explícita para esta línea de tarifa."
+
+#. 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 "Units of Measure Categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu1_product_template
+msgid "Processor AMD Athlon XP 1800+"
+msgstr "Procesador AMD Athlon XP 1800+"
+
+#. module: product
+#: model:product.template,name:product.product_product_20_product_template
+msgid "HDD on demand"
+msgstr "HDD bajo pedido"
+
+#. module: product
+#: field:product.price_list,price_list:0
+msgid "PriceList"
+msgstr "Tarifa"
+
+#. module: product
+#: view:product.template:0
+msgid "UOM"
+msgstr "UdM"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "PCE"
+msgstr "Unidad"
+
+#. module: product
+#: view:product.template:0
+msgid "Miscelleanous"
+msgstr "Miscelánea"
+
+#. module: product
+#: model:product.template,name:product.product_product_worker0_product_template
+msgid "Worker"
+msgstr "Trabajador"
+
+#. module: product
+#: help:product.template,sale_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from a sale order line."
+msgstr ""
+"Indica si el producto será visible en la lista de productos que aparece al "
+"seleccionar un producto en una línea de pedido de venta."
+
+#. module: product
+#: model:product.pricelist.version,name:product.ver0
+msgid "Default Public Pricelist Version"
+msgstr "Versión de tarifa pública por defecto"
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Standard Price"
+msgstr "Precio estándar"
+
+#. module: product
+#: model:product.pricelist.type,name:product.pricelist_type_sale
+#: field:res.partner,property_product_pricelist:0
+msgid "Sale Pricelist"
+msgstr "Tarifa de venta"
+
+#. module: product
+#: view:product.template:0
+#: field:product.template,type:0
+msgid "Product Type"
+msgstr "Tipo de producto"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
+msgstr "  por ej.: 1 * (esta unidad) = ratio * (unidad referencia)"
+
+#. module: product
+#: code:addons/product/product.py:380
+#, python-format
+msgid "Products: "
+msgstr "Productos: "
+
+#. module: product
+#: field:product.category,parent_id:0
+msgid "Parent Category"
+msgstr "Categoría padre"
+
+#. module: product
+#: help:product.product,outgoing_qty:0
+msgid ""
+"Quantities of products that are planned to leave in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Cantidades de productos que están previstos dejar en las ubicaciones "
+"seleccionadas o todas las internas si no se ha seleccionado ninguna."
+
+#. module: product
+#: help:product.template,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Obtener para stock': Cuando sea necesario, coger del stock o esperar hasta "
+"que sea reabastecido. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
+"producir para la petición de abastecimiento."
+
+#. module: product
+#: model:process.node,note:product.process_node_supplier0
+msgid "Supplier name, price, product code, ..."
+msgstr "Nombre proveedor, precio, código producto, ..."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd3_product_template
+msgid "HDD Seagate 7200.8 160GB"
+msgstr "HDD Seagate 7200.8 160GB"
+
+#. module: product
+#: field:product.product,ean13:0
+msgid "EAN13"
+msgstr "EAN13"
+
+#. module: product
+#: field:product.template,seller_id:0
+msgid "Main Supplier"
+msgstr "Proveedor principal"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_ul_form_action
+#: model:ir.model,name:product.model_product_packaging
+#: model:ir.ui.menu,name:product.menu_product_ul_form_action
+#: view:product.packaging:0
+#: view:product.product:0
+#: view:product.ul:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: product
+#: view:product.product:0
+#: field:product.template,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: product
+#: help:product.pricelist.item,min_quantity:0
+msgid ""
+"The rule only applies if the partner buys/sells more than this quantity."
+msgstr ""
+"La regla sólo se aplica si la empresa compra/vende más de esta cantidad."
+
+#. module: product
+#: model:product.template,name:product.product_product_woodmm0_product_template
+msgid "Wood 2mm"
+msgstr "Madera 2mm"
+
+#. module: product
+#: field:product.price_list,qty1:0
+msgid "Quantity-1"
+msgstr "Cantidad-1"
+
+#. module: product
+#: help:product.packaging,ul_qty:0
+msgid "The number of packages by layer"
+msgstr "El número de paquetes por capa."
+
+#. module: product
+#: field:product.packaging,qty:0
+msgid "Quantity by Package"
+msgstr "Cantidad por paquete"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: product
+#: help:product.template,categ_id:0
+msgid "Select category for the current product"
+msgstr "Seleccione la categoría para el producto actual."
+
+#. module: product
+#: field:product.product,outgoing_qty:0
+msgid "Outgoing"
+msgstr "Saliente"
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Reference UoM for this category"
+msgstr "Referencia UdM para esta categoría"
+
+#. module: product
+#: model:product.price.type,name:product.list_price
+#: field:product.product,lst_price:0
+msgid "Public Price"
+msgstr "Precio al público"
+
+#. module: product
+#: field:product.price_list,qty5:0
+msgid "Quantity-5"
+msgstr "Cantidad-5"
+
+#. module: product
+#: model:product.category,name:product.product_category_10
+msgid "IT components"
+msgstr "Componentes TI"
+
+#. module: product
+#: field:product.template,product_manager:0
+msgid "Product Manager"
+msgstr "Responsable de producto"
+
+#. module: product
+#: field:product.supplierinfo,product_name:0
+msgid "Supplier Product Name"
+msgstr "Nombre producto proveedor"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc3_product_template
+msgid "Medium PC"
+msgstr "PC Medio"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action_puchased
+msgid ""
+"Products can be purchased and/or sold. They 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 ""
+"Los productos pueden ser comprados y / o vendidos. Pueden ser materias "
+"primas, productos inventariable, material fungible o servicios. El "
+"formulario del producto contiene información detallada sobre sus productos "
+"relacionados con la logística de contratación, precio de venta, categoría de "
+"los productos, proveedores, etc."
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price Search"
+msgstr "Buscar precio productos"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_sale:0
+msgid "Sale Description"
+msgstr "Descripción de venta"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Storage Localisation"
+msgstr "Ubicación en el almacén"
+
+#. module: product
+#: help:product.packaging,length:0
+msgid "The length of the package"
+msgstr "La longitud del paquete."
+
+#. module: product
+#: help:product.template,weight_net:0
+msgid "The net weight in Kg."
+msgstr "El peso neto en Kg."
+
+#. module: product
+#: help:product.template,state:0
+msgid "Tells the user if he can use the product or not."
+msgstr "Informa al usuario si puede usar el producto o no."
+
+#. module: product
+#: field:pricelist.partnerinfo,min_quantity:0
+#: field:product.supplierinfo,qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: product
+#: field:product.packaging,height:0
+msgid "Height"
+msgstr "Altura"
+
+#. module: product
+#: help:product.pricelist.version,date_end:0
+msgid "Ending date for this pricelist version to be valid."
+msgstr "Fecha de fin de validez de esta versión de tarifa."
+
+#. module: product
+#: model:product.category,name:product.cat0
+msgid "All products"
+msgstr "Todos los productos"
+
+#. module: product
+#: model:ir.model,name:product.model_pricelist_partnerinfo
+msgid "pricelist.partnerinfo"
+msgstr "pricelist.partnerinfo"
+
+#. module: product
+#: field:product.price_list,qty2:0
+msgid "Quantity-2"
+msgstr "Cantidad-2"
+
+#. module: product
+#: field:product.price_list,qty3:0
+msgid "Quantity-3"
+msgstr "Cantidad-3"
+
+#. module: product
+#: view:product.product:0
+msgid "Codes"
+msgstr "Códigos"
+
+#. module: product
+#: help:product.supplierinfo,product_uom:0
+msgid ""
+"Choose here the Unit of Measure in which the prices and quantities are "
+"expressed below."
+msgstr ""
+"Seleccione aquí la unidad de medida en que se expresarán los precios y las "
+"cantidades listadas."
+
+#. module: product
+#: field:product.price_list,qty4:0
+msgid "Quantity-4"
+msgstr "Cantidad-4"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_wtime
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action2
+msgid ""
+"A price list contains rules to be evaluated in order to compute the purchase "
+"or sales price for all the partners assigned to a price list. Price lists "
+"have several versions (2010, 2011, Promotion of February 2010, etc.) and "
+"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 ""
+"Una lista de precios contiene normas que deben evaluarse con el fin de "
+"calcular precio de compra o de venta para todos los terceros asignados con "
+"una lista de precios. Las listas de precios tienen varias versiones (2010, "
+"2011, promoción de febrero de 2010, etc) y cada versión tiene varias reglas. "
+"Ejemplo: precio de los clientes de una categoría de producto se basará en "
+"precio del proveedor multiplicado por 1,80."
+
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
+
+#. module: product
+#: model:product.template,name:product.product_product_metalcleats0_product_template
+msgid "Metal Cleats"
+msgstr "Tacos de metal"
+
+#. module: product
+#: code:addons/product/pricelist.py:343
+#, python-format
+msgid ""
+"No active version for the selected pricelist !\n"
+"Please create or activate one."
+msgstr ""
+"¡No hay una versión activa de la tarifa seleccionada!\n"
+"Cree o active una."
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product uom categ"
+msgstr "Categ. UdM de producto"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_box
+msgid "Box 20x20x40"
+msgstr "Caja 20x20x40"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Price Computation"
+msgstr "Cálculo del precio"
+
+#. module: product
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr "Puede ser comprado"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu2_product_template
+msgid "High speed processor config"
+msgstr "Config. Procesador alta velocidad"
+
+#. module: product
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
+
+#. module: product
+#: help:product.uom,category_id:0
+msgid ""
+"Quantity conversions may happen automatically between Units of Measure in "
+"the same category, according to their respective ratios."
+msgstr ""
+"Conversiones de cantidad pueden realizarse de forma automática entre "
+"unidades de medida en la misma categoría, de acuerdo con sus coeficientes de "
+"conversión respectivos."
+
+#. module: product
+#: help:product.packaging,width:0
+msgid "The width of the package"
+msgstr "La anchura del paquete."
+
+#. module: product
+#: field:product.product,virtual_available:0
+msgid "Virtual Stock"
+msgstr "Stock virtual"
+
+#. module: product
+#: selection:product.category,type:0
+msgid "View"
+msgstr "Vista"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_template_action_tree
+msgid "Product Templates"
+msgstr "Plantillas producto"
+
+#. module: product
+#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
+msgid "Restaurant Expenses"
+msgstr "Gastos restaurante"
+
+#. module: product
+#: constraint:product.packaging:0
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: product
+#: field:product.pricelist.item,min_quantity:0
+msgid "Min. Quantity"
+msgstr "Cantidad mín."
+
+#. module: product
+#: model:ir.model,name:product.model_product_price_type
+msgid "Price Type"
+msgstr "Tipo precio"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Max. Margin"
+msgstr "Margen máx."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Base Price"
+msgstr "Precio base"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan2_product_template
+msgid "Silent fan"
+msgstr "Ventilador silencioso"
+
+#. module: product
+#: help:product.supplierinfo,name:0
+msgid "Supplier of this product"
+msgstr "Proveedor de este producto."
+
+#. module: product
+#: help:product.pricelist.version,active:0
+msgid ""
+"When a version is duplicated it is set to non active, so that the dates do "
+"not overlaps with original version. You should change the dates and "
+"reactivate the pricelist"
+msgstr ""
+"Cuando se duplica una versión se cambia a no activa, de modo que las fechas "
+"no se superpongan con la versión original. Deberá cambiar las fechas y "
+"reactivar la tarifa."
+
+#. module: product
+#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
+msgid "KIT Shelf of 100cm"
+msgstr "KIT estante de 100cm"
+
+#. module: product
+#: field:product.supplierinfo,name:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: product
+#: model:product.template,name:product.product_product_sidepanel0_product_template
+msgid "Side Panel"
+msgstr "Panel lateral"
+
+#. module: product
+#: model:product.template,name:product.product_product_26_product_template
+msgid "Kit Keyboard + Mouse"
+msgstr "Kit Teclado + Ratón"
+
+#. module: product
+#: field:product.price.type,name:0
+msgid "Price Name"
+msgstr "Nombre precio"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu3_product_template
+msgid "Processor AMD Athlon XP 2200+"
+msgstr "Procesador AMD Athlon XP 2200+"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.action_product_price_list
+#: model:ir.model,name:product.model_product_price_list
+#: view:product.price_list:0
+#: report:product.pricelist:0
+#: field:product.pricelist.version,pricelist_id:0
+msgid "Price List"
+msgstr "Lista de precios"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Suppliers"
+msgstr "Proveedores"
+
+#. module: product
+#: view:product.product:0
+msgid "To Purchase"
+msgstr "A comprar"
+
+#. module: product
+#: help:product.supplierinfo,min_qty:0
+msgid ""
+"The minimal quantity to purchase to this supplier, expressed in the supplier "
+"Product UoM if not empty, in the default unit of measure of the product "
+"otherwise."
+msgstr ""
+"La cantidad mínima a comprar a este proveedor, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "New Price ="
+msgstr "Nuevo Precio ="
+
+#. module: product
+#: help:pricelist.partnerinfo,price:0
+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 ""
+"Este precio se considerará como el precio para la UdM del proveedor si "
+"existe o en la UdM por defecto del producto en caso contrario."
+
+#. module: product
+#: model:product.category,name:product.product_category_accessories
+msgid "Accessories"
+msgstr "Accesorios"
+
+#. module: product
+#: field:product.template,sale_delay:0
+msgid "Customer Lead Time"
+msgstr "Plazo de entrega del cliente"
+
+#. module: product
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Supplier of the product"
+msgstr "Proveedor del producto"
+
+#. module: product
+#: help:product.template,uos_id:0
+msgid ""
+"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 UOM."
+msgstr ""
+"Utilizado por las compañías que gestionan dos unidades de medida: "
+"facturación y gestión de inventario. Por ejemplo, en industrias "
+"alimentarias, puede gestionar un stock de unidades de jamón, pero facturar "
+"en Kg. Déjelo vacío para usar la UdM por defecto."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Min. Margin"
+msgstr "Margen mín."
+
+#. module: product
+#: field:product.category,child_id:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: product
+#: field:product.pricelist.version,date_end:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: product
+#: view:product.price_list:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: product
+#: view:product.product:0
+#: field:product.ul,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_main
+msgid "Pricelists"
+msgstr "Tarifas"
+
+#. module: product
+#: field:product.product,partner_ref:0
+msgid "Customer ref"
+msgstr "Ref. cliente"
+
+#. module: product
+#: view:product.product:0
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. module: product
+#: field:product.pricelist.type,key:0
+msgid "Key"
+msgstr "Clave"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rules Test Match"
+msgstr "Reglas test de concordancia"
+
+#. module: product
+#: help:product.pricelist.item,product_id:0
+msgid ""
+"Set a product if this rule only apply to one product. Keep empty for all "
+"products"
+msgstr ""
+"Indicar un producto si esta regla sólo se aplica a un producto. Dejarlo "
+"vacío para todos los productos"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr "Abastecimiento-Ubicación"
+
+#. module: product
+#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
+msgid "Kitchen Design Project"
+msgstr "Proyecto diseño cocina"
+
+#. module: product
+#: model:product.uom,name:product.uom_hour
+msgid "Hour"
+msgstr "Hora"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Development"
+msgstr "En desarrollo"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm1_product_template
+msgid "Shelf of 200cm"
+msgstr "Estante de 200cm"
+
+#. module: product
+#: view:product.uom:0
+msgid "Ratio & Precision"
+msgstr "Ratio y precisión"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_gram
+msgid "g"
+msgstr "g"
+
+#. module: product
+#: model:product.category,name:product.product_category_11
+msgid "IT components kits"
+msgstr "Kits de componentes TI"
+
+#. module: product
+#: selection:product.category,type:0
+#: selection:product.template,state:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: product
+#: model:process.node,name:product.process_node_supplier0
+#: view:product.supplierinfo:0
+msgid "Supplier Information"
+msgstr "Información del proveedor"
+
+#. module: product
+#: field:product.price.type,currency_id:0
+#: report:product.pricelist:0
+#: field:product.pricelist,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram_product_template
+msgid "DDR 256MB PC400"
+msgstr "DDR 256MB PC400"
+
+#. module: product
+#: view:product.category:0
+msgid "Product Categories"
+msgstr "Categorías de producto"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
+msgstr "  por ej.: 1 * (unidad referencia) = ratio * (esta unidad)"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_form_action
+msgid ""
+"Create and manage the units of measure you want to be used in your system. "
+"You can define a conversion rate between several Units of Measure within the "
+"same category."
+msgstr ""
+"Cree y gestione las unidades de medida que desea utilizar en su sistema. "
+"Puede definir una tipo de conversión entre diferentes unidades de medida en "
+"la misma categoría."
+
+#. module: product
+#: field:product.packaging,weight:0
+msgid "Total Package Weight"
+msgstr "Total peso paquete"
+
+#. module: product
+#: help:product.packaging,code:0
+msgid "The code of the transport unit."
+msgstr "El código de la unidad de transporte."
+
+#. module: product
+#: help:product.template,standard_price:0
+msgid ""
+"Product's cost for accounting stock valuation. It is the base price for the "
+"supplier price."
+msgstr ""
+"Coste del producto para la valoración contable de las existencias. Es el "
+"precio base para el precio del proveedor."
+
+#. module: product
+#: view:product.price.type:0
+msgid "Products Price Type"
+msgstr "Tipo de precios de productos"
+
+#. module: product
+#: field:product.product,price_extra:0
+msgid "Variant Price Extra"
+msgstr "Precio extra variante"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan_product_template
+msgid "Regular case fan 80mm"
+msgstr "Ventilador normal 80mm"
+
+#. module: product
+#: model:ir.model,name:product.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr "Información de un proveedor de producto"
+
+#. module: product
+#: view:product.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_purchase:0
+msgid "Purchase Description"
+msgstr "Descripción de compra"
+
+#. module: product
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#. module: product
+#: help:product.supplierinfo,delay:0
+msgid ""
+"Lead time in days between the confirmation of the purchase order and the "
+"reception of the products in your warehouse. Used by the scheduler for "
+"automatic computation of the purchase order planning."
+msgstr ""
+"Plazo de entrega en días entre la confirmación del pedido de compra y la "
+"recepción de los productos en su almacén. Utilizado por el planificador para "
+"el cálculo automático de la planificación del pedido de compra."
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action
+msgid ""
+"There can be more than one version of a pricelist. Here you can create and "
+"manage new versions of a price list. Some examples of versions: 2010, 2011, "
+"Summer Promotion, etc."
+msgstr ""
+"No puede haber más de una versión de una lista de precios. Aquí puede crear "
+"y administrar nuevas versiones de una lista de precios. Algunos ejemplos de "
+"versiones: 2010, 2011, promoción de verano, etc"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr "Almacenable"
+
+#. module: product
+#: field:product.packaging,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Seq"
+msgstr "Seq"
+
+#. module: product
+#: view:product.price_list:0
+msgid "Calculate Product Price per unit base 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
+msgid "Shipping Unit"
+msgstr "Unidad de envío"
+
+#. module: product
+#: field:pricelist.partnerinfo,suppinfo_id:0
+msgid "Partner Information"
+msgstr "Información de empresa"
+
+#. module: product
+#: selection:product.ul,type:0
+#: model:product.uom.categ,name:product.product_uom_categ_unit
+msgid "Unit"
+msgstr "Unidad"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Information"
+msgstr "Información"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Products Listprices Items"
+msgstr "Elementos de las tarifas de productos"
+
+#. module: product
+#: view:product.packaging:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. module: product
+#: field:product.pricelist.version,items_id:0
+msgid "Price List Items"
+msgstr "Elementos de la tarifa"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
+msgid ""
+"Create and manage the units of measure categories you want to be used in "
+"your system. If several units of measure are in the same category, they can "
+"be converted to each other. For example, in the unit of measure category "
+"\"Time\", you will have the following UoM: Hours, Days."
+msgstr ""
+"Cree y gestione las categorías de unidades de medida que quiera utilizar en "
+"su sistema. SI varias unidades de medida están en la misma categoría, pueden "
+"ser convertidas entre ellas. Por ejemplo, en al unidad de medida \"Tiempo\", "
+"tendrá las sigueinte UdM: horas, días."
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Bigger than the reference UoM"
+msgstr "Mayor que la UdM de referencia"
+
+#. module: product
+#: model:ir.module.module,shortdesc:product.module_meta_information
+msgid "Products & Pricelists"
+msgstr "Productos y tarifas"
+
+#. module: product
+#: view:product.product:0
+msgid "To Sell"
+msgstr "A vender"
+
+#. module: product
+#: model:product.category,name:product.product_category_services0
+msgid "Marketable Services"
+msgstr "Servicios negociables"
+
+#. module: product
+#: field:product.pricelist.item,price_surcharge:0
+msgid "Price Surcharge"
+msgstr "Recargo precio"
+
+#. module: product
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
+msgstr "Placa madre ASUStek A7N8X"
+
+#. module: product
+#: field:product.product,packaging:0
+msgid "Logistical Units"
+msgstr "Unidades de logística"
+
+#. module: product
+#: field:product.category,complete_name:0
+#: field:product.category,name:0
+#: field:product.pricelist.type,name:0
+#: field:product.pricelist.version,name:0
+#: view:product.product:0
+#: field:product.product,name_template:0
+#: field:product.template,name:0
+#: field:product.ul,name:0
+#: field:product.uom,name:0
+#: field:product.uom.categ,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: product
+#: view:product.product:0
+msgid "Stockable"
+msgstr "Estocable"
+
+#. module: product
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
+msgstr "Dintel madera 4m"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.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 ""
+"Debe definir un producto por cada cosa 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 logística de abastecimiento, precio de venta, categoría de "
+"producto, proveedores, etc."
+
+#. module: product
+#: model:product.uom,name:product.product_uom_kgm
+msgid "kg"
+msgstr "kg"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_meter
+msgid "m"
+msgstr "m"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "Obsolete"
+msgstr "Obsoleto"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_km
+msgid "km"
+msgstr "km"
+
+#. module: product
+#: help:product.template,cost_method:0
+msgid ""
+"Standard Price: the cost price is fixed and recomputed periodically (usually "
+"at the end of the year), Average Price: the cost price is recomputed at each "
+"reception of products."
+msgstr ""
+"Precio estándar: El precio de coste es fijo y se recalcula periódicamente "
+"(normalmente al finalizar el año), Precio medio: El precio de coste se "
+"recalcula en cada recepción de productos."
+
+#. module: product
+#: help:product.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de categorías de "
+"producto."
+
+#. module: product
+#: field:product.uom,factor:0
+#: field:product.uom,factor_inv:0
+msgid "Ratio"
+msgstr "Ratio"
+
+#. module: product
+#: help:product.template,purchase_ok:0
+msgid ""
+"Determine if the product is visible in the list of products within a "
+"selection from a purchase order line."
+msgstr ""
+"Indica si el producto es visible en la lista de productos que aparece al "
+"seleccionar un producto en una línea de pedido de compra."
+
+#. module: product
+#: field:product.template,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
+
+#. module: product
+#: field:product.packaging,width:0
+msgid "Width"
+msgstr "Ancho"
+
+#. module: product
+#: help:product.price.type,field:0
+msgid "Associated field in the product form."
+msgstr "Campo asociado en el formulario de producto."
+
+#. module: product
+#: view:product.product:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: product
+#: field:product.template,procure_method:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Printing Date"
+msgstr "Fecha impresión"
+
+#. module: product
+#: field:product.template,uos_id:0
+msgid "Unit of Sale"
+msgstr "Unidad de venta"
+
+#. module: product
+#: model:ir.module.module,description:product.module_meta_information
+msgid ""
+"\n"
+"    This is the base module for managing products and pricelists in "
+"OpenERP.\n"
+"\n"
+"    Products support variants, different pricing methods, suppliers\n"
+"    information, make to stock/order, different unit of measures,\n"
+"    packaging and properties.\n"
+"\n"
+"    Pricelists support:\n"
+"    * Multiple-level of discount (by product, category, quantities)\n"
+"    * Compute price based on different criteria:\n"
+"        * Other pricelist,\n"
+"        * Cost price,\n"
+"        * List price,\n"
+"        * Supplier price, ...\n"
+"    Pricelists preferences by product and/or partners.\n"
+"\n"
+"    Print product labels with barcode.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar productos y tarifas en OpenERP.\n"
+"\n"
+"    Los productos soportan variantes, distintos métodos de precios, "
+"información\n"
+"    de proveedor, obtener para stock/pedido, distintas unidades de medida,\n"
+"    empaquetado y propiedades.\n"
+"\n"
+"    Soporte de tarifas:\n"
+"    * Múltiple-nivel de descuento (por producto, categoría, cantidades)\n"
+"    * Cálculo del precio basado en distintos criterios:\n"
+"        * Otra tarifa,\n"
+"        * Precio coste,\n"
+"        * Precio lista,\n"
+"        * Precio proveedor, ...\n"
+"    Preferencias de tarifas por producto y/o empresas.\n"
+"\n"
+"    Imprimir etiquetas de productos con códigos de barras.\n"
+"    "
+
+#. module: product
+#: help:product.template,seller_delay:0
+msgid ""
+"This is the average delay in days between the purchase order confirmation "
+"and the reception of goods for this product and for the default supplier. It "
+"is used by the scheduler to order requests based on reordering delays."
+msgstr ""
+"Éste es el plazo promedio en días entre la confirmación del pedido de compra "
+"y la recepción de la mercancía para este producto y para el proveedor por "
+"defecto. El planificador lo utiliza para generar solicitudes basado en los "
+"plazos de los pedidos."
+
+#. module: product
+#: help:product.template,seller_id:0
+msgid "Main Supplier who has highest priority in Supplier List."
+msgstr ""
+"Proveedor principal que tenga la prioridad más alta en la lista de "
+"proveedores."
+
+#. module: product
+#: model:product.category,name:product.product_category_services
+#: view:product.product:0
+msgid "Services"
+msgstr "Servicios"
+
+#. module: product
+#: field:product.pricelist.item,base_pricelist_id:0
+msgid "If Other Pricelist"
+msgstr "Lista Precios Base"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_normal_action
+#: model:ir.actions.act_window,name:product.product_normal_action_puchased
+#: model:ir.actions.act_window,name:product.product_normal_action_tree
+#: model:ir.ui.menu,name:product.menu_products
+#: view:product.product:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: product
+#: help:product.packaging,rows:0
+msgid "The number of layers on a pallet or box"
+msgstr "El número de capas en un palet o caja."
+
+#. module: product
+#: help:product.pricelist.item,base:0
+msgid "The mode for computing the price for this rule."
+msgstr "El modo de calcular el precio para esta regla."
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Pallet Dimension"
+msgstr "Dimensión del palet"
+
+#. module: product
+#: code:addons/product/product.py:618
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: product
+#: field:product.template,seller_ids:0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: product
+#: help:product.template,sale_delay:0
+msgid ""
+"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."
+msgstr ""
+"Esta es la demora media en días entre la confirmación del pedido del cliente "
+"y la entrega de los productos acabados. Es el tiempo que prometen a sus "
+"clientes."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Second UoM"
+msgstr "UdM secundaria"
+
+#. module: product
+#: code:addons/product/product.py:142
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_form_action
+#: model:ir.ui.menu,name:product.next_id_16
+#: view:product.uom:0
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+#. module: product
+#: field:product.supplierinfo,min_qty:0
+msgid "Minimal Quantity"
+msgstr "Cantidad mínima"
+
+#. module: product
+#: model:product.category,name:product.product_category_pc
+msgid "PC"
+msgstr "PC"
+
+#. module: product
+#: help:product.supplierinfo,product_code:0
+msgid ""
+"This supplier's product code will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
+msgstr ""
+"Este código de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el código interno."
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr "Obtener para stock"
+
+#. module: product
+#: field:product.pricelist.item,price_version_id:0
+msgid "Price List Version"
+msgstr "Versión de tarifa"
+
+#. module: product
+#: help:product.pricelist.item,sequence:0
+msgid ""
+"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."
+msgstr ""
+"Indica el orden en que los elementos de la tarifa serán comprobados. En la "
+"evaluación se da máxima prioridad a la secuencia más baja y se detiene tan "
+"pronto como se encuentra un elemento coincidente."
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Consumable"
+msgstr "Consumible"
+
+#. module: product
+#: help:product.price.type,currency_id:0
+msgid "The currency the field is expressed in."
+msgstr "La moneda en que se expresa el campo."
+
+#. module: product
+#: help:product.template,weight:0
+msgid "The gross weight in Kg."
+msgstr "El peso bruto en Kg."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: product
+#: field:product.uom,category_id:0
+msgid "UoM Category"
+msgstr "Categoría UdM"
+
+#. module: product
+#: field:product.template,loc_rack:0
+msgid "Rack"
+msgstr "Estante"
+
+#. module: product
+#: field:product.template,uom_po_id:0
+msgid "Purchase Unit of Measure"
+msgstr "Unidad de medida compra"
+
+#. module: product
+#: field:product.template,supply_method:0
+msgid "Supply method"
+msgstr "Método suministro"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_category_action
+msgid ""
+"Here is a list of all your products classified by category. You can click a "
+"category to get the list of all products linked to this category or to a "
+"child of this category."
+msgstr ""
+"Aquí se muestra una lista de todos los productos clasificados por "
+"categorías. Puede hacer clic en una categoría para obtener la lista de todos "
+"los productos vinculados con esta categoría o con una categoría hija."
+
+#. module: product
+#: view:product.product:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu_gen_product_template
+msgid "Regular processor config"
+msgstr "Config. procesador normal"
+
+#. module: product
+#: code:addons/product/product.py:142
+#, python-format
+msgid ""
+"Conversion from Product UoM m to Default UoM PCE is not possible as they "
+"both belong to different Category!."
+msgstr ""
+"¡La conversión de la UdM m a la UdM PCE no es posible ya que ambas "
+"pertenecen a categorías diferentes!"
+
+#. module: product
+#: field:product.pricelist.version,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: product
+#: help:product.template,produce_delay:0
+msgid ""
+"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."
+msgstr ""
+"Demora media en días para producir este producto. Esto es sólo para la orden "
+"de fabricación y, si se trata de un lista de material multi-nivel, es sólo "
+"para el nivel de este producto. Diferentes tiempos de demora se suman para "
+"todos los niveles y pedidos de compra."
+
+#. module: product
+#: help:product.product,qty_available:0
+msgid ""
+"Current quantities of products in selected locations or all internal if none "
+"have been selected."
+msgstr ""
+"Cantidades actuales de productos en las ubicaciones seleccionadas o todas "
+"las internas si no se ha seleccionado ninguna."
+
+#. module: product
+#: model:product.template,name:product.product_product_pc1_product_template
+msgid "Basic PC"
+msgstr "PC Básico"
+
+#. module: product
+#: help:product.pricelist,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the pricelist "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
+
+#. module: product
+#: field:product.product,qty_available:0
+msgid "Real Stock"
+msgstr "Stock real"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_cm
+msgid "cm"
+msgstr "cm"
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom
+msgid "Product Unit of Measure"
+msgstr "Unidad de medida del producto"
+
+#. module: product
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+"categoría."
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Precisión de redondeo"
+
+#. module: product
+#: view:product.uom:0
+msgid "Unit of Measure Properties"
+msgstr "Propiedades unidad de medida"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelf1_product_template
+msgid "Rack 200cm"
+msgstr "Estantería 200cm"
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Buy"
+msgstr "Comprar"
+
+#. module: product
+#: view:product.uom.categ:0
+msgid "Units of Measure categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: product
+#: help:product.packaging,weight_ul:0
+msgid "The weight of the empty UL"
+msgstr "El peso de la unidad logística vacía."
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Smaller than the reference UoM"
+msgstr "Menor que la UdM de referencia"
+
+#. module: product
+#: field:product.price.type,active:0
+#: field:product.pricelist,active:0
+#: field:product.pricelist.version,active:0
+#: field:product.product,active:0
+#: field:product.uom,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: product
+#: field:product.product,price_margin:0
+msgid "Variant Price Margin"
+msgstr "Margen de precio variante"
+
+#. module: product
+#: sql_constraint:product.uom:0
+msgid "The conversion ratio for a unit of measure cannot be 0!"
+msgstr "¡El ratio de conversión para una unidad de medida no puede ser 0!"
+
+#. module: product
+#: help:product.packaging,ean:0
+msgid "The EAN code of the package unit."
+msgstr "El código EAN de la unidad del paquete."
+
+#. module: product
+#: field:product.packaging,weight_ul:0
+msgid "Empty Package Weight"
+msgstr "Peso paquete vacío"
+
+#. module: product
+#: field:product.price.type,field:0
+msgid "Product Field"
+msgstr "Campo de producto"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_type_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
+msgid "Pricelists Types"
+msgstr "Tipos de tarifas"
+
+#. module: product
+#: help:product.uom,factor:0
+msgid ""
+"How many times this UoM is smaller than the reference UoM in this category:\n"
+"1 * (reference unit) = ratio * (this unit)"
+msgstr ""
+"Cuantas veces esta UdM es más pequeña que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (unidad de referencia) = ratio * (esta unidad)"
+
+#. module: product
+#: help:product.template,uom_id:0
+msgid "Default Unit of Measure used for all stock operation."
+msgstr ""
+"Unidad de medida por defecto utilizada para todas las operaciones de stock."
+
+#. module: product
+#: model:product.category,name:product.product_category_misc0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc4_product_template
+msgid "Customizable PC"
+msgstr "PC personalizable"
+
+#. module: product
+#: field:pricelist.partnerinfo,price:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: product
+#: model:product.category,name:product.product_category_7
+#: model:product.template,name:product.product_product_1_product_template
+msgid "Onsite Intervention"
+msgstr "Intervención en el mismo lugar"
+
+#. module: product
+#: model:product.pricelist,name:product.list0
+msgid "Public Pricelist"
+msgstr "Tarifa pública"
+
+#. module: product
+#: model:product.category,name:product.product_category_marketableproduct0
+msgid "Marketable Products"
+msgstr "Productos negociables"
+
+#. module: product
+#: field:product.supplierinfo,product_code:0
+msgid "Supplier Product Code"
+msgstr "Código producto proveedor"
+
+#. module: product
+#: view:product.product:0
+msgid "Default UOM"
+msgstr "UdM por defecto"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pallet"
+msgstr "Palet"
+
+#. module: product
+#: field:product.packaging,ul_qty:0
+msgid "Package by layer"
+msgstr "Paquetes por piso"
+
+#. module: product
+#: field:product.template,warranty:0
+msgid "Warranty (months)"
+msgstr "Garantía (meses)"
+
+#. module: product
+#: help:product.pricelist.item,categ_id:0
+msgid ""
+"Set a category of product if this rule only apply to products of a category "
+"and his children. Keep empty for all products"
+msgstr ""
+"Establecer una categoría de producto si esta regla sólo se aplicará a los "
+"productos de una categoría y sus hijos. Dejar vacío para todos los productos"
+
+#. module: product
+#: model:ir.model,name:product.model_product_product
+#: model:ir.ui.menu,name:product.prod_config_main
+#: model:process.node,name:product.process_node_product0
+#: model:process.process,name:product.process_process_productprocess0
+#: field:product.packaging,product_id:0
+#: field:product.pricelist.item,product_id:0
+#: view:product.product:0
+#: field:product.supplierinfo,product_id:0
+#: model:res.request.link,name:product.req_link_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by pallet or box."
+msgstr "El número total de productos que puede poner por palet o caja."
+
+#. module: product
+#: field:product.product,variants:0
+msgid "Variants"
+msgstr "Variantes"
+
+#. 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 "Productos por categoría"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action_form
+#: model:ir.ui.menu,name:product.menu_product_category_action_form
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: product
+#: field:product.template,uos_coeff:0
+msgid "UOM -> UOS Coeff"
+msgstr "Coef. UdM -> UdV"
+
+#. module: product
+#: help:product.supplierinfo,sequence:0
+msgid "Assigns the priority to the list of product supplier."
+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 "Unidad de medida por defecto"
+
+#. module: product
+#: model:product.template,name:product.product_product_tow1_product_template
+msgid "ATX Mid-size Tower"
+msgstr "Torre de tamaño medio ATX"
+
+#. module: product
+#: field:product.packaging,ean:0
+msgid "EAN"
+msgstr "EAN"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rounding Method"
+msgstr "Método redondeo"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_label
+msgid "Products Labels"
+msgstr "Etiquetas de productos"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_big_box
+msgid "Box 30x40x60"
+msgstr "Caja 30x40x60"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: product
+#: help:product.packaging,height:0
+msgid "The height of the package"
+msgstr "La altura del paquete."
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price List"
+msgstr "Tarifa de productos"
+
+#. module: product
+#: field:product.pricelist,company_id:0
+#: field:product.pricelist.item,company_id:0
+#: field:product.pricelist.version,company_id:0
+#: field:product.supplierinfo,company_id:0
+#: field:product.template,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_price_type_action
+msgid "Prices Types"
+msgstr "Tipos de precios"
+
+#. module: product
+#: help:product.template,list_price:0
+msgid ""
+"Base price for computing the customer price. Sometimes called the catalog "
+"price."
+msgstr ""
+"Precio base para calcular el precio de cliente. También llamado el precio de "
+"catálogo."
+
+#. module: product
+#: code:addons/product/pricelist.py:518
+#, python-format
+msgid "Partner section of the product form"
+msgstr "Sección empresa del formulario de producto"
+
+#. module: product
+#: help:product.price.type,name:0
+msgid "Name of this kind of price."
+msgstr "Nombre de este tipo de precio."
+
+#. module: product
+#: field:product.supplierinfo,product_uom:0
+msgid "Supplier UoM"
+msgstr "UdM proveedor"
+
+#. module: product
+#: help:product.pricelist.version,date_start:0
+msgid "Starting date for this pricelist version to be valid."
+msgstr "Fecha inicial de validez para esta versión de tarifa."
+
+#. module: product
+#: help:product.template,uom_po_id:0
+msgid ""
+"Default Unit of Measure used for purchase orders. It must be in the same "
+"category than the default unit of measure."
+msgstr ""
+"Unidad de medida por defecto utilizada para los pedidos de compra. Debe "
+"estar en la misma categoría que la unidad de medida por defecto."
+
+#. module: product
+#: model:product.template,description:product.product_product_cpu1_product_template
+msgid "This product is configured with example of push/pull flows"
+msgstr ""
+"Este producto está configurado con ejemplo de flujos empujar/estirar."
+
+#. module: product
+#: field:product.packaging,length:0
+msgid "Length"
+msgstr "Longitud"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_length
+msgid "Length / Distance"
+msgstr "Longitud / Distancia"
+
+#. module: product
+#: model:product.template,name:product.product_product_0_product_template
+msgid "Onsite Senior Intervention"
+msgstr "Intervención en el mismo lugar consultor senior"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_type
+#: field:product.pricelist,type:0
+#: view:product.pricelist.type:0
+msgid "Pricelist Type"
+msgstr "Tipo de tarifa"
+
+#. module: product
+#: model:product.category,name:product.product_category_otherproducts0
+msgid "Other Products"
+msgstr "Otros productos"
+
+#. module: product
+#: view:product.product:0
+msgid "Characteristics"
+msgstr "Características"
+
+#. module: product
+#: field:product.template,sale_ok:0
+msgid "Can be Sold"
+msgstr "Puede ser vendido"
+
+#. module: product
+#: field:product.template,produce_delay:0
+msgid "Manufacturing Lead Time"
+msgstr "Plazo de entrega de fabricación"
+
+#. module: product
+#: field:product.supplierinfo,pricelist_ids:0
+msgid "Supplier Pricelist"
+msgstr "Tarifa de proveedor"
+
+#. module: product
+#: field:product.pricelist.item,base:0
+msgid "Based on"
+msgstr "Basado en"
+
+#. module: product
+#: model:product.category,name:product.product_category_rawmaterial0
+msgid "Raw Materials"
+msgstr "Materias primas"
+
+#. module: product
+#: help:product.product,virtual_available:0
+msgid ""
+"Future stock for this product according to the selected locations or all "
+"internal if none have been selected. Computed as: Real Stock - Outgoing + "
+"Incoming."
+msgstr ""
+"Stock futuro de este producto conforme a las ubicaciones seleccionadas o "
+"todas las internas, si ninguna de ellas ha sido seleccionada. Calculo como: "
+"Stock real - Saliente + Entrante."
+
+#. module: product
+#: field:product.pricelist,name:0
+msgid "Pricelist Name"
+msgstr "Nombre tarifa"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_version
+#: view:product.pricelist:0
+#: view:product.pricelist.version:0
+msgid "Pricelist Version"
+msgstr "Versión tarifa"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "* ( 1 + "
+msgstr "* ( 1 + "
+
+#. module: product
+#: help:product.packaging,weight:0
+msgid "The weight of a full package, pallet or box."
+msgstr "El peso de un paquete, palet o caja completo/a."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd2_product_template
+msgid "HDD Seagate 7200.8 120GB"
+msgstr "HDD Seagate 7200.8 120GB"
+
+#. module: product
+#: model:product.template,name:product.product_product_employee0_product_template
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm0_product_template
+msgid "Shelf of 100cm"
+msgstr "Estante de 100cm"
+
+#. module: product
+#: model:ir.model,name:product.model_product_category
+#: field:product.pricelist.item,categ_id:0
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Price List Name"
+msgstr "Nombre tarifa"
+
+#. module: product
+#: field:product.supplierinfo,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo de entrega"
+
+#. module: product
+#: help:product.uom,active:0
+msgid ""
+"By unchecking the active field you can disable a unit of measure without "
+"deleting it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar una unidad de medida sin "
+"eliminarla."
+
+#. module: product
+#: field:product.template,seller_delay:0
+msgid "Supplier Lead Time"
+msgstr "Plazo de entrega del proveedor"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Box"
+msgstr "Caja"
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_ul_form_action
+msgid ""
+"Create and manage your packaging dimensions and types you want to be "
+"maintained in your system."
+msgstr ""
+"Cree y gestione las unidades y tipos de embalaje que quiera utilizar en su "
+"sistema."
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm1_product_template
+msgid "Rear Panel SHE200"
+msgstr "Panel posterior SHE200"
+
+#. module: product
+#: help:product.pricelist.type,key:0
+msgid ""
+"Used in the code to select specific prices based on the context. Keep "
+"unchanged."
+msgstr ""
+"Utilizado en el código para seleccionar precios específicos basados en el "
+"contexto. Dejarlo tal como está."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd1_product_template
+msgid "HDD Seagate 7200.8 80GB"
+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 "Esta es una cantidad que será convertida en UdM por defecto."
+
+#. module: product
+#: field:product.packaging,ul:0
+msgid "Type of Package"
+msgstr "Tipo de empaquetado"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pack"
+msgstr "Paquete"
+
+#. module: product
+#: model:product.category,name:product.product_category_4
+msgid "Dello Computer"
+msgstr "Ordenador Dello"
+
+#. module: product
+#: model:product.uom.categ,name:product.product_uom_categ_kgm
+msgid "Weight"
+msgstr "Peso"
+
+#. module: product
+#: model:product.template,name:product.product_product_22_product_template
+msgid "Processor on demand"
+msgstr "Procesador bajo pedido"
+
+#. module: product
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Mouse"
+msgstr "Ratón"
+
+#. module: product
+#: field:product.uom,uom_type:0
+msgid "UoM Type"
+msgstr "Tipo UdM"
+
+#. module: product
+#: help:product.template,product_manager:0
+msgid "This is use as task responsible"
+msgstr "Se utiliza como responsable de tarea."
+
+#. module: product
+#: help:product.uom,rounding:0
+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 ""
+"La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para una "
+"Unidad de Medida que no pueda dividirse aún más, como una pieza."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Descriptions"
+msgstr "Descripciones"
+
+#. module: product
+#: field:product.template,loc_row:0
+msgid "Row"
+msgstr "Fila"
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm0_product_template
+msgid "Rear Panel SHE100"
+msgstr "Panel posterior SHE100"
+
+#. module: product
+#: model:product.template,name:product.product_product_23_product_template
+msgid "Complete PC With Peripherals"
+msgstr "PC completo con periféricos"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Weigths"
+msgstr "Pesos"
+
+#. module: product
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: product
+#: model:product.template,name:product.product_product_hotelexpenses0_product_template
+msgid "Hotel Expenses"
+msgstr "Gastos hotel"
+
+#. module: product
+#: help:product.uom,factor_inv:0
+msgid ""
+"How many times this UoM is bigger than the reference UoM in this category:\n"
+"1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+"Cuantas veces esta UdM es más grande que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (esta unidad) = ratio * (unidad de referencia)"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelf0_product_template
+msgid "Rack 100cm"
+msgstr "Estantería 100cm"
+
+#. module: product
+#: help:product.packaging,sequence:0
+msgid "Gives the sequence order when displaying a list of packaging."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de paquetes."
+
+#. module: product
+#: field:product.pricelist.item,price_round:0
+msgid "Price Rounding"
+msgstr "Redondeo precio"
+
+#. module: product
+#: field:product.pricelist.item,price_max_margin:0
+msgid "Max. Price Margin"
+msgstr "Máx. margen de precio"
+
+#. module: product
+#: help:product.supplierinfo,product_name:0
+msgid ""
+"This supplier's product name will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
+msgstr ""
+"Este nombre de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el nombre interno."
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: product
+#: field:product.template,rental:0
+msgid "Can be Rent"
+msgstr "Puede ser alquilado"
+
+#. module: product
+#: model:product.price.type,name:product.standard_price
+#: field:product.template,standard_price:0
+msgid "Cost Price"
+msgstr "Precio de coste"
+
+#. module: product
+#: field:product.pricelist.item,price_min_margin:0
+msgid "Min. Price Margin"
+msgstr "Mín. margen de precio"
+
+#. module: product
+#: field:product.template,weight:0
+msgid "Gross weight"
+msgstr "Peso bruto"
+
+#. module: product
+#: model:product.template,name:product.product_product_assemblysection0_product_template
+msgid "Assembly Section"
+msgstr "Sección montaje"
+
+#. module: product
+#: model:product.category,name:product.product_category_3
+msgid "Computer Stuff"
+msgstr "Complementos de ordenador"
+
+#. module: product
+#: model:product.category,name:product.product_category_8
+msgid "Phone Help"
+msgstr "Ayuda telefónica"
+
+#. module: product
+#: help:product.pricelist.item,price_round:0
+msgid ""
+"Sets the price so that it is a multiple of this value.\n"
+"Rounding is applied after the discount and before the surcharge.\n"
+"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgstr ""
+"Calcula el precio de modo que sea un múltiplo de este valor.\n"
+"El redondeo se aplica después del descuento y antes del incremento.\n"
+"Para que los precios terminen en 9,99, redondeo 10, incremento -0,01."
+
+#. module: product
+#: view:product.price_list:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr "Elemento de la tarifa"
+
+#. module: product
+#: model:product.template,name:product.product_product_21_product_template
+msgid "RAM on demand"
+msgstr "RAM bajo pedido"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales Properties"
+msgstr "Propiedades de venta"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_ton
+msgid "tonne"
+msgstr "tonelada"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Delays"
+msgstr "Plazos"
+
+#. module: product
+#: model:process.node,note:product.process_node_product0
+msgid "Creation of the product"
+msgstr "Creación del producto"
+
+#. module: product
+#: help:product.template,type:0
+msgid ""
+"Will change the way procurements are processed. Consumables are stockable "
+"products with infinite stock, or for use when you have no inventory "
+"management in the system."
+msgstr ""
+"Cambiará la forma en que las compras son procesadas. Los Consumibles son "
+"productos almacenables y con infinita capacidad de almacenamiento, o para "
+"usarse cuando no hay administración de inventarios en el sistema."
+
+#. module: product
+#: field:pricelist.partnerinfo,name:0
+#: field:product.packaging,name:0
+#: report:product.pricelist:0
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: product
+#: code:addons/product/pricelist.py:361
+#, python-format
+msgid ""
+"Could not resolve product category, you have defined cyclic categories of "
+"products!"
+msgstr ""
+"¡No se pudo resolver la categoría del producto, ha definido categorías de "
+"producto cíclicas!"
+
+#. module: product
+#: view:product.template:0
+msgid "Product Description"
+msgstr "Descripción del producto"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid " ) + "
+msgstr " ) + "
+
+#. module: product
+#: help:product.product,incoming_qty:0
+msgid ""
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Cantidades de productos que está previsto que lleguen en las ubicaciones "
+"seleccionadas o en todas las ubicaciones internas si ninguna ha sido "
+"seleccionada."
+
+#. module: product
+#: field:product.template,volume:0
+msgid "Volume"
+msgstr "Volumen"
+
+#. module: product
+#: field:product.template,loc_case:0
+msgid "Case"
+msgstr "Caja"
+
+#. module: product
+#: view:product.product:0
+msgid "Product Variant"
+msgstr "Variantes de producto"
+
+#. module: product
+#: model:product.category,name:product.product_category_shelves0
+msgid "Shelves"
+msgstr "Estantes"
+
+#. module: product
+#: code:addons/product/pricelist.py:517
+#, python-format
+msgid "Other Pricelist"
+msgstr "Otra tarifa"
+
+#. module: product
+#: model:ir.model,name:product.model_product_template
+#: field:product.pricelist.item,product_tmpl_id:0
+#: field:product.product,product_tmpl_id:0
+#: view:product.template:0
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: product
+#: field:product.template,cost_method:0
+msgid "Costing Method"
+msgstr "Método de coste"
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Palletization"
+msgstr "Paletización"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "End of Lifecycle"
+msgstr "Fin del ciclo de vida"
+
+#. module: product
+#: help:product.product,packaging:0
+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 ""
+"Indica las diferentes formas de empaquetar el mismo producto. Esto no tiene "
+"ningún impacto en la preparación de albaranes y se utiliza principalmente si "
+"utiliza el módulo EDI."
+
+#. 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 "Versiones de tarifa"
+
+#. module: product
+#: field:product.category,sequence:0
+#: field:product.packaging,sequence:0
+#: field:product.pricelist.item,sequence:0
+#: field:product.supplierinfo,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: product
+#: field:product.template,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
+
+#. module: product
+#: field:product.category,type:0
+msgid "Category Type"
+msgstr "Tipo categoría"
+
+#. module: product
+#: model:product.category,name:product.cat2
+msgid "Private"
+msgstr "Privado"
+
+#. module: product
+#: help:product.template,uos_coeff:0
+msgid ""
+"Coefficient to convert UOM to UOS\n"
+" uos = uom * coeff"
+msgstr ""
+"Coeficiente para convertir UdM a UdV\n"
+" UdV = UdM * coef"
+
+#. module: product
+#: help:product.template,volume:0
+msgid "The volume in m3."
+msgstr "El volumen en m3."
+
+#. module: product
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
+msgstr "Descuento precio"
+
+#~ msgid ""
+#~ "The minimal quantity to purchase for this supplier, expressed in the default "
+#~ "unit of measure."
+#~ msgstr ""
+#~ "La cantidad mínima a comprar a este proveedor, expresada en la unidad de "
+#~ "medida por defecto."
+
+#~ msgid ""
+#~ "Futur stock for this product according to the selected location or all "
+#~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
+#~ "Incoming."
+#~ msgstr ""
+#~ "Stock futuro para este producto según la ubicación seleccionada o todas las "
+#~ "internas si no se ha seleccionado ninguna. Calculado como: Stock real - "
+#~ "Saliente + Entrante."
+
+#~ msgid "Procure Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Product Process"
+#~ msgstr "Proceso producto"
+
+#~ msgid "Customer Price"
+#~ msgstr "Precio cliente"
+
+#~ msgid "List Price"
+#~ msgstr "Precio lista"
+
+#~ msgid "The number of layer on a palet or box"
+#~ msgstr "El número de piso en un palet o caja"
+
+#~ msgid "Prices Computations"
+#~ msgstr "Cálculos de precios"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Number of Layer"
+#~ msgstr "Número de piso"
+
+#~ msgid "Default UoM"
+#~ msgstr "UdM por defecto"
+
+#~ msgid "Create new Product"
+#~ msgstr "Crear nuevo producto"
+
+#~ msgid "In Production"
+#~ msgstr "En producción"
+
+#~ msgid "Priority"
+#~ msgstr "Prioridad"
+
+#~ msgid "Factor"
+#~ msgstr "Factor"
+
+#~ msgid "Supplier Info"
+#~ msgstr "Info. proveedor"
+
+#~ msgid "Partner Product Name"
+#~ msgstr "Nombre producto proveedor"
+
+#~ msgid ""
+#~ "This pricelist will be used, instead of the default one,                     "
+#~ "for sales to the current partner"
+#~ msgstr ""
+#~ "Esta tarifa será usada en lugar de la tarifa por defecto para las ventas a "
+#~ "la empresa actual."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "Determine if the product can be visible in the list of product within a "
+#~ "selection from a sale order line."
+#~ msgstr ""
+#~ "Indica si el producto es visible en la lista de productos dentro de una "
+#~ "selección desde una línea de un pedido de venta."
+
+#~ 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 ""
+#~ "Name of the product for this partner, will be used when printing a request "
+#~ "for quotation. Keep empty to use the internal one."
+#~ msgstr ""
+#~ "Nombre del producto para esta empresa, se utilizará al imprimir una petición "
+#~ "de presupuesto. Dejarlo vacío para utilizar el nombre interno."
+
+#~ msgid "Can be sold"
+#~ msgstr "Puede ser vendido"
+
+#~ msgid "Rate"
+#~ msgstr "Tasa"
+
+#~ msgid ""
+#~ "Used by companies that manages two unit of measure: invoicing and stock "
+#~ "management. For example, in food industries, you will manage a stock of ham "
+#~ "but invoice in Kg. Keep empty to use the default UOM."
+#~ msgstr ""
+#~ "Utilizado por las compañías que utilizan dos unidades de medida: facturación "
+#~ "y gestión de stocks. Por ejemplo, en industrias de alimentación, podría "
+#~ "gestionar un stock de unidades de jamón pero realizar la facturación en Kg. "
+#~ "Dejarlo vacío para utilizar la UdM por defecto."
+
+#~ msgid "Purchase UoM"
+#~ msgstr "UdM de compra"
+
+#~ msgid "Price list"
+#~ msgstr "Tarifa"
+
+#~ msgid ""
+#~ "Gives the different ways to package the same product. This has no impact on "
+#~ "the packing order and is mainly used if you use the EDI module."
+#~ msgstr ""
+#~ "Indica diferente maneras de empaquetar el mismo producto. No influye en el "
+#~ "albarán y es utilizado si se usa el módulo EDI."
+
+#~ msgid "Partner Product Code"
+#~ msgstr "Código producto proveedor"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "The total number of products you can put by palet or box."
+#~ msgstr "El número total de productos que puede poner por palet o caja."
+
+#~ 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 ""
+#~ "Code of the product for this partner, will be used when printing a request "
+#~ "for quotation. Keep empty to use the internal one."
+#~ msgstr ""
+#~ "Código del producto para esta empresa, se utilizará al imprimir una "
+#~ "petición de presupuesto. Dejarlo vacío para utilizar el código interno."
+
+#~ msgid "Product suppliers, with their product name, price, etc."
+#~ msgstr "Proveedores del producto, con su nombre de producto, precio, etc."
+
+#~ msgid "Price type"
+#~ msgstr "Tipo de precio"
+
+#~ msgid ""
+#~ "Coefficient to convert UOM to UOS\n"
+#~ " uom = uos * coeff"
+#~ msgstr ""
+#~ "Coeficiente para convertir UdM a UdV\n"
+#~ " udm = udv * coef"
+
+#~ msgid "Prices & Suppliers"
+#~ msgstr "Precios & Proveedores"
+
+#~ msgid "The weight of a full of products palet or box."
+#~ msgstr "El peso de un palet o caja llena de productos."
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Plazo de entrega"
+
+#~ msgid ""
+#~ "Average time to produce this product. This is only for the production order "
+#~ "and, if it is a multi-level bill of material, it's only for the level of "
+#~ "this product. Different delays will be summed for all levels and purchase "
+#~ "orders."
+#~ msgstr ""
+#~ "Tiempo promedio para producir este producto. Sólo se utiliza para la orden "
+#~ "de producción y, si es contiene una lista de materiales multi-nivel, sólo "
+#~ "para el nivel de este producto. Diferentes plazos serán sumados para todos "
+#~ "los niveles y pedidos de compra."
+
+#~ msgid ""
+#~ "Delay in days between the confirmation of the purchase order and the "
+#~ "reception of the products in your warehouse. Used by the scheduler for "
+#~ "automatic computation of the purchase order planning."
+#~ msgstr ""
+#~ "Plazo en días entre la confirmación de la orden de compra y la recepción de "
+#~ "los productos en su almacén. Utilizado por el planificador para el cálculo "
+#~ "automático de la orden de compra."
+
+#~ msgid ""
+#~ "Default Unit of Measure used for purchase orders. It must in the same "
+#~ "category than the default unit of measure."
+#~ msgstr ""
+#~ "Unidad de medida por defecto utilizada en las órdenes de compra. Debe "
+#~ "estar en la misma categoría que la unidad de medida por defecto."
+
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
+#~ msgid "KGM"
+#~ msgstr "Kg."
+
+#~ msgid "Suppliers of Product"
+#~ msgstr "Proveedores del producto"
+
+#~ msgid "Rentable Product"
+#~ msgstr "Producto alquilable"
+
+#~ msgid ""
+#~ "The cost of the product for accounting stock valuation. It can serves as a "
+#~ "base price for supplier price."
+#~ msgstr ""
+#~ "El coste del producto para la valorización contable del inventario. Puede "
+#~ "servir como precio base para el precio de proveedor."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You can see the list of suppliers for that product."
+#~ msgstr "Puede ver la lista de proveedores de dicho producto."
+
+#~ msgid ""
+#~ "Unit of Measure of a category can be converted between each others in the "
+#~ "same category."
+#~ msgstr ""
+#~ "La unidad de medida de una categoría puede ser convertida a otras de la "
+#~ "misma categoría."
+
+#~ msgid ""
+#~ "The coefficient for the formula:\n"
+#~ "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
+#~ msgstr ""
+#~ "El coeficiente para la fórmula:\n"
+#~ "1 (unidad base) = coef. (esta unidad). Ratio = 1 / Factor."
+
+#~ msgid ""
+#~ "Will change the way procurements are processed. Consumables are stockable "
+#~ "products with infinite stock, or for use when you have no stock management "
+#~ "in the system."
+#~ msgstr ""
+#~ "Modifica la forma en que se procesan los abastecimientos. Consumibles son "
+#~ "productos almacenables con stock infinito, o puede utilizarlos cuando no "
+#~ "gestione las existencias en el sistema."
+
+#~ msgid ""
+#~ "This is the average time between the confirmation of the customer order and "
+#~ "the delivery of the finished products. It's the time you promise to your "
+#~ "customers."
+#~ msgstr ""
+#~ "Este es el tiempo promedio entre la confirmación del pedido del cliente y la "
+#~ "entrega de los productos acabados. Es el tiempo que promete a sus clientes."
+
+#~ msgid ""
+#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
+#~ "that can not be split."
+#~ msgstr ""
+#~ "La cantidad calculada será un múltiplo de este valor. Use 1.0 para los "
+#~ "productos que no se puedan dividir."
+
+#~ msgid ""
+#~ "The coefficient for the formula:\n"
+#~ "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
+#~ msgstr ""
+#~ "El coeficiente para la fórmula:\n"
+#~ "coef. (unidad base) = 1 (esta unidad). Factor = 1 / Ratio."
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index e6f877bfbce..bfee0f38548 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Ettevaatust !"
@@ -257,7 +257,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Tooted: "
@@ -529,7 +529,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1252,7 +1252,7 @@ msgid "Pallet Dimension"
 msgstr "Kaubaaluse mõõdud"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1641,7 +1641,7 @@ msgstr "Tooted kategooria järgi"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Toodete kategooriad"
 
 #. module: product
@@ -1722,7 +1722,7 @@ msgstr ""
 "Baashind arvutamaks kliendihinda. Vahetevahel kutsutakse kui kataloogihind."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partneri sektsioon toote vormil"
@@ -2145,7 +2145,7 @@ msgid "Description"
 msgstr "Kirjeldus"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2192,7 +2192,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Muu hinnakiri"
@@ -2275,35 +2275,6 @@ msgstr "Maht kuupmeetrites."
 msgid "Price Discount"
 msgstr "Allahindlus"
 
-#~ msgid "Rentable product"
-#~ msgstr "Renditav toode"
-
-#~ msgid "Childs Categories"
-#~ msgstr "Alamkategooriad"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Selle hinakirja versiooni kehtivuse lõpukuupäev."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Selle hinnakirja versiooni kehtimahakkamise kuupäev."
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Sul ei saa olla 2 hinnakirja versiooni mis kattuvad!"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Toote tarnija"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Reegel aktiveerub ainult siis, kui partner ostab/müüb rohkem kui see kogus."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Sa näed tarnijate nimekirja selle tootejaoks."
-
-#~ msgid "Packagings"
-#~ msgstr "Pakkimised"
-
 #~ msgid "Product Process"
 #~ msgstr "Toote protsess"
 
@@ -2313,35 +2284,12 @@ msgstr "Allahindlus"
 #~ msgstr ""
 #~ "Minimaalne ostukogus sellele tarnijale, väljendatuna vaikimisi mõõtühikuga."
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "See on keskmine aeg kliendi tellimuse kinnitamise ja valmis toote "
-#~ "kättetoimetamise vahel. See on aeg, mida sa lubad oma klientidele."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Hinna arvutamise viis sellele reeglile."
-
 #~ msgid "Number of Layer"
 #~ msgstr "Kihtide arv"
 
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "Kihtide arv kaubaalusel või kastis"
 
-#~ msgid "Palette Dimension"
-#~ msgstr "Kaubaaluse mõõdud"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Hinna maks marginaal"
-
-#~ msgid "Palet"
-#~ msgstr "Kaubaalus"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Hinna min marginaal"
-
 #~ msgid "The total number of products you can put by palet or box."
 #~ msgstr "Toodete koguarv, mis mahub kaubaalusele või kasti."
 
@@ -2351,10 +2299,6 @@ msgstr "Allahindlus"
 #~ msgid "KGM"
 #~ msgstr "Kg"
 
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "Sama kategooria mõõtühikut saab vastastikku ümber arvestada."
-
 #~ msgid ""
 #~ "Name of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
@@ -2365,20 +2309,6 @@ msgstr "Allahindlus"
 #~ msgid "Rate"
 #~ msgstr "Määr"
 
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Koefitsent valemile:\n"
-#~ "1 (baasühik) = koef. (see ühik)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Koefitsent valemile:\n"
-#~ "koef (baasühik) = 1 (see ühik)"
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2388,13 +2318,6 @@ msgstr "Allahindlus"
 #~ "asukohtadest, kui ühtegi pole valitud. Arvututuskäik: Tegelik laoseis - "
 #~ "Väljuvad + Sisenevad."
 
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Muudab hankimiste töötlemise viisi. Tarvikud on ladustatavad tooted lõputu "
-#~ "laoseisuga või ilma laohalduseta süsteemis."
-
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2402,9 +2325,6 @@ msgstr "Allahindlus"
 #~ "Määra, kas toode on nähtav toodete nimekirjas müügikorralduse reale "
 #~ "valimiseks."
 
-#~ msgid "Paletization"
-#~ msgstr "Kaubaalus"
-
 #~ msgid ""
 #~ "Average time to produce this product. This is only for the production order "
 #~ "and, if it is a multi-level bill of material, it's only for the level of "
@@ -2416,13 +2336,6 @@ msgstr "Allahindlus"
 #~ "tasemele. Erinevad viivitused summeeritakse kõigile tasemetele ja "
 #~ "ostutellimustele."
 
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Toote maksumus ramatupidamise laoseisu väärtustamiseks. See võib teenida "
-#~ "baashinda tarnija hinnale."
-
 #~ msgid ""
 #~ "Used by companies that manages two unit of measure: invoicing and stock "
 #~ "management. For example, in food industries, you will manage a stock of ham "
@@ -2432,30 +2345,6 @@ msgstr "Allahindlus"
 #~ "laohaldus. Näiteks toiduainetööstuses haldad sa singivarusid aga arveldad "
 #~ "kilodes. Hoia tühjana, et kasutada vaikimisi möötühikut."
 
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Määrab hinna nii, et see on selle väärtuse kordne.\n"
-#~ "Ümardmine rakendatakse peale allahindlust ja enne lisatasu.\n"
-#~ "Et saada hindu, mis lõppevad 9.99, määra ümarduseks 10, lisatasu -0,01"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Loo lattu': Vajadusel võta laost või oota taasvarustamist. 'Loo "
-#~ "tellimusele': Vajadusel osta või tooda hanketellimusele."
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Arvutatud kogus on selle väärtuse kordne. Kasuta 1.0 toodetel, mida ei saa "
-#~ "poolitada."
-
 #~ msgid ""
 #~ "Set a category of product if this rule only apply to products of a category "
 #~ "and his childs. Keep empty for all products"
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 3fa7732594d..7f6cf0c02f6 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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -107,8 +107,8 @@ msgstr "Finkoa"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1233,7 +1233,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1621,7 +1621,7 @@ msgstr "Produktuak Kategoriaka"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Produktuen Kategoriak"
 
 #. module: product
@@ -1701,7 +1701,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2119,7 +2119,7 @@ msgid "Description"
 msgstr "Deskribapena"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2164,7 +2164,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 4fe9d37fa1e..356403ad34f 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -25,7 +25,7 @@ msgstr "DDR 512MB PC400"
 #. module: product
 #: field:product.packaging,rows:0
 msgid "Number of Layers"
-msgstr ""
+msgstr "Kerrosten määrä"
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -33,6 +33,8 @@ msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
 msgstr ""
+"Virhe ! Et voi määritellä päähintalistaa toiseksi hintalistaksi "
+"hintalistaluettelossa!"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -56,7 +58,7 @@ msgstr "Emolevy ASUStek A7V8X-X"
 #. module: product
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
-msgstr ""
+msgstr "Päätoimittajan minimihankintamäärä"
 
 #. module: product
 #: model:product.uom,name:product.uom_day
@@ -89,6 +91,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
+"Tätä hintalistaa käytetään oletusarvon sijasta myyntiin nykyiselle "
+"yhteistyökumppanille"
 
 #. module: product
 #: constraint:product.supplierinfo:0
@@ -102,7 +106,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Toimittajan määrä"
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -111,8 +115,8 @@ msgstr "Kiinteä"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Varoitus!"
@@ -154,6 +158,8 @@ 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 ""
+"Minimimäärä joka liipaisee tämän säännön, määriteltynä toimittajan "
+"toimitusyksikössä (jos on) tai tuotteen oletusmittayksikössä."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -223,7 +229,7 @@ msgstr "Muut"
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "Työntekijä"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -231,6 +237,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"määritteleen onko tuote näkyvissä tuotelistassa josta valitaan "
+"myyntitilausrivit."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -257,10 +265,10 @@ msgstr "Tuotteen tyyppi"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  esim. 1 * (tämä mittayksikkö) = kerroin * (viitemittayksikkö)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Tuotteet: "
@@ -293,7 +301,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "Toimittajan nimi, hinta, tuotekoodi, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -308,7 +316,7 @@ msgstr "EAN13"
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "Päätoimittaja"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -336,7 +344,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "Puu 2 mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
@@ -346,7 +354,7 @@ msgstr "Määrä 1"
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "Pakkausten määrä kerroksittain"
 
 #. module: product
 #: field:product.packaging,qty:0
@@ -363,7 +371,7 @@ msgstr "Tila"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "Valitse nykyisen tuotteen kategoria"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -373,7 +381,7 @@ msgstr "Lähtevät"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "viitemittayksikkö tälle kategorialle"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
@@ -399,7 +407,7 @@ msgstr "Tuotevastaava"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "Toimittajan tuotenimi"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
@@ -418,7 +426,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "Tuotteen hintojen haku"
 
 #. module: product
 #: view:product.product:0
@@ -494,7 +502,7 @@ msgstr "Koodit"
 msgid ""
 "Choose here the Unit of Measure in which the prices and quantities are "
 "expressed below."
-msgstr ""
+msgstr "Valitse mittayksikkö jossa hinnat ja määrät näytetään alapuolella."
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -527,6 +535,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Jos aktiivinen kenttä asetetaan tilaan epätosi (false), se mahdollistaa "
+"tuotteen piilottamisen poistamatta sitä."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -534,12 +544,14 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
 "Please create or activate one."
 msgstr ""
+"Ei aktiivista versiota valitusta hintalistasta !\n"
+"Ole hyvä ja luo tai aktivoi jokin."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -572,6 +584,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"1 tai useampia toimittajia voidaan liittää tuotteeseen. Kaikki tiedot "
+"näkyvät tuotelomakkeella."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -579,6 +593,8 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Määräkonversioita voi tapahtua automaattisesti saman kategorian "
+"määräyksiköiden välillä, suhdelukujen mukaisesti."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -598,12 +614,12 @@ msgstr "Näkymä"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr ""
+msgstr "Tuote mallipohjat"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Ravintolakulut"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -655,7 +671,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "100 cm hyllykkö"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -665,7 +681,7 @@ msgstr "Toimittaja"
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr ""
+msgstr "Sivupaneeli"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -700,7 +716,7 @@ msgstr "Toimittajat"
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "Ostettava"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -709,6 +725,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"Minimimiäärä joka hankintaan tältä toimittajalla, ilmaistuna toimittajan "
+"mittayksikössä (jos on) tai tuotteen oletusmittayksikössä."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -721,6 +739,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 ""
+"Hinta koskee toimittajan mittayksikköä (jos on) tai tuotteen "
+"oletusmittayksikköä."
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -735,7 +755,7 @@ msgstr "Asiakkaan läpimenoaika"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "Tuotteen toimittaja"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -816,7 +836,7 @@ msgstr "Hankinta ja paikat"
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Keittiönsuunnittelu projekti"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
@@ -831,12 +851,12 @@ msgstr "Kehityksessä"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "200 cm hylly"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Suhde ja tarkkuus"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
@@ -880,7 +900,7 @@ msgstr "Tuotteiden kategoriat"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  esim. 1* (viitemittayksikkö) = kerroin * (tämä mittayksikkö)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -906,6 +926,8 @@ msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
 msgstr ""
+"Tuotekustannukset varastonarvostusta varten. On perushinta "
+"toimittajahinnalle."
 
 #. module: product
 #: view:product.price.type:0
@@ -978,7 +1000,7 @@ msgstr "Sarja"
 #. module: product
 #: view:product.price_list:0
 msgid "Calculate Product Price per unit base on pricelist version."
-msgstr ""
+msgstr "Laske tuotehinta yksiköittäin hintalistaversion mukaan."
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1029,7 +1051,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Suurempi kuin viitemittayksikkö"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
@@ -1039,12 +1061,12 @@ msgstr "Tuotteet ja hinnastot"
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "Myytäväksi"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "Markkinoitavat palvelut"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1078,7 +1100,7 @@ msgstr "Nimi"
 #. module: product
 #: view:product.product:0
 msgid "Stockable"
-msgstr ""
+msgstr "Varastoitava"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
@@ -1130,7 +1152,7 @@ msgstr ""
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä tuotekategorialistaa."
 
 #. module: product
 #: field:product.uom,factor:0
@@ -1218,7 +1240,7 @@ msgstr ""
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "Päätoimittaja jolla on korkein prioriteetti toimittajalistalla."
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -1243,7 +1265,7 @@ msgstr "Tuotteet"
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Pkaetin tai lavan kerrosten määrä."
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -1257,7 +1279,7 @@ msgid "Pallet Dimension"
 msgstr "Lavan koko"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopio)"
@@ -1274,6 +1296,8 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Tämä on keskimääräinen viive päivinä tilausvahvistuksen ja toimituksen "
+"välillä. Se on aika jonka lupaat asiakkaille."
 
 #. module: product
 #: view:product.product:0
@@ -1311,6 +1335,8 @@ msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Tätä toimittajan tuotekoodia käytetään tarjouspyynnöissä. Jos jätetään "
+"tyhjäksi niin käytetään sisäisä koodia."
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -1329,6 +1355,9 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Antaa järjestyksen missä hinnaston rivit tarkistetaan. Arviointi antaa "
+"korkeimman prioriteetin pienimmälle järjestysnumerolle ja lopettaa kun "
+"sopiva nimike löytyy."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1364,7 +1393,7 @@ msgstr "Hylly"
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Hankinnan mittayksikkö"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1378,11 +1407,14 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Luettelo kaikista tuotteista kategorioittain. Voit valita kategoriaa "
+"saadaksesi listan kaikista kategoriaan liitetyistä tuotteista tai alatason "
+"kategorioista."
 
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Ryhmittele.."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -1396,6 +1428,8 @@ msgid ""
 "Conversion from Product UoM m to Default UoM PCE is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Muunnos tuotteen mittayksikösä m oletusmittayksikköön kpl ei ole mahdollinen "
+"koska ne kuuluvat eri kategorioihin!."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1410,6 +1444,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"keskimääräinen viive tuotteen valmistamiseksi päivinä. Tämä on vain "
+"tuotantotilausta varten ja jos osaluettelo on monitasoinen, se koskee vain "
+"ensimmäistä tasoa. Eri läpimenoajat summataan eri tasoilta ja "
+"hankintatilauksilta."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -1431,6 +1469,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Jos aktiivinen kenttä asetetaan arvoon epätosi (false), voit piilottaa "
+"hinnaston poistamatta sitä."
 
 #. module: product
 #: field:product.product,qty_available:0
@@ -1463,7 +1503,7 @@ msgstr "Pyöristystarkkuus"
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Mittayksikön ominaisuudet"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
@@ -1488,7 +1528,7 @@ msgstr "Tyhjän pakkauksen paino"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Pienempi kuin viitemittayksikkö"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1507,7 +1547,7 @@ msgstr "Variaation kate"
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Muuntokerroin mittayksikölle ei voi olla 0 !"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1536,6 +1576,9 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Kuinka monta kertaa pienempi tämä mittayksikkö on kategorian "
+"viitemittayksikköön nähden.\n"
+"1 * (viitemittayksikkö) = kerroin * (tämä yksikkö"
 
 #. module: product
 #: help:product.template,uom_id:0
@@ -1571,12 +1614,12 @@ msgstr "Julkinen hinnasto"
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Markkinoitavat tuotteet"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Toimittajan tuotekoodi"
 
 #. module: product
 #: view:product.product:0
@@ -1631,7 +1674,7 @@ msgstr "Valmista tilaukseen"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Tuotteiden kokonaismäärä jotka voit laittaa lavalle tai laatikkoon."
 
 #. module: product
 #: field:product.product,variants:0
@@ -1647,7 +1690,7 @@ msgstr "Tuotteet kategorioittain"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Tuotteiden kategoriat"
 
 #. module: product
@@ -1658,7 +1701,7 @@ msgstr "Munnoskerroin"
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Asettaa tuotteen toimittajan prioriteetin"
 
 #. module: product
 #: field:product.template,uom_id:0
@@ -1727,7 +1770,7 @@ msgid ""
 msgstr "Perushinta josta asiakkaan hinta lasketaan."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Tuotelomakkeen kumppaniosio"
@@ -1753,11 +1796,13 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"Oletusmittayksikkö jota käytetään ostotilauksilla. Täytyy olla samaa "
+"kategoriaa kuin oletusmittayksikkö."
 
 #. 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 "Tuote on määritelty työntö/imu virtausten esimerkiksi"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1789,12 +1834,12 @@ msgstr "Muut Tuotteet"
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "Tuntomerkit"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "Voidaan myydä"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -1823,6 +1868,8 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"Tuleva varasto tälle tuotteelle valituissa paikoissa (tai kaikki sisäiset "
+"jos mitään ei valittu). Lasketaan: todellinen varasto - lähtevät + saapuvat."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -1844,7 +1891,7 @@ msgstr "* ( 1 + "
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "Koko pakkauksen, lavan tai paketin kokonaispaino."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
@@ -1859,7 +1906,7 @@ msgstr "Työntekijä"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "100 cm hylly"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
@@ -1875,7 +1922,7 @@ msgstr "Hinnaston Nimi"
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Toimitusviive"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1883,6 +1930,8 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Poistamalla valinnan kentästä voit poistaa käytöstä mittayksikön poistamatta "
+"sitä kokonaan."
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -1900,6 +1949,8 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Luo ja hallitse pakkausmittoja ja tyyppejä joita haluat ylläpitää "
+"järjestelmässäsi"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
@@ -1923,7 +1974,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 "Tämä on määrä joka muutetaan oletusmittayksikköön."
 
 #. module: product
 #: field:product.packaging,ul:0
@@ -1958,12 +2009,12 @@ msgstr "Hiiri"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Mittayksikön tyyppi"
 
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "Tätä käytetään tehtävän vastuuhenkilönä"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -1971,6 +2022,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 ""
+"Laskettu määrä on tämän arvon kertoma. Käytä 1.0 mittayksikölle jota ei voi "
+"edelleen jakaa, kuten esim. kpl."
 
 #. module: product
 #: view:product.product:0
@@ -2007,7 +2060,7 @@ msgstr "Virhe! Et voi luoda itseään toistavasti rinnastettuja jäseniä."
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Hotellikulut"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2015,6 +2068,9 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Kuinka monta kertaa suurempi tämä mittayksikkö on kuin kategorian "
+"viitemittayksikkö.\n"
+"1 * (tämä mittayksikkö) = kerroin * (viitemittayksikkö)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
@@ -2024,7 +2080,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä pakkausten listausta."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -2042,6 +2098,8 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Tämän toimittajan tuotenimeä käytetään tarjouspyynnössä. Jätä tyhjäksi jos "
+"käytetään sisäistä nimeä."
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -2051,7 +2109,7 @@ msgstr "Vaihteleva"
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "Voidaan vuokrata"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -2072,7 +2130,7 @@ msgstr "Bruttopaino"
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Kokoonpano osa"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
@@ -2130,7 +2188,7 @@ msgstr "Viiveet"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "Tuotteen luominen"
 
 #. module: product
 #: help:product.template,type:0
@@ -2151,12 +2209,14 @@ msgid "Description"
 msgstr "Kuvaus"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
 "products!"
 msgstr ""
+"Ei voitu ratkaista tuotekategoriaa, olet määritellyt syklisiä kategorioita "
+"tuotteille!"
 
 #. module: product
 #: view:product.template:0
@@ -2195,10 +2255,10 @@ msgstr "Tuotevariaatio"
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Hyllyt"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Muu hinnasto"
@@ -2233,6 +2293,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 ""
+"Antaa eri tapoja pakata sama tuote. Ei vaikuta keräilyjärjestykseen ja "
+"käytetään lähinnä EDI moduulissa."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2257,7 +2319,7 @@ msgstr "Myyntihinta"
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Kategorian tyyppi"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -2270,6 +2332,9 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Tehokkuuskerroin (Coefficent) muutettaessa valmistusmittayksikköä (UOM) "
+"myyntimittayksiköön (UOS)\n"
+" UOS = UOM * tehokkuuskerroin"
 
 #. module: product
 #: help:product.template,volume:0
@@ -2281,12 +2346,6 @@ msgstr "Tilavuus kuutiometreinä."
 msgid "Price Discount"
 msgstr "Hinnanalennus"
 
-#~ msgid "Supplier of Product"
-#~ msgstr "Tuotteen toimittaja"
-
-#~ msgid "Rentable product"
-#~ msgstr "Vuokrattava tuote"
-
 #~ msgid "Priority"
 #~ msgstr "Prioriteetti"
 
@@ -2302,9 +2361,6 @@ msgstr "Hinnanalennus"
 #~ msgid "Price list"
 #~ msgstr "Hinnasto"
 
-#~ msgid "Packagings"
-#~ msgstr "Pakkaukset"
-
 #~ msgid "Cancel"
 #~ msgstr "Peruuta"
 
@@ -2320,14 +2376,6 @@ msgstr "Hinnanalennus"
 #~ msgid "Partner Product Code"
 #~ msgstr "Kumppanin tuotekoodi"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Keskimääräinen aika tilausvahvistuksen ja toimituksen välillä. Tämä on se "
-#~ "aika jonka voit luvata asiakkaille."
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2349,77 +2397,27 @@ msgstr "Hinnanalennus"
 #~ msgid "Customer Price"
 #~ msgstr "Asiakashinta"
 
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Hinnan laskentatapa tälle säännölle"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Muuttaa tapaa jolla hankinnat käsitellään. Kulutustavarat ovat varastoitavia "
-#~ "tuotteita joilla on loppumaton varasto, tai ne ovat järjestelmässä ilman "
-#~ "varastonhallintaa."
-
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "Kerrosten lukumäärä lavalla tai laatikossa"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Alakategoriat"
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Hinnaston voimassaolon loppumispäivä."
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Lavan mitat"
-
 #~ msgid "Prices Computations"
 #~ msgstr "Hintojen laskenta"
 
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Asettaa hinnan siten että se on tämän arvon kerrannainen.\n"
-#~ "Pyöristys tehdään alennuksen jälkeen ja ennen hinnanlisiä.\n"
-#~ "Saadaksesi hintoja jotka päättyvät 9.99, aseta pyöristys 10 ja hinnanlisä -"
-#~ "0.01"
-
 #~ msgid "Number of Layer"
 #~ msgstr "Kerroksien määrä"
 
 #~ msgid "Delivery Delay"
 #~ msgstr "Toimitusviive"
 
-#~ msgid "Price Max. Margin"
-#~ msgstr "Hinta maksimikate"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Hinta minimikate"
-
-#~ msgid "Palet"
-#~ msgstr "Lava"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "Kumppanin tuotteen nimi"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Näkyvissä on lista tuotteen toimittajista."
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Virhe: Myyntiyksikkö täytyy olla eri kategoriassa kuin mittayksikkö"
 
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Mittayksiköt jotka ovat samassa kategoriassa voidaan muuntaa toisikseen."
-
 #~ msgid ""
 #~ "Coefficient to convert UOM to UOS\n"
 #~ " uom = uos * coeff"
@@ -2427,13 +2425,6 @@ msgstr "Hinnanalennus"
 #~ "Kerroin jolla mittayksikkö muunnetaan myyntiyksiköksi\n"
 #~ " mittayksikkö = myyntiyksikkö * kerroin"
 
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Tuotteen kustannus varaston kirjanpidollista arvonmääritystä varten. Voi "
-#~ "toimia perustana toimittajahinnalle."
-
 #~ msgid ""
 #~ "Gives the different ways to package the same product. This has no impact on "
 #~ "the packing order and is mainly used if you use the EDI module."
@@ -2450,15 +2441,6 @@ msgstr "Hinnanalennus"
 #~ msgid "Rate"
 #~ msgstr "Määrä"
 
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "\"Valmista varastoon\": Ota varastosta tarpeen vaatiessa tai odota kunnes "
-#~ "saatavilla. \"Valmista tilaukseen\": Osta tai tuota tarpeen vaatiessa "
-#~ "hankintapyynnöllä."
-
 #~ msgid ""
 #~ "Used by companies that manages two unit of measure: invoicing and stock "
 #~ "management. For example, in food industries, you will manage a stock of ham "
@@ -2476,26 +2458,12 @@ msgstr "Hinnanalennus"
 #~ "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ä!"
 
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d yksikköä"
-
 #~ msgid "Product suppliers, with their product name, price, etc."
 #~ msgstr "Tuotteiden toimittajat, niiden nimet tuotteille, hinnat jne."
 
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Laskettava määrä on oltava tämän arvon moninkerroin. Käytä 1.0 jos tuotetta "
-#~ "ei voida pilkkoa."
-
 #~ msgid "The weight of a full of products palet or box."
 #~ msgstr "Tuotteilla täytetyn lavan tai laatikon paino."
 
-#~ msgid "Paletization"
-#~ msgstr "Lavoitus"
-
 #~ msgid ""
 #~ "Set a category of product if this rule only apply to products of a category "
 #~ "and his childs. Keep empty for all products"
@@ -2549,10 +2517,6 @@ msgstr "Hinnanalennus"
 #~ "Viive päivinä ostotilauksen vahvistuksen ja tuotteiden vastaanoton välillä. "
 #~ "Tätä käytetään ostotilausten aikataulujen automaattiseen laskentaan."
 
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d yksikköä"
-
 #~ msgid ""
 #~ "Code of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
@@ -2567,9 +2531,6 @@ msgstr "Hinnanalennus"
 #~ "Tuotteen nimi tälle kumppanille, käytetään tarjouspyyntöä tulostettaessa. "
 #~ "Jätä tyhjäksi käyttääksesi oletusta."
 
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Hinnaston voimassaolon alkamispäivä."
-
 #~ msgid "Factor"
 #~ msgstr "Kerroin"
 
@@ -2585,11 +2546,6 @@ msgstr "Hinnanalennus"
 #~ msgid "Suppliers of Product"
 #~ msgstr "Tuotteen toimittajat"
 
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Sääntöä sovelletaan vain jos kummani ostaa/myy enemmän kuin tämän määrän."
-
 #~ msgid ""
 #~ "Unit of Measure of a category can be converted between each others in the "
 #~ "same category."
@@ -2599,20 +2555,6 @@ msgstr "Hinnanalennus"
 #~ msgid "Purchase UoM"
 #~ msgstr "Ostojen mittayksikkö"
 
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Vakio kaavaan:\n"
-#~ "1 (perusyksikkö) = vakio (tämä yksikkö)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Vakio kaavaan:\n"
-#~ "vakio (perusyksikkö) = 1 (tämä yksikkö)"
-
 #~ msgid ""
 #~ "The coefficient for the formula:\n"
 #~ "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index ae563e7bba3..23ed20bcd46 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-18 16:45+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: view:product.product:0
@@ -149,8 +149,8 @@ msgstr "Fixé"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -212,9 +212,9 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Purchase will trigger purchase orders when requested."
 msgstr ""
-"La production générera un ordre de production ou une tâche, en fonction du "
-"type de produit. Un achat déclenchera un ordre d'achat lorsque ce sera "
-"nécessaire"
+"\"Produire\" générera un ordre de production ou une tâche, en fonction du "
+"type de produit. \"Acheter\" déclenchera un ordre d'achat lorsque ce sera "
+"nécessaire."
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -304,7 +304,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  par exemple : 1 x (cette unité) = ratio x (unité de référence)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produits: "
@@ -330,10 +330,9 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
-"'Fabrication sur stock' : quand il y a une demande, on prend du stock ou on "
-"attend jusqu'au prochain réapprovisionnement. 'Fabrication à la commande' : "
-"quand il y a une demande, on achète ou on fabrique en lien avec cette "
-"demande."
+"\"Production sur stock\" : quand il y a une demande, on prend du stock ou on "
+"attend jusqu'au prochain réapprovisionnement. \"Production à la demande\" : "
+"quand il y a une demande, on achète ou on fabrique selon cette demande."
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
@@ -593,7 +592,7 @@ msgid "Metal Cleats"
 msgstr "Taquets en métal"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -886,7 +885,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "Approvisionnement & Emplacements"
+msgstr "Approvisionnement & emplacements"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
@@ -1268,7 +1267,7 @@ msgstr "Unité de mesure"
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr "Gestion des besoins"
+msgstr "Méthode d'approvisionnement"
 
 #. module: product
 #: report:product.pricelist:0
@@ -1309,8 +1308,8 @@ msgstr ""
 "\n"
 "    Les produits supportent les variantes, différentes méthodes de prix, des "
 "informations\n"
-"    à propos des fournisseurs, les méthodes d'approvisionnement (en stock/à "
-"la commande), différentes unités de mesure,\n"
+"    à propos des fournisseurs, les méthodes d'approvisionnement (production "
+"sur stock/à la demande), différentes unités de mesure,\n"
 "    différents emballages et propriétés.\n"
 "\n"
 "    Les listes de prix supportent :\n"
@@ -1348,7 +1347,7 @@ msgstr ""
 #: model:product.category,name:product.product_category_services
 #: view:product.product:0
 msgid "Services"
-msgstr "Aire de repos"
+msgstr "Services"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1381,7 +1380,7 @@ msgid "Pallet Dimension"
 msgstr "Dimension d'une Palette"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
@@ -1475,7 +1474,7 @@ msgstr "Le poids brut en Kg."
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr "Besoin"
+msgstr "Approvisionnement"
 
 #. module: product
 #: field:product.template,loc_rack:0
@@ -1756,7 +1755,7 @@ msgstr "Produire"
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr "Fabrication à la commande"
+msgstr "Production à la demande"
 
 #. module: product
 #: help:product.packaging,qty:0
@@ -1779,7 +1778,7 @@ msgstr "Produits par catégorie"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Catégories de produits"
 
 #. module: product
@@ -1855,7 +1854,7 @@ msgstr ""
 "Prix de base pour le calcul du prix client. Parfois appelé prix catalogue."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Section partenaire dans le formulaire produit"
@@ -1924,7 +1923,7 @@ msgstr "Caractéristiques"
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr "peut être vendu"
+msgstr "Peut être vendu"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -2196,7 +2195,7 @@ msgstr "Variable"
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr "peut être loué"
+msgstr "Peut être loué"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -2284,9 +2283,9 @@ msgid ""
 "products with infinite stock, or for use when you have no inventory "
 "management in the system."
 msgstr ""
-"Permet de changer la façon dont les besoins sont gérés. Les consommables "
-"sont des produits physiques avec un stock infini, pour lesquels vous n'avez "
-"pas de gestion de stock dans le système."
+"Permet de changer la façon dont les approvisionnements sont gérés. Les "
+"consommables sont des produits physiques avec un stock infini, pour lesquels "
+"vous n'avez pas de gestion de stock dans le système."
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2299,7 +2298,7 @@ msgid "Description"
 msgstr "Description"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2348,7 +2347,7 @@ msgid "Shelves"
 msgstr "Étagères"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Autre liste de prix"
@@ -2436,112 +2435,6 @@ msgstr "Le volume en m³"
 msgid "Price Discount"
 msgstr "Réduction sur le prix"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Catégorie enfant"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Marge minimale sur le prix"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimension de la palette"
-
-#~ msgid "Palet"
-#~ msgstr "Palette"
-
-#~ msgid "Paletization"
-#~ msgstr "Mise sur palette"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Marge maximale sur le prix"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Le coefficient pour la formule:\n"
-#~ "coef (unité de base) = 1 (cette unité)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Le coefficient de la formule:\n"
-#~ "1 (unité de base) = coef (cette unité)"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Livraison sur stock': au besoin, livre à partir du stock ou attend un "
-#~ "approvisionnement. 'Fabrication à la commande': au besoin, achète ou produit "
-#~ "d'après la commande"
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Mode de calcul du prix pour cette règle"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Date de départ pour la validité de cette version de la liste de prix"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Date de fin de validité pour cette version de la liste de prix"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Fournisseur du produit"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "La règle n'est applicable que lorsque le partenaire achète/vend une quantité "
-#~ "plus élevée"
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Vous pouvez voir la liste des fournisseurs pour ce produit"
-
-#~ msgid "Packagings"
-#~ msgstr "Colisage"
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "L'unité de mesure de la même catégorie peut être répartie entre chacune "
-#~ "d'entre elles"
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "La quantité calculée sera un multiple de cette valeur. Utilisez 1.0 pour les "
-#~ "produits qui ne peuvent pas être séparés"
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "Unité %d"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unités"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Le coût du produit utilisé pour la valorisation du stock dans la "
-#~ "comptabilité. Il peut servir comme prix de base pour le calcul du prix "
-#~ "fournisseur."
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Vous en pouvez pas avoir 2 listes de prix avec des dates qui se chevauchent"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Change la façon dont les approvisionnements sont traités. Les consommables "
-#~ "sont des produits stockables qui ont un stock infini, ou dont e stock n'est "
-#~ "pas suivi dans le système"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2690,9 +2583,6 @@ msgstr "Réduction sur le prix"
 #~ "catégorie de produits et ses fils. Laisser vide si elle s'applique à tous "
 #~ "les produits"
 
-#~ msgid "Rentable product"
-#~ msgstr "Peut être loué"
-
 #~ msgid "You can see the list of suppliers for that product."
 #~ msgstr "Vous pouvez voir la liste des fournisseurs pour ce produit."
 
@@ -2730,14 +2620,6 @@ msgstr "Réduction sur le prix"
 #~ "La quantité calculée sera un multiple de cette valeur. Utilisez 1.0 pour les "
 #~ "produits qui ne peuvent pas être séparés."
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Temps moyen entre la confirmation de la commande client et la livraison des "
-#~ "produits finis . C'est le délai que vous promettez à vos clients."
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2760,16 +2642,6 @@ msgstr "Réduction sur le prix"
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Définit le prix comme un multiple de cette valeur.\n"
-#~ "Le prix est arrondi après la remise et avant la surcharge.\n"
-#~ "Pour avoir des prix de la forme 9.99, définir l'arrondi à 10, la surcharge à "
-#~ "-0.01"
-
 #~ msgid ""
 #~ "Delay in days between the confirmation of the purchase order and the "
 #~ "reception of the products in your warehouse. Used by the scheduler for "
@@ -2817,127 +2689,3 @@ msgstr "Réduction sur le prix"
 
 #~ msgid "Rentable Product"
 #~ msgstr "Peut être loué"
-
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Utilisée par les entreprises qui gèrent deux unités de mesure : gestion de "
-#~ "la facturation et des inventaires. Par exemple, dans l'industrie "
-#~ "alimentaire, vous pouvez gérer un stock de jambon (unité) mais les facturer "
-#~ "au Kg. Laisser vide pour utiliser l'UdM par défaut."
-
-#~ msgid ""
-#~ "You must define a Product for everything you buy or sell. They can be raw "
-#~ "materials, stockable products, consumables or services. The Product form "
-#~ "contains a detailed information of your products related to procurement "
-#~ "logistics, sales price, product category, suppliers and so on."
-#~ msgstr ""
-#~ "Vous devez définir un produit pour chaque chose vendue ou achetée. Les "
-#~ "produits peuvent être des matières premières, des produits stockables, des "
-#~ "consommables ou des services. Le formulaire \"Produit\" contient une "
-#~ "description détaillée en terme de logistique d'approvisionnement, de prix de "
-#~ "vente, de classement de produit, de fournisseurs, etc."
-
-#~ msgid ""
-#~ "Products can be purchased and/or sold. They can be raw materials, stockable "
-#~ "products, consumables or services. The Product form contains a detailed "
-#~ "information on your  products related to procurement logistics, sales price, "
-#~ "product category, suppliers and so on."
-#~ msgstr ""
-#~ "Les produits peuvent être achetés ou vendus. Ils peuvent être des matières "
-#~ "premières, des produits stockables, des consommables ou des services. Le "
-#~ "formulaire \"Produit\" contient une description détaillée en terme de "
-#~ "logistique d'approvisionnement, de prix de vente, de classement de produit, "
-#~ "de fournisseurs, etc."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Le nom du groupe doit être unique !"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Un raccourci pour ce menu existe déjà !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "UdM du produit chez le fournisseur."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "La quantité minimum d'achat chez ce fournisseur, exprimée dans l'unité de "
-#~ "mesure par défaut."
-
-#~ msgid "Only one value can be defined for each given usage!"
-#~ msgstr ""
-#~ "Seule une valeur unique peut être définie pour une utilisation donnée!"
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr ""
-#~ "Indique la séquence d'ordre lors de l'affichage de la liste des listes de "
-#~ "prix d'un article."
-
-#~ msgid ""
-#~ "Create and manage the units of measure you want to be used in your system. "
-#~ "You can define a conversion rate to be used between the several Unit of "
-#~ "Measure within the same category."
-#~ msgstr ""
-#~ "Créez et gérez les unités de mesure à utiliser dans le système. Vous pouvez "
-#~ "définir un taux de conversion à utiliser entre plusieurs unités de mesure de "
-#~ "la même catégorie."
-
-#~ msgid ""
-#~ "A pricelist contains rules to be evaluated in order to compute the purchase "
-#~ "or sale price for all the partners assigned to a pricelist. Pricelists have "
-#~ "several versions (2010, 2011, Promotion of February 2010, etc.) and each "
-#~ "version has several rules. Example: the customer price of this category of "
-#~ "product will be based on the supplier price multiplied by 1.80."
-#~ msgstr ""
-#~ "Une liste de prix regroupe les règles à suivre pour calculer le prix "
-#~ "(d'achat ou de vente) pour tous les partenaires associés à la liste. Les "
-#~ "liste de prix ont plusieurs versions (ex. : \"2010\", \"2011\", \"Promotions "
-#~ "de février 2010\", etc...) et chaque version contient plusieurs règles. "
-#~ "Exemple : \"le prix de vente pour cette catégorie de produit est basé sur le "
-#~ "prix du fournisseur multiplié par 1,80\"."
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "Voici la liste de tous vos produits classés par catégorie. Vous pouvez "
-#~ "cliquer sur une catégorie pour obtenir la liste de tous les produits de "
-#~ "cette catégorie, ou de ses sous-catégories."
-
-#~ msgid ""
-#~ "Create and manage the units of measure categories you want to be used in "
-#~ "your system. If several units of measures are in the same category, they can "
-#~ "be converted within each other. For example, in the unit of measure category "
-#~ "\"Time\", you will have the following UoM: Hours, Days."
-#~ msgstr ""
-#~ "Créez et gérez les catégories d'unités de mesure à utiliser dans votre "
-#~ "système. Si plusieurs unités de mesure appartiennent à la même catégorie, "
-#~ "elles peuvent être converties entre elles. Par exemple : dans la catégorie "
-#~ "d'unité de mesure \"Temps\", vous aurez les UdM suivantes : heures, jours."
-
-#~ msgid ""
-#~ "There can be more than one version of a pricelist. If you need to create new "
-#~ "versions of a pricelist, you can do it and manage them from here. Some "
-#~ "examples of versions: 2010, 2011, Promotion of February 2010, etc."
-#~ msgstr ""
-#~ "Il peut y avoir plusieurs versions d'une même liste de prix. Si vous avez "
-#~ "besoin de créer de nouvelles versions d'une liste de prix, vous pouvez le "
-#~ "faire et le gérer d'ici. Exemples de versions : \"2010\", \"2011\", "
-#~ "\"promotions de février 2010\", etc..."
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index 7b53a38c34f..419cf491e14 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -107,8 +107,8 @@ msgstr ""
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1233,7 +1233,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1619,7 +1619,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
@@ -1699,7 +1699,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2117,7 +2117,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2162,7 +2162,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 2de35d309ff..80599b46259 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-15 11:31+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -24,7 +24,7 @@ msgstr "DDR 512MB PC400"
 #. module: product
 #: field:product.packaging,rows:0
 msgid "Number of Layers"
-msgstr ""
+msgstr "Broj razina"
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -32,6 +32,8 @@ msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
 msgstr ""
+"Greška ! Glavni cjenik se ne može postaviti kao drugi cjenik u stavci "
+"cjenika!"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -45,7 +47,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
-msgstr "Može se prodati"
+msgstr "Može se prodavati"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
@@ -55,7 +57,7 @@ msgstr "Matična ploča ASUStek A7V8X-X"
 #. module: product
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
-msgstr ""
+msgstr "Minimalna nabavna količina kod glavnog dobavljača"
 
 #. module: product
 #: model:product.uom,name:product.uom_day
@@ -88,6 +90,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
+"Ovaj cjenik će se koristiti, umjesto predefiniranog, za prodaju trenutnom "
+"partneru"
 
 #. module: product
 #: constraint:product.supplierinfo:0
@@ -95,6 +99,8 @@ msgid ""
 "Error: The default UOM and the Supplier Product UOM must be in the same "
 "category."
 msgstr ""
+"Greška: predefinirana JM i JM artikla dobavljača moraju biti iz iste "
+"kategorije"
 
 #. module: product
 #: field:product.template,seller_qty:0
@@ -108,8 +114,8 @@ msgstr "Fiksno"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -138,7 +144,7 @@ msgstr "Naziv pravila"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Reference"
-msgstr ""
+msgstr "Šifra"
 
 #. module: product
 #: constraint:product.category:0
@@ -151,6 +157,8 @@ 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 ""
+"Mininalna količina za okidanje ovog pravila, izražena u nabavnoj JM ili u "
+"predefiniranoj JM artikla ukoliko nabavna JM nije upisana"
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -168,8 +176,8 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Purchase will trigger purchase orders when requested."
 msgstr ""
-"Proizvodnja će kreirati narudžbu za proizvodnju ili zaduženja, prema tipu "
-"proizvoda. Nabava će pokrenuti kreiranje narudžbenica kada se pojavi zahtjev."
+"\"Proizvedi\" će kreirati proizvodni nalog ili zadatke, ovisno o tipu "
+"artikla. \"Naruči\" će kreirati narudžbe po zahtjevu."
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -190,7 +198,7 @@ msgstr "Kategorije jedinica mjere"
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
 msgid "Processor AMD Athlon XP 1800+"
-msgstr "Processor AMD Athlon XP 1800+"
+msgstr "Procesor AMD Athlon XP 1800+"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
@@ -210,7 +218,7 @@ msgstr "Jed.mj."
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr "PCE"
+msgstr "KOM"
 
 #. module: product
 #: view:product.template:0
@@ -228,11 +236,12 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Određuje vidljivost artikla u listi odabira artikala kod stavaka zaključnica"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr "Zadana verzija javnog cjenika"
+msgstr "Predefinirna verzija javnog cjenika"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -249,15 +258,15 @@ msgstr "Prodajni cjenik"
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr "Tip proizvoda"
+msgstr "Tip artikla"
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  npr: 1 * (ova jedinica) = omjer * (referentna jedinica)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -290,7 +299,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "Naziv dobavljača, cijena, šifra artikla, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -305,7 +314,7 @@ msgstr "EAN13"
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "Glavni dobavljač"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -328,12 +337,12 @@ msgstr "Kategorija"
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
-"Pravilo se primjenjuje ssamo ako partner kupuje/prodaje više od ove količine."
+"Pravilo se primjenjuje samo ako partner kupuje/prodaje više od ove količine."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "Drvo 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
@@ -343,7 +352,7 @@ msgstr "Količina-1"
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "Broj pakiranja po razini"
 
 #. module: product
 #: field:product.packaging,qty:0
@@ -360,7 +369,7 @@ msgstr "Status"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "Odabir kategorije za trenutni artikl"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -370,7 +379,7 @@ msgstr "Izlazno"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "Referentna JM za ovu kategoriju"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
@@ -396,7 +405,7 @@ msgstr "Menadžer proizvoda"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "Naziv artikla kod dobavljača"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
@@ -411,6 +420,9 @@ msgid ""
 "information about your products related to procurement logistics, sales "
 "price, product category, suppliers and so on."
 msgstr ""
+"Artikli se mogu naručivati i/ili prodavati. Mogu biti materijali, skladišni "
+"artikli, potrošna roba ili usluge. Forma artikla sadrži detaljne informacije "
+"o nabavi, prodajnim cijenama, kategorijama, dobaljačima itd."
 
 #. module: product
 #: view:product.pricelist:0
@@ -422,7 +434,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr "Prodajni opis"
+msgstr "Opis prodaje"
 
 #. module: product
 #: view:product.product:0
@@ -464,7 +476,7 @@ msgstr "Datum do kojeg vrijedi cjenik"
 #. module: product
 #: model:product.category,name:product.cat0
 msgid "All products"
-msgstr "Svi proizvodi"
+msgstr "Svi artikli"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -492,6 +504,8 @@ msgid ""
 "Choose here the Unit of Measure in which the prices and quantities are "
 "expressed below."
 msgstr ""
+"Ovdje odaberite jedinicu mjere u kojoj su iskazane cijene i količine u "
+"stavkama dolje."
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -506,7 +520,7 @@ msgstr "Prodaje i kupovine"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -517,6 +531,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 ""
+"Cjenik sadrži pravila po kojima se izračunavaju nabavne i prodajne cijene za "
+"sve partnere koji su dodijeljeni cjeniku. Cjenici imaju više verzija (2010, "
+"2011, akcija veljača 2011, itd.) i svaka verzija ima nekoliko pravila. "
+"Primjer: prodajna cijena određene kategorije artikla će biti jednaka "
+"nabavnoj pomnoženoj sa 1.80."
 
 #. module: product
 #: help:product.product,active:0
@@ -524,24 +543,28 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Postavljanje artikla kao neaktivnog omogućava vam da ga sakrijete bez "
+"stvarnog brisanja."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "Metalni klinovi"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
 "Please create or activate one."
 msgstr ""
+"Odabrani cjenik nema aktivnu verziju!\n"
+"Napravite novu verziju ili aktivirajte postojeću."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr "Kateg. JM proizvoda"
+msgstr "Kategorija JM artikla"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -569,6 +592,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"Jedan ili više dobavljača se može povezati s artiklom. Sve informacije se "
+"nalaze na formi artikla."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -576,6 +601,8 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Preračun količine se može napraviti automatski između jedinica mjere koje se "
+"nalaze u istoj kategoriji, prema njihovim koeficijentima."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -662,12 +689,12 @@ msgstr "Dobavljač"
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr "Side Panel"
+msgstr "Bočni panel"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr "Pribor tipkovnica + miš"
+msgstr "Komplet tipkovnica + miš"
 
 #. module: product
 #: field:product.price.type,name:0
@@ -677,7 +704,7 @@ msgstr "Naziv cijene"
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
-msgstr "Processor AMD Athlon XP 2200+"
+msgstr "Procesor AMD Athlon XP 2200+"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -706,6 +733,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"Minimalna nabavna količina kod ovog dobavljača izražena u JM dobavljača ili "
+"u predefiniranoj jedinici mjere artikla ukoliko nabavna JM nije upisana."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -718,11 +747,13 @@ 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 ""
+"Ova će biti nabavna cijena u nabavnoj JM artikla ili u predefiniranoj JM "
+"artikla ukoliko nabavna JM nije upisana"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
 msgid "Accessories"
-msgstr "Oprema"
+msgstr "Dodatna oprema"
 
 #. module: product
 #: field:product.template,sale_delay:0
@@ -732,7 +763,7 @@ msgstr "Vrijeme vođenja kupca."
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "Dobavljač artikla"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -801,8 +832,8 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
-"Odredite proizvod ako se ovo pravilo odnosi samo na jedan proizvod. Ostavite "
-"prazno ako vrijedi za sve proizvode."
+"Odaberite artikl ukoliko ovo pravilo vrijedi samo za jedan artikl. Ostavite "
+"prazno ukoliko pravilo vrijedi za sve artikle"
 
 #. module: product
 #: view:product.product:0
@@ -813,7 +844,7 @@ msgstr "Nabava i lokacije"
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Projekt dizajna kuhinje"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
@@ -833,7 +864,7 @@ msgstr "Polica od 200cm"
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Omjer & preciznost"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
@@ -877,7 +908,7 @@ msgstr "Kategorije proizvoda"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  npr: 1 * (referentna jedinica) = omjer * (trenutna jedinica)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -917,7 +948,7 @@ msgstr "Posebna promjenjiva cijena"
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr "Standardni ventilator kućišta 80mm"
+msgstr "Standardni ventilator za kućište 80mm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
@@ -997,7 +1028,7 @@ msgstr "Jedinica"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Information"
-msgstr "Informacija"
+msgstr "Informacije"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1012,7 +1043,7 @@ msgstr "Ostali podaci"
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr "Stavke cjenika"
+msgstr ""
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1026,7 +1057,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Veća od referentne JM"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
@@ -1080,7 +1111,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Drveni nadvratnik 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1094,12 +1125,12 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "kg"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1109,7 +1140,7 @@ msgstr "Zastarjelo"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -1161,7 +1192,7 @@ msgstr "Polje pridruženo na formi proizvoda"
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Jedinica mjere"
 
 #. module: product
 #: field:product.template,procure_method:0
@@ -1255,10 +1286,10 @@ msgid "Pallet Dimension"
 msgstr "Dimenzije palete"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopija)"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -1283,7 +1314,7 @@ msgstr "Druga JM"
 #: code:addons/product/product.py:142
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greška !"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1296,7 +1327,7 @@ msgstr "Jedinice mjere"
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr "Min. količina"
+msgstr "Minimalna količina"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
@@ -1380,7 +1411,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -1421,7 +1452,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr "Računalo"
+msgstr "Osnovni PC"
 
 #. module: product
 #: help:product.pricelist,active:0
@@ -1429,6 +1460,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Postavljanje cjenika kao neaktivnog omogućava vam da ga sakrijete bez "
+"stvarnog brisanja."
 
 #. module: product
 #: field:product.product,qty_available:0
@@ -1438,7 +1471,7 @@ msgstr "Dostupna zaliha"
 #. 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
@@ -1456,7 +1489,7 @@ msgstr ""
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr "Preciznost zaokruživanja"
+msgstr ""
 
 #. module: product
 #: view:product.uom:0
@@ -1466,7 +1499,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "Polica 200cm"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1476,7 +1509,7 @@ msgstr "Kupi"
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr "Kategorije jedinaica mjere"
+msgstr "Kategorije jedinica mjere"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1495,7 +1528,7 @@ msgstr ""
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr "Aktivan"
+msgstr "Actif"
 
 #. module: product
 #: field:product.product,price_margin:0
@@ -1510,7 +1543,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr "EAN šifra jedinice pakiranja"
+msgstr "EAN kôd pakiranja"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1559,7 +1592,7 @@ msgstr "Jed. cijena"
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
 msgid "Onsite Intervention"
-msgstr "Trenutna intervencija"
+msgstr "Intervencija na terenu"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
@@ -1574,7 +1607,7 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Šifra artikla kod dobavljača"
 
 #. module: product
 #: view:product.product:0
@@ -1645,7 +1678,7 @@ msgstr "Proizvodi po kategorijama"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorije proizvoda"
 
 #. module: product
@@ -1725,7 +1758,7 @@ msgid ""
 msgstr "Osnovica za izračun cijene za kupca. (Kataloška cijena)"
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1765,7 +1798,7 @@ msgstr "Duljina"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Duljina / udaljenost"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
@@ -1857,7 +1890,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Polica 100cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
@@ -1868,12 +1901,12 @@ msgstr "Kategorija proizvoda"
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "Naziv cjenika"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Rok isporuke"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1885,12 +1918,12 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr "Vodeće vrijeme dobavljača"
+msgstr "Rok isporuke dobavljača"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
-msgstr "Kutija"
+msgstr ""
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_ul_form_action
@@ -1902,7 +1935,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Bočna stranica SHE200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -1910,7 +1943,7 @@ msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
 msgstr ""
-"Koristi se u kodu pri odabiru specifičnih cijena temeljenih na kontekstu. "
+"Koristi se u programskom kôdu za odabir pojedinih cijena prema kontekstu. "
 "Ostavite nepromijenjeno."
 
 #. module: product
@@ -1956,7 +1989,7 @@ msgstr "Miš"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Tip JM"
 
 #. module: product
 #: help:product.template,product_manager:0
@@ -1984,7 +2017,7 @@ msgstr "Redak"
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Bočna stranica SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -2005,7 +2038,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Troškovi smještaja"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2017,7 +2050,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "Polica 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
@@ -2070,7 +2103,7 @@ msgstr "Bruto težina"
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Sastavni dio"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
@@ -2080,7 +2113,7 @@ msgstr "Računalne stvari"
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr "telefonska pomoć"
+msgstr "Telefonska pomoć"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2097,7 +2130,7 @@ msgstr ""
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -2117,7 +2150,7 @@ msgstr "Svojstva prodaje"
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "tonne"
-msgstr ""
+msgstr "tona"
 
 #. module: product
 #: view:product.product:0
@@ -2128,7 +2161,7 @@ msgstr "Odgode"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "Stvaranje  artikla"
 
 #. module: product
 #: help:product.template,type:0
@@ -2152,7 +2185,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2181,7 +2214,7 @@ msgstr ""
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr "Razina"
+msgstr "Volumen"
 
 #. module: product
 #: field:product.template,loc_case:0
@@ -2196,10 +2229,10 @@ msgstr "Varijanta proizvoda"
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Police"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
@@ -2258,7 +2291,7 @@ msgstr "Prodajna cijena"
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Tip kategorije"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -2271,6 +2304,8 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Koeficijent pretvorbe JM u JP\n"
+" jp =jm * koef"
 
 #. module: product
 #: help:product.template,volume:0
@@ -2289,32 +2324,15 @@ msgstr "Popust"
 #~ "Minimalna količina narudžbe od ovog dobavljača, izražena u predefiniranoj "
 #~ "jedinici mjere."
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Ovo je prosječno vrijeme od potvrde kupčeve narudžbe do isporuke finalnog "
-#~ "proizvoda. To je vrijeme koje obećajete svojim kupcima."
-
 #~ msgid "Procure Method"
 #~ msgstr "Metoda nabave"
 
 #~ msgid "Customer Price"
 #~ msgstr "Cijena za kupca"
 
-#~ msgid "Supplier of Product"
-#~ msgstr "Dobavljač proizvoda"
-
-#~ msgid "Rentable product"
-#~ msgstr "Proizvod za iznajmljivanje"
-
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "Broj slojeva na paleti ili kutiji"
 
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimenzije palete"
-
 #~ msgid "Prices Computations"
 #~ msgstr "Izračuni cijena"
 
@@ -2336,9 +2354,6 @@ msgstr "Popust"
 #~ msgid "Factor"
 #~ msgstr "Faktor"
 
-#~ msgid "Palet"
-#~ msgstr "Palet"
-
 #~ msgid ""
 #~ "This pricelist will be used, instead of the default one,                     "
 #~ "for sales to the current partner"
@@ -2348,13 +2363,6 @@ msgstr "Popust"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za arhitekturu prikaza!"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Možete vidjeti popis dobavljača za ovaj proizvod."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "Jedinice mjere se mogu preračunavati unutar iste kategorije."
-
 #~ msgid "Can be sold"
 #~ msgstr "Može se prodati"
 
@@ -2429,15 +2437,6 @@ msgstr "Popust"
 #~ "Naziv proizvoda za ovog partnera će se koristiti pri ispisu zahtjeva za "
 #~ "navođenje cijene. Ostavite prazno za korištenje internog naziva."
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Koristi se u tvrtkama koje upravljaju sa dvije jedinice mjere: fakturnom i "
-#~ "inventarskom. Npr., za prehrambene industrije, upravljat ćete sa zalihom "
-#~ "šunke, ali će fakture biti u Kg. Ostavite prazno za predefinirani UOM."
-
 #~ msgid "Purchase UoM"
 #~ msgstr "Kupovna JM"
 
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 86e6074e1f3..57ba5549e7e 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-10 09:07+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -113,8 +114,8 @@ msgstr "Állandó"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Figyelem !"
@@ -264,7 +265,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Termékek: "
@@ -534,7 +535,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1279,7 +1280,7 @@ msgid "Pallet Dimension"
 msgstr "Raklapméret"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (másolat)"
@@ -1671,7 +1672,7 @@ msgstr "Termékek kategóriánként"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Termék kategóriák"
 
 #. module: product
@@ -1751,7 +1752,7 @@ msgid ""
 msgstr "Az eladási ár alapjául szolgál. Szokás katalógusárnak is nevezni."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "A termék űrlap Partner adatai"
@@ -2175,7 +2176,7 @@ msgid "Description"
 msgstr "Leírás"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2220,7 +2221,7 @@ msgid "Shelves"
 msgstr "Polcok"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Másik árlista"
@@ -2303,96 +2304,10 @@ msgstr "A térfogat köbméterben."
 msgid "Price Discount"
 msgstr "Árengedmény"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Gyerek kategóriák"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
 #~ msgstr "Minimális beszerzési mennyiség, alap mértékegységben kifejezve"
 
-#~ msgid "Rentable product"
-#~ msgstr "Kölcsönözhető termék"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "A termék beszerzési költsége amit a könyvelésnél is használnak. Más árak "
-#~ "számítási alapjául szolgálhat."
-
 #~ msgid "Procure Method"
 #~ msgstr "Ellátás módja"
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Az átszámított mennyiség ennek az értéknek lesz a többszöröse. Használjon "
-#~ "1,0-t olyan termékekhez amiket nem lehet feldarabolni."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Az ár ennek az értéknek csak a többszöröse lehet.\n"
-#~ "A kerekítés a százalékos érték felszorzása után és a fix összeg\n"
-#~ "hozzáadása előtt kerül alkalmazásra. 9,99-re végződő ár\n"
-#~ "készítéséhez 10-es kerekítést és -0,01 fix összeget használjon."
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Raklap méretei"
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Láthatja a termék szállítóinak listáját."
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Készletre gyártás': Ha szükség van rá, vegyen a készletből vagy várjon "
-#~ "annak újratöltésére. 'Rendelésre gyártás': Ha szükség van rá, rendeljen vagy "
-#~ "gyártson."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "A termék szállítója"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "A szabály csak akkor lép életbe, ha a partner ennél a mennyiségnél többet "
-#~ "vesz vagy ad el."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "Egy kategóriába tartozó mértékegységek egymás között átválthatók."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Mennyiség számítás:\n"
-#~ "mennyiség ebben az egységben = 1 (alapegység) / arány"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Mennyiség számítás:\n"
-#~ "mennyiség alapegységben = szorzó * 1 (ez az egység)"
-
-#~ msgid "Palet"
-#~ msgstr "Raklap"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Meghatározza, hogy az ellátást a rendszer hogy kezeli. Fogyóeszközök olyan "
-#~ "készletezhető termékek, amikből végtelen mennyiség áll rendelkezésre vagyis "
-#~ "nincs szükség a készletszint követésére."
-
-#~ msgid "Paletization"
-#~ msgstr "Raklapozás"
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 75629d099e7..9603fff37a4 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -113,8 +113,8 @@ msgstr "Tetap"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Peringatan !"
@@ -266,7 +266,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produk : "
@@ -553,7 +553,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1333,7 +1333,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensi Pallet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (salinan)"
@@ -1747,7 +1747,7 @@ msgstr "Produk berdasarkan kategori"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategori Produk"
 
 #. module: product
@@ -1829,7 +1829,7 @@ msgstr ""
 "katalog."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partner bagian dari bentuk produk"
@@ -2271,7 +2271,7 @@ msgid "Description"
 msgstr "Keterangan"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2320,7 +2320,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Rak-rak"
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 671c59b1a64..03b11b14363 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Fisso"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Attenzione !"
@@ -268,7 +268,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  ad es.: 1 * (questa unità) = rapporto * (unità di riferimento)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Prodotti "
@@ -556,7 +556,7 @@ msgid "Metal Cleats"
 msgstr "Asticelle di metallo"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1338,7 +1338,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensioni Pallet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -1753,7 +1753,7 @@ msgstr "Prodotti per Categoria"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorie Prodotti"
 
 #. module: product
@@ -1835,7 +1835,7 @@ msgstr ""
 "listino prezzi."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sezione del partner per il form del prodotto"
@@ -2278,7 +2278,7 @@ msgid "Description"
 msgstr "Descrizione"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2327,7 +2327,7 @@ msgid "Shelves"
 msgstr "Scaffali"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Altro listino prezzi"
@@ -2415,108 +2415,6 @@ msgstr "Il volume in mc"
 msgid "Price Discount"
 msgstr "Sconto Prezzo"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Questo è il tempo medio che intercorre tra la conferma d'ordine da parte del "
-#~ "cliente e la consegna dei prodotti. Attenzione: è il tempo di consegna "
-#~ "promesso ai tuoi clienti."
-
-#~ msgid "Childs Categories"
-#~ msgstr "Categorie collegate"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Prezzo di Margine Minimo"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Cambierà il modo in cui vengono processati gli approvvigionamenti. I "
-#~ "consumabili sono prodotti per cui è prevista una quantità infinita a stock, "
-#~ "o per i quali non è prevista una gestione da parte del sistema"
-
-#~ msgid "Palet"
-#~ msgstr "Pallet"
-
-#~ msgid "Rentable product"
-#~ msgstr "Prodotto noleggiabile"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensioni Pallet"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Produzione da Stock': se necessario, prelevare dallo stock o attendere il "
-#~ "rifornimento. 'Produzione da Ordine': se necessario, acquistare o produrre "
-#~ "per la richiesta di approvvigionamento"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Il coefficiente per la formula:\n"
-#~ "coeff (unità base) = 1 (questa unità)"
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Non puoi avere due versioni dello stesso listino che si sovrappongono"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Il coefficiente per la formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-
-#~ msgid "Paletization"
-#~ msgstr "Pallettizzazione"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Margine Prezzo Massimo"
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "La modalità di calcolo del prezzo per questa regola."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Data inizio validità per questo listino prezzi."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Fornitore del Prodotto"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Data di fine validità per questo listino prezzi."
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "La regola si applica soltanto se il partner compra/vende più di questa "
-#~ "quantità."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Si può vedere la lista dei fornitori di quel prodotto."
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unità"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unità"
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unità di misura della stessa categoria possono essere convertite tra loro."
-
-#~ msgid "Packagings"
-#~ msgstr "Imballaggi"
-
 #~ msgid "KGM"
 #~ msgstr "Kg"
 
@@ -2540,13 +2438,6 @@ msgstr "Sconto Prezzo"
 #~ "prosciutto a pezzi, ma verrà fatturato in kg. Lasciare vuoto per usare "
 #~ "l'unità di misura predefinita."
 
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Il costo del prodotto per la valorizzazione contabile del magazzino. Può "
-#~ "essere utilizzato come prezzo base per il prezzo del fornitore."
-
 #~ msgid ""
 #~ "Set a category of product if this rule only apply to products of a category "
 #~ "and his childs. Keep empty for all products"
@@ -2584,13 +2475,6 @@ msgstr "Sconto Prezzo"
 #~ msgid "The weight of a full of products palet or box."
 #~ msgstr "Peso di un pallet completo di prodotti o scatola."
 
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "La quantità calcolata sarà un multiplo di questo valore. Usare 1.0 per "
-#~ "prodotti che non possono essere separati."
-
 #~ msgid ""
 #~ "Delay in days between the confirmation of the purchase order and the "
 #~ "reception of the products in your warehouse. Used by the scheduler for "
@@ -2606,16 +2490,6 @@ msgstr "Sconto Prezzo"
 #~ msgid "Partner Product Name"
 #~ msgstr "Nome prodotto per partner"
 
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Seleziona il prezzo così come un multiplo del suo valore.\n"
-#~ "L'arrotondamento viene applicato dopo lo sconto e prima del ricarico.\n"
-#~ "Per avere prezzi che finiscono con 9.99, mettere arrotondamento 10, ricarico "
-#~ "-0.01"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2761,16 +2635,6 @@ msgstr "Sconto Prezzo"
 #~ "Il costo del prodotto per la valutazione in contabilità dello stock. Può "
 #~ "servire come prezzo base per il prezzo del fornitore."
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Usato da aziende che gestiscono due unità di misura: gestione della "
-#~ "fatturazione e dell'inventario. Per esempio, nelle industrie alimentari, "
-#~ "puoi gestire uno stock di prosciutto in quantità ma fatturare in Kg. "
-#~ "Lasciare vuoto per usare Unità di Misura standard."
-
 #~ msgid ""
 #~ "Unit of Measure of a category can be converted between each others in the "
 #~ "same category."
@@ -2818,142 +2682,3 @@ msgstr "Sconto Prezzo"
 
 #~ msgid "Default UoM"
 #~ msgstr "UOM Predefinita"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Il nome del gruppo deve essere unico !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Se il campo 'attivo' è selezionato, sarà possibile nascondere il listino "
-#~ "senza rimuoverlo."
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr ""
-#~ "Stabilisce la sequenza quando di visualizza una lista di elementi di listino."
-
-#~ msgid ""
-#~ "A pricelist contains rules to be evaluated in order to compute the purchase "
-#~ "or sale price for all the partners assigned to a pricelist. Pricelists have "
-#~ "several versions (2010, 2011, Promotion of February 2010, etc.) and each "
-#~ "version has several rules. Example: the customer price of this category of "
-#~ "product will be based on the supplier price multiplied by 1.80."
-#~ msgstr ""
-#~ "Un listino contiene regole utilizzate per calcolare il prezzo di acquisto o "
-#~ "di vendita per tutti i partner associati al listino. I listini hanno diverse "
-#~ "versioni (2010, 2011, promozione di febbraio 2010, ecc.) e ogni versione ha "
-#~ "diverse regole. Esempio: il prezzo cliente di questa categoria di prodotti "
-#~ "sarà basato sul prezzo fornitore moltplicato per 1,8"
-
-#~ msgid ""
-#~ "You must define a Product for everything you buy or sell. They can be raw "
-#~ "materials, stockable products, consumables or services. The Product form "
-#~ "contains a detailed information of your products related to procurement "
-#~ "logistics, sales price, product category, suppliers and so on."
-#~ msgstr ""
-#~ "E' necessario definire un prodotto per ogni cosa si compri o si venda. Siano "
-#~ "materiali grezzi, prodotti stoccabili, consumabili o servizi. Il form del "
-#~ "prodotto contiene informazioni dettagliate relative alla logistica degli "
-#~ "approvvigionamenti, prezzi di vendita, categorie prodotti, fornitori e così "
-#~ "via."
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Esiste già una scorciatoia per questo menu!"
-
-#~ msgid ""
-#~ "Create and manage the units of measure you want to be used in your system. "
-#~ "You can define a conversion rate to be used between the several Unit of "
-#~ "Measure within the same category."
-#~ msgstr ""
-#~ "Crea e gestisce le unità di misura che si vogliono usare nel sistema. E' "
-#~ "possibile definire un tasso di conversione da usare fra le varie unità di "
-#~ "misura all'interno della stessa categoria."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate dagli oggetti osv_memory !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico !"
-
-#~ msgid ""
-#~ "Create and manage the units of measure categories you want to be used in "
-#~ "your system. If several units of measures are in the same category, they can "
-#~ "be converted within each other. For example, in the unit of measure category "
-#~ "\"Time\", you will have the following UoM: Hours, Days."
-#~ msgstr ""
-#~ "Crea e gestisce le categorie di unità di misura da usare nel sistema. Se "
-#~ "nella stessa categoria ci sono diverse unità di misura, esse possono essere "
-#~ "convertite le une con le altre. Per esempio, nella categoria \"Tempo\", si "
-#~ "potranno avere le seguenti U.M.: Ore, Giorni."
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "Qui c'è una lista di tutti i prodotti classificati per categoria. E' "
-#~ "possibile cliccare su una categoria per ottenere la lista di tutti i "
-#~ "prodotti collegati a questa categoria o a una sua figlia."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non è possibile creare menu ricorsivi."
-
-#~ msgid ""
-#~ "Products can be purchased and/or sold. They can be raw materials, stockable "
-#~ "products, consumables or services. The Product form contains a detailed "
-#~ "information on your  products related to procurement logistics, sales price, "
-#~ "product category, suppliers and so on."
-#~ msgstr ""
-#~ "I prodotti possono essere comprati e/o venduti. Possono essere materiali "
-#~ "grezzi, prodotti stoccabili, consumabili o servizi. Il form del prodotto "
-#~ "contiene informazioni dettagliate sui prodotti relative alla logistica degli "
-#~ "approvvigionamenti, i prezzi di vendita, le categorie prodotti, fornitori e "
-#~ "così via."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almeno un diritto di accesso verificato !"
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "U.M. prodotto fornitore."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Se il campo 'attivo' è selezionato, sarà possibile nascondere il prodotto "
-#~ "senza rimuoverlo."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "La quantità minima da acquistare a questo fornitore, espressa nella U.M. di "
-#~ "default."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1 !"
-
-#~ msgid "Only one value can be defined for each given usage!"
-#~ msgstr "Può essere definito solamente un valore per ogni utilizzo!"
-
-#~ msgid ""
-#~ "There can be more than one version of a pricelist. If you need to create new "
-#~ "versions of a pricelist, you can do it and manage them from here. Some "
-#~ "examples of versions: 2010, 2011, Promotion of February 2010, etc."
-#~ msgstr ""
-#~ "Ci può essere più di una versione di listino. Se c'è bisogno di creare nuove "
-#~ "versioni di listino, è possibile gestirle da qui. Alcuni esempi di versioni: "
-#~ "2010, 2011, Promozione di febbraio 2010, ecc."
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Non è possibile avere due utenti con lo stesso login !"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "L'azienda scelta non è nelle aziende permesse per questo utente"
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index 612dfb17403..9c5cca89bc0 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -107,8 +107,8 @@ msgstr "고정됨"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "경고 !"
@@ -254,7 +254,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "상품 "
@@ -522,7 +522,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1237,7 +1237,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1623,7 +1623,7 @@ msgstr "카테고리 별 상품"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "상품 카테고리"
 
 #. module: product
@@ -1703,7 +1703,7 @@ msgid ""
 msgstr "고객 가격 계산을 위한 베이스 가격. 흔히 카타로그 가격이라 불립니다."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "상품 양식의 파트너 섹션"
@@ -2121,7 +2121,7 @@ msgid "Description"
 msgstr "설명"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2166,7 +2166,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "다른 가격리스트"
@@ -2254,12 +2254,6 @@ msgstr "가격 할인"
 #~ "unit of measure."
 #~ msgstr "이 공급자로부터의 최소 구매 수량으로 디폴트 측정 단위로 표현됨"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr "고객 주문과 완제품 전달 간의 평균 시간으로, 귀하가 고객에게 약속한 시간입니다."
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2280,50 +2274,15 @@ msgstr "가격 할인"
 #~ msgid "Customer Price"
 #~ msgstr "고객 가격"
 
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "이 모듈의 가격 계산 모드"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "상품 공급자"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "이 가격 리스트 버전 검증을 위한 시작 날짜"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr "조달 프로세스 방식을 변경, 소비재는 무한한 스톡 수량, 또는 시스템 내의 스톡 관리가 없음."
-
-#~ msgid "Rentable product"
-#~ msgstr "대여 가능한 상품"
-
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "파레트 또는 박스 상의 레이어 숫자"
 
-#~ msgid "Childs Categories"
-#~ msgstr "차일드 카테고리"
-
 #~ msgid "Prices Computations"
 #~ msgstr "가격 계산"
 
-#~ msgid "Price Max. Margin"
-#~ msgstr "가격 최대 마진"
-
 #~ msgid "Configuration"
 #~ msgstr "구성"
 
-#~ msgid "Palette Dimension"
-#~ msgstr "파레트 디멘션"
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "가격을 설정함으로써 이것은 이 값의 배수가 됩니다. \n"
-#~ "반올림은 할인 뒤,  그리고 할증 전에 적용됩니다. \n"
-#~ "9.99와 같은 가격은 반올림을 10으로, 할증을 -0.01로 설정한 경우입니다."
-
 #~ msgid "Number of Layer"
 #~ msgstr "레이어 숫자"
 
@@ -2342,9 +2301,6 @@ msgstr "가격 할인"
 #~ msgid "Factor"
 #~ msgstr "팩터"
 
-#~ msgid "Palet"
-#~ msgstr "파레트"
-
 #~ msgid "Partner Product Name"
 #~ msgstr "파트너 상품 이름"
 
@@ -2353,17 +2309,6 @@ msgstr "가격 할인"
 #~ "for sales to the current partner"
 #~ msgstr "이 가격리스트는 현재 파트너에 대한 판매에서 디폴트 값 대신에 사용됩니다."
 
-#~ msgid "Price Min. Margin"
-#~ msgstr "가격 최소 마진"
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "해당 상품의 공급자 리스트를 볼 수 있습니다."
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr "회계 스톡 가치증식을 위한 상품 원가. 공급자 가격의 기본 가격으로 활용됩니다."
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "에러: UOS는 UOM과 다른 카테고리에 있어야 합니다."
 
@@ -2372,10 +2317,6 @@ msgstr "가격 할인"
 #~ "selection from a sale order line."
 #~ msgstr "해당 상품을 판매 주문 라인으로부터 선택 내에 있는 상품 리스트 속에서 볼 수 있는 지 여부를 결정."
 
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "동일한 카테고리의 UoM은 서로 변환될 수 있습니다."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "유효하지 않은 뷰 아키텍처의 XML"
 
@@ -2384,13 +2325,6 @@ msgstr "가격 할인"
 #~ "for quotation. Keep empty to use the internal one."
 #~ msgstr "이 파트너의 상품 이름으로 견적 요청을 인쇄할 때 이용됩니다. 내부 용도로 사용될 경우에는 비워 두십시오."
 
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "식의 상관계수\n"
-#~ "coef (base unit) = 1 (this unit)"
-
 #~ msgid "Can be sold"
 #~ msgstr "판매 가능"
 
@@ -2402,20 +2336,9 @@ msgstr "가격 할인"
 #~ "두 UoM을 관리하는 조직들에 의해 사용됩니다: 인보이스와 스톡 관리. 가령, 식품산업에서, 김치를 포기로 관리하지만, kg 단위로 "
 #~ "판매하는 경우 등입니다. 디폴트 UOM을 사용하려면 비워 두십시오."
 
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d 단위"
-
 #~ msgid "Rate"
 #~ msgstr "요율"
 
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'재고 생산': 필요할 때, 스톡에서 가져오거나, 충당을 대기. '주문 생산': 필요할 때, 조달 요청을 위해 구매 또는 생산."
-
 #~ msgid "Purchase UoM"
 #~ msgstr "구매 UoM"
 
@@ -2427,19 +2350,12 @@ msgstr "가격 할인"
 #~ "the packing order and is mainly used if you use the EDI module."
 #~ msgstr "동일한 상품을 포장하는 상이한 방식. 포장 주문에는 영향이 없으며, EDI 모듈을 이용할 경우에 주로 사용됩니다."
 
-#~ msgid "Packagings"
-#~ msgstr "포장"
-
 #~ msgid "Partner Product Code"
 #~ msgstr "파트너 상품 코드"
 
 #~ msgid "Cancel"
 #~ msgstr "취소"
 
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d 단위"
-
 #~ msgid "The total number of products you can put by palet or box."
 #~ msgstr "파레트 또는 박스로 적재된 총 상품 수량"
 
@@ -2461,22 +2377,6 @@ msgstr "가격 할인"
 #~ msgid "Product suppliers, with their product name, price, etc."
 #~ msgstr "공급자 이름, 상품 이름, 가격 등"
 
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr "파트너가 이 수량 이상으로 판매/구매할 때만 적용되는 규칙"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "이 식의 상관계수:\n"
-#~ "1 (base unit) = coef (this unit)"
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr "계산된 수량은 이 값의 배수입니다. 분할되지 않는 상품의 경우 1.0을 이용하십시오."
-
 #~ msgid ""
 #~ "Coefficient to convert UOM to UOS\n"
 #~ " uom = uos * coeff"
@@ -2487,18 +2387,9 @@ msgstr "가격 할인"
 #~ msgid "The weight of a full of products palet or box."
 #~ msgstr "상품 파레트 또는 박스의 총중량"
 
-#~ msgid "Paletization"
-#~ msgstr "파레트 적재"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "이 가격리스트 버전의 검증을 위한 마감 날짜"
-
 #~ msgid "Prices & Suppliers"
 #~ msgstr "가격 & 공급자"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "중복되는 두 가격리스트 버전은 안 됩니다."
-
 #~ msgid "Delivery Delay"
 #~ msgstr "배송 지연"
 
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 758706ed79c..4ffab08f569 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: lt\n"
 
 #. module: product
@@ -110,8 +110,8 @@ msgstr "Fiksuotas"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Įspėjimas!"
@@ -259,7 +259,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produktai: "
@@ -531,7 +531,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1249,7 +1249,7 @@ msgid "Pallet Dimension"
 msgstr "Pakuotės matmenys"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1641,7 +1641,7 @@ msgstr "Produktai pagal kategorijas"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Produktų kategorijos"
 
 #. module: product
@@ -1723,7 +1723,7 @@ msgstr ""
 "kaina."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Produkto formos partnerio sekcija"
@@ -2143,7 +2143,7 @@ msgid "Description"
 msgstr "Aprašymas"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2190,7 +2190,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Kitas kainoraštis"
@@ -2288,9 +2288,6 @@ msgstr "Kainos nuolaida"
 #~ msgid "Priority"
 #~ msgstr "Svarbumas"
 
-#~ msgid "Palet"
-#~ msgstr "Paletė"
-
 #~ msgid "Can be sold"
 #~ msgstr "Galima parduoti"
 
@@ -2303,60 +2300,21 @@ msgstr "Kainos nuolaida"
 #~ msgid "Price type"
 #~ msgstr "Kainos tipas"
 
-#~ msgid "Paletization"
-#~ msgstr "Palečių kūrimas"
-
 #~ msgid "Configuration"
 #~ msgstr "Nustatymai"
 
-#~ msgid "Supplier of Product"
-#~ msgstr "Produkto tiekėjas"
-
 #~ msgid "Create new Product"
 #~ msgstr "Sukurti naują produktą"
 
 #~ msgid "Partner Product Name"
 #~ msgstr "Partnerio produkto pavadinimas"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Vidutinis laikas tarp pirkėjo užsakymo patvirtinimo ir prekių pristatymo "
-#~ "pirkėjui. Pirkėjams pažadėtas laikas."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Kainos skaičiavumo būdas šiai taisyklei"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Šio kainoraščio versijos galiojimo pradžios data."
-
-#~ msgid "Rentable product"
-#~ msgstr "Nuomojamas produktas"
-
-#~ msgid "Childs Categories"
-#~ msgstr "Vaikinės kategorijos"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Kainos maks. marža"
-
 #~ msgid "Price list"
 #~ msgstr "Kainoraštis"
 
 #~ msgid "Partner Product Code"
 #~ msgstr "Partnerio produkto kodas"
 
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Šios kainoraščio versijos galiojimo pabaigos data"
-
-#~ msgid "Packagings"
-#~ msgstr "Pakuotės"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d vnt."
-
 #~ msgid "Supplier Info"
 #~ msgstr "Tiekėjo informacija"
 
@@ -2364,55 +2322,9 @@ msgstr "Kainos nuolaida"
 #~ msgstr ""
 #~ "Klaida: Numat. mat. vnt. turi būti kitos kategorijos negu pardavimo mat. vnt."
 
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Tos pačios kategorijos mato vienetai gali būti perversti iš vieno į kitą"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Kainos min. marža"
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Produkto tiekėjų sąrašas"
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d vnt."
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Paletės matmenys"
-
 #~ msgid "KGM"
 #~ msgstr "KG"
 
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Ši taisyklė taikoma tada, kai parteris parduoda/perka daugiau nei šis kiekis."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Formulės koeficientas:\n"
-#~ "koef(bazinis vienetas) = 1 (šis vienetas)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Formulės koeficientas:\n"
-#~ "1 (bazinis vienetas) = koef (šis vienetas)"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Gaminti į sandėlį': Kai yra poreikis, imti iš sandėlio arba laukti kol bus "
-#~ "papildytas sandėlys. 'Gaminti pagal užsakymą': Kai yra poreikis,pirkti arba "
-#~ "gaminti."
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2505,9 +2417,6 @@ msgstr "Kainos nuolaida"
 #~ msgid "Purchase UoM"
 #~ msgstr "Pirkimo mato vnt."
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Jūs negalite turėti 2 kainoraščių versijų, kurios sutampa!"
-
 #~ msgid "The total number of products you can put by palet or box."
 #~ msgstr "Bendras produktų kiekis, kurį galima sudėtį ant paletės ar į dėžę"
 
@@ -2597,9 +2506,6 @@ msgstr "Kainos nuolaida"
 #~ "jei vieta nėra pasirinkta. Skaičiuojama : Tikros atsargos - Išvykstančios "
 #~ "prekės + Atvykstančios prekės."
 
-#~ msgid "Price List Name :"
-#~ msgstr "Kainoraščio pavadinimas :"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Netinkamas modelio pavadinimas veiksmo apibrėžime."
 
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index a7fadd645be..dc6d73f56f5 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -115,8 +115,8 @@ msgstr "Fiksēts"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Uzmanību!"
@@ -268,7 +268,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  attiecīgi: 1 * (esošā vienība) = attiecība * (atsauces vienība)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Preces: "
@@ -556,7 +556,7 @@ msgid "Metal Cleats"
 msgstr "Metal Cleats"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1294,7 +1294,7 @@ msgid "Pallet Dimension"
 msgstr "Paletes izmēri"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
@@ -1704,7 +1704,7 @@ msgstr "Preces pa Kategorijām"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Preču kategorijas"
 
 #. module: product
@@ -1786,7 +1786,7 @@ msgstr ""
 "cenu."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Produkta formas Partnera sadaļa"
@@ -2219,7 +2219,7 @@ msgid "Description"
 msgstr "Apraksts"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2268,7 +2268,7 @@ msgid "Shelves"
 msgstr "Plaukti"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Cita Cenuzīme"
@@ -2355,9 +2355,3 @@ msgstr "Tilpums m3"
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
 msgstr "Cenas atlaide"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Nevar būt divi lietotāji ar vienādu pieteikuma vārdu!"
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 4791a6dbc24..6902709c58b 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Тогтмол"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Анхааруулга !"
@@ -264,7 +264,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  Ж: 1 * (энэ нэгж) = харьцаа * (сурвалж нэгж)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Бараа: "
@@ -537,7 +537,7 @@ msgid "Metal Cleats"
 msgstr "Төмөр Тах"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1273,7 +1273,7 @@ msgid "Pallet Dimension"
 msgstr "Савлагааны хэмжигдэхүүн"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (Хуулах)"
@@ -1671,7 +1671,7 @@ msgstr "Бараа, ангиллаар"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Барааны ангилал"
 
 #. module: product
@@ -1751,7 +1751,7 @@ msgid ""
 msgstr "Худалдах үнийг тооцоолох суурь үнэ. Өөрөөр хэлбэл каталоги үнэ."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Нийлүүлэгчийн санал болгосон үнэ"
@@ -2184,7 +2184,7 @@ msgid "Description"
 msgstr "Тодорхойлолт"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2231,7 +2231,7 @@ msgid "Shelves"
 msgstr "Тавиур"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Бусад үнийн хүснэгт"
@@ -2456,15 +2456,6 @@ msgstr "Үнийн хөнгөлөлт"
 #~ msgstr ""
 #~ "Хэмжих нэгж нь тухайн ангилал дотроо өөр нэгж рүү хөрвүүлэгдэж болно."
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Хоёр хэмжих нэгж ашигладаг компаниудад хэрэглэгдэнэ. Жишээлбэл, хүнсний "
-#~ "үйлдвэрлэлд, агуулахдаа гулуузаар хэмжих боловч хэрэглэгчээс  Кг-аар "
-#~ "нэхэмжлэнэ. Үндсэн хэмжих нэгжийг ашиглах бол хоосон орхино."
-
 #~ msgid ""
 #~ "The coefficient for the formula:\n"
 #~ "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
@@ -2549,155 +2540,18 @@ msgstr "Үнийн хөнгөлөлт"
 #~ msgid "Cancel"
 #~ msgstr "Цуцлах"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Энэ цэсний богино холбоос байна!"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Үнийн хүснэгтийг идэвхигүй болговол энэ үнийн хүснэгт хэрэглэгдэхгүй."
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Үнийн хүснэгтийн жагсаалтанд эрэмбэ дараалал тогтооно."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr "Идэвхигүй бараа бүтээгдэхүүнийг хэрэглэх боломжгүй болно."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэх боломгүй."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхардах ёсгүй !"
-
-#~ msgid ""
-#~ "Create and manage the units of measure categories you want to be used in "
-#~ "your system. If several units of measures are in the same category, they can "
-#~ "be converted within each other. For example, in the unit of measure category "
-#~ "\"Time\", you will have the following UoM: Hours, Days."
-#~ msgstr ""
-#~ "Та системд хэрэглэх хэмжих нэгж болон ангилалыг үүсгэж удирдах боломжтой. "
-#~ "Нэг ангилалд баглах хэмжих нэгжүүд хоорондоо хөрвөх боломжтой. Жишээлбэл "
-#~ "\"Хугацаа\" ангилалын хэмжих нэгжүүд : Цаг, Өдөр."
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Нийлүүлэгчийн үнийн саналын хэмжих нэгж"
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "Энд таны бүх бараануудыг харгалзах ангилалаар харуулна. Та ангилал дээр дарж "
-#~ "тухайн ангилал болон түүний дэд ангилалуудад харгалзах барааны жагсаалт руу "
-#~ "орох боломжтой."
-
 #~ msgid "List Price"
 #~ msgstr "Зарах үнэ"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулын сертификат ID давхардах ёсгүй !"
-
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Барааны ангилалыг хэрэглэх боломжгүй, ' \\n'Учир нь рекурсив хэлбэрийн "
-#~ "ангилал тодорхойлсон байна'"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Группын нэр давхардах ёсгүй !"
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "Уг нийлүүлэгчээс худалдан авах доод тоо хэмжээ, үндсэн хэмжих нэгжээр."
-
-#~ msgid ""
-#~ "A pricelist contains rules to be evaluated in order to compute the purchase "
-#~ "or sale price for all the partners assigned to a pricelist. Pricelists have "
-#~ "several versions (2010, 2011, Promotion of February 2010, etc.) and each "
-#~ "version has several rules. Example: the customer price of this category of "
-#~ "product will be based on the supplier price multiplied by 1.80."
-#~ msgstr ""
-#~ "Үнийн хүснэгт бол худалдан авалт болон борлуулалтад хэрэглэгддэг, харилцагч "
-#~ "бүрээс хамаарсан үнийн дүрмүүд бүхий хүснэгт юм. Үнийн хүснэгт нь олон "
-#~ "хувилбартай байх боломжтой бөгөөд хувилбар бүр үнийн дүрэмтэй. Жишээлбэл: "
-#~ "тухайн ангилалын бараануудын зарах үнийг худалдан авсан үнээ 1.80 -р үржүүлж "
-#~ "тогтооно."
-
-#~ msgid ""
-#~ "Products can be purchased and/or sold. They can be raw materials, stockable "
-#~ "products, consumables or services. The Product form contains a detailed "
-#~ "information on your  products related to procurement logistics, sales price, "
-#~ "product category, suppliers and so on."
-#~ msgstr ""
-#~ "Бараануудыг худалдан авч мөн борлуулах боломжтой байна. Мөн бараанууд нь өөр "
-#~ "барааны түүхий эд материал, хадгалах бараа, хангамжийн материал, үйлчилгээ "
-#~ "зэрэг төрлүүдэд хуваагдана. Барааны форм дэлгэц нь барааны логистик, татан "
-#~ "авалт, боруулалт, худалдан авалт, ангилал зэрэг бүхий л дэлгэрэнгүй "
-#~ "мэдээллийг бүртгэнэ."
-
-#~ msgid ""
-#~ "You must define a Product for everything you buy or sell. They can be raw "
-#~ "materials, stockable products, consumables or services. The Product form "
-#~ "contains a detailed information of your products related to procurement "
-#~ "logistics, sales price, product category, suppliers and so on."
-#~ msgstr ""
-#~ "Худалдан авалт болон борлуулалт хийхдээ бараагаа сонгох хэрэглэй. Үүнд "
-#~ "материал, хадгалах бараа, хамгамжийн материал болон үйлчилгээ байж болно. "
-#~ "Эдгээр төрөл ангилалыг барааны мэдээлэл дээр тохируулна."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй !"
 
-#~ msgid "res.users"
-#~ msgstr "Хэрэглэгч"
-
-#~ msgid ""
-#~ "Create and manage the units of measure you want to be used in your system. "
-#~ "You can define a conversion rate to be used between the several Unit of "
-#~ "Measure within the same category."
-#~ msgstr ""
-#~ "Таны системд хэрэглэгдэх хэмжих нэгжийн бүртгэл. Та ижил ангилалын хэмжих "
-#~ "нэгжүүдийг хооронд нь тодорхой коэффицентээр хөрвүүлэх боломжтой."
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "Сонгосон хүснэгтэд идэвхитэй үнийн хувилбар алга !\n"
-#~ "' \\n                                'Идэвхитэй хувилбар үүсгэн үү!"
-
-#~ msgid ""
-#~ "There can be more than one version of a pricelist. If you need to create new "
-#~ "versions of a pricelist, you can do it and manage them from here. Some "
-#~ "examples of versions: 2010, 2011, Promotion of February 2010, etc."
-#~ msgstr ""
-#~ "Үнийн хүснэгт нь нэгээс олон байх боломжтой. Хэрэв танд үнийн хүснэгтийн "
-#~ "шинэ хувилбар хэрэгтэй бол та энд хувилбар үүсгэн удирдах боломжтой."
-
 #~ msgid ""
 #~ "Set a category of product if this rule only apply to products of a category "
 #~ "and his childs. Keep empty for all products"
 #~ msgstr ""
 #~ "Уг дүрэм нь сонгосон ангилалын бараануудад үйлчилнэ. Хоосон орхивол бүх "
 #~ "бараанд үйлчилнэ."
-
-#~ msgid "Only one value can be defined for each given usage!"
-#~ msgstr "Бүх хэрэглээнд зөвхөн нэг утга хэрэглэгдэнэ!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index eba7087e1fe..3b8513dad10 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -51,7 +51,7 @@ msgstr "Salgbar"
 #. 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
@@ -109,8 +109,8 @@ msgstr "Fast"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel !"
@@ -258,7 +258,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produkter: "
@@ -530,7 +530,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -545,7 +545,7 @@ msgstr "Måleenhet for produktgruppe"
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "Box 20x20x40"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -648,7 +648,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "KIT Shelf of 100cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -809,7 +809,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Kitchen Design Project"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
@@ -824,7 +824,7 @@ msgstr "Under utvikling"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Shelf of 200cm"
 
 #. module: product
 #: view:product.uom:0
@@ -913,7 +913,7 @@ msgstr "Variant Price Extra"
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "Regular case fan 80mm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
@@ -956,7 +956,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr ""
+msgstr "Lagerført produkt"
 
 #. module: product
 #: field:product.packaging,code:0
@@ -1047,7 +1047,7 @@ msgstr ""
 #. 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
@@ -1076,7 +1076,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Wood Lintel 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1209,7 +1209,7 @@ msgstr ""
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "Hovedleverandør som har høyeste prioritet i leverandørlisten"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -1248,7 +1248,7 @@ msgid "Pallet Dimension"
 msgstr "Pallstørrelse"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopier)"
@@ -1636,7 +1636,7 @@ msgstr "Produkter per produktgruppe"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Produktkategorier"
 
 #. module: product
@@ -1677,7 +1677,7 @@ msgstr "Products Labels"
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
 msgid "Box 30x40x60"
-msgstr ""
+msgstr "Box 30x40x60"
 
 #. module: product
 #: selection:product.template,type:0
@@ -1716,7 +1716,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2006,7 +2006,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "Rack 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
@@ -2069,7 +2069,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr ""
+msgstr "Telefonhjelp"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2108,7 +2108,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr ""
+msgstr "Forsinkelser"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -2137,7 +2137,7 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2184,7 +2184,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Annen prisliste"
@@ -2269,21 +2269,6 @@ msgstr "Volume (m3)"
 msgid "Price Discount"
 msgstr "Prisrabatt"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Det er en gjennomsnittlig tid mellom bekreftelse av kundes ordre og "
-#~ "ferdigstillingen av det ferdige produktet. Dette er tiden du lover deg til "
-#~ "ovenfor kunden."
-
-#~ msgid "Childs Categories"
-#~ msgstr "Barnekategori"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Pris Minimums Margin"
-
 #~ msgid "Customer Price"
 #~ msgstr "Kundepris"
 
@@ -2314,9 +2299,6 @@ msgstr "Prisrabatt"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for visningsarkitektur"
 
-#~ msgid "Product Pricelist"
-#~ msgstr "Produktprisliste"
-
 #~ msgid "Price list"
 #~ msgstr "Prisliste"
 
@@ -2336,12 +2318,6 @@ msgstr "Prisrabatt"
 #~ msgid "Price type"
 #~ msgstr "Pristype"
 
-#~ msgid "units"
-#~ msgstr "enheter"
-
-#~ msgid "Currency :"
-#~ msgstr "Valuta:"
-
 #~ msgid "Delivery Delay"
 #~ msgstr "Delivery Delay"
 
diff --git a/addons/product/i18n/nb_NB.po b/addons/product/i18n/nb_NB.po
index 74e08e40d52..fee211ea66f 100644
--- a/addons/product/i18n/nb_NB.po
+++ b/addons/product/i18n/nb_NB.po
@@ -1506,7 +1506,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index 80681371624..369c75e60e6 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Vastgezet"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing!"
@@ -268,7 +268,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  bijv.: 1 * (deze eenheid) = ratio * (referentie eenheid)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Producten: "
@@ -557,7 +557,7 @@ msgid "Metal Cleats"
 msgstr "Metalen strip"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1340,7 +1340,7 @@ msgid "Pallet Dimension"
 msgstr "Afmetingen pallet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopie)"
@@ -1755,7 +1755,7 @@ msgstr "Producten op categorie"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Productcategoriën"
 
 #. module: product
@@ -1837,7 +1837,7 @@ msgstr ""
 "genoemd."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Leveranciers sectie op productformulier"
@@ -2279,7 +2279,7 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2328,7 +2328,7 @@ msgid "Shelves"
 msgstr "Planken"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Andere prijslijst"
@@ -2344,7 +2344,7 @@ msgstr "Productsjabloon"
 #. module: product
 #: field:product.template,cost_method:0
 msgid "Costing Method"
-msgstr "Kostenmethode"
+msgstr "Kostprijsbepaling"
 
 #. module: product
 #: view:product.packaging:0
@@ -2416,129 +2416,9 @@ msgstr "Het volume in m3."
 msgid "Price Discount"
 msgstr "Korting"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Kind Categorieën"
-
-#~ msgid "Rentable product"
-#~ msgstr "Verhuurbaar"
-
 #~ msgid "Priority"
 #~ msgstr "Prioriteit"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Twee overlappende prijslijsten is niet mogelijk!"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Coëfficiënt voor de formule:\n"
-#~ "Coëfficiënt(standaard eenheid) = 1 (deze eenheid)"
-
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Dit is de gemiddelde tijd tussen de orderbevestiging en de levering van de "
-#~ "producten. Dit is tevens de levertijd die toegezegd kan worden richting de "
-#~ "afnemers."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "De manier van berekening van de prijs in deze prijslijstregel."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Begindatum voor het gebruik van deze prijslijst."
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Deze keuze heeft invloed op de verwerking van dit product in de voorraad, "
-#~ "productie of inkopen."
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr "Heeft invloed op de productiemethode."
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Einddatum voor het gebruik van deze prijslijst"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Deze prijslijstregel geldt dan alleen als er meer dat dit aantal van deze "
-#~ "producten wordt gekocht."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Maakt de prijs zodoende dat het een veelvoud is van de valuta.\n"
-#~ "De afronding wordt toegepast na de korting en voor de extra korting\n"
-#~ "Om prijzen te krijgen eindigende op 9,99, selecteer afronden 10, en korting -"
-#~ "0,01"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "De prijs waarop de waardering wordt gebaseerd. Tevens kan deze prijs dienen "
-#~ "als basis-inkoop."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "Meeteenheden uit dezelfde category kunnen worden uitgewisseld."
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Afmetingen Pallet"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Minimale Marge"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Leverancier van het product"
-
-#~ msgid "Palet"
-#~ msgstr "Pallet"
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "U kunt de lijst van leveranciers voor dit product zien."
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d eenheid"
-
-#~ msgid "Packagings"
-#~ msgstr "Verpakkingen"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d eenheden"
-
-#~ msgid "Paletization"
-#~ msgstr "Pallettiseren"
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Het berekende aantal zal een veelvoud zijn van deze waard. Gebruik 1.0 voor "
-#~ "producten die niet kunnen worden gedeeld."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "De coefficient voor de formule:\n"
-#~ "1 (basiseenheid) = coef (deze eenheid)"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Max. Marge"
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2730,15 +2610,6 @@ msgstr "Korting"
 #~ "Naam van het product voor deze relatie. Deze wordt gebruikt bij het "
 #~ "afdrukken van offertes. Laat deze leeg om de eigen productnaam te gebruiken."
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Gebruikt door bedrijven die twee meeteenheden hanteren: facturatie en "
-#~ "voorraadbeheer. Bijv. in de voedingsindustrie beheert u een voorraad ham, "
-#~ "maar bestelt u per kg. Laat leeg om de standaard ME te gebruiken."
-
 #~ msgid "Purchase UoM"
 #~ msgstr "Besteleenheid"
 
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index d330032b42b..374d222f30b 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -107,8 +107,8 @@ msgstr ""
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1233,7 +1233,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1619,7 +1619,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
@@ -1699,7 +1699,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2117,7 +2117,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2162,7 +2162,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index 74bf4fac046..af15aaf0f5a 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Stała"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
@@ -266,7 +266,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  tzn.: 1 * (ta jednostka) = współczynnik * (jednostka referencyjna)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produkty: "
@@ -550,7 +550,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1302,7 +1302,7 @@ msgid "Pallet Dimension"
 msgstr "Rozmiar palety"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
@@ -1713,7 +1713,7 @@ msgstr "Produkty wg kategorii"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorie produktów"
 
 #. module: product
@@ -1794,7 +1794,7 @@ msgstr ""
 "Cena bazowa dla obliczenia ceny dla klienta. Nazywana ceną katalogową."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Sekcja dostawcy w formularzu produktu"
@@ -2232,7 +2232,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2281,7 +2281,7 @@ msgid "Shelves"
 msgstr "Półki"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Inny cennik"
@@ -2382,21 +2382,9 @@ msgstr "Upust cenowy"
 #~ "Minimalna ilość, którą można zakupić od tego dostawcy, wyrażona w domyślnej "
 #~ "jednostce miary."
 
-#~ msgid "Supplier of Product"
-#~ msgstr "Dostawca produktu"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Początkowa data ważności tej wersji cennika"
-
-#~ msgid "Childs Categories"
-#~ msgstr "Kategorie podrzędne"
-
 #~ msgid "Configuration"
 #~ msgstr "Konfiguracja"
 
-#~ msgid "Palette Dimension"
-#~ msgstr "Wymiary palety"
-
 #~ msgid "Number of Layer"
 #~ msgstr "Liczba warstw"
 
@@ -2421,9 +2409,6 @@ msgstr "Upust cenowy"
 #~ msgstr ""
 #~ "Ten cennik będzie stosowany zamiast domyślnego do sprzedaży dla tego partnera"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Możesz zobaczyć listę dostawców tego produktu."
-
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2431,11 +2416,6 @@ msgstr "Upust cenowy"
 #~ "Określa, czy produkt ma być widoczny na listach wyboru do pozycji zamówienia "
 #~ "sprzedaży."
 
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Jednostki miary tej samej kategorii mogą być konwertowane między sobą."
-
 #~ msgid "Can be sold"
 #~ msgstr "Może być sprzedane"
 
@@ -2451,10 +2431,6 @@ msgstr "Upust cenowy"
 #~ msgid "Cancel"
 #~ msgstr "Anuluj"
 
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d jednostek"
-
 #~ msgid ""
 #~ "Code of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
@@ -2468,20 +2444,9 @@ msgstr "Upust cenowy"
 #~ msgid "Supplier Info"
 #~ msgstr "Info dostawcy"
 
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Reguła będzie spełniona, jeśli partner kupi/sprzeda więcej niż ta ilość."
-
 #~ msgid "The weight of a full of products palet or box."
 #~ msgstr "Waga całej palety lub opakowania z produktami."
 
-#~ msgid "Paletization"
-#~ msgstr "Paletyzacja"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Końcowa data ważności tej wersji cennika"
-
 #~ msgid "Prices & Suppliers"
 #~ msgstr "Ceny i dostawcy"
 
@@ -2492,14 +2457,6 @@ msgstr "Upust cenowy"
 #~ "Domyślna jednostka używana do zamówień zakupu. Musi być tej samej kategorii "
 #~ "co domyślna jednostka miary."
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "To jest średni czas pomiędzy potwierdzeniem zamówienia klienta a dostawą "
-#~ "produktów. To jest czas, który obiecujesz klientowi."
-
 #~ msgid "Product Process"
 #~ msgstr "Proces produktu"
 
@@ -2509,46 +2466,15 @@ msgstr "Upust cenowy"
 #~ msgid "Customer Price"
 #~ msgstr "Cena dla klienta"
 
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Tryb wyliczania ceny dla tej reguły"
-
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "Liczba warstw na palecie lub w opakowaniu"
 
 #~ msgid "Prices Computations"
 #~ msgstr "Obliczanie cen"
 
-#~ msgid "Rentable product"
-#~ msgstr "Produkt do wypożyczenia"
-
 #~ msgid "Default UoM"
 #~ msgstr "Domyślna JM"
 
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Ustawia cenę, aby była wielokrotnością tej wartości.\n"
-#~ "Zaokrąglenie jest stosowane po rabacie i przed dopłatą.\n"
-#~ "Aby uzyskać ceny 9,99, ustaw zaokrąglenie 10 i dopłatę -0,01."
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Maks. marża ceny"
-
-#~ msgid "Palet"
-#~ msgstr "Paleta"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Marża ceny min."
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Koszt produktu do wyceny zasobów. Może służyć jako cena bazowa dla ceny "
-#~ "dostawcy."
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Błąd: JS musi być innej kategorii niż JM."
 
@@ -2562,15 +2488,6 @@ msgstr "Upust cenowy"
 #~ msgid "Rate"
 #~ msgstr "Przelicznik"
 
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Na zapas': Kiedy trzeba pobierz z zapasów lub czekaj na uzupełnienie "
-#~ "zapasów. 'Na zamówienie': Kiedy trzeba zakup lub wyprodukuj na zamówienie "
-#~ "nabycia."
-
 #~ msgid ""
 #~ "Used by companies that manages two unit of measure: invoicing and stock "
 #~ "management. For example, in food industries, you will manage a stock of ham "
@@ -2584,16 +2501,6 @@ msgstr "Upust cenowy"
 #~ msgid "Product suppliers, with their product name, price, etc."
 #~ msgstr "Dostawca produktu ze swoją nazwą produktu, ceną itp."
 
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Wyliczona ilość będzie wielokrotnością tej liczby. Stosuj 1.0 dla produktów, "
-#~ "które nie mogą być podzielone."
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Nie możesz mieć dwóch cenników nachodzących na siebie !"
-
 #~ msgid ""
 #~ "Set a category of product if this rule only apply to products of a category "
 #~ "and his childs. Keep empty for all products"
@@ -2611,10 +2518,6 @@ msgstr "Upust cenowy"
 #~ "strefach wewnętrznych, jeśli strefy nie wybrano. Obliczone jako: Zapas "
 #~ "rzeczywisty - Zapas wychodzący + Zapas wchodzący."
 
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "Jednostka %d"
-
 #~ msgid ""
 #~ "Coefficient to convert UOM to UOS\n"
 #~ " uom = uos * coeff"
@@ -2622,30 +2525,9 @@ msgstr "Upust cenowy"
 #~ "Przelicznik do konwersji JM na JS\n"
 #~ " jm = js * przelicznik"
 
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Współczynnik dla formuły:\n"
-#~ "współcz. * (jednostka bazowa) = 1 (ta jednostka)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Przelicznik dla formuły:\n"
-#~ "1 (jednostka bazowa) = przelicznik * (ta jednostka)"
-
 #~ msgid "List Price"
 #~ msgstr "Cena kat."
 
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Zmienia sposób nabywania. Materiały pomocnicze są produktami o niekończącym "
-#~ "się zapasie lub bez zarządzania zapasem w systemie."
-
 #~ msgid ""
 #~ "Gives the different ways to package the same product. This has no impact on "
 #~ "the packing order and is mainly used if you use the EDI module."
@@ -2653,9 +2535,6 @@ msgstr "Upust cenowy"
 #~ "Daje ci różne możliwości pakowania tego samego produktu. Nie ma wpływu na "
 #~ "zamówienia, czy przesunięcia, ale jest stosowany w module EDI."
 
-#~ msgid "Packagings"
-#~ msgstr "Opakowania"
-
 #~ msgid "The total number of products you can put by palet or box."
 #~ msgstr "Liczba produktów, które możesz umieścić na palecie lub w kartonie."
 
@@ -2745,55 +2624,3 @@ msgstr "Upust cenowy"
 #~ msgstr ""
 #~ "Współczynnik w wyrażeniu:\n"
 #~ "1 (jednostka podst.) = współcz. (ta jednostka). Przelicznik = 1 / współcz."
-
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Stosowane przez firmy, które stosują dwie jednostki miary: jedną do "
-#~ "fakturowania, a drugą do gospodarki magazynowej. Np. w przemyśle spożywczym "
-#~ "będziesz magazynował w kilogramach a sprzedawał w sztukach. Pozostaw puste, "
-#~ "aby stosować domyślne jednostki miary."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Nazwa grupy musi być unikalna !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Jeśli to pole jest zgaszone, to cennik może być niewidoczny bez konieczności "
-#~ "jego usuwania."
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Określa kolejność w wyświetlaniu listy elementów cennika."
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Skrót dla tego menu już istnieje!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid ""
-#~ "Here is a list of all your products classified by category. You can click on "
-#~ "a category to get the list of all products linked to this category or to a "
-#~ "child of this category."
-#~ msgstr ""
-#~ "To jest lista wszystkich twoich kategorii. Możesz kliknąć na kategorię, aby "
-#~ "zobaczyć listę produktów należących do tej kategorii i kategorii podrzędnych."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index b4739e0a98c..675d515d8e3 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -1511,7 +1511,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 7c53c4eda83..1c4bd145d6d 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -24,7 +24,7 @@ msgstr "DDR 512MB PC400"
 #. module: product
 #: field:product.packaging,rows:0
 msgid "Number of Layers"
-msgstr ""
+msgstr "Numero de Camadas"
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -32,6 +32,8 @@ msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
 msgstr ""
+"Erro ! Não pode atribuir a Lista de Preços Principal como Outra Lista de "
+"Preços no item Lista de Preços !"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -55,27 +57,27 @@ msgstr "Placa Mãe ASUStek A7V8X-X"
 #. module: product
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
-msgstr ""
+msgstr "Esta é a quantidade mínima a comprar do fornecedor principal."
 
 #. module: product
 #: model:product.uom,name:product.uom_day
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: product
 #: view:product.product:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr "Basíco + PC (montagem na ordem)"
+msgstr "Basíco + PC (montagem na ordem de venda)"
 
 #. module: product
 #: field:product.product,incoming_qty:0
 msgid "Incoming"
-msgstr "A Receber"
+msgstr "Entrada"
 
 #. module: product
 #: field:product.template,mes_type:0
@@ -88,6 +90,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
+"Esta lista de preços será usada, em vez da por defeito, para vendas ao "
+"cliente actual"
 
 #. module: product
 #: constraint:product.supplierinfo:0
@@ -95,21 +99,23 @@ msgid ""
 "Error: The default UOM and the Supplier Product UOM must be in the same "
 "category."
 msgstr ""
+"Erro: A UDM por defeito e a UDM do produto do Fornecedor deverão ser da "
+"mesma categoria."
 
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Quantidade do Fornecedor"
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Fixed"
-msgstr "Fixo"
+msgstr "Corrigido"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -138,7 +144,7 @@ msgstr "Nome da Regra"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Reference"
-msgstr ""
+msgstr "Código"
 
 #. module: product
 #: constraint:product.category:0
@@ -151,6 +157,8 @@ 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 ""
+"A quantidade mínima para activar esta regra, expressa na UDM do Fornecedor "
+"se existe, ou em contrário, na UDM por defeito para o produto."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -179,7 +187,7 @@ msgstr "Preço Médio"
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr "Nome da regra explícita para esta linha de lista de preço."
+msgstr "Nome da regra explicita para esta linha de lista de preços."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
@@ -205,22 +213,22 @@ msgstr "Lista de Preços"
 #. module: product
 #: view:product.template:0
 msgid "UOM"
-msgstr "UOM"
+msgstr "UDM"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr "PCE"
+msgstr "UNI"
 
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr "Miscelânea"
+msgstr "Diversos"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "Trabalhador"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -228,22 +236,24 @@ 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 ser visível na lista de produtos numa seleção a "
+"partir de uma linha de ordem de vendas."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr "Versão Pública Padrão da Lista de Preços"
+msgstr "Versão de Lista de Preços Pública Padrão"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Standard Price"
-msgstr "Preço Padrão"
+msgstr "Preço Standard"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr "Lista de Preços de Vendas"
+msgstr "Lista de Preços de Venda"
 
 #. module: product
 #: view:product.template:0
@@ -254,10 +264,10 @@ msgstr "Tipo de Produto"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  ex: 1 * (esta unidade) = rácio * (unidade de referência)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produtos: "
@@ -273,8 +283,8 @@ msgid ""
 "Quantities of products that are planned to leave in selected locations or "
 "all internal if none have been selected."
 msgstr ""
-"Quantidade de produtos que estão planeados para chegar em locais "
-"seleccionados ou todos os internos se nenhum tiver sido seleccionado."
+"Quantidade de produtos previstos para sair nas localizações seleccionadas ou "
+"todos os internos caso nenhuma tenha sido seleccionada."
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -283,14 +293,14 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
-"'Produzir para Stock': Quando necessário, tome a partir do stock ou espere "
-"até o re-abastecimento. 'Produzir para Ordem de venda ': Quando necessário, "
-"comprar ou produzir para a aquisição de pedidos."
+"'Produzir para Stock': Quando necessário, tirar do stock ou esperar até o re-"
+"abastecimento. 'Produzir para Ordem de venda ': Quando necessário, comprar "
+"ou produzir para o pedido de aquisição."
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "Nome de Fornecedor, preço, código de produto, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -305,7 +315,7 @@ msgstr "EAN13"
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "Fornecedor Principal"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -328,13 +338,12 @@ msgstr "Categoria"
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
-"A regra aplica-se apenas se o terceiro comprar/vender mais do que esta "
-"quantidade."
+"A regra só se aplica se o terceiro compra/vende mais que esta quantidade."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "Wood 2 mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
@@ -344,12 +353,12 @@ msgstr "Quantidade-1"
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "O numero de embalagens 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
@@ -361,7 +370,7 @@ msgstr "Estado"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "Seleccione categoria para o produto actual"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -371,7 +380,7 @@ msgstr "Saída"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "UDM de referência para esta categoria"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
@@ -397,7 +406,7 @@ msgstr "Gestor do Produto"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "Nome do Produto no Fornecedor"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
@@ -412,11 +421,15 @@ msgid ""
 "information about your products related to procurement logistics, sales "
 "price, product category, suppliers and so on."
 msgstr ""
+"Os produtos podem ser comprados e/ou vendidos. Podem ser matérias primas, "
+"produtos armazenáveis ou serviços. O formulário do produto contém informação "
+"detalhada sobre os seus produtos relacionada com logística, preços de venda, "
+"categoria de produto, fornecedores e por ai em diante."
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "Pesquisa de Preço de Produtos"
 
 #. module: product
 #: view:product.product:0
@@ -429,12 +442,12 @@ msgstr "Descrição de Venda"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr "Localização do Armazém"
+msgstr "Localização da Armazenagem"
 
 #. module: product
 #: help:product.packaging,length:0
 msgid "The length of the package"
-msgstr "O tamanho da embalagem"
+msgstr "O comprimento da embalagem"
 
 #. module: product
 #: help:product.template,weight_net:0
@@ -460,7 +473,7 @@ msgstr "Altura"
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr "Data final para esta versão da lista de preço para ser valida."
+msgstr "Data final até à qual esta versão da lista de preço é válida."
 
 #. module: product
 #: model:product.category,name:product.cat0
@@ -470,7 +483,7 @@ msgstr "Todos os produtos"
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
 msgid "pricelist.partnerinfo"
-msgstr "pricelist.partnerinfo"
+msgstr "Informação de Terceiro de Lista de Preços"
 
 #. module: product
 #: field:product.price_list,qty2:0
@@ -493,6 +506,8 @@ msgid ""
 "Choose here the Unit of Measure in which the prices and quantities are "
 "expressed below."
 msgstr ""
+"Escolha aqui a Unidade de Medida na qual os preços e quantidades são "
+"expressos abaixo."
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -507,7 +522,7 @@ msgstr "Vendas & Compras"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Tempo de trabalho"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -518,6 +533,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 ""
+"Uma lista de preços contém regras a ser avaliadas para processar o preço de "
+"compra ou venda para todos os terceiros associados a uma lista de preços. "
+"Listas de preços tem diversas versões (2010, 2011, Promoção de Fevereiro, "
+"etc.) e cada versão tem diversas regras. Exemplo: o preço de cliente de uma "
+"categoria de produtos será baseado no preço do fornecedor multiplicado por "
+"1,80."
 
 #. module: product
 #: help:product.product,active:0
@@ -525,24 +546,28 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"se o campo \"activo\" estiver marcado como falso, permitirá esconder o "
+"produto sem o remover."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "Chuteiras de Metal"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
 "Please create or activate one."
 msgstr ""
+"Não existe nenhuma versão activa para a lista de preços seleccionada!\n"
+"Por favor activar uma."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr "Categoria UoM de Produtos"
+msgstr "Categoria de UDM de Produto"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -562,7 +587,7 @@ msgstr "Pode ser Comprado"
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
 msgid "High speed processor config"
-msgstr "Configuração do Processador de Alta Velocidade"
+msgstr "Configuração do processador de alta velocidade"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -570,6 +595,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"1 ou vários fornecedores podem ser ligados a um produto. Toda a informação "
+"fica no formulário do produto."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -577,11 +604,13 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Conversões de quantidade podem acontecer automaticamente entre unidades de "
+"medida na mesma categoria, de acordo com os respectivos rácios."
 
 #. module: product
 #: help:product.packaging,width:0
 msgid "The width of the package"
-msgstr "O volume da embalagem"
+msgstr "A largura da embalagem"
 
 #. module: product
 #: field:product.product,virtual_available:0
@@ -591,23 +620,23 @@ msgstr "Stock Virtual"
 #. module: product
 #: selection:product.category,type:0
 msgid "View"
-msgstr ""
+msgstr "Ecrã"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr ""
+msgstr "Modelos de Produto"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Despesas de Restaurante"
 
 #. module: product
 #: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Erro: Código ean Inválido"
+msgstr "Erro: Código EAN inválido"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
@@ -617,7 +646,7 @@ msgstr "Quantidade Mínima"
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
 msgid "Price Type"
-msgstr ""
+msgstr "Tipo de preço"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -647,23 +676,23 @@ msgid ""
 "reactivate the pricelist"
 msgstr ""
 "Quando uma versão é duplicada é definida como não activa, de modo que as "
-"datas não sobreponham com a versão original. Deve mudar as datas e reactivar "
-"a lista de preço"
+"datas não se sobreponham ás da versão original. Deve mudar as datas e "
+"reactivar a lista de preços"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "Kit estante de 100 cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Supplier"
-msgstr ""
+msgstr "Fornecedor"
 
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr ""
+msgstr "Painel Lateral"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -693,12 +722,12 @@ msgstr "Lista de Preços"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Fornecedores"
 
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "Para Comprar"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -707,6 +736,9 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"A quantidade mínima a comprar a este fornecedor, expressa no UDM do produto "
+"do fornecedor se preenchido, caso contrário na unidade de medida por defeito "
+"do produto."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -719,6 +751,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 ""
+"Este preço será considerado como o preço para a UdM do fornecedor se existir "
+"ou caso contrário a unidade de medida por defeito do produto"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -733,7 +767,7 @@ msgstr "Prazo de Entrega ao Cliente"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "Fornecedor do produto"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -742,6 +776,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 ""
+"Utilizado por empresas que gerem duas unidades de medida: facturação e "
+"gestão de inventário. Por exemplo, nas industrias alimentares, ira gerir o "
+"stock de fiambre mas facturar em Kg. Manter vazio para utilizar a UDM por "
+"defeito."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -751,7 +789,7 @@ msgstr "Margem mínima"
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr "Categorias Dependente"
+msgstr "Categorias Descendentes"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
@@ -784,7 +822,7 @@ msgstr "Ref do Cliente"
 #. module: product
 #: view:product.product:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: product
 #: field:product.pricelist.type,key:0
@@ -794,7 +832,7 @@ msgstr "Chave"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rules Test Match"
-msgstr "Regras de Teste Correspondentes"
+msgstr "Teste de Correspondência de Regras"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -802,24 +840,24 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
-"Definir um produto se esta regra somente se aplicar para um produto. Deixar "
+"Definir um produto se esta regra somente se aplicar a um produto. Deixar "
 "vazio para todos os produtos."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "Aquisições & Locais"
+msgstr "Aquisições & Localizações"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Projecto de Desenho de Cozinha"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Hora"
 
 #. module: product
 #: selection:product.template,state:0
@@ -829,17 +867,17 @@ msgstr "Em Desenvolvimento"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Prateleira de 200cm"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Rácio e Precisão"
 
 #. 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
@@ -850,7 +888,7 @@ msgstr "Kits de componentes de TI"
 #: selection:product.category,type:0
 #: selection:product.template,state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
@@ -863,7 +901,7 @@ msgstr "Informação do Fornecedor"
 #: report:product.pricelist:0
 #: field:product.pricelist,currency_id:0
 msgid "Currency"
-msgstr "Moeda"
+msgstr "Divisa"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
@@ -878,7 +916,7 @@ msgstr "Categorias de Produto"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  ex: 1 * (unidade de referência) = rácio * (esta unidade)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -887,6 +925,9 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"Criar e gerir as unidades de medida que deseja utilizar no seu sistema. Pode "
+"definir a taxa de conversão entre várias unidades de medida, dentro da mesma "
+"categoria."
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -904,6 +945,8 @@ msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
 msgstr ""
+"Custo do produto para valorização contabilística. É o preço base para o "
+"preço de fornecedor."
 
 #. module: product
 #: view:product.price.type:0
@@ -913,22 +956,22 @@ msgstr "Tipo de Preço dos Produtos"
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr "Preço Variante Extra"
+msgstr "Preço Extra da Variante"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr "Regular ventuinha da caixa 80mm"
+msgstr "Ventoinha de caixa regular de 80mm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr "Informação sobre uum fornecedor de produto"
+msgstr "Informação sobre um fornecedor de produto"
 
 #. module: product
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Avançados..."
 
 #. module: product
 #: view:product.product:0
@@ -940,7 +983,7 @@ msgstr "Descrição de Compra"
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Não pode ter 2 versões de listas de preços que coincidam!"
+msgstr "Não pode ter duas versões de listas de preços que se sobreponham."
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -949,6 +992,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Tempo limite em dias desde a confirmação da ordem de compra e a recepção dos "
+"produtos no seu armazém. Utilizado para o calculo automático do planeamento "
+"da ordem de compra."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action
@@ -957,6 +1003,9 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"Pode haver mais que uma versão de uma lista de preços. Aqui pode criar e "
+"gerir novas versões de uma lista de preços. Alguns exemplos de versões: "
+"2010, 2011, Promoção de verão, etc."
 
 #. module: product
 #: selection:product.template,type:0
@@ -971,12 +1020,13 @@ msgstr "Código"
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr "Seq"
+msgstr "Sequência"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Calculate Product Price per unit base on pricelist version."
 msgstr ""
+"Calcular Preço do Produto por unidade base na versão de lista de preços."
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1003,7 +1053,7 @@ msgstr "Informação"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Products Listprices Items"
-msgstr "Itens da Lista de Preços de Produtos"
+msgstr "Itens da Lista de Preços dos Produtos"
 
 #. module: product
 #: view:product.packaging:0
@@ -1023,11 +1073,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 ""
+"Criar e gerir as categorias de unidades de medida que deseja utilizar no "
+"sistema. Se existirem várias unidades de medida numa categoria, poderão ser "
+"convertidas entre elas. Por exemplo, na categoria de unidade de medida "
+"\"Tempo\", terá as seguintes UDM: Horas, Dias."
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Maior que a UDM de Referência"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
@@ -1037,12 +1091,12 @@ msgstr "Produtos & Listas de Preços"
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "Para Vender"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "Serviços Negociáveis"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1076,12 +1130,12 @@ msgstr "Nome"
 #. module: product
 #: view:product.product:0
 msgid "Stockable"
-msgstr ""
+msgstr "Armazenável"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Lintel de Madeira de 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1091,16 +1145,21 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"É necessário definir um produto para tudo o que compre ou venda. Os produtos "
+"podem ser matérias primas, produtos armazenáveis, consumíveis ou serviços. O "
+"formulário do produto contem informação detalhada sobre os produtos "
+"relaciona com logística, preço de venda, categoria de produto, fornecedores "
+"e por ai em diante."
 
 #. 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
@@ -1110,7 +1169,7 @@ msgstr "Obsoleto"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -1128,12 +1187,13 @@ msgstr ""
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
+"Dá a ordem de sequência quando exibe uma lista de categorias de produtos."
 
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
 msgid "Ratio"
-msgstr ""
+msgstr "Rácio"
 
 #. module: product
 #: help:product.template,purchase_ok:0
@@ -1162,17 +1222,17 @@ msgstr "Campo associado no formulário do produto."
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Método de Aprovisionamento"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Data de Impressão"
 
 #. module: product
 #: field:product.template,uos_id:0
@@ -1202,6 +1262,25 @@ msgid ""
 "    Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"    Este é o módulo base para gerir produtos e listas de preços no OpenERP.\n"
+"    \n"
+"    Produtos suportam variantes, métodos de preço diferentes, informação de\n"
+"    fornecedores, produzir para stock/ordem de venda, diferentes unidades de "
+"medida,\n"
+"    embalagem e propriedades.\n"
+"\n"
+"    Suporte de listas de preços:\n"
+"    * Múltiplos níveis de desconto (por produto, categoria, quantidades)\n"
+"    * Calculo de preço baseado em diferentes critérios:\n"
+"        * Outra Lista de preços,\n"
+"        * Preço de Custo,\n"
+"        * Preço de Lista,\n"
+"        * Preço de Fornecedor, ...\n"
+"    Preferências de Listas de preços por produto e/ou Clientes.\n"
+"\n"
+"    Imprime Etiquetas de produto com código de barras.\n"
+"    "
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1210,14 +1289,15 @@ 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 ""
-"Este é o atraso médio em dias entre a confirmação da ordem de compra e a "
-"recepção de bens para este produto e para o fornecedor padrão. É utilizado "
-"pelo programador para emitir pedidos baseado em atrasos reordenados."
+"Este é o tempo médio em dias entre a confirmação da ordem de compra e a "
+"recepção de bens, para este produto e para o fornecedor padrão. É utilizado "
+"para emitir pedidos baseados nos tempos das ordens de compra."
 
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
 msgstr ""
+"Fornecedor principal que tem a prioridade mais alta na lista de Fornecedores."
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -1242,7 +1322,7 @@ msgstr "Produtos"
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "O numero de camadas numa palete ou caixa"
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -1256,10 +1336,10 @@ msgid "Pallet Dimension"
 msgstr "Dimensão da Palete"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (cópia)"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -1273,18 +1353,20 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Este é o tempo médio em dias entre a confirma da ordem do cliente e a "
+"entrega dos produtos acabados. É o tempo que promete aos seus clientes."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr "Segundo UoM"
+msgstr "Segunda UdM"
 
 #. module: product
 #: code:addons/product/product.py:142
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro !"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1310,6 +1392,8 @@ msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Este código de produto de fornecedor será utilizado quando imprimir um "
+"pedido de cotação. Manter vazio para utilizar o interno."
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -1328,6 +1412,9 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Dá a ordem na qual os itens da lista de preços serão verificados. A "
+"avaliação dá máxima prioridade à sequência mais baixa e para quando encontra "
+"uma correspondência."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1337,7 +1424,7 @@ msgstr "Consumível"
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr "A moeda na qual o campo está definido."
+msgstr "A divisa na qual o campo actual está definido."
 
 #. module: product
 #: help:product.template,weight:0
@@ -1348,22 +1435,22 @@ msgstr "Peso bruto em Kg."
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr "Aquisição"
+msgstr "Aprovisionamento"
 
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr "Categoria UoM"
+msgstr "Categoria de UdM"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr "Pacote"
+msgstr "Estante"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida de Compra"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1377,16 +1464,19 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Aqui está uma lista de todos os seus produtos classificados por categoria. "
+"Pode clicar numa categoria para conseguir uma lista de todos os produtos "
+"ligados a esta categoria ou a um descendente desta categoria."
 
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr "Regular configuração do processador"
+msgstr "Configuração habitual de processador"
 
 #. module: product
 #: code:addons/product/product.py:142
@@ -1395,6 +1485,8 @@ msgid ""
 "Conversion from Product UoM m to Default UoM PCE is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Conversão entre UdM de Produto m para UdM por defeito UNI não é possível "
+"porque ambas pertencem a categorias diferentes!."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1409,6 +1501,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Tempo médio em dias para produzir este produto. Este é só para a ordem de "
+"produção e, se for uma lista de material multi-nível, será só para o nível "
+"deste produto. Tempos de entrega diferentes serão somados para todos os "
+"níveis e ordens de compra."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -1416,8 +1512,8 @@ msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
 msgstr ""
-"Quantidade actual de produtos em locais seleccionados ou todos os internos "
-"se nenhuma for seleccionada."
+"Quantidade actual de produtos nas localizações seleccionadas ou todos os "
+"internos se nenhuma for seleccionada."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
@@ -1430,6 +1526,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Se o campo \"activo\" estiver marcado com falso, irá permitir esconder a "
+"lista de preços sem a remover."
 
 #. module: product
 #: field:product.product,qty_available:0
@@ -1439,7 +1537,7 @@ msgstr "Stock Real"
 #. 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
@@ -1461,17 +1559,17 @@ msgstr "Precisão de Arredondamento"
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Propriedades de Unidade de Medida"
 
 #. 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
 msgid "Buy"
-msgstr "Comprar"
+msgstr "Compra"
 
 #. module: product
 #: view:product.uom.categ:0
@@ -1486,7 +1584,7 @@ msgstr "O peso do UL vazio"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Menor que a UdM de referência"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1500,33 +1598,33 @@ msgstr "Activo"
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr "Margem de Preço Variante"
+msgstr "Margem de Preço da Variante"
 
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "O rácio de conversão para uma unidade de medida não pode ser 0!"
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr "O código EAN da unidade da embalagem"
+msgstr "O código EAN da unidade da embalagem."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr "Peso da Embalagem Vazia"
+msgstr "Peso da Embalagem Vazia (Tara)"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr "Campo Produto"
+msgstr "Campo do Produto"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
 msgid "Pricelists Types"
-msgstr "Tipos de Listas de Preço"
+msgstr "Tipos de Listas de Preços"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1534,16 +1632,19 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Quantas vezes esta UdM é menor que a UdM de referência nesta categoria:\n"
+"1 * (unidade de referência) = rácio * (esta unidade)"
 
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr "Unidade de Medida Padrão utilizada para todas as operações de stock."
+msgstr ""
+"Unidade de Medida Padrão utilizada para todas as operações de inventário."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "Diversos"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
@@ -1564,22 +1665,22 @@ msgstr "Intervenção no Local"
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr "Lista de Preços Públicos"
+msgstr "Lista de Preços Pública"
 
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Produtos Negociáveis"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Código de Produto de Fornecedor"
 
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr ""
+msgstr "UdM padrão"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1602,6 +1703,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 ""
+"Definir uma categoria de produto se esta regra só se aplica a produtos de "
+"uma categoria e seus descendentes. Manter vazio para todos os produtos"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1629,7 +1732,7 @@ msgstr "Produzir para Ordem de venda"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "O numero total de produtos que pode embalar por palete ou caixa"
 
 #. module: product
 #: field:product.product,variants:0
@@ -1645,23 +1748,23 @@ msgstr "Produtos por Categoria"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorias de Produtos"
 
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr "UdM -> UOS Coeff"
+msgstr "UDM -> UDV Coef"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "atribue a prioridade à lista fornecedores do produto."
 
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit Of Measure"
-msgstr ""
+msgstr "Unidade de Medida por defeito"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1681,7 +1784,7 @@ msgstr "Método de Arredondamento"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr "Rótulos de Produtos"
+msgstr "Etiquetas de Produtos"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
@@ -1701,7 +1804,7 @@ msgstr "A altura da embalagem"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr "Lista de Preço de Produtos"
+msgstr "Lista de Preços de Produtos"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1724,13 +1827,13 @@ msgid ""
 "price."
 msgstr ""
 "Preço de base para calcular o preço do cliente. Algumas vezes chamado de "
-"catálogo de preços."
+"preço de catálogo."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
-msgstr "Secção do Terceiro do formulário do produto"
+msgstr "Secção de terceiro do formulário de produto"
 
 #. module: product
 #: help:product.price.type,name:0
@@ -1740,12 +1843,12 @@ msgstr "Nome deste tipo de preço."
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "UdM do Fornecedor"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr "Data de inicio para esta versão da lista de preço para ser válida."
+msgstr "Data de inicio para esta versão da lista de preço ser válida."
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1753,6 +1856,8 @@ 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 por defeito para ordens de compra. Deverá estar na mesma "
+"categoria que a unidade de medida por defeito."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
@@ -1762,17 +1867,17 @@ msgstr ""
 #. module: product
 #: field:product.packaging,length:0
 msgid "Length"
-msgstr "Cumprimento"
+msgstr "Comprimento"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Comprimento/Distancia"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr "Intervenção do Sénior no Local"
+msgstr "Intervenção Sénior no Local"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -1784,22 +1889,22 @@ msgstr "Tipo de Lista de Preços"
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "Outros Produtos"
 
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "Caracteristicas"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "Pode ser Vendido"
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr "Prazo de Entrega da Produção"
+msgstr "Prazo de Entrega de Fabrico"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
@@ -1814,7 +1919,7 @@ msgstr "Baseado em"
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "Matérias primas"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -1823,6 +1928,9 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"Inventário futuro para este produto de acordo com as localizações "
+"seleccionadas ou todas as internas se nenhuma foi seleccionada. Processado "
+"como: Stock Real - de saída + de entrada."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -1844,7 +1952,7 @@ msgstr "* ( 1 + "
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "O peso de uma embalagem, palete ou caixa."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
@@ -1854,12 +1962,12 @@ msgstr "HDD Seagate 7200.8 120GB"
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
 msgid "Employee"
-msgstr ""
+msgstr "Colaborador"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Prateleira de 100cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
@@ -1870,12 +1978,12 @@ msgstr "Categoria do Produto"
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "Nome da Lista de Preços"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Prazo de Entrega"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1883,6 +1991,8 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Ao desmarcar o campo \"Activo\" pode desactivar uma unidade de medida sem a "
+"eliminar."
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -1900,11 +2010,12 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Criar e gerir as dimensões de embalagem e tipos que existiram no sistema."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Painel Traseiro SH200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -1923,7 +2034,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 "Esta é a quantidade que será convertida na UdM por defeito"
 
 #. module: product
 #: field:product.packaging,ul:0
@@ -1933,7 +2044,7 @@ msgstr "Tipo de Embalagem"
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr "Pacote"
+msgstr "Embalagem"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
@@ -1958,12 +2069,12 @@ msgstr "Rato"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Tipo de UdM"
 
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "É utilizado como responsável de tarefa"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -1971,6 +2082,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á um múltiplo deste valor. Utilize 1.0 para uma "
+"UdM que não permiti divisões, como por exemplo uma peça."
 
 #. module: product
 #: view:product.product:0
@@ -1986,7 +2099,7 @@ msgstr "Linha"
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Painel Traseiro SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -2002,12 +2115,12 @@ msgstr "Pesos"
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro ! Não é possível criar membros associados recursivos."
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Despesas de Hotel"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2015,16 +2128,18 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Quantas vezes esta UdM é maior que a UdM de referencia nesta categoria:\n"
+"1 * (esta unidade) = rácio * (unidade de referência)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "Rack 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
-msgstr ""
+msgstr "Dá a ordem de sequência quando exibe um lista de embalagem."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -2042,6 +2157,8 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Este nome de produto de fornecedor será utilizado quando imprimir um pedido "
+"de cotação. Manter vazio para utilizar o interno."
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -2051,7 +2168,7 @@ msgstr "Variável"
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "Pode ser alugado"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -2062,7 +2179,7 @@ msgstr "Preço de Custo"
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr "Margem de Preço Mínimo"
+msgstr "Margem de Preço Min."
 
 #. module: product
 #: field:product.template,weight:0
@@ -2072,7 +2189,7 @@ msgstr "Peso bruto"
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Secção de Montagem"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
@@ -2082,7 +2199,7 @@ msgstr "Material Informático"
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr "Telefone de Suporte"
+msgstr "Suporte por telefone"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2091,15 +2208,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 que ele seja um múltiplo desse valor. \n"
-"Arredondamento é aplicado após o desconto, e antes da sobretaxa. \n"
-"Para obter preços que terminam em 9,99, definir o arredondamento para 10, "
-"sobretaxa -0,01"
+"Estabelece o preço de modo que seja um múltiplo deste valor.\n"
+"Arredondamento é aplicado após o desconto e antes da sobretaxa.\n"
+"Para obter preços que terminam em 9,99, definir o arredondamento 10, -0,01 "
+"sobretaxa"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -2109,17 +2226,17 @@ msgstr "Item da Lista de Preços"
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr "RAM em produra"
+msgstr "RAM por pedido"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr "Propriedades de Vendas"
+msgstr "Propriedades da venda"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "tonne"
-msgstr ""
+msgstr "tonelada"
 
 #. module: product
 #: view:product.product:0
@@ -2130,7 +2247,7 @@ msgstr "Atrasos"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "Criação do produto"
 
 #. module: product
 #: help:product.template,type:0
@@ -2139,6 +2256,9 @@ msgid ""
 "products with infinite stock, or for use when you have no inventory "
 "management in the system."
 msgstr ""
+"Mudará a forma pela qual o aprovisionamento será processado. Consumíveis são "
+"produtos armazenáveis com stock infinito, ou para utilizar quando não tem "
+"gestão de inventário no sistema."
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2151,12 +2271,14 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
 "products!"
 msgstr ""
+"Não foi possível resolver a categoria do produto, estão definidas categorias "
+"cíclicas de produtos!"
 
 #. module: product
 #: view:product.template:0
@@ -2174,8 +2296,8 @@ msgid ""
 "Quantities of products that are planned to arrive in selected locations or "
 "all internal if none have been selected."
 msgstr ""
-"Quantidade de produtos que estão planeadas para chegar em locais "
-"seleccionadas ou todos os internos se nenhum tiver sido seleccionado."
+"Quantidade de produtos que esta prevista chegar nas localizações "
+"seleccionadas ou todos as internas se nenhuma tiver sido seleccionada."
 
 #. module: product
 #: field:product.template,volume:0
@@ -2185,20 +2307,20 @@ msgstr "Volume"
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr "Caso"
+msgstr "Caixa"
 
 #. module: product
 #: view:product.product:0
 msgid "Product Variant"
-msgstr "Produto Variável"
+msgstr "Variante de Produto"
 
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Prateleiras"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Outra Lista de Preços"
@@ -2209,7 +2331,7 @@ msgstr "Outra Lista de Preços"
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr "Produto Modelo"
+msgstr "Modelo de produto"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -2225,7 +2347,7 @@ msgstr "Paletização"
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
-msgstr "Fim de ciclo de vida"
+msgstr "Fim do Ciclo-de-vida"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -2233,6 +2355,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 ""
+"Dá as diferentes formas de embalar o mesmo produto. Isto não tem impacto na "
+"ordem de recolha e é essencialmente utilizado se usa o modulo EDI."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2257,7 +2381,7 @@ msgstr "Preço de Venda"
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Tipo de Categoria"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -2270,6 +2394,8 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Coeficiente para converter UDM para UDV\n"
+" udv = udm * coef"
 
 #. module: product
 #: help:product.template,volume:0
@@ -2281,94 +2407,6 @@ msgstr "Volume em m3."
 msgid "Price Discount"
 msgstr "Desconto"
 
-#~ msgid "Palet"
-#~ msgstr "Palete"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensão da Palette"
-
-#~ msgid "Childs Categories"
-#~ msgstr "Categorias dependentes"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "O coeficiente para a formula:\n"
-#~ "coef (unidade base) = 1 (esta unidade)"
-
-#~ msgid "Paletization"
-#~ msgstr "Paletização"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "O coeficiente da formula:\n"
-#~ "1 (unidade base) = coef (esta unidade)"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Mudará a maneira que as aquisições são processadas, consumíveis são produtos "
-#~ "estocáveis com stock infinito, ou sem um gerenciamento de stock no sistema."
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "' Por em Stock': Quando necessário, tome do stock ou espere até o "
-#~ "reabastecimento . ' Por em Pedido': Quando necessário, compra ou produz para "
-#~ "o pedido aquisição."
-
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Este é o tempo médio entre a confirmação do pedido do cliente e a entrega "
-#~ "dos produtos terminados. É o tempo prometido aos seus clientes."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Método de cálculo do preço dessa regra"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Data de inicio de validade da versão dessa lista de preços"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Margem mínima do preço"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Data de fim de validade para essa versão de lista de preços"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Fornecedor do produto"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Margem máxima do preço"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "A regra apenas se aplica se o parceiro comprar/vender mais que essa "
-#~ "quantidade."
-
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d unidade"
-
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d unidades"
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter duas versões da lista de preços que se sobrepõem!"
-
-#~ msgid "Rentable product"
-#~ msgstr "Pode ser alugado"
-
 #~ msgid "Procure Method"
 #~ msgstr "Método de Aquisição"
 
@@ -2393,12 +2431,6 @@ msgstr "Desconto"
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Pode ver a lista de fornecedores do produto"
-
-#~ msgid "Packagings"
-#~ msgstr "Embalagens"
-
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 825341274e7..833f9fcd9fd 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Fixo"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Atenção !"
@@ -267,7 +267,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  Ex.: 1 * (esta unid.) = proporção * (unid. de referência)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produtos: "
@@ -556,7 +556,7 @@ msgid "Metal Cleats"
 msgstr "Presilhas de Metal"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1341,7 +1341,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensões do Pallet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -1754,7 +1754,7 @@ msgstr "Produtos por categoria"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorias de produtos"
 
 #. module: product
@@ -1836,7 +1836,7 @@ msgstr ""
 "catálogo."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Seção de parceiro na tela de produto."
@@ -2277,7 +2277,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2326,7 +2326,7 @@ msgid "Shelves"
 msgstr "Bandejas"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Outra lista"
@@ -2414,110 +2414,6 @@ msgstr "Volume em m3."
 msgid "Price Discount"
 msgstr "Desconto"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Este é o tempo médio entre a confirmação do pedido do cliente e a entrega "
-#~ "dos produtos. É o tempo que você promete a seus clientes."
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "O modo de cálculo do preço para esta regra."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Data de início de vigência desta lista de preços."
-
-#~ msgid "Childs Categories"
-#~ msgstr "Categorias filhas"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Margem Mínima de preço"
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter 2 listas de preços que sobrepoem!"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensão do palet"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Data de fim de validade desta lista de preço."
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Fornecedor do produto"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "A regra só se aplica se o parceiro compra / vende mais do que essa "
-#~ "quantidade."
-
-#~ msgid "Palet"
-#~ msgstr "Palet"
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Você pode ver a lista de fornecedores para esse produto."
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Define o preço como múltiplo deste valor\n"
-#~ "O arredondamento será aplicado após o desconto, e antes da sobretaxa.\n"
-#~ "Para ter preços que terminam por 9,99, use arredondamento 10, sobretaxa -0,01"
-
-#~ msgid "Packagings"
-#~ msgstr "Embalagens"
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unidades de medidas da mesma categoria podem ser convertidos entre si."
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "A quantidade calculada será um múltiplo desse valor. Utilizar 1,0 para os "
-#~ "produtos que não podem ser fracionados."
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Margem máxima de preço"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Vai mudar a forma como são tratados aquisições, consumíveis são produtos "
-#~ "estocáveis com estoque mínimo, ou sem uma gestão de saldo."
-
-#~ msgid "Paletization"
-#~ msgstr "Paletização"
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "O custo contábil do produto. Ele pode servir como preço base para o preço de "
-#~ "compra"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "O coeficiente para a formula:\n"
-#~ "coef (unid base) = 1(está unid)"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Fazer para Estoque': Sempre que necessário, tomar apartir do estoque ou "
-#~ "esperar até reabastecer. 'Faça para Pedido': Sempre que necessário, adquirir "
-#~ "ou produzir através de um pedido"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2656,16 +2552,6 @@ msgstr "Desconto"
 #~ "Defina uma categoria de produto, se esta regra apenas se aplica aos produtos "
 #~ "de uma categoria e seus filhos. Mantenha em branco para todos os produtos"
 
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "O coeficiente pra a fórmula:\n"
-#~ "1 (unidade base) = coef (esta unidade)"
-
-#~ msgid "Rentable product"
-#~ msgstr "Produto locável"
-
 #~ msgid ""
 #~ "The cost of the product for accounting stock valuation. It can serves as a "
 #~ "base price for supplier price."
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index af401f85416..e4fbea3b172 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -112,8 +112,8 @@ msgstr "Fixat"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Atenţie !"
@@ -264,7 +264,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  : 1 * (această unitate) = rația * (unitatea de referință)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produse: "
@@ -551,7 +551,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1275,7 +1275,7 @@ msgid "Pallet Dimension"
 msgstr "Dimensiune palet"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
@@ -1665,7 +1665,7 @@ msgstr "Produse după categorie"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorii Produse"
 
 #. module: product
@@ -1747,7 +1747,7 @@ msgstr ""
 "numit și prețul de catalog."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Secțiunea partener a formularului de produs"
@@ -2167,7 +2167,7 @@ msgid "Description"
 msgstr "Descriere"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2214,7 +2214,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Altă listă de preţuri"
@@ -2317,12 +2317,6 @@ msgstr "Discount preţ"
 #~ msgid "In Production"
 #~ msgstr "În producţie"
 
-#~ msgid "Packagings"
-#~ msgstr "Ambalaje"
-
-#~ msgid "Palet"
-#~ msgstr "Palet"
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
@@ -2330,17 +2324,6 @@ msgstr "Discount preţ"
 #~ "Cantitatea minimă de aprovizionat de la acest furnizor, exprimat în unitatea "
 #~ "de măsură implicită."
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Acesta este timpul mediu dintre confirmarea comenzii clientului şi livrarea "
-#~ "produselor finite. Acesta este timpul promis clienţilor."
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimensiune palet"
-
 #~ msgid "Create new Product"
 #~ msgstr "Creare produs nou"
 
@@ -2353,12 +2336,6 @@ msgstr "Discount preţ"
 #~ msgid "Customer Price"
 #~ msgstr "Pret client"
 
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Modul de calculare a pretului pentru aceasta regula."
-
-#~ msgid "Rentable product"
-#~ msgstr "Produs inchiriabil"
-
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
@@ -2371,50 +2348,9 @@ msgstr "Discount preţ"
 #~ msgid "Procure Method"
 #~ msgstr "Metoda de aprovizionare"
 
-#~ msgid "Supplier of Product"
-#~ msgstr "Furnizor de produs"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr ""
-#~ "Data de inceput pentru valabilitatea aceste versiuni de lista de preturi."
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Va schimba modul in care este procesata aprovizionarea; consumabilele sunt "
-#~ "produse stocabile cu stoc infinit si pentru care nu se tine evindenta "
-#~ "stocului in sistem."
-
-#~ msgid "Childs Categories"
-#~ msgstr "Categorii copil"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Marja max. de pret"
-
-#~ msgid ""
-#~ "Sets the price so that it is a multiple of this value.\n"
-#~ "Rounding is applied after the discount and before the surcharge.\n"
-#~ "To have prices that ends by 9.99, set rounding 10, surcharge -0.01"
-#~ msgstr ""
-#~ "Selectai pretul ca multiplu al acestei valori.\n"
-#~ "Rotunjirea se aplica dupa discount si inainte de rmajorare.\n"
-#~ "Pentru a avea preturi care se termina cu 9.99, selectati rotunjire 10 si "
-#~ "majorare la -0.01."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru afisarea formularului!"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Puteti vedea lista de furnizori pentru acel produs."
-
-#~ msgid ""
-#~ "The cost of the product for accounting stock valorisation. It can serves as "
-#~ "a base price for supplier price."
-#~ msgstr ""
-#~ "Costul produsului pentru contabilizarea valorii stocului. Poate fi folosit "
-#~ "ca pret de baza pentru pret furnizor."
-
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2422,59 +2358,6 @@ msgstr "Discount preţ"
 #~ "Determină dacă produsul este vizibil în lista de produse folosită în "
 #~ "poziţiile din comanda de vânzare."
 
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr ""
-#~ "Unitatile de masura din aceeasi categorie pot fi convertite intre ele."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Produce pe stoc': cand e necesar, ia de pe stoc sau astaepta furnizarea. "
-#~ "\"Produce la comanda': cand e necesar, cumpara sau produce conform "
-#~ "necesarului."
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Regula se aplica numai daca partenerul cumpara/vinde mai mult decat aceasta "
-#~ "cantitate."
-
-#~ msgid ""
-#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
-#~ "that can not be splitted."
-#~ msgstr ""
-#~ "Cantitatea calculata va fi multiplu al acestei valori. Folositi 1.0 pentru "
-#~ "produsele care nu pot fi 'explodate'."
-
-#~ msgid "Paletization"
-#~ msgstr "Paletizare"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Data sfarsit de valabilitate a acesti versiuni de lista de preturi."
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Margine pret min."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Coeficiuentul pentru formula:\n"
-#~ "1 (Um baza) = coef (aceasta UM)"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
 #~ msgid "List Price"
 #~ msgstr "Listă Preţuri"
 
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index dd262bbf6b8..daad08a7abb 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -105,7 +105,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Количество поставщика"
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -114,8 +114,8 @@ msgstr "Фиксированный"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Внимание !"
@@ -258,15 +258,15 @@ msgstr "Каталог продаж"
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr "Тип ТМЦ"
+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:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "ТМЦ: "
@@ -421,6 +421,10 @@ msgid ""
 "information about your products related to procurement logistics, sales "
 "price, product category, suppliers and so on."
 msgstr ""
+"ТМЦ могут продаваться и покупаться. ТМЦ могут быть сырьем, складируемым "
+"товаром, расходными материалами или услугами. Форма ввода ТМЦ содержит "
+"подробную информацию о правилах снабжения, цене продажи, категории ТМЦ, "
+"поставщиках и т.д."
 
 #. module: product
 #: view:product.pricelist:0
@@ -545,7 +549,7 @@ msgid "Metal Cleats"
 msgstr "Металлические зажимы"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -577,7 +581,7 @@ 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
@@ -665,6 +669,9 @@ 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
@@ -901,7 +908,7 @@ 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
@@ -986,6 +993,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
@@ -1052,6 +1062,10 @@ msgid ""
 "be converted to each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
 msgstr ""
+"Создание категорий единиц измерения и управление ими в вашей системе. Если "
+"несколько единиц измерения принадлежат к одной категории, то они должны "
+"конвертироваться друг в друга. Например, в категории измерения \"Время\" вы "
+"можете иметь единицы измерения: часы, дни."
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1120,6 +1134,10 @@ 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
@@ -1285,7 +1303,7 @@ msgid "Pallet Dimension"
 msgstr "Размер поддона"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (копия)"
@@ -1361,6 +1379,9 @@ 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
@@ -1524,7 +1545,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Меньше чем базовая ед.изм."
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1573,6 +1594,8 @@ 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
 #: help:product.template,uom_id:0
@@ -1642,6 +1665,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
@@ -1654,7 +1679,7 @@ msgstr ""
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr "Товарно-материальные ценности"
+msgstr "ТМЦ"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1686,13 +1711,13 @@ msgstr "ТМЦ по категориям"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Категории ТМЦ"
 
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr ""
+msgstr "Ед.изм -> Ед.прод. Коэфф"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
@@ -1767,7 +1792,7 @@ msgstr ""
 "Базовая цена для расчёта цены продажи. Иногда называется справочой ценой."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Раздел партнера в форме ввода ТМЦ"
@@ -2064,6 +2089,8 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Во сколько раз эта ед.изм. больше чем базовая ед.изм. в этой категории:\n"
+"1 * (эта единица) = коэффициент * (базовая единица)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
@@ -2204,7 +2231,7 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2253,7 +2280,7 @@ msgid "Shelves"
 msgstr "Полки"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Другой прайс"
@@ -2325,6 +2352,8 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Коэффициент преобразования Ед.изм. в Ед.Прод.\n"
+" ед.изм. = ед.прод. * К"
 
 #. module: product
 #: help:product.template,volume:0
@@ -2336,50 +2365,6 @@ msgstr "Объём в метрах куб."
 msgid "Price Discount"
 msgstr "Скидка с цены"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Невозможно использовать 2 перекрывающиеся версии каталогов!"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Макс. маржа цены"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Цена при мин. марже"
-
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Это среднее время между подтверждением клиентом заказа и поставкой готовой "
-#~ "продукции. Это то время, которое вы обещаете вашим клиентам."
-
-#~ msgid "Rentable product"
-#~ msgstr "Арендуемая продукция"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Изготовление про запас': Когда требуется, берется со клада либо хранится до "
-#~ "восстановления продукции. 'Изготовление на заказ': Когда требуется, "
-#~ "закупается либо производится по требованию снабжения."
-
-#~ msgid "Childs Categories"
-#~ msgstr "Категории потомков"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Поставщик продукции"
-
-#~ msgid ""
-#~ "The rule only apply if the partner buys/sells more than this quantity."
-#~ msgstr ""
-#~ "Правило применяется только тогда, когда партнёр покупает/продаёт больше, чем "
-#~ "это кодичество."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Вы можете просматривать список поставщиков этой продукции."
-
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2521,77 +2506,3 @@ msgstr "Скидка с цены"
 #~ msgstr ""
 #~ "Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
 #~ "категориям."
-
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Не удается определить категорию ТМЦ, '\\n' вы зациклили категории ' \\n 'ТМЦ!"
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr ""
-#~ "Дает порядок последовательности при выводе элементов списка каталога."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Для объектов osv_memory правила не поддерживаются !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Ед. изм. ТМЦ поставщика."
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "Нет активной версии для выбранного каталога!\n"
-#~ "' \\n 'Пожалуйста, создайте или активируйте каталог."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
-#~ "ТМЦ без ее удаления."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
-#~ "каталог без его удаления."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "Минимальное количество продукции закупаемой у этого поставщика, в единицах "
-#~ "измерения по умолчанию."
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Название группы должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Shortcut for this menu already exists!"
-#~ msgstr "Закладка для этого меню уже существует !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Вы не можете иметь двух одинаковых пользователей !"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Выбранная компания недоступна для этого пользователя"
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 93f5b5941ea..a358facbc8e 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Pevný"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Varovanie!"
@@ -263,7 +263,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  napr.: 1 * (táto jednotka) = pomer * (referenčná jednotka)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produkty: "
@@ -541,7 +541,7 @@ msgid "Metal Cleats"
 msgstr "Kovové kufre"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1270,7 +1270,7 @@ msgid "Pallet Dimension"
 msgstr "Rozmery palety"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1656,7 +1656,7 @@ msgstr "Produkty podľa kategórie"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
@@ -1736,7 +1736,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2154,7 +2154,7 @@ msgid "Description"
 msgstr "Popis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2199,7 +2199,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
@@ -2335,16 +2335,6 @@ msgstr ""
 #~ msgid "Rentable Product"
 #~ msgstr "Produkt na prenájom"
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Používajú spoločnosti, ktoré spravujú dve merné jednotky: fakturáciu a "
-#~ "riadenie zásob. Napríklad, v potravinárskom priemysle, budete riadiť "
-#~ "populácie šunky, ale fakturovať za Kg. Ponechajte prázdne pre predvolené "
-#~ "použiie  UOM."
-
 #~ msgid "Default UoM"
 #~ msgstr "Prednastavená MJ"
 
@@ -2360,27 +2350,5 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
 
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Názov skupiny musí byť jedinečný!"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Chyba: UOS musia byť v inej kategórii, ako merné jednotky"
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Udáva poradie pri zobrazovaní zoznamu riadkov cenníka."
-
-#~ msgid ""
-#~ "A pricelist contains rules to be evaluated in order to compute the purchase "
-#~ "or sale price for all the partners assigned to a pricelist. Pricelists have "
-#~ "several versions (2010, 2011, Promotion of February 2010, etc.) and each "
-#~ "version has several rules. Example: the customer price of this category of "
-#~ "product will be based on the supplier price multiplied by 1.80."
-#~ msgstr ""
-#~ "Cenník obsahuje pravidlá, ktoré sa sa vyhodnotia na výpočet nákupnej alebo "
-#~ "predajnej ceny pre všetkých priradených partnerov. Cenníky môžu mať niekoľko "
-#~ "verzií (2010, 2011, reklamný na február 2010, atď...) každá verzia ma "
-#~ "niekoľko pravidiel. Napríklad: cena pre zákazníka v tejto kategórií bude "
-#~ "založená na cene od dodávateľa vynásobenej 1,80."
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index 3fb1d9eca62..07cc3ed271c 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -112,8 +112,8 @@ msgstr "Stalno"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Opozorilo!"
@@ -261,7 +261,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  tj.: 1 * (ta enota) = razmerje * (referenčna enota)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Produkti "
@@ -529,7 +529,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1246,7 +1246,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1632,7 +1632,7 @@ msgstr "Izdelki po kategorijah"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorije proizvodov"
 
 #. module: product
@@ -1712,7 +1712,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2130,7 +2130,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2175,7 +2175,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
@@ -2258,68 +2258,6 @@ msgstr "Prostornina v m3"
 msgid "Price Discount"
 msgstr "Popust"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "To je povprečni čas med potrditvijo kupčevega naročila in dostavo dokončanih "
-#~ "izdelkov. V bistvu je čas, ki ste ga obljubili vašim kupcem."
-
-#~ msgid "Childs Categories"
-#~ msgstr "Podkategorije"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Min.marža"
-
-#~ msgid ""
-#~ "Will change the way procurements are processed, consumable are stockable "
-#~ "products with infinite stock, or without a stock management in the system."
-#~ msgstr ""
-#~ "Določa, kako se obdelujejo nabave, potrošni material so izdelki z neomejeno "
-#~ "zalogo, ali pa brez upravljanja zaloge v sistemu."
-
-#~ msgid "Palet"
-#~ msgstr "Paleta"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Dimenzije palete"
-
-#~ msgid "Rentable product"
-#~ msgstr "Najemljiv izdelek"
-
-#~ msgid ""
-#~ "'Make to Stock': When needed, take from the stock or wait until "
-#~ "refurnishing. 'Make to Order': When needed, purchase or produce for the "
-#~ "procurement request."
-#~ msgstr ""
-#~ "'Iz zaloge': Ko je potreba, vzemi iz zaloge ali počakaj, dokler ni na "
-#~ "voljo.\n"
-#~ "'Naroči': Ko je potreba, nabavi ali proizvedi glede na nabavne zahteve."
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Koeficient za formulo:\n"
-#~ "koef (osnovna enota) = 1 (ta enota)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Koeficient za formulo:\n"
-#~ "1 (osnova nenota) = koef (ta enota)"
-
-#~ msgid "Paletization"
-#~ msgstr "Paletizacija"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Maks.marža"
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Ne morete imeti 2 različic cenika, ki se prekrivata."
-
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
 #~ "unit of measure."
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 66278a83357..fba3b9e9df4 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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:18+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -107,8 +107,8 @@ msgstr ""
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1233,7 +1233,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1619,7 +1619,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
@@ -1699,7 +1699,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2117,7 +2117,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2162,7 +2162,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index bea8cf7e33b..fe484cf3433 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: 2011-04-29 05:18+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -113,8 +113,8 @@ msgstr "Fiksno"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje !"
@@ -264,7 +264,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  npr: 1* (ovaj komad) = odnos * (referentni komad)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -539,7 +539,7 @@ msgid "Metal Cleats"
 msgstr "Metalne Stege"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1276,7 +1276,7 @@ msgid "Pallet Dimension"
 msgstr "Dimenzije palete"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopiraj)"
@@ -1676,7 +1676,7 @@ msgstr "Proizvodi po kategoriji"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorije proizvoda"
 
 #. module: product
@@ -1757,7 +1757,7 @@ msgstr ""
 "Osnovna cena za izračunavanje cene za kupca. Nekada se zove kataloška cena."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Deo za partnera u formi proizvoda"
@@ -2195,7 +2195,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2242,7 +2242,7 @@ msgid "Shelves"
 msgstr "Police"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Ostali cenovnici"
@@ -2457,9 +2457,6 @@ msgstr "Popust"
 #~ "Daje različite načine pakovanja istog proizvoda. Ovo nema uticaja na "
 #~ "otpremnicu i uglavnom se koristi kod EDI modula."
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Ne možete da imate dva cenovnika koja se preklapaju!"
-
 #~ msgid ""
 #~ "The coefficient for the formula:\n"
 #~ "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
@@ -2584,56 +2581,3 @@ msgstr "Popust"
 
 #~ msgid "Partner Product Name"
 #~ msgstr "Partnerov naziv proizvoda"
-
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Nije moguce resisti kategoriju proizvoda, '\\n'imas definisane ciklicne "
-#~ "kategorije '\\n'proizvoda!"
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Daje redosled sekvenci pri prikazu liste stavki cenovnika."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes "
-#~ "cenovnik bez njegovog uklanjanja."
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "Nema aktivne verzije selektovanog cenovnika !\n"
-#~ "' \\'Molim kreirajte novi ili aktivirajte neki."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Nr mozes kreirati rekursivni meni"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes "
-#~ "proizvod bez uklanjanja."
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Dobavljaceva JM Proizvoda"
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "Minimalna kolicina za nabavku od ovog dobavljaca, izrazenoj u podrazumevanoj "
-#~ "jedinici mere"
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index 001d0b0ae36..539886a9548 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -113,8 +113,8 @@ msgstr "Fiksno"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje !"
@@ -264,7 +264,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  npr: 1* (ovaj komad) = odnos * (referentni komad)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Proizvodi: "
@@ -539,7 +539,7 @@ msgid "Metal Cleats"
 msgstr "Metalne Stege"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1276,7 +1276,7 @@ msgid "Pallet Dimension"
 msgstr "Dimenzije palete"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopiraj)"
@@ -1676,7 +1676,7 @@ msgstr "Proizvodi po kategoriji"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorije proizvoda"
 
 #. module: product
@@ -1757,7 +1757,7 @@ msgstr ""
 "Osnovna cena za izračunavanje cene za kupca. Nekada se zove kataloška cena."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Deo za partnera u formi proizvoda"
@@ -2195,7 +2195,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2242,7 +2242,7 @@ msgid "Shelves"
 msgstr "Police"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Ostali cenovnici"
@@ -2336,45 +2336,9 @@ msgstr "Popust"
 #~ msgstr ""
 #~ "Greška: JU (jedinice usluga)  i JM moraju da budu u različitim kategorijama"
 
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Nije moguce resisti kategoriju proizvoda, '\\n'imas definisane ciklicne "
-#~ "kategorije '\\n'proizvoda!"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes "
-#~ "cenovnik bez njegovog uklanjanja."
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Daje redosled sekvenci pri prikazu liste stavki cenovnika."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "Nema aktivne verzije selektovanog cenovnika !\n"
-#~ "' \\'Molim kreirajte novi ili aktivirajte neki."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Nr mozes kreirati rekursivni meni"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -2383,23 +2347,6 @@ msgstr "Popust"
 #~ msgid "List Price"
 #~ msgstr "Spisak cena"
 
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Dobavljaceva JM Proizvoda"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the product "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Ako je aktivno polje postavljeno na ISTINA, omogucava ti da sakrijes "
-#~ "proizvod bez uklanjanja."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "Minimalna kolicina za nabavku od ovog dobavljaca, izrazenoj u podrazumevanoj "
-#~ "jedinici mere"
-
 #~ msgid ""
 #~ "Set a category of product if this rule only apply to products of a category "
 #~ "and his childs. Keep empty for all products"
@@ -2525,9 +2472,6 @@ msgstr "Popust"
 #~ "Daje različite načine pakovanja istog proizvoda. Ovo nema uticaja na "
 #~ "otpremnicu i uglavnom se koristi kod EDI modula."
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Ne možete da imate dva cenovnika koja se preklapaju!"
-
 #~ msgid ""
 #~ "The coefficient for the formula:\n"
 #~ "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index f8d5913d2c8..16ee9b9aa89 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -110,8 +110,8 @@ msgstr "Fast"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Varning !"
@@ -261,7 +261,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Products: "
@@ -536,7 +536,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1271,7 +1271,7 @@ msgid "Pallet Dimension"
 msgstr "Palldimensioner"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
@@ -1663,7 +1663,7 @@ msgstr "Produkter per kategori"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Produktkategorier"
 
 #. module: product
@@ -1743,7 +1743,7 @@ msgid ""
 msgstr "Pris för att beräkna kundpriset, även kallat katalogpris."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Partner section of the product form"
@@ -2175,7 +2175,7 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2224,7 +2224,7 @@ msgid "Shelves"
 msgstr "Hyllor"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Other Pricelist"
@@ -2309,9 +2309,6 @@ msgstr "Volymen i kubikmeter"
 msgid "Price Discount"
 msgstr "Prisrabatt"
 
-#~ msgid "Rentable product"
-#~ msgstr "Hyrbar produkt"
-
 #~ msgid "Procure Method"
 #~ msgstr "Inköpsmetod"
 
@@ -2430,15 +2427,6 @@ msgstr "Prisrabatt"
 #~ msgid "Rate"
 #~ msgstr "Taxa"
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr ""
-#~ "Används av företag som förvaltar olika måttenheter vid fakturering och "
-#~ "lagerhantering. Till exempel i livsmedelsindustrin, kommer du att klara ett "
-#~ "lager med skinka utan faktura i kg. Vid tomt används standardmåttenheten."
-
 #~ msgid "Purchase UoM"
 #~ msgstr "Inköpsenhet"
 
@@ -2557,16 +2545,6 @@ msgstr "Prisrabatt"
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
-#~ msgid "Price List Name:"
-#~ msgstr "Price List Name:"
-
-#~ msgid ""
-#~ "Conversion from Product UoM %s to Default UoM %s is not possible as they "
-#~ "both belong to different Category!"
-#~ msgstr ""
-#~ "Conversion from Product UoM %s to Default UoM %s is not possible as they "
-#~ "both belong to different Category!"
-
 #~ msgid ""
 #~ "Used by companies that manages two unit of measure: invoicing and stock "
 #~ "management. For example, in food industries, you will manage a stock of ham "
@@ -2576,22 +2554,6 @@ msgstr "Prisrabatt"
 #~ "management. For example, in food industries, you will manage a stock of ham "
 #~ "but invoice in Kg. Keep empty to use the default UOM."
 
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-
-#~ msgid "Product Pricelist"
-#~ msgstr "Product Pricelist"
-
-#~ msgid "Printing Date :"
-#~ msgstr "Printing Date :"
-
 #~ msgid ""
 #~ "Will change the way procurements are processed. Consumables are stockable "
 #~ "products with infinite stock, or for use when you have no stock management "
@@ -2601,81 +2563,8 @@ msgstr "Prisrabatt"
 #~ "products with infinite stock, or for use when you have no stock management "
 #~ "in the system."
 
-#~ msgid "units"
-#~ msgstr "units"
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-
-#~ msgid "Currency :"
-#~ msgstr "Currency :"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Namned på gruppen måste vara unikt!"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
 
 #~ 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 ""
-#~ "Create and manage the units of measure you want to be used in your system. "
-#~ "You can define a conversion rate to be used between the several Unit of "
-#~ "Measure within the same category."
-#~ msgstr ""
-#~ "Lägg upp och underhåll de enheter som du vill använda i systemet. Du kan "
-#~ "använda omräkningsfaktorer mellan olika enheter med samma kategori."
-
-#~ msgid ""
-#~ "You must define a Product for everything you buy or sell. They can be raw "
-#~ "materials, stockable products, consumables or services. The Product form "
-#~ "contains a detailed information of your products related to procurement "
-#~ "logistics, sales price, product category, suppliers and so on."
-#~ msgstr ""
-#~ "Du måste definiera en produkt för allt som du köper eller säljer. Det kan "
-#~ "vara råmterial, lagerprodukter, förbrukningsprodukter eller tjänster. "
-#~ "Produktsidan innehåller detaljerad information om dina produkter relaterad "
-#~ "till logistik, försäljningspriser, produktkategorier, leverantörer mm."
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "Leverantörens enhet"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Detta företag är inte tillåtet för den här användaren"
-
-#~ msgid "Gives the sequence order when displaying a list of pricelist items."
-#~ msgstr "Anger sorteringsordningen när prislisteposter visas."
-
-#~ msgid ""
-#~ "Products can be purchased and/or sold. They can be raw materials, stockable "
-#~ "products, consumables or services. The Product form contains a detailed "
-#~ "information on your  products related to procurement logistics, sales price, "
-#~ "product category, suppliers and so on."
-#~ msgstr ""
-#~ "Produkter kan köpas och/eller säljas. De kan vara råmaterial, lagerförda "
-#~ "artiklar, förbrukningsprodukter eller tjänster. Produktsidan innehåller "
-#~ "detaljerad information om dina produkter relaterat till "
-#~ "anskaffningslogistik, försäljningspris, produktkategorier, leverantörer och "
-#~ "så vidare."
-
-#~ msgid ""
-#~ "The minimal quantity to purchase to this supplier, expressed in the default "
-#~ "unit of measure."
-#~ msgstr ""
-#~ "Den minsta kvantitet som skall vid inköp från denna leverantör, uttryckt i "
-#~ "standard enheten."
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Du kan inte ha två användare med samma användarid!"
diff --git a/addons/product/i18n/th.po b/addons/product/i18n/th.po
index 39a989ff4a3..e8482253471 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -107,8 +107,8 @@ msgstr ""
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "ระวัง!"
@@ -254,7 +254,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "สินค้า "
@@ -522,7 +522,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1233,7 +1233,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1619,7 +1619,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
@@ -1699,7 +1699,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2117,7 +2117,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2162,7 +2162,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index a90f4ea7b6e..531ff1a201d 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -106,8 +106,8 @@ msgstr ""
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -253,7 +253,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -521,7 +521,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1232,7 +1232,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1618,7 +1618,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: product
@@ -1698,7 +1698,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2116,7 +2116,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2161,7 +2161,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 4217b9c98bc..56e17763c11 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -114,8 +114,8 @@ msgstr "Sabitlendi"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "Uyarı !"
@@ -266,7 +266,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  Ör: 1 * (birim) = oran * (kaynak birim)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "Ürünler: "
@@ -551,7 +551,7 @@ msgid "Metal Cleats"
 msgstr "Metal takoz"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1324,7 +1324,7 @@ msgid "Pallet Dimension"
 msgstr "Palet Boyutu"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (kopya)"
@@ -1734,7 +1734,7 @@ msgstr "Kategori Bazında Ürün"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Ürün Kategorisi"
 
 #. module: product
@@ -1816,7 +1816,7 @@ msgstr ""
 "olarak da geçer."
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "Ürün formunun İş ortağı bölümü"
@@ -2254,7 +2254,7 @@ msgid "Description"
 msgstr "Açıklama"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2303,7 +2303,7 @@ msgid "Shelves"
 msgstr "Raflar"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "Diğer Fiyat Listesi"
@@ -2396,12 +2396,6 @@ msgstr "Fiyat İskontosu"
 #~ msgid "Customer Price"
 #~ msgstr "Müşteri Fiyatı"
 
-#~ msgid "Supplier of Product"
-#~ msgstr "Ürün tedarikçisi"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Palet boyutu"
-
 #~ msgid "Number of Layer"
 #~ msgstr "Tabaka Sayısı"
 
@@ -2411,51 +2405,24 @@ msgstr "Fiyat İskontosu"
 #~ msgid "Priority"
 #~ msgstr "Öncelik"
 
-#~ msgid "Palet"
-#~ msgstr "Palet"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "En Yüksek Fiyat Marjini"
-
-#~ msgid "Rentable product"
-#~ msgstr "Kiralanabilir ürün"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "En Düşük Fiyat Marjini"
-
 #~ msgid "Price list"
 #~ msgstr "Fiyat Listesi"
 
 #~ msgid "Cancel"
 #~ msgstr "İptal"
 
-#~ msgid "Childs Categories"
-#~ msgstr "Alt Kategorisi"
-
 #~ msgid "Prices & Suppliers"
 #~ msgstr "Fiyatlar & Tedarikçiler"
 
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Bu fiyat listesi sürümünün, geçerlilik başlangıç tarihi."
-
 #~ msgid "Prices Computations"
 #~ msgstr "Fiyat Hesaplamaları"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Bu ürün için tedarikçi listesini görebilirsiniz."
-
 #~ msgid "Can be sold"
 #~ msgstr "Satılabilir"
 
 #~ msgid "Rate"
 #~ msgstr "Oran"
 
-#~ msgid "Packagings"
-#~ msgstr "Paketlemeler"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Fiyat listesi son geçerlilik tarihi"
-
 #~ msgid "Configuration"
 #~ msgstr "Ayarlar"
 
@@ -2505,9 +2472,3 @@ msgstr "Fiyat İskontosu"
 
 #~ msgid "Delivery Delay"
 #~ msgstr "Temin Gecikmesi"
-
-#~ msgid "Currency :"
-#~ msgstr "Döviz :"
-
-#~ msgid "Printing Date :"
-#~ msgstr "Yazdırma Tarihi :"
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index 21d1031e105..d00228914ae 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -106,8 +106,8 @@ msgstr "Фіксований"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -253,7 +253,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -521,7 +521,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1237,7 +1237,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1623,7 +1623,7 @@ msgstr "Продукти за категоріями"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Категорії продуктів"
 
 #. module: product
@@ -1703,7 +1703,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2121,7 +2121,7 @@ msgid "Description"
 msgstr "Опис"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2166,7 +2166,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
@@ -2249,71 +2249,6 @@ msgstr ""
 msgid "Price Discount"
 msgstr "Знижка"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr ""
-#~ "Середній час між підтвердженням заявки клієнта і доставкою йому готової "
-#~ "продукції. Це час, який Ви обіцяєте своїм клієнтам."
-
-#~ msgid "Childs Categories"
-#~ msgstr "Дочірні категорії"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "Мін. націнка"
-
-#~ msgid "Palette Dimension"
-#~ msgstr "Розмір Палети"
-
-#~ msgid "Palet"
-#~ msgstr "Піддон"
-
-#~ msgid "Rentable product"
-#~ msgstr "Може здаватись в оренду"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "coef (base unit) = 1 (this unit)"
-#~ msgstr ""
-#~ "Коефіцієнт для формули: \n"
-#~ "coef (базова одиниця) = 1 (дана одиниця)"
-
-#~ msgid ""
-#~ "The coefficient for the formula:\n"
-#~ "1 (base unit) = coef (this unit)"
-#~ msgstr ""
-#~ "Коефіцієнт для формули: \n"
-#~ "coef (базова одиниця) = 1 (дана одиниця)"
-
-#~ msgid "Paletization"
-#~ msgstr "Палетування"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Макс. націнка"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "Постачальник Продукту"
-
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "Метод обрахунку ціни для цього правила."
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "Дата початку дії цієї версії прейскуранту."
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "Одиниці Виміру однієї категорії можуть конвертуватись одна в іншу."
-
-#~ msgid "Packagings"
-#~ msgstr "Упаковки"
-
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "Кінцева дата дійсності цієї версії прейскуранту."
-
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "Ви можете побачити список постачальників для цього продукту."
-
 #~ msgid "Procure Method"
 #~ msgstr "Метод доставки"
 
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index fab7b68520a..b5c6914a004 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-06-04 14:36+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-06-05 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -1655,7 +1655,7 @@ msgstr "Sản phẩm theo chủng loại"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Loại sản phẩm"
 
 #. module: product
@@ -2293,18 +2293,6 @@ msgstr "Chiết khấu"
 #~ msgid "Customer Price"
 #~ msgstr "Giá bán"
 
-#~ msgid "Supplier of Product"
-#~ msgstr "Nhà cung cấp sản phẩm"
-
-#~ msgid "Rentable product"
-#~ msgstr "Sản phẩm có thể cho thuê"
-
-#~ msgid "Childs Categories"
-#~ msgstr "Danh mục con"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "Lợi nhuận tối đa"
-
 #~ msgid "Number of Layer"
 #~ msgstr "Số lớp"
 
@@ -2320,16 +2308,9 @@ msgstr "Chiết khấu"
 #~ msgid "Price list"
 #~ msgstr "Bảng giá"
 
-#~ msgid "Packagings"
-#~ msgstr "Đóng gói"
-
 #~ msgid "Cancel"
 #~ msgstr "Hủy"
 
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d đơn vị"
-
 #~ msgid "Supplier Info"
 #~ msgstr "Thông tin nhà cung cấp"
 
@@ -2384,9 +2365,6 @@ msgstr "Chiết khấu"
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "Số lượng các lớp trên một palet hoặc trong một hộp"
 
-#~ msgid "Price List Name:"
-#~ msgstr "Tên bảng giá:"
-
 #~ msgid "Prices Computations"
 #~ msgstr "Bảng tính giá"
 
@@ -2432,13 +2410,6 @@ msgstr "Chiết khấu"
 #~ msgid "Suppliers of Product"
 #~ msgstr "Nhà cung cấp của sản phẩm"
 
-#~ msgid ""
-#~ "Conversion from Product UoM %s to Default UoM %s is not possible as they "
-#~ "both belong to different Category!"
-#~ msgstr ""
-#~ "Chuyển đổi từ ĐVĐ sản phẩm %s sang ĐVĐ mặc định %s không thể thực hiện do "
-#~ "chúng thuộc các loại khác nhau!"
-
 #~ msgid ""
 #~ "Unit of Measure of a category can be converted between each others in the "
 #~ "same category."
@@ -2458,25 +2429,9 @@ msgstr "Chiết khấu"
 #~ "kho. Ví dụ, trong ngành công nghiệp thực phẩm, bạn sẽ quản lý một kho thịt "
 #~ "nguội nhưng hóa đơn theo Kg. Để trống để sử dụng đơn vị đo mặc định."
 
-#, python-format
-#~ msgid ""
-#~ "Could not resolve product category, ' \\n                                    "
-#~ "'you have defined cyclic categories ' \\n                                    "
-#~ "'of products!"
-#~ msgstr ""
-#~ "Không thể quyết định loại sản phẩm, ' \\n                                    "
-#~ "'bạn đã định nghĩa các loại' \\n                                    'sản "
-#~ "phẩm tuần hoàn"
-
-#~ msgid "Product Pricelist"
-#~ msgstr "Bảng giá sản phẩm"
-
 #~ msgid "Purchase UoM"
 #~ msgstr "Đơn vị đo mua hàng"
 
-#~ msgid "Printing Date :"
-#~ msgstr "Ngày in  :"
-
 #~ msgid ""
 #~ "Gives the different ways to package the same product. This has no impact on "
 #~ "the packing order and is mainly used if you use the EDI module."
@@ -2538,62 +2493,6 @@ msgstr "Chiết khấu"
 #~ "cho đến khi giao hàng sản phẩm hoàn chỉnh. Đây là thời gian bạn hứa với "
 #~ "khách hàng."
 
-#~ msgid "units"
-#~ msgstr "đơn vị"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This is the base module for managing products and pricelists in Open "
-#~ "ERP.\n"
-#~ "\n"
-#~ "    Products support variants, different pricing methods, suppliers\n"
-#~ "    information, make to stock/order, different unit of measures,\n"
-#~ "    packaging and properties.\n"
-#~ "\n"
-#~ "    Pricelists support:\n"
-#~ "    * Multiple-level of discount (by product, category, quantities)\n"
-#~ "    * Compute price based on different criteria:\n"
-#~ "        * Other pricelist,\n"
-#~ "        * Cost price,\n"
-#~ "        * List price,\n"
-#~ "        * Supplier price, ...\n"
-#~ "    Pricelists preferences by product and/or partners.\n"
-#~ "\n"
-#~ "    Print product labels with barcode.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Đây là mô đun cơ bản để quản lý sản phẩm và bảng giá trong Open ERP.\n"
-#~ "\n"
-#~ "    Sản phẩm hỗ trợ các biến thể, các phương pháp định giá khác nhau, các "
-#~ "nhà cung cấp\n"
-#~ "    thông tin, sản xuất theo nhu cầu dự đoán/theo đơn đặt hàng, các đơn vị "
-#~ "đo khác nhau,\n"
-#~ "    đóng gói và đặc tính.\n"
-#~ "\n"
-#~ "    Bảng giá hỗ trợ:\n"
-#~ "    * Chiết khấu với nhiều cấp độ (theo sản phẩm, chủng loại, số lượng)\n"
-#~ "    * Tính giá theo nhiều tiêu chí khác nhau:\n"
-#~ "        * Bảng giá khác,\n"
-#~ "        * Giá vốn,\n"
-#~ "        * Giá niêm yết,\n"
-#~ "        * Giá nhà cung cấp, ...\n"
-#~ "    Bảng giá yêu thích theo sản phẩm và/hoặc đối tác .\n"
-#~ "\n"
-#~ "    In nhãn sản phẩm và mã vạch.\n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "No active version for the selected pricelist !\n"
-#~ "' \\n                                'Please create or activate one."
-#~ msgstr ""
-#~ "Không có phiên bản có hiệu lực cho bảng giá được chọn!\n"
-#~ "' \\n                                'Vui lòng tạo hoặc kích hoạt."
-
-#~ msgid "Currency :"
-#~ msgstr "Loại tiền :"
-
 #~ msgid "The weight of a full of products palet or box."
 #~ msgstr "Khối lượng của một palet hoặc một hộp đầy sản phẩm."
 
@@ -2641,9 +2540,3 @@ msgstr "Chiết khấu"
 
 #~ msgid "KGM"
 #~ msgstr "KGM"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Tên nhóm phải duy nhất !"
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 1ba717c00a9..c5b54946bd5 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -106,8 +106,8 @@ msgstr "固定的"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -206,7 +206,7 @@ msgstr "计量单位"
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr "块（片，包等）"
+msgstr "个"
 
 #. module: product
 #: view:product.template:0
@@ -253,7 +253,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  例: 1*(目标单位) = ratio * (参照单位)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "产品： "
@@ -523,7 +523,7 @@ msgid "Metal Cleats"
 msgstr "金属螺栓"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -708,7 +708,7 @@ msgstr "新价格 ="
 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 ""
+msgstr "这个价格是供应商计量单位的价格。如果没有输入供应商计量单位则此价格是产品基本计量单位的价格。"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -1258,7 +1258,7 @@ msgid "Pallet Dimension"
 msgstr "垫板尺寸"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " (复件)"
@@ -1411,6 +1411,7 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"平均制造提前期。这个天数只适用于生产订单，在多层物料清单里他只表述了本层的天数。BOM总计的提前期要根据所有层制造提前期和采购提前期的合计。"
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -1646,7 +1647,7 @@ msgstr "产品分类"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "产品分类"
 
 #. module: product
@@ -1726,7 +1727,7 @@ msgid ""
 msgstr "计算客户价格的基础价格.有时候它被称为目录价格"
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr "供应产品的业务伙伴"
@@ -1821,7 +1822,7 @@ msgid ""
 "Future stock for this product according to the selected locations or all "
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
-msgstr ""
+msgstr "此产品在所选库位（如未选库位则是在所有内部库位）未来的数量。算法是 账面数量 - 未发出数量 + 未收到数量"
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -2148,7 +2149,7 @@ msgid "Description"
 msgstr "说明"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2193,7 +2194,7 @@ msgid "Shelves"
 msgstr "架子"
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "其他价格表"
@@ -2278,21 +2279,6 @@ msgstr "这体积是m3"
 msgid "Price Discount"
 msgstr "价格折扣"
 
-#~ msgid "Childs Categories"
-#~ msgstr "子项分类"
-
-#~ msgid "Rentable product"
-#~ msgstr "可出租产品"
-
-#~ msgid "Price Max. Margin"
-#~ msgstr "最高价"
-
-#~ msgid "Price Min. Margin"
-#~ msgstr "最低价"
-
-#~ msgid "Supplier of Product"
-#~ msgstr "产品供应商"
-
 #~ msgid "Prices Computations"
 #~ msgstr "价格计算"
 
@@ -2302,15 +2288,6 @@ msgstr "价格折扣"
 #~ msgid "Priority"
 #~ msgstr "优先级"
 
-#~ msgid ""
-#~ "This is the average time between the confirmation of the customer order and "
-#~ "the delivery of the finnished products. It's the time you promise to your "
-#~ "customers."
-#~ msgstr "从确认用户订单到发货给客户的平均时间。也就是您承诺给您的客户的时间。"
-
-#~ msgid "Starting date for validity of this pricelist version."
-#~ msgstr "价该格表版本的生效时间"
-
 #~ msgid "Default UoM"
 #~ msgstr "默认计量单位"
 
@@ -2320,13 +2297,6 @@ msgstr "价格折扣"
 #~ msgid "Partner Product Name"
 #~ msgstr "业务伙伴产品名称"
 
-#~ msgid "You can see the list of supplier for that product."
-#~ msgstr "您可以看见该产品的供应商列表。"
-
-#~ msgid ""
-#~ "Unit of Measure of the same category can be converted between each others."
-#~ msgstr "同一分类下的计量单位可以互相转换。"
-
 #~ msgid "Price list"
 #~ msgstr "价格表"
 
@@ -2342,18 +2312,9 @@ msgstr "价格折扣"
 #~ msgid "Supplier Info"
 #~ msgstr "供应商信息"
 
-#~ msgid "Ending date for validity of this pricelist version."
-#~ msgstr "价格表版本失效时间。"
-
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "您不能有2个重叠的价格表版本。"
-
 #~ msgid "KGM"
 #~ msgstr "千克"
 
-#~ msgid "The mode of computation of the price for this rule."
-#~ msgstr "该规则的价格计算模式"
-
 #~ msgid "Customer Price"
 #~ msgstr "客户价格"
 
@@ -2372,29 +2333,15 @@ msgstr "价格折扣"
 #~ msgid "Price type"
 #~ msgstr "价格类型"
 
-#, python-format
-#~ msgid "%d unit"
-#~ msgstr "%d 单位"
-
 #~ msgid "Rate"
 #~ msgstr "比率"
 
-#, python-format
-#~ msgid "%d units"
-#~ msgstr "%d 单位"
-
 #~ msgid "Delivery Delay"
 #~ msgstr "交货延迟"
 
 #~ msgid "Procure Method"
 #~ msgstr "获得方式"
 
-#~ msgid ""
-#~ "Used by companies that manages two unit of measure: invoicing and inventory "
-#~ "management. For example, in food industries, you will manage a stock of ham "
-#~ "but invoice in Kg. Keep empty to use the default UOM."
-#~ msgstr "处理发票和库存管理两个计量单位的公司使用。例如，在食品工业中，您在库存中管理火腿，但发票使用公斤为计量单位。留空以使用默认计量单位。"
-
 #~ msgid ""
 #~ "The cost of the product for accounting stock valuation. It can serves as a "
 #~ "base price for supplier price."
@@ -2403,9 +2350,6 @@ msgstr "价格折扣"
 #~ msgid "Product Process"
 #~ msgstr "产品工艺"
 
-#~ msgid "Price List Name:"
-#~ msgstr "价格表名称:"
-
 #~ msgid "Factor"
 #~ msgstr "系数"
 
@@ -2415,65 +2359,13 @@ msgstr "价格折扣"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "错误:销售单位必须和计量单位在不同的分类."
 
-#~ msgid "Currency :"
-#~ msgstr "货币:"
-
 #~ msgid "Suppliers of Product"
 #~ msgstr "产品供应商"
 
-#~ msgid "Product Pricelist"
-#~ msgstr "产品价格表"
-
-#~ msgid "Printing Date :"
-#~ msgstr "打印日期:"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
-#~ msgid "units"
-#~ msgstr "单位"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This is the base module for managing products and pricelists in Open "
-#~ "ERP.\n"
-#~ "\n"
-#~ "    Products support variants, different pricing methods, suppliers\n"
-#~ "    information, make to stock/order, different unit of measures,\n"
-#~ "    packaging and properties.\n"
-#~ "\n"
-#~ "    Pricelists support:\n"
-#~ "    * Multiple-level of discount (by product, category, quantities)\n"
-#~ "    * Compute price based on different criteria:\n"
-#~ "        * Other pricelist,\n"
-#~ "        * Cost price,\n"
-#~ "        * List price,\n"
-#~ "        * Supplier price, ...\n"
-#~ "    Pricelists preferences by product and/or partners.\n"
-#~ "\n"
-#~ "    Print product labels with barcode.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这基础模块管理系统的产品和价格表.\n"
-#~ "\n"
-#~ "产品支持系列型号不同的\n"
-#~ "计价方式,供应商信息,按库存/按单生产,不同的单位,\n"
-#~ "包装和属性.\n"
-#~ "\n"
-#~ "价格表支持:\n"
-#~ "- 多层折扣(按产品,分类,数量)\n"
-#~ "- 计算价格根据不同的准则\n"
-#~ "\t- 其它价格表\n"
-#~ "\t- 成本价\n"
-#~ "\t- 标价\n"
-#~ "\t- 供应商价格..\n"
-#~ "价格表参数根据产品或业务伙伴\n"
-#~ "\n"
-#~ "打印产品标签和条码\n"
-#~ "    "
-
 #~ msgid "Prices & Suppliers"
 #~ msgstr "价格&供应商"
 
@@ -2615,23 +2507,3 @@ msgstr "价格折扣"
 #~ msgstr ""
 #~ "延迟天数是确认采购订单到仓库接收产品之间的延迟天数.\n"
 #~ "用于制定采购订单计划时调度程序自动计算."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "模块的认证ID必须唯一"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "群组名称必须唯一"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the pricelist "
-#~ "without removing it."
-#~ msgstr "如果有效字段设置为真(true),它允许你隐藏价格表而不是删除"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "两个用户不能使用相同的用户名！"
-
-#~ msgid "Supplier Product UoM."
-#~ msgstr "供应商产品计量单位"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 438d048f9d0..741d885d5bc 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: 2011-04-29 05:19+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -106,8 +106,8 @@ msgstr "固定"
 
 #. module: product
 #: code:addons/product/pricelist.py:186
-#: code:addons/product/pricelist.py:339
-#: code:addons/product/pricelist.py:357
+#: code:addons/product/pricelist.py:342
+#: code:addons/product/pricelist.py:360
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -253,7 +253,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  例子：1 * (本單位) = 比例 * (參照單位)"
 
 #. module: product
-#: code:addons/product/product.py:378
+#: code:addons/product/product.py:380
 #, python-format
 msgid "Products: "
 msgstr "產品： "
@@ -521,7 +521,7 @@ msgid "Metal Cleats"
 msgstr "金屬楔子"
 
 #. module: product
-#: code:addons/product/pricelist.py:340
+#: code:addons/product/pricelist.py:343
 #, python-format
 msgid ""
 "No active version for the selected pricelist !\n"
@@ -1232,7 +1232,7 @@ msgid "Pallet Dimension"
 msgstr "卡板尺寸"
 
 #. module: product
-#: code:addons/product/product.py:603
+#: code:addons/product/product.py:618
 #, python-format
 msgid " (copy)"
 msgstr " （副本）"
@@ -1620,7 +1620,7 @@ msgstr "各分類產品"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "產品分類"
 
 #. module: product
@@ -1700,7 +1700,7 @@ msgid ""
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:515
+#: code:addons/product/pricelist.py:518
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -2118,7 +2118,7 @@ msgid "Description"
 msgstr "說明"
 
 #. module: product
-#: code:addons/product/pricelist.py:358
+#: code:addons/product/pricelist.py:361
 #, python-format
 msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
@@ -2163,7 +2163,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:514
+#: code:addons/product/pricelist.py:517
 #, python-format
 msgid "Other Pricelist"
 msgstr "其他價目表"
@@ -2250,6 +2250,3 @@ msgstr "價格折扣"
 
 #~ msgid "Customer Price"
 #~ msgstr "客户价格"
-
-#~ msgid "Childs Categories"
-#~ msgstr "子項分類"
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 81cec0e7d95..db953c8a319 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -160,30 +160,22 @@ class product_pricelist(osv.osv):
         product_uom_obj = self.pool.get('product.uom')
         supplierinfo_obj = self.pool.get('product.supplierinfo')
         price_type_obj = self.pool.get('product.price.type')
-        product_pricelist_version_obj = self.pool.get('product.pricelist.version')
 
         # product.pricelist.version:
-        if pricelist_ids:
-            pricelist_version_ids = pricelist_ids
-        else:
-            # all pricelists:
-            pricelist_version_ids = self.pool.get('product.pricelist').search(cr, uid, [], context=context)
+        if not pricelist_ids:
+            pricelist_ids = self.pool.get('product.pricelist').search(cr, uid, [], context=context)
 
-        pricelist_version_ids = list(set(pricelist_version_ids))
-        plversions_search_args = [
-            ('pricelist_id', 'in', pricelist_version_ids),
-            '|',
-            ('date_start', '=', False),
-            ('date_start', '<=', date),
-            '|',
-            ('date_end', '=', False),
-            ('date_end', '>=', date),
-        ]
-
-        plversion_ids = product_pricelist_version_obj.search(cr, uid, plversions_search_args)
-        if len(pricelist_version_ids) != len(plversion_ids):
-            msg = "At least one pricelist has no active version !\nPlease create or activate one."
-            raise osv.except_osv(_('Warning !'), _(msg))
+        pricelist_version_ids = self.pool.get('product.pricelist.version').search(cr, uid, [
+                                                        ('pricelist_id', 'in', pricelist_ids),
+                                                        '|',
+                                                        ('date_start', '=', False),
+                                                        ('date_start', '<=', date),
+                                                        '|',
+                                                        ('date_end', '=', False),
+                                                        ('date_end', '>=', date),
+                                                    ])
+        if len(pricelist_ids) != len(pricelist_version_ids):
+            raise osv.except_osv(_('Warning !'), _("At least one pricelist has no active version !\nPlease create or activate one."))
 
         # product.product:
         product_ids = [i[0] for i in products_by_qty_by_partner]
@@ -198,7 +190,7 @@ class product_pricelist(osv.osv):
 
         results = {}
         for product_id, qty, partner in products_by_qty_by_partner:
-            for pricelist_id in pricelist_version_ids:
+            for pricelist_id in pricelist_ids:
                 price = False
 
                 tmpl_id = products_dict[product_id].product_tmpl_id and products_dict[product_id].product_tmpl_id.id or False
@@ -210,6 +202,13 @@ class product_pricelist(osv.osv):
                 else:
                     categ_where = '(categ_id IS NULL)'
 
+                if partner:
+                    partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
+                    partner_args = (partner, product_id)
+                else:
+                    partner_where = 'base <> -2 '
+                    partner_args = ()
+
                 cr.execute(
                     'SELECT i.*, pl.currency_id '
                     'FROM product_pricelist_item AS i, '
@@ -217,11 +216,12 @@ class product_pricelist(osv.osv):
                     'WHERE (product_tmpl_id IS NULL OR product_tmpl_id = %s) '
                         'AND (product_id IS NULL OR product_id = %s) '
                         'AND (' + categ_where + ' OR (categ_id IS NULL)) '
+                        'AND (' + partner_where + ') '
                         'AND price_version_id = %s '
                         'AND (min_quantity IS NULL OR min_quantity <= %s) '
                         'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
                     'ORDER BY sequence',
-                    (tmpl_id, product_id, plversion_ids[0], qty))
+                    (tmpl_id, product_id) + partner_args + (pricelist_version_ids[0], qty))
                 res1 = cr.dictfetchall()
                 uom_price_already_computed = False
                 for res in res1:
@@ -289,7 +289,7 @@ class product_pricelist(osv.osv):
                     if 'uom' in context and not uom_price_already_computed:
                         product = products_dict[product_id]
                         uom = product.uos_id or product.uom_id
-                        price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, price, context['uom'])
+                        price = product_uom_obj._compute_price(cr, uid, uom.id, price, context['uom'])
 
                 if results.get(product_id):
                     results[product_id][pricelist_id] = price
@@ -304,148 +304,6 @@ class product_pricelist(osv.osv):
         res.update({'item_id': {ids[-1]: res_multi.get('item_id', ids[-1])}})
         return res
 
-    def price_get_old(self, cr, uid, ids, prod_id, qty, partner=None, context=None):
-        '''
-        context = {
-            'uom': Unit of Measure (int),
-            'partner': Partner ID (int),
-            'date': Date of the pricelist (%Y-%m-%d),
-        }
-        '''
-        price = False
-        item_id = 0
-        if context is None:
-            context = {}
-        currency_obj = self.pool.get('res.currency')
-        product_obj = self.pool.get('product.product')
-        supplierinfo_obj = self.pool.get('product.supplierinfo')
-        price_type_obj = self.pool.get('product.price.type')
-
-        if context and ('partner_id' in context):
-            partner = context['partner_id']
-        context['partner_id'] = partner
-        date = time.strftime('%Y-%m-%d')
-        if context and ('date' in context):
-            date = context['date']
-        result = {}
-        result['item_id'] = {}
-        for id in ids:
-            cr.execute('SELECT * ' \
-                    'FROM product_pricelist_version ' \
-                    'WHERE pricelist_id = %s AND active=True ' \
-                        'AND (date_start IS NULL OR date_start <= %s) ' \
-                        'AND (date_end IS NULL OR date_end >= %s) ' \
-                    'ORDER BY id LIMIT 1', (id, date, date))
-            plversion = cr.dictfetchone()
-
-            if not plversion:
-                raise osv.except_osv(_('Warning !'),
-                        _('No active version for the selected pricelist !\n' \
-                                'Please create or activate one.'))
-
-            cr.execute('SELECT id, categ_id ' \
-                    'FROM product_template ' \
-                    'WHERE id = (SELECT product_tmpl_id ' \
-                        'FROM product_product ' \
-                        'WHERE id = %s)', (prod_id,))
-            tmpl_id, categ = cr.fetchone()
-            categ_ids = []
-            while categ:
-                categ_ids.append(str(categ))
-                cr.execute('SELECT parent_id ' \
-                        'FROM product_category ' \
-                        'WHERE id = %s', (categ,))
-                categ = cr.fetchone()[0]
-                if str(categ) in categ_ids:
-                    raise osv.except_osv(_('Warning !'),
-                            _('Could not resolve product category, ' \
-                                    'you have defined cyclic categories ' \
-                                    'of products!'))
-            if categ_ids:
-                categ_where = '(categ_id IN (' + ','.join(categ_ids) + '))'
-            else:
-                categ_where = '(categ_id IS NULL)'
-
-            cr.execute(
-                'SELECT i.*, pl.currency_id '
-                'FROM product_pricelist_item AS i, '
-                    'product_pricelist_version AS v, product_pricelist AS pl '
-                'WHERE (product_tmpl_id IS NULL OR product_tmpl_id = %s) '
-                    'AND (product_id IS NULL OR product_id = %s) '
-                    'AND (' + categ_where + ' OR (categ_id IS NULL)) '
-                    'AND price_version_id = %s '
-                    'AND (min_quantity IS NULL OR min_quantity <= %s) '
-                    'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
-                'ORDER BY sequence',
-                (tmpl_id, prod_id, plversion['id'], qty))
-            res1 = cr.dictfetchall()
-
-            for res in res1:
-                item_id = 0
-                if res:
-                    if res['base'] == -1:
-                        if not res['base_pricelist_id']:
-                            price = 0.0
-                        else:
-                            price_tmp = self.price_get(cr, uid,
-                                    [res['base_pricelist_id']], prod_id,
-                                    qty, context=context)[res['base_pricelist_id']]
-                            ptype_src = self.browse(cr, uid,
-                                    res['base_pricelist_id']).currency_id.id
-                            price = currency_obj.compute(cr, uid, ptype_src,
-                                    res['currency_id'], price_tmp, round=False)
-                            break
-                    elif res['base'] == -2:
-                        where = []
-                        if partner:
-                            where = [('name', '=', partner) ]
-                        sinfo = supplierinfo_obj.search(cr, uid,
-                                [('product_id', '=', tmpl_id)] + where)
-                        price = 0.0
-                        if sinfo:
-                            cr.execute('SELECT * ' \
-                                    'FROM pricelist_partnerinfo ' \
-                                    'WHERE suppinfo_id IN %s' \
-                                        'AND min_quantity <= %s ' \
-                                    'ORDER BY min_quantity DESC LIMIT 1', (tuple(sinfo),qty,))
-                            res2 = cr.dictfetchone()
-                            if res2:
-                                price = res2['price']
-                                break
-                    else:
-                        price_type = price_type_obj.browse(cr, uid, int(res['base']))
-                        price = currency_obj.compute(cr, uid,
-                                price_type.currency_id.id, res['currency_id'],
-                                product_obj.price_get(cr, uid, [prod_id],
-                                price_type.field, context=context)[prod_id], round=False, context=context)
-
-                    if price:
-                        price_limit = price
-
-                        price = price * (1.0+(res['price_discount'] or 0.0))
-                        price = rounding(price, res['price_round'])
-                        price += (res['price_surcharge'] or 0.0)
-                        if res['price_min_margin']:
-                            price = max(price, price_limit+res['price_min_margin'])
-                        if res['price_max_margin']:
-                            price = min(price, price_limit+res['price_max_margin'])
-                        item_id = res['id']
-                        break
-
-                else:
-                    # False means no valid line found ! But we may not raise an
-                    # exception here because it breaks the search
-                    price = False
-            result[id] = price
-            result['item_id'] = {id: item_id}
-            if context and ('uom' in context):
-                product = product_obj.browse(cr, uid, prod_id)
-                uom = product.uos_id or product.uom_id
-                result[id] = self.pool.get('product.uom')._compute_price(cr,
-                        uid, uom.id, result[id], context['uom'])
-
-        return result
-
 product_pricelist()
 
 
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index f284dcbc47b..d4d274da2d1 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -56,6 +56,7 @@
                 <tree string="Products Listprices Items">
                     <field name="sequence"/>
                     <field colspan="4" name="name" select="1"/>
+                    <field name="product_id"/>
                     <field name="product_tmpl_id" select="1"/>
                     <field name="categ_id" select="1"/>
                     <field name="min_quantity"/>
@@ -164,6 +165,19 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="product_pricelist_view_search" />
+            <field name="context">{"default_type":"sale", "search_default_type":"sale"}</field>
+            <field name="domain">[('type','=','sale')]</field>
+            <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field>
+        </record>
+        <record id="product_pricelist_action_for_purchase" model="ir.actions.act_window">
+            <field name="name">Pricelists</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.pricelist</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="product_pricelist_view_search" />
+            <field name="context">{"default_type":"purchase", "search_default_type":"purchase"}</field>
+            <field name="domain">[('type','=','purchase')]</field>
             <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field>
         </record>
         <menuitem
diff --git a/addons/product/product.py b/addons/product/product.py
index 8e6e132296d..ecf1761318e 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -75,7 +75,7 @@ class product_uom(osv.osv):
     _description = 'Product Unit of Measure'
 
     def _compute_factor_inv(self, factor):
-        return factor and round(1.0 / factor, 6) or 0.0
+        return factor and (1.0 / factor) or 0.0
 
     def _factor_inv(self, cursor, user, ids, name, arg, context=None):
         res = {}
@@ -93,6 +93,7 @@ class product_uom(osv.osv):
             del(data['factor_inv'])
         return super(product_uom, self).create(cr, uid, data, context)
 
+    _order = "name"
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
@@ -100,7 +101,7 @@ class product_uom(osv.osv):
         'factor': fields.float('Ratio', required=True,digits=(12, 12),
             help='How many times this UoM is smaller than the reference UoM in this category:\n'\
                     '1 * (reference unit) = ratio * (this unit)'),
-        'factor_inv': fields.function(_factor_inv, digits_compute=dp.get_precision('Product UoM'),
+        'factor_inv': fields.function(_factor_inv, digits=(12,12),
             fnct_inv=_factor_inv_write,
             string='Ratio',
             help='How many times this UoM is bigger than the reference UoM in this category:\n'\
@@ -121,8 +122,7 @@ class product_uom(osv.osv):
     }
 
     _sql_constraints = [
-        ('factor_gt_zero', 'CHECK (factor!=0)', 'The conversion ratio for a unit of measure cannot be 0!'),
-        ('factor_category_id_uniq', 'unique (category_id, factor)', 'You can not have more than one UOM with same factor for same UOM category'),
+        ('factor_gt_zero', 'CHECK (factor!=0)', 'The conversion ratio for a unit of measure cannot be 0!')
     ]
 
     def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
@@ -167,6 +167,13 @@ class product_uom(osv.osv):
         if value == 'reference':
             return {'value': {'factor': 1, 'factor_inv': 1}}
         return {}
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'category_id' in vals:
+            for uom in self.browse(cr, uid, ids, context=context):
+                if uom.category_id != vals['category_id']:
+                    raise osv.except_osv(_('Warning'),_("Cannot change the category of existing UoM '%s'.") % (uom.name,))
+        return super(product_uom, self).write(cr, uid, ids, vals, context=context)
 
 product_uom()
 
@@ -230,7 +237,7 @@ class product_category(osv.osv):
         return True
 
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
+        (_check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id'])
     ]
     def child_get(self, cr, uid, ids):
         return [ids]
@@ -251,9 +258,9 @@ class product_template(osv.osv):
                 result[product.id] = {field:False}
             result[product.id]['seller_delay'] = 1
             if product.seller_ids:
-                partner_list = sorted([(partner_id.sequence, partner_id)
+                partner_list = [(partner_id.sequence, partner_id)
                                        for partner_id in  product.seller_ids
-                                       if partner_id and isinstance(partner_id.sequence, (int, long))])
+                                       if partner_id and isinstance(partner_id.sequence, (int, long))]
                 main_supplier = partner_list and partner_list[0] and partner_list[0][1] or False
                 result[product.id]['seller_delay'] =  main_supplier and main_supplier.delay or 1
                 result[product.id]['seller_qty'] =  main_supplier and main_supplier.qty or 0.0
@@ -276,8 +283,8 @@ class product_template(osv.osv):
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale 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('Purchase Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price."),
         'volume': fields.float('Volume', help="The volume in m3."),
-        'weight': fields.float('Gross weight', help="The gross weight in Kg."),
-        'weight_net': fields.float('Net weight', help="The net weight in Kg."),
+        '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)'),
@@ -292,7 +299,7 @@ class product_template(osv.osv):
         '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 UOM.'),
-        'uos_coeff': fields.float('UOM -> UOS Coeff', digits=(16,4),
+        'uos_coeff': fields.float('UOM -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
             help='Coefficient to convert UOM to UOS\n'
             ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
@@ -327,7 +334,16 @@ class product_template(osv.osv):
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
         if uom_id:
             return {'value': {'uom_po_id': uom_id}}
-        return False
+        return {}
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'uom_po_id' in vals:
+            new_uom = self.pool.get('product.uom').browse(cr, uid, vals['uom_po_id'], context=context)
+            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(_('UoM categories Mismatch!'), _("New UoM '%s' must belongs to same UoM category '%s' as of old UoM '%s'.") % (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),
@@ -461,6 +477,7 @@ class product_product(osv.osv):
         'active': lambda *a: 1,
         'price_extra': lambda *a: 0.0,
         'price_margin': lambda *a: 1.0,
+        'color': 0,
     }
 
     _name = "product.product"
@@ -469,8 +486,8 @@ class product_product(osv.osv):
     _inherits = {'product.template': 'product_tmpl_id'}
     _order = 'default_code,name_template'
     _columns = {
-        'qty_available': fields.function(_product_qty_available, type='float', string='Real Stock'),
-        'virtual_available': fields.function(_product_virtual_available, type='float', string='Virtual Stock'),
+        'qty_available': fields.function(_product_qty_available, type='float', string='Quantity On Hand'),
+        'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
         'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
         '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('Sale Price')),
@@ -487,8 +504,10 @@ class product_product(osv.osv):
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale 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),
+        'color': fields.integer('Color Index'),
+        'product_image': fields.binary('Image'),
     }
-
+    
     def unlink(self, cr, uid, ids, context=None):
         unlink_ids = []
         unlink_product_tmpl_ids = []
@@ -714,24 +733,16 @@ class product_supplierinfo(osv.osv):
         for supplier_info in self.browse(cr, uid, ids, context=context):
             for field in fields:
                 result[supplier_info.id] = {field:False}
-            if supplier_info.product_uom.id:
-                qty = product_uom_pool._compute_qty(cr, uid, supplier_info.product_uom.id, supplier_info.min_qty, to_uom_id=supplier_info.product_id.uom_id.id)
-            else:
-                qty = supplier_info.min_qty
+            qty = supplier_info.min_qty
             result[supplier_info.id]['qty'] = qty
         return result
 
-    def _get_uom_id(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        return context.get('uom_id', False)
-
     _columns = {
         'name' : fields.many2one('res.partner', 'Supplier', required=True,domain = [('supplier','=',True)], ondelete='cascade', help="Supplier of this product"),
         'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
         'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
         'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
-        'product_uom': fields.many2one('product.uom', string="Supplier UoM", help="Choose here the Unit of Measure in which the prices and quantities are expressed below."),
+        'product_uom': fields.related('product_id', 'uom_po_id', type='many2one', relation='product.uom', string="Supplier UoM", readonly="1", help="This comes from the product form."),
         'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."),
         'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
@@ -744,17 +755,7 @@ class product_supplierinfo(osv.osv):
         'sequence': lambda *a: 1,
         'delay': lambda *a: 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),
-        'product_uom': _get_uom_id,
     }
-    def _check_uom(self, cr, uid, ids, context=None):
-        for supplier_info in self.browse(cr, uid, ids, context=context):
-            if supplier_info.product_uom and supplier_info.product_uom.category_id.id <> supplier_info.product_id.uom_id.category_id.id:
-                return False
-        return True
-
-    _constraints = [
-        (_check_uom, 'Error: The default UOM and the Supplier Product UOM must be in the same category.', ['product_uom']),
-    ]
     def price_get(self, cr, uid, supplier_ids, product_id, product_qty=1, context=None):
         """
         Calculate price from supplier pricelist.
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 31e93f46d5f..122c8594de4 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -23,8 +23,8 @@
 
 
         <!--
-	Resource: product.uom
-	-->
+            Resource: product.uom
+        -->
         <record id="product_uom_unit" model="product.uom">
             <field name="category_id" ref="product_uom_categ_unit"/>
             <field name="name">PCE</field>
@@ -164,5 +164,23 @@ parameter) will see those record just disappear.
             <field name="name">Product UoM</field>
             <field name="digits" eval="3"/>
         </record>
+        <record forcecreate="True" id="decimal_product_uos" model="decimal.precision">
+            <field name="name">Product UoS</field>
+            <field name="digits" eval="3"/>
+        </record>        
+
+        <!--
+        Product
+        -->
+        <record id="product_consultant" model="product.product">
+            <field name="list_price">75.0</field>
+            <field name="standard_price">30.0</field>
+            <field name="uom_id" ref="product.uom_hour"/>
+            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="name">Service on Timesheet</field>
+            <field name="categ_id" ref="product.cat0"/>
+            <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 d8c1e29749b..3aebec13715 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -129,7 +129,7 @@
             <field name="standard_price">300.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">2.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Basic PC</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_pc"/>
@@ -154,7 +154,7 @@
             <field name="standard_price">600.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">3.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Medium PC</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_pc"/>
@@ -178,7 +178,7 @@
             <field name="standard_price">54.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Mainboard ASUStek A7N8X</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -189,7 +189,7 @@
             <field name="standard_price">180.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Mainboard ASUStek A7V8X-X</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -201,7 +201,7 @@
             <field name="standard_price">50.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Processor AMD Athlon XP 1800+</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -212,7 +212,7 @@
             <field name="standard_price">100.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Processor AMD Athlon XP 2200+</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -223,7 +223,7 @@
             <field name="standard_price">40.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">HDD Seagate 7200.8 80GB</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -234,7 +234,7 @@
             <field name="standard_price">60.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">HDD Seagate 7200.8 120GB</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -246,7 +246,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="procure_method">make_to_order</field>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">HDD Seagate 7200.8 160GB</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -257,7 +257,7 @@
             <field name="standard_price">5.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Regular case fan 80mm</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -268,7 +268,7 @@
             <field name="standard_price">10.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Silent fan</field>
             <field name="type">product</field>
             <field name="categ_id" ref="cat1"/>
@@ -280,7 +280,7 @@
             <field name="standard_price">200.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">Regular processor config</field>
             <field name="procure_method">make_to_order</field>
             <field name="type">product</field>
@@ -292,7 +292,7 @@
             <field name="standard_price">40.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">DDR 256MB PC400</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_pc"/>
@@ -303,7 +303,7 @@
             <field name="standard_price">60.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">DDR 512MB PC400</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -316,7 +316,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="procure_method">make_to_order</field>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">High speed processor config</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -327,7 +327,7 @@
             <field name="standard_price">25.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">ATX Mid-size Tower</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
@@ -340,7 +340,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="procure_method">make_to_order</field>
-            <field name="sale_delay">1.0</field>
+            <field name="sale_delay">7.0</field>
             <field name="name">HDD on demand</field>
             <field name="type">product</field>
             <field eval="False" name="sale_ok"/>
@@ -449,7 +449,7 @@
             <field name="uom_id" ref="product_uom_meter"/>
             <field name="uom_po_id" ref="product_uom_meter"/>
             <field name="name">Wood 2mm</field>
-            <field eval="10" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field eval="7.0" name="sale_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_rawmaterial0"/>
@@ -515,7 +515,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Rear Panel SHE100</field>
-            <field eval="5" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_misc0"/>
         </record>
@@ -528,7 +528,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Rear Panel SHE200</field>
-            <field eval="5" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_misc0"/>
         </record>
@@ -541,7 +541,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Side Panel</field>
-            <field eval="5" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_misc0"/>
         </record>
@@ -554,7 +554,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Rack 100cm</field>
-            <field eval="8" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_misc0"/>
         </record>
@@ -567,7 +567,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Rack 200cm</field>
-            <field eval="8" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_misc0"/>
         </record>
@@ -593,7 +593,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Wood Lintel 4m</field>
-            <field eval="10" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_misc0"/>
         </record>
@@ -605,7 +605,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Metal Cleats</field>
-            <field eval="20" name="seller_delay"/>
+            <field eval="2" name="seller_delay"/>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_misc0"/>
         </record>
@@ -736,21 +736,21 @@
             <field name="qty">1</field>
             <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_20"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
         </record>
         <record id="supplierinfo15" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_21"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
         </record>
         <record id="supplierinfo16" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_22"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
         </record>
         <record id="supplierinfo17" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_seagate"/>
@@ -758,7 +758,7 @@
             <field name="min_qty">1</field>
             <field name="sequence">5</field>
             <field name="product_id" ref="product_product_hdd1"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
         </record>
         <record id="supplierinfo18" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_seagate"/>
@@ -766,7 +766,7 @@
             <field name="min_qty">1</field>
             <field name="sequence">5</field>
             <field name="product_id" ref="product_product_hdd2"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
         </record>
         <record id="supplierinfo19" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
@@ -774,7 +774,7 @@
             <field name="min_qty">1</field>
             <field name="sequence">5</field>
             <field name="product_id" ref="product_product_hdd3"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
         </record>
 
         <!--
@@ -783,7 +783,7 @@
 
         <record id="product_supplierinfo_0" model="product.supplierinfo">
             <field name="product_id" ref="product_product_rearpanelarm0"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
         </record>
@@ -815,7 +815,7 @@
 
         <record id="product_supplierinfo_4" model="product.supplierinfo">
             <field name="product_id" ref="product_product_shelfofcm0"/>
-            <field name="delay">8</field>
+            <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
         </record>
@@ -823,7 +823,7 @@
 
         <record id="product_supplierinfo_5" model="product.supplierinfo">
             <field name="product_id" ref="product_product_shelfofcm1"/>
-            <field name="delay">8</field>
+            <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
         </record>
@@ -839,7 +839,7 @@
 
         <record id="product_supplierinfo_7" model="product.supplierinfo">
             <field name="product_id" ref="product_product_woodlintelm0"/>
-            <field name="delay">10</field>
+            <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
         </record>
@@ -847,7 +847,7 @@
 
         <record id="product_supplierinfo_8" model="product.supplierinfo">
             <field name="product_id" ref="product_product_metalcleats0"/>
-            <field name="delay">20</field>
+            <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1d30bc2bb43..ac9ae8c5ec3 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
-                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
@@ -69,7 +69,7 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product">
-                   <group colspan="4" col="6">
+                   <group colspan="4" col="8">
                     <group colspan="4" col="2">
                         <separator string="Name" colspan="2"/>
                         <field name="name"/>
@@ -85,6 +85,9 @@
                         <field name="sale_ok"/>
                         <field name="purchase_ok"/>
                     </group>
+                    <group colspan="1" col="1">
+                        <field name="product_image" widget='image' nolabel="1"/>
+                    </group> 
                    </group>
 
                     <notebook colspan="4">
@@ -108,8 +111,8 @@
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Weights" colspan="2"/>
                                 <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')]}"/>
+                                <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                             </group>
 
                             <group colspan="2" col="2" name="status" groups="base.group_extended">
@@ -191,6 +194,62 @@
                 </form>
             </field>
         </record>
+        
+        <!-- Product Kanban View  -->
+        <record model="ir.ui.view" id="product_kanban_view">
+            <field name="name">Product Kanban</field>
+            <field name="model">product.product</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="type">
+                    <field name="color"/>
+                    <field name="type"/>
+                    <field name="product_image"/>
+                    <field name="list_price"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type.raw_value)"/>
+                            <div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                <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_title1">
+                                        <field name="name"/>
+                                    </div>
+                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+                                        <table class="oe_kanban_table">
+                                            <tr>
+                                                <td valign="top" width="48">
+                                                    <img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" width="48"/>
+                                                </td>
+                                                <td>
+                                                    <div class="oe_kanban_title2">
+                                                        <t t-if="record.type.raw_value=='service'">No Stock</t>
+                                                        <t t-if="record.type.raw_value!='service'">
+                                                            <div><field name="qty_available"/> On Hand , <field name="virtual_available"/> Available</div>
+                                                            <div>
+                                                                <t t-if="record.list_price.raw_value!=0">Public Price : <field name="lst_price"/> ,</t>
+                                                                Cost : <field name="standard_price"/>
+                                                            </div>
+                                                        </t>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </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>
+                                        <br class="oe_kanban_clear"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record id="product_normal_action" model="ir.actions.act_window">
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
@@ -204,12 +263,27 @@
             <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_type">form</field>
             <field name="context">{"search_default_filter_to_sell":1}</field>
             <field name="view_id" ref="product_product_tree_view"/>  
             <field name="search_view_id" ref="product_search_form_view"/>            
             <field name="help">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.</field>
         </record>
+        
+        <record id="open_view_product_tree1" model="ir.actions.act_window.view">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+           <field name="view_id" ref="product_product_tree_view"/>
+            <field name="act_window_id" ref="product_normal_action_sell"/>
+        </record>
+        
+        <record id="open_view_product_form1" model="ir.actions.act_window.view">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="product_normal_form_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"/>
         <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="1"/>
@@ -277,7 +351,7 @@
             parent="base.menu_product"
             sequence="0"/>
         <record id="product_category_action_form" model="ir.actions.act_window">
-            <field name="name">Products Categories</field>
+            <field name="name">Product Categories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.category</field>
             <field name="view_type">form</field>
@@ -302,7 +376,6 @@
             <field eval="'product.category'" name="model"/>
             <field name="name">Products by Categories</field>
             <field eval="'ir.actions.act_window,%d'%product_normal_action_tree" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
 
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index f80032c6f9a..72c51639849 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -15,3 +15,5 @@
 "access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
 "access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
 "access_product_product_employee","product.product employee","model_product_product","base.group_user",1,0,0,0
+"access_product_template_sale_manager","product.template salemanager","model_product_template","base.group_sale_manager",1,1,1,1
+"access_product_product_sale_manager","product.product salemanager","model_product_product","base.group_sale_manager",1,1,1,1
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 00e2d7f05f3..d9f14a13225 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -28,21 +28,28 @@
         <field name="name">product pricelist company rule</field>
         <field name="model_id" ref="model_product_pricelist"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+        <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
     <record model="ir.rule" id="product_pricelist_item_comp_rule">
         <field name="name">product pricelist item company rule</field>
         <field name="model_id" ref="model_product_pricelist_item"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+        <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
     <record model="ir.rule" id="product_pricelist_version_comp_rule">
         <field name="name">product pricelist version company rule</field>
         <field name="model_id" ref="model_product_pricelist_version"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+        <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+    </record>
+
+    <record model="ir.rule" id="product_supplierinfo_comp_rule">
+        <field name="name">product supplierinfo company rule</field>
+        <field name="model_id" ref="model_product_supplierinfo"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/product/test/product_test.yml b/addons/product/test/product_test.yml
new file mode 100644
index 00000000000..ae75a552c79
--- /dev/null
+++ b/addons/product/test/product_test.yml
@@ -0,0 +1,33 @@
+-
+  In order to test product,I start by creating a 20KG UOM for 'Sugar'  
+-
+ !record {model: product.uom, id: product_20k_uom_sugar}:
+    name: 20KG
+    uom_type: bigger
+    category_id: product.product_uom_categ_kgm
+    factor_inv: 20
+-
+  I create a 10KG UOM for 'Sugar'  
+-
+ !record {model: product.uom, id: product_10k_uom_sugar}:
+    name: 10KG
+    uom_type: bigger
+    category_id: product.product_uom_categ_kgm
+    factor_inv: 10
+-
+  I create a new product 'Sugar' in 20KG UOM.
+-
+ !record {model: product.product, id: product_sugar_id1}:
+    categ_id: 'product.product_category_rawmaterial0'
+    name: Sugar 20KG
+    procure_method: make_to_order
+    standard_price: 400.0
+    uom_id: product.product_20k_uom_sugar
+    uom_po_id: product.product_20k_uom_sugar
+-
+  I test onchanged on UOM, Create Duplicate Product and Delete original Product.
+-
+  !python {model: product.product}: |
+    self.onchange_uom(cr ,uid, [ref("product_sugar_id1")], ref("product.product_20k_uom_sugar"), ref("product.product_10k_uom_sugar"))
+    self.copy(cr, uid, ref("product_sugar_id1"))
+    self.unlink(cr, uid, [ref("product_sugar_id1")])
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
index bdfbc1d32bf..01ddf25c56c 100644
--- a/addons/product/wizard/product_installer.xml
+++ b/addons/product/wizard/product_installer.xml
@@ -2,7 +2,7 @@
     <data>
 
          <record id="product_form_config_action" model="ir.actions.act_window">
-            <field name="name">Create some Products</field>
+            <field name="name">Create or Import Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 434f5605baa..bd1ad693a93 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Expiry Date",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Specific Industry Applications",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/product_expiry/i18n/ca.po b/addons/product_expiry/i18n/ca.po
index 9b29b7b2847..f46adfb2ca9 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 66cde1432eb..da55280b479 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -214,36 +214,18 @@ msgstr "Datum Ablaufwarnung"
 #~ "Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
 #~ "Mengeneinheit"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
 #~ "Fehler: Die Standard Mengeneinheit (ME) sowie die Mengeneinheit (ME) bei der "
 #~ "Beschaffung muss in derselben Kategorie sein."
 
-#~ msgid "The date signifying an alert to notify about the production lot."
-#~ msgstr ""
-#~ "Das Datum, an dem ein Warnhinweis über den Verfall oder Ablauf von Produkten "
-#~ "generiert wird."
-
 #~ msgid "The date the lot may become dangerous and should not be consumed."
 #~ msgstr ""
 #~ "Das Datum an dem die Verwendung des Los gefährlich werden kann und deshalb "
 #~ "nicht mehr konsumiert bzw. angewendet werden sollte (z.B. Verwendbar bis bei "
 #~ "Arzneimitteln)."
 
-#~ msgid ""
-#~ "The number of days after which, needs an alert to notify about the "
-#~ "production lot."
-#~ msgstr ""
-#~ "Die Anzahl an Tagen nach denen ein Warnhinweis bezüglich dieses Los erstellt "
-#~ "wird."
-
 #~ msgid "The date the lot starts deteriorating without becoming dangerous."
 #~ msgstr ""
 #~ "Das Datum, ab dem das Produkt schlechter wird ohne gefährlich zu werden (... "
@@ -254,15 +236,3 @@ msgstr "Datum Ablaufwarnung"
 #~ msgid "The date the lot should be removed."
 #~ msgstr ""
 #~ "Datum an dem das Los vernichtet oder anderweitig verwertet werden soll"
-
-#~ msgid "The conversion ratio for a unit of measure cannot be 0!"
-#~ msgstr "Der Umrechnungsfaktor einer Mengeneinheit kann nicht 0 sein!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/product_expiry/i18n/el.po b/addons/product_expiry/i18n/el.po
index 7a1f0e828e6..6f8fda6a75f 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -182,24 +182,12 @@ msgstr ""
 msgid "Product Alert Time"
 msgstr "Ύπενθύμιση Προϊόντος"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου θα πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες !"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
 #~ "Λάθος: Η προεπιλεγμένη Μ.Μ και η Μ.Μ αγοράς θα πρέπει να είναι στην ίδια "
 #~ "κατηγορία"
 
-#~ msgid ""
-#~ "The number of days after which, needs an alert to notify about the "
-#~ "production lot."
-#~ msgstr ""
-#~ "Ο αριθμός ημερών που θα χρειαστεί να γίνει υπενθήμιση για την παρτίδα."
-
 #~ msgid "The date the lot may become dangerous and should not be consumed."
 #~ msgstr ""
 #~ "Η ημερομηνία που η παρτίδα μπορεί να είναι επικίνδυνη και δεν θα πρέπει να "
@@ -208,9 +196,6 @@ msgstr "Ύπενθύμιση Προϊόντος"
 #~ msgid "The date the lot should be removed."
 #~ msgstr "Η ημερομηνία που η παρτίδα πρέπει να απομακρυνθεί."
 
-#~ msgid "The date signifying an alert to notify about the production lot."
-#~ msgstr "Η ημερομηνία δήλωσης υπενθύμισης για την παρτίδα παραγωγής."
-
 #~ msgid "The date the lot starts deteriorating without becoming dangerous."
 #~ msgstr ""
 #~ "Η ημερομηνία που η παρτίδα αρχίζει να χαλάει χωρίς να γίνεται επικίνδυνη"
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index c26ffa1f4d9..b7315bb7a7d 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -229,33 +229,3 @@ msgstr "Tiempo de alerta producto"
 #~ msgstr ""
 #~ "Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
 #~ "consumido."
-
-#~ msgid "The date signifying an alert to notify about the production lot."
-#~ msgstr ""
-#~ "La fecha que representa una alerta para notificar sobre el lote de "
-#~ "producción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid ""
-#~ "The number of days after which, needs an alert to notify about the "
-#~ "production lot."
-#~ msgstr ""
-#~ "El número de días después de los cuales se necesita una alerta para "
-#~ "notificar sobre el lote de producción."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The conversion ratio for a unit of measure cannot be 0!"
-#~ msgstr "¡El ratio de conversión para una unidad de medida no puede ser 0!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/product_expiry/i18n/es_EC.po b/addons/product_expiry/i18n/es_EC.po
index b57bfd33e97..4b7011a6cec 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/es_MX.po b/addons/product_expiry/i18n/es_MX.po
new file mode 100644
index 00000000000..bef6320d1a6
--- /dev/null
+++ b/addons/product_expiry/i18n/es_MX.po
@@ -0,0 +1,231 @@
+# 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-09 10:01+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_stock_production_lot
+msgid "Production lot"
+msgstr "Lote producción"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Jamón"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Leche de vaca"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+msgid "Products date of expiry"
+msgstr "Fecha de caducidad de productos"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product Life Time"
+msgstr "Tiempo de vida producto"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr "La fecha en que el lote empieza a deteriorarse sin ser peligroso."
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product Use Time"
+msgstr "Tiempo de uso producto"
+
+#. module: product_expiry
+#: 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: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
+msgstr "La fecha en que el lote debería ser eliminado."
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_expiry
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
+msgstr ""
+"El número de días después de lo cuales debería notificarse una alerta sobre "
+"el lote de producción."
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product Removal Time"
+msgstr "Tiempo eliminación producto"
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "Fecha de eliminación"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+"La fecha en que el lote puede empezar a ser peligroso y no debería ser "
+"consumido."
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+"Gestionar diferentes fechas en productos y lotes de producción:\n"
+" - fin de vida\n"
+" - fecha de caducidad\n"
+" - fecha de retirada\n"
+" - fecha de alerta\n"
+"Usados, por ejemplo, en la industria alimentaria."
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Pan"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr "LTR"
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "Fecha de fin de vida"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "Fecha caducidad"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "Queso Camembert francés"
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr "Número de días antes de que un lote de producción deba ser retirado."
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "Fecha de alerta"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+"Número de días antes de que un producto empieza a deteriorarse sin llegar a "
+"ser peligroso."
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+"Número de días antes de que un producto pueda llegar a ser peligroso y no "
+"debe ser consumido."
+
+#. 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 ""
+"La fecha en la que debería notificarse una alerta sobre el lote de "
+"producción."
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product Alert Time"
+msgstr "Tiempo de alerta producto"
+
+#~ 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 "Product alert time"
+#~ msgstr "Fecha alerta producto"
+
+#~ 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 "Product removal time"
+#~ msgstr "Fecha eliminación producto"
+
+#~ msgid "Product usetime"
+#~ msgstr "Tiempo de uso producto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
+
+#~ msgid "Product lifetime"
+#~ msgstr "Ciclo de vida producto"
+
+#~ msgid "The date the lot starts deteriorating without becoming dangerous."
+#~ msgstr ""
+#~ "Fecha en la que el producto empieza a deteriorarse sin llegar a ser "
+#~ "peligroso."
+
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Fecha en la que el producto debería ser eliminado."
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
+#~ "consumido."
diff --git a/addons/product_expiry/i18n/es_VE.po b/addons/product_expiry/i18n/es_VE.po
new file mode 100644
index 00000000000..bef6320d1a6
--- /dev/null
+++ b/addons/product_expiry/i18n/es_VE.po
@@ -0,0 +1,231 @@
+# 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-09 10:01+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_stock_production_lot
+msgid "Production lot"
+msgstr "Lote producción"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Jamón"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Leche de vaca"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+msgid "Products date of expiry"
+msgstr "Fecha de caducidad de productos"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product Life Time"
+msgstr "Tiempo de vida producto"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr "La fecha en que el lote empieza a deteriorarse sin ser peligroso."
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product Use Time"
+msgstr "Tiempo de uso producto"
+
+#. module: product_expiry
+#: 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: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
+msgstr "La fecha en que el lote debería ser eliminado."
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_expiry
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
+msgstr ""
+"El número de días después de lo cuales debería notificarse una alerta sobre "
+"el lote de producción."
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product Removal Time"
+msgstr "Tiempo eliminación producto"
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "Fecha de eliminación"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+"La fecha en que el lote puede empezar a ser peligroso y no debería ser "
+"consumido."
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+"Gestionar diferentes fechas en productos y lotes de producción:\n"
+" - fin de vida\n"
+" - fecha de caducidad\n"
+" - fecha de retirada\n"
+" - fecha de alerta\n"
+"Usados, por ejemplo, en la industria alimentaria."
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Pan"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr "LTR"
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "Fecha de fin de vida"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "Fecha caducidad"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "Queso Camembert francés"
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr "Número de días antes de que un lote de producción deba ser retirado."
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "Fecha de alerta"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+"Número de días antes de que un producto empieza a deteriorarse sin llegar a "
+"ser peligroso."
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+"Número de días antes de que un producto pueda llegar a ser peligroso y no "
+"debe ser consumido."
+
+#. 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 ""
+"La fecha en la que debería notificarse una alerta sobre el lote de "
+"producción."
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product Alert Time"
+msgstr "Tiempo de alerta producto"
+
+#~ 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 "Product alert time"
+#~ msgstr "Fecha alerta producto"
+
+#~ 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 "Product removal time"
+#~ msgstr "Fecha eliminación producto"
+
+#~ msgid "Product usetime"
+#~ msgstr "Tiempo de uso producto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
+
+#~ msgid "Product lifetime"
+#~ msgstr "Ciclo de vida producto"
+
+#~ msgid "The date the lot starts deteriorating without becoming dangerous."
+#~ msgstr ""
+#~ "Fecha en la que el producto empieza a deteriorarse sin llegar a ser "
+#~ "peligroso."
+
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Fecha en la que el producto debería ser eliminado."
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
+#~ "consumido."
diff --git a/addons/product_expiry/i18n/et.po b/addons/product_expiry/i18n/et.po
index 72e4a64faa7..7c64dccb342 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 03098dfc7b1..30db3f893f7 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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fa3c2c47680..30846b0f792 100644
--- a/addons/product_expiry/i18n/fr.po
+++ b/addons/product_expiry/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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9a8f2d9c33e..624b14c1f9e 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b6969ec8418..699004b6ad6 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 28098db054d..a51398b2330 100644
--- a/addons/product_expiry/i18n/hu.po
+++ b/addons/product_expiry/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-31 17:24+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cff1eb25976..6a24985f5b8 100644
--- a/addons/product_expiry/i18n/it.po
+++ b/addons/product_expiry/i18n/it.po
@@ -9,14 +9,14 @@ msgstr ""
 "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 22:50+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -195,3 +195,9 @@ msgstr ""
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr "Tempo di avviso del prodotto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per la struttura della Vista!"
+
+#~ msgid "Product lifetime"
+#~ msgstr "Vita utile del prodotto"
diff --git a/addons/product_expiry/i18n/mn.po b/addons/product_expiry/i18n/mn.po
index 4ad34c69e0d..e90b4dd64d4 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -174,11 +174,5 @@ msgstr ""
 msgid "Product Alert Time"
 msgstr "Анхааруулах хугацаа"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
diff --git a/addons/product_expiry/i18n/nl.po b/addons/product_expiry/i18n/nl.po
index 7de323f1d9e..bb039c95207 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d1d06c875b9..67cb1595a3e 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a8a0ed6ba89..922e33d86f0 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5102598e316..5861f1cd83b 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 43906e86352..edce3955113 100644
--- a/addons/product_expiry/i18n/ru.po
+++ b/addons/product_expiry/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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -35,12 +35,12 @@ msgstr "Коровье молоко"
 #. module: product_expiry
 #: model:ir.module.module,shortdesc:product_expiry.module_meta_information
 msgid "Products date of expiry"
-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
@@ -51,18 +51,19 @@ 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
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
+"Комбинация серийного номера и внутренней ссылки должна быть уникальной !"
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
 msgid "The date on which the lot should be removed."
-msgstr ""
+msgstr "Дата, на которую партия должна быть удалена."
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -75,22 +76,26 @@ msgid ""
 "The number of days after which an alert should be notified about the "
 "production lot."
 msgstr ""
+"Количество дней, после которых должно быть предупреждение об опасности "
+"партии продукции."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
 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 ""
+"Дата, на которую партия продукции может стать опасной и не должна "
+"употребляться."
 
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
@@ -112,7 +117,7 @@ msgstr "Хлеб"
 #: model:product.uom,name:product_expiry.product_uom_ltr
 #: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
 msgid "LTR"
-msgstr ""
+msgstr "Слева направо"
 
 #. module: product_expiry
 #: view:product.product:0
@@ -123,27 +128,27 @@ 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 "Французский сыр camenbert"
 
 #. 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
@@ -175,28 +180,12 @@ msgstr ""
 msgid "Product Alert Time"
 msgstr ""
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
 #~ "Ошибка. ед. изм. по умолчанию и закупочные ед. изм. должны иметь одинаковую "
 #~ "категорию."
 
-#~ msgid "The conversion ratio for a unit of measure cannot be 0!"
-#~ msgstr ""
-#~ "Коэффициент преобразования для единиц измерения не может быть нулевым !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
 
@@ -204,6 +193,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
 #~ "категориям."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/product_expiry/i18n/sl.po b/addons/product_expiry/i18n/sl.po
index 6d4fbb00ea5..52740864bfa 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 22c058333d7..55c966b7980 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -220,17 +220,3 @@ msgstr "Vreme Upozorenja Proizvoda"
 
 #~ msgid "Product alert time"
 #~ msgstr "Vreme alarma proizvoda"
-
-#~ msgid "The date signifying an alert to notify about the production lot."
-#~ msgstr "Datum oznacava upozorenje da bi upozorio na seriju proizvoda."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid ""
-#~ "The number of days after which, needs an alert to notify about the "
-#~ "production lot."
-#~ msgstr ""
-#~ "Broj dana, nakon kojih je potrebno upozorenje u vezi serije proizvoda."
diff --git a/addons/product_expiry/i18n/sr@latin.po b/addons/product_expiry/i18n/sr@latin.po
index de07142f9de..76ced918547 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -186,19 +186,11 @@ msgstr ""
 msgid "Product Alert Time"
 msgstr "Vreme Upozorenja Proizvoda"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
 #~ "Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
 
-#~ msgid "The date signifying an alert to notify about the production lot."
-#~ msgstr "Datum oznacava upozorenje da bi upozorio na seriju proizvoda."
-
 #~ msgid "The date the lot may become dangerous and should not be consumed."
 #~ msgstr ""
 #~ "Datum kada serija proizvoda postaje opasna i ne smije se konzumirati."
@@ -207,12 +199,6 @@ msgstr "Vreme Upozorenja Proizvoda"
 #~ msgstr ""
 #~ "Greška: JU (jedinice usluga)  i JM moraju da budu u različitim kategorijama"
 
-#~ msgid ""
-#~ "The number of days after which, needs an alert to notify about the "
-#~ "production lot."
-#~ msgstr ""
-#~ "Broj dana, nakon kojih je potrebno upozorenje u vezi serije proizvoda."
-
 #~ msgid "The date the lot starts deteriorating without becoming dangerous."
 #~ msgstr ""
 #~ "Datum kada serija proizvoda počinje propadati, a da nije opasna po zdravlje."
diff --git a/addons/product_expiry/i18n/sv.po b/addons/product_expiry/i18n/sv.po
index 3df1d8c8b45..53e03a9d10a 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6e65a798e78..8a99f0a0df0 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: 2011-04-29 05:42+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fbac6c16bac..c863aba8ad6 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\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 77d7cc054a4..3aa5360b077 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: 2011-07-15 04:51+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 5aea3f333d3..d04d0724137 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Attributes & Manufacturers",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/product_manufacturer/i18n/bg.po b/addons/product_manufacturer/i18n/bg.po
index 63a6a5d6b43..675ddaffb8f 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/ca.po b/addons/product_manufacturer/i18n/ca.po
index baefed33e72..07f51cd1d8c 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
index 7a728fc5220..6abae825464 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -87,21 +87,3 @@ msgstr "Produzent Produktnummer"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Produzent"
-
-#~ 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 Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/product_manufacturer/i18n/el.po b/addons/product_manufacturer/i18n/el.po
index f350ce46ebf..af7cb1d9805 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,11 +85,3 @@ msgstr "Όνομα Προϊόντος Κατασκευαστή"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Κατασκευαστής"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Λαναθασμένο XML για προβολή Αρχιτεκτονικής!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το Αντικείμενο πρέπει να ξεκινά με x_ και να μην περιέχει ειδικούς χαρακτήρες"
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
index 7819d2ddc32..e0d1f550b06 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -87,39 +87,3 @@ msgstr "Nombre producto fabricante"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Fabricante"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la estructura de la vista!"
-
-#~ msgid "Manufacturing data"
-#~ msgstr "Datos de fabricació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 puede contener ningún "
-#~ "carácter especial!"
-
-#~ msgid "Manufacturer product code"
-#~ msgstr "Código de producto del fabricante"
-
-#~ msgid "Product name"
-#~ msgstr "Nombre del producto"
-
-#~ msgid "Manufacturing Data"
-#~ msgstr "Datos de fabricación"
-
-#~ msgid "Manufacturer product name"
-#~ msgstr "Nombre del fabricante del producto"
-
-#~ msgid "Product reference"
-#~ msgstr "Referencia del producto"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/product_manufacturer/i18n/es_EC.po b/addons/product_manufacturer/i18n/es_EC.po
index 775515cd184..8666c4475a5 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -86,12 +86,3 @@ msgstr ""
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Fabricante"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la estructura 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 puede contener ningún "
-#~ "carácter especial!"
diff --git a/addons/product_manufacturer/i18n/es_MX.po b/addons/product_manufacturer/i18n/es_MX.po
new file mode 100644
index 00000000000..25bd32dbd32
--- /dev/null
+++ b/addons/product_manufacturer/i18n/es_MX.po
@@ -0,0 +1,89 @@
+# 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-08 21:40+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:46+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+"Un módulo que añade fabricantes y atributos en el formulario de producto"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Código producto fabricante"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Nombre de plantilla de producto"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Atributos de producto"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Atributos del producto"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Atributo"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Atributos"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Fabricantes y atributos de los productos"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Nombre producto fabricante"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Fabricante"
diff --git a/addons/product_manufacturer/i18n/es_VE.po b/addons/product_manufacturer/i18n/es_VE.po
new file mode 100644
index 00000000000..25bd32dbd32
--- /dev/null
+++ b/addons/product_manufacturer/i18n/es_VE.po
@@ -0,0 +1,89 @@
+# 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-08 21:40+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:46+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+"Un módulo que añade fabricantes y atributos en el formulario de producto"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Código producto fabricante"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Nombre de plantilla de producto"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Atributos de producto"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Atributos del producto"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Atributo"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Atributos"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Fabricantes y atributos de los productos"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Nombre producto fabricante"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Fabricante"
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
index a73fee33e8e..259bc89e3c5 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,29 +85,3 @@ msgstr ""
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Tootja"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Product reference"
-#~ msgstr "Toote viide"
-
-#~ msgid "Manufacturing data"
-#~ msgstr "Tootmise andmed"
-
-#~ 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 "Product name"
-#~ msgstr "Toote nimi"
-
-#~ msgid "Manufacturing Data"
-#~ msgstr "Valmistusandmeid"
-
-#~ msgid "Manufacturer product name"
-#~ msgstr "Toote nimetus"
-
-#~ msgid "Manufacturer product code"
-#~ msgstr "Tootja tootekood"
diff --git a/addons/product_manufacturer/i18n/fi.po b/addons/product_manufacturer/i18n/fi.po
index 4d8ac103ccc..f8e1bfe3a40 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: 2011-06-21 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index 4419eeb50ee..bd92dd6f37e 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/gl.po b/addons/product_manufacturer/i18n/gl.po
index 2896c38fdea..33033a76b62 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/hr.po b/addons/product_manufacturer/i18n/hr.po
index cd6cd367fe0..6f69a08cd42 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,11 +85,3 @@ msgstr "Proizvođački naziv artikla"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Proizvođač"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za arhitekturu View-a!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove !"
diff --git a/addons/product_manufacturer/i18n/hu.po b/addons/product_manufacturer/i18n/hu.po
index c35c73fae41..07218a45f9c 100644
--- a/addons/product_manufacturer/i18n/hu.po
+++ b/addons/product_manufacturer/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-25 21:42+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/it.po b/addons/product_manufacturer/i18n/it.po
index 608ccbc4781..cb656d3fcea 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/mn.po b/addons/product_manufacturer/i18n/mn.po
index 66a7cc8c25a..442e9c7fd3d 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -87,36 +87,3 @@ msgstr "Үйлдвэрлэгчийн барааны нэр"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Үйлдвэрлэгч"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Manufacturer product code"
-#~ msgstr "Үйлдвэрлэгчийн барааны код"
-
-#~ msgid "Product reference"
-#~ msgstr "Бүтээгдэхүүний ишлэл"
-
-#~ msgid "Manufacturing data"
-#~ msgstr "Үйлдвэрлэлийн өгөгдөл"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Product name"
-#~ msgstr "Бүтээгдэхүүний нэр"
-
-#~ msgid "Manufacturing Data"
-#~ msgstr "Үйлдвэрлэлийн өгөгдөл"
-
-#~ msgid "Manufacturer product name"
-#~ msgstr "Үйлдвэрлэгчийн бүтээгдэхүүний нэр"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхардах ёсгүй !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
diff --git a/addons/product_manufacturer/i18n/nl.po b/addons/product_manufacturer/i18n/nl.po
index c57468bc3fc..aa45d5439ce 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/pl.po b/addons/product_manufacturer/i18n/pl.po
index 3f6b6447611..135b478afd2 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,12 +85,3 @@ msgstr "Nazwa produktu u producenta"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Producent"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
diff --git a/addons/product_manufacturer/i18n/pt.po b/addons/product_manufacturer/i18n/pt.po
index 383384d0a56..c09c0ae7268 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,21 +85,3 @@ msgstr "Nome do produto (fabricante)"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Fabricante"
-
-#~ 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 "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/product_manufacturer/i18n/pt_BR.po b/addons/product_manufacturer/i18n/pt_BR.po
index 056d92e9167..169ff22f853 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,21 +85,3 @@ msgstr "Nome de Fabricação do Produto"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Fabricante"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido 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 pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po
index 1f7b2052260..f37bff17df9 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,15 +85,3 @@ msgstr "Название используемое производителем"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 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 "Product name"
-#~ msgstr "Название продукта"
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
index 6b6eddcf668..00bd30013a0 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,14 +85,3 @@ msgstr ""
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Proizvajalec"
-
-#~ 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 "Product name"
-#~ msgstr "Ime proizvoda"
diff --git a/addons/product_manufacturer/i18n/sr.po b/addons/product_manufacturer/i18n/sr.po
index b49ca186166..6e03919e703 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,11 +85,3 @@ msgstr "Proizvođačev Naziv Proizvoda"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "Proizvođač"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
diff --git a/addons/product_manufacturer/i18n/sr@latin.po b/addons/product_manufacturer/i18n/sr@latin.po
index 879ab8676c4..4afe1da61ba 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/sv.po b/addons/product_manufacturer/i18n/sv.po
index bc98e2ed5ad..7a77cb33810 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/tr.po b/addons/product_manufacturer/i18n/tr.po
index b5fc29fe6d9..cc8647e58df 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
diff --git a/addons/product_manufacturer/i18n/zh_CN.po b/addons/product_manufacturer/i18n/zh_CN.po
index 3256811240f..7bb7711d0e4 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:43+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
@@ -85,19 +85,3 @@ msgstr "制造商产品名称"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 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 "The certificate ID of the module must be unique !"
-#~ msgstr "模块的认证ID必须唯一"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "模块名必须是唯一的！"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "字段的长度不小于1"
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 69553f1aced..b412e8b63eb 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Margins in Product',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices.
 =============================================================================================================================
@@ -37,6 +37,7 @@ The wizard to launch the report has several options to help you get the data you
                    'wizard/product_margin_view.xml',
                    'product_margin_view.xml'
     ],
+    'test':['test/product_margin.yml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/product_margin/i18n/ar.po b/addons/product_margin/i18n/ar.po
index 2f71598cceb..8d337a28b9f 100644
--- a/addons/product_margin/i18n/ar.po
+++ b/addons/product_margin/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/bg.po b/addons/product_margin/i18n/bg.po
index 06edde9d64d..0dde55dc913 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 20a2ed04288..92609f38f68 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 72d1390d7a0..ee96be8edd3 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6d2f2c8f769..bdbd273b354 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: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1a44e045686..f24e51ec315 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -320,24 +320,3 @@ msgstr "Produkt Marge"
 
 #~ msgid "View Stock of Products"
 #~ msgstr "Ansicht Lagerbestand Produkte"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/product_margin/i18n/el.po b/addons/product_margin/i18n/el.po
index c339d109fc1..5911fdab60f 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -322,12 +322,3 @@ msgstr "Περιθόριο Προϊόντος"
 
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Τζίρος - Συνολικό Κόστος"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου θα πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού"
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index 54ae6c3d4e9..3a9ddec98e4 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -324,24 +324,3 @@ msgstr "Margen producto"
 
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Volumen de negocio - Coste total"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/product_margin/i18n/es_AR.po b/addons/product_margin/i18n/es_AR.po
index 24f5eba98f2..4cfcb7b7010 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/es_EC.po b/addons/product_margin/i18n/es_EC.po
index ee943549c91..679094ca91b 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/es_MX.po b/addons/product_margin/i18n/es_MX.po
new file mode 100644
index 00000000000..4072a859fe6
--- /dev/null
+++ b/addons/product_margin/i18n/es_MX.po
@@ -0,0 +1,326 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_margin
+#
+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:51+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: 2011-09-05 05:39+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "Volumen de negocio"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr "Margen previsto (%)"
+
+#. module: product_margin
+#: field:product.margin,from_date:0
+msgid "From"
+msgstr "Desde"
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Suma de multiplicaciones del precio del catálogo de venta y cantidad de "
+"facturas de cliente"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnorder - Standard price"
+msgstr "Volumen de negocio - Precio estándar"
+
+#. module: product_margin
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "To Date"
+msgstr "Hasta fecha"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "From Date"
+msgstr "Desde fecha"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "Borrador, abierto y pagado"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "Precio unidad promedio"
+
+#. module: product_margin
+#: model:ir.module.module,shortdesc:product_margin.module_meta_information
+msgid "Margins in Product"
+msgstr "Márgenes en productos"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "Precio catálogo"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Expected Sale - Turn Over"
+msgstr "Venta prevista - Volumen de negocio"
+
+#. module: product_margin
+#: model:ir.module.module,description:product_margin.module_meta_information
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins\n"
+"and other interesting indicators based on invoices. The wizard to launch\n"
+"the report has several options to help you get the data you need.\n"
+msgstr ""
+"\n"
+"Añade un menú de informes en los productos, que calcula ventas, compras,\n"
+"márgenes y otros indicadores interesantes en base a las facturas.\n"
+"El asistente ofrece varias opciones para ayudarle a obtener los datos que "
+"necesita.\n"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "Precio estándar"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "Venta prevista"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
+msgstr ""
+"Suma de multiplicaciones del precio de coste y cantidad de facturas de "
+"proveedor"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venta prevista - Coste normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análisis"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "Total coste"
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "Margen previsto"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr "Núm. comprados"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Customer Invoices"
+msgstr ""
+"Suma de multiplicaciones del precio de factura y cantidad de facturas de "
+"cliente"
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr "Margen previsto * 100 / Venta prevista"
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices)"
+msgstr "Precio promedio en facturas de cliente)"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
+msgstr ""
+"Suma de multiplicaciones del precio de factura y cantidad de facturas de "
+"proveedor "
+
+#. module: product_margin
+#: field:product.margin,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr "Estado factura"
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr "Coste normal - Coste total"
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "Margen total"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferencia ventas"
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "Coste normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Precio promedio en facturas de proveedor "
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr "Suma de cantidad en facturas proveedor"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Properties categories"
+msgstr "Categorías propiedades"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr "Margen total * 100 / Volumen de negocio"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
+msgstr "Núm. facturados"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "Abierto y pagado"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Márgenes de producto"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: product_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "Diferencia compra"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin (%)"
+msgstr "Total margen (%)"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir márgenes"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "Márgenes"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr "Suma de cantidad en facturas de cliente"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "Margen producto"
+
+#~ msgid "Excepted Sale - Normal Cost"
+#~ msgstr "Venta excluida - Coste normal"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Select "
+#~ msgstr "Seleccionar "
+
+#~ msgid "View Stock of Products"
+#~ msgstr "Ver stock de productos"
+
+#~ msgid "Excepted Sale - Turn Over"
+#~ msgstr "Venta excluida - Volumen de negocio"
+
+#~ msgid "Turnorder - Total Cost"
+#~ msgstr "Volumen de negocio - Coste total"
diff --git a/addons/product_margin/i18n/es_VE.po b/addons/product_margin/i18n/es_VE.po
new file mode 100644
index 00000000000..4072a859fe6
--- /dev/null
+++ b/addons/product_margin/i18n/es_VE.po
@@ -0,0 +1,326 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_margin
+#
+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:51+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: 2011-09-05 05:39+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "Volumen de negocio"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr "Margen previsto (%)"
+
+#. module: product_margin
+#: field:product.margin,from_date:0
+msgid "From"
+msgstr "Desde"
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Suma de multiplicaciones del precio del catálogo de venta y cantidad de "
+"facturas de cliente"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnorder - Standard price"
+msgstr "Volumen de negocio - Precio estándar"
+
+#. module: product_margin
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "To Date"
+msgstr "Hasta fecha"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "From Date"
+msgstr "Desde fecha"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "Borrador, abierto y pagado"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "Precio unidad promedio"
+
+#. module: product_margin
+#: model:ir.module.module,shortdesc:product_margin.module_meta_information
+msgid "Margins in Product"
+msgstr "Márgenes en productos"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "Precio catálogo"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Expected Sale - Turn Over"
+msgstr "Venta prevista - Volumen de negocio"
+
+#. module: product_margin
+#: model:ir.module.module,description:product_margin.module_meta_information
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins\n"
+"and other interesting indicators based on invoices. The wizard to launch\n"
+"the report has several options to help you get the data you need.\n"
+msgstr ""
+"\n"
+"Añade un menú de informes en los productos, que calcula ventas, compras,\n"
+"márgenes y otros indicadores interesantes en base a las facturas.\n"
+"El asistente ofrece varias opciones para ayudarle a obtener los datos que "
+"necesita.\n"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "Precio estándar"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "Venta prevista"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
+msgstr ""
+"Suma de multiplicaciones del precio de coste y cantidad de facturas de "
+"proveedor"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venta prevista - Coste normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análisis"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "Total coste"
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "Margen previsto"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr "Núm. comprados"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Customer Invoices"
+msgstr ""
+"Suma de multiplicaciones del precio de factura y cantidad de facturas de "
+"cliente"
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr "Margen previsto * 100 / Venta prevista"
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices)"
+msgstr "Precio promedio en facturas de cliente)"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
+msgstr ""
+"Suma de multiplicaciones del precio de factura y cantidad de facturas de "
+"proveedor "
+
+#. module: product_margin
+#: field:product.margin,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr "Estado factura"
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr "Coste normal - Coste total"
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "Margen total"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferencia ventas"
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "Coste normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Precio promedio en facturas de proveedor "
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr "Suma de cantidad en facturas proveedor"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Properties categories"
+msgstr "Categorías propiedades"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr "Margen total * 100 / Volumen de negocio"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
+msgstr "Núm. facturados"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "Abierto y pagado"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Márgenes de producto"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: product_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "Diferencia compra"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin (%)"
+msgstr "Total margen (%)"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir márgenes"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "Márgenes"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr "Suma de cantidad en facturas de cliente"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "Margen producto"
+
+#~ msgid "Excepted Sale - Normal Cost"
+#~ msgstr "Venta excluida - Coste normal"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Select "
+#~ msgstr "Seleccionar "
+
+#~ msgid "View Stock of Products"
+#~ msgstr "Ver stock de productos"
+
+#~ msgid "Excepted Sale - Turn Over"
+#~ msgstr "Venta excluida - Volumen de negocio"
+
+#~ msgid "Turnorder - Total Cost"
+#~ msgstr "Volumen de negocio - Coste total"
diff --git a/addons/product_margin/i18n/et.po b/addons/product_margin/i18n/et.po
index 830734f9779..1ac8d4d618a 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7f1b7e5fe4f..f4e2a0727d9 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -31,7 +31,7 @@ msgstr "Odotettu marginaali (%)"
 #. module: product_margin
 #: field:product.margin,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Lähettäjä"
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
@@ -47,7 +47,7 @@ msgstr ""
 #. module: product_margin
 #: field:product.margin,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Vastaanottaja"
 
 #. module: product_margin
 #: field:product.product,date_to:0
@@ -63,7 +63,7 @@ msgstr "Alkaen"
 #: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Draft, Open and Paid"
-msgstr ""
+msgstr "Luonnos, avoin ja maksettu"
 
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
@@ -74,12 +74,12 @@ msgstr "Keskimääräinen yksikköhinta"
 #. module: product_margin
 #: model:ir.module.module,shortdesc:product_margin.module_meta_information
 msgid "Margins in Product"
-msgstr ""
+msgstr "Tuotteen katteet"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: product_margin
 #: view:product.product:0
@@ -95,7 +95,7 @@ msgstr "Maksettu"
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
-msgstr ""
+msgstr "Odotettu myynti - liikevaihto"
 
 #. module: product_margin
 #: model:ir.module.module,description:product_margin.module_meta_information
@@ -124,7 +124,7 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,expected_margin:0
 msgid "Expected Sale - Normal Cost"
-msgstr ""
+msgstr "Odotettu myynti - normaalikulut"
 
 #. module: product_margin
 #: view:product.product:0
@@ -173,12 +173,12 @@ msgstr ""
 #: field:product.margin,invoice_state:0
 #: field:product.product,invoice_state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Laskun tila"
 
 #. module: product_margin
 #: help:product.product,purchase_gap:0
 msgid "Normal Cost - Total Cost"
-msgstr ""
+msgstr "Normaalikulut - kokonaiskulut"
 
 #. module: product_margin
 #: field:product.product,total_margin:0
@@ -204,17 +204,17 @@ msgstr "Ostot"
 #. module: product_margin
 #: help:product.product,purchase_avg_price:0
 msgid "Avg. Price in Supplier Invoices "
-msgstr ""
+msgstr "Keskihinta toimittajien laskuilla "
 
 #. module: product_margin
 #: help:product.product,purchase_num_invoiced:0
 msgid "Sum of Quantity in Supplier Invoices"
-msgstr ""
+msgstr "Määrien summa toimittajien laskuilla"
 
 #. module: product_margin
 #: view:product.margin:0
 msgid "Properties categories"
-msgstr ""
+msgstr "Ominaisuuksien kategoriat"
 
 #. module: product_margin
 #: help:product.product,total_margin_rate:0
@@ -225,13 +225,13 @@ msgstr "Kokonaismarginaali * 100 / Liikevaihto"
 #: field:product.product,purchase_num_invoiced:0
 #: field:product.product,sale_num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "laskutettu määrä"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Open and Paid"
-msgstr ""
+msgstr "Avoin ja maksettu"
 
 #. module: product_margin
 #: view:product.product:0
@@ -245,22 +245,22 @@ msgstr "Myynti"
 #: view:product.product:0
 #, python-format
 msgid "Product Margins"
-msgstr ""
+msgstr "Tuotteen katteet"
 
 #. module: product_margin
 #: view:product.margin:0
 msgid "General Information"
-msgstr ""
+msgstr "Yleiset tiedot"
 
 #. module: product_margin
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Virhe: Väärä EAN-koodi"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
 msgid "Purchase Gap"
-msgstr ""
+msgstr "Hankinnan erotus"
 
 #. module: product_margin
 #: field:product.product,total_margin_rate:0
@@ -270,7 +270,7 @@ msgstr "Kokonaismarginaali (%)"
 #. module: product_margin
 #: view:product.margin:0
 msgid "Open Margins"
-msgstr ""
+msgstr "Avaa katteet"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -285,12 +285,12 @@ msgstr "Marginaalit"
 #. module: product_margin
 #: help:product.product,sale_num_invoiced:0
 msgid "Sum of Quantity in Customer Invoices"
-msgstr ""
+msgstr "Määrien summa asiakaslaskuilla"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr ""
+msgstr "Tuotteen kate"
 
 #~ msgid "Reporting"
 #~ msgstr "Raportointi"
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index cd25d474f4c..8b1df4a7b86 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2e66ad3b715..8fd7d1573b3 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3ffffb51fdd..0ff675d04b8 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e585c230ef4..c07fe5eb1d8 100644
--- a/addons/product_margin/i18n/hu.po
+++ b/addons/product_margin/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-30 20:40+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5505b28ec97..74f1fa38f70 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 346a983698b..4430bf2b3f7 100644
--- a/addons/product_margin/i18n/it.po
+++ b/addons/product_margin/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-14 10:12+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0268b6662f9..340721987f9 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2f71598cceb..8d337a28b9f 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1d3f82d59e1..8d172382cbe 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/nl_BE.po b/addons/product_margin/i18n/nl_BE.po
index 5fb6a344d4a..161aed06f9e 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9387f1474fc..6b86ddd1504 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4ff50096488..cbe80d56b2a 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -318,21 +318,3 @@ msgstr ""
 
 #~ msgid "View Stock of Products"
 #~ msgstr "Ver Stock de Produtos"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index e7f663c210e..19ed3be6e2c 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ro.po b/addons/product_margin/i18n/ro.po
index 3fd6fcb19c0..ece3f30f04e 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 62f259601cb..00114030289 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -30,7 +30,7 @@ msgstr "Ожидаемая наценка (%)"
 #. module: product_margin
 #: field:product.margin,from_date:0
 msgid "From"
-msgstr "От"
+msgstr "С"
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
@@ -47,7 +47,7 @@ msgstr ""
 #. module: product_margin
 #: field:product.margin,to_date:0
 msgid "To"
-msgstr "Кому"
+msgstr "До"
 
 #. module: product_margin
 #: field:product.product,date_to:0
@@ -79,7 +79,7 @@ msgstr "Наценки в ТМЦ"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
 msgid "Product"
-msgstr "ТМЦ"
+msgstr "Продукция"
 
 #. module: product_margin
 #: view:product.product:0
@@ -95,7 +95,7 @@ msgstr "Оплачено"
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
-msgstr "Ожидаемые продажи - оборот"
+msgstr "Ожидаемые продажи — Оборот"
 
 #. module: product_margin
 #: model:ir.module.module,description:product_margin.module_meta_information
@@ -105,6 +105,12 @@ msgid ""
 "and other interesting indicators based on invoices. The wizard to launch\n"
 "the report has several options to help you get the data you need.\n"
 msgstr ""
+"\n"
+"Добавляет меню отчётов в Продукцию, для вычисления продаж, покупок, маржи\n"
+"и прочих интересных показателей на основе счетов. Мастер, формирующий "
+"отчёт,\n"
+"содержит достаточное количество параметров, помогающих получить нужные "
+"данные.\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -124,12 +130,12 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,expected_margin:0
 msgid "Expected Sale - Normal Cost"
-msgstr ""
+msgstr "Ожидаемые продажи — Нормальная цена"
 
 #. module: product_margin
 #: view:product.product:0
 msgid "Analysis Criteria"
-msgstr "Критерий анализа"
+msgstr "Критерии анализа"
 
 #. module: product_margin
 #: view:product.product:0
@@ -140,7 +146,7 @@ msgstr "Общая стоимость"
 #. module: product_margin
 #: field:product.product,expected_margin:0
 msgid "Expected Margin"
-msgstr "Ожидаемая наценка"
+msgstr "Ожидаемая маржа"
 
 #. module: product_margin
 #: view:product.product:0
@@ -156,7 +162,7 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,expected_margin_rate:0
 msgid "Expected margin * 100 / Expected Sale"
-msgstr "Ожидаемая маржа * 100 / Ожидаемая продажа"
+msgstr "Ожидаемая маржа * 100 / Ожидаемые продажи"
 
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
@@ -173,23 +179,23 @@ msgstr ""
 #: field:product.margin,invoice_state:0
 #: field:product.product,invoice_state:0
 msgid "Invoice State"
-msgstr "Состояние счета"
+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
 #: field:product.product,sales_gap:0
 msgid "Sales Gap"
-msgstr ""
+msgstr "Отставание продаж"
 
 #. module: product_margin
 #: field:product.product,normal_cost:0
@@ -214,7 +220,7 @@ msgstr "Сумма количеств в счетах поставщика"
 #. module: product_margin
 #: view:product.margin:0
 msgid "Properties categories"
-msgstr "Категории продукта"
+msgstr "Категории характеристик"
 
 #. module: product_margin
 #: help:product.product,total_margin_rate:0
@@ -245,7 +251,7 @@ msgstr "Продажи"
 #: view:product.product:0
 #, python-format
 msgid "Product Margins"
-msgstr "Наценки ТМЦ"
+msgstr "Маржа продукции"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -255,22 +261,22 @@ msgstr "Общая информация"
 #. module: product_margin
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Ошибка: Неправильный штрих-код"
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
 msgid "Purchase Gap"
-msgstr ""
+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
@@ -280,38 +286,20 @@ msgstr "Отмена"
 #. module: product_margin
 #: view:product.product:0
 msgid "Margins"
-msgstr "Наценки"
+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 "Маржа продукции"
 
 #~ msgid "Reporting"
 #~ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/product_margin/i18n/sl.po b/addons/product_margin/i18n/sl.po
index 7d2ce4ef3be..10cba92ad3d 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a114b7513d4..0c6907c9bf7 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dda258d6431..1161c6bb447 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -314,14 +314,3 @@ msgstr "Marza Proizvoda"
 
 #~ msgid "View Stock of Products"
 #~ msgstr "Pogledaj zalihu proizvoda"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
diff --git a/addons/product_margin/i18n/sr@latin.po b/addons/product_margin/i18n/sr@latin.po
index 75ea705584a..309e7eb2802 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -294,17 +294,6 @@ msgstr "Suma količina na fakturama kupca"
 msgid "Product Margin"
 msgstr "Marza Proizvoda"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 8db2885127a..870d93e349d 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fa5c5a42fd3..98586aa8071 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0314c406ee9..4cbbf792cce 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/uk.po b/addons/product_margin/i18n/uk.po
index 45e1b06bc25..3a757adf6cc 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f1bcc549882..bf5b7fa8e0c 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\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 612cc7754d5..c580e4a0f48 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-03-20 09:13+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -41,7 +41,7 @@ msgstr "客户发票 (标价 * 数量) 合计"
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnorder - Standard price"
-msgstr ""
+msgstr "订单价格 - 标准价"
 
 #. module: product_margin
 #: field:product.margin,to_date:0
@@ -78,7 +78,7 @@ msgstr "产品利润"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: product_margin
 #: view:product.product:0
@@ -94,7 +94,7 @@ msgstr "支付"
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
-msgstr ""
+msgstr "预计售价 - 订单价格"
 
 #. module: product_margin
 #: model:ir.module.module,description:product_margin.module_meta_information
@@ -104,6 +104,8 @@ msgid ""
 "and other interesting indicators based on invoices. The wizard to launch\n"
 "the report has several options to help you get the data you need.\n"
 msgstr ""
+"\n"
+"在产品对象上添加了一个报告，用于按发票计算销售、采购、利润和其它有趣的指标。报表的向导有很多选项是您得到想要的数据。\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -123,7 +125,7 @@ msgstr "供应商发票  (成本价格 * 数量) 合计"
 #. module: product_margin
 #: help:product.product,expected_margin:0
 msgid "Expected Sale - Normal Cost"
-msgstr ""
+msgstr "预计销售 - 标准成本"
 
 #. module: product_margin
 #: view:product.product:0
@@ -213,7 +215,7 @@ msgstr "供应商发票数量合计"
 #. module: product_margin
 #: view:product.margin:0
 msgid "Properties categories"
-msgstr ""
+msgstr "属性分类"
 
 #. module: product_margin
 #: help:product.product,total_margin_rate:0
@@ -249,12 +251,12 @@ msgstr "产品利润"
 #. module: product_margin
 #: view:product.margin:0
 msgid "General Information"
-msgstr ""
+msgstr "一般信息"
 
 #. module: product_margin
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
@@ -289,21 +291,11 @@ msgstr "客户发票数量合计"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr ""
+msgstr "产品利润"
 
 #~ msgid "Select "
 #~ msgstr "选择 "
 
-#~ msgid ""
-#~ "\n"
-#~ "Adds a reporting menu in products that computes sales, purchases, margins\n"
-#~ "and others interesting indicators based on invoices. The wizard to launch\n"
-#~ "the report has several options to help you get the data you need.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "在计算产m品销售,采购,利润和其它基于发票利益指标上增加一个报表菜单.\n"
-#~ "这向导启动几种选择报表来帮助你获得你需要的资料\n"
-
 #~ msgid "Reporting"
 #~ msgstr "内部报表"
 
diff --git a/addons/product_margin/i18n/zh_TW.po b/addons/product_margin/i18n/zh_TW.po
index cec5aee95ed..4a78fe23534 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:36+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/test/product_margin.yml b/addons/product_margin/test/product_margin.yml
new file mode 100644
index 00000000000..fa8241ab206
--- /dev/null
+++ b/addons/product_margin/test/product_margin.yml
@@ -0,0 +1,25 @@
+-
+   In order to test the product_margin module, I create a product margin record
+-
+  !record {model: product.margin, id: product_margin_wiz0}:
+    from_date: !eval "'%s-01-01' %(datetime.now().year)"
+    to_date: !eval "'%s-12-31' %(datetime.now().year)"
+    invoice_state: open_paid
+-
+  I open margin for PC3
+-
+  !python {model: product.margin}: |
+    self.action_open_window(cr, uid, [ref("product_margin_wiz0")], {"lang": 'en_US',
+      "search_default_filter_to_sell": "1", "tz": False, "active_model": "product.product", "disable_log": True, 
+      "active_ids": [ref("product.product_product_pc3")], "active_id": ref("product.product_product_pc3")})
+-
+  I read the fields of the product.
+-
+  !python {model: product.product}: |
+    fields = ['sale_avg_price', 'expected_margin_rate', 'total_margin_rate', 'total_cost', 'sale_num_invoiced', 
+      'total_margin', 'sales_gap', 'purchase_num_invoiced', 'expected_margin', 'turnover']
+    self.read(cr, uid, [ref("product_margin_wiz0")], fields, {"lang": 'en_US',
+      "search_default_filter_to_sell": "1", "tz": False, "active_model": "product.product", 
+      "bin_size": True, "active_ids": [ref("product.product_product_pc3")], 
+      "active_id": ref("product.product_product_pc3")})
+
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index 903bc6c7523..d05c3a82c11 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -21,7 +21,7 @@
     "name": "Visible Discount",
     "version": "1.0",
     "author": "OpenERP SA",
-    "category": "Sales",
+    "category": "Hidden",
     'complexity': "easy",
     "description": """
 This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
diff --git a/addons/product_visible_discount/i18n/bg.po b/addons/product_visible_discount/i18n/bg.po
index a7d4113a89f..9bcbf642790 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/ca.po b/addons/product_visible_discount/i18n/ca.po
index 69e5c693722..2a43391e448 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/da.po b/addons/product_visible_discount/i18n/da.po
new file mode 100644
index 00000000000..92f78c208b1
--- /dev/null
+++ b/addons/product_visible_discount/i18n/da.po
@@ -0,0 +1,81 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-08 11:47+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "No Purchase Pricelist Found !"
+msgstr "Kunne ikke finde indkøbsprisliste!"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "No Sale Pricelist Found "
+msgstr "Kunne ikke finde salgsprisliste! "
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Synlig rabat"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinie"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "Man skal først definere en prisliste til kunden!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "You must first define a pricelist for Supplier !"
+msgstr "Man skal først definere en prisliste til leverandøren!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinie"
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
index e2ab3f6d287..bdc1d40446c 100644
--- a/addons/product_visible_discount/i18n/de.po
+++ b/addons/product_visible_discount/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
@@ -98,21 +98,3 @@ msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Verkaufsauftragsposition"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/product_visible_discount/i18n/el.po b/addons/product_visible_discount/i18n/el.po
index 322aaa319f0..acf9f7e89aa 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
@@ -80,14 +80,5 @@ msgstr "Θα πρέπει πρώτα να ορίσεις τιμοκατάλογ
 msgid "Sales Order Line"
 msgstr ""
 
-#~ msgid "Sale Order Line"
-#~ msgstr "Γραμμή Παραγγελίας Πώλησης"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Λανθασμένο XML για προβολή Αρχιτεκτονικής"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου θα πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες"
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index 3cf3c6a64cf..9d58fb19b09 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
@@ -97,21 +97,3 @@ msgstr "Línea pedido de venta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML no válido para la definición de la vista!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Línea pedido venta"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/product_visible_discount/i18n/es_EC.po b/addons/product_visible_discount/i18n/es_EC.po
index eb18d0c05f6..52d436d7a7e 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/es_MX.po b/addons/product_visible_discount/i18n/es_MX.po
new file mode 100644
index 00000000000..210ceaf8673
--- /dev/null
+++ b/addons/product_visible_discount/i18n/es_MX.po
@@ -0,0 +1,99 @@
+# 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-01 07:19+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "No Purchase Pricelist Found !"
+msgstr "¡No se ha encontrado tarifa de compra!"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "No Sale Pricelist Found "
+msgstr "No se ha encontrado tarifa de venta "
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite calcular descuentos en las líneas del Pedido de "
+"Ventas y en las de la Factura basados en la tarifa de la empresa.\n"
+"    Para ello se añade al formulario de la tarifa una nueva opción llamada "
+"\"Descuento visible\".\n"
+"    Ejemplo:\n"
+"        Para el producto PC1 y la empresa \"Asustek\": si el precio de venta "
+"es 450 y el precio calculado con la tarifa de Asustek es 225:\n"
+"        Si la opción \"Descuento visible\" está activada, en la línea del "
+"pedido aparecerá: precio unitario=450, Descuento=50,00, Precio neto=225\n"
+"        Si la opción \"Descuento visible\" está desactivada, en la línea del "
+"pedido y en la factura aparecerá: Precio unitario=225, Descuento=0,00, "
+"Precio neto=225\n"
+"    "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Descuento visible"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "¡Primero debe definir una tarifa para el cliente!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "You must first define a pricelist for Supplier !"
+msgstr "¡Primero debe definir una tarifa para el proveedor!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
diff --git a/addons/product_visible_discount/i18n/es_VE.po b/addons/product_visible_discount/i18n/es_VE.po
new file mode 100644
index 00000000000..210ceaf8673
--- /dev/null
+++ b/addons/product_visible_discount/i18n/es_VE.po
@@ -0,0 +1,99 @@
+# 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-01 07:19+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "No Purchase Pricelist Found !"
+msgstr "¡No se ha encontrado tarifa de compra!"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "No Sale Pricelist Found "
+msgstr "No se ha encontrado tarifa de venta "
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite calcular descuentos en las líneas del Pedido de "
+"Ventas y en las de la Factura basados en la tarifa de la empresa.\n"
+"    Para ello se añade al formulario de la tarifa una nueva opción llamada "
+"\"Descuento visible\".\n"
+"    Ejemplo:\n"
+"        Para el producto PC1 y la empresa \"Asustek\": si el precio de venta "
+"es 450 y el precio calculado con la tarifa de Asustek es 225:\n"
+"        Si la opción \"Descuento visible\" está activada, en la línea del "
+"pedido aparecerá: precio unitario=450, Descuento=50,00, Precio neto=225\n"
+"        Si la opción \"Descuento visible\" está desactivada, en la línea del "
+"pedido y en la factura aparecerá: Precio unitario=225, Descuento=0,00, "
+"Precio neto=225\n"
+"    "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Descuento visible"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:155
+#, python-format
+msgid "You must first define a pricelist for Customer !"
+msgstr "¡Primero debe definir una tarifa para el cliente!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:147
+#, python-format
+msgid "You must first define a pricelist for Supplier !"
+msgstr "¡Primero debe definir una tarifa para el proveedor!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
diff --git a/addons/product_visible_discount/i18n/et.po b/addons/product_visible_discount/i18n/et.po
index 99fb45f3307..789b056c387 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/fi.po b/addons/product_visible_discount/i18n/fi.po
index 5e067054acc..b955e45f476 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/fr.po b/addons/product_visible_discount/i18n/fr.po
index f91c4718b09..acda929a763 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
@@ -97,6 +97,3 @@ msgstr "Ligne de bon de commande"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Ligne de commande de vente"
diff --git a/addons/product_visible_discount/i18n/gl.po b/addons/product_visible_discount/i18n/gl.po
index 31c71665765..03de8df6adb 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/hr.po b/addons/product_visible_discount/i18n/hr.po
index fe68667ba38..0fa8467d1fc 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/hu.po b/addons/product_visible_discount/i18n/hu.po
index 681965568b8..91f0ef357bb 100644
--- a/addons/product_visible_discount/i18n/hu.po
+++ b/addons/product_visible_discount/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-31 18:05+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/it.po b/addons/product_visible_discount/i18n/it.po
index fdf9c1a5d90..5768ad4d68d 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/mn.po b/addons/product_visible_discount/i18n/mn.po
index ea33343d2a8..df3e138e948 100644
--- a/addons/product_visible_discount/i18n/mn.po
+++ b/addons/product_visible_discount/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/nl.po b/addons/product_visible_discount/i18n/nl.po
index 2882e9685ba..3b3f0aee40d 100644
--- a/addons/product_visible_discount/i18n/nl.po
+++ b/addons/product_visible_discount/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/pl.po b/addons/product_visible_discount/i18n/pl.po
index a1d66e467a5..1c9d7be0f77 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/pt.po b/addons/product_visible_discount/i18n/pt.po
index 2ddb9dd2c8e..8ea004be78f 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
@@ -82,21 +82,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Linha de Ordem de venda"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/product_visible_discount/i18n/pt_BR.po b/addons/product_visible_discount/i18n/pt_BR.po
index 29db65ec623..967b12031f7 100644
--- a/addons/product_visible_discount/i18n/pt_BR.po
+++ b/addons/product_visible_discount/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/ru.po b/addons/product_visible_discount/i18n/ru.po
index a6deaf93845..668a84d4897 100644
--- a/addons/product_visible_discount/i18n/ru.po
+++ b/addons/product_visible_discount/i18n/ru.po
@@ -14,20 +14,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
 #, python-format
 msgid "No Purchase Pricelist Found !"
-msgstr "Не найден каталог для закупок !"
+msgstr "Не найден прайс-лист для закупок!"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:155
 #, python-format
 msgid "No Sale Pricelist Found "
-msgstr "Не найден каталог для продаж "
+msgstr "Не найден прайс-лист для продаж "
 
 #. module: product_visible_discount
 #: model:ir.module.module,description:product_visible_discount.module_meta_information
@@ -46,6 +46,18 @@ msgid ""
 "Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
 "    "
 msgstr ""
+"\n"
+"    Этот модуль позволяет вычислять скидки по позициям заказа на продажу и "
+"позициям счёта на основе прайс-листа контрагента.\n"
+"    Для этого в форму «Прайс-лист» добавлен переключатель «Видимая скидка».\n"
+"    Пример:\n"
+"        Для продукта PC1 и контрагента \"Asustek\": если listprice=450 и "
+"цена, вычисленная с помощью  прайс-листа Asustek — 225\n"
+"        Если переключатель установлен, в заказе на продажу мы получим: Цена "
+"единицы = 450, Скидка = 50,00, Чистая цена = 225\n"
+"        Если переключатель не установлен, в заказе на продажу и счёте "
+"получим: Цена единицы = 225, Скидка = 0,00, Чистая цена = 225\n"
+"    "
 
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
@@ -62,18 +74,18 @@ msgstr "Позиция счета"
 #: code:addons/product_visible_discount/product_visible_discount.py:155
 #, python-format
 msgid "You must first define a pricelist for Customer !"
-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:147
 #, python-format
 msgid "You must first define a pricelist for Supplier !"
-msgstr "Сначала вы должны определить каталог для поставщика !"
+msgstr "Сначала требуется определить прайс-лист для поставщика!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
@@ -82,12 +94,3 @@ msgstr "Позиция заказа на продажу"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра структуры!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Позиция заказа на продажу"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
-#~ "символов !"
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
index 9f7033ebbc7..4437ebc9df5 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/sr.po b/addons/product_visible_discount/i18n/sr.po
index a3a07b64e0f..5a7e7c998eb 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
@@ -94,11 +94,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Linija Prodajnih Naloga"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere."
diff --git a/addons/product_visible_discount/i18n/sr@latin.po b/addons/product_visible_discount/i18n/sr@latin.po
index 55676851933..d13f34c1d65 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
@@ -94,11 +94,3 @@ msgstr "Redosled narudžbina"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Linija Prodajnih Naloga"
diff --git a/addons/product_visible_discount/i18n/tr.po b/addons/product_visible_discount/i18n/tr.po
index 3f4d846e1b5..1aa9b990809 100644
--- a/addons/product_visible_discount/i18n/tr.po
+++ b/addons/product_visible_discount/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/vi.po b/addons/product_visible_discount/i18n/vi.po
index e4a01dfb9ca..a16e2d1ce87 100644
--- a/addons/product_visible_discount/i18n/vi.po
+++ b/addons/product_visible_discount/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-05-01 17:21+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-02 04:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/i18n/zh_CN.po b/addons/product_visible_discount/i18n/zh_CN.po
index 00b498500d7..482e2abd962 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: 2011-07-15 04:51+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:147
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index c2f939c1618..7edd196cd53 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -40,7 +40,8 @@ class sale_order_line(osv.osv):
 
     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):
+            lang=False, update_tax=True, date_order=False, packaging=False,
+            fiscal_position=False, flag=False, context=None):
 
         def get_real_price(res_dict, product_id, qty, uom, pricelist):
             item_obj = self.pool.get('product.pricelist.item')
@@ -59,7 +60,7 @@ class sale_order_line(osv.osv):
             product_tmpl_id = product.product_tmpl_id.id
 
             product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
-            
+
             factor = 1.0
             if uom and uom != product.uom_id.id:
                 product_uom_obj = self.pool.get('product.uom')
@@ -70,7 +71,7 @@ class sale_order_line(osv.osv):
 
         res=super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
-            lang, update_tax,date_order,fiscal_position=fiscal_position,flag=flag)
+            lang, update_tax, date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
 
         context = {'lang': lang, 'partner_id': partner_id}
         result=res['value']
diff --git a/addons/profile_tools/__init__.py b/addons/profile_tools/__init__.py
index 3511d091ecb..9a3d6d2fbb6 100644
--- a/addons/profile_tools/__init__.py
+++ b/addons/profile_tools/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 46528337f98..bd8790d1496 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -21,28 +21,27 @@
 
 
 {
-    "name" : "Miscellaneous Tools",
+    "name" : "Miscellaneous Hidden",
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "description": """
-Installer for extra tools like lunch, survey, idea, share, etc.
+Installer for extra Hidden like lunch, survey, idea, share, etc.
 ===============================================================
 
-Makes the Extra Tools Configuration available from where you can install
+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': [
-        'misc_tools_installer.xml',
     ],
     'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate' : '00557100228403879621',
-    'images': ['images/config_extra_tools.jpeg'],
+    'images': ['images/config_extra_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/i18n/bg.po b/addons/profile_tools/i18n/bg.po
index d568054e263..a27f3f95d42 100644
--- a/addons/profile_tools/i18n/bg.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/ca.po b/addons/profile_tools/i18n/ca.po
index 289cea0d5a1..b81932b6e87 100644
--- a/addons/profile_tools/i18n/ca.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/de.po b/addons/profile_tools/i18n/de.po
index e3fd37e9216..7a6f8aa87ff 100644
--- a/addons/profile_tools/i18n/de.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
@@ -156,49 +156,3 @@ msgstr "Titel"
 #: field:misc_tools.installer,share:0
 msgid "Web Share"
 msgstr "Gemeinsames Web"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "Share Data / Portals"
-#~ msgstr "Freigabe von Daten / Portal"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid ""
-#~ "This module allows you to easily give restricted access of any filtered list "
-#~ "of objects to any customer or supplier.Just click on the share icon to give "
-#~ "access to your customers on their project's tasks, support requests, "
-#~ "invoices, etc."
-#~ msgstr ""
-#~ "Diese Modul ermöglicht eine gezielte Vergabe des Zugriffs auf gefilterte "
-#~ "Listen oder Objekte für bestimmte Kunden oder Lieferanten oder sonstige "
-#~ "Externe. Sie brauchen hierzu nur auf den Freigabe Button drücken, um "
-#~ "Freigaben zu Aufgaben, Supporttickets, Rechnungen etc. zu erteilen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Native pad integration"
-#~ msgstr "Generische Padintegration"
-
-#~ msgid ""
-#~ "Here are applications that can help you improve your organization without "
-#~ "being key in its management."
-#~ msgstr ""
-#~ "Hier finden Sie die Anwendungen, die für Ihre Organisation nützlich sein "
-#~ "können, ohne dass Sie Schlüsselanwendungen für das Management Ihres "
-#~ "Unternehmens sind."
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
index a90f4c0f719..34f883fee44 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
@@ -157,48 +157,3 @@ msgstr "título"
 #: field:misc_tools.installer,share:0
 msgid "Web Share"
 msgstr "Compartir Web"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "This module allows you to easily give restricted access of any filtered list "
-#~ "of objects to any customer or supplier.Just click on the share icon to give "
-#~ "access to your customers on their project's tasks, support requests, "
-#~ "invoices, etc."
-#~ msgstr ""
-#~ "Este módulo permite de forma fácil dar acceso restringido de cualquier lista "
-#~ "filtrada de objetos a cualquier cliente o proveedor. Haga clic en el icono "
-#~ "compartir para dar acceso a sus clientes en sus tareas de proyecto, "
-#~ "solicitudes de soporte, facturas, etc."
-
-#~ msgid "Share Data / Portals"
-#~ msgstr "Compartir datos / Portales"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Native pad integration"
-#~ msgstr "Integración pad nativa"
-
-#~ msgid ""
-#~ "Here are applications that can help you improve your organization without "
-#~ "being key in its management."
-#~ msgstr ""
-#~ "Aquí se muestran aplicaciones que pueden ayudarle a mejorar su organización "
-#~ "sin ser fundamentales para su gestión."
diff --git a/addons/profile_tools/i18n/es_MX.po b/addons/profile_tools/i18n/es_MX.po
new file mode 100644
index 00000000000..ec495f0d96e
--- /dev/null
+++ b/addons/profile_tools/i18n/es_MX.po
@@ -0,0 +1,159 @@
+# 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
new file mode 100644
index 00000000000..ec495f0d96e
--- /dev/null
+++ b/addons/profile_tools/i18n/es_VE.po
@@ -0,0 +1,159 @@
+# 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
index 54edf5dbbbd..40156df942c 100644
--- a/addons/profile_tools/i18n/fi.po
+++ b/addons/profile_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: 2011-06-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/fr.po b/addons/profile_tools/i18n/fr.po
index b7a77b828d1..f169d076b16 100644
--- a/addons/profile_tools/i18n/fr.po
+++ b/addons/profile_tools/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/gl.po b/addons/profile_tools/i18n/gl.po
index fc4995bd046..c780a7308c0 100644
--- a/addons/profile_tools/i18n/gl.po
+++ b/addons/profile_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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/hu.po b/addons/profile_tools/i18n/hu.po
index b030046447f..9e631019569 100644
--- a/addons/profile_tools/i18n/hu.po
+++ b/addons/profile_tools/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-25 08:50+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/it.po b/addons/profile_tools/i18n/it.po
index 2530d3f69da..e629bf61a78 100644
--- a/addons/profile_tools/i18n/it.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/mn.po b/addons/profile_tools/i18n/mn.po
index 8414e455a83..224b49db737 100644
--- a/addons/profile_tools/i18n/mn.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/nl.po b/addons/profile_tools/i18n/nl.po
index 784b1a8a71d..868f438d828 100644
--- a/addons/profile_tools/i18n/nl.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/pt.po b/addons/profile_tools/i18n/pt.po
index b43abd3116a..0bea52aa91a 100644
--- a/addons/profile_tools/i18n/pt.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/pt_BR.po b/addons/profile_tools/i18n/pt_BR.po
index 0951c668a82..25dc1800350 100644
--- a/addons/profile_tools/i18n/pt_BR.po
+++ b/addons/profile_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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/ru.po b/addons/profile_tools/i18n/ru.po
index a150d4bd2e6..cd4377015ce 100644
--- a/addons/profile_tools/i18n/ru.po
+++ b/addons/profile_tools/i18n/ru.po
@@ -14,13 +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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
 msgid "Promote ideas of the employees, votes and discussion on best ideas."
 msgstr ""
+"Продвигайте идеи сотрудников, организуйте голосования и обсуждение лучших "
+"идей."
 
 #. module: profile_tools
 #: help:misc_tools.installer,share:0
@@ -29,11 +31,15 @@ msgid ""
 "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: задачам проекта, запросам "
+"поддержки, счетам и т.д."
 
 #. module: profile_tools
 #: help:misc_tools.installer,lunch:0
 msgid "A simple module to help you to manage Lunch orders."
-msgstr ""
+msgstr "Простой модуль, помогающий управлять заказами на ланч."
 
 #. module: profile_tools
 #: field:misc_tools.installer,subscription:0
@@ -59,6 +65,8 @@ msgid ""
 "Extra Tools are applications that can help you improve your organization "
 "although they are not key for company management."
 msgstr ""
+"Дополнительные инструменты - приложения, позволяющие улучшить работу, при "
+"этом не являющиеся ключевыми для управления организацией."
 
 #. module: profile_tools
 #: view:misc_tools.installer:0
@@ -86,7 +94,7 @@ msgstr ""
 #. module: profile_tools
 #: field:misc_tools.installer,lunch:0
 msgid "Lunch"
-msgstr ""
+msgstr "Ланч"
 
 #. module: profile_tools
 #: view:misc_tools.installer:0
@@ -96,7 +104,7 @@ msgstr "Дополнительные инструменты настройки"
 #. module: profile_tools
 #: field:misc_tools.installer,idea:0
 msgid "Ideas Box"
-msgstr ""
+msgstr "Копилка идей"
 
 #. module: profile_tools
 #: help:misc_tools.installer,subscription:0
@@ -111,7 +119,7 @@ msgstr "Средства настройки"
 #. module: profile_tools
 #: field:misc_tools.installer,pad:0
 msgid "Collaborative Note Pads"
-msgstr ""
+msgstr "Заметки с общим доступом"
 
 #. module: profile_tools
 #: field:misc_tools.installer,survey:0
@@ -126,7 +134,7 @@ msgstr "Настроить дополнительные инструменты"
 #. module: profile_tools
 #: field:misc_tools.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Настройка выполняется"
+msgstr "Выполнение настройки"
 
 #. module: profile_tools
 #: field:misc_tools.installer,config_logo:0
@@ -136,7 +144,7 @@ msgstr "Изображение"
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: profile_tools
 #: field:misc_tools.installer,share:0
diff --git a/addons/profile_tools/i18n/zh_CN.po b/addons/profile_tools/i18n/zh_CN.po
index df2ecbe2c8e..eb16c497e29 100644
--- a/addons/profile_tools/i18n/zh_CN.po
+++ b/addons/profile_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: 2011-07-15 04:51+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
@@ -53,7 +53,7 @@ msgid ""
 "    module\n"
 "    "
 msgstr ""
-"安装一些工具类的模块，如午餐、调查问卷、周期性凭证和审计线索之类。\n"
+"安装一些工具类的模块，如午餐、调查问卷、周期性凭证和审计跟踪之类。\n"
 "    "
 
 #. module: profile_tools
@@ -94,12 +94,12 @@ msgstr "午餐"
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Extra Tools Configuration"
-msgstr "附加工具配置"
+msgstr "附加工具设置"
 
 #. module: profile_tools
 #: field:misc_tools.installer,idea:0
 msgid "Ideas Box"
-msgstr "创意池"
+msgstr "创意"
 
 #. module: profile_tools
 #: help:misc_tools.installer,subscription:0
@@ -109,7 +109,7 @@ msgstr "帮助生成周期性凭证"
 #. module: profile_tools
 #: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
 msgid "Tools Configuration"
-msgstr "工具配置"
+msgstr "工具设置"
 
 #. module: profile_tools
 #: field:misc_tools.installer,pad:0
@@ -124,7 +124,7 @@ msgstr "问卷"
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Configure Extra Tools"
-msgstr "配置额外工具"
+msgstr "设置附加的工具"
 
 #. module: profile_tools
 #: field:misc_tools.installer,progress:0
@@ -144,4 +144,4 @@ msgstr "标题"
 #. module: profile_tools
 #: field:misc_tools.installer,share:0
 msgid "Web Share"
-msgstr "分享"
+msgstr "共享"
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
deleted file mode 100644
index 44258234d11..00000000000
--- a/addons/profile_tools/installer.py
+++ /dev/null
@@ -1,40 +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 osv import fields, osv
-
-class misc_tools_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
-        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
-        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
-        'share':fields.boolean('Web Share',help='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.'),
-        'pad': fields.boolean('Collaborative Note Pads',
-            help="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."),
-    }
-misc_tools_installer()
-
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
deleted file mode 100644
index 6804e1dadd0..00000000000
--- a/addons/profile_tools/misc_tools_installer.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_misc_tools_installer" model="ir.ui.view">
-      <field name="name">misc_tools.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='profile_tools']" position="replace">
-            <newline/>
-            <separator  string="Extra Tools Features" colspan="4" />
-            <field name="share" />
-            <field name="lunch" />
-            <field name="idea" />
-            <field name="survey" />
-            <field name="subscription" />
-            <field name="pad" />            
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 142cd98e485..01bef264e02 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -21,7 +21,6 @@
 
 import project
 import company
-import installer
 import report
 import wizard
 import res_partner
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index a2387ce24dc..9132636b56f 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -28,7 +28,7 @@
     "category": "Project Management",
     'complexity': "easy",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
-    "depends": ["base_setup", "product", "analytic", "board"],
+    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource"],
     "description": """
 Project management module tracks multi-level projects, tasks, work done on tasks, eso.
 ======================================================================================
@@ -46,7 +46,6 @@ Dashboard for project members that includes:
     "update_xml": [
         "security/project_security.xml",
         "wizard/project_task_delegate_view.xml",
-        "wizard/project_task_close_view.xml",
         "wizard/project_task_reevaluate_view.xml",
         "security/ir.model.access.csv",
         "project_data.xml",
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
index b9ff6331db0..d9340eefb3a 100644
--- a/addons/project/board_project_manager_view.xml
+++ b/addons/project/board_project_manager_view.xml
@@ -2,20 +2,23 @@
 <openerp>
     <data>
 
-        <!--
-         Board for project managers
-         -->
+        <!-- Board for project managers -->
+
         <act_window 
-            domain="[('user_id', '=', uid)]" 
-            id="act_my_project" name="My projects" 
-            res_model="project.project" view_mode="tree,form" 
+            id="act_my_project"
+            name="My projects" 
+            res_model="project.project"
+            domain="&quot;[('user_id', '=', uid)]&quot;"
+            view_mode="tree,form" 
             view_type="form"/>
+
         <act_window 
             id="act_my_account"
             name="My accounts to invoice"
             res_model="account.analytic.account"
-            domain="[('user_id','=',uid),('state','&lt;&gt;','close')]"
+            domain="&quot;[('user_id','=',uid),('state','&lt;&gt;','close')]&quot;"
             view_mode="tree,form"
             view_type="form"/>
+
     </data>
 </openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 6470dd3e49d..a58557c94ba 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -48,7 +48,7 @@
         </record>
 
 
-        <record id="action_view_task_tree" model="ir.actions.act_window">
+        <record id="my_open_tasks_action" model="ir.actions.act_window">
             <field name="name">My Open Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
@@ -81,16 +81,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Board">
-                    <hpaned>
-                        <child1>
-                            <action colspan="4"  height="100" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
-                            <action colspan="4"  height="100" name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
-                        </child1>
-                        <child2>
-                            <action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
-                            <action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
-                        </child2>
-                    </hpaned>
+                    <board style="1-2">
+                        <column>
+                            <action name="%(my_open_tasks_action)d" string="My Open Tasks"/>
+                            <action name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks"/>
+                        </column>
+                        <column>
+                            <action name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours"/>
+                            <action name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/project/company.py b/addons/project/company.py
index 0967d130737..6400450cd3e 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -33,3 +33,5 @@ class res_company(osv.osv):
     }
 res_company()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 527bd1e21dc..20c0766fe08 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index a5a05f42048..71eea6d0e77 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr "Крайни срокове"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Действието не е разрешено"
@@ -242,7 +242,7 @@ msgid "Day"
 msgstr "Ден"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "Задачата '%s' е завършена"
@@ -428,7 +428,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Задачата '%s' е приключена"
@@ -478,8 +478,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Грешка! Не можете да създавате рекурсивни аналитични сметки."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (копие)"
@@ -618,7 +618,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -711,7 +711,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -736,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1138,7 +1138,6 @@ msgstr "Табло на проекта"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1168,7 +1167,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1216,7 +1215,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1353,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1402,7 +1401,7 @@ msgid "Open"
 msgstr "Отвoри"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1726,7 +1725,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1801,7 +1800,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1829,7 +1828,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -1980,84 +1979,3 @@ msgstr ""
 
 #~ msgid "Delay"
 #~ msgstr "Закъснение"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Приключени задачи по проект (текущ месец)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Приключени задачи по проект и по потребител"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Приключени задачи по проект и по потребител (текущ месец)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Приключване на задача"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Задачи по проект"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Управление на продажби – справки"
-
-#~ msgid "User"
-#~ msgstr "Потребител"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Задачи по проект и по потребител"
-
-#~ msgid "This Month"
-#~ msgstr "Текущ месец"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Задачи по проекти и по потребители"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Прибл. закъснение на приключването"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Задачи по проект"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Приключени задачи по проект"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Задачи според потребител"
-
-#~ msgid "No Task"
-#~ msgstr "Няма задача"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Доклад на задачите по проекти според потребител"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "График / Часове задачи на месец"
-
-#~ msgid "Reporting"
-#~ msgstr "Справки"
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Приключени задачи през последните 15 дни"
-
-#~ msgid "Task Hours"
-#~ msgstr "Часове задачи"
-
-#~ msgid "Task Number"
-#~ msgstr "Номер на задача"
-
-#~ msgid "report.timesheet.task.user"
-#~ msgstr "report.timesheet.task.user"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "График / Доклад на часовете задачи на месец"
-
-#~ msgid "Task Progress"
-#~ msgstr "Напредък на задачата"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Доклад за приключена задача"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Часове по график"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Приключени задачи"
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index 2896cd037c5..4211107d667 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr "Kontrolna ploča za projekte"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -1880,33 +1879,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
-
-#~ msgid "My project's planning"
-#~ msgstr "Planiranje mog projekta"
-
-#~ msgid "Board for project users"
-#~ msgstr "Tabla za korisnike projekta"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Cjevovod za zadatke"
-
-#~ msgid "My Planning"
-#~ msgstr "Moje planiranje"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Nadzorna ploča vođe projekta"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Moji rokovi"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Vremenski raporti korisnika"
-
-#~ msgid "Project manager board"
-#~ msgstr "Tabla vođe projekta"
-
-#~ msgid "My tasks board"
-#~ msgstr "Moja tabla zadataka"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Moj vremenski raport"
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 6afadc70bd2..f41bf9ec9b5 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-10-30 08:48+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2011-10-16 23:02+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -25,13 +24,13 @@ msgstr "Tasques assignades"
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Torna a incloure la descripció de la tasca en la tasca de l'usuari."
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "La tasca '%s' ha estat delegada a %s."
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -49,19 +48,21 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La companyia seleccionada no està en les companyies permeses per aquest "
+"usuari"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Poseu aquí les hores que queden per tancar la tasca."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Terminis"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operació no permesa!"
@@ -70,7 +71,7 @@ msgstr "Operació no permesa!"
 #: code:addons/project/wizard/project_task_delegate.py:67
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "COMPROVA: %s"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:55
@@ -85,7 +86,7 @@ msgstr "COMPROVA: "
 #. module: project
 #: field:project.installer,project_issue:0
 msgid "Issues Tracker"
-msgstr ""
+msgstr "Seguiment d'incidències"
 
 #. module: project
 #: field:project.installer,hr_timesheet_sheet:0
@@ -121,17 +122,19 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Indica l'ordre de seqüència quan es mostra una llista de projectes."
 
 #. module: project
 #: 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
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Re-avaluació de la tasca"
 
 #. module: project
 #: field:project.project,members:0
@@ -146,7 +149,7 @@ msgstr "Tasca per delegació"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: project
 #: view:project.task:0
@@ -175,7 +178,7 @@ msgstr "Les meves tasques"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project
 #: field:project.task,company_id:0
@@ -188,22 +191,22 @@ msgstr "Companyia"
 #. module: project
 #: field:project.installer,project_scrum:0
 msgid "SCRUM"
-msgstr ""
+msgstr "SCRUM"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
 msgid "Projects: Planned Vs Total hours"
-msgstr ""
+msgstr "Projectes: Hores planficadas - totals"
 
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "Missatge d'avís"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nom de la fase"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -214,12 +217,12 @@ msgstr "Canvia a pendent"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dies per obrir"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Canvia etapa"
 
 #. module: project
 #: view:project.project:0
@@ -229,7 +232,7 @@ msgstr "Nou projecte basat en plantilla"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -240,25 +243,25 @@ msgstr "Molt urgent"
 #. module: project
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Usuari al que vol delegar aquesta tasca."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "La tasca '%s' està realitzada"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_close
 msgid "Project Close Task"
-msgstr ""
+msgstr "Tasca de tancament de projecte"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -275,7 +278,7 @@ msgstr "Tasca"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Socis"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -289,7 +292,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Treball tasca projecte"
 
 #. module: project
 #: view:project.project:0
@@ -301,22 +304,22 @@ msgstr "Notes"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Projecte - Hores restants"
 
 #. module: project
 #: view:project.project:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Adreça de factura"
 
 #. module: project
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Resum de la tasca"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "No és una plantilla de tasca"
 
 #. module: project
 #: view:project.task:0
@@ -329,6 +332,8 @@ msgid ""
 "Helps generate invoices based on time spent on tasks, if activated on the "
 "project."
 msgstr ""
+"Ajuda a generar factures basades en el temps utilitzat en les tasques, si "
+"s'ha activat en el projecte."
 
 #. module: project
 #: view:project.project:0
@@ -361,7 +366,7 @@ msgstr "Capçalera correu"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Configureu la seva aplicació de gestió de projectes"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -371,7 +376,7 @@ msgstr "Tasca realitzada"
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Títol per la seva tasca de validació."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -388,12 +393,12 @@ msgstr "Tasca és completada"
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -405,7 +410,7 @@ msgstr "Delega tasques a altre usuari"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -425,17 +430,17 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuaris"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "En proves"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Temps previst perquè l'usuari delegat tanqui aquesta tasca."
 
 #. module: project
 #: view:project.project:0
@@ -443,7 +448,7 @@ msgid "Reactivate Project"
 msgstr "Reactiva projecte"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tasca '%s' tancada"
@@ -476,7 +481,7 @@ msgstr "Data límit"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -490,51 +495,53 @@ msgstr "Empresa"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! No podeu crear comptes analítics recursius."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (còpia)"
 
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Controla i ajuda als treballadors a codificar i validar els seus horaris i "
+"assistències."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "Nº de tasques"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Previ"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Re-avaluar tasca"
 
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Assignat a"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Data parada: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "No podeu tenir dos usuaris amb el mateix identificador!"
 
 #. module: project
 #: view:project.project:0
@@ -549,7 +556,7 @@ msgstr "Plantilla"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "Especificació"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -559,12 +566,12 @@ msgstr "Els meus projectes"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No es pot crear companyies recursives."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Següent"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -575,7 +582,7 @@ msgstr "Des de estat esborrany, es converteix en estat obert."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "Nº de dies"
 
 #. module: project
 #: help:project.task,active:0
@@ -584,6 +591,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Aquest camp es calcula automàticament i té el mateix comportament que el "
+"camp booleà 'actiu': Si la tasca està vinculada a una plantilla o a un "
+"projecte no activat, s'ocultaran tret que es pregunti específicament."
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -605,7 +615,7 @@ msgstr "Tasca del projecte"
 #. module: project
 #: view:project.installer:0
 msgid "Methodologies"
-msgstr ""
+msgstr "Metodologies"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -615,7 +625,7 @@ msgstr "Calculat com: Temps dedicat + Temps restant."
 #. module: project
 #: help:project.task.close,partner_email:0
 msgid "Email Address of Customer"
-msgstr ""
+msgstr "Adreça de correu electrònic del client."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -626,23 +636,23 @@ msgstr "Hores reals"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Títol de la tasca de validació"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Re-avalua"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Envia email després de tancar la tasca"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Retard sobrepassat"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -680,12 +690,12 @@ msgstr "Temps estimat"
 #: code:addons/project/wizard/project_task_close.py:86
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Tasca '%s' tancada"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "No hi ha tasques assignades als usuaris"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -693,6 +703,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma de les hores planificades de totes les tasques relacionades amb aquest "
+"projecte i els seus projectes fills."
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -712,7 +724,7 @@ msgstr "Informació extra"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -727,7 +739,7 @@ msgid "Starting Date"
 msgstr "Data d'inici"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -741,7 +753,7 @@ msgstr "Projectes"
 #: 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
@@ -750,12 +762,16 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"Definiu els passos que s'utilitzaran en el projecte des de la creació de la "
+"tasca, fins al tancament de la tasca o incidència. Utilitzarà aquestes fases "
+"amb la finalitat de seguir el progrés en la solució d'una tasca o una "
+"incidència."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "La tasca '%s' està oberta."
 
 #. module: project
 #: view:project.task:0
@@ -765,12 +781,12 @@ msgstr "Dates"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Nou títol de la tasca delegada a l'usuari."
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: project
 #: view:project.installer:0
@@ -778,11 +794,13 @@ msgid ""
 "Various OpenERP applications are available to manage your projects with "
 "different level of control and flexibility."
 msgstr ""
+"Estan disponibles diverses aplicacions d'OpenERP per gestionar els seus "
+"projectes amb diversos nivells de control i flexibilitat."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projecte - Hores planificades i totals"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -804,7 +822,7 @@ msgstr "Retard hores"
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Anàlisi de tasques"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -820,7 +838,7 @@ msgstr "Delega"
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Plantilles de projectes"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -840,7 +858,7 @@ msgstr "Projecte"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Evalua"
 
 #. module: project
 #: view:board.board:0
@@ -851,7 +869,7 @@ msgstr "El meu taulell"
 #: code:addons/project/wizard/project_task_close.py:79
 #, python-format
 msgid "Please specify the email address of Project Manager."
-msgstr ""
+msgstr "Indiqueu l'adreça de correu electrònic del responsable del projecte."
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -862,13 +880,13 @@ msgstr "Projectes"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Delega tasca de projecte"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -885,12 +903,12 @@ msgstr "Tasques"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Parent"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Delega tasca"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -904,21 +922,30 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"Una tasca representa un treball que ha de realitzar-se. Cada usuari treballa "
+"en la seva pròpia llista de tasques, on pot registrar el seu treball de la "
+"tasca en hores. Pot treballar i tancar la tasca ell mateix o delegar-la a un "
+"altre usuari. Si delega una tasca a un altre usuari, obté una nova tasca en "
+"estat pendent, que es tornarà a obrir quan hagi de revisar el treball "
+"realitzat. Si instal·leu el mòdul project_timesheet, el treball de les "
+"tasques pot facturar-se sobre la base de la configuració del projecte. Amb "
+"el mòdul project_mrp, les comandes de venda poden crear tasques "
+"automàticament quan es confirmen."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: project
 #: field:project.task,progress:0
@@ -934,6 +961,11 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Si la tasca s'ha creat, l'estat és 'Esborrany'.\n"
+" Si la tasca s'inicia, l'estat es converteix 'En progrés'.\n"
+" Si és necessària una revisió, la tasca està en estat 'Pendent'.             "
+"                     \n"
+" Si la tasca està acabada, l'estat canvia a 'Realitzada'."
 
 #. module: project
 #: help:project.task,progress:0
@@ -955,7 +987,7 @@ msgstr "Tasques de projecte"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Fase de la Tasca"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -979,19 +1011,19 @@ msgstr "Estat: %(state)s"
 #. module: project
 #: field:project.installer,project_long_term:0
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Planificació llarg termini"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Tasques pare"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -1001,12 +1033,12 @@ msgstr "Avisa empresa"
 #. module: project
 #: view:report.project.task.user:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Any  "
 
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: project
 #: view:project.task:0
@@ -1016,13 +1048,13 @@ msgstr "Informació"
 #. module: project
 #: help:project.installer,account_budget:0
 msgid "Helps accountants manage analytic and crossover budgets."
-msgstr ""
+msgstr "Ajuda als comptables a gestionar pressupostos analítics i creuats."
 
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritat"
 
 #. module: project
 #: view:project.project:0
@@ -1032,17 +1064,17 @@ msgstr "Administració"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "projecte.tasca.reavaluar"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "La meva tasca"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Membre"
 
 #. module: project
 #: view:project.task:0
@@ -1052,7 +1084,7 @@ msgstr "Tasques de projecte"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursius."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1074,7 +1106,7 @@ msgstr "Baixa"
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Rendiment"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1102,18 +1134,18 @@ msgstr "Pendent"
 #. module: project
 #: view:project.task:0
 msgid "Task Edition"
-msgstr ""
+msgstr "Edició de tasca"
 
 #. module: project
 #: 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 "Fases"
 
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: project
 #: view:project.project:0
@@ -1127,11 +1159,13 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Nou estat de la seva pròpia tasca. S'obrirà automàticament en estat "
+"'Pendent' quan la tasca delegada es tanqui."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: project
 #: help:project.installer,project_scrum:0
@@ -1139,12 +1173,14 @@ msgid ""
 "Implements and tracks the concepts and task types defined in the SCRUM "
 "methodology."
 msgstr ""
+"Implementa i segueix els conceptes i tipus de tasques definits en la "
+"metodologia SCRUM."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dies per al tancament"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
@@ -1154,7 +1190,6 @@ msgstr "Taulell de projectes"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Projecte pare"
 
@@ -1171,23 +1206,23 @@ msgstr "Defineix els requeriments i fixa les hores previstes."
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: project
 #: field:project.task.close,partner_email:0
 msgid "Customer Email"
-msgstr ""
+msgstr "Correu electrònic del client"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "El projecte '%s' ha estat tancat."
 
 #. module: project
 #: view:project.task:0
@@ -1197,12 +1232,12 @@ msgstr "Edició de tasca"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: project
 #: help:project.task.close,manager_warn:0
 msgid "Warn Manager by Email"
-msgstr ""
+msgstr "Avisa al responsable per correu electrònic"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1212,7 +1247,7 @@ msgstr "Obre tasca"
 #. module: project
 #: field:project.task.close,manager_email:0
 msgid "Manager Email"
-msgstr ""
+msgstr "Correu electrònic del administrador"
 
 #. module: project
 #: help:project.project,active:0
@@ -1220,11 +1255,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el projecte sense eliminar-ho."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1232,10 +1268,10 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Quan es completa una tasca, canvia a l'estat Realitzada."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "El projecte '%s' ha estat obert."
 
 #. module: project
 #: field:project.task.work,date:0
@@ -1245,7 +1281,7 @@ msgstr "Data"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Taullell"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -1253,6 +1289,8 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"Error! La moneda ha de ser la mateixa que la moneda de la companyia "
+"seleccionada."
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:79
@@ -1271,12 +1309,12 @@ msgstr "Projectes d'usuari"
 #. module: project
 #: field:project.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delega"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:91
@@ -1289,7 +1327,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Número de dies per obrir la tasca."
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1299,7 +1337,7 @@ msgstr "Delegat a"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1314,7 +1352,7 @@ msgstr "Tasca delegada"
 #. module: project
 #: field:project.installer,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Aconsegueix les coses acabades (GTD)"
 
 #. module: project
 #: help:project.project,members:0
@@ -1322,11 +1360,14 @@ msgid ""
 "Project's member. Not used in any computation, just for information purpose, "
 "but a user has to be member of a project to add a the to this project."
 msgstr ""
+"Membre del projecte. No s'utilitza en cap càlcul, només amb finalitat "
+"informativa, però un usuari ha de ser membre d'un projecte per afegir-lo al "
+"projecte."
 
 #. module: project
 #: help:project.task.close,partner_warn:0
 msgid "Warn Customer by Email"
-msgstr ""
+msgstr "Avisa al client per correu electrònic."
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -1338,6 +1379,13 @@ msgid ""
 "    * Members list of project\n"
 "    "
 msgstr ""
+"El mòdul de gestió de projectes administra projectes multi-nivell, tasques,\n"
+"treballs realitzat en les tasques, ... És capaç de fer la planificació, "
+"ordenar les tasques, ...\n"
+" El taulell pels membres de projectes que inclou:\n"
+"    * Llista de les meves tasques obertes\n"
+"    * Llista dels membres del projecte\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
@@ -1369,9 +1417,13 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"Aquest informe li permet analitzar el rendiment dels seus projectes i "
+"usuaris. Podeu analitzar la quantitat de tasques, les hores invertides en "
+"comparació de les hores previstes, el número mitjà de dies per obrir o "
+"tancar una tasca, etc"
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tasca '%s' en progrés"
@@ -1415,7 +1467,7 @@ msgstr "Cancel·la"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1424,7 +1476,7 @@ msgid "Open"
 msgstr "Obert"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1448,7 +1500,7 @@ msgstr "En progrés"
 #: code:addons/project/wizard/project_task_close.py:82
 #, python-format
 msgid "Please specify the email address of Customer."
-msgstr ""
+msgstr "Introdueixi l'adreça de correu electrònic del client."
 
 #. module: project
 #: view:project.task:0
@@ -1459,22 +1511,22 @@ msgstr "Reactiva"
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr ""
+msgstr "Envia Email"
 
 #. module: project
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Activitat actual"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Cerca projecte"
 
 #. module: project
 #: help:project.installer,project_gtd:0
@@ -1482,18 +1534,21 @@ 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 és una metodologia per a organitzar-vos eficaçment vosaltres mateixos i "
+"les vostres tasques. Aquest mòdul integra completament el principio de GTD "
+"amb la gestió de projectes d'OpenERP."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projecte vs hores"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1510,7 +1565,7 @@ msgstr "Avisa responsable"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Data límit sobrepassada"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1518,6 +1573,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma de les hores utilitzades en totes les tasques relacionades amb aquest "
+"projecte i els seus projectes fills."
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1525,11 +1582,13 @@ msgid ""
 "Computed as difference of the time estimated by the project manager and the "
 "real time to close the task."
 msgstr ""
+"Calculat com la diferència del temps previst pel responsable del projecte i "
+"el temps real per tancar la tasca."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Re-avalua tasca"
 
 #. module: project
 #: help:project.installer,project_long_term:0
@@ -1537,21 +1596,23 @@ msgid ""
 "Enables long-term projects tracking, including multiple-phase projects and "
 "resource allocation handling."
 msgstr ""
+"Permet el seguiment de projectes a llarg termini, incloent projectes de "
+"múltiples fases i la gestió d'assignació de recursos."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Desenvolupament"
 
 #. module: project
 #: field:project.installer,project_timesheet:0
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Factura a partir de tasques"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Les meves hores restants del projecte"
 
 #. module: project
 #: field:project.task,description:0
@@ -1576,7 +1637,7 @@ msgstr "Urgent"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1586,14 +1647,14 @@ msgstr "Validació de tasca"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Tasques totals"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Les meves tasques delegades"
 
 #. module: project
 #: view:project.project:0
@@ -1604,7 +1665,7 @@ msgstr "Tasca: %(name)s"
 #: model:ir.actions.act_window,name:project.action_project_installer
 #: view:project.installer:0
 msgid "Project Application Configuration"
-msgstr ""
+msgstr "Configuració aplicació de projectes"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1625,7 +1686,7 @@ msgstr "Els meus comptes a facturar"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1647,34 +1708,36 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma del total d'hores de totes les tasques relacionades amb aquest projecte "
+"i els seus projectes fills."
 
 #. module: project
 #: help:project.task.close,manager_email:0
 msgid "Email Address of Project's Manager"
-msgstr ""
+msgstr "Adreça de correu electrònic del responsable del projecte"
 
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days
 #: view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Tasca per dies"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:111
@@ -1682,16 +1745,18 @@ msgstr ""
 msgid ""
 "Couldn't send mail! Check the email ids and smtp configuration settings"
 msgstr ""
+"No es pot enviar el correu! Comproveu els ids de l'email i els valors de "
+"configuració del smtp"
 
 #. module: project
 #: field:project.task.close,partner_warn:0
 msgid "Warn Customer"
-msgstr ""
+msgstr "Avisa client"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Editeu"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1702,27 +1767,27 @@ msgstr "Codifiqueu vostres hores de treball."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Número de dies per tancar la tasca."
 
 #. module: project
 #: view:board.board:0
 msgid "My Projects: Planned vs Total Hours"
-msgstr ""
+msgstr "Els meus projectes: Planificats - Hores totals"
 
 #. module: project
 #: model:ir.model,name:project.model_project_installer
 msgid "project.installer"
-msgstr ""
+msgstr "projecte.instal·lador"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1733,7 +1798,7 @@ msgstr "Hores dedicades"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Varis"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1748,13 +1813,13 @@ msgstr "Unitat de temp projecte"
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Hores dedicades"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "La tasca '%s' està pendent."
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1767,33 +1832,33 @@ msgstr "Total hores"
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Indica l'ordre de seqüència quan es mostra una llista de projectes."
 
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Usuaris"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Tasques sobrepassades"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr ""
+msgstr "Combina"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Hores restants per projecte"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1816,6 +1881,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Un projecte cté un conjunt de tasques o incidències que seran realitzades "
+"pels recursos assignats a ell. Un projecte pot estructurar-se "
+"jeràrquicament, com a fill d'un projecte pare. Això li permet dissenyar "
+"grans estructures de projecte amb diferents fases repartides en el cicle de "
+"vida del projecte. Cada usuari pot establir el seu projecte per defecte en "
+"les seves pròpies preferències per filtrar automàticament les tasques o "
+"incidències en les quals normalment treballa. Si opteu per facturar el temps "
+"utilitzat en una tasca del projecte, podeu trobar les tasques del projecte a "
+"facturar en la secció de facturació."
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1828,7 +1902,7 @@ msgid "Validation State"
 msgstr "Estat de validació"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tasca '%s' cancel·lada"
@@ -1844,27 +1918,29 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"El temps previst perquè pugui validar el treball realitzat per l'usuari a "
+"qui s'ha delegat aquesta tasca."
 
 #. module: project
 #: view:project.project:0
 msgid "Manager"
-msgstr ""
+msgstr "Director"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "La tasca '%s' està cancel·lada."
 
 #. module: project
 #: view:project.task.close:0
 msgid "_Send"
-msgstr ""
+msgstr "_Envia"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1874,18 +1950,18 @@ msgstr "Resum del treball"
 #. module: project
 #: view:project.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: project
 #: help:project.installer,project_issue:0
 msgid "Automatically synchronizes project tasks and crm cases."
-msgstr ""
+msgstr "Sincronitza automàticament tasques de projecte i casos CRM."
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,type_ids:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Fases de tasques"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1901,7 +1977,7 @@ msgstr "Peu correu"
 #. module: project
 #: field:project.installer,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Pressupostos"
 
 #, python-format
 #~ msgid ""
@@ -2215,102 +2291,3 @@ msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "Estat"
-
-#~ msgid "My project's planning"
-#~ msgstr "La meva planificació de projectes"
-
-#~ msgid "Board for project users"
-#~ msgstr "Taulell per a usuaris de projectes"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Encadenament de tasques"
-
-#~ msgid "My Planning"
-#~ msgstr "La meva planificació"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Taulell responsable de projectes"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Les meves dates límit"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Fulls de serveis d'usuari"
-
-#~ msgid "Project manager board"
-#~ msgstr "Taulell del responsable de projectes"
-
-#~ msgid "My tasks board"
-#~ msgstr "El meu taulell de tasques"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "El meu encadenament de tasques d'usuari"
-
-#~ msgid "My Timesheet"
-#~ msgstr "La meva agenda"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Tasques finalitzades per projecte (aquest mes)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Tasques tancades per projecte i usuari"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Tasques finalitzades per projecte i usuari (aquest mes)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Tasca tancada"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Tasques per Projecte"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestió de projectes"
-
-#~ msgid "User"
-#~ msgstr "Usuari"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Tasques per projecte i usuari"
-
-#~ msgid "This Month"
-#~ msgstr "Aquest mes"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Tasques per projectes i usuaris"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Mitjana retard de tancament"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Tasques per projecte"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Tasques tancades per projecte"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Tasques per usuari"
-
-#~ msgid "No Task"
-#~ msgstr "No hi ha tasca"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Informe de tasques per usuari per projectes"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Temps / Hores de tasques per mes"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Proporciona estadístiques de tasques per usuari en projectes per a comprovar "
-#~ "el treball encadenat dels usuaris."
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Tasques tancades en els últims 15 dies"
-
-#~ msgid "Task Hours"
-#~ msgstr "Hores de tasca"
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 6df41cca7e7..4648ea77aae 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-15 02:36+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\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: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index c47afad42e5..739be62dda6 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgstr ""
 "Entferne Beschreibung der Aufgabe in der Aufgabenliste des Benutzers."
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "Die Aufgabe '%s' wurde delegiert an %s."
@@ -63,7 +63,7 @@ msgid "Deadlines"
 msgstr "Meine Fristen"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Vorgang nicht erlaubt!"
@@ -252,7 +252,7 @@ msgid "Day"
 msgstr "Tag"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "Die Aufgabe '%s' ist erledigt"
@@ -449,7 +449,7 @@ msgid "Reactivate Project"
 msgstr "Reaktiviere Projekt"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Aufgabe '%s' beendet"
@@ -499,8 +499,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (Kopie)"
@@ -645,7 +645,7 @@ msgid "Reevaluate"
 msgstr "Neuberechnung"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Versende EMail nach Beendigung der Aufgabe"
@@ -740,7 +740,7 @@ msgid "Starting Date"
 msgstr "Start Datum:"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -770,7 +770,7 @@ msgstr ""
 "nachvollziehen."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "Die Aufgabe '%s' wurde gestartet"
@@ -1194,7 +1194,6 @@ msgstr "Pinnwand Projektmitarbeiter"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Hauptprojekt"
 
@@ -1224,7 +1223,7 @@ msgid "Customer Email"
 msgstr "EMail Kunde"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "Das Projekt '%s' wurde abgeschlossen."
@@ -1275,7 +1274,7 @@ msgstr ""
 "Bei Fertigstellung der Aufgabe wird der Status in \"Erledigt\" geändert."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "Das Projekt '%s' wurde geöffnet und damit in Berabeitung genommen."
@@ -1423,7 +1422,7 @@ msgstr ""
 "Durchschnittsanzahl an Tagen bzw. auch die Preise und Umsätze erkennen."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Aufgabe '%s' auf Bearbeitung gesetzt"
@@ -1475,7 +1474,7 @@ msgid "Open"
 msgstr "Offen"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1813,7 +1812,7 @@ msgid "Spent Hours"
 msgstr "Geleistete Stunden"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "Die Aufgabe '%s' ist im Wartezustand."
@@ -1824,7 +1823,7 @@ msgstr "Die Aufgabe '%s' ist im Wartezustand."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
 msgid "Total Hours"
-msgstr "Gesamte Stunden"
+msgstr "Gesamtstunden"
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1900,7 +1899,7 @@ msgid "Validation State"
 msgstr "Validierung Status"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Aufgabe '%s' ist storniert"
@@ -1930,7 +1929,7 @@ msgid "Create Date"
 msgstr "Erzeugt am"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "Die Aufgabe '%s' wurde abgebrochen."
@@ -2280,225 +2279,3 @@ msgstr "Budgets"
 
 #~ msgid "All Attachments"
 #~ msgstr "Alle Anhänge"
-
-#~ msgid "My project's planning"
-#~ msgstr "Meine geplanten Projekte"
-
-#~ msgid "Board for project users"
-#~ msgstr "Tafel für Projekt Mitarbeiter"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Aufgabenbestand"
-
-#~ msgid "My Planning"
-#~ msgstr "Meine Planung"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Projektmanager Dashboard"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Meine Deadlines"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Benutzer Zeiterfassung"
-
-#~ msgid "Project manager board"
-#~ msgstr "Dashboard Projektmanager"
-
-#~ msgid "My tasks board"
-#~ msgstr "Meine Aufgaben (Dashboard)"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Meine Benutzer"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Meine Zeiterfassung"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Aufgaben nach Projekten (dieser Monat)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Fertige Aufgaben nach Projekt und Benutzer"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Erl. Aufgaben nach Projekt und Benutzer (d. Monat)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Beendete Aufgaben"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Aufgaben nach Projekt"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Verkaufsverwaltung - Berichte"
-
-#~ msgid "User"
-#~ msgstr "Benutzer"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Aufgaben nach Projekt und Benutzer"
-
-#~ msgid "This Month"
-#~ msgstr "Dieser Monat"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Aufgaben nach Projekten und Benutzern"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Durch. Verzögerung"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Aufgaben nach Projekten"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Erl. Aufgaben nach Projekt"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Aufgaben je Benutzer"
-
-#~ msgid "No Task"
-#~ msgstr "Keine Aufgabe"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Report je Aufgabe und Benutzer je Projekt"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Arbeitszeitaufzeichnung / Stunden je Monat"
-
-#~ msgid "Reporting"
-#~ msgstr "Berichtswesen"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr "Statistik über offene Aufgaben (Pipeline) je Benutzer"
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Erledigte Aufgaben der letzten 15 Tage"
-
-#~ msgid "Task Hours"
-#~ msgstr "Aufgabe Stunden"
-
-#~ msgid "Task Number"
-#~ msgstr "Aufgaben Nummer"
-
-#~ msgid "report.timesheet.task.user"
-#~ msgstr "report.timesheet.task.user"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "Arbeitszeitaufzeichnung/Aufgaben Stunden je Monat"
-
-#~ msgid "Task Progress"
-#~ msgstr "Aufgaben-Fortschritt"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Abgeschlossene Aufgaben Bericht"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Arbeitszeitaufzeichnung Stunden"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Abgeschlossene Aufgaben"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the project "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Wenn dieses Feld aktiviert ist , kann ein Projekt ausgeblendet werden, ohne "
-#~ "dieses vollständig zu entfernen."
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr ""
-#~ "Definition der Reihenfolge von Aufgaben, bei der Anzeige von Aufgabenlisten."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Scheduling"
-#~ msgstr "Terminierung"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Define here the steps that will be used on the project from the creation of "
-#~ "the task, up to the closing of the task or issue. You will use these stages "
-#~ "in order to track the progress of the resolution of a task or an issue."
-#~ msgstr ""
-#~ "Definieren Sie hier die erforderlichen Arbeitsschritte eines Projektes von "
-#~ "der Erstellung einer Aufgabe bis zur Erledigung der Aufgabe oder "
-#~ "Problemlösung. Sie können durch diese Schritte den Bearbeitungsstand oder "
-#~ "den Fortschritt bei der Aufgabenerledigung oder Problemlösung jederzeit gut "
-#~ "nachvollziehen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "A task represents a work that has to be done. Each user works in his own "
-#~ "list of tasks where he can record his task work in hours. He can work and "
-#~ "close the task itself or delegate it to antoher user. If you delegate a task "
-#~ "to another user, you get a new task in pending state, which will be re-"
-#~ "opened when you have to review the work achieved. If you install the "
-#~ "project_timesheet module, tasks works can be invoiced based on the project "
-#~ "configuration. With the project_mrp module, sales orders can create tasks "
-#~ "automatically when they are confirmed."
-#~ msgstr ""
-#~ "Eine Aufgabe repräsentiert einen zu erledigenden Arbeit. Jeder Benutzer "
-#~ "verfügt über einen eigene Aufgabenliste, über die er seine erledigte Arbeit "
-#~ "aufzeichnen kann. Durch die Delegation einer Aufgabe an einen anderen "
-#~ "Benutzer, erhalten Sie eine neue Aufgabe mit Status 'In Wartezustand', die "
-#~ "zu Ihrer Kontrolle wiedereröffnet wird, wenn der andere Benutzer die "
-#~ "delegierte Aufgabe erledigt. Wenn Sie das Modul project_timesheet "
-#~ "installieren, können Sie erledigte Aufgaben in Projekten unmittelbar auf "
-#~ "Basis der Projektzeiterfassung abrechnen. Durch das project_mrp Modul, "
-#~ "können auch automatisch Aufgaben aus Verkaufsaufträgen generiert werden."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
-
-#~ msgid ""
-#~ "A project contains a set of tasks or issues that will be performed by your "
-#~ "resources assigned on it. A project can be put into a hierarchy, as a child "
-#~ "of a Parent Project. This allows you to  design large project structure with "
-#~ "different phases spread over the project duration cycle. Each user can set "
-#~ "his default project in his own preferences, in order to filter automatically "
-#~ "the tasks or issues he usually works on."
-#~ msgstr ""
-#~ "Ein Projekt besteht aus einzelnen Aufgaben oder Problemstellungen, die durch "
-#~ "zugewiesene Mitarbeiter bearbeitet werden sollen. Ein Projekt kann durch "
-#~ "eine hierachische Struktur ein Teilprojekt eines Hauptprojektes sein. Dieses "
-#~ "ermöglicht die Gestaltung komplexer Projektstrukturen mit verschiedenen "
-#~ "Projektphasen über die Gesamtdauer eines Projektdurchlaufs. Jeder Benutzer "
-#~ "kann ein Standard Projekt in seinen persönlichen Einstellungen hinterlegen, "
-#~ "um exakt die Aufgaben oder Probleme herauszufiltern, an denen der Benutzer "
-#~ "arbeiten soll."
-
-#~ msgid ""
-#~ "A project contains a set of tasks or issues that will be performed by your "
-#~ "assigned personnel. A project can be put into a hierarchy, as a child of a "
-#~ "Parent Project. This allows you to design large project structure with "
-#~ "different phases spread over the project's duration cycle. Each user can set "
-#~ "his default project in his own preferences, in order to filter automatically "
-#~ "the tasks or issues he usually works on. If you have personalized your "
-#~ "Project application in order to invoice the time spent on a task, you can "
-#~ "choose to invoice or not one project in the billing section."
-#~ msgstr ""
-#~ "Ein Projekt besteht aus einer Reihe von Einzelaufgaben oder projektbezogenen "
-#~ "Problemstellungen, die durch Ihre Mitarbeiter zu bearbeiten sind. Ein "
-#~ "Projekt kann in eine bestehende multidimensionale Projekthierachie, z.B. als "
-#~ "Teilprojekt platziert werden. Jeder Anwender kann dabei sein eigenes Projekt "
-#~ "in seinen Benutzer Eigenschaften hinterlegen, wodurch für die Anzeige der zu "
-#~ "bearbeitenden Aufgaben ein automatischer Filter nur für dieses Projekt "
-#~ "angewendet wird. Wenn Sie Ihre Anwendung für Projekte so konfiguriert haben, "
-#~ "dass eine unmittelbare Weiterberechnung von erledigten Aufgaben möglich sein "
-#~ "soll, können Sie einstellen, ob für ein Projekt die Abrechnungsfunktion "
-#~ "angewendet werden soll oder nicht."
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 2178aaace46..5e9c0753d8c 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -30,7 +30,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -63,7 +63,7 @@ msgid "Deadlines"
 msgstr "Προθεσμίες"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Μη Επιτρεπτή Λειτουργία!"
@@ -254,7 +254,7 @@ msgid "Day"
 msgstr "Ημέρα"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -444,7 +444,7 @@ msgid "Reactivate Project"
 msgstr "Επανενεργοποίηση Έργου"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -494,8 +494,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -634,7 +634,7 @@ msgid "Reevaluate"
 msgstr "Επαναξιολόγηση"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -727,7 +727,7 @@ msgid "Starting Date"
 msgstr "Ημερ/νία Εκκίνησης"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -752,7 +752,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1154,7 +1154,6 @@ msgstr "Πίνακας Έργων"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Μητρικό Έργο"
 
@@ -1184,7 +1183,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1233,7 +1232,7 @@ msgstr ""
 "Όταν η Εργασία ολοκληρωθεί, η κατάστασή της θα μεταβληθεί σε 'Ολοκληρώθηκε'."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1371,7 +1370,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1423,7 +1422,7 @@ msgid "Open"
 msgstr "Άνοιγμα"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1751,7 +1750,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Validation State"
 msgstr "Στάδιο Επικύρωσης"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1856,7 +1855,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -2199,43 +2198,3 @@ msgstr ""
 
 #~ msgid "Running projects"
 #~ msgstr "Έργα σε εξέλιξη"
-
-#~ msgid "My project's planning"
-#~ msgstr "Σχεδιασμός Έργων μου"
-
-#~ msgid "Board for project users"
-#~ msgstr "Πίνακας Χρηστών Έργου"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Κανάλι Αναθέσεων"
-
-#~ msgid "My Planning"
-#~ msgstr "Ο Σχεδιασμός μου"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Πίνακας Αναφορών Διευθυντή Έργου"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Οι Προθεσμίες μου"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Φύλλα χρόνου χρηστών"
-
-#~ msgid "Project manager board"
-#~ msgstr "Πίνακας διευθυντή έργου"
-
-#~ msgid "My tasks board"
-#~ msgstr "Ο πίνακας αναθέσεών μου"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Το κανάλι μου"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Το Φύλλο Χρόνου μου"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the project "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Εάν το πεδίο είναι ενεργό, θα επειτραπεί να γίνει το έργο κρυφό χωρίς να "
-#~ "διαγραφεί."
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 6ae425919cd..3cd989e1ca1 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-16 18:25+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-10-16 23:01+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario."
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "La tarea '%s' ha sido delegada a %s."
@@ -63,7 +62,7 @@ msgid "Deadlines"
 msgstr "Fechas límite"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "¡Operación no permitida!"
@@ -72,7 +71,7 @@ msgstr "¡Operación no permitida!"
 #: code:addons/project/wizard/project_task_delegate.py:67
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CONSULTAR: %s"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:55
@@ -255,7 +254,7 @@ msgid "Day"
 msgstr "Día"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "La tarea '%s' está realizada"
@@ -450,7 +449,7 @@ msgid "Reactivate Project"
 msgstr "Reactivar proyecto"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tarea '%s' cerrada"
@@ -500,8 +499,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -643,7 +642,7 @@ msgid "Reevaluate"
 msgstr "Re-evaluar"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Enviar email después de cerrar la tarea"
@@ -738,7 +737,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -766,7 +765,7 @@ msgstr ""
 "fin de seguir el progreso en la solución de una tarea o una incidencia."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "La tarea '%s' está abierta."
@@ -1188,7 +1187,6 @@ msgstr "Tablero de proyectos"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Proyecto padre"
 
@@ -1218,7 +1216,7 @@ msgid "Customer Email"
 msgstr "Email cliente"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "El proyecto '%s' ha sido cerrado."
@@ -1267,7 +1265,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Cuando se completa una tarea, cambia al estado Realizada."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "El proyecto '%s' ha sido abierto."
@@ -1421,7 +1419,7 @@ msgstr ""
 "tarea, etc"
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tarea '%s' en progreso"
@@ -1474,7 +1472,7 @@ msgid "Open"
 msgstr "Abierto"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1814,7 +1812,7 @@ msgid "Spent Hours"
 msgstr "Horas consumidas"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "La tarea '%s' está pendiente."
@@ -1901,7 +1899,7 @@ msgid "Validation State"
 msgstr "Estado de validación"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tarea '%s' cancelada"
@@ -1931,7 +1929,7 @@ msgid "Create Date"
 msgstr "Fecha creación"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "La tarea '%s' está cancelada."
@@ -2290,210 +2288,3 @@ msgstr "Presupuestos"
 
 #~ msgid "Tasks in Progress"
 #~ msgstr "Tareas en progreso"
-
-#~ msgid "My project's planning"
-#~ msgstr "Mi planificación de proyectos"
-
-#~ msgid "Board for project users"
-#~ msgstr "Tablero para usuarios de proyectos"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Encadenamiento de tareas"
-
-#~ msgid "My Planning"
-#~ msgstr "Mi planificación"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Tablero responsable de proyectos"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Mis fechas límite"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Hojas de servicios de usuario"
-
-#~ msgid "Project manager board"
-#~ msgstr "Tablero del responsable de proyectos"
-
-#~ msgid "My tasks board"
-#~ msgstr "Mi tablero de tareas"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Mi encadenamiento de tareas de usuario"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Mi agenda"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Tareas finalizadas por proyecto (este mes)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Tareas cerradas por proyecto y usuario"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Tareas finalizadas por proyecto y usuario (este mes)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Tarea cerrada"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Tareas por Proyecto"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestión de proyectos"
-
-#~ msgid "User"
-#~ msgstr "Usuario"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Tareas por proyecto y usuario"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Tareas por proyectos y usuarios"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Promedio demora de cierre"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Tareas por proyecto"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Tareas cerradas por proyecto"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Tareas por usuario"
-
-#~ msgid "No Task"
-#~ msgstr "No hay tarea"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Informe de tareas por usuario para proyectos"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Tiempo / Horas de tareas por mes"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Proporciona estadísticas de tareas por usuario en proyectos para comprobar "
-#~ "el trabajo encadenado de los usuarios."
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Tareas cerradas en los últimos 15 días"
-
-#~ msgid "Task Hours"
-#~ msgstr "Horas de tarea"
-
-#~ msgid "Task Number"
-#~ msgstr "Número de tarea"
-
-#~ msgid "Task Progress"
-#~ msgstr "Progreso de la tarea"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Tareas cerradas"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the project "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el proyecto sin eliminarlo."
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr "Indica el orden de secuencia cuando se muestra una lista de tareas."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Scheduling"
-#~ msgstr "Planificación"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "A task represents a work that has to be done. Each user works in his own "
-#~ "list of tasks where he can record his task work in hours. He can work and "
-#~ "close the task itself or delegate it to antoher user. If you delegate a task "
-#~ "to another user, you get a new task in pending state, which will be re-"
-#~ "opened when you have to review the work achieved. If you install the "
-#~ "project_timesheet module, tasks works can be invoiced based on the project "
-#~ "configuration. With the project_mrp module, sales orders can create tasks "
-#~ "automatically when they are confirmed."
-#~ msgstr ""
-#~ "Una tarea representa un trabajo que tiene que hacer. Cada usuario trabaja en "
-#~ "su propia lista de tareas donde se puede grabar su trabajo en horas de "
-#~ "trabajo. Se puede trabajar y cerrar la tarea en sí o delegar a otro usuario. "
-#~ "Si delega una tarea a otro usuario, se obtiene una nueva tarea en estado "
-#~ "esperando, que se volverá a abrir cuando se tiene que revisar el trabajo "
-#~ "realizado. Si instala el módulo project_timesheet, las tareas pueden ser "
-#~ "facturadas según la configuración del proyecto. Con el módulo project_mrp, "
-#~ "mediante los pedidos de venta podrás crear tareas automatizadas cuando esten "
-#~ "los pedidos confirmados."
-
-#~ msgid ""
-#~ "A project contains a set of tasks or issues that will be performed by your "
-#~ "resources assigned on it. A project can be put into a hierarchy, as a child "
-#~ "of a Parent Project. This allows you to  design large project structure with "
-#~ "different phases spread over the project duration cycle. Each user can set "
-#~ "his default project in his own preferences, in order to filter automatically "
-#~ "the tasks or issues he usually works on."
-#~ msgstr ""
-#~ "Un proyecto contiene un conjunto de tareas o cuestiones que se llevará a "
-#~ "cabo por los recursos asignados en él. Un proyecto puede ser puesto en una "
-#~ "jerarquía, como un hijo del padre del proyecto. Esto le permite diseñar la "
-#~ "estructura del proyecto grande con las diferentes fases repartidas en el "
-#~ "ciclo de duración del proyecto. Cada usuario puede configurar su proyecto de "
-#~ "forma predeterminada en sus propias preferencias, con el fin de filtrar de "
-#~ "forma automática las tareas o temas que normalmente trabaja."
-
-#~ msgid ""
-#~ "Define here the steps that will be used on the project from the creation of "
-#~ "the task, up to the closing of the task or issue. You will use these stages "
-#~ "in order to track the progress of the resolution of a task or an issue."
-#~ msgstr ""
-#~ "Defina aquí los pasos que se utilizarán en el proyecto de la creación de la "
-#~ "tarea, hasta el cierre de la tarea o problema. Podrá utilizar estas etapas "
-#~ "con el fin de seguir el progreso de la resolución de una tarea o un problema."
-
-#~ msgid ""
-#~ "A project contains a set of tasks or issues that will be performed by your "
-#~ "assigned personnel. A project can be put into a hierarchy, as a child of a "
-#~ "Parent Project. This allows you to design large project structure with "
-#~ "different phases spread over the project's duration cycle. Each user can set "
-#~ "his default project in his own preferences, in order to filter automatically "
-#~ "the tasks or issues he usually works on. If you have personalized your "
-#~ "Project application in order to invoice the time spent on a task, you can "
-#~ "choose to invoice or not one project in the billing section."
-#~ msgstr ""
-#~ "Un proyecto contiene un conjunto de tareas o actividades que se llevarán a "
-#~ "cabo por el personal asignado. Un proyecto puede ser puesto en una "
-#~ "jerarquía, como un hijo de un proyecto padre. Esto le permite diseñar la "
-#~ "estructura de grandes proyectos con las distintas fases repartidas en el "
-#~ "ciclo de duración del proyecto. Cada usuario puede configurar su proyecto "
-#~ "por defecto en sus propias preferencias, con el fin de filtrar de forma "
-#~ "automática las tareas o actividades en las que normalmente trabaja. Si ha "
-#~ "personalizado la aplicación de proyectos con el fin de facturar el tiempo "
-#~ "dedicado a una tarea, puede elegir si facturar o no un proyecto en la "
-#~ "sección de facturación."
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index 59fb7b2015f..2fd1d382cc0 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -60,7 +60,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "¡Operación no permitida!"
@@ -249,7 +249,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -442,7 +442,7 @@ msgid "Reactivate Project"
 msgstr "Reactivar proyecto"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tarea '%s' cerrada"
@@ -492,8 +492,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -632,7 +632,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -725,7 +725,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -750,7 +750,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1152,7 +1152,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Proyecto padre"
 
@@ -1182,7 +1181,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1230,7 +1229,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Cuando se completa una tarea, se convierte en estado realizada."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1369,7 +1368,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tarea '%s' establecida en proceso"
@@ -1422,7 +1421,7 @@ msgid "Open"
 msgstr "Abierto"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1749,7 +1748,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1826,7 +1825,7 @@ msgid "Validation State"
 msgstr "Estado de validación"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tarea '%s' cancelada"
@@ -1854,7 +1853,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index 93a3eda54bc..6c53b21aa72 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Incluir la descripción de la tarea en la del usuario"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "La tarea '%s' has sido delegada a '%s'."
@@ -60,7 +60,7 @@ msgid "Deadlines"
 msgstr "Tiempos Límites"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "¡Operación no permitida!"
@@ -250,7 +250,7 @@ msgid "Day"
 msgstr "Día"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "La tarea '%s' esta terminada."
@@ -445,7 +445,7 @@ msgid "Reactivate Project"
 msgstr "Reactivar proyecto"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tarea '%s' cerrada"
@@ -495,8 +495,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Error! No puedes crear cuentas analiticas recursivas"
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -639,7 +639,7 @@ msgid "Reevaluate"
 msgstr "Reevaluar"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Enviar email despues de cerrar la tarea"
@@ -734,7 +734,7 @@ msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -762,7 +762,7 @@ msgstr ""
 "fin de seguir el progreso en la solución de una tarea o una incidencia."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "La tarea '%s' esta abierta."
@@ -1183,7 +1183,6 @@ msgstr "Tablero de proyectos"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Proyecto padre"
 
@@ -1213,7 +1212,7 @@ msgid "Customer Email"
 msgstr "E-mail de Cliente"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "El poryecto '%s' ha sido cerrado"
@@ -1262,7 +1261,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Cuando se completa una tarea, cambia al estado Realizada."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "El proyecto '%s' ha sido abierto."
@@ -1416,7 +1415,7 @@ msgstr ""
 "tarea, etc"
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tarea '%s' en progreso"
@@ -1469,7 +1468,7 @@ msgid "Open"
 msgstr "Abierto"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1807,7 +1806,7 @@ msgid "Spent Hours"
 msgstr "Horas consumidas"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "La tarea '%s' esta pendiente"
@@ -1893,7 +1892,7 @@ msgid "Validation State"
 msgstr "Estado de validación"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tarea '%s' cancelada"
@@ -1923,7 +1922,7 @@ msgid "Create Date"
 msgstr "Fecha de Creación"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "La tarea '%s' esta cancelada"
@@ -2274,128 +2273,3 @@ msgstr "Presupuestos"
 
 #~ msgid "Partner Info"
 #~ msgstr "Información de empresa"
-
-#~ msgid "My project's planning"
-#~ msgstr "Mi planificación de proyectos"
-
-#~ msgid "Board for project users"
-#~ msgstr "Tablero para usuarios de proyectos"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Encadenamiento de tareas"
-
-#~ msgid "My Planning"
-#~ msgstr "Mi planificación"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Tablero responsable de proyectos"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Mis fechas límite"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Hojas de servicios de usuario"
-
-#~ msgid "Project manager board"
-#~ msgstr "Tablero del responsable de proyectos"
-
-#~ msgid "My tasks board"
-#~ msgstr "Mi tablero de tareas"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Mi encadenamiento de tareas de usuario"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Mi agenda"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Tareas finalizadas por proyecto (este mes)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Tareas cerradas por proyecto y usuario"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Tareas finalizadas por proyecto y usuario (este mes)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Tarea cerrada"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Tareas por Proyecto"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestión de proyectos"
-
-#~ msgid "User"
-#~ msgstr "Usuario"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Tareas por proyecto y usuario"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Tareas por proyectos y usuarios"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Promedio demora de cierre"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Tareas por proyecto"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Tareas cerradas por proyecto"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Tareas por usuario"
-
-#~ msgid "No Task"
-#~ msgstr "No hay tarea"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Informe de tareas por usuario para proyectos"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Tiempo / Horas de tareas por mes"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Proporciona estadísticas de tareas por usuario en proyectos para comprobar "
-#~ "el trabajo encadenado de los usuarios."
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Tareas cerradas en los últimos 15 días"
-
-#~ msgid "Task Hours"
-#~ msgstr "Horas de tarea"
-
-#~ msgid "Task Number"
-#~ msgstr "Número de tarea"
-
-#~ msgid "Task Progress"
-#~ msgstr "Progreso de la tarea"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Tareas cerradas"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the project "
-#~ "without removing it."
-#~ msgstr "Si es activado, permitira esconder el proyecto sin borrarlo."
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr "Da una secuencia ordenada cuando muestra unaa lista de tareas"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! No puede crear menus recursivos"
-
-#~ msgid "Scheduling"
-#~ msgstr "Calendario"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reglas no son soportadas para datos que solo estan en memoria"
diff --git a/addons/project/i18n/es_MX.po b/addons/project/i18n/es_MX.po
new file mode 100644
index 00000000000..22b2e410bcb
--- /dev/null
+++ b/addons/project/i18n/es_MX.po
@@ -0,0 +1,2291 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* 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: 2011-01-16 18:25+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 04:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned tasks"
+msgstr "Tareas asignadas"
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario."
+
+#. module: project
+#: code:addons/project/project.py:671
+#, python-format
+msgid "The task '%s' has been delegated to %s."
+msgstr "La tarea '%s' ha sido delegada a %s."
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+"Permite fijar la unidad de medida utilizada en proyectos y tareas.\n"
+"Si utiliza las hojas de horarios relacionadas con proyectos (módulo "
+"project_timesheet), no olvide configurar la unidad de medida correcta en sus "
+"empleados."
+
+#. module: project
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr "Introduzca aquí las horas restantes requeridas para cerrar la tarea."
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr "Fechas límite"
+
+#. module: project
+#: code:addons/project/project.py:118
+#, python-format
+msgid "Operation Not Permitted !"
+msgstr "¡Operación no permitida!"
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:67
+#, python-format
+msgid "CHECK: %s"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:55
+#: code:addons/project/wizard/project_task_delegate.py:56
+#: code:addons/project/wizard/project_task_delegate.py:63
+#: code:addons/project/wizard/project_task_delegate.py:64
+#: code:addons/project/wizard/project_task_delegate.py:67
+#, python-format
+msgid "CHECK: "
+msgstr "Validar "
+
+#. module: project
+#: field:project.installer,project_issue:0
+msgid "Issues Tracker"
+msgstr "Seguimiento de problemas"
+
+#. module: project
+#: field:project.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegations"
+msgstr "Delegaciones"
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr "Horas a validar"
+
+#. module: project
+#: field:project.project,progress_rate:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Total tiempo restante, puede ser reestimado periódicamente por quien se le "
+"ha asignado la tarea."
+
+#. module: project
+#: help:project.project,priority:0
+msgid "Gives the sequence order when displaying the list of projects"
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de proyectos."
+
+#. module: project
+#: 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
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr "Tarea re-evaluación"
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr "Miembros del proyecto"
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr "Tarea por delegación"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr "Tareas delegadas"
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tareas delegadas"
+
+#. module: project
+#: help:project.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Cabecera añadida al principio del correo electrónico del mensaje de aviso "
+"enviado al cliente cuando una tarea se cierra."
+
+#. module: project
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Mis tareas"
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project
+#: field:project.task,company_id:0
+#: field:project.task.work,company_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: project
+#: field:project.installer,project_scrum:0
+msgid "SCRUM"
+msgstr "SCRUM"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
+msgid "Projects: Planned Vs Total hours"
+msgstr "Proyectos: Horas planficadas - totales"
+
+#. module: project
+#: view:project.task.close:0
+msgid "Warn Message"
+msgstr "Mensaje de aviso"
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr "Nombre etapa"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr "Cambiar a pendiente"
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: project
+#: view:project.task:0
+msgid "Change Stage"
+msgstr "Cambiar etapa"
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr "Nuevo proyecto basado en plantilla"
+
+#. module: project
+#: 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
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr "Muy urgente"
+
+#. module: project
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr "Usuario al que quiere delegar esta tarea."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,day:0
+#: field:task.by.days,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: project
+#: code:addons/project/project.py:584
+#, python-format
+msgid "The task '%s' is done"
+msgstr "La tarea '%s' está realizada"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_close
+msgid "Project Close Task"
+msgstr "Tarea cierre proyecto"
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr "Tarea borrador"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: field:project.task.work,task_id:0
+#: view:report.project.task.user:0
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project
+#: view:project.project:0
+msgid "Members"
+msgstr "Miembros"
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Tiempo estimado para realizar la tarea, normalmente fijado por el "
+"responsable del proyecto cuando la tarea está en estado borrador."
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr "Trabajo tarea proyecto"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs remaining hours"
+msgstr "Proyecto - Horas restantes"
+
+#. module: project
+#: view:project.project:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: project
+#: field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr "Resumen tarea"
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr "No es una plantilla de tarea"
+
+#. module: project
+#: view:project.task:0
+msgid "Start Task"
+msgstr "Iniciar tarea"
+
+#. module: project
+#: help:project.installer,project_timesheet:0
+msgid ""
+"Helps generate invoices based on time spent on tasks, if activated on the "
+"project."
+msgstr ""
+"Ayuda a generar facturas basado en el tiempo empleado en las tareas, si se "
+"ha activado en el proyecto."
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Automatic variables for headers and footer. Use exactly the same notation."
+msgstr ""
+"Variables automáticas para cabeceras y pie. Utilizar exactamente la misma "
+"notación."
+
+#. module: project
+#: selection:project.task,state:0
+#: selection:project.vs.hours,state:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mis tareas abiertas"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_header:0
+msgid "Mail Header"
+msgstr "Cabecera correo"
+
+#. module: project
+#: view:project.installer:0
+msgid "Configure Your Project Management Application"
+msgstr "Configure su aplicación de gestión de proyectos"
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr "Tarea realizada"
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr "Título para su tarea de validación."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Promedio Plan.-Real"
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr "Tarea es completada"
+
+#. module: project
+#: field:project.task,date_end:0
+#: field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr "Delega tareas a otro usuario"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Calculado usando la suma de las tareas realizadas."
+
+#. module: project
+#: help:project.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Si marca esto, al usuario le aparecerá una ventana emergente cuando cierre "
+"una tarea que propondrá un mensaje para ser enviado por correo electrónico "
+"al cliente."
+
+#. module: project
+#: model:ir.model,name:project.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr "Testeo"
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr "Tiempo estimado para que el usuario delegado cierre esta tarea."
+
+#. module: project
+#: view:project.project:0
+msgid "Reactivate Project"
+msgstr "Reactivar proyecto"
+
+#. module: project
+#: code:addons/project/project.py:562
+#, python-format
+msgid "Task '%s' closed"
+msgstr "Tarea '%s' cerrada"
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+#: field:project.project,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr "Realizado por"
+
+#. module: project
+#: view:project.task:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project
+#: view:project.task.close:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner
+#: view:project.project:0
+#: field:project.task,partner_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: project
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: project
+#: help:project.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr "Ayuda a los empleados codificar y validar horarios y asistencias."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,nbr:0
+msgid "# of tasks"
+msgstr "Nº de tareas"
+
+#. module: project
+#: view:project.task:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluate Task"
+msgstr "Re-evaluar tarea"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr "Asignado a"
+
+#. module: project
+#: view:project.project:0
+msgid "Date Stop: %(date)s"
+msgstr "Fecha parada: %(date)s"
+
+#. module: project
+#: 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 de usuario!"
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr "Restaurar como proyecto"
+
+#. module: project
+#: selection:project.vs.hours,state:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Specification"
+msgstr "Especificación"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_project
+msgid "My projects"
+msgstr "Mis proyectos"
+
+#. module: project
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: project
+#: view:project.task:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr "Desde estado borrador, se convierte en estado abierto."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr "Nº de días"
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+"Este campo se calcula automáticamente y tiene el mismo comportamiento que el "
+"campo booleano 'activo': Si la tarea está vinculada a una plantilla o a un "
+"proyecto no activado, se ocultarán a menos que se pregunte específicamente."
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "Porcentaje de tareas cerradas según el total de tareas a realizar."
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr "Nueva descripción de tarea"
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr "Tarea del proyecto"
+
+#. module: project
+#: view:project.installer:0
+msgid "Methodologies"
+msgstr "Metodologías"
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
+
+#. module: project
+#: help:project.task.close,partner_email:0
+msgid "Email Address of Customer"
+msgstr "Dirección de correo electrónico del cliente."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Horas reales"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr "Título tarea de validación"
+
+#. module: project
+#: view:project.task:0
+msgid "Reevaluate"
+msgstr "Re-evaluar"
+
+#. module: project
+#: code:addons/project/project.py:539
+#, python-format
+msgid "Send Email after close task"
+msgstr "Enviar email después de cerrar la tarea"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr "Retraso sobrepasado"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr "Media"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: field:project.vs.hours,remaining_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr "Trabajo de tarea"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: project
+#: field:project.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Tiempo estimado"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:86
+#, python-format
+msgid "Task '%s' Closed"
+msgstr "Tarea '%s' cerrada"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr "No hay tareas asignadas a los usuarios"
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Suma de las horas planificadas de todas las tareas relacionadas con este "
+"proyecto y sus proyectos hijos."
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr "Título delegado"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr "Mis proyectos"
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_definitions
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: project
+#: field:project.task,date_start:0
+#: field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project
+#: code:addons/project/project.py:264
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_open_view_project_all
+#: view:project.project:0
+#, python-format
+msgid "Projects"
+msgstr "Proyectos"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,type_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,type_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"Define the steps that will be used in the project from the creation of the "
+"task, up to the closing of the task or issue. You will use these stages in "
+"order to track the progress in solving a task or an issue."
+msgstr ""
+"Define los pasos que se utilizarán en el proyecto desde la creación de la "
+"tarea, hasta el cierre de la tarea o incidencia. Usará estas etapas con el "
+"fin de seguir el progreso en la solución de una tarea o una incidencia."
+
+#. module: project
+#: code:addons/project/project.py:635
+#, python-format
+msgid "The task '%s' is opened."
+msgstr "La tarea '%s' está abierta."
+
+#. module: project
+#: view:project.task:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr "Nuevo título de la tarea delegada al usuario."
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: project
+#: view:project.installer:0
+msgid ""
+"Various OpenERP applications are available to manage your projects with "
+"different level of control and flexibility."
+msgstr ""
+"Están disponibles varias aplicaciones OpenERP para gestionar sus proyectos "
+"con varios niveles de control y flexibilidad."
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs Planned and Total Hours"
+msgstr "Proyecto - Horas planificadas y totales"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr "Tarea borrador a abierta"
+
+#. module: project
+#: view:project.project:0
+msgid "User: %(user_id)s"
+msgstr "Usuario: %(user_id)s"
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Retraso horas"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr "Análisis tareas"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tareas por usuario y proyecto"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+msgid "Templates of Projects"
+msgstr "Plantillas de proyectos"
+
+#. module: project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,project_id:0
+#: field:project.vs.hours,project:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+#: field:res.users,context_project_id:0
+#: field:task.by.days,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr "_Evaluar"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:79
+#, python-format
+msgid "Please specify the email address of Project Manager."
+msgstr ""
+"Indique la dirección de correo electrónico del responsable del proyecto."
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+#: view:res.company:0
+msgid "Project Management"
+msgstr "Proyectos"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr "Delegar tarea de proyecto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:ir.ui.menu,name:project.menu_tasks_config
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.task:0
+#: view:res.partner:0
+#: field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr "Padre"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr "Delegar tarea"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"A task represents a work that has to be done. Each user works in his own "
+"list of tasks where he can record his task work in hours. He can work and "
+"close the task itself or delegate it to another user. If you delegate a task "
+"to another user, you get a new task in pending state, which will be reopened "
+"when you have to review the work achieved. If you install the "
+"project_timesheet module, task work can be invoiced based on the project "
+"configuration. With the project_mrp module, sales orders can create tasks "
+"automatically when they are confirmed."
+msgstr ""
+"Una tarea representa un trabajo que debe realizarse. Cada usuario trabaja en "
+"su propia lista de tareas, donde puede registrar su trabajo de la tarea en "
+"horas. Puede trabajar y cerrar la tarea él mismo o delegarla a otro usuario. "
+"Si delega una tarea a otro usuario, obtiene una nueva tarea en estado "
+"pendiente, que se volverá a abrir cuando tenga que revisar el trabajo "
+"realizado. Si instala el módulo project_timesheet, el trabajo de las tareas "
+"puede facturarse en base a la configuración del proyecto. Con el módulo "
+"project_mrp, los pedidos de venta pueden crear tareas automáticamente cuando "
+"se confirman."
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project
+#: field:project.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr "Progreso (%)"
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"If the task is created the state is 'Draft'.\n"
+" If the task is started, the state becomes 'In Progress'.\n"
+" If review is needed the task is in 'Pending' state.                         "
+"         \n"
+" If the task is over, the states is set to 'Done'."
+msgstr ""
+"Si la tarea se ha creado, el estado es 'Borrador'.\n"
+"Si la tarea se inicia, el estado se convierte 'En progreso'.\n"
+"Si es necesaria una revisión, la tarea está en estado 'Pendiente'.\n"
+"Si la tarea está terminada, el estado cambia a 'Realizada'."
+
+#. module: project
+#: help:project.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+#: view:project.task.type:0
+msgid "Task Stage"
+msgstr "Etapa tarea"
+
+#. module: project
+#: field:project.task,planned_hours:0
+#: field:project.task.delegate,planned_hours:0
+#: field:project.vs.hours,planned_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr "Horas estimadas"
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr "Fijar como plantilla"
+
+#. module: project
+#: view:project.project:0
+msgid "Status: %(state)s"
+msgstr "Estado: %(state)s"
+
+#. module: project
+#: field:project.installer,project_long_term:0
+msgid "Long Term Planning"
+msgstr "Planificación largo plazo"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,parent_ids:0
+msgid "Parent Tasks"
+msgstr "Tareas padre"
+
+#. module: project
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Avisar empresa"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: project
+#: view:project.project:0
+msgid "Billing"
+msgstr "Facturación"
+
+#. module: project
+#: view:project.task:0
+msgid "Information"
+msgstr "Información"
+
+#. module: project
+#: help:project.installer,account_budget:0
+msgid "Helps accountants manage analytic and crossover budgets."
+msgstr "Ayuda a los contables gestionar presupuestos analíticos y cruzados."
+
+#. module: project
+#: field:project.task,priority:0
+#: field:report.project.task.user,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr "Administración"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr "proyecto.tarea.reevaluar"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr "Mi tarea"
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr "Miembro"
+
+#. module: project
+#: view:project.task:0
+msgid "Project Tasks"
+msgstr "Tareas de proyecto"
+
+#. module: project
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: project
+#: view:project.project:0
+msgid "Performance"
+msgstr "Rendimiento"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Mis fechas límite de tareas"
+
+#. module: project
+#: view:project.project:0
+#: field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr "Responsable de proyecto"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project
+#: view:project.task:0
+msgid "Task Edition"
+msgstr "Edición tarea"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+#: model:ir.ui.menu,name:project.menu_task_types_view
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: project
+#: view:project.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,complete_name:0
+msgid "Project Name"
+msgstr "Nombre del proyecto"
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr ""
+"Nuevo estado de su propia tarea. En estado Pendiente se volverá a abrir "
+"automáticamente cuando la tarea delegada se cierra."
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project
+#: help:project.installer,project_scrum:0
+msgid ""
+"Implements and tracks the concepts and task types defined in the SCRUM "
+"methodology."
+msgstr ""
+"Implementa y sigue los conceptos y tipos de tareas definidos en la "
+"metodología SCRUM."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr "Días para cerrar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tablero de proyectos"
+
+#. module: project
+#: view:project.project:0
+msgid "Parent Project"
+msgstr "Proyecto padre"
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr "Definir los requerimientos y fijar las horas previstas."
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: project
+#: field:project.task.close,partner_email:0
+msgid "Customer Email"
+msgstr "Email cliente"
+
+#. module: project
+#: code:addons/project/project.py:187
+#, python-format
+msgid "The project '%s' has been closed."
+msgstr "El proyecto '%s' ha sido cerrado."
+
+#. module: project
+#: view:project.task:0
+msgid "Task edition"
+msgstr "Edición de tarea"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project
+#: help:project.task.close,manager_warn:0
+msgid "Warn Manager by Email"
+msgstr "Avisar al responsable por email."
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr "Abrir tarea"
+
+#. module: project
+#: field:project.task.close,manager_email:0
+msgid "Manager Email"
+msgstr "Email responsable"
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el proyecto sin eliminarlo."
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr "Cuando se completa una tarea, cambia al estado Realizada."
+
+#. module: project
+#: code:addons/project/project.py:209
+#, python-format
+msgid "The project '%s' has been opened."
+msgstr "El proyecto '%s' ha sido abierto."
+
+#. module: project
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_86
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: project
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:79
+#: code:addons/project/wizard/project_task_close.py:82
+#: code:addons/project/wizard/project_task_close.py:91
+#: code:addons/project/wizard/project_task_close.py:111
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_project
+msgid "User's projects"
+msgstr "Proyectos del usuario"
+
+#. module: project
+#: field:project.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr "_Delegar"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:91
+#, python-format
+msgid "Couldn't send mail because your email address is not configured!"
+msgstr ""
+"¡No se puede enviar el correo porqué su dirección de correo electrónico no "
+"está configurada!"
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr "Número de días para abrir la tarea."
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#. module: project
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Assigned to"
+msgstr "Asignado a"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr "Tarea delegada"
+
+#. module: project
+#: field:project.installer,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Conseguir las cosas terminadas (GTD)"
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose, "
+"but a user has to be member of a project to add a the to this project."
+msgstr ""
+"Miembro del proyecto. No se utiliza en ningún cálculo, sólo con finalidad "
+"informativa, pero un usuario debe ser miembro de un proyecto para agregarlo "
+"al proyecto."
+
+#. module: project
+#: help:project.task.close,partner_warn:0
+msgid "Warn Customer by Email"
+msgstr "Avisar al cliente por correo electrónico."
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Project management module tracks multi-level projects, tasks,\n"
+"work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+" Dashboard for project members that includes:\n"
+"    * List of my open tasks\n"
+"    * Members list of project\n"
+"    "
+msgstr ""
+"El módulo de gestión de proyectos administra proyectos multi-nivel, tareas,\n"
+"trabajos realizado en las tareas, ... Es capaz de hacer la planificación, "
+"ordenar las tareas, ...\n"
+" Tablero para los miembros de proyectos que incluye:\n"
+"    * Lista de mis tareas abiertas\n"
+"    * Lista de los miembros del proyecto\n"
+"    "
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
+msgid "Month works"
+msgstr "Trabajos mensuales"
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.project,sequence:0
+#: field:project.task,sequence:0
+#: field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,state:0
+#: field:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,state:0
+#: field:task.by.days,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+"Este informe le permite analizar el rendimiento de sus proyectos y usuarios. "
+"Puede analizar la cantidad de tareas, las horas invertidas en comparación "
+"con las horas previstas, el número promedio de días para abrir o cerrar una "
+"tarea, etc"
+
+#. module: project
+#: code:addons/project/project.py:595
+#, python-format
+msgid "Task '%s' set in progress"
+msgstr "Tarea '%s' en progreso"
+
+#. module: project
+#: view:project.project:0
+msgid "Date Start: %(date_start)s"
+msgstr "Fecha de inicio: %(date_start)s"
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Enlace este proyecto a una cuenta analítica si necesita la gestión "
+"financiera de los proyectos. Le permite conectar los proyectos con "
+"presupuestos, planificación, análisis de costes e ingresos, tiempo dedicado "
+"en los proyectos, etc."
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.project:0
+#: view:project.task:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project
+#: selection:project.vs.hours,state:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: selection:project.vs.hours,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: project
+#: code:addons/project/project.py:118
+#, python-format
+msgid ""
+"You can not delete a project with tasks. I suggest you to deactivate it."
+msgstr ""
+"No puede eliminar un proyecto con tareas. Le sugerimos que lo desactive."
+
+#. module: project
+#: view:project.project:0
+msgid "ID: %(task_id)s"
+msgstr "ID: %(task_id)s"
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:82
+#, python-format
+msgid "Please specify the email address of Customer."
+msgstr "Introduzca la dirección de email del cliente."
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Reactivar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_close
+#: view:project.task.close:0
+msgid "Send Email"
+msgstr "Enviar email"
+
+#. module: project
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividad actual"
+
+#. module: project
+#: field:project.task,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr "Buscar proyecto"
+
+#. module: project
+#: help:project.installer,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 es una metodología para organizar de manera eficiente uno mismo y sus "
+"tareas. Este módulo integra completamente el principio de GTD con la gestión "
+"de proyectos de OpenERP."
+
+#. module: project
+#: model:ir.model,name:project.model_project_vs_hours
+msgid " Project vs  hours"
+msgstr " Proyecto - Horas"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr "Muy baja"
+
+#. module: project
+#: field:project.project,warn_manager:0
+#: field:project.task.close,manager_warn:0
+msgid "Warn Manager"
+msgstr "Avisar responsable"
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Suma de las horas empleadas en todas las tareas relacionadas con este "
+"proyecto y sus proyectos hijos."
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference of the time estimated by the project manager and the "
+"real time to close the task."
+msgstr ""
+"Calculado como la diferencia del tiempo estimado por el responsable del "
+"proyecto y el tiempo real para cerrar la tarea."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr "Re-evaluar tarea"
+
+#. module: project
+#: help:project.installer,project_long_term:0
+msgid ""
+"Enables long-term projects tracking, including multiple-phase projects and "
+"resource allocation handling."
+msgstr ""
+"Permite el seguimiento de proyectos a largo plazo, incluyendo proyectos de "
+"múltiples fases y la gestión de asignación de recursos."
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desarrollo"
+
+#. module: project
+#: field:project.installer,project_timesheet:0
+msgid "Bill Time on Tasks"
+msgstr "Facturar tiempo en tareas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Remaining Hours by Project"
+msgstr "Mis horas restantes por proyecto"
+
+#. module: project
+#: field:project.task,description:0
+#: field:project.task,name:0
+#: field:project.task.close,description:0
+#: view:project.task.type:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr "Su título de tarea"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr "Validación de tarea"
+
+#. module: project
+#: field:task.by.days,total_task:0
+msgid "Total tasks"
+msgstr "Total tareas"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
+#: view:project.task:0
+msgid "My Delegated Tasks"
+msgstr "Mis tareas delegadas"
+
+#. module: project
+#: view:project.project:0
+msgid "Task: %(name)s"
+msgstr "Tarea: %(name)s"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_installer
+#: view:project.installer:0
+msgid "Project Application Configuration"
+msgstr "Configuración aplicaciones de proyectos"
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr "Tiempo dedicado"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mis cuentas a facturar"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Project tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project
+#: help:project.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Si marca este campo, el responsable del proyecto recibirá un aviso cada vez "
+"que una tarea sea completada por su equipo."
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Suma del total de horas de todas las tareas relacionadas con este proyecto y "
+"sus proyectos hijos."
+
+#. module: project
+#: help:project.task.close,manager_email:0
+msgid "Email Address of Project's Manager"
+msgstr "Dirección de correo electrónico del responsable del proyecto"
+
+#. module: project
+#: view:project.project:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_task_by_days_graph
+#: model:ir.model,name:project.model_task_by_days
+#: view:task.by.days:0
+msgid "Task By Days"
+msgstr "Tarea por días"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:111
+#, python-format
+msgid ""
+"Couldn't send mail! Check the email ids and smtp configuration settings"
+msgstr ""
+"¡No se puede enviar el correo! Compruebe los ids del email y los valores de "
+"configuración del smtp"
+
+#. module: project
+#: field:project.task.close,partner_warn:0
+msgid "Warn Customer"
+msgstr "Avisar cliente"
+
+#. module: project
+#: view:project.task:0
+msgid "Edit"
+msgstr "Editar"
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr "Codificar sus horas de trabajo."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr "Número de día para cerrar la tarea."
+
+#. module: project
+#: view:board.board:0
+msgid "My Projects: Planned vs Total Hours"
+msgstr "Mis proyectos: Planificados - Horas totales"
+
+#. module: project
+#: model:ir.model,name:project.model_project_installer
+msgid "project.installer"
+msgstr "proyecto.instalador"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Horas dedicadas"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Miscelleanous"
+msgstr "Varios"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr "Abrir tarea realizada"
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr "Unidad de tiempo proyecto"
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr "Horas consumidas"
+
+#. module: project
+#: code:addons/project/project.py:678
+#, python-format
+msgid "The task '%s' is pending."
+msgstr "La tarea '%s' está pendiente."
+
+#. module: project
+#: field:project.task,total_hours:0
+#: field:project.vs.hours,total_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de proyectos."
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr "Tareas sobrepasadas"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Merge"
+msgstr "Fusionar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
+#: view:project.vs.hours:0
+msgid "Remaining Hours Per Project"
+msgstr "Horas restantes por proyecto"
+
+#. module: project
+#: help:project.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Pie añadido al final del correo electrónico del mensaje de aviso enviado al "
+"cliente cuando una tarea se cierra."
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"A project contains a set of tasks or issues that will be performed by your "
+"resources assigned to it. A project can be hierarchically structured, as a "
+"child of a Parent Project. This allows you to design large project "
+"structures with different phases spread over the project duration cycle. "
+"Each user can set his default project in his own preferences to "
+"automatically filter the tasks or issues he usually works on. If you choose "
+"to invoice the time spent on a project task, you can find project tasks to "
+"be invoiced in the billing section."
+msgstr ""
+"Un proyecto contiene un conjunto de tareas o incidencias que serán "
+"realizadas por los recursos asignados a él. Un proyecto puede estructurarse "
+"jerárquicamente, como hijo de un proyecto padre. Esto le permite diseñar "
+"grandes estructuras de proyecto con distintas fases repartidas en el ciclo "
+"de vida del proyecto. Cada usuario puede establecer su proyecto por defecto "
+"en sus propias preferencias para filtrar automáticamente las tareas o "
+"incidencias en las que normalmente trabaja. Si opta por facturar el tiempo "
+"empleado en una tarea del proyecto, puede encontrar las tareas del proyecto "
+"a facturar en la sección de facturación."
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: project
+#: field:project.task.delegate,state:0
+msgid "Validation State"
+msgstr "Estado de validación"
+
+#. module: project
+#: code:addons/project/project.py:615
+#, python-format
+msgid "Task '%s' cancelled"
+msgstr "Tarea '%s' cancelada"
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr "Trabajo realizado"
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr ""
+"El tiempo estimado para que pueda validar el trabajo realizado por el "
+"usuario a quien se ha delegado esta tarea."
+
+#. module: project
+#: view:project.project:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: project
+#: code:addons/project/project.py:623
+#, python-format
+msgid "The task '%s' is cancelled."
+msgstr "La tarea '%s' está cancelada."
+
+#. module: project
+#: view:project.task.close:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr "Resumen del trabajo"
+
+#. module: project
+#: view:project.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: project
+#: help:project.installer,project_issue:0
+msgid "Automatically synchronizes project tasks and crm cases."
+msgstr "Sincroniza automáticamente tareas de proyecto y casos CRM."
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,type_ids:0
+msgid "Tasks Stages"
+msgstr "Etapas de tareas"
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr "Delegar su tarea a otro usuario"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Pie correo"
+
+#. module: project
+#: field:project.installer,account_budget:0
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#, python-format
+#~ msgid ""
+#~ "A new project has been created !\n"
+#~ "We suggest you to close this one and work on this new project."
+#~ msgstr ""
+#~ "¡Se ha creado un nuevo proyecto!\n"
+#~ "Le sugerimos cerrar éste y trabajar en el nuevo proyecto."
+
+#~ msgid "Tasks Process"
+#~ msgstr "Proceso de tareas"
+
+#~ msgid "New title of the task delegated to the user."
+#~ msgstr "Nuevo título de la tarea delegada al usuario."
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail because the contact for this task (%s) has no email "
+#~ "address!"
+#~ msgstr ""
+#~ "¡No se puede enviar el correo porqué el contacto para esta tarea (%s) no "
+#~ "tiene ninguna dirección de correo electrónico!"
+
+#~ msgid "Change Remaining Hours"
+#~ msgstr "Cambiar horas restantes"
+
+#~ msgid "Close Task"
+#~ msgstr "Cerrar tarea"
+
+#~ msgid "Subproject"
+#~ msgstr "Subproyecto"
+
+#~ msgid "My Running Projects"
+#~ msgstr "Mis proyectos ejecutándose"
+
+#~ msgid "Importance"
+#~ msgstr "Importancia"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "User you want to delegate this task to."
+#~ msgstr "Usuario al que quiere delegar esta tarea."
+
+#~ 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 "Unassigned Tasks"
+#~ msgstr "Tareas no asignadas"
+
+#~ msgid "Task Types"
+#~ msgstr "Tipos de tarea"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid ""
+#~ "Estimated time for you to validate the work done by the user to whom you "
+#~ "delegate this task."
+#~ msgstr ""
+#~ "Tiempo estimado para que pueda validar el trabajo realizado por el usuario "
+#~ "en el cual delega esta tarea."
+
+#~ msgid "Days"
+#~ msgstr "Días"
+
+#~ msgid "Analysis"
+#~ msgstr "Análisis"
+
+#~ msgid "My Draft Tasks"
+#~ msgstr "Mis tareas borrador"
+
+#~ msgid "All Tasks"
+#~ msgstr "Todas las tareas"
+
+#~ msgid "Send Message"
+#~ msgstr "Enviar mensaje"
+
+#~ msgid "All projects"
+#~ msgstr "Todos los proyectos"
+
+#~ msgid "Internal description of the project."
+#~ msgstr "Descripción interna del proyecto."
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Weeks"
+#~ msgstr "Semanas"
+
+#~ msgid "My Current Tasks"
+#~ msgstr "Mis tareas actuales"
+
+#~ msgid "New Project"
+#~ msgstr "Nuevo proyecto"
+
+#~ msgid "Project task type"
+#~ msgstr "Tipo de tarea de proyecto"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
+
+#~ msgid "My Pending Tasks"
+#~ msgstr "Mis tareas pendientes"
+
+#, python-format
+#~ msgid "Operation Done"
+#~ msgstr "Operación realizada"
+
+#~ msgid "Estimated time to close this task by the delegated user."
+#~ msgstr "Tiempo estimado para que el usuario delegado cierre esta tarea."
+
+#~ msgid "Task Details"
+#~ msgstr "Detalles de tarea"
+
+#~ msgid "Trigger Invoice"
+#~ msgstr "Activar factura"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Task type"
+#~ msgstr "Tipo de tarea"
+
+#~ msgid "New Task"
+#~ msgstr "Nueva tarea"
+
+#~ 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 "Project's members"
+#~ msgstr "Miembros del proyecto"
+
+#~ msgid "After task is completed, Create its invoice."
+#~ msgstr "Después que la tarea esté completada, crear su factura."
+
+#~ 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 "Review"
+#~ msgstr "Revisión"
+
+#~ msgid "E-Mails"
+#~ msgstr "Emails"
+
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Activar facturas desde líneas de pedidos de venta"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid ""
+#~ "New state of your own task. Pending will be reopened automatically when the "
+#~ "delegated task is closed."
+#~ msgstr ""
+#~ "Nuevo estado de su propia tarea. En espera será reabierta automáticamente "
+#~ "cuándo la tarea delegada se cierre."
+
+#~ msgid "Bug"
+#~ msgstr "Error"
+
+#~ msgid "Quotation"
+#~ msgstr "Presupuesto"
+
+#~ 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 "Working Time"
+#~ msgstr "Tiempo trabajado"
+
+#~ msgid "Months"
+#~ msgstr "Meses"
+
+#~ msgid "Delegate this task to a user"
+#~ msgstr "Delegar esta tarea a un usuario"
+
+#~ msgid "Date Closed"
+#~ msgstr "Fecha de cierre"
+
+#~ 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 "Gantt Representation"
+#~ msgstr "Representación de Gantt"
+
+#~ msgid "Task summary"
+#~ msgstr "Resumen de tarea"
+
+#~ msgid "Create a Task"
+#~ msgstr "Crear una tarea"
+
+#~ 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 "Delay"
+#~ msgstr "Retraso"
+
+#~ msgid "Send mail to customer"
+#~ msgstr "Enviar correo al cliente"
+
+#~ msgid "config.compute.remaining"
+#~ msgstr "config.calculo.restante"
+
+#~ msgid "Quiet close"
+#~ msgstr "Cerrar silenciosamente"
+
+#~ msgid "New title of your own task to validate the work done."
+#~ msgstr "Nuevo título de su propia tarea para validar el trabajo realizado."
+
+#~ msgid "Task invoice"
+#~ msgstr "Tarea factura"
+
+#~ msgid "Projects Structure"
+#~ msgstr "Estructura del proyecto"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Tarea delegada"
+
+#~ msgid "New Feature"
+#~ msgstr "Nueva característica"
+
+#~ msgid "Template of Projects"
+#~ msgstr "Plantilla de proyectos"
+
+#~ msgid "Partner Info"
+#~ msgstr "Información de empresa"
+
+#~ msgid "Compute Remaining Hours"
+#~ msgstr "Calcular horas restantes"
+
+#~ msgid "Error ! You can not create recursive projects."
+#~ msgstr "¡Error! No puede crear proyectos recursivos."
+
+#~ msgid "Date Stop: %(date_stop)s"
+#~ msgstr "Fecha de parada: %(date_stop)s"
+
+#~ msgid "Expected End"
+#~ msgstr "Fin previsto"
+
+#~ msgid "Running projects"
+#~ msgstr "Proyectos en ejecución"
+
+#~ msgid ""
+#~ "If you have [?] in the name, it means there are no analytic account linked "
+#~ "to project."
+#~ msgstr ""
+#~ "Si tiene [?] en el nombre, significa que no hay cuenta analítica vinculada "
+#~ "al proyecto."
+
+#~ msgid "Reinclude the description of the task in the task of the user."
+#~ msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario."
+
+#~ 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."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "All Attachments"
+#~ msgstr "Todos los adjuntos"
+
+#~ msgid "My Tasks in Progress"
+#~ msgstr "Mis tareas en progreso"
+
+#~ msgid ""
+#~ "Project management module that track multi-level projects, tasks,\n"
+#~ "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ "    "
+#~ msgstr ""
+#~ "Módulo de gestión de proyectos que permite un seguimiento de proyectos multi-"
+#~ "nivel, las tareas,\n"
+#~ "trabajos sobre las tareas, ... Es capaz de visualizar la planificación, "
+#~ "ordenar tareas, ...\n"
+#~ "    "
+
+#~ msgid "Planned"
+#~ msgstr "Estimado"
+
+#~ msgid "Sum of planned hours of all tasks related to this project."
+#~ msgstr ""
+#~ "Suma de las horas estimadas de todas las tareas relacionadas con este "
+#~ "proyecto."
+
+#~ msgid "Running"
+#~ msgstr "En progreso"
+
+#~ msgid "Tasks in Progress"
+#~ msgstr "Tareas en progreso"
diff --git a/addons/project/i18n/es_PY.po b/addons/project/i18n/es_PY.po
index 8980384f056..ca5ae97a3af 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario."
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -242,7 +242,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -428,7 +428,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -478,8 +478,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -618,7 +618,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -711,7 +711,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -736,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1138,7 +1138,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1168,7 +1167,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1216,7 +1215,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1353,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1402,7 +1401,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1726,7 +1725,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1801,7 +1800,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1829,7 +1828,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/es_VE.po b/addons/project/i18n/es_VE.po
new file mode 100644
index 00000000000..22b2e410bcb
--- /dev/null
+++ b/addons/project/i18n/es_VE.po
@@ -0,0 +1,2291 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* 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: 2011-01-16 18:25+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 04:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned tasks"
+msgstr "Tareas asignadas"
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario."
+
+#. module: project
+#: code:addons/project/project.py:671
+#, python-format
+msgid "The task '%s' has been delegated to %s."
+msgstr "La tarea '%s' ha sido delegada a %s."
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+"Permite fijar la unidad de medida utilizada en proyectos y tareas.\n"
+"Si utiliza las hojas de horarios relacionadas con proyectos (módulo "
+"project_timesheet), no olvide configurar la unidad de medida correcta en sus "
+"empleados."
+
+#. module: project
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr "Introduzca aquí las horas restantes requeridas para cerrar la tarea."
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr "Fechas límite"
+
+#. module: project
+#: code:addons/project/project.py:118
+#, python-format
+msgid "Operation Not Permitted !"
+msgstr "¡Operación no permitida!"
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:67
+#, python-format
+msgid "CHECK: %s"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:55
+#: code:addons/project/wizard/project_task_delegate.py:56
+#: code:addons/project/wizard/project_task_delegate.py:63
+#: code:addons/project/wizard/project_task_delegate.py:64
+#: code:addons/project/wizard/project_task_delegate.py:67
+#, python-format
+msgid "CHECK: "
+msgstr "Validar "
+
+#. module: project
+#: field:project.installer,project_issue:0
+msgid "Issues Tracker"
+msgstr "Seguimiento de problemas"
+
+#. module: project
+#: field:project.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegations"
+msgstr "Delegaciones"
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr "Horas a validar"
+
+#. module: project
+#: field:project.project,progress_rate:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Total tiempo restante, puede ser reestimado periódicamente por quien se le "
+"ha asignado la tarea."
+
+#. module: project
+#: help:project.project,priority:0
+msgid "Gives the sequence order when displaying the list of projects"
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de proyectos."
+
+#. module: project
+#: 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
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr "Tarea re-evaluación"
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr "Miembros del proyecto"
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr "Tarea por delegación"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr "Tareas delegadas"
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tareas delegadas"
+
+#. module: project
+#: help:project.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Cabecera añadida al principio del correo electrónico del mensaje de aviso "
+"enviado al cliente cuando una tarea se cierra."
+
+#. module: project
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Mis tareas"
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project
+#: field:project.task,company_id:0
+#: field:project.task.work,company_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: project
+#: field:project.installer,project_scrum:0
+msgid "SCRUM"
+msgstr "SCRUM"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
+msgid "Projects: Planned Vs Total hours"
+msgstr "Proyectos: Horas planficadas - totales"
+
+#. module: project
+#: view:project.task.close:0
+msgid "Warn Message"
+msgstr "Mensaje de aviso"
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr "Nombre etapa"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr "Cambiar a pendiente"
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: project
+#: view:project.task:0
+msgid "Change Stage"
+msgstr "Cambiar etapa"
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr "Nuevo proyecto basado en plantilla"
+
+#. module: project
+#: 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
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr "Muy urgente"
+
+#. module: project
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr "Usuario al que quiere delegar esta tarea."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,day:0
+#: field:task.by.days,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: project
+#: code:addons/project/project.py:584
+#, python-format
+msgid "The task '%s' is done"
+msgstr "La tarea '%s' está realizada"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_close
+msgid "Project Close Task"
+msgstr "Tarea cierre proyecto"
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr "Tarea borrador"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: field:project.task.work,task_id:0
+#: view:report.project.task.user:0
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project
+#: view:project.project:0
+msgid "Members"
+msgstr "Miembros"
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Tiempo estimado para realizar la tarea, normalmente fijado por el "
+"responsable del proyecto cuando la tarea está en estado borrador."
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr "Trabajo tarea proyecto"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs remaining hours"
+msgstr "Proyecto - Horas restantes"
+
+#. module: project
+#: view:project.project:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: project
+#: field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr "Resumen tarea"
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr "No es una plantilla de tarea"
+
+#. module: project
+#: view:project.task:0
+msgid "Start Task"
+msgstr "Iniciar tarea"
+
+#. module: project
+#: help:project.installer,project_timesheet:0
+msgid ""
+"Helps generate invoices based on time spent on tasks, if activated on the "
+"project."
+msgstr ""
+"Ayuda a generar facturas basado en el tiempo empleado en las tareas, si se "
+"ha activado en el proyecto."
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Automatic variables for headers and footer. Use exactly the same notation."
+msgstr ""
+"Variables automáticas para cabeceras y pie. Utilizar exactamente la misma "
+"notación."
+
+#. module: project
+#: selection:project.task,state:0
+#: selection:project.vs.hours,state:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mis tareas abiertas"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_header:0
+msgid "Mail Header"
+msgstr "Cabecera correo"
+
+#. module: project
+#: view:project.installer:0
+msgid "Configure Your Project Management Application"
+msgstr "Configure su aplicación de gestión de proyectos"
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr "Tarea realizada"
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr "Título para su tarea de validación."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Promedio Plan.-Real"
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr "Tarea es completada"
+
+#. module: project
+#: field:project.task,date_end:0
+#: field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr "Delega tareas a otro usuario"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Calculado usando la suma de las tareas realizadas."
+
+#. module: project
+#: help:project.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Si marca esto, al usuario le aparecerá una ventana emergente cuando cierre "
+"una tarea que propondrá un mensaje para ser enviado por correo electrónico "
+"al cliente."
+
+#. module: project
+#: model:ir.model,name:project.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr "Testeo"
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr "Tiempo estimado para que el usuario delegado cierre esta tarea."
+
+#. module: project
+#: view:project.project:0
+msgid "Reactivate Project"
+msgstr "Reactivar proyecto"
+
+#. module: project
+#: code:addons/project/project.py:562
+#, python-format
+msgid "Task '%s' closed"
+msgstr "Tarea '%s' cerrada"
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+#: field:project.project,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr "Realizado por"
+
+#. module: project
+#: view:project.task:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project
+#: view:project.task.close:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner
+#: view:project.project:0
+#: field:project.task,partner_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: project
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: project
+#: help:project.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr "Ayuda a los empleados codificar y validar horarios y asistencias."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,nbr:0
+msgid "# of tasks"
+msgstr "Nº de tareas"
+
+#. module: project
+#: view:project.task:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluate Task"
+msgstr "Re-evaluar tarea"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr "Asignado a"
+
+#. module: project
+#: view:project.project:0
+msgid "Date Stop: %(date)s"
+msgstr "Fecha parada: %(date)s"
+
+#. module: project
+#: 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 de usuario!"
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr "Restaurar como proyecto"
+
+#. module: project
+#: selection:project.vs.hours,state:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Specification"
+msgstr "Especificación"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_project
+msgid "My projects"
+msgstr "Mis proyectos"
+
+#. module: project
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: project
+#: view:project.task:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr "Desde estado borrador, se convierte en estado abierto."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr "Nº de días"
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+"Este campo se calcula automáticamente y tiene el mismo comportamiento que el "
+"campo booleano 'activo': Si la tarea está vinculada a una plantilla o a un "
+"proyecto no activado, se ocultarán a menos que se pregunte específicamente."
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "Porcentaje de tareas cerradas según el total de tareas a realizar."
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr "Nueva descripción de tarea"
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr "Tarea del proyecto"
+
+#. module: project
+#: view:project.installer:0
+msgid "Methodologies"
+msgstr "Metodologías"
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
+
+#. module: project
+#: help:project.task.close,partner_email:0
+msgid "Email Address of Customer"
+msgstr "Dirección de correo electrónico del cliente."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Horas reales"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr "Título tarea de validación"
+
+#. module: project
+#: view:project.task:0
+msgid "Reevaluate"
+msgstr "Re-evaluar"
+
+#. module: project
+#: code:addons/project/project.py:539
+#, python-format
+msgid "Send Email after close task"
+msgstr "Enviar email después de cerrar la tarea"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr "Retraso sobrepasado"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr "Media"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: field:project.vs.hours,remaining_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr "Trabajo de tarea"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: project
+#: field:project.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Tiempo estimado"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:86
+#, python-format
+msgid "Task '%s' Closed"
+msgstr "Tarea '%s' cerrada"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr "No hay tareas asignadas a los usuarios"
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Suma de las horas planificadas de todas las tareas relacionadas con este "
+"proyecto y sus proyectos hijos."
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr "Título delegado"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr "Mis proyectos"
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_definitions
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: project
+#: field:project.task,date_start:0
+#: field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project
+#: code:addons/project/project.py:264
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_open_view_project_all
+#: view:project.project:0
+#, python-format
+msgid "Projects"
+msgstr "Proyectos"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,type_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,type_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"Define the steps that will be used in the project from the creation of the "
+"task, up to the closing of the task or issue. You will use these stages in "
+"order to track the progress in solving a task or an issue."
+msgstr ""
+"Define los pasos que se utilizarán en el proyecto desde la creación de la "
+"tarea, hasta el cierre de la tarea o incidencia. Usará estas etapas con el "
+"fin de seguir el progreso en la solución de una tarea o una incidencia."
+
+#. module: project
+#: code:addons/project/project.py:635
+#, python-format
+msgid "The task '%s' is opened."
+msgstr "La tarea '%s' está abierta."
+
+#. module: project
+#: view:project.task:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr "Nuevo título de la tarea delegada al usuario."
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: project
+#: view:project.installer:0
+msgid ""
+"Various OpenERP applications are available to manage your projects with "
+"different level of control and flexibility."
+msgstr ""
+"Están disponibles varias aplicaciones OpenERP para gestionar sus proyectos "
+"con varios niveles de control y flexibilidad."
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs Planned and Total Hours"
+msgstr "Proyecto - Horas planificadas y totales"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr "Tarea borrador a abierta"
+
+#. module: project
+#: view:project.project:0
+msgid "User: %(user_id)s"
+msgstr "Usuario: %(user_id)s"
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Retraso horas"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr "Análisis tareas"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tareas por usuario y proyecto"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+msgid "Templates of Projects"
+msgstr "Plantillas de proyectos"
+
+#. module: project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,project_id:0
+#: field:project.vs.hours,project:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+#: field:res.users,context_project_id:0
+#: field:task.by.days,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr "_Evaluar"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:79
+#, python-format
+msgid "Please specify the email address of Project Manager."
+msgstr ""
+"Indique la dirección de correo electrónico del responsable del proyecto."
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+#: view:res.company:0
+msgid "Project Management"
+msgstr "Proyectos"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr "Delegar tarea de proyecto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:ir.ui.menu,name:project.menu_tasks_config
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.task:0
+#: view:res.partner:0
+#: field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr "Padre"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr "Delegar tarea"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"A task represents a work that has to be done. Each user works in his own "
+"list of tasks where he can record his task work in hours. He can work and "
+"close the task itself or delegate it to another user. If you delegate a task "
+"to another user, you get a new task in pending state, which will be reopened "
+"when you have to review the work achieved. If you install the "
+"project_timesheet module, task work can be invoiced based on the project "
+"configuration. With the project_mrp module, sales orders can create tasks "
+"automatically when they are confirmed."
+msgstr ""
+"Una tarea representa un trabajo que debe realizarse. Cada usuario trabaja en "
+"su propia lista de tareas, donde puede registrar su trabajo de la tarea en "
+"horas. Puede trabajar y cerrar la tarea él mismo o delegarla a otro usuario. "
+"Si delega una tarea a otro usuario, obtiene una nueva tarea en estado "
+"pendiente, que se volverá a abrir cuando tenga que revisar el trabajo "
+"realizado. Si instala el módulo project_timesheet, el trabajo de las tareas "
+"puede facturarse en base a la configuración del proyecto. Con el módulo "
+"project_mrp, los pedidos de venta pueden crear tareas automáticamente cuando "
+"se confirman."
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project
+#: field:project.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr "Progreso (%)"
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"If the task is created the state is 'Draft'.\n"
+" If the task is started, the state becomes 'In Progress'.\n"
+" If review is needed the task is in 'Pending' state.                         "
+"         \n"
+" If the task is over, the states is set to 'Done'."
+msgstr ""
+"Si la tarea se ha creado, el estado es 'Borrador'.\n"
+"Si la tarea se inicia, el estado se convierte 'En progreso'.\n"
+"Si es necesaria una revisión, la tarea está en estado 'Pendiente'.\n"
+"Si la tarea está terminada, el estado cambia a 'Realizada'."
+
+#. module: project
+#: help:project.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+#: view:project.task.type:0
+msgid "Task Stage"
+msgstr "Etapa tarea"
+
+#. module: project
+#: field:project.task,planned_hours:0
+#: field:project.task.delegate,planned_hours:0
+#: field:project.vs.hours,planned_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr "Horas estimadas"
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr "Fijar como plantilla"
+
+#. module: project
+#: view:project.project:0
+msgid "Status: %(state)s"
+msgstr "Estado: %(state)s"
+
+#. module: project
+#: field:project.installer,project_long_term:0
+msgid "Long Term Planning"
+msgstr "Planificación largo plazo"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,parent_ids:0
+msgid "Parent Tasks"
+msgstr "Tareas padre"
+
+#. module: project
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Avisar empresa"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: project
+#: view:project.project:0
+msgid "Billing"
+msgstr "Facturación"
+
+#. module: project
+#: view:project.task:0
+msgid "Information"
+msgstr "Información"
+
+#. module: project
+#: help:project.installer,account_budget:0
+msgid "Helps accountants manage analytic and crossover budgets."
+msgstr "Ayuda a los contables gestionar presupuestos analíticos y cruzados."
+
+#. module: project
+#: field:project.task,priority:0
+#: field:report.project.task.user,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr "Administración"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr "proyecto.tarea.reevaluar"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr "Mi tarea"
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr "Miembro"
+
+#. module: project
+#: view:project.task:0
+msgid "Project Tasks"
+msgstr "Tareas de proyecto"
+
+#. module: project
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: project
+#: view:project.project:0
+msgid "Performance"
+msgstr "Rendimiento"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Mis fechas límite de tareas"
+
+#. module: project
+#: view:project.project:0
+#: field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr "Responsable de proyecto"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project
+#: view:project.task:0
+msgid "Task Edition"
+msgstr "Edición tarea"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+#: model:ir.ui.menu,name:project.menu_task_types_view
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: project
+#: view:project.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,complete_name:0
+msgid "Project Name"
+msgstr "Nombre del proyecto"
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr ""
+"Nuevo estado de su propia tarea. En estado Pendiente se volverá a abrir "
+"automáticamente cuando la tarea delegada se cierra."
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project
+#: help:project.installer,project_scrum:0
+msgid ""
+"Implements and tracks the concepts and task types defined in the SCRUM "
+"methodology."
+msgstr ""
+"Implementa y sigue los conceptos y tipos de tareas definidos en la "
+"metodología SCRUM."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr "Días para cerrar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tablero de proyectos"
+
+#. module: project
+#: view:project.project:0
+msgid "Parent Project"
+msgstr "Proyecto padre"
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr "Definir los requerimientos y fijar las horas previstas."
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: project
+#: field:project.task.close,partner_email:0
+msgid "Customer Email"
+msgstr "Email cliente"
+
+#. module: project
+#: code:addons/project/project.py:187
+#, python-format
+msgid "The project '%s' has been closed."
+msgstr "El proyecto '%s' ha sido cerrado."
+
+#. module: project
+#: view:project.task:0
+msgid "Task edition"
+msgstr "Edición de tarea"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project
+#: help:project.task.close,manager_warn:0
+msgid "Warn Manager by Email"
+msgstr "Avisar al responsable por email."
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr "Abrir tarea"
+
+#. module: project
+#: field:project.task.close,manager_email:0
+msgid "Manager Email"
+msgstr "Email responsable"
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el proyecto sin eliminarlo."
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr "Cuando se completa una tarea, cambia al estado Realizada."
+
+#. module: project
+#: code:addons/project/project.py:209
+#, python-format
+msgid "The project '%s' has been opened."
+msgstr "El proyecto '%s' ha sido abierto."
+
+#. module: project
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_86
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: project
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:79
+#: code:addons/project/wizard/project_task_close.py:82
+#: code:addons/project/wizard/project_task_close.py:91
+#: code:addons/project/wizard/project_task_close.py:111
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_project
+msgid "User's projects"
+msgstr "Proyectos del usuario"
+
+#. module: project
+#: field:project.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr "_Delegar"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:91
+#, python-format
+msgid "Couldn't send mail because your email address is not configured!"
+msgstr ""
+"¡No se puede enviar el correo porqué su dirección de correo electrónico no "
+"está configurada!"
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr "Número de días para abrir la tarea."
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#. module: project
+#: view:res.partner:0
+msgid "History"
+msgstr "Historial"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Assigned to"
+msgstr "Asignado a"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr "Tarea delegada"
+
+#. module: project
+#: field:project.installer,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Conseguir las cosas terminadas (GTD)"
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose, "
+"but a user has to be member of a project to add a the to this project."
+msgstr ""
+"Miembro del proyecto. No se utiliza en ningún cálculo, sólo con finalidad "
+"informativa, pero un usuario debe ser miembro de un proyecto para agregarlo "
+"al proyecto."
+
+#. module: project
+#: help:project.task.close,partner_warn:0
+msgid "Warn Customer by Email"
+msgstr "Avisar al cliente por correo electrónico."
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Project management module tracks multi-level projects, tasks,\n"
+"work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+" Dashboard for project members that includes:\n"
+"    * List of my open tasks\n"
+"    * Members list of project\n"
+"    "
+msgstr ""
+"El módulo de gestión de proyectos administra proyectos multi-nivel, tareas,\n"
+"trabajos realizado en las tareas, ... Es capaz de hacer la planificación, "
+"ordenar las tareas, ...\n"
+" Tablero para los miembros de proyectos que incluye:\n"
+"    * Lista de mis tareas abiertas\n"
+"    * Lista de los miembros del proyecto\n"
+"    "
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
+msgid "Month works"
+msgstr "Trabajos mensuales"
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.project,sequence:0
+#: field:project.task,sequence:0
+#: field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,state:0
+#: field:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,state:0
+#: field:task.by.days,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+"Este informe le permite analizar el rendimiento de sus proyectos y usuarios. "
+"Puede analizar la cantidad de tareas, las horas invertidas en comparación "
+"con las horas previstas, el número promedio de días para abrir o cerrar una "
+"tarea, etc"
+
+#. module: project
+#: code:addons/project/project.py:595
+#, python-format
+msgid "Task '%s' set in progress"
+msgstr "Tarea '%s' en progreso"
+
+#. module: project
+#: view:project.project:0
+msgid "Date Start: %(date_start)s"
+msgstr "Fecha de inicio: %(date_start)s"
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Enlace este proyecto a una cuenta analítica si necesita la gestión "
+"financiera de los proyectos. Le permite conectar los proyectos con "
+"presupuestos, planificación, análisis de costes e ingresos, tiempo dedicado "
+"en los proyectos, etc."
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.project:0
+#: view:project.task:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project
+#: selection:project.vs.hours,state:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: selection:project.vs.hours,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: project
+#: code:addons/project/project.py:118
+#, python-format
+msgid ""
+"You can not delete a project with tasks. I suggest you to deactivate it."
+msgstr ""
+"No puede eliminar un proyecto con tareas. Le sugerimos que lo desactive."
+
+#. module: project
+#: view:project.project:0
+msgid "ID: %(task_id)s"
+msgstr "ID: %(task_id)s"
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:82
+#, python-format
+msgid "Please specify the email address of Customer."
+msgstr "Introduzca la dirección de email del cliente."
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Reactivar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_close
+#: view:project.task.close:0
+msgid "Send Email"
+msgstr "Enviar email"
+
+#. module: project
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actividad actual"
+
+#. module: project
+#: field:project.task,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr "Buscar proyecto"
+
+#. module: project
+#: help:project.installer,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 es una metodología para organizar de manera eficiente uno mismo y sus "
+"tareas. Este módulo integra completamente el principio de GTD con la gestión "
+"de proyectos de OpenERP."
+
+#. module: project
+#: model:ir.model,name:project.model_project_vs_hours
+msgid " Project vs  hours"
+msgstr " Proyecto - Horas"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr "Muy baja"
+
+#. module: project
+#: field:project.project,warn_manager:0
+#: field:project.task.close,manager_warn:0
+msgid "Warn Manager"
+msgstr "Avisar responsable"
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr "Fecha límite excedida"
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Suma de las horas empleadas en todas las tareas relacionadas con este "
+"proyecto y sus proyectos hijos."
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference of the time estimated by the project manager and the "
+"real time to close the task."
+msgstr ""
+"Calculado como la diferencia del tiempo estimado por el responsable del "
+"proyecto y el tiempo real para cerrar la tarea."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr "Re-evaluar tarea"
+
+#. module: project
+#: help:project.installer,project_long_term:0
+msgid ""
+"Enables long-term projects tracking, including multiple-phase projects and "
+"resource allocation handling."
+msgstr ""
+"Permite el seguimiento de proyectos a largo plazo, incluyendo proyectos de "
+"múltiples fases y la gestión de asignación de recursos."
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "Desarrollo"
+
+#. module: project
+#: field:project.installer,project_timesheet:0
+msgid "Bill Time on Tasks"
+msgstr "Facturar tiempo en tareas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Remaining Hours by Project"
+msgstr "Mis horas restantes por proyecto"
+
+#. module: project
+#: field:project.task,description:0
+#: field:project.task,name:0
+#: field:project.task.close,description:0
+#: view:project.task.type:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr "Su título de tarea"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr "Validación de tarea"
+
+#. module: project
+#: field:task.by.days,total_task:0
+msgid "Total tasks"
+msgstr "Total tareas"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
+#: view:project.task:0
+msgid "My Delegated Tasks"
+msgstr "Mis tareas delegadas"
+
+#. module: project
+#: view:project.project:0
+msgid "Task: %(name)s"
+msgstr "Tarea: %(name)s"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_installer
+#: view:project.installer:0
+msgid "Project Application Configuration"
+msgstr "Configuración aplicaciones de proyectos"
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr "Tiempo dedicado"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mis cuentas a facturar"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Project tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project
+#: help:project.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Si marca este campo, el responsable del proyecto recibirá un aviso cada vez "
+"que una tarea sea completada por su equipo."
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Suma del total de horas de todas las tareas relacionadas con este proyecto y "
+"sus proyectos hijos."
+
+#. module: project
+#: help:project.task.close,manager_email:0
+msgid "Email Address of Project's Manager"
+msgstr "Dirección de correo electrónico del responsable del proyecto"
+
+#. module: project
+#: view:project.project:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_task_by_days_graph
+#: model:ir.model,name:project.model_task_by_days
+#: view:task.by.days:0
+msgid "Task By Days"
+msgstr "Tarea por días"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:111
+#, python-format
+msgid ""
+"Couldn't send mail! Check the email ids and smtp configuration settings"
+msgstr ""
+"¡No se puede enviar el correo! Compruebe los ids del email y los valores de "
+"configuración del smtp"
+
+#. module: project
+#: field:project.task.close,partner_warn:0
+msgid "Warn Customer"
+msgstr "Avisar cliente"
+
+#. module: project
+#: view:project.task:0
+msgid "Edit"
+msgstr "Editar"
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr "Codificar sus horas de trabajo."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr "Número de día para cerrar la tarea."
+
+#. module: project
+#: view:board.board:0
+msgid "My Projects: Planned vs Total Hours"
+msgstr "Mis proyectos: Planificados - Horas totales"
+
+#. module: project
+#: model:ir.model,name:project.model_project_installer
+msgid "project.installer"
+msgstr "proyecto.instalador"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Horas dedicadas"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Miscelleanous"
+msgstr "Varios"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr "Abrir tarea realizada"
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr "Unidad de tiempo proyecto"
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr "Horas consumidas"
+
+#. module: project
+#: code:addons/project/project.py:678
+#, python-format
+msgid "The task '%s' is pending."
+msgstr "La tarea '%s' está pendiente."
+
+#. module: project
+#: field:project.task,total_hours:0
+#: field:project.vs.hours,total_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de proyectos."
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr "Tareas sobrepasadas"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Merge"
+msgstr "Fusionar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
+#: view:project.vs.hours:0
+msgid "Remaining Hours Per Project"
+msgstr "Horas restantes por proyecto"
+
+#. module: project
+#: help:project.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Pie añadido al final del correo electrónico del mensaje de aviso enviado al "
+"cliente cuando una tarea se cierra."
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"A project contains a set of tasks or issues that will be performed by your "
+"resources assigned to it. A project can be hierarchically structured, as a "
+"child of a Parent Project. This allows you to design large project "
+"structures with different phases spread over the project duration cycle. "
+"Each user can set his default project in his own preferences to "
+"automatically filter the tasks or issues he usually works on. If you choose "
+"to invoice the time spent on a project task, you can find project tasks to "
+"be invoiced in the billing section."
+msgstr ""
+"Un proyecto contiene un conjunto de tareas o incidencias que serán "
+"realizadas por los recursos asignados a él. Un proyecto puede estructurarse "
+"jerárquicamente, como hijo de un proyecto padre. Esto le permite diseñar "
+"grandes estructuras de proyecto con distintas fases repartidas en el ciclo "
+"de vida del proyecto. Cada usuario puede establecer su proyecto por defecto "
+"en sus propias preferencias para filtrar automáticamente las tareas o "
+"incidencias en las que normalmente trabaja. Si opta por facturar el tiempo "
+"empleado en una tarea del proyecto, puede encontrar las tareas del proyecto "
+"a facturar en la sección de facturación."
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: project
+#: field:project.task.delegate,state:0
+msgid "Validation State"
+msgstr "Estado de validación"
+
+#. module: project
+#: code:addons/project/project.py:615
+#, python-format
+msgid "Task '%s' cancelled"
+msgstr "Tarea '%s' cancelada"
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr "Trabajo realizado"
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr ""
+"El tiempo estimado para que pueda validar el trabajo realizado por el "
+"usuario a quien se ha delegado esta tarea."
+
+#. module: project
+#: view:project.project:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: project
+#: code:addons/project/project.py:623
+#, python-format
+msgid "The task '%s' is cancelled."
+msgstr "La tarea '%s' está cancelada."
+
+#. module: project
+#: view:project.task.close:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr "Resumen del trabajo"
+
+#. module: project
+#: view:project.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: project
+#: help:project.installer,project_issue:0
+msgid "Automatically synchronizes project tasks and crm cases."
+msgstr "Sincroniza automáticamente tareas de proyecto y casos CRM."
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,type_ids:0
+msgid "Tasks Stages"
+msgstr "Etapas de tareas"
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr "Delegar su tarea a otro usuario"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Pie correo"
+
+#. module: project
+#: field:project.installer,account_budget:0
+msgid "Budgets"
+msgstr "Presupuestos"
+
+#, python-format
+#~ msgid ""
+#~ "A new project has been created !\n"
+#~ "We suggest you to close this one and work on this new project."
+#~ msgstr ""
+#~ "¡Se ha creado un nuevo proyecto!\n"
+#~ "Le sugerimos cerrar éste y trabajar en el nuevo proyecto."
+
+#~ msgid "Tasks Process"
+#~ msgstr "Proceso de tareas"
+
+#~ msgid "New title of the task delegated to the user."
+#~ msgstr "Nuevo título de la tarea delegada al usuario."
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail because the contact for this task (%s) has no email "
+#~ "address!"
+#~ msgstr ""
+#~ "¡No se puede enviar el correo porqué el contacto para esta tarea (%s) no "
+#~ "tiene ninguna dirección de correo electrónico!"
+
+#~ msgid "Change Remaining Hours"
+#~ msgstr "Cambiar horas restantes"
+
+#~ msgid "Close Task"
+#~ msgstr "Cerrar tarea"
+
+#~ msgid "Subproject"
+#~ msgstr "Subproyecto"
+
+#~ msgid "My Running Projects"
+#~ msgstr "Mis proyectos ejecutándose"
+
+#~ msgid "Importance"
+#~ msgstr "Importancia"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "User you want to delegate this task to."
+#~ msgstr "Usuario al que quiere delegar esta tarea."
+
+#~ 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 "Unassigned Tasks"
+#~ msgstr "Tareas no asignadas"
+
+#~ msgid "Task Types"
+#~ msgstr "Tipos de tarea"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid ""
+#~ "Estimated time for you to validate the work done by the user to whom you "
+#~ "delegate this task."
+#~ msgstr ""
+#~ "Tiempo estimado para que pueda validar el trabajo realizado por el usuario "
+#~ "en el cual delega esta tarea."
+
+#~ msgid "Days"
+#~ msgstr "Días"
+
+#~ msgid "Analysis"
+#~ msgstr "Análisis"
+
+#~ msgid "My Draft Tasks"
+#~ msgstr "Mis tareas borrador"
+
+#~ msgid "All Tasks"
+#~ msgstr "Todas las tareas"
+
+#~ msgid "Send Message"
+#~ msgstr "Enviar mensaje"
+
+#~ msgid "All projects"
+#~ msgstr "Todos los proyectos"
+
+#~ msgid "Internal description of the project."
+#~ msgstr "Descripción interna del proyecto."
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Weeks"
+#~ msgstr "Semanas"
+
+#~ msgid "My Current Tasks"
+#~ msgstr "Mis tareas actuales"
+
+#~ msgid "New Project"
+#~ msgstr "Nuevo proyecto"
+
+#~ msgid "Project task type"
+#~ msgstr "Tipo de tarea de proyecto"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
+
+#~ msgid "My Pending Tasks"
+#~ msgstr "Mis tareas pendientes"
+
+#, python-format
+#~ msgid "Operation Done"
+#~ msgstr "Operación realizada"
+
+#~ msgid "Estimated time to close this task by the delegated user."
+#~ msgstr "Tiempo estimado para que el usuario delegado cierre esta tarea."
+
+#~ msgid "Task Details"
+#~ msgstr "Detalles de tarea"
+
+#~ msgid "Trigger Invoice"
+#~ msgstr "Activar factura"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Task type"
+#~ msgstr "Tipo de tarea"
+
+#~ msgid "New Task"
+#~ msgstr "Nueva tarea"
+
+#~ 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 "Project's members"
+#~ msgstr "Miembros del proyecto"
+
+#~ msgid "After task is completed, Create its invoice."
+#~ msgstr "Después que la tarea esté completada, crear su factura."
+
+#~ 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 "Review"
+#~ msgstr "Revisión"
+
+#~ msgid "E-Mails"
+#~ msgstr "Emails"
+
+#~ msgid "Trigger invoices from sale order lines"
+#~ msgstr "Activar facturas desde líneas de pedidos de venta"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid ""
+#~ "New state of your own task. Pending will be reopened automatically when the "
+#~ "delegated task is closed."
+#~ msgstr ""
+#~ "Nuevo estado de su propia tarea. En espera será reabierta automáticamente "
+#~ "cuándo la tarea delegada se cierre."
+
+#~ msgid "Bug"
+#~ msgstr "Error"
+
+#~ msgid "Quotation"
+#~ msgstr "Presupuesto"
+
+#~ 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 "Working Time"
+#~ msgstr "Tiempo trabajado"
+
+#~ msgid "Months"
+#~ msgstr "Meses"
+
+#~ msgid "Delegate this task to a user"
+#~ msgstr "Delegar esta tarea a un usuario"
+
+#~ msgid "Date Closed"
+#~ msgstr "Fecha de cierre"
+
+#~ 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 "Gantt Representation"
+#~ msgstr "Representación de Gantt"
+
+#~ msgid "Task summary"
+#~ msgstr "Resumen de tarea"
+
+#~ msgid "Create a Task"
+#~ msgstr "Crear una tarea"
+
+#~ 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 "Delay"
+#~ msgstr "Retraso"
+
+#~ msgid "Send mail to customer"
+#~ msgstr "Enviar correo al cliente"
+
+#~ msgid "config.compute.remaining"
+#~ msgstr "config.calculo.restante"
+
+#~ msgid "Quiet close"
+#~ msgstr "Cerrar silenciosamente"
+
+#~ msgid "New title of your own task to validate the work done."
+#~ msgstr "Nuevo título de su propia tarea para validar el trabajo realizado."
+
+#~ msgid "Task invoice"
+#~ msgstr "Tarea factura"
+
+#~ msgid "Projects Structure"
+#~ msgstr "Estructura del proyecto"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Tarea delegada"
+
+#~ msgid "New Feature"
+#~ msgstr "Nueva característica"
+
+#~ msgid "Template of Projects"
+#~ msgstr "Plantilla de proyectos"
+
+#~ msgid "Partner Info"
+#~ msgstr "Información de empresa"
+
+#~ msgid "Compute Remaining Hours"
+#~ msgstr "Calcular horas restantes"
+
+#~ msgid "Error ! You can not create recursive projects."
+#~ msgstr "¡Error! No puede crear proyectos recursivos."
+
+#~ msgid "Date Stop: %(date_stop)s"
+#~ msgstr "Fecha de parada: %(date_stop)s"
+
+#~ msgid "Expected End"
+#~ msgstr "Fin previsto"
+
+#~ msgid "Running projects"
+#~ msgstr "Proyectos en ejecución"
+
+#~ msgid ""
+#~ "If you have [?] in the name, it means there are no analytic account linked "
+#~ "to project."
+#~ msgstr ""
+#~ "Si tiene [?] en el nombre, significa que no hay cuenta analítica vinculada "
+#~ "al proyecto."
+
+#~ msgid "Reinclude the description of the task in the task of the user."
+#~ msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario."
+
+#~ 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."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "All Attachments"
+#~ msgstr "Todos los adjuntos"
+
+#~ msgid "My Tasks in Progress"
+#~ msgstr "Mis tareas en progreso"
+
+#~ msgid ""
+#~ "Project management module that track multi-level projects, tasks,\n"
+#~ "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ "    "
+#~ msgstr ""
+#~ "Módulo de gestión de proyectos que permite un seguimiento de proyectos multi-"
+#~ "nivel, las tareas,\n"
+#~ "trabajos sobre las tareas, ... Es capaz de visualizar la planificación, "
+#~ "ordenar tareas, ...\n"
+#~ "    "
+
+#~ msgid "Planned"
+#~ msgstr "Estimado"
+
+#~ msgid "Sum of planned hours of all tasks related to this project."
+#~ msgstr ""
+#~ "Suma de las horas estimadas de todas las tareas relacionadas con este "
+#~ "proyecto."
+
+#~ msgid "Running"
+#~ msgstr "En progreso"
+
+#~ msgid "Tasks in Progress"
+#~ msgstr "Tareas en progreso"
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index 3e6433abe07..8313b419ba2 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -59,7 +59,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Toiming pole lubatud!"
@@ -247,7 +247,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -438,7 +438,7 @@ msgid "Reactivate Project"
 msgstr "Reaktiveeri projekt"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -488,8 +488,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -629,7 +629,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -722,7 +722,7 @@ msgid "Starting Date"
 msgstr "Alguskuupäev"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -747,7 +747,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1149,7 +1149,6 @@ msgstr "Projekti töölaud"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Ülemprojekt"
 
@@ -1179,7 +1178,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1227,7 +1226,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Kui ülesanne on lõpetatud siis see muutub valmis olekusse."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1364,7 +1363,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1416,7 +1415,7 @@ msgid "Open"
 msgstr "Ava"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1743,7 +1742,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1820,7 +1819,7 @@ msgid "Validation State"
 msgstr "Kinnitamise olek"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1848,7 +1847,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -2198,108 +2197,3 @@ msgstr ""
 
 #~ msgid "Date Stop: %(date_stop)s"
 #~ msgstr "Lõppkuupäev: %(date_stop)s"
-
-#~ msgid "My project's planning"
-#~ msgstr "Minu projektide planeerimine"
-
-#~ msgid "Board for project users"
-#~ msgstr "Töölaud projekti kasutajatele"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Ülesannete ootel tööd"
-
-#~ msgid "My Planning"
-#~ msgstr "Minu planeerimine"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Projektijuhi töölaud"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Minu tähtajad"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Kasutaja tööajalehed"
-
-#~ msgid "Project manager board"
-#~ msgstr "Projektijuhi laud"
-
-#~ msgid "My tasks board"
-#~ msgstr "Minu ülesannete laud"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Minu kasutaja ootel tööd"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Minu tööajaleht"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Ülesanded lõpetatud projektijärgi (käesoleval kuul)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Ülesanded suletud Kategooria ja Kasutajajärgi"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Ülesanded lõpetatud projekt ja kasutajajärgi (käesoleval kuul)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Ülesanne suletud"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Ülesanded Projektijärgi"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Müügihaldus - Aruandlus"
-
-#~ msgid "User"
-#~ msgstr "Kasutaja"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Ülesanded Projekti ja Kasutajajärgi"
-
-#~ msgid "This Month"
-#~ msgstr "Käesolev kuu"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Ülesanded projektide ja kasutajatejärgi"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Keskmine sulgemise viivitus"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Ülesanded projektijärgi"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Ülesanded Suletud Projektijärgi"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Ülesanded kasutaja järgi"
-
-#~ msgid "No Task"
-#~ msgstr "Ülesanne puudub"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Tööajaleht / Ülesannete tunnid kuu kaupa"
-
-#~ msgid "Reporting"
-#~ msgstr "Aruandlus"
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Viimase 15 päeva jooksul suletud ülesanded"
-
-#~ msgid "Task Hours"
-#~ msgstr "Ülesande tunnid"
-
-#~ msgid "Task Number"
-#~ msgstr "Tegumi number"
-
-#~ msgid "Task Progress"
-#~ msgstr "Ülesande edenemine"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Suletud ttegumi aruanne"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Töögraafiku tunnid"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Suletud tegumid"
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 390ac349525..78b39b6dea1 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -246,7 +246,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -432,7 +432,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -482,8 +482,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -622,7 +622,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -715,7 +715,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -740,7 +740,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1142,7 +1142,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1172,7 +1171,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1220,7 +1219,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1357,7 +1356,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1406,7 +1405,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1730,7 +1729,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1805,7 +1804,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1833,7 +1832,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 774a9fb8c21..3db27c29f88 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -25,13 +25,13 @@ msgstr "Tehtävät"
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Sisällytä uudelleen tehtävän kuvaus käyttäjän tehtävään"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Tehtävä '%s' on delegoitu käyttäjälle %s."
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -44,20 +44,20 @@ msgstr ""
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Syötä tähän jäljelläolevat tunnit tehtävän suorittamiseksi."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Takarajat"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Toimenpide ei ole sallittu !"
@@ -76,27 +76,27 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:67
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "TARKISTA: "
 
 #. module: project
 #: field:project.installer,project_issue:0
 msgid "Issues Tracker"
-msgstr ""
+msgstr "Tapahtumien seuranta"
 
 #. module: project
 #: field:project.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Tuntilistat"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr ""
+msgstr "Delegoinnit"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "Tarkistettavat tunnit"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -111,21 +111,23 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Jäljellä oleva aika yhteensä, voidaan uudelleenarvioida säännöllisesti "
+"tehtävän suorittajan toimesta."
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Antaa järjestysnumeron näytettäessä projektilistaa"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Uudelleenarviointi tehtävä"
 
 #. module: project
 #: field:project.project,members:0
@@ -135,12 +137,12 @@ msgstr "Projektin jäsenet"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Tehtävä suorittajan mukaan"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: project
 #: view:project.task:0
@@ -158,6 +160,7 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Asiakkaalle lähetettävän tehtävän valmistumisviesti sähköpostin ylätunniste."
 
 #. module: project
 #: view:project.task:0
@@ -167,7 +170,7 @@ msgstr "Omat tehtävät"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
 
 #. module: project
 #: field:project.task,company_id:0
@@ -175,7 +178,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: project
 #: field:project.installer,project_scrum:0
@@ -185,43 +188,43 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
 msgid "Projects: Planned Vs Total hours"
-msgstr ""
+msgstr "Projektin suunnitellut vrt. todelliset kokonais tunnit"
 
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "Varoitusviesti"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Vaiheen nimi"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "Aseta odottamaan"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Päiviä avaamiseen"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Muuta vaihe"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Uusi projekti perustuen pohjaan"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Virhe! Et voi asettaa eskalointia samalle projektille!"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -232,30 +235,30 @@ msgstr "Kiireellinen"
 #. module: project
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Käyttäjä jolle haluat delegoida tämän tehtävän"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Tehtävä '%s' on valmis"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_close
 msgid "Project Close Task"
-msgstr ""
+msgstr "Projektin sulkemistehtävä"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Luonnos tehtävä"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -267,7 +270,7 @@ msgstr "Tehtävä"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Jäsenet"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -275,11 +278,13 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Arvioitu aika tehtävän suorittamiseen, tämän asettaa yleensä "
+"projektipäällikkö kun tehtävä on luonnostilassa."
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projektin tehtävät työt"
 
 #. module: project
 #: view:project.project:0
@@ -291,22 +296,22 @@ msgstr "Muistiinpanot"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Projekti vs. jäljelläolevat tunnit"
 
 #. module: project
 #: view:project.project:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Laskutusosoite"
 
 #. module: project
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Tehtävän yhteenveto"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Ei malli tehtävä"
 
 #. module: project
 #: view:project.task:0
@@ -319,12 +324,16 @@ msgid ""
 "Helps generate invoices based on time spent on tasks, if activated on the "
 "project."
 msgstr ""
+"Auttaa luomaan laskuja tehtäviin käytetyn ajan pohjalta, jos aktivoitu "
+"projektilla."
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Automaattiset muuttujat ylä ja alatunnisteille. Käytä täsmälleen samaa "
+"muotoilua."
 
 #. module: project
 #: selection:project.task,state:0
@@ -338,7 +347,7 @@ msgstr "Peruutettu"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_task_tree
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Omat avoimet tehtävät"
 
 #. module: project
 #: view:project.project:0
@@ -349,7 +358,7 @@ msgstr "Sähköpostin ylätunniste"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Konfiguroi projektinhallinta ohjelmasi"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -359,7 +368,7 @@ msgstr "Tehty tehtävä"
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Tarkistustehtäväsi otsikko"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -376,12 +385,12 @@ msgstr "Tehtävä on valmis"
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Kuukausi   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -393,12 +402,12 @@ msgstr "Muille käyttäjille delegoidut tehtävät"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Laskettu käyttäen sumaana tehtyjen tehtävien määrää."
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -406,6 +415,8 @@ 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 ""
+"Jos valitset tämän, käyttäjälle tulee popup ilmoitus kun suljetaan tehtävä "
+"jossa ehdotetaan sähköpostin lähettämistä asiakkaalle."
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -415,20 +426,21 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testaus"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
+"Suorittavan käyttäjän arvio tehtävän loppuunsuorittamiseen kuluvasta ajasta"
 
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr ""
+msgstr "uudelleenaktivoi projekti"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tehtävä '%s' suljettu"
@@ -475,56 +487,58 @@ msgstr "Kumppani"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopio)"
 
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Seuraa ja auttaa työntekijöitä syöttämään ja tarkistamaan tuntilistoja ja "
+"läsnäoloja."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "tehtävien määrä"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Edellinen"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "uudelleenarvioi tehtävä"
 
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Määritelty käyttäjälle"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Pysäytyspäivä %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "aseta projektiksi"
 
 #. module: project
 #: selection:project.vs.hours,state:0
@@ -534,7 +548,7 @@ msgstr "Sapluuna"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "Määrittely"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -544,23 +558,23 @@ msgstr "Omat projektit"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Seuraava"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "Luonnostilasta avoin tilaan"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "Päivien määrä"
 
 #. module: project
 #: help:project.task,active:0
@@ -573,7 +587,7 @@ msgstr ""
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
+msgstr "Prosenttiosuun suljetuista tehtävistä kokonaistehtävämäärän mukaan"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -589,39 +603,39 @@ msgstr "Projekti tehtävä"
 #. module: project
 #: view:project.installer:0
 msgid "Methodologies"
-msgstr ""
+msgstr "Metodit"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Laskettu: käytetty aika + jäljelläoleva aika"
 
 #. module: project
 #: help:project.task.close,partner_email:0
 msgid "Email Address of Customer"
-msgstr ""
+msgstr "Asiakkaan sähköpostiosoite"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Todelliset tunnit"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Arviointitehtävän otsikko"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Uudelleenarvioi"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Lähetä sähköpostia tehtävän sulkemisen jälkeen"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -648,12 +662,12 @@ msgstr "Jäljellä olevat tunnit"
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "Tehtävän tyot"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_board_note_tree
 msgid "Public Notes"
-msgstr ""
+msgstr "Julkiset tiedotteet"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -664,12 +678,12 @@ msgstr "Suunnitellut tunnit"
 #: code:addons/project/wizard/project_task_close.py:86
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Tehtävä '%s' on suljettu"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Ei määritellyt tehtävät käyttäjille"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -677,11 +691,13 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Summa projektin tehtäviin suunniteltujen tuntien määrästä mukaanlukien "
+"alaprojektit."
 
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Delegoinnin otsikko"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -696,13 +712,13 @@ msgstr "Lisätiedot"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: project
 #: field:project.task,date_start:0
@@ -711,7 +727,7 @@ msgid "Starting Date"
 msgstr "Aloituspäivämäärä"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -725,7 +741,7 @@ msgstr "Projektit"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Vaihe"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -736,10 +752,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Tehtävä '%s' on avattu."
 
 #. module: project
 #: view:project.task:0
@@ -749,12 +765,12 @@ msgstr "Päivämäärät"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Tehtävän uusi otsikko joka delegoitiin käyttäjälle."
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Kuukausi-1    "
 
 #. module: project
 #: view:project.installer:0
@@ -762,21 +778,23 @@ msgid ""
 "Various OpenERP applications are available to manage your projects with "
 "different level of control and flexibility."
 msgstr ""
+"Monia OpenERP ohjelmia on saatavilla projektiesi hallintaan eritasoisilla "
+"seuranta ja joustavuusominaisuuksilla."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projekti vs. suunnitellut ja kokonaistunnit"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Luonnos avaa tehtävä"
 
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Käyttäjä: %(user_id)s"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -788,23 +806,23 @@ msgstr "Viivästyneet tunnit"
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Tehtäväanalyysi"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Tehtävät käyttäjittäin ja projekteittain"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegoi"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Projektien mallipohjat"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -829,30 +847,30 @@ msgstr ""
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Oma työpöytä"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:79
 #, python-format
 msgid "Please specify the email address of Project Manager."
-msgstr ""
+msgstr "Määrittele projektipäällikön sähköpostiosoite"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektinhallinta"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projektitehtävän suorittaja (delegaatti)"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -869,12 +887,12 @@ msgstr "Tehtävät"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "vanhempi"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Tehtävän delegointi"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -892,17 +910,17 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: project
 #: field:project.task,progress:0
@@ -922,13 +940,13 @@ msgstr ""
 #. module: project
 #: help:project.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Laskettu: käytetty aika / kokonaisaika"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -939,7 +957,7 @@ msgstr "Projektin tehtävät"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Tehtävän vaihe"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -953,44 +971,44 @@ msgstr "Suunnitellut tunnit"
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Aseta mallipohjaksi"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Tila: (state)s"
 
 #. module: project
 #: field:project.installer,project_long_term:0
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Pitkän aikavälin suunnittelu"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspvm"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Ylätason tehtävät"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Varoita kumppania"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Vuosi  "
 
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: project
 #: view:project.task:0
@@ -1001,17 +1019,18 @@ msgstr "Tiedot"
 #: help:project.installer,account_budget:0
 msgid "Helps accountants manage analytic and crossover budgets."
 msgstr ""
+"Auttaa kirjanpitäjiä hallitsemaan analyyttisiä ja ristikkäisiä budjetteja."
 
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteetti"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Ylläpito"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
@@ -1021,12 +1040,12 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Oma tehtävä"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Jäsen"
 
 #. module: project
 #: view:project.task:0
@@ -1036,7 +1055,7 @@ msgstr "Projekti tehtävät"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1047,7 +1066,7 @@ msgstr ""
 #: selection:report.project.task.user,state:0
 #: selection:task.by.days,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1058,12 +1077,12 @@ msgstr "Matala"
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Suorituskyky"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Omien tehtävien määräajat"
 
 #. module: project
 #: view:project.project:0
@@ -1081,23 +1100,23 @@ msgstr "Projektipäällikkö"
 #: selection:report.project.task.user,state:0
 #: selection:task.by.days,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottava"
 
 #. module: project
 #: view:project.task:0
 msgid "Task Edition"
-msgstr ""
+msgstr "Tehtävän muokkaus"
 
 #. module: project
 #: 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 "Vaiheet"
 
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: project
 #: view:project.project:0
@@ -1111,11 +1130,13 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Oman tehtäväsi tila. Odottava avataan uudelleen automaattisesti kun "
+"delegoitu tehtävä on suljettu"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: project
 #: help:project.installer,project_scrum:0
@@ -1123,29 +1144,30 @@ msgid ""
 "Implements and tracks the concepts and task types defined in the SCRUM "
 "methodology."
 msgstr ""
+"Toteuttaa ja seuraa konsepteja ja tehtävätyyppejä jotka on määritelty SCRUM "
+"metodeissa"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Päivää sulkemiseen"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Projektin työpöytä"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Ylätason projekti"
 
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -1155,38 +1177,38 @@ msgstr "Määritä vaatimukset ja aseta suunnitellut tunnit."
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: project
 #: field:project.task.close,partner_email:0
 msgid "Customer Email"
-msgstr ""
+msgstr "Asiakkaan sähköpostiosoite"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Projekti '%s' on suljettu"
 
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "Tehtävän muokkaus"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: project
 #: help:project.task.close,manager_warn:0
 msgid "Warn Manager by Email"
-msgstr ""
+msgstr "Varoita päällikköä sähköpostitse"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1196,7 +1218,7 @@ msgstr "Avaa tehtävä"
 #. module: project
 #: field:project.task.close,manager_email:0
 msgid "Manager Email"
-msgstr ""
+msgstr "Päällikön sähköpostiosoite"
 
 #. module: project
 #: help:project.project,active:0
@@ -1204,22 +1226,24 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Jos aktiivisen kentän tilaksi asetetaan epätosi (false), se mahdollistaa "
+"projektin piilottamisen poistamatta sitä."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Yritykset"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "kun tehtävä on valmistunut, se muuttuu valmis tilaan."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Projekti '%s' on avattu."
 
 #. module: project
 #: field:project.task.work,date:0
@@ -1229,14 +1253,14 @@ msgstr "Päivämäärä"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Työpöytä"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:79
@@ -1255,7 +1279,7 @@ msgstr "Käyttäjän projektit"
 #. module: project
 #: field:project.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1273,7 +1297,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Päivien määrä tehtävän avaamiseen"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1283,12 +1307,12 @@ msgstr "Delegoitu"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Annettu tehtäväksi"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1298,7 +1322,7 @@ msgstr "Delegoidut tehtävät"
 #. module: project
 #: field:project.installer,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Saada asiat tehtyä"
 
 #. module: project
 #: help:project.project,members:0
@@ -1310,7 +1334,7 @@ msgstr ""
 #. module: project
 #: help:project.task.close,partner_warn:0
 msgid "Warn Customer by Email"
-msgstr ""
+msgstr "Varoita asiakasta sähköpostitse"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -1326,7 +1350,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
 msgid "Month works"
-msgstr ""
+msgstr "Kuukauden työt"
 
 #. module: project
 #: field:project.project,priority:0
@@ -1334,7 +1358,7 @@ msgstr ""
 #: field:project.task,sequence:0
 #: field:project.task.type,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: project
 #: view:project.task:0
@@ -1344,7 +1368,7 @@ msgstr ""
 #: field:report.project.task.user,state:0
 #: field:task.by.days,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1355,10 +1379,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr ""
+msgstr "Tehtävä '%s' asetus menossa"
 
 #. module: project
 #: view:project.project:0
@@ -1395,7 +1419,7 @@ msgstr "Peruuta"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1404,11 +1428,13 @@ msgid "Open"
 msgstr "Avaa"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
 msgstr ""
+"Et voi poistaa projekteja jolla on tehtäviä, suosittelen ottamaan sen pois "
+"käytöstä."
 
 #. module: project
 #: view:project.project:0
@@ -1427,7 +1453,7 @@ msgstr "Käynnissä"
 #: code:addons/project/wizard/project_task_close.py:82
 #, python-format
 msgid "Please specify the email address of Customer."
-msgstr ""
+msgstr "Ole hyvä ja määritä asiakkaan sähköpostiosoite"
 
 #. module: project
 #: view:project.task:0
@@ -1438,22 +1464,22 @@ msgstr "Uudelleen aktivoi"
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr ""
+msgstr "Lähetä sähköposti"
 
 #. module: project
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Nykyinen aktiviteetti"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Hae projektia"
 
 #. module: project
 #: help:project.installer,project_gtd:0
@@ -1465,14 +1491,14 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projekti verrattuna tunteihin"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1484,12 +1510,12 @@ msgstr "Erittäin vähäinen"
 #: field:project.project,warn_manager:0
 #: field:project.task.close,manager_warn:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Varoita päällikköä"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Ylitetty aikaraja"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1497,6 +1523,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Tähän projektiin liittyvien tehtävien ja alatason projektien käytetty "
+"kokonaistuntimäärä."
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1504,11 +1532,13 @@ msgid ""
 "Computed as difference of the time estimated by the project manager and the "
 "real time to close the task."
 msgstr ""
+"Laskettu erotuksena projektipäällikön arvion ja projektin valmistumiseen "
+"kuluneen todellisen ajan mukaan"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Uudelleenarvioi tehtävä"
 
 #. module: project
 #: help:project.installer,project_long_term:0
@@ -1516,21 +1546,23 @@ msgid ""
 "Enables long-term projects tracking, including multiple-phase projects and "
 "resource allocation handling."
 msgstr ""
+"Mahdollistaa pitkäaikaisten projektien seurannan mukaanlukien monivaiheiset "
+"projektit ja resurssien allokoinnin."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Kehitys"
 
 #. module: project
 #: field:project.installer,project_timesheet:0
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Tehtävien laskutettava aika"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Omat jäljelläolevat tunnit projekteittain"
 
 #. module: project
 #: field:project.task,description:0
@@ -1555,24 +1587,24 @@ msgstr "Kiireellinen"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task"
-msgstr ""
+msgstr "Tarkastustehtävä"
 
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Tehtävät yhteensä"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Omat delegoidut tehtävät"
 
 #. module: project
 #: view:project.project:0
@@ -1583,12 +1615,12 @@ msgstr "Tehtävä: %(name)s"
 #: model:ir.actions.act_window,name:project.action_project_installer
 #: view:project.installer:0
 msgid "Project Application Configuration"
-msgstr ""
+msgstr "Projekti ohjelmiston konfiguraatio"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Määritä tehtävä käyttäjälle"
 
 #. module: project
 #: field:project.project,effective_hours:0
@@ -1599,12 +1631,12 @@ msgstr "Kulutettu aika"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "Omat laskutettavat tilit"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1617,6 +1649,8 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
+"Jos valitset tämän kentän, projektipäällikkö vastaanottaa pyynnön joka kerta "
+"kun hänen tiiminsä saa valmiiksi tehtävän."
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -1624,34 +1658,35 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Tämän projektin tehtävien ja alatason projektieen kokonaistuntimäärä."
 
 #. module: project
 #: help:project.task.close,manager_email:0
 msgid "Email Address of Project's Manager"
-msgstr ""
+msgstr "Projektipäällikön sähköpostiosoite"
 
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Asiakas"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days
 #: view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Tehtävä päivien mukaan"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:111
@@ -1659,37 +1694,39 @@ msgstr ""
 msgid ""
 "Couldn't send mail! Check the email ids and smtp configuration settings"
 msgstr ""
+"Sähköpostia ei voitu lähettää. Tarkista sähköpostiosoitteet ja smtp "
+"konfiguraatio (sähköpostipalvelinasetukset)"
 
 #. module: project
 #: field:project.task.close,partner_warn:0
 msgid "Warn Customer"
-msgstr ""
+msgstr "Varoita asiakasta"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Syötä työtuntisi"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Päivien määrä tehtävän valmistumiseksi"
 
 #. module: project
 #: view:board.board:0
 msgid "My Projects: Planned vs Total Hours"
-msgstr ""
+msgstr "Omat projektit: suunnitellut tunnit verrattuna kokonaistunteihin"
 
 #. module: project
 #: model:ir.model,name:project.model_project_installer
@@ -1699,7 +1736,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1710,28 +1747,28 @@ msgstr "Käytetyt tunnit"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Muut"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Avaa valmiiksimerkitty tehtävä"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Projektin aikayksikkö"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Käytetyt tunnit"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Tehtävä '%s' on odottavassa tilassa."
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1744,7 +1781,7 @@ msgstr "Tunnit yhteensä"
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä projektilistaa."
 
 #. module: project
 #: field:project.task,id:0
@@ -1754,23 +1791,23 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Ohitetut tehtävät"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr ""
+msgstr "Yhdistä"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Jäljelläolevat tunnit projekteittain"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1778,6 +1815,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Vakioviesti lisätään asiakkaalle lähetettävän tehtävän sulkemisesta kertovan "
+"sähköpostin alkuun."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1800,13 +1839,13 @@ msgstr "Kokonaisaika"
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "Tarkistuksen tila"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "Tehtävä '%s' on peruttu"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -1819,22 +1858,24 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Arvioitu aika joka käytetään tehtävän tehneen työn tarkistamiseen (henkilö "
+"jolle delegoit tehtävän)"
 
 #. module: project
 #: view:project.project:0
 msgid "Manager"
-msgstr ""
+msgstr "Päällikkö"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Tehtävä '%s' on peruttu"
 
 #. module: project
 #: view:project.task.close:0
@@ -1849,18 +1890,18 @@ msgstr "Työn yhteenveto"
 #. module: project
 #: view:project.installer:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: project
 #: help:project.installer,project_issue:0
 msgid "Automatically synchronizes project tasks and crm cases."
-msgstr ""
+msgstr "Synkronoi automaattisesti projektin tehtävät ja crm tapaukset."
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,type_ids:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Tehtävien vaiheet"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1876,7 +1917,7 @@ msgstr "Sähköpostiviestin alatunnite"
 #. module: project
 #: field:project.installer,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Budjetit"
 
 #~ msgid "Close Task"
 #~ msgstr "Sulje tehtävä"
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 6fa5786727d..6b57de99e8f 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-23 19:17+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-07-24 04:34+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -1001,7 +1001,7 @@ msgstr "Étape de tâche"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr "Heures planifiés"
+msgstr "Heures planifiées"
 
 #. module: project
 #: view:project.project:0
@@ -2295,90 +2295,3 @@ msgstr "Budgets"
 
 #~ msgid "Subproject"
 #~ msgstr "Sous-projet"
-
-#~ msgid "My project's planning"
-#~ msgstr "Mon planning de projets"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Pipeline des taches"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Tableau de bord de gestion de projet"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Mes dates limites"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Feuille de présence de l'utilisateur"
-
-#~ msgid "Project manager board"
-#~ msgstr "Tableau du responsable projet"
-
-#~ msgid "My tasks board"
-#~ msgstr "Mon tableau de tâches"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Mon pipeline"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Tâches terminées par projet (ce mois)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Tâches Fermées par Projet et Utilisateur"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Tâches terminées par projet et par utilisateur (ce mois)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Tâches Fermées"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Tâches par Projet"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Gestion des ventes - Rapports"
-
-#~ msgid "User"
-#~ msgstr "Utilisateur"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Tâches par Projet et Utilisateur"
-
-#~ msgid "This Month"
-#~ msgstr "Ce mois"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Tâches par projets et utilisateurs"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Delai moy de fermeture"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Tâches par projet"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Tâches Fermées par Projet"
-
-#~ msgid "Reporting"
-#~ msgstr "Reporting"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Tâches terminées"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Rapport des tâches terminées"
-
-#~ msgid "Task Number"
-#~ msgstr "Numéro de tâche"
-
-#~ msgid "Board for project users"
-#~ msgstr "Tableau de bord pour les utilisateurs de projet"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Ma feuille de présence"
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr "Donne la séquence à l'affichage d'une liste de tâches"
-
-#~ msgid "Scheduling"
-#~ msgstr "Planification"
diff --git a/addons/project/i18n/gl.po b/addons/project/i18n/gl.po
index c678589cac0..7052dc0db8a 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -242,7 +242,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -428,7 +428,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -478,8 +478,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -618,7 +618,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -711,7 +711,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -736,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1138,7 +1138,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1168,7 +1167,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1216,7 +1215,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1353,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1402,7 +1401,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1726,7 +1725,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1801,7 +1800,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1829,7 +1828,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index c73cce5612d..efc9c66ee4a 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: project
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -60,7 +60,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -248,7 +248,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -439,7 +439,7 @@ msgid "Reactivate Project"
 msgstr "Ponovno Aktivirajte Projekt"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -489,8 +489,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -630,7 +630,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -723,7 +723,7 @@ msgid "Starting Date"
 msgstr "Početni Datum"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -748,7 +748,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1150,7 +1150,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Matični Projekt"
 
@@ -1180,7 +1179,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1228,7 +1227,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Kada je zadatak izvršen, doći će u stanje \"Gotovo\""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1365,7 +1364,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1417,7 +1416,7 @@ msgid "Open"
 msgstr "Otvori"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1743,7 +1742,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1820,7 +1819,7 @@ msgid "Validation State"
 msgstr "Stanje Vrednovanja"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1848,7 +1847,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -2184,90 +2183,3 @@ msgstr ""
 
 #~ msgid "Expected End"
 #~ msgstr "Očekivani kraj"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Izvršeni zadaci prema Projektu (Ovaj mjesec)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Zadatak zaključen prema Projektu i Korisniku"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Izvršeni Zadaci prema Projektu i Korisniku (Ovaj mjesec)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Zadatak zaključen"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Zadaci prema Projektu"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Upravljanje Prodajom - Izvještavanje"
-
-#~ msgid "User"
-#~ msgstr "Korisnik"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Zadaci prema Projektu i Korisniku"
-
-#~ msgid "This Month"
-#~ msgstr "Ovaj mjesec"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Zadaci prema Projektima i Korisnicima"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Prosječno kašnjenje zaključivanja"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Zadaci prema Projektu"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Zadaci zaključeni prema Projektu"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Zadaci prema Korisniku"
-
-#~ msgid "No Task"
-#~ msgstr "Nema Zadatka"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Izvještaj o Zadacima prema korisniku za projekte"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Raspored / Zadaci u satima po mjesecu"
-
-#~ msgid "Reporting"
-#~ msgstr "Izvještavanje"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Daje statistike o Zadacima prema Korisniku na projektima radi provjere "
-#~ "slijeda zadataka korisnika."
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Zadaci zaključeni u proteklih 15 dana"
-
-#~ msgid "Task Hours"
-#~ msgstr "Zadatak u satima"
-
-#~ msgid "Task Number"
-#~ msgstr "Broj Zadatka"
-
-#~ msgid "report.timesheet.task.user"
-#~ msgstr "report.timesheet.task.user"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "Raspored / Zadaci u satima po mjesecu"
-
-#~ msgid "Task Progress"
-#~ msgstr "Progres Zadatka"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Izvještaj o zaključenju Zadatka"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Sati Rasporeda"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Zaključeni Zadaci"
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 494e8536f07..08777fcc511 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-08 16:17+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "'%s' feladat átruházásra került %s-ra/re."
@@ -63,7 +64,7 @@ msgid "Deadlines"
 msgstr "Határidők"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Nem engedélyezett művelet!"
@@ -253,7 +254,7 @@ msgid "Day"
 msgstr "Nap"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "'%s' feladat elkészült"
@@ -449,7 +450,7 @@ msgid "Reactivate Project"
 msgstr "Projekt újraaktíválása"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "'%s' feladat lezárásra került"
@@ -499,8 +500,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (másolat)"
@@ -647,7 +648,7 @@ msgid "Reevaluate"
 msgstr "Újraértékelés"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "E-mail küldése a feladat lezárása után"
@@ -742,7 +743,7 @@ msgid "Starting Date"
 msgstr "Kezdési dátum"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -767,7 +768,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "'%s' feladat megnyitásra került."
@@ -1187,7 +1188,6 @@ msgstr "Projekt vezérlőpult"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Főprojekt"
 
@@ -1217,7 +1217,7 @@ msgid "Customer Email"
 msgstr "Vevői e-mail"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "'%s' projekt lezárásra került."
@@ -1265,7 +1265,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Amikor a feladat befejeződik, kész állapotba kerül."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "'%s' projekt megnyitásra került."
@@ -1417,7 +1417,7 @@ msgstr ""
 "lezárásához szükséges napok átlagos számát, stb."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "'%s' feladat folyamatban állapotba beállításra került"
@@ -1469,7 +1469,7 @@ msgid "Open"
 msgstr "Nyitott"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1807,7 +1807,7 @@ msgid "Spent Hours"
 msgstr "Eltöltött órák"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "'%s' feladat függőben lévő."
@@ -1884,7 +1884,7 @@ msgid "Validation State"
 msgstr "Jóváhagyás állapota"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "'%s' feladat törlésre került"
@@ -1914,7 +1914,7 @@ msgid "Create Date"
 msgstr "Létrehozás dátuma"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "'%s' feladat törlésre került."
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index 3cf7ac32f97..870ccf889a2 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -1874,9 +1873,3 @@ msgstr ""
 #: field:project.installer,account_budget:0
 msgid "Budgets"
 msgstr ""
-
-#~ msgid "This Month"
-#~ msgstr "Bulan Ini"
-
-#~ msgid "Reporting"
-#~ msgstr "Pelaporan"
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 75e7b3b9a73..d03192323bb 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-17 06:56+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Ri-include la descrizione dell'attività nell'attività dell'utente"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "L'attività '%s' è stata affidata a %s."
@@ -61,7 +61,7 @@ msgid "Deadlines"
 msgstr "Scadenze"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operazione Non Permessa !"
@@ -252,7 +252,7 @@ msgid "Day"
 msgstr "Giorno"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "L'attività '%s' è completata"
@@ -447,7 +447,7 @@ msgid "Reactivate Project"
 msgstr "Riattiva Progetto"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Attività '%s' chiusa"
@@ -497,8 +497,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -642,7 +642,7 @@ msgid "Reevaluate"
 msgstr "Rivaluta"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Manda email dopo la chiusura dell'attività"
@@ -737,7 +737,7 @@ msgid "Starting Date"
 msgstr "Data di inizio"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -766,7 +766,7 @@ msgstr ""
 "risoluzione delle attività o problematiche."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "L'attività '%s' è aperta."
@@ -1188,7 +1188,6 @@ msgstr "Dashboard Progetti"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Progetto genitore"
 
@@ -1218,7 +1217,7 @@ msgid "Customer Email"
 msgstr "Email del cliente"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "Il progetto '%s' è stato chiuso."
@@ -1268,7 +1267,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Quando l'attività sarà completata, diverrà in stato completato."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "Il progetto '%s' è stato aperto."
@@ -1424,7 +1423,7 @@ msgstr ""
 "chiudere un'attività, ecc."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Attività '%s' impostata come \"In Corso\""
@@ -1476,7 +1475,7 @@ msgid "Open"
 msgstr "Aperto"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1815,7 +1814,7 @@ msgid "Spent Hours"
 msgstr "Ore impiegate"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "L'attività '%s' è in sospeso."
@@ -1901,7 +1900,7 @@ msgid "Validation State"
 msgstr "Stato Convalida"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Attività '%s' annullata"
@@ -1931,7 +1930,7 @@ msgid "Create Date"
 msgstr "Data creazione"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "L'attività '%s' è annullata."
@@ -2259,72 +2258,6 @@ msgstr "Budget"
 #~ msgid "Working Time"
 #~ msgstr "Orario di Lavoro"
 
-#~ msgid "My project's planning"
-#~ msgstr "La MIa Pianificazione Progetti"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Flusso Attività"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Dashboard Project manager"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Le Mie Scadenze"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Orari di Lavoro dell'Utente"
-
-#~ msgid "Project manager board"
-#~ msgstr "Dashboard Project Manager"
-
-#~ msgid "My tasks board"
-#~ msgstr "Scheda Le Mie Attività"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Flusso del Mio Utente"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Attività concluse per progetto (questo mese)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Attività Chiuse per Progetto e Utente"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Attività concluse per progetto e utente (questo mese)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Attività Chiusa"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Attività per Progetto"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Gestione vendite - Segnalazione"
-
-#~ msgid "User"
-#~ msgstr "Utente"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Attività per Progetto e Utente"
-
-#~ msgid "This Month"
-#~ msgstr "Questo Mese"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Attività per Progetti e Utenti"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Ritardo Medio di Chiusura"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Attività per Progetto"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Attività Chiuse per Progetto"
-
-#~ msgid "Reporting"
-#~ msgstr "Reportistica"
-
 #~ msgid ""
 #~ "If you have [?] in the project name, it means there are no analytic account "
 #~ "linked to this project."
@@ -2347,60 +2280,6 @@ msgstr "Budget"
 #~ "Se hai [?] nel nome, significa che non ci sono conti analitici collegati al "
 #~ "progetto."
 
-#~ msgid "My Planning"
-#~ msgstr "Le Mie Pianificazioni"
-
-#~ msgid "Board for project users"
-#~ msgstr "Tabola per utenti del progetto"
-
-#~ msgid "No Task"
-#~ msgstr "Nessuna attività"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Il mio Timesheet"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Attività per utente"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Timesheet / Ore Attività per mese"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Ore Timesheet"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Chiudi il report delle attività"
-
-#~ msgid "Task Progress"
-#~ msgstr "Avanzamento dell'attività"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "Report: Timesheet/Ore attività per mese"
-
-#~ msgid "report.timesheet.task.user"
-#~ msgstr "report.timesheet.task.user"
-
-#~ msgid "Task Number"
-#~ msgstr "Numero attività"
-
-#~ msgid "Task Hours"
-#~ msgstr "Ore attività"
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Attività chiusa per essere passati 15 giorni."
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Fornisce statistiche sulle attività per utente sui progetti per controllare "
-#~ "le code di utenti"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Report sulle attività per utente per progetto"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Attività chiuse"
-
 #~ msgid ""
 #~ "Project management module that track multi-level projects, tasks,\n"
 #~ "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
@@ -2411,62 +2290,3 @@ msgstr "Budget"
 #~ "lavoro fatto per una attività, eso. E' in grado di disegnare un Planning, "
 #~ "ordinare attività, eso.\n"
 #~ "    "
-
-#~ msgid "Scheduling"
-#~ msgstr "Pianificazione"
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr "Stabilisce l'ordine in cui visualizzare una lista di attività"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the project "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Se viene selezionato il campo attivo, sarà possibile nascondere il progetto "
-#~ "senza rimuoverlo."
-
-#~ msgid ""
-#~ "Define here the steps that will be used on the project from the creation of "
-#~ "the task, up to the closing of the task or issue. You will use these stages "
-#~ "in order to track the progress of the resolution of a task or an issue."
-#~ msgstr ""
-#~ "Definire qui i passi che saranno usati nel progetto a partire dalla "
-#~ "creazione dell'attività fino alla chiusura dell'attività o del problema. "
-#~ "Queste fasi saranno usate per tracciare il progresso della risoluzione di "
-#~ "una attività o di un problema."
-
-#~ msgid ""
-#~ "A task represents a work that has to be done. Each user works in his own "
-#~ "list of tasks where he can record his task work in hours. He can work and "
-#~ "close the task itself or delegate it to antoher user. If you delegate a task "
-#~ "to another user, you get a new task in pending state, which will be re-"
-#~ "opened when you have to review the work achieved. If you install the "
-#~ "project_timesheet module, tasks works can be invoiced based on the project "
-#~ "configuration. With the project_mrp module, sales orders can create tasks "
-#~ "automatically when they are confirmed."
-#~ msgstr ""
-#~ "Un'attività rappresenta un lavoro che deve essere fatto. Ogni utente lavora "
-#~ "alla propria lista di attività dove può segnare il proprio lavoro in ore. "
-#~ "Può lavorare e chiudere l'attività lui stesso oppure delegarla ad un altro "
-#~ "utente. Se si delega un'attività ad un altro utente, si ottiene un'attività "
-#~ "nello stato 'in sospeso', che sarà riaperta al momento di esaminare il "
-#~ "lavoro realizzato. Se si installa il modulo project_timesheet, i lavori "
-#~ "delle attività possono essere fatturati sulla base della configurazione del "
-#~ "progetto. Con il modulo project_mrp, gli ordini di vendita possono creare "
-#~ "automaticamente le attività quando confermati."
-
-#~ msgid ""
-#~ "A project contains a set of tasks or issues that will be performed by your "
-#~ "resources assigned on it. A project can be put into a hierarchy, as a child "
-#~ "of a Parent Project. This allows you to  design large project structure with "
-#~ "different phases spread over the project duration cycle. Each user can set "
-#~ "his default project in his own preferences, in order to filter automatically "
-#~ "the tasks or issues he usually works on."
-#~ msgstr ""
-#~ "Un progetto contiene un insieme di attività o problemi che saranno eseguite "
-#~ "dalle risorse assegnategli. Un progetto può essere messo in una gerarchia, "
-#~ "come figlio di un progetto genitore. Questo permetto di progettare un'ampia "
-#~ "struttura di progetto con diverse fasi spalmate sul ciclo di durata del "
-#~ "progetto. Ogni utente può impostare il proprio progetto di default nelle "
-#~ "proprie preferenze, al fine di filtrare automaticamente le attività o i "
-#~ "problemi su cui lavora solitamente."
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 3aec5fef5e0..29f6944390c 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -60,7 +60,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "오퍼레이션이 허용되지 않음!"
@@ -245,7 +245,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -431,7 +431,7 @@ msgid "Reactivate Project"
 msgstr "프로젝트를 다시 활성화"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "과제 '%s' 완료됨"
@@ -481,8 +481,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -621,7 +621,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -714,7 +714,7 @@ msgid "Starting Date"
 msgstr "시작 날짜"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -739,7 +739,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1141,7 +1141,6 @@ msgstr "프로젝트 대시보드"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "파트너 프로젝트"
 
@@ -1171,7 +1170,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1219,7 +1218,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "과제가 완료되면, '완료' 상태가 됩니다."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1356,7 +1355,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "진행 중인 과제 '%s'"
@@ -1407,7 +1406,7 @@ msgid "Open"
 msgstr "열기"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1731,7 +1730,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1806,7 +1805,7 @@ msgid "Validation State"
 msgstr "검증 상태"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "과제 '%s' 취소됨"
@@ -1834,7 +1833,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -2162,36 +2161,3 @@ msgstr ""
 
 #~ msgid "All projects"
 #~ msgstr "모든 프로젝트들"
-
-#~ msgid "My project's planning"
-#~ msgstr "내 프로젝트 계획"
-
-#~ msgid "Board for project users"
-#~ msgstr "프로젝트 사용자 위원회"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "과제 파이프라인"
-
-#~ msgid "My Planning"
-#~ msgstr "내 계획"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "프로젝트 매니저 대시보드"
-
-#~ msgid "My Deadlines"
-#~ msgstr "내 마감시한"
-
-#~ msgid "User's timesheets"
-#~ msgstr "사용자 타임시트"
-
-#~ msgid "Project manager board"
-#~ msgstr "프로젝트 매니저 보드"
-
-#~ msgid "My tasks board"
-#~ msgstr "내 과제 보드"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "내 사용자 파이프라인"
-
-#~ msgid "My Timesheet"
-#~ msgstr "내 타임시트"
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index b7e2846c9e8..b9595c015ff 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -60,7 +60,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Veiksmas neleidžiamas!"
@@ -248,7 +248,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -440,7 +440,7 @@ msgid "Reactivate Project"
 msgstr "Atnaujinti projektą"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -490,8 +490,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -631,7 +631,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -724,7 +724,7 @@ msgid "Starting Date"
 msgstr "Pradžios data"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -749,7 +749,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1151,7 +1151,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Tėvinis projektas"
 
@@ -1181,7 +1180,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1229,7 +1228,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Kai užduotis atliekama, jos būsena tampa - atlikta."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1367,7 +1366,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1419,7 +1418,7 @@ msgid "Open"
 msgstr "Veikianti"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1747,7 +1746,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1824,7 +1823,7 @@ msgid "Validation State"
 msgstr "Patvirtinimo būsena"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1852,7 +1851,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index 04122c42117..3dbe0406fbd 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Ievietot uzdevuma aprakstu lietotāja uzdevumā"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "Uzdevums '%s' tika deliģēts %s."
@@ -60,7 +60,7 @@ msgid "Deadlines"
 msgstr "Termiņi"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Darbība nav atļauta!"
@@ -249,7 +249,7 @@ msgid "Day"
 msgstr "Diena"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "Uzdevums '%s' izpildīts"
@@ -443,7 +443,7 @@ msgid "Reactivate Project"
 msgstr "Aktivizēt Projektu no jauna"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Uzdevums '%s' pabeigts"
@@ -493,8 +493,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Kļūda! Nedrīkst veidot rekursīvus analītiskos kontus"
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
@@ -637,7 +637,7 @@ msgid "Reevaluate"
 msgstr "Pārvērtēt"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Nosūtīt e-pastu pēc uzdevumu pabeigšanas"
@@ -732,7 +732,7 @@ msgid "Starting Date"
 msgstr "Sākuma Datums"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -760,7 +760,7 @@ msgstr ""
 "uzdevuma izpildes progresam."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "Uzdevums '%s' nav pabeigts"
@@ -1183,7 +1183,6 @@ msgstr "Projekta tāfele"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "VirsProjekts"
 
@@ -1213,7 +1212,7 @@ msgid "Customer Email"
 msgstr "Klienta e-pasts"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "Projekts '%s' ir pabeigts."
@@ -1263,7 +1262,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Kad uzdevums ir paveikts, tas tiek atzīmēts kā paveikts."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "Projets '%s' ir sākts"
@@ -1412,7 +1411,7 @@ msgstr ""
 "vidējos darba uzdevumu izpildes termiņu rādītājus."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Uzdevuma '%s' progress"
@@ -1464,7 +1463,7 @@ msgid "Open"
 msgstr "Atvērt"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1802,7 +1801,7 @@ msgid "Spent Hours"
 msgstr "Iztērētās stundas"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "Uzdevums '%s' neizlemts."
@@ -1886,7 +1885,7 @@ msgid "Validation State"
 msgstr "Apstiprinājuma Statuss"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Uzdevums '%s' atcelts"
@@ -1916,7 +1915,7 @@ msgid "Create Date"
 msgstr "Izveidošanas datums"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "Uzdevums '%s' ir atcelts."
@@ -2258,9 +2257,3 @@ msgstr "Budžeti"
 
 #~ msgid "My Pending Tasks"
 #~ msgstr "Mani Uzdevumi (Gaida)"
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr "Ļauj attēlot uzdevumu sarakstu secībā pēc kārtas"
-
-#~ msgid "Scheduling"
-#~ msgstr "Plānošana"
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 4b3f8f84aa9..ef864360d05 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "The task '%s' has been delegated to %s."
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr "Үргэлжлэх хугацаа"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Үйлдлийг зөвшөөрөөгүй!"
@@ -243,7 +243,7 @@ msgid "Day"
 msgstr "Өдөр"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "'%s' дууссан даалгавар"
@@ -430,7 +430,7 @@ msgid "Reactivate Project"
 msgstr "Төслийг дахин нээх"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Хаагдсан '%s' даалгавар"
@@ -480,8 +480,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (хувилах)"
@@ -620,7 +620,7 @@ msgid "Reevaluate"
 msgstr "Дахин үнэлэх"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -713,7 +713,7 @@ msgid "Starting Date"
 msgstr "Эхлэл Огноо"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -738,7 +738,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "Нээсэн '%s' даалгавар"
@@ -1145,7 +1145,6 @@ msgstr "Төслийн самбар"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Толгой төсөл"
 
@@ -1175,7 +1174,7 @@ msgid "Customer Email"
 msgstr "Үйлчлүүлэгчийн Эмэйл"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "Төсөл '%s' хаагдлаа."
@@ -1223,7 +1222,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Даалгавар дууссан үед дууссан төлөвтэй болно."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "Төсөл '%s' нээгдлээ."
@@ -1360,7 +1359,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Даалгавар '%s' явц"
@@ -1409,7 +1408,7 @@ msgid "Open"
 msgstr "Нээх"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1734,7 +1733,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "Даалгавар '%s' хүлээгдэж байна."
@@ -1811,7 +1810,7 @@ msgid "Validation State"
 msgstr "Батлагдсан төлөв"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Даалгавар '%s' цуцлагдсан."
@@ -1839,7 +1838,7 @@ msgid "Create Date"
 msgstr "Үүсэх огноо"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "Даалгавар '%s'-г цуцалсан."
@@ -1889,12 +1888,6 @@ msgstr "Төсөв"
 #~ msgid "Contact"
 #~ msgstr "Харьцах хүн"
 
-#~ msgid "User"
-#~ msgstr "Хэрэглэгч"
-
-#~ msgid "This Month"
-#~ msgstr "Энэ сар"
-
 #~ msgid "Change Remaining Hours"
 #~ msgstr "Үлдсэн цагийг засах"
 
@@ -2051,45 +2044,6 @@ msgstr "Төсөв"
 #~ msgid "Running projects"
 #~ msgstr "Явж байгаа төслүүд"
 
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Төслийн менежерийн самбар"
-
-#~ msgid "My Planning"
-#~ msgstr "Миний төлөвлөгөө"
-
-#~ msgid "Task Closed"
-#~ msgstr "Даалгавар хаагдсан"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Даалгаврууд, төслөөр"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Борлуулалтын удирдлага - Тайлан"
-
-#~ msgid "Reporting"
-#~ msgstr "Тайлан"
-
-#~ msgid "No Task"
-#~ msgstr "Даалгавар байхгүй"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Хаагдсан даалгаврууд"
-
-#~ msgid "Task Number"
-#~ msgstr "Даалгаврын дугаар"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Хаагдсан даалгаврын тайлан"
-
-#~ msgid "Task Progress"
-#~ msgstr "Даалгаврын явц"
-
-#~ msgid "report.timesheet.task.user"
-#~ msgstr "report.timesheet.task.user"
-
-#~ msgid "Task Hours"
-#~ msgstr "Даалгаврын хугацаа"
-
 #~ msgid "My Tasks in Progress"
 #~ msgstr "Миний идэвхитэй даалгаврууд"
 
@@ -2137,42 +2091,3 @@ msgstr "Төсөв"
 
 #~ msgid "Task invoice"
 #~ msgstr "Даалгаврын тооцоо"
-
-#~ msgid "My project's planning"
-#~ msgstr "Миний төслийн төлөвлөгөө"
-
-#~ msgid "Board for project users"
-#~ msgstr "Төслийн гишүүдийн самбар"
-
-#~ msgid "My tasks board"
-#~ msgstr "Миний даалгавруудын самбар"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Миний хуваарь"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Төслөөс хаасан ажлууд"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Даалгаврууд, хэрэглэгчээр"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Сар бүрийн хуваарь ба даалгаварын хугацаа"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Хуваарийн хугацаа"
-
-#~ msgid "Task "
-#~ msgstr "Даалгавар "
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
-
-#~ msgid "is Done."
-#~ msgstr "Дууссан."
-
-#~ msgid "Scheduling"
-#~ msgstr "Төлөвлөгөө"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index d3b60b71b45..2cba8c54a3e 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,10 +28,10 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Oppgaven '%s' er tildelt til %s."
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -49,7 +49,7 @@ msgstr ""
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Legg inn antall timer som trengs for å avslutte oppgaven"
 
 #. module: project
 #: view:project.task:0
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr "Tidsfrister"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operasjon er ikke tillatt !"
@@ -245,7 +245,7 @@ msgid "Day"
 msgstr "Dag"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "Oppgaven '%s' er ferdig"
@@ -437,7 +437,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Task '%s' lukket"
@@ -487,8 +487,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (kopi)"
@@ -627,7 +627,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Send e-post etter at oppgave er lukket"
@@ -722,7 +722,7 @@ msgid "Starting Date"
 msgstr "Startdato"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -747,7 +747,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1149,7 +1149,6 @@ msgstr "Prosjektkonsoll"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Overordnet prosjekt"
 
@@ -1179,7 +1178,7 @@ msgid "Customer Email"
 msgstr "Kundens e-post"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1227,7 +1226,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Når oppgaven er fullført vil den få status ferdig"
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1372,7 +1371,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1424,7 +1423,7 @@ msgid "Open"
 msgstr "Åpne"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1756,7 +1755,7 @@ msgid "Spent Hours"
 msgstr "Timer brukt"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1833,7 +1832,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Oppgave '%s' er kansellert"
@@ -1861,7 +1860,7 @@ msgid "Create Date"
 msgstr "Opprettet dato"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 18b4f553ef2..8a4c2a29018 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "De omschrijving van de taak heropnemen in de taak van de gebruiker"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "De taak '%s' is gedelegeerd aan %s."
@@ -61,7 +61,7 @@ msgid "Deadlines"
 msgstr "Deadlines"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operatie niet toegestaan !"
@@ -250,7 +250,7 @@ msgid "Day"
 msgstr "Dag"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "De taak '%s' is gereed"
@@ -445,7 +445,7 @@ msgid "Reactivate Project"
 msgstr "Heractiveer project"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Taak '%s' gesloten"
@@ -495,8 +495,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Fout! U kunt geen recursieve kostenplaatsen maken."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (kopie)"
@@ -639,7 +639,7 @@ msgid "Reevaluate"
 msgstr "Herevalueren"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Email sturen na sluiting taak"
@@ -734,7 +734,7 @@ msgid "Starting Date"
 msgstr "Begindatum"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -762,7 +762,7 @@ msgstr ""
 "het verloop van een taak of probleem te volgen."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "De taak '%s' is geopend."
@@ -1182,7 +1182,6 @@ msgstr "Project dashboard"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Hoofdproject"
 
@@ -1212,7 +1211,7 @@ msgid "Customer Email"
 msgstr "Klant email"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "Het project '%s' is gesloten."
@@ -1262,7 +1261,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Wanneer taak is afgerond, komt deze in de status Voltooid"
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "Het project '%s' is geopend."
@@ -1414,7 +1413,7 @@ msgstr ""
 "een taak, etc."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Taak '%s' in behandeling genomen"
@@ -1467,7 +1466,7 @@ msgid "Open"
 msgstr "Open"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1807,7 +1806,7 @@ msgid "Spent Hours"
 msgstr "Gewerkte uren"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "De taak '%s' is wachtend."
@@ -1892,7 +1891,7 @@ msgid "Validation State"
 msgstr "Bevestigingsstatus"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Taak '%s' afgebroken"
@@ -1922,7 +1921,7 @@ msgid "Create Date"
 msgstr "Datum gemaakt"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "De taak '%s' is geannuleerd."
@@ -2274,123 +2273,3 @@ msgstr "Budgetten"
 
 #~ msgid "Running projects"
 #~ msgstr "Lopende projecten"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Aankomende taken"
-
-#~ msgid "Board for project users"
-#~ msgstr "Dashboard voor projectleden"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Gesloten taken per project en gebruiker"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Mijn urenstaat"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Mijn verwachte taken"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Afgeronde taken per project (deze maand)"
-
-#~ msgid "This Month"
-#~ msgstr "Huidige maand"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Afgeronde taken per project en gebruiker (deze maand)"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Taken per project"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Verkoopbeheer - Rapportage"
-
-#~ msgid "User"
-#~ msgstr "Gebruiker"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Taken per project en gebruiker"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Taken per projecten en gebruikers"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Overzicht taken per gebruiker voor projecten"
-
-#~ msgid "No Task"
-#~ msgstr "Geen taak"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Afgesloten taken per project"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Taken per project"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Gem. afsluitvertraging"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Projectleider dashboard"
-
-#~ msgid "My project's planning"
-#~ msgstr "Mijn projectplanning"
-
-#~ msgid "My Planning"
-#~ msgstr "Mijn planning"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Urenstaten gebruikers"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Mijn termijnen"
-
-#~ msgid "Project manager board"
-#~ msgstr "Projectleider dashboard"
-
-#~ msgid "My tasks board"
-#~ msgstr "Mijn taken-dashboard"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Urenstaat uren"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Geeft statistieken op taken per gebruiker op projecten om de aankomende "
-#~ "taken van gebruikers te controleren."
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "Urenstaat/taakuren per maand rapportage"
-
-#~ msgid "report.timesheet.task.user"
-#~ msgstr "report.timesheet.task.user"
-
-#~ msgid "Task Closed"
-#~ msgstr "Taak gesloten"
-
-#~ msgid "Reporting"
-#~ msgstr "Rapportering"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Urenstaat / taakuren per maand"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Gesloten taken rapportage"
-
-#~ msgid "Task Progress"
-#~ msgstr "Taakvoortgang"
-
-#~ msgid "Task Number"
-#~ msgstr "Taaknummer"
-
-#~ msgid "Task Hours"
-#~ msgstr "Taakuren"
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Gesloten taken in de afgelopen 15 dagen"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Gesloten taken"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Taken per gebruiker"
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index 7ea8849da5c..f8e11682628 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index d65e33dd74c..a56ebf019c4 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Wstawiaj opis zadania do zadania użytkownika"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "Zadanie '%s' zostało przekazane dla %s."
@@ -60,7 +60,7 @@ msgid "Deadlines"
 msgstr "Termin"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Niedozwolona operacja !"
@@ -249,7 +249,7 @@ msgid "Day"
 msgstr "Dzień"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "Zadanie '%s' wykonano"
@@ -443,7 +443,7 @@ msgid "Reactivate Project"
 msgstr "Reaktywuj projekt"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Zadanie '%s' zamknięto"
@@ -493,8 +493,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
@@ -636,7 +636,7 @@ msgid "Reevaluate"
 msgstr "Ponownie oszacuj"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Wyślij wiadomość po zamknięciu zadania"
@@ -730,7 +730,7 @@ msgid "Starting Date"
 msgstr "Data rozpoczęcia"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -758,7 +758,7 @@ msgstr ""
 "zadania."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "Zadanie '%s' jest otwarte."
@@ -1181,7 +1181,6 @@ msgstr "Konsola projektu"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Projekt nadrzędny"
 
@@ -1211,7 +1210,7 @@ msgid "Customer Email"
 msgstr "Adres klienta"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "Projekt '%s' został zamknięty."
@@ -1261,7 +1260,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Kiedy zadanie jest wypełnione, to przechodzi w stan Wykonano."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "Projekt '%s' został otwarty."
@@ -1408,7 +1407,7 @@ msgstr ""
 "planowanych, średnie czasy do otwarcia lub zamknięcia zadań."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Zadanie '%s' ustawiono na stan 'W toku'"
@@ -1460,7 +1459,7 @@ msgid "Open"
 msgstr "Otwórz"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1794,7 +1793,7 @@ msgid "Spent Hours"
 msgstr "Przepracowane godziny"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "Zadanie '%s' jest w stanie Oczekiwanie."
@@ -1878,7 +1877,7 @@ msgid "Validation State"
 msgstr "Stan zatwierdzenia"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Zadanie '%s' anulowano"
@@ -1908,7 +1907,7 @@ msgid "Create Date"
 msgstr "Data utworzenia"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "Zadanie '%s' zostało anulowane."
@@ -2241,126 +2240,3 @@ msgstr "Budżety"
 
 #~ msgid "Date Stop: %(date_stop)s"
 #~ msgstr "Data zakończenia: %(date_stop)s"
-
-#~ msgid "My project's planning"
-#~ msgstr "Planowanie mojego projektu"
-
-#~ msgid "Board for project users"
-#~ msgstr "Konsola dla użytkowników projektu"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Przepływ zadań"
-
-#~ msgid "My Planning"
-#~ msgstr "Moje planowania"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Konsola Menedżera projektów"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Moje terminy"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Karty czasu pracy użytkownika"
-
-#~ msgid "Project manager board"
-#~ msgstr "Konsola Menedżera projektu"
-
-#~ msgid "My tasks board"
-#~ msgstr "Konsola moich zadań"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Moje przepływy zadań"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Moja karta czasu pracy"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Zadania zakończone wg projektów (ten miesiąc)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Zadania zamknięte wg projektu i użytkownika"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Zakończone zadania wg projektu i użytkownika (ten miesiąc)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Zadania zamknięte"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Zadania wg projektu"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Sprzedaż - Raportowanie"
-
-#~ msgid "User"
-#~ msgstr "Użytkownik"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Zadania wg projektu i użytkownika"
-
-#~ msgid "This Month"
-#~ msgstr "W tym miesiącu"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Zadania wg projektów i użytkowników"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Śred. opóźnienie"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Zadania wg projektu"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Zamknięte zadania wg projektu"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Zadania wg użytkownika"
-
-#~ msgid "No Task"
-#~ msgstr "Brak zadań"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Raport zadań wg użytkowników"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Karta czasu pracy / Czasy zadań na miesiąc"
-
-#~ msgid "Reporting"
-#~ msgstr "Raportowanie"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Pokaże statystykę zadań wg użytkownika na projekt do sprawdzania przepływu "
-#~ "użytkownika."
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Zadania zamknięte w ostatnich 15stu dniach"
-
-#~ msgid "Task Hours"
-#~ msgstr "Godziny zadania"
-
-#~ msgid "Task Number"
-#~ msgstr "Numer zadania"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "Raport godzin kart/zadań wg miesięcy"
-
-#~ msgid "Task Progress"
-#~ msgstr "Postęp zadania"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Raport zamkniętych zadań"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Godziny karty czasu pracy"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Zadania zamknięte"
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr "Określa kolejność zadań w listach"
-
-#~ msgid "Scheduling"
-#~ msgstr "Planowanie"
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index ffd6415345f..268534e898c 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "A tarefa '%s' foi atribuída a %s."
@@ -58,7 +58,7 @@ msgid "Deadlines"
 msgstr "Prazos"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operação Não Permitida !"
@@ -247,7 +247,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "A tarefa '%s' está concluída"
@@ -439,7 +439,7 @@ msgid "Reactivate Project"
 msgstr "Reactivar projecto"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tarefa '%s' fechada"
@@ -489,8 +489,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Erro! Não pode criar contas analíticas recursivamente"
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -630,7 +630,7 @@ msgid "Reevaluate"
 msgstr "Reavaliar"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Enviar mensagem após o fecho da tarefa"
@@ -723,7 +723,7 @@ msgid "Starting Date"
 msgstr "Data Inicial"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -748,7 +748,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "A tarefa '%s' está em aberto"
@@ -1150,7 +1150,6 @@ msgstr "Painel de projecto"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Projecto Ascendente"
 
@@ -1180,7 +1179,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1229,7 +1228,7 @@ msgstr ""
 "Quando a tarefa é completada, irá aparecer dentro do estado concluído."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "O projeto '%s' foi aberto."
@@ -1368,7 +1367,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tarefa '%s' definida em progresso"
@@ -1420,7 +1419,7 @@ msgid "Open"
 msgstr "Abrir"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1748,7 +1747,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1825,7 +1824,7 @@ msgid "Validation State"
 msgstr "Estado de Validação"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tarefa '%s' cancelada"
@@ -1853,7 +1852,7 @@ msgid "Create Date"
 msgstr "Data de criação"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -2064,63 +2063,6 @@ msgstr "Orçamentos"
 #~ msgid "New title of your own task to validate the work done."
 #~ msgstr "Novo título da sua própria tarefa para validar o trabalho feito."
 
-#~ msgid "My project's planning"
-#~ msgstr "Meus planeamentos de projectos"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Encanamento de tarefas"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Painel de administração de projecto"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Meus prazos"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Folha de presença do utilizador"
-
-#~ msgid "Project manager board"
-#~ msgstr "Quadro de gestão de projecto"
-
-#~ msgid "My tasks board"
-#~ msgstr "Meu quadro de tarefas"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Fila do meu utilizador"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Tarefas fechados por projecto e utilizador"
-
-#~ msgid "Task Closed"
-#~ msgstr "Tarefa fechado"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Tarefas por projecto"
-
-#~ msgid "User"
-#~ msgstr "Utilizador"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Tarefas por projecto e utilizador"
-
-#~ msgid "This Month"
-#~ msgstr "Este mês"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Tarefas por projectos e utilizadores"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Avg atraso do fecho"
-
-#~ msgid "Tasks by project"
-#~ msgstr "tarefas por projectos"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Tarefas fechadas por projecto"
-
-#~ msgid "Reporting"
-#~ msgstr "Relatório"
-
 #~ msgid "Tasks Process"
 #~ msgstr "Processo de Tarefas"
 
@@ -2263,12 +2205,3 @@ msgstr "Orçamentos"
 
 #~ msgid "Running projects"
 #~ msgstr "Projectos em execução"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index f0f4985cb68..3ba453713f0 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Recolocar a descrição da tarefa na tarefa do usuário"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "A tarefa '%s' foi atríbuida para %s."
@@ -63,7 +63,7 @@ msgid "Deadlines"
 msgstr "Prazos finais"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operação Não Permitida !"
@@ -102,14 +102,14 @@ msgstr "Delegações"
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Horas a Validar"
+msgstr "Horas para Validar"
 
 #. module: project
 #: field:project.project,progress_rate:0
 #: view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr "Andamento"
+msgstr "Progresso"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -143,7 +143,7 @@ msgstr "Membros do Projeto"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Tarefas para delegar"
+msgstr "Tarefas por responsáveis"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -237,7 +237,7 @@ msgstr "Erro! Você não pode atribuir escalas para o mesmo projeto!"
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Very urgent"
-msgstr "Urgentíssimo"
+msgstr "Muito Urgente"
 
 #. module: project
 #: help:project.task.delegate,user_id:0
@@ -252,7 +252,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "A tarefa '%s' está concluída"
@@ -265,7 +265,7 @@ msgstr "Tarefa de Projeto Concluída"
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr "Rascunho de Tarefa"
+msgstr "Tarefa em Rascunho"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -313,17 +313,17 @@ msgstr "Endereço de Faturamento"
 #. module: project
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr "Resumo da Tarefa"
+msgstr "Sumário da Tarefa"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr "Não é uma Tarefa de Modelo"
+msgstr "Não é uma Tarefa Modelo"
 
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr "Início da Tarefa"
+msgstr "Iniciar Tarefa"
 
 #. module: project
 #: help:project.installer,project_timesheet:0
@@ -331,8 +331,8 @@ msgid ""
 "Helps generate invoices based on time spent on tasks, if activated on the "
 "project."
 msgstr ""
-"Ajuda a gerar faturas baseado no tempo gasto em tarefas, se ativado no "
-"projeto."
+"Ajuda a gerar documentos fiscais baseado no tempo gasto em tarefas, se "
+"ativado no projeto."
 
 #. module: project
 #: view:project.project:0
@@ -370,7 +370,7 @@ msgstr "Configure o Aplicativo de Gerenciamento de Projeto"
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr "Tarefa concluida"
+msgstr "Tarefa Concluida"
 
 #. module: project
 #: help:project.task.delegate,prefix:0
@@ -433,7 +433,7 @@ msgstr "res.users"
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr "Em teste"
+msgstr "Testando"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
@@ -443,10 +443,10 @@ msgstr "Tempo Estimado para o usuário concluir esta tarefa a ele atribuída"
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr "Reativar projeto"
+msgstr "Reativar Projeto"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tarefa '%s' concluída"
@@ -460,7 +460,7 @@ msgstr "Conta Analítica"
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr "Realizado por"
+msgstr "Concluído por"
 
 #. module: project
 #: view:project.task:0
@@ -472,7 +472,7 @@ msgstr "Planejamento"
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "Prazo limite"
+msgstr "Prazo Limite"
 
 #. module: project
 #: view:project.task.close:0
@@ -496,8 +496,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Erro! Você não pode criar contas analíticas recursivas"
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -559,7 +559,7 @@ msgstr "Especificação"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr "Meus projetos"
+msgstr "Meus Projetos"
 
 #. module: project
 #: constraint:res.company:0
@@ -629,7 +629,7 @@ msgstr "Endereço de Email do Cliente"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr "Horas efetivas"
+msgstr "Horas Efetivas"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -642,7 +642,7 @@ msgid "Reevaluate"
 msgstr "Reavaliar"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Enviar Email após conclusão da tarefa"
@@ -737,7 +737,7 @@ msgid "Starting Date"
 msgstr "Data de Início"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -765,7 +765,7 @@ msgstr ""
 "acompanhar o progresso na resolução de uma tarefa ou um problema."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "A tarefa '%s' está aberta."
@@ -993,7 +993,7 @@ msgstr "Estágios de Tarefas"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr "Horas planejadas"
+msgstr "Horas Planejadas"
 
 #. module: project
 #: view:project.project:0
@@ -1108,7 +1108,7 @@ msgstr "Desempenho"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr "Meus prazos finais de tarefas"
+msgstr "Meus Prazos de Tarefas"
 
 #. module: project
 #: view:project.project:0
@@ -1177,17 +1177,16 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr "Dias para concluir"
+msgstr "Dias para Fechar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Painel de projeto"
+msgstr "Painel de Projeto"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Projeto Pai"
 
@@ -1217,7 +1216,7 @@ msgid "Customer Email"
 msgstr "Email do Cliente"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "O Projeto '%s' foi concluído."
@@ -1240,7 +1239,7 @@ msgstr "Avisar Gerente por Email"
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr "Abrir tarefa"
+msgstr "Abrir Tarefa"
 
 #. module: project
 #: field:project.task.close,manager_email:0
@@ -1267,7 +1266,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Quando uma tarefa é completada, se converte no estado Concluida."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "O projeto '%s' foi aberto."
@@ -1301,7 +1300,7 @@ msgstr "Erro"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr "Projetos do usuário"
+msgstr "Projetos do Usuário"
 
 #. module: project
 #: field:project.installer,progress:0
@@ -1419,7 +1418,7 @@ msgstr ""
 "as planejadas, o número médio de dias para abrir e fechar uma tarefa, etc."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tarefa '%s' definida como Em Andamento"
@@ -1471,7 +1470,7 @@ msgid "Open"
 msgstr "Aberto"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1488,7 +1487,7 @@ msgstr "ID: %(task_id)s"
 #: selection:report.project.task.user,state:0
 #: selection:task.by.days,state:0
 msgid "In Progress"
-msgstr "Em andamento"
+msgstr "Em Progresso"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:82
@@ -1505,12 +1504,12 @@ msgstr "Reativar"
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr "Enviar email"
+msgstr "Enviar Email"
 
 #. module: project
 #: view:res.users:0
 msgid "Current Activity"
-msgstr "Atividade atual"
+msgstr "Atividade Atual"
 
 #. module: project
 #: field:project.task,user_id:0
@@ -1810,7 +1809,7 @@ msgid "Spent Hours"
 msgstr "Horas Gastas"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "A tarefa '%s' está pendente."
@@ -1896,7 +1895,7 @@ msgid "Validation State"
 msgstr "Estado de validação"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tarefa '%s' cancelada"
@@ -1926,7 +1925,7 @@ msgid "Create Date"
 msgstr "Data de Criação"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "A tarefa '%s' está cancelada."
@@ -2260,111 +2259,6 @@ msgstr "Orçamentos"
 #~ msgid "My Current Tasks"
 #~ msgstr "Minhas Tarefas Atuais"
 
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Reporting"
-#~ msgstr "Relatórios"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Painel de Gerência de Projeto"
-
-#~ msgid "My project's planning"
-#~ msgstr "Meu planejamento do projeto"
-
-#~ msgid "My Planning"
-#~ msgstr "Meu Planejamento"
-
-#~ msgid "Board for project users"
-#~ msgstr "Quadro para usuários do projeto"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Tarefas Encerradas por Projeto e Usuário"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Planilha de horas do usuário"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Meus Prazos Finais"
-
-#~ msgid "My tasks board"
-#~ msgstr "Meu quadro de tarefas"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Minha Planilha de Horas"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Tarefas concluídas por projeto (este mês)"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Tarefas finalizadas por projeto e usuário (este mês)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Tarefas Encerradas"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Tarefas por Projeto"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Gerenciamento de Vendas - Relatório"
-
-#~ msgid "User"
-#~ msgstr "Usuário"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Tarefas por Projeto e Usuário"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Tarefas por projeto e usuário"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Atraso Médio no Encerramento"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Relatório para projetos de tarefas por usuário"
-
-#~ msgid "No Task"
-#~ msgstr "Nenhuma tarefa"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Tarefas por Usuário"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Tarefas Encerradas por Projeto"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Tarefas por projeto"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Planilha de Horas / Horas por Tarefa por Mês"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Quantidade de Horas da Planilha de Horas"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Tarefas Encerradas"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Relatório de Tarefas Encerradas"
-
-#~ msgid "Task Progress"
-#~ msgstr "Progresso da Tarefa"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "Relatório de Planilha de Horas/Horas-Tarefa por Mês"
-
-#~ msgid "Task Number"
-#~ msgstr "Número da Tarefa"
-
-#~ msgid "Task Hours"
-#~ msgstr "Horas-Tarefa"
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Tarefas Encerradas a menos de 15 Dias"
-
-#~ msgid "Project manager board"
-#~ msgstr "Quadro de Gestão do Projeto"
-
 #~ msgid ""
 #~ "Project's member. Not used in any computation, just for information purpose."
 #~ msgstr ""
@@ -2372,82 +2266,3 @@ msgstr "Orçamentos"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the project "
-#~ "without removing it."
-#~ msgstr ""
-#~ "Se o campo ativo é definido como verdadeiro, permite a você esconder o "
-#~ "projeto sem removê-lo."
-
-#~ msgid ""
-#~ "Define here the steps that will be used on the project from the creation of "
-#~ "the task, up to the closing of the task or issue. You will use these stages "
-#~ "in order to track the progress of the resolution of a task or an issue."
-#~ msgstr ""
-#~ "Defina aqui as etapas que serão utilizadas no projeto na criação da tarefa, "
-#~ "até a conclusão da tarefa ou problema. Você utilizará estes estágios para "
-#~ "acompanhar o progresso da resolução de uma tarefa ou problema."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "A task represents a work that has to be done. Each user works in his own "
-#~ "list of tasks where he can record his task work in hours. He can work and "
-#~ "close the task itself or delegate it to antoher user. If you delegate a task "
-#~ "to another user, you get a new task in pending state, which will be re-"
-#~ "opened when you have to review the work achieved. If you install the "
-#~ "project_timesheet module, tasks works can be invoiced based on the project "
-#~ "configuration. With the project_mrp module, sales orders can create tasks "
-#~ "automatically when they are confirmed."
-#~ msgstr ""
-#~ "Uma tarefa representa um trabalho que precisa ser feito. Cada usuário "
-#~ "trabalha com sua própria lista de tarefas onde ele pode registrar suas horas "
-#~ "de trabalho. Ele pode trabalhar e concluir tarefas ou atribuí-las para outro "
-#~ "usuário. Se você atribuir uma tarefa para outro usuário, você recebe uma "
-#~ "nova tarefa com status pendente, que será reaberta quando você tiver "
-#~ "revisado o trabalho repassado. Se você instalar o módulo "
-#~ "\"project_timesheet\", tarefas trabalhadas pode ser faturadas baseado na "
-#~ "configuração do projeto. Com o módulo \"project_mrp\", pedidos podem criar "
-#~ "tarefas automaticamente quando confirmados."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Gives the sequence order when displaying a list of task"
-#~ msgstr "Fornece a ordem sequencial ao exibir uma lista de tarefas"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo precisa ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regra precisa ter ao menos um direito de acesso marcado."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regras não são suportadas por objetos osv_memory !"
-
-#~ msgid "Scheduling"
-#~ msgstr "Agendamento"
-
-#~ msgid ""
-#~ "A project contains a set of tasks or issues that will be performed by your "
-#~ "resources assigned on it. A project can be put into a hierarchy, as a child "
-#~ "of a Parent Project. This allows you to  design large project structure with "
-#~ "different phases spread over the project duration cycle. Each user can set "
-#~ "his default project in his own preferences, in order to filter automatically "
-#~ "the tasks or issues he usually works on."
-#~ msgstr ""
-#~ "Um projeto contém uma definição de tarefas ou problemas que serão realizados "
-#~ "pelos recursos associados a ele. Um projeto pode estar em uma hierarquia, "
-#~ "como um filho de um Projeto Pai. Isto permite desenvolver estruturas de "
-#~ "projeto de grandes dimensões com diferentes fases distribuídos ao longo da "
-#~ "duração do projeto. Cada usuário pode definir seus projetos padrão nas suas "
-#~ "preferências, a fim de filtrar automaticamente as tarefas ou problemas com "
-#~ "os quais trabalha usualmente."
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index 179b7cd32b1..094d3feb7e0 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operație nepermisă !"
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr "Zi"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 5bb466d30cd..679d33f190f 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr "Включить описание задания в задание пользователя"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "Задание '%s' было назначено  %s"
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr "Сроки"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Недопустимая операция!"
@@ -247,7 +247,7 @@ msgid "Day"
 msgstr "День"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "Задание '%s' выполнено"
@@ -441,7 +441,7 @@ msgid "Reactivate Project"
 msgstr "Возобновить проект"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Задание '%s' завершено"
@@ -491,8 +491,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -632,7 +632,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -725,7 +725,7 @@ msgid "Starting Date"
 msgstr "Дата начала"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -750,7 +750,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1152,7 +1152,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Основной проект"
 
@@ -1182,7 +1181,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1230,7 +1229,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "После завершения задания установить для него статус \"Выполнено\"."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1368,7 +1367,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Задание '%s' в состоянии \"Выполняется\""
@@ -1421,7 +1420,7 @@ msgid "Open"
 msgstr "Открыть"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1749,7 +1748,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1826,7 +1825,7 @@ msgid "Validation State"
 msgstr "Состояние проверки"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Задание '%s' отменено"
@@ -1854,7 +1853,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index 1c65b3b4f5c..85c7e6fb429 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -242,7 +242,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -428,7 +428,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -478,8 +478,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -618,7 +618,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -711,7 +711,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -736,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1138,7 +1138,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1168,7 +1167,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1216,7 +1215,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1353,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1402,7 +1401,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1726,7 +1725,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1801,7 +1800,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1829,7 +1828,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index cdd9474da1c..9655b687ef9 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr "Začetni datum"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr "Odpri"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -1966,63 +1965,3 @@ msgstr ""
 
 #~ msgid "Running"
 #~ msgstr "V teku"
-
-#~ msgid "My Planning"
-#~ msgstr "Moje načrtovanje"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Moja časovnica"
-
-#~ msgid "User"
-#~ msgstr "Uporabnik"
-
-#~ msgid "This Month"
-#~ msgstr "Ta mesec"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Naloge po uporabniku"
-
-#~ msgid "No Task"
-#~ msgstr "Brez naloge"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Poročilo po nalogah po uporabnikih za projekte"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Ure na mesec po časovnici/nalogi"
-
-#~ msgid "Reporting"
-#~ msgstr "Poročanje"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Prikaže statistiko nalog po uporabnikih na projektih za preverjanje čakalne "
-#~ "vrste po uporabnikih."
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Naloge zaprte v zadnjih 15-ih dnevih"
-
-#~ msgid "Task Hours"
-#~ msgstr "Ure po nalogi"
-
-#~ msgid "Task Number"
-#~ msgstr "Številka naloge"
-
-#~ msgid "report.timesheet.task.user"
-#~ msgstr "report.timesheet.task.user"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "Poročilo o urah na mesec po časovnici/nalogi"
-
-#~ msgid "Task Progress"
-#~ msgstr "Napredek opravila"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Poročilo o zaključenih nalogah"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "Ure po časovnici"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Zaključene naloge"
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 225d27f3299..780b30c2413 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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -242,7 +242,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -428,7 +428,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -478,8 +478,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -618,7 +618,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -711,7 +711,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -736,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1138,7 +1138,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1168,7 +1167,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1216,7 +1215,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1353,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1402,7 +1401,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1726,7 +1725,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1801,7 +1800,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1829,7 +1828,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 0de3e17eef4..d73ac6923fa 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -59,7 +59,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operation Not Permitted !"
@@ -248,7 +248,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -439,7 +439,7 @@ msgid "Reactivate Project"
 msgstr "Återaktivera projektet"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Task '%s' closed"
@@ -489,8 +489,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -629,7 +629,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -722,7 +722,7 @@ msgid "Starting Date"
 msgstr "Startdatum"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -747,7 +747,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1149,7 +1149,6 @@ msgstr "Projekt dashboard"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Överliggande projekt"
 
@@ -1179,7 +1178,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1227,7 +1226,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "När aktiviteten är avslutad sätts status till klar."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1364,7 +1363,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Task '%s' set in progress"
@@ -1416,7 +1415,7 @@ msgid "Open"
 msgstr "Öppna"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1743,7 +1742,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1820,7 +1819,7 @@ msgid "Validation State"
 msgstr "Granskningsstatus"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Task '%s' cancelled"
@@ -1848,7 +1847,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -2166,39 +2165,6 @@ msgstr ""
 #~ msgid "Expected End"
 #~ msgstr "Förväntat slutdatum"
 
-#~ msgid "My project's planning"
-#~ msgstr "Mina projekts planering"
-
-#~ msgid "Board for project users"
-#~ msgstr "Dashboard för projektanvändare"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Aktiviteter i pipeline"
-
-#~ msgid "My Planning"
-#~ msgstr "Min planering"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Projektledare dashboard"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Mina deadlines"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Användares tidrapporter"
-
-#~ msgid "Project manager board"
-#~ msgstr "Projektledarens dashboard"
-
-#~ msgid "My tasks board"
-#~ msgstr "Dashboard för mina aktiviteter"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Mina användares pipeline"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Min tidrapport"
-
 #, python-format
 #~ msgid ""
 #~ "Couldn't send mail because the contact for this task (%s) has no email "
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 3eef827796a..56577ced268 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 9d7dc26c728..8253777bedf 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -245,7 +245,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -435,7 +435,7 @@ msgid "Reactivate Project"
 msgstr "Projeyi Canlandır"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -485,8 +485,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -625,7 +625,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -718,7 +718,7 @@ msgid "Starting Date"
 msgstr "Başlangıç Tarihi"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -743,7 +743,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1145,7 +1145,6 @@ msgstr "Proje Panosu"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Ana Proje"
 
@@ -1175,7 +1174,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1223,7 +1222,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Görev sona erince tamamlanmış duruma geçecektir."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1360,7 +1359,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1409,7 +1408,7 @@ msgid "Open"
 msgstr "Açık"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1733,7 +1732,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1808,7 +1807,7 @@ msgid "Validation State"
 msgstr "Onay Durumu"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1836,7 +1835,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -2132,72 +2131,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Hesaplanan : Toplam Süre - Tahmini Süre . It gives the difference of the "
 #~ "time estimated by the project manager and the real time to close the task."
-
-#~ msgid "My project's planning"
-#~ msgstr "Proje Planlamam"
-
-#~ msgid "Board for project users"
-#~ msgstr "Proje kullanıcıları masası"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Görev gidişatı"
-
-#~ msgid "My Planning"
-#~ msgstr "Planlamam"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Proje Yöteticisi alanı"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Benim Bitirme tarihlerim"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Kullanıcının Zaman Çizelgesi"
-
-#~ msgid "Project manager board"
-#~ msgstr "Proje Yöneticileri"
-
-#~ msgid "My tasks board"
-#~ msgstr "Görevlerimin panosu"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Kullanıcımın proje önerisi"
-
-#~ msgid "My Timesheet"
-#~ msgstr "Zaman çizelgem"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Satış Yönetimi - Raporlama"
-
-#~ msgid "User"
-#~ msgstr "Kullanıcı"
-
-#~ msgid "This Month"
-#~ msgstr "Bu Ay"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Ort. Kapanış Gecikmesi"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Kullanıcı Bazında Görevler"
-
-#~ msgid "No Task"
-#~ msgstr "Görev Yok"
-
-#~ msgid "Reporting"
-#~ msgstr "Raporlama"
-
-#~ msgid "Task Hours"
-#~ msgstr "Görev Saati"
-
-#~ msgid "Task Number"
-#~ msgstr "Görev Sayısı"
-
-#~ msgid "Task Progress"
-#~ msgstr "Görev Süreci"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "Kapanan Görev Raporu"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "Kapanan Görev"
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 8f4121f41f3..de752130814 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -27,7 +27,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1137,7 +1137,6 @@ msgstr "Панель проекту"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1166,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1214,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1352,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1400,7 @@ msgid "Open"
 msgstr "Відкритий"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1725,7 +1724,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1799,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1827,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
@@ -1951,30 +1950,3 @@ msgstr ""
 
 #~ msgid "Date Stop: %(date_stop)s"
 #~ msgstr "Дата завершення: %(date_stop)"
-
-#~ msgid "My project's planning"
-#~ msgstr "Моє планування проектів"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Діаграма завдань"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Панель Менеджера Проекту"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Табелі користувача"
-
-#~ msgid "Project manager board"
-#~ msgstr "Панель менеджера проектів"
-
-#~ msgid "My tasks board"
-#~ msgstr "Моя панель завдань"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "Канали мого користувача"
-
-#~ msgid "This Month"
-#~ msgstr "Цей місяць"
-
-#~ msgid "Reporting"
-#~ msgstr "Звіти"
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index 34875698441..e3acf3c2c37 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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
@@ -57,7 +57,7 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -242,7 +242,7 @@ msgid "Day"
 msgstr "Ngày"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -428,7 +428,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -478,8 +478,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (sao chép)"
@@ -618,7 +618,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -711,7 +711,7 @@ msgid "Starting Date"
 msgstr "Ngày bắt đầu"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -736,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -1138,7 +1138,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1168,7 +1167,7 @@ msgid "Customer Email"
 msgstr "Địa chỉ thư điện tử của Khách hàng"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1216,7 +1215,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1353,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1402,7 +1401,7 @@ msgid "Open"
 msgstr "Mở"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1726,7 +1725,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1801,7 +1800,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1829,7 +1828,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index c8023857725..26e66ac4198 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -24,13 +24,13 @@ msgstr "指派任务"
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "包含当前任务的描述"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "任务 '%s' 已被分派给 '%s'"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -38,17 +38,19 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
-msgstr "这将设置项目和任务的计量单位如果你使用链接的时间表不要忘记设置你员工的计量单位"
+msgstr ""
+"此操作用于设置项目和任务的所采用的计量单位\n"
+"如果您安装了project_timesheet模块，工作时间表会与项目连接，请记得在员工设置中选择正确的计量单位。"
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "选择的公司不属于此用户允许访问的公司。"
+msgstr "用户无权操作所选择公司数据"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "在这里输入完成这个任务还需要多少小时"
 
 #. module: project
 #: view:project.task:0
@@ -56,7 +58,7 @@ msgid "Deadlines"
 msgstr "截止期限"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "不允许的操作"
@@ -75,7 +77,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:67
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "CHECK: "
 
 #. module: project
 #: field:project.installer,project_issue:0
@@ -85,7 +87,7 @@ msgstr "问题跟踪程序"
 #. module: project
 #: field:project.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr "时间表"
+msgstr "工作时间表"
 
 #. module: project
 #: view:project.task:0
@@ -102,29 +104,29 @@ msgstr "确认小时数"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr "进展"
+msgstr "进度"
 
 #. module: project
 #: help:project.task,remaining_hours:0
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
-msgstr "总剩余时间,任务接收者能重新估计"
+msgstr "总剩余时间，任务执行者可定期重估"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "调整项目显示优先级"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "错误！项目的开始日期必须小于项目的结束日期"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "任务重估"
 
 #. module: project
 #: field:project.project,members:0
@@ -139,7 +141,7 @@ msgstr "委派任务"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: project
 #: view:project.task:0
@@ -149,14 +151,14 @@ msgstr "委派任务"
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "委派任务"
+msgstr "已委派任务"
 
 #. module: project
 #: help:project.project,warn_header:0
 msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr "任务关闭时通知客户的消息邮件的头"
+msgstr "任务关闭时通知客户的消息邮件设置"
 
 #. module: project
 #: view:project.task:0
@@ -166,7 +168,7 @@ msgstr "我的任务"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "错误！不能创建循环引用的任务"
 
 #. module: project
 #: field:project.task,company_id:0
@@ -179,22 +181,22 @@ msgstr "公司"
 #. module: project
 #: field:project.installer,project_scrum:0
 msgid "SCRUM"
-msgstr ""
+msgstr "SCRUM"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
 msgid "Projects: Planned Vs Total hours"
-msgstr ""
+msgstr "项目：计划工时和实际工时"
 
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "警告信息"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "阶段名称"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -205,12 +207,12 @@ msgstr "设为未决"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "距开始日期"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "修改阶段"
 
 #. module: project
 #: view:project.project:0
@@ -220,7 +222,7 @@ msgstr "新的基于模板的项目"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "不能升级到相同的项目"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -231,25 +233,25 @@ msgstr "非常紧急"
 #. module: project
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "你要分派这个任务给哪个用户"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "天数"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "任务 '%s' 已完成"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_close
 msgid "Project Close Task"
-msgstr ""
+msgstr "关闭任务"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -266,7 +268,7 @@ msgstr "任务"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "成员"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -278,7 +280,7 @@ msgstr "做任务的估计时间.通常由项目经理在任务草稿阶段设
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "任务进度"
 
 #. module: project
 #: view:project.project:0
@@ -290,22 +292,22 @@ msgstr "备注"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "项目及剩余时间"
 
 #. module: project
 #: view:project.project:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "发票地址"
 
 #. module: project
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "任务摘要"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "非模版任务"
 
 #. module: project
 #: view:project.task:0
@@ -317,13 +319,13 @@ msgstr "开始任务"
 msgid ""
 "Helps generate invoices based on time spent on tasks, if activated on the "
 "project."
-msgstr ""
+msgstr "如果项目允许，能够按实际工时生成发票"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
-msgstr "页眉页脚的自动变量.使用同一个符号."
+msgstr "用于页眉和和页脚的内置变量。请注意使用正确的符号。"
 
 #. module: project
 #: selection:project.task,state:0
@@ -348,7 +350,7 @@ msgstr "邮件头"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "配置项目管理功能"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -358,13 +360,13 @@ msgstr "完成任务"
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "验证任务的前缀"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "计划实际平均偏差"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
@@ -375,12 +377,12 @@ msgstr "任务完成"
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -392,7 +394,7 @@ msgstr "委派任务给其它用户"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -409,17 +411,17 @@ msgstr "如果勾选此项用户关闭任务时将弹出一个信息这信息会
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "测试"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "被分派任务的人估算的工时"
 
 #. module: project
 #: view:project.project:0
@@ -427,10 +429,10 @@ msgid "Reactivate Project"
 msgstr "重新启动项目"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
-msgstr ""
+msgstr "任务 '%s' 已关闭"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -460,7 +462,7 @@ msgstr "最后期限"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -474,51 +476,51 @@ msgstr "业务伙伴"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "错误! 你不能创建递归的辅助核算项目"
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (copy)"
 
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
-msgstr ""
+msgstr "跟踪并帮助员工制定、检验时间表和考勤。"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "任务编号"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "上一个"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "任务重估"
 
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "分配给"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "结束日期：%(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "不能有用户名相同的两个用户"
 
 #. module: project
 #: view:project.project:0
@@ -533,22 +535,22 @@ msgstr "模板"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "文档"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr "我的项目"
+msgstr "我的项目列表"
 
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "错误！您不能创建递归公司."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "下一个"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -559,7 +561,7 @@ msgstr "从草稿状态它将进入待处理状态"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "天数"
 
 #. module: project
 #: help:project.task,active:0
@@ -567,7 +569,7 @@ msgid ""
 "This field is computed automatically and have the same behavior than the "
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
-msgstr ""
+msgstr "这个字段由系统自动更新。功能类似“启用”字段：如果任务属于一个项目模版或停用的项目，任务会被隐藏，除非用指定条件查询。"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -588,7 +590,7 @@ msgstr "项目任务"
 #. module: project
 #: view:project.installer:0
 msgid "Methodologies"
-msgstr ""
+msgstr "理论"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -598,7 +600,7 @@ msgstr "计算:花费的时间 + 剩余的时间"
 #. module: project
 #: help:project.task.close,partner_email:0
 msgid "Email Address of Customer"
-msgstr ""
+msgstr "客户邮件地址"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -609,23 +611,23 @@ msgstr "有效时间"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "验证任务标题"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "重估"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "关闭任务后发送邮件"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "拖期总计"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -668,14 +670,14 @@ msgstr "任务“%s”已经关闭"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "未分配的任务"
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "项目下的任务和子任务计划工时的合计数"
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -695,7 +697,7 @@ msgstr "额外信息"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -710,13 +712,13 @@ msgid "Starting Date"
 msgstr "开始日期"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
 #, python-format
 msgid "Projects"
-msgstr "项目"
+msgstr "项目列表"
 
 #. module: project
 #: view:project.task:0
@@ -724,7 +726,7 @@ msgstr "项目"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "阶段"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -732,13 +734,13 @@ msgid ""
 "Define the steps that will be used in the project from the creation of the "
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
-msgstr ""
+msgstr "定义从任务创建到关闭要经过的步骤。你将用这些阶段来跟踪任务或缺陷的进度"
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "任务 '%s' 已创建"
 
 #. module: project
 #: view:project.task:0
@@ -748,24 +750,24 @@ msgstr "日期"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "分派给这个用户的任务标题"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: project
 #: view:project.installer:0
 msgid ""
 "Various OpenERP applications are available to manage your projects with "
 "different level of control and flexibility."
-msgstr ""
+msgstr "OpenERP中有很多模块用于在项目管理中维护控制和自由度的平衡"
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "项目的计划和实际工时"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -787,7 +789,7 @@ msgstr "延迟的小时数"
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "任务分析"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -803,7 +805,7 @@ msgstr "委派"
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 msgid "Templates of Projects"
-msgstr ""
+msgstr "项目模版"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -823,7 +825,7 @@ msgstr "项目"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_估算"
 
 #. module: project
 #: view:board.board:0
@@ -834,7 +836,7 @@ msgstr "我的面板"
 #: code:addons/project/wizard/project_task_close.py:79
 #, python-format
 msgid "Please specify the email address of Project Manager."
-msgstr ""
+msgstr "请输入项目经理的邮件地址"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -845,13 +847,13 @@ msgstr "项目管理"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "任务分派"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -868,12 +870,12 @@ msgstr "任务"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "上一级"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "任务分派"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -887,21 +889,24 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"任务是一个要完成的工作。每个用户根据自己的任务列表工作并记录进度和工时。他可以自己完成这个任务或分派给其他人。如果你把任务分派给其他人，你会得到一个“等待"
+"”状态的新任务，在你得到工作成果后这个任务会被重启以便你复核工作成果。如果你安装了project_timesheet模块，根据项目的配置，你可以基于工时开"
+"发票。如果安装了project_mrp模块，销售订单确认时会自动创建任务。"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图片"
 
 #. module: project
 #: field:project.task,progress:0
@@ -917,6 +922,10 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"任务创建后的状态是“草稿”\n"
+" 任务开始后的状态是“进行中”\n"
+" 如果需要复核，状态是“等待”\n"
+" 如果任务已结束，状态是“完成”"
 
 #. module: project
 #: help:project.task,progress:0
@@ -938,7 +947,7 @@ msgstr "项目任务"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "任务阶段"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -962,19 +971,19 @@ msgstr "状态: %(state)s"
 #. module: project
 #: field:project.installer,project_long_term:0
 msgid "Long Term Planning"
-msgstr ""
+msgstr "长期计划"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "上级任务"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -984,12 +993,12 @@ msgstr "警告业务伙伴"
 #. module: project
 #: view:report.project.task.user:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "发票"
 
 #. module: project
 #: view:project.task:0
@@ -999,13 +1008,13 @@ msgstr "信息"
 #. module: project
 #: help:project.installer,account_budget:0
 msgid "Helps accountants manage analytic and crossover budgets."
-msgstr ""
+msgstr "用于会计人员管理预算"
 
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "优先级"
 
 #. module: project
 #: view:project.project:0
@@ -1015,17 +1024,17 @@ msgstr "管理"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "我的任务"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "成员"
 
 #. module: project
 #: view:project.task:0
@@ -1035,7 +1044,7 @@ msgstr "项目任务列表"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的相关成员。"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1057,7 +1066,7 @@ msgstr "低"
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "表现"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1068,7 +1077,7 @@ msgstr "我的任务最后期限"
 #: view:project.project:0
 #: field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr "项目管理"
+msgstr "项目经理"
 
 #. module: project
 #: view:project.project:0
@@ -1085,18 +1094,18 @@ msgstr "未决"
 #. module: project
 #: view:project.task:0
 msgid "Task Edition"
-msgstr ""
+msgstr "任务"
 
 #. module: project
 #: 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 "阶段"
 
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "配置:"
 
 #. module: project
 #: view:project.project:0
@@ -1109,25 +1118,25 @@ msgstr "项目名称"
 msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
-msgstr ""
+msgstr "你的任务进入了新的阶段。等待状态将在分派的任务结束后重启任务"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: project
 #: help:project.installer,project_scrum:0
 msgid ""
 "Implements and tracks the concepts and task types defined in the SCRUM "
 "methodology."
-msgstr ""
+msgstr "实现了SCRUM方法下的概念和任务类型"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "剩余天数"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
@@ -1137,7 +1146,6 @@ msgstr "项目控制台"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "上级项目"
 
@@ -1154,23 +1162,23 @@ msgstr "确认要求和设置计划时间"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: project
 #: field:project.task.close,partner_email:0
 msgid "Customer Email"
-msgstr ""
+msgstr "客户邮件"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "项目 '%s' 已关闭"
 
 #. module: project
 #: view:project.task:0
@@ -1180,12 +1188,12 @@ msgstr "任务编辑"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: project
 #: help:project.task.close,manager_warn:0
 msgid "Warn Manager by Email"
-msgstr ""
+msgstr "邮件通知经理"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1195,19 +1203,19 @@ msgstr "待处理任务"
 #. module: project
 #: field:project.task.close,manager_email:0
 msgid "Manager Email"
-msgstr ""
+msgstr "经理邮件"
 
 #. module: project
 #: help:project.project,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
-msgstr ""
+msgstr "如果启用字段的勾去掉，可以不用删除就隐藏项目"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1215,10 +1223,10 @@ msgid "When task is completed, it will come into the done state."
 msgstr "当任务完成它将进入完成状态"
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "项目 '%s' 已创建"
 
 #. module: project
 #: field:project.task.work,date:0
@@ -1228,14 +1236,14 @@ msgstr "日期"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "控制台"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "错误！货币必须是所选公司的本位币"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:79
@@ -1244,7 +1252,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_close.py:111
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -1254,23 +1262,23 @@ msgstr "用户计划"
 #. module: project
 #: field:project.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "配置进度"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_分派"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:91
 #, python-format
 msgid "Couldn't send mail because your email address is not configured!"
-msgstr ""
+msgstr "不能发送邮件因为您的邮件地址没有配置！"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "距开始日期"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1280,7 +1288,7 @@ msgstr "委派給"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "历史记录"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1295,7 +1303,7 @@ msgstr "委派任务"
 #. module: project
 #: field:project.installer,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "GTD"
 
 #. module: project
 #: help:project.project,members:0
@@ -1307,7 +1315,7 @@ msgstr ""
 #. module: project
 #: help:project.task.close,partner_warn:0
 msgid "Warn Customer by Email"
-msgstr ""
+msgstr "邮件提醒客户"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -1319,6 +1327,12 @@ msgid ""
 "    * Members list of project\n"
 "    "
 msgstr ""
+"项目管理模块用于管理多层项目和任务、任务进度等。\n"
+"还能统计项目进展，进行任务排序等。\n"
+" 项目成员的控制台包括：\n"
+"    我的任务列表\n"
+"    项目成员列表\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
@@ -1349,10 +1363,10 @@ msgid ""
 "This report allows you to analyse the performance of your projects and "
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
-msgstr ""
+msgstr "这个报表用于分析你项目和成员的效率。可以分析任务数量、计划工时和实际工时的对比、任务的平均花费天数"
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "任务 '%s' 设置进度"
@@ -1392,7 +1406,7 @@ msgstr "取消"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1401,11 +1415,11 @@ msgid "Open"
 msgstr "待处理"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
-msgstr ""
+msgstr "您不能删除一个包含任务的项目。我建议您不启用该项目。"
 
 #. module: project
 #: view:project.project:0
@@ -1424,7 +1438,7 @@ msgstr "进展"
 #: code:addons/project/wizard/project_task_close.py:82
 #, python-format
 msgid "Please specify the email address of Customer."
-msgstr ""
+msgstr "请输入客户的邮件地址"
 
 #. module: project
 #: view:project.task:0
@@ -1435,41 +1449,41 @@ msgstr "恢复"
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: project
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "当前活动"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "项目列表"
 
 #. module: project
 #: help:project.installer,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: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " 项目小时数"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1486,48 +1500,48 @@ msgstr "警告信息"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超过截止日期"
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "本项目和相关项目的任务实际花费的小时数合计"
 
 #. module: project
 #: help:project.task,delay_hours:0
 msgid ""
 "Computed as difference of the time estimated by the project manager and the "
 "real time to close the task."
-msgstr ""
+msgstr "计算公式为：项目经理估算的时间和实际花费的时间的差"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "任务重估"
 
 #. module: project
 #: help:project.installer,project_long_term:0
 msgid ""
 "Enables long-term projects tracking, including multiple-phase projects and "
 "resource allocation handling."
-msgstr ""
+msgstr "用于长期项目的管理，包括分阶段的项目和资源分配管理"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "开发"
 
 #. module: project
 #: field:project.installer,project_timesheet:0
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "按任务开发票"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "按项目统计我的剩余工时数"
 
 #. module: project
 #: field:project.task,description:0
@@ -1552,7 +1566,7 @@ msgstr "紧急的"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1562,14 +1576,14 @@ msgstr "确认任务"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "任务总数"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "我分派的任务"
 
 #. module: project
 #: view:project.project:0
@@ -1580,7 +1594,7 @@ msgstr "任务:%(名称)"
 #: model:ir.actions.act_window,name:project.action_project_installer
 #: view:project.installer:0
 msgid "Project Application Configuration"
-msgstr ""
+msgstr "项目管理功能配置"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1601,7 +1615,7 @@ msgstr "我的发票科目"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1620,52 +1634,52 @@ msgstr "如果勾选此项项目经理将收到他团队每个任务完成时间
 msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "此项目极其子项目的所有任务的实际工时数"
 
 #. module: project
 #: help:project.task.close,manager_email:0
 msgid "Email Address of Project's Manager"
-msgstr ""
+msgstr "项目经理邮件地址"
 
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "客户"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days
 #: view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "任务日程"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:111
 #, python-format
 msgid ""
 "Couldn't send mail! Check the email ids and smtp configuration settings"
-msgstr ""
+msgstr "不能发送邮件！检查邮箱帐号和smtp设置"
 
 #. module: project
 #: field:project.task.close,partner_warn:0
 msgid "Warn Customer"
-msgstr ""
+msgstr "提醒客户"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "编辑"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1676,27 +1690,27 @@ msgstr "你工作小时编码"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "距结束日期"
 
 #. module: project
 #: view:board.board:0
 msgid "My Projects: Planned vs Total Hours"
-msgstr ""
+msgstr "我的项目：计划和实际工时"
 
 #. module: project
 #: model:ir.model,name:project.model_project_installer
 msgid "project.installer"
-msgstr ""
+msgstr "project.installer"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1707,7 +1721,7 @@ msgstr "时间花费"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "杂项"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1722,13 +1736,13 @@ msgstr "项目时间单位"
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "花费时间"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "任务 '%s' 在等待状态"
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1741,33 +1755,33 @@ msgstr "总小时数"
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "输入项目序号用于对项目列表排序"
 
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "拖期任务"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr ""
+msgstr "合并"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "每个项目的剩余工时"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1788,6 +1802,8 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"项目包含一系列要由指定人员处理的任务或缺陷。项目可以有层级结构，作为另一个项目的子项目。这允许你把一个长期的大项目分成多个阶段去完成。每个用户都可以设置一"
+"个默认项目这样他可以自动地筛选他常用的任务或缺陷。如果你允许按任务工时开发票，你可以在会计管理的菜单下看到可以开票的任务。"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1800,10 +1816,10 @@ msgid "Validation State"
 msgstr "确认状态"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "任务 '%s' 取消了"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -1815,28 +1831,28 @@ msgstr "工作完成"
 msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
-msgstr ""
+msgstr "你复核分派任务的工作成果需要的工时数"
 
 #. module: project
 #: view:project.project:0
 msgid "Manager"
-msgstr ""
+msgstr "经理"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "任务 ‘%s' 取消了"
 
 #. module: project
 #: view:project.task.close:0
 msgid "_Send"
-msgstr ""
+msgstr "发送(_S)"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1846,18 +1862,18 @@ msgstr "工作摘要"
 #. module: project
 #: view:project.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: project
 #: help:project.installer,project_issue:0
 msgid "Automatically synchronizes project tasks and crm cases."
-msgstr ""
+msgstr "自动同步项目的任务和CRM的业务"
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,type_ids:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "任务阶段"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1873,7 +1889,7 @@ msgstr "邮件页脚"
 #. module: project
 #: field:project.installer,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "预算"
 
 #~ msgid "Close Task"
 #~ msgstr "关闭任务"
@@ -2149,140 +2165,3 @@ msgstr ""
 #~ "New state of your own task. Pending will be reopened automatically when the "
 #~ "delegated task is closed."
 #~ msgstr "你任务的新状态.未决的任务将会自动重新开始.委派的任务结束."
-
-#~ msgid "My project's planning"
-#~ msgstr "我的项目计划"
-
-#~ msgid "Board for project users"
-#~ msgstr "用户项目面板"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "任务管线"
-
-#~ msgid "My Planning"
-#~ msgstr "我的计划"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "项目管理控制台"
-
-#~ msgid "My Deadlines"
-#~ msgstr "我的最后期限"
-
-#~ msgid "User's timesheets"
-#~ msgstr "用户时间表"
-
-#~ msgid "Project manager board"
-#~ msgstr "项目管理控制台"
-
-#~ msgid "My tasks board"
-#~ msgstr "我的任务面板"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "我用户的管线"
-
-#~ msgid "My Timesheet"
-#~ msgstr "我的时间表"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "项目的完成的任务(这月)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "项目和用户关闭的任务"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "项目和用户完成的任务(这月)"
-
-#~ msgid "Task Closed"
-#~ msgstr "任务关闭"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "项目的任务"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "销售管理 - 报表"
-
-#~ msgid "User"
-#~ msgstr "用户"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "项目和用户的任务"
-
-#~ msgid "This Month"
-#~ msgstr "本月"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "项目和用户的任务"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "平均关闭延迟"
-
-#~ msgid "Tasks by project"
-#~ msgstr "项目任务"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "项目关闭的任务"
-
-#~ msgid "Tasks by User"
-#~ msgstr "用户任务"
-
-#~ msgid "No Task"
-#~ msgstr "没任务"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "项目用户任务报表"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "时间表/每月任务小时数"
-
-#~ msgid "Reporting"
-#~ msgstr "内部报表"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr "项目用户任务的统计来检查用户的管线"
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "15天前关闭的任务"
-
-#~ msgid "Task Hours"
-#~ msgstr "任务的小时数"
-
-#~ msgid "Task Number"
-#~ msgstr "任务数"
-
-#~ msgid "Timesheet/Task hours Report Per Month"
-#~ msgstr "时间表/每月任务小时数报表"
-
-#~ msgid "Task Progress"
-#~ msgstr "任务进度"
-
-#~ msgid "Closed Task Report"
-#~ msgstr "关闭任务报表"
-
-#~ msgid "Timesheet Hours"
-#~ msgstr "时间表小时数"
-
-#~ msgid "Closed Tasks"
-#~ msgstr "关闭任务"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module implements a dashboard for project member that includes:\n"
-#~ "    * List of my open tasks\n"
-#~ "    * List of my next deadlines\n"
-#~ "    * List of public notes\n"
-#~ "    * Graph of my timesheet\n"
-#~ "    * Graph of my work analysis\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "这模块实现项目的控制台包括:\n"
-#~ "    *我打开的任务列表\n"
-#~ "    *我的下一最后期限列表\n"
-#~ "    *公开备注列表\n"
-#~ "    *我的时间表图表\n"
-#~ "    *我的工作分析图形\n"
-#~ "    "
-
-#~ msgid "All Months"
-#~ msgstr "所有月份"
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index 39959addc38..008442910bb 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-28 16:28+0000\n"
+"PO-Revision-Date: 2011-09-27 10:35+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 04:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr "任務指派"
+msgstr "已分配任務"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -27,10 +27,10 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "「%s」任務委派予 %s"
+msgstr "已將「%s」任務委派予 %s。"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -56,7 +56,7 @@ msgid "Deadlines"
 msgstr "最後限期"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
@@ -241,7 +241,7 @@ msgid "Day"
 msgstr "日"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "完成「%s」任務"
@@ -254,7 +254,7 @@ msgstr "專案結束任務"
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr "草案任務"
+msgstr "任務草案"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -273,7 +273,7 @@ msgstr "成員"
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
-msgstr "完成任務估計時間，通常由專案經理（PM）於草案階段設定"
+msgstr "完成任務估計時間，通常由專案經理(PM)於草案階段設定。"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -427,7 +427,7 @@ msgid "Reactivate Project"
 msgstr "重啟專案"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "「%s」任務完成"
@@ -477,8 +477,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " （副本）"
@@ -508,7 +508,7 @@ msgstr "重新評估任務"
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr "指派給"
+msgstr "已分配給"
 
 #. module: project
 #: view:project.project:0
@@ -553,7 +553,7 @@ msgstr "下一個"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "「草案」階段會轉為「進行中」階段"
+msgstr "會由「草案」階段轉為「開放」階段。"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -617,7 +617,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -710,7 +710,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "「%s」任務開始進行"
@@ -770,7 +770,7 @@ msgstr ""
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr "草案進行任務"
+msgstr "開啟任務草案"
 
 #. module: project
 #: view:project.project:0
@@ -917,6 +917,10 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"當建立任務時會處於「草案(Draft)」階段。\n"
+"  開始後會處於「進行中(In Progress)」階段。\n"
+"  如需評估，會處於「待通過(Pending)」階段。                                  \n"
+"  任務完成，處於「完成(Done)」階段。"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1137,7 +1141,6 @@ msgstr ""
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1167,7 +1170,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1215,7 +1218,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "「%s」專案開始進行"
@@ -1285,7 +1288,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Assigned to"
-msgstr "指派給"
+msgstr "已分配給"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1352,7 +1355,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1401,7 +1404,7 @@ msgid "Open"
 msgstr "進行中"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1585,7 +1588,7 @@ msgstr ""
 #. module: project
 #: field:project.task.delegate,user_id:0
 msgid "Assign To"
-msgstr "指派給"
+msgstr "分配給"
 
 #. module: project
 #: field:project.project,effective_hours:0
@@ -1725,7 +1728,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1800,7 +1803,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1828,7 +1831,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/installer.py b/addons/project/installer.py
deleted file mode 100644
index 36b458da296..00000000000
--- a/addons/project/installer.py
+++ /dev/null
@@ -1,51 +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 osv import fields, osv
-
-class project_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Project Management
-        'project_long_term': fields.boolean(
-        'Long Term Planning',
-            help="Enables long-term projects tracking, including "
-                 "multiple-phase projects and resource allocation handling."),
-        'hr_timesheet_sheet': fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'project_timesheet': fields.boolean('Bill Time on Tasks',
-            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
-        'account_budget': fields.boolean('Budgets',
-            help="Helps accountants manage analytic and crossover budgets."),
-        'project_issue': fields.boolean('Issues Tracker',
-            help="Automatically synchronizes project tasks and crm cases."),
-        # Methodologies
-        'project_scrum': fields.boolean('Methodology: SCRUM',
-            help="Implements and tracks the concepts and task types defined "
-                 "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Methodology: Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-    }
-project_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/project.py b/addons/project/project.py
index 622b5ffc2c2..abebd2d35ff 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -25,6 +25,7 @@ from datetime import datetime, date
 
 from tools.translate import _
 from osv import fields, osv
+from resource.faces import task as Task
 
 # I think we can remove this in v6.1 since VMT's improvements in the framework ?
 #class project_project(osv.osv):
@@ -45,6 +46,7 @@ class project_task_type(osv.osv):
     _defaults = {
         'sequence': 1
     }
+    _order = 'sequence'
 project_task_type()
 
 class project(osv.osv):
@@ -55,7 +57,7 @@ class project(osv.osv):
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
             return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
-        if context and context.has_key('user_prefence') and context['user_prefence']:
+        if context and context.get('user_preference'):
                 cr.execute("""SELECT project.id FROM project_project project
                            LEFT JOIN account_analytic_account account ON account.id = project.analytic_account_id
                            LEFT JOIN project_user_rel rel ON rel.project_id = project.analytic_account_id
@@ -73,11 +75,14 @@ class project(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         partner_obj = self.pool.get('res.partner')
         if not part:
-            return {'value':{'contact_id': False, 'pricelist_id': False}}
+            return {'value':{'contact_id': False}}
         addr = partner_obj.address_get(cr, uid, [part], ['contact'])
-        pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
-        pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
-        return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
+        val = {'contact_id': addr['contact']}
+        if 'pricelist_id' in self.fields_get(cr, uid, context=context):
+            pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
+            pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
+            val['pricelist_id'] = pricelist_id
+        return {'value': val}
 
     def _progress_rate(self, cr, uid, ids, names, arg, context=None):
         res = {}.fromkeys(ids, 0.0)
@@ -118,7 +123,7 @@ class project(osv.osv):
     def unlink(self, cr, uid, ids, *args, **kwargs):
         for proj in self.browse(cr, uid, ids):
             if proj.tasks:
-                raise osv.except_osv(_('Operation Not Permitted !'), _('You can not delete a project with tasks. I suggest you to deactivate it.'))
+                raise osv.except_osv(_('Operation Not Permitted !'), _('You cannot delete a project containing tasks. I suggest you to desactivate it.'))
         return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
 
     _columns = {
@@ -138,6 +143,7 @@ class project(osv.osv):
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
             }),
         'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
+        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
         'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
@@ -304,6 +310,105 @@ class project(osv.osv):
                 self.setActive(cr, uid, child_ids, value, context=None)
         return True
 
+    def _schedule_header(self, cr, uid, ids, force_members=True, context=None):
+        context = context or {}
+        if type(ids) in (long, int,):
+            ids = [ids]
+        projects = self.browse(cr, uid, ids, context=context)
+
+        for project in projects:
+            if (not project.members) and force_members:
+                raise osv.except_osv(_('Warning !'),_("You must assign members on the project '%s' !") % (project.name,))
+
+        resource_pool = self.pool.get('resource.resource')
+
+        result = "from resource.faces import *\n"
+        result += "import datetime\n"
+        for project in self.browse(cr, uid, ids, context=context):
+            u_ids = [i.id for i in project.members]
+            if project.user_id and (project.user_id.id not in u_ids):
+                u_ids.append(project.user_id.id)
+            for task in project.tasks:
+                if task.state in ('done','cancelled'):
+                    continue
+                if task.user_id and (task.user_id.id not in u_ids):
+                    u_ids.append(task.user_id.id)
+            calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
+            resource_objs = resource_pool.generate_resources(cr, uid, u_ids, calendar_id, context=context)
+            for key, vals in resource_objs.items():
+                result +='''
+class User_%s(Resource):
+    efficiency = %s
+''' % (key,  vals.get('efficiency', False))
+
+        result += '''
+def Project():
+        '''
+        return result
+
+    def _schedule_project(self, cr, uid, project, context=None):
+        resource_pool = self.pool.get('resource.resource')
+        calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
+        working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+        # TODO: check if we need working_..., default values are ok.
+        puids = [x.id for x in project.members]
+        if project.user_id:
+            puids.append(project.user_id.id)
+        result = """
+  def Project_%d():
+    start = \'%s\'
+    working_days = %s
+    resource = %s
+"""       % (
+            project.id, 
+            project.date_start, 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
+        if vacation:
+            result+= """
+    vacation = %s
+""" %   ( vacation, )
+        return result
+
+    #TODO: DO Resource allocation and compute availability
+    def compute_allocation(self, rc, uid, ids, start_date, end_date, context=None):
+        if context ==  None:
+            context = {}
+        allocation = {}
+        return allocation
+
+    def schedule_tasks(self, cr, uid, ids, context=None):
+        context = context or {}
+        if type(ids) in (long, int,):
+            ids = [ids]
+        projects = self.browse(cr, uid, ids, context=context)
+        result = self._schedule_header(cr, uid, ids, False, context=context)
+        for project in projects:
+            result += self._schedule_project(cr, uid, project, context=context)
+            result += self.pool.get('project.task')._generate_task(cr, uid, project.tasks, ident=4, context=context)
+
+        local_dict = {}
+        exec result in local_dict
+        projects_gantt = Task.BalancedProject(local_dict['Project'])
+
+        for project in projects:
+            project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,))
+            for task in project.tasks:
+                if task.state in ('done','cancelled'):
+                    continue
+
+                p = getattr(project_gantt, 'Task_%d' % (task.id,))
+
+                self.pool.get('project.task').write(cr, uid, [task.id], {
+                    'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
+                    'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
+                }, context=context)
+                if (not task.user_id) and (p.booked_resource):
+                    self.pool.get('project.task').write(cr, uid, [task.id], {
+                        'user_id': int(p.booked_resource[0].name[5:]),
+                    }, context=context)
+        return True
 project()
 
 class users(osv.osv):
@@ -319,6 +424,62 @@ class task(osv.osv):
     _log_create = True
     _date_name = "date_start"
 
+
+    def _resolve_project_id_from_context(self, cr, uid, context=None):
+        """Return ID of project based on the value of 'project_id'
+           context key, or None if it cannot be resolved to a single project.
+        """
+        if context is None: context = {}
+        if type(context.get('project_id')) in (int, long):
+            project_id = context['project_id']
+            return project_id
+        if isinstance(context.get('project_id'), basestring):
+            project_name = context['project_id']
+            project_ids = self.pool.get('project.project').name_search(cr, uid, name=project_name)
+            if len(project_ids) == 1:
+                return project_ids[0][0]
+
+    def _read_group_type_id(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+        stage_obj = self.pool.get('project.task.type')
+        project_id = self._resolve_project_id_from_context(cr, uid, context=context)
+        order = stage_obj._order
+        access_rights_uid = access_rights_uid or uid
+        if read_group_order == 'type_id desc':
+            # lame way to allow reverting search, should just work in the trivial case
+            order = '%s desc' % order
+        if project_id:
+            domain = ['|', ('id','in',ids), ('project_ids','in',project_id)]
+        else:
+            domain = ['|', ('id','in',ids), ('project_default','=',1)]
+        stage_ids = stage_obj._search(cr, uid, 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
+
+    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')
+        project_id = self._resolve_project_id_from_context(cr, uid, context=context)
+        access_rights_uid = access_rights_uid or uid
+        if project_id:
+            ids += self.pool.get('project.project').read(cr, access_rights_uid, project_id, ['members'], context=context)['members']
+            order = res_users._order
+            # lame way to allow reverting search, should just work in the trivial case
+            if read_group_order == 'user_id desc':
+                order = '%s desc' % order
+            # de-duplicate and apply search order
+            ids = res_users._search(cr, uid, [('id','in',ids)], order=order, access_rights_uid=access_rights_uid, context=context)
+        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
+
+    _group_by_full = {
+        'type_id': _read_group_type_id,
+        'user_id': _read_group_user_id
+    }
+
+
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         obj_project = self.pool.get('project.project')
         for domain in args:
@@ -430,9 +591,15 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
+        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], '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",
+                                         readonly=True, required=False),
         'create_date': fields.datetime('Create Date', readonly=True,select=True),
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
@@ -469,11 +636,14 @@ class task(osv.osv):
         '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'),
-        'id': fields.integer('ID'),
+        'id': fields.integer('ID', readonly=True),
+        'color': fields.integer('Color Index'),
+        'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
     }
 
     _defaults = {
         'state': 'draft',
+        'kanban_state': 'normal',
         'priority': '2',
         'progress': 0,
         'sequence': 10,
@@ -483,7 +653,22 @@ class task(osv.osv):
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
     }
 
-    _order = "sequence,priority, date_start, name, id"
+    _order = "priority, sequence, date_start, name, id"
+
+    def set_priority(self, cr, uid, ids, priority):
+        """Set task priority
+        """
+        return self.write(cr, uid, ids, {'priority' : priority})
+
+    def set_high_priority(self, cr, uid, ids, *args):
+        """Set task priority to high
+        """
+        return self.set_priority(cr, uid, ids, '1')
+
+    def set_normal_priority(self, cr, uid, ids, *args):
+        """Set task priority to normal
+        """
+        return self.set_priority(cr, uid, ids, '3')
 
     def _check_recursion(self, cr, uid, ids, context=None):
         for id in ids:
@@ -590,11 +775,12 @@ class task(osv.osv):
                 'name': _('Send Email after close task'),
                 'view_type': 'form',
                 'view_mode': 'form',
-                'res_model': 'project.task.close',
+                'res_model': 'mail.compose.message',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy': True,
-                'context': {'active_id': task.id}
+                'context': {'active_id': task.id,
+                            'active_model': 'project.task'}
            }
         return res
 
@@ -603,6 +789,7 @@ class task(osv.osv):
         Close Task
         """
         request = self.pool.get('res.request')
+        if not isinstance(ids,list): ids = [ids]
         for task in self.browse(cr, uid, ids, context=context):
             vals = {}
             project = task.project_id
@@ -677,6 +864,7 @@ class task(osv.osv):
         return True
 
     def do_open(self, cr, uid, ids, context={}):
+        if not isinstance(ids,list): ids = [ids]
         tasks= self.browse(cr, uid, ids, context=context)
         for t in tasks:
             data = {'state': 'open'}
@@ -691,37 +879,39 @@ class task(osv.osv):
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         return True
 
-    def do_delegate(self, cr, uid, task_id, delegate_data={}, context=None):
+    def do_delegate(self, cr, uid, ids, delegate_data={}, context=None):
         """
         Delegate Task to another users.
         """
-        task = self.browse(cr, uid, task_id, context=context)
-        self.copy(cr, uid, task.id, {
-            'name': delegate_data['name'],
-            'user_id': delegate_data['user_id'],
-            'planned_hours': delegate_data['planned_hours'],
-            'remaining_hours': delegate_data['planned_hours'],
-            'parent_ids': [(6, 0, [task.id])],
-            'state': 'draft',
-            'description': delegate_data['new_task_description'] or '',
-            'child_ids': [],
-            'work_ids': []
-        }, context=context)
-        newname = delegate_data['prefix'] or ''
-        self.write(cr, uid, [task.id], {
-            'remaining_hours': delegate_data['planned_hours_me'],
-            'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
-            'name': newname,
-        }, context=context)
-        if delegate_data['state'] == 'pending':
-            self.do_pending(cr, uid, [task.id], context)
-        else:
-            self.do_close(cr, uid, [task.id], context=context)
-        user_pool = self.pool.get('res.users')
-        delegate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
-        message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_user.name)
-        self.log(cr, uid, task.id, message)
-        return True
+        assert delegate_data['user_id'], _("Delegated User should be specified")
+        delegrated_tasks = {}
+        for task in self.browse(cr, uid, ids, context=context):
+            delegrated_task_id = self.copy(cr, uid, task.id, {
+                'name': delegate_data['name'],
+                'project_id': delegate_data['project_id'] and delegate_data['project_id'][0] or False,
+                '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': []
+            }, context=context)
+            newname = delegate_data['prefix'] or ''
+            task.write({
+                'remaining_hours': delegate_data['planned_hours_me'],
+                'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
+                'name': newname,
+            }, context=context)
+            if delegate_data['state'] == 'pending':
+                self.do_pending(cr, uid, task.id, context=context)
+            elif delegate_data['state'] == 'done':
+                self.do_close(cr, uid, task.id, context=context)
+            
+            message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_data['user_id'][1])
+            self.log(cr, uid, task.id, message)
+            delegrated_tasks[task.id] = delegrated_task_id
+        return delegrated_tasks
 
     def do_pending(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'pending'}, context=context)
@@ -730,6 +920,31 @@ class task(osv.osv):
             self.log(cr, uid, id, message)
         return True
 
+    def set_remaining_time_1(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'remaining_hours': 1.0}, context=context)
+        return True
+
+    def set_remaining_time_2(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'remaining_hours': 2.0}, context=context)
+        return True
+
+    def set_remaining_time_5(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'remaining_hours': 5.0}, context=context)
+        return True
+
+    def set_remaining_time_10(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'remaining_hours': 10.0}, context=context)
+        return True
+
+    def set_kanban_state_blocked(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
+
+    def set_kanban_state_normal(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context)
+
+    def set_kanban_state_done(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context)
+
     def _change_type(self, cr, uid, ids, next, *args):
         """
             go to the next stage
@@ -759,6 +974,20 @@ class task(osv.osv):
     def prev_type(self, cr, uid, ids, *args):
         return self._change_type(cr, uid, ids, False, *args)
 
+    # Overridden to reset the kanban_state to normal whenever
+    # the stage (type_id) of the task changes.
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if vals and not 'kanban_state' in vals and 'type_id' in vals:
+            new_stage = vals.get('type_id')
+            vals_reset_kstate = dict(vals, kanban_state='normal')
+            for t in self.browse(cr, uid, ids, context=context):
+                write_vals = vals_reset_kstate if t.type_id != new_stage else vals 
+                super(task,self).write(cr, uid, [t.id], write_vals, context=context)
+            return True
+        return super(task,self).write(cr, uid, ids, vals, context=context)
+
     def unlink(self, cr, uid, ids, context=None):
         if context == None:
             context = {}
@@ -766,6 +995,33 @@ class task(osv.osv):
         res = super(task, self).unlink(cr, uid, ids, context)
         return res
 
+    def _generate_task(self, cr, uid, tasks, ident=4, context=None):
+        context = context or {}
+        result = ""
+        ident = ' '*ident
+        for task in tasks:
+            if task.state in ('done','cancelled'):
+                continue
+            result += '''
+%sdef Task_%s():
+%s  todo = \"%.2fH\"
+%s  effort = \"%.2fH\"''' % (ident,task.id, ident,task.remaining_hours, ident,task.total_hours)
+            start = []
+            for t2 in task.parent_ids:
+                start.append("up.Task_%s.end" % (t2.id,))
+            if start:
+                result += '''
+%s  start = max(%s)
+''' % (ident,','.join(start))
+
+            if task.user_id:
+                result += '''
+%s  resource = %s
+''' % (ident, 'User_'+str(task.user_id.id))
+
+        result += "\n"
+        return result
+
 task()
 
 class project_work(osv.osv):
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index d78f208526a..a3bfe9be673 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,30 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-    
-        <!--
-        Requests Links
-        -->
-        <record id="req_link_project" model="res.request.link">
-            <field name="name">Project</field>
-            <field name="object">project.project</field>
-        </record>
-
-        <record id="req_link_task" model="res.request.link">
-            <field name="name">Project task</field>
-            <field name="object">project.task</field>
-        </record>
-        
-        <!--
-        Resource: project.project
-        -->
-
+    <data noupdate="1">
+        <!-- Resource: project.project -->
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
-        <function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
-
+        <function id="parent_project_default_set" model="ir.values" name="set" eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)"/>
 
         <!-- Task Stages -->
         <record id="project_tt_specification" model="project.task.type">
@@ -47,7 +29,5 @@
             <field name="name">Deployment</field>
             <field name="project_default" eval="1"/>
         </record>
-
-
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 999d16c07cc..7592d24a145 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -76,6 +76,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Prepare Requirements Document</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_2" model="project.task">
@@ -84,6 +85,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Make SRS</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_3" model="project.task">
@@ -92,6 +94,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Design Use Cases</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_4" model="project.task">
@@ -100,6 +103,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Budget Planning</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_5" model="project.task">
@@ -108,6 +112,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Quality Planning</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_6" model="project.task">
@@ -116,6 +121,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Risk Management Planning</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_7" model="project.task">
@@ -124,6 +130,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Create Project Schedules</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_8" model="project.task">
@@ -132,6 +139,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Dataflow Design</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_9" model="project.task">
@@ -140,6 +148,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">User Interface Design</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <record id="project_task_10" model="project.task">
@@ -148,6 +157,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Develop Module in Sale Management</field>
+             <field name="type_id" ref="project_tt_development"/>
         </record>
 
         <record id="project_task_11" model="project.task">
@@ -156,30 +166,41 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Develop module in Warehouse</field>
+            <field name="type_id" ref="project_tt_merge"/>
         </record>
 
+        <function model="project.task" name="do_close" eval="[ref('project_task_11')]"/>
+        
         <record id="project_task_12" model="project.task">
             <field eval="20.0" name="planned_hours"/>
             <field name="user_id" ref="project.res_users_developer"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Integrate Modules</field>
+            <field name="type_id" ref="project_tt_development"/>
         </record>
 
+        <function model="project.task" name="do_close" eval="[ref('project_task_12')]"/>
+        
         <record id="project_task_13" model="project.task">
             <field eval="50.0" name="planned_hours"/>
             <field name="user_id" ref="project.res_users_tester"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Unit Testing</field>
+            <field name="type_id" ref="project_tt_development"/>
         </record>
 
+        <function model="project.task" name="do_pending" eval="[ref('project_task_13')]"/>
+
         <record id="project_task_14" model="project.task">
             <field eval="30.0" name="planned_hours"/>
             <field name="user_id" ref="project.res_users_tester"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Regression Test</field>
+            <field name="type_id" ref="project_tt_development"/> 
+            <field name="state">pending</field> 
         </record>
 
         <record id="project_task_15" model="project.task">
@@ -188,6 +209,8 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Documentation</field>
+            <field name="type_id" ref="project_tt_specification"/>
+            <field name="date_start">2011-02-06</field>
         </record>
 
         <record id="project_task_16" model="project.task">
@@ -197,7 +220,9 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Performance Tuning</field>
+             <field name="type_id" ref="project_tt_specification"/>
         </record>
+        <function model="project.task" name="do_open" eval="[ref('project_task_16')]"/>
 
         <record id="project_task_17" model="project.task">
             <field eval="5.0" name="planned_hours"/>
@@ -205,7 +230,9 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Deploy and Review on Customer System</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
+        <function model="project.task" name="do_open" eval="[ref('project_task_17')]"/>
 
         <record id="project_task_18" model="project.task">
             <field eval="10.0" name="planned_hours"/>
@@ -213,6 +240,7 @@
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Training and Presentation</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
 
         <!--
@@ -243,6 +271,7 @@
             <field name="name">Study + Prototype</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development')])]" name="type_ids"/>
+            <field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
         </record>
         <record id="project_project_22" model="project.project">
             <field name="priority">20</field>
@@ -250,12 +279,14 @@
             <field name="name">Specific Developments</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]" name="type_ids"/>
+            <field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
         </record>
         <record id="project_project_23" model="project.project">
             <field name="priority">30</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Install, data import, configuration</field>
             <field eval="[(6, 0, [ref('project_tt_development')])]" name="type_ids"/>
+            <field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
         </record>
 
         <!-- Tasks -->
@@ -263,32 +294,38 @@
             <field name="planned_hours">38.0</field>
             <field name="remaining_hours">38.0</field>
             <field name="type_id" ref="project_tt_development"/>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" eval="False"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="description">BoM, After sales returns, interventions. Traceability.</field>
             <field name="name">Specific adaptation to MRP</field>
         </record>
+        <function model="project.task" name="do_open" eval="[ref('project_task_116')]"/>
+       
         <record id="project_task_130" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
+            <field name="user_id" eval="False"/>
             <field name="type_id" ref="project_tt_development"/>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Data importation + Doc</field>
         </record>
+        <function model="project.task" name="do_open" eval="[ref('project_task_130')]"/>
+
         <record id="project_task_131" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
+            <field name="user_id" eval="False"/>
             <field name="type_id" ref="project_tt_development"/>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Modifications asked by the customer.</field>
         </record>
+        <function model="project.task" name="do_open" eval="[ref('project_task_131')]"/>
+        
         <record id="project_task_184" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type_id" ref="project_tt_development"/>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field name="type_id" ref="project_tt_testing"/>
+            <field name="user_id" eval="False"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Customer analysis + Architecture</field>
@@ -297,8 +334,8 @@
             <field name="sequence">15</field>
             <field name="planned_hours">8.0</field>
             <field name="remaining_hours">8.0</field>
-            <field name="type_id" ref="project_tt_development"/>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field name="type_id" ref="project_tt_testing"/>
+            <field name="user_id" eval="False"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
         </record>
@@ -307,153 +344,38 @@
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
             <field name="type_id" ref="project_tt_development"/>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field name="user_id" eval="False"/>
             <field name="priority">2</field>
-            <field name="state">open</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Analysis, Data Importation</field>
         </record>
+        <function model="project.task" name="do_open" eval="[ref('project_task_188')]"/>
+        
         <record id="project_task_189" model="project.task">
             <field name="sequence">20</field>
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="state">open</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field name="user_id" eval="False"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Parameters</field>
+            <field name="type_id" ref="project_tt_specification"/>
         </record>
+        <function model="project.task" name="do_open" eval="[ref('project_task_189')]"/>
+        
         <record id="project_task_190" model="project.task">
             <field name="sequence">20</field>
             <field name="planned_hours">32.0</field>
             <field name="remaining_hours">32.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field name="user_id" eval="False"/>
             <field name="state">open</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Start of the doc redaction + MRP</field>
+            <field name="type_id" ref="project_tt_testing"/>
         </record>
-        <record id="project_task_192" model="project.task">
-            <field name="sequence">25</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="state">done</field>
-            <field name="name">MRP Tests</field>
-        </record>
-        <record id="project_task_193" model="project.task">
-            <field name="sequence">29</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">MRP; functional layer</field>
-            <field name="state">done</field>
-        </record>
-        <record id="project_task_194" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Products Adaptation</field>
-        </record>
-        <record id="project_task_195" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_23"/>
-            <field name="name">Install + Super User Training</field>
-        </record>
-        <record id="project_task_196" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">32.0</field>
-            <field name="remaining_hours">32.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Customer doc</field>
-        </record>
-        <record id="project_task_197" model="project.task">
-            <field name="sequence">30</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">Development of the presentation layer</field>
-        </record>
-        <record id="project_task_198" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">32.0</field>
-            <field name="remaining_hours">32.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">Free Time</field>
-        </record>
-        <record id="project_task_199" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">50.0</field>
-            <field name="remaining_hours">50.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Specific tests</field>
-        </record>
-        <record id="project_task_200" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Sale module</field>
-        </record>
-        <record id="project_task_201" model="project.task">
-            <field name="sequence">40</field>
-            <field name="planned_hours">32.0</field>
-            <field name="remaining_hours">32.0</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="project_id" ref="project_project_23"/>
-            <field name="state">open</field>
-            <field name="name">In house training</field>
-        </record>
-        <record id="project_task_202" model="project.task">
-            <field name="sequence">50</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="state">open</field>
-            <field name="name">Validation + latest modifications.</field>
-        </record>
-        <record id="project_task_203" model="project.task">
-            <field name="sequence">50</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Adaptations buy module</field>
-        </record>
-        <record id="project_task_204" model="project.task">
-            <field name="sequence">60</field>
-            <field name="planned_hours">16.0</field>
-            <field name="remaining_hours">16.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_21"/>
-            <field name="name">Presentation of the software.</field>
-        </record>
-        <record id="project_task_205" model="project.task">
-            <field name="sequence">60</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Adaptations Stock module</field>
-        </record>
-        <record id="project_task_206" model="project.task">
-            <field name="sequence">70</field>
-            <field name="planned_hours">24.0</field>
-            <field name="remaining_hours">24.0</field>
-            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
-            <field name="project_id" ref="project_project_22"/>
-            <field name="name">Latest in house tests</field>
-        </record>
+
+        <!-- Schedule tasks to assign users and dates -->
+
+        <function model="project.project" name="schedule_tasks" eval="[[ref('project_project_21'), ref('project_project_22'), ref('project_project_23')]]"/>
+
     </data>
 </openerp>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index d6538ac1310..338040df5e2 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -1,27 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-  <data>
+    <data>
 
-    <record id="view_project_installer" model="ir.ui.view">
-      <field name="name">project.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-          <data>
-          <xpath expr="//group[@name='project']" position="replace">
-            <newline/>
-            <separator  string="Project Management Features" colspan="4" />
-            <field name="project_issue" />
-            <field name="project_long_term" />
-            <field name="hr_timesheet_sheet" />
-            <field name="project_timesheet" />
-            <field name="account_budget" />
-            <field name="project_scrum" />
-            <field name="project_gtd" />
-          </xpath>
-        </data>
-      </field>
-    </record>
 
-  </data>
+        <record id="category_project_config" model="ir.actions.todo.category">
+            <field name="name">Project Management</field>
+            <field name="sequence">7</field>
+        </record>
+
+        <record id="action_create_initial_projects_installer" model="ir.actions.act_window">
+            <field name="name">Create your Firsts Projects</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="config_wizard_action_create_initial_projects_installer" model="ir.actions.todo">
+            <field name="action_id" ref="action_create_initial_projects_installer"/>
+            <field name="category_id" ref="category_project_config" />
+        </record>
+
+        <record id="action_review_task_stage" model="ir.actions.act_window">
+            <field name="name">Review Task Stages</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">project.task.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_common': 1, 'default_project_default': 1}</field>
+            <field name="domain">[]</field>
+            <field name="help">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.</field>
+        </record>
+
+        <record id="config_wizard_action_review_task_stage" model="ir.actions.todo">
+            <field name="action_id" ref="action_review_task_stage"/>
+            <field name="category_id" ref="category_project_config" />
+        </record>
+    </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 435bf64fe8d..50ab84c27f4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,7 +45,7 @@
                             <newline/>
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
-                                <field name="state" select="1" readonly="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
@@ -106,8 +106,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                   <group col='15' colspan='4'>
-                       <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects"/>
+                   <group>
+                       <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"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
                        <separator orientation="vertical"/>
@@ -118,7 +119,7 @@
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
-                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
                          <separator orientation="vertical"/>
@@ -134,7 +135,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:date and (date&lt;current_date) and (state in ('open'));blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree 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="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
@@ -174,7 +175,6 @@
             <field name="context">{'search_default_Current':1}</field>
             <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
         </record>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
@@ -257,10 +257,10 @@
                             </field>
                             <newline/>
                             <group col="11" colspan="4">
-                                <field name="state" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-                                <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
+                                <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending"/>
@@ -297,7 +297,7 @@
                                 <field name="create_date"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
-                            <field name="partner_id"/>
+                            <field name="partner_id" />
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
                                 <field name="type_id" widget="selection" readonly="1"/>
@@ -312,6 +312,87 @@
             </field>
         </record>
 
+	
+        <!-- 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>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="type_id" >
+                    <field name="color"/>
+                    <field name="priority"/>
+                    <field name="type_id"/>
+                    <field name="user_id"/>
+                    <field name="user_email"/>
+                    <field name="description"/>
+                    <field name="sequence"/>
+                    <field name="state"/>
+                    <field name="kanban_state"/>
+                    <field name="project_id"/>
+                    <field name="remaining_hours" sum="Remaining Time"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.str.underscored(_.str.trim(record.name.raw_value))"/></t>
+                            <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t>
+                            <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t>
+                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
+                                <div class="oe_kanban_box oe_kanban_color_border">
+                                    <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
+                                    <tr>
+                                        <td align="left" valign="middle" width="16">
+                                            <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
+                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                        </td>
+                                        <td align="left" valign="middle">
+                                            <b t-att-title="record.project_id.value"><field name="name"/></b>
+                                        </td>
+                                        <td valign="top" width="22">
+                                            <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>
+                                        </td>
+                                    </tr>
+                                    </table>
+                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+                                        <div class="oe_kanban_description">
+                                            <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/>
+                                            <span class="oe_kanban_project_times" style="white-space: nowrap">
+                                                <i t-if="record.date_deadline.raw_value"><field name="date_deadline"/> ,</i>
+                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
+                                                <t t-set="times" t-value="[
+                                                     [1, (hours gte 1 and hours lt 2)]
+                                                    ,[2, (hours gte 2 and hours lt 5)]
+                                                    ,[5, (hours gte 5 and hours lt 10)]
+                                                    ,[10, (hours gte 10)]
+                                                ]"/>
+                                                <t t-foreach="times" t-as="time"
+                                                    ><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
+                                                        type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
+                                                    ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
+                                                ></t>
+                                            </span>
+                                        </div>
+                                        <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_right">
+                                            <a name="set_kanban_state_blocked" string="Block" kanban_states="normal,done" type="object" icon="kanban-stop"/>
+                                            <a name="set_kanban_state_normal" string="Normal" kanban_states="blocked,done" type="object" icon="gtk-media-play"/>
+                                            <a name="set_kanban_state_done" string="Done" kanban_states="blocked,normal" type="object" icon="kanban-apply"/>
+                                        </div>
+                                        <div class="oe_kanban_clear"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+         </record>
+
         <record id="view_task_tree2" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
@@ -325,9 +406,9 @@
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="total_hours" invisible="1"/>
-                     <field name="planned_hours"/>
+                    <field name="planned_hours" invisible="context.get('set_visible',False)"/>
                     <field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/>
-                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
+                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
@@ -341,8 +422,7 @@
                     <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
-                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-                    <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                 </tree>
@@ -368,10 +448,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="user_id" date_start="date_start" date_stop="date_end" string="Tasks">
-                    <level object="project.project" link="project_id" domain="[]">
-                        <field name="name"/>
-                    </level>
+                <gantt color="user_id" date_start="date_start" date_stop="date_end" string="Tasks" default_group_by="project_id,user_id">
                 </gantt>
             </field>
         </record>
@@ -394,10 +471,10 @@
             <field name="model">project.task</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-               <search string="Task Edition">
-                    <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, In Progress and Pending Tasks" icon="terp-check"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
+               <search string="Tasks">
+                    <group>
+                        <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"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <filter name="edit"
@@ -407,16 +484,17 @@
                         <separator orientation="vertical"/>
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="project_id" select="1">
+                        <field name="name"/>
+                        <field name="project_id" context="{'project_id':self}">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
-                        <field name="user_id" select="1">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" separator="1"/>
+                        <field name="user_id">
+                            <filter domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@@ -437,20 +515,21 @@
             <field name="name">Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,gantt,graph</field>
+            <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_user_id":uid, "search_default_current": 1}</field>
+            <field name="context">{"search_default_draft": 1, "search_default_open":1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
+
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form,calendar,graph,kanban</field>
             <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
@@ -461,7 +540,7 @@
             <field name="res_model">project.task</field>
             <field name="name">Project's tasks</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph,gantt</field>
+            <field name="view_mode">tree,form,calendar,graph,gantt,kanban</field>
             <field name="domain">[('project_id', 'child_of', [active_id])]</field>
             <field name="context">{'project_id':active_id, 'active_test':False}</field>
         </record>
@@ -471,10 +550,24 @@
             <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"/>
-            <field eval="True" name="object"/>
         </record>
 
         <!-- Task types -->
+        <record id="task_type_search" model="ir.ui.view">
+            <field name="name">project.task.type.search</field>
+            <field name="model">project.task.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Tasks Stages">
+                   <group>
+                       <filter icon="terp-check" string="Common" name="common" domain="[('project_default', '=', 1)]" help="Stages common to all projects"/>
+                       <separator orientation="vertical"/>
+                       <field name="name"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
         <record id="task_type_edit" model="ir.ui.view">
             <field name="name">project.task.type.form</field>
             <field name="model">project.task.type</field>
@@ -482,7 +575,7 @@
             <field name="arch" type="xml">
                 <form string="Task Stage">
                     <group colspan="4" col="6">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="project_default"/>
                     <field name="sequence"/>
                     </group>
@@ -513,7 +606,11 @@
         </record>
 
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
-        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
+
+        <menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
+
+        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" 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"/>
 
@@ -562,11 +659,10 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <group name="default_filters" position="inside">
-                <field name="context_project_id" context="{'user_prefence':True}" widget="selection"/>
+                <field name="context_project_id" context="{'user_preference':True}" widget="selection"/>
             </group>
        </field>
     </record>
-    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
-    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
+    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
     </data>
 </openerp>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 989f646724e..fb1b0b030d6 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -128,6 +128,7 @@ class project_vs_hours(osv.osv):
     _columns = {
         'project': fields.char('Project', size=128, required=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
+        'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
         'planned_hours': fields.float('Planned Hours', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
         'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True, readonly=True)
@@ -140,7 +141,7 @@ class project_vs_hours(osv.osv):
             CREATE or REPLACE view project_vs_hours as (
                 select
                       min(pt.id) as id,
-                      aaa.user_id as uid,
+                      aaa.user_id as user_id,
                       aaa.name as project,
                       aaa.state,
                       sum(pt.remaining_hours) as remaining_hours,
@@ -154,7 +155,7 @@ class project_vs_hours(osv.osv):
                  UNION All
                  SELECT
                       min(pt.id) as id,
-                      pur.uid as uid,
+                      pur.uid as user_id,
                       aaa.name as project,
                       aaa.state,
                       sum(pt.remaining_hours) as remaining_hours,
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index eaf0985faef..cfa667c7590 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -59,25 +59,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
-                    <group colspan="10" col="12">
-                        <filter icon="terp-go-year" string="  Year  "
+                    <group>
+                        <filter icon="terp-go-year" string="Year"
+                                name="year"
                                 domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
                                 help="Current Year"/>
-                        <filter icon="terp-go-month" string="   Month   "
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-month" string="Month"
                                 name="month"
                                 domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                                 help="Current Month"/>
                         <filter icon="terp-go-week"
-                                string="    Month-1    "
-                                separator="1"
+                                string="Month-1"
                                 domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                                 help="Previous Month"/>
                         <separator orientation="vertical"/>
-                        <filter string="Draft"
+                        <filter string="New"
                                 icon="terp-document-new"
                                 domain="[('state','=','draft')]"
-                                help = "Draft tasks"/>
-                        <filter string="Current"
+                                help = "New tasks"/>
+                        <filter string="In progress"
                                 icon="terp-check"
                                 domain="[('state', '=' ,'open')]"
                                 help = "In progress tasks"/>
@@ -109,7 +110,7 @@
                       <field name="partner_id" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="priority"/>
                         <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
@@ -122,7 +123,7 @@
 
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
+                    <group expand="1" string="Group By...">
                         <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
@@ -147,7 +148,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
@@ -185,7 +186,7 @@
         <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
-        <field name="domain">[('uid','=',uid),('state','=','open')]</field>
+        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
         <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
     </record>
 
@@ -273,7 +274,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="context">{}</field>
-        <field name="domain">[('uid','=',uid),('state','=','open')]</field>
+        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
         <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
     </record>
 
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 69e1051e621..f5324d2b6aa 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import project_task_close
+import mail_compose_message
 import project_task_delegate
 import project_task_reevaluate
 
diff --git a/addons/project/wizard/mail_compose_message.py b/addons/project/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..82d67ea9b92
--- /dev/null
+++ b/addons/project/wizard/mail_compose_message.py
@@ -0,0 +1,72 @@
+# -*- 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
+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
+        '''
+        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'project.task' and resource_id:
+            task_pool = self.pool.get('project.task')
+            task_data = task_pool.browse(cr, uid, resource_id, context=context)
+            partner = task_data.partner_id or task_data.project_id.partner_id
+            if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) :
+                raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
+            elif task_data.project_id.warn_customer and (not partner or not len(partner.address) or (partner and len(partner.address) and not partner.address[0].email)):
+                raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
+
+            result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
+            val = {
+                    'name': task_data.name,
+                    'user_id': task_data.user_id.name,
+                    'task_id': "%d/%d" % (task_data.project_id.id, task_data.id),
+                    'date_start': task_data.date_start,
+                    'date': task_data.date_end,
+                    'state': task_data.state
+            }
+            header = (task_data.project_id.warn_header or '') % val
+            footer = (task_data.project_id.warn_footer or '') % val
+            description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
+            if partner and len(partner.address):
+                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
+            result.update({
+                       'body_text': description or False,
+                       'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,
+                       'subject':  _("Task '%s' Closed") % task_data.name,
+                       'model': model,
+                       'res_id': resource_id,
+                    })
+
+        return result
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
deleted file mode 100644
index 627864820f6..00000000000
--- a/addons/project/wizard/project_task_close.py
+++ /dev/null
@@ -1,122 +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 tools
-from tools.translate import _
-import re
-class project_task_close(osv.osv_memory):
-    """
-    Close Task
-    """
-    _name = "project.task.close"
-    _description = "Project Close Task"
-    _columns = {
-        'manager_warn': fields.boolean("Warn Manager", help="Warn Manager by Email"),
-        'partner_warn': fields.boolean("Warn Customer", help="Warn Customer by Email"),
-        'manager_email': fields.char('Manager Email', size=128, help="Email Address of Project's Manager"),
-        'partner_email': fields.char('Customer Email', size=128, help="Email Address of Customer"),
-        'description': fields.text('Description'),
-    }
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        if context is None:
-            context = {}
-        record_id = context and context.get('active_id', False) or False
-        task_pool = self.pool.get('project.task')
-                
-        res = super(project_task_close, self).default_get(cr, uid, fields, context=context)
-        task = task_pool.browse(cr, uid, record_id, context=context)
-        project = task.project_id
-        manager = project.user_id or False
-        partner = task.partner_id or task.project_id.partner_id
-        
-        if 'description' in fields:
-            res.update({'description': task.description or False})
-        if 'manager_warn' in fields:
-            res.update({'manager_warn': project.warn_manager or False})
-        if 'partner_warn' in fields:
-            res.update({'partner_warn': project.warn_customer or False})
-        if 'manager_email' in fields:
-            res.update({'manager_email': manager and manager.user_email or False})
-        if partner and len(partner.address) and 'partner_email' in fields:
-            res.update({'partner_email': partner.address[0].email})
-        return res
-
-    def send(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        
-        task_pool = self.pool.get('project.task')
-        task_id = context.get('active_id', False)
-        if not task_id:
-            return {}
-        task = task_pool.browse(cr, uid, task_id, context=context)
-        for data in self.browse(cr, uid, ids, context=context):
-            # Send Warn Message by Email to Manager and Customer
-            if data.manager_warn and not data.manager_email:
-                raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager."))
-
-            elif data.partner_warn and not data.partner_email:
-                raise osv.except_osv(_('Error'), _("Please specify the email address of Customer."))
-
-            elif data.manager_warn or data.partner_warn:
-                project = task.project_id
-                subject = _("Task '%s' Closed") % task.name
-                if task.user_id  and task.user_id.user_email:
-                    from_adr = task.user_id.user_email
-                    signature = task.user_id.signature
-                else:
-                    raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
-                val = {
-                        'name': task.name,
-                        'user_id': task.user_id.name,
-                        'task_id': "%d/%d" % (project.id, task.id),
-                        'date_start': task.date_start,
-                        'date_end': task.date_end,
-                        'state': task.state
-                }
-
-                to_adr = []
-                header = footer = ''
-                try:
-                    header_str = (project.warn_header or '')
-                    footer_str = (project.warn_footer or '')
-                    header = (re.sub(r'\%\W*\(', '%(', header_str)) % val
-                    footer = (re.sub(r'\%\W*\(', '%(', footer_str)) % val
-                except:
-                    raise osv.except_osv(_('Error'), _("Invlaid automatic variables used in project header or foooter."))
-                body = u'%s\n%s\n%s\n\n-- \n%s' % (header, data.description or '', footer, signature)
-                if data.manager_warn and data.manager_email:
-                    to_adr.append(data.manager_email)
-                if data.partner_warn and data.partner_email:
-                    to_adr.append(data.partner_email)
-                mail_id = tools.email_send(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr])
-                if not mail_id:
-                    raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings"))
-        return {'type': 'ir.actions.act_window_close'}
-
-project_task_close()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_close_view.xml b/addons/project/wizard/project_task_close_view.xml
deleted file mode 100644
index d6bed92824d..00000000000
--- a/addons/project/wizard/project_task_close_view.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	<record id="view_project_task_close" model="ir.ui.view">
-            <field name="name">Send Email</field>
-            <field name="model">project.task.close</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              	<form string="Send Email">
-              		  <group colspan="4" col="4">
-                            <field name="manager_warn" invisible="1"/>
-		                    <field name="manager_email" widget="email" attrs="{'invisible':[('manager_warn','=',False)], 'required':[('manager_warn','=',True)]}" width="250"/>
-                            <field name="partner_warn" invisible="1"/>
-		                    <field name="partner_email" widget="email" attrs="{'invisible':[('partner_warn','=',False)], 'required':[('partner_warn','=',True)]}"/>
-					        <separator string="Warn Message" colspan="4"/>
-		                    <field name="description" nolabel="1" colspan="4" width="200" height="150"/>
-		              </group>
-		              <separator string="" colspan="4"/>
-                      <group colspan="2" col="2">
-                      </group>
-		              <group colspan="2" col="3">
-		            		<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            		<button  icon="terp-mail-message-new" string="_Send" name="send" type="object"/>
-		              </group>
-			  	</form>
-            </field>
-		</record>
-
-		<record id="action_project_task_close" model="ir.actions.act_window">
-	           <field name="name">Send Email</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">project.task.close</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-	           <field name="view_id" ref="view_project_task_close"/>
-	           <field name="target">new</field>
-    	</record>
-
-    </data>
-</openerp>
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index eaf5dea3084..efadc3f124b 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -31,14 +31,23 @@ class project_task_delegate(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Delegated Title', size=64, required=True, help="New title of the task delegated to the user"),
-        'prefix': fields.char('Your Task Title', size=64, required=True, help="Title for your validation task"),
+        'prefix': fields.char('Your Task Title', size=64, help="Title for your validation task"),
+        'project_id': fields.many2one('project.project', 'Project', help="User you want to delegate this task to"),
         'user_id': fields.many2one('res.users', 'Assign To', required=True, help="User you want to delegate this task to"),
         'new_task_description': fields.text('New Task Description', help="Reinclude the description of the task in the task of the user"),
         'planned_hours': fields.float('Planned Hours',  help="Estimated time to close this task by the delegated user"),
-        'planned_hours_me': fields.float('Hours to Validate', required=True, help="Estimated time for you to validate the work done by the user to whom you delegate this task"),
-        'state': fields.selection([('pending','Pending'), ('done','Done'), ], 'Validation State', required=True, help="New state of your own task. Pending will be reopened automatically when the delegated task is closed")
+        'planned_hours_me': fields.float('Hours to Validate', help="Estimated time for you to validate the work done by the user to whom you delegate this task"),
+        'state': fields.selection([('pending','Pending'), ('done','Done'), ], 'Validation State', help="New state of your own task. Pending will be reopened automatically when the delegated task is closed")
     }
 
+    def onchange_project_id(self, cr, uid, ids, project_id=False, context=None):
+        project_project = self.pool.get('project.project')
+        if not project_id:
+            return {'value':{'user_id': False}}
+        project = project_project.browse(cr, uid, project_id, context=context)
+        return {'value': {'user_id': project.user_id and project.user_id.id or False}}
+        
+
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
@@ -47,10 +56,15 @@ class project_task_delegate(osv.osv_memory):
         if context is None:
             context = {}
         record_id = context and context.get('active_id', False) or False
+        if not record_id:
+            return res
         task_pool = self.pool.get('project.task')
         task = task_pool.browse(cr, uid, record_id, context=context)
         task_name =tools.ustr(task.name)
 
+        if 'project_id' in fields:
+            res.update({'project_id': task.project_id and task.project_id.id})
+
         if 'name' in fields:
             if task_name.startswith(_('CHECK: ')):
                 newname = tools.ustr(task_name).replace(_('CHECK: '), '')
@@ -105,9 +119,19 @@ class project_task_delegate(osv.osv_memory):
         task_id = context.get('active_id', False)
         task_pool = self.pool.get('project.task')
         delegate_data = self.read(cr, uid, ids, context=context)[0]
-        delegate_data['user_id'] = delegate_data['user_id'][0]
-        delegate_data['name'] = tools.ustr(delegate_data['name'])
-        task_pool.do_delegate(cr, uid, task_id, delegate_data, context=context)
-        return {'type': 'ir.actions.act_window_close'}
+        delegated_tasks = task_pool.do_delegate(cr, uid, [task_id], delegate_data, context=context)
+        models_data = self.pool.get('ir.model.data')
+
+        action_model, action_id = models_data.get_object_reference(cr, uid, 'project', 'action_view_task')
+        view_model, task_view_form_id = models_data.get_object_reference(cr, uid, 'project', 'view_task_form2')
+        view_model, task_view_tree_id = models_data.get_object_reference(cr, uid, 'project', 'view_task_tree2')
+        action = self.pool.get(action_model).read(cr, uid, action_id, context=context)         
+        action['res_id'] = delegated_tasks[task_id]
+        action['view_id'] = False
+        action['views'] = [(task_view_form_id, 'form'), (task_view_tree_id, 'tree')]
+        action['help'] = False    
+        return action
 
 project_task_delegate()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index f9b27af05b3..072325c2b53 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -8,18 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Project Task Delegate">
+                      <field name="project_id" on_change="onchange_project_id(project_id)"/>
+		              <field name="user_id"/>
                       <group colspan="2" col="2">
 	                        <separator string="Delegated Task" colspan="4"/>
-		                    <field name="user_id" colspan="4"/>
-		                    <field name="planned_hours" widget="float_time" colspan="4"/>
-		                    <field name="name" colspan="4"/>
+                            <field name="name"/>
+                            <field name="planned_hours"/>
                             <separator string="New Task Description" colspan="4"/>
-		                    <field name="new_task_description" colspan="4" nolabel="1"/>
+                            <field name="new_task_description" colspan="4" nolabel="1"/>
                       </group>
                       <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
-		                    <field name="planned_hours_me"  widget="float_time" colspan="4"/>
-           	                <field name="prefix" string="Validation Task Title" colspan="4"/>
+                            <field name="prefix" string="Validation Task Title"/>
+		                    <field name="planned_hours_me"/>
                             <field name="state" colspan="4"/>
 		              </group>
                       <separator string="" colspan="4"/>
@@ -40,7 +41,6 @@
 	           <field name="view_type">form</field>
 	           <field name="view_mode">form</field>
 	           <field name="view_id" ref="view_project_task_delegate"/>
-		       <field name="context">{'record_id' : active_id}</field>
 	           <field name="target">new</field>
     	</record>
 
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
index d627ffa4408..382c9d64361 100644
--- a/addons/project/wizard/project_task_reevaluate.py
+++ b/addons/project/wizard/project_task_reevaluate.py
@@ -73,11 +73,13 @@ class project_task_reevaluate(osv.osv_memory):
         if context is None:
             context = {}
         data = self.browse(cr, uid, ids, context=context)[0]
-        task_pool = self.pool.get('project.task')
-        task_id = context.get('active_id', False)
+        task_id = context.get('active_id')
         if task_id:
+            task_pool = self.pool.get('project.task')
             task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
-            if context.get('button_reactivate', False):
+            if context.get('button_reactivate'):
                 task_pool.do_reopen(cr, uid, [task_id], context=context)
         return {'type': 'ir.actions.act_window_close'}
 project_task_reevaluate()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 29c9ec4d483..6e716a2e9d0 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "CalDAV for Task Management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Project Management",
+    "category": "Hidden",
     "description": """
 Synchronization between Project Task and Caldav Vtodo.
 ======================================================
@@ -41,3 +41,5 @@ on a remote server.
     "certificate" : "001114200456808204637",
     'images': ['images/project_tasks_caldav.jpeg','images/project_tasks_caldav_attendees.jpeg','images/project_caldav_calendars.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_caldav/i18n/bg.po b/addons/project_caldav/i18n/bg.po
index d67ab826c90..a18cdaa4c67 100644
--- a/addons/project_caldav/i18n/bg.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/ca.po b/addons/project_caldav/i18n/ca.po
index a923b01bbad..0ae09d0b79b 100644
--- a/addons/project_caldav/i18n/ca.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -23,450 +23,453 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Aquesta propietat defineix la llista d'excepcions de data/hora per un "
+"esdeveniment de calendari recurrent."
 
 #. module: project_caldav
 #: field:project.task,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Dc"
 
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensual"
 
 #. module: project_caldav
 #: help:project.task,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Reunió periòdica"
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Diumenge"
 
 #. module: project_caldav
 #: selection:project.task,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Quart"
 
 #. module: project_caldav
 #: field:project.task,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Mostra com"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Assignees details"
-msgstr ""
+msgstr "Detalls assignats"
 
 #. module: project_caldav
 #: field:project.task,day:0
 #: selection:project.task,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Dia del mes"
 
 #. module: project_caldav
 #: selection:project.task,class:0
 msgid "Public"
-msgstr ""
+msgstr "Públic"
 
 #. module: project_caldav
 #: field:project.task,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "URL de caldav"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: project_caldav
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Divendres"
 
 #. module: project_caldav
 #: field:project.task,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Tot el dia"
 
 #. module: project_caldav
 #: selection:project.task,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Lliure"
 
 #. module: project_caldav
 #: field:project.task,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Dll"
 
 #. module: project_caldav
 #: model:ir.model,name:project_caldav.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_caldav
 #: selection:project.task,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Darrer"
 
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "Days"
-msgstr ""
+msgstr "Dies"
 
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "No repeteix"
 
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Anual"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Opció de recurrencia"
 
 #. module: project_caldav
 #: field:project.task,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Dt."
 
 #. module: project_caldav
 #: field:project.task,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Repeteix fins"
 
 #. module: project_caldav
 #: field:project.task,organizer:0
 #: field:project.task,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organitzador"
 
 #. module: project_caldav
 #: help:project.task,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Edita totes les ocurrències de la reunió recurrent."
 
 #. module: project_caldav
 #: field:project.task,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Ds."
 
 #. module: project_caldav
 #: field:project.task,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Assistents"
 
 #. module: project_caldav
 #: field:project.task,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Dg."
 
 #. module: project_caldav
 #: selection:project.task,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Dia del mes"
 
 #. module: project_caldav
 #: field:project.task,location:0
 msgid "Location"
-msgstr ""
+msgstr "Ubicació"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Mail TO"
-msgstr ""
+msgstr "Envia correu a"
 
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Setmanes"
 
 #. module: project_caldav
 #: field:project.task,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Opció"
 
 #. module: project_caldav
 #: selection:project.task,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Confidencial"
 
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "Hours"
-msgstr ""
+msgstr "Hores"
 
 #. module: project_caldav
 #: field:project.task,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "ID recurrent"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: project_caldav
 #: field:project.task,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Dj."
 
 #. module: project_caldav
 #: selection:project.task,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Sempre"
 
 #. module: project_caldav
 #: help:project.task,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Repeteix x vegades"
 
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "A diari"
 
 #. module: project_caldav
 #: field:project.task,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Marca com a"
 
 #. module: project_caldav
 #: field:project.task,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "Repeteix"
 
 #. module: project_caldav
 #: help:project.task,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
 msgstr ""
+"Permet que l'esdeveniment es repeteixi automàticament en aquest interval"
 
 #. module: project_caldav
 #: selection:project.task,byday:0
 msgid "First"
-msgstr ""
+msgstr "Primer"
 
 #. module: project_caldav
 #: code:addons/project_caldav/project_caldav.py:67
 #, python-format
 msgid "Tasks"
-msgstr ""
+msgstr "Tasques"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Dimarts"
 
 #. module: project_caldav
 #: field:project.task,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_caldav
 #: model:ir.module.module,shortdesc:project_caldav.module_meta_information
 msgid "CalDAV for task management"
-msgstr ""
+msgstr "CalDAV per la gestió de tasques"
 
 #. module: project_caldav
 #: field:project.task,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Fus horari"
 
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Setmanal"
 
 #. module: project_caldav
 #: field:project.task,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "Edita tot"
 
 #. module: project_caldav
 #: field:project.task,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Dv."
 
 #. module: project_caldav
 #: help:project.task,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Localització de l'esdeveniment"
 
 #. module: project_caldav
 #: field:project.task,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Regla recurrent"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "From"
-msgstr ""
+msgstr "Des de"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Reminder"
-msgstr ""
+msgstr "Recordatori"
 
 #. module: project_caldav
 #: model:ir.module.module,description:project_caldav.module_meta_information
 msgid " Synchronize between Project task and Caldav Vtodo."
-msgstr ""
+msgstr " Sincronitza entre tasques de projecte i Caldav Vtodo."
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Assignees Detail"
-msgstr ""
+msgstr "Detall de l'assignació"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Dilluns"
 
 #. module: project_caldav
 #: selection:project.task,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Tercer"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: project_caldav
 #: field:project.task,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Data d'escriptura"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Mesos"
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Dimecres"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Repeat Times"
-msgstr ""
+msgstr "Repeticions"
 
 #. module: project_caldav
 #: selection:project.task,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "To"
-msgstr ""
+msgstr "Fins"
 
 #. module: project_caldav
 #: field:project.task,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Data ID recurrents"
 
 #. module: project_caldav
 #: field:project.task,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Freqüència"
 
 #. module: project_caldav
 #: help:project.task,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Repeteix cada (dies/setmana/mes/any)"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #. module: project_caldav
 #: selection:project.task,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Ocupat"
 
 #. module: project_caldav
 #: field:project.task,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Repeteix cada"
 
 #. module: project_caldav
 #: selection:project.task,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Fixa la quantitat de vegades"
 
 #. module: project_caldav
 #: field:project.task,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Recurrent"
 
 #. module: project_caldav
 #: view:project.task:0
 #: field:project.task,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Recurrència"
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Dijous"
 
 #. module: project_caldav
 #: field:project.task,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Regla d'excepció"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Other"
-msgstr ""
+msgstr "Altres"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: project_caldav
 #: help:project.task,exrule:0
@@ -474,11 +477,13 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Defineix una regla o patró de repetició de temps a excloure de la regla "
+"recurrent."
 
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Anys"
 
 #. module: project_caldav
 #: help:project.task,rrule:0
@@ -487,90 +492,94 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Definiu una regla o patró repetitiu per esdeveniments recurrents.\n"
+"Per exemple: Per 10 ocurrències cada últim diumenge de cada dos mesos : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Assign Task"
-msgstr ""
+msgstr "Assigna tasca"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "Regla de recurrencia"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: project_caldav
 #: field:project.task,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Data/hores d'excepció"
 
 #. module: project_caldav
 #: field:project.task,alarm_id:0
 #: field:project.task,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: project_caldav
 #: field:project.task,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Dia de la setmana"
 
 #. module: project_caldav
 #: field:project.task,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Per dia"
 
 #. module: project_caldav
 #: view:project.task:0
 msgid "The"
-msgstr ""
+msgstr "El/La"
 
 #. module: project_caldav
 #: help:project.task,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
 msgstr ""
+"Configureu una alarma en aquest moment, abans que succeeixi l'esdeveniment"
 
 #. module: project_caldav
 #: selection:project.task,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: project_caldav
 #: selection:project.task,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Segon"
 
 #. module: project_caldav
 #: field:project.task,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "Forma d'acabar recurrència"
 
 #. module: project_caldav
 #: field:project.task,date:0
 #: field:project.task,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durada"
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Dissabte"
 
 #. module: project_caldav
 #: selection:project.task,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Cinquè"
diff --git a/addons/project_caldav/i18n/de.po b/addons/project_caldav/i18n/de.po
index e687c7c2a43..ef06e4f60b3 100644
--- a/addons/project_caldav/i18n/de.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -579,51 +579,3 @@ msgstr "Samstag"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "5ter"
-
-#~ msgid "Exclude range"
-#~ msgstr "Zurücknahme Datumsbereich"
-
-#~ msgid "Minutes"
-#~ msgstr "Minuten"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Wiederhole Bis"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Wähle Daten für Regel"
-
-#~ msgid "Count"
-#~ msgstr "Anzahl"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Custom"
-#~ msgstr "Individuell"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalle"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunden"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Max. Wiederholungen"
-
-#~ msgid "Can not map a field more than once"
-#~ msgstr "Kann kein Feld mehr als einmal verbinden"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/project_caldav/i18n/el.po b/addons/project_caldav/i18n/el.po
index d414f11073a..bc060c1e5bf 100644
--- a/addons/project_caldav/i18n/el.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
index 94a91119eae..15211f59d0a 100644
--- a/addons/project_caldav/i18n/es.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -581,51 +581,3 @@ msgstr "Sábado"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "Quinto"
-
-#~ msgid "Can not map a field more than once"
-#~ msgstr "No puede mapear un campo más de una vez"
-
-#~ msgid "Exclude range"
-#~ msgstr "Excluir rango"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir cada x"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la definición de la vista!"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Repetir max. estas veces"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Regla de recurrencia personalizada"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizado"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalo"
-
-#~ msgid "Count"
-#~ msgstr "Contador"
diff --git a/addons/project_caldav/i18n/es_MX.po b/addons/project_caldav/i18n/es_MX.po
new file mode 100644
index 00000000000..176c4f3fb30
--- /dev/null
+++ b/addons/project_caldav/i18n/es_MX.po
@@ -0,0 +1,583 @@
+# 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-18 08:13+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:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
+"de calendario recurrente."
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr "Mier"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: project_caldav
+#: help:project.task,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Reunión recurrente"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr "Detalles asignados"
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr "Día del mes"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr "Público"
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr "Último"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr "Días"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr "Anual"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Option"
+msgstr "Opción de recurrencia"
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr "Organizador"
+
+#. module: project_caldav
+#: help:project.task,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr "Editar todas las ocurrencias de la reunión recurrente."
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr "Participantes"
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr "Enviar correo a"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "Forever"
+msgstr "Siempre"
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat x times"
+msgstr "Repetir x veces"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr "Cada día"
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Repeat"
+msgstr "Repetir"
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Permite que el evento se repita en ese intervalo"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr "Primero"
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:67
+#, python-format
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr "CalDAV para la gestión de tareas"
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr "Cada semana"
+
+#. module: project_caldav
+#: field:project.task,edit_all:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr "Lacalización del evento"
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr "De"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr "Recordar"
+
+#. module: project_caldav
+#: model:ir.module.module,description:project_caldav.module_meta_information
+msgid " Synchronize between Project task and Caldav Vtodo."
+msgstr " Sincroniza entre tareas de proyecto y Caldav Vtodo."
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr "Detalle de la asignación"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr "Fecha de escritura"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Repeat Times"
+msgstr "Repeticiones"
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr "Hasta el"
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr "de"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr "Ocupado"
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Repeat every"
+msgstr "Repetir cada"
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "Fix amout of times"
+msgstr "Cantidad fija de veces"
+
+#. module: project_caldav
+#: field:project.task,recurrency:0
+msgid "Recurrent"
+msgstr "Recurrente"
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr "Regla de excepción"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr "Asignar Tarea"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Rule"
+msgstr "Regla de recurrencia"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarma"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr "El"
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: project_caldav
+#: field:project.task,end_type:0
+msgid "Way to end reccurency"
+msgstr "Forma de terminar recurrencia"
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr "Quinto"
diff --git a/addons/project_caldav/i18n/es_VE.po b/addons/project_caldav/i18n/es_VE.po
new file mode 100644
index 00000000000..176c4f3fb30
--- /dev/null
+++ b/addons/project_caldav/i18n/es_VE.po
@@ -0,0 +1,583 @@
+# 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-18 08:13+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:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
+"de calendario recurrente."
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr "Mier"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: project_caldav
+#: help:project.task,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Reunión recurrente"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr "Detalles asignados"
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr "Día del mes"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr "Público"
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr "Último"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr "Días"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr "Anual"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Option"
+msgstr "Opción de recurrencia"
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr "Organizador"
+
+#. module: project_caldav
+#: help:project.task,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr "Editar todas las ocurrencias de la reunión recurrente."
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr "Participantes"
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr "Enviar correo a"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "Forever"
+msgstr "Siempre"
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat x times"
+msgstr "Repetir x veces"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr "Cada día"
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Repeat"
+msgstr "Repetir"
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Permite que el evento se repita en ese intervalo"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr "Primero"
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:67
+#, python-format
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr "CalDAV para la gestión de tareas"
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr "Cada semana"
+
+#. module: project_caldav
+#: field:project.task,edit_all:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr "Lacalización del evento"
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr "De"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr "Recordar"
+
+#. module: project_caldav
+#: model:ir.module.module,description:project_caldav.module_meta_information
+msgid " Synchronize between Project task and Caldav Vtodo."
+msgstr " Sincroniza entre tareas de proyecto y Caldav Vtodo."
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr "Detalle de la asignación"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr "Fecha de escritura"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Repeat Times"
+msgstr "Repeticiones"
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "End date"
+msgstr "Fecha de fin"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr "Hasta el"
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr "de"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr "Ocupado"
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Repeat every"
+msgstr "Repetir cada"
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "Fix amout of times"
+msgstr "Cantidad fija de veces"
+
+#. module: project_caldav
+#: field:project.task,recurrency:0
+msgid "Recurrent"
+msgstr "Recurrente"
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr "Regla de excepción"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr "Asignar Tarea"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Rule"
+msgstr "Regla de recurrencia"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarma"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr "El"
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: project_caldav
+#: field:project.task,end_type:0
+msgid "Way to end reccurency"
+msgstr "Forma de terminar recurrencia"
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr "Quinto"
diff --git a/addons/project_caldav/i18n/fi.po b/addons/project_caldav/i18n/fi.po
index 176c2097a77..8c11a952bbe 100644
--- a/addons/project_caldav/i18n/fi.po
+++ b/addons/project_caldav/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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/fr.po b/addons/project_caldav/i18n/fr.po
index 292dfac9732..f0a6f0920fe 100644
--- a/addons/project_caldav/i18n/fr.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -582,27 +582,3 @@ msgstr "Samedi"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "Cinquième"
-
-#~ msgid "Exclude range"
-#~ msgstr "Exclure la plage"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutes"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Répéter tous les x"
-
-#~ msgid "Seconds"
-#~ msgstr "Secondes"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Nombre de répétitions maximum"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Personnaliser la régle de récurrence"
-
-#~ msgid "Custom"
-#~ msgstr "Personnalisé"
-
-#~ msgid "Interval"
-#~ msgstr "Intervalle"
diff --git a/addons/project_caldav/i18n/gl.po b/addons/project_caldav/i18n/gl.po
index 252e44a9258..5e538a0c28b 100644
--- a/addons/project_caldav/i18n/gl.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/hu.po b/addons/project_caldav/i18n/hu.po
index f60a1a0b4b9..9a344d1fdac 100644
--- a/addons/project_caldav/i18n/hu.po
+++ b/addons/project_caldav/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-25 10:54+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/it.po b/addons/project_caldav/i18n/it.po
index ac1eb5dc61b..d96b99e4775 100644
--- a/addons/project_caldav/i18n/it.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -578,6 +578,3 @@ msgstr "Sabato"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "Quinto"
-
-#~ msgid "Interval"
-#~ msgstr "Intervallo"
diff --git a/addons/project_caldav/i18n/lv.po b/addons/project_caldav/i18n/lv.po
index ecdb92f0d66..52d422d45f2 100644
--- a/addons/project_caldav/i18n/lv.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -578,30 +578,3 @@ msgstr "Sestdiena"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "Piektais"
-
-#~ msgid "Exclude range"
-#~ msgstr "Izņemot periodu"
-
-#~ msgid "Minutes"
-#~ msgstr "Minūtes"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Atkārtot katru"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekundes"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Atkārtot maksimums tik reižu"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Pielāgotais atkārtošanas noteikums"
-
-#~ msgid "Count"
-#~ msgstr "Skaits"
-
-#~ msgid "Custom"
-#~ msgstr "Pielāgots"
-
-#~ msgid "Interval"
-#~ msgstr "Intervāls"
diff --git a/addons/project_caldav/i18n/nl.po b/addons/project_caldav/i18n/nl.po
index 8ea4b1f5c01..b4a3553b9df 100644
--- a/addons/project_caldav/i18n/nl.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/pl.po b/addons/project_caldav/i18n/pl.po
index 2ccc0b6b826..5841d43d41d 100644
--- a/addons/project_caldav/i18n/pl.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -578,30 +578,3 @@ msgstr "Sobota"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "Piąty"
-
-#~ msgid "Exclude range"
-#~ msgstr "Wyłączony zakres"
-
-#~ msgid "Minutes"
-#~ msgstr "Minuty"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Powtarzaj co x"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekundy"
-
-#~ msgid "Repeat max that times"
-#~ msgstr "Powtórz maksymalnie tyle razy"
-
-#~ msgid "Custom Recurrency Rule"
-#~ msgstr "Własna reguła rekurencji"
-
-#~ msgid "Count"
-#~ msgstr "Liczba"
-
-#~ msgid "Custom"
-#~ msgstr "Własne"
-
-#~ msgid "Interval"
-#~ msgstr "Interwał"
diff --git a/addons/project_caldav/i18n/pt.po b/addons/project_caldav/i18n/pt.po
index 93ba17245f3..fc852bd0007 100644
--- a/addons/project_caldav/i18n/pt.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -574,12 +574,3 @@ msgstr "Sábado"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr ""
-
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
-
-#~ msgid "Seconds"
-#~ msgstr "Segundos"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetir a cada x"
diff --git a/addons/project_caldav/i18n/pt_BR.po b/addons/project_caldav/i18n/pt_BR.po
index f794b34d6e5..ea80521a4ee 100644
--- a/addons/project_caldav/i18n/pt_BR.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/ru.po b/addons/project_caldav/i18n/ru.po
index 677971bbf9c..083e5d1e747 100644
--- a/addons/project_caldav/i18n/ru.po
+++ b/addons/project_caldav/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/i18n/sv.po b/addons/project_caldav/i18n/sv.po
index e8de8f114cb..2bfcb731cfe 100644
--- a/addons/project_caldav/i18n/sv.po
+++ b/addons/project_caldav/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: 2011-06-04 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
@@ -574,18 +574,3 @@ msgstr "Lördag"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "Femte"
-
-#~ msgid "Minutes"
-#~ msgstr "Minuter"
-
-#~ msgid "Repeat every x"
-#~ msgstr "Repetera varje x"
-
-#~ msgid "Seconds"
-#~ msgstr "Sekunder"
-
-#~ msgid "Custom"
-#~ msgstr "Anpassad"
-
-#~ msgid "Interval"
-#~ msgstr "Intervall"
diff --git a/addons/project_caldav/i18n/zh_CN.po b/addons/project_caldav/i18n/zh_CN.po
index cdf5cfa5229..3986feb28ef 100644
--- a/addons/project_caldav/i18n/zh_CN.po
+++ b/addons/project_caldav/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: 2011-07-11 04:51+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_caldav
 #: help:project.task,exdate:0
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index ada89d35e69..782f167d69b 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -28,7 +28,7 @@ from project.project import task as base_project_task
 
 class project_task(osv.osv):
     _name = "project.task"
-    _inherit = ["calendar.todo", "project.task"]
+    _inherit = ["project.task", "calendar.todo"]
     _columns = {
         # force inherit from project.project_task so that 
         # calendar.todo.active is masked oute
@@ -42,11 +42,11 @@ class project_task(osv.osv):
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
     }
+    
     _defaults = {
         'state': 'draft',
     }
 
-
     def open_task(self, cr, uid, ids, context=None):
         """
         Open Task Form for Project Task.
@@ -109,6 +109,8 @@ class project_task(osv.osv):
                 self.write(cr, uid, [exists], val)
                 ids.append(exists)
             else:
+                #set user_id with id, needed later
+                val.update({'user_id' : uid})
                 task_id = self.create(cr, uid, val)
                 ids.append(task_id)
         return ids
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index d27a4474fc9..0d566be4619 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -65,9 +65,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="progress" position="after">
-                    <field name="recurrency"/>      
-                     <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
-                                on_change="onchange_edit_all(rrule_type,edit_all)"/>                    
+                    <!--     Recurrency of task not well implemented for now, remove the option-->     
+                     <field name="recurrency" invisible="1"/>
+                     <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"/>                    
                 </field>
             </field>
         </record>
@@ -79,46 +79,57 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <notebook colspan="4" position="inside">
-                    <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
-                        <group colspan="2" col="4" >
-                             <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                        </group>
-                        <newline/>
-                        <group col="4" colspan="6" name="rrule">
-                            <separator string="Recurrency Rule" colspan="8"/>
-                            <group col="6" colspan="4">
-                                <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/>
-                                <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
-                                <field name="end_date" attrs="{'invisible': [('readonly','!=',False)]}"/>
+                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                        <group col="4" colspan="4" name="rrule">
+                            <group col="4" colspan="4">
+                                <field name="rrule_type" string="Recurrency period" />
+                                <field name="interval" />                               
+                                                       
+                                
+                                <separator string="End of recurrency" colspan="4"/>
+                                <field name="end_type" />
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
+                                <newline />
+                           
+                      
                             </group>
-                            <group col="14" colspan="4" name="Select weekdays" 
-                                    attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
+                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                <separator string="Choose day where repeat the meeting" colspan="8"/>
                                 <field name="mo" colspan="1" />
                                 <field name="tu" colspan="1" />
                                 <field name="we" colspan="1" />
                                 <field name="th" colspan="1" />
                                 <newline/>
                                 <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
-                                <field name="su" colspan="1"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
+                                <field name="sa" colspan="1"  />
+                                <field name="su" colspan="1"  />
                                 <newline />
                             </group>
-                            <group col="10" colspan="4" attrs="{'invisible': [('rrule_type','!=','monthly'), ('rrule_type','!=','yearly')]}">
+                            <group col="10" colspan="4"
+                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
+                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
                                 <group col="2" colspan="1">
-                                <field name="select1" />
+                                    <field name="select1" />
                                 </group>
-                                <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
-                                <field name="day" attrs="{'required' : [('select1','=','date')]}" />
+                                <group col="2" colspan="1">
+                                    <field name="day"
+                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                            'invisible' : [('select1','=','day')]}" />
                                 </group>
-                                <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
-                                <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
-                                <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
-                                </group>
-                                <group col="1" colspan="1" attrs="{'invisible' : [('rrule_type','!=','yearly')]}">
-                                <field name="month_list" string="of" colspan="1" attrs="{'required' : [('rrule_type','=','yearly')]}" />
+                                <group col="3" colspan="1">
+                                    <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')]}" />
                                 </group>
                             </group>
                         </group>
+
                     </page>
                  </notebook>
             </field>
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 5f70392352b..761b2b44708 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Getting Things Done - Time Management Module',
+    'name': 'Todo List based on the GTD methodology',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
@@ -29,8 +29,12 @@
 This module implements all concepts defined by the Getting Things Done methodology.
 ===================================================================================
 
-This world-wide used methodology is used for personal
-time management improvement.
+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.
+
+The todo 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.
diff --git a/addons/project_gtd/i18n/ar.po b/addons/project_gtd/i18n/ar.po
index 022299be5a3..b0198681214 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/bg.po b/addons/project_gtd/i18n/bg.po
index ea0fc214005..4a7d866a023 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/bs.po b/addons/project_gtd/i18n/bs.po
index c2f71036ffa..e281ad3681e 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/ca.po b/addons/project_gtd/i18n/ca.po
index 30f56ed4b0e..ad62c4d6741 100644
--- a/addons/project_gtd/i18n/ca.po
+++ b/addons/project_gtd/i18n/ca.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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
 msgid "Time-laps during which task has to be treated"
-msgstr ""
+msgstr "Iteracions de temps durant les quals la tasca ha de ser realitzada."
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
@@ -30,22 +30,23 @@ msgstr "project.gtd.timebox"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Reactiva"
 
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
 msgid "Gives the sequence order when displaying a list of timebox."
 msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista de períodes de temps."
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_travel
 msgid "Travel"
-msgstr ""
+msgstr "Viatge"
 
 #. module: project_gtd
 #: view:project.timebox.empty:0
 msgid "Timebox Empty Process Completed Successfully."
-msgstr ""
+msgstr "El procés de períodes de temps buits s'ha realitzat correctament."
 
 #. module: project_gtd
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
@@ -57,22 +58,22 @@ msgstr "No existeix període de temps fill d'aquest!"
 #: code:addons/project_gtd/project_gtd.py:112
 #, python-format
 msgid "GTD"
-msgstr ""
+msgstr "GTD"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_lt
 msgid "Long Term"
-msgstr ""
+msgstr "Llarg termini"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_empty
 msgid "Project Timebox Empty"
-msgstr ""
+msgstr "Període de temps buit del projecte"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_daily
 msgid "Today"
-msgstr ""
+msgstr "Avui"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -101,12 +102,12 @@ msgstr "Error!"
 #. module: project_gtd
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel·la"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
@@ -121,31 +122,34 @@ msgid ""
 "defines a period of time in order to categorize your tasks: today, this "
 "week, this month, long term."
 msgstr ""
+"Les 'timeboxes' es defineixen en la metodologia \"Getting Things Done\". Una "
+"\"Timebox\" defineix un període de temps amb la finalitat de categoritzar "
+"les seves tasques: avui, aquesta setmana, aquest mes, a llarg termini."
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
 msgid "This Week"
-msgstr ""
+msgstr "Aquesta setmana"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_monthly
 msgid "This Month"
-msgstr ""
+msgstr "Aquest mes"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Icona"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
 msgid "Project Timebox Fill"
-msgstr ""
+msgstr "Període de temps del projecte ple"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
@@ -155,7 +159,7 @@ msgstr "Afegeix al període de temps"
 #. module: project_gtd
 #: field:project.timebox.empty,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
@@ -166,7 +170,7 @@ msgstr "Contextes"
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_car
 msgid "Car"
-msgstr ""
+msgstr "Cotxe"
 
 #. module: project_gtd
 #: model:ir.module.module,description:project_gtd.module_meta_information
@@ -187,6 +191,22 @@ msgid ""
 "performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul implementa tots els conceptes definits per la metodologia\n"
+"Getting Things Done. Aquesta metodologia reconeguda mundialment s'utilitza\n"
+"per millorar la gestió del temps personal.\n"
+"\n"
+"Getting Things Done (habitualment abreujat com GTD) és un mètode de gestió\n"
+"d'activitats creat per David Allen, i descrit en un llibre amb el mateix "
+"nom.\n"
+"\n"
+"GTD es basa en el principi que una persona necessita alliberar la ment de "
+"tasques\n"
+"anotant-les externament. D'aquesta manera, la ment és lliure de recordar "
+"tot\n"
+"el que cal fer, i es pot concentrar a realitzar realment\n"
+"aquestes tasques.\n"
+"    "
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
@@ -212,12 +232,12 @@ msgstr "Context"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Següent"
 
 #. module: project_gtd
 #: view:project.timebox.empty:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Accepta"
 
 #. module: project_gtd
 #: code:addons/project_gtd/project_gtd.py:110
@@ -228,7 +248,7 @@ msgstr "Aconsegueix les coses acabades"
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
 msgid "Office"
-msgstr ""
+msgstr "Oficina"
 
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0
@@ -240,6 +260,7 @@ msgstr "Seqüència"
 #: help:project.gtd.context,sequence:0
 msgid "Gives the sequence order when displaying a list of contexts."
 msgstr ""
+"Indiqueu l'ordre de seqüència quan es mostra una llista de contextos."
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -255,7 +276,7 @@ msgstr "Selecció de tasques"
 #: code:addons/project_gtd/project_gtd.py:111
 #, python-format
 msgid "Inbox"
-msgstr ""
+msgstr "Bústia d'entrada"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
@@ -265,12 +286,12 @@ msgstr "Obtindre des de període de temps"
 #. module: project_gtd
 #: help:project.task,context_id:0
 msgid "The context place where user has to treat task"
-msgstr ""
+msgstr "El lloc de context on l'usuari ha de realitzar la tasca."
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_home
 msgid "Home"
-msgstr ""
+msgstr "Inici"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
@@ -279,11 +300,14 @@ 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 ""
+"Els contextos es defineixen en la metodologia \"Getting Things Done\". Li "
+"permet categoritzar les seves tasques d'acord al context en el qual han de "
+"ser realitzades: en l'oficina, casa, en agafar el cotxe, etc."
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Previ"
 
 #~ msgid "Visible Columns"
 #~ msgstr "Columnes visibles"
diff --git a/addons/project_gtd/i18n/cs.po b/addons/project_gtd/i18n/cs.po
index bc7ad0a1bf5..cec7e2cfe3c 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index be73abb2840..89b9acf2606 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
@@ -444,37 +444,3 @@ msgstr "Vorherige"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "Timeboxes are defined in the \"Getting Things Done\" methodology. It defines "
-#~ "a period of time in order to categorize your tasks: today, this week, this "
-#~ "month, long term."
-#~ msgstr ""
-#~ "Bei der  \"Getting Things Done\" Methodik werden Zeitfenster definiert. "
-#~ "Repräsentiert wird hierdurch eine definierte Zeitvorgabe, in die Sie Ihre "
-#~ "Aufgaben zu Organisationszwecken einsortieren können."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Contexts are defined in the \"Getting Things Done\" methodology. It allows "
-#~ "you to categorize your tasks according to the context in which they have to "
-#~ "be done: at office, at home, when I take my car, etc."
-#~ msgstr ""
-#~ "Kontexte werden im Rahmen der  \"Getting Things Done\" Methode verwendet. "
-#~ "Hierdurch können Sie Ihre Aufgaben nach den Orten klassifizieren, an denen "
-#~ "die jeweilige Aufgabe erledigt werden soll, z.B. Zu Hause, Im Büro oder "
-#~ "Während Anreise."
diff --git a/addons/project_gtd/i18n/el.po b/addons/project_gtd/i18n/el.po
index b259dc24e90..9e51c17fb1c 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -324,9 +324,6 @@ msgstr "Προηγούμενη"
 #~ msgid "Effective Hours"
 #~ msgstr "Αποδοτικές Ώρες"
 
-#~ msgid "My Contexts"
-#~ msgstr "Τα Περιβάλλοντά μου"
-
 #~ msgid "Timebox tasks selection"
 #~ msgstr "Επιλογή εργασιών Χρονοπλαισίου"
 
@@ -393,9 +390,6 @@ msgstr "Προηγούμενη"
 #~ msgid "Deadline"
 #~ msgstr "Προθεσμία"
 
-#~ msgid "Est. Hours"
-#~ msgstr "Εκτιμ. Ώρες"
-
 #~ msgid "Cancel"
 #~ msgstr "Ακύρωση"
 
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index ab348abaf5a..42f239459f7 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
@@ -442,492 +442,3 @@ msgstr "Anterior"
 
 #~ msgid "All My Timeboxes"
 #~ msgstr "Todos mis períodos de tiempo"
-
-#~ msgid "STOCK_SAVE"
-#~ msgstr "STOCK_SAVE"
-
-#~ msgid "STOCK_DIALOG_QUESTION"
-#~ msgstr "STOCK_DIALOG_QUESTION"
-
-#~ msgid "terp-account"
-#~ msgstr "terp-account"
-
-#~ msgid "STOCK_CDROM"
-#~ msgstr "STOCK_CDROM"
-
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "STOCK_GO_FORWARD"
-#~ msgstr "STOCK_GO_FORWARD"
-
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#~ msgid "STOCK_EXECUTE"
-#~ msgstr "STOCK_EXECUTE"
-
-#~ msgid "STOCK_UNDELETE"
-#~ msgstr "STOCK_UNDELETE"
-
-#~ msgid "STOCK_MEDIA_FORWARD"
-#~ msgstr "STOCK_MEDIA_FORWARD"
-
-#~ msgid "STOCK_STOP"
-#~ msgstr "STOCK_STOP"
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
-#~ msgid "STOCK_SORT_ASCENDING"
-#~ msgstr "STOCK_SORT_ASCENDING"
-
-#~ msgid "STOCK_REFRESH"
-#~ msgstr "STOCK_REFRESH"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "STOCK_HOME"
-#~ msgstr "STOCK_HOME"
-
-#~ msgid "STOCK_PRINT_PREVIEW"
-#~ msgstr "STOCK_PRINT_PREVIEW"
-
-#~ msgid "STOCK_PASTE"
-#~ msgstr "STOCK_PASTE"
-
-#~ msgid "STOCK_ZOOM_IN"
-#~ msgstr "STOCK_ZOOM_IN"
-
-#~ msgid "STOCK_CONVERT"
-#~ msgstr "STOCK_CONVERT"
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid "STOCK_DIALOG_WARNING"
-#~ msgstr "STOCK_DIALOG_WARNING"
-
-#~ msgid "STOCK_FIND_AND_REPLACE"
-#~ msgstr "STOCK_FIND_AND_REPLACE"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
-#~ msgid "STOCK_ZOOM_100"
-#~ msgstr "STOCK_ZOOM_100"
-
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#~ msgid "STOCK_ITALIC"
-#~ msgstr "STOCK_ITALIC"
-
-#~ msgid "STOCK_MEDIA_RECORD"
-#~ msgstr "STOCK_MEDIA_RECORD"
-
-#~ msgid "terp-calendar"
-#~ msgstr "terp-calendar"
-
-#~ msgid "terp-partner"
-#~ msgstr "terp-partner"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-stock"
-#~ msgstr "terp-stock"
-
-#~ msgid "STOCK_MEDIA_PLAY"
-#~ msgstr "STOCK_MEDIA_PLAY"
-
-#~ msgid "STOCK_CANCEL"
-#~ msgstr "STOCK_CANCEL"
-
-#~ msgid "STOCK_NEW"
-#~ msgstr "STOCK_NEW"
-
-#~ msgid "STOCK_YES"
-#~ msgstr "STOCK_YES"
-
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "STOCK_MEDIA_PREVIOUS"
-#~ msgstr "STOCK_MEDIA_PREVIOUS"
-
-#~ msgid "STOCK_DISCONNECT"
-#~ msgstr "STOCK_DISCONNECT"
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid "STOCK_SAVE_AS"
-#~ msgstr "STOCK_SAVE_AS"
-
-#~ msgid "STOCK_CONNECT"
-#~ msgstr "STOCK_CONNECT"
-
-#~ msgid "STOCK_JUSTIFY_LEFT"
-#~ msgstr "STOCK_JUSTIFY_LEFT"
-
-#~ msgid "STOCK_FILE"
-#~ msgstr "STOCK_FILE"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "terp-administration"
-#~ msgstr "terp-administration"
-
-#~ msgid "STOCK_QUIT"
-#~ msgstr "STOCK_QUIT"
-
-#~ msgid "STOCK_EDIT"
-#~ msgstr "STOCK_EDIT"
-
-#~ msgid "terp-purchase"
-#~ msgstr "terp-purchase"
-
-#~ msgid "STOCK_SELECT_FONT"
-#~ msgstr "STOCK_SELECT_FONT"
-
-#~ msgid "terp-hr"
-#~ msgstr "terp-hr"
-
-#~ msgid "STOCK_COLOR_PICKER"
-#~ msgstr "STOCK_COLOR_PICKER"
-
-#~ msgid "STOCK_ABOUT"
-#~ msgstr "STOCK_ABOUT"
-
-#~ msgid "STOCK_GOTO_TOP"
-#~ msgstr "STOCK_GOTO_TOP"
-
-#~ msgid "STOCK_OK"
-#~ msgstr "STOCK_OK"
-
-#~ msgid "STOCK_NETWORK"
-#~ msgstr "STOCK_NETWORK"
-
-#~ msgid "STOCK_GO_DOWN"
-#~ msgstr "STOCK_GO_DOWN"
-
-#~ msgid "STOCK_DELETE"
-#~ msgstr "STOCK_DELETE"
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "STOCK_DND"
-#~ msgstr "STOCK_DND"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "STOCK_UNINDENT"
-#~ msgstr "STOCK_UNINDENT"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
-#~ msgid "STOCK_CLEAR"
-#~ msgstr "STOCK_CLEAR"
-
-#~ msgid "terp-project"
-#~ msgstr "terp-project"
-
-#~ msgid "STOCK_ADD"
-#~ msgstr "STOCK_ADD"
-
-#~ msgid "STOCK_HELP"
-#~ msgstr "STOCK_HELP"
-
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
-#~ msgid "STOCK_GO_UP"
-#~ msgstr "STOCK_GO_UP"
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
-#~ msgid "STOCK_PREFERENCES"
-#~ msgstr "STOCK_PREFERENCES"
-
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
-
-#~ msgid "STOCK_SORT_DESCENDING"
-#~ msgstr "STOCK_SORT_DESCENDING"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid "STOCK_PROPERTIES"
-#~ msgstr "STOCK_PROPERTIES"
-
-#~ msgid "STOCK_UNDO"
-#~ msgstr "STOCK_UNDO"
-
-#~ msgid "STOCK_GOTO_LAST"
-#~ msgstr "STOCK_GOTO_LAST"
-
-#~ msgid "STOCK_FIND"
-#~ msgstr "STOCK_FIND"
-
-#~ msgid "STOCK_FLOPPY"
-#~ msgstr "STOCK_FLOPPY"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "STOCK_DIRECTORY"
-#~ msgstr "STOCK_DIRECTORY"
-
-#~ msgid "STOCK_MISSING_IMAGE"
-#~ msgstr "STOCK_MISSING_IMAGE"
-
-#~ msgid "STOCK_UNDERLINE"
-#~ msgstr "STOCK_UNDERLINE"
-
-#~ msgid "STOCK_JUSTIFY_CENTER"
-#~ msgstr "STOCK_JUSTIFY_CENTER"
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "STOCK_OPEN"
-#~ msgstr "STOCK_OPEN"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error! No puede crear un menú recursivo."
-
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#~ msgid "STOCK_MEDIA_STOP"
-#~ msgstr "STOCK_MEDIA_STOP"
-
-#~ msgid "STOCK_DND_MULTIPLE"
-#~ msgstr "STOCK_DND_MULTIPLE"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "STOCK_JUSTIFY_FILL"
-#~ msgstr "STOCK_JUSTIFY_FILL"
-
-#~ msgid "STOCK_REMOVE"
-#~ msgstr "STOCK_REMOVE"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "STOCK_REVERT_TO_SAVED"
-#~ msgstr "STOCK_REVERT_TO_SAVED"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "STOCK_GO_BACK"
-#~ msgstr "STOCK_GO_BACK"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "STOCK_BOLD"
-#~ msgstr "STOCK_BOLD"
-
-#~ msgid "STOCK_APPLY"
-#~ msgstr "STOCK_APPLY"
-
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#~ msgid "STOCK_DIALOG_AUTHENTICATION"
-#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
-
-#~ msgid "STOCK_ZOOM_OUT"
-#~ msgstr "STOCK_ZOOM_OUT"
-
-#~ msgid "terp-graph"
-#~ msgstr "terp-graph"
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
-#~ msgid "STOCK_NO"
-#~ msgstr "STOCK_NO"
-
-#~ msgid "terp-mrp"
-#~ msgstr "terp-mrp"
-
-#~ msgid "STOCK_STRIKETHROUGH"
-#~ msgstr "STOCK_STRIKETHROUGH"
-
-#~ msgid "STOCK_MEDIA_REWIND"
-#~ msgstr "STOCK_MEDIA_REWIND"
-
-#~ msgid "terp-crm"
-#~ msgstr "terp-crm"
-
-#~ msgid "STOCK_SELECT_COLOR"
-#~ msgstr "STOCK_SELECT_COLOR"
-
-#~ msgid "STOCK_PRINT"
-#~ msgstr "STOCK_PRINT"
-
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
-#~ msgid "terp-product"
-#~ msgstr "terp-product"
-
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "STOCK_CLOSE"
-#~ msgstr "STOCK_CLOSE"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
-#~ msgid "STOCK_GOTO_FIRST"
-#~ msgstr "STOCK_GOTO_FIRST"
-
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
-#~ msgid "STOCK_ZOOM_FIT"
-#~ msgstr "STOCK_ZOOM_FIT"
-
-#~ msgid "STOCK_CUT"
-#~ msgstr "STOCK_CUT"
-
-#~ msgid "terp-report"
-#~ msgstr "terp-report"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#~ msgid "STOCK_INDENT"
-#~ msgstr "STOCK_INDENT"
-
-#~ msgid "STOCK_SPELL_CHECK"
-#~ msgstr "STOCK_SPELL_CHECK"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "terp-sale"
-#~ msgstr "terp-sale"
-
-#~ msgid "STOCK_JUSTIFY_RIGHT"
-#~ msgstr "STOCK_JUSTIFY_RIGHT"
-
-#~ msgid "terp-tools"
-#~ msgstr "terp-tools"
-
-#~ msgid "STOCK_DIALOG_INFO"
-#~ msgstr "STOCK_DIALOG_INFO"
-
-#~ msgid "STOCK_JUMP_TO"
-#~ msgstr "STOCK_JUMP_TO"
-
-#~ msgid "STOCK_HARDDISK"
-#~ msgstr "STOCK_HARDDISK"
-
-#~ msgid "STOCK_MEDIA_NEXT"
-#~ msgstr "STOCK_MEDIA_NEXT"
-
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
-
-#~ msgid "STOCK_REDO"
-#~ msgstr "STOCK_REDO"
-
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "STOCK_INDEX"
-#~ msgstr "STOCK_INDEX"
-
-#~ msgid "STOCK_GOTO_BOTTOM"
-#~ msgstr "STOCK_GOTO_BOTTOM"
-
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
-#~ msgid "STOCK_DIALOG_ERROR"
-#~ msgstr "STOCK_DIALOG_ERROR"
-
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
-
-#~ msgid "STOCK_COPY"
-#~ msgstr "STOCK_COPY"
-
-#~ msgid "STOCK_MEDIA_PAUSE"
-#~ msgstr "STOCK_MEDIA_PAUSE"
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
-#~ msgid ""
-#~ "Contexts are defined in the \"Getting Things Done\" methodology. It allows "
-#~ "you to categorize your tasks according to the context in which they have to "
-#~ "be done: at office, at home, when I take my car, etc."
-#~ msgstr ""
-#~ "Los contextos se definen en la metodología \"Getting Things Done\". Le "
-#~ "permite clasificar sus tareas según el contexto en el que deben llevarse a "
-#~ "cabo: en la oficina, en casa, cuando voy en coche, etc."
-
-#~ msgid ""
-#~ "Timeboxes are defined in the \"Getting Things Done\" methodology. It defines "
-#~ "a period of time in order to categorize your tasks: today, this week, this "
-#~ "month, long term."
-#~ msgstr ""
-#~ "Los periodos de tiempo se definen en la metodología \"Getting Things Done\". "
-#~ "Se define un periodo de tiempo con el fin de clasificar sus tareas: hoy, "
-#~ "esta semana, este mes, a largo plazo."
diff --git a/addons/project_gtd/i18n/es_AR.po b/addons/project_gtd/i18n/es_AR.po
index 0a1eb075b0f..63c0d3d9ee3 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/es_EC.po b/addons/project_gtd/i18n/es_EC.po
index 7217c21a8c8..9e719b272ef 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/es_MX.po b/addons/project_gtd/i18n/es_MX.po
new file mode 100644
index 00000000000..0d80129a43a
--- /dev/null
+++ b/addons/project_gtd/i18n/es_MX.po
@@ -0,0 +1,444 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_gtd
+#
+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-17 10:08+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_gtd
+#: help:project.task,timebox_id:0
+msgid "Time-laps during which task has to be treated"
+msgstr ""
+"Iteraciones de tiempo durante las cuales la tarea tiene que ser realizada."
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr "proyecto.gtd.periodotiempo"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Reactivar"
+
+#. module: project_gtd
+#: help:project.gtd.timebox,sequence:0
+msgid "Gives the sequence order when displaying a list of timebox."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de periodos de "
+"tiempo."
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "Viajes"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr ""
+"El proceso de periodos de tiempo vacíos se ha realizado corretamente."
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "No timebox child of this one !"
+msgstr "¡No existe período de tiempo hijo de éste!"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:112
+#, python-format
+msgid "GTD"
+msgstr "GTD"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "Largo plazo"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "Periodo de tiempo del proyecto vacío"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "Hoy"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+#: field:project.gtd.timebox,name:0
+#: view:project.task:0
+#: field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "Periodo de tiempo"
+
+#. module: project_gtd
+#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
+msgid "Getting Things Done - Time Management Module"
+msgstr "Módulo gestión del tiempo - Conseguir las cosas terminadas (GTD)"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "Cambiar al periodo de tiempo"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "Periodo de tiempo vacío"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox "
+"defines a period of time in order to categorize your tasks: today, this "
+"week, this month, long term."
+msgstr ""
+"Las 'timeboxes' se definen en la metodología \"Getting Things Done\". Una "
+"\"Timebox\" define un periodo de tiempo con la finalidad de categorizar sus "
+"tareas: hoy, esta semana, este mes, a largo plazo."
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "Esta semana"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_monthly
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: project_gtd
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "Icono"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
+msgid "Project Timebox Fill"
+msgstr "Periodo de tiempo del proyecto lleno"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "Añadir al periodo de tiempo"
+
+#. module: project_gtd
+#: field:project.timebox.empty,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_gtd
+#: 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 "Contextos"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "Coche"
+
+#. module: project_gtd
+#: model:ir.module.module,description:project_gtd.module_meta_information
+msgid ""
+"\n"
+"This module implements all concepts defined by the Getting Things Done\n"
+"methodology. This world-wide used methodology is used for personal\n"
+"time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management\n"
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by\n"
+"recording them externally. That way, the mind is freed from the job of\n"
+"remembering everything that needs to be done, and can concentrate on "
+"actually\n"
+"performing those tasks.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo implementa todos los conceptos definidos por la metodología\n"
+"Getting Things Done. Esta metodología reconocida mundialmente se usa\n"
+"para la mejorar la gestión del tiempo personal.\n"
+"\n"
+"Getting Things Done (habitualmente abreviado como GTD) es un método de "
+"gestión\n"
+"de actividades creado por David Allen, y descrito en un libro con el mismo "
+"nombre.\n"
+"\n"
+"GTD se basa en el principio de que una persona necesita liberar la mente de "
+"tareas\n"
+"anotándolas externamente. De ese modo, la mente es libre de recordar todo "
+"lo\n"
+"que hay que hacer, y se puede concentrar en realizar realmente\n"
+"esas tareas.\n"
+"    "
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Planifica periodo de tiempo"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "Periodos de tiempo"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_context
+#: view:project.gtd.context:0
+#: field:project.gtd.context,name:0
+#: field:project.task,context_id:0
+msgid "Context"
+msgstr "Contexto"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:110
+#, python-format
+msgid "Getting Things Done"
+msgstr "Conseguir las cosas terminadas (GTD)"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "Oficina"
+
+#. module: project_gtd
+#: field:project.gtd.context,sequence:0
+#: field:project.gtd.timebox,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_gtd
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de contextos."
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "Definición periodos de tiempo"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "Selección de tareas"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:111
+#, python-format
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_id:0
+msgid "Get from Timebox"
+msgstr "Obtener desde periodo de tiempo"
+
+#. module: project_gtd
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "El lugar de contexto donde el usuario tiene que realizar la tarea."
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "Casa"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"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 ""
+"Los contextos se definen en la metodología \"Getting Things Done\". Le "
+"permite categorizar sus tareas de acuerdo al contexto en el que tienen que "
+"ser realizadas: en la oficinal, en casa, al coger el coche, etc."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "Anterior"
+
+#~ msgid "Visible Columns"
+#~ msgstr "Columnas visibles"
+
+#~ 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 "My Deadlines"
+#~ msgstr "Mis fechas límite"
+
+#~ msgid "Monthly"
+#~ msgstr "Mensual"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Priority"
+#~ msgstr "Prioridad"
+
+#~ msgid "My Inbox"
+#~ msgstr "Mi bandeja de entrada"
+
+#~ msgid "Default Project"
+#~ msgstr "Proyecto por defecto"
+
+#~ msgid "Context 4"
+#~ msgstr "Contexto 4"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
+
+#~ msgid "Effective Hours"
+#~ msgstr "Horas reales"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Inbox Tasks"
+#~ msgstr "Tareas bandeja de entrada"
+
+#~ msgid "My Pending Tasks"
+#~ msgstr "Mis tareas pendientes"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "project.gtd.context"
+#~ msgstr "project.gtd.context"
+
+#~ msgid "Context 1"
+#~ msgstr "Contexto 1"
+
+#~ msgid "Context 2"
+#~ msgstr "Contexto 2"
+
+#~ msgid "Context 3"
+#~ msgstr "Contexto 3"
+
+#~ msgid "Context 5"
+#~ msgstr "Contexto 5"
+
+#~ msgid "Context 6"
+#~ msgstr "Contexto 6"
+
+#~ msgid "Daily"
+#~ msgstr "Diario"
+
+#~ msgid "Project"
+#~ msgstr "Proyecto"
+
+#~ msgid "Planned"
+#~ msgstr "Planificado"
+
+#~ msgid "My Open Tasks"
+#~ msgstr "Mis tareas abiertas"
+
+#~ msgid "Time Management"
+#~ msgstr "Gestión del tiempo"
+
+#~ msgid "Tasks"
+#~ msgstr "Tareas"
+
+#~ msgid "Deadline"
+#~ msgstr "Fecha límite"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Date Start"
+#~ msgstr "Fecha inicial"
+
+#~ msgid "Planned Hours"
+#~ msgstr "Horas planeadas"
+
+#~ msgid "Weekly"
+#~ msgstr "Semanal"
+
+#, python-format
+#~ msgid "Eff. Hours"
+#~ msgstr "Horas efectivas"
+
+#, python-format
+#~ msgid "No timebox of the type \"%s\" defined !"
+#~ msgstr "¡No se ha definido un período de tiempo de tipo \"%s\"!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Child Timeboxes"
+#~ msgstr "Períodos de tiempo hijos"
+
+#~ msgid "Timebox tasks selection"
+#~ msgstr "Selección tareas del período de tiempo"
+
+#~ msgid "Parent Timebox"
+#~ msgstr "Período de tiempo padre"
+
+#~ msgid "Timebox Tasks"
+#~ msgstr "Tareas período de tiempo"
+
+#~ msgid "My Daily Timebox"
+#~ msgstr "Mi período de tiempo diario"
+
+#~ msgid "My Timeboxes"
+#~ msgstr "Mis períodos de tiempo"
+
+#~ msgid "All My Timeboxes"
+#~ msgstr "Todos mis períodos de tiempo"
diff --git a/addons/project_gtd/i18n/es_VE.po b/addons/project_gtd/i18n/es_VE.po
new file mode 100644
index 00000000000..0d80129a43a
--- /dev/null
+++ b/addons/project_gtd/i18n/es_VE.po
@@ -0,0 +1,444 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_gtd
+#
+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-17 10:08+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_gtd
+#: help:project.task,timebox_id:0
+msgid "Time-laps during which task has to be treated"
+msgstr ""
+"Iteraciones de tiempo durante las cuales la tarea tiene que ser realizada."
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr "proyecto.gtd.periodotiempo"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Reactivar"
+
+#. module: project_gtd
+#: help:project.gtd.timebox,sequence:0
+msgid "Gives the sequence order when displaying a list of timebox."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de periodos de "
+"tiempo."
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "Viajes"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr ""
+"El proceso de periodos de tiempo vacíos se ha realizado corretamente."
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "No timebox child of this one !"
+msgstr "¡No existe período de tiempo hijo de éste!"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:112
+#, python-format
+msgid "GTD"
+msgstr "GTD"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "Largo plazo"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "Periodo de tiempo del proyecto vacío"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "Hoy"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+#: field:project.gtd.timebox,name:0
+#: view:project.task:0
+#: field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "Periodo de tiempo"
+
+#. module: project_gtd
+#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
+msgid "Getting Things Done - Time Management Module"
+msgstr "Módulo gestión del tiempo - Conseguir las cosas terminadas (GTD)"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "Cambiar al periodo de tiempo"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "Periodo de tiempo vacío"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox "
+"defines a period of time in order to categorize your tasks: today, this "
+"week, this month, long term."
+msgstr ""
+"Las 'timeboxes' se definen en la metodología \"Getting Things Done\". Una "
+"\"Timebox\" define un periodo de tiempo con la finalidad de categorizar sus "
+"tareas: hoy, esta semana, este mes, a largo plazo."
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "Esta semana"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_monthly
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: project_gtd
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "Icono"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
+msgid "Project Timebox Fill"
+msgstr "Periodo de tiempo del proyecto lleno"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "Añadir al periodo de tiempo"
+
+#. module: project_gtd
+#: field:project.timebox.empty,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_gtd
+#: 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 "Contextos"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "Coche"
+
+#. module: project_gtd
+#: model:ir.module.module,description:project_gtd.module_meta_information
+msgid ""
+"\n"
+"This module implements all concepts defined by the Getting Things Done\n"
+"methodology. This world-wide used methodology is used for personal\n"
+"time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management\n"
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by\n"
+"recording them externally. That way, the mind is freed from the job of\n"
+"remembering everything that needs to be done, and can concentrate on "
+"actually\n"
+"performing those tasks.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo implementa todos los conceptos definidos por la metodología\n"
+"Getting Things Done. Esta metodología reconocida mundialmente se usa\n"
+"para la mejorar la gestión del tiempo personal.\n"
+"\n"
+"Getting Things Done (habitualmente abreviado como GTD) es un método de "
+"gestión\n"
+"de actividades creado por David Allen, y descrito en un libro con el mismo "
+"nombre.\n"
+"\n"
+"GTD se basa en el principio de que una persona necesita liberar la mente de "
+"tareas\n"
+"anotándolas externamente. De ese modo, la mente es libre de recordar todo "
+"lo\n"
+"que hay que hacer, y se puede concentrar en realizar realmente\n"
+"esas tareas.\n"
+"    "
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Planifica periodo de tiempo"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "Periodos de tiempo"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_context
+#: view:project.gtd.context:0
+#: field:project.gtd.context,name:0
+#: field:project.task,context_id:0
+msgid "Context"
+msgstr "Contexto"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:110
+#, python-format
+msgid "Getting Things Done"
+msgstr "Conseguir las cosas terminadas (GTD)"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "Oficina"
+
+#. module: project_gtd
+#: field:project.gtd.context,sequence:0
+#: field:project.gtd.timebox,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_gtd
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de contextos."
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "Definición periodos de tiempo"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "Selección de tareas"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:111
+#, python-format
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_id:0
+msgid "Get from Timebox"
+msgstr "Obtener desde periodo de tiempo"
+
+#. module: project_gtd
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "El lugar de contexto donde el usuario tiene que realizar la tarea."
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "Casa"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"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 ""
+"Los contextos se definen en la metodología \"Getting Things Done\". Le "
+"permite categorizar sus tareas de acuerdo al contexto en el que tienen que "
+"ser realizadas: en la oficinal, en casa, al coger el coche, etc."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "Anterior"
+
+#~ msgid "Visible Columns"
+#~ msgstr "Columnas visibles"
+
+#~ 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 "My Deadlines"
+#~ msgstr "Mis fechas límite"
+
+#~ msgid "Monthly"
+#~ msgstr "Mensual"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Priority"
+#~ msgstr "Prioridad"
+
+#~ msgid "My Inbox"
+#~ msgstr "Mi bandeja de entrada"
+
+#~ msgid "Default Project"
+#~ msgstr "Proyecto por defecto"
+
+#~ msgid "Context 4"
+#~ msgstr "Contexto 4"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
+
+#~ msgid "Effective Hours"
+#~ msgstr "Horas reales"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Inbox Tasks"
+#~ msgstr "Tareas bandeja de entrada"
+
+#~ msgid "My Pending Tasks"
+#~ msgstr "Mis tareas pendientes"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "project.gtd.context"
+#~ msgstr "project.gtd.context"
+
+#~ msgid "Context 1"
+#~ msgstr "Contexto 1"
+
+#~ msgid "Context 2"
+#~ msgstr "Contexto 2"
+
+#~ msgid "Context 3"
+#~ msgstr "Contexto 3"
+
+#~ msgid "Context 5"
+#~ msgstr "Contexto 5"
+
+#~ msgid "Context 6"
+#~ msgstr "Contexto 6"
+
+#~ msgid "Daily"
+#~ msgstr "Diario"
+
+#~ msgid "Project"
+#~ msgstr "Proyecto"
+
+#~ msgid "Planned"
+#~ msgstr "Planificado"
+
+#~ msgid "My Open Tasks"
+#~ msgstr "Mis tareas abiertas"
+
+#~ msgid "Time Management"
+#~ msgstr "Gestión del tiempo"
+
+#~ msgid "Tasks"
+#~ msgstr "Tareas"
+
+#~ msgid "Deadline"
+#~ msgstr "Fecha límite"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Date Start"
+#~ msgstr "Fecha inicial"
+
+#~ msgid "Planned Hours"
+#~ msgstr "Horas planeadas"
+
+#~ msgid "Weekly"
+#~ msgstr "Semanal"
+
+#, python-format
+#~ msgid "Eff. Hours"
+#~ msgstr "Horas efectivas"
+
+#, python-format
+#~ msgid "No timebox of the type \"%s\" defined !"
+#~ msgstr "¡No se ha definido un período de tiempo de tipo \"%s\"!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Child Timeboxes"
+#~ msgstr "Períodos de tiempo hijos"
+
+#~ msgid "Timebox tasks selection"
+#~ msgstr "Selección tareas del período de tiempo"
+
+#~ msgid "Parent Timebox"
+#~ msgstr "Período de tiempo padre"
+
+#~ msgid "Timebox Tasks"
+#~ msgstr "Tareas período de tiempo"
+
+#~ msgid "My Daily Timebox"
+#~ msgstr "Mi período de tiempo diario"
+
+#~ msgid "My Timeboxes"
+#~ msgstr "Mis períodos de tiempo"
+
+#~ msgid "All My Timeboxes"
+#~ msgstr "Todos mis períodos de tiempo"
diff --git a/addons/project_gtd/i18n/et.po b/addons/project_gtd/i18n/et.po
index f5b29d3c349..2884a5c5ccf 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/fi.po b/addons/project_gtd/i18n/fi.po
index 49b47b56d79..c90eddd2806 100644
--- a/addons/project_gtd/i18n/fi.po
+++ b/addons/project_gtd/i18n/fi.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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
 msgid "Time-laps during which task has to be treated"
-msgstr ""
+msgstr "Aikajana jonka ainakna tehtävä tulisi suorittaa"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
@@ -30,17 +30,17 @@ msgstr ""
 #. module: project_gtd
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Aktivoi uudelleen"
 
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
 msgid "Gives the sequence order when displaying a list of timebox."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä listaa aikaikkunoista."
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_travel
 msgid "Travel"
-msgstr ""
+msgstr "Matka"
 
 #. module: project_gtd
 #: view:project.timebox.empty:0
@@ -51,7 +51,7 @@ msgstr ""
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "No timebox child of this one !"
-msgstr ""
+msgstr "Ei tällaista aikaikkunan alatasoa !"
 
 #. module: project_gtd
 #: code:addons/project_gtd/project_gtd.py:112
@@ -62,17 +62,17 @@ msgstr ""
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_lt
 msgid "Long Term"
-msgstr ""
+msgstr "Pitkäaikainen"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_empty
 msgid "Project Timebox Empty"
-msgstr ""
+msgstr "Projektin aikaikkuna tyhjä"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_daily
 msgid "Today"
-msgstr ""
+msgstr "Tänään"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -80,39 +80,39 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "Aikaikkuna"
 
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "Tehtävien suorittaminen - ajanhallintamoduuli"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_to_id:0
 msgid "Set to Timebox"
-msgstr ""
+msgstr "Aseta aikaikkunaan"
 
 #. module: project_gtd
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "Error !"
-msgstr "Virhe!"
+msgstr "Virhe !"
 
 #. module: project_gtd
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peru"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
 #: view:project.timebox.empty:0
 msgid "Empty Timebox"
-msgstr ""
+msgstr "Tyhjä aikaikkuna"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
@@ -125,48 +125,48 @@ msgstr ""
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
 msgid "This Week"
-msgstr ""
+msgstr "Tällä viikolla"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_monthly
 msgid "This Month"
-msgstr ""
+msgstr "Kuluva kuukausi"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Ikoni"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
 msgid "Project Timebox Fill"
-msgstr ""
+msgstr "Täytä projektin aikaikkuna"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tehtävä"
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "Add to Timebox"
-msgstr ""
+msgstr "Lisää aikaikkunaan"
 
 #. module: project_gtd
 #: field:project.timebox.empty,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: project_gtd
 #: 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 "Kontekstit"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_car
 msgid "Car"
-msgstr ""
+msgstr "Auto"
 
 #. module: project_gtd
 #: model:ir.module.module,description:project_gtd.module_meta_information
@@ -192,14 +192,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
 #: view:project.timebox.fill.plan:0
 msgid "Plannify Timebox"
-msgstr ""
+msgstr "Suunnittele aikaikkuna"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
 #: view:project.gtd.timebox:0
 msgid "Timeboxes"
-msgstr ""
+msgstr "Aikaikkunat"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
@@ -207,12 +207,12 @@ msgstr ""
 #: field:project.gtd.context,name:0
 #: field:project.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "Konteksti"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Seuraava"
 
 #. module: project_gtd
 #: view:project.timebox.empty:0
@@ -234,43 +234,43 @@ msgstr ""
 #: field:project.gtd.context,sequence:0
 #: field:project.gtd.timebox,sequence:0
 msgid "Sequence"
-msgstr "Jakso"
+msgstr "Sekvenssi"
 
 #. module: project_gtd
 #: help:project.gtd.context,sequence:0
 msgid "Gives the sequence order when displaying a list of contexts."
-msgstr ""
+msgstr "Antaa järjestyksen listattaessa kontekstejä."
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr ""
+msgstr "Aikaikkunan määrittely"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,task_ids:0
 msgid "Tasks selection"
-msgstr ""
+msgstr "Tehtävien valinta"
 
 #. module: project_gtd
 #: code:addons/project_gtd/project_gtd.py:111
 #, python-format
 msgid "Inbox"
-msgstr ""
+msgstr "Saapuneet"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
 msgid "Get from Timebox"
-msgstr ""
+msgstr "Hae aikaikkunasta"
 
 #. module: project_gtd
 #: help:project.task,context_id:0
 msgid "The context place where user has to treat task"
-msgstr ""
+msgstr "Kontekstin paikka missä tehtävä hoidetaan"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_home
 msgid "Home"
-msgstr ""
+msgstr "Alkuun"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
@@ -283,7 +283,7 @@ msgstr ""
 #. module: project_gtd
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Edellinen"
 
 #~ msgid "Monthly"
 #~ msgstr "Kuukausittain"
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index a6e6b814249..c8e841f0a9b 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
@@ -35,7 +35,7 @@ msgstr "Réactiver"
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
 msgid "Gives the sequence order when displaying a list of timebox."
-msgstr "Donnes l'ordre d'affichage de la liste des boîtes de temps."
+msgstr "Donnes l'ordre d'affichage de la liste des timeboxes."
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_travel
@@ -45,13 +45,13 @@ msgstr "Voyage"
 #. module: project_gtd
 #: view:project.timebox.empty:0
 msgid "Timebox Empty Process Completed Successfully."
-msgstr "Le processus de la zone de temps vide s'est correctement déroulé."
+msgstr "Le vidage de la timebox s'est correctement déroulé."
 
 #. module: project_gtd
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "No timebox child of this one !"
-msgstr "Pas de TimeBox enfant pour celle ci !"
+msgstr "Pas de timebox enfant définit pour celle-ci !"
 
 #. module: project_gtd
 #: code:addons/project_gtd/project_gtd.py:112
@@ -67,7 +67,7 @@ msgstr "Long terme"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_empty
 msgid "Project Timebox Empty"
-msgstr "Zone de temps du projet vide"
+msgstr "Timebox de projet vide"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_daily
@@ -80,7 +80,7 @@ msgstr "Aujourd'hui"
 #: view:project.task:0
 #: field:project.task,timebox_id:0
 msgid "Timebox"
-msgstr "Feuilles de temps"
+msgstr "Timebox"
 
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
@@ -90,7 +90,7 @@ msgstr "Getting Things Done - Module de Gestion du Temps"
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_to_id:0
 msgid "Set to Timebox"
-msgstr "Définir dans la timebox"
+msgstr "Mettre dans la timebox"
 
 #. module: project_gtd
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
@@ -112,7 +112,7 @@ msgstr "_Annuler"
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
 #: view:project.timebox.empty:0
 msgid "Empty Timebox"
-msgstr "Feuille de temps vide"
+msgstr "Timebox vide"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
@@ -121,10 +121,9 @@ msgid ""
 "defines a period of time in order to categorize your tasks: today, this "
 "week, this month, long term."
 msgstr ""
-"Les zones de temps sont définies dans la méthodologie \"Getting Things "
-"Done\". Une zone de temps définit une période de temps dans le but de "
-"classer vos tâches dans des catégories : aujourd'hui, cette semaine, ce "
-"mois, long terme."
+"Les timeboxes sont définies dans la méthodologie \"Getting Things Done\". "
+"Une zone de temps définit une période de temps dans le but de classer vos "
+"tâches dans des catégories : aujourd'hui, cette semaine, ce mois, long terme."
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
@@ -144,7 +143,7 @@ msgstr "Icône"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
 msgid "Project Timebox Fill"
-msgstr "Remplir les zones de temps du projet"
+msgstr "Remplir les timeboxes du projet"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_task
@@ -154,7 +153,7 @@ msgstr "Tâche"
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "Add to Timebox"
-msgstr "Ajouter une Timebox"
+msgstr "Ajouter à la timebox"
 
 #. module: project_gtd
 #: field:project.timebox.empty,name:0
@@ -211,7 +210,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
 #: view:project.timebox.fill.plan:0
 msgid "Plannify Timebox"
-msgstr "Mes feuilles de temps planifiés"
+msgstr "Planifier la timebox"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
@@ -263,7 +262,7 @@ msgstr "Donne l'ordre d'affichage de la liste des contextes."
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr "Définition de la feuille de temps"
+msgstr "Définition de la timebox"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,task_ids:0
@@ -279,7 +278,7 @@ msgstr "Boîte de réception"
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
 msgid "Get from Timebox"
-msgstr "Obtenir de la timebox"
+msgstr "Importer de la Timebox"
 
 #. module: project_gtd
 #: help:project.task,context_id:0
diff --git a/addons/project_gtd/i18n/gl.po b/addons/project_gtd/i18n/gl.po
index 4cb4e06d3f2..ca7483794e1 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: 2011-05-13 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/hr.po b/addons/project_gtd/i18n/hr.po
index 3ddf4dbe2a8..b561d7b7b4d 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/hu.po b/addons/project_gtd/i18n/hu.po
index 3ef62ac409c..1b8151f2c46 100644
--- a/addons/project_gtd/i18n/hu.po
+++ b/addons/project_gtd/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-25 10:59+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/id.po b/addons/project_gtd/i18n/id.po
index 85a83fead26..6dad0489be7 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/it.po b/addons/project_gtd/i18n/it.po
index 6cc077c2319..34fdf789296 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/ko.po b/addons/project_gtd/i18n/ko.po
index c6396745775..44b68cf7362 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/lt.po b/addons/project_gtd/i18n/lt.po
index 022299be5a3..b0198681214 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/lv.po b/addons/project_gtd/i18n/lv.po
index ddc5a80656d..13f9cc40df4 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/nl.po b/addons/project_gtd/i18n/nl.po
index e1c0415c2a0..fdac5322655 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/nl_BE.po b/addons/project_gtd/i18n/nl_BE.po
index c7ae5dfb9eb..41d92b718f6 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 14f49b1234f..6973f778948 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/pt.po b/addons/project_gtd/i18n/pt.po
index 93a706205b1..1abf3c473f3 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index 9fb2d027d32..92a3e76d564 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
@@ -406,102 +406,3 @@ msgstr "Anterior"
 
 #~ msgid "project.gtd.context"
 #~ msgstr "project.gtd.context"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "STOCK_HELP"
-#~ msgstr "STOCK_HELP"
-
-#~ msgid "STOCK_GO_UP"
-#~ msgstr "STOCK_GO_UP"
-
-#~ msgid "terp-project"
-#~ msgstr "terp-project"
-
-#~ msgid "STOCK_PREFERENCES"
-#~ msgstr "STOCK_PREFERENCES"
-
-#~ msgid "STOCK_SORT_DESCENDING"
-#~ msgstr "STOCK_SORT_DESCENDING"
-
-#~ msgid "STOCK_PROPERTIES"
-#~ msgstr "STOCK_PROPERTIES"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid "STOCK_UNDO"
-#~ msgstr "STOCK_UNDO"
-
-#~ msgid "STOCK_GOTO_LAST"
-#~ msgstr "STOCK_GOTO_LAST"
-
-#~ msgid "STOCK_FIND"
-#~ msgstr "STOCK_FIND"
-
-#~ msgid "STOCK_ADD"
-#~ msgstr "STOCK_ADD"
-
-#~ msgid "STOCK_FLOPPY"
-#~ msgstr "STOCK_FLOPPY"
-
-#~ msgid "STOCK_DIRECTORY"
-#~ msgstr "STOCK_DIRECTORY"
-
-#~ msgid "STOCK_UNDERLINE"
-#~ msgstr "STOCK_UNDERLINE"
-
-#~ msgid "STOCK_MISSING_IMAGE"
-#~ msgstr "STOCK_MISSING_IMAGE"
-
-#~ msgid "STOCK_JUSTIFY_CENTER"
-#~ msgstr "STOCK_JUSTIFY_CENTER"
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "STOCK_OPEN"
-#~ msgstr "STOCK_OPEN"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#~ msgid "STOCK_MEDIA_STOP"
-#~ msgstr "STOCK_MEDIA_STOP"
-
-#~ msgid "STOCK_DND_MULTIPLE"
-#~ msgstr "STOCK_DND_MULTIPLE"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "STOCK_JUSTIFY_FILL"
-#~ msgstr "STOCK_JUSTIFY_FILL"
-
-#~ msgid "STOCK_REMOVE"
-#~ msgstr "STOCK_REMOVE"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "STOCK_REVERT_TO_SAVED"
-#~ msgstr "STOCK_REVERT_TO_SAVED"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "STOCK_GO_BACK"
-#~ msgstr "STOCK_GO_BACK"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo precisa ser único!"
diff --git a/addons/project_gtd/i18n/ro.po b/addons/project_gtd/i18n/ro.po
index 022299be5a3..b0198681214 100644
--- a/addons/project_gtd/i18n/ro.po
+++ b/addons/project_gtd/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/ru.po b/addons/project_gtd/i18n/ru.po
index 7ea33ec57d8..2ad231dad17 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
@@ -222,7 +222,7 @@ msgstr ""
 #: code:addons/project_gtd/project_gtd.py:110
 #, python-format
 msgid "Getting Things Done"
-msgstr "Разобраться с делами"
+msgstr "Getting Things Done"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
diff --git a/addons/project_gtd/i18n/sl.po b/addons/project_gtd/i18n/sl.po
index d6d34b20f4d..49e415b14eb 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/sq.po b/addons/project_gtd/i18n/sq.po
index 30da8320d23..98607953dce 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index 7f93b80dd34..4eeda027363 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
@@ -384,9 +384,6 @@ msgstr ""
 #~ msgid "Tasks"
 #~ msgstr "Aktiviteter"
 
-#~ msgid "TimeBox"
-#~ msgstr "TimeBox"
-
 #~ msgid "Child Timeboxes"
 #~ msgstr "Child Timeboxes"
 
@@ -396,9 +393,6 @@ msgstr ""
 #~ msgid "Deadline"
 #~ msgstr "Deadline"
 
-#~ msgid "TimeBox Configuration"
-#~ msgstr "TimeBox Configuration"
-
 #~ msgid "Cancel"
 #~ msgstr "Cancel"
 
diff --git a/addons/project_gtd/i18n/tlh.po b/addons/project_gtd/i18n/tlh.po
index a4a6e096738..bba74118109 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 5ec3c40d34e..5a48e92f466 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/uk.po b/addons/project_gtd/i18n/uk.po
index edb2c79d175..9322c6b2050 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/i18n/vi.po b/addons/project_gtd/i18n/vi.po
index b748dca4350..e23ab92e250 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
@@ -284,57 +284,3 @@ msgstr ""
 #: view:project.task:0
 msgid "Previous"
 msgstr "Trước"
-
-#~ msgid "STOCK_FILE"
-#~ msgstr "STOCK_FILE"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "STOCK_QUIT"
-#~ msgstr "STOCK_QUIT"
-
-#~ msgid "STOCK_EDIT"
-#~ msgstr "STOCK_EDIT"
-
-#~ msgid "STOCK_CONNECT"
-#~ msgstr "STOCK_CONNECT"
-
-#~ msgid "STOCK_SAVE_AS"
-#~ msgstr "STOCK_SAVE_AS"
-
-#~ msgid "STOCK_GO_DOWN"
-#~ msgstr "STOCK_GO_DOWN"
-
-#~ msgid "STOCK_NETWORK"
-#~ msgstr "STOCK_NETWORK"
-
-#~ msgid "STOCK_OK"
-#~ msgstr "STOCK_OK"
-
-#~ msgid "STOCK_GOTO_TOP"
-#~ msgstr "STOCK_GOTO_TOP"
-
-#~ msgid "STOCK_ABOUT"
-#~ msgstr "STOCK_ABOUT"
-
-#~ msgid "STOCK_COLOR_PICKER"
-#~ msgstr "STOCK_COLOR_PICKER"
-
-#~ msgid "terp-hr"
-#~ msgstr "terp-hr"
-
-#~ msgid "STOCK_SELECT_FONT"
-#~ msgstr "STOCK_SELECT_FONT"
-
-#~ msgid "terp-purchase"
-#~ msgstr "terp-purchase"
-
-#~ msgid "STOCK_DELETE"
-#~ msgstr "STOCK_DELETE"
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "STOCK_DND"
-#~ msgstr "STOCK_DND"
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index 66d86d899c4..cce4161ef6a 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
 msgid "Time-laps during which task has to be treated"
-msgstr ""
+msgstr "处理任务的时间段"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
@@ -34,7 +34,7 @@ msgstr "重新激活"
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
 msgid "Gives the sequence order when displaying a list of timebox."
-msgstr ""
+msgstr "输入序号用于时间箱列表排序"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_travel
@@ -44,13 +44,13 @@ msgstr "旅行"
 #. module: project_gtd
 #: view:project.timebox.empty:0
 msgid "Timebox Empty Process Completed Successfully."
-msgstr ""
+msgstr "清空时间箱成功"
 
 #. module: project_gtd
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "No timebox child of this one !"
-msgstr ""
+msgstr "没有子时间箱"
 
 #. module: project_gtd
 #: code:addons/project_gtd/project_gtd.py:112
@@ -66,7 +66,7 @@ msgstr "长期"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_empty
 msgid "Project Timebox Empty"
-msgstr ""
+msgstr "清空时间箱"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_daily
@@ -100,7 +100,7 @@ msgstr "错误！"
 #. module: project_gtd
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "错误！不能创建循环引用的任务"
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
@@ -119,7 +119,7 @@ msgid ""
 "Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox "
 "defines a period of time in order to categorize your tasks: today, this "
 "week, this month, long term."
-msgstr ""
+msgstr "时间箱是GTD方法的一个术语。时间箱用于根据一定的时间区间来对任务进行分类：今天的事，本周的事，这个月的事，长期的事"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
@@ -139,7 +139,7 @@ msgstr "图标"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
 msgid "Project Timebox Fill"
-msgstr ""
+msgstr "填充时间箱"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_task
@@ -186,6 +186,15 @@ msgid ""
 "performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"这个模块实现了GTD的概念。这个世界通行的方法是用来提升个人时间管理的。\n"
+"\n"
+"Getting Things Done（GTD）是由David Allen提出的一种行为管理方法，他还\n"
+"写了一本同名的书阐述这个方法。\n"
+"\n"
+"GTD基于一个原则：个人应该把任务从脑子里移除到外部的记录系统上。这样，\n"
+"大脑就不需要再记忆所有该做的事情，只需要关注正在做的事。\n"
+"    "
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
@@ -238,7 +247,7 @@ msgstr "序列"
 #. module: project_gtd
 #: help:project.gtd.context,sequence:0
 msgid "Gives the sequence order when displaying a list of contexts."
-msgstr ""
+msgstr "输入序号用于情境列表的排序"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -254,7 +263,7 @@ msgstr "任务选择"
 #: code:addons/project_gtd/project_gtd.py:111
 #, python-format
 msgid "Inbox"
-msgstr ""
+msgstr "收件箱"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
@@ -264,12 +273,12 @@ msgstr "从时间箱"
 #. module: project_gtd
 #: help:project.task,context_id:0
 msgid "The context place where user has to treat task"
-msgstr ""
+msgstr "用户要执行任务的地点"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_home
 msgid "Home"
-msgstr ""
+msgstr "首页"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
@@ -277,12 +286,12 @@ msgid ""
 "Contexts are defined in the \"Getting Things Done\" methodology. It allows "
 "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 ""
+msgstr "情境是GTD方法中的概念。它使你能够按照执行的地点对任务进行分类，如：在办公室、在家、开车的时候"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "上一个"
 
 #~ msgid "Parent Timebox"
 #~ msgstr "上级时间盒"
diff --git a/addons/project_gtd/i18n/zh_TW.po b/addons/project_gtd/i18n/zh_TW.po
index 15cc804c852..0f0e0547709 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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:27+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_gtd
 #: help:project.task,timebox_id:0
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index a3c9d48476b..bec70779551 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -104,30 +104,19 @@ class project_task(osv.osv):
         res = super(project_task,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         search_extended = False
         timebox_obj = self.pool.get('project.gtd.timebox')
-        access_pool = self.pool.get('ir.model.access')
-        if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"):
+        if (res['type'] == 'search') and context.get('gtd', False):
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]), context=context)
-            search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done'))
-            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
-            search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Getting things done" string="%s"/>''' % (_('GTD'),)
-            search_extended += '''<separator orientation="vertical"/>'''
+            search_extended =''
             for time in tt:
                 if time.icon:
                     icon = time.icon
                 else :
                     icon=""
-                search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'gtd_visible':True, 'user_invisible': True}"/>'''
-            search_extended += '''
-            <separator orientation="vertical"/>
-            <field name="context_id" select="1" widget="selection"/>
-            </group>
-            </search> '''
-        if search_extended:
-            res['arch'] = unicode(res['arch'], 'utf8').replace('</search>', search_extended)
-            attrs_sel = self.pool.get('project.gtd.context').name_search(cr, uid, '', [], context=context)
-            context_id_info = self.pool.get('project.task').fields_get(cr, uid, ['context_id'], context=context)
-            context_id_info['context_id']['selection'] = attrs_sel
-            res['fields'].update(context_id_info)
+                search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'user_invisible': True}"/>\n'''
+            search_extended +='''<separator orientation="vertical"/>'''
+
+            res['arch'] = res['arch'].replace('<separator name="gtdsep"/>', search_extended)
+
         return res
 
 project_task()
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index 126233104e2..7d495023f87 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -1,8 +1,27 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        <record model="res.groups" id="group_project_getting">
-            <field name="name">Project / Methodology / Getting Things Done</field>
+        <record model="project.gtd.context" id="context_office">
+            <field name="name">Office</field>
+            <field name="sequence">0</field>
         </record>
+        <record model="project.gtd.context" id="context_travel">
+            <field name="name">Travel</field>
+            <field name="sequence">2</field>
+        </record>
+
+        <record model="project.gtd.timebox" id="timebox_daily">
+            <field name="name">Today</field>
+            <field name="icon">terp-go-today</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_weekly">
+            <field name="name">This Week</field>
+            <field name="icon">terp-go-week</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_lt">
+            <field name="name">Long Term</field>
+            <field name="icon">terp-project</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index a2d3cf65923..00ba897c4e2 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -2,105 +2,34 @@
 <openerp>
     <data>
 
-    <record model="project.gtd.context" id="context_office">
-        <field name="name">Office</field>
-        <field name="sequence">0</field>
-    </record>
-    <record model="project.gtd.context" id="context_travel">
-        <field name="name">Travel</field>
-        <field name="sequence">2</field>
+    <record model="project.gtd.context" id="context_home">
+        <field name="name">Home</field>
+        <field name="sequence">3</field>
     </record>
     <record model="project.gtd.context" id="context_car">
         <field name="name">Car</field>
         <field name="sequence">1</field>
     </record>
-    <record model="project.gtd.context" id="context_home">
-        <field name="name">Home</field>
-        <field name="sequence">3</field>
-    </record>
 
-    <record model="project.gtd.timebox" id="timebox_daily">
-        <field name="name">Today</field>
-        <field name="icon">terp-go-today</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_weekly">
-        <field name="name">This Week</field>
-        <field name="icon">terp-go-week</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_monthly">
-        <field name="name">This Month</field>
-        <field name="icon">terp-go-month</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_lt">
-        <field name="name">Long Term</field>
-        <field name="icon">terp-project</field>
-    </record>
-
-    <record id="project.project_task_116" model="project.task">
-        <field name="planned_hours">38.0</field>
-        <field name="remaining_hours">38.0</field>
+    <record id="project.project_task_10" model="project.task">
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type_id" ref="project.project_tt_development"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Specific adaptation to MRP</field>
     </record>
 
-     <record id="project.project_task_201" model="project.task">
-        <field name="sequence">40</field>
-        <field name="planned_hours">32.0</field>
-        <field name="remaining_hours">32.0</field>
-        <field name="timebox_id" ref="timebox_monthly"/>
-        <field name="context_id" ref="context_home"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_23"/>
-        <field name="name">In house training</field>
-      </record>
-
-      <record id="project.project_task_202" model="project.task">
-        <field name="sequence">50</field>
-        <field name="planned_hours">24.0</field>
-        <field name="remaining_hours">24.0</field>
-        <field name="timebox_id" ref="timebox_weekly"/>
-        <field name="context_id" ref="context_office"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Validation + latest modifications.</field>
-      </record>
-
-    <record id="project.project_task_116" model="project.task">
-        <field name="planned_hours">38.0</field>
-        <field name="remaining_hours">38.0</field>
+    <record id="project.project_task_11" model="project.task">
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type_id" ref="project.project_tt_development"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Specific adaptation to MRP</field>
     </record>
 
-     <record id="project.project_task_201" model="project.task">
-        <field name="sequence">40</field>
-        <field name="planned_hours">32.0</field>
-        <field name="remaining_hours">32.0</field>
-        <field name="timebox_id" ref="timebox_monthly"/>
-        <field name="context_id" ref="context_home"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_23"/>
-        <field name="name">In house training</field>
-      </record>
+    <record id="project.project_task_12" model="project.task">
+        <field name="timebox_id" ref="timebox_daily"/>
+        <field name="context_id" ref="context_car"/>
+    </record>
 
-      <record id="project.project_task_202" model="project.task">
-        <field name="sequence">50</field>
-        <field name="planned_hours">24.0</field>
-        <field name="remaining_hours">24.0</field>
-        <field name="timebox_id" ref="timebox_weekly"/>
-        <field name="context_id" ref="context_office"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="project_id" ref="project.project_project_22"/>
-        <field name="name">Validation + latest modifications.</field>
-      </record>
+    <record id="project.project_task_13" model="project.task">
+        <field name="timebox_id" ref="timebox_daily"/>
+        <field name="context_id" ref="context_car"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index b92fc1a1fb8..66e7a8a69e3 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -31,7 +31,7 @@
         <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows 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.</field>
     </record>
 
-    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting"
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts"
                 parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
@@ -79,10 +79,10 @@
         <field name="inherit_id" ref="project.view_task_tree2" />
         <field name="arch" type="xml">
             <field name="remaining_hours" position="after">
-                <field string="Timebox" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible', False)"/>
-                <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible',False)"/>
-                <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible',False)"/>
-                <field name="context_id" groups="project_gtd.group_project_getting" invisible="not context.get('gtd_visible', False)" widget="selection"/>
+                <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 name="context_id" invisible="not context.get('context_show', False)" widget="selection" groups="base.group_extended"/>
                 <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
             </field>
         </field>
@@ -95,11 +95,53 @@
         <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" groups="project_gtd.group_project_getting"/>
-                <field name="timebox_id" widget="selection" select="1" groups="project_gtd.group_project_getting"/>
+                <field name="context_id" widget="selection"/>
+                <field name="timebox_id" widget="selection" select="1"/>
             </field>
         </field>
     </record>
 
+    <record id="view_task_gtd_search" model="ir.ui.view">
+        <field name="name">project.task.gtd.search</field>
+        <field name="model">project.task</field>
+        <field name="type">search</field>
+        <field name="priority">50</field>
+        <field name="arch" type="xml">
+           <search string="My Tasks">
+                <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
+                <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+                <separator orientation="vertical"/>
+                <filter
+                    domain="[('timebox_id','=', False)]"
+                    help="Tasks having no timebox assigned yet" string="Inbox"/>
+                <separator orientation="vertical"/>
+                <separator name="gtdsep"/>
+                <field name="name"/>
+                <field name="context_id" widget="selection" groups="base.group_extended"
+                    context="{'context_show': True}">
+                    <filter string="Show Context"
+                        name="context_show"
+                        context="{'context_show': True}"
+                        domain="[]" icon="terp-camera_test"
+                        help="Show the context field"/>
+                    <filter string="Show Deadlines" context="{'deadline_visible': False}"
+                        domain="[]" help="Show only tasks having a deadline"
+                        icon="terp-gnome-cpu-frequency-applet+"/>
+                </field>
+            </search>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="open_gtd_task">
+        <field name="name">My Tasks</field>
+        <field name="res_model">project.task</field>
+        <field name="search_view_id" ref="view_task_gtd_search"/>
+        <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>
+    </record>
+    <menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="4"/>
+
+
     </data>
 </openerp>
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 0398fbfb0ee..8e85047c51c 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -1,6 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_gtd_context","project.gtd.context","model_project_gtd_context","group_project_getting",1,1,1,1
-"access_project_gtd_timebox","project.gtd.timebox","model_project_gtd_timebox","group_project_getting",1,1,1,1
 "access_project_gtd_context_user","project.gtd.context project user","model_project_gtd_context","project.group_project_user",1,0,0,0
 "access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
 "access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
diff --git a/addons/project_gtd/test/gtd_test.yml b/addons/project_gtd/test/gtd_test.yml
index 5c05dfd76cc..0583bc7e8e0 100644
--- a/addons/project_gtd/test/gtd_test.yml
+++ b/addons/project_gtd/test/gtd_test.yml
@@ -1,5 +1,5 @@
 - 
-  Create a task 'Develop time management module' with monthly timebox
+  Create a task 'Develop time management module' with weekly timebox
 - 
   !record {model: project.task, id: project_task_developtimemanagementmodule0}:
     name: Develop time management module
@@ -7,7 +7,7 @@
     project_id: project.project_project_22
     remaining_hours: 15.0
     state: draft
-    timebox_id: project_gtd.timebox_monthly
+    timebox_id: project_gtd.timebox_weekly
     
     
 - 
@@ -36,12 +36,12 @@
     sequence: 0.0
     
 - 
-  Planify the task from monthly timebox to tomorrow timebox
+  Planify the task from weekly timebox to tomorrow timebox
 - 
   !record {model: project.timebox.fill.plan, id: project_timebox_fill_plan_0}:
     task_ids:
       - project_task_developtimemanagementmodule0
-    timebox_id: project_gtd.timebox_monthly
+    timebox_id: project_gtd.timebox_weekly
     timebox_to_id: project_gtd_timebox_tomorrow1
     
     
@@ -75,4 +75,4 @@
    Check task 'Develop time management module' is no more in tomorrow timebox
 -
    !assert {model: project.task, id: project_task_developtimemanagementmodule0, string: Task is not in tomorrow timebox}: 
-      - timebox_id.id != ref("project_gtd_timebox_tomorrow1")
\ No newline at end of file
+      - timebox_id.id != ref("project_gtd_timebox_tomorrow1")
diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index b7ebeb1bd00..e66161b798f 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -31,7 +31,6 @@
 
     	<record model="ir.values" id="project_gtd_empty_values">
             <field name="model_id" ref="model_project_gtd_timebox" />
-            <field name="object" eval="1" />
             <field name="name">Empty Timebox</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_project_gtd_empty'))" />
@@ -41,4 +40,4 @@
 
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 41b99eb1b1e..9f9e080fc4e 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -33,7 +33,6 @@
 
     	<record model="ir.values" id="project_gtd_fill_values">
             <field name="model_id" ref="model_project_gtd_timebox" />
-            <field name="object" eval="1" />
             <field name="name">Plannify Timebox</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_project_gtd_fill'))" />
@@ -43,4 +42,4 @@
 
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_issue/__init__.py b/addons/project_issue/__init__.py
index 21efa34f6f4..f519698a60c 100644
--- a/addons/project_issue/__init__.py
+++ b/addons/project_issue/__init__.py
@@ -22,6 +22,5 @@
 
 import project_issue
 import report
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 459c44dea04..e77499df3d0 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {
-    'name': 'Issue Management in Project Management',
+    'name': 'Issues Tracker',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 3b6a6bcd0a3..216f01eba9f 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -57,22 +57,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Board">
-                    <hpaned>
-                        <child1>
-                            <action colspan="4"  name="%(action_view_current_project_issue_tree)d" string="Current Issues" width="510"/>
-                            <action colspan="4"  name="%(action_view_pending_project_issue_tree)d" string="Pending Issues" width="510"/>
-                        </child1>
-                        <child2>
-                        <vpaned>
-                            <child1>
-                                <action colspan="4"  name="%(action_project_issue_graph_state)d" string="Issues By State" />
-                            </child1>
-                            <child2>
-                                <action colspan="4"  name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
-                            </child2>
-                        </vpaned>
-                        </child2>
-                    </hpaned>
+                    <board style="1-1">
+                        <column>
+                            <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
+                            <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
+                        </column>
+                        <column>
+	                        <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
+                            <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
@@ -115,6 +109,7 @@
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     <field name="categ_id" invisible="1"/>
+                    <field name="task_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -123,7 +118,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
          <record id="view_my_open_project_issue_graph" model="ir.ui.view">
@@ -142,7 +137,8 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
+            <field name="context">{'default_user_id': uid}</field>
            <field name="view_id" ref="view_my_open_project_issue_graph"/>
         </record>
        <record id="board_my_project_issue_form" model="ir.ui.view">
@@ -151,11 +147,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-            	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
-						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
+            	<xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
+						<action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
             	</xpath>
-            	<xpath expr="/form/hpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
-						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
+            	<xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
+						<action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
             	</xpath>
             </field>
         </record>
diff --git a/addons/project_issue/i18n/ca.po b/addons/project_issue/i18n/ca.po
index 1fe2f6473b2..1466dbb0364 100644
--- a/addons/project_issue/i18n/ca.po
+++ b/addons/project_issue/i18n/ca.po
@@ -8,82 +8,84 @@ 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-12 17:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 19:57+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "retard mitja per obrir"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: project_issue
 #: field:project.issue,working_hours_open:0
 msgid "Working Hours to Open the Issue"
-msgstr ""
+msgstr "Hores de treball per obrir la incidència"
 
 #. module: project_issue
 #: 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_issue
 #: field:project.issue,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Obert"
 
 #. module: project_issue
 #: field:project.issue.report,opening_date:0
 msgid "Date of Opening"
-msgstr ""
+msgstr "Data d'obertura"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: project_issue
 #: field:project.issue,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progrés (%)"
 
 #. module: project_issue
 #: field:project.issue,company_id:0
 #: view:project.issue.report:0
 #: field:project.issue.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Observadors d'Emails (CC)"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Close Working hours"
-msgstr ""
+msgstr "Tanqueu hores de treball"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_version
 msgid "project.issue.version"
-msgstr ""
+msgstr "projecte.incidència.versió"
 
 #. module: project_issue
 #: field:project.issue,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dies per obrir"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:360
@@ -92,49 +94,51 @@ msgid ""
 "You cannot escalate this issue.\n"
 "The relevant Project has not configured the Escalation Project!"
 msgstr ""
+"No podeu escalar aquesta incidència.\n"
+"El projecte rellevant no té configurat l'escalat de projecte!"
 
 #. module: project_issue
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Data de tancament"
 
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Afegeix nota interna"
 
 #. module: project_issue
 #: field:project.issue,task_id:0
 #: view:project.issue.report:0
 #: field:project.issue.report,task_id:0
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "Issues By Stage"
-msgstr ""
+msgstr "Incidències per etapa"
 
 #. module: project_issue
 #: field:project.issue,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mòbil"
 
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_project
@@ -143,44 +147,44 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projecte"
 
 #. 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 "Les meves incidències de projecte obertes"
 
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avís!"
 
 #. module: project_issue
 #: field:project.issue.report,date_closed:0
 msgid "Date of Closing"
-msgstr ""
+msgstr "Data de tancament"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Search"
-msgstr ""
+msgstr "Cerca en el gestor d'incidències"
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
-msgstr ""
+msgstr "Hores de treball mitjà per obrir"
 
 #. module: project_issue
 #: field:project.issue,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Acció següent"
 
 #. module: project_issue
 #: help:project.project,project_escalation_id:0
@@ -188,11 +192,13 @@ msgid ""
 "If any issue is escalated from the current Project, it will be listed under "
 "the project selected here."
 msgstr ""
+"Si alguna incidència del projecte actual s'ha intensificat, es mostrarà dins "
+"del projecte seleccionat aquí."
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informació extra"
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.action_project_issue_report
@@ -202,6 +208,11 @@ 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 ""
+"Aquest informe sobre les incidències del projecte permet analitzar la "
+"qualitat del seu suport o els serveis postvenda. Podeu fer un seguiment de "
+"les incidències per antiguitat. Podeu analitzar el temps requerit a obrir o "
+"tancar una incidència, el nombre de correus intercanviats i el temps gastat "
+"en mitjana per incidència."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -209,43 +220,45 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (còpia)"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Previous"
-msgstr ""
+msgstr "Previ"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Statistics"
-msgstr ""
+msgstr "Estadístiques"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Convert To Task"
-msgstr ""
+msgstr "Converteix a tasca"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
-msgstr ""
+msgstr "Anàlisi d'incidències"
 
 #. module: project_issue
 #: field:project.issue.version,name:0
 msgid "Version Number"
-msgstr ""
+msgstr "Número de versió"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Next"
-msgstr ""
+msgstr "Següent"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -253,12 +266,12 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritat"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envia nou correu electrònic"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -266,141 +279,141 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,version_id:0
 msgid "Version"
-msgstr ""
+msgstr "Versió"
 
 #. module: project_issue
 #: model:ir.module.module,shortdesc:project_issue.module_meta_information
 msgid "Issue Management in Project Management"
-msgstr ""
+msgstr "Gestió d'incidències en gestió de projectes"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "Pending Issues"
-msgstr ""
+msgstr "Incidències pendents"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Open Working Hours"
-msgstr ""
+msgstr "Hores de treball obert"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
 msgid "Issue Categories"
-msgstr ""
+msgstr "Categories d'incidències"
 
 #. module: project_issue
 #: field:project.issue,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: project_issue
 #: field:project.issue,canal_id:0
 #: field:project.issue.report,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Canal"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Mínima"
 
 #. module: project_issue
 #: field:project.issue,create_date:0
 #: field:project.issue.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_version_action
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
 msgid "Versions"
-msgstr ""
+msgstr "Versions"
 
 #. module: project_issue
 #: field:project.issue,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telèfon"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Canvia a esborrany"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Today"
-msgstr ""
+msgstr "Avui"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
 msgid "Project Issue Dashboard"
-msgstr ""
+msgstr "Taulell d'incidències de projecte"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: project_issue
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
 msgid "Categories"
-msgstr ""
+msgstr "Categories"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 #: field:project.issue.report,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "History Information"
-msgstr ""
+msgstr "Informació històrica"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
 msgid "Project issues"
-msgstr ""
+msgstr "Incidències projecte"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicació i historial"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "My Open Project Issue"
-msgstr ""
+msgstr "Les meves incidències de projecte obertes"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
 msgid "My Project Issues"
-msgstr ""
+msgstr "Les meves incidències de projecte"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacta"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "El meu taulell"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Issues"
-msgstr ""
+msgstr "Les meves incidències"
 
 #. module: project_issue
 #: help:project.issue,canal_id:0
@@ -409,6 +422,9 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
 msgstr ""
+"Els canals representen els diferents mètodes de comunicació disponibles amb "
+"el client. En cada oportunitat comercial, podeu indicar el canal de l'origen "
+"d'aquesta oportunitat."
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.project_issue_version_action
@@ -417,66 +433,70 @@ 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 ""
+"Podeu utilitzar el seguiment d'incidències d'OpenERP per manejar errors en "
+"el projecte de desenvolupament de programari, per manejar reclamacions en "
+"serveis post-venda, etc. Definiu aquí les diferents versions dels seus "
+"productes sobre els quals podeu treballar les incidències."
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:283
 #, python-format
 msgid "Tasks"
-msgstr ""
+msgstr "Tasques"
 
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
-msgstr ""
+msgstr "Nº de incidències"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Tree"
-msgstr ""
+msgstr "Arbre del gestor d'incidències"
 
 #. module: project_issue
 #: help:project.issue,assigned_to:0
 msgid "This is the current user to whom the related task have been assigned"
-msgstr ""
+msgstr "Aquest és l'usuari actual al que s'ha assignat la tasca associada"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 #: field:project.issue.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
-msgstr ""
+msgstr "projecte.incidència.informe"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:362
 #: view:project.issue:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Escalat"
 
 #. module: project_issue
 #: model:crm.case.categ,name:project_issue.feature_request_categ
 msgid "Feature Requests"
-msgstr ""
+msgstr "Sol·licitud de noves característiques"
 
 #. module: project_issue
 #: field:project.issue,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Data d'actualització"
 
 #. module: project_issue
 #: model:ir.module.module,description:project_issue.module_meta_information
@@ -485,6 +505,10 @@ msgid ""
 "        This module provide Issues/Bugs Management in Project\n"
 "    "
 msgstr ""
+"\n"
+"        Aquest mòdul proporciona la gestió d'incidències/errors en "
+"projectes.\n"
+"    "
 
 #. module: project_issue
 #: view:project.issue:0
@@ -492,12 +516,12 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Number of Project Issues"
-msgstr ""
+msgstr "Núm. d'incidències de projecte"
 
 #. module: project_issue
 #: help:project.issue,email_cc:0
@@ -506,30 +530,33 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Aquestes adreces de correu seran afegides al camp CC en tots els correus "
+"entrants i sortints d'aquest registre abans de ser enviats. Separeu les "
+"diferents adreces de correu amb una coma."
 
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Fluix"
 
 #. module: project_issue
 #: field:project.issue,date_closed:0
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancat"
 
 #. module: project_issue
 #: field:project.issue.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "Retard mitjà fins a tancament"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -537,150 +564,150 @@ msgstr ""
 #: view:project.issue.report:0
 #: selection:project.issue.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Status"
-msgstr ""
+msgstr "Estat"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Project Issues"
-msgstr ""
+msgstr "Núm. d'incidències del projecte"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "Current Issues"
-msgstr ""
+msgstr "Incidències actuals"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC Global"
 
 #. module: project_issue
 #: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Pendent"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: project_issue
 #: field:project.issue,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dies per al tancament"
 
 #. module: project_issue
 #: field:project.issue,active:0
 #: field:project.issue.version,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Tree"
-msgstr ""
+msgstr "Arbre de gestió de funcionalitats"
 
 #. module: project_issue
 #: model:crm.case.categ,name:project_issue.bug_categ
 msgid "Bugs"
-msgstr ""
+msgstr "Errors"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "Issues By State"
-msgstr ""
+msgstr "Incidències per estat"
 
 #. module: project_issue
 #: view:project.issue:0
 #: field:project.issue,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: project_issue
 #: field:project.issue,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacte empresa"
 
 #. module: project_issue
 #: field:project.issue,type_id:0
 msgid "Resolution"
-msgstr ""
+msgstr "Resolució"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "History"
-msgstr ""
+msgstr "Historial"
 
 #. module: project_issue
 #: field:project.issue,assigned_to:0
 #: view:project.issue.report:0
 #: field:project.issue.report,assigned_to:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Assignat a"
 
 #. module: project_issue
 #: field:project.project,reply_to:0
 msgid "Reply-To Email Address"
-msgstr ""
+msgstr "Respondre a l'adreça de correu electrònic"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "El més alt"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjunts"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Form"
-msgstr ""
+msgstr "Formulari de gestió d'incidències"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -688,38 +715,38 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
-msgstr ""
+msgstr "Versió incidència"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicació"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: project_issue
 #: view:project.issue:0
 #: selection:project.issue.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
@@ -727,7 +754,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_track
 #: view:project.issue:0
 msgid "Issues"
-msgstr ""
+msgstr "Incidencias"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
@@ -736,7 +763,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_issue.menu_project_confi
 #: view:project.issue.report:0
 msgid "Project Issue"
-msgstr ""
+msgstr "Incidència projecte"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -744,18 +771,18 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project_issue
 #: help:project.issue,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Calculat com: Temps dedicat / Temps total."
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
@@ -765,69 +792,74 @@ msgid ""
 "issue (analysis, development, done). With the mailgateway module, issues can "
 "be integrated through an email address (example: support@mycompany.com)"
 msgstr ""
+"Incidents com errors del sistema, queixes dels clients, i avaries de "
+"material es recullen aquí. Podeu definir les etapes assignades a la solució "
+"dels incidents del projecte (anàlisi, desenvolupament, fet). Amb el mòdul "
+"passarel·la de correu, els incidents poden integrar-se a través d'una adreça "
+"de correu electrònic (exemple: support@mycompany.com)"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: project_issue
 #: help:project.issue,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Aquestes persones rebran un correu electrònic."
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Reply"
-msgstr ""
+msgstr "Respondre"
 
 #. module: project_issue
 #: field:project.issue,name:0
 msgid "Issue"
-msgstr ""
+msgstr "Incidència"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Search"
-msgstr ""
+msgstr "Cerca de gestió de funcionalitats"
 
 #. module: project_issue
 #: view:project.issue:0
 #: field:project.issue,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: project_issue
 #: field:project.issue,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_report
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 msgid "Issue Analysis"
-msgstr ""
+msgstr "Anàlisi d'incidències"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Sale Team    "
-msgstr ""
+msgstr "Equip de vendes    "
 
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Nº d'emails"
 
 #. module: project_issue
 #: field:project.issue,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nom del treballador"
 
 #. module: project_issue
 #: help:project.issue,state:0
@@ -840,27 +872,34 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'estat s'estableix a 'Esborrany', quan es crea un cas.                      "
+"            \n"
+"Si el cas està en progrés l'estat s'estableix a 'Obert'.                     "
+"             \n"
+"Quan el cas es tanca, l'estat s'estableix a 'Realitzat'.                     "
+"             \n"
+"Si el cas necessita ser revisat llavors en estat s'estableix a 'Pendent'."
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:61
 #, python-format
 msgid "Issue '%s' has been opened."
-msgstr ""
+msgstr "La incidència '%s' ha estat oberta."
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
-msgstr ""
+msgstr "Descripció funcionalitat"
 
 #. module: project_issue
 #: field:project.project,project_escalation_id:0
 msgid "Project Escalation"
-msgstr ""
+msgstr "Escalat de projecte"
 
 #. module: project_issue
 #: help:project.issue,section_id:0
@@ -868,89 +907,94 @@ msgid ""
 "Sales team to which Case belongs to.                             Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
+"Equip de vendes al qual pertany el cas. Defineix l'usuari responsable i el "
+"compte de correu electrònic per a la passarel·la de correu."
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mes-1"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:76
 #, python-format
 msgid "Issue '%s' has been closed."
-msgstr ""
+msgstr "La incidència '%s' ha estat tancada."
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "References"
-msgstr ""
+msgstr "Referències"
 
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
-msgstr ""
+msgstr "Hores de treball per tancar la incidència"
 
 #. module: project_issue
 #: field:project.issue,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:377
 #, python-format
 msgid "No Title"
-msgstr ""
+msgstr "Sense títol"
 
 #. module: project_issue
 #: 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 dies per tancar la incidència de projecte"
 
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_close:0
 msgid "Avg. Working Hours to Close"
-msgstr ""
+msgstr "Hores de treball mitjà per tancar"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Alt"
 
 #. module: project_issue
 #: field:project.issue,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data límit"
 
 #. module: project_issue
 #: field:project.issue,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Última acció"
 
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: project_issue
 #: field:project.issue,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duració"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
-msgstr ""
+msgstr "Les meves incidències obertes per data de creació"
+
+#~ msgid "Maintenance"
+#~ msgstr "Manteniment"
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
index 0d8ec770e50..1b06b8ed4b9 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -222,7 +222,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (Kopie)"
@@ -243,6 +243,8 @@ msgid "Convert To Task"
 msgstr "Erzeuge Aufgabe"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Statistik Probleme"
@@ -995,155 +997,5 @@ msgstr "Dauer"
 msgid "My Open Issues by Creation Date"
 msgstr "Meine offenen Probleme nach Erstelldatum"
 
-#~ msgid "Severity"
-#~ msgstr "Schwere"
-
-#, python-format
-#~ msgid "is Open."
-#~ msgstr "ist Offen."
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Tage    "
-
-#, python-format
-#~ msgid "An Issue created"
-#~ msgstr "Ein Problem erfasst"
-
-#~ msgid "365 Days"
-#~ msgstr "365 Tage"
-
-#~ msgid "Fixed"
-#~ msgstr "Behoben"
-
-#~ msgid "Close Date"
-#~ msgstr "Datum Beendigung"
-
-#~ msgid "Version 4.4"
-#~ msgstr "Version 4.4"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung für diese Aktion."
-
-#~ msgid "Section"
-#~ msgstr "Sektion"
-
-#~ msgid "%Done"
-#~ msgstr "%Erledigt"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "Avg. Answers"
-#~ msgstr "Durch. Antw."
-
-#~ msgid "Won't fix"
-#~ msgstr "Kein Fehler"
-
-#~ msgid "%Cancel"
-#~ msgstr "%Abbrechen"
-
-#~ msgid "Communication history"
-#~ msgstr "Historie Kommunikation"
-
-#~ msgid "Salesman"
-#~ msgstr "Verkäufer"
-
-#~ msgid "Issue Stages"
-#~ msgstr "Problem Stufen"
-
-#~ msgid "Version 4.2"
-#~ msgstr "Version 4.2"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
-
-#~ msgid "Works For Me"
-#~ msgstr "Problem n. reproduzierbar"
-
-#~ msgid "7 Days"
-#~ msgstr "7 Tage"
-
-#, python-format
-#~ msgid "Issue "
-#~ msgstr "Problem "
-
-#~ msgid "30 Days"
-#~ msgstr "30 Tage"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Warte a. Rückmeldung"
-
-#~ msgid "Stages"
-#~ msgstr "Stufen"
-
-#, python-format
-#~ msgid "from Mailgate."
-#~ msgstr "von Mailgateway"
-
-#~ msgid "   Today   "
-#~ msgstr "   Heute   "
-
-#~ msgid "Accepted as Bug"
-#~ msgstr "Akzeptiert als Fehler"
-
-#~ msgid "Assignee"
-#~ msgstr "Bearbeiter"
-
-#~ msgid "In Progress"
-#~ msgstr "In Bearbeitung"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Object Bezeichnung muss mit x_ beginnen und darf kein Sonderzeichen "
-#~ "haben !"
-
-#~ msgid "Working Time"
-#~ msgstr "Arbeitszeit"
-
-#~ msgid "Invalid"
-#~ msgstr "Fehlerhaft"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Tabelle der Arbeitszeit als Einstellung für das Gantt Diagramm"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#~ msgid "Name"
-#~ msgstr "Bezeichnung"
-
-#, python-format
-#~ msgid "is Closed."
-#~ msgstr "ist Beendet"
-
-#~ msgid "Todo"
-#~ msgstr "Offen"
-
-#~ msgid ""
-#~ "Issues such as system bugs, client complains, material breakdowns are "
-#~ "collected here. You can define the stages assigned to the resolution of the "
-#~ "issue on the project. (analysis, development, done) Using the mailgateway "
-#~ "module, the issues can be integrated to an email address (example: "
-#~ "support@mycompany.com)"
-#~ msgstr ""
-#~ "Probleme wie Softwarefehler, Beschwerden von Kunden, Materialfehler können "
-#~ "hier zentral gesammelt werden. Sie können Bearbeitungsschritte für die "
-#~ "Bearbeitung der Vorgänge zuweisen (Problemanalyse, Entwicklung, Abschluss "
-#~ "des Vorgangs). Über das Mailgateway, können Sie Probleme fest mit einer "
-#~ "Emailadresse verbinden (z.B. support@mycompany.com)."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #~ msgid "Maintenance"
 #~ msgstr "Wartung"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 6dfdfd02a06..63a2baaca20 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -223,7 +223,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -244,6 +244,8 @@ msgid "Convert To Task"
 msgstr "Convertir a tarea"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Análisis de incidencias"
@@ -995,5 +997,5 @@ msgstr "Duración"
 msgid "My Open Issues by Creation Date"
 msgstr "Mis incidencias abiertas por fecha de creación"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo no válido en la definición de la acción."
+#~ msgid "Maintenance"
+#~ msgstr "Mantenimiento"
diff --git a/addons/project_issue/i18n/es_MX.po b/addons/project_issue/i18n/es_MX.po
new file mode 100644
index 00000000000..9e1c1c6f704
--- /dev/null
+++ b/addons/project_issue/i18n/es_MX.po
@@ -0,0 +1,1001 @@
+# 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-18 09:24+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:52+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Retraso promedio para abrir"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr "Horas de trabajo para abrir la incidencia"
+
+#. module: project_issue
+#: 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_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Abierto"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Fecha de apertura"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Progreso (%)"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email de los observadores"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr "Cerrar horas de trabajo"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "proyecto.incidencia.versión"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"No puede escalar esta incidencia.\n"
+"¡El proyecto relevante no tienen configurado el escalado de proyecto!"
+
+#. module: project_issue
+#: 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_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "Fecha de cierre"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "Incidencias por etapa"
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Mis incidencias de proyecto abiertas"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "Fecha de cierre"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "Buscar en el gestor de incidencias"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "Horas de trabajo prom. para abrir"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "Próxima acción"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+"Si alguna incidencia del proyecto actual se intensificó, se mostrará dentro "
+"del proyecto seleccionado aquí."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+"Este informe sobre las incidencias del proyecto permite analizar la calidad "
+"de su soporte o los servicios postventa. Puede hacer un seguimiento de las "
+"incidencias por antigüedad. Puede analizar el tiempo requerido en abrir o "
+"cerrar una incidencia, el número de correos intercambiados y el tiempo "
+"gastado en promedio por incidencia."
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:473
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "Convertir a tarea"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "Análisis de incidencias"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "Número de versión"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Enviar nuevo correo eléctronico"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "Versión"
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr "Gestión de incidencias en gestión de proyectos"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr "Incidencias pendientes"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr "Horas de trabajo abierto"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "Categorías de incidencias"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "La más baja"
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "Versiones"
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "Cuadro de mandos de incidencias de proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "Incidencias proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "Mis incidencias de proyecto abiertas"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "Mis incidencias de proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "Mis incidencias"
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr ""
+"Los canales representan los diferentes métodos de comunicación disponibles "
+"con el cliente. En cada oportunidad comercial, puede indicar el canal del "
+"origen de esta oportunidad."
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+"Puede usar el seguimiento de incidencias de OpenERP para manejar errores en "
+"el proyecto de desarrollo de software, para manejar reclamaciones en "
+"servicios pos-venta, etc. Defina aquí las distintas versiones de sus "
+"productos sobre las que puede trabajar las incidencias."
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:283
+#, python-format
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "Nº de incidencias"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "Árbol del gestor de incidencias"
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr "Este es el usuario actual al que se ha asignado la tarea asociada"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "proyecto.incidencia.informe"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:362
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "Peticiones de funcionalidades"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "Actualizar fecha"
+
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid ""
+"\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+"\n"
+"        Este módulo proporciona la gestión de incidencias/errores en "
+"proyectos.\n"
+"    "
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "Nº de incidencias de proyecto"
+
+#. module: project_issue
+#: help:project.issue,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Cerrada"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Retraso prom. hasta cierre"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "Nº de incidencias del proyecto"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "Incidencias actuales"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "To Do"
+msgstr "Por hacer"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "Días para el cierre"
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr "Activa"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "Árbol de gestión de funcionalidades"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
+msgstr "Fallos"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "Incidencias por estado"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: project_issue
+#: field:project.issue,type_id:0
+msgid "Resolution"
+msgstr "Resolución"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr "Asignada a"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "Responder a la dirección de correo electrónico"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "La más alta"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "Formulario de gestión de incidencias"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "General"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr "Versión incidencia"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr "Incidencias"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr "Incidencia proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+"Incidentes como errores del sistema, quejas de los clientes, y averías de "
+"material se recogen aquí. Puede definir las etapas asignadas a la solución "
+"de los incidentes del proyecto (análisis, desarrollo, hecho). Con el módulo "
+"pasarela de correo, los incidentes pueden integrarse a través de una "
+"dirección de correo electrónico (ejemplo: support@mycompany.com)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán correo electronico."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr "Incidencia"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr "Búsqueda de gestión de funcionalidades"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr "Análisis de incidencias"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Sale Team    "
+msgstr "Equipo de ventas    "
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: project_issue
+#: help:project.issue,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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces en estado se establece a "
+"'Pendiente'."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:61
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr "La incidencia '%s' ha sido abierta."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr "Descripción funcionalidad"
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr "Escalado de proyecto"
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+"Equipo de ventas al cual pertenece el caso. Define el usuario responsable y "
+"la cuenta de correo electrónico para la pasarela de correo."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr "Mes-1"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:76
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr "La incidencia '%s' ha sido cerrada."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr "Horas de trabajo para cerrar la incidencia"
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:377
+#, python-format
+msgid "No Title"
+msgstr "Sin título"
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "Número de días para cerrar la incidencia de proyecto"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr "Equipo de ventas"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr "Horas de trabajo prom. para cerrar"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr "Última acción"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr "Mis incidencias abiertas por fecha de creación"
+
+#~ msgid "Maintenance"
+#~ msgstr "Mantenimiento"
diff --git a/addons/project_issue/i18n/es_VE.po b/addons/project_issue/i18n/es_VE.po
new file mode 100644
index 00000000000..9e1c1c6f704
--- /dev/null
+++ b/addons/project_issue/i18n/es_VE.po
@@ -0,0 +1,1001 @@
+# 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-18 09:24+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:52+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Retraso promedio para abrir"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr "Horas de trabajo para abrir la incidencia"
+
+#. module: project_issue
+#: 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_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Abierto"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Fecha de apertura"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Progreso (%)"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email de los observadores"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr "Cerrar horas de trabajo"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "proyecto.incidencia.versión"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Días para abrir"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"No puede escalar esta incidencia.\n"
+"¡El proyecto relevante no tienen configurado el escalado de proyecto!"
+
+#. module: project_issue
+#: 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_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "Fecha de cierre"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "Incidencias por etapa"
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Mis incidencias de proyecto abiertas"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "Fecha de cierre"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "Buscar en el gestor de incidencias"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "Horas de trabajo prom. para abrir"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "Próxima acción"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+"Si alguna incidencia del proyecto actual se intensificó, se mostrará dentro "
+"del proyecto seleccionado aquí."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+"Este informe sobre las incidencias del proyecto permite analizar la calidad "
+"de su soporte o los servicios postventa. Puede hacer un seguimiento de las "
+"incidencias por antigüedad. Puede analizar el tiempo requerido en abrir o "
+"cerrar una incidencia, el número de correos intercambiados y el tiempo "
+"gastado en promedio por incidencia."
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:473
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Anterior"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "Convertir a tarea"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "Análisis de incidencias"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "Número de versión"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Enviar nuevo correo eléctronico"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "Versión"
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr "Gestión de incidencias en gestión de proyectos"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr "Incidencias pendientes"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr "Horas de trabajo abierto"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "Categorías de incidencias"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "La más baja"
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "Versiones"
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "Cuadro de mandos de incidencias de proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "Incidencias proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "Comunicación e Historial"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "Mis incidencias de proyecto abiertas"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "Mis incidencias de proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "Mis incidencias"
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr ""
+"Los canales representan los diferentes métodos de comunicación disponibles "
+"con el cliente. En cada oportunidad comercial, puede indicar el canal del "
+"origen de esta oportunidad."
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+"Puede usar el seguimiento de incidencias de OpenERP para manejar errores en "
+"el proyecto de desarrollo de software, para manejar reclamaciones en "
+"servicios pos-venta, etc. Defina aquí las distintas versiones de sus "
+"productos sobre las que puede trabajar las incidencias."
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:283
+#, python-format
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "Nº de incidencias"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "Árbol del gestor de incidencias"
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr "Este es el usuario actual al que se ha asignado la tarea asociada"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "proyecto.incidencia.informe"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:362
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Escalar"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "Peticiones de funcionalidades"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "Actualizar fecha"
+
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid ""
+"\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+"\n"
+"        Este módulo proporciona la gestión de incidencias/errores en "
+"proyectos.\n"
+"    "
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "Nº de incidencias de proyecto"
+
+#. module: project_issue
+#: help:project.issue,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 ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Cerrada"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Retraso prom. hasta cierre"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "Nº de incidencias del proyecto"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "Incidencias actuales"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "To Do"
+msgstr "Por hacer"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "Días para el cierre"
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr "Activa"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "Árbol de gestión de funcionalidades"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
+msgstr "Fallos"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "Incidencias por estado"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: project_issue
+#: field:project.issue,type_id:0
+msgid "Resolution"
+msgstr "Resolución"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr "Asignada a"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "Responder a la dirección de correo electrónico"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "La más alta"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "Formulario de gestión de incidencias"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "General"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr "Versión incidencia"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr "Incidencias"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr "Incidencia proyecto"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+"Incidentes como errores del sistema, quejas de los clientes, y averías de "
+"material se recogen aquí. Puede definir las etapas asignadas a la solución "
+"de los incidentes del proyecto (análisis, desarrollo, hecho). Con el módulo "
+"pasarela de correo, los incidentes pueden integrarse a través de una "
+"dirección de correo electrónico (ejemplo: support@mycompany.com)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "Estas personas recibirán correo electronico."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr "Responder"
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr "Incidencia"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr "Búsqueda de gestión de funcionalidades"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr "Análisis de incidencias"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Sale Team    "
+msgstr "Equipo de ventas    "
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr "Nombre del empleado"
+
+#. module: project_issue
+#: help:project.issue,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 ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces en estado se establece a "
+"'Pendiente'."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:61
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr "La incidencia '%s' ha sido abierta."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr "Descripción funcionalidad"
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr "Escalado de proyecto"
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+"Equipo de ventas al cual pertenece el caso. Define el usuario responsable y "
+"la cuenta de correo electrónico para la pasarela de correo."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr "Mes-1"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:76
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr "La incidencia '%s' ha sido cerrada."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr "Horas de trabajo para cerrar la incidencia"
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:377
+#, python-format
+msgid "No Title"
+msgstr "Sin título"
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "Número de días para cerrar la incidencia de proyecto"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr "Equipo de ventas"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr "Horas de trabajo prom. para cerrar"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr "Última acción"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr "Mis incidencias abiertas por fecha de creación"
+
+#~ msgid "Maintenance"
+#~ msgstr "Mantenimiento"
diff --git a/addons/project_issue/i18n/fi.po b/addons/project_issue/i18n/fi.po
index 800ed99793a..c231246dfd2 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: 2011-07-20 04:37+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 545ce59fc3f..4c8a55e4ba3 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -223,7 +223,7 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
@@ -244,6 +244,8 @@ msgid "Convert To Task"
 msgstr "Convertir en tâche"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Analyse des incidents"
diff --git a/addons/project_issue/i18n/hu.po b/addons/project_issue/i18n/hu.po
index cfa80fa62df..23eaeeea8e4 100644
--- a/addons/project_issue/i18n/hu.po
+++ b/addons/project_issue/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-07 12:14+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -213,7 +214,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (másolat)"
@@ -234,6 +235,8 @@ msgid "Convert To Task"
 msgstr ""
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr ""
diff --git a/addons/project_issue/i18n/it.po b/addons/project_issue/i18n/it.po
index 712ef54f301..3146e89e568 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -214,7 +214,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -235,6 +235,8 @@ msgid "Convert To Task"
 msgstr "Converti ad attività"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Analisi problematiche"
@@ -366,7 +368,7 @@ msgstr "Stadio"
 #. module: project_issue
 #: view:project.issue:0
 msgid "History Information"
-msgstr ""
+msgstr "Storico Informazioni"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
@@ -377,7 +379,7 @@ msgstr "Problematiche di progetto"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicazioni & Storico"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -726,7 +728,7 @@ msgstr "Annulla"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Close"
-msgstr "Chiudi"
+msgstr "Chiuso"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -982,3 +984,6 @@ msgstr "Durata"
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
 msgstr "Le mie problematiche per data di creazione"
+
+#~ msgid "Maintenance"
+#~ msgstr "Manutenzione"
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 3880f547850..4660aec17cc 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -212,7 +212,7 @@ msgid "Partner"
 msgstr "Partneris"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
@@ -233,6 +233,8 @@ msgid "Convert To Task"
 msgstr "Pārveidot par uzdevumu"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Incidentu analīze"
diff --git a/addons/project_issue/i18n/nb.po b/addons/project_issue/i18n/nb.po
index bb294245223..ef8136dfa8e 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index 403f0acbe50..f58e1ebfd72 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -220,7 +220,7 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (kopie)"
@@ -241,6 +241,8 @@ msgid "Convert To Task"
 msgstr "Omzetten naar taak"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Issues analyse"
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index 2825628479e..7cc427df007 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -216,7 +216,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
@@ -237,6 +237,8 @@ msgid "Convert To Task"
 msgstr "Skonwertuj do zadania"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Analiza problemu"
@@ -983,118 +985,3 @@ msgstr "Czas trwania"
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
 msgstr "Moje otwarte problemy wg dat utworzenia"
-
-#, python-format
-#~ msgid "An Issue created"
-#~ msgstr "Utworzono problem"
-
-#~ msgid "365 Days"
-#~ msgstr "365 dni"
-
-#~ msgid "Close Date"
-#~ msgstr "Data zamknięcia"
-
-#~ msgid "Fixed"
-#~ msgstr "Naprawione"
-
-#~ msgid "%Done"
-#~ msgstr "%Wykonano"
-
-#~ msgid "Version 4.4"
-#~ msgstr "Wersja 4.4"
-
-#~ msgid "Section"
-#~ msgstr "Sekcja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Avg. Answers"
-#~ msgstr "Śred. odpowiedzi"
-
-#~ msgid "Won't fix"
-#~ msgstr "Nie do naprawienia"
-
-#~ msgid "%Cancel"
-#~ msgstr "%Anulowanych"
-
-#~ msgid "Communication history"
-#~ msgstr "Historia komunikacji"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Issue Stages"
-#~ msgstr "Etapy problemów"
-
-#~ msgid "Salesman"
-#~ msgstr "Sprzedawca"
-
-#~ msgid "Works For Me"
-#~ msgstr "Praca dla mnie"
-
-#~ msgid "7 Days"
-#~ msgstr "7 dni"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Oczekuje na odpowiedź"
-
-#~ msgid "Stages"
-#~ msgstr "Etapy"
-
-#~ msgid "30 Days"
-#~ msgstr "30 Dni"
-
-#, python-format
-#~ msgid "Issue "
-#~ msgstr "Problem "
-
-#~ msgid "   Today   "
-#~ msgstr "   Dzisiaj   "
-
-#~ msgid "Accepted as Bug"
-#~ msgstr "Zaakceptowany jako błąd"
-
-#~ msgid "Assignee"
-#~ msgstr "Przypisany"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "In Progress"
-#~ msgstr "W toku"
-
-#~ msgid "Invalid"
-#~ msgstr "Niepoprawne"
-
-#~ msgid "Working Time"
-#~ msgstr "Czas pracy"
-
-#~ msgid "Emails"
-#~ msgstr "Emaile"
-
-#~ msgid "Name"
-#~ msgstr "Nazwa"
-
-#~ msgid "Todo"
-#~ msgstr "Do wykonania"
-
-#, python-format
-#~ msgid "is Closed."
-#~ msgstr "jest Zamknięte"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Dni    "
-
-#~ msgid "Severity"
-#~ msgstr "Ważność"
-
-#, python-format
-#~ msgid "is Open."
-#~ msgstr "jest Otwarte"
diff --git a/addons/project_issue/i18n/pt.po b/addons/project_issue/i18n/pt.po
index 84fe3ae57ff..cc4e1546255 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -212,7 +212,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -233,6 +233,8 @@ msgid "Convert To Task"
 msgstr ""
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr ""
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index 282691b8667..392ea94a384 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: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -212,7 +212,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -233,6 +233,8 @@ msgid "Convert To Task"
 msgstr "Converter em Tarefa"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr ""
diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po
new file mode 100644
index 00000000000..5c1528e4c92
--- /dev/null
+++ b/addons/project_issue/i18n/ru.po
@@ -0,0 +1,967 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-07 22:20+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-11-08 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Средняя задержка при Открытии"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr "Группировать по ..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"Ошибка! Дата начала проекта должна быть раньше даты окончания проекта."
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Открыто"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Дата открытия"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Выполнение (%)"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Организация"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Адреса наблюдателей"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Дней до открытия"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"Не возможна эскалация этой проблемы.\n"
+"Связанный с проблемой проект ещё не настроил процедуры эскалации!"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Ошибка! Вы не можете назначить эскалацию на тот же проект!"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "Дата закрытия"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "День"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Добавить внутреннюю заметку"
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Задача"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "Проблемы по стадии"
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr "Мобильный"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Мои открытые проблемы по проекту"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "Отменен"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid "Warning !"
+msgstr "Warning !"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "Дата закрытия"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "Поиск по проблемам"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "Ср. кол-во часов до открытия"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "Следующее действие"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "Доп. инфо."
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:473
+#, python-format
+msgid " (copy)"
+msgstr " (копия)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Предыдущий"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Статистика"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "Преобразовать в задачу"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "Анализ проблемы"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "Номер версии"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Следующий"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "Приоритет"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Отправить новое эл. письмо"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "Версия"
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr "Управление инцидентами в управлении проектами"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr "Ожидающие инциденты"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr "Открыто рабочих часов"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "Категории инцидентов"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "Электронная почта"
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr "Канал"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "Низший"
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "Дата создания"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "Версии"
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr "Телефон"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "Вернуть в черновики"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Сегодня"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "Инфо-панель \"Инциденты проекта\""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "Выполнено"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "Июль"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Категории"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "Этап"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "История"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "Инциденты проекта"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "Общение & история"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "Мой открытый инцидент"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "Мои инциденты"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "Контакт"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr "Моя панель"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "Мои инциденты"
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:283
+#, python-format
+msgid "Tasks"
+msgstr "Задачи"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "Кол-во инцидентов"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Сентябрь"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "Декабрь"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "Дерево инцидентов"
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "project.issue.report"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:362
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Эскалировать"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "Запросы на доработку"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "Дата изменения"
+
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid ""
+"\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "Категория"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "Кол-во инцидентов на проекте"
+
+#. module: project_issue
+#: help:project.issue,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: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "Черновик"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Низкий"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Закрыт"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Ср. задержка перед закрытием"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "В ожидании"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "Состояние"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "Кол-во инцидентов на проекте"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "Текущие индиденты"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Обычный"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "Глобальная копия"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "To Do"
+msgstr "Сделать"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "Июнь"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "Дней до закрытия"
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr "Активный"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "Ноябрь"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr "Расширенные фильтры..."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Поиск"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "Октябрь"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "Январь"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "Дерево запросов функциональности"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "Инциденты по состоянию"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Контакт контрагента"
+
+#. module: project_issue
+#: field:project.issue,type_id:0
+msgid "Resolution"
+msgstr "Решение"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "История"
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr "Назначено"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "Обратный адрес электронной почты"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "Наивысший"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr "Прикрепленные файлы"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "Форма для отслеживания инцидентов"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr "Состояние"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "Эти люди получат эл. письма."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Sale Team    "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,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 ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:61
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:76
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:377
+#, python-format
+msgid "No Title"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr ""
+
+#~ msgid "Maintenance"
+#~ msgstr "Обслуживание"
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
index 1c41a92d2f9..0593d04b986 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: 2011-07-01 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 12bfa85b283..6973002be23 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -26,7 +26,9 @@ from tools.translate import _
 import binascii
 import time
 import tools
+from crm import wizard
 
+wizard.mail_compose_message.SUPPORTED_MODELS.append('project.issue')
 
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
@@ -44,8 +46,15 @@ class project_issue(crm.crm_case, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
-    _inherit = ['mailgate.thread']
-    
+    _inherit = ['mail.thread']
+
+    def write(self, cr, uid, ids, vals, context=None):
+        #Update last action date everytime the user change the stage, the state or send a new email
+        logged_fields = ['type_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')
+        return super(project_issue, self).write(cr, uid, ids, vals, context)
+
     def case_open(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
@@ -56,7 +65,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
 
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid})
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id' : uid})
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Issue '%s' has been opened.") % name
             self.log(cr, uid, id, message)
@@ -90,32 +99,31 @@ class project_issue(crm.crm_case, osv.osv):
 
         res = {}
         for issue in self.browse(cr, uid, ids, context=context):
+            res[issue.id] = {}
             for field in fields:
-                res[issue.id] = {}
                 duration = 0
                 ans = False
                 hours = 0
 
+                date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                 if field in ['working_hours_open','day_open']:
                     if issue.date_open:
-                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                         date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
                         ans = date_open - date_create
                         date_until = issue.date_open
                         #Calculating no. of working hours to open the issue
                         hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
-                                 datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
-                                 datetime.strptime(issue.date_open, '%Y-%m-%d %H:%M:%S'))
+                                                           date_create,
+                                                           date_open)
                 elif field in ['working_hours_close','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
                         #Calculating no. of working hours to close the issue
                         hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
-                                datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
-                                datetime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S'))
+                               date_create,
+                               date_close)
                 elif field in ['days_since_creation']:
                     if issue.create_date:
                         days_since_creation = datetime.today() - datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
@@ -137,7 +145,11 @@ class project_issue(crm.crm_case, osv.osv):
                     duration = float(ans.days)
                     if issue.project_id and issue.project_id.resource_calendar_id:
                         duration = float(ans.days) * 24
-                        new_dates = cal_obj.interval_min_get(cr, uid, issue.project_id.resource_calendar_id.id, datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), duration, resource=resource_id)
+
+                        new_dates = cal_obj.interval_min_get(cr, uid,
+                                                             issue.project_id.resource_calendar_id.id,
+                                                             date_create,
+                                                             duration, resource=resource_id)
                         no_days = []
                         date_until = datetime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
                         for in_time, out_time in new_dates:
@@ -146,17 +158,19 @@ class project_issue(crm.crm_case, osv.osv):
                             if out_time > date_until:
                                 break
                         duration = len(no_days)
+
                 if field in ['working_hours_open','working_hours_close']:
                     res[issue.id][field] = hours
                 else:
                     res[issue.id][field] = abs(float(duration))
+
         return res
 
     def _get_issue_task(self, cr, uid, ids, context=None):
         issues = []
         issue_pool = self.pool.get('project.issue')
         for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
-            issues += issue_pool.search(cr, uid, [('task_id','=',task.id)])            
+            issues += issue_pool.search(cr, uid, [('task_id','=',task.id)])
         return issues
 
     def _get_issue_work(self, cr, uid, ids, context=None):
@@ -174,11 +188,11 @@ class project_issue(crm.crm_case, osv.osv):
             progress = 0.0
             if issue.task_id:
                 progress = task_pool._hours_get(cr, uid, [issue.task_id.id], field_names, args, context=context)[issue.task_id.id]['progress']
-            res[issue.id] = {'progress' : progress}     
-        return res        
+            res[issue.id] = {'progress' : progress}
+        return res
 
     _columns = {
-        'id': fields.integer('ID'),
+        'id': fields.integer('ID', readonly=True),
         'name': fields.char('Issue', size=128, required=True),
         'active': fields.boolean('Active', required=False),
         'create_date': fields.datetime('Creation Date', readonly=True,select=True),
@@ -189,32 +203,27 @@ class project_issue(crm.crm_case, osv.osv):
         '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.'),
-        'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Partner', select=1),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'To Do'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-        'email_from': fields.char('Email', size=128, help="These people will receive email."),
+        '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"),
         'date_open': fields.datetime('Opened', readonly=True,select=True),
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'version_id': fields.many2one('project.issue.version', 'Version'),
-        'partner_name': fields.char("Employee's Name", size=64),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'partner_phone': fields.char('Phone', size=32),
-        'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"),
+        'type_id': fields.many2one ('project.task.type', 'Stages', domain="[('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -222,14 +231,16 @@ class project_issue(crm.crm_case, osv.osv):
                                 multi='compute_day', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='compute_day', type="float", store=True),
-        'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1),
+        'user_id': fields.many2one('res.users', 'Assigned to', required=False, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
                                 multi='compute_day', type="float", store=True),
         'inactivity_days': fields.function(_compute_day, string='Days since last action', \
                                 multi='compute_day', type="integer", help="Difference in days between last action and current date"),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'color': fields.integer('Color Index'),
+        'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
         'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
@@ -247,19 +258,11 @@ class project_issue(crm.crm_case, osv.osv):
         return False
 
     def on_change_project(self, cr, uid, ids, project_id, context=None):
-        result = {}
-
-        if project_id:
-            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
-            if project.user_id:
-                result['value'] = {'user_id' : project.user_id.id}
-
-        return result
+        return {}
 
 
     _defaults = {
         'active': 1,
-        #'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
         'partner_address_id': crm.crm_case._get_default_partner_address,
         'email_from': crm.crm_case._get_default_email,
@@ -269,8 +272,22 @@ class project_issue(crm.crm_case, osv.osv):
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'project_id':_get_project,
         'categ_id' : lambda *a: False,
-        #'assigned_to' : lambda obj, cr, uid, context: uid,
-    }
+         }
+
+    def set_priority(self, cr, uid, ids, priority):
+        """Set lead priority
+        """
+        return self.write(cr, uid, ids, {'priority' : priority})
+
+    def set_high_priority(self, cr, uid, ids, *args):
+        """Set lead priority to high
+        """
+        return self.set_priority(cr, uid, ids, '1')
+
+    def set_normal_priority(self, cr, uid, ids, *args):
+        """Set lead priority to normal
+        """
+        return self.set_priority(cr, uid, ids, '3')
 
     def convert_issue_task(self, cr, uid, ids, context=None):
         case_obj = self.pool.get('project.issue')
@@ -298,7 +315,7 @@ class project_issue(crm.crm_case, osv.osv):
                 'date': bug.date,
                 'project_id': bug.project_id.id,
                 'priority': bug.priority,
-                'user_id': bug.assigned_to.id,
+                'user_id': bug.user_id.id,
                 'planned_hours': 0.0,
             })
 
@@ -360,13 +377,12 @@ class project_issue(crm.crm_case, osv.osv):
                     self.write(cr, uid, task.id, {'type_id': index and types[index-1] or False})
         return True
 
-
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
         result = {}
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
-        return {'value':{'assigned_to': task.user_id.id,}}
+        return {'value':{'user_id': task.user_id.id,}}
 
     def case_escalate(self, cr, uid, ids, *args):
         """Escalates case to top level
@@ -378,7 +394,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
         cases = self.browse(cr, uid, ids)
         for case in cases:
-            data = {}
+            data = {'state' : 'draft'}
             if case.project_id.project_escalation_id:
                 data['project_id'] = case.project_id.project_escalation_id.id
                 if case.project_id.project_escalation_id.user_id:
@@ -388,26 +404,17 @@ class project_issue(crm.crm_case, osv.osv):
             else:
                 raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
             self.write(cr, uid, [case.id], data)
-        self._history(cr, uid, cases, _('Escalate'))
+        self.message_append(cr, uid, cases, _('Escalate'))
         return True
 
-    def message_new(self, cr, uid, msg, context=None):
-        """
-        Automatically calls when new email message arrives
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        """
-        if context is None: 
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """Automatically called when new email message arrives"""
+        if context is None:
             context = {}
-        mailgate_pool = self.pool.get('email.server.tools')
-
         subject = msg.get('subject') or _('No Title')
-        body = msg.get('body')
+        body = msg.get('body_text')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -415,37 +422,20 @@ class project_issue(crm.crm_case, osv.osv):
             'description': body,
             'user_id': False,
         }
-        if msg.get('priority', False):
+        if priority:
             vals['priority'] = priority
-
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
-        if res:
-            vals.update(res)
+        vals.update(self.message_partner_by_email(cr, uid, msg_from))
         context.update({'state_to' : 'draft'})
-        res = self.create(cr, uid, vals, context=context)
-        self.convert_to_bug(cr, uid, [res], context=context)
 
-        attachents = msg.get('attachments', [])
-        for attactment in attachents or []:
-            data_attach = {
-                'name': attactment,
-                'datas': binascii.b2a_base64(str(attachents.get(attactment))),
-                'datas_fname': attactment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
+        if custom_values and isinstance(custom_values, dict):
+            vals.update(custom_values)
 
-        return res
+        res_id = self.create(cr, uid, vals, context)
+        self.message_append_dict(cr, uid, [res_id], msg, context=context)
+        self.convert_to_bug(cr, uid, [res_id], context=context)
+        return res_id
 
-    def message_update(self, cr, uid, ids, vals=None, msg="", default_act='pending', context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs
-        """
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
 
         if vals is None:
             vals = {}
@@ -454,7 +444,7 @@ class project_issue(crm.crm_case, osv.osv):
             ids = [ids]
 
         vals.update({
-            'description': msg['body']
+            'description': msg['body_text']
         })
         if msg.get('priority', False):
             vals['priority'] = msg.get('priority')
@@ -471,7 +461,7 @@ class project_issue(crm.crm_case, osv.osv):
                 record.write({'state' : 'open'})
 
         vls = { }
-        for line in msg['body'].split('\n'):
+        for line in msg['body_text'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -480,20 +470,9 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
+        self.message_append_dict(cr, uid, ids, msg, context=context)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-
-        """ Send The Message
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param *args: Return Tuple Value
-            @param **args: Return Dictionary of Keyword Value
-        """
-        return True
-
     def copy(self, cr, uid, id, default=None, context=None):
         issue = self.read(cr, uid, id, ['name'], context=context)
         if not default:
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 539cef5579e..12ff265b1e9 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -198,7 +198,6 @@
     </record>
 
     <record id="crm_case_createnewobject0" model="project.issue">
-        <field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
         <field name="partner_address_id" ref="base.res_partner_address_6"/>
         <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 18c8779704f..5830fcb37fb 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
-    ######################## ISSUE TRACKING (menu) ###########################
     <!--
         ALL BUGS
     -->
@@ -10,12 +8,13 @@
         <field name="name">Issues</field>
         <field name="res_model">project.issue</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
+        <field name="view_mode">tree,calendar,kanban</field>
         <field name="view_id" ref="project_issue_tree_view"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
+    	
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
@@ -40,7 +39,7 @@
     </record>
 
     <act_window
-    		context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
             id="act_project_project_2_project_issue_all"
             name="Issues"
             res_model="project.issue"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 1d1474ab255..6fc872580a2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
+        <menuitem  id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
@@ -40,7 +40,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
-            <field name="context">{'object_id':'project.issue'}</field>
+            <field name="context" eval="{'object_id': ref('model_project_issue')}"/>
         </record>
 
         <menuitem action="project_issue_categ_action" name="Categories" id="menu_project_issue_category_act" parent="menu_project_confi" />
@@ -55,11 +55,10 @@
                         <field name="name"/>
                         <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                        <field name="user_id" invisible="1" />
-                        <field name="assigned_to"/>
+                        <field name="user_id"/>
                         <field name="version_id" colspan="2" widget="selection"/>
                         <group colspan="2" col="4">
-                            <field name="type_id" string="Resolution" />
+                            <field name="type_id" string="Stages" />
                             <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                             <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                         </group>
@@ -67,7 +66,7 @@
                     <notebook colspan="4">
                         <page string="General">
                             <group col="2" colspan="2">
-                            <separator colspan="2" string="Communication"/>
+                            <separator colspan="2" string="Contact Information"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
                             <field name="email_from"/>
@@ -84,27 +83,27 @@
                             <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                            <field name="state" />
+                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                             <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                             <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                            <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
                         <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
                             <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
+                                    <field name="email_from" invisible="1"/>
                                     <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
+                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -113,20 +112,18 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
-                                        <field name="history" invisible="1"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
-                                            <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+                                            <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                                <field name="body_text" colspan="4" nolabel="1" height="250"/>
+                                                <button colspan="4" string="Reply"
+                                                    name="%(mail.action_email_compose_message_wizard)d"
+                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                                    icon="terp-mail-replied" type="action"/>
                                             </group>
-                                            <group attrs="{'invisible': [('history', '=', True)]}">
+                                            <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
@@ -142,9 +139,8 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
                             <button string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'project.issue'}"
-                               icon="terp-mail-message-new" type="action" />
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -187,11 +183,11 @@
                     <field name="partner_id" groups="base.group_extended"/>
                     <field name="project_id" />
                     <field name="priority" string="Priority"/>
-                    <field name="type_id" widget="selection" readonly="1" string="Resolution" />
+                    <field name="type_id" widget="selection" readonly="1" string="Stages" />
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
-                    <field name="assigned_to"/>
+                    <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
@@ -199,8 +195,9 @@
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                     <field name="categ_id" invisible="1"/>
+                    <field name="task_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -212,25 +209,21 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and To Do" icon="terp-check"/>
-                        <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/>
+                        <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
+                        <filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="partner_id" groups="base.group_extended"/>
-                        <field name="assigned_to">
-                            <filter domain="[('assigned_to','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
+                        <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
+                        <field name="user_id">
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                         </field>
                         <field name="project_id"/>
-                        <field name="version_id" widget="selection"/>
                         <field name="id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
                         <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'assigned_to'}" />
+                            domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -261,13 +254,94 @@
             <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration">
+                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
                     <field name="name"/>
                     <field name="partner_id"/>
                 </calendar>
             </field>
         </record>
 
+
+    <!-- Project Issue Karban View-->
+
+    <record model="ir.ui.view" id="project_issue_kanban_view">
+        <field name="name">Project Issue Kanban</field>
+        <field name="model">project.issue</field>
+        <field name="type">kanban</field>
+        <field name="arch" type="xml">
+            <kanban default_group_by="type_id">
+                <field name="color"/>
+                <field name="state"/>
+                <field name="priority"/>
+                <field name="user_email"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <t t-set="color" t-value="kanban_color(record.color.raw_value || record.state.raw_value)"/>
+                        <div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                            <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">
+                                    <table class="oe_kanban_table">
+                                        <tr>
+                                            <td class="oe_kanban_title1" align="left" valign="middle">
+                                                <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority" />
+                                                <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                                <field name="name"/>
+                                            </td>
+                                            <td valign="top" width="22">
+                                                <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar"/>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                    <table class="oe_kanban_table">
+                                        <tr>
+                                            <td>
+                                                <div class="oe_kanban_right oe_kanban_small">
+                                                    <field name="user_id"/>
+                                                </div>
+                                                <div class="oe_kanban_title2">
+                                                    <field name="partner_id"/>
+                                                </div>
+                                                <div class="oe_kanban_title3">
+                                                    <field name="project_id"/>
+                                                </div>
+                                                <div class="oe_kanban_title3">
+                                                    <i><field name="version_id"/></i>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </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"/>
+                                        <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
+                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
+                                        <a string="Escalate" name="case_escalate"  icon="gtk-go-up" type="object"/>
+                                        <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
+                                    </div>
+                                    <div class="oe_kanban_right">
+                                        <a name="case_open" string="Open" states="draft,pending" type="object" icon="kanban-apply" />
+                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause"/>
+                                        <a name="case_close" string="Close" states="open,draft,pending" type="object" icon="kanban-stop"/>
+                                    </div>
+                                    <br class="oe_kanban_clear"/>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+
+
+
+
+
         # ------------------------------------------------------
         # Feature Requests
         # ------------------------------------------------------
@@ -286,35 +360,35 @@
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
-                    <field name="assigned_to"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
 
         <record id="view_project_feature_filter" model="ir.ui.view">
-            <field name="name">Project Issue- Feature Tracker Search</field>
+            <field name="name">Project Issue - Feature Tracker Search</field>
             <field name="model">project.issue</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <filter icon="terp-go-today" string="Today" separator="1"
+                    <filter icon="terp-go-today" string="Today" 
                         domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
                     <separator orientation="vertical"/>
                     <group>
-                        <field name="name" select='1' string="Feature description"/>
-                        <field name="assigned_to" select="1"/>
-                        <field name="state" select="1">
-                            <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                            <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
+                        <field name="name" string="Feature description"/>
+                        <field name="user_id"/>
+                        <field name="state">
+                        <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
-                        <field name="project_id" select="1" string="Project"/>
+                        <field name="project_id" string="Project"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 29542f32912..36ce72f2a70 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -37,7 +37,6 @@ class project_issue_report(osv.osv):
 
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
@@ -64,9 +63,9 @@ class project_issue_report(osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
-        'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
+        'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
+        'channel_id': fields.many2one('crm.case.channel', 'Channel',readonly=True),
         'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ),
         'email': fields.integer('# Emails', size=128, readonly=True),
     }
@@ -95,14 +94,14 @@ class project_issue_report(osv.osv):
                     c.project_id as project_id,
                     c.version_id as version_id,
                     1 as nbr,
-                    c.assigned_to,
                     c.partner_id,
-                    c.canal_id,
+                    c.channel_id,
                     c.task_id,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
                     extract('epoch' from (c.date_closed-c.date_open))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
+                    (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email
+
                 FROM
                     project_issue c
                 WHERE c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 015a7750548..1695fa3469a 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -18,10 +18,9 @@
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
-                    <field name="canal_id" invisible="1"/>
+                    <field name="channel_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="task_id" invisible="1"/>
-                    <field name="assigned_to" invisible="1"/>
+                    <field name="task_id" invisible="1"/>                    
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -53,22 +52,25 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
-                           <filter string="Year" icon="terp-go-year" help="Current Year"
+                  <group>
+                        <filter string="Year" icon="terp-go-year" help="Current Year"
+                        name="year"
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                         />
-
+                        <separator orientation="vertical" />
                        <filter string="Month" icon="terp-go-month" name="This Month"
                         domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         />
-                       <filter icon="terp-go-week" string="Month-1" separator="1" help="Previous Month"
+                       <filter icon="terp-go-week" string="Month-1"  help="Previous Month"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         />
-
-                           <separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
-                            string="Current"
-                            domain="[('state','in',('draft','open'))]"/>
+                            string="New"
+                            domain="[('state','=','draft')]"/>
+                        <filter  icon="terp-check"
+                            string="To Do"
+                            domain="[('state','=','open')]"/>                            
                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
@@ -77,43 +79,16 @@
                             domain="[('state','=','done')]"/>
 
                            <separator orientation="vertical" />
-                           <field name="section_id"
-                               string="Sale Team    "
-                               widget="selection"
-                               context="{'invisible_section': False}">
 
-                               <filter icon="terp-crm"
-                                   context="{'invisible_section': False}"
-                                   domain="[('section_id.user_id','=',uid)]"
-                                   help="My Sale Team" />
-
-                           </field>
-                              <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection"/>
+                          <field name="project_id"/>
+                          <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
+                          <field name="partner_id"/>
+                          <field name="version_id" widget="selection" />
                    </group>
                    <newline/>
-                   <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-                       <field name="partner_id"/>
-                       <field name="assigned_to" widget="selection"/>
-                       <separator orientation="vertical"/>
-                       <field name="priority" />
-                       <separator orientation="vertical"/>
-                       <field name="version_id" widget="selection" />
-                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                       <field name="type_id" widget="selection"/>
-                       <separator orientation="vertical"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       <newline/>
-                       <field name="creation_date"/>
-                       <field name="opening_date"/>
-                       <field name="date_closed" string="Date Closed"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                           <filter name="User" string="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'user_id'}" />
+                   <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'assigned_to'}" />
+                            domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Sale Team" icon="terp-personal+"
@@ -155,7 +130,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
               <field name="view_mode">graph,tree</field>
-              <field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
+              <field name="context">{'search_default_year':1,'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
             <field name="help">This report on the project issues allows you to analyse the quality of your support or after-sales services. You can track the issues per age. You can analyse the time required to open or close an issue, the number of email to exchange and the time spent on average by issues.</field>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 177533462a0..01afcb73b09 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -5,7 +5,7 @@
 "access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
 "access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
 "access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
-"access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
+"access_mail_message_project_manager","mail.message.manager","mail.model_mail_message","project.group_project_manager",1,1,1,1
 "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
 "access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
-"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
+"access_mail_message_issue_project_user","mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index cc1cd6504b0..972245533ad 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Add the Timesheet support for Issue Management in Project Management',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden/Link',
     'description': """
 This module adds the Timesheet support for the Issues/Bugs Management in Project.
 =================================================================================
diff --git a/addons/project_issue_sheet/i18n/ca.po b/addons/project_issue_sheet/i18n/ca.po
index 60cb5f0b73a..171faaa3cce 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
@@ -25,53 +25,59 @@ msgid ""
 "Issues/Bugs Management in Project\n"
 "                "
 msgstr ""
+"\n"
+"                    Aquest mòdul afegeix el suport de fulles de serveis per "
+"a la gestió d'incidències/errors en projectes\n"
+"                "
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línia analítica"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_project_issue
 msgid "Project Issue"
-msgstr ""
+msgstr "Incidència projecte"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Línia del full d'assistència"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "Timesheet"
-msgstr ""
+msgstr "Full d'assistència"
 
 #. module: project_issue_sheet
 #: field:project.issue,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Compte analític"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "Worklogs"
-msgstr ""
+msgstr "Registres del treball"
 
 #. module: project_issue_sheet
 #: field:account.analytic.line,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: project_issue_sheet
 #: field:project.issue,timesheet_ids:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Fulls de treball"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
 msgid "Add the Timesheet support for Issue Management in Project Management"
 msgstr ""
+"Afegir el suport de fulles de treball per la gestió d'incidències en la "
+"gestió de projectes"
 
 #. module: project_issue_sheet
 #: field:hr.analytic.timesheet,issue_id:0
 msgid "Issue"
-msgstr ""
+msgstr "Incidència"
diff --git a/addons/project_issue_sheet/i18n/de.po b/addons/project_issue_sheet/i18n/de.po
index 76623b12221..d0c1c2e5bb0 100644
--- a/addons/project_issue_sheet/i18n/de.po
+++ b/addons/project_issue_sheet/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
@@ -79,12 +79,3 @@ msgstr "Ergänzt Zeiterfassung für die Bearbeitung von Problemen zu Projekten"
 #: field:hr.analytic.timesheet,issue_id:0
 msgid "Issue"
 msgstr "Problem"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen beinhalten !"
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index ea667ad975c..0fb3c01f434 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
@@ -82,21 +82,3 @@ msgstr ""
 #: field:hr.analytic.timesheet,issue_id:0
 msgid "Issue"
 msgstr "Incidencia"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la definición de la vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/project_issue_sheet/i18n/es_MX.po b/addons/project_issue_sheet/i18n/es_MX.po
new file mode 100644
index 00000000000..17ce3190b1c
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/es_MX.po
@@ -0,0 +1,84 @@
+# 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-16 18:01+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:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+"\n"
+"                    Este módulo añade el soporte de hojas de servicios para "
+"la gestión de incidencias/errores en proyectos\n"
+"                "
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "Incidencia proyecto"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Hoja de servicios"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr "Registros del trabajo"
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+"Añadir el soporte de hojas de trabajo para la gestión de incidencias en la "
+"gestión de proyectos"
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr "Incidencia"
diff --git a/addons/project_issue_sheet/i18n/es_VE.po b/addons/project_issue_sheet/i18n/es_VE.po
new file mode 100644
index 00000000000..17ce3190b1c
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/es_VE.po
@@ -0,0 +1,84 @@
+# 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-16 18:01+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:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+"\n"
+"                    Este módulo añade el soporte de hojas de servicios para "
+"la gestión de incidencias/errores en proyectos\n"
+"                "
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "Incidencia proyecto"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Hoja de servicios"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr "Registros del trabajo"
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+"Añadir el soporte de hojas de trabajo para la gestión de incidencias en la "
+"gestión de proyectos"
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr "Incidencia"
diff --git a/addons/project_issue_sheet/i18n/fi.po b/addons/project_issue_sheet/i18n/fi.po
index 3f49470827f..3f0af6e4da8 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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/fr.po b/addons/project_issue_sheet/i18n/fr.po
index b9cb5ab8ec5..3f6645e8644 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/gl.po b/addons/project_issue_sheet/i18n/gl.po
index 4b2d81ede80..dee86626c1e 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/hu.po b/addons/project_issue_sheet/i18n/hu.po
index 471b51298bb..58ef227248e 100644
--- a/addons/project_issue_sheet/i18n/hu.po
+++ b/addons/project_issue_sheet/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-07 12:16+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/it.po b/addons/project_issue_sheet/i18n/it.po
index 4b89c8fe510..ee2535ffe9e 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
@@ -58,7 +58,7 @@ msgstr "Conto Analitico"
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "Worklogs"
-msgstr ""
+msgstr "Worklogs"
 
 #. module: project_issue_sheet
 #: field:account.analytic.line,create_date:0
diff --git a/addons/project_issue_sheet/i18n/lv.po b/addons/project_issue_sheet/i18n/lv.po
index ba076026fd8..c01317b66a5 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/mn.po b/addons/project_issue_sheet/i18n/mn.po
index 179b7d90180..be403b72e27 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/nl.po b/addons/project_issue_sheet/i18n/nl.po
index 9190c3245b0..b646d2c3fd2 100644
--- a/addons/project_issue_sheet/i18n/nl.po
+++ b/addons/project_issue_sheet/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
index f7440194135..45896f8b766 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
@@ -75,12 +75,3 @@ msgstr ""
 #: field:hr.analytic.timesheet,issue_id:0
 msgid "Issue"
 msgstr "Problem"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/project_issue_sheet/i18n/pt.po b/addons/project_issue_sheet/i18n/pt.po
index 095781cea54..a66513ea433 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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/pt_BR.po b/addons/project_issue_sheet/i18n/pt_BR.po
index 6b809d67846..eb70ca09a1e 100644
--- a/addons/project_issue_sheet/i18n/pt_BR.po
+++ b/addons/project_issue_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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
diff --git a/addons/project_issue_sheet/i18n/ru.po b/addons/project_issue_sheet/i18n/ru.po
index 8e163157d5f..5410abd1b3e 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: 2011-06-11 04:57+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
@@ -53,7 +53,7 @@ msgstr "Табель"
 #. module: project_issue_sheet
 #: field:project.issue,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "Счет аналитики"
+msgstr "Счёт аналитики"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
diff --git a/addons/project_issue_sheet/i18n/zh_CN.po b/addons/project_issue_sheet/i18n/zh_CN.po
index eda41afa445..00aafd12653 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: 2011-07-03 04:47+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,description:project_issue_sheet.module_meta_information
@@ -52,7 +52,7 @@ msgstr "计工单"
 #. module: project_issue_sheet
 #: field:project.issue,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 058fd67a946..fb522d08352 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -11,15 +11,15 @@
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
                 <xpath expr="/form/notebook" position="before">
-                    <field name="analytic_account_id"
+                    <field invisible="1" name="analytic_account_id"
                         domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
                         on_change='on_change_account_id(analytic_account_id)'
                         groups="base.group_extended" />
                 </xpath>
-                <notebook colspan="4">
-                    <page string="Worklogs">
-                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : assigned_to, 'default_account_id' : analytic_account_id}">
-                            <tree editable="top" string="Timesheet">
+                <xpath expr="//notebook/page[@string='Extra Info']" position="before">
+                	<page string="Worklogs">
+                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                            <tree editable="top" string="Timesheets">
                                 <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="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
@@ -33,7 +33,7 @@
                             </tree>
                         </field>
                     </page>
-                </notebook>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 76e872d65f7..31522d63ea2 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Long Term Project Management",
+    "name": "Long Term Planning",
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
@@ -49,13 +49,11 @@ Features
           'test/test_schedule_phases_case2.yml',
           'test/project_schedule_consecutive_day.yml',
           'test/project_schedule_without_wroking_hour.yml',
-          'test/schedule_phase_tasks.yml',
           'test/phase_constraint.yml',
           'test/test_schedule_tasks_case1.yml',
     ],
     "update_xml": [
         "security/ir.model.access.csv",
-        "wizard/project_schedule_tasks_view.xml",
         "project_long_term_view.xml",
         "project_long_term_workflow.xml",
         "wizard/project_compute_phases_view.xml",
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index 05ad33d52b4..d929802b2ed 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -8,66 +8,69 @@ 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 22:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 23:04+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
 msgid "Long Term Project Management"
-msgstr ""
+msgstr "Gestió de projectes a llarg plaç"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of Phases"
-msgstr ""
+msgstr "Calcula la planificació de fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,next_phase_ids:0
 msgid "Next Phases"
-msgstr ""
+msgstr "Següents fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project's Tasks"
-msgstr ""
+msgstr "Tasques del projecte"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
 msgid "Phases"
-msgstr ""
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: project_long_term
 #: 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_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
-msgstr ""
+msgstr "Assignació de recursos"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Displaying settings"
-msgstr ""
+msgstr "Configuració de visualització"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr ""
+msgstr "Horari"
 
 #. module: project_long_term
 #: model:ir.module.module,description:project_long_term.module_meta_information
@@ -90,55 +93,73 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"        Mòdul de Gestió de Projectes a llarg termini que realitza el "
+"seguiment de planejament, programació, assignació de recursos.\n"
+"        Utilitzat principalment amb la gestió de projectes grans.\n"
+"            - Les Fases del Projecte seran gestionades per l'Administrador "
+"del projecte\n"
+"            - Calcula la Programació de Fases: Calcula la data d'inici i "
+"data de finalització de les fases del projecte en estat esborrador, obert i "
+"pendent.\n"
+"                                        Si no hi ha cap projecte concret, "
+"llavors es portaran totes les fases en estat esborrador, obert i pendent\n"
+"            - Calcula la Programació de Tasques: Això funciona igual que el "
+"botó programador de project.phase. Pren el projecte com a argument i calcula "
+"totes les tasques obertes, en esborrany i pendents.\n"
+"            - Programa tasques: Totes les tasques en estat esborrador, "
+"pendent i obert es programen des de la data d'inici de la fase\n"
+"\n"
+"    "
 
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
-msgstr ""
+msgstr "Assignació de recursos"
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr ""
+msgstr "Calcular un sol projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,previous_phase_ids:0
 msgid "Previous Phases"
-msgstr ""
+msgstr "Fases prèvies"
 
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "UdM (Unitat de Mesura) és la unitat de mesura per la durada"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
-msgstr ""
+msgstr " És calculat pel planificador d'acord a la data d'inici i la durada."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -150,103 +171,103 @@ msgstr ""
 #: field:project.resource.allocation,project_id:0
 #: view:project.task:0
 msgid "Project"
-msgstr ""
+msgstr "Projecte"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: project_long_term
 #: selection:project.phase,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Planning"
-msgstr ""
+msgstr "Planificació"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data limit"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 msgid "Compute Phase Scheduling"
-msgstr ""
+msgstr "Calcula planificació de fases"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (còpia)"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,useability:0
 msgid "Availability"
-msgstr ""
+msgstr "Disponibilitat"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "C_alcula"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of phases for all or specified project"
-msgstr ""
+msgstr "Calcula planificació de fases per tots o el projecte especificat"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr ""
+msgstr "UdM duració"
 
 #. 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
 msgid "Compute Task Scheduling"
-msgstr ""
+msgstr "Calcula planificació de tasques"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr ""
+msgstr "Data d'inici mínima"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_resource_allocation
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Project Resource Allocation"
-msgstr ""
+msgstr "Assignació de recursos del projecte"
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task"
-msgstr ""
+msgstr "Calcula planificació de tasques"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_resource
@@ -254,7 +275,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
 #: view:project.resource.allocation:0
 msgid "Resources"
-msgstr ""
+msgstr "Recursos"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
@@ -263,52 +284,57 @@ msgid ""
 "view.\n"
 "\t           "
 msgstr ""
+"Per programar les fases de tots els projectes, o un d'específic. A "
+"continuació, obrirà una vista de Gantt.\n"
+"\t           "
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Related Tasks"
-msgstr ""
+msgstr "Tasques relacionades"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
 msgid ""
 "Availability of this resource for this project phase in percentage (=50%)"
 msgstr ""
+"La disponibilitat d'aquest recurs per aquesta fase del projecte en "
+"percentatge (= 50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr ""
+msgstr "força la fase d'inici després d'aquesta data"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Tasques de projecte"
 
 #. module: project_long_term
 #: field:project.phase,resource_ids:0
 msgid "Project Resources"
-msgstr ""
+msgstr "Recursos del projecte"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "_Ok"
-msgstr ""
+msgstr "_D'acord"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Schedule and Display info"
-msgstr ""
+msgstr "Planifica i mostra informació"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -316,21 +342,24 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
+"És calculat pel planificador en funció de la data d'inici o data de "
+"finalització de la fase anterior"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
 msgstr ""
+"La data d'inici de la fase ha de ser anterior a la data de finalització."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_schedule_tasks
 msgid "project.schedule.tasks"
-msgstr ""
+msgstr "projecte.planifica.tasques"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
@@ -342,69 +371,77 @@ msgid ""
 "human resources, convert your phases into a series of tasks when you start "
 "working on the project."
 msgstr ""
+"Un projecte es pot dividir en diferents fases. Per a cada fase, podeu "
+"definir la seva assignació de recursos, descriure diferents tasques i "
+"vincular la seva fase a fases prèvies i posteriors, afegir restriccions de "
+"data per a la programació automàtica. Quan comenceu a treballar en el "
+"projecte, utilitzeu el planejament a llarg termini per planificar els seus "
+"recursos humans disponibles i convertir les seves fases en una sèrie de "
+"tasques."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
 #: field:project.resource.allocation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Resource Allocation"
-msgstr ""
+msgstr "Asignació de recursos"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr ""
+msgstr "Força que la fase acabi abans d'aquesta data"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: project_long_term
 #: field:project.resource.allocation,name:0
 msgid "unknown"
-msgstr ""
+msgstr "desconegut"
 
 #. module: project_long_term
 #: field:project.resource.allocation,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Task Detail"
-msgstr ""
+msgstr "Detall de la tasca"
 
 #. module: project_long_term
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
+"Hores de treball de l'horari per a ajustar l'informe del diagrama de Gantt"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Calcula tasques del projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
-msgstr ""
+msgstr "Restriccions"
 
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Indica l'ordre quan es mostra la llista de fases"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -414,77 +451,78 @@ msgstr ""
 #: view:project.phase:0
 #: field:project.project,phase_ids:0
 msgid "Project Phases"
-msgstr ""
+msgstr "Fases del projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En procés"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Hores restants"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Horari de treball"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr ""
+msgstr "Comença fase"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Please Specify Project to be schedule"
-msgstr ""
+msgstr "Si us plau seleccioneu el projecte a planificar"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total d'hores"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
-msgstr ""
+msgstr "Planificació de tasques completada satisfactòriament."
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task for specified project."
-msgstr ""
+msgstr "Calcula planificació de tasques per al projecte específic"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 msgid "Phase"
-msgstr ""
+msgstr "Fase"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -495,43 +533,48 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
+"Si la fase es crea, l'estat és \"Esborrany\".\n"
+" Si la fase comença, l'estat canvia a \"En Procés\".\n"
+" Si es necessita revisió, la fase està en estat \"Pendent\".                 "
+"                 \n"
+" Si la fase està acabada, l'estat es fixa en \"Fet\"."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
 #: field:project.resource.allocation,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurs"
 
 #. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Detalls de tasques"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 msgid "Working Period"
-msgstr ""
+msgstr "Horari laboral"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detall del recurs"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 msgid "Scheduling"
-msgstr ""
+msgstr "Planificació"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -540,51 +583,51 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,phase_id:0
 msgid "Project Phase"
-msgstr ""
+msgstr "Fase del projecte"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Cerca fases del projecte"
 
 #. module: project_long_term
 #: field:project.schedule.tasks,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "No es permeten bucles en les fases"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All Projects"
-msgstr ""
+msgstr "Calcula tots els projectes"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Absències de recursos"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
 #: view:project.phase:0
 #: view:project.schedule.tasks:0
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Planifica tasques"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Per defecte en dies"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durada"
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index c65e834d993..9233ca1c1fe 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ msgid "Error! project start-date must be lower then project end-date."
 msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Ressourcenaufteilung"
@@ -119,7 +120,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Zuweisung Ressourcen"
@@ -130,7 +130,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Tag"
@@ -215,7 +215,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Berechne Terminierung der Phasen"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (Kopie)"
@@ -483,6 +483,7 @@ msgid "Responsible"
 msgstr "Verantwortlicher"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Arbeitszeit"
@@ -632,132 +633,3 @@ msgstr "Gem. Standard in Tagen"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Dauer"
-
-#~ msgid "_Compute"
-#~ msgstr "_Berechne"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafter Modellname in der Aktion."
-
-#~ msgid "R.A."
-#~ msgstr "R.Z."
-
-#~ msgid "Usability"
-#~ msgstr "Verfügbarkeit"
-
-#~ msgid ""
-#~ "Usability of this resource for this project phase in percentage (=50%)"
-#~ msgstr "Verfügbarkeit der Ressource für diese Projektphase in Prozent (=50%)"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Ende Datum d. Phase"
-
-#~ msgid "This wizard will schedule phases for all or specified project"
-#~ msgstr "Der Assistent kalkuliert die Phasen für alle oder ein spez. Projekt"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Die ausgew. Firma ist nicht zugelassen für diesen Benutzer"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Fehler! Sie können keine rekursiven anal. Konten erzeugen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#, python-format
-#~ msgid "Project must have members assigned !"
-#~ msgstr "Projekt muss zugew. Team Mitarbeiter haben!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Error! Task start-date must be lower then task end-date."
-#~ msgstr "Fehler! Aufgaben Start muss vor dem Ende sein"
-
-#~ msgid "Compute"
-#~ msgstr "Berechne"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Keinen Verantwortlichen zugewiesen!"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Fehler"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Sie müssen einen Verantwortlichen für die Phase zuweisen '%s' !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbez. muss mit einem x_ beginnen und darf keine Sonderzeichen haben "
-#~ "!"
-
-#, python-format
-#~ msgid "Phase must have resources assigned !"
-#~ msgstr "Phase muss zugewiesene Ressource haben!"
-
-#~ msgid "Other Info"
-#~ msgstr "Weitere Info"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Beginn der Phase"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Keine Aufgaben zur Berechnung für Projekt '%s'."
-
-#~ msgid ""
-#~ "A project can be split into the different phases. For each phase, you can "
-#~ "define your resources allocation, describe different tasks and link your "
-#~ "phase to previous and next ones, add date constraints for the automated "
-#~ "scheduling. Use the long term planning in order to planify your available "
-#~ "human resources, convert your phases into a series of tasks when you start "
-#~ "working on it."
-#~ msgstr ""
-#~ "Ein Projekt kann in verschiedene Phasen aufgeteilt werden. Für jede Phase "
-#~ "können Sie zur automatischen Terminierung die Ressourcenaufteilung "
-#~ "definieren, Aufgaben beschreiben und die Phase sowohl mit vorhergehenden als "
-#~ "auch nachfolgenden Phasen verknüpfen oder Bedingungen für feste Termine "
-#~ "hinterlegen. Benutzen Sie das Modul Planung für Langzeitprojekte zur "
-#~ "langfristigen Planung und Aufteilung verfügbarer Personalressourcen. "
-#~ "Konvertieren Sie die Phasen in konkrete Aufgabenlisten, wenn Sie die "
-#~ "Bearbeitung der Phasen eröffnen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Keine Aufgaben zur Berechnung für Phase: '%s'."
-
-#, python-format
-#~ msgid "Should have Resources Allocation or Project Members!"
-#~ msgstr ""
-#~ "Es sollte eine Ressourcenaufteilung oder Projektmitarbeiter existieren!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Ende Datum d. Phase"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phases"
-#~ msgstr "Beginn der Phase"
-
-#, python-format
-#~ msgid ""
-#~ "Resources should be allocated to your phases and Members should be assigned "
-#~ "to your Project!"
-#~ msgstr ""
-#~ "Ressourcen sollten auf Ihre Projektphasen verteilt werden, "
-#~ "Projektmitarbeiter sollten auf Ihre Projekte verteilt werden."
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index fe7bc15a941..e89ed4db05a 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -57,6 +57,7 @@ msgstr ""
 "del proyecto."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Asignación de recursos"
@@ -119,7 +120,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "¡Error! No se pueden crear tareas recursivas."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Asignación de recursos"
@@ -130,7 +130,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Día"
@@ -215,7 +215,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calcular planificación de fases"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -483,6 +483,7 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Horario de trabajo"
@@ -630,36 +631,3 @@ msgstr "Por defecto en días"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Duración"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#~ msgid "Other Info"
-#~ msgstr "Otra información"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Fecha de fin de la fase"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "No existen tareas para calcular en este proyecto '%s'"
-
-#, python-format
-#~ msgid ""
-#~ "Resources should be allocated to your phases and Members should be assigned "
-#~ "to your Project!"
-#~ msgstr ""
-#~ "Los recursos deben de ser asignados a tus fases y los miembros a tu proyecto."
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "¡Debe asignar un reponsable por fase '%s'!"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "¡No hay un reponsable asignado!"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "No existen tareas para el cálculo para la fase '%s'."
diff --git a/addons/project_long_term/i18n/es_MX.po b/addons/project_long_term/i18n/es_MX.po
new file mode 100644
index 00000000000..60dd2368ade
--- /dev/null
+++ b/addons/project_long_term/i18n/es_MX.po
@@ -0,0 +1,633 @@
+# 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-18 09:17+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "Gestión de proyectos a largo plazo"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "Calcular planificación de fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Siguientes fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_long_term
+#: 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_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "Mostrando configuración"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Programa"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"        Módulo de Gestión de Proyectos a Largo Plazo que realiza el "
+"seguimiento de planeamiento, programación, asignación de recursos.\n"
+"        Utilizado principalmente con la gestión de proyectos grandes.\n"
+"            - Las Fases del Proyecto serán gestionadas por el Administrador "
+"del proyecto\n"
+"            - Calcula la Programación de Fases: Calcula la fecha de inicio y "
+"fecha de finalización de las fases del proyecto en estado borrador, abierto "
+"y pendiente.\n"
+"                                       Si no hay ningún proyecto concreto, "
+"entonces se llevarán todas las fases en estado borrador, abierto y "
+"pendiente\n"
+"            - Calcula la Programación de Tareas: Esto funciona igual que el "
+"botón programador de project.phase. Toma el proyecto como argumento y "
+"calcula todas las tareas abiertas, en borrador y pendientes.\n"
+"            - Programa tareas: Todas las tareas en estado borrador, "
+"pendiente y abierto se programan desde la fecha de inicio de la fase\n"
+"\n"
+"    "
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No se pueden crear tareas recursivas."
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: 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_long_term
+#: code:addons/project_long_term/project_long_term.py:128
+#, python-format
+msgid "Day"
+msgstr "Día"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Calcular un sólo proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Fases previas"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Es calculado por el planificador en fucnión de la fecha de inicio y la "
+"duración"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Fecha de fin"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "Calcular planificación de fases"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:190
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "Disponibilidad"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "C_alcular"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr ""
+"Calcular planificación de fases para todos o el proyecto especificado"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "UdM duración"
+
+#. 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
+msgid "Compute Task Scheduling"
+msgstr "Calcular planificación de tareas"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Fecha de inicio mínima"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "Asignación de recursos de proyecto"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "Calcular planificación de tarea"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+"Para programar las fases de todos los proyectos, o uno específico. A "
+"continuación, abrirá una vista de Gantt.\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Tareas relacionadas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr ""
+"La disponibilidad de este recurso para esta fase de proyecto en porcentaje "
+"(=50%)"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "Forzar que la fase epiece después de esta fecha"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Tareas de proyecto"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "Recursos de proyecto"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr "Planificar y mostrar información"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Es calculado por el planificador en función de la fecha inicio o fecha fin "
+"de la fase anterior"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "La fecha-inicio de la fase debe ser anterior a la fecha-fin."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr "proyecto.planificar.tareas"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on the project."
+msgstr ""
+"Un proyecto se puede dividir en diferentes fases. Para cada fase, puede "
+"definir su asignación de recursos, describir diferentes tareas y vincular su "
+"fase a fases previas y posteriores, añadir restricciones de fecha para la "
+"programación automática. Cuando empiece a trabajar en el proyecto, use el "
+"planeamiento a largo plazo para planificar sus recursos humanos disponibles "
+"y convertir sus fases en una serie de tareas."
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "Forzar que la fase termine antes de esta fecha"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "Detalles tarea"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Horario de trabajo para ajustar el informe del diagrama de Gantt"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Calcular tareas proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Restricciones"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Indica el orden cuando se muestra la lista de fases"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Fases proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Comenzar fase"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr "Por favor seleccione el proyecto a planificar"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "Planificación de tareas completada satisfactoriamente."
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "Calcular planificación de tareas para un proyecto específico"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"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'."
+msgstr ""
+"Si la fase se crea, el estado es \"Borrador\".\n"
+" Si la fase comienza, el estado cambia a \"En Proceso\".\n"
+" Si se necesita revisión, la fase está en estado \"Pendiente\".\n"
+" Si la fase está terminada, el estado se fija en \"Hecho\"."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "Fecha de fin"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Detalles tareas"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr "Periodo de trabajo"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "Detalle recurso"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Planificación"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "Fase proyecto"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Calcular fases del proyecto"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "No se permiten bucles en fases"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "Calcular todos los proyectos"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Ausencias recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "Planificar tareas"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Por defecto en días"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/project_long_term/i18n/es_VE.po b/addons/project_long_term/i18n/es_VE.po
new file mode 100644
index 00000000000..60dd2368ade
--- /dev/null
+++ b/addons/project_long_term/i18n/es_VE.po
@@ -0,0 +1,633 @@
+# 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-18 09:17+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:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "Gestión de proyectos a largo plazo"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "Calcular planificación de fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Siguientes fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_long_term
+#: 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_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "Mostrando configuración"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Programa"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"        Módulo de Gestión de Proyectos a Largo Plazo que realiza el "
+"seguimiento de planeamiento, programación, asignación de recursos.\n"
+"        Utilizado principalmente con la gestión de proyectos grandes.\n"
+"            - Las Fases del Proyecto serán gestionadas por el Administrador "
+"del proyecto\n"
+"            - Calcula la Programación de Fases: Calcula la fecha de inicio y "
+"fecha de finalización de las fases del proyecto en estado borrador, abierto "
+"y pendiente.\n"
+"                                       Si no hay ningún proyecto concreto, "
+"entonces se llevarán todas las fases en estado borrador, abierto y "
+"pendiente\n"
+"            - Calcula la Programación de Tareas: Esto funciona igual que el "
+"botón programador de project.phase. Toma el proyecto como argumento y "
+"calcula todas las tareas abiertas, en borrador y pendientes.\n"
+"            - Programa tareas: Todas las tareas en estado borrador, "
+"pendiente y abierto se programan desde la fecha de inicio de la fase\n"
+"\n"
+"    "
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No se pueden crear tareas recursivas."
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: 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_long_term
+#: code:addons/project_long_term/project_long_term.py:128
+#, python-format
+msgid "Day"
+msgstr "Día"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Calcular un sólo proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Fases previas"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Es calculado por el planificador en fucnión de la fecha de inicio y la "
+"duración"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Fecha de fin"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "Calcular planificación de fases"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:190
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "Disponibilidad"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "C_alcular"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr ""
+"Calcular planificación de fases para todos o el proyecto especificado"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "UdM duración"
+
+#. 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
+msgid "Compute Task Scheduling"
+msgstr "Calcular planificación de tareas"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Fecha de inicio mínima"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "Asignación de recursos de proyecto"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "Calcular planificación de tarea"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+"Para programar las fases de todos los proyectos, o uno específico. A "
+"continuación, abrirá una vista de Gantt.\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Tareas relacionadas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr ""
+"La disponibilidad de este recurso para esta fase de proyecto en porcentaje "
+"(=50%)"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "Forzar que la fase epiece después de esta fecha"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Tareas de proyecto"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "Recursos de proyecto"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr "Planificar y mostrar información"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Es calculado por el planificador en función de la fecha inicio o fecha fin "
+"de la fase anterior"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "La fecha-inicio de la fase debe ser anterior a la fecha-fin."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr "proyecto.planificar.tareas"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on the project."
+msgstr ""
+"Un proyecto se puede dividir en diferentes fases. Para cada fase, puede "
+"definir su asignación de recursos, describir diferentes tareas y vincular su "
+"fase a fases previas y posteriores, añadir restricciones de fecha para la "
+"programación automática. Cuando empiece a trabajar en el proyecto, use el "
+"planeamiento a largo plazo para planificar sus recursos humanos disponibles "
+"y convertir sus fases en una serie de tareas."
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "Forzar que la fase termine antes de esta fecha"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "Detalles tarea"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Horario de trabajo para ajustar el informe del diagrama de Gantt"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Calcular tareas proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Restricciones"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Indica el orden cuando se muestra la lista de fases"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Fases proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Comenzar fase"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr "Por favor seleccione el proyecto a planificar"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "Planificación de tareas completada satisfactoriamente."
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "Calcular planificación de tareas para un proyecto específico"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"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'."
+msgstr ""
+"Si la fase se crea, el estado es \"Borrador\".\n"
+" Si la fase comienza, el estado cambia a \"En Proceso\".\n"
+" Si se necesita revisión, la fase está en estado \"Pendiente\".\n"
+" Si la fase está terminada, el estado se fija en \"Hecho\"."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "Fecha de fin"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Detalles tareas"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr "Periodo de trabajo"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "Detalle recurso"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Planificación"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "Fase proyecto"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Calcular fases del proyecto"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "No se permiten bucles en fases"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "Calcular todos los proyectos"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Ausencias recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "Planificar tareas"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Por defecto en días"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index 7164020c084..a19e02be3af 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
 msgid "Long Term Project Management"
-msgstr ""
+msgstr "Pitkäaikaisten projektien hallinta"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of Phases"
-msgstr ""
+msgstr "Laske vaiheiden ajoitus"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -47,7 +47,7 @@ msgstr "Vaiheet"
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: project_long_term
 #: constraint:project.project:0
@@ -55,19 +55,20 @@ 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_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
-msgstr ""
+msgstr "Resurssien allokointi"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Displaying settings"
-msgstr ""
+msgstr "Näyttöasetukset"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr ""
+msgstr "Ajastus"
 
 #. module: project_long_term
 #: model:ir.module.module,description:project_long_term.module_meta_information
@@ -94,51 +95,50 @@ msgstr ""
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
-msgstr ""
+msgstr "Resurssien allokoinnit"
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Virhe! Et voi asettaa eskalointia samalle projektille!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tehtävä"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr ""
+msgstr "Laske yksittäinen projekti"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,previous_phase_ids:0
 msgid "Previous Phases"
-msgstr ""
+msgstr "Aikaisemmat vaiheet"
 
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "Mittayksikkö (UoM) on keston mittayksikkö"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
-msgstr ""
+msgstr " Se lasketaan ajastimella alkupäivän ja keston mukaan."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -150,64 +150,64 @@ msgstr ""
 #: field:project.resource.allocation,project_id:0
 #: view:project.task:0
 msgid "Project"
-msgstr ""
+msgstr "Projekti"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Virhe!"
 
 #. module: project_long_term
 #: selection:project.phase,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Peruttu"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Planning"
-msgstr ""
+msgstr "Suunnittelu"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr ""
+msgstr "Määräaika"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peru"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 msgid "Compute Phase Scheduling"
-msgstr ""
+msgstr "Laske vaiheen ajoitus"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopio)"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,useability:0
 msgid "Availability"
-msgstr ""
+msgstr "Saatavuus"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -218,35 +218,35 @@ msgstr ""
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of phases for all or specified project"
-msgstr ""
+msgstr "Laske vaiheiden ajoitus kaikille tai valituille projekteille"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr ""
+msgstr "Keston mittayksikkö"
 
 #. 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
 msgid "Compute Task Scheduling"
-msgstr ""
+msgstr "Laske tehtävän ajoitus"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr ""
+msgstr "Minimi aloituspäivä"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_resource_allocation
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Project Resource Allocation"
-msgstr ""
+msgstr "Projektin resurssien allokointi"
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task"
-msgstr ""
+msgstr "Laske tehtävän ajoitus"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_resource
@@ -254,7 +254,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
 #: view:project.resource.allocation:0
 msgid "Resources"
-msgstr ""
+msgstr "Resurssit"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
@@ -267,38 +267,39 @@ msgstr ""
 #. module: project_long_term
 #: help:project.resource.allocation,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Related Tasks"
-msgstr ""
+msgstr "Liittyvät tehtävät"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Dates"
-msgstr ""
+msgstr "Päivämäärät"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
 msgid ""
 "Availability of this resource for this project phase in percentage (=50%)"
 msgstr ""
+"Tämän resurssin saatavuus tälle projektin vaiheelle prosentteina (=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr ""
+msgstr "Pakota vaihe alkamaan tämän päivän jälkeen"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projektin tehtävät"
 
 #. module: project_long_term
 #: field:project.phase,resource_ids:0
 msgid "Project Resources"
-msgstr ""
+msgstr "Projektin resurssit"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
@@ -308,7 +309,7 @@ msgstr ""
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Schedule and Display info"
-msgstr ""
+msgstr "Ajoita ja näytä tiedot"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -316,16 +317,18 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
+"Lasketaan ajastimen avulla käyttäen projektin kestoa ja edellisen vaiheen "
+"loppupäivää."
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
-msgstr ""
+msgstr "Vaiheen alkupäivän tulee olla aikaisempi kuin loppupäivä."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_schedule_tasks
@@ -347,64 +350,64 @@ msgstr ""
 #: field:project.phase,date_start:0
 #: field:project.resource.allocation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspvm"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Resource Allocation"
-msgstr ""
+msgstr "Resurssien allokointi"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr ""
+msgstr "pakota vaihe valmistumaan ennen tätä päivää"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottava"
 
 #. module: project_long_term
 #: field:project.resource.allocation,name:0
 msgid "unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #. module: project_long_term
 #: field:project.resource.allocation,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Task Detail"
-msgstr ""
+msgstr "Tehtävän yksityiskohdat"
 
 #. module: project_long_term
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Aikatauluta työtunnit säätääkseksi gantt diagrammin raporttia"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Laske projektin tehtävät"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
-msgstr ""
+msgstr "Rajoitukset"
 
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä listaa vaiheista."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -414,77 +417,78 @@ msgstr ""
 #: view:project.phase:0
 #: field:project.project,phase_ids:0
 msgid "Project Phases"
-msgstr ""
+msgstr "Projektin vaiheet"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Käynnissä"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Jäljelläolevat tunnit"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Työaika"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr ""
+msgstr "Käynnistä vaihe"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Please Specify Project to be schedule"
-msgstr ""
+msgstr "Ole hyvä ja määrittele ajoitettava projekti"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Tunnit yhteensä"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
-msgstr ""
+msgstr "Tehtävien ajoitus tehty onnistuneesti."
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task for specified project."
-msgstr ""
+msgstr "Laske tehtävän ajoitus määritellylle projektille."
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 msgid "Phase"
-msgstr ""
+msgstr "Vaihe"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -500,23 +504,23 @@ msgstr ""
 #: field:project.phase,date_end:0
 #: field:project.resource.allocation,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurssi"
 
 #. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Tehtävän yksityiskohdat"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -526,12 +530,12 @@ msgstr ""
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Resurssin yksityiskohdat"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 msgid "Scheduling"
-msgstr ""
+msgstr "Aikataulutus"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -540,51 +544,51 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,phase_id:0
 msgid "Project Phase"
-msgstr ""
+msgstr "Projektin vaihe"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Laske projektin vaiheet"
 
 #. module: project_long_term
 #: field:project.schedule.tasks,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Viesti"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Vaiheissa ei sallita luuppeja"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All Projects"
-msgstr ""
+msgstr "Laske kaikki projektit"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Resurssin lomat"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
 #: view:project.phase:0
 #: view:project.schedule.tasks:0
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Ajoita tehtävät"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Oletuksena päivissä"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Kesto"
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index ed909261c56..d4d97674d0e 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 05:12+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -56,6 +56,7 @@ msgstr ""
 "projet."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Allocation des ressources"
@@ -119,7 +120,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Allocations des ressources"
@@ -131,7 +131,7 @@ msgstr ""
 "Erreur ! Vous ne pouvez pas attribuer une escalade sur le même projet !"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Jour"
@@ -215,7 +215,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calculer la planification des phases"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
@@ -487,6 +487,7 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Horaires de travail"
@@ -634,65 +635,3 @@ msgstr "Par défaut en jour"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Durée"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Pas de tâches à calculer pour le projet '%s'."
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Date de fin de la phase"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Vous devez assigner une personne responsable de la phase '%s' !"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Erreur"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Aucun responsable n'a été assigné !"
-
-#~ msgid "Other Info"
-#~ msgstr "Autres Informations"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Date de début de la phase"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Pas de tâches à calculer pour la phase '%s'."
-
-#~ msgid ""
-#~ "A project can be split into the different phases. For each phase, you can "
-#~ "define your resources allocation, describe different tasks and link your "
-#~ "phase to previous and next ones, add date constraints for the automated "
-#~ "scheduling. Use the long term planning in order to planify your available "
-#~ "human resources, convert your phases into a series of tasks when you start "
-#~ "working on it."
-#~ msgstr ""
-#~ "Un projet peut être divisé en différentes phases. Pour chaque phase, vous "
-#~ "pouvez allouer des ressources, décrire les différentes tâches et relier les "
-#~ "phases les unes aux autres, ajouter des contraintes sur les dates pour "
-#~ "l'ordonnancement automatique. Utilisez la planification à long terme pour "
-#~ "planifier les ressources humaines disponibles, et convertissez vos phases en "
-#~ "une série de tâches quand vous commencez à travailler sur le projet."
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Date de fin de la phase"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phases"
-#~ msgstr "Date de début de la phase"
-
-#, python-format
-#~ msgid ""
-#~ "Resources should be allocated to your phases and Members should be assigned "
-#~ "to your Project!"
-#~ msgstr ""
-#~ "Des ressources devraient être allouées à vos phases et des membres devraient "
-#~ "être affectés à votre projet !"
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index 7a7cab7f6b4..14b95c1f8b3 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-08 16:34+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -56,6 +57,7 @@ msgstr ""
 "befejező dátumának."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Erőforrás elosztás"
@@ -116,7 +118,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Erőforrás elosztások"
@@ -127,7 +128,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Nap"
@@ -210,7 +211,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Fázis ütemezésének számítása"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (másolat)"
@@ -477,6 +478,7 @@ msgid "Responsible"
 msgstr "Felelős"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Munkaidő"
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 7bf7563b59e..c4a45177fb3 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -9,14 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-17 07:00+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -57,6 +57,7 @@ msgstr ""
 "Errore! La data inizio del progetto deve essere antecedente alla data fine."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Allocazione risorse"
@@ -119,7 +120,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Errore ! Non è possibile creare attività ricorsive."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Allocazione risorse"
@@ -130,7 +130,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Errore! Non è possibile assegnare l'escalation allo stesso progetto!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Giorno"
@@ -214,7 +214,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calcola pianificazione fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -485,6 +485,7 @@ msgid "Responsible"
 msgstr "Responsabile"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Tempo di lavoro"
@@ -633,24 +634,3 @@ msgstr "Per default in giorni"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Durata"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Nessuna attività da calcolare per il progetto: \"%s\"."
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr ""
-#~ "E' necessario assegnare una persona responsabile per la fase: \"%s\"!"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Errore"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Nessuna attività da calcolare per la fase: \"%s\"."
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Nessuna persona responsabile assegnata!"
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index bb2b4f802e0..fe2259f2a89 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ msgid "Error! project start-date must be lower then project end-date."
 msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Resursu iedalīšana"
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Resursu iedalīšanas"
@@ -108,7 +108,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Diena"
@@ -191,7 +191,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Aprēķināt fāzes grafiku"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
@@ -445,6 +445,7 @@ msgid "Responsible"
 msgstr "Atbildīgais"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Darba Laiks"
@@ -588,36 +589,3 @@ msgstr "Pēc noklusējuma dienās"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Ilgums"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Fāzes beigu datums"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Projektam '%s' nav uzdevumu ko aprēķināt."
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Kļūda"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Nav nozīmēta atbildīgā persona!"
-
-#~ msgid "Other Info"
-#~ msgstr "Cita informācija"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Fāzes sākuma datums"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Fāzei '%s' nav uzdevumu ko aprēķināt"
-
-#, python-format
-#~ msgid "Should have Resources Allocation or Project Members!"
-#~ msgstr "Nepieciešama resursu iedalīšana vai projekta dalībnieki!"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Fāzei '%s' jānozīmē atbildīgo personu!"
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 8f4c4240a5c..31fda45e39b 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ msgid "Error! project start-date must be lower then project end-date."
 msgstr "Fout! Project startdatum moet liggen voor project einddatum."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Resource toewijzing"
@@ -114,7 +115,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Fout! U kunt geen recursieve taken aanmaken."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Resource toewijzingen"
@@ -125,7 +125,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Fout! U kunt geen escalatie toewijzen aan hetzelfde project!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dag"
@@ -209,7 +209,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Fase planning berekenen"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (kopie)"
@@ -475,6 +475,7 @@ msgid "Responsible"
 msgstr "Verantwoordelijke"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Werktijd"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index edca6002194..79eb160c3c4 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Alokacja zasobów"
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Alokacje zasobów"
@@ -108,7 +108,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dzień"
@@ -191,7 +191,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Oblicz planowanie fazy"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
@@ -446,6 +446,7 @@ msgid "Responsible"
 msgstr "Odpowiedzialny"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Czas pracy"
@@ -594,70 +595,3 @@ msgstr "Domyślnie w dniach"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Czas trwania"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Usability"
-#~ msgstr "Użyteczność"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Błąd"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Compute"
-#~ msgstr "Oblicz"
-
-#~ 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 "Other Info"
-#~ msgstr "Inne informacje"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Data rozpoczęcia fazy"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Brak zadań do obliczeń w Projekcie '%s'"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Końcowa data fazy"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Nie przypisano osoby odpowiedzialnej"
-
-#, python-format
-#~ msgid "Should have Resources Allocation or Project Members!"
-#~ msgstr "Musi być Alokacja zasobów lub Członkowie projektu!"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Musisz podać osobę odpowiedzialną za fazę '%s' !"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Brak zadań do obliczania dla Fazy '%s'."
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Końcowa data fazy"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phasesStarting Date of the phase"
-#~ msgstr "Data rozpoczęcia fazy"
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index fa981921229..b12d7d22926 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr ""
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Erro! Não se pode criar tarefas recursivamente"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr ""
@@ -108,7 +108,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dia"
@@ -191,7 +191,7 @@ msgid "Compute Phase Scheduling"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -445,6 +445,7 @@ msgid "Responsible"
 msgstr "Responsável"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr ""
@@ -588,26 +589,3 @@ msgstr ""
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Duração"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Erro"
-
-#~ msgid "Other Info"
-#~ msgstr "Outras informações"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Data de início da fase"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Data de fim da fase"
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Data de fim da fase"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phases"
-#~ msgstr "Data de início da fase"
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index eb8d62470c6..e34a8fef0a8 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr "Alocação de Recursos"
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Erro! Você não pode criar tarefas recursivas."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Alocação de Recursos"
@@ -108,7 +108,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Erro! Você não pode atribuir escalas para o mesmo projeto!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dia"
@@ -192,7 +192,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calcular Agendamento da Fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -459,6 +459,7 @@ msgid "Responsible"
 msgstr "Responsável"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Tempo Trabalhado"
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 65ebffc73c9..225907d2f5b 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: 2011-07-01 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 6c5ef7890bf..4ab1722336e 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -22,8 +22,7 @@
 from datetime import datetime
 from tools.translate import _
 from osv import fields, osv
-from resource.faces import task as Task 
-from operator import itemgetter
+from resource.faces import task as Task
 
 class project_phase(osv.osv):
     _name = "project.phase"
@@ -74,40 +73,43 @@ class project_phase(osv.osv):
                  return False
          return True
 
-    def _check_constraint_start(self, cr, uid, ids, context=None):
-         phase = self.read(cr, uid, ids[0], ['date_start', 'constraint_date_start'], context=context)
-         if phase['date_start'] and phase['constraint_date_start'] and phase['date_start'] < phase['constraint_date_start']:
-             return False
-         return True
-
-    def _check_constraint_end(self, cr, uid, ids, context=None):
-         phase = self.read(cr, uid, ids[0], ['date_end', 'constraint_date_end'], context=context)
-         if phase['date_end'] and phase['constraint_date_end'] and phase['date_end'] > phase['constraint_date_end']:
-             return False
-         return True
-
     def _get_default_uom_id(self, cr, uid):
        model_data_obj = self.pool.get('ir.model.data')
        model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
 
-    def _compute(self, cr, uid, ids, field_name, arg, context=None):
+    def _compute_progress(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         if not ids:
             return res
         for phase in self.browse(cr, uid, ids, context=context):
-            tot = 0.0
+            if phase.state=='done':
+                res[phase.id] = 100.0
+                continue
+            elif phase.state=="cancelled":
+                res[phase.id] = 0.0
+                continue
+            elif not phase.task_ids:
+                res[phase.id] = 0.0
+                continue
+
+            tot = done = 0.0
             for task in phase.task_ids:
-                tot += task.planned_hours
-            res[phase.id] = tot
+                tot += task.total_hours
+                done += min(task.effective_hours, task.total_hours)
+
+            if not tot:
+                res[phase.id] = 0.0
+            else:
+                res[phase.id] = round(100.0 * done / tot, 2)
         return res
 
     _columns = {
         'name': fields.char("Name", size=64, required=True),
-        'date_start': fields.date('Start Date', help="It's computed by the scheduler according the project date or the end date of the previous phase.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'date_end': fields.date('End Date', help=" It's computed by the scheduler according to the start date and the duration.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'constraint_date_start': fields.date('Minimum Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'constraint_date_end': fields.date('Deadline', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'date_start': fields.datetime('Start Date', help="It's computed by the scheduler according the project date or the end date of the previous phase.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'date_end': fields.datetime('End Date', help=" It's computed by the scheduler according to the start date and the duration.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'constraint_date_start': fields.datetime('Minimum Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'constraint_date_end': fields.datetime('Deadline', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'project_id': fields.many2one('project.project', 'Project', required=True),
         'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases', states={'cancelled':[('readonly',True)]}),
         'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases', states={'cancelled':[('readonly',True)]}),
@@ -115,74 +117,27 @@ class project_phase(osv.osv):
         'duration': fields.float('Duration', required=True, help="By default in days", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'responsible_id': fields.many2one('res.users', 'Responsible', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
+        'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
+            help="The ressources on the project can be computed automatically by the scheduler"),
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
-        'total_hours': fields.function(_compute, string='Total Hours'),
+        'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
      }
     _defaults = {
-        'responsible_id': lambda obj,cr,uid,context: uid,
         'state': 'draft',
         'sequence': 10,
         'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Day'))], context=c)[0]
     }
-    _order = "project_id, date_start, sequence, name"
+    _order = "project_id, date_start, sequence"
     _constraints = [
         (_check_recursion,'Loops in phases not allowed',['next_phase_ids', 'previous_phase_ids']),
         (_check_dates, 'Phase start-date must be lower than phase end-date.', ['date_start', 'date_end']),
     ]
 
     def onchange_project(self, cr, uid, ids, project, context=None):
-        result = {}
-        result['date_start'] = False
-        project_obj = self.pool.get('project.project')
-        if project:
-            project_id = project_obj.browse(cr, uid, project, context=context)
-            result['date_start'] = project_id.date_start
-        return {'value': result}
-
-
-    def _check_date_start(self, cr, uid, phase, date_end, context=None):
-       """
-       Check And Compute date_end of phase if change in date_start < older time.
-       """
-       uom_obj = self.pool.get('product.uom')
-       resource_obj = self.pool.get('resource.resource')
-       cal_obj = self.pool.get('resource.calendar')
-       calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-       resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)])
-       if resource_id:
-            res = resource_obj.read(cr, uid, resource_id, ['calendar_id'], context=context)[0]
-            cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
-            if cal_id:
-                calendar_id = cal_id
-       default_uom_id = self._get_default_uom_id(cr, uid)
-       avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-       work_times = cal_obj.interval_min_get(cr, uid, calendar_id, date_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
-       dt_start = work_times[0][0].strftime('%Y-%m-%d')
-       self.write(cr, uid, [phase.id], {'date_start': dt_start, 'date_end': date_end.strftime('%Y-%m-%d')}, context=context)
-
-    def _check_date_end(self, cr, uid, phase, date_start, context=None):
-       """
-       Check And Compute date_end of phase if change in date_end > older time.
-       """
-       uom_obj = self.pool.get('product.uom')
-       resource_obj = self.pool.get('resource.resource')
-       cal_obj = self.pool.get('resource.calendar')
-       calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-       resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)], context=context)
-       if resource_id:
-            res = resource_obj.read(cr, uid, resource_id, ['calendar_id'], context=context)[0]
-            cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
-            if cal_id:
-                calendar_id = cal_id
-       default_uom_id = self._get_default_uom_id(cr, uid)
-       avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-       work_times = cal_obj.interval_get(cr, uid, calendar_id, date_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
-       dt_end = work_times[-1][1].strftime('%Y-%m-%d')
-       self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d'), 'date_end': dt_end}, context=context)
+        return {}
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -211,559 +166,109 @@ class project_phase(osv.osv):
         self.write(cr, uid, ids, {'state': 'done'})
         return True
 
-    def generate_phase(self, cr, uid, ids, f, parent=False, context=None):
-        if context is None:
-            context = {}
-        phase_ids = []
-        data_pool = self.pool.get('ir.model.data')
-        uom_pool = self.pool.get('product.uom')
-        task_pool = self.pool.get('project.task')
-        data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day')
-        for phase in self.browse(cr, uid, ids, context=context):
-            avg_days = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, day_uom_id)
-            duration = str(avg_days) + 'd'
-            # Create a new project for each phase
-            str_resource = ('%s & '*len(phase.resource_ids))[:-2]
-            str_vals = str_resource % tuple(map(lambda x: 'Resource_%s'%x.resource_id.id, phase.resource_ids))
+    def generate_phase(self, cr, uid, phases, context=None):
+        context = context or {}
+        result = ""
 
-            # Phases Defination for the Project
-            s = '''
+        task_pool = self.pool.get('project.task')
+        for phase in phases:
+            if phase.state in ('done','cancelled'):
+                continue
+            duration_uom = {
+                'days': 'd', 'day': 'd', 'd':'d',
+                'months': 'm', 'month':'month', 'm':'m',
+                'weeks': 'w', 'week': 'w', 'w':'w',
+                'hours': 'H', 'hour': 'H', 'h':'H',
+            }.get(phase.product_uom.name.lower(), "h")
+            duration = str(phase.duration) + duration_uom
+            result += '''
     def Phase_%s():
-        title = \"%s\"
-        effort = \'%s\'
-        resource = %s
-'''%(phase.id, phase.name, duration, str_vals or False)
-
-            # Recalculate date_start and date_end
-            # according to constraints on date start and date end on phase
-            start_date = ''
-            end_date = ''
+        effort = \"%s\"''' % (phase.id, duration)
+            start = []
             if phase.constraint_date_start:
-                start_date = datetime.strptime(phase.constraint_date_start, '%Y-%m-%d')
-                s += '''
-        start = \"%s\"
-'''%(datetime.strftime(start_date, "%Y-%m-%d"))
-            else:
-                if parent:
-                    start = 'up.Phase_%s.end' % (parent.id)
-                    s += '''
-        start = %s
-'''%(start)
-                else:
-                    start = phase.project_id.date_start or phase.date_start
-                    s += '''
-        start = \"%s\"
-'''%(start)                
-                
-            if phase.constraint_date_end :
-                end_date= datetime.strptime(phase.constraint_date_end, '%Y-%m-%d')
-                s += '''
-        end = \"%s\"
-'''%(datetime.strftime(end_date, "%Y-%m-%d"))               
+                start.append('datetime.datetime.strptime("'+str(phase.constraint_date_start)+'", "%Y-%m-%d %H:%M:%S")')
+            for previous_phase in phase.previous_phase_ids:
+                start.append("up.Phase_%s.end" % (previous_phase.id,))
+            if start:
+                result += '''
+        start = max(%s)
+''' % (','.join(start))
 
+            if phase.user_force_ids:
+                result += '''
+        resource = %s
+''' % '|'.join(map(lambda x: 'User_'+str(x.id), phase.user_force_ids))
 
-                #start = datetime.strftime((datetime.strptime(start, "%Y-%m-%d")), "%Y-%m-%d")
+            result += task_pool._generate_task(cr, uid, phase.task_ids, ident=8, context=context)
+            result += "\n"
 
-            phase_ids.append(phase.id)
-            parent = False
-            task_ids = []
-            todo_task_ids = task_pool.search(cr, uid, [('id', 'in', map(lambda x : x.id, phase.task_ids)),
-                                              ('state', 'in', ['draft', 'open', 'pending'])
-                                              ], order='sequence')
-            if todo_task_ids :
-                for task in task_pool.browse(cr, uid, todo_task_ids, context=context):
-                    s += task_pool.generate_task(cr, uid, task.id, parent=parent, flag=False, context=context)
-                    if not parent:
-                        parent = task
-                    task_ids.append(task.id)
-            
-            f += s + '\n'
-            # Recursive call till all the next phases scheduled
-            for next_phase in phase.next_phase_ids:
-                if next_phase.state in ['draft', 'open', 'pending']:
-                    rf, rphase_ids = self.generate_phase(cr, uid, [next_phase.id], f = '', parent=phase, context=context)
-                    f += rf +'\n'
-                    phase_ids += rphase_ids
-                else:   
-                    continue
-        return f, phase_ids
-
-    def schedule_tasks(self, cr, uid, ids, context=None):
-        """
-        Schedule tasks base on faces lib
-        """
-        if context is None:
-            context = {}
-        if type(ids) in (long, int,):
-            ids = [ids]
-        task_pool = self.pool.get('project.task')
-        resource_pool = self.pool.get('resource.resource')
-        for phase in self.browse(cr, uid, ids, context=context):
-            project = phase.project_id
-            calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
-            start_date = project.date_start
-            #Creating resources using the member of the Project
-            u_ids = [i.id for i in project.members]
-            resource_objs = resource_pool.generate_resources(cr, uid, u_ids, calendar_id, context=context)
-            start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
-            func_str = ''
-            start = start_date
-            minimum_time_unit = 1
-            # default values
-            working_hours_per_day = 24
-            working_days_per_week = 7
-            working_days_per_month = 30
-            working_days_per_year = 365
-            
-            vacation = []
-            if calendar_id:
-                working_hours_per_day = 8 #TODO: it should be come from calendars
-                working_days_per_week = 5
-                working_days_per_month = 20
-                working_days_per_year = 200
-                vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
-
-            working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
-            
-            cls_str = ''
-            # Creating Resources for the Project
-            for key, vals in resource_objs.items():
-                cls_str +='''
-    class Resource_%s(Resource):
-        title = \"%s\"
-        vacation = %s
-        efficiency = %s
-'''%(key,  vals.get('name',False), vals.get('vacation', False), vals.get('efficiency', False))
-    
-            # Create a new project for each phase
-            func_str += '''
-def Phase_%d():
-    from resource.faces import Resource
-    title = \"%s\"
-    start = \'%s\'
-    minimum_time_unit = %s
-    working_hours_per_day = %s
-    working_days_per_week = %s
-    working_days_per_month = %s
-    working_days_per_year = %s
-    vacation = %s
-    working_days =  %s
-'''%(phase.id, phase.name, start, minimum_time_unit, working_hours_per_day,  working_days_per_week, working_days_per_month, working_days_per_year, vacation, working_days )
-            
-            parent = False
-            task_ids = []
-            todo_task_ids = task_pool.search(cr, uid, [('id', 'in', map(lambda x : x.id, phase.task_ids)),
-                                              ('state', 'in', ['draft', 'open', 'pending'])
-                                              ], order='sequence')
-            for task in task_pool.browse(cr, uid, todo_task_ids, context=context):
-                func_str += task_pool.generate_task(cr, uid, task.id, parent=parent, flag=True, context=context)
-                if not parent:
-                    parent = task
-                task_ids.append(task.id)
-            func_str += cls_str
-            phase_id = phase.id
-            #check known constraints before running Face algorithm in order to have the error translated
-            if not phase.project_id.date_start:
-                raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.'))
-            # Allocating Memory for the required Project and Pahses and Resources
-            exec(func_str)
-            Phase = eval('Phase_%d' % phase.id)
-            phase = None
-            try:
-                phase = Task.BalancedProject(Phase)
-            except Exception, e:
-                raise osv.except_osv(_('Error !'),e)
-
-            for task_id in task_ids:
-                task = eval("phase.Task_%d" % task_id)
-                start_date = task.start.to_datetime()
-                end_date = task.end.to_datetime()
-                
-                task_pool.write(cr, uid, [task_id], {
-                                      'date_start': start_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                      'date_end': end_date.strftime('%Y-%m-%d %H:%M:%S')
-                                    }, context=context)
-        return True
+        return result
 project_phase()
 
-class project_resource_allocation(osv.osv):
-    _name = 'project.resource.allocation'
-    _description = 'Project Resource Allocation'
-    _rec_name = 'resource_id'
-
-    def get_name(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for allocation in self.browse(cr, uid, ids, context=context):
-            name = allocation.phase_id.name
-            name += ' (%s%%)' %(allocation.useability)
-            res[allocation.id] = name
-        return res
+class project_user_allocation(osv.osv):
+    _name = 'project.user.allocation'
+    _description = 'Phase User Allocation'
+    _rec_name = 'user_id'
     _columns = {
-        'name': fields.function(get_name, type='char', size=256),
-        'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
+        'user_id': fields.many2one('res.users', 'User', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
         'project_id': fields.related('phase_id', 'project_id', type='many2one', relation="project.project", string='Project', store=True),
-        'user_id': fields.related('resource_id', 'user_id', type='many2one', relation="res.users", string='User'),
-        'date_start': fields.date('Start Date', help="Starting Date"),
-        'date_end': fields.date('End Date', help="Ending Date"),
-        'useability': fields.float('Availability', help="Availability of this resource for this project phase in percentage (=50%)"),
+        'date_start': fields.datetime('Start Date', help="Starting Date"),
+        'date_end': fields.datetime('End Date', help="Ending Date"),
     }
-    _defaults = {
-        'useability': 100,
-    }
-
-project_resource_allocation()
+project_user_allocation()
 
 class project(osv.osv):
     _inherit = "project.project"
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
     }
-    def generate_members(self, cr, uid, ids, context=None):
-        """
-        Return a list of  Resource Class objects for the resources allocated to the phase.
-        """
-        res = {}
-        resource_pool = self.pool.get('resource.resource')
-        for project in self.browse(cr, uid, ids, context=context):
-            user_ids = map(lambda x:x.id, project.members)
-            calendar_id  = project.resource_calendar_id and project.resource_calendar_id.id or False
-            resource_objs = resource_pool.generate_resources(cr, uid, user_ids, calendar_id, context=context)
-            res[project.id] = resource_objs
-        return res
-
     def schedule_phases(self, cr, uid, ids, context=None):
-        """
-        Schedule phase base on faces lib
-        """
-        if context is None:
-            context = {}
+        context = context or {}
         if type(ids) in (long, int,):
             ids = [ids]
-        phase_pool = self.pool.get('project.phase')
-        task_pool = self.pool.get('project.task')        
-        resource_pool = self.pool.get('resource.resource')
-        data_pool = self.pool.get('ir.model.data')
-        resource_allocation_pool = self.pool.get('project.resource.allocation')
-        data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day')
-        
-        #Checking the Valid Phase resource allocation from project member
-        for project in self.browse(cr, uid, ids, context=context):
-            flag = False
-            res_missing = []
-            members_ids = []
-            if project.members:
-                members_ids = [user.id for user in project.members]
+        projects = self.browse(cr, uid, ids, context=context)
+        result = self._schedule_header(cr, uid, ids, context=context)
+        for project in projects:
+            result += self._schedule_project(cr, uid, project, context=context)
+            result += self.pool.get('project.phase').generate_phase(cr, uid, project.phase_ids, context=context)
+
+        local_dict = {}
+        exec result in local_dict
+        projects_gantt = Task.BalancedProject(local_dict['Project'])
+
+        for project in projects:
+            project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,))
             for phase in project.phase_ids:
-                if phase.resource_ids:
-                    res_ids = [ re.id for re in  phase.resource_ids] 
-                    for res in resource_allocation_pool.browse(cr, uid, res_ids, context=context):
-                        if res.resource_id.user_id.id not in members_ids:
-                            res_missing += [res.resource_id.name]
-                            flag = True
-            if flag:
-                raise osv.except_osv(_('Warning !'),_("Resource(s) %s is(are) not member(s) of the project '%s' .") % (",".join(res_missing), project.name))
+                if phase.state in ('done','cancelled'):
+                    continue
+                # Maybe it's better to update than unlink/create if it already exists ?
+                p = getattr(project_gantt, 'Phase_%d' % (phase.id,))
 
-        for project in self.browse(cr, uid, ids, context=context):
-            root_phase_ids = phase_pool.search(cr, uid, [('project_id', '=', project.id),
-                                                  ('state', 'in', ['draft', 'open', 'pending']),
-                                                  ('previous_phase_ids', '=', False)
-                                                  ])
-            calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
-            start_date = project.date_start
-            #if start_date:
-            #    start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
-            #Creating resources using the member of the Project
-            u_ids = [i.id for i in project.members]
-            resource_objs = resource_pool.generate_resources(cr, uid, u_ids, calendar_id, context=context)
-            func_str = ''
-            start = start_date
-            minimum_time_unit = 1
-            # default values
-            working_hours_per_day = 24
-            working_days_per_week = 7
-            working_days_per_month = 30
-            working_days_per_year = 365
-            
-            vacation = []
-            if calendar_id:
-                working_hours_per_day = 8 #TODO: it should be come from calendars
-                working_days_per_week = 5
-                working_days_per_month = 20
-                working_days_per_year = 200
-                vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
+                self.pool.get('project.user.allocation').unlink(cr, uid, 
+                    [x.id for x in phase.user_ids],
+                    context=context
+                )
 
-            working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
-            
-            cls_str = ''
-            # Creating Resources for the Project
-            for key, vals in resource_objs.items():
-                cls_str +='''
-    class Resource_%s(Resource):
-        title = \"%s\"
-        vacation = %s
-        efficiency = %s
-'''%(key,  vals.get('name',False), vals.get('vacation', False), vals.get('efficiency', False))
-        
-            # Create a new project for each phase
-            func_str += '''
-def Project_%d():
-    from resource.faces import Resource
-    title = \"%s\"
-    start = \'%s\'
-    minimum_time_unit = %s
-    working_hours_per_day = %s
-    working_days_per_week = %s
-    working_days_per_month = %s
-    working_days_per_year = %s
-    vacation = %s
-    working_days =  %s
-'''%(project.id, project.name, start, minimum_time_unit, working_hours_per_day,  working_days_per_week, working_days_per_month, working_days_per_year, vacation, working_days )
-
-            func_str += cls_str
-            phase_ids = []
-            for root_phase in phase_pool.browse(cr, uid, root_phase_ids, context=context):
-                phases, child_phase_ids = phase_pool.generate_phase(cr, uid, [root_phase.id], '', context=context)
-                func_str += phases
-                phase_ids += child_phase_ids
-        
-            project_id = project.id
-            if not project.date_start:
-                raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.'))
-            # Allocating Memory for the required Project and Phases and Resources
-            exec(func_str)
-            Project = eval('Project_%d' % project.id)
-            project = None
-            try:
-                project = Task.BalancedProject(Project)
-            except Exception, e:
-                raise osv.except_osv(_('Error !'), e)
-            
-            for phase_id in phase_ids:
-                act_phase = phase_pool.browse(cr, uid, phase_id, context=context)
-                resources = act_phase.resource_ids
-                phase = eval("project.Phase_%d" % phase_id)
-                start_date = phase.start.to_datetime()
-                end_date = phase.end.to_datetime()
-                
-                if resources:
-                    for res in resources:
-                        vals = {}
-                        vals.update({'date_start' :  start_date })
-                        vals.update({'date_end' :  end_date})
-                        resource_allocation_pool.write(cr, uid, res.id, vals, context=context)
-                if act_phase.task_ids:
-                    for task in act_phase.task_ids:
-                        vals = {}
-                        #Getting values of the Tasks
-                        temp = eval("phase.Task_%s"%task.id)
-                        if temp.booked_resource:
-                            res_name = temp.booked_resource[0].title
-                            res_id = resource_pool.search(cr, uid,[('name','=',res_name)], context = context)
-                            if res_id:
-                                res = resource_pool.browse(cr, uid, res_id[0], context = context)
-                                vals.update({'user_id' : res.user_id.id})
-                                               
-                        vals.update({'date_start' : temp.start.strftime('%Y-%m-%d %H:%M:%S')})
-                        vals.update({'date_end' : temp.end.strftime('%Y-%m-%d %H:%M:%S')})
-                        task_pool.write(cr, uid, task.id, vals, context=context)
-
-
-                phase_pool.write(cr, uid, [phase_id], {
-                                        'date_start': start_date.strftime('%Y-%m-%d'),
-                                        'date_end': end_date.strftime('%Y-%m-%d')
-                                    }, context=context)
-        return True            
-
-    #TODO: DO Resource allocation and compute availability
-    def compute_allocation(self, rc, uid, ids, start_date, end_date, context=None):
-        if context ==  None:
-            context = {}
-        allocation = {}
-        return allocation
-
-    def schedule_tasks(self, cr, uid, ids, context=None):
-        """
-        Schedule task base on faces lib
-        """
-        if context is None:
-            context = {}
-        if type(ids) in (long, int,):
-            ids = [ids]
-        task_pool = self.pool.get('project.task')
-        resource_pool = self.pool.get('resource.resource')
-        data_pool = self.pool.get('ir.model.data')
-        data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day')
-
-        for project in self.browse(cr, uid, ids, context=context):
-            calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
-            start_date = project.date_start
-        
-            #Checking the Valid Phase resource allocation from project member
-            flag = False
-            res_missing = []
-            members_ids = []
-            if project.members:
-                members_ids = [user.id for user in project.members]
-            for phase in project.phase_ids:
-                if phase.resource_ids:
-                    res_ids = [ re.id for re in  phase.resource_ids] 
-                    for res in self.pool.get('project.resource.allocation').browse(cr, uid, res_ids, context=context):
-                        if res.resource_id.user_id.id not in members_ids:
-                            res_missing += [res.resource_id.name]
-                            flag = True
-            if flag:
-                raise osv.except_osv(_('Warning !'),_("Resource(s) %s is(are) not member(s) of the project '%s' .") % (",".join(res_missing), project.name))
-            #Creating resources using the member of the Project
-            u_ids = [i.id for i in project.members]
-            resource_objs = resource_pool.generate_resources(cr, uid, u_ids, calendar_id, context=context)
-            try:
-                start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
-            except:
-                raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.'))
-            func_str = ''
-            start = start_date
-            minimum_time_unit = 1
-            # default values
-            working_hours_per_day = 24
-            working_days_per_week = 7
-            working_days_per_month = 30
-            working_days_per_year = 365
-            
-            vacation = []
-            if calendar_id:
-                working_hours_per_day = 8 #TODO: it should be come from calendars
-                working_days_per_week = 5
-                working_days_per_month = 20
-                working_days_per_year = 200
-                vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
-
-            working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
-            
-            cls_str = ''
-            # Creating Resources for the Project
-            for key, vals in resource_objs.items():
-                cls_str +='''
-    class Resource_%s(Resource):
-        title = \"%s\"
-        vacation = %s
-        efficiency = %s
-'''%(key,  vals.get('name',False), vals.get('vacation', False), vals.get('efficiency', False))
-    
-            # Create a new project for each phase
-            func_str += '''
-def Project_%d():
-    from resource.faces import Resource
-    title = \"%s\"
-    start = \'%s\'
-    minimum_time_unit = %s
-    working_hours_per_day = %s
-    working_days_per_week = %s
-    working_days_per_month = %s
-    working_days_per_year = %s
-    vacation = %s
-    working_days =  %s
-'''%(project.id, project.name, start, minimum_time_unit, working_hours_per_day,  working_days_per_week, working_days_per_month, working_days_per_year, vacation, working_days )
-            
-            parent = False
-            task_ids = []
-            todo_task_ids = task_pool.search(cr, uid, [('project_id', '=', project.id),
-                                              ('state', 'in', ['draft', 'open', 'pending'])
-                                              ], order='sequence')
-            if todo_task_ids:
-                for task in task_pool.browse(cr, uid, todo_task_ids, context=context):
-                    func_str += task_pool.generate_task(cr, uid, task.id, parent=parent, flag=True,context=context)
-                    if not parent:
-                        parent = task
-                    task_ids.append(task.id)
-            func_str += cls_str
-
-            if not project.date_start:# or not project.members:
-                raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.'))
-            # Allocating Memory for the required Project and Phases and Resources
-            exec(func_str)
-            Project = eval('Project_%d' % project.id)
-            project = None
-            try:
-                project = Task.BalancedProject(Project)
-            except Exception, e:
-                raise osv.except_osv(_('Error !'), e)
-            
-            for task_id in task_ids:
-                task = eval("project.Task_%d" % task_id)
-                start_date = task.start.to_datetime()
-                end_date = task.end.to_datetime()
-                
-                task_pool.write(cr, uid, [task_id], {
-                                      'date_start': start_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                      'date_end': end_date.strftime('%Y-%m-%d %H:%M:%S')
-                                    }, context=context)
+                for r in p.booked_resource:
+                    self.pool.get('project.user.allocation').create(cr, uid, {
+                        'user_id': int(r.name[5:]),
+                        'phase_id': phase.id,
+                        'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
+                        'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
+                    }, context=context)
+                self.pool.get('project.phase').write(cr, uid, [phase.id], {
+                    'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
+                    'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
+                }, context=context)
         return True
-
 project()
 
-class resource_resource(osv.osv):
-    _inherit = "resource.resource"
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
-        if context is None:
-            context = {}
-        if context.get('project_id',False):
-            project_pool = self.pool.get('project.project')
-            project_rec = project_pool.browse(cr, uid, context['project_id'], context=context)
-            user_ids = [user_id.id for user_id in project_rec.members]
-            args.append(('user_id','in',user_ids))
-        return super(resource_resource, self).search(cr, uid, args, offset, limit, order, context, count)
-
-resource_resource()
-
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase'),
     }
-    _defaults = {
-        'user_id' : False
-    }
-
-    def generate_task(self, cr, uid, task_id, parent=False, flag=False, context=None):
-        if context is None:
-            context = {}
-        task = self.browse(cr, uid, task_id, context=context)
-        duration = str(task.planned_hours)+ 'H'
-        str_resource = False
-        parent = task.parent_ids
-        if task.phase_id.resource_ids:
-            str_resource = ('%s | '*len(task.phase_id.resource_ids))[:-2]
-            str_resource = str_resource % tuple(map(lambda x: 'Resource_%s'%x.resource_id.id, task.phase_id.resource_ids))
-        # Task Defination for the Phase of the Project
-        if not flag:
-            s = '''
-        def Task_%s():
-            title = \"%s\"
-            effort = \'%s\'
-            resource = %s
-'''%(task.id, task.name, duration, str_resource)
-            if task.child_ids:
-                seq = [[child.planned_hours, child.id] for child in task.child_ids]
-                seq.sort(key=itemgetter(0))
-                s +='''
-            start = up.Task_%s.end
-    '''%(seq[-1][1])
-        else:
-            s = '''
-    def Task_%s():
-        title = \"%s\"
-        effort = \'%s\'
-        resource = %s
-'''%(task.id, task.name, duration, str_resource)
-            if task.child_ids:
-                seq = [[child.planned_hours, child.id] for child in task.child_ids]
-                seq.sort(key=itemgetter(0))
-                s +='''
-        start = up.Task_%s.end
-'''%(seq[-1][1])
-        s += '\n'
-        return s
 project_task()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/project_long_term_data.xml b/addons/project_long_term/project_long_term_data.xml
index 8da591f1337..ebc084668b7 100644
--- a/addons/project_long_term/project_long_term_data.xml
+++ b/addons/project_long_term/project_long_term_data.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- Requests Links -->
-        <record id="req_link_project" model="res.request.link">
-            <field name="name">Project</field>
-            <field name="object">project.project</field>
-        </record>
-        <record id="req_link_task" model="res.request.link">
-            <field name="name">Project task</field>
-            <field name="object">project.task</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 961b0c62c9b..fe3f8c8e510 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -1,94 +1,49 @@
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
-<!--
-This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
--->
-        <!-- Human Resources -->
-        <record id="resource_analyst" model="resource.resource">
-            <field name="user_id" ref="project.res_users_analyst"/>
-            <field name="name">Analyst</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-        </record>
-
-        <record id="resource_project_manager" model="resource.resource">
-            <field name="user_id" ref="project.res_users_project_manager"/>
-            <field name="name">Project Manager</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-        </record>
-
-         <record id="resource_technical_leader" model="resource.resource">
-            <field name="user_id" ref="project.res_users_technical_leader"/>
-            <field name="name">Technical Leader</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-        </record>
-
-        <record id="resource_developer" model="resource.resource">
-            <field name="user_id" ref="project.res_users_developer"/>
-            <field name="name">Developer</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-        </record>
-
-        <record id="resource_designer" model="resource.resource">
-            <field name="user_id" ref="project.res_users_designer"/>
-            <field name="name">Designer</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-        </record>
-
-        <record id="resource_tester" model="resource.resource">
-            <field name="user_id" ref="project.res_users_tester"/>
-            <field name="name">Tester</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-        </record>
-
-        <record id="resource_finacial_manager" model="resource.resource">
-            <field name="user_id" ref="project.res_users_finacial_manager"/>
-            <field name="name">Project Finacial Manager</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
-        </record>
-
-
-
-        
+        <!--
+        This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
+        -->
 
         <!-- Project Phases -->
+
         <record id="project_phase_1" model="project.phase">
             <field eval="[(6, 0, [])]" name="previous_phase_ids"/>
             <field name="name">Collect Requirement and Make SRS</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="project.res_users_analyst"/>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
+        <function model="project.phase" name="set_open" eval="[ref('project_phase_1')]"/>
+        
         <record id="project_phase_2" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
             <field name="name">Design Model</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="project.res_users_project_manager"/>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
-
+        <function model="project.phase" name="set_open" eval="[ref('project_phase_2')]"/>
+        
         <record id="project_phase_3" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
             <field name="name">Planning and compute Risk analysis, Time chart </field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="project.res_users_project_manager"/>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
-
+        <function model="project.phase" name="set_open" eval="[ref('project_phase_3')]"/>
+        
         <record id="project_phase_4" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
             <field name="name">Development and Integration</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
-            <field name="responsible_id" ref="project.res_users_technical_leader"/>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
@@ -98,7 +53,6 @@ This Demo data file Human Resources, Phases and Resources,Tasks allocation and
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="project.res_users_project_manager"/>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
@@ -108,56 +62,10 @@ This Demo data file Human Resources, Phases and Resources,Tasks allocation and
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">10</field>
-            <field name="responsible_id" ref="project.res_users_analyst"/>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
-        <!--  Project Resource Allocation -->
-        <record id="resource_allocation_1" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_analyst"/>
-            <field name="phase_id" ref="project_phase_1"/>
-        </record>
-
-        <record id="resource_allocation_2" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_project_manager"/>
-            <field name="phase_id" ref="project_phase_2"/>
-        </record>
-
-        <record id="resource_allocation_3" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_project_manager"/>
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="resource_allocation_4" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_technical_leader"/>
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="resource_allocation_5" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_developer"/>
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="resource_allocation_6" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_designer"/>
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="resource_allocation_7" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_tester"/>
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="resource_allocation_8" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_project_manager"/>
-            <field name="phase_id" ref="project_phase_5"/>
-        </record>
-
-        <record id="resource_allocation_9" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_analyst"/>
-            <field name="phase_id" ref="project_phase_6"/>
-        </record>
-
+        <function model="project.phase" name="set_open" eval="[ref('project_phase_6')]"/>
         <!-- Tasks -->
 
         <record id="project.project_task_1" model="project.task">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 819fdbd7542..cdeb0a0d63d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,32 +2,32 @@
 <openerp>
     <data>
 
-    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
+    <menuitem id="base.menu_project_long_term" name="Planning" parent="base.menu_main_pm" sequence="1"/>
 
     # ------------------------------------------------------
-    # Project Resource Allocation
+    # Project User Allocation
     # ------------------------------------------------------
 
-        <record id="view_project_resource_allocation_gantt" model="ir.ui.view">
-            <field name="name">project.resource.allocation.gantt</field>
-            <field name="model">project.resource.allocation</field>
+        <record id="view_project_user_allocation_gantt" model="ir.ui.view">
+            <field name="name">project.user.allocation.gantt</field>
+            <field name="model">project.user.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt color="project_id" date_start="date_start" date_stop="date_end" mode="year">
                <level object="res.users" link="user_id" domain="[]">
-                    <field name="name"/>
+                    <field name="phase_id"/>
                 </level>
               </gantt>
             </field>
         </record>
 
-        <record id="view_project_resource_allocation_calendar" model="ir.ui.view">
-            <field name="name">project.resource.allocation.calendar</field>
-            <field name="model">project.resource.allocation</field>
+        <record id="view_project_user_allocation_calendar" model="ir.ui.view">
+            <field name="name">project.user.allocation.calendar</field>
+            <field name="model">project.user.allocation</field>
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="resource_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
+                <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Users">
                     <field name="phase_id"/>
                     <field name="project_id"/>
                 </calendar>
@@ -35,53 +35,51 @@
         </record>
 
 
-        <record id="view_project_resource_allocation_form" model="ir.ui.view">
-            <field name="name">project.resource.allocation.form</field>
-            <field name="model">project.resource.allocation</field>
+        <record id="view_project_user_allocation_form" model="ir.ui.view">
+            <field name="name">project.user.allocation.form</field>
+            <field name="model">project.user.allocation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Resource Allocation">
+                <form string="Project User Allocation">
                     <group colspan="4" col="6">
-                        <field name="resource_id"/>
+                        <field name="user_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
-                        <field name="useability" string="Availability"/>
                     </group>
                 </form>
             </field>
         </record>
 
-        <record id="view_project_resource_allocation_list" model="ir.ui.view">
-            <field name="name">project.resource.allocation.list</field>
-            <field name="model">project.resource.allocation</field>
+        <record id="view_project_user_allocation_list" model="ir.ui.view">
+            <field name="name">project.user.allocation.list</field>
+            <field name="model">project.user.allocation</field>
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Project Resource Allocation">
-                    <field name="resource_id"/>
+                <tree editable="bottom" string="Project User Allocation">
+                    <field name="user_id"/>
                     <field name="phase_id"/>
                     <field name="project_id"/>
-                    <field name="useability" string="Availability"/>
                 </tree>
             </field>
         </record>
 
-       <record id="view_project_resource_allocation_search" model="ir.ui.view">
-            <field name="name">project.resource.allocation.search</field>
-            <field name="model">project.resource.allocation</field>
+       <record id="view_project_user_allocation_search" model="ir.ui.view">
+            <field name="name">project.user.allocation.search</field>
+            <field name="model">project.user.allocation</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Resources Allocation">
-                    <group colspan="4" col="20">
-                        <field name="resource_id"/>
+                <search string="Planning of Users">
+                    <group>
+                        <field name="user_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
@@ -90,12 +88,12 @@
             </field>
         </record>
        <record id="act_resouce_allocation" model="ir.actions.act_window">
-            <field name="name">Resources Allocation</field>
-            <field name="res_model">project.resource.allocation</field>
+            <field name="name">Planning of Users</field>
+            <field name="res_model">project.user.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
              <field name="context">{}</field>
-            <field name="search_view_id" ref="view_project_resource_allocation_search"/>
+            <field name="search_view_id" ref="view_project_user_allocation_search"/>
         </record>
 
 
@@ -110,37 +108,32 @@
             <field name="arch" type="xml">
                 <form string="Project Phase">
                     <group colspan="6" col="6">
-                        <group colspan="6" col="6" >
-                            <field name="name" select="1"/>
-                            <field name="project_id" on_change="onchange_project(project_id)"/>
-                            <field name="responsible_id"/>
-                        </group>
-                        <group colspan="6" col="6">
-                            <field name="date_start" readonly="1"/>
+                        <group colspan="6" col="7" >
+                            <field name="name" colspan="4"/>
+                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
                             <field name="duration"/>
-                            <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
-                            <field name="date_end" readonly="1"/>
+                            <field name="product_uom" nolabel="1"/>
                         </group>
                     </group>
                     <notebook colspan="4">
-                        <page string="Resource Allocation">
-                            <field colspan="4" name="resource_ids" nolabel="1">
-                                 <tree editable="bottom" string="Project Resource Allocation">
-                                    <field name="resource_id" context="{'project_id':parent.project_id}"/>
+                        <page string="Planning of Users">
+                            <field colspan="4" name="user_ids" nolabel="1">
+                                 <tree editable="bottom" string="Project Users">
+                                    <field name="user_id"/>
                                     <field name="date_start"/>
                                     <field name="date_end"/>
-                                    <field name="useability" string="Availability"/>
                                   </tree>
-                                  <form string="Project Resource Allocation">
-                                    <field name="resource_id" context="{'project_id':parent.project_id}"/>
+                                  <form string="Project Users">
+                                    <field name="user_id"/>
                                     <field name="date_start" /> 
                                     <field name="date_end"/>
-                                    <field name="useability" string="Availability"/>
                                   </form>
                              </field>
                             <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
-                                <field name="state" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
@@ -162,38 +155,9 @@
                                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
                                     <field name="state"/>
                                   </tree>
-                                  <form string="Project's Tasks">
-                                      <notebook colspan="4">
-                                          <page string="Task Detail">
-                                              <group colspan="4" col="4">
-                                                <field name="name"/>
-                                                <field name="project_id"/>
-                                                <field name="user_id"/>
-                                                <field name="sequence"/>
-                                            </group>
-                                            <group colspan="2" col="2">
-                                                  <separator string="Dates" colspan="2"/>
-                                                  <field name="date_start"/>
-                                                  <field name="date_end" />
-                                                  <field name="date_deadline"/>
-                                            </group>
-                                            <group colspan="2" col="2">
-                                                  <separator string="Planning" colspan="2"/>
-                                                  <field name="planned_hours" widget="float_time"/>
-                                                <field name="total_hours" widget="float_time"/>
-                                                <field name="remaining_hours" widget="float_time"/>
-                                                <field name="effective_hours" invisible="1"/>
-                                            </group>
-                                            <group colspan="6" col="4">
-                                                <field name="state"/>
-                                            </group>
-                                        </page>
-                                    </notebook>
-                                  </form>
                              </field>
-                               <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
-                        <page string="Schedule and Display info">
+                        <page string="Constraints">
                            <group colspan="2" col="2">
                                 <separator string="Constraints" colspan="2"/>
                                 <field name="constraint_date_start"/>
@@ -203,10 +167,12 @@
                                 <separator string="Displaying settings" colspan="2"/>
                                 <field name="sequence"/>
                             </group>
+                           <separator colspan="4" string="Force Assigned Users"/>
+                           <field colspan="4" name="user_force_ids" nolabel="1"/>
                            <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
+                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
                            <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
+                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -220,15 +186,13 @@
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:state in ('pending')" string="Project Phases">
+                <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases">
                     <field name="name"/>
                     <field name="project_id" on_change="onchange_project(project_id)"/>
-                    <field name="responsible_id"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="duration"/>
                     <field name="state"/>
-                     <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>
@@ -241,7 +205,6 @@
             <field name="arch" type="xml">
                 <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
                     <field name="name"/>
-                    <field name="responsible_id"/>
                 </calendar>
             </field>
         </record>
@@ -266,8 +229,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
-                    <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, In Progress and Pending Phases" icon="terp-check"/>
+                    <group>
+                        <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
@@ -275,14 +238,11 @@
                         <field name="project_id">
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         </field>
-                        <field name="responsible_id"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
-                        <separator orientation="vertical"/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -300,7 +260,7 @@
             <field name="view_mode">gantt,tree,form,calendar</field>
             <field name="context">{"search_default_current": 1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
-            <field name="help">A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on the project.</field>
+            <field name="help">A project can be split into the different phases. For each phase, you can define your users allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available users, convert your phases into a series of tasks when you start working on the project.</field>
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
@@ -317,7 +277,7 @@
     # Project
     # ------------------------------------------------------
 
-        <record id="project.view_project_resource_form1" model="ir.ui.view">
+        <record id="project.view_project_user_form1" model="ir.ui.view">
             <field name="name">Project Resource Calendar View</field>
             <field name="model">project.project</field>
             <field name="type">form</field>
@@ -340,9 +300,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <field name="sequence" position="after">
+                <xpath expr="//field[@name='effective_hours']" position="after">
                     <field name="phase_id"/>
-                </field>
+                </xpath>
             </field>
         </record>
         <record id="view_phase_task_search_form" model="ir.ui.view">
@@ -364,7 +324,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
             <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
-            <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/>
+                <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/>
             </filter>
             </field>
         </record>
@@ -382,33 +342,20 @@
         </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"
-        context="{'search_default_phase_id': [active_id]}"
-        domain="[('phase_id', '=', active_id),('project_id','=',project_id)]"
         />
 
     <act_window
-        context="{'search_default_project_id': [active_id]}"
+        context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
         id="act_project_phases"
         name="Phases"
         res_model="project.phase"
         src_model="project.project"
-        domain="[('project_id', '=', active_id)]"
-        view_mode="tree,form"
-        view_type="form" 
-        />
-
-    <act_window
-        context="{'search_default_user_id': [user_id]}"
-        id="act_project_resource"
-        name="Resources"
-        res_model="resource.resource"
-        src_model="project.project"
-        domain="[('user_id', '=',user_id)]"
         view_mode="tree,form"
         view_type="form" 
         />
@@ -418,26 +365,24 @@
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase_list"
-            groups="base.group_extended"
             id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
 
         <menuitem action="act_project_phase"
             icon="STOCK_INDENT"
-            groups="base.group_extended"
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
             icon="STOCK_INDENT"
-            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
+            parent="base.menu_project_long_term" sequence="2"/>
 
-        <menuitem id="menu_pm_resources_project1"
+        <menuitem id="menu_pm_users_project1"
             groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
-        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_users_project1" sequence="5"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_users_project1" sequence="3"/>
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 6d4961f2cfe..4382d27834e 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,0,0,0
+"access_project_user_allocation","project.user.allocation","model_project_user_allocation","project.group_project_user",1,0,0,0
 "access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,1,1,1
-"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
-"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
-"access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
-"access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
-"access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
+"access_project_user_allocation_manager","project.user.allocation manager","model_project_user_allocation","project.group_project_manager",1,1,1,1
+"access_resource_resource_user","user.user user","resource.model_resource_resource","project.group_project_user",1,0,0,0
+"access_resource_calendar_leaves_user","user.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
+"access_resource_resource_manager","user.user manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
+"access_project_user_allocation_manager","project.user.allocation.manager","model_project_user_allocation","project.group_project_manager",1,1,1,1
diff --git a/addons/project_long_term/test/phase_constraint.yml b/addons/project_long_term/test/phase_constraint.yml
index cf6bfa844a6..f4fa09e6e38 100644
--- a/addons/project_long_term/test/phase_constraint.yml
+++ b/addons/project_long_term/test/phase_constraint.yml
@@ -1,133 +1,67 @@
 - 
-  I have a project 'Develop yaml Project Module'.
+  Given that I have a project 'Test Phases'.
 - 
   !record {model: project.project, id: project_project_developyamlproject0}:
     name: "Develop Yaml Project Module"
     date_start: !eval time.strftime('%Y-%m-%d')
+    resource_calendar_id: resource.timesheet_group1
+    members:
+      - base.user_admin
 - 
-  I have set Working Time from Monday to  Friday from 9am to 17pm.
-- 
-  !record {model: resource.calendar, id: resource_calendar_hoursweeks0}:
-    name: "from Monday to  Friday, from 9am to 17pm"
-
-- 
-  I have set Day1 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}:
-    name: "Day1"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "0"
-    calendar_id : resource_calendar_hoursweeks0
-
-- 
-  I have set Day2 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}:
-    name: "Day2"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "1"
-    calendar_id : resource_calendar_hoursweeks0
-    
-- 
-  I have set Day3 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}:
-    name: "Day3"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "2"    
-    calendar_id : resource_calendar_hoursweeks0
-
-- 
-  I have set Day4 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}:
-    name: "Day4"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "3"
-    calendar_id : resource_calendar_hoursweeks0
-
-- 
-  I have set Day5 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}:
-    name: "Day5"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "4"    
-    calendar_id : resource_calendar_hoursweeks0
-
-
-- 
-  Now Set working period to  Project 'Develop yaml Project Module'
-- 
-  !python {model: project.project}: |  
-    self.write(cr, uid, [ref("project_project_developyamlproject0")], {'resource_calendar_id': ref("resource_calendar_hoursweeks0")})
-
-    
-- 
-  Creating 3 consecutive 5-days phases.
-  For that Creating a Analyst Human resource to analyst Project Yaml.
+  And I create three human ressources to work on this project, an analyst.
 - 
   !record {model: resource.resource, id: resource_resource_analyst1}:
-    calendar_id: project_long_term.resource_calendar_hoursweeks0
+    calendar_id: resource.timesheet_group1
     name: Analyst
     resource_type: user
     time_efficiency: 1.0
     user_id: base.user_admin
-    
 - 
-  Creating Developer Human resource who develop Yaml
+  I define a developer HR.
 - 
   !record {model: resource.resource, id: resource_resource_develop0}:
-    calendar_id: project_long_term.resource_calendar_hoursweeks0
+    calendar_id: resource.timesheet_group1
     name: Developer
     resource_type: user
     time_efficiency: 1.0
     user_id: base.user_admin
 - 
-  Creating a Tester Human resource for testing Yaml
+  I define a tester HR.
 - 
   !record {model: resource.resource, id: resource_resource_tester1}:
-    calendar_id: project_long_term.resource_calendar_hoursweeks0
+    calendar_id: resource.timesheet_group1
     name: tester
     resource_type: user
     time_efficiency: 1.0
     user_id: base.user_admin
-    
 - 
-  Create 3 a project phase and NO one  depends on other one.
-  so,they should start on the same day. 
-  Creating First 'Analysis Flow for Yaml' Project Phase.
+  Then I create three phases for my projects; Analysis, Development, Testing.
+- 
+  The first phase is 'Analysis' and has a duration of 6 days.
 - 
   !record {model: project.phase, id: project_phase_analysisflowforyaml0}:
     date_start: !eval time.strftime('%Y-%m-%d')
     duration: 6.0
-    name: "Analysis Flow for Yaml"
+    name: "Analysis"
     product_uom: product.uom_day
     project_id: project_project_developyamlproject0
-    responsible_id: project.res_users_analyst
     state: draft
 
 - 
-  I update the Constrain Date Start adn Date End for phase Analysis Flow for Yaml
+  I update the constrain and the analysis phase to not start before 4 days.
 - 
    !python {model : project.phase }: |
+      pass
       import datetime
       from dateutil.relativedelta import *
-      start = datetime.date.today() - relativedelta(days=2)    
-      end = datetime.date.today() + relativedelta(days=6)
-      self.write(cr,uid, [(ref("project_phase_analysisflowforyaml0"))], {'constraint_date_start': start, 'constraint_date_end':end})
-    
+      start = datetime.date.today() + relativedelta(days=4)
+      self.write(cr,uid, [(ref("project_phase_analysisflowforyaml0"))], {'constraint_date_start': start})
 - 
-  Create project phase 'Develop yaml' with constraint date.
+  The second phase is 'Development' and depend on the 'Analysis', with a duration of 6 days.
 - 
   !record {model: project.phase, id: project_phase_developyaml0}:
     duration: 6.0
-    name: Develop Yaml
+    name: Development
     product_uom: product.uom_day
     project_id: project_project_developyamlproject0
     previous_phase_ids:
@@ -137,43 +71,48 @@
   I update the Constrain Date Start adn Date End for phase Develop yaml
 - 
    !python {model : project.phase }: |
+      pass 
       import datetime
-      from dateutil.relativedelta import *
-      start = datetime.date.today() - relativedelta(days=5)    
-      end = datetime.date.today() + relativedelta(days=10)
-      self.write(cr,uid, [(ref("project_phase_developyaml0"))], {'constraint_date_start': start, 'constraint_date_end':end})
+      #from dateutil.relativedelta import *
+      #start = datetime.date.today() - relativedelta(days=5)    
+      #end = datetime.date.today() + relativedelta(days=10)
+      #self.write(cr,uid, [(ref("project_phase_developyaml0"))], {'constraint_date_start': start, 'constraint_date_end':end})
 -
-  Create project phase 'Test Yaml'
+  The third phase is 'Testing' and depend on the 'Develop' phase, with a duration of 6 days.
 - 
   !record {model: project.phase, id: project_phase_testyaml0}:
     duration: 6.0
-    name: Testing Yaml
+    name: Testing
     product_uom: product.uom_day
     project_id: project_project_developyamlproject0
     previous_phase_ids:
       - project_phase_developyaml0
-    constraint_date_start : 
-    constraint_date_end : 
 - 
-  Compute Schedule of phases For One project 
+  Then I launch the scheduler to compute starting and ending phases on all phases of this project.
 - 
   !record {model: project.compute.phases, id: project_compute_phases_0}:
     project_id: project_project_developyamlproject0
     target_project: one
-    
-- 
-  Schedule project phases using "Compute Phase Scheduling"
 - 
   !python {model: project.project}: |
     self.schedule_phases(cr, uid, [ref("project_project_developyamlproject0")])
-      
 -
-  After  scheduling,check that 
-  Phase "Analysis Flow for Yaml" and "Test Yaml" Phase should start on the project start date while "Develop yaml" Phase should respect the constraint. 
+  After scheduling, I check the starting date and ending date on the phases are correct.
 -
-  !python {model: project.project}: |
-     proj=self.browse(cr, uid, [ref("project_project_developyamlproject0")])[0]
-     for phase in proj.phase_ids:
-        for phase1 in proj.phase_ids:
-             if phase1.id != phase.id and phase.constraint_date_start == phase1.date_start:
-               raise AssertionError("Phases not scheduled")      
+  !python {model: project.phase}: |
+     import datetime
+     from dateutil.relativedelta import *
+     minstart = (datetime.date.today() + relativedelta(days=4)).strftime('%Y-%m-%d')
+     minend = (datetime.date.today() + relativedelta(days=11)).strftime('%Y-%m-%d')
+
+     phase1=self.browse(cr, uid, ref('project_phase_analysisflowforyaml0'))
+     assert phase1.date_start>=minstart, 'Error, the Analysis phase '+phase1.date_start+' should start after '+str(minstart)
+     assert phase1.date_end>=minend, 'Error, the Analysis phase should end after '+str(minend)
+
+     phase2=self.browse(cr, uid, ref('project_phase_developyaml0'))
+     assert phase2.date_start>=phase1.date_end, 'Error, the phase Development should start after the end of the Analysis phase'
+
+     phase3=self.browse(cr, uid, ref('project_phase_testyaml0'))
+     assert phase3.date_start>=phase2.date_end, 'Error, the phase Testing should start after the end of the Development phase'
+     assert phase3.date_start<phase3.date_end, 'Error, the phase Testing should start before ending'
+
diff --git a/addons/project_long_term/test/project_schedule_consecutive_day.yml b/addons/project_long_term/test/project_schedule_consecutive_day.yml
index 10cfc7b6b9c..cffe06a9ff9 100644
--- a/addons/project_long_term/test/project_schedule_consecutive_day.yml
+++ b/addons/project_long_term/test/project_schedule_consecutive_day.yml
@@ -4,6 +4,8 @@
   !record {model: project.project, id: project_project_developyamlproject_2}:
     name: "Develop Yaml Project Module"
     date_start: !eval time.strftime('%Y-%m-%d')
+    members:
+      - base.user_admin
 
 - 
   I have set Working Time from Monday to  Friday from 9am to 17pm.
@@ -107,7 +109,6 @@
   !record {model: project.compute.phases, id: project_compute_phases_0}:
     project_id: project_project_developyamlproject_2
     target_project: one
-    
 - 
   Schedule project phases using Compute Phase Scheduling
 - 
@@ -120,7 +121,7 @@
   !python {model: project.project}: |
      proj=self.browse(cr, uid, [ref("project_project_developyamlproject_2")])[0]
      for phase in proj.phase_ids:
-        if (not phase.responsible_id) or (not phase.date_start) or (not phase.date_end):
-           raise AssertionError("Phases not scheduled")      
-      
+        if (not phase.date_start) or (not phase.date_end):
+           raise AssertionError("Phases not scheduled")
+
 
diff --git a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml b/addons/project_long_term/test/project_schedule_without_wroking_hour.yml
index 61a8539585a..4fe7687425b 100644
--- a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml
+++ b/addons/project_long_term/test/project_schedule_without_wroking_hour.yml
@@ -15,7 +15,6 @@
     product_uom: product.uom_day
     name: "Analysis Flow for Yaml"
     project_id: project_project_developyamlproject_2
-    responsible_id: project.res_users_analyst
     state: draft
     
 - 
@@ -71,7 +70,7 @@
   !python {model: project.project}: |
      proj=self.browse(cr, uid, [ref("project_project_developyamlproject_2")])[0]
      for phase in proj.phase_ids:
-        if (not phase.responsible_id) or (not phase.date_start) or (not phase.date_end):
+        if (not phase.date_start) or (not phase.date_end):
            raise AssertionError("Phases not scheduled")      
       
 
diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml
deleted file mode 100644
index be22f778cee..00000000000
--- a/addons/project_long_term/test/schedule_phase_tasks.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-- 
-  Create project 'Develop an outlook-openerp synchronization plugin'
-- 
-  !record {model: project.project, id: project_project_project4}:
-    name: Develop an outlook-openerp synchronization plugin
-    members:
-      - project.res_users_project_manager
-      - project.res_users_technical_leader
-      - project.res_users_developer
-      - project.res_users_designer
-      - project.res_users_tester
-      - project.res_users_analyst
-      - project.res_users_finacial_manager
-- 
-  Create phase 'Develop GUI' in Outlook
-- 
-  !record {model: project.phase, id: project_phase_phase0}:
-    date_start: !eval time.strftime("%Y-%m-%d")
-    duration: 200.0
-    name: Develop GUI in Outlook
-    product_uom: product.uom_day
-    project_id: project_project_project4
-    state: draft
-    resource_ids:
-      - resource_id: project_long_term.resource_analyst
-      - resource_id: project_long_term.resource_developer
-      - resource_id: project_long_term.resource_designer
-      - resource_id: project_long_term.resource_tester
-      - resource_id: project_long_term.resource_project_manager
-    
-- 
-  Create the phase task 'Develop GUI for Server Configuration'
-- 
-  !record {model: project.task, id: project_task_t0}:
-    name: Develop GUI for Server Configuration
-    planned_hours: 20.0
-    remaining_hours: 20.0
-    state: draft
-    phase_id: project_phase_phase0
-    project_id: project_project_project4
-
-    
-- 
-  Create the phase task 'Develop GUI for Modules Configuration'
-- 
-  !record {model: project.task, id: project_task_t1}:
-    name: Develop GUI for Modules Configuration
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id: project_phase_phase0
-    project_id: project_project_project4
-
-- 
-  Create the phase task 'Develop GUI for OpenERP Synchronisation'
-- 
-  !record {model: project.task, id: project_task_t2}:
-    name: Develop GUI for OpenERP Synchronisation
-    planned_hours: 30.0
-    remaining_hours: 30.0
-    state: draft
-    phase_id: project_phase_phase0
-    project_id: project_project_project4
-
-- 
-  Create the phase task 'Design required GUI/Menus'
-- 
-  !record {model: project.task, id: project_task_3}:
-    name: Design required GUI/Menus
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id: project_phase_phase0
-    project_id: project_project_project4
-    
-- 
-  Schedule phase tasks
-- 
-  !python {model: project.phase}: |
-      res = self.schedule_tasks(cr, uid, [ref("project_phase_phase0")])
-
--
-  Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
--
-  !python {model: project.phase}: |
-     phase = self.browse(cr, uid, [ref("project_phase_phase0")])[0]
-     for task in phase.task_ids:
-        if (not task.date_start) or (not task.date_end):
-           raise AssertionError("Phase Tasks not scheduled: %d uid=%r start=%r end=%r" % \
-                    (task.id, task.user_id, task.date_start, task.date_end))
diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml
index 4bc6549bf35..550787fe867 100644
--- a/addons/project_long_term/test/schedule_project_phases.yml
+++ b/addons/project_long_term/test/schedule_project_phases.yml
@@ -31,28 +31,6 @@
     name: Establishing Project Feasibility
     product_uom: product.uom_day
     project_id: project_project_worldbanksproject0
-
--
- Resource1
--
-  !record {model: project.resource.allocation, id: res_phase1}:
-    resource_id: project_long_term.resource_project_manager
-    phase_id: project_phase_definingclientsbasicideaofproject0
-
--
- Resource2
--
-  !record {model: project.resource.allocation, id: res_phase2}:
-    resource_id: project_long_term.resource_analyst
-    phase_id: project_phase_definingclientsbasicideaofproject0
-
--
- Resource3
--
-  !record {model: project.resource.allocation, id: res_phase3}:
-    resource_id: project_long_term.resource_technical_leader
-    phase_id: project_phase_definingclientsbasicideaofproject0
-
 -
   Create the phase task 'Develop GUI for Server Configuration'
 -
@@ -84,20 +62,6 @@
     product_uom: product.uom_hour
     project_id: project_project_worldbanksproject0
 
--
- Resource4
--
-  !record {model: project.resource.allocation, id: res_phase4}:
-    resource_id: project_long_term.resource_developer
-    phase_id: project_phase_preparationofengineeringdesigns0
-
--
- Resource5
--
-  !record {model: project.resource.allocation, id: res_phase5}:
-    resource_id: project_long_term.resource_designer
-    phase_id: project_phase_preparationofengineeringdesigns0
-
 -
   Create the phase task 'Develop GUI for Client Configuration'
 -
@@ -210,7 +174,7 @@
   !python {model: project.project}: |
      prj=self.browse(cr, uid, [ref("project_project_worldbanksproject0")])[0]
      for phase in prj.phase_ids:
-        if (not phase.responsible_id) or (not phase.date_start) or (not phase.date_end):
-     	   raise AssertionError("Tasks not scheduled")
+        if (not phase.date_start) or (not phase.date_end):
+            raise AssertionError("Tasks not scheduled")
 
 
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
index 825b7c404d9..17db7ef8038 100644
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ b/addons/project_long_term/test/schedule_project_tasks.yml
@@ -11,26 +11,17 @@
       - project.res_users_tester
       - project.res_users_analyst
       - project.res_users_finacial_manager
-        
+
 - 
   Create phase 'Develop GUI' in thunderbird
 - 
   !record {model: project.phase, id: project_phase_phase1}:
-    date_start: !eval time.strftime('%Y-%m-%d')
+    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
     duration: 200.0
     name: Develop GUI in thunderbird
     product_uom: product.uom_day
     project_id: project_project_project1
     state: draft
-    resource_ids:
-      - resource_id: project_long_term.resource_analyst
-        useability: 80.0
-      - resource_id: project_long_term.resource_developer
-        useability: 30.0
-      - resource_id: project_long_term.resource_designer
-        useability: 30.0
-    
-    
 - 
   Create the phase task 'Develop GUI for Server Configuration'
 - 
@@ -76,8 +67,7 @@
     phase_id: project_phase_phase1
     project_id: project_project_project1
     user_id: project.res_users_designer
-    
-    
+
 - 
   Schedule tasks
 - 
@@ -88,7 +78,9 @@
   Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
 -
   !python {model: project.project}: |
-     prj = self.browse(cr, uid, [ref("project_project_project1")])[0]
-     for task in prj.tasks:
-     	if (not task.user_id) or (not task.date_start) or (not task.date_end):
-     	   raise AssertionError("Project Tasks not scheduled")
+    prj = self.browse(cr, uid, [ref("project_project_project1")])[0]
+    for task in prj.tasks:
+        if task.state in ('done','cancelled'):
+            continue
+        if (not task.user_id) or (not task.date_start) or (not task.date_end):
+            raise AssertionError("Project tasks not scheduled!")
diff --git a/addons/project_long_term/test/test_schedule_phases_case1.yml b/addons/project_long_term/test/test_schedule_phases_case1.yml
index ba091a29916..8b9ff5f3705 100644
--- a/addons/project_long_term/test/test_schedule_phases_case1.yml
+++ b/addons/project_long_term/test/test_schedule_phases_case1.yml
@@ -63,10 +63,14 @@
     import datetime
     from dateutil.relativedelta import *
     start = (datetime.date.today()).strftime('%Y-%m-%d')
-    end = (datetime.date.today() + relativedelta(days=2)).strftime('%Y-%m-%d')
+    end = (datetime.date.today() + relativedelta(days=1)).strftime('%Y-%m-%d 17:00:00')
     first_phase = self.browse(cr, uid, ref('project_phase_firstphase0_case1'))
-    assert (first_phase.date_start == start and first_phase.date_end == end),'Dates are wrong!'
+    assert (first_phase.date_start[:10] >= start),'Start dates are wrong: %s < %s !' % (first_phase.date_start[:10], start)
+    assert (first_phase.date_end >= end),'End dates are wrong: %s <%s!' % (first_phase.date_end, end)
+
     second_phase = self.browse(cr, uid, ref('project_phase_secondphase0_case2'))
     start = first_phase.date_end
-    end = (datetime.date.today() + relativedelta(days=5)).strftime('%Y-%m-%d')
-    assert (second_phase.date_start == start and second_phase.date_end == end),'Dates are wrong!'
+    end = (datetime.date.today() + relativedelta(days=4)).strftime('%Y-%m-%d')
+    assert second_phase.date_start >= start, 'Dates are wrong on second phase: %s < %s!' % (second_phase.date_start, start)
+    assert second_phase.date_end >= end, 'Dates are wrong on second phase %s < %s!' % (second_phase.date_end, end)
+
diff --git a/addons/project_long_term/test/test_schedule_phases_case2.yml b/addons/project_long_term/test/test_schedule_phases_case2.yml
index 67a7332cf5b..35173a897a3 100644
--- a/addons/project_long_term/test/test_schedule_phases_case2.yml
+++ b/addons/project_long_term/test/test_schedule_phases_case2.yml
@@ -147,7 +147,7 @@
   I create a phase 'Initial Phase' for project 'Development and Testing'.
 - 
   !record {model: project.phase, id: project_phase_phase0}:
-    date_start: '2011-01-03'
+    date_start: '2011-01-03 08:00:00'
     duration: 0.0
     name: Initial Phase
     product_uom: product.uom_day
diff --git a/addons/project_long_term/test/test_schedule_tasks_case1.yml b/addons/project_long_term/test/test_schedule_tasks_case1.yml
index d40b61d6b3a..3bb0ea87c43 100644
--- a/addons/project_long_term/test/test_schedule_tasks_case1.yml
+++ b/addons/project_long_term/test/test_schedule_tasks_case1.yml
@@ -38,7 +38,7 @@
       - res_users_user0
       - res_users_user1
     phase_ids:
-      - date_start: '2011-01-06'
+      - date_start: '2011-01-06 08:00:00'
         duration: 2.0
         name: Phase A
         product_uom: product.uom_day
@@ -184,16 +184,11 @@
   Now I create one phase for the project.
 - 
   !record {model: project.phase, id: project_phase_phasea0}:
-    date_start: '2011-01-06'
+    date_start: '2011-01-06 08:00:00'
     duration: 2.0
     name: Phase A
     product_uom: product.uom_day
     project_id: project_project_projecta0
-    resource_ids:
-      - project_id: project_project_projecta0
-        resource_id: resource_resource_user0
-      - project_id: project_project_projecta0
-        resource_id: resource_resource_user1
     state: draft
     task_ids:
       - delay_hours: 0.0
diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py
index c1e6d838111..4536f4a3cbb 100644
--- a/addons/project_long_term/wizard/__init__.py
+++ b/addons/project_long_term/wizard/__init__.py
@@ -21,6 +21,5 @@
 
 import project_compute_phases
 import project_compute_tasks
-import project_schedule_tasks
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 7e84f0681cc..4a66cecf9cd 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -25,21 +25,19 @@ class project_compute_phases(osv.osv_memory):
     _name = 'project.compute.phases'
     _description = 'Project Compute Phases'
     _columns = {
-       'target_project': fields.selection([('all', 'Compute All Projects'),
-                                           ('one', 'Compute a Single Project'),
-                                           ], 'Schedule', required = True),
-
+        'target_project': fields.selection([
+            ('all', 'Compute All My Projects'),
+            ('one', 'Compute a Single Project'),
+            ], 'Schedule', required=True),
         'project_id': fields.many2one('project.project', 'Project')
     }
-
     _defaults = {
-        'target_project': 'all'
+        'target_project': 'one'
     }
 
     def check_selection(self, cr, uid, ids, context=None):
         return self.compute_date(cr, uid, ids, context=context)
 
-    
     def compute_date(self, cr, uid, ids, context=None):
         """
         Compute the phases for scheduling.
@@ -47,12 +45,12 @@ class project_compute_phases(osv.osv_memory):
         project_pool = self.pool.get('project.project')
         data = self.read(cr, uid, ids, [], context=context)[0]
         if not data['project_id'] and data['target_project'] == 'one':
-            raise osv.except_osv(_('Error!'), _('Please Specify Project to be schedule'))
+            raise osv.except_osv(_('Error!'), _('Please specify a project to schedule.'))
 
-        if data['project_id']:        # If project mentioned find its phases
+        if data['target_project'] == 'one':
             project_ids = [data['project_id'][0]]
-        else:                        # Else take all the draft,open,pending states phases
-            project_ids = project_pool.search(cr, uid, [], context=context)
+        else:
+            project_ids = project_pool.search(cr, uid, [('user_id','=',uid)], context=context)
 
         project_pool.schedule_phases(cr, uid, project_ids, context=context)
         return self._open_phases_list(cr, uid, data, context=context)
@@ -70,8 +68,9 @@ class project_compute_phases(osv.osv_memory):
         result = act_obj.read(cr, uid, [id], context=context)[0]
         result['target'] = 'current'
         project_id = data.get('project_id') and data.get('project_id')[0] or False
-        result['context'] = {"search_default_project_id":project_id, "default_project_id":project_id, "search_default_responsible_id":uid, "search_default_current": 1}
+        result['context'] = {"search_default_project_id":project_id, "default_project_id":project_id, "search_default_current": 1}
         return result
 
 project_compute_phases()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 9d5754af09c..b6afc26276b 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -2,43 +2,42 @@
 <openerp>
     <data>
 
-    	<record id="view_project_compute_phases_select" model="ir.ui.view">
-            <field name="name">Compute Scheduling of Phases</field>
+        <record id="view_project_compute_phases_select" model="ir.ui.view">
+            <field name="name">Schedule Phases</field>
             <field name="model">project.compute.phases</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Compute Scheduling of Phases">
+                  <form string="Schedule Phases">
                     <group colspan="4" col="4">
-                        <separator colspan="4" string="Compute Scheduling of phases for all or specified project" />
+                        <separator colspan="4" string="Schedule Phases" />
                         <field name="target_project" colspan="4"/>
-                        <field name="project_id" widget="selection" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
+                        <field name="project_id" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                         <separator colspan="4"/>
                         <group colspan="2" col="2">
                         </group>
                         <group colspan="2" col="2"> <!-- Improve me -->
-	                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-	                        <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
+                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                            <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
                         </group>
-		            </group>
-			  	</form>
+                    </group>
+                  </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_project_compute_phases" model="ir.actions.act_window">
-	           <field name="name">Compute Phase Scheduling</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">project.compute.phases</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-	           <field name="view_id" ref="view_project_compute_phases_select"/>
-		       <field name="context">{'record_id': active_id}</field>
-	           <field name="target">new</field>
-	           <field name="help">To schedule phases of all or a specified project. It then open a gantt view.
-	           </field>
-    	</record>
+        <record id="action_project_compute_phases" model="ir.actions.act_window">
+               <field name="name">Schedule Phases</field>
+               <field name="type">ir.actions.act_window</field>
+               <field name="res_model">project.compute.phases</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">form</field>
+               <field name="view_id" ref="view_project_compute_phases_select"/>
+               <field name="target">new</field>
+               <field name="help">To schedule phases of all or a specified project. It then open a gantt view.
+               </field>
+        </record>
 
- 		<menuitem id="menu_compute_phase" name="Compute Phase Scheduling"
-        	parent="menu_phase_schedule" action="action_project_compute_phases"/>
+        <menuitem id="menu_compute_phase"
+            parent="menu_phase_schedule" action="action_project_compute_phases"/>
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index a74cd07ddc6..24240f90a54 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -30,7 +30,7 @@ class project_compute_tasks(osv.osv_memory):
 
     def compute_date(self, cr, uid, ids, context=None):
         """
-        Schedule the tasks according to resource available and priority.
+        Schedule the tasks according to users and priority.
         """
         project_pool = self.pool.get('project.project')
         task_pool = self.pool.get('project.task')
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index e6540fafff9..bf27e7e7286 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -2,40 +2,38 @@
 <openerp>
     <data>
 
-    	<record id="view_project_compute_tasks" model="ir.ui.view">
-            <field name="name">Compute Task Scheduling</field>
+        <record id="view_project_compute_tasks" model="ir.ui.view">
+            <field name="name">Schedule Tasks</field>
             <field name="model">project.compute.tasks</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Compute Scheduling of Task">
-	                <group colspan="4">
- 					    <separator colspan="4" string="Compute Scheduling of Task for specified project." />
-                        <field name="project_id" widget="selection" colspan="4"/>
+                 <form string="Schedule Tasks">
+                    <group colspan="4">
+                        <field name="project_id" colspan="4"/>
                         <separator colspan="4"/>
                         <group colspan="2" col="2">
                         </group>
                         <group colspan="2" col="2">
                             <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            	    <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-		              </group>
-		            </group>
-			  	</form>
+                            <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
+                      </group>
+                    </group>
+                  </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_project_compute_tasks" model="ir.actions.act_window">
-	           <field name="name">Compute Task Scheduling</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">project.compute.tasks</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-	           <field name="view_id" ref="view_project_compute_tasks"/>
-		       <field name="context">{'record_id' : active_id}</field>
-	           <field name="target">new</field>
-    	</record>
+        <record id="action_project_compute_tasks" model="ir.actions.act_window">
+               <field name="name">Schedule Tasks</field>
+               <field name="type">ir.actions.act_window</field>
+               <field name="res_model">project.compute.tasks</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">form</field>
+               <field name="view_id" ref="view_project_compute_tasks"/>
+               <field name="target">new</field>
+        </record>
 
- 		<menuitem id="menu_compute_tasks" name="Compute Task Scheduling"
-        	parent="menu_phase_schedule" action="action_project_compute_tasks"/>
+         <menuitem id="menu_compute_tasks"
+            parent="menu_phase_schedule" action="action_project_compute_tasks"/>
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
deleted file mode 100644
index d446ef20183..00000000000
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ /dev/null
@@ -1,51 +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 osv import fields, osv
-
-class project_schedule_task(osv.osv_memory):
-    _name = "project.schedule.tasks"
-    _description = 'project.schedule.tasks'
-    _columns = {
-        'msg': fields.char('Message', size=64)
-    }
-    _defaults = {
-         'msg': 'Task Scheduling Completed Successfully'
-    }
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context)
-        self.compute_date(cr, uid, context=context)
-        return res
-    
-    def compute_date(self, cr, uid, context=None):
-        """
-        Schedule the tasks according to resource available and priority.
-        """
-        phase_pool = self.pool.get('project.phase')
-        if context is None:
-            context = {}
-        if not 'active_id' in context:
-            return {'type': 'ir.actions.act_window_close'}
-        return phase_pool.schedule_tasks(cr, uid, [context['active_id']], context=context)
-project_schedule_task()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_schedule_tasks_view.xml b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
deleted file mode 100644
index f8e2f2d828b..00000000000
--- a/addons/project_long_term/wizard/project_schedule_tasks_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	<record id="view_project_schedule_tasks" model="ir.ui.view">
-            <field name="name">Schedule Tasks</field>
-            <field name="model">project.schedule.tasks</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              	<form string="Schedule Tasks">
-              		  <group height="90" width="275">
-	              		  <label string="Task Scheduling completed successfully."/>
-			              <group colspan="4" col="6">
-			            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
-			              </group>
-						</group>
-			  	</form>
-            </field>
-		</record>
-
-		<record id="action_project_schedule_tasks" model="ir.actions.act_window">
-	           <field name="name">Schedule Tasks</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">project.schedule.tasks</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-	           <field name="view_id" ref="view_project_schedule_tasks"/>
-		       <field name="context">{'record_id': active_id}</field>
-	           <field name="target">new</field>
-    	</record>
-
-    </data>
-</openerp>
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index 4551d19bb1f..ba3e2e57ba5 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -21,20 +21,28 @@
 
 
 {
-    "name": "Project MailGateWay",
+    "name": "Project Tasks - Mail Integration",
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category": "Project Management",
+    "category": "Hidden",
     'complexity': "easy",
     "images": ["images/project_mailgate_task.jpeg"],
-    "depends": ["project", "mail_gateway"],
+    "depends": ["project", "mail"],
     "description": """
-This module is an interface that synchronises mails with OpenERP Project Task.
-==============================================================================
+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.
+
 
-It allows creating tasks as soon as a new mail arrives in our configured mail server.
-Moreover, it keeps track of all further communications and task states.
     """,
     "init_xml": [],
     "update_xml": ["security/ir.model.access.csv",
diff --git a/addons/project_mailgate/i18n/ca.po b/addons/project_mailgate/i18n/ca.po
index cadabcba219..ddb496c3d2b 100644
--- a/addons/project_mailgate/i18n/ca.po
+++ b/addons/project_mailgate/i18n/ca.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
-msgstr ""
+msgstr "Informació històrica"
 
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_mailgate
 #: model:ir.module.module,description:project_mailgate.module_meta_information
@@ -38,63 +38,71 @@ msgid ""
 "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"
+"    "
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjunts"
 
 #. module: project_mailgate
 #: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
 msgid "Project MailGateWay"
-msgstr ""
+msgstr "Ruta d'enllaç del projecte"
 
 #. module: project_mailgate
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_mailgate
 #: field:project.task,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:123
 #, python-format
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:149
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:143
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:129
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:135
 #, python-format
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
diff --git a/addons/project_mailgate/i18n/de.po b/addons/project_mailgate/i18n/de.po
index fe8300d9b3c..378a91ac23f 100644
--- a/addons/project_mailgate/i18n/de.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
@@ -107,21 +107,3 @@ msgstr "Im Wartezustand"
 #: view:project.task:0
 msgid "History"
 msgstr "Historie"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
index 57b135eca8a..586d1b26f7c 100644
--- a/addons/project_mailgate/i18n/es.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
@@ -106,21 +106,3 @@ msgstr "Pendiente"
 #: view:project.task:0
 msgid "History"
 msgstr "Historial"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no vá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 "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
diff --git a/addons/project_mailgate/i18n/es_MX.po b/addons/project_mailgate/i18n/es_MX.po
new file mode 100644
index 00000000000..2736d2572ac
--- /dev/null
+++ b/addons/project_mailgate/i18n/es_MX.po
@@ -0,0 +1,108 @@
+# 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
new file mode 100644
index 00000000000..2736d2572ac
--- /dev/null
+++ b/addons/project_mailgate/i18n/es_VE.po
@@ -0,0 +1,108 @@
+# 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
index d7b563f2f4b..cf85c5355e6 100644
--- a/addons/project_mailgate/i18n/fi.po
+++ b/addons/project_mailgate/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: 2011-06-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/fr.po b/addons/project_mailgate/i18n/fr.po
index 14c86daa48d..20192114e7f 100644
--- a/addons/project_mailgate/i18n/fr.po
+++ b/addons/project_mailgate/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 23:14+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/gl.po b/addons/project_mailgate/i18n/gl.po
index 4bd35afef01..9cb742ecbc5 100644
--- a/addons/project_mailgate/i18n/gl.po
+++ b/addons/project_mailgate/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/hu.po b/addons/project_mailgate/i18n/hu.po
index 625748c2058..fc655a9a70f 100644
--- a/addons/project_mailgate/i18n/hu.po
+++ b/addons/project_mailgate/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-25 13:21+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/it.po b/addons/project_mailgate/i18n/it.po
index 2ba0a646ec1..9c944186eba 100644
--- a/addons/project_mailgate/i18n/it.po
+++ b/addons/project_mailgate/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-22 09:54+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
@@ -54,7 +54,7 @@ msgstr "Allegati"
 #. module: project_mailgate
 #: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
 msgid "Project MailGateWay"
-msgstr ""
+msgstr "Ingresso Mail di Progetto"
 
 #. module: project_mailgate
 #: constraint:project.task:0
diff --git a/addons/project_mailgate/i18n/lv.po b/addons/project_mailgate/i18n/lv.po
index cbed24c309a..5e0b0ebbadd 100644
--- a/addons/project_mailgate/i18n/lv.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/mn.po b/addons/project_mailgate/i18n/mn.po
index 19024e2e7b0..d7d5af38774 100644
--- a/addons/project_mailgate/i18n/mn.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/nl.po b/addons/project_mailgate/i18n/nl.po
index ebff27f3d0b..7affcd6c210 100644
--- a/addons/project_mailgate/i18n/nl.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/pl.po b/addons/project_mailgate/i18n/pl.po
index 7be83590838..2351344b186 100644
--- a/addons/project_mailgate/i18n/pl.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
@@ -106,21 +106,3 @@ msgstr "Oczekujące"
 #: view:project.task:0
 msgid "History"
 msgstr "Historia"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
diff --git a/addons/project_mailgate/i18n/pt.po b/addons/project_mailgate/i18n/pt.po
index 5581d7cc82f..0cf8970c4eb 100644
--- a/addons/project_mailgate/i18n/pt.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/pt_BR.po b/addons/project_mailgate/i18n/pt_BR.po
index e27f6b7a1d9..5060da49f82 100644
--- a/addons/project_mailgate/i18n/pt_BR.po
+++ b/addons/project_mailgate/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
@@ -106,21 +106,3 @@ msgstr "Pendente"
 #: view:project.task:0
 msgid "History"
 msgstr "Histórico"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido 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 pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/project_mailgate/i18n/zh_CN.po b/addons/project_mailgate/i18n/zh_CN.po
index 5146601a653..55f863ebfed 100644
--- a/addons/project_mailgate/i18n/zh_CN.po
+++ b/addons/project_mailgate/i18n/zh_CN.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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
-msgstr "历史信息"
+msgstr "日志信息"
 
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
@@ -101,4 +101,4 @@ msgstr "等待中"
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index 2325d533c03..9715a32c151 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -21,121 +21,85 @@
 
 from osv import fields, osv
 from tools.translate import _
+import tools
 import binascii
 
 
 class project_tasks(osv.osv):
     _name = "project.task"
-    _inherit = ['mailgate.thread', 'project.task']
+    _inherit = ['mail.thread','project.task']
 
-    _columns={
-                'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model', '=', _name)], readonly=True),
-              }
+    _columns = {
+         'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)], readonly=True),
+    }
 
-    def message_new(self, cr, uid, msg, context=None):
-#        """
-#        Automatically calls when new email message arrives
-#
-#        @param self: The object pointer
-#        @param cr: the current row, from the database cursor,
-#        @param uid: the current user’s ID for security checks
-#        """
-        mailgate_obj = self.pool.get('email.server.tools')
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        res_id = super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
         subject = msg.get('subject')
-        body = msg.get('body')
+        body = msg.get('body_text')
         msg_from = msg.get('from')
-        #TODO map email priority with openerp task priority
-        priority = msg.get('priority') 
-
         data = {
             'name': subject,
             'description': body,
             'planned_hours': 0.0,
         }
-        res = mailgate_obj.get_partner(cr, uid, msg_from)
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
+        data.update(self.message_partner_by_email(cr, uid, msg_from))
+        self.write(cr, uid, [res_id], data, context)
+        return res_id
 
-        attachments = msg.get('attachments', [])
-        for attachment in attachments or []:
-            data_attach = {
-                'name': attachment,
-                'datas': binascii.b2a_base64(str(attachments.get(attachment))),
-                'datas_fname': attachment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
-
-        return res
-
-    def message_update(self, cr, uid, id, msg, data={}, default_act='pending'):
-        mailgate_obj = self.pool.get('email.server.tools')
-        msg_actions, body_data = mailgate_obj.msg_act_get(msg)
+    def message_update(self, cr, uid, ids, msg, data={}, default_act='pending'):
         data.update({
-            'description': body_data,
+            'description': msg['body_text'],
         })
         act = 'do_'+default_act
-        if 'state' in msg_actions:
-            if msg_actions['state'] in ['draft', 'close', 'cancel', 'open', 'pending']:
-                act = 'do_' + msg_actions['state']
 
-        for k1, k2 in [('cost', 'planned_hours')]:
-            try:
-                data[k2] = float(msg_actions[k1])
-            except:
-                pass
+        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:
+                        data[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 'priority' in msg_actions:
-            if msg_actions['priority'] in ('1', '2', '3', '4', '5'):
-                data['priority'] = msg_actions['priority']
-
-        self.write(cr, uid, [id], data)
-        getattr(self, act)(cr, uid, [id])
+        self.write(cr, uid, ids, data, context=context)
+        getattr(self,act)(cr, uid, ids, context=context)
+        self.message_append_dict(cr, uid, [res_id], msg, context=context)
         return True
 
-    def message_followers(self, cr, uid, ids, context=None):
-        res = []
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        for task in self.browse(cr, uid, select, context=context):
-            user_email = (task.user_id and task.user_id.user_email) or False
-            res += [(user_email, False, False, task.priority)]
-        if isinstance(ids, (str, int, long)):
-            return len(res) and res[0] or False
-        return res
-
-    def msg_send(self, cr, uid, id, *args, **argv):
-        return True
-
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
-        mailgate_pool = self.pool.get('mailgate.thread')
-        return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
-                                       subject=subject, email=email, \
-                                       details=details, email_from=email_from,\
-                                       message_id=message_id, attach=attach, \
-                                       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.user_email)
+            followers[task.id] = filter(None, task_followers)
+        return followers
 
     def do_draft(self, cr, uid, ids, context=None):
         res = super(project_tasks, self).do_draft(cr, uid, ids, context)
         tasks = self.browse(cr, uid, ids, context=context)
-        self._history(cr, uid, tasks, _('Draft'), context=context)
+        self.message_append(cr, uid, tasks, _('Draft'), context=context)
         return res
 
     def do_open(self, cr, uid, ids, context=None):
         res = super(project_tasks, self).do_open(cr, uid, ids, context)
         tasks = self.browse(cr, uid, ids, context=context)
-        self._history(cr, uid, tasks, _('Open'), context=context)
+        self.message_append(cr, uid, tasks, _('Open'), context=context)
         return res
 
     def do_pending(self, cr, uid, ids, context=None):
         res = super(project_tasks, self).do_pending(cr, uid, ids, context)
         tasks = self.browse(cr, uid, ids, context=context)
-        self._history(cr, uid, tasks, _('Pending'), context=context)
+        self.message_append(cr, uid, tasks, _('Pending'), context=context)
         return res
 
     def do_close(self, cr, uid, ids, context=None):
@@ -143,13 +107,13 @@ class project_tasks(osv.osv):
         tasks = self.browse(cr, uid, ids, context=context)
         for task in tasks:
             if task.state == 'done':
-                self._history(cr, uid, tasks, _('Done'), context=context)
+                self.message_append(cr, uid, tasks, _('Done'), context=context)
         return res
 
     def do_cancel(self, cr, uid, ids, context=None):
         res = super(project_tasks, self).do_cancel(cr, uid, ids, context=context)
         tasks = self.browse(cr, uid, ids, context=context)
-        self._history(cr, uid, tasks, _('Cancel'), context=context)
+        self.message_append(cr, uid, tasks, _('Cancel'), context=context)
         return res
 
 project_tasks()
diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
index 8c8816ebbd5..c3cd4bf9db2 100644
--- a/addons/project_mailgate/project_mailgate_view.xml
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -9,7 +9,7 @@
 		            <field name="arch" type="xml">
 		                <xpath expr="/form/notebook/page[@string='Extra Info']" position="before">
 		                    <page string="History">
-	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
 			                        <tree string="History">
 			                            <field name="display_text" string="History Information"/>
 			                        </tree>
@@ -19,15 +19,14 @@
 			                                <field name="date"/>
 			                                <field name="email_to" widget="char" size="512"/>
 			                                <field name="email_cc" widget="char" size="512"/>
-			                                <field name="name" colspan="4" widget="char" size="512"/>
-			                                <field name="history" invisible="1"/>
+			                                <field name="subject" colspan="4" widget="char" size="512"/>
 			                            </group>
 			                            <notebook colspan="4">
 			                                <page string="Details">
-			                                    <group attrs="{'invisible': [('history', '!=', True)]}">
-			                                        <field name="description" colspan="4" nolabel="1" height="250"/>
+			                                    <group attrs="{'invisible': [('email_from', '=', False)]}">
+			                                        <field name="body_text" colspan="4" nolabel="1" height="250"/>
 			                                    </group>
-			                                    <group attrs="{'invisible': [('history', '=', True)]}">
+			                                    <group attrs="{'invisible': [('email_from', '!=', False)]}">
 			                                        <field name="display_text" colspan="4" nolabel="1"  height="250"/>
 			                                    </group>
 			                                </page>
diff --git a/addons/project_mailgate/security/ir.model.access.csv b/addons/project_mailgate/security/ir.model.access.csv
index 1a840d89e9a..cf9a08b958d 100644
--- a/addons/project_mailgate/security/ir.model.access.csv
+++ b/addons/project_mailgate/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_mailgate_message_project_manager","project.mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,0
-"access_mailgate_message_project_user","project.mailgate.message.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
+"access_mail_message_project_manager","project.mail.message.manager","mail.model_mail_message","project.group_project_manager",1,1,1,0
+"access_mail_message_project_user","project.mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 3f1882ed376..f7e50110784 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -26,7 +26,7 @@
     "images": ["images/project_message.jpeg"],
     "depends": ["project"],
     "author": "OpenERP SA",
-    "category": 'Project Management',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
 This module provides the functionality to send messages within a project.
diff --git a/addons/project_messages/i18n/bg.po b/addons/project_messages/i18n/bg.po
index 8a07b7ad4da..b4cfec55ba7 100644
--- a/addons/project_messages/i18n/bg.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -117,6 +117,8 @@ msgid "Message From"
 msgstr "Съобщение от"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Съобщения по проект"
diff --git a/addons/project_messages/i18n/ca.po b/addons/project_messages/i18n/ca.po
index 34e8156d6f9..0349d903bb4 100644
--- a/addons/project_messages/i18n/ca.po
+++ b/addons/project_messages/i18n/ca.po
@@ -8,55 +8,55 @@ 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 21:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 20:53+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
 msgid "To"
-msgstr ""
+msgstr "Fins"
 
 #. module: project_messages
 #: model:ir.model,name:project_messages.model_project_messages
 msgid "project.messages"
-msgstr ""
+msgstr "projecte.missatges"
 
 #. module: project_messages
 #: field:project.messages,from_id:0
 msgid "From"
-msgstr ""
+msgstr "Per"
 
 #. module: project_messages
 #: model:ir.actions.act_window,name:project_messages.messages_form
 #: model:ir.ui.menu,name:project_messages.menu_messages_form
 msgid "Communication Messages"
-msgstr ""
+msgstr "Missatges de comunicació"
 
 #. module: project_messages
 #: view:project.messages:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: project_messages
 #: field:project.messages,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: project_messages
 #: view:project.messages:0
 msgid "Today"
-msgstr ""
+msgstr "Avui"
 
 #. module: project_messages
 #: help:project.messages,to_id:0
 msgid "Keep this empty to broadcast the message."
-msgstr ""
+msgstr "Mantingueu aquest buit per transmetre el missatge."
 
 #. module: project_messages
 #: model:ir.actions.act_window,name:project_messages.act_project_messages
@@ -65,14 +65,14 @@ msgstr ""
 #: view:project.project:0
 #: field:project.project,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: project_messages
 #: model:ir.model,name:project_messages.model_project_project
 #: view:project.messages:0
 #: field:project.messages,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projecte"
 
 #. module: project_messages
 #: model:ir.actions.act_window,help:project_messages.messages_form
@@ -81,6 +81,9 @@ msgid ""
 "communication between project members. The messages are stored in the system "
 "and can be used for post analysis."
 msgstr ""
+"Un sistema de missatgeria intern permet una comunicació eficient i permet el "
+"seguiment entre els membres del projecte. Els missatges s'emmagatzemen en el "
+"sistema i es pot utilitzar per a l'anàlisi posterior."
 
 #. module: project_messages
 #: model:ir.module.module,description:project_messages.module_meta_information
@@ -93,40 +96,51 @@ msgid ""
 "    it to all the users.\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul proporciona la funcionalitat d'enviar missatges en un "
+"projecte.\n"
+"    Un usuari pot enviar missatges individualment a un altre usuari. També "
+"pot enviar-los\n"
+"    a tots els usuaris del projecte.\n"
+"    "
 
 #. module: project_messages
 #: view:project.messages:0
 msgid "Message To"
-msgstr ""
+msgstr "Missatge a"
 
 #. module: project_messages
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_messages
 #: view:project.messages:0
 #: field:project.messages,message:0
 #: view:project.project:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: project_messages
 #: view:project.messages:0
 msgid "Message From"
-msgstr ""
+msgstr "Missatge de"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
-msgstr ""
+msgstr "Missatge de projectes"
 
 #. module: project_messages
 #: 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_messages
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
-msgstr ""
+msgstr "Sistema de missatges en projectes"
diff --git a/addons/project_messages/i18n/de.po b/addons/project_messages/i18n/de.po
index 94cc8a92c86..292b6b534f9 100644
--- a/addons/project_messages/i18n/de.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -128,6 +128,8 @@ msgid "Message From"
 msgstr "Mitteilung von"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Projekt Mitteilungen"
@@ -141,38 +143,3 @@ msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "Integriertes Projekt Nachrichten System"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehler in XML Quellcode für diese Ansicht!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung für Aktion"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
-#~ msgid "Group by...."
-#~ msgstr "Gruppieren..."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "An in-project messagery system permits an efficient and trackable "
-#~ "communication between project members. The messages are kept in the system "
-#~ "and can then be used for post-analysis."
-#~ msgstr ""
-#~ "Ein integriertes Benachrichtigungssystem ermöglicht eine effiziente und "
-#~ "rückverfolgbare Kommunikation zwischen den Projektmitarbeitern. Diese "
-#~ "Benachrichtigungen verbleiben im System und können für eine anschliessende "
-#~ "oder abschliessende Analyse eines Projektes verwendet werden."
diff --git a/addons/project_messages/i18n/es.po b/addons/project_messages/i18n/es.po
index 5157cd2efc2..413de0a0840 100644
--- a/addons/project_messages/i18n/es.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -128,6 +128,8 @@ msgid "Message From"
 msgstr "Mensajes de"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Mensajes de proyectos"
@@ -143,36 +145,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "Sistema de mensajes en proyectos"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la 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 "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error! No puede crear un menú recursivo."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la definición de la vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "An in-project messagery system permits an efficient and trackable "
-#~ "communication between project members. The messages are kept in the system "
-#~ "and can then be used for post-analysis."
-#~ msgstr ""
-#~ "Un sistema de mensajes en proyectos permite una comunicación eficiente y "
-#~ "trazable entre los miembros del proyecto. Los mensajes se conservan en el "
-#~ "sistema y se pueden utilizar para análisis posteriores."
diff --git a/addons/project_messages/i18n/es_MX.po b/addons/project_messages/i18n/es_MX.po
new file mode 100644
index 00000000000..398d311d7d9
--- /dev/null
+++ b/addons/project_messages/i18n/es_MX.po
@@ -0,0 +1,147 @@
+# 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-16 18:05+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Para"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "De"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr "Mensajes de comunicación"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "Mantenga este vacío para transmitir el mensaje."
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"Un sistema de mensajería interno permite una comunicación eficiente y "
+"trazable entre los miembros del proyecto. Los mensajes se almacenan en el "
+"sistema y pueden usarse para un análisis posterior."
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona la funcionalidad de enviar mensajes en un "
+"proyecto.\n"
+"    Un usuario puede enviar mensajes individualmente a otro usuario. También "
+"puede enviarlos\n"
+"    a todos los usuarios del proyecto.\n"
+"    "
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Mensaje a"
+
+#. module: project_messages
+#: 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_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Mensajes de"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Mensajes de proyectos"
+
+#. module: project_messages
+#: 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_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Sistema de mensajes en proyectos"
diff --git a/addons/project_messages/i18n/es_VE.po b/addons/project_messages/i18n/es_VE.po
new file mode 100644
index 00000000000..398d311d7d9
--- /dev/null
+++ b/addons/project_messages/i18n/es_VE.po
@@ -0,0 +1,147 @@
+# 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-16 18:05+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Para"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "De"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr "Mensajes de comunicación"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "Mantenga este vacío para transmitir el mensaje."
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"Un sistema de mensajería interno permite una comunicación eficiente y "
+"trazable entre los miembros del proyecto. Los mensajes se almacenan en el "
+"sistema y pueden usarse para un análisis posterior."
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona la funcionalidad de enviar mensajes en un "
+"proyecto.\n"
+"    Un usuario puede enviar mensajes individualmente a otro usuario. También "
+"puede enviarlos\n"
+"    a todos los usuarios del proyecto.\n"
+"    "
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Mensaje a"
+
+#. module: project_messages
+#: 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_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Mensajes de"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Mensajes de proyectos"
+
+#. module: project_messages
+#: 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_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Sistema de mensajes en proyectos"
diff --git a/addons/project_messages/i18n/fi.po b/addons/project_messages/i18n/fi.po
index b527eee221a..aa19e9713d6 100644
--- a/addons/project_messages/i18n/fi.po
+++ b/addons/project_messages/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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
diff --git a/addons/project_messages/i18n/fr.po b/addons/project_messages/i18n/fr.po
index 7f9d448a475..9747ebef4a8 100644
--- a/addons/project_messages/i18n/fr.po
+++ b/addons/project_messages/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 19:55+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -125,6 +125,8 @@ msgid "Message From"
 msgstr "Message de"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Messages du projet"
@@ -140,6 +142,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "Système de messagerie interne aux projets"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de Menu récursif."
diff --git a/addons/project_messages/i18n/gl.po b/addons/project_messages/i18n/gl.po
index cba3486cc62..666124b4e38 100644
--- a/addons/project_messages/i18n/gl.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -125,6 +125,8 @@ msgid "Message From"
 msgstr "Mensaxes de"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Mensaxes de proxectos"
diff --git a/addons/project_messages/i18n/hu.po b/addons/project_messages/i18n/hu.po
index 31110ae7ad6..a2e91544408 100644
--- a/addons/project_messages/i18n/hu.po
+++ b/addons/project_messages/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-25 13:26+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -116,6 +117,8 @@ msgid "Message From"
 msgstr ""
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Projektüzenetek"
diff --git a/addons/project_messages/i18n/it.po b/addons/project_messages/i18n/it.po
index a5eab2d29c4..9afdb99cb37 100644
--- a/addons/project_messages/i18n/it.po
+++ b/addons/project_messages/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: 2011-05-07 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -117,6 +117,8 @@ msgid "Message From"
 msgstr "Messaggio da"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Messaggi progetto"
diff --git a/addons/project_messages/i18n/lv.po b/addons/project_messages/i18n/lv.po
index 2e217b0c21d..240343092ad 100644
--- a/addons/project_messages/i18n/lv.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -117,6 +117,8 @@ msgid "Message From"
 msgstr ""
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Projekta ziņojumi"
diff --git a/addons/project_messages/i18n/mn.po b/addons/project_messages/i18n/mn.po
index 6ea9aab1dd8..a2d61e6bda5 100644
--- a/addons/project_messages/i18n/mn.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -117,6 +117,8 @@ msgid "Message From"
 msgstr "Хэнээс"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Төслийн Мессежүүд"
@@ -130,12 +132,3 @@ msgstr "Алдаа! төслийн эхлэх огноо дуусах огноо
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "Төслийн дотоод Мессежний Систем"
-
-#~ msgid ""
-#~ "An in-project messagery system permits an efficient and trackable "
-#~ "communication between project members. The messages are kept in the system "
-#~ "and can then be used for post-analysis."
-#~ msgstr ""
-#~ "Төслийн дотоод мессежний систем нь гишүүд хоорондын бүтээмжтэй холбоог "
-#~ "зөвшөөрдөг. Системд хадгалагдаж буй мессежүүд нь дараагийн шинжилгээнд "
-#~ "ашиглах боломжтой."
diff --git a/addons/project_messages/i18n/nl.po b/addons/project_messages/i18n/nl.po
index c5ee0622d95..aa21168e87f 100644
--- a/addons/project_messages/i18n/nl.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -127,6 +127,8 @@ msgid "Message From"
 msgstr "Bericht van"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Project berichten"
diff --git a/addons/project_messages/i18n/pl.po b/addons/project_messages/i18n/pl.po
index e325abf01ee..22fca508f3e 100644
--- a/addons/project_messages/i18n/pl.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -117,6 +117,8 @@ msgid "Message From"
 msgstr "Wiadomość od"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Wiadomości projektu"
@@ -130,18 +132,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "System wiadomości wewnątrzprojektowych"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
diff --git a/addons/project_messages/i18n/pt.po b/addons/project_messages/i18n/pt.po
index 9db6d377276..52fb291fa34 100644
--- a/addons/project_messages/i18n/pt.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -117,6 +117,8 @@ msgid "Message From"
 msgstr "Mensagem de"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr ""
diff --git a/addons/project_messages/i18n/pt_BR.po b/addons/project_messages/i18n/pt_BR.po
index ee55f39bd0c..1e10876ca80 100644
--- a/addons/project_messages/i18n/pt_BR.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -117,6 +117,8 @@ msgid "Message From"
 msgstr "Mensagem De"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr "Mensagens do Projeto"
@@ -130,36 +132,3 @@ msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "Sistema de Mensagens Em-Projeto"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid ""
-#~ "An in-project messagery system permits an efficient and trackable "
-#~ "communication between project members. The messages are kept in the system "
-#~ "and can then be used for post-analysis."
-#~ msgstr ""
-#~ "Um sistema mensageiro em-projeto permite uma comunicação eficiente e "
-#~ "rastreável entre os membro do projeto. As mensagens são mantidas no sistema "
-#~ "e podem ser utilizadas em análises posteriores."
diff --git a/addons/project_messages/i18n/sr.po b/addons/project_messages/i18n/sr.po
index 7ad9e142191..5e0c9c23302 100644
--- a/addons/project_messages/i18n/sr.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -124,6 +124,8 @@ msgid "Message From"
 msgstr "Poruka od"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr ""
@@ -137,17 +139,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "Projektni sistem dopisivanja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
diff --git a/addons/project_messages/i18n/sr@latin.po b/addons/project_messages/i18n/sr@latin.po
index 4c92cf47283..13fb624a7c5 100644
--- a/addons/project_messages/i18n/sr@latin.po
+++ b/addons/project_messages/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
@@ -124,6 +124,8 @@ msgid "Message From"
 msgstr "Poruka od"
 
 #. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr ""
@@ -137,17 +139,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
 msgid "In-Project Messaging System"
 msgstr "Projektni sistem dopisivanja"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
diff --git a/addons/project_messages/i18n/zh_CN.po b/addons/project_messages/i18n/zh_CN.po
index 51983dae2b3..48ed0f33085 100644
--- a/addons/project_messages/i18n/zh_CN.po
+++ b/addons/project_messages/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: 2011-07-03 04:47+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_messages
 #: field:project.messages,to_id:0
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 027403b84f3..f8c98d15785 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -70,7 +70,7 @@
            <field name="arch" type="xml">
                <search string="Project Messages">
                		<group>
-                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-go-today" string="Today"  domain="[('create_date','&gt;=',time.strftime('%%Y-%%m-%%d')),('create_date','&lt;', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                			<field name="project_id"/>
                         <field name="from_id"/>
@@ -78,7 +78,7 @@
                         <field name="message"/>
                		</group>
                		<newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/>
                         <filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py
index 364dec5a437..df4f0fa8a52 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/project_mrp/__init__.py
@@ -21,3 +21,5 @@
 
 import project_procurement
 import project_mrp
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 86520a0cc78..3cb2fb40179 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Automatic task creation from procurement lines',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 Automatically creates project tasks from procurement lines
diff --git a/addons/project_mrp/i18n/ar.po b/addons/project_mrp/i18n/ar.po
index 0279dee668c..1b3a763a7f9 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/bg.po b/addons/project_mrp/i18n/bg.po
index c3dd7741db5..e2c0eeb613b 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/bs.po b/addons/project_mrp/i18n/bs.po
index 0279dee668c..1b3a763a7f9 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/ca.po b/addons/project_mrp/i18n/ca.po
index 6fa3e5977b4..67ba0bc5d62 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/cs.po b/addons/project_mrp/i18n/cs.po
index 0279dee668c..91446294539 100644
--- a/addons/project_mrp/i18n/cs.po
+++ b/addons/project_mrp/i18n/cs.po
@@ -4,68 +4,69 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-05 06:12+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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "Pro každý výrobek, při typu služby a při příkazu"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procurement Task"
-msgstr ""
+msgstr "Úloha zásobování"
 
 #. module: project_mrp
 #: model:ir.module.module,shortdesc:project_mrp.module_meta_information
 msgid "Procurement and Project Management integration"
-msgstr ""
+msgstr "Integrace zásobování a projektového řízení"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr ""
+msgstr "Pokud typ výrobku je služby, tak je vytvořen úkol."
 
 #. 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 "pokud je typ 'služba', pak vytvoří úkol."
 
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní úkoly."
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Výrobek"
 
 #. module: project_mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Chyba: Neplatný kód ean"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_procurement_order
 #: field:project.task,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "Zásobování"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
@@ -73,27 +74,27 @@ msgstr ""
 #: model:process.node,name:project_mrp.process_node_procuretasktask0
 #: field:procurement.order,task_id:0
 msgid "Task"
-msgstr ""
+msgstr "Úkol"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr ""
+msgstr "Úkol je vytvořen k poskytování služby."
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
 msgid "Order Task"
-msgstr ""
+msgstr "Příkaz úkolu"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
 msgid "Sale Order Task"
-msgstr ""
+msgstr "Úkol prodejního příkazu"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
 msgid "Create Task"
-msgstr ""
+msgstr "Vytvořit úkol"
 
 #. module: project_mrp
 #: model:ir.module.module,description:project_mrp.module_meta_information
@@ -120,13 +121,35 @@ msgid ""
 "automatically created via sale orders.\n"
 "\n"
 msgstr ""
+"\n"
+"Tento modul vytváří spojení mezi zásobovacími příkazy\n"
+"obsahujícími řádky \"služby\" a úkoly projektového řízení.\n"
+"\n"
+"Když je instalováno, tak tento modul automaticky vytvoří nový úkol\n"
+"pro každý řádek příkazu zásobování, pokud odopvídající výrobek\n"
+"splňuje následující vlastnosti:\n"
+"  * Typ = Služba\n"
+"  * Metoda zásobování (Splnění příkazu) = MTO (udělat na příkaz)\n"
+"  * Metoda dodání/zásobování = Vyrobit\n"
+"\n"
+"Nový úkol je vytvořen mimo existující projekt, ale \n"
+"může být do projektu přidán ručně.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
 
 #. 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 ""
+"Pokud je metoda zásobování Udělat na příkaz a metoda dodání je výroba"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "V případě, kdy prodáváte služby pomocí prodejního příkazu"
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index 64906825b1c..5c28b66323a 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -175,21 +175,3 @@ msgstr ""
 
 #~ msgid "Procure Task"
 #~ msgstr "Beschaffung Aufgabe"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen \r\n"
-#~ "beinhalten"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "ungültige XML Architektur"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/project_mrp/i18n/el.po b/addons/project_mrp/i18n/el.po
index 7b1f414cca5..fcd8c8fc96e 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2db54603938..b1ba89279ec 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -164,21 +164,3 @@ msgstr "En caso que venda servicios sobre pedido de venta"
 
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Gestión de proyectos - Integración con MRP y ventas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura 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 "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/project_mrp/i18n/es_AR.po
index 40ccddff664..f8b303a73c6 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/es_EC.po b/addons/project_mrp/i18n/es_EC.po
index b525f569dc6..ae8fd797026 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/es_MX.po b/addons/project_mrp/i18n/es_MX.po
new file mode 100644
index 00000000000..521b5e8cd02
--- /dev/null
+++ b/addons/project_mrp/i18n/es_MX.po
@@ -0,0 +1,166 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_mrp
+#
+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-29 13:16+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: 2011-09-05 05:27+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "Para cada producto, sobre tipo servicio y sobre orden"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Tarea abastecimiento"
+
+#. module: project_mrp
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
+msgstr "Integración de abastecimientos y gestión de proyectos"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "Tipo de producto es servicio, luego se crea la tarea."
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "si tipo de producto es 'servicio' entonces se crea la tarea."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "Se crea una tarea para proveer el servicio."
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "Tarea orden"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "Tarea pedido de venta"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "Crear tarea"
+
+#. module: project_mrp
+#: model:ir.module.module,description:project_mrp.module_meta_information
+msgid ""
+"\n"
+"This module creates a link between procurement orders\n"
+"containing \"service\" lines and project management tasks.\n"
+"\n"
+"When installed, this module will automatically create a new task\n"
+"for each procurement order line, when the corresponding product\n"
+"meets the following characteristics:\n"
+"  * Type = Service\n"
+"  * Procurement method (Order fulfillment) = MTO (make to order)\n"
+"  * Supply/Procurement method = Produce\n"
+"\n"
+"The new task is created outside of any existing project, but\n"
+"can be added to a project manually.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
+msgstr ""
+"\n"
+"Este módulo crea un enlace entre órdenes de abastecimiento\n"
+"conteniendo líneas de \"servicio\" y tareas de gestión de proyectos.\n"
+"\n"
+"Cuando se instala, este módulo creará una nueva tarea por cada línea\n"
+"de orden de abastecimiento, cuando el producto correspondiente\n"
+"cumpla las siguientes características:\n"
+"  * Tipo = Servicio\n"
+"  * Método abastecimiento (cubrir el pedido) = OBP (obtener bajo pedido)\n"
+"  * Método suministro/abastecimiento = Producir\n"
+"\n"
+"La nueva tarea se crea fuera de los proyectos existentes, pero\n"
+"puede ser añadida a un proyecto manualmente.\n"
+"\n"
+"Cuando la tarea de proyecto se completa o cancela, consecuentemente\n"
+"se actualiza el flujo de trabajo de la correspondiente línea de "
+"abastecimiento.\n"
+"\n"
+"Este módulo es útil para poder facturar servicios basados en tareas creadas\n"
+"automáticamente a través de pedidos de venta.\n"
+"\n"
+
+#. 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 ""
+"Si método abastecimiento es Obtener bajo pedido y método suministro es "
+"Producir"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "En caso que venda servicios sobre pedido de venta"
+
+#~ msgid "If procure method is Make to order and supply method is produce"
+#~ msgstr ""
+#~ "si método de abastecimiento es Fabricar bajo pedido y método de suministro "
+#~ "es Producir"
+
+#~ msgid "Procure Task"
+#~ msgstr "Tarea abastecimiento"
+
+#~ msgid "Project Management - MRP and Sale Integration"
+#~ msgstr "Gestión de proyectos - Integración con MRP y ventas"
diff --git a/addons/project_mrp/i18n/es_VE.po b/addons/project_mrp/i18n/es_VE.po
new file mode 100644
index 00000000000..521b5e8cd02
--- /dev/null
+++ b/addons/project_mrp/i18n/es_VE.po
@@ -0,0 +1,166 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_mrp
+#
+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-29 13:16+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: 2011-09-05 05:27+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "Para cada producto, sobre tipo servicio y sobre orden"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Tarea abastecimiento"
+
+#. module: project_mrp
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
+msgstr "Integración de abastecimientos y gestión de proyectos"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "Tipo de producto es servicio, luego se crea la tarea."
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "si tipo de producto es 'servicio' entonces se crea la tarea."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "Se crea una tarea para proveer el servicio."
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "Tarea orden"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "Tarea pedido de venta"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "Crear tarea"
+
+#. module: project_mrp
+#: model:ir.module.module,description:project_mrp.module_meta_information
+msgid ""
+"\n"
+"This module creates a link between procurement orders\n"
+"containing \"service\" lines and project management tasks.\n"
+"\n"
+"When installed, this module will automatically create a new task\n"
+"for each procurement order line, when the corresponding product\n"
+"meets the following characteristics:\n"
+"  * Type = Service\n"
+"  * Procurement method (Order fulfillment) = MTO (make to order)\n"
+"  * Supply/Procurement method = Produce\n"
+"\n"
+"The new task is created outside of any existing project, but\n"
+"can be added to a project manually.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
+msgstr ""
+"\n"
+"Este módulo crea un enlace entre órdenes de abastecimiento\n"
+"conteniendo líneas de \"servicio\" y tareas de gestión de proyectos.\n"
+"\n"
+"Cuando se instala, este módulo creará una nueva tarea por cada línea\n"
+"de orden de abastecimiento, cuando el producto correspondiente\n"
+"cumpla las siguientes características:\n"
+"  * Tipo = Servicio\n"
+"  * Método abastecimiento (cubrir el pedido) = OBP (obtener bajo pedido)\n"
+"  * Método suministro/abastecimiento = Producir\n"
+"\n"
+"La nueva tarea se crea fuera de los proyectos existentes, pero\n"
+"puede ser añadida a un proyecto manualmente.\n"
+"\n"
+"Cuando la tarea de proyecto se completa o cancela, consecuentemente\n"
+"se actualiza el flujo de trabajo de la correspondiente línea de "
+"abastecimiento.\n"
+"\n"
+"Este módulo es útil para poder facturar servicios basados en tareas creadas\n"
+"automáticamente a través de pedidos de venta.\n"
+"\n"
+
+#. 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 ""
+"Si método abastecimiento es Obtener bajo pedido y método suministro es "
+"Producir"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "En caso que venda servicios sobre pedido de venta"
+
+#~ msgid "If procure method is Make to order and supply method is produce"
+#~ msgstr ""
+#~ "si método de abastecimiento es Fabricar bajo pedido y método de suministro "
+#~ "es Producir"
+
+#~ msgid "Procure Task"
+#~ msgstr "Tarea abastecimiento"
+
+#~ msgid "Project Management - MRP and Sale Integration"
+#~ msgstr "Gestión de proyectos - Integración con MRP y ventas"
diff --git a/addons/project_mrp/i18n/et.po b/addons/project_mrp/i18n/et.po
index 50bf0329e9e..3710a587a26 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/fi.po b/addons/project_mrp/i18n/fi.po
index 4fda4ed837b..f8e85129323 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: 2011-06-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/fr.po b/addons/project_mrp/i18n/fr.po
index 138d2d548c7..2f8b634089b 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -66,7 +66,7 @@ msgstr "Projet"
 #: model:ir.model,name:project_mrp.model_procurement_order
 #: field:project.task,procurement_id:0
 msgid "Procurement"
-msgstr "Besoin"
+msgstr "Approvisionnement"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
@@ -130,7 +130,7 @@ msgstr ""
 "correspondant\n"
 "rencontre les caractéristiques suivantes :\n"
 "  * Type = Service\n"
-"  * Méthode d'approvisionnement = Fabrication à la commande\n"
+"  * Méthode d'approvisionnement = Production à la demande\n"
 "  * Méthode de fourniture = Produire\n"
 "\n"
 "La nouvelle tâche est créée en dehors de tout projet existant, mais elle "
@@ -149,7 +149,7 @@ msgstr ""
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
-"Si la méthode d'approvisionnement est \"Fabrication à la commande\" et la "
+"Si la méthode d'approvisionnement est \"Production à la demande\" et la "
 "méthode de fourniture est \"Produire\""
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/gl.po b/addons/project_mrp/i18n/gl.po
index b1f32f244a9..733834001fe 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index 82d58b10c62..a5bf98634cf 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/hu.po b/addons/project_mrp/i18n/hu.po
index 187e1566e60..8ced5ff8f05 100644
--- a/addons/project_mrp/i18n/hu.po
+++ b/addons/project_mrp/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-07 16:26+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/id.po b/addons/project_mrp/i18n/id.po
index 0b9354eac65..0eb6e858029 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/it.po b/addons/project_mrp/i18n/it.po
index 7601f2ef57e..c55503a9f4f 100644
--- a/addons/project_mrp/i18n/it.po
+++ b/addons/project_mrp/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-17 06:31+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/ko.po b/addons/project_mrp/i18n/ko.po
index ad8fb5ff3ff..38def37bf8c 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/lt.po b/addons/project_mrp/i18n/lt.po
index 0279dee668c..1b3a763a7f9 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/lv.po b/addons/project_mrp/i18n/lv.po
index 0007bdff52c..408e1855cb1 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/nl.po b/addons/project_mrp/i18n/nl.po
index c4a620f7135..59951b591d2 100644
--- a/addons/project_mrp/i18n/nl.po
+++ b/addons/project_mrp/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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/project_mrp/i18n/nl_BE.po
index 97e40cf6d43..0f4242971ec 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 2ec814c209d..97430cc4114 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/pt.po b/addons/project_mrp/i18n/pt.po
index eeb7c57b741..f5d0ebe9b0e 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/project_mrp/i18n/pt_BR.po
index fcbef9d42e9..7fd36767ba6 100644
--- a/addons/project_mrp/i18n/pt_BR.po
+++ b/addons/project_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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/ro.po b/addons/project_mrp/i18n/ro.po
index 0279dee668c..1b3a763a7f9 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/ru.po b/addons/project_mrp/i18n/ru.po
index a5aba14b3b6..0643545fd9f 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/sl.po b/addons/project_mrp/i18n/sl.po
index 7986ff51743..b8ee61698bc 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/sq.po b/addons/project_mrp/i18n/sq.po
index a18b4677176..ef12f78d559 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/sv.po b/addons/project_mrp/i18n/sv.po
index e43597494ca..48787eb3a49 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/project_mrp/i18n/tlh.po
index 1b625c73066..5e5c762bd31 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 6a849661850..f04f0fe433d 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/uk.po b/addons/project_mrp/i18n/uk.po
index 5a5f167bfe6..8fab240bf49 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/vi.po b/addons/project_mrp/i18n/vi.po
index 763aa81b645..d57834bac38 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index f22ea2897d3..b3bc2c08360 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-03-20 09:49+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -24,12 +24,12 @@ msgstr "订单的每个产品和服务"
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procurement Task"
-msgstr ""
+msgstr "需求任务"
 
 #. module: project_mrp
 #: model:ir.module.module,shortdesc:project_mrp.module_meta_information
 msgid "Procurement and Project Management integration"
-msgstr ""
+msgstr "补货流程和项目管理的集成"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
@@ -44,28 +44,28 @@ msgstr "如果采购类型是服务创建这任务"
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "错误！不能创建循环引用的任务"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: project_mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_procurement_order
 #: field:project.task,procurement_id:0
 msgid "Procurement"
-msgstr "获得"
+msgstr "需求"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
@@ -120,11 +120,25 @@ msgid ""
 "automatically created via sale orders.\n"
 "\n"
 msgstr ""
+"\n"
+"这个模块在包含服务类产品的需求单和项目管理的任务之间建立了联系\n"
+"\n"
+"安装了这个模块以后，只要满足下列条件，就会为需求单的每个行创建一个任务：\n"
+"  产品类型为服务型\n"
+"  补货方式为按订单\n"
+"  供应方式为自制\n"
+"\n"
+"新任务不属于任何项目，但可以手工指定给项目。\n"
+"\n"
+"当任务完成或取消后，补货单的对应行状态也会更新。\n"
+"\n"
+"这个模块适用于针对任务开发票的公司按订单创建任务。\n"
+"\n"
 
 #. 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 "如果补货方式为按订单而且供应方式为自制"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/project_mrp/i18n/zh_TW.po
index 6005dd87e99..916ded992f5 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: 2011-04-29 05:23+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index b027e9eb60f..3bbb0658b11 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -26,7 +26,8 @@ class project_task(osv.osv):
     _name = "project.task"
     _inherit = "project.task"
     _columns = {
-        'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null')
+        'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null'),
+        'sale_line_id': fields.related('procurement_id', 'sale_line_id', type='many2one', relation='sale.order.line', store=True, string='Sale Order Line'),
     }
 
     def _validate_subflows(self, cr, uid, ids):
@@ -44,7 +45,6 @@ class project_task(osv.osv):
         res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
         self._validate_subflows(cr, uid, ids)
         return res
-
 project_task()
 
 class product_product(osv.osv):
@@ -54,5 +54,58 @@ class product_product(osv.osv):
     }
 product_product()
 
+class sale_order(osv.osv):
+    _inherit ='sale.order'
 
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, *args):
+        proc_data = super(sale_order, self)._prepare_order_line_procurement(cr,
+                uid, order, line, move_id, date_planned, *args)
+        proc_data['sale_line_id'] = line.id
+        return proc_data
+
+    def _picked_rate(self, cr, uid, ids, name, arg, context=None):
+        if not ids:
+            return {}
+        res_sale = {}
+        res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
+        cr.execute('''select sol.order_id as sale_id, t.state as task_state ,
+                    t.id as task_id, sum(sol.product_uom_qty) as total
+                    from project_task as t
+                    left join sale_order_line as sol on sol.id = t.sale_line_id
+                    where sol.order_id in %s group by sol.order_id,t.state,t.id ''',(tuple(ids),))
+        sale_task_data = cr.dictfetchall()
+
+        if not sale_task_data:
+            return res
+
+        for id in ids:
+            res_sale[id] = {
+                'number_of_done': 0,
+                'total_no_task': 0,
+            }
+        #compute the sum of quantity for each SO
+        cr.execute('''select sol.order_id as sale_id, sum(sol.product_uom_qty) as total
+                    from sale_order_line sol where sol.order_id in %s group by sol.order_id''',(tuple(ids),))
+        total_qtty_ref = cr.dictfetchall()
+        for item in total_qtty_ref:
+            res_sale[item['sale_id']]['number_of_stockable'] = item['total']
+
+        for item in sale_task_data:
+            res_sale[item['sale_id']]['total_no_task'] += item['total']
+            if item['task_state'] == 'done':
+                res_sale[item['sale_id']]['number_of_done'] += item['total']
+
+        for sale in self.browse(cr, uid, ids, context=context):
+            res_sale[sale.id]['number_of_stockable'] -= res_sale[sale.id]['total_no_task']
+            #adjust previously percentage because now we must also count the product of type service
+            res[sale.id] = res[sale.id] * float(res_sale[sale.id]['number_of_stockable']) / (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
+            #add the task
+            res[sale.id] += res_sale[sale.id]['number_of_done'] * 100 /  (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
+        return res
+
+    _columns = {
+        'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
+    }
+
+sale_order()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index c8ed6fbc447..b5ce4e8190d 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -24,7 +24,18 @@
                 </field>
             </field>
         </record>
-    
+        
+    <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
+            <field name="name">project.mrp.form.view.inherit</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+            <xpath expr="/form/notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
+                <field name="sale_line_id"/>
+            </xpath>    
+            </field>
+        </record>  
     </data>
 </openerp>
-        
\ No newline at end of file
+        
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 0a7fa12ce6f..2c9732478fb 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -19,23 +19,38 @@
 #
 ##############################################################################
 
-from osv import fields, osv, orm
-
-import tools
+from osv import fields, osv
 
 class procurement_order(osv.osv):
     _name = "procurement.order"
     _inherit = "procurement.order"
     _columns = {
-        'task_id': fields.many2one('project.task', 'Task')
+        'task_id': fields.many2one('project.task', 'Task'),
+        'sale_line_id': fields.many2one('sale.order.line', 'Sale order line')
     }
+
     def check_produce_service(self, cr, uid, procurement, context=None):
         return True
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
+        project_obj = self.pool.get('project.project')
+        uom_obj = self.pool.get('product.uom')
+        default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
         for procurement in self.browse(cr, uid, ids, context=context):
+            project_id = False
+            if procurement.product_id.project_id:
+                project_id = procurement.product_id.project_id.id
+            elif procurement.sale_line_id:
+                account_id = procurement.sale_line_id.order_id.project_id.id
+                if account_id:
+                    project_ids = project_obj.search(cr, uid, [('analytic_account_id', '=', account_id)])
+                    project_id = project_ids and project_ids[0] or False
+            if procurement.product_uom.id != default_uom:
+                planned_hours = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, default_uom)
+            else:
+                planned_hours = procurement.product_qty
+
             self.write(cr, uid, [procurement.id], {'state': 'running'})
-            planned_hours = procurement.product_qty
             task_id = self.pool.get('project.task').create(cr, uid, {
                 'name': '%s:%s' % (procurement.origin or '', procurement.product_id.name),
                 'date_deadline': procurement.date_planned,
@@ -46,11 +61,11 @@ class procurement_order(osv.osv):
                 'procurement_id': procurement.id,
                 'description': procurement.note,
                 'date_deadline': procurement.date_planned,
-                'project_id': procurement.product_id.project_id and procurement.product_id.project_id.id or False,
+                'project_id':  project_id,
                 'state': 'draft',
                 'company_id': procurement.company_id.id,
             },context=context)
-            self.write(cr, uid, [procurement.id],{'task_id':task_id}) 
+            self.write(cr, uid, [procurement.id],{'task_id':task_id})
         return task_id
 
 procurement_order()
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
index faf99dc5419..b2cc6a68363 100644
--- a/addons/project_mrp/test/project_task_procurement.yml
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -1,10 +1,11 @@
--
-  In order to test project_mrp module with OpenERP I want to create sale orders 
-  with product type 'service' so when procurement runs one task is created.
+- |
+  In order to test project_mrp module with OpenERP I create a sale order
+  with product type 'service' so when procurement runs one task is created for
+  the project associated with my sale order.
 -
   I create record for a service type product.
 -
-  !record {model: product.product, id: product_product_partnerstraining0}:
+  !record {model: product.product, id: product_product_partnerstraining0, view: False}:
     categ_id: product.product_category_7
     cost_method: standard
     mes_type: fixed
@@ -15,8 +16,9 @@
     uom_id: product.uom_day
     uom_po_id: product.uom_day
     warranty: 0.0
-- 
-  I create a sale order for product Partners Training which has type 'Service'.
+- |
+  I create a sale order for product Partners Training which has type 'Service',
+  and select the appropriate Analytic Account matching my project.
 - 
   !record {model: sale.order, id: sale_order_so0}:
     date_order: !eval time.strftime('%Y-%m-%d')
@@ -40,6 +42,13 @@
     pricelist_id: product.list0
     shop_id: sale.shop
     user_id: base.user_demo
+
+- I select the Analytic Account for my project on the sale order 
+- 
+  !python {model: sale.order}: |
+    acc_id = self.pool.get('project.project').browse(cr, uid,
+        ref('project.project_integrate_openerp')).analytic_account_id.id
+    self.write(cr, uid, ref('sale_order_so0'), {'project_id': acc_id})
 -
   I confirm this sale order.
 -
@@ -60,11 +69,15 @@
     - model: procurement.order
       search: "[]"
 -
-  Now I check that one task is created for my sale order.
+  Now I check that one task is created for my sale order, in the desired project
 -
   !python {model: project.task}: |
     order_obj = self.pool.get('sale.order')
-    order = order_obj.browse(cr, uid, ref('sale_order_so0')) 
-    task_id = self.search(cr, uid, [('name','like', order.name)]) 
-    assert task_id, 'No Task is created!'
-
+    order = order_obj.browse(cr, uid, ref('sale_order_so0'))
+    # planned_hours == 40 because default company project UOM is hours, and
+    # product was sold as 5.0 days.
+    task_id = self.search(cr, uid, [('name', '=', order.name+":Partners Training"),
+                                    ('project_id','=', ref('project.project_integrate_openerp')),
+                                    ('planned_hours','=', 40.0),
+                                    ('state','=','draft')])
+    assert task_id, 'Expected Task not found!'
\ No newline at end of file
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 537170d4e3d..9ce5e8a2d9a 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Planning Management Module',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """Keep track of your planning
 This module helps you to manage your plannings.
diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml
index 867dba5767f..db29a7f067a 100644
--- a/addons/project_planning/board_project_planning_view.xml
+++ b/addons/project_planning/board_project_planning_view.xml
@@ -5,11 +5,11 @@
         <record id="board_project_planning_form" model="ir.ui.view">
             <field name="name">board.project.planning.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="project.board_project_form"/>              
+			<field name="inherit_id" ref="project.board_project_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1/action[@string='My Open Tasks']" position="after"> 
-				<action colspan="4" name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
+      		<xpath expr="/form/board/column/action[@string='My Open Tasks']" position="after">
+				<action name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
 			</xpath>
             </field>
         </record>
diff --git a/addons/project_planning/i18n/ar.po b/addons/project_planning/i18n/ar.po
index 3b07df22375..7137fe5cb8b 100644
--- a/addons/project_planning/i18n/ar.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/bg.po b/addons/project_planning/i18n/bg.po
index 91ddcf28593..1a5b83858ae 100644
--- a/addons/project_planning/i18n/bg.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -584,12 +584,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
diff --git a/addons/project_planning/i18n/bs.po b/addons/project_planning/i18n/bs.po
index 01c39887a95..a884f5561d6 100644
--- a/addons/project_planning/i18n/bs.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,6 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/project_planning/i18n/ca.po b/addons/project_planning/i18n/ca.po
index 71ea6bea812..48d259c605a 100644
--- a/addons/project_planning/i18n/ca.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -23,6 +23,8 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"Error! La moneda ha de ser la mateixa que la moneda de la companyia "
+"seleccionada."
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,tasks:0
@@ -31,6 +33,8 @@ msgid ""
 "This value is given by the sum of work remaining to do on the task for this "
 "planning, expressed in days."
 msgstr ""
+"Aquest valor ve donat per la suma de treball que queda per fer en la tasca "
+"d'aquesta planificació, expressat en dies."
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
@@ -48,7 +52,7 @@ msgstr "Línia de planificació"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Unallocated Time"
-msgstr ""
+msgstr "Temps total no assignat"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,name:0
@@ -58,12 +62,12 @@ msgstr "Nom planificació"
 #. module: project_planning
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_planning
 #: view:board.board:0
 msgid "My Project's planning"
-msgstr ""
+msgstr "Les meves planificacions de projectes"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,timesheet:0
@@ -76,7 +80,7 @@ msgstr "Full d'assistència"
 #. module: project_planning
 #: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Planning Management Module"
-msgstr ""
+msgstr "Mòdul per la gestió de la planificació"
 
 #. module: project_planning
 #: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
@@ -85,35 +89,39 @@ msgid ""
 "material), OpenERP allows you to encode and then automatically compute tasks "
 "and phases scheduling, track resource allocation and availability."
 msgstr ""
+"Amb el seu sistema global per planificar tots els recursos d'una empresa "
+"(persones i materials), OpenERP li permet codificar i calcular "
+"automàticament la planificació de tasques i fases, i controlar l'assignació "
+"i disponibilitat de recursos."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Total planned tasks"
-msgstr ""
+msgstr "Total de tasques planificades"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Comptabilitat"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: project_planning
 #: field:account.analytic.account,planning_ids:0
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
 msgid "Plannings"
-msgstr ""
+msgstr "Planificacions"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -123,35 +131,37 @@ msgstr "Projecte"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Start Task"
-msgstr ""
+msgstr "Inicia tasca"
 
 #. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Total Planned (in Days)"
-msgstr ""
+msgstr "Planificació total (en dies)"
 
 #. module: project_planning
 #: constraint:report_account_analytic.planning:0
 msgid ""
 "Invalid planning ! Planning dates can't overlap for the same responsible. "
 msgstr ""
+"Planificació invàlida! Les dates de planificació no es poden superposar per "
+"al mateix càrrec. "
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_account:0
 msgid "Planning By Account"
-msgstr ""
+msgstr "Planificació per compte"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Current Plannings"
-msgstr ""
+msgstr "Planificacions actuals"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_account_analytic_account
@@ -161,17 +171,17 @@ msgstr "Compte analític"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Canvia a esborrany"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informació extra"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "To :"
-msgstr ""
+msgstr "Per:"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,timesheet:0
@@ -180,28 +190,31 @@ msgid ""
 "This value is given by the sum of all work encoded in the timesheet(s) "
 "between the 'Date From' and 'Date To' of the planning."
 msgstr ""
+"Aquest valor ve donat per la suma de tots els treballs codificats en la/es "
+"fulla/es de serveis entre la 'Data des de' i la 'Data fins' de la "
+"planificació."
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! No podeu crear comptes analítics recursius."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_open:0
 #: field:report_account_analytic.planning.user,plan_open:0
 msgid "Time Allocation without Tasks"
-msgstr ""
+msgstr "Temps d'assignació sense tasques"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 msgid "Planning Lines"
-msgstr ""
+msgstr "Línies planificades"
 
 #. module: project_planning
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No podeu crear companyies recursives."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,account_id:0
@@ -215,16 +228,18 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to FALSE, expressed in days."
 msgstr ""
+"Aquest valor ve donat per la suma de l'assignació de temps amb l'opció "
+"'Assignat en tasques' desmarcada, expressat en dies."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Varis"
 
 #. module: project_planning
 #: help:res.company,planning_time_mode_id:0
 msgid "This will set the unit of measure used in plannings."
-msgstr ""
+msgstr "Això establirà la unitat de mesura utilitzada en les planificacions."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -235,7 +250,7 @@ msgstr "Planificació RRHH"
 #: field:report_account_analytic.planning.account,tasks:0
 #: field:report_account_analytic.planning.user,tasks:0
 msgid "Remaining Tasks"
-msgstr ""
+msgstr "Tasques pendents"
 
 #. module: project_planning
 #: view:account.analytic.account:0
@@ -259,12 +274,12 @@ msgstr "Total planejat"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
-msgstr ""
+msgstr "Codificació del temps"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,free:0
 msgid "Unallocated Time"
-msgstr ""
+msgstr "Temps no assignat"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
@@ -272,11 +287,13 @@ msgid ""
 "This value is given by the sum of time allocation without task(s) linked, "
 "expressed in days."
 msgstr ""
+"Aquest valor ve donat per la suma de l'assignació de temps sense tasca/ques "
+"vinculada/es, expressat en dies."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegat"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,free:0
@@ -284,6 +301,8 @@ msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
 msgstr ""
+"Calculat com a dies laborables - (Temps d'assignació de les tasques + Temps "
+"d'assignació sense tasques + Absències de vacances)"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
@@ -291,6 +310,8 @@ msgid ""
 "Set here the number of working days within this planning for one person full "
 "time"
 msgstr ""
+"Indiqueu aquí el número de dies de treball dins d'aquesta planificació per "
+"una persona a temps complet."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -300,12 +321,12 @@ msgstr "["
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "From :"
-msgstr ""
+msgstr "De:"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_user_ids:0
 msgid "Planning By User"
-msgstr ""
+msgstr "Planificació per usuari"
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.act_task_of_lines
@@ -317,12 +338,12 @@ msgstr "Tasques"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By Account (in Days)"
-msgstr ""
+msgstr "Planificació per compte (en dies)"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without tasks"
-msgstr ""
+msgstr "Temps sense tasques"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
@@ -332,7 +353,7 @@ msgstr "Data inicial"
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "Total lliure"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
@@ -340,6 +361,8 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to TRUE expressed in days."
 msgstr ""
+"Aquest valor ve donat per la suma de l'assignació de temps amb l'opció "
+"\"Assignat en tasques\" marcada expressat en dies."
 
 #. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
@@ -360,7 +383,7 @@ msgstr "Nota"
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
@@ -371,12 +394,12 @@ msgstr "Planificació per compte"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned Days"
-msgstr ""
+msgstr "Dies planificats"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,state:0
@@ -389,6 +412,8 @@ msgid ""
 "This value is given by the total of validated leaves into the 'Date From' "
 "and 'Date To' of the planning."
 msgstr ""
+"Aquest valor ve donat pel total de les absències validades entre la 'Data "
+"des de' i la 'Data fins a' de la planificació."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -401,7 +426,7 @@ msgstr "Usuari"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Remaining Tasks"
-msgstr ""
+msgstr "Total de tasques pendents"
 
 #. module: project_planning
 #: model:ir.module.module,description:project_planning.module_meta_information
@@ -422,21 +447,38 @@ msgid ""
 "At the end of the month, the planning manager can also check if the encoded "
 "timesheets are respecting the planned time on each analytic account.\n"
 msgstr ""
+"\n"
+"Aquest mòdul li permet gestionar les seves planificacions.\n"
+"\n"
+"Aquest mòdul es basa en la comptabilitat analítica i està totalment integrat "
+"amb\n"
+"* la codificació de fulles de serveis\n"
+"* la gestió de les vacances/festes\n"
+"* la gestió de projectes\n"
+"\n"
+"D'aquesta forma, cada responsable de departament pot saber si algú en el seu "
+"equip encara té temps no assignat per una certa planificació (tenint en "
+"compte les vacances validades) o si encara ho necessiteu per codificar "
+"tasques.\n"
+"\n"
+"Al final del mes, el responsable de planificació també pot comprovar si les "
+"fulles de serveis codificades estan respectant el temps planificat en cada "
+"compte analític.\n"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "Quantitat en la UdM base"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
 msgid "Time Planned on Tasks"
-msgstr ""
+msgstr "Temps planificat en tasques"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
@@ -446,7 +488,7 @@ msgstr "Quantitat"
 #. module: project_planning
 #: field:report_account_analytic.planning,code:0
 msgid "Code"
-msgstr ""
+msgstr "Codi"
 
 #. module: project_planning
 #: view:account.analytic.account:0
@@ -463,12 +505,12 @@ msgstr "Realitzat"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By User (in Days)"
-msgstr ""
+msgstr "Planificació per usuari (en dies)"
 
 #. module: project_planning
 #: view:report_account_analytic.planning.stat:0
@@ -485,22 +527,22 @@ msgstr "Obert"
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
 #: view:report_account_analytic.planning:0
 msgid "Planning by User"
-msgstr ""
+msgstr "Planificació per usuari"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Information"
-msgstr ""
+msgstr "Informació"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,business_days:0
 msgid "Business Days"
-msgstr ""
+msgstr "Dies laborables"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Reactiva"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
@@ -515,7 +557,7 @@ msgstr "Estad. planificació"
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_tasks:0
 msgid "Time Allocation of Tasks"
-msgstr ""
+msgstr "Temps d'assignació de tasques"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -525,17 +567,17 @@ msgstr "Resum per usuari"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
-msgstr ""
+msgstr "Temps total d'assignació sense tasques"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,holiday:0
 msgid "Leaves"
-msgstr ""
+msgstr "Absències"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation of Tasks"
-msgstr ""
+msgstr "Temps total d'assignació de tasques"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
@@ -545,7 +587,7 @@ msgstr "Data final"
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Remaining tasks"
-msgstr ""
+msgstr "Tasques pendents"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -555,7 +597,7 @@ msgstr "Resum per projecte"
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Responsible :"
-msgstr ""
+msgstr "Responsable:"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -565,12 +607,12 @@ msgstr "]"
 #. module: project_planning
 #: field:res.company,planning_time_mode_id:0
 msgid "Planning Time Unit"
-msgstr ""
+msgstr "Unitat de temps de planificació"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,task_ids:0
 msgid "Planning Tasks"
-msgstr ""
+msgstr "Planificació de tasques"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
@@ -583,15 +625,5 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
+"Aquest valor ve donat per la suma de l'assignació de temps amb la/es "
+"tasca/ques enllaçada/es, expressat en dies."
diff --git a/addons/project_planning/i18n/cs.po b/addons/project_planning/i18n/cs.po
index 60b2403f01a..e634b6d5bea 100644
--- a/addons/project_planning/i18n/cs.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/de.po b/addons/project_planning/i18n/de.po
index e2445d25a56..baec76363e1 100644
--- a/addons/project_planning/i18n/de.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -624,50 +624,3 @@ msgid ""
 msgstr ""
 "Dieser Wert repräsentiert die Summe der verplanten Zeitressource durch "
 "zugewiesene Aufgaben."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Time without"
-#~ msgstr "Zeit ohne Aufgabe"
-
-#~ msgid "From"
-#~ msgstr "Von"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#~ msgid "Total Planned Tasks"
-#~ msgstr "Gesamtverpl.  Aufgabenzeit"
-
-#~ msgid "tasks"
-#~ msgstr "Aufgaben"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
-#~ msgid "To"
-#~ msgstr "An"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Der Name des Moduls muss eindeutig sein."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "With its commun system for scheduling all resources of a company (people and "
-#~ "materials), OpenERP allows you to encode then compute automatically tasks "
-#~ "and phases scheduling, track resources allocation and availibility."
-#~ msgstr ""
-#~ "Durch die grundsätzliche Möglichkeit zur Planung von Ressourcen (Personen "
-#~ "und Sachgüter), ermöglicht OpenERP eine automatische Kalkulation von Aufgabe "
-#~ "und Projektphasen zwecks Verfolgung und Abgleich freier und tatsächlicher "
-#~ "benötigter Ressourcen sowie Verfügbarkeit von Ressourcen."
diff --git a/addons/project_planning/i18n/el.po b/addons/project_planning/i18n/el.po
index 905f08b4370..0b3eb3f3fcc 100644
--- a/addons/project_planning/i18n/el.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,12 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
diff --git a/addons/project_planning/i18n/es.po b/addons/project_planning/i18n/es.po
index d4a40a4d871..4955e447e1b 100644
--- a/addons/project_planning/i18n/es.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -627,52 +627,3 @@ msgid ""
 msgstr ""
 "Este valor viene dado por la suma de la asignación de tiempo con la(s) "
 "tarea(s) enlazada(s), expresado en días."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la definición de la vista!"
-
-#~ msgid "Total Planned Tasks"
-#~ msgstr "Total tareas planificadas"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error! No puede crear un menú recursivo."
-
-#~ msgid "tasks"
-#~ msgstr "tareas"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Time without"
-#~ msgstr "Tiempo sin"
-
-#~ msgid ""
-#~ "With its commun system for scheduling all resources of a company (people and "
-#~ "materials), OpenERP allows you to encode then compute automatically tasks "
-#~ "and phases scheduling, track resources allocation and availibility."
-#~ msgstr ""
-#~ "Con su sistema común para la planificación de todos los recursos (personas y "
-#~ "materiales) de una compañía, OpenERP le permite codificar y calcular "
-#~ "automáticamente tareas y fases de planificación, controlar la asignación de "
-#~ "recursos y la disponibilidad."
-
-#~ msgid "From"
-#~ msgstr "Desde"
-
-#~ msgid "To"
-#~ msgstr "Hasta"
diff --git a/addons/project_planning/i18n/es_MX.po b/addons/project_planning/i18n/es_MX.po
new file mode 100644
index 00000000000..49788494d9d
--- /dev/null
+++ b/addons/project_planning/i18n/es_MX.po
@@ -0,0 +1,629 @@
+# 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-17 21:01+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de trabajo que queda por hacer en la tarea "
+"de esta planificación, expresado en días."
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Estadísticas de planificación"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr "Línea de planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Tiempo no asignado total"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Nombre planificación"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "Mis planificaciones de proyectos"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Hoja de servicios"
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr "Módulo para la gestión de la planificación"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its global system to schedule all resources of a company (people and "
+"material), OpenERP allows you to encode and then automatically compute tasks "
+"and phases scheduling, track resource allocation and availability."
+msgstr ""
+"Con su sistema global para planificar todos los recursos de una compañía "
+"(personas y materiales), OpenERP le permite codificar y calcular "
+"automáticamente la planificación de tareas y fases, y controlar la "
+"asignación y disponibilidad de recursos."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr "Total de tareas planificadas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr "Planificaciones"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Iniciar tarea"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr "Planificación total (en días)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"¡Planificación no válida! Las fechas de la planificación no pueden "
+"superponerse para el mismo responsable. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Planificación por cuenta"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Planificaciones actuales"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
+msgstr "Hasta:"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+"Este valor viene dado por la suma de todos los trabajos codificados en la(s) "
+"hoja(s) de servicios entre la 'Fecha desde' y la 'Fecha hasta' de la "
+"planificación."
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr "Tiempo de asignación sin tareas"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Líneas planificadas"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo con la opción "
+"'Asignado en tareas' desmarcada, expresado en días."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Varios"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr ""
+"Esto establecerá la unidad de medida utilizada en las planificaciones."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Planificación RRHH"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Tareas pendientes"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Total planificado"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Codificación de tiempo"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Tiempo no asignado"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo sin tarea(s) "
+"vinculada(s), expresado en días."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+"Calculado como días laborables - (Tiempo de asignación de las tareas + "
+"Tiempo de asignación sin tareas + Ausencias de vacaciones)"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+"Indique aquí el número de días de trabajo dentro de esta planificación para "
+"una persona a tiempo completo."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr "["
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr "Desde:"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Planificación por usuario"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Planificación por cuenta (en días)"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
+msgstr "Tiempo sin tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Total libre"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo con la opción "
+"\"Asignado en tareas\" marcada expresado en días."
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Análisis planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Ctdad UdM"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Planificación por cuenta"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Días planificados"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+"Este valor viene dado por el total de las ausencias validadas entre la "
+"'Fecha desde' y la 'Fecha hasta' de la planificación."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Total de tareas pendientes"
+
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid ""
+"\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated "
+"with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still "
+"unallocated time for a given planning (taking in consideration the validated "
+"leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded "
+"timesheets are respecting the planned time on each analytic account.\n"
+msgstr ""
+"\n"
+"Este módulo le permite gestionar sus planificaciones.\n"
+"\n"
+"Este módulo se basa en la contabilidad analítica y está totalmente integrado "
+"con\n"
+"* la codificación de hojas de servicios\n"
+"* las gestión de las vacaciones/fiestas\n"
+"* la gestión de proyectos\n"
+"\n"
+"De esta forma, cada responsable de departamento puede saber si alguien en su "
+"equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
+"en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
+"tareas.\n"
+"\n"
+"Al final del mes, el responsable de planificación también puede comprobar si "
+"las hojas de servicios codificadas están respetando el tiempo planificado en "
+"cada cuenta analítica.\n"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "Cantidad en la UdM base"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Tiempo planificado en tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Líneas planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Planificación por usuario (en días)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Estadísticas de planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Planificación por usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Información"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Días laborables"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Reactivar"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Estad. planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Tiempo de asignación de tareas"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Resumen por usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Tiempo total de asignación sin tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Ausencias"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr "Tiempo total de asignación de tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr "Tareas pendientes"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Resumen por proyecto"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr "Responsable:"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr "]"
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Unidad de tiempo de planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Planificación de tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo con la(s) "
+"tarea(s) enlazada(s), expresado en días."
diff --git a/addons/project_planning/i18n/es_VE.po b/addons/project_planning/i18n/es_VE.po
new file mode 100644
index 00000000000..49788494d9d
--- /dev/null
+++ b/addons/project_planning/i18n/es_VE.po
@@ -0,0 +1,629 @@
+# 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-17 21:01+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de trabajo que queda por hacer en la tarea "
+"de esta planificación, expresado en días."
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Estadísticas de planificación"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr "Línea de planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Tiempo no asignado total"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Nombre planificación"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "Mis planificaciones de proyectos"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Hoja de servicios"
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr "Módulo para la gestión de la planificación"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its global system to schedule all resources of a company (people and "
+"material), OpenERP allows you to encode and then automatically compute tasks "
+"and phases scheduling, track resource allocation and availability."
+msgstr ""
+"Con su sistema global para planificar todos los recursos de una compañía "
+"(personas y materiales), OpenERP le permite codificar y calcular "
+"automáticamente la planificación de tareas y fases, y controlar la "
+"asignación y disponibilidad de recursos."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr "Total de tareas planificadas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr "Planificaciones"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Iniciar tarea"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr "Planificación total (en días)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"¡Planificación no válida! Las fechas de la planificación no pueden "
+"superponerse para el mismo responsable. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Planificación por cuenta"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Planificaciones actuales"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
+msgstr "Hasta:"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+"Este valor viene dado por la suma de todos los trabajos codificados en la(s) "
+"hoja(s) de servicios entre la 'Fecha desde' y la 'Fecha hasta' de la "
+"planificación."
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr "Tiempo de asignación sin tareas"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Líneas planificadas"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo con la opción "
+"'Asignado en tareas' desmarcada, expresado en días."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Varios"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr ""
+"Esto establecerá la unidad de medida utilizada en las planificaciones."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Planificación RRHH"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Tareas pendientes"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Total planificado"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Codificación de tiempo"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Tiempo no asignado"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo sin tarea(s) "
+"vinculada(s), expresado en días."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+"Calculado como días laborables - (Tiempo de asignación de las tareas + "
+"Tiempo de asignación sin tareas + Ausencias de vacaciones)"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+"Indique aquí el número de días de trabajo dentro de esta planificación para "
+"una persona a tiempo completo."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr "["
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr "Desde:"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Planificación por usuario"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Planificación por cuenta (en días)"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
+msgstr "Tiempo sin tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Total libre"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo con la opción "
+"\"Asignado en tareas\" marcada expresado en días."
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Análisis planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Ctdad UdM"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Planificación por cuenta"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Días planificados"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+"Este valor viene dado por el total de las ausencias validadas entre la "
+"'Fecha desde' y la 'Fecha hasta' de la planificación."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Total de tareas pendientes"
+
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid ""
+"\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated "
+"with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still "
+"unallocated time for a given planning (taking in consideration the validated "
+"leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded "
+"timesheets are respecting the planned time on each analytic account.\n"
+msgstr ""
+"\n"
+"Este módulo le permite gestionar sus planificaciones.\n"
+"\n"
+"Este módulo se basa en la contabilidad analítica y está totalmente integrado "
+"con\n"
+"* la codificación de hojas de servicios\n"
+"* las gestión de las vacaciones/fiestas\n"
+"* la gestión de proyectos\n"
+"\n"
+"De esta forma, cada responsable de departamento puede saber si alguien en su "
+"equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
+"en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
+"tareas.\n"
+"\n"
+"Al final del mes, el responsable de planificación también puede comprobar si "
+"las hojas de servicios codificadas están respetando el tiempo planificado en "
+"cada cuenta analítica.\n"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "Cantidad en la UdM base"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Tiempo planificado en tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Líneas planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Planificación por usuario (en días)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Estadísticas de planificación"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Planificación por usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Información"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Días laborables"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Reactivar"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Estad. planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Tiempo de asignación de tareas"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Resumen por usuario"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Tiempo total de asignación sin tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Ausencias"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr "Tiempo total de asignación de tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr "Tareas pendientes"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Resumen por proyecto"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr "Responsable:"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr "]"
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Unidad de tiempo de planificación"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Planificación de tareas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
+"Este valor viene dado por la suma de la asignación de tiempo con la(s) "
+"tarea(s) enlazada(s), expresado en días."
diff --git a/addons/project_planning/i18n/et.po b/addons/project_planning/i18n/et.po
index 30d366dab38..c8e71ec19f7 100644
--- a/addons/project_planning/i18n/et.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,14 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
diff --git a/addons/project_planning/i18n/fi.po b/addons/project_planning/i18n/fi.po
index bda70796e5e..1915303bfce 100644
--- a/addons/project_planning/i18n/fi.po
+++ b/addons/project_planning/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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/fr.po b/addons/project_planning/i18n/fr.po
index 3abd13097ce..a4dba47ecd0 100644
--- a/addons/project_planning/i18n/fr.po
+++ b/addons/project_planning/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 08:41+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -623,27 +623,3 @@ msgid ""
 msgstr ""
 "Cette valeur est le résultat de la somme des temps alloués, liés à des "
 "tâches, exprimée en jour."
-
-#~ msgid "From"
-#~ msgstr "De"
-
-#~ msgid "Total Planned Tasks"
-#~ msgstr "Total des tâches planifiées"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de menu récursif."
-
-#~ msgid "tasks"
-#~ msgstr "tâches"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
-#~ "spécial !"
-
-#~ msgid "To"
-#~ msgstr "À"
-
-#~ msgid "Time without"
-#~ msgstr "Marge libre"
diff --git a/addons/project_planning/i18n/gl.po b/addons/project_planning/i18n/gl.po
index a8cc0e0d3d3..2faef4997c3 100644
--- a/addons/project_planning/i18n/gl.po
+++ b/addons/project_planning/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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index 9449868118b..ca01b101337 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,14 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nepravilno ime modela u definiciji radnje."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
diff --git a/addons/project_planning/i18n/hu.po b/addons/project_planning/i18n/hu.po
index 778969a7d09..3eddcdefb6b 100644
--- a/addons/project_planning/i18n/hu.po
+++ b/addons/project_planning/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-07 18:31+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/id.po b/addons/project_planning/i18n/id.po
index ed5c609c6f0..4c33cc14c87 100644
--- a/addons/project_planning/i18n/id.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/it.po b/addons/project_planning/i18n/it.po
index 657d4ce431a..49640894cc1 100644
--- a/addons/project_planning/i18n/it.po
+++ b/addons/project_planning/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-04-25 10:56+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/ko.po b/addons/project_planning/i18n/ko.po
index 70e48ec9986..311f9a56f2e 100644
--- a/addons/project_planning/i18n/ko.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/lt.po b/addons/project_planning/i18n/lt.po
index af1733af0ae..e4609d383cd 100644
--- a/addons/project_planning/i18n/lt.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/lv.po b/addons/project_planning/i18n/lv.po
index bff5abeef03..f322de6dd51 100644
--- a/addons/project_planning/i18n/lv.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -585,18 +585,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "From"
-#~ msgstr "No"
-
-#~ msgid "tasks"
-#~ msgstr "uzdevumi"
-
-#~ msgid "To"
-#~ msgstr "Līdz"
-
-#~ msgid "Time without"
-#~ msgstr "Laiks bez"
-
-#~ msgid "Total Planned Tasks"
-#~ msgstr "Plānotie uzdevumi kopā"
diff --git a/addons/project_planning/i18n/nl.po b/addons/project_planning/i18n/nl.po
index a115ddf960f..d803f68d42c 100644
--- a/addons/project_planning/i18n/nl.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -624,14 +624,3 @@ msgid ""
 msgstr ""
 "Deze waarde wordt bepaald door de som van de toegewezen tijd met verbonden "
 "taken, uitgedrukt in dagen."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave!"
diff --git a/addons/project_planning/i18n/pl.po b/addons/project_planning/i18n/pl.po
index 237d40d4ace..70a62bd00c6 100644
--- a/addons/project_planning/i18n/pl.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -598,18 +598,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr "To jest suma dni czasu przydzielonego w zadaniach."
-
-#~ msgid "Time without"
-#~ msgstr "Czas bez"
-
-#~ msgid "From"
-#~ msgstr "Od"
-
-#~ msgid "Total Planned Tasks"
-#~ msgstr "Suma planowanych zadań"
-
-#~ msgid "tasks"
-#~ msgstr "zadania"
-
-#~ msgid "To"
-#~ msgstr "Do"
diff --git a/addons/project_planning/i18n/pt.po b/addons/project_planning/i18n/pt.po
index cb82fa9f9ab..29d47fe4b2c 100644
--- a/addons/project_planning/i18n/pt.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,9 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "tasks"
-#~ msgstr "tarefas"
-
-#~ msgid "To"
-#~ msgstr "Para"
diff --git a/addons/project_planning/i18n/pt_BR.po b/addons/project_planning/i18n/pt_BR.po
index 57319ece995..93ee522fe27 100644
--- a/addons/project_planning/i18n/pt_BR.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -620,12 +620,3 @@ msgid ""
 msgstr ""
 "Este valor é determinado pela soma da alocação do tempo com tarefa (s) "
 "vinculada, expresso em dias."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/project_planning/i18n/ro.po b/addons/project_planning/i18n/ro.po
index ca15672b64f..1a3a7806aa8 100644
--- a/addons/project_planning/i18n/ro.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/ru.po b/addons/project_planning/i18n/ru.po
index a7a69564176..5f2d39655b6 100644
--- a/addons/project_planning/i18n/ru.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -71,7 +71,7 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.user,timesheet:0
 msgid "Timesheet"
-msgstr "Расписание"
+msgstr "Табель"
 
 #. module: project_planning
 #: model:ir.module.module,shortdesc:project_planning.module_meta_information
@@ -583,12 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/project_planning/i18n/sl.po b/addons/project_planning/i18n/sl.po
index ffb544a8b9f..580935c55e5 100644
--- a/addons/project_planning/i18n/sl.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,14 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda."
diff --git a/addons/project_planning/i18n/sq.po b/addons/project_planning/i18n/sq.po
index 4d0faf2d172..ed869fee4f3 100644
--- a/addons/project_planning/i18n/sq.po
+++ b/addons/project_planning/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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:54+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/sv.po b/addons/project_planning/i18n/sv.po
index 8d0befea0e8..1e62835ca16 100644
--- a/addons/project_planning/i18n/sv.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,8 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
diff --git a/addons/project_planning/i18n/tlh.po b/addons/project_planning/i18n/tlh.po
index 8015585f043..ae957a98b48 100644
--- a/addons/project_planning/i18n/tlh.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/tr.po b/addons/project_planning/i18n/tr.po
index b9592d667f5..67933040bf8 100644
--- a/addons/project_planning/i18n/tr.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,6 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/project_planning/i18n/uk.po b/addons/project_planning/i18n/uk.po
index ef641c75ee0..957beb5922d 100644
--- a/addons/project_planning/i18n/uk.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -583,11 +583,3 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
diff --git a/addons/project_planning/i18n/vi.po b/addons/project_planning/i18n/vi.po
index 0bdbbfd96bc..e9580542a7c 100644
--- a/addons/project_planning/i18n/vi.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/i18n/zh_CN.po b/addons/project_planning/i18n/zh_CN.po
index 817b30c5a91..d44d57d630e 100644
--- a/addons/project_planning/i18n/zh_CN.po
+++ b/addons/project_planning/i18n/zh_CN.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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "错误！货币必须是所选公司的本位币"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,tasks:0
@@ -30,40 +30,40 @@ msgstr ""
 msgid ""
 "This value is given by the sum of work remaining to do on the task for this "
 "planning, expressed in days."
-msgstr ""
+msgstr "这个值由该计划所属的任务剩余工时的合计，单位是天"
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:project_planning.menu_board_planning
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr ""
+msgstr "计划统计"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning.line:0
 msgid "Planning Line"
-msgstr ""
+msgstr "计划明细"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Unallocated Time"
-msgstr ""
+msgstr "总计分配时间"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr ""
+msgstr "计划名称"
 
 #. module: project_planning
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "错误！不能创建循环引用的任务"
 
 #. module: project_planning
 #: view:board.board:0
 msgid "My Project's planning"
-msgstr ""
+msgstr "我的项目计划"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,timesheet:0
@@ -71,12 +71,12 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.user,timesheet:0
 msgid "Timesheet"
-msgstr ""
+msgstr "计工单"
 
 #. module: project_planning
 #: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Planning Management Module"
-msgstr ""
+msgstr "项目计划模块"
 
 #. module: project_planning
 #: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
@@ -84,94 +84,94 @@ msgid ""
 "With its global system to schedule all resources of a company (people and "
 "material), OpenERP allows you to encode and then automatically compute tasks "
 "and phases scheduling, track resource allocation and availability."
-msgstr ""
+msgstr "OpenERP是个集成的系统，可以统管整个公司的人力和物料资源。这样可以输入和计算任务和阶段的日程，跟踪资源的分配和可用性。"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Total planned tasks"
-msgstr ""
+msgstr "计划的任务总计"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "科目"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "任务"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: project_planning
 #: field:account.analytic.account,planning_ids:0
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
 msgid "Plannings"
-msgstr ""
+msgstr "计划"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Start Task"
-msgstr ""
+msgstr "开始任务"
 
 #. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Total Planned (in Days)"
-msgstr ""
+msgstr "总计划天数"
 
 #. module: project_planning
 #: constraint:report_account_analytic.planning:0
 msgid ""
 "Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
+msgstr "输入的计划无效！计划日期不能和负责的日期重合 "
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_account:0
 msgid "Planning By Account"
-msgstr ""
+msgstr "按科目的计划"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Current Plannings"
-msgstr ""
+msgstr "当前计划"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "重置为草稿"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Extra Info"
-msgstr ""
+msgstr "附加信息"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "To :"
-msgstr ""
+msgstr "至"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,timesheet:0
@@ -179,63 +179,63 @@ msgstr ""
 msgid ""
 "This value is given by the sum of all work encoded in the timesheet(s) "
 "between the 'Date From' and 'Date To' of the planning."
-msgstr ""
+msgstr "这个值来源于在计划的起止期间内计工单中输入的工时数合计。"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "错误! 你不能创建递归的辅助核算项目"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_open:0
 #: field:report_account_analytic.planning.user,plan_open:0
 msgid "Time Allocation without Tasks"
-msgstr ""
+msgstr "未被任务分配的时间"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 msgid "Planning Lines"
-msgstr ""
+msgstr "计划明细"
 
 #. module: project_planning
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "错误！您不能创建递归公司."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,account_id:0
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_open:0
 msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
+msgstr "这个值是没有分配给任务的时间合计，单位是天"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "杂项"
 
 #. module: project_planning
 #: help:res.company,planning_time_mode_id:0
 msgid "This will set the unit of measure used in plannings."
-msgstr ""
+msgstr "这里设置计划的时间单位"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr ""
+msgstr "人力资源计划"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,tasks:0
 #: field:report_account_analytic.planning.user,tasks:0
 msgid "Remaining Tasks"
-msgstr ""
+msgstr "剩下的任务"
 
 #. module: project_planning
 #: view:account.analytic.account:0
@@ -249,146 +249,146 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,planning_id:0
 #: field:report_account_analytic.planning.user,planning_id:0
 msgid "Planning"
-msgstr ""
+msgstr "计划"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,total_planned:0
 msgid "Total Planned"
-msgstr ""
+msgstr "总计划"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
-msgstr ""
+msgstr "输入时间"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,free:0
 msgid "Unallocated Time"
-msgstr ""
+msgstr "未分配的时间"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
 msgid ""
 "This value is given by the sum of time allocation without task(s) linked, "
 "expressed in days."
-msgstr ""
+msgstr "这个值是没有分配给任务的时间合计，单位是天"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Delegate"
-msgstr ""
+msgstr "委派"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,free:0
 msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
-msgstr ""
+msgstr "计算公式： 正常工作天数 - （已分配给任务的时间 + 未分配给任务的时间 + 休假）"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
 msgid ""
 "Set here the number of working days within this planning for one person full "
 "time"
-msgstr ""
+msgstr "在这里输入计划范围内一个全职员工的工作天数"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "From :"
-msgstr ""
+msgstr "自："
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_user_ids:0
 msgid "Planning By User"
-msgstr ""
+msgstr "按用户查看计划"
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.act_task_of_lines
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By Account (in Days)"
-msgstr ""
+msgstr "按科目查看计划"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without tasks"
-msgstr ""
+msgstr "未分配任务的时间"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "不参与总计"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
 msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
+msgstr "这个值是已分配给任务的时间总计，单位是天"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr ""
+msgstr "计划分析"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
-msgstr ""
+msgstr "按科目查看计划"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Pending"
-msgstr ""
+msgstr "等待中"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned Days"
-msgstr ""
+msgstr "计划天数"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,holiday:0
 msgid ""
 "This value is given by the total of validated leaves into the 'Date From' "
 "and 'Date To' of the planning."
-msgstr ""
+msgstr "这个值由计划起止期间内已确认的休假"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -396,12 +396,12 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,user_id:0
 #: field:report_account_analytic.planning.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Remaining Tasks"
-msgstr ""
+msgstr "总计剩余时间"
 
 #. module: project_planning
 #: model:ir.module.module,description:project_planning.module_meta_information
@@ -422,164 +422,171 @@ msgid ""
 "At the end of the month, the planning manager can also check if the encoded "
 "timesheets are respecting the planned time on each analytic account.\n"
 msgstr ""
+"\n"
+"此模块帮您管理计划。\n"
+"这个模块基于辅助核算会计，与很多其他功能实现了集成：\n"
+"输入计工单\n"
+"休假管理\n"
+"项目管理\n"
+"这样部门经理就可以知道某个人或团队在给定计划期间（去掉休假）是否还可以分配任务\n"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "换算成基本计量单位的数量"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
 msgid "Time Planned on Tasks"
-msgstr ""
+msgstr "分配了任务的时间"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,code:0
 msgid "Code"
-msgstr ""
+msgstr "编号"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr ""
+msgstr "计划明细"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "已完成"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消(&C)"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By User (in Days)"
-msgstr ""
+msgstr "按用户查看计划天数"
 
 #. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr ""
+msgstr "计划统计"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr ""
+msgstr "开始"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
 #: view:report_account_analytic.planning:0
 msgid "Planning by User"
-msgstr ""
+msgstr "按用户查看计划"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Information"
-msgstr ""
+msgstr "信息"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,business_days:0
 msgid "Business Days"
-msgstr ""
+msgstr "工作天数"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reactivate"
-msgstr ""
+msgstr "重新激活"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr ""
+msgstr "计划状态"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_tasks:0
 msgid "Time Allocation of Tasks"
-msgstr ""
+msgstr "已分配任务的时间"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr ""
+msgstr "按用户合计"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
-msgstr ""
+msgstr "未分配任务的时间"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,holiday:0
 msgid "Leaves"
-msgstr ""
+msgstr "休假"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation of Tasks"
-msgstr ""
+msgstr "已分配任务的时间"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Remaining tasks"
-msgstr ""
+msgstr "剩余任务"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr ""
+msgstr "按项目合计"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Responsible :"
-msgstr ""
+msgstr "负责人"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: project_planning
 #: field:res.company,planning_time_mode_id:0
 msgid "Planning Time Unit"
-msgstr ""
+msgstr "计划时间单位"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,task_ids:0
 msgid "Planning Tasks"
-msgstr ""
+msgstr "计划任务"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "经理"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_tasks:0
 msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
-msgstr ""
+msgstr "这个值是已分配给任务的时间合计，单位是天"
diff --git a/addons/project_planning/i18n/zh_TW.po b/addons/project_planning/i18n/zh_TW.po
index b520d3493dc..5770a1ccc17 100644
--- a/addons/project_planning/i18n/zh_TW.po
+++ b/addons/project_planning/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
diff --git a/addons/project_planning/project_planning_demo.xml b/addons/project_planning/project_planning_demo.xml
index 4943ca0e5e3..f1b7e288734 100644
--- a/addons/project_planning/project_planning_demo.xml
+++ b/addons/project_planning/project_planning_demo.xml
@@ -30,7 +30,7 @@
             <field name="amount_unit" ref="product.uom_hour"/>
             <field name="planning_id" ref="project_plannning_1"/>
             <field name="user_id" ref="project.res_users_technical_leader"/>
-            <field name="task_ids" eval="[(6,0,[ref('project.project_task_192')])]"/>
+            <field name="task_ids" eval="[(6,0,[ref('project.project_task_190')])]"/>
         </record>     
         
                 
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ef39b5daad9..83da24292ae 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -109,7 +109,7 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                                        <button name="%(project.action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
+                                                        <button name="%(mail.action_email_compose_message_wizard)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                                     </group>
                                                  </page>
                                                 <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@@ -156,7 +156,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning by Account">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
@@ -274,10 +274,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning statistics">
-                    <group col="10" colspan="4">
-                        <field name="planning_id" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                    <group>
+                        <field name="planning_id"/>
+                        <field name="user_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 8157180321a..68ea9d5d78e 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Project Retro planning',
     'version': '0.1',
-    'category': 'Project Management',
+    'category': 'Hidden',
     'description': """
 Changes dates according to change in project End Date.
 ======================================================
diff --git a/addons/project_retro_planning/i18n/ar.po b/addons/project_retro_planning/i18n/ar.po
index 7cb273edae6..1afa318b821 100644
--- a/addons/project_retro_planning/i18n/ar.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/bg.po b/addons/project_retro_planning/i18n/bg.po
index aad5d6569f7..0e82e1b9f00 100644
--- a/addons/project_retro_planning/i18n/bg.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/bs.po b/addons/project_retro_planning/i18n/bs.po
index b5433a8f471..5265a002dfe 100644
--- a/addons/project_retro_planning/i18n/bs.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/ca.po b/addons/project_retro_planning/i18n/ca.po
index 3576e9d6c40..f380888a945 100644
--- a/addons/project_retro_planning/i18n/ca.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/cs.po b/addons/project_retro_planning/i18n/cs.po
index 5a00e297908..68164b360f4 100644
--- a/addons/project_retro_planning/i18n/cs.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/da.po b/addons/project_retro_planning/i18n/da.po
new file mode 100644
index 00000000000..9003e2af861
--- /dev/null
+++ b/addons/project_retro_planning/i18n/da.po
@@ -0,0 +1,47 @@
+# 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: 2011-01-11 11:15+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: project_retro_planning
+#: model:ir.model,name:project_retro_planning.model_project_project
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_retro_planning
+#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
+msgid "Project Retro planning"
+msgstr ""
+
+#. 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 ""
+
+#. 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
index f022d257af4..09a79dd1801 100644
--- a/addons/project_retro_planning/i18n/de.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -49,15 +49,3 @@ msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 #: 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 ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen \r\n"
-#~ "beinhalten"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index bc5669f2930..cc88a628987 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -51,15 +51,3 @@ msgstr ""
 #: 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 ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/project_retro_planning/i18n/es_AR.po b/addons/project_retro_planning/i18n/es_AR.po
index 9c151202c6d..ce06b467fc7 100644
--- a/addons/project_retro_planning/i18n/es_AR.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/es_EC.po b/addons/project_retro_planning/i18n/es_EC.po
index b95323899c9..ad68f5f76fd 100644
--- a/addons/project_retro_planning/i18n/es_EC.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/es_MX.po b/addons/project_retro_planning/i18n/es_MX.po
new file mode 100644
index 00000000000..96e736af7eb
--- /dev/null
+++ b/addons/project_retro_planning/i18n/es_MX.po
@@ -0,0 +1,53 @@
+# 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
new file mode 100644
index 00000000000..96e736af7eb
--- /dev/null
+++ b/addons/project_retro_planning/i18n/es_VE.po
@@ -0,0 +1,53 @@
+# 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
index 10cf0c4084e..762e1e8c9e3 100644
--- a/addons/project_retro_planning/i18n/et.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/fi.po b/addons/project_retro_planning/i18n/fi.po
index b62a8edb284..98793b3ac97 100644
--- a/addons/project_retro_planning/i18n/fi.po
+++ b/addons/project_retro_planning/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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/fr.po b/addons/project_retro_planning/i18n/fr.po
index c1d7f27e76f..11e37c447a3 100644
--- a/addons/project_retro_planning/i18n/fr.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/gl.po b/addons/project_retro_planning/i18n/gl.po
index a01135ec040..fb12bec25c9 100644
--- a/addons/project_retro_planning/i18n/gl.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -36,13 +36,19 @@ msgid ""
 "          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  "
 
 #. 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 ""
+msgstr "¡Erro! ¡Non pode asignar escalada ó mesmo proxecto!"
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
index 38f30f49ce7..872dde535d7 100644
--- a/addons/project_retro_planning/i18n/hr.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/hu.po b/addons/project_retro_planning/i18n/hu.po
index f59b5334e28..bc78745a33b 100644
--- a/addons/project_retro_planning/i18n/hu.po
+++ b/addons/project_retro_planning/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-07 20:10+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/id.po b/addons/project_retro_planning/i18n/id.po
index 0c6531bfd96..775c67d278f 100644
--- a/addons/project_retro_planning/i18n/id.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/it.po b/addons/project_retro_planning/i18n/it.po
index 0de7f7f10d7..69ac4c9c2a2 100644
--- a/addons/project_retro_planning/i18n/it.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -45,9 +45,3 @@ msgstr ""
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'Ogetto deve iniziare con x_ e non deve contenere nessun tipo di "
-#~ "carattere speciale !"
diff --git a/addons/project_retro_planning/i18n/kab.po b/addons/project_retro_planning/i18n/kab.po
index 2931cb56997..866b90e6326 100644
--- a/addons/project_retro_planning/i18n/kab.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/ko.po b/addons/project_retro_planning/i18n/ko.po
index 24d62435a02..cbc414be84f 100644
--- a/addons/project_retro_planning/i18n/ko.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/lt.po b/addons/project_retro_planning/i18n/lt.po
index 7cb273edae6..5888ac55971 100644
--- a/addons/project_retro_planning/i18n/lt.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/mn.po b/addons/project_retro_planning/i18n/mn.po
index 0a23e8d4f70..93d27da6524 100644
--- a/addons/project_retro_planning/i18n/mn.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/nl.po b/addons/project_retro_planning/i18n/nl.po
index df8b31a4eed..605a3d6722f 100644
--- a/addons/project_retro_planning/i18n/nl.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/nl_BE.po b/addons/project_retro_planning/i18n/nl_BE.po
index 0a3859fbac0..c2284ed7838 100644
--- a/addons/project_retro_planning/i18n/nl_BE.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/oc.po b/addons/project_retro_planning/i18n/oc.po
new file mode 100644
index 00000000000..7451fd7b147
--- /dev/null
+++ b/addons/project_retro_planning/i18n/oc.po
@@ -0,0 +1,47 @@
+# 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: 2011-01-11 11:15+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: project_retro_planning
+#: model:ir.model,name:project_retro_planning.model_project_project
+msgid "Project"
+msgstr "Projècte"
+
+#. module: project_retro_planning
+#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
+msgid "Project Retro planning"
+msgstr "Retroplanificacion de projèctes"
+
+#. 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 ""
+
+#. 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/pl.po b/addons/project_retro_planning/i18n/pl.po
index 933966039b0..8ba5468a0c5 100644
--- a/addons/project_retro_planning/i18n/pl.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/pt.po b/addons/project_retro_planning/i18n/pt.po
index a9514fe518e..1c39fbdd83e 100644
--- a/addons/project_retro_planning/i18n/pt.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -44,15 +44,3 @@ msgstr "Erro ! A data de início do projeto deve ser anterior à do seu fim"
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
diff --git a/addons/project_retro_planning/i18n/pt_BR.po b/addons/project_retro_planning/i18n/pt_BR.po
index 2be00182477..77f925322cf 100644
--- a/addons/project_retro_planning/i18n/pt_BR.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/ro.po b/addons/project_retro_planning/i18n/ro.po
index 7cb273edae6..5888ac55971 100644
--- a/addons/project_retro_planning/i18n/ro.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/ru.po b/addons/project_retro_planning/i18n/ru.po
index ce8759d3419..f1bc1ba338d 100644
--- a/addons/project_retro_planning/i18n/ru.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/sl.po b/addons/project_retro_planning/i18n/sl.po
index 5001954dc84..4add38f7888 100644
--- a/addons/project_retro_planning/i18n/sl.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -44,14 +44,3 @@ msgstr ""
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
diff --git a/addons/project_retro_planning/i18n/sq.po b/addons/project_retro_planning/i18n/sq.po
index c20d570ee0a..b4e197b3159 100644
--- a/addons/project_retro_planning/i18n/sq.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/sr.po b/addons/project_retro_planning/i18n/sr.po
index 9e3c639e44a..7f08fa31c39 100644
--- a/addons/project_retro_planning/i18n/sr.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -45,8 +45,3 @@ msgstr ""
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere!"
diff --git a/addons/project_retro_planning/i18n/sr@latin.po b/addons/project_retro_planning/i18n/sr@latin.po
index 9dd0299c7eb..edc698dddde 100644
--- a/addons/project_retro_planning/i18n/sr@latin.po
+++ b/addons/project_retro_planning/i18n/sr@latin.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: 2010-12-23 14:52+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
@@ -35,18 +35,17 @@ msgid ""
 "          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  "
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+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 ""
-
-#~ 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!"
+msgstr "Greška! Ne možete dodeliti eskalaciju jednom istom projektu!"
diff --git a/addons/project_retro_planning/i18n/sv.po b/addons/project_retro_planning/i18n/sv.po
index fa5b6cdce7d..534ae069391 100644
--- a/addons/project_retro_planning/i18n/sv.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/tlh.po b/addons/project_retro_planning/i18n/tlh.po
index 6cd6bb13308..0270890545a 100644
--- a/addons/project_retro_planning/i18n/tlh.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 248738c851a..e8fe54c41fe 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/uk.po b/addons/project_retro_planning/i18n/uk.po
index 26e76028e7a..30019ff8410 100644
--- a/addons/project_retro_planning/i18n/uk.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/ur.po b/addons/project_retro_planning/i18n/ur.po
index 1d185480e79..bc2281ae97a 100644
--- a/addons/project_retro_planning/i18n/ur.po
+++ b/addons/project_retro_planning/i18n/ur.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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "منصوبہ"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
diff --git a/addons/project_retro_planning/i18n/vi.po b/addons/project_retro_planning/i18n/vi.po
index 1de967ff95d..db7276295f1 100644
--- a/addons/project_retro_planning/i18n/vi.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_retro_planning/i18n/zh_CN.po b/addons/project_retro_planning/i18n/zh_CN.po
index a8882c49135..f10ab4dc095 100644
--- a/addons/project_retro_planning/i18n/zh_CN.po
+++ b/addons/project_retro_planning/i18n/zh_CN.po
@@ -8,23 +8,23 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-03-20 09:52+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
 msgid "Project Retro planning"
-msgstr "项目补充计划"
+msgstr "项目计划反推"
 
 #. module: project_retro_planning
 #: model:ir.module.module,description:project_retro_planning.module_meta_information
@@ -34,21 +34,16 @@ msgid ""
 "          then the deadline date and start date for all the tasks will "
 "change accordingly  "
 msgstr ""
+"\n"
+"        - 如果项目的结束日期发生了变化\n"
+"          项目中所有任务的开始日期和结束日期也会自动变化  "
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "错误！项目的开始日期必须小于项目的结束日期"
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid ""
-#~ "\n"
-#~ "        - Stop date of project is change will change all the tasks of that "
-#~ "project to same number of days "
-#~ msgstr ""
-#~ "\n"
-#~ "        项目的停止日期将改变项目所有的任务日期 "
+msgstr "不能升级到相同的项目"
diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po
index 2c09e2a2bc6..966d07ebe9e 100644
--- a/addons/project_retro_planning/i18n/zh_TW.po
+++ b/addons/project_retro_planning/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: 2011-04-29 05:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 9a1713b9014..fb08b8432be 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Scrum, Agile Development Method',
+    'name': 'Methodology: SCRUM',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
@@ -50,7 +50,7 @@ More information on the methodology:
     """,
     'author': 'OpenERP SA',
     'images': ['images/product_backlogs.jpeg', 'images/project_sprints.jpeg', 'images/scrum_dashboard.jpeg', 'images/scrum_meetings.jpeg'],
-    'depends': ['project', 'process'],
+    'depends': ['project', 'process', 'mail'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
@@ -58,7 +58,7 @@ More information on the methodology:
         'wizard/project_scrum_backlog_create_task_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
         'wizard/project_scrum_postpone_view.xml',
-        "wizard/project_scrum_email_view.xml",
+#        "wizard/project_scrum_email_view.xml",
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
         'process/project_scrum_process.xml',
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 5620950fa5a..2a9d3532b2d 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -76,15 +76,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Board">
-                    <hpaned>
-                        <child1>
-               				 <action colspan="4" height="220" name="%(action_sprint_all_dashboard_tree)d" string="Sprints" width="510"/>
-                        </child1>
-                        <child2>
-                             <action colspan="4" height="220" name="%(action_view_task_progress_graph)d" string="Task Progress" width="510"/>
-                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progress" width="510"/>
-                        </child2>
-                    </hpaned>
+                    <board style="1-2">
+                        <column>
+               				 <action name="%(action_sprint_all_dashboard_tree)d" string="Sprints"/>
+                        </column>
+                        <column>
+                             <action name="%(action_view_task_progress_graph)d" string="Task Progress"/>
+                             <action name="%(action_view_backlog_progress_graph)d" string="Backlog Progress"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
@@ -133,8 +133,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-            	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
-						<action colspan="4"  height="100" name="%(action_view_my_scrum_sprint_tree)d" string="My Sprint" />
+            	<xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
+						<action name="%(action_view_my_scrum_sprint_tree)d" string="My Sprint"/>
             	</xpath>
             </field>
         </record>
diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
index acfd53b6b55..4afbe000269 100644
--- a/addons/project_scrum/i18n/ar.po
+++ b/addons/project_scrum/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: 2011-06-19 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -111,7 +111,7 @@ msgstr "مستوي التقدم"
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
-msgstr ""
+msgstr "Scrum Master"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:83
@@ -191,7 +191,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr ""
+msgstr "اسم المهمة الأسبوعية (Sprint)"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_task
@@ -259,7 +259,7 @@ msgstr "سجل تراكمي للمنتج"
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "مشروع"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -282,12 +282,12 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Sprint Info"
-msgstr ""
+msgstr "بيان مهمة أسبوعية"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "تاريخ انتهاء"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -298,7 +298,7 @@ msgstr ""
 #. module: project_scrum
 #: help:project.scrum.sprint,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "محسوب باستخدام مجموع مهام الأعمال المنتهية."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:91
@@ -319,7 +319,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "تاريخ الإبتداء"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:94
@@ -349,7 +349,7 @@ msgstr ""
 #: field:project.scrum.product.backlog,expected_hours:0
 #: field:project.scrum.sprint,expected_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "الساعات المخططة"
 
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
@@ -393,17 +393,17 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,state:0
 msgid "State"
-msgstr ""
+msgstr "حالة"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr ""
+msgstr "عرض المهام الأسبوعية (Sprint)"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,meeting_ids:0
 msgid "Daily Scrum"
-msgstr ""
+msgstr "Scrum يومي"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.create.task:0
@@ -440,19 +440,19 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
 msgid "Scrum"
-msgstr ""
+msgstr "Scrum"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "مهام اليوم"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:88
 #: field:project.scrum.meeting,question_yesterday:0
 #, python-format
 msgid "Tasks since yesterday"
-msgstr ""
+msgstr "مهام منذ أمس"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
@@ -490,12 +490,12 @@ msgstr ""
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "أُلغيت"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj2
 msgid "View project's tasks"
-msgstr ""
+msgstr "عرض المهام للمشروع"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:56
@@ -513,7 +513,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
 msgid "Sprint Backlog"
-msgstr ""
+msgstr "سجل تراكمي للمهام الأسبوعية"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -540,7 +540,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.meeting,date:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "تاريخ الإجتماع"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
@@ -549,7 +549,7 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Tasks"
-msgstr ""
+msgstr "المهام"
 
 #. module: project_scrum
 #: field:project.scrum.email,product_owner_email:0
@@ -570,7 +570,7 @@ msgstr ""
 #: help:project.scrum.product.backlog,progress:0
 #: help:project.scrum.sprint,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "حسابها كالتالي: الوقت المستغرق / الوقت الإجمالي."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -581,7 +581,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
 msgid "Blocks encountered"
-msgstr ""
+msgstr "نقط العوائق"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,state_open:0
@@ -609,7 +609,7 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Sprint"
-msgstr ""
+msgstr "مهام أسبوعية للـ (Scrum Sprint)"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -619,23 +619,23 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Review"
-msgstr ""
+msgstr "مراجعه"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "المهام الأسبوعية بأثر رجعي (Sprint)"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,note:0
 msgid "Note"
-msgstr ""
+msgstr "ملاحظة"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
-msgstr ""
+msgstr "مسودة"
 
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
@@ -662,7 +662,7 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Pending"
-msgstr ""
+msgstr "معلّق"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -684,7 +684,7 @@ msgstr ""
 #: field:project.project,product_owner_id:0
 #: field:project.scrum.sprint,product_owner_id:0
 msgid "Product Owner"
-msgstr ""
+msgstr "مالك المنتج"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,sequence:0
@@ -695,12 +695,12 @@ msgstr ""
 #: model:process.node,name:project_scrum.process_node_productbacklog0
 #: view:project.scrum.product.backlog:0
 msgid "Product backlog"
-msgstr ""
+msgstr "السجل التراكمي للمنتج"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
 msgid "Backlogs"
-msgstr ""
+msgstr "سجلات تراكمية"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:326
@@ -716,7 +716,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
 msgid "Active"
-msgstr ""
+msgstr "نشط"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_meeting_form
@@ -742,12 +742,12 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
-msgstr ""
+msgstr "عرض السجل التراكمي للمهام الأسبوعية"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_backlog:0
 msgid "Backlog Accurate"
-msgstr ""
+msgstr "سجل تراكمي دقيق"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
@@ -791,13 +791,13 @@ msgstr ""
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Done"
-msgstr ""
+msgstr "تم"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 #: view:project.scrum.product.backlog:0
 msgid "Cancel"
-msgstr ""
+msgstr "إلغـاء"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
@@ -812,13 +812,13 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "افتح"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "ساعات فعالة"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -828,7 +828,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "الساعات المتبقية"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -838,7 +838,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,name:0
 msgid "Feature"
-msgstr ""
+msgstr "السمات"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -870,13 +870,13 @@ msgstr ""
 #. module: project_scrum
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
 msgid "Backlog Task"
-msgstr ""
+msgstr "سجل تراكمي للمهمة"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Planned hours"
-msgstr ""
+msgstr "الساعات المخططة"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_project_scrum_email
@@ -885,7 +885,7 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Meeting"
-msgstr ""
+msgstr "مقابلات (Scrum Meeting)"
 
 #. module: project_scrum
 #: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
@@ -896,7 +896,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Daily Meetings"
-msgstr ""
+msgstr "لقاءات يومية"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -906,7 +906,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.project,sprint_size:0
 msgid "Sprint Days"
-msgstr ""
+msgstr "أيام المهام الأسبوعية (Sprint)"
 
 #. module: project_scrum
 #: help:project.scrum.email,product_owner_email:0
@@ -916,7 +916,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,progress:0
 msgid "Progress (0-100)"
-msgstr ""
+msgstr "التقدم (0-100)"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:324
@@ -956,7 +956,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "بيانات Scrum"
 
 #. module: project_scrum
 #: field:project.project,scrum:0
@@ -971,7 +971,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "تفاصيل المهام"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_postpone_wizard
@@ -1087,4 +1087,279 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
-msgstr ""
+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 "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 "Draft Backlogs"
+#~ 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 "In Progress"
+#~ msgstr "قيد التقدم"
+
+#~ msgid "Very Low"
+#~ msgstr "منخفض جداً"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "الجدول الزمني لساعات العمل لتعديل تقرير الرسم البياني Gantt"
+
+#~ 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
index fa259a7e8f2..778b86538ec 100644
--- a/addons/project_scrum/i18n/bg.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
index 4e833742289..70a688acdd6 100644
--- a/addons/project_scrum/i18n/bs.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
index e075d780db0..967ff492116 100644
--- a/addons/project_scrum/i18n/ca.po
+++ b/addons/project_scrum/i18n/ca.po
@@ -7,25 +7,24 @@ 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-08-02 17:18+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 23:10+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
 msgid "Email Id of Scrum Master"
-msgstr ""
+msgstr "Id de correu del Scrum Master"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
 msgid "_Assign"
-msgstr ""
+msgstr "_Assigna"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,name:0
@@ -41,7 +40,7 @@ msgstr "Des de backlog crea tasca."
 #: view:project.scrum.product.backlog:0
 #: field:project.scrum.product.backlog,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autor/a"
 
 #. module: project_scrum
 #: model:ir.module.module,description:project_scrum.module_meta_information
@@ -69,12 +68,34 @@ msgid ""
 "    * http://controlchaos.com\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul implementa tots els conceptes definits per la metodologia\n"
+"    Scrum de gestió de projectes per a empreses de TI:\n"
+"    * Projecte amb sprints, product owner, scrum master\n"
+"    * Sprints amb revisions, reunions diàries, comentaris\n"
+"    * Product backlog\n"
+"    * Sprint backlog\n"
+"\n"
+"    Afegexiu alguns conceptes al mòdul de gestió de projectes:\n"
+"    * Full de ruta a mig termini, a llarg termini\n"
+"    * Sol·licituds clients/funcional versus sol·licituds tècniques\n"
+"\n"
+"    També crea un nou informe:\n"
+"    * Gràfic de treball pendent\n"
+"\n"
+"    Els projectes i tasques scrum hereten dels projectes i tasques\n"
+"    reals, així podeu seguir treballant en tasques normals que també\n"
+"    inclouen tasques dels projectes scrum.\n"
+"\n"
+"    Més informació sobre la metodologia:\n"
+"    * http://controlchaos.com\n"
+"    "
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What did you do since the last meeting?"
-msgstr ""
+msgstr "Que vareu fer des de l'última reunió"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
@@ -84,13 +105,18 @@ msgid ""
 "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 ""
+msgstr "Agrupa per..."
 
 #. module: project_scrum
 #: model:process.node,note:project_scrum.process_node_productbacklog0
@@ -118,12 +144,14 @@ msgstr "Scrum master"
 #: code:addons/project_scrum/project_scrum.py:83
 #, python-format
 msgid "The sprint '%s' has been opened."
-msgstr ""
+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
@@ -139,12 +167,12 @@ msgstr "Retrospectiu"
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Send Email"
-msgstr ""
+msgstr "Envia Email"
 
 #. module: project_scrum
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj
@@ -155,39 +183,39 @@ msgstr "Vista backlogs del projecte"
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Canvia a esborrany"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
 msgid "Merge Product Backlogs"
-msgstr ""
+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 ""
+msgstr "Fusiona elements de la pila"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:53
 #, python-format
 msgid "Scrum Meeting : %s"
-msgstr ""
+msgstr "Reunió de Scrum: %s"
 
 #. module: project_scrum
 #: view:project.task:0
 msgid "Backlog"
-msgstr ""
+msgstr "Pila"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_email
 msgid "project.scrum.email"
-msgstr ""
+msgstr "projecte.scrum.correu"
 
 #. module: project_scrum
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
@@ -197,17 +225,17 @@ msgstr "Nom del sprint"
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Ok"
-msgstr ""
+msgstr "Accepta"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Spent hours"
-msgstr ""
+msgstr "Hores consumides"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_meeting_form
@@ -216,30 +244,34 @@ msgid ""
 "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
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
-msgstr ""
+msgstr "Introdueix una adreça de correu del producte per definir l'esprint."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:327
 #, python-format
 msgid "Scrum Meeting of %s"
-msgstr ""
+msgstr "Reunió scrum de %s"
 
 #. 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 ""
+msgstr "Cartera de productes '% s' es converteix en tasca %d."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
 #, python-format
 msgid "Product Backlog '%s' is assigned sprint:%s"
-msgstr ""
+msgstr "Cartera de productes '%s' se li assigna sprint: %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
@@ -265,7 +297,7 @@ msgstr "Projecte"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Start Task"
-msgstr ""
+msgstr "Inicia tasca"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:90
@@ -273,12 +305,12 @@ msgstr ""
 #: code:addons/project_scrum/wizard/project_scrum_email.py:96
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Sense"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Canvia etapa"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -294,7 +326,7 @@ msgstr "Data de fi"
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Links"
-msgstr ""
+msgstr "Enllaços"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,effective_hours:0
@@ -305,17 +337,17 @@ msgstr "Calculat utilitzant la suma de les tasques realitzades."
 #: code:addons/project_scrum/wizard/project_scrum_email.py:91
 #, python-format
 msgid "Task for Today"
-msgstr ""
+msgstr "Tasca per avui"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Open Backlog"
-msgstr ""
+msgstr "Obre pila"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Spent Hours"
-msgstr ""
+msgstr "Total hores consumides"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
@@ -326,24 +358,24 @@ msgstr "Data d'inici"
 #: code:addons/project_scrum/wizard/project_scrum_email.py:94
 #, python-format
 msgid "Blocking points encountered:"
-msgstr ""
+msgstr "Punts de bloqueig trobats:"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Planning"
-msgstr ""
+msgstr "Planificació"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.email:0
 msgid "_Cancel"
-msgstr ""
+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 ""
+msgstr "La persona que manté els processos per al producte"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -355,7 +387,7 @@ msgstr "Hores planejades"
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Assumpte"
 
 #. module: project_scrum
 #: view:board.board:0
@@ -365,28 +397,29 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Sprints"
-msgstr ""
+msgstr "Sprints"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:314
 #, python-format
 msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
+"No es va poder enviar la notificació per correu a l'amo del producte %s"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Convert To Task"
-msgstr ""
+msgstr "Converteix a tasca"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Are you sure you want to merge these Backlogs?"
-msgstr ""
+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 ""
+msgstr "Usuari responsable que pot treballar en la tasca"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -409,14 +442,14 @@ msgstr "Scrum diari"
 #. module: project_scrum
 #: view:project.scrum.backlog.create.task:0
 msgid "C_onvert"
-msgstr ""
+msgstr "C_onverteix"
 
 #. 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 ""
+msgstr "Piles del producte"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
@@ -425,18 +458,18 @@ msgstr ""
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Error !"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data creació"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Are there anything blocking you?"
-msgstr ""
+msgstr "Hi ha alguna cosa bloquejant-te?"
 
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
@@ -460,32 +493,32 @@ msgstr "Tasques des d'ahir"
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Atenció"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
 msgid "Assign sprint to backlogs"
-msgstr ""
+msgstr "Asigna sprint a piles"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,expected_hours:0
 msgid "Estimated time to do the task."
-msgstr ""
+msgstr "Temps estimat per realitzar la tasca"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,task_hours:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Hores de tasca"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Scrum Master"
-msgstr ""
+msgstr "Envia al scrum master"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
@@ -505,11 +538,13 @@ 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 ""
+msgstr "Diàriament"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
@@ -519,24 +554,24 @@ msgstr "Sprint backlog"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegat"
 
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "El meu taulell"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Postpone Backlog"
-msgstr ""
+msgstr "Postposar pila"
 
 #. 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 ""
+msgstr "Progrés de la tasca"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,date:0
@@ -555,17 +590,17 @@ msgstr "Tasques"
 #. module: project_scrum
 #: field:project.scrum.email,product_owner_email:0
 msgid "Product Owner Email"
-msgstr ""
+msgstr "Correu del propietari del producte"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "_Send"
-msgstr ""
+msgstr "_Envia"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,sprint_id:0
 msgid "Select Sprint to assign backlog."
-msgstr ""
+msgstr "Seleccioneu el Sprint per assignar el backlog."
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,progress:0
@@ -577,7 +612,7 @@ msgstr "Calculat com: Temps dedicat / Temps total."
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
@@ -588,23 +623,24 @@ msgstr "Bloqueigs trobats"
 #: 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.email:0
 #: field:project.scrum.email,message:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: project_scrum
 #: field:project.scrum.email,scrum_master_email:0
 msgid "Scrum Master Email"
-msgstr ""
+msgstr "Correu del scrum master"
 
 #. 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 ""
+msgstr "La persona que és responsable del producte"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -615,7 +651,7 @@ msgstr "Scrum sprint"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Product owner"
-msgstr ""
+msgstr "Propietari del producte"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -643,19 +679,21 @@ msgstr "Esborrany"
 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
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What do you plan to do till the next meeting?"
-msgstr ""
+msgstr "Què planegeu fer fins a la següent reunió?"
 
 #. 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 ""
+msgstr "Ajorna"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -669,17 +707,17 @@ msgstr "Pendent"
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Optional Info"
-msgstr ""
+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 ""
+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 ""
+msgstr "Número de dies reservats per al sprint"
 
 #. module: project_scrum
 #: field:project.project,product_owner_id:0
@@ -690,7 +728,7 @@ 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 ""
+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
@@ -707,12 +745,12 @@ msgstr "Backlogs"
 #: code:addons/project_scrum/project_scrum.py:326
 #, python-format
 msgid "Thank you"
-msgstr ""
+msgstr "Gràcies"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Create Task for Product Backlog"
-msgstr ""
+msgstr "Crea tasca per la pila del producte"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
@@ -723,22 +761,22 @@ msgstr "Actiu"
 #: 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 ""
+msgstr "Reunions scrum"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,expected_hours:0
 msgid "Estimated total time to do the Backlog"
-msgstr ""
+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 ""
+msgstr "Seleccioneu un projecte per a la nova pila de producte"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Merge"
-msgstr ""
+msgstr "Combina"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
@@ -755,7 +793,7 @@ msgstr "Backlogs exactes"
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.product.backlog:0
 msgid "Convert to Task"
-msgstr ""
+msgstr "Converteix a tasca"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,project_id:0
@@ -774,20 +812,20 @@ msgstr "Seqüència"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Product Owner"
-msgstr ""
+msgstr "Envia al propietari del producte"
 
 #. 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 ""
+msgstr "Progrés de la pila"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
 #, python-format
 msgid "Email notification could not be sent to the scrum master %s"
-msgstr ""
+msgstr "No es va poder enviar la notificació de correu al master de scrum %s"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -807,7 +845,7 @@ msgstr "Cancel·la"
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -826,7 +864,7 @@ msgstr "Hores reals"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
-msgstr ""
+msgstr "Informació"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -836,7 +874,7 @@ msgstr "Hores restants"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,name:0
@@ -849,17 +887,17 @@ msgstr "Característica"
 #: view:project.scrum.sprint:0
 #: view:project.task:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "My Backlogs"
-msgstr ""
+msgstr "Les meves piles"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "Send Email for Scrum Meeting Details"
-msgstr ""
+msgstr "Envia correu per als detalls de la reunió Scrum"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
@@ -869,6 +907,11 @@ msgid ""
 "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
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
@@ -894,7 +937,7 @@ msgstr "Reunió scrum"
 #: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
 #: view:project.scrum.sprint:0
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Gràfic de Burndown"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -904,7 +947,7 @@ msgstr "Reunions diàries"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Expected hours"
-msgstr ""
+msgstr "Hores esperades"
 
 #. module: project_scrum
 #: field:project.project,sprint_size:0
@@ -914,7 +957,7 @@ msgstr "Dies del sprint"
 #. module: project_scrum
 #: help:project.scrum.email,product_owner_email:0
 msgid "Email Id of Product Owner"
-msgstr ""
+msgstr "Id del correu del propietari del producte"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,progress:0
@@ -929,6 +972,9 @@ msgid ""
 " \n"
 "I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
 msgstr ""
+"Hola% s,\n"
+"\n"
+"T'envio els detalls de la reunió de a diari de %s la data de la %s Sprint\n"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:325
@@ -943,6 +989,14 @@ msgid ""
 "*Blocks encountered:\n"
 "_______________________ %s"
 msgstr ""
+"\n"
+"* Tasques des d'ahir:\n"
+"_______________________%s\n"
+"* Tasca per avui:\n"
+"_______________________%s\n"
+"\n"
+"* Bloqueja trobat:\n"
+"_______________________% s"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,active:0
@@ -950,11 +1004,13 @@ 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 ""
+msgstr "Temps estimat de les hores totals de les tasques"
 
 #. module: project_scrum
 #: view:project.project:0
@@ -964,12 +1020,12 @@ msgstr "Dades scrum"
 #. module: project_scrum
 #: field:project.project,scrum:0
 msgid "Is a Scrum Project"
-msgstr ""
+msgstr "És un projecte scrum"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Edit"
-msgstr ""
+msgstr "Editeu"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
@@ -979,12 +1035,12 @@ msgstr "Detalls de tasques"
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_postpone_wizard
 msgid "postpone.wizard"
-msgstr ""
+msgstr "posposa.assistent"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Planned Hours"
-msgstr ""
+msgstr "Hores planificades totals"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
@@ -992,73 +1048,78 @@ 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
 #: code:addons/project_scrum/project_scrum.py:303
 #, python-format
 msgid "Please provide email address for scrum master defined on sprint."
 msgstr ""
+"Si us plau, proporcioneu l'adreça de correu electrònic per al master de "
+"scrum definit en el sprint."
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Select the project for merged backlogs"
-msgstr ""
+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 ""
+msgstr "El meu sprint"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,effective_hours:0
 msgid "Spent Hours"
-msgstr ""
+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 ""
+msgstr "Taulell de scrum"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_sprint
 msgid "Project Scrum Sprint"
-msgstr ""
+msgstr "Sprint del projecte scrum"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Feature Description"
-msgstr ""
+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 ""
+msgstr "Si us plau, seleccioneu qualsevol projecte."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:97
 #, python-format
 msgid "Thank you,"
-msgstr ""
+msgstr "Gràcies,"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:90
 #, python-format
 msgid "The sprint '%s' has been closed."
-msgstr ""
+msgstr "El sprint '%s' ha estat tancat."
 
 #. 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 ""
+msgstr "Assignar sprint"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.create.task,user_id:0
@@ -1068,7 +1129,7 @@ msgstr "Assigna a"
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Are you sure to postpone Backlog ?"
-msgstr ""
+msgstr "Segur que desitgeu postposar la pila ?"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,sprint_id:0
@@ -1085,7 +1146,7 @@ msgstr "Sprint"
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
 #, python-format
 msgid "Please select at least two product Backlogs"
-msgstr ""
+msgstr "Si us plau, seleccioneu almenys dues piles de producte"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,review:0
diff --git a/addons/project_scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
index a330261531b..29d3cfcb0ae 100644
--- a/addons/project_scrum/i18n/cs.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index 761d103d5c7..de5196ddcc8 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1495,138 +1495,5 @@ msgstr "Sprint Rückbetrachtung"
 #~ msgid "Delegated To"
 #~ msgstr "Delegiert an"
 
-#~ msgid "Editable"
-#~ msgstr "Bearbeitbar"
-
-#~ msgid "Error! task start-date must be lower then task end-date."
-#~ msgstr "Fehler! Das Anfangsdatum muss kleiner als das Enddatum sein."
-
-#~ msgid "Owners"
-#~ msgstr "Eigentümer"
-
-#~ msgid "Extended Options..."
-#~ msgstr "Erweiterte Optionen.."
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Fehler! Es können keine rekursive Kontenhierarchien erstellt werden."
-
-#~ msgid "Hello"
-#~ msgstr "Hallo"
-
-#~ msgid "Set Open"
-#~ msgstr "Setze auf Offen"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#, python-format
-#~ msgid ""
-#~ "is converted into Task %d.\"%(task_id,))\n"
-#~ "                self.log(cr, uid, backlog.id, message)\n"
-#~ "            if data['state_open'] and backlog.state == \"draft\":\n"
-#~ "                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-#~ "            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-#~ "context=context)\n"
-#~ "            message = _('Product Backlog"
-#~ msgstr ""
-#~ "wurde konvertiert in Aufgabe %d.\"%(task_id,))\n"
-#~ "                self.log(cr, uid, backlog.id, message)\n"
-#~ "            if data['state_open'] and backlog.state == \"draft\":\n"
-#~ "                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-#~ "            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-#~ "context=context)\n"
-#~ "            message = _('Product Backlog"
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "* Hindernisse für Weiterarbeit:"
-
-#, python-format
-#~ msgid "Scrum Meeting of"
-#~ msgstr "Scrum Meeting für"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "für den Sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hallo "
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Aufgaben seit gestern:"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Keine Hindernisse"
-
-#, python-format
-#~ msgid ""
-#~ " Email Not send to the product owner %s!' % "
-#~ "meeting_id.sprint_id.product_owner_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-#~ msgstr ""
-#~ " Email wurde nicht gesendet an den Product Owner  %s!' % "
-#~ "meeting_id.sprint_id.product_owner_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-
-#, python-format
-#~ msgid ""
-#~ " Email Not send to the scrum master %s!' % "
-#~ "meeting_id.sprint_id.scrum_master_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-#~ msgstr ""
-#~ " Email wurde nicht gesendet an den Scrum Master %s!' % "
-#~ "meeting_id.sprint_id.scrum_master_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Ich sende Dir das Tagesprotokoll zum Meeting vom"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "* Heutige Aufgaben:"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "The scrum agile methodology is used in software development projects. In "
-#~ "this methodology, a sprint is a short period of time (one month) on which "
-#~ "the team implement a list of product backlogs. The sprint review is "
-#~ "organized when the team presents his work to the customer and product owner."
-#~ msgstr ""
-#~ "Die Scrum Methodik wird in Softwareentwicklungsprojekten eingesetzt. Bei "
-#~ "dieser Methode repräsentiert ein Sprint einen genau definierten kurzen "
-#~ "Zeitabschnitt (ein Monat) für den ein Projektteam eine vereinbarte Liste an "
-#~ "Produkt Backlogs umsetzt. Der Sprint Review soll dann kurzfristig eine "
-#~ "kritische Rückbetrachtung auf das Projekt bei der Ergebnispräsentation "
-#~ "gegenüber dem Kunden oder dem Produkt Owner ermöglichen."
-
-#~ msgid ""
-#~ "The scrum agile methodology is used in software development projects. The "
-#~ "Product Backlog is the list of features to be implemented. A product backlog "
-#~ "can be planified in a sprint of developement and can be split into several "
-#~ "tasks. The product backlog is managed by the product owner of the project."
-#~ msgstr ""
-#~ "Die Scrum Methodik wird in Softwareentwicklungsprojekten eingesetzt. Das "
-#~ "Produkt Backlog repräsentiert eine Liste an Funktionen die es zu "
-#~ "implementieren gilt. Ein Produkt Backlog kann planerisch in einen Sprint "
-#~ "umgesetzt werden und dabei in eine Liste diverser Aufgaben zerlegt werden. "
-#~ "Das Produkt Backlog wird durch den Produkt Owner für dieses Projekt "
-#~ "verwaltet."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/project_scrum/i18n/el.po b/addons/project_scrum/i18n/el.po
index bf8ab0d3b9e..f5d07df2324 100644
--- a/addons/project_scrum/i18n/el.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 0e7833b6298..992f9348867 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1484,31 +1484,3 @@ msgstr "Revisión del sprint"
 #~ "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."
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "*Bloqueos encontrados:"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "por el sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hola "
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Sin bloqueos"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Tarea para hoy:"
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Tareas desde ayer:"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Le envío los detalles de la reunión diaria de fecha"
diff --git a/addons/project_scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
index e94b55dbd39..33e0a82b853 100644
--- a/addons/project_scrum/i18n/es_AR.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/es_MX.po b/addons/project_scrum/i18n/es_MX.po
new file mode 100644
index 00000000000..8f32f5148e0
--- /dev/null
+++ b/addons/project_scrum/i18n/es_MX.po
@@ -0,0 +1,1486 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-18 08:14+0000\n"
+"Last-Translator: Jorge L Tupac-Yupanqui <Unknown>\n"
+"Language-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:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_scrum
+#: help:project.scrum.email,scrum_master_email:0
+msgid "Email Id of Scrum Master"
+msgstr "Id de correo del Scrum Master"
+
+#. 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
+#: model:ir.module.module,description:project_scrum.module_meta_information
+msgid ""
+"\n"
+"    This module implements all concepts defined by the scrum project\n"
+"    management methodology for IT companies:\n"
+"    * Project with sprints, product owner, scrum master\n"
+"    * Sprints with reviews, daily meetings, feedbacks\n"
+"    * Product backlog\n"
+"    * Sprint backlog\n"
+"\n"
+"    It adds some concepts to the project management module:\n"
+"    * Mid-term, long-term road-map\n"
+"    * Customers/functional requests VS technical ones\n"
+"\n"
+"    It also creates a new reporting:\n"
+"    * Burn-down chart\n"
+"\n"
+"    The scrum projects and tasks inherit from the real projects and\n"
+"    tasks, so you can continue working on normal tasks that will also\n"
+"    include tasks from scrum projects.\n"
+"\n"
+"    More information on the methodology:\n"
+"    * http://controlchaos.com\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo implementa todos los conceptos definidos por la metodología\n"
+"    Scrum de gestión de proyectos para empresas de TI:\n"
+"    * Proyecto con sprints, product owner, scrum master\n"
+"    * Sprints con revisiones, reuniones diarias, comentarios\n"
+"    * Product backlog\n"
+"    * Sprint backlog\n"
+"\n"
+"    Añade algunos conceptos al módulo de gestión de proyectos:\n"
+"     * Hoja de ruta a medio plazo, a largo plazo\n"
+"     * Solicitudes clientes/funcional versus solicitudes técnicas\n"
+"\n"
+"    También crea un nuevo reporte:\n"
+"    * Gráfico de trabajo pendiente\n"
+"\n"
+"    Los proyectos y tareas scrum heredan de los proyectos y tareas\n"
+"    reales, así usted puede seguir trabajando en tareas normales que "
+"también\n"
+"    incluirán tareas de los proyectos scrum.\n"
+"\n"
+"    Más información sobre la metodología:\n"
+"    * http://controlchaos.com\n"
+"    "
+
+#. 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
+#: 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
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
+msgid "Scrum, Agile Development Method"
+msgstr "Scrum, método de desarrollo ágil"
+
+#. module: project_scrum
+#: field:project.scrum.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
+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
+#: 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/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
+#: model:ir.model,name:project_scrum.model_project_scrum_email
+msgid "project.scrum.email"
+msgstr "proyecto.scrum.correoe"
+
+#. 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
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nombre del sprint"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:316
+#, python-format
+msgid "Please provide email address for product owner defined on sprint."
+msgstr ""
+"Intruduze una dirección de correo del producto para definir el esprint."
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:327
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr "Reunión scrum de %s"
+
+#. 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
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
+#, python-format
+msgid "Product Backlog '%s' is assigned sprint:%s"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
+#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
+#: view:project.scrum.product.backlog:0
+#: field:project.task,product_backlog_id:0
+#, python-format
+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:90
+#: code:addons/project_scrum/wizard/project_scrum_email.py:93
+#: code:addons/project_scrum/wizard/project_scrum_email.py:96
+#, python-format
+msgid "None"
+msgstr "Ninguno"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Stage"
+msgstr "Cambiar etapa"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Info. del sprint"
+
+#. 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:91
+#, 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
+#: field:project.scrum.sprint,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:94
+#, python-format
+msgid "Blocking points encountered:"
+msgstr "Puntos de bloqueo encontrados:"
+
+#. 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
+#: view:project.scrum.email: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
+#: field:project.scrum.email,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:314
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
+msgstr ""
+"No se pudo mandar la notificación por correo al dueño del producto %s"
+
+#. 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
+#: 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
+#: 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
+#: code:addons/project_scrum/project_scrum.py:301
+#: code:addons/project_scrum/project_scrum.py:303
+#: code:addons/project_scrum/project_scrum.py:314
+#: code:addons/project_scrum/project_scrum.py:316
+#, python-format
+msgid "Error !"
+msgstr "¡ Error !"
+
+#. 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:88
+#: 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
+#: 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
+#: view:project.scrum.sprint:0
+msgid "Send to Scrum Master"
+msgstr "Enviar al scrum master"
+
+#. 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/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
+#: view:postpone.wizard:0
+msgid "Postpone Backlog"
+msgstr "Postponer pila"
+
+#. 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
+#: 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
+#: field:project.scrum.email,product_owner_email:0
+msgid "Product Owner Email"
+msgstr "Correo dueño del producto"
+
+#. module: project_scrum
+#: view:project.scrum.email:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. 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
+#: 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.email:0
+#: field:project.scrum.email,message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_scrum
+#: field:project.scrum.email,scrum_master_email:0
+msgid "Scrum Master Email"
+msgstr "Correo del maestro de scrum"
+
+#. 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 "Scrum Sprint"
+msgstr "Scrum sprint"
+
+#. 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: code:addons/project_scrum/project_scrum.py:326
+#, python-format
+msgid "Thank you"
+msgstr "Gracias"
+
+#. 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:project.scrum.sprint:0
+msgid "Send to Product Owner"
+msgstr "Enviar al dueño de producto"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:301
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr "No se pudo enviar la notificación de correo al maestro de scrum %s"
+
+#. 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
+#: view:project.scrum.product.backlog:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. 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.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+#: view:project.task:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "My Backlogs"
+msgstr "Mis pilas"
+
+#. module: project_scrum
+#: view:project.scrum.email:0
+msgid "Send Email for Scrum Meeting Details"
+msgstr "Enviar correo para los detalles de la reunión Scrum"
+
+#. 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
+#: 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
+#: model:ir.actions.act_window,name:project_scrum.action_project_scrum_email
+#: model:ir.model,name:project_scrum.model_project_scrum_meeting
+#: view:project.scrum.email:0
+#: 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.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
+#: help:project.scrum.email,product_owner_email:0
+msgid "Email Id of Product Owner"
+msgstr "Id del correo del dueño de producto"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progreso (0-100)"
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:324
+#, python-format
+msgid ""
+"Hello %s,\n"
+" \n"
+"I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:325
+#, python-format
+msgid ""
+"\n"
+"*Tasks since yesterday:\n"
+"_______________________%s\n"
+"*Task for Today:\n"
+"_______________________ %s\n"
+"\n"
+"*Blocks encountered:\n"
+"_______________________ %s"
+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 ""
+"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.product.backlog:0
+msgid "Total Planned Hours"
+msgstr "Horas planeadas totales"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:303
+#, python-format
+msgid "Please provide email address for scrum master defined on sprint."
+msgstr ""
+"Por favor, proporcione la dirección de correo electrónico para el maestro de "
+"scrum definido en el sprint."
+
+#. 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:97
+#, python-format
+msgid "Thank you,"
+msgstr "Gracias,"
+
+#. 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
+#: 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
+#: 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 "Draft Backlogs"
+#~ msgstr "Backlogs borrador"
+
+#~ 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 "In Progress"
+#~ msgstr "En progreso"
+
+#~ 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 "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."
diff --git a/addons/project_scrum/i18n/es_VE.po b/addons/project_scrum/i18n/es_VE.po
new file mode 100644
index 00000000000..8f32f5148e0
--- /dev/null
+++ b/addons/project_scrum/i18n/es_VE.po
@@ -0,0 +1,1486 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-18 08:14+0000\n"
+"Last-Translator: Jorge L Tupac-Yupanqui <Unknown>\n"
+"Language-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:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_scrum
+#: help:project.scrum.email,scrum_master_email:0
+msgid "Email Id of Scrum Master"
+msgstr "Id de correo del Scrum Master"
+
+#. 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
+#: model:ir.module.module,description:project_scrum.module_meta_information
+msgid ""
+"\n"
+"    This module implements all concepts defined by the scrum project\n"
+"    management methodology for IT companies:\n"
+"    * Project with sprints, product owner, scrum master\n"
+"    * Sprints with reviews, daily meetings, feedbacks\n"
+"    * Product backlog\n"
+"    * Sprint backlog\n"
+"\n"
+"    It adds some concepts to the project management module:\n"
+"    * Mid-term, long-term road-map\n"
+"    * Customers/functional requests VS technical ones\n"
+"\n"
+"    It also creates a new reporting:\n"
+"    * Burn-down chart\n"
+"\n"
+"    The scrum projects and tasks inherit from the real projects and\n"
+"    tasks, so you can continue working on normal tasks that will also\n"
+"    include tasks from scrum projects.\n"
+"\n"
+"    More information on the methodology:\n"
+"    * http://controlchaos.com\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo implementa todos los conceptos definidos por la metodología\n"
+"    Scrum de gestión de proyectos para empresas de TI:\n"
+"    * Proyecto con sprints, product owner, scrum master\n"
+"    * Sprints con revisiones, reuniones diarias, comentarios\n"
+"    * Product backlog\n"
+"    * Sprint backlog\n"
+"\n"
+"    Añade algunos conceptos al módulo de gestión de proyectos:\n"
+"     * Hoja de ruta a medio plazo, a largo plazo\n"
+"     * Solicitudes clientes/funcional versus solicitudes técnicas\n"
+"\n"
+"    También crea un nuevo reporte:\n"
+"    * Gráfico de trabajo pendiente\n"
+"\n"
+"    Los proyectos y tareas scrum heredan de los proyectos y tareas\n"
+"    reales, así usted puede seguir trabajando en tareas normales que "
+"también\n"
+"    incluirán tareas de los proyectos scrum.\n"
+"\n"
+"    Más información sobre la metodología:\n"
+"    * http://controlchaos.com\n"
+"    "
+
+#. 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
+#: 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
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
+msgid "Scrum, Agile Development Method"
+msgstr "Scrum, método de desarrollo ágil"
+
+#. module: project_scrum
+#: field:project.scrum.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
+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
+#: 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/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
+#: model:ir.model,name:project_scrum.model_project_scrum_email
+msgid "project.scrum.email"
+msgstr "proyecto.scrum.correoe"
+
+#. 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
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nombre del sprint"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:316
+#, python-format
+msgid "Please provide email address for product owner defined on sprint."
+msgstr ""
+"Intruduze una dirección de correo del producto para definir el esprint."
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:327
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr "Reunión scrum de %s"
+
+#. 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
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
+#, python-format
+msgid "Product Backlog '%s' is assigned sprint:%s"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
+#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
+#: view:project.scrum.product.backlog:0
+#: field:project.task,product_backlog_id:0
+#, python-format
+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:90
+#: code:addons/project_scrum/wizard/project_scrum_email.py:93
+#: code:addons/project_scrum/wizard/project_scrum_email.py:96
+#, python-format
+msgid "None"
+msgstr "Ninguno"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Stage"
+msgstr "Cambiar etapa"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Info. del sprint"
+
+#. 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:91
+#, 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
+#: field:project.scrum.sprint,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:94
+#, python-format
+msgid "Blocking points encountered:"
+msgstr "Puntos de bloqueo encontrados:"
+
+#. 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
+#: view:project.scrum.email: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
+#: field:project.scrum.email,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:314
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
+msgstr ""
+"No se pudo mandar la notificación por correo al dueño del producto %s"
+
+#. 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
+#: 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
+#: 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
+#: code:addons/project_scrum/project_scrum.py:301
+#: code:addons/project_scrum/project_scrum.py:303
+#: code:addons/project_scrum/project_scrum.py:314
+#: code:addons/project_scrum/project_scrum.py:316
+#, python-format
+msgid "Error !"
+msgstr "¡ Error !"
+
+#. 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:88
+#: 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
+#: 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
+#: view:project.scrum.sprint:0
+msgid "Send to Scrum Master"
+msgstr "Enviar al scrum master"
+
+#. 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/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
+#: view:postpone.wizard:0
+msgid "Postpone Backlog"
+msgstr "Postponer pila"
+
+#. 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
+#: 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
+#: field:project.scrum.email,product_owner_email:0
+msgid "Product Owner Email"
+msgstr "Correo dueño del producto"
+
+#. module: project_scrum
+#: view:project.scrum.email:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. 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
+#: 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.email:0
+#: field:project.scrum.email,message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_scrum
+#: field:project.scrum.email,scrum_master_email:0
+msgid "Scrum Master Email"
+msgstr "Correo del maestro de scrum"
+
+#. 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 "Scrum Sprint"
+msgstr "Scrum sprint"
+
+#. 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: code:addons/project_scrum/project_scrum.py:326
+#, python-format
+msgid "Thank you"
+msgstr "Gracias"
+
+#. 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:project.scrum.sprint:0
+msgid "Send to Product Owner"
+msgstr "Enviar al dueño de producto"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:301
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr "No se pudo enviar la notificación de correo al maestro de scrum %s"
+
+#. 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
+#: view:project.scrum.product.backlog:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. 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.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+#: view:project.task:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "My Backlogs"
+msgstr "Mis pilas"
+
+#. module: project_scrum
+#: view:project.scrum.email:0
+msgid "Send Email for Scrum Meeting Details"
+msgstr "Enviar correo para los detalles de la reunión Scrum"
+
+#. 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
+#: 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
+#: model:ir.actions.act_window,name:project_scrum.action_project_scrum_email
+#: model:ir.model,name:project_scrum.model_project_scrum_meeting
+#: view:project.scrum.email:0
+#: 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.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
+#: help:project.scrum.email,product_owner_email:0
+msgid "Email Id of Product Owner"
+msgstr "Id del correo del dueño de producto"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progreso (0-100)"
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:324
+#, python-format
+msgid ""
+"Hello %s,\n"
+" \n"
+"I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:325
+#, python-format
+msgid ""
+"\n"
+"*Tasks since yesterday:\n"
+"_______________________%s\n"
+"*Task for Today:\n"
+"_______________________ %s\n"
+"\n"
+"*Blocks encountered:\n"
+"_______________________ %s"
+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 ""
+"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.product.backlog:0
+msgid "Total Planned Hours"
+msgstr "Horas planeadas totales"
+
+#. 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
+#: code:addons/project_scrum/project_scrum.py:303
+#, python-format
+msgid "Please provide email address for scrum master defined on sprint."
+msgstr ""
+"Por favor, proporcione la dirección de correo electrónico para el maestro de "
+"scrum definido en el sprint."
+
+#. 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:97
+#, python-format
+msgid "Thank you,"
+msgstr "Gracias,"
+
+#. 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
+#: 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
+#: 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 "Draft Backlogs"
+#~ msgstr "Backlogs borrador"
+
+#~ 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 "In Progress"
+#~ msgstr "En progreso"
+
+#~ 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 "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."
diff --git a/addons/project_scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
index cada072d522..626a7a25c60 100644
--- a/addons/project_scrum/i18n/et.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1417,12 +1417,3 @@ msgstr "Sprindi ülevaade"
 
 #~ msgid "Running"
 #~ msgstr "Töös"
-
-#~ msgid "Editable"
-#~ msgstr "Redigeeritav"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Viga! Sa ei saa luua rekursiivseid analüütilisi kontosid."
-
-#~ msgid "Hello"
-#~ msgstr "Tere"
diff --git a/addons/project_scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
index e75844700af..a4109b8e61e 100644
--- a/addons/project_scrum/i18n/fr.po
+++ b/addons/project_scrum/i18n/fr.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-18 16:47+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-11-25 14:47+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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -977,6 +976,10 @@ msgid ""
 " \n"
 "I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
 msgstr ""
+"Bonjour %s,\n"
+" \n"
+"Je vous envoie les informations du rendez-vous quotidien du %s en vue du "
+"\"sprint\" %s\n"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:325
@@ -991,6 +994,14 @@ msgid ""
 "*Blocks encountered:\n"
 "_______________________ %s"
 msgstr ""
+"\n"
+"* Tâches depuis hier :\n"
+"_______________________%s\n"
+"* Tâches pour aujourd'hui :\n"
+"_______________________ %s\n"
+"\n"
+"* Blocages rencontrés :\n"
+"_______________________ %s"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,active:0
@@ -1441,31 +1452,3 @@ msgstr "Revue de Sprint"
 
 #~ 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."
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Tâches depuis hier :"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "pour le sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Bonjour "
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "* Blocages rencontrés :"
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Nb de blocs"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Je vous envoie les détails de la mêlée quotidienne de la date"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Tâche pour aujourd'hui :"
diff --git a/addons/project_scrum/i18n/gu.po b/addons/project_scrum/i18n/gu.po
index 1dceeb5ad25..0ceea4c40ea 100644
--- a/addons/project_scrum/i18n/gu.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
index 42407a95113..dcdffaf8c28 100644
--- a/addons/project_scrum/i18n/hr.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
index 29132eb3795..8b9fcc03f7e 100644
--- a/addons/project_scrum/i18n/hu.po
+++ b/addons/project_scrum/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-26 14:04+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1090,15 +1091,3 @@ msgstr ""
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
 msgstr ""
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hello "
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Feladatok tegnap óta:"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Mai feladatok:"
diff --git a/addons/project_scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
index 406f879de46..bbcb091a9a0 100644
--- a/addons/project_scrum/i18n/id.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
index b80e130d36a..b2ee8d29011 100644
--- a/addons/project_scrum/i18n/it.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1270,7 +1270,3 @@ msgstr "Revisione Sprint"
 
 #~ msgid "Created tasks"
 #~ msgstr "Attività Create"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Salve "
diff --git a/addons/project_scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
index 01149cf560b..063ac30e2e3 100644
--- a/addons/project_scrum/i18n/ko.po
+++ b/addons/project_scrum/i18n/ko.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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
index 42407a95113..dcdffaf8c28 100644
--- a/addons/project_scrum/i18n/lt.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
index 9e3e1313699..b746caad8ed 100644
--- a/addons/project_scrum/i18n/nl.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1471,31 +1471,3 @@ msgstr "Sprint evaluatie"
 #~ msgstr ""
 #~ "Voetregels die worden toegevoegd aan het emailbericht waarmee de klant wordt "
 #~ "gewaarschuwd als een taak wordt afgesloten."
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "*Blokkades ontdekt:"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "voor de Sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hallo "
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Taken sinds gisteren:"
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Geeb blokkades"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Ik stuur u de dagelijkse vergadering details van datum"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Taak voor vandaag:"
diff --git a/addons/project_scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
index 77608115a8a..64d9869cb6c 100644
--- a/addons/project_scrum/i18n/nl_BE.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
index 1b84fb87b27..66f641636ae 100644
--- a/addons/project_scrum/i18n/pl.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1314,15 +1314,9 @@ msgstr "Przegląd sprintu"
 #~ "Czas pozostały. Może być okresowo przeszacowany przez osobę przypisaną do "
 #~ "zadania."
 
-#~ msgid "Editable"
-#~ msgstr "Edytowalne"
-
 #~ msgid "What have you accomplished since yesterday ?"
 #~ msgstr "Co osiągnąłeś od wczoraj ?"
 
-#~ msgid "Owners"
-#~ msgstr "Właściciele"
-
 #~ msgid "Mail Header"
 #~ msgstr "Magłówek wiadomości"
 
@@ -1346,9 +1340,6 @@ msgstr "Przegląd sprintu"
 #~ msgid "Computed as: Time Spent + Remaining Time."
 #~ msgstr "Obliczone jako: Czas spędzony + Czas pozostały"
 
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
-
 #~ msgid "Delay Hours"
 #~ msgstr "Opóźnienie"
 
@@ -1370,9 +1361,6 @@ msgstr "Przegląd sprintu"
 #~ msgid "Sum of planned hours of all tasks related to this project."
 #~ msgstr "Suma planowanych godzin dla wszystkich zadań projektu."
 
-#~ msgid "Set Open"
-#~ msgstr "Ustaw na otwarte"
-
 #~ msgid "Task summary"
 #~ msgstr "Podsumowanie zadania"
 
@@ -1382,10 +1370,3 @@ msgstr "Przegląd sprintu"
 #~ msgstr ""
 #~ "Nagłówek dodawany na początek wiadomości informującej klienta o zamknięciu "
 #~ "zadania."
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Wysyłam Ci szczegóły codziennego spotkania z daty"
-
-#~ msgid "Hello"
-#~ msgstr "Witaj"
diff --git a/addons/project_scrum/i18n/pt.po b/addons/project_scrum/i18n/pt.po
index 240475d84b9..474a5c2ff92 100644
--- a/addons/project_scrum/i18n/pt.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1421,15 +1421,3 @@ msgstr "Rever Sprint"
 
 #~ msgid "Mail Footer"
 #~ msgstr "Rodapé do Mail"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Olá "
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Tarefa do dia:"
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Tarefas desde ontem:"
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
index 43db6ff561a..f48bfdeecee 100644
--- a/addons/project_scrum/i18n/pt_BR.po
+++ b/addons/project_scrum/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-15 16:12+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-10-13 00:57+0000\n"
+"Last-Translator: Joe Pimentel <joe.b.pimentel@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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
 msgid "Email Id of Scrum Master"
-msgstr ""
+msgstr "Email do Scrum Master"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
@@ -68,12 +68,35 @@ msgid ""
 "    * http://controlchaos.com\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo implementa todos os conceitos definidos pela metodologia de "
+"gerenciamento\n"
+"    de projeto Scrum para empresas de TI:\n"
+"    * Projetos com sprints, Dono do Produto, Scrum Master\n"
+"    * Sprints com Revisões, Encontros Diários, Feedbacks\n"
+"    * Backlog do Produto\n"
+"    * Backlog do Sprint \n"
+"\n"
+"    Ele adiciona alguns conceitos ao modulo de gerenciamento de projetos:\n"
+"    * Roteiros de Médio e longo prazo\n"
+"    * Requisitos Funcionais/de Clientes VS  técnicos\n"
+"\n"
+"    Ele também cria umnovo relatório:\n"
+"    * Burn-down chart\n"
+"\n"
+"    The scrum projects and tasks inherit from the real projects and\n"
+"    tasks, so you can continue working on normal tasks that will also\n"
+"    include tasks from scrum projects.\n"
+"\n"
+"    Mais informações sobre a Metodologia:\n"
+"    * http://controlchaos.com\n"
+"    "
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What did you do since the last meeting?"
-msgstr ""
+msgstr "O que você executou desde a última reunião?"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
@@ -83,6 +106,11 @@ msgid ""
 "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
@@ -117,7 +145,7 @@ msgstr "Scrum Master"
 #: code:addons/project_scrum/project_scrum.py:83
 #, python-format
 msgid "The sprint '%s' has been opened."
-msgstr ""
+msgstr "O Sprint '%s' foi iniciado."
 
 #. module: project_scrum
 #: constraint:project.project:0
@@ -159,24 +187,24 @@ msgstr "Definir como Provisório"
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
 msgid "Merge Product Backlogs"
-msgstr ""
+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 ""
+msgstr "Mesclar Backlogs"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:53
 #, python-format
 msgid "Scrum Meeting : %s"
-msgstr ""
+msgstr "Reuniáo Scrum: %s"
 
 #. module: project_scrum
 #: view:project.task:0
 msgid "Backlog"
-msgstr ""
+msgstr "Backlog"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_email
@@ -206,7 +234,7 @@ msgstr "Ok"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Spent hours"
-msgstr ""
+msgstr "Horas Gastas"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_meeting_form
@@ -215,30 +243,36 @@ msgid ""
 "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
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
+"Por favor, forneça um endereço de email para o Dono do Produto definido no "
+"Sprint."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:327
 #, python-format
 msgid "Scrum Meeting of %s"
-msgstr ""
+msgstr "Reunião Scrum de %s"
 
 #. 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 ""
+msgstr "Backlog de Produto '%s' esta convertida na Tarefa %d."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
 #, python-format
 msgid "Product Backlog '%s' is assigned sprint:%s"
-msgstr ""
+msgstr "Backlog de Produto '%s' esta atribuída a Sprint: %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
@@ -264,7 +298,7 @@ msgstr "Projeto"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Start Task"
-msgstr ""
+msgstr "Iniciar Tarefa"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:90
@@ -272,12 +306,12 @@ msgstr ""
 #: code:addons/project_scrum/wizard/project_scrum_email.py:96
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Nenhum(a)"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Mudar Estágio"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -293,7 +327,7 @@ msgstr "Data Final"
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Links"
-msgstr ""
+msgstr "Ligações"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,effective_hours:0
@@ -304,17 +338,17 @@ msgstr "Calculado usando a soma do trabalho realizado da tarefa."
 #: code:addons/project_scrum/wizard/project_scrum_email.py:91
 #, python-format
 msgid "Task for Today"
-msgstr ""
+msgstr "Tarefa de Hoje"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Open Backlog"
-msgstr ""
+msgstr "Abrir Backlog"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Spent Hours"
-msgstr ""
+msgstr "Total de Horas Gastas"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
@@ -325,24 +359,24 @@ msgstr "Data de Início"
 #: code:addons/project_scrum/wizard/project_scrum_email.py:94
 #, python-format
 msgid "Blocking points encountered:"
-msgstr ""
+msgstr "Pontos de bloqueio encontrados:"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Planning"
-msgstr ""
+msgstr "Planejamento"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.email:0
 msgid "_Cancel"
-msgstr ""
+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 ""
+msgstr "A pessoa que mantem os processos para o produto"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -354,7 +388,7 @@ msgstr "Horas planejadas"
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Assunto"
 
 #. module: project_scrum
 #: view:board.board:0
@@ -364,28 +398,28 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Sprints"
-msgstr ""
+msgstr "Sprints"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:314
 #, python-format
 msgid "Email notification could not be sent to the product owner %s"
-msgstr ""
+msgstr "Email de notificação não pode ser enviado para o Dono do Prodyuto %s"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Convert To Task"
-msgstr ""
+msgstr "Converter em Tarefa"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Are you sure you want to merge these Backlogs?"
-msgstr ""
+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 ""
+msgstr "Usuário responsável que pode trabalhar na tarefa"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -408,14 +442,14 @@ msgstr "Scrum Diário"
 #. module: project_scrum
 #: view:project.scrum.backlog.create.task:0
 msgid "C_onvert"
-msgstr ""
+msgstr "C_onverter"
 
 #. 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 ""
+msgstr "Backlogs de Produto"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
@@ -424,18 +458,18 @@ msgstr ""
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro!"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,create_date:0
 msgid "Creation Date"
-msgstr ""
+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 ""
+msgstr "Existe alguma coisa bloqueando você?"
 
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
@@ -459,32 +493,32 @@ msgstr "Tarefas desde ontem"
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
 msgid "Assign sprint to backlogs"
-msgstr ""
+msgstr "Atribuir Sprint para Backlogs"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,expected_hours:0
 msgid "Estimated time to do the task."
-msgstr ""
+msgstr "Tempo estimado para realizar a tarefa"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,task_hours:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Horas da Tarefa"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Dates"
-msgstr ""
+msgstr "Datas"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Scrum Master"
-msgstr ""
+msgstr "Enviar para Scrum Master"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
@@ -504,11 +538,13 @@ 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 ""
+msgstr "Diária"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
@@ -518,24 +554,24 @@ msgstr "Backlog do Sprint"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegar"
 
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Meu Painel"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Postpone Backlog"
-msgstr ""
+msgstr "Adiar Backlog"
 
 #. 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 ""
+msgstr "Progresso da Tarefa"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,date:0
@@ -554,17 +590,17 @@ msgstr "Tarefas"
 #. module: project_scrum
 #: field:project.scrum.email,product_owner_email:0
 msgid "Product Owner Email"
-msgstr ""
+msgstr "Email do Dono do Produto"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "_Send"
-msgstr ""
+msgstr "_Enviar"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,sprint_id:0
 msgid "Select Sprint to assign backlog."
-msgstr ""
+msgstr "Selecione Sprint para atribuir Backlog"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,progress:0
@@ -576,7 +612,7 @@ msgstr "Calculado como: Tempo Gasto / Tempo Total."
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
@@ -587,23 +623,25 @@ msgstr "Bloqueios encontrados"
 #: 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.email:0
 #: field:project.scrum.email,message:0
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
 #. module: project_scrum
 #: field:project.scrum.email,scrum_master_email:0
 msgid "Scrum Master Email"
-msgstr ""
+msgstr "Email do Scrum Master"
 
 #. 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 ""
+msgstr "A pesoa que é responsável pelo produto"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -614,7 +652,7 @@ msgstr "Scrum Sprint"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Product owner"
-msgstr ""
+msgstr "Dono do Produto"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -642,19 +680,21 @@ msgstr "Esboço"
 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
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What do you plan to do till the next meeting?"
-msgstr ""
+msgstr "O que você planeja realizar até a próxima reuniáo"
 
 #. 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 ""
+msgstr "Adiar"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -668,17 +708,17 @@ msgstr "Pendente"
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Optional Info"
-msgstr ""
+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 ""
+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 ""
+msgstr "Número de dias alocados para o Sprint"
 
 #. module: project_scrum
 #: field:project.project,product_owner_id:0
@@ -690,6 +730,7 @@ msgstr "Proprietário do Produto"
 #: 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
@@ -706,12 +747,12 @@ msgstr "Backlogs"
 #: code:addons/project_scrum/project_scrum.py:326
 #, python-format
 msgid "Thank you"
-msgstr ""
+msgstr "Obrigado"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Create Task for Product Backlog"
-msgstr ""
+msgstr "Criar Tarefa para o Backlog de Produto"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
@@ -722,22 +763,22 @@ msgstr "Ativo"
 #: 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 ""
+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 ""
+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 ""
+msgstr "Selecione o projeto para o novo Backlog de Produto"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Merge"
-msgstr ""
+msgstr "Mesclar"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
@@ -754,7 +795,7 @@ msgstr "Precisão do Backlog"
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.product.backlog:0
 msgid "Convert to Task"
-msgstr ""
+msgstr "Converter para Tarefa"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,project_id:0
@@ -773,20 +814,20 @@ msgstr "Seqüência"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Product Owner"
-msgstr ""
+msgstr "Enviar para o Dono do Produto"
 
 #. 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 ""
+msgstr "Progresso do Backlog"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
 #, python-format
 msgid "Email notification could not be sent to the scrum master %s"
-msgstr ""
+msgstr "Notificação de Email não pode ser enviada para o Scrum Master %s"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -806,7 +847,7 @@ msgstr "Cancelar"
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -825,7 +866,7 @@ msgstr "Horas efetivas"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
-msgstr ""
+msgstr "Informação"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -835,7 +876,7 @@ msgstr "Horas Restantes"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsável"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,name:0
@@ -848,17 +889,17 @@ msgstr "Característica"
 #: view:project.scrum.sprint:0
 #: view:project.task:0
 msgid "Current"
-msgstr ""
+msgstr "Atual"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "My Backlogs"
-msgstr ""
+msgstr "Meus Backlogs"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "Send Email for Scrum Meeting Details"
-msgstr ""
+msgstr "Enviar email para Detalhes da Reunião Scrum"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
@@ -868,6 +909,11 @@ msgid ""
 "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
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
@@ -893,7 +939,7 @@ msgstr "Reunião de Scrum"
 #: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
 #: view:project.scrum.sprint:0
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Burndown Chart"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -903,7 +949,7 @@ msgstr "Reuniões Diárias"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Expected hours"
-msgstr ""
+msgstr "Horas Esperadas"
 
 #. module: project_scrum
 #: field:project.project,sprint_size:0
@@ -913,7 +959,7 @@ msgstr "Dias do Sprint"
 #. module: project_scrum
 #: help:project.scrum.email,product_owner_email:0
 msgid "Email Id of Product Owner"
-msgstr ""
+msgstr "Id do Email do Dono do Produto"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,progress:0
@@ -928,6 +974,10 @@ msgid ""
 " \n"
 "I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
 msgstr ""
+"Olá %s,\n"
+"\n"
+"Estou lhe enviando os Detalhes da Reunião Diária da data %s para o Sprint "
+"%s\n"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:325
@@ -942,6 +992,14 @@ msgid ""
 "*Blocks encountered:\n"
 "_______________________ %s"
 msgstr ""
+"\n"
+"*Tarefas desde ontem:\n"
+"_______________________%s\n"
+"*Tarefas para Hoje:\n"
+"_______________________ %s\n"
+"\n"
+"*Bloqueios encontrados:\n"
+"_______________________ %s"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,active:0
@@ -949,11 +1007,13 @@ 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 ""
+msgstr "Tempo estimado do total de horas das tarefas"
 
 #. module: project_scrum
 #: view:project.project:0
@@ -963,12 +1023,12 @@ msgstr "Dados do Scrum"
 #. module: project_scrum
 #: field:project.project,scrum:0
 msgid "Is a Scrum Project"
-msgstr ""
+msgstr "É um Projeto Scrum"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
@@ -978,12 +1038,12 @@ msgstr "Detalhes das Tarefas"
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_postpone_wizard
 msgid "postpone.wizard"
-msgstr ""
+msgstr "postpone.wizard"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Planned Hours"
-msgstr ""
+msgstr "Horas Totais Planejadas"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
@@ -991,39 +1051,43 @@ 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
 #: code:addons/project_scrum/project_scrum.py:303
 #, python-format
 msgid "Please provide email address for scrum master defined on sprint."
 msgstr ""
+"Favor providenciar endereço de email do Scrum Master definido no Sprint"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Select the project for merged backlogs"
-msgstr ""
+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 ""
+msgstr "Meu Sprint"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,effective_hours:0
 msgid "Spent Hours"
-msgstr ""
+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 ""
+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 ""
+msgstr "Painel Scrum"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_sprint
@@ -1033,31 +1097,31 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Feature Description"
-msgstr ""
+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 ""
+msgstr "Favor selecionar algum Projeto"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:97
 #, python-format
 msgid "Thank you,"
-msgstr ""
+msgstr "Obrigado"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:90
 #, python-format
 msgid "The sprint '%s' has been closed."
-msgstr ""
+msgstr "O Sprint '%s' foi fechado."
 
 #. 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 ""
+msgstr "Atribuir Sprint"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.create.task,user_id:0
@@ -1067,7 +1131,7 @@ msgstr "Atribuir para"
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Are you sure to postpone Backlog ?"
-msgstr ""
+msgstr "Tem certeza de adiar Backlog"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,sprint_id:0
@@ -1084,7 +1148,7 @@ msgstr "Sprint"
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
 #, python-format
 msgid "Please select at least two product Backlogs"
-msgstr ""
+msgstr "Favor selecionar no mínimo dois Backlogs de Produto"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,review:0
diff --git a/addons/project_scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
index 42407a95113..dcdffaf8c28 100644
--- a/addons/project_scrum/i18n/ro.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
index 6c8be6ef4d8..394e9f9715b 100644
--- a/addons/project_scrum/i18n/ru.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
index c10bbc45aaa..1e1f9670e86 100644
--- a/addons/project_scrum/i18n/sl.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
index 360ea401297..1487fc47ab0 100644
--- a/addons/project_scrum/i18n/sq.po
+++ b/addons/project_scrum/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
index 1e5b3c31010..96dcf417dc1 100644
--- a/addons/project_scrum/i18n/sv.po
+++ b/addons/project_scrum/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: 2011-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1123,7 +1123,3 @@ msgstr ""
 
 #~ msgid "Users"
 #~ msgstr "Användare"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hej "
diff --git a/addons/project_scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
index 8d91d713666..b7b57b2c510 100644
--- a/addons/project_scrum/i18n/tlh.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 9f808b4ee79..82cb958a872 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
index 09fbd975e84..c189d5cd7b4 100644
--- a/addons/project_scrum/i18n/uk.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
index ccd8cb95bf6..87bae4cfc22 100644
--- a/addons/project_scrum/i18n/vi.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
index 2e69a1eaf66..d8f9dec2afd 100644
--- a/addons/project_scrum/i18n/zh_CN.po
+++ b/addons/project_scrum/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: 2011-08-17 04:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
index aefa0347025..a3be38686c5 100644
--- a/addons/project_scrum/i18n/zh_TW.po
+++ b/addons/project_scrum/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: 2011-04-29 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 334a415982d..1ac0871de68 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -317,6 +317,7 @@ class project_scrum_meeting(osv.osv):
         return True
 
     def email_send(self, cr, uid, ids, email, context=None):
+        mail_message_obj = self.pool.get('mail.message')
         meeting_id = self.browse(cr, uid, ids, context=context)[0]
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         user_email = user.user_email or tools.config.get('email_from', False)
@@ -324,10 +325,12 @@ class project_scrum_meeting(osv.osv):
         body += _('\n* Tasks since yesterday:\n_______________________\n%s\n\n* Task for Today:\n_______________________ \n%s\n\n* Blocks encountered:\n_______________________ \n\n%s') %(meeting_id.question_yesterday,meeting_id.question_today, meeting_id.question_blocks or _('No Blocks'))
         body += _("\n\nThank you,\n%s") % user.name
         sub_name = meeting_id.name or _('Scrum Meeting of %s') % meeting_id.date
-        flag = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id))
+        flag = mail_message_obj.schedule_with_attach(cr, uid, user_email , [email], sub_name, body, model='project.scrum.meeting', res_id=meeting_id.id, context=context)
         if not flag:
             return False
         return True
 
 project_scrum_meeting()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index aa16a62c0b9..09d018aeb92 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -33,7 +33,7 @@
             <field name="model">project.scrum.product.backlog</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel','done');blue:state in ('pending')" string="Product Backlog">
+                <tree colors="grey:state in ('cancel','done');blue:state == 'pending'" string="Product Backlog">
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="project_id"/>
@@ -61,8 +61,8 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
-     					<button name="%(action_postpone_wizard)d" string="Postpone" type="action"
-							help="Postpone backlog" colspan="2"
+                        <button name="%(action_postpone_wizard)d" string="Postpone" type="action"
+                            help="Postpone backlog" colspan="2"
                          icon="gtk-convert"  attrs="{'invisible':[('state','in',['done', 'cancel'])]}"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
@@ -129,15 +129,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter
                             icon="terp-check"
-                            string="Current"
+                            string="Draft"
                             name="current"
-                            domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open','pending'])]"
-                            help="Draft, Open and Pending Backlogs"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
+                            domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','=','draft')]"
+                            help="Draft Backlogs"/>
+                        <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Backlogs"/>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Backlogs"/>
                         <separator orientation="vertical"/>
                         <filter string="Edit" icon="gtk-execute" domain="[]" context="{'set_editable':'1'}"/>
@@ -163,7 +162,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@@ -179,7 +178,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">project.scrum.product.backlog</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_current': 1,'search_default_user_id':uid,'search_default_project_id':project_id}</field>
+            <field name="context">{'search_default_current':1, 'search_default_user_id':uid,'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
             <field name="help">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.</field>
         </record>
@@ -225,7 +224,7 @@
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
-                                	string="Burndown Chart" type="action" icon="gtk-print"/>
+                                    string="Burndown Chart" type="action" icon="gtk-print"/>
                 </tree>
             </field>
         </record>
@@ -274,7 +273,7 @@
                                             <separator colspan="4" string="Are there anything blocking you?"/>
                                             <field colspan="4" name="question_blocks" nolabel="1"/>
                                             <separator colspan="4" string=""/>
-                							<button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
+                                            <button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
                                             <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
                                         </page>
                                         <page string="Optional Info">
@@ -302,8 +301,8 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state" readonly="1"/>
-                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" 
-                        			string="Burndown Chart" type="action" icon="gtk-print"/>
+                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
+                                    string="Burndown Chart" type="action" icon="gtk-print"/>
                         <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                         <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
@@ -319,10 +318,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sprints">
-                    <group col="10" colspan="4">
-                        <filter name="terp-check" icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
+                    <group>
+                        <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Sprints"/>
+                        <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Sprints"/>
                         <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
@@ -331,7 +329,7 @@
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
                         <filter string="Scrum Master" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
                         <separator orientation="vertical"/>
@@ -351,7 +349,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
-            <field name="context">{"search_default_filter_current": 1}</field>
+            <field name="context">{"search_default_current": 1}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
             <field name="help">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.</field>
         </record>
@@ -396,7 +394,9 @@
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
                         <field name="user_id"/>
-                        <button name="%(action_project_scrum_email)d"  string="Send Email" type="action" icon="terp-mail-message-new" />
+                        <button name="%(mail.action_email_compose_message_wizard)d"
+                                string="Send Email" type="action" icon="terp-mail-message-new"
+                        />
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
@@ -427,16 +427,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
                         <field name="sprint_id">
-                            <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                            <filter icon="terp-check" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                         </field>
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Meeting Date"/>
@@ -467,13 +467,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('product_backlog_id', '=', active_id)]</field>
+            <field name="context">{'default_product_backlog_id': active_id}</field>
         </record>
         <record id="ir_scrum_sprint_open_task" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
             <field eval="'project.scrum.sprint'" name="model"/>
             <field name="name">View sprint tasks</field>
             <field eval="'ir.actions.act_window,'+str(action_sprint_task_open)" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <record id="action_sprint_backlog_open" model="ir.actions.act_window">
@@ -482,13 +482,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('sprint_id', '=', active_id)]</field>
+            <field name="context">{'default_sprint_id': active_id}</field>
         </record>
         <record id="ir_scrum_sprint_open_sprint" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
             <field eval="'project.scrum.sprint'" name="model"/>
             <field name="name">View sprint backlog</field>
             <field eval="'ir.actions.act_window,'+str(action_sprint_backlog_open)" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <!--
@@ -507,7 +507,6 @@
             <field eval="'project.scrum.project'" name="model"/>
             <field name="name">View project's backlog</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
-            <field eval="True" name="object"/>
         </record>
         <record id="dblc_proj2" model="ir.actions.act_window">
             <field name="res_model">project.task</field>
@@ -521,7 +520,6 @@
             <field eval="'project.scrum.project'" name="model"/>
             <field name="name">View project's tasks</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj2)" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <!--
@@ -587,7 +585,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='Project']" position="after">
-                	<separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                     <filter string="Backlog" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'product_backlog_id'}"/>
                 </xpath>
@@ -595,7 +593,7 @@
         </record>
 
         <act_window
-        	context="{'search_default_sprint_id': [active_id], 'default_sprint_id': active_id}"
+            context="{'search_default_sprint_id': [active_id], 'default_sprint_id': active_id}"
             id="act_scrum_sprint_2_product_backlog"
             name="Backlogs"
             res_model="project.scrum.product.backlog"
@@ -604,7 +602,7 @@
             view_type="form"/>
 
         <act_window
-        	context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1, 'default_sprint_id': active_id}"
+            context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1, 'default_sprint_id': active_id}"
             id="act_scrum_sprint_2_project_task"
             name="Tasks"
             res_model="project.task"
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 4b5b0919574..fcba1742d75 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -23,7 +23,7 @@ import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
 import project_scrum_postpone
-import project_scrum_email
+import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_scrum/wizard/mail_compose_message.py b/addons/project_scrum/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..7e6a326964b
--- /dev/null
+++ b/addons/project_scrum/wizard/mail_compose_message.py
@@ -0,0 +1,65 @@
+# -*- 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
+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 == 'project.scrum.meeting' and resource_id:
+            meeting_pool = self.pool.get('project.scrum.meeting')
+            user_pool = self.pool.get('res.users')
+            meeting = meeting_pool.browse(cr, uid, resource_id, context=context)
+
+            sprint = meeting.sprint_id
+            user_data = user_pool.browse(cr, uid, uid, context=context)
+            result.update({'email_from': user_data.user_email or False})
+
+            if sprint.scrum_master_id and sprint.scrum_master_id.user_email:
+                result.update({'email_to': sprint.scrum_master_id.user_email})
+            if sprint.product_owner_id and sprint.product_owner_id.user_email:
+                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' +  sprint.product_owner_id.user_email or sprint.product_owner_id.user_email})
+
+            subject = _("Scrum Meeting : %s") %(meeting.date)
+            message = _("Hello  , \nI am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'") %(meeting.date, sprint.name, sprint.project_id.name)
+            result.update({
+                       'subject': subject,
+                       'body_text': message,
+                       'model': model,
+                       'res_id': resource_id
+                    })
+        return result
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
index 9ffbd3222ee..53356e7def5 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
@@ -32,7 +32,6 @@
 
 		<record model="ir.values" id="scrum_backlog_to_task_values">
             <field name="model_id" ref="model_project_scrum_product_backlog" />
-            <field name="object" eval="1" />
             <field name="name">Convert into Tasks</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_to_task'))" />
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
index 9e374d9437b..dd773bf2c19 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
@@ -28,7 +28,6 @@
 
         <record model="ir.values" id="scrum_backlog_merge_values">
             <field name="model_id" ref="model_project_scrum_product_backlog" />
-            <field name="object" eval="1" />
             <field name="name">Merge Backlogs</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_merge'))" />
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
index f870ca27262..7cab0b5bf6d 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
@@ -34,7 +34,6 @@
 
 		<record model="ir.values" id="scrum_backlog_to_sprint_values">
             <field name="model_id" ref="model_project_scrum_product_backlog" />
-            <field name="object" eval="1" />
             <field name="name">Assign Sprint</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_to_sprint'))" />
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index f2e8dd79446..c61f43e6779 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -69,6 +69,7 @@ class project_scrum_email(osv.osv_memory):
         if context is None:
             context = {}
 
+        mail_message = self.pool.get('mail.message')
         active_id = context.get('active_id', False)
         scrum_meeting_pool = self.pool.get('project.scrum.meeting')
         user_pool = self.pool.get('res.users')
@@ -91,7 +92,7 @@ class project_scrum_email(osv.osv_memory):
         body += "\n%s\n" %_("Task for Today")
         body += "_______________________ \n"
         body += "\n%s\n" %(meeting.question_today or _('None'))
-        body += "\n%s\n" % _('Blocking points encountered:') 
+        body += "\n%s\n" % _('Blocking points encountered:')
         body += "_______________________ \n"
         body += "\n%s\n" %(meeting.question_blocks or _('None'))
         body += "\n%s\n%s" %(_('Thank you,'), user.name)
@@ -100,8 +101,9 @@ class project_scrum_email(osv.osv_memory):
         if data.scrum_master_email == data.product_owner_email:
             data.product_owner_email = False
         if data.scrum_master_email:
-            tools.email_send(user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email)
+            mail_message.schedule_with_attach(cr, uid, user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email, context=context)
         if data.product_owner_email:
-            tools.email_send(user_email, [data.product_owner_email], data.subject, body, reply_to=user_email)
+            mail_message.schedule_with_attach(cr, uid, user_email, [data.product_owner_email], data.subject, body, reply_to=user_email, context=context)
         return {'type': 'ir.actions.act_window_close'}
-project_scrum_email()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 1263a514804..b90d3d745a1 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Project Timesheet',
+    'name': 'Bill Time on Tasks',
     'version': '1.0',
     'category': 'Project Management',
     'description': """
@@ -34,7 +34,7 @@ the Timesheet line entries for particular date and particular user  with the eff
     'author': 'OpenERP SA',
     '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'],
+    'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
     'init_xml': ['project_timesheet_data.xml'],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
     'demo_xml': ["project_timesheet_demo.xml"],
diff --git a/addons/project_timesheet/i18n/ar.po b/addons/project_timesheet/i18n/ar.po
index b52f0987ca1..6cb17e990c0 100644
--- a/addons/project_timesheet/i18n/ar.po
+++ b/addons/project_timesheet/i18n/ar.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/bg.po b/addons/project_timesheet/i18n/bg.po
index b52f0987ca1..6cb17e990c0 100644
--- a/addons/project_timesheet/i18n/bg.po
+++ b/addons/project_timesheet/i18n/bg.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/bs.po b/addons/project_timesheet/i18n/bs.po
index 5ec8b9bd061..27dc1919780 100644
--- a/addons/project_timesheet/i18n/bs.po
+++ b/addons/project_timesheet/i18n/bs.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Loša Konfiguracija !"
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index d1f155150a3..7342b8b5bfe 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/i18n/ca.po
@@ -14,17 +14,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr "No s'ha definit un empleat per a l'usuario \"%s\". Heu de crear un."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -36,12 +36,12 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "Tasca de la fulla de serveis"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Registra entrada/sortida per projecte"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -51,151 +51,153 @@ msgstr "Id relacionat amb el temps"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Treball tasca projecte"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "informe.fullhores.tasca.usuari"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursivament."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Projecte/Compte analític"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Hores de tasca"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Avís! La data d'inici del projecte ha de ser anterior a la data final del "
+"projecte."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " Any "
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
-msgstr ""
+msgstr "No podeu eliminar una empresa ja assignada a un projecte!"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Factura de la tasca"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Treball de tasca"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Acció no vàlida!"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Factura treball de les tasques"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari/a"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Empleneu la seva fulla de serveis."
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "Facturable"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -208,54 +210,61 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"        Aquest mòdul li permet transferir les entrades de les tasques "
+"definides en la gestió del projecte cap a les\n"
+"        línies en la fulla de serveis per una data i usuari en particular "
+"amb la finalitat de crear, editar i eliminar en els dos sentits.\n"
+"\n"
+"    "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Factura els treballs de les tasques"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Hores de la fulla de serveis"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Codificació de la tasca"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "El resum de la tasca prové de la línia de la fulla de serveis"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Activa factura"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Tasques per usuari"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -265,41 +274,40 @@ msgstr ""
 "Introduïu-lo a la pestanya d'horaris del formulari de l'empleat."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projecte"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dades de facturació"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Codifica el temps utilitzat en la seva tasca"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " Mes "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Report per mes d'hores de tasques/fulles d'assistència"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Configuració errònia!"
@@ -307,43 +315,43 @@ msgstr "Configuració errònia!"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Treballa en tasca"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mes-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Després que la tasca estigui completada, crea la seva factura."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Activa factures des de línies de comandes de venda"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -353,10 +361,10 @@ msgstr "Horaris pels projectes"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Factura treball de la tascta"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -372,12 +380,12 @@ msgstr ""
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Hores de tasca per mes"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Emplena fulla de serveis"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -385,7 +393,15 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
+"Aquesta llista li mostra tots els treballs que podeu facturar al client. "
+"Selecciona les línies a fi de generar factures automàticament."
 
 #, python-format
 #~ msgid "No employee defined for this user. You must create one."
 #~ msgstr "No s'ha definit cap empleat per a aquest usuari. N'heu de crear un."
+
+#~ msgid "Working Hours"
+#~ msgstr "Hores de treball"
+
+#~ msgid "My Timesheet"
+#~ msgstr "El meu full d'assistència"
diff --git a/addons/project_timesheet/i18n/cs.po b/addons/project_timesheet/i18n/cs.po
index 6afc510ceea..4583995d6c1 100644
--- a/addons/project_timesheet/i18n/cs.po
+++ b/addons/project_timesheet/i18n/cs.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -104,7 +104,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -140,7 +140,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -264,7 +264,6 @@ msgstr ""
 "Vyplňte rozvrhy na kartě formuláře zaměstnance ."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -295,10 +294,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Špatná konfigurace !"
@@ -355,7 +354,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index 83cb86e1fc2..1f0e20aaf5a 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.po
@@ -14,11 +14,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
@@ -26,7 +26,7 @@ msgstr ""
 "Mitarbeiter für diesen Benutzer erstellen."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -107,7 +107,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr "Kann Partner, der zum Projekt zugewiesen wurde, nicht löschen!"
@@ -143,7 +143,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr "Fehlerhafte Aktion !"
@@ -264,7 +264,7 @@ msgid "Tasks by User"
 msgstr "Aufgaben je Benutzer"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -275,7 +275,6 @@ msgstr ""
 "'Zeiterfassung'"
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projekt"
@@ -306,10 +305,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr "Arbeitstunden und Aufgaben nach Monat"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Falsche Konfiguration !"
@@ -366,7 +365,7 @@ msgid "Invoice Task Work"
 msgstr "Abrechnen Arbeitsstunden"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -404,55 +403,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Kein Mitarbeiter für den Benutzer definiert. Sie müssen einen erzeugen."
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen haben!"
+#~ msgid "Working Hours"
+#~ msgstr "Arbeitsstunden"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "This Year"
-#~ msgstr "Aktuelles Jahr"
-
-#~ msgid "Invoiceble"
-#~ msgstr "Nicht Abrechenbar"
-
-#~ msgid "This Month"
-#~ msgstr "Dieser Monat"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "My Entries"
-#~ msgstr "Meine Arbeitszeiten"
-
-#~ msgid "Journal"
-#~ msgstr "Journal"
-
-#~ msgid "Product"
-#~ msgstr "Produkt"
-
-#~ msgid "Search Analytic Lines"
-#~ msgstr "Suche Analytische Buchungen"
-
-#~ msgid "Extended Filters..."
-#~ msgstr "Erweiterter Filter..."
-
-#~ msgid "Account"
-#~ msgstr "Analysekonto"
-
-#~ msgid "Fin.Account"
-#~ msgstr "Finanzkonto"
+#~ msgid "My Timesheet"
+#~ msgstr "Meine Zeiterfassung"
diff --git a/addons/project_timesheet/i18n/el.po b/addons/project_timesheet/i18n/el.po
index 37a4c892235..adb4d2cbbd9 100644
--- a/addons/project_timesheet/i18n/el.po
+++ b/addons/project_timesheet/i18n/el.po
@@ -13,20 +13,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -108,7 +108,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -144,7 +144,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -258,7 +258,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -269,7 +269,6 @@ msgstr ""
 "υπαλλήλου."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -300,10 +299,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Λάθος ρυθμίσεις!"
@@ -360,7 +359,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index ce5f969ff4d..11ebfb0674f 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 "No se ha definido un empleado para el usuario \"%s\". Debe crear uno."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -107,7 +107,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr "¡No se puede eliminar una empresa ya asignada a un proyecto!"
@@ -143,7 +143,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "¡Error! No se pueden crear tareas recursivas."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
@@ -265,7 +265,7 @@ msgid "Tasks by User"
 msgstr "Tareas por usuario"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -275,7 +275,6 @@ msgstr ""
 "Rellene la pestaña parte de horas del formulario del empleado."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Proyecto"
@@ -306,10 +305,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr "Reporte por mes de horas de tareas/hojas de asistencia"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "¡ Configuración errónea !"
@@ -366,7 +365,7 @@ msgid "Invoice Task Work"
 msgstr "Facturar trabajo de la tarea"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -402,20 +401,8 @@ msgstr ""
 #~ msgid "No employee defined for this user. You must create one."
 #~ msgstr "No se ha definido ningún empleado para este usuario. Debe crear uno."
 
-#~ msgid "Search Analytic Lines"
-#~ msgstr "Buscar líneas analíticas"
+#~ msgid "My Timesheet"
+#~ msgstr "Mi parte de horas"
 
-#~ msgid "Journal"
-#~ msgstr "Diario"
-
-#~ msgid "Product"
-#~ msgstr "Producto"
-
-#~ msgid "Extended Filters..."
-#~ msgstr "Filtros extendidos..."
-
-#~ msgid "Account"
-#~ msgstr "Cuenta"
-
-#~ msgid "Fin.Account"
-#~ msgstr "Cuenta fin."
+#~ msgid "Working Hours"
+#~ msgstr "Horas de trabajo"
diff --git a/addons/project_timesheet/i18n/es_AR.po b/addons/project_timesheet/i18n/es_AR.po
index 05e4aed2b14..9e3f7bb440a 100644
--- a/addons/project_timesheet/i18n/es_AR.po
+++ b/addons/project_timesheet/i18n/es_AR.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -104,7 +104,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -140,7 +140,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -264,7 +264,6 @@ msgstr ""
 "Llene la solapa de hoja de tareas en el formulario de empleado"
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -295,10 +294,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "¡Configuración errónea!"
@@ -355,7 +354,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/es_MX.po b/addons/project_timesheet/i18n/es_MX.po
new file mode 100644
index 00000000000..932863e35f8
--- /dev/null
+++ b/addons/project_timesheet/i18n/es_MX.po
@@ -0,0 +1,408 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-01-18 09:18+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: 2011-09-05 05:33+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:44
+#, python-format
+msgid "No employee defined for user \"%s\". You must create one."
+msgstr ""
+"No se ha definido un empleado para el usuario \"%s\". Debe crear uno."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:52
+#, python-format
+msgid ""
+"No journal defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"No se ha definido ningún diario para el empleado relacionado.\n"
+"Rellene la pestaña parte de horas del formulario del empleado."
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_timesheettask0
+msgid "Timesheet task"
+msgstr "Tarea de la hoja de servicios"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
+msgstr "Entrada/salida por proyecto"
+
+#. module: project_timesheet
+#: field:project.task.work,hr_analytic_timesheet_id:0
+msgid "Related Timeline Id"
+msgstr "Id de la línea de tiempos asociada"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task_work
+msgid "Project Task Work"
+msgstr "Trabajo tarea proyecto"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr "reporte.partehoras.tarea.usuario"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_timesheet
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Analytic account/project"
+msgstr "Proyecto/Cuenta analítica"
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Horas tarea"
+
+#. module: project_timesheet
+#: 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_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Year "
+msgstr " Año "
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:220
+#, python-format
+msgid "Cannot delete Partner which is Assigned to project  !"
+msgstr "¡No se puede eliminar una empresa ya asignada a un proyecto!"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
+msgid "Task invoice"
+msgstr "Factura tarea"
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_taskwork0
+msgid "Task Work"
+msgstr "Trabajo de tarea"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No se pueden crear tareas recursivas."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:220
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks Work"
+msgstr "Facturar trabajo de las tareas"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_timesheet
+#: 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_timesheet
+#: field:report.timesheet.task.user,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_timesheettask0
+msgid "Complete Your Timesheet."
+msgstr "Cumplimente su hoja de servicios."
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoiceable"
+msgstr "Facturable"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: project_timesheet
+#: model:ir.module.module,description:project_timesheet.module_meta_information
+msgid ""
+"\n"
+"        This module 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"
+"\n"
+"    "
+msgstr ""
+"\n"
+"        Este módulo le permite transferir las entradas de las tareas "
+"definidas en la gestión del proyecto hacia\n"
+"        las líneas en la hoja de servicios para una fecha y usuario en "
+"particular con la finalidad de crear, editar y eliminar en los dos "
+"sentidos.\n"
+"\n"
+"    "
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+msgid "Bill Tasks Works"
+msgstr "Facturar los trabajos de las tareas"
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Horas de la hoja de servicios"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskencoding0
+msgid "Task encoding"
+msgstr "Codificación de tarea"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
+msgid "Task summary is comes into the timesheet line"
+msgstr "El resumen de la tarea proviene de la línea de la hoja de servicios"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger Invoice"
+msgstr "Disparar factura"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Tasks by User"
+msgstr "Tareas por usuario"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:48
+#, python-format
+msgid ""
+"No product defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"No se ha definido ningún producto para el empleado relacionado.\n"
+"Rellene la pestaña parte de horas del formulario del empleado."
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_project
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoicing Data"
+msgstr "Datos facturación"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
+msgstr "Codificar el tiempo empleado en su tarea"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Month "
+msgstr " Mes "
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Reporte por mes de horas de tareas/hojas de asistencia"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
+#, python-format
+msgid "Bad Configuration !"
+msgstr "¡ Configuración errónea !"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_taskwork0
+msgid "Work on task"
+msgstr "Trabajar en tarea"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Month-1 "
+msgstr " Mes-1 "
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
+msgid "After task is completed, Create its invoice."
+msgstr "Después que la tarea esté completada, crear su factura."
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
+msgstr "Disparar facturas desde líneas de pedidos de venta"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_timesheet
+#: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
+msgid "Project Timesheet"
+msgstr "Parte de horas de proyectos"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoice Task Work"
+msgstr "Facturar trabajo de la tarea"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:59
+#, python-format
+msgid ""
+"No product and product category property account defined on the related "
+"employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"No se ha definido un producto y una propiedad de cuenta en la categoría de "
+"producto para el empleado relacionado.\n"
+"Rellene la pestaña parte de horas del formulario del empleado."
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
+#: view:report.timesheet.task.user:0
+msgid "Task Hours Per Month"
+msgstr "Horas de tarea por mes"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
+msgid "Fill Timesheet"
+msgstr "Rellenar hoja de servicios"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
+msgid ""
+"This lists show you every task work you can invoice to the customer. Select "
+"the lines in order to generate the invoices automatically."
+msgstr ""
+"Esta lista le muestra todos los trabajos que puede facturar al cliente. "
+"Seleccionar las líneas a fin de generar facturas automáticamente."
+
+#, python-format
+#~ msgid "No employee defined for this user. You must create one."
+#~ msgstr "No se ha definido ningún empleado para este usuario. Debe crear uno."
+
+#~ msgid "My Timesheet"
+#~ msgstr "Mi parte de horas"
+
+#~ msgid "Working Hours"
+#~ msgstr "Horas de trabajo"
diff --git a/addons/project_timesheet/i18n/es_VE.po b/addons/project_timesheet/i18n/es_VE.po
new file mode 100644
index 00000000000..932863e35f8
--- /dev/null
+++ b/addons/project_timesheet/i18n/es_VE.po
@@ -0,0 +1,408 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-01-18 09:18+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: 2011-09-05 05:33+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:44
+#, python-format
+msgid "No employee defined for user \"%s\". You must create one."
+msgstr ""
+"No se ha definido un empleado para el usuario \"%s\". Debe crear uno."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:52
+#, python-format
+msgid ""
+"No journal defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"No se ha definido ningún diario para el empleado relacionado.\n"
+"Rellene la pestaña parte de horas del formulario del empleado."
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_timesheettask0
+msgid "Timesheet task"
+msgstr "Tarea de la hoja de servicios"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
+msgstr "Entrada/salida por proyecto"
+
+#. module: project_timesheet
+#: field:project.task.work,hr_analytic_timesheet_id:0
+msgid "Related Timeline Id"
+msgstr "Id de la línea de tiempos asociada"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task_work
+msgid "Project Task Work"
+msgstr "Trabajo tarea proyecto"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr "reporte.partehoras.tarea.usuario"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_timesheet
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Analytic account/project"
+msgstr "Proyecto/Cuenta analítica"
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Horas tarea"
+
+#. module: project_timesheet
+#: 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_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Year "
+msgstr " Año "
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:220
+#, python-format
+msgid "Cannot delete Partner which is Assigned to project  !"
+msgstr "¡No se puede eliminar una empresa ya asignada a un proyecto!"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
+msgid "Task invoice"
+msgstr "Factura tarea"
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_taskwork0
+msgid "Task Work"
+msgstr "Trabajo de tarea"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No se pueden crear tareas recursivas."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:220
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks Work"
+msgstr "Facturar trabajo de las tareas"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_timesheet
+#: 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_timesheet
+#: field:report.timesheet.task.user,name:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_timesheettask0
+msgid "Complete Your Timesheet."
+msgstr "Cumplimente su hoja de servicios."
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoiceable"
+msgstr "Facturable"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: project_timesheet
+#: model:ir.module.module,description:project_timesheet.module_meta_information
+msgid ""
+"\n"
+"        This module 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"
+"\n"
+"    "
+msgstr ""
+"\n"
+"        Este módulo le permite transferir las entradas de las tareas "
+"definidas en la gestión del proyecto hacia\n"
+"        las líneas en la hoja de servicios para una fecha y usuario en "
+"particular con la finalidad de crear, editar y eliminar en los dos "
+"sentidos.\n"
+"\n"
+"    "
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+msgid "Bill Tasks Works"
+msgstr "Facturar los trabajos de las tareas"
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Horas de la hoja de servicios"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskencoding0
+msgid "Task encoding"
+msgstr "Codificación de tarea"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
+msgid "Task summary is comes into the timesheet line"
+msgstr "El resumen de la tarea proviene de la línea de la hoja de servicios"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger Invoice"
+msgstr "Disparar factura"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Tasks by User"
+msgstr "Tareas por usuario"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:48
+#, python-format
+msgid ""
+"No product defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"No se ha definido ningún producto para el empleado relacionado.\n"
+"Rellene la pestaña parte de horas del formulario del empleado."
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_project
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoicing Data"
+msgstr "Datos facturación"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
+msgstr "Codificar el tiempo empleado en su tarea"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Month "
+msgstr " Mes "
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Reporte por mes de horas de tareas/hojas de asistencia"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
+#, python-format
+msgid "Bad Configuration !"
+msgstr "¡ Configuración errónea !"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_taskwork0
+msgid "Work on task"
+msgstr "Trabajar en tarea"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Month-1 "
+msgstr " Mes-1 "
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
+msgid "After task is completed, Create its invoice."
+msgstr "Después que la tarea esté completada, crear su factura."
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
+msgstr "Disparar facturas desde líneas de pedidos de venta"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_timesheet
+#: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
+msgid "Project Timesheet"
+msgstr "Parte de horas de proyectos"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoice Task Work"
+msgstr "Facturar trabajo de la tarea"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:59
+#, python-format
+msgid ""
+"No product and product category property account defined on the related "
+"employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"No se ha definido un producto y una propiedad de cuenta en la categoría de "
+"producto para el empleado relacionado.\n"
+"Rellene la pestaña parte de horas del formulario del empleado."
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
+#: view:report.timesheet.task.user:0
+msgid "Task Hours Per Month"
+msgstr "Horas de tarea por mes"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
+msgid "Fill Timesheet"
+msgstr "Rellenar hoja de servicios"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
+msgid ""
+"This lists show you every task work you can invoice to the customer. Select "
+"the lines in order to generate the invoices automatically."
+msgstr ""
+"Esta lista le muestra todos los trabajos que puede facturar al cliente. "
+"Seleccionar las líneas a fin de generar facturas automáticamente."
+
+#, python-format
+#~ msgid "No employee defined for this user. You must create one."
+#~ msgstr "No se ha definido ningún empleado para este usuario. Debe crear uno."
+
+#~ msgid "My Timesheet"
+#~ msgstr "Mi parte de horas"
+
+#~ msgid "Working Hours"
+#~ msgstr "Horas de trabajo"
diff --git a/addons/project_timesheet/i18n/et.po b/addons/project_timesheet/i18n/et.po
index 6ee1575f431..01ed8dd4eb0 100644
--- a/addons/project_timesheet/i18n/et.po
+++ b/addons/project_timesheet/i18n/et.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index 5a355bbf39c..0697d0ddde7 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/i18n/fi.po
@@ -14,17 +14,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr "Käyttäjälle \"%s\" ei ole määritetty työntekijää. Tee määritys."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -34,22 +34,22 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "Tuntilistan tehtävä"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Kirjaudu Sisään/Ulos projektista"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
 msgid "Related Timeline Id"
-msgstr ""
+msgstr "Liittyvän aikajanan id"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projektin tehtävät työt"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
@@ -64,7 +64,7 @@ msgstr "Ryhmittele"
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -80,12 +80,12 @@ msgstr "Vuosi"
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Analyyttinen tili/projekti"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Tehtävän tunnit"
 
 #. module: project_timesheet
 #: constraint:project.project:0
@@ -95,7 +95,7 @@ msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " Vuosi "
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -103,7 +103,7 @@ msgid "Partner"
 msgstr "Kumppani"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr "Kumppania, joka on kiinnitetty projektiin, ei voi poistaa !"
@@ -121,12 +121,12 @@ msgstr "Elokuu"
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Tehtävän laskutus"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Tehtävän tyot"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -136,13 +136,13 @@ msgstr "Toukokuu"
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Virheellinen toiminto!"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -157,7 +157,7 @@ msgstr "Tehtävä"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Laskuta tehtävän työt"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -168,12 +168,12 @@ msgstr "Käyttäjä"
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Virhe! Et voi asettaa eskalointia samalle projektille!"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Päiväys"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -188,7 +188,7 @@ msgstr "Tee tuntilistasi valmiiksi."
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "Laskutettavissa"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -215,22 +215,22 @@ msgstr "Helmikuu"
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Veloita tehtävän työt"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Tuntilistan tunnit"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Tehtävän syöttö"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Tehtävän yhteenvedosta tulee tuntilistan rivi"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -240,7 +240,7 @@ msgstr "Tammikuu"
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Liipaise laskutus"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -250,10 +250,10 @@ msgstr "Marraskuu"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Tehtävät käyttäjittäin"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -261,7 +261,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projekti"
@@ -279,26 +278,26 @@ msgstr "Laskutustiedot"
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Syötä tehtävään käyttämäsi tuntimäärä"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " Kuukausi "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Tuntilista/tehtävä tuntiraportti kuukausittain"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
-msgstr ""
+msgstr "Virheellinen konfiguraatio !"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
@@ -308,12 +307,12 @@ msgstr "Laskutus"
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Tehtävälle tehty työ"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Kuukausi-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -333,13 +332,13 @@ msgstr "Kun tehtävä on valmis, tee sille lasku."
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Liipaise laskutus myyntitilausriveistä"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -349,10 +348,10 @@ msgstr "Projektin tuntilista"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Laskuta tehtävän työt"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -365,7 +364,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Tehtävän tunnit kuukausittain"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
@@ -380,3 +379,9 @@ msgid ""
 msgstr ""
 "Tämä lista näyttää kaikki tehtävät, jotka voidaan laskuttaa asiakkaalta. "
 "Valitse rivit joista muodostetaan lasku automaattisesti."
+
+#~ msgid "Working Hours"
+#~ msgstr "Työtunnit"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Oma tuntilista"
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index 6f7fca417fc..488fc3977d0 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/i18n/fr.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 "Pas d'employé défini pour l'utilisateur \"%s\".  Vous devez en créer un."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -36,7 +36,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr "Fueille de temps de la tâche"
+msgstr "Feuille de temps de la tâche"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -108,7 +108,7 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr "Impossible de supprimer un partenaire assigné à un projet !"
@@ -144,7 +144,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr "Action incorrecte !"
@@ -267,7 +267,7 @@ msgid "Tasks by User"
 msgstr "Tâches par utilisateur"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -277,7 +277,6 @@ msgstr ""
 "Remplissez l'onglet de la feuille de temps du formulaire de l'employé"
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projet"
@@ -305,13 +304,13 @@ msgstr " Mois "
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr "Rapport mensule des heures sur les tâches / les feuilles de temps"
+msgstr "Rapport mensuel des heures sur les tâches / les feuilles de temps"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Mauvaise configuration !"
@@ -368,16 +367,16 @@ msgid "Invoice Task Work"
 msgstr "Facturer le travail de la tâche"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
-"Pas de propriétés comptables définis pour le produit et la catégorie du "
-"produit associé à l'employé.\n"
-"Compléter l'onglet feuille de temps du formulaire de l'employé."
+"Pas de propriétés comptables définies pour le produit et la catégorie du "
+"produit associés à l'employé.\n"
+"Compléter l'onglet feuille de présence du formulaire de l'employé."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
@@ -404,17 +403,8 @@ msgstr ""
 #~ msgid "No employee defined for this user. You must create one."
 #~ msgstr "Pas d'employé définit pour cet utilisateur. Vous devez en créer un."
 
-#~ msgid "Product"
-#~ msgstr "Produit"
+#~ msgid "My Timesheet"
+#~ msgstr "Ma feuille de temps"
 
-#~ msgid "My Entries"
-#~ msgstr "Mes saisies"
-
-#~ msgid "Journal"
-#~ msgstr "Journal"
-
-#~ msgid "Account"
-#~ msgstr "Compte"
-
-#~ msgid "Extended Filters..."
-#~ msgstr "Filtres étendus..."
+#~ msgid "Working Hours"
+#~ msgstr "Heures de travail"
diff --git a/addons/project_timesheet/i18n/gl.po b/addons/project_timesheet/i18n/gl.po
index 10fa345fa46..175b77f4a16 100644
--- a/addons/project_timesheet/i18n/gl.po
+++ b/addons/project_timesheet/i18n/gl.po
@@ -15,17 +15,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -106,7 +106,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -142,7 +142,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -266,7 +266,6 @@ msgstr ""
 "Introdúzao no separador de horarios do formulario do empregado."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -297,10 +296,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "¡Configuración errada!"
@@ -357,7 +356,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index cac62cee1d9..55b351af97b 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -103,7 +103,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -139,7 +139,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -253,7 +253,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -261,7 +261,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -292,10 +291,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -352,7 +351,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/hu.po b/addons/project_timesheet/i18n/hu.po
index 0fecb292dd4..acef5685196 100644
--- a/addons/project_timesheet/i18n/hu.po
+++ b/addons/project_timesheet/i18n/hu.po
@@ -8,23 +8,24 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-02-08 09:31+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 "\"%s\" felhasználóra nem állítottak be alkalmazottat. Kérem, hozza létre."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -107,7 +108,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -144,7 +145,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr "Érvénytelen művelet !"
@@ -265,7 +266,7 @@ msgid "Tasks by User"
 msgstr "Feladatok felhasználó szerint"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -275,7 +276,6 @@ msgstr ""
 "Töltse ki a munkaidő-kimutatás fület az alkalmazotti űrlapon."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projekt"
@@ -306,10 +306,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr "Havi jelentés - munkaidő/feladattal eltöltött órák száma"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Rossz konfiguráció !"
@@ -366,7 +366,7 @@ msgid "Invoice Task Work"
 msgstr "Feladatmunka számlázása"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/id.po b/addons/project_timesheet/i18n/id.po
index dc734e2e1cb..26f9badce4a 100644
--- a/addons/project_timesheet/i18n/id.po
+++ b/addons/project_timesheet/i18n/id.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index bdd4e4d7487..c19af304894 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/i18n/it.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 "Nessun impiegato definito per l'utente: \"%s\". E' necessario crearne uno."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -106,7 +106,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr "Non è possibile eliminare partner a cui sono assegnati dei progetti!"
@@ -142,7 +142,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Errore ! Non è possibile creare attività ricorsive."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr "Azione non valida!"
@@ -257,7 +257,7 @@ msgid "Tasks by User"
 msgstr "Attività per utente"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -267,7 +267,6 @@ msgstr ""
 "Compilare la scheda timesheet nel modulo dell'impiegato"
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Progetto"
@@ -298,10 +297,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr "Report ore timesheet/attività per mese"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Configurazione errata!"
@@ -358,7 +357,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/ko.po b/addons/project_timesheet/i18n/ko.po
index 5efffe46e80..8a2aaf46af9 100644
--- a/addons/project_timesheet/i18n/ko.po
+++ b/addons/project_timesheet/i18n/ko.po
@@ -14,17 +14,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -105,7 +105,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -141,7 +141,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -265,7 +265,6 @@ msgstr ""
 "직원 양식의 타임시트 탭을 기재하십시오."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -296,10 +295,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "잘못된 구성 !"
@@ -356,7 +355,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/lt.po b/addons/project_timesheet/i18n/lt.po
index 9d22f00adfc..36a9657c284 100644
--- a/addons/project_timesheet/i18n/lt.po
+++ b/addons/project_timesheet/i18n/lt.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index 58e358e212b..b49a3a02913 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.po
@@ -14,17 +14,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr "Lietotājam '%s' nav definēts darbinieks, kas obligāti jāizveido."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -105,7 +105,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -141,7 +141,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Tasks by User"
 msgstr "Uzdevumi pēc lietotāja"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -265,7 +265,6 @@ msgstr ""
 "Aizpildīt darbinieka Darba laika uzskaites Tabeles formā."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projekts"
@@ -296,10 +295,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Nepareiza konfigurācija!"
@@ -356,7 +355,7 @@ msgid "Invoice Task Work"
 msgstr "Izrakstīt rēķinu par uzdevuma darbu"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -386,24 +385,3 @@ msgstr ""
 #, python-format
 #~ msgid "No employee defined for this user. You must create one."
 #~ msgstr "Nav definēts darbinieks šim lietotājam. Tas ir jānodefinē."
-
-#~ msgid "Journal"
-#~ msgstr "Žurnāls"
-
-#~ msgid "Product"
-#~ msgstr "Produkts"
-
-#~ msgid "Extended Filters..."
-#~ msgstr "Paplašinātie filtri..."
-
-#~ msgid "Account"
-#~ msgstr "Konts"
-
-#~ msgid "Search Analytic Lines"
-#~ msgstr "Meklēta analītikas rindas"
-
-#~ msgid "My Entries"
-#~ msgstr "Mani ieraksti"
-
-#~ msgid "Fin.Account"
-#~ msgstr "Fin. konts"
diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po
index 9a8b6219201..316486da702 100644
--- a/addons/project_timesheet/i18n/nl.po
+++ b/addons/project_timesheet/i18n/nl.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -105,7 +105,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -141,7 +141,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -265,7 +265,6 @@ msgstr ""
 "Vul het formulier voor de werknemer onder het 'urenstaat' tabblad in."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -296,10 +295,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Fout in configuratie !"
@@ -356,7 +355,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/nl_BE.po b/addons/project_timesheet/i18n/nl_BE.po
index 6205d8fc82f..8e472b61700 100644
--- a/addons/project_timesheet/i18n/nl_BE.po
+++ b/addons/project_timesheet/i18n/nl_BE.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 0c974b8e4b5..c642c72eb25 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 "Nie zdefiniowano pracownika dla użytkownika \"%s\". Musisz go utworzyć."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -105,7 +105,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -141,7 +141,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych zadań."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Tasks by User"
 msgstr "Zadania wg użytkowników"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -265,7 +265,6 @@ msgstr ""
 "Uzupełnij zakładkę karty czasu pracy na formularzu pracownika."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projekt"
@@ -296,10 +295,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr "Raport godzin karty czasu pracy/zadania na miesiąc"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Błędna konfiguracja !"
@@ -356,7 +355,7 @@ msgid "Invoice Task Work"
 msgstr "Fakturuj przebieg zadania"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -386,21 +385,3 @@ msgid ""
 msgstr ""
 "Ta lista pokazuje ci wszystkie zadania, które można zafakturować na klienta. "
 "Wybierz pozycje, aby automatycznie utworzyć fakturę."
-
-#~ msgid "Search Analytic Lines"
-#~ msgstr "Przeszukaj pozycje analityczne"
-
-#~ msgid "My Entries"
-#~ msgstr "Moje zapisy"
-
-#~ msgid "Journal"
-#~ msgstr "Dziennik"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgid "Extended Filters..."
-#~ msgstr "Rozszerzone filtry..."
-
-#~ msgid "Fin.Account"
-#~ msgstr "Konto fin."
diff --git a/addons/project_timesheet/i18n/pt.po b/addons/project_timesheet/i18n/pt.po
index 06f3675e2cf..638c4b64ec4 100644
--- a/addons/project_timesheet/i18n/pt.po
+++ b/addons/project_timesheet/i18n/pt.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 "Não há um empregado definido para o utilizador \"%s\". Tem de criar um."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -105,7 +105,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -141,7 +141,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Tasks by User"
 msgstr "Tarefas por Utilizador"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -265,7 +265,6 @@ msgstr ""
 "Preencha o separador horário do formulário funcionário."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projeto"
@@ -296,10 +295,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Má Configuração!"
@@ -356,7 +355,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -386,33 +385,3 @@ msgstr ""
 #, python-format
 #~ msgid "No employee defined for this user. You must create one."
 #~ msgstr "Nenhum funcionário definido para este utilizador. Precisa criar um."
-
-#~ 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 "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura de vista"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "This Year"
-#~ msgstr "Este ano"
-
-#~ msgid "This Month"
-#~ msgstr "Este mês"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index edde7bf1851..24fd877e275 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 "Nenhum funcionário definido para o usuário \"%s\". Você precisa criar um."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -103,7 +103,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr "Não é possível excluir parceiro que é atribuído ao projeto!"
@@ -139,7 +139,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Erro! Você não pode criar tarefas recursivas."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação Inválida!"
@@ -261,7 +261,7 @@ msgid "Tasks by User"
 msgstr "Tarefas por Usuário"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -271,7 +271,6 @@ msgstr ""
 "Preencha a aba da planilha de horas do formulário do empregado."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Projeto"
@@ -302,10 +301,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr "Planilha de Horas/Relatório de Horas de Tarefas por Mês"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Mal configurado !"
@@ -362,7 +361,7 @@ msgid "Invoice Task Work"
 msgstr "Fatura de Tarefas em andamento"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -397,33 +396,3 @@ msgstr ""
 #, python-format
 #~ msgid "No employee defined for this user. You must create one."
 #~ msgstr "Nenhum empregado definido para este usuário. Você deve criar um."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "This Year"
-#~ msgstr "Este ano"
-
-#~ msgid "This Month"
-#~ msgstr "Este Mês"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/project_timesheet/i18n/ro.po b/addons/project_timesheet/i18n/ro.po
index b52f0987ca1..6cb17e990c0 100644
--- a/addons/project_timesheet/i18n/ro.po
+++ b/addons/project_timesheet/i18n/ro.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/ru.po b/addons/project_timesheet/i18n/ru.po
index a22261cb7ff..f836f26abaa 100644
--- a/addons/project_timesheet/i18n/ru.po
+++ b/addons/project_timesheet/i18n/ru.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Неправильная настройка!"
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po
index 42a2f543563..91649f04001 100644
--- a/addons/project_timesheet/i18n/sl.po
+++ b/addons/project_timesheet/i18n/sl.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Nepravilna konfiguracija!"
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/sq.po b/addons/project_timesheet/i18n/sq.po
index 7a6651e6828..b9c11a6d0c5 100644
--- a/addons/project_timesheet/i18n/sq.po
+++ b/addons/project_timesheet/i18n/sq.po
@@ -14,17 +14,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -103,7 +103,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -139,7 +139,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -253,7 +253,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -261,7 +261,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -292,10 +291,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -352,7 +351,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index 19eae245c41..c6f0e7b4e38 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/i18n/sv.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr "No employee defined for user \"%s\". You must create one."
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -104,7 +104,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -140,7 +140,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -254,7 +254,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -264,7 +264,6 @@ msgstr ""
 "Fill in the timesheet tab of the employee form."
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -295,10 +294,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Bad Configuration !"
@@ -355,7 +354,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/tlh.po b/addons/project_timesheet/i18n/tlh.po
index ad45faf9380..327eafac7d5 100644
--- a/addons/project_timesheet/i18n/tlh.po
+++ b/addons/project_timesheet/i18n/tlh.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 749a9abca5f..81bf397a27d 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/uk.po b/addons/project_timesheet/i18n/uk.po
index 23f0ed14ec3..f62a316fb3a 100644
--- a/addons/project_timesheet/i18n/uk.po
+++ b/addons/project_timesheet/i18n/uk.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/i18n/vi.po b/addons/project_timesheet/i18n/vi.po
index 2a8f8fea6b2..c8d89957457 100644
--- a/addons/project_timesheet/i18n/vi.po
+++ b/addons/project_timesheet/i18n/vi.po
@@ -14,17 +14,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -103,7 +103,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -139,7 +139,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -253,7 +253,7 @@ msgid "Tasks by User"
 msgstr "Công việc theo người sử dụng"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -261,7 +261,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr "Dự án"
@@ -292,10 +291,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr "Cấu hình không hợp lệ !"
@@ -352,7 +351,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
@@ -378,9 +377,3 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
-
-#~ msgid "Product"
-#~ msgstr "Sản phẩm"
-
-#~ msgid "Extended Filters..."
-#~ msgstr "Bộ lọc mở rộng..."
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index 7e04480f9f8..09ce28bcfe6 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -8,37 +8,39 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2010-03-20 09:53+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
-msgstr ""
+msgstr "用户 \"%s\" 没有对应的员工。请先新建。"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"相关的员工没有设置默认的账簿\n"
+"请在员工界面的计工单标签页输入默认账簿"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "计工单和任务"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "项目的签入/签出"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -48,151 +50,151 @@ msgstr "有关的时间ID"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "任务进度"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的相关成员。"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "任务工时"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "错误！项目的开始日期必须小于项目的结束日期"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " 年 "
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
-msgstr ""
+msgstr "此业务伙伴已有相关项目，不能删除"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "任务结算"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "任务进展"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "错误！不能创建循环引用的任务"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "无效动作！"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "任务"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "根据任务进展开发票"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "不能升级到相同的项目"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "完成任务"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "需要开发票"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "客户"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -205,140 +207,145 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"        此模块允许你在创建、修改或删除任务进展时自动更新计工单\n"
+"\n"
+"    "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "根据任务进展开发票"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "计工单工时"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "输入任务"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "任务工时合计已进入计工单"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "触发发票"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "按用户打印任务"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"没有为员工指定产品\n"
+"请在员工界面的计工单标签页输入"
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "发票数据"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "输入你在此任务上花费的工时"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " 月份 "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "按月输出计工单和任务工时"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
-msgstr ""
+msgstr "配置错误"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "开发票"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "任务进展"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " 上个月 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "当任务完成时创建相关发票"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "按销售订单明细开发票"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -348,32 +355,40 @@ msgstr "项目时间表"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "按任务进展开发票"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"没有为员工对应的产品指定科目\n"
+"请在员工界面的计工单标签页输入"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "每月的任务工时"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "输入计工单"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
 msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
-msgstr ""
+msgstr "这里列出了所有可以向客户开发票的工作进展。选择对应行生成发票"
+
+#~ msgid "Working Hours"
+#~ msgstr "工时"
+
+#~ msgid "My Timesheet"
+#~ msgstr "我的计工单"
diff --git a/addons/project_timesheet/i18n/zh_TW.po b/addons/project_timesheet/i18n/zh_TW.po
index 4a76547a64d..49d203d3f7c 100644
--- a/addons/project_timesheet/i18n/zh_TW.po
+++ b/addons/project_timesheet/i18n/zh_TW.po
@@ -13,17 +13,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:29+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:30+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:53
+#: code:addons/project_timesheet/project_timesheet.py:44
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:61
+#: code:addons/project_timesheet/project_timesheet.py:52
 #, python-format
 msgid ""
 "No journal defined on the related employee.\n"
@@ -102,7 +102,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
@@ -138,7 +138,7 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:229
+#: code:addons/project_timesheet/project_timesheet.py:220
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -252,7 +252,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:57
+#: code:addons/project_timesheet/project_timesheet.py:48
 #, python-format
 msgid ""
 "No product defined on the related employee.\n"
@@ -260,7 +260,6 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
 msgstr ""
@@ -291,10 +290,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:52
-#: code:addons/project_timesheet/project_timesheet.py:56
-#: code:addons/project_timesheet/project_timesheet.py:60
-#: code:addons/project_timesheet/project_timesheet.py:67
+#: code:addons/project_timesheet/project_timesheet.py:43
+#: code:addons/project_timesheet/project_timesheet.py:47
+#: code:addons/project_timesheet/project_timesheet.py:51
+#: code:addons/project_timesheet/project_timesheet.py:58
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -351,7 +350,7 @@ msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:68
+#: code:addons/project_timesheet/project_timesheet.py:59
 #, python-format
 msgid ""
 "No product and product category property account defined on the related "
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index ee506697677..f00835bc9a5 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -228,7 +228,7 @@ class res_partner(osv.osv):
     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 !'), _('Cannot delete Partner which is Assigned to project  !'))            
+            raise osv.except_osv(_('Invalid action !'), _('You cannot delete a partner which is assigned to project, we suggest you to uncheck the active box!'))
         return super(res_partner,self).unlink(cursor, user, ids,
                 context=context)
 res_partner()
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
index 8eec74bc9e5..8c3f4e2b72a 100644
--- a/addons/project_timesheet/project_timesheet_demo.xml
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -4,13 +4,13 @@
         <!-- Example employee -->
         <record id="hr.employee2" model="hr.employee">
             <field name="user_id" ref="project.res_users_technical_leader"/>
-            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
         <record id="hr.employee3" model="hr.employee">
             <field name="user_id" ref="project.res_users_project_manager"/>
-            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
@@ -19,7 +19,7 @@
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_analyst"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
-            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
@@ -28,7 +28,7 @@
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_developer"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
-            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
         <record id="hr.employee6" model="hr.employee">
@@ -36,7 +36,7 @@
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_designer"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
-            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
         <record id="hr.employee7" model="hr.employee">
@@ -44,7 +44,7 @@
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_tester"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
-            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
         <record id="hr.employee8" model="hr.employee">
@@ -52,7 +52,7 @@
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_finacial_manager"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
-            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 02272025ef8..de6d77a2fd9 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -39,7 +39,7 @@
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Member"]' position='after'>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test" string="Invoiceable" domain="[('to_invoice','!=', False)]" help="Invoiceable Project"/>
+                    <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
         </record>
@@ -105,8 +105,9 @@ the project form.</field>
         <!--
             Time Tracking menu in project Management
         -->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/>
+
+        <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
         
     </data>
 </openerp>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index c73bc9dc039..e24f604fbe6 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -30,12 +30,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             	<search string="Tasks by User">
-            		<group colspan="4" col="3">
-                        <filter icon="terp-go-year" string=" Year "
+            		<group>
+                        <filter icon="terp-go-year" string="Year"
                             name="year"
                             domain="[('name','&lt;=', time.strftime('%%Y-%%m-%%d')),('name','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Task Hours in current year"/>
-                        <filter icon="terp-go-month" string=" Month "
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-month" string="Month"
                             name="month"
                             domain="[('name','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Task Hours in current month"/>
@@ -47,7 +48,7 @@
 	                    <field name="user_id"/>
                 	</group>
                 	<newline/>
-                	<group expand="1" string="Group By..." colspan="4" col="3">
+                	<group expand="1" string="Group By...">
                 	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
@@ -76,7 +77,7 @@
             <field name="res_model">report.timesheet.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1, 'search_default_group_user_id':1}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1, 'search_default_group_user_id':1}</field>
         </record>
         <menuitem id="menu_timesheet_task_user" parent="hr_timesheet.menu_hr_reporting_timesheet"
                     action="action_report_timesheet_task_user" sequence="1"/>
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 4cf790c4e2b..f524c214821 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -50,9 +50,9 @@
   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-06-%d')
-    date_from: !eval "'%s-06-01' %(datetime.now().year)"
-    date_to: !eval "'%s-06-30' %(datetime.now().year)"
+    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
     state: new
     user_id: res_users_hrmanager0
@@ -70,7 +70,7 @@
   Create a task 'Get all timesheet records'
 -
   !record {model: project.task, id: project_task_getalltimesheetrecords0}:
-    date_start: !eval time.strftime('%Y-06-%d %H:%M:%S')
+    date_start: !eval time.strftime('%Y-05-%d %H:%M:%S')
     name: Get all timesheet records
     planned_hours: 20.0
     project_id: project_project_timesheetmanagement0
@@ -92,7 +92,7 @@
 -
   !record {model: project.task, id: project_task_getalltimesheetrecords0}:
     work_ids:
-      - date: !eval time.strftime('%Y-06-%d %H:%M:%S')
+      - date: !eval time.strftime('%Y-05-%d %H:%M:%S')
         hours: 10.0
         name: Get work calendar of all employees
         user_id: res_users_hrmanager0
diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 301e32ebca9..66f92a60831 100644
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -26,6 +26,7 @@ import wizard
 import report
 import stock
 import company
+import edi
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 975754dd5fe..b4f3a9adf30 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Purchase Management',
     'version': '1.1',
-    'category': 'Purchases',
+    'category': 'Purchase Management',
     'complexity': "easy",
     'description': """
 Purchase module is for generating a purchase order for purchase of goods from a supplier.
@@ -40,7 +40,7 @@ Dashboard for purchase management that includes:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images' : ['images/purchase_order.jpeg', 'images/purchase_analysis.jpeg', 'images/request_for_quotation.jpeg'],
-    'depends': ['base', 'account', 'stock', 'process', 'procurement'],
+    'depends': ['stock', 'process', 'procurement'],
     'data': [
         'security/purchase_security.xml',
         'security/ir.model.access.csv',
@@ -58,16 +58,23 @@ Dashboard for purchase management that includes:
         'process/purchase_process.xml',
         'report/purchase_report_view.xml',
         'board_purchase_view.xml',
+        'edi/purchase_order_action_data.xml',
     ],
     'test': [
-             'test/purchase_from_order.yml',
-             'test/purchase_from_manual.yml',
-             'test/purchase_from_picking.yml',
-             'purchase_unit_test.xml',
-             'test/procurement_buy.yml',
-             'test/purchase_report.yml',
+        'test/process/cancel_order.yml',
+        'test/process/rfq2order2done.yml',
+        'test/process/generate_invoice_from_reception.yml',
+        'test/process/run_scheduler.yml',
+        'test/process/merge_order.yml',
+        'test/process/edi_purchase_order.yml',
+        'test/ui/print_report.yml',
+        'test/ui/duplicate_order.yml',
+        'test/ui/delete_order.yml',
+    ],
+    'demo': [
+        'purchase_order_demo.yml',
+        'purchase_demo.xml',
     ],
-    'demo': ['purchase_demo.xml'],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 8a289ccbedb..453f029aa0d 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -14,7 +14,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field>
-            <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
             <field name="name">Purchase Order Waiting Approval</field>
@@ -23,7 +22,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
-            <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
 
 		<record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
@@ -131,25 +129,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Board">
-                    <hpaned>
-                        <child1>
+                    <board style="1-1">
+                        <column>
                         <!--
-                            <action colspan="4" height="220" name="%(purchase.action_current_purchases)d" string="Current purchases"  width="510"/>
-                            <action colspan="4" height="220" name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"  width="510"/>
+                            <action name="%(purchase.action_current_purchases)d" string="Current purchases"/>
+                            <action name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"/>
                         -->
-                        	<action colspan="4" height="220" name="%(purchase_draft)d" string="Request for Quotations"  width="510"/>
-                        	<action colspan="4" height="220" name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"  width="510"/>
-                        </child1>
-                        <child2>
-                        	<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"  />
+                        	<action name="%(purchase_draft)d" string="Request for Quotations"/>
+                        	<action name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"/>
+                        </column>
+                        <column>
+                        	<action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"/>
                         <!--
-                            <action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"  />
-                            <action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"  />
-                            <action colspan="4" height="220" name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"  />
+                            <action name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"/>
+                            <action name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"/>
+                            <action name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"/>
                         -->
 
-                        </child2>
-                    </hpaned>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/edi/__init__.py b/addons/purchase/edi/__init__.py
new file mode 100644
index 00000000000..be599e9736c
--- /dev/null
+++ b/addons/purchase/edi/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 purchase_order
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
new file mode 100644
index 00000000000..235b02645ed
--- /dev/null
+++ b/addons/purchase/edi/purchase_order.py
@@ -0,0 +1,202 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
+
+from osv import fields, osv, orm
+from edi import EDIMixin
+from tools import DEFAULT_SERVER_DATE_FORMAT
+from tools.translate import _
+
+PURCHASE_ORDER_LINE_EDI_STRUCT = {
+    'name': True,
+    'date_planned': True,
+    'product_id': True,
+    'product_uom': True,
+    'price_unit': True,
+    'product_qty': True,
+    'notes': True,
+
+    # fields used for web preview only - discarded on import
+    'price_subtotal': True,
+}
+
+PURCHASE_ORDER_EDI_STRUCT = {
+    'company_id': True, # -> to be changed into partner
+    'name': True,
+    'partner_ref': True,
+    'origin': True,
+    'date_order': True,
+    'partner_id': True,
+    #custom: 'partner_address',
+    'notes': True,
+    'order_line': PURCHASE_ORDER_LINE_EDI_STRUCT,
+    #custom: currency_id
+
+    # fields used for web preview only - discarded on import
+    'amount_total': True,
+    'amount_untaxed': True,
+    'amount_tax': True,
+}
+
+class purchase_order(osv.osv, EDIMixin):
+    _inherit = 'purchase.order'
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        """Exports a purchase order"""
+        edi_struct = dict(edi_struct or PURCHASE_ORDER_EDI_STRUCT)
+        res_company = self.pool.get('res.company')
+        res_partner_address = self.pool.get('res.partner.address')
+        edi_doc_list = []
+        for order in records:
+            # generate the main report
+            self._edi_generate_report_attachment(cr, uid, order, context=context)
+
+            # Get EDI doc based on struct. The result will also contain all metadata fields and attachments.
+            edi_doc = super(purchase_order,self).edi_export(cr, uid, [order], edi_struct, context)[0]
+            edi_doc.update({
+                    # force trans-typing to purchase.order upon import
+                    '__import_model': 'sale.order',
+                    '__import_module': 'sale',
+
+                    'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context),
+                    'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_address_id], context=context)[0],
+                    'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id],
+                                                                         context=context)[0],
+            })
+            if edi_doc.get('order_line'):
+                for line in edi_doc['order_line']:
+                    line['__import_model'] = 'sale.order.line'
+            edi_doc_list.append(edi_doc)
+        return edi_doc_list
+
+    def edi_import_company(self, cr, uid, edi_document, context=None):
+        # TODO: for multi-company setups, we currently import the document in the
+        #       user's current company, but we should perhaps foresee a way to select
+        #       the desired company among the user's allowed companies
+
+        self._edi_requires_attributes(('company_id','company_address'), edi_document)
+        res_partner_address = self.pool.get('res.partner.address')
+        res_partner = self.pool.get('res.partner')
+
+        # imported company = as a new partner
+        src_company_id, src_company_name = edi_document.pop('company_id')
+        partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
+                                              src_company_id, context=context)
+        partner_value = {'customer': True}
+        res_partner.write(cr, uid, [partner_id], partner_value, context=context)
+
+        # imported company_address = new partner address
+        address_info = edi_document.pop('company_address')
+        address_info['partner_id'] = (src_company_id, src_company_name)
+        address_info['type'] = 'default'
+        address_id = res_partner_address.edi_import(cr, uid, address_info, context=context)
+
+        # modify edi_document to refer to new partner/address
+        partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
+        edi_document['partner_id'] = (src_company_id, src_company_name)
+        edi_document.pop('partner_address', False) # ignored
+        edi_document['partner_address_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
+
+        return partner_id
+
+    def _edi_get_pricelist(self, cr, uid, partner_id, currency, context=None):
+        # TODO: refactor into common place for purchase/sale, e.g. into product module
+        partner_model = self.pool.get('res.partner')
+        partner = partner_model.browse(cr, uid, partner_id, context=context)
+        pricelist = partner.property_product_pricelist_purchase
+        if not pricelist:
+            pricelist = self.pool.get('ir.model.data').get_object(cr, uid, 'purchase', 'list0', context=context)
+
+        if not pricelist.currency_id == currency:
+            # look for a pricelist with the right type and currency, or make a new one
+            pricelist_type = 'purchase'
+            product_pricelist = self.pool.get('product.pricelist')
+            match_pricelist_ids = product_pricelist.search(cr, uid,[('type','=',pricelist_type),
+                                                                    ('currency_id','=',currency.id)])
+            if match_pricelist_ids:
+                pricelist_id = match_pricelist_ids[0]
+            else:
+                pricelist_name = _('EDI Pricelist (%s)') % (currency.name,)
+                pricelist_id = product_pricelist.create(cr, uid, {'name': pricelist_name,
+                                                                  'type': pricelist_type,
+                                                                  'currency_id': currency.id,
+                                                                 })
+                self.pool.get('product.pricelist.version').create(cr, uid, {'name': pricelist_name,
+                                                                            'pricelist_id': pricelist_id})
+            pricelist = product_pricelist.browse(cr, uid, pricelist_id)
+
+        return self.edi_m2o(cr, uid, pricelist, context=context)
+
+    def _edi_get_location(self, cr, uid, partner_id, context=None):
+        partner_model = self.pool.get('res.partner')
+        partner = partner_model.browse(cr, uid, partner_id, context=context)
+        location = partner.property_stock_customer
+        if not location:
+            location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
+        return self.edi_m2o(cr, uid, location, context=context)
+
+    def edi_import(self, cr, uid, edi_document, context=None):
+        self._edi_requires_attributes(('company_id','company_address','order_line','date_order','currency'), edi_document)
+
+        #import company as a new partner
+        partner_id = self.edi_import_company(cr, uid, edi_document, context=context)
+
+        # currency for rounding the discount calculations and for the pricelist
+        res_currency = self.pool.get('res.currency')
+        currency_info = edi_document.pop('currency')
+        currency_id = res_currency.edi_import(cr, uid, currency_info, context=context)
+        order_currency = res_currency.browse(cr, uid, currency_id)
+
+        partner_ref = edi_document.pop('partner_ref', False)
+        edi_document['partner_ref'] = edi_document['name']
+        edi_document['name'] = partner_ref or edi_document['name']
+        edi_document['pricelist_id'] = self._edi_get_pricelist(cr, uid, partner_id, order_currency, context=context)
+        edi_document['location_id'] = self._edi_get_location(cr, uid, partner_id, context=context)
+
+        # discard web preview fields, if present
+        edi_document.pop('amount_total', None)
+        edi_document.pop('amount_tax', None)
+        edi_document.pop('amount_untaxed', None)
+        edi_document.pop('payment_term', None)
+        edi_document.pop('order_policy', None)
+        edi_document.pop('user_id', None)
+
+        for order_line in edi_document['order_line']:
+            self._edi_requires_attributes(('date_planned', 'product_id', 'product_uom', 'product_qty', 'price_unit'), order_line)
+            # original sale order contains unit price and discount, but not final line price
+            discount = order_line.pop('discount', 0.0)
+            if discount:
+                order_line['price_unit'] = res_currency.round(cr, uid, order_currency,
+                                                              (order_line['price_unit'] * (1 - (discount or 0.0) / 100.0)))
+            # sale order lines have sequence numbers, not purchase order lines
+            order_line.pop('sequence', None)
+
+            # discard web preview fields, if present
+            order_line.pop('price_subtotal', None)
+        return super(purchase_order,self).edi_import(cr, uid, edi_document, context=context)
+
+class purchase_order_line(osv.osv, EDIMixin):
+    _inherit='purchase.order.line'
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
new file mode 100644
index 00000000000..f3f610b8e75
--- /dev/null
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <!--Export edi document  -->
+        <record id="ir_actions_server_edi_purchase" model="ir.actions.server">
+            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='purchase.email_template_edi_purchase', context=context)</field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="condition">True</field>
+            <field name="name">Auto-email confirmed purchase orders</field>
+        </record>
+
+        <!-- EDI related Email Templates menu -->
+        <record model="ir.actions.act_window" id="action_email_templates">
+            <field name="name">Email Templates</field>
+            <field name="res_model">email.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_template.email_template_tree" />
+            <field name="search_view_id" ref="email_template.view_email_template_search"/>
+            <field name="context" eval="{'search_default_model_id': ref('purchase.model_purchase_order')}"/>
+        </record>
+        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_purchase_config_purchase" sequence="30"/>
+        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30"/>
+    </data>
+
+    <!-- Mail template and workflow bindings are done in a NOUPDATE block
+         so users can freely customize/delete them -->
+    <data noupdate="1">
+         <!-- bind the mailing server action to purchase.order confirmed activity -->
+        <record id="purchase.act_confirmed" model="workflow.activity">
+            <field name="action_id" ref="ir_actions_server_edi_purchase"/>
+        </record>
+
+        <!--Email template -->
+        <record id="email_template_edi_purchase" model="email.template">
+            <field name="name">Automated Purchase Order Notification Mail</field>
+            <field name="email_from">${object.validator.user_email or ''}</field>
+            <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
+            <field name="email_to">${object.partner_address_id.email}</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html"><![CDATA[
+<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); ">
+
+    <p>Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},</p>
+    
+    <p>Here is a purchase order confirmation from ${object.company_id.name}: </p>
+    
+    <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
+       &nbsp;&nbsp;<strong>REFERENCES</strong><br />
+       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
+       &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />
+       &nbsp;&nbsp;Order date: ${object.date_order}<br />
+       % if object.origin:
+       &nbsp;&nbsp;Order reference: ${object.origin}<br />
+       % endif
+       % if object.partner_ref:
+       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />
+       % endif
+       &nbsp;&nbsp;Your contact: <a href="mailto:${object.validator.user_email or ''}?subject=Order%20${object.name}">${object.validator.name}</a>
+    </p>
+
+    <p>
+    You can view the order confirmation document and download it using the following link:
+    </p>
+            <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;" 
+               href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
+
+    <br/>
+    <p>If you have any question, do not hesitate to contact us.</p>
+    <p>Thank you!</p>
+    <br/>
+    <br/>
+    <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;">
+        <h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;">
+            <strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
+    </div>
+    <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
+        <span style="color: #222; margin-bottom: 5px; display: block; ">
+        % if object.company_id.street:
+            ${object.company_id.street}<br/>
+        % endif
+        % if object.company_id.street2:
+            ${object.company_id.street2}<br/>
+        % endif
+        % if object.company_id.city or object.company_id.zip:
+            ${object.company_id.zip} ${object.company_id.city}<br/>
+        % 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 ''}<br/>
+        % endif
+        </span>
+        % if object.company_id.phone:
+            <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; ">
+                Phone:&nbsp; ${object.company_id.phone}
+            </div>
+        % endif
+        % if object.company_id.website:
+            <div>
+                Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
+            </div>
+        %endif
+        <p></p>
+    </div>
+</div>
+            ]]></field>
+            <field name="body_text"><![CDATA[
+Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},
+
+Here is a 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.user_email and '<%s>'%(object.validator.user_email) or ''}
+
+You can view the 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.user_email and '<%s>'%(object.validator.user_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>
\ No newline at end of file
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index 5c77e6a30fb..11027da5da2 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -395,7 +395,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -759,7 +759,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1549,7 +1548,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1674,7 +1673,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index ce72e938659..619436f2e86 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.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-08-03 10:12+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "става потвърена Поръчка."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -44,7 +44,7 @@ msgid "Destination"
 msgstr "Назначение"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -144,7 +144,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Няма ценова листа !"
@@ -237,7 +237,7 @@ msgid "Partial Picking"
 msgstr "Частично товарене"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Поръчката '%s' е потвърдена."
@@ -284,7 +284,7 @@ msgid "Notes"
 msgstr "Бележки"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -361,7 +361,7 @@ msgid "Cancelled"
 msgstr "Отказани"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Поръчката е над лимита"
@@ -415,7 +415,7 @@ msgid "Reference"
 msgstr "Препратка"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Не могат да се трият Поръчка/и в състояние %s!"
@@ -437,7 +437,7 @@ msgid "Day"
 msgstr "Ден"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -454,8 +454,8 @@ msgid "# of Lines"
 msgstr "# от редове"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Грешни мерни единици"
@@ -592,7 +592,7 @@ msgid "Order Lines"
 msgstr "Редове от поръчка"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Няма партньор"
@@ -641,9 +641,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Фактури генерирани за поръчка"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -701,7 +701,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Невалидно действие !"
@@ -779,7 +779,7 @@ msgid "    Month-1    "
 msgstr "    Месец-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -790,7 +790,7 @@ msgid "Manual"
 msgstr "Ръчно"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -904,7 +904,6 @@ msgid "Month"
 msgstr "Месец"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Чака потвърждение от доставчик"
@@ -1107,7 +1106,7 @@ msgid "Manual Invoices"
 msgstr "Ръчно издадени фактури"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1124,14 +1123,14 @@ msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr "Трябва първо да откажете всички фактури прикрепени към тази поръчка"
@@ -1178,7 +1177,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1440,7 +1439,7 @@ msgid "Date Approved"
 msgstr "Одобрен на дата"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1552,7 +1551,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Общо количество и сума на месец"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1696,7 +1695,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Поръчка '%s' е отказана."
@@ -1773,7 +1772,7 @@ msgid "Partner"
 msgstr "Партньор"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index d447b0abc7c..3c0d0e210d1 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr "Odredište"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -226,7 +226,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -273,7 +273,7 @@ msgid "Notes"
 msgstr "Napomene"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -347,7 +347,7 @@ msgid "Cancelled"
 msgstr "Otkazano"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -401,7 +401,7 @@ msgid "Reference"
 msgstr "Referenca"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -423,7 +423,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -440,8 +440,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -478,7 +478,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -578,7 +578,7 @@ msgid "Order Lines"
 msgstr "Redovi naloga"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -627,9 +627,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -687,7 +687,7 @@ msgid "Reservation Destination"
 msgstr "Odredište rezervacije"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -765,7 +765,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -776,7 +776,7 @@ msgid "Manual"
 msgstr "Ručno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -892,7 +892,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1095,7 +1094,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1112,14 +1111,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1166,7 +1165,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1433,7 +1432,7 @@ msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1545,7 +1544,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1564,7 +1563,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1689,7 +1688,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1766,7 +1765,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 195fedd1f21..24429012b29 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-16 04:54+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -28,7 +27,7 @@ msgstr ""
 "compra confirmada."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -47,7 +46,7 @@ msgid "Destination"
 msgstr "Destí"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -86,7 +85,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Reception"
-msgstr ""
+msgstr "A la recepció"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -130,7 +129,7 @@ msgstr ""
 "obtenir els productes rebuts, i controlar les factures dels proveïdors."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveïdor seleccionat només ven aquest producte per %s"
@@ -153,7 +152,7 @@ msgid "From a Pick list"
 msgstr "Des d'un albarà"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "No tarifa!"
@@ -246,7 +245,7 @@ msgid "Partial Picking"
 msgstr "Empaquetat parcial"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Comanda de compra '%s' esta confirmada."
@@ -293,7 +292,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -371,7 +370,7 @@ msgid "Cancelled"
 msgstr "Cancel·lada"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Import de la compra per sobre del límit"
@@ -425,7 +424,7 @@ msgid "Reference"
 msgstr "Referència"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "No es poden eliminar comanda(es) de compra que estiguin en estat %s!"
@@ -447,7 +446,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Comanda de compra '%s' s'ha canviat a l'estat esborrany."
@@ -464,8 +463,8 @@ msgid "# of Lines"
 msgstr "# de línies"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -502,7 +501,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarà ha estat realitzat."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "UdM del producte errònia!"
@@ -607,7 +606,7 @@ msgid "Order Lines"
 msgstr "Línies de la comanda"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Falta empresa!"
@@ -663,9 +662,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Factures generades per a una comanda de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -730,7 +729,7 @@ msgid "Reservation Destination"
 msgstr "Destinació de la reserva"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Acció no vàlida!"
@@ -814,7 +813,7 @@ msgid "    Month-1    "
 msgstr "    Mes-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "No s'ha definit un diari per a aquesta empresa: \"%s\" (id:%d)"
@@ -825,7 +824,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -948,7 +947,6 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Esperant acceptació proveïdor"
@@ -1002,13 +1000,13 @@ msgstr "Per ser revisat pel comptable."
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 msgid "On Purchase Order Line"
-msgstr ""
+msgstr "En la línia d'ordres de compra"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
 msgid "On Receptions"
-msgstr ""
+msgstr "En recepcions"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1154,7 +1152,7 @@ msgid "Manual Invoices"
 msgstr "Factures manuals"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1172,7 +1170,7 @@ msgid "Extended Filters..."
 msgstr "Filtres extesos..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1180,7 +1178,7 @@ msgstr ""
 "No hi ha compte de despeses definida per a aquest producte: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1239,7 +1237,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1512,7 +1510,7 @@ msgid "Date Approved"
 msgstr "Data aprovació"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "No es pot cancel·lar aquesta comanda de compra!"
@@ -1628,7 +1626,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Qtat total i import per mes"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "No es pot cancel·lar la comanda de compra!"
@@ -1795,7 +1793,7 @@ msgstr ""
 "una comanda de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "La comanda de compra '%s' està cancel·lada."
@@ -1875,7 +1873,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1925,9 +1923,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Taulell de compres"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No podeu tenir 2 versions de tarifes que es superposin!"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist in the purchase form !\n"
@@ -1948,15 +1943,6 @@ msgstr "Taulell de compres"
 #~ msgid "From Picking"
 #~ msgstr "Des de albarà"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Si us plau observeu que les comandes només es fusionaran si pertanyen a la "
-#~ "mateixa empresa i es dirigeixen a la mateixa ubicació, i les línies només es "
-#~ "fusionaran si són exactament les mateixes excepte la quantitat i unitat."
-
 #~ msgid "Packing"
 #~ msgstr "Paquet/Albarà"
 
@@ -1972,9 +1958,6 @@ msgstr "Taulell de compres"
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Comandes de compra en procés"
 
-#~ msgid "N°"
-#~ msgstr "Nº"
-
 #~ msgid "Purchase order is confirmed by the user."
 #~ msgstr "Comanda de compra és confirmada per l'usuari."
 
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index ad48bccef92..a3a9b09968b 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.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: 2011-07-15 02:37+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\n"
+"PO-Revision-Date: 2011-11-07 12:54+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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: purchase
@@ -27,7 +27,7 @@ msgstr ""
 "potvrzenou nákupní objednávkou."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Nemůžete potvrdit nákupní objednávku bez řádků Nákupní objednávky."
@@ -45,7 +45,7 @@ msgid "Destination"
 msgstr "Cíl"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -118,7 +118,7 @@ msgstr ""
 "sledovat obdržené výrobky a ovládat faktury dodavatelů."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s"
@@ -141,7 +141,7 @@ msgid "From a Pick list"
 msgstr "Ze seznamu navádění"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Žádný ceník !"
@@ -232,7 +232,7 @@ msgid "Partial Picking"
 msgstr "Částečné navádění"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Nákupní objednávka '%s' je potvrzena."
@@ -279,7 +279,7 @@ msgid "Notes"
 msgstr "Poznámky"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -355,7 +355,7 @@ msgid "Cancelled"
 msgstr "Zrušeno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Částka nákupu je nad limitem"
@@ -409,7 +409,7 @@ msgid "Reference"
 msgstr "Odkaz"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Nelze smazat Nákupní objednávku(y), která je ve stavu %s!"
@@ -431,7 +431,7 @@ msgid "Day"
 msgstr "Den"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Nákupní objednávka '%s' byla nasatavena do návrhového stavu."
@@ -448,8 +448,8 @@ msgid "# of Lines"
 msgstr "# z řádek"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -486,7 +486,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indikuje, že navádění bylo dokončeno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Nesprávná MJ výrobku !"
@@ -588,7 +588,7 @@ msgid "Order Lines"
 msgstr "Řádky objednávky"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Žádný partner!"
@@ -637,9 +637,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Faktury generované pro nákupní objednávku"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -700,7 +700,7 @@ msgid "Reservation Destination"
 msgstr "Cíl rezervace"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Neplatná akce !"
@@ -780,7 +780,7 @@ msgid "    Month-1    "
 msgstr "    Měsíc-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Pro tuto společnost není určen nákupní deník: \"%s\" (id:%d)"
@@ -791,7 +791,7 @@ msgid "Manual"
 msgstr "Ruční"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -908,7 +908,6 @@ msgid "Month"
 msgstr "Měsíc"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Čekání na potvrzení dodavatelem"
@@ -1112,7 +1111,7 @@ msgid "Manual Invoices"
 msgstr "Ruční faktury"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1129,14 +1128,14 @@ msgid "Extended Filters..."
 msgstr "Rozšířené filtry..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, 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)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1184,7 +1183,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1447,7 +1446,7 @@ msgid "Date Approved"
 msgstr "Datum schválení"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Nelze zrušit tuto nákupní objednávku !"
@@ -1559,7 +1558,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Celkové množ. a částka za měsíc"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Nelze zrušit nákupní objednávku !"
@@ -1705,7 +1704,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Nákupní objednávka '%s' zrušena."
@@ -1785,7 +1784,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1840,3 +1839,6 @@ msgstr "Nástěnka nákupu"
 
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Nefakturované nákupní řádky"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
new file mode 100644
index 00000000000..4c366d8124d
--- /dev/null
+++ b/addons/purchase/i18n/da.po
@@ -0,0 +1,1798 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-08 22:35+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: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr "Faktureret & Betalt"
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"You can create a request for quotation when you want to buy products to a "
+"supplier but the purchase is not confirmed yet. Use also this menu to review "
+"requests for quotation created automatically based on your logistic rules "
+"(minimum stock, MTO, etc). You can convert the request for quotation into a "
+"purchase order once the order is confirmed. If you use the extended "
+"interface (from user's preferences), you can select the way to control your "
+"supplier invoices: based on the order, based on the receptions or manual "
+"encoding."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Reception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr "Ikke faktureret"
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr "Leverandør"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"Use this menu to search within your purchase orders by references, supplier, "
+"products, etc. For each purchase order, you can track the products received, "
+"and control the supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:735
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid "No Pricelist !"
+msgstr "Ingen prisliste"
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr "Antal"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr "Nuværende indkøb"
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+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
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:296
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr "Godkendt indkøb"
+
+#. 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 "Godkendt"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,notes:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr "Noter"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr "Skatter"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
+#: view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr "Indkøbsordre"
+
+#. module: purchase
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr "Netto total:"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure Your Purchases Management Application"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
+msgstr "Produkter"
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:315
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prislist"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr "   Måned   "
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr "Lager flytning"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:344
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning"
+msgstr "Advarsel!"
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Netto pris"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Bekræftet"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Bekræft"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Plukkeliste"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Ordre linie"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr "Total pris"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr "Prislister"
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received from your supplier. "
+"OpenERP pregenerates draft invoices from your purchase orders or receptions, "
+"according to your settings. Once you receive a supplier invoice, you can "
+"match it with the draft invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:373
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:410
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you have not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr "Indkøbs rekvisition"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+msgid "Receive Products"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Indkøb"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakturaer"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: purchase
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Modtaget"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Indkøbs administration"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr "  År  "
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Kalendervisning"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Hilsen"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr "Indkøbs egenskaber"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:318
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:418
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. 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 ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid ""
+"\n"
+"    Purchase module is for generating a purchase order for purchase of goods "
+"from a supplier.\n"
+"    A supplier invoice is created for the particular order placed\n"
+"    Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month    \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#, python-format
+msgid ""
+"The selected supplier has a minimal quantity set to %s, you cannot purchase "
+"less."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr "Virksomheder"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr "Oversigt"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr "Indkøbsordre pr. måned"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historik"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "Venter"
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid ""
+"Extend your Purchases Management Application with additional functionalities."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+#: view:purchase.installer:0
+msgid "Purchases Application Configuration"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr "Indkøbsordrer"
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr "Søg indkøbsordre"
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lagersted"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr "Godkendelsesdato"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:417
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Enhedspris"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr "Vare"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr "Bekræftelse"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Levering"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Antal"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr "Adresse"
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:409
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr "Godkend"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr "Til godkendelse"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "Fakturering"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:424
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr "Adresser"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr "Fra indkøbsordre"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr "Indløb"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid ""
+"You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Lagerflytning"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr "Måleenheder"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr "Ordrer"
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr "Indkøb oversigt"
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 23136992873..6aa22d7b2d1 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -7,15 +7,15 @@ 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-18 11:29+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -28,7 +28,7 @@ msgstr ""
 "Beschaffungsauftrag (Bestellung)."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -47,7 +47,7 @@ msgid "Destination"
 msgstr "Zielort"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -132,7 +132,7 @@ msgstr ""
 "Eingangsrechnung vornehmen."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -156,7 +156,7 @@ msgid "From a Pick list"
 msgstr "vom Lieferauftrag"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Keine Preisliste!"
@@ -250,7 +250,7 @@ msgid "Partial Picking"
 msgstr "Lieferung Teilmenge"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Beschaffungsauftrag '%s' wurde bestätigt."
@@ -297,7 +297,7 @@ msgid "Notes"
 msgstr "Bemerkungen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -378,7 +378,7 @@ msgid "Cancelled"
 msgstr "Abgebrochen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Beschaffungswert übersteigt Limit"
@@ -432,7 +432,7 @@ msgid "Reference"
 msgstr "Referenz"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Einkaufsaufträge mit dem Status %s können nicht gelöscht werden"
@@ -454,7 +454,7 @@ msgid "Day"
 msgstr "Tag"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Beschaffungsauftrag '%s' wurde in Entwurf Status versetzt"
@@ -471,8 +471,8 @@ msgid "# of Lines"
 msgstr "# Positionen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -509,7 +509,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Es wird angezeigt, dass ein Lieferauftrag ansteht"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Falsche Mengeneinheit!"
@@ -615,7 +615,7 @@ msgid "Order Lines"
 msgstr "Auftragszeilen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Kein Partner!"
@@ -672,9 +672,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Erstellte Eingangsrechnung für Beschaffungsauftrag"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -739,7 +739,7 @@ msgid "Reservation Destination"
 msgstr "Reservierung Auslieferungsziel"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Fehlerhafte Aktion"
@@ -824,7 +824,7 @@ msgid "    Month-1    "
 msgstr "    Monat-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -837,7 +837,7 @@ msgid "Manual"
 msgstr "Manuelle Rechnung"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -961,7 +961,6 @@ msgid "Month"
 msgstr "Monat"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Erwarte Auftragsbestätigung"
@@ -1169,7 +1168,7 @@ msgid "Manual Invoices"
 msgstr "Erzeuge Rechnungen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1188,7 +1187,7 @@ msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1196,7 +1195,7 @@ msgstr ""
 "Es ist kein Aufwandskonto für dieses Produkt hinterlegt:  \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1256,7 +1255,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1529,7 +1528,7 @@ msgid "Date Approved"
 msgstr "Datum Annahme"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Konnte den Beschaffungsauftrag nicht abbrechen!"
@@ -1647,7 +1646,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Gesamtmenge und Umsatz nach Monaten"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Konnte Beschaffungsvorgang nicht abbrechen!"
@@ -1815,7 +1814,7 @@ msgstr ""
 "einen Beschaffungsauftrag abbricht."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Beschaffungsauftrag '%s' wurde abgebrochen"
@@ -1897,7 +1896,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1947,23 +1946,9 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Pinnwand Einkauf"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Sie können keine sich zeitlich überlappende Versionen von Preislisten haben."
-
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Vorab Eingangsrechnung zur Wareneingangskontrolle"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Bitte berücksichtige folgendes: Aufträge werden nur zusammengefasst wenn Sie "
-#~ "an denselben Partner gerichtet sind und der Wareneingang denselben Lagerort "
-#~ "betrifft. Außerdem werden Einzelpositionen nur zusammengefasst wenn sie "
-#~ "exakt gleich sind (bis auf Menge und Einheit)."
-
 #~ msgid "Packing"
 #~ msgstr "Packliste"
 
@@ -1979,9 +1964,6 @@ msgstr "Pinnwand Einkauf"
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Beschaffungsaufträge (in Bearbeitung)"
 
-#~ msgid "N°"
-#~ msgstr "Nr."
-
 #~ msgid "Purchase order is confirmed by the user."
 #~ msgstr "Bestätigter Beschaffungsauftrag"
 
@@ -2158,149 +2140,18 @@ msgstr "Pinnwand Einkauf"
 #~ msgid "Date"
 #~ msgstr "Datum"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Auftrag in manueller Bearbeitung"
-
-#~ msgid "In progress"
-#~ msgstr "In Bearbeitung"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Warteliste"
-
-#~ msgid "Quotation"
-#~ msgstr "Angebot"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#~ msgid "To be Invoiced"
-#~ msgstr "Abzurechnen"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Eine Eingangsrechnung für einen Beschaffungsauftrag"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "Über das Menü Beschaffungsaufträge, können Sie den Status Ihrer Bestellungen "
-#~ "rückverfolgen: Haben Sie die Produkte erhalten, wurde eine Rechnung "
-#~ "erstellt, ist die Rechnung gebucht und ist die Rechnung bereits bezahlt oder "
-#~ "nach wie vor offen.\n"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Nutzen Sie dieses Menü für die Erfassung und Rückverfolgung von "
-#~ "Eingangsrechnungen. OpenERP erzeugt vorab Rechnungen im Status Entwurf "
-#~ "entweder bereits auf Basis der Bestellung oder später durch den "
-#~ "Wareneingang. Sobald Sie dann die tatsächliche Rechnung ihres Lieferanten "
-#~ "erhalten, können Sie diese Rechnung mit dem Entwurf abgleichen und die "
-#~ "Eingangsrechnung buchen."
-
 #~ msgid ""
 #~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 #~ "Item!"
 #~ msgstr ""
 #~ "Fehler ! Sie können nicht die Basispreisliste als andere Preisliste zuweisen."
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ " Please note that: \n"
-#~ " \n"
-#~ "   Orders will only be merged if: \n"
-#~ "   * Purchase Orders are in draft \n"
-#~ "   * Purchase Orders belong to the same supplier \n"
-#~ "   * Purchase Orders are have same stock location, same pricelist \n"
-#~ " \n"
-#~ "    Lines will only be merged if: \n"
-#~ "   * Order lines are exactly the same except for the product,quantity and "
-#~ "unit \n"
-#~ " "
-#~ msgstr ""
-#~ " Bitte beachten Sie folgendes: \n"
-#~ "\n"
-#~ "  Aufträge werden nur zusammengefasst, wenn folgendes zutreffend ist:\n"
-#~ "  * Beschaffungsauftrag im Entwurf\n"
-#~ "   * Beschaffungsaufträge beim selben Lieferanten\n"
-#~ "   * Beschaffungsaufträge beinhalten identische Lagerorte, sowie eine "
-#~ "identische Preisliste.\n"
-#~ "\n"
-#~ "Auftragspositionen werden nur zusammengefasst, wenn folgendes zutreffend "
-#~ "ist:\n"
-#~ "  * Die Auftragsposition ist exakt identisch, bis auf: Produkt, Menge und "
-#~ "Einheit \n"
-#~ " "
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Durch das Menü Angebotsanfragen können Sie neue Angebote bei Lieferanten "
-#~ "anfragen, bestehende Anfragen rückverfolgen, eine Bestellung tätigen sowie "
-#~ "die Auftragsbestätigung durch den Lieferanten eingeben. Durch Ihre "
-#~ "Bestellung wird dann ein Beschaffungsauftrag erzeugt, der wiederum folgende "
-#~ "weitere Wokflows auslöst: Erstellung eines Wareneingangslieferscheins im "
-#~ "Status Entwurf, Eingangsrechnung im Entwurf zur Rechnungskontrolle."
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Verwenden Sie die Daten zu Ihren Lieferanten und nutzen Sie das Supplier "
-#~ "Relationship Management. Sie können über den Aktenreiter Historie bei Ihren "
-#~ "Lieferanten folgende Informationen einsehen: Gesendete EMails, Bestellungen, "
-#~ "Gemeinsame Termine, etc."
-
-#~ msgid "Product UoM"
-#~ msgstr "Produkt ME"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #~ msgid "From Picking"
 #~ msgstr "Rechnung durch Lieferung"
 
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Wenn Sie beim Beschaffungsauftrag für die Einstellung zur Erstellung einer "
-#~ "Rechnung \"Manuelle Rechnung\" gewählt haben, können Sie hier "
-#~ "nachvollziehen, für welche Auftragspositionen Sie bislang noch keine "
-#~ "Rechnung von Ihrem Lieferanten bekommen haben. Sobald Sie dann eine "
-#~ "Eingangsrechnung empfangen, können Sie auch eine Eingangsrechnung zunächst "
-#~ "im Status Entwurf auf Basis der Auftragspositionen über dieses Menü "
-#~ "erstellen."
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Nicht berechnete Produktzugänge"
 
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index c87b3ff983d..1ee24f75a7b 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -45,7 +45,7 @@ msgid "Destination"
 msgstr "Προορισμός"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -116,7 +116,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -139,7 +139,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Δεν υπάρχει Τιμοκατάλογος!"
@@ -233,7 +233,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -280,7 +280,7 @@ msgid "Notes"
 msgstr "Σημειώσεις"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -354,7 +354,7 @@ msgid "Cancelled"
 msgstr "Ακυρωμένη"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -408,7 +408,7 @@ msgid "Reference"
 msgstr "Παραπομπή"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -431,7 +431,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -448,8 +448,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -486,7 +486,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Λάθος ΜΟΜ Προϊόντος"
@@ -586,7 +586,7 @@ msgid "Order Lines"
 msgstr "Γραμμές Παραγγελίας"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Δεν υπάρχει Συνεργάτης!"
@@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -695,7 +695,7 @@ msgid "Reservation Destination"
 msgstr "Προορσιμός Κράτησης"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Άκυρη Ενέργεια!"
@@ -773,7 +773,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -784,7 +784,7 @@ msgid "Manual"
 msgstr "Μη Αυτόματη"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -900,7 +900,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1104,7 +1103,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1121,14 +1120,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Δεν έχει δηλωθεί λογαριασμός εξόδων για το προϊόν: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1177,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1443,7 +1442,7 @@ msgid "Date Approved"
 msgstr "Ημερ/νία Έγκρισης"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Η Παραγγελία δεν μπορεί να ακυρωθεί!"
@@ -1555,7 +1554,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Η Παραγγελία δεν μπορεί να ακυρωθεί!"
@@ -1574,7 +1573,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1699,7 +1698,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1776,7 +1775,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1830,16 +1829,6 @@ msgstr ""
 #~ msgid "From Picking"
 #~ msgstr "Από Συλλογή"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Παρακαλώ, σημειώστε ότι οι παραγγελίες θα συγχωνευθούν μόνο αν προέρχονται "
-#~ "από τον ίδιο προμηθευτή και έχουν τον ίδιο προορισμό. Οι γραμμές θα "
-#~ "συγχωνευθούν μόνο αν είναι ολόιδιες, με εξαίρεση τις ποσότητες και τις "
-#~ "μονάδες μέτρησης."
-
 #~ msgid "Packing"
 #~ msgstr "Συσκευασία"
 
@@ -1855,9 +1844,6 @@ msgstr ""
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Παραγγελίες Αγορών σε Εξέλιξη"
 
-#~ msgid "N°"
-#~ msgstr "N°"
-
 #~ msgid "Purchase order is confirmed by the user."
 #~ msgstr "Η Παραγγελία Αγοράς επιβεβαιώθηκε από το χρήστη"
 
@@ -2028,10 +2014,6 @@ msgstr ""
 #~ msgid "From Packing list, Create invoice."
 #~ msgstr "Δημιουργία Τιμολογίου από Κατάσταση Συσκευασίας"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Δεν μπορείτε να έχετε 2 εκδόσεις τιμοκαταλόγου που αλληλοκαλύπτονται!"
-
 #~ msgid "Approving Purchase Order"
 #~ msgstr "Έγκριση Παραγγελιών Αγοράς"
 
@@ -2048,12 +2030,3 @@ msgstr ""
 
 #~ msgid "Date"
 #~ msgstr "Ημερομηνία"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Χειροκίνητο σε εξέλιξη"
-
-#~ msgid "Quotation"
-#~ msgstr "Προσφορά"
-
-#~ msgid "In progress"
-#~ msgstr "Σε εξέλιξη"
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 47b5fa79292..35e6205351d 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -760,7 +760,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1675,7 +1674,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index f8d6d8bba80..755695102f8 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-14 09:43+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
 "confirmado."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
 msgstr "Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -84,7 +84,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Reception"
-msgstr ""
+msgstr "En la recepción"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -128,7 +128,7 @@ msgstr ""
 "productos recibidos, y controlar las facturas de los proveedores."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -151,7 +151,7 @@ msgid "From a Pick list"
 msgstr "Desde un albarán"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No tarifa!"
@@ -244,7 +244,7 @@ msgid "Partial Picking"
 msgstr "Albarán parcial"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Pedido de compra '%s' está confirmado."
@@ -291,7 +291,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -369,7 +369,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Importe de compra por encima del límite"
@@ -423,7 +423,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
@@ -445,7 +445,7 @@ msgid "Day"
 msgstr "Día"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
@@ -462,8 +462,8 @@ msgid "# of Lines"
 msgstr "Nº de líneas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -500,7 +500,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarán ha sido realizado."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "¡UdM del producto errónea!"
@@ -605,7 +605,7 @@ msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "¡Falta empresa!"
@@ -660,9 +660,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Facturas generadas para un pedido de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -727,7 +727,7 @@ msgid "Reservation Destination"
 msgstr "Destinación de la reserva"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
@@ -811,7 +811,7 @@ msgid "    Month-1    "
 msgstr "    Mes-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
@@ -822,7 +822,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -945,7 +945,6 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Esperando aceptación proveedor"
@@ -999,13 +998,13 @@ msgstr "Para ser revisado por el contable."
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 msgid "On Purchase Order Line"
-msgstr ""
+msgstr "En la línea de órdenes de compra"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
 msgid "On Receptions"
-msgstr ""
+msgstr "en recepciones"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1151,7 +1150,7 @@ msgid "Manual Invoices"
 msgstr "Facturas manuales"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1169,7 +1168,7 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1177,7 +1176,7 @@ msgstr ""
 "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1235,7 +1234,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1506,7 +1505,7 @@ msgid "Date Approved"
 msgstr "Fecha aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "¡No se puede cancelar este pedido de compra!"
@@ -1621,7 +1620,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Ctdad total y importe por mes"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "¡No se puede cancelar el pedido de compra!"
@@ -1788,7 +1787,7 @@ msgstr ""
 "cancela un pedido de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "El pedido de compra '%s' está cancelado."
@@ -1868,7 +1867,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1918,9 +1917,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Tablero de compras"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist in the purchase form !\n"
@@ -1943,15 +1939,6 @@ msgstr "Tablero de compras"
 #~ msgid "From Picking"
 #~ msgstr "Desde albarán"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen a la "
-#~ "misma empresa y se dirigen a la misma ubicación, y las líneas sólo serán "
-#~ "fusionadas si son exactamente las mismas excepto la cantidad y unidad."
-
 #~ msgid "Packing"
 #~ msgstr "Empaquetado/Albarán"
 
@@ -1967,9 +1954,6 @@ msgstr "Tablero de compras"
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Pedidos de compra en proceso"
 
-#~ msgid "N°"
-#~ msgstr "Nº"
-
 #~ msgid "Purchase order is confirmed by the user."
 #~ msgstr "Pedido de compra es confirmado por el usuario."
 
@@ -2145,99 +2129,5 @@ msgstr "Tablero de compras"
 #~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
 #~ "elemento de la tarifa."
 
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "Quotation"
-#~ msgstr "Presupuesto"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Esperando planificación"
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Para facturar"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Una factura generada por un pedido de compra."
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Líneas de compra no facturadas"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Permite acceder a sus registros de proveedores y mantener su relación con "
-#~ "ellos. Puede gestionar todas sus interacciones con ellos a través de la "
-#~ "pestaña historial: Correos electrónicos, pedidos, reuniones, ..."
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM del producto"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "En el menú de pedidos de compra, puede gestionar el estado de sus pedidos: "
-#~ "los productos recibidos, la factura recibida y controlada.\n"
-
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Si se establece el control de la facturación de un pedido de compra como "
-#~ "\"Manual\", puede controlar todas las líneas del pedido de compra para las "
-#~ "que no se ha recibido todavía la factura del proveedor. Una vez que esté "
-#~ "listo para recibir una factura de proveedor, puede generar una factura de "
-#~ "proveedor en borrador basada en las líneas desde este menú."
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de "
-#~ "presupuesto, revisar las existentes y confirmarlas una vez la oferta del "
-#~ "proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, "
-#~ "OpenERP lo convertirá en un pedido de compra y generará los siguientes "
-#~ "pasos: recepción en borrador de los productos, factura de control."
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Utilice este menú para controlar las facturas que se reciban de su "
-#~ "proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de "
-#~ "compra o de sus recepciones. Una vez que reciba una factura de proveedor, "
-#~ "puede compararla con la factura borrador y validarla."
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index a1a332e0405..aa4f1d6000c 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr "Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -136,7 +136,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sin lista de precio !"
@@ -230,7 +230,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -277,7 +277,7 @@ msgid "Notes"
 msgstr "notas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -351,7 +351,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -405,7 +405,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -427,7 +427,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -444,8 +444,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -482,7 +482,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "UdM del producto errónea !"
@@ -582,7 +582,7 @@ msgid "Order Lines"
 msgstr "Líneas de la orden"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "No hay partner !"
@@ -631,9 +631,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -691,7 +691,7 @@ msgid "Reservation Destination"
 msgstr "Destino de la reserva"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Acción no válida !"
@@ -769,7 +769,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -780,7 +780,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -896,7 +896,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1099,7 +1098,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1116,14 +1115,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "No hay cuenta de gastos definida para este producto: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1171,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1439,7 +1438,7 @@ msgid "Date Approved"
 msgstr "Fecha de aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "No se puede cancelar esta orden de compra!"
@@ -1551,7 +1550,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "¡No se puede cancelar la orden de compra!"
@@ -1570,7 +1569,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1695,7 +1694,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1772,7 +1771,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1821,15 +1820,6 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Factura de proveedor pre-generada en la recepción para control"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen al "
-#~ "mismo partner y se dirigen a la misma ubicación, y las líneas sólo serán "
-#~ "fusionadas si son iguales excepto la cantidad y unidad."
-
 #~ msgid "Packing"
 #~ msgstr "Empaque"
 
@@ -1845,9 +1835,6 @@ msgstr ""
 #~ msgid "Create invoice from product recept"
 #~ msgstr "Crear factura desde recepción producto"
 
-#~ msgid "N°"
-#~ msgstr "Nº"
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Órdenes de compra en proceso"
 
@@ -1996,9 +1983,6 @@ msgstr ""
 #~ msgid "Approved Purchase"
 #~ msgstr "Compra aprobada"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de listas de precios que se superpongan!"
-
 #~ msgid "Packing Invoice"
 #~ msgstr "Facturar remito"
 
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index 3760c59d5fb..9a753ce299b 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
 "confirmado."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
 msgstr "Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -120,7 +120,7 @@ msgstr ""
 "productos recibidos, y controlar las facturas de los proveedores."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -143,7 +143,7 @@ msgid "From a Pick list"
 msgstr "Desde un albarán"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No tarifa!"
@@ -236,7 +236,7 @@ msgid "Partial Picking"
 msgstr "Albarán parcial"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Pedido de compra '%s' está confirmado."
@@ -283,7 +283,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -361,7 +361,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Importe de compra por encima del límite"
@@ -415,7 +415,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
@@ -437,7 +437,7 @@ msgid "Day"
 msgstr "Día"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
@@ -454,8 +454,8 @@ msgid "# of Lines"
 msgstr "Nº de líneas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que un albarán ha sido realizado"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "¡UdM del producto errónea!"
@@ -597,7 +597,7 @@ msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "¡Falta empresa!"
@@ -652,9 +652,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Facturas generadas para un pedido de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -719,7 +719,7 @@ msgid "Reservation Destination"
 msgstr "Destinación de la reserva"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
@@ -803,7 +803,7 @@ msgid "    Month-1    "
 msgstr "    Mes-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
@@ -814,7 +814,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -932,7 +932,6 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Esperando aceptación proveedor"
@@ -1138,7 +1137,7 @@ msgid "Manual Invoices"
 msgstr "Facturas manuales"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1156,7 +1155,7 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1164,7 +1163,7 @@ msgstr ""
 "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1223,7 +1222,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1494,7 +1493,7 @@ msgid "Date Approved"
 msgstr "Fecha aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "¡No se puede cancelar este pedido de compra!"
@@ -1609,7 +1608,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Ctdad total y importe por mes"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "¡No se puede cancelar el pedido de compra!"
@@ -1631,7 +1630,7 @@ msgstr "Febrero"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorías de productos"
 
 #. module: purchase
@@ -1776,7 +1775,7 @@ msgstr ""
 "cancela un pedido de compra."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "El pedido de compra '%s' está cancelado."
@@ -1856,7 +1855,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1912,9 +1911,6 @@ msgstr "Tablero de compras"
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Líneas de compra no facturadas"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist in the purchase form !\n"
@@ -1934,15 +1930,6 @@ msgstr "Tablero de compras"
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Factura de proveedor pre-generada en la recepción para control"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor observe que los pedidos sólo serán fusionados si pertenecen a la "
-#~ "misma empresa y se dirigen a la misma ubicación, y las líneas sólo serán "
-#~ "fusionadas si son exactamente las mismas excepto la cantidad y unidad."
-
 #~ msgid "Packing"
 #~ msgstr "Empaquetado/Albarán"
 
@@ -1958,9 +1945,6 @@ msgstr "Tablero de compras"
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Pedidos de compra en proceso"
 
-#~ msgid "N°"
-#~ msgstr "Nº"
-
 #~ msgid "Purchase order is confirmed by the user."
 #~ msgstr "Pedido de compra es confirmado por el usuario."
 
@@ -2135,97 +2119,3 @@ msgstr "Tablero de compras"
 #~ msgstr ""
 #~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
 #~ "elemento de la tarifa."
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "Quotation"
-#~ msgstr "Presupuesto"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Esperando planificación"
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Para facturar"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Una factura generada por un pedido de compra."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Permite acceder a sus registros de proveedores y mantener su relación con "
-#~ "ellos. Puede gestionar todas sus interacciones con ellos a través de la "
-#~ "pestaña historial: Correos electrónicos, pedidos, reuniones, ..."
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM del producto"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "En el menú de pedidos de compra, puede gestionar el estado de sus pedidos: "
-#~ "los productos recibidos, la factura recibida y controlada.\n"
-
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Si se establece el control de la facturación de un pedido de compra como "
-#~ "\"Manual\", puede controlar todas las líneas del pedido de compra para las "
-#~ "que no se ha recibido todavía la factura del proveedor. Una vez que esté "
-#~ "listo para recibir una factura de proveedor, puede generar una factura de "
-#~ "proveedor en borrador basada en las líneas desde este menú."
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de "
-#~ "presupuesto, revisar las existentes y confirmarlas una vez la oferta del "
-#~ "proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, "
-#~ "OpenERP lo convertirá en un pedido de compra y generará los siguientes "
-#~ "pasos: recepción en borrador de los productos, factura de control."
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Utilice este menú para controlar las facturas que se reciban de su "
-#~ "proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de "
-#~ "compra o de sus recepciones. Una vez que reciba una factura de proveedor, "
-#~ "puede compararla con la factura borrador y validarla."
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index c42d975a303..1507c035063 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -28,7 +28,7 @@ msgstr ""
 "confirmado."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -47,7 +47,7 @@ msgid "Destination"
 msgstr "Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -130,7 +130,7 @@ msgstr ""
 "productos recibidos, y el control de las facturas de proveedores."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "El proveedor seleccionado sólo vende este producto por %s"
@@ -153,7 +153,7 @@ msgid "From a Pick list"
 msgstr "Desde inventario"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No tarifa!"
@@ -246,7 +246,7 @@ msgid "Partial Picking"
 msgstr "Movimientos parciales"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Pedido de compra '%s' está confirmado."
@@ -293,7 +293,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -369,7 +369,7 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -423,7 +423,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "No se puede borrar las Ordenes de Compra que estan en estado %s !"
@@ -445,7 +445,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -462,8 +462,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -500,7 +500,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -600,7 +600,7 @@ msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -649,9 +649,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -709,7 +709,7 @@ msgid "Reservation Destination"
 msgstr "Destinación de la reserva"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -787,7 +787,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -798,7 +798,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -914,7 +914,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1117,7 +1116,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1134,14 +1133,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1188,7 +1187,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1456,7 +1455,7 @@ msgid "Date Approved"
 msgstr "Fecha aprobación"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1568,7 +1567,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1587,7 +1586,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1712,7 +1711,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1789,7 +1788,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -2024,17 +2023,5 @@ msgstr ""
 #~ msgstr ""
 #~ "Después del pedido de compra aprobado, se convierte en factura de proveedor"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "Quotation"
-#~ msgstr "Cotización"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Esperando Fecha"
-
 #~ msgid "From Picking"
 #~ msgstr "Desde inventario"
diff --git a/addons/purchase/i18n/es_MX.po b/addons/purchase/i18n/es_MX.po
new file mode 100644
index 00000000000..16e79d63699
--- /dev/null
+++ b/addons/purchase/i18n/es_MX.po
@@ -0,0 +1,2133 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase
+#
+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-14 09:43+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+"El comprador debe aprobar la solicitud de presupuesto antes de enviar al "
+"proveedor. La solicitud de presupuesto se convertirá en un pedido de compra "
+"confirmado."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+"No puede confirmar un pedido de compra sin líneas de pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr "Facturada & Pagada (conciliada)"
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr "Destino"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"Debe seleccionar una UdM del producto de la misma categoría que la UdM de "
+"compra del producto"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr "Fecha en el que fue creado este documento."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"You can create a request for quotation when you want to buy products to a "
+"supplier but the purchase is not confirmed yet. Use also this menu to review "
+"requests for quotation created automatically based on your logistic rules "
+"(minimum stock, MTO, etc). You can convert the request for quotation into a "
+"purchase order once the order is confirmed. If you use the extended "
+"interface (from user's preferences), you can select the way to control your "
+"supplier invoices: based on the order, based on the receptions or manual "
+"encoding."
+msgstr ""
+"Puede crear una petición de presupuesto cuando quiera obtener productos de "
+"un proveedor pero la compra todavía no se haya confirmado. Utilice asimismo "
+"este menú para revisar las peticiones de compra creadas automáticamente en "
+"base a sus reglas de logística (stock mínimo, obtener bajo pedido, etc). "
+"Puede convertir la petición en una compra una vez el pedido se haya "
+"confirmado. Si utiliza la interfaz extendida (desde las Preferencias de "
+"Usuario), puede elegir la forma de controlar sus facturas de proveedor: "
+"basadas en pedido, basadas en recepciones o codificación manual."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Reception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr "No facturado"
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Dirección destinatario"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr "¿Desea generar las facturas de proveedor?"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"Use this menu to search within your purchase orders by references, supplier, "
+"products, etc. For each purchase order, you can track the products received, "
+"and control the supplier invoices."
+msgstr ""
+"Utilice este menú para buscar en sus pedidos de compra por referencia, "
+"proveedor, producto, etc. Para cada pedido de compra, puede obtener los "
+"productos recibidos, y controlar las facturas de los proveedores."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:735
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr "El proveedor seleccionado sólo vende este producto por %s"
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
+#, python-format
+msgid "Supplier Invoices"
+msgstr "Facturas de proveedor"
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr "Desde un albarán"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid "No Pricelist !"
+msgstr "¡No tarifa!"
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr "Seleccionar un pedido de compra abierto"
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr "Compra mensual por categoría"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr "Tarifa de compra por defecto"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr "Compras actuales"
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Introduzca una dirección si quiere enviar directamente desde el proveedor al "
+"cliente. En este caso, se eliminará el enlace al almacén y pondrá la "
+"ubicación del cliente."
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+"Esta tarifa será utilizada en lugar de la por defecto para las compras de la "
+"empresa actual"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
+msgstr ""
+"La tarifa fija la moneda utilizada en este pedido de compra. También calcula "
+"el precio del proveedor para los productos/cantidades seleccionados."
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Albarán parcial"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:296
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr "Pedido de compra '%s' está confirmado."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr "Aprovar compra"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr "Referencia UdM"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,notes:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"¡Debe seleccionar una tarifa o un proveedor en el formulario de compra!\n"
+"Indique uno antes de seleccionar un producto."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
+#: view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure Your Purchases Management Application"
+msgstr "Configure su aplicación de gestión de compras"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
+msgstr "Productos"
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+"Un albarán genera una factura. Según el control de facturación en el pedido "
+"de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:315
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr "Importe de compra por encima del límite"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr "Convertir a pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Productos entrantes"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr "Productos de salida"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Corregido manualmente"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr "Nombre contacto dirección dest."
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:344
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr "Planes analíticos de compra"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr "compra.instalador"
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Precio neto"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr "Indica que un albarán ha sido realizado."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "¡UdM del producto errónea!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Control factura"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Referencia proveedor"
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr "El importe de los impuestos."
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+"Un albarán genera una factura de proveedor. Según el control de facturación "
+"del pedido de compra, la factura se basa en las cantidades recibidas o "
+"pedidas."
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+"El análisis de recepción permite comprobar y analizar fácilmente las "
+"recepciones de su compañía y el rendimiento de las entregas de su proveedor."
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr "Fusionar pedidos de compra"
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid "No Partner!"
+msgstr "¡Falta empresa!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr "Tarifas"
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr "Nombre contacto dirección"
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+"Desde pedido: se generará una factura borrador basándose en los pedidos de "
+"compra. El contable sólo tendrá que validar la factura para su control.\n"
+"Desde albarán: se generará una factura borrador basándose en recepciones "
+"validadas.\n"
+"Manual: le permite generar facturas de proveedor eligiendo en las líneas no "
+"facturadas de todos los pedidos de compra manuales."
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr "Facturas generadas para un pedido de compra"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Confirmación pedido de compra Nº"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+"Los análisis de compra le permite comprobar y analizar fácilmente el "
+"historial de compras de su compañía y su rendimiento. Desde este menú puede "
+"controlar el rendimiento de su negociación, el funcionamiento de las "
+"entregas de sus proveedores, etc."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Aprobado por proveedor"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+"La factura se crea de forma automática si el control de factura del pedido "
+"de compra es 'Desde albarán'. La factura también puede ser generada "
+"manualmente por el contable (control de factura = Manual)."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Desde pedido"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Destinación de la reserva"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr "Compra por proveedor"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr "Recepciones"
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Validada por"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received from your supplier. "
+"OpenERP pregenerates draft invoices from your purchase orders or receptions, "
+"according to your settings. Once you receive a supplier invoice, you can "
+"match it with the draft invoice and validate it."
+msgstr ""
+"Use este menú para controlar las facturas a recibir de su proveedor. OpenERP "
+"pregenera facturas borrador a partir de sus pedidos de compra o recepciones, "
+"en función de los parámetros. En cuanto reciba la factura del proveedor, "
+"puede verificarla con la factura borrador y validarla."
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Petición presupuesto"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr "Facturas proveedor a recibir"
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+"Gestiona sus peticiones de compras y permite controlar y gestionar "
+"fácilmente todos sus pedidos de compra."
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:373
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:410
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+"Debe primero cancelar todos los albaranes relacionados a este pedido de "
+"compra."
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr "Productos de entrada a controlar"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr "Aprobación"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr "Estadísticas pedidos de compra"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you have not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+"Si establece el control de facturación de un pedido de compra a \"Manual\", "
+"puede controlar aquí todas las líneas de los pedidos de compra para los "
+"cuales no ha recibido todavía la factura de proveedor correspondiente. Una "
+"vez esté listo para recibir una factura de proveedor, puede generar una "
+"factura de proveedor en borrador basada en las lineas desde este menú."
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr "Gestiona distribución analítica y pedidos de compra."
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Ésto se calcula como la mínima fecha planificada para todos los productos de "
+"las líneas del pedido de compra."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr "Petición de compra"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr "Días para entregar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+msgid "Receive Products"
+msgstr "Recibir productos"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Pedido de compra confirmado para facturar"
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr "Total líneas pedidos por usuario por mes"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: purchase
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Esperando aceptación proveedor"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Presupuesto solicitado:"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Pedido de compra esperando aprobación"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr "Total importe base"
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Recibido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr "Lista de productos solicitados."
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Ésta es la lista de albaranes generados por esta compra"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Compras"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr "Estado del pedido de compra."
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Línea pedido de compra"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr "Fusión pedido compra"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Recuerdos,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr "Negociación por el proveedor"
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr "Propiedades de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+"Un pedido de compra genera una factura de proveedor, tan pronto como la "
+"confirme el comprador. En función del control de facturación del pedido de "
+"compra, la factura se basa en las cantidades recibidas u ordenadas."
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr "Indica que una factura ha sido pagada."
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productos salientes a facturar"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr "Ctdad por producto"
+
+#. module: purchase
+#: 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: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Fecha de la creación de este documento."
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas y Compras"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr "Pedidos de compras"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:318
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+"Alguien ha confirmado un pedido con un importe por encima del límite definido"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
+#, 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: purchase
+#: code:addons/purchase/purchase.py:418
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Primero debe cancelar todas las facturas asociadas a este pedido de compra."
+
+#. 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 "Seleccione múltiples pedidos a fusionar en la vista listado."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr "Albarán generado"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid ""
+"\n"
+"    Purchase module is for generating a purchase order for purchase of goods "
+"from a supplier.\n"
+"    A supplier invoice is created for the particular order placed\n"
+"    Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month    \n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de compras permite generar pedidos de compra para adquirir "
+"bienes de un proveedor.\n"
+"    Se crea una factura de proveedor para un pedido en concreto.\n"
+"    El tablero para la gestión de compras incluye:\n"
+"    * Pedidos actuales de compra.\n"
+"    * Pedidos de compra en borrador.\n"
+"    * Gráfico de cantidad e importe por mes.    \n"
+"\n"
+"    "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#, python-format
+msgid ""
+"The selected supplier has a minimal quantity set to %s, you cannot purchase "
+"less."
+msgstr ""
+"El proveedor seleccionado tiene establecida una cantidad mínima a %s, no "
+"puede comprar menos."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar pedido de compra"
+
+#. module: purchase
+#: 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: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr "Se genera un albarán para el seguimiento de los productos entrantes."
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr "Valor productos"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
+msgstr "Tipos de tarifas"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr "Pedido de compra por mes"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historia"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr "Productos por categoría"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr "Días a validar"
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+"Referencia al documento que ha generado esta solicitud de pedido de compra."
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+"El estado del pedido de compra o de la solicitud de presupuesto. Un "
+"presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el "
+"pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. "
+"Entonces el proveedor debe confirmar el pedido para cambiar el estado a "
+"'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se "
+"convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o "
+"en la recepción de mercancías, el estado se convierte en 'Excepción'."
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr "Solicitudes de presupuesto"
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr "Fecha en que el pedido de compra ha sido aprobado."
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr "Versión tarifa de compra por defecto"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid ""
+"Extend your Purchases Management Application with additional functionalities."
+msgstr ""
+"Extienda su aplicación de gestión de compras con funcionalidades adicionales."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+#: view:purchase.installer:0
+msgid "Purchases Application Configuration"
+msgstr "Configuración aplicación compras"
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr "Petición de presupuesto Nº"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Líneas pedido de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "El proveedor aprueba el pedido de compra."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr "Fusionar pedidos"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr "Línea pedido de compra realiza factura"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr "Albaranes de entrada"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr "Total pedidos por usuario mensual"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr "Solicitud de presupuesto"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nuestra referencia"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr "Buscar pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Solicitud de presupuesto"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr "Fecha solicitud"
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr "Fecha aprobación"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:417
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "¡No se puede cancelar este pedido de compra!"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr "Envío y Facturación"
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Fecha planificada"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr "Confirmación"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr "Este es el plazo de tiempo de seguridad para cada pedido de compra."
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr "Dirección de entrega prevista:"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr "Análisis recepciones"
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr "El importe sin impuestos."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
+msgstr ""
+"Acceda a los registros de sus proveedores y mantenga una buena relación con "
+"ellos.  Puede mantener el registro de todas sus interacciones con ellos "
+"gracias a la pestaña histórico: emails, reuniones, etc."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Entrega"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr "Solicitud de presupuestos"
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr "Reserva"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr "Ctdad total y importe por mes"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:409
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "¡No se puede cancelar el pedido de compra!"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+"En caso de que no exista ningún proveedor de este producto, el comprador "
+"puede rellenar el formulario manualmente y confirmarlo. La solicitud de "
+"presupuesto se convierte en un pedido de compra confirmado."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr "Análisis compra"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr "Su referencia"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Fecha prevista"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr "Total precio por producto por estado"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "IVA:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr "Fecha ordenado"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr "Control de compra"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+" Tenga en cuenta que: \n"
+" \n"
+" Los pedidos sólo se fusionarán si: \n"
+" * Los pedidos de compra están en borrador. \n"
+" * Los pedidos pertenecen al mismo proveedor. \n"
+" * Los pedidos tienen la misma ubicación de stock y la misma lista de "
+"precios. \n"
+" \n"
+" Las líneas sólo se fusionarán si: \n"
+" * Las líneas de pedido son exactamente iguales excepto por el producto, "
+"cantidad y unidades. \n"
+" "
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr "Precio compra-estándar"
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Tarifa de compra"
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr "Método facturación"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea un pedido "
+"(presupuesto) de compra.                                        \n"
+"* El estado 'Confirmado' se establece automáticamente al confirmar el pedido "
+"de compra.                                        \n"
+"* El estado 'Hecho' se establece automáticamente cuando el pedido de compra "
+"se realiza.                                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela un pedido de compra."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:424
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr "El pedido de compra '%s' está cancelado."
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr "Versiones de tarifa"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr "¿Está seguro que quiere fusionar estos pedidos?"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr "Desde un pedido de compra"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "CIF/NIF:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr "El importe total."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr "Plazo de tiempo de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+"Se crea automáticamente la factura si el control de facturación del pedido "
+"de compra es 'Desde pedido'. La factura también puede ser generada "
+"manualmente por el contable (control facturación = Manual)."
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr "Compra"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid ""
+"You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr ""
+"¡Debe seleccionar una empresa en el formulario de compra!\n"
+"Por favor seleccione una empresa antes de seleccionar un producto."
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr "Movimiento parcial"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr "Pedidos"
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+"Número único del pedido de compra, calculado de forma automática cuando el "
+"pedido de compra se crea."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr "Tablero de compras"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a pricelist in the purchase form !\n"
+#~ "Please set one before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar una tarifa en el formulario de compra!\n"
+#~ "Por favor seleccione una antes de seleccionar un producto."
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Módulo para la gestión de compras\n"
+#~ "    Solicitud de presupuesto, crear pedido de compra, crear factura de "
+#~ "proveedor, imprimir pedido de compra..."
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Factura de proveedor pre-generada en la recepción para control"
+
+#~ msgid "From Picking"
+#~ msgstr "Desde albarán"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Compra confirmada"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Crear factura desde recepción producto"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Proceso de compra"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Pedidos de compra en proceso"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Pedido de compra es confirmado por el usuario."
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Línieas del pedido de compra"
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "Desde pedido: Una factura borrador se pre-generará basada en el pedido de "
+#~ "compra. El contable sólo deberá validar esta factura para control.\n"
+#~ "Desde albarán: Una factura borrador será pre-generará basada en las "
+#~ "recepciones validadas.\n"
+#~ "Manual: Ninguna factura se pre-generará. El contable deberá codificarla "
+#~ "manualmente."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Facturar desde albaranes"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Recepción producto"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Confirmar pedido de compra desde solicitud de presupuesto sin origen"
+
+#~ msgid "Planned Date"
+#~ msgstr "Fecha prevista"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Fusionar compras"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Cuando se controla factura desde pedidos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Factura de proveedor pre-generada para control basada en pedido"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Factura desde compra"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Albarán es creado para el control de recepción de productos."
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Confirmación compra"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Aprobar pedido de compra después de confirmación"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Codificación manual del usuario."
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Confirmar pedido de compra desde solicitud de presupuesto"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Confirmar pedido de compra"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref. empresa"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Pedido de compra es aprobado por el proveedor."
+
+#~ msgid "Purchase order"
+#~ msgstr "Pedido de compra"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "La solicitud de presupuesto es propuesta por el sistema."
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Facturar paquete"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Crear factura desde albarán"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Albaranes & Facturas"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Después de pedido de compra, crear factura."
+
+#~ msgid "Scheduled date"
+#~ msgstr "Fecha planificada"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Crear albarán"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Cuando el pedido de compra es aprobado, crea su albarán."
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Facturar desde albarán"
+
+#~ msgid "Order Status"
+#~ msgstr "Estado del pedido"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Propiedades de compra"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. pedido"
+
+#~ 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 "New Purchase Order"
+#~ msgstr "Nuevo pedido de compra"
+
+#~ msgid "Out Packing"
+#~ msgstr "Paquete saliente"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Controlar facturas en la recepción"
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Factura recepción producto"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Confirmación pedido de compra"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Factura de compra"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Compra aprobada"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Desde albarán, crear factura."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Aprobación pedido de compra"
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr ""
+#~ "Después del pedido de compra aprobado, se convierte en factura de proveedor"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this purchase order."
+#~ msgstr ""
+#~ "Primero debe cancelar todos los albaranes asociados a este pedido de compra."
+
+#~ msgid "Purchase orders"
+#~ msgstr "Pedidos de compra"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Solicitud de presupuestos"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
+#~ "elemento de la tarifa."
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Líneas de compra no facturadas"
diff --git a/addons/purchase/i18n/es_MX.po.moved b/addons/purchase/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..a8f4145a21b
--- /dev/null
+++ b/addons/purchase/i18n/es_MX.po.moved
@@ -0,0 +1,1730 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-05 17:03+0000\n"
+"PO-Revision-Date: 2011-07-05 17:03+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: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid "The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order."
+msgstr "El comprador debe aprobar el RFQ antes de ser enviado al proveedor. El RFQ se convierte en una orden de compra confirmada."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr "No puede confirmar un pedido de compra sin líneas de pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr "Facturada & Pagada (conciliada)"
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr "Destino"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid "You have to select a product UOM in the same category than the purchase UOM of the product"
+msgstr "Debe seleccionar una UdM del producto de la misma categoría que la UdM de compra del producto"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr "Fecha en el que fue creado este documento."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid "You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding."
+msgstr "Puede crear una petición de presupuesto cuando quiera obtener productos de un proveedor pero la compra todavía no se haya confirmado. Utilice asimismo este menú para revisar las peticiones de compra creadas automáticamente en base a sus reglas de logística (stock mínimo, obtener bajo pedido, etc). Puede convertir la petición en una compra una vez el pedido se haya confirmado. Si utiliza la interfaz extendida (desde las Preferencias de Usuario), puede elegir la forma de controlar sus facturas de proveedor: basadas en pedido, basadas en recepciones o codificación manual."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Picking"
+msgstr "Desde lista de empaque"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr "No facturado"
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Dirección destinatario"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr "Stock factura en el envío"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr "¿Desea generar las facturas de proveedor?"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid "Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices."
+msgstr "Utilice este menú para buscar en sus pedidos de compra por referencia, proveedor, producto, etc. Para cada pedido de compra, puede obtener los productos recibidos, y controlar las facturas de los proveedores."
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
+#, python-format
+msgid "Supplier Invoices"
+msgstr "Facturas de proveedor"
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr "Desde una lista de empaque"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid "No Pricelist !"
+msgstr "¡Sin Lista de precio!"
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr "Seleccionar un pedido de compra abierto"
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr "Compra mensual por categoría"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr "Tarifa de compra por defecto"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr "Compras actuales"
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid "Put an address if you want to deliver directly from the supplier to the customer.In this case, it will remove the warehouse link and set the customer location."
+msgstr "Introduzca una dirección si quiere enviar directamente desde el proveedor al cliente. En este caso, se eliminará el enlace al almacén y pondrá la ubicación del cliente."
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid "This pricelist will be used, instead of the default one, for purchases from the current partner"
+msgstr "Esta tarifa será utilizada en lugar de la por defecto para las compras de la empresa actual"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid "The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."
+msgstr "La lista de precios fija la moneda utilizada en este pedido de compra. También calcula el precio del proveedor para los productos/cantidades seleccionados."
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Empaquetado parcial"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:296
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr "Pedido de compra '%s' está confirmado."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr "Aprobar compra"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr "Referencia UdM"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,notes:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid "You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr "¡Debe seleccionar una tarifa o un proveedor en el formulario de compra!\n"
+"Indique uno antes de seleccionar un producto."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
+#: view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure Your Purchases Management Application"
+msgstr "Configure su aplicación de gestión de compras"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
+msgstr "Productos"
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid "A Pick list generates an invoice. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities."
+msgstr "Una lista de empaque genera una factura. Según el control de facturación en el pedido de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:315
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr "Importe de compra por encima del límite"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr "Convertir a pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de precio"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Productos de entrada"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr "Productos de salida"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Corregido manualmente"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr "Nombre contacto dirección dest."
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:344
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr "Planes analíticos de compra"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr "compra.instalador"
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Precio neto"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr "Indica que una orden ha sido realizada."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "¡UdM del producto errónea!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Control factura"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Referencia del proveedor"
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr "El importe de los impuestos."
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid "A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
+msgstr "Una lista de empaque genera una factura de proveedor. Según el control de facturación del pedido de compra, la factura se basa en las cantidades recibidas o pedidas."
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid "Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries."
+msgstr "El análisis de recepción permite comprobar y analizar fácilmente las recepciones de su compañía y el rendimiento de las entregas de su proveedor."
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Lista de empaque"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr "Fusionar pedidos de compra"
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid "No Partner!"
+msgstr "¡Falta empresa!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Monto sin impuestos"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr "Lista de precios"
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr "Nombre contacto dirección"
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid "From Order: a draft invoice will be pre-generated based on the purchase order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
+msgstr "Desde pedido: se generará una factura borrador basándose en los pedidos de compra. El contador sólo tendrá que validar la factura para su control.\n"
+"Desde la orden: se generará una factura borrador basándose en recepciones validadas.\n"
+"Manual: le permite generar facturas de proveedor eligiendo en las líneas no facturadas de todos los pedidos de compra manuales."
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr "Facturas generadas para un pedido de compra"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Confirmación pedido de compra Nº"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid "Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc."
+msgstr "Los análisis de compra le permite comprobar y analizar fácilmente el historial de compras de su compañía y su rendimiento. Desde este menú puede controlar el rendimiento de su negociación, el funcionamiento de las entregas de sus proveedores, etc."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:735
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr "El proveedor seleccionado sólo vende este producto por %s"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid "The invoice is created automatically if the Invoice control of the purchase order is 'On picking'. The invoice can also be generated manually by the accountant (Invoice control = Manual)."
+msgstr "La factura se crea de forma automática si el control de factura del pedido de compra es 'Desde orden'. La factura también puede ser generada manualmente por el contador (control de factura = Manual)."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Desde pedido"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Reserva de Destino"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr "Compra por proveedor"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr "Recepciones"
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Validada por"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid "Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it."
+msgstr "Use este menú para controlar las facturas a recibir de su proveedor. OpenERP pregenera facturas borrador a partir de sus pedidos de compra o recepciones, en función de los parámetros. En cuanto reciba la factura del proveedor, puede verificarla con la factura borrador y validarla."
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Petición de presupuesto"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr "Facturas de proveedor a recibir"
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid "Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."
+msgstr "Gestiona sus peticiones de compras y permite controlar y gestionar fácilmente todos sus pedidos de compra."
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:373
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Waiting Approval"
+msgstr "Esperando aprobacion"
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:410
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr "Debe primero cancelar todos las listas d empaque relacionadas a este pedido de compra."
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr "Fecha de pedido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr "Productos de entrada a controlar"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr "Aprobación"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr "Estadísticas de pedidos de compra"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
+msgstr "Si establece el control de facturación de un pedido de compra a \"Manual\", puede controlar aquí todas las líneas de los pedidos de compra para los cuales no ha recibido todavía la factura de proveedor correspondiente. Una vez esté listo para recibir una factura de proveedor, puede generar una factura de proveedor en borrador basada en las lineas desde este menú."
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr "Gestiona distribución analítica y pedidos de compra."
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid "This is computed as the minimum scheduled date of all purchase order lines' products."
+msgstr "Ésto se calcula como la mínima fecha planificada para todos los productos de las líneas del pedido de compra."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr "Petición de compra"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr "Días para entregar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+msgid "Receive Products"
+msgstr "Recibir productos"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Pedido de compra confirmado para facturar"
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr "Total de líneas de pedidos por usuario por mes"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: purchase
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Esperando aceptación de proveedor"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Presupuesto solicitado:"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Esperando aprobacion de Pedido de compra"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr "Total de monto sin impuestos"
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Recibido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr "Lista de productos solicitados."
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid "This is the list of picking list that have been generated for this purchase"
+msgstr "Ésta es la lista de ordenes generadas por esta compra"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Gestion de Compras"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contador."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr "Líneas de compra no facturadas"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr "Estado del pedido de compra."
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Línea de pedido de compra"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr "Fusión pedido compra"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Recuerdos,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr "Negociación por el proveedor"
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr "Propiedades de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid "A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
+msgstr "Un pedido de compra genera una factura de proveedor, tan pronto como la confirme el comprador. En función del control de facturación del pedido de compra, la factura se basa en las cantidades recibidas u ordenadas."
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Monto sin impuestos"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr "Indica que una factura ha sido pagada."
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productos salientes a facturar"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr "Ctdad por producto"
+
+#. module: purchase
+#: 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: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Fecha de la creación de este documento."
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr "Pedidos de compras"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:318
+#, python-format
+msgid "Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr "Alguien ha confirmado un pedido con un importe por encima del límite definido"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
+#, 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: purchase
+#: code:addons/purchase/purchase.py:418
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr "Primero debe cancelar todas las facturas asociadas a este pedido de compra."
+
+#. 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 "Seleccione múltiples pedidos a fusionar en la vista listado."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr "Orden generada"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid "\n"
+"    Purchase module is for generating a purchase order for purchase of goods from a supplier.\n"
+"    A supplier invoice is created for the particular order placed\n"
+"    Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month    \n"
+"\n"
+"    "
+msgstr "\n"
+"    El módulo de compras permite generar pedidos de compra para adquirir bienes de un proveedor.\n"
+"    Se crea una factura de proveedor para un pedido en concreto.\n"
+"    El tablero para la gestión de compras incluye:\n"
+"    * Pedidos actuales de compra.\n"
+"    * Pedidos de compra en borrador.\n"
+"    * Gráfico de cantidad e importe por mes.    \n"
+"\n"
+"    "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#, python-format
+msgid "The selected supplier has a minimal quantity set to %s, you cannot purchase less."
+msgstr "El proveedor seleccionado tiene establecida una cantidad mínima a %s, no puede comprar menos."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar pedido de compra"
+
+#. module: purchase
+#: 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: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr "Se genera una lista de empaque para el seguimiento de los productos entrantes."
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr "Valor de productos"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
+msgstr "Tipos de lista de precios"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr "Pedido de compra por mes"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historia"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr "Productos por categoría"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr "Días a validar"
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr "Referencia al documento que ha generado esta solicitud de pedido de compra."
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid "The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception."
+msgstr "El estado del pedido de compra o de la solicitud de presupuesto. Un presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. Entonces el proveedor debe confirmar el pedido para cambiar el estado a 'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o en la recepción de mercancías, el estado se convierte en 'Excepción'."
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr "Solicitudes de presupuesto"
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr "Fecha en que el pedido de compra ha sido aprobado."
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr "Versión lista de precio de compra por defecto"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Extend your Purchases Management Application with additional functionalities."
+msgstr "Extienda su aplicación de gestión de compras con funcionalidades adicionales."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+#: view:purchase.installer:0
+msgid "Purchases Application Configuration"
+msgstr "Configuración aplicación compras"
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr "Petición de presupuesto Nº"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Líneas pedido de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "El proveedor aprueba el pedido de compra."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr "Fusionar pedidos"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr "Línea pedido de compra realiza factura"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr "Ordenes de entrada"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr "Total pedidos por usuario mensual"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr "Solicitud de presupuesto"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nuestra referencia"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr "Buscar pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Solicitud de presupuesto"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr "Fecha solicitud"
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr "Fecha aprobación"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:417
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "¡No se puede cancelar este pedido de compra!"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr "Envío y Facturación"
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Fecha planificada"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr "Confirmación"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr "Este es el plazo de tiempo de seguridad para cada pedido de compra."
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr "Dirección de entrega prevista:"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr "Análisis recepciones"
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr "El importe sin impuestos."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid "Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc."
+msgstr "Acceda a los registros de sus proveedores y mantenga una buena relación con ellos.  Puede mantener el registro de todas sus interacciones con ellos gracias a la pestaña histórico: emails, reuniones, etc."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Entrega"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr "Solicitud de presupuestos"
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr "Reserva"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr "Ctdad total e importe por mes"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:409
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "¡No se puede cancelar el pedido de compra!"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid "In case there is no supplier for this product, the buyer can fill the form manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr "En caso de que no exista ningún proveedor de este producto, el comprador puede rellenar el formulario manualmente y confirmarlo. La solicitud de presupuesto se convierte en un pedido de compra confirmado."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr "Análisis de compra"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr "Su referencia de orden"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Fecha prevista"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr "Total precio por producto por estado"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "IVA:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Order Date"
+msgstr "Ordenado por Fecha"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío: "
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr "Control de compra"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid " Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit \n"
+" "
+msgstr " Tenga en cuenta que: \n"
+" \n"
+" Los pedidos sólo se fusionarán si: \n"
+" * Los pedidos de compra están en borrador. \n"
+" * Los pedidos pertenecen al mismo proveedor. \n"
+" * Los pedidos tienen la misma ubicación de stock y la misma lista de precios. \n"
+" \n"
+" Las líneas sólo se fusionarán si: \n"
+" * Las líneas de pedido son exactamente iguales excepto por el producto, cantidad y unidades. \n"
+" "
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr "Precio compra-estándar"
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Lista de precios de compra"
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr "Método de facturación"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid " * The 'Draft' state is set automatically when purchase order in draft state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.                                        \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr " * El estado 'Borrador' se establece automáticamente cuando crea un pedido (presupuesto) de compra.                                        \n"
+"* El estado 'Confirmado' se establece automáticamente al confirmar el pedido de compra.                                        \n"
+"* El estado 'Hecho' se establece automáticamente cuando el pedido de compra se realiza.                                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario cancela un pedido de compra."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:424
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr "El pedido de compra '%s' está cancelado."
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr "Versiones de tarifa"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr "¿Está seguro que quiere fusionar estos pedidos?"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr "Desde un pedido de compra"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "RFC:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr "El importe total."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr "Plazo de tiempo de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid "The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual)."
+msgstr "Se crea automáticamente la factura si el control de facturación del pedido de compra es 'Desde pedido'. La factura también puede ser generada manualmente por el contador (control facturación = Manual)."
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr "Compra"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid "You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr "¡Debe seleccionar una empresa en el formulario de compra!\n"
+"Por favor seleccione una empresa antes de seleccionar un producto."
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr "Movimiento parcial"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr "Pedidos"
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid "unique number of the purchase order,computed automatically when the purchase order is created"
+msgstr "Número único del pedido de compra, calculado de forma automática cuando el pedido de compra se crea."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr "Tablero de compras"
+
diff --git a/addons/purchase/i18n/es_VE.po b/addons/purchase/i18n/es_VE.po
new file mode 100644
index 00000000000..16e79d63699
--- /dev/null
+++ b/addons/purchase/i18n/es_VE.po
@@ -0,0 +1,2133 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase
+#
+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-14 09:43+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-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:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+"El comprador debe aprobar la solicitud de presupuesto antes de enviar al "
+"proveedor. La solicitud de presupuesto se convertirá en un pedido de compra "
+"confirmado."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+"No puede confirmar un pedido de compra sin líneas de pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr "Facturada & Pagada (conciliada)"
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr "Destino"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+"Debe seleccionar una UdM del producto de la misma categoría que la UdM de "
+"compra del producto"
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr "Fecha en el que fue creado este documento."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"You can create a request for quotation when you want to buy products to a "
+"supplier but the purchase is not confirmed yet. Use also this menu to review "
+"requests for quotation created automatically based on your logistic rules "
+"(minimum stock, MTO, etc). You can convert the request for quotation into a "
+"purchase order once the order is confirmed. If you use the extended "
+"interface (from user's preferences), you can select the way to control your "
+"supplier invoices: based on the order, based on the receptions or manual "
+"encoding."
+msgstr ""
+"Puede crear una petición de presupuesto cuando quiera obtener productos de "
+"un proveedor pero la compra todavía no se haya confirmado. Utilice asimismo "
+"este menú para revisar las peticiones de compra creadas automáticamente en "
+"base a sus reglas de logística (stock mínimo, obtener bajo pedido, etc). "
+"Puede convertir la petición en una compra una vez el pedido se haya "
+"confirmado. Si utiliza la interfaz extendida (desde las Preferencias de "
+"Usuario), puede elegir la forma de controlar sus facturas de proveedor: "
+"basadas en pedido, basadas en recepciones o codificación manual."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Reception"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr "No facturado"
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Dirección destinatario"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr "¿Desea generar las facturas de proveedor?"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"Use this menu to search within your purchase orders by references, supplier, "
+"products, etc. For each purchase order, you can track the products received, "
+"and control the supplier invoices."
+msgstr ""
+"Utilice este menú para buscar en sus pedidos de compra por referencia, "
+"proveedor, producto, etc. Para cada pedido de compra, puede obtener los "
+"productos recibidos, y controlar las facturas de los proveedores."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:735
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr "El proveedor seleccionado sólo vende este producto por %s"
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
+#, python-format
+msgid "Supplier Invoices"
+msgstr "Facturas de proveedor"
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr "Desde un albarán"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid "No Pricelist !"
+msgstr "¡No tarifa!"
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr "Seleccionar un pedido de compra abierto"
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr "Compra mensual por categoría"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr "Tarifa de compra por defecto"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr "Compras actuales"
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Introduzca una dirección si quiere enviar directamente desde el proveedor al "
+"cliente. En este caso, se eliminará el enlace al almacén y pondrá la "
+"ubicación del cliente."
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+"Esta tarifa será utilizada en lugar de la por defecto para las compras de la "
+"empresa actual"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
+msgstr ""
+"La tarifa fija la moneda utilizada en este pedido de compra. También calcula "
+"el precio del proveedor para los productos/cantidades seleccionados."
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Albarán parcial"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:296
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr "Pedido de compra '%s' está confirmado."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr "Aprovar compra"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr "Referencia UdM"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,notes:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:660
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"¡Debe seleccionar una tarifa o un proveedor en el formulario de compra!\n"
+"Indique uno antes de seleccionar un producto."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
+#: view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure Your Purchases Management Application"
+msgstr "Configure su aplicación de gestión de compras"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
+msgstr "Productos"
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+"Un albarán genera una factura. Según el control de facturación en el pedido "
+"de venta, la factura se basa en las cantidades enviadas u ordenadas."
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:315
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr "Importe de compra por encima del límite"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr "Convertir a pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Productos entrantes"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr "Productos de salida"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Corregido manualmente"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr "¡No se pueden eliminar pedido(s) de compra que estén en estado %s!"
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr "Nombre contacto dirección dest."
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:344
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr "Pedido de compra '%s' se ha cambiado al estado borrador."
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr "Nº de líneas"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr "Planes analíticos de compra"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr "compra.instalador"
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr "Precio neto"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr "Indica que un albarán ha sido realizado."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:721
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr "¡UdM del producto errónea!"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Control factura"
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Referencia proveedor"
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr "El importe de los impuestos."
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+"Un albarán genera una factura de proveedor. Según el control de facturación "
+"del pedido de compra, la factura se basa en las cantidades recibidas o "
+"pedidas."
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+"El análisis de recepción permite comprobar y analizar fácilmente las "
+"recepciones de su compañía y el rendimiento de las entregas de su proveedor."
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr "Fusionar pedidos de compra"
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid "No Partner!"
+msgstr "¡Falta empresa!"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr "Tarifas"
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr "Nombre contacto dirección"
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+"Desde pedido: se generará una factura borrador basándose en los pedidos de "
+"compra. El contable sólo tendrá que validar la factura para su control.\n"
+"Desde albarán: se generará una factura borrador basándose en recepciones "
+"validadas.\n"
+"Manual: le permite generar facturas de proveedor eligiendo en las líneas no "
+"facturadas de todos los pedidos de compra manuales."
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr "Facturas generadas para un pedido de compra"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:292
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Confirmación pedido de compra Nº"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+"Los análisis de compra le permite comprobar y analizar fácilmente el "
+"historial de compras de su compañía y su rendimiento. Desde este menú puede "
+"controlar el rendimiento de su negociación, el funcionamiento de las "
+"entregas de sus proveedores, etc."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Aprobado por proveedor"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+"La factura se crea de forma automática si el control de factura del pedido "
+"de compra es 'Desde albarán'. La factura también puede ser generada "
+"manualmente por el contable (control de factura = Manual)."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Desde pedido"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Destinación de la reserva"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:244
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr "Compra por proveedor"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr "Recepciones"
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr "Validada por"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received from your supplier. "
+"OpenERP pregenerates draft invoices from your purchase orders or receptions, "
+"according to your settings. Once you receive a supplier invoice, you can "
+"match it with the draft invoice and validate it."
+msgstr ""
+"Use este menú para controlar las facturas a recibir de su proveedor. OpenERP "
+"pregenera facturas borrador a partir de sus pedidos de compra o recepciones, "
+"en función de los parámetros. En cuanto reciba la factura del proveedor, "
+"puede verificarla con la factura borrador y validarla."
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Petición presupuesto"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr "Facturas proveedor a recibir"
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+"Gestiona sus peticiones de compras y permite controlar y gestionar "
+"fácilmente todos sus pedidos de compra."
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:373
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:410
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+"Debe primero cancelar todos los albaranes relacionados a este pedido de "
+"compra."
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr "Productos de entrada a controlar"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr "Aprobación"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr "Estadísticas pedidos de compra"
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you have not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+"Si establece el control de facturación de un pedido de compra a \"Manual\", "
+"puede controlar aquí todas las líneas de los pedidos de compra para los "
+"cuales no ha recibido todavía la factura de proveedor correspondiente. Una "
+"vez esté listo para recibir una factura de proveedor, puede generar una "
+"factura de proveedor en borrador basada en las lineas desde este menú."
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr "Gestiona distribución analítica y pedidos de compra."
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Ésto se calcula como la mínima fecha planificada para todos los productos de "
+"las líneas del pedido de compra."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr "Petición de compra"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr "Días para entregar"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+msgid "Receive Products"
+msgstr "Recibir productos"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr "Pedido de compra confirmado para facturar"
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr "Total líneas pedidos por usuario por mes"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: purchase
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Esperando aceptación proveedor"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Presupuesto solicitado:"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Pedido de compra esperando aprobación"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr "Total importe base"
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Recibido"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr "Lista de productos solicitados."
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Ésta es la lista de albaranes generados por esta compra"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr "Compras"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr "Estado del pedido de compra."
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Línea pedido de compra"
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr "Fusión pedido compra"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Recuerdos,"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr "Negociación por el proveedor"
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr "Propiedades de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+"Un pedido de compra genera una factura de proveedor, tan pronto como la "
+"confirme el comprador. En función del control de facturación del pedido de "
+"compra, la factura se basa en las cantidades recibidas u ordenadas."
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr "Indica que una factura ha sido pagada."
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr "Productos salientes a facturar"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr "Ctdad por producto"
+
+#. module: purchase
+#: 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: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Fecha de la creación de este documento."
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas y Compras"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr "Pedidos de compras"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr "Facturas manuales"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:318
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+"Alguien ha confirmado un pedido con un importe por encima del límite definido"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
+#, 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: purchase
+#: code:addons/purchase/purchase.py:418
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+"Primero debe cancelar todas las facturas asociadas a este pedido de compra."
+
+#. 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 "Seleccione múltiples pedidos a fusionar en la vista listado."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr "Albarán generado"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid ""
+"\n"
+"    Purchase module is for generating a purchase order for purchase of goods "
+"from a supplier.\n"
+"    A supplier invoice is created for the particular order placed\n"
+"    Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month    \n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de compras permite generar pedidos de compra para adquirir "
+"bienes de un proveedor.\n"
+"    Se crea una factura de proveedor para un pedido en concreto.\n"
+"    El tablero para la gestión de compras incluye:\n"
+"    * Pedidos actuales de compra.\n"
+"    * Pedidos de compra en borrador.\n"
+"    * Gráfico de cantidad e importe por mes.    \n"
+"\n"
+"    "
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:696
+#, python-format
+msgid ""
+"The selected supplier has a minimal quantity set to %s, you cannot purchase "
+"less."
+msgstr ""
+"El proveedor seleccionado tiene establecida una cantidad mínima a %s, no "
+"puede comprar menos."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar pedido de compra"
+
+#. module: purchase
+#: 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: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr "Se genera un albarán para el seguimiento de los productos entrantes."
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr "Tablero"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr "Valor productos"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
+msgstr "Tipos de tarifas"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr "Pedido de compra por mes"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historia"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr "Productos por categoría"
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr "Días a validar"
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+"Referencia al documento que ha generado esta solicitud de pedido de compra."
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+"El estado del pedido de compra o de la solicitud de presupuesto. Un "
+"presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el "
+"pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. "
+"Entonces el proveedor debe confirmar el pedido para cambiar el estado a "
+"'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se "
+"convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o "
+"en la recepción de mercancías, el estado se convierte en 'Excepción'."
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr "Solicitudes de presupuesto"
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr "Fecha en que el pedido de compra ha sido aprobado."
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr "Versión tarifa de compra por defecto"
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid ""
+"Extend your Purchases Management Application with additional functionalities."
+msgstr ""
+"Extienda su aplicación de gestión de compras con funcionalidades adicionales."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+#: view:purchase.installer:0
+msgid "Purchases Application Configuration"
+msgstr "Configuración aplicación compras"
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr "Petición de presupuesto Nº"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr "Líneas pedido de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "El proveedor aprueba el pedido de compra."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr "Fusionar pedidos"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr "Línea pedido de compra realiza factura"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr "Albaranes de entrada"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr "Total pedidos por usuario mensual"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr "Solicitud de presupuesto"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nuestra referencia"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr "Buscar pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Solicitud de presupuesto"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr "Fecha solicitud"
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr "Fecha aprobación"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:417
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr "¡No se puede cancelar este pedido de compra!"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr "Envío y Facturación"
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Fecha planificada"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr "Confirmación"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr "Este es el plazo de tiempo de seguridad para cada pedido de compra."
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr "Dirección de entrega prevista:"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr "Análisis recepciones"
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr "El importe sin impuestos."
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
+msgstr ""
+"Acceda a los registros de sus proveedores y mantenga una buena relación con "
+"ellos.  Puede mantener el registro de todas sus interacciones con ellos "
+"gracias a la pestaña histórico: emails, reuniones, etc."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Entrega"
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr "Solicitud de presupuestos"
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr "Reserva"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr "Ctdad total y importe por mes"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:409
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr "¡No se puede cancelar el pedido de compra!"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+"En caso de que no exista ningún proveedor de este producto, el comprador "
+"puede rellenar el formulario manualmente y confirmarlo. La solicitud de "
+"presupuesto se convierte en un pedido de compra confirmado."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr "Análisis compra"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr "Su referencia"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr "Fecha prevista"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr "Total precio por producto por estado"
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr "IVA:"
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr "Fecha ordenado"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr "Control de compra"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+" Tenga en cuenta que: \n"
+" \n"
+" Los pedidos sólo se fusionarán si: \n"
+" * Los pedidos de compra están en borrador. \n"
+" * Los pedidos pertenecen al mismo proveedor. \n"
+" * Los pedidos tienen la misma ubicación de stock y la misma lista de "
+"precios. \n"
+" \n"
+" Las líneas sólo se fusionarán si: \n"
+" * Las líneas de pedido son exactamente iguales excepto por el producto, "
+"cantidad y unidades. \n"
+" "
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr "Precio compra-estándar"
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Tarifa de compra"
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr "Método facturación"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr "Para aprobar"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea un pedido "
+"(presupuesto) de compra.                                        \n"
+"* El estado 'Confirmado' se establece automáticamente al confirmar el pedido "
+"de compra.                                        \n"
+"* El estado 'Hecho' se establece automáticamente cuando el pedido de compra "
+"se realiza.                                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela un pedido de compra."
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:424
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr "El pedido de compra '%s' está cancelado."
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr "Versiones de tarifa"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr "¿Está seguro que quiere fusionar estos pedidos?"
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr "Desde un pedido de compra"
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr "CIF/NIF:"
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr "El importe total."
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr "Plazo de tiempo de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+"Se crea automáticamente la factura si el control de facturación del pedido "
+"de compra es 'Desde pedido'. La factura también puede ser generada "
+"manualmente por el contable (control facturación = Manual)."
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr "Compra"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:662
+#, python-format
+msgid ""
+"You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr ""
+"¡Debe seleccionar una empresa en el formulario de compra!\n"
+"Por favor seleccione una empresa antes de seleccionar un producto."
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr "Movimiento parcial"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr "Pedidos"
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+"Número único del pedido de compra, calculado de forma automática cuando el "
+"pedido de compra se crea."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr "Tablero de compras"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a pricelist in the purchase form !\n"
+#~ "Please set one before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar una tarifa en el formulario de compra!\n"
+#~ "Por favor seleccione una antes de seleccionar un producto."
+
+#~ msgid ""
+#~ "Module for purchase management\n"
+#~ "    Request for quotation, Create Supplier Invoice, Print Order..."
+#~ msgstr ""
+#~ "Módulo para la gestión de compras\n"
+#~ "    Solicitud de presupuesto, crear pedido de compra, crear factura de "
+#~ "proveedor, imprimir pedido de compra..."
+
+#~ msgid "Supplier Invoice pre-generated on receptions for control"
+#~ msgstr "Factura de proveedor pre-generada en la recepción para control"
+
+#~ msgid "From Picking"
+#~ msgstr "Desde albarán"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Confirmed Purchase"
+#~ msgstr "Compra confirmada"
+
+#~ msgid "Create invoice from product recept"
+#~ msgstr "Crear factura desde recepción producto"
+
+#~ msgid "Purchase Process"
+#~ msgstr "Proceso de compra"
+
+#~ msgid "Purchase Orders in Progress"
+#~ msgstr "Pedidos de compra en proceso"
+
+#~ msgid "Purchase order is confirmed by the user."
+#~ msgstr "Pedido de compra es confirmado por el usuario."
+
+#~ msgid "Purchase Order lines"
+#~ msgstr "Línieas del pedido de compra"
+
+#~ msgid ""
+#~ "From Order: a draft invoice will be pre-generated based on the purchase "
+#~ "order. The accountant will just have to validate this invoice for control.\n"
+#~ "From Picking: a draft invoice will be pre-genearted based on validated "
+#~ "receptions.\n"
+#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
+#~ "manually."
+#~ msgstr ""
+#~ "Desde pedido: Una factura borrador se pre-generará basada en el pedido de "
+#~ "compra. El contable sólo deberá validar esta factura para control.\n"
+#~ "Desde albarán: Una factura borrador será pre-generará basada en las "
+#~ "recepciones validadas.\n"
+#~ "Manual: Ninguna factura se pre-generará. El contable deberá codificarla "
+#~ "manualmente."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Facturar desde albaranes"
+
+#~ msgid "Product Receipt"
+#~ msgstr "Recepción producto"
+
+#~ msgid "Confirm Purchase order from Request for quotation without origin"
+#~ msgstr "Confirmar pedido de compra desde solicitud de presupuesto sin origen"
+
+#~ msgid "Planned Date"
+#~ msgstr "Fecha prevista"
+
+#~ msgid "Merge purchases"
+#~ msgstr "Fusionar compras"
+
+#~ msgid "When controlling invoice from orders"
+#~ msgstr "Cuando se controla factura desde pedidos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Pre-generated supplier invoice to control based on order"
+#~ msgstr "Factura de proveedor pre-generada para control basada en pedido"
+
+#~ msgid "Invoice from Purchase"
+#~ msgstr "Factura desde compra"
+
+#~ msgid "Packing is created for the products reception control."
+#~ msgstr "Albarán es creado para el control de recepción de productos."
+
+#~ msgid "Confirming Purchase"
+#~ msgstr "Confirmación compra"
+
+#~ msgid "Approve Purchase order after Confirming"
+#~ msgstr "Aprobar pedido de compra después de confirmación"
+
+#~ msgid "Encoded manually by the user."
+#~ msgstr "Codificación manual del usuario."
+
+#~ msgid "Confirm Purchase order from Request for quotation"
+#~ msgstr "Confirmar pedido de compra desde solicitud de presupuesto"
+
+#~ msgid "Confirm Purchase Order"
+#~ msgstr "Confirmar pedido de compra"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref. empresa"
+
+#~ msgid "Purchase order is approved by supplier."
+#~ msgstr "Pedido de compra es aprobado por el proveedor."
+
+#~ msgid "Purchase order"
+#~ msgstr "Pedido de compra"
+
+#~ msgid "Request for quotation is proposed by the system."
+#~ msgstr "La solicitud de presupuesto es propuesta por el sistema."
+
+#~ msgid "Packing Invoice"
+#~ msgstr "Facturar paquete"
+
+#~ msgid "Creates invoice from packin list"
+#~ msgstr "Crear factura desde albarán"
+
+#~ msgid "Delivery & Invoices"
+#~ msgstr "Albaranes & Facturas"
+
+#~ msgid "After Purchase order , Create invoice."
+#~ msgstr "Después de pedido de compra, crear factura."
+
+#~ msgid "Scheduled date"
+#~ msgstr "Fecha planificada"
+
+#~ msgid "Create Packing list"
+#~ msgstr "Crear albarán"
+
+#~ msgid "When purchase order is approved , it creates its packing list."
+#~ msgstr "Cuando el pedido de compra es aprobado, crea su albarán."
+
+#~ msgid "Invoice from Packing list"
+#~ msgstr "Facturar desde albarán"
+
+#~ msgid "Order Status"
+#~ msgstr "Estado del pedido"
+
+#~ msgid "Purchases Properties"
+#~ msgstr "Propiedades de compra"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. pedido"
+
+#~ 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 "New Purchase Order"
+#~ msgstr "Nuevo pedido de compra"
+
+#~ msgid "Out Packing"
+#~ msgstr "Paquete saliente"
+
+#~ msgid "Control invoices on receptions"
+#~ msgstr "Controlar facturas en la recepción"
+
+#~ msgid "Product recept invoice"
+#~ msgstr "Factura recepción producto"
+
+#~ msgid "Confirming Purchase Order"
+#~ msgstr "Confirmación pedido de compra"
+
+#~ msgid "Purchase Invoice"
+#~ msgstr "Factura de compra"
+
+#~ msgid "Approved Purchase"
+#~ msgstr "Compra aprobada"
+
+#~ msgid "From Packing list, Create invoice."
+#~ msgstr "Desde albarán, crear factura."
+
+#~ msgid "Approving Purchase Order"
+#~ msgstr "Aprobación pedido de compra"
+
+#~ msgid "After approved purchase order , it comes into the supplier invoice"
+#~ msgstr ""
+#~ "Después del pedido de compra aprobado, se convierte en factura de proveedor"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this purchase order."
+#~ msgstr ""
+#~ "Primero debe cancelar todos los albaranes asociados a este pedido de compra."
+
+#~ msgid "Purchase orders"
+#~ msgstr "Pedidos de compra"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Request For Quotations"
+#~ msgstr "Solicitud de presupuestos"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
+#~ "elemento de la tarifa."
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Líneas de compra no facturadas"
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index c96f3ee87a8..72e825bf7a8 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -13,11 +13,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Hinnakiri puudub !"
@@ -46,7 +46,7 @@ msgid "From Order"
 msgstr "Tellimusest"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Vigane tegevus !"
@@ -78,7 +78,7 @@ msgid "Invoicing Control"
 msgstr "Arveldamishaldus"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -98,7 +98,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -116,7 +116,7 @@ msgid "Destination"
 msgstr "Sihtpunkt"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -186,7 +186,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -295,7 +295,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -342,7 +342,7 @@ msgid "Notes"
 msgstr "Märkused"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -398,7 +398,7 @@ msgid "Cancelled"
 msgstr "Tühistatud"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -452,7 +452,7 @@ msgid "Reference"
 msgstr "Viide"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -474,7 +474,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -491,8 +491,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -529,7 +529,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Vale toote MÜ!"
@@ -629,7 +629,7 @@ msgid "Order Lines"
 msgstr "Korralduse read"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Puudub partner!"
@@ -678,9 +678,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -799,7 +799,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -810,7 +810,7 @@ msgid "Manual"
 msgstr "Käsitsi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -926,7 +926,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1129,7 +1128,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1146,14 +1145,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Sellele tootele pole määratud kulukontot: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1202,7 +1201,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1463,7 +1462,7 @@ msgid "Date Approved"
 msgstr "Heaks kiitmise kuupäev"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Seda ostukorraldust ei saa tühistada !"
@@ -1570,7 +1569,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Ostukorraldust ei saa tühistada !"
@@ -1589,7 +1588,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1704,7 +1703,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1819,9 +1818,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Sul ei saa olla 2 hinnakirja versiooni mis kattuvad!"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist in the purchase form !\n"
@@ -1839,9 +1835,6 @@ msgstr ""
 #~ msgid "Purchase Process"
 #~ msgstr "Ostuprotseduur"
 
-#~ msgid "N°"
-#~ msgstr "N°"
-
 #~ msgid "Planned Date"
 #~ msgstr "Planeeritud kuupäev"
 
@@ -1886,15 +1879,6 @@ msgstr ""
 #~ msgid "From Picking"
 #~ msgstr "Noppest"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Pane tähele, et korraldused liidetakse ainult siis, kui nad lähevad samale "
-#~ "partnerile ja samasse kohta. Read liidetakse ainult siis, kui nad on täpselt "
-#~ "samad välja arvatud kogus ja ühik."
-
 #~ msgid "Packing"
 #~ msgstr "Pakkimine"
 
@@ -2025,15 +2009,3 @@ msgstr ""
 
 #~ msgid "Date"
 #~ msgstr "Kuupäev"
-
-#~ msgid "Quotation"
-#~ msgstr "Hinnapakkumine"
-
-#~ msgid "In progress"
-#~ msgstr "Hetkel toimumas"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Ootegraafik"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Edenemisel käsitsi"
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index aa89bc410cf..361ed5c8603 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.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: 2010-12-16 05:43+0000\n"
+"PO-Revision-Date: 2011-11-07 12:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -23,12 +23,14 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"Ostajan on hyväksyttävä tarjouspyyntö ennen toimittajalle lähettämistä. "
+"Tarjouspyynnöstä tulee hyväksytty ostotilaus."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
-msgstr ""
+msgstr "Et voi vahvistaa ostotilausta ilman ostotilausrivejä."
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
@@ -43,7 +45,7 @@ msgid "Destination"
 msgstr "Kohde"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -69,6 +71,13 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Voit luoda tarjouspyynnön jos haluat ostaa tuotteita toimittajalta, mutta "
+"ostoa ei ole vielä vahvisttu. Voit käyttää tätä valikkoa myös "
+"tarkastellaksesi automaattisesti luotuja tarjouspyyntöjä jotka pohjautuvat "
+"logistiikkasääntöihisi (minimivarasto, MTO jne.) Voit muuntaa tarjouspyynnön "
+"ostotilaukseksi kun tilaus on vahvistettu. Jos käytät laajennettua liittymää "
+"(käyttäjäasetukset), voit valita tavan jolla hallitaan toimittajien laskuja: "
+"tilauksen pohjalta, vastaanoton pohjalta tai käsin syöttäen."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -112,9 +121,12 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Käytä tätä valikkoa etsiäksesi ostotilauksia viitteiden, toimittajien, "
+"tuotteiden yms. perusteella. Jokaista ostotilausta kohden, voit seurata "
+"vastaanotettuja tuotteita ja hallita toimittajien laskuja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Valittu toimittaja myy tätä tuotetta vain %s"
@@ -137,7 +149,7 @@ msgid "From a Pick list"
 msgstr "Keräilylistalta"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ei hinnastoa!"
@@ -229,7 +241,7 @@ msgid "Partial Picking"
 msgstr "Osittainen keräily"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Ostotilaus '%s' on vahvistettu."
@@ -276,12 +288,14 @@ msgid "Notes"
 msgstr "Huomautukset"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Sinun pitää valita hinnasto tai toimittaja ostolomakkeella !\n"
+"Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -352,7 +366,7 @@ msgid "Cancelled"
 msgstr "Peruttu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Ostomäärä ylittää rajan"
@@ -406,7 +420,7 @@ msgid "Reference"
 msgstr "Viite"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Ostotilausta jonka tila on %s ei voi poistaa."
@@ -428,7 +442,7 @@ msgid "Day"
 msgstr "Päivä"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Ostotilaus '%s' on asetettu vedokseksi."
@@ -445,8 +459,8 @@ msgid "# of Lines"
 msgstr "Rivien lukumäärä"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -483,7 +497,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Merkitsee että keräilylista on tehty"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Väärä tuotteen mittayksikkö!"
@@ -587,7 +601,7 @@ msgid "Order Lines"
 msgstr "Tilausrivit"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Ei kumppania!"
@@ -629,6 +643,11 @@ msgid ""
 "Manual: allows you to generate suppliers invoices by chosing in the "
 "uninvoiced lines of all manual purchase orders."
 msgstr ""
+"Tilaukselta: luonnoslasku luodaan ostotilauksen perusteella. Kirjanpitäjän "
+"pitä vain tarkistaa ja hyväksyä lasku.\n"
+"Keräilystä: luonnoslasku luodaan tarkastetun vastaanoton perusteella.\n"
+"Käsin (manuaalinen): mahdollistaa toimittajalaskujen luonnin käsin "
+"laskuttamattomilta riveiltä kaikista manuaalisista ostotilauksisa."
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
@@ -636,9 +655,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Ostotilaukselle luodut laskut"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -666,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 ""
+"ostoanalyysi mahdollistaa helpon tarkastelun yrityksesi ostohistoriasta ja "
+"tehokkuukdesta. Tästä valikosta voit seurata neuvottelujen onnistumista, "
+"toimittajien toimituskykyä yms."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -679,6 +701,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Lasku on luotu automaattisesti, jos laskukontrolli ostotilauksessa on "
+"'keräilystä'. Lasku voidaan luoda myös käsin kirjanpitäjän toimesta "
+"(laskukontrolli=manuaalinen)"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -696,7 +721,7 @@ msgid "Reservation Destination"
 msgstr "Varausmääränpää"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Virheellinen toiminto!"
@@ -749,6 +774,10 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Käytä tätä valikkoa kontrolloidaksesi laskuja joita saapuu toimittajiltasi. "
+"OpeneERP luo esilaskut jotka perustuvat ostotilauksiin tai vastaanottoihin, "
+"asetusten mukaisesti. Kun vastaanotat toimittajan laskun, voit kohdistaa ja "
+"täsmäyttää sen luonnoslakusn kanssa."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -776,10 +805,11 @@ msgid "    Month-1    "
 msgstr "    Kuukausi-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"Tälle yritykselle ei ole määritelty ostojen päiväkirjaa: \"%s\" (id:%d)"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -787,7 +817,7 @@ msgid "Manual"
 msgstr "Manuaalinen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -809,7 +839,7 @@ msgstr "Hallittavat sisääntulevat tuotteet"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "Hyväksyntä"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -824,6 +854,10 @@ msgid ""
 "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
 "can generate a draft supplier invoice based on the lines from this menu."
 msgstr ""
+"Jos asetat ostotilauksen laskukontrollin tilaan manuaalinen, voit seurata "
+"täällä kaikkia ostotilausrivejä joista et ole vielä vastaanottanut "
+"toimittajan laskua. Kun olet valmis vastaanottamaan toimittajan laskun, voit "
+"luoda luonnostilassa olevan toimittajalaskun tämän valikon rivien pohjalta."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -905,7 +939,6 @@ msgid "Month"
 msgstr "Kuukausi"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Odottaa toimittajan vahvistusta"
@@ -1050,6 +1083,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Ostotilaus luo toimittajalaskun heti kun se on vahvistettu ostajan toimesta. "
+"Riippuen laskujen kontrollista ostotilauksella, lasku perustuu "
+"vastaanotettuihin tai tilattuihin määriin."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1108,7 +1144,7 @@ msgid "Manual Invoices"
 msgstr "Käsin Laskutus"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1125,14 +1161,14 @@ msgid "Extended Filters..."
 msgstr "Laajennetut Suotimet..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Tälle tuotteelle ei ole määritetty kulutiliä: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr "Sinun täytyy ensin perua kaikki ostotilaukseen liitetyt laskut."
@@ -1179,7 +1215,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1447,7 +1483,7 @@ msgid "Date Approved"
 msgstr "Hyväksymispäivämäärä"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Tätä ostotilausta ei voida perua!"
@@ -1519,6 +1555,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Hallinnoi toimittajatietoja ja pidä yllä hyvät suhteet toimittajiisi. Voit "
+"seurata kaikkia yhteyksiä heiden kanssaan kohdasta Historia: sähköpostit, "
+"tilauset, kokoukset jne."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1559,7 +1598,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Kokonaismäärä ja määrä kuukausittain"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Ostotilausta ei voida perua!"
@@ -1570,6 +1609,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 ""
+"Jos tuotteelle ei ole toimittajaa, ostaja voi täyttää lomakkeen käsin ja "
+"vahvistaa sen. Tarjouspyynnöstä tulee vahvistettu ostotilaus."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1703,7 +1744,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Ostotilaus '%s' on peruttu."
@@ -1767,6 +1808,9 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Lasku luodaan automaattisesti jos laskujen kontrolli ostotilauksella on "
+"'tilattaessa'. Lasku voidaan luoda myös käsin kirjanpitäjän toimesta "
+"(laskujen kontrolli = manuaalinen)."
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -1780,7 +1824,7 @@ msgid "Partner"
 msgstr "Kumppani"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1821,6 +1865,8 @@ msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
 msgstr ""
+"Uniikki numero ostotilauksella, laskettu automaattisesti kun ostotilaus "
+"luodaan"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
@@ -1871,30 +1917,15 @@ msgstr "Hankintojen Työtila"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
-
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Toimittajan lasku ennakoluotu vastaanotettaessa kontrollia varten"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Huomioi että tilaukset yhdistetään vain jos ne ovat samalle kumppanille ja "
-#~ "lähetetään samaan paikkaan, ja linjat yhdistetään vain jos ne ovat täysin "
-#~ "samat lukuunottamatta määrää ja mittayksikköä."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
 #~ msgid "Create invoice from product recept"
 #~ msgstr "Luo lasku tuote vastaanotettaessa"
 
-#~ msgid "N°"
-#~ msgstr "Nro"
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Ostotilaukset käsittelyssä"
 
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 6f68bdd0cc2..89bdac8d444 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 08:42+0000\n"
-"Last-Translator: Xavier Verbeke <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:55+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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "au fournisseur. L'appel d'offre devient alors un ordre d'achat confirmé."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
 msgstr "Destination"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -129,7 +129,7 @@ msgstr ""
 "suivre les produits reçus et contrôler les factures du fournisseur."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Le fournisseur sélectionné peut seulement vendre ce produit par %s"
@@ -152,7 +152,7 @@ msgid "From a Pick list"
 msgstr "À la réception"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Pas de Liste de Prix !"
@@ -246,7 +246,7 @@ msgid "Partial Picking"
 msgstr "Traitement partiel"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "L'ordre d'achat '%s' est confirmé."
@@ -293,7 +293,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -373,7 +373,7 @@ msgid "Cancelled"
 msgstr "Annulé"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Montant d'achat supérieur à la limite"
@@ -427,7 +427,7 @@ msgid "Reference"
 msgstr "Référence"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Impossible de supprimer des bons de commande dans l'état %s !"
@@ -449,7 +449,7 @@ msgid "Day"
 msgstr "Jour"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "L'ordre d'achat '%s' a été passé au statut 'Brouillon'."
@@ -466,8 +466,8 @@ msgid "# of Lines"
 msgstr "# de lignes"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -504,7 +504,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indique qu'une réception de marchandise a été effectuée."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "UdM Produit incorrecte !"
@@ -610,7 +610,7 @@ msgid "Order Lines"
 msgstr "Lignes de la commande"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Pas de Partenaire !"
@@ -665,9 +665,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Factures générées pour un bon de commande"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -732,7 +732,7 @@ msgid "Reservation Destination"
 msgstr "Destination de la réservation"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Action non valide !"
@@ -817,7 +817,7 @@ msgid "    Month-1    "
 msgstr "    Mois -1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -830,7 +830,7 @@ msgid "Manual"
 msgstr "Manuel"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -922,7 +922,7 @@ msgstr "Réception de produits"
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr "Besoin"
+msgstr "Approvisionnement"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -952,7 +952,6 @@ msgid "Month"
 msgstr "Mois"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "En attente de confirmation du fournisseur"
@@ -1059,7 +1058,7 @@ msgstr "Créer les factures"
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr "Ligne de commande"
+msgstr "Ligne de commande d'achat"
 
 #. module: purchase
 #: constraint:res.partner:0
@@ -1162,7 +1161,7 @@ msgid "Manual Invoices"
 msgstr "Factures manuelles"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1181,7 +1180,7 @@ msgid "Extended Filters..."
 msgstr "Filtres étendus..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1189,7 +1188,7 @@ msgstr ""
 "Il n'y a pas de compte de charge définit pour ce produit : \"%s\" (id. : %d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1249,7 +1248,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1520,7 +1519,7 @@ msgid "Date Approved"
 msgstr "Date approbation"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Impossible d'annuler cette commande d'achat !"
@@ -1635,7 +1634,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Quantité totale et montant total par mois"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Impossible d'annuler le bon de commande !"
@@ -1802,7 +1801,7 @@ msgstr ""
 "bon de commande."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "L'ordre d'achat '%s' est annulé."
@@ -1882,7 +1881,7 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1932,20 +1931,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Tableau de bord des achats"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Vous en pouvez pas avoir 2 listes de prix avec des dates qui se chevauchent"
-
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Veuillez noter que les commandes ne seront fusionnées que si elles sont "
-#~ "destinées au même partenaire et vont à la même zone de stockage, et que les "
-#~ "lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf "
-#~ "pour la quantité et l'unité"
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Ordres d'achat en cours"
 
@@ -2150,23 +2135,11 @@ msgstr "Tableau de bord des achats"
 #~ msgid "Product recept invoice"
 #~ msgstr "Facture de Réception du Produit"
 
-#~ msgid "Quotation"
-#~ msgstr "Devis"
-
 #~ msgid "Date"
 #~ msgstr "Date"
 
-#~ msgid "In progress"
-#~ msgstr "En cours"
-
 #~ msgid "From Picking"
 #~ msgstr "Sur marchandise reçue"
 
-#~ msgid "To be Invoiced"
-#~ msgstr "À facturer"
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Lignes d'achat non facturées"
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM du produit"
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index 87d634bae25..7d5fdaf2106 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -760,7 +760,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1550,7 +1549,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1675,7 +1674,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 683b87830fe..b1d2cf956ae 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,35 +24,36 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
-msgstr ""
+msgstr "Ne možete potvrditi narudžbu bez stavaka."
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr ""
+msgstr "Fakturirano i plaćeno"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
 #: field:purchase.report,location_id:0
 msgid "Destination"
-msgstr ""
+msgstr "Odredište"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
 "of the product"
 msgstr ""
+"Zadana jedinica mjere mora biti u istoj kategoriji kao nabavna jedinica mjere"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr ""
+msgstr "Datum izrade dokumenta"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -75,12 +76,12 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "Nefakturirano"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "Adresa odredišta"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -111,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -157,7 +158,7 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: purchase
 #: view:board.board:0
@@ -169,7 +170,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi kao nacrt"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -220,7 +221,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -267,7 +268,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +342,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -395,7 +396,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -417,7 +418,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -434,8 +435,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -472,7 +473,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -498,7 +499,7 @@ msgstr ""
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
 #: view:purchase.order.line_invoice:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
@@ -572,7 +573,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -621,9 +622,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -681,7 +682,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -759,7 +760,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -770,7 +771,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -884,7 +885,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1087,7 +1087,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1104,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1158,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1317,7 +1317,7 @@ msgstr ""
 #: view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1418,7 +1418,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1530,7 +1530,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1549,7 +1549,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1674,7 +1674,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1751,7 +1751,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 38dd12566a6..27aa4fa3bd4 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-09 18:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2011-11-07 12:47+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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +27,7 @@ msgstr ""
 "szállítónak. Az ajánlatkérés egy megerősített szállítói megrendeléssé válik."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Nem erősíthet meg sorok nélküli szállítói megrendelést."
@@ -44,7 +45,7 @@ msgid "Destination"
 msgstr "Célállomás"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +128,7 @@ msgstr ""
 "a bejövő számlákat."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -150,7 +151,7 @@ msgid "From a Pick list"
 msgstr "Bevételezési lista alapján"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nincs árlista !"
@@ -240,7 +241,7 @@ msgid "Partial Picking"
 msgstr "Részleges bevételezés"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "'%s' szállítói megrendelés megerősítésre került."
@@ -287,7 +288,7 @@ msgid "Notes"
 msgstr "Megjegyzések"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -366,7 +367,7 @@ msgid "Cancelled"
 msgstr "Érvénytelenített"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "A limitet meghaladó beszerzési összeg"
@@ -420,7 +421,7 @@ msgid "Reference"
 msgstr "Hivatkozás"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "%s állapotban lévő szállítói megrendelés(eke)t nem lehet törölni!"
@@ -442,7 +443,7 @@ msgid "Day"
 msgstr "Nap"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "'%s' szállítói megrendelés tervezet állapotba beállításra került."
@@ -459,8 +460,8 @@ msgid "# of Lines"
 msgstr "Sorok száma"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -497,7 +498,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Jelzi, hogy a bevételezést végrehajtották."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Rossz termék ME!"
@@ -603,7 +604,7 @@ msgid "Order Lines"
 msgstr "Megrendelés sorok"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Nincs partner!"
@@ -658,9 +659,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "A szállítói megrendelés alapján készített számlák"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -725,7 +726,7 @@ msgid "Reservation Destination"
 msgstr "Foglalás rendeltetési helye"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Érvénytelen művelet !"
@@ -809,7 +810,7 @@ msgid "    Month-1    "
 msgstr "    Előző hónap    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "\"%s\" (kód: %d) vállalatra nem állítottak be bejövő számla naplót."
@@ -820,7 +821,7 @@ msgid "Manual"
 msgstr "Kézi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -942,7 +943,6 @@ msgid "Month"
 msgstr "Hónap"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Szállító visszaigazolására váró"
@@ -1148,7 +1148,7 @@ msgid "Manual Invoices"
 msgstr "Kézi számlák"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1167,7 +1167,7 @@ msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1175,7 +1175,7 @@ msgstr ""
 "\"%s\" (kód: %d) termékre nem állítottak be beszerzés főkönyvi számlát"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1235,7 +1235,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1506,7 +1506,7 @@ msgid "Date Approved"
 msgstr "Jóváhagyás dátuma"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Nem érvényteleníthető ez a szállítói megrendelés!"
@@ -1618,7 +1618,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Havi összes mennyiség és végösszeg"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Nem érvényteleníthető a szállítói megrendelés!"
@@ -1785,7 +1785,7 @@ msgstr ""
 "érvényteleníti a megrendelést."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "'%s' szállítói megrendelés érvénytelenítésre került."
@@ -1865,7 +1865,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -2097,15 +2097,6 @@ msgstr "Beszerzési vezérlőpult"
 #~ msgid "Approving Purchase Order"
 #~ msgstr "Beszerzési rendelés jóváhagyása"
 
-#~ msgid ""
-#~ "You have to select a partner in the purchase form !\n"
-#~ "\"\n"
-#~ "\"Please set one partner before choosing a product."
-#~ msgstr ""
-#~ "Önnek ki kell választania egy partnert a beszerzési űrlapon !\n"
-#~ "\"\n"
-#~ "\"Kérem adjon meg egy partnert mielőtt választ egy terméket."
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Nem számlázott beszerzés sorok"
 
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 3cde6f2958f..c10f1c6e9db 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.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: 2011-01-25 06:44+0000\n"
-"Last-Translator: moelyana <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "pembelian yang telah dikonfirmasi."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -45,7 +45,7 @@ msgid "Destination"
 msgstr "Tujuan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +127,7 @@ msgstr ""
 "diterima, dan mengkontrol  faktur  pemasok"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -150,7 +150,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Tidak ada daftar harga !"
@@ -241,7 +241,7 @@ msgid "Partial Picking"
 msgstr "Pengambilan Sebagian"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Order Pembelian '%s' telah dikonfirmasi"
@@ -288,7 +288,7 @@ msgid "Notes"
 msgstr "Catatan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -367,7 +367,7 @@ msgid "Cancelled"
 msgstr "Dibatalkan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Reference"
 msgstr "Referensi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Tidak dapat menghapus Purchase Order  yang berada di bagian %s"
@@ -443,7 +443,7 @@ msgid "Day"
 msgstr "Hari"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "'% s' Order pembelian telah diatur di bagian draft."
@@ -460,8 +460,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -498,7 +498,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Hal ini menunjukkan bahwa  pengambilan  telah  dilakukan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Produk UoM Salah !"
@@ -603,7 +603,7 @@ msgid "Order Lines"
 msgstr "Daftar Order"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Rekanan Tidak ada"
@@ -652,9 +652,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Faktur dibuat untuk pesanan pembelian"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -718,7 +718,7 @@ msgid "Reservation Destination"
 msgstr "Reservasi Tujuan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Tindakan tidak valid !"
@@ -802,7 +802,7 @@ msgid "    Month-1    "
 msgstr "    Bulan - 1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -814,7 +814,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -932,7 +932,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1141,7 +1140,7 @@ msgid "Manual Invoices"
 msgstr "Faktur secara manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1160,7 +1159,7 @@ msgid "Extended Filters..."
 msgstr "Filter Tambahan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1168,7 +1167,7 @@ msgstr ""
 "Tidak ada account beban yang ditetapkan untuk produk  ini  \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1217,7 +1216,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1485,7 +1484,7 @@ msgid "Date Approved"
 msgstr "Tanggal Disetujui"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Order Pembelian tidak dapat dibatalkan"
@@ -1600,7 +1599,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Total Qty dan Jumlah berdasarkan bulan"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Order Pembelian tidak dapat dibatalkan !"
@@ -1747,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Order Pembelian '%s' dibatalkan."
@@ -1824,7 +1823,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index e56e5809a44..ca9077d432c 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-12 04:56+0000\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "fornitore. Il preventivo diverrà quindi un ordine di acquisto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
 msgstr "Destinazione"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -117,7 +117,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Il fornitore selezionato vende questo prodotto solo da %s"
@@ -140,7 +140,7 @@ msgid "From a Pick list"
 msgstr "Da una lista di prelievo"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nessun Listino Prezzi !"
@@ -233,7 +233,7 @@ msgid "Partial Picking"
 msgstr "Prelievo parziale"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "L'ordine di acquisto '%s' è confermato."
@@ -280,7 +280,7 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -360,7 +360,7 @@ msgid "Cancelled"
 msgstr "Annullato"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Costo d' acquisto sopra il limite consentito"
@@ -414,7 +414,7 @@ msgid "Reference"
 msgstr "Referenza"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -437,7 +437,7 @@ msgid "Day"
 msgstr "Giorno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "L'ordine di acquisto '%s' è stato riportato allo stato bozza."
@@ -454,8 +454,8 @@ msgid "# of Lines"
 msgstr "Numero di linee"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -492,7 +492,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica che è stato eseguito un movimento merci"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "UOM del prodotto errata!"
@@ -598,7 +598,7 @@ msgid "Order Lines"
 msgstr "Righe Ordine"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Nessun partner!"
@@ -654,9 +654,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Fatture generate per un ordine di acquisto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -721,7 +721,7 @@ msgid "Reservation Destination"
 msgstr "Destinazione Prenotata"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Azione non valida !"
@@ -801,7 +801,7 @@ msgid "    Month-1    "
 msgstr "    Mese - 1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -814,7 +814,7 @@ msgid "Manual"
 msgstr "Manuale"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -932,7 +932,6 @@ msgid "Month"
 msgstr "Mese"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "In attesa della risposta del fornitore"
@@ -1140,7 +1139,7 @@ msgid "Manual Invoices"
 msgstr "Fatture manuali"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1159,7 +1158,7 @@ msgid "Extended Filters..."
 msgstr "Filtri estesi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1167,7 +1166,7 @@ msgstr ""
 "Non risulta presente alcun conto definito per questo prodotto:\"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1228,7 +1227,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1501,7 +1500,7 @@ msgid "Date Approved"
 msgstr "Data Approvazione"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Non è possibile cancellare questo ordine di acquisto!"
@@ -1614,7 +1613,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Q.tà totale e costo totale per mese"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "L'ordine di acquisto non può essere cancellato !"
@@ -1781,7 +1780,7 @@ msgstr ""
 "l'utente cancella l'ordine di acquisto"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "L'ordine di acquisto '%s' è cancellato."
@@ -1861,7 +1860,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1911,23 +1910,9 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Dashboard acquisti"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr ""
-#~ "Non puoi avere due versioni dello stesso listino che si sovrappongono"
-
 #~ msgid "From Picking"
 #~ msgstr "Da Prelievo"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Attenzione: gli ordini verranno fusi esclusivamente se sono rivolti al "
-#~ "medesimo fornitore e destinati allo stesso punto di stoccaggio. Le righe "
-#~ "verranno unite esclusivamente nel caso in cui risultassero identiche, ad "
-#~ "eccezione di quantità e unità di misura."
-
 #~ msgid "Create invoice from product recept"
 #~ msgstr "Creare fattura da ricezione prodotti"
 
@@ -2086,66 +2071,5 @@ msgstr "Dashboard acquisti"
 #~ msgid "Purchase Order lines"
 #~ msgstr "Righe Ordine Acquisto"
 
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Se si imposta il controllo della fatturazione su un ordine di acquisto come "
-#~ "\"Manuale\", è possibile tener traccia qui delle linee degli ordini di "
-#~ "acquisto per cui non si è ancora ricevuta la fattura del fornitore. Una "
-#~ "volta che la fattura del fornitore è pervenuta è possibile, da questo menu, "
-#~ "generare una fattura fornitore in formato bozza basata su queste linee."
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Da fatturare"
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Linee di acquisto non fatturate"
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "Dal menu Ordini di Acquisto è possibile tracciare lo stato dei propri "
-#~ "ordini: merci ricevute, fatture pervenute e controllate.\n"
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "È possibile utilizzare questo menu per controllare le fatture che devono "
-#~ "essere ricevute dal fornitore. OpenERP pre-genera le fatture in stato bozza "
-#~ "partendo dagli ordini di vendita o dalle ricezioni merci. Una volta ricevuta "
-#~ "una fattura d'acquisto è possibile verificarne la congruenza con la fattura "
-#~ "pre-generata in formato bozza e quindi validarla."
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "Mediante il menu di richiesta preventivo è possibile creare nuovi "
-#~ "preventivi, gestire quelli già presenti e confermarli, convertendoli quindi "
-#~ "in ordini effettivi, non appena perviene l'approvazione da parte del "
-#~ "fornitore. Quanto una richiesta di preventivo viene confermata, OpenERP si "
-#~ "occuperà di convertirla in ordine di acquisto e di generare tutti i passi "
-#~ "successivi necessari: ricezione dei prodotti da approvare, controllo delle "
-#~ "fatturazioni."
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Possibilità di accesso ai record dei propri fornitori e di gestione delle "
-#~ "relazioni con essi. È possibili tenere traccia dei contatti intercorsi con i "
-#~ "fornitori attraverso il tab storia: email, ordini, riunioni, etc."
-
-#~ msgid "Product UoM"
-#~ msgstr "UoM del prodotto"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 735fe0c6b20..d0da7599b25 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr "목적지"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "가격리스트가 없음!"
@@ -221,7 +221,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
 msgstr "노트"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
 msgstr "취소됨"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
 msgstr "참조"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "잘못된 상품 UOM !"
@@ -573,7 +573,7 @@ msgid "Order Lines"
 msgstr "주문 라인"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "파트너가 없음!"
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
 msgstr "예약 목적지"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "유효하지 않은 액션!"
@@ -760,7 +760,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
 msgstr "매뉴얼"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "이 상품을 위해 정의된 비용 계정이 없습니다: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr "먼저 이 구매 주문에 첨부된 모든 인보이스를 취소해야 합니다."
@@ -1159,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1422,7 +1421,7 @@ msgid "Date Approved"
 msgstr "승인된 날짜"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "이 구매 주문을 취소할 수 없습니다 !"
@@ -1534,7 +1533,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "구매 주문을 취소할 수 없습니다 !"
@@ -1553,7 +1552,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1678,7 +1677,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1755,7 +1754,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1807,14 +1806,6 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "컨트롤을 위한 접수 상에서 미리 생성된 공급자 인보이스"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "주문들은 동일한 파트너 및 동일한 위치를 향할 때만 합병될 수 있으며, 라인들은 수량과 유닛 외에는 정확히 동일할 경우에만 합쳐질 수 "
-#~ "있습니다."
-
 #~ msgid "From Picking"
 #~ msgstr "피킹으로부터"
 
@@ -1827,9 +1818,6 @@ msgstr ""
 #~ msgid "Create invoice from product recept"
 #~ msgstr "제품 수령으로부터 인보이스 생성"
 
-#~ msgid "N°"
-#~ msgstr "N°"
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "진행 중인 구매 주문"
 
@@ -1988,9 +1976,6 @@ msgstr ""
 #~ msgid "Purchase Invoice"
 #~ msgstr "구매 인보이스"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "중복되는 두 가격리스트 버전들은 허용되지 않습니다."
-
 #~ msgid "From Packing list, Create invoice."
 #~ msgstr "포장 리스트로부터 인보이스 생성"
 
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 14eb20b5406..d123fb6d378 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr "Paskirties vieta"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nėra kainoraščio!"
@@ -224,7 +224,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -271,7 +271,7 @@ msgid "Notes"
 msgstr "Pastabos"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -345,7 +345,7 @@ msgid "Cancelled"
 msgstr "Nutrauktas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -399,7 +399,7 @@ msgid "Reference"
 msgstr "Nuoroda"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -438,8 +438,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -476,7 +476,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Netinkamas produkto mato vnt.!"
@@ -576,7 +576,7 @@ msgid "Order Lines"
 msgstr "Užsakymo eilutės"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Nėra partnerio!"
@@ -625,9 +625,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -685,7 +685,7 @@ msgid "Reservation Destination"
 msgstr "Rezervacijos vieta"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Netinkamas veiksmas!"
@@ -763,7 +763,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -774,7 +774,7 @@ msgid "Manual"
 msgstr "Rankinis"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -888,7 +888,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1091,7 +1090,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1108,14 +1107,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1164,7 +1163,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1424,7 +1423,7 @@ msgid "Date Approved"
 msgstr "Patvirtinimo data"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Negalima atšaukti šio pirkimo užsakymo!"
@@ -1536,7 +1535,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Negalima atšaukti pirkimo užsakymo!"
@@ -1555,7 +1554,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1680,7 +1679,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1757,7 +1756,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1805,9 +1804,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr ""
 
-#~ msgid "N°"
-#~ msgstr "N°"
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Vykdomi pirkimų užsakymai"
 
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 0c0e7592538..1012b60dafa 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -44,7 +44,7 @@ msgid "Destination"
 msgstr "Хаана"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -136,7 +136,7 @@ msgid "From a Pick list"
 msgstr "Түүврийн жагсаалтаас"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Үнийн хүснэгтгүй !"
@@ -228,7 +228,7 @@ msgid "Partial Picking"
 msgstr "Дутуу түүвэр"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Батлагдсан '%s' худалдан авалтын захиалга."
@@ -275,7 +275,7 @@ msgid "Notes"
 msgstr "Тэмдэглэл"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -349,7 +349,7 @@ msgid "Cancelled"
 msgstr "Цуцалсан"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -403,7 +403,7 @@ msgid "Reference"
 msgstr "Дугаар"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "%s төлөвт байгаа захиалгыг устгах боломжгүй!"
@@ -425,7 +425,7 @@ msgid "Day"
 msgstr "Өдөр"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -442,8 +442,8 @@ msgid "# of Lines"
 msgstr "# Мөрийн"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -480,7 +480,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Энэ нь барааг бүрэн хүлээж авсан эсэхийг илэрхийлнэ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -580,7 +580,7 @@ msgid "Order Lines"
 msgstr "Захиалгын мөрүүд"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Харилцагчгүй!"
@@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -695,7 +695,7 @@ msgid "Reservation Destination"
 msgstr "Нөөц хүргэх хаяг"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Алдаатай үйлдэл !"
@@ -773,7 +773,7 @@ msgid "    Month-1    "
 msgstr "    Сар-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -784,7 +784,7 @@ msgid "Manual"
 msgstr "Гараар"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -899,7 +899,6 @@ msgid "Month"
 msgstr "Сар"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1102,7 +1101,7 @@ msgid "Manual Invoices"
 msgstr "Нэхэмжлэх заавар"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1119,14 +1118,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Энэ бараанд зарлагын данс алга:\"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1173,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1439,7 +1438,7 @@ msgid "Date Approved"
 msgstr "Зөвшөөрсөн огноо"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Энэ худалдан авалтын захиалгыг цуцалж чадсангүй !"
@@ -1552,7 +1551,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Нийт тоо ширхэг болон хэмжээ (сараар)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Худалдан авалтын захиалга цуцалж чадсангүй!"
@@ -1571,7 +1570,7 @@ msgstr "2 сар"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1704,7 +1703,7 @@ msgstr ""
 "order."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Худалдан авалтын захиалга '%s' цуцлагдсан."
@@ -1781,7 +1780,7 @@ msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1997,15 +1996,6 @@ msgstr "Худалдан авалт"
 #~ msgid "Product Receipt"
 #~ msgstr "Барааны баримт"
 
-#~ msgid "Waiting Schedule"
-#~ msgstr "Хүлээх төлөвлөгөө"
-
-#~ msgid "In progress"
-#~ msgstr "Үргэлжилж байна"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Гарын авлага үргэлжилж байна"
-
 #~ msgid "Control invoices on receptions"
 #~ msgstr "Ирэх нэхэмжлэлийг удирдах"
 
@@ -2018,57 +2008,14 @@ msgstr "Худалдан авалт"
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Хүлээн авалт дээр нийлүүлэгчийн нэхэмжлэл үүснэ"
 
-#~ msgid "Extended filters..."
-#~ msgstr "Өргөтгөсөн шүүлтүүр..."
-
-#~ msgid ""
-#~ "From Order: a draft invoice will be pre-generated based on the purchase "
-#~ "order. The accountant will just have to validate this invoice for control.\n"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-#~ msgstr ""
-#~ "Захиалгаас: a draft invoice will be pre-generated based on the purchase "
-#~ "order. The accountant will just have to validate this invoice for control.\n"
-#~ "Түүврээс: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-
-#~ msgid ""
-#~ "There is no expense account defined ' \\n                                    "
-#~ "        'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Зардлын данс тодорхойлогдоогүй байна ' \\n                                   "
-#~ "         'энэ барааны \"%s\" (id:%d)"
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Нэхэмжлэнэ"
-
-#~ msgid "Нийлүүлэгчийн нэхэмжлэл хүлээж авах"
-#~ msgstr "Нийлүүлэгчийн нэхэмжлэл хүлээж авах"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
 
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Нэхэмжлэгдээгүй худалдан авалтын мөр"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
-
 #~ msgid "When controlling invoice from orders"
 #~ msgstr "Захиалгаас нэхэмжлэл үүсгэх үед"
 
 #~ msgid "Purchase order is approved by supplier."
 #~ msgstr "Нийлүүлэгч захиалгыг зөвшөөрсөн."
-
-#~ msgid "Quotation"
-#~ msgstr "Үнийн санал"
-
-#~ msgid "Product UoM"
-#~ msgstr "Хэмжих нэгж"
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index 2092846d971..ccf50d5c099 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr "Destinasjon"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr "Fra en plukkliste"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ingen prisliste!"
@@ -223,7 +223,7 @@ msgid "Partial Picking"
 msgstr "Delvis plukking"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Innkjøpsordre '%s' er bekreftet."
@@ -270,7 +270,7 @@ msgid "Notes"
 msgstr "Notater"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -344,7 +344,7 @@ msgid "Cancelled"
 msgstr "Annulert"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Innkjøpsbeløp er over grenseverdien"
@@ -398,7 +398,7 @@ msgid "Reference"
 msgstr "Referanse"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -420,7 +420,7 @@ msgid "Day"
 msgstr "Dag"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -437,8 +437,8 @@ msgid "# of Lines"
 msgstr "# linjer"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -475,7 +475,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Feil måleenhet for produkt!"
@@ -575,7 +575,7 @@ msgid "Order Lines"
 msgstr "Ordrelinjer"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Ingen klient definert!"
@@ -629,9 +629,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Faktura generert for en innkjøpsordre"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -689,7 +689,7 @@ msgid "Reservation Destination"
 msgstr "Reservasjonsmål"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Ugyldig aksjon!"
@@ -767,7 +767,7 @@ msgid "    Month-1    "
 msgstr "    Måned-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -779,7 +779,7 @@ msgid "Manual"
 msgstr "Manuell"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr "Du må først avbryte all plukking relatert til denne innkjøpsordren."
@@ -893,7 +893,6 @@ msgid "Month"
 msgstr "Måned"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1096,7 +1095,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1113,7 +1112,7 @@ msgid "Extended Filters..."
 msgstr "Utvidede filter..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1121,7 +1120,7 @@ msgstr ""
 "Det er ikke definert noen kostnadskonto for dette produktet: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1169,7 +1168,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1429,7 +1428,7 @@ msgid "Date Approved"
 msgstr "Godkjent dato"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Kunne ikke annulere denne innkjøpsordren !"
@@ -1541,7 +1540,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Kunne ikke annulere innkjøpsordre!"
@@ -1685,7 +1684,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Innkjøpsordre '%s' er annulert."
@@ -1762,7 +1761,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 06a4abfb2bd..381c796a1c7 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-16 17:01+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
 "inkooporder."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "U kunt een inkooporder zonder orderregels niet bevestigen."
@@ -45,7 +45,7 @@ msgid "Destination"
 msgstr "Bestemming"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +127,7 @@ msgstr ""
 "producten volgen en inkoopfacturen beheren."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "De geselecteerde leverancier verkoopt dit product alleen per %s"
@@ -150,7 +150,7 @@ msgid "From a Pick list"
 msgstr "van een piklijst"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Geen prijslijst!"
@@ -243,7 +243,7 @@ msgid "Partial Picking"
 msgstr "Deels gepikt"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Inkooporder '%s' is bevestigd."
@@ -290,7 +290,7 @@ msgid "Notes"
 msgstr "Notities"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -370,7 +370,7 @@ msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Inkoopbedrag boven de limiet"
@@ -424,7 +424,7 @@ msgid "Reference"
 msgstr "Referentie"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Kan geen inkooporder(s) verwijderen die in status %s zijn !"
@@ -446,7 +446,7 @@ msgid "Day"
 msgstr "Dag"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Inkooporder '%s' is in concept status gezet."
@@ -463,8 +463,8 @@ msgid "# of Lines"
 msgstr "# Regels"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -501,7 +501,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Het geeft aan dat een picking is uitgevoerd"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Verkeerde product meeteenheid !"
@@ -606,7 +606,7 @@ msgid "Order Lines"
 msgstr "Orderregels"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Geen relatie geselecteerd!"
@@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Facturen voor een inkooporder gegenereerd"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -727,7 +727,7 @@ msgid "Reservation Destination"
 msgstr "Gereserveerde bestemming"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Foutieve handeling!"
@@ -809,7 +809,7 @@ msgid "    Month-1    "
 msgstr "    Maand-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Er is geen inkoopdagboek gedefinieerd in dit bedrijf: \"%s\" (id:%d)"
@@ -820,7 +820,7 @@ msgid "Manual"
 msgstr "Handmatig"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -940,7 +940,6 @@ msgid "Month"
 msgstr "Maand"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Wacht lever. bevest."
@@ -1149,7 +1148,7 @@ msgid "Manual Invoices"
 msgstr "Handmatige facturen"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1168,7 +1167,7 @@ msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1176,7 +1175,7 @@ msgstr ""
 "Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1234,7 +1233,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1502,7 +1501,7 @@ msgid "Date Approved"
 msgstr "Datum goedgekeurd"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Inkooporder kan niet geannuleerd worden."
@@ -1617,7 +1616,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Totaal aantal en bedrag per maand"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Inkooporder kan niet worden geannuleerd!"
@@ -1785,7 +1784,7 @@ msgstr ""
 "inkooporder annuleert."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Inkooporder '%s' is geannuleerd."
@@ -1865,7 +1864,7 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1915,9 +1914,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Inkoop dashboard"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Twee overlappende prijslijsten is niet mogelijk!"
-
 #~ msgid "Product recept invoice"
 #~ msgstr "Product-ontvangst factuur"
 
@@ -1934,15 +1930,6 @@ msgstr "Inkoop dashboard"
 #~ msgid "From Picking"
 #~ msgstr "Van ontvangsten"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Alleen orders met dezelfde leverancier en met dezelfde bestemming worden "
-#~ "samengevoegd. Tevens moeten de regels exact hetzelfde zijn (uitgezonderd "
-#~ "aantallen)."
-
 #~ msgid "Packing"
 #~ msgstr "Verpakking"
 
@@ -1955,9 +1942,6 @@ msgstr "Inkoop dashboard"
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Lopende inkooporders"
 
-#~ msgid "N°"
-#~ msgstr "Nr."
-
 #~ msgid "Purchase order is confirmed by the user."
 #~ msgstr "Inkooporder is goedgekeurd door de gebruiker."
 
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index bea5f4d3470..6019b6af6da 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -395,7 +395,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -759,7 +759,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1549,7 +1548,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1674,7 +1673,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 99672259fbc..4f5b8ee53c6 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-22 13:10+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "dostawcy. Zapytanie ofertowe stanie się potwierdzonym zamówieniem zakupu."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Nie możesz potwierdzić zamówienia zakupu bez pozycji."
@@ -44,7 +44,7 @@ msgid "Destination"
 msgstr "Przeznaczenie"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -123,7 +123,7 @@ msgstr ""
 "itd. W zamówieniu zakupu możesz przeglądać produkty i sprawdzać stan faktur."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Wybrany dostawca sprzedaje ten produkt tylko po %s"
@@ -146,7 +146,7 @@ msgid "From a Pick list"
 msgstr "Z pobrania"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Brak cennika !"
@@ -237,7 +237,7 @@ msgid "Partial Picking"
 msgstr "Pobranie częściowe"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Zamówienie zakupu '%s' zostało potwierdzone"
@@ -284,7 +284,7 @@ msgid "Notes"
 msgstr "Uwagi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -363,7 +363,7 @@ msgid "Cancelled"
 msgstr "Anulowano"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Wartość zakupu powyżej limitu"
@@ -417,7 +417,7 @@ msgid "Reference"
 msgstr "Odnośnik"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Nie można usuwać zamówień zakupu, które są w stanie %s !"
@@ -439,7 +439,7 @@ msgid "Day"
 msgstr "Dzień"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Zamówienie zakupu '%s' zostało ustawione w stan Projekt"
@@ -456,8 +456,8 @@ msgid "# of Lines"
 msgstr "# pozycji"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -494,7 +494,7 @@ msgid "It indicates that a picking has been done"
 msgstr "To oznacza, że pobranie zostało wykonane"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Niepoprawna JM produktu !"
@@ -598,7 +598,7 @@ msgid "Order Lines"
 msgstr "Pozycje zamówienia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Brak partnera!"
@@ -653,9 +653,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Faktury wygenerowane do zamówienia zakupu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -718,7 +718,7 @@ msgid "Reservation Destination"
 msgstr "Miejsce docelowe rezerwacji"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Niedozwolona akcja !"
@@ -801,7 +801,7 @@ msgid "    Month-1    "
 msgstr "    Miesiąc-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Brak dziennika zakupów dla tej firmy: \"%s\" (id:%d)"
@@ -812,7 +812,7 @@ msgid "Manual"
 msgstr "Ręczne"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -934,7 +934,6 @@ msgid "Month"
 msgstr "Miesiąc"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Oczekuje potwierdzenia dostawcy"
@@ -1141,7 +1140,7 @@ msgid "Manual Invoices"
 msgstr "Ręczne faktury"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1158,7 +1157,7 @@ msgid "Extended Filters..."
 msgstr "Rozszerzone filtry..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1166,7 +1165,7 @@ msgstr ""
 "Nie zdefiniowano konta rozchodowego dla tego produktu: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1223,7 +1222,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1493,7 +1492,7 @@ msgid "Date Approved"
 msgstr "Data aprobowania"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Nie można anulować tego zamówienia zakupu !"
@@ -1608,7 +1607,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Suma ilości i kwot wg miesięcu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Nie można anulować zamówienia zakupu !"
@@ -1772,7 +1771,7 @@ msgstr ""
 "* Stan 'Anulowano' jest ustawiany po anulowaniu zamówienia."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Zamówienia zakupu '%s' zostało anulowane."
@@ -1852,7 +1851,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1973,9 +1972,6 @@ msgstr "Konsola zakupów"
 #~ msgid "After Purchase order , Create invoice."
 #~ msgstr "Po zamówieniu zakupu utwórz fakturę."
 
-#~ msgid "N°"
-#~ msgstr "Nr"
-
 #~ msgid "Invoice based on deliveries"
 #~ msgstr "Faktura wg dostaw"
 
@@ -1995,21 +1991,9 @@ msgstr "Konsola zakupów"
 #~ "Moduł do zarządzania zakupami\n"
 #~ "    Zapytanie ofertowe, Tworzenie faktury zakupu, Druk zamówienia..."
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Nie możesz mieć dwóch cenników nachodzących na siebie !"
-
 #~ msgid "Approving Purchase Order"
 #~ msgstr "Aprobowanie zamówień sprzedaży"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Zamówienia będą łączone tylko wtedy, jeśli są do tego samego partnera i do "
-#~ "tej samej strefy magazynowej, a pozycje będą łaczone tylko wtedy jeśli są "
-#~ "takie same z wyjątkiem ilości i jednostki miary."
-
 #~ msgid "Request For Quotations"
 #~ msgstr "Zapytania ofertowe"
 
@@ -2103,18 +2087,6 @@ msgstr "Konsola zakupów"
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Faktura dostawcy wygenerowana przy przyjęciu dla kontroli"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Ręczne w toku"
-
-#~ msgid "Quotation"
-#~ msgstr "Oferta"
-
-#~ msgid "In progress"
-#~ msgstr "W toku"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Czeka na planowanie"
-
 #~ msgid "Packing"
 #~ msgstr "Pobranie"
 
@@ -2142,84 +2114,5 @@ msgstr "Konsola zakupów"
 #~ msgid "When purchase order is approved , it creates its packing list."
 #~ msgstr "Kiedy zamówienie zakupu jest zaaprobowane, to jest tworzone pobranie"
 
-#~ msgid "To be Invoiced"
-#~ msgstr "Do zafakturowania"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Jeśli ustawisz fakturowanie w zamówieniu zakupu jako \"Ręcznie\", to "
-#~ "będziesz mógł wyszukiwać pozycje zamówień zakupu, dla których dostawca nie "
-#~ "wystawił faktury. Jeśli się spodziewasz faktury od dostawcy, to możesz "
-#~ "wygenerować projekt faktury od dostawcy na podstawie pozycji z tego menu."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Faktura wygenerowana dla zamówienia zakupu"
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Pozycje zakupów nie zafakturowane"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "W menu Zamówienia zakupu możesz sprawdzać stany zamówień: przyjęcia "
-#~ "produktów i zafakturowanie pozycji.\n"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Nazwa grupy musi być unikalna !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
-#~ msgid "Product UoM"
-#~ msgstr "JM produktu"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
-#~ msgid ""
-#~ "With the Requests for quotation menu you can create new request for "
-#~ "quotations, review existing one and confirm them to order once the supplier "
-#~ "offer is approved. When you confirm a RfQ, OpenERP will convert it to a "
-#~ "Purchase Order and generate the next steps: draft reception of the products, "
-#~ "invoice to control."
-#~ msgstr ""
-#~ "W menu Zapytania ofertowe możesz tworzyć nowe zapytania ofertowe, przeglądać "
-#~ "je i potwierdzać kiedy dostawca aprobuje zamówienie. Po potwierdzeniu "
-#~ "zapytania OpenERP skonwertuje je do zamówienia zakupu i wygeneruje następne "
-#~ "dokumenty: przyjęcie zewnętrzne i projekt faktury."
-
-#~ msgid ""
-#~ "Access your supplier records and maintain your relationship with them. You "
-#~ "can track all your interactions with them through the history tab: emails, "
-#~ "orders, meeting, etc."
-#~ msgstr ""
-#~ "Dostęp do historii relacji z dostawcą. Możesz przeglądać: wiadomości, "
-#~ "zamówienia, spotkania itp."
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Stosuj to menu do sprawdzania faktur otrzymywanych od dostawców. OpenERP "
-#~ "generuje projekty faktur na podstawie twoich zamówień zakupu lub przyjęć. "
-#~ "Kiedy otrzymasz fakturę od dostawcy, to możesz ją skonfrontować z projektami "
-#~ "faktur i zatwierdzić."
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 4ef1b193df2..3a713a2b118 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "fornecedor. A cotação torna-se numa ordem de compra confirmada."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Não pode confirmar uma ordem de compra sem linhas."
@@ -44,7 +44,7 @@ msgid "Destination"
 msgstr "Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -114,7 +114,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -137,7 +137,7 @@ msgid "From a Pick list"
 msgstr "A partir das receções"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem lista de preços"
@@ -230,7 +230,7 @@ msgid "Partial Picking"
 msgstr "Receção parcial"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "A ordem de compra '%s' está confirmada."
@@ -277,7 +277,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -353,7 +353,7 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Montante acima do limite"
@@ -407,7 +407,7 @@ msgid "Reference"
 msgstr "Referência"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Não pode eliminar ordens de compra no estado %s!"
@@ -429,7 +429,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "A ordem de compra '%s' passou ao estado rascunho."
@@ -446,8 +446,8 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -484,7 +484,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indica que a receção foi feita"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "UdM Errada!"
@@ -586,7 +586,7 @@ msgid "Order Lines"
 msgstr "Lindas da ordem"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Sem parceiro!"
@@ -635,9 +635,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -695,7 +695,7 @@ msgid "Reservation Destination"
 msgstr "Destino da reserva"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Acção Inválida!"
@@ -775,7 +775,7 @@ msgid "    Month-1    "
 msgstr "    Mês-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -787,7 +787,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -904,7 +904,6 @@ msgid "Month"
 msgstr "Mês"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Aguarda ação do fornecedor"
@@ -1110,7 +1109,7 @@ msgid "Manual Invoices"
 msgstr "Faturação Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1127,7 +1126,7 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos ..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1135,7 +1134,7 @@ msgstr ""
 "Não existe nenhuma conta de despesa definida para este artigo: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1184,7 +1183,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1450,7 +1449,7 @@ msgid "Date Approved"
 msgstr "Data de aprovação"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Não é possivel cancelar esta ordem de compra !"
@@ -1562,7 +1561,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Quantidades e valores por mês"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Não é possivel cancelar a ordem de compra !"
@@ -1581,7 +1580,7 @@ msgstr "Fevereiro"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1706,7 +1705,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "A ordem de compra '%s' foi cancelada."
@@ -1783,7 +1782,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1831,9 +1830,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter duas versões da lista de preços que se sobrepõem!"
-
 #~ msgid "Purchase Process"
 #~ msgstr "Processo de compra"
 
@@ -1867,15 +1863,6 @@ msgstr ""
 #~ msgid "Approved Purchase"
 #~ msgstr "Compra aprovada"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor note que as ordens só serão juntadas se forem do mesmo terceiro e "
-#~ "estiverem a ir na mesma posição, e as linhas serão juntadas se forem "
-#~ "exactamente os mesmos à excepção da quantidade e da unidade."
-
 #~ msgid "Merge purchases"
 #~ msgstr "Juntar compras"
 
@@ -2048,47 +2035,14 @@ msgstr ""
 #~ "Precisa primeiro cancelar todas as embalagens anexadas para esta ordem de "
 #~ "compra."
 
-#~ msgid "To be Invoiced"
-#~ msgstr "A ser facturado"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
 #~ msgid "You cannot have 2 pricelist versions that overlap!"
 #~ msgstr "Não pode ter duas versões de listas de preços que se sobreponham."
 
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura da vista!"
 
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Linhas de ordens de compra não faturadas"
 
-#~ msgid ""
-#~ "From the Purchase Orders menu, you can track the status of your orders: "
-#~ "products received, invoice received and controlled.\n"
-#~ msgstr ""
-#~ "A partir do menu 'Ordens de compra' pode seguir a situação das suas ordens: "
-#~ "artigos recebidos; Fatura recebida e verificada.\n"
-
-#~ msgid ""
-#~ "Use this menu to control the invoices to be received by your supplier. "
-#~ "OpenERP pre-generates draft of invoices based on your purchase orders or "
-#~ "your receptions. Once you receive a supplier invoice, you can control it "
-#~ "according to the draft of invoice and validate it."
-#~ msgstr ""
-#~ "Use este menu para controlar as faturas recebidas dos fornecedores. O "
-#~ "OpenERP gera faturas 'rascunho' com base nas ordens de compra ou nas "
-#~ "recepções. Assim que receber uma fatura, pode verifica-la contra a a fatura "
-#~ "rascunho e confirmá-la."
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM do artigo"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Uma fatura gerada por ordem de compra"
-
 #~ msgid "From Picking"
 #~ msgstr "A partir da receção"
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 8fb034b9764..a8e82a4db94 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-28 21:53+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
 "se torna um Pedido de compra confirmado."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -46,7 +46,7 @@ msgid "Destination"
 msgstr "Local Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -129,7 +129,7 @@ msgstr ""
 "controlar as faturas do fornecedor."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "O fornecedor selecionado somente vende este produto por %s"
@@ -152,7 +152,7 @@ msgid "From a Pick list"
 msgstr "Da Lista de Separação"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem Lista de Preços !"
@@ -245,7 +245,7 @@ msgid "Partial Picking"
 msgstr "Separação Parcial"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "O pedido de compra '%s' está confirmado."
@@ -292,7 +292,7 @@ msgid "Notes"
 msgstr "Observações"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -372,7 +372,7 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Valor de compra acima do limite."
@@ -426,7 +426,7 @@ msgid "Reference"
 msgstr "Referência"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Ordem(ns) de Compra com Status em %s não podem ser deletados"
@@ -448,7 +448,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "O Pedido de Compra '%s' foi colocado em Provisório."
@@ -465,8 +465,8 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -503,7 +503,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Isso indica que a Separação foi Feita"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "UdM do Produto errada !"
@@ -609,7 +609,7 @@ msgid "Order Lines"
 msgstr "Linhas do Pedido"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Sem Parceiro!"
@@ -664,9 +664,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Faturas geradas para um pedido de compra"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -731,7 +731,7 @@ msgid "Reservation Destination"
 msgstr "Reserva Destino"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação Inválida !"
@@ -815,7 +815,7 @@ msgid "    Month-1    "
 msgstr "    Mês-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Não há diário de compras definido para esta empresa: \"%s\" (id:%d)"
@@ -826,7 +826,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -948,7 +948,6 @@ msgid "Month"
 msgstr "Mês"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Aguardando Confirmação do Fornecedor"
@@ -1154,7 +1153,7 @@ msgid "Manual Invoices"
 msgstr "Faturamento Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1171,7 +1170,7 @@ msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
@@ -1179,7 +1178,7 @@ msgstr ""
 "No existe conta de despesas definida para este produto: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1238,7 +1237,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1511,7 +1510,7 @@ msgid "Date Approved"
 msgstr "Data da Aprovação"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Não é possível cancelar esta ordem de compra!"
@@ -1626,7 +1625,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Total Qtd e Valor por Mês"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Não foi possível cancelar o pedido de compra!"
@@ -1791,7 +1790,7 @@ msgstr ""
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Pedido de compra '%s' está cancelado."
@@ -1871,7 +1870,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1921,18 +1920,12 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Painel de Compras"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Você não pode ter 2 listas de preços que sobrepoem!"
-
 #~ msgid "Confirm Purchase Order"
 #~ msgstr "Confirmar Ordem de Compra"
 
 #~ msgid "Order Ref"
 #~ msgstr "Ref. Pedido"
 
-#~ msgid "N°"
-#~ msgstr "Nº"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist in the purchase form !\n"
@@ -1990,15 +1983,6 @@ msgstr "Painel de Compras"
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Fatura do fornecedor pré-gerada nos recebimentos para controle"
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Por favor note que as ordens só serão agrupadas se forem do mesmo parceiro e "
-#~ "estiverem indo para mesma localidade, e as linhas serão agrupadas se forem "
-#~ "exatamente iguais, com exceção da quantidade e da unidade."
-
 #~ msgid "Confirmed Purchase"
 #~ msgstr "Compra Confirmada"
 
@@ -2050,98 +2034,12 @@ msgstr "Painel de Compras"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definição da ação."
 
-#~ msgid "Extended filters..."
-#~ msgstr "Extended filters..."
-
-#~ msgid "To Invoice"
-#~ msgstr "Para Faturar"
-
-#~ msgid ""
-#~ "From Order: a draft invoice will be pre-generated based on the purchase "
-#~ "order. The accountant will just have to validate this invoice for control.\n"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-#~ msgstr ""
-#~ "From Order: a draft invoice will be pre-generated based on the purchase "
-#~ "order. The accountant will just have to validate this invoice for control.\n"
-#~ "From Picking: a draft invoice will be pre-generated based on validated "
-#~ "receptions.\n"
-#~ "Manual: no invoice will be pre-generated. The accountant will have to encode "
-#~ "manually."
-
-#~ msgid "Quotation Request"
-#~ msgstr "Requisição de Cotação"
-
-#~ msgid "This Year"
-#~ msgstr "Este Ano"
-
-#~ msgid "Launch"
-#~ msgstr "Executar"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ " Please note that:\n"
-#~ "\n"
-#~ "   Orders will only be merged if: \n"
-#~ "   * Purchase Orders are in draft \n"
-#~ "   * Purchase Orders belong to the same supplier \n"
-#~ "   * Purchase Orders are have same stock location, same pricelist \n"
-#~ "\n"
-#~ "    Lines will only be merged if: \n"
-#~ "   * Order lines are exactly the same except for the product,quantity and "
-#~ "unit \n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ " Please note that:\n"
-#~ "\n"
-#~ "   Orders will only be merged if: \n"
-#~ "   * Purchase Orders are in draft \n"
-#~ "   * Purchase Orders belong to the same supplier \n"
-#~ "   * Purchase Orders are have same stock location, same pricelist \n"
-#~ "\n"
-#~ "    Lines will only be merged if: \n"
-#~ "   * Order lines are exactly the same except for the product,quantity and "
-#~ "unit \n"
-#~ "\n"
-
-#~ msgid "Total Quantity per product"
-#~ msgstr "Total Quantity per product"
-
 #~ msgid "You cannot have 2 pricelist versions that overlap!"
 #~ msgstr "You cannot have 2 pricelist versions that overlap!"
 
-#~ msgid "Purchase Lines not Invoiced"
-#~ msgstr "Linhas de Ordens de Compras não Faturadas"
-
-#~ msgid "# of Products"
-#~ msgstr "# de Produtos"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
-#~ msgid "Draft Purchases"
-#~ msgstr "Compras em Rascunho"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "An invoice generated for a purchase order"
-
-#~ msgid "Purchase  Profile : Install Extra Modules"
-#~ msgstr "Purchase  Profile : Install Extra Modules"
-
-#~ msgid "Inventory Control"
-#~ msgstr "Controle de Inventário"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar menu recursivo."
-
-#~ msgid "7 Days"
-#~ msgstr "7 Dias"
-
 #~ msgid "Delivery & Invoices"
 #~ msgstr "Entrega & Faturamento"
 
@@ -2163,22 +2061,6 @@ msgstr "Painel de Compras"
 #~ msgid "Scheduled date"
 #~ msgstr "Data Prevista"
 
-#~ msgid ""
-#~ "Manages your Purchase Requisition and allow you to easily keep track and "
-#~ "manage all your purchase orders."
-#~ msgstr ""
-#~ "Manages your Purchase Requisition and allow you to easily keep track and "
-#~ "manage all your purchase orders."
-
-#~ msgid "Picking"
-#~ msgstr "Separação"
-
-#~ msgid "This Month"
-#~ msgstr "Este Mês"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules are not supported for osv_memory objects !"
-
 #~ msgid "Purchase Order lines"
 #~ msgstr "Linhas da Ordem de Compra"
 
@@ -2245,27 +2127,9 @@ msgstr "Painel de Compras"
 #~ msgid "Purchase order is confirmed by the user."
 #~ msgstr "Ordem de compra confirmada pelo usuário."
 
-#~ msgid "Manual in progress"
-#~ msgstr "Em andamento manual"
-
-#~ msgid "Quotation"
-#~ msgstr "Cotação"
-
-#~ msgid "In progress"
-#~ msgstr "Em andamento"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Aguardando Programação"
-
 #~ msgid "Date"
 #~ msgstr "Data"
 
-#~ msgid "To be Invoiced"
-#~ msgstr "A Faturar"
-
-#~ msgid "Product UoM"
-#~ msgstr "UdM do Produto"
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Linhas não faturadas do Pedido de Compra"
 
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index b1c3b86aafb..4f093b771f9 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -1475,7 +1475,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1511,7 +1511,7 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 20958481ac9..1b90abfe14a 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-04 15:03+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "confirmat devine o comandă de aprovizionare."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Nu puteți confirma comanda de aprovizionare fără linii de comandă."
@@ -44,7 +44,7 @@ msgid "Destination"
 msgstr "Destinație"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -126,7 +126,7 @@ msgstr ""
 "urmări produsele recepționate și controla facturile primite de la furnizori."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -149,7 +149,7 @@ msgid "From a Pick list"
 msgstr "Dintr-o lista de preluare"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Fără listă de preţ!"
@@ -243,7 +243,7 @@ msgid "Partial Picking"
 msgstr "Parțial preluat"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Comande de aprovizionare '%s' este confirmata."
@@ -290,7 +290,7 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -367,7 +367,7 @@ msgid "Cancelled"
 msgstr "Anulat"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Reference"
 msgstr "Referință"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -444,7 +444,7 @@ msgid "Day"
 msgstr "Zi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Comanda de aprovizionare '%s' a fost setata la starea de ciornă."
@@ -461,8 +461,8 @@ msgid "# of Lines"
 msgstr "# de linii"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -499,7 +499,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "UM produs greșită!"
@@ -605,7 +605,7 @@ msgid "Order Lines"
 msgstr "Poziţii comandă"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Fără partener!"
@@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Facturi generate dintr-o comandă de aprovizionare"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -721,7 +721,7 @@ msgid "Reservation Destination"
 msgstr "Destinaţie rezervare"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Acţiune invalidă!"
@@ -804,7 +804,7 @@ msgid "    Month-1    "
 msgstr "    Luna-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -815,7 +815,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -931,7 +931,6 @@ msgid "Month"
 msgstr "Luna"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1135,7 +1134,7 @@ msgid "Manual Invoices"
 msgstr "Facturare manuală"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1152,14 +1151,14 @@ msgid "Extended Filters..."
 msgstr "Filtre extinse..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1208,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1476,7 +1475,7 @@ msgid "Date Approved"
 msgstr "Dată aprobare"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Nu puteți anula această comandă de aprovizionare!"
@@ -1588,7 +1587,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Nu puteți anula comanda de aprovizionare!"
@@ -1732,7 +1731,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Comanda de aprovizionare '%s' este anulată."
@@ -1812,7 +1811,7 @@ msgid "Partner"
 msgstr "Partener"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 310b6825dcc..48335dbbf50 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-24 14:57+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "становится подтвержденным заказом на закупку."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Вы не можете подтвердить заказ на закупку без позиций в заказе."
@@ -44,7 +44,7 @@ msgid "Destination"
 msgstr "Место назначения"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -118,7 +118,7 @@ msgstr ""
 "ТМЦ, и контролировать счета поставщиков."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Выбранный поставщик продает ТМЦ только по %s"
@@ -141,7 +141,7 @@ msgid "From a Pick list"
 msgstr "Из комплектовочного листа"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Нет каталога !"
@@ -234,7 +234,7 @@ msgid "Partial Picking"
 msgstr "Частичное комплектование"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Заказ на закупку '%s' подтвержден."
@@ -281,7 +281,7 @@ msgid "Notes"
 msgstr "Примечания"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -360,7 +360,7 @@ msgid "Cancelled"
 msgstr "Отменено"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Закупленное количество сверх лимита"
@@ -414,7 +414,7 @@ msgid "Reference"
 msgstr "Ссылка"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Нельзя удалить Заказ(ы) на закупку в стадии %s !"
@@ -436,7 +436,7 @@ msgid "Day"
 msgstr "День"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Заказ на закупку '%s' был установлен в состояние \"Черновик\"."
@@ -453,8 +453,8 @@ msgid "# of Lines"
 msgstr "Кол-во позиций"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -491,7 +491,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Показывает, что комплектование выполнено."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Неверная ед. изм."
@@ -596,7 +596,7 @@ msgid "Order Lines"
 msgstr "Позиции заказа"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Нет партнера!"
@@ -645,9 +645,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Счета созданные для заказа на закупку"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -705,7 +705,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Неверное действие !"
@@ -785,7 +785,7 @@ msgid "    Month-1    "
 msgstr "    Месяц-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Журнал закупок не определен для этой компании:  \"%s\" (id:%d)"
@@ -796,7 +796,7 @@ msgid "Manual"
 msgstr "Вручную"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -914,7 +914,6 @@ msgid "Month"
 msgstr "Месяц"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Ожидание"
@@ -1118,7 +1117,7 @@ msgid "Manual Invoices"
 msgstr "Счета вручную"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1135,14 +1134,14 @@ msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1191,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1460,7 +1459,7 @@ msgid "Date Approved"
 msgstr "Дата утверждения"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Не удалось отменить этот заказ на закупку"
@@ -1572,7 +1571,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Общее кол-во и сумма по месяцу"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Не удалось отменить заказ на закупку !"
@@ -1724,7 +1723,7 @@ msgstr ""
 "пользователем заказа на закупку."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Заказ на закупку '%s' отменен."
@@ -1804,7 +1803,7 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1854,18 +1853,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Панель закупок"
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Невозможно использовать 2 перекрывающиеся версии каталогов!"
-
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Учтите, что заказы могут быть объединены, только если они относятся к одному "
-#~ "партнеру и местоположению, а позиции могут быть объединены, только если они "
-#~ "абсолютно одинаковы, кроме количества."
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Выполняемые заказы на закупку"
 
@@ -2021,15 +2008,6 @@ msgstr "Панель закупок"
 #~ msgstr ""
 #~ "Предварительно созданный счет поставщика для контроля основанного на заказе"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Выполняется вручную"
-
-#~ msgid "In progress"
-#~ msgstr "Выполняется"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Расписание ожидания"
-
 #~ msgid "From Picking"
 #~ msgstr "Из прихода"
 
@@ -2061,9 +2039,6 @@ msgstr "Панель закупок"
 #~ msgid "Request For Quotations"
 #~ msgstr "Запрос цен"
 
-#~ msgid "Quotation"
-#~ msgstr "Предложение (оферта)"
-
 #~ msgid ""
 #~ "Module for purchase management\n"
 #~ "    Request for quotation, Create Supplier Invoice, Print Order..."
@@ -2077,47 +2052,5 @@ msgstr "Панель закупок"
 #~ msgid "Product Receipt"
 #~ msgstr "Получение ТМЦ"
 
-#~ msgid ""
-#~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
-#~ "track here all the purchase order lines for which you did not received the "
-#~ "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
-#~ "can generate a draft supplier invoice based on the lines from this menu."
-#~ msgstr ""
-#~ "Если, при заказе на закупку, вы установили метод управления счетами "
-#~ "\"Вручную\", то здесь вы можете отслеживать все позиции заказа на закупку на "
-#~ "которые вы не получили  счет от поставщика. При готовности получить счет от "
-#~ "поставщика, вы можете создать черновик счета основанный на позициях заказа "
-#~ "из этого меню."
-
-#~ msgid "To be Invoiced"
-#~ msgstr "Счет будет выставлен"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
-
-#~ msgid "An invoice generated for a purchase order"
-#~ msgstr "Счет созданный для заказа на закупку"
-
 #~ msgid "Purchase Lines Not Invoiced"
 #~ msgstr "Закупаемые позиции без счетов"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Название группы должно быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Product UoM"
-#~ msgstr "Ед. изм. ТМЦ"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Правила не поддерживаются в объектах osv_memory !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index eb93ab484b2..6802175f609 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Nemôžete potvrdiť objednávku bez objednávky v zozname."
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr "Cieľ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Vybraný dodávateľ predáva produkt %s"
@@ -136,7 +136,7 @@ msgid "From a Pick list"
 msgstr "Vyberte zo zoznamu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Žiadny cenník !"
@@ -222,7 +222,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -269,7 +269,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -343,7 +343,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -397,7 +397,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -436,8 +436,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -474,7 +474,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -574,7 +574,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -623,9 +623,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -683,7 +683,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -761,7 +761,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -772,7 +772,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -886,7 +886,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1089,7 +1088,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1106,14 +1105,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1160,7 +1159,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1420,7 +1419,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1532,7 +1531,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1676,7 +1675,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1753,7 +1752,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index f6cd7ae855a..9d80b7e205c 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr "Cilj"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ni cenika!"
@@ -224,7 +224,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -271,7 +271,7 @@ msgid "Notes"
 msgstr "Opombe"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -345,7 +345,7 @@ msgid "Cancelled"
 msgstr "Preklicano"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -399,7 +399,7 @@ msgid "Reference"
 msgstr "Sklic"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -421,7 +421,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -438,8 +438,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -476,7 +476,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -576,7 +576,7 @@ msgid "Order Lines"
 msgstr "Postavke naloga"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Ni partnerja!"
@@ -625,9 +625,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -685,7 +685,7 @@ msgid "Reservation Destination"
 msgstr "Cilj rezervacije"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Nepravilno dejanje!"
@@ -763,7 +763,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -774,7 +774,7 @@ msgid "Manual"
 msgstr "Ročno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -888,7 +888,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1091,7 +1090,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1108,14 +1107,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1162,7 +1161,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1428,7 +1427,7 @@ msgid "Date Approved"
 msgstr "Odobreno dne"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1540,7 +1539,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1559,7 +1558,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1684,7 +1683,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1761,7 +1760,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1807,18 +1806,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr ""
 
-#~ msgid "You can not have 2 pricelist version that overlaps!"
-#~ msgstr "Ne morete imeti 2 različic cenika, ki se prekrivata."
-
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Prosim, vedite, da bodo nalogi združeni samo, če so namenjeni istemu "
-#~ "partnerju in lokaciji. Postavke bodo združene samo, če so popolnoma enake, "
-#~ "razen v količini in enoti."
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Nabavni nalogi v teku"
 
@@ -1868,6 +1855,3 @@ msgstr ""
 
 #~ msgid "Packing"
 #~ msgstr "Pakiranje"
-
-#~ msgid "N°"
-#~ msgstr "N°"
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index efe6a6db7d9..cfac8534d84 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -760,7 +760,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1550,7 +1549,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1675,7 +1674,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index ddd8b010c7a..3b1a4f7e9a0 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: 2011-07-23 04:55+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr "Odredište"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -274,7 +274,7 @@ msgid "Notes"
 msgstr "Napomene"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -348,7 +348,7 @@ msgid "Cancelled"
 msgstr "Otkazano"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -402,7 +402,7 @@ msgid "Reference"
 msgstr "Referenca"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Ne mogu da izbrisem nabavne nalog(e) koji su u %s Stanju !"
@@ -424,7 +424,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -441,8 +441,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -479,7 +479,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -579,7 +579,7 @@ msgid "Order Lines"
 msgstr "Redovi naloga"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -628,9 +628,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -688,7 +688,7 @@ msgid "Reservation Destination"
 msgstr "Odredište rezervacije"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -766,7 +766,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -777,7 +777,7 @@ msgid "Manual"
 msgstr "Ručno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -893,7 +893,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1096,7 +1095,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1113,14 +1112,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1167,7 +1166,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1434,7 +1433,7 @@ msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1546,7 +1545,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1565,7 +1564,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1690,7 +1689,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1767,7 +1766,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -2001,15 +2000,3 @@ msgstr ""
 
 #~ msgid "Request For Quotations"
 #~ msgstr "Zahtevi za ponudu"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Rucno uredjenje u toku"
-
-#~ msgid "Quotation"
-#~ msgstr "Upit"
-
-#~ msgid "In progress"
-#~ msgstr "U toku"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Cekanje Zakazanog"
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index 51c198f13d7..f3c6af3d628 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr "Odredište"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -274,7 +274,7 @@ msgid "Notes"
 msgstr "Napomene"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -348,7 +348,7 @@ msgid "Cancelled"
 msgstr "Otkazano"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -402,7 +402,7 @@ msgid "Reference"
 msgstr "Referenca"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Ne mogu da izbrisem nabavne nalog(e) koji su u %s Stanju !"
@@ -424,7 +424,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -441,8 +441,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -479,7 +479,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -579,7 +579,7 @@ msgid "Order Lines"
 msgstr "Redovi naloga"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -628,9 +628,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -688,7 +688,7 @@ msgid "Reservation Destination"
 msgstr "Odredište rezervacije"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -766,7 +766,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -777,7 +777,7 @@ msgid "Manual"
 msgstr "Ručno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -893,7 +893,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1096,7 +1095,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1113,14 +1112,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1167,7 +1166,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1434,7 +1433,7 @@ msgid "Date Approved"
 msgstr "Datum odobrenja"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1546,7 +1545,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1565,7 +1564,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1690,7 +1689,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1767,7 +1766,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -2001,15 +2000,3 @@ msgstr ""
 
 #~ msgid "Request For Quotations"
 #~ msgstr "Zahtevi za ponudu"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Rucno uredjenje u toku"
-
-#~ msgid "Quotation"
-#~ msgstr "Upit"
-
-#~ msgid "In progress"
-#~ msgstr "U toku"
-
-#~ msgid "Waiting Schedule"
-#~ msgstr "Cekanje Zakazanog"
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 7ce399da019..30986c6e224 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: 2011-08-05 04:39+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Du kan inte bekräfta beställningen utan inköpsorder"
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr "Destination"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -136,7 +136,7 @@ msgid "From a Pick list"
 msgstr "Från plocklista"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "No Pricelist !"
@@ -229,7 +229,7 @@ msgid "Partial Picking"
 msgstr "Delvis plockning"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Inköpsorder '%s' är bekräftad."
@@ -276,7 +276,7 @@ msgid "Notes"
 msgstr "Anteckningar"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -350,7 +350,7 @@ msgid "Cancelled"
 msgstr "Cancelled"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -404,7 +404,7 @@ msgid "Reference"
 msgstr "Reference"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Kan inte radera order/ordrar som är i %s tillstånd!"
@@ -426,7 +426,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -443,8 +443,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -481,7 +481,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Wrong Product UOM !"
@@ -563,12 +563,12 @@ msgstr "Tel.:"
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr "Picking List"
+msgstr "Plocklista"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "Skriv ut"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
@@ -581,7 +581,7 @@ msgid "Order Lines"
 msgstr "Order Lines"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "No Partner!"
@@ -630,9 +630,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -690,7 +690,7 @@ msgid "Reservation Destination"
 msgstr "Reservation Destination"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Invalid action !"
@@ -768,7 +768,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -779,7 +779,7 @@ msgid "Manual"
 msgstr "Manual"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -895,7 +895,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1099,7 +1098,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1116,14 +1115,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "There is no expense account defined for this product: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr "You must first cancel all invoices attached to this purchase order."
@@ -1170,7 +1169,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1437,7 +1436,7 @@ msgid "Date Approved"
 msgstr "Datum godkänd"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Could not cancel this purchase order !"
@@ -1549,7 +1548,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Could not cancel purchase order !"
@@ -1568,7 +1567,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1693,7 +1692,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1770,7 +1769,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index eb6d20c7bea..708bcaa31cc 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr ""
 "จากนั้นใบแจ้งขอใบเสนอราคาจึงจะเปลี่ยนเป็นใบสั่งซื้อสถานะยืนยัน"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "คุณไม่สามารถยืนยันใบสั่งซื้อที่ไม่มีรายการสั่งซื้อได้"
@@ -45,7 +45,7 @@ msgid "Destination"
 msgstr "ปลายทาง"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -124,7 +124,7 @@ msgstr ""
 "้วเท่าใด"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -147,7 +147,7 @@ msgid "From a Pick list"
 msgstr "สร้างจากใบรับ/จ่ายสินค้า"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "ไม่มีรายการาคา!"
@@ -239,7 +239,7 @@ msgid "Partial Picking"
 msgstr "ทยอยส่ง"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "ใบสั่งซื้อ '%s' นี้ถูกยืนยันแล้ว"
@@ -286,7 +286,7 @@ msgid "Notes"
 msgstr "บันทึก"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -365,7 +365,7 @@ msgid "Cancelled"
 msgstr "ยกเลิกแล้ว"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "จำนวนเงินที่ซื้อเกินขีดจำกัด"
@@ -419,7 +419,7 @@ msgid "Reference"
 msgstr "เลขที่"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "ไม่สามารถลบใบสั่งซื้อที่อยู่ในสถานะ %s ได้!"
@@ -441,7 +441,7 @@ msgid "Day"
 msgstr "วัน"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "ใบสั่งซื้อ '%s' ถูกเปลี่ยนเป็นสถานะฉบับร่างแล้ว"
@@ -458,8 +458,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -496,7 +496,7 @@ msgid "It indicates that a picking has been done"
 msgstr "ช่องนี้บ่งบอกถึงการจัดส่งสินค้าเสร็จสมบูรณ์"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "หน่วยของสินค้าไม่ถูกต้อง!"
@@ -601,7 +601,7 @@ msgid "Order Lines"
 msgstr "รายการสั่งซื้อ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "ไม่พบผู้จัดจำหน่าย!"
@@ -656,9 +656,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "ใบแจ้งหนี้ที่สร้างขึ้นสำหรับการสั่งซื้อ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -716,7 +716,7 @@ msgid "Reservation Destination"
 msgstr "ปลายทางการจอง"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "การกระทำไม่ถูกต้อง !"
@@ -794,7 +794,7 @@ msgid "    Month-1    "
 msgstr "    เดือน - 1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -805,7 +805,7 @@ msgid "Manual"
 msgstr "กำหนดเอง"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -920,7 +920,6 @@ msgid "Month"
 msgstr "เดือน"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1123,7 +1122,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1140,14 +1139,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1194,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1454,7 +1453,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1566,7 +1565,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1585,7 +1584,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1710,7 +1709,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1787,7 +1786,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index ad499e448b0..eebe4256b17 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -395,7 +395,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -472,7 +472,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -759,7 +759,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1549,7 +1548,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1674,7 +1673,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 4c8efc204f6..52ba5cd56b9 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.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-12-16 04:39+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -26,7 +26,7 @@ msgstr ""
 "bir Satınalma Siparişi haline gelir."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -45,7 +45,7 @@ msgid "Destination"
 msgstr "Hedef"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -127,7 +127,7 @@ msgstr ""
 "ürünleri izleyebilir ve tedarikçi faturalarını kontrol edebilirsiniz."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Seçilen tedarikçi bu ürünün sadece %s'ini satar"
@@ -150,7 +150,7 @@ msgid "From a Pick list"
 msgstr "Alım listesinden"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "Fiyat listesi yok!"
@@ -244,7 +244,7 @@ msgid "Partial Picking"
 msgstr "Kısmi Alım"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Satınalma siparişi '%s' onaylandı."
@@ -291,7 +291,7 @@ msgid "Notes"
 msgstr "Notlar"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -369,7 +369,7 @@ msgid "Cancelled"
 msgstr "İptal Edildi"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Satınalma miktarı limitin üzerinde"
@@ -423,7 +423,7 @@ msgid "Reference"
 msgstr "Referans"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "%s Durumundaki Satınalma Sipariş(ler)i silinemez!"
@@ -445,7 +445,7 @@ msgid "Day"
 msgstr "Gün"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Satınalma siparişi '%s' taslak olarak ayarlandı."
@@ -462,8 +462,8 @@ msgid "# of Lines"
 msgstr "# / Satır"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -500,7 +500,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Bir alım gerçekleştirildiğini gösterir"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Hatalı Birim!"
@@ -606,7 +606,7 @@ msgid "Order Lines"
 msgstr "Sipariş Kalemleri"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr "Ortak yok!"
@@ -661,9 +661,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Bir satınalma siparişi için oluşturulan faturalar"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -727,7 +727,7 @@ msgid "Reservation Destination"
 msgstr "Rezervasyon Yeri"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Geçersiz işlem!"
@@ -811,7 +811,7 @@ msgid "    Month-1    "
 msgstr "    Ay-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -823,7 +823,7 @@ msgid "Manual"
 msgstr "Manuel"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -945,7 +945,6 @@ msgid "Month"
 msgstr "Ay"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Tedarikçi Onayı Bekleniyor"
@@ -1151,7 +1150,7 @@ msgid "Manual Invoices"
 msgstr "Manuel Faturalar"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1168,14 +1167,14 @@ msgid "Extended Filters..."
 msgstr "Uzatılmış Filtreler..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Bu ürün için belirtilen masraf tutarı yok: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1234,7 +1233,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1503,7 +1502,7 @@ msgid "Date Approved"
 msgstr "Onaylanmış Tarih"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Bu satınalma siparişi iptal edilemedi!"
@@ -1618,7 +1617,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Aylık Toplam Miktar ve Tutar"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Satınalma siparişi iptal edilemedi!"
@@ -1784,7 +1783,7 @@ msgstr ""
 "edildi' durumu ayarlanır."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Satınalma siparişi '%s' iptal edildi."
@@ -1864,7 +1863,7 @@ msgid "Partner"
 msgstr "Ortak"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index eca571737ee..50192074c87 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -269,7 +269,7 @@ msgid "Notes"
 msgstr "Примітки"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -343,7 +343,7 @@ msgid "Cancelled"
 msgstr "Скасовано"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -397,7 +397,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -436,8 +436,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -474,7 +474,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -574,7 +574,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -623,9 +623,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -683,7 +683,7 @@ msgid "Reservation Destination"
 msgstr "Ціль резервування"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -761,7 +761,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -772,7 +772,7 @@ msgid "Manual"
 msgstr "Ручний"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -886,7 +886,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1089,7 +1088,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1106,14 +1105,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1160,7 +1159,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1426,7 +1425,7 @@ msgid "Date Approved"
 msgstr "Затверджена дата"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1538,7 +1537,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1557,7 +1556,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1682,7 +1681,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1759,7 +1758,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1805,16 +1804,6 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr ""
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Зауваження. Замовлення будуть об'єднані лище тоді, коли вони відносяться до "
-#~ "одного партнера і направляються до одного пункту призначення. Рядки будуть "
-#~ "об'єднані лише тоді, коли вони співпадають у всьому, крім кількості та "
-#~ "одиниці виміру."
-
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Заявка на придбання в обробці"
 
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 10d13529fd8..3762f2620f6 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-07-31 06:20+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-08-01 04:39+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -43,7 +43,7 @@ msgid "Destination"
 msgstr "Điểm đến"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -112,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -221,7 +221,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -268,7 +268,7 @@ msgid "Notes"
 msgstr "Ghi chú"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -342,7 +342,7 @@ msgid "Cancelled"
 msgstr "Đã hủy bỏ"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Reference"
 msgstr "Tham chiếu"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -418,7 +418,7 @@ msgid "Day"
 msgstr "Ngày"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -435,8 +435,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -473,7 +473,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -573,7 +573,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -622,9 +622,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -682,7 +682,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "Hành động không hợp lệ!"
@@ -760,7 +760,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -771,7 +771,7 @@ msgid "Manual"
 msgstr "Thủ công"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -885,7 +885,6 @@ msgid "Month"
 msgstr "Tháng"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1088,7 +1087,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1105,14 +1104,14 @@ msgid "Extended Filters..."
 msgstr "Bộ lọc mở rộng..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1159,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1419,7 +1418,7 @@ msgid "Date Approved"
 msgstr "Ngày được chấp thuận"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1531,7 +1530,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1550,7 +1549,7 @@ msgstr "Tháng Hai"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1675,7 +1674,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1752,7 +1751,7 @@ msgid "Partner"
 msgstr "Đối tác"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1801,21 +1800,12 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
 #~ msgid "You cannot have 2 pricelist versions that overlap!"
 #~ msgstr "Bạn không thể có 2 phiên bản bảng giá chồng chéo nhau!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Lỗi ! Bạn không thể tạo trình đơn đệ quy."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Tên nhóm phải duy nhất !"
-
 #~ msgid ""
 #~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 #~ "Item!"
@@ -1823,17 +1813,8 @@ msgstr ""
 #~ "Lỗi! Bạn không thể chỉ định bảng giá chính là bảng giá khác trong các mục "
 #~ "bảng giá!"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Tên đối tượng phải được bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc "
 #~ "biệt nào!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1 !"
-
-#~ msgid "Product UoM"
-#~ msgstr "Đơn vị đo của sản phẩm"
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index b93c40c12f2..9e67dc54b69 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -7,24 +7,24 @@ 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-28 02:07+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
-msgstr "询价单(RFQ) 必须先得到采购经理核准才能发给供应商。 询价单能确认为采购订单。"
+msgstr "询价单(RFQ) 必须先得到采购经理审批后才能发给供应商。 询价单能确认为采购订单。"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "采购订单无明细，您不能确认。"
@@ -32,7 +32,7 @@ msgstr "采购订单无明细，您不能确认。"
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr "已开票并付清"
+msgstr "已开票 & 付清"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
@@ -42,17 +42,17 @@ msgid "Destination"
 msgstr "目的地"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
 "of the product"
-msgstr "您选择的产品计量单位与产品的采购单位是同一的类型。"
+msgstr "您选择的产品计量单位要与该产品的采购单位同一的类型。"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr "文档生成日期"
+msgstr "单据生成日期"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -66,8 +66,8 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
-"当您向供应商购买产品时您能创建一个询价但采购还没确认。询价基于您的后勤规则(最少库存，MTO(按单生产)等)。询价确认后转为采购订单。如果您使用扩展接口("
-"在用户偏好里)，您能选择控制供应商开发票的习惯：基于这订单，基于接收或者手动。"
+"当您还没确认采购时您可以先创建一个询价单。询价单基于您的物料规则 (最少库存，MTO(按单生产)等) "
+"自动创建。您能把询价确认后转为采购订单。如果您使用扩展接口(在用户偏好里)，您能选择控制供应商的开票方式：基于该订单，基于接收或者手动。"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -110,10 +110,10 @@ msgid ""
 "Use this menu to search within your purchase orders by references, supplier, "
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
-msgstr "使用这菜单按关联单号，供应商，产品等搜索您的采购订单，您可以跟踪接收的产品和控制供应商的发票。"
+msgstr "使用这菜单按单号，供应商，产品等搜索您的采购订单，您可以跟踪接收的产品和控制供应商的发票。"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "选择的供应商只销售这产品  %s"
@@ -136,7 +136,7 @@ msgid "From a Pick list"
 msgstr "来自装箱单"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr "没有价格表！"
@@ -151,7 +151,7 @@ msgstr "数量"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr "选择开启的销售订单"
+msgstr "选择待处理的销售订单"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -195,7 +195,7 @@ msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
-msgstr "填入一个地址，如果您想直接提供从供应商送货到客户。在这情况下它将删除仓库链接并设定客户库位。"
+msgstr "如果您想直接从供应商送货到客户，请填入地址。在这情况下它将删除仓库链接并设定客户库位。"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -214,7 +214,7 @@ msgstr "传真 ："
 msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
-msgstr "设定采购订单价格表使用的币别。它还计算出选定产品/数量的供应商价格。"
+msgstr "价格表设定采购订单使用的币别。它还决定选定产品/数量的供应商价格。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
@@ -222,7 +222,7 @@ msgid "Partial Picking"
 msgstr "部分装箱单"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "采购订单 '%s' 已经确认。"
@@ -230,7 +230,7 @@ msgstr "采购订单 '%s' 已经确认。"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr "批准采购"
+msgstr "审批采购"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -238,7 +238,7 @@ msgstr "批准采购"
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr "已核准"
+msgstr "已审批"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -269,19 +269,17 @@ msgid "Notes"
 msgstr "备注"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
-msgstr ""
-"请在采购窗口选择价格表或供应商！\n"
-"然后再选择产品。"
+msgstr "请在采购界面选择价格表或供应商！然后再选择产品。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr "9"
+msgstr "9月"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -312,7 +310,7 @@ msgstr "单号"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr "净总额："
+msgstr "净合计:"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -335,7 +333,7 @@ msgstr "设置进度"
 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 "装箱单生成一发票，然后这发票控制销售订单，发票是基于交付的或订单上的数量。"
+msgstr "装箱单生成发票，销售订单控制生成的发票，发票是基于已交付或已经下单的数量。"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -345,10 +343,10 @@ msgid "Cancelled"
 msgstr "已取消"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
-msgstr "采购金额超过限额"
+msgstr "采购金额超过限定"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -391,7 +389,7 @@ msgstr "手动更正"
 #. module: purchase
 #: view:purchase.report:0
 msgid "   Month   "
-msgstr "   月   "
+msgstr "   月份   "
 
 #. module: purchase
 #: view:purchase.order:0
@@ -399,7 +397,7 @@ msgid "Reference"
 msgstr "单号"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "无法删除 %s 状态的采购订单"
@@ -407,7 +405,7 @@ msgstr "无法删除 %s 状态的采购订单"
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr "目的地址联系人名"
+msgstr "目的地址联系人姓名"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
@@ -421,7 +419,7 @@ msgid "Day"
 msgstr "天"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "采购订单 “%s” 已经设为草稿"
@@ -438,8 +436,8 @@ msgid "# of Lines"
 msgstr "# 明细"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -476,7 +474,7 @@ msgid "It indicates that a picking has been done"
 msgstr "这表示装箱单已完成"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "错误的产品计量单位！"
@@ -523,7 +521,7 @@ msgstr "供应商单号"
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr "税额"
+msgstr "税金"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -531,7 +529,7 @@ msgid ""
 "A Pick list generates a supplier invoice. Depending on the Invoicing control "
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
-msgstr "装箱单生成供应商发票。采购订单控制发票，发票是基于接收或订单的数量。"
+msgstr "装箱单生成供应商发票。采购订单控制发票，发票是基于已接收或已下单数量。"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -576,10 +574,10 @@ msgid "Order Lines"
 msgstr "订单明细"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
-msgstr "缺少业务伙伴！"
+msgstr "没业务伙伴！"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -590,7 +588,7 @@ msgstr "传真:"
 #: view:purchase.report:0
 #: field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr "总价格"
+msgstr "总价"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -625,12 +623,12 @@ 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:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -688,7 +686,7 @@ msgid "Reservation Destination"
 msgstr "预定目的地"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr "无效动作！"
@@ -703,7 +701,7 @@ msgstr "完成"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr "7"
+msgstr "7月"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
@@ -731,7 +729,7 @@ msgstr "接收"
 #: field:purchase.order,validator:0
 #: view:purchase.report:0
 msgid "Validated by"
-msgstr "审批人"
+msgstr "审核人"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -741,7 +739,7 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
-"使用这菜单控制您供应商收到的发票。系统根据您的设定从您的采购订单或者收货单生成发票草稿。一旦您收到供应商的发票，您可以匹配发票的草稿并审核它。"
+"使用这菜单控制您从供应商收到的发票。系统根据您的设定从您的采购订单或收货生成发票草稿。一旦您收到供应商的发票，您可以匹配发票的草稿并审核它。"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -767,10 +765,10 @@ msgid "    Month-1    "
 msgstr "    上月    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-msgstr "公司没定义这采购分录序时薄：\"%s\" (id:%d)"
+msgstr "公司没定义这采购账簿：\"%s\" (id:%d)"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -778,7 +776,7 @@ msgid "Manual"
 msgstr "手动"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr "您必须先取消这采购订单的所有装箱单。"
@@ -798,7 +796,7 @@ msgstr "控制接收的产品"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr "同意"
+msgstr "审批"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -813,7 +811,7 @@ msgid ""
 "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
 "can generate a draft supplier invoice based on the lines from this menu."
 msgstr ""
-"如果您设定采购订单的发票控制是”手动“。您能跟踪还没有收到供应商发票的所有采购订单的明细。一旦您收到供应商发票从这菜单您基于这些明细能生成发票草稿。"
+"如果您设定采购订单的发票控制是”手动“。您能跟踪还没有收到供应商发票的所有采购订单的明细。一旦您收到供应商发票从这菜单您基于这些明细生成发票草稿。"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -831,12 +829,12 @@ msgstr "管理分析配送和采购订单"
 msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
-msgstr "这计算所有采购订单明细产品的最小计划日期"
+msgstr "计算所有采购订单明细产品的最小计划日期"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr "8"
+msgstr "8月"
 
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
@@ -869,7 +867,7 @@ msgstr "需求单"
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr "发票列表"
+msgstr "发票"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
@@ -884,16 +882,15 @@ msgstr "图像"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr "按用户每月的总订单明细"
+msgstr "按用户每月的订单明细汇总"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "等该供应商回复"
@@ -901,7 +898,7 @@ msgstr "等该供应商回复"
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr "询价:"
+msgstr "询价单:"
 
 #. module: purchase
 #: view:board.board:0
@@ -929,7 +926,7 @@ msgstr "采购的产品"
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr "从采购中已生成装箱单"
+msgstr "这采购已生成装箱单"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -941,7 +938,7 @@ msgstr "采购管理"
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr "等待会计审核。"
+msgstr "等待会计复核。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
@@ -1003,7 +1000,7 @@ msgstr "采购订单明细"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关业务伙伴。"
+msgstr "错误！您不能创建递归的协会会员。"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1037,7 +1034,7 @@ msgid ""
 "A purchase order generates a supplier invoice, as soon as it is confirmed by "
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
-msgstr "一旦买方确认根据采购订单的发票控制，一个采购订单生成一个供应商发票，发票根据收到或订购的数量。"
+msgstr "一旦买方确认根据采购订单开发票，一个采购订单生成一个供应商发票，发票根据已收到或已下单的数量。"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1068,22 +1065,22 @@ msgstr "Qty. per product"
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "您尝试分配一个来自其它产品的批次"
+msgstr "您尝试为不同的产品分配批次"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr "文档的创建日期"
+msgstr "单据的创建日期"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr "6"
+msgstr "6月"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
@@ -1096,16 +1093,16 @@ msgid "Manual Invoices"
 msgstr "手工发票"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
-msgstr "有人刚确认一个超过默认限制金额的采购"
+msgstr "有人刚确认一个超过默认限定金额的采购"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr "11"
+msgstr "11月"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1113,14 +1110,14 @@ msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "未定义此产品“%s“ (id:%d)的费用科目"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr "您必须先取消掉附加到此采购订单上的所有发票。"
@@ -1144,7 +1141,7 @@ msgstr "异常"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr "10"
+msgstr "10月"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1175,7 +1172,7 @@ msgstr ""
 "    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1185,7 +1182,7 @@ msgstr "这选定的供应商设定的最少采购数量为 %s，您不能采购
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr "1"
+msgstr "1月"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
@@ -1205,7 +1202,7 @@ msgstr "必须为此产品赋予一个生产批次"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr "生成装箱单跟踪入库的产品"
+msgstr "生成装箱单用来跟踪入库的产品"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
@@ -1227,7 +1224,7 @@ msgstr "价格表类型"
 #: view:purchase.order:0
 #: view:purchase.report:0
 msgid "Quotations"
-msgstr "报价单"
+msgstr "询价单"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
@@ -1243,18 +1240,18 @@ msgstr "日志"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr "分类的产品"
+msgstr "产品分类"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr "审批日期"
+msgstr "审核日期"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr "相关文档生成这采购订单申请"
+msgstr "生成这采购订单申请的相关单据"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1267,11 +1264,11 @@ msgid ""
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
 "采购订单或询价单的状态。\r\n"
-"    询价单是采购订单的‘草稿’状态。\r\n"
-"    订单被用户确确认为‘已确认’状态。\r\n"
-"    然后订单的供应商必须确认这时状态改为为‘已核准’。 \r\n"
-"    当采购订单支付和已收货状态变为‘完成’。\r\n"
-"    如果在开发票或接收产品时执行取消操作状态将变为‘异常’。"
+" 询价单是采购订单的‘草稿’状态。\r\n"
+"订单被用户确认为‘已确认’状态。\r\n"
+"然后订单的供应商必须确认这时状态改为为‘已审批’。 \r\n"
+"当采购订单支付和已收货状态变为‘完成’。 \r\n"
+"如果在开发票或接收产品时执行取消操作状态将变为‘异常’。"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1287,7 +1284,7 @@ msgstr "询价单"
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr "采购订单核准的日期"
+msgstr "采购订单审批日期"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -1304,13 +1301,13 @@ msgstr "默认采购价格表版本"
 #: view:purchase.installer:0
 msgid ""
 "Extend your Purchases Management Application with additional functionalities."
-msgstr "扩展您采购管理的应用并增加功能"
+msgstr "扩展您采购管理应用并增加功能"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_install_module
 #: view:purchase.installer:0
 msgid "Purchases Application Configuration"
-msgstr "采购管理应用程序设置"
+msgstr "采购应用设置"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -1331,7 +1328,7 @@ msgstr "发票"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr "12"
+msgstr "12月"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1351,7 +1348,7 @@ msgstr "采购订单明细"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr "供应商核准了这采购订单。"
+msgstr "供应商审批了这采购订单。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1374,7 +1371,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
@@ -1427,7 +1424,7 @@ msgstr "仓库"
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr "询价请求"
+msgstr "询价单"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1438,10 +1435,10 @@ msgstr "要求日期"
 #: field:purchase.order,date_approve:0
 #: field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr "已核准日期"
+msgstr "审批日期"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "无法取消此采购订单！"
@@ -1460,7 +1457,7 @@ msgstr "交付 & 开发票"
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr "预定日期"
+msgstr "计划日期"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
@@ -1488,7 +1485,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
 #: report:purchase.quotation:0
@@ -1523,7 +1520,7 @@ msgstr "交付"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr "询价请求"
+msgstr "询价单"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1553,7 +1550,7 @@ msgid "Total Qty and Amount by month"
 msgstr "按月度的总数量和总金额"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "无法取消采购订单！"
@@ -1563,12 +1560,12 @@ msgstr "无法取消采购订单！"
 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 "如果这产品没有供应商，买方可以手动填写并确认。这询价单能通过确认转换为采购订单。"
+msgstr "在这业务产品没有供应商，买方可以手动填写并确认。这询价单能通过确认转换为采购订单。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr "2"
+msgstr "2月"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
@@ -1584,7 +1581,7 @@ msgstr "采购分析"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr "你订单"
+msgstr "您的订单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1592,7 +1589,7 @@ msgstr "你订单"
 #: report:purchase.quotation:0
 #: field:purchase.report,expected_date:0
 msgid "Expected Date"
-msgstr "预定日期"
+msgstr "预计日期"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
@@ -1624,12 +1621,12 @@ msgstr "采购控制"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr "3"
+msgstr "3月"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr "4"
+msgstr "4月"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1681,12 +1678,12 @@ msgstr "开票方式"
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr "核准"
+msgstr "审批"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr "待核准"
+msgstr "待审批"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1705,12 +1702,12 @@ msgid ""
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
 " “草稿”状态当采购订单在草稿状态是自动设置\n"
-"“确认”状态当采购订单在确认状态时自动设置为确认\n"
-"“完成”状态当采购订单完成自动设置\n"
-"“取消”状态当用户取消采购订单时自动设置"
+"“已确认”状态当采购订单在确认状态时自动设置为确认\n"
+"“已完成”状态当采购订单完成自动设置\n"
+"“已取消”状态当用户取消采购订单时自动设置"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "采购订单 “%s” 已经取消"
@@ -1760,7 +1757,7 @@ msgstr "总金额"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr "5"
+msgstr "5月"
 
 #. module: purchase
 #: field:res.company,po_lead:0
@@ -1787,7 +1784,7 @@ msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -2013,12 +2010,6 @@ msgstr "采购控制台"
 #~ msgid "Approving Purchase Order"
 #~ msgstr "通过采购订单"
 
-#~ msgid "To be Invoiced"
-#~ msgstr "待开票"
-
-#~ msgid "Product UoM"
-#~ msgstr "货品计量单位"
-
 #~ msgid "From Picking"
 #~ msgstr "来自装箱单"
 
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 480ae47ab84..6c74fa1a99c 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: 2011-07-23 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:292
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -220,7 +220,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/purchase.py:296
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -267,7 +267,7 @@ msgid "Notes"
 msgstr "注解"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:649
+#: code:addons/purchase/purchase.py:660
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -341,7 +341,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:305
+#: code:addons/purchase/purchase.py:315
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -355,18 +355,18 @@ msgstr ""
 #: 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
 msgid "Shipping Exception"
-msgstr ""
+msgstr "貨運異常"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "發票明細"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
@@ -395,7 +395,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -417,7 +417,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:334
+#: code:addons/purchase/purchase.py:344
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -434,8 +434,8 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
-#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:735
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -464,15 +464,15 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr "订单行"
+msgstr "訂單明細"
 
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "代表已完成提貨"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:710
+#: code:addons/purchase/purchase.py:721
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -572,7 +572,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -621,9 +621,9 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:282
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:292
 #: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -681,7 +681,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/purchase.py:244
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -759,7 +759,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:363
+#: code:addons/purchase/purchase.py:373
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -770,7 +770,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:400
+#: code:addons/purchase/purchase.py:410
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -884,7 +884,6 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr ""
@@ -1087,7 +1086,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:308
+#: code:addons/purchase/purchase.py:318
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1104,14 +1103,14 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:408
+#: code:addons/purchase/purchase.py:418
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1158,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:696
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1303,12 +1302,12 @@ msgstr ""
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice"
-msgstr "发票"
+msgstr "發票"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1317,13 +1316,13 @@ msgstr ""
 #: view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "Cancel"
-msgstr ""
+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
@@ -1398,13 +1397,13 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
-msgstr "仓库"
+msgstr "倉庫"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "要求報價(RFQ)。"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1418,7 +1417,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:407
+#: code:addons/purchase/purchase.py:417
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1530,7 +1529,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:399
+#: code:addons/purchase/purchase.py:409
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1549,7 +1548,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: purchase
@@ -1586,12 +1585,12 @@ msgstr ""
 #: report:purchase.order:0
 #: field:purchase.order,date_order:0
 msgid "Date Ordered"
-msgstr "订购日期"
+msgstr "訂單日期"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "貨運地址 :"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1674,7 +1673,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:414
+#: code:addons/purchase/purchase.py:424
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1751,7 +1750,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:651
+#: code:addons/purchase/purchase.py:662
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 7eb1ed88d24..0dc015834a0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -165,7 +165,7 @@ class purchase_order(osv.osv):
             help="Reference of the document that generated this purchase order request."
         ),
         'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64),
-        'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
+        '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),
         'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
@@ -188,11 +188,10 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoiced & Paid', 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','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True,
-            help="From Order: a draft invoice will be generated based on the purchase order. The accountant " \
-                "will just have to validate this invoice for control.\n" \
-                "From Reception: a draft invoice will be generated based on validated receptions.\n" \
-                "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on receptions')], 'Invoicing Control', required=True,
+            help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' frow where you can selectively create an invoice.\n" \
+                "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."
         ),
         'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
             store = {
@@ -228,7 +227,7 @@ class purchase_order(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
     }
     _sql_constraints = [
-        ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+        ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _name = "purchase.order"
     _description = "Purchase Order"
@@ -241,7 +240,7 @@ class purchase_order(osv.osv):
             if s['state'] in ['draft','cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!')  % _(dict(purchase_order.STATE_SELECTION).get(s['state'])))
+                raise osv.except_osv(_('Invalid action !'), _('In order to delete a purchase order, it must be cancelled first!'))
 
         # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
         # automatically sending subflow.delete upon deletion
@@ -254,31 +253,32 @@ class purchase_order(osv.osv):
     def button_dummy(self, cr, uid, ids, context=None):
         return True
 
-    def onchange_dest_address_id(self, cr, uid, ids, adr_id):
-        if not adr_id:
+    def onchange_dest_address_id(self, cr, uid, ids, address_id):
+        if not address_id:
             return {}
+        address = self.pool.get('res.partner.address')
         values = {'warehouse_id': False}
-        part_id = self.pool.get('res.partner.address').browse(cr, uid, adr_id).partner_id
-        if part_id:
-            loc_id = part_id.property_stock_customer.id
-            values.update({'location_id': loc_id})
+        supplier = address.browse(cr, uid, address_id).partner_id
+        if supplier:
+            location_id = supplier.property_stock_customer.id
+            values.update({'location_id': location_id})
         return {'value':values}
 
     def onchange_warehouse_id(self, cr, uid, ids, warehouse_id):
         if not warehouse_id:
             return {}
-        res = self.pool.get('stock.warehouse').read(cr, uid, [warehouse_id], ['lot_input_id'])[0]['lot_input_id'][0]
-        return {'value':{'location_id': res, 'dest_address_id': False}}
+        warehouse = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id)
+        return {'value':{'location_id': warehouse.lot_input_id.id, 'dest_address_id': False}}
 
-    def onchange_partner_id(self, cr, uid, ids, part):
-
-        if not part:
+    def onchange_partner_id(self, cr, uid, ids, partner_id):
+        partner = self.pool.get('res.partner')
+        if not partner_id:
             return {'value':{'partner_address_id': False, 'fiscal_position': False}}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
-        part = self.pool.get('res.partner').browse(cr, uid, part)
-        pricelist = part.property_product_pricelist_purchase.id
-        fiscal_position = part.property_account_position and part.property_account_position.id or False
-        return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
+        supplier_address = partner.address_get(cr, uid, [partner_id], ['default'])
+        supplier = partner.browse(cr, uid, partner_id)
+        pricelist = supplier.property_product_pricelist_purchase.id
+        fiscal_position = supplier.property_account_position and supplier.property_account_position.id or False
+        return {'value':{'partner_address_id': supplier_address['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
@@ -289,7 +289,7 @@ class purchase_order(osv.osv):
         todo = []
         for po in self.browse(cr, uid, ids, context=context):
             if not po.order_line:
-                raise osv.except_osv(_('Error !'),_('You can not confirm purchase order without Purchase Order Lines.'))
+                raise osv.except_osv(_('Error !'),_('You cannot confirm a purchase order without any lines.'))
             for line in po.order_line:
                 if line.state=='draft':
                     todo.append(line.id)
@@ -300,7 +300,7 @@ class purchase_order(osv.osv):
         for id in ids:
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
         return True
-
+    # Dead code:
     def wkf_warn_buyer(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state' : 'wait', 'validator' : uid})
         request = pooler.get_pool(cr.dbname).get('res.request')
@@ -319,17 +319,25 @@ class purchase_order(osv.osv):
                        'ref_partner_id': po.partner_id.id,
                        'ref_doc1': 'purchase.order,%d' % (po.id,),
                 })
-    def inv_line_create(self, cr, uid, a, ol):
-        return (0, False, {
-            'name': ol.name,
-            'account_id': a,
-            'price_unit': ol.price_unit or 0.0,
-            'quantity': ol.product_qty,
-            'product_id': ol.product_id.id or False,
-            'uos_id': ol.product_uom.id or False,
-            'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
-            'account_analytic_id': ol.account_analytic_id.id or False,
-        })
+
+    def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
+        """Collects require data from purchase order line that is used to create invoice line 
+        for that purchase order line
+        :param account_id: Expense account of the product of PO line if any.
+        :param browse_record order_line: Purchase order line browse record
+        :return: Value for fields of invoice lines.
+        :rtype: dict
+        """
+        return {
+            'name': order_line.name,
+            'account_id': account_id,
+            'price_unit': order_line.price_unit or 0.0,
+            'quantity': order_line.product_qty,
+            'product_id': order_line.product_id.id or False,
+            'uos_id': order_line.product_uom.id or False,
+            'invoice_line_tax_id': [(6, 0, [x.id for x in order_line.taxes_id])],
+            'account_analytic_id': order_line.account_analytic_id.id or False,
+        }
 
     def action_cancel_draft(self, cr, uid, ids, *args):
         if not len(ids):
@@ -345,52 +353,71 @@ class purchase_order(osv.osv):
             self.log(cr, uid, id, message)
         return True
 
-    def action_invoice_create(self, cr, uid, ids, *args):
+    def action_invoice_create(self, cr, uid, ids, context=None):
+        """Generates invoice for given ids of purchase orders and links that invoice ID to purchase order.
+        :param ids: list of ids of purchase orders.
+        :return: ID of created invoice.
+        :rtype: int
+        """
         res = False
 
         journal_obj = self.pool.get('account.journal')
-        for o in self.browse(cr, uid, ids):
-            il = []
-            todo = []
-            for ol in o.order_line:
-                todo.append(ol.id)
-                if ol.product_id:
-                    a = ol.product_id.product_tmpl_id.property_account_expense.id
-                    if not a:
-                        a = ol.product_id.categ_id.property_account_expense_categ.id
-                    if not a:
-                        raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') % (ol.product_id.name, ol.product_id.id,))
-                else:
-                    a = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category').id
-                fpos = o.fiscal_position or False
-                a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
-                il.append(self.inv_line_create(cr, uid, a, ol))
+        inv_obj = self.pool.get('account.invoice')
+        inv_line_obj = self.pool.get('account.invoice.line')
+        fiscal_obj = self.pool.get('account.fiscal.position')
+        property_obj = self.pool.get('ir.property')
 
-            a = o.partner_id.property_account_payable.id
-            journal_ids = journal_obj.search(cr, uid, [('type', '=','purchase'),('company_id', '=', o.company_id.id)], limit=1)
+        for order in self.browse(cr, uid, ids, context=context):
+            pay_acc_id = order.partner_id.property_account_payable.id
+            journal_ids = journal_obj.search(cr, uid, [('type', '=','purchase'),('company_id', '=', order.company_id.id)], limit=1)
             if not journal_ids:
                 raise osv.except_osv(_('Error !'),
-                    _('There is no purchase journal defined for this company: "%s" (id:%d)') % (o.company_id.name, o.company_id.id))
-            inv = {
-                'name': o.partner_ref or o.name,
-                'reference': o.partner_ref or o.name,
-                'account_id': a,
+                    _('There is no purchase journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
+
+            # generate invoice line correspond to PO line and link that to created invoice (inv_id) and PO line
+            inv_lines = []
+            for po_line in order.order_line:
+                if po_line.product_id:
+                    acc_id = po_line.product_id.product_tmpl_id.property_account_expense.id
+                    if not acc_id:
+                        acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
+                    if not acc_id:
+                        raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') % (po_line.product_id.name, po_line.product_id.id,))
+                else:
+                    acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category').id
+                fpos = order.fiscal_position or False
+                acc_id = fiscal_obj.map_account(cr, uid, fpos, acc_id)
+
+                inv_line_data = self._prepare_inv_line(cr, uid, acc_id, po_line, context=context)
+                inv_line_id = inv_line_obj.create(cr, uid, inv_line_data, context=context)
+                inv_lines.append(inv_line_id)
+
+                po_line.write({'invoiced':True, 'invoice_lines': [(4, inv_line_id)]}, context=context)
+
+            # get invoice data and create invoice
+            inv_data = {
+                'name': order.partner_ref or order.name,
+                'reference': order.partner_ref or order.name,
+                'account_id': pay_acc_id,
                 'type': 'in_invoice',
-                'partner_id': o.partner_id.id,
-                'currency_id': o.pricelist_id.currency_id.id,
-                'address_invoice_id': o.partner_address_id.id,
-                'address_contact_id': o.partner_address_id.id,
+                'partner_id': order.partner_id.id,
+                'currency_id': order.pricelist_id.currency_id.id,
+                'address_invoice_id': order.partner_address_id.id,
+                'address_contact_id': order.partner_address_id.id,
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
-                'origin': o.name,
-                'invoice_line': il,
-                'fiscal_position': o.fiscal_position.id or o.partner_id.property_account_position.id,
-                'payment_term': o.partner_id.property_payment_term and o.partner_id.property_payment_term.id or False,
-                'company_id': o.company_id.id,
+                'invoice_line': [(6, 0, inv_lines)], 
+                'origin': order.name,
+                'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
+                'payment_term': order.partner_id.property_payment_term and order.partner_id.property_payment_term.id or False,
+                'company_id': order.company_id.id,
             }
-            inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
-            self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)
-            self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True})
-            self.write(cr, uid, [o.id], {'invoice_ids': [(4, inv_id)]})
+            inv_id = inv_obj.create(cr, uid, inv_data, context=context)
+
+            # compute the invoice
+            inv_obj.button_compute(cr, uid, [inv_id], context=context, set_total=True)
+
+            # Link this new invoice to related purchase order
+            order.write({'invoice_ids': [(4, inv_id)]}, context=context)
             res = inv_id
         return res
 
@@ -402,79 +429,111 @@ class purchase_order(osv.osv):
         return False
 
     def action_cancel(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
         for purchase in self.browse(cr, uid, ids, context=context):
             for pick in purchase.picking_ids:
                 if pick.state not in ('draft','cancel'):
                     raise osv.except_osv(
-                        _('Could not cancel purchase order !'),
-                        _('You must first cancel all picking attached to this purchase order.'))
+                        _('Unable to cancel this purchase order!'),
+                        _('You must first cancel all receptions related to this purchase order.'))
             for pick in purchase.picking_ids:
-                wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
             for inv in purchase.invoice_ids:
                 if inv and inv.state not in ('cancel','draft'):
                     raise osv.except_osv(
-                        _('Could not cancel this purchase order !'),
-                        _('You must first cancel all invoices attached to this purchase order.'))
+                        _('Unable to cancel this purchase order!'),
+                        _('You must first cancel all invoices related to this purchase order.'))
                 if inv:
-                    wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
-        for (id,name) in self.name_get(cr, uid, ids):
+        
+        for (id, name) in self.name_get(cr, uid, ids):
+            wf_service.trg_validate(uid, 'purchase.order', id, 'purchase_cancel', cr)
             message = _("Purchase order '%s' is cancelled.") % name
             self.log(cr, uid, id, message)
         return True
 
+    def _prepare_order_picking(self, cr, uid, order, *args):
+        return {
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
+            'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
+            'date': order.date_order,
+            'type': 'in',
+            'address_id': order.dest_address_id.id or order.partner_address_id.id,
+            'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
+            'purchase_id': order.id,
+            'company_id': order.company_id.id,
+            'move_lines' : [],
+        }
+         
+    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, *args):
+        return {
+            'name': order.name + ': ' + (order_line.name or ''),
+            'product_id': order_line.product_id.id,
+            'product_qty': order_line.product_qty,
+            'product_uos_qty': order_line.product_qty,
+            'product_uom': order_line.product_uom.id,
+            'product_uos': order_line.product_uom.id,
+            'date': order_line.date_planned,
+            'date_expected': order_line.date_planned,
+            'location_id': order.partner_id.property_stock_supplier.id,
+            'location_dest_id': order.location_id.id,
+            'picking_id': picking_id,
+            'address_id': order.dest_address_id.id or order.partner_address_id.id,
+            'move_dest_id': order_line.move_dest_id.id,
+            'state': 'draft',
+            'purchase_line_id': order_line.id,
+            'company_id': order.company_id.id,
+            'price_unit': order_line.price_unit
+        }
+
+    def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, *args):
+        """Creates pickings and appropriate stock moves for given order lines, then
+        confirms the moves, makes them available, and confirms the picking.
+
+        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: purchase order to which the order lines belong
+        :param list(browse_record) order_lines: purchase order line records for which picking
+                                                and moves should be created.
+        :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 omitted.
+        :return: list of IDs of pickings used/created for the given order lines (usually just one)
+        """
+        if not picking_id: 
+            picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, *args))
+        todo_moves = []
+        stock_move = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
+        for order_line in order_lines:
+            if not order_line.product_id:
+                continue
+            if order_line.product_id.type in ('product', 'consu'):
+                move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, *args))
+                if order_line.move_dest_id:
+                    order_line.move_dest_id.write({'location_id': order.location_id.id})
+                todo_moves.append(move)
+        stock_move.action_confirm(cr, uid, todo_moves)
+        stock_move.force_assign(cr, uid, todo_moves)
+        wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+        return [picking_id]
+
     def action_picking_create(self,cr, uid, ids, *args):
-        picking_id = False
+        picking_ids = []
         for order in self.browse(cr, uid, ids):
-            loc_id = order.partner_id.property_stock_supplier.id
-            istate = 'none'
-            if order.invoice_method=='picking':
-                istate = '2binvoiced'
-            pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in')
-            picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                'name': pick_name,
-                'origin': order.name+((order.origin and (':'+order.origin)) or ''),
-                'type': 'in',
-                'address_id': order.dest_address_id.id or order.partner_address_id.id,
-                'invoice_state': istate,
-                'purchase_id': order.id,
-                'company_id': order.company_id.id,
-                'move_lines' : [],
-            })
-            todo_moves = []
-            for order_line in order.order_line:
-                if not order_line.product_id:
-                    continue
-                if order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
-                    dest = order.location_id.id
-                    move = self.pool.get('stock.move').create(cr, uid, {
-                        'name': order.name + ': ' +(order_line.name or ''),
-                        'product_id': order_line.product_id.id,
-                        'product_qty': order_line.product_qty,
-                        'product_uos_qty': order_line.product_qty,
-                        'product_uom': order_line.product_uom.id,
-                        'product_uos': order_line.product_uom.id,
-                        'date': order_line.date_planned,
-                        'date_expected': order_line.date_planned,
-                        'location_id': loc_id,
-                        'location_dest_id': dest,
-                        'picking_id': picking_id,
-                        'move_dest_id': order_line.move_dest_id.id,
-                        'state': 'draft',
-                        'purchase_line_id': order_line.id,
-                        'company_id': order.company_id.id,
-                        'price_unit': order_line.price_unit
-                    })
-                    if order_line.move_dest_id:
-                        self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
-                    todo_moves.append(move)
-            self.pool.get('stock.move').action_confirm(cr, uid, todo_moves)
-            self.pool.get('stock.move').force_assign(cr, uid, todo_moves)
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-        return picking_id
+            picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, *args))
+
+        # Must return one unique picking ID: the one to connect in the subflow of the purchase order.
+        # In case of multiple (split) pickings, we should return the ID of the critical one, i.e. the
+        # one that should trigger the advancement of the purchase workflow.
+        # By default we will consider the first one as most important, but this behavior can be overridden.
+        return picking_ids[0] if picking_ids else False
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -489,7 +548,6 @@ class purchase_order(osv.osv):
         })
         return super(purchase_order, self).copy(cr, uid, id, default, context)
 
-
     def do_merge(self, cr, uid, ids, context=None):
         """
         To merge similar type of purchase orders.
@@ -509,6 +567,7 @@ class purchase_order(osv.osv):
          @return: new purchase order id
 
         """
+        #TOFIX: merged order line should be unlink
         wf_service = netsvc.LocalService("workflow")
         def make_key(br, fields):
             list_key = []
@@ -539,7 +598,7 @@ class purchase_order(osv.osv):
             if not order_infos:
                 order_infos.update({
                     'origin': porder.origin,
-                    'date_order': time.strftime('%Y-%m-%d'),
+                    'date_order': porder.date_order,
                     'partner_id': porder.partner_id.id,
                     'partner_address_id': porder.partner_address_id.id,
                     'dest_address_id': porder.dest_address_id.id,
@@ -552,6 +611,8 @@ class purchase_order(osv.osv):
                     'fiscal_position': porder.fiscal_position and porder.fiscal_position.id or False,
                 })
             else:
+                if porder.date_order < order_infos['date_order']:
+                    order_infos['date_order'] = porder.date_order
                 if porder.notes:
                     order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
                 if porder.origin:
@@ -612,9 +673,17 @@ class purchase_order_line(osv.osv):
             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.char('Description', size=256, required=True),
-        'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
         'date_planned': fields.date('Scheduled Date', required=True, select=True),
         'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
@@ -639,6 +708,7 @@ 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,
@@ -653,9 +723,14 @@ class purchase_order_line(osv.osv):
         default.update({'state':'draft', 'move_ids':[],'invoiced':0,'invoice_lines':[]})
         return super(purchase_order_line, self).copy_data(cr, uid, id, default, context)
 
+    #TOFIX:
+    # - name of method should "onchange_product_id"
+    # - docstring
+    # - merge 'product_uom_change' method
+    # - split into small internal methods for clearity 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
-            name=False, price_unit=False, notes=False):
+            name=False, price_unit=False, notes=False, context={}):
         if not pricelist:
             raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
         if not  partner_id:
@@ -697,7 +772,7 @@ class purchase_order_line(osv.osv):
                 temp_qty = s.min_qty # supplier _qty assigned to temp
                 if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
                     qty = temp_qty
-                    res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s, you cannot purchase less.') % qty}})
+                    res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s, you should not purchase less.') % qty}})
         qty_in_product_uom = product_uom_pool._compute_qty(cr, uid, uom, qty, to_uom_id=prod.uom_id.id)
         price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
                     product, qty_in_product_uom or 1.0, partner_id, {
@@ -726,12 +801,14 @@ class purchase_order_line(osv.osv):
         res['domain'] = domain
         return res
 
+    #TOFIX:
+    # - merge into 'product_id_change' method
     def product_uom_change(self, cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
-            name=False, price_unit=False, notes=False):
+            name=False, price_unit=False, notes=False, context={}):
         res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom,
                 partner_id, date_order=date_order, fiscal_position=fiscal_position, date_planned=date_planned,
-            name=name, price_unit=price_unit, notes=notes)
+            name=name, price_unit=price_unit, notes=notes, context=context)
         if 'product_uom' in res['value']:
             if uom and (uom != res['value']['product_uom']) and res['value']['product_uom']:
                 seller_uom_name = self.pool.get('product.uom').read(cr, uid, [res['value']['product_uom']], ['name'])[0]['name']
@@ -761,6 +838,23 @@ class procurement_order(osv.osv):
         res = res.values()
         return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
 
+    def create_procurement_purchase_order(self, cr, uid, procurement, po_vals, line_vals, context=None):
+        """Create the purchase order from the procurement, using
+           the provided field values, after adding the given purchase
+           order line in the purchase order.
+
+           :params procurement: the procurement object generating the purchase order
+           :params dict po_vals: field values for the new purchase order (the
+                                 ``order_line`` field will be overwritten with one
+                                 single line, as passed in ``line_vals``).
+           :params dict line_vals: field values of the single purchase order line that
+                                   the purchase order will contain.
+           :return: id of the newly created purchase order
+           :rtype: int
+        """
+        po_vals.update({'order_line': [(0,0,line_vals)]})
+        return self.pool.get('purchase.order').create(cr, uid, po_vals, context=context)
+
     def make_po(self, cr, uid, ids, context=None):
         """ Make purchase order from procurement
         @return: New created Purchase Orders procurement wise
@@ -774,7 +868,8 @@ class procurement_order(osv.osv):
         pricelist_obj = self.pool.get('product.pricelist')
         prod_obj = self.pool.get('product.product')
         acc_pos_obj = self.pool.get('account.fiscal.position')
-        po_obj = self.pool.get('purchase.order')
+        seq_obj = self.pool.get('ir.sequence')
+        warehouse_obj = self.pool.get('stock.warehouse')
         for procurement in self.browse(cr, uid, ids, context=context):
             res_id = procurement.move_id.id
             partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
@@ -783,7 +878,7 @@ class procurement_order(osv.osv):
             partner_id = partner.id
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
-
+            warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id or company.id)], context=context)
             uom_id = procurement.product_id.uom_po_id.id
 
             qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
@@ -792,62 +887,44 @@ class procurement_order(osv.osv):
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id]
 
-            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
-            newdate = (newdate - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay)
+            order_date = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
+            schedule_date = (order_date - relativedelta(days=company.po_lead))
+            order_dates = schedule_date - relativedelta(days=seller_delay)
 
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang': partner.lang, 'partner_id': partner_id})
 
             product = prod_obj.browse(cr, uid, procurement.product_id.id, context=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)
 
-            line = {
+            line_vals = {
                 'name': product.partner_ref,
                 'product_qty': qty,
                 'product_id': procurement.product_id.id,
                 'product_uom': uom_id,
-                'price_unit': price,
-                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                'price_unit': price or 0.0,
+                'date_planned': schedule_date.strftime('%Y-%m-%d %H:%M:%S'),
                 'move_dest_id': res_id,
                 'notes': product.description_purchase,
+                'taxes_id': [(6,0,taxes)],
             }
-
-            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)
-            line.update({
-                'taxes_id': [(6,0,taxes)]
-            })
-            purchase_id = po_obj.create(cr, uid, {
+            name = seq_obj.get(cr, uid, 'purchase.order') or _('PO: %s') % procurement.name
+            po_vals = {
+                'name': name,
                 'origin': procurement.origin,
                 'partner_id': partner_id,
                 'partner_address_id': address_id,
                 'location_id': procurement.location_id.id,
+                'warehouse_id': warehouse_id and warehouse_id[0] or False,
                 'pricelist_id': pricelist_id,
-                'order_line': [(0,0,line)],
+                'date_order': order_dates.strftime('%Y-%m-%d %H:%M:%S'),
                 'company_id': procurement.company_id.id,
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
-            })
-            res[procurement.id] = purchase_id
-            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
+            }
+            res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=context)
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
         return res
 
 procurement_order()
-
-class stock_invoice_onshipping(osv.osv_memory):
-    _inherit = "stock.invoice.onshipping"
-
-    def create_invoice(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        res = super(stock_invoice_onshipping,self).create_invoice(cr, uid, ids, context=context)
-        purchase_obj = self.pool.get('purchase.order')
-        picking_obj = self.pool.get('stock.picking')
-        for pick_id in res:
-            pick = picking_obj.browse(cr, uid, pick_id, context=context)
-            if pick.purchase_id:
-                purchase_obj.write(cr, uid, [pick.purchase_id.id], {
-                    'invoice_ids': [(4, res[pick_id])]}, context=context)
-        return res
-
-stock_invoice_onshipping()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 6aa98f8cf6c..6999f85b076 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -6,198 +6,14 @@
             <field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
         </record>
 
-    <!--Resource: purchase.order-->
-
-        <record id="order_purchase1" model="purchase.order">
-            <field name="location_id" ref="stock.stock_location_stock"/>
-            <field name="pricelist_id" ref="purchase.list0"/>
-            <field name="partner_id" ref="base.res_partner_asus"/>
-            <field name="partner_address_id" ref="base.res_partner_address_tang"/>
-        </record>
-
-        <record id="order_purchase2" model="purchase.order">
-            <field name="location_id" ref="stock.stock_location_stock"/>
-            <field name="pricelist_id" ref="purchase.list0"/>
-            <field name="partner_id" ref="base.res_partner_3"/>
-            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
-        </record>
-
-        <record id="order_purchase3" model="purchase.order">
-            <field name="location_id" ref="stock.stock_location_stock"/>
-            <field name="pricelist_id" ref="purchase.list0"/>
-            <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
-            <field name="partner_address_id" ref="base.res_partner_address_3000"/>
-        </record>
-
-        <record id="order_purchase4" model="purchase.order">
-            <field name="location_id" ref="stock.stock_location_stock"/>
-            <field name="pricelist_id" ref="purchase.list0"/>
-            <field name="partner_id" ref="base.res_partner_4"/>
-            <field name="partner_address_id" ref="base.res_partner_address_7"/>
-        </record>
-
-        <record id="order_purchase5" model="purchase.order">
-            <field name="location_id" ref="stock.stock_location_stock"/>
-            <field name="pricelist_id" ref="purchase.list0"/>
-            <field name="partner_id" ref="base.res_partner_maxtor"/>
-            <field name="partner_address_id" ref="base.res_partner_address_wong"/>
-        </record>
-
-        <record id="order_purchase6" model="purchase.order">
-            <field name="location_id" ref="stock.stock_location_stock"/>
-            <field name="pricelist_id" ref="purchase.list0"/>
-            <field name="partner_id" ref="base.res_partner_vickingdirect0"/>
-            <field name="partner_address_id" ref="base.res_partner_address_brussels0"/>
-        </record>
-        <!--Resource: purchase.order.line-->
-
-        <record id="line1_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase1"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">New server config + material</field>
-            <field model="product.product" name="product_id" search="[]"/>
-            <field model="product.uom" name="product_uom" search="[]"/>
-            <field name="price_unit">150</field>
-            <field name="product_qty">5</field>
-        </record>
-
-        <record id="line2_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase1"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[PC1] Basic PC</field>
-            <field name="product_id" ref="product.product_product_pc1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">450</field>
-            <field name="product_qty">2</field>
-        </record>
-
-        <record id="line3_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase2"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[PC3] Medium PC</field>
-            <field name="product_id" ref="product.product_product_pc3"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">900</field>
-            <field name="product_qty">1</field>
-        </record>
-
-        <record id="line4_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase3"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">Onsite Senior Intervention</field>
-            <field name="product_id" ref="product.product_product_0"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">900</field>
-            <field name="product_qty">10</field>
-        </record>
-
-        <record id="line5_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase3"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">Onsite Intervention</field>
-            <field name="product_id" ref="product.product_product_1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">100</field>
-            <field name="product_qty">5</field>
-        </record>
-
-        <record id="line6_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase4"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[PC2] Basic+ PC (assembly on order)</field>
-            <field name="product_id" ref="product.product_product_pc2"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">40</field>
-            <field name="product_qty">5</field>
-        </record>
-
-        <record id="line7_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase4"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
-            <field name="product_id" ref="product.product_product_mb1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">45</field>
-            <field name="product_qty">15</field>
-        </record>
-
-        <record id="line8_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase4"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[MB2] Mainboard ASUStek A7V8X-X</field>
-            <field name="product_id" ref="product.product_product_mb2"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">45</field>
-            <field name="product_qty">15</field>
-        </record>
-
-        <record id="line9_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase5"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[CPU1] Processor AMD Athlon XP 1800+</field>
-            <field name="product_id" ref="product.product_product_cpu1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">60</field>
-            <field name="product_qty">3</field>
-        </record>
-
-        <record id="line10_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase5"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[CPU3] Processor AMD Athlon XP 2200+</field>
-            <field name="product_id" ref="product.product_product_cpu3"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">50</field>
-            <field name="product_qty">13</field>
-        </record>
-
-        <record id="line11_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase5"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[HDD1] HDD Seagate 7200.8 80GB</field>
-            <field name="product_id" ref="product.product_product_hdd1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">70</field>
-            <field name="product_qty">10</field>
-        </record>
-
-        <record id="line12_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase6"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[HDD2] HDD Seagate 7200.8 120GB</field>
-            <field name="product_id" ref="product.product_product_hdd2"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">70</field>
-            <field name="product_qty">10</field>
-        </record>
-
-        <record id="line12_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase6"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[RAM] DDR 256MB PC400</field>
-            <field name="product_id" ref="product.product_product_ram"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">700</field>
-            <field name="product_qty">10</field>
-        </record>
-
-        <record id="line13_purchase" model="purchase.order.line">
-            <field name="order_id" ref="order_purchase6"/>
-            <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
-            <field name="name">[RAM512] DDR 512MB PC400</field>
-            <field name="product_id" ref="product.product_product_ram512"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">1700</field>
-            <field name="product_qty">10</field>
-        </record>
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
-        <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase4"/>
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase6"/>
 
         <record id="stock.res_company_tinyshop0" model="res.company">
             <field eval="1.0" name="po_lead"/>
             <field eval="80.0" name="schedule_range"/>
         </record>
+
     </data>
 </openerp>
 
diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml
new file mode 100644
index 00000000000..abfaa102033
--- /dev/null
+++ b/addons/purchase/purchase_order_demo.yml
@@ -0,0 +1,76 @@
+-
+  !record {model: purchase.order, id: order_purchase1}:
+    partner_id: base.res_partner_asus
+    invoice_method: order
+    order_line:
+      - product_id: product.product_product_pc2
+        price_unit: 150.50
+        product_qty: 5.0
+      - product_id: product.product_product_pc1
+        price_unit: 450.20
+        product_qty: 2.0
+
+-
+  !record {model: purchase.order, id: order_purchase2}:
+    partner_id: base.res_partner_3
+    invoice_method: picking
+    order_line:
+      - product_id: product.product_product_pc3
+        price_unit: 900
+
+-
+  !record {model: purchase.order, id: order_purchase3}:
+    partner_id: base.res_partner_desertic_hispafuentes
+    order_line:
+      - product_id: product.product_product_0
+        price_unit: 900.20
+        product_qty: 10.0
+      - product_id: product.product_product_1
+        price_unit: 100.00
+        product_qty: 5
+
+-
+  !record {model: purchase.order, id: order_purchase4}:
+    partner_id: base.res_partner_4
+    order_line:
+      - product_id: product.product_product_pc2
+        price_unit: 40
+        product_qty: 5
+      - product_id: product.product_product_mb1
+        price_unit: 45
+        product_qty: 15.0
+      - product_id: product.product_product_mb2
+        price_unit: 45
+        product_qty: 15
+
+-
+  !record {model: purchase.order, id: order_purchase5}:
+    partner_id: base.res_partner_maxtor
+    order_line:
+      - product_id: product.product_product_cpu1
+        product_qty: 3
+      - product_id: product.product_product_cpu3
+        product_qty: 13
+      - product_id: product.product_product_hdd1
+        product_qty: 10
+
+-
+  !record {model: purchase.order, id: order_purchase6}:
+    partner_id: base.res_partner_vickingdirect0
+    order_line:
+      - product_id: product.product_product_hdd2
+        product_qty: 10
+      - product_id: product.product_product_ram
+        product_qty: 10
+      - product_id: product.product_product_ram512
+        product_qty: 10
+
+-
+  !record {model: purchase.order, id: order_purchase7}:
+    partner_id: base.res_partner_desertic_hispafuentes
+    order_line:
+      - product_id: product.product_product_0
+        product_qty: 5
+      - product_id: product.product_product_1
+        product_qty: 15
+
diff --git a/addons/purchase/purchase_report.xml b/addons/purchase/purchase_report.xml
index e13ca9911b0..a3a4a6a70b6 100644
--- a/addons/purchase/purchase_report.xml
+++ b/addons/purchase/purchase_report.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="report_purchase_quotation" model="purchase.order" name="purchase.quotation" rml="purchase/report/request_quotation.rml" string="Request for Quotation"/>
-        <report auto="False" id="report_purchase_order" model="purchase.order" name="purchase.order" rml="purchase/report/order.rml" string="Purchase Order"/>
+        <report auto="False" id="report_purchase_quotation" model="purchase.order" 
+                name="purchase.quotation" rml="purchase/report/request_quotation.rml"
+                string="Request for Quotation"/>
+        <report auto="False" id="report_purchase_order" model="purchase.order"
+                name="purchase.order" rml="purchase/report/order.rml"
+                usage="default" string="Purchase Order"/>
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_sequence.xml b/addons/purchase/purchase_sequence.xml
index 7f426b53be6..d5b4fc4bd3b 100644
--- a/addons/purchase/purchase_sequence.xml
+++ b/addons/purchase/purchase_sequence.xml
@@ -11,6 +11,7 @@
             <field name="code">purchase.order</field>
             <field name="prefix">PO</field>
             <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
deleted file mode 100644
index b35e0626085..00000000000
--- a/addons/purchase/purchase_unit_test.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- Resource: purchase.order -->
-        <record model="purchase.order" id="test_purchase_1">
-            <field name="name">Test purchase</field>
-            <field name="dest_address_id" search="[]" model="res.partner.address"/>
-            <field name="pricelist_id" ref="list0"/>
-            <field name="partner_id" search="[]" model="res.partner"/>
-            <field name="partner_address_id" search="[]" model="res.partner.address"/>
-            <field name="location_id" ref="stock.stock_location_stock"/>
-        </record>
-        <record model="purchase.order.line" id="test_purchase_1_line_1">
-            <field name="order_id" ref="test_purchase_1"/>
-            <field name="name">[PC1] Basic PC</field>
-            <field name="date_planned" eval="time.strftime('%Y-%m-%d', time.localtime(time.time() + 2 * 86400))" />
-            <field name="product_id" ref="product.product_product_pc1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">450</field>
-            <field name="product_qty">2</field>
-        </record>
-        <record model="purchase.order.line" id="test_purchase_1_line_3">
-            <field name="order_id" ref="test_purchase_1"/>
-            <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
-            <field name="date_planned" eval="time.strftime('%Y-%m-%d', time.localtime(time.time() + 2 * 86400))" />
-            <field name="product_id" ref="product.product_product_mb1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">88</field>
-            <field name="product_qty">3</field>
-        </record>
-
-        <assert model="purchase.order" id="test_purchase_1" string="The amount of Test purchase is correctly computed">
-            <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed" />
-        </assert>
-
-        <workflow model="purchase.order" ref="test_purchase_1" action="purchase_confirm" />
-
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now in progress">
-            <test expr="state">approved</test>
-        </assert>
-
-        <!-- Treat generated invoice -->
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding invoice" severity="fatal">
-            <test expr="bool(invoice_ids)" />
-        </assert>
-
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice has the same amount and is currently a draft">
-            <test expr="invoice_ids[0].state">draft</test>
-        </assert>
-
-        <workflow model="account.invoice" action="invoice_open">
-            <value model="purchase.order" eval="obj(ref('test_purchase_1')).invoice_ids[0].id" />
-        </workflow>
-
-        <function model="account.invoice" name="pay_and_reconcile">
-            <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_ids[0].id]" />
-            <value eval="1164" />
-            <value eval="ref('account.cash')"/>
-            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
-            <value eval="ref('account.bank_journal')" />
-            <value eval="ref('account.cash')"/>
-            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
-            <value eval="ref('account.bank_journal')" />
-        </function>
-
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice is now paid" severity="error">
-            <test expr="invoice_ids[0].state">paid</test>
-        </assert>
-
-        <!-- Treat generated picking -->
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding picking" severity="fatal">
-            <test expr="len(picking_ids) == 1" />
-        </assert>
-
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's picking will be sent to the good address" severity="error">
-            <test expr="picking_ids[0].address_id == partner_address_id" />
-        </assert>
-
-        <!-- Do the same as in wizard_partial_picking lines 143-144 -->
-        <function model="stock.picking" name="action_move">
-            <value model="purchase.order" eval="[obj(ref('test_purchase_1')).picking_ids[0].id]" />
-        </function>
-
-        <workflow model="stock.picking" action="button_done">
-            <value model="purchase.order" eval="obj(ref('test_purchase_1')).picking_ids[0].id" />
-        </workflow>
-
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's picking is now done" severity="error">
-            <test expr="picking_ids[0].state">done</test>
-        </assert>
-
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now completed" severity="fatal">
-            <test expr="state">done</test>
-        </assert>
-    </data>
-</openerp>
-
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8973f7aa574..6f6b5975de7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -14,14 +14,14 @@
 
         <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
-            parent="menu_purchase_config_purchase" sequence="50"/>
+            parent="menu_purchase_config_purchase" sequence="50"  groups="base.group_extended"/>
 
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
             parent="menu_purchase_config_pricelist" sequence="20"/>
 
         <menuitem
-            action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
+            action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
             parent="menu_purchase_config_pricelist" sequence="10"/>
 
         <!--<menuitem
@@ -90,12 +90,13 @@
 
           <!--Inventory control-->
       <menuitem id="menu_procurement_management_inventory" name="Receive 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"
+            parent="base.menu_purchase_root" sequence="4"
             groups="base.group_extended"/>
+      <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
+            name="Incoming Shipments" sequence="9"/>
       <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
-            parent="menu_procurement_management_inventory" sequence="11"/>
+            parent="menu_procurement_management_inventory" sequence="11"
+            groups="base.group_extended"/>
 
      <!--Invoice control-->
      <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
@@ -107,12 +108,12 @@
         <field name="view_mode">tree,form,calendar,graph</field>
         <field eval="False" name="view_id"/>
         <field name="domain">[('type','=','in_invoice')]</field>
-        <field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
+        <field name="context">{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
         <field name="search_view_id" ref="account.view_account_invoice_filter"/>
             <field name="help">Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it.</field>
     </record>
 
-     <menuitem name="Supplier Invoices to Receive"
+     <menuitem name="Based on draft invoices"
           id="menu_procurement_management_pending_invoice"
           action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
@@ -194,7 +195,7 @@
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="11" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
@@ -234,28 +235,27 @@
             </field>
         </record>
 
-       <record id="view_purchase_order_filter" model="ir.ui.view">
-            <field name="name">purchase.order.list.select</field>
+       <record id="view_request_for_quotation_filter" model="ir.ui.view">
+            <field name="name">request.quotation.select</field>
             <field name="model">purchase.order</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                 <group col='10' colspan='4'>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1" help="Purchase order which are in draft state"/>
-                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1" help="Purchase order to be approved"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1" help="Approved purchase order"/>
+                 <group>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase order which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]"  help="Approved purchase order"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"  help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="Not Invoiced" domain="[('invoice_ids','=', False)]" separator="1" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1" string="Reference"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="product_id" select="1"/>
-                    <field name="create_uid" select="1"/>
+                    <field name="name" string="Reference"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                  <group expand="0" string="Group By..." groups="base.group_extended">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -268,6 +268,43 @@
               </search>
             </field>
         </record>
+
+        <record id="view_purchase_order_filter" model="ir.ui.view">
+            <field name="name">purchase.order.list.select</field>
+            <field name="model">purchase.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Purchase Order">
+                 <group>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('draft','wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','=','approved')]"  help="Approved purchase orders"/>
+                    <filter icon="terp-accessories-archiver+" string="Done" domain="[('state','=','done')]" help="Purchase orders which are in done state."/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" string="Reference"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
+                </group>
+                <newline/>
+                  <group expand="0" string="Group By..." groups="base.group_extended">
+                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                     <separator orientation="vertical"/>
+                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                     <separator orientation="vertical"/>
+                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+
+                </group>
+              </search>
+            </field>
+        </record>
+        
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
@@ -275,7 +312,7 @@
             <field name="arch" type="xml">
                 <tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
                     <field name="name" string="Reference"/>
-                    <field name="date_order" string="Order Date"/>
+                    <field name="date_order" />
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="location_id"/>
@@ -294,10 +331,9 @@
             <field name="name">Requests for Quotation</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
             <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
+            <field name="search_view_id" ref="view_request_for_quotation_filter"/>
             <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq"
@@ -324,8 +360,8 @@
                 <form string="Purchase Order Line">
                     <notebook colspan="4">
                         <page string="Order Line">
-                            <field name="product_id" colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
-                            <field name="product_qty" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
+                            <field name="product_id" colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
+                            <field name="product_qty" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned" widget="date"/>
@@ -371,9 +407,6 @@
                     <field name="product_uom"/>
                     <field name="price_subtotal"/>
                     <field name="date_planned"  widget="date" width="135"/>
-
-
-
                     <field name="state" invisible="1"/>
                     <field name="invoiced" invisible="1"/>
                 </tree>
@@ -463,14 +496,14 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">On Purchase Order Line</field>
+            <field name="name">Based 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>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
-            <field name="help">If you set the invoicing control on a purchase order as "Manual", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
+            <field name="help">If you set the Invoicing Control on a purchase order as "Based on Purchase Order lines", you can track here all the purchase order lines for which you have not yet received the supplier invoice. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
         </record>
         <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index aea6fa2b2ac..c978712c0a1 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -138,12 +138,12 @@
         <record id="trans_except_picking" model="workflow.transition">
             <field name="act_from" ref="act_except_picking"/>
             <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
+            <field name="signal">purchase_cancel</field>
         </record>
         <record id="trans_except_invoice" model="workflow.transition">
             <field name="act_from" ref="act_except_invoice"/>
             <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
+            <field name="signal">purchase_cancel</field>
         </record>
         <record id="trans_picking_except_picking" model="workflow.transition">
             <field name="act_from" ref="act_picking"/>
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 4b143d0f961..a1201c7b452 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -165,21 +165,13 @@
           <blockTable colWidths="253.0" style="Tableau2">
             <tr>
               <td>
-                <para style="terp_default_9">
-                  <font color="white"> </font>
-                </para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
                 <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="terp_default_9">[[ (addr.partner_id and addr.partner_id.title and addr.partner_id.title.name) or '' ]] [[ (addr.partner_id and addr.partner_id.name) or '' ]]</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 or '' ]] [[ addr.city or '' ]]</para>
-                <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or removeParentNode('para') ]]</para>
-                <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.partner_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.street) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.street) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.street2) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.street2) or removeParentNode('para') ]]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.zip) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.zip) or '' ]] [[ (o.dest_address_id and o.dest_address_id and o.dest_address_id.city) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.city) or '' ]]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.state_id and o.dest_address_id.state_id.name) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.state_id and o.warehouse_id.partner_address_id.state_id.name) or removeParentNode('para') ]] </para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.country_id and o.dest_address_id.country_id.name) or (o.warehouse_id and o.warehouse_id.partner_address_id and o.warehouse_id.partner_address_id.country_id and o.warehouse_id.partner_address_id.country_id.name) ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -225,7 +217,7 @@
           <para style="terp_tblheader_General_Centre">Your Order Reference</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Date Ordered</para>
+          <para style="terp_tblheader_General_Centre">Order Date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Validated By</para>
@@ -293,7 +285,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
           </td>
         </tr>
         <tr>
@@ -339,7 +331,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Purchase Price'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
         </td>
       </tr>
       <tr>
@@ -352,7 +344,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Purchase Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Purchase Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -365,7 +357,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') , currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 6b68cecf1a5..e3a4a651b7f 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -92,26 +92,23 @@ class purchase_report(osv.osv):
                     s.company_id as company_id,
                     l.product_id,
                     t.categ_id as category_id,
-                    (case when u.uom_type not in ('reference') then
-                            (select id from product_uom where uom_type='reference' and category_id = 1)
-                    else
-                        u.id
-                    end) as product_uom,
+                    t.uom_id as product_uom,
                     s.location_id as location_id,
-                    sum(l.product_qty/u.factor) as quantity,
+                    sum(l.product_qty/u.factor*u2.factor) as quantity,
                     extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
                     extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
-                    (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
-                    avg(100.0 * (l.price_unit*l.product_qty*u.factor) / NULLIF(t.standard_price*l.product_qty*u.factor, 0.0))::decimal(16,2) as negociation,
+                    (l.price_unit*l.product_qty)::decimal(16,2) as price_total,
+                    avg(100.0 * (l.price_unit*l.product_qty) / NULLIF(t.standard_price*l.product_qty/u.factor*u2.factor, 0.0))::decimal(16,2) as negociation,
 
-                    sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
-                    (sum(l.product_qty*l.price_unit)/NULLIF(sum(l.product_qty*u.factor),0.0))::decimal(16,2) as price_average
+                    sum(t.standard_price*l.product_qty/u.factor*u2.factor)::decimal(16,2) as price_standard,
+                    (sum(l.product_qty*l.price_unit)/NULLIF(sum(l.product_qty/u.factor*u2.factor),0.0))::decimal(16,2) as price_average
                 from purchase_order s
                     left join purchase_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)
                 where l.product_id is not null
                 group by
                     s.company_id,
@@ -139,8 +136,12 @@ class purchase_report(osv.osv):
                     s.warehouse_id,
                     u.uom_type, 
                     u.category_id,
-                    u.id
+                    t.uom_id,
+                    u.id,
+                    u2.factor
             )
         """)
 purchase_report()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 804a1670467..68323bc9146 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,17 +53,18 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-            <group colspan="10" col="12">
-                <filter icon="terp-go-year" string="  Year  "
+            <group>
+                <filter icon="terp-go-year" string="Year"
+                name="year"
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Order in current year"/>
-                <filter icon="terp-go-month" string="   Month   "
+                <separator orientation="vertical"/>
+                <filter icon="terp-go-month" string="Month"
                         name="month"
                         domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Order in  current month"/>
                 <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         separator="1"
+                         string="Month-1"
                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Order in last month"/>
                 <separator orientation="vertical"/>
@@ -80,7 +81,7 @@
                 <field name="product_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="user_id"/>
                     <field name="validator"/>
                     <separator orientation="vertical"/>
@@ -94,14 +95,14 @@
                     <field name="expected_date"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
  					<separator orientation="vertical"/>
                     <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-accessories-archiver" context="{'group_by':'category_id'}"/>
-                    <filter string="Reference UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
+                    <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_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'}" groups="base.group_extended"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
@@ -150,7 +151,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="view_id" ref="view_purchase_order_tree"></field>
-        <field name="context">{'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field>
     </record>
 
@@ -180,7 +181,8 @@
         <field name="res_model">report.stock.move</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_in': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="search_view_id" ref="stock.view_stock_search"/>
+        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,}</field>
         <field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field>
     </record>
     <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
@@ -211,7 +213,7 @@
             <field name="model">purchase.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Total price by product by state"  type="pie">
+                <graph string="Total price by product by state" type="pie">
                     <field name="product_id"/>
                     <field name="price_total" operator="+"/>
 
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 541db7331fe..42d9c40d7e5 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -91,7 +91,10 @@ class stock_picking(osv.osv):
 
     def _get_price_unit_invoice(self, cursor, user, move_line, type):
         if move_line.purchase_line_id:
-            return move_line.purchase_line_id.price_unit
+            if move_line.purchase_line_id.order_id.invoice_method == 'picking':
+                return move_line.price_unit
+            else:
+                return move_line.purchase_line_id.price_unit
         return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
 
     def _get_discount_invoice(self, cursor, user, move_line):
@@ -105,7 +108,7 @@ class stock_picking(osv.osv):
         return super(stock_picking, self)._get_taxes_invoice(cursor, user, move_line, type)
 
     def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
-        if move_line.purchase_line_id:
+        if picking.purchase_id and move_line.purchase_line_id:
             return move_line.purchase_line_id.account_analytic_id.id
         return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 
@@ -118,71 +121,18 @@ class stock_picking(osv.osv):
     def _invoice_hook(self, cursor, user, picking, invoice_id):
         purchase_obj = self.pool.get('purchase.order')
         if picking.purchase_id:
-            purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_id': invoice_id,})
+            purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_ids': [(4, invoice_id)]})
         return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
 
-stock_picking()
-
 class stock_partial_picking(osv.osv_memory):
     _inherit = 'stock.partial.picking'
 
-    def default_get(self, cr, uid, fields, context=None):
-        """ To get default values for the object.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values
-        @param context: A standard dictionary
-        @return: A dictionary which of fields with values.
-        """
-        if context is None:
-            context = {}
-        pick_obj = self.pool.get('stock.picking')
-        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
-        for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            has_product_cost = (pick.type == 'in' and pick.purchase_id)
-            for m in pick.move_lines:
-                if m.state in ('done','cancel') :
-                    continue
-                if has_product_cost and m.product_id.cost_method == 'average' and m.purchase_line_id:
-                    # We use the original PO unit purchase price as the basis for the cost, expressed
-                    # in the currency of the PO (i.e the PO's pricelist currency)
-                    list_index = 0
-                    for item in res['product_moves_in']:
-                        if item['move_id'] == m.id:
-                            res['product_moves_in'][list_index]['cost'] = m.purchase_line_id.price_unit
-                            res['product_moves_in'][list_index]['currency'] = m.picking_id.purchase_id.pricelist_id.currency_id.id
-                        list_index += 1
-        return res
-stock_partial_picking()
+    # Overridden to inject the purchase price as true 'cost price' when processing
+    # incoming pickings.
+    def _product_cost_for_average_update(self, cr, uid, move):
+        if move.picking_id.purchase_id:
+            return {'cost': move.purchase_line_id.price_unit,
+                    'currency': move.picking_id.purchase_id.pricelist_id.currency_id.id}
+        return super(stock_partial_picking, self)._product_cost_for_average_update(cr, uid, move)
 
-class stock_partial_move(osv.osv_memory):
-    _inherit = "stock.partial.move"
-    def default_get(self, cr, uid, fields, context=None):
-        """ To get default values for the object.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values
-        @param context: A standard dictionary
-        @return: A dictionary which of fields with values.
-        """
-        if context is None:
-            context = {}
-        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')
-        for m in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            if m.picking_id.type == 'in' and m.product_id.cost_method == 'average' \
-                and m.purchase_line_id and m.picking_id.purchase_id:
-                    # We use the original PO unit purchase price as the basis for the cost, expressed
-                    # in the currency of the PO (i.e the PO's pricelist currency)
-                    list_index = 0
-                    for item in res['product_moves_in']:
-                        if item['move_id'] == m.id:
-                            res['product_moves_in'][list_index]['cost'] = m.purchase_line_id.price_unit
-                            res['product_moves_in'][list_index]['currency'] = m.picking_id.purchase_id.pricelist_id.currency_id.id
-                        list_index += 1
-        return res
-stock_partial_move()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index e02aa4dbf66..7afcc96767f 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -31,7 +31,7 @@
             res_model="stock.picking"
             groups="base.group_extended"
             src_model="purchase.order"
-            context="{'contact_display': 'partner'}" />
+            context="{'default_purchase_id': active_id, 'contact_display': 'partner'}" />
        
         <record id="action_picking_in_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -70,12 +70,13 @@
                             domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
                         <filter icon="terp-dialog-close" name="done" string="Done"
                             domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <filter string="To invoice" name="to_invoice" icon="terp-dolar"
-                            domain="[('invoice_state', '=', '2binvoiced')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders"
                             domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
+                        <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
+                            domain="[('invoice_state', '=', '2binvoiced')]"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id"/>
                         <field name="origin"/>
@@ -103,15 +104,15 @@
         </record>
  
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Pickings to Invoice</field>
+            <field name="name">Based on receptions</field>
             <field name="res_model">stock.picking</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_done':1,'search_default_to_invoice':1}</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="help">Create invoice from reception of products. If you selected this invoice control method in the purchase order, all receptions done are available here to be invoiced.</field>
+            <field name="help">If you set the Invoicing Control on a purchase order as "Based on receptions", you can track here all the product receptions and create invoices for those receptions.</field>
        </record>
 
         <menuitem action="action_picking_tree4_picking_to_invoice"
diff --git a/addons/purchase/test/process/cancel_order.yml b/addons/purchase/test/process/cancel_order.yml
new file mode 100644
index 00000000000..4ac8e09443f
--- /dev/null
+++ b/addons/purchase/test/process/cancel_order.yml
@@ -0,0 +1,54 @@
+-
+   In order to test the cancel flow, I start it from canceling confirmed purchase order.
+-
+  I confirm the purchase order.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase4}
+-
+  I check the "Approved" status  after confirmed RFQ.
+-
+  !assert {model: purchase.order, id: order_purchase4}:
+    - state == 'approved'
+-
+  First I cancel  receptions related to this order if order shipped.
+-
+  !python {model: purchase.order}: |
+    order = self.browse(cr, uid, ref("order_purchase4"))
+    self.pool.get('stock.picking').action_cancel(cr, uid, [picking.id for picking in  order.picking_ids])
+-
+  I check order status in "Shipping Exception".
+-
+  !python {model: purchase.order}: |
+    order = self.browse(cr, uid, ref("order_purchase4"))
+    assert order.state == "except_picking", "order should be in Ship Exception state after cancel shipment"    
+-
+  Now I am able to cancel purchase order.
+-
+  !python {model: purchase.order}: |
+    self.action_cancel(cr, uid, [ref("order_purchase4")])
+-
+  I check that order is cancelled.
+-
+  !assert {model: purchase.order, id: order_purchase4}:
+    - state == 'cancel'
+-
+  After cancel the order, I check that it's related invoice cancelled.
+-
+  !python {model: purchase.order}: |
+    order = self.browse(cr, uid, ref("order_purchase4"))
+    assert order.invoice_ids[0].state == "cancel", "order's related invoice should be cancelled"   
+-
+  Now again set cancelled order to draft.
+-
+  !python {model: purchase.order}: |
+    self.action_cancel_draft(cr, uid, [ref("order_purchase4")])
+-
+  Now I again to cancel draft order.
+-
+  !python {model: purchase.order}: |
+    self.action_cancel(cr, uid, [ref("order_purchase4")])
+-
+  I check that order is cancelled.
+-
+  !assert {model: purchase.order, id: order_purchase4}:
+    - state == 'cancel'
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
new file mode 100644
index 00000000000..ff49b41157b
--- /dev/null
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -0,0 +1,136 @@
+-
+  I create a draft Purchase Order
+-
+  !record {model: purchase.order, id: purchase_order_edi_1}:
+    partner_id: base.res_partner_agrolait
+    partner_address_id: base.res_partner_address_8invoice
+    location_id: stock.stock_location_3
+    pricelist_id: 1
+    order_line:
+      - product_id: product.product_product_pc1
+        product_qty: 1.0
+        product_uom: 1
+        price_unit: 150.0
+        name: 'Basic PC'
+        date_planned: '2011-08-31'
+    order_line:
+      - product_id: product.product_product_pc3
+        product_qty: 10.0
+        product_uom: 1
+        price_unit: 20.0
+        name: 'Medium PC'
+        date_planned: '2011-08-31'
+
+-
+  I confirm the purchase order
+-
+  !workflow {model: purchase.order, ref: purchase_order_edi_1, action: purchase_confirm}
+-
+  Then I export the purchase order via EDI
+-
+  !python {model: edi.document}: |
+     order_pool = self.pool.get('purchase.order')
+     order = order_pool.browse(cr, uid, ref("purchase_order_edi_1"))
+     token = self.export_edi(cr, uid, [order])
+     assert token, 'Invalid EDI Token'
+
+-
+  Then I import a sample EDI document of a sale order
+-
+  !python {model: edi.document}: |
+    purchase_order_pool = self.pool.get('purchase.order')
+    edi_document = {
+        "__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_test", 
+        "__module": "sale",
+        "__model": "sale.order",
+        "__import_module": "purchase",
+        "__import_model": "purchase.order",
+        "__version": [6,1,0],
+        "name": "SO008", 
+        "currency": {
+                "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.EUR",
+                "__module": "base",
+                "__model": "res.currency",
+                "code": "EUR",
+                "symbol": "€",
+        },
+        "date_order": "2011-09-13", 
+        "partner_id": ["sale:724f93ec-ddd0-11e0-88ec-701a04e25543.res_partner_test22", "Junjun wala"],
+        "partner_address": {
+                "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.res_partner_address_7wdsjasdjh",
+                "__module": "base",
+                "__model": "res.partner.address",
+                "phone": "(+32).81.81.37.00", 
+                "street": "Chaussee de Namur 40", 
+                "city": "Gerompont", 
+                "zip": "1367", 
+                "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"], 
+        },
+        "company_id": ["base:724f93ec-ddd0-11e0-88ec-701a04e25543.main_company", "Supplier S.A."], 
+        "company_address": {
+                "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.main_address", 
+                "__module": "base",
+                "__model": "res.partner.address",
+                "city": "Gerompont", 
+                "zip": "1367", 
+                "country_id": ["base:724f93ec-ddd0-11e0-88ec-701a04e25543.be", "Belgium"], 
+                "phone": "(+32).81.81.37.00", 
+                "street": "Chaussee de Namur 40",
+                "street2": "mailbox 34",
+                "bank_ids": [
+                    ["base:724f93ec-ddd0-11e0-88ec-701a04e25543.res_partner_bank-XiwqnxKWzGbp","Guys bank: 123477777-156113"]
+                ],
+        }, 
+        "order_line": [{
+            "__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_line-LXEqeuI-SSP0", 
+            "__module": "sale", 
+            "__model": "sale.order.line",
+            "__import_module": "purchase", 
+            "__import_model": "purchase.order.line", 
+            "name": "Basic PC", 
+            "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "PCE"], 
+            "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_pc1", "[PC1] Basic PC"],
+        },
+        {
+            "__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_line-LXEqeadasdad", 
+            "__module": "sale", 
+            "__model": "sale.order.line",
+            "__import_module": "purchase", 
+            "__import_model": "purchase.order.line", 
+            "name": "Medium PC", 
+            "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "PCE"], 
+            "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_pc3", "[PC3] Medium PC"],
+        }], 
+    }
+    new_purchase_order_id = purchase_order_pool.edi_import(cr, uid, edi_document, context=context)
+    assert new_purchase_order_id,  'Purchase order import failed'
+    order_new = purchase_order_pool.browse(cr, uid, new_purchase_order_id)
+
+    # check bank info on partner
+    assert len(order_new.partner_id.bank_ids) == 1, "Expected 1 bank entry related to partner"
+    bank_info = order_new.partner_id.bank_ids[0]
+    assert bank_info.acc_number == "Guys bank: 123477777-156113", 'Expected "Guys bank: 123477777-156113", got %s' % bank_info.acc_number
+
+    assert order_new.pricelist_id.name == 'Default Purchase Pricelist' , "Default Purchase Pricelist was not automatically assigned"
+    assert order_new.amount_total == 350, "Amount total is not same"
+    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':
+            assert purchase_line.product_uom.name == "PCE" , "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':
+            assert purchase_line.product_uom.name == "PCE" , "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"
+        else:
+            raise AssertionError('unknown order line: %s' % purchase_line)
diff --git a/addons/purchase/test/process/generate_invoice_from_reception.yml b/addons/purchase/test/process/generate_invoice_from_reception.yml
new file mode 100644
index 00000000000..0e042db1176
--- /dev/null
+++ b/addons/purchase/test/process/generate_invoice_from_reception.yml
@@ -0,0 +1,24 @@
+-
+ I confirm another order where invoice control is 'Based on receptions'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase2}
+-
+  I check that the invoice of order.
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("order_purchase2"))
+    assert len(purchase_order.invoice_ids) == 0, "Invoice should not be generated on order confirmation."
+-
+  Now I create an invoice for order on reception.
+-
+  !python {model: stock.picking}: |
+    pick_ids = self.search(cr, uid, [('purchase_id','=',ref('order_purchase2'))])
+    self.action_invoice_create(cr, uid, pick_ids, ref('account.expenses_journal'))
+-
+ I check that the invoice of order.
+-
+ !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("order_purchase2"))
+    assert len(purchase_order.invoice_ids) == 1, "Invoice should be generated."
+
+
diff --git a/addons/purchase/test/process/merge_order.yml b/addons/purchase/test/process/merge_order.yml
new file mode 100644
index 00000000000..2ea8b7e2a31
--- /dev/null
+++ b/addons/purchase/test/process/merge_order.yml
@@ -0,0 +1,42 @@
+-
+  In order to merge RFQ, I merge two RFQ which has same supplier and check new merged order.
+-
+  !python {model: purchase.order}: |
+    new_id = self.do_merge(cr, uid, [ref('order_purchase3'), ref('order_purchase7')])
+    order3 = self.browse(cr, uid, ref('order_purchase3'))
+    order7 = self.browse(cr, uid, ref('order_purchase7'))
+    total_qty = sum([x.product_qty for x in order3.order_line] + [x.product_qty for x in order7.order_line])
+
+    assert order3.state == 'cancel', "Merged order should be canceled"
+    assert order7.state == 'cancel', "Merged order should be canceled"
+
+    def merged_data(lines):
+        product_id =[]
+        product_uom = []
+        res = {}
+        for line in lines:
+          product_id.append(line.product_id.id) 
+          product_uom.append(line.product_uom.id) 
+        res.update({'product_ids': product_id,'product_uom':product_uom})
+        return res
+
+    for order in self.browse(cr, uid, new_id.keys()):
+       total_new_qty = [x.product_qty for x in order.order_line]
+       total_new_qty = sum(total_new_qty)
+       
+       assert total_new_qty == total_qty,"product quantities are not correspond" 
+       assert order.partner_id == order3.partner_id ,"partner is not correspond"
+       assert order.partner_address_id == order3.partner_address_id ,"Partner address is not correspond"
+       assert order.warehouse_id == order3.warehouse_id or order7.warehouse_id,"Warehouse is not correspond"
+       assert order.state == 'draft',"New created order state should be in draft"
+       assert order.pricelist_id == order3.pricelist_id,"Price list is not correspond"
+       assert order.date_order == order3.date_order ,"Date of order is not correspond"
+       assert order.location_id == order3.location_id ,"Location is not correspond"
+       n_product_data = merged_data(order.order_line)
+       o_product_data= merged_data(order3.order_line)
+       o_pro_data = merged_data(order7.order_line)
+       
+       assert n_product_data == o_product_data or o_pro_data,"product data are not correspond"
+       
+
+
diff --git a/addons/purchase/test/process/rfq2order2done.yml b/addons/purchase/test/process/rfq2order2done.yml
new file mode 100644
index 00000000000..80c9e85778f
--- /dev/null
+++ b/addons/purchase/test/process/rfq2order2done.yml
@@ -0,0 +1,72 @@
+-
+  In order to test the purchase order flow I compute the total of the listed products
+-
+  I check the total untaxed amount of the RFQ is correctly computed
+-
+  !assert {model: purchase.order, id: order_purchase1, string: The amount of RFQ is not correctly computed}:
+    - sum([l.price_subtotal for l in order_line]) == amount_untaxed
+-
+  I confirm the RFQ.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase1}
+-
+  I check the "Approved" status  after confirmed RFQ.
+-
+  !assert {model: purchase.order, id: order_purchase1}:
+    - state == 'approved'
+-
+  I check that the invoice details which is generated after confirmed RFQ.
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("order_purchase1"))
+    assert len(purchase_order.invoice_ids) >= 1, "Invoice is not generated more or less than one"
+    for invoice in purchase_order.invoice_ids:
+      assert invoice.state == "draft", "Invoice state should be draft"
+      assert invoice.partner_id.id == purchase_order.partner_id.id, "Supplier is not correspond with purchase order"
+      assert invoice.reference == purchase_order.partner_ref or purchase_order.name,"Invoice reference is not correspond with purchase order"
+      assert invoice.type == 'in_invoice',"Invoice type is not correspond with purchase order"
+      assert invoice.currency_id.id == purchase_order.pricelist_id.currency_id.id ,"Invoice currency is not correspond with purchase order"
+      assert invoice.origin == purchase_order.name,"Invoice origin is not correspond with purchase order"
+      assert invoice.company_id.id == purchase_order.company_id.id ,"Invoice company is not correspond with purchase order"
+      assert invoice.amount_untaxed == purchase_order.amount_untaxed, "Invoice untaxed amount is not correspond with purchase order"
+      assert invoice.amount_tax == purchase_order.amount_tax, "Invoice tax amount is not correspond with purchase order"
+      assert invoice.amount_total == purchase_order.amount_total, "Invoice total amount is not correspond with purchase order"
+      assert len(invoice.invoice_line) == len(purchase_order.order_line), "Lines of Invoice and Purchase Order are not correspond"
+-
+  I check that Reception details after confirmed RFQ.
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("order_purchase1"))
+    assert len(purchase_order.picking_ids) >= 1, "You should have only one reception order"
+    for picking in purchase_order.picking_ids:
+      assert picking.state == "assigned", "Reception state should be in assigned state"
+      assert picking.address_id.id == purchase_order.partner_address_id.id, "Delivery address of reception id is different from order"
+      assert picking.company_id.id == purchase_order.company_id.id, "Company is not correspond with purchase order"
+-
+  Reception is ready for process so now done the reception.
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("order_purchase1")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("order_purchase1")).shipped == True,"Purchase order should be delivered"
+
+-
+  I Validate Invoice of Purchase Order.
+-
+  !python {model: purchase.order}: |
+    import netsvc
+    invoice_ids = [x.id for x in self.browse(cr, uid, ref("order_purchase1")).invoice_ids]
+    wf_service = netsvc.LocalService("workflow")
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice', invoice, 'invoice_open', cr)
+-
+  I check that purchase order is invoiced.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("order_purchase1")).invoiced == True,"Purchase Order should be invoiced"
+
diff --git a/addons/purchase/test/process/run_scheduler.yml b/addons/purchase/test/process/run_scheduler.yml
new file mode 100644
index 00000000000..c0a6fe57d9b
--- /dev/null
+++ b/addons/purchase/test/process/run_scheduler.yml
@@ -0,0 +1,26 @@
+-
+  In order to test the scheduler to generate RFQ.
+-
+  I create a procurement order.
+-
+  !record {model: procurement.order, id: procurement_order_testcase0}:
+    location_id: stock.stock_location_stock
+    name: Test scheduler for RFQ
+    procure_method: make_to_order
+    product_id: product.product_product_woodlintelm0
+    product_qty: 15.0
+-
+  I confirm on procurement order.
+-
+  !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_testcase0}
+-
+  I run the scheduler.
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  I check Generated RFQ.
+-
+  !python {model: procurement.order}: |
+    procurement = self.browse(cr, uid, ref('procurement_order_testcase0'))
+    assert procurement.purchase_id, 'RFQ should be generated!'
diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml
deleted file mode 100644
index 83eec43594b..00000000000
--- a/addons/purchase/test/procurement_buy.yml
+++ /dev/null
@@ -1,114 +0,0 @@
--
-  In order to test the procurement with product type buy in OpenERP, I will create product
-  and then I will create procurement for this product.
--
-  I create  product.
--
-  !record {model: product.product, id: product_product_cddrive0}:
-    categ_id: product.product_category_3
-    cost_method: standard
-    mes_type: fixed
-    name: CD drive
-    procure_method: make_to_order
-    supply_method: buy
-    type: product
-    seller_delay: '1'
-    standard_price: 100.0
-    supply_method: buy
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
-    seller_delay: '1'
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        min_qty: 2.0
-        qty: 5.0
--
-  I create  procurement order.
--
-  !record {model: procurement.order, id: procurement_order_testcase0}:
-    company_id: base.main_company
-    date_planned: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    location_id: stock.stock_location_stock
-    name: Test Case
-    priority: '1'
-    procure_method: make_to_order
-    product_id: product_product_cddrive0
-    product_qty: 5.0
-    product_uom: product.product_uom_unit
-    product_uos: product.product_uom_unit
-    product_uos_qty: 0.0
-    state: draft
--
-  I confirm on procurement order.
--
-  !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_testcase0}
--
-  I run the scheduler.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[]"
--
-  I check that  purchase order is generated.
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
-    assert(proc_ids.purchase_id), _('Purchase Order is not Created!')
--
-  I check the state is running.
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
-    assert(proc_ids.state == 'running'), _('Exception')
--
-  I confirm  and Approve the purchase order.
--
-  !python {model: purchase.order}: |
-    procurement_obj = self.pool.get('procurement.order')
-    proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr)
--
-  I receive the order of the supplier ASUStek from the Incoming Shipments menu.
--
-  !python {model: stock.picking }: |
-   import time
-   procurement_obj = self.pool.get('procurement.order')
-   proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
-   picking_ids = self.search(cr, uid, [('purchase_id', '=', proc_ids.purchase_id.id),('type','=','in')])
-   pickings = self.browse(cr, uid, picking_ids)
-   for picking in pickings:
-      move = picking.move_lines[0]
-      partial_datas = {
-            'partner_id': picking.address_id.partner_id.id,
-            'address_id': picking.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d')
-           }
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [picking.id], partial_datas)
--
-  I confirm the Reservation.
--
-  !python {model: stock.move }: |
-   procurement_obj = self.pool.get('procurement.order')
-   proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
-   self.action_done(cr,uid,[proc_ids.move_id.id])
--
-  I check the state is Done.
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0]
-    assert(proc_ids.state == 'done'), _('Order is not in done state')
diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml
deleted file mode 100644
index 2739d74110e..00000000000
--- a/addons/purchase/test/purchase_from_manual.yml
+++ /dev/null
@@ -1,133 +0,0 @@
--
-  In order to test the purchase flow,I start by creating a new product 'iPod'
--
- !record {model: product.product, id: product_product_ipod0}:
-    categ_id: 'product.product_category_3'
-    cost_method: standard
-    mes_type: fixed
-    name: iPod
-    price_margin: 2.0
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    seller_delay: '1'
-    standard_price: 100.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  In order to test the purchase flow,I create a new record where "invoice_method" is From Manual
--
-  I create purchase order for iPod.
--
-  !record {model: purchase.order, id: purchase_order_po1}:
-    company_id: base.main_company
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_method: manual
-    location_id: stock.stock_location_stock
-    order_line:
-      - date_planned: !eval time.strftime('%Y-%m-%d')
-        name: iPod
-        price_unit: 100.0
-        product_id: 'product_product_ipod0'
-        product_qty: 10.0
-        product_uom: product.product_uom_unit
-        state: draft
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    pricelist_id: purchase.list0
--
-  Initially purchase order is in the draft state
--
-  !assert {model: purchase.order, id: purchase_order_po1}:
-    - state == 'draft'
--
-  I confirm the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po1}
--
-  I check that the order which was initially in the draft state has transit to confirm state.
--
-  !assert {model: purchase.order, id: purchase_order_po1}:
-    - state == 'approved'
--
-  I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po1"))
-    pur_line=self.pool.get( 'purchase.order.line')
-    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
-    assert search_ids, _('Purchase order line is not created!')
--
-  To check that wizard "Create Invoices" gets opened
--
-  I create purchase order line invoice entry.
--
-  !record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
-    {}
--
-  I create invoice for products in the purchase order.
--
-  !python {model: purchase.order.line_invoice}: |
-    pur_obj=self.pool.get('purchase.order')
-    ids = []
-    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po1"))
-    for line in pur_id1.order_line:
-        ids.append(line.id)
-    self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
--
-  I check that invoice gets created.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po1"))
-    pur_line=self.pool.get( 'purchase.order.line')
-    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
-    assert search_ids, _('Invoice is not created!')
--
-  I check that a record gets created in the Pending Invoices.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_id1=self.browse(cr, uid, ref("purchase_order_po1"))
-    account_obj = self.pool.get('account.invoice')
-    ids = account_obj.search(cr, uid, [('origin', '=', 'PO-'+str(pur_id1.id))])
-    assert ids, _('Pending Invoice is not created!')
--
-  I check that the order which was initially in the confirmed state has transit to approved state.
--
-  !assert {model: purchase.order, id: purchase_order_po1}:
-    - state == 'approved'
--
-  I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved.
--
-  !python {model: purchase.order}: |
-    pur_id=self.browse(cr, uid, ref("purchase_order_po1"))
-    assert(pur_id.date_approve)
--
-  I check that an entry gets created in the stock pickings.
--
-  !python {model: purchase.order}: |
-    pur_id=self.browse(cr, uid, ref("purchase_order_po1"))
-    assert(pur_id.picking_ids)
--
-  I check that an entry gets created in the stock moves.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_id1=self.browse(cr, uid, ref("purchase_order_po1"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
-    pick_id = picking_obj.browse(cr, uid, ids)[0]
-    move_obj = self.pool.get('stock.move')
-    search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
-    assert search_id, _('No Incoming Product!')
--
-  I check that Traceability moves are created.
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
deleted file mode 100644
index 3acc68cb51b..00000000000
--- a/addons/purchase/test/purchase_from_order.yml
+++ /dev/null
@@ -1,139 +0,0 @@
--
-  In order to test the purchase flow,I start by creating a new product 'iPod'
--
- !record {model: product.product, id: product_product_ipod0}:
-    categ_id: 'product.product_category_3'
-    cost_method: standard
-    mes_type: fixed
-    name: iPod
-    price_margin: 2.0
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    seller_delay: '1'
-    standard_price: 100.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  In order to test the purchase flow,I create a new record where "invoice_method" is From Order.
--
-  I create purchase order for iPod.
--
-  !record {model: purchase.order, id: purchase_order_po0}:
-    company_id: base.main_company
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_method: order
-    location_id: stock.stock_location_stock
-    order_line:
-      - date_planned: !eval time.strftime('%Y-%m-%d')
-        name: iPod
-        price_unit: 100.0
-        product_id: 'product_product_ipod0'
-        product_qty: 10.0
-        product_uom: product.product_uom_unit
-        state: draft
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    pricelist_id: purchase.list0
--
-  Initially purchase order is in the draft state.
--
-  !assert {model: purchase.order, id: purchase_order_po0}:
-    - state == 'draft'
--
-  I confirm the purchase order for iPod.
--
-  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po0}
--
-  I check that the order which was initially in the draft state has transit to confirm state.
--
-  !assert {model: purchase.order, id: purchase_order_po0}:
-    - state == 'approved'
--
-  I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po0"))
-    pur_line=self.pool.get( 'purchase.order.line')
-    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
-    assert search_ids, _('Purchase order line is not created!')
--
-  To check that wizard "Create Invoices" gets called.
--
-  I create purchase order line invoice entry.
--
-  !record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
-    {}
--
-  I create invoice for products in the purchase order.
--
-  !python {model: purchase.order.line_invoice}: |
-    pur_obj=self.pool.get('purchase.order')
-    ids = []
-    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po0"))
-    for line in pur_id1.order_line:
-        ids.append(line.id)
-    self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
--
-  I check that invoice gets created.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po0"))
-    pur_line=self.pool.get( 'purchase.order.line')
-    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
-    assert search_ids, _('Invoice is not created!')
--
-  I check that a record gets created in the Pending Invoices.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_id1=self.browse(cr, uid, ref("purchase_order_po0"))
-    account_obj = self.pool.get('account.invoice')
-    ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
-    assert ids, _('Pending Invoice is not created!')
--
-  I check that the order which was initially in the confirmed state has transit to approved state.
--
-  !assert {model: purchase.order, id: purchase_order_po0}:
-    - state == 'approved'
--
-  I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved.
--
-  !python {model: purchase.order}: |
-    pur_id=self.browse(cr, uid, ref("purchase_order_po0"))
-    assert(pur_id.date_approve)
--
-  I check that an entry gets created in the pickings.
--
-  !python {model: purchase.order}: |
-    pur_id=self.browse(cr, uid, ref("purchase_order_po0"))
-    assert(pur_id.picking_ids)
--
- I check that an entry gets created in the stock moves.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_id1=self.browse(cr, uid, ref("purchase_order_po0"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
-    pick_id = picking_obj.browse(cr, uid, ids)[0]
-    move_obj = self.pool.get('stock.move')
-    search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
-    assert search_id, _('No Incoming Product!')
--
-  I check that Traceability moves are created.
--
-  I check that an invoice_ids field of Delivery&Invoices gets bind with the value.
--
-  !python {model: purchase.order}: |
-    pur_id2=self.browse(cr, uid, ref("purchase_order_po0"))
-    assert(pur_id2.invoice_ids)
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
deleted file mode 100644
index 94239ba28c4..00000000000
--- a/addons/purchase/test/purchase_from_picking.yml
+++ /dev/null
@@ -1,147 +0,0 @@
--
-  In order to test the purchase flow,I start by creating a new product 'iPod'
--
- !record {model: product.product, id: product_product_ipod0}:
-    categ_id: 'product.product_category_3'
-    cost_method: standard
-    mes_type: fixed
-    name: iPod
-    price_margin: 2.0
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    seller_delay: '1'
-    standard_price: 100.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  In order to test the purchase flow,I create a new record where "invoice_method" is From Picking
--
-  I create purchase order for iPod.
--
-  !record {model: purchase.order, id: purchase_order_po2}:
-    company_id: base.main_company
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_method: picking
-    location_id: stock.stock_location_stock
-    order_line:
-      - date_planned: !eval time.strftime('%Y-%m-%d')
-        name: iPod
-        price_unit: 100.0
-        product_id: 'product_product_ipod0'
-        product_qty: 10.0
-        product_uom: product.product_uom_unit
-        state: draft
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    pricelist_id: purchase.list0
--
-  Initially purchase order is in the draft state.
--
-  !assert {model: purchase.order, id: purchase_order_po2}:
-    - state == 'draft'
--
-  I confirm the purchase order for iPod.
--
-  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po2}
--
- I check that the order which was initially in the draft state has transit to confirm state.
--
-  !assert {model: purchase.order, id: purchase_order_po2}:
-    - state == 'approved'
--
-  I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po2"))
-    pur_line=self.pool.get( 'purchase.order.line')
-    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
-    assert search_ids, _('Purchase order line is not created!')
--
-  To check that wizard "Create Invoices" gets opened.
--
-  I create purchase order line invoice entry.
--
-  !record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
-    {}
--
-  I create invoice for products in the purchase order.
--
-  !python {model: purchase.order.line_invoice}: |
-    pur_obj=self.pool.get('purchase.order')
-    ids = []
-    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
-    for line in pur_id1.order_line:
-        ids.append(line.id)
-    self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
--
-  I check that invoice gets created.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po2"))
-    pur_line=self.pool.get( 'purchase.order.line')
-    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
-    assert search_ids, _('Invoice is not created!')
--
-  I check that a record gets created in the Pending Invoices.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    pur_id1=self.browse(cr, uid, ref("purchase_order_po2"))
-    account_obj = self.pool.get('account.invoice')
-    ids = account_obj.search(cr, uid, [('origin', '=', 'PO-'+str(pur_id1.id))])
-    assert ids, _('Pending Invoice is not created!')
--
- I check that the order which was initially in the confirmed state has transit to approved state.
--
-  !assert {model: purchase.order, id: purchase_order_po2}:
-    - state == 'approved'
--
- I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved.
--
-  !python {model: purchase.order}: |
-    pur_id=self.browse(cr, uid, ref("purchase_order_po2"))
-    assert(pur_id.date_approve)
--
- I check that an entry gets created in the stock.picking.
--
-  !python {model: purchase.order}: |
-    pur_id=self.browse(cr, uid, ref("purchase_order_po2"))
-    assert(pur_id.picking_ids)
--
- I check that an entry gets created related to stock move.
--
-  !python {model: purchase.order}: |
-    pur_id1=self.browse(cr, uid, ref("purchase_order_po2"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
-    pick_id = picking_obj.browse(cr, uid, ids)[0]
-    move_obj = self.pool.get('stock.move')
-    search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
-    assert search_id, 'No Incoming Product!'
--
-  Then I create an invoice from picking by clicking on "Create Invoice" wizard
--
-  !python {model: stock.invoice.onshipping}: |
-    import time
-    pur_obj=self.pool.get('purchase.order')
-    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
-    pick_ids = [x.id for x in pur_id1.picking_ids]
-    id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.expenses_journal')},
-      {'active_ids': pick_ids})
-    self.create_invoice(cr, uid, [id], {"active_ids": pick_ids, "active_id": pick_ids[0]})
--
-  I check that an invoice_ids field of Delivery&Invoices gets bind with the value.
--
-  !python {model: purchase.order}: |
-    pur_id2=self.browse(cr, uid, ref("purchase_order_po2"))
-    assert(pur_id2.invoice_ids)
diff --git a/addons/purchase/test/ui/delete_order.yml b/addons/purchase/test/ui/delete_order.yml
new file mode 100644
index 00000000000..4b0afe085b5
--- /dev/null
+++ b/addons/purchase/test/ui/delete_order.yml
@@ -0,0 +1,22 @@
+-
+  In order to test to delete process on purchase order.
+-
+  I try to delete confirmed order and check Error Message.
+-
+  !python {model: purchase.order}: |
+    try:
+        self.unlink(cr, uid, [ref("order_purchase1")])
+    except Exception,e:
+        pass
+-
+  I delete a draft order.
+-
+  !python {model: purchase.order}: |
+    self.unlink(cr, uid, [ref("order_purchase5")])
+-
+  I delete a cancelled order.
+-
+  !python {model: purchase.order}: |
+    self.unlink(cr, uid, [ref("order_purchase7")])
+
+
diff --git a/addons/purchase/test/ui/duplicate_order.yml b/addons/purchase/test/ui/duplicate_order.yml
new file mode 100644
index 00000000000..b81f41d46c5
--- /dev/null
+++ b/addons/purchase/test/ui/duplicate_order.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the duplicate order and check duplicate details.
+-
+  I duplicate order.
+-
+  !python {model: purchase.order}: |
+    context.update({'active_id':ref('order_purchase1')})
+    self.copy(cr, uid, ref('order_purchase1'), context)
diff --git a/addons/purchase/test/purchase_report.yml b/addons/purchase/test/ui/print_report.yml
similarity index 79%
rename from addons/purchase/test/purchase_report.yml
rename to addons/purchase/test/ui/print_report.yml
index bbc15b1e936..d0bdf4bfcef 100644
--- a/addons/purchase/test/purchase_report.yml
+++ b/addons/purchase/test/ui/print_report.yml
@@ -1,16 +1,16 @@
 -
-  In order to test the PDF reports defined on a Purchase Order, we will print a Request Quotation report
-- 
+  In order to test the PDF reports defined on a Purchase Order, I print a Request Quotation report
+-
   !python {model: purchase.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.purchase.quotation').create(cr, uid, [ref('purchase.order_purchase1'),ref('purchase.order_purchase2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'purchase-request_quotation'+format), 'wb+').write(data)
 -
-  In order to test the PDF reports defined on a Purchase Order, we will print Purchase Order report
-- 
+  I print Purchase Order report
+-
   !python {model: purchase.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.purchase.order').create(cr, uid, [ref('purchase.order_purchase1'),ref('purchase.order_purchase2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'purchase-purchase_order_report'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'purchase-purchase_order_report'+format), 'wb+').write(data)
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index be99a41a3cc..a96d07f6caf 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -20,13 +20,28 @@
 ##############################################################################
 from osv import fields, osv
 
-class purchase_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
+class purchase_config_wizard(osv.osv_memory):
+    _name = 'purchase.config.wizard'
+    _inherit = 'res.config'
 
     _columns = {
-        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
-        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.")
+        'default_method' : fields.selection(
+            [('manual', 'Based on Purchase Order Lines'),
+             ('picking', 'Based on Receptions'),
+             ('order', 'Pre-Generate Draft Invoices on Based Purchase Orders'),
+            ], 'Default Invoicing Control Method', required=True,
+        )
     }
-purchase_installer()
+    _defaults = {
+        'default_method': lambda s,c,u,ctx: s.pool.get('purchase.order').default_get(c,u,['invoice_method'],context=ctx)['invoice_method']
+    }
+
+    def execute(self, cr, uid, ids, context=None):
+        wizard = self.browse(cr, uid, ids, context=context)[0]
+        proxy = self.pool.get('ir.values')
+        proxy.set(cr, uid, 'default', False, 'invoice_method', ['purchase.order'], wizard.default_method),
+        return {'type' : 'ir.actions.act_window_close'}
+
+purchase_config_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index bc3ca11aa7b..37ae97e9eca 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -1,21 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_purchase_install_module_form" model="ir.ui.view">
-            <field name="name">Purchases Application Configuration</field>
-            <field name="model">base.setup.installer</field>
+
+        <record id="action_import_create_supplier_installer" model="ir.actions.act_window">
+            <field name="name">Create or Import Suppliers</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">tree,form</field>
+            <field name="context">{'search_default_supplier': 1, 'default_supplier' : True, 'default_customer' : False}</field>
+            <field name="view_id" ref="base.view_partner_tree" />
+            <field name="help">Create or Import Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
+        </record>
+
+        <record id="category_purchase_config" model="ir.actions.todo.category">
+            <field name="name">Purchase Management</field>
+            <field name="sequence">5</field>
+        </record>
+
+        <record id="config_wizard_action_import_create_supplier_installer" model="ir.actions.todo">
+            <field name="action_id" ref="action_import_create_supplier_installer" />
+            <field name="category_id" ref="category_purchase_config" />
+        </record>
+
+        <record id="view_purchase_config" model="ir.ui.view">
+            <field name="name">Invoicing Control on Purchases</field>
+            <field name="model">purchase.config.wizard</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-          <xpath expr="//group[@name='purchase']" position="replace">
-            <newline/>
-            <separator  string="Purchase Management Features" colspan="4" />
-            <field name="purchase_requisition" />
-            <field name="purchase_analytic_plans" />
-          </xpath>
+                <form position="attributes">
+                  <attribute name="string">Invoicing Control on Purchases</attribute>
+                </form>
+
+                <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                    <attribute name="string">Invoicing Control on Purchases</attribute>
+                </xpath>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">This tool will help you to select the method you want to use to control supplier invoices.</attribute>
+                </xpath>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
+                    <attribute name="rowspan">12</attribute>
+                </xpath>
+                <group string="res_config_contents" position="replace">
+                    <group colspan="4" col="4">
+                       <field name="default_method"/>
+                    </group>
+                 </group>
               </data>
             </field>
         </record>
+
+
+        <record id="action_purchase_config" model="ir.actions.act_window">
+            <field name="name">Set the Default Invoicing Control Method</field>
+            <field name="res_model">purchase.config.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="view_id" ref="view_purchase_config"/>
+        </record>
+
+        <record id="todo_purchase_config" model="ir.actions.todo">
+            <field name="action_id" ref="action_purchase_config" />
+            <field name="category_id" ref="category_purchase_config" />
+            <field name="type">once</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index d13d2fac66b..236cde7dde5 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -55,18 +55,6 @@ class purchase_line_invoice(osv.osv_memory):
             invoice_line_obj=self.pool.get('account.invoice.line')
             account_jrnl_obj=self.pool.get('account.journal')
 
-            def multiple_order_invoice_name(orders):
-                name = "PO";
-                for order in orders:
-                    name += "-%d" % order.id
-                return name
-
-            def multiple_order_invoice_reference(partner, orders):
-                reference = "P%dPO" % partner.id
-                for order in orders:
-                    reference += "-%d" % order.id
-                return reference
-
             def multiple_order_invoice_notes(orders):
                 notes = ""
                 for order in orders:
@@ -82,6 +70,7 @@ class purchase_line_invoice(osv.osv_memory):
                     @param orders : The set of orders to add in the invoice
                     @param lines : The list of line's id
                 """
+                name = orders and orders[0].name or ''
                 journal_id = account_jrnl_obj.search(cr, uid, [('type', '=', 'purchase')], context=None)
                 journal_id = journal_id and journal_id[0] or False
                 a = partner.property_account_payable.id
@@ -90,11 +79,11 @@ class purchase_line_invoice(osv.osv_memory):
                 else:
                     pay_term = False
                 inv = {
-                    'name': multiple_order_invoice_name(orders),
-                    'origin': multiple_order_invoice_name(orders),
+                    'name': name,
+                    'origin': name,
                     'type': 'in_invoice',
                     'journal_id':journal_id,
-                    'reference': multiple_order_invoice_reference(partner, orders),
+                    'reference' : partner.ref,
                     'account_id': a,
                     'partner_id': partner.id,
                     'address_invoice_id': orders[0].partner_address_id.id,
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 56d9bd59051..a29fd64944c 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Purchase Analytic Distribution Management',
+    'name': 'Purchase Analytic Plans',
     'version': '1.0',
-    'category': 'Purchases',
+    'category': 'Purchase Management',
     'description': """
 The base module to manage analytic distribution and purchase orders.
 ====================================================================
diff --git a/addons/purchase_analytic_plans/i18n/ar.po b/addons/purchase_analytic_plans/i18n/ar.po
index 85da3d3ac21..9aa3810f9ba 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/bg.po b/addons/purchase_analytic_plans/i18n/bg.po
index 42d72adcf81..e3b4ec2b855 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/bs.po b/addons/purchase_analytic_plans/i18n/bs.po
index 8d4ab0c128f..80ea8b44e36 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/ca.po b/addons/purchase_analytic_plans/i18n/ca.po
index 69eb21eb44b..d8dce229d42 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/cs.po b/addons/purchase_analytic_plans/i18n/cs.po
index 4d77eba1962..07b6e1d69a3 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/da.po b/addons/purchase_analytic_plans/i18n/da.po
new file mode 100644
index 00000000000..7679cbef497
--- /dev/null
+++ b/addons/purchase_analytic_plans/i18n/da.po
@@ -0,0 +1,51 @@
+# 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: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-11-08 11:49+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: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Indkøbsordrelinie"
+
+#. module: purchase_analytic_plans
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordre reference skal være unik"
+
+#. module: purchase_analytic_plans
+#: field:purchase.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
+msgstr "Indkøbsordre"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
+msgstr ""
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and purchase orders.\n"
+"    "
+msgstr ""
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index 26e252fbf7b..bbc68d55cd9 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -56,18 +56,3 @@ msgstr ""
 
 #~ 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 \r\n"
-#~ "beinhalten"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/purchase_analytic_plans/i18n/el.po b/addons/purchase_analytic_plans/i18n/el.po
index 37a486fc040..d9dfd33db3d 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4acaf4a093d..34f6e770445 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -55,18 +55,3 @@ 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 "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/purchase_analytic_plans/i18n/es_AR.po b/addons/purchase_analytic_plans/i18n/es_AR.po
index 5858fe08cba..6b4eb18772b 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/es_MX.po b/addons/purchase_analytic_plans/i18n/es_MX.po
new file mode 100644
index 00000000000..f359d538647
--- /dev/null
+++ b/addons/purchase_analytic_plans/i18n/es_MX.po
@@ -0,0 +1,57 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_analytic_plans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-01-13 12:42+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Línea pedido de compra"
+
+#. module: purchase_analytic_plans
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: purchase_analytic_plans
+#: field:purchase.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
+msgstr "Gestión de la distribución analítica de compras"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and purchase orders.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para gestionar distribuciones analíticas y pedidos de "
+"compra.\n"
+"    "
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/purchase_analytic_plans/i18n/es_VE.po b/addons/purchase_analytic_plans/i18n/es_VE.po
new file mode 100644
index 00000000000..f359d538647
--- /dev/null
+++ b/addons/purchase_analytic_plans/i18n/es_VE.po
@@ -0,0 +1,57 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_analytic_plans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-01-13 12:42+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 04:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Línea pedido de compra"
+
+#. module: purchase_analytic_plans
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: purchase_analytic_plans
+#: field:purchase.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Distribución analítica"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
+msgstr "Gestión de la distribución analítica de compras"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and purchase orders.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para gestionar distribuciones analíticas y pedidos de "
+"compra.\n"
+"    "
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/purchase_analytic_plans/i18n/et.po b/addons/purchase_analytic_plans/i18n/et.po
index 6c6c04a8480..df558680d2e 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/fi.po b/addons/purchase_analytic_plans/i18n/fi.po
index 9e99d25b5cc..79802e698b7 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: 2011-06-10 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/fr.po b/addons/purchase_analytic_plans/i18n/fr.po
index 91e08257c11..16db4dc9070 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/gl.po b/addons/purchase_analytic_plans/i18n/gl.po
index 0a3ff9d2fb2..2315629a97a 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index 8d125a75251..f03e787479e 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/hu.po b/addons/purchase_analytic_plans/i18n/hu.po
index a323ec7ec94..f5a6fd53ffc 100644
--- a/addons/purchase_analytic_plans/i18n/hu.po
+++ b/addons/purchase_analytic_plans/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-02-01 18:03+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -52,14 +53,3 @@ msgstr ""
 "    Az analitikus felosztás és a szállítói megrendelések kezelésére szolgáló "
 "alapmodul.\n"
 "    "
-
-#~ msgid ""
-#~ "\n"
-#~ "\"\n"
-#~ "\"    The base module to manage analytic distribution and purchase orders.\n"
-#~ "\"\n"
-#~ "\"    "
-#~ msgstr ""
-#~ "\n"
-#~ "Költségfelosztás és szállítói megrendelések kezelésére szolgáló alapmodul.   "
-#~ " "
diff --git a/addons/purchase_analytic_plans/i18n/id.po b/addons/purchase_analytic_plans/i18n/id.po
index 4e973fa421f..820c9fa6e48 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index 4a07819d942..d675c9a6c88 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/ko.po b/addons/purchase_analytic_plans/i18n/ko.po
index d3753e3e456..117c2d758d2 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/lt.po b/addons/purchase_analytic_plans/i18n/lt.po
index 85da3d3ac21..9aa3810f9ba 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/mn.po b/addons/purchase_analytic_plans/i18n/mn.po
index 6bdb2b8c227..93c6eeca761 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/nl.po b/addons/purchase_analytic_plans/i18n/nl.po
index 393e6176356..650132f8189 100644
--- a/addons/purchase_analytic_plans/i18n/nl.po
+++ b/addons/purchase_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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/nl_BE.po b/addons/purchase_analytic_plans/i18n/nl_BE.po
index c24a249768f..e71b4d2beb2 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/pl.po b/addons/purchase_analytic_plans/i18n/pl.po
index 2cf6d31290d..bb95ce98b78 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/pt.po b/addons/purchase_analytic_plans/i18n/pt.po
index d44c0fdca17..cbbc147b172 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -51,18 +51,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index d97ebee4c66..d5b672875e1 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -55,18 +55,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/purchase_analytic_plans/i18n/ro.po b/addons/purchase_analytic_plans/i18n/ro.po
index 37e82d326b8..5246f6ef487 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index e8ec625eef4..0db1ccfafdf 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -55,18 +55,3 @@ 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 "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/purchase_analytic_plans/i18n/sl.po b/addons/purchase_analytic_plans/i18n/sl.po
index 1f806fda433..0d55194de64 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -24,7 +24,7 @@ msgstr "Postavka nabavnega naloga"
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Sklic naročila mora biti enoličen!"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -51,17 +51,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
diff --git a/addons/purchase_analytic_plans/i18n/sq.po b/addons/purchase_analytic_plans/i18n/sq.po
index fa0f70e090a..caa556b77d9 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/sr.po b/addons/purchase_analytic_plans/i18n/sr.po
index 14eb63c20ef..87e479b7573 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
@@ -52,8 +52,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere!"
diff --git a/addons/purchase_analytic_plans/i18n/sr@latin.po b/addons/purchase_analytic_plans/i18n/sr@latin.po
index 3879fe394f9..abae3b0356d 100644
--- a/addons/purchase_analytic_plans/i18n/sr@latin.po
+++ b/addons/purchase_analytic_plans/i18n/sr@latin.po
@@ -8,39 +8,39 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-23 10:59+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-13 15:29+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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr "Linija Narudžbenica"
+msgstr "Red nabavnog naloga"
 
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Referenca nabavke mora biti jedinstvena !"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr "Analitička Distribucija"
+msgstr "Analitička distribucija"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr "Narudžbenica"
+msgstr "Nabavni nalog"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr "Upravljanje Analitickom Distribucijom Nabavke"
+msgstr "Uređivanje analitičke distribucije nabavke"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -49,11 +49,9 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    Osnovni modul za uređivanje analitičke distribucije i naloga nabavke.\n"
+"    "
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere!"
diff --git a/addons/purchase_analytic_plans/i18n/sv.po b/addons/purchase_analytic_plans/i18n/sv.po
index 3787c72d2af..590804cf0e4 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/tlh.po b/addons/purchase_analytic_plans/i18n/tlh.po
index 3956140970f..0fca81a8adf 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index c7b86928048..5b086cb948a 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: 2011-06-10 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/uk.po b/addons/purchase_analytic_plans/i18n/uk.po
index 553c1c385aa..a24bbaec124 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/ur.po b/addons/purchase_analytic_plans/i18n/ur.po
index b043df71c8c..347c4ea8c55 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/vi.po b/addons/purchase_analytic_plans/i18n/vi.po
index 1fdc96a3009..3ee9e92c7e8 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index 0af9a17d400..16de2df7621 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -8,38 +8,38 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2010-03-20 09:56+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. 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
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "单号必须唯一！"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr "辅助核算分配"
+msgstr "分析控制台"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "采购订单"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr "采购辅助核算分配管理"
+msgstr "采购分析管理"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -48,6 +48,9 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    这模块管理采购订单的分析\n"
+"    "
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件"
diff --git a/addons/purchase_analytic_plans/i18n/zh_TW.po b/addons/purchase_analytic_plans/i18n/zh_TW.po
index 743ba5bd119..8444ce4f603 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
index 46594033603..9be9e828d22 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans.py
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -35,9 +35,9 @@ class purchase_order(osv.osv):
     _name='purchase.order'
     _inherit='purchase.order'
 
-    def inv_line_create(self, cr, uid, a, ol):
-        res=super(purchase_order,self).inv_line_create(cr, uid, a, ol)
-        res[2]['analytics_id']=ol.analytics_id.id
+    def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
+        res = super(purchase_order, self)._prepare_inv_line(cr, uid, account_id, order_line, context=context)
+        res['analytics_id'] = order_line.analytics_id.id
         return res
 
 purchase_order()
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index c111d0679c1..7bd9df87c8b 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Double Validation for Purchase",
     "version" : "1.1",
-    "category": 'Purchases',
+    "category": 'Hidden',
     'complexity': "easy",
     "images" : ["images/purchase_validation.jpeg"],
     "depends" : ["base","purchase"],
@@ -40,9 +40,12 @@ that exceeds minimum amount set by configuration wizard.
 	   'purchase_double_validation_workflow.xml',
 	   'purchase_double_validation_installer.xml'
 	    ],
+    'test': ['test/purchase_double_validation_test.yml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate' : '00436592682510544157',
 
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/i18n/bg.po b/addons/purchase_double_validation/i18n/bg.po
index ed9b4eff4b6..3b966b1be82 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 851245c8ddf..96aed96bf3a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 174cb79fc41..83a1631d602 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 518d029c3cf..301e47c2d4a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/es_MX.po b/addons/purchase_double_validation/i18n/es_MX.po
new file mode 100644
index 00000000000..5d1c4b25e65
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/es_MX.po
@@ -0,0 +1,90 @@
+# Spanish 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-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. 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
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr "Compras con doble validación"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid ""
+"\n"
+"\tThis module modifies the purchase workflow in order to validate purchases "
+"that exceeds minimum amount set by configuration wizard\n"
+"    "
+msgstr ""
+"\n"
+"\tEste módulo modifica el flujo de compras de tal forma que obliga validar "
+"las compras que sobrepasan un importe mínimo que se establece en el "
+"asistente de configuración.\n"
+"    "
+
+#. 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 importe mínimo para la compra"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr "res_config_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 "compra.doble.validación.instalador"
+
+#. 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/es_VE.po b/addons/purchase_double_validation/i18n/es_VE.po
new file mode 100644
index 00000000000..5d1c4b25e65
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/es_VE.po
@@ -0,0 +1,90 @@
+# Spanish 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-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\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
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. 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
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr "Compras con doble validación"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid ""
+"\n"
+"\tThis module modifies the purchase workflow in order to validate purchases "
+"that exceeds minimum amount set by configuration wizard\n"
+"    "
+msgstr ""
+"\n"
+"\tEste módulo modifica el flujo de compras de tal forma que obliga validar "
+"las compras que sobrepasan un importe mínimo que se establece en el "
+"asistente de configuración.\n"
+"    "
+
+#. 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 importe mínimo para la compra"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr "res_config_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 "compra.doble.validación.instalador"
+
+#. 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 645ea26abf4..72276c3388d 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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9399ea57680..1f4fb01db22 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 aa1b5e4118b..5bbb2a6bf34 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2059d2d91ff..1d70026936a 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6fca10f3b46..f586071fd04 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fe410f7bee9..65c0ec96837 100644
--- a/addons/purchase_double_validation/i18n/nl.po
+++ b/addons/purchase_double_validation/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a4baccee9b7..fd95658f31e 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cc0a075da56..ab70f561a98 100644
--- a/addons/purchase_double_validation/i18n/ru.po
+++ b/addons/purchase_double_validation/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7b6e2f860c0..b880a7815b1 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 91894013962..11deec6b302 100644
--- a/addons/purchase_double_validation/i18n/zh_CN.po
+++ b/addons/purchase_double_validation/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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Define minimum amount after which puchase is needed to be validated."
-msgstr "定义最低金额后采购需要复核"
+msgstr "定义限定金额后采购需要审核"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -56,7 +56,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"\t这模块修改采购的工作流程订单要复核采购超过设定的最低金额\n"
+"\t这模块修改采购的工作流程采购超过设定的限定金额要审核\n"
 "    "
 
 #. module: purchase_double_validation
@@ -73,7 +73,7 @@ msgstr "res_config_contents"
 #. module: purchase_double_validation
 #: help:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum amount after which validation of purchase is required."
-msgstr "在设定最低金额后采购复核是必须的"
+msgstr "在设定限定金额后采购审核是必须的"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
@@ -83,4 +83,4 @@ msgstr "purchase.double.validation.installer"
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum Purchase Amount"
-msgstr "最低采购金额"
+msgstr "限定的采购金额"
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index bc39c837b6b..490581e472b 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -40,15 +40,11 @@
             <field name="target">new</field>
         </record>
 
-        <record id="category_purchase_configuration" model="ir.actions.todo.category">
-            <field name="name">Purchase Management</field>
-            <field name="sequence">5</field>
-        </record>
-        
         <!-- register configuration wizard -->
         <record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
             <field name="action_id" ref="action_config_purchase_limit_amount"/>
-            <field name="category_id" ref="category_purchase_configuration"/>
+            <field name="category_id" ref="purchase.category_purchase_config"/>
+            <field name="type">once</field>
         </record>
         
     </data>
diff --git a/addons/purchase_double_validation/test/purchase_double_validation_test.yml b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
new file mode 100755
index 00000000000..ecc8d08a493
--- /dev/null
+++ b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
@@ -0,0 +1,117 @@
+-
+  I Create new limit amount from  Configure Limit Amount for Purchase wizard.
+- 
+  !record {model: purchase.double.validation.installer, id: purchase_double_validation_installer_1}:
+    limit_amount: 3000
+- 
+  Then I set the Limit Amount
+- 
+  !python {model: purchase.double.validation.installer}: |
+    self.execute(cr, uid, [ref("purchase_double_validation_installer_1")])
+-
+  In order to test the purchase double validation flow,I start by creating a new product 'MOB1'
+-
+ !record {model: product.product, id: product_product_mob1}:
+    categ_id: 'product.product_category_3'
+    cost_method: standard
+    mes_type: fixed
+    name: MOB1
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 2000.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  In order to test the purchase double validation flow,I create a new record where "invoice_method" is From Order.
+-
+  Test for purchase double validation in which Total > = Limit Amount.
+- 
+  I create purchase order for MOB1 for 3 quantity.
+- 
+  !record {model: purchase.order, id: purchase_order_po11}:
+    company_id: base.main_company
+    date_order: '2011-01-1'
+    invoice_method: order
+    location_id: stock.stock_location_stock
+    order_line:
+      - date_planned: '2011-01-11'
+        name: MOB1
+        price_unit: 2000.0
+        product_id: 'product_product_mob1'
+        product_qty: 3.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+- 
+  Initially purchase order is in the draft state.
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'draft'  
+-
+  I confirm the purchase order for MOB1.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po11}
+-  
+  I check that the order which was initially in the draft state has transmit to confirm state for double validation.
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'confirmed'
+-
+  I Approved purchase order by Supplier for MOB1.
+-
+  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po11}
+-  
+  I check that the order which was initially in the confirmed state has transmit to approved state.
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'approved' 
+-
+  Test for purchase double validation in which Total < Limit Amount.
+- 
+  I create purchase order for MOB1 for 1 quantity.
+- 
+  !record {model: purchase.order, id: purchase_order_po12}:
+    company_id: base.main_company
+    date_order: '2011-01-02'
+    invoice_method: order
+    location_id: stock.stock_location_stock
+    order_line:
+      - date_planned: '2011-01-12'
+        name: MOB1
+        price_unit: 2000.0
+        product_id: 'product_product_mob1'
+        product_qty: 1.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+- 
+  Initially purchase order is in the draft state.
+-
+  !assert {model: purchase.order, id: purchase_order_po12}:
+    - state == 'draft'  
+-
+  I confirm the purchase order for MOB1.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po12}
+-  
+  I check that the order which was initially in the draft state has transmit to approved state.
+-
+  !assert {model: purchase.order, id: purchase_order_po12}:
+    - state == 'approved'
+
+
+   
\ No newline at end of file
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index a3658414e0f..d1ec2b1c260 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,10 +18,10 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase - Purchase Requisition",
+    "name" : "Purchase Requisition",
     "version" : "0.1",
     "author" : "OpenERP SA",
-    "category" : "Purchases",
+    "category" : "Purchase Management",
     'complexity': "easy",
     "images" : ['images/purchase_requisitions.jpeg'],
     "website" : "http://www.openerp.com",
@@ -43,7 +43,9 @@ This new object will regroup and will allow you to easily keep track and order a
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"
     ],
     "active": False,
-    "test":['test/purchase_requisition_report.yml'],
+    "test":['test/purchase_requisition_report.yml',
+            'test/purchase_requisition_test.yml',
+            ],
     "installable": True,
     "certificate" : "001023264099823179629",
 }
diff --git a/addons/purchase_requisition/i18n/bg.po b/addons/purchase_requisition/i18n/bg.po
index fcd941776b3..ecbb6d7b6a8 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/ca.po b/addons/purchase_requisition/i18n/ca.po
index 0a546e1644e..d2289cf5faa 100644
--- a/addons/purchase_requisition/i18n/ca.po
+++ b/addons/purchase_requisition/i18n/ca.po
@@ -8,75 +8,75 @@ 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:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 21:52+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En procés"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
 #, python-format
 msgid "No Product in Tender"
-msgstr ""
+msgstr "No hi ha producte en la licitació"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirma"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Supplier"
-msgstr ""
+msgstr "Proveïdor"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,exclusive:0
 msgid "Requisition Type"
-msgstr ""
+msgstr "Tipus de sol·licitud"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Product Detail"
-msgstr ""
+msgstr "Detall del producte"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,date_start:0
 msgid "Requisition Date"
-msgstr ""
+msgstr "Data de sol·licitud"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
@@ -88,29 +88,29 @@ msgstr ""
 #: field:purchase.requisition.line,requisition_id:0
 #: view:purchase.requisition.partner:0
 msgid "Purchase Requisition"
-msgstr ""
+msgstr "Sol·licitud de compra"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
 msgid "Purchase Requisition Line"
-msgstr ""
+msgstr "Línia sol·licitud de compra"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_product_product
 #: field:purchase.requisition.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producte"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "La referència de la comanda ha de ser única!"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -118,37 +118,39 @@ msgid ""
 "Check this box so that requisitions generates purchase requisitions instead "
 "of directly requests for quotations."
 msgstr ""
+"Marqueu aquesta opció per generar sol·licituds de compra en comptes de "
+"directament sol·licituds de pressupostos."
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
 #: field:purchase.requisition.line,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Request a Quotation"
-msgstr ""
+msgstr "Sol·licita un pressupost"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
 msgid "Multiple Requisitions"
-msgstr ""
+msgstr "Sol·licituds múltiples"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Approved by Supplier"
-msgstr ""
+msgstr "Aprovat pel proveïdor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Inicialitza a esborrany"
 
 #. module: purchase_requisition
 #: model:ir.module.module,description:purchase_requisition.module_meta_information
@@ -160,21 +162,27 @@ msgid ""
 "    This new object will regroup and will allow you to easily keep track and "
 "order all your purchase orders.\n"
 msgstr ""
+"\n"
+"    Aquest mòdul li permet gestionar les seves sol·licituds de compra.\n"
+"    Quan es crea una comanda de compra, ara té l'oportunitat de desar la "
+"sol·licitud relacionada.\n"
+"    Aquest nou objecte reagruparà i li permetrà fàcilment controlar i "
+"ordenar totes les seves comandes de compra.\n"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Direcció"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referència de la comanda"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -185,53 +193,59 @@ msgid ""
 "negotiation, once you have reviewed all the supplier's offers, you can "
 "validate some and cancel others."
 msgstr ""
+"Una sol·licitud de compra és el pas previ a una sol·licitud de pressupost. "
+"En una sol·licitud de compra (o licitació de compra), podeu registrar els "
+"productes que necessiteu comprar i activar la creació de sol·licituds de "
+"pressupost als proveïdors. Després de la negociació, una vegada que haveu "
+"revisat totes les ofertes del proveïdor, podeu validar algunes i cancel·lar "
+"unes altres."
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
 #: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
 msgid "Purchase Requisitions"
-msgstr ""
+msgstr "Sol·licituds de compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
 msgid "Requisition Reference"
-msgstr ""
+msgstr "Referència de sol·licitud"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,line_ids:0
 msgid "Products to Purchase"
-msgstr ""
+msgstr "Productes a comprar"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,date_end:0
 msgid "Requisition Deadline"
-msgstr ""
+msgstr "Data límit de sol·licitud"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Search Purchase Requisition"
-msgstr ""
+msgstr "Cerca sol·licitud de compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Data comanda"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,exclusive:0
@@ -242,172 +256,176 @@ msgid ""
 "orders.On confirmation of a purchase order it does not cancel the remaining "
 "orders"
 msgstr ""
+"Sol·licitud de compra (exclusiva): En la confirmació d'una comanda de "
+"compra, cancel·la les restants comandes de compra.\n"
+"Sol·licitud de compra (múltiple): Permet tenir diverses comandes de compra. "
+"En la confirmació d'una comanda de compra no cancel·la la resta de comandes."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "Cancel·la comanda de compra"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_order
 #: view:purchase.requisition:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Comanda de compra"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM de producte"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Products"
-msgstr ""
+msgstr "Productes"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Order Date"
-msgstr ""
+msgstr "Data comanda"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
 msgid "Purchase Requisition Partner"
-msgstr ""
+msgstr "Proveïdor de sol·licitud de compra"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Quotation Detail"
-msgstr ""
+msgstr "Detall del pressupost"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Purchase for Requisitions"
-msgstr ""
+msgstr "Compra per a sol·licituds"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
 msgid "Purchase orders"
-msgstr ""
+msgstr "Comanda de compra"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: view:purchase.requisition:0
 #: field:purchase.requisition,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Orígen"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Reference"
-msgstr ""
+msgstr "Referència"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Proveïment"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Magatzem"
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
-msgstr ""
+msgstr "Última sol·licitud"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Quotations"
-msgstr ""
+msgstr "Pressuposts"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Qty"
-msgstr ""
+msgstr "Quant."
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
 msgid "Purchase Requisition (exclusive)"
-msgstr ""
+msgstr "Sol·licitud de compra (exclusiva)"
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "Crea pressupost"
 
 #. module: purchase_requisition
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Codi EAN erroni"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel·la"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Confirm Purchase Order"
-msgstr ""
+msgstr "Confirma comanda de compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: purchase_requisition
 #: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
 msgid "Purchase - Purchase Requisition"
-msgstr ""
+msgstr "Compra - Sol·licitud de compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned"
-msgstr ""
+msgstr "Sense assignar"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Requisition"
-msgstr ""
+msgstr "Requisició"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
 msgid "Purchase Orders"
-msgstr ""
+msgstr "Comandes de compra"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
@@ -416,3 +434,5 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 msgstr ""
+"Ja heu demanat un% s de compra d'aquest empresa, heu de cancel·lar l'ordre "
+"de compra per crear una nova cotització."
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index 0df2357f64d..d90df580355 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -440,40 +440,3 @@ msgid ""
 msgstr ""
 "SIe haben bereits einen %s Einkaufsauftrag für diesen Partner, dieser muss "
 "gelöscht werden, bevor ein neuer erstellt werden kann.."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "A purchase requisition is a step before the request for quotation. In a "
-#~ "purchase requisition (or purchase tender), you can record the products you "
-#~ "need to buy and trigger the creation of RfQs to supplier. After the "
-#~ "negotiation, once you have reviewed all the supplier's offers, you can "
-#~ "validate some and cancel others."
-#~ msgstr ""
-#~ "Eine Bedarfsmeldung ist einer Beschaffungsanfrage an Lieferanten "
-#~ "vorgeschaltet. In einer Bedarfsmeldung (oder einer Ausschreibung) können Sie "
-#~ "die Produkte vermerken, die beschafft werden sollen, bevor dann konkret "
-#~ "Angebote bei Lieferanten angefragt werden. Nach abgeschlossener Verhandlung "
-#~ "mit Lieferanten können Sie entscheiden, welches Angebot oder welche Angebote "
-#~ "zur Bedarfsdeckung ausgeführt werden sollen. Die verbleibenden nicht "
-#~ "angenommen Angebote werden dabei automatisch verworfen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/purchase_requisition/i18n/es.po b/addons/purchase_requisition/i18n/es.po
index 8def623da4f..d3367aa6996 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/es_MX.po b/addons/purchase_requisition/i18n/es_MX.po
new file mode 100644
index 00000000000..b9a52fabb87
--- /dev/null
+++ b/addons/purchase_requisition/i18n/es_MX.po
@@ -0,0 +1,437 @@
+# 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-18 01:41+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: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "No Product in Tender"
+msgstr "No hay producto en la licitación"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo de solicitud"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalle del producto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Fecha de solicitud"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "Solicitud de compra"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Línea solicitud de compra"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+"Marque esta opción para generar solicitudes de compra en lugar de "
+"directamente solicitudes de presupuestos."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Solicitar un presupuesto"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Solicitudes múltiples"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Aprobado por proveedor"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid ""
+"\n"
+"    This module allows you to manage your Purchase Requisition.\n"
+"    When a purchase order is created, you now have the opportunity to save "
+"the related requisition.\n"
+"    This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+"\n"
+"    Este módulo le permite gestionar sus solicitudes de compra.\n"
+"    Cuando se crea un pedido de compra, ahora tiene la oportunidad de "
+"guardar la solicitud relacionada.\n"
+"    Este nuevo objeto reagrupará y le permitirá fácilmente controlar y "
+"ordenar todos sus pedidos de compra.\n"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referencia pedido"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"Una solicitud de compra es el paso previo a una solicitud de presupuesto. En "
+"una solicitud de compra (o licitación de compra), puede registrar los "
+"productos que necesita comprar y activar la creación de solicitudes de "
+"presupuesto a los proveedores. Después de la negociación, una vez que haya "
+"revisado todas las ofertas del proveedor, puede validar algunas y cancelar "
+"otras."
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Solicitudes de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referencia de solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Productos a comprar"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Fecha límite de solicitud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Buscar solicitud de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Fecha pedido"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Solicitud de compra (exclusiva): En la confirmación de un pedido de compra, "
+"cancela los restantes pedidos de compra.\n"
+"Solicitud de compra (múltiple): Permite tener varios pedidos de compra. En "
+"la confirmación de un pedido de compra no cancela el resto de pedidos."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar pedido de compra"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "UdM de producto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "["
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Proveedor de solicitud de compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "]"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalle del presupuesto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Compra para solicitudes"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Última solicitud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Solicitud de compra (exclusiva)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crear presupuesto"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Codigo ean incorrecto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmar pedido de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Compra - Solicitud de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "No asignado"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
diff --git a/addons/purchase_requisition/i18n/es_VE.po b/addons/purchase_requisition/i18n/es_VE.po
new file mode 100644
index 00000000000..b9a52fabb87
--- /dev/null
+++ b/addons/purchase_requisition/i18n/es_VE.po
@@ -0,0 +1,437 @@
+# 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-18 01:41+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: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "No Product in Tender"
+msgstr "No hay producto en la licitación"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo de solicitud"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalle del producto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Fecha de solicitud"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "Solicitud de compra"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Línea solicitud de compra"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+"Marque esta opción para generar solicitudes de compra en lugar de "
+"directamente solicitudes de presupuestos."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Solicitar un presupuesto"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Solicitudes múltiples"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Aprobado por proveedor"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid ""
+"\n"
+"    This module allows you to manage your Purchase Requisition.\n"
+"    When a purchase order is created, you now have the opportunity to save "
+"the related requisition.\n"
+"    This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+"\n"
+"    Este módulo le permite gestionar sus solicitudes de compra.\n"
+"    Cuando se crea un pedido de compra, ahora tiene la oportunidad de "
+"guardar la solicitud relacionada.\n"
+"    Este nuevo objeto reagrupará y le permitirá fácilmente controlar y "
+"ordenar todos sus pedidos de compra.\n"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referencia pedido"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"Una solicitud de compra es el paso previo a una solicitud de presupuesto. En "
+"una solicitud de compra (o licitación de compra), puede registrar los "
+"productos que necesita comprar y activar la creación de solicitudes de "
+"presupuesto a los proveedores. Después de la negociación, una vez que haya "
+"revisado todas las ofertas del proveedor, puede validar algunas y cancelar "
+"otras."
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Solicitudes de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referencia de solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Productos a comprar"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Fecha límite de solicitud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Buscar solicitud de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Fecha pedido"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Solicitud de compra (exclusiva): En la confirmación de un pedido de compra, "
+"cancela los restantes pedidos de compra.\n"
+"Solicitud de compra (múltiple): Permite tener varios pedidos de compra. En "
+"la confirmación de un pedido de compra no cancela el resto de pedidos."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar pedido de compra"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "UdM de producto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "["
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Proveedor de solicitud de compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "]"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalle del presupuesto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Compra para solicitudes"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Última solicitud"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Solicitud de compra (exclusiva)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crear presupuesto"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Codigo ean incorrecto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmar pedido de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Compra - Solicitud de compra"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "No asignado"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Solicitud"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
diff --git a/addons/purchase_requisition/i18n/fi.po b/addons/purchase_requisition/i18n/fi.po
index c2b9043f1da..ea003c9c7d9 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: 2011-06-21 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/fr.po b/addons/purchase_requisition/i18n/fr.po
index fffa6fbeb1a..2ba6c591e29 100644
--- a/addons/purchase_requisition/i18n/fr.po
+++ b/addons/purchase_requisition/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-18 16:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-09-26 12:22+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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -193,11 +193,11 @@ msgid ""
 "negotiation, once you have reviewed all the supplier's offers, you can "
 "validate some and cancel others."
 msgstr ""
-"Une demande d'achat est une étape avant la demande de devis. Dans une "
-"demande d'achat (ou appel d'offre), vous pouvez enregistrer les produits que "
-"vous avez besoin d'acheter et automatiser la création des demandes de devis "
-"à vos fournisseurs. Après la négociation, quand vous avez toutes les offres "
-"de vos fournisseurs, vous pouvez en valider certaines et en annuler d'autres."
+"La demande d'achat précède la demande de devis.  La demande d'achat "
+"répertorie les produits dont on a besoin et on peut y déclencher des "
+"demandes de devis auprès des fournisseurs. Aprés la négociation, lorsque "
+"toutes les offres des fournisseurs ont été examinées, vous pouvez valider "
+"certaines offres et éliminer les autres."
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
@@ -344,7 +344,7 @@ msgstr "Référence"
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_procurement_order
 msgid "Procurement"
-msgstr "Besoin"
+msgstr "Approvisionnement"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
@@ -434,3 +434,5 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 msgstr ""
+"Il existe déjà une commande %s pour ce partenaire, vous devez annuler cette "
+"commande avant de faire un nouveau devis."
diff --git a/addons/purchase_requisition/i18n/hu.po b/addons/purchase_requisition/i18n/hu.po
index 3d51e04f9a2..88b414a692b 100644
--- a/addons/purchase_requisition/i18n/hu.po
+++ b/addons/purchase_requisition/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-31 20:01+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/id.po b/addons/purchase_requisition/i18n/id.po
index 29dd405c376..a4ec156ec4e 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/it.po b/addons/purchase_requisition/i18n/it.po
index 5ba133bdd9d..3daf8266ac2 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -265,7 +265,7 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
-msgstr "Cancella ordine di acquisto"
+msgstr "Annulla Ordine d'Acquisto"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_order
@@ -298,7 +298,7 @@ msgstr "Data ordine"
 #. module: purchase_requisition
 #: selection:purchase.requisition,state:0
 msgid "Cancelled"
-msgstr "Cancellato"
+msgstr "Annullato"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -391,7 +391,7 @@ msgstr "Fatto"
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "_Cancel"
-msgstr "_Cancella"
+msgstr "_Annulla"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -435,17 +435,3 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 msgstr ""
-
-#~ msgid ""
-#~ "A purchase requisition is a step before the request for quotation. In a "
-#~ "purchase requisition (or purchase tender), you can record the products you "
-#~ "need to buy and trigger the creation of RfQs to supplier. After the "
-#~ "negotiation, once you have reviewed all the supplier's offers, you can "
-#~ "validate some and cancel others."
-#~ msgstr ""
-#~ "Una richiesta di vendita rappresenta un passo antecedente al preventivo. In "
-#~ "un richiesta di vendita (o offerta di vendita), è possibile registrare i "
-#~ "prodotti che si desidera comprare ed innescare la creazione di una richiesta "
-#~ "preventivo per il fornitore. Dopo che la negoziazione è terminata, non "
-#~ "appena quindi tutte le offerte dei fornitori sono state valutate, è "
-#~ "possibile confermarne alcune e cancellarne altre."
diff --git a/addons/purchase_requisition/i18n/nl.po b/addons/purchase_requisition/i18n/nl.po
index 80faa0332a6..9a3caaae33c 100644
--- a/addons/purchase_requisition/i18n/nl.po
+++ b/addons/purchase_requisition/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/pl.po b/addons/purchase_requisition/i18n/pl.po
index 8f913d7ada8..43d68f6bafe 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -416,24 +416,3 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 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 "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
diff --git a/addons/purchase_requisition/i18n/pt.po b/addons/purchase_requisition/i18n/pt.po
index 292340362d5..1ecc8601a32 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/pt_BR.po b/addons/purchase_requisition/i18n/pt_BR.po
index 1e6b1d72acc..a32b8c5d8e8 100644
--- a/addons/purchase_requisition/i18n/pt_BR.po
+++ b/addons/purchase_requisition/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/ro.po b/addons/purchase_requisition/i18n/ro.po
index 652e2430f86..4230bb1286e 100644
--- a/addons/purchase_requisition/i18n/ro.po
+++ b/addons/purchase_requisition/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 18:25+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index d663b8137be..f6fc4ab295a 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -161,6 +161,12 @@ msgid ""
 "    This new object will regroup and will allow you to easily keep track and "
 "order all your purchase orders.\n"
 msgstr ""
+"\n"
+"    Этот модуль позволяет вам управлять запросами на закупку (тендерами).\n"
+"    При создании заказа на закупку, вы сможете указать связанный с ним "
+"запрос.\n"
+"    Этот новый объект сгруппирует и позволит отследить и упорядочить все "
+"ваши заказы на закупку.\n"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
@@ -425,39 +431,3 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid ""
-#~ "A purchase requisition is a step before the request for quotation. In a "
-#~ "purchase requisition (or purchase tender), you can record the products you "
-#~ "need to buy and trigger the creation of RfQs to supplier. After the "
-#~ "negotiation, once you have reviewed all the supplier's offers, you can "
-#~ "validate some and cancel others."
-#~ msgstr ""
-#~ "Заявка на закупку это шаг перед запросом цен. В заявке на закупку (или "
-#~ "тендере на закупку) вы записываете ТМЦ для закупки и подтверждаете запросы "
-#~ "цен у поставщиков. После переговоров, просмотрев все предложения "
-#~ "поставщиков, вы можете утвердить одни предложения и отменить другие."
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 4317b09d26a..790fd5bffff 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/zh_CN.po b/addons/purchase_requisition/i18n/zh_CN.po
index 2fc29e1ad6c..aab4de9b66c 100644
--- a/addons/purchase_requisition/i18n/zh_CN.po
+++ b/addons/purchase_requisition/i18n/zh_CN.po
@@ -14,69 +14,69 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
 #, python-format
 msgid "No Product in Tender"
-msgstr ""
+msgstr "没请购的产品"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Confirm"
-msgstr ""
+msgstr "确认"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Supplier"
-msgstr ""
+msgstr "供应商"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,exclusive:0
 msgid "Requisition Type"
-msgstr ""
+msgstr "请购类型"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Product Detail"
-msgstr ""
+msgstr "产品详情"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,date_start:0
 msgid "Requisition Date"
-msgstr ""
+msgstr "请购日期"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
@@ -88,67 +88,67 @@ msgstr ""
 #: field:purchase.requisition.line,requisition_id:0
 #: view:purchase.requisition.partner:0
 msgid "Purchase Requisition"
-msgstr ""
+msgstr "采购申请"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
 msgid "Purchase Requisition Line"
-msgstr ""
+msgstr "采购申请明细"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_product_product
 #: field:purchase.requisition.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "单号必须唯一！"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,description:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
 msgid ""
 "Check this box so that requisitions generates purchase requisitions instead "
 "of directly requests for quotations."
-msgstr ""
+msgstr "勾选选项，请购生成采购申请而不是直接生成询价单"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
 #: field:purchase.requisition.line,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Request a Quotation"
-msgstr ""
+msgstr "请求询价"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
 msgid "Multiple Requisitions"
-msgstr ""
+msgstr "多个申请"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Approved by Supplier"
-msgstr ""
+msgstr "供应商已核审批"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "重置为草稿"
 
 #. module: purchase_requisition
 #: model:ir.module.module,description:purchase_requisition.module_meta_information
@@ -160,21 +160,25 @@ msgid ""
 "    This new object will regroup and will allow you to easily keep track and "
 "order all your purchase orders.\n"
 msgstr ""
+"\n"
+"    这模块允许您管理您的请购。\n"
+"生成与采购订相关的请购。\n"
+"它现在将重组和让您轻松跟踪和安排您所有的采购订单。\n"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "地址"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Order Reference"
-msgstr ""
+msgstr "单号"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -185,53 +189,55 @@ msgid ""
 "negotiation, once you have reviewed all the supplier's offers, you can "
 "validate some and cancel others."
 msgstr ""
+"询价的前一步是采购申请，在采购申请您能记录您需求购买的产品并触发生成给供应商的询价单，之后经过协商，一旦您审阅过所有供应商提供的信息，您可以确认他并取消其"
+"他人。"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
 #: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
 msgid "Purchase Requisitions"
-msgstr ""
+msgstr "采购申请"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,name:0
 msgid "Requisition Reference"
-msgstr ""
+msgstr "采购申请"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,line_ids:0
 msgid "Products to Purchase"
-msgstr ""
+msgstr "采购的产品"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,date_end:0
 msgid "Requisition Deadline"
-msgstr ""
+msgstr "请购截止日期"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Search Purchase Requisition"
-msgstr ""
+msgstr "搜索采购申请"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "下单日期"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,exclusive:0
@@ -242,172 +248,174 @@ msgid ""
 "orders.On confirmation of a purchase order it does not cancel the remaining "
 "orders"
 msgstr ""
+"采购申请(排它的)：确认采购订单，它会取消剩下的采购订单。\n"
+"采购申请(复合的)：它允许有多个采购订单，确认采购订单它不会取消剩下的采购订单。"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "取消采购订单"
 
 #. module: purchase_requisition
 #: 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:44
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product UoM"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Products"
-msgstr ""
+msgstr "产品"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Order Date"
-msgstr ""
+msgstr "订单日期"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
 msgid "Purchase Requisition Partner"
-msgstr ""
+msgstr "采购申请业务伙伴"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Quotation Detail"
-msgstr ""
+msgstr "询价详情"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Purchase for Requisitions"
-msgstr ""
+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
 #: view:purchase.requisition:0
 #: field:purchase.requisition,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "源"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Reference"
-msgstr ""
+msgstr "单号"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "需求单"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "仓库"
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
 msgid "Latest Requisition"
-msgstr ""
+msgstr "最近的请购"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Quotations"
-msgstr ""
+msgstr "询价单"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
 msgid "Purchase Requisition (exclusive)"
-msgstr ""
+msgstr "采购申请(排它的)"
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "创建询价单"
 
 #. module: purchase_requisition
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "_Cancel"
-msgstr ""
+msgstr "取消(_C)"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Confirm Purchase Order"
-msgstr ""
+msgstr "确认采购订单"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: purchase_requisition
 #: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
 msgid "Purchase - Purchase Requisition"
-msgstr ""
+msgstr "采购 - 采购申请"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned"
-msgstr ""
+msgstr "未分配"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Requisition"
-msgstr ""
+msgstr "采购申请"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
 msgid "Purchase Orders"
-msgstr ""
+msgstr "采购订单"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cb31709b20e..d619e3a82f5 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -25,6 +25,7 @@ import netsvc
 
 from osv import fields,osv
 from tools.translate import _
+import decimal_precision as dp
 
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
@@ -41,7 +42,7 @@ class purchase_requisition(osv.osv):
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
         'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),        
-        'state': fields.selection([('draft','Draft'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
+        'state': fields.selection([('draft','New'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
     }
     _defaults = {
         'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -93,7 +94,7 @@ class purchase_requisition_line(osv.osv):
     _columns = {
         'product_id': fields.many2one('product.product', 'Product' ),
         'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
-        'product_qty': fields.float('Quantity', digits=(16,2)),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
@@ -164,7 +165,7 @@ class procurement_order(osv.osv):
             if procurement.product_id.purchase_requisition:
                 requisition_id=self.pool.get('purchase.requisition').create(cr, uid, {
                     'name': sequence_obj.get(cr, uid, 'purchase.order.requisition'),
-                    'origin': procurement.name,
+                    'origin': procurement.origin,
                     'date_end': procurement.date_planned,
                     'warehouse_id':procurement.purchase_id and procurement.purchase_id.warehouse_id.id,
                     'company_id':procurement.company_id.id,
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index f9813874c12..e0f09f6f7d6 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -21,11 +21,26 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='Not Invoiced']" position="after">
-             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" separator="1" help="Purchase Orders with requisition"/>
+            <xpath expr="/search/group/filter[@name='not_invoiced']" position="after">
+             <separator orientation="vertical"/>
+             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
             </xpath>
         </field>
     </record>
+
+    <record model="ir.ui.view" id="request_for_quotation_inherit">
+        <field name="name">request.for.quotation.select.inherit</field>
+        <field name="type">form</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.view_request_for_quotation_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="/search/group/filter[@name='not_invoiced']" position="after">
+             <separator orientation="vertical"/>
+             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
+            </xpath>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="view_purchase_requisition_form">
         <field name="name">purchase.requisition.form</field>
         <field name="type">form</field>
@@ -60,9 +75,9 @@
                         </field>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1"/>
+                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
                         <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-                        <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
+                        <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
                         <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                         <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
                     </group>
@@ -78,8 +93,8 @@
                                 <field name="minimum_planned_date"/>
                                 <field name="origin"/>
                                 <field name="state"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>								
-								<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>                                
+                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
                             </tree>
                          </field>
@@ -102,7 +117,7 @@
         <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree colors="grey:state in ('done');red:date_end&lt;current_date and state not in ('done','cancel');black:date_end&gt;=current_date;" string="Purchase Requisition">
+            <tree colors="grey:state == 'done';red:date_end&lt;current_date and state not in ('done','cancel');black:date_end&gt;=current_date;" string="Purchase Requisition">
                 <field name="name"/>
                 <field name="user_id"/>
                 <field name="date_start"/>
@@ -119,20 +134,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
-                 <group col='10' colspan='4'>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/>
+                 <group>
+                    <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
+                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="user_id" />
                     <field name="exclusive" />
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                  	<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-					<separator orientation="vertical"/>
+                  <group expand="0" string="Group By..." groups="base.group_extended">
+                    <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
@@ -187,12 +203,13 @@
             </xpath>
         </field>
     </record>
-	<act_window
+    <act_window
             domain="[('requisition_id', '=', active_id)]"
+            context="{'default_requisition_id': active_id}"
             id="act_res_partner_2_purchase_order"
             name="Purchase orders"
             res_model="purchase.order"
             src_model="purchase.requisition"/>
-    
+
     </data>
 </openerp>
diff --git a/addons/purchase_requisition/test/purchase_requisition_test.yml b/addons/purchase_requisition/test/purchase_requisition_test.yml
new file mode 100755
index 00000000000..403eaca04fc
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_test.yml
@@ -0,0 +1,166 @@
+-
+  In order to test the purchase requisition flow,I start by creating a new product 'MOB1'
+- 
+  !record {model: product.product, id: product_product_mob1}:
+    name: MOB1
+    categ_id: product.product_category_3
+    cost_method: standard
+    mes_type: fixed
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    standard_price: 2000.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+- 
+  I create purchase requisition for MOB1 for 1 quantity.
+- 
+  !record {model: purchase.requisition, id: purchase_requisition_te0}:
+    company_id: base.main_company
+    exclusive: multiple
+    line_ids:
+      - company_id: base.main_company
+        product_id: product_product_mob1
+        product_qty: 10.0
+        product_uom_id: product.product_uom_unit
+    name: TE00009
+- 
+  Initially purchase requisition is in draft state.
+-
+  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
+    - state == 'draft'  
+- 
+  Copy purchase requisition which is in draft state than confirm and Done it.
+-
+  !python {model: purchase.requisition}: |
+    copy_id = self.copy(cr, uid, ref("purchase_requisition_te0"))   
+    self.tender_cancel(cr, uid, [copy_id], context=None)
+    self.tender_reset(cr, uid, [copy_id], context=None)
+    self.tender_in_progress(cr, uid, [copy_id], context=None)
+    self.tender_done(cr, uid, [copy_id], context=None)
+- 
+  I confirm the purchase requisition for MOB1.
+- 
+  !python {model: purchase.requisition}: |
+    self.tender_in_progress(cr, uid, [ref("purchase_requisition_te0")])
+-
+  I check that the purchase requisition which was initially in the draft state has transmit to In Progress after confirm it.
+-
+  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
+    - state == 'in_progress'
+- 
+  In order to create a purchase order for 'Axelor', i click on the wizard 'Request a Quotation' and create record for wizard.
+- 
+  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
+    partner_address_id: base.res_partner_address_3000
+    partner_id: base.res_partner_desertic_hispafuentes
+- 
+  I click on 'Create Quotation' for creating PO.
+- 
+  !python {model: purchase.requisition.partner}: |
+    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"active_model": "purchase.requisition",
+      "active_ids": [ref("purchase_requisition_te0")],"active_id": ref("purchase_requisition_te0"), })
+-
+  I confirm the purchase order of Axelor.
+-
+  !python {model: purchase.order}: |
+    purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")   
+    if purchase_id:
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
+-
+  I check that Quotation of Axelor is Approved.
+-        
+  !python {model: purchase.order}: |
+   purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])[0]
+   state=self.browse(cr,uid,purchase_id).state
+   assert (state=='approved')
+- 
+  I click on Done button
+- 
+  !python {model: purchase.requisition}: |
+    self.tender_done(cr, uid, [ref("purchase_requisition_te0")],)
+-
+  I check that after click on Done button state is in done.
+-
+  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
+    - state == 'done'
+-
+  In order to test the purchase requisition flow for Requisition Type is exclusive 
+- 
+  I create purchase requisition for Requisition Type is exclusive 
+- 
+  !record {model: purchase.requisition, id: purchase_requisition_ex1}:
+    company_id: base.main_company
+    exclusive: exclusive
+    line_ids:
+      - company_id: base.main_company
+        product_id: product_product_mob1
+        product_qty: 10.0
+        product_uom_id: product.product_uom_unit
+    name: TE000010
+- 
+   I Create a First Purchase Order for the supplier 'Distrib PC'.
+- 
+  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_1}:
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+- 
+  I create Quotations For supplier 'Distrib PC'.
+- 
+  !python {model: purchase.requisition.partner}: |
+    self.create_order(cr, uid, [ref("purchase_requisition_partner_1")], {"active_model": "purchase.requisition",
+      "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })    
+- 
+   I Create a Second Purchase Order for the supplier ASUStek.
+- 
+  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_2}:
+    partner_address_id: base.res_partner_address_tang
+    partner_id: base.res_partner_asus
+- 
+  I create Quotations For supplier 'ASUStek'.
+- 
+  !python {model: purchase.requisition.partner}: |
+    self.create_order(cr, uid, [ref("purchase_requisition_partner_2")], {"active_model": "purchase.requisition",
+      "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })
+- 
+  I check that Initially purchase requisition is draft state.
+-
+  !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
+    - state == 'draft'  
+-
+  I confirm the Second purchase order of ASUStek, than check that Quotation is Approved.
+-
+  !python {model: purchase.order}: |
+    purchase_id= self.search(cr, uid, [('partner_id','=',ref("base.res_partner_asus")),('requisition_id','=',ref("purchase_requisition_ex1"))])
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")   
+    if purchase_id:
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
+    state=self.browse(cr,uid,purchase_id[0]).state
+    assert (state=='approved')
+    
+-
+  I check that Quotation of Distrib PC is cancelled.
+-        
+  !python {model: purchase.order}: |
+   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
+   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','=',ref("purchase_requisition_ex1"))])[0]
+   state=self.browse(cr,uid,purchase_id).state
+   assert (state=='cancel')
+-
+  I check that Purchase Requisition is Done.
+-
+  !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
+    - state == 'done'
diff --git a/addons/report_designer/__init__.py b/addons/report_designer/__init__.py
index 3511d091ecb..9a3d6d2fbb6 100644
--- a/addons/report_designer/__init__.py
+++ b/addons/report_designer/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 73982086c8f..fd29d2b96ee 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -21,28 +21,27 @@
 
 
 {
-    "name" : "Reporting Tools Installer",
+    "name" : "Reporting Hidden Installer",
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": "Tools",
+    "category": "Hidden",
     "description": """
-Installer for reporting tools.
+Installer for reporting Hidden.
 ==============================
 
-Makes the Reporting Tools Configuration available from where you can install
+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',
-        'report_designer_installer.xml',
     ],
     'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate' : '00764037194670093149',
-    'images': ['images/config_reporting_tools.jpeg'],
+    'images': ['images/config_reporting_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/i18n/bg.po b/addons/report_designer/i18n/bg.po
index 667a29f4602..3a2fd4344ac 100644
--- a/addons/report_designer/i18n/bg.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/ca.po b/addons/report_designer/i18n/ca.po
index 6554663e929..3158922e088 100644
--- a/addons/report_designer/i18n/ca.po
+++ b/addons/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/de.po b/addons/report_designer/i18n/de.po
index 0fd14b895d1..e51d1f78e62 100644
--- a/addons/report_designer/i18n/de.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
@@ -106,22 +106,3 @@ msgstr ""
 #: field:report_designer.installer,progress:0
 msgid "Configuration Progress"
 msgstr "Abfolge Konfiguration"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/report_designer/i18n/el.po b/addons/report_designer/i18n/el.po
index 20455c5e415..fffcdd78ac9 100644
--- a/addons/report_designer/i18n/el.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
index 10b89b32237..a532b64bd9b 100644
--- a/addons/report_designer/i18n/es.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
@@ -106,24 +106,3 @@ msgstr ""
 #: field:report_designer.installer,progress:0
 msgid "Configuration Progress"
 msgstr "Progreso configuración"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura 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 "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/report_designer/i18n/es_MX.po b/addons/report_designer/i18n/es_MX.po
new file mode 100644
index 00000000000..f6105aff7ce
--- /dev/null
+++ b/addons/report_designer/i18n/es_MX.po
@@ -0,0 +1,108 @@
+# 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
new file mode 100644
index 00000000000..f6105aff7ce
--- /dev/null
+++ b/addons/report_designer/i18n/es_VE.po
@@ -0,0 +1,108 @@
+# 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
index cdf6c3a0a71..5b36b48e9ed 100644
--- a/addons/report_designer/i18n/fi.po
+++ b/addons/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: 2011-06-15 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/fr.po b/addons/report_designer/i18n/fr.po
index ddeb7b3c7e1..d0afe874b35 100644
--- a/addons/report_designer/i18n/fr.po
+++ b/addons/report_designer/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 <quentin@theuret.net>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/gl.po b/addons/report_designer/i18n/gl.po
index 5c3e6542fbd..2e0fa12c47f 100644
--- a/addons/report_designer/i18n/gl.po
+++ b/addons/report_designer/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/hu.po b/addons/report_designer/i18n/hu.po
index 1c3aeaafe11..c414a8520c2 100644
--- a/addons/report_designer/i18n/hu.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/it.po b/addons/report_designer/i18n/it.po
index a0a04a934b0..dce6caf5662 100644
--- a/addons/report_designer/i18n/it.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
@@ -105,15 +105,3 @@ msgstr ""
 #: field:report_designer.installer,progress:0
 msgid "Configuration Progress"
 msgstr "Avanzamento configurazione"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
diff --git a/addons/report_designer/i18n/mn.po b/addons/report_designer/i18n/mn.po
index 51f07c91a69..91a77b33f8c 100644
--- a/addons/report_designer/i18n/mn.po
+++ b/addons/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/nl.po b/addons/report_designer/i18n/nl.po
index 4be662e622a..750aff37802 100644
--- a/addons/report_designer/i18n/nl.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/pt.po b/addons/report_designer/i18n/pt.po
index c92e6b4a69e..5e59bab2226 100644
--- a/addons/report_designer/i18n/pt.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/pt_BR.po b/addons/report_designer/i18n/pt_BR.po
index b13cc3d2971..7d1ded72029 100644
--- a/addons/report_designer/i18n/pt_BR.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
@@ -100,24 +100,3 @@ msgstr ""
 #: field:report_designer.installer,progress:0
 msgid "Configuration Progress"
 msgstr "Configuração em Progresso"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido 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 pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/report_designer/i18n/ro.po b/addons/report_designer/i18n/ro.po
index b0126ea2ef5..e3642b04bd5 100644
--- a/addons/report_designer/i18n/ro.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/ru.po b/addons/report_designer/i18n/ru.po
index b828422d6d3..bfcd2561eed 100644
--- a/addons/report_designer/i18n/ru.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
@@ -36,7 +36,7 @@ msgstr "Настройка"
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: report_designer
 #: model:ir.model,name:report_designer.model_report_designer_installer
@@ -51,7 +51,7 @@ msgstr "Изображение"
 #. module: report_designer
 #: field:report_designer.installer,base_report_designer:0
 msgid "OpenOffice Report Designer"
-msgstr "Конструктор отчета OpenOffice"
+msgstr "Конструктор отчетов OpenOffice"
 
 #. module: report_designer
 #: model:ir.module.module,shortdesc:report_designer.module_meta_information
@@ -64,11 +64,13 @@ 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 "Инструментарий настройки отчетов"
+msgstr "Настроить генератор отчётов"
 
 #. module: report_designer
 #: help:report_designer.installer,base_report_creator:0
@@ -76,6 +78,8 @@ 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
@@ -84,6 +88,9 @@ msgid ""
 "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
@@ -91,29 +98,10 @@ msgid ""
 "Installer for reporting tools selection\n"
 "    "
 msgstr ""
+"Установщик инструментария отчётов\n"
+"    "
 
 #. module: report_designer
 #: field:report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Настройка выполняется"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
+msgstr "Выполнение настройки"
diff --git a/addons/report_designer/i18n/sv.po b/addons/report_designer/i18n/sv.po
index 23e985e5b48..8bd9bb1ac0a 100644
--- a/addons/report_designer/i18n/sv.po
+++ b/addons/report_designer/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
@@ -96,6 +96,3 @@ msgstr ""
 #: field:report_designer.installer,progress:0
 msgid "Configuration Progress"
 msgstr "Konfigurationsförlopp"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
diff --git a/addons/report_designer/i18n/th.po b/addons/report_designer/i18n/th.po
new file mode 100644
index 00000000000..1625e20012d
--- /dev/null
+++ b/addons/report_designer/i18n/th.po
@@ -0,0 +1,98 @@
+# 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: 2011-11-18 05:13+0000\n"
+"X-Generator: Launchpad (build 14299)\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
index 6c9cbdf5925..01ddd1722b1 100644
--- a/addons/report_designer/i18n/tr.po
+++ b/addons/report_designer/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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
diff --git a/addons/report_designer/i18n/zh_CN.po b/addons/report_designer/i18n/zh_CN.po
index 51f8409e356..feeb3fd4486 100644
--- a/addons/report_designer/i18n/zh_CN.po
+++ b/addons/report_designer/i18n/zh_CN.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: 2011-07-15 04:51+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "报表工具设置"
+msgstr "报告工具设置"
 
 #. module: report_designer
 #: field:report_designer.installer,base_report_creator:0
@@ -56,19 +56,19 @@ msgstr "OpenOffice报表设计"
 #. module: report_designer
 #: model:ir.module.module,shortdesc:report_designer.module_meta_information
 msgid "Reporting Tools"
-msgstr "报表工具"
+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 "系统有内建报表的能力可以在未来改善以下是一些应用"
+msgstr "系统有内建报告能力可以在未来改善以下是一些应用"
 
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "Configure Reporting Tools"
-msgstr "设置报表工具"
+msgstr "设置报告工具"
 
 #. module: report_designer
 #: help:report_designer.installer,base_report_creator:0
@@ -91,7 +91,7 @@ msgid ""
 "Installer for reporting tools selection\n"
 "    "
 msgstr ""
-"选择要安装的报表工具\n"
+"安装选择的报告工具\n"
 "    "
 
 #. module: report_designer
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
deleted file mode 100644
index e4bbc4ffa93..00000000000
--- a/addons/report_designer/installer.py
+++ /dev/null
@@ -1,35 +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 osv import fields, osv
-
-class report_designer_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Reporting
-        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="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."),
-        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
-                                "reports  on several objects. It's a SQL query builder and browser for end users."),
-    }
-report_designer_installer()
-
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
deleted file mode 100644
index d8d1798578e..00000000000
--- a/addons/report_designer/report_designer_installer.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_report_designer_installer" model="ir.ui.view">
-      <field name="name">report_designer.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='report_designer']" position="replace">
-            <newline/>
-            <separator  string="Advanced Reporting Features" colspan="4" />
-            <field name="base_report_designer" />
-            <field name="base_report_creator" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index b3101317ece..6c80e0f2b81 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Intrastat Reporting',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Hidden',
     'description': """
 A module that adds intrastat reports.
 =====================================
diff --git a/addons/report_intrastat/i18n/ar.po b/addons/report_intrastat/i18n/ar.po
index 00a02e2ca12..85e35a426d4 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 764a25c46b1..78c262aa8f9 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 60da97b9102..67aff092267 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f5edf897d5e..4e0cda8769c 100644
--- a/addons/report_intrastat/i18n/ca.po
+++ b/addons/report_intrastat/i18n/ca.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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancel·lada"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "El codi de país ha de ser únic!"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -52,6 +52,8 @@ msgstr "Preu unitat"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Error: La UdM per defecte i la UdM de compra han d'estar en la mateixa "
+"categoria."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@@ -81,7 +83,7 @@ msgstr "Impostos:"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -92,7 +94,7 @@ msgstr "Descripció"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
@@ -132,17 +134,17 @@ msgstr "Base"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "Aquest any"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -170,12 +172,12 @@ msgstr "Total (amb impostos):"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
@@ -195,21 +197,25 @@ msgid ""
 "    This module gives the details of the goods traded between the countries "
 "of European Union "
 msgstr ""
+"\n"
+"    Un mòdul que afegeix informes intrastat.\n"
+"    Aquest mòdul proporciona informació de les mercaderies comercialitzades "
+"entre els països de la Unió Europea. "
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "El nom del país ha de ser únic!"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -219,7 +225,7 @@ msgstr "Impostos"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -256,12 +262,12 @@ msgstr "Unitats subministrades"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -271,12 +277,12 @@ msgstr "Factura d'abonament"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "Origen del document"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Observació posició fiscal :"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -287,7 +293,7 @@ msgstr "Pes"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Plantilla del producte"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
@@ -297,7 +303,7 @@ msgstr "Membre Intrastat"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -332,7 +338,7 @@ msgstr "Fax :"
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. 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 00a02e2ca12..f961abf8d3c 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -354,3 +354,6 @@ msgstr ""
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
 msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index 71bcd395911..029a426a98c 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -389,15 +389,3 @@ msgstr "Intrastat Nummer (Code)"
 
 #~ msgid "Origin"
 #~ msgstr "Herkunft"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 1c8de44137c..3951d5d23fe 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -388,18 +388,3 @@ msgstr "Código Intrastat"
 
 #~ msgid "Origin"
 #~ msgstr "Origen"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ 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."
diff --git a/addons/report_intrastat/i18n/es_AR.po b/addons/report_intrastat/i18n/es_AR.po
index 5038ed36004..b032e1d2277 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es_MX.po b/addons/report_intrastat/i18n/es_MX.po
new file mode 100644
index 00000000000..9b1398332b8
--- /dev/null
+++ b/addons/report_intrastat/i18n/es_MX.po
@@ -0,0 +1,390 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* report_intrastat
+#
+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: 2010-12-28 08:50+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:20+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr "¡El código de país debe ser único!"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: report_intrastat
+#: 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: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Import"
+msgstr "Importación"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Document"
+msgstr "Documento"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat.code,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: report_intrastat
+#: field:report.intrastat,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: report_intrastat
+#: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
+msgid "Invoice Intrastat"
+msgstr "Factura Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: report_intrastat
+#: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
+msgid "Intrastat Reporting - Reporting"
+msgstr "Informes - Informes Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Base"
+msgstr "Base"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat_code
+#: field:product.template,intrastat_id:0
+#: field:report.intrastat,intrastat_id:0
+#: view:report.intrastat.code:0
+msgid "Intrastat code"
+msgstr "Código Intrastat"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Partner Ref."
+msgstr "Ref. empresa"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (inclu. taxes):"
+msgstr "Total (con impuestos):"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat
+msgid "Intrastat report"
+msgstr "Informe Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: report_intrastat
+#: model:ir.module.module,description:report_intrastat.module_meta_information
+msgid ""
+"\n"
+"    A module that adds intrastat reports.\n"
+"    This module gives the details of the goods traded between the countries "
+"of European Union "
+msgstr ""
+"\n"
+"    Un módulo que añade informes intrastat.\n"
+"    Este módulo proporciona información de las mercancías comercializadas "
+"entre los países de la Unión Europea. "
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_res_country
+msgid "Country"
+msgstr "País"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr "¡El nombre del país debe ser único!"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "Intrastat Data"
+msgstr "Datos Intrastat"
+
+#. module: report_intrastat
+#: field:report.intrastat,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: 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 "Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: report_intrastat
+#: field:report.intrastat,supply_units:0
+msgid "Supply Units"
+msgstr "Unidades suministradas"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Refund"
+msgstr "Factura de abono"
+
+#. module: report_intrastat
+#: field:report.intrastat,ref:0
+msgid "Source document"
+msgstr "Documento origen"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat,weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_product_template
+msgid "Product Template"
+msgstr "Plantilla producto"
+
+#. module: report_intrastat
+#: field:res.country,intrastat:0
+msgid "Intrastat member"
+msgstr "Miembro Intrastat"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: report_intrastat
+#: field:report.intrastat,code:0
+msgid "Country code"
+msgstr "Código del país"
+
+#. module: report_intrastat
+#: field:report.intrastat,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: report_intrastat
+#: field:report.intrastat,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Export"
+msgstr "Exportación"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: report_intrastat
+#: field:report.intrastat,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Refund"
+msgstr "Factura de abono de proveedor"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (excl. taxes):"
+msgstr "Total (sin impuestos):"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: report_intrastat
+#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
+#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
+#: field:report.intrastat.code,name:0
+msgid "Intrastat Code"
+msgstr "Código Intrastat"
+
+#~ 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 "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "Intrastat (this month)"
+#~ msgstr "Intrastat (este mes)"
+
+#~ msgid "All Months"
+#~ msgstr "Todos los meses"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Period"
+#~ msgstr "Periodo"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
diff --git a/addons/report_intrastat/i18n/es_VE.po b/addons/report_intrastat/i18n/es_VE.po
new file mode 100644
index 00000000000..9b1398332b8
--- /dev/null
+++ b/addons/report_intrastat/i18n/es_VE.po
@@ -0,0 +1,390 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* report_intrastat
+#
+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: 2010-12-28 08:50+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:20+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Cancelled Invoice"
+msgstr "Factura cancelada"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr "¡El código de país debe ser único!"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: report_intrastat
+#: 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: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Import"
+msgstr "Importación"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "VAT :"
+msgstr "CIF/NIF:"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Document"
+msgstr "Documento"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes:"
+msgstr "Impuestos:"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat.code,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: report_intrastat
+#: field:report.intrastat,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: report_intrastat
+#: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
+msgid "Invoice Intrastat"
+msgstr "Factura Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: report_intrastat
+#: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
+msgid "Intrastat Reporting - Reporting"
+msgstr "Informes - Informes Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Base"
+msgstr "Base"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat_code
+#: field:product.template,intrastat_id:0
+#: field:report.intrastat,intrastat_id:0
+#: view:report.intrastat.code:0
+msgid "Intrastat code"
+msgstr "Código Intrastat"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Partner Ref."
+msgstr "Ref. empresa"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (inclu. taxes):"
+msgstr "Total (con impuestos):"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat
+msgid "Intrastat report"
+msgstr "Informe Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: report_intrastat
+#: model:ir.module.module,description:report_intrastat.module_meta_information
+msgid ""
+"\n"
+"    A module that adds intrastat reports.\n"
+"    This module gives the details of the goods traded between the countries "
+"of European Union "
+msgstr ""
+"\n"
+"    Un módulo que añade informes intrastat.\n"
+"    Este módulo proporciona información de las mercancías comercializadas "
+"entre los países de la Unión Europea. "
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_res_country
+msgid "Country"
+msgstr "País"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr "¡El nombre del país debe ser único!"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "Intrastat Data"
+msgstr "Datos Intrastat"
+
+#. module: report_intrastat
+#: field:report.intrastat,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: 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 "Intrastat"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: report_intrastat
+#: field:report.intrastat,supply_units:0
+msgid "Supply Units"
+msgstr "Unidades suministradas"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Refund"
+msgstr "Factura de abono"
+
+#. module: report_intrastat
+#: field:report.intrastat,ref:0
+msgid "Source document"
+msgstr "Documento origen"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat,weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_product_template
+msgid "Product Template"
+msgstr "Plantilla producto"
+
+#. module: report_intrastat
+#: field:res.country,intrastat:0
+msgid "Intrastat member"
+msgstr "Miembro Intrastat"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: report_intrastat
+#: field:report.intrastat,code:0
+msgid "Country code"
+msgstr "Código del país"
+
+#. module: report_intrastat
+#: field:report.intrastat,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: report_intrastat
+#: field:report.intrastat,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Export"
+msgstr "Exportación"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: report_intrastat
+#: field:report.intrastat,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Refund"
+msgstr "Factura de abono de proveedor"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (excl. taxes):"
+msgstr "Total (sin impuestos):"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: report_intrastat
+#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
+#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
+#: field:report.intrastat.code,name:0
+msgid "Intrastat Code"
+msgstr "Código Intrastat"
+
+#~ 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 "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
+#~ msgid "Intrastat (this month)"
+#~ msgstr "Intrastat (este mes)"
+
+#~ msgid "All Months"
+#~ msgstr "Todos los meses"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Period"
+#~ msgstr "Periodo"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
diff --git a/addons/report_intrastat/i18n/et.po b/addons/report_intrastat/i18n/et.po
index 00dba296e5f..b89bd2dbb88 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8bafc3ddf59..4bb19357356 100644
--- a/addons/report_intrastat/i18n/fi.po
+++ b/addons/report_intrastat/i18n/fi.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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Peruutettu lasku"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Maakoodin tulee olla uniikki"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -52,6 +52,8 @@ msgstr "Yksikköhinta"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa "
+"kategoriassa."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@@ -81,7 +83,7 @@ msgstr "Verot"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -92,7 +94,7 @@ msgstr "Kuvaus"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
@@ -132,17 +134,17 @@ msgstr "Perus"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "Tänä vuonna"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -170,12 +172,12 @@ msgstr "Yhteensä (sisältää verot)"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
@@ -199,17 +201,17 @@ msgstr ""
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "Maa"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Maan nimen pitää olla uniikki!"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -219,7 +221,7 @@ msgstr "Verot"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -251,17 +253,17 @@ msgstr "Laskun luonnos"
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "Toimituserät"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -271,12 +273,12 @@ msgstr "Palautus"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "Alkuperädokumentti"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Tilikausiposition huomautus :"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -287,7 +289,7 @@ msgstr "Paino"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Tuotemalli"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
@@ -297,7 +299,7 @@ msgstr "Intrastat jäsen"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -332,7 +334,7 @@ msgstr "Fax.:"
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. 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 7ad766635c2..25a570c0a96 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e4769a13576..527133136a6 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/hu.po b/addons/report_intrastat/i18n/hu.po
index 2bd6a3dae7b..40e2d66576a 100644
--- a/addons/report_intrastat/i18n/hu.po
+++ b/addons/report_intrastat/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-28 14:01+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f32e3d02609..4e86df0dd46 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b127c2c8534..def49786327 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 32c43c42b19..9d08f3034ea 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bdc7eb703e1..effa9c3f9b0 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dbafd88652b..d9d4b99a3fb 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/nl_BE.po b/addons/report_intrastat/i18n/nl_BE.po
index 0cee8d8a01c..9a8b0fb0a9a 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a116a8e16fe..03a3fb2112b 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e104434efcd..c5dcc4d3c07 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 aae160fc424..35a2e8d8e68 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -341,7 +341,7 @@ msgstr "Ano"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr "Reembolso de Fornecedor"
+msgstr "Devolução ao Fornecedor"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ro.po b/addons/report_intrastat/i18n/ro.po
index bdc7eb703e1..effa9c3f9b0 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 be5f7ab858c..23ddd5725e1 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sl.po b/addons/report_intrastat/i18n/sl.po
index 499afdbb9d2..431e1362696 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 496160b6829..6cf2b2c2667 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: 2011-04-29 05:14+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c86648484a6..f3b4147acac 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9d9a889dcf3..9735a22f465 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0ddb042c330..af5d98247cf 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2043252f74c..edbc5c73c78 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 21fb5b0e0a3..e4da92295cd 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -71,12 +71,12 @@ msgstr "Tài liệu"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
+msgstr "Hoá đơn chiếu lệ"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr "Thuế:"
+msgstr "Các loại thuế:"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index f767e44c41a..8f80fc46ac3 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -8,28 +8,28 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-08-03 07:31+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "取消发票"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "国家代码须唯一"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -50,7 +50,7 @@ msgstr "单价"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "错误:默认的计量单位和采购的计量单位必须是同一类型."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@@ -80,7 +80,7 @@ msgstr "税:"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -91,7 +91,7 @@ msgstr "描述"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
@@ -101,7 +101,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
@@ -131,17 +131,17 @@ msgstr "基于"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "本年"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -149,7 +149,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
@@ -169,12 +169,12 @@ msgstr "总计(含税)"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
@@ -194,21 +194,24 @@ msgid ""
 "    This module gives the details of the goods traded between the countries "
 "of European Union "
 msgstr ""
+"\n"
+"    这个模块增加了欧盟内部报表。\n"
+"    此模块提供了欧盟国家之间的货物交易细节 "
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "国家"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "国家名必须唯一"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -218,7 +221,7 @@ msgstr "税"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -228,7 +231,7 @@ msgstr "金额"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "欧盟内部数据"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0
@@ -255,12 +258,12 @@ msgstr "供应单位"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -270,12 +273,12 @@ msgstr "退还"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "源文档"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "财务状况备注:"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -286,17 +289,17 @@ msgstr "重量"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "产品模板"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "欧盟内部成员"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -311,7 +314,7 @@ msgstr "国家代码"
 #. module: report_intrastat
 #: field:report.intrastat,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: report_intrastat
 #: field:report.intrastat,currency_id:0
@@ -331,7 +334,7 @@ msgstr "传真:"
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -353,7 +356,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 "All Months"
 #~ msgstr "所有月份"
diff --git a/addons/report_intrastat/i18n/zh_TW.po b/addons/report_intrastat/i18n/zh_TW.po
index e85633e001b..7c5f0e8f3ab 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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index a77c4f5d389..ffe90b54d4f 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -124,3 +124,5 @@ class report_intrastat(osv.osv):
             )""")
 
 report_intrastat()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index f9a894efbe8..b14b94ef315 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -97,15 +97,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
                         <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="month" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="intrastat_id" select="1"/>
-                        <field name="type" select="1"/>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="code"/>
+                        <field name="intrastat_id"/>
+                        <field name="type"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
index a97025f4896..e09f929ad56 100644
--- a/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@ -34,4 +34,6 @@ import company
 import report_helper
 import webkit_report
 import ir_report
-import wizard
\ No newline at end of file
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index e593791f826..56496a2d130 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -38,43 +38,53 @@ This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to su
 The module structure and some code is inspired by the report_openoffice module.
 
 The module allows:
-    -HTML report definition
-    -Multi header support
-    -Multi logo
-    -Multi company support
-    -HTML and CSS-3 support (In the limit of the actual WebKIT version)
-    -JavaScript support
-    -Raw HTML debugger
-    -Book printing capabilities
-    -Margins definition
-    -Paper size definition
+
+    - HTML report definition
+    - Multi header support
+    - Multi logo
+    - Multi company support
+    - HTML and CSS-3 support (In the limit of the actual WebKIT version)
+    - JavaScript support
+    - Raw HTML debugger
+    - Book printing capabilities
+    - Margins definition
+    - Paper size definition
 
 ... and much more
 
 Multiple headers and logos can be defined per company.
-CSS style, header and footer body are defined per company
-
-The library to install can be found here
-http://code.google.com/p/wkhtmltopdf/
-The system libraries are available for Linux, Mac OS X i386 and Windows 32.
-
-After installing the wkhtmltopdf library on the OpenERP Server machine, you need to set the
-path to the wkthtmltopdf executable file on the Company.
+CSS style, header and footer body are defined per company.
 
 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).
+
+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
+Ubuntu is known to have this issue.
+
+
+TODO
+----
+
+ * JavaScript support activation deactivation
+ * Collated and book format support
+ * Zip return for separated PDF
+ * Web client WYSIWYG
 
-TODO :
-JavaScript support activation deactivation
-Collated and book format support
-Zip return for separated PDF
-Web client WYSIWYG
                     """,
     "version" : "0.9",
     "depends" : ["base"],
-    "author" : "Camptocamp SA - NBessi",
-    "category": "Tools",
+    "author" : "Camptocamp",
+    "category": "Hidden", # 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",
@@ -88,3 +98,5 @@ Web client WYSIWYG
     "certificate" : "001159699313338995949",
     'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index 82e9f406567..eaf3c02b50f 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -33,24 +33,30 @@ from osv import fields, osv
 
 class ResCompany(osv.osv):
     """Override company to add Header object link a company can have many header and logos"""
-    
+
     _inherit = "res.company"
     _columns = {
                 'header_image' : fields.many2many(
-                                                    'ir.header_img', 
-                                                    'company_img_rel', 
-                                                    'company_id', 
-                                                    'img_id', 
+                                                    'ir.header_img',
+                                                    'company_img_rel',
+                                                    'company_id',
+                                                    'img_id',
                                                     'Available Images',
                                                 ),
                 'header_webkit' : fields.many2many(
-                                                    'ir.header_webkit', 
-                                                    'company_html_rel', 
-                                                    'company_id', 
-                                                    'html_id', 
+                                                    'ir.header_webkit',
+                                                    'company_html_rel',
+                                                    'company_id',
+                                                    'html_id',
                                                     'Available html',
                                                 ),
-                'lib_path' : fields.char('Webkit Executable Path', size=264, help="Complete (Absolute) path to the wkhtmltopdf executable."),
+                'lib_path' : fields.char('Webkit Executable Path', size=264,
+                                         help="Full path to the wkhtmltopdf executable file. "
+                                              "Version 0.9.9 is required. Install a static version "
+                                              "of the library if you experience missing header/footers "
+                                              "on Linux."),
 
-    }   
-ResCompany()
\ No newline at end of file
+    }
+ResCompany()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/default_header.html b/addons/report_webkit/default_header.html
new file mode 100644
index 00000000000..0798209a5b7
--- /dev/null
+++ b/addons/report_webkit/default_header.html
@@ -0,0 +1,22 @@
+<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <style type="text/css"> 
+            ${css}
+        </style>
+        <script>
+        function subst() {
+           var vars={};
+           var x=document.location.search.substring(1).split('&');
+           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+           for(var i in x) {
+             var y = document.getElementsByClassName(x[i]);
+             for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+           }
+         }
+        </script>
+    </head>
+<body style="border:0; margin: 0;" onload="subst()">
+</body>
+</html>
\ No newline at end of file
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
index b8ff6fb2956..b052c612445 100644
--- a/addons/report_webkit/header.py
+++ b/addons/report_webkit/header.py
@@ -33,7 +33,7 @@ from osv import fields, osv
 
 class HeaderHTML(osv.osv):
     """HTML Header allows you to define HTML CSS and Page format"""
-    
+
     _name = "ir.header_webkit"
     _columns = {
         'company_id' : fields.many2one('res.company', 'Company'),
@@ -86,7 +86,7 @@ class HeaderHTML(osv.osv):
                 required=True,
                 help="Select Proper Paper size"
         )
-    }    
+    }
 HeaderHTML()
 
 class HeaderImage(osv.osv):
@@ -97,5 +97,7 @@ class HeaderImage(osv.osv):
         'img' : fields.binary('Image'),
         'name' : fields.char('Name', size=128, required =True, help="Name of Image"),
         'type' : fields.char('Type', size=32, required =True, help="Image type(png,gif,jpeg)")
-    }    
-HeaderImage()
\ No newline at end of file
+    }
+HeaderImage()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index d3e9363acd7..267bc7cb0a4 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -6,31 +6,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form>
-                    <field name='company_id' />
-                    <newline />
-                    <field name="name"/>
-                    <field name="type"/>
+                    <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="type"/>
+                        <field name='company_id' />
+                    </group>
                     <field name="img" widget="image" colspan="4"/>
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="header_webkit">
             <field name="name">res.company.header.html</field>
             <field name="model">ir.header_webkit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form>
-                    <field name="name"/>
-                    <newline/>
-                    <notebook>
-                        <page string="Content and styling" >
-                            <field name='company_id' />
-                            <field name="css" colspan="4"/>
-                            <field name="html" colspan="4"/>
-                            <field name="footer_html" colspan="4" />
-                        </page>
-                        <page string="page setup" >
+                    <field name="name" colspan="4"/>
+                    <notebook colspan="4">
+                        <page string="Company and Page Setup" >
+                            <field name='company_id' colspan="4"/>
                             <field name="orientation" />
                             <field name="format" />
                             <field name="margin_top" />
@@ -38,27 +33,35 @@
                             <field name="margin_left" />
                             <field name="margin_right" />
                         </page>
+                        <page string="CSS Style" >
+                            <field name="css" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Header" >
+                            <field name="html" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Footer" >
+                            <field name="footer_html" colspan="4" nolabel="1"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        
+
         <record id="action_header_img" model="ir.actions.act_window">
-            <field name="name">Header IMG</field>
+            <field name="name">Webkit Logos</field>
             <field name="res_model">ir.header_img</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_header_img" id="menu_header_img" parent="base.menu_res_company_global" sequence="14"/>
-        
+
         <record id="action_header_webkit" model="ir.actions.act_window">
-            <field name="name">Header HTML</field>
+            <field name="name">Webkit Headers/Footers</field>
             <field name="res_model">ir.header_webkit</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_header_webkit" id="menu_header_webkit" parent="base.menu_res_company_global" sequence="14"/>
-        
-        
+
     </data>
 </openerp>
diff --git a/addons/report_webkit/i18n/bg.po b/addons/report_webkit/i18n/bg.po
index a5408a89c95..fab4db43686 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Фирма"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr ""
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7  21  88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr ""
@@ -112,7 +112,7 @@ msgid "Name of Image"
 msgstr "Име на изображението"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr ""
@@ -214,7 +214,7 @@ msgid "The header linked to the report"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -305,7 +305,7 @@ msgid "Top Margin (mm)"
 msgstr "Горна граница (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr ""
@@ -529,7 +529,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr ""
diff --git a/addons/report_webkit/i18n/ca.po b/addons/report_webkit/i18n/ca.po
index dabcddb5fff..6203ea791dc 100644
--- a/addons/report_webkit/i18n/ca.po
+++ b/addons/report_webkit/i18n/ca.po
@@ -8,91 +8,91 @@ 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-02-06 00:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 20:54+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
 msgid "WebKit Header"
-msgstr ""
+msgstr "Capçalera WebKit"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
 msgid "Webkit Template (used if Report File is not found)"
-msgstr ""
+msgstr "Plantilla WebKit (utilitzada si el fitxer de l'informe no existeix)"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Tabloid 29 279.4 x 431.8 mm"
-msgstr ""
+msgstr "Tabloide 29 279,4 x 431,8 mm"
 
 #. 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 "Header IMG"
-msgstr ""
+msgstr "Imatge capçalera"
 
 #. module: report_webkit
 #: field:res.company,lib_path:0
 msgid "Webkit Executable Path"
-msgstr ""
+msgstr "Ruta executable WebKit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
-msgstr ""
+msgstr "Llibre 28 431,8 x 279,4 mm"
 
 #. module: report_webkit
 #: help:ir.header_img,type:0
 msgid "Image type(png,gif,jpeg)"
-msgstr ""
+msgstr "Tipus d'imatge (png, gif, jpeg)"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
-msgstr ""
+msgstr "Executiu 4 7,5 x 10 pulgades, 190,5 x 254 mm"
 
 #. module: report_webkit
 #: field:ir.header_img,company_id:0
 #: field:ir.header_webkit,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
-msgstr ""
+msgstr "La ruta a Wkhtmltopdf no és absoluta"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "DLE 26 110 x 220 mm"
-msgstr ""
+msgstr "DLE 26 110 x 220 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B7  21  88 x 125 mm"
-msgstr ""
+msgstr "B7 21 88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
-msgstr ""
+msgstr "Renderitzador de WebKit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Folio 27  210 x 330 mm"
-msgstr ""
+msgstr "Foli 27 210 x 330 mm"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:67
@@ -105,119 +105,129 @@ msgid ""
 "http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
 "                             ' path to the executable on the Company form."
 msgstr ""
+"Si us plau instal·leu l'executable en el seu sistema'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) o "
+"descarregueu-lo d'aquí:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list i establiu la'+\n"
+"                             ' ruta cap a l'executable en el formulari de la "
+"companyia."
 
 #. module: report_webkit
 #: help:ir.header_img,name:0
 msgid "Name of Image"
-msgstr ""
+msgstr "Nom de la imatge"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
 "                                'Given path is not executable or path is "
 "wrong"
 msgstr ""
+"Ruta Wkhtmltopdf errònia en la companyia'+\n"
+"                                'La ruta actual no pot ser executada o la "
+"ruta és errònia"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
-msgstr ""
+msgstr "Webkit genera un error"
 
 #. 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 pulgades, 215,9 x 355,6 mm"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_webkit
 msgid "ir.header_webkit"
-msgstr ""
+msgstr "ir.capçalera_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 "Header HTML"
-msgstr ""
+msgstr "Capçalera HTML"
 
 #. 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 mm, 8,26 x 11,69 pulgades"
 
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B2  17  500 x 707 mm"
-msgstr ""
+msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_img
 msgid "ir.header_img"
-msgstr ""
+msgstr "ir.capçalera_img"
 
 #. module: report_webkit
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No podeu crear companyies recursives."
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A0  5   841 x 1189 mm"
-msgstr ""
+msgstr "A0 5 841 x 1189 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "C5E 24  163 x 229 mm"
-msgstr ""
+msgstr "C5E 24 163 x 229 mm"
 
 #. module: report_webkit
 #: field:ir.header_img,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: report_webkit
 #: code:addons/report_webkit/wizard/report_webkit_actions.py:134
 #, python-format
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Connexions d'accions de client"
 
 #. module: report_webkit
 #: field:res.company,header_image:0
 msgid "Available Images"
-msgstr ""
+msgstr "Imatges disponibles"
 
 #. module: report_webkit
 #: field:ir.header_webkit,html:0
 msgid "webkit header"
-msgstr ""
+msgstr "Capçalera WebKit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B1  15  707 x 1000 mm"
-msgstr ""
+msgstr "B1 15 707 x 1000 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A1  6   594 x 841 mm"
-msgstr ""
+msgstr "A1 6 594 x 841 mm"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,webkit_header:0
 msgid "The header linked to the report"
-msgstr ""
+msgstr "La capçalera relacionada amb l'informe"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
-msgstr ""
+msgstr "La ruta cap a la llibreria Wkhtmltopdf no està definida en l'empresa"
 
 #. module: report_webkit
 #: model:ir.module.module,description:report_webkit.module_meta_information
@@ -262,58 +272,99 @@ msgid ""
 "Web client WYSIWYG\n"
 "                    "
 msgstr ""
+"Aquest mòdul afegeix un nou motor d'informes basat en la llibreria WebKit "
+"(wkhtmltopdf) per suportar informes dissenyats en HTML + CSS.\n"
+"L'estructura del mòdul i part del codi s'inspira en el mòdul "
+"report_openoffice.\n"
+"El mòdul permet:\n"
+"    -Definició de l'informe HTML\n"
+"    -Suporti múltiples capçaleres\n"
+"    -Múltiples logotips\n"
+"    -Suporta multicompanyia\n"
+"    -Suport HTML i CSS-3 (limitat per la versió actual de Webkit)\n"
+"    -Suport javascript\n"
+"    -Depurador HTML Raw\n"
+"    -Capacitat d'impressió de llibres\n"
+"    -Definició de marges\n"
+"    -Definició de formats de pàgina\n"
+"i molt més\n"
+"\n"
+"Es poden definir múltiples capçaleres i logotips per companyia.\n"
+"L'estil CSS, l'encapçalat i el peu de pàgina es defineixen per companyia.\n"
+"\n"
+"La llibreria a instal·lar es pot trobar en:\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"Les llibreries del sistema estan disponibles per Linux, Mac US X i386 i "
+"Windows 32.\n"
+"\n"
+"Després d'instal·lar la biblioteca wkhtmltopdf en el servidor de OpenERP, és "
+"necessari establir la\n"
+"ruta d'accés a l'arxiu executable wkthtmltopdf en la companyia\n"
+"\n"
+"Per obtenir un informe d'exemple mireu també el mòdul webkit_report_sample, "
+"i aquest vídeo:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Per implementar:\n"
+"Suport d'activació i desactivació de Javascript\n"
+"Suport del format book i collated\n"
+"Zip per PDF separats\n"
+"Editor WYSIWYG per a client web\n"
+"                    "
 
 #. 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 "Seleccioneu la grandària de paper adequat"
 
 #. 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 mm, 6,93 x 9,84 pulgades"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "Content and styling"
-msgstr ""
+msgstr "Contingut i estil"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A7  11  74 x 105 mm"
-msgstr ""
+msgstr "A7 11 74 x 105 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A6  10  105 x 148 mm"
-msgstr ""
+msgstr "A6 10 105 x 148 mm"
 
 #. 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 ""
+"Aquesta plantilla serà utilitzada si el fitxer de l'informe principal no es "
+"troba"
 
 #. module: report_webkit
 #: field:ir.header_webkit,margin_top:0
 msgid "Top Margin (mm)"
-msgstr ""
+msgstr "Marge superior (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
-msgstr ""
+msgstr "Si us plau, indiqueu la capçalera en la configuració de la companyia"
 
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Accepta"
 
 #. module: report_webkit
 #: help:report.webkit.actions,print_button:0
@@ -321,26 +372,28 @@ msgid ""
 "Check this to add a Print action for this Report in the sidebar of the "
 "corresponding document types"
 msgstr ""
+"Marca aquesta opció per afegir una acció Imprimir per aquest informe en el "
+"lateral dels corresponents tipus de documents"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B3  18  353 x 500 mm"
-msgstr ""
+msgstr "B3 18 353 x 500 mm"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,webkit_debug:0
 msgid "Enable the webkit engine debugger"
-msgstr ""
+msgstr "Activa el motor de debug de Webkit"
 
 #. module: report_webkit
 #: field:ir.header_img,img:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: report_webkit
 #: field:res.company,header_webkit:0
 msgid "Available html"
-msgstr ""
+msgstr "Html disponible"
 
 #. module: report_webkit
 #: help:report.webkit.actions,open_action:0
@@ -348,111 +401,113 @@ msgid ""
 "Check this to view the newly added internal print action after creating it "
 "(technical view) "
 msgstr ""
+"Marqueu aquesta opció per veure l'acció que acaba d'afegir d'impressió "
+"intern després de la seva creació (vegeu tècniques) "
 
 #. module: report_webkit
 #: view:res.company:0
 msgid "Images"
-msgstr ""
+msgstr "Imatges"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,orientation:0
 msgid "Portrait"
-msgstr ""
+msgstr "Retrat"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,orientation:0
 msgid "Landscape"
-msgstr ""
+msgstr "Horitzontal"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "page setup"
-msgstr ""
+msgstr "configuració de pàgina"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B8  22  62 x 88 mm"
-msgstr ""
+msgstr "B8 22 62 x 88 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A2  7   420 x 594 mm"
-msgstr ""
+msgstr "A2 7 420 x 594 mm"
 
 #. module: report_webkit
 #: field:report.webkit.actions,print_button:0
 msgid "Add print button"
-msgstr ""
+msgstr "Afegeix botó d'imprimeix"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A9  13  37 x 52 mm"
-msgstr ""
+msgstr "A9 13 37 x 52 mm"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: report_webkit
 #: field:ir.header_webkit,margin_bottom:0
 msgid "Bottom Margin (mm)"
-msgstr ""
+msgstr "Marge inferior (mm)"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_report_webkit_actions
 msgid "Webkit Actions"
-msgstr ""
+msgstr "Accions Webkit"
 
 #. module: report_webkit
 #: field:report.webkit.actions,open_action:0
 msgid "Open added action"
-msgstr ""
+msgstr "Obre acció afegida"
 
 #. module: report_webkit
 #: field:ir.header_webkit,margin_right:0
 msgid "Right Margin (mm)"
-msgstr ""
+msgstr "Marge dret (mm)"
 
 #. module: report_webkit
 #: field:ir.header_webkit,orientation:0
 msgid "Orientation"
-msgstr ""
+msgstr "Orientació"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B6  20  125 x 176 mm"
-msgstr ""
+msgstr "B6 20 125 x 176 mm"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
 msgid "Set Webkit Report Header"
-msgstr ""
+msgstr "Estableix capçalera d'informe Webkit"
 
 #. module: report_webkit
 #: field:ir.header_webkit,format:0
 msgid "Paper size"
-msgstr ""
+msgstr "Mida del paper"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid ":B10    16  31 x 44 mm"
-msgstr ""
+msgstr ":B10 16 31 x 44 mm"
 
 #. module: report_webkit
 #: field:ir.header_webkit,css:0
 msgid "Header CSS"
-msgstr ""
+msgstr "Capçalera CSS"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B4  19  250 x 353 mm"
-msgstr ""
+msgstr "B4 19 250 x 353 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A3  8   297 x 420 mm"
-msgstr ""
+msgstr "A3 8 297 x 420 mm"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:240
@@ -465,96 +520,102 @@ msgid ""
 "          raise except_osv(\n"
 "                _('No header defined for this Webkit report!"
 msgstr ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('Capçalera no definida per aquest informe Webkit!"
 
 #. module: report_webkit
 #: help:res.company,lib_path:0
 msgid "Complete (Absolute) path to the wkhtmltopdf executable."
-msgstr ""
+msgstr "Ruta completa (absoluta) a l'executable wkhtmltopdf."
 
 #. module: report_webkit
 #: field:ir.header_webkit,footer_html:0
 msgid "webkit footer"
-msgstr ""
+msgstr "Peu de pàgina Webkit"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_debug:0
 msgid "Webkit debug"
-msgstr ""
+msgstr "Webkit debug"
 
 #. 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 "Carta 2 8,5 x 11 pulgades, 215,9 x 279,4 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B0  14  1000 x 1414 mm"
-msgstr ""
+msgstr "B0 14 1000 x 1414 mm"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,report_webkit_data:0
 msgid "Webkit Template"
-msgstr ""
+msgstr "Plantilla Webkit"
 
 #. module: report_webkit
 #: model:ir.module.module,shortdesc:report_webkit.module_meta_information
 msgid "Webkit Report Engine"
-msgstr ""
+msgstr "Motor d'informes Webkit"
 
 #. module: report_webkit
 #: field:ir.header_img,name:0
 #: field:ir.header_webkit,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A5  9   148 x 210 mm"
-msgstr ""
+msgstr "A5 9 148 x 210 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A8  12  52 x 74 mm"
-msgstr ""
+msgstr "A8 12 52 x 74 mm"
 
 #. 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 "Afegeix botons d'imprimeix"
 
 #. 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 mm, Sobre U.S. Comú 10"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
-msgstr ""
+msgstr "Plantilla de l'informe Webkit no trobada!"
 
 #. module: report_webkit
 #: field:ir.header_webkit,margin_left:0
 msgid "Left Margin (mm)"
-msgstr ""
+msgstr "Marge esquerra (mm)"
 
 #. module: report_webkit
 #: view:res.company:0
 msgid "Headers"
-msgstr ""
+msgstr "Capçaleres"
 
 #. module: report_webkit
 #: help:ir.header_webkit,footer_html:0
 msgid "Set Webkit Report Footer."
-msgstr ""
+msgstr "Defineix peu de pàgina informe Webkit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B9  23  33 x 62 mm"
-msgstr ""
+msgstr "B9 23 33 x 62 mm"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.accions.informe.xml"
diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po
index e3b62ef7474..1c1d422d5a8 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -66,7 +66,7 @@ msgid "Company"
 msgstr "Unternehmen"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr "Pfad zu wkhtmltopdf ist nicht absolut"
@@ -82,10 +82,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7  21  88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr "Webkit Ausgabe"
@@ -119,7 +119,7 @@ msgid "Name of Image"
 msgstr "Name des Bildes"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -131,7 +131,7 @@ msgstr ""
 "nicht"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr "Webkit verursacht Fehler"
@@ -224,7 +224,7 @@ msgid "The header linked to the report"
 msgstr "Der Kopftext für diesen Report"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr "WKhtmltopdf Bibliothek Pfad ist nicht für Unternehmen angegeben"
@@ -351,7 +351,7 @@ msgid "Top Margin (mm)"
 msgstr "Kopfrand (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Bitte definieren Sie den Kopftext Ihres Unternehmens"
@@ -585,7 +585,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr "Webkit Report Engine nicht gefunden !"
@@ -614,26 +614,3 @@ msgstr "B9  23  33 x 62 mm"
 #: model:ir.model,name:report_webkit.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen haben!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index 3f16f358263..cae8d77f02a 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr "La ruta a Wkhtmltopdf no es absoluta"
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7 21 88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr "Renderizador del webkit"
@@ -119,7 +119,7 @@ msgid "Name of Image"
 msgstr "Nombre de la imagen"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -131,7 +131,7 @@ msgstr ""
 "ruta es errónea"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr "Webkit genera un error"
@@ -224,7 +224,7 @@ msgid "The header linked to the report"
 msgstr "La cabecera relacionada con el informe"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -357,7 +357,7 @@ msgid "Top Margin (mm)"
 msgstr "Margen Superiro (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Por favor, indique la cabecera en la configuración de la compañía"
@@ -591,7 +591,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25 105 x 241 mm, Sobre U.S. Común 10"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr "¡Plantilla del informe Webkit no encontrada!"
@@ -620,27 +620,3 @@ msgstr "B9 23 33 x 62 mm"
 #: model:ir.model,name:report_webkit.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
 msgstr "ir.acciones.informe.xml"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear un menú recursivo"
-
-#~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/report_webkit/i18n/es_MX.po b/addons/report_webkit/i18n/es_MX.po
new file mode 100644
index 00000000000..8e0b1ac5a2a
--- /dev/null
+++ b/addons/report_webkit/i18n/es_MX.po
@@ -0,0 +1,622 @@
+# 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-29 10:24+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:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "WebKit Header"
+msgstr "Cabecera WebKit"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "Plantilla WebKit (utilizada si el archivo del informe no existe)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr "Tabloide 29 279,4 x 431,8 mm"
+
+#. 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 "Header IMG"
+msgstr "Imagen cabecera"
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "Ruta ejecutable WebKit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr "Libro 28 431,8 x 279,4 mm"
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "Tipo de imagen (png, gif, jpeg)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr "Ejecutivo 4 7,5 x 10 pulgadas, 190,5 x 254 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:97
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr "La ruta a Wkhtmltopdf no es absoluta"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr "DLE 26 110 x 220 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr "B7 21 88 x 125 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
+#: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
+#, python-format
+msgid "Webkit render"
+msgstr "Renderizador del webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr "Folio 27 210 x 330 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:67
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company form."
+msgstr ""
+"Por favor instale el ejecutable en su sistema'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) o "
+"desárguelo de aquí:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list y establezca la'+\n"
+"                             ' ruta hacia el ejecutable en el formulario de "
+"la compañía."
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "Nombre de la imagen"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:91
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+"Ruta Wkhtmltopdf errónea en la compañía'+\n"
+"                                'La ruta actual no puede ser ejecutada o la "
+"ruta es errónea"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:166
+#, python-format
+msgid "Webkit raise an error"
+msgstr "Webkit genera un error"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr "Legal 3 8,5 x 14 pulgadas, 215,9 x 355,6 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr "ir.cabecera_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 "Header HTML"
+msgstr "Cabecera HTML"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr "A4 0 210 x 297 mm, 8,26 x 11,69 pulgadas"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr "B2 17 500 x 707 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr "ir.cabecera_img"
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr "A0 5 841 x 1189 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr "C5E 24 163 x 229 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:134
+#, python-format
+msgid "Client Actions Connections"
+msgstr "Conexiones acciones cliente"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "Imágenes disponibles"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr "Cabecera WebKit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr "B1 15 707 x 1000 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr "A1 6 594 x 841 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "La cabecera relacionada con el informe"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:78
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr ""
+"La ruta hacia la librería Wkhtmltopdf no está definida en la compañía"
+
+#. module: report_webkit
+#: model:ir.module.module,description:report_webkit.module_meta_information
+msgid ""
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"The module structure and some code is inspired by 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 much more\n"
+"\n"
+"Multiple headers and logos can be defined per company.\n"
+"CSS style, header and footer body are defined per company\n"
+"\n"
+"The library to install can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The system libraries are available for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"After installing the wkhtmltopdf library on the OpenERP Server machine, you "
+"need to set the\n"
+"path to the wkthtmltopdf executable file on the Company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov \n"
+"\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 ""
+"Este módulo añade un nuevo motor de informes basado en la librería WebKit "
+"(wkhtmltopdf) para soportar informes diseñados en HTML + CSS.\n"
+"La estructura del módulo y parte del código se inspira en el módulo "
+"report_openoffice.\n"
+"El módulo permite:\n"
+"    -Definición del informe HTML\n"
+"    -Soporte múltiples cabeceras\n"
+"    -Múltiples logos\n"
+"    -Soporte multicompañía\n"
+"    -Soporte HTML y CSS-3 (limitado por la versión actual de Webkit)\n"
+"    -Soporte javascript\n"
+"    -Depurador HTML Raw\n"
+"    -Capacidad de impresión de libros\n"
+"    -Definición de márgenes\n"
+"    -Definición de formatos de página\n"
+"y mucho más\n"
+"\n"
+"Se pueden definir múltiples cabeceras y logos por compañía.\n"
+"El estilo CSS, el encabezado y el pie de página se definen por compañía.\n"
+"\n"
+"La librería a instalar se puede encontrar en:\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"Las librerías del sistema están disponibles para Linux, Mac OS X i386 y "
+"Windows 32.\n"
+"\n"
+"Después de instalar la biblioteca wkhtmltopdf en el servidor de OpenERP, es "
+"necesario establecer la\n"
+"ruta de acceso al archivo ejecutable wkthtmltopdf en la compañía.\n"
+"\n"
+"Para obtener un informe de ejemplo véase también el módulo "
+"webkit_report_sample, y este vídeo:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Para implementar:\n"
+"Soporte de activación y desactivación de JavaScript\n"
+"Soporte del formato book y collated\n"
+"Zip para PDF separados\n"
+"Editor WYSIWYG para cliente web\n"
+"                    "
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr "Webkit"
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "Seleccione el tamaño de papel adecuado"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr "B5 1 176 x 250 mm, 6,93 x 9,84 pulgadas"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Content and styling"
+msgstr "Contenido y estilo"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr "A7 11 74 x 105 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr "A6 10 105 x 148 mm"
+
+#. 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 ""
+"Esta plantilla será utilizada si el fichero del informe principal no se "
+"encuentra"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "Margen Superiro (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:261
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "Por favor, indique la cabecera en la configuración de la compañía"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr ""
+"Marcar esta opción para añadir una acción Imprimir para este informe en el "
+"lateral de los correspondientes tipos de documentos"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr "B3 18 353 x 500 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "Activar el motor de debug de Webkit"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "Html disponible"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr ""
+"Seleccione esta opción para ver la recientemente añadida acción imprimir "
+"después de crearla (vista técnica) "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "Imágenes"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "Horizontal"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Apaisado"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "page setup"
+msgstr "configuración página"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr "B8 22 62 x 88 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr "A2 7 420 x 594 mm"
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "Añadir botón de imprimir"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr "A9 13 37 x 52 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "Margen inferior (mm)"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "Acciones Webkit"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "Abrir acción añadida"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "Margen derecho (mm)"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "Orientación"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "Establecer cabecera informe Webkit"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Tamaño del papel"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ":B10 16 31 x 44 mm"
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "Cabecera CSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr "B4 19 250 x 353 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr "A3 8 297 x 420 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:240
+#, python-format
+msgid ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('No header defined for this Webkit report!"
+msgstr ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('Cabecera no definida para este reporte Webkit!"
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid "Complete (Absolute) path to the wkhtmltopdf executable."
+msgstr "Ruta completa (absoluta) al ejecutable wkhtmltopdf."
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "pie de página Webkit"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr "Webkit debug"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr "Carta 2 8,5 x 11 pulgadas, 215,9 x 279,4 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr "B0 14 1000 x 1414 mm"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "Plantilla Webkit"
+
+#. module: report_webkit
+#: model:ir.module.module,shortdesc:report_webkit.module_meta_information
+msgid "Webkit Report Engine"
+msgstr "Motor de informes Webkit"
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr "A5 9 148 x 210 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr "A8 12 52 x 74 mm"
+
+#. 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 "Añadir botones imprimir"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr "Comm10E 25 105 x 241 mm, Sobre U.S. Común 10"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:255
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "¡Plantilla del informe Webkit no encontrada!"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "Margen izquierdo (mm)"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "Cabeceras"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "Definir pie de página informe Webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr "B9 23 33 x 62 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
diff --git a/addons/report_webkit/i18n/es_VE.po b/addons/report_webkit/i18n/es_VE.po
new file mode 100644
index 00000000000..8e0b1ac5a2a
--- /dev/null
+++ b/addons/report_webkit/i18n/es_VE.po
@@ -0,0 +1,622 @@
+# 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-29 10:24+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:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "WebKit Header"
+msgstr "Cabecera WebKit"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "Plantilla WebKit (utilizada si el archivo del informe no existe)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr "Tabloide 29 279,4 x 431,8 mm"
+
+#. 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 "Header IMG"
+msgstr "Imagen cabecera"
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "Ruta ejecutable WebKit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr "Libro 28 431,8 x 279,4 mm"
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "Tipo de imagen (png, gif, jpeg)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr "Ejecutivo 4 7,5 x 10 pulgadas, 190,5 x 254 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:97
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr "La ruta a Wkhtmltopdf no es absoluta"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr "DLE 26 110 x 220 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr "B7 21 88 x 125 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
+#: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
+#, python-format
+msgid "Webkit render"
+msgstr "Renderizador del webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr "Folio 27 210 x 330 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:67
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company form."
+msgstr ""
+"Por favor instale el ejecutable en su sistema'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) o "
+"desárguelo de aquí:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list y establezca la'+\n"
+"                             ' ruta hacia el ejecutable en el formulario de "
+"la compañía."
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "Nombre de la imagen"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:91
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+"Ruta Wkhtmltopdf errónea en la compañía'+\n"
+"                                'La ruta actual no puede ser ejecutada o la "
+"ruta es errónea"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:166
+#, python-format
+msgid "Webkit raise an error"
+msgstr "Webkit genera un error"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr "Legal 3 8,5 x 14 pulgadas, 215,9 x 355,6 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr "ir.cabecera_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 "Header HTML"
+msgstr "Cabecera HTML"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr "A4 0 210 x 297 mm, 8,26 x 11,69 pulgadas"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr "B2 17 500 x 707 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr "ir.cabecera_img"
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr "A0 5 841 x 1189 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr "C5E 24 163 x 229 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:134
+#, python-format
+msgid "Client Actions Connections"
+msgstr "Conexiones acciones cliente"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "Imágenes disponibles"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr "Cabecera WebKit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr "B1 15 707 x 1000 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr "A1 6 594 x 841 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "La cabecera relacionada con el informe"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:78
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr ""
+"La ruta hacia la librería Wkhtmltopdf no está definida en la compañía"
+
+#. module: report_webkit
+#: model:ir.module.module,description:report_webkit.module_meta_information
+msgid ""
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"The module structure and some code is inspired by 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 much more\n"
+"\n"
+"Multiple headers and logos can be defined per company.\n"
+"CSS style, header and footer body are defined per company\n"
+"\n"
+"The library to install can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The system libraries are available for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"After installing the wkhtmltopdf library on the OpenERP Server machine, you "
+"need to set the\n"
+"path to the wkthtmltopdf executable file on the Company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov \n"
+"\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 ""
+"Este módulo añade un nuevo motor de informes basado en la librería WebKit "
+"(wkhtmltopdf) para soportar informes diseñados en HTML + CSS.\n"
+"La estructura del módulo y parte del código se inspira en el módulo "
+"report_openoffice.\n"
+"El módulo permite:\n"
+"    -Definición del informe HTML\n"
+"    -Soporte múltiples cabeceras\n"
+"    -Múltiples logos\n"
+"    -Soporte multicompañía\n"
+"    -Soporte HTML y CSS-3 (limitado por la versión actual de Webkit)\n"
+"    -Soporte javascript\n"
+"    -Depurador HTML Raw\n"
+"    -Capacidad de impresión de libros\n"
+"    -Definición de márgenes\n"
+"    -Definición de formatos de página\n"
+"y mucho más\n"
+"\n"
+"Se pueden definir múltiples cabeceras y logos por compañía.\n"
+"El estilo CSS, el encabezado y el pie de página se definen por compañía.\n"
+"\n"
+"La librería a instalar se puede encontrar en:\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"Las librerías del sistema están disponibles para Linux, Mac OS X i386 y "
+"Windows 32.\n"
+"\n"
+"Después de instalar la biblioteca wkhtmltopdf en el servidor de OpenERP, es "
+"necesario establecer la\n"
+"ruta de acceso al archivo ejecutable wkthtmltopdf en la compañía.\n"
+"\n"
+"Para obtener un informe de ejemplo véase también el módulo "
+"webkit_report_sample, y este vídeo:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Para implementar:\n"
+"Soporte de activación y desactivación de JavaScript\n"
+"Soporte del formato book y collated\n"
+"Zip para PDF separados\n"
+"Editor WYSIWYG para cliente web\n"
+"                    "
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr "Webkit"
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "Seleccione el tamaño de papel adecuado"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr "B5 1 176 x 250 mm, 6,93 x 9,84 pulgadas"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Content and styling"
+msgstr "Contenido y estilo"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr "A7 11 74 x 105 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr "A6 10 105 x 148 mm"
+
+#. 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 ""
+"Esta plantilla será utilizada si el fichero del informe principal no se "
+"encuentra"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "Margen Superiro (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:261
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "Por favor, indique la cabecera en la configuración de la compañía"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr ""
+"Marcar esta opción para añadir una acción Imprimir para este informe en el "
+"lateral de los correspondientes tipos de documentos"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr "B3 18 353 x 500 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "Activar el motor de debug de Webkit"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "Html disponible"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr ""
+"Seleccione esta opción para ver la recientemente añadida acción imprimir "
+"después de crearla (vista técnica) "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "Imágenes"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "Horizontal"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Apaisado"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "page setup"
+msgstr "configuración página"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr "B8 22 62 x 88 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr "A2 7 420 x 594 mm"
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "Añadir botón de imprimir"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr "A9 13 37 x 52 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "Margen inferior (mm)"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "Acciones Webkit"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "Abrir acción añadida"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "Margen derecho (mm)"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "Orientación"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6 20 125 x 176 mm"
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "Establecer cabecera informe Webkit"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Tamaño del papel"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ":B10 16 31 x 44 mm"
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "Cabecera CSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr "B4 19 250 x 353 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr "A3 8 297 x 420 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:240
+#, python-format
+msgid ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('No header defined for this Webkit report!"
+msgstr ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('Cabecera no definida para este reporte Webkit!"
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid "Complete (Absolute) path to the wkhtmltopdf executable."
+msgstr "Ruta completa (absoluta) al ejecutable wkhtmltopdf."
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "pie de página Webkit"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr "Webkit debug"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr "Carta 2 8,5 x 11 pulgadas, 215,9 x 279,4 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr "B0 14 1000 x 1414 mm"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "Plantilla Webkit"
+
+#. module: report_webkit
+#: model:ir.module.module,shortdesc:report_webkit.module_meta_information
+msgid "Webkit Report Engine"
+msgstr "Motor de informes Webkit"
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr "A5 9 148 x 210 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr "A8 12 52 x 74 mm"
+
+#. 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 "Añadir botones imprimir"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr "Comm10E 25 105 x 241 mm, Sobre U.S. Común 10"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:255
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "¡Plantilla del informe Webkit no encontrada!"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "Margen izquierdo (mm)"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "Cabeceras"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "Definir pie de página informe Webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr "B9 23 33 x 62 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
diff --git a/addons/report_webkit/i18n/fi.po b/addons/report_webkit/i18n/fi.po
index e3965949483..d42db82feec 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: 2011-07-22 04:42+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
diff --git a/addons/report_webkit/i18n/fr.po b/addons/report_webkit/i18n/fr.po
index d19499ebb3c..a66b5899b8f 100644
--- a/addons/report_webkit/i18n/fr.po
+++ b/addons/report_webkit/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-13 22:56+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Société"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr "Le chemin vers Wkhtmltopdf n'est pas absolu"
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7  21  88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr "Rendu Webkit"
@@ -119,7 +119,7 @@ msgid "Name of Image"
 msgstr "Nom de l'image"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -131,7 +131,7 @@ msgstr ""
 "le chemin est erroné"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr "Webkit a retourné une erreur"
@@ -224,7 +224,7 @@ msgid "The header linked to the report"
 msgstr "L'en-tête liée au rapport"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -357,7 +357,7 @@ msgid "Top Margin (mm)"
 msgstr "Marge supérieure (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Veuillez indiquer une en-tête dans les paramètres de la société"
@@ -591,7 +591,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25  105 x 241 mm, U.S. Common 10 Enveloppe"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr "Modèle de rapport Webkit non trouvé !"
diff --git a/addons/report_webkit/i18n/hu.po b/addons/report_webkit/i18n/hu.po
index 9c660c9b33e..b5a1e3f59f2 100644
--- a/addons/report_webkit/i18n/hu.po
+++ b/addons/report_webkit/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-26 10:12+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -64,7 +65,7 @@ msgid "Company"
 msgstr "Vállalat"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr ""
@@ -80,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7  21  88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr ""
@@ -111,7 +112,7 @@ msgid "Name of Image"
 msgstr "Kép megnevezése"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -120,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr ""
@@ -213,7 +214,7 @@ msgid "The header linked to the report"
 msgstr "A fejléc kapcsolódik a jelentéshez"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -304,7 +305,7 @@ msgid "Top Margin (mm)"
 msgstr "Felső margó (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Kérjük, állítson be fejlécet a vállalati beállításokban"
@@ -528,7 +529,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr "WebKit jelentés sablon nem található !"
diff --git a/addons/report_webkit/i18n/it.po b/addons/report_webkit/i18n/it.po
index 0adc3a66b18..f013af90a8c 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Azienda"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr "ll percorso a Wkhtmltopdf non è assoluto"
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7 21 88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr "Render webkit"
@@ -118,7 +118,7 @@ msgid "Name of Image"
 msgstr "Nome dell'immagine"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -130,7 +130,7 @@ msgstr ""
 "eseguibile, oppure il percorso è sbagliato"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr "webkit ha generato un errore"
@@ -223,7 +223,7 @@ msgid "The header linked to the report"
 msgstr "L'intestazione collegata al report"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr "Il percorso alla libreria Wkhtmltopdf non è impostato nell'azienda"
@@ -316,7 +316,7 @@ msgid "Top Margin (mm)"
 msgstr "Margine superiore (mm.)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Prego impostare una intestazione nei settaggi dell'azienda"
@@ -353,7 +353,7 @@ msgstr "Immagine"
 #. module: report_webkit
 #: field:res.company,header_webkit:0
 msgid "Available html"
-msgstr ""
+msgstr "HTML Disponibile"
 
 #. module: report_webkit
 #: help:report.webkit.actions,open_action:0
@@ -550,7 +550,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25 105 x 241 mm, U.S. Common 10 Envelope"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr "Template report webkit non trovato!"
diff --git a/addons/report_webkit/i18n/nl.po b/addons/report_webkit/i18n/nl.po
index 0319fc93e66..44d3a903430 100644
--- a/addons/report_webkit/i18n/nl.po
+++ b/addons/report_webkit/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr "pad naar Wkhtmltopdf is niet absoluut"
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7  21  88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr "Webkit maken"
@@ -119,7 +119,7 @@ msgid "Name of Image"
 msgstr "Naam van de afbeelding"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -131,7 +131,7 @@ msgstr ""
 "verkeerd"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr "Webkit geef een fout"
@@ -224,7 +224,7 @@ msgid "The header linked to the report"
 msgstr "De aan het overzicht gekoppelde koptekst"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr "Wkhtmltopdf library pad is niet ingesteld in bedrijf"
@@ -358,7 +358,7 @@ msgid "Top Margin (mm)"
 msgstr "Top merge (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Stel aub een koptekst in bij uw bedrijfsinstellingen"
@@ -592,7 +592,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr "WebKit overzicht sjabloon niet gevonden !"
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
index 75208450e35..d6f6dc89178 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Firma"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr ""
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr ""
@@ -112,7 +112,7 @@ msgid "Name of Image"
 msgstr "Nazwa obrazu"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr ""
@@ -214,7 +214,7 @@ msgid "The header linked to the report"
 msgstr "Nagłówek związany z raportem"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -306,7 +306,7 @@ msgid "Top Margin (mm)"
 msgstr "Górny margines (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Ustaw nagłówek w ustawieniach firmy"
@@ -534,7 +534,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr "Nie znaleziono szablonu raportu webkit"
diff --git a/addons/report_webkit/i18n/pt.po b/addons/report_webkit/i18n/pt.po
index 9dc45c8bbfd..66f988f087e 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr ""
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7 21 88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr ""
@@ -112,7 +112,7 @@ msgid "Name of Image"
 msgstr "Nome da imagem"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr ""
@@ -214,7 +214,7 @@ msgid "The header linked to the report"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -305,7 +305,7 @@ msgid "Top Margin (mm)"
 msgstr "Margem superior (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr "Por favor, defina um cabeçalho nas configurações da empresa"
@@ -529,7 +529,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr ""
diff --git a/addons/report_webkit/i18n/pt_BR.po b/addons/report_webkit/i18n/pt_BR.po
index 19e6a7517c8..35aa51bec1c 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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr ""
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr "B7  21  88 x 125 mm"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr ""
@@ -112,7 +112,7 @@ msgid "Name of Image"
 msgstr "Nome da Imagem"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr ""
@@ -214,7 +214,7 @@ msgid "The header linked to the report"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -306,7 +306,7 @@ msgid "Top Margin (mm)"
 msgstr "Margem Superior (mm)"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr ""
@@ -530,7 +530,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr ""
diff --git a/addons/report_webkit/i18n/ru.po b/addons/report_webkit/i18n/ru.po
index b792a841b23..74d0f28ffa4 100644
--- a/addons/report_webkit/i18n/ru.po
+++ b/addons/report_webkit/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
@@ -65,7 +65,7 @@ msgid "Company"
 msgstr "Компания"
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:84
+#: code:addons/report_webkit/webkit_report.py:97
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr ""
@@ -81,10 +81,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:290
-#: code:addons/report_webkit/webkit_report.py:304
-#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
 #: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
 #, python-format
 msgid "Webkit render"
 msgstr ""
@@ -112,7 +112,7 @@ msgid "Name of Image"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:78
+#: code:addons/report_webkit/webkit_report.py:91
 #, python-format
 msgid ""
 "Wrong Wkhtmltopdf path set in company'+\n"
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:151
+#: code:addons/report_webkit/webkit_report.py:166
 #, python-format
 msgid "Webkit raise an error"
 msgstr ""
@@ -214,7 +214,7 @@ msgid "The header linked to the report"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:66
+#: code:addons/report_webkit/webkit_report.py:78
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -305,7 +305,7 @@ msgid "Top Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:246
+#: code:addons/report_webkit/webkit_report.py:261
 #, python-format
 msgid "Please set a header in company settings"
 msgstr ""
@@ -529,7 +529,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:240
+#: code:addons/report_webkit/webkit_report.py:255
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr ""
@@ -558,27 +558,3 @@ msgstr ""
 #: model:ir.model,name:report_webkit.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
 msgstr "ir.actions.report.xml"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/report_webkit/i18n/zh_CN.po b/addons/report_webkit/i18n/zh_CN.po
index 7364e6e7272..32f09a35c6c 100644
--- a/addons/report_webkit/i18n/zh_CN.po
+++ b/addons/report_webkit/i18n/zh_CN.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: 2011-07-15 04:51+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
 msgid "WebKit Header"
-msgstr "WebKit的头"
+msgstr "WebKit页头"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -36,7 +36,7 @@ msgstr "Tabloid 29 279.4 x 431.8 毫米"
 #: model:ir.actions.act_window,name:report_webkit.action_header_img
 #: model:ir.ui.menu,name:report_webkit.menu_header_img
 msgid "Header IMG"
-msgstr "头IMG"
+msgstr "logo"
 
 #. module: report_webkit
 #: field:res.company,lib_path:0
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index e6f4a81f9e7..d2709ea6fc2 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -123,13 +123,18 @@ class ReportXML(osv.osv):
                                             'ir.header_webkit',
                                             type='many2one',
                                             relation='ir.header_webkit',
-                                            string='WebKit Header',
+                                            string='Webkit Header',
                                             help="The header linked to the report",
                                             view_load=True,
                                             required=True
                                         ),
         'webkit_debug' : fields.boolean('Webkit debug', help="Enable the webkit engine debugger"),
         'report_webkit_data': fields.text('Webkit Template', help="This template will be used if the main report file is not found"),
+        'precise_mode':fields.boolean('Precise Mode', help='This mode allow more precise element \
+                                                            position as each object is printed on a separate HTML.\
+                                                            but memory and disk usage is wider')
     }
 
 ReportXML()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
index e92c5a5345b..1d60f6a873d 100644
--- a/addons/report_webkit/ir_report_view.xml
+++ b/addons/report_webkit/ir_report_view.xml
@@ -10,6 +10,7 @@
                     <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
                         <field name="webkit_header"/>
                         <field name="webkit_debug"/>
+                        <field name="precise_mode"/>
                         <separator string="Webkit Template (used if Report File is not found)" colspan="4"/>
                         <field name="report_webkit_data" colspan="4" nolabel="1"/>
                     </page>
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index 2b9d8c93256..12651f308dc 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -79,4 +79,6 @@ class WebKitHelper(object):
         """Return HTML embedded logo by name"""
         img, type = self.get_logo_by_name(name)
         return self.embed_image(type, img, width, height)
-        
\ No newline at end of file
+        
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/security/ir.model.access.csv b/addons/report_webkit/security/ir.model.access.csv
index 850a202512e..6c626f9873e 100644
--- a/addons/report_webkit/security/ir.model.access.csv
+++ b/addons/report_webkit/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_ir_header_webkit","ir.header_webkit","model_ir_header_webkit",,1,,,
-"access_ir_header_img","ir.header_img","model_ir_header_img",,,,,
+"access_ir_header_webkit","ir.header_webkit","model_ir_header_webkit",,1,,1,
+"access_ir_header_img","ir.header_img","model_ir_header_img",,1,,1,
\ No newline at end of file
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 406013cef12..7e828403437 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
 # All Right Reserved
 #
 # Author : Nicolas Bessi (Camptocamp)
@@ -35,8 +35,11 @@ import os
 import report
 import tempfile
 import time
+import logging
+
 from mako.template import Template
 from mako import exceptions
+
 import netsvc
 import pooler
 from report_helper import WebKitHelper
@@ -46,6 +49,7 @@ import tools
 from tools.translate import _
 from osv.osv import except_osv
 
+logger = logging.getLogger('report_webkit')
 
 def mako_template(text):
     """Build a Mako template.
@@ -60,12 +64,12 @@ class WebKitParser(report_sxw):
     """Custom class that use webkit to render HTML reports
        Code partially taken from report openoffice. Thanks guys :)
     """
-    
-    def __init__(self, name, table, rml=False, parser=False, 
+
+    def __init__(self, name, table, rml=False, parser=False,
         header=True, store=False):
         self.parser_instance = False
         self.localcontext={}
-        report_sxw.__init__(self, name, table, rml, parser, 
+        report_sxw.__init__(self, name, table, rml, parser,
             header, store)
 
     def get_lib(self, cursor, uid, company) :
@@ -81,7 +85,7 @@ class WebKitParser(report_sxw):
                              ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+
                              ' path to the executable on the Company form.'+
                              'Minimal version is 0.9.9')
-                            ) 
+                            )
         if os.path.isabs(path) :
             if (os.path.exists(path) and os.access(path, os.X_OK)\
                 and os.path.basename(path).startswith('wkhtmltopdf')):
@@ -118,7 +122,7 @@ class WebKitParser(report_sxw):
             head_file = file( os.path.join(
                                   tmp_dir,
                                   str(time.time()) + '.head.html'
-                                 ), 
+                                 ),
                                 'w'
                             )
             head_file.write(header)
@@ -129,14 +133,14 @@ class WebKitParser(report_sxw):
             foot_file = file(  os.path.join(
                                   tmp_dir,
                                   str(time.time()) + '.foot.html'
-                                 ), 
+                                 ),
                                 'w'
                             )
             foot_file.write(footer)
             foot_file.close()
             file_to_del.append(foot_file.name)
             command.extend(['--footer-html', foot_file.name])
-            
+
         if webkit_header.margin_top :
             command.extend(['--margin-top', str(webkit_header.margin_top).replace(',', '.')])
         if webkit_header.margin_bottom :
@@ -163,7 +167,7 @@ class WebKitParser(report_sxw):
             status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr
             if status :
                 raise except_osv(
-                                _('Webkit raise an error' ), 
+                                _('Webkit raise an error' ),
                                 status
                             )
         except Exception:
@@ -176,68 +180,30 @@ class WebKitParser(report_sxw):
 
         os.unlink(out)
         return pdf
-    
-    
-    def setLang(self, lang):
-        if not lang:
-            lang = 'en_US'
-        self.localcontext['lang'] = lang
 
     def translate_call(self, src):
         """Translate String."""
         ir_translation = self.pool.get('ir.translation')
-        res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid, self.name, 'report', self.localcontext.get('lang', 'en_US'), src)
+        res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid,
+                                         self.name, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src)
         if not res :
             return src
-        return res 
- 
-    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
-        """format using the know cursor, language from localcontext"""
-        if digits is None:
-            digits = self.parser_instance.get_digits(value)
-        if isinstance(value, (str, unicode)) and not value:
-            return ''
-        pool_lang = self.pool.get('res.lang')
-        lang = self.localcontext['lang']
-        
-        lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0]
-        lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids)
+        return res
 
-        if date or date_time:
-            if not str(value):
-                return ''
-
-            date_format = lang_obj.date_format
-            parse_format = '%Y-%m-%d'
-            if date_time:
-                value=value.split('.')[0]
-                date_format = date_format + " " + lang_obj.time_format
-                parse_format = '%Y-%m-%d %H:%M:%S'
-            if not isinstance(value, time.struct_time):
-                return time.strftime(date_format, time.strptime(value, parse_format))
-
-            else:
-                date = datetime(*value.timetuple()[:6])
-            return date.strftime(date_format)
-
-        return lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
-
-    # override needed to keep the attachments' storing procedure
+    # override needed to keep the attachments storing procedure
     def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None):
         """generate the PDF"""
-        
+
         if context is None:
             context={}
-
+        htmls = []
         if report_xml.report_type != 'webkit':
             return super(WebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
 
-        self.parser_instance = self.parser(
-                                            cursor,
-                                            uid,
-                                            self.name2,
-                                            context=context
-                                        )
+        self.parser_instance = self.parser(cursor,
+                                           uid,
+                                           self.name2,
+                                           context=context)
 
         self.pool = pooler.get_pool(cursor.dbname)
         objs = self.getObjects(cursor, uid, ids, context)
@@ -256,66 +222,55 @@ class WebKitParser(report_sxw):
         header = report_xml.webkit_header.html
         footer = report_xml.webkit_header.footer_html
         if not header and report_xml.header:
-          raise except_osv(
-                _('No header defined for this Webkit report!'),
-                _('Please set a header in company settings')
-            )
+            raise except_osv(
+                  _('No header defined for this Webkit report!'),
+                  _('Please set a header in company settings')
+              )
         if not report_xml.header :
-            #I know it could be cleaner ...
-            header = u"""
-<html>
-    <head>
-        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
-        <style type="text/css"> 
-            ${css}
-        </style>
-        <script>
-        function subst() {
-           var vars={};
-           var x=document.location.search.substring(1).split('&');
-           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
-           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
-           for(var i in x) {
-             var y = document.getElementsByClassName(x[i]);
-             for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
-           }
-         }
-        </script>
-    </head>
-<body style="border:0; margin: 0;" onload="subst()">
-</body>
-</html>"""
+            header = ''
+            default_head = addons.get_module_resource('report_webkit', 'default_header.html')
+            with open(default_head,'r') as f:
+                header = f.read()
         css = report_xml.webkit_header.css
         if not css :
             css = ''
         user = self.pool.get('res.users').browse(cursor, uid, uid)
         company= user.company_id
-        
+
         #default_filters=['unicode', 'entity'] can be used to set global filter
         body_mako_tpl = mako_template(template)
         helper = WebKitHelper(cursor, uid, report_xml.id, context)
-        try :
-            html = body_mako_tpl.render(     helper=helper,
-                                             css=css,
-                                             _=self.translate_call,
-                                             **self.parser_instance.localcontext
-                                        )
-        except Exception, e:
-            msg = exceptions.text_error_template().render()
-            netsvc.Logger().notifyChannel('Webkit render', netsvc.LOG_ERROR, msg)
-            raise except_osv(_('Webkit render'), msg)
+        if report_xml.precise_mode:
+            for obj in objs:
+                self.parser_instance.localcontext['objects'] = [obj]
+                try :
+                    html = body_mako_tpl.render(helper=helper,
+                                                css=css,
+                                                _=self.translate_call,
+                                                **self.parser_instance.localcontext)
+                    htmls.append(html)
+                except Exception, e:
+                    msg = exceptions.text_error_template().render()
+                    logger.error(msg)
+                    raise except_osv(_('Webkit render'), msg)
+        else:
+            try :
+                html = body_mako_tpl.render(helper=helper,
+                                            css=css,
+                                            _=self.translate_call,
+                                            **self.parser_instance.localcontext)
+                htmls.append(html)
+            except Exception, e:
+                msg = exceptions.text_error_template().render()
+                logger.error(msg)
+                raise except_osv(_('Webkit render'), msg)
         head_mako_tpl = mako_template(header)
         try :
-            head = head_mako_tpl.render(
-                                        company=company,
-                                        time=time,
-                                        helper=helper,
+            head = head_mako_tpl.render(helper=helper,
                                         css=css,
-                                        formatLang=self.formatLang,
-                                        setLang=self.setLang,
                                         _=self.translate_call,
-                                        _debug=False
-                                    )
+                                        _debug=False,
+                                        **self.parser_instance.localcontext)
         except Exception, e:
             raise except_osv(_('Webkit render'),
                 exceptions.text_error_template().render())
@@ -323,38 +278,28 @@ class WebKitParser(report_sxw):
         if footer :
             foot_mako_tpl = mako_template(footer)
             try :
-                foot = foot_mako_tpl.render(
-                                            company=company,
-                                            time=time,
-                                            helper=helper,
+                foot = foot_mako_tpl.render(helper=helper,
                                             css=css,
-                                            formatLang=self.formatLang,
-                                            setLang=self.setLang,
                                             _=self.translate_call,
-                                            )
+                                            **self.parser_instance.localcontext)
             except:
                 msg = exceptions.text_error_template().render()
-                netsvc.Logger().notifyChannel('Webkit render', netsvc.LOG_ERROR, msg)
+                logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
         if report_xml.webkit_debug :
             try :
-                deb = head_mako_tpl.render(
-                                            company=company,
-                                            time=time,
-                                            helper=helper,
-                                            css=css,
-                                            _debug=tools.ustr(html),
-                                            formatLang=self.formatLang,
-                                            setLang=self.setLang,
-                                            _=self.translate_call,
-                                            )
+                deb = head_mako_tpl.render(helper=helper,
+                                           css=css,
+                                           _debug=tools.ustr("\n".join(htmls)),
+                                           _=self.translate_call,
+                                           **self.parser_instance.localcontext)
             except Exception, e:
                 msg = exceptions.text_error_template().render()
-                netsvc.Logger().notifyChannel('Webkit render', netsvc.LOG_ERROR, msg)
+                logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
             return (deb, 'html')
         bin = self.get_lib(cursor, uid, company.id)
-        pdf = self.generate_pdf(bin, report_xml, head, foot, [html])
+        pdf = self.generate_pdf(bin, report_xml, head, foot, htmls)
         return (pdf, 'pdf')
 
 
@@ -366,13 +311,11 @@ class WebKitParser(report_sxw):
         report_xml_ids = ir_obj.search(cursor, uid,
                 [('report_name', '=', self.name[7:])], context=context)
         if report_xml_ids:
-            
-            report_xml = ir_obj.browse(
-                                        cursor, 
-                                        uid, 
-                                        report_xml_ids[0], 
-                                        context=context
-                                    )
+
+            report_xml = ir_obj.browse(cursor,
+                                       uid,
+                                       report_xml_ids[0],
+                                       context=context)
             report_xml.report_rml = None
             report_xml.report_rml_content = None
             report_xml.report_sxw_content_data = None
@@ -386,3 +329,5 @@ class WebKitParser(report_sxw):
         if not result:
             return (False,False)
         return result
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py
index f6f7b3c8019..e8ae8b79fc0 100644
--- a/addons/report_webkit/wizard/__init__.py
+++ b/addons/report_webkit/wizard/__init__.py
@@ -29,4 +29,6 @@
 #
 ##############################################################################
 
-import report_webkit_actions
\ No newline at end of file
+import report_webkit_actions
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index 79426f8d159..bb2c5312441 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -144,3 +144,5 @@ class report_webkit_actions(osv.osv_memory):
                 }                   
 
 report_webkit_actions()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit_sample/__init__.py b/addons/report_webkit_sample/__init__.py
index 9b406f754d8..c1d68d587bf 100644
--- a/addons/report_webkit_sample/__init__.py
+++ b/addons/report_webkit_sample/__init__.py
@@ -29,4 +29,6 @@
 #
 ##############################################################################
 import wizard
-import report
\ No newline at end of file
+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
index 3670aa4c5d2..4e144736c24 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -43,7 +43,7 @@ You have to create the print buttons by calling the wizard. For more details see
                     """,
     "version" : "0.9",
     "depends" : ["base", "account", "report_webkit"],
-    "category": "Tools",
+    "category": "Hidden",
     "author" : "Camptocamp SA - NBessi",
     "url": "http://www.camptocamp.com/",
     "data": ["report_webkit_html_view.xml",
@@ -54,3 +54,5 @@ You have to create the print buttons by calling the wizard. For more details see
     "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/bg.po b/addons/report_webkit_sample/i18n/bg.po
index ecde03f868a..3520051b931 100644
--- a/addons/report_webkit_sample/i18n/bg.po
+++ b/addons/report_webkit_sample/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -23,12 +23,12 @@ msgid "WebKit invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Фактура към доставчик"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Единична цена"
 
@@ -53,91 +53,91 @@ msgid "Webkit Report Samples"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Отстъпка (%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Факс"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Документ"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Описание"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Цена"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Дата на фактура"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "КОЛ."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "База"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Отпратка към контрагент"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "Данъци"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Количество"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr "ДДС"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr "Обезщетение"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Тел"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "Имейл"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Фактура"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr "Обезщетение на доставчик"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Общо"
diff --git a/addons/report_webkit_sample/i18n/ca.po b/addons/report_webkit_sample/i18n/ca.po
index 75cb0d5adeb..97733e93416 100644
--- a/addons/report_webkit_sample/i18n/ca.po
+++ b/addons/report_webkit_sample/i18n/ca.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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
 msgid "WebKit invoice"
-msgstr ""
+msgstr "Factura Webkit"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Factura de proveïdor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
-msgstr ""
+msgstr "Preu unitari"
 
 #. module: report_webkit_sample
 #: model:ir.module.module,description:report_webkit_sample.module_meta_information
@@ -46,98 +46,109 @@ msgid ""
 "        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"
+"                    "
 
 #. module: report_webkit_sample
 #: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
 msgid "Webkit Report Samples"
-msgstr ""
+msgstr "Informes Webkit d'exemple"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desc.(%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
-msgstr ""
+msgstr "Preu"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data de la factura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
-msgstr ""
+msgstr "QTAT"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
-msgstr ""
+msgstr "Ref. empresa"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
-msgstr ""
+msgstr "Impostos"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
-msgstr ""
+msgstr "Devolució"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
-msgstr ""
+msgstr "Tel"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Factura d'abonament de proveïdor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
-msgstr ""
+msgstr "Total"
diff --git a/addons/report_webkit_sample/i18n/de.po b/addons/report_webkit_sample/i18n/de.po
index 14b87dbdadb..d385c1f3be4 100644
--- a/addons/report_webkit_sample/i18n/de.po
+++ b/addons/report_webkit_sample/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: 2011-07-03 04:47+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -152,9 +152,3 @@ msgstr "Lieferanten Gutschrift"
 #: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Summe"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/report_webkit_sample/i18n/es.po b/addons/report_webkit_sample/i18n/es.po
index b0d79bf88c4..d272285c179 100644
--- a/addons/report_webkit_sample/i18n/es.po
+++ b/addons/report_webkit_sample/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -24,12 +24,12 @@ msgid "WebKit invoice"
 msgstr "Factura Webkit"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Factura de Proveedor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Precio unitario"
 
@@ -65,97 +65,91 @@ msgid "Webkit Report Samples"
 msgstr "Informes Webkit de ejemplo"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Documento"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Descripción"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Precio"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Fecha factura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "CTDAD"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "Base"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Ref. empresa"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Importe"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr "CIF/NIF"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr "Reembolso"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Tel"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "E-mail"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Factura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr "Factura rectificativa (abono) de proveedor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Total"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Idientificador del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/report_webkit_sample/i18n/es_MX.po b/addons/report_webkit_sample/i18n/es_MX.po
new file mode 100644
index 00000000000..221c8a52662
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/es_MX.po
@@ -0,0 +1,155 @@
+# 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
new file mode 100644
index 00000000000..221c8a52662
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/es_VE.po
@@ -0,0 +1,155 @@
+# 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
index 1d2690dd578..3f4d87fcf98 100644
--- a/addons/report_webkit_sample/i18n/fi.po
+++ b/addons/report_webkit_sample/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: 2011-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po
index 4ef1c199415..d1445f975a2 100644
--- a/addons/report_webkit_sample/i18n/fr.po
+++ b/addons/report_webkit_sample/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -23,12 +23,12 @@ msgid "WebKit invoice"
 msgstr "facture WebKit"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Facture fournisseur"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Prix unitaire"
 
@@ -63,210 +63,91 @@ msgid "Webkit Report Samples"
 msgstr "Exemples de rapports Webkit"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Disc.(%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Ref. document"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Description"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Prix"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Date de la facture"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "QTÉ"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "Base"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Réf. partenaire"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "Impôts"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Montant"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr "TVA"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr "Remboursement"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Tél"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "Courriel"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Facture"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr "Remboursement fournisseur"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Total"
-
-#~ msgid "Report Action already exist for this report."
-#~ msgstr "Report Action already exist for this report."
-
-#~ msgid "Add print button"
-#~ msgstr "Add print button"
-
-#~ msgid "Add Print Buttons"
-#~ msgstr "Ajouter des boutons d'impression"
-
-#~ msgid "Client Actions Connections"
-#~ msgstr "Actions Client Connections"
-
-#~ 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"
-#~ "                    "
-
-#~ msgid "Add action to menu context in print button."
-#~ msgstr "Ajouter à l'action du menu contextuel dans le bouton d'impression."
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancel"
-
-#~ msgid "webkit report"
-#~ msgstr "rapport webkit"
-
-#~ msgid "Open added action"
-#~ msgstr "Ouvrir ajouté action"
-
-#~ msgid "_Ok"
-#~ msgstr "_Ok"
-
-#~ msgid "_Close"
-#~ msgstr "_Close"
-
-#~ msgid "Unit of Measure"
-#~ msgstr "Unité de mesure"
-
-#~ msgid "Tax Lines"
-#~ msgstr "Lignes de taxe"
-
-#~ msgid "Invoice Ref"
-#~ msgstr "Réf. Facture"
-
-#~ msgid "Invoice Line"
-#~ msgstr "Ligne de facture"
-
-#~ msgid "Product"
-#~ msgstr "Produit"
-
-#~ msgid "Tax"
-#~ msgstr "Taxe"
diff --git a/addons/report_webkit_sample/i18n/gl.po b/addons/report_webkit_sample/i18n/gl.po
index fd8be2c838c..091fc35c4cd 100644
--- a/addons/report_webkit_sample/i18n/gl.po
+++ b/addons/report_webkit_sample/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -23,12 +23,12 @@ msgid "WebKit invoice"
 msgstr "Factura Webkit"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Factura de provedor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Prezo unidade"
 
@@ -59,91 +59,91 @@ msgid "Webkit Report Samples"
 msgstr "Informes Webkit de exemplo"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Documento"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Descrición"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Prezo"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Data da factura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "CANT."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "Base"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Referencia socio"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "Impostos"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Cantidade"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr "IVE"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr "Reembolso"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Tel."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "E-mail"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Factura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr "Reembolso do provedor:"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Total"
diff --git a/addons/report_webkit_sample/i18n/hu.po b/addons/report_webkit_sample/i18n/hu.po
index 95514d7811f..9a88c7fb216 100644
--- a/addons/report_webkit_sample/i18n/hu.po
+++ b/addons/report_webkit_sample/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-04 15:22+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -22,12 +23,12 @@ msgid "WebKit invoice"
 msgstr "WebKit számla"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Bejövő számla"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Egységár"
 
@@ -52,91 +53,91 @@ msgid "Webkit Report Samples"
 msgstr "WebKit jelentés minták"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Eng. (%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Dokumentum"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Leírás"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Nettó érték"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Számla kelte"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "Db"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "Adóalap"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Partner hiv."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "Adók"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Adó összege"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr "ÁFA"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr "Jóváíró számla"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Tel"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "E-mail"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Számla"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice: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:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Bruttó érték"
diff --git a/addons/report_webkit_sample/i18n/it.po b/addons/report_webkit_sample/i18n/it.po
index 42f682271fd..51acabdd570 100644
--- a/addons/report_webkit_sample/i18n/it.po
+++ b/addons/report_webkit_sample/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -23,12 +23,12 @@ msgid "WebKit invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Fattura Fornitore"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Prezzo unitario"
 
@@ -53,91 +53,91 @@ msgid "Webkit Report Samples"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Sconto (%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Documento"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Descrizione"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Prezzo"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Data fattura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "Q.ta"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "Base"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Rif. Partner"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "Tasse"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Importo"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr "IVA"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Tel."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "Email"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Fattura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Totale"
diff --git a/addons/report_webkit_sample/i18n/nl.po b/addons/report_webkit_sample/i18n/nl.po
index 983f46a19a5..9afcb788ac8 100644
--- a/addons/report_webkit_sample/i18n/nl.po
+++ b/addons/report_webkit_sample/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -23,12 +23,12 @@ msgid "WebKit invoice"
 msgstr "WebKit factuur"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Inkoopfactuur"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Stuksprijs"
 
@@ -64,91 +64,91 @@ msgid "Webkit Report Samples"
 msgstr "Webkit overzicht voorbeelden"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Krt. (%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Document"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Omschrijving"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Prijs"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Factuurdatum"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr "AANT"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr "Basis"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Relatie ref."
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr "BTW"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr "Bedrag"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr "BTW"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr "Creditnota"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Tel"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr "E-mail"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Factuur"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr "Creditfactuur inkoop"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Totaal"
diff --git a/addons/report_webkit_sample/i18n/pt.po b/addons/report_webkit_sample/i18n/pt.po
index 0846320a0ac..abbdb9154c0 100644
--- a/addons/report_webkit_sample/i18n/pt.po
+++ b/addons/report_webkit_sample/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -23,12 +23,12 @@ msgid "WebKit invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Factura de fornecedor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Preço unitário"
 
@@ -53,91 +53,91 @@ msgid "Webkit Report Samples"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Documento"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Descrição"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Preço"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr "Data da fatura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr "Ref. do parceiro"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr "Telefone"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr "Fatura"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr "Reembolso de Fornecedor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Total"
diff --git a/addons/report_webkit_sample/i18n/pt_BR.po b/addons/report_webkit_sample/i18n/pt_BR.po
index ea821b47fdf..58d68ab58d5 100644
--- a/addons/report_webkit_sample/i18n/pt_BR.po
+++ b/addons/report_webkit_sample/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
@@ -23,12 +23,12 @@ msgid "WebKit invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+#: report:report.webkitaccount.invoice:35
 msgid "Supplier Invoice"
 msgstr "Fatura de Fornecedor"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Unit Price"
 msgstr "Preço Unitário"
 
@@ -53,91 +53,91 @@ msgid "Webkit Report Samples"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+#: report:report.webkitaccount.invoice:22
 msgid "Fax"
 msgstr "Fax"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Document"
 msgstr "Documento"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Description"
 msgstr "Descrição"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Price"
 msgstr "Preço"
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Invoice Date"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "QTY"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Base"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+#: report:report.webkitaccount.invoice:44
 msgid "Partner Ref."
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+#: report:report.webkitaccount.invoice:49
 msgid "Taxes"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+#: report:report.webkitaccount.invoice:64
 msgid "Amount"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+#: report:report.webkitaccount.invoice:28
 msgid "VAT"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+#: report:report.webkitaccount.invoice:37
 msgid "Refund"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+#: report:report.webkitaccount.invoice:19
 msgid "Tel"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+#: report:report.webkitaccount.invoice:25
 msgid "E-mail"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+#: report:report.webkitaccount.invoice:33
 msgid "Invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+#: report:report.webkitaccount.invoice:39
 msgid "Supplier Refund"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+#: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr ""
diff --git a/addons/report_webkit_sample/i18n/zh_CN.po b/addons/report_webkit_sample/i18n/zh_CN.po
index 3ff9715435b..35126666111 100644
--- a/addons/report_webkit_sample/i18n/zh_CN.po
+++ b/addons/report_webkit_sample/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: 2011-07-13 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
diff --git a/addons/report_webkit_sample/report/__init__.py b/addons/report_webkit_sample/report/__init__.py
index 04cc14f1d80..e8703f10d03 100644
--- a/addons/report_webkit_sample/report/__init__.py
+++ b/addons/report_webkit_sample/report/__init__.py
@@ -29,4 +29,6 @@
 #
 ##############################################################################
 
-import report_webkit_html
\ No newline at end of file
+import report_webkit_html
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit_sample/report/report_webkit_html.py b/addons/report_webkit_sample/report/report_webkit_html.py
index 3e7f70c4154..5da7f008569 100644
--- a/addons/report_webkit_sample/report/report_webkit_html.py
+++ b/addons/report_webkit_sample/report/report_webkit_html.py
@@ -15,3 +15,5 @@ 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/resource/__openerp__.py b/addons/resource/__openerp__.py
index dab9b06d5f8..f1e020215a6 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Project Management",
+    "category" : "Hidden",
     "website" : "http://www.openerp.com",
     "description": """
 Module for resource management.
diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py
index 411b2c5395b..894345230ea 100644
--- a/addons/resource/faces/observer.py
+++ b/addons/resource/faces/observer.py
@@ -77,3 +77,5 @@ factories = { }
 clear_cache_funcs = {}
 #@-node:@file observer.py
 #@-leo
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index aba9635fc4b..c82c49d4816 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -949,3 +949,5 @@ if __name__ == '__main__':
     start3 = cal.StartDate("10.1.2005")
 #@-node:@file pcalendar.py
 #@-leo
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py
index a9de390b255..61bfa91917b 100644
--- a/addons/resource/faces/plocale.py
+++ b/addons/resource/faces/plocale.py
@@ -52,3 +52,5 @@ def get_encoding():
     if trans: return trans.charset()
     return locale.getpreferredencoding()
     
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py
index 7cc2741fc8e..3451806444e 100644
--- a/addons/resource/faces/resource.py
+++ b/addons/resource/faces/resource.py
@@ -864,3 +864,5 @@ class _AndResourceGroup(_ResourceGroup):
 #@-others
 #@-node:@file resource.py
 #@-leo
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index fe90c42d806..f5240112277 100644
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -3851,3 +3851,5 @@ class AdjustedProject(_AllocationPoject):
 """
 #@-node:@file task.py
 #@-leo
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py
index 215766eb958..3e7c3c1dc89 100644
--- a/addons/resource/faces/timescale.py
+++ b/addons/resource/faces/timescale.py
@@ -111,3 +111,5 @@ class TimeScale(object):
 
 
 _default_scale = TimeScale(pcal._default_calendar)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py
index f7d61fb1dc9..54985767613 100644
--- a/addons/resource/faces/utils.py
+++ b/addons/resource/faces/utils.py
@@ -122,3 +122,5 @@ def progress_end():
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/i18n/bg.po b/addons/resource/i18n/bg.po
index a40e2ce921e..1099e761d87 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr "Сряда"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/ca.po b/addons/resource/i18n/ca.po
index 9ab7efdf733..4c9220604a9 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -48,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Absències de recursos"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -219,7 +220,6 @@ msgid "Wednesday"
 msgstr "Dimecres"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/cs.po b/addons/resource/i18n/cs.po
index 23d3166ec81..244cb499790 100644
--- a/addons/resource/i18n/cs.po
+++ b/addons/resource/i18n/cs.po
@@ -6,16 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-07-13 13:10+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\n"
+"PO-Revision-Date: 2011-09-06 06:16+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: 2011-07-15 04:51+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: resource
@@ -279,6 +279,10 @@ 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 ""
+"Toto pole vykresluje efektivitu zdroje k dokončení úloh. např. zdroj je dán "
+"sám do fáze 5 dnů s 5 úlohách k němu přiřazených, ukáže jako výchozí "
+"zatížení 100% pro tuto fázi, ale pokud dáme efektivitu 200%, pak jeho "
+"zatížení bude pouze 50%."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -308,6 +312,9 @@ msgid ""
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
 msgstr ""
+"Zdroje umožňují vytvořit a spravovat zdroje, které by měly být zapojené v "
+"určitých fázích projektu. Můžete také nastavit jejich úroveň účinnosti a "
+"základní zatížení na jejich týdeních pracovních hodinách."
 
 #. module: resource
 #: view:resource.resource:0
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index f5488ec5f7e..7adc076dea3 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -49,6 +49,7 @@ msgid "Resources Leaves"
 msgstr "Abwesende Ressourcen"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -225,7 +226,6 @@ msgid "Wednesday"
 msgstr "Mittwoch"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -375,50 +375,3 @@ msgstr " (copy)"
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Samstag"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the resource "
-#~ "record without removing it."
-#~ msgstr ""
-#~ "Wenn das Aktiv Feld auf Falsch gesetzt wird, wird die Ressource versteckt "
-#~ "ohne sie zu löschen"
-
-#~ msgid "Manager"
-#~ msgstr "Manager"
-
-#~ msgid "Search Working Period"
-#~ msgstr "Suche Arbeitsperiode"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Resources allows you to create and manage resources that should be involved "
-#~ "in a specific project phase. It also allows you to set their efficiency "
-#~ "level and workload based on their weekly working hours"
-#~ msgstr ""
-#~ "Ressourcen ermöglichen die Erstellung und Verwaltung von Ressourcen, die in "
-#~ "bestimmten Projektphasen benötigt werden. Dabei kann auch der Grad der "
-#~ "Effizienz und die Arbeitskapazität auf Basis der Wochenarbeitszeit "
-#~ "festgelegt werden."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index fae97aa22fd..35eb213e13f 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -49,6 +49,7 @@ msgid "Resources Leaves"
 msgstr "Ausencias de recursos"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -220,7 +221,6 @@ msgid "Wednesday"
 msgstr "Miércoles"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -367,40 +367,3 @@ msgstr " (copia)"
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Sábado"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la definición de la vista!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Idientificador del certificado del módulo debe ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "Resources allows you to create and manage resources that should be involved "
-#~ "in a specific project phase. It also allows you to set their efficiency "
-#~ "level and workload based on their weekly working hours"
-#~ msgstr ""
-#~ "Los recursos le permiten crear y gestionar recursos que deberían ser "
-#~ "implicadas en una fase específica de un proyecto. También le permite "
-#~ "establecer su nivel de eficiencia y carga de trabajo en base a sus horas "
-#~ "trabajadas durante la semana"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Search Working Period"
-#~ msgstr "Buscar periodo de trabajo"
diff --git a/addons/resource/i18n/es_EC.po b/addons/resource/i18n/es_EC.po
index 24b02ed4a7e..8feaf050817 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: 2011-08-17 04:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/es_MX.po b/addons/resource/i18n/es_MX.po
new file mode 100644
index 00000000000..bb4f784d8f8
--- /dev/null
+++ b/addons/resource/i18n/es_MX.po
@@ -0,0 +1,369 @@
+# 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-12 19:11+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+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 ""
+"Si está vacío, es un día festivo para toda la compañía. Si hay un recurso "
+"seleccionado, el festivo/ausencia es solo para ese recurso."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Tipo de recurso"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Detalle ausencia"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Ausencias de recursos"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Buscar recurso"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Responsable del grupo de trabajo"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr "El horario de trabajo empezará desde"
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+"¡Error! La fecha inicial de ausencia debe ser anterior a la fecha final de "
+"ausencia."
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Calendario recurso"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Material"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Día de la semana"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr "El horario de trabajo terminará a"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Fecha de inicio"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr "Buscar horario de trabajo"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Buscar ausencias en periodos de trabajo"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Días cerrados"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo para la gestión de recursos\n"
+"     Un recurso representa algo que puede ser programado en un calendario\n"
+"     (un desarrollador en una tarea o un centro de producción en órdenes de "
+"producción).\n"
+"     Este módulo gestiona un recurso calendario asociado a cada recurso.\n"
+"     También gestiona las ausencias de cada recurso.\n"
+"\n"
+"    "
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Period"
+msgstr "Horario de trabajo"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Detalle recurso"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el registro del recurso sin "
+"eliminarlo."
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Calendario del recurso"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "Usuario relacionado con el recurso para gestionar su acceso."
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Define el horario del recurso."
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Trabajar desde"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Trabajar hasta"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"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 indica la eficiencia del recurso para completar tareas. Por "
+"ejemplo un recurso único en una fase de 5 días con 5 tareas asignadas a él, "
+"indicará una carga del 100% para esta fase por defecto, pero si ponemos una "
+"eficiencia de 200%, su carga será únicamente del 50%."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+msgid "Working time"
+msgstr "Tiempo de trabajo"
+
+#. 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 "Ausencias de recursos"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+"Los recursos le permiten crear y gestionar los recursos que deben participar "
+"en una cierta fase de un proyecto. También puede definir su nivel de "
+"eficiencia y carga de trabajo en base a sus horas de trabajo semanales."
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr "(ausencia)"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Factor de eficiciencia"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Humano"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Detalle del trabajo"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: resource
+#: code:addons/resource/resource.py:246
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Sábado"
diff --git a/addons/resource/i18n/es_VE.po b/addons/resource/i18n/es_VE.po
new file mode 100644
index 00000000000..bb4f784d8f8
--- /dev/null
+++ b/addons/resource/i18n/es_VE.po
@@ -0,0 +1,369 @@
+# 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-12 19:11+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+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 ""
+"Si está vacío, es un día festivo para toda la compañía. Si hay un recurso "
+"seleccionado, el festivo/ausencia es solo para ese recurso."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Tipo de recurso"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Detalle ausencia"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Ausencias de recursos"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Buscar recurso"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Responsable del grupo de trabajo"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr "El horario de trabajo empezará desde"
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+"¡Error! La fecha inicial de ausencia debe ser anterior a la fecha final de "
+"ausencia."
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Calendario recurso"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Material"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Día de la semana"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr "El horario de trabajo terminará a"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Fecha de inicio"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr "Buscar horario de trabajo"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Buscar ausencias en periodos de trabajo"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Días cerrados"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo para la gestión de recursos\n"
+"     Un recurso representa algo que puede ser programado en un calendario\n"
+"     (un desarrollador en una tarea o un centro de producción en órdenes de "
+"producción).\n"
+"     Este módulo gestiona un recurso calendario asociado a cada recurso.\n"
+"     También gestiona las ausencias de cada recurso.\n"
+"\n"
+"    "
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Period"
+msgstr "Horario de trabajo"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Detalle recurso"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el registro del recurso sin "
+"eliminarlo."
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Calendario del recurso"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "Usuario relacionado con el recurso para gestionar su acceso."
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Define el horario del recurso."
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Trabajar desde"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Trabajar hasta"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"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 indica la eficiencia del recurso para completar tareas. Por "
+"ejemplo un recurso único en una fase de 5 días con 5 tareas asignadas a él, "
+"indicará una carga del 100% para esta fase por defecto, pero si ponemos una "
+"eficiencia de 200%, su carga será únicamente del 50%."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+msgid "Working time"
+msgstr "Tiempo de trabajo"
+
+#. 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 "Ausencias de recursos"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+"Los recursos le permiten crear y gestionar los recursos que deben participar "
+"en una cierta fase de un proyecto. También puede definir su nivel de "
+"eficiencia y carga de trabajo en base a sus horas de trabajo semanales."
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr "(ausencia)"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Factor de eficiciencia"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Humano"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Detalle del trabajo"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: resource
+#: code:addons/resource/resource.py:246
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Sábado"
diff --git a/addons/resource/i18n/et.po b/addons/resource/i18n/et.po
index 3fbf6da9d53..8fdee2af099 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr "Kolmapäev"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -344,17 +344,3 @@ msgstr ""
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Laupäev"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid "Manager"
-#~ msgstr "Haldur"
diff --git a/addons/resource/i18n/fi.po b/addons/resource/i18n/fi.po
index 6703e5ead1f..af7a47dd000 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: 2011-06-21 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -231,6 +231,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Jos aktiivisen kentän arvo on epätosi (false), voit piilottaa resurssin "
+"poistamatta sitä."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index f2b92486f24..b993c3f7ae5 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -48,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Congés des ressources"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -218,7 +219,6 @@ msgid "Wednesday"
 msgstr "Mercredi"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -366,6 +366,3 @@ msgstr " (copie)"
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Samedi"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/resource/i18n/gl.po b/addons/resource/i18n/gl.po
index a31e1763a14..6fd21a8a859 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: 2011-05-13 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6c3737c4dad..4e113fd9f49 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/hu.po b/addons/resource/i18n/hu.po
index 181fa4a9732..4cb179a8820 100644
--- a/addons/resource/i18n/hu.po
+++ b/addons/resource/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-26 10:53+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -45,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -205,7 +207,6 @@ msgid "Wednesday"
 msgstr "Szerda"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/it.po b/addons/resource/i18n/it.po
index b5b6d439aad..88c33dcabee 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -48,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Permessi"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -209,7 +210,6 @@ msgid "Wednesday"
 msgstr "Mercoledì"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -349,46 +349,3 @@ msgstr " (copia)"
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Sabato"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non è possibile creare menu ricorsivi."
-
-#~ msgid "Search Working Period"
-#~ msgstr "Ricerca periodo di lavoro"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "Resources allows you to create and manage resources that should be involved "
-#~ "in a specific project phase. It also allows you to set their efficiency "
-#~ "level and workload based on their weekly working hours"
-#~ msgstr ""
-#~ "Il modulo Risorse permette di creare e gestire risorse coinvolte in una "
-#~ "specifica fase di un progetto. Permette anche di definirne l'efficienza ed "
-#~ "il carico di lavoro in base alle ore di lavoro settimanali."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the resource "
-#~ "record without removing it."
-#~ msgstr ""
-#~ "Il camp 'attivo' permette di noscondere il record della risorsa senza "
-#~ "eliminarlo."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/resource/i18n/lt.po b/addons/resource/i18n/lt.po
index 4caf50c2cf4..2d9c18e5817 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -48,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Išvykimų resursai"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -208,7 +209,6 @@ msgid "Wednesday"
 msgstr "Trečiadienis"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/mn.po b/addons/resource/i18n/mn.po
index 0e88eee0931..a4fa81b5417 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -48,6 +48,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -216,7 +217,6 @@ msgid "Wednesday"
 msgstr "Лхагва"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -354,27 +354,3 @@ msgstr ""
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Бямба"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Search Working Period"
-#~ msgstr "Ажлын мөчлөг хайх"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the resource "
-#~ "record without removing it."
-#~ msgstr ""
-#~ "Хэрэв идэвхитэй талбарт чагт тависан бол нөөцийг хасалгүйгээр нуух болно."
-
-#~ msgid "Manager"
-#~ msgstr "Менежер"
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index 7aaff98f36d..11320fdd055 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -48,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Afwezigheid resource"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -217,7 +218,6 @@ msgid "Wednesday"
 msgstr "Woensdag"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -365,27 +365,3 @@ msgstr " (kopie)"
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Zaterdag"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "Search Working Period"
-#~ msgstr "Zoek werkperiode"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the resource "
-#~ "record without removing it."
-#~ msgstr ""
-#~ "Als het actief veld is aan staat, kunt u de resource verbergen zonder haar "
-#~ "te verwijderen."
-
-#~ msgid "Manager"
-#~ msgstr "Manager"
diff --git a/addons/resource/i18n/pl.po b/addons/resource/i18n/pl.po
index 0011bd8c253..a7823e4be01 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -48,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Nieobecności zasobu"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -208,7 +209,6 @@ msgid "Wednesday"
 msgstr "Środa"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -346,21 +346,3 @@ msgstr ""
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
 msgstr "Sobota"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid "Search Working Period"
-#~ msgstr "Szukaj okresu pracy"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Manager"
-#~ msgstr "Menedżer"
diff --git a/addons/resource/i18n/pt.po b/addons/resource/i18n/pt.po
index e4acd6d526f..1b8fc031186 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr "Quarta-Feira"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/pt_BR.po b/addons/resource/i18n/pt_BR.po
index 12891a63f9a..21edd1fdd02 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr "Quarta"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/ro.po b/addons/resource/i18n/ro.po
index d6b88b9c2e3..15579841f25 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr "Miercuri"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
index 7cbabc0c8ef..c84dcccf72e 100644
--- a/addons/resource/i18n/ru.po
+++ b/addons/resource/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+"Если пусто, это не рабочий день для всей компании. Если ресурс установлен, "
+"отдых/отпуск только на этот ресурс"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -46,6 +48,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -102,7 +105,7 @@ msgstr ""
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Календарь ресурса"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -206,7 +209,6 @@ msgid "Wednesday"
 msgstr "Среда"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -233,12 +235,12 @@ msgstr ""
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Календарь ресурса"
 
 #. module: resource
 #: help:resource.resource,user_id:0
 msgid "Related user name for the resource to manage its access."
-msgstr ""
+msgstr "Пользователь управляющий доступом к ресурсу"
 
 #. module: resource
 #: help:resource.resource,calendar_id:0
@@ -293,7 +295,7 @@ msgstr ""
 #. module: resource
 #: view:resource.resource:0
 msgid "General Information"
-msgstr "Общие сведения"
+msgstr "Общая информация"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po
index 69558fad685..a8ea6406469 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr "Onsdag"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/tr.po b/addons/resource/i18n/tr.po
index ff60562766b..beb801370c5 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/vi.po b/addons/resource/i18n/vi.po
index 3a1078fc675..6588588bec9 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -206,7 +207,6 @@ msgid "Wednesday"
 msgstr "Thứ Tư"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
diff --git a/addons/resource/i18n/zh_CN.po b/addons/resource/i18n/zh_CN.po
index bc6cb5765c6..256ec39d2cf 100644
--- a/addons/resource/i18n/zh_CN.po
+++ b/addons/resource/i18n/zh_CN.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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
 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 ""
+msgstr "如果为空，表示公司的一个通用假期，如果设置了一个资源，假期/准假只适用于该资源。"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -38,14 +38,15 @@ msgstr "资源类型"
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr ""
+msgstr "准假详情"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "资源准假"
 
 #. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
@@ -97,12 +98,12 @@ 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
 msgid "Resource Calendar"
-msgstr "资源日历"
+msgstr "资源日程表"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -157,7 +158,7 @@ msgstr "日期"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Search Working Period Leaves"
-msgstr ""
+msgstr "搜索准假工作周期"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
@@ -167,7 +168,7 @@ msgstr "结束日期"
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
 msgid "Closing Days"
-msgstr ""
+msgstr "休息日"
 
 #. module: resource
 #: model:ir.module.module,shortdesc:resource.module_meta_information
@@ -185,7 +186,7 @@ msgstr "资源"
 #: field:resource.calendar.leaves,name:0
 #: field:resource.resource,name:0
 msgid "Name"
-msgstr "姓名"
+msgstr "名称"
 
 #. module: resource
 #: model:ir.module.module,description:resource.module_meta_information
@@ -212,7 +213,6 @@ msgid "Wednesday"
 msgstr "周三"
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
@@ -234,7 +234,7 @@ msgstr "有效"
 msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
-msgstr "如果此字段未被选中，那么可以隐藏此记录且并不删除它。"
+msgstr "如果这有效字段设为否，那么可以隐藏此记录且并不删除它。"
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
@@ -279,6 +279,8 @@ 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 ""
+"这字段描述该资源完成任务的效率。例如一个资源在一个任务的阶段单独放5天分配5给它，默认情况下这阶段它将是100%负荷，但如果设为效率是200%那它将只用到"
+"50%的负荷。"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -294,7 +296,7 @@ msgstr "工作时间"
 #: 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 "资源准假"
 
 #. module: resource
 #: view:resource.resource:0
@@ -307,7 +309,7 @@ msgid ""
 "Resources allow you to create and manage resources that should be involved "
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
-msgstr ""
+msgstr "资源允许你创建和管理资源参与的特定的计划阶段。你还能在其每周工作时间基础上设置其效率和工作量。"
 
 #. module: resource
 #: view:resource.resource:0
@@ -318,12 +320,12 @@ msgstr "不活跃的"
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "（假期）"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
 msgid "Efficiency factor"
-msgstr ""
+msgstr "效率因子"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
@@ -333,7 +335,7 @@ msgstr "人"
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "工作细节"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
@@ -344,7 +346,7 @@ msgstr "开始日期"
 #: code:addons/resource/resource.py:246
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (复件)"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index e2d329bf2c7..bd62c449d2b 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -211,15 +211,21 @@ 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'),
+        'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week', required=True),
         'date_from' : fields.date('Starting date'),
         'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from"),
         'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
+    
     _order = 'dayofweek, hour_from'
+    
+    _defaults = {
+        'dayofweek' : '0'
+    }
 resource_calendar_attendance()
 
 def convert_timeformat(time_string):
@@ -241,7 +247,7 @@ class resource_resource(osv.osv):
         'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
         'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
         'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will 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%."),
-        'calendar_id' : fields.many2one("resource.calendar", "Working Period", help="Define the schedule of resource"),
+        'calendar_id' : fields.many2one("resource.calendar", "Working Time", help="Define the schedule of resource"),
     }
     _defaults = {
         'resource_type' : 'user',
@@ -265,28 +271,20 @@ class resource_resource(osv.osv):
         resource_objs = {}
         user_pool = self.pool.get('res.users')
         for user in user_pool.browse(cr, uid, user_ids, context=context):
+            resource_objs[user.id] = {
+                 'name' : user.name,
+                 'vacation': [],
+                 'efficiency': 1.0,
+            }
+
             resource_ids = self.search(cr, uid, [('user_id', '=', user.id)], context=context)
-            #assert len(resource_ids) < 1, "User should not has more than one resources"
-            leaves = []
-            resource_eff = 1.0
             if resource_ids:
                 for resource in self.browse(cr, uid, resource_ids, context=context):
-                    resource_eff = resource.time_efficiency
+                    resource_objs[user.id]['efficiency'] = resource.time_efficiency
                     resource_cal = resource.calendar_id.id
                     if resource_cal:
                         leaves = self.compute_vacation(cr, uid, calendar_id, resource.id, resource_cal, context=context)
-                    temp = {
-                             'name' : resource.name,
-                             'vacation': tuple(leaves),
-                             'efficiency': resource_eff,
-                          }
-                    resource_objs[resource.id] = temp     
-#            resource_objs.append(classobj(str(user.name), (Resource,),{
-#                                             '__doc__': user.name,
-#                                             '__name__': user.name,
-#                                             'vacation': tuple(leaves),
-#                                             'efficiency': resource_eff,
-#                                          }))
+                        resource_objs[user.id]['vacation'] += list(leaves)
         return resource_objs
 
     def compute_vacation(self, cr, uid, calendar_id, resource_id=False, resource_calendar=False, context=None):
@@ -323,8 +321,8 @@ class resource_resource(osv.osv):
         """
         if not calendar_id:
             # Calendar is not specified: working days: 24/7
-            return [('fri', '1:0-12:0','12:0-24:0'), ('thu', '1:0-12:0','12:0-24:0'), ('wed', '1:0-12:0','12:0-24:0'), 
-                   ('mon', '1:0-12:0','12:0-24:0'), ('tue', '1:0-12:0','12:0-24:0'), ('sat', '1:0-12:0','12:0-24:0'), ('sun', '1:0-12:0','12:0-24: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"
         non_working = ""
@@ -340,9 +338,11 @@ class resource_resource(osv.osv):
         for week in weeks:
             res_str = ""
             day = None
-            if week_days.has_key(week['dayofweek']):
+            if week_days.get(week['dayofweek'],False):
                 day = week_days[week['dayofweek']]
                 wk_days[week['dayofweek']] = week_days[week['dayofweek']]
+            else:
+                raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
             hour_from_str = convert_timeformat(week['hour_from'])
             hour_to_str = convert_timeformat(week['hour_to'])
             res_str = hour_from_str + '-' + hour_to_str
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 424955d0584..c98dac80757 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -10,7 +10,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Resource">
-                   <group col='15' colspan='4'>
+                   <group>
                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
@@ -19,7 +19,7 @@
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                   <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
@@ -38,7 +38,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Time">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name" string="Name"/>
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -53,14 +53,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name" string="Reason"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Period" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                         <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -106,6 +106,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_resource_calendar_search"/>
+            <field name="help">Define working hours and time table that could be scheduled to your project members</field>
         </record>
 
         <record id="view_resource_calendar_attendance_tree" model="ir.ui.view">
@@ -154,6 +155,7 @@
             res_model="resource.calendar.leaves"
             src_model="resource.calendar"
             view_mode="calendar,tree,form"
+            context="{'default_calendar_id': active_id}"
             domain="[('calendar_id','=',active_id), ('resource_id','=',False)]"/>
 
         <act_window
@@ -162,6 +164,7 @@
             res_model="resource.calendar.leaves"
             src_model="resource.calendar"
             view_mode="calendar,tree,form"
+            context="{'default_calendar_id': active_id}"
             domain="[('calendar_id','=',active_id), ('resource_id','!=',False)]"/>
 
         <record id="resource_resource_form" model="ir.ui.view">
@@ -170,19 +173,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Resource">
-                   <group colspan="4" col="6">
-                    <field name="name" colspan="4"/>
-                    <field name="active"/>
-                    <field name="resource_type" />
-                    <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
-                   <notebook colspan="4">
-                     <page string="General Information">
+                   <group col="6" colspan="4">
+			           <field name="name" colspan="4"/>
+			           <field name="active"/>
+	                   <newline/>
+			           <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
+                       <field name="resource_type" />
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <newline/>
                        <field name="calendar_id" string="Working Period"/>
                        <field name="time_efficiency" groups="base.group_extended"/>
-                     </page>
-	           </notebook>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 3c7af56e808..b26486e1425 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -25,9 +25,9 @@
 
 import sale
 import stock
-import sale_installer
 import wizard
 import report
 import company
+import edi
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index c983edc881e..8b5ae108f72 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -22,8 +22,7 @@
 {
     'name': 'Sales Management',
     'version': '1.0',
-    'category': 'Sales',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 The base module to manage quotations and sales orders.
@@ -79,15 +78,16 @@ Dashboard for Sales Manager that includes:
         'sale_sequence.xml',
         'sale_data.xml',
         'sale_view.xml',
-        'sale_installer.xml',
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
-        'board_sale_view.xml',
         'process/sale_process.xml',
+        'board_sale_view.xml',
+        'edi/sale_order_action_data.xml',
     ],
     'demo_xml': ['sale_demo.xml'],
     'test': [
+        'test/edi_sale_order.yml',
         'test/data_test.yml',
         'test/manual_order_policy.yml',
         'test/prepaid_order_policy.yml',
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 66b3c8805e4..c57ed5c6144 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Manager Dashboard">
-                    <hpaned position="100">
-                        <child1>
-                            <action  name="%(sale.action_quotation_for_sale)d" string="Quotations"/>
-                            <action width="510" name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
-                        </child1>
-                        <child2>
-                            <action  name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
-                            <action  name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
-                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
-                        </child2>
-                    </hpaned>
+                    <board style="1-2">
+                        <column>
+                            <action name="%(sale.action_quotation_for_sale)d" string="Quotations"/>
+                            <action name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
+                        </column>
+                        <column>
+                            <action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
+                            <action name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
+                            <action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
@@ -32,5 +32,101 @@
 
         <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
+
+
+    <record id="action_quotation_for_sale" model="ir.actions.act_window">
+        <field name="name">My Quotations</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+        <field name="view_id" ref="sale.view_order_tree"/>
+        </record>
+
+    <record id="view_turnover_by_month_tree" model="ir.ui.view">
+        <field name="name">turnover.by.month.tree</field>
+        <field name="model">account.invoice.report</field>
+        <field name="type">tree</field>
+            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
+        <field name="priority" eval="32"/>
+        <field name="arch" type="xml">
+            <tree string="Monthly Turnover">
+                <field name="month"/>
+                <field name="price_total"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_turnover_by_month_graph" model="ir.ui.view">
+        <field name="name">turnover.by.month.graph</field>
+        <field name="model">account.invoice.report</field>
+            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
+        <field name="priority" eval="32"/>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+        <graph string="Monthly Turnover" type="bar">
+            <field name="month"/>
+            <field name="price_total" operator="+"/>
+        </graph>
+        </field>
+    </record>
+
+        <record model="ir.actions.act_window" id="action_turnover_by_month">
+            <field name="name">Monthly Turnover</field>
+            <field name="res_model">account.invoice.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_turnover_by_month_graph"/>
+            <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
+            <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+            <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
+       </record>
+
+       <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
+            <field name="act_window_id" ref="action_turnover_by_month"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_turnover_by_month_graph"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
+            <field name="act_window_id" ref="action_turnover_by_month"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_turnover_by_month_tree"/>
+        </record>
+
+        <record id="board_sales_form" model="ir.ui.view">
+            <field name="name">board.sales.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Dashboard">
+                    <board style="1-2">
+                        <column>
+                            <action name="%(action_quotation_for_sale)d"
+                                string="My Quotations"/>
+                             <!--groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"-->
+                        </column>
+                        <column>
+                            <action name="%(action_turnover_by_month)d"
+                                  string="Monthly Turnover"/>
+                             <!--groups="base.group_sale_salesman,account.group_account_manager"-->
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_board_sales" model="ir.actions.act_window">
+            <field name="name">Sales Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_sales_form"/>
+        </record>
+
+        <menuitem
+            id="base.menu_base_partner" action="open_board_sales"
+            name="Sales"/>
+
     </data>
 </openerp>
diff --git a/addons/sale/edi/__init__.py b/addons/sale/edi/__init__.py
new file mode 100644
index 00000000000..40789b6448b
--- /dev/null
+++ b/addons/sale/edi/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 sale_order
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
new file mode 100644
index 00000000000..d40d0b613ed
--- /dev/null
+++ b/addons/sale/edi/sale_order.py
@@ -0,0 +1,222 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2011 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 datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
+
+from osv import fields, osv, orm
+from edi import EDIMixin
+from tools import DEFAULT_SERVER_DATE_FORMAT
+
+SALE_ORDER_LINE_EDI_STRUCT = {
+    'sequence': True,
+    'name': True,
+    #custom: 'date_planned'
+    'product_id': True,
+    'product_uom': True,
+    'price_unit': True,
+    #custom: 'product_qty'
+    'discount': True,
+    'notes': True,
+
+    # fields used for web preview only - discarded on import
+    'price_subtotal': True,
+}
+
+SALE_ORDER_EDI_STRUCT = {
+    'name': True,
+    'origin': True,
+    'company_id': True, # -> to be changed into partner
+    #custom: 'partner_ref'
+    'date_order': True,
+    'partner_id': True,
+    #custom: 'partner_address'
+    #custom: 'notes'
+    'order_line': SALE_ORDER_LINE_EDI_STRUCT,
+
+    # fields used for web preview only - discarded on import
+    'amount_total': True,
+    'amount_untaxed': True,
+    'amount_tax': True,
+    'payment_term': True,
+    'order_policy': True,
+    'user_id': True,
+}
+
+class sale_order(osv.osv, EDIMixin):
+    _inherit = 'sale.order'
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        """Exports a Sale order"""
+        edi_struct = dict(edi_struct or SALE_ORDER_EDI_STRUCT)
+        res_company = self.pool.get('res.company')
+        res_partner_address = self.pool.get('res.partner.address')
+        edi_doc_list = []
+        for order in records:
+            # generate the main report
+            self._edi_generate_report_attachment(cr, uid, order, context=context)
+
+            # Get EDI doc based on struct. The result will also contain all metadata fields and attachments.
+            edi_doc = super(sale_order,self).edi_export(cr, uid, [order], edi_struct, context)[0]
+            edi_doc.update({
+                    # force trans-typing to purchase.order upon import
+                    '__import_model': 'purchase.order',
+                    '__import_module': 'purchase',
+
+                    'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context),
+                    'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_order_id], context=context)[0],
+
+                    'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id],
+                                                                         context=context)[0],
+                    'partner_ref': order.client_order_ref or False,
+                    'notes': order.note or False,
+            })
+            edi_doc_list.append(edi_doc)
+        return edi_doc_list
+
+
+    def _edi_import_company(self, cr, uid, edi_document, context=None):
+        # TODO: for multi-company setups, we currently import the document in the
+        #       user's current company, but we should perhaps foresee a way to select
+        #       the desired company among the user's allowed companies
+
+        self._edi_requires_attributes(('company_id','company_address'), edi_document)
+        res_partner_address = self.pool.get('res.partner.address')
+        res_partner = self.pool.get('res.partner')
+
+        # imported company = as a new partner
+        src_company_id, src_company_name = edi_document.pop('company_id')
+        partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
+                                              src_company_id, context=context)
+        partner_value = {'supplier': True}
+        res_partner.write(cr, uid, [partner_id], partner_value, context=context)
+
+        # imported company_address = new partner address
+        address_info = edi_document.pop('company_address')
+        address_info['partner_id'] = (src_company_id, src_company_name)
+        address_info['type'] = 'default'
+        address_id = res_partner_address.edi_import(cr, uid, address_info, context=context)
+
+        # modify edi_document to refer to new partner/address
+        partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
+        edi_document['partner_id'] = (src_company_id, src_company_name)
+        edi_document.pop('partner_address', False) # ignored
+        address_edi_m2o = self.edi_m2o(cr, uid, partner_address, context=context)
+        edi_document['partner_order_id'] = address_edi_m2o
+        edi_document['partner_invoice_id'] = address_edi_m2o
+        edi_document['partner_shipping_id'] = address_edi_m2o
+
+        return partner_id
+
+    def _edi_get_pricelist(self, cr, uid, partner_id, currency, context=None):
+        # TODO: refactor into common place for purchase/sale, e.g. into product module
+        partner_model = self.pool.get('res.partner')
+        partner = partner_model.browse(cr, uid, partner_id, context=context)
+        pricelist = partner.property_product_pricelist
+        if not pricelist:
+            pricelist = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'list0', context=context)
+
+        if not pricelist.currency_id == currency:
+            # look for a pricelist with the right type and currency, or make a new one
+            pricelist_type = 'sale'
+            product_pricelist = self.pool.get('product.pricelist')
+            match_pricelist_ids = product_pricelist.search(cr, uid,[('type','=',pricelist_type),
+                                                                    ('currency_id','=',currency.id)])
+            if match_pricelist_ids:
+                pricelist_id = match_pricelist_ids[0]
+            else:
+                pricelist_name = _('EDI Pricelist (%s)') % (currency.name,)
+                pricelist_id = product_pricelist.create(cr, uid, {'name': pricelist_name,
+                                                                  'type': pricelist_type,
+                                                                  'currency_id': currency.id,
+                                                                 })
+                self.pool.get('product.pricelist.version').create(cr, uid, {'name': pricelist_name,
+                                                                            'pricelist_id': pricelist_id})
+            pricelist = product_pricelist.browse(cr, uid, pricelist_id)
+
+        return self.edi_m2o(cr, uid, pricelist, context=context)
+
+    def edi_import(self, cr, uid, edi_document, context=None):
+        self._edi_requires_attributes(('company_id','company_address','order_line','date_order','currency'), edi_document)
+
+        #import company as a new partner
+        partner_id = self._edi_import_company(cr, uid, edi_document, context=context)
+
+        # currency for rounding the discount calculations and for the pricelist
+        res_currency = self.pool.get('res.currency')
+        currency_info = edi_document.pop('currency')
+        currency_id = res_currency.edi_import(cr, uid, currency_info, context=context)
+        order_currency = res_currency.browse(cr, uid, currency_id)
+
+        date_order = edi_document['date_order']
+        partner_ref = edi_document.pop('partner_ref', False)
+        edi_document['client_order_ref'] = edi_document['name']
+        edi_document['name'] = partner_ref or edi_document['name']
+        edi_document['note'] = edi_document.pop('notes', False)
+        edi_document['pricelist_id'] = self._edi_get_pricelist(cr, uid, partner_id, order_currency, context=context)
+
+        # discard web preview fields, if present
+        edi_document.pop('amount_total', None)
+        edi_document.pop('amount_tax', None)
+        edi_document.pop('amount_untaxed', None)
+
+        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)
+            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)
+        return super(sale_order,self).edi_import(cr, uid, edi_document, context=context)
+
+class sale_order_line(osv.osv, EDIMixin):
+    _inherit='sale.order.line'
+
+    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
+        """Overridden to provide sale order line fields with the expected names
+           (sale and purchase orders have different column names)"""
+        edi_struct = dict(edi_struct or SALE_ORDER_LINE_EDI_STRUCT)
+        edi_doc_list = []
+        for line in records:
+            edi_doc = super(sale_order_line,self).edi_export(cr, uid, [line], edi_struct, context)[0]
+            edi_doc['__import_model'] = 'purchase.order.line'
+            edi_doc['product_qty'] = line.product_uom_qty
+            if line.product_uos:
+                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
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
new file mode 100644
index 00000000000..3d7a554ff4a
--- /dev/null
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -0,0 +1,193 @@
+<?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">
+            <field name="name">Email Templates</field>
+            <field name="res_model">email.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_template.email_template_tree" />
+            <field name="search_view_id" ref="email_template.view_email_template_search"/>
+            <field name="context" eval="{'search_default_model_id': ref('sale.model_sale_order')}"/>
+        </record>
+        <menuitem id="menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="30"/>
+        <menuitem id="menu_email_templates" parent="menu_sales_configuration_misc" action="action_email_templates" sequence="30"/>
+    </data>
+
+
+    <!-- Mail template and workflow bindings are 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.user_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="model_id" ref="sale.model_sale_order"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html"><![CDATA[
+<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); ">
+
+    <p>Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},</p>
+    
+    <p>Here is your order confirmation for ${object.partner_id.name}: </p>
+    
+    <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
+       &nbsp;&nbsp;<strong>REFERENCES</strong><br />
+       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
+       &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />
+       &nbsp;&nbsp;Order date: ${object.date_order}<br />
+       % if object.origin:
+       &nbsp;&nbsp;Order reference: ${object.origin}<br />
+       % endif
+       % if object.client_order_ref:
+       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />
+       % endif
+       &nbsp;&nbsp;Your contact: <a href="mailto:${object.user_id.user_email or ''}?subject=Order%20${object.name}">${object.user_id.name}</a>
+    </p>
+
+    <p>
+    You can view the order confirmation document, download it and pay online using the following link:
+    </p>
+            <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;" 
+               href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
+
+    % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account:
+    <%
+    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&amp;business=%s&amp;item_name=%s%%20Order%%20%s" \
+       "&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&amp;no_note=1" \
+       "&amp;bn=OpenERP_Order_PayNow_%s" % \
+       (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)
+    %>
+    <br/>
+    <p>It is also possible to directly pay with Paypal:</p>
+        <a style="margin-left: 120px;" href="${paypal_url}">
+            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+        </a>
+    % endif
+
+    <br/>
+    <p>If you have any question, do not hesitate to contact us.</p>
+    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>
+    <br/>
+    <br/>
+    <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;">
+        <h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;">
+            <strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
+    </div>
+    <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
+        <span style="color: #222; margin-bottom: 5px; display: block; ">
+        % if object.company_id.street:
+            ${object.company_id.street}<br/>
+        % endif
+        % if object.company_id.street2:
+            ${object.company_id.street2}<br/>
+        % endif
+        % if object.company_id.city or object.company_id.zip:
+            ${object.company_id.zip} ${object.company_id.city}<br/>
+        % 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 ''}<br/>
+        % endif
+        </span>
+        % if object.company_id.phone:
+            <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; ">
+                Phone:&nbsp; ${object.company_id.phone}
+            </div>
+        % endif
+        % if object.company_id.website:
+            <div>
+                Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
+            </div>
+        %endif
+        <p></p>
+    </div>
+</div>
+            ]]></field>
+            <field name="body_text"><![CDATA[
+Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},
+
+Here is your order confirmation for ${object.partner_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.user_email and '<%s>'%(object.user_id.user_email) or ''}
+
+You can view the 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:
+<% 
+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.user_email and '<%s>'%(object.user_id.user_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 e9e75ea7f85..6b96c7e08eb 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-06 09:13+0000\n"
-"Last-Translator: Hsn <hh.alshawaf@gmail.com>\n"
+"PO-Revision-Date: 2011-11-05 10:31+0000\n"
+"Last-Translator: Ahmad Khayyat <Unknown>\n"
 "Language-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-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-06 05:23+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+msgstr "مبيعات مندوب المبيعات آخر 90 يوماً"
 
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
+msgstr "إضافة إمكانية حساب تكاليف التسليم  في التسعيرات."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -33,11 +33,13 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
+"إذا لم يكن المخزون كافياً لتسليم الكميات المطلوبة في وقت واحد، هل تقبل "
+"بالشحن الجزئي؟"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "عنوان الشحن لطلب المبيعات الحالي"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -49,13 +51,13 @@ msgstr "الكمية"
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "اليوم"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "الغاء اﻻمر"
+msgstr "إلغاء الطلب"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -66,12 +68,12 @@ msgstr ""
 #: code:addons/sale/sale.py:603
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "تم تحويل العرض المالي '%s' إلى طلب مبيعات"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr ""
+msgstr "الدفع قبل التسليم"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:42
@@ -87,12 +89,12 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "يحدد أوامر التحصيل لكل سطر في أوامر المبيعات."
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr "الكل في وقتاَ واحد"
+msgstr "الجميع معاً"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -109,22 +111,25 @@ msgid ""
 "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
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "أمر تحصيل"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "شريك"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "سطر الأمر"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -151,12 +156,12 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr "شروط الدفع الافتراضية"
+msgstr "أجل السداد الافتراضي"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "إعدادات سياسة الالتقاط لأمر المبيعات"
 
 #. module: sale
 #: view:sale.order:0
@@ -164,12 +169,12 @@ msgstr ""
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "State"
-msgstr ""
+msgstr "الحالة"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "نسبة الخصم (%)"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
@@ -179,17 +184,17 @@ msgstr ""
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "اختر لتجميع الفواتير حسب العميل"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr ""
+msgstr "الكميات المطلوبة"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr ""
+msgstr "المبيعات بواسطة مندوب المبيعات"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
@@ -200,17 +205,17 @@ msgstr "نقل المخزون"
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "مرجع الأمر"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "معلومات أخرى"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "التواريخ"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -227,56 +232,56 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "إعادة إنشاء التعبئة"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+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 ""
+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 ""
+msgstr "لوحة معلومات مدير المبيعات"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr ""
+msgstr "التعبئة"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "من أمر مبيعات"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "اسم المتجر"
 
 #. module: sale
 #: code:addons/sale/sale.py:1014
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "لا يوجد عملاء"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "المبيعات ذات الخلل"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "مسودّة"
 
 #. module: sale
 #: view:sale.order:0
@@ -309,7 +314,7 @@ msgstr ""
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "ضبط الإعدادات"
 
 #. module: sale
 #: constraint:stock.move:0
@@ -325,28 +330,28 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "يونيو/حزيران"
 
 #. module: sale
 #: code:addons/sale/sale.py:584
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "لم يمكن إلغاء أمر البيع"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "إحصائيات أوامر البيع"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "الحساب التحليلي المتعلق بأمر بيع"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "أكتوبر/تشرين الأول"
 
 #. module: sale
 #: view:board.board:0
@@ -354,17 +359,17 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "التسعيرات"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "قائمة الأسعار لأمر البيع الحالي"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Delivery Order Only"
-msgstr ""
+msgstr "أمر تسليم فقط"
 
 #. module: sale
 #: report:sale.order:0
@@ -376,23 +381,23 @@ msgstr ""
 msgid ""
 "Number of days between the order confirmation the shipping of the products "
 "to the customer"
-msgstr ""
+msgstr "عدد الأيام منذ تأكيد الطلب حتى شحن المنتج للعميل"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "تاريخ التسعيرة"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "الوضع المالي"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "UoM"
-msgstr ""
+msgstr "وحدة القياس"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
@@ -403,7 +408,7 @@ msgstr ""
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "قيد التقدم"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -411,18 +416,20 @@ 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:971
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
+msgstr "يجب أولاً أن تلغي عمليات نقل المخزون المرتبطة بسطر أمر المبيعات هذا."
 
 #. module: sale
 #: code:addons/sale/sale.py:1042
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "(غير ممكن)"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -434,7 +441,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Tel. :"
-msgstr ""
+msgstr "هاتف:"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:64
@@ -442,7 +449,7 @@ msgstr ""
 msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
+msgstr "لا يمكنك الدفع مقدماً لأمر مبيعات معدّ لـ 'فوترة آلية بعد التسليم'."
 
 #. module: sale
 #: view:sale.order:0
@@ -455,28 +462,28 @@ msgstr "ملاحظات"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "عنوان الفاتورة لأمر البيع الحالي"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
-msgstr ""
+msgstr "تحسين تطبيق المبيعات بإمكانيات إضافية."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "مفوتر"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr "أجل التسليم"
+msgstr "أمر التسليم"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "تاريخ التأكيد"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -486,17 +493,17 @@ msgstr ""
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "لا بدّ أن يكون مرجع الأمر فريداً"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "مارس/آذار"
 
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "المبلغ الإجمالي"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -506,14 +513,14 @@ msgstr "المجموع"
 #. module: sale
 #: report:sale.order:0
 msgid "Invoice address :"
-msgstr ""
+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 ""
+msgstr "لكل سطر أمر مبيعات، يتمّ إنشاء أمر تحصيل يوفر المنتج المباع."
 
 #. module: sale
 #: help:sale.order,incoterm:0
@@ -525,44 +532,44 @@ msgstr ""
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "عنوان الفاتورة"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "ابحث السطور غير المفوترة"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr ""
+msgstr "التسعيرة / الأمر"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "عدد السطور"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "فاتورة مبيعات غير مسددة"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "سطر أمر المبيعات"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "إعداد سير عمل المبيعات والقيم الافتراضية"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr "المخزن"
+msgstr "المستودع"
 
 #. module: sale
 #: report:sale.order:0
@@ -572,7 +579,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "سطور الأوامر"
 
 #. module: sale
 #: view:sale.order:0
@@ -583,32 +590,32 @@ msgstr ""
 #: 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 ""
+msgstr "السطور المعدّة للفوترة"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "الكمية (وحدة قياس)"
 
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "تاريخ الإنشاء"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "السطور المستلمة غير المفوترة"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "المجموع"
 
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "مبيعاتي"
 
 #. module: sale
 #: code:addons/sale/sale.py:290
@@ -616,14 +623,14 @@ msgstr ""
 #: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "لا يمكن إجراء هذه العملية!"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.report,pricelist_id:0
 #: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "قائمة الأسعار"
 
 #. module: sale
 #: view:sale.report:0
@@ -634,87 +641,87 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "تاريخ الأمر"
 
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "تمّ الشحن"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "جميع التسعيرات"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "أصدر فاتورة الأمر بعد التسليم"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "سبتمبر/أيلول"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "فئة المنتج"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "الضرائب:"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "تحركات المخزون"
 
 #. module: sale
 #: view:sale.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  السنة  "
 
 #. module: sale
 #: field:sale.order,state:0
 #: field:sale.report,state:0
 msgid "Order State"
-msgstr ""
+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 ""
+msgstr "هل تريد فعلاً  إنشاء الفاتورة/الفواتبر؟"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "المبيعات حسب الشهر"
 
 #. module: sale
 #: code:addons/sale/sale.py:970
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "لم يمكن إلغاء سطر أمر المبيعات!"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "أيام الأمان"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "تحصيل المواد المباعة"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "إنشاء الفاتورة النهائية"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -727,11 +734,12 @@ 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
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "مرشحات مفصلة"
 
 #. module: sale
 #: model:ir.module.module,description:sale.module_meta_information
@@ -764,27 +772,27 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "متجر المبيعات"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "الشركات"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "نوفمبر/تشرين الثاني"
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "المحفوظات"
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "اختيار السياسة الافتراضية"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -793,34 +801,36 @@ msgid ""
 "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 ""
+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 ""
+msgstr "اسم وعنوان جهة الاتصال التي طلبت الأمر أو التسعيرة"
 
 #. module: sale
 #: code:addons/sale/sale.py:966
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+msgstr "لا يمكنك إلغاء أمر مبيعات تمّت فوترته!"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr ""
+msgstr "الكمية"
 
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "المراجع"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -831,17 +841,17 @@ msgstr ""
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "إلغاء"
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "تواريخ أوامر المبيعات"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
-msgstr ""
+msgstr "استثناء"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -850,118 +860,118 @@ msgstr ""
 #: view:sale.advance.payment.inv:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "إنشاء فاتورة"
 
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "هوامش أوامر المبيعات"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "المجموع دون ضرائب"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Compute"
-msgstr ""
+msgstr "احسب"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr ""
+msgstr "المبيعات حسب الشريك"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr ""
+msgstr "ممثل العميل"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "فاتورة غير مسددة"
 
 #. module: sale
 #: report:sale.order:0
 #: view:sale.order.line:0
 msgid "Price"
-msgstr ""
+msgstr "السعر"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_installer
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "إعدادات تطبيق المبيعات"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "السعر الإجمالي"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr ""
+msgstr "تحت الطلب"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "بناءً على الكميات المشحونة أو المطلوبة"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "عمليات التقاط ذات علاقة"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "الاسم"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+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 ""
+msgstr "المبيعات لكل عميل خلال الـ 90 يوماً الماضية"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "مسودّة: حالة من حالات أمر المبيعات"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "إنشاء أمر تسليم"
 
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
-msgstr ""
+msgstr "تكاليف التسليم"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "المجموع مع الضرائب"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "إنشاء قائمة الالتقاط"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "المبيعات حسب فئة المنتج"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -971,30 +981,30 @@ msgstr "التسليم الجزئي"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr "تأكيد تسعيرة"
+msgstr "تأكيد التسعيرة"
 
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "مرجع المستند الذي أصدر طلب أمر المبيعات هذا"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "تجميع حسب ..."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Invoice"
-msgstr ""
+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 ""
+msgstr "أوامر التسليم المعدّة للفوترة"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1005,23 +1015,23 @@ msgstr "بإنتظار الجدول"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "طريقة التحصيل"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "title"
-msgstr ""
+msgstr "العنوان"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "قائمة الالتقاط"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "تاريخ الأمر"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -1036,12 +1046,12 @@ msgstr "تحقق"
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "تأكيد الأمر"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "إنشاء أمر تحصيل"
 
 #. module: sale
 #: view:sale.order:0
@@ -1053,23 +1063,23 @@ msgstr "الضرائب"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr ""
+msgstr "سياسة الشحن"
 
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "تاريخ إنشاء أمر المبيعات"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "نقل مخزون"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "إنشاء الفواتير"
 
 #. module: sale
 #: view:sale.order:0
@@ -1079,27 +1089,27 @@ msgstr "معلومات إضافية"
 #. module: sale
 #: report:sale.order:0
 msgid "Fax :"
-msgstr "الفاكس"
+msgstr "الفاكس:"
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "مبلغ الدفع المقدم"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr "العدد المطلوب"
+msgstr "الكميات المشحونة"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "أصدر الفواتير بناءً على أوامر المبيعات"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "قائمة الالتقاط"
 
 #. module: sale
 #: code:addons/sale/sale.py:387
@@ -1107,72 +1117,72 @@ msgstr ""
 #: code:addons/sale/sale.py:938
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "خطأ !"
 
 #. module: sale
 #: code:addons/sale/sale.py:570
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "لم يمكن إلغاء أمر المبيعات!"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "يوليو/تموز"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "التحصيل"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "خلل شحن"
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "تجميع الفواتير"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "شحن وفوترة يدوية"
 
 #. module: sale
 #: code:addons/sale/sale.py:1051
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "معلومات الالتقاط!"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "الشهر"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
 msgid "Sales Management"
-msgstr ""
+msgstr "إدارة المبيعات"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "أصدر الفاتورة بناءً على الالتقاط"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "بحاجة إلى مراجعة المحاسِب"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "وحدة القياس المرجعية"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1191,31 +1201,31 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "التسعيرات السابقة"
 
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr ""
+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 ""
+msgstr "تحليل المبيعات"
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
-msgstr ""
+msgstr "الخصائص"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "التسعيرة"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1229,7 +1239,7 @@ msgstr ""
 #: help:sale.config.picking_policy,order_policy:0
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
-msgstr ""
+msgstr "يمكنك إنشاء الفواتير بناءً على أوامر المبيعات أو بناءً على الشحنات."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -1237,13 +1247,13 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
-msgstr ""
+msgstr "المبيعات"
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "سعر الوحدة"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1251,7 +1261,7 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "تمّ"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
@@ -1262,7 +1272,7 @@ msgstr ""
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
-msgstr ""
+msgstr "الفاتورة"
 
 #. module: sale
 #: code:addons/sale/sale.py:1014
@@ -1271,26 +1281,28 @@ msgid ""
 "You have to select a customer in the sales form !\n"
 "Please set one customer before choosing a product."
 msgstr ""
+"يجب أن تختار عميلاً في نموذج المبيعات!\n"
+"فضلاً حدّد عميلاً قبل اختيار المنتج."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "قائمة الالتقاط وأمر التسليم"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "المستند المصدر"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "في انتظار التنفيذ"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "سياسة الالتقاط"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
@@ -1300,18 +1312,18 @@ msgstr ""
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "المبلغ دون ضرائب"
 
 #. module: sale
 #: code:addons/sale/sale.py:571
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
+msgstr "يجب أولاً أن تلغي جميع الالتقاطات المرتبطة بأمر المبيعات هذا."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "فاتورة الدفع المقدم للمبيعات"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1324,12 +1336,12 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "المنتج"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "الفواتير"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
@@ -1360,23 +1372,23 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "تاريخ الأمر"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "وحدة البيع للمنتج"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "قيد التنفيذ يدوياً"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "وحدة القياس للمنتج"
 
 #. module: sale
 #: view:sale.order:0
@@ -1392,12 +1404,12 @@ msgstr ""
 #: code:addons/sale/sale.py:921
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "تجاهل الخلل"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1415,6 +1427,8 @@ 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
@@ -1429,7 +1443,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "مرجع العميل"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1441,7 +1455,7 @@ msgstr "المجموع"
 #: code:addons/sale/sale.py:388
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "لا يوجد دفتر يومية مبيعات معرّف لهذه الشركة: \"%s\" (id: %d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1455,25 +1469,25 @@ msgstr ""
 #: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "لا يمكن حذف سطر أمر المبيعات %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 ""
+msgstr "أصدر الفواتير"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "في انتظار الفوترة"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "تاريخ تأكيد أمر المبيعات"
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1482,42 +1496,42 @@ msgstr ""
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "الشركة"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "تاريخ الفاتورة"
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "المبلغ المفوتر مقدماً"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr "فاتورة استثناء"
+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 ""
+msgstr "هذه قائمة الالتقاط الخاصة بأمر المبيعات هذا."
 
 #. 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 ""
+msgstr "يعطي هامش الربح بواسطة حساب الفرق بين سعر الوحدة وسعر التكلفة."
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "إنشاء الفواتير"
 
 #. module: sale
 #: report:sale.order:0
@@ -1529,7 +1543,7 @@ msgstr "المجموع الصافي"
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr "الغاء"
+msgstr "ملغي"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1538,12 +1552,12 @@ msgstr "الغاء"
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "المتجر"
 
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   الشهر   "
 
 #. module: sale
 #: field:sale.report,date_confirm:0
@@ -1554,13 +1568,13 @@ msgstr ""
 #: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "تحذير"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 msgid "Sales by Month"
-msgstr ""
+msgstr "المبيعات حسب الشهر"
 
 #. module: sale
 #: code:addons/sale/sale.py:1045
@@ -1581,12 +1595,12 @@ msgstr ""
 #: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sales Order"
-msgstr ""
+msgstr "أمر المبيعات"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "الكمية (وحدة البيع)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1610,45 +1624,45 @@ msgstr "تأكيد"
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+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 ""
+msgstr "المبيعات حسب فئة المنتج خلال الـ 90 يوماً الماضية"
 
 #. module: sale
 #: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "سطور الفواتير"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "سطور أوامر المبيعات"
 
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "الوقت اللازم للتسليم"
 
 #. module: sale
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "الإعدادات"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr ""
+msgstr "تسليم كامل"
 
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    الشهر 1    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1661,7 +1675,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "أغسطس/آب"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1672,29 +1686,32 @@ 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. سطر أمر المبيعات مفوتر!"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "الوزن"
 
 #. module: sale
 #: view:sale.open.invoice:0
 #: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "الفواتير"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "ديسمبر/كانون الأول"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "الصورة"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -1708,7 +1725,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "غير مفوتر"
 
 #. module: sale
 #: report:sale.order:0
@@ -1719,17 +1736,17 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "مندوب المبيعات"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "يحدد كلاً من التحصيل والفواتير"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "المبلغ دون ضرائب"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:163
@@ -1738,18 +1755,18 @@ msgstr ""
 #: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
-msgstr ""
+msgstr "فاتورة الدفع المقدم"
 
 #. module: sale
 #: code:addons/sale/sale.py:591
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "تمّ إلغاء أمر المبيعات '%s'"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "مسودّة"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -1768,7 +1785,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "مبلغ الضرائب"
 
 #. module: sale
 #: view:sale.order:0
@@ -1779,153 +1796,153 @@ msgstr ""
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "سير الإعدادات"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr ""
+msgstr "مبيعات المنتج"
 
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+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 ""
+msgstr "أوامر المبيعات"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "تسليم مباشر"
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "الدفاتر اليومية للفواتير"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "منتج الدفع المقدم"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "الكمية المشحونة"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "تمّ إنشاء الفاتورة بنجاح!"
 
 #. module: sale
 #: code:addons/sale/sale.py:585
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "يجب أولاً إلغاء جميع الفواتير المرتبطة بأمر المبيعات هذا."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "يناير/كانون الثاني"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "إعدادات تطبيق إدارة المبيعات"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
-msgstr ""
+msgstr "أمر المبيعات قيد التنفيذ"
 
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "تحسين تنسيق أوامر المبيعات"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:63
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "خطأ"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+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 ""
+msgstr "أمر تحصيل واحد لكل سطر أمر مبيعات ولكل من المكوّنات."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr ""
+msgstr "تعيين"
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "ترتيب التواريخ"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "فوترة أمر المبيعات المؤكّد"
 
 #. module: sale
 #: code:addons/sale/sale.py:290
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr ""
+msgstr "لا يمكن حذف أوامر المبيعات التي تمّ تأكيدها!"
 
 #. module: sale
 #: code:addons/sale/sale.py:316
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "تمّ وضع أمر المبيعات '%s' في حالة \"مسودّة\"."
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr "من المخزن"
+msgstr "من المخزون"
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr ""
+msgstr "سياسة الشحن الافتراضية"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "إغلاق"
 
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "تمّ التسليم"
 
 #. module: sale
 #: code:addons/sale/sale.py:1115
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "المخزون غير كافٍ!"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "يجب تعيين دفعة إنتاج لهذا المنتج"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
@@ -1945,40 +1962,40 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "يشير إلى أنه تمّ تسديد الفاتورة."
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "الوصف"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "مايو/أيار"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
+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
 msgid "Advance"
-msgstr ""
+msgstr "الدفع المقدم"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "فبراير/شباط"
 
 #. module: sale
 #: help:sale.installer,sale_journal:0
@@ -1986,44 +2003,46 @@ msgid ""
 "Allows you to group and invoice your delivery orders according to different "
 "invoicing types: daily, weekly, etc."
 msgstr ""
+"إضافة إمكانية تجميع وفوترة أوامر التسليم حسب عدد من أنواع الفوترة المختلفة: "
+"يومياً، أسبوعياً، إلخ."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "أبريل/نيسان"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr ""
+msgstr "المحاسبة"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "خطوات تسليم أمر مبيعات"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "ابحث في أمر المبيعات"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "طلب أمر مبيعات"
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "أجل السداد"
 
 #. module: sale
 #: help:sale.installer,sale_layout:0
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
+msgstr "مزايا إضافية لتحسين تنسيق تقارير أوامر المبيعات."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2044,18 +2063,18 @@ msgstr ""
 #: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
-msgstr ""
+msgstr "تمّ الالتقاط"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "السنة"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr ""
+msgstr "أصدر الفواتير بناءً على التسليم"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "إعادة الشراء"
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 29b635c9f6e..3c965012e5c 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2070,12 +2070,6 @@ msgstr "Година"
 msgid "Invoice Based on Deliveries"
 msgstr "Фактура базирана на доставки"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Опракта за клиент"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Фактура след пакетиране"
-
 #~ msgid "Manual Designation"
 #~ msgstr "Ръчно обозначаване"
 
@@ -2091,9 +2085,6 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Reference"
 #~ msgstr "Отпратка"
 
-#~ msgid "Shop name"
-#~ 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 "
@@ -2135,19 +2126,6 @@ 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 "
-#~ "(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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Показва състоянието на запитването или поръчката за продажба. Състоянието за "
-#~ "грешка се задава автоматично когато настъпи операция на отказ при проверка "
-#~ "на поръчката (Грешка при поръчка) или в процеса на пакетиране (Грешка при "
-#~ "доставка). Статуса 'Очакване на график' е поставен когато фактурата е "
-#~ "потвърдена но чака планировчика да бъде на дата 'Дата на поръчка'"
-
 #~ msgid "Total amount"
 #~ msgstr "Обща сума"
 
@@ -2166,18 +2144,12 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Sale Shop"
 #~ msgstr "Магазин за продажба"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Ръчно в изпълнение"
-
 #~ msgid "Sales orders"
 #~ msgstr "Поръчки за продажба"
 
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Поръчки за продажба за фактуриране"
 
-#~ msgid "Number packages"
-#~ msgstr "Брой пакетирания"
-
 #~ msgid "Procurement for each line"
 #~ msgstr "Снабдяване за всеки ред"
 
@@ -2190,31 +2162,6 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "My sales in 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 "
-#~ "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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "Политиката на доставки се използва за синхронизиране на фактурите и "
-#~ "доставките\n"
-#~ "  - Избора \"Плащане преди доставка' първо ще генерира фактура и после реда "
-#~ "за пакетиране след плащане на поръчката\n"
-#~ "  - 'Доставка и ръчно фактуриране' ще създаде реда за пакетиране и ще чака "
-#~ "потребителя ръчно да натисне бутона 'Фактура' за да се генерира проект на "
-#~ "фактура\n"
-#~ "  - 'Фактура според реда след доставка' ще генерира проект на фактура "
-#~ "базиран на реда на продажба след като са приключени всички списъци за "
-#~ "пакетиране\n"
-#~ "  - 'Фактура от пакетиране' се използва при създаване на фактура по време на "
-#~ "процеса на пакетиране"
-
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Конфигуриране на реда на доставка при продажба"
 
@@ -2234,12 +2181,6 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Sales Process"
 #~ msgstr "Процес на продажба"
 
-#~ msgid "Related Packings"
-#~ msgstr "Свързани пакетирания"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Количество (продажни единици)"
-
 #~ msgid "Status"
 #~ msgstr "Състояние"
 
@@ -2255,13 +2196,6 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Прокет на фактура за клиент чакащ одобрение от счетоводител."
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Ако нямате достатъчно налични стоки за да направите една доставка приемате "
-#~ "ли доставка на части."
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -2302,11 +2236,6 @@ msgstr "Фактура базирана на доставки"
 #~ "При потвърждение списъка за пакетиране се премества в поръчката за доставка. "
 #~ "Това става като се натисне бутона 'Проверка'"
 
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Първо трябва да откажете всички пакетирания към тази поръчка за продажба"
-
 #~ msgid "Sale Invoice"
 #~ msgstr "Фактура за продажба"
 
@@ -2335,14 +2264,6 @@ msgstr "Фактура базирана на доставки"
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "Името и адреса на контакта който е поискал запитване или поръчка"
 
-#~ msgid "Product UOS"
-#~ msgstr "Продажни единици на продукта"
-
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Не може да откажете поръчка за продажба която вече е била фактурирана !"
-
 #~ msgid "Sales order"
 #~ msgstr "Поръчка за продажба"
 
@@ -2473,31 +2394,6 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Create Advance Invoice"
 #~ 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 "
-#~ "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 After 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 ""
-#~ "Политиката за доставки се използва за синхронизиране на фактури и действия "
-#~ "за доставка.\n"
-#~ "  - Възможността 'Плати преди доставка' първо създава фактурата и тогава "
-#~ "реда за пакетиране след плащане на фактурата\n"
-#~ "  - 'Доставка и ръчно фактуриране' направо създава реда на пакетиране и "
-#~ "изчаква потребителя да натисне бутона 'Фактура' за да създаде фактура в "
-#~ "прокт.\n"
-#~ "  - Възможността 'Фактура след доставка' създава проект на фактура въз "
-#~ "основата на поръчка за продажба след като са завършени списъците за "
-#~ "пакетиране.\n"
-#~ "  - 'Фактуриране на база пакетиране' се използва за да се създаде фактура по "
-#~ "време на процеса на пакетиране"
-
 #~ 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,99 +2434,3 @@ msgstr "Фактура базирана на доставки"
 
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Мои поръчки за продажба, очакващи фактура"
-
-#~ msgid "Average Price"
-#~ msgstr "Средна цена"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Доклад за изготвена поръчка за продажба"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Поръчки за продажба по категория"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Натрупан годишен оборот от продажби по месеци"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Поръчки за продажба по продукт"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Годишен оборот от продажби по месеци"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Оборот по продукт"
-
-#~ msgid "All Months"
-#~ msgstr "Всички месеци"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Поръчки за продажби по категории"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Продажби на месеца"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Продажби по продукт (този месец)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Годишен оборот от продажби по месеци"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Управление на продажби – справки"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Продажби по категория от продукти"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Натрупан годишен оборот от продажби по месеци"
-
-#~ msgid "# of Products"
-#~ msgstr "# на продукти"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Продажби по продукт"
-
-#~ msgid "This Month"
-#~ msgstr "Този месец"
-
-#~ msgid "Categories"
-#~ msgstr "Категории"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Създадени поръчки за продажба"
-
-#~ msgid "Reporting"
-#~ msgstr "Справки"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Оборот за месец"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Годишен оборот от продажби по дни"
-
-#~ msgid "Graphs"
-#~ msgstr "Диаграми"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Общо оборот"
-
-#~ msgid "In progress"
-#~ msgstr "Извършва се"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Продажби по катерия от продукти (този месец)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Годишен оборот от продажби по дни"
-
-#~ msgid "Create Date"
-#~ msgstr "Дата на създаване"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Изготвени поръчки за продажба"
-
-#~ msgid "Sales by State"
-#~ msgstr "Продажби по област"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Конфигуриране на реда на доставка при продажба"
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index 808ace1ea2c..96d62bc06c5 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2399,30 +2399,3 @@ msgstr "Račun sa referencom na isporuku"
 
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Nakon potvrde Prodajnog naloga, kreirati Fakturu"
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Informacije o prodaji"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Informacije o prodaji"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Prodaja mjeseca"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Prodaja - tabla upravljanja"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Slućaji u mjesecu"
-
-#~ msgid "My open quotations"
-#~ msgstr "Moji otvoreni upiti"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Statistika slućajeva"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Top 10 prodaja u mjesecu"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Konfigurisanje logistike prodajnog naloga"
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 1162a0e6d4f..54defa8c890 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2227,89 +2227,6 @@ msgstr "Any"
 msgid "Invoice Based on Deliveries"
 msgstr "Factura des d'albarans"
 
-#~ msgid "In progress"
-#~ msgstr "En procés"
-
-#~ msgid "Shop name"
-#~ msgstr "Nom de tenda"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en procés"
-
-#~ msgid "Number packages"
-#~ msgstr "Número de paquets"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Quantitat (UdV)"
-
-#~ msgid "Product UOS"
-#~ msgstr "UdV del producte"
-
-#~ msgid "Related Packings"
-#~ msgstr "Albarans relacionats"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Indica l'estat del pressupost o comanda de venda. L'estat d'excepció "
-#~ "s'estableix automàticament quan té lloc una cancel·lació en la validació de "
-#~ "la factura (Excepció de factura) o en el processat d'albarans (Excepció "
-#~ "d'enviament). L'estat 'Esperant data planificada' s'estableix quan la "
-#~ "factura està confirmada però la data actual és anterior a la 'Data Ordenada'."
-
-#~ msgid "Customer Ref."
-#~ msgstr "Referència de client"
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Si no teniu suficient estoc disponible per a enviar-lo tot a la vegada, "
-#~ "accepteu enviaments parcials o no."
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Primer heu de cancel·lar tots els albarans associats a aquesta comanda de "
-#~ "venda."
-
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "No es pot cancel·lar una línia de la comanda de venda que ja està facturada!"
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "La política d'enviament s'utilitza per sincronitzar els processos de "
-#~ "facturació i lliurament.\n"
-#~ "  - L'opció 'Pagament abans de l'enviament' generarà primer la factura i "
-#~ "després del pagament d'aquesta factura generarà l'albarà.\n"
-#~ "  - L'opció 'Enviar & Factura manual' crearà l'albarà directament i esperarà "
-#~ "a que l'usuari manualment faci clic sobre el botó de 'Factura' per generar "
-#~ "la factura esborrany.\n"
-#~ "  - L'opció 'Factura comanda després de l'enviament' generarà la factura "
-#~ "esborrany basada en la comanda de venda després de que tots els albarans "
-#~ "hagin estat finalitzats.\n"
-#~ "  - L'opció 'Factura a partir dels albarans' s'utilitza per crear una "
-#~ "factura durant el procés d'empaquetament."
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Factura des d'albarans"
-
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configureu la logística de les comandes de venda"
 
@@ -2746,120 +2663,3 @@ msgstr "Factura des d'albarans"
 #~ "processin.\n"
 #~ "   - L'opció 'Factura des de albarà' s'utilitza per crear una factura durant "
 #~ "el procés dels albarans."
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Taulell per a vendes"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Taulell de vendes"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Vendes del mes"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Taulell de vendes"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Casos del mes"
-
-#~ msgid "My open quotations"
-#~ msgstr "Els meus pressuposts oberts"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Estadística de casos"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Primeres deu vendes del mes"
-
-#~ msgid "Average Price"
-#~ msgstr "Preu mig"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Informe de comanda de venda creats"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Comandes de vendes per categoria"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Moviment mensual de vendes acumulades sobre un any"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Comandes de vendes per productes"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Moviment mensual de vendes sobre un any"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Volum per producte"
-
-#~ msgid "All Months"
-#~ msgstr "Tots els mesos"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Comandes de vendes per categories"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Vendes del mes"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Vendes per producte (aquest mes)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Moviment mensual de vendes sobre un any"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestió de vendes"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Vendes per categoria de productes"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Moviment mensual de vendes acumulades sobre un any"
-
-#~ msgid "# of Products"
-#~ msgstr "# de productes"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Vendes per producte"
-
-#~ msgid "This Month"
-#~ msgstr "Aquest mes"
-
-#~ msgid "Categories"
-#~ msgstr "Categories"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Comandes de venda creades"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Volum per mesos"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Moviment diari de vendes sobre un any"
-
-#~ msgid "Graphs"
-#~ msgstr "Resums"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Volum total"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Vendes per categoria de producte (aquest mes)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Moviment diari de vendes sobre un any"
-
-#~ msgid "Create Date"
-#~ msgstr "Data creació"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Comandes de venda creades"
-
-#~ msgid "Sales by State"
-#~ msgstr "Vendes per estat"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Configureu la logística de les comandes de venda"
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 4c6c07a4d9a..86f3ad30352 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -1,10 +1,10 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* sale
+#   * sale
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-08-03 08:32+0000\n"
@@ -13,19 +13,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\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 ""
+msgstr "Prodeje podle Prodejce v posledních 90 dnech"
 
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
+msgstr "Povolí vám spočítat cenu doručení při vašem ocenění."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -37,62 +38,62 @@ msgstr ""
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Dodací adresa aktuální prodejní objednávky."
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
 msgid "Quantity"
-msgstr "Počet"
+msgstr "Množství"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Den"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Zrušit objednávku"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr ""
+msgstr "Nastavit logistiku prodejní objednávky"
 
 #. module: sale
 #: code:addons/sale/sale.py:603
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "Ocenění '%s' bylo převedeno na prodejní objednávku."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr ""
+msgstr "Platba před doručením"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varování !"
 
 #. module: sale
 #: report:sale.order:0
 msgid "VAT"
-msgstr ""
+msgstr "DPH"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "Řídí příkazy zásobování pro každý řádek prodejní objednávky"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "Vše najednou"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -113,18 +114,18 @@ msgstr ""
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "Zásobovací příkaz"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "Řádek objednávky"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -151,12 +152,12 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr ""
+msgstr "Výchozí datum splatnosti"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Nastavit politiku navádění pro prodejní objednávku"
 
 #. module: sale
 #: view:sale.order:0
@@ -164,53 +165,53 @@ msgstr ""
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Slev.(%)"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "Vynutit přiřazení"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Zaškrtněte políčko pro seskupení faktůr pro stejného zákazníka"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr ""
+msgstr "Objednané množství"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr ""
+msgstr "Prodeje dle obchodníka"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Pohyby inventáře"
 
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Odkaz objednávky"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Jiné informace"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "Data"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -227,12 +228,12 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "Znovu vytvořit balení"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Sleva (%)"
 
 #. module: sale
 #: help:res.company,security_lead:0
@@ -245,43 +246,43 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr ""
+msgstr "Nástěnka řízení prodeje"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr ""
+msgstr "Balení"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "Z prodejní objednávky"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "Jméno obchodu"
 
 #. module: sale
 #: code:addons/sale/sale.py:1014
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "Neurčen zákazník !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "Prodeje ve výjimce"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Nastavit na koncept"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Conditions"
-msgstr ""
+msgstr "Podmínky"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -309,44 +310,44 @@ msgstr ""
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Nastavit"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Snažíte se přiřadit dávku, která není ze stejného výrobku"
 
 #. module: sale
 #: code:addons/sale/sale.py:620
 #, python-format
 msgid "invalid mode for test_state"
-msgstr ""
+msgstr "neplatný režim pro test_state"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
 #. module: sale
 #: code:addons/sale/sale.py:584
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Nelze zrušit tuto prodejní objednávku !"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Statistiky prodejních objednávek"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Analytický účet vztažený k prodejní objednávce."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
 #. module: sale
 #: view:board.board:0
@@ -354,56 +355,56 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Cenové nabídky"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Ceník pro aktuální prodejní objednávku."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Delivery Order Only"
-msgstr ""
+msgstr "Pouze doručovací příkaz"
 
 #. module: sale
 #: report:sale.order:0
 msgid "TVA :"
-msgstr ""
+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 ""
+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 ""
+msgstr "Datum ocenění"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Finanční pozice"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "UoM"
-msgstr ""
+msgstr "MJ"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr ""
+msgstr "Počet balíků"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "V běhu"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -411,18 +412,22 @@ 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:971
 #, 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:1042
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "(nedost.)"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -434,7 +439,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:64
@@ -455,48 +460,48 @@ msgstr "Poznámky"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Fakturační adresa pro aktuální prodejní objednávku."
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
-msgstr ""
+msgstr "Rozšiřuje vaší základní Prodejní aplikaci o doplňující funkce."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturováno"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Objednávka doručení"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Datum potvrzení"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr ""
+msgstr "Podílový partner"
 
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Odkaz objednávky musí být jedinečný !"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Celkové množství"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -506,7 +511,7 @@ msgstr "Mezisoučet"
 #. module: sale
 #: report:sale.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Fakturační adresa :"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -514,6 +519,8 @@ 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
 #: help:sale.order,incoterm:0
@@ -525,90 +532,90 @@ msgstr ""
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Fakturační adresa"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "Hledat nefakturované řádky"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Ocenění / Objednávka"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# z řádek"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Otevřená faktura objednávky"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Řádek prodejní objednávky"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "Nastavení vašeho pracovního toku a výchozích hodnot prodeje."
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Sklad"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "Objednávka N° :"
 
 #. module: sale
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Řádky objednávky"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Nezdaněná částka"
 
 #. 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 ""
+msgstr "Řádky k fakturaci"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Množství (MJ)"
 
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum vytvoření"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "Nefakturované a doručené řádky"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Celkem :"
 
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "Moje prodeje"
 
 #. module: sale
 #: code:addons/sale/sale.py:290
@@ -616,110 +623,110 @@ msgstr ""
 #: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Neplatná akce !"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.report,pricelist_id:0
 #: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Ceník"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# z množ."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum objednávky"
 
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "Odesláno"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "Včechny cenové nabídky"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "Fakturovat při objednávce po doručení"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Září"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Kategorie výrobku"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Daně :"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Phyby zboží"
 
 #. module: sale
 #: view:sale.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Rok  "
 
 #. module: sale
 #: field:sale.order,state:0
 #: field:sale.report,state:0
 msgid "Order State"
-msgstr ""
+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 ""
+msgstr "Opravdu chcete vytvořit fakturu(y) ?"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "Prodeje podle měsíce"
 
 #. module: sale
 #: code:addons/sale/sale.py:970
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Nelze zrušit řádek prodejní objednávky!"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Bezpečnostní dny"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "Pořízení prodaného materiálu"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "Vytvořit konečnou fakturu"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Dodací adresa"
 
 #. module: sale
 #: help:sale.order,shipped:0
@@ -731,7 +738,7 @@ msgstr ""
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšířené filtry..."
 
 #. module: sale
 #: model:ir.module.module,description:sale.module_meta_information
@@ -764,27 +771,27 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Prodejní obchod"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Společnosti"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Výchozí politika naskladnění"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -793,34 +800,37 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Toto je seznam faktur, které byly generovány pro tuto prodejní objednávku. "
+"Stejné prodejní objednávky mohly být vícekrát fakturovány (např. podle "
+"řádku)."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Your Reference"
-msgstr ""
+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 ""
+msgstr "Jméno a adresa kontaktu, který vyžádal objednávku nebo ocenění."
 
 #. module: sale
 #: code:addons/sale/sale.py:966
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+msgstr "Nemůžete zrušit prodejní objednávku, která už byla fakturována !"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr ""
+msgstr "Množ."
 
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Odkazy"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -831,17 +841,17 @@ msgstr ""
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
-msgstr "Storno"
+msgstr "Zrušit"
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Data prodejních objednávek"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Vyjímka"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -850,145 +860,146 @@ msgstr ""
 #: view:sale.advance.payment.inv:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Vytvořit fakturu"
 
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Marže v prodejních objednávkách"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Celkem nezahrnuté daně"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Compute"
-msgstr ""
+msgstr "Spočítat"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr ""
+msgstr "Prodeje podle partnera"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr ""
+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 ""
+msgstr "Otevřít fakturu"
 
 #. module: sale
 #: report:sale.order:0
 #: view:sale.order.line:0
 msgid "Price"
-msgstr ""
+msgstr "Cena"
 
 #. 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 ""
+msgstr "Nastavení prodejní aplikace"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Celková cena"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr ""
+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 ""
+msgstr "Založeno přepraveném nebo objednaném množství."
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "Sousivející navádění"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "Jméno"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+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 ""
+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 ""
+msgstr "Návrh prodejní objednávky"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "Vytvořit dodací příkaz"
 
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Ceny dodání"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Celkem zahrnutá daň"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "Vytvořit seznam naskladnění"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "Prodeje podle kategorie výrobků"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Částečné doručení"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr ""
+msgstr "Potvrdit ocenění"
 
 #. 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.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Znovu vytvořit fakturu"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
@@ -1005,43 +1016,43 @@ msgstr "Čekací rozvrh"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Metoda zásobování"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "title"
-msgstr ""
+msgstr "nadpis"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "Seznam naskladnění"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Datum objednávky"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Dokument přesunu na výstup nebo k zákazníkovi"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "Ověřit"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Potvrdit objednávku"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "Vytvořit zásobovací příkaz"
 
 #. module: sale
 #: view:sale.order:0
@@ -1053,23 +1064,23 @@ msgstr "Daně"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr ""
+msgstr "Přepravní politika"
 
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Datum, kdy je vytvořena prodejní objednávka."
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Přesun zásob"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Vytvořit faktury"
 
 #. module: sale
 #: view:sale.order:0
@@ -1084,22 +1095,22 @@ msgstr "Fax :"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "Částka dopředu"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Přepravované množství"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "Faktura založená na Prodejních objednávkách"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Naváděcí seznam"
 
 #. module: sale
 #: code:addons/sale/sale.py:387
@@ -1107,72 +1118,72 @@ msgstr ""
 #: code:addons/sale/sale.py:938
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Chyba !"
 
 #. module: sale
 #: code:addons/sale/sale.py:570
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "Nelze zrušit prodejní příkaz !"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "Zásobování"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Výjimka přepravy"
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr "Seskupit faktury(Group the invoices)"
+msgstr "Seskupit faktury"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "Přeprava & Ruční faktura"
 
 #. module: sale
 #: code:addons/sale/sale.py:1051
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "Informace naskladnění !"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Měsíc"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
 msgid "Sales Management"
-msgstr ""
+msgstr "Řízení prodeje"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Faktura z naskladnění"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "K překontrolování účetním."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referenční MJ"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1191,31 +1202,31 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Staré ocenění"
 
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr ""
+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 ""
+msgstr "Analýza prodeje"
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
-msgstr ""
+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 ""
+msgstr "Cenová nabídka"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1224,12 +1235,17 @@ msgid ""
 "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
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -1237,13 +1253,13 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
-msgstr ""
+msgstr "Prodej"
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena za kus"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1251,18 +1267,18 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Dokončeno"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "sale.installer"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: sale
 #: code:addons/sale/sale.py:1014
@@ -1271,52 +1287,55 @@ 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
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "Seznam naskladnění & Dodací příkaz"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Zdrojový dokument"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "K provedení"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "Politika naskladnění"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Dokument přesunu k zákazníkovi."
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "Množství bez daně."
 
 #. module: sale
 #: code:addons/sale/sale.py:571
 #, 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 ""
+msgstr "Prodejní platba faktury dopředu"
 
 #. module: sale
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr ""
+msgstr "Incoterm"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1324,22 +1343,22 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Výrobek"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturování"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr ""
+msgstr "Zrušit přiřazení"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr ""
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -1355,49 +1374,49 @@ msgstr ""
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr ""
+msgstr "Faktura pro"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "DAtum objednání"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "UoS výrobku"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Ruční v běhu"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "MJ výrobku"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logistika"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order"
-msgstr ""
+msgstr "Objednávka"
 
 #. module: sale
 #: code:addons/sale/sale.py:921
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Pro tento výrobek není definován příjmový účet: \"%s\" (id: %d)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "Ignoravat výjimku"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1419,17 +1438,17 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "States"
-msgstr ""
+msgstr "Stavy"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Odkaz zákazníka"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1441,7 +1460,7 @@ msgstr "Celkem"
 #: code:addons/sale/sale.py:388
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "V této společnosti není definován prodejní deník: \"%s\" (id:%d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1455,25 +1474,25 @@ msgstr ""
 #: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "Nelze odstranit řádek prodejní objednávky, který je %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 ""
+msgstr "Vytvoření faktůr"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "K fakturaci"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Datum, pro které prodejní objednávka potvrzena."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1482,29 +1501,30 @@ msgstr ""
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Společnost"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum faktury"
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "Částka, která je fakturována dopředu."
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Vyjímka faktury"
 
 #. 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
 #: help:sale.installer,sale_margin:0
@@ -1512,17 +1532,19 @@ msgid ""
 "Gives the margin of profitability by calculating the difference between Unit "
 "Price and Cost Price."
 msgstr ""
+"Dává marži výnosnosti vypočítáním rozdílu mezi jednotkovou cenou a výrobní "
+"cenou."
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create invoices"
-msgstr "Vytvořit faktury(Create invoices)"
+msgstr "Vytvořit faktury"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Čistého celkem:"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1538,29 +1560,29 @@ msgstr "Zrušeno"
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Obchod"
 
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Měsíc   "
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "Datum potvrzení"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid "Warning"
-msgstr ""
+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 ""
+msgstr "Prodeje podle měsíce"
 
 #. module: sale
 #: code:addons/sale/sale.py:1045
@@ -1581,12 +1603,12 @@ msgstr ""
 #: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodejní objednávka"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Množství (PJ)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1605,50 +1627,50 @@ msgstr "Potvrzeno"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdit"
 
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+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 ""
+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 ""
+msgstr "Řádky faktury"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "Řádky prodejní objednávky"
 
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Dodací čekací lhůta"
 
 #. module: sale
 #: view:res.company:0
 msgid "Configuration"
-msgstr "Konfigurace"
+msgstr "Nastavení"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr ""
+msgstr "Úplné doručení"
 
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Měsíc-1    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1661,7 +1683,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1676,25 +1698,25 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,th_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Váha"
 
 #. module: sale
 #: view:sale.open.invoice:0
 #: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Faktury"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obrázek"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -1708,7 +1730,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "Nefakturované"
 
 #. module: sale
 #: report:sale.order:0
@@ -1719,17 +1741,17 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Obchodník"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "Řídí zásobování a fakturace"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Nezdaněná částka"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:163
@@ -1738,18 +1760,18 @@ msgstr ""
 #: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
-msgstr ""
+msgstr "Faktura dopředu"
 
 #. module: sale
 #: code:addons/sale/sale.py:591
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "Prodejní objednávka '%s' byla zrušena."
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Koncept"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -1768,45 +1790,45 @@ msgstr ""
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "Částka daně"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Balení"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Průběh nastavení"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr ""
+msgstr "Prodeje výrobků"
 
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+msgstr "Datum objedná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 ""
+msgstr "Prodejní objednávky"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Přímé dodání"
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Fakturační deníky"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -1817,50 +1839,51 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "Přepravené množ."
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "Vaše faktura byla úspěšně vytvořena!"
 
 #. module: sale
 #: code:addons/sale/sale.py:585
 #, 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 ""
+msgstr "Leden"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "Nastavit vaše aplikaci Řízení prodeje"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
-msgstr ""
+msgstr "Prodejní objednávky v běhu"
 
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "Vylepšení rozvržení prodejní objednávky"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:63
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Zpoždění závazku"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -1872,65 +1895,66 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr ""
+msgstr "Přiřadit k"
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Datum objednávky"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Potvrzení prodejní objednávky k fakturaci."
 
 #. module: sale
 #: code:addons/sale/sale.py:290
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
 msgstr ""
+"Potvrzené prodejní objednávky, které jsou již potvrzené nelze smazat."
 
 #. module: sale
 #: code:addons/sale/sale.py:316
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "Prodejní objednávka '%s' byla nastavena do stavu koncept."
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr ""
+msgstr "ze skladu"
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr ""
+msgstr "Výchozí přepravní politika"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Uzavřít"
 
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "Doručené množ."
 
 #. module: sale
 #: code:addons/sale/sale.py:1115
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Nedostatek zásob !"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Posloupnost rozvržení"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1945,18 +1969,18 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Indikuje, že faktura již byla zaplacena."
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
@@ -1968,17 +1992,17 @@ msgstr ""
 #: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Zákazník"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr ""
+msgstr "Dopředu"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
 #. module: sale
 #: help:sale.installer,sale_journal:0
@@ -1990,40 +2014,41 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr ""
+msgstr "Účetnictví"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Kroky k dodání prodejní objednávky"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Hledat prodejní objednávky"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Vyžádání Prodejní objednávky"
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Platební období"
 
 #. module: sale
 #: help:sale.installer,sale_layout:0
 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."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2038,24 +2063,24 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
-msgstr ""
+msgstr "Množství N°"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
-msgstr ""
+msgstr "Naskladněno"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr ""
+msgstr "Faktura založená na dodávce"
 
 #~ msgid "Do you really want to create the invoices ?"
 #~ msgstr ""
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
new file mode 100644
index 00000000000..f0c4e392425
--- /dev/null
+++ b/addons/sale/i18n/da.po
@@ -0,0 +1,2068 @@
+# 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: 2011-01-11 11:16+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: 2011-11-10 04:57+0000\n"
+"X-Generator: Launchpad (build 14263)\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 "Salg pr. sælger de sidste 90 dage"
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr ""
+"Gir dig mulighed for at beregne leveringsomkostninger på dine tilbud."
+
+#. 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
+#: 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
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr "Konfigurer kundeordrelogistik"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "Tilbuddets '%s' er konverteret til salgsordre."
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr "Forudbetaling"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "Moms"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr "Alt på en gang"
+
+#. 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 ""
+
+#. 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
+#: 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
+#: 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
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr "Konfigurerer plukpolitik for salgsorder"
+
+#. 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
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. 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
+#: 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
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabat (%)"
+
+#. 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: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
+#: code:addons/sale/sale.py:1014
+#, 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
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Betingelser"
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+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:620
+#, 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:584
+#, 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
+#: 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 "Tilbud"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+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
+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:971
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1042
+#, 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
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
+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.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marts"
+
+#. 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
+#: 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 "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
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+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.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:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Invalid action !"
+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
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr "Afsendt"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. 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
+#: view:sale.report:0
+msgid "  Year  "
+msgstr "  År  "
+
+#. 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 "Salg pr. måned"
+
+#. module: sale
+#: code:addons/sale/sale.py:970
+#, 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 "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
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. 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 ""
+
+#. 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_res_company
+msgid "Companies"
+msgstr "Virksomheder"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+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
+#: code:addons/sale/sale.py:966
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Antal"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+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
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+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
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+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
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Pris"
+
+#. 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 ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Total pris"
+
+#. 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
+#: 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
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+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 "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+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
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+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: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
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+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.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+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
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkeliste"
+
+#. 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 "Fejl!"
+
+#. module: sale
+#: code:addons/sale/sale.py:570
+#, python-format
+msgid "Could not cancel 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
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1051
+#, python-format
+msgid "Picking Information !"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management"
+msgstr "Salgs administration"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
+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
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. 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 ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+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
+#: 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
+#: 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 "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:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr ""
+
+#. 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:1014
+#, 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
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
+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:571
+#, 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
+#: 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 "Vare"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr "Fakturering"
+
+#. 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
+#: 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 ""
+
+#. 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.order,state:0
+#: 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:921
+#, 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: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 ""
+
+#. 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
+#: code:addons/sale/sale.py:388
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+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
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
+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
+#: 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,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"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Faktura dato"
+
+#. 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
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. 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 ""
+
+#. 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 "Netto total:"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+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
+#: view:sale.report:0
+msgid "   Month   "
+msgstr "   Måned   "
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, 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 "Salg pr. måned"
+
+#. 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 ""
+
+#. 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
+#: 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
+#: 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
+#: 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
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. 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 ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. 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
+#: 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 "December"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. 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ælger"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. 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 ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, 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
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+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
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:585
+#, 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
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+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
+#: code:addons/sale/sale.py:290
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, 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
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Leveret"
+
+#. module: sale
+#: code:addons/sale/sale.py:1115
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+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 "Maj"
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+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 ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februar"
+
+#. 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 ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
+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
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+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
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index fe799a24e8f..da222851524 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2239,80 +2239,6 @@ msgstr "Jahr"
 msgid "Invoice Based on Deliveries"
 msgstr "Rechnung durch Lieferung"
 
-#~ msgid "Shop name"
-#~ msgstr "Shopname"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Menge (UOS)"
-
-#~ msgid "Customer Ref."
-#~ msgstr "Kunden Referenz"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Rechnung aus Packliste"
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Sie müssen zuerst alle Packaufträge zu diesem Verkaufsauftrag löschen."
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Zeigt den Status des Angebots oder des Auftrags (Bestellung). Der Ausnahme "
-#~ "Zustand (exception) wird automatisch gesetzt, wenn ein Fehler bei der "
-#~ "Rechnungsvalidierung oder beim Packvorgang entsteht. Der Status "
-#~ "\"Warteliste\" wird gesetzt, wenn die Rechnung bestätigt wurde allerdings "
-#~ "das hinterlegte Bestelldatum (Date Ordered) noch nicht aktuell ist."
-
-#~ msgid "Number packages"
-#~ msgstr "Anzahl Pakete"
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "Die Auslieferungsregel synchronisiert Rechnungsstellung mit Auslieferung.\n"
-#~ "  -  'Zahlung vor Auslieferung' wird zuerst eine Rechnung erzeugen und dann "
-#~ "erst den Packauftrag wenn die Zahlung erfasst wurde.\n"
-#~ "  - 'Auslieferung & Manuelle Rechnung' wird einen Packauftrag direkt "
-#~ "erzeugen und wartet bis der Benutzer auf den \"Erzeuge Rechnung\" Button "
-#~ "klickt um die  Rechnung zu produzieren.\n"
-#~ "  - 'Rechnung aus Bestellung nach Lieferung' wird eine Rechnung im Entwurf "
-#~ "erzeugen beim Entstehen des Verkaufsauftrags nach dem der Packauftrag "
-#~ "fertiggestellt wurde.\n"
-#~ "  - 'Rechnung aus Packauftrag' erzeugt eine Rechnung durch einen Packauftrag."
-
-#~ msgid "Related Packings"
-#~ msgstr "zugehörige Packvorgänge"
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Generieren Sie Teil - Auslieferungen falls Sie nicht genügend Lagerbestand "
-#~ "für eine komplette Auslieferung haben."
-
-#~ msgid "Product UOS"
-#~ msgstr "Produkt UoS"
-
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Sie können keine Rechnung stornieren, die bereits abgerechnet wurde !"
-
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Verwaltet den Liefer- und Fakturierungs- Fortschritt"
 
@@ -2708,298 +2634,14 @@ msgstr "Rechnung durch Lieferung"
 #~ "  - Die 'Rechnung vom Lieferschein' Regel erzeugt eine Rechnung aufgrund der "
 #~ "Lieferung."
 
-#~ 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 After 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 ""
-#~ "Die Lieferregeln werden verwendet, um Rechnung und Lieferung abzustimmen\n"
-#~ "  'Vorauszahlung' erzeugt zuerst eine Rechnung, nach Zahlung den "
-#~ "Packauftrag\n"
-#~ "  'Lieferung und manuelle Rechnung' erzeugt sofort einen Packauftrag und der "
-#~ "Benutzer muss die Rechung mit der Schaltfläche \"Rechnung\" erzeugen.\n"
-#~ "  'Rechnung nach Lieferung' erzeugt eine Rechnung nach Erstellung aller "
-#~ "Lieferscheine \n"
-#~ "  'Rechnung je Lieferschein' erzeugt eine Rechnung aufgrund des einzelnen "
-#~ "Lieferscheines."
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Verkäufe Anzeigetafel"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Verkauf Dashboard"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Verkäufe des Monats"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Verkaufsmanager Dashboard"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Fälle des Monats"
-
-#~ msgid "My open quotations"
-#~ msgstr "Meine offenen Angebote"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Fallstatistik"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Top Ten Verkäufe des Monats"
-
-#~ msgid "Average Price"
-#~ msgstr "Durch. Preis"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Bericht neue Verkaufsaufträge"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Verkäufe nach Kategorien"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Jahresumsatz nach Monaten kumm."
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Verkäufe nach Produkten"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Jahresumsatz nach Monaten"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Umsatz je Produkt"
-
-#~ msgid "All Months"
-#~ msgstr "Alle Monate"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Verkäufe nach Kategorien"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Verkäufe des Monats"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Verkäufe nach Produkten (dieser Monat)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Jahresumsatz nach Monaten"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Verkaufsverwaltung - Berichte"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Verkäufe nach Produktkategorien"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Jahresumsatz nach Monaten kumm."
-
-#~ msgid "# of Products"
-#~ msgstr "# Produkte"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Verkauf nach Produkt"
-
-#~ msgid "This Month"
-#~ msgstr "Dieser Monat"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorien"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Erstellte Verkaufsaufträge"
-
-#~ msgid "Reporting"
-#~ msgstr "Berichtswesen"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Umsatz je Monat"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Jahresumsatz nach Tagen"
-
-#~ msgid "Graphs"
-#~ msgstr "Graphiken"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manuelle Bearbeitung"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Gesamtumsatz"
-
-#~ msgid "In progress"
-#~ msgstr "Im Fortschritt"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Verkäufe nach Produktkategorien (dieser Monat)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Jahresumsatz nach Tagen"
-
-#~ msgid "Create Date"
-#~ msgstr "Erstellungsdatum"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Neue Verkaufsaufträge"
-
-#~ msgid "Sales by State"
-#~ msgstr "Verkäufe je Staat"
-
 #~ 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"
 
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Verkauf je Partner"
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Zuerst müssen die Lagerbuchungen für diese Auftragszeile storniert werden."
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Kann %s Auftragszeile nicht löschen"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "Das Angebot '%s' wurde zu einen Verkaufsauftrag."
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Anzahl der Tage zwischen Auftragsbestätigung und Auslieferung der Produkte "
-#~ "an den Kunden."
-
-#~ msgid "The total amount"
-#~ msgstr "Die Gesamtsumme"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Rechungsadresse für den aktuellen Verkaufsauftrag"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Das zum Verkaufsauftrag zugehörige Analysekonto"
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr "Für diesen Produkt \"%s\" ist kein Erlöskonto definiert:  (id:%d)"
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Zeigt an, dass die Rechnung bezahlt wurde"
-
-#~ msgid "The tax amount"
-#~ msgstr "Der Steuerbetrag"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Version der Preisliste für den aktuellen Verkaufsauftrag"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Sequenz Nummer"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Menge "
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Steuert die Beschaffungsaufträge von jeder Verkaufsauftragszeile"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Kann Verkaufsauftragszeile nicht stornieren"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Datum der Bestätigung des Verkaufsauftrages"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Lieferadresse für diesen Verkaufsauftrag"
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Für dieses Unternehmen ist kein Verkaufsjournal definiert: \"%s\" (id:%d)"
-
-#~ msgid "The amount without tax"
-#~ msgstr "Der Nettobetrag"
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Verkaufsauftragsanforderung"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regeln werden für osv.memory Objekte nicht unterstützt!"
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Verkauf je Kunde"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Für \"automatische Rechnung nach Lieferung\" kann keine Anzahlung gemacht "
-#~ "werden."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#, 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: "
-#~ msgstr ""
-#~ "Sie wählten %d Einheiten.\n"
-#~ "Diese sind mit der gewählten Verpackung nicht kompatibel.\n"
-#~ "Hier ist ein Vorschlag für Mengen entsprechend der Verpackung: "
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Verweis auf den Beleg, der diesem Verkaufsauftrag zugrunde liegt."
-
-#~ msgid ""
-#~ "Incoterm which stands for 'International Commercial terms' implies its a "
-#~ "series of sales terms which are used in the commercial transaction"
-#~ msgstr ""
-#~ "Incoterm bedeutet 'International commercial terms\"und beschreibt die "
-#~ "Lieferbedingungen."
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Ein Verkaufauftrag erzeugt eine Rechnung, sobald eine Bestätigung durch den "
-#~ "Verkäufer erfolgt. In Abhängigkeit von den Einstellungen zur "
-#~ "Rechnungserstellung, erfolgt die Abrechnung auf Basis bestellter oder "
-#~ "gelieferter Produkte."
-
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Typ der VE: "
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Datum der Erstellung dieses Verkaufsauftrags"
-
-#~ msgid "From a sale order"
-#~ msgstr "Rechnung von einem Verkaufsauftrag"
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Öffne Ausgangsrechnung"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -3012,144 +2654,16 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Kann diesen Verkaufsauftrag nicht abbrechen !"
 
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Anzahlungsrechnung für Auftrag"
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Ein Beschaffungsauftrag für jede Verkaufsauftragszeile und für jedes "
-#~ "Einzelprodukt."
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Erzeuge Ausgangsrechnung"
-
-#~ 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 sale 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 ""
-#~ "Die Abrechnungsbedingung bestimmt die zeitliche Abfolge von "
-#~ "Rechnungsstellung und Lieferung .\n"
-#~ "  - Bei 'Zahlung vor Lieferung'  wird zuerst die Rechnung generiert, dann "
-#~ "erfolgt ein Lieferauftrag aufgrund der Zahlung .\n"
-#~ "  -  Bei 'Lieferung & Manuelle Rechnung' ist der Lieferauftrag unmittelbar "
-#~ "verfügbar. Die Rechnung muss dann noch manuell erzeugt werden.\n"
-#~ "  -  Bei 'Rechnung durch Auftrag' erfolgt eine automatische Rechnung im "
-#~ "Status Entwurf, wenn die Lieferung vollständig abgeschlossen wurde.\n"
-#~ "  - Bei  'Rechnung durch Lieferung' kann bei Abschluss einer Auslieferung "
-#~ "eine Rechnung  gleich mit erstellt werden."
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "Ein Lieferauftrag (Lieferschein) wird unmittelbar bei der Bestätigung des "
-#~ "Verkaufsauftrages zeitgleich mit dem Beschaffungsauftrag erstellt. Ein "
-#~ "Lieferauftrag beinhaltet Zeile für Zeile alle Produkte der "
-#~ "Verkaufsauftragspositionen. Die Verfügbarkeit dieser Produkte wird durch "
-#~ "dann durch den vorhandenen  Bestand überprüft, und wirkt sich somit auch auf "
-#~ "die Anzeige der Verfügbarkeit bei dem Verkaufsauftrag insgesamt aus."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "Der Verkaufsauftrag '%s' wurde auf Entwurf gesetzt."
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "Der Verkaufsauftrag '%s' wurde auf storniert."
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Rechnung durch Lieferung"
-
 #~ 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 ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Der Status des Verkaufsauftrages. \n"
-#~ "Der Fehlerstatus wird automatisch gesetzt, wenn eine Rechnung oder eine "
-#~ "Lieferung storniert wird.\n"
-#~ "In Wartezustand befindet sich der Auftrag nach seiner Bestätigung, in "
-#~ "Erwartung der Verarbeitung durch den Assistenten zur Erstellung von "
-#~ "Beschaffungsaufträgen."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "*Der 'Entwurf' Status wird unmittelbar bei der neuen Erstellung eines "
-#~ "Auftrags zugewiesen.   \n"
-#~ "* Es erfolgt ein Wechsel auf den Status 'Bestätigt' bei der "
-#~ "Auftragungsbestätigung .\n"
-#~ "* Der Status 'Fehlermeldung' wird angezeigt, wenn der bezugnehmende Auftrag "
-#~ "nicht korrekt verarbeitet werden kann.\n"
-#~ "* Der 'Erledigt' Status wird angezeigt, wenn der zugehörige Lieferauftrag "
-#~ "erledigt wurde.\n"
-#~ "* Der Status 'Abgebrochen' wird angezeigt, wenn ein Benutzer den Auftrag "
-#~ "storniert hat."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Verkäufe nach Produktkategorien"
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "Der Verkäufer bestätigt das Angebot und erstellt dadurch einen "
-#~ "Verkaufsauftrag mit dem Status \"In Bearbeitung\" oder \"Manuell In "
-#~ "Bearbeitung \""
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
 #~ "Fehler: Die Standard Mengeneinheit sowie die Mengeneinheit für die "
 #~ "Beschaffung muss in derselben Kategorie sein."
 
-#~ msgid "Draft state of sale order"
-#~ msgstr "Entwurfsstatus des Verkaufsauftrages"
-
-#~ msgid "Related Invoices"
-#~ msgstr "Rechnungsbezug"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Bestätigter Verkaufsauftrag zur Abrechnung"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Verkäufe nach Verkäufer"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Dies zeigt an, dass der Verkaufsauftrag ausgeliefert wurde. Das Feld wird "
-#~ "nur dann aktualisiert, wenn der Assistent für Beschaffungsvorschläge "
-#~ "ausgeführt wird."
-
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Schritte für Auslieferung eines Verkaufsauftrags"
 
@@ -3159,133 +2673,5 @@ msgstr "Rechnung durch Lieferung"
 #~ "Zuerst müssen alle bereits rzeugten Rechnungen dieses Verkaufsauftrags "
 #~ "gelöscht werden."
 
-#~ msgid "Default UoM"
-#~ msgstr "Mengeneinheit"
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr ""
-#~ "Zuerst müssen alle Lieferungen für diesen Verkaufsauftrag storniert werden"
-
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Rechnung durch Auftrag"
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Für jede Verkaufsauftragszeile wird ein Beschaffungsauftrag erzeugt, um das "
-#~ "verkaufte Produkt bereitzustellen."
-
-#~ msgid "Source document"
-#~ msgstr "Referenzbeleg"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Rechungserstellung nicht möglich:\n"
-#~ "1. Der Status des Verkaufsauftrages ist entweder \"Entwurf\" oder "
-#~ "\"Storniert\"!\n"
-#~ "2. Die Verkaufsauftragszeile ist bereits fakturiert"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Ein Beschaffungsauftrag wird automatisch erzeugt, wenn der Verkaufsauftrag "
-#~ "bestätigt oder die Rechnung bezahlt wird. Dies steuert die Beschaffung oder "
-#~ "die Produktion aufgrund der festgelegten Regeln. "
-
-#~ msgid "Logistics"
-#~ msgstr "Logistik"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Konfiguriere Packliste für Auftrag"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Hier finden Sie eine Liste aller Verkaufsauftragspositionen die abrechenbar "
-#~ "sind. Diese Ansicht ermöglicht Ihnen eine sukzessive Teilabrechnung von "
-#~ "Verkaufsaufträgen. Sie benötigen diese Liste nicht, wenn Sie eine komplette "
-#~ "Abrechnung eines Verkaufsauftrags durch eine abschliessende Rechnung "
-#~ "bevorzugen."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Depending on the Invoicing control of the sale order, the invoice can be "
-#~ "based on delivered or on ordered quantities. Thus, a sale order can "
-#~ "generates an invoice or a delivery order as soon as it is confirmed by the "
-#~ "salesman."
-#~ msgstr ""
-#~ "In Abhängigkeit von der Auslieferungsmethode eines Verkaufsauftrags, kann "
-#~ "die Rechnung auf gelieferten oder bestellten Mengen beruhen. Hierdurch kann "
-#~ "eine Auftragserteilung sowohl eine Rechnung als auch einen "
-#~ "Auslieferungsauftrag für den Versand unmittelbar durch die Bestätigung der "
-#~ "Auftragserteilung eines Kunden generiert werden."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Sie können keine Anzahlungsrechnung für einen Verkaufsauftrag erstellen, der "
-#~ "mit der Abrechnungsmethode 'Automatische Rechnung nach Lieferung' erstellt "
-#~ "wurde"
-
-#~ msgid ""
-#~ "Sales Orders helps you manage quotations and orders done with your "
-#~ "customers. OpenERP suggests that you to start by creating a quotation. Once "
-#~ "the order is confirmed, the quotation is converted into a Sale Order. "
-#~ "OpenERP can handle several types of products so that a sales order can "
-#~ "trigger tasks, delivery orders, manufacturing orders, purchases and so on. "
-#~ "Based on the configuration of the sale 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 ermöglichen die Erstellung und Verwaltung von Angeboten und "
-#~ "Kundenbestellungen. OpenERP schlägt üblicherweise vor, zunächst ein Angebot "
-#~ "in Form eines Verkaufsauftrags im Zustand Entwurf zu erstellen. Sobald das "
-#~ "Angebot durch Auftragserteilung bestätigt wird, wird das Angebot faktisch in "
-#~ "einen Verkaufsauftrag umgewandelt. OpenERP kann mit verschiedenen "
-#~ "Produkttypen umgehen, wodurch entweder Aufgaben, Lieferaufträge, "
-#~ "Fertigungsaufträge, Bestellungen an Lieferanten etc. ausgelöst werden. Auf "
-#~ "Basis der entsprechenden Auftragskonfiguration, wird ein Rechnungsentwurf "
-#~ "erstellt, der zur Versendung und Abrechnung an Kunden lediglich bestätigt "
-#~ "werden muss."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Verkäufe pro Kunde"
-
-#~ msgid ""
-#~ "If you have more than one shops reselling your company products, you can "
-#~ "create and manage them from here. Whenever you will record a new quotation "
-#~ "or sale 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 sale."
-#~ msgstr ""
-#~ "Wenn Sie mehr als einen Verkaufsshop für den Vertrieb Ihrer Produkte "
-#~ "betreiben, können Sie Ihre Verkaufsshops hier erstellen und verwalten. Wann "
-#~ "immer Sie ein Angebot oder einen neuen Verkaufsauftrag erstellen muss dieser "
-#~ "zwingend einem Verkaufsshop zugeordnet sein. Einem Verkaufsshop wird auch "
-#~ "ein Lager zugeordnet,wodurch der Lagerort bestimmt wird, von dem die "
-#~ "Produkte an Kunden ausgeliefert werden."
-
-#~ msgid "Sales Dashboard"
-#~ msgstr "Pinnwand Verkauf"
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 649e4673715..5c3d09d42bc 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2099,9 +2099,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Αυτόματη Δήλωση"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Σχετ. Πελάτη"
-
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Μετά την επιβεβαίωση της εντολής, δημιουργήστε το τιμολόγιο"
 
@@ -2112,9 +2109,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "Όποτε το πλήκτρο επιβεβαίωσης πατιέται, η πρόχειρη κατάσταση μεταφέρεται σε "
 #~ "χειροκίνητη, δηλαδή η προσφορά μετατρέπεται σε εντολή πώλησης."
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Τιμολόγιο απο συσκευασίες"
-
 #~ msgid "Manual Designation"
 #~ msgstr "Χειροκίνητος Προσδιορισμός"
 
@@ -2130,9 +2124,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Reference"
 #~ msgstr "Παραπομπή"
 
-#~ msgid "Shop name"
-#~ msgstr "Όνομα Καταστήματος"
-
 #~ msgid "Procure Method"
 #~ msgstr "Μέθοδος Προμήθειας"
 
@@ -2214,12 +2205,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Sales orders"
 #~ msgstr "Εντολές πώλησης"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Χειροκίνητη λειτουργία σε εξέλιξη"
-
-#~ msgid "Number packages"
-#~ msgstr "Αριθμοδότηση συσκευασιών"
-
 #~ msgid "Payment accounts"
 #~ msgstr "Λογαριασμοί πληρωμών"
 
@@ -2239,9 +2224,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Αδύνατη η ακύρωση της εντολής πώλησης!"
 
-#~ msgid "In progress"
-#~ msgstr "Σε εξέλιξη"
-
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Διαχειρίζεται την εξέλιξη στις παράδοσεις και τις τιμολόγησεις"
 
@@ -2289,9 +2271,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Procurement Corrected"
 #~ msgstr "Διόρθωση Προμήθειας"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Ποσότητα (2η ΜΜ)"
-
 #~ msgid "Status"
 #~ msgstr "Κατάσταση"
 
@@ -2304,9 +2283,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Sale Procurement"
 #~ msgstr "Προμήθεια Πώλησης"
 
-#~ msgid "Related Packings"
-#~ msgstr "Σχετικές συσκευασίες"
-
 #~ msgid "Sale Order"
 #~ msgstr "Εντολή Πώλησης"
 
@@ -2318,13 +2294,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "μετά την επιβεβαίωση της εντολής πώλησης. Αυτή η συναλλαγή μετατρέπει την "
 #~ "εντολή πώλησης σε τιμολόγιο"
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Εάν δεν έχετε αρκετό διαθέσιμο απόθεμα για ολοκληρωμένη παράδοση, "
-#~ "συμφωνείται για μερική παράδοση ή όχι."
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Τιμοκατάλογοι Πώλησης"
 
@@ -2334,12 +2303,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Make Invoice"
 #~ msgstr "Δημιουργία Τιμολογίου"
 
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Θα πρέπει πρώτα να ακυρώσετε τις επισυναπτόμενες φορτώσεις για την εντολή "
-#~ "πώλησης."
-
 #~ msgid "Sales order lines"
 #~ msgstr "Γραμμές εντολών πώλησης"
 
@@ -2392,9 +2355,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Open Advance Invoice"
 
-#~ msgid "Product UOS"
-#~ msgstr "2η ΜΜ Προϊόντος"
-
 #~ msgid "Deliver"
 #~ msgstr "Μεταφορά"
 
@@ -2405,11 +2365,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Αδύνατη η ακύρωση αυτής της εντολής πώλησης!"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Δεν μπορείτε να ακυρώσετε μιά γραμμή εντολής πώλησης εάν έχει τιμολογηθεί!"
-
 #~ msgid ""
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr ""
@@ -2473,19 +2428,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Error: Invalid ean code"
 #~ 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 "
-#~ "(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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "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 be on the date 'Date Ordered'."
-
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configure Sale Order Logistic"
 
@@ -2497,29 +2439,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
 
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Packing OUT is created for stockable products."
 
@@ -2541,31 +2460,6 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Invoice from the Packing"
 #~ 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 "
-#~ "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 After 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 ""
-#~ "Η Πολιτική Μεταφορών χρησιμοποιείται στον συχρονισμό της τιμολόγησης και της "
-#~ "αποστολής.\n"
-#~ "  - Το 'Πληρωμή πριν την Παράδοση' θα δημιουργήσει πρώτα το τιμολόγιο και "
-#~ "στην συνέχεια την εντολή αποστολής όταν το τιμολόγιο εξοφληθεί.\n"
-#~ "  - Το 'Παράδοση και Χειροκίνητη Τιμολόγηση' θα δημιουργήσει την εντολή "
-#~ "αποστολής αμέσως και θα περιμένει από τον χρήστη να δημιουργήσει το "
-#~ "τιμολόγιο πατώντας το αντίστοιχο κουμπί.\n"
-#~ "  - Το 'Τιμολόγηση στην εντολή μετά την παράδοση' θα δημιουργήσει πρόχειρο "
-#~ "τιμολόγιο βασισμένο στην εντολή πώλησης αφού ολοκληρωθούν όλες οι "
-#~ "αποστολές.\n"
-#~ "  - Το 'Τιμολόγηση απ' την συσκευασία' χρησιμοποιείται για να δημιουργήσει "
-#~ "το τιμολόγιο κατα την διάρκεια της διαδικασίας αποστολής."
-
 #~ msgid "Customer Ref"
 #~ msgstr "Παραπομπή Πελάτη"
 
@@ -2583,207 +2477,11 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "τιμολόγιο επιβεβαιωθεί αλλά περιμένει τον Χρονοπρογραμματιστή να τρέξει κατα "
 #~ "'Ημερομηνία Παραγγελίας'."
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Πίνακας πωλήσεων"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Πίνακας Αναφορών Πωλήσεων"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Πωλήσεις του μήνα"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Πίνακας διευθυντή πωλήσεων"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Θέματα του μήνα"
-
-#~ msgid "My open quotations"
-#~ msgstr "Οι ανοικτές προσφορές μου"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Στατιστικά θεμάτων"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Top ten πωλήσεις του μήνα"
-
-#~ msgid "Average Price"
-#~ msgstr "Μέση Τιμή"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Αναφορά των Δημιουργημένων Εντολών Πώλησης"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Εντολές Πώλησεις κατα κατηγορία"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Μηνιαίος συσσωρευμένος τζίρος ως προς το έτος"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Εντολές Πώλησεις κατα Προϊόν"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Μηνιαίος τζίρος ως προς το έτος"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Τζίρος ανά προϊόν"
-
-#~ msgid "All Months"
-#~ msgstr "Όλοι οι Μήνες"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Εντολές Πώλησης κατα Κατηγορίες"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Πωλήσεις του Μήνα"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Πωλήσεις κατα Προϊόν (τρέχων μήνας)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Μηνιαίος τζίρος ως προς το έτος"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Διαχείριση Πωλήσεων - Αναφορές"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Πωλήσεις κατα Κατηγορία Προϊόντων"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Μηνιαίος συσσωρευμένος τζίρος ως προς το έτος"
-
-#~ msgid "# of Products"
-#~ msgstr "# Προϊόντων"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Πωλήσεις κατα Προϊόν"
-
-#~ msgid "This Month"
-#~ msgstr "Τρέχων Μήνας"
-
-#~ msgid "Categories"
-#~ msgstr "Κατηγορίες"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Εντολή Πώλησης Δημιουργήθηκε"
-
-#~ msgid "Reporting"
-#~ msgstr "Αναφορές"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Τζίρος ανά μήνα"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Ημερήσιος τζίρος ως προς το έτος"
-
-#~ msgid "Graphs"
-#~ msgstr "Γραφήματα"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Συνολικός τζίρος"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Πωλήσεις κατα Κατηγορία Προϊόντων (τρέχων μήνας)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Ημερήσιος τζίρος ως προς το έτος"
-
-#~ msgid "Create Date"
-#~ msgstr "Ημερομηνία Δημιουργίας"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Εντολές Πώλησης Δημιουργήθηκαν"
-
-#~ msgid "Sales by State"
-#~ msgstr "Πωλήσεις κατα Κατάσταση"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Ποσότητα: "
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Πωλήσεις ανά Πωλητή"
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Πωλήσεις ανά Συνεργάτη"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Ημερομηνία που δημιουργήθηκε η παραγγελία πώλησης"
-
-#~ msgid "From a sale order"
-#~ msgstr "Από παραγγελία Πώλησης"
-
-#~ msgid "The total amount"
-#~ msgstr "Το συνολικό ποσό"
-
-#~ msgid "The tax amount"
-#~ msgstr "Το ποσό φόρου"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Διεύθυνση Τιμολογίου για την τρέχουσα παραγγελία πώλησης"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr ""
-#~ "Αναφορά αυτού του εγγράφου που δημιούργησε αυτήν την εντολή παραγγελίας "
-#~ "πώλησης"
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Δεν μπορεί να διαγραφεί γραμμή παραγγελίας πώλησης που είναι %s!"
-
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Δεν μπορεί να γίνει ακύρωση μιας γραμμής παραγγελίας πώλησης η οποία έχει "
 #~ "τιμολογηθεί !"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Προηγμένη Πληρωμή Πώλησης Τιμολογίου"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Ο κωδικός αναλυτικής που σχετίζεται με την παραγγελία πώλησης"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "Η προσφορά '%s' έχει μετατραπεί σε παραγγελία πώλησης."
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Υποδεικνύει ότι ένα τιμολόγιο έχει πληρωθεί"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Configure Sale Order Logistics"
-
-#~ msgid "The amount without tax"
-#~ msgstr "Το ποσό χωρίς φόρο"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Διεύθυνση αποστολής για την τρέχουσα εντολή πώλησης"
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Πωλήσεις ανά πελάτη"
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Πωλήσεις ανά Πελάτη"
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Πωλήσεις ανά Κατηγορία Προϊόντων"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Έκδοση Τιμοκαταλόγου για την τρέχουσα παραγγελία πώλησης"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Αριθμός Αλληλουχίας"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "Η παραγγελία πώλησης '%s' έχει ακυρωθεί"
-
-#~ msgid "Default UoM"
-#~ msgstr "Προεπιλεγμένη ΜΜ"
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 5cc82199874..7aa29742cd9 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -204,7 +204,7 @@ 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 ordenadas"
+msgstr "Cantidades pedidas"
 
 #. module: sale
 #: view:sale.report:0
@@ -994,7 +994,7 @@ 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."
+msgstr "Basado en las cantidades enviadas o pedidas."
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -1454,7 +1454,7 @@ msgstr ""
 "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 ordenada\"."
+"\"Fecha pedido\"."
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1464,7 +1464,7 @@ msgstr "Facturar las"
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
-msgstr "Fecha ordenada"
+msgstr "Fecha de pedido"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
@@ -1513,9 +1513,9 @@ msgid ""
 "salesman."
 msgstr ""
 "En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades enviadas o vendidas. Por lo tanto, un "
+"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 "
-"confirmada por el comercial."
+"confirmado por el comercial."
 
 #. module: sale
 #: code:addons/sale/sale.py:1116
@@ -1938,7 +1938,7 @@ msgstr "Ventas de producto"
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr "Fecha ordenada"
+msgstr "Fecha pedido"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -2226,89 +2226,6 @@ msgstr "Año"
 msgid "Invoice Based on Deliveries"
 msgstr "Facturar desde albaranes"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Factura a partir de los albaranes"
-
-#~ msgid "Shop name"
-#~ msgstr "Nombre de tienda"
-
-#~ msgid "Number packages"
-#~ msgstr "Número de paquetes"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Cantidad (UdV)"
-
-#~ msgid "Product UOS"
-#~ msgstr "UdV del producto"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Customer Ref."
-#~ msgstr "Referencia de cliente"
-
-#~ msgid "Related Packings"
-#~ msgstr "Albaranes relacionados"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Indica el estado del presupuesto o pedido. El estado de excepción se "
-#~ "establece automáticamente cuando una operación de cancelación ocurre en la "
-#~ "validación de las facturas (Excepción de factura) o en la gestión de los "
-#~ "albaranes (Excepción de envío). El estado 'Esperando fecha planificada' se "
-#~ "establece cuando la factura se confirma pero la fecha actual es anterior a "
-#~ "la 'Fecha ordenada'."
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Si no tiene suficiente stock disponible para enviarlo todo a la vez, acepta "
-#~ "envíos parciales o no."
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Primero debe cancelar todos los albaranes asociados a este pedido de venta."
-
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "¡No se puede cancelar una línea del pedido de venta que ya ha sido facturada!"
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "La política de envío se utiliza para sincronizar los procesos de facturación "
-#~ "y envío.\n"
-#~ "  - La opción 'Pago antes del envío' generará primero la factura y después "
-#~ "del pago de esta factura generará el albarán.\n"
-#~ "  - La opción 'Enviar & Factura manual' creará el albarán directamente y "
-#~ "esperará a que el usuario manualmente haga clic sobre el botón de 'Factura' "
-#~ "para generar la factura borrador.\n"
-#~ "  - La opción 'Facturar pedido después del envío' generará la factura "
-#~ "borrador basada en el pedido de venta después de que todos los albaranes "
-#~ "hayan sido finalizados.\n"
-#~ "  - La opción 'Factura a partir de los albaranes' se utiliza para crear una "
-#~ "factura durante el proceso de empaquetado."
-
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar la logística de los pedidos de venta"
 
@@ -2704,31 +2621,6 @@ 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 ""
-#~ "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 After 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 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 ""
 #~ "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 "
@@ -2771,506 +2663,3 @@ msgstr "Facturar desde albaranes"
 #~ "hayan procesado.\n"
 #~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
 #~ "durante el proceso de los albaranes."
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Casos del mes"
-
-#~ msgid "My open quotations"
-#~ msgstr "Mis presupuestos abiertos"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Estadística de casos"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Primeras diez ventas del mes"
-
-#~ msgid "Average Price"
-#~ msgstr "Precio medio"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Informe de pedidos de venta creados"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Pedidos de ventas por categoría"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Movimiento mensual de ventas acumuladas sobre un año"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Pedidos de ventas por productos"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Movimiento mensual de ventas sobre un año"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Volumen por producto"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Pedidos de ventas por categorías"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Ventas por producto (este mes)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Movimiento mensual de ventas sobre un año"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestión de ventas"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Ventas por categoría de productos"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Movimiento mensual de ventas acumuladas sobre un año"
-
-#~ msgid "# of Products"
-#~ msgstr "# de productos"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Ventas por producto"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Pedidos de venta creados"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Volumen por meses"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Movimiento diario de ventas sobre un año"
-
-#~ msgid "Graphs"
-#~ msgstr "Resúmenes"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Volumen total"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Ventas por categoría de producto (este mes)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Movimiento diario de ventas sobre un año"
-
-#~ msgid "Create Date"
-#~ msgstr "Fecha creación"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Pedidos de venta creados"
-
-#~ msgid "Sales by State"
-#~ msgstr "Ventas por estado"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr ""
-#~ "Referencia del documento que generó esta petición de pedido de venta."
-
-#, 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: "
-#~ msgstr ""
-#~ "Ha seleccionado una cantidad de %d unidades.\n"
-#~ "Pero no es compatible con el envase seleccionado.\n"
-#~ "Aquí hay una propuesta de las cantidades de acuerdo con el envase: "
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Debe primero cancelar los movimientos de stock adjuntos a esta línea de "
-#~ "pedido de venta."
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Ventas por empresa"
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Fecha en que el pedido de venta es creado."
-
-#~ msgid "From a sale order"
-#~ msgstr "Desde un pedido de venta"
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the 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 de los "
-#~ "productos al cliente."
-
-#~ msgid "The total amount"
-#~ msgstr "El importe total."
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Venta abrir factura"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Venta realizar factura"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Venta pago anticipado factura"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Dirección de factura para el pedido de venta actual."
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de ingresos ' \\n                               "
-#~ "         'para este producto: \"%s\" (id:%d)"
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Indica que una factura ha sido pagada."
-
-#~ 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 sale 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 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 "The tax amount"
-#~ msgstr "El importe de los impuestos."
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "El albarán se crea tan pronto como el pedido de venta se confirma, en el "
-#~ "mismo momento que la orden de abastecimiento. Representa la asignación de "
-#~ "los artículos al pedido de venta. Hay un albarán por línea de pedido de "
-#~ "venta, que evoluciona con la disponibilidad de los artículos."
-
-#~ 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 términos de venta que se utilizan en la transacción comercial."
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Versión de la tarifa para el pedido de venta actual."
-
-#~ msgid "Sequence Number"
-#~ msgstr "Número secuencia"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "El pedido de venta '%s' ha sido cacelado."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Genera órdenes de abastecimiento para cada línea del pedido de venta"
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Facturar desde albarán"
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 "
-#~ "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). \n"
-#~ "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 ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "El comercial confirma el presupuesto. El estado del pedido de venta se "
-#~ "convierte en 'En progreso' o 'Manual en progreso'."
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Un pedido de venta genera una factura, tan pronto como se confirma por el "
-#~ "comercial. En función del control de facturación del pedido de venta, la "
-#~ "factura se basa en las cantidades enviadas o en las ordenadas."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* El estado 'Borrador' se establece cuando el pedido de venta asociado está "
-#~ "en el estado borrador.\n"
-#~ "* El estado 'Confirmado' se establece cuando el pedido de venta asociado se "
-#~ "confirma.\n"
-#~ "* El estado 'Excepción' se establece cuando el pedido de venta asociado "
-#~ "cambia a excepción.\n"
-#~ "* El estado 'Realizado' se establece cuando la línea del pedido de venta ha "
-#~ "sido recogida.\n"
-#~ "* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
-#~ "venta asociado."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Ventas por categoría de producto"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Estado borrador del pedido de venta"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Cantidad: "
-
-#~ msgid "Related Invoices"
-#~ msgstr "Facturas relacionadas"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Pedido de venta confirmado para facturar."
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "¡Podría no cancelar la línea de pedido de venta!"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Ventas por comercial"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Fecha en la que se ha confirmado el pedido de venta."
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Indica que el pedido de venta ha sido entregado. ¡Este campo sólo se "
-#~ "actualiza después de que el planificador ha sido ejecutado!"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Dirección de envío para el pedido de venta actual."
-
-#~ msgid "Default UoM"
-#~ msgstr "UdM por defecto"
-
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Tipo de ul: "
-
-#~ msgid "The amount without tax"
-#~ msgstr "El importe sin impuestos."
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No hay un diario de ventas definido para esta compañía: \"%s\" (id:%d)"
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr ""
-#~ "Primero debe cancelar todos los albaranes relacionados con este pedido de "
-#~ "venta."
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Por cada línea del pedido de venta, una orden de abastecimiento se ha creado "
-#~ "para suministrar el producto vendido."
-
-#~ msgid "Source document"
-#~ msgstr "Documento origen"
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Solicitud pedido de venta"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "No se puede crear la factura para esta línea del pedido de venta debido a "
-#~ "una de las siguientes razones:\n"
-#~ "1. El estado de esta línea del pedido de venta es \"borrador\" o "
-#~ "\"cancelado\".\n"
-#~ "2. La línea del pedido de venta está facturada."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "No se puede hacer un anticipo de un pedido de venta \\n que esté defino como "
-#~ "'Facturar pedido después del envío'."
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Ventas por cliente"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale 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. Conduce a la compra y a la "
-#~ "producción de productos según las normas y los parámetros del pedido de "
-#~ "venta. "
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Una orden de abastecimiento por cada línea del pedido de venta y por cada "
-#~ "uno de los componentes."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "No puede realizar un avance de factura de un pedido de venta definido como "
-#~ "'Factura automática después envío'."
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Configurar la logística de los pedidos de venta"
-
-#~ msgid "Logistics"
-#~ msgstr "Logística"
-
-#~ msgid ""
-#~ "If you have more than one shops reselling your company products, you can "
-#~ "create and manage them from here. Whenever you will record a new quotation "
-#~ "or sale 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 sale."
-#~ msgstr ""
-#~ "Si tiene más de una tienda que vende los productos de su empresa, puede "
-#~ "crearlas y gestionarlas desde aquí. Cuando cree un nuevo presupuesto o "
-#~ "pedido de venta, deb ser relacionado con una tienda. La tienda define "
-#~ "también el almacén desde el cual los productos serán enviados para cada "
-#~ "venta."
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Aquí tiene una lista de todas las líneas de pedidos de venta que deben ser "
-#~ "facturadas. Esta vista le permite facturar parcialmente pedidos de venta, "
-#~ "por líneas. No necesita esta lista si factura basándose en albaranes de "
-#~ "entrega o si factura las ventas integralmente."
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Ventas por cliente"
-
-#~ msgid ""
-#~ "Sales Orders helps you manage quotations and orders done with your "
-#~ "customers. OpenERP suggests that you to start by creating a quotation. Once "
-#~ "the order is confirmed, the quotation is converted into a Sale Order. "
-#~ "OpenERP can handle several types of products so that a sales order can "
-#~ "trigger tasks, delivery orders, manufacturing orders, purchases and so on. "
-#~ "Based on the configuration of the sale 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 venta le ayudan a gestionar presupuestos y pedidos realizados "
-#~ "por sus clientes. OpenERP le recomienda que empiece creando un presupuesto. "
-#~ "Una vez se confirma el presupuesto, se convierte en un pedido de venta. "
-#~ "OpenERP puede gestionar varios tipos de productos de forma que el pedido de "
-#~ "venta puede crear tareas, albaranes, órdenes de fabricación, de compra, etc. "
-#~ "En función de la configuración del pedido de venta, se generará una factura "
-#~ "borrador para que únicamente tenga que confirmarla para facturar a su "
-#~ "cliente."
-
-#~ msgid "Sales Dashboard"
-#~ msgstr "Tablero de ventas"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index fcbc1f5d565..459cf60bd97 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2062,12 +2062,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entrega, desde el almacén hasta el cliente."
 
-#~ msgid "Customer Ref."
-#~ msgstr "Referencia de cliente"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Factura a partir del empaque"
-
 #~ msgid "Invoice after delivery"
 #~ msgstr "Facturar después de la entrega"
 
@@ -2077,9 +2071,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Reference"
 #~ msgstr "Referencia"
 
-#~ msgid "Shop name"
-#~ msgstr "Nombre de la sucursal"
-
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2135,20 +2126,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Abastecimiento de la orden de venta"
 
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Indica el estado del presupuesto u orden. El estado de excepción se "
-#~ "establece automáticamente cuando una operación de cancelación ocurre en la "
-#~ "validación de las facturas (Excepción de factura) o en la gestión de los "
-#~ "empaques (Excepción de envío). El estado 'Esperando fecha planificada' se "
-#~ "establece cuando la factura se confirma pero la fecha actual es anterior a "
-#~ "la 'Fecha ordenada'."
-
 #~ msgid "Total amount"
 #~ msgstr "Importe total"
 
@@ -2158,49 +2135,15 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Sales orders"
 #~ msgstr "Órdenes de venta"
 
-#~ msgid "Number packages"
-#~ msgstr "Número de paquetes"
-
 #~ msgid "Payment accounts"
 #~ msgstr "Cuentas de pago"
 
 #~ msgid "Draft Invoice"
 #~ msgstr "Factura borrador"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en proceso"
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "La política de envío se utiliza para sincronizar los procesos de facturación "
-#~ "y entrega.\n"
-#~ "  - La opción 'Pago antes de la entrega' generará primero la factura y "
-#~ "después del pago de esta factura generará el empaque.\n"
-#~ "  - La opción 'Enviar & Factura manual' creará el empaque directamente y "
-#~ "esperará a que el usuario manualmente haga clic sobre el botón de 'Factura' "
-#~ "para generar la factura borrador.\n"
-#~ "  - La opción 'Facturar pedido después del envío' generará la factura "
-#~ "borrador basada en el pedido de venta después de que todos los empaques "
-#~ "hayan sido finalizados.\n"
-#~ "  - La opción 'Factura a partir de los empaques' se utiliza para crear una "
-#~ "factura durante el proceso de empaquetado."
-
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Órdenes de venta a facturar"
 
-#~ msgid "In progress"
-#~ msgstr "En proceso"
-
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "No pudo cancelar la orden de venta !"
@@ -2233,9 +2176,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Mis ventas en excepción de envío"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Cantidad (UdV)"
-
 #~ msgid "Status"
 #~ msgstr "Estado"
 
@@ -2251,19 +2191,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Sale Procurement"
 #~ msgstr "Abastecimiento de venta"
 
-#~ msgid "Related Packings"
-#~ msgstr "Empaques relacionados"
-
 #~ msgid "One procurement for each product."
 #~ msgstr "Un abastecimiento por cada producto."
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Si no tiene suficiente stock disponible para enviarlo todo a la vez, acepta "
-#~ "envíos parciales o no."
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Lista de precios de venta"
 
@@ -2273,11 +2203,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Make Invoice"
 #~ msgstr "Crear factura"
 
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Primero debe cancelar todos los empaques asociados a esta orden de venta."
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Se crea un empaque de salida OUT para productos almacenables."
 
@@ -2311,9 +2236,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Abrir anticipo factura"
 
-#~ msgid "Product UOS"
-#~ msgstr "UdV del producto"
-
 #~ msgid "Deliver"
 #~ msgstr "Entregar"
 
@@ -2324,12 +2246,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "¡No se puede cancelar esta orden de venta !"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "¡No se puede cancelar una línea de la orden de venta que ya ha sido "
-#~ "facturada!"
-
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Lista de precios de compra"
 
@@ -2516,31 +2432,6 @@ msgstr "Facturar desde órdenes de entrega"
 #~ "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 ""
-#~ "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 After 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 los procesos de facturación "
-#~ "y entrega..\n"
-#~ " - La opción 'Pago antes de la entrega' generará primero la factura y "
-#~ "después del pago de esta factura se generará el remito.\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 orden después de la entrega' generará la factura "
-#~ "borrador basada en la orden de venta, después de que todos los remitos hayan "
-#~ "sido procesados.\n"
-#~ " - La opción 'Factura desde remito' se utiliza para crear una factura "
-#~ "durante el proceso de los remitos."
-
 #~ 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 "
@@ -2604,117 +2495,3 @@ msgstr "Facturar desde órdenes de entrega"
 
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Después de confirmar la orden, crear la factura."
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Tablero del vendedor"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Casos del mes"
-
-#~ msgid "My open quotations"
-#~ msgstr "Mis cotizaciones abiertas"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Estadísticas de casos"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Mejores diez ventas del mes"
-
-#~ msgid "Average Price"
-#~ msgstr "Precio promedio"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Reporte de orden de venta creada"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Órdenes de venta por categoría"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Facturación acumulada mensual durante un año"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Órdenes de venta por productos"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Facturación acumulada mensual durante un año"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Facturación por producto"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Órdenes de venta por categoría"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Ventas por producto (este mes)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Facturación acumulada mensual durante un año"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Gestión de ventas - Reportes"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Ventas por categoría de productos"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Facturación acumulada mensual durante un año"
-
-#~ msgid "# of Products"
-#~ msgstr "# de productos"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Ventas por producto"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Órdenes de venta creadas"
-
-#~ msgid "Reporting"
-#~ msgstr "Reportes"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Facturación por mes"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Facturación de ventas diarias durante un año"
-
-#~ msgid "Graphs"
-#~ msgstr "Gráficos"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Facturación total"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Ventas por categoría de producto (este mes)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Facturación de ventas diarias durate un año"
-
-#~ msgid "Create Date"
-#~ msgstr "Fecha de creación"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Órdenes de venta creadas"
-
-#~ msgid "Sales by State"
-#~ msgstr "Ventas por provincia"
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index bb7fa71c8b1..bda9cda990f 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -7,15 +7,14 @@ 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-14 04:38+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-10-06 16:03+0000\n"
+"Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -34,8 +33,8 @@ 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?"
+"Si no dispone de suficiente stock disponible para enviarlo todo a la vez, "
+"¿acepta envíos parciales?"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
@@ -140,6 +139,14 @@ msgid ""
 "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
@@ -791,6 +798,28 @@ msgid ""
 "    * 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
@@ -953,7 +982,7 @@ msgstr "Basado en las cantidades enviadas o ordenadas."
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr "Albarán relacionado"
+msgstr "Guía de despacho relacionada"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -1055,7 +1084,7 @@ msgstr "título"
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr "Albarán"
+msgstr "Guía de despacho"
 
 #. module: sale
 #: view:sale.order:0
@@ -1102,7 +1131,7 @@ 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 stock"
+msgstr "Movimiento de stock"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1138,7 +1167,7 @@ msgstr "Factura basada en pedidos de venta"
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
+msgstr "LIsta de guías de despacho"
 
 #. module: sale
 #: code:addons/sale/sale.py:387
@@ -1324,7 +1353,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr "Albarán y Orden de entrega"
+msgstr "Guía de despacho y Orden de entrega"
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -2037,6 +2066,11 @@ msgid ""
 "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
@@ -2164,92 +2198,6 @@ msgstr "Año"
 msgid "Invoice Based on Deliveries"
 msgstr "Facturar desde albaranes"
 
-#~ msgid "Sales Dashboard"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Factura a partir de los albaranes"
-
-#~ msgid "Shop name"
-#~ msgstr "Nombre de tienda"
-
-#~ msgid "Number packages"
-#~ msgstr "Número de paquetes"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Cantidad (UdV)"
-
-#~ msgid "Product UOS"
-#~ msgstr "UdV del producto"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en progreso"
-
-#~ msgid "In progress"
-#~ msgstr "En progreso"
-
-#~ msgid "Customer Ref."
-#~ msgstr "Referencia de cliente"
-
-#~ msgid "Related Packings"
-#~ msgstr "Albaranes relacionados"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Indica el estado del presupuesto o pedido. El estado de excepción se "
-#~ "establece automáticamente cuando una operación de cancelación ocurre en la "
-#~ "validación de las facturas (Excepción de factura) o en la gestión de los "
-#~ "albaranes (Excepción de envío). El estado 'Esperando fecha planificada' se "
-#~ "establece cuando la factura se confirma pero la fecha actual es anterior a "
-#~ "la 'Fecha ordenada'."
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Si no tiene suficiente stock disponible para enviarlo todo a la vez, acepta "
-#~ "envíos parciales o no."
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Primero debe cancelar todos los albaranes asociados a este pedido de venta."
-
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "¡No se puede cancelar una línea del pedido de venta que ya ha sido facturada!"
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "La política de envío se utiliza para sincronizar los procesos de facturación "
-#~ "y envío.\n"
-#~ "  - La opción 'Pago antes del envío' generará primero la factura y después "
-#~ "del pago de esta factura generará el albarán.\n"
-#~ "  - La opción 'Enviar & Factura manual' creará el albarán directamente y "
-#~ "esperará a que el usuario manualmente haga clic sobre el botón de 'Factura' "
-#~ "para generar la factura borrador.\n"
-#~ "  - La opción 'Facturar pedido después del envío' generará la factura "
-#~ "borrador basada en el pedido de venta después de que todos los albaranes "
-#~ "hayan sido finalizados.\n"
-#~ "  - La opción 'Factura a partir de los albaranes' se utiliza para crear una "
-#~ "factura durante el proceso de empaquetado."
-
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar la logística de los pedidos de venta"
 
@@ -2645,31 +2593,6 @@ 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 ""
-#~ "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 After 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 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 ""
 #~ "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 "
@@ -2712,503 +2635,3 @@ msgstr "Facturar desde albaranes"
 #~ "hayan procesado.\n"
 #~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
 #~ "durante el proceso de los albaranes."
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Casos del mes"
-
-#~ msgid "My open quotations"
-#~ msgstr "Mis presupuestos abiertos"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Estadística de casos"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Primeras diez ventas del mes"
-
-#~ msgid "Average Price"
-#~ msgstr "Precio medio"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Informe de pedidos de venta creados"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Pedidos de ventas por categoría"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Movimiento mensual de ventas acumuladas sobre un año"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Pedidos de ventas por productos"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Movimiento mensual de ventas sobre un año"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Volumen por producto"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Pedidos de ventas por categorías"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Ventas por producto (este mes)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Movimiento mensual de ventas sobre un año"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestión de ventas"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Ventas por categoría de productos"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Movimiento mensual de ventas acumuladas sobre un año"
-
-#~ msgid "# of Products"
-#~ msgstr "# de productos"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Ventas por producto"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Pedidos de venta creados"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Volumen por meses"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Movimiento diario de ventas sobre un año"
-
-#~ msgid "Graphs"
-#~ msgstr "Resúmenes"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Volumen total"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Ventas por categoría de producto (este mes)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Movimiento diario de ventas sobre un año"
-
-#~ msgid "Create Date"
-#~ msgstr "Fecha creación"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Pedidos de venta creados"
-
-#~ msgid "Sales by State"
-#~ msgstr "Ventas por estado"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr ""
-#~ "Referencia del documento que generó esta petición de pedido de venta."
-
-#, 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: "
-#~ msgstr ""
-#~ "Ha seleccionado una cantidad de %d unidades.\n"
-#~ "Pero no es compatible con el envase seleccionado.\n"
-#~ "Aquí hay una propuesta de las cantidades de acuerdo con el envase: "
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Debe primero cancelar los movimientos de stock adjuntos a esta línea de "
-#~ "pedido de venta."
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Ventas por empresa"
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Fecha en que el pedido de venta es creado."
-
-#~ msgid "From a sale order"
-#~ msgstr "Desde un pedido de venta"
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the 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 de los "
-#~ "productos al cliente."
-
-#~ msgid "The total amount"
-#~ msgstr "El importe total."
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Venta abrir factura"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Venta realizar factura"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Venta pago anticipado factura"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Dirección de factura para el pedido de venta actual."
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de ingresos ' \\n                               "
-#~ "         'para este producto: \"%s\" (id:%d)"
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Indica que una factura ha sido pagada."
-
-#~ 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 sale 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 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 "The tax amount"
-#~ msgstr "El importe de los impuestos."
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "El albarán se crea tan pronto como el pedido de venta se confirma, en el "
-#~ "mismo momento que la orden de abastecimiento. Representa la asignación de "
-#~ "los artículos al pedido de venta. Hay un albarán por línea de pedido de "
-#~ "venta, que evoluciona con la disponibilidad de los artículos."
-
-#~ 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 términos de venta que se utilizan en la transacción comercial."
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Versión de la tarifa para el pedido de venta actual."
-
-#~ msgid "Sequence Number"
-#~ msgstr "Número secuencia"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "El pedido de venta '%s' ha sido cacelado."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Genera órdenes de abastecimiento para cada línea del pedido de venta"
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Facturar desde albarán"
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 "
-#~ "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). \n"
-#~ "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 ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "El comercial confirma el presupuesto. El estado del pedido de venta se "
-#~ "convierte en 'En progreso' o 'Manual en progreso'."
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Un pedido de venta genera una factura, tan pronto como se confirma por el "
-#~ "comercial. En función del control de facturación del pedido de venta, la "
-#~ "factura se basa en las cantidades enviadas o en las ordenadas."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* El estado 'Borrador' se establece cuando el pedido de venta asociado está "
-#~ "en el estado borrador.\n"
-#~ "* El estado 'Confirmado' se establece cuando el pedido de venta asociado se "
-#~ "confirma.\n"
-#~ "* El estado 'Excepción' se establece cuando el pedido de venta asociado "
-#~ "cambia a excepción.\n"
-#~ "* El estado 'Realizado' se establece cuando la línea del pedido de venta ha "
-#~ "sido recogida.\n"
-#~ "* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
-#~ "venta asociado."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Ventas por categoría de producto"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Estado borrador del pedido de venta"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Cantidad: "
-
-#~ msgid "Related Invoices"
-#~ msgstr "Facturas relacionadas"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Pedido de venta confirmado para facturar."
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "¡Podría no cancelar la línea de pedido de venta!"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Ventas por comercial"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Fecha en la que se ha confirmado el pedido de venta."
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Indica que el pedido de venta ha sido entregado. ¡Este campo sólo se "
-#~ "actualiza después de que el planificador ha sido ejecutado!"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Dirección de envío para el pedido de venta actual."
-
-#~ msgid "Default UoM"
-#~ msgstr "UdM por defecto"
-
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Tipo de ul: "
-
-#~ msgid "The amount without tax"
-#~ msgstr "El importe sin impuestos."
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No hay un diario de ventas definido para esta compañía: \"%s\" (id:%d)"
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr ""
-#~ "Primero debe cancelar todos los albaranes relacionados con este pedido de "
-#~ "venta."
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Por cada línea del pedido de venta, una orden de abastecimiento se ha creado "
-#~ "para suministrar el producto vendido."
-
-#~ msgid "Source document"
-#~ msgstr "Documento origen"
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Solicitud pedido de venta"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "No se puede crear la factura para esta línea del pedido de venta debido a "
-#~ "una de las siguientes razones:\n"
-#~ "1. El estado de esta línea del pedido de venta es \"borrador\" o "
-#~ "\"cancelado\".\n"
-#~ "2. La línea del pedido de venta está facturada."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "No se puede hacer un anticipo de un pedido de venta \\n que esté defino como "
-#~ "'Facturar pedido después del envío'."
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Ventas por cliente"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale 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. Conduce a la compra y a la "
-#~ "producción de productos según las normas y los parámetros del pedido de "
-#~ "venta. "
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Una orden de abastecimiento por cada línea del pedido de venta y por cada "
-#~ "uno de los componentes."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "No puede realizar un avance de factura de un pedido de venta definido como "
-#~ "'Factura automática después envío'."
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Configurar la logística de los pedidos de venta"
-
-#~ msgid "Logistics"
-#~ msgstr "Logística"
-
-#~ msgid ""
-#~ "If you have more than one shops reselling your company products, you can "
-#~ "create and manage them from here. Whenever you will record a new quotation "
-#~ "or sale 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 sale."
-#~ msgstr ""
-#~ "Si tiene más de una tienda que vende los productos de su empresa, puede "
-#~ "crearlas y gestionarlas desde aquí. Cuando cree un nuevo presupuesto o "
-#~ "pedido de venta, deb ser relacionado con una tienda. La tienda define "
-#~ "también el almacén desde el cual los productos serán enviados para cada "
-#~ "venta."
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Aquí tiene una lista de todas las líneas de pedidos de venta que deben ser "
-#~ "facturadas. Esta vista le permite facturar parcialmente pedidos de venta, "
-#~ "por líneas. No necesita esta lista si factura basándose en albaranes de "
-#~ "entrega o si factura las ventas integralmente."
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Ventas por cliente"
-
-#~ msgid ""
-#~ "Sales Orders helps you manage quotations and orders done with your "
-#~ "customers. OpenERP suggests that you to start by creating a quotation. Once "
-#~ "the order is confirmed, the quotation is converted into a Sale Order. "
-#~ "OpenERP can handle several types of products so that a sales order can "
-#~ "trigger tasks, delivery orders, manufacturing orders, purchases and so on. "
-#~ "Based on the configuration of the sale 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 venta le ayudan a gestionar presupuestos y pedidos realizados "
-#~ "por sus clientes. OpenERP le recomienda que empiece creando un presupuesto. "
-#~ "Una vez se confirma el presupuesto, se convierte en un pedido de venta. "
-#~ "OpenERP puede gestionar varios tipos de productos de forma que el pedido de "
-#~ "venta puede crear tareas, albaranes, órdenes de fabricación, de compra, etc. "
-#~ "En función de la configuración del pedido de venta, se generará una factura "
-#~ "borrador para que únicamente tenga que confirmarla para facturar a su "
-#~ "cliente."
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index bb4c017894a..09ca639be4c 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2308,31 +2308,6 @@ msgstr "Facturar desde albaranes"
 #~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
 #~ "a facturas."
 
-#~ 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 After 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 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 "Sales order lines"
 #~ msgstr "Líneas del pedido de ventas"
 
@@ -2475,175 +2450,16 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sale Order line"
 #~ msgstr "Línea pedido de venta"
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Tablero de ventas"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Casos del mes"
-
-#~ msgid "My open quotations"
-#~ msgstr "Mis presupuestos abiertos"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Estadística de casos"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Primeras diez ventas del mes"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Informe de pedidos de venta creados"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Pedidos de ventas por categoría"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Movimiento mensual de ventas acumuladas sobre un año"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Pedidos de ventas por productos"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Movimiento mensual de ventas sobre un año"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Volumen por producto"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Pedidos de ventas por categorías"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Ventas del mes"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Ventas por producto (este mes)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Movimiento mensual de ventas sobre un año"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestión de ventas"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Ventas por categoría de productos"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Movimiento mensual de ventas acumuladas sobre un año"
-
-#~ msgid "# of Products"
-#~ msgstr "# de productos"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Ventas por producto"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Pedidos de venta creados"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Volumen por meses"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Movimiento diario de ventas sobre un año"
-
-#~ msgid "Graphs"
-#~ msgstr "Resúmenes"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manual en proceso"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Volumen total"
-
-#~ msgid "In progress"
-#~ msgstr "En proceso"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Ventas por categoría de producto (este mes)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Movimiento diario de ventas sobre un año"
-
-#~ msgid "Create Date"
-#~ msgstr "Fecha creación"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Pedidos de venta creados"
-
-#~ msgid "Sales by State"
-#~ msgstr "Ventas por estado"
-
 #~ 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 ""
-#~ "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: "
-#~ msgstr ""
-#~ "Usted seleccionó una cantidad de %d unidades.\n"
-#~ "Pero no es compatible con el Paquete seleccionado.\n"
-#~ "Esta es una proposition de cantidades de acuerdo al empaquetamiento: "
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Ventas por Empresa"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Referencia del documento que generó ésta orden de pedido."
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Primero debe cancelar los movimientos de stock asociados a esta línea de "
-#~ "pedido."
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "¡Imposible eliminar una línea de pedido que está %s!"
-
-#~ msgid "Average Price"
-#~ msgstr "Precio promedio"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Fecha en la que la orden de compras es creada"
-
-#~ msgid "From a sale order"
-#~ msgstr "De una orden de pedido"
-
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "¡No se puede cancelar la orden de pedido!"
 
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
 #~ msgid "Our Salesman"
 #~ msgstr "Nuestro vendedor"
 
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Factura pendiente de venta"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2660,380 +2476,22 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "¡No es posible cancelar esta orden de pedido!"
 
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "La petición '%s' fue convertida en un pedido de venta."
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Número de días entre la confirmación de envio de los productos a el cliente."
-
-#~ msgid "The total amount"
-#~ msgstr "Monto total"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Direccion de entrega de factura de la actual orden de pedido"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Factura de Pago avanzado de pedido"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Cuenta analítica relacionada a la orden de pedido"
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No existe cuenta income definida ' \\n\n"
-#~ "                                        'para este producto: \"%s\" (id:%d)"
-
-#~ msgid "Unit of Measure "
-#~ msgstr "Unidad de medida "
-
 #, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "¡No es posible eliminar ordenes de pedidos que fueron confirmadas!"
 
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Una orden de abastecimiento por cada línea de pedido y por cada componente."
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Sale Make Invoice"
-
-#~ 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 sale 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íos es usada para sincronizar la factura y las operaciones "
-#~ "de entrega.\n"
-#~ "  - 'Pague antes de la entrega', primero generará la factura y después del "
-#~ "pago de ésta, generará la orden de picking.\n"
-#~ "  - 'Envío y Facturación Manual' creará la orden de picking directamente y "
-#~ "esperará a que el usuario manualmente haga click en 'Facturar' para generar "
-#~ "la factura borrador.\n"
-#~ "  - 'Factura de Pedido después de la entrega' generará la factura borrador "
-#~ "basado en la orden de pedido después de que todas las listas picking se "
-#~ "hayan completado.\n"
-#~ "  - 'Factura desde el picking' es utilizado para crear una factura durante "
-#~ "el proceso de picking."
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Indica que una factura ha sido pagada"
-
-#~ msgid "Gives the sequence order when displaying a list of sale order lines."
-#~ msgstr ""
-#~ "Genera la secuencia de la orden cuando se muestra una lista de líneas de "
-#~ "pedido"
-
-#~ msgid "The tax amount"
-#~ msgstr "Impuestos"
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "El formulario de paquete de productos se crea inmediatamente al confirmar el "
-#~ "pedido, al mismo tiempo que la orden de abastecimiento. Esto representa la "
-#~ "asignación de partes a la orden de pedido. Hay un solo paquete de productos "
-#~ "por orden de pedido la cual esta formada por las partes disponbles."
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Versión de la lista de precios de la actual orden de pedido"
-
 #~ msgid "Sale Order Line"
 #~ msgstr "Línea de 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 ('International Commercial terms') implica una serie de términos de "
-#~ "ventas que son usados en las transacciones comerciales."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "La orden de pedido '%s' fue marcada como borrador."
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "La orden de pedido '%s' fue cancelada."
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Factura de entrega"
-
 #~ 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"
 
-#~ msgid ""
-#~ "\n"
-#~ "    The base module to manage quotations and sales orders.\n"
-#~ "\n"
-#~ "    * Workflow with validation steps:\n"
-#~ "        - Quotation -> Sale 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"
-#~ "    Módulo base para manejar peticiones y ordenes de pedidos.\n"
-#~ "\n"
-#~ "    * Flujo con pasos de validación:\n"
-#~ "        - Peticiones -> Orden de pedido -> Factura\n"
-#~ "    * Métodos de facturación:\n"
-#~ "        - Facturación en el pedido (antes o despues del envío)\n"
-#~ "        - Facturacion en la entrega\n"
-#~ "        - Facturación planificada (timesheets)\n"
-#~ "        - Facturación avanzada\n"
-#~ "    * Preferencias de Clientes/Empresas (envío, facturación, incoterm, ...)\n"
-#~ "    * Stock de productos y precios\n"
-#~ "    * Métodos de entrega:\n"
-#~ "        - Todo en uno, multi-parcial\n"
-#~ "        - Costos de entrega\n"
-#~ "    * Dashboard para los vendedores que incluye:\n"
-#~ "    * Peticiones pendientes\n"
-#~ "    * Mejores 10 ventas del mes\n"
-#~ "    * Estadísticas de casos\n"
-#~ "    * Gráfico de ventas por producto\n"
-#~ "    * Gráfico de casos del mes\n"
-#~ "    "
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Una orden de pedido genera una factura imediatamenteal confirmarla por el "
-#~ "vendedor. Dependiendo del control de facturación de la orden de pedido, la "
-#~ "factura está basada en la entrega o en la cantidad ordenada."
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Dado el estado de la petición o la orden de pedido.\n"
-#~ "El estado de excepción se fija automáticamente cuando una operación de "
-#~ "cancelación ocurre en la validación de facturación (Invoice Exception) o en "
-#~ "el proceso de paquete de productos (Shipping Exception).\n"
-#~ "El estado 'Esperando planificación' se fija cuando la factura es confirmada "
-#~ "pero esperando a que el planificador se ejecute en la fecha 'Fecha de "
-#~ "pedido'."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* El estado 'Borrador' se fija cuando se crea la orden de pedido.\n"
-#~ "\n"
-#~ "* El estado 'Confirmado' se fija cuando la orden es confirmada.\n"
-#~ "\n"
-#~ "* El estado 'Excepción' se fija cuando la orden es marcada como excepción.\n"
-#~ "\n"
-#~ "* El estado 'Hecho' se fija cuando la orden ha sido picked.\n"
-#~ "\n"
-#~ "* El estado 'Cancelado' se fija cuando un usuario cancela la orden."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Pedidos por categoria de productos"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Quantity: "
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Medios de ordenes de abastecimiento de cada línea de pedido."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No se puede crear menús recursivos."
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Estado de borrador de la orden de pedido"
-
-#~ msgid "Related Invoices"
-#~ msgstr "Facturas relacionadas"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Orden de pedido confirmada para facturar."
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "¡No puede cancelar la línea de pedido!"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Fecha en la que el orden es confirmada"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Ventas por vendedor"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Dirección de envío de la actual orden de pedido"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Indica que la orden de pedido fue entregada. ¡Este campo se actualiza sólo "
-#~ "después de que el planificador fue ejecutado!"
-
 #, 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 "Default UoM"
-#~ msgstr "UdM por defecto"
-
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Tipo of ul: "
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr "Debe primero cancelar todos paquetes de este pedido de venta."
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "No existe diario de ventas definido para esta compañia: \"%s\" (id:%d)"
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Para cada línea de pedido, una orden abastecimiento es creada para "
-#~ "suministrar el producto vendido."
-
-#~ msgid "Source document"
-#~ msgstr "Documento de origen"
-
-#~ msgid "The amount without tax"
-#~ msgstr "El monto sin impuestos"
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Requisición de pedido de venta"
-
 #~ msgid "Payment Terms"
 #~ msgstr "Terminos de pago"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "La factura no puede ser creada para esta pedido de venta por 2 razones:\n"
-#~ "1. El estado de este pedido es \"Borrador\" o \"Cancelado\"\n"
-#~ "2. ¡El pedido ya fue facturado!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Reglas no están soportadas para objetos osv_memory!"
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "El vendedor confirma la petición. El estado del pedido de venta será 'En "
-#~ "proceso' o 'Manual en proceso'"
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Ventas por cliente"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "No se puede hacer un anticipo del pedido de venta \\n\n"
-#~ "                             que está definido como 'Facturación automática "
-#~ "después de la entrega'"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Una orden de abastecimiento se crea automáticamente el momento de confirmar "
-#~ "el pedido de venta o al pagar la factura. Esto guía la compra o la "
-#~ "fabricación de productos en cuanto a las reglas y parametros de los pedidos "
-#~ "de ventas. "
-
-#~ msgid "Sequence Number"
-#~ msgstr "Secuencia Numerica"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Aquí tiene una lista de todas las líneas de pedidos de venta que deben ser "
-#~ "facturadas. Esta vista le permite facturar parcialmente pedidos de venta, "
-#~ "por líneas. No necesita esta lista si factura basándose en albaranes de "
-#~ "entrega o si factura las ventas integralmente."
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Ventas por cliente"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "No puede realizar un avance de factura de un pedido de venta definido como "
-#~ "'Factura automática después envío'."
-
-#~ msgid ""
-#~ "If you have more than one shops reselling your company products, you can "
-#~ "create and manage them from here. Whenever you will record a new quotation "
-#~ "or sale 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 sale."
-#~ msgstr ""
-#~ "Si tiene más de una tienda que vende los productos de su empresa, puede "
-#~ "crearlas y gestionarlas desde aquí. Cuando cree un nuevo presupuesto o "
-#~ "pedido de venta, deb ser relacionado con una tienda. La tienda define "
-#~ "también el almacén desde el cual los productos serán enviados para cada "
-#~ "venta."
diff --git a/addons/sale/i18n/es_MX.po b/addons/sale/i18n/es_MX.po
new file mode 100644
index 00000000000..b567f32a1e7
--- /dev/null
+++ b/addons/sale/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/i18n/es_MX.po.moved b/addons/sale/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..5087f1b6b81
--- /dev/null
+++ b/addons/sale/i18n/es_MX.po.moved
@@ -0,0 +1,1987 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-05 15:17+0000\n"
+"PO-Revision-Date: 2011-07-05 15:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \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 vendedor ú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 ordenes 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 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 "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 la recoleccion\" 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 Packing"
+
+#. 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 la orden después del pago de dicha factura.\n"
+"  -La opción 'Envío y factura manual' creará la orden 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 las ordenes hayan sido realizadas.\n"
+"  -La opción 'Facturar desde orden' 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 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: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 "Monto 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 "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.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 "Lista de precios"
+
+#. 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 de la orden\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 ordenadas."
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Orden 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
+#: 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 lista empaque"
+
+#. 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 "Ordenes 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 "Lista de empaque"
+
+#. 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 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
+#: 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 "Lista de empaque"
+
+#. 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 de la Lista de empaque!"
+
+#. 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 la orden"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contador."
+
+#. 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 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
+#: 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 "Orden 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 todas las ordenes 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
+#: 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 de la orden (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 ordenada\"."
+
+#. 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 ordenada"
+
+#. 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 enviadas o vendidas. Por lo tanto, un pedido de venta puede generar una factura o una orden tan pronto como sea confirmada por el vendedor."
+
+#. 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 ordenes 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 empaquetado seleccionado.\n"
+"Aquí tiene una propuesta de cantidades acordes con este empaquetado:\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 "La orden 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 orden 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 se pueden 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 "Vendedor"
+
+#. 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 "Monto sin impuestos"
+
+#. 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 "Paquetes"
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de 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 ordenada"
+
+#. 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
+#: 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 ordenes 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 basado en las entregas"
+
diff --git a/addons/sale/i18n/es_VE.po b/addons/sale/i18n/es_VE.po
new file mode 100644
index 00000000000..b567f32a1e7
--- /dev/null
+++ b/addons/sale/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/i18n/et.po b/addons/sale/i18n/et.po
index f1e4abc3879..c3301eddd1d 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-15 21:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:sale.order:0
@@ -148,7 +148,7 @@ msgstr "Maksmine enne kohaletoimetamist"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Hoiatus!"
 
 #. module: sale
 #: report:sale.order:0
@@ -190,7 +190,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: sale
 #: view:sale.order:0
@@ -281,7 +281,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "Kuupäevad"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -2078,54 +2078,16 @@ msgstr ""
 msgid "Invoice Based on Deliveries"
 msgstr "Arve kohaletoimetamiste põhjal"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Kliendi viide"
-
-#~ msgid "In progress"
-#~ msgstr "Töös"
-
-#~ msgid "Shop name"
-#~ msgstr "Poe nimi"
-
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr "Sa ei saa tühistada müügitellimuse rida mis on juba arveks tehtud !"
-
 #~ msgid "Sales Configuration"
 #~ msgstr "Müükide seadistused"
 
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Minu müügitellimused mis ootavad arvet"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Edenemisel käsitsi"
-
-#~ msgid "Number packages"
-#~ msgstr "Pakkide arv"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr "Viga: vaikimisi MÜ ja ostu MÜ peavad olema samast kategooriast."
 
-#~ msgid "Related Packings"
-#~ msgstr "Seotud pakkimised"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Kogus (TÜ)"
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Kas sa aktsepteerid osalist tarnimist, kui sul pole piisavalt laovarusid, et "
-#~ "tarnida kõik korraga."
-
-#~ msgid "Product UOS"
-#~ msgstr "Toote TÜ"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Arve pakkimiselt"
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Loo hange uuesti"
 
@@ -2379,12 +2341,6 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr "Sa ei saa tühistada müügikorralduse rida, mis on juba arveldatud!"
 
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Sa pead kõigepealt tühistama kõik pakkimised, mis sellele müügikorraldusele "
-#~ "lisatud."
-
 #, python-format
 #~ msgid "You must first cancel all packing attached to this sale order."
 #~ msgstr ""
@@ -2481,120 +2437,3 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgstr ""
 #~ "Seda seadistuse sammu kasutatakse seadmaks vaikimisi tarnimise reeglit, kui "
 #~ "luuakse müügikorraldus"
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Töölaud müükide jaoks"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Müügi töölaud"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Kuu müügid"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Müügijuhataja laud"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Kuu juhtumid"
-
-#~ msgid "My open quotations"
-#~ msgstr "Minu avatud hinnapakkumised"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Juhtumite statistika"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Kuu müükide top 10"
-
-#~ msgid "Average Price"
-#~ msgstr "Keskmine hind"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Loodud müügikorralduse aruanne"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Müügikorraldused kategooria kaupa"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Kuu kumuleeritud müükide käive ühe aasta jooksul"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Müügikorraldused toodete kaupa"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Kuu müükide käive ühe aasta jooksul"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Käive toote kohta"
-
-#~ msgid "All Months"
-#~ msgstr "Kõik kuud"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Müügikorraldused kategooria kaupa"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Kuu müügid"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Müügid toote kaupa (see kuu)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Kuu müükide käive ühe aasta jooksul"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Müügihaldus - Aruandlus"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Müügid toote kategooriate kaupa"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Kuu kumuleeritud müükide käive ühe aasta jooksul"
-
-#~ msgid "# of Products"
-#~ msgstr "Toodete arv"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Müügid toodete kaupa"
-
-#~ msgid "This Month"
-#~ msgstr "Käesolev kuu"
-
-#~ msgid "Categories"
-#~ msgstr "Kategooriad"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Loodud müügikorraldused"
-
-#~ msgid "Reporting"
-#~ msgstr "Aruandlus"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Käive kuu kohta"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Päeva müükide käive ühe aasta jooksul"
-
-#~ msgid "Graphs"
-#~ msgstr "Graafikud"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Kogu käive"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Müügid toote kategooriate kaupa (see kuu)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Päeva müükide käive ühe aasta jooksul"
-
-#~ msgid "Create Date"
-#~ msgstr "Loomise kuupäev"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Loodud müügikorraldused"
-
-#~ msgid "Sales by State"
-#~ msgstr "Müügid oleku kaupa"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Seadista müügikorralduse logistika"
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 33fdb7d2807..40844278015 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -26,7 +26,7 @@ msgstr "Myynnit Myyjittäin viimeisen 90 päivän ajalta"
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
+msgstr "Mahdollistaa kuljetuskustannusten laskennan tarjouksellesi."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -63,7 +63,7 @@ msgstr "Peruuta tilaus"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr ""
+msgstr "Konfiguroi myyntitilauksen logistiikan"
 
 #. module: sale
 #: code:addons/sale/sale.py:603
@@ -90,7 +90,7 @@ msgstr "ALV"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "Ohjaa hankintatilauksia jokaiselle myyntitilausriville"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -112,11 +112,15 @@ msgid ""
 "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
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "Hankinta tilaus"
 
 #. module: sale
 #: view:sale.report:0
@@ -166,7 +170,7 @@ msgstr "Oletusmaksuehto"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Määritellään myyntitilauksen poimintasäännöt"
 
 #. module: sale
 #: view:sale.order:0
@@ -189,7 +193,7 @@ msgstr "Pakota luovutus"
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Ruksi laatikko ryhmitelläksesi samalle asiakkaalle menevät laskut."
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -199,7 +203,7 @@ msgstr "Tilatut määrät"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr ""
+msgstr "Myyjän myynti"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
@@ -215,7 +219,7 @@ msgstr "Tilauksen viite"
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Lisätiedot"
 
 #. module: sale
 #: view:sale.order:0
@@ -228,16 +232,18 @@ 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
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Myynti luo lasku"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "Luo pakkaus uudelleen"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -316,16 +322,18 @@ 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 !"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguroi"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Erä ei ole samaa tuotetta"
 
 #. module: sale
 #: code:addons/sale/sale.py:620
@@ -352,7 +360,7 @@ msgstr "Myyntitilausten Tilastot"
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Myyntitilaukseen liitetty analyyttinen tili."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -388,6 +396,7 @@ 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
@@ -397,7 +406,7 @@ msgstr "Tarjouksen Päiväys"
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Verosijainti"
+msgstr "Taloudellinen tilanne"
 
 #. module: sale
 #: view:sale.order:0
@@ -422,18 +431,22 @@ 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:971
 #, 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:1042
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "(ei saatavilla)"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -441,6 +454,8 @@ 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
@@ -454,6 +469,8 @@ 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
@@ -466,12 +483,12 @@ msgstr "Huomautukset"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Laskutusosoite nykyiselle myyntitilaukselle"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
-msgstr ""
+msgstr "paranna perusmyyntiohjelmistoasi lisätoiminnoilla"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -487,7 +504,7 @@ msgstr "Toimitusmääräys"
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Vahvistuspvm"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -497,7 +514,7 @@ msgstr "Jakelukumppani"
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -507,7 +524,7 @@ msgstr "Maaliskuu"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Kokonaismäärä"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -525,6 +542,8 @@ 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
@@ -532,6 +551,9 @@ 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
@@ -557,7 +579,7 @@ msgstr "Rivien lukumäärä"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Myynti Avaa lasku"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -568,7 +590,7 @@ msgstr "Myyntitilauksen Rivi"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "Aseta myynnin työkulu ja oletusarvot"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -699,7 +721,7 @@ msgstr "Tilauksen vaihe"
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Oletko varma, että haluat muodostaa laskun?"
 
 #. module: sale
 #: view:sale.report:0
@@ -720,12 +742,12 @@ msgstr "Varopäivät"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "Myydyn materiaalin hankinta"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "Luo lopullinen lasku"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -738,11 +760,13 @@ 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
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: sale
 #: model:ir.module.module,description:sale.module_meta_information
@@ -804,6 +828,8 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Tämä on lista laskuista jotka on luotu tälle myyntitilaukselle. Sama "
+"myyntitilaus on voitu laskuttaa useassa erässä (esim. riveittäin)"
 
 #. module: sale
 #: report:sale.order:0
@@ -814,13 +840,13 @@ msgstr "Viitteenne"
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact who requested the order or quotation."
-msgstr ""
+msgstr "Kontaktin nimi ja osoite, joka pyysi tilausta tai tarjousta"
 
 #. module: sale
 #: code:addons/sale/sale.py:966
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+msgstr "Et voi peruuttaa myyntitilausriviä joka on jo laskutettu!"
 
 #. module: sale
 #: view:sale.order:0
@@ -905,7 +931,7 @@ msgstr "Hinta"
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "Myyntiohjelmiston konfiguraatio"
 
 #. module: sale
 #: view:sale.report:0
@@ -921,7 +947,7 @@ msgstr "tilauksesta"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "Perustu joko lähetettyihin tai tilattuihin määriin"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -947,12 +973,12 @@ 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 ""
+msgstr "Myyntitilauksen luonnostila"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "Luo toimitusmääräin"
 
 #. module: sale
 #: field:sale.installer,delivery:0
@@ -987,7 +1013,7 @@ msgstr "Vahvista tarjous"
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "Viite dokumenttiin joka loi tämän myyntitilauspyynnön."
 
 #. module: sale
 #: view:sale.order:0
@@ -1005,7 +1031,7 @@ msgstr "Laskun uudelleenluonti"
 #: 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 ""
+msgstr "Laskutettavat toimitukset"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1027,7 +1053,7 @@ msgstr "otsake"
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "Keräilylista"
 
 #. module: sale
 #: view:sale.order:0
@@ -1037,7 +1063,7 @@ msgstr "Tilauksen Päiväys"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Dokumentti siirrosta kohdepaikkaan tai asiakkalle."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1052,7 +1078,7 @@ msgstr "Vahvista tilaus"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "Luo hankintatilaus"
 
 #. module: sale
 #: view:sale.order:0
@@ -1069,7 +1095,7 @@ msgstr "Toimituskäytäntö"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Päivä jolloin myyntitilaus on luotu"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
@@ -1095,7 +1121,7 @@ msgstr "Faksi:"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "Etukäteismäärä"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1124,7 +1150,7 @@ msgstr "Virhe!"
 #: code:addons/sale/sale.py:570
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "Ei voi peruuttaa myyntitilausta !"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1156,7 +1182,7 @@ msgstr "Toimitus ja manuaalinen lasku"
 #: code:addons/sale/sale.py:1051
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "Keräilyn tiedot !"
 
 #. module: sale
 #: view:sale.report:0
@@ -1172,23 +1198,23 @@ msgstr "Myynninhallinta"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Laskutus keräilystä"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Kirjanpitäjän tarkistettavaksi"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Viitemittayksikkö"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Myyntiilausrivi tee lasku"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1198,6 +1224,11 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"OpenERP pystyy oletusarvoisesti hoitamaan monimutkaisia reitityksiä ja "
+"polkuja tuotteillesi omissa varastoissasi ja kumppanien tiloissa. Tämä "
+"konfiguroi yleisimmät ja yksinkertaisimmat metodit tuotteiden "
+"toimittamiseksi asiakkaalle yhdellä tai kahdella työntekijän tekemällä "
+"operaatiolla."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
@@ -1235,12 +1266,15 @@ msgid ""
 "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 ""
+msgstr "Voit luoda laskuja myyntitilausten tai toimitusten pohjalta."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -1282,11 +1316,13 @@ 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
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "Keräilylista ja toimitusmääräin"
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -1301,28 +1337,30 @@ msgstr "Tehtävää"
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "Keräilysäännöt"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Dokumentti siirrosta asiakkaalle"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "Määrä ilman veroa."
 
 #. module: sale
 #: code:addons/sale/sale.py:571
 #, 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
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Myynnin ennakkomaksulasku"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1392,7 +1430,7 @@ msgstr "Tuotteen mittayksikkö"
 #. module: sale
 #: view:sale.order:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logistinen"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1403,12 +1441,12 @@ msgstr "Tilaa"
 #: code:addons/sale/sale.py:921
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Tulotiliä ei ole määritelty tälle tuotteelle: \"%s\" (id:%d)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "Ohita poikkeus"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1426,6 +1464,8 @@ 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
@@ -1452,7 +1492,7 @@ msgstr "Yhteensä"
 #: code:addons/sale/sale.py:388
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Myyntipäiväkirjaa ei ole määritelty tälle yritykselle \"%s\" (id:%d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1461,12 +1501,14 @@ msgid ""
 "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
 #: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "Ei voi oistaa myyntitilausriviä joka on %s !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1484,7 +1526,7 @@ msgstr "Laskutettavaa"
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Päivä jolloin myyntitilaus on vahvistettu"
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1503,7 +1545,7 @@ msgstr "Laskun päivämäärä"
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "Ennakkoon laskutettava määrä."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1515,7 +1557,7 @@ msgstr "Poikkeus laskutuksessa"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is a list of picking that has been generated for this sales order."
-msgstr ""
+msgstr "Tämä on keräilylista joka on luotu tälle myyntitilaukselle."
 
 #. module: sale
 #: help:sale.installer,sale_margin:0
@@ -1523,6 +1565,8 @@ msgid ""
 "Gives the margin of profitability by calculating the difference between Unit "
 "Price and Cost Price."
 msgstr ""
+"Antaa voittomarginaalin laskemalla erotuksen yksikköhinnasta ja "
+"kustannushinnasta."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1583,6 +1627,11 @@ msgid ""
 "\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"Valitsit määräksi %d yksikköä.\n"
+"Mutta se ei ole yhteensopiva valitun pakkauksen kanssa.\n"
+"Tässä on ehdotus määristä pakkauksen mukaan:\n"
+"\n"
+"EAN: %s määrä %s Tyyppi %s"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1644,7 +1693,7 @@ msgstr "Myyntitilauksen rivit"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Toimitusviive"
 
 #. module: sale
 #: view:res.company:0
@@ -1668,6 +1717,9 @@ msgid ""
 "soon as possible when one product is available or you wait that all products "
 "are available.."
 msgstr ""
+"Toimitustyyppiä käytetään määrittelemään tilauksittain, haluatko toimittaa "
+"heti kun jokin tuotteista on saatavilla vai haluatko odottaa kunnes kaikki "
+"tuotteet ovat saatavilla.."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1683,6 +1735,9 @@ msgid ""
 "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
 #: field:sale.order.line,th_weight:0
@@ -1715,6 +1770,9 @@ msgid ""
 "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
@@ -1735,7 +1793,7 @@ msgstr "Myyjä"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "Ohjaa hankintaa ja laskutusta"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -1779,12 +1837,12 @@ msgstr ""
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "Veron määrä"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Pakkaukset"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
@@ -1817,7 +1875,7 @@ msgstr "Suora toimitus"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Laskutuspäiväkirja"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -1833,13 +1891,15 @@ msgstr "Toimitettu Määrä"
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "Lasku on luotu onnistuneesti!"
 
 #. module: sale
 #: code:addons/sale/sale.py:585
 #, 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
@@ -1849,7 +1909,7 @@ msgstr "Tammikuu"
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "Konfiguroi myynninhallinta ohjelmistosi"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1859,7 +1919,7 @@ msgstr "Myyntitilaukset käsittelyssä"
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "Myyntitilauksen asettelun parannukset"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:63
@@ -1871,7 +1931,7 @@ msgstr "Virhe"
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Sitoutumisen viive"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -1879,6 +1939,8 @@ 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
@@ -1899,7 +1961,7 @@ msgstr "Laskutettavat vahvistetut myyntitilaukset."
 #: code:addons/sale/sale.py:290
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr ""
+msgstr "Ei voi poistaa myyntitilauksia jotka on jo vahvistettu !"
 
 #. module: sale
 #: code:addons/sale/sale.py:316
@@ -1931,7 +1993,7 @@ msgstr "Toimitettu"
 #: code:addons/sale/sale.py:1115
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Ei tarpeeksi varastoa !"
 
 #. module: sale
 #: constraint:stock.move:0
@@ -1941,7 +2003,7 @@ msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Asettelun järjestys"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1956,7 +2018,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Merkitsee että lasku on maksettu"
 
 #. module: sale
 #: report:sale.order:0
@@ -1972,7 +2034,7 @@ msgstr "Toukokuu"
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
+msgstr "Lisää luvatun, pyydetyn ja todellisen päiväyksen myyntitilaukselle."
 
 #. module: sale
 #: view:sale.order:0
@@ -1984,7 +2046,7 @@ msgstr "Asiakas"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr ""
+msgstr "Ennakko"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1997,6 +2059,8 @@ msgid ""
 "Allows you to group and invoice your delivery orders according to different "
 "invoicing types: daily, weekly, etc."
 msgstr ""
+"Mahdollistaa toimitusten laskujen ryhmittelyn eri jaksoille: päivittäin, "
+"viikottain jne."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2011,18 +2075,18 @@ msgstr "Kirjanpito"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Vaiheet myyntitilauksen toimittamiseksi"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Hae myyntitilausta"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Myyntitilausehdotus"
 
 #. module: sale
 #: report:sale.order:0
@@ -2034,7 +2098,7 @@ msgstr "Maksuehto"
 #: help:sale.installer,sale_layout:0
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
+msgstr "Lisää joitaikin ominaisuuksia myyntitilausraporttien asetteluun."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2087,9 +2151,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automaattinen ilmoitus"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Asiakkaan viite"
-
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2098,9 +2159,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Manual Designation"
 #~ msgstr "Käsin syötetty nimike"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Lasku pakatuista"
-
 #~ msgid "Invoice after delivery"
 #~ msgstr "Lasku toimituksen jälkeen"
 
@@ -2116,9 +2174,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Outgoing Products"
 #~ msgstr "Lähtevät tuotteet"
 
-#~ msgid "Shop name"
-#~ msgstr "Myymälän nimi"
-
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2164,38 +2219,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "Kun valitset toimituskäytännöksi \"Automaattinen lasku toimituksen "
 #~ "jälkeen\", lasku luodaan automaattisesti toimituksen jälkeen."
 
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "Toimituskäytännöllä tarkoitetaan laskutuksen yhdistämistä toimitukseen.\n"
-#~ "  - \"Maksu ennen toimitusta\" luo ensin laskun; pakkausmääräys luodaan "
-#~ "vasta sen jälkeen kun lasku on maksettu.\n"
-#~ "  - \"Toimitus ja manuaalinen lasku\" luo heti pakkausmääräyksen ja odottaa "
-#~ "että käyttäjä luo laskun luonnoksen painamalla \"Lasku\".\n"
-#~ "  - \"Lasku toimituksen jälkeen\" luo laskun luonnoksen kun kaikki "
-#~ "pakkauslistat ovat valmiit.\n"
-#~ "  - \"Lasku pakatuista\" luo laskun samanaikaisesti pakkausprosessin aikana."
-
 #~ msgid "Canceled"
 #~ msgstr "Peruutettu"
 
-#~ msgid "Related Packings"
-#~ msgstr "Liittyvät pakatut"
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Sinun täytyy ensin peruuttaa kaikki tähän myyntitilaukseen liitetyt pakatut."
-
 #~ msgid "Manual Description"
 #~ msgstr "Käsin syötetty kuvaus"
 
@@ -2210,19 +2236,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Packing"
 #~ msgstr "Pakkaus"
 
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Antaa tarjouksen tai myyntitilauksen tilan. Poikkeustila asetetaan "
-#~ "automaattisesti kun peruutus tapahtuu laskun vahvistuksessa (Poikkeus "
-#~ "laskutuksessa) tai pakkausprosessissa (Poikkeus toimituksessa). \"Odottaa "
-#~ "aikataulua\" asetetaan kun lasku on vahvistettu, mutta lasku odottaa että "
-#~ "päivämäärä vastaa tilauspäivämäärää."
-
 #~ msgid "Total amount"
 #~ msgstr "Yhteensä"
 
@@ -2235,9 +2248,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sale Shop"
 #~ msgstr "Myymälä"
 
-#~ msgid "Number packages"
-#~ msgstr "Pakkausten lukumäärä"
-
 #~ msgid "Payment accounts"
 #~ msgstr "Maksutilit"
 
@@ -2253,9 +2263,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Laskutettavat myyntitilaukset"
 
-#~ msgid "In progress"
-#~ msgstr "Käsittelyssä"
-
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Hallitsee toimituksien ja laskutuksen käsittelyä"
 
@@ -2325,13 +2332,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sale Order"
 #~ msgstr "Myyntitilaus"
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Jos tuotetta ei ole tarpeeksi varastossa tilauksen toimittamiseen kerralla, "
-#~ "hyväksytäänkö osittaistoimitukset vai ei?"
-
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Luonnos asiakkaan laskusta tilinpitäjän tarkastettavaksi."
 
@@ -2410,10 +2410,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "New Quotation"
 #~ msgstr "Uusi tarjous"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr "Laskutettua myyntitilauksen rivia ei voi peruuttaa!"
-
 #~ msgid "Make invoices"
 #~ msgstr "Luo laskut"
 
@@ -2439,15 +2435,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sale Order line"
 #~ msgstr "Myyntitilausrivi"
 
-#~ msgid "Product UOS"
-#~ msgstr "Tuotteen myyntiyksikkö"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Virhe: Myyntiyksikkö täytyy olla eri kategoriassa kuin mittayksikkö"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Määrä (myyntiyksikköä)"
-
 #~ 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 "
@@ -2497,9 +2487,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "My sales order in progress"
 #~ msgstr "Omat myyntitilaukset käsittelyssä"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Manuaalisessa käsittelyssä"
-
 #~ msgid "Customer Ref"
 #~ msgstr "Asiakkaan viite"
 
@@ -2569,96 +2556,3 @@ msgstr "Lasku perustuen toimitettuihin"
 
 #~ msgid "Other data"
 #~ msgstr "Muut tiedot"
-
-#~ msgid "Average Price"
-#~ msgstr "Keskihinta"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Luotujen myyntilausten raportti"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Myyntitilaukset kategorioittain"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Kumulatiivinen myynti kuukausittain vuoden ajalta"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Myyntitilaukset tuotteittain"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Myynti kuukausittain vuoden ajalta"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Liikevaihto tuotetta kohden"
-
-#~ msgid "All Months"
-#~ msgstr "Kaikki kuukaudet"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Myyntitilaukset kategorioittain"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Kuukauden myynti"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Myynti tuotteittain (kuluva kuukausi)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Liikevaihto kuukausittain vuoden ajalta"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Myynnin hallinta - Raportointi"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Myynti tuoteluokittain"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Kumulatiivinen myynnin kuukausittainen liikevaihto vuoden ajalta"
-
-#~ msgid "# of Products"
-#~ msgstr "Tuotteiden lukumäärä"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Myynti tuotteittain"
-
-#~ msgid "This Month"
-#~ msgstr "Tässä kuussa"
-
-#~ msgid "Categories"
-#~ msgstr "Kategoriat"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Luodut myyntitilaukset"
-
-#~ msgid "Reporting"
-#~ msgstr "Raportointi"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Liikevaihto kuukausittain"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Päivittäinen liikevaihto vuoden ajalta"
-
-#~ msgid "Graphs"
-#~ msgstr "Kuvaajat"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Liikevaihto yhteensä"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Myynti tuoteluokittain (kuluva kuukausi)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Päivittäinen liikevaihto vuoden ajalta"
-
-#~ msgid "Create Date"
-#~ msgstr "Luontipäivämäärä"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Luodut myyntitilaukset"
-
-#~ msgid "Sales by State"
-#~ msgstr "Myynti tiloittain"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Myyntitilauksien logistiikan asetukset"
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index b1b1fd50065..9e1c20409be 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: code:addons/sale/sale.py:620
@@ -643,7 +643,7 @@ msgstr "Factures de vente ouvertes"
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr "Ligne de bon de commandes"
+msgstr "Ligne de commandes de vente"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -1243,7 +1243,7 @@ msgstr "Juillet"
 #. module: sale
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr "Besoin"
+msgstr "Approvisionnement"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1407,7 +1407,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr "Bon de préparation et de livraison"
+msgstr "Bon de préparation + bon de livraison"
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -2264,21 +2264,6 @@ msgstr "Année"
 msgid "Invoice Based on Deliveries"
 msgstr "Facture basée sur les livraisons"
 
-#~ msgid "Shop name"
-#~ msgstr "Nom du magasin"
-
-#~ msgid "Number packages"
-#~ msgstr "Nombre d'UL"
-
-#~ msgid "In progress"
-#~ msgstr "En cours"
-
-#~ msgid "Customer Ref."
-#~ msgstr "Réf. Client"
-
-#~ msgid "Related Packings"
-#~ msgstr "Colisage en relation"
-
 #~ msgid "Make invoices"
 #~ msgstr "Créer les factures"
 
@@ -2292,9 +2277,6 @@ msgstr "Facture basée sur les livraisons"
 #~ "Quand le bouton \"confirmer\" est pressé, l'état passe de brouillon à "
 #~ "manuel, c'est à dire que le devis est transformé en commande."
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Facturation sur base des colisages"
-
 #~ msgid "Outgoing Products"
 #~ msgstr "Produits à expédier"
 
@@ -2331,13 +2313,6 @@ msgstr "Facture basée sur les livraisons"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurer la logistique des commandes de ventes"
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Si vous n'avez pas de stock suffisant pour tout livrer d'un coup, accèptez "
-#~ "vous de faire une livraison partielle ou pas."
-
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Approvisionnement des commandes de ventes"
 
@@ -2393,31 +2368,6 @@ msgstr "Facture basée sur les livraisons"
 #~ "La liste de colisages est créée quand on clique sur le bouton « Assigner » "
 #~ "après confirmation de la commande client."
 
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "La Politique de livraison est utilisée pour synchroniser les opérations de "
-#~ "facturation et de livraison. \n"
-#~ "    - « Payer avant la livraison » génère d'abord la facture et ensuite le "
-#~ "bon de livraison après le paiement de cette facture. \n"
-#~ "    - « Livraison & Facture manuelle » crée directement le bon de livraison "
-#~ "et crée une facture brouillon quand l'utilisateur clique sur le bouton « "
-#~ "Facturer ». \n"
-#~ "    - « Facture basée sur la commande après livraison»  crée une facture "
-#~ "brouillon basée sur la commande du client à la fin de toutes les livraisons. "
-#~ "\n"
-#~ "    - « Facture sur base des livraisons » crée une facture pendant la "
-#~ "livraison."
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Recréer l'approvisionnement"
 
@@ -2696,39 +2646,9 @@ msgstr "Facture basée sur les livraisons"
 #~ "lorsque la facture est confirmée mais attend que le Planificateur soit lancé "
 #~ "à la Date de la Commande."
 
-#~ msgid "Product UOS"
-#~ msgstr "UdV du produit"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Quantité (UdV)"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Donne l'état du devis ou de la commande. Passe automatiquement en état "
-#~ "d'exception lorsqu'une opération d'annulation intervient dans la validation "
-#~ "de facture (exception de facture) ou dans le processus de colisage "
-#~ "(exception d'expédition). Passe en état \"en attente de planification\" "
-#~ "lorsque la facture est confirmée mais en attend que le planificateur soit à "
-#~ "la date \"Date de commande\"."
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr "Vous devez d'abord annuler tous les colisages liés à cette commande."
-
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Lignes non facturées"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Vous ne pouvez pas annuler une commande de vente que vous avez déjà facturée "
-#~ "!"
-
 #~ 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 "
@@ -2744,391 +2664,9 @@ msgstr "Facture basée sur les livraisons"
 #~ msgid "Related Packing"
 #~ msgstr "Colisage lié"
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Tableau de Bord des Ventes"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Tableau de Bord des Ventes"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Ventes du Mois"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Tableau de Bord du Gestionnaire des Ventes"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Cas du Mois"
-
-#~ msgid "My open quotations"
-#~ msgstr "Mes Devis Ouverts"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Statistiques des Cas"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "10 meilleures Ventes du Mois"
-
-#~ msgid "Average Price"
-#~ msgstr "Prix moyen"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Rapport sur les commandes crées"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Commandes de vente par catégorie"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Chiffres d'affaires cumulés mensuels des ventes sur un an"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Commandes de vente par produit"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Chiffres d'affaires mensuels sur un an"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Chiffres d'affaires par produit"
-
-#~ msgid "All Months"
-#~ msgstr "Tous les mois"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Commandes de vente par catégorie"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Ventes du mois"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Ventes par produit (ce mois)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Chiffres d'affaires mensuels sur un an"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Gestion des ventes - Rapports"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Ventes par catégorie de produits"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Chiffres d'affaires mensuel des ventes cumulés depuis un an"
-
-#~ msgid "# of Products"
-#~ msgstr "# de Produits"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Ventes par produit"
-
-#~ msgid "This Month"
-#~ msgstr "Ce mois"
-
-#~ msgid "Categories"
-#~ msgstr "Catégories"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Commandes crées"
-
-#~ msgid "Reporting"
-#~ msgstr "Rapports"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Chiffres d'affaires journalier depuis un an"
-
-#~ msgid "Graphs"
-#~ msgstr "Graphiques"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manuelle en cours"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Chiffre d'affaire total"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Ventes par catégorie de produits (ce mois)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Chiffres d'affaires journalier sur un an"
-
-#~ msgid "Create Date"
-#~ msgstr "Date de création"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Commandes de vente créées"
-
-#~ msgid "Sales by State"
-#~ msgstr "Ventes par état"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Référence du document qui a généré cette demande d'ordre de ventes."
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Ventes par partenaire"
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Facture de vente ouverte"
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN : "
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Nombre de jour entre la confirmation de l'ordre et l'expédition des produits "
-#~ "au client"
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Il n'y a aucun compte de revenu défini ' \\n 'pour ce produit: \"%s\" (id:%d)"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Version de la liste de prix pour la commande de vente actuelle"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Numéro de séquence"
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "La commande de vente '%s' est passée dans l'état brouillon."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Ventes par catégorie de produit"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Quantité : "
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "État brouillon de commande de vente"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Date à laquelle la commande de vente est confirmée"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Adresse d'expédition pour la commande de vente actuelle"
-
-#~ msgid "Default UoM"
-#~ msgstr "UdM par défaut"
-
-#~ msgid "The amount without tax"
-#~ msgstr "Montant hors-taxe"
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Demande de commande de vente"
-
-#~ msgid "Source document"
-#~ msgstr "Document d'origine"
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Impossible de supprimer une ligne de commande qui est %s !"
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Vous devez d'abord annuler les mouvements de stock attaché à cette ligne de "
-#~ "commande."
-
-#~ msgid "From a sale order"
-#~ msgstr "D'une commande de vente"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Adresse de facturation de la commande actuelle"
-
-#~ msgid "The total amount"
-#~ msgstr "Le montant total"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "Le devis '%s' a été converti en commande de vente."
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Ceci indique qu'une facture a été payée"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Le compte analytique lié à une commande"
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Un ordre d'approvisionnement pour chaque ligne de commande de vente et pour "
-#~ "chaque composant."
-
-#~ msgid "The tax amount"
-#~ msgstr "Le montant des taxes"
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "Le vendeur confirme le devis. L'état de la commande de vente devient 'En "
-#~ "cours' ou 'Manuelle en cours'."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Vous ne pouvez pas faire d'avance sur une commande de ventes définit comme "
-#~ "'Facture automatique après la livraison'."
-
-#~ msgid ""
-#~ "Depending on the Invoicing control of the sale order, the invoice can be "
-#~ "based on delivered or on ordered quantities. Thus, a sale order can "
-#~ "generates an invoice or a delivery order as soon as it is confirmed by the "
-#~ "salesman."
-#~ msgstr ""
-#~ "Selon le contrôle de facturation de la commande de ventes, la facture sera "
-#~ "basée sur les quantités livrées ou commandées. Ainsi, une commande de ventes "
-#~ "peut générer une facture ou un bon de livraison dès qu'elle est confirmée "
-#~ "par le vendeur."
-
-#~ msgid "Related Invoices"
-#~ msgstr "Factures associées"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Commande de vente confirmée à facturer."
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Ventes par vendeur"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat pour un module doit être unique !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer un menu récursif."
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr ""
-#~ "Pilote la satisfaction des besoins pour toutes les lignes de commande de "
-#~ "ventes."
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Impossible d'annuler la ligne de commande de vente !"
-
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Étapes pour livrer un commande de vente"
 
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Il n'y a aucun journal de vente défini pour cette société : \"%s\" (id : %d)"
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Pour chaque ligne de commande de ventes, un besoin est créé pour "
-#~ "l'approvisionnement du produit vendu."
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Un besoin est automatiquement enregistré dès qu'une commande de vente est "
-#~ "confirmée ou qu'une facture est payée. Il provoque l'achat ou à la "
-#~ "production des produits selon les règles et les paramètres de la commande de "
-#~ "vente. "
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "Le formulaire de bon de préparation est créé dès que la commande de ventes "
-#~ "est confirmée, en même temps que le besoin de stock ou de service. Il "
-#~ "représente l'assignation des produits à une commande de ventes. Il y a une "
-#~ "ligne bon de préparation par ligne de commande de ventes qui évolue avec la "
-#~ "disponibilité des composants."
-
-#~ 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 sale 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 politique d'expédition est utilisée pour coordonner les opérations de "
-#~ "facturation et de livraison.\n"
-#~ "  - L'option \"Paiement avant livraison\" va d'abord générer la facture, et "
-#~ "ne générera le bon de préparation qu'après le paiement de la facture.\n"
-#~ "  - L'option \"Expédition puis facturation manuelle\" va créer le bon de "
-#~ "préparation directement, et attendre que l'utilisateur clique manuellement "
-#~ "sur le bouton \"Facturer\" pour générer la facture brouillon.\n"
-#~ "  - L'option \"Facturer sur commande après la livraison\" va générer la "
-#~ "facture brouillon en se basant sur les quantités commandées lorsque toutes "
-#~ "les expéditions seront terminées.\n"
-#~ "  - L'option \"Facturer sur préparation\" est utilisée pour créer une "
-#~ "facture durant la préparation de l'expédition."
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr ""
-#~ "Vous devez d'abord annuler toutes les préparations et expéditions associées "
-#~ "à cette commande de ventes."
-
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "C'est la liste des expéditions générées pour cette commande"
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* L'état \"Brouillon\" est utilisé lorsque la commande de ventes associée "
-#~ "est dans l'état brouillon.                     \n"
-#~ "* L'état \"Confirmée\" est utilisé lorsque la commande de vente associée est "
-#~ "confirmée.                     \n"
-#~ "* L'état \"Incident\" est utilisé lorsque la commande de vente associée est "
-#~ "en exception.                     \n"
-#~ "* L'état \"Terminée\" est utilisé lorsque la ligne de commande de vente "
-#~ "associée a été récupérée.                     \n"
-#~ "* L'état \"Annulée\" est utilisé lorsqu'un utilisateur annule la commande de "
-#~ "ventes associée."
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Donne l'état du devis ou de la commande. \n"
-#~ "La commande passe automatiquement à l'état \"Incident\" quand une annulation "
-#~ "a lieu pendant la validation d'une facture (\"Incident de facturation\") ou "
-#~ "d'une expédition (\"Incident d'expédition\") \n"
-#~ "La commande passe à l'état \"Attente de planification\" quand une facture "
-#~ "est confirmée mais attend que le planificateur s'exécute à la date \"Date de "
-#~ "commande\"."
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Date de création de la commande de vente"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "La commande de vente '%s' a été annulée"
-
-#~ msgid "Sales Dashboard"
-#~ msgstr "Tableaux de bord des ventes"
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index 9addf92dcba..559b2b52f18 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index dfc4cfd6a75..5e1d0a6ed10 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: sale
@@ -2383,30 +2383,6 @@ 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 ""
-#~ "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 After 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 ""
-#~ "Politika pakiranja koristi se kod usklađivanja operacija izdavanja računa i "
-#~ "Isporučivanja.\n"
-#~ "  - Izbor \"Platite prije isporuke\" prvo će generirati Račun i pa tek onda "
-#~ "nalog za pakiranje kada je Račun plaćen.\n"
-#~ "  - \"Isporuka i ručno izdan Račun\" kreirat će izravno nalog za isporuku te "
-#~ "čekati da korisnik ručno klikne na ikonu \"Račun\" kako bi se generirao "
-#~ "Nacrt Računa.\n"
-#~ "  - Račun po Nalogu nakon Isporuke\" generirat će Nacrt Računa na osnovi "
-#~ "prodajne Narudžbe nakon što su svi Tovarni Listovi dovršeni.\n"
-#~ "  - Opcija \"Račun na osnovi Pakiranja\" koristi se za izdavanje računa "
-#~ "tijekom postupka pakiranja."
-
 #~ msgid "Sales order lines"
 #~ msgstr "Vezane Prodajne Narudžbe"
 
@@ -2550,151 +2526,3 @@ msgstr "Faktura na temelju dostava"
 
 #~ msgid "Invoice based on packing lists"
 #~ msgstr "Račun napravljen prema tovarnom listi"
-
-#~ msgid "Average Price"
-#~ msgstr "Prosječna cijena"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Izvještaj o kreiranoj Prodajnoj narudžbi"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Prodajne narudžbe prema Kategoriji"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Kumulativni promet prodaje po mjesecima u godini"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Prodajne narudžbe prema Proizvodima"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Mjesečni promet prodaje tijekom jedne godine"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Promet po Proizvodu"
-
-#~ msgid "All Months"
-#~ msgstr "Svi mjeseci"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Prodajne narudžbe prema Kategorijama"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Prodaje u mjesecu"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Prodaje prema Proizvodima (Ovaj mjesec)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Mjesečni promet prodaje tijekom jedne godine"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Upravljanje prodajom - Izvještavanje"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Prodaje prema Kategorijama Proizvoda"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Kumulativni promet prodaje po mjesecima u godini"
-
-#~ msgid "# of Products"
-#~ msgstr "# Proizvoda"
-
-#~ msgid "Sales by Product"
-#~ msgstr "prodaja prema Proizvodu"
-
-#~ msgid "This Month"
-#~ msgstr "Ovaj mjesec"
-
-#~ msgid "Categories"
-#~ msgstr "kategorije"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Kreirane Prodajne Narudžbe"
-
-#~ msgid "Reporting"
-#~ msgstr "Izvještavanje"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Promet po mjesecu"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Dnevni promet prodaje tijekom jedne godine"
-
-#~ msgid "Graphs"
-#~ msgstr "Grafikoni"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Priručnik u tijeku"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Ukupni promet"
-
-#~ msgid "In progress"
-#~ msgstr "U Tijeku"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Prodaje prema Kategoriji Proizvoda (Ovaj mjesec)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Dnevni promet prodaje tijekom jedne godine"
-
-#~ msgid "Create Date"
-#~ msgstr "Kreiraj datum"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Kreirane Prodajne Narudžbe"
-
-#~ msgid "Sales by State"
-#~ msgstr "Prodaje prema Stanju"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Konfiguriraj logistiku Prodajne Narudžbe"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Ovdje je lista svih stavki narudžbe koju treba fakturirati. Ovaj pogled "
-#~ "omogućava da se narudžba djelomično fakturira prema stavkama narudžbe. Ova "
-#~ "lista nije potrebna ako se fakturira prema dostavnicama ili ako se fakturira "
-#~ "ukupna prodaja."
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Prodaje po kupcu"
-
-#~ msgid ""
-#~ "Sales Orders helps you manage quotations and orders done with your "
-#~ "customers. OpenERP suggests that you to start by creating a quotation. Once "
-#~ "the order is confirmed, the quotation is converted into a Sale Order. "
-#~ "OpenERP can handle several types of products so that a sales order can "
-#~ "trigger tasks, delivery orders, manufacturing orders, purchases and so on. "
-#~ "Based on the configuration of the sale order, a draft invoice will be "
-#~ "generated so that you just have to confirm it when you want to bill your "
-#~ "customer."
-#~ msgstr ""
-#~ "Forma narudžbi pomaže kod upravljanja ponudama i narudžbama za vaše kupce. "
-#~ "OpenERP predlaže da započnete sa kreiranjem ponude. Jednom kada se obavi "
-#~ "naručivanje, ponuda se pretvara u narudžbu. OpenERP može upravljati sa "
-#~ "nekoliko tipova proizvoda tako da narudžba može pokrenuti zadatke, "
-#~ "otpremnice, narudžbe proizvodnje, kupovine, idt. Temeljeno na postavkama "
-#~ "narudžbe, nacrt fakture će se kreirati tako da ju je samo potrebno potvrditi "
-#~ "kada želite naplatiti klijentu."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Prodaje po kategoriji proizvoda"
-
-#~ msgid "Default UoM"
-#~ msgstr "Standardna JM"
-
-#~ msgid ""
-#~ "If you have more than one shops reselling your company products, you can "
-#~ "create and manage them from here. Whenever you will record a new quotation "
-#~ "or sale 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 sale."
-#~ msgstr ""
-#~ "Ako više od jedne prodavaonice preprodaje proizvode vaše tvrtke, možete ih "
-#~ "kreirati i upravljati njima odavde. Kada kreirate novu ponudu ili narudžbu, "
-#~ "mora biti povezana sa prodavaonicom. Prodavaonica također određuje skladište "
-#~ "iz kojeg će se proizvodi dostavljati za svaku prodaju."
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index b1f1e28b98d..5f58ab043e4 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-01 17:37+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2151,15 +2152,9 @@ msgstr "Számla árukiadás alapján"
 #~ msgid "Reference"
 #~ msgstr "Hivatkozás"
 
-#~ msgid "Shop name"
-#~ msgstr "Boltnév"
-
 #~ msgid "Net Price"
 #~ msgstr "Nettó ár"
 
-#~ msgid "In progress"
-#~ msgstr "Folyamatban"
-
 #~ msgid "Order Ref"
 #~ msgstr "Rendelési hiv."
 
@@ -2169,21 +2164,9 @@ msgstr "Számla árukiadás alapján"
 #~ msgid "Sequence"
 #~ msgstr "Sorszám"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Vevői hiv."
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Számla a csomagolások alapján"
-
 #~ msgid "Procure Method"
 #~ msgstr "Ellátás módja"
 
-#~ msgid "Product UOS"
-#~ msgstr "Termék EE-e"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Mennyiség (EE)"
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Beszerzés készítése"
 
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 434d09b8b43..2e7a08e00c4 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -14,19 +14,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "Penjualan"
+msgstr "Penjualan oleh Salesman dalam 90 hari terakhir"
 
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
 msgstr ""
+"Memungkinkan Anda untuk menghitung biaya pengiriman pada quotations Anda."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -40,7 +41,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Alamat pengiriman untuk  sales order saat ini."
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -58,18 +59,18 @@ msgstr "Hari"
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Pembatalan Order"
+msgstr "Batalkan order"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr "Konfigurasi Logistik Order Penjualan"
+msgstr "Konfigurasi Logistik Sales Order"
 
 #. module: sale
 #: code:addons/sale/sale.py:603
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr "quotation \"%s\" telah dikonversikan pada order penjualan"
+msgstr "quotation \"%s\" telah dikonversikan pada sales order"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -85,12 +86,12 @@ msgstr "Peringatan !"
 #. module: sale
 #: report:sale.order:0
 msgid "VAT"
-msgstr ""
+msgstr "VAT"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "meningkatkan order pengadaan pada setiap daftar order penjualan"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -112,11 +113,15 @@ msgid ""
 "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
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr "Order Pengadaan"
+msgstr "Order procurement"
 
 #. module: sale
 #: view:sale.report:0
@@ -127,7 +132,7 @@ msgstr "Rekanan"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "Daftar Pesanan"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -140,6 +145,14 @@ msgid ""
 "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."
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -150,6 +163,11 @@ msgid ""
 "the product is a service, shipped quantities means hours spent on the "
 "associated tasks."
 msgstr ""
+"Urutan penjualan secara otomatis akan membuat proposisi invoice (draft "
+"invoice). Pesanan dan jumlah yang  dikirimkan mungkin tidak sama. Anda harus "
+"memilih apakah anda ingin  berdasarkan jumlah pesanan  atau jumlah barang "
+"dikirim. Jika produk berupa layanan,kuantitas yang di kirimkan artinya "
+"jumlah  jam yang dihabiskan pada tugas-tugas yang terkait."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -159,7 +177,7 @@ msgstr "Default Term Pembayaran"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfigurasi Pengambil Kebijakan untuk Order Penjualan"
+msgstr "Konfigurasi Pengambil Kebijakan untuk Sales Order"
 
 #. module: sale
 #: view:sale.order:0
@@ -167,7 +185,7 @@ msgstr "Konfigurasi Pengambil Kebijakan untuk Order Penjualan"
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "State"
-msgstr "Propinsi"
+msgstr "Status"
 
 #. module: sale
 #: report:sale.order:0
@@ -177,12 +195,12 @@ msgstr "Potongan (%)"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "Penetapan Tugas"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "centang kotak untuk kelompok invoice untuk pelanggan yang sama"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -192,7 +210,7 @@ msgstr "Order Kuantitas"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr "Penjualan oleh Salesman"
+msgstr "Penjualan berdasarkan Salesman"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
@@ -221,18 +239,18 @@ msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
-"Faktur dibuat secara otomatis jika kebijakan pengiriman adalah 'Faktur dari "
-"penjemputan' atau 'Faktur setelah pengiriman\""
+"invoice dibuat secara otomatis jika kebijakan pengiriman adalah 'invoicedari "
+"penjemputan' atau 'invoice setelah pengiriman\""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Sales membuat invoice"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "Pengemasan ulang"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -244,6 +262,8 @@ msgstr "Potongan (%)"
 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:board.board:0
@@ -260,7 +280,7 @@ msgstr "Kemasan"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr "Daftar order penjualan"
+msgstr "Dari Sales Order"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -276,7 +296,7 @@ msgstr "Nama konsumen tidak ditemukan"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "Sales dalam Pengecualian"
 
 #. module: sale
 #: view:sale.order:0
@@ -302,6 +322,19 @@ msgid ""
 "  - The 'Invoice From The Picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Kebijakan Pengiriman digunakan untuk menyinkronkan operasi dan pengiriman "
+"invoice.\n"
+"- The 'Pembayaran Sebelum pengiriman' pilihan pertama akan menghasilkan "
+"invoice dan kemudian menghasilkan urutan pengambilan setelah pembayaran "
+"invoice ini.\n"
+"- The 'Pengiriman & Manual invoice' akan menciptakan urutan pengambilan "
+"langsung dan menunggu pengguna untuk secara manual klik tombol 'invoice' "
+"untuk menghasilkan invoice draft.\n"
+"- The 'invoice On Delivery Order Setelah' pilihan akan menghasilkan invoice "
+"draft berdasarkan pesanan sales setelah semua daftar pengambilan telah "
+"selesai.\n"
+"- 'invoice Dari Picking' Pilihan ini digunakan untuk membuat invoice selama "
+"proses pengambilan."
 
 #. module: sale
 #: code:addons/sale/sale.py:939
@@ -316,7 +349,7 @@ msgstr ""
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr "Konfigurasi"
+msgstr "Pengaturan"
 
 #. module: sale
 #: constraint:stock.move:0
@@ -333,7 +366,7 @@ msgstr "mode tidak sah untuk test_state"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: sale
 #: code:addons/sale/sale.py:584
@@ -367,7 +400,7 @@ msgstr "Penawaran"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Daftar  harga sales order untuk saat ini"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -377,7 +410,7 @@ msgstr "Hanya Order Pengiriman saja"
 #. module: sale
 #: report:sale.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: sale
 #: help:sale.order.line,delay:0
@@ -420,6 +453,8 @@ 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:971
@@ -441,6 +476,8 @@ 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
@@ -454,6 +491,8 @@ 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
@@ -503,7 +542,7 @@ msgstr "Referensi order harus unik !"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
 #. module: sale
 #: help:sale.order,amount_total:0
@@ -609,7 +648,7 @@ msgstr "Kuantitas"
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Tanggal Pembuatan"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -624,7 +663,7 @@ msgstr "Total :"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "Sales Saya"
 
 #. module: sale
 #: code:addons/sale/sale.py:290
@@ -645,18 +684,18 @@ msgstr "Harga"
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# of Qty"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Tanggal Order"
 
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "Dikirimkan"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -671,7 +710,7 @@ msgstr "Faktur Pada Order Setelah Pengiriman"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: sale
 #: view:sale.report:0
@@ -720,7 +759,7 @@ msgstr "Daftar penjualan tidak dapat di batalkan !"
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Keamanan hari"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
@@ -743,6 +782,8 @@ 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
 #: view:sale.report:0
@@ -775,12 +816,34 @@ msgid ""
 "    * Graph of cases of the month\n"
 "    "
 msgstr ""
+"\n"
+"    Modul dasar untuk mengelola quotation dan sales order .\n"
+"\n"
+"     * Alur Kerja dengan langkah-langkah validasi:\n"
+"         - Quotation -> Sales order -> invoice\n"
+"     * Metoda Invoicing :\n"
+"         - invoice pada pesanan (sebelum atau sesudah pengiriman)\n"
+"         - invoice pengiriman yang\n"
+"         - invoice pada timesheets\n"
+"         - invoice Advance\n"
+"     * preferensi Mitra (pengiriman, invoicing, INCOTERM, ...)\n"
+"     * Produk dan harga stok\n"
+"     * Pengiriman :\n"
+"         - semua sekaligus, multi-paket\n"
+"         - Biaya pengiriman\n"
+"     * Dashboard untuk salesman yang meliputi:\n"
+"     * quotation terbuka Anda\n"
+"     * Top 10 bulan ini\n"
+"     * Kasus statistik\n"
+"     * Grafik penjualan per produk\n"
+"     * Grafik kasus bulan ini.\n"
+"    "
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Toko Penjualan"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
@@ -790,12 +853,12 @@ msgstr "Perusahaan"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "Riwayat"
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
@@ -834,12 +897,12 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr ""
+msgstr "Qty"
 
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Referensiya"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -850,7 +913,7 @@ msgstr ""
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
@@ -906,7 +969,7 @@ msgstr "Buka Faktur"
 #: report:sale.order:0
 #: view:sale.order.line:0
 msgid "Price"
-msgstr ""
+msgstr "Harga"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_installer
@@ -919,7 +982,7 @@ msgstr "Konfugurasi aplikasi penjualan"
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Harga"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -939,7 +1002,7 @@ msgstr "Penjemputan terkait"
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nama"
 
 #. module: sale
 #: report:sale.order:0
@@ -985,7 +1048,7 @@ msgstr "Penjualan berdasarkan Produk Kategori"
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Pengiriman Sebagian"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1031,7 +1094,7 @@ msgstr "Metode Pengadaan"
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "title"
-msgstr ""
+msgstr "Judul:"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
@@ -1041,7 +1104,7 @@ msgstr "Daftar Jemput"
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Tanggal order"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -1138,7 +1201,7 @@ msgstr "Order Penjualan tidak dapat di batalkan !"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
@@ -1171,7 +1234,7 @@ msgstr "Informasi penjemputan !"
 #: view:sale.report:0
 #: field:sale.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Bulan"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
@@ -1197,7 +1260,7 @@ msgstr "Referensi UoM"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Penjualan Orderline Buat_invoice"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1215,31 +1278,31 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Quotations Lama"
 
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr ""
+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 ""
+msgstr "Analisa Penjualan"
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
-msgstr ""
+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 ""
+msgstr "Quotation"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1267,13 +1330,13 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
-msgstr ""
+msgstr "Sales"
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Harga Satuan"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1286,13 +1349,13 @@ msgstr "Selesai"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "sale.installer"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
-msgstr ""
+msgstr "Invoice"
 
 #. module: sale
 #: code:addons/sale/sale.py:1014
@@ -1350,7 +1413,7 @@ msgstr "Pembayaran faktur penjualan"
 #. module: sale
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr ""
+msgstr "Incoterm"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1358,7 +1421,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produk"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
@@ -1373,7 +1436,7 @@ msgstr "Pembatalan penugasan"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr ""
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -1385,6 +1448,12 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"Memberikan status quotation atau sales order .\n"
+"Kondisi pengecualian secara otomatis mengatur kapan operasi dibatalkan yang "
+"terjadi pada validasi invoice (invoice Exception) atau dalam proses daftar "
+"memilih (Shipping Exception).\n"
+"Pada Status 'Waiting Schedule' ini mengatur kapan Invoice dikonfirmasi "
+"tetapi menunggu scheduler yang akan dijalankan pada tanggal 'Tanggal Ordered'"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1461,12 +1530,12 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "States"
-msgstr ""
+msgstr "Status"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1527,12 +1596,12 @@ msgstr "Tanggal dimana order penjualan di konfirmasi"
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Perusahaan"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Tanggal Invoice"
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
@@ -1634,7 +1703,7 @@ msgstr ""
 #: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sales Order"
-msgstr ""
+msgstr "Sales order"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -1679,7 +1748,7 @@ msgstr "Penjualan berdasarkan produk kategori dalam 90 hari terakhir"
 #: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Detail Invoice"
 
 #. module: sale
 #: view:sale.order:0
@@ -1721,7 +1790,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agustus"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1741,25 +1810,25 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,th_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Berat"
 
 #. module: sale
 #: view:sale.open.invoice:0
 #: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Invoices"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Gambar"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -1832,6 +1901,16 @@ msgid ""
 "            \n"
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
+"Kondisi * The 'Draft' diatur ketika sales order terkait di dalam status "
+"draft.\n"
+"Kondisi * The 'Dikonfirmasi' ini diset ketika urutan penjualan tersebut "
+"dikonfirmasi.\n"
+"* Pada Status 'Exception' ini diset ketika urutan penjualan tersebut "
+"ditetapkan sebagai pengecualian.\n"
+"* Pada Status 'Selesai' ini diset ketika baris pesanan penjualan telah "
+"diambil.\n"
+"* Pada Status 'Dibatalkan' diatur ketika user membatalkan pesanan penjualan "
+"yang terkait."
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -1879,7 +1958,7 @@ msgstr "Faktur Jurnal"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Produk advance"
 
 #. module: sale
 #: view:sale.report:0
@@ -1930,7 +2009,7 @@ msgstr "Kesalahan"
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Kesepakatan yang ditunda"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -1944,7 +2023,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr ""
+msgstr "Menetapkan"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -1954,7 +2033,7 @@ msgstr "Tanggal Pemesanan"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Sales order untuk invoice dikonfirmasi."
 
 #. module: sale
 #: code:addons/sale/sale.py:290
@@ -1966,7 +2045,7 @@ msgstr "Tidak dapat menghapus Order Penjualan  yang sudah dikonfirmasi!"
 #: code:addons/sale/sale.py:316
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "'%s ' sales order telah diatur di  bagian  draf"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1992,7 +2071,7 @@ msgstr "Sudah Terkirim"
 #: code:addons/sale/sale.py:1115
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Stok tidak mencukupi"
 
 #. module: sale
 #: constraint:stock.move:0
@@ -2002,7 +2081,7 @@ msgstr "Anda harus menetapkan lot produksi untuk produk  ini"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Urutan rancangan"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -2013,6 +2092,11 @@ msgid ""
 "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"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2046,7 +2130,7 @@ msgstr "Customer"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr ""
+msgstr "Advance"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2059,6 +2143,8 @@ msgid ""
 "Allows you to group and invoice your delivery orders according to different "
 "invoicing types: daily, weekly, etc."
 msgstr ""
+"Memungkinkan Anda untuk mengelompokan  dan membuat faktur pengiriman pesanan "
+" Anda sesuai dengan jenis faktur yang berbeda: harian, mingguan, dll"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2073,7 +2159,7 @@ msgstr "Akunting"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Langkah-langkah untuk pengiriman sales order."
 
 #. module: sale
 #: view:sale.order:0
@@ -2097,6 +2183,8 @@ msgstr "Termin Pembayaran"
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
 msgstr ""
+"Menyediakan beberapa fitur untuk meningkatkan  tata letak  laporan  Sales "
+"Order."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2107,11 +2195,17 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Laporan ini melakukan analisis pada penawaran Anda dan pesanan penjualan. "
+"Analisis pendapatan penjualan Anda  memeriksa  dan menyortir itu dengan "
+"kriteria kelompok yang berbeda  (salesman, mitra, produk, dll) Gunakan "
+"laporan ini untuk melakukan analisis penjualan tidak memiliki  tagihan  "
+"belum. Jika Anda ingin menganalisis  omset  Anda, Anda harus menggunakan  "
+"laporan  Analisis  Faktur  dalam  aplikasi  Akuntansi"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
-msgstr ""
+msgstr "Quotation N°"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
@@ -2128,7 +2222,7 @@ msgstr "Tahun"
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr ""
+msgstr "Invoice berdasarkan pengiriman"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Pengadaan kembali"
@@ -2136,9 +2230,6 @@ msgstr ""
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Invoice berhasil dibuat"
 
-#~ msgid "Order Ref."
-#~ msgstr "Ref. Order"
-
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Pengiriman, dari gudang ke pelanggan"
 
@@ -2241,12 +2332,3 @@ msgstr ""
 
 #~ msgid "Draft Invoice"
 #~ msgstr "Konsep Invoice"
-
-#~ msgid "All Months"
-#~ msgstr "Semua Bulan"
-
-#~ msgid "This Month"
-#~ msgstr "Bulan Ini"
-
-#~ msgid "Reporting"
-#~ msgstr "Pelaporan"
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index a691ad6acc9..3910558f189 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/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: 2011-05-26 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2233,85 +2233,6 @@ msgstr "Anno"
 msgid "Invoice Based on Deliveries"
 msgstr "Fattura basata su Consegne"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "fattura da Preparazione Merci"
-
-#~ msgid "Customer Ref."
-#~ msgstr "Rif. Cliente"
-
-#~ msgid "In progress"
-#~ msgstr "In corso"
-
-#~ msgid "Shop name"
-#~ msgstr "Nome Negozio"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Restituisce lo stato del preventivo o dell ordine di vendita. Lo stato di "
-#~ "Eccezione viene applicato automaticamente in presenza di un annullamento nel "
-#~ "processo di validazione della Fattura (Eccezione Fattura) o nel processo di "
-#~ "Preparazione Merci (Eccezione Spedizione). Lo stato 'Attesa Programmata' "
-#~ "viene applicato quando una Fattura viene confermata ma rimane in attesa "
-#~ "della data riportata nel campo di programmazione (Scheduler)."
-
-#~ msgid "Number packages"
-#~ msgstr "Numero Colli"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Progressione Manuale"
-
-#~ msgid "Related Packings"
-#~ msgstr "Preparazioni Merci correlate"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Quantità (UoS)"
-
-#~ msgid "Product UOS"
-#~ msgstr "UoS Prodotto"
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Si deve prima cancellare tutti gli imballaggi associati a questo ordine di "
-#~ "vendita."
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "La Politica di Spedizione è utilizzata per sincronizzare fattura e "
-#~ "operazioni di consegna.\n"
-#~ "  - L'opzione 'Pagamento prima della consegna' genererà prima la fattura e "
-#~ "poi l'ordine di consegna dopo il pagamento di questa fattura.\n"
-#~ "  - L'opzione 'Spedizione e Fatturazione manuale' genererà l'ordine di "
-#~ "consegna direttamente e attenderà che l'utente clicchi manualmente sul "
-#~ "pulsante 'Fattura' per generare la bozza di fattura.\n"
-#~ "  - L'opzione 'Fatturazione su ordine a consegna avvenuta' genererà la bozza "
-#~ "di fattura basata sull'ordine di vendita dopo che tutti gli ordini di "
-#~ "consegna sono stati effettuati.\n"
-#~ "  - L'opzione 'Fatturazione da consegna ordini' è usata per creare una "
-#~ "fattura durante la fase di consegna."
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Se non si ha abbastanza giacenza disponibile sufficiente per la consegna in "
-#~ "una sola transazione, accetta la spedizione parziale o no"
-
 #~ msgid ""
 #~ "This Configuration step use to set default picking policy when make sale "
 #~ "order"
@@ -2319,12 +2240,6 @@ msgstr "Fattura basata su Consegne"
 #~ "Questo passo di configurazione serve ad impostare la politica di consegna "
 #~ "standard quando viene fatto un ordine di vendita"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Non è possibile cancellare una riga di ordine vendita che è stato già "
-#~ "fatturato !"
-
 #~ 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 "
@@ -2678,144 +2593,6 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Righe non fatturate"
 
-#~ 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 After 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 politica di spedizione è utilizzata per sincronizzare le operazioni di "
-#~ "fatturazione e consegna\n"
-#~ "  - La scelta 'Pagamento prima della consegna' dapprima genererà la fattura "
-#~ "e poi, dopo il pagamento di questa fattura, genererà il DDT.\n"
-#~ "  - 'Spedizione e fatturazione manuale' genererà direttamente il DDT e "
-#~ "attenderà che l'utente clicchi manualmente sul bottone \"Crea fattura\" per "
-#~ "generare la bozza di fattura.\n"
-#~ "  - 'Fattura su ordine a consegna effettuata' genererà la bozza di fattura "
-#~ "basata sull'ordine di vendita dopo che la merce sia uscita.\n"
-#~ "  - 'Fattura da DDT' è utilizzato per creare una fattura durante il processo "
-#~ "di spedizione."
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Cruscotto per le vendite"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Cruscotto Vendite"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Vendite del Mese"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Dashboard Sales Manager"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Casi del Mese"
-
-#~ msgid "My open quotations"
-#~ msgstr "Le Mie Domande Aperte"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Statistiche Casi"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Le migliori 10 vendite del mese"
-
-#~ msgid "Average Price"
-#~ msgstr "Prezzo Medio"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Relazione sugli Ordini di Vendita Creati"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Ordini di Vendita per Categoria"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Totale cumulativo Vendite Mensili per un anno"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Ordini di Vendita per Prodotto"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Ammontare Vendite mensili dopo un anno"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Turnover per Prodotto"
-
-#~ msgid "All Months"
-#~ msgstr "Tutti i Mesi"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Ordini di vendita per Categoria"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Vendite del mese"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Vendite per Prodotto (questo mese)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Ammontare complessivo vendite mensili dopo un anno"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Gestione vendite - Segnalazione"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Vendite per categoria di Prodotto"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Ammontare cumulativo Vendite mensili dopo un anno"
-
-#~ msgid "# of Products"
-#~ msgstr "Numero Prodotti"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Vendite per Prodotto"
-
-#~ msgid "This Month"
-#~ msgstr "Questo Mese"
-
-#~ msgid "Categories"
-#~ msgstr "Categorie"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Creazione Ordine di Vendita"
-
-#~ msgid "Reporting"
-#~ msgstr "Reportistica"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Turnover per Mese"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Ammontare Vendite giornaliere dopo un anno"
-
-#~ msgid "Graphs"
-#~ msgstr "Grafici"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Turnover Totale"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Vendite per categoria di Prodotto (questo mese)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Ammontare Vendite giornaliere dopo un anno"
-
-#~ msgid "Create Date"
-#~ msgstr "Data Creazione"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Ordini di Vendita Creati"
-
-#~ msgid "Sales by State"
-#~ msgstr "Stao delle Vendite"
-
 #~ msgid "Customer Ref"
 #~ msgstr "Rif. Cliente"
 
@@ -2825,172 +2602,6 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Procedura per consegnare un ordine di vendita"
 
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Indica che una fattura è stata pagata"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Indirizzo di fatturazione per l'ordine di vendita corrente"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Indirizzo di spedizione per l'ordine di vendita corrente"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Versione di listino per l'ordine di vendita corrente"
-
-#~ msgid "The amount without tax"
-#~ msgstr "L'importo senza tasse"
-
-#~ msgid "The tax amount"
-#~ msgstr "L'importo delle tasse"
-
-#~ msgid "The total amount"
-#~ msgstr "L'importo totale"
-
-#~ msgid ""
-#~ "Incoterm which stands for 'International Commercial terms' implies its a "
-#~ "series of sales terms which are used in the commercial transaction"
-#~ msgstr ""
-#~ "Incoterm, che sta per 'Termini commerciali internazionali', implica una "
-#~ "serie di termini di vendita che vengono usati nelle transazioni commerciali"
-
-#~ msgid "Source document"
-#~ msgstr "Documento di origine"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr ""
-#~ "Riferimento al documento che ha generato questa richiesta di ordine di "
-#~ "vendita."
-
-#~ 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 sale 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 politica di spedizione è utilizzata per sincronizzare lo operazioni di "
-#~ "fatturazione e consegna.\n"
-#~ "  - La scelta 'Pagamento prima della consegna' dapprima genererà la fattura "
-#~ "e poi, dopo il pagamento di questa fattura, genererà il prelievo.\n"
-#~ "  - 'Spedizione e fatturazione manuale' genererà direttamente l'ordine di "
-#~ "prelievo e attenderà che l'utente clicchi manualmente sul bottone “Fattura” "
-#~ "per generare la bozza di fattura.\n"
-#~ "  - 'Fattura su ordine a consegna effettuata' genererà la bozza di fattura "
-#~ "basata sull'ordine di vendita dopo che tutta la merce è stata prelevata.\n"
-#~ "  - 'Fattura alla consegna' è utilizzato per creare una fattura durante il "
-#~ "processo di prelievo."
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Fattura alla consegna"
-
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Questa è la lista di DDT generati per questa Fattura"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Data in cui l'ordine di vendita è stato confermato"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Data in cui l'ordine di vendita è stato creato"
-
-#~ msgid "Related Invoices"
-#~ msgstr "Fatture collegate"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Indica che l'ordine di vendita è stato consegnato. Questo campo viene "
-#~ "aggiornato solamente dopo che il pianificatore è stato lanciato !"
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Lo stato del preventivo o dell'ordine di vendita. \n"
-#~ "Lo stato di eccezione viene automaticamente impostato quando avviene "
-#~ "un'operazione di annullamento nella validazione della fattura o nel processo "
-#~ "di prelievo. \n"
-#~ "Lo stato 'In attesa di pianificazione' viene impostato quando la fattura è "
-#~ "confermata ma si è in attesa che il pianificatore esegua nella 'Data ordine'"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Configura la logistica di ordine di vendita"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Non si può eliminare un ordine di vendita che è %s !"
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Vendite per partner"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Qui viene presentata una lista di ciascuna linea di ordine di vendita da "
-#~ "fatturare. Questa vista permette di fatturare gli ordini di vendita "
-#~ "parzialmente, per linea d'ordine. Non è necessario partire da questa lista "
-#~ "se si emette fattura sulla base degli ordini di consegna o se si fattura "
-#~ "l'ordine nel suo complesso."
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Vednite per cliente"
-
-#~ msgid ""
-#~ "Sales Orders helps you manage quotations and orders done with your "
-#~ "customers. OpenERP suggests that you to start by creating a quotation. Once "
-#~ "the order is confirmed, the quotation is converted into a Sale Order. "
-#~ "OpenERP can handle several types of products so that a sales order can "
-#~ "trigger tasks, delivery orders, manufacturing orders, purchases and so on. "
-#~ "Based on the configuration of the sale 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 agevolano la gestione dei preventivi e degli ordini "
-#~ "verso i clienti. OpenERP suggerisce di partire con la creazione di un "
-#~ "preventivo. Non appena la richiesta è confermata, il preventivo viene "
-#~ "modificato e diventa un ordine di vendita. OpenERP è in grado di gestire "
-#~ "diversi tipi di prodotti così che un ordine di vendita può generare in "
-#~ "automatico delle operazioni correlate come: azioni automatiche, creazione di "
-#~ "consegne, creazioni di ordini di produzione, acquisti, etc. In accordo con "
-#~ "la configurazione dell'ordine di vendita può venir generata in automatico "
-#~ "una fattura in bozza; questo agevola il lavoro della contabilità che non "
-#~ "dovrà creare da zero la fattura ed i movimenti associati ma, una volta che "
-#~ "la fattura deve essere presentata al cliente, si limiterà a confermare la "
-#~ "fattura automaticamente generata."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Vendite per categoria di prodotto"
-
-#~ msgid "Default UoM"
-#~ msgstr "UoM predefinita"
-
-#~ msgid ""
-#~ "If you have more than one shops reselling your company products, you can "
-#~ "create and manage them from here. Whenever you will record a new quotation "
-#~ "or sale 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 sale."
-#~ msgstr ""
-#~ "Se si hanno più negozi che rivendono i prodotti della propria azienda è "
-#~ "possibile crearli e gestirli da qui. Ogni volta che si registra un nuovo "
-#~ "preventivo o un nuovo ordine di vendita questo deve essere assegnato ad un "
-#~ "negozio. Il negozio definisce anche il magazzino dal quale i prodotti "
-#~ "verranno consegnati per ciascun ordine."
-
-#~ msgid "Sales Dashboard"
-#~ msgstr "Dashboard vendite"
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index e6196a6b259..fbec57e8670 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2077,17 +2077,11 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Automatic Declaration"
 #~ msgstr "자동 선언"
 
-#~ msgid "Customer Ref."
-#~ msgstr "고객 참조"
-
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
 #~ msgstr "확정 버튼이 클릭될 때 마다, 초안 상태가 매뉴얼로 이동합니다. 즉, 견적이 판매 주문으로 이동합니다."
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "포장으로부터 인보이스"
-
 #~ msgid "Manual Designation"
 #~ msgstr "매뉴얼 목적지"
 
@@ -2106,9 +2100,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Origin"
 #~ msgstr "기원"
 
-#~ msgid "Shop name"
-#~ 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 "
@@ -2167,16 +2158,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Packing"
 #~ 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 "
-#~ "(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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "인용 상태 또는 판매 주문을 제공합니다. 예외 상태는 인보이스 검증 또는 포장 리스트 프로세스 (선적 예외)에서 취소 오퍼레이션이 발생할 "
-#~ "때, 자동적으로 설정됩니다. '스케줄 대기' 상태는 인보이스가 확정되었지만, 스케줄러가 '주문 날짜'에 이를 때를 기다릴 때 설정됩니다."
-
 #~ msgid "Total amount"
 #~ msgstr "총 금액"
 
@@ -2195,35 +2176,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Sales orders"
 #~ msgstr "판매 주문"
 
-#~ msgid "Number packages"
-#~ msgstr "패키지 수"
-
 #~ msgid "Draft Invoice"
 #~ 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 "
-#~ "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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "선적 정책은 인보이스와 배송 오퍼레이션을 동기화하는데 이용됩니다. \n"
-#~ "    - '배송 전 지불'로 선택하면, 인보이스를 먼저 생성하고 난 뒤, 이 인보이스의 결제 뒤에 포장 주문을 생성합니다. \n"
-#~ "    - '선적 및 매뉴얼 인보이스'를 선택하면, 곧 바로 포장 주문을 생성하고, 사용자가 인보이스 초안을 생성하기 위해 '인보이스' "
-#~ "버튼을 클릭할 때를 기다립니다. \n"
-#~ "    - '배송 뒤, 주문에 기초한 인보이스'를 선택하면, 모든 포장 리스트가 완료된 뒤 판매 주문에 기초하여 인보이스 초안을 "
-#~ "생성합니다.  \n"
-#~ "    - '포장으로부터 인보이스'를 선택하면, 포장 프로세스 중에 인보이스를 생성합니다."
-
-#~ msgid "Manual in progress"
-#~ msgstr "진행 중 매뉴얼"
-
 #~ msgid "Payment accounts"
 #~ msgstr "결제 계정"
 
@@ -2236,9 +2191,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Packing Default Policy"
 #~ msgstr "포장 디폴트 정잭"
 
-#~ msgid "In progress"
-#~ msgstr "진행 중"
-
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "배송과 인보이스 진행 관리"
 
@@ -2287,15 +2239,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "판매 주문 물류 구성"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "수량 (UOS)"
-
 #~ msgid "Sale Procurement"
 #~ msgstr "판매 조달"
 
-#~ msgid "Related Packings"
-#~ msgstr "관련된 포장들"
-
 #~ msgid "Sale Order"
 #~ msgstr "판매 주문"
 
@@ -2305,11 +2251,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgstr ""
 #~ "판매 주문을 확정한 뒤, '인보이스 생성'을 클릭하면 인보이스가 생성됩니다. 이 트랜젝션은 판매 주문을 인보이스로 이동합니다."
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr "한꺼번에 모두 배송할 충분한 스톡이 없다면, 부분 배송을 할 것인지 아닌 지를 결정."
-
 #~ msgid "One procurement for each product."
 #~ msgstr "각 상품 별 하나의 조달"
 
@@ -2322,10 +2263,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "회계사무원이 검토할 고객 인보이스 초안"
 
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr "이 판매 주문에 첨부된 모든 포장들을 먼저 취소하십시오."
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "스톡가능한 상품에 대해 포장 OUT이 생성됩니다."
 
@@ -2380,9 +2317,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Advance 인보이스 오픈"
 
-#~ msgid "Product UOS"
-#~ msgstr "상품 UOS"
-
 #~ msgid "Deliver"
 #~ msgstr "배송"
 
@@ -2393,10 +2327,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "이 판매 주문을 취소하지 못했습니다 !"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr "이미 인보이스가 발행된 판매 주문은 취소할 수 없습니다 !"
-
 #~ msgid "Make invoices"
 #~ msgstr "인보이스 만들기"
 
@@ -2465,30 +2395,3 @@ msgstr "베송에 기초한 인보이스"
 
 #~ msgid "Our Salesman"
 #~ msgstr "우리 판매사원"
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "판매 대시보드"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "판매 대시보드"
-
-#~ msgid "Sales of the month"
-#~ msgstr "월간 판매"
-
-#~ msgid "Sales manager board"
-#~ msgstr "판매 매니저 보드"
-
-#~ msgid "Cases of the month"
-#~ msgstr "월간 케이스"
-
-#~ msgid "My open quotations"
-#~ msgstr "내 오픈 견적들"
-
-#~ msgid "Cases statistics"
-#~ msgstr "케이스 통계"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "월간 10대 판매량"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "판매 주문 물류 구성"
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index f95c32814a2..5cef5431853 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2058,24 +2058,15 @@ msgstr ""
 msgid "Invoice Based on Deliveries"
 msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Pirkėjo nuoroda"
-
 #~ msgid "Origin"
 #~ msgstr "Kilmė"
 
-#~ msgid "Shop name"
-#~ msgstr "Parduotuvės pavadinimas"
-
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatinis deklaravimas"
 
 #~ msgid "Reference"
 #~ msgstr "Nuoroda"
 
-#~ msgid "Number packages"
-#~ msgstr "Pakuočių skaičius"
-
 #~ msgid "Sales orders"
 #~ msgstr "Pardavimų užsakymai"
 
@@ -2394,12 +2385,6 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Packing List & Delivery Order"
 #~ msgstr "Važtaraštis ir pristatymo užsakymas"
 
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Dienų skaičius nuo užsakymo patvirtinimo iki produkto pristatymo klientui"
-
 #~ msgid "Do you really want to create the invoices ?"
 #~ msgstr "Ar jūs tikrai norite sukurti sąskaitas faktūras?"
 
@@ -2495,6 +2480,3 @@ 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 "Configure Sale Order Logistics"
-#~ msgstr "Konfigūruoti pardavimo užsakymo logistiką"
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index 3890f3f8ef8..d44bd5d38d1 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2073,15 +2073,9 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Manual Designation"
 #~ msgstr "Manuāls Norīkojums"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Atsauce uz Klientu:"
-
 #~ msgid "Invoice after delivery"
 #~ msgstr "Rēķins pēc piegādes"
 
-#~ msgid "Shop name"
-#~ msgstr "Veikala nosaukums"
-
 #~ msgid "Outgoing Products"
 #~ msgstr "Izejošā Produkcija"
 
@@ -2135,18 +2129,12 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Sales orders"
 #~ msgstr "Tirdzniecības pasūtījumi"
 
-#~ msgid "Number packages"
-#~ msgstr "Iepakojumu skaits"
-
 #~ msgid "Draft Invoice"
 #~ msgstr "Rēķins (Melnraksts)"
 
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Tirdzniecības pasūtījums kuram jāpiestāda Rēķins"
 
-#~ msgid "In progress"
-#~ msgstr "Progress"
-
 #~ msgid "Packing Default Policy"
 #~ msgstr "Standarta noteikumi iepakošanai"
 
@@ -2175,9 +2163,6 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Sales Process"
 #~ msgstr "Tirdzniecības Process"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Daudzums (Pārd. mērv.)"
-
 #~ msgid "Status"
 #~ msgstr "Statuss"
 
@@ -2190,9 +2175,6 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Izveidot Priekšapmaksas Rēķinu"
 
-#~ msgid "Related Packings"
-#~ msgstr "Sastītie Iepakojumi"
-
 #~ msgid "Sale Order"
 #~ msgstr "Tirdzniecības Pasūtījums"
 
@@ -2244,9 +2226,6 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Atvērt Priekšapmaksas rēķinu"
 
-#~ msgid "Product UOS"
-#~ msgstr "Preces tirdzn. mērv."
-
 #~ msgid "Deliver"
 #~ msgstr "Nosūtīt"
 
@@ -2257,11 +2236,6 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Nevar atcelt šo tirdzniecības pasūtījumu!"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Nevar atcelt Tirdzniecības pasūtījuma pozīciju, par kuru ir izveidots Rēķins!"
-
 #~ msgid "Make invoices"
 #~ msgstr "Veidot Rēķinus"
 
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index ccde203a9b6..8b4c3f30555 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2223,111 +2223,6 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Sale Order line"
 #~ msgstr "Борлуулалтын захиалгын шугам"
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Борлуулалтын самбар"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Борлуулалтын самбар"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Сарын борлуулалт"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Борлуулалтын менежерийн самбар"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Тохиолдлын тоо бүртгэл"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Сарын шилдэг 10 борлуулалт"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Борлуулалтын захиалга үүссэн мэдээлэл"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Нэг жил дэх сар тутмын хуримтлуулсан борлуулалтын эргэлт"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Нэг жил дэх сар тутмын борлуулалтын эргэлт"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Бүтээгдэхүүний дундаж эргэлт"
-
-#~ msgid "All Months"
-#~ msgstr "Бүх сар"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Зэрэглэлээр борлуулалтын захиалга"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Сарын борлуулалт"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Бүтээгдэхүүнээр борлуулах(энэ сар)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Нэг жил дэх сар тутмын борлуулалтын эргэлт"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Борлуулалтын менежмент-Мэдээ"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Бүтээгдэхүүний зэрэглэлээр борлуулах"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Нэг жил дэх сар тутмын хуримтлуулсан борлуулалтын эргэлт"
-
-#~ msgid "# of Products"
-#~ msgstr "Бүтээгдэхүүний #"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Бүтээгдэхүүнээр борлуулах"
-
-#~ msgid "This Month"
-#~ msgstr "Энэ сар"
-
-#~ msgid "Categories"
-#~ msgstr "Зэрэглэлүүд"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Борлуулалтын захиалга үүссэн"
-
-#~ msgid "Reporting"
-#~ msgstr "Мэдээ"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Сарын дундаж эргэлт"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Нэг жил дэх өдөр тутмын борлуулалтын эргэлт"
-
-#~ msgid "Graphs"
-#~ msgstr "График"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Өсөлтийн заавар"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Нийт эргэлт"
-
-#~ msgid "In progress"
-#~ msgstr "Өсөлт"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Бүтээгдэхүүний зэрэглэлээр борлуулах( энэ сар)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Нэг жил дэх өдөр тутмын борлуулалтын эргэлт"
-
-#~ msgid "Create Date"
-#~ msgstr "Үүсгэх огноо"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Борлуулалтын захиалга үүсгэх"
-
-#~ msgid "Sales by State"
-#~ msgstr "Байрлалаар борлуулах"
-
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Борлуулалтын захиалга хүргэх алхам"
 
@@ -2449,55 +2344,6 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Make invoices"
 #~ msgstr "Нэхэмжлэл үүсгэх"
 
-#~ msgid "From a sale order"
-#~ msgstr "Борлуулалтын захиалгаас"
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#, 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: "
-#~ msgstr ""
-#~ "Та %d нэгжийн тоо хэмжээг сонголоо.\n"
-#~ "Гэвч энэ нь сонгосон савлагаанд нийцэхгүй байна.\n"
-#~ "Энд савлагаанд тохирох хэмжих нэгжүүдийг санал болгоё: "
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Борлуулалт (Харилцагчаар)"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Тухайн захиалгын анхан шатны баримтын нэр, дугаар."
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Та эхлээд захиалгын мөртэй холбоотой барааны хөдөлгөөнийг цуцлах хэрэгтэй."
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Борлуулалтын захиалгын %s мөрүүдийг устгах боломжгүй !"
-
-#~ msgid "Average Price"
-#~ msgstr "Дундаж өртөг"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Борлуулалтын захиалгыг үүсгэсэн огноо"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Энд нэхэмжлээгүй байгаа борлуулалтын захиалгын мөрүүд харагдана. Та "
-#~ "захиалгын мөрүүдийг хэсэг хэсгээр нь нэхэмжлэх боломжтой. Уг жагсаалтад "
-#~ "хүргэлтээс нэхэмжлэл үүсгэхээр тохируулагдсан захиалга болон нэхэмжлэл "
-#~ "үүсгэсэн захиалгууд харагдахгүй."
-
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Борлуулалтын захиалгыг цуцалж болохгүй !"
@@ -2505,9 +2351,6 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Our Salesman"
 #~ msgstr "Манай борлуулагч"
 
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Борлуулалтын нэхэмжлэл нээх"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2524,289 +2367,23 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Энэ захиалгыг цуцлах боломжгүй !"
 
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "The quotation '%s' has been converted to a sale order."
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Захиалга батлагдсанаас хойш үйлчлүүлэгчид бараа хүргэгдэх хүртэл "
-#~ "зарцуулагдах дундаж хугацаа (өдрөөр)"
-
-#~ msgid "The total amount"
-#~ msgstr "Захиалгын нийт дүн"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Тухайн захиалгын нэхэмжлэлийг илгээх хаяг"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Борлуулалтын захиалгын урьдчилгаа төлбөр нэхэмжлэл"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Борлуулалтын захиалгатай холбоотой аналитик данс"
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr "Энэ бараанд орлогын данс тодорхойлогдоогүй байна: \"%s\" (id:%d)"
-
-#~ msgid "Unit of Measure "
-#~ msgstr "Хэмжих нэгж "
-
 #, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Батлагдсан төлөвтэй борлуулалтын захиалгыг устгах боломжгүй !"
 
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Борлуулалтын захиалгын мөр бүрт нэг нөхөн дүүргэлтийн захиалга хэрэглэгдэнэ."
-
-#~ msgid "Sale Make Invoice"
-#~ 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 "
-#~ "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 sale 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 ""
-#~ "Захиалга гүйцэтгэх арга нь төлбөр нэхэмжлэх болон бараа хүргэх ажиллагааны "
-#~ "уялдааг тодорхойлно.\n"
-#~ "  - 'Хүргэлтийн өмнө төлбөр хийх': Эхлээд нэхэмжлэл үүсэх бөгөөд бүрэн "
-#~ "төлөгдсөний дараа бараа хүргэлтийн баримт үүснэ.\n"
-#~ "  - 'Хүргэлтийн дараа нэхэмжлэлийг гараар үүсгэх': Захиалгаас шууд бараа "
-#~ "хүргэлтийн баримт үүсэх бөгөөд агуулахын ажилтан 'Нэхэмжлэл үүсгэх' товч "
-#~ "дарж ноорог нэхэмжлэл үүсгэнэ.\n"
-#~ "  - 'Хүргэлтийн дараа захиалга дээр үндэслэн нэхэмжлэл үүсгэх': Бүх "
-#~ "хүргэлтийн баримтууд гүйцэтгэгдэж дууссаны дараа захиалга дээр үндэслэн "
-#~ "нэхэмжлэл үүснэ.\n"
-#~ "  - 'Хүргэлтээс нэхэмжлэл үүсэх': Захиалгыг бэлтгэж хүргэх явцад нэхэмжлэл "
-#~ "үүснэ."
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Энэ нь нэхэмжлэл бүрэн төлөгдсөн эсэхийг илэрхийлнэ"
-
-#~ msgid "Gives the sequence order when displaying a list of sale order lines."
-#~ msgstr ""
-#~ "Борлуулалтын захиалгын мөрийн жагсаалтанд харагдах эрэмбэ дарааллыг "
-#~ "тодорхойлно."
-
-#~ msgid "The tax amount"
-#~ msgstr "Татварын нийлбэр дүн"
-
-#~ msgid ""
-#~ "Sales Orders helps you manage quotations and orders done with your "
-#~ "customers. OpenERP suggests that you to start by creating a quotation. Once "
-#~ "the order is confirmed, the quotation is converted into a Sale Order. "
-#~ "OpenERP can handle several types of products so that a sales order can "
-#~ "trigger tasks, delivery orders, manufacturing orders, purchases and so on. "
-#~ "Based on the configuration of the sale order, a draft invoice will be "
-#~ "generated so that you just have to confirm it when you want to bill your "
-#~ "customer."
-#~ msgstr ""
-#~ "Та үйлчлүүлэгчийн захиалгыг үнийн саналаас эхлэн дууссан төлөвтэй "
-#~ "борлуулалтын захиалга хүртэлх бүхий л ажиллагааг удирдах боломжтой. Та "
-#~ "эхлээд үнийн санал үүсгэнэ. Захиалгыг батлахад үнийн санал нь жинхэнэ "
-#~ "борлуулалтын захиалга болон хувирна. OpenERP систем нь хэд хэдэн төрлийн "
-#~ "бүтээгдэхүүнийг борлуулах боломжтой бөгөөд тэдгээрийн төрлөөс хамаараад "
-#~ "захиалгаас үүдэн үүрэг даалгавар, хүргэлтийн захиалга, үйлдвэрлэлийн "
-#~ "захиалга, худалдан авалтын захиалга зэрэг баримтууд үүснэ. Борлуулалтын "
-#~ "захиалгын тохиргооноос хамаараад ноорог нэхэмжлэл үүсэх бөгөөд та түүнийг "
-#~ "үйлчлүүлэгчид илгээхийн өмнө батлах шаардлагатай."
-
-#~ msgid "Pricelist version for current sale order"
-#~ 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 "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory объект дээр дүрэм хэрэглэх боломжгүй !"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "Борлуулалтын захиалга '%s' цуцлагдсан."
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Хүргэлтээс нэхэмжлэл үүсэх"
-
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr ""
 #~ "Энэ дэлгэц нь сонгосон нэхэмжлэлийн эх баримт бүхий агуулахын баримтын "
 #~ "жагсаалт юм"
 
-#~ msgid ""
-#~ "\n"
-#~ "    The base module to manage quotations and sales orders.\n"
-#~ "\n"
-#~ "    * Workflow with validation steps:\n"
-#~ "        - Quotation -> Sale 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"
-#~ "    * Хяналтын ажлын урсгалын алхам:\n"
-#~ "        - Үнийн санал -> Борлуулалтын захиалга -> Нэхэмжлэл\n"
-#~ "    * Нэхэмжлэлийн хэлбэр:\n"
-#~ "        - Захиалсан тоогоор нэхэмжлэх (хүргэлтийн өмнө эсвэл дараа)\n"
-#~ "        - Хүргэсэн тоогоор нэхэмжлэх\n"
-#~ "        - Цагийн хүснэгтийн нэхэмжлэл\n"
-#~ "        - Урьдчилгаа нэхэмжлэл\n"
-#~ "    * Харилцагчийн хүсэлт сонирхэл (хүргэлт, нэхэмжлэл, худалдааны нөхцөл, "
-#~ "...)\n"
-#~ "    * Барааны нөөц болон үнэ\n"
-#~ "    * Хүргэлтийн хэлбэр:\n"
-#~ "        - бүгдийг нэг удаагаар, олон хуваан хүргэх\n"
-#~ "        - хүргэлтийн өртөг\n"
-#~ "    * Дараахыг багтаасан борлуулагчийн хяналтын самбар:\n"
-#~ "    * Таны нээлттэй үнийн санал\n"
-#~ "    * Сарын шилдэг 10 захиалга\n"
-#~ "    * Боломж шинжилгээ\n"
-#~ "    * Барааны борлуулалтын график\n"
-#~ "    * Сарын боломжын график\n"
-#~ "    "
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Борлуулагч захиалгыг батласны дараа захиалгаас нэхэмжлэл үүсгэх боломжтой "
-#~ "болно. Борлуулалтын захиалга дээрх нэхэмжлэл тохируулгаас хамаараад "
-#~ "хүргэлтэнд үндэслэх, эсвэл захиалсан тоо хэмжээн дээр үндэслэн нэхэмжлэл "
-#~ "үүснэ."
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Үнийн санал болон захиалгын төлөв байдлыг тодорхойлно. \n"
-#~ "Нэхэмжлэл цуцлагдах (Нэхэмжлэлийн саатал), бараа бэлтгэх ажиллагаа цуцлагдах "
-#~ "(Хүргэлтийн саатал) зэрэг тохиолдолд захиалга автоматаар 'Саатал' төлөвт "
-#~ "шилжинэ.\n"
-#~ "Нэхэмжлэл батлагдсан боловч захиалгын огноо болоогүй байвал 'Хуваарь хүлээх' "
-#~ "төлөвт шилжинэ."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* 'Ноорог': борлуулалтын захиалга ноорог төлөвтэй байгааг илэрхийлнэ.        "
-#~ "             \n"
-#~ "* 'Батлагдсан': борлуулалтын захиалга баталгаажсаныг илэрхийлнэ.             "
-#~ "        \n"
-#~ "* 'Саатал': борлуулалтын захиалгад ямар нэгэн саатал гарсаныг илэрхийлнэ.    "
-#~ "                 \n"
-#~ "* 'Дууссан': борлуулалтын захиалга бүрэн хийгдэж дууссаныг илэрхийлнэ.       "
-#~ "              \n"
-#~ "* 'Цуцлагдсан': борлуулалтын захиалга бүхэлдээ цуцлагдсныг илэрхийлнэ."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Барааны ангиллаар борлуулах"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Тоо хэмжээ: "
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Борлуулалтын захиалгын мөр бүрт нөхөн дүүргэлтийн захиалга үүснэ."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Борлуулалтын захиалга ноороглох"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Батлагдсан борлуулалтын захиалга нэхэмжлэх."
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Борлуулалтын захиалгын мөрийг цуцалж чадсангүй!"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Борлуулалтын захиалгыг баталгаажуулсан огноо"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Борлуулалт(Борлуулагчаар)"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Тухайн захиалгыг хүргэж өгөх хаяг"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Энэ нь захиалга хүргэгдсэнийг илэрхийлнэ. Энэ талбар нь хүргэлтийн баримтаас "
-#~ "хамаараад автоматаар бөглөгдөнө !"
-
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr "Та эхлээд уг захиалгатай холбоотой нэхэмжлэлүүдийг цуцлах хэрэгтэй."
 
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr ""
-#~ "Та эхлээд уг захиалгатай холбоотой бараа хүргэлтийн баримтуудыг цуцлах "
-#~ "хэрэгтэй."
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr "Энэ компанид борлуулалтын журнал алга: \"%s\" (id:%d)"
-
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Хүргэлтийн дараа захиалга дээр үндэслэн нэхэмжлэх"
 
-#~ msgid "Source document"
-#~ msgstr "Эх баримт"
-
-#~ msgid "The amount without tax"
-#~ 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 "
@@ -2815,53 +2392,5 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ "Энэ бол захиалгад зориулан үүсгэсэн нэхэмжлэлийн жагсаалт юм. Нэг захиалгыг "
 #~ "хэд хэдэн удаа нэхэмжилж болно (жишээ нь мөр бүрээр)."
 
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "Борлуулагч үнийн саналыг батална. Борлуулалтын захиалга 'хийгдэж байна' "
-#~ "болон 'гараар хийгдэж байна' гэсэн төлөвтэй болно."
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Борлуулалт (Үйлчлүүлэгчээр)"
-
 #~ msgid "Sale Order Lines"
 #~ msgstr "Захиалгын мөрүүд"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Та 'Хүргэлтийн дараа автоматаар нэхэмжлэх' гэсэн гүйцэтгэх арга \\n          "
-#~ "                   тохируулагдсан захиалга дээр урьдчилгаа нэхэмжлэх "
-#~ "боломжгүй."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "'%s' борлуулалтын захиалга ноорог төлөвтэй боллоо."
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Борлуулалтын захиалга батлагдсан эсвэл нэхэмжлэл бүрэн төлөгдсөний дараа "
-#~ "нөхөн дүүргэлтийн захиалга автоматаар үүснэ. Нөхөн дүүргэлтийн захиалга нь  "
-#~ "борлуулалтын захиалгын өгөгдлөөс хамаарч худалдан авалт эсвэл үйлдвэрлэлийн "
-#~ "захиалга болон хувирна. "
-
-#~ msgid "Default UoM"
-#~ msgstr "Үндсэн х.н"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Та 'Хүргэлтийн дараа автоматаар нэхэмжлэх' гэсэн гүйцэтгэх арга "
-#~ "тохируулагдсан захиалга дээр урьдчилгаа нэхэмжлэх боломжгүй."
-
-#~ msgid "Related Invoices"
-#~ msgstr "Холбогдох нэхэмжлэлүүд"
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index 74171fcd666..e5fbb3ce43a 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -1296,7 +1296,7 @@ msgstr "Enhetspris"
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Done"
-msgstr "Utført"
+msgstr "Fullført"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
@@ -2191,10 +2191,6 @@ msgstr "Faktura basert på leveringer"
 #~ msgid "Order Ref"
 #~ msgstr "Ordreref."
 
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Kvantum: "
-
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2213,20 +2209,12 @@ msgstr "Faktura basert på leveringer"
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Mine salg med forsendelseunntak"
 
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Type av ul: "
-
 #~ msgid "Procurement Corrected"
 #~ msgstr "Endret innkjøp"
 
 #~ msgid "Status"
 #~ msgstr "Status"
 
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
 #~ msgid "Our Salesman"
 #~ msgstr "Vår salgsperson"
 
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index b3caa0c8487..54faceb55d8 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -25,7 +25,7 @@ msgstr "Omzet per verkoper in de laatste 90 dagen"
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Laat u verzendkosten berekenen op uw offertes."
+msgstr "Geeft de mogelijkheid om verzendkosten te berekenen op offertes"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -33,8 +33,8 @@ 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, "
-"accepteert u dan deelleveringen?."
+"Indien er onvoldoende voorraad is om alles in een zending te leveren, worden "
+"er dan deelleveringen geaccepteerd?"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
@@ -94,7 +94,7 @@ msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderregel."
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr "Alles ineens"
+msgstr "Complete leveringen"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -823,7 +823,7 @@ msgstr ""
 "    * Relatie voorkeuren (levering, facturatie, voorwaarden, ...)\n"
 "    * Product voorraad en prijzen\n"
 "    * Levering methodes:\n"
-"        - alles ineens, deelleveringen\n"
+"        - complete leveringen, deelleveringen\n"
 "        - verzendkosten\n"
 "    * Dashboard voor verkoper die bevat:\n"
 "    * Uw open offertes\n"
@@ -1132,7 +1132,7 @@ msgstr "Belastingen"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr "Leveringscondities"
+msgstr "Behandelwijze"
 
 #. module: sale
 #: help:sale.order,create_date:0
@@ -1168,7 +1168,7 @@ msgstr "Voorschotbedrag"
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr "Verzonden aantallen"
+msgstr "Verzonden hoeveelheden"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
@@ -1761,7 +1761,7 @@ msgstr "Instellingen"
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr "Volledige levering"
+msgstr "Complete zending"
 
 #. module: sale
 #: view:sale.report:0
@@ -1938,7 +1938,7 @@ msgstr "Verkooporders"
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr "Rechtstreekse levering"
+msgstr "Deelleveringen"
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
@@ -2212,77 +2212,6 @@ msgstr "Jaar"
 msgid "Invoice Based on Deliveries"
 msgstr "Facturatie gebaseer op leveringen"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Aantal (UOS)"
-
-#~ msgid "Product UOS"
-#~ msgstr "Product Verkoopeenh."
-
-#~ msgid "Customer Ref."
-#~ msgstr "Klant ref"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Factureer op basis van pakbonnen"
-
-#~ msgid "Shop name"
-#~ msgstr "Naam verkooppunt"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr "Dit geeft de status van de offerte-aanvraag of verkooporder."
-
-#~ msgid "Manual in progress"
-#~ msgstr "Handmatig in bewerking"
-
-#~ msgid "Number packages"
-#~ msgstr "Aantal pakketten"
-
-#~ msgid "Related Packings"
-#~ msgstr "Gerelateerde pakbonnen"
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Wanneer er niet voldoende voorraad aanwezig is om alles te leveren moet er "
-#~ "dan deels worden geleverd of niet."
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr "Eerst moeten alle pakbonnen geannuleerd worden van deze verkooporder"
-
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr "U kunt geen verkooporder annuleren die al is verzonden !"
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "De verzendpolicy wordt gebruikt om facturering en verzending te "
-#~ "synchroniseren\n"
-#~ "  - De 'Vooraf betalen' optie genereert eerst een factuur en genereerd de "
-#~ "verzendopdracht nadat de factuur is betaald\n"
-#~ "  - De 'Verzenden en handmatig factureren' optie genereerd direct een "
-#~ "verzendopdracht en wacht tot de gebruiker op 'Factureren' knop klikt om een "
-#~ "concept factuur te maken\n"
-#~ "  - De 'Factureren na verzending' optie genereert een concept factuur nadat "
-#~ "alle pakbonnen zijn verwerkt.\n"
-#~ "  - De 'Factureren op basis van pakbonnen' optie wordt gebruikt om de "
-#~ "factuur te genereren in het verzend proces."
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Vraag opnieuw aan"
 
@@ -2646,126 +2575,9 @@ msgstr "Facturatie gebaseer op leveringen"
 #~ "In de verkooporder, de aanschaf voor elke verkoopregel komt in de "
 #~ "inkooporder."
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Dashboard voor verkoop"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Verkopers dashboard"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Dossiers van de maand"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Verkoop dashboard"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Maandelijkse verkopen"
-
-#~ msgid "My open quotations"
-#~ msgstr "Mijn open offerte aanvragen"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Dossier-statistieken"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Omzet per product"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Maandelijkse verkoop-omzet over één jaar"
-
-#~ msgid "All Months"
-#~ msgstr "Alle maanden"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Top-tien verkopen van de maand"
-
-#~ msgid "Average Price"
-#~ msgstr "Gemiddelde prijs"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Maandelijkse verkoopomzet gedurende één jaar"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Verkoop per product (deze maand)"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Verkoopbeheer - Overzichten"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Maandelijkse cumulatieve verkoop-omzet over één jaar"
-
-#~ msgid "# of Products"
-#~ msgstr "# Producten"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Dagelijkse verkoop-omzet over één jaar"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Dagelijkse verkoop-omzet over één jaar"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Totale omzet"
-
-#~ msgid "Categories"
-#~ msgstr "Categorieën"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Omzet per maand"
-
-#~ msgid "Create Date"
-#~ msgstr "Aanmaakdatum"
-
-#~ msgid "Sales by State"
-#~ msgstr "Verkopen per status"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de actie-definitie."
 
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Overzicht aangemaakte verkoopopdrachten"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Verkoopopdrachten per categorie"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Maandelijkse cumulatieve verkoop over een jaar"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Verkoopopdrachten per product"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Verkoopopdrachten per categorie"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Verkoop van de maand"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Verkoop per productcategorie"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Verkoop per product"
-
-#~ msgid "This Month"
-#~ msgstr "Deze maand"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Gemaakte verkoopopdrachten"
-
-#~ msgid "Reporting"
-#~ msgstr "Overzichten"
-
-#~ msgid "Graphs"
-#~ msgstr "Diagrammen"
-
-#~ msgid "In progress"
-#~ msgstr "In behandeling"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Verkoop per productcategorie (deze maand)"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Aangemaakte verkoopopdrachten"
-
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Factureren van pakbon"
 
@@ -2774,30 +2586,3 @@ msgstr "Facturatie gebaseer op leveringen"
 
 #~ msgid "Related Packing"
 #~ msgstr "Gerelateerde verzending"
-
-#~ 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 After 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 ""
-#~ "Het verzend-beleid wordt gebruikt om de factuur en de levering te "
-#~ "synchroniseren.\n"
-#~ "  - Bij 'Vooruitbetaling' wordt er eerst een factuur gegenereerd. Nadat de "
-#~ "factuur is voldaan wordt er een pakbon gegenereerd.\n"
-#~ "  - Bij 'Verzenden & handmatige facturatie' wordt er direct een pakbon "
-#~ "aangemaakt. Vervolgens moet er handmatig een concept factuur worden "
-#~ "aangemaakt.\n"
-#~ "  - Bij 'Factureren na uitlevering' wordt er een concept factuur aangemaakt "
-#~ "aan de hand van de verkooporder nadat alle pakbonnen zijn afgehandeld.\n"
-#~ "  - Bij 'Factureren van Pakbon' wordt de factuur aangemaakt tijdens het "
-#~ "order-picken."
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Stel verkooplogistiek in"
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
new file mode 100644
index 00000000000..b40a8630c3d
--- /dev/null
+++ b/addons/sale/i18n/oc.po
@@ -0,0 +1,2059 @@
+# 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: 2011-01-11 11:16+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\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 ""
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+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
+#: 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
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr ""
+
+#. 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 ""
+
+#. 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
+#: 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
+#: 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
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+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
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+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
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+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: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
+#: code:addons/sale/sale.py:1014
+#, 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
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+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:620
+#, 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:584
+#, 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
+#: 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 ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+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
+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:971
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1042
+#, 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
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
+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.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+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
+#: 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
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+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.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:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Invalid action !"
+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
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+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
+#: view:sale.report:0
+msgid "  Year  "
+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:970
+#, 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
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. 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 ""
+
+#. 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_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+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
+#: code:addons/sale/sale.py:966
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+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
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+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
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+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
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "Sales Application Configuration"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+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
+#: 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
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+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 "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+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
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+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: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
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+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.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+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
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. 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 ""
+
+#. module: sale
+#: code:addons/sale/sale.py:570
+#, python-format
+msgid "Could not cancel 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
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1051
+#, python-format
+msgid "Picking Information !"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
+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
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. 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 ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+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
+#: 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
+#: 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 ""
+
+#. 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:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+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:1014
+#, 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
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
+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:571
+#, 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
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+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:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+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
+#: 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 ""
+
+#. 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.order,state:0
+#: 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:921
+#, 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: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 ""
+
+#. 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
+#: code:addons/sale/sale.py:388
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+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
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
+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
+#: 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,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
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+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
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+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
+#: 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
+#: view:sale.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, 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
+#: 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 ""
+
+#. 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
+#: 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
+#: 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
+#: 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
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. 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 ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+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
+#: 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
+#: field:sale.installer,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:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. 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 ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, 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
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+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
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:585
+#, 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
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+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
+#: code:addons/sale/sale.py:290
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, 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
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1115
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+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
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+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
+#: 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 ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
+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
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Relambi de pagament"
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+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
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Devís N°"
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: view:sale.report:0
+msgid "Picked"
+msgstr "Liurada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Annada"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+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 95a75a36abd..555390a6dda 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2251,11 +2251,6 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Sale Order Line"
 #~ msgstr "Pozycja zamówienia sprzedaży"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Nie możesz anulować zamówienia sprzedaży, które zostało już zafakturowane !"
-
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Cennik zakupu"
 
@@ -2277,18 +2272,12 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Deklaracja automatyczna"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Nr u klienta"
-
 #~ msgid "Invoice after delivery"
 #~ msgstr "Faktura po dostawie"
 
 #~ msgid "Origin"
 #~ msgstr "Pochodzenie"
 
-#~ msgid "Shop name"
-#~ msgstr "Nazwa sklepu"
-
 #~ msgid "Net Price"
 #~ msgstr "Cena netto"
 
@@ -2335,19 +2324,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Konfiguruj ligistykę zamówienia sprzedaży"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Ilość (JS)"
-
 #~ msgid "One procurement for each product."
 #~ msgstr "Jedno nabycie na każdy produkt"
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Czy akceptujesz wysyłkę częściową, jeśli nie masz wystarczających zapasów, "
-#~ "aby dostarczyć całość."
-
 #~ msgid "Make Invoice"
 #~ msgstr "Utwórz fakturę"
 
@@ -2357,9 +2336,6 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Otwarte faktury płatne z góry"
 
-#~ msgid "Product UOS"
-#~ msgstr "JS produktu"
-
 #~ msgid "Make invoices"
 #~ msgstr "Utwórz faktury"
 
@@ -2471,36 +2447,6 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Draft Invoice"
 #~ msgstr "Projekt faktury"
 
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "Sposób wysyłki jest stosowany do uzgodnienia operacji fakturowania i "
-#~ "wysyłki.\n"
-#~ "  - 'Płatność przed dostawą' wygeneruje fakturę, a następnie po zapłacie "
-#~ "wysyłkową listę przesunięć.\n"
-#~ "  - 'Wysyłka i ręczna faktura' utworzy od razu listę przesunięć i będzie "
-#~ "czekać na użytkownika, aż naciśnie przycisk 'Faktura', aby utworzyć projekt "
-#~ "faktury.\n"
-#~ "  - 'Faktura wg zamówienia po dostawie' wygeneruje projekt faktury wg "
-#~ "zamówienia po zrealizowaniu wszystkich wysyłkowych list przesunięć.\n"
-#~ "  - 'Faktura wg dostawy' jest stosowane do tworzenia faktur podczas "
-#~ "wydawania towarów."
-
-#~ msgid "Manual in progress"
-#~ msgstr "Ręczne w trakcie przetwarzania"
-
-#~ msgid "In progress"
-#~ msgstr "W trakcie przetwarzania"
-
 #~ msgid "Packing Default Policy"
 #~ msgstr "Domyślne zasady wydawania"
 
@@ -2523,15 +2469,6 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Sale Procurement"
 #~ msgstr "Nabycie dla sprzedaży"
 
-#~ msgid "Related Packings"
-#~ msgstr "Odnośne listy przesunięć"
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Musisz najpierw anulować wszystkie listy przesunięć związane z tym "
-#~ "zamówieniem sprzedaży."
-
 #~ msgid "Quotation (A sale order in draft state)"
 #~ msgstr "Oferta (zamówienie sprzedaży w stanie Projekt)"
 
@@ -2541,9 +2478,6 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Related invoices"
 #~ msgstr "Odnośne faktury"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Faktura wg dostawy"
-
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2552,19 +2486,6 @@ msgstr "Faktura wg dostaw"
 #~ "przechodzi w Ręczny, a to oznacza, że oferta zmieniła się w Zamówienie "
 #~ "sprzedaży."
 
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Określa stan oferty lub zamówienia sprzedaży. Stan wyjątku jest nadawany, "
-#~ "gdy wystąpi operacja anulowania przy zatwierdzaniu faktury (Wyjątek faktury) "
-#~ "lub w procesie listy przesunięć (Wyjątek wysyłki). Stan 'Oczekuje na "
-#~ "planowanie' zostaje ustawiony, gdy faktura jest potwierdzona, ale czeka na "
-#~ "planistę do daty 'Data zamówienia'."
-
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2615,29 +2536,6 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Nie można anulować tego 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 "
-#~ "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 After 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 ""
-#~ "Zasady wysyłki są stosowane do synchronizowania operacji fakturowych i "
-#~ "wysyłkowych.\n"
-#~ "  - 'Płać przed wysyłką' najpierw wygeneruje fakturę a potem, po otrzymaniu "
-#~ "wpłaty, wygeneruje zamówienie wysyłki.\n"
-#~ "  - 'Wysyłka i faktura ręczna' utworzy zamówienie wysyłki od razu i poczeka, "
-#~ "aż użytkownik naciśnie przycisk 'Faktura', aby wygenerować projekt faktury.\n"
-#~ "  - 'Faktura wg zamówienia po postawie' utworzy projekt faktury po wysyłce "
-#~ "na podstawie zamówienia.\n"
-#~ "  - 'Faktura wg wysyłki' jest stosowana do tworzenia faktury w trakcie "
-#~ "procesu wysyłki."
-
 #~ 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 "
@@ -2689,249 +2587,10 @@ msgstr "Faktura wg dostaw"
 #~ "  - 'Faktura z wydania' utworzy fakturę w trakcie wykonywania wydania "
 #~ "zewnętrznego."
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Konsola dla sprzedaży"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Konsola szefa sprzedaży"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Sprawy miesiąca"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Konsola sprzedaży"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Sprzedaż w miesiącu"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Najlepsze sprzedaże w miesiącu"
-
-#~ msgid "Average Price"
-#~ msgstr "Cena przeciętna"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Statystyka spraw"
-
-#~ msgid "My open quotations"
-#~ msgstr "Moje otwarte zamówienia"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Obrót na produkt"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Miesięczny obrót w jednym roku"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Zamówienia sprzedaży wg produktów"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Miesięczny skumulowany obrót w jednym roku"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Sprzedaż w miesiącu"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Zamówienia sprzedaży wg kategorii"
-
-#~ msgid "All Months"
-#~ msgstr "Wszystkie miesiące"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Raport z utworzonych zamówień sprzedaży"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Zamówienia sprzedaży wg kategorii"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Sprzedaż wg produktu (w tym miesiącu)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Miesięczny obrót w ciągu roku"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Sprzedaż wg produktów"
-
-#~ msgid "This Month"
-#~ msgstr "Bieżący miesiąc"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorie"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Utworzone zamówienia sprzedaży"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Sprzedaż - Raportowanie"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Sprzedaż wg kategorii produktów"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Miesięczny skumulowany obrót w ciągu jednego roku"
-
-#~ msgid "# of Products"
-#~ msgstr "# Produktów"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Dizenny obrót na rok"
-
-#~ msgid "Create Date"
-#~ msgstr "Data utworzenia"
-
-#~ msgid "Graphs"
-#~ msgstr "Wykresy"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Dzienny obrót na rok"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Sprzedaż wg kategorii poroduktów (w tym miesiącu)"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Suma obrotów"
-
-#~ msgid "Reporting"
-#~ msgstr "Raportowanie"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Obrót miesięczny"
-
-#~ msgid "Sales by State"
-#~ msgstr "Sprzedaż wg stanu"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Utworzone zamówienia sprzedaży"
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Sprzedaż wg partnera"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Odnośnik do dokumentu, który wygenerował to zamówienie sprzedaży."
-
-#, 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: "
-#~ msgstr ""
-#~ "Wybrałeś ilości dla jednostek %d.\n"
-#~ "Ale to jest niezgodne z wybranymi opakowaniami.\n"
-#~ "To jest propozycja ilości dostosowanej do opakowań: "
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Nie mozna usunąć pozycji zamówienia sprzedaży, która jest %s !"
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Musisz najpierw anulować przesunięcia zapasów związane z tą pozycją "
-#~ "zamówienia sprzedaży."
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Data utworzenia zamówienia sprzedaży"
-
-#~ msgid "From a sale order"
-#~ msgstr "Z zamówienia sprzedaży"
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Otwarte faktry sprzedaży"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Adres faktury dla bieżącego zamówienia sprzedaży"
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Liczba dni pomiędzy potwierdzeniem zamówienia a wysyłką produktów do klienta"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Konto analityczne związane z tym zamówieniem sprzedaży"
-
-#~ msgid "The total amount"
-#~ msgstr "Suma kwot"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "Oferta '%s' została skonwertowana do zamówienia sprzedaży."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Nie zdefiniowano konta przychodów ' \\n 'dla produktu: \"%s\" (id:%d)"
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Sprzedaż tworzy fakturę"
-
-#~ msgid ""
-#~ "One Procurement order for each sale 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 "It indicates that an invoice has been paid"
-#~ msgstr "To oznacza, że faktura została zapłacona"
-
-#~ 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 sale 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 ""
-#~ "Zasady wysyłki są stosowane do synchronizowania operacji fakturowania i "
-#~ "wydań.\n"
-#~ "  - 'Płatność przed dostawą' najpierw wygeneruje fakturę, a wydanie "
-#~ "zewnętrzne po zapłaceniu faktury.\n"
-#~ "  - 'Wysyłka i ręczna faktura' utworzy pobranie i będzie czekać na "
-#~ "użytkownika, aż utworzy projekt faktury przyciskiem.\n"
-#~ "  - 'Faktura wg zamówienia po wysyłce' wygeneruje projekt faktury na "
-#~ "podstawie zamówienia po wykonaniu pobrania..\n"
-#~ "  - 'Faktura z pobrania' jest stosowana do tworzenia faktury w trakcie "
-#~ "wykonywania pobrania."
-
-#~ msgid "The tax amount"
-#~ msgstr "Kwota podatku"
-
-#~ 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) wprowadza terminy sprzedażowe "
-#~ "stosowane w transakcjach handlowych"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Numer kolejny"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "Zamówienie sprzedaży '%s' zostało anulowane."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "Zamówienie sprzedaży '%s' zostało ustawione w stan Projekt."
-
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "To pobranie zostało utworzone dla tej faktury"
 
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Sprzedaż wg kategorii produktu"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Ilość: "
-
 #, python-format
 #~ msgid "You must first cancel all packing attached to this sale order."
 #~ msgstr ""
@@ -2966,118 +2625,3 @@ msgstr "Faktura wg dostaw"
 
 #~ msgid "Invoice based on packing lists"
 #~ msgstr "Faktura wg pobrania"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Nie można utworzyć faktury z tej pozycji zamówienia sprzedaży z jednego z "
-#~ "powodów:\n"
-#~ "1.Stan pozycji jest \"Projekt\" lub \"Anulowano\"!\n"
-#~ "2.Pozycja jest już zafakturowana!"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "To jest lista pozycji zamówień sprzedaży do fakturowania. Ten widok pozwala "
-#~ "fakturować zamówienia sprzedaży częściowo, po pozycji. Nie potrzebujesz tej "
-#~ "listy, jeśli fakturujesz na podstawie wysyłek lub jeśli fakturujesz w "
-#~ "całości."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Faktura zaliczkowa"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Nie można wystawiać faktury zaliczkowej dla zamówienia sprzedaży "
-#~ "zdefiniowanego jako \"Automatyczna faktura po dostawie\"."
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Wersja cannika dla bieżącego zamówienia sprzedaży"
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Faktura z wydania"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Sprzedaż wg sprzedawców"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Data potwierdzenia zamówienia sprzedaży"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Adres wysyłki dla zamówienia sprzedaży"
-
-#~ msgid "Default UoM"
-#~ msgstr "Domyślna JM"
-
-#~ msgid "Source document"
-#~ msgstr "Źródło dokumentu"
-
-#~ msgid "Logistics"
-#~ msgstr "Logistyka"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Konfiguruj ligistykę zamówienia sprzedaży"
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Sprzedaż wg klientów"
-
-#~ msgid ""
-#~ "Depending on the Invoicing control of the sale order, the invoice can be "
-#~ "based on delivered or on ordered quantities. Thus, a sale 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ć "
-#~ "generowana na ilości dostarczone lub zamówione. Dzięki tym ustawieniom "
-#~ "potwierdzenie zamówienia sprzedaży może od razu generować fakturę."
-
-#~ msgid ""
-#~ "Sales Orders helps you manage quotations and orders done with your "
-#~ "customers. OpenERP suggests that you to start by creating a quotation. Once "
-#~ "the order is confirmed, the quotation is converted into a Sale Order. "
-#~ "OpenERP can handle several types of products so that a sales order can "
-#~ "trigger tasks, delivery orders, manufacturing orders, purchases and so on. "
-#~ "Based on the configuration of the sale 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ą elementem porządkującym oferty dla klientów i "
-#~ "zamówienia od klientów. Zalecamy rozpoczynanie sprzedaży od sporządzenia "
-#~ "oferty. Po potwierdzeniu oferty staje się ona zamówieniem sprzedaży. Dzięki "
-#~ "temu, że OpenERP rozpoznaje typy produktów, zamówienie sprzedaży może "
-#~ "wygenerować zadanie, zamówienie dostawy, zamówienie produkcji lub zamówienie "
-#~ "zakupu. W Konfiguracji zamówienia sprzedaży można ustawić, że po "
-#~ "potwierdzeniu zamówienia sprzedaży automatycznie zostanie wygenerowany "
-#~ "projekt faktury dla klienta."
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "Kiedy sprzedawca potwierdza ofertę, to zmienia się ona w zamówienie "
-#~ "sprzedaży w stanie 'W toku' lub 'Ręcznie w toku'."
-
-#~ msgid "Sales Dashboard"
-#~ msgstr "Konsola sprzedaży"
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 04b8024da73..58356e0183f 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -25,7 +25,7 @@ msgstr "Vendas por vendedor nos últimos 90 dias"
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Possibilita a calcular os custos de entrega nas cotações."
+msgstr "Permite calcular os custos de entrega nas cotações."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -33,13 +33,13 @@ 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 suficiente disponível para entregar tudo de uma vez, "
-"aceita a entrega parcial ou não?"
+"Se não tiver inventário disponível para entregar tudo de uma vez, aceita a "
+"entrega parcial ou não?"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr "Morada de entrega para esta ordem de venda."
+msgstr "Endereço de entrega para esta ordem de venda."
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -57,7 +57,7 @@ msgstr "Dia"
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Cancelar Ordem"
+msgstr "Cancelar Ordem de Venda"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -650,7 +650,7 @@ msgstr "Lista de preços"
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "Qtd"
 
 #. module: sale
 #: view:sale.order:0
@@ -785,7 +785,7 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Loja"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
@@ -1046,7 +1046,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Data da ordem"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
@@ -1814,7 +1814,7 @@ msgstr "Venda de artigos"
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+msgstr "Data da Ordem"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -1842,7 +1842,7 @@ msgstr "Artigo \"Adiantamento\""
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "Qtd Enviada"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -1939,7 +1939,7 @@ msgstr "Fechar"
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "Entregue"
 
 #. module: sale
 #: code:addons/sale/sale.py:1115
@@ -2082,59 +2082,9 @@ msgstr "Ano"
 msgid "Invoice Based on Deliveries"
 msgstr "Factura Baseada em Entregas"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Referência do 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Disponibiliza o estado da cotação ou da ordem de venda. O estado de excepção "
-#~ "é automaticamente definido quando ocorre uma operação de cancelamento na "
-#~ "validação da factura (Excepção na Factura) ou no processamento da lista de "
-#~ "empacotamento (Excepção no Envio). O estado de \"Aguardar data Agendada\" é "
-#~ "definido quando a factura é confirmada mas fica à espera que a agenda esteja "
-#~ "na data \"Data do Pedido\"."
-
-#~ msgid "Number packages"
-#~ msgstr "Número de Pacotes"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manual em curso"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Factura das embalagens"
-
-#~ msgid "Shop name"
-#~ msgstr "Nome da Loja"
-
-#~ msgid "Related Packings"
-#~ msgstr "Ambalagens relacionadas"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Quantidade (UDV)"
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Se nou tiver stock suficiente para entregar tudo de uma vez, aceita ou não "
-#~ "entregas parciais."
-
-#~ msgid "Product UOS"
-#~ msgstr "UdV do Produto"
-
 #~ msgid "Deliver"
 #~ msgstr "Entrega"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Não pode cancelar uma linha de encomenda que está em curso de facturação!"
-
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Lista de Preços de Compras"
 
@@ -2229,90 +2179,6 @@ msgstr "Factura Baseada em Entregas"
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuração das Vendas"
 
-#~ msgid "Sale Dashboard"
-#~ msgstr "Painel de vendas"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Vendas do mês"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Painel gestor de vendas"
-
-#~ msgid "My open quotations"
-#~ msgstr "Minhas cotações abertas"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Estatistica dos processos"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Dez maiores vendas do mês"
-
-#~ msgid "Average Price"
-#~ msgstr "Preço Médio"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Ordens de venda por categoria"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Volume de vendas mensais acumuladas ao longo de um ano"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Ordens de venda por produtos"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Volume de vendas mensais ao longo de um ano"
-
-#~ msgid "All Months"
-#~ msgstr "Todos os meses"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Ordens de venda por categorias"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Vendas do mês"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Vendas por produto (mês actual)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Volume de vendas mensais ao longo de um ano"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Vendas por categorias e produtos"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Volume de vendas mensais acumuladas ao longo de um ano"
-
-#~ msgid "# of Products"
-#~ msgstr "Nº de produtos"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Vendas por produtos"
-
-#~ msgid "This Month"
-#~ msgstr "Este mês"
-
-#~ msgid "Categories"
-#~ msgstr "Categorias"
-
-#~ msgid "Reporting"
-#~ msgstr "Relatório"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Volume de vendas diárias ao longo de um ano"
-
-#~ msgid "Graphs"
-#~ msgstr "Gráficos"
-
-#~ msgid "In progress"
-#~ msgstr "Em curso"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Vendas por categoria de produtos (mês actual)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Volume de vendas diárias ao longo de um ano"
-
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Etapas para Entregar uma Ordem de Venda"
 
@@ -2644,119 +2510,6 @@ msgstr "Factura Baseada em Entregas"
 #~ msgid "Related invoices"
 #~ msgstr "Facturas Relacionadas"
 
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Configurar a logística da ordem de venda"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Data em que uma ordem de venda é criada"
-
-#~ msgid "The total amount"
-#~ msgstr "O valor total"
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Vendas, por cliente"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Número de sequência"
-
-#~ msgid "Source document"
-#~ msgstr "Documento de origem"
-
-#~ msgid "The amount without tax"
-#~ msgstr "O total sem impostos"
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Indica que uma fatura foi paga"
-
-#~ msgid "Related Invoices"
-#~ msgstr "Faturas relacionadas"
-
-#~ msgid "From a sale order"
-#~ msgstr "A partir de uma ordem de venda"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Endereço de faturação para a ordem de venda corrente"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "A cotação '%s' foi convertida em ordem de venda"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "A ordem de venda '%s' foi cancelada."
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Data na qual a ordem de venda foi confirmada"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Endereço de entrega para a ordem de venda corrente"
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Não foi possível cancelar a linha da ordem de venda!"
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "A ordem de venda '%s' foi colocada como 'rascunho'"
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Não é possível apagar uma linha de ordem de venda que seja %s!"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "A conta analítica relacionada com uma ordem de venda"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Aqui está uma lista de cada item de pedido a ser faturado. Esta vista "
-#~ "permite faturar ordens de venda parcialmente, pelas linhas da ordem. Não "
-#~ "precisa desta lista se a faturação for baseado nas ordens de entrega ou se "
-#~ "faturar toda a venda de uma vez."
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Referência do documento que originou esta ordem de venda."
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Primeiro tem de cancelar os movimentos de stock relacionados a esta linha da "
-#~ "ordem de venda."
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "A fatura não pode ser criada para esta linha de ordem de venda por uma das "
-#~ "seguintes razões:\n"
-#~ "1. O estado linha está como \"rascunho\" ou \"cancelado\"!\n"
-#~ "2. A linha já foi faturada!"
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Fatura de venda em aberto"
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Uma ordem de aprovisionamento para cada linha de ordem de venda e para cada "
-#~ "um dos componentes."
-
-#~ msgid "The tax amount"
-#~ msgstr "O montante de impostos"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Versão da lista de preço para a ordem de venda atual"
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Vendas por categoria de artigos"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index f5547695426..21079eeb134 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2226,9 +2226,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Invoice Corrected"
 #~ msgstr "Fatura Corrigida"
 
-#~ msgid "Shop name"
-#~ msgstr "Nome da loja"
-
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Esta é a lista de separação que foi gerada para esta fatura"
@@ -2245,32 +2242,10 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Packing"
 #~ msgstr "Separação"
 
-#~ msgid "Manual in progress"
-#~ msgstr "Manual em andamento"
-
-#~ msgid "Number packages"
-#~ msgstr "Número de pacotes"
-
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Não posso cancelar a ordem de venda !"
 
-#~ msgid "Related Packings"
-#~ msgstr "Separar Relacionados"
-
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Se voce nãotem estoque disponível suficiente para entregar tudo de uma vez, "
-#~ "voce aceita entrgas parciais ou não."
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Voce precisa primeiro cancelar todas as ordens de separação anexadas a esta "
-#~ "ordem de venda."
-
 #~ msgid "Sequence"
 #~ msgstr "Sequência"
 
@@ -2280,15 +2255,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Sua fatura foi criada com sucesso !"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Ref. Cliente"
-
 #~ msgid "Manual Designation"
 #~ msgstr "Designação Manual"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Faturar a partir das embalagens"
-
 #~ msgid "Procure Method"
 #~ msgstr "Método de Aquisição"
 
@@ -2303,48 +2272,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgstr ""
 #~ "Primeiro deve cancelar todas as faturas associadas a esta Ordem de Compra."
 
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Retorna o estado da cotação ou ordem de venda. O estado de exceção é "
-#~ "automaticamente ajustado quando uma operação de cancelamento ocorre na "
-#~ "validação da fatura (Exceção de Faturamento) ou no processo de lista de "
-#~ "empacotamento (Exceção de Entrega). O estado de 'Aguardo de Processamento' é "
-#~ "ajustado quando a fatura está confirmada porém aguardando que o "
-#~ "processamento seja feito da data 'Data Pedido'."
-
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "A 'Política de Entrega' é utilizada para sincronizar a fatura e as operações "
-#~ "de e entrega.\n"
-#~ "  - A opção 'Pagar antes da entrega' irá gerar primeiro a fatura e depois do "
-#~ "pagamento desta a ordem de embalamento.\n"
-#~ "  - A opção 'Entrega e Fatura Manual 'criará a ordem de embalamento e "
-#~ "aguardar que o usuário pressione o botão 'Fatura' para gerar a fatura "
-#~ "rascunho.\n"
-#~ "  - A opção 'Fatura sobre a Ordem após Entrega' irá gerar a fatura rascunho "
-#~ "basado na ordem de venda após todas as listas de embalamento serem "
-#~ "terminadas.\n"
-#~ "  - A opção 'Fatura a partir das listas de embalamento' são usadas para "
-#~ "criar uma fatura durante o processo de embalamento."
-
-#~ msgid "In progress"
-#~ msgstr "Em progresso"
-
 #~ msgid "My Quotations"
 #~ msgstr "Minhas Cotações"
 
@@ -2367,24 +2294,13 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuração de Vendas"
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Quantidade (UdV)"
-
 #~ msgid "Deliver"
 #~ msgstr "Entrega"
 
-#~ msgid "Product UOS"
-#~ msgstr "UdV do Produto"
-
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Não é possível cancelar esta ordem de venda!"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Não é possível cancelar um item de ordem de venda que já foi faturada !"
-
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2420,151 +2336,42 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entregue, do depósito para o cliente"
 
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Relatório de Ordem de Venda Criada"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Retorno por Produto"
-
-#~ msgid "All Months"
-#~ msgstr "Todos os meses"
-
-#~ msgid "This Month"
-#~ msgstr "Este mes"
-
-#~ msgid "Reporting"
-#~ msgstr "Relatórios"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Retorno Total"
-
-#~ msgid "Create Date"
-#~ msgstr "Data de Criação"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Dias    "
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Versão da lista de preço para ordem de venda atual"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "O centro de custo relatado a ordem de venda"
-
-#~ msgid "Unit of Measure "
-#~ msgstr "Unidade de Medida "
-
-#~ msgid "Default UoM"
-#~ msgstr "UdM Padrão"
-
-#~ msgid "Average Price"
-#~ msgstr "Preço Médio"
-
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Lista de Preço de Compras"
 
-#~ msgid "Sales by Products"
-#~ msgstr "Vendas por Produtos"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Data que a ordem de venda foi criada"
-
-#~ msgid "  365 Days  "
-#~ msgstr "  365 Dias  "
-
-#~ msgid "Invoice from Picking"
-#~ msgstr "Faturar pela Lista de Separação"
-
-#~ msgid "Deposit"
-#~ msgstr "Deposito"
-
 #~ msgid "Sales orders"
 #~ msgstr "Ordens de Venda"
 
-#~ msgid "Source document"
-#~ msgstr "Documento Origem"
-
-#~ msgid "Create Partial Invoice"
-#~ msgstr "Criar Nota Fiscal Parcial"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Vendas por Representante"
-
 #~ msgid "Our Salesman"
 #~ msgstr "Nosso Representante"
 
-#~ msgid "Total Sales By Month"
-#~ msgstr "Total de Vendas por Mês"
-
-#~ msgid "Billing"
-#~ msgstr "Faturamento"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definição da ação."
 
 #~ msgid "Sale Pricelists"
 #~ msgstr "Lista de Preço para Vendas"
 
-#~ msgid "Related Invoices"
-#~ msgstr "Notas Fiscais Relacionadas"
-
-#~ msgid "Shipments Analysis"
-#~ msgstr "Análise de Embarques"
-
 #~ msgid "Sales order lines"
 #~ msgstr "Linhas da Ordem de Venda"
 
-#~ msgid "General Information"
-#~ msgstr "Informações Gerais"
-
 #~ msgid "Sale Shop"
 #~ msgstr "Estabelecimento de Venda"
 
-#~ msgid "Sales By Partner"
-#~ msgstr "Vendas por Parceiros"
-
-#~ msgid "Partial Invoice"
-#~ msgstr "Nota Fiscal Parcial"
-
 #~ msgid "Sale Order Lines"
 #~ msgstr "Linhas da Ordem de Venda"
 
 #~ msgid "Sales order"
 #~ msgstr "Ordem de Venda"
 
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Data que a ordem de venda foi confirmada"
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Número de dias entre a confirmação da ordem e o embarque dos produtos para o "
-#~ "cliente"
-
 #~ msgid "Total amount"
 #~ msgstr "Total Geral"
 
-#~ msgid "Paid Qty"
-#~ msgstr "Qtd Paga"
-
-#~ msgid "Default Unit Of Measure"
-#~ msgstr "Unidade Padrão de Medida"
-
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "Configurar Politica de Separação para Ordem de Venda"
 
 #~ msgid "Payment Terms"
 #~ msgstr "Forma de Pagamento"
 
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Endereço de Embarque para a Ordem de venda Atual"
-
-#~ msgid "   30 Days   "
-#~ msgstr "   30 Dias   "
-
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Etapas para entrega de um pedido/ordem de venda"
 
@@ -2592,9 +2399,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "My sales order in progress"
 #~ msgstr "Meus pedidos em andamento"
 
-#~ msgid "Sales by State"
-#~ msgstr "Vendas por Estado"
-
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Meus pedidos aguardando emissão da Fatura"
 
@@ -2668,84 +2472,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Sale Order line"
 #~ msgstr "Linha de Pedidos"
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Painel de Vendas"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Painel de Vendas"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Vendas do Mes"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Grupo de Gerentes de Vendas"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Casos do Mes"
-
-#~ msgid "My open quotations"
-#~ msgstr "Minhas Cotações em Aberto"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Estatísticas de Casos"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "As 10 Maiores Vendas do Mes"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Vendas ordenadas por Categoria"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "Retorno Mensal Acumulado de Vendas no Período de Um Ano"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Pedidos Ordenados por Produto"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Retorno Mensal de Vendas no Período de Um Ano"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Pedidos Ordenados por Categoria"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Vendas Mensais"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Vendas por Produto (este mes)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Retorno Mensal de Vendas no Período de Um Ano"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Gerenciamento de Vendas - Relatórios"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Vendas por Categoria de Produtos"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "Retorno Mensal de Vendas Acumuladas no Período de Um Ano"
-
-#~ msgid "# of Products"
-#~ msgstr "Total de Produtos"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Vendas por produto"
-
-#~ msgid "Categories"
-#~ msgstr "Categorias"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Pedidos Gerados"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Retorno Mensal"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "Retorno diário de Vendas no pPríodo de Um Ano"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Odem de Vendas Gerada"
-
 #~ msgid "Payment Accounts"
 #~ msgstr "Contas de Pagamento"
 
@@ -2758,18 +2484,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Fatura Provisória do Cliente, a ser revisado pelo contador"
 
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "Giro diário das vendas em um ano"
-
 #~ msgid "Related invoices"
 #~ msgstr "módulo: vendas"
 
-#~ msgid "Graphs"
-#~ msgstr "Gráficos"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Vendas por Categoria de Produto (este mês)"
-
 #~ 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 "
@@ -2803,39 +2520,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Advance Payment"
 #~ msgstr "Pagamento Antecipado"
 
-#, 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: "
-#~ msgstr ""
-#~ "Você selecionou uma quantidade de %d unidades.\n"
-#~ "Mas isto não é compatível com a embalagem escolhida.\n"
-#~ "Aqui está uma proposta de quantidades de acordo com a embalagem: "
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Referência do pedido que gerou esta requisição de ordem de venda."
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Não é possível apagar um item de ordem de venda que é %s !"
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Você deve primeiro cancelar os movimentos de estoque relacionados a este "
-#~ "item da ordem de venda."
-
-#~ msgid "From a sale order"
-#~ msgstr "A partir de uma ordem de venda"
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Fatura de Venda Aberta"
-
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
@@ -2847,283 +2531,15 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ "Please set one customer before choosing a product."
 #~ msgstr "Você precisa selecionar um cliente no formulário de vendas !"
 
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Fatura de Adiantamento de Venda"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Endereço de Fatura para a ordem de venda corrente"
-
-#~ msgid "The total amount"
-#~ msgstr "O montante total"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "A cotação '%s' foi convertida para uma ordem de venda."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Não existe conta de receita definida ' \\n                                   "
-#~ "     ' para este produto: \"%s\" (id:%d)"
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Gera Fatura de Venda"
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Uma Ordem de Compra para cada item de ordem de venda e para cada um dos "
-#~ "componentes."
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Isto indica que a fatura foi paga"
-
-#~ 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 sale 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 ""
-#~ "A Política de Embarque é usada para sincronizar operações de faturamento e "
-#~ "entrega.\n"
-#~ "  - A opção 'Pagamento antes da entrega' vai gerar primeiro a fatura e então "
-#~ "a ordem de embarque após o pagamento da fatura.\n"
-#~ "  - A opção 'Embarque e Faturamento Manual' vai criar a ordem de embarque "
-#~ "diretamente e esperar pelo usuário manualmente clicar no botão para gerar o "
-#~ "rascunho da fatura.\n"
-#~ "  - A opção 'Fatura na Ordem Após a Entrega' vai gerar o rascunho da fatura "
-#~ "baseado na ordem de venda após toda a lista de embarque ter sido "
-#~ "finalizada.\n"
-#~ "  - A opção 'Fatura a partir do Embarque' é usada para criar uma fatura "
-#~ "durante o processo de embarque."
-
-#~ msgid "The tax amount"
-#~ msgstr "O montante de impostos"
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "O formulário de Lista de Opções é criado tão logo a ordem de venda é "
-#~ "confirmada, ao mesmo tempo em que a ordem de compra. Ele representa a "
-#~ "atribuição de peças para a ordem de venda. Há 1 lista de opções por item de "
-#~ "ordem de venda que 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 ""
-#~ "Incoterm que significa \"International Commercial Terms\" implica em uma "
-#~ "série de termos de vendas que são utilizados na transação comercial"
-
 #~ msgid "Sale Order Line"
 #~ msgstr "Itens de Pedidos"
 
-#~ msgid "Sequence Number"
-#~ msgstr "Número sequencial"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "O pedido '%s' foi cancelado."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "O pedido '%s' foi definido como rascunho."
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Fatura da Entrega"
-
 #~ msgid "Sale Order"
 #~ msgstr "Pedido de Venda"
 
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Fornece o estado da cotação ou pedido. \n"
-#~ "O estado de pendência é automaticamente definido quando uma operação de "
-#~ "cancelamento ocorrer na validação da  nota fiscal (Pendências da Fatura) ou "
-#~ "no processo da lista de seleção (Pendências de Embarque). \n"
-#~ "O estado 'Aguardando Agenda' é definido quando a fatura é confirmada mas "
-#~ "está esperando pelo programador para seguir na data 'Data Solicitada'."
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "O Representante confirma a cotação. O estado do pedido torna-se 'Em "
-#~ "progresso\" ou 'Manualmente em progresso'."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Vendas por Categoria de Produto"
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Um pedido gera uma nota fiscal, assim que é confirmada pelo representante. "
-#~ "Dependendo do controle de faturamento do pedido, a nota fiscal é baseada na "
-#~ "entrega ou nas quantidades solicitadas."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* O estado 'Rascunho' é definido quando o pedido relacionado é um rascunho "
-#~ "(prévia).                     \n"
-#~ "* O estado 'Confirmado' é definido quando o pedido é confirmado.             "
-#~ "        \n"
-#~ "* O estado 'Pendente' é definido quando o pedido relacionado possui uma "
-#~ "pendência.                     \n"
-#~ "* O estado 'Concluído' é definido quando o item de pedido é selecionado.     "
-#~ "                \n"
-#~ "* O estado 'Cancelado' é definido quando um usuário cancela o pedido "
-#~ "relacionado."
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Gerar ordens de compra para cada item do pedido."
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Quantidade "
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Não foi possível cancelar o item do pedido!"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Confirmado pedido para nota fiscal"
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Estado de Rascunho do Pedido"
-
-#~ msgid "The amount without tax"
-#~ msgstr "O total sem impostos"
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr ""
-#~ "Você precisa primeiro cancelar todas as seleções anexadas para este pedido."
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Para cada item de pedido, uma ordem de compra é criada para suprir o produto "
-#~ "vendido."
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Requisição de Pedido de Venda"
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Vendas por Cliente"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Isto indica que o pedido foi entregue. Este campo é atualizado somente após "
-#~ "a programação ser lançada !"
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Não há um diário de vendas definido para estas empresa: \"%s\" (id:%d)"
-
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Faturamento do Pedido após a entrega"
 
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "A Nota Fiscal não pode ser criada para este Item de Pedido devido uma das "
-#~ "seguintes razões:\n"
-#~ "1.O estado do item de pedido está como \"rascunho\" ou \"cancelado\"!\n"
-#~ "2.O item de Pedido já está faturado!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regras não são suportadas por objetos osv_memory !"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Um Ordem de compra é automaticamente criada assim que um pedido é confirmado "
-#~ "ou quando a fatura é paga. Isso direciona a compra e produção de produtos em "
-#~ "relação às regras e parâmetros do pedido. "
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Você não pode gerar um adiantamento em um pedido \\n que está definido como "
-#~ "'Faturamento automático após a entrega'."
-
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Tipo de ul: "
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order                              that "
-#~ "is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Você não pode fazer um adiantamento em uma ordem de venda que é definida "
-#~ "como 'Fatura Automática após Entrega'."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regra precisa ter ao menos um direito de acesso marcado."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. This view allows you "
-#~ "to invoice sales orders partially, by lines of sales order. You don't need "
-#~ "this list if you invoice based on the delivery orders or if you invoice "
-#~ "sales totally."
-#~ msgstr ""
-#~ "Aqui está uma lista de cada item de pedido a ser faturado. Esta visão "
-#~ "permite faturar pedidos parcialmente, pelos itens de pedido. Você não "
-#~ "precisa desta lista se o faturamento for baseado nas ordens de entrega ou se "
-#~ "você fatura toda a venda de uma vez."
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -3132,9 +2548,3 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Erro: Unidade de venda deve ser de categoria diferente da unidade de medida"
-
-#~ msgid "Logistics"
-#~ msgstr "Logistica"
-
-#~ msgid "Sales Dashboard"
-#~ msgstr "Painel de Vendas"
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index 6ad2a8f167f..22eea5bf0cc 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2231,9 +2231,6 @@ msgstr "An"
 msgid "Invoice Based on Deliveries"
 msgstr "Factură bazată pe livrări"
 
-#~ msgid "Shop name"
-#~ msgstr "Nume magazin"
-
 #~ msgid "Origin"
 #~ msgstr "Origine"
 
@@ -2243,9 +2240,6 @@ msgstr "Factură bazată pe livrări"
 #~ msgid "Sales orders"
 #~ msgstr "Comenzi vânzare"
 
-#~ msgid "In progress"
-#~ msgstr "În progres"
-
 #~ msgid "Draft Invoice"
 #~ msgstr "Factură ciornă"
 
@@ -2264,18 +2258,12 @@ msgstr "Factură bazată pe livrări"
 #~ msgid "Outgoing Products"
 #~ msgstr "Produse ieşite"
 
-#~ msgid "Number packages"
-#~ msgstr "Numărul de pachete"
-
 #~ msgid "Order Ref"
 #~ msgstr "Ref. Comanda"
 
 #~ msgid "Invoice Corrected"
 #~ msgstr "Factura corectata"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Factura din lista de livrare"
-
 #~ msgid "Manual Designation"
 #~ msgstr "Desemnare manuala"
 
@@ -2285,9 +2273,6 @@ msgstr "Factură bazată pe livrări"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Livrare - din depozit către client."
 
-#~ msgid "Customer Ref."
-#~ msgstr "Referinţă client"
-
 #~ 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,64 +2313,10 @@ msgstr "Factură bazată pe livrări"
 #~ msgstr ""
 #~ "Trebuie mai întâi să anulaţi toate facturile ataşate acestei comenzi."
 
-#~ 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 packings' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "\"Metoda de livrare\" este utilizată pentru a sincroniza opeaţiunile de "
-#~ "facturare cu cele de livrare.\n"
-#~ "  - opţiunea ”Plata înainte de livrare” - va genera mai întâi factura, iar "
-#~ "după confirmarea plăţii facturii se va genera ordinul de împachetare pentru "
-#~ "livrare.\n"
-#~ "  - opţiunea ”Livrare şi facturare manuală” va crea direct ordinul de "
-#~ "împachetare pentru livrare şi va aştepta ca utilizatorul să confirme pentru "
-#~ "a genera o factura-ciornă.\n"
-#~ "  - opţiunea ”Facturare după livrare” va genera o factură-ciornă pe baza "
-#~ "comenzii primite după ce vor fi confirmate ca livrate toate ordinele de "
-#~ "împachetare.\n"
-#~ "  - opţiunea ”Factură pe măsura livrării”  este utilizat pentru a genera o "
-#~ "factură în timpul procesului de împachetare şi livrare  - conform produselor "
-#~ "ce vor fi livrate, indiferent de comanda iniţială."
-
-#~ msgid "Related Packings"
-#~ msgstr "Pachete comune unei singure  livrări"
-
-#~ msgid "Product UOS"
-#~ msgstr "Unitatea de împachetare şi livrare a produsului"
-
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Nu se poate anula această comandă!"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr "Nu puteţi anula o comandă care a fost deja facturată!"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Oferă starea în care se află o ofertă sau o comandă. Starea de excepţie este "
-#~ "atribuită automat atunci cînd intervine o anulare în validarea facturii "
-#~ "(Excepţie la facturare) sau în procesarea listei de împachetare (Excepţie la "
-#~ "livrare). Starea ”Programare în aşteptare” este atribuită atunci când "
-#~ "factura este confirmată, dar aşteaptă să ajungă la data stabilită  în "
-#~ "comandă pentru livrare."
-
-#~ msgid "Manual in progress"
-#~ msgstr "Comandă procesată manual - în curs"
-
 #~ msgid ""
 #~ "This Configuration step use to set default picking policy when make sale "
 #~ "order"
@@ -2393,25 +2324,9 @@ msgstr "Factură bazată pe livrări"
 #~ "Acest pas în configurare stabileşte valoare implicită pentru ”Metoda de "
 #~ "livrare” pentru atunci când se lansează o comandă."
 
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Cantitate (UOS) (unitate de împachetare)"
-
 #~ msgid "Our Salesman"
 #~ msgstr "Agentul nostru de vânzări"
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Dacă nu aveţi stoc suficient pentru a face livrarea într-o singură tranşă, "
-#~ "acceptaţi livrări parţiale sau nu?"
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Trebuie mai întâi să anulaţi toate ordinele de împachetare ataşate acestei "
-#~ "comenzi."
-
 #~ msgid "Sales order"
 #~ msgstr "Comenzi"
 
@@ -2459,27 +2374,6 @@ msgstr "Factură bazată pe livrări"
 #~ msgid "Reference"
 #~ msgstr "Referinta"
 
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "Raport de comenzi create"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Venitul pe produs"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Comenzi create"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Venitul lunar"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Venitul total"
-
-#~ msgid "Create Date"
-#~ msgstr "Data Creării"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Comenzi create"
-
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "UOS (unitatea de masura la livrare) trebuie să fie într-o categorie diferită "
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index ca5644c55f5..c33e157940a 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -126,7 +126,7 @@ msgstr "Заказ на закупку"
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr "Партнёр"
+msgstr "Контрагент"
 
 #. module: sale
 #: view:sale.order:0
@@ -225,7 +225,7 @@ msgstr "Описание заказа"
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr "Другая информация"
+msgstr "Прочая информация"
 
 #. module: sale
 #: view:sale.order:0
@@ -238,8 +238,8 @@ msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
-"Счет создается автоматически если политика доставки 'Счет по приходу' или "
-"'Счет на заказ после доставки'."
+"Счет создается автоматически если политика доставки \"Счет из "
+"комплектования\" или \"Счет на заказ после доставки\"."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -267,7 +267,7 @@ msgstr "Это количество дней, добавляемых к обещ
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr "Инф. панель менеджера продаж"
+msgstr "Панель менеджера продаж"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -319,6 +319,16 @@ msgid ""
 "  - The 'Invoice From The Picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Политика доставки используется для синхронизации выставления счетов и "
+"операций по доставке.\n"
+"  - \"Платеж перед доставкой\" - сначала создается счет, а после оплаты "
+"этого счета создается комплектовочный лист.\n"
+"  - \"Доставка & счет вручную\" - сразу создается комплектовочный лист, "
+"после этого ожидается, что пользователь вручную нажмет на кнопку \"Счет\" "
+"для создания черновика счета.\n"
+"  - \"Счет на заказ после доставки\" - черновик счета генерируется из заказа "
+"на продажу, после того, как все комплектовочные листы будут завершены.\n"
+"  - \"Счет из комплектования\" - счет создается в процессе комплектования."
 
 #. module: sale
 #: code:addons/sale/sale.py:939
@@ -800,6 +810,30 @@ msgid ""
 "    * Graph of cases of the month\n"
 "    "
 msgstr ""
+"\n"
+"    Базовый модуль для управления коммерческими предложениями и заказами на "
+"продажу.\n"
+"\n"
+"    * Рабочий процесс по шагам:\n"
+"        - Предложение -> Заказ на продажу -> Счет\n"
+"    * Методы выставления счетов:\n"
+"        - Счет по заказу (перед отгрузкой или после)\n"
+"        - Счет по доставке\n"
+"        - Счет по затратам времени\n"
+"        - Счет на аванс\n"
+"    * Предпочтения контрагентов (доставка, выставление счетов, ИНКОТЕРМ, "
+"...)\n"
+"    * Товарные запасы и цены\n"
+"    * Методы доставки:\n"
+"        - всё за раз, несколько раз\n"
+"        - стоимость доставки\n"
+"    * Панель для менеджера продаж содержит:\n"
+"    * Ваши открытые предложения\n"
+"    * 10 лучших продаж месяца\n"
+"    * Статистика \n"
+"    * График продаж ТМЦ\n"
+"    * График сделок месяца\n"
+"    "
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
@@ -914,7 +948,7 @@ msgstr "Вычислить"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr "Продажи по партнеру"
+msgstr "Продажи по контрагенту"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -1232,8 +1266,9 @@ msgid ""
 "operations by the worker."
 msgstr ""
 "По умолчанию Open ERP в состоянии управлять сложными маршрутами и путями ТМЦ "
-"на ваш склад и в места хранения партнера. Это позволит настроить наиболее "
-"общие и простые методы доставки ТМЦ до заказчика за одно или два действия."
+"на ваш склад и в места хранения контрагентов. Это позволит настроить "
+"наиболее общие и простые методы доставки ТМЦ до заказчика за одно или два "
+"действия."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
@@ -1379,7 +1414,7 @@ msgstr "Инкотерм"
 #: view:sale.report:0
 #: field:sale.report,product_id:0
 msgid "Product"
-msgstr "Продукция"
+msgstr "ТМЦ"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
@@ -1532,7 +1567,7 @@ msgstr "Нельзя удалить позицию заказа на прода
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 #: view:sale.order:0
 msgid "Make Invoices"
-msgstr "Сделать счета"
+msgstr "Сформировать счета"
 
 #. module: sale
 #: view:sale.order:0
@@ -2172,15 +2207,6 @@ msgstr "Год"
 msgid "Invoice Based on Deliveries"
 msgstr "Счет основанный на доставках"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Ссылка на клиента"
-
-#~ msgid "In progress"
-#~ msgstr "Выполняется"
-
-#~ msgid "Shop name"
-#~ msgstr "Название магазина"
-
 #~ msgid "Origin"
 #~ msgstr "Происхождение"
 
@@ -2425,89 +2451,9 @@ msgstr "Счет основанный на доставках"
 #~ "Когда кнопка подтверждения будет нажата, состояние изменится с \"Черновик\" "
 #~ "на \"Вручную\". Предложение цен превратится в заказ на продажу."
 
-#~ msgid "My open quotations"
-#~ msgstr "Мои открытые предложения"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Адрес доставки для текущего заказа на продажу"
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Количество дней между подтверждением заказа и доставкой продукции заказчику"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Счет на предоплату"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Вы не можете сделать аванс по заказу на продажу \\n что определяется как "
-#~ "'Автоматически, счет после доставки'."
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Ссылка документа создавшего этот запрос - заказ на продажу."
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Не могу удалить позицию заказа %s !"
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Сначала вы должны отменить складские перемещения связанные с этой позицией "
-#~ "заказа."
-
-#~ msgid "Sales By Partner"
-#~ msgstr "Продажи по партнеру"
-
-#~ msgid "Average Price"
-#~ msgstr "Средняя цена"
-
-#~ msgid "Invoice from Delivery"
-#~ 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 "
-#~ "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 sale 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 ""
-#~ "Политика доставки используется для синхронизации операций со счетами и "
-#~ "доставкой.\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 sale 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."
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr ""
-#~ "Сначала вы должны отменить всё комплектование связанное с этим заказом"
-
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Счет на заказ после доставки"
 
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Дата на которую создан заказ на продажу"
-
-#~ msgid "From a sale order"
-#~ msgstr "Из заказа на продажу"
-
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Не удалось отменить заказ на продажу !"
@@ -2520,10 +2466,6 @@ msgstr "Счет основанный на доставках"
 #~ "Вы должны выбрать заказчика в форме ввода продаж !\n"
 #~ "Пожалуйста задайте заказчика перед выбором продукции."
 
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Каталоги закупок"
 
@@ -2535,233 +2477,11 @@ msgstr "Счет основанный на доставках"
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr "Вы не можете отменить позицию заказа в выставленном  счете !"
 
-#~ msgid "The total amount"
-#~ msgstr "Общая сумма"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "Предложение '%s' было преобразовано в заказ на продажу."
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Адрес счета для текущего заказа на продажу"
-
 #, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Нельзя удалить подтвержденный заказ на продажу !"
 
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Один заказ на снабжение для каждой позиции заказа на продажу и для каждого "
-#~ "из компонентов."
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Счет аналитики связанный с заказом на продажу"
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Показывает, что счет был оплачен"
-
-#~ msgid "The tax amount"
-#~ msgstr "Сумма налога"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Версия каталога для текущего заказа на продажу"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Последовательный номер"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "Заказ на продажу '%s' был отменен."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "Заказ на продажу '%s' был установлен в состояние \"Черновик\"."
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Дает состояние предложения или заказа на продажу. \n"
-#~ "Исключительная ситуация автоматически устанавливается если при обработке "
-#~ "счета или при комплектовании была использована операция \"Отмена\". \n"
-#~ "Состояние \"Ожидание расписания\" устанавливается когда счет подтвержден, но "
-#~ "ожидает когда планировщик сработает по дате \"Дата заказа\"."
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "Менеджер продаж подтверждает предложение. Состояние заказа на продажу "
-#~ "становится \"В процессе\" или \"В процессе вручную\"."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Продажи по категориям продукции"
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Заказ на продажу генерирует счет как только он подтверждается менеджером "
-#~ "продаж. В зависимости от режима управления выставлением счетов по заказам на "
-#~ "продажу, счет основан на доставленном или заказанном количестве."
-
-#~ msgid "Related Invoices"
-#~ msgstr "Связанные счета"
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Нельзя отменить позицию заказа на продажу!"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Подтвержденный заказ на продажу в счет."
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Заказа на закупку в состояние \"Черновик\""
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Продажи по менеджеру продаж"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Дата на которую подтвержден заказ на продажу"
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr "Журнал продаж для этой компании не определен: \"%s\" (id:%d)"
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Для каждой позиции заказа создается заказ на снабжение для закупки проданной "
-#~ "продукции."
-
-#~ msgid "Default UoM"
-#~ msgstr "Ед. изм. по умолчанию"
-
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
 #~ "Сначала вы должны отменить все счета связанные с этим заказом на продажу."
-
-#~ msgid "The amount without tax"
-#~ msgstr "Сумма без налога"
-
-#~ msgid "Source document"
-#~ msgstr "Исходный документ"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Счет не может быть создан для этой позиции заказа на продажу по одной из "
-#~ "следующих причин:\n"
-#~ "1. Состояние этой позиции заказа на продажу - \"Черновик\" или "
-#~ "\"Отменено\"!\n"
-#~ "2. Счет на позицию заказа на продажу уже выставлен!"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Заказ на снабжение автоматически создастся как только заказ на продажу будет "
-#~ "подтвержден или счет будет оплачен. Это управляет снабжением и производством "
-#~ "продукции по правилам и параметрам заказа на продажу. "
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Продажи по заказчику"
-
-#~ msgid "Sale Make Invoice"
-#~ 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: "
-#~ msgstr ""
-#~ "Вы выбрали количество %d единиц.\n"
-#~ "Но это не соответствует выбранной упаковке.\n"
-#~ "Предложение количеств в соответствии с упаковкой: "
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "Форма комплектовочного листа создается как только подтверждается заказ на "
-#~ "продажу, в одно время с заказом на снабжение. Он представляет из себя "
-#~ "выделение продукции для заказа на закупку. Для каждой позиции заказа свой "
-#~ "комплектовочный лист, который изменяется в зависимости от доступности "
-#~ "продукции."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "* Состояние 'Черновик' устанавливается когда соответствующий заказ на "
-#~ "продажу в состоянии 'Черновик'.                     \n"
-#~ "* Состояние 'Подтверждено' устанавливается когда соответствующий заказ на "
-#~ "продажу подтвержден.                     \n"
-#~ "* Состояние 'Исключительна ситуация' устанавливается когда соответствующий "
-#~ "заказ на продажу в состоянии 'Исключительна ситуация'.                     \n"
-#~ "* Состояние 'Выполнено' устанавливается когда позиция заказа на продажу "
-#~ "скомплектована.                     \n"
-#~ "* Состояние 'Отменено' устанавливается когда соответствующий заказ на "
-#~ "продажу отменен пользователем."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Управляет заказами на снабжение для каждой позиции заказа на продажу"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Количество: "
-
-#~ msgid "Sale Open Invoice"
-#~ 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 ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Показывает, что заказ был доставлен. Это поле обновляется только после "
-#~ "запуска планировщика !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Правила не поддерживаются для объектов osv_memory !"
-
-#~ msgid "Logistics"
-#~ msgstr "Логистика"
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Продажи по заказчику"
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 5f0c70221eb..f1735eb9cb0 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index f1ad65c3b2c..587455e36e8 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+msgstr "Prodaja po prodajalec v zadnjih 90 dneh"
 
 #. module: sale
 #: help:sale.installer,delivery:0
@@ -33,6 +33,8 @@ 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
 #: help:sale.order,partner_shipping_id:0
@@ -49,7 +51,7 @@ msgstr "Količina"
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -2057,46 +2059,12 @@ msgstr ""
 msgid "Invoice Based on Deliveries"
 msgstr ""
 
-#~ msgid "Customer Ref."
-#~ msgstr "Sklic partnerja"
-
-#~ msgid "In progress"
-#~ msgstr "V teku"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Ročno v teku"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Količina (Prodajna EM)"
-
 #~ msgid "Set Default"
 #~ msgstr "Nastavi privzeto"
 
-#~ msgid "Product UOS"
-#~ msgstr "Prodajna ME proizvoda"
-
-#~ 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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Podaja stanje ponudbe ali prodajnega naloga. V stanje izjeme se samodejno "
-#~ "postavi takrat, ko se pojavi preklic  pri odobritvi računa (Izjema računa) "
-#~ "ali pri postopku pakiranja (Izjema odpreme). V stanje 'Čaka na uvrstitev' se "
-#~ "postavi, ko je račun potrjen, vendar čaka na uvrstitev glede na datum 'Datum "
-#~ "naročila'"
-
-#~ msgid "Related Packings"
-#~ msgstr "Povezani paketi"
-
 #~ msgid "Manual Designation"
 #~ msgstr "Ročno označevanje"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "Račun med pakiranjem"
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Znova ustvari nabavo"
 
@@ -2265,63 +2233,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid "Dashboard for sales"
-#~ msgstr "Nadzorna plošča za prodaje"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Nadzorna plošča za prodajo"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Mesečna prodaja"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Plošča za direktorja prodaje"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Primeri v meseci"
-
-#~ msgid "My open quotations"
-#~ msgstr "Moje odprte ponudbe"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Statistika primerov"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Naj deset prodaj meseca"
-
-#~ msgid "Average Price"
-#~ msgstr "Povprečna cena"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Naročila po kategorijah"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Naročila po proizvodih"
-
-#~ msgid "All Months"
-#~ msgstr "Vsi meseci"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Mesečna prodaja"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Prodaja po proizvodih (ta mesec)"
-
-#~ msgid "# of Products"
-#~ msgstr "Število proizvodov"
-
-#~ msgid "This Month"
-#~ msgstr "Ta mesec"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorije"
-
-#~ msgid "Reporting"
-#~ msgstr "Poročanje"
-
-#~ msgid "Graphs"
-#~ msgstr "Grafikoni"
-
-#~ msgid "Create Date"
-#~ msgstr "Datum izdelave"
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index a018db8cc25..77375c47fdc 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/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: 2011-04-29 05:15+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:16+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 27ec7bd8c36..be97164df8d 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2503,322 +2503,16 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Make Invoice"
 #~ msgstr "Kreiraj račun"
 
-#~ msgid "Sales By Partner"
-#~ msgstr "Prodaja po Partneru"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Referentni dokument koji generise ovaj zahtev za prodaju."
-
-#, 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: "
-#~ msgstr ""
-#~ "Selektovao si kolicinu od %d komada.\n"
-#~ "Ali nisu kompatibilni sa selektovanim pakovanjem.\n"
-#~ "Oved su predlozi kolicina za odgovarajuce pakovanje. "
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime modela u definiciji akcije."
 
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Ne mozes izbrisati liniju naloga prodaje koji je %s !"
-
-#~ msgid "Average Price"
-#~ msgstr "Srednja Cena"
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Prvo moras otkazati pomeranje lagera pridodato ovoj liniji prodajnog naloga"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Datum kada je kreiran Prodajni Nalog"
-
 #~ 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 "From a sale order"
-#~ msgstr "Od Prodajnog Naloga"
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Otvorena faktura Prodaje"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Napredno Placanje Fakture Prodaje"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Adresa Fakture za trenutni Prodajni Nalog"
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr "Broj dana izmedju potvrde Narudzbe i dostave proizvoda klijentu."
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Analiticki nalog vezan za prodajni nalog"
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greska: Neispravan EAN kod"
 
-#~ msgid "The total amount"
-#~ msgstr "Ukupni Iznos"
-
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "Upit '%s' je konvertovan u Prodajni Nalog"
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Napravi Prodajni Nalog"
-
-#~ msgid ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Jedna Nabavna Faktura za Svaki Prodajni nalog, i za svaku od komponenti."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "nema ulaznog naloga definisanog kao ' \\n' za proizvod: \"%s\" (id:%d)"
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Indikator placenih faktura"
-
-#~ 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 sale 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 ""
-#~ "Dostavna Politika je iskoriscena da sinhronizuje fakture i dostavne "
-#~ "operacije.\n"
-#~ "  -'Plati pre isporuke' izbor ce generisati prvu fakturu i zatim ce "
-#~ "generisati izborni redosled nakon uplate ove fakture.\n"
-#~ "  -'Isporuka & Rucno Fakturisanje' ce kreirati izborni redosled direktno, i "
-#~ "sacekace korisnika da rucno klikne na \" Faktura' dugme da bi je postavio u "
-#~ "' Faktura u Pripremi'.\n"
-#~ "  -Faktura po nalogu nakon Isporuke; izbor ce generisati fakturu 'U "
-#~ "Pripremi' baziranoj na prodadajnom nalogu nakon sto su sve izborne liste "
-#~ "zavrsene.\n"
-#~ "  -Faktura iz Izbora' izbor se koristi da kreira fakturu tokom samog "
-#~ "izbornog procesa."
-
-#~ msgid "The tax amount"
-#~ msgstr "Iznos Poreza"
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "Forma Izborne liste je kreirana momenta kada je prodajni nalog potvrdjen, u "
-#~ "isto vreme kada i nabavni nalog. Reprezentuje pripadnost komponenti za "
-#~ "prodajni nalog. Tamo je 1 izborna lista napravljena iz prodajnog naloga koja "
-#~ "evoluira sa dostupnoscu delova ( komponenti)"
-
-#~ 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') imlicira da je ovo prodajna "
-#~ "serija koja je koriscena u komercijalnim transakcijama."
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Verzija Cenovnika za dati Prodajni nalog"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Sekvencioni Broj"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "Prodajni nalog '%s' je otkazan ."
-
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "Prodajni Nalog '%s' je postavljen u stanje 'U Pripremi' ."
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Ponovi Nabavku"
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Faktura iz Isporuke"
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Prodajni nalog generise Fakturu, onda kada je potvrdjen od strane prodavca. "
-#~ "Ovisno o kontroli fakturisanja prodajnog naloga, faktura je bazirana na "
-#~ "isporuci ili na porucenim kolicinama."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni Meni."
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Pogon Nabavnih naloga za svaku liniju prodajnog naloga"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Kolicina: "
-
-#~ msgid "Related Invoices"
-#~ msgstr "Relacione Fakture"
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Ne mogu otkazati liniju prodajnog naloga!"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Potvrdi Prodajni nalog za Fakturisanje"
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Stanje 'U Pripremi' prodajnog naloga"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Prodaja po Prodavcu"
-
-#~ msgid "Date on which sale order is confirmed"
-#~ msgstr "Datum kojeg je potvrdjen prodajni nalog"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Adresa Isporuke za dati prodajni nalog"
-
-#~ msgid "Default UoM"
-#~ msgstr "Podrazumevana JM"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Indikator Dostave. Ovo polje biva obnovljeno nakon sto je porenut rokovnik."
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr "NIje definisana Knjiga Prodaje za ovo preduzece: \"%s\" (id:%d)"
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr "Prvo moras otkazati sve izbore dodatih ovom prodajnom nalogu"
-
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Za svaku liniju prodajnog naloga, nabavni nalog je kreiran da nadoknadi "
-#~ "prodati proizvod."
-
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Tip ul: "
-
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Daje stanje upita ili prodajnog naloga. \n"
-#~ "Stanje Izuzetka je automatski postavljeno kada se pojavi operacija OTKAZI "
-#~ "pri validaciji fakture ( Izuzetak fakture) ili u procesu izborne liste "
-#~ ")Izuzetak isporuke). \n"
-#~ "Stanje 'Cekam zakazano' je postavljeno kada je faktura potvrdjena ali ceka "
-#~ "rokovnik da je obradi na datum 'Naruceno dana'."
-
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "Prodavac potvrdjuje upit. Stanje prodaje postaje ' U Progresu' ili u ' Rucno "
-#~ "u Procesu' ."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Prodaja po kategoriji proizvoda"
-
-#~ msgid "Source document"
-#~ msgstr "Izvorni Dokumenat"
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "*Stanje ' U Pripremi' je postavljeno kada je dati prodajni nalog u stanju 'U "
-#~ "Pripremi'.                                                      \n"
-#~ "* Stanje' POtvrdjeno' je postavljeno kada je dati prodajni nalog potvrdjen.  "
-#~ "                                                         \n"
-#~ "*Stanje 'Izuzetak' je postavljen kada se dati nalog prodaje postavljen kao "
-#~ "izuzetak.                                                       \n"
-#~ "*Stanje ' zavrseno' je postavljeno kada je izabrana linija prodajnog naloga. "
-#~ "                                      \n"
-#~ "*stanje 'Otkazano' je postavljeno kada korisnik otklaze dati prodajni nalog."
-
-#~ msgid "The amount without tax"
-#~ msgstr "Iznos bez poreza"
-
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Rekvizicija Prodajnog Naloga"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Faktura ne moze biti kreirana za ovaj prodajni nalog zbog sledecih razloga:\n"
-#~ "1.Stanje ove prodaje je ili 'U Pripremi' ili 'Otkazano' !\n"
-#~ "2.Prodajni nalog je fakturisan!"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Ne mozes napraviti napredak u prodajnom nalogu \\n koji je definisan kao ' "
-#~ "Automatska faktura nakon isporuke' ."
-
-#~ msgid "Sales By Customer"
-#~ msgstr "Prodaja po Potrosacu"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Nabavni nalog je automatski kreiran u momentu potvrde placene fakture. "
-#~ "Pokrece kupovinu i proizvodnju proizvoda uzimajuci u obzir pravila i "
-#~ "parametre prodajnog naloga. "
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Konfigurisanje logistike naloga za prodaju"
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index 81078294385..79790d77d96 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/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: 2011-04-29 05:17+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2095,60 +2095,18 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime modela u definiciji akcije."
 
-#~ msgid "Sales By Partner"
-#~ msgstr "Prodaja po Partneru"
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr "Referentni dokument koji generise ovaj zahtev za prodaju."
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Prvo moras otkazati pomeranje lagera pridodato ovoj liniji prodajnog naloga"
-
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Ne mozes izbrisati liniju naloga prodaje koji je %s !"
-
-#~ msgid "Average Price"
-#~ msgstr "Srednja Cena"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Datum kada je kreiran Prodajni Nalog"
-
 #~ 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 "From a sale order"
-#~ msgstr "Od Prodajnog Naloga"
-
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Ne možete da otkažete nalog za prodaju!"
 
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
 #~ msgid "Our Salesman"
 #~ msgstr "Naš prodavac"
 
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Faktura ne moze biti kreirana za ovaj prodajni nalog zbog sledecih razloga:\n"
-#~ "1.Stanje ove prodaje je ili 'U Pripremi' ili 'Otkazano' !\n"
-#~ "2.Prodajni nalog je fakturisan!"
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Otvorena faktura Prodaje"
-
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
@@ -2158,125 +2116,25 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Ne možete da otkažete ovaj nalog za prodaju!"
 
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sale order."
-#~ msgstr "Upit '%s' je konvertovan u Prodajni Nalog"
-
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Kupovni cenovnik"
 
-#~ msgid "The total amount"
-#~ msgstr "Ukupni Iznos"
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greska: Neispravan EAN kod"
 
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Adresa Fakture za trenutni Prodajni Nalog"
-
-#~ msgid "Sale Advance Payment Invoice"
-#~ msgstr "Napredno Placanje Fakture Prodaje"
-
-#~ msgid "The analytic account related to a sale order"
-#~ msgstr "Analiticki nalog vezan za prodajni nalog"
-
 #, 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 ""
-#~ "One Procurement order for each sale order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Jedna Nabavna Faktura za Svaki Prodajni nalog, i za svaku od komponenti."
-
-#~ msgid "Sale Make Invoice"
-#~ msgstr "Napravi Prodajni Nalog"
-
-#~ 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 sale 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 ""
-#~ "Dostavna Politika je iskoriscena da sinhronizuje fakture i dostavne "
-#~ "operacije.\n"
-#~ "  -'Plati pre isporuke' izbor ce generisati prvu fakturu i zatim ce "
-#~ "generisati izborni redosled nakon uplate ove fakture.\n"
-#~ "  -'Isporuka & Rucno Fakturisanje' ce kreirati izborni redosled direktno, i "
-#~ "sacekace korisnika da rucno klikne na \" Faktura' dugme da bi je postavio u "
-#~ "' Faktura u Pripremi'.\n"
-#~ "  -Faktura po nalogu nakon Isporuke; izbor ce generisati fakturu 'U "
-#~ "Pripremi' baziranoj na prodadajnom nalogu nakon sto su sve izborne liste "
-#~ "zavrsene.\n"
-#~ "  -Faktura iz Izbora' izbor se koristi da kreira fakturu tokom samog "
-#~ "izbornog procesa."
-
-#~ msgid "It indicates that an invoice has been paid"
-#~ msgstr "Indikator placenih faktura"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
-#~ msgid "The tax amount"
-#~ msgstr "Iznos Poreza"
-
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sale order is confirmed, in the "
-#~ "same time as the procurement order. It represents the assignment of parts to "
-#~ "the sale order. There is 1 pick list by sale order line which evolves with "
-#~ "the availability of parts."
-#~ msgstr ""
-#~ "Forma Izborne liste je kreirana momenta kada je prodajni nalog potvrdjen, u "
-#~ "isto vreme kada i nabavni nalog. Reprezentuje pripadnost komponenti za "
-#~ "prodajni nalog. Tamo je 1 izborna lista napravljena iz prodajnog naloga koja "
-#~ "evoluira sa dostupnoscu delova ( komponenti)"
-
-#~ msgid "Pricelist version for current sale order"
-#~ msgstr "Verzija Cenovnika za dati Prodajni nalog"
-
-#, 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: "
-#~ msgstr ""
-#~ "Selektovao si kolicinu od %d komada.\n"
-#~ "Ali nisu kompatibilni sa selektovanim pakovanjem.\n"
-#~ "Oved su predlozi kolicina za odgovarajuce pakovanje. "
-
 #~ msgid "Sale Order Line"
 #~ msgstr "Stavke naloga za prodaju"
 
-#~ 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') imlicira da je ovo prodajna "
-#~ "serija koja je koriscena u komercijalnim transakcijama."
-
-#~ msgid "Sequence Number"
-#~ msgstr "Sekvencioni Broj"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Cenovnik prodaje"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
-
-#, python-format
-#~ msgid "The sale order '%s' has been cancelled."
-#~ msgstr "Prodajni nalog '%s' je otkazan ."
-
-#~ msgid "Invoice from Delivery"
-#~ msgstr "Faktura iz Isporuke"
-
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Ovo je spisak izbornih lista koji su generisani za ovaj račun"
@@ -2284,94 +2142,17 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Sale Order"
 #~ msgstr "Nalog za prodaju"
 
-#~ msgid ""
-#~ "Gives the state of the quotation or sale 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 ""
-#~ "Daje stanje upita ili prodajnog naloga. \n"
-#~ "Stanje Izuzetka je automatski postavljeno kada se pojavi operacija OTKAZI "
-#~ "pri validaciji fakture ( Izuzetak fakture) ili u procesu izborne liste "
-#~ ")Izuzetak isporuke). \n"
-#~ "Stanje 'Cekam zakazano' je postavljeno kada je faktura potvrdjena ali ceka "
-#~ "rokovnik da je obradi na datum 'Naruceno dana'."
-
-#~ msgid ""
-#~ "* The 'Draft' state is set when the related sale order in draft state.       "
-#~ "              \n"
-#~ "* The 'Confirmed' state is set when the related sale order is confirmed.     "
-#~ "                \n"
-#~ "* The 'Exception' state is set when the related sale order is set as "
-#~ "exception.                     \n"
-#~ "* The 'Done' state is set when the sale order line has been picked.          "
-#~ "           \n"
-#~ "* The 'Cancelled' state is set when a user cancel the sale order related."
-#~ msgstr ""
-#~ "*Stanje ' U Pripremi' je postavljeno kada je dati prodajni nalog u stanju 'U "
-#~ "Pripremi'.                                                      \n"
-#~ "* Stanje' POtvrdjeno' je postavljeno kada je dati prodajni nalog potvrdjen.  "
-#~ "                                                         \n"
-#~ "*Stanje 'Izuzetak' je postavljen kada se dati nalog prodaje postavljen kao "
-#~ "izuzetak.                                                       \n"
-#~ "*Stanje ' zavrseno' je postavljeno kada je izabrana linija prodajnog naloga. "
-#~ "                                      \n"
-#~ "*stanje 'Otkazano' je postavljeno kada korisnik otklaze dati prodajni nalog."
-
-#~ msgid "Sales by Product's Category"
-#~ msgstr "Prodaja po kategoriji proizvoda"
-
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Kolicina: "
-
-#~ msgid "Drives procurement orders for every sale order line."
-#~ msgstr "Pogon Nabavnih naloga za svaku liniju prodajnog naloga"
-
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
 #~ "Greška: Podrazumevani UOM i and the kupljeni UOM moraju da budu u istoj "
 #~ "kategoriji."
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni Meni."
-
-#~ msgid "Draft state of sale order"
-#~ msgstr "Stanje 'U Pripremi' prodajnog naloga"
-
-#~ msgid "Related Invoices"
-#~ msgstr "Relacione Fakture"
-
-#~ msgid "Confirmed sale order to invoice."
-#~ msgstr "Potvrdi Prodajni nalog za Fakturisanje"
-
-#, python-format
-#~ msgid "Could not cancel sale order line!"
-#~ msgstr "Ne mogu otkazati liniju prodajnog naloga!"
-
 #~ 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 "Date on which sale order is confirmed"
-#~ msgstr "Datum kojeg je potvrdjen prodajni nalog"
-
-#~ msgid "Sales By Salesman"
-#~ msgstr "Prodaja po Prodavcu"
-
-#~ msgid "Shipping address for current sale order"
-#~ msgstr "Adresa Isporuke za dati prodajni nalog"
-
-#~ msgid ""
-#~ "It indicates that the sale order has been delivered. This field is updated "
-#~ "only after the scheduler have been launched !"
-#~ msgstr ""
-#~ "Indikator Dostave. Ovo polje biva obnovljeno nakon sto je porenut rokovnik."
-
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Koraci za dostavu naloga za prodaju"
 
@@ -2379,34 +2160,9 @@ msgstr "Račun na osnovu isporuke"
 #~ 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."
 
-#~ msgid "Default UoM"
-#~ msgstr "Podrazumevana JM"
-
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Tip ul: "
-
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sale order."
-#~ msgstr "Prvo moras otkazati sve izbore dodatih ovom prodajnom nalogu"
-
-#, python-format
-#~ msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-#~ msgstr "NIje definisana Knjiga Prodaje za ovo preduzece: \"%s\" (id:%d)"
-
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Račun na bazi Naloga posle isporuke"
 
-#~ msgid ""
-#~ "For every sale order line, a procurement order is created to supply the sold "
-#~ "product."
-#~ msgstr ""
-#~ "Za svaku liniju prodajnog naloga, nabavni nalog je kreiran da nadoknadi "
-#~ "prodati proizvod."
-
-#~ msgid "Source document"
-#~ msgstr "Izvorni Dokumenat"
-
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2415,9 +2171,6 @@ msgstr "Račun na osnovu isporuke"
 #~ "Izaberite kupca u formi za prodaju !\n"
 #~ "Izaberite jednog kupca pre nego što izaberete proizvod."
 
-#~ msgid "The amount without tax"
-#~ msgstr "Iznos bez poreza"
-
 #~ 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 "
@@ -2427,42 +2180,15 @@ msgstr "Račun na osnovu isporuke"
 #~ "je za jedan nalog za prodaju pravljeno više računa (za svaku stavku na "
 #~ "primer)."
 
-#~ msgid "Sale Order Requisition"
-#~ msgstr "Rekvizicija Prodajnog Naloga"
-
 #~ msgid "Payment Terms"
 #~ msgstr "Uslovi plaćanja"
 
-#~ msgid ""
-#~ "The salesman confirms the quotation. The state of the sale order becomes 'In "
-#~ "progress' or 'Manual in progress'."
-#~ msgstr ""
-#~ "Prodavac potvrdjuje upit. Stanje prodaje postaje ' U Progresu' ili u ' Rucno "
-#~ "u Procesu' ."
-
 #~ msgid "Sale Shop"
 #~ msgstr "Prodavnica"
 
-#~ msgid "Sales By Customer"
-#~ msgstr "Prodaja po Potrosacu"
-
 #~ msgid "Sale Order Lines"
 #~ msgstr "Stavke naloga za prodaju"
 
-#, python-format
-#~ msgid "The sale order '%s' has been set in draft state."
-#~ msgstr "Prodajni Nalog '%s' je postavljen u stanje 'U Pripremi' ."
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sale 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 sale order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Nabavni nalog je automatski kreiran u momentu potvrde placene fakture. "
-#~ "Pokrece kupovinu i proizvodnju proizvoda uzimajuci u obzir pravila i "
-#~ "parametre prodajnog naloga. "
-
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Vaš račun je uspešno kreiran !"
 
@@ -2785,37 +2511,5 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Make Invoice"
 #~ msgstr "Kreiraj račun"
 
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr "Broj dana izmedju potvrde Narudzbe i dostave proizvoda klijentu."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "nema ulaznog naloga definisanog kao ' \\n' za proizvod: \"%s\" (id:%d)"
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Ponovi Nabavku"
-
-#~ msgid ""
-#~ "A sale order generates an invoice, as soon as it is confirmed by the "
-#~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
-#~ "is based on delivered or on ordered quantities."
-#~ msgstr ""
-#~ "Prodajni nalog generise Fakturu, onda kada je potvrdjen od strane prodavca. "
-#~ "Ovisno o kontroli fakturisanja prodajnog naloga, faktura je bazirana na "
-#~ "isporuci ili na porucenim kolicinama."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order \\n                             "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Ne mozes napraviti napredak u prodajnom nalogu \\n koji je definisan kao ' "
-#~ "Automatska faktura nakon isporuke' ."
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Konfigurisanje logistike naloga za prodaju"
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 9a8e10f7612..2d49a6362f0 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -25,7 +25,7 @@ msgstr "Försäljning per försäljare senaste 90 dagar"
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Ger dig möjlighet att beräkna frkatkostnad på dina offerter."
+msgstr "Ger dig möjlighet att beräkna fraktkostnader på dina offerter."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -33,7 +33,8 @@ 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 många i lager, accepterar ni delleveranser?"
+"Om ni inte har tillräckligt lager tillgängligt för att leverera allt på en "
+"gång, accepterar ni delleveranser?"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
@@ -61,7 +62,7 @@ msgstr "Avbryt order"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr "Konfigurera kundorder logistik"
+msgstr "Konfigurering av kundorderlogistik"
 
 #. module: sale
 #: code:addons/sale/sale.py:603
@@ -93,7 +94,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr "Allting direkt"
+msgstr "Samlad leverans"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -138,6 +139,13 @@ msgid ""
 "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 försäljningsorder 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
 #: help:sale.order,invoice_quantity:0
@@ -468,6 +476,8 @@ msgstr "Fakturaadress för kundordern."
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
 msgstr ""
+"Förstärk den grundläggande försäljningsapplikationen med ytterligare "
+"funktionalitet."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -734,6 +744,8 @@ 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
 #: view:sale.report:0
@@ -766,6 +778,28 @@ msgid ""
 "    * Graph of cases of the month\n"
 "    "
 msgstr ""
+"\n"
+"    Basmodulen för hantering av offerter och kundorder.\n"
+"Arbetsflöde med bekräftelser i flera steg:\n"
+"    - Offert -> kundorder -> faktura\n"
+"   - Faktureringsmetoder:\n"
+"      - Fakturera en order (före eller efter frakt)\n"
+"      - Fakturering vid leverans\n"
+"      - Fakturering av tid\n"
+"      - Avancerade fakturor\n"
+"    - Företagsval (frakt, faktueringsmetod, internationella handelstermer "
+"(incoterm), etc)\n"
+"    - Produkter, lager och priser\n"
+"    - Leveransmetoder\n"
+"         - Allt vid ett tillfälle / delleveranser\n"
+"         - Leveranskostnader\n"
+"    - Översiktspanel för säljare\n"
+"       - Aktuella offerter\n"
+"       - Top tio ordrar denna månad\n"
+"       - Statistik över utfall\n"
+"       - Grafer över försäljning per produkt\n"
+"       - Grafer över utfall i månaden\n"
+"    "
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
@@ -791,7 +825,7 @@ msgstr "Historik"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Standard packningsprincip"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -844,7 +878,7 @@ msgstr "Avbryt"
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr "Kundorder datum"
+msgstr "Kundorderdatum"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -868,7 +902,7 @@ msgstr "Marginaler på kundordern"
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Exklusive moms"
 
 #. module: sale
 #: view:sale.order:0
@@ -883,7 +917,7 @@ msgstr "Försäljning per partner"
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr "Ordering Contact"
+msgstr "Inköpskontakt"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
@@ -902,7 +936,7 @@ msgstr "Pris"
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "Konfigurering av Försäljningsapplikationen"
 
 #. module: sale
 #: view:sale.report:0
@@ -959,7 +993,7 @@ msgstr "Leveranskostnad"
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Inklusive moms"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
@@ -1520,14 +1554,14 @@ msgstr "Fakturaundantag"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is a list of picking that has been generated for this sales order."
-msgstr "Det här är en plocklista som har blivit skapad för denna kundorder."
+msgstr "Det här plocklistan är skapad för denna kundorder."
 
 #. 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 ""
+msgstr "Beräknar marginalen som differensen mellan styckpris och kostpris."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1760,7 +1794,7 @@ msgstr "Avancerad faktura"
 #: code:addons/sale/sale.py:591
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "Försäljningsordern '%s' har annullerats."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1817,7 +1851,7 @@ msgstr "Kundorder"
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr "Direktleverans"
+msgstr ""
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
@@ -1854,7 +1888,7 @@ msgstr "Januari"
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "Konfigurera din försäljningsapplikation"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1864,7 +1898,7 @@ msgstr "Pågående kundorder"
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "Förbättringar av säljorderlayouten"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:63
@@ -1961,7 +1995,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Anger att en faktura är betald."
 
 #. module: sale
 #: report:sale.order:0
@@ -1978,6 +2012,8 @@ msgstr "Maj"
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
 msgstr ""
+"Lägger till datum för överenskommelser, önskad och verkliga datum på "
+"säljordrarna."
 
 #. module: sale
 #: view:sale.order:0
@@ -2002,6 +2038,8 @@ msgid ""
 "Allows you to group and invoice your delivery orders according to different "
 "invoicing types: daily, weekly, etc."
 msgstr ""
+"Ger möjlighet att gruppera och fakturera leveranser på olika fakturatyper; "
+"dagligen, veckovis etc."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2016,7 +2054,7 @@ msgstr "Redovisning"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Steg för att leverera en kundorder"
 
 #. module: sale
 #: view:sale.order:0
@@ -2039,7 +2077,7 @@ msgstr "Betalningsvillkor"
 #: help:sale.installer,sale_layout:0
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
+msgstr "Nya funktioner som utökar layouten på säljorderrapporterna."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2073,9 +2111,6 @@ msgstr ""
 msgid "Invoice Based on Deliveries"
 msgstr "Fakturera utgående ifrån leveranser"
 
-#~ msgid "In progress"
-#~ msgstr "Pågående"
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Återskapa inköp"
 
@@ -2361,118 +2396,9 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "försäljningenordern. Denna transaktion flyttar försäljningsorder till "
 #~ "plocklista."
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "Dashboard för kundorder"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "Kundorder dashboard"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Försäljning denna månad"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Dashboard för försäljningschef"
-
-#~ msgid "Cases of the month"
-#~ msgstr "Ärenden denna månad"
-
-#~ msgid "My open quotations"
-#~ msgstr "Mina öppna offerter"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Ärendestatistik"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Top tio kundorder denna månad"
-
-#~ msgid "Average Price"
-#~ msgstr "Snittpris"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Kundorder per kategori"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Kundorder per produkt"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "Månatlig omsättning  för ett år"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "Omsättning per produkt"
-
-#~ msgid "All Months"
-#~ msgstr "Alla månader"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Kundorder per kategorier"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Försäljning för månaden"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Försäljning per produkt (denna månad)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "Månatlig omsättning för ett år"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Kunderorder - rapporter"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Försäljning per produktkategori"
-
-#~ msgid "# of Products"
-#~ msgstr "st produkter"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Försäljning per produkt"
-
-#~ msgid "This Month"
-#~ msgstr "Denna månad"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorier"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "Skapade kundorder"
-
-#~ msgid "Reporting"
-#~ msgstr "Rapportering"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "Omsättning per månad"
-
-#~ msgid "Graphs"
-#~ msgstr "Diagram"
-
-#~ msgid "Total Turnover"
-#~ msgstr "Total omsättning"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "Försäljning per produktkategori (denna månad)"
-
-#~ msgid "Create Date"
-#~ msgstr "Skapad datum"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Skapade kundorder"
-
-#~ msgid "Sales by State"
-#~ msgstr "Försäljning per stat"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
-#, 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: "
-#~ msgstr ""
-#~ "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: "
-
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatic Declaration"
 
@@ -2494,10 +2420,6 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "du fakturar baserad på beställt eller levererade mängder. Om produkten är en "
 #~ "tjänst betyder kvantiten timmar på tillhörande aktiviteter."
 
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Cannot delete a sale order line which is %s !"
-
 #, python-format
 #~ msgid "You must first cancel all packing attached to this sale order."
 #~ msgstr "You must first cancel all packing attached to this sale order."
@@ -2530,10 +2452,6 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Could not cancel sale order !"
 
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Quantity: "
-
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2541,36 +2459,6 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
 
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Type of ul: "
-
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
-#~ msgid ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-
-#~ msgid "Packing Information !"
-#~ msgstr "Packing Information !"
-
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-
 #, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
@@ -2579,37 +2467,6 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
 
-#~ 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 After 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 ""
-#~ "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 After 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."
-
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2650,45 +2507,5 @@ 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."
 
-#~ msgid "Sales By Partner"
-#~ msgstr "Försäljning per företag"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Datum när ordern är skapad"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
 #~ 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 "Configure Sale Order Logistics"
-#~ msgstr "Konfigurera kundorder logistik"
-
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sale order line."
-#~ msgstr ""
-#~ "Du måste först avbryta lagerförflyttningen som är kopplad till denna "
-#~ "försäljningsorderrad."
-
-#~ msgid "Reference of the document that generated this sale order request."
-#~ msgstr ""
-#~ "Refererande till dokumentet som låg till underlag för försäljningsordern."
-
-#~ msgid "From a sale order"
-#~ msgstr "Från en försäljningsorder"
-
-#~ msgid "Invoice address for current sale order"
-#~ msgstr "Faktureringsadress för aktuell försäljningsorder"
-
-#~ msgid "Sale Open Invoice"
-#~ msgstr "Försäljning öppna fakturor"
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Försäljning per kund"
-
-#~ msgid "Sequence Number"
-#~ msgstr "Sekvensnummer"
-
-#~ msgid "Default UoM"
-#~ msgstr "Standardenhet"
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index 3efa121f2e5..65504fbc687 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 94ba0606803..526ba7d785e 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 4bf5a6d0ea5..69f28e05c2e 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/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: 2011-06-11 04:56+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2195,9 +2195,6 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Reference"
 #~ msgstr "Referans"
 
-#~ msgid "Shop name"
-#~ msgstr "Mağaza adı"
-
 #~ msgid "Net Price"
 #~ msgstr "Net Fiyat"
 
@@ -2225,9 +2222,6 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Otomatik Bildiri"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Müşteri Ref."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "İşlem tanımlamasında geçersiz model adı."
 
@@ -2420,78 +2414,3 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ 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 "Sale Dashboard"
-#~ msgstr "Satış Paneli"
-
-#~ msgid "Sales of the month"
-#~ msgstr "Aylık Satışlar"
-
-#~ msgid "Sales manager board"
-#~ msgstr "Satış Yönetici Panosu"
-
-#~ msgid "Cases statistics"
-#~ msgstr "Servis Talebi İstatistikleri"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "Ayın En 10 Satışları"
-
-#~ msgid "Average Price"
-#~ msgstr "Ortalama Fiyat"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "Kategorilere göre siparişler"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "Ürünlere göre siparişler"
-
-#~ msgid "All Months"
-#~ msgstr "Tüm aylar"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "Kategorilere göre satışlar"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "Aylık satışlar"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "Ürüne göre satışlar (bu ay)"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Satış Yönetimi - Raporlama"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "Ürün Kategorilerine Göre Satışlar"
-
-#~ msgid "# of Products"
-#~ msgstr "Ürün adedi"
-
-#~ msgid "Sales by Product"
-#~ msgstr "Ürünlere Göre Satışlar"
-
-#~ msgid "This Month"
-#~ msgstr "Bu Ay"
-
-#~ msgid "Categories"
-#~ msgstr "Kategoriler"
-
-#~ msgid "Reporting"
-#~ msgstr "Raporlama"
-
-#~ msgid "Graphs"
-#~ msgstr "Grafikler"
-
-#~ msgid "Manual in progress"
-#~ msgstr "Manuel İşlem Devam Ediyor"
-
-#~ msgid "In progress"
-#~ msgstr "İşlenen"
-
-#~ msgid "Create Date"
-#~ msgstr "Oluşturulma Tarihi"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "Oluşan Satış Siparişleri"
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "Satış Sipariş Lojistiğini Ayarla"
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index d2dfbd6779d..7173d92c6e0 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-12-15 20:52+0000\n"
-"Last-Translator: Jay Vora (OpenERP) <jvo@tinyerp.com>\n"
+"Last-Translator: Jay Vora <Unknown>\n"
 "Language-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-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -2057,49 +2057,6 @@ msgstr ""
 msgid "Invoice Based on Deliveries"
 msgstr ""
 
-#~ msgid "Shop name"
-#~ msgstr "Назва торгової точки"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "Кількість (ОП)"
-
-#~ msgid "Manual in progress"
-#~ msgstr "В обробці вручну"
-
-#~ msgid "Number packages"
-#~ msgstr "Кількість упаковок"
-
-#~ msgid "In progress"
-#~ msgstr "В обробці"
-
-#~ msgid "Product UOS"
-#~ msgstr "ОП продукту"
-
-#~ msgid "Related Packings"
-#~ msgstr "Пов'язані Партії"
-
-#~ msgid "Invoice from the packings"
-#~ 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 "
-#~ "(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 be on the date 'Date Ordered'."
-#~ msgstr ""
-#~ "Показує стан пропозиції або заявки на продаж. Стан виключення настає "
-#~ "автоматично, коли трапляється операція скасування у підтвердженні інвойса "
-#~ "('Виключення з інвойсування') або у процесі листа пакування ('Виключення з "
-#~ "доставки'). Стан 'Очікує плану дій' встановлюється, коли інвойс "
-#~ "підтверджений, але очікує планувальника до дати 'Дата заявки'."
-
-#, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr ""
-#~ "Primero debe cancelar todos los albaranes relacionados con este pedido de "
-#~ "venta."
-
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Доставка зі складу Клієнтові."
 
@@ -2109,9 +2066,6 @@ msgstr ""
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Стадії Доставки Замовлення на Продаж"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Клієнт"
-
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2125,21 +2079,9 @@ msgstr ""
 #~ msgid "Packing"
 #~ msgstr "Пакування"
 
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shippings or not."
-#~ msgstr ""
-#~ "Якщо у Вас недостатньо запасів для доставки всього одразу, приймаєте Ви "
-#~ "часткові відвантаження чи ні."
-
 #~ msgid "Sale Procurement"
 #~ msgstr "Забезпечення Продажу"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "Ви не можете скасувати рядок замовлення на продаж який вже було інвойсовано !"
-
 #~ msgid "Recreate Procurement"
 #~ msgstr "Перестворити постачання"
 
@@ -2301,12 +2243,3 @@ msgstr ""
 
 #~ msgid "Sale Order line"
 #~ msgstr "Рядок заявки на продаж"
-
-#~ msgid "All Months"
-#~ msgstr "Всі місяці"
-
-#~ msgid "This Month"
-#~ msgstr "Цей місяць"
-
-#~ msgid "Reporting"
-#~ msgstr "Звіти"
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 53be86ad82e..b0acd9ac8a3 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -9,23 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-05-04 19:22+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-05 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
-
-#, 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: "
-#~ msgstr ""
-#~ "Bạn đã chọn một số lượng của %d đơn vị.\n"
-#~ " Nhưng nó không tương thích với loại đóng gói được chọn.\n"
-#~ " Dưới đây là một gợi ý về số lượng theo loại bao bì đóng gói: "
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -496,7 +486,7 @@ 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"
+msgstr "Yêu cầu Giao hàng"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
@@ -1804,7 +1794,7 @@ msgstr ""
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Tiến trình cấu hình"
+msgstr "Tiến trình Cấu hình"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -2085,15 +2075,6 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Khai báo tự động"
 
-#~ msgid "Customer Ref."
-#~ msgstr "Thông tin khách hàng"
-
-#~ msgid "Invoice from the packings"
-#~ msgstr "Lập hóa đơn khi giao hàng"
-
-#~ msgid "Shop name"
-#~ msgstr "Tên cửa hàng"
-
 #~ msgid "Packing"
 #~ msgstr "Đóng gói"
 
@@ -2165,41 +2146,6 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Các bước để thực hiện một đơn chào hàng"
 
-#~ msgid ""
-#~ "\n"
-#~ "    The base module to manage quotations and sales orders.\n"
-#~ "\n"
-#~ "    * Workflow with validation steps:\n"
-#~ "        - Quotation -> Sale 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"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Mô đun cơ bản để quản lý các báo giá và đơn hàng.\n"
-#~ "\n"
-#~ "    * Quy trình thực hiện với các bước xác nhận:\n"
-#~ "        - Báo giá -> Đơn chào hàng -> Hóa đơn\n"
-#~ "    * Phương pháp lập hóa đơn:\n"
-#~ "        - Lập hóa đơn theo đặt hàng (trước hoặc sau vận chuyển )\n"
-#~ "        - Lập hóa đơn theo giao hàng\n"
-#~ "        - Lập hóa đơn theo thời gian quy định\n"
-#~ "        - Hóa đơn ứng trước\n"
-#~ "    * Sở thích đối tác (vận chuyển, hóa đơn, incoterm, ...)\n"
-#~ "    * Lưu trữ và giá sản phẩm\n"
-#~ "    * Phương pháp giao hàng:\n"
-#~ "        - toàn bộ một lần, nhiều gói\n"
-#~ "        - chi phí giao hàng\n"
-#~ "    "
-
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Hóa đơn của bạn đã được tạo thành công!"
 
@@ -2236,10 +2182,6 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "My sales order in progress"
 #~ msgstr "Đơn chào hàng của tôi đang được thực hiện"
 
-#, python-format
-#~ msgid "Cannot delete a sale order line which is %s !"
-#~ msgstr "Không thể xóa một đơn chào hàng sản phẩm là %s!"
-
 #~ msgid "All Sales Order"
 #~ msgstr "Tất cả đơn chào hàng"
 
@@ -2302,10 +2244,6 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Order Ref"
 #~ msgstr "Số tham chiếu đặt hàng"
 
-#, python-format
-#~ msgid " Quantity: "
-#~ msgstr " Số lượng: "
-
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2332,10 +2270,6 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Sales Configuration"
 #~ msgstr "Cấu hình bán hàng"
 
-#, python-format
-#~ msgid " Type of ul: "
-#~ msgstr " Loại ul: "
-
 #~ msgid "Procurement Corrected"
 #~ msgstr "Thu mua hàng được điều chỉnh đúng"
 
@@ -2351,44 +2285,18 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Packing Policy"
 #~ msgstr "Chính sách đóng gói bao bì"
 
-#, python-format
-#~ msgid "EAN: "
-#~ msgstr "EAN: "
-
 #~ 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 ""
-#~ "Number of days between the order confirmation the the shipping of the "
-#~ "products to the customer"
-#~ msgstr ""
-#~ "Số ngày kể từ ngày xác nhận đơn đặt hàng đến ngày giao hàng cho khách hàng"
-
 #~ msgid "Sale Order"
 #~ msgstr "Đơn chào hàng"
 
-#~ msgid "Packing Information !"
-#~ msgstr "Thông tin đóng gói!"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Bảng giá bán hàng"
 
-#, python-format
-#~ msgid ""
-#~ "Invoice cannot be created for this Sale Order Line due to one of the "
-#~ "following reasons:\n"
-#~ "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-#~ "2.The Sale Order Line is Invoiced!"
-#~ msgstr ""
-#~ "Không thể tạo hóa đơn cho đơn chào hàng sản phẩm này do một trong các lý do "
-#~ "sau: \n"
-#~ "1.Trạng thái của đơn chào hàng sản phẩm này hoặc là \"dự thảo\" hoặc "
-#~ "\"hủy\"!\n"
-#~ "2.Đơn chào hàng sản phẩm này đã được lập hóa đơn!"
-
 #, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
@@ -2397,31 +2305,6 @@ 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 ""
-#~ "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 After 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 ""
-#~ "Chính sách vận chuyển được dùng để đồng bộ hóa hoạt động lập hóa đơn và giao "
-#~ "hàng.\n"
-#~ "  - Lựa chọn 'Thanh toán trước khi giao hàng' đầu tiên sẽ tạo hóa đơn và sau "
-#~ "đó tạo yêu cầu đóng gói sau khi nhận được thanh toán của hóa đơn này.\n"
-#~ "  - Lựa chọn 'Vận chuyển và Hóa đơn thủ công' sẽ tạo ra yêu cầu đóng gói "
-#~ "trực tiếp và chờ người sử dụng chọn nút 'Hóa đơn' một cách thủ công để tạo "
-#~ "hóa đơn dự thảo.\n"
-#~ "  - Lựa chọn 'Hóa đơn theo đơn đặt hàng sau giao hàng' sẽ tạo hóa đơn dự "
-#~ "thảo dựa trên đơn chào hàng sau khi tất cả bảng kê bao bì hàng hóa được hoàn "
-#~ "tất.\n"
-#~ "  - Lựa chọn 'Hóa đơn từ đóng gói hàng hóa' được dùng để tạo hóa đơn trong "
-#~ "quá trình đóng gói."
-
 #~ msgid "Sales order lines"
 #~ msgstr "Sản phẩm đơn chào hàng"
 
@@ -2434,14 +2317,6 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Other data"
 #~ msgstr "Dữ liệu khác"
 
-#, python-format
-#~ msgid ""
-#~ "There is no income account defined ' \\n                                     "
-#~ "   'for this product: \"%s\" (id:%d)"
-#~ msgstr ""
-#~ "Không có tài khoản thu nhập được thiết lập ' \\n                             "
-#~ "           'cho sản phẩm này: \"%s\" (mã:%d)"
-
 #~ 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 "
@@ -2583,29 +2458,5 @@ 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 "Average Price"
-#~ msgstr "Giá trung bình"
-
-#~ msgid "Date on which sale order is created"
-#~ msgstr "Ngày đơn đặt hàng được tạo"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
-#~ msgid "The total amount"
-#~ msgstr "Tổng giá trị"
-
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Lỗi: mã EAN không hợp lệ"
-
-#~ msgid "Sales by Customer"
-#~ msgstr "Doanh số theo khách hàng"
-
-#~ msgid "Source document"
-#~ msgstr "Tài liệu nguồn"
-
-#~ msgid "The amount without tax"
-#~ msgstr "Giá trị không thuế"
-
-#~ msgid "This is a list of picking that has been generated for this sale order"
-#~ msgstr "Đây là danh sách các sản phẩm đã chọn được tạo ra cho đơn hàng này"
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 864e029f473..afe17921e8a 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -37,7 +37,7 @@ msgstr "如果库存不够一次全部交货，你是否接受部分交货？"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "当前销售订单的送货地址。"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -60,7 +60,7 @@ msgstr "取消订单"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr "配置销售单物流信息"
+msgstr "设置销售单物流信息"
 
 #. module: sale
 #: code:addons/sale/sale.py:603
@@ -87,7 +87,7 @@ msgstr "增值税"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "由销售订单明细产生的采购订单。"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -108,7 +108,7 @@ 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 ""
+msgstr "要开票的销售订单明细列表。你可以按照销售订单明细分别开票。如果按发货单开票，或者按销售订单统一开票的话，你不需要这个列表。"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
@@ -137,6 +137,9 @@ msgid ""
 "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能处理多种类型产品使一个销售订单可能触发任务，发货单，生产订单，采购等。\r\n"
+"根据销售订单的设置，将会产生一张发票草稿以便当你需要向客户开票的时候，你只需要确认一下即可。"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -158,7 +161,7 @@ msgstr "默认付款条件"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr "配置销售订单的提货政策"
+msgstr "设置销售订单的提货政策"
 
 #. module: sale
 #: view:sale.order:0
@@ -181,7 +184,7 @@ msgstr "强制指定"
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "选择此项，发票将会按客户分组。"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -212,24 +215,24 @@ msgstr "其他信息"
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+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 ""
+msgstr "如果运送方式是‘提货后开票’或者‘发货后开票’， 系统将会自己创建发票。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "销售生成发票"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "重建装箱单"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -240,14 +243,14 @@ msgstr "折扣(%)"
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
-msgstr ""
+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 ""
+msgstr "销售经理控制台"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -257,7 +260,7 @@ msgstr "包装"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "来自销售订单"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -268,7 +271,7 @@ msgstr "商店名"
 #: code:addons/sale/sale.py:1014
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "客户没有定义 ！"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
@@ -283,7 +286,7 @@ msgstr "设为报价单"
 #. module: sale
 #: view:sale.order:0
 msgid "Conditions"
-msgstr ""
+msgstr "条款"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -299,6 +302,11 @@ msgid ""
 "  - The 'Invoice From The Picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"运送方式是用于同步发票和发货操作的。\n"
+"  - ‘款到发货’选项是先生成发票，然后当收到发票的付款后生成装箱单。\n"
+"  - ‘运送并且手工开票’是直接创建装箱单，并且等待用户手工点击‘开票’按钮生成发票草稿。\n"
+"  - ‘先发货后开票’选项是在所有装箱单完成之后根据销售订单生成发票草稿。\n"
+"  - ‘按装箱单开票’选项是在分拣的过程中生成发票。"
 
 #. module: sale
 #: code:addons/sale/sale.py:939
@@ -306,49 +314,49 @@ msgstr ""
 msgid ""
 "There is no income category account defined in default Properties for "
 "Product Category or Fiscal Position is not defined !"
-msgstr ""
+msgstr "没有为产品类别定义缺省的收入类科目，或者没有定义财务结构 ！"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "你尝试分配一个来自其它产品的批次"
 
 #. module: sale
 #: code:addons/sale/sale.py:620
 #, python-format
 msgid "invalid mode for test_state"
-msgstr ""
+msgstr "test_state的模式无效"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: sale
 #: code:addons/sale/sale.py:584
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "不能取消此销售订单 ！"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "销售订单统"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "销售订单相关的辅助核算项。"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: sale
 #: view:board.board:0
@@ -356,12 +364,12 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "报价单"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "当前销售订单的价格表。"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -378,12 +386,12 @@ msgstr "增值税:"
 msgid ""
 "Number of days between the order confirmation the shipping of the products "
 "to the customer"
-msgstr ""
+msgstr "从订单确认到开始运送货物给客户之间的天数"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "报价日期"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -412,26 +420,26 @@ msgstr "进展"
 msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
-msgstr ""
+msgstr "业务员确认报价。销售订单的状态变成‘进度’或‘手工进度’。"
 
 #. module: sale
 #: code:addons/sale/sale.py:971
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
+msgstr "你必须先取消所有附加在此销售订单明细上的库存调拨。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1042
 #, python-format
 msgid "(n/a)"
-msgstr ""
+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 ""
+msgstr "选择一个‘预付产品’的服务类产品。你可能需要创建并把它设为此字段的缺省值。"
 
 #. module: sale
 #: report:sale.order:0
@@ -444,7 +452,7 @@ msgstr "电话:"
 msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
+msgstr "你不能对一个定义为‘发货后自动开票’的销售订单提前开票。"
 
 #. module: sale
 #: view:sale.order:0
@@ -457,12 +465,12 @@ msgstr "备注"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "当前销售订单的发票地址。"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
-msgstr ""
+msgstr "通过额外的功能增强你的核心销售应用程序。"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -478,7 +486,7 @@ msgstr "送货单"
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "确认日期"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -493,12 +501,12 @@ msgstr "单号必须唯一！"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "总金额。"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -515,14 +523,14 @@ msgstr "发票地址:"
 msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
-msgstr ""
+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 ""
+msgstr "国际贸易术语包含一系列用于贸易事务的术语。"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -532,7 +540,7 @@ msgstr "发票地址"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "查询未开票明细"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -548,18 +556,18 @@ msgstr "明细#"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "未结发票销售订单"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "销售订单明细"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "设置你的销售流程和默认值。"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -585,7 +593,7 @@ msgstr "未完税金额"
 #: 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 ""
+msgstr "需开票的销售订单明细"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -595,7 +603,7 @@ msgstr "数量(计量单位)"
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -610,7 +618,7 @@ msgstr "合计:"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "我的销售订单"
 
 #. module: sale
 #: code:addons/sale/sale.py:290
@@ -631,18 +639,18 @@ msgstr "价格表"
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "数量#"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "订单日期"
 
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "已运送"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -652,18 +660,18 @@ msgstr "所有报价单"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "发货后开票"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "产品类别"
 
 #. module: sale
 #: report:sale.order:0
@@ -678,7 +686,7 @@ msgstr "库存调拨"
 #. module: sale
 #: view:sale.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: sale
 #: field:sale.order,state:0
@@ -690,33 +698,33 @@ msgstr "订单状态"
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成发票吗 ？"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "月销售情况"
 
 #. module: sale
 #: code:addons/sale/sale.py:970
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "不能取消销售明细！"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "安全天数"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "已出售物料采购"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "生成最终发票"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -728,12 +736,12 @@ msgstr "运送地址"
 msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
-msgstr ""
+msgstr "它表示销售订单已经发货了。只有运行日程表（scheduler）后这个字段才会被修改。"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "扩展过滤器..."
 
 #. module: sale
 #: model:ir.module.module,description:sale.module_meta_information
@@ -761,22 +769,42 @@ msgid ""
 "    * Graph of cases of the month\n"
 "    "
 msgstr ""
+"\n"
+"    管理报价单和销售订单的基础模块。\n"
+"  * 工作流和验证步骤： - 报价 -> 销售订单 -> 开票\n"
+"  * 开票方式：\n"
+"    - 按订单开票（运送前或后）\n"
+"    - 按发货单开票 - 按工时单开票\n"
+"    - 预付款发票\n"
+"  * 业务伙伴首选项（运送，开票方式...）\n"
+"  * 产品库存与价格\n"
+"  * 送货方式:\n"
+"    - 所有一起，多个包裹\n"
+"    - 交货成本\n"
+"\n"
+"  * 业务员控制台包括:\n"
+"    * 你的未关闭报价单\n"
+"    * 月销售前10\n"
+"    * 业务个案统计\n"
+"    * 产品销售图表\n"
+"    * 月业务个案图表\n"
+"    "
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "销售店"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: sale
 #: view:sale.order:0
@@ -786,7 +814,7 @@ msgstr "日志"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "默认分拣方式"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -794,7 +822,7 @@ 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 ""
+msgstr "这是为此销售订单生成的发票列表。同一销售订单可能会多次开票（比如按销售明细）。"
 
 #. module: sale
 #: report:sale.order:0
@@ -805,13 +833,13 @@ msgstr "你参考"
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact who requested the order or quotation."
-msgstr ""
+msgstr "订单或报价请求人的姓名和地址。"
 
 #. module: sale
 #: code:addons/sale/sale.py:966
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+msgstr "你不能取消已开票的销售订单 ！"
 
 #. module: sale
 #: view:sale.order:0
@@ -822,7 +850,7 @@ msgstr "数量"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "引用"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -838,7 +866,7 @@ msgstr "取消"
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "销售订单日期"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -857,12 +885,12 @@ msgstr "创建发票"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "销售订单利润"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "不含税总金额"
 
 #. module: sale
 #: view:sale.order:0
@@ -872,7 +900,7 @@ msgstr "计算"
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr ""
+msgstr "业务伙伴的销售情况"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -883,7 +911,7 @@ msgstr "订购联系"
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "未结发票"
 
 #. module: sale
 #: report:sale.order:0
@@ -896,7 +924,7 @@ msgstr "价格"
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "销售应用程序设置"
 
 #. module: sale
 #: view:sale.report:0
@@ -912,12 +940,12 @@ msgstr "来自订单"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "基于已运送或被订购的数据。"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "装箱单"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -933,37 +961,37 @@ msgstr "运送地址:"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 msgid "Sales per Customer in last 90 days"
-msgstr ""
+msgstr "最近90天每个客户的销售情况"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "销售订单草稿状态"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "创建发货单"
 
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
-msgstr ""
+msgstr "交货成本"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "含税总金额"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "创建分拣单"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "按产品类别的销售情况"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -978,14 +1006,14 @@ msgstr "确认报价单"
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "生成此销售订单请求的单据"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于..."
 
 #. module: sale
 #: view:sale.order:0
@@ -996,7 +1024,7 @@ msgstr "重新创建发票"
 #: 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 ""
+msgstr "开票的发货单"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1007,28 +1035,28 @@ msgstr "等待调度"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "采购方式"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "分拣单"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "订单日期"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "调拨出去或调拨给客户的单据"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1043,7 +1071,7 @@ msgstr "确认订单"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "创建采购订单"
 
 #. module: sale
 #: view:sale.order:0
@@ -1060,18 +1088,18 @@ msgstr "运送方式"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "销售订单创建日期"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "库存调拨"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "生成发票"
 
 #. module: sale
 #: view:sale.order:0
@@ -1086,7 +1114,7 @@ msgstr "传真:"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "预付款总额"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1101,7 +1129,7 @@ msgstr "基于销售订单开票"
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "装箱单"
 
 #. module: sale
 #: code:addons/sale/sale.py:387
@@ -1115,12 +1143,12 @@ msgstr "错误！"
 #: code:addons/sale/sale.py:570
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "不能取消销售订单 ！"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
@@ -1147,7 +1175,7 @@ msgstr "发货和手工发票"
 #: code:addons/sale/sale.py:1051
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "装箱单信息 ！"
 
 #. module: sale
 #: view:sale.report:0
@@ -1163,23 +1191,23 @@ msgstr "销售管理"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "来自装箱单的发票"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "等待会计审核。"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "参考计量单位（UoM）"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "销售订单明细开票"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1189,11 +1217,12 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"默认情况下，OpenERP能够管理仓库和业务伙伴库位之间复杂的路线和路径。此设置能够配置最常用、最简单的方式来发货给各户，员工只需1或2个操作。"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "老的报价单"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1205,7 +1234,7 @@ msgstr "支付"
 #: model:ir.ui.menu,name:sale.menu_report_product_all
 #: view:sale.report:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "销售分析表"
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
@@ -1225,13 +1254,13 @@ 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 ""
+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 ""
+msgstr "你可以根据销售订单或运输单生成发票。"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -1258,7 +1287,7 @@ msgstr "完成"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "sale.installer"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -1273,47 +1302,49 @@ msgid ""
 "You have to select a customer in the sales form !\n"
 "Please set one customer before choosing a product."
 msgstr ""
+"你必须在销售表单中选择一个客户 ！\n"
+"请在选择产品之前设置1个客户。"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "装箱单 & 发货单"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源文档"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "待处理"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "装箱方式"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "转移给客户的单据"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "除税后总额。"
 
 #. module: sale
 #: code:addons/sale/sale.py:571
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
+msgstr "你必须先取消销售订单上的所有装箱单。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "销售预付发票"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1331,7 +1362,7 @@ msgstr "产品"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "开发票"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
@@ -1341,7 +1372,7 @@ msgstr "取消指定"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr "销售设置领料/提货方式"
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -1353,6 +1384,9 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"指定报价单或销售订单的状态\n"
+"当发票验证被取消（发票异常），或取消装箱单里的产品（运输异常）的时候，会被设置为异常状态。\n"
+"当发票被确认但在“订单日期”那天正等待日程安排会被设置为‘等待日程安排’状态。"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1383,7 +1417,7 @@ msgstr "产品计量单位"
 #. module: sale
 #: view:sale.order:0
 msgid "Logistic"
-msgstr ""
+msgstr "物流"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1394,12 +1428,12 @@ msgstr "订单"
 #: code:addons/sale/sale.py:921
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "没有为此产品定义收入类科目： \\\"%s\\\" (id:%d)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "忽略异常"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1409,6 +1443,8 @@ msgid ""
 "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:1116
@@ -1417,6 +1453,8 @@ 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
@@ -1426,12 +1464,12 @@ msgstr "状态"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "客户订单号"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1443,7 +1481,7 @@ msgstr "合计"
 #: code:addons/sale/sale.py:388
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "没有为此公司定义销售账簿： \\\"%s\\\" (id:%d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1451,31 +1489,31 @@ 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 ""
+msgstr "根据出库库位的设置，出库和客户之间的库存转移是通过发货单手工或自动完成的。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "不能删除 %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 ""
+msgstr "生成发票"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "开票"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "销售订单的日期已确认。"
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1484,17 +1522,17 @@ msgstr ""
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "开票日期"
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "预付款发票金额"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1506,14 +1544,14 @@ msgstr "发票异常"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is a list of picking that has been generated for this sales order."
-msgstr ""
+msgstr "此销售订单的装箱单。"
 
 #. 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 ""
+msgstr "通过单价和成本价之间的差价设定利润率。"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1545,24 +1583,24 @@ msgstr "商店"
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月   "
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "确认日期"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 msgid "Sales by Month"
-msgstr ""
+msgstr "月销售情况"
 
 #. module: sale
 #: code:addons/sale/sale.py:1045
@@ -1574,6 +1612,11 @@ msgid ""
 "\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"你选中了%d单位的数量。\n"
+"但是它和选中的装箱单不一致。\n"
+"根据装箱单它的数量应该是：\n"
+"\n"
+"EAN：%s 数量：%s ul类型：%s"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1583,7 +1626,7 @@ msgstr ""
 #: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -1597,7 +1640,7 @@ msgid ""
 "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 ""
+msgstr "一旦销售订单被确认，装箱单就会和采购订单一起被生成。它代表部分销售订单分配。每行有效的销售订单明细会对应一张装箱单。"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1612,13 +1655,13 @@ msgstr "确认"
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+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 ""
+msgstr "最近90天各产品类别的销售情况"
 
 #. module: sale
 #: view:sale.order:0
@@ -1635,7 +1678,7 @@ msgstr "销售订单明细"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "发货提前期"
 
 #. module: sale
 #: view:res.company:0
@@ -1650,7 +1693,7 @@ msgstr "完成送货"
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1658,12 +1701,12 @@ 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 ""
+msgstr "运输方式是用于设置每张销售订单是否有一个产品有效时尽可能早发货，还是等所有产品都准备好了才尽可能早发货。"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1674,6 +1717,9 @@ 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. 销售订单明细已经开票！"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1690,13 +1736,13 @@ msgstr "发票"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -1705,12 +1751,12 @@ msgid ""
 "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 ""
+msgstr "采购订单会在销售订单确认或发票付款后立刻自动生成。根据产品的采购和生产规则和销售订单参数。 "
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "未开票"
 
 #. module: sale
 #: report:sale.order:0
@@ -1726,7 +1772,7 @@ msgstr "业务员"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "促使采购和开票"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -1746,7 +1792,7 @@ msgstr "预付款发票"
 #: code:addons/sale/sale.py:591
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "销售订单'%s'已被取消。"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1766,22 +1812,27 @@ msgid ""
 "            \n"
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
+"*当相关的销售订单处于草稿状态时设置为'草稿'状态。                     \n"
+"*当相关的销售订单被确认时设置为'已确认'状态。                     \n"
+"*当相关的销售订单被设置为异常的时候设置为'异常'状态。                     \n"
+"*当销售订单明细已经拣货时设置为'已完成'状态。                     \n"
+"*当用户取消相关销售订单时设置为'已取消'状态。"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "税额。"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "装箱单"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "设置进度"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1791,7 +1842,7 @@ msgstr "产品销售"
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+msgstr "订购日期"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -1808,7 +1859,7 @@ msgstr "直接送货"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "开票日志"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -1819,28 +1870,28 @@ msgstr "预付产品"
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "交货数量"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "发票创建成功！"
 
 #. module: sale
 #: code:addons/sale/sale.py:585
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "你必须先取消销售订单的所有发票。"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "设置销售管理应用程序"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1850,26 +1901,26 @@ msgstr "销售订单进展"
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "改善销售订单样式"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:63
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+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 ""
+msgstr "销售订单的对应一个采购订单"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1879,24 +1930,24 @@ msgstr "指定"
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "订单日期"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "确认的销售订单开票。"
 
 #. module: sale
 #: code:addons/sale/sale.py:290
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr ""
+msgstr "不能删除已被确认的销售订单 !"
 
 #. module: sale
 #: code:addons/sale/sale.py:316
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "销售订单'%s'已经被设为草稿状态。"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1916,23 +1967,23 @@ msgstr "关闭"
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "已交货"
 
 #. module: sale
 #: code:addons/sale/sale.py:1115
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "库存不足 ！"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "你必须为产品安排生产批次"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "样式序列号"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1943,11 +1994,13 @@ msgid ""
 "warehouse from which the products will be delivered for each particular "
 "sales."
 msgstr ""
+"如果有有超过一个商店转售你公司的产品，你可以在这里创建和管理它们。\r\n"
+"每当生成一个报价单或者销售订单都必须和一个商店关联起来。商店也会为各自的销售订单指定产品会从那个仓库发货。"
 
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "它表示发票已经支付。"
 
 #. module: sale
 #: report:sale.order:0
@@ -1958,12 +2011,12 @@ msgstr "说明"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
+msgstr "为销售订单添加承诺，申请和生效日期。"
 
 #. module: sale
 #: view:sale.order:0
@@ -1975,24 +2028,24 @@ msgstr "客户"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr ""
+msgstr "预支"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. 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 ""
+msgstr "允许你对你的发货单根据不同开票类型：每天，每周等，进行分组和开票。"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: sale
 #: view:sale.shop:0
@@ -2002,18 +2055,18 @@ msgstr "会计"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "销售订单发货步骤"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "查询销售订单"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "销售订单申请"
 
 #. module: sale
 #: report:sale.order:0
@@ -2025,7 +2078,7 @@ msgstr "付款条件"
 #: help:sale.installer,sale_layout:0
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
+msgstr "提供一些新的功能来改善销售订单报表的样式。"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2036,6 +2089,8 @@ msgid ""
 "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
@@ -2052,25 +2107,13 @@ msgstr "已领料/退货"
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
 msgstr "发票基于送货单"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "从装箱单创建发票"
-
-#~ msgid "Shop name"
-#~ msgstr "商店名称"
-
-#~ msgid "Quantity (UOS)"
-#~ msgstr "数量（销售计量单位）"
-
-#~ msgid "Product UOS"
-#~ msgstr "产品销售计量单位"
-
 #~ msgid "Draft Invoice"
 #~ msgstr "发票草稿"
 
@@ -2190,41 +2233,6 @@ msgstr "发票基于送货单"
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "步骤提供销售订单"
 
-#~ msgid ""
-#~ "\n"
-#~ "    The base module to manage quotations and sales orders.\n"
-#~ "\n"
-#~ "    * Workflow with validation steps:\n"
-#~ "        - Quotation -> Sale 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"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这基础模块管理报价和销售订单\n"
-#~ "\n"
-#~ "\t* 工作流批准的步骤:\n"
-#~ "\t\t- 报价 -》 销售订单 -》 发票\n"
-#~ "\t*开票方式:\n"
-#~ "\t\t- 发票基于订单(之前和之后运输)\n"
-#~ "\t\t- 发票基于送货单\n"
-#~ "\t\t- 发票基于时间表\n"
-#~ "\t\t- 预付款发票\n"
-#~ "\t*业务伙伴优先级(运输单,发票,国际贸易术语)\n"
-#~ "    *库存产品和价格\n"
-#~ "\t*送货方式:\n"
-#~ "\t\t- 多业务伙伴一起\n"
-#~ "\t\t- 送货成本\n"
-#~ "    "
-
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "你的发票已经成功创建!"
 
@@ -2350,24 +2358,6 @@ msgstr "发票基于送货单"
 #~ "the sale order. This transaction moves the sale order to invoices."
 #~ 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 "
-#~ "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 After 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 ""
-#~ "运输策略是用来同步发票和交货操作\n"
-#~ "  在运输前付款将先产生发票和包装单后支付发票\n"
-#~ "  运输和手动开发票将创建包装单并等待用户手动开发票\n"
-#~ "  发票在交货后将在销售订单建立所有包装单后产生发票\n"
-#~ "  发票来自包装是用户在包装的时候生成发票"
-
 #~ msgid "Sequence"
 #~ msgstr "序列"
 
@@ -2463,172 +2453,6 @@ msgstr "发票基于送货单"
 #~ msgid "Sale Order line"
 #~ msgstr "销售订单明细"
 
-#~ msgid "Dashboard for sales"
-#~ msgstr "销售控制台"
-
-#~ msgid "Sale Dashboard"
-#~ msgstr "销售控制台"
-
-#~ msgid "Sales of the month"
-#~ msgstr "当月销售"
-
-#~ msgid "Sales manager board"
-#~ msgstr "销售管理面板"
-
-#~ msgid "Cases of the month"
-#~ msgstr "这月业务个案"
-
-#~ msgid "My open quotations"
-#~ msgstr "我打开报价"
-
-#~ msgid "Cases statistics"
-#~ msgstr "业务个案统计"
-
-#~ msgid "Top ten sales of the month"
-#~ msgstr "当月销售"
-
-#~ msgid "Report of Created Sale Order"
-#~ msgstr "创建销售订单报表"
-
-#~ msgid "Sales Orders by category"
-#~ msgstr "销售订单分类"
-
-#~ msgid "Monthly cumulated sales turnover over one year"
-#~ msgstr "一年内月累积营业额"
-
-#~ msgid "Sales Orders by Products"
-#~ msgstr "销售订单产品"
-
-#~ msgid "Monthly Sales Turnover Over One Year"
-#~ msgstr "一年内月累积营业额"
-
-#~ msgid "Turnover Per Product"
-#~ msgstr "每产品的营业额"
-
-#~ msgid "All Months"
-#~ msgstr "所有月份"
-
-#~ msgid "Sales Orders by Categories"
-#~ msgstr "销售订单分类"
-
-#~ msgid "Sales of the Month"
-#~ msgstr "这月的销售"
-
-#~ msgid "Sales by Product (this month)"
-#~ msgstr "销售的产品(这月)"
-
-#~ msgid "Monthly sales turnover over one year"
-#~ msgstr "一年内月累积营业额"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "销售管理 - 报表"
-
-#~ msgid "Sales by Category of Products"
-#~ msgstr "销售的产品分类"
-
-#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
-#~ msgstr "一年内月累积营业额"
-
-#~ msgid "# of Products"
-#~ msgstr "产品#"
-
-#~ msgid "Sales by Product"
-#~ msgstr "销售的产品"
-
-#~ msgid "This Month"
-#~ msgstr "本月"
-
-#~ msgid "Categories"
-#~ msgstr "分类"
-
-#~ msgid "Created Sale Orders"
-#~ msgstr "创建销售订单"
-
-#~ msgid "Reporting"
-#~ msgstr "内部报表"
-
-#~ msgid "Turnover Per Month"
-#~ msgstr "每月的营业额"
-
-#~ msgid "Daily Sales Turnover Over One Year"
-#~ msgstr "一年内每天的营业额"
-
-#~ msgid "Graphs"
-#~ msgstr "图表"
-
-#~ msgid "Manual in progress"
-#~ msgstr "手动处理"
-
-#~ msgid "Total Turnover"
-#~ msgstr "总营业额"
-
-#~ msgid "In progress"
-#~ msgstr "图表"
-
-#~ msgid "Sales by Category of Product (this month)"
-#~ msgstr "销售的产品分类(这月)"
-
-#~ msgid "Daily sales turnover over one year"
-#~ msgstr "一年内每天的营业额"
-
-#~ msgid "Create Date"
-#~ msgstr "创建日期"
-
-#~ msgid "Created Sales orders"
-#~ msgstr "创建销售订单"
-
-#~ msgid "Sales by State"
-#~ msgstr "销售的状态"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module implements a dashboard for salesman that includes:\n"
-#~ "    * You 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"
-#~ "    *这月前10业务员\n"
-#~ "    *业务统计\n"
-#~ "    *销售产品图表\n"
-#~ "    *月份业务图表\n"
-#~ "    "
-
-#~ msgid ""
-#~ "\n"
-#~ "    Reporting for the sale module:\n"
-#~ "    * Sales order by product (my/this month/all)\n"
-#~ "    * Sales order by category of product (my/this month/all)\n"
-#~ "\n"
-#~ "    Some predefined lists:\n"
-#~ "    * Sales of the month\n"
-#~ "    * Open quotations\n"
-#~ "    * Uninvoiced Sales\n"
-#~ "    * Uninvoiced but shipped Sales\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    销售报表模块:\n"
-#~ "\t- 销售订单产品(我的、这月、所有)\n"
-#~ "\t- 销售订单的产品分来(我的、这月、所有)\n"
-#~ "\t\n"
-#~ "\t\t一些预定清单:\n"
-#~ "\t\t- 这月的销售\n"
-#~ "\t\t- 待处理的报价\n"
-#~ "\t\t- 未开票但已运输的销售\n"
-#~ "    "
-
-#~ msgid "Configure Sale Order Logistics"
-#~ msgstr "设置销售订单逻辑"
-
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr "您必须先取消所有和这个订单相关的发票。"
-
-#~ msgid "Average Price"
-#~ msgstr "平均价格"
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 53472e4178e..6f56f744f9c 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/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: 2011-04-29 05:16+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -32,7 +32,7 @@ msgstr ""
 msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
-msgstr ""
+msgstr "如庫存不足以一次過交貨，是否接受部份交貨?"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
@@ -43,7 +43,7 @@ msgstr ""
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "數量"
 
 #. module: sale
 #: view:sale.report:0
@@ -55,7 +55,7 @@ msgstr ""
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "取消订单"
+msgstr "取消訂單"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr ""
+msgstr "交貨前先付款"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:42
@@ -82,7 +82,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "VAT"
-msgstr ""
+msgstr "增值稅(VAT)"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -92,7 +92,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "一次過"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -100,7 +100,7 @@ msgstr ""
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "项目"
+msgstr "分析科目"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -124,7 +124,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr "订单行"
+msgstr "訂單明細"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -151,7 +151,7 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr "默认交付"
+msgstr "標準付款條件"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
@@ -169,12 +169,12 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "折扣(%)"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "強制指定"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -184,7 +184,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr ""
+msgstr "已訂數量"
 
 #. module: sale
 #: view:sale.report:0
@@ -194,13 +194,13 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "存貨調動"
 
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "訂單參考"
 
 #. module: sale
 #: view:sale.order:0
@@ -232,7 +232,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "折扣(%)"
 
 #. module: sale
 #: help:res.company,security_lead:0
@@ -250,7 +250,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr ""
+msgstr "包裝"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -260,23 +260,23 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "商店名稱"
 
 #. module: sale
 #: code:addons/sale/sale.py:1014
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "未定義客戶 !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "銷售異常情況"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr "报送草案"
+msgstr "設為草稿"
 
 #. module: sale
 #: view:sale.order:0
@@ -364,12 +364,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Delivery Order Only"
-msgstr ""
+msgstr "只交貨單"
 
 #. module: sale
 #: report:sale.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "增值稅(TVA) :"
 
 #. module: sale
 #: help:sale.order.line,delay:0
@@ -392,7 +392,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "UoM"
-msgstr ""
+msgstr "量度單位(UoM)"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
@@ -403,7 +403,7 @@ msgstr ""
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -434,7 +434,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Tel. :"
-msgstr ""
+msgstr "電話 :"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:64
@@ -450,7 +450,7 @@ msgstr ""
 #: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "備註"
 
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
@@ -466,12 +466,12 @@ msgstr ""
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "已開發票"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr ""
+msgstr "交貨單"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
@@ -501,12 +501,12 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "小計"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "發票地址 :"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -525,7 +525,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr "发票地址"
+msgstr "發票地址"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -535,7 +535,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr ""
+msgstr "報價單 / 訂單"
 
 #. module: sale
 #: view:sale.report:0
@@ -562,22 +562,22 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr "可用的仓库"
+msgstr "倉庫"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "單號"
 
 #. module: sale
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr "订单行"
+msgstr "訂單行"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "未完稅金額"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
@@ -588,7 +588,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "數量(計量單位)"
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -598,12 +598,12 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "未開票運貨明細"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "總計 :"
 
 #. module: sale
 #: view:sale.report:0
@@ -616,14 +616,14 @@ msgstr ""
 #: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無效動作!"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.report,pricelist_id:0
 #: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr "价格表"
+msgstr "價目表"
 
 #. module: sale
 #: view:sale.report:0
@@ -645,7 +645,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "所有報價單"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -666,12 +666,12 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "稅 :"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "庫存調動"
 
 #. module: sale
 #: view:sale.report:0
@@ -682,7 +682,7 @@ msgstr ""
 #: field:sale.order,state:0
 #: field:sale.report,state:0
 msgid "Order State"
-msgstr "订单状态"
+msgstr "訂單狀態"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -719,7 +719,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr "发运地址"
+msgstr "貨運地址"
 
 #. module: sale
 #: help:sale.order,shipped:0
@@ -779,7 +779,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
@@ -797,7 +797,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Your Reference"
-msgstr ""
+msgstr "您的參考"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
@@ -815,7 +815,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr ""
+msgstr "數量"
 
 #. module: sale
 #: view:sale.order:0
@@ -831,7 +831,7 @@ msgstr ""
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
@@ -841,7 +841,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
-msgstr ""
+msgstr "異常情況"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -850,7 +850,7 @@ msgstr ""
 #: view:sale.advance.payment.inv:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr "開立發票"
 
 #. module: sale
 #: field:sale.installer,sale_margin:0
@@ -865,7 +865,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Compute"
-msgstr "计算"
+msgstr "計算"
 
 #. module: sale
 #: view:sale.report:0
@@ -875,7 +875,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr ""
+msgstr "訂單聯絡人"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
@@ -887,7 +887,7 @@ msgstr ""
 #: report:sale.order:0
 #: view:sale.order.line:0
 msgid "Price"
-msgstr ""
+msgstr "價格"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_installer
@@ -905,7 +905,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr ""
+msgstr "按要求"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
@@ -920,12 +920,12 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "名稱"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "貨運地址 :"
 
 #. module: sale
 #: view:board.board:0
@@ -966,12 +966,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "部份交貨"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr ""
+msgstr "確認報價"
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -988,7 +988,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Invoice"
-msgstr "Re创建发票"
+msgstr "重新開立發票"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
@@ -1000,7 +1000,7 @@ msgstr ""
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "等待排程"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -1031,12 +1031,12 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "審核"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr "确认订单"
+msgstr "確認訂單"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
@@ -1048,12 +1048,12 @@ msgstr ""
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr "税"
+msgstr "稅"
 
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr "发运策略"
+msgstr "貨運規則"
 
 #. module: sale
 #: help:sale.order,create_date:0
@@ -1074,12 +1074,12 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "額外訊息"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "傳真 :"
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -1089,12 +1089,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "已運送數量"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "基於銷貨單的發票"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
@@ -1107,7 +1107,7 @@ msgstr ""
 #: code:addons/sale/sale.py:938
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤 !"
 
 #. module: sale
 #: code:addons/sale/sale.py:570
@@ -1123,23 +1123,23 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "採購"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "貨運異常情況"
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "發票分類"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "貨運 及 手動發票"
 
 #. module: sale
 #: code:addons/sale/sale.py:1051
@@ -1156,7 +1156,7 @@ msgstr ""
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
 msgid "Sales Management"
-msgstr ""
+msgstr "業務管理"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -1215,7 +1215,7 @@ msgstr ""
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "報價單"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1237,13 +1237,13 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
-msgstr "销售"
+msgstr "銷售"
 
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "單價"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1251,7 +1251,7 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
@@ -1262,7 +1262,7 @@ msgstr ""
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
-msgstr ""
+msgstr "發票"
 
 #. module: sale
 #: code:addons/sale/sale.py:1014
@@ -1316,7 +1316,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr ""
+msgstr "國際商業用語"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1324,7 +1324,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,product_id:0
 msgid "Product"
-msgstr "产品"
+msgstr "產品"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
@@ -1334,7 +1334,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr ""
+msgstr "取消指派"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -1355,12 +1355,12 @@ msgstr ""
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr ""
+msgstr "根據以下之發票:"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "訂單日期"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
@@ -1371,7 +1371,7 @@ msgstr ""
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "手動進行中"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1386,7 +1386,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order"
-msgstr ""
+msgstr "訂單"
 
 #. module: sale
 #: code:addons/sale/sale.py:921
@@ -1435,7 +1435,7 @@ msgstr ""
 #: field:sale.order,amount_total:0
 #: view:sale.order.line:0
 msgid "Total"
-msgstr "总计"
+msgstr "總計"
 
 #. module: sale
 #: code:addons/sale/sale.py:388
@@ -1498,7 +1498,7 @@ msgstr ""
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "發票異常情況"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1517,12 +1517,12 @@ msgstr ""
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "開立發票"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "淨計 :"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1538,7 +1538,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "商店"
 
 #. module: sale
 #: view:sale.report:0
@@ -1586,7 +1586,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "數量 (UoS)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1600,12 +1600,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "確認"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: sale
 #: constraint:res.company:0
@@ -1622,13 +1622,13 @@ msgstr ""
 #: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "發票明細"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "銷貨單明細"
 
 #. module: sale
 #: field:sale.order.line,delay:0
@@ -1638,12 +1638,12 @@ msgstr ""
 #. module: sale
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "設定"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr ""
+msgstr "已完成交貨"
 
 #. module: sale
 #: view:sale.report:0
@@ -1676,14 +1676,14 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,th_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "重量"
 
 #. module: sale
 #: view:sale.open.invoice:0
 #: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "發票"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1719,7 +1719,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "業務員"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
@@ -1729,7 +1729,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "不付税金额"
+msgstr "未完稅金額"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:163
@@ -1738,7 +1738,7 @@ msgstr "不付税金额"
 #: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
-msgstr ""
+msgstr "先開發票"
 
 #. module: sale
 #: code:addons/sale/sale.py:591
@@ -1749,7 +1749,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -1784,7 +1784,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr ""
+msgstr "商品銷售"
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -1796,12 +1796,12 @@ msgstr ""
 #: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
-msgstr ""
+msgstr "銷貨單"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "直接交貨"
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
@@ -1843,7 +1843,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
-msgstr ""
+msgstr "處理中的銷貨單"
 
 #. module: sale
 #: field:sale.installer,sale_layout:0
@@ -1854,7 +1854,7 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:63
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "錯誤"
 
 #. module: sale
 #: view:sale.report:0
@@ -1899,17 +1899,17 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr ""
+msgstr "自庫存"
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr ""
+msgstr "標準貨運規則"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "關閉"
 
 #. module: sale
 #: field:sale.order,shipped:0
@@ -1951,7 +1951,7 @@ msgstr ""
 #: report:sale.order:0
 #: field:sale.order.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1968,7 +1968,7 @@ msgstr ""
 #: 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
@@ -2017,7 +2017,7 @@ msgstr ""
 #: report:sale.order:0
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "付款條件"
 
 #. module: sale
 #: help:sale.installer,sale_layout:0
@@ -2038,13 +2038,13 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
-msgstr ""
+msgstr "報價單編號"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
-msgstr ""
+msgstr "已提貨"
 
 #. module: sale
 #: view:sale.report:0
@@ -2055,29 +2055,267 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr ""
+msgstr "根據交貨的發票"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "您的發票已經開立成功！"
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "自動聲明"
+
+#~ msgid "Manual Designation"
+#~ msgstr "手動指定"
+
+#~ msgid "Origin"
+#~ msgstr "來源"
+
+#~ msgid "Reference"
+#~ msgstr "參考"
+
+#~ msgid "Net Price"
+#~ msgstr "淨價"
+
+#~ msgid "My sales order in progress"
+#~ msgstr "我的處理中訂單"
+
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "我的待開發票訂單"
+
+#~ msgid "Total amount"
+#~ msgstr "總金額"
+
+#~ msgid "Sale Shop"
+#~ msgstr "銷售點"
 
 #~ msgid "Payment accounts"
-#~ msgstr "账号付款"
+#~ msgstr "付款帳號"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "發票草稿"
+
+#~ msgid "My Quotations"
+#~ msgstr "我的報價單"
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "標準包裝規則"
 
 #~ msgid "Order Ref"
-#~ msgstr "订单参照"
+#~ msgstr "訂單參考"
 
-#~ msgid "Invoice Corrected"
-#~ msgstr "发票更正"
+#~ msgid "Sales Configuration"
+#~ msgstr "銷售設定"
 
-#~ msgid "Invoice from the packings"
-#~ msgstr "從裝箱單開立發票"
+#~ msgid "Recreate Procurement"
+#~ msgstr "重新建立採購"
 
-#~ msgid "Shop name"
-#~ msgstr "商店名稱"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "動作定義之模型名稱無效。"
 
-#~ msgid "Manual in progress"
-#~ msgstr "正在手動處理"
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "發貨，從倉庫到客戶。"
 
-#~ msgid "In progress"
-#~ msgstr "處理中"
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "確認訂單後開立發票。"
+
+#~ msgid "Invoice after delivery"
+#~ msgstr "交貨後開立發票"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "外送貨物"
+
+#~ msgid "Procure Method"
+#~ msgstr "採購方法"
 
 #, python-format
-#~ msgid "You must first cancel all packings attached to this sale order."
-#~ msgstr "你必須先取消所有在此銷售訂單的附加檔案."
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr "您必須先取消所有附加的發票。"
+
+#~ msgid "Packing"
+#~ msgstr "包裝"
+
+#~ msgid "Related Packing"
+#~ msgstr "相關包裝"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "無效的XML檢視架構(Invalid XML for View Architecture)!"
+
+#~ msgid "Customer Ref"
+#~ msgstr "客戶參考"
+
+#~ msgid "Payment Accounts"
+#~ msgstr "付款帳號"
+
+#~ msgid "Advance Payment"
+#~ msgstr "先行付款"
+
+#~ msgid "Payment Terms"
+#~ msgstr "付款條件"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "報價單 (處於草稿狀態之銷貨單)"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "客戶發票草稿，要由會計師審閱。"
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "要開發票的銷貨單"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "管理貨運與開立發票進度"
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "為銷貨單設定提貨規則"
+
+#~ msgid "Packing Policy"
+#~ msgstr "包裝規則"
+
+#~ msgid "Steps To Deliver a Sale Order"
+#~ msgstr "銷貨單交貨步驟"
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "銷貨單確認後開立採購清單。"
+
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr "此步驟用於設定開立銷貨單時之提貨標準規則"
+
+#~ msgid "All Sales Order"
+#~ msgstr "所有銷貨單"
+
+#~ msgid "Sale Order Procurement"
+#~ msgstr "銷貨單採購"
+
+#~ msgid "Sales orders"
+#~ msgstr "銷貨單"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "不能取消銷貨單 !"
+
+#~ msgid "Sale Order"
+#~ msgstr "銷貨單"
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "設定銷貨單物流"
+
+#~ msgid "Sales order lines"
+#~ msgstr "銷貨單明細"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "確認銷貨單及開立發票"
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "包裝清單 及 交貨單"
+
+#~ msgid "Sale Order Lines"
+#~ msgstr "銷貨單明細"
+
+#~ msgid "Sales order"
+#~ msgstr "銷貨單"
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr "不能取消已開立發票的銷貨單明細 !"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "銷貨單明細"
+
+#~ msgid "My Sales Order"
+#~ msgstr "我的銷貨單"
+
+#~ msgid "Sale Order line"
+#~ msgstr "銷貨單明細"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "無法取消此銷貨單 !"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr "無法刪除已確認的銷貨單 !"
+
+#~ msgid "Canceled"
+#~ msgstr "取消"
+
+#~ msgid "Sales Process"
+#~ msgstr "銷售進度"
+
+#~ msgid "Status"
+#~ msgstr "狀態"
+
+#~ msgid "Procurement Corrected"
+#~ msgstr "已修正採購"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "銷售採購"
+
+#~ msgid "Our Salesman"
+#~ msgstr "我們的業務員"
+
+#~ msgid "Make Invoice"
+#~ msgstr "開立發票"
+
+#~ msgid "Other data"
+#~ msgstr "其他資料"
+
+#~ msgid "Sequence"
+#~ msgstr "次序"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "根據包裝清單的發票"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "物件名稱必須以「x_」開頭且不能包含特殊字元！"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "是否開立發票 ?"
+
+#~ msgid "Set Default"
+#~ msgstr "設為預定"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "銷售發票"
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "根據包裝的發票"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr "訂貨或要求報價之聯絡名稱及地址。"
+
+#~ msgid "Make invoices"
+#~ msgstr "開立發票"
+
+#~ msgid "Deliver"
+#~ msgstr "交貨"
+
+#~ msgid "Purchase Pricelists"
+#~ msgstr "購貨價目表"
+
+#~ msgid "New Quotation"
+#~ msgstr "新報價單"
+
+#~ msgid "Related invoices"
+#~ msgstr "有關發票"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "交貨延誤"
+
+#~ msgid "Invoice Corrected"
+#~ msgstr "已更正發票"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "錯誤：ean 碼無效"
+
+#~ msgid "Sale Pricelists"
+#~ msgstr "銷售價目表"
+
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr "當按下「確認」，「草稿」狀態會變為「手動」，意思是報價單變為銷貨單。"
+
+#~ msgid "Manual Description"
+#~ msgstr "手動說明"
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 00ebb50472e..a6902f79047 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -283,7 +283,7 @@
             <para style="terp_default_Centre_9">[[ formatLang(line.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]] </para>
           </td>
         </tr>
         <tr>
@@ -329,7 +329,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -342,7 +342,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -355,7 +355,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index e4f917ba063..42e090d54e5 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -38,7 +38,7 @@ class sale_report(osv.osv):
             ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'uom_name': fields.char('Reference UoM', size=128, readonly=True),
+        'product_uom': fields.many2one('product.uom', 'UoM', readonly=True),
         'product_uom_qty': fields.float('# of Qty', readonly=True),
 
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
@@ -67,51 +67,42 @@ class sale_report(osv.osv):
         tools.drop_view_if_exists(cr, 'sale_report')
         cr.execute("""
             create or replace view sale_report as (
-                select el.*,
-                   -- (select count(1) from sale_order_line where order_id = s.id) as nbr,
-                    (select 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,
-                     s.shipped,
-                     s.shipped::integer as shipped_qty_1,
-                     s.pricelist_id as pricelist_id,
-                     s.project_id as analytic_account_id
+                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,
-                    (
-                    select l.id as id,
-                        l.product_id as product_id,
-                        (case when u.uom_type not in ('reference') then
-                            (select name from product_uom where uom_type='reference' and category_id=u.category_id)
-                        else
-                            u.name
-                        end) as uom_name,
-                        sum(l.product_uom_qty * u.factor) as product_uom_qty,
-                        sum(l.product_uom_qty * l.price_unit) as price_total,
-                        pt.categ_id, l.order_id
-                    from
-                     sale_order_line l ,product_uom u, product_product p, product_template pt
-                     where u.id = l.product_uom
-                     and pt.id = p.product_tmpl_id
-                     and p.id = l.product_id
-                      group by l.id, l.order_id, l.product_id, u.name, pt.categ_id, u.uom_type, u.category_id) el
-                where s.id = el.order_id
-                group by el.id,
-                    el.product_id,
-                    el.uom_name,
-                    el.product_uom_qty,
-                    el.price_total,
-                    el.categ_id,
-                    el.order_id,
+                    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,
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index c62510e9ab6..7cc40c30645 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -22,7 +22,7 @@
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_uom_qty" sum="# of Qty"/>
                 <field name="shipped_qty_1" sum="Shipped"/>
-                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
+                <field name="product_uom" invisible="not context.get('set_visible',False)"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
                 <field name="state" invisible="1"/>
@@ -51,16 +51,16 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="  Year  "
+                    <filter icon="terp-go-year" string="Year" name="year"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Sales order created in current year"/>
-                    <filter icon="terp-go-month" string="   Month   "
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="Month"
                         name="month"
                         domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Sales order created in current month"/>
                     <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         separator="1"
+                         string="Month-1"
                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Sales order created in last month"/>
                     <separator orientation="vertical"/>
@@ -94,12 +94,12 @@
                     <field name="date_confirm"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
@@ -124,12 +124,12 @@
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_order_product_search"/>
         <field name="view_id" ref="view_order_product_tree"/>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="help">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.</field>
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
-    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1" groups="base.group_sale_manager"/>
+    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
 
     <!--This views used in board_sale module -->
     <record id="view_sales_by_partner_graph" model="ir.ui.view">
@@ -209,7 +209,7 @@
                 <field name="price_total" />
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
-                <field name="uom_name" invisible="1"/>
+                <field name="product_uom" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="state" invisible="1"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 17d2c636e12..2188f6dee5f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -25,6 +25,7 @@ import time
 import pooler
 from osv import fields, osv
 from tools.translate import _
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
 import decimal_precision as dp
 import netsvc
 
@@ -105,11 +106,11 @@ class sale_order(osv.osv):
                 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':
@@ -118,7 +119,7 @@ class sale_order(osv.osv):
                 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
@@ -199,7 +200,7 @@ class sale_order(osv.osv):
         'state': fields.selection([
             ('draft', 'Quotation'),
             ('waiting_date', 'Waiting Schedule'),
-            ('manual', 'Manual In Progress'),
+            ('manual', 'To Invoice'),
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
@@ -207,7 +208,7 @@ class sale_order(osv.osv):
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es 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 date 'Ordered Date'.", select=True),
         'date_order': fields.date('Ordered Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
-        'create_date': fields.date('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
+        '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', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
         'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
@@ -216,21 +217,21 @@ class sale_order(osv.osv):
         'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('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', 'Partial Delivery'), ('one', 'Complete Delivery')],
+        'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')],
             'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
-            ('prepaid', 'Payment Before Delivery'),
-            ('manual', 'Shipping & Manual Invoice'),
-            ('postpaid', 'Invoice On Order After Delivery'),
-            ('picking', 'Invoice From The Picking'),
-        ], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
-                    help="""The Shipping Policy is used to synchronise invoice and delivery operations.
-  - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
-  - 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.
-  - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.
-  - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."""),
+            ('prepaid', 'Pay before delivery'),
+            ('manual', 'Deliver & invoice on demand'),
+            ('picking', 'Invoice based on deliveries'),
+            ('postpaid', 'Invoice on order after delivery'),
+        ], 'Invoice Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
+                    help="""The Invoice Policy is used to synchronise invoice and delivery operations.
+  - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
+  - 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.
+  - The 'Invoice on order after delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.
+  - The 'Invoice based on deliveries' choice is used to create an invoice during the picking process."""),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist for current sales order."),
-        'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sales order."),
+        'project_id': fields.many2one('account.analytic.account', 'Contract/Analytic Account', readonly=True, states={'draft': [('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)]}),
         '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)."),
@@ -268,7 +269,7 @@ class sale_order(osv.osv):
     }
     _defaults = {
         'picking_policy': 'direct',
-        'date_order': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_order': lambda *a: time.strftime(DEFAULT_SERVER_DATE_FORMAT),
         'order_policy': 'manual',
         'state': 'draft',
         'user_id': lambda obj, cr, uid, context: uid,
@@ -279,7 +280,7 @@ class sale_order(osv.osv):
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
     }
     _sql_constraints = [
-        ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+        ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _order = 'name desc'
 
@@ -291,7 +292,8 @@ class sale_order(osv.osv):
             if s['state'] in ['draft', 'cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sales Order(s) which are already confirmed !'))
+                raise osv.except_osv(_('Invalid action !'), _('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.'))
+
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
     def onchange_shop_id(self, cr, uid, ids, shop_id):
@@ -321,6 +323,16 @@ class sale_order(osv.osv):
             self.log(cr, uid, id, message)
         return True
 
+    def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context={}):
+        print order_lines
+        if (not pricelist_id) or (not order_lines):
+            return {}
+        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_id(self, cr, uid, ids, part):
         if not part:
             return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'partner_order_id': False, 'payment_term': False, 'fiscal_position': False}}
@@ -424,7 +436,7 @@ class sale_order(osv.osv):
         }
         inv.update(self._inv_get(cr, uid, order))
         inv_id = inv_obj.create(cr, uid, inv, context=context)
-        data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], pay_term, time.strftime('%Y-%m-%d'))
+        data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], pay_term, time.strftime(DEFAULT_SERVER_DATE_FORMAT))
         if data.get('value', False):
             inv_obj.write(cr, uid, [inv_id], data['value'], context=context)
         inv_obj.button_compute(cr, uid, [inv_id])
@@ -468,6 +480,7 @@ class sale_order(osv.osv):
         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 = {}
         if context is None:
             context = {}
         # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
@@ -475,6 +488,13 @@ class sale_order(osv.osv):
         if date_inv:
             context['date_inv'] = date_inv
         for o in self.browse(cr, uid, ids, context=context):
+            currency_id = o.pricelist_id.currency_id.id
+            if (o.partner_id.id in partner_currency) and (partner_currency[o.partner_id.id] <> currency_id):
+                raise osv.except_osv(
+                    _('Error !'),
+                    _('You cannot group sales having different currencies for the same partner.'))
+
+            partner_currency[o.partner_id.id] = currency_id
             lines = []
             for line in o.order_line:
                 if line.invoiced:
@@ -599,10 +619,12 @@ class sale_order(osv.osv):
 
     def action_wait(self, cr, uid, ids, *args):
         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'):
-                self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')})
+                self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)})
             else:
-                self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
+                self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)})
             self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
             message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
             self.log(cr, uid, o.id, message)
@@ -654,111 +676,148 @@ class sale_order(osv.osv):
                 return False
             return canceled
 
-    def action_ship_create(self, cr, uid, ids, *args):
-        wf_service = netsvc.LocalService("workflow")
-        picking_id = False
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, *args):
+        return {
+            'name': line.name,
+            '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,
+            'property_ids': [(6, 0, [x.id for x in line.property_ids])],
+            'company_id': order.company_id.id,
+        }
+
+    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, *args):
+        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[:64],
+            '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_qty,
+            'product_uos': (line.product_uos and line.product_uos.id)\
+                    or line.product_uom.id,
+            'product_packaging': line.product_packaging.id,
+            'address_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': line.notes,
+            'company_id': order.company_id.id,
+            'price_unit': line.product_id.standard_price or 0.0
+        }
+
+    def _prepare_order_picking(self, cr, uid, order, *args):
+        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,
+            'address_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 _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, *args):
+        """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')
-        proc_obj = self.pool.get('procurement.order')
-        company = self.pool.get('res.users').browse(cr, uid, uid).company_id
-        for order in self.browse(cr, uid, ids, context={}):
-            proc_ids = []
-            output_id = order.shop_id.warehouse_id.lot_output_id.id
-            picking_id = False
-            for line in order.order_line:
-                proc_id = False
-                date_planned = datetime.now() + relativedelta(days=line.delay or 0.0)
-                date_planned = (date_planned - timedelta(days=company.security_lead)).strftime('%Y-%m-%d %H:%M:%S')
+        picking_obj = self.pool.get('stock.picking')
+        procurement_obj = self.pool.get('procurement.order')
 
-                if line.state == 'done':
-                    continue
-                move_id = False
-                if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
-                    location_id = order.shop_id.warehouse_id.lot_stock_id.id
+        proc_ids = []
+        for line in order_lines:
+            if line.state == 'done':
+                continue
+
+            date_planned = datetime.strptime(order.date_order, 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)
+
+            if line.product_id:
+                if line.product_id.product_tmpl_id.type in ('product', 'consu'):
                     if not picking_id:
-                        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
-                        picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                            'name': pick_name,
-                            'origin': order.name,
-                            'type': 'out',
-                            'state': 'auto',
-                            'move_type': order.picking_policy,
-                            'sale_id': order.id,
-                            'address_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,
-                        })
-                    move_id = self.pool.get('stock.move').create(cr, uid, {
-                        'name': line.name[:64],
-                        '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_qty,
-                        'product_uos': (line.product_uos and line.product_uos.id)\
-                                or line.product_uom.id,
-                        'product_packaging': line.product_packaging.id,
-                        'address_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': line.notes,
-                        'company_id': order.company_id.id,
-                    })
-                    
-                if line.product_id:
-                    proc_id = self.pool.get('procurement.order').create(cr, uid, {
-                        'name': line.name,
-                        '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,
-                        'property_ids': [(6, 0, [x.id for x in line.property_ids])],
-                        'company_id': order.company_id.id,
-                    })
-                    proc_ids.append(proc_id)
-                    self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
-                    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):
-                                            move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
-                                            proc_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, *args))
+                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, *args))
+                else:
+                    # a service has no stock move
+                    move_id = False
 
-            val = {}
+                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, *args))
+                proc_ids.append(proc_id)
+                line.write({'procurement_id': proc_id})
 
-            if picking_id:
-                wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+                # FIXME: deals with potentially cancelled shipments, seems broken, see below
+                # FIXME: was introduced by revid: mtr@mtr-20101125100355-0a1b7m792t63mssv
+                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})
+                                        procurement_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
 
-            for proc_id in proc_ids:
-                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+        wf_service = netsvc.LocalService("workflow")
+        if picking_id:
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
 
-            if order.state == 'shipping_except':
-                val['state'] = 'progress'
-                val['shipped'] = False
+        for proc_id in proc_ids:
+            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
 
-                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
-            self.write(cr, uid, [order.id], val)
+        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, *args):
+        for order in self.browse(cr, uid, ids, context={}):
+            self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, *args)
         return True
 
     def action_ship_end(self, cr, uid, ids, context=None):
@@ -793,8 +852,7 @@ class sale_order(osv.osv):
                 'description': 'Order '+str(inv['id']),
                 'document': '',
                 'partner_id': part,
-                'date': time.strftime('%Y-%m-%d'),
-                'canal_id': False,
+                'date': time.strftime(DEFAULT_SERVER_DATE_FORMAT),
                 'user_id': uid,
                 'partner_type': partnertype,
                 'probability': 1.0,
@@ -839,6 +897,14 @@ class sale_order_line(osv.osv):
                 res[line.id] = 1
         return res
 
+    def _get_uom_id(self, cr, uid, *args):
+        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
+
     _name = 'sale.order.line'
     _description = 'Sales Order Line'
     _columns = {
@@ -853,12 +919,13 @@ class sale_order_line(osv.osv):
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
         '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)]}),
+        '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.address', 'Allotment Partner'),
-        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uom_qty': fields.float('Quantity (UoM)', 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)', 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),
@@ -878,6 +945,7 @@ class sale_order_line(osv.osv):
     }
     _order = 'sequence, id'
     _defaults = {
+        'product_uom' : _get_uom_id,
         'discount': 0.0,
         'delay': 0.0,
         'product_uom_qty': 1,
@@ -967,7 +1035,7 @@ class sale_order_line(osv.osv):
     def button_cancel(self, cr, uid, ids, context=None):
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoiced:
-                raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sales order line that has already been invoiced !'))
+                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(
@@ -1011,52 +1079,81 @@ class sale_order_line(osv.osv):
         default.update({'state': 'draft', 'move_ids': [], 'invoiced': False, 'invoice_lines': []})
         return super(sale_order_line, self).copy_data(cr, uid, id, default, context=context)
 
-    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 {}
-        lang = lang or ('lang' in context and context['lang'])
-        if not  partner_id:
-            raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sales form !\nPlease set one customer before choosing a product.'))
-        warning = {}
-        warning_msgs = ''
-        product_uom_obj = self.pool.get('product.uom')
-        partner_obj = self.pool.get('res.partner')
-        product_obj = self.pool.get('product.product')
-        if partner_id:
-            lang = partner_obj.browse(cr, uid, partner_id).lang
-        context = {'lang': lang, 'partner_id': partner_id}
-
+    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': {'th_weight': 0, 'product_packaging': False,
-                'product_uos_qty': qty}, 'domain': {'product_uom': [],
-                   'product_uos': []}}
-        if not date_order:
-            date_order = time.strftime('%Y-%m-%d')
-
+            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 = {}
-        product_obj = product_obj.browse(cr, uid, product, context=context)
-        if not packaging and product_obj.packaging:
-            packaging = product_obj.packaging[0].id
+        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 = product_obj.uom_id and product_obj.uom_id.id
-            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=context)
+            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
-                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"
+                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 {}
+        lang = lang or context.get('lang',False)
+        if not  partner_id:
+            raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sales form !\nPlease set one customer before choosing a product.'))
+        warning = {}
+        product_uom_obj = self.pool.get('product.uom')
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        context = {'lang': lang, 'partner_id': partner_id}
+        if partner_id:
+            lang = partner_obj.browse(cr, uid, partner_id).lang
+        context_partner = {'lang': lang, 'partner_id': partner_id}
+
+        if not product:
+            return {'value': {'th_weight': 0, 'product_packaging': False,
+                'product_uos_qty': qty}, 'domain': {'product_uom': [],
+                   'product_uos': []}}
+        if not date_order:
+            date_order = time.strftime(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)
+
         uom2 = False
         if uom:
             uom2 = product_uom_obj.browse(cr, uid, uom)
@@ -1078,7 +1175,7 @@ class sale_order_line(osv.osv):
             result.update({'type': product_obj.procure_method})
 
         if not flag:
-            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
+            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context_partner)[0][1]
         domain = {}
         if (not uom) and (not uos):
             result['product_uom'] = product_obj.uom_id.id
@@ -1121,7 +1218,7 @@ class sale_order_line(osv.osv):
                      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:
             warn_msg = _('You have to select a pricelist or a customer in the sales form !\n'
                     'Please set one before choosing a product.')
@@ -1142,7 +1239,7 @@ class sale_order_line(osv.osv):
         if warning_msgs:
             warning = {
                        'title': _('Configuration Error !'),
-                       'message' : warning_msgs  
+                       'message' : warning_msgs
                     }
         return {'value': result, 'domain': domain, 'warning': warning}
 
@@ -1167,7 +1264,7 @@ class sale_order_line(osv.osv):
         """Allows to delete sales order lines in draft,cancel states"""
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state not in ['draft', 'cancel']:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is %s !') %(rec.state,))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is in state \'%s\'!') %(rec.state,))
         return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
 
 sale_order_line()
@@ -1175,6 +1272,7 @@ sale_order_line()
 class sale_config_picking_policy(osv.osv_memory):
     _name = 'sale.config.picking_policy'
     _inherit = 'res.config'
+
     _columns = {
         'name': fields.char('Name', size=64),
         'sale_orders': fields.boolean('Based on Sales Orders',),
@@ -1185,21 +1283,20 @@ class sale_config_picking_policy(osv.osv_memory):
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
         ], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."),
-        'charge_delivery': fields.boolean('Do you charge the delivery'),
+        'charge_delivery': fields.boolean('Do you charge the delivery?'),
         'time_unit': fields.many2one('product.uom','Main Working Time Unit')
     }
     _defaults = {
         'order_policy': 'manual',
+        'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False,
     }
 
     def onchange_order(self, cr, uid, ids, sale, deli, context=None):
         res = {}
-        if sale or deli:
+        if sale:
             res.update({'order_policy': 'manual'})
-        elif not sale and not deli:
-            res.update({'order_policy': 'manual'})
-        else:
-            return {}
+        elif deli:
+            res.update({'order_policy': 'picking'})
         return {'value':res}
 
     def execute(self, cr, uid, ids, context=None):
@@ -1209,48 +1306,36 @@ class sale_config_picking_policy(osv.osv_memory):
         module_obj = self.pool.get('ir.module.module')
         module_upgrade_obj = self.pool.get('base.module.upgrade')
         module_name = []
-        group_ids=[]
-        group_name = ['group_sale_salesman','group_sale_manager']
 
-        for name in group_name:
-            data_id = data_obj.name_search(cr, uid, name)
-            group_ids.append(data_obj.browse(cr,uid,data_id[0][0]).res_id)
+        group_id = data_obj.get_object(cr, uid, 'base', 'group_sale_salesman').id
 
         wizard = self.browse(cr, uid, ids)[0]
 
         if wizard.sale_orders:
-            menu_name = 'menu_invoicing_sales_order_lines'
-            data_id = data_obj.name_search(cr, uid, menu_name)
-            menu_id = data_obj.browse(cr,uid,data_id[0][0]).res_id
-            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_ids[0]),(4,group_ids[1])]}) 
+            menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id
+            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
 
         if wizard.deli_orders:
-            menu_name = 'menu_action_picking_list_to_invoice'
-            data_id = data_obj.name_search(cr, uid, menu_name)
-            menu_id = data_obj.browse(cr,uid,data_id[0][0]).res_id
-            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_ids[0]),(4,group_ids[1])]})
+            menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id
+            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
 
         if wizard.task_work:
             module_name.append('project_timesheet')
+            module_name.append('project_mrp')
             module_name.append('account_analytic_analysis')
 
         if wizard.timesheet:
             module_name.append('account_analytic_analysis')
 
         if wizard.charge_delivery:
-            module_name.append('delivery')    
-
-        if wizard.time_unit:
-            product_obj = self.pool.get('product.product')
-            product_id = product_obj.name_search(cr, uid, 'Employee')
-            product_obj.write(cr, uid, product_id[0][0], {'uom_id':wizard.time_unit.id})
+            module_name.append('delivery')
 
         if len(module_name):
             module_ids = []
             need_install = False
             module_ids = []
             for module in module_name:
-                data_id = module_obj.name_search(cr,uid,module)
+                data_id = module_obj.name_search(cr, uid , module, [], '=')
                 module_ids.append(data_id[0][0])
 
             for module in module_obj.browse(cr, uid, module_ids):
@@ -1261,7 +1346,17 @@ class sale_config_picking_policy(osv.osv_memory):
             if need_install:
                 pooler.restart_pool(cr.dbname, update_module=True)[1]
 
-        ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)  
+        if wizard.time_unit:
+            prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id
+            product_obj = self.pool.get('product.product')
+            product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
+
+        ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)
+        if wizard.task_work and wizard.time_unit:
+            company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+            self.pool.get('res.company').write(cr, uid, [company_id], {
+                'project_time_mode_id': wizard.time_unit.id
+            }, context=context)
 
 sale_config_picking_policy()
 
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 41f7534c8e2..4622577ac3d 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -13,11 +13,15 @@
     Resource: sale.shop
     -->
         <record id="shop" model="sale.shop">
-            <field model="res.company" name="name" search="[]" use="name"/>
-            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="account.payment.term" name="payment_default_id" search="[]"/>
-            <field model="res.company" name="company_id" search="[]"/>
+            <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"/>
+
+            <!--  Copy the name of any company. Without demo data this will yield
+                  the main company name, which is correct. With demo data it will
+                  be random, but it does not matter much -->
+            <field model="res.company" name="name" search="[]" use="name"/>
         </record>
 
         <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
deleted file mode 100644
index dcac79270b2..00000000000
--- a/addons/sale/sale_installer.py
+++ /dev/null
@@ -1,43 +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 sale_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'delivery': fields.boolean('Delivery Costs', 
-            help="Allows you to compute delivery costs on your quotations."),
-        'sale_journal': fields.boolean('Invoicing journals',
-            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
-        'sale_layout': fields.boolean('Sales Orders Print Layout',
-            help="Provides some features to improve the layout of the Sales Order reports."),
-        'sale_margin': fields.boolean('Margins in Sales Orders',
-            help="Gives the margin of profitability by calculating "
-                 "the difference between Unit Price and Cost Price."),
-        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
-            help="Adds commitment, requested and effective dates on Sales Orders."),
-    }
-    
-sale_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
deleted file mode 100644
index 38b1de7d2b8..00000000000
--- a/addons/sale/sale_installer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_sale_installer" model="ir.ui.view">
-      <field name="name">sale.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='sale']" position="replace">
-            <newline/>
-            <separator  string="Sales Management Features" colspan="4" />
-            <field name="delivery" />
-            <field name="sale_journal" />
-            <field name="sale_layout" />
-            <field name="sale_margin" />
-            <field name="sale_order_dates" />               
-          </xpath>           
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/sale/sale_report.xml b/addons/sale/sale_report.xml
index 33819df0bde..0f77913a3c9 100644
--- a/addons/sale/sale_report.xml
+++ b/addons/sale/sale_report.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/sale_order.rml" string="Quotation / Order"/>
+        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order"
+                rml="sale/report/sale_order.rml" string="Quotation / Order"
+                usage="default"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml
index dadd1942940..666f7b49720 100644
--- a/addons/sale/sale_sequence.xml
+++ b/addons/sale/sale_sequence.xml
@@ -13,6 +13,7 @@
             <field name="code">sale.order</field>
             <field name="prefix">SO</field>
             <field name="padding">3</field>
+            <field name="company_id" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 86835320d40..3976abb5d05 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,10 +1,14 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem icon="terp-partner"
+            id="base.menu_base_partner" name="Sales"
+            sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
-        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
+        <menuitem id="base.menu_sales" name="Sales"
+            parent="base.menu_base_partner" sequence="1"
+            />
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>         
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
@@ -112,45 +116,58 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">
                                     <notebook>
                                         <page string="Order Line">
-                                            <field colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                            <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, 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)"/>
-                                            <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field groups="product.group_uos" name="product_uos"/>
-                                            <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
+                                        <group colspan="4" col="5">
+                                            <field colspan="3"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                name="product_id"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                            <field name="name"/>
 
-                                            <field colspan="4" name="name"/>
+                                            <field
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                name="product_uom_qty"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, 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)"
+                                                nolabel="1"/>
                                             <field name="price_unit"/>
-                                            <field name="discount"/>
-                                            <field name="type" groups="base.group_extended"/>
-                                            <field name="delay" groups="base.group_extended"/>
+
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field groups="product.group_uos" name="product_uos" nolabel="1"/>
                                             <newline/>
+                                            <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="base.group_extended"
+                                                colspan="3"/>
+                                            <field name="discount"/>
+                                            <separator colspan="5" string="Notes"/>
+                                            <field colspan="5" name="notes" nolabel="1"/>
                                             <separator colspan="5" string="Taxes"/>
-                                            <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <group colspan="4" col="5" groups="base.group_extended">
+                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                            <group colspan="5" col="5" groups="base.group_extended">
                                                 <separator colspan="5" string="States"/>
                                                 <field name="state"/>
                                                 <field name="invoiced"/>
                                                 <group attrs="{'invisible':[('invoiced','=',True)]}">
-                                                <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
-                                                 </group>
+                                                    <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
+                                                </group>
                                             </group>
+                                        </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
+                                            <field name="type"/>
+                                            <field name="delay"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
                                             <field name="property_ids" colspan="4"/>
                                         </page>
-                                        <page string="Notes">
-                                            <field colspan="4" name="notes" nolabel="1"/>
-                                        </page>
                                         <page string="History" groups="base.group_extended">
                                             <separator colspan="4" string="Invoice Lines"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
@@ -177,7 +194,7 @@
                                 <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                             </group>
                             <group col="13" colspan="4">
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
@@ -212,7 +229,7 @@
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Dates" colspan="2"/>
-                                <field name="create_date" widget="datetime"/>
+                                <field name="create_date"/>
                                 <field name="date_confirm"/>
                             </group>
                             <separator colspan="4" string="Notes"/>
@@ -240,14 +257,13 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="date_order" select="1" string="Order date"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id">
                         <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
                     </field>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
@@ -387,7 +403,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -396,7 +412,7 @@
                         <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     </field>
                     <newline/>
-                    <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
+                    <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':'order_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
@@ -425,7 +441,7 @@
                         <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     </field>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="9" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -473,60 +489,56 @@
             src_model="product.product"
             groups="base.group_sale_salesman"/>
 
-        <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5" groups="-base.group_extended"/>
-        <menuitem id="menu_invoicing_sales_order_lines" parent="menu_invoiced" action="action_order_line_tree2" sequence="2" groups="base.group_no_one"/>
+        <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5" groups="-base.group_extended"/>
+        <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="2" groups="base.group_no_one"/>
 
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">
-            <field name="name">Set Up Your Invoicing Method</field>
+            <field name="name">Setup Your Invoicing Method</field>
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Sales Application Configuration</attribute>
+                  <attribute name="string">Setup your Invoicing Method</attribute>
                 </form>
-                <group colspan="4" col="8" position="replace">
-                    <group colspan="8">
-                        <separator string="How do you generate your costumer invoice ?"/>
+
+                <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                    <attribute name="string">Setup your Invoicing Method</attribute>
+                </xpath>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">This tool will help you to install the right module and configure the system according to the method you use to invoice your customers.</attribute>
+                </xpath>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
+                    <attribute name="rowspan">12</attribute>
+                </xpath>
+                <group string="res_config_contents" position="replace">
+                    <group colspan="4" col="4">
+                       <field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)"/>
+                       <newline/>
+                       <field name="deli_orders" on_change="onchange_order(sale_orders,deli_orders)"/>
+                       <newline/>
+                       <field name="task_work"/>
+                       <newline/>
+                       <field name="timesheet"/>
+                       <newline/>
+                       <separator string="Options" colspan="4"/>
+                       <field name="order_policy" attrs="{'invisible':['|',('sale_orders','!=',True),('deli_orders','!=',True)]}"/>
+                       <newline/>
+                       <field name="charge_delivery" attrs="{'invisible':[('sale_orders','!=',True), ('deli_orders','!=',True)]}"/>
+                       <newline/>
+                       <field name="time_unit" widget="selection" domain="[('category_id','=',%(product.uom_categ_wtime)s)]" attrs="{'invisible':[('task_work','=',False),('timesheet','=',False)]}"/>
                     </group>
-                    <group colspan="8" col="2">
-                        <label align="0.0" string="Based on Sales Orders" width="200" colspan="1"/>
-                        <field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)" nolabel="1"/>
-                        <label align="0.0" string="Based on Delivery Orders" width="200" colspan="1"/>
-                        <field name="deli_orders" on_change="onchange_order(sale_orders,deli_orders)" nolabel="1"/>
-                        <label align="0.0" string="Based on Task's Work" width="200" colspan="1"/>
-                        <field name="task_work" nolabel="1"/>
-                        <label align="0.0" string="Based on Timesheet" width="200" colspan="1"/>
-                        <field name="timesheet" nolabel="1"/>
-                    </group>
-                    <group colspan="8">
-                        <separator string="Options"/>
-                    </group>
-                    <group colspan="8">
-                        <group colspan="4" col="2" attrs="{'invisible':['|',('sale_orders','!=',True),('deli_orders','!=',True)]}">
-                            <label align="0.0" string="Main Method Based On" width="200" colspan="1"/>
-                            <field name="order_policy" nolabel="1"/>
-                        </group>
-                        <group colspan="4" col="2" attrs="{'invisible':[('sale_orders','!=',True), ('deli_orders','!=',True)]}">
-                            <label align="0.0" string="Do you charge the delivery" width="200" colspan="1"/>
-                            <field name="charge_delivery" nolabel="1"/>
-                        </group>
-                        <group colspan="4" col="2" attrs="{'invisible':[('task_work','=',False),('timesheet','=',False)]}">
-                            <label align="0.0" string="Main Working Time Unit" width="200" colspan="1"/>
-                            <field name="time_unit" widget="selection" domain="[('category_id','=',3)]" nolabel="1"/>
-                        </group>
-                    </group>
-                </group>
-                <xpath expr="//button[@name=&quot;action_skip&quot;]" position="replace"/>
+                 </group>
               </data>
             </field>
         </record>
 
         <record id="action_config_picking_policy" model="ir.actions.act_window">
-            <field name="name">Set up your Invoicing Method</field>
+            <field name="name">Setup your Invoicing Method</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.config.picking_policy</field>
             <field name="view_id" ref="view_config_picking_policy"/>
@@ -539,6 +551,7 @@
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
             <field name="action_id" ref="action_config_picking_policy"/>
             <field name="category_id" ref="base.category_sales_management_config"/>
+            <field name="type">once</field>
         </record>
 
     </data>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 1f0e7c7197f..22517bca44c 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -59,8 +59,6 @@
 "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_template_sale_manager","product.template salemanager","product.model_product_template","base.group_sale_manager",1,1,1,1
-"access_product_product_sale_manager","product.product salemanager","product.model_product_product","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_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
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index e62ec56dd45..b7a228acf6a 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -4,7 +4,6 @@
 
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User - Own Leads Only</field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
@@ -15,6 +14,7 @@
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Sales / Manager</field>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record model="res.users" id="base.user_admin">
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 04a9b12687e..9e0a47b3ceb 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -116,9 +116,13 @@ class stock_picking(osv.osv):
 
     def action_invoice_create(self, cursor, user, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
+        if context is None:
+            context = {}
         invoice_obj = self.pool.get('account.invoice')
         picking_obj = self.pool.get('stock.picking')
         invoice_line_obj = self.pool.get('account.invoice.line')
+        fiscal_position_obj = self.pool.get('account.fiscal.position')
+        order_line_obj = self.pool.get('sale.order.line')
 
         result = super(stock_picking, self).action_invoice_create(cursor, user,
                 ids, journal_id=journal_id, group=group, type=type,
@@ -136,14 +140,18 @@ class stock_picking(osv.osv):
                 continue
             sale_lines = picking.sale_id.order_line
             invoice_created = invoices[result[picking.id]]
-            for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context):
-                if not inv.fiscal_position:
-                    invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
+            if picking.sale_id.user_id:
+                invoice_obj.write(cursor, user, [invoice_created.id], {'user_id': picking.sale_id.user_id.id}, context=context)
+
+            if picking.sale_id.fiscal_position:
+                invoice_obj.write(cursor, user, [invoice_created.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
             if picking.sale_id.client_order_ref:
                 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:
                 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:
@@ -168,7 +176,7 @@ class stock_picking(osv.osv):
                     account_analytic_id = self._get_account_analytic_invoice(cursor,
                             user, picking, sale_line)
 
-                    account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, picking.sale_id.partner_id.property_account_position, account_id)
+                    account_id = fiscal_position_obj.map_account(cursor, user, picking.sale_id.partner_id.property_account_position, account_id)
                     invoice = invoices[result[picking.id]]
                     invoice_line_id = invoice_line_obj.create(cursor, user, {
                         'name': name,
@@ -183,10 +191,12 @@ class stock_picking(osv.osv):
                         'account_analytic_id': account_analytic_id,
                         'notes':sale_line.notes
                     }, context=context)
-                    self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced': True,
+                    order_line_obj.write(cursor, user, [sale_line.id], {'invoiced': True,
                         'invoice_lines': [(6, 0, [invoice_line_id])],
                     })
         return result
 
 stock_picking()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 20ef5752471..7b9e90f6f0a 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -71,10 +71,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field>
+            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</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="sale.menu_invoiced" groups="base.group_no_one" sequence="20"/>
+        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="base.group_no_one" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index d582a7c3e37..06bd0a309f5 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -3,27 +3,16 @@
   I create a Sale Order for LG Viewty Smart for qty 100 having order_policy manual.
 -
   !record {model: sale.order, id: sale_order_so5}:
-    date_order: !eval time.strftime('%Y-%m-%d')
     invoice_quantity: order
     order_line:
-      - name: LG Viewty Smart
-        price_unit: 170.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 100.0
-        state: draft
-        delay: 7.0
+      - product_uom_qty: 100.0
         product_id: sale.product_product_lgviewtysmart0
+        name: LG View
         product_uos_qty: 100.0
-        th_weight: 0.0
         type: make_to_order
     order_policy: manual
     partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
     picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
 -
   I use the Advance Payment wizard.
 -
@@ -42,8 +31,8 @@
   I verify whether the invoice has been generated.
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so5"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so5"
+    so = self.read(cr, uid, ref("sale_order_so5"))
+    assert so['invoice_ids'], "Invoices has not been generated for sale_order_so5"
 -
   I open the Invoice for the SO.
 -
diff --git a/addons/sale/test/data_test.yml b/addons/sale/test/data_test.yml
index 6e5ec1a9738..8b5d32a086a 100644
--- a/addons/sale/test/data_test.yml
+++ b/addons/sale/test/data_test.yml
@@ -122,7 +122,6 @@
     default_credit_account_id: account_account_purchases0
     default_debit_account_id: account_account_purchases0
     name: Purchase Journal - (test)
-    sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
 - 
@@ -134,7 +133,6 @@
     default_credit_account_id: account_account_sales0
     default_debit_account_id: account_account_sales0
     name: Sale Journal
-    sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
 - 
@@ -146,7 +144,6 @@
     default_credit_account_id: account_account_cash0
     default_debit_account_id: account_account_cash0
     name: Bank Journal
-    sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
 - 
@@ -177,6 +174,7 @@
     category_id:
       - res_partner_category_customers0
     name: Cleartrail
+    opt_out: True
 - 
   I create contact address for Cleartrail.
 - 
@@ -211,21 +209,7 @@
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
 - 
-  I define LG Viewty Smart product template.
--
-  !record {model: product.template, id: product_template_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    procure_method: make_to_order
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
+
   I define LG Viewty Smart product.
 -
   !record {model: product.product, id: product_product_lgviewtysmart0}:
@@ -248,21 +232,7 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
--
-  I define Slider Mobile template.
-- 
-  !record {model: product.template, id: product_template_slidermobile0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 200.0
-    mes_type: fixed
-    name: Slider Mobile
-    procure_method: make_to_order
-    standard_price: 189.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
+
 - 
   I define Slider Mobile.
 - 
diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
new file mode 100644
index 00000000000..9a207d9f44e
--- /dev/null
+++ b/addons/sale/test/edi_sale_order.yml
@@ -0,0 +1,132 @@
+-
+  I create a draft Sale Order
+-
+  !record {model: sale.order, id: sale_order_edi_1}:
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8invoice
+    partner_order_id: base.res_partner_address_8invoice
+    partner_shipping_id: base.res_partner_address_8invoice
+    pricelist_id: 1
+    order_line:
+      - product_id: product.product_product_pc1
+        product_uom_qty: 1.0
+        product_uom: 1
+        price_unit: 150.0
+        name: 'Basic pc'
+    order_line:
+      - product_id: product.product_product_pc3
+        product_uom_qty: 10.0
+        product_uom: 1
+        price_unit: 200.0
+        name: 'Medium pc'
+-
+  I confirm the sale order
+-
+  !workflow {model: sale.order, ref: sale_order_edi_1, action: order_confirm}
+-
+  Then I export the sale order via EDI
+-
+  !python {model: edi.document}: |
+    sale_order = self.pool.get('sale.order')
+    so = sale_order.browse(cr, uid, ref("sale_order_edi_1"))
+    token = self.export_edi(cr, uid, [so])
+    assert token, 'Invalid EDI Token'
+-
+  Then I import a sample EDI document of a purchase order
+-
+  !python {model: edi.document}: |
+    sale_order_pool = self.pool.get('sale.order')
+    edi_document = {
+        "__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_test",
+        "__module": "purchase",
+        "__model": "purchase.order",
+        "__import_module": "sale",
+        "__import_model": "sale.order",
+        "__version": [6,1,0],
+        "name": "PO00011",
+        "date_order": "2011-09-12",
+        "currency": {
+                "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.EUR",
+                "__module": "base",
+                "__model": "res.currency",
+                "code": "EUR",
+                "symbol": "€",
+        },
+        "company_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.main_company", "Client S.A."],
+        "company_address": {
+                "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.some_address",
+                "__module": "base",
+                "__model": "res.partner.address",
+                "phone": "(+32).81.81.37.00", 
+                "street": "Chaussee de Namur 40", 
+                "city": "Gerompont", 
+                "zip": "1367", 
+                "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"],
+                "bank_ids": [
+                    ["base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_bank-adaWadsadasdDJzGbp","Ladies bank: 032465789-156113"]
+                ],
+        }, 
+        "partner_id": ["purchase:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_test20", "jones white"], 
+        "partner_address": {
+                "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh",
+                "__module": "base",
+                "__model": "res.partner.address",
+                "phone": "(+32).81.81.37.00", 
+                "street": "Chaussee de Namur 40", 
+                "city": "Gerompont", 
+                "zip": "1367", 
+                "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"], 
+        },
+        "order_line": [{
+                "__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-AlhsVDZGoKvJ", 
+                "__module": "purchase", 
+                "__model": "purchase.order.line",
+                "__import_module": "sale", 
+                "__import_model": "sale.order.line", 
+                "name": "Basic PC", 
+                "date_planned": "2011-09-30", 
+                "price_unit": 150.0, 
+                "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc1", "[PC1] Basic PC"],
+                "product_qty": 1.0, 
+                "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "PCE"], 
+        },
+        {
+                "__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-Alsads33e", 
+                "__module": "purchase", 
+                "__model": "purchase.order.line",
+                "__import_module": "sale", 
+                "__import_model": "sale.order.line",
+                "name": "Medium PC", 
+                "date_planned": "2011-09-15", 
+                "price_unit": 100.0, 
+                "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc3", "[PC3] Medium PC"],
+                "product_qty": 2.0, 
+                "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "PCE"], 
+        }], 
+    }
+    new_sale_order_id = sale_order_pool.edi_import(cr, uid, edi_document, context=context)
+    assert new_sale_order_id,  'Sale order import failed'
+    order_new = sale_order_pool.browse(cr, uid, new_sale_order_id)
+
+    # check bank info on partner
+    assert len(order_new.partner_id.bank_ids) == 1, "Expected 1 bank entry related to partner"
+    bank_info = order_new.partner_id.bank_ids[0]
+    assert bank_info.acc_number == "Ladies bank: 032465789-156113", 'Expected "Ladies bank: 032465789-156113", got %s' % bank_info.acc_number
+
+    assert order_new.pricelist_id.name == 'Public Pricelist' , "Public Price list was not automatically assigned"
+    assert order_new.amount_total == 350, "Amount total is wrong"
+    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,)
+            assert sale_line.product_uom.name == "PCE" , "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,)
+            assert sale_line.product_uom.name == "PCE" , "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"
+        else:
+            raise AssertionError('unknown order line: %s' % sale_line)
\ No newline at end of file
diff --git a/addons/sale/test/invoice_on_ordered_qty.yml b/addons/sale/test/invoice_on_ordered_qty.yml
index 785b2d8835e..313aa3a0d63 100644
--- a/addons/sale/test/invoice_on_ordered_qty.yml
+++ b/addons/sale/test/invoice_on_ordered_qty.yml
@@ -31,39 +31,17 @@
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so9}
 -
-  I verify that the picking has been generated for the sale order
+  I verify that the picking has been generated for the sale order and I process it
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so9"))
     assert so.picking_ids,"Picking has not been generated for sale_order_so9"
--
-  Then I confirm the picking
--
-  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
-  Then I done the picking
--
-  !python {model: stock.picking }: |
-    import time
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
-    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-    if picking_id:
-       pick=self.browse(cr,uid,picking_id[0])
-       pick.force_assign(cr, uid)
-       partial_datas = {
-            'partner_id':pick.address_id.partner_id.id,
-             'address_id': pick.address_id.id,
-             'delivery_date' : time.strftime('%Y-%m-%d'),
-            }
-       move = pick.move_lines[0]
-       partial_datas['move%s'%(move.id)]= {
-           'product_id': move.product_id.id,
-           'product_qty': '100',
-           'product_uom': move.product_uom.id,
-       }
-       self.do_partial(cr, uid, [pick.id],partial_datas)
+    picking, = so.picking_ids
+    stock_partial_picking = self.pool.get('stock.partial.picking')
+    partial_id = stock_partial_picking.create(cr, uid, {},
+            context={'active_model': 'stock.picking',
+                     'active_ids': [picking.id]})
+    stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I click on Create Invoice button to create the invoice.
 -
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
index bf2795e0f5b..c6ac86471be 100644
--- a/addons/sale/test/invoice_on_shipped_qty.yml
+++ b/addons/sale/test/invoice_on_shipped_qty.yml
@@ -30,41 +30,21 @@
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so6}
 -
-  I verify that the picking has been generated for the sale order
+  I verify that the picking has been generated for the sale order and I process it
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so6"))
     assert so.picking_ids,"Picking has not been generated for sale_order_so6"
--
-  Then I click on the "Product Sent" button of Outgoing Shipments
--
-  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
-  I change the quantity on the picking to 199, and confirm partially 100 PCE.
--
-  !python {model: stock.picking }: |
-    import time
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
-    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-    if picking_id:
-       pick=self.browse(cr,uid,picking_id[0])
-       self.pool.get('stock.move').write(cr, uid, [pick.move_lines[0].id], {'product_qty': 199, 'product_uos_qty': 199})
-       pick=self.browse(cr,uid,picking_id[0])
-       pick.force_assign(cr, uid)
-       partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-           'address_id': pick.address_id.id,
-           'delivery_date' : time.strftime('%Y-%m-%d'),
-       }
-       move = pick.move_lines[0]
-       partial_datas['move%s'%(move.id)]= {
-           'product_id': move.product_id.id,
-           'product_qty': '100',
-           'product_uom': move.product_uom.id,
-       }
-       self.do_partial(cr, uid, [pick.id],partial_datas)
+    picking, = so.picking_ids
+    stock_partial_picking = self.pool.get('stock.partial.picking')
+    partial_id = stock_partial_picking.create(cr, uid, {},
+            context={'active_model': 'stock.picking',
+                     'active_ids': [picking.id]})
+    # I change the qty to 100 for a partial delivery
+    partial = stock_partial_picking.browse(cr,uid,partial_id)
+    line_id = partial.move_ids[0].id
+    partial.write({'move_ids': [(1,line_id,{'quantity':100})]})
+    partial.do_partial()
 -
   Then I click on 'Create Invoices' button
 -
@@ -72,9 +52,9 @@
     import time
     sale_obj = self.pool.get('sale.order')
     sale_id = sale_obj.browse(cr, uid, ref("sale_order_so6"))
-    ids = [x.id for x in sale_id.picking_ids]
+    ids = [x.id for x in sale_id.picking_ids if x.state == 'done']
     wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')},
-      {'active_ids': ids})
+      {'active_ids': ids, 'active_model': 'stock.picking'})
     self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]})
 -
   I verify whether the invoice has been generated for SO
@@ -98,7 +78,7 @@
     inv_brw = self.browse(cr,uid,inv_id)[0]
     for inv_lines in inv_brw.invoice_line:
         qty1=inv_lines.quantity
-    assert (qty1 == qty), "Quantities are not the same"
+    assert (qty1 == qty), "Quantities are not the same: invoiced: %s, shipped: %s" % (qty1,qty)
 -
   I open the Invoice for the SO.
 -
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index c1535402f9b..af515b2d4e4 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -136,15 +136,11 @@
   I verify that a procurement state is "running"
 -
   !python {model: procurement.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        sale_order_obj = self.pool.get('sale.order')
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-        proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
-        assert(proc_ids),"Procurement is not in the running state!"
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','in',['running','ready'])])
+    # should be running is 'purchase' is installed, else 'ready'
+    assert(proc_ids),"Procurement is not in running/ready state!"
 -
   I verify that a purchase order has been generated
 -
@@ -192,7 +188,7 @@
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
-  I verify that a picking related to purchase order has been generated.
+  I verify that a picking related to purchase order has been generated and I process it
 -
   !python {model: sale.order}: |
     modules = self.pool.get('ir.module.module')
@@ -204,29 +200,12 @@
         pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
         po = pur_obj.browse(cr, uid, pur_id)[0]
         assert(po.picking_ids),"Picking for purchase order has not been generated"
--
-  Then I click on the "Products Received" button of Incoming Shipments
--
-  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
-  I click on the "Validate" button
--
-  !python {model: stock.picking}: |
-    modules = self.pool.get('ir.module.module')
-    sale_order_obj = self.pool.get('sale.order')
-    pur_obj = self.pool.get('purchase.order')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        for pick in pick_ser_id:
-          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
+        picking, = po.picking_ids
+        stock_partial_picking = self.pool.get('stock.partial.picking')
+        partial_id = stock_partial_picking.create(cr, uid, {},
+                context={'active_model': 'stock.picking',
+                         'active_ids': [picking.id]})
+        stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I verify that picking for purchase order has been done.
 -
@@ -244,7 +223,7 @@
         ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
         assert(ids),"Picking is not in the done state!"
 -
-  Then I done the picking
+  Then I process the picking
 -
   !python {model: stock.picking }: |
    import time
@@ -254,18 +233,11 @@
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
+      stock_partial_picking = self.pool.get('stock.partial.picking')
+      partial_id = stock_partial_picking.create(cr, uid, {},
+              context={'active_model': 'stock.picking',
+                       'active_ids': [pick.id]})
+      stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I verify that picking for sale order is in done state.
 -
@@ -275,38 +247,6 @@
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    pick = self.browse(cr,uid,picking_id[0])
    assert (pick.state) =='done', "Picking for SO is not in done state."
--
-  Then I done the delivery order
--
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
--
-  I verify that delivery state is done
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   pick = self.browse(cr,uid,picking_id[0])
-   assert (pick.state) =='done', "Picking for SO is not in done state."
 -
   I verify that a "Picked" has been set to true
 -
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index 4381c78f010..1dcbf980da4 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -46,18 +46,11 @@
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
+      stock_partial_picking = self.pool.get('stock.partial.picking')
+      partial_id = stock_partial_picking.create(cr, uid, {},
+              context={'active_model': 'stock.picking',
+                       'active_ids': [pick.id]})
+      stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   Then I click on 'Create Invoices' button
 -
@@ -67,7 +60,7 @@
     sale_id=sale_obj.browse(cr, uid, ref("sale_order_so7"))
     ids = [x.id for x in sale_id.picking_ids]
     wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')},
-      {'active_ids': ids})
+      {'active_ids': ids, 'active_model': 'stock.picking'})
     self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]})
 -
   I check that an invoice has been created.
@@ -197,7 +190,7 @@
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
-  I verify that a picking related to purchase order has been generated.
+  I verify that a picking related to purchase order has been generated and I process it
 -
   !python {model: sale.order}: |
     modules = self.pool.get('ir.module.module')
@@ -209,29 +202,12 @@
         pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
         po = pur_obj.browse(cr, uid, pur_id)[0]
         assert(po.picking_ids),"Picking for purchase order has not been generated"
--
-  Then I click on the "Products Received" button of Incoming Shipments
--
-  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
-  I click on the "Validate" button
--
-  !python {model: stock.picking}: |
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        sale_order_obj = self.pool.get('sale.order')
-        pur_obj = self.pool.get('purchase.order')
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        for pick in pick_ser_id:
-          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
+        picking, = po.picking_ids
+        stock_partial_picking = self.pool.get('stock.partial.picking')
+        partial_id = stock_partial_picking.create(cr, uid, {},
+                context={'active_model': 'stock.picking',
+                         'active_ids': [picking.id]})
+        stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I verify that picking for purchase order has been done.
 -
@@ -249,36 +225,20 @@
         ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
         assert ids, _('Picking is not in the done state!')
 -
-  I verify that delivery order has been generated for sale order
+  I verify that delivery order has been generated for sale order, and process it
 -
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
    picking_id = self.search(cr, uid, [('origin','=',so.name)])
    assert (picking_id),"Delivery order has not been generated"
--
-  I verify that delivery has been done
--
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
+   pick=self.browse(cr,uid,picking_id[0])
+   pick.force_assign(cr, uid)
+   stock_partial_picking = self.pool.get('stock.partial.picking')
+   partial_id = stock_partial_picking.create(cr, uid, {},
+           context={'active_model': 'stock.picking',
+                    'active_ids': [pick.id]})
+   stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I verify that delivery state is done
 -
@@ -290,7 +250,7 @@
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
 -
-  I verify that a "Picked" has been set to true
+  I verify that the sale order is marked as delivered
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so7"))
diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml
index 330c6d17308..a0d5a8e1928 100644
--- a/addons/sale/test/postpaid_order_policy.yml
+++ b/addons/sale/test/postpaid_order_policy.yml
@@ -45,18 +45,11 @@
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
+      stock_partial_picking = self.pool.get('stock.partial.picking')
+      partial_id = stock_partial_picking.create(cr, uid, {},
+              context={'active_model': 'stock.picking',
+                       'active_ids': [pick.id]})
+      stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I verify that picking order is in done state.
 -
@@ -76,7 +69,7 @@
    picking_id = self.search(cr, uid, [('origin','=',so.name)])
    assert (picking_id),"Delivery order has not been generated"
 -
-  I click on the Products Sent button and then on the Validate button
+  I process the delivery order
 -
   !python {model: stock.picking }: |
    import time
@@ -86,20 +79,13 @@
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
+      stock_partial_picking = self.pool.get('stock.partial.picking')
+      partial_id = stock_partial_picking.create(cr, uid, {},
+              context={'active_model': 'stock.picking',
+                       'active_ids': [pick.id]})
+      stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
-  I verify that delivery state is done
+  I verify that delivery order is marked done
 -
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
@@ -187,7 +173,7 @@
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
-  I verify that a picking related to purchase order has been generated.
+  I verify that a picking related to purchase order has been generated and I process it
 -
   !python {model: sale.order}: |
     modules = self.pool.get('ir.module.module')
@@ -199,31 +185,14 @@
         pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
         po = pur_obj.browse(cr, uid, pur_id)[0]
         assert(po.picking_ids),"Picking for purchase order has not been generated"
+        picking, = po.picking_ids
+        stock_partial_picking = self.pool.get('stock.partial.picking')
+        partial_id = stock_partial_picking.create(cr, uid, {},
+                context={'active_model': 'stock.picking',
+                         'active_ids': [picking.id]})
+        stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
-  Then I click on the "Products Received" button of Incoming Shipments
--
-  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
-  I click on the "Validate" button
--
-  !python {model: stock.picking}: |
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        sale_order_obj = self.pool.get('sale.order')
-        pur_obj = self.pool.get('purchase.order')
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        for pick in pick_ser_id:
-          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
--
-  I verify that picking for purchase order has been done.
+  I verify that picking for purchase order has been marked done.
 -
   !python {model: sale.order}: |
     from tools.translate import _
@@ -239,7 +208,7 @@
         ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
         assert ids, _('Picking is not in the done state!')
 -
-  I verify that a "Picked" has been set to true
+  I verify that the sale order is marked as delivered
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so8"))
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
index 4bf132e5bee..d6f3da64a2c 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -101,18 +101,11 @@
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
+      stock_partial_picking = self.pool.get('stock.partial.picking')
+      partial_id = stock_partial_picking.create(cr, uid, {},
+              context={'active_model': 'stock.picking',
+                       'active_ids': [pick.id]})
+      stock_partial_picking.do_partial(cr, uid, [partial_id])
 -
   I verify that picking order is in done state.
 -
@@ -201,7 +194,7 @@
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
-  I verify that a picking related to purchase order has been generated.
+  I verify that a picking related to purchase order has been generated and I process it
 -
   !python {model: sale.order}: |
     modules = self.pool.get('ir.module.module')
@@ -213,51 +206,21 @@
         pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
         po = pur_obj.browse(cr, uid, pur_id)[0]
         assert(po.picking_ids),"Picking for purchase order has not been generated"
--
-  Then I click on the "Products Received" button of Incoming Shipments
--
-  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
-  I click on the "Validate" button
--
-  !python {model: stock.picking}: |
-    modules = self.pool.get('ir.module.module')
-    sale_order_obj = self.pool.get('sale.order')
-    pur_obj = self.pool.get('purchase.order')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        for pick in pick_ser_id:
-          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
--
-  I verify that picking for purchase order has been done.
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if(mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so1"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
+        picking, = po.picking_ids
+        stock_partial_picking = self.pool.get('stock.partial.picking')
+        partial_id = stock_partial_picking.create(cr, uid, {},
+                context={'active_model': 'stock.picking',
+                         'active_ids': [picking.id]})
+        stock_partial_picking.do_partial(cr, uid, [partial_id])
         picking_obj = self.pool.get('stock.picking')
-        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
-        assert ids, _('Picking is not in the done state!')
+        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id),('state', '=', 'done')])
+        assert ids, 'Picking should be marked done!'
 -
-  I verify that a "Picked" has been set to true
+  I verify that the sale order is marked as delivered
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert (so.shipped == True), "Picking is not done."
+    assert (so.shipped == True), "Sale order is not marked as delivered"
 -
   I verify that a sale order is in done state
 -
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 8c0383acb02..2fa7488a669 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -73,6 +73,8 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 'comment': order.note,
                 'payment_term': pay_term,
                 'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
+                'user_id': order.user_id and order.user_id.id or False,
+                'company_id': order.company_id and order.company_id.id or False
             }
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
             return inv_id
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 6562af09258..1df79f3c52d 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -26,7 +26,6 @@
 
         <record model="ir.values" id="sale_order_line_make_invoice">
             <field name="model_id" ref="sale.model_sale_order_line" />
-            <field name="object" eval="1" />
             <field name="name">Make Invoices</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_order_line_make_invoice'))" />
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 267167237bc..d39aee3b3fa 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -31,7 +31,6 @@
         
         <record model="ir.values" id="sale_order_make_invoice">
             <field name="model_id" ref="sale.model_sale_order" />
-            <field name="object" eval="1" />
             <field name="name">Make Invoices</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_sale_order_make_invoice'))" />
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 4b1e4511021..cb9bb2fc5bd 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -27,8 +27,8 @@ class sale_advance_payment_inv(osv.osv_memory):
     _columns = {
         'product_id': fields.many2one('product.product', 'Advance Product', required=True,
             help="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."),
-        'amount': fields.float('Advance Amount', size=(16, 2), required=True, help="The amount to be invoiced in advance."),
-        'qtty': fields.float('Quantity', size=(16, 2), required=True),
+        'amount': fields.float('Advance Amount', digits=(16, 2), required=True, help="The amount to be invoiced in advance."),
+        'qtty': fields.float('Quantity', digits=(16, 2), required=True),
     }
     _defaults = {
         'qtty': 1.0
@@ -65,15 +65,22 @@ class sale_advance_payment_inv(osv.osv_memory):
                              that is defined as 'Automatic Invoice after delivery'."))
                 val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
                         uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
+                res = val['value']
+                if not res.get('account_id'):
+                    raise osv.except_osv(_('Configuration Error !'),
+                                _('There is no income account defined ' \
+                                        'for this product: "%s" (id:%d)') % \
+                                        (sale_adv_obj.product_id.name, sale_adv_obj.product_id.id,))
+                
                 line_id = obj_lines.create(cr, uid, {
-                    'name': val['value']['name'],
-                    'account_id': val['value']['account_id'],
+                    'name': res.get('name'),
+                    'account_id': res['account_id'],
                     'price_unit': sale_adv_obj.amount,
                     'quantity': sale_adv_obj.qtty,
                     'discount': False,
-                    'uos_id': val['value']['uos_id'],
+                    'uos_id': res.get('uos_id'),
                     'product_id': sale_adv_obj.product_id.id,
-                    'invoice_line_tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    'invoice_line_tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
                     'account_analytic_id': sale.project_id.id or False,
                     #'note':'',
                 })
@@ -109,15 +116,15 @@ class sale_advance_payment_inv(osv.osv_memory):
                 if sale.order_policy == 'picking':
                     self.pool.get('sale.order.line').create(cr, uid, {
                         'order_id': sale.id,
-                        'name': val['value']['name'],
+                        'name': res.get('name'),
                         'price_unit': -sale_adv_obj.amount,
                         'product_uom_qty': sale_adv_obj.qtty,
                         'product_uos_qty': sale_adv_obj.qtty,
-                        'product_uos': val['value']['uos_id'],
-                        'product_uom': val['value']['uos_id'],
+                        'product_uos': res.get('uos_id'),
+                        'product_uom': res.get('uos_id'),
                         'product_id': sale_adv_obj.product_id.id,
                         'discount': False,
-                        'tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                        'tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
                     }, context)
 
         context.update({'invoice_id':list_inv})
@@ -173,4 +180,4 @@ class sale_open_invoice(osv.osv_memory):
 
 sale_open_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/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 91f04c1b977..1850fbf8b2a 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Sales Analytic Distribution Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden',
     'description': """
 The base module to manage analytic distribution and sales orders.
 =================================================================
diff --git a/addons/sale_analytic_plans/i18n/ar.po b/addons/sale_analytic_plans/i18n/ar.po
index e413f522088..38d19a8879c 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d27836f0d2a..250a58f503f 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8d22d2d6456..57f99796388 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f2b2d6253ab..c32c0730cfb 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3460280b4e0..7a9bf199c3b 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 27ed7dda89b..ee2402eb8a5 100644
--- a/addons/sale_analytic_plans/i18n/da.po
+++ b/addons/sale_analytic_plans/i18n/da.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-03 16:58+0000\n"
-"PO-Revision-Date: 2009-11-17 10:33+0000\n"
-"Last-Translator: SmartWi <kurt@smartwi.net>\n"
+"PO-Revision-Date: 2011-11-02 15:31+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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -38,7 +38,7 @@ msgstr ""
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Salgsordrelinie"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for View Architecture!"
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index 98ae119dd82..663eb2e22ab 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -46,21 +46,3 @@ msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Verkaufsauftragszeile"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen \r\n"
-#~ "beinhalten"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/sale_analytic_plans/i18n/el.po b/addons/sale_analytic_plans/i18n/el.po
index 2e9b19f2bb7..647fca9be89 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e93377cd8e6..a68856c037f 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -46,21 +46,3 @@ msgstr "Línea pedido de venta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Línea pedido venta"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/sale_analytic_plans/i18n/es_AR.po b/addons/sale_analytic_plans/i18n/es_AR.po
index 962e7149e6a..ac275eb5dc2 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..35a062be0c1
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/es_CL.po
@@ -0,0 +1,45 @@
+# 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: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-10-17 16:56+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: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Distribución Analítica"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
+msgid "Sales Analytic Distribution Management"
+msgstr "Administracion de distribución analítica de ventas"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,description:sale_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and sales orders.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para gestionar distribuciones analíticas y pedidos de "
+"venta.\n"
+"    "
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea de pedido de venta"
diff --git a/addons/sale_analytic_plans/i18n/es_MX.po b/addons/sale_analytic_plans/i18n/es_MX.po
new file mode 100644
index 00000000000..6f5d3bbb661
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/es_MX.po
@@ -0,0 +1,48 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_analytic_plans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2010-12-28 09:16+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:35+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Distribución Analítica"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
+msgid "Sales Analytic Distribution Management"
+msgstr "Administracion de distribución analítica de ventas"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,description:sale_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and sales orders.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para gestionar distribuciones analíticas y pedidos de "
+"venta.\n"
+"    "
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/sale_analytic_plans/i18n/es_VE.po b/addons/sale_analytic_plans/i18n/es_VE.po
new file mode 100644
index 00000000000..6f5d3bbb661
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/es_VE.po
@@ -0,0 +1,48 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_analytic_plans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2010-12-28 09:16+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:35+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Distribución Analítica"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
+msgid "Sales Analytic Distribution Management"
+msgstr "Administracion de distribución analítica de ventas"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,description:sale_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and sales orders.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para gestionar distribuciones analíticas y pedidos de "
+"venta.\n"
+"    "
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/sale_analytic_plans/i18n/et.po b/addons/sale_analytic_plans/i18n/et.po
index f24ff5ccc0e..a220f88814c 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7780b9fd7f4..5de6eb87f00 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 afd395b4260..1544bd6360d 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -46,6 +46,3 @@ msgstr "Ligne de bon de commande"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Ligne de commande de vente"
diff --git a/addons/sale_analytic_plans/i18n/gl.po b/addons/sale_analytic_plans/i18n/gl.po
index 6efc98942c5..2dbfc66f47e 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 15a8d2ca88b..8fdd4a4062d 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 69bb599b350..66649f0fb8f 100644
--- a/addons/sale_analytic_plans/i18n/hu.po
+++ b/addons/sale_analytic_plans/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-02-01 17:51+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -42,14 +43,3 @@ msgstr ""
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "Vevői megrendelés sor"
-
-#~ msgid ""
-#~ "\n"
-#~ "\"\n"
-#~ "\"    The base module to manage analytic distribution and sales orders.\n"
-#~ "\"\n"
-#~ "\"    "
-#~ msgstr ""
-#~ "\n"
-#~ "Költségfelosztás és vevői megrendelések kezelésére szolgáló alapmodul. The "
-#~ "base module to manage analytic distribution and sales orders.    "
diff --git a/addons/sale_analytic_plans/i18n/id.po b/addons/sale_analytic_plans/i18n/id.po
index 942fd3da8d9..9b42dfb185d 100644
--- a/addons/sale_analytic_plans/i18n/id.po
+++ b/addons/sale_analytic_plans/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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Analisa Distribusi"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
+msgstr "Manajemen Sales Analisa Distribusi"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,description:sale_analytic_plans.module_meta_information
@@ -33,8 +33,11 @@ msgid ""
 "    The base module to manage analytic distribution and sales orders.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul Dasar untuk mengelola distribusi analitik dan sales order .\n"
+"    "
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Daftar sales order"
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index c8977dd420e..ee0c2dfa25e 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -46,11 +46,3 @@ msgstr "Linea d'ordine di vendita"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Riga Ordine di Vendita"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'Oggetto deve iniziare con x_e non contenere caratteri speciali !"
diff --git a/addons/sale_analytic_plans/i18n/ko.po b/addons/sale_analytic_plans/i18n/ko.po
index afe3c13ec99..ff2dd67fb7d 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e413f522088..417109e85ba 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fce579a4575..0715142e487 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 818454cf897..ad5c6c390d0 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c2a1b169321..e81bdcb4c59 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..e4af10e9b81
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/oc.po
@@ -0,0 +1,45 @@
+# 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: 2011-01-03 16:58+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Distribucion analitica"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
+msgid "Sales Analytic Distribution Management"
+msgstr "Gestion de la Distribucion Analitica de las Vendas"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,description:sale_analytic_plans.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage analytic distribution and sales orders.\n"
+"    "
+msgstr ""
+"\n"
+"    Lo modul de basa per gerir la distribucion analitica e los bons de "
+"comanda.\n"
+"    "
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha de bon de comanda"
diff --git a/addons/sale_analytic_plans/i18n/pl.po b/addons/sale_analytic_plans/i18n/pl.po
index d7bba20dc6b..72c779b6af0 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2f7a8221a35..24f3cee4582 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -41,21 +41,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Linha de Ordem de Venda"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index 39b4ef3b58e..ff6b75874a9 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -44,6 +44,3 @@ msgstr "Linha de Pedido de Vendas"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Itens de Pedidos"
diff --git a/addons/sale_analytic_plans/i18n/ro.po b/addons/sale_analytic_plans/i18n/ro.po
index bd1375c1ca8..6ebd355dba2 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d95c4cc7eeb..a8256523ccb 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -45,21 +45,3 @@ msgstr "Позиция заказа на продажу"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Позиция заказа"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/sale_analytic_plans/i18n/sk.po b/addons/sale_analytic_plans/i18n/sk.po
index 660c95cb583..c47b9c3129e 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 8549ccd3957..6b13a05d9de 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -37,24 +37,7 @@ msgstr ""
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Postavka prodajnega naročila"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Postavka prodajnega naloga"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
diff --git a/addons/sale_analytic_plans/i18n/sq.po b/addons/sale_analytic_plans/i18n/sq.po
index f2e0209e534..5215d9c5484 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: 2011-04-29 05:31+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6b94aacbec1..cab42ed3c5a 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -42,7 +42,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Ime objekta mora početi s x_ i ne sme sadržati specijalne znake !"
diff --git a/addons/sale_analytic_plans/i18n/sr@latin.po b/addons/sale_analytic_plans/i18n/sr@latin.po
index 59f0e47ef79..d98066019fb 100644
--- a/addons/sale_analytic_plans/i18n/sr@latin.po
+++ b/addons/sale_analytic_plans/i18n/sr@latin.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-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-23 14:51+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-10-13 15:11+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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr "Analitička Distribucija"
+msgstr "Analitička distribucija"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr "Menadzment Analiticke Distribucije Prodaje"
+msgstr "Uređivanje analitičke distribucije prodaje"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,description:sale_analytic_plans.module_meta_information
@@ -34,15 +34,15 @@ msgid ""
 "    The base module to manage analytic distribution and sales orders.\n"
 "    "
 msgstr ""
+"\n"
+"    Osnovni modul za uređivanje analitičke distribucije prodaje i redosleda "
+"narudžbina.\n"
+"    "
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Ime objekta mora početi s x_ i ne sme sadržati specijalne znake !"
+msgstr "Redosled narudžbina"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index a7f094d2676..19704dd27e5 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fb0423c5bd3..93ce2b416b0 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3b12a579c0b..1481078774f 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6937fe995de..904b65032e1 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 fc8c63a6596..1689a1f430f 100644
--- a/addons/sale_analytic_plans/i18n/vi.po
+++ b/addons/sale_analytic_plans/i18n/vi.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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Phân tích PHân Phối"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
+msgstr "phân tích quản lý bán hàng kênh phân phối"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,description:sale_analytic_plans.module_meta_information
@@ -34,8 +34,11 @@ msgid ""
 "    The base module to manage analytic distribution and sales orders.\n"
 "    "
 msgstr ""
+"\n"
+"    module cơ bản cho quản lý phân tích phân phối và bán hàng theo đơn\n"
+"    "
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "dòng hảng của đơn hàng bán"
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index 64d20ed83cf..6972f05f582 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -8,23 +8,23 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2010-03-20 10:14+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr "辅助核算分配"
+msgstr "分析控制台"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr "销售辅助核算分配管理"
+msgstr "销售分析管理"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,description:sale_analytic_plans.module_meta_information
@@ -33,11 +33,14 @@ msgid ""
 "    The base module to manage analytic distribution and sales orders.\n"
 "    "
 msgstr ""
+"\n"
+"    管理分析经销和销售订单的基础模块\n"
+"    "
 
 #. 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/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index d629cc36d1b..fb9db88b0ca 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 7fe2bd135c7..c3f4365bfee 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Creates Sales order from Opportunity',
+    'name': 'Opportunity to Quotation',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 27adce0ca9d..9d383a4ac28 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -1,110 +1,49 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-
-		<record id="action_quotation_for_sale_crm" model="ir.actions.act_window">
-	        <field name="name">Quotations</field>
-	        <field name="res_model">sale.order</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
-	   		<field name="view_id" ref="sale.view_order_tree"/>
-    	</record>
-
-    	<record id="view_turnover_by_month_tree" model="ir.ui.view">
-	        <field name="name">turnover.by.month.tree</field>
-	        <field name="model">account.invoice.report</field>
-	        <field name="type">tree</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-	        <field name="priority" eval="32"/>
-	        <field name="arch" type="xml">
-	            <tree string="Monthly Turnover">
-	                <field name="month"/>
-	                <field name="price_total"/>
-	            </tree>
-	        </field>
-	    </record>
-
-	    <record id="view_turnover_by_month_graph" model="ir.ui.view">
-	        <field name="name">turnover.by.month.graph</field>
-	        <field name="model">account.invoice.report</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-	        <field name="priority" eval="32"/>
-	        <field name="type">graph</field>
-	        <field name="arch" type="xml">
-	            <graph string="Monthly Turnover" type="bar">
-	                <field name="month"/>
-	                <field name="price_total" operator="+"/>
-	            </graph>
-	        </field>
-	    </record>
-
-		<record model="ir.actions.act_window" id="action_turnover_by_month">
-		    <field name="name">Monthly Turnover</field>
-			<field name="res_model">account.invoice.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree</field>
-			<field name="view_id" ref="view_turnover_by_month_graph"/>
-			<field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
-			<field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
-        	<field name="search_view_id" ref="account.view_account_invoice_report_search"/>
-         </record>
-		<record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
-			<field name="act_window_id" ref="action_turnover_by_month"/>
-			<field name="view_mode">graph</field>
-			<field name="view_id" ref="view_turnover_by_month_graph"/>
-         </record>
-		<record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
-			<field name="act_window_id" ref="action_turnover_by_month"/>
-			<field name="view_mode">tree</field>
-			<field name="view_id" ref="view_turnover_by_month_tree"/>
-         </record>
-
-        <record model="ir.ui.view" id="board_crm_form_inherit_child1">
-            <field name="name">board.crm.form.inherit.child1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="crm.board_crm_form"/>
-            <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child1/action[@string='My Open Opportunities']" position="after">
-		            <action
-		                string="My Quotations"
-		                name="%(action_quotation_for_sale_crm)d"
-		                colspan="4"
-		                height="150"
-                                groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"
-		                width="510"/>
-	            </xpath>
-            </field>
-        </record>
-
-      <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
+    <data>
+        <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
             <field name="name">board.crm.form.inherit.replace1</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="crm.board_crm_form"/>
+            <field name="inherit_id" ref="sale.board_sales_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@string='My Win/Lost Ratio for the Last Year']" position="replace">
-	                <action
-		                string="Monthly Turnover"
-		                name="%(action_turnover_by_month)d"
-                                groups="base.group_sale_salesman,account.group_account_manager"
-		                colspan="4"/>
-	            </xpath>
+            <xpath expr="/form/board/column/action[@string='My Quotations']" position="before">
+                <action name="%(crm.act_my_oppor)d"
+                     string="My Open Opportunities"
+                     />
+                     <!--groups="base.group_sale_salesman,base.group_sale_manager"-->
+            </xpath>
             </field>
         </record>
 
         <record model="ir.ui.view" id="board_crm_form_inherit_replace2">
-            <field name="name">board.crm.form.inherit.replace2</field>
+            <field name="name">board.crm.form.inherit.replace1</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="crm.board_crm_form"/>
+            <field name="inherit_id" ref="sale.board_sales_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@string='My Planned Revenues by Stage']" position="attributes">
-	                <attribute name="string">Opportunities by Stage</attribute>
-	            </xpath>
+            <xpath expr="/form/board/column/action[@string='My Quotations']" position="after">
+                <action name="%(crm.act_my_meetings)d"
+                     string="My Meetings"/>
+            </xpath>
             </field>
         </record>
 
+        <record model="ir.ui.view" id="board_crm_form_inherit_replace3">
+            <field name="name">board.crm.form.inherit.replace1</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.board_sales_form"/>
+            <field name="arch" type="xml">
+            <xpath expr="/form/board/column/action[@string='Monthly Turnover']" position="before">
+                <action name="%(crm.act_my_oppor_stage)d"
+                     string="My Planned Revenues by Stage"
+                     />
+                     <!--groups="base.group_sale_salesman,base.group_sale_manager"-->
+            </xpath>
+            </field>
+        </record>
+        <menuitem name="Sales"
+            id="base.menu_base_partner" action="sale.open_board_sales"/>
     </data>
 </openerp>
diff --git a/addons/sale_crm/i18n/ar.po b/addons/sale_crm/i18n/ar.po
index 5be9de8c5a8..92b4b97e880 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/bg.po b/addons/sale_crm/i18n/bg.po
index 0e0a493302b..330427d6d85 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/bs.po b/addons/sale_crm/i18n/bs.po
index 7b3a020a13f..379769413e1 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/ca.po b/addons/sale_crm/i18n/ca.po
index 0b554a97dd9..9cff2e16afb 100644
--- a/addons/sale_crm/i18n/ca.po
+++ b/addons/sale_crm/i18n/ca.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:34+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 23:05+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-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-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -31,7 +30,7 @@ msgstr "Converteix a pressupost"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "Oportunitat de '%s' es converteix en cotització"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
diff --git a/addons/sale_crm/i18n/cs.po b/addons/sale_crm/i18n/cs.po
index 24de0ccc307..ee7e51ec789 100644
--- a/addons/sale_crm/i18n/cs.po
+++ b/addons/sale_crm/i18n/cs.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-07-15 18:59+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\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: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0a1abf97361..e31e1e6b57a 100644
--- a/addons/sale_crm/i18n/da.po
+++ b/addons/sale_crm/i18n/da.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:16+0000\n"
-"PO-Revision-Date: 2010-11-17 08:33+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"PO-Revision-Date: 2011-11-02 15:39+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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -25,7 +25,7 @@ msgstr "Kunde"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr "Konverter til estimat"
+msgstr "Konverter til tilbud"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
@@ -37,13 +37,13 @@ msgstr ""
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr "utilstrækkelig data!"
+msgstr "utilstrækkelige data!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Kunden har ingen addresse!"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
@@ -75,7 +75,7 @@ msgstr "_Opret"
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Ordre reference skal være unik"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -86,13 +86,13 @@ msgstr ""
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr ""
+msgstr "Konverter til tilbud"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Omsætning pr, måned"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
@@ -114,12 +114,12 @@ msgstr ""
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Tilbud"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Butik"
 
 #. module: sale_crm
 #: view:board.board:0
@@ -129,7 +129,7 @@ msgstr ""
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Mine tilbud"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
@@ -140,22 +140,22 @@ msgstr ""
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Salgsteam"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
-msgstr ""
+msgstr "Lav tilbud"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annullér"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Salgsordre"
 
 #, python-format
 #~ msgid "is converted to Quotation."
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 2c31e26d95b..3139dfabb49 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -151,7 +151,7 @@ msgstr "Meine Angebote"
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr "Schliese Verkaufschance"
+msgstr "Schließe Verkaufschance"
 
 #. module: sale_crm
 #: view:sale.order:0
@@ -272,12 +272,6 @@ msgstr "Verkaufsauftrag"
 #~ msgid "All at once"
 #~ msgstr "Alles zugleich"
 
-#~ 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"
-
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "wurde in Angebot umgewandelt"
@@ -285,21 +279,3 @@ msgstr "Verkaufsauftrag"
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Verkaufschance "
-
-#~ msgid "Sale Order"
-#~ msgstr "Verkaufsauftrag"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Make sale"
-#~ msgstr "Erzeuge Verkauf"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/sale_crm/i18n/el.po b/addons/sale_crm/i18n/el.po
index 1c7d92f1cfa..e876f7da229 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -257,12 +257,6 @@ msgstr "Παραγγελία Πώλησης"
 #~ msgid "Case Section"
 #~ msgstr "Τμήμα Θεμάτων"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
-
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "έχει μετατραπεί σε προσφορά"
@@ -270,9 +264,3 @@ msgstr "Παραγγελία Πώλησης"
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Ευκαιρία "
-
-#~ msgid "Sale Order"
-#~ msgstr "Παραγγελία Πώλησης"
-
-#~ msgid "Make sale"
-#~ msgstr "Δημιουργία πώλησης"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index a9eb8b82c75..09698585afc 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -269,34 +269,10 @@ msgstr "Pedido de venta"
 #~ msgid "Sale CRM Stuff"
 #~ msgstr "Herramientas CRM para ventas"
 
-#~ 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!"
-
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "se ha convertido a presupuesto."
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Make sale"
-#~ msgstr "Realizar venta"
-
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Oportunidad "
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido venta"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/sale_crm/i18n/es_AR.po b/addons/sale_crm/i18n/es_AR.po
index db54bcf1724..b5040fec548 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/es_CL.po b/addons/sale_crm/i18n/es_CL.po
new file mode 100644
index 00000000000..636d138872e
--- /dev/null
+++ b/addons/sale_crm/i18n/es_CL.po
@@ -0,0 +1,181 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-10-17 17:15+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: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "¡El cliente no tiene definidas direcciones!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "Crear ventas"
+
+#. module: sale_crm
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and "
+"the\n"
+"crm modules.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo añade un acceso directo a uno o varios casos de oportunidades en "
+"el CRM.\n"
+"Este acceso directo le permite generar un pedido de venta a partir del caso "
+"seleccionado.\n"
+"Si están abiertos distintos casos (una lista), genera un pedido de venta "
+"por\n"
+"caso.\n"
+"El caso se cierra y es enlazado al pedido ventas generado.\n"
+"\n"
+"Le sugerimos que instale este módulo si ha instalado ambos módulos sale y "
+"crm.\n"
+"    "
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Crear"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+"Marque esta opción para cerrar la oportunidad después de haber creado el "
+"pedido de venta."
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr "Volumen de ventas mensual"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Converted to Sales Quotation(id: %s)."
+msgstr "Convertido a presupuesto de venta (id: %s)."
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Oportunidad: %s"
+
+#. module: sale_crm
+#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
+msgid "Creates Sales order from Opportunity"
+msgstr "Crea pedido de venta desde oportunidad"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Almacén"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Cerrar oportunidad"
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Realizar un presupuesto"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venta"
+
+#, python-format
+#~ msgid "Opportunity "
+#~ msgstr "Oportunidad "
+
+#, python-format
+#~ msgid "is converted to Quotation."
+#~ msgstr "se ha convertido a presupuesto."
diff --git a/addons/sale_crm/i18n/es_MX.po b/addons/sale_crm/i18n/es_MX.po
new file mode 100644
index 00000000000..79767bad821
--- /dev/null
+++ b/addons/sale_crm/i18n/es_MX.po
@@ -0,0 +1,278 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_crm
+#
+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-12 15:43+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
+"Language-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:09+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "¡El cliente no tiene definidas direcciones!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "Crear ventas"
+
+#. module: sale_crm
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and "
+"the\n"
+"crm modules.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo añade un acceso directo a uno o varios casos de oportunidades en "
+"el CRM.\n"
+"Este acceso directo le permite generar un pedido de venta a partir del caso "
+"seleccionado.\n"
+"Si están abiertos distintos casos (una lista), genera un pedido de venta "
+"por\n"
+"caso.\n"
+"El caso se cierra y es enlazado al pedido ventas generado.\n"
+"\n"
+"Le sugerimos que instale este módulo si ha instalado ambos módulos sale y "
+"crm.\n"
+"    "
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Crear"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+"Marque esta opción para cerrar la oportunidad después de haber creado el "
+"pedido de venta."
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Converted to Sales Quotation(id: %s)."
+msgstr "Convertido a presupuesto de venta (id: %s)."
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Oportunidad: %s"
+
+#. module: sale_crm
+#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
+msgid "Creates Sales order from Opportunity"
+msgstr "Crea pedido de venta desde oportunidad"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Cerrar oportunidad"
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Realizar un presupuesto"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#~ msgid "All at once"
+#~ msgstr "Todo junto"
+
+#~ msgid "Crm opportunity quotation"
+#~ msgstr "Presupuesto oportunidad CRM"
+
+#~ msgid "Opportunity Analytic"
+#~ msgstr "Oportunidad - Analítica"
+
+#~ msgid "Use this partner if there is no partner on the case"
+#~ msgstr "Utilizar esta empresa si no hay empresa asociada al caso"
+
+#~ msgid "Create"
+#~ msgstr "Crear"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Opportunity goes into the quotation"
+#~ msgstr "Oportunidad se convierte en presupuesto"
+
+#~ msgid "Analytic account"
+#~ msgstr "Cuenta analítica"
+
+#~ msgid "Convert opportunity to quotation"
+#~ msgstr "Convertir oportunidad en presupuesto"
+
+#~ msgid "Your action"
+#~ msgstr "Su acción"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Política de empaquetado"
+
+#~ msgid "Create Quote"
+#~ msgstr "Crear presupuesto"
+
+#~ msgid "Contract Volume (pricelist)"
+#~ msgstr "Volumen de contrato (tarifa)"
+
+#~ msgid "CRM Opportunity"
+#~ msgstr "Oportunidad CRM"
+
+#~ msgid "Opportunity convert into quotation"
+#~ msgstr "Convertir oportunidad en presupuesto"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
+#~ msgid "Opportunity Quotation"
+#~ msgstr "Oportunidad - Presupuesto"
+
+#~ msgid "Quotation"
+#~ msgstr "Presupuesto"
+
+#~ msgid "Check this to close the case after having created the sale order."
+#~ msgstr ""
+#~ "Marque esta opción para cerrar el caso después de haber creado el pedido de "
+#~ "venta."
+
+#~ msgid "Opporunity convert to the Pricelist"
+#~ msgstr "Convertir oportunidad a la tarifa"
+
+#~ msgid "User Responsible"
+#~ msgstr "Usuario responsable"
+
+#~ msgid "Reflect the contract made with customer"
+#~ msgstr "Reflejar el contrato hecho con el cliente"
+
+#~ msgid "Products"
+#~ msgstr "Productos"
+
+#~ msgid "Close Case"
+#~ msgstr "Cerrar caso"
+
+#~ msgid "Make Case"
+#~ msgstr "Realizar caso"
+
+#~ msgid "The CRM Opportunity can lead to a quotation."
+#~ msgstr "La oportunidad CRM puede convertirse a un presupuesto."
+
+#~ msgid "Opportunity Pricelist"
+#~ msgstr "Oportunidad - Tarifa"
+
+#~ msgid "Contract Pricelist"
+#~ msgstr "Tarifa contrato"
+
+#~ msgid "Case Description"
+#~ msgstr "Descripción del caso"
+
+#~ msgid "Analytic Account"
+#~ msgstr "Cuenta analítica"
+
+#~ msgid "Case Section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "Sale CRM Stuff"
+#~ msgstr "Herramientas CRM para ventas"
+
+#, python-format
+#~ msgid "is converted to Quotation."
+#~ msgstr "se ha convertido a presupuesto."
+
+#, python-format
+#~ msgid "Opportunity "
+#~ msgstr "Oportunidad "
diff --git a/addons/sale_crm/i18n/es_MX.po.moved b/addons/sale_crm/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..e834f299d4e
--- /dev/null
+++ b/addons/sale_crm/i18n/es_MX.po.moved
@@ -0,0 +1,167 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_crm
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-05 15:46+0000\n"
+"PO-Revision-Date: 2011-07-05 15: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: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
+#, python-format
+msgid "is converted to Quotation."
+msgstr "se ha convertido a presupuesto."
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "¡El cliente no tiene definidas direcciones!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "Crear ventas"
+
+#. module: sale_crm
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid "\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"This shortcut allows you to generate a sales order based on the selected case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and the\n"
+"crm modules.\n"
+"    "
+msgstr "\n"
+"Este módulo añade un acceso directo a uno o varios casos de oportunidades en el CRM.\n"
+"Este acceso directo le permite generar un pedido de venta a partir del caso seleccionado.\n"
+"Si están abiertos distintos casos (una lista), genera un pedido de venta por\n"
+"caso.\n"
+"El caso se cierra y es enlazado al pedido ventas generado.\n"
+"\n"
+"Le sugerimos que instale este módulo si ha instalado ambos módulos sale y crm.\n"
+"    "
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Crear"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid "Check this to close the opportunity after having created the sale order."
+msgstr "Marque esta opción para cerrar la oportunidad después de haber creado el pedido de venta."
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Converted to Sales Quotation(id: %s)."
+msgstr "Convertido a presupuesto de venta (id: %s)."
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
+#, python-format
+msgid "Opportunity "
+msgstr "Oportunidad "
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Oportunidad: %s"
+
+#. module: sale_crm
+#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
+msgid "Creates Sales order from Opportunity"
+msgstr "Crea pedido de venta desde oportunidad"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Cerrar oportunidad"
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Realizar un presupuesto"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
diff --git a/addons/sale_crm/i18n/es_VE.po b/addons/sale_crm/i18n/es_VE.po
new file mode 100644
index 00000000000..79767bad821
--- /dev/null
+++ b/addons/sale_crm/i18n/es_VE.po
@@ -0,0 +1,278 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_crm
+#
+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-12 15:43+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
+"Language-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:09+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "¡Datos insuficientes!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "¡El cliente no tiene definidas direcciones!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "Crear ventas"
+
+#. module: sale_crm
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and "
+"the\n"
+"crm modules.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo añade un acceso directo a uno o varios casos de oportunidades en "
+"el CRM.\n"
+"Este acceso directo le permite generar un pedido de venta a partir del caso "
+"seleccionado.\n"
+"Si están abiertos distintos casos (una lista), genera un pedido de venta "
+"por\n"
+"caso.\n"
+"El caso se cierra y es enlazado al pedido ventas generado.\n"
+"\n"
+"Le sugerimos que instale este módulo si ha instalado ambos módulos sale y "
+"crm.\n"
+"    "
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Crear"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+"Marque esta opción para cerrar la oportunidad después de haber creado el "
+"pedido de venta."
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Convertir a presupuesto"
+
+#. module: sale_crm
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Converted to Sales Quotation(id: %s)."
+msgstr "Convertido a presupuesto de venta (id: %s)."
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Oportunidad: %s"
+
+#. module: sale_crm
+#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
+msgid "Creates Sales order from Opportunity"
+msgstr "Crea pedido de venta desde oportunidad"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Cerrar oportunidad"
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de ventas"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Realizar un presupuesto"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#~ msgid "All at once"
+#~ msgstr "Todo junto"
+
+#~ msgid "Crm opportunity quotation"
+#~ msgstr "Presupuesto oportunidad CRM"
+
+#~ msgid "Opportunity Analytic"
+#~ msgstr "Oportunidad - Analítica"
+
+#~ msgid "Use this partner if there is no partner on the case"
+#~ msgstr "Utilizar esta empresa si no hay empresa asociada al caso"
+
+#~ msgid "Create"
+#~ msgstr "Crear"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Opportunity goes into the quotation"
+#~ msgstr "Oportunidad se convierte en presupuesto"
+
+#~ msgid "Analytic account"
+#~ msgstr "Cuenta analítica"
+
+#~ msgid "Convert opportunity to quotation"
+#~ msgstr "Convertir oportunidad en presupuesto"
+
+#~ msgid "Your action"
+#~ msgstr "Su acción"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Política de empaquetado"
+
+#~ msgid "Create Quote"
+#~ msgstr "Crear presupuesto"
+
+#~ msgid "Contract Volume (pricelist)"
+#~ msgstr "Volumen de contrato (tarifa)"
+
+#~ msgid "CRM Opportunity"
+#~ msgstr "Oportunidad CRM"
+
+#~ msgid "Opportunity convert into quotation"
+#~ msgstr "Convertir oportunidad en presupuesto"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
+#~ msgid "Opportunity Quotation"
+#~ msgstr "Oportunidad - Presupuesto"
+
+#~ msgid "Quotation"
+#~ msgstr "Presupuesto"
+
+#~ msgid "Check this to close the case after having created the sale order."
+#~ msgstr ""
+#~ "Marque esta opción para cerrar el caso después de haber creado el pedido de "
+#~ "venta."
+
+#~ msgid "Opporunity convert to the Pricelist"
+#~ msgstr "Convertir oportunidad a la tarifa"
+
+#~ msgid "User Responsible"
+#~ msgstr "Usuario responsable"
+
+#~ msgid "Reflect the contract made with customer"
+#~ msgstr "Reflejar el contrato hecho con el cliente"
+
+#~ msgid "Products"
+#~ msgstr "Productos"
+
+#~ msgid "Close Case"
+#~ msgstr "Cerrar caso"
+
+#~ msgid "Make Case"
+#~ msgstr "Realizar caso"
+
+#~ msgid "The CRM Opportunity can lead to a quotation."
+#~ msgstr "La oportunidad CRM puede convertirse a un presupuesto."
+
+#~ msgid "Opportunity Pricelist"
+#~ msgstr "Oportunidad - Tarifa"
+
+#~ msgid "Contract Pricelist"
+#~ msgstr "Tarifa contrato"
+
+#~ msgid "Case Description"
+#~ msgstr "Descripción del caso"
+
+#~ msgid "Analytic Account"
+#~ msgstr "Cuenta analítica"
+
+#~ msgid "Case Section"
+#~ msgstr "Sección del caso"
+
+#~ msgid "Sale CRM Stuff"
+#~ msgstr "Herramientas CRM para ventas"
+
+#, python-format
+#~ msgid "is converted to Quotation."
+#~ msgstr "se ha convertido a presupuesto."
+
+#, python-format
+#~ msgid "Opportunity "
+#~ msgstr "Oportunidad "
diff --git a/addons/sale_crm/i18n/et.po b/addons/sale_crm/i18n/et.po
index 15dc3d38b42..994fe60764d 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/fi.po b/addons/sale_crm/i18n/fi.po
index a42854f2c4a..9d4a797c1d8 100644
--- a/addons/sale_crm/i18n/fi.po
+++ b/addons/sale_crm/i18n/fi.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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Asiakas"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Muuta tarjoukseksi"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
@@ -37,18 +37,18 @@ msgstr ""
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Tieto on puutteellinen!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Asiakkaan osoitetta ei ole määritelty"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Suorita myynti"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -75,84 +75,94 @@ msgstr ""
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Tilauksen viite tulee olla yksilöllinen!"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
+"Valitse tämä sulkeaksesi myyntimahdollisuuden myyntitilauksen luonnin "
+"jälkeen."
 
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr ""
+msgstr "Muuta tarjoukseksi"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Kuukausittainen liikevaihto"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Muutettu myynnin tarjoukseksi (id: %s)."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Mahdollisuus: %s"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Luo myyntitilauksen myyntimahdollisuudesta"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Tarjoukset"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Myymälä"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Mahdollisuudet vaiheittain"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Omat tarjoukset"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Sulje mahdollisuus"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Myyntitiimi"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
-msgstr ""
+msgstr "Luo tarjous"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Myyntitilaus"
+
+#, python-format
+#~ msgid "is converted to Quotation."
+#~ msgstr "on muutettu tarjoukseksi."
+
+#, python-format
+#~ msgid "Opportunity "
+#~ msgstr "Mahdollisuus "
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index 0c4c4855909..ce39c2219d5 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-13 11:11+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-11-25 14:51+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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -31,7 +30,7 @@ msgstr "Convertir en devis"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "L'opportunité  '%s' a été convertie en devis."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
@@ -253,16 +252,10 @@ msgstr "Commande de ventes"
 #~ msgid "Analytic Account"
 #~ msgstr "Compte analytique"
 
-#~ msgid "Make sale"
-#~ msgstr "Créer une vente"
-
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Opportunité "
 
-#~ msgid "Sale Order"
-#~ msgstr "Commande de vente"
-
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "a été converti en devis."
diff --git a/addons/sale_crm/i18n/gl.po b/addons/sale_crm/i18n/gl.po
index d1ebabbbb0f..80b56e03755 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: 2011-05-10 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 12023a80609..9ad402a8321 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/hu.po b/addons/sale_crm/i18n/hu.po
index e46884d3873..a990589e170 100644
--- a/addons/sale_crm/i18n/hu.po
+++ b/addons/sale_crm/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-01 18:33+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/id.po b/addons/sale_crm/i18n/id.po
index 28f2fe5c360..237f9443cc9 100644
--- a/addons/sale_crm/i18n/id.po
+++ b/addons/sale_crm/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Customer"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Konversi ke Quotation"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
@@ -36,18 +36,18 @@ msgstr ""
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Data penuh !!!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Alamat Customer tidak ditemukan !"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Buat Sales"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -65,93 +65,115 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Modul ini menambahkan shortcut pada satu atau beberapa kesempatan kasus "
+"CRM.\n"
+"Cara pintas ini memungkinkan Anda untuk menghasilkan sales order berdasarkan "
+"kasus yang dipilih.\n"
+"Jika kasus yang berbeda terbuka (daftar), ia menghasilkan satu order dijual\n"
+"kasus.\n"
+"Kasus ini kemudian ditutup dan dihubungkan dengan sales order yang "
+"dihasilkan.\n"
+"\n"
+"Kami sarankan Anda untuk menginstal modul ini jika Anda menginstal keduanya "
+"baik sale dan\n"
+"crm modul.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "_Buat"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Referensi order harus unik !"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
-msgstr ""
+msgstr "Centang ini untuk menutup peluang setelah membuat order penjualan."
 
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr ""
+msgstr "Konversikan ke Quote"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Perputaran Bulanan"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Dikonversi menjadi Quotation Sales (id:%s)."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Kesempatan: %s"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Buat Sales Order dari Kesempatan"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Quotations"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Toko"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Kesempatan menurut tingkatan"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Quotation Saya"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Peluang yang paling dekat"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Team Sales"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
-msgstr ""
+msgstr "Buat Quotation"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Sales order"
+
+#, python-format
+#~ msgid "is converted to Quotation."
+#~ msgstr "ini sudah dikonversi ke Quotation"
+
+#, python-format
+#~ msgid "Opportunity "
+#~ msgstr "Kesempatan "
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 14718d860fc..19869274d53 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-04-25 10:56+0000\n"
-"Last-Translator: simone.sandri <Unknown>\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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/ko.po b/addons/sale_crm/i18n/ko.po
index 4e2d3502ab6..1c00e814cce 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/lt.po b/addons/sale_crm/i18n/lt.po
index 3a234161889..dbe209d0ab1 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/nl.po b/addons/sale_crm/i18n/nl.po
index 1c3c027dbc2..23a038628d3 100644
--- a/addons/sale_crm/i18n/nl.po
+++ b/addons/sale_crm/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/nl_BE.po b/addons/sale_crm/i18n/nl_BE.po
index 4f329c60393..02843adaf74 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index 71b4396c896..43eaa8ea004 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/pt.po b/addons/sale_crm/i18n/pt.po
index d2e2b311540..e04ce683068 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -253,27 +253,6 @@ msgstr ""
 #~ msgid "Case Section"
 #~ msgstr "Secção do Processo"
 
-#~ 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 "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid "Make sale"
-#~ msgstr "Fazer uma venda"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
-
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Oportunidade "
-
-#~ msgid "Sale Order"
-#~ msgstr "Ordem de venda"
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index fc6752c8cfb..63839a849b4 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -266,15 +266,6 @@ msgstr "Pedido de Venda"
 #~ msgid "Case Section"
 #~ msgstr "Seção Casos"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
 #, python-format
 #~ msgid "is converted to Quotation."
 #~ msgstr "está convertido em Cotação."
@@ -282,21 +273,6 @@ msgstr "Pedido de Venda"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para Arquitetura da View"
 
-#~ msgid "Make sale"
-#~ msgstr "Realizar a venda"
-
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Oportunidade "
-
-#~ msgid "Sale Order"
-#~ msgstr "Ordem de Venda"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/sale_crm/i18n/ro.po b/addons/sale_crm/i18n/ro.po
index 47a5402cb0a..d2a4478b68b 100644
--- a/addons/sale_crm/i18n/ro.po
+++ b/addons/sale_crm/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-24 18:39+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 668a15c7ad1..f66b6194654 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -253,30 +253,6 @@ msgstr "Заказ на продажу"
 #~ msgid "is converted to Quotation."
 #~ msgstr "преобразовано в предложение."
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Make sale"
-#~ msgstr "Продать"
-
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Сделка "
-
-#~ msgid "Sale Order"
-#~ msgstr "Заказ на продажу"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/sale_crm/i18n/sk.po b/addons/sale_crm/i18n/sk.po
index 953aef75cdb..5e81ce716c2 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/sl.po b/addons/sale_crm/i18n/sl.po
index a4b539516c5..d4ce768cbe9 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/sq.po b/addons/sale_crm/i18n/sq.po
index 29d31a7a432..a052ccdb3f8 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po
index 80f5d341585..7c69b8a0ab8 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/tlh.po b/addons/sale_crm/i18n/tlh.po
index 7af48151955..f4797f1119d 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index 5dc35cd00f3..07ca219efef 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: 2011-05-17 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -65,6 +65,16 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Bu modül, MİY de bir ya da birkaç fırsat durumuna kısayol ekler.\n"
+"Bu kısayol, seçilen duruma göre satış siparişi oluşturmanızı sağlar.\n"
+"Eğer farklı durumlar (bir liste) açıksa, duruma göre satış siparişi "
+"oluşturur.\n"
+"Sonra durumlar kpatılır ve oluşturulan satış siparişine bağlanır.\n"
+"\n"
+"Eğer hem satış hem de crm modüllerini kurduysanız bu modülü kurmanızı \n"
+"Öneririz.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
diff --git a/addons/sale_crm/i18n/uk.po b/addons/sale_crm/i18n/uk.po
index cd1cb455fc4..9d9ab9727fa 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/i18n/vi.po b/addons/sale_crm/i18n/vi.po
index 4e2f4fe301a..01d637c2f7b 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -164,6 +164,3 @@ msgstr ""
 #, python-format
 #~ msgid "Opportunity "
 #~ msgstr "Cơ hội "
-
-#~ msgid "Sale Order"
-#~ msgstr "Đơn hàng"
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index 2a7c196635b..609757c9438 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-08-03 06:06+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -24,7 +24,7 @@ msgstr "客户"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "转为报价单"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
@@ -36,18 +36,18 @@ msgstr ""
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "数据不够！"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "没有客户地址信息！"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "生成销售订单"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -65,22 +65,30 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"此模块在CRM中为一个或多个商机案例添加了快捷方式。\n"
+"这个快捷方式允许你为选中的商机生成销售订单。\n"
+"如果打开了不同的商机（列表）， 它会为每个商机生成一个销售订单。\n"
+"然后关闭商机，并且关联到生成的销售订单上。\n"
+"\n"
+"如果你已经安装了销售和CRM模块，我建议你安装此模块。\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "创建(_C)"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-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:crm.lead:0
@@ -91,29 +99,29 @@ msgstr "转为报价"
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "月营业额"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "转为销售报价(id: %s)。"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "商机： %s"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "通过商机生成销售订单"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "报价单"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -123,23 +131,23 @@ msgstr "商店"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "按阶段查看商机"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "我的报价单"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "关闭商机"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "销售团队"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -154,7 +162,7 @@ msgstr "取消"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
 
 #~ msgid "Quotation"
 #~ msgstr "报价"
@@ -251,3 +259,11 @@ msgstr ""
 
 #~ msgid "Case Section"
 #~ msgstr "业务个案项"
+
+#, python-format
+#~ msgid "is converted to Quotation."
+#~ msgstr "已经被转为报价单。"
+
+#, python-format
+#~ msgid "Opportunity "
+#~ msgstr "商机 "
diff --git a/addons/sale_crm/i18n/zh_TW.po b/addons/sale_crm/i18n/zh_TW.po
index 5d6e574b9f2..626d1729a19 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: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 2ba148416d5..a96892b990f 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -33,7 +33,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
-                <field name="date_order" position="after">
+                <field name="user_id" position="after">
                     <field name="section_id" widget="selection" string="Sales Team" groups="base.group_extended">
                         <filter icon="terp-personal+"
                                 domain="[('section_id.user_id','=',uid)]"
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 030a7567e57..ae0371a15e5 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -103,12 +103,13 @@ class crm_make_sale(osv.osv_memory):
                 }
                 if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
-                new_id = sale_obj.create(cr, uid, vals)
+                new_id = sale_obj.create(cr, uid, vals, context=context)
+                sale_order = sale_obj.browse(cr, uid, new_id, context=context)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
                 message = _("Opportunity  '%s' is converted to Quotation.") % (case.name)
                 self.log(cr, uid, case.id, message)
-                case_obj._history(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id))
+                case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(%s).") % (sale_order.name), context=context)
 
             if make.close:
                 case_obj.case_close(cr, uid, data)
@@ -148,8 +149,10 @@ class crm_make_sale(osv.osv_memory):
     }
     _defaults = {
          'shop_id': _get_shop_id,
-         'close': True,
+         'close': False,
          'partner_id': _selectPartner,
     }
 
 crm_make_sale()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
index b05803da6c6..2af863efc1b 100644
--- a/addons/sale_journal/__init__.py
+++ b/addons/sale_journal/__init__.py
@@ -21,3 +21,5 @@
 
 import sale_journal
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index c95b94da3ee..1cd2eef2d77 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Managing sales and deliveries by journal',
+    'name': 'Invoicing Journals',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals.
diff --git a/addons/sale_journal/i18n/ar.po b/addons/sale_journal/i18n/ar.po
index 04b90506ab2..0bc04abe51a 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index e404f856f4a..17d24654c55 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/bs.po b/addons/sale_journal/i18n/bs.po
index ce76d547c7a..64e2e8c1753 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ca.po b/addons/sale_journal/i18n/ca.po
index 1b99cdfed4b..ed0233b0cf5 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/cs.po b/addons/sale_journal/i18n/cs.po
index 04b90506ab2..0bc04abe51a 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/da.po b/addons/sale_journal/i18n/da.po
new file mode 100644
index 00000000000..2dd51da5b8e
--- /dev/null
+++ b/addons/sale_journal/i18n/da.po
@@ -0,0 +1,156 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-02 15:46+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: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr ""
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordre reference skal være unik"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Fakturering"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Salg og indkøb"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Noter"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Faktureringsmåde"
+
+#. module: sale_journal
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid ""
+"\n"
+"    The sales journal modules allows you to categorise your\n"
+"    sales and deliveries (picking lists) between different journals.\n"
+"    This module is very helpful for bigger companies that\n"
+"    works by departments.\n"
+"\n"
+"    You can use journal for different purposes, some examples:\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"    Journals have a responsible and evolves between different status:\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"    Batch operations can be processed on the different journals to\n"
+"    confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+"    It also supports batch invoicing methods that can be configured by\n"
+"    partners and sales orders, examples:\n"
+"    * daily invoicing,\n"
+"    * monthly invoicing, ...\n"
+"\n"
+"    Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Grupperet"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"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
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Fakturatype"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Kontakt"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: 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 "Fakturatyper"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Plukliste"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr ""
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 54ec9a66fff..3c746636eb0 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -438,38 +438,5 @@ msgstr "Verwaltung von Verkäufen und Lieferungen mittels Journale"
 #~ msgid "Approved sales"
 #~ msgstr "genehmigte Verkäufe"
 
-#~ msgid "Sale Order"
-#~ msgstr "Verkaufsauftrag"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können kein rekursives Menü anlegen"
-
-#~ msgid ""
-#~ "Invoice types are used on partners, sales order and delivery orders. You can "
-#~ "create journal to group your invoicing according to customer's needs: daily, "
-#~ "each wednesday, monthly, etc."
-#~ msgstr ""
-#~ "Rechnungstypen werden bei Partnern, Verkaufsaufträgen oder "
-#~ "Auslieferungsaufträgen verwendet. Sie können je nach Ihrem speziellen Bedarf "
-#~ "für die Fakturierung spezielle Journale zur Gruppierung bestimmter "
-#~ "Rechnungstypen einsetzen, z.B. für die Abrechnung zu bestimmten Stichtagen: "
-#~ "Tägliche Abrechnung, Abrechnung Monatsende, Wöchentliche Abrechnung etc."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the invoice "
-#~ "type without removing it."
-#~ msgstr ""
-#~ "Durch Aktivierung können Sie den Rechnungstyp einfach verbergen, ohne ihn zu "
-#~ "löschen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/sale_journal/i18n/el.po b/addons/sale_journal/i18n/el.po
index 1209a1902a2..e738920d320 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -154,6 +154,3 @@ msgstr "Λίστα Παραλαβής"
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
 msgstr ""
-
-#~ msgid "Sale Order"
-#~ msgstr "Παραγγελία Πώλησης"
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index 624c628f1d2..509078a1e4a 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -434,34 +434,3 @@ msgstr "Gestionar ventas y entregas por diario"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido venta"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the invoice "
-#~ "type without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el tipo de factura sin "
-#~ "eliminarlo."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "Invoice types are used on partners, sales order and delivery orders. You can "
-#~ "create journal to group your invoicing according to customer's needs: daily, "
-#~ "each wednesday, monthly, etc."
-#~ msgstr ""
-#~ "Los tipos de factura se utilizan en las empresas, los pedidos de ventas y "
-#~ "las órdenes de entrega. Puede crear un diario para agrupar su facturación "
-#~ "según las necesidades del cliente: cada día, cada miércoles, mensuales, ..."
diff --git a/addons/sale_journal/i18n/es_AR.po b/addons/sale_journal/i18n/es_AR.po
index 119c6dcffc7..6638e7f7b36 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/es_CL.po b/addons/sale_journal/i18n/es_CL.po
new file mode 100644
index 00000000000..4a90ab6c093
--- /dev/null
+++ b/addons/sale_journal/i18n/es_CL.po
@@ -0,0 +1,188 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-10-18 17:32+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: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "El tipo de diario utilizado para ventas y guías de despacho."
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Facturando"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas y Compras"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el tipo de factura sin "
+"eliminarlo."
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid ""
+"\n"
+"    The sales journal modules allows you to categorise your\n"
+"    sales and deliveries (picking lists) between different journals.\n"
+"    This module is very helpful for bigger companies that\n"
+"    works by departments.\n"
+"\n"
+"    You can use journal for different purposes, some examples:\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"    Journals have a responsible and evolves between different status:\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"    Batch operations can be processed on the different journals to\n"
+"    confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+"    It also supports batch invoicing methods that can be configured by\n"
+"    partners and sales orders, examples:\n"
+"    * daily invoicing,\n"
+"    * monthly invoicing, ...\n"
+"\n"
+"    Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de diario de ventas le permite categorizar sus ventas\n"
+"    y entregas (guías de despacho) en diferentes diarios.\n"
+"    Este módulo es muy útil para compañías grandes que\n"
+"    trabajan por departamentos.\n"
+"\n"
+"    Puede usar los diarios para diferentes propósitos, algunos ejemplos:\n"
+"    * aislar ventas de diferentes departamentos\n"
+"    * diarios para entregas según camión o compañía de envío\n"
+"\n"
+"    Los diarios tienen un responsable y evolucionan entre diferentes "
+"estados:\n"
+"    * borrador, abierto, cancelado, hecho.\n"
+"\n"
+"    Se pueden procesar operaciones en lote en los diferentes diarios\n"
+"    para confirmar todas las ventas a la vez, para validar o facturar "
+"albaranes, ...\n"
+"\n"
+"    También soporta métodos de facturación en lote que pueden ser "
+"configurados \n"
+"    según empresa o pedido de venta, ejemplos:\n"
+"    * facturación diaria,\n"
+"    * facturación mensual, ...\n"
+"\n"
+"    Se proporcionan algunas estadísticas por diario.\n"
+"    "
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "No agrupado"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"Los tipos de facturas son utilizados para las empresas, pedidos de venta y "
+"guías de despacho. Puede crear un diario de facturación específico para "
+"agrupar su facturación en función de las necesidades de sus clientes: "
+"diaria, cada miércoles, mensual, etc."
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venta"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Tipo de Factura"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Socio"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: 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 "Tipos de factura"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "LIsta de guías de despacho"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Gestionar ventas y entregas por diario"
diff --git a/addons/sale_journal/i18n/es_MX.po b/addons/sale_journal/i18n/es_MX.po
new file mode 100644
index 00000000000..0cfef946538
--- /dev/null
+++ b/addons/sale_journal/i18n/es_MX.po
@@ -0,0 +1,436 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_journal
+#
+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-13 09:28+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:26+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "El tipo de diario utilizado para ventas y albaranes."
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el tipo de factura sin "
+"eliminarlo."
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid ""
+"\n"
+"    The sales journal modules allows you to categorise your\n"
+"    sales and deliveries (picking lists) between different journals.\n"
+"    This module is very helpful for bigger companies that\n"
+"    works by departments.\n"
+"\n"
+"    You can use journal for different purposes, some examples:\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"    Journals have a responsible and evolves between different status:\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"    Batch operations can be processed on the different journals to\n"
+"    confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+"    It also supports batch invoicing methods that can be configured by\n"
+"    partners and sales orders, examples:\n"
+"    * daily invoicing,\n"
+"    * monthly invoicing, ...\n"
+"\n"
+"    Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de diario de ventas le permite categorizar sus ventas\n"
+"    y entregas (albaranes) en diferentes diarios.\n"
+"    Este módulo es muy útil para compañías grandes que\n"
+"    trabajan por departamentos.\n"
+"\n"
+"    Puede usar los diarios para diferentes propósitos, algunos ejemplos:\n"
+"    * aislar ventas de diferentes departamentos\n"
+"    * diarios para entregas según camión o compañía de envío\n"
+"\n"
+"    Los diarios tienen un responsable y evolucionan entre diferentes "
+"estados:\n"
+"    * borrador, abierto, cancelado, hecho.\n"
+"\n"
+"    Se pueden procesar operaciones en lote en los diferentes diarios\n"
+"    para confirmar todas las ventas a la vez, para validar o facturar "
+"albaranes, ...\n"
+"\n"
+"    También soporta métodos de facturación en lote que pueden ser "
+"configurados \n"
+"    según empresa o pedido de venta, ejemplos:\n"
+"    * facturación diaria,\n"
+"    * facturación mensual, ...\n"
+"\n"
+"    Se proporcionan algunas estadísticas por diario.\n"
+"    "
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "No agrupado"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"Los tipos de facturas son utilizados para las empresas, pedidos de venta y "
+"albaranes. Puede crear un diario de facturación específico para agrupar su "
+"facturación en función de las necesidades de sus clientes: diaria, cada "
+"miércoles, mensual, etc."
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Tipo de factura"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: 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 "Tipos de factura"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Gestionar ventas y entregas por diario"
+
+#~ msgid "Confirmed packing"
+#~ msgstr "Albarán confirmado"
+
+#~ msgid "Packing by journal"
+#~ msgstr "Albaranes por diario"
+
+#~ msgid "Packing"
+#~ msgstr "Albarán"
+
+#~ msgid "Packing to invoice"
+#~ msgstr "Albaranes a facturar"
+
+#~ msgid "Packing by journals"
+#~ msgstr "Albaranes por diario"
+
+#~ msgid "Packing by invoice method"
+#~ msgstr "Albaranes por método de facturación"
+
+#~ msgid "Monthly sales"
+#~ msgstr "Ventas mensuales"
+
+#~ msgid "assigned"
+#~ msgstr "Asignado"
+
+#~ msgid "Waiting Schedule"
+#~ msgstr "Esperando fecha planificada"
+
+#~ msgid "to be invoiced"
+#~ msgstr "Para ser facturado"
+
+#~ msgid "Sale Journal"
+#~ msgstr "Diario de ventas"
+
+#~ msgid "Sale Stats"
+#~ msgstr "Estadísticas de ventas"
+
+#~ msgid "waiting"
+#~ msgstr "En espera"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Cambiar a borrador"
+
+#~ msgid "Journal date"
+#~ msgstr "Fecha del diario"
+
+#~ msgid "My open journals"
+#~ msgstr "Mis diarios abiertos"
+
+#~ msgid "# of Lines"
+#~ msgstr "# de líneas"
+
+#~ msgid "All Open Journals"
+#~ msgstr "Todos los diarios abiertos"
+
+#~ msgid "done"
+#~ msgstr "hecho"
+
+#~ msgid "Average Price"
+#~ msgstr "Precio medio"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "All Months"
+#~ msgstr "Todos los meses"
+
+#~ msgid "Total Price"
+#~ msgstr "Precio total"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "My open packing journals"
+#~ msgstr "Mis diarios de albaranes abiertos"
+
+#~ msgid "Sales Orders by Journal"
+#~ msgstr "Pedidos de ventas por diario"
+
+#~ msgid "Open journals"
+#~ msgstr "Abrir diarios"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "Sales by journal (this month)"
+#~ msgstr "Ventas por diario (este mes)"
+
+#~ msgid "Manual in progress"
+#~ msgstr "Manual en proceso"
+
+#~ msgid "In progress"
+#~ msgstr "En proceso"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Invoice state"
+#~ msgstr "Estado de la factura"
+
+#~ msgid "Order State"
+#~ msgstr "Estado del pedido"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepción de envío"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "cancel"
+#~ msgstr "Cancelado"
+
+#~ msgid "Invoice Exception"
+#~ msgstr "Excepción de factura"
+
+#~ msgid "Validation date"
+#~ msgstr "Fecha de validación"
+
+#~ msgid "draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Quotation"
+#~ msgstr "Presupuesto"
+
+#~ msgid "Sales Journals"
+#~ msgstr "Diario de ventas"
+
+#~ msgid "sale_journal.invoice.type.tree"
+#~ msgstr "diario_venta.factura.tipo.árbol"
+
+#~ msgid "Creation date"
+#~ msgstr "Fecha creación"
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid "Open Journal"
+#~ msgstr "Abrir diario"
+
+#~ msgid "Sales"
+#~ msgstr "Ventas"
+
+#~ msgid "Packing Journal"
+#~ msgstr "Diario de albaranes"
+
+#~ msgid "Done"
+#~ msgstr "Realizado"
+
+#~ msgid "Journal Stats"
+#~ msgstr "Estadísticas de diarios"
+
+#~ msgid "Open"
+#~ msgstr "Abierto"
+
+#~ 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 "Responsible"
+#~ msgstr "Responsable"
+
+#~ msgid "My Open Journals"
+#~ msgstr "Mis diarios abiertos"
+
+#~ msgid "Cancel Sales"
+#~ msgstr "Cancelar ventas"
+
+#~ msgid "invoiced"
+#~ msgstr "Facturado"
+
+#~ msgid "confirmed"
+#~ msgstr "Confirmado"
+
+#~ msgid "Packing lists by Journal"
+#~ msgstr "Listas de albaranes por diario"
+
+#~ msgid "Quantities"
+#~ msgstr "Cantidades"
+
+#~ msgid "Journal"
+#~ msgstr "Diario"
+
+#~ msgid "This Month"
+#~ msgstr "Este mes"
+
+#~ msgid "Sales by Journal"
+#~ msgstr "Ventas por diario"
+
+#~ msgid "Invoicing Methods"
+#~ msgstr "Métodos de facturación"
+
+#~ msgid "Journal Information"
+#~ msgstr "Información del diario"
+
+#~ msgid "States"
+#~ msgstr "Estados"
+
+#~ msgid "Close Journal"
+#~ msgstr "Cerrar diario"
+
+#~ msgid "Approved sales"
+#~ msgstr "Ventas aprobadas"
+
+#~ msgid "Assigned packing"
+#~ msgstr "Albarán asignado"
+
+#~ msgid "Packing by Invoice Method"
+#~ msgstr "Albaranes por método de facturación"
+
+#~ msgid "Packing Journals"
+#~ msgstr "Diarios de albaranes"
+
+#~ msgid "Packing journals"
+#~ msgstr "Diarios de albaranes"
+
+#~ msgid "Cancel Packing"
+#~ msgstr "Cancelar albarán"
+
+#~ msgid "The type of journal used for sales and packing."
+#~ msgstr "Tipo de diario utilizado para ventas y albaranes."
+
+#~ msgid "Draft sales"
+#~ msgstr "Ventas borrador"
+
+#~ msgid "Confirm Sales"
+#~ msgstr "Confirmar ventas"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelado"
+
+#~ msgid "Statistics on packing to invoice"
+#~ msgstr "Estadísticas de albaranes a facturar"
+
+#~ msgid "Packing by Journal"
+#~ msgstr "Albaranes por diario"
+
+#~ msgid "Stats on packing by invoice method"
+#~ msgstr "Estadísticas de albaranes por método de facturación"
+
+#~ msgid "Packing to Invoice"
+#~ msgstr "Albaranes a facturar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/sale_journal/i18n/es_VE.po b/addons/sale_journal/i18n/es_VE.po
new file mode 100644
index 00000000000..0cfef946538
--- /dev/null
+++ b/addons/sale_journal/i18n/es_VE.po
@@ -0,0 +1,436 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_journal
+#
+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-13 09:28+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:26+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "El tipo de diario utilizado para ventas y albaranes."
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el tipo de factura sin "
+"eliminarlo."
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid ""
+"\n"
+"    The sales journal modules allows you to categorise your\n"
+"    sales and deliveries (picking lists) between different journals.\n"
+"    This module is very helpful for bigger companies that\n"
+"    works by departments.\n"
+"\n"
+"    You can use journal for different purposes, some examples:\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"    Journals have a responsible and evolves between different status:\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"    Batch operations can be processed on the different journals to\n"
+"    confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+"    It also supports batch invoicing methods that can be configured by\n"
+"    partners and sales orders, examples:\n"
+"    * daily invoicing,\n"
+"    * monthly invoicing, ...\n"
+"\n"
+"    Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de diario de ventas le permite categorizar sus ventas\n"
+"    y entregas (albaranes) en diferentes diarios.\n"
+"    Este módulo es muy útil para compañías grandes que\n"
+"    trabajan por departamentos.\n"
+"\n"
+"    Puede usar los diarios para diferentes propósitos, algunos ejemplos:\n"
+"    * aislar ventas de diferentes departamentos\n"
+"    * diarios para entregas según camión o compañía de envío\n"
+"\n"
+"    Los diarios tienen un responsable y evolucionan entre diferentes "
+"estados:\n"
+"    * borrador, abierto, cancelado, hecho.\n"
+"\n"
+"    Se pueden procesar operaciones en lote en los diferentes diarios\n"
+"    para confirmar todas las ventas a la vez, para validar o facturar "
+"albaranes, ...\n"
+"\n"
+"    También soporta métodos de facturación en lote que pueden ser "
+"configurados \n"
+"    según empresa o pedido de venta, ejemplos:\n"
+"    * facturación diaria,\n"
+"    * facturación mensual, ...\n"
+"\n"
+"    Se proporcionan algunas estadísticas por diario.\n"
+"    "
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "No agrupado"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"Los tipos de facturas son utilizados para las empresas, pedidos de venta y "
+"albaranes. Puede crear un diario de facturación específico para agrupar su "
+"facturación en función de las necesidades de sus clientes: diaria, cada "
+"miércoles, mensual, etc."
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Tipo de factura"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: 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 "Tipos de factura"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Gestionar ventas y entregas por diario"
+
+#~ msgid "Confirmed packing"
+#~ msgstr "Albarán confirmado"
+
+#~ msgid "Packing by journal"
+#~ msgstr "Albaranes por diario"
+
+#~ msgid "Packing"
+#~ msgstr "Albarán"
+
+#~ msgid "Packing to invoice"
+#~ msgstr "Albaranes a facturar"
+
+#~ msgid "Packing by journals"
+#~ msgstr "Albaranes por diario"
+
+#~ msgid "Packing by invoice method"
+#~ msgstr "Albaranes por método de facturación"
+
+#~ msgid "Monthly sales"
+#~ msgstr "Ventas mensuales"
+
+#~ msgid "assigned"
+#~ msgstr "Asignado"
+
+#~ msgid "Waiting Schedule"
+#~ msgstr "Esperando fecha planificada"
+
+#~ msgid "to be invoiced"
+#~ msgstr "Para ser facturado"
+
+#~ msgid "Sale Journal"
+#~ msgstr "Diario de ventas"
+
+#~ msgid "Sale Stats"
+#~ msgstr "Estadísticas de ventas"
+
+#~ msgid "waiting"
+#~ msgstr "En espera"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Cambiar a borrador"
+
+#~ msgid "Journal date"
+#~ msgstr "Fecha del diario"
+
+#~ msgid "My open journals"
+#~ msgstr "Mis diarios abiertos"
+
+#~ msgid "# of Lines"
+#~ msgstr "# de líneas"
+
+#~ msgid "All Open Journals"
+#~ msgstr "Todos los diarios abiertos"
+
+#~ msgid "done"
+#~ msgstr "hecho"
+
+#~ msgid "Average Price"
+#~ msgstr "Precio medio"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "All Months"
+#~ msgstr "Todos los meses"
+
+#~ msgid "Total Price"
+#~ msgstr "Precio total"
+
+#~ msgid "Reporting"
+#~ msgstr "Informe"
+
+#~ msgid "My open packing journals"
+#~ msgstr "Mis diarios de albaranes abiertos"
+
+#~ msgid "Sales Orders by Journal"
+#~ msgstr "Pedidos de ventas por diario"
+
+#~ msgid "Open journals"
+#~ msgstr "Abrir diarios"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "Sales by journal (this month)"
+#~ msgstr "Ventas por diario (este mes)"
+
+#~ msgid "Manual in progress"
+#~ msgstr "Manual en proceso"
+
+#~ msgid "In progress"
+#~ msgstr "En proceso"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Invoice state"
+#~ msgstr "Estado de la factura"
+
+#~ msgid "Order State"
+#~ msgstr "Estado del pedido"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepción de envío"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "cancel"
+#~ msgstr "Cancelado"
+
+#~ msgid "Invoice Exception"
+#~ msgstr "Excepción de factura"
+
+#~ msgid "Validation date"
+#~ msgstr "Fecha de validación"
+
+#~ msgid "draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Quotation"
+#~ msgstr "Presupuesto"
+
+#~ msgid "Sales Journals"
+#~ msgstr "Diario de ventas"
+
+#~ msgid "sale_journal.invoice.type.tree"
+#~ msgstr "diario_venta.factura.tipo.árbol"
+
+#~ msgid "Creation date"
+#~ msgstr "Fecha creación"
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid "Open Journal"
+#~ msgstr "Abrir diario"
+
+#~ msgid "Sales"
+#~ msgstr "Ventas"
+
+#~ msgid "Packing Journal"
+#~ msgstr "Diario de albaranes"
+
+#~ msgid "Done"
+#~ msgstr "Realizado"
+
+#~ msgid "Journal Stats"
+#~ msgstr "Estadísticas de diarios"
+
+#~ msgid "Open"
+#~ msgstr "Abierto"
+
+#~ 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 "Responsible"
+#~ msgstr "Responsable"
+
+#~ msgid "My Open Journals"
+#~ msgstr "Mis diarios abiertos"
+
+#~ msgid "Cancel Sales"
+#~ msgstr "Cancelar ventas"
+
+#~ msgid "invoiced"
+#~ msgstr "Facturado"
+
+#~ msgid "confirmed"
+#~ msgstr "Confirmado"
+
+#~ msgid "Packing lists by Journal"
+#~ msgstr "Listas de albaranes por diario"
+
+#~ msgid "Quantities"
+#~ msgstr "Cantidades"
+
+#~ msgid "Journal"
+#~ msgstr "Diario"
+
+#~ msgid "This Month"
+#~ msgstr "Este mes"
+
+#~ msgid "Sales by Journal"
+#~ msgstr "Ventas por diario"
+
+#~ msgid "Invoicing Methods"
+#~ msgstr "Métodos de facturación"
+
+#~ msgid "Journal Information"
+#~ msgstr "Información del diario"
+
+#~ msgid "States"
+#~ msgstr "Estados"
+
+#~ msgid "Close Journal"
+#~ msgstr "Cerrar diario"
+
+#~ msgid "Approved sales"
+#~ msgstr "Ventas aprobadas"
+
+#~ msgid "Assigned packing"
+#~ msgstr "Albarán asignado"
+
+#~ msgid "Packing by Invoice Method"
+#~ msgstr "Albaranes por método de facturación"
+
+#~ msgid "Packing Journals"
+#~ msgstr "Diarios de albaranes"
+
+#~ msgid "Packing journals"
+#~ msgstr "Diarios de albaranes"
+
+#~ msgid "Cancel Packing"
+#~ msgstr "Cancelar albarán"
+
+#~ msgid "The type of journal used for sales and packing."
+#~ msgstr "Tipo de diario utilizado para ventas y albaranes."
+
+#~ msgid "Draft sales"
+#~ msgstr "Ventas borrador"
+
+#~ msgid "Confirm Sales"
+#~ msgstr "Confirmar ventas"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelado"
+
+#~ msgid "Statistics on packing to invoice"
+#~ msgstr "Estadísticas de albaranes a facturar"
+
+#~ msgid "Packing by Journal"
+#~ msgstr "Albaranes por diario"
+
+#~ msgid "Stats on packing by invoice method"
+#~ msgstr "Estadísticas de albaranes por método de facturación"
+
+#~ msgid "Packing to Invoice"
+#~ msgstr "Albaranes a facturar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/sale_journal/i18n/et.po b/addons/sale_journal/i18n/et.po
index ba368e5a138..5a979fec5a6 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/fi.po b/addons/sale_journal/i18n/fi.po
index e188449bf4f..bc611f0f0ea 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index 51b0351af86..2e7e2753931 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -380,16 +380,3 @@ msgstr "Gestion des ventes et des livraisons par journal"
 
 #~ msgid "Approved sales"
 #~ msgstr "Ventes Approuvées"
-
-#~ msgid ""
-#~ "Invoice types are used on partners, sales order and delivery orders. You can "
-#~ "create journal to group your invoicing according to customer's needs: daily, "
-#~ "each wednesday, monthly, etc."
-#~ msgstr ""
-#~ "Les types de factures sont utilisés sur les partenaires, les commandes de "
-#~ "vente et les ordres de livraison. Vous pouvez créer un journal pour grouper "
-#~ "vos facturations en fonction des besoins des clients: journalier, chaque "
-#~ "mercredi, mensuel, etc."
-
-#~ msgid "Sale Order"
-#~ msgstr "Commande de vente"
diff --git a/addons/sale_journal/i18n/gl.po b/addons/sale_journal/i18n/gl.po
index 1389837157f..c16d134ff4e 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: 2011-05-10 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index 922f48d64a8..cca79e1562a 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/hu.po b/addons/sale_journal/i18n/hu.po
index 9a955165783..9254b685462 100644
--- a/addons/sale_journal/i18n/hu.po
+++ b/addons/sale_journal/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-01 21:02+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/id.po b/addons/sale_journal/i18n/id.po
index 0d048515fb6..1fb3d4e4c5d 100644
--- a/addons/sale_journal/i18n/id.po
+++ b/addons/sale_journal/i18n/id.po
@@ -13,33 +13,33 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 msgid "Note"
-msgstr ""
+msgstr "Catatan"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
-msgstr ""
+msgstr "Tipe jurnal yang digunakan untuk sales dan picking"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Referensi order harus unik !"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Invoicing"
-msgstr ""
+msgstr "invoicing"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Sales & Purchases"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -47,16 +47,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
+"Jika kolom aktif diatur ke False, itu akan memungkinkan Anda untuk "
+"menyembunyikan jenis faktur tanpa menghapusnya."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr ""
+msgstr "Meotode Invoicing"
 
 #. module: sale_journal
 #: model:ir.module.module,description:sale_journal.module_meta_information
@@ -85,21 +87,48 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul sales jurnal memungkinkan Anda untuk mengkategorikan Anda\n"
+"sales dan pengiriman (daftar pengambilan) antara jurnal yang berbeda.\n"
+"Modul ini sangat membantu bagi perusahaan yang lebih besar yang\n"
+"bekerja dengan departemen.\n"
+"\n"
+"Dapat menggunakan jurnal untuk tujuan yang berbeda, beberapa contoh:\n"
+"* mengisolasi penjualan berbagai departemen\n"
+"* jurnal untuk pengiriman dengan truk atau dengan UPS\n"
+"\n"
+"Jurnal memiliki bertanggung jawab dan berkembang antara status yang "
+"berbeda:\n"
+"* draft, terbuka, membatalkan, dilakukan.\n"
+"\n"
+"Batch operasi dapat diproses pada jurnal yang berbeda untuk\n"
+"pastikan semua penjualan sekaligus, untuk memvalidasi atau pengemasan "
+"faktur, ...\n"
+"\n"
+"Ini juga mendukung metode faktur batch yang dapat dikonfigurasi oleh\n"
+"mitra dan pesanan penjualan, contoh:\n"
+"* invoicing harian,\n"
+"* invoicing bulanan, ...\n"
+"\n"
+"Beberapa statistik oleh jurnal disediakan.\n"
+"\n"
+"modul: sale_journal\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr ""
+msgstr "Tidak dikelompokan"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Dikelompokan"
 
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! Anda tidak dapat membuat anggota terkait secara terus menerus"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -108,16 +137,19 @@ msgid ""
 "can create a specific invoicing journal to group your invoicing according to "
 "your customer's needs: daily, each Wednesday, monthly, etc."
 msgstr ""
+"Jenis invoice digunakan untuk partner, order sales dan order pengiriman. "
+"Anda dapat membuat jurnal invoicing khusus untuk grup invoicing Anda sesuai "
+"dengan kebutuhan pelanggan Anda: harian, setiap Rabu, bulanan, dll"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 msgid "Invoicing method"
-msgstr ""
+msgstr "Metoda invoicing"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Sales order"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -125,34 +157,34 @@ msgstr ""
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr ""
+msgstr "Tipe Invoice"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktif"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Rekanan"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
 #: 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 ""
+msgstr "Jenis Invoice"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Daftar pengambilan"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr ""
+msgstr "Mengelola sales dan pengiriman berdasarkan jurnal"
 
 #~ msgid "All Months"
 #~ msgstr "Semua Bulan"
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index 46dd0771a05..5e46ddfea76 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ko.po b/addons/sale_journal/i18n/ko.po
index 61b32eeb0ca..33c2e903d72 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/lt.po b/addons/sale_journal/i18n/lt.po
index 04b90506ab2..0bc04abe51a 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/mn.po b/addons/sale_journal/i18n/mn.po
index ba8aae036ab..b43b7873990 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -157,16 +157,3 @@ msgstr "Агуулахын баримт"
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
 msgstr ""
-
-#~ msgid ""
-#~ "Invoice types are used on partners, sales order and delivery orders. You can "
-#~ "create journal to group your invoicing according to customer's needs: daily, "
-#~ "each wednesday, monthly, etc."
-#~ msgstr ""
-#~ "Нэхэмжлэлийн төрлүүд нь түншүүд, борлуулалтын захиалга ба хүргэлтийн "
-#~ "захиалгад ашиглагдана. Үйлчлүүлэгчийн шаардлагын дагуу нэхэмжлэлээ бүлэглэх "
-#~ "бүртгэлийг үүсгэх боломжтой. Үүнд: өдөр бүрээр, лхагва гараг бүр, сар бүр "
-#~ "г.м."
-
-#~ msgid "Sale Order"
-#~ msgstr "Борлуулалтын захиалга"
diff --git a/addons/sale_journal/i18n/nl.po b/addons/sale_journal/i18n/nl.po
index 156445d55f9..bfa7db9dc47 100644
--- a/addons/sale_journal/i18n/nl.po
+++ b/addons/sale_journal/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/nl_BE.po b/addons/sale_journal/i18n/nl_BE.po
index 363644ea015..983aab79f90 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 104c97cb88c..96d1c1d7a69 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index fc1172cb458..e4d7ef6f137 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -402,25 +402,3 @@ msgstr "Gestão de vendas e entregas por diário"
 
 #~ msgid "Packing to Invoice"
 #~ msgstr "Embalagem para Facturar"
-
-#~ msgid "Sale Order"
-#~ msgstr "Ordem de Venda"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the invoice "
-#~ "type without removing it."
-#~ msgstr ""
-#~ "Se o campo \"ativo\" estiver selecionado, permitir-lhe-á esconder o tipo de "
-#~ "fatura sem ter de o remover"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index 33204ff1977..ce5b1a11769 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ro.po b/addons/sale_journal/i18n/ro.po
index 6750bc6beda..dec885f21f7 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index d5ce8d39ccb..7639081db0e 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -87,6 +87,30 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    Модуль журналов продаж позволяет вам распределять\n"
+"    продажи и отгрузки (отборочные листы) по различным журналам.\n"
+"    Этот модуль очень полезен для больших компаний, которые \n"
+"    работают по отделам.\n"
+"\n"
+"    Вы можете использовать журнал для различных целей, например:\n"
+"    * изоляция продаж разных отделов\n"
+"    * журналы для доставки автотранспортом или почтой\n"
+"\n"
+"    Журнал имеет ответственного и может изменять свой статус:\n"
+"    * черновик, открыт, отменен, сделано.\n"
+"\n"
+"    Пакетные операции могут быть применены к различным журналам\n"
+"    для подтверждения всех продаж за раз, для утверждения или\n"
+"    выставления счета на упаковку, ...\n"
+"\n"
+"    Они также поддерживают пакетное выставление счетов, которые могут \n"
+"    быть настроены на партнеров и заказы, например:\n"
+"    * ежедневное выставление счетов,\n"
+"    * ежемесячное выставление счетов, ...\n"
+"\n"
+"    По журналам предоставляются статистические данные.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -336,25 +360,3 @@ msgstr "Управление продажами и доставками по ж
 
 #~ msgid "Open Journal"
 #~ msgstr "Открыть журнал"
-
-#~ msgid "Sale Order"
-#~ msgstr "Заказ на продажу"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the invoice "
-#~ "type without removing it."
-#~ msgstr ""
-#~ "если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
-#~ "тип счета без его удаления."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/sale_journal/i18n/sk.po b/addons/sale_journal/i18n/sk.po
index 2363466de92..5b980522ac6 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/sl.po b/addons/sale_journal/i18n/sl.po
index eb4dc501d2d..8e94d473037 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/sq.po b/addons/sale_journal/i18n/sq.po
index 2b94d83e70c..8230afecc7d 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index 7f839f28c82..6fae49235ed 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -159,6 +159,9 @@ msgstr "Managing sales and deliveries by journal"
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
+#~ msgid "Reporting"
+#~ msgstr "Rapportering"
+
 #~ msgid "Sale Stats"
 #~ msgstr "Försäljningsstatistik"
 
diff --git a/addons/sale_journal/i18n/tlh.po b/addons/sale_journal/i18n/tlh.po
index 36a401895d5..9b9f12c79ae 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 2c0463d5309..520269a875d 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -87,6 +87,30 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    Satış Yevmiyesi Modülü, farklı yevmiyelerdeki satış ve teslimatlarınızı\n"
+"    (toplama listeleri) sınıflandırmanızı sağlar.\n"
+"    Bu modül bölümlerce çalışan büyük firmalar\n"
+"    için çok yararlıdır.\n"
+"\n"
+"    Yevmiyeyi farklı amaçlar için kullanabilirsiniz, örneğin:\n"
+"    * farklı bölümlerin satışlarını ayırma\n"
+"    * kamyon ile ya da UPS (kargo) ile yapılan sevkiyat yevmiyeleri\n"
+"\n"
+"    yevmiyelerin bir sorumlusu vrdır ve farklı durumlara göre değişir:\n"
+"    * taslak, aç, vazgeç, bitti.\n"
+"\n"
+"    Tüm satışların bir seferde onaylanması, paketlemeyi doğrulamak ya da \n"
+"    faturalandırmak, ... için farklı yevmiyelere toplu işlemler "
+"uygulanabilir.\n"
+"\n"
+"    Paydaşlara, satış siparişlerine göre yapılandırılabilen toplu\n"
+"    faturalandırma yöntemlerini destekler, örnekler:\n"
+"    * günlük faturalandırma,\n"
+"    * aylık faturalandırma, ...\n"
+"\n"
+"    Yevmiyelere göre bazı istatistikler elde edilir.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -101,7 +125,7 @@ msgstr "Gruplanmış"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Hata! Yinelemeli üyeler oluşturamazsınız."
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -157,7 +181,7 @@ msgstr "Paketleme Listesi"
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr ""
+msgstr "Yevmiyelere göre satış ve teslimat yönetimi"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/sale_journal/i18n/uk.po b/addons/sale_journal/i18n/uk.po
index 5590da844d1..ce6119d62b9 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/i18n/vi.po b/addons/sale_journal/i18n/vi.po
index 47dd2e2dcf3..ee1a8a37e84 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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -154,6 +154,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
 msgstr ""
-
-#~ msgid "Sale Order"
-#~ msgstr "Đơn hàng"
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index ddf5343a08b..3658ddce082 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -24,7 +24,7 @@ msgstr "备注"
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
-msgstr ""
+msgstr "用于销售和拣货的账簿类型。"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
@@ -46,7 +46,7 @@ msgstr "销售&采购"
 msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
-msgstr ""
+msgstr "如果设置active为False，你可以隐藏发票类型，不用删除它。"
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -85,6 +85,25 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    销售账簿模块允许你对你的销售订单和发货订单（拣货单）的账簿进行分类。\n"
+"    这个模块对按部门核算的大公司非常有用。\n"
+"\n"
+"    你可以把账簿用于不同的目的，比如：\n"
+"    *不同部门的独立销售\n"
+"    *按卡车或UPS发货的账簿\n"
+"\n"
+"    账簿可以在不同的状态之间进行转换：\n"
+"    *草稿，启动，取消，已完成。\n"
+"\n"
+"    可以在不同的账簿上执行批量的操作，以确认所有销售订单，验证或装箱开票，...\n"
+"\n"
+"    它也支持批量开票方式， 可以按业务伙伴或销售订单配置，比如：\n"
+"    *每天开票。\n"
+"    *每月开票，...\n"
+"\n"
+"    同时提供了按账簿的一些统计。\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -94,12 +113,12 @@ msgstr "没分组"
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr "组"
+msgstr "已分组"
 
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+msgstr "错误！您不能创建递归的协会会员。"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -107,7 +126,7 @@ msgid ""
 "Invoice types are used for partners, sales orders and delivery orders. You "
 "can create a specific invoicing journal to group your invoicing according to "
 "your customer's needs: daily, each Wednesday, monthly, etc."
-msgstr ""
+msgstr "发票类型对业务伙伴，销售订单和发货订单是有用的。你可以根据用户的需要生成专门的发票账簿来对你的发票进行分组：每天，每周三，每周，每月等。"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
@@ -147,12 +166,12 @@ msgstr "发票类型"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
 msgid "Picking List"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr "管理销售和送货分类帐"
+msgstr "管理销售和送货的账簿"
 
 #~ msgid "Set to Draft"
 #~ msgstr "设为草稿"
@@ -286,54 +305,6 @@ msgstr "管理销售和送货分类帐"
 #~ msgid "Packing journals"
 #~ msgstr "包装分类帐"
 
-#~ msgid ""
-#~ "\n"
-#~ "    The sale journal modules allows you to categorise your\n"
-#~ "    sales and deliveries (packing lists) between different journals.\n"
-#~ "    This module is very helpful for bigger companies that\n"
-#~ "    works by departments.\n"
-#~ "\n"
-#~ "    You can use journal for different purposes, some examples:\n"
-#~ "    * isolate sales of different departments\n"
-#~ "    * journals for deliveries by truck or by UPS\n"
-#~ "\n"
-#~ "    Journals have a responsible and evolves between different status:\n"
-#~ "    * draft, open, cancel, done.\n"
-#~ "\n"
-#~ "    Batch operations can be processed on the different journals to\n"
-#~ "    confirm all sales at once, to validate or invoice packing, ...\n"
-#~ "\n"
-#~ "    It also supports batch invoicing methods that can be configured by\n"
-#~ "    partners and sales orders, examples:\n"
-#~ "    * daily invoicing,\n"
-#~ "    * monthly invoicing, ...\n"
-#~ "\n"
-#~ "    Some statistics by journals are provided.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这销售分类帐模块,允许你在不同的分类帐中分类出\n"
-#~ "你的销售和送货(包装单)\n"
-#~ "\t这模块对大公司的\n"
-#~ "工作部门是非常有帮助的\n"
-#~ "\n"
-#~ "\t你能使用分类帐达到不同目的的,如:\n"
-#~ "\t*分开不同部门的销售\n"
-#~ "\t*跟踪用快递送货分类帐\n"
-#~ "\t\n"
-#~ "\t分类帐有不同的状态下:\n"
-#~ "              草稿,待处理,取消,完成\n"
-#~ "\t\n"
-#~ "在不同的分类帐批处理\n"
-#~ "一次确认所有销售，使生效或者发票,包装。。\n"
-#~ "\n"
-#~ "\t它还支持配置业务伙伴和销售订单的开票方式如:\n"
-#~ "        *每日开票\n"
-#~ "        *每月开票\n"
-#~ "\t\n"
-#~ "\t提供在一个会计期间的分类帐统计\n"
-#~ "    "
-
 #~ msgid "Reporting"
 #~ msgstr "内部报表"
 
diff --git a/addons/sale_journal/i18n/zh_TW.po b/addons/sale_journal/i18n/zh_TW.po
index e9afae38b0d..ed7d5565337 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: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 136e7d68198..edae822e832 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -47,10 +47,10 @@ class res_partner(osv.osv):
             'sale_journal.invoice.type',
             type = 'many2one',
             relation = 'sale_journal.invoice.type',
-            string = "Invoicing Method",
+            string = "Invoicing Type",
             view_load = True,
             group_name = "Accounting Properties",
-            help = "The type of journal used for sales and picking."),
+            help = "This invoicing type will be used, by default, for invoicing the current partner."),
     }
 res_partner()
 
@@ -85,3 +85,5 @@ class sale(osv.osv):
         return result
 
 sale()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index 8f9005e50a0..b3d033fed44 100644
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name" : "Sale Order Layout",
+    "name" : "Sales Orders Print Layout",
     "version" : "1.0",
     "images" : ["images/sale_layout.jpeg"],
     "depends" : ["sale", "account_invoice_layout"],
@@ -36,7 +36,7 @@ It gives you the possibility to
 
     """,
     "website" : "http://www.openerp.com",
-    "category" : "Sales",
+    "category" : "Sales Management",
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
diff --git a/addons/sale_layout/i18n/bg.po b/addons/sale_layout/i18n/bg.po
index 0c6532a0301..a547c4e5a1d 100644
--- a/addons/sale_layout/i18n/bg.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/ca.po b/addons/sale_layout/i18n/ca.po
index cc7b7c4ded1..b680b3acbbe 100644
--- a/addons/sale_layout/i18n/ca.po
+++ b/addons/sale_layout/i18n/ca.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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: sale_layout
 #: model:ir.module.module,description:sale_layout.module_meta_information
@@ -35,258 +35,268 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul proporciona funcionalitats per millorar la plantilla de la "
+"comanda de vendes.\n"
+"\n"
+"    Proporciona la possibilitat de\n"
+"        * ordenar totes les línies d'una comanda de vendes\n"
+"        * afegir títols, línies de comentari, línies amb subtotals\n"
+"        * dibuixar línies horitzontals i posar salts de pàgina\n"
+"\n"
+"    "
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Title"
-msgstr ""
+msgstr "Tí­tol"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Desc. (%)"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Preu unitari"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Order N°"
-msgstr ""
+msgstr "Comanda Nº"
 
 #. module: sale_layout
 #: field:sale.order,abstract_line_ids:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Línies de venda"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desc.(%)"
 
 #. module: sale_layout
 #: field:sale.order.line,layout_type:0
 msgid "Layout Type"
-msgstr ""
+msgstr "Tipus de plantilla"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Product"
-msgstr ""
+msgstr "Producte"
 
 #. module: sale_layout
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "La referència de la comanda ha de ser única!"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Manual Description"
-msgstr ""
+msgstr "Descripció manual"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Our Salesman"
-msgstr ""
+msgstr "El nostre venedor"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "Declaració automàtica"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Línies de factura"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Quotation N°"
-msgstr ""
+msgstr "Pressupost Nº"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Crea factura"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Properties"
-msgstr ""
+msgstr "Propietats"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Adreça de factura :"
 
 #. module: sale_layout
 #: model:ir.module.module,shortdesc:sale_layout.module_meta_information
 msgid "Sale Order Layout"
-msgstr ""
+msgstr "Plantilla de comanda de venda"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Page Break"
-msgstr ""
+msgstr "Salt de pàgina"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Data venda"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Adreça d'enviament:"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Taxes"
-msgstr ""
+msgstr "Impostos"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total net :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Terminis de pagament"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Sale Order Lines"
-msgstr ""
+msgstr "Línies d'ordre de venda"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Separator Line"
-msgstr ""
+msgstr "Línia de separació"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Your Reference"
-msgstr ""
+msgstr "La seva referència"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Data pressupost"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Qty"
-msgstr ""
+msgstr "Quant."
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "States"
-msgstr ""
+msgstr "Estats"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Sales order lines"
-msgstr ""
+msgstr "Línies de la comanda de venda"
 
 #. module: sale_layout
 #: model:ir.actions.report.xml,name:sale_layout.sale_order_1
 msgid "Order with Layout"
-msgstr ""
+msgstr "Comanda amb plantilla"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informació extra"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Impostos :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Comanda de venda"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "Línia de la comanda"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Price"
-msgstr ""
+msgstr "Preu"
 
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línia de comanda de venda"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Moviments d'estoc"
diff --git a/addons/sale_layout/i18n/da.po b/addons/sale_layout/i18n/da.po
new file mode 100644
index 00000000000..d27e07c62ae
--- /dev/null
+++ b/addons/sale_layout/i18n/da.po
@@ -0,0 +1,292 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-08 22:33+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Sub total"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Titel"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Enhedspris"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Ordre nummer"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Ordre linier"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Rabat (%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr ""
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Vores sælger"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Faktura linier"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Antal"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Tilbud nummer"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "Moms"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Faktura adresse:"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Salgsordre layout"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Leveringsadresse"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Netto total:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Betalingsbetingelser"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Salgsordre linier"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Tilbudsdato"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Antal"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Stater"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Ordre linie"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinie"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Lagerflytninger"
diff --git a/addons/sale_layout/i18n/de.po b/addons/sale_layout/i18n/de.po
index f188d7348ae..c0755a1d15a 100644
--- a/addons/sale_layout/i18n/de.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -306,24 +306,3 @@ msgstr "Lieferaufträge"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
-#~ msgid "Sale Order"
-#~ msgstr "Verkaufsauftrag"
-
-#~ 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 "Sale Order Line"
-#~ msgstr "Verkaufsauftragsposition"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/sale_layout/i18n/el.po b/addons/sale_layout/i18n/el.po
index c50308cb263..59a2b27014c 100644
--- a/addons/sale_layout/i18n/el.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -290,9 +290,3 @@ msgstr ""
 #: view:sale.order:0
 msgid "Stock Moves"
 msgstr "Κινήσεις Αποθέματος"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Γραμμή Παραγγελίας Πώλησης"
-
-#~ msgid "Sale Order"
-#~ msgstr "Παραγγελία Πώλησης"
diff --git a/addons/sale_layout/i18n/es.po b/addons/sale_layout/i18n/es.po
index 1a848185463..681c41056fb 100644
--- a/addons/sale_layout/i18n/es.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -300,15 +300,3 @@ msgstr "Línea pedido de venta"
 #: view:sale.order:0
 msgid "Stock Moves"
 msgstr "Movimientos de 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 "Sale Order Line"
-#~ msgstr "Línea pedido de venta"
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de venta"
diff --git a/addons/sale_layout/i18n/es_CL.po b/addons/sale_layout/i18n/es_CL.po
new file mode 100644
index 00000000000..6c72be156cc
--- /dev/null
+++ b/addons/sale_layout/i18n/es_CL.po
@@ -0,0 +1,302 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-10-18 17:48+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: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona funcionalidades para mejorar la plantilla del "
+"pedido de ventas.\n"
+"\n"
+"    Proporciona la posibilidad de\n"
+"        * ordenar todas las líneas de un pedido de ventas\n"
+"        * añadir títulos, líneas de comentario, líneas con subtotales\n"
+"        * dibujar líneas horizontales y poner saltos de página\n"
+"\n"
+"    "
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Título"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Precio Unitario"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Líneas de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Tipo de plantilla"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Descripción manual"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Declaración automática"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Presupuesto Nº"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Plantilla de pedido de venta"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Salto de página"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Fecha Pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Condiciones de Pago"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Líneas del pedido de venta"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Línea de separación"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Líneas del pedido de ventas"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Pedido con plantilla"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venta"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea de pedido de venta"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
diff --git a/addons/sale_layout/i18n/es_MX.po b/addons/sale_layout/i18n/es_MX.po
new file mode 100644
index 00000000000..8d183784ead
--- /dev/null
+++ b/addons/sale_layout/i18n/es_MX.po
@@ -0,0 +1,302 @@
+# 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-13 05:15+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona funcionalidades para mejorar la plantilla del "
+"pedido de ventas.\n"
+"\n"
+"    Proporciona la posibilidad de\n"
+"        * ordenar todas las líneas de un pedido de ventas\n"
+"        * añadir títulos, líneas de comentario, líneas con subtotales\n"
+"        * dibujar líneas horizontales y poner saltos de página\n"
+"\n"
+"    "
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Título"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Líneas de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Tipo de plantilla"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Descripción manual"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Nuestro comercial"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Declaración automática"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Presupuesto Nº"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Dirección de factura:"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Plantilla de pedido de venta"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Salto de página"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Fecha Pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Plazos de pago"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Líneas del pedido de venta"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Línea de separación"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Líneas del pedido de ventas"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Pedido con plantilla"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
diff --git a/addons/sale_layout/i18n/es_VE.po b/addons/sale_layout/i18n/es_VE.po
new file mode 100644
index 00000000000..8d183784ead
--- /dev/null
+++ b/addons/sale_layout/i18n/es_VE.po
@@ -0,0 +1,302 @@
+# 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-13 05:15+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona funcionalidades para mejorar la plantilla del "
+"pedido de ventas.\n"
+"\n"
+"    Proporciona la posibilidad de\n"
+"        * ordenar todas las líneas de un pedido de ventas\n"
+"        * añadir títulos, líneas de comentario, líneas con subtotales\n"
+"        * dibujar líneas horizontales y poner saltos de página\n"
+"\n"
+"    "
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Título"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Líneas de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Tipo de plantilla"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Descripción manual"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Nuestro comercial"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Declaración automática"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Presupuesto Nº"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "CIF/NIF"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Dirección de factura:"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Plantilla de pedido de venta"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Salto de página"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Fecha Pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Plazos de pago"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Líneas del pedido de venta"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Línea de separación"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Líneas del pedido de ventas"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Pedido con plantilla"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
diff --git a/addons/sale_layout/i18n/et.po b/addons/sale_layout/i18n/et.po
index 1cc3d0366ed..1aecd79e3ea 100644
--- a/addons/sale_layout/i18n/et.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/fi.po b/addons/sale_layout/i18n/fi.po
index abebab1528b..a171ebae53e 100644
--- a/addons/sale_layout/i18n/fi.po
+++ b/addons/sale_layout/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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/fr.po b/addons/sale_layout/i18n/fr.po
index 2e9417629a1..6fd99002cb7 100644
--- a/addons/sale_layout/i18n/fr.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/gl.po b/addons/sale_layout/i18n/gl.po
index 496eb644b72..8903ab93329 100644
--- a/addons/sale_layout/i18n/gl.po
+++ b/addons/sale_layout/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: 2011-05-13 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/hu.po b/addons/sale_layout/i18n/hu.po
index c1841fd1b9b..d5d27bcd118 100644
--- a/addons/sale_layout/i18n/hu.po
+++ b/addons/sale_layout/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-01 21:21+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/id.po b/addons/sale_layout/i18n/id.po
index f9027dfa71a..408b1dfe94e 100644
--- a/addons/sale_layout/i18n/id.po
+++ b/addons/sale_layout/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: 2011-05-21 05:02+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/it.po b/addons/sale_layout/i18n/it.po
index 16039ba68b4..c5e4a0b55e6 100644
--- a/addons/sale_layout/i18n/it.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -179,7 +179,7 @@ msgstr "Note"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Ordinato per Data"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
@@ -189,7 +189,7 @@ msgstr "Indirizzo Spedizione:"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Taxes"
-msgstr ""
+msgstr "Tasse"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
@@ -239,7 +239,7 @@ msgstr "Data preventivo"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "TVA :"
-msgstr ""
+msgstr "IVA :"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -269,7 +269,7 @@ msgstr "Informazioni aggiuntive"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Tasse :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
@@ -289,7 +289,7 @@ msgstr "Riga Ordine"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Price"
-msgstr ""
+msgstr "Prezzo"
 
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order_line
diff --git a/addons/sale_layout/i18n/nb.po b/addons/sale_layout/i18n/nb.po
index 38b0c6fc8dd..906dd93ede3 100644
--- a/addons/sale_layout/i18n/nb.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -254,7 +254,7 @@ msgstr "Ordre med layout"
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr "Ekstra inforrmasjon"
+msgstr "Ekstra informasjon"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
diff --git a/addons/sale_layout/i18n/nl.po b/addons/sale_layout/i18n/nl.po
index 557448c99b9..07b9ba55a45 100644
--- a/addons/sale_layout/i18n/nl.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/pl.po b/addons/sale_layout/i18n/pl.po
index 1475cc408ae..219ee4a0a62 100644
--- a/addons/sale_layout/i18n/pl.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/pt.po b/addons/sale_layout/i18n/pt.po
index adddf49728f..1e78cd4d6a7 100644
--- a/addons/sale_layout/i18n/pt.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -290,6 +290,3 @@ msgstr ""
 #: view:sale.order:0
 msgid "Stock Moves"
 msgstr ""
-
-#~ msgid "Sale Order"
-#~ msgstr "Ordem de venda"
diff --git a/addons/sale_layout/i18n/pt_BR.po b/addons/sale_layout/i18n/pt_BR.po
index f0e21d78288..29a49f94e6a 100644
--- a/addons/sale_layout/i18n/pt_BR.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/ro.po b/addons/sale_layout/i18n/ro.po
index f52d8b44ac9..4cbff9cd920 100644
--- a/addons/sale_layout/i18n/ro.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/ru.po b/addons/sale_layout/i18n/ru.po
index 457ac451f6c..f989aaeb8fb 100644
--- a/addons/sale_layout/i18n/ru.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -79,7 +79,7 @@ msgstr "Позиции заказа"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Disc.(%)"
-msgstr "Дисконт (%)"
+msgstr "Скидка (%)"
 
 #. module: sale_layout
 #: field:sale.order.line,layout_type:0
@@ -149,7 +149,7 @@ msgstr "НДС"
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr "Сделать счет"
+msgstr "Сформировать счёт"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -301,26 +301,5 @@ msgstr "Позиция заказа на продажу"
 msgid "Stock Moves"
 msgstr "Перемещения ТМЦ"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Позиция заказа на продажу"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Sale Order"
-#~ msgstr "Заказ на продажу"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
diff --git a/addons/sale_layout/i18n/sk.po b/addons/sale_layout/i18n/sk.po
index ef343b33dfb..7feb9b198cf 100644
--- a/addons/sale_layout/i18n/sk.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
diff --git a/addons/sale_layout/i18n/sv.po b/addons/sale_layout/i18n/sv.po
index 382f684c67e..003141f42e9 100644
--- a/addons/sale_layout/i18n/sv.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -291,25 +291,5 @@ msgstr ""
 msgid "Stock Moves"
 msgstr "Lagertransaktioner"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Certifikat ID för modulen måste vara unik!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Säljorderrad"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid "Sale Order"
-#~ msgstr "Kundorder"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Fältstorleken kan inte vara mindre än ett!"
diff --git a/addons/sale_layout/i18n/tr.po b/addons/sale_layout/i18n/tr.po
index 59321666c76..e30daa28637 100644
--- a/addons/sale_layout/i18n/tr.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -35,11 +35,21 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Bu modül, Satış Siparişi sayfa düzenini iyileştirilmesi için özellikler "
+"sağlar .\n"
+"\n"
+"    aşağıdaki imkanları sunae\n"
+"        * satış siparişinin bütün satırlarını sıralar\n"
+"        * unvan, açıklama satırları, ara toplam satırları ekler\n"
+"        * yatay çizgiler çizer ve sayfa aralıkları koyar\n"
+"\n"
+"    "
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Title"
-msgstr ""
+msgstr "Unvan"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
@@ -74,7 +84,7 @@ msgstr "İnd.(%)"
 #. module: sale_layout
 #: field:sale.order.line,layout_type:0
 msgid "Layout Type"
-msgstr ""
+msgstr "Yerleşm Düzeni Türü"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -199,7 +209,7 @@ msgstr "Toplam :"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Ödeme Koşulları"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -229,7 +239,7 @@ msgstr "Fiyat teklifinin verildiği gün"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -239,7 +249,7 @@ msgstr "Adet"
 #. module: sale_layout
 #: view:sale.order:0
 msgid "States"
-msgstr ""
+msgstr "Eyaletler"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -249,7 +259,7 @@ msgstr "Satış Sipariş Kalemleri"
 #. module: sale_layout
 #: model:ir.actions.report.xml,name:sale_layout.sale_order_1
 msgid "Order with Layout"
-msgstr ""
+msgstr "Sipariş Sayfa Düzeni"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -289,4 +299,4 @@ msgstr "Satış Siparişi Kalemi"
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Stok Hareketleri"
diff --git a/addons/sale_layout/i18n/zh_CN.po b/addons/sale_layout/i18n/zh_CN.po
index b7f46bc26f3..334a931705a 100644
--- a/addons/sale_layout/i18n/zh_CN.po
+++ b/addons/sale_layout/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -35,6 +35,15 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    此模块让你改善销售订单的样式。\n"
+"\n"
+"    它可以让你：\n"
+"    *对销售订单明细进行排序\n"
+"    *添加标题，注释行，小计行\n"
+"    *添加水平线和放置分页符\n"
+"\n"
+"    "
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -64,7 +73,7 @@ msgstr "单号"
 #. module: sale_layout
 #: field:sale.order,abstract_line_ids:0
 msgid "Order Lines"
-msgstr ""
+msgstr "订单明细"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
@@ -74,7 +83,7 @@ msgstr "折扣(%)"
 #. module: sale_layout
 #: field:sale.order.line,layout_type:0
 msgid "Layout Type"
-msgstr ""
+msgstr "样式类型"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -84,37 +93,37 @@ msgstr "序列"
 #. module: sale_layout
 #: view:sale.order:0
 msgid "UoM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: sale_layout
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "单号必须唯一！"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Manual Description"
-msgstr ""
+msgstr "手动添加的描述"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Our Salesman"
-msgstr ""
+msgstr "我方业务员"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "自动申报"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -154,7 +163,7 @@ msgstr "发票地址:"
 #. module: sale_layout
 #: model:ir.module.module,shortdesc:sale_layout.module_meta_information
 msgid "Sale Order Layout"
-msgstr ""
+msgstr "销售订单样式"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -184,109 +193,109 @@ msgstr "税金"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Net Total :"
-msgstr ""
+msgstr "总净重："
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Tel. :"
-msgstr ""
+msgstr "电话："
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Total :"
-msgstr ""
+msgstr "合计:"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "付款条款"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Sale Order Lines"
-msgstr ""
+msgstr "销售订单明细"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Separator Line"
-msgstr ""
+msgstr "分隔线"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Your Reference"
-msgstr ""
+msgstr "你的关联单号"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "报价日期"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "TVA :"
-msgstr ""
+msgstr "增值税："
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "States"
-msgstr ""
+msgstr "状态"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Sales order lines"
-msgstr ""
+msgstr "销售订单明细"
 
 #. module: sale_layout
 #: model:ir.actions.report.xml,name:sale_layout.sale_order_1
 msgid "Order with Layout"
-msgstr ""
+msgstr "添加样式的订单"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "附加信息"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Taxes :"
-msgstr ""
+msgstr "税："
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Fax :"
-msgstr ""
+msgstr "传真："
 
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "订单明细"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
 
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "销售订单明细"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "库存调拨"
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 57839ecffeb..62513d6d98f 100644
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -67,7 +67,7 @@ class sale_order_1(report_sxw.rml_parse):
                 sub_total[i] = entry.price_subtotal and entry.price_subtotal
                 i = i + 1
                 res['note'] = entry.notes or ''
-                res['currency'] = sale_order.pricelist_id.currency_id.name
+                res['currency'] = sale_order.pricelist_id.currency_id.symbol
                 res['layout_type'] = entry.layout_type
             else:
                 res['product_uom_qty'] = ''
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index 941df09aeb5..a0ccec0ab7b 100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -133,31 +133,6 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table7">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="260.0,64.0,215.0" style="Tableau2">
@@ -275,9 +250,7 @@
       <blockTable colWidths="6.0,193.0,85.0,71.0,57.0,57.0,71.0" style="Table1">
         <tr>
           <td>
-            <para style="terp_default_8">
-              <font face="Helvetica" size="9.0">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</font>
-            </para>
+            <para style="terp_default_9">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</para>
           </td>
           <td>
             <para style="terp_default_9"><font face="Helvetica" size="8.0">[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
@@ -295,7 +268,7 @@
             <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ a['layout_type']=='break' and removeParentNode('blockTable')]]<font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ a['currency'] ]]</para>
           </td>
         </tr>
         <tr>
@@ -396,6 +369,5 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-  </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index 853783c218d..7c15713d3b3 100644
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -27,9 +27,15 @@ class sale_order_line(osv.osv):
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
+        line_ids = []
+        for id in ids:
+            res[id] = 0.0
         for line in self.browse(cr, uid, ids, context=context):
             if line.layout_type == 'article':
-                return super(sale_order_line, self)._amount_line(cr, uid, ids, field_name, arg, context)
+                line_ids.append(line.id)
+        if line_ids:
+            res_article = super(sale_order_line, self)._amount_line(cr, uid, line_ids, field_name, arg, context)
+            res.update(res_article)
         return res
 
     def invoice_line_create(self, cr, uid, ids, context=None):
@@ -111,11 +117,13 @@ class sale_order_line(osv.osv):
                 ('subtotal', 'Sub Total'),
                 ('line', 'Separator Line'),
                 ('break', 'Page Break'),]
-            ,'Layout Type', select=True, required=True),
-        'sequence': fields.integer('Layout Sequence'),
+            ,'Line Type', select=True, required=True),
+        'sequence': fields.integer('Line Sequence'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
         'product_uom': fields.many2one('product.uom', 'Product UoM'),
+        # Override the field to call the overridden _amount_line function
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
     }
 
     _defaults = {
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index dbea639f86e..79adefa32f3 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -14,60 +14,83 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
                     <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
-                            <form string="Sale Order Lines">
+                            <form string="Order Line">
                                 <notebook>
                                     <page string="Order Line">
-                                        <separator colspan="4" string="Automatic Declaration"/>
-                                        <field colspan="4"
+                                    <group colspan="4" col="5">
+                                        <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                    </group>
+                                    <group colspan="4" col="5">
+                                        <field colspan="3"
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             name="product_id"
-                                            attrs="{'readonly':[('layout_type','!=','article')]}"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"
                                             on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
                                             select="1"/>
+                                        <field
+                                            name="name" required="0"
+                                            attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/>
+
                                         <field
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             name="product_uom_qty"
-                                            attrs="{'readonly':[('layout_type','!=','article')]}"
-                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
-                                            select="1"/>
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"
+                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
                                         <field name="product_uom"
-                                               required="0"
-                                            attrs="{'readonly':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
+                                            nolabel="1"
+                                            required="0"
+                                            attrs="{'invisible':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
                                             on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
-                                        <field
-                                            name="product_packaging"
-                                            attrs="{'readonly':[('layout_type','!=','article')]}"
-                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
-                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
-                                            domain="[('product_id','=',product_id)]"
-                                            groups="base.group_extended"/>
-                                        <separator colspan="4" string="Manual Description" />
-                                        <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
-                                        <field name="sequence" string="Seq."/>
-                                        <field colspan="4" name="name" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))] }"/>
-                                        <field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
-                                        <field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <field name="delay" select="2" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <separator colspan="4" string="States"/>
-                                        <field name="state" select="2"/>
-                                        <group col="3" colspan="2">
-                                            <field name="invoiced" select="2"/>
-                                            <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
-                                        </group>
-                                    </page>
-                                    <page groups="base.group_extended" string="Extra Info">
+                                        <field name="price_unit"
+                                            attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
+
                                         <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
                                         <field groups="product.group_uos" name="product_uos"/>
+                                        <newline/>
+
+                                        <field
+                                            name="product_packaging"
+                                            colspan="3"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"
+                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                            on_change="product_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="base.group_extended"/>
+                                        <field
+                                            name="discount"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"/>
+
+                                        <group colspan="5"
+                                            attrs="{'invisible':[('layout_type','not in', ['article','text'])]}">
+                                            <separator colspan="4" string="Notes"/>
+                                            <field colspan="4" name="notes" nolabel="1"/>
+                                        </group>
+
+                                        <group colspan="5"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}">
+                                            <separator colspan="4" string="Taxes"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/>
+                                        </group>
+
+                                        <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                            <separator colspan="5" string="States"/>
+                                            <field name="state"/>
+                                            <field name="invoiced"/>
+                                            <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
+                                        </group>
+                                    </group>
+                                    </page>
+                                    <page groups="base.group_extended" string="Extra Info"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}">
+                                        <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                        <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/>
                                         <field name="address_allotment_id" select="2"/>
                                         <separator colspan="4" string="Properties"/>
                                         <field colspan="4" name="property_ids" nolabel="1"/>
                                     </page>
-                                    <page string="Notes">
-                                        <field colspan="4" name="notes" nolabel="1"/>
-                                    </page>
-                                    <page string="History" groups="base.group_extended">
+                                    <page string="History" groups="base.group_extended"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}">
                                         <separator colspan="4" string="Invoice Lines"/>
                                         <field colspan="4" name="invoice_lines" nolabel="1"/>
                                         <separator colspan="4" string="Stock Moves"/>
diff --git a/addons/sale_margin/__init__.py b/addons/sale_margin/__init__.py
index 425dcf6352d..ad51e586046 100644
--- a/addons/sale_margin/__init__.py
+++ b/addons/sale_margin/__init__.py
@@ -19,7 +19,6 @@
 ##############################################################################
 
 import sale_margin
-import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 1121b178266..c7eae6daea2 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -19,9 +19,9 @@
 ##############################################################################
 
 {
-    "name":"Margins in Sales Order",
+    "name":"Margins in Sales Orders",
     "version":"1.0",
-    "category" : "Sales",
+    "category" : "Sales Management",
     "description": """
 This module adds the 'Margin' on sales order.
 =============================================
@@ -33,7 +33,7 @@ This gives the profitability by calculating the difference between the Unit Pric
     "depends":["sale"],
     "demo_xml":[],
     'test': ['test/sale_margin.yml'],
-    "update_xml":["security/ir.model.access.csv","sale_margin_view.xml","report/report_margin_view.xml"],
+    "update_xml":["security/ir.model.access.csv","sale_margin_view.xml"],
     "active": False,
     "installable": True,
     "certificate" : "001165700015525701661",
diff --git a/addons/sale_margin/i18n/bg.po b/addons/sale_margin/i18n/bg.po
index 8717bf8c171..0b27924cd3b 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/ca.po b/addons/sale_margin/i18n/ca.po
index cc8e27e954b..e44b06e1ac8 100644
--- a/addons/sale_margin/i18n/ca.po
+++ b/addons/sale_margin/i18n/ca.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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: sale_margin
 #: selection:report.account.invoice,type:0
@@ -43,17 +43,17 @@ msgstr "Factura de client"
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: sale_margin
 #: field:report.account.invoice,state:0
@@ -73,6 +73,11 @@ msgid ""
 "Unit Price and Cost Price\n"
 "    "
 msgstr ""
+" \n"
+"    Aquest mòdul afegeix el 'Marge' en la comanda de venda,\n"
+"    que proporciona la rendibilitat calculant la diferència entre el preu "
+"unitari i el preu de cost\n"
+"    "
 
 #. module: sale_margin
 #: selection:report.account.invoice,state:0
@@ -95,7 +100,7 @@ msgstr "Pagat"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Albarà"
 
 #. module: sale_margin
 #: help:sale.order,margin:0
@@ -103,6 +108,8 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
 msgstr ""
+"Dóna la rendibilitat mitjançant el càlcul de la diferència entre el preu "
+"unitari i preu de cost."
 
 #. module: sale_margin
 #: field:report.account.invoice,type:0
@@ -117,7 +124,7 @@ msgstr "Tipus"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_report_account_invoice_product
 msgid "Invoice Statistics"
-msgstr ""
+msgstr "Estadístiques de factures"
 
 #. module: sale_margin
 #: field:report.account.invoice.partner.product,product_id:0
@@ -128,17 +135,17 @@ msgstr "Producte"
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "La referència de la comanda ha de ser única!"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Invoice by Partner"
-msgstr ""
+msgstr "Factures per empresa"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: sale_margin
 #: selection:report.account.invoice,state:0
@@ -152,47 +159,47 @@ msgstr "Pro-forma"
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Data factura"
 
 #. module: sale_margin
 #: model:ir.module.module,shortdesc:sale_margin.module_meta_information
 msgid "Margins in Sales Order"
-msgstr ""
+msgstr "Marges en les ordres de venda"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Search Margin"
-msgstr ""
+msgstr "Cerca marge"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "This Year"
-msgstr ""
+msgstr "Aquest any"
 
 #. module: sale_margin
 #: field:report.account.invoice.product,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
@@ -203,7 +210,7 @@ msgstr "Aquest mes"
 #: view:report.account.invoice.product:0
 #: field:report.account.invoice.product,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: sale_margin
 #: field:report.account.invoice.category,categ_id:0
@@ -224,28 +231,28 @@ msgstr "Preu cost"
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 #: field:report.account.invoice.product,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: sale_margin
 #: field:report.account.invoice,amount:0
@@ -268,7 +275,7 @@ msgstr "Factura d'abonament de proveïdor"
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: sale_margin
 #: field:report.account.invoice,margin:0
@@ -284,7 +291,7 @@ msgstr "Marge"
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: sale_margin
 #: field:report.account.invoice,quantity:0
@@ -321,12 +328,12 @@ msgstr "Factures"
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Línia de factura"
 
 #. module: sale_margin
 #: field:report.account.invoice,name:0
@@ -353,16 +360,19 @@ msgid ""
 "system. You can sort and group your results by specific selection criteria "
 "to quickly find what you are looking for."
 msgstr ""
+"Aquest informe li ofereix una visió general de totes les factures generades "
+"pel sistema. Podeu ordenar i agrupar els resultats per criteris específics "
+"de selecció per trobar ràpidament el que cerca."
 
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
 msgid "Invoice Report"
-msgstr ""
+msgstr "Informe de factura"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
@@ -372,7 +382,7 @@ msgstr "Factura"
 #. module: sale_margin
 #: view:stock.picking:0
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Factures de client"
 
 #. module: sale_margin
 #: field:report.account.invoice.partner,partner_id:0
@@ -383,7 +393,7 @@ msgstr "Empresa"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Comanda de venda"
 
 #. module: sale_margin
 #: selection:report.account.invoice,state:0
@@ -397,12 +407,12 @@ msgstr "Oberta"
 #. module: sale_margin
 #: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Anàlisi de factures"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línia comanda de venda"
 
 #~ msgid "Invoices by Product"
 #~ msgstr "Factures per producte"
diff --git a/addons/sale_margin/i18n/da.po b/addons/sale_margin/i18n/da.po
new file mode 100644
index 00000000000..d21c88669d9
--- /dev/null
+++ b/addons/sale_margin/i18n/da.po
@@ -0,0 +1,405 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-02 15: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: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Kunde faktura"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr ""
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Tilstand"
+
+#. module: sale_margin
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid ""
+" \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the "
+"Unit Price and Cost Price\n"
+"    "
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Kladde"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Betalt"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "Plukliste"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Faktura statistik"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordre reference skal være unik"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Proforma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Fakturadato"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr ""
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr ""
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Dette år"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Denne måned"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Kategorier"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Kostpris"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Beløb"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "November"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Antal"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Leverandørfaktura"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakturaer"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinie"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Annulleret"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr ""
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Udført"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Kundefakturaer"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Kontakt"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Åben"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinie"
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
index bc8b7e42f61..bea9083a831 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -505,29 +505,5 @@ msgstr "Auftragsposition"
 #~ msgid "report.account.invoice"
 #~ msgstr "report.account.invoice"
 
-#~ msgid "Sale Order"
-#~ msgstr "Verkaufsauftrag"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Verkaufsauftragsposition"
-
-#~ msgid ""
-#~ "It gives profitability by calculating the difference between the Unit Price "
-#~ "and Cost Price"
-#~ msgstr ""
-#~ "Deckungsbeitrag als Differenz zwischen Verkaufspreis und Herstellkosten"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/sale_margin/i18n/el.po b/addons/sale_margin/i18n/el.po
index ca83cb54239..70d36f36639 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -406,9 +406,3 @@ msgstr ""
 
 #~ msgid "Create Invoice"
 #~ msgstr "Δημιουργία Τιμολογίου"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Γραμμή Παραγγελίας Πώλησης"
-
-#~ msgid "Sale Order"
-#~ msgstr "Παραγγελία Πώλησης"
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index d60abc4f303..e0104b5c758 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -506,28 +506,3 @@ msgstr "Línea pedido de venta"
 
 #~ msgid "Invoiced date"
 #~ msgstr "fecha facturada"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Línea pedido de venta"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error! No puede crear un menú recursivo."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de venta"
-
-#~ msgid ""
-#~ "It gives profitability by calculating the difference between the Unit Price "
-#~ "and Cost Price"
-#~ msgstr ""
-#~ "Da la rentabilidad calculando la diferencia entre precio unitario y precio "
-#~ "de coste"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/sale_margin/i18n/es_CL.po b/addons/sale_margin/i18n/es_CL.po
new file mode 100644
index 00000000000..6df37b3f35a
--- /dev/null
+++ b/addons/sale_margin/i18n/es_CL.po
@@ -0,0 +1,415 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-10-18 18:31+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: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Factura rectificativa (abono) de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Factura de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale_margin
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid ""
+" \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the "
+"Unit Price and Cost Price\n"
+"    "
+msgstr ""
+" \n"
+"    Este módulo añade el 'Margen' en el pedido de venta,\n"
+"    que proporciona la rentabilidad calculando la diferencia entre el precio "
+"unidad y el precio de coste\n"
+"    "
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "LIsta de guías de despacho"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+"Proporciona la rentabilidad calculando la diferencia entre el precio unidad "
+"y el precio de coste."
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Estadísticas de facturas"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Facturas por empresa"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Fecha de facturación"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "Márgenes en pedidos de venta"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Buscar margen"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Este Año"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Cantidad"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Factura rectificativa (abono) de proveedor"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Margen"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Facturas por producto"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Factura del Proveedor"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Cancelado/a"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+"Este informe ofrece una visión general de todas las facturas generadas por "
+"el sistema. Puede ordenar y agrupar los resultados por criterios específicos "
+"de selección para encontrar rápidamente lo que busca."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Informe de factura"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Listo"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Facturas del Cliente"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venta"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Análisis de facturas"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea de pedido de venta"
diff --git a/addons/sale_margin/i18n/es_MX.po b/addons/sale_margin/i18n/es_MX.po
new file mode 100644
index 00000000000..aeecfe1e39b
--- /dev/null
+++ b/addons/sale_margin/i18n/es_MX.po
@@ -0,0 +1,508 @@
+# 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-13 20:47+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Factura de abono de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Factura de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale_margin
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid ""
+" \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the "
+"Unit Price and Cost Price\n"
+"    "
+msgstr ""
+" \n"
+"    Este módulo añade el 'Margen' en el pedido de venta,\n"
+"    que proporciona la rentabilidad calculando la diferencia entre el precio "
+"unidad y el precio de coste\n"
+"    "
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+"Proporciona la rentabilidad calculando la diferencia entre el precio unidad "
+"y el precio de coste."
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Estadísticas de facturas"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Facturas por empresa"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Fecha de facturación"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "Márgenes en pedidos de venta"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Buscar margen"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Factura de abono de proveedor"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Margen"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Facturas por producto"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Cancelada"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+"Este informe ofrece una visión general de todas las facturas generadas por "
+"el sistema. Puede ordenar y agrupar los resultados por criterios específicos "
+"de selección para encontrar rápidamente lo que busca."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Informe de factura"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Abierta"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Análisis de facturas"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ 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 "report.account.invoice.partner.product"
+#~ msgstr "informe.contabilidad.factura.empresa.producto"
+
+#~ msgid "report.account.invoice.product"
+#~ msgstr "informe.contabilidad.factura.producto"
+
+#~ msgid "Invoices by Product"
+#~ msgstr "Facturas por producto"
+
+#~ msgid "Create invoices"
+#~ msgstr "Crear facturas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "All Months"
+#~ msgstr "Todos los meses"
+
+#~ msgid "Destination Journal"
+#~ msgstr "Diario de destino"
+
+#~ msgid "report.account.invoice.partner.product.tree"
+#~ msgstr "informe.contabilidad.factura.empresa.producto.árbol"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Create Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "Supplier Invoices"
+#~ msgstr "Facturas de proveedor"
+
+#~ msgid "Invoices by Partner and Product"
+#~ msgstr "Facturas por empresa y producto"
+
+#~ msgid "report.account.invoice.category"
+#~ msgstr "informe.contabilidad.factura.categoría"
+
+#~ msgid "Create invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "report.account.invoice.category.tree"
+#~ msgstr "informe.contabilidad.factura.categoría.árbol"
+
+#~ msgid "Invoices by category"
+#~ msgstr "Facturas por categoría"
+
+#~ msgid "Invoices by partner"
+#~ msgstr "Facturas por empresa"
+
+#~ msgid "report.account.invoice.partner.tree"
+#~ msgstr "informe.contabilidad.factura.empresa.árbol"
+
+#~ msgid "Invoices by partner and product"
+#~ msgstr "Facturas por empresa y producto"
+
+#~ msgid "Invoices by Category"
+#~ msgstr "Facturas por categoría"
+
+#~ msgid "Group by partner"
+#~ msgstr "Agrupar por empresa"
+
+#~ msgid "Invoices by Partner"
+#~ msgstr "Facturas por empresa"
+
+#~ msgid "report.account.invoice.partner"
+#~ msgstr "informe.contabilidad.factura.empresa"
+
+#~ msgid "Margins in Sale Orders"
+#~ msgstr "Márgenes en pedidos de venta"
+
+#~ msgid "report.account.invoice"
+#~ msgstr "informe.contabilidad.factura"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "report.account.invoice.product.tree"
+#~ msgstr "informe.contabilidad.factura.producto.árbol"
+
+#~ msgid "report.account.invoice.tree"
+#~ msgstr "informe.contabilidad.factura.árbol"
+
+#~ msgid "Invoiced date"
+#~ msgstr "fecha facturada"
diff --git a/addons/sale_margin/i18n/es_MX.po.moved b/addons/sale_margin/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..ac02278b28a
--- /dev/null
+++ b/addons/sale_margin/i18n/es_MX.po.moved
@@ -0,0 +1,335 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_margin
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-05 15:57+0000\n"
+"PO-Revision-Date: 2011-07-05 15:57+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Factura de abono de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Factura de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale_margin
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid " \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the Unit Price and Cost Price\n"
+"    "
+msgstr " \n"
+"    Este módulo añade el 'Margen' en el pedido de venta,\n"
+"    que proporciona la rentabilidad calculando la diferencia entre el precio unidad y el precio de coste\n"
+"    "
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de Empaque"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid "It gives profitability by calculating the difference between the Unit Price and Cost Price."
+msgstr "Proporciona la rentabilidad calculando la diferencia entre el precio unidad y el precio de coste."
+
+#. module: sale_margin
+#: field:report.account.invoice.product,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Estadísticas de facturas"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Facturas por empresa"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Fecha de facturación"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "Márgenes en pedidos de venta"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Buscar margen"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,categ_id:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Factura de abono de proveedor"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Margen"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Facturas por producto"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: sale_margin
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Cancelada"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid "This report gives you an overview of all the invoices generated by the system. You can sort and group your results by specific selection criteria to quickly find what you are looking for."
+msgstr "Este informe ofrece una visión general de todas las facturas generadas por el sistema. Puede ordenar y agrupar los resultados por criterios específicos de selección para encontrar rápidamente lo que busca."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Informe de factura"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_reoirt
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Abierta"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Análisis de facturas"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
diff --git a/addons/sale_margin/i18n/es_VE.po b/addons/sale_margin/i18n/es_VE.po
new file mode 100644
index 00000000000..aeecfe1e39b
--- /dev/null
+++ b/addons/sale_margin/i18n/es_VE.po
@@ -0,0 +1,508 @@
+# 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-13 20:47+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Factura de abono de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Factura de cliente"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale_margin
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid ""
+" \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the "
+"Unit Price and Cost Price\n"
+"    "
+msgstr ""
+" \n"
+"    Este módulo añade el 'Margen' en el pedido de venta,\n"
+"    que proporciona la rentabilidad calculando la diferencia entre el precio "
+"unidad y el precio de coste\n"
+"    "
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+"Proporciona la rentabilidad calculando la diferencia entre el precio unidad "
+"y el precio de coste."
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Estadísticas de facturas"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Facturas por empresa"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Fecha de facturación"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "Márgenes en pedidos de venta"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Buscar margen"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Este año"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Este Mes"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Factura de abono de proveedor"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Margen"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Facturas por producto"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Cancelada"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+"Este informe ofrece una visión general de todas las facturas generadas por "
+"el sistema. Puede ordenar y agrupar los resultados por criterios específicos "
+"de selección para encontrar rápidamente lo que busca."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Informe de factura"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Abierta"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Análisis de facturas"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ 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 "report.account.invoice.partner.product"
+#~ msgstr "informe.contabilidad.factura.empresa.producto"
+
+#~ msgid "report.account.invoice.product"
+#~ msgstr "informe.contabilidad.factura.producto"
+
+#~ msgid "Invoices by Product"
+#~ msgstr "Facturas por producto"
+
+#~ msgid "Create invoices"
+#~ msgstr "Crear facturas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "All Months"
+#~ msgstr "Todos los meses"
+
+#~ msgid "Destination Journal"
+#~ msgstr "Diario de destino"
+
+#~ msgid "report.account.invoice.partner.product.tree"
+#~ msgstr "informe.contabilidad.factura.empresa.producto.árbol"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "Create Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "Supplier Invoices"
+#~ msgstr "Facturas de proveedor"
+
+#~ msgid "Invoices by Partner and Product"
+#~ msgstr "Facturas por empresa y producto"
+
+#~ msgid "report.account.invoice.category"
+#~ msgstr "informe.contabilidad.factura.categoría"
+
+#~ msgid "Create invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "report.account.invoice.category.tree"
+#~ msgstr "informe.contabilidad.factura.categoría.árbol"
+
+#~ msgid "Invoices by category"
+#~ msgstr "Facturas por categoría"
+
+#~ msgid "Invoices by partner"
+#~ msgstr "Facturas por empresa"
+
+#~ msgid "report.account.invoice.partner.tree"
+#~ msgstr "informe.contabilidad.factura.empresa.árbol"
+
+#~ msgid "Invoices by partner and product"
+#~ msgstr "Facturas por empresa y producto"
+
+#~ msgid "Invoices by Category"
+#~ msgstr "Facturas por categoría"
+
+#~ msgid "Group by partner"
+#~ msgstr "Agrupar por empresa"
+
+#~ msgid "Invoices by Partner"
+#~ msgstr "Facturas por empresa"
+
+#~ msgid "report.account.invoice.partner"
+#~ msgstr "informe.contabilidad.factura.empresa"
+
+#~ msgid "Margins in Sale Orders"
+#~ msgstr "Márgenes en pedidos de venta"
+
+#~ msgid "report.account.invoice"
+#~ msgstr "informe.contabilidad.factura"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "report.account.invoice.product.tree"
+#~ msgstr "informe.contabilidad.factura.producto.árbol"
+
+#~ msgid "report.account.invoice.tree"
+#~ msgstr "informe.contabilidad.factura.árbol"
+
+#~ msgid "Invoiced date"
+#~ msgstr "fecha facturada"
diff --git a/addons/sale_margin/i18n/et.po b/addons/sale_margin/i18n/et.po
index 9403689744c..47b000fb433 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/fi.po b/addons/sale_margin/i18n/fi.po
index 630903ae46b..e94e547fb8e 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -408,3 +408,62 @@ msgstr "Laskuanalyysi"
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "Myyntitilausrivi"
+
+#~ 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 "Invoices by Product"
+#~ msgstr "Laskut tuotteittain"
+
+#~ msgid "Create invoices"
+#~ msgstr "Muodosta laskut"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#~ msgid "All Months"
+#~ msgstr "Kaikki kuukaudet"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
+
+#~ msgid "Create Invoice"
+#~ msgstr "Luo lasku"
+
+#~ msgid "Invoices by Partner and Product"
+#~ msgstr "Laskut kumppaneittain ja tuotteittain"
+
+#~ msgid "Create invoice"
+#~ msgstr "Luo lasku"
+
+#~ msgid "Invoices by category"
+#~ msgstr "Laskut kategorioittain"
+
+#~ msgid "Destination Journal"
+#~ msgstr "Kohde päiväkirja"
+
+#~ msgid "Group by partner"
+#~ msgstr "Ryhmittele kumppanittain"
+
+#~ msgid "Supplier Invoices"
+#~ msgstr "Toimittajan Laskut"
+
+#~ msgid "Margins in Sale Orders"
+#~ msgstr "Myyntitilauksen kate"
+
+#~ msgid "Cancel"
+#~ msgstr "Peruuta"
+
+#~ msgid "Invoiced date"
+#~ msgstr "Laskutuspäivä"
+
+#~ msgid "Invoices by partner and product"
+#~ msgstr "Laskut kumppaneittain ja tuotteittain"
+
+#~ msgid "Invoices by Category"
+#~ msgstr "Laskut kategorioittain"
+
+#~ msgid "Invoices by Partner"
+#~ msgstr "Laskut kumppaneittain"
diff --git a/addons/sale_margin/i18n/fr.po b/addons/sale_margin/i18n/fr.po
index b2181db1ce0..6a641c9eca3 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -475,25 +475,3 @@ msgstr "Ligne de bon de commande"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de modèle incorrect pour la définition de l'action"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Ligne de commande de vente"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid ""
-#~ "It gives profitability by calculating the difference between the Unit Price "
-#~ "and Cost Price"
-#~ msgstr ""
-#~ "Ce champ indique la profitabilité en calculant la différence entre le prix "
-#~ "unitaire et le prix de revient."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/sale_margin/i18n/hu.po b/addons/sale_margin/i18n/hu.po
index 4b81e3d5110..e3e07ed16a1 100644
--- a/addons/sale_margin/i18n/hu.po
+++ b/addons/sale_margin/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-01 22:09+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/it.po b/addons/sale_margin/i18n/it.po
index 79924bd3d6f..9040ee1e668 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/nl.po b/addons/sale_margin/i18n/nl.po
index 33a5463adf6..6a4674c6eae 100644
--- a/addons/sale_margin/i18n/nl.po
+++ b/addons/sale_margin/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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/pl.po b/addons/sale_margin/i18n/pl.po
index 07b350d67b9..b201521c8dc 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/pt.po b/addons/sale_margin/i18n/pt.po
index b294296442a..15740e5fd12 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index d1a7970d3ea..451883737ef 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/ro.po b/addons/sale_margin/i18n/ro.po
index b7df684690f..9bfaca379b8 100644
--- a/addons/sale_margin/i18n/ro.po
+++ b/addons/sale_margin/i18n/ro.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-04-04 14:32+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index d1c634e5f38..f885678d376 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -444,18 +444,3 @@ msgstr "Позиция заказа на продажу"
 
 #~ msgid "Cancel"
 #~ msgstr "Отмена"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Позиция заказа на продажу"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Sale Order"
-#~ msgstr "Заказ на продажу"
-
-#~ msgid ""
-#~ "It gives profitability by calculating the difference between the Unit Price "
-#~ "and Cost Price"
-#~ msgstr ""
-#~ "Дает рентабельность, вычисляется разница между ценой продажи и закупки."
diff --git a/addons/sale_margin/i18n/sk.po b/addons/sale_margin/i18n/sk.po
index 324e5b784e0..2471c05478b 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/sl.po b/addons/sale_margin/i18n/sl.po
index a67213c08d3..782cc7d585d 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: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index cf7e283375f..f5a70a71a0e 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
diff --git a/addons/sale_margin/i18n/zh_CN.po b/addons/sale_margin/i18n/zh_CN.po
index 9397a2b316d..9c974f50166 100644
--- a/addons/sale_margin/i18n/zh_CN.po
+++ b/addons/sale_margin/i18n/zh_CN.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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Category"
-msgstr "类别"
+msgstr "分类"
 
 #. module: sale_margin
 #: selection:report.account.invoice,type:0
@@ -48,7 +48,7 @@ msgstr "2月"
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Current"
-msgstr "目前"
+msgstr "当前的"
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -73,6 +73,10 @@ msgid ""
 "Unit Price and Cost Price\n"
 "    "
 msgstr ""
+" \n"
+"    这个模块在销售订单上添加了‘利润’。\n"
+"    通过计算单价和成本价之间的差额给出盈利状况\n"
+"    "
 
 #. module: sale_margin
 #: selection:report.account.invoice,state:0
@@ -95,14 +99,14 @@ msgstr "已付"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: sale_margin
 #: help:sale.order,margin:0
 msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
-msgstr ""
+msgstr "通过计算单价和成本价之间的差额给出盈利状况"
 
 #. module: sale_margin
 #: field:report.account.invoice,type:0
@@ -112,12 +116,12 @@ msgstr ""
 #: field:report.account.invoice.product,type:0
 #: wizard_field:stock.invoice_onshipping,init,type:0
 msgid "Type"
-msgstr "类别"
+msgstr "类型"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_report_account_invoice_product
 msgid "Invoice Statistics"
-msgstr ""
+msgstr "发票统计"
 
 #. module: sale_margin
 #: field:report.account.invoice.partner.product,product_id:0
@@ -133,7 +137,7 @@ msgstr "单号必须唯一！"
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Invoice by Partner"
-msgstr ""
+msgstr "按业务伙伴查看发票"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
@@ -192,7 +196,7 @@ msgstr "7月"
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Extended Filters..."
-msgstr "扩展过滤器..."
+msgstr "增加筛选条件"
 
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
@@ -208,7 +212,7 @@ msgstr "日"
 #. module: sale_margin
 #: field:report.account.invoice.category,categ_id:0
 msgid "Categories"
-msgstr "类别"
+msgstr "分类"
 
 #. module: sale_margin
 #: field:account.invoice.line,cost_price:0
@@ -352,7 +356,7 @@ msgid ""
 "This report gives you an overview of all the invoices generated by the "
 "system. You can sort and group your results by specific selection criteria "
 "to quickly find what you are looking for."
-msgstr ""
+msgstr "此报表显示系统生成的所有发票的概况。你可以通过指定筛选条件对结果进行排序和分组，快速找到你想查看的信息。"
 
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
@@ -392,12 +396,12 @@ msgstr "销售订单"
 #: selection:report.account.invoice.partner.product,state:0
 #: selection:report.account.invoice.product,state:0
 msgid "Open"
-msgstr ""
+msgstr "开启"
 
 #. module: sale_margin
 #: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "发票分析"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
diff --git a/addons/sale_margin/report/report_margin.py b/addons/sale_margin/report/report_margin.py
deleted file mode 100644
index a318a6c17b8..00000000000
--- a/addons/sale_margin/report/report_margin.py
+++ /dev/null
@@ -1,90 +0,0 @@
-##############################################################################
-#    
-#    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
-import pooler
-from tools import config
-import time
-import tools
-
-
-
-class report_account_invoice_product(osv.osv):
-    _name = 'report.account.invoice.product'
-    _auto = False
-    _description = "Invoice Statistics"    
-    _columns = {
-        'date': fields.date('Date', readonly=True),                
-        'year': fields.char('Year', size=4, readonly=True),
-        'day': fields.char('Day', size=128, 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),
-        'type': fields.selection([
-            ('out_invoice','Customer Invoice'),
-            ('in_invoice','Supplier Invoice'),
-            ('out_refund','Customer Refund'),
-            ('in_refund','Supplier Refund'),
-        ],'Type', readonly=True),
-        'state': fields.selection([
-            ('draft','Draft'),
-            ('proforma','Pro-forma'),
-            ('open','Open'),
-            ('paid','Paid'),
-            ('cancel','Canceled')
-        ],'State', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'amount': fields.float('Amount', readonly=True),
-        'cost_price': fields.float('Cost Price', readonly=True),
-        'margin': fields.float('Margin', readonly=True),
-        'categ_id': fields.many2one('product.category', 'Categories', readonly=True),        
-        'quantity': fields.float('Quantity', readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_account_invoice_product')        
-        cr.execute("""
-            create or replace view report_account_invoice_product as (
-                select
-                    min(l.id) as id,
-                    i.create_date as date,                    
-                    to_char(date_trunc('day',i.date_invoice), 'YYYY') as year,
-                    to_char(date_trunc('day',i.date_invoice), 'MM') as month,
-                    to_char(date_trunc('day',i.date_invoice), 'YYYY-MM-DD') as day,                    
-                    i.type,
-                    i.state,
-                    l.product_id,
-                    t.categ_id,
-                    i.partner_id,
-                    sum(l.quantity * l.price_unit * (1.0 - l.discount/100.0)) as amount,
-                    sum(l.quantity * l.cost_price) as cost_price,
-                    sum((l.quantity * l.price_unit * (1.0 - l.discount/100.0) - (l.quantity * l.cost_price))) as margin,
-                    sum(l.quantity) as quantity
-                from account_invoice i
-                    left join account_invoice_line l on (i.id = l.invoice_id)
-                    left join product_product p on (p.id = l.product_id)
-                    left join product_template t on (t.id = p.product_tmpl_id)                    
-                group by t.categ_id,i.partner_id,l.product_id, i.date_invoice, i.type, i.state,i.create_date
-            )
-        """)
-report_account_invoice_product()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
deleted file mode 100644
index 4e0d939b567..00000000000
--- a/addons/sale_margin/report/report_margin_view.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-
-		<record model="ir.ui.view" id="view_report_account_invoice_tree">
-			<field name="name">report.account.invoice.product.tree</field>
-			<field name="model">report.account.invoice.product</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Invoices by product">
-					<field name="date"/>
-	                <field name="year" invisible="1" />
-                	<field name="month" invisible="1"/>
-                	<field name="day" invisible="1"/>
-					<field name="type"/>
-					<field name="state"/>
-					<field name="product_id" invisible="1" />
-					<field name="partner_id"/>
-					<field name="categ_id" invisible="1" />
-					<field name="amount"/>
-					<field name="cost_price"/>
-					<field name="margin"/>
-					<field name="quantity"/>
-				</tree>
-			</field>
-		</record>
-		
-         <record id="view_report_account_invoice_filter" model="ir.ui.view">
-            <field name="name">account.invoice.product.filter</field>
-            <field name="model">report.account.invoice.product</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Margin">
-                    <group col="10" colspan="4">
-						<filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
-						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
-						<separator orientation="vertical"/>
-						<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                   		<filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
-                   		<filter string="Current" icon="terp-check" domain="[('state', '=' ,'open')]" help="open Invoices"/>
-	                	<filter string="Done" icon="terp-dialog-close" domain="[('state','=','paid')]" help="Done Invoices"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="date" string="Date Invoiced"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="amount" />
-                        <field name="state"/>
-                        <newline/>
-                        <field name="product_id"/>
-                        <field name="categ_id"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
-	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-	                    <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
- 						<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
- 						<separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-go-month" 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="view_report_account_invoice_graph" model="ir.ui.view">
-             <field name="name">report.account.invoice.product.graph</field>
-             <field name="model">report.account.invoice.product</field>
-             <field name="type">graph</field>
-             <field name="arch" type="xml">
-                 <graph string="Invoice by Partner" type="pie">
-                	<field name="partner_id"/>
-					<field name="margin"/>
-                 </graph>
-             </field>
-        </record>
-                
-		<record id="action_report_account_invoice_report" model="ir.actions.act_window">
-	        <field name="name">Invoice Analysis</field>
-	        <field name="res_model">report.account.invoice.product</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,graph</field>
-	        <field name="context">{"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]}</field>
-	        <field name="search_view_id" ref="view_report_account_invoice_filter"/>
-            <field name="help">This report gives you an overview of all the invoices generated by the system. You can sort and group your results by specific selection criteria to quickly find what you are looking for.</field>
-	    </record>		
-
-		<menuitem name="Invoice Report" id="menu_report_account_invoice_product" parent="account.menu_finance_reporting"/>
-
-		<menuitem name="Invoice" id="menu_report_account_invoice_reoirt" parent="menu_report_account_invoice_product" action="action_report_account_invoice_report" groups="account.group_account_manager"/>
-	</data>
-</openerp>
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 24f36b9f94b..82a7150b6d1 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -25,12 +25,14 @@ class sale_order_line(osv.osv):
 
     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):
+            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False, context=None):
         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)
+            lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
+        if not pricelist:
+            return res
         frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
-        to_cur = self.pool.get('res.partner').browse(cr, uid, partner_id).property_product_pricelist.currency_id.id
+        to_cur = self.pool.get('product.pricelist').browse(cr, uid, [pricelist])[0].currency_id.id
         if product:
             purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
             price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False)
@@ -49,7 +51,8 @@ class sale_order_line(osv.osv):
         return res
 
     _columns = {
-        'margin': fields.function(_product_margin, string='Margin', store=True),
+        'margin': fields.function(_product_margin, string='Margin',
+              store = True),
         'purchase_price': fields.float('Cost Price', digits=(16,2))
     }
 
@@ -66,48 +69,16 @@ class sale_order(osv.osv):
                 result[sale.id] += line.margin or 0.0
         return result
 
+    def _get_order(self, cr, uid, ids, context=None):
+        return super(self,sale_order)._get_order(cr, uid, ids, context=context)
+
     _columns = {
-        'margin': fields.function(_product_margin, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
+        'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={
+                'sale.order.line': (_get_order, ['margin'], 20),
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 20),
+                }),
     }
 
 sale_order()
 
-class stock_picking(osv.osv):
-    _inherit = 'stock.picking'
-
-    _columns = {
-        'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]),
-    }
-
-    def action_invoice_create(self, cr, uid, ids, journal_id=False,
-            group=False, type='out_invoice', context=None):
-        # need to carify with new requirement
-        invoice_ids = []
-        picking_obj = self.pool.get('stock.picking')
-        res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=journal_id, group=group, type=type, context=context)
-        invoice_ids = res.values()
-        picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]})
-        return res
-
-stock_picking()
-
-class account_invoice_line(osv.osv):
-    _inherit = "account.invoice.line"
-    _columns = {
-        'cost_price': fields.float('Cost Price', digits=(16, 2)),
-    }
-    def write(self, cr, uid, ids, vals, context=None):
-        if vals.get('product_id', False):
-            res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
-            vals['cost_price'] = res[0]['standard_price']
-        return super(account_invoice_line, self).write(cr, uid, ids, vals, context)
-
-    def create(self, cr, uid, vals, context=None):
-        if vals.get('product_id',False):
-            res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
-            vals['cost_price'] = res[0]['standard_price']
-        return super(account_invoice_line, self).create(cr, uid, vals, context)
-
-account_invoice_line()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 201dd12d7a0..ad0b8440f19 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -20,7 +20,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
+            <xpath expr="//field[@name='order_line']/form//field[@name='price_unit']" position="after">
                 <field name="purchase_price"/>
             </xpath>
         </field>
@@ -32,7 +32,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-           <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after">
+           <xpath expr="//field[@name='order_line']/tree//field[@name='price_unit']" position="after">
                 <field name="purchase_price"/>
             </xpath>
         </field>
@@ -61,21 +61,6 @@
             </field>
         </field>
     </record>    
-    
-    
-    <record model="ir.ui.view" id="view_picking_margin_out_form">
-        <field name="name">picking.margin.view.form</field>
-        <field name="type">form</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_out_form" />
-        <field name="arch" type="xml">
-        <xpath expr="/form/notebook/page[@string='Additional info']" position="after">
-            <page string="Customer Invoices">
-               <field colspan="4" name="invoice_ids" nolabel="1"/>
-            </page>    
-        </xpath>
-        </field>
-    </record>
-    
+
 </data>
 </openerp>
diff --git a/addons/sale_margin/security/ir.model.access.csv b/addons/sale_margin/security/ir.model.access.csv
index d7752fa1961..0343f29f43a 100644
--- a/addons/sale_margin/security/ir.model.access.csv
+++ b/addons/sale_margin/security/ir.model.access.csv
@@ -1,2 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_invoice_product","report.account.invoice.product","model_report_account_invoice_product","account.group_account_manager",1,1,1,1
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 1fd1fab9d2f..7d4443a3cce 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Sales and MRP Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 This module provides facility to the user to install mrp and sales modulesat a time.
diff --git a/addons/sale_mrp/i18n/bg.po b/addons/sale_mrp/i18n/bg.po
index 88c983522b9..8654f32f0a8 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 741bd27fb23..8b7f89f116e 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..5654cd805c9
--- /dev/null
+++ b/addons/sale_mrp/i18n/da.po
@@ -0,0 +1,66 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-02 15:29+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: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sales "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sales order.\n"
+"    It adds sales name and sales Reference on production order\n"
+"    "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Salgs- og produktionsstyring"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Ordre antal kan ikke være negativ eller 0."
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr ""
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
index 90fa7dd747a..316971ae944 100644
--- a/addons/sale_mrp/i18n/de.po
+++ b/addons/sale_mrp/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -74,33 +74,3 @@ msgstr "Bestellmengen können nicht negativ oder '0' sein !"
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr "Anzeige der Auftragsbezeichnung durch den Verkauf"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
-#~ msgid "Sale Name"
-#~ msgstr "Verkauf Bezeichnung"
-
-#~ msgid "Indicate the Customer Reference from sale order."
-#~ msgstr "Anzeige Kundenreferenz in Verkaufsauftrag"
-
-#~ msgid "Indicate the name of sale order."
-#~ msgstr "Zeigt die Bezeichnung für den Verkaufsauftrag"
-
-#~ msgid "Sale Reference"
-#~ msgstr "Verkaufsauftrag"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index 7e1c90a15a6..c1b117df7e7 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -73,33 +73,3 @@ msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr "Indica el nombre del pedido de venta."
-
-#~ msgid "Indicate the name of sale order."
-#~ msgstr "Indica el nombre del pedido de venta."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Sale Name"
-#~ msgstr "Nombre venta"
-
-#~ msgid "Sale Reference"
-#~ msgstr "Referencia venta"
-
-#~ msgid "Indicate the Customer Reference from sale order."
-#~ msgstr "Indica la referencia del cliente desde el pedido de venta."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/sale_mrp/i18n/es_CL.po b/addons/sale_mrp/i18n/es_CL.po
new file mode 100644
index 00000000000..93a417a462c
--- /dev/null
+++ b/addons/sale_mrp/i18n/es_CL.po
@@ -0,0 +1,74 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-10-18 18:35+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: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Indica la referencia del cliente del pedido de venta."
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Referencia venta"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sales "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sales order.\n"
+"    It adds sales name and sales Reference on production order\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona facilidades al usuario para instalar los módulos "
+"mrp y sale\n"
+"    a la vez. Se utiliza básicamente cuando queremos hacer un seguimiento de "
+"las\n"
+"    órdenes de producción generadas a partir del pedido de cliente.\n"
+"    Añade el nombre y la referencia de la venta en la orden de producción.\n"
+"    "
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Nombre Venta"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Gestión de ventas y MRP"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Indica el nombre del pedido de venta."
diff --git a/addons/sale_mrp/i18n/es_MX.po b/addons/sale_mrp/i18n/es_MX.po
new file mode 100644
index 00000000000..1691681e1db
--- /dev/null
+++ b/addons/sale_mrp/i18n/es_MX.po
@@ -0,0 +1,75 @@
+# 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-28 07:51+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Indica la referencia del cliente del pedido de venta."
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Referencia venta"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sales "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sales order.\n"
+"    It adds sales name and sales Reference on production order\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona facilidades al usuario para instalar los módulos "
+"mrp y sale\n"
+"    a la vez. Se utiliza básicamente cuando queremos hacer un seguimiento de "
+"las\n"
+"    órdenes de producción generadas a partir del pedido de cliente.\n"
+"    Añade el nombre y la referencia de la venta en la orden de producción.\n"
+"    "
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Nombre venta"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Gestión de ventas y MRP"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Indica el nombre del pedido de venta."
diff --git a/addons/sale_mrp/i18n/es_VE.po b/addons/sale_mrp/i18n/es_VE.po
new file mode 100644
index 00000000000..1691681e1db
--- /dev/null
+++ b/addons/sale_mrp/i18n/es_VE.po
@@ -0,0 +1,75 @@
+# 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-28 07:51+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:47+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Indica la referencia del cliente del pedido de venta."
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Referencia venta"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sales "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sales order.\n"
+"    It adds sales name and sales Reference on production order\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo proporciona facilidades al usuario para instalar los módulos "
+"mrp y sale\n"
+"    a la vez. Se utiliza básicamente cuando queremos hacer un seguimiento de "
+"las\n"
+"    órdenes de producción generadas a partir del pedido de cliente.\n"
+"    Añade el nombre y la referencia de la venta en la orden de producción.\n"
+"    "
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Nombre venta"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Gestión de ventas y MRP"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Indica el nombre del pedido de venta."
diff --git a/addons/sale_mrp/i18n/et.po b/addons/sale_mrp/i18n/et.po
index 22710dffb2e..04545e91888 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -64,11 +64,3 @@ msgstr ""
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
diff --git a/addons/sale_mrp/i18n/fi.po b/addons/sale_mrp/i18n/fi.po
index 6be833d9b5e..d6ccb929f06 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 59298ebd296..f49b218bb0f 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -72,12 +72,3 @@ msgstr "La quantité commandée ne peut être ni négative ni nulle !"
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr "Indique le nom du bon de commandes."
-
-#~ msgid "Indicate the name of sale order."
-#~ msgstr "Indique le nom de la commande de vente."
-
-#~ msgid "Sale Reference"
-#~ msgstr "Référence de la commande"
-
-#~ msgid "Indicate the Customer Reference from sale order."
-#~ msgstr "Indique la référence client de la commande de vente."
diff --git a/addons/sale_mrp/i18n/gl.po b/addons/sale_mrp/i18n/gl.po
index e9d3bfc6be4..36a40cfb39c 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9944810420b..20ac067e3e7 100644
--- a/addons/sale_mrp/i18n/hu.po
+++ b/addons/sale_mrp/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-01 22:23+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e8b59675c49..a5398042de5 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f0ed80d28a5..e027d922452 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -64,9 +64,3 @@ msgstr "Захиалгын тоо хэмжээ тэгээс их эерэг то
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr ""
-
-#~ msgid "Sale Name"
-#~ msgstr "Борлуулалтын Нэр"
-
-#~ msgid "Sale Reference"
-#~ msgstr "Борлуулалтын Лавлах"
diff --git a/addons/sale_mrp/i18n/nl.po b/addons/sale_mrp/i18n/nl.po
index 297039c7f88..b03dde3e388 100644
--- a/addons/sale_mrp/i18n/nl.po
+++ b/addons/sale_mrp/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4cf0a6e30c1..96138e37c9b 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -71,42 +71,3 @@ msgstr "Zamawiana ilośc nie może być  ujemna lub zerowa !"
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr "Wskazuje nazwę zamówienia sprzedaży."
-
-#~ msgid "Indicate the name of sale order."
-#~ msgstr "Określ nazwę zamówienia sprzedaży"
-
-#~ msgid "Indicate the Customer Reference from sale order."
-#~ msgstr "Określ odnośnik klienta z zamówienia sprzedaży"
-
-#~ msgid "Sale Name"
-#~ msgstr "Nazwa sprzedaży"
-
-#~ msgid "Sale Reference"
-#~ msgstr "Odnośnik sprzedaży"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module provides facility to the user to install mrp and sale "
-#~ "modules\n"
-#~ "    at a time. It is basically used when we want to keep track of "
-#~ "production\n"
-#~ "    orders generated from sale orders.\n"
-#~ "    It adds sale name and sale Reference on production order\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Ten moduł zwiększający funkcjonalność modułów mrp i sale. \n"
-#~ "    Jest on stosowany głównie kiedy chcemy losy zamówień \n"
-#~ "    produkcji tworzonych z zamówień sprzedaży.\n"
-#~ "    Moduł dodaje nazwę sprzedaży i odnośnik sprzedaży do \n"
-#~ "    zamówienia produkcji.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/sale_mrp/i18n/pt.po b/addons/sale_mrp/i18n/pt.po
index fb73b06b8a9..dcfd11c49e8 100644
--- a/addons/sale_mrp/i18n/pt.po
+++ b/addons/sale_mrp/i18n/pt.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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
 msgid "Indicate the Customer Reference from sales order."
-msgstr ""
+msgstr "Indique a Referência do Cliente do pedido de venda."
 
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sales Reference"
-msgstr ""
+msgstr "Referência da Venda"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -48,7 +48,7 @@ msgstr ""
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sales Name"
-msgstr ""
+msgstr "Nome da Venda"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
@@ -58,36 +58,9 @@ msgstr ""
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "A quantidade numa encomenda não pode ser igual ou inferior a zero!"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr ""
-
-#~ msgid "Indicate the name of sale order."
-#~ msgstr "Indique o nome da ordem de venda"
-
-#~ msgid "Indicate the Customer Reference from sale order."
-#~ msgstr "Indique a referência do cliente, da ordem de venda."
-
-#~ 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 "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura de vista"
-
-#~ msgid "Sale Name"
-#~ msgstr "Nome da Venda"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
+msgstr "Indique o nome do pedido de venda."
diff --git a/addons/sale_mrp/i18n/pt_BR.po b/addons/sale_mrp/i18n/pt_BR.po
index 951bac4f887..7b8d69fda99 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -70,33 +70,3 @@ msgstr "Quantidade da Ordem não pode ser negativa ou zero !"
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr "Indica o nome do pedido de venda."
-
-#~ msgid "Indicate the name of sale order."
-#~ msgstr "Indicar o nome de pedido."
-
-#~ msgid "Indicate the Customer Reference from sale order."
-#~ msgstr "Indicar a referência de Cliente a partir do pedido."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Sale Name"
-#~ msgstr "Nome de Venda"
-
-#~ msgid "Sale Reference"
-#~ msgstr "Referência de Venda"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/sale_mrp/i18n/ro.po b/addons/sale_mrp/i18n/ro.po
index c97c6db8834..3c022287be6 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2f79f0fa037..5a46df03b65 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -72,18 +72,3 @@ msgstr "Количество в заказе не может быть отриц
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 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 "Sale Reference"
-#~ msgstr "Ссылка на продажу"
-
-#~ msgid "Sale Name"
-#~ msgstr "Название продажи"
diff --git a/addons/sale_mrp/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
index be1270e032b..f882c32df67 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -64,11 +64,3 @@ msgstr ""
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
diff --git a/addons/sale_mrp/i18n/sr@latin.po b/addons/sale_mrp/i18n/sr@latin.po
index 22f0613a1af..a9cc59efe04 100644
--- a/addons/sale_mrp/i18n/sr@latin.po
+++ b/addons/sale_mrp/i18n/sr@latin.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-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-05 11:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-10-13 15:09+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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
 msgid "Indicate the Customer Reference from sales order."
-msgstr ""
+msgstr "Označite referencu kupca za prodajni nalog."
 
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sales Reference"
-msgstr ""
+msgstr "Referenca prodaje"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Nalog proizvodnje"
 
 #. module: sale_mrp
 #: model:ir.module.module,description:sale_mrp.module_meta_information
@@ -44,23 +44,30 @@ msgid ""
 "    It adds sales name and sales Reference on production order\n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj modul omogučava korisniku instaliranje mrp i prodajnih modula\n"
+"   u dogledno vreme. U osnovi, upotrebljava se kad želimo pratiti pravljenje "
+"proizvodnih\n"
+"   naloga iz naloga za prodaju.\n"
+"    Dodaje naziv prodaje i referencu prodaje na proizvodni nalog\n"
+"    "
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sales Name"
-msgstr ""
+msgstr "Naziv prodaje"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "Prodaja i MRP uređivanje"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Količina naloga ne može biti negativna ili nula !"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr ""
+msgstr "Označite naziv za prodajni nalog"
diff --git a/addons/sale_mrp/i18n/tr.po b/addons/sale_mrp/i18n/tr.po
index 19ad98b3bbf..65b9207eee2 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: 2011-04-29 05:44+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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 121e60bffee..745f757f041 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/i18n/zh_CN.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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
+"X-Generator: Launchpad (build 14231)\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
 msgid "Sales Reference"
-msgstr ""
+msgstr "销售订单"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr "生成订单"
+msgstr "生产单"
 
 #. module: sale_mrp
 #: model:ir.module.module,description:sale_mrp.module_meta_information
@@ -44,11 +44,16 @@ msgid ""
 "    It adds sales name and sales Reference on production order\n"
 "    "
 msgstr ""
+"\n"
+"    这模块提方便用户一次安装MRP和销售模块。\n"
+"它基本是用于跟踪从销售订单生成生产单。\n"
+"它在生产单中加入销售名称和销售订单。\n"
+"    "
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sales Name"
-msgstr ""
+msgstr "销售名称"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
@@ -63,4 +68,4 @@ msgstr "订单数量不能为0或者负数!"
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr ""
+msgstr "在销售订单中标识出这名称"
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index eb7e3a516fa..f88a2777a00 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Sales Order Dates',
+    'name': 'Full Dates on Sales Order',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 Add additional date information to the sales order.
diff --git a/addons/sale_order_dates/i18n/bg.po b/addons/sale_order_dates/i18n/bg.po
index e075feda778..d152091225f 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ea0dc54bc2b..5bb6a6bf3c6 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..e5f079b2f11
--- /dev/null
+++ b/addons/sale_order_dates/i18n/da.po
@@ -0,0 +1,70 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-02 15:24+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: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordre reference skal være unik"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Den dato, som kunden har begæret salget"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Salgsordre dato"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Plukdato"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Leveringsdato"
diff --git a/addons/sale_order_dates/i18n/de.po b/addons/sale_order_dates/i18n/de.po
index 8f938516ada..0bf508df82c 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -70,41 +70,3 @@ msgstr ""
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
 msgstr "Vereinbarter Liefertermin"
-
-#~ msgid "Sale Order Dates"
-#~ msgstr "Verkaufsauftrag Datum"
-
-#~ msgid "Add commitment, requested and effective dates on the sale order.\n"
-#~ msgstr ""
-#~ "fügt Bestätigungsdatum, Anfragedatum und effektives Datum zum "
-#~ "Verkaufsauftrag hinzu\n"
-
-#~ msgid "Sale Order"
-#~ msgstr "Verkaufsauftrag"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
-#~ msgid "Date on which picking is created"
-#~ msgstr "Datum der Lieferscheinerstellung"
-
-#~ msgid "Date on which delivery of products is to be made"
-#~ msgstr "Termin der laut Liefervereinbarung als Lieferzeit versprochen wurde."
-
-#~ msgid "Date on which customer has requested for sales"
-#~ msgstr "Termin den Kunde bei Vertrieb angefragt hat."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/sale_order_dates/i18n/el.po b/addons/sale_order_dates/i18n/el.po
index 6b15c905758..c99567db9cf 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -68,12 +68,3 @@ msgstr ""
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
 msgstr "Ημερομηνία που θα γίνει η παράδοση των προϊόντων."
-
-#~ msgid "Date on which picking is created"
-#~ msgstr "Ημερομηνία που δημιουργήθηκε η παραλαβή"
-
-#~ msgid "Sale Order"
-#~ msgstr "Παραγγελία Πώλησης"
-
-#~ msgid "Sale Order Dates"
-#~ msgstr "Ημερομηνίες Παραγγελιών Πώλησης"
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index 18e5d634c2c..fb447dbb7a4 100644
--- a/addons/sale_order_dates/i18n/es.po
+++ b/addons/sale_order_dates/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -71,36 +71,3 @@ msgstr ""
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
 msgstr "Fecha en que la entrega de productos se va a realizar."
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido venta"
-
-#~ msgid "Sale Order Dates"
-#~ msgstr "Fechas en pedidos de venta"
-
-#~ msgid "Date on which delivery of products is to be made"
-#~ msgstr "Fecha en que la entrega de los productos se debe realizar."
-
-#~ msgid "Date on which picking is created"
-#~ msgstr "Fecha en que se ha creado el albarán."
-
-#~ msgid "Date on which customer has requested for sales"
-#~ msgstr "Fecha en que el cliente ha solicitado la venta."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/sale_order_dates/i18n/es_CL.po b/addons/sale_order_dates/i18n/es_CL.po
new file mode 100644
index 00000000000..16adc5a742b
--- /dev/null
+++ b/addons/sale_order_dates/i18n/es_CL.po
@@ -0,0 +1,72 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-10-18 18:43+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: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Fecha en que el cliente ha solicitado la venta."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Fecha compromiso"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Fecha de Vencimiento"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Fechas en pedidos de venta"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Fecha en que la guía de despacho ha sido creada."
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Fecha de Pedido"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venta"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Añade las fechas de compromiso, pedido y vencimiento en el pedido de venta.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Fecha en que la entrega de productos se va a realizar."
diff --git a/addons/sale_order_dates/i18n/es_MX.po b/addons/sale_order_dates/i18n/es_MX.po
new file mode 100644
index 00000000000..eab28a11f04
--- /dev/null
+++ b/addons/sale_order_dates/i18n/es_MX.po
@@ -0,0 +1,73 @@
+# 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-13 10:05+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Fecha en que el cliente ha solicitado la venta."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Fecha compromiso"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Fecha efectiva"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Fechas en pedidos de venta"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Fecha en que el albarán ha sido creado."
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Fecha solicitud"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Añade las fechas de compromiso, solicitada y efectiva en el pedido de "
+"venta.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Fecha en que la entrega de productos se va a realizar."
diff --git a/addons/sale_order_dates/i18n/es_MX.po.moved b/addons/sale_order_dates/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..b682cb925d7
--- /dev/null
+++ b/addons/sale_order_dates/i18n/es_MX.po.moved
@@ -0,0 +1,71 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_dates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-05 16:02+0000\n"
+"PO-Revision-Date: 2011-07-05 16: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: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Fecha en que el cliente ha solicitado la venta."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Fecha compromiso"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Fecha efectiva"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Fechas en pedidos de venta"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Fecha en que la orden ha sido creada."
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Fecha solicitud"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid "\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+""
+msgstr "\n"
+"Añade las fechas de compromiso, solicitada y efectiva en el pedido de venta.\n"
+""
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Fecha en que la entrega de productos se va a realizar."
+
diff --git a/addons/sale_order_dates/i18n/es_VE.po b/addons/sale_order_dates/i18n/es_VE.po
new file mode 100644
index 00000000000..eab28a11f04
--- /dev/null
+++ b/addons/sale_order_dates/i18n/es_VE.po
@@ -0,0 +1,73 @@
+# 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-13 10:05+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Fecha en que el cliente ha solicitado la venta."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Fecha compromiso"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Fecha efectiva"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Fechas en pedidos de venta"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Fecha en que el albarán ha sido creado."
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Fecha solicitud"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Añade las fechas de compromiso, solicitada y efectiva en el pedido de "
+"venta.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Fecha en que la entrega de productos se va a realizar."
diff --git a/addons/sale_order_dates/i18n/fi.po b/addons/sale_order_dates/i18n/fi.po
index 72a1ee7fde7..e6f97accc49 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: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f6d18da5d90..338d84b0d0b 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -71,18 +71,3 @@ msgstr ""
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
 msgstr "Date à laquelle la livraison des produits doit être faite."
-
-#~ msgid "Date on which picking is created"
-#~ msgstr "Date de préparation"
-
-#~ msgid "Date on which customer has requested for sales"
-#~ msgstr "Date demandée par le client"
-
-#~ msgid "Date on which delivery of products is to be made"
-#~ msgstr "Date à laquelle les produits doivent être livrés."
-
-#~ msgid "Sale Order"
-#~ msgstr "Commande de vente"
-
-#~ msgid "Sale Order Dates"
-#~ msgstr "Dates de commande de vente"
diff --git a/addons/sale_order_dates/i18n/gl.po b/addons/sale_order_dates/i18n/gl.po
index e94dfd96918..34eb8638f15 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b55a815e615..d3835048dbc 100644
--- a/addons/sale_order_dates/i18n/hu.po
+++ b/addons/sale_order_dates/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-26 13:07+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a02082a25bd..29b8411911b 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: 2011-05-12 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 52e4037337c..9397148335f 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 bf869abde0d..d49180f2a2d 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -68,12 +68,3 @@ msgstr ""
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
 msgstr ""
-
-#~ msgid "Date on which delivery of products is to be made"
-#~ msgstr "Бүтээгдэхүүний хүргэж өгөлт хийгдсэн огноо"
-
-#~ msgid "Sale Order"
-#~ msgstr "Борлуулалтын захиалга"
-
-#~ msgid "Date on which customer has requested for sales"
-#~ msgstr "Хэрэглэгч борлуулалтын хүсэлт гаргасан огноо"
diff --git a/addons/sale_order_dates/i18n/nl.po b/addons/sale_order_dates/i18n/nl.po
index db6dc5ffb52..5fd0e29aa4e 100644
--- a/addons/sale_order_dates/i18n/nl.po
+++ b/addons/sale_order_dates/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 66f118bdb1c..4d553e363d5 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0cde6c9e629..b191959ef00 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -68,6 +68,3 @@ msgstr ""
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
 msgstr ""
-
-#~ msgid "Sale Order"
-#~ msgstr "Ordem de venda"
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index 70966ecd3a9..2990f5e1e79 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7272a60b8d4..9c1c900a95c 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -35,7 +35,7 @@ msgstr "Дата предоставления"
 #. module: sale_order_dates
 #: field:sale.order,effective_date:0
 msgid "Effective Date"
-msgstr "Действительно до"
+msgstr "Дата вступления в силу"
 
 #. module: sale_order_dates
 #: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
@@ -70,27 +70,3 @@ msgstr ""
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
 msgstr "Дата на которую должна быть сделана доставка."
-
-#~ msgid "Sale Order Dates"
-#~ msgstr "Даты заказа на продажу"
-
-#~ msgid "Date on which delivery of products is to be made"
-#~ msgstr "Дата на которую должна быть сделана доставка"
-
-#~ msgid "Date on which picking is created"
-#~ msgstr "Дата на которую производилось комплектование"
-
-#~ msgid "Date on which customer has requested for sales"
-#~ msgstr "Дата на которую заказчик обратился с заказом"
-
-#~ msgid "Sale Order"
-#~ msgstr "Заказ на продажу"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/sale_order_dates/i18n/sk.po b/addons/sale_order_dates/i18n/sk.po
index a7c01c18d53..df3c7ac544e 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..f1b7acf9d11
--- /dev/null
+++ b/addons/sale_order_dates/i18n/sl.po
@@ -0,0 +1,70 @@
+# Slovenian 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:16+0000\n"
+"PO-Revision-Date: 2011-11-16 22:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-11-17 05:22+0000\n"
+"X-Generator: Launchpad (build 14291)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca naročila more biti unikatna!"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Zahtevan Datum"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr ""
diff --git a/addons/sale_order_dates/i18n/sr@latin.po b/addons/sale_order_dates/i18n/sr@latin.po
new file mode 100644
index 00000000000..b5f0dba6f1f
--- /dev/null
+++ b/addons/sale_order_dates/i18n/sr@latin.po
@@ -0,0 +1,72 @@
+# Serbian Latin 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:16+0000\n"
+"PO-Revision-Date: 2011-10-17 13:50+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: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca nabavke mora biti jedinstvena !"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Datum kada je kupac zatražio prodaje"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Datum obavezivanja"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Efektivni datum"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Datumi prodajnih paloga"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Datum kada je biranje napravljeno"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Traženi datum"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalozi"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Dodaj datume obavezivanja, zatražene i efektivne na prodaje naloge.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Datum kada treba proizvodi da pristignu"
diff --git a/addons/sale_order_dates/i18n/sv.po b/addons/sale_order_dates/i18n/sv.po
index 5062e7d0cc7..57ea4160d2e 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 aad7dd1190c..b1bf23381db 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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1f886800e9f..c2ace86cb2a 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: 2011-06-29 04:43+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -25,12 +25,12 @@ msgstr "单号必须唯一！"
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date on which customer has requested for sales."
-msgstr "客户申请销售订单的日期"
+msgstr "客户要求的销售订单日期"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
 msgid "Commitment Date"
-msgstr ""
+msgstr "承诺日期"
 
 #. module: sale_order_dates
 #: field:sale.order,effective_date:0
@@ -45,12 +45,12 @@ msgstr "销售订单日期"
 #. module: sale_order_dates
 #: help:sale.order,effective_date:0
 msgid "Date on which picking is created."
-msgstr "创建分拣单日期"
+msgstr "创建装箱单日期"
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
 msgid "Requested Date"
-msgstr "申请日期"
+msgstr "要求的日期"
 
 #. module: sale_order_dates
 #: model:ir.model,name:sale_order_dates.model_sale_order
@@ -63,8 +63,10 @@ msgid ""
 "\n"
 "Add commitment, requested and effective dates on the sales order.\n"
 msgstr ""
+"\n"
+"增加承诺，销售订单上的要求的和生效日期\n"
 
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
-msgstr "发货单生成日期"
+msgstr "送货的日期"
diff --git a/addons/share/__init__.py b/addons/share/__init__.py
index e3c3acf1bc5..0ad202a6162 100644
--- a/addons/share/__init__.py
+++ b/addons/share/__init__.py
@@ -22,3 +22,5 @@
 import ir_model
 import res_users
 import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index f83f69abd1e..b9077109c3c 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -3,6 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2011 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
@@ -21,11 +22,11 @@
 
 
 {
-    "name" : "Sharing Tools",
-    "version" : "1.5",
-    "depends" : ["base"],
+    "name" : "Web Share",
+    "version" : "2.0",
+    "depends" : ["base", "mail"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
 This module adds generic sharing tools to your current OpenERP database.
@@ -53,6 +54,11 @@ synchronization with other companies, etc.
     'installable': True,
     'web': True,
     'certificate' : '001301246528927038493',
+    'js': ['static/src/js/share.js'],
+    'css': ['static/src/css/share.css'],
+    '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/bg.po b/addons/share/i18n/bg.po
index 520d797c0f3..e209e451cce 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr "Споделяне"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -105,7 +105,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -154,7 +154,7 @@ msgid "Share wizard: step 1"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -166,7 +166,7 @@ msgid "Share User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr ""
@@ -202,7 +202,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "New users (emails required)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -239,7 +239,7 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -274,7 +274,7 @@ msgid "Send Email Notification(s)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -282,7 +282,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "База данни"
@@ -316,19 +316,19 @@ msgid "Users to share with"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -346,7 +346,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -369,7 +369,7 @@ msgid "Domain"
 msgstr "Домейн"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -388,7 +388,7 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -407,7 +407,7 @@ msgid "Share"
 msgstr "Споделяне"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr ""
@@ -423,16 +423,17 @@ msgid "share.wizard.result.line"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr ""
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr ""
 
@@ -469,7 +470,7 @@ msgid "Read-only"
 msgstr "Само за четене"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr ""
diff --git a/addons/share/i18n/ca.po b/addons/share/i18n/ca.po
index 1aa66af429b..e3bf9be8c7c 100644
--- a/addons/share/i18n/ca.po
+++ b/addons/share/i18n/ca.po
@@ -8,15 +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:16+0000\n"
-"PO-Revision-Date: 2011-03-26 17:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-08-17 22:38+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -25,7 +24,7 @@ msgid "Sharing"
 msgstr "Compartits"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -76,6 +75,10 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
+"Benvolgut,\n"
+"\n"
+"%s\n"
+"\n"
 
 #. module: share
 #: constraint:res.users:0
@@ -114,7 +117,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr "Acabeu de configurar correctament un nou accés compartit!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Còpia per compartir)"
@@ -136,6 +139,8 @@ msgid ""
 "You may use the following login and password to get access to this protected "
 "area:\n"
 msgstr ""
+"Podeu utilitzar el següent nom d'usuari i contrasenya per accedir a aquesta "
+"àrea protegida:\n"
 
 #. module: share
 #: view:res.groups:0
@@ -163,7 +168,7 @@ msgid "Share wizard: step 1"
 msgstr "Assistent compartició: pas 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -175,7 +180,7 @@ msgid "Share User"
 msgstr "Comparteix usuari"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr "%s a compartit la informació %s d'OpenERP amb tu"
@@ -214,7 +219,7 @@ msgid "res.groups"
 msgstr "res.grups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (Compartit)"
@@ -230,7 +235,7 @@ msgid "New users (emails required)"
 msgstr "Nous usuaris (adreces de correu electrònic requerides)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Filtre de compartició creat per l'usuari %s (%s) per al grup %s"
@@ -251,7 +256,7 @@ msgid "Share Group"
 msgstr "Grup compartit"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -295,7 +300,7 @@ msgid "Send Email Notification(s)"
 msgstr "Envia notificacions per correu electrònic"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -305,7 +310,7 @@ msgstr ""
 "recordatori, el vostre login és %s.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Base de dades"
@@ -341,20 +346,20 @@ msgid "Users to share with"
 msgstr "Usuaris amb els quals compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 "Filtre de compartició indirecta creat per l'usuari %s (%s) per al grup %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "Correu electrònic requerit"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Accés copiat per a compartició"
@@ -376,7 +381,7 @@ msgstr ""
 "línia)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -401,7 +406,7 @@ msgid "Domain"
 msgstr "Domini"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -423,7 +428,7 @@ msgid "Access info"
 msgstr "Informació d'accés"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -444,7 +449,7 @@ msgid "Share"
 msgstr "Comparteix"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Assistent de compartició - Pas 2"
@@ -460,16 +465,17 @@ msgid "share.wizard.result.line"
 msgstr "comparteix.assistent.resultat.línia"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "No s'ha pogut configurar l'accés compartit"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Assistent de compartició"
 
@@ -509,7 +515,7 @@ msgid "Read-only"
 msgstr "Només lectura"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*contrasenya habitual*"
@@ -529,3 +535,9 @@ msgstr "*contrasenya habitual*"
 #~ msgstr ""
 #~ "Podeu utilitzar el següent usuari i contrasenya per accedir en aquesta àrea "
 #~ "protegida:"
+
+#~ msgid "Access Groups"
+#~ msgstr "Grups d'accés"
+
+#~ msgid "Sharing Tools"
+#~ msgstr "Eines de compartició"
diff --git a/addons/share/i18n/cs.po b/addons/share/i18n/cs.po
index 4249bae8975..1a6f473afed 100644
--- a/addons/share/i18n/cs.po
+++ b/addons/share/i18n/cs.po
@@ -8,59 +8,63 @@ 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-03-10 21:58+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-09-05 17:16+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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
 #, python-format
 msgid "Sharing"
-msgstr ""
+msgstr "Sdílení"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
 msgstr ""
+"Přídavná data byla automaticky přidána k vašemu aktuálnímu přístupu.\n"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Existing External Users"
-msgstr ""
+msgstr "Existující vnější uživatelé"
 
 #. module: share
 #: help:res.groups,share:0
 msgid "Group created to set access rights for sharing data with some users."
 msgstr ""
+"Skupina vytvořená k nastavení přístupových práv pro sdílení dat s některými "
+"uživateli."
 
 #. module: share
 #: model:ir.module.module,shortdesc:share.module_meta_information
 msgid "Share Management"
-msgstr ""
+msgstr "Správa sdílení"
 
 #. module: share
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Nemůžete mít dva uživatele se stejným přihlašovacím jménem !"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:76
 #, python-format
 msgid "Sharing Wizard - Step 1"
-msgstr ""
+msgstr "Průvodce sdílení - Krok 1"
 
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.ui.menu,name:share.menu_action_share_wizard
 msgid "Share Access Rules"
-msgstr ""
+msgstr "Pravidla přístupu sdílení"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:453
@@ -71,54 +75,60 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
+"Vážený,\n"
+"\n"
+"%s\n"
+"\n"
 
 #. module: share
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Vybraná společnost není v povolených společnostech pro tohoto uživatele"
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Next"
-msgstr ""
+msgstr "Další"
 
 #. module: share
 #: help:share.wizard,action_id:0
 msgid ""
 "The action that opens the screen containing the data you wish to share."
 msgstr ""
+"Akce, které otevírají obrazovku obsahující data, které chcete sdílet."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:68
 #, python-format
 msgid "Please specify \"share_root_url\" in context"
-msgstr ""
+msgstr "Prosíme zadejte \"share_root_url\" v kontextu"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Congratulations, you have successfully setup a new shared access!"
-msgstr ""
+msgstr "Blahopřejeme, úspěšně jste nastavili nový přístup sdílení!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
-msgstr ""
+msgstr "(Kopie pro sdílení)"
 
 #. module: share
 #: field:share.wizard.result.line,newly_created:0
 msgid "Newly created"
-msgstr ""
+msgstr "Nově vytvořeno"
 
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Generic Share Access URL"
-msgstr ""
+msgstr "Obecné přístupové URL sdílení"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:457
@@ -127,60 +137,62 @@ msgid ""
 "You may use the following login and password to get access to this protected "
 "area:\n"
 msgstr ""
+"Můžete použít následující přihlašovací jméno a heslo pro přístup k této "
+"chráněné oblasti:\n"
 
 #. module: share
 #: view:res.groups:0
 msgid "Regular groups only (no share groups"
-msgstr ""
+msgstr "Pouze běžné skupiny (žádné sídlecí skupiny"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Read & Write"
-msgstr ""
+msgstr "Čtení & Zápis"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share wizard: step 2"
-msgstr ""
+msgstr "Průvodce sdílením: krok 2"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share wizard: step 0"
-msgstr ""
+msgstr "Průvodce sdílením: krok 0"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share wizard: step 1"
-msgstr ""
+msgstr "Průvodce sdílením: krok 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Jméno uživatele"
 
 #. module: share
 #: field:res.users,share:0
 msgid "Share User"
-msgstr ""
+msgstr "Sdílet uživatele"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
-msgstr ""
+msgstr "%s má s tebou sdíleny OpenERP %s informace"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Finish"
-msgstr ""
+msgstr "Dokončit"
 
 #. module: share
 #: field:share.wizard,user_ids:0
 #: field:share.wizard.user,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:103
@@ -190,65 +202,68 @@ msgid ""
 "this person.\n"
 "You may want to try selecting existing shared users instead."
 msgstr ""
+"Uživatelské jméno (%s) již existuje, možná byla s touto osobou již data "
+"nasdílena.\n"
+"Možná místo toho chcete zkusit vybrat existující sdílené uživatele."
 
 #. module: share
 #: field:share.wizard,new_users:0
 msgid "New users"
-msgstr ""
+msgstr "Nový uživatelé"
 
 #. module: share
 #: model:ir.model,name:share.model_res_groups
 msgid "res.groups"
-msgstr ""
+msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
-msgstr ""
+msgstr "%s (Sdíleno)"
 
 #. module: share
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "Jméno skupiny musí být jedinečné !"
 
 #. module: share
 #: selection:share.wizard,user_type:0
 msgid "New users (emails required)"
-msgstr ""
+msgstr "Nový uživatelé (požadovány emaily)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
-msgstr ""
+msgstr "Filtr sdílení vytvořený uživatelem %s (%s) pro skupinu %s"
 
 #. module: share
 #: view:res.groups:0
 msgid "Groups"
-msgstr ""
+msgstr "Skupiny"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Select the desired shared access mode:"
-msgstr ""
+msgstr "Vyberte požadovaný režim přístupu sdílení:"
 
 #. module: share
 #: field:res.groups,share:0
 msgid "Share Group"
-msgstr ""
+msgstr "Sdílena skupina"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
-msgstr ""
+msgstr "Heslo"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Who would you want to share this data with?"
-msgstr ""
+msgstr "S kým chcete sdílet tato data?"
 
 #. module: share
 #: model:ir.module.module,description:share.module_meta_information
@@ -261,36 +276,46 @@ msgid ""
 "users/ will only have access to the correct data.\n"
 "    "
 msgstr ""
+"Cíl je realizovat obecné mechanizmi sdílení, kde uživatel OpenERP\n"
+"může sdílet data z OpenERP svým kolegům, zákazníkům nebo přátelům.\n"
+"Systém bude pracovat s vytvořením nových uživatelů a skupin za běhu, a "
+"pomocí\n"
+"kombinování odpovídajících přístupových práv a ir.rules pro ujištění se, že "
+"\n"
+"pouze /sdílení uživatelé/ budou mít přístup ke správným datům.\n"
+"    "
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:102
 #, python-format
 msgid "User already exists"
-msgstr ""
+msgstr "Uživatel již existuje"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Send Email Notification(s)"
-msgstr ""
+msgstr "Poslat emailové upozornění"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
 "login is %s.\n"
 msgstr ""
+"Můžete použít vaše existující jméno a heslo k jeho zobrazení. Jako "
+"připomenutí, váše přihlášení je %s.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
-msgstr ""
+msgstr "Databáze"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_user
 msgid "share.wizard.user"
-msgstr ""
+msgstr "share.wizard.user"
 
 #. module: share
 #: view:share.wizard:0
@@ -298,40 +323,42 @@ msgid ""
 "Please select the action that opens the screen containing the data you want "
 "to share."
 msgstr ""
+"Prosíme vyberte akci, která otevírá obrazovku obsahující data, které chcete "
+"sdílet."
 
 #. module: share
 #: selection:share.wizard,user_type:0
 msgid "Existing external users"
-msgstr ""
+msgstr "Existující vnější uživatelé"
 
 #. module: share
 #: view:share.wizard:0
 #: field:share.wizard,result_line_ids:0
 msgid "Summary"
-msgstr ""
+msgstr "Shrnutí"
 
 #. module: share
 #: field:share.wizard,user_type:0
 msgid "Users to share with"
-msgstr ""
+msgstr "Uživatele pro sdílení s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
-msgstr ""
+msgstr "Filtr nepřímého sdílení vytvořený uživatelem %s (%s) pro skupinu %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "Požadován email"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
-msgstr ""
+msgstr "Zkopírované práva pro sdílení"
 
 #. module: share
 #: view:share.wizard:0
@@ -339,100 +366,111 @@ msgid ""
 "Optionally, you may specify an additional domain restriction that will be "
 "applied to the shared data."
 msgstr ""
+"Volitelně, můžete zadat přídavné omezení domén, které bude použito na "
+"sdílená data."
 
 #. module: share
 #: view:share.wizard:0
 msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
+"Nový uživatelé (prosíme poskytněte jednu e-mailovou adresu na řádek níže)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
 "to be able to send outgoing emails."
 msgstr ""
+"Aktuální uživatel musí mít emailovou adresu nastavenu v Předvolbách "
+"uživatele, aby byllo možné odeslat odchozí emaily."
 
 #. module: share
 #: view:res.users:0
 msgid "Regular users only (no share user)"
-msgstr ""
+msgstr "Pouze běžní uživatelé (žádní sdílení uživatelé)"
 
 #. module: share
 #: field:share.wizard.result.line,share_url:0
 msgid "Share URL"
-msgstr ""
+msgstr "Sdílet URL"
 
 #. module: share
 #: field:share.wizard,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Doména"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
 "supported at the moment.\n"
 "You may want to try a simpler filter."
 msgstr ""
+"Omlouváme se, aktuální obrazovka a filtr, který se snažíte nasdílet nejsou "
+"nyní podporovány.\n"
+"Můžete zkusit jednodušší filtr."
 
 #. module: share
 #: field:share.wizard,access_mode:0
 msgid "Access Mode"
-msgstr ""
+msgstr "Režim přístupu"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Access info"
-msgstr ""
+msgstr "Přístupové informace"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
 "    %s"
 msgstr ""
+"K jeho přístupu, můžete jít na následující URL:\n"
+"    %s"
 
 #. module: share
 #: field:share.wizard,action_id:0
 msgid "Action to share"
-msgstr ""
+msgstr "Akce ke sdílení"
 
 #. module: share
 #: code:addons/share/web/editors.py:18
 #, python-format
 msgid "Share"
-msgstr ""
+msgstr "Sdílení"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
-msgstr ""
+msgstr "Průvodce sdílením - Krok 2"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Here is a summary of the access points you have just created:"
-msgstr ""
+msgstr "Zde je souhrn přístupových bodů, které jste právě vytvořili:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
 msgid "share.wizard.result.line"
-msgstr ""
+msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
-msgstr ""
+msgstr "Sdílený přístup nelze nastavit"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Průvodce sdílením"
 
@@ -444,7 +482,7 @@ msgstr "Vyberte typ uživatele(ů), se kterým(i) chcete sdílet data."
 #. module: share
 #: view:share.wizard:0
 msgid "Cancel"
-msgstr "Storno"
+msgstr "Zrušit"
 
 #. module: share
 #: view:share.wizard:0
@@ -457,12 +495,12 @@ msgid ""
 "External user with limited access, created only for the purpose of sharing "
 "data."
 msgstr ""
-"Externí uživatel s omezeným přístupem, vytvořený pouze za účelem sdílení dat."
+"Vnější uživatel s omezeným přístupem, vytvořený pouze za účelem sdílení dat."
 
 #. module: share
 #: help:share.wizard,domain:0
 msgid "Optional domain for further data filtering"
-msgstr "Případná doména pro další filtrování dat"
+msgstr "Volitelná doména pro další filtrování dat"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
@@ -470,7 +508,7 @@ msgid "Read-only"
 msgstr "Pouze ke čtení"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*obvyklé heslo*"
diff --git a/addons/share/i18n/da.po b/addons/share/i18n/da.po
new file mode 100644
index 00000000000..31f542710c7
--- /dev/null
+++ b/addons/share/i18n/da.po
@@ -0,0 +1,476 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-09-23 17:42+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: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:462
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr ""
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:275
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:458
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:452
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:149
+#, python-format
+msgid "%s (Shared)"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:418
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:459
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Adgangskode"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:463
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:460
+#, python-format
+msgid "Database"
+msgstr "Database"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:304
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:240
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:314
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:454
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:313
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:323
+#, python-format
+msgid "*usual password*"
+msgstr ""
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index 43884624cc4..1c1e17c8329 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -23,7 +23,7 @@ msgid "Sharing"
 msgstr "Freigaben"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -116,7 +116,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr "Glückwunsch, Sie haben erfolgreich eine neue Freigabe definiert!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Kopie für Freigabe)"
@@ -167,7 +167,7 @@ msgid "Share wizard: step 1"
 msgstr "Freigabeassistent: Schritt 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -179,7 +179,7 @@ msgid "Share User"
 msgstr "Freizugebende Benutzer"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr "%s hat die OpenERP Information %s für Sie freigegeben"
@@ -218,7 +218,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (Veröffentlicht)"
@@ -234,7 +234,7 @@ msgid "New users (emails required)"
 msgstr "Neue Benutzer (Email erforderlich)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Freigabe durch Benutzer %s (%s) für die Gruppe %s"
@@ -255,7 +255,7 @@ msgid "Share Group"
 msgstr "Freigabe Gruppe"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -300,7 +300,7 @@ msgid "Send Email Notification(s)"
 msgstr "Sende EMail Bestätigung(en)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -310,7 +310,7 @@ msgstr ""
 "Passwort benutzen, zur Erinnerung: Ihr Login ist %s.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Datenbank"
@@ -346,19 +346,19 @@ msgid "Users to share with"
 msgstr "Freigegebene Benutzer"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "Indirekter Freigabefilter des Benutzers %s (%s) für die Gruppe %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "EMail zwingend erforderlich"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Kopierte Rechte für Nutzung"
@@ -379,7 +379,7 @@ msgstr ""
 "Neue Benutzer (bitte geben Sie unten eine EMail Adresse pro Zeile an)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -404,7 +404,7 @@ msgid "Domain"
 msgstr "Domain"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -427,7 +427,7 @@ msgid "Access info"
 msgstr "Zugriffsinfo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -448,7 +448,7 @@ msgid "Share"
 msgstr "Freigabe"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Freigabeassistent - Schritt 2"
@@ -466,16 +466,17 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "Freigabe konnte nicht erteilt werden"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Freigabeassistent"
 
@@ -512,91 +513,11 @@ msgid "Read-only"
 msgstr "Schreiben"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "* übliches Passwort*"
 
-#~ msgid "Exising Users"
-#~ msgstr "Existierende Benutzer"
-
-#~ msgid "Step 1: Chose the action and the additional domain"
-#~ msgstr "Schritt 1: Wähle Aktion und die zusätzliche Domain"
-
-#~ msgid "Share Users"
-#~ msgstr "Freigaben Benutzer"
-
-#~ msgid "Step 3: Chose Access Mode"
-#~ msgstr "Schritt 3: Wähle Modus für Zugriff"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "New Users"
-#~ msgstr "Neue Benutzer"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Fehler"
-
-#~ msgid "Step 4: Share Users Detail"
-#~ msgstr "Schritt 4: Freigaben Benutzer Details"
-
-#, python-format
-#~ msgid "Share Group is exits without sharing !"
-#~ msgstr "Freigaben Gruppe existiert ohne Freigabe"
-
-#~ msgid "New"
-#~ msgstr "Neu"
-
-#~ msgid "READ ONLY"
-#~ msgstr "NUR LESEN"
-
-#~ msgid "Send Email"
-#~ msgstr "Sende EMail"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht"
-
-#~ msgid "READ & WRITE"
-#~ msgstr "LESEN & SCHREIBEN"
-
-#, python-format
-#~ msgid "Step:3 Sharing Wizard"
-#~ msgstr "Schritt 3: Freigaben Assistent"
-
-#~ msgid "Create share"
-#~ msgstr "Erzeuge Freigabe"
-
-#~ msgid "User Type"
-#~ msgstr "Benutzertyp"
-
-#~ msgid "Step 2: Chose the User type"
-#~ msgstr "Schritt 2: Wähle Benutzertyp"
-
-#~ msgid "New user"
-#~ msgstr "Neuer Benutzer"
-
-#~ msgid "Action"
-#~ msgstr "Aktion"
-
-#, python-format
-#~ msgid "Step:2 Sharing Wizard"
-#~ msgstr "Schritt 2: Freigaben Assistent"
-
-#~ msgid "Existing"
-#~ msgstr "Existierende"
-
-#, python-format
-#~ msgid "Step:4 Share Users Detail"
-#~ msgstr "Step 4: Freigaben Benutzer Details"
-
-#~ msgid "Write Access"
-#~ msgstr "Schreib Zugriff"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #, python-format
 #~ msgid ""
 #~ "You may use the following login and password to get access to this protected "
@@ -605,19 +526,6 @@ msgstr "* übliches Passwort*"
 #~ "Sie sollten die folgenden Login Daten für einen Zugriff auf den geschützten "
 #~ "Bereich verwenden:"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten!"
-
-#, python-format
-#~ msgid ""
-#~ "Please specify \"share_root_url\" in server configuration or in context"
-#~ msgstr ""
-#~ "Bitte spezifiere \"share_root_url\" in der Server Konfiguration oder im "
-#~ "Kontext."
-
 #~ msgid "Sharing Tools"
 #~ msgstr "Tools für Freigaben"
 
@@ -629,14 +537,5 @@ msgstr "* übliches Passwort*"
 #~ "Sehr geehrte/r Frau/Herr,\n"
 #~ "\n"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #~ msgid "Access Groups"
 #~ msgstr "Berechtigungsgruppen"
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
index d72459c1248..c1997671cf9 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr "Compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -115,7 +115,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr "¡Acaba de configurar correctamente un nuevo acceso compartido!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Copia para compartir)"
@@ -164,7 +164,7 @@ msgid "Share wizard: step 1"
 msgstr "Asistente compartición: Paso 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -176,7 +176,7 @@ msgid "Share User"
 msgstr "Usuario compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr "%s ha compartido la información %s de OpenERP contigo"
@@ -215,7 +215,7 @@ msgid "res.groups"
 msgstr "res.grupos"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (Compartido)"
@@ -231,7 +231,7 @@ msgid "New users (emails required)"
 msgstr "Nuevos usuarios (direcciones de correo electrónico requeridas)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -253,7 +253,7 @@ msgid "Share Group"
 msgstr "Grupo compartición"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -298,7 +298,7 @@ msgid "Send Email Notification(s)"
 msgstr "Enviar notificaciones por correo electrónico"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -308,7 +308,7 @@ msgstr ""
 "recordatorio, su usuario es %s.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Base de datos"
@@ -344,7 +344,7 @@ msgid "Users to share with"
 msgstr "Usuarios con los que compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -352,13 +352,13 @@ msgstr ""
 "%s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "Correo electrónico requerido"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Acceso copiado para compartición"
@@ -380,7 +380,7 @@ msgstr ""
 "correo electrónico por línea)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -405,7 +405,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -427,7 +427,7 @@ msgid "Access info"
 msgstr "Información de acceso"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -448,7 +448,7 @@ msgid "Share"
 msgstr "Compartir"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Asistente de compartición - Paso 2"
@@ -465,16 +465,17 @@ msgid "share.wizard.result.line"
 msgstr "compartir.asistente.resultado.linea"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "No se pudo configurar el acceso compartido"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Asistente de compartición"
 
@@ -514,7 +515,7 @@ msgid "Read-only"
 msgstr "Sólo lectura"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*contraseña habitual*"
@@ -534,3 +535,9 @@ msgstr "*contraseña habitual*"
 #~ msgstr ""
 #~ "Estimado,\n"
 #~ "\n"
+
+#~ msgid "Access Groups"
+#~ msgstr "Grupos de acceso"
+
+#~ msgid "Sharing Tools"
+#~ msgstr "Herramientas de compartición"
diff --git a/addons/share/i18n/es_MX.po b/addons/share/i18n/es_MX.po
new file mode 100644
index 00000000000..3eb8ef9f3e4
--- /dev/null
+++ b/addons/share/i18n/es_MX.po
@@ -0,0 +1,543 @@
+# 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 08:39+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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:462
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+"Esta información adicional ha sido automáticamente añadida a su acceso "
+"actual.\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+"Grupo creado para establecer derechos de acceso para compartir información "
+"con algunos usuarios."
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr "Gestión de comparticiones"
+
+#. module: share
+#: 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 de usuario!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "Asistente compartición - Paso 1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr "Reglas de acceso a comparticiones"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+"La acción que abre la pantalla que contiene la información que desea "
+"compartir."
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+"Por favor, especifique \"share_root_url\" (URL raíz de la compartición) en "
+"el contexto"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr "¡Acaba de configurar correctamente un nuevo acceso compartido!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:275
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "(Copia para compartir)"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Recién creado"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr "URL genérica de acceso compartido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "Sólo grupos regulares (no grupos de compartición)"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Lectura y escritura"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr "Asistente compartición: Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr "Asistente compartición: Paso 0"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr "Asistente compartición: Paso 1"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:458
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "Usuario compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:452
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr "%s ha compartido la información %s de OpenERP contigo"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Finalizar"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+"El nombre de usuario (%s) ya existe, puede que la información ya haya sido "
+"compartida con esta persona.\n"
+"Puede probar de seleccionar en su lugar a usuarios compartidos existentes."
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Nuevos usuarios"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr "res.grupos"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:149
+#, python-format
+msgid "%s (Shared)"
+msgstr "%s (Compartido)"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "¡El nombre del grupo debe ser único!"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr "Nuevos usuarios (direcciones de correo electrónico requeridas)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:418
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtro de compartición creado por el usuario %s (%s) para el grupo %s"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr "Seleccione el modo de acceso compartido deseado:"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Grupo compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:459
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "¿Con quién desearía compartir estos datos?"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+"El objetivo es implementar un mecanismo genérico de colaboración, donde un "
+"usuario de OpenERP\n"
+"puede compartir información de OpenERP con sus compañeros, clientes, o "
+"amigos.\n"
+"El sistema funcionará creando nuevos usuarios y grupos sobre la marcha, y "
+"combinando\n"
+"las reglas de acceso apropiadas e ir.rules para asegurar que los /usuarios "
+"compartidos/ tengan \n"
+"únicamente acceso a la información adecuada.\n"
+"    "
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr "El usuario ya existe"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Enviar notificaciones por correo electrónico"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:463
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+"Puede utilizar su usuario (login) y contraseña para verlo. Como "
+"recordatorio, su usuario es %s.\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:460
+#, python-format
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr "compartir.asistente.usuario"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+"Seleccione la acción que abre la pantalla que contiene la información que "
+"quiere compartir."
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr "Usuarios con los que compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:304
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtro de compartición indirecto creado por el usuario %s (%s) para el grupo "
+"%s"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid "Email required"
+msgstr "Correo electrónico requerido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:240
+#, python-format
+msgid "Copied access for sharing"
+msgstr "Acceso copiado para compartición"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+"Opcionalmente, puede indicar una restricción de dominio adicional que será "
+"aplicada sobre la información compartida."
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+"Nuevos usuarios (por favor, introduzca a continuación una dirección de "
+"correo electrónico por línea)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+"El usuario actual debe tener una dirección de email configurada en las "
+"preferencias de usuario para poder enviar emails salientes."
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "Sólo usuarios regulares (no usuarios de compartición)"
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "Compartir URL"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:314
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+"Lo sentimos, la pantalla y el filtro actual que se está tratando de "
+"compartir no son soportados en este momento.\n"
+"Puede probar un filtro simple."
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Modo de acceso"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "Información de acceso"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:454
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+"Para acceder, puede utilizar la siguiente URL:\n"
+"    %s"
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "Acción a compartir"
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr "Asistente de compartición - Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+"Aquí se muestra un resumen de los puntos de acceso que acaba de crear:"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "compartir.asistente.resultado.linea"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:313
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr "No se pudo configurar el acceso compartido"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "Asistente de compartición"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+"Seleccione el tipo de usuario(s) con los que le gustaría compartir datos."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+"Usuario externo con acceso limitado, creado sólo con el propósito de "
+"compartir datos."
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Dominio opcional para filtrado avanzado de datos."
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Sólo lectura"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:323
+#, python-format
+msgid "*usual password*"
+msgstr "*contraseña habitual*"
+
+#, python-format
+#~ msgid ""
+#~ "You may use the following login and password to get access to this protected "
+#~ "area:"
+#~ msgstr ""
+#~ "Puede usar el siguiente usuario y contraseña para acceder a esta área "
+#~ "protegida:"
+
+#, python-format
+#~ msgid ""
+#~ "Dear,\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Estimado,\n"
+#~ "\n"
+
+#~ msgid "Access Groups"
+#~ msgstr "Grupos de acceso"
+
+#~ msgid "Sharing Tools"
+#~ msgstr "Herramientas de compartición"
diff --git a/addons/share/i18n/es_VE.po b/addons/share/i18n/es_VE.po
new file mode 100644
index 00000000000..3eb8ef9f3e4
--- /dev/null
+++ b/addons/share/i18n/es_VE.po
@@ -0,0 +1,543 @@
+# 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 08:39+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:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:462
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+"Esta información adicional ha sido automáticamente añadida a su acceso "
+"actual.\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+"Grupo creado para establecer derechos de acceso para compartir información "
+"con algunos usuarios."
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr "Gestión de comparticiones"
+
+#. module: share
+#: 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 de usuario!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "Asistente compartición - Paso 1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr "Reglas de acceso a comparticiones"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+"La acción que abre la pantalla que contiene la información que desea "
+"compartir."
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+"Por favor, especifique \"share_root_url\" (URL raíz de la compartición) en "
+"el contexto"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr "¡Acaba de configurar correctamente un nuevo acceso compartido!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:275
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "(Copia para compartir)"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Recién creado"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr "URL genérica de acceso compartido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "Sólo grupos regulares (no grupos de compartición)"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Lectura y escritura"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr "Asistente compartición: Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr "Asistente compartición: Paso 0"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr "Asistente compartición: Paso 1"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:458
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "Usuario compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:452
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr "%s ha compartido la información %s de OpenERP contigo"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Finalizar"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+"El nombre de usuario (%s) ya existe, puede que la información ya haya sido "
+"compartida con esta persona.\n"
+"Puede probar de seleccionar en su lugar a usuarios compartidos existentes."
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Nuevos usuarios"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr "res.grupos"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:149
+#, python-format
+msgid "%s (Shared)"
+msgstr "%s (Compartido)"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "¡El nombre del grupo debe ser único!"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr "Nuevos usuarios (direcciones de correo electrónico requeridas)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:418
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtro de compartición creado por el usuario %s (%s) para el grupo %s"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr "Seleccione el modo de acceso compartido deseado:"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Grupo compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:459
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "¿Con quién desearía compartir estos datos?"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+"El objetivo es implementar un mecanismo genérico de colaboración, donde un "
+"usuario de OpenERP\n"
+"puede compartir información de OpenERP con sus compañeros, clientes, o "
+"amigos.\n"
+"El sistema funcionará creando nuevos usuarios y grupos sobre la marcha, y "
+"combinando\n"
+"las reglas de acceso apropiadas e ir.rules para asegurar que los /usuarios "
+"compartidos/ tengan \n"
+"únicamente acceso a la información adecuada.\n"
+"    "
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr "El usuario ya existe"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Enviar notificaciones por correo electrónico"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:463
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+"Puede utilizar su usuario (login) y contraseña para verlo. Como "
+"recordatorio, su usuario es %s.\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:460
+#, python-format
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr "compartir.asistente.usuario"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+"Seleccione la acción que abre la pantalla que contiene la información que "
+"quiere compartir."
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr "Usuarios con los que compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:304
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtro de compartición indirecto creado por el usuario %s (%s) para el grupo "
+"%s"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid "Email required"
+msgstr "Correo electrónico requerido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:240
+#, python-format
+msgid "Copied access for sharing"
+msgstr "Acceso copiado para compartición"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+"Opcionalmente, puede indicar una restricción de dominio adicional que será "
+"aplicada sobre la información compartida."
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+"Nuevos usuarios (por favor, introduzca a continuación una dirección de "
+"correo electrónico por línea)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+"El usuario actual debe tener una dirección de email configurada en las "
+"preferencias de usuario para poder enviar emails salientes."
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "Sólo usuarios regulares (no usuarios de compartición)"
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "Compartir URL"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:314
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+"Lo sentimos, la pantalla y el filtro actual que se está tratando de "
+"compartir no son soportados en este momento.\n"
+"Puede probar un filtro simple."
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Modo de acceso"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "Información de acceso"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:454
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+"Para acceder, puede utilizar la siguiente URL:\n"
+"    %s"
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "Acción a compartir"
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr "Asistente de compartición - Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+"Aquí se muestra un resumen de los puntos de acceso que acaba de crear:"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "compartir.asistente.resultado.linea"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:313
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr "No se pudo configurar el acceso compartido"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "Asistente de compartición"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+"Seleccione el tipo de usuario(s) con los que le gustaría compartir datos."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+"Usuario externo con acceso limitado, creado sólo con el propósito de "
+"compartir datos."
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Dominio opcional para filtrado avanzado de datos."
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Sólo lectura"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:323
+#, python-format
+msgid "*usual password*"
+msgstr "*contraseña habitual*"
+
+#, python-format
+#~ msgid ""
+#~ "You may use the following login and password to get access to this protected "
+#~ "area:"
+#~ msgstr ""
+#~ "Puede usar el siguiente usuario y contraseña para acceder a esta área "
+#~ "protegida:"
+
+#, python-format
+#~ msgid ""
+#~ "Dear,\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Estimado,\n"
+#~ "\n"
+
+#~ msgid "Access Groups"
+#~ msgstr "Grupos de acceso"
+
+#~ msgid "Sharing Tools"
+#~ msgstr "Herramientas de compartición"
diff --git a/addons/share/i18n/fi.po b/addons/share/i18n/fi.po
index d22933c18bc..f317af2637a 100644
--- a/addons/share/i18n/fi.po
+++ b/addons/share/i18n/fi.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:16+0000\n"
-"PO-Revision-Date: 2011-06-13 06:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-10-25 12:21+0000\n"
+"Last-Translator: Jussi Mikkola <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: 2011-06-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -149,7 +149,7 @@ msgstr "Jako velho: vaihe 2"
 #. module: share
 #: view:share.wizard:0
 msgid "Share wizard: step 0"
-msgstr "JJako velho: vaihe 0"
+msgstr ""
 
 #. module: share
 #: view:share.wizard:0
@@ -183,7 +183,7 @@ msgstr "Valmis"
 #: field:share.wizard,user_ids:0
 #: field:share.wizard.user,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:103
diff --git a/addons/share/i18n/fr.po b/addons/share/i18n/fr.po
index da3cbf1b7e8..489308f579e 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -23,7 +23,7 @@ msgid "Sharing"
 msgstr "Partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -113,7 +113,7 @@ msgstr ""
 "Félicitations, vous avez défini un nouvel accès partagé avec succès !"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(copie pour partage)"
@@ -162,7 +162,7 @@ msgid "Share wizard: step 1"
 msgstr "Assistant de partage : étape 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -174,7 +174,7 @@ msgid "Share User"
 msgstr "Utilisateur du partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr "%s a partagé des informations OpenERP %s avec vous"
@@ -213,7 +213,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (partagé)"
@@ -229,7 +229,7 @@ msgid "New users (emails required)"
 msgstr "Nouveaux utilisateurs (couriels requis)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Partager le filtre créé par l'utilisateur %s (%s) pour le groupe %s"
@@ -250,7 +250,7 @@ msgid "Share Group"
 msgstr "Groupe de partage"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -295,7 +295,7 @@ msgid "Send Email Notification(s)"
 msgstr "Envoyer des notifications par courriel"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -305,7 +305,7 @@ msgstr ""
 "de passe) pour le voir. Pour rappel, votre nom d'utilisateur est %s.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Base de données"
@@ -341,20 +341,20 @@ msgid "Users to share with"
 msgstr "Utilisateurs avec lesquels partager"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 "Filtre de partage indirect créé par l'utilisateur %s (%s) pour le groupe %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "Courriel requis"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Accès copié pour le partage"
@@ -376,7 +376,7 @@ msgstr ""
 "dessous)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -401,7 +401,7 @@ msgid "Domain"
 msgstr "Domaine"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -423,7 +423,7 @@ msgid "Access info"
 msgstr "Informations d'accès"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -444,7 +444,7 @@ msgid "Share"
 msgstr "Partager"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Assistant de partage - étape 2"
@@ -460,16 +460,17 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "L'accès au partage n'a pas pu être mis en place"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Assistant de partage"
 
@@ -510,7 +511,7 @@ msgid "Read-only"
 msgstr "En lecture seule"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "* mot de passe habituel *"
@@ -533,3 +534,6 @@ msgstr "* mot de passe habituel *"
 #~ msgstr ""
 #~ "Cher(e),\n"
 #~ "\n"
+
+#~ msgid "Access Groups"
+#~ msgstr "Groupes d'accès"
diff --git a/addons/share/i18n/gl.po b/addons/share/i18n/gl.po
index f5130ab42ca..8bbfe4375a1 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
diff --git a/addons/share/i18n/hr.po b/addons/share/i18n/hr.po
index 744afe033fb..29c2187a5d2 100644
--- a/addons/share/i18n/hr.po
+++ b/addons/share/i18n/hr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-09-08 09:05+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -105,7 +105,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -154,7 +154,7 @@ msgid "Share wizard: step 1"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -166,7 +166,7 @@ msgid "Share User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr ""
@@ -202,7 +202,7 @@ msgid "res.groups"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "New users (emails required)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -239,7 +239,7 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -274,7 +274,7 @@ msgid "Send Email Notification(s)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -282,7 +282,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr ""
@@ -316,19 +316,19 @@ msgid "Users to share with"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -346,7 +346,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -369,7 +369,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -388,7 +388,7 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -407,7 +407,7 @@ msgid "Share"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr ""
@@ -423,16 +423,17 @@ msgid "share.wizard.result.line"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr ""
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr ""
 
@@ -469,12 +470,7 @@ msgid "Read-only"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
diff --git a/addons/share/i18n/hu.po b/addons/share/i18n/hu.po
index 9f90f550221..13a69e64a88 100644
--- a/addons/share/i18n/hu.po
+++ b/addons/share/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-26 14:47+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -23,7 +24,7 @@ msgid "Sharing"
 msgstr "Megosztás"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -104,7 +105,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -153,7 +154,7 @@ msgid "Share wizard: step 1"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -165,7 +166,7 @@ msgid "Share User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr ""
@@ -201,7 +202,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (megosztott)"
@@ -217,7 +218,7 @@ msgid "New users (emails required)"
 msgstr "Új felhasználók (e-mail szükséges)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Share Group"
 msgstr "Megosztott csoport"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -273,7 +274,7 @@ msgid "Send Email Notification(s)"
 msgstr "E-mail értesítés(ek) küldése"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -281,7 +282,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Adatbázis"
@@ -315,19 +316,19 @@ msgid "Users to share with"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "E-mail szükséges"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -346,7 +347,7 @@ msgstr ""
 "Új felhasználók (kérjük, hogy lejjebb adjon meg soronként egy e-mail címet)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -369,7 +370,7 @@ msgid "Domain"
 msgstr "Domain"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -388,7 +389,7 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -407,7 +408,7 @@ msgid "Share"
 msgstr "Megosztás"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr ""
@@ -423,16 +424,17 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr ""
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr ""
 
@@ -469,7 +471,7 @@ msgid "Read-only"
 msgstr "Csak olvasható"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*szokásos jelszó*"
diff --git a/addons/share/i18n/it.po b/addons/share/i18n/it.po
index 00d83ef810e..d2218cc7f81 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: 2011-04-30 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr "Condivisione"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -115,7 +115,7 @@ msgstr ""
 "Congratulazioni, avete correttamente configurato un nuovo accesso condiviso!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(copia per condivisione)"
@@ -164,7 +164,7 @@ msgid "Share wizard: step 1"
 msgstr "Wizard condivisione: passo 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -176,7 +176,7 @@ msgid "Share User"
 msgstr "Condividi utente"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr "%s ha condiviso l'informazione OpenERP: %s con te"
@@ -215,7 +215,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (condivisi)"
@@ -231,7 +231,7 @@ msgid "New users (emails required)"
 msgstr "Nuovi utenti (email richieste)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Filtro condivisione creato dall'utente %s (%s) per gruppo %s"
@@ -252,7 +252,7 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -287,7 +287,7 @@ msgid "Send Email Notification(s)"
 msgstr "Invia anotifiche(a) via email"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -297,7 +297,7 @@ msgstr ""
 "Come promemoria, il vostro login è: %s.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Database"
@@ -333,7 +333,7 @@ msgid "Users to share with"
 msgstr "Utenti da condividere con"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -341,13 +341,13 @@ msgstr ""
 "%s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "Richiesta email"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -365,7 +365,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr "Nuovi utenti (prego fornire un indirizzo email per linea sotto)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -390,7 +390,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -409,7 +409,7 @@ msgid "Access info"
 msgstr "Info accesso"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -430,7 +430,7 @@ msgid "Share"
 msgstr "Condivisione"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Wizard condivisione - Passo 2"
@@ -446,16 +446,17 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "L'accesso condiviso non può essere creato"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Wizard condivisione"
 
@@ -494,7 +495,7 @@ msgid "Read-only"
 msgstr "Solo lettura"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*password abituale*"
diff --git a/addons/share/i18n/mn.po b/addons/share/i18n/mn.po
index 2bb10d54931..ab5670136f2 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -105,7 +105,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -154,7 +154,7 @@ msgid "Share wizard: step 1"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -166,7 +166,7 @@ msgid "Share User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr ""
@@ -202,7 +202,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "New users (emails required)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -239,7 +239,7 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -274,7 +274,7 @@ msgid "Send Email Notification(s)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -282,7 +282,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr ""
@@ -316,19 +316,19 @@ msgid "Users to share with"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -346,7 +346,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -369,7 +369,7 @@ msgid "Domain"
 msgstr "Домэйн"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -388,7 +388,7 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -407,7 +407,7 @@ msgid "Share"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr ""
@@ -423,16 +423,17 @@ msgid "share.wizard.result.line"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr ""
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr ""
 
@@ -469,59 +470,7 @@ msgid "Read-only"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr ""
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Алдаа"
-
-#~ msgid "Exising Users"
-#~ msgstr "Байгаа хэрэглэгчид"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "New"
-#~ msgstr "Шинэ"
-
-#~ msgid "READ ONLY"
-#~ msgstr "ЗӨВХӨН УНШИГДАНА"
-
-#~ msgid "Send Email"
-#~ msgstr "Мэйл Илгээх"
-
-#~ msgid "Action"
-#~ msgstr "Үйлдэл"
-
-#~ msgid "New user"
-#~ msgstr "Шинэ хэрэглэгч"
-
-#~ msgid "Step 2: Chose the User type"
-#~ msgstr "Алхам 2: Хэрэглэгчийн төрлийг сонгох"
-
-#~ msgid "User Type"
-#~ msgstr "Хэрэглэгчийн төрөл"
-
-#~ msgid "READ & WRITE"
-#~ msgstr "УНШИХ & БИЧИХ"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Write Access"
-#~ msgstr "Бичих хандалт"
-
-#~ msgid "share.result"
-#~ msgstr "share.result"
diff --git a/addons/share/i18n/nl.po b/addons/share/i18n/nl.po
index 4181f2d759f..1d7548d635c 100644
--- a/addons/share/i18n/nl.po
+++ b/addons/share/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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr "Delen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -110,7 +110,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr "Gefeliciteerd, u heeft met succes een gedeelde toegang ingesteld!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Kopie voor delen)"
@@ -159,7 +159,7 @@ msgid "Share wizard: step 1"
 msgstr "Deel assistent - stap 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -171,7 +171,7 @@ msgid "Share User"
 msgstr "Delen gebruiker"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr "%s heeft OpenERP %s informatie met u gedeeld"
@@ -210,7 +210,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (Gedeeld)"
@@ -226,7 +226,7 @@ msgid "New users (emails required)"
 msgstr "Nieuwe gebruikers (emails verplicht)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr "Deel-filter gemaakt door gebruiker %s (%s) voor groep %s"
@@ -247,7 +247,7 @@ msgid "Share Group"
 msgstr "Delen groep"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -291,7 +291,7 @@ msgid "Send Email Notification(s)"
 msgstr "Email melding(en) versturen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -301,7 +301,7 @@ msgstr ""
 "herinnering, uw login is %s.\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Database"
@@ -337,19 +337,19 @@ msgid "Users to share with"
 msgstr "Gebruikers oom mee te delen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr "Indirect deel-filter gemaakt door gebruiker %s (%s) voor groep %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "Email verplicht"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Toegang gekopieerd voor delen"
@@ -369,7 +369,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr "Nieuwe gebruikers (vul hieronder aub één email adres per regel in)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -394,7 +394,7 @@ msgid "Domain"
 msgstr "Domein"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -416,7 +416,7 @@ msgid "Access info"
 msgstr "Toegangsinfo"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -437,7 +437,7 @@ msgid "Share"
 msgstr "Delen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Deel assistent - stap 2"
@@ -454,16 +454,17 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "Gedeelde toegang kon niet worden ingesteld"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Deel assistent"
 
@@ -502,7 +503,7 @@ msgid "Read-only"
 msgstr "Alleen lezen"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*gebruikelijk wachtwoord*"
diff --git a/addons/share/i18n/pl.po b/addons/share/i18n/pl.po
index c38a04b5a4f..97928d1dbb6 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -105,7 +105,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -154,7 +154,7 @@ msgid "Share wizard: step 1"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -166,7 +166,7 @@ msgid "Share User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr ""
@@ -202,7 +202,7 @@ msgid "res.groups"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr ""
@@ -218,7 +218,7 @@ msgid "New users (emails required)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -239,7 +239,7 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -274,7 +274,7 @@ msgid "Send Email Notification(s)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -282,7 +282,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Baza danych"
@@ -316,19 +316,19 @@ msgid "Users to share with"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -346,7 +346,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -369,7 +369,7 @@ msgid "Domain"
 msgstr "Domena"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -388,7 +388,7 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -407,7 +407,7 @@ msgid "Share"
 msgstr "Udostępnij"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr ""
@@ -423,16 +423,17 @@ msgid "share.wizard.result.line"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr ""
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr ""
 
@@ -469,28 +470,7 @@ msgid "Read-only"
 msgstr "Tylko do odczytu"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/share/i18n/pt.po b/addons/share/i18n/pt.po
index 85a3e4ca99b..b1b832e9269 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -109,7 +109,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr "Parabéns, acabou de estabelecer um novo acesso para partilha!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -158,7 +158,7 @@ msgid "Share wizard: step 1"
 msgstr "Assistente de partilha: passo 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -170,7 +170,7 @@ msgid "Share User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr ""
@@ -206,7 +206,7 @@ msgid "res.groups"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr ""
@@ -222,7 +222,7 @@ msgid "New users (emails required)"
 msgstr "Novos utilizadores (exigidos os endereços eletrónicos)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -243,7 +243,7 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -278,7 +278,7 @@ msgid "Send Email Notification(s)"
 msgstr "Enviar mensagens de notificação"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -286,7 +286,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Base de dados"
@@ -320,19 +320,19 @@ msgid "Users to share with"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -350,7 +350,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -375,7 +375,7 @@ msgid "Domain"
 msgstr "Domínio"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -394,7 +394,7 @@ msgid "Access info"
 msgstr "Informação de acesso"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -413,7 +413,7 @@ msgid "Share"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Assistente de partilha - Passo 2"
@@ -429,16 +429,17 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "O acesso partilhado não pode ser configurado"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Assistente de partilha"
 
@@ -475,7 +476,7 @@ msgid "Read-only"
 msgstr "Apenas de leitura"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*senha habitual*"
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index aeba6344497..5691bc19644 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -24,7 +24,7 @@ msgid "Sharing"
 msgstr "Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
@@ -110,7 +110,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr "Parabéns! Você configurou com sucesso um novo acesso compartilhado."
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
 msgstr "(Cópia para compartilhamento)"
@@ -160,7 +160,7 @@ msgid "Share wizard: step 1"
 msgstr "Assistente de compartilhamento: passo 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -172,7 +172,7 @@ msgid "Share User"
 msgstr "Usuário de Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr "%s compartilhou as informações %s do OpenERP com você"
@@ -208,7 +208,7 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
 msgstr "%s (Compartilhado)"
@@ -224,7 +224,7 @@ msgid "New users (emails required)"
 msgstr "Novos usuários (emails obrigatório)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -245,7 +245,7 @@ msgid "Share Group"
 msgstr "Grupo de Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -280,7 +280,7 @@ msgid "Send Email Notification(s)"
 msgstr "Enviar Notificação por Email"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
@@ -288,7 +288,7 @@ msgid ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "Base de Dados"
@@ -322,19 +322,19 @@ msgid "Users to share with"
 msgstr "Usuários para compartilhar"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
 msgstr "Email obrigatório"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
 msgstr "Copiado o acesso para o compartilhamento"
@@ -353,7 +353,7 @@ msgstr ""
 "Novos Usuários (favor informar abaixo um endereço de email por linha)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
@@ -378,7 +378,7 @@ msgid "Domain"
 msgstr "Domínio"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
@@ -397,7 +397,7 @@ msgid "Access info"
 msgstr "Informações de acesso"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
@@ -418,7 +418,7 @@ msgid "Share"
 msgstr "Compartilhamento"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr "Assistente de Compartilhamento - Passo 2"
@@ -434,16 +434,17 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr "O acesso de compartilhamento não pode ser configurado"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
 msgstr "Assistente de Compartilhamento"
 
@@ -482,7 +483,7 @@ msgid "Read-only"
 msgstr "Somente leitura"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr ""
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
index 23cadca3e0f..e24cea83663 100644
--- a/addons/share/i18n/ru.po
+++ b/addons/share/i18n/ru.po
@@ -14,47 +14,51 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
 #, python-format
 msgid "Sharing"
-msgstr ""
+msgstr "Совместный доступ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:434
+#: code:addons/share/wizard/share_wizard.py:462
 #, python-format
 msgid ""
 "This additional data has been automatically added to your current access.\n"
 msgstr ""
+"Эти дополнительные данные были автоматически добавлены к вашему текущему "
+"доступу.\n"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Existing External Users"
-msgstr ""
+msgstr "Существующий внешний пользователь"
 
 #. module: share
 #: help:res.groups,share:0
 msgid "Group created to set access rights for sharing data with some users."
 msgstr ""
+"Создана группа для установки прав доступа для обмена данными с другими "
+"пользователями."
 
 #. module: share
 #: model:ir.module.module,shortdesc:share.module_meta_information
 msgid "Share Management"
-msgstr ""
+msgstr "Управление обменом данными"
 
 #. module: share
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
+msgstr "Вы не можете иметь двух одинаковых пользователей !"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:76
 #, python-format
 msgid "Sharing Wizard - Step 1"
-msgstr ""
+msgstr "Мастер совместного доступа - шаг 1"
 
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard
@@ -76,8 +80,7 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"Выбранная компания отсутствует в списке разрешённых компаний для этого "
-"пользователя"
+"Выбранная организация отсутствует в списке разрешённых для этого пользователя"
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -94,23 +97,25 @@ msgstr "Далее"
 msgid ""
 "The action that opens the screen containing the data you wish to share."
 msgstr ""
+"Действие, которое открывает экран, содержащий данные, которыми вы хотите "
+"поделиться"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:68
 #, python-format
 msgid "Please specify \"share_root_url\" in context"
-msgstr ""
+msgstr "Пожалуйста, определите \"\"share_root_url\" в контексте"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Congratulations, you have successfully setup a new shared access!"
-msgstr ""
+msgstr "Поздравляю, вы успешно установили новый совместный доступ!"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:247
+#: code:addons/share/wizard/share_wizard.py:275
 #, python-format
 msgid "(Copy for sharing)"
-msgstr ""
+msgstr "(Копировать для совместного доступа)"
 
 #. module: share
 #: field:share.wizard.result.line,newly_created:0
@@ -120,7 +125,7 @@ msgstr "Вновь созданный"
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Generic Share Access URL"
-msgstr ""
+msgstr "Адрес общего совместного доступа"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:457
@@ -133,7 +138,7 @@ msgstr ""
 #. module: share
 #: view:res.groups:0
 msgid "Regular groups only (no share groups"
-msgstr ""
+msgstr "Только обычные группы (не группы совместного доступа"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
@@ -143,35 +148,35 @@ msgstr "Чтение и запись"
 #. module: share
 #: view:share.wizard:0
 msgid "Share wizard: step 2"
-msgstr ""
+msgstr "Мастер совместного доступа: шаг 2"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share wizard: step 0"
-msgstr ""
+msgstr "Мастер совместного доступа: шаг 0"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share wizard: step 1"
-msgstr ""
+msgstr "Мастер совместного доступа: шаг 1"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:430
+#: code:addons/share/wizard/share_wizard.py:458
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
-msgstr "Имя пользователя"
+msgstr "Пользователь"
 
 #. module: share
 #: field:res.users,share:0
 msgid "Share User"
-msgstr ""
+msgstr "Совместный доступ с пользователем"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:424
+#: code:addons/share/wizard/share_wizard.py:452
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
-msgstr ""
+msgstr "%s предоставил вам совместный доступ к следующим данным: %s"
 
 #. module: share
 #: view:share.wizard:0
@@ -192,6 +197,9 @@ msgid ""
 "this person.\n"
 "You may want to try selecting existing shared users instead."
 msgstr ""
+"Имя пользователя (%s) уже существует, возможно, данные уже были общие с этим "
+"человеком.\n"
+"Вы можете попытаться выбрать существующего общего пользователя."
 
 #. module: share
 #: field:share.wizard,new_users:0
@@ -204,10 +212,10 @@ msgid "res.groups"
 msgstr "res.groups"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:121
+#: code:addons/share/wizard/share_wizard.py:149
 #, python-format
 msgid "%s (Shared)"
-msgstr ""
+msgstr "%s (в совместном доступе)"
 
 #. module: share
 #: sql_constraint:res.groups:0
@@ -217,13 +225,14 @@ msgstr "Название группы должно быть уникальным
 #. module: share
 #: selection:share.wizard,user_type:0
 msgid "New users (emails required)"
-msgstr ""
+msgstr "Новые пользователи (требуются эл. адреса)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:390
+#: code:addons/share/wizard/share_wizard.py:418
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
+"Фильтр совместного доступа созданный пользователем %s (%s) для группы %s"
 
 #. module: share
 #: view:res.groups:0
@@ -233,15 +242,15 @@ msgstr "Группы"
 #. module: share
 #: view:share.wizard:0
 msgid "Select the desired shared access mode:"
-msgstr ""
+msgstr "Выберите режим совместного доступа:"
 
 #. module: share
 #: field:res.groups,share:0
 msgid "Share Group"
-msgstr ""
+msgstr "Группа совместного доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:431
+#: code:addons/share/wizard/share_wizard.py:459
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -250,7 +259,7 @@ msgstr "Пароль"
 #. module: share
 #: view:share.wizard:0
 msgid "Who would you want to share this data with?"
-msgstr ""
+msgstr "Тот, с кем вы хотели иметь совместный доступ к этим данным ?"
 
 #. module: share
 #: model:ir.module.module,description:share.module_meta_information
@@ -276,15 +285,17 @@ msgid "Send Email Notification(s)"
 msgstr "Отправить уведомление по эл. почте"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:435
+#: code:addons/share/wizard/share_wizard.py:463
 #, python-format
 msgid ""
 "You may use your existing login and password to view it. As a reminder, your "
 "login is %s.\n"
 msgstr ""
+"Вы можете использовать существующий логин и пароль, для просмотра. Напомним, "
+"что ваш логин: %s\n"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:432
+#: code:addons/share/wizard/share_wizard.py:460
 #, python-format
 msgid "Database"
 msgstr "База данных"
@@ -300,6 +311,8 @@ msgid ""
 "Please select the action that opens the screen containing the data you want "
 "to share."
 msgstr ""
+"Пожалуйста, выберите действие, которое открывает экран, содержащий данные, "
+"которыми вы хотите поделиться."
 
 #. module: share
 #: selection:share.wizard,user_type:0
@@ -315,25 +328,26 @@ msgstr "Содержание"
 #. module: share
 #: field:share.wizard,user_type:0
 msgid "Users to share with"
-msgstr ""
+msgstr "Пользователи для совместного доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:276
+#: code:addons/share/wizard/share_wizard.py:304
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
+"Фильтр косвенного доступа созданный пользователем %s (%s) для группы %s"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "Требуется эл. почта"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:212
+#: code:addons/share/wizard/share_wizard.py:240
 #, python-format
 msgid "Copied access for sharing"
-msgstr ""
+msgstr "Скопированы права совместного доступа"
 
 #. module: share
 #: view:share.wizard:0
@@ -341,29 +355,34 @@ msgid ""
 "Optionally, you may specify an additional domain restriction that will be "
 "applied to the shared data."
 msgstr ""
+"Опционально, вы можете указать дополнительные ограничения, которые будут "
+"применяться к общим данным."
 
 #. module: share
 #: view:share.wizard:0
 msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
+"Новые пользователи (пожалуйста, введите один адрес эл. почты в строке ниже)"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:420
+#: code:addons/share/wizard/share_wizard.py:448
 #, python-format
 msgid ""
 "The current user must have an email address configured in User Preferences "
 "to be able to send outgoing emails."
 msgstr ""
+"Текущий пользователь должен иметь адрес эл. почты заданный в его настройках, "
+"чтобы иметь возможность отправлять ему эл. почту."
 
 #. module: share
 #: view:res.users:0
 msgid "Regular users only (no share user)"
-msgstr ""
+msgstr "Только обычные пользователи (не пользователи совместного доступа)"
 
 #. module: share
 #: field:share.wizard.result.line,share_url:0
 msgid "Share URL"
-msgstr ""
+msgstr "Адрес совместного доступа"
 
 #. module: share
 #: field:share.wizard,domain:0
@@ -371,13 +390,17 @@ msgid "Domain"
 msgstr "Домен"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:286
+#: code:addons/share/wizard/share_wizard.py:314
 #, python-format
 msgid ""
 "Sorry, the current screen and filter you are trying to share are not "
 "supported at the moment.\n"
 "You may want to try a simpler filter."
 msgstr ""
+"К сожалению, текущий экран и фильтр, которыми вы пытаетесь поделиться не "
+"поддерживаются на данный момент.\n"
+"\n"
+"Вы можете попробовать более простой фильтр."
 
 #. module: share
 #: field:share.wizard,access_mode:0
@@ -387,37 +410,39 @@ msgstr "Режим доступа"
 #. module: share
 #: view:share.wizard:0
 msgid "Access info"
-msgstr ""
+msgstr "Данные доступа"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:426
+#: code:addons/share/wizard/share_wizard.py:454
 #, python-format
 msgid ""
 "To access it, you can go to the following URL:\n"
 "    %s"
 msgstr ""
+"Для доступа к нему, вы можете перейти к следующему адресу:\n"
+"    %s"
 
 #. module: share
 #: field:share.wizard,action_id:0
 msgid "Action to share"
-msgstr ""
+msgstr "Действие совместного доступа"
 
 #. module: share
 #: code:addons/share/web/editors.py:18
 #, python-format
 msgid "Share"
-msgstr ""
+msgstr "Совместный доступ"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:406
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "Sharing Wizard - Step 2"
-msgstr ""
+msgstr "Мастер совместного доступа - Шаг 2"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Here is a summary of the access points you have just created:"
-msgstr ""
+msgstr "Вот обзор точек доступа, которые вы только что создали:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -425,23 +450,26 @@ msgid "share.wizard.result.line"
 msgstr "share.wizard.result.line"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:285
+#: code:addons/share/wizard/share_wizard.py:313
 #, python-format
 msgid "Sharing access could not be setup"
-msgstr ""
+msgstr "Совместный доступ не может быть настроен"
 
 #. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
-#: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
-msgstr ""
+msgstr "Мастер совместного доступа"
 
 #. module: share
 #: help:share.wizard,user_type:0
 msgid "Select the type of user(s) you would like to share data with."
 msgstr ""
+"Выберите тип пользователей с которыми вы хотели бы иметь совместный доступ к "
+"данным."
 
 #. module: share
 #: view:share.wizard:0
@@ -459,6 +487,8 @@ msgid ""
 "External user with limited access, created only for the purpose of sharing "
 "data."
 msgstr ""
+"Внешний пользователь с ограниченным доступом, созданы только для обмена "
+"данными."
 
 #. module: share
 #: help:share.wizard,domain:0
@@ -471,7 +501,7 @@ msgid "Read-only"
 msgstr "Только чтение"
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:295
+#: code:addons/share/wizard/share_wizard.py:323
 #, python-format
 msgid "*usual password*"
 msgstr "*Обычный пароль*"
@@ -483,3 +513,17 @@ msgstr "*Обычный пароль*"
 #~ msgstr ""
 #~ "Вы можете использовать следующие логин и пароль, для доступа к этой "
 #~ "защищенной зоне:"
+
+#, python-format
+#~ msgid ""
+#~ "Dear,\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Уважаемый\n"
+#~ "\n"
+
+#~ msgid "Access Groups"
+#~ msgstr "Группы доступа"
+
+#~ msgid "Sharing Tools"
+#~ msgstr "Инструменты совместного доступа"
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 0b468c99beb..1874b50233d 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: 2011-07-09 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:15
@@ -80,7 +80,7 @@ msgstr "选择的用户组不在这用允许的用户组"
 #. module: share
 #: model:ir.model,name:share.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: share
 #: view:share.wizard:0
@@ -422,7 +422,7 @@ msgstr "你刚建立的接入点简述："
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
 msgid "share.wizard.result.line"
-msgstr ""
+msgstr "share.wizard.result.line"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:313
diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py
index 437a0c51095..0927462b5c3 100644
--- a/addons/share/ir_model.py
+++ b/addons/share/ir_model.py
@@ -43,4 +43,6 @@ class ir_model_access(osv.osv):
                         a.perm_''' + access_mode, (model_name,))
         return [x[0] for x in cr.fetchall()]
 
-ir_model_access()
\ No newline at end of file
+ir_model_access()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index 81683066220..f7a81a24948 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -24,7 +24,7 @@ class res_groups(osv.osv):
     _name = "res.groups"
     _inherit = 'res.groups'
     _columns = {
-        'share': fields.boolean('Share Group', groups='share.group_share', readonly=True, 
+        'share': fields.boolean('Share Group', readonly=True,
                     help="Group created to set access rights for sharing data with some users.")
      }
 res_groups()
@@ -33,7 +33,9 @@ class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
     _columns = {
-        'share': fields.boolean('Share User', groups='share.group_share', readonly=True, 
+        'share': fields.boolean('Share User', readonly=True,
                     help="External user with limited access, created only for the purpose of sharing data.")
      }
 res_users()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index b70afda6152..b03a090c809 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -10,7 +10,7 @@
                 <xpath expr="/search/field[@name='company_ids']" position="after">
                     <field name="share">
                         <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
-                            domain="[('share','=',False)]" default="1"/>
+                            domain="[('share','=',False)]"/>
                     </field>
                 </xpath>
             </field>
@@ -44,7 +44,7 @@
                     <field name="name"/>
                     <field name="share">
                         <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
-                            domain="[('share','=',False)]" default="1"/>
+                            domain="[('share','=',False)]"/>
                     </field>
                 </search>
             </field>
@@ -67,4 +67,4 @@
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml
index 98a10a3cec8..315f750a7f6 100644
--- a/addons/share/share_view.xml
+++ b/addons/share/share_view.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>   
+    <data>
         <record id="view_groups_form" model="ir.ui.view">
             <field name="name">res.groups.form</field>
             <field name="model">res.groups</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
+                 <field name="name" position="after">
                     <field name="share"/>
-                </group>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css
new file mode 100644
index 00000000000..3b47a065b1e
--- /dev/null
+++ b/addons/share/static/src/css/share.css
@@ -0,0 +1,13 @@
+
+.openerp li.oe-share {
+    background: url(../img/share.png) no-repeat;
+    padding-left: 20px;
+}
+
+.openerp a.oe-share {
+    background: url(../img/share.png) no-repeat;
+    display: block;
+    float: left;
+    width: 20px;
+    height: 20px;
+}
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
new file mode 100644
index 00000000000..b2abc1832a4
--- /dev/null
+++ b/addons/share/static/src/js/share.js
@@ -0,0 +1,80 @@
+
+openerp.share = function(instance) {
+
+function launch_wizard(self, view) {
+        var action = view.widget_parent.action;
+        var Share = new instance.web.DataSet(self, 'share.wizard', view.dataset.get_context());
+        var domain = view.dataset.domain;
+
+        if (view.fields_view.type == 'form') {
+            domain = new instance.web.CompoundDomain(domain, [['id', '=', view.datarecord.id]]);
+        }
+
+        Share.create({
+            name: action.name,
+            domain: domain,
+            action_id: action.id,
+        }, function(result) {
+            var share_id = result.result;
+            var step1 = Share.call('go_step_1', [[share_id],], function(result) {
+                var action = result;
+                self.do_action(action);
+            });
+        });
+}
+
+var _has_share = null;
+function if_has_share(yes, no) {
+    if (!_has_share) {
+        _has_share = $.Deferred(function() {
+            var self = this;
+            instance.connection.on_session_invalid.add_last(function() { _has_share = null; });
+            var func = new instance.web.Model(null, "share.wizard").get_func("has_share");
+            func(instance.connection.uid).pipe(function(res) {
+                if(res) {
+                    self.resolve();
+                } else {
+                    self.reject();
+                }
+            });
+        });
+    }
+    _has_share.done(yes).fail(no);
+}
+
+
+instance.web.Sidebar = instance.web.Sidebar.extend({
+    add_default_sections: function() {
+        this._super();
+        var self = this;
+        if_has_share(function() {
+            self.add_items('other', [{
+                label: 'Share',
+                callback: self.on_sidebar_click_share,
+                classname: 'oe-share',
+            }]);
+        });
+    },
+    on_sidebar_click_share: function(item) {
+        var view = this.widget_parent
+        launch_wizard(this, view);
+    },
+});
+
+instance.web.ViewManagerAction.include({
+    start: function() {
+        var self = this;
+        if_has_share(function() {
+            self.$element.find('a.oe-share').click(self.on_click_share);
+        }, function() {
+            self.$element.find('a.oe-share').remove();
+        });
+        return this._super.apply(this, arguments);
+    },
+    on_click_share: function(e) {
+        e.preventDefault();
+        launch_wizard(this, this.views[this.active_view].controller);
+    },
+});
+
+};
diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml
new file mode 100644
index 00000000000..9a1363846a0
--- /dev/null
+++ b/addons/share/static/src/xml/share.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+
+    <t t-extend="ViewManagerAction">
+        <t t-jquery=".oe-shortcut-toggle" t-operation="after">
+            <a class="oe-share" href="#share" title="Share this in 2 clicks...">
+                <!--<img src="/share/static/src/img/share.png"/>-->
+            </a>
+        </t>
+    </t>
+
+</templates>
diff --git a/addons/share/web/__init__.py b/addons/share/web/__init__.py
deleted file mode 100644
index f95bb222c10..00000000000
--- a/addons/share/web/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import controllers
-import editors
\ No newline at end of file
diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
deleted file mode 100644
index e682c8d9709..00000000000
--- a/addons/share/web/controllers.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import urlparse
-import cherrypy
-
-from openobject import rpc
-from openobject.tools import expose, ast
-
-import openerp.controllers
-
-
-
-class ShareWizardController(openerp.controllers.SecuredController):
-    _cp_path = "/share"
-
-    @expose()
-    def index(self, domain, context, view_id, search_domain='[]', action_id=None):
-        context = ast.literal_eval(context)
-
-        if not action_id:
-            # This should not be needed anymore, but just in case users are
-            # running the module with an older version of the web client...
-
-            # to remove soon-ish
-            action_id = rpc.RPCProxy('ir.actions.act_window').search(
-                [('view_id','=',int(view_id))], context=context)
-            if not action_id: return ""
-
-            action_id = action_id[0]
-
-        domain = ast.literal_eval(domain)
-        domain.extend(ast.literal_eval(search_domain))
-
-        scheme, netloc, _, _, _ = urlparse.urlsplit(cherrypy.request.base)
-        share_root_url = urlparse.urlunsplit((
-            scheme, netloc, '/openerp/login',
-            'db=%(dbname)s&user=%(login)s&password=%(password)s', ''))
-
-        context.update(
-            #active_ids=share_wiz_id,
-            #active_id=share_wiz_id[0],
-            _terp_view_name='Share Wizard',
-            share_root_url=share_root_url)
-        Share = rpc.RPCProxy('share.wizard')
-        sharing_view_id = Share.create({
-            'domain': str(domain),
-            'action_id': action_id and int(action_id)
-        }, context)
-        return openerp.controllers.actions.execute(
-            Share.go_step_1([sharing_view_id], context),
-            ids=[sharing_view_id], context=context)
diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py
deleted file mode 100644
index 677de4a8317..00000000000
--- a/addons/share/web/editors.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-import openobject.templating
-
-class FormEditor(openobject.templating.TemplateEditor):
-    templates = ['/openerp/controllers/templates/form.mako']
-    MAIN_FORM_BODY = u'id="main_form_body"'
-
-    def insert_share_button(self, output):
-        # Insert the share button on the form title H1 line, at the very end,
-        # but only if the user is a member of the sharing group 
-        share_opener_insertion = output.index('% endif', output.index(
-                '/view_diagram/process',
-                output.index(self.MAIN_FORM_BODY))) + len('% endif')
-        return output[:share_opener_insertion] + '''
-    <%
-        if 'has_share' not in cp.session:
-            cp.session['has_share'] = rpc.RPCProxy('share.wizard').has_share()
-    %>
-    % if cp.session['has_share'] and buttons.toolbar and not is_dashboard:
-        <a id="share-opener" href="#share" title="${_('Share this in 2 clicks...')}">
-            <img id="share-opener-img" src="/share/static/images/share.png"/>
-        </a>
-               <script type="text/javascript">
-                   jQuery(document).ready(function() {
-                       jQuery("#share-opener").click(function() {
-                           jQuery(this).attr(
-                               "href",
-                               openobject.http.getURL('/share', {
-                                   context: jQuery("#_terp_context").val(),
-                                   domain: jQuery("#_terp_domain").val(),
-                                   view_id: jQuery("#_terp_view_id").val(),
-                                   action_id: jQuery("#_terp_action_id").val(),
-                                   search_domain: jQuery("#_terp_view_type").val() == "form" ? 
-                                                         ("[('id','=',"+jQuery("#_terp_id").val()+")]") : 
-                                                            jQuery("#_terp_search_domain").val(),
-                           }));
-                       });
-                   });
-               </script>
-               \n
-    % endif
-''' + output[share_opener_insertion:]
-
-    def edit(self, template, template_text):
-        return self.insert_share_button(
-            super(FormEditor, self).edit(template, template_text))
-
-
-class SidebarEditor(openobject.templating.TemplateEditor):
-    templates = ['/openerp/widgets/templates/sidebar.mako']
-    ADD_SHARE_SECTION = u'id="sidebar"'
-
-    def insert_share_link(self, output):
-        # Insert the link on the line, right after the link to open the
-        # attachment form, but only if the user is a member of the sharing group 
-        share_opener_insertion = output.index(
-                '\n',
-                output.index(self.ADD_SHARE_SECTION)) + 1
-        return output[:share_opener_insertion] + '''
-    <%
-        if 'has_share' not in cp.session:
-            cp.session['has_share'] = rpc.RPCProxy('share.wizard').has_share()
-    %>
-    % if cp.session['has_share']:
-        <div id="share-wizard" class="sideheader-a"><h2>${_("Sharing")}</h2></div>
-             <ul class="clean-a">
-                 <li>
-                     <a id="sharing" href="#share">${_("Share")}</a>
-                 </li>
-             </ul>
-               <script type="text/javascript">
-                   jQuery(document).ready(function() {
-                       jQuery("#sharing").click(function() {
-                           jQuery(this).attr(
-                               "href",
-                               openobject.http.getURL('/share', {
-                                   context: jQuery("#_terp_context").val(),
-                                   domain: jQuery("#_terp_domain").val(),
-                                   view_id: jQuery("#_terp_view_id").val(),
-                                   action_id: jQuery("#_terp_action_id").val(),
-                                   search_domain: jQuery("#_terp_view_type").val() == "form" ? 
-                                                         ("[('id','=',"+jQuery("#_terp_id").val()+")]") : 
-                                                            jQuery("#_terp_search_domain").val(),
-                           }));
-                       });
-                   });
-               </script>
-               \n
-    % endif
-''' + output[share_opener_insertion:]
-
-    def edit(self, template, template_text):
-        return self.insert_share_link(
-            super(SidebarEditor, self).edit(template, template_text))
diff --git a/addons/share/wizard/__init__.py b/addons/share/wizard/__init__.py
index 2034dfe2fc6..1dae9e7a508 100644
--- a/addons/share/wizard/__init__.py
+++ b/addons/share/wizard/__init__.py
@@ -21,3 +21,5 @@
 
 import share_wizard
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index eec8b440dfa..5f33f02f9e5 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -119,24 +119,38 @@ class share_wizard(osv.osv_memory):
             values['name'] = action.name
         return super(share_wizard,self).create(cr, uid, values, context=context)
 
+    def share_url_template(self, cr, uid, _ids, context=None):
+        # NOTE: take _ids in parameter to allow usage through browse_record objects
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='', context=context)
+        if base_url:
+            base_url += '/?db=%(dbname)s&login=%(login)s'
+        return base_url
+
+    def _share_root_url(self, cr, uid, ids, _fieldname, _args, context=None):
+        result = dict.fromkeys(ids, '')
+        data = dict(dbname=cr.dbname, login='')
+        for this in self.browse(cr, uid, ids, context=context):
+            result[this.id] = this.share_url_template() % data
+        return result
+
     _columns = {
         'action_id': fields.many2one('ir.actions.act_window', 'Action to share', required=True,
                 help="The action that opens the screen containing the data you wish to share."),
         'domain': fields.char('Domain', size=256, help="Optional domain for further data filtering"),
-        'user_type': fields.selection(_user_type_selection,'Users to share with',
+        'user_type': fields.selection(lambda s, *a, **k: s._user_type_selection(*a, **k),'Users to share with', required=True,
                      help="Select the type of user(s) you would like to share data with."),
         'new_users': fields.text("Emails"),
         'access_mode': fields.selection([('readonly','Can view'),('readwrite','Can edit')],'Access Mode', required=True,
                                         help="Access rights to be granted on the shared documents."),
         'result_line_ids': fields.one2many('share.wizard.result.line', 'share_wizard_id', 'Summary', readonly=True),
-        'share_root_url': fields.char('Share Access URL', size=512, readonly=True, tooltip='Main access page for users that are granted shared access'),
+        'share_root_url': fields.function(_share_root_url, string='Share Access URL', type='char', size=512, readonly=True,
+                                help='Main access page for users that are granted shared access'),
         'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"),
         'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."),
     }
     _defaults = {
-        'user_type' : 'new',
+        'user_type' : 'emails',
         'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
-        'share_root_url': lambda self, cr, uid, context, *a: context.get('share_root_url') or _('Please specify "share_root_url" in context'),
         'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
         'access_mode': 'readonly',
     }
@@ -211,7 +225,7 @@ class share_wizard(osv.osv_memory):
                 del new_context[key]
 
         dataobj = self.pool.get('ir.model.data')
-        menu_id = dataobj._get_id(cr, uid, 'base', 'menu_administration_shortcut', new_context)
+        menu_id = dataobj._get_id(cr, uid, 'base', 'menu_administration_shortcut')
         shortcut_menu_id  = int(dataobj.read(cr, uid, menu_id, ['res_id'], new_context)['res_id'])
         action_id = self.pool.get('ir.actions.act_window').create(cr, UID_ROOT, values, new_context)
         menu_data = {'name': values['name'],
@@ -537,12 +551,11 @@ class share_wizard(osv.osv_memory):
         try:
             domain = safe_eval(wizard_data.domain)
             if domain:
-                domain_expr = expression.expression(domain)
                 for rel_field, model in fields_relations:
                     related_domain = []
                     if not rel_field: continue
                     for element in domain:
-                        if domain_expr._is_leaf(element):
+                        if expression.is_leaf(element):
                             left, operator, right = element
                             left = '%s.%s'%(rel_field, left)
                             element = left, operator, right
@@ -555,19 +568,6 @@ class share_wizard(osv.osv_memory):
             raise osv.except_osv(_('Sharing access could not be created'),
                                  _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
 
-    def _finish_result_lines(self, cr, uid, wizard_data, share_group_id, context=None):
-        """Perform finalization of the share, and populate the summary"""
-        share_root_url = wizard_data.share_root_url
-        format_url = '%(dbname)s' in share_root_url
-        for result in wizard_data.result_line_ids:
-                # share_root_url may contain placeholders for dbname, login and password
-                share_url = (share_root_url % \
-                                        {'login': quote_plus(result.user_id.login),
-                                         'password': '', # kept empty for security reasons
-                                         'dbname': quote_plus(cr.dbname)}) \
-                                          if format_url else share_root_url
-                result.write({'share_url': share_url}, context=context)
-
     def _check_preconditions(self, cr, uid, wizard_data, context=None):
         self._assert(wizard_data.action_id and wizard_data.access_mode,
                      _('Action and Access Mode are required to create a shared access'),
@@ -662,15 +662,6 @@ class share_wizard(osv.osv_memory):
         # C.
         self._create_indirect_sharing_rules(cr, current_user, wizard_data, group_id, obj1, context=context)
 
-        # so far, so good -> check summary results and return them
-        self._finish_result_lines(cr, uid, wizard_data, group_id, context=context)
-
-        # update share URL to make it generic
-        generic_share_url = wizard_data.share_root_url % {'dbname': cr.dbname,
-                                                          'login': '',
-                                                          'password': ''}
-        wizard_data.write({'share_root_url': generic_share_url}, context=context)
-
         # refresh wizard_data
         wizard_data = self.browse(cr, uid, ids[0], context=context)
 
@@ -692,6 +683,7 @@ class share_wizard(osv.osv_memory):
 
     def send_emails(self, cr, uid, wizard_data, context=None):
         self._logger.info('Sending share notifications by email...')
+        mail_message = self.pool.get('mail.message')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.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.'))
@@ -726,7 +718,12 @@ class share_wizard(osv.osv_memory):
             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.")
 
-            if tools.email_send(user.user_email, [email_to], subject, body):
+            if mail_message.schedule_with_attach(cr, uid,
+                                                 user.user_email,
+                                                 [email_to],
+                                                 subject,
+                                                 body,
+                                                 model='share.wizard'):
                 emails_sent += 1
             else:
                 self._logger.warning('Failed to send share notification from %s to %s, ignored', user.user_email, email_to)
@@ -736,11 +733,20 @@ share_wizard()
 class share_result_line(osv.osv_memory):
     _name = 'share.wizard.result.line'
     _rec_name = 'user_id'
+
+
+    def _share_url(self, cr, uid, ids, _fieldname, _args, context=None):
+        result = dict.fromkeys(ids, '')
+        for this in self.browse(cr, uid, ids, context=context):
+            data = dict(dbname=cr.dbname, login=this.login)
+            result[this.id] = this.share_wizard_id.share_url_template() % data
+        return result
+
     _columns = {
         'user_id': fields.many2one('res.users', required=True, readonly=True),
         'login': fields.related('user_id', 'login', string='Login', type='char', size=64, required=True, readonly=True),
         'password': fields.char('Password', size=64, readonly=True),
-        'share_url': fields.char('Share URL', size=512, required=True),
+        'share_url': fields.function(_share_url, string='Share URL', type='char', size=512),
         'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True),
         'newly_created': fields.boolean('Newly created', readonly=True),
     }
@@ -748,3 +754,5 @@ class share_result_line(osv.osv_memory):
         'newly_created': True,
     }
 share_result_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 5087b85d7bd..128b32b07da 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -29,6 +29,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grant instant access to your documents">
+                    <group name="groups_group" colspan="4" col="4">
+	                    <separator colspan="4" string="Who do you want to share with?"/>
+	                    <field name="user_type" />
+                    </group>
                     <group colspan="4" name="emails_group" attrs="{'invisible':[('user_type','!=','emails')]}">
                         <separator colspan="4" string="Share with these people (one e-mail per line)"/>
                         <field colspan="4" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails')]}"/>
@@ -78,7 +82,6 @@
                     - 'action_id' (id of action)
                     - 'domain' (string expression for full domain to apply as sent to server, 
                                with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
-                    - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders)
          -->
         <record id="action_share_wizard" model="ir.actions.act_window">
             <field name="name">Share Wizard</field>
@@ -94,7 +97,6 @@
                     - 'action_id' (id of action)
                     - 'domain' (string expression for full domain to apply as sent to server, 
                                with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
-                    - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders)
          -->
         <record id="action_share_wizard_step1" model="ir.actions.act_window">
             <field name="name">Share Wizard</field>
diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index 78abee6d31d..0a241209593 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -25,4 +25,4 @@ import product
 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/stock/__openerp__.py b/addons/stock/__openerp__.py
index 70dc37ec2da..9608aa9d8ad 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -47,9 +47,12 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "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",
+    "category" : "Warehouse Management",
     "init_xml" : [],
-    "demo_xml" : ["stock_demo.xml"],
+    "demo_xml" : [
+        "stock_demo.xml",
+        "stock_demo_picking.yml",
+    ],
     "update_xml" : [
         "security/stock_security.xml",
         "security/ir.model.access.csv",
@@ -76,12 +79,17 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "partner_view.xml",
         "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
-        "board_warehouse_view.xml"
+        "board_warehouse_view.xml",
+    ],
+    'test': [
+        'test/stock_test.yml',
+        'test/stock_report.yml',
+        'test/stock_test_wizard.yml',
+        'test/stock_demo_backorder.yml'
     ],
-    'test': ['test/stock_test.yml',
-             'test/stock_report.yml',
-             ],
     'installable': True,
     'active': False,
     'certificate': '0055421559965',
 }
+
+# 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 91245381e2f..3c645aecb5b 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -28,7 +28,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="stock.view_stock_graph_board"></field>
-            <field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+            <field name="context">{'default_type':'in','search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
         <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
             <field name="name">Outgoing Products Delay</field>
@@ -37,7 +37,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="stock.view_stock_graph_board"></field>
-            <field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+            <field name="context">{'default_type':'out','search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
         <record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
@@ -45,17 +45,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Warehouse board">
-                    <hpaned position="200">
-                        <child1>
-                            <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product"  width="510"/>
-                            <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" width="510"/>
-                        </child1>
+                    <board style="1-2">
+                        <column>
+                            <action name="%(action_incoming_product_board)d" string="Incoming Product"/>
+                            <action name="%(action_outgoing_product_board)d" string="Outgoing Product"/>
+                        </column>
 
-                        <child2>
-                            <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" />
-                            <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products Delay" />
-                        </child2>
-                    </hpaned>
+                        <column>
+                            <action name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay"/>
+                            <action name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products Delay"/>
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index 199ba0c33e4..fcc9d11f91c 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2087,8 +2087,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2145,7 +2145,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2860,7 +2860,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3903,3 +3903,8 @@ msgstr ""
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
 msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index cd99c6ebfa1..373159d3b9f 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.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:16+0000\n"
-"PO-Revision-Date: 2011-03-02 09:07+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2118,8 +2118,8 @@ msgid "Future Qty"
 msgstr "Бъдещо количесто"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2176,7 +2176,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2894,7 +2894,7 @@ msgstr "Продукти по категория"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Категории продукти"
 
 #. module: stock
@@ -3940,6 +3940,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Location Content (With children)"
 #~ msgstr "Съдържание на местонахождение (с подчинени)"
 
@@ -3955,10 +3960,6 @@ msgstr ""
 #~ msgid "Locations' Values"
 #~ msgstr "Стойности на местонахождение"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Бъдещи стоки"
-
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -3998,17 +3999,9 @@ msgstr ""
 #~ msgid "Products Received"
 #~ msgstr "Получени продукти"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Бъдещи продукции"
-
 #~ msgid "Incoming Products"
 #~ msgstr "Пристигащи продукти"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Бъдещи получавания"
-
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Изискване при получване да се използва партида от продукция"
 
@@ -4140,9 +4133,6 @@ msgstr ""
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Календар на доставките"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Проследяване на входящи партиди"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4182,10 +4172,6 @@ msgstr ""
 #~ msgid "STOCK_PASTE"
 #~ msgstr "STOCK_PASTE"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Бъдещи доставки"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Транспортен номер"
 
@@ -4290,9 +4276,6 @@ msgstr ""
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
-#~ msgid "Qty"
-#~ msgstr "К-во"
-
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Проект на периодична наличност"
 
@@ -4323,10 +4306,6 @@ msgstr ""
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Бъдещо к-во"
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Обезщетение на доставчик"
 
@@ -4532,9 +4511,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Проследяване на изходящи партиди"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4600,9 +4576,6 @@ msgstr ""
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Прекратен"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4645,10 +4618,6 @@ msgstr ""
 #~ msgid "Split in Two"
 #~ msgstr "Разделяне на две"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Бъдещи печалби и загуби"
-
 #~ 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 "
@@ -4719,9 +4688,6 @@ msgstr ""
 #~ msgid "Move History"
 #~ msgstr "Хронология на движение"
 
-#~ msgid "weight"
-#~ msgstr "тегло"
-
 #~ msgid "Available Packing"
 #~ msgstr "Налична опаковка"
 
@@ -4759,36 +4725,8 @@ msgstr ""
 #~ "Планирана дата за придвижване на продукти, или реална дата, ако "
 #~ "придвижването е извършено."
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "Модулът за управление на инвентар на OpenERP може да управлява многобройни "
-#~ "складове, многобройни и структурирани местонахождения в склад.\n"
-#~ "Благодарение на управлението с двойно вписване, контролирането на инвентара "
-#~ "е и мощно и гъвкаво:\n"
-#~ "*Хронология и планиране на движения\n"
-#~ "*Различни методи за инвентар (FIFO, LIFO, ...)\n"
-#~ "*Оценяване на склад (стандартни или средни цени, ...)\n"
-#~ "* Robustness faced with Inventory differences\n"
-#~ "*Автоматични правила за предварителни поръчки (складови наличности, JIT, "
-#~ "...)\n"
-#~ "*Поддръжка на баркодове\n"
-#~ "*Светкавично откриване на грешки благодарение на управлението с двойно "
-#~ "вписване\n"
-#~ "*Проследимост (вертикална, производствени партиди, серийни номера, ...)\n"
-#~ "    "
+#~ msgid "Products Categories"
+#~ msgstr "Категории продукти"
 
 #, python-format
 #~ msgid "Product "
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index d653abbb3f8..0dce966cc34 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2087,8 +2087,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2145,7 +2145,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2860,7 +2860,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3906,6 +3906,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 
@@ -4066,9 +4071,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_RECORD"
 #~ msgstr "STOCK_MEDIA_RECORD"
 
-#~ msgid "weight"
-#~ msgstr "Težina"
-
 #~ msgid "Available Packing"
 #~ msgstr "Dostupno pakovanje"
 
@@ -4224,24 +4226,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "Open ERP upravljanje zalihama\n"
-#~ "    "
-
 #~ msgid "Units"
 #~ msgstr "Jedinice mjere"
 
@@ -4404,9 +4388,6 @@ msgstr ""
 #~ msgid "Add"
 #~ msgstr "Dodaj"
 
-#~ msgid "Canceled"
-#~ msgstr "Poništeno"
-
 #~ msgid "Do you want to set stocks to zero ?"
 #~ msgstr "Da li želite postaviti zalihe na nulu?"
 
@@ -4506,9 +4487,6 @@ msgstr ""
 #~ msgid "Force to use a Production Lot during production order"
 #~ msgstr "Mora da se koristi proizvodna partija u toku prijema"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Praćenje dolaznih partija"
-
 #~ msgid ""
 #~ "This journal will be used for the accounting move generated by stock move"
 #~ msgstr ""
@@ -4584,9 +4562,6 @@ msgstr ""
 #~ msgid "Serial"
 #~ msgstr "Serijski"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Praćenje izlaznih partija"
-
 #~ 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 "
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index 335890b07ef..55233026269 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-26 18:33+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-11-07 12:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -897,7 +896,7 @@ msgstr "Diari"
 #: code:addons/stock/stock.py:1315
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "Està previst %s."
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -2268,9 +2267,9 @@ msgid "Future Qty"
 msgstr "Qtat futura"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Compte variació d'estoc"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr "Compte de la valoració d'estoc"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2326,7 +2325,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubicació on el sistema emmagatzemarà els productes finalitzats."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -3093,7 +3092,7 @@ msgstr "Productes per categoria"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categories de productes"
 
 #. module: stock
@@ -3525,7 +3524,7 @@ msgstr "Categoria del producte"
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr ""
+msgstr "INV: %s"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -4000,13 +3999,13 @@ msgstr ""
 #: code:addons/stock/stock.py:2386
 #, python-format
 msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
+msgstr "'%s' producte que es consumeix amb '%s' quantitat."
 
 #. module: stock
 #: code:addons/stock/stock.py:2595
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "l'inventari '%s' està llest."
 
 #. module: stock
 #: constraint:stock.move:0
@@ -4207,9 +4206,10 @@ msgstr "Moviment parcial"
 msgid "Optional localization details, for information purpose only"
 msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Estoc futur"
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
 
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
@@ -4244,14 +4244,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "Products Received"
 #~ msgstr "Productes rebuts"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Produccions futures"
-
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Recepcions futures"
-
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Obligueu a utilitzar un lot de producció durant la recepció"
 
@@ -4372,9 +4364,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Calendari d'enviaments"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Lots seguiment d'entrada"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4419,10 +4408,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgstr ""
 #~ "Lot de seguiment és el codi que es col·locarà en la unitat/palet logístic."
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Enviaments futurs"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Número seguiment"
 
@@ -4557,10 +4542,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Qtat futura"
-
 #~ msgid "STOCK_CDROM"
 #~ msgstr "STOCK_CDROM"
 
@@ -4760,9 +4741,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Lots seguiment de sortida"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4823,9 +4801,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Cancel·lat"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4868,10 +4843,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "Split in Two"
 #~ msgstr "Divideix en dos"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "P&L futur"
-
 #~ 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 "
@@ -5013,9 +4984,6 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "Move Lines"
 #~ msgstr "Línies moviment"
 
-#~ msgid "Qty"
-#~ msgstr "Qtat."
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Factura rectificativa (abonament) de proveïdor"
 
@@ -5075,6 +5043,12 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "Product "
 #~ msgstr "Producte "
 
+#~ msgid "Stock Variation Account"
+#~ msgstr "Compte variació d'estoc"
+
+#~ msgid "Products Categories"
+#~ msgstr "Categories de productes"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index 56e482bdb06..c74ce13948f 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-07-15 19:02+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\n"
+"PO-Revision-Date: 2011-11-07 12:57+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: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: stock
@@ -153,7 +153,7 @@ msgid "UoM"
 msgstr "UoM"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:104
+#: code:addons/stock/wizard/stock_change_product_qty.py:90
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 #, python-format
@@ -186,14 +186,14 @@ msgstr ""
 "k nastavení každého výrobku."
 
 #. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2415
+#: code:addons/stock/stock.py:1176
+#: code:addons/stock/stock.py:2378
 #, python-format
 msgid "Missing partial picking data for move #%s"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.server,name:stock.action_partial_move_server
+#: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
 msgstr "Odeslat/Příjmout výrobky"
 
@@ -252,8 +252,7 @@ msgid "Reference"
 msgstr "Odkaz"
 
 #. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
+#: code:addons/stock/stock.py:661
 #, python-format
 msgid "Products to Process"
 msgstr "Výrobky ke zpracování"
@@ -278,16 +277,15 @@ msgid "Split lines"
 msgstr "Rozdělit řádky"
 
 #. module: stock
-#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1127
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr "Nemůžete zrušit navádění, protože pohyb zásob je dokončeném stavu !"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
-#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/stock.py:2198
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Warning!"
 msgstr "Varování!"
@@ -317,7 +315,7 @@ msgid "Currency in which Unit cost is expressed"
 msgstr "Měna, ve které je vyjádřena jednotková cena"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "No invoicing"
 msgstr "Bez fakturace"
@@ -432,7 +430,7 @@ msgid "In Qty"
 msgstr "V množ."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "No product in this location."
 msgstr "V tomto místě není žádný výrobek."
@@ -509,7 +507,7 @@ msgid "Move History (child moves)"
 msgstr "Historie pohybů (pohyby potomků)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:1984
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
@@ -529,7 +527,7 @@ msgid "Destination Location"
 msgstr "Cílové umístění"
 
 #. module: stock
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
 msgstr "Nemůžete zpracovat navádění bez pohybů zásob"
@@ -578,7 +576,7 @@ msgid "Location / Product"
 msgstr "Místo / Výrobek"
 
 #. module: stock
-#: code:addons/stock/stock.py:1303
+#: code:addons/stock/stock.py:1306
 #, python-format
 msgid "Reception"
 msgstr "Příjem"
@@ -708,7 +706,7 @@ msgid "Process Picking"
 msgstr "Zpracovat navádění"
 
 #. module: stock
-#: code:addons/stock/product.py:358
+#: code:addons/stock/product.py:355
 #, python-format
 msgid "Future Receptions"
 msgstr "Budoucí příjmy"
@@ -793,7 +791,7 @@ msgid "Merge Inventory"
 msgstr "Sloučit inventář"
 
 #. module: stock
-#: code:addons/stock/product.py:374
+#: code:addons/stock/product.py:371
 #, python-format
 msgid "Future P&L"
 msgstr "Budoucí P&L"
@@ -1018,7 +1016,7 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: stock
-#: code:addons/stock/stock.py:1302
+#: code:addons/stock/stock.py:1305
 #, python-format
 msgid "Delivery Order"
 msgstr "Objednávka doručení"
@@ -1157,7 +1155,7 @@ msgstr ""
 "zdrojové umístění pro pohyby zásob generované výrobními příkazy"
 
 #. module: stock
-#: code:addons/stock/stock.py:2006
+#: code:addons/stock/stock.py:1975
 #, python-format
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
@@ -1165,7 +1163,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: code:addons/stock/stock.py:1322
 #, python-format
 msgid "is in draft state."
 msgstr ""
@@ -1190,7 +1188,7 @@ msgid "Chaining Type"
 msgstr "Typ zřetězení"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "To be refunded/invoiced"
 msgstr ""
@@ -1230,7 +1228,7 @@ msgid "Additional Info"
 msgstr "Doplňkové info"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1602
 #, python-format
 msgid "Operation forbidden"
 msgstr "Nedovolená operace"
@@ -1241,7 +1239,7 @@ msgid "From"
 msgstr "Od"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:77
+#: code:addons/stock/wizard/stock_return_picking.py:79
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1370,13 +1368,12 @@ msgid "None"
 msgstr "Žádné"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action3
 #: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "No Invoices were created"
 msgstr "Nebyla vytvořena žádná faktura"
@@ -1429,7 +1426,7 @@ msgstr ""
 "Nechejte toto pole prázdné, pokud je toto umístění sdílené mezi společnostmi."
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2198
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
 msgstr "Prosíme poskytněte kladné množství k vyhození!"
@@ -1469,7 +1466,7 @@ msgid "Supplier Location"
 msgstr "Umístění dodavatele"
 
 #. module: stock
-#: code:addons/stock/stock.py:2254
+#: code:addons/stock/stock.py:2217
 #, python-format
 msgid "were scrapped"
 msgstr "byly vyhozeny"
@@ -1584,7 +1581,7 @@ msgid "Stock report by tracking lots"
 msgstr "Skladový výkaz dle sledovaných dávek"
 
 #. module: stock
-#: code:addons/stock/product.py:370
+#: code:addons/stock/product.py:367
 #, python-format
 msgid "Delivered Qty"
 msgstr "Doručené množ."
@@ -1661,7 +1658,7 @@ msgid "Warehouse Dashboard"
 msgstr "Nástěnka skladu"
 
 #. module: stock
-#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:510
 #, python-format
 msgid "You can not remove a lot line !"
 msgstr "Nemůžete odstranit řádek dávky !"
@@ -1675,7 +1672,7 @@ msgid "Scrap Products"
 msgstr "Vadné výrobky"
 
 #. module: stock
-#: code:addons/stock/stock.py:1128
+#: code:addons/stock/stock.py:1135
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
 msgstr "Nemůžete odstranit navádění, které je ve stavu %s !"
@@ -1732,13 +1729,13 @@ msgid "Shipping Address :"
 msgstr "Dodací adresa :"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Provide the quantities of the returned products."
 msgstr "Poskytněte množství navrácených výrobků."
 
 #. module: stock
-#: code:addons/stock/stock.py:2009
+#: code:addons/stock/stock.py:1978
 #, python-format
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
@@ -1817,7 +1814,7 @@ msgid "Quantity per lot"
 msgstr "Množství na dávku"
 
 #. module: stock
-#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:1981
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
@@ -1827,7 +1824,7 @@ msgstr ""
 "\"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:360
+#: code:addons/stock/product.py:357
 #, python-format
 msgid "Received Qty"
 msgstr "Obdržené množ."
@@ -1968,7 +1965,6 @@ msgstr "Cena"
 #: 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 "Vstupní účet zásob"
 
@@ -2026,7 +2022,7 @@ msgid "Inventory loss"
 msgstr "Ztráty inventáře"
 
 #. module: stock
-#: code:addons/stock/stock.py:1311
+#: code:addons/stock/stock.py:1314
 #, python-format
 msgid "Document"
 msgstr "Dokument"
@@ -2116,15 +2112,15 @@ msgid "Warehouse board"
 msgstr "Tabule skladu"
 
 #. module: stock
-#: code:addons/stock/product.py:380
+#: code:addons/stock/product.py:377
 #, python-format
 msgid "Future Qty"
 msgstr "Budoucí množ."
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Účet výměny zásob"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2147,13 +2143,13 @@ msgid "Shipping Type"
 msgstr "Typ přepravy"
 
 #. module: stock
-#: code:addons/stock/stock.py:2210
+#: code:addons/stock/stock.py:2175
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Můžete smazat pouze návrhové přesuny."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #: 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
@@ -2180,7 +2176,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Umístění, kde systém naskladní hotové výrobky."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2218,7 +2214,7 @@ msgid "Expected date for the picking to be processed"
 msgstr "Očekávaný datum pro zpracování navedení"
 
 #. module: stock
-#: code:addons/stock/product.py:376
+#: code:addons/stock/product.py:373
 #, python-format
 msgid "P&L Qty"
 msgstr "P&L množ."
@@ -2296,7 +2292,7 @@ msgid "Source"
 msgstr "Zdroj"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:2557
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
 #: field:stock.inventory.line,inventory_id:0
@@ -2336,7 +2332,7 @@ 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/stock.py:751
 #, python-format
 msgid "Error !"
 msgstr "Chyba !"
@@ -2402,7 +2398,7 @@ msgid "Maxtor Suppliers"
 msgstr "Dodavatelé Maxtoru"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
+#: code:addons/stock/wizard/stock_change_product_qty.py:66
 #: code:addons/stock/wizard/stock_change_standard_price.py:106
 #, python-format
 msgid "Active ID is not set in Context"
@@ -2513,7 +2509,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2302
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
@@ -2569,7 +2565,7 @@ msgid "Quantity (UOS)"
 msgstr "Množství (UOS)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1664
+#: code:addons/stock/stock.py:1647
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
@@ -2609,7 +2605,7 @@ msgid "Properties"
 msgstr "Vlastnosti"
 
 #. module: stock
-#: code:addons/stock/stock.py:974
+#: code:addons/stock/stock.py:982
 #, python-format
 msgid "Error, no partner !"
 msgstr "Chyba, žádný partner !"
@@ -2617,7 +2613,6 @@ msgstr "Chyba, žádný partner !"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
 msgstr "Incoterms"
@@ -2659,7 +2654,7 @@ msgid "Inventory Reference"
 msgstr "Odkaz inventáře"
 
 #. module: stock
-#: code:addons/stock/stock.py:1304
+#: code:addons/stock/stock.py:1307
 #, python-format
 msgid "Internal picking"
 msgstr "Vnitřní navádění"
@@ -2745,7 +2740,7 @@ msgid "Date done"
 msgstr "Datum dokončení"
 
 #. module: stock
-#: code:addons/stock/stock.py:975
+#: code:addons/stock/stock.py:983
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -2825,14 +2820,14 @@ msgid "Product"
 msgstr "Výrobek"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "Invoicing"
 msgstr "Fakturace"
 
 #. module: stock
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Please provide Proper Quantity !"
 msgstr "Priosíme poskytněte vhodné množství !"
@@ -2859,7 +2854,7 @@ msgid "Consume Products"
 msgstr "Spotřebované výrobky"
 
 #. module: stock
-#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1646
 #, python-format
 msgid "Insufficient Stock in Lot !"
 msgstr "Nedostatek zásob v dávce !"
@@ -2903,7 +2898,7 @@ msgstr "Výrobky podle kategorie"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorie výrobků"
 
 #. module: stock
@@ -3005,7 +3000,7 @@ msgid "All at once"
 msgstr "Vše najednou"
 
 #. module: stock
-#: code:addons/stock/stock.py:1620
+#: code:addons/stock/stock.py:1603
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
@@ -3013,7 +3008,7 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:386
+#: code:addons/stock/product.py:383
 #, python-format
 msgid "Future Productions"
 msgstr "Budoucí výroba"
@@ -3024,7 +3019,7 @@ msgid "To Invoice"
 msgstr "K fakturaci"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Return lines"
 msgstr "Vrátit řádky"
@@ -3099,8 +3094,7 @@ msgid "Icon"
 msgstr "Ikona"
 
 #. module: stock
-#: code:addons/stock/stock.py:2209
-#: code:addons/stock/stock.py:2617
+#: code:addons/stock/stock.py:2174
 #, python-format
 msgid "UserError"
 msgstr "Uživatelská chyba"
@@ -3127,14 +3121,14 @@ msgstr "Neevropský zákazník"
 #: 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/wizard/stock_fill_inventory.py:47
+#: code:addons/stock/stock.py:1975
+#: code:addons/stock/stock.py:1978
+#: code:addons/stock/stock.py:1981
+#: code:addons/stock/stock.py:1984
+#: code:addons/stock/stock.py:1987
+#: code:addons/stock/stock.py:1990
+#: code:addons/stock/stock.py:2302
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -3142,7 +3136,7 @@ msgid "Error!"
 msgstr "Chyba!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2021
+#: code:addons/stock/stock.py:1990
 #, python-format
 msgid ""
 "There is no inventory variation account defined on the product category: "
@@ -3174,7 +3168,7 @@ msgid "It specifies goods to be delivered all at once or by direct delivery"
 msgstr "Určuje, zda bude zboží dodáno vše najednou nebo přímým dodáním"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #, python-format
 msgid "This picking list does not require invoicing."
 msgstr "Naváděcí seznam nevyžaduje fakturaci."
@@ -3209,8 +3203,8 @@ msgid "Warning"
 msgstr "Varování"
 
 #. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:1321
+#: code:addons/stock/stock.py:2557
 #, python-format
 msgid "is done."
 msgstr "dokončeno."
@@ -3314,7 +3308,7 @@ msgid "Reporting"
 msgstr "Hlášení"
 
 #. module: stock
-#: code:addons/stock/stock.py:1313
+#: code:addons/stock/stock.py:1316
 #, python-format
 msgid " for the "
 msgstr " pro "
@@ -3363,7 +3357,7 @@ msgid "Chaining Journal"
 msgstr "Deník zřetězení"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Nelze rezervovat výrobky kvůli nedostatku zásob."
@@ -3374,7 +3368,7 @@ msgid "Customers"
 msgstr "Zákazníci"
 
 #. module: stock
-#: code:addons/stock/stock.py:1317
+#: code:addons/stock/stock.py:1320
 #, python-format
 msgid "is cancelled."
 msgstr "je zrušeno."
@@ -3385,13 +3379,13 @@ msgid "Stock Inventory Lines"
 msgstr "Řádky inventáře skladu"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #, python-format
 msgid "Process Document"
 msgstr "Zpracovat dokument"
 
 #. module: stock
-#: code:addons/stock/product.py:368
+#: code:addons/stock/product.py:365
 #, python-format
 msgid "Future Deliveries"
 msgstr "Budoucí dodávky"
@@ -3553,7 +3547,7 @@ msgid "Existing Lot"
 msgstr "Existující dávka"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
 msgstr "Prosíme zadejte nejméně jedno nenulové množství!"
@@ -3568,7 +3562,7 @@ msgstr ""
 "protože zdrojové umístění pro pohyb zásob je generováno zásobováním"
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
 msgstr "je připraveno ke zpracování."
@@ -3584,7 +3578,7 @@ msgid "Set to zero"
 msgstr "Nastavit na nulu"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
 #, python-format
 msgid "None of these picking lists require invoicing."
 msgstr "Žádný z těchto naváděcích seznamů nevyžaduje fakturaci."
@@ -3596,13 +3590,13 @@ msgstr "Listopad"
 
 #. module: stock
 #: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
+#: code:addons/stock/stock.py:1987
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr "Není definován deník pro tuto kategorii výrobků: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:382
+#: code:addons/stock/product.py:379
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Neplánované množ."
@@ -3642,16 +3636,16 @@ msgid "Move History (parent moves)"
 msgstr "Historie pohybů (nadřazené pohyby)"
 
 #. module: stock
-#: code:addons/stock/product.py:364
+#: code:addons/stock/product.py:361
 #, python-format
 msgid "Future Stock"
 msgstr "Budoucí zásoby"
 
 #. 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:510
+#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1135
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "Error"
 msgstr "Chyba"
@@ -3789,7 +3783,7 @@ msgid "Split Move"
 msgstr "Rozdělit přesun"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:92
+#: code:addons/stock/wizard/stock_return_picking.py:97
 #, python-format
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
@@ -3835,7 +3829,6 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
 #: view:stock.tracking:0
 msgid "Upstream traceability"
 msgstr "Sledování odchozích"
@@ -3847,7 +3840,7 @@ msgid "Location Content"
 msgstr "Obsah místa"
 
 #. module: stock
-#: code:addons/stock/product.py:388
+#: code:addons/stock/product.py:385
 #, python-format
 msgid "Produced Qty"
 msgstr "Vyrobené množ."
@@ -3856,7 +3849,6 @@ msgstr "Vyrobené množ."
 #: 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 "Výstupní účet zásob"
 
@@ -3910,13 +3902,12 @@ msgid "Invoiced date"
 msgstr "Fakturační datum"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/stock.py:729
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #: 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/wizard/stock_return_picking.py:79
+#: code:addons/stock/wizard/stock_return_picking.py:97
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Warning !"
 msgstr "Varování !"
@@ -3964,6 +3955,11 @@ msgstr "Částečný přesun"
 msgid "Optional localization details, for information purpose only"
 msgstr "Volitelné podrobnosti umístění, pouze pro informační účely"
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Return"
 #~ msgstr "Návrat"
 
@@ -3978,6 +3974,12 @@ msgstr "Volitelné podrobnosti umístění, pouze pro informační účely"
 #~ msgid "Product "
 #~ msgstr "Výrobek "
 
+#~ msgid "Stock Variation Account"
+#~ msgstr "Účet výměny zásob"
+
+#~ msgid "Products Categories"
+#~ msgstr "Kategorie výrobků"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
@@ -3990,71 +3992,5 @@ msgstr "Volitelné podrobnosti umístění, pouze pro informační účely"
 #~ msgid "quantity."
 #~ msgstr "množství."
 
-#~ msgid "Convert to Quotation"
-#~ msgstr "Převést na cenovou nabídku"
-
-#~ msgid "Opportunity  '%s' is converted to Quotation."
-#~ msgstr "Příležitost '%s' je převedena na Ocenění."
-
-#~ msgid "Data Insufficient!"
-#~ msgstr "Nedostatečná data !"
-
-#~ msgid "Customer has no addresses defined!"
-#~ msgstr "Zákazník nemá definovánu adresu!"
-
-#~ msgid "Make sales"
-#~ msgstr "Provést prodej"
-
-#~ msgid "_Create"
-#~ msgstr "_Vytvořit"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Odkaz objednávky musí být jedinečný !"
-
-#~ msgid ""
-#~ "Check this to close the opportunity after having created the sale order."
-#~ msgstr ""
-#~ "Zaškrtněte toto k uzavření příležitosti po té, když bude mít vytvořenu "
-#~ "prodejní objednávku."
-
-#~ msgid "Convert to Quote"
-#~ msgstr "Převést na ocenění"
-
-#~ msgid "Monthly Turnover"
-#~ msgstr "Měsíční obrat"
-
-#~ msgid "Converted to Sales Quotation(id: %s)."
-#~ msgstr "Převedeno na prodejní ocenění(id: %s)."
-
-#~ msgid "Opportunity: %s"
-#~ msgstr "Příležitost: %s"
-
-#~ msgid "Creates Sales order from Opportunity"
-#~ msgstr "Vytvořit prodejní objednávky z příležitosti"
-
-#~ msgid "Quotations"
-#~ msgstr "Cenové nabídky"
-
-#~ msgid "Shop"
-#~ msgstr "Obchod"
-
-#~ msgid "Opportunities by Stage"
-#~ msgstr "Příležitosti podle fáze"
-
-#~ msgid "My Quotations"
-#~ msgstr "Moje cenové nabídky"
-
-#~ msgid "Close Opportunity"
-#~ msgstr "Užavřít příležitost"
-
-#~ msgid "Sales Team"
-#~ msgstr "Obchodní tým"
-
-#~ msgid "Make Quotation"
-#~ msgstr "Vytvořit cenovou nabídku"
-
-#~ msgid "Sales Order"
-#~ msgstr "Prodejní objednávka"
-
-#~ msgid "Opportunity "
-#~ msgstr "Příležitost "
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatné jméno modelu v definici akce."
diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po
new file mode 100644
index 00000000000..007c15baa00
--- /dev/null
+++ b/addons/stock/i18n/da.po
@@ -0,0 +1,3911 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-09-22 19:56+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: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups_upload
+msgid "Stock ups upload"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:76
+#, python-format
+msgid "Variation Account is not specified for Product Category: %s"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in a new pack"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,action:0
+msgid "Action"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+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 ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr "Revisionsnummer"
+
+#. module: stock
+#: view:stock.move.memory.in:0
+#: view:stock.move.memory.out:0
+msgid "Product Moves"
+msgstr "Lagerflytning"
+
+#. 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 ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"Periodical Inventories are used to count the number of products available "
+"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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr ""
+
+#. module: stock
+#: 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.split.into,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+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
+msgid "Day"
+msgstr "Dag"
+
+#. 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.production.lot:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:90
+#: 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 ""
+
+#. module: stock
+#: field:product.category,property_stock_journal:0
+#: view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
+msgid "Stock journal"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Incoming"
+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. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1176
+#: code:addons/stock/stock.py:2378
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_move
+msgid "Deliver/Receive Products"
+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 ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it '             #                        'for "
+"this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,origin:0
+#: view:stock.picking:0
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,picking_id:0
+#: field:stock.picking,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:661
+#, python-format
+msgid "Products to Process"
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Split lines"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1127
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2198
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
+#, python-format
+msgid "Warning!"
+msgstr "Advarsel!"
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+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
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+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 ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:135
+#, python-format
+msgid "No invoicing"
+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 ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+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
+#: report:stock.picking.list:0
+msgid "State"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+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
+msgid "Available"
+msgstr "Til rådighed"
+
+#. module: stock
+#: view:stock.picking:0
+#: field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+msgid "Outgoing Product"
+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 ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
+#, python-format
+msgid "No product in this location."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+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 ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0
+#: field:stock.location,usage:0
+msgid "Location Type"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,type:0
+#: help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "["
+msgstr "["
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Production Lot Number available in "
+"company warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1984
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:751
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"You will find in this list all products you have to deliver to your "
+"customers. You can process the deliveries directly from this list using the "
+"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 ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: field:stock.location,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1306
+#, python-format
+msgid "Reception"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot.revision:0
+msgid "Production Lot Revisions"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid ""
+"The stock journal system allows you to assign each stock operation to a "
+"specific journal according to the type of operation to perform or the "
+"worker/team that should perform the operation. Examples of stock journals "
+"may be: quality control, pick lists, packing, etc."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,complete_name:0
+#: field:stock.location,name:0
+msgid "Location Name"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Move Information"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr "August"
+
+#. 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
+msgid "Packs"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+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
+msgid "Production Lots"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+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 ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+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 ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:355
+#, python-format
+msgid "Future Receptions"
+msgstr ""
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing lots in the list below, otherwise you "
+"should enter new ones line by line."
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Now"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,prodlot_id:0
+msgid "Production lot is used to put a serial number on the production"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_input_id:0
+msgid "Location Input"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr "Indkøb"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+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 ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:371
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: 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 ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Incoming Products Delay"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr "Lagersteder"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr "Enhedspris"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines_exist
+msgid "Exist Split lines"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Haster"
+
+#. module: stock
+#: view:stock.picking:0
+#: report:stock.picking.list:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Inventory Properties"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Month-1"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:132
+#, python-format
+msgid "Delivery Information"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#, python-format
+msgid "Stock Inventory is done"
+msgstr ""
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:148
+#, python-format
+msgid ""
+"There is no stock output account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_production:0
+msgid "Production Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+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"
+"        "
+msgstr ""
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1305
+#, python-format
+msgid "Delivery Order"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_memory_in
+msgid "stock.move.memory.in"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr "Leverandør"
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Expected Shipping Date"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Not Available"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr "Marts"
+
+#. 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
+msgid "Split inventory lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select 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 ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+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 production "
+"orders"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1975
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Variant account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1322
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+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
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:135
+#, python-format
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 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
+msgid "_Cancel"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1602
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,from_date:0
+msgid "From"
+msgstr "Fra"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:79
+#, 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 ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+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
+msgid "Waiting"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:93
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
+msgid "Type"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+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
+msgid "Creation Date"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
+msgid "Packing"
+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 ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:85
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:139
+#, python-format
+msgid "Receive Information"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
+msgid "Location Inventory Overview"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement
+msgid "Stock Replacement"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
+#, python-format
+msgid "No Invoices were created"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "OpenERP S.A."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:140
+#, python-format
+msgid "Receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+#: field:stock.picking,date:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: stock
+#: field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* Done: has been processed, can't be modified or cancelled anymore\n"
+"* Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2198
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:85
+#, python-format
+msgid "Cannot deliver products which are already delivered !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not "
+"find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2217
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr "September"
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+msgid ""
+"If this picking was split this field links to the picking that contains the "
+"other part that has been processed already."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory.in,currency:0
+#: field:stock.move.memory.out,currency:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+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."
+msgstr ""
+
+#. 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
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "Lagerflytning"
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:367
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: 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 ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+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 "Dato"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr "Oversigt"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_track
+msgid "Track moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:510
+#, python-format
+msgid "You can not remove a lot line !"
+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
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1135
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+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
+msgid "Cancel"
+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 ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: 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.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:120
+#, python-format
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1978
+#, 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 ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr "Kost pris"
+
+#. module: stock
+#: view:product.product:0
+#: field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Later"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+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 ""
+
+#. module: stock
+#: field:stock.warehouse,partner_address_id:0
+msgid "Owner Address"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_move_report
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"moves. Use this report when you want to analyse the different routes taken "
+"by your products and inventory management performance."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1981
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:357
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.incoterms,name:0
+#: field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr "Lager"
+
+#. module: stock
+#: model:ir.module.module,description:stock.module_meta_information
+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"
+"    "
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"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"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr "]"
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+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:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+msgid "Incoming Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory.in,cost:0
+#: field:stock.move.memory.out,cost:0
+msgid "Cost"
+msgstr "Pris"
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1314
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+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
+msgid "Unit of Measure"
+msgstr "Måleenhed"
+
+#. module: stock
+#: code:addons/stock/product.py:176
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line_old
+#: view:stock.move.track:0
+msgid "Tracking a move"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+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 ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:90
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:377
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,note:0
+#: view:stock.picking:0
+#: field:stock.picking,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr "Værdi"
+
+#. module: stock
+#: field:report.stock.move,type:0
+#: field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2175
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:74
+#: 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
+msgid "Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+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
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: 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
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid ""
+"Here you can receive individual products, no matter what purchase order or "
+"picking order they come from. You will find the list of all products you are "
+"waiting for. Once you receive an order, you can filter based on the name of "
+"the supplier or the purchase order reference. Then you can confirm all "
+"products received using the buttons on the right of each line."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "Lager flytning"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory.in,move_id:0
+#: field:stock.move.memory.out,move_id:0
+msgid "Move"
+msgstr "Flyt"
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:373
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr ""
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
+msgid ""
+"Inventory Analysis allows you to easily check and analyse your company stock "
+"levels. Sort and group by selection criteria in order to better analyse and "
+"manage your company  activities."
+msgstr ""
+
+#. module: stock
+#: 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 ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid ""
+"Define your locations to reflect your warehouse structure and organization. "
+"OpenERP is able to manage physical locations (warehouses, shelves, bin, "
+"etc), partner locations (customers, suppliers) and virtual locations which "
+"are the counterpart of the stock operations like the manufacturing orders "
+"consumptions, inventories, etc. Every stock operation in OpenERP moves the "
+"products from one location to another one. For instance, if you receive "
+"products from a supplier, OpenERP will move products from the Supplier "
+"location to the Stock location. Each report can be performed on physical, "
+"partner or virtual locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr "Prioritet"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2557
+#: 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
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups
+msgid "Stock ups"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines.exist,name:0
+msgid "Tracking serial"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#: code:addons/stock/stock.py:751
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement_result
+msgid "Stock Replacement result"
+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 "Måleenheder"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"need this report in order to ensure that the stock of each product is "
+"controlled at least once a year."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+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
+msgid "Stock Journal"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Indkøb"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Maxtor Suppliers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:66
+#: code:addons/stock/wizard/stock_change_standard_price.py:106
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+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
+msgid "Receive Products"
+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 ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking list"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Yes"
+msgstr "Ja"
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+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
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:122
+#, python-format
+msgid ""
+"There is no stock input account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2302
+#, python-format
+msgid "Can not consume a move with negative or zero quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real:0
+msgid "Real Stock"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr ""
+
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+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. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. 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
+msgid "Lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1647
+#, python-format
+msgid ""
+"You are moving %.2f %s products but only %.2f %s available in this lot."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Set Available"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,active:0
+#: field:stock.location,active:0
+#: field:stock.tracking,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: stock
+#: model:ir.module.module,shortdesc:stock.module_meta_information
+msgid "Inventory Management"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:982
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr "Incoterms"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
+msgstr ""
+
+#. module: stock
+#: field:stock.move.track,tracking_prefix:0
+msgid "Tracking prefix"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1307
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr "Til"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Lagersted"
+
+#. 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)"
+msgstr ""
+
+#. module: stock
+#: view:product.category:0
+msgid "Accounting Stock Properties"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+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:stock.picking,state:0
+msgid "Done"
+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 ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:983
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "To Do"
+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 "Lagersteder"
+
+#. module: stock
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,returned_price:0
+msgid "Returned product price"
+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 ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+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 "Lager"
+
+#. 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
+#: 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.move.split,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
+msgid "Product"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:135
+#, python-format
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posz:0
+msgid "Height (Z)"
+msgstr ""
+
+#. module: stock
+#: field:stock.ups,weight:0
+msgid "Lot weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1646
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr "Varianter"
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr "Leverandører"
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory.in,wizard_id:0
+#: field:stock.move.memory.out,wizard_id:0
+msgid "Wizard"
+msgstr "Guide"
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"Internal Moves display all inventory operations you have to perform in your "
+"warehouse. All operations can be categorized into stock journals, so that "
+"each worker has his own list of operations to perform in his own journal. "
+"Most operations are prepared automatically by OpenERP according to your "
+"preconfigured logistics rules, but you can also record manual stock "
+"operations."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
+#: field:stock.move,location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1603
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:383
+#, python-format
+msgid "Future Productions"
+msgstr "Fremtidige produktioner"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:120
+#, python-format
+msgid "Return lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_lines_date
+#: view:report.stock.lines.date:0
+msgid "Dates of Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_memory_out
+msgid "stock.move.memory.out"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
+#, python-format
+msgid "Message !"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in current pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr "Årsag"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Delivery Order:"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid ""
+"This is the list of all the production lots (serial numbers) you recorded. "
+"When you select a lot, you can get the upstream or downstream traceability "
+"of the products contained in lot. By default, the list is filtred on the "
+"serial numbers that are available in your warehouse but you can uncheck the "
+"'Available' button to get all the lots you produced, received or delivered "
+"to customers."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2174
+#, python-format
+msgid "UserError"
+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
+msgid "Ok"
+msgstr "OK"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+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:1975
+#: code:addons/stock/stock.py:1978
+#: code:addons/stock/stock.py:1981
+#: code:addons/stock/stock.py:1984
+#: code:addons/stock/stock.py:1987
+#: code:addons/stock/stock.py:1990
+#: code:addons/stock/stock.py:2302
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1990
+#, python-format
+msgid ""
+"There is no inventory variation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Do you want to merge theses inventories ?"
+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
+msgid "Cancelled"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Picking"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
+#, python-format
+msgid "This picking list does not require invoicing."
+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 ""
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:43
+#: code:addons/stock/wizard/stock_inventory_merge.py:63
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1321
+#: code:addons/stock/stock.py:2557
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+msgid ""
+"This stock location will be used, instead of the default one, as the "
+"destination location for goods you send to this partner"
+msgstr ""
+
+#. module: stock
+#: selection:report.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 "Bekræftet"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
+msgid "Merge inventories"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.product.qty,new_quantity:0
+msgid "This quantity is expressed in the Default UoM of the product."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: help:stock.move.memory.in,cost:0
+#: help:stock.move.memory.out,cost:0
+msgid "Unit Cost for this product line"
+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.move,categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. 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 "Rapportering"
+
+#. module: stock
+#: code:addons/stock/stock.py:1316
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:729
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Kunder"
+
+#. module: stock
+#: code:addons/stock/stock.py:1320
+#, python-format
+msgid "is cancelled."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:74
+#, python-format
+msgid "Process Document"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:365
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. 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
+#: 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 ""
+
+#. module: stock
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr "Vægt"
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr "December"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"This menu gives you the full traceability of inventory operations on a "
+"specific product. You can filter on the product to see all the past or "
+"future movements for the product."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: 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 ""
+
+#. 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
+msgid "Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid ""
+"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'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Outgoing Products Delay"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,use_exist:0
+msgid "Existing Lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:204
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1319
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr "November"
+
+#. module: stock
+#: code:addons/stock/product.py:101
+#: code:addons/stock/stock.py:1987
+#, python-format
+msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:379
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
+msgid "Future Stock Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:361
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:510
+#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1135
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"This is the structure of your company's warehouses and locations. You can "
+"click on a location to get the list of the products and their stock level in "
+"this particular location and all its children."
+msgstr ""
+
+#. 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.production.lot,name:0
+msgid "Production Lot"
+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
+msgid "Traceability"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+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
+msgid "Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split for this product: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. 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
+msgid "Moves"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+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 "Produktion"
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:97
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:133
+#, python-format
+msgid "Deliver"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Upstream traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:385
+#, python-format
+msgid "Produced Qty"
+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
+msgid "Stock Output Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr "April"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:729
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_return_picking.py:79
+#: code:addons/stock/wizard/stock_return_picking.py:97
+#: code:addons/stock/wizard/stock_return_picking.py:204
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 0733209c1fd..072c6d34cab 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-03 09:07+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:47+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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2254,9 +2254,9 @@ msgid "Future Qty"
 msgstr "Zukünftige Menge"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Bestandsveränderungskonto"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2312,7 +2312,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Lagerort, wo das System die Fertigprodukte lagert."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -3091,7 +3091,7 @@ msgstr "Produkte nach Kategorien"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Produkte Kategorien"
 
 #. module: stock
@@ -4217,9 +4217,10 @@ msgstr "Teillieferung"
 msgid "Optional localization details, for information purpose only"
 msgstr "Optionale Lagerort Details, nur als Information"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Virtuelles Lager"
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
 
 #~ msgid "LIFO"
 #~ msgstr "LiFo"
@@ -4257,17 +4258,9 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "Products Received"
 #~ msgstr "Bestandsbuchung"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Virtuelle Produktion"
-
 #~ msgid "Incoming Products"
 #~ msgstr "Wareneingang"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Virtueller Lieferschein"
-
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Erzwinge Verwendung der Fertigungsserie beim Warenzugang"
 
@@ -4402,9 +4395,6 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Kalender für Auslieferungen"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Verfolge Warenzugänge"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4447,10 +4437,6 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "STOCK_PASTE"
 #~ msgstr "STOCK_PASTE"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Virtuelle Auslieferungen"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Seriennummer"
 
@@ -4562,9 +4548,6 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
-#~ msgid "Qty"
-#~ msgstr "Anz."
-
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Entwurf Bestandsaufnahme"
 
@@ -4598,10 +4581,6 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Virtuelle Anz."
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Lieferanten Gutschrift"
 
@@ -4911,9 +4890,6 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Abgebrochen"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4956,10 +4932,6 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "Split in Two"
 #~ msgstr "Aufteilen"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Virtuelle P&L"
-
 #~ 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 "
@@ -5052,9 +5024,6 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "Units"
 #~ msgstr "Einheiten"
 
-#~ msgid "weight"
-#~ msgstr "Gewichtung"
-
 #~ msgid "Total :"
 #~ msgstr "Summe :"
 
@@ -5065,42 +5034,9 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ "Geplantes Datum der Buchung oder tatsächliches Datum, wenn die Buchung "
 #~ "erfolgt ist."
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "OpenERP Lager Management  verwaltet  multiple-Warenläger, mehrfache und "
-#~ "strukturiert Lagerorte\n"
-#~ "Dank der doppelten Buchhaltung auch in der Lagerbuchhaltung ist die "
-#~ "Inventurkontrolle mächtig und flexibel.\n"
-#~ "* Lagerbuchungen - Journal und Planung\n"
-#~ "* Verschiedene Abfassungsmothoden (FIFO, LIFO)\n"
-#~ "* Lagerbewertung (Standard- und Durchschnittspreis)\n"
-#~ "* Behnadlung von Inventurdifferenzen\n"
-#~ "* Regeln für automatische Nachbestellung (Lagerort, JIT)\n"
-#~ "* Bar Code unterstützung\n"
-#~ "* Rasche Fehlererkennung duchr doppelte Buchhaltung\n"
-#~ "* Nachvollziehbarkeit (upstream/downstream, Produktionslose, Seriennummer, "
-#~ "...)\n"
-#~ "    "
-
 #~ msgid "Track Production Lots"
 #~ msgstr "Verfolge Produktion (Lose)"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Verfolge Warenversand (Lose)"
-
 #~ msgid "Stock by Lots"
 #~ msgstr "Bestand je Fertigungslos"
 
@@ -5108,327 +5044,24 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ "Tracking lot is the code that will be put on the logistical unit/pallet"
 #~ msgstr "Diese Losnummer wird für die logistische Einheit/Pallette vergeben"
 
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr ""
-#~ "Sie befinden sich bewegenden %.2f Produkte, sondern nur %.2f in dieser "
-#~ "Partie."
-
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start module: stock"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regeln werden für osv.memory Objekte nicht unterstützt!"
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Produkt "
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Fehler! Sie können keine rekursiven Betriebe erzeugen."
-
-#~ msgid "Extended options..."
-#~ msgstr "Erweiterte Optionen.."
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "Nach Erstellung hat die Lagerbuchung den Status \"Entwurf\".\n"
-#~ " Danach kommt \"Bestätigt\".\n"
-#~ " Wenn genung Lagerbestand vorhanden ist, kommt \"Verfügbar\"\n"
-#~ " Wenn der Lieferschein erledigt ist, kommt \"Erledigt.                       "
-#~ "           \n"
-#~ "Wenn der Status \"Schwebend\" ist, warted die Buchung auf eine andere."
-
-#, python-format
-#~ msgid "No invoice were created"
-#~ msgstr "Es wurden keine Rechnungen erzeugt"
-
-#, python-format
-#~ msgid ""
-#~ "Variation Account is not specified for Product Category: %s' % "
-#~ "(product_obj.categ_id.name)))\n"
-#~ "        move_ids = []\n"
-#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-#~ msgstr ""
-#~ "Bestandveränderungskonto fehlt für Produktkategorie: %s' % "
-#~ "(product_obj.categ_id.name)))\n"
-#~ "        move_ids = []\n"
-#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-
-#, python-format
-#~ msgid ""
-#~ "There is no stock input account defined ' \\n                                "
-#~ "            'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Kein Wareneingangskonto ' \\n                                            "
-#~ "'für Produkt: \"%s\" (id: %d)"
-
-#~ msgid "Inventory (with child locations)"
-#~ msgstr "Inventur (mit untergeordneten Lagerorten)"
-
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
-
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#, python-format
-#~ msgid "Currency in which Unit Cost is expressed"
-#~ msgstr "Währung für die Preisangabe"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-#~ msgstr ""
-#~ "Eindeutige Seriennummer, wird wiefolgt angezeigt: PREFIX/SERIAL [INT_REF]"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "Serial Number"
-#~ msgstr "Seriennummer"
-
-#, python-format
-#~ msgid "New picking invoices"
-#~ msgstr "Neue Lieferscheinbuchungen"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
+#~ msgid "Stock Variation Account"
+#~ msgstr "Bestandsveränderungskonto"
 
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "is geplant"
 
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
-
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Warenversand"
-
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Journaldefinition fehlt '\\n                                'für die "
-#~ "Produktkategorie: \"%s\" (id: %d)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#, python-format
-#~ msgid ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-#~ msgstr ""
-#~ "Kann keine zugehörigen Daten auffinden für Lagerbuchung :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Verzug bei Warenversand"
-
 #, python-format
 #~ msgid "is consumed with"
 #~ msgstr "wird verbraucht durch"
 
-#, python-format
-#~ msgid ""
-#~ "Total quantity after split exceeds the quantity to split ' \\n               "
-#~ "                     'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Dee Summe der geteilten Mengen ist größer als die zutelende Menge' \\n       "
-#~ "                             'für Produkt: \"%s\" (id: %d)"
-
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Fehler bei  Zuweisung eines Los !"
-
-#, python-format
-#~ msgid ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "                move_product_qty[move.id] = product_qty\n"
-#~ "                product_uom = partial_data.get('product_uom',False)\n"
-#~ "                product_price = partial_data.get('product_price',0.0)\n"
-#~ "                product_currency = "
-#~ "partial_data.get('product_currency',False)\n"
-#~ "                prodlot_id = partial_data.get('prodlot_id"
-#~ msgstr ""
-#~ "Konnte keine Daten zu diesem Lieferschein auffinden :%s' %(move.id))\n"
-#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "                move_product_qty[move.id] = product_qty\n"
-#~ "                product_uom = partial_data.get('product_uom',False)\n"
-#~ "                product_price = partial_data.get('product_price',0.0)\n"
-#~ "                product_currency = "
-#~ "partial_data.get('product_currency',False)\n"
-#~ "                prodlot_id = partial_data.get('prodlot_id"
-
-#, python-format
-#~ msgid ""
-#~ "There is no stock output account defined ' \\n                               "
-#~ "             'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Es ist kein Konto für das Ausgangslager definiert ' \\n                      "
-#~ "                      'für dieses Produkt: \"%s\" (id: %d)"
-
-#~ msgid "Not from Picking"
-#~ msgstr "Nicht vom Lieferschein"
-
-#, python-format
-#~ msgid ""
-#~ "The current move line is already assigned to a pack, please remove it first "
-#~ "if you really want to change it ' \\n            #                        "
-#~ "'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Der aktuelle Lieferschein wurde bereits einem Packmittel zugewiesen, bitte "
-#~ "entfernen Sie  zuerst den Eintrag per Hand, ehe Sie dann eine Änderung "
-#~ "vornehmen können bei  ' \\n            #                        'diesem "
-#~ "Produkt: \"%s\" (id: %d)"
-
-#, python-format
-#~ msgid "Not Available. Moves are not confirmed."
-#~ msgstr "Nicht verfügbar. Buchungen sind nicht bestätigt"
-
 #~ msgid "Packing List:"
 #~ msgstr "Lieferauftrag:"
 
@@ -5436,135 +5069,8 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "quantity."
 #~ msgstr "Anzahl"
 
-#~ msgid ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-#~ msgstr ""
-#~ "Die periodische Inventur wird genutzt, um die tatsächlich verfügbare Anzahl "
-#~ "Ihrer Produkte pro Lagerort zu erfassen. Sie können hierdurch die einmalige "
-#~ "Jahresinventur durchführen, oder auch jederzeit aktuelle Bestände erfassen "
-#~ "und damit den Buchbestand korrigieren."
-
-#~ msgid ""
-#~ "Define your locations in order to reflect to your warehouse structure and "
-#~ "organization. OpenERP is able to manage physical locations (warehouses, "
-#~ "shelves, bin, etc), partners location (customers, suppliers) and virtual "
-#~ "locations which are the counter-part of the stock operations like the "
-#~ "manufacturing orders consummations, the inventories, etc. Every stock "
-#~ "operation in OpenERP moves the products from one location to another one. "
-#~ "For instance, if you receive products from a supplier, OpenERP will move "
-#~ "products from the Supplier location into the Stock location. Each report can "
-#~ "be performed on physicals, partners or virtual locations."
-#~ msgstr ""
-#~ "Definieren Sie Ihre Lagerorte zur individuellen Abbildung Ihrer "
-#~ "Lagerorganisation. OpenERP ist in der Lage reale Lagerorte (Zentrallager, "
-#~ "Regale, etc.), Lagerorte bei Partnern (Kunden, Lieferanten) und virtuelle "
-#~ "Lagerorte, wie zum Beispiel das Materiallager der Produktion, abzubilden. "
-#~ "Jede Lieferung in OpenERP erzeugt eine Lagerbuchung für ein Produkt von "
-#~ "einem Ort zu einem Anderen. Für das Beispiel einer Produktlieferung von "
-#~ "einem Lieferanten, erzeugt OpenERP eine Lagerbuchung vom Lieferantenlagerort "
-#~ "zum Hauptlager. Jede Bestandsauswertung kann sowohl für reale als auch für "
-#~ "virtuelle Lagerorte erstellt werden."
-
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr ""
-#~ "Dies ist eine Liste aller zu bearbeitenden Lieferaufträge in Abhängigkeit "
-#~ "der jeweiligen Verkaufsaufträge sowie der Einstellungen mit Auswirkungen auf "
-#~ "den Warenfluss."
-
-#~ msgid ""
-#~ "The Internal Moves lists all inventory operations you have to perform in "
-#~ "your warehouse. All operations can be categorized into stock journals, so "
-#~ "that each worker has it's own list of operations to perform in his own "
-#~ "journal. Most operations are prepared automatically by OpenERP according to "
-#~ "your pre-configured logistics rules but you can also record manual stock "
-#~ "operations."
-#~ msgstr ""
-#~ "Die Internen Lieferungen zeigen alle Bestandsbuchungen, die in Ihrem "
-#~ "Zentrallager stattfinden oder stattgefunden haben. Alle Liefervorgänge "
-#~ "können bei Bedarf in Lagerjournalen kategorisiert werden, so das jeder "
-#~ "Lagerarbeiter sein eigenes Journal mit seiner eigenen Liste von "
-#~ "durchzuführenden bzw. bereits erledigten Lieferungen, vorfinden kann. Die "
-#~ "meisten Lieferungen werden von OpenERP automatisch nach den von Ihnen "
-#~ "definierten Regeln für den Warenfluss ausgeführt, alternativ können Sie aber "
-#~ "auch manuelle Lieferungen erfassen."
-
-#~ msgid ""
-#~ "This menu gives you the full traceability of inventory operations made on a "
-#~ "specific product. You can filter on the product to see all the past or "
-#~ "future movements made on the product."
-#~ msgstr ""
-#~ "Dieses Menü gibt Ihnen die Möglichkeit alle Lieferungen und "
-#~ "Bestandsbuchungen eines bestimmten Produktes nachzuvollziehen. Sie können "
-#~ "hierbei Filter verwenden, um entweder alle bereits erfolgten oder alle "
-#~ "zukünftigen Lieferungen anzuzeigen."
-
-#~ msgid ""
-#~ "This is the structure of your company's warehouses and locations. You can "
-#~ "click on a location in order to get the list of the products and their stock "
-#~ "level in this particular location and all its children."
-#~ msgstr ""
-#~ "Sie sehen hier die Struktur Ihrer Zentralläger mit den dortigen Lagerorten. "
-#~ "Sie können auf einen Lagerort klicken, um eine Liste der dort gelagerten "
-#~ "Produkte sowie deren Lagerbestand auf diesem Lagerort mitsamt "
-#~ "untergeordneter Lagerorte zu betrachten."
-
-#~ msgid ""
-#~ "This is the list of all the production lots (serial numbers) you recorded. "
-#~ "After having selected a lot, you can get the up-stream or down-stream "
-#~ "traceability of the products contained in lot."
-#~ msgstr ""
-#~ "Diese Liste zeigt Ihnen alle Fertigungslose. Wenn Sie ein Los ausgewählt "
-#~ "haben, können Sie dann die zugehörigen Lieferungen sowohl upstream als auch "
-#~ "downstream zurück- bzw. nachverfolgen."
-
-#~ msgid ""
-#~ "This is the list of all your packs. After having selected a Pack, you can "
-#~ "get the up-stream or down-stream traceability of the products contained in "
-#~ "the pack."
-#~ msgstr ""
-#~ "Sie sehen hier eine Liste aller Pakete. Wählen Sie eins aus, um die "
-#~ "Produktlieferungen dieses Pakets zurück- bzw. nachzuverfolgen "
-#~ "(zurückverfolgen = Upstream, nachverfolgen = Downstream)."
-
-#~ msgid ""
-#~ "You will find here the list of all products you are waiting for, according "
-#~ "to your preceding purchase orders. Once you receive an order, you can filter "
-#~ "based on the name of the supplier or the purchase order reference. Then you "
-#~ "can confirm all products received using the buttons on the right of each "
-#~ "line."
-#~ msgstr ""
-#~ "Hier finden Sie eine Liste aller Produkte, auf deren Anlieferung Sie laut "
-#~ "Ihrer Bestellungen noch warten. Wenn Sie eine Lieferung erhalten, können Sie "
-#~ "hier nach Lieferanten oder Bestellnummmer filtern. Anschließend können Sie "
-#~ "den Erhalt der eingetroffenen Produkte einfach bestätigen, in dem Sie "
-#~ "innerhalb der Positionszeile die Buttons auf der rechten Seite nutzen."
-
-#~ msgid ""
-#~ "The 'Deliver Products' menu lists all products you have to deliver to your "
-#~ "customers. You can process the deliveries directly from this list, line by "
-#~ "or line or through the Delivery Orders menu."
-#~ msgstr ""
-#~ "Das Menü 'Produktabgänge' zeigt alle an Kunden auszuliefernden "
-#~ "Produktpositionen. Sie können die Auslieferung entweder direkt über diese "
-#~ "Liste positionsweise ausführen oder über das Menü Warenversand gesamte "
-#~ "Lieferaufträge bearbeiten."
-
-#~ msgid ""
-#~ "The stock journals system allows you assign each stock operation into a "
-#~ "specific journal according to the type of operation to perform or the "
-#~ "worker/team that should perform the operation. Examples of stock journals "
-#~ "may be: quality control, pick lists, packing, etc."
-#~ msgstr ""
-#~ "Die Systematik der Lagerjournale ermöglicht eine Zuweisung von "
-#~ "Lieferaufträgen zu bestimmten Lagerjournalen in Abhängigkeit des\r\n"
-#~ "jeweiligen Vorgangs, der im Lager durchzuführen ist. Als Beispiele können "
-#~ "genannt werden: Wareneingangskontrolle, Kommissionierung, Verpackung, "
-#~ "Versand etc."
+#~ msgid "Products Categories"
+#~ msgstr "Produkte Kategorien"
 
 #, python-format
 #~ msgid "INV: "
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index 818d3876417..2de9e65b1bc 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.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:16+0000\n"
-"PO-Revision-Date: 2011-04-01 18:43+0000\n"
+"PO-Revision-Date: 2011-11-07 12:46+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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -2105,8 +2105,8 @@ msgid "Future Qty"
 msgstr "Μελοντική Ποσ."
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2163,7 +2163,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Τοποθεσία όπου το σύστημα θα αποθηκεύσει τα ολοκληρωμένα προϊόντα."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2882,7 +2882,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Κατηγορίες Προϊόντων"
 
 #. module: stock
@@ -3928,26 +3928,23 @@ msgstr "Μερική Κίνηση"
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Stock Management"
 #~ msgstr "Διαχείριση Αποθεμάτων"
 
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Μελλοντικό Απόθεμα"
-
 #~ msgid "Amount"
 #~ msgstr "Ποσό"
 
 #~ msgid "Return packing"
 #~ msgstr "Επιστροφή Συσκευασίας"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Μελλοντικές Παραλαβές"
-
 #~ msgid "Incoming Products"
 #~ msgstr "Εισερχόμενα Προϊόντα"
 
@@ -4011,10 +4008,6 @@ msgstr ""
 #~ msgid "Products Received"
 #~ msgstr "Παραληφθέντα Προϊόντα"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Μελλοντική Παραγωγή"
-
 #~ msgid "STOCK_NEW"
 #~ msgstr "STOCK_NEW"
 
@@ -4125,9 +4118,6 @@ msgstr ""
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Ημερολόγιο Παραλαβών"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Ανίχενυση Εισερχομένων Παρτίδων"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4173,10 +4163,6 @@ msgstr ""
 #~ "Παρτίδα Αναφοράς είναι ο κωδικός που τοποθετείται στην τροφοδοτική μονάδα / "
 #~ "παλλέτα"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Μελλοντικές Παραλαβές"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Αριθμός Αναφοράς"
 
@@ -4266,9 +4252,6 @@ msgstr ""
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
-#~ msgid "Qty"
-#~ msgstr "Ποσ."
-
 #~ msgid "STOCK_MISSING_IMAGE"
 #~ msgstr "STOCK_MISSING_IMAGE"
 
@@ -4290,10 +4273,6 @@ msgstr ""
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Μελλοντική Ποσ."
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Επιστροφή σε Προμηθευτή"
 
@@ -4493,9 +4472,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Ανίχνευση Εξερχομένων ΠΑρτίδων"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4566,9 +4542,6 @@ msgstr ""
 #~ msgid "Stock by Lots"
 #~ msgstr "Απόθεμα ανά Παρτίδα"
 
-#~ msgid "Canceled"
-#~ msgstr "Ακυρώθηκε"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4602,10 +4575,6 @@ msgstr ""
 #~ msgid "Split in Two"
 #~ msgstr "Δαιχωρισμός σε δύο"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Μελλοντικό  P&L"
-
 #~ 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 "
@@ -4770,41 +4739,9 @@ msgstr ""
 #~ msgid "Delivery"
 #~ msgstr "Παράδοση"
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "Το πρόσθετο Διαχείρισης Αποθεμάτων της OpenERP μπορεί να διαχειριστεί "
-#~ "πολλαπλές αποθήκες, πολλές και δομημένες τοποθεσίες αποθεμάτων.\n"
-#~ "Χάρις στο διπλογραφικό σύστημα, η διαχείριση είναι ισχυρή και ευέλικτη:\n"
-#~ "* Ιστορικό και προγραμματισμό κινήσεων.\n"
-#~ "* Διάφορες μεθόδους απογραφής (FIFO, LIFO, ...)\n"
-#~ "* Αποτίμηση (στάνταρ ή μέση τιμή, ...)\n"
-#~ "* Ευρωστία στις διαφορές αποθεμάτων\n"
-#~ "* Αυτόματοι κανόνες προμηθειών ( ύψος αποθεμάτων, JIT, ...)\n"
-#~ "* Υποστήριξη bar code\n"
-#~ "* Γρήγορη ανίχνευση λαθών μέσω του διπλογραφικού συτήματος\n"
-#~ "* Παρακολούθηση κινήσεων (εισαγωγών/εξαγωγών, παρτίδες παραγωγής, σειριακός "
-#~ "αριθμός, ...)\n"
-#~ "    "
-
 #~ msgid "Units"
 #~ msgstr "Μονάδες"
 
-#~ msgid "weight"
-#~ msgstr "βάρος"
-
 #~ msgid "Total :"
 #~ msgstr "Σύνολο:"
 
@@ -4822,6 +4759,9 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Προϊόν "
 
+#~ msgid "Products Categories"
+#~ msgstr "Κατηγορίες Προϊόντων"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "είναι προγραμματιζμένο"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 9e4c2349717..3b030cfef80 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 09:19+0000\n"
+"PO-Revision-Date: 2011-11-07 12:46+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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #~ msgid "Stock Management"
 #~ msgstr "Gestión de inventario"
@@ -2277,9 +2277,9 @@ msgid "Future Qty"
 msgstr "Ctdad futura"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta variación stock"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2335,7 +2335,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubicación donde el sistema almacenará los productos finalizados."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -3104,7 +3104,7 @@ msgstr "Productos por categoría"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorías de productos"
 
 #. module: stock
@@ -4218,6 +4218,11 @@ msgstr "Movimiento parcial"
 msgid "Optional localization details, for information purpose only"
 msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Sub Products"
 #~ msgstr "Sub productos"
 
@@ -4239,10 +4244,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_PREFERENCES"
 #~ msgstr "STOCK_PREFERENCES"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Existencias futuras"
-
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4273,14 +4274,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Products Received"
 #~ msgstr "Productos recibidos"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Producciones futuras"
-
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Recepciones futuras"
-
 #~ msgid "Move History"
 #~ msgstr "Histórico movimientos"
 
@@ -4384,9 +4377,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Calendario de entregas"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Lotes seguimiento de entrada"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4432,10 +4422,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ "Lote de seguimiento es el código que se colocará en la unidad/palet "
 #~ "logístico."
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Envíos futuros"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Número seguimiento"
 
@@ -4573,10 +4559,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Ctdad futura"
-
 #~ msgid "STOCK_CDROM"
 #~ msgstr "STOCK_CDROM"
 
@@ -4776,9 +4758,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Lotes seguimiento de salida"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4839,9 +4818,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4884,10 +4860,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Split in Two"
 #~ msgstr "Partir en dos"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "P&L futuro"
-
 #~ 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 "
@@ -5024,39 +4996,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Total :"
 #~ msgstr "Total:"
 
-#~ msgid "weight"
-#~ msgstr "Peso"
-
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "El modulo de OpenERP que gestiona el inventario puede administrar más "
-#~ "almacenes y estructuras de almacenamiento múltiples y complejas.\n"
-#~ "Gracias a la gestión de doble acceso, el control sobre el inventario es "
-#~ "potente y flexible:\n"
-#~ "* Historial y planificación de los movimientos\n"
-#~ "* Diversos métodos de hacer inventario (FIFO, LIFO,...)\n"
-#~ "* Estima del almacenamiento ( precio estándar o medio, ...)\n"
-#~ "* Robustez frente a divergencias del inventario\n"
-#~ "* Normas de reordenación  automática (niveles del almacen, JIT, ...)\n"
-#~ "* Soporte de códigos de barras\n"
-#~ "* Revelación rápida de los errores gracias al sistema de acceso doble\n"
-#~ "* Localización (upstream/downstream, lotes de producción, números de serie, "
-#~ "...)\n"
-#~ "    "
-
 #~ msgid ""
 #~ "Scheduled date for the movement of the products or real date if the move is "
 #~ "done."
@@ -5076,9 +5015,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Move Lines"
 #~ msgstr "Líneas movimiento"
 
-#~ msgid "Qty"
-#~ msgstr "Cant."
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Factura rectificativa (abono) de proveedor"
 
@@ -5112,432 +5048,28 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ "...)\n"
 #~ "    "
 
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No se ha definido un diario '\\n                                'en la "
-#~ "categoría de producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Retraso albaranes de salida"
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "Cuando se crea el movimiento de stock está en el estado 'Borrador'.\n"
-#~ " Después se cambia a estado 'Confirmado'.\n"
-#~ " Si el stock está disponible, el estado se cambia a 'Disponible'.\n"
-#~ " Cuando el albarán se ha enviado el estado es 'Realizado'.\n"
-#~ "El estado es 'En espera' si el movimiento está a la espera de otro."
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
 #, python-format
 #~ msgid "is consumed with"
 #~ msgstr "es consumido con"
 
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#, python-format
-#~ msgid ""
-#~ "Total quantity after split exceeds the quantity to split ' \\n               "
-#~ "                     'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Cantidad total después de dividir exceda la cantidad a dividir ' \\n         "
-#~ "                           'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "¡Asignación de lote errónea!"
-
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
-#, python-format
-#~ msgid "No invoice were created"
-#~ msgstr "No se han creado facturas"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
-#, python-format
-#~ msgid ""
-#~ "There is no stock output account defined ' \\n                               "
-#~ "             'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de salida de stock ' \\n                        "
-#~ "                    'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
-#, python-format
-#~ msgid ""
-#~ "There is no stock input account defined ' \\n                                "
-#~ "            'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de entrada de stock '\\n                        "
-#~ "        'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start"
-
-#~ msgid "Inventory (with child locations)"
-#~ msgstr "Inventario (con ubicaciones hijas)"
-
-#~ msgid "Not from Picking"
-#~ msgstr "No desde albarán"
-
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
+#~ msgid "Stock Variation Account"
+#~ msgstr "Cuenta variación stock"
 
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Producto "
 
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
-#, python-format
-#~ msgid "Currency in which Unit Cost is expressed"
-#~ msgstr "Moneda en que se expresa el coste unidad"
-
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-#~ msgstr "Número de serie único, será mostrado como: PREFIJO/SERIE [REF_INT]"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#, python-format
-#~ msgid ""
-#~ "The current move line is already assigned to a pack, please remove it first "
-#~ "if you really want to change it ' \\n            #                        "
-#~ "'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "La línea de movimiento actual ya está asignada a un paquete, elimínelo "
-#~ "primero si realmente quiere cambiarla ' \\n            #                     "
-#~ "   'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "Serial Number"
-#~ msgstr "Número de serie"
-
-#, python-format
-#~ msgid "New picking invoices"
-#~ msgstr "Nuevas facturas de albarán"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr ""
-#~ "Está moviendo %.2f productos pero sólo hay %.2f disponibles en este lote."
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "¡Error! No puede crear compañías recursivas."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
-
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "está planificado"
 
-#, python-format
-#~ msgid "Not Available. Moves are not confirmed."
-#~ msgstr "No disponible. Movimientos no están confirmados."
-
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
-
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
-#~ msgid "Extended options..."
-#~ msgstr "Opciones extendidas..."
-
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "cantidad."
 
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Envíos de salida"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "stock.move.memory"
-#~ msgstr "stock.movimiento.memoria"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#, python-format
-#~ msgid "Invoices"
-#~ msgstr "Facturas"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Only one value can be defined for each given usage!"
-#~ msgstr "¡Sólo se puede definir un valor para cada uso dado!"
-
-#~ msgid "The name of the journal must be unique per company !"
-#~ msgstr "¡El nombre del diario debe ser único por compañía!"
-
-#~ msgid "The code of the journal must be unique per company !"
-#~ msgstr "¡El código del diario debe ser único por compañía!"
-
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr ""
-#~ "Esta es la lista de todas las órdenes de entrega que deben ser preparadas, "
-#~ "de acuerdo con sus distintos pedidos de ventas y sus reglas logísticas."
-
-#~ msgid ""
-#~ "This is the structure of your company's warehouses and locations. You can "
-#~ "click on a location in order 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 "
-#~ "hacer clic en una ubicación para obtener la lista de productos y su nivel de "
-#~ "stock para esta ubicación en particular y todos sus hijos."
-
-#~ msgid ""
-#~ "This is the list of all your packs. After having selected a Pack, you can "
-#~ "get the up-stream or down-stream traceability of the products contained in "
-#~ "the pack."
-#~ msgstr ""
-#~ "Esta es la lista de todos sus paquetes. Después de haber seleccionado un "
-#~ "paquete, puede obtener la trazabilidad para arriba y para abajo de los "
-#~ "productos contenidos en el paquete."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-#~ msgstr ""
-#~ "Los inventarios periódicos son utilizados para contar el número de productos "
-#~ "disponibles en cada ubicación. Lo puede utilizar, una vez por año, para "
-#~ "relaizar el inventario general, o, cuando sea necesario, para corregir el "
-#~ "nivel de stock actual de un producto."
-
-#~ msgid ""
-#~ "The 'Deliver Products' menu lists all products you have to deliver to your "
-#~ "customers. You can process the deliveries directly from this list, line by "
-#~ "or line or through the Delivery Orders menu."
-#~ msgstr ""
-#~ "El menú \"Enviar productos\" muestra todos los productos que tiene que "
-#~ "enviar a sus clientes. Puede porcesar los envíos directamente desde esta "
-#~ "lista, línea por línea, o a través del menú órdenes de envío."
-
-#~ msgid ""
-#~ "Define your locations in order to reflect to your warehouse structure and "
-#~ "organization. OpenERP is able to manage physical locations (warehouses, "
-#~ "shelves, bin, etc), partners location (customers, suppliers) and virtual "
-#~ "locations which are the counter-part of the stock operations like the "
-#~ "manufacturing orders consummations, the inventories, etc. Every stock "
-#~ "operation in OpenERP moves the products from one location to another one. "
-#~ "For instance, if you receive products from a supplier, OpenERP will move "
-#~ "products from the Supplier location into the Stock location. Each report can "
-#~ "be performed on physicals, partners or virtual locations."
-#~ msgstr ""
-#~ "Defina sus ubicaciones para reflejar la organización y la estructura de su "
-#~ "almacén. OpenERP puede gestionar ubicaciones físicas (almacenes, "
-#~ "estanterías, ubicaciones, etc.), ubicaciones de empresas externas (clientes, "
-#~ "proveedores) y ubicaciones virtuales que son la contra-partida de "
-#~ "operaciones como el consumo de órdenes de producción, inventarios, etc. Cada "
-#~ "movimiento de stock en OpenERP mueve un producto de una ubicación a otra. "
-#~ "Por ejemplo, si recibe productos de un proveedor, OpenERP moverá los "
-#~ "productos de la ubicación Proveedor a la ubicación Stock. Cada informe "
-#~ "informe puede realizarse sobre ubicaciones físicas, externas o virtuales."
-
-#~ msgid ""
-#~ "This menu gives you the full traceability of inventory operations made on a "
-#~ "specific product. You can filter on the product to see all the past or "
-#~ "future movements made on the product."
-#~ msgstr ""
-#~ "Este menú le indica la trazabilidad completa de operaciones de inventario "
-#~ "realizadas sobre un producto. Puede filtrar sobre un producto para ver todos "
-#~ "los movimientos, futuros y pasados, realizados sobre el producto."
-
-#~ msgid ""
-#~ "The stock journals system allows you assign each stock operation into a "
-#~ "specific journal according to the type of operation to perform or the "
-#~ "worker/team that should perform the operation. Examples of stock journals "
-#~ "may be: quality control, pick lists, packing, etc."
-#~ msgstr ""
-#~ "El sistema de diarios de stock permite asignar cada operación de stock a un "
-#~ "diario específico dependiendo del tipo de operación a realizar o el empleado "
-#~ "/ equipo que debe de realizar la operación. Algunos ejemplos de diarios de "
-#~ "stock: control calidad, lista de preparación, embalaje, etc"
-
-#~ msgid ""
-#~ "This is the list of all the production lots (serial numbers) you recorded. "
-#~ "After having selected a lot, you can get the up-stream or down-stream "
-#~ "traceability of the products contained in lot."
-#~ msgstr ""
-#~ "Esta es la lista de todos los lotes de producción (números de serie) que ha "
-#~ "creado. Después de seleccionar un lote, puede obtener la trazabilidad "
-#~ "(ascendente o descendente) de los productos de dicho lote."
-
-#~ msgid ""
-#~ "You will find here the list of all products you are waiting for, according "
-#~ "to your preceding purchase orders. Once you receive an order, you can filter "
-#~ "based on the name of the supplier or the purchase order reference. Then you "
-#~ "can confirm all products received using the buttons on the right of each "
-#~ "line."
-#~ msgstr ""
-#~ "Encontrará aquí la lista de todos los productos que está esperando, en "
-#~ "función de las órdenes de compra realizadas anteriormente. Cuando reciba un "
-#~ "pedido, puede filtrar por el nombre del proveedor o por la referencia del "
-#~ "pedido. Entonces puede confirmar los productos recibidos gracias a los "
-#~ "botones situados a la derecha de cada línea."
-
-#~ msgid ""
-#~ "The Internal Moves lists all inventory operations you have to perform in "
-#~ "your warehouse. All operations can be categorized into stock journals, so "
-#~ "that each worker has it's own list of operations to perform in his own "
-#~ "journal. Most operations are prepared automatically by OpenERP according to "
-#~ "your pre-configured logistics rules but you can also record manual stock "
-#~ "operations."
-#~ msgstr ""
-#~ "Los movimientos internos muestran todas las operaciones de inventario que "
-#~ "debe realizar en su almacén. Todas las operaciones pueden ser categorizadas "
-#~ "en diarios de inventario, para que cada empleado tenga su propia lista de "
-#~ "operaciones a realizar en su propio diario. La mayoría de operaciones son "
-#~ "preparadas automáticamente por OpenERP en función de las reglas logísticas "
-#~ "preconfiguradas, pero puede igualmente crear operaciones de stock "
-#~ "manualmente."
-
-#~ 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."
-
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
+
+#~ msgid "Products Categories"
+#~ msgstr "Categorías de productos"
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index a586f5c8423..abe5da9e081 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2091,8 +2091,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2865,7 +2865,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3911,20 +3911,17 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Fill Inventory for specific location"
 #~ msgstr "Rellenar inventario para una determinada ubicación"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Producciones futuras"
-
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Forzar a usar un lote de producción durante la recepción"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Recepciones futuras"
-
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4040,10 +4037,6 @@ msgstr ""
 #~ msgid "Unreceived Products"
 #~ msgstr "Productos no recibidos"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Stock futuro"
-
 #~ msgid "Products Received"
 #~ msgstr "Productos recibidos"
 
@@ -4111,9 +4104,6 @@ msgstr ""
 #~ msgid "STOCK_ZOOM_FIT"
 #~ msgstr "STOCK_ZOOM_FIT"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Lotes seguimiento de entrada"
-
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Calendario de entregas"
 
@@ -4165,10 +4155,6 @@ msgstr ""
 #~ "Lote de seguimiento es el código que se colocará en la unidad/palet "
 #~ "logístico."
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Envíos futuros"
-
 #~ msgid "Packing List:"
 #~ msgstr "Remito"
 
@@ -4268,9 +4254,6 @@ msgstr ""
 #~ msgid "Periodical Inventory"
 #~ msgstr "Inventario periódico"
 
-#~ msgid "Qty"
-#~ msgstr "Ctdad"
-
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Inventarios periódicos borrador"
 
@@ -4304,10 +4287,6 @@ msgstr ""
 #~ msgid "Input Packing List"
 #~ msgstr "Remitos de entrada"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Ctdad futura"
-
 #, python-format
 #~ msgid "Invoice is already created."
 #~ msgstr "La factura no ha sido creada aún"
@@ -4547,9 +4526,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Lotes seguimiento de salida"
-
 #~ msgid "STOCK_FIND"
 #~ msgstr "STOCK_FIND"
 
@@ -4614,9 +4590,6 @@ msgstr ""
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
 #~ 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 "
@@ -4647,10 +4620,6 @@ msgstr ""
 #~ msgid "Localisation"
 #~ msgstr "Ubicaciones geográficas"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "P&L futuro"
-
 #~ msgid "Track Production Lots"
 #~ msgstr "Lotes seguimiento de producción"
 
diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po
index 0a0a1c00687..ea086475e65 100644
--- a/addons/stock/i18n/es_CL.po
+++ b/addons/stock/i18n/es_CL.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:16+0000\n"
-"PO-Revision-Date: 2011-01-14 04:42+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2011-10-05 16:52+0000\n"
+"Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -37,7 +37,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Ubicación encadenada si fija"
+msgstr "Encadenar Ubicación si es Fija"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -70,20 +70,20 @@ msgstr "Hoy"
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr "Número revisión"
+msgstr "Número de revisión"
 
 #. module: stock
 #: view:stock.move.memory.in:0
 #: view:stock.move.memory.out:0
 msgid "Product Moves"
-msgstr "Movimientos productos"
+msgstr "Movimientos de producto"
 
 #. 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 "Análisis de movimientos"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -548,7 +548,7 @@ msgstr "Ubicación destino"
 #: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "No puede procesar un albarán sin movimientos de stock"
+msgstr "No puede procesar una guía de despacho sin movimientos de stock"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
@@ -631,6 +631,11 @@ 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 cada operación de "
+"existencias a un diario específico según el tipo de operación a realizar o "
+"el trabajador / equipo que debe realizar la operación. Algunos ejemplos de "
+"diarios de existencias pueden ser: control de calidad, listas de selección, "
+"embalaje, etc."
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -847,7 +852,7 @@ msgstr "Contiene"
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr "Retraso albaranes entrada"
+msgstr "Retraso de guías de despacho de entrada"
 
 #. module: stock
 #: view:stock.location:0
@@ -1100,7 +1105,7 @@ msgstr "Orden de entrega"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_in
 msgid "stock.move.memory.in"
-msgstr ""
+msgstr "stock.move.memory.in"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1163,9 +1168,9 @@ 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)."
+"Tipo de envío de la guía de despacho 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
@@ -1372,7 +1377,7 @@ msgstr "Dividir"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr "Buscar albarán stock"
+msgstr "Buscar guía de despacho de stock"
 
 #. module: stock
 #: code:addons/stock/product.py:93
@@ -1561,6 +1566,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 ""
+"Cuando un movimiento de almacén es creado queda en estado 'Borrador'.\n"
+" Luego, se establece en estado 'No Disponible' si el ... no ha encontrado "
+"los productos.\n"
+" Cuando los productos se han reservado es puesto en 'Disponible'.\n"
+" Cuando el retiro es realizado el estado es puesto en 'Realizado'.           "
+"   \n"
+"El estado es puesto 'En Espera' si se está esperando por otro movimiento."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -2000,6 +2012,27 @@ msgid ""
 "day)\n"
 "    "
 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 (ascendente/descendente abajo, lotes de producción, número de "
+"serie, ...)\n"
+"* Panel para almacenes que incluye:\n"
+"    * Productos a recibir con retraso (fecha <= hoy)\n"
+"    * Excepciones de compra\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
@@ -2242,9 +2275,9 @@ msgid "Future Qty"
 msgstr "Ctdad futura"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta variación stock"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2300,7 +2333,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubicación donde el sistema almacenará los productos finalizados."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -3069,8 +3102,8 @@ msgstr "Productos por categoría"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
-msgstr "Categorías de productos"
+msgid "Product Categories"
+msgstr ""
 
 #. module: stock
 #: field:stock.move.memory.in,wizard_id:0
@@ -3229,7 +3262,7 @@ msgstr "Movimientos para este lote de producción"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_out
 msgid "stock.move.memory.out"
-msgstr ""
+msgstr "stock.move.memory.out"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:115
@@ -3360,7 +3393,7 @@ msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr "Este albarán no requiere facturación."
+msgstr "Esta guía de despacho no requiere facturación."
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3383,6 +3416,16 @@ 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 \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 la Guía de Despacho "
+"(albaran) de los productos entrantes.\n"
+"* Ubicación fija: Se utiliza la ubicación encadenada del campo: Ubicación "
+"Encadenada si es Fija."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
@@ -4169,6 +4212,11 @@ msgstr "Movimiento parcial"
 msgid "Optional localization details, for information purpose only"
 msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Stock Management"
 #~ msgstr "Gestión de inventario"
 
@@ -4180,6 +4228,12 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Product "
 #~ msgstr "Producto "
 
+#~ msgid "Stock Variation Account"
+#~ msgstr "Cuenta variación stock"
+
+#~ msgid "Products Categories"
+#~ msgstr "Categorías de productos"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
@@ -4213,10 +4267,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_PREFERENCES"
 #~ msgstr "STOCK_PREFERENCES"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Existencias futuras"
-
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4247,14 +4297,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Products Received"
 #~ msgstr "Productos recibidos"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Producciones futuras"
-
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Recepciones futuras"
-
 #~ msgid "Move History"
 #~ msgstr "Histórico movimientos"
 
@@ -4358,9 +4400,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Calendario de entregas"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Lotes seguimiento de entrada"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4406,10 +4445,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ "Lote de seguimiento es el código que se colocará en la unidad/palet "
 #~ "logístico."
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Envíos futuros"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Número seguimiento"
 
@@ -4547,10 +4582,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Ctdad futura"
-
 #~ msgid "STOCK_CDROM"
 #~ msgstr "STOCK_CDROM"
 
@@ -4750,9 +4781,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Lotes seguimiento de salida"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4813,9 +4841,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4858,10 +4883,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Split in Two"
 #~ msgstr "Partir en dos"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "P&L futuro"
-
 #~ 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 "
@@ -4998,39 +5019,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Total :"
 #~ msgstr "Total:"
 
-#~ msgid "weight"
-#~ msgstr "Peso"
-
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "El modulo de OpenERP que gestiona el inventario puede administrar más "
-#~ "almacenes y estructuras de almacenamiento múltiples y complejas.\n"
-#~ "Gracias a la gestión de doble acceso, el control sobre el inventario es "
-#~ "potente y flexible:\n"
-#~ "* Historial y planificación de los movimientos\n"
-#~ "* Diversos métodos de hacer inventario (FIFO, LIFO,...)\n"
-#~ "* Estima del almacenamiento ( precio estándar o medio, ...)\n"
-#~ "* Robustez frente a divergencias del inventario\n"
-#~ "* Normas de reordenación  automática (niveles del almacen, JIT, ...)\n"
-#~ "* Soporte de códigos de barras\n"
-#~ "* Revelación rápida de los errores gracias al sistema de acceso doble\n"
-#~ "* Localización (upstream/downstream, lotes de producción, números de serie, "
-#~ "...)\n"
-#~ "    "
-
 #~ msgid ""
 #~ "Scheduled date for the movement of the products or real date if the move is "
 #~ "done."
@@ -5050,9 +5038,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Move Lines"
 #~ msgstr "Líneas movimiento"
 
-#~ msgid "Qty"
-#~ msgstr "Cant."
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Factura rectificativa (abono) de proveedor"
 
@@ -5085,413 +5070,3 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ "* Trazabilidad (hacia arriba/abajo, lotes de producción, número de serie "
 #~ "...)\n"
 #~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No se ha definido un diario '\\n                                'en la "
-#~ "categoría de producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Retraso albaranes de salida"
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "Cuando se crea el movimiento de stock está en el estado 'Borrador'.\n"
-#~ " Después se cambia a estado 'Confirmado'.\n"
-#~ " Si el stock está disponible, el estado se cambia a 'Disponible'.\n"
-#~ " Cuando el albarán se ha enviado el estado es 'Realizado'.\n"
-#~ "El estado es 'En espera' si el movimiento está a la espera de otro."
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#, python-format
-#~ msgid ""
-#~ "Total quantity after split exceeds the quantity to split ' \\n               "
-#~ "                     'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Cantidad total después de dividir exceda la cantidad a dividir ' \\n         "
-#~ "                           'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "¡Asignación de lote errónea!"
-
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
-#, python-format
-#~ msgid "No invoice were created"
-#~ msgstr "No se han creado facturas"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
-#, python-format
-#~ msgid ""
-#~ "There is no stock output account defined ' \\n                               "
-#~ "             'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de salida de stock ' \\n                        "
-#~ "                    'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
-#, python-format
-#~ msgid ""
-#~ "There is no stock input account defined ' \\n                                "
-#~ "            'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No se ha definido una cuenta de entrada de stock '\\n                        "
-#~ "        'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start"
-
-#~ msgid "Inventory (with child locations)"
-#~ msgstr "Inventario (con ubicaciones hijas)"
-
-#~ msgid "Not from Picking"
-#~ msgstr "No desde albarán"
-
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
-
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
-#, python-format
-#~ msgid "Currency in which Unit Cost is expressed"
-#~ msgstr "Moneda en que se expresa el coste unidad"
-
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-#~ msgstr "Número de serie único, será mostrado como: PREFIJO/SERIE [REF_INT]"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#, python-format
-#~ msgid ""
-#~ "The current move line is already assigned to a pack, please remove it first "
-#~ "if you really want to change it ' \\n            #                        "
-#~ "'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "La línea de movimiento actual ya está asignada a un paquete, elimínelo "
-#~ "primero si realmente quiere cambiarla ' \\n            #                     "
-#~ "   'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "Serial Number"
-#~ msgstr "Número de serie"
-
-#, python-format
-#~ msgid "New picking invoices"
-#~ msgstr "Nuevas facturas de albarán"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr ""
-#~ "Está moviendo %.2f productos pero sólo hay %.2f disponibles en este lote."
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "¡Error! No puede crear compañías recursivas."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
-
-#, python-format
-#~ msgid "Not Available. Moves are not confirmed."
-#~ msgstr "No disponible. Movimientos no están confirmados."
-
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
-
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
-#~ msgid "Extended options..."
-#~ msgstr "Opciones extendidas..."
-
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Envíos de salida"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
-#~ msgid "stock.move.memory"
-#~ msgstr "stock.movimiento.memoria"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#, python-format
-#~ msgid "Invoices"
-#~ msgstr "Facturas"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Only one value can be defined for each given usage!"
-#~ msgstr "¡Sólo se puede definir un valor para cada uso dado!"
-
-#~ msgid "The name of the journal must be unique per company !"
-#~ msgstr "¡El nombre del diario debe ser único por compañía!"
-
-#~ msgid "The code of the journal must be unique per company !"
-#~ msgstr "¡El código del diario debe ser único por compañía!"
-
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr ""
-#~ "Esta es la lista de todas las órdenes de entrega que deben ser preparadas, "
-#~ "de acuerdo con sus distintos pedidos de ventas y sus reglas logísticas."
-
-#~ msgid ""
-#~ "This is the structure of your company's warehouses and locations. You can "
-#~ "click on a location in order 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 "
-#~ "hacer clic en una ubicación para obtener la lista de productos y su nivel de "
-#~ "stock para esta ubicación en particular y todos sus hijos."
-
-#~ msgid ""
-#~ "This is the list of all your packs. After having selected a Pack, you can "
-#~ "get the up-stream or down-stream traceability of the products contained in "
-#~ "the pack."
-#~ msgstr ""
-#~ "Esta es la lista de todos sus paquetes. Después de haber seleccionado un "
-#~ "paquete, puede obtener la trazabilidad para arriba y para abajo de los "
-#~ "productos contenidos en el paquete."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
-#~ msgid ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-#~ msgstr ""
-#~ "Los inventarios periódicos son utilizados para contar el número de productos "
-#~ "disponibles en cada ubicación. Lo puede utilizar, una vez por año, para "
-#~ "relaizar el inventario general, o, cuando sea necesario, para corregir el "
-#~ "nivel de stock actual de un producto."
-
-#~ msgid ""
-#~ "The 'Deliver Products' menu lists all products you have to deliver to your "
-#~ "customers. You can process the deliveries directly from this list, line by "
-#~ "or line or through the Delivery Orders menu."
-#~ msgstr ""
-#~ "El menú \"Enviar productos\" muestra todos los productos que tiene que "
-#~ "enviar a sus clientes. Puede porcesar los envíos directamente desde esta "
-#~ "lista, línea por línea, o a través del menú órdenes de envío."
-
-#~ msgid ""
-#~ "Define your locations in order to reflect to your warehouse structure and "
-#~ "organization. OpenERP is able to manage physical locations (warehouses, "
-#~ "shelves, bin, etc), partners location (customers, suppliers) and virtual "
-#~ "locations which are the counter-part of the stock operations like the "
-#~ "manufacturing orders consummations, the inventories, etc. Every stock "
-#~ "operation in OpenERP moves the products from one location to another one. "
-#~ "For instance, if you receive products from a supplier, OpenERP will move "
-#~ "products from the Supplier location into the Stock location. Each report can "
-#~ "be performed on physicals, partners or virtual locations."
-#~ msgstr ""
-#~ "Defina sus ubicaciones para reflejar la organización y la estructura de su "
-#~ "almacén. OpenERP puede gestionar ubicaciones físicas (almacenes, "
-#~ "estanterías, ubicaciones, etc.), ubicaciones de empresas externas (clientes, "
-#~ "proveedores) y ubicaciones virtuales que son la contra-partida de "
-#~ "operaciones como el consumo de órdenes de producción, inventarios, etc. Cada "
-#~ "movimiento de stock en OpenERP mueve un producto de una ubicación a otra. "
-#~ "Por ejemplo, si recibe productos de un proveedor, OpenERP moverá los "
-#~ "productos de la ubicación Proveedor a la ubicación Stock. Cada informe "
-#~ "informe puede realizarse sobre ubicaciones físicas, externas o virtuales."
-
-#~ msgid ""
-#~ "This menu gives you the full traceability of inventory operations made on a "
-#~ "specific product. You can filter on the product to see all the past or "
-#~ "future movements made on the product."
-#~ msgstr ""
-#~ "Este menú le indica la trazabilidad completa de operaciones de inventario "
-#~ "realizadas sobre un producto. Puede filtrar sobre un producto para ver todos "
-#~ "los movimientos, futuros y pasados, realizados sobre el producto."
-
-#~ msgid ""
-#~ "The stock journals system allows you assign each stock operation into a "
-#~ "specific journal according to the type of operation to perform or the "
-#~ "worker/team that should perform the operation. Examples of stock journals "
-#~ "may be: quality control, pick lists, packing, etc."
-#~ msgstr ""
-#~ "El sistema de diarios de stock permite asignar cada operación de stock a un "
-#~ "diario específico dependiendo del tipo de operación a realizar o el empleado "
-#~ "/ equipo que debe de realizar la operación. Algunos ejemplos de diarios de "
-#~ "stock: control calidad, lista de preparación, embalaje, etc"
-
-#~ msgid ""
-#~ "This is the list of all the production lots (serial numbers) you recorded. "
-#~ "After having selected a lot, you can get the up-stream or down-stream "
-#~ "traceability of the products contained in lot."
-#~ msgstr ""
-#~ "Esta es la lista de todos los lotes de producción (números de serie) que ha "
-#~ "creado. Después de seleccionar un lote, puede obtener la trazabilidad "
-#~ "(ascendente o descendente) de los productos de dicho lote."
-
-#~ msgid ""
-#~ "You will find here the list of all products you are waiting for, according "
-#~ "to your preceding purchase orders. Once you receive an order, you can filter "
-#~ "based on the name of the supplier or the purchase order reference. Then you "
-#~ "can confirm all products received using the buttons on the right of each "
-#~ "line."
-#~ msgstr ""
-#~ "Encontrará aquí la lista de todos los productos que está esperando, en "
-#~ "función de las órdenes de compra realizadas anteriormente. Cuando reciba un "
-#~ "pedido, puede filtrar por el nombre del proveedor o por la referencia del "
-#~ "pedido. Entonces puede confirmar los productos recibidos gracias a los "
-#~ "botones situados a la derecha de cada línea."
-
-#~ msgid ""
-#~ "The Internal Moves lists all inventory operations you have to perform in "
-#~ "your warehouse. All operations can be categorized into stock journals, so "
-#~ "that each worker has it's own list of operations to perform in his own "
-#~ "journal. Most operations are prepared automatically by OpenERP according to "
-#~ "your pre-configured logistics rules but you can also record manual stock "
-#~ "operations."
-#~ msgstr ""
-#~ "Los movimientos internos muestran todas las operaciones de inventario que "
-#~ "debe realizar en su almacén. Todas las operaciones pueden ser categorizadas "
-#~ "en diarios de inventario, para que cada empleado tenga su propia lista de "
-#~ "operaciones a realizar en su propio diario. La mayoría de operaciones son "
-#~ "preparadas automáticamente por OpenERP en función de las reglas logísticas "
-#~ "preconfiguradas, pero puede igualmente crear operaciones de stock "
-#~ "manualmente."
-
-#~ 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."
diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po
index 1d5a75c744c..89adf47cf6e 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2245,9 +2245,9 @@ msgid "Future Qty"
 msgstr "Ctdad. Futura"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta de Variación de inventario"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2303,7 +2303,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubocación donde el sistema colocará los productos finales."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -3053,7 +3053,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -4145,6 +4145,11 @@ msgstr "Movimiento Parcial"
 msgid "Optional localization details, for information purpose only"
 msgstr "Detalles opcionales de la ubicación, solo para información"
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4323,9 +4328,6 @@ msgstr "Detalles opcionales de la ubicación, solo para información"
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Calendario de entregas"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Lotes seguimiento de entrada"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4584,36 +4586,6 @@ msgstr "Detalles opcionales de la ubicación, solo para información"
 #~ msgid "Future Stock Forecast"
 #~ msgstr "Previsión de futuro stock"
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "El modulo de OpenERP que gestiona el inventario puede administrar más "
-#~ "almacenes y estructuras de almacenamiento múltiples y complejas.\n"
-#~ "Gracias a la gestión de doble acceso, el control sobre el inventario es "
-#~ "potente y flexible:\n"
-#~ "* Historial y planificación de los movimientos\n"
-#~ "* Diversos métodos de hacer inventario (FIFO, LIFO,...)\n"
-#~ "* Estima del almacenamiento ( precio estándar o medio, ...)\n"
-#~ "* Robustez frente a divergencias del inventario\n"
-#~ "* Normas de reordenación  automática (niveles del almacen, JIT, ...)\n"
-#~ "* Soporte de códigos de barras\n"
-#~ "* Revelación rápida de los errores gracias al sistema de acceso doble\n"
-#~ "* Localización (upstream/downstream, lotes de producción, números de serie, "
-#~ "...)\n"
-#~ "    "
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -4749,9 +4721,6 @@ msgstr "Detalles opcionales de la ubicación, solo para información"
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Lotes seguimiento de salida"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4823,9 +4792,6 @@ msgstr "Detalles opcionales de la ubicación, solo para información"
 #~ msgid "Stock by Lots"
 #~ msgstr "Stock por lotes"
 
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4938,476 +4904,30 @@ msgstr "Detalles opcionales de la ubicación, solo para información"
 #~ msgid "Move State"
 #~ msgstr "Estado de movimientos"
 
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No existe un diario definido '\\n                                'en la "
-#~ "categoria del producto: \"%s\" (id: %d)"
-
 #~ 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 ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-#~ msgstr ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Retraso en albaranes de salida"
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
 #, python-format
 #~ msgid "is consumed with"
 #~ msgstr "es consumido con"
 
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
-#, python-format
-#~ msgid ""
-#~ "Total quantity after split exceeds the quantity to split ' \\n               "
-#~ "                     'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Cantidad Total despues de dividir  la cantidad a dividir' \\n                "
-#~ "                    'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Mal Asignación de lote !"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
-#, python-format
-#~ msgid "No invoice were created"
-#~ msgstr "No se creo ninguna factura"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
-#, python-format
-#~ msgid ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "                move_product_qty[move.id] = product_qty\n"
-#~ "                product_uom = partial_data.get('product_uom',False)\n"
-#~ "                product_price = partial_data.get('product_price',0.0)\n"
-#~ "                product_currency = "
-#~ "partial_data.get('product_currency',False)\n"
-#~ "                prodlot_id = partial_data.get('prodlot_id"
-#~ msgstr ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "                move_product_qty[move.id] = product_qty\n"
-#~ "                product_uom = partial_data.get('product_uom',False)\n"
-#~ "                product_price = partial_data.get('product_price',0.0)\n"
-#~ "                product_currency = "
-#~ "partial_data.get('product_currency',False)\n"
-#~ "                prodlot_id = partial_data.get('prodlot_id"
+#~ msgid "Stock Variation Account"
+#~ msgstr "Cuenta de Variación de inventario"
 
 #~ msgid "Packing List:"
 #~ msgstr "Lista Albaranes:"
 
-#, python-format
-#~ msgid ""
-#~ "There is no stock output account defined ' \\n                               "
-#~ "             'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No existe cuanta de salida de inventario definida ' \\n                      "
-#~ "                      'para este producto: \"%s\" (id: %d)"
-
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-#~ msgstr ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "department"
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#, python-format
-#~ msgid ""
-#~ "Variation Account is not specified for Product Category: %s' % "
-#~ "(product_obj.categ_id.name)))\n"
-#~ "        move_ids = []\n"
-#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-#~ msgstr ""
-#~ "Variation Account is not specified for Product Category: %s' % "
-#~ "(product_obj.categ_id.name)))\n"
-#~ "        move_ids = []\n"
-#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
-#, python-format
-#~ msgid ""
-#~ "There is no stock input account defined ' \\n                                "
-#~ "            'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "No existe cuenta de entrada de inventario definida ' \\n                     "
-#~ "                       'para este producto: \"%s\" (id: %d)"
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
-#~ msgid "Inventory (with child locations)"
-#~ msgstr "Inventario (con ubicaciones hijas)"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start"
-
-#~ msgid "Not from Picking"
-#~ msgstr "No a partir de albarán"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reglas no soportadas por objetos osv_memory !"
-
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Producto "
 
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#, python-format
-#~ msgid "Currency in which Unit Cost is expressed"
-#~ msgstr "Moneda en la cual el costo unitario es expresado"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-#~ msgstr ""
-#~ "El número de serie único, debe ser mostrado como: PREFIX/SERIAL [INT_REF]"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "Serial Number"
-#~ msgstr "Número Serie"
-
-#, python-format
-#~ msgid "New picking invoices"
-#~ msgstr "Nuevo facturas de movimiento"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#, python-format
-#~ msgid ""
-#~ "The current move line is already assigned to a pack, please remove it first "
-#~ "if you really want to change it ' \\n            #                        "
-#~ "'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "The current move line is already assigned to a pack, please remove it first "
-#~ "if you really want to change it ' \\n            #                        "
-#~ "'for this product: \"%s\" (id: %d)"
-
-#~ msgid "Skoda"
-#~ msgstr "Skoda"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr ""
-#~ "Esta miviendo %.2f productos pero solo %.2f esta disponible en este lote."
-
 #~ msgid "Location Overview"
 #~ msgstr "Vista General de Ubicaciones"
 
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! Usted no puede crear menus recursivos."
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "¡Error! No se pueden crear compañías recursivas."
-
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
-
-#~ msgid "weight"
-#~ msgstr "peso"
-
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "es planificada"
 
-#, python-format
-#~ msgid "Not Available. Moves are not confirmed."
-#~ msgstr "No Disponible. Movimientos no estan confirmados."
-
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
-
-#~ msgid "Extended options..."
-#~ msgstr "Opciones Extendidas..."
-
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "cantidad."
-
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Productos Salientes"
-
-#~ msgid ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-#~ msgstr ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-
-#~ msgid ""
-#~ "Define your locations in order to reflect to your warehouse structure and "
-#~ "organization. OpenERP is able to manage physical locations (warehouses, "
-#~ "shelves, bin, etc), partners location (customers, suppliers) and virtual "
-#~ "locations which are the counter-part of the stock operations like the "
-#~ "manufacturing orders consummations, the inventories, etc. Every stock "
-#~ "operation in OpenERP moves the products from one location to another one. "
-#~ "For instance, if you receive products from a supplier, OpenERP will move "
-#~ "products from the Supplier location into the Stock location. Each report can "
-#~ "be performed on physicals, partners or virtual locations."
-#~ msgstr ""
-#~ "Define your locations in order to reflect to your warehouse structure and "
-#~ "organization. OpenERP is able to manage physical locations (warehouses, "
-#~ "shelves, bin, etc), partners location (customers, suppliers) and virtual "
-#~ "locations which are the counter-part of the stock operations like the "
-#~ "manufacturing orders consummations, the inventories, etc. Every stock "
-#~ "operation in OpenERP moves the products from one location to another one. "
-#~ "For instance, if you receive products from a supplier, OpenERP will move "
-#~ "products from the Supplier location into the Stock location. Each report can "
-#~ "be performed on physicals, partners or virtual locations."
-
-#~ msgid ""
-#~ "The 'Deliver Products' menu lists all products you have to deliver to your "
-#~ "customers. You can process the deliveries directly from this list, line by "
-#~ "or line or through the Delivery Orders menu."
-#~ msgstr ""
-#~ "The 'Deliver Products' menu lists all products you have to deliver to your "
-#~ "customers. You can process the deliveries directly from this list, line by "
-#~ "or line or through the Delivery Orders menu."
-
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr ""
-#~ "Esta es la lista para todas las ordenes de envios, que deben ser preparadas "
-#~ "deacuerdo a tus diferentes ordenes de venta y las reglas de logistica"
-
-#~ 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 ""
-#~ "The Internal Moves lists all inventory operations you have to perform in "
-#~ "your warehouse. All operations can be categorized into stock journals, so "
-#~ "that each worker has it's own list of operations to perform in his own "
-#~ "journal. Most operations are prepared automatically by OpenERP according to "
-#~ "your pre-configured logistics rules but you can also record manual stock "
-#~ "operations."
-#~ msgstr ""
-#~ "Los movimientos internos muestran todas las operaciones de inventario que "
-#~ "debe realizar en su almacén. Todas las operaciones pueden ser categorizadas "
-#~ "en diarios de inventario, para que cada empleado tenga su propia lista de "
-#~ "operaciones a realizar en su propio diario. La mayoría de operaciones son "
-#~ "preparadas automáticamente por OpenERP en función de las reglas logísticas "
-#~ "preconfiguradas, pero puede igualmente crear operaciones de stock "
-#~ "manualmente."
-
-#~ msgid ""
-#~ "This menu gives you the full traceability of inventory operations made on a "
-#~ "specific product. You can filter on the product to see all the past or "
-#~ "future movements made on the product."
-#~ msgstr ""
-#~ "Este menú le indica la trazabilidad completa de operaciones de inventario "
-#~ "realizadas sobre un producto. Puede filtrar sobre un producto para ver todos "
-#~ "los movimientos, futuros y pasados, realizados sobre el producto."
-
-#~ msgid ""
-#~ "This is the list of all the production lots (serial numbers) you recorded. "
-#~ "After having selected a lot, you can get the up-stream or down-stream "
-#~ "traceability of the products contained in lot."
-#~ msgstr ""
-#~ "Esta es la lista de todos los lotes de producción (números de serie) que ha "
-#~ "creado. Después de seleccionar un lote, puede obtener la trazabilidad "
-#~ "(ascendente o descendente) de los productos de dicho lote."
-
-#~ msgid ""
-#~ "You will find here the list of all products you are waiting for, according "
-#~ "to your preceding purchase orders. Once you receive an order, you can filter "
-#~ "based on the name of the supplier or the purchase order reference. Then you "
-#~ "can confirm all products received using the buttons on the right of each "
-#~ "line."
-#~ msgstr ""
-#~ "Encontrará aquí la lista de todos los productos que está esperando, en "
-#~ "función de las órdenes de compra realizadas anteriormente. Cuando reciba un "
-#~ "pedido, puede filtrar por el nombre del proveedor o por la referencia del "
-#~ "pedido. Entonces puede confirmar los productos recibidos gracias a los "
-#~ "botones situados a la derecha de cada línea."
-
-#~ msgid ""
-#~ "This is the structure of your company's warehouses and locations. You can "
-#~ "click on a location in order 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 "
-#~ "hacer clic en una ubicación para obtener la lista de productos y su nivel de "
-#~ "stock para esta ubicación en particular y todos sus hijos."
-
-#~ msgid ""
-#~ "This is the list of all your packs. After having selected a Pack, you can "
-#~ "get the up-stream or down-stream traceability of the products contained in "
-#~ "the pack."
-#~ msgstr ""
-#~ "Esta es la lista de todos sus paquetes. Después de haber seleccionado un "
-#~ "paquete, puede obtener la trazabilidad para arriba y para abajo de los "
-#~ "productos contenidos en el paquete."
-
-#~ msgid ""
-#~ "The stock journals system allows you assign each stock operation into a "
-#~ "specific journal according to the type of operation to perform or the "
-#~ "worker/team that should perform the operation. Examples of stock journals "
-#~ "may be: quality control, pick lists, packing, etc."
-#~ msgstr ""
-#~ "El sistema de diarios de stock permite asignar cada operación de stock a un "
-#~ "diario específico dependiendo del tipo de operación a realizar o el empleado "
-#~ "/ equipo que debe de realizar la operación. Algunos ejemplos de diarios de "
-#~ "stock: control calidad, lista de preparación, embalaje, etc"
-
-#~ msgid "stock.move.memory"
-#~ msgstr "stock.movimiento.memoria"
diff --git a/addons/stock/i18n/es_MX.po b/addons/stock/i18n/es_MX.po
new file mode 100644
index 00000000000..37a72b5d89f
--- /dev/null
+++ b/addons/stock/i18n/es_MX.po
@@ -0,0 +1,5073 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock
+#
+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"
+"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"
+
+#. 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
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr "Ubicación encadenada si fija"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr "Trazabilidad hacia arriba"
+
+#. 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"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr "Número de revisión"
+
+#. module: stock
+#: view:stock.move.memory.in:0
+#: view:stock.move.memory.out:0
+msgid "Product Moves"
+msgstr "Movimientos productos"
+
+#. 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"
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+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
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"Periodical Inventories are used to count the number of products available "
+"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
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr "Albarán"
+
+#. module: stock
+#: 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.split.into,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+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
+msgid "Day"
+msgstr "Día"
+
+#. 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.production.lot:0
+msgid "UoM"
+msgstr "UdM"
+
+#. 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"
+
+#. module: stock
+#: 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
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr "Faltan datos del albarán parcial para el movimiento #%s"
+
+#. module: stock
+#: model:ir.actions.server,name:stock.action_partial_move_server
+msgid "Deliver/Receive Products"
+msgstr "Enviar/Recibir productos"
+
+#. 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!"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"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"
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr "Otra referencia o número de serie."
+
+#. module: stock
+#: field:stock.move,origin:0
+#: view:stock.picking:0
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr "No factura"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr "Identificación paquete"
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,picking_id:0
+#: field:stock.picking,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: stock
+#: code:addons/stock/stock.py:666
+#: code:addons/stock/stock.py:1472
+#, 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."
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1120
+#, 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/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr "Agrupar por empresa"
+
+#. 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
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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
+#, python-format
+msgid "No invoicing"
+msgstr "No facturación"
+
+#. 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"
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr "Código para Incoterms"
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr "Movimientos para este paquete"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr "Ubicación interna"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr "Confirmar el inventario"
+
+#. 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
+#: report:stock.picking.list:0
+msgid "State"
+msgstr "Estado"
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr "Valor stock real"
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr "Retraso (días)"
+
+#. 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)"
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+msgstr "UdM"
+
+#. 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
+msgid "Available"
+msgstr "Reservado"
+
+#. module: stock
+#: 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"
+
+#. 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í."
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr "En cantidad"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#, python-format
+msgid "No product in this location."
+msgstr "No hay producto en esta ubicación."
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr "Ubicación de salida"
+
+#. 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"
+
+#. 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
+msgid "Location Type"
+msgstr "Tipo de ubicación"
+
+#. module: stock
+#: 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."
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr "Etiquetas artículos"
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr "Estadísticas de movimientos"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr "Filtro lotes de producto"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "["
+msgstr "["
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+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)"
+
+#. module: stock
+#: code:addons/stock/stock.py:2015
+#, 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"
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr "Ubicación destino"
+
+#. module: stock
+#: code:addons/stock/stock.py:754
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr "No puede procesar un albarán sin movimientos de stock"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr "Pedido (origen)"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr "Total:"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"You will find in this list all products you have to deliver to your "
+"customers. You can process the deliveries directly from this list using the "
+"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"
+
+#. module: stock
+#: view:stock.location:0
+#: field:stock.location,comment:0
+msgid "Additional Information"
+msgstr "Información adicional"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr "Ubicación / Producto"
+
+#. module: stock
+#: code:addons/stock/stock.py:1303
+#, python-format
+msgid "Reception"
+msgstr "Recepción"
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr "Referencia adicional"
+
+#. 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
+msgid ""
+"The stock journal system allows you to assign each stock operation to a "
+"specific journal according to the type of operation to perform or the "
+"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
+msgid "Location Name"
+msgstr "Nombre ubicación"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr "Inventario enviado"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Move Information"
+msgstr "Información de movimiento"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr "Salida"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. 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
+msgid "Packs"
+msgstr "Paquetes"
+
+#. 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"
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas y Compras"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr "Ubicación de abastecimiento"
+
+#. 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
+msgid "Production Lots"
+msgstr "Lotes de producción"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+msgstr "Destinatario"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr "Línea inventario"
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+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"
+
+#. module: stock
+#: code:addons/stock/product.py:358
+#, python-format
+msgid "Future Receptions"
+msgstr "Recepciones futuras"
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+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
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr "Movimiento destino"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Now"
+msgstr "Procesar ahora"
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr "Dirección ubicación"
+
+#. 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"
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr "Fecha de la orden."
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr "Periódico (manual)"
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr "Proveedores TI"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventarios físicos borrador"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr "Fusionar inventario"
+
+#. module: stock
+#: code:addons/stock/product.py:374
+#, python-format
+msgid "Future P&L"
+msgstr "P&L futuras"
+
+#. module: stock
+#: 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 "Albaranes de entrada"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr "Desecho"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr "Ubicaciones stock"
+
+#. 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"
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr "Fecha prevista"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr "Buscar paquete"
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: stock
+#: view:stock.picking:0
+#: report:stock.picking.list:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: stock
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"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"
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr "Tiempo inicial de ejecución (días)"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr "Existencias por ubicacion"
+
+#. module: stock
+#: help:stock.move,address_id:0
+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
+msgid "Month-1"
+msgstr "Mes-1"
+
+#. 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"
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr "Stock virtual"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr "Vista"
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr "Padre izquierdo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:132
+#, python-format
+msgid "Delivery Information"
+msgstr "Información de envío"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#, python-format
+msgid "Stock Inventory is done"
+msgstr "Inventario de stock realizado"
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock
+#: code:addons/stock/product.py:148
+#, 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"
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr "Dirección de la empresa."
+
+#. 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"
+"        "
+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
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1302
+#, 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"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr "Operación manual"
+
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr "Fecha realizado"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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
+msgid "Split inventory lines"
+msgstr "Dividir líneas de inventario"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr "Inventario físico"
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+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
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"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"
+
+#. module: stock
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr "Ubicaciones de empresas"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr "Cantidad total"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr "Movimiento consumo"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr "Clientes europeos"
+
+#. 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."
+
+#. 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"
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select 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."
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr "Trazabilidad hacia abajo"
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+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 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."
+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
+#, python-format
+msgid "is in draft state."
+msgstr "está en estado borrador."
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+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
+msgid "To be refunded/invoiced"
+msgstr "Para ser abonado/facturado"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr "Tienda 1"
+
+#. 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
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr "Información adicional"
+
+#. module: stock
+#: code:addons/stock/stock.py:1619
+#, python-format
+msgid "Operation forbidden"
+msgstr "Operación prohibida"
+
+#. 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 "Invoice Control"
+msgstr "Control factura"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr "Revisiones de lote de producción"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr "Albarán interno"
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: stock
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr "Dividir"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr "Buscar albarán stock"
+
+#. module: stock
+#: code:addons/stock/product.py:93
+#, python-format
+msgid "Company is not specified in Location"
+msgstr "No se ha especificado una compañía en la ubicación"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr "Proveedores TI genéricos"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr "Albarán:"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr "Id línea de inventario"
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr "Dirección del cliente o proveedor."
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
+msgid "Packing"
+msgstr "Albarán"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:85
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:139
+#, python-format
+msgid "Receive Information"
+msgstr "Información de recepción"
+
+#. 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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr "Información general"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action3
+#: view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr "Trazabilidad hacia abajo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#, python-format
+msgid "No Invoices were created"
+msgstr "No se han creado facturas"
+
+#. 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"
+
+#. 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
+msgid "Order Date"
+msgstr "Fecha orden"
+
+#. module: stock
+#: field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr "Ubicación padre"
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* 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
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr "¡Introduzca una cantidad positiva a desechar!"
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr "Tiempo inicial encadenado"
+
+#. 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!"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr "Stock factura en el envío"
+
+#. module: stock
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not "
+"find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2254
+#, python-format
+msgid "were scrapped"
+msgstr "estaban desechados"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr "Parcial"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+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"
+
+#. module: stock
+#: field:stock.move.memory.in,currency:0
+#: field:stock.move.memory.out,currency:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr "Lotes seguimiento de fabricación"
+
+#. 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 ""
+"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
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. 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"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr "Cancelar disponibilidad"
+
+#. 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."
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr "Movimientos creados"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr "Estante 2"
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr "Lote seguimiento"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr "Albaranes pendientes"
+
+#. module: stock
+#: view:product.product:0
+#: view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr "Propiedades de las ubicaciones parte recíproca"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr "Ubicación"
+
+#. 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
+#, python-format
+msgid "Delivered Qty"
+msgstr "Ctdad enviada"
+
+#. module: stock
+#: 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 "Dividir en lotes"
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr "Números lote de producción"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr "Ubicación stock"
+
+#. 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."
+
+#. 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"
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr "Número lotes"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:512
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr "¡No puede eliminar una línea de lote!"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1128
+#, 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!"
+
+#. 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
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. 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"
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Split in production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: 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.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr "Información"
+
+#. 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
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Later"
+msgstr "Procesar más tarde"
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+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
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"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
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr "Tiempo inicial planificado (días)"
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr "Buscar inventario"
+
+#. module: stock
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr "Cantidad por lote"
+
+#. module: stock
+#: code:addons/stock/stock.py:2012
+#, 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
+#, python-format
+msgid "Received Qty"
+msgstr "Ctdad recibida"
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr "Referencia interna"
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+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"
+
+#. module: stock
+#: field:stock.incoterms,name:0
+#: field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr "Stocks"
+
+#. module: stock
+#: model:ir.module.module,description:stock.module_meta_information
+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"
+"    "
+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
+msgid ""
+"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"
+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"
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr "Tiempo real (automatizado)"
+
+#. 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, ..."
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr "]"
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Ubicación de inventario"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr "Valor total"
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+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"
+
+#. module: stock
+#: field:stock.move.memory.in,cost:0
+#: field:stock.move.memory.out,cost:0
+msgid "Cost"
+msgstr "Coste"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr "Entrega parcial"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr "Mov. automático, paso no añadido"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr "Análisis ubicación stock"
+
+#. module: stock
+#: help:stock.move,date:0
+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:stock.production.lot:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr "Ubicaciones encadenadas"
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr "Pérdidas de inventario"
+
+#. module: stock
+#: code:addons/stock/stock.py:1311
+#, python-format
+msgid "Document"
+msgstr "Documento"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr "Albarán de entrada"
+
+#. module: stock
+#: field:stock.move,product_uom:0
+#: field:stock.move.memory.in,product_uom:0
+#: field:stock.move.memory.out,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: stock
+#: code:addons/stock/product.py:176
+#, python-format
+msgid "Products: "
+msgstr "Productos: "
+
+#. module: stock
+#: help:product.product,track_production:0
+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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr "Otros"
+
+#. module: stock
+#: code:addons/stock/product.py:90
+#, 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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr "Productos "
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr "Lotes de seguimiento de entrada"
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr "Tablero almacén"
+
+#. module: stock
+#: code:addons/stock/product.py:380
+#, python-format
+msgid "Future Qty"
+msgstr "Ctdad futura"
+
+#. 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
+msgid "Notes"
+msgstr "Notas"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2210
+#, python-format
+msgid "You can only delete draft moves."
+msgstr "Sólo puede eliminar movimientos borrador."
+
+#. 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
+msgid "Products"
+msgstr "Productos"
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr "Cambiar precio"
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr "Método entrega"
+
+#. module: stock
+#: 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 "Ubicación donde el sistema almacenará los productos finalizados."
+
+#. 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."
+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
+msgid ""
+"Here you can receive individual products, no matter what purchase order or "
+"picking order they come from. You will find the list of all products you are "
+"waiting for. Once you receive an order, you can filter based on the name of "
+"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"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr "Retraso (días)"
+
+#. module: stock
+#: field:stock.move.memory.in,move_id:0
+#: field:stock.move.memory.out,move_id:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. 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."
+
+#. module: stock
+#: code:addons/stock/product.py:376
+#, python-format
+msgid "P&L Qty"
+msgstr "Ctdad P&L"
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "Revisiones"
+
+#. 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?"
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"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
+msgid ""
+"Inventory Analysis allows you to easily check and analyse your company stock "
+"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
+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
+msgid ""
+"Define your locations to reflect your warehouse structure and organization. "
+"OpenERP is able to manage physical locations (warehouses, shelves, bin, "
+"etc), partner locations (customers, suppliers) and virtual locations which "
+"are the counterpart of the stock operations like the manufacturing orders "
+"consumptions, inventories, etc. Every stock operation in OpenERP moves the "
+"products from one location to another one. For instance, if you receive "
+"products from a supplier, OpenERP will move products from the Supplier "
+"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"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr "Origen"
+
+#. 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
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#: code:addons/stock/stock.py:754
+#, 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"
+
+#. 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"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr "Ubicaciones fijas"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr "Consumible"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"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:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr "Previsión nivel de stock"
+
+#. 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
+msgid "Stock Journal"
+msgstr "Diario de inventario"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Maxtor Suppliers"
+msgstr "Proveedores Maxtor"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:80
+#: code:addons/stock/wizard/stock_change_standard_price.py:106
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr "No se ha establecido el ID activo en el Contexto"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr "Forzar disponibilidad"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr "Movimiento desecho"
+
+#. 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
+msgid "Receive Products"
+msgstr "Recibir productos"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr "Ver stock de productos"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking list"
+msgstr "Albarán interno"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr "Fecha de realización."
+
+#. 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]"
+
+#. 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í"
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr "Inventarios"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr "Por hacer"
+
+#. 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
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr "Unidad de medida"
+
+#. module: stock
+#: code:addons/stock/product.py:122
+#, 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
+#, 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"
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr "Rellenar inventario"
+
+#. 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."
+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
+msgid "Lot"
+msgstr "Lote"
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr "Número lote de producción"
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr "Cantidad (UdV)"
+
+#. module: stock
+#: code:addons/stock/stock.py:1664
+#, 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"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr "Dirección de contacto :"
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr "Albarán pendiente"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: stock
+#: code:addons/stock/stock.py:974
+#, python-format
+msgid "Error, no partner !"
+msgstr "¡Error, sin empresa!"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr "Incoterms"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"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
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1304
+#, python-format
+msgid "Internal picking"
+msgstr "Albarán interno"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr "Abrir producto"
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr "Procesar"
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr "Nombre de revisión"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. 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)"
+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"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr "Paquetes cliente"
+
+#. 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:stock.picking,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. 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"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr "Ubicaciones virtuales"
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Para facturar"
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr "Fecha realización"
+
+#. module: stock
+#: code:addons/stock/stock.py:975
+#, 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr "Diario de destino"
+
+#. 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"
+
+#. 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
+#: 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.move.split,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
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:126
+#, python-format
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: stock
+#: code:addons/stock/stock.py:2274
+#: code:addons/stock/stock.py:2334
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr "¡Indique cantidad correcta!"
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr "UdV del producto"
+
+#. 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"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr "Consumir productos"
+
+#. module: stock
+#: code:addons/stock/stock.py:1663
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr "¡Stock insuficiente en el lote!"
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr "Padre derecho"
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr "Variantes"
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr "Pasillo (X)"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr "Proveedores"
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr "Valor total"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr "Productos por categoría"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: stock
+#: field:stock.move.memory.in,wizard_id:0
+#: field:stock.move.memory.out,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. 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"
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr "Incluir hijos"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr "Estante 1"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"Internal Moves display all inventory operations you have to perform in your "
+"warehouse. All operations can be categorized into stock journals, so that "
+"each worker has his own list of operations to perform in his own journal. "
+"Most operations are prepared automatically by OpenERP according to your "
+"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"
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr "Referencia paquete"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
+#: field:stock.move,location_id:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr "Asientos contables"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr "Total"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr "Envíos internos"
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr "Activa cuenta relacionada"
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr "Valor stock virtual"
+
+#. module: stock
+#: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr "Lotes"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr "Nuevo paquete"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr "Destinación"
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr "Todo junto"
+
+#. module: stock
+#: code:addons/stock/stock.py:1620
+#, 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
+#, python-format
+msgid "Future Productions"
+msgstr "Producciones futuras"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:115
+#, python-format
+msgid "Return lines"
+msgstr "Líneas de devolución"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr "Cantidad de entrada total"
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr "Ctdad salida"
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr "Movimientos para este lote de producción"
+
+#. 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
+msgid "Put in current pack"
+msgstr "Poner en el paquete actual"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr "Regularización de inventario"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Delivery Order:"
+msgstr "Albarán de salida:"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid ""
+"This is the list of all the production lots (serial numbers) you recorded. "
+"When you select a lot, you can get the upstream or downstream traceability "
+"of the products contained in lot. By default, the list is filtred on the "
+"serial numbers that are available in your warehouse but you can uncheck the "
+"'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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2209
+#: code:addons/stock/stock.py:2617
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. 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
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+msgstr "Clientes no europeos"
+
+#. 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/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?"
+
+#. 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
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Picking"
+msgstr "Albarán"
+
+#. 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."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr "Este albarán no requiere facturación."
+
+#. 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"
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* 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
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: stock
+#: code:addons/stock/stock.py:1318
+#: code:addons/stock/stock.py:2589
+#, python-format
+msgid "is done."
+msgstr "está realizado."
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Delivery Orders"
+msgstr "Albaranes de salida"
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+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
+#: view:stock.picking:0
+#: selection:stock.picking,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr "Icono mostrado en la vista de árbol jerárquica."
+
+#. 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"
+
+#. 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."
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr "Recepción:"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr "Cantidad de salida total"
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr "Albarán pendiente de"
+
+#. module: stock
+#: help:stock.move.memory.in,cost:0
+#: help:stock.move.memory.out,cost:0
+msgid "Unit Cost for this product line"
+msgstr "Coste unidad para esta línea de producto"
+
+#. 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.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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1313
+#, python-format
+msgid " for the "
+msgstr " para el "
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr "Cantidad a dejar en el paquete actual"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr "Lotes existentes"
+
+#. module: stock
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr "Ubicación de stock"
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:732
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr "No suficiente stock, no ha sido posible reservar los productos."
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Clientes"
+
+#. module: stock
+#: code:addons/stock/stock.py:1317
+#, python-format
+msgid "is cancelled."
+msgstr "está cancelado."
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr "Líneas regularización de inventario"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:97
+#, python-format
+msgid "Process Document"
+msgstr "Procesar documento"
+
+#. module: stock
+#: code:addons/stock/product.py:368
+#, python-format
+msgid "Future Deliveries"
+msgstr "Entregas futuras"
+
+#. 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
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr "Auto validar"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr "Plantilla producto"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"This menu gives you the full traceability of inventory operations on a "
+"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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr "Validar inventario"
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+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
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr "Movimientos de productos"
+
+#. 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"
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr "Fecha prevista máx."
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr "Auto-Albarán"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr "Tienda 2"
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: stock
+#: 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"
+
+#. 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
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr "Inventario stock"
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid ""
+"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'.              \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"
+
+#. 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
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr "¡Introduzca por lo menos una cantidad que no sea cero!"
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+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
+#, python-format
+msgid "is ready to process."
+msgstr "preparado para procesar."
+
+#. 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."
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr "Inicializar a cero"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr "Ninguno de estos albaranes requiere facturación."
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: stock
+#: code:addons/stock/product.py:101
+#: code:addons/stock/stock.py:2018
+#, 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
+#, python-format
+msgid "Unplanned Qty"
+msgstr "Ctdad no planificada"
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr "Compañía encadenada"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr "Comprobar disponibilidad"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: stock
+#: help:product.product,track_incoming:0
+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"
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr "Historial movimientos (mov. padres)"
+
+#. module: stock
+#: code:addons/stock/product.py:364
+#, python-format
+msgid "Future Stock"
+msgstr "Stock futuro"
+
+#. 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
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr "Fichero XML"
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr "Seleccionar cantidad"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"This is the structure of your company's warehouses and locations. You can "
+"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.production.lot,name:0
+msgid "Production Lot"
+msgstr "Lote de producción"
+
+#. 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
+msgid "Traceability"
+msgstr "Trazabilidad"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr "Para facturar"
+
+#. 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
+msgid "Locations"
+msgstr "Ubicaciones"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+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
+msgid "Moves"
+msgstr "Movimientos"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Ubicación destino"
+
+#. 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"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr "Previsto"
+
+#. 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"
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr "Dividir movimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:92
+#, 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
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr "Real"
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: stock
+#: 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
+msgid "Upstream traceability"
+msgstr "Trazabilidad hacia arriba"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/product.py:388
+#, python-format
+msgid "Produced Qty"
+msgstr "Ctdad producida"
+
+#. 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"
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr "Tipo ubicaciones encadenadas"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location:0
+#: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr "Identificación lote de producción"
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr "Ubicación desecho"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr "Futuro"
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr "Fecha facturado"
+
+#. 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
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr "Salida"
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr "Mantener en un lote"
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr "Precio coste:"
+
+#. 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."
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr "Ubicaciones físicas"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr "Movimiento parcial"
+
+#. 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 "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: "
diff --git a/addons/stock/i18n/es_MX.po.moved b/addons/stock/i18n/es_MX.po.moved
new file mode 100644
index 00000000000..ddb33a01138
--- /dev/null
+++ b/addons/stock/i18n/es_MX.po.moved
@@ -0,0 +1,3696 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-05 16:05+0000\n"
+"PO-Revision-Date: 2011-07-05 16:05+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
+#: 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
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr "Ubicación encadenada si fija"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr "Trazabilidad hacia arriba"
+
+#. 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"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr "Número de revisión"
+
+#. module: stock
+#: view:stock.move.memory.in:0
+#: view:stock.move.memory.out:0
+msgid "Product Moves"
+msgstr "Movimientos de productos"
+
+#. 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 de movimientos"
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+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
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid "Periodical Inventories are used to count the number of products available 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
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr "Lista de empaque"
+
+#. module: stock
+#: 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.split.into,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+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 ordenes 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
+msgid "Day"
+msgstr "Día"
+
+#. 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.production.lot:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: stock
+#: 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:2412
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr "Faltan datos de la orden parcial para el movimiento #%s"
+
+#. module: stock
+#: model:ir.actions.server,name:stock.action_partial_move_server
+msgid "Deliver/Receive Products"
+msgstr "Entrega/Recepcion de Productos"
+
+#. 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!"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#, python-format
+msgid "The current move line is already assigned to a pack, please remove it first if you really want to change it '             #                        'for this product: \"%s\" (id: %d)"
+msgstr "La línea de movimiento actual ya está asignada a una orden, 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"
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr "Otra referencia o número de serie."
+
+#. module: stock
+#: field:stock.move,origin:0
+#: view:stock.picking:0
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr "No factura"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr "Identificación de paquete"
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,picking_id:0
+#: field:stock.picking,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: stock
+#: code:addons/stock/stock.py:666
+#: code:addons/stock/stock.py:1472
+#, 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."
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1120
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr "¡No puede cancelar la lista de empaque porqué el movimiento de stock está en estado realizado!"
+
+#. module: stock
+#: code:addons/stock/stock.py:2230
+#: code:addons/stock/stock.py:2271
+#: code:addons/stock/stock.py:2331
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr "Agrupar por empresa"
+
+#. 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
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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
+#, python-format
+msgid "No invoicing"
+msgstr "No facturación"
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid "This account will be used to value stock moves that have this location as source, instead of the stock input account from the product."
+msgstr "Esta cuenta sera usada para valorar los movimientos de stock que tengan este lugar como origen, en lugar de la cuenta de stock de entrada del producto."
+
+#. 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"
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr "Código para Incoterms"
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr "Movimientos para este paquete"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr "Ubicación interna"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr "Confirmar el inventario"
+
+#. 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
+#: report:stock.picking.list:0
+msgid "State"
+msgstr "Estado"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr "Informacion Contable"
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr "Valor stock real"
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr "Retraso (días)"
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr "Acción trazabilidad "
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+msgstr "UdM"
+
+#. 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
+msgid "Available"
+msgstr "Reservado"
+
+#. module: stock
+#: 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 "Orden de salida"
+
+#. 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í."
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr "En cantidad"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
+#, python-format
+msgid "No product in this location."
+msgstr "No hay producto en esta ubicación."
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr "Ubicación de salida"
+
+#. 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"
+
+#. 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
+msgid "Location Type"
+msgstr "Tipo de ubicación"
+
+#. module: stock
+#: 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."
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr "Etiquetas artículos"
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr "Estadísticas de movimientos"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr "Filtro lotes de producto"
+
+#. module: stock
+#: code:addons/stock/stock.py:2615
+#, python-format
+msgid "You can not cancel inventory which has any account move with posted state."
+msgstr "No podra cancelar el inventario que tenga algun movimiento de cuenta con lo ultimo publicado."
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "["
+msgstr "["
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+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)"
+
+#. module: stock
+#: code:addons/stock/stock.py:2015
+#, 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 "Movimientos internos"
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr "Ubicación destino"
+
+#. module: stock
+#: code:addons/stock/stock.py:754
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr "No puede procesar una orden sin movimientos de stock"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr "Pedido (origen)"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr "Total:"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid "You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the 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"
+
+#. module: stock
+#: view:stock.location:0
+#: field:stock.location,comment:0
+msgid "Additional Information"
+msgstr "Información adicional"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr "Ubicación / Producto"
+
+#. module: stock
+#: code:addons/stock/stock.py:1303
+#, python-format
+msgid "Reception"
+msgstr "Recepción"
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr "Referencia adicional"
+
+#. 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
+msgid "The stock journal system allows you to assign each stock operation to a specific journal according to the type of operation to perform or the 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
+msgid "Location Name"
+msgstr "Nombre ubicación"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr "Inventario enviado"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Move Information"
+msgstr "Información de movimiento"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr "Salida"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. 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
+msgid "Packs"
+msgstr "Paquetes"
+
+#. 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"
+
+#. module: stock
+#: 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 "Ordenes de entrada"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr "Ubicación de abastecimiento"
+
+#. 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
+msgid "Production Lots"
+msgstr "Lotes de producción"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+msgstr "Destinatario"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr "Línea inventario"
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+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 Lista de empaque"
+
+#. module: stock
+#: code:addons/stock/product.py:355
+#, python-format
+msgid "Future Receptions"
+msgstr "Recepciones futuras"
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+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
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr "Movimiento destino"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Now"
+msgstr "Procesar ahora"
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr "Dirección ubicación"
+
+#. module: stock
+#: code:addons/stock/stock.py:2382
+#, python-format
+msgid "is consumed with"
+msgstr "es consumido con"
+
+#. 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"
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr "Fecha de la orden."
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr "Periódico (manual)"
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventarios físicos borrador"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr "Fusionar inventario"
+
+#. module: stock
+#: code:addons/stock/product.py:371
+#, python-format
+msgid "Future P&L"
+msgstr "P&L futuras"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Grupo Pessah Textil SA de CV"
+msgstr "Grupo Pessah Textil SA de CV"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr "Desecho"
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr "Contiene"
+
+#. module: stock
+#: view:board.board:0
+msgid "Incoming Products Delay"
+msgstr "Retraso ordenes entrada"
+
+#. module: stock
+#: code:addons/stock/product.py:377
+#, python-format
+msgid "Future Qty"
+msgstr "Ctdad futura"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr "Ubicaciones stock"
+
+#. 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"
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr "Fecha prevista"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr "Buscar paquete"
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: stock
+#: view:stock.picking:0
+#: report:stock.picking.list:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid "Keep empty if you produce at the location where the finished products are 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"
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr "Tiempo inicial de ejecución (días)"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr "Existencias por ubicacion"
+
+#. module: stock
+#: help:stock.move,address_id:0
+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
+msgid "Month-1"
+msgstr "Mes-1"
+
+#. 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 "Packing List"
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr "Stock virtual"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr "Vista"
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr "Padre izquierdo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:132
+#, python-format
+msgid "Delivery Information"
+msgstr "Información de envío"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#, python-format
+msgid "Stock Inventory is done"
+msgstr "Inventario de stock realizado"
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: stock
+#: code:addons/stock/product.py:148
+#, 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"
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr "Dirección de la empresa."
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr "Fecha último inventario"
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid "* Supplier Location: Virtual location representing the source location for products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1302
+#, python-format
+msgid "Delivery Order"
+msgstr "Orden de salida"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_memory_in
+msgid "stock.move.memory.in"
+msgstr "stock.movimiento.memoria.entrada"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr "Operación manual"
+
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr "Fecha realizado"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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
+msgid "Split inventory lines"
+msgstr "Dividir líneas de inventario"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr "Inventario físico"
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+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 la orden 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
+msgid "Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."
+msgstr "Tipo de envío de la orden 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"
+
+#. module: stock
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr "Ubicaciones de empresas"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr "Cantidad total"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr "Movimiento consumo"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr "Proveedores"
+
+#. 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."
+
+#. 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"
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid "This is used only if you select 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."
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr "Trazabilidad hacia abajo"
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+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 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."
+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
+#, python-format
+msgid "is in draft state."
+msgstr "está en estado borrador."
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+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 todas sus ordenes. Cuando selecciona una orden, 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
+#: code:addons/stock/wizard/stock_return_picking.py:126
+#, python-format
+msgid "To be refunded/invoiced"
+msgstr "Para ser abonado/facturado"
+
+#. module: stock
+#: code:addons/stock/stock.py:2207
+#, python-format
+msgid "You can only delete draft moves."
+msgstr "Sólo puede eliminar movimientos borrador."
+
+#. 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
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr "Información adicional"
+
+#. module: stock
+#: code:addons/stock/stock.py:1619
+#, python-format
+msgid "Operation forbidden"
+msgstr "Operación prohibida"
+
+#. 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 ordenes que estén confirmadas, reservadas o realizadas!"
+
+#. module: stock
+#: view:stock.picking:0
+#: field:stock.picking,invoice_state:0
+msgid "Invoice Control"
+msgstr "Control factura"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr "Revisiones de lote de producción"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr "Lista de empaque interno"
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: stock
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr "Dividir"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr "Buscar empaque stock"
+
+#. module: stock
+#: code:addons/stock/product.py:93
+#, python-format
+msgid "Company is not specified in Location"
+msgstr "No se ha especificado una compañía en la ubicación"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr "Lista de empaque:"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr "Id línea de inventario"
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr "Dirección del cliente o proveedor."
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
+msgid "Packing"
+msgstr "Empaque"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:85
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:139
+#, python-format
+msgid "Receive Information"
+msgstr "Información de recepción"
+
+#. 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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr "Información general"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action3
+#: view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr "Trazabilidad hacia abajo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#, python-format
+msgid "No Invoices were created"
+msgstr "No se han creado facturas"
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr "Estantería (Y)"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:140
+#, python-format
+msgid "Receive"
+msgstr "Recibir"
+
+#. 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
+msgid "Order Date"
+msgstr "Fecha orden"
+
+#. module: stock
+#: field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr "Ubicación padre"
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid "* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"
+"* 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:2230
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr "¡Introduzca una cantidad positiva a desechar!"
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr "Tiempo inicial encadenado"
+
+#. 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!"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr "Stock factura en el envío"
+
+#. module: stock
+#: help:stock.move,state:0
+msgid "When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" 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 la orden 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2251
+#, python-format
+msgid "were scrapped"
+msgstr "estaban desechados"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr "Parcial"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+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 empaque se dividió, este campo enlaza con el empaque 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"
+
+#. module: stock
+#: field:stock.move.memory.in,currency:0
+#: field:stock.move.memory.out,currency:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr "Lotes seguimiento de fabricación"
+
+#. 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 "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
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. 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 de mercancías"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr "Cancelar disponibilidad"
+
+#. 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."
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr "Movimientos creados"
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr "Lote seguimiento"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr "Ordenes pendientes"
+
+#. module: stock
+#: view:product.product:0
+#: view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr "Propiedades de las ubicaciones parte recíproca"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr "Ubicación"
+
+#. 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:367
+#, python-format
+msgid "Delivered Qty"
+msgstr "Ctdad enviada"
+
+#. module: stock
+#: 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 "Dividir en lotes"
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr "Números lote de producción"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr "Ubicación stock"
+
+#. 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."
+
+#. 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"
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr "Número lotes"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:512
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr "¡No puede eliminar una línea de lote!"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1128
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr "¡No puede eliminar la orden que está en estado %s!"
+
+#. 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
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. 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 orden"
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Split in production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: 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.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr "Información"
+
+#. 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
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Later"
+msgstr "Procesar más tarde"
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+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 orden (cuando se utiliza el método del precio medio de coste)."
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_move_report
+msgid "Moves Analysis allows you to easily check and analyse your company stock 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
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr "Tiempo inicial planificado (días)"
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr "Buscar inventario"
+
+#. module: stock
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr "Cantidad por lote"
+
+#. module: stock
+#: code:addons/stock/stock.py:2012
+#, 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:357
+#, python-format
+msgid "Received Qty"
+msgstr "Ctdad recibida"
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr "Referencia interna"
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+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"
+
+#. module: stock
+#: field:stock.incoterms,name:0
+#: field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr "Stocks"
+
+#. module: stock
+#: model:ir.module.module,description:stock.module_meta_information
+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"
+"    "
+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
+msgid "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"
+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"
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr "Tiempo real (automatizado)"
+
+#. 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, ..."
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr "]"
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Ubicación de inventario"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr "Valor total"
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+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 "Orden de entrada"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr "Creación"
+
+#. module: stock
+#: field:stock.move.memory.in,cost:0
+#: field:stock.move.memory.out,cost:0
+msgid "Cost"
+msgstr "Coste"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr "Entrega parcial"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr "Mov. automático, paso no añadido"
+
+#. module: stock
+#: code:addons/stock/stock.py:2382
+#, python-format
+msgid "Product "
+msgstr "Producto "
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr "Análisis ubicación stock"
+
+#. module: stock
+#: help:stock.move,date:0
+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
+#: model:ir.model,name:stock.model_stock_move_memory_out
+msgid "stock.move.memory.out"
+msgstr "stock.movimiento.memoria.salida"
+
+#. 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 "Agrupar por..."
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr "Ubicaciones encadenadas"
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr "Pérdidas de inventario"
+
+#. module: stock
+#: code:addons/stock/stock.py:1311
+#, python-format
+msgid "Document"
+msgstr "Documento"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr "Lista de empaque de entrada"
+
+#. module: stock
+#: field:stock.move,product_uom:0
+#: field:stock.move.memory.in,product_uom:0
+#: field:stock.move.memory.out,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: stock
+#: code:addons/stock/product.py:176
+#, python-format
+msgid "Products: "
+msgstr "Productos: "
+
+#. module: stock
+#: help:product.product,track_production:0
+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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr "Otros"
+
+#. module: stock
+#: code:addons/stock/product.py:90
+#, 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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr "Productos "
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr "Lotes de seguimiento de entrada"
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr "Tablero almacén"
+
+#. 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"
+
+#. 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
+msgid "Notes"
+msgstr "Notas"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: stock
+#: 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"
+
+#. 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
+msgid "Products"
+msgstr "Productos"
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr "Cambiar precio"
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr "Método entrega"
+
+#. module: stock
+#: 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 "Ubicación donde el sistema almacenará los productos finalizados."
+
+#. 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."
+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
+msgid "Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of 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 u orden de entrada provienen. Encontrará la lista de todos los productos que está esperando. Una vez recibida la orden, 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 de stock"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr "Retraso (días)"
+
+#. module: stock
+#: field:stock.move.memory.in,move_id:0
+#: field:stock.move.memory.out,move_id:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr "Fecha prevista para procesar el empaque."
+
+#. module: stock
+#: code:addons/stock/product.py:373
+#, python-format
+msgid "P&L Qty"
+msgstr "Ctdad P&L"
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "Revisiones"
+
+#. 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?"
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid "If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves.The inventory variation account set on the product category will represent the 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
+msgid "Inventory Analysis allows you to easily check and analyse your company stock 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
+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
+msgid "Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier 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"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr "Origen"
+
+#. module: stock
+#: code:addons/stock/stock.py:2586
+#: 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
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de empaque"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#: code:addons/stock/stock.py:754
+#, 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"
+
+#. 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"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr "Ubicaciones fijas"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr "Consumible"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid "Display the last inventories done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you 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:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr "Previsión nivel de stock"
+
+#. 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
+msgid "Stock Journal"
+msgstr "Diario de inventario"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:80
+#: code:addons/stock/wizard/stock_change_standard_price.py:106
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr "No se ha establecido el ID activo en el Contexto"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr "Forzar disponibilidad"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr "Movimiento desecho"
+
+#. 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
+msgid "Receive Products"
+msgstr "Recibir productos"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr "Ver stock de productos"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking list"
+msgstr "Lista de empaque interna"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr "Fecha de realización."
+
+#. 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]"
+
+#. 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í"
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr "Inventarios"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr "Por hacer"
+
+#. 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
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr "Unidad de medida"
+
+#. module: stock
+#: code:addons/stock/product.py:122
+#, 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:2336
+#, 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"
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr "Rellenar inventario"
+
+#. 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."
+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
+msgid "Lot"
+msgstr "Lote"
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr "Número lote de producción"
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr "Cantidad (UdV)"
+
+#. module: stock
+#: code:addons/stock/stock.py:1664
+#, 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"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr "Dirección de contacto :"
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr "Orden pendiente"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: stock
+#: code:addons/stock/stock.py:974
+#, python-format
+msgid "Error, no partner !"
+msgstr "¡Error, sin empresa!"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr "Incoterms"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid "Incoterms are series of sales terms.They are used to divide transaction 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
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1304
+#, python-format
+msgid "Internal picking"
+msgstr "Empaque interno"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr "Abrir producto"
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr "Procesar"
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr "Nombre de revisión"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. 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)"
+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"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr "Paquetes cliente"
+
+#. 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:stock.picking,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. 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"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr "Ubicaciones virtuales"
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Para facturar"
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr "Fecha realización"
+
+#. module: stock
+#: code:addons/stock/stock.py:975
+#, python-format
+msgid "Please put a partner on the picking list if you want to generate invoice."
+msgstr "Por favor indique una empresa en la orden 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"
+
+#. 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"
+
+#. module: stock
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. 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"
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr "Diario de destino"
+
+#. 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"
+
+#. 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
+#: 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.move.split,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
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:126
+#, python-format
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: stock
+#: code:addons/stock/stock.py:2271
+#: code:addons/stock/stock.py:2331
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr "¡Indique cantidad correcta!"
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr "UdV del producto"
+
+#. 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"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr "Consumir productos"
+
+#. module: stock
+#: code:addons/stock/stock.py:1663
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr "¡Stock insuficiente en el lote!"
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr "Padre derecho"
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr "Variantes"
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr "Pasillo (X)"
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr "Valor total"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr "Productos por categoría"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: stock
+#: field:stock.move.memory.in,wizard_id:0
+#: field:stock.move.memory.out,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. 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"
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr "Incluir hijos"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid "Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your 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"
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr "Referencia de paquete"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
+#: field:stock.move,location_id:0
+msgid "Source Location"
+msgstr "Ubicación de origen"
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr "Asientos contables"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr "Total"
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr "Activa cuenta relacionada"
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr "Valor stock virtual"
+
+#. module: stock
+#: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr "Lotes"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr "Nuevo paquete"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr "Destino"
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr "Todo junto"
+
+#. module: stock
+#: code:addons/stock/stock.py:1620
+#, 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:383
+#, python-format
+msgid "Future Productions"
+msgstr "Producciones futuras"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:115
+#, python-format
+msgid "Return lines"
+msgstr "Líneas de devolución"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr "Cantidad de entrada total"
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr "Ctdad salida"
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr "Movimientos para este lote de producción"
+
+#. 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
+msgid "Put in current pack"
+msgstr "Poner en el paquete actual"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr "Regularización de inventario"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Delivery Order:"
+msgstr "Orden de salida:"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid "This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the '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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2206
+#: code:addons/stock/stock.py:2614
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. 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
+msgid "Ok"
+msgstr "Aceptar"
+
+#. 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:2336
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: 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?"
+
+#. 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
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr "Tipo ubicaciones encadenadas"
+
+#. 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."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr "Esta orden no requiere facturación."
+
+#. 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"
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid "Determines whether this location is chained to another location, i.e. any incoming product in this location \n"
+"should next go to the chained location. The chained location is determined according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location field on the Partner form of the Partner that is specified in the Picking list of the incoming products.\n"
+"* 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 la orden 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
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: stock
+#: code:addons/stock/stock.py:1318
+#: code:addons/stock/stock.py:2586
+#, python-format
+msgid "is done."
+msgstr "está realizado."
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Delivery Orders"
+msgstr "Ordenes de salida"
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+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
+#: view:stock.picking:0
+#: selection:stock.picking,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr "Icono mostrado en la vista de árbol jerárquica."
+
+#. 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"
+
+#. 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."
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr "Recepción:"
+
+#. 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 "Empaques relacionados"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr "Cantidad de salida total"
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr "Orden pendiente de"
+
+#. module: stock
+#: help:stock.move.memory.in,cost:0
+#: help:stock.move.memory.out,cost:0
+msgid "Unit Cost for this product line"
+msgstr "Coste unidad para esta línea de producto"
+
+#. 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.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: "
+msgstr "INV: "
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.next_id_61
+msgid "Reporting"
+msgstr "Informes"
+
+#. module: stock
+#: code:addons/stock/stock.py:1313
+#, python-format
+msgid " for the "
+msgstr " para el "
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr "Cantidad a dejar en el paquete actual"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr "Lotes existentes"
+
+#. module: stock
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr "Ubicación de stock"
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid "If cost price is increased, stock variation account will be debited and stock output account will be credited with the value = (difference of amount * quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and stock input account will be debited."
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:732
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr "No suficiente stock, no ha sido posible reservar los productos."
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Clientes"
+
+#. module: stock
+#: code:addons/stock/stock.py:1317
+#, python-format
+msgid "is cancelled."
+msgstr "está cancelado."
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr "Líneas regularización de inventario"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:97
+#, python-format
+msgid "Process Document"
+msgstr "Procesar documento"
+
+#. module: stock
+#: code:addons/stock/product.py:365
+#, python-format
+msgid "Future Deliveries"
+msgstr "Entregas futuras"
+
+#. 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 "Las ordenes de entrada son la lista de todos los pedidos que va a recibir de su proveedor. Una orden 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
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr "Auto validar"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid "This menu gives you the full traceability of inventory operations on a 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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr "Validar inventario"
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+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 orden (cuando se utiliza el método de precio medio de coste)."
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr "Movimientos de productos"
+
+#. 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"
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr "Fecha prevista máx."
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr "Auto-Orden"
+
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr "Tipo encadenado"
+
+#. module: stock
+#: 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"
+
+#. 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
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr "Inventario stock"
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid "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'.              \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 la orden 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 ordenes salida"
+
+#. 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
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr "¡Introduzca por lo menos una cantidad que no sea cero!"
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+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
+#, python-format
+msgid "is ready to process."
+msgstr "preparado para procesar."
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr "Referencia del documento que ha generado esta orden."
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr "Inicializar a cero"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr "Ninguno de estas ordenes requiere facturación."
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: stock
+#: code:addons/stock/product.py:101
+#: code:addons/stock/stock.py:2018
+#, 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:379
+#, python-format
+msgid "Unplanned Qty"
+msgstr "Ctdad no planificada"
+
+#. module: stock
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled"
+msgstr "está planificado"
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr "Compañía encadenada"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr "Comprobar disponibilidad"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: stock
+#: help:product.product,track_incoming:0
+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"
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr "Historial movimientos (mov. padres)"
+
+#. module: stock
+#: code:addons/stock/product.py:361
+#, python-format
+msgid "Future Stock"
+msgstr "Stock futuro"
+
+#. 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
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr "Fichero XML"
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr "Seleccionar cantidad"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid "This is the structure of your company's warehouses and locations. You can 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.production.lot,name:0
+msgid "Production Lot"
+msgstr "Lote de producción"
+
+#. 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
+msgid "Traceability"
+msgstr "Trazabilidad"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr "Para facturar"
+
+#. 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
+msgid "Locations"
+msgstr "Ubicaciones"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+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
+msgid "Moves"
+msgstr "Movimientos"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Ubicación destino"
+
+#. 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:2382
+#, python-format
+msgid "quantity."
+msgstr "cantidad."
+
+#. 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"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr "Previsto"
+
+#. 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"
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr "Dividir movimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:92
+#, 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
+#: help:stock.location,valuation_in_account_id:0
+msgid "This account will be used to value stock moves that have this location as destination, instead of the stock output account from the product."
+msgstr "Esta cuenta sera usada para valorar movimientos de stock que tengan esta ubicacion como destino, en lugar de la cuenta de stock de salida del producto."
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr "Real"
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: stock
+#: 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
+msgid "Upstream traceability"
+msgstr "Trazabilidad hacia arriba"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/product.py:385
+#, python-format
+msgid "Produced Qty"
+msgstr "Ctdad producida"
+
+#. 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"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Picking"
+msgstr "Empaque"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location:0
+#: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr "Identificación lote de producción"
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr "Ubicación desecho"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr "Futuro"
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr "Fecha facturado"
+
+#. module: stock
+#: code:addons/stock/stock.py:732
+#: 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
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr "Salida"
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr "Mantener en un lote"
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr "Precio coste:"
+
+#. 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."
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr "Ubicaciones físicas"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr "Movimiento parcial"
+
+#. 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 "Detalles de ubicación opcionales, sólo para fines de información."
+
diff --git a/addons/stock/i18n/es_VE.po b/addons/stock/i18n/es_VE.po
new file mode 100644
index 00000000000..37a72b5d89f
--- /dev/null
+++ b/addons/stock/i18n/es_VE.po
@@ -0,0 +1,5073 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock
+#
+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"
+"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"
+
+#. 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
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr "Ubicación encadenada si fija"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr "Trazabilidad hacia arriba"
+
+#. 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"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr "Número de revisión"
+
+#. module: stock
+#: view:stock.move.memory.in:0
+#: view:stock.move.memory.out:0
+msgid "Product Moves"
+msgstr "Movimientos productos"
+
+#. 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"
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+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
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"Periodical Inventories are used to count the number of products available "
+"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
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr "Albarán"
+
+#. module: stock
+#: 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.split.into,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+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
+msgid "Day"
+msgstr "Día"
+
+#. 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.production.lot:0
+msgid "UoM"
+msgstr "UdM"
+
+#. 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"
+
+#. module: stock
+#: 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
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr "Faltan datos del albarán parcial para el movimiento #%s"
+
+#. module: stock
+#: model:ir.actions.server,name:stock.action_partial_move_server
+msgid "Deliver/Receive Products"
+msgstr "Enviar/Recibir productos"
+
+#. 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!"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"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"
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr "Otra referencia o número de serie."
+
+#. module: stock
+#: field:stock.move,origin:0
+#: view:stock.picking:0
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr "No factura"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr "Identificación paquete"
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,picking_id:0
+#: field:stock.picking,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: stock
+#: code:addons/stock/stock.py:666
+#: code:addons/stock/stock.py:1472
+#, 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."
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1120
+#, 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/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr "Agrupar por empresa"
+
+#. 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
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. 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
+#, python-format
+msgid "No invoicing"
+msgstr "No facturación"
+
+#. 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"
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr "Código para Incoterms"
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr "Movimientos para este paquete"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr "Ubicación interna"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr "Confirmar el inventario"
+
+#. 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
+#: report:stock.picking.list:0
+msgid "State"
+msgstr "Estado"
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr "Valor stock real"
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr "Retraso (días)"
+
+#. 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)"
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+msgstr "UdM"
+
+#. 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
+msgid "Available"
+msgstr "Reservado"
+
+#. module: stock
+#: 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"
+
+#. 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í."
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr "En cantidad"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#, python-format
+msgid "No product in this location."
+msgstr "No hay producto en esta ubicación."
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr "Ubicación de salida"
+
+#. 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"
+
+#. 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
+msgid "Location Type"
+msgstr "Tipo de ubicación"
+
+#. module: stock
+#: 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."
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr "Etiquetas artículos"
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr "Estadísticas de movimientos"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr "Filtro lotes de producto"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "["
+msgstr "["
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+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)"
+
+#. module: stock
+#: code:addons/stock/stock.py:2015
+#, 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"
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr "Ubicación destino"
+
+#. module: stock
+#: code:addons/stock/stock.py:754
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr "No puede procesar un albarán sin movimientos de stock"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr "Pedido (origen)"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr "Total:"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"You will find in this list all products you have to deliver to your "
+"customers. You can process the deliveries directly from this list using the "
+"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"
+
+#. module: stock
+#: view:stock.location:0
+#: field:stock.location,comment:0
+msgid "Additional Information"
+msgstr "Información adicional"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr "Ubicación / Producto"
+
+#. module: stock
+#: code:addons/stock/stock.py:1303
+#, python-format
+msgid "Reception"
+msgstr "Recepción"
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr "Referencia adicional"
+
+#. 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
+msgid ""
+"The stock journal system allows you to assign each stock operation to a "
+"specific journal according to the type of operation to perform or the "
+"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
+msgid "Location Name"
+msgstr "Nombre ubicación"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr "Inventario enviado"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Move Information"
+msgstr "Información de movimiento"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr "Salida"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. 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
+msgid "Packs"
+msgstr "Paquetes"
+
+#. 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"
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas y Compras"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr "Ubicación de abastecimiento"
+
+#. 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
+msgid "Production Lots"
+msgstr "Lotes de producción"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+msgstr "Destinatario"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr "Línea inventario"
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+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"
+
+#. module: stock
+#: code:addons/stock/product.py:358
+#, python-format
+msgid "Future Receptions"
+msgstr "Recepciones futuras"
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+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
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr "Movimiento destino"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Now"
+msgstr "Procesar ahora"
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr "Dirección ubicación"
+
+#. 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"
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr "Fecha de la orden."
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr "Periódico (manual)"
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr "Proveedores TI"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "Inventarios físicos borrador"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr "Fusionar inventario"
+
+#. module: stock
+#: code:addons/stock/product.py:374
+#, python-format
+msgid "Future P&L"
+msgstr "P&L futuras"
+
+#. module: stock
+#: 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 "Albaranes de entrada"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr "Desecho"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr "Ubicaciones stock"
+
+#. 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"
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr "Fecha prevista"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr "Buscar paquete"
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: stock
+#: view:stock.picking:0
+#: report:stock.picking.list:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: stock
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"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"
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr "Tiempo inicial de ejecución (días)"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr "Existencias por ubicacion"
+
+#. module: stock
+#: help:stock.move,address_id:0
+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
+msgid "Month-1"
+msgstr "Mes-1"
+
+#. 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"
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr "Stock virtual"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr "Vista"
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr "Padre izquierdo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:132
+#, python-format
+msgid "Delivery Information"
+msgstr "Información de envío"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#, python-format
+msgid "Stock Inventory is done"
+msgstr "Inventario de stock realizado"
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock
+#: code:addons/stock/product.py:148
+#, 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"
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr "Dirección de la empresa."
+
+#. 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"
+"        "
+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
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1302
+#, 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"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr "Operación manual"
+
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr "Fecha realizado"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. 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
+msgid "Split inventory lines"
+msgstr "Dividir líneas de inventario"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr "Inventario físico"
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+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
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"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"
+
+#. module: stock
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr "Ubicaciones de empresas"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr "Cantidad total"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr "Movimiento consumo"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr "Clientes europeos"
+
+#. 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."
+
+#. 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"
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select 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."
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr "Trazabilidad hacia abajo"
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+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 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."
+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
+#, python-format
+msgid "is in draft state."
+msgstr "está en estado borrador."
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+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
+msgid "To be refunded/invoiced"
+msgstr "Para ser abonado/facturado"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr "Tienda 1"
+
+#. 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
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr "Información adicional"
+
+#. module: stock
+#: code:addons/stock/stock.py:1619
+#, python-format
+msgid "Operation forbidden"
+msgstr "Operación prohibida"
+
+#. 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 "Invoice Control"
+msgstr "Control factura"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr "Revisiones de lote de producción"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr "Albarán interno"
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: stock
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr "Dividir"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr "Buscar albarán stock"
+
+#. module: stock
+#: code:addons/stock/product.py:93
+#, python-format
+msgid "Company is not specified in Location"
+msgstr "No se ha especificado una compañía en la ubicación"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr "Proveedores TI genéricos"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr "Albarán:"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr "Id línea de inventario"
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr "Dirección del cliente o proveedor."
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
+msgid "Packing"
+msgstr "Albarán"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:85
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:139
+#, python-format
+msgid "Receive Information"
+msgstr "Información de recepción"
+
+#. 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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr "Información general"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Ninguno"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action3
+#: view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr "Trazabilidad hacia abajo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#, python-format
+msgid "No Invoices were created"
+msgstr "No se han creado facturas"
+
+#. 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"
+
+#. 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
+msgid "Order Date"
+msgstr "Fecha orden"
+
+#. module: stock
+#: field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr "Ubicación padre"
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* 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
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr "¡Introduzca una cantidad positiva a desechar!"
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr "Tiempo inicial encadenado"
+
+#. 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!"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr "Stock factura en el envío"
+
+#. module: stock
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not "
+"find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2254
+#, python-format
+msgid "were scrapped"
+msgstr "estaban desechados"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr "Parcial"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+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"
+
+#. module: stock
+#: field:stock.move.memory.in,currency:0
+#: field:stock.move.memory.out,currency:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr "Lotes seguimiento de fabricación"
+
+#. 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 ""
+"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
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. 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"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr "Cancelar disponibilidad"
+
+#. 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."
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr "Movimientos creados"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr "Estante 2"
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr "Lote seguimiento"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr "Albaranes pendientes"
+
+#. module: stock
+#: view:product.product:0
+#: view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr "Propiedades de las ubicaciones parte recíproca"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr "Ubicación"
+
+#. 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
+#, python-format
+msgid "Delivered Qty"
+msgstr "Ctdad enviada"
+
+#. module: stock
+#: 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 "Dividir en lotes"
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr "Números lote de producción"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr "Ubicación stock"
+
+#. 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."
+
+#. 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"
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr "Número lotes"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:512
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr "¡No puede eliminar una línea de lote!"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1128
+#, 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!"
+
+#. 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
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. 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"
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Split in production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: 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.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr "Información"
+
+#. 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
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Later"
+msgstr "Procesar más tarde"
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+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
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"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
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr "Tiempo inicial planificado (días)"
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr "Buscar inventario"
+
+#. module: stock
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr "Cantidad por lote"
+
+#. module: stock
+#: code:addons/stock/stock.py:2012
+#, 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
+#, python-format
+msgid "Received Qty"
+msgstr "Ctdad recibida"
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr "Referencia interna"
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+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"
+
+#. module: stock
+#: field:stock.incoterms,name:0
+#: field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr "Stocks"
+
+#. module: stock
+#: model:ir.module.module,description:stock.module_meta_information
+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"
+"    "
+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
+msgid ""
+"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"
+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"
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr "Tiempo real (automatizado)"
+
+#. 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, ..."
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr "]"
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Ubicación de inventario"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr "Valor total"
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+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"
+
+#. module: stock
+#: field:stock.move.memory.in,cost:0
+#: field:stock.move.memory.out,cost:0
+msgid "Cost"
+msgstr "Coste"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr "Entrega parcial"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr "Mov. automático, paso no añadido"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr "Análisis ubicación stock"
+
+#. module: stock
+#: help:stock.move,date:0
+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:stock.production.lot:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr "Ubicaciones encadenadas"
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr "Pérdidas de inventario"
+
+#. module: stock
+#: code:addons/stock/stock.py:1311
+#, python-format
+msgid "Document"
+msgstr "Documento"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr "Albarán de entrada"
+
+#. module: stock
+#: field:stock.move,product_uom:0
+#: field:stock.move.memory.in,product_uom:0
+#: field:stock.move.memory.out,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: stock
+#: code:addons/stock/product.py:176
+#, python-format
+msgid "Products: "
+msgstr "Productos: "
+
+#. module: stock
+#: help:product.product,track_production:0
+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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. 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"
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr "Otros"
+
+#. module: stock
+#: code:addons/stock/product.py:90
+#, 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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr "Productos "
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr "Lotes de seguimiento de entrada"
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr "Tablero almacén"
+
+#. module: stock
+#: code:addons/stock/product.py:380
+#, python-format
+msgid "Future Qty"
+msgstr "Ctdad futura"
+
+#. 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
+msgid "Notes"
+msgstr "Notas"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2210
+#, python-format
+msgid "You can only delete draft moves."
+msgstr "Sólo puede eliminar movimientos borrador."
+
+#. 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
+msgid "Products"
+msgstr "Productos"
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr "Cambiar precio"
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr "Método entrega"
+
+#. module: stock
+#: 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 "Ubicación donde el sistema almacenará los productos finalizados."
+
+#. 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."
+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
+msgid ""
+"Here you can receive individual products, no matter what purchase order or "
+"picking order they come from. You will find the list of all products you are "
+"waiting for. Once you receive an order, you can filter based on the name of "
+"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"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr "Retraso (días)"
+
+#. module: stock
+#: field:stock.move.memory.in,move_id:0
+#: field:stock.move.memory.out,move_id:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. 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."
+
+#. module: stock
+#: code:addons/stock/product.py:376
+#, python-format
+msgid "P&L Qty"
+msgstr "Ctdad P&L"
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "Revisiones"
+
+#. 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?"
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"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
+msgid ""
+"Inventory Analysis allows you to easily check and analyse your company stock "
+"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
+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
+msgid ""
+"Define your locations to reflect your warehouse structure and organization. "
+"OpenERP is able to manage physical locations (warehouses, shelves, bin, "
+"etc), partner locations (customers, suppliers) and virtual locations which "
+"are the counterpart of the stock operations like the manufacturing orders "
+"consumptions, inventories, etc. Every stock operation in OpenERP moves the "
+"products from one location to another one. For instance, if you receive "
+"products from a supplier, OpenERP will move products from the Supplier "
+"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"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr "Origen"
+
+#. 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
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#: code:addons/stock/stock.py:754
+#, 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"
+
+#. 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"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr "Ubicaciones fijas"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr "Consumible"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"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:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr "Previsión nivel de stock"
+
+#. 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
+msgid "Stock Journal"
+msgstr "Diario de inventario"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Maxtor Suppliers"
+msgstr "Proveedores Maxtor"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:80
+#: code:addons/stock/wizard/stock_change_standard_price.py:106
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr "No se ha establecido el ID activo en el Contexto"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr "Forzar disponibilidad"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr "Movimiento desecho"
+
+#. 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
+msgid "Receive Products"
+msgstr "Recibir productos"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr "Ver stock de productos"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking list"
+msgstr "Albarán interno"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr "Fecha de realización."
+
+#. 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]"
+
+#. 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í"
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr "Inventarios"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr "Por hacer"
+
+#. 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
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr "Unidad de medida"
+
+#. module: stock
+#: code:addons/stock/product.py:122
+#, 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
+#, 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"
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr "Rellenar inventario"
+
+#. 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."
+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
+msgid "Lot"
+msgstr "Lote"
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr "Número lote de producción"
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr "Cantidad (UdV)"
+
+#. module: stock
+#: code:addons/stock/stock.py:1664
+#, 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"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr "Dirección de contacto :"
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr "Albarán pendiente"
+
+#. module: stock
+#: 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"
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: stock
+#: code:addons/stock/stock.py:974
+#, python-format
+msgid "Error, no partner !"
+msgstr "¡Error, sin empresa!"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr "Incoterms"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr "Total:"
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"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
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1304
+#, python-format
+msgid "Internal picking"
+msgstr "Albarán interno"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr "Abrir producto"
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr "Hasta"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr "Procesar"
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr "Nombre de revisión"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. 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)"
+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"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr "Paquetes cliente"
+
+#. 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:stock.picking,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. 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"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr "Ubicaciones virtuales"
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Para facturar"
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr "Fecha realización"
+
+#. module: stock
+#: code:addons/stock/stock.py:975
+#, 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr "Diario de destino"
+
+#. 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"
+
+#. 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
+#: 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.move.split,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
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:126
+#, python-format
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: stock
+#: code:addons/stock/stock.py:2274
+#: code:addons/stock/stock.py:2334
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr "¡Indique cantidad correcta!"
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr "UdV del producto"
+
+#. 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"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr "Consumir productos"
+
+#. module: stock
+#: code:addons/stock/stock.py:1663
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr "¡Stock insuficiente en el lote!"
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr "Padre derecho"
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr "Variantes"
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr "Pasillo (X)"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr "Proveedores"
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr "Valor total"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr "Productos por categoría"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: stock
+#: field:stock.move.memory.in,wizard_id:0
+#: field:stock.move.memory.out,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. 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"
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr "Incluir hijos"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr "Estante 1"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"Internal Moves display all inventory operations you have to perform in your "
+"warehouse. All operations can be categorized into stock journals, so that "
+"each worker has his own list of operations to perform in his own journal. "
+"Most operations are prepared automatically by OpenERP according to your "
+"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"
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr "Referencia paquete"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
+#: field:stock.move,location_id:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr "Asientos contables"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr "Total"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr "Envíos internos"
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr "Activa cuenta relacionada"
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr "Valor stock virtual"
+
+#. module: stock
+#: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr "Lotes"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr "Nuevo paquete"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr "Destinación"
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr "Todo junto"
+
+#. module: stock
+#: code:addons/stock/stock.py:1620
+#, 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
+#, python-format
+msgid "Future Productions"
+msgstr "Producciones futuras"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:115
+#, python-format
+msgid "Return lines"
+msgstr "Líneas de devolución"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr "Cantidad de entrada total"
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr "Ctdad salida"
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr "Movimientos para este lote de producción"
+
+#. 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
+msgid "Put in current pack"
+msgstr "Poner en el paquete actual"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr "Regularización de inventario"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Delivery Order:"
+msgstr "Albarán de salida:"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid ""
+"This is the list of all the production lots (serial numbers) you recorded. "
+"When you select a lot, you can get the upstream or downstream traceability "
+"of the products contained in lot. By default, the list is filtred on the "
+"serial numbers that are available in your warehouse but you can uncheck the "
+"'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"
+
+#. module: stock
+#: code:addons/stock/stock.py:2209
+#: code:addons/stock/stock.py:2617
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. 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
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+msgstr "Clientes no europeos"
+
+#. 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/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?"
+
+#. 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
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Picking"
+msgstr "Albarán"
+
+#. 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."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr "Este albarán no requiere facturación."
+
+#. 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"
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* 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
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: stock
+#: code:addons/stock/stock.py:1318
+#: code:addons/stock/stock.py:2589
+#, python-format
+msgid "is done."
+msgstr "está realizado."
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Delivery Orders"
+msgstr "Albaranes de salida"
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+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
+#: view:stock.picking:0
+#: selection:stock.picking,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr "Icono mostrado en la vista de árbol jerárquica."
+
+#. 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"
+
+#. 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."
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr "Recepción:"
+
+#. 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"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr "Cantidad de salida total"
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr "Albarán pendiente de"
+
+#. module: stock
+#: help:stock.move.memory.in,cost:0
+#: help:stock.move.memory.out,cost:0
+msgid "Unit Cost for this product line"
+msgstr "Coste unidad para esta línea de producto"
+
+#. 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.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"
+
+#. module: stock
+#: code:addons/stock/stock.py:1313
+#, python-format
+msgid " for the "
+msgstr " para el "
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr "Cantidad a dejar en el paquete actual"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr "Lotes existentes"
+
+#. module: stock
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr "Ubicación de stock"
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+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"
+
+#. module: stock
+#: code:addons/stock/stock.py:732
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr "No suficiente stock, no ha sido posible reservar los productos."
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Clientes"
+
+#. module: stock
+#: code:addons/stock/stock.py:1317
+#, python-format
+msgid "is cancelled."
+msgstr "está cancelado."
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr "Líneas regularización de inventario"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:97
+#, python-format
+msgid "Process Document"
+msgstr "Procesar documento"
+
+#. module: stock
+#: code:addons/stock/product.py:368
+#, python-format
+msgid "Future Deliveries"
+msgstr "Entregas futuras"
+
+#. 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
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr "Auto validar"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr "Plantilla producto"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"This menu gives you the full traceability of inventory operations on a "
+"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"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr "Validar inventario"
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+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
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr "Movimientos de productos"
+
+#. 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"
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr "Fecha prevista máx."
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr "Auto-Albarán"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr "Tienda 2"
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: stock
+#: 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"
+
+#. 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
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr "Inventario stock"
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid ""
+"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'.              \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"
+
+#. 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
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr "¡Introduzca por lo menos una cantidad que no sea cero!"
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+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
+#, python-format
+msgid "is ready to process."
+msgstr "preparado para procesar."
+
+#. 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."
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr "Inicializar a cero"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr "Ninguno de estos albaranes requiere facturación."
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: stock
+#: code:addons/stock/product.py:101
+#: code:addons/stock/stock.py:2018
+#, 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
+#, python-format
+msgid "Unplanned Qty"
+msgstr "Ctdad no planificada"
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr "Compañía encadenada"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr "Comprobar disponibilidad"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: stock
+#: help:product.product,track_incoming:0
+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"
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr "Historial movimientos (mov. padres)"
+
+#. module: stock
+#: code:addons/stock/product.py:364
+#, python-format
+msgid "Future Stock"
+msgstr "Stock futuro"
+
+#. 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
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr "Fichero XML"
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr "Seleccionar cantidad"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"This is the structure of your company's warehouses and locations. You can "
+"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.production.lot,name:0
+msgid "Production Lot"
+msgstr "Lote de producción"
+
+#. 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
+msgid "Traceability"
+msgstr "Trazabilidad"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr "Para facturar"
+
+#. 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
+msgid "Locations"
+msgstr "Ubicaciones"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+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
+msgid "Moves"
+msgstr "Movimientos"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Ubicación destino"
+
+#. 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"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr "Previsto"
+
+#. 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"
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr "Dividir movimiento"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:92
+#, 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
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr "Dividir en lotes de producción"
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr "Real"
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: stock
+#: 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
+msgid "Upstream traceability"
+msgstr "Trazabilidad hacia arriba"
+
+#. 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"
+
+#. module: stock
+#: code:addons/stock/product.py:388
+#, python-format
+msgid "Produced Qty"
+msgstr "Ctdad producida"
+
+#. 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"
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr "Tipo ubicaciones encadenadas"
+
+#. 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"
+
+#. module: stock
+#: view:stock.location:0
+#: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr "Identificación lote de producción"
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr "Ubicación desecho"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr "Futuro"
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr "Fecha facturado"
+
+#. 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
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr "Salida"
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr "Mantener en un lote"
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr "Precio coste:"
+
+#. 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."
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr "Ubicaciones físicas"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr "Movimiento parcial"
+
+#. 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 "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: "
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 2694dbae647..f6955029f12 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.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:16+0000\n"
-"PO-Revision-Date: 2010-10-30 15:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-11 18:14+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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -47,7 +47,7 @@ msgstr ""
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
-msgstr ""
+msgstr "Tegevus"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -63,7 +63,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr ""
+msgstr "Täna"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
@@ -138,7 +138,7 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:report.stock.move,day:0
 msgid "Day"
-msgstr ""
+msgstr "Päev"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -168,7 +168,7 @@ msgstr "Laopäevik"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "Sissetulev"
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
@@ -2083,8 +2083,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2141,7 +2141,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2848,7 +2848,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3894,6 +3894,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "STOCK_ZOOM_100"
 #~ msgstr "STOCK_ZOOM_100"
 
@@ -3912,10 +3917,6 @@ msgstr ""
 #~ msgid "terp-account"
 #~ msgstr "terp-konto"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Tuleviku laoseis"
-
 #~ msgid "STOCK_QUIT"
 #~ msgstr "STOCK_QUIT"
 
@@ -3970,9 +3971,6 @@ msgstr ""
 #~ msgid "STOCK_CUT"
 #~ msgstr "STOCK_CUT"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Jälgi saabuvaid partiisid"
-
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Tarnete kalender"
 
@@ -4098,9 +4096,6 @@ msgstr ""
 #~ msgid "Dest. Address"
 #~ msgstr "Sihtaadress"
 
-#~ msgid "Qty"
-#~ msgstr "Kogus"
-
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
@@ -4309,9 +4304,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Jälgi väljuvaid partiisid"
-
 #~ msgid "STOCK_FIND"
 #~ msgstr "STOCK_FIND"
 
@@ -4363,9 +4355,6 @@ msgstr ""
 #~ msgid "Add"
 #~ msgstr "Lisa"
 
-#~ msgid "Canceled"
-#~ msgstr "Tühistatud"
-
 #~ msgid "Set Stock to 0"
 #~ msgstr "Määra ladu nulli"
 
@@ -4631,10 +4620,6 @@ msgstr ""
 #~ msgid "Products Received"
 #~ msgstr "Tooted saabunud"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Tooted tulevikus"
-
 #~ msgid "Incoming Products"
 #~ msgstr "Saabuvad tooted"
 
@@ -4713,24 +4698,5 @@ msgstr ""
 #~ msgid "Units"
 #~ msgstr "Ühikud"
 
-#~ msgid "weight"
-#~ msgstr "kaalukus"
-
 #~ msgid "Total :"
 #~ msgstr "Kokku :"
-
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Tulevased tarned"
-
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Tulevased vastuvõtud"
-
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Tulevane kogus"
-
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Tulevased kasumid ja kahjumid"
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index 8be484661c4..1d0d50b89a5 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.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:16+0000\n"
-"PO-Revision-Date: 2011-02-22 08:17+0000\n"
-"Last-Translator: Pekka Pylvänäinen <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -31,7 +31,7 @@ msgstr ""
 #: code:addons/stock/product.py:76
 #, python-format
 msgid "Variation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "Erotustiliä ei ole määritelty tuotegatekorialle %s"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -43,46 +43,46 @@ msgstr "Ketjutettu paikka jos kiinteä"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
-msgstr ""
+msgstr "Laita uuteen pakkaukseen"
 
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Upstream Traceability"
-msgstr ""
+msgstr "Ylävirtauksen seurattavuus"
 
 #. 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 ""
+msgstr "Viimeiset tuote inventaariot"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr ""
+msgstr "Tänään"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr ""
+msgstr "Reviisionumero"
 
 #. module: stock
 #: view:stock.move.memory.in:0
 #: view:stock.move.memory.out:0
 msgid "Product Moves"
-msgstr ""
+msgstr "Tuotesiirrot"
 
 #. 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 ""
+msgstr "Siirtoanalyysi"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -90,6 +90,8 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
+"Sisäinen viitenumero siinä tapauksessa että se eroaa valmistajan "
+"sarjanumerosta"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -98,6 +100,9 @@ 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 ""
+"Jaksottaisia inventointeja käytetään laskemaan saatavilla olevien tuotteiden "
+"määrä kohteittain. Voit käyttää sitä jo vuosi-inventaarion tekoon tai "
+"tarvittaessa korjataksesi tuotteen nykyistä varastomäärää."
 
 #. module: stock
 #: view:stock.picking:0
@@ -134,6 +139,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 ""
+"Tämä on luetteleo kaikista toimitusmääräyksistä jotka on valmisteltava, "
+"myyntitilausten ja logistikkasääntöjen mukaisesti."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -179,13 +186,17 @@ msgid ""
 "value for all products in this category, it can also directly be set on each "
 "product."
 msgstr ""
+"Reaaliaikaista varastonarvon laskentaa tehtäessä, kirjausten vastakirjaukset "
+"kaikille lähteville varastosiirroille merkitään tälle tilille. Tämä on "
+"oletusarvo kaikille tuotteille tässä kategoriassa, se voidaan myös asettaa "
+"suoraan joka tuotteelle."
 
 #. module: stock
 #: code:addons/stock/stock.py:1176
 #: code:addons/stock/stock.py:2378
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr ""
+msgstr "Puuttuu osittainen keräilytieto siirrolle numero %s"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
@@ -207,6 +218,9 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
+"Nykyinen siirtorivi on jo määritelty pakkaukselle, ole hyvä ja poista se "
+"ensin jos sinun todella pitää muuttaa sitä. Numero tuottteelle: \"%s\" (id: "
+"%d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -223,7 +237,7 @@ msgstr "Muu viite tai sarjanumero"
 #: view:stock.picking:0
 #: field:stock.picking,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Lähde"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -233,7 +247,7 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "Pakkauksen tunniste"
 
 #. module: stock
 #: view:stock.move:0
@@ -247,12 +261,12 @@ msgstr "Viite"
 #: code:addons/stock/stock.py:661
 #, python-format
 msgid "Products to Process"
-msgstr ""
+msgstr "Käsiteltävät tuotteet"
 
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Virhe ! Et voi luoda rekursiivisia luokkia."
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -272,7 +286,7 @@ msgstr "Jaa rivit"
 #: code:addons/stock/stock.py:1127
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
-msgstr ""
+msgstr "Et voi peruutta keräilyä koska varastosiirto on valmis tilassa!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2198
@@ -332,7 +346,7 @@ msgstr "Incoterms koodi"
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr ""
+msgstr "Siirrot tähän pakkaukseen"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -369,12 +383,12 @@ msgstr "Todellinen varasto"
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr ""
+msgstr "Viive (päivää)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "Toiminnon seurattavuus "
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -402,7 +416,7 @@ msgstr "Saatavilla"
 #: view:stock.picking:0
 #: field:stock.picking,min_date:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Oletettu päivämäärä"
 
 #. module: stock
 #: view:board.board:0
@@ -419,7 +433,7 @@ msgstr "Luo ja hallitse varastoja ja kiinnitä niille varastopaikat"
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr ""
+msgstr "Saapuva määrä"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:115
@@ -436,7 +450,7 @@ msgstr "Lähtevien paikka"
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr ""
+msgstr "Jaa osiin"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -450,6 +464,9 @@ msgid ""
 "incoming stock moves will be posted in this account. If not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Tehtäessä reaaliaikaista varastonarvon laskentaa tapahtumien vastatili "
+"saapuvien varastosiirtojen osalta laitetaan tälle tilille. Jos ei asetettu "
+"tuotteelle, käytetään käytetyn tuotekategorian tietoja."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -461,7 +478,7 @@ msgstr "Paikan tyyppi"
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr ""
+msgstr "Toimitustyypin määrittely, saapuuko tuotteita vai lähteekö."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -476,7 +493,7 @@ msgstr "Varastosiirron tilastot"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "Tuoteerien suodin"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -492,11 +509,13 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
+"Nykyinen tuotemäärä tällä tuotantoeränumerolla joka on vapaana yirtyksen "
+"varastoissa"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr ""
+msgstr "Siirtohistoria (alatason siirrot)"
 
 #. module: stock
 #: code:addons/stock/stock.py:1984
@@ -541,7 +560,7 @@ msgstr "Tilaus (Lähde)"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr ""
+msgstr "Kokonaissumma:"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
@@ -551,6 +570,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 ""
+"Tässä listassa näet kaikki tuotteet joita asiakkaille on toimitettava. Voit "
+"prosessoida toimitukset suoraan listalta käyttäen joka rivin oikealla "
+"puolella olevia nappeja. Voit suodattaa toimitettavia tuotteita "
+"asiakkaittain, tuotteittain tai myyntitilauksittain (käyttäen lähdekenttää)"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -567,18 +590,18 @@ msgstr "Lisätiedot"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr ""
+msgstr "Sijainti / Tuote"
 
 #. module: stock
 #: code:addons/stock/stock.py:1306
 #, python-format
 msgid "Reception"
-msgstr ""
+msgstr "Vastaanotto"
 
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr ""
+msgstr "Lisäviite"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
@@ -591,6 +614,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Pakottaa määrittelemään tuotantoerän kaikille siirroille jotka sisältävät "
+"tätä tuotetta ja jotka ovat menossa asiakkaalle."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -600,6 +625,10 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"Varastotapahtumajärjestelmä mahdollistaa sinun asettavan joka "
+"varastotapahtumalle luettelon perustuen työntekijän/tiimin tehtävään "
+"toimintoon. Esimerkkejä varastotapahtumista voivat olla laatutarkistus, "
+"keräilylista, pakkaus jne."
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -621,12 +650,12 @@ msgstr "Siirtotiedot"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Lähtevä"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
@@ -639,7 +668,7 @@ msgstr "Pakkaukset"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Erä ei ole samaa tuotetta"
 
 #. module: stock
 #: view:res.partner:0
@@ -649,7 +678,7 @@ msgstr "Myynti ja hankinta"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -680,12 +709,12 @@ msgstr "Varastot"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr ""
+msgstr "Inventaario rivi"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -693,17 +722,19 @@ 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 ""
+"Kun tehdään reaaliaikaista varastonarvon laskentaa, tämä on kirjanpitotili "
+"johon tapahtumat lisätään automaattisesti kun varastosiirtoja käsitellään."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr ""
+msgstr "Prosessoi keräily."
 
 #. module: stock
 #: code:addons/stock/product.py:355
 #, python-format
 msgid "Future Receptions"
-msgstr ""
+msgstr "Tulevat saapumiset"
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -712,11 +743,13 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
+"Valitse tämä vaihtoehto valitaksesi olemassaolevan erän allaolevasta "
+"listasta, muuten sinun tulee syöttää uudet rivi riviltä."
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr ""
+msgstr "Kohteen siirto"
 
 #. module: stock
 #: view:stock.move:0
@@ -742,12 +775,12 @@ msgstr "Saapuvien paikka"
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr ""
+msgstr "Tilauspäivä"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr ""
+msgstr "Jaksottainen (käsin tehty)"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -762,31 +795,31 @@ msgstr "IT-toimittajat"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr ""
+msgstr "Luonnos fyysisitä varastoista"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr ""
+msgstr "Siirtopaikka yritysten välisille siirroille"
 
 #. 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 ""
+msgstr "Muuta tuotteen määrää"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr ""
+msgstr "Yhdistä varastot"
 
 #. module: stock
 #: code:addons/stock/product.py:371
 #, python-format
 msgid "Future P&L"
-msgstr ""
+msgstr "Tulevat P&L"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
@@ -800,7 +833,7 @@ msgstr "Vastaanotot"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Scrap"
-msgstr ""
+msgstr "Hävitä"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -810,12 +843,12 @@ msgstr "Sisältää"
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr ""
+msgstr "Saapuvien tuotteiden viive"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr ""
+msgstr "Varastopaikat"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -827,7 +860,7 @@ msgstr "Yksikköhinta"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines_exist
 msgid "Exist Split lines"
-msgstr ""
+msgstr "Olemassaolevat jakolinjat"
 
 #. module: stock
 #: field:stock.move,date_expected:0
@@ -837,7 +870,7 @@ msgstr "Suunniteltu päivämäärä"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
+msgstr "Etsi pakkaus"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -848,7 +881,7 @@ msgstr "Kiireellinen"
 #: view:stock.picking:0
 #: report:stock.picking.list:0
 msgid "Journal"
-msgstr ""
+msgstr "Loki"
 
 #. module: stock
 #: code:addons/stock/stock.py:1315
@@ -863,16 +896,19 @@ 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 ""
+"Jätä tyhjäksi jos tuotanto tapahtuu samassa paikassa kuin valmiita tuotteita "
+"tarvitaan. Aseta paikka jos tuotanto tapahtuu muualla. Tämä voi olla myös "
+"kumppanin sijainti jos tuotanto tapahtuu alihankintana."
 
 #. module: stock
 #: view:res.partner:0
 msgid "Inventory Properties"
-msgstr ""
+msgstr "Varaston ominaisuudet"
 
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr ""
+msgstr "Toiminnan viive (päivää)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -885,17 +921,20 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
+"Vaihtoehtoinen osoite johon tuotteet toimitetaan, käytetään erityisesti "
+"jaotteluun"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month-1"
-msgstr ""
+msgstr "Kuukausi -1"
 
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
+"Poistamalla tämän valinnan, voit piilottaa sijainnin ilman sen poistamista"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -922,7 +961,7 @@ msgstr "Vasen ylempi"
 #: code:addons/stock/wizard/stock_partial_move.py:132
 #, python-format
 msgid "Delivery Information"
-msgstr ""
+msgstr "Toimitustiedot"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:48
@@ -933,7 +972,7 @@ msgstr ""
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Virhe: Väärä EAN-koodi"
 
 #. module: stock
 #: code:addons/stock/product.py:148
@@ -941,6 +980,7 @@ msgstr ""
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Tälle tuotteelle ei ole määritelty varaston lähtö tiliä \"%s\" (id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -950,7 +990,7 @@ msgstr "Tuotannon paikka"
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr ""
+msgstr "Yhteistyökumppanin osoite"
 
 #. module: stock
 #: model:res.company,overdue_msg:stock.res_company_shop0
@@ -1010,7 +1050,7 @@ msgstr "Tekijä"
 #: code:addons/stock/stock.py:1305
 #, python-format
 msgid "Delivery Order"
-msgstr ""
+msgstr "Toimitusmääräys"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_in
@@ -1026,7 +1066,7 @@ msgstr "Manuaalinen toimenpide"
 #: view:stock.location:0
 #: view:stock.move:0
 msgid "Supplier"
-msgstr ""
+msgstr "Toimittaja"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1041,12 +1081,12 @@ msgstr "Odotettu toimituspäivä"
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Not Available"
-msgstr ""
+msgstr "Ei saatavissa"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
@@ -1054,12 +1094,12 @@ msgstr ""
 #: view:stock.inventory:0
 #: view:stock.inventory.line:0
 msgid "Split inventory lines"
-msgstr ""
+msgstr "Jaa inventaariorivit"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr ""
+msgstr "Fyysinen inventaario"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1067,6 +1107,8 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
+"Yritys jolle ketjutetun siirron sisältävä keräilylista kuuluu (jätä tyhjäksi "
+"käytääksesi oletusyrityksen valintasääntöä)"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1075,11 +1117,14 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
+"Keräilylistan toimitustyyppi joka sisältää ketjutetun siirron (jätä "
+"tyhjäksi, niin tyyppi valitaan automaattisesti lähde ja kohdepaikkojen "
+"mukaan)"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr ""
+msgstr "Eränumero"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
@@ -1097,13 +1142,13 @@ msgstr "Kumppanien paikat"
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Kokonaismäärä"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr ""
+msgstr "Käyttävä siirto"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -1113,12 +1158,12 @@ msgstr "Eurooppalaiset asiakkaat"
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr ""
+msgstr "Viive alkuperäisen siirron ja ketjutetun siirrän välillä"
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr ""
+msgstr "Tuo nykyinen tuotevarasto valitusta paikasta"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1133,7 +1178,7 @@ msgstr ""
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Downstream Traceability"
-msgstr ""
+msgstr "Alavirtauksen seurattavuus"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1142,6 +1187,8 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
+"Tuotteelle käytetään tässä määritettyä varaston lähdepaikkaa oletuksen "
+"asemasta luotaessa varastonsiirtoja tuotantotilauksia varten"
 
 #. module: stock
 #: code:addons/stock/stock.py:1975
@@ -1150,12 +1197,14 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"Ei voitu luoda päiväkirjamerkintää, koska lähtevä tili on määritelty "
+"tuotteelle ja muutos tili tuotekategorialle ovat sama."
 
 #. module: stock
 #: code:addons/stock/stock.py:1322
 #, python-format
 msgid "is in draft state."
-msgstr ""
+msgstr "on luonnostilassa"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1163,6 +1212,8 @@ 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 ""
+"Tämä on lista pakkauksistasi. kun valitset pakkauksen, voit saada ylätason "
+"tai alatason seurattavuuden tuotteilel jotka ovat pakkauksessa."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_final
@@ -1172,18 +1223,18 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
-msgstr ""
+msgstr "Ketjutyyppinen"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "To be refunded/invoiced"
-msgstr ""
+msgstr "Tulee hyvittää/laskuttaa"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr ""
+msgstr "Tehdas 1"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -1197,12 +1248,12 @@ msgstr ""
 #: view:stock.picking:0
 #: view:stock.split.into:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peruuta"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Ready"
-msgstr ""
+msgstr "Valmis"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1212,13 +1263,13 @@ msgstr "Kalenterinäkymä"
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr ""
+msgstr "Lisätietoa"
 
 #. module: stock
 #: code:addons/stock/stock.py:1602
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Toiminto kielletty"
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1230,6 +1281,8 @@ msgstr "Mistä"
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
+"Voit palauttaa vain keräilyjä jotka on vahvistettu, saatavilla tai valmis "
+"tilassa!"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1245,7 +1298,7 @@ msgstr "Tuotantoerän revisiot"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr ""
+msgstr "Sisäinen keräilylista"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -1265,13 +1318,13 @@ msgstr "Jaa"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr ""
+msgstr "Etsi varastokeräilyä"
 
 #. module: stock
 #: code:addons/stock/product.py:93
 #, python-format
 msgid "Company is not specified in Location"
-msgstr ""
+msgstr "Yritystä ei ole määritelty paikassa"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1287,7 +1340,7 @@ msgstr "Yleiset IT-toimittajat"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Keräilylista:"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -1295,7 +1348,7 @@ msgstr ""
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
@@ -1305,7 +1358,7 @@ msgstr "Varastorivin koodi"
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr ""
+msgstr "Asiakkaan tai toimittajan osoite"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1324,24 +1377,24 @@ msgstr "Asiakkaan paikka"
 #: code:addons/stock/wizard/stock_partial_move.py:85
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Virheellinen toiminto!"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:139
 #, python-format
 msgid "Receive Information"
-msgstr ""
+msgstr "Vastaanottotiedot"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "Paikan varastotietojen yhteenveto"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement
 msgid "Stock Replacement"
-msgstr ""
+msgstr "Varaston korvaaminen"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1362,7 +1415,7 @@ msgstr "Lähtevien seuranta"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "No Invoices were created"
-msgstr ""
+msgstr "Laskuja ei luotu"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -1373,20 +1426,22 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_move.py:140
 #, python-format
 msgid "Receive"
-msgstr ""
+msgstr "Vastaanota"
 
 #. module: stock
 #: help:stock.incoterms,active:0
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
+"Poistamalla valinnan aktiivisesta kentästä, voit piilottaa INCOTERM "
+"lausekkeen poistamatta sitä."
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 #: field:stock.picking,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Tilauksen päivämäärä"
 
 #. module: stock
 #: field:stock.location,location_id:0
@@ -1408,18 +1463,18 @@ msgstr ""
 #. module: stock
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
-msgstr ""
+msgstr "Jätä kenttä tyhjäksi, jos paikka on jaettu kaikkien yritysten kesken"
 
 #. module: stock
 #: code:addons/stock/stock.py:2198
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr ""
+msgstr "Ole hyvä ja määrittele positiivinen määrä romutettavaksi!"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr ""
+msgstr "Ketjutuksen odotusaika"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:85
@@ -1454,7 +1509,7 @@ msgstr "Toimittajien paikat"
 #: code:addons/stock/stock.py:2217
 #, python-format
 msgid "were scrapped"
-msgstr ""
+msgstr "hävitettiin"
 
 #. module: stock
 #: view:stock.move:0
@@ -1465,7 +1520,7 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: stock
 #: help:stock.picking,backorder_id:0
@@ -1473,22 +1528,24 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
+"Jos tämä keräily jaettiin tämä kenttä linkittää keräilyyn joka sisältää "
+"toisen osan joka on jo käsitelty"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr ""
+msgstr "Varaston tilastot"
 
 #. module: stock
 #: field:stock.move.memory.in,currency:0
 #: field:stock.move.memory.out,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuutta"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "Seuraa valmistuseriä"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
@@ -1496,6 +1553,7 @@ msgstr ""
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
 msgstr ""
+"Ole hyvä ja valitse useita fyysisiä varastoja yhdistääksesi ne listanäkymässä"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1524,7 +1582,7 @@ msgstr "Peru saatavuus"
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "Siirron suunniteltu päivämäärä"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
@@ -1534,17 +1592,17 @@ msgstr "Luodut siirrot"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "Hylly 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr ""
+msgstr "Seurantaerä"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Jälkitilaukset"
 
 #. module: stock
 #: view:product.product:0
@@ -1555,12 +1613,12 @@ msgstr "Vastaavat paikkatiedot"
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr ""
+msgstr "Lokalisointi"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "Varastoraportti seurantaerittäin"
 
 #. module: stock
 #: code:addons/stock/product.py:367
@@ -1573,12 +1631,12 @@ msgstr "Toimitettu määrä"
 #: view:stock.inventory.line.split:0
 #: view:stock.move.split:0
 msgid "Split in lots"
-msgstr ""
+msgstr "Jaa eriin"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr ""
+msgstr "Tuotantoerien numerot"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1600,7 +1658,7 @@ msgstr "Päivämäärä"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Laajennetut Suotimet..."
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
@@ -1616,12 +1674,12 @@ msgstr "Yhdistäminen on sallittu vain luonnosinventoinneille."
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr ""
+msgstr "Työpöytä"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_track
 msgid "Track moves"
-msgstr ""
+msgstr "Seuraa siirtoja"
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -1631,13 +1689,13 @@ msgstr "Koodi"
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr ""
+msgstr "Erän numero"
 
 #. 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 "Varaston työpöytä"
 
 #. module: stock
 #: code:addons/stock/stock.py:510
@@ -1651,13 +1709,13 @@ msgstr "Eräriviä ei voida poistaa!"
 #: view:stock.move.scrap:0
 #: view:stock.picking:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Romuta tuotteet"
 
 #. module: stock
 #: code:addons/stock/stock.py:1135
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr ""
+msgstr "Et voi poistaa keräilyä joka on %s tilassa !"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -1672,7 +1730,7 @@ msgstr "Peruuta"
 #: 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 "Palauta keräily"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1708,7 +1766,7 @@ msgstr "Tiedot"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "Toimitusosoite :"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:120
@@ -1727,18 +1785,18 @@ msgstr ""
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Kustannushinta"
 
 #. module: stock
 #: view:product.product:0
 #: field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr ""
+msgstr "Varastonarvostus"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Luo lasku"
 
 #. module: stock
 #: view:stock.move:0
@@ -1766,6 +1824,8 @@ 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 ""
+"Tekninen kenttä jota käytetään tallentamaan tuotteen kustannushinta jonka "
+"käyttäjä syötti keräilyvahvistuksessa (kun keskihinta menetelemää käytetään)"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1778,17 +1838,17 @@ msgstr ""
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr ""
+msgstr "Suunniteltu läpimenoaika (päivää)"
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr ""
+msgstr "Hinta"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr ""
+msgstr "Hae varastosta"
 
 #. module: stock
 #: field:stock.move.track,quantity:0
@@ -1802,6 +1862,8 @@ msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Varaston tulevan tilin tietoja ei ole määritelty tuotteelle tai sen "
+"kategorialle \"%s\" (id: %d)"
 
 #. module: stock
 #: code:addons/stock/product.py:357
@@ -1812,7 +1874,7 @@ msgstr "Vastaanotettu määrä"
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Sisäinen viite"
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -1820,13 +1882,15 @@ msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
 msgstr ""
+"Vaihtoehtoinen etuliite kun näytetään tämä sarjanumero: 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 "Tuo varasto"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1872,21 +1936,23 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
+"Tuotteelle käytetään tässä määritettyä varaston lähdepaikkaa oletuksen "
+"asemasta luotaessa inventointitilanteessa"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr ""
+msgstr "Varastoitava"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr ""
+msgstr "Reaaliaikainen (autom.)"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr ""
+msgstr "Logistinen lähetysyksikkö: lava, laatikko, pakkaus ..."
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -1911,7 +1977,7 @@ msgstr "Inventaarion paikka"
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total value"
-msgstr ""
+msgstr "Kokonaisarvo"
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -1919,23 +1985,25 @@ 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 ""
+"Varasto päiväkirja johon ketjutettu siirto kirjoitetaan, jos ketjutyyppi ei "
+"ole läpinäkyvä (ei merkintää jos tyhjä)"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_incoming_product_board
 msgid "Incoming Product"
-msgstr ""
+msgstr "Saapuva tuote"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr ""
+msgstr "Luonti"
 
 #. module: stock
 #: field:stock.move.memory.in,cost:0
 #: field:stock.move.memory.out,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Kustannus"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
@@ -1953,7 +2021,7 @@ msgstr "Varastonhallinta"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Osatoimitus"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1971,11 +2039,13 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Siirtopäivä: aikataulutetu päivä kunnes siirto on tehty, senjälkeen oikea "
+"siirtopäivä."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
 msgid "Latest Inventory Date"
-msgstr ""
+msgstr "Viimeisin inventointipäivä"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1985,7 +2055,7 @@ msgstr ""
 #: view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: stock
 #: view:stock.location:0
@@ -2001,19 +2071,19 @@ msgstr "Varastohävikki"
 #: code:addons/stock/stock.py:1314
 #, python-format
 msgid "Document"
-msgstr ""
+msgstr "Dokumentti"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr ""
+msgstr "Syötä keräilylista"
 
 #. module: stock
 #: field:stock.move,product_uom:0
 #: field:stock.move.memory.in,product_uom:0
 #: field:stock.move.memory.out,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Mittayksikkö"
 
 #. module: stock
 #: code:addons/stock/product.py:176
@@ -2027,6 +2097,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
+"Paikottaa määrittelemään tuotantoerän kaikille tämän tuotteen siirroille ja "
+"jotka on luotu valmistustilauksesta"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
@@ -2037,50 +2109,50 @@ msgstr "Seuraa siirtoa"
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr ""
+msgstr "Päivitä"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Aseta luonnokseksi"
 
 #. 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 ""
+msgstr "varastopäiväkirjat"
 
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr ""
+msgstr "Muut"
 
 #. module: stock
 #: code:addons/stock/product.py:90
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
-msgstr ""
+msgstr "Ei löytynyt eroa standardihinnan ja uuden hinnan väliltä"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Osittainen keräily"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr ""
+msgstr "Romutettu"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr ""
+msgstr "Tuotteet "
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr ""
+msgstr "Seuraa saapuvia eriä"
 
 #. module: stock
 #: view:board.board:0
@@ -2091,11 +2163,11 @@ msgstr "Varastohallinnan työpöytä"
 #: code:addons/stock/product.py:377
 #, python-format
 msgid "Future Qty"
-msgstr ""
+msgstr "Tuleva määrä"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2137,7 +2209,7 @@ msgstr "Tuotteet"
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
-msgstr ""
+msgstr "Muuta hinta"
 
 #. module: stock
 #: field:stock.picking,move_type:0
@@ -2149,14 +2221,16 @@ msgstr "Toimitustapa"
 #: 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 "Paikka jonne järjestelmä varastoi valmiit tuotteet."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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 ""
+"Jos reaaliaikainen varastonarvostus on päällä tuotteella, tätä tiliä "
+"käytetään tuotteen nykyarvon tallentamiseen"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2176,18 +2250,18 @@ msgstr "Varastonsiirto"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Viive(päivää)"
 
 #. module: stock
 #: field:stock.move.memory.in,move_id:0
 #: field:stock.move.memory.out,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Siirrä"
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr ""
+msgstr "Odotettu keräilyn toteutumispäivä"
 
 #. module: stock
 #: code:addons/stock/product.py:373
@@ -2204,7 +2278,7 @@ msgstr "Revisiot"
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr ""
+msgstr "Tämä toiminto peruutta lähetyksen. Haluatko jatkaa?"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2249,13 +2323,13 @@ msgstr ""
 #. module: stock
 #: view:stock.invoice.onshipping:0
 msgid "Create"
-msgstr ""
+msgstr "Luo"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Dates"
-msgstr ""
+msgstr "Päivämäärät"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2265,7 +2339,7 @@ msgstr "Prioriteetti"
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr ""
+msgstr "Lähde"
 
 #. module: stock
 #: code:addons/stock/stock.py:2557
@@ -2281,13 +2355,14 @@ msgstr "Inventaario"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Keräilylista"
 
 #. module: stock
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
+"Sarjanumeron ja sisäisen viitenumeron yhdistelmän on oltava uniikki !"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups
@@ -2303,7 +2378,7 @@ msgstr "Peruuta inventaario"
 #: field:stock.move.split.lines,name:0
 #: field:stock.move.split.lines.exist,name:0
 msgid "Tracking serial"
-msgstr ""
+msgstr "Seuranta sarjanumero"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
@@ -2316,13 +2391,13 @@ msgstr "Virhe!"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement_result
 msgid "Stock Replacement result"
-msgstr ""
+msgstr "Varaston korvauksen lopputulos"
 
 #. 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 ""
+msgstr "MIttayksiköt"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2332,12 +2407,12 @@ msgstr "Kiinteä paikka"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr ""
+msgstr "Kulutustavara"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2351,7 +2426,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
-msgstr ""
+msgstr "Varastotasojen ennuste"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
@@ -2378,7 +2453,7 @@ msgstr "Maxtor toimittajat"
 #: code:addons/stock/wizard/stock_change_standard_price.py:106
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr ""
+msgstr "Aktiivista ID:tä ei ole asetettu kontekstissä"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2389,7 +2464,7 @@ msgstr "Pakota saatavuus"
 #: model:ir.actions.act_window,name:stock.move_scrap
 #: view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr ""
+msgstr "Hävitä siirto"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:138
@@ -2416,29 +2491,31 @@ msgstr "Näytä tuotteiden varasto"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking list"
-msgstr ""
+msgstr "Sisäinen keräilylista"
 
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr ""
+msgstr "Valmistumispäivä"
 
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "Uniikki tuotantoerä, näytetään muodossa: PREFIX/SERIAL [INT_REF]"
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
+"Poistamalla valinnan aktiivisesta kentästä, voit piilotaa pakkauksen "
+"poistamatta sitä"
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -2453,7 +2530,7 @@ msgstr "Tavaraluettelot"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr ""
+msgstr "Tehtävät"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2469,13 +2546,13 @@ msgstr ""
 #: field:stock.production.lot.revision,company_id:0
 #: field:stock.warehouse,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr ""
+msgstr "Mittayksikkö"
 
 #. module: stock
 #: code:addons/stock/product.py:122
@@ -2483,12 +2560,13 @@ msgstr ""
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Tälle tuotteelle ei ole määritelty varaston tulojen tiliä: \"%s\" (id:%d)"
 
 #. module: stock
 #: code:addons/stock/stock.py:2302
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
-msgstr ""
+msgstr "Ei voi käyttää siirtoa jossa on määränä negatiivinen arvo tai 0 !"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2505,6 +2583,8 @@ msgstr "Täytä varastolista"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa "
+"kategoriassa."
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -2533,7 +2613,7 @@ msgstr "Erä"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr ""
+msgstr "Tuotantoerän numero"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2555,7 +2635,7 @@ msgstr "Aseta saataville"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr ""
+msgstr "Kontaktiosoite:"
 
 #. module: stock
 #: field:stock.move,backorder_id:0
@@ -2572,7 +2652,7 @@ msgstr "Aktiivinen"
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 msgid "Inventory Management"
-msgstr ""
+msgstr "Varastonhallinta"
 
 #. module: stock
 #: view:product.template:0
@@ -2597,7 +2677,7 @@ msgstr "INCOTERMS"
 #: report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
 msgid "Total:"
-msgstr ""
+msgstr "Summa:"
 
 #. module: stock
 #: help:stock.incoterms,name:0
@@ -2606,6 +2686,8 @@ msgid ""
 "costs and responsibilities between buyer and seller and reflect state-of-the-"
 "art transportation practices."
 msgstr ""
+"Incoterm lausekkeet ovat myynnin sopimuslausekkeita. Niitä käytetään "
+"määrittämään kulujen ja vastuiden jakaminen myyjän ja ostajan kesken."
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -2613,6 +2695,7 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
+"Jos valittu, tuotteet jotka ovat alatason paikoissa otetaan myös mukaan."
 
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
@@ -2622,18 +2705,18 @@ msgstr "Seurannan etuliite"
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "Varaston viite"
 
 #. module: stock
 #: code:addons/stock/stock.py:1307
 #, python-format
 msgid "Internal picking"
-msgstr ""
+msgstr "Sisäinen keräily"
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Avaa tuote"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2644,7 +2727,7 @@ msgstr "päättyen"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process"
-msgstr ""
+msgstr "Prosessi"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -2674,7 +2757,7 @@ msgstr "Varaston kirjanpidon ominaisuudet"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr ""
+msgstr "Asiakkaan pakkaukset"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -2693,7 +2776,7 @@ msgstr "Valmis"
 #: model:ir.model,name:stock.model_stock_change_standard_price
 #: view:stock.change.standard.price:0
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Muuta standardihintaa"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
@@ -2725,7 +2808,7 @@ msgstr "Ei kiireellinen"
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
-msgstr ""
+msgstr "Tehtävät"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -2736,7 +2819,7 @@ msgstr "Varastot"
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: stock
 #: field:stock.move,returned_price:0
@@ -2748,7 +2831,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Varaston analyysi"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -2792,14 +2875,14 @@ msgstr "Tuote"
 #: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "Invoicing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: stock
 #: code:addons/stock/stock.py:2237
 #: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Please provide Proper Quantity !"
-msgstr ""
+msgstr "Ole hyvä ja syötä oikeanalinen määrä!"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -2814,19 +2897,19 @@ msgstr "Korkeus (Z)"
 #. module: stock
 #: field:stock.ups,weight:0
 msgid "Lot weight"
-msgstr ""
+msgstr "Erän paino"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Käytä tuotteet"
 
 #. module: stock
 #: code:addons/stock/stock.py:1646
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr ""
+msgstr "Erässä ei tarpeeksi tuotteita !"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -2836,7 +2919,7 @@ msgstr "Oikea ylempi"
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Osoite"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2858,23 +2941,23 @@ msgstr "Toimittajat"
 #: field:report.stock.inventory,value:0
 #: field:report.stock.move,value:0
 msgid "Total Value"
-msgstr ""
+msgstr "Kokonaisarvo"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr ""
+msgstr "Tuotteet Kategorioittain"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
-msgstr ""
+msgid "Product Categories"
+msgstr "Tuotteiden Kategoriat"
 
 #. module: stock
 #: field:stock.move.memory.in,wizard_id:0
 #: field:stock.move.memory.out,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Velho"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -2885,12 +2968,12 @@ msgstr "Tuotteet paikoittain"
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr ""
+msgstr "Ota alataso mukaan"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr ""
+msgstr "Hylly 1"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -2906,12 +2989,12 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr ""
+msgstr "Tilaus"
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr ""
+msgstr "Pakkausviite"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2928,17 +3011,17 @@ msgstr "Kirjanpidon merkinnät"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Yhteensä"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr ""
+msgstr "Sisäiset toimitukset"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr ""
+msgstr "Ota käyttöön viittaava tili"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -2956,12 +3039,12 @@ msgstr "Erät"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "New pack"
-msgstr ""
+msgstr "Uusi pakkaus"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr ""
+msgstr "Vastaanottaja"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -2975,17 +3058,19 @@ msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
+"Määriä, yksiköitä, tuotteita ja paikkoja ei voida muuttaa varastosiirroissa "
+"jotka on jo käsitelty (paitsi pääkäyttäjä)"
 
 #. module: stock
 #: code:addons/stock/product.py:383
 #, python-format
 msgid "Future Productions"
-msgstr ""
+msgstr "Tulevat tuotannot"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Laskutettavaa"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:120
@@ -3002,17 +3087,17 @@ msgstr "Tavaraluetteloiden pvm."
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total incoming quantity"
-msgstr ""
+msgstr "Saapuva määrä yhteensä"
 
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr ""
+msgstr "Lähtevä määrä"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr ""
+msgstr "Siirtoja tälle tuotantoerälle"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_out
@@ -3029,7 +3114,7 @@ msgstr "Viesti!"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in current pack"
-msgstr ""
+msgstr "Laita nykyiseen pakkaukseen"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3039,12 +3124,12 @@ msgstr "Erän tavaraluettelo"
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr ""
+msgstr "Syy"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order:"
-msgstr ""
+msgstr "Toimitusmääräin:"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3111,6 +3196,7 @@ msgid ""
 "There is no inventory variation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Tuotekategorialle \"%s\" (id: %d) ei ole määritelty varastoneron tiliä."
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -3124,23 +3210,23 @@ msgstr "Haluatko yhdistää nämä tavaraluettelot?"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Peruttu"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Picking"
-msgstr ""
+msgstr "Keräily"
 
 #. module: stock
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
-msgstr ""
+msgstr "Määrittelee kerralla toimitettavat tai suoratoimitettavat tuotteet"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr ""
+msgstr "Tämä keräilylistä ei vaadi laskutusta."
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3176,7 +3262,7 @@ msgstr "Varoitus"
 #: code:addons/stock/stock.py:2557
 #, python-format
 msgid "is done."
-msgstr ""
+msgstr "on tehty."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
@@ -3211,7 +3297,7 @@ msgstr "Vahvista"
 #. module: stock
 #: help:stock.location,icon:0
 msgid "Icon show in  hierarchical tree view"
-msgstr ""
+msgstr "Näytä kuvake hierarkisessa puunäkymässä"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
@@ -3222,18 +3308,20 @@ msgstr "Yhdistä tavaraluettelot"
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Tämä määrä on määritelty tuotteen oletusmittayksikössä"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Vastaanotto:"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
+"Valitse tämä mahdollistaaksesi romutettujen/vioittuneiden tuotteiden "
+"laittamisen paikkaan."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3243,18 +3331,18 @@ msgstr "Liittyvä keräily"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr ""
+msgstr "Lähtevä määrä yhteensä"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "Jälkitilaus"
 
 #. module: stock
 #: help:stock.move.memory.in,cost:0
 #: help:stock.move.memory.out,cost:0
 msgid "Unit Cost for this product line"
-msgstr ""
+msgstr "Yksikkökustannus tälle tuotelinjalle"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
@@ -3263,7 +3351,7 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Tuotteen kategoria"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
@@ -3285,7 +3373,7 @@ msgstr ""
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to leave in the current pack"
-msgstr ""
+msgstr "Määrä joka jätetään nykyiseen pakkaukseen"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3302,7 +3390,7 @@ msgstr "Konfiguraatio"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Olemassaolevat erät"
 
 #. module: stock
 #: field:product.product,location_id:0
@@ -3323,13 +3411,13 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr ""
+msgstr "Ketjupäiväkirja"
 
 #. module: stock
 #: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Ei tarpeeksi varstoa, ei voida varata tuotteita"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -3340,7 +3428,7 @@ msgstr "Asiakkaat"
 #: code:addons/stock/stock.py:1320
 #, python-format
 msgid "is cancelled."
-msgstr ""
+msgstr "on peruutettu."
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -3351,30 +3439,30 @@ msgstr "Varaston inventaarion rivit"
 #: code:addons/stock/wizard/stock_partial_picking.py:74
 #, python-format
 msgid "Process Document"
-msgstr ""
+msgstr "Prosessoi dokumentti"
 
 #. module: stock
 #: code:addons/stock/product.py:365
 #, python-format
 msgid "Future Deliveries"
-msgstr ""
+msgstr "Tulevat toimitukset"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr ""
+msgstr "Lisätietoja"
 
 #. module: stock
 #: view:stock.move:0
 #: field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr ""
+msgstr "Paketti"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Date Expected"
-msgstr ""
+msgstr "Odotettu päivä"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3393,17 +3481,17 @@ msgstr "Automaattinen hyväksyntä"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Weight"
-msgstr ""
+msgstr "Paino"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Tuotemalli"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -3421,12 +3509,12 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr ""
+msgstr "Palauta tuotteet"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "Tarkista varasto"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3448,27 +3536,27 @@ msgstr "Laskutettu"
 #. module: stock
 #: field:stock.move,address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "Määränpään osoite"
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr ""
+msgstr "Viimeinen odotettu päivä"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr ""
+msgstr "Automaattikeräily"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr ""
+msgstr "Tehdas 2"
 
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -3493,7 +3581,7 @@ msgstr "Luonnos"
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Varastonarvo"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3508,18 +3596,18 @@ msgstr ""
 #. module: stock
 #: view:board.board:0
 msgid "Outgoing Products Delay"
-msgstr ""
+msgstr "Lähtevien tuotteiden viive"
 
 #. module: stock
 #: field:stock.move.split.lines,use_exist:0
 msgid "Existing Lot"
-msgstr ""
+msgstr "Olemassaoleva erä"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr ""
+msgstr "Ole hyvä ja määrittele ainakin yksi ei-nolla arvoinen määrä!"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3527,40 +3615,42 @@ 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 ""
+"Tuotteelle käytetään tässä määritettyä varaston lähdepaikkaa oletuksen "
+"asemasta luotaessa varastonsiirtoja hankintoja varten"
 
 #. module: stock
 #: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
-msgstr ""
+msgstr "On valmis prosessoitavaksi"
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr ""
+msgstr "Viite dokumenttiin joka loi tämän keräilyn"
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
 msgid "Set to zero"
-msgstr ""
+msgstr "Aseta nollaksi"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:85
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr ""
+msgstr "Mikään näistä keräilylistoista ei vaadi laskutusta"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: stock
 #: code:addons/stock/product.py:101
 #: code:addons/stock/stock.py:1987
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Tuotekategorialle \"%s\" (id: %d) ei ole määritelty päiväkirjaa."
 
 #. module: stock
 #: code:addons/stock/product.py:379
@@ -3571,7 +3661,7 @@ msgstr "Ei suunniteltu määrä"
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr ""
+msgstr "Ketjutettu yritys"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3581,7 +3671,7 @@ msgstr "Tarkista saatavuus"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3598,13 +3688,13 @@ msgstr "Tulevat varastonsiirrot"
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr ""
+msgstr "Siirtohistoria (ylätason siirrot)"
 
 #. module: stock
 #: code:addons/stock/product.py:361
 #, python-format
 msgid "Future Stock"
-msgstr ""
+msgstr "Tuleva varasto"
 
 #. module: stock
 #: code:addons/stock/stock.py:510
@@ -3618,12 +3708,12 @@ msgstr "Virhe"
 #. module: stock
 #: field:stock.ups.final,xmlfile:0
 msgid "XML File"
-msgstr ""
+msgstr "XML tiedosto"
 
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Valitse määrä"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3659,7 +3749,7 @@ msgstr "Seuranta"
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr ""
+msgstr "Laskutettava"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -3676,7 +3766,7 @@ msgstr "Yleistiedot"
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Etuliite"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3706,7 +3796,7 @@ msgstr "Kohdepaikka"
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr ""
+msgstr "Määrittelee pakkauksen tiedot kuten tyyppi, määrä jne."
 
 #. module: stock
 #: code:addons/stock/stock.py:2386
@@ -3723,12 +3813,12 @@ msgstr ""
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr ""
+msgstr "Oletettu"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -3740,7 +3830,7 @@ msgstr "Tuotanto"
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr ""
+msgstr "Jaa siirto"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:97
@@ -3749,16 +3839,18 @@ msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
+"Palautettavia tuotteita ei ole (vain rivit valmis tilassa joita ei ole vielä "
+"kokonaan palautettu voidaan palauttaa)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Jaa valmistuseriin"
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr ""
+msgstr "Todellinen"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3770,13 +3862,13 @@ msgstr "Kuvaus"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:133
 #, python-format
 msgid "Deliver"
-msgstr ""
+msgstr "Toimita"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -3795,7 +3887,7 @@ msgstr "Tulevien seuranta"
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr ""
+msgstr "Paikan sisältö"
 
 #. module: stock
 #: code:addons/stock/product.py:385
@@ -3830,34 +3922,34 @@ msgstr "Asiakas"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr ""
+msgstr "Tuotantoerän tunnus"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
 #: view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr ""
+msgstr "Romuta paikka"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 msgid "Future"
-msgstr ""
+msgstr "Tulevaisuudessa"
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
 msgid "Invoiced date"
-msgstr ""
+msgstr "Laskutuspäivä"
 
 #. module: stock
 #: code:addons/stock/stock.py:729
@@ -3868,7 +3960,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varoitus !"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -3878,23 +3970,23 @@ msgstr "Lähtevä"
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
-msgstr ""
+msgstr "Pidä yhdessä erässä"
 
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price:"
-msgstr ""
+msgstr "Hankintahinta:"
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Vaihtoehtoinen: seuraava varastonsiirto kun ketjutetaan"
 
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,year:0
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
@@ -3904,7 +3996,7 @@ msgstr "Aineelliset paikat"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move"
-msgstr ""
+msgstr "Osasiirto"
 
 #. module: stock
 #: help:stock.location,posx:0
@@ -3913,6 +4005,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Stock Management"
 #~ msgstr "Varastonhallinta"
 
@@ -3958,14 +4055,6 @@ msgstr ""
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Pakota käyttämään tuotantoerää vastaanotossa"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Näennäinen tuotanto"
-
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Näennäiset vastaanotot"
-
 #~ msgid "STOCK_NEW"
 #~ msgstr "STOCK_NEW"
 
@@ -4077,9 +4166,6 @@ msgstr ""
 #~ msgid "STOCK_ZOOM_FIT"
 #~ msgstr "STOCK_ZOOM_FIT"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Saapuvien erien seuranta"
-
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Toimituskalenteri"
 
@@ -4135,10 +4221,6 @@ msgstr ""
 #~ msgid "terp-stock"
 #~ msgstr "terp-stock"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Näennäiset toimitukset"
-
 #~ msgid "Packing List:"
 #~ msgstr "Pakkauslista:"
 
@@ -4244,9 +4326,6 @@ msgstr ""
 #~ msgid "terp-crm"
 #~ msgstr "terp-crm"
 
-#~ msgid "Qty"
-#~ msgstr "Määrä"
-
 #~ msgid "STOCK_SPELL_CHECK"
 #~ msgstr "STOCK_SPELL_CHECK"
 
@@ -4280,10 +4359,6 @@ msgstr ""
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Näennäinen määrä"
-
 #, python-format
 #~ msgid "Invoice is already created."
 #~ msgstr "Lasku on jo luotu."
@@ -4491,9 +4566,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Seuraa lähteviä eriä"
-
 #~ msgid "STOCK_FIND"
 #~ msgstr "STOCK_FIND"
 
@@ -4569,9 +4641,6 @@ msgstr ""
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Peruttu"
-
 #~ msgid "STOCK_JUSTIFY_CENTER"
 #~ msgstr "STOCK_JUSTIFY_CENTER"
 
@@ -4596,10 +4665,6 @@ msgstr ""
 #~ msgid "Localisation"
 #~ msgstr "Paikallistaminen"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Näennäinen P&L"
-
 #~ msgid "Split in Two"
 #~ msgstr "Jaa kahteen"
 
@@ -4703,10 +4768,6 @@ msgstr ""
 #~ msgid "New Periodical Inventory"
 #~ msgstr "Uusi jaksoittainen inventaario"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Näennäinen varasto"
-
 #~ msgid ""
 #~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
 #~ "structured stock locations.\n"
@@ -4750,3 +4811,25 @@ msgstr ""
 
 #~ msgid "Location Overview"
 #~ msgstr "Paikan yleiskuva"
+
+#, python-format
+#~ msgid "is consumed with"
+#~ msgstr "On käytetty tämän kanssa"
+
+#, python-format
+#~ msgid "Product "
+#~ msgstr "Tuote "
+
+#~ msgid "Stock Variation Account"
+#~ msgstr "Varastomuutoksen tili"
+
+#~ msgid "Products Categories"
+#~ msgstr "Tuotteiden Kategoriat"
+
+#, python-format
+#~ msgid "is scheduled"
+#~ msgstr "on aikataulutettu"
+
+#, python-format
+#~ msgid "quantity."
+#~ msgstr "määrä"
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 71969bde6f5..92d99777e8e 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-05-21 12:15+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: hedererjs <hedererjs@asperience.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: 2011-05-22 04:47+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
@@ -178,7 +178,7 @@ msgid "UoM"
 msgstr "UdM"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:104
+#: code:addons/stock/wizard/stock_change_product_qty.py:90
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 #, python-format
@@ -211,15 +211,15 @@ msgstr ""
 "pouvez également l'indiquer directement sur chaque produit."
 
 #. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2415
+#: code:addons/stock/stock.py:1176
+#: code:addons/stock/stock.py:2378
 #, python-format
 msgid "Missing partial picking data for move #%s"
 msgstr ""
 "Données manquantes sur la préparation partielle pour le mouvement #%s"
 
 #. module: stock
-#: model:ir.actions.server,name:stock.action_partial_move_server
+#: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
 msgstr "Livrer/recevoir des produits"
 
@@ -278,8 +278,7 @@ msgid "Reference"
 msgstr "Référence"
 
 #. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
+#: code:addons/stock/stock.py:661
 #, python-format
 msgid "Products to Process"
 msgstr "Produits à traiter"
@@ -304,7 +303,7 @@ msgid "Split lines"
 msgstr "Eclater les lignes"
 
 #. module: stock
-#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1127
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
@@ -312,10 +311,9 @@ msgstr ""
 "est à l'état \"Terminé\" !"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
-#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/stock.py:2198
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Warning!"
 msgstr "Attention !"
@@ -345,7 +343,7 @@ msgid "Currency in which Unit cost is expressed"
 msgstr "Devise dans laquelle est exprimée le coût unitaire"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "No invoicing"
 msgstr "Pas de facturation"
@@ -461,7 +459,7 @@ msgid "In Qty"
 msgstr "Qté entrante"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "No product in this location."
 msgstr "Aucun produit dans cet emplacement."
@@ -545,7 +543,7 @@ msgid "Move History (child moves)"
 msgstr "Historique des mouvements (mouvements enfant)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:1984
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
@@ -567,7 +565,7 @@ msgid "Destination Location"
 msgstr "Emplacement de destination"
 
 #. module: stock
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
 msgstr ""
@@ -622,7 +620,7 @@ msgid "Location / Product"
 msgstr "Emplacement / Produit"
 
 #. module: stock
-#: code:addons/stock/stock.py:1303
+#: code:addons/stock/stock.py:1306
 #, python-format
 msgid "Reception"
 msgstr "Réception"
@@ -674,7 +672,7 @@ msgstr "Inventaire comptabilisé"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Move Information"
-msgstr "Information sur le Mouvement"
+msgstr "Information sur le mouvement"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -733,7 +731,7 @@ msgstr "Destinataire"
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr "Structure de l'emplacement"
+msgstr "Structure des emplacements"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -760,7 +758,7 @@ msgid "Process Picking"
 msgstr "Traiter le transfert"
 
 #. module: stock
-#: code:addons/stock/product.py:358
+#: code:addons/stock/product.py:355
 #, python-format
 msgid "Future Receptions"
 msgstr "Réceptions à venir"
@@ -847,7 +845,7 @@ msgid "Merge Inventory"
 msgstr "Fusionner les inventaires"
 
 #. module: stock
-#: code:addons/stock/product.py:374
+#: code:addons/stock/product.py:371
 #, python-format
 msgid "Future P&L"
 msgstr "P&L future"
@@ -1103,10 +1101,11 @@ msgstr ""
 "* \"Inventaire\": emplacement virtuel servant de contrepartie aux mouvements "
 "servant à corriger les niveaux des stocks lors des inventaires physiques\n"
 "                       \n"
-"* \"Besoin\" : emplacement virtuel servant de contrepartie temporaire pour "
-"les besoins de stock lorsque l'emplacement d'origine (fournisseur ou "
-"production interne) n'est pas connu à l'avance. Cet emplacement est "
-"normalement vide lorsque le planificateur termine son exécution\n"
+"* \"Approvisionnement\" : emplacement virtuel servant de contrepartie "
+"temporaire pour les besoins de stock lorsque l'emplacement d'origine "
+"(fournisseur ou production interne) n'est pas connu à l'avance. Cet "
+"emplacement est normalement vide lorsque le planificateur termine son "
+"exécution\n"
 "                       \n"
 "* \"Fabrication\" : emplacement virtuel servant de contrepartie pour les "
 "opérations de fabrication : les matières premières y sont consommées et les "
@@ -1119,7 +1118,7 @@ msgid "Author"
 msgstr "Auteur"
 
 #. module: stock
-#: code:addons/stock/stock.py:1302
+#: code:addons/stock/stock.py:1305
 #, python-format
 msgid "Delivery Order"
 msgstr "Bon de livraison"
@@ -1265,7 +1264,7 @@ msgstr ""
 "mouvements de stock générés par les ordres de fabrication."
 
 #. module: stock
-#: code:addons/stock/stock.py:2006
+#: code:addons/stock/stock.py:1975
 #, python-format
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
@@ -1276,7 +1275,7 @@ msgstr ""
 "mêmes."
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: code:addons/stock/stock.py:1322
 #, python-format
 msgid "is in draft state."
 msgstr "est à l'état 'Brouillon'."
@@ -1302,7 +1301,7 @@ msgid "Chaining Type"
 msgstr "Type de chainage"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "To be refunded/invoiced"
 msgstr "A rembourser / facturer."
@@ -1342,7 +1341,7 @@ msgid "Additional Info"
 msgstr "Informations complémentaires."
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1602
 #, python-format
 msgid "Operation forbidden"
 msgstr "Opération interdite"
@@ -1353,7 +1352,7 @@ msgid "From"
 msgstr "Depuis"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:77
+#: code:addons/stock/wizard/stock_return_picking.py:79
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1483,13 +1482,12 @@ msgid "None"
 msgstr "Aucun"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action3
 #: view:stock.tracking:0
 msgid "Downstream traceability"
-msgstr "Traçabilté aval"
+msgstr "Traçabilité aval"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "No Invoices were created"
 msgstr "Aucunes factures ne sera crées"
@@ -1553,10 +1551,10 @@ msgstr ""
 "sociétés."
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2198
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr "Veuillez indiquer une quantité positive a mettre en rebus !"
+msgstr "Veuillez indiquer une quantité positive à mettre au rebut !"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1599,7 +1597,7 @@ msgid "Supplier Location"
 msgstr "Emplacement fournisseur"
 
 #. module: stock
-#: code:addons/stock/stock.py:2254
+#: code:addons/stock/stock.py:2217
 #, python-format
 msgid "were scrapped"
 msgstr "ont été mis au rebut"
@@ -1715,7 +1713,7 @@ msgid "Stock report by tracking lots"
 msgstr "Rapport de stock par numéro de suivi"
 
 #. module: stock
-#: code:addons/stock/product.py:370
+#: code:addons/stock/product.py:367
 #, python-format
 msgid "Delivered Qty"
 msgstr "Qté livrée"
@@ -1792,7 +1790,7 @@ msgid "Warehouse Dashboard"
 msgstr "Tableau de bord de l'entrepôt"
 
 #. module: stock
-#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:510
 #, python-format
 msgid "You can not remove a lot line !"
 msgstr "Vous ne pouvez pas retirer une ligne de lot !"
@@ -1806,7 +1804,7 @@ msgid "Scrap Products"
 msgstr "Rebuts"
 
 #. module: stock
-#: code:addons/stock/stock.py:1128
+#: code:addons/stock/stock.py:1135
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
 msgstr ""
@@ -1864,13 +1862,13 @@ msgid "Shipping Address :"
 msgstr "Adresse de livraison"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Provide the quantities of the returned products."
 msgstr "Indiquez les quantités des produits retournés."
 
 #. module: stock
-#: code:addons/stock/stock.py:2009
+#: code:addons/stock/stock.py:1978
 #, python-format
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
@@ -1959,7 +1957,7 @@ msgid "Quantity per lot"
 msgstr "Quantité par Lot"
 
 #. module: stock
-#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:1981
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
@@ -1969,7 +1967,7 @@ msgstr ""
 "catégorie : \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:360
+#: code:addons/stock/product.py:357
 #, python-format
 msgid "Received Qty"
 msgstr "Qté reçue"
@@ -2135,7 +2133,6 @@ msgstr "Coût"
 #: 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 "Compte du Stock d'Entrée"
 
@@ -2195,7 +2192,7 @@ msgid "Inventory loss"
 msgstr "Pertes d'inventaire"
 
 #. module: stock
-#: code:addons/stock/stock.py:1311
+#: code:addons/stock/stock.py:1314
 #, python-format
 msgid "Document"
 msgstr "Document"
@@ -2270,7 +2267,7 @@ msgstr "Traitement partiel"
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Mis au rebus"
+msgstr "Mis au rebut"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2288,15 +2285,15 @@ msgid "Warehouse board"
 msgstr "Tableau de bord entrepôt"
 
 #. module: stock
-#: code:addons/stock/product.py:380
+#: code:addons/stock/product.py:377
 #, python-format
 msgid "Future Qty"
 msgstr "Qté à venir"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "COmpte des variation de stock"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2319,13 +2316,13 @@ msgid "Shipping Type"
 msgstr "Type de Livraison"
 
 #. module: stock
-#: code:addons/stock/stock.py:2210
+#: code:addons/stock/stock.py:2175
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Vous ne pouvez supprimer que les mouvements en brouillon"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #: 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
@@ -2352,7 +2349,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "L'emplacement ou le système stockera les produits finis"
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2398,7 +2395,7 @@ msgid "Expected date for the picking to be processed"
 msgstr "Date à laquelle l'opération de manutention doit être effectuée"
 
 #. module: stock
-#: code:addons/stock/product.py:376
+#: code:addons/stock/product.py:373
 #, python-format
 msgid "P&L Qty"
 msgstr "Qté pertes et profits"
@@ -2499,7 +2496,7 @@ msgid "Source"
 msgstr "Origine"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:2557
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
 #: field:stock.inventory.line,inventory_id:0
@@ -2541,7 +2538,7 @@ msgstr "Suivre le numéro de série"
 #. 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/stock.py:751
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -2603,7 +2600,7 @@ msgstr "Journal de stock"
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "Besoin"
+msgstr "Approvisionnement"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
@@ -2611,7 +2608,7 @@ msgid "Maxtor Suppliers"
 msgstr "Fournisseur Maxtor"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
+#: code:addons/stock/wizard/stock_change_product_qty.py:66
 #: code:addons/stock/wizard/stock_change_standard_price.py:106
 #, python-format
 msgid "Active ID is not set in Context"
@@ -2725,7 +2722,7 @@ msgstr ""
 "(id: %d)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2302
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
@@ -2785,7 +2782,7 @@ msgid "Production Lot Number"
 msgstr "Numéro de lot de production"
 
 #. module: stock
-#: code:addons/stock/stock.py:1664
+#: code:addons/stock/stock.py:1647
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
@@ -2825,7 +2822,7 @@ msgid "Properties"
 msgstr "Propriétés"
 
 #. module: stock
-#: code:addons/stock/stock.py:974
+#: code:addons/stock/stock.py:982
 #, python-format
 msgid "Error, no partner !"
 msgstr "Erreur, pas de partenaire !"
@@ -2833,7 +2830,6 @@ msgstr "Erreur, pas de partenaire !"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
 msgstr "Incoterms"
@@ -2877,7 +2873,7 @@ msgid "Inventory Reference"
 msgstr "Référence de l'inventaire"
 
 #. module: stock
-#: code:addons/stock/stock.py:1304
+#: code:addons/stock/stock.py:1307
 #, python-format
 msgid "Internal picking"
 msgstr "Bon de transfert"
@@ -2885,7 +2881,7 @@ msgstr "Bon de transfert"
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr "Ouvrir le produit"
+msgstr "Ouvrir les produits"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2966,7 +2962,7 @@ msgid "Date done"
 msgstr "Date de fin"
 
 #. module: stock
-#: code:addons/stock/stock.py:975
+#: code:addons/stock/stock.py:983
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -3046,14 +3042,14 @@ msgid "Product"
 msgstr "Produit"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "Invoicing"
 msgstr "En facturation"
 
 #. module: stock
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Please provide Proper Quantity !"
 msgstr "Veuillez fournir la bonne quantité !"
@@ -3075,7 +3071,7 @@ msgid "Consume Products"
 msgstr "Produits consommés"
 
 #. module: stock
-#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1646
 #, python-format
 msgid "Insufficient Stock in Lot !"
 msgstr "Stock insuffisant pour ce lot"
@@ -3119,7 +3115,7 @@ msgstr "Produits par catégorie"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Catégories de produits"
 
 #. module: stock
@@ -3228,7 +3224,7 @@ msgid "All at once"
 msgstr "Tout en une fois"
 
 #. module: stock
-#: code:addons/stock/stock.py:1620
+#: code:addons/stock/stock.py:1603
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
@@ -3239,7 +3235,7 @@ msgstr ""
 "l'administrateur)"
 
 #. module: stock
-#: code:addons/stock/product.py:386
+#: code:addons/stock/product.py:383
 #, python-format
 msgid "Future Productions"
 msgstr "Production future"
@@ -3250,7 +3246,7 @@ msgid "To Invoice"
 msgstr "À facturer"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Return lines"
 msgstr "Lignes de retour"
@@ -3331,8 +3327,7 @@ msgid "Icon"
 msgstr "Icône"
 
 #. module: stock
-#: code:addons/stock/stock.py:2209
-#: code:addons/stock/stock.py:2617
+#: code:addons/stock/stock.py:2174
 #, python-format
 msgid "UserError"
 msgstr "ErreurUtilisateur"
@@ -3359,14 +3354,14 @@ msgstr "Clients non européen"
 #: 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/wizard/stock_fill_inventory.py:47
+#: code:addons/stock/stock.py:1975
+#: code:addons/stock/stock.py:1978
+#: code:addons/stock/stock.py:1981
+#: code:addons/stock/stock.py:1984
+#: code:addons/stock/stock.py:1987
+#: code:addons/stock/stock.py:1990
+#: code:addons/stock/stock.py:2302
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -3374,7 +3369,7 @@ msgid "Error!"
 msgstr "Erreur!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2021
+#: code:addons/stock/stock.py:1990
 #, python-format
 msgid ""
 "There is no inventory variation account defined on the product category: "
@@ -3410,7 +3405,7 @@ msgstr ""
 "directe"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #, python-format
 msgid "This picking list does not require invoicing."
 msgstr "Cette opération de manutention n'a pas à être facturée."
@@ -3455,8 +3450,8 @@ msgid "Warning"
 msgstr "Attention"
 
 #. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:1321
+#: code:addons/stock/stock.py:2557
 #, python-format
 msgid "is done."
 msgstr "est terminé."
@@ -3519,7 +3514,7 @@ msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
 "Cochez cette case pour autoriser l'utilisation de cette emplacement pour les "
-"produits détruits/endommagés."
+"rebuts et les produits endommagés."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3563,7 +3558,7 @@ msgid "Reporting"
 msgstr "Rapports"
 
 #. module: stock
-#: code:addons/stock/stock.py:1313
+#: code:addons/stock/stock.py:1316
 #, python-format
 msgid " for the "
 msgstr " pour le "
@@ -3571,7 +3566,7 @@ msgstr " pour le "
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to leave in the current pack"
-msgstr "Quantité à laisser dans le colisage actuel"
+msgstr "Quantité à laisser dans le colis actuel"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3617,7 +3612,7 @@ msgid "Chaining Journal"
 msgstr "Journal d'enchainement"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Pas encore de stock, impossible de réserver les produits."
@@ -3628,7 +3623,7 @@ msgid "Customers"
 msgstr "Clients"
 
 #. module: stock
-#: code:addons/stock/stock.py:1317
+#: code:addons/stock/stock.py:1320
 #, python-format
 msgid "is cancelled."
 msgstr "est annulé"
@@ -3639,13 +3634,13 @@ msgid "Stock Inventory Lines"
 msgstr "Lignes d'inventaire de stock"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #, python-format
 msgid "Process Document"
 msgstr "Document du processus"
 
 #. module: stock
-#: code:addons/stock/product.py:368
+#: code:addons/stock/product.py:365
 #, python-format
 msgid "Future Deliveries"
 msgstr "Livraison future"
@@ -3712,9 +3707,9 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
-"Ce menu vous donne la traçabilité entière des opérations d'inventaire sur "
-"une produit spécifique. Vous pouvez filtrer sur un produit pour voir tous "
-"les mouvements passés ou futurs de ce produit"
+"Ce menu vous donne la traçabilité entière des opérations d'inventaire sur un "
+"produit spécifique. Vous pouvez filtrer sur un produit pour voir tous les "
+"mouvements passés ou futurs de ce produit"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3823,7 +3818,7 @@ msgid "Existing Lot"
 msgstr "Lot existant"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
 msgstr "Veuiilez spécifier au moins un quantité supérieur à zéro"
@@ -3836,10 +3831,10 @@ msgid ""
 msgstr ""
 "Pour le produit actuel, cet emplacement sera utilisé à la place de "
 "l'emplacement par défaut comme emplacement d'origine des mouvements de stock "
-"générés par les besoins de stock."
+"générés par les approvisionnements."
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
 msgstr "prêt à être traité."
@@ -3855,7 +3850,7 @@ msgid "Set to zero"
 msgstr "Mettre à zéro"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
 #, python-format
 msgid "None of these picking lists require invoicing."
 msgstr "Aucune de ces opérations de manutention n'est à facturer."
@@ -3867,7 +3862,7 @@ msgstr "Novembre"
 
 #. module: stock
 #: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
+#: code:addons/stock/stock.py:1987
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -3875,7 +3870,7 @@ msgstr ""
 "%d)"
 
 #. module: stock
-#: code:addons/stock/product.py:382
+#: code:addons/stock/product.py:379
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Qté non prévu"
@@ -3915,16 +3910,16 @@ msgid "Move History (parent moves)"
 msgstr "Historique du mouvement (mouvements parent)"
 
 #. module: stock
-#: code:addons/stock/product.py:364
+#: code:addons/stock/product.py:361
 #, python-format
 msgid "Future Stock"
 msgstr "Stock prévisionnel"
 
 #. 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:510
+#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1135
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -3972,7 +3967,7 @@ msgstr "Lot de Production"
 #: view:stock.production.lot:0
 #: view:stock.tracking:0
 msgid "Traceability"
-msgstr "Traçabilités"
+msgstr "Traçabilité"
 
 #. module: stock
 #: view:stock.picking:0
@@ -4065,7 +4060,7 @@ msgid "Split Move"
 msgstr "Eclater le mouvement"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:92
+#: code:addons/stock/wizard/stock_return_picking.py:97
 #, python-format
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
@@ -4114,7 +4109,6 @@ msgstr ""
 "produit, celui de la catégorie du produit sera utilisé."
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
 #: view:stock.tracking:0
 msgid "Upstream traceability"
 msgstr "Traçabilité amont"
@@ -4126,7 +4120,7 @@ msgid "Location Content"
 msgstr "Contenu de l'emplacement"
 
 #. module: stock
-#: code:addons/stock/product.py:388
+#: code:addons/stock/product.py:385
 #, python-format
 msgid "Produced Qty"
 msgstr "Qté produite"
@@ -4135,7 +4129,6 @@ msgstr "Qté produite"
 #: 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 "Compte de Stock Sortant"
 
@@ -4189,13 +4182,12 @@ msgid "Invoiced date"
 msgstr "Date de facture"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/stock.py:729
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #: 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/wizard/stock_return_picking.py:79
+#: code:addons/stock/wizard/stock_return_picking.py:97
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -4244,9 +4236,10 @@ msgid "Optional localization details, for information purpose only"
 msgstr ""
 "Détails facultatifs sur la localisation, uniquement à but informatif."
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Stock prévisionnel"
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
 
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
@@ -4284,10 +4277,6 @@ msgstr ""
 #~ msgid "Products Received"
 #~ msgstr "Réception produit"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Productions prévisionnelles"
-
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Force l'utilisation des lot de productions en réception"
 
@@ -4402,9 +4391,6 @@ msgstr ""
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Calendrier des livraisons"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Tracer les lots entrants"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4438,10 +4424,6 @@ msgstr ""
 #~ msgid "STOCK_PASTE"
 #~ msgstr "STOCK_PASTE"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Livraisons prévisionnelles"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Numéro de suivi"
 
@@ -4537,9 +4519,6 @@ msgstr ""
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
-#~ msgid "Qty"
-#~ msgstr "Qté"
-
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Inventaires périodiques en brouillon"
 
@@ -4564,10 +4543,6 @@ msgstr ""
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Qté prévisionnelle"
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Note de crédit fournisseur"
 
@@ -4746,9 +4721,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Tracer les lots sortants"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4803,9 +4775,6 @@ msgstr ""
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Annulé"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -5037,10 +5006,6 @@ msgstr ""
 #~ msgid "Outgoing Products"
 #~ msgstr "Produits à expédier"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Pertes et profits prévisionnels"
-
 #~ msgid "Return"
 #~ msgstr "Retourner"
 
@@ -5058,10 +5023,6 @@ msgstr ""
 #~ msgid "Make Parcel"
 #~ msgstr "Faire le colis"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Réceptions prévisionnelles"
-
 #~ 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 "
@@ -5089,9 +5050,6 @@ msgstr ""
 #~ msgid "Units"
 #~ msgstr "Unités"
 
-#~ msgid "weight"
-#~ msgstr "poids"
-
 #~ msgid ""
 #~ "Scheduled date for the movement of the products or real date if the move is "
 #~ "done."
@@ -5102,97 +5060,17 @@ msgstr ""
 #~ msgid "Total :"
 #~ msgstr "Total :"
 
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr ""
-#~ "Voici la liste de tous les ordres de livraison qui doivent être préparés, "
-#~ "conformément aux différents commandes de vente et aux règles logistiques."
-
-#~ msgid ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-#~ msgstr ""
-#~ "L'inventaire régulier est utilisé quand vous comptez les produits "
-#~ "disponibles dans chaque emplacement. Vous pouvez l'utiliser un fois par an "
-#~ "pour réaliser l'inventaire général ou, quand vous en avez besoin, pour "
-#~ "corriger l'état actuel du stock d'un produit."
-
-#~ msgid ""
-#~ "Define your locations in order to reflect to your warehouse structure and "
-#~ "organization. OpenERP is able to manage physical locations (warehouses, "
-#~ "shelves, bin, etc), partners location (customers, suppliers) and virtual "
-#~ "locations which are the counter-part of the stock operations like the "
-#~ "manufacturing orders consummations, the inventories, etc. Every stock "
-#~ "operation in OpenERP moves the products from one location to another one. "
-#~ "For instance, if you receive products from a supplier, OpenERP will move "
-#~ "products from the Supplier location into the Stock location. Each report can "
-#~ "be performed on physicals, partners or virtual locations."
-#~ msgstr ""
-#~ "Définissez vos emplacements de façon à refléter la structure et "
-#~ "l'organisation de votre entrepôt. OpenERP est capable de gérer des "
-#~ "emplacements physiques (entrepôts, étagères, bacs, etc...), des emplacements "
-#~ "externalisés (clients, fournisseurs) et des emplacements virtuels servant de "
-#~ "contreparties aux mouvements de stock tels que les consommations de matières "
-#~ "premières pendant les fabrications, les inventaires, etc... Chaque mouvement "
-#~ "de stock dans OpenERP déplace le produit d'un emplacement à un autre. Par "
-#~ "exemple, si vous réceptionnez un produit d'un fournisseur, OpenERP déplacera "
-#~ "les produits de l'emplacement du fournisseur vers l'emplacement de stockage. "
-#~ "Chaque rapport peut être produit aussi bien sur les emplacements physiques "
-#~ "que virtuels ou externalisés."
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "Quand le mouvement de stock est créé, il est à l'état \"Brouillon\".\n"
-#~ " Ensuite, il passe à l'état \"Confirmé\".\n"
-#~ " Si le stock est disponible, il passe à l'état \"Disponible\".\n"
-#~ " Quand la manutention est effectuée, il passe à l'état \"Terminé\".\n"
-#~ "Le statut est \"En attente\" si le mouvement attend qu'un autre soit "
-#~ "effectué."
-
-#~ msgid "Not from Picking"
-#~ msgstr "Hors manutention"
-
-#~ msgid ""
-#~ "The 'Deliver Products' menu lists all products you have to deliver to your "
-#~ "customers. You can process the deliveries directly from this list, line by "
-#~ "or line or through the Delivery Orders menu."
-#~ msgstr ""
-#~ "Le menu 'Livraison des produits' liste tous les produits qui sont à livrer à "
-#~ "vos clients. Vous pouvez traiter les livraisons directement à parti de cette "
-#~ "liste, ligne par ligne ou à travers le menu 'Ordres de livraison'."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid ""
-#~ "This menu gives you the full traceability of inventory operations made on a "
-#~ "specific product. You can filter on the product to see all the past or "
-#~ "future movements made on the product."
-#~ msgstr ""
-#~ "Ce menu permet la traçabilité totale des opérations de stock effectués sur "
-#~ "un produit donné. Vous pouvez filtrer sur le produit pour voir toues les "
-#~ "mouvements passés ou à venir concernant ce produit."
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "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"
-
 #, python-format
 #~ msgid "is consumed with"
 #~ msgstr "est consommé avec"
 
+#~ msgid "Stock Variation Account"
+#~ msgstr "COmpte des variation de stock"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
@@ -5201,12 +5079,9 @@ msgstr ""
 #~ msgid "is scheduled"
 #~ msgstr "est planifié"
 
-#~ msgid "stock.move.memory"
-#~ msgstr "stock.move.memory"
-
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "quantité."
 
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Livraisons sortantes"
+#~ msgid "Products Categories"
+#~ msgstr "Catégories de produits"
diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po
index a44cadfe479..a1341961104 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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2088,8 +2088,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2146,7 +2146,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2861,7 +2861,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3904,3 +3904,8 @@ msgstr ""
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
 msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 1c2a1ea0848..cb76c9fba0e 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr ""
+msgstr "Prati izlazne lotove"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_upload
@@ -2090,8 +2090,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2148,7 +2148,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2863,7 +2863,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3909,6 +3909,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4023,14 +4028,6 @@ msgstr ""
 #~ msgid "Include all childs for the location"
 #~ msgstr "Uključi sve podređene lokacije"
 
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Loša dodjela lota !"
-
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr "Prebacujete %.2f proizvoda ali samo %.2f je dostupno na ovom lotu."
-
 #~ msgid "Track line"
 #~ msgstr "Stavka praćenja"
 
@@ -4091,9 +4088,6 @@ msgstr ""
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Kalendar dostava"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Prati ulazne lotove"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4150,9 +4144,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_RECORD"
 #~ msgstr "STOCK_MEDIA_RECORD"
 
-#~ msgid "weight"
-#~ msgstr "težina"
-
 #~ msgid "Non Assigned Products:"
 #~ msgstr "Nepridruženi proizvodi:"
 
@@ -4354,36 +4345,6 @@ msgstr ""
 #~ msgid "Future Stock Forecast"
 #~ msgstr "Predviđanje buduće zalihe"
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "OpenERP modul za upravljanje inventarom može upravljati sa višeskladišnom, "
-#~ "višelokacijskom zalihom i strukturiranom lokacijom zalihe.\n"
-#~ "Zahvaljujući upravljanju dvostrukim unosima, kontrola inventara pruža mnogo "
-#~ "mogućnosti i fleksibilnosti:\n"
-#~ "* Povijest prijenosa i planiranje,\n"
-#~ "* Različite metode inventorija (FIFO, LIFO, ...)\n"
-#~ "* Vrednovanje zalihe (standardna ili prosječna cijena, ...)\n"
-#~ "* Robusnost pri razlikama inventara\n"
-#~ "* Automatska pravila promjene redoslijeda (nivo zalihe, JIT, ...)\n"
-#~ "* Podržan barkod\n"
-#~ "* Brzo otkrivanje pogrešaka preko sustava dvostrukog unosa\n"
-#~ "* Sljedivost (od izvora proizvoda/tokom proizvoda, lotovi proizvodnje, "
-#~ "serijski broj, ...)\n"
-#~ "    "
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -4516,9 +4477,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Prati izlazne lotove"
-
 #~ msgid "STOCK_PRINT_PREVIEW"
 #~ msgstr "STOCK_PRINT_PREVIEW"
 
@@ -4589,9 +4547,6 @@ msgstr ""
 #~ msgid "Stock by Lots"
 #~ msgstr "Zaliha po serijama proizvoda"
 
-#~ msgid "Canceled"
-#~ msgstr "Poništeno"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index 00c870ba98c..4508ac3a2ea 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-06 14:33+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2011-11-07 12:46+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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2159,9 +2160,9 @@ msgid "Future Qty"
 msgstr "Jövőbeni mennyiség"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Készlet főkönyvi számla"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2217,7 +2218,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2960,7 +2961,7 @@ msgstr "Termékek kategóriák szerint"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Termék kategóriák"
 
 #. module: stock
@@ -4034,6 +4035,11 @@ msgstr "Részleges mozgás"
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4753,6 +4759,12 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Termék "
 
+#~ msgid "Products Categories"
+#~ msgstr "Termék kategóriák"
+
+#~ msgid "Stock Variation Account"
+#~ msgstr "Készlet főkönyvi számla"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "beütemezésre került."
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index 27742722009..db9fec8893d 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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2158,8 +2158,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2216,7 +2216,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Lokasi dimana sistem akan menyimpan produk jadi"
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2967,7 +2967,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -4057,6 +4057,11 @@ msgstr "Pindah Sebagian"
 msgid "Optional localization details, for information purpose only"
 msgstr "Opsional rincian lokalisasi , untuk tujuan informasi saja"
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Produk "
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 103b83890b4..0253e9048e3 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -7,15 +7,15 @@ 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-03-30 15:03+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"PO-Revision-Date: 2011-11-07 12:57+0000\n"
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -53,7 +53,7 @@ msgstr "Azione"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Upstream Traceability"
-msgstr ""
+msgstr "Tracciabilità a monte"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -108,7 +108,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr "Documento di trasporto"
+msgstr "Picking list"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -255,7 +255,7 @@ msgstr "Riferimento"
 #: code:addons/stock/stock.py:661
 #, python-format
 msgid "Products to Process"
-msgstr "Prodotti da processare"
+msgstr "Prodotti da elaborare"
 
 #. module: stock
 #: constraint:product.category:0
@@ -534,7 +534,7 @@ msgstr "Ubicazione destinazione"
 #: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "Non è possibile processare picking senza movimenti di magazzino"
+msgstr "Non è possibile elborare picking senza movimenti di magazzino"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
@@ -562,7 +562,7 @@ msgid ""
 "customer, products or sale order (using the Origin field)."
 msgstr ""
 "Troverete in questa lista tutti i prodotti che avete da consegnare ai vostri "
-"clienti. E' possibile processare le consegne direttamente da questa lista "
+"clienti. E' possibile elaborare le consegne direttamente da questa lista "
 "usando i bottoni sulla destra di ogni riga. E' possibile filtrare i prodotti "
 "da consegnare per cliente, prodotti o ordine di vendita (usando il campo "
 "origine)."
@@ -715,7 +715,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr "Processa picking"
+msgstr "Elabora picking"
 
 #. module: stock
 #: code:addons/stock/product.py:355
@@ -899,7 +899,7 @@ msgstr "Lead time di esecuzione (giorni)"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "Magazzino per Locazione"
+msgstr "Giacenza per Punto di Stoccaggio"
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -1172,7 +1172,7 @@ msgstr ""
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Downstream Traceability"
-msgstr ""
+msgstr "Tracciabilità a valle"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1202,6 +1202,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 ""
+"Questa è la lista di tutti gli imballaggi. Quando di seleziona un "
+"imballaggio, è possibile visualizzare la tracciabilità a monte o a valle dei "
+"prodotti contenuti nell'imballaggio"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_final
@@ -1395,7 +1398,7 @@ msgstr "Nessuno"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Downstream traceability"
-msgstr "Tracciabilità verso il basso"
+msgstr "Tracciabilità a valle"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:113
@@ -1453,7 +1456,7 @@ msgstr ""
 "* In attesa: in attesa che un altro movimento venga processato prima di "
 "diventare automaticamente disponibile (ad es. nei flussi 'Produrre su "
 "ordine')\n"
-"* Completato: è stato processato, non può più essere modificato o annullato\n"
+"* Completato: è stato elaborato, non può più essere modificato o annullato\n"
 "* Annullato: è stato annullato, non può più essere confermato"
 
 #. module: stock
@@ -1526,7 +1529,7 @@ msgid ""
 "other part that has been processed already."
 msgstr ""
 "Se questo documento è stato diviso, questo campo è collegato al documento "
-"che contiene la parte dell'ordine che è già stata processata."
+"che contiene la parte dell'ordine che è già stata elaborata."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1726,7 +1729,7 @@ msgstr "Annulla"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "Ritorno picking"
+msgstr "Ritorna picking"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1921,6 +1924,25 @@ msgid ""
 "day)\n"
 "    "
 msgstr ""
+"Il modulo di gestione magazzino può gestire magazzini multipli, punti di "
+"stoccaggio multipli e strutturati.\n"
+"Grazie alla gestione in partita doppia, il controllo del magazzino è potente "
+"e flessibile:\n"
+"* Storia dei movimenti e pianificazione,\n"
+"* Differenti metodi per le scorte (FIFO, LIFO, ...)\n"
+"* Valutazione dello stock (standard o prezzo medio, ...)\n"
+"* Robustezza confrontata con le differenze di scorte\n"
+"* Regole di riordino automatico (livello di stock, JIT, ...)\n"
+"* Supporto per i codici a barre\n"
+"* Individuazione rapida degli errori attraverso il sistema a partita doppia\n"
+"* Tracciabilità (a monte / a valle, lotti di produzione, numeri seriali, "
+"...)\n"
+"* Dashboard del magazzino che include:\n"
+"    * Prodotti da ricevere in ritardo (data < = oggi)\n"
+"    * Approvvigionamenti in errore\n"
+"    * Grafico: numero di prodotti ricevuti rispetto ai pianificati\n"
+"    * Grafico: numero di prodotti consegnati rispetto ai pianificati\n"
+"    "
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2151,8 +2173,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2209,7 +2231,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubicazione dove il sistema stoccherà i prodotti finiti"
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2244,7 +2266,7 @@ msgstr ""
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr "Data attesa per l'elaborazione del prelievo"
+msgstr "Data attesa per l'elaborazione del picking"
 
 #. module: stock
 #: code:addons/stock/product.py:373
@@ -2474,7 +2496,7 @@ msgstr "Visualizza giacenza prodotti"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking list"
-msgstr "Lista di picking interna"
+msgstr "Picking list interna"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2780,8 +2802,7 @@ msgstr "Data Chiusura"
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
 msgstr ""
-"Inserire un Partner nel documento di trasporto se si vuole generare la "
-"fattura."
+"Inserire un Partner nella picking list se si vuole generare la fattura."
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -2933,7 +2954,7 @@ msgstr "Prodotti per Categoria"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorie Prodotti"
 
 #. module: stock
@@ -3208,7 +3229,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr "La lista di picking non richiede fatturazione."
+msgstr "Questa picking non richiede fatturazione."
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3306,7 +3327,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "Selezione collegata"
+msgstr "Picking collegato"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3600,12 +3621,12 @@ msgstr ""
 #: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
-msgstr "è pronto per essere processato."
+msgstr "è pronto per essere elaborato."
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr "Riferimento al documento che ha generato questo prelievo"
+msgstr "Riferimento al documento che ha generato questo picking"
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -3616,7 +3637,7 @@ msgstr "Imposta a zero"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:85
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr "Nessuna di queste liste di picking richiede fatturazione."
+msgstr "Nessuna di queste picking list richiede fatturazione."
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -3859,7 +3880,7 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Upstream traceability"
-msgstr "Tracciabilita verso l alto"
+msgstr "Tracciabilita a monte"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
@@ -3983,6 +4004,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Fill Inventory for specific location"
 #~ msgstr "Inserimento Inventario per locazioni specifiche"
 
@@ -4046,9 +4072,6 @@ msgstr ""
 #~ msgid "Dest. Address"
 #~ msgstr "Indirizzo di Destinazione"
 
-#~ msgid "Qty"
-#~ msgstr "Qta'"
-
 #~ msgid "Input Packing List"
 #~ msgstr "Bolla Merci in Entrata"
 
@@ -4271,9 +4294,6 @@ msgstr ""
 #~ msgid "STOCK_ZOOM_FIT"
 #~ msgstr "STOCK_ZOOM_FIT"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Tracciabilità Lotti in arrivo"
-
 #~ msgid "STOCK_GOTO_BOTTOM"
 #~ msgstr "STOCK_GOTO_BOTTOM"
 
@@ -4652,9 +4672,6 @@ msgstr ""
 #~ msgid "STOCK_INDEX"
 #~ msgstr "Indice del magazzino"
 
-#~ msgid "weight"
-#~ msgstr "peso"
-
 #~ msgid "Available Packing"
 #~ msgstr "Imballaggio disponibile"
 
@@ -4695,36 +4712,6 @@ msgstr ""
 #~ msgid "Future Stock Forecast"
 #~ msgstr "Previsione del magazzino"
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "Il modulo di OpenERP che gestisce l'inventario può amministrare più "
-#~ "magazzini e strutture di stoccaggio multiple e complesse.\n"
-#~ "Grazie alla gestione con doppio accesso, il controllo sull'inventario è "
-#~ "potente e flessibile:\n"
-#~ "* Storia e pianificazione dei movimenti\n"
-#~ "* Svariati metodi di inventariamento (FIFO, LIFO, ...)\n"
-#~ "* Stima del magazzino (prezzo standard o medio, ...)\n"
-#~ "* Robustezza di fronte a divergenze dell'inventario\n"
-#~ "* Norme di riordino automatico (livelli del magazzino, JIT, ...)\n"
-#~ "* Supporto dei codici a barre\n"
-#~ "* Rivelazione rapida degli errori grazie al sistema di accesso doppio\n"
-#~ "* Tracciabilità (upstream/downstream, lotti di produzione, numeri di serie, "
-#~ "...)\n"
-#~ "    "
-
 #~ msgid "Units"
 #~ msgstr "Unità"
 
@@ -4734,18 +4721,12 @@ msgstr ""
 #~ msgid "Max. Planned Date"
 #~ msgstr "Massima data pianificata"
 
-#~ msgid "Canceled"
-#~ msgstr "Cancellato"
-
 #~ msgid "Future Delivery Orders"
 #~ msgstr "Ordini di consegna futuri"
 
 #~ msgid "Workshop"
 #~ msgstr "Officina/Laboratorio"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Traccia i Lotti in uscita"
-
 #~ 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 "
@@ -4788,19 +4769,16 @@ msgstr ""
 #~ msgid "Move Lines"
 #~ msgstr "Movimenti"
 
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Consegne in uscita"
-
 #~ msgid "Packing List:"
 #~ msgstr "Lista Imballaggi:"
 
-#~ msgid "Not from Picking"
-#~ msgstr "Non da DDT"
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Prodotto "
 
+#~ msgid "Products Categories"
+#~ msgstr "Categorie Prodotti"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "è pianificato"
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 77a6007a667..5aa17a9f249 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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2088,8 +2088,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2146,7 +2146,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2861,7 +2861,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3905,6 +3905,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Revision"
 #~ msgstr "리비전"
 
@@ -3920,10 +3925,6 @@ msgstr ""
 #~ msgid "STOCK_ZOOM_100"
 #~ msgstr "스톡_줌_100"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "향후 생산"
-
 #~ msgid "Products Received"
 #~ msgstr "수령한 상품"
 
@@ -3942,10 +3943,6 @@ msgstr ""
 #~ msgid "STOCK_NEW"
 #~ msgstr "스톡_새로 만들기"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "향후 수령"
-
 #~ msgid "Incoming Products"
 #~ msgstr "입고 상품"
 
@@ -4001,10 +3998,6 @@ msgstr ""
 #~ msgid "Tracking Number"
 #~ msgstr "추적 번호"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "향후 배송"
-
 #~ msgid "Packing List:"
 #~ msgstr "포장 리스트"
 
@@ -4056,9 +4049,6 @@ msgstr ""
 #~ msgid "The packing has been successfully made !"
 #~ msgstr "포장이 생성되었습니다."
 
-#~ msgid "Qty"
-#~ msgstr "수량"
-
 #~ msgid "Packing List"
 #~ msgstr "포장 리스트"
 
@@ -4068,10 +4058,6 @@ msgstr ""
 #~ msgid "Open Products"
 #~ msgstr "상품 열기"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "향후 수량"
-
 #, python-format
 #~ msgid "Invoice is already created."
 #~ msgstr "인보이스가 이미 생성되었습니다."
@@ -4206,9 +4192,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "재고_미디어_잠시 중단"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "출고 로트 추적"
-
 #~ msgid "STOCK_FIND"
 #~ msgstr "재고＿찾기"
 
@@ -4253,9 +4236,6 @@ msgstr ""
 #~ msgid "Please select one and only one inventory !"
 #~ msgstr "재고를 단 하나만 선택하십시오."
 
-#~ msgid "Canceled"
-#~ msgstr "취소됨"
-
 #~ msgid "STOCK_JUSTIFY_CENTER"
 #~ msgstr "재고_확정_센터"
 
@@ -4280,10 +4260,6 @@ msgstr ""
 #~ msgid "Localisation"
 #~ msgstr "지역화"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "향후 P&L"
-
 #~ msgid "Track Production Lots"
 #~ msgstr "생산 로트 추적"
 
@@ -4374,9 +4350,6 @@ msgstr ""
 #~ msgstr ""
 #~ "현재 상품 (템플릿)의 경우, 이 창고가 디폴트 대신에 사용되는데, 재고를 처리할 때  재고 이동의 출발 위치가 생성되기 때문입니다."
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "입고 로트 추적"
-
 #~ msgid "Latest Date of Inventory"
 #~ msgstr "마지막 재고 날짜"
 
@@ -4483,9 +4456,5 @@ msgstr ""
 #~ msgid "Locations' Values"
 #~ msgstr "출고"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "예상 재고"
-
 #~ msgid "Fill Inventory for specific location"
 #~ msgstr "특정 위치의 재고를 채움"
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index 86f0f6d2a81..5a7e42629cd 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 "Language: lt\n"
 
 #. module: stock
@@ -2091,8 +2091,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2866,7 +2866,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3912,6 +3912,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Internal Ref"
 #~ msgstr "Vidinė nuoroda"
 
@@ -3930,9 +3935,6 @@ msgstr ""
 #~ msgid "Dest. Address"
 #~ msgstr "Pristatymo adresas"
 
-#~ msgid "Qty"
-#~ msgstr "Kiekis"
-
 #~ msgid "FIFO"
 #~ msgstr "FIFO"
 
@@ -3959,10 +3961,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Virtualios atsargos"
-
 #~ msgid "Sub Products"
 #~ msgstr "Vaikiniai produktai"
 
@@ -3984,14 +3982,6 @@ msgstr ""
 #~ msgid "Products Received"
 #~ msgstr "Produktai gauti"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Produktai ateityje"
-
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Ateities užsakymas"
-
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Priverstinai naudoti gamybos partiją registruojant užsakymus"
 
@@ -4010,9 +4000,6 @@ msgstr ""
 #~ msgid "terp-purchase"
 #~ msgstr "OpenERP-pirkimai"
 
-#~ msgid "(Keep empty to open the current situation)"
-#~ msgstr "(Palikite tuščią, norėdami atidaryti dabartinę situaciją)"
-
 #~ msgid "Products Sent"
 #~ msgstr "Išsiųsti produktai"
 
@@ -4074,9 +4061,6 @@ msgstr ""
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Pristatymų kalendorius"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Sekti atvežamus produktus"
-
 #~ msgid "Latest Date of Inventory"
 #~ msgstr "Paskutinė inventorizacijos data"
 
@@ -4093,10 +4077,6 @@ msgstr ""
 #~ "Tracking lot is the code that will be put on the logistical unit/pallet"
 #~ msgstr "Partijos kodas, kuris bus įtrauktas į logistikos vienetą / padėklą."
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Pristatymai ateityje"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Partijų numeriai"
 
@@ -4106,9 +4086,6 @@ msgstr ""
 #~ msgid "Packing List:"
 #~ msgstr "Važtaraščio sąrašas:"
 
-#~ msgid "weight"
-#~ msgstr "svoris"
-
 #~ msgid "Non Assigned Products:"
 #~ msgstr "Nepriskirti produktai:"
 
@@ -4320,9 +4297,6 @@ msgstr ""
 #~ msgid "Chained Delay (days)"
 #~ msgstr "Atidėjimas (dienomis)"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Sekti išvežamus produktus"
-
 #~ 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 "
@@ -4370,9 +4344,6 @@ msgstr ""
 #~ msgid "Stock by Lots"
 #~ msgstr "Atsargos pagal partiją"
 
-#~ msgid "Canceled"
-#~ msgstr "Atšaukta"
-
 #~ 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 "
@@ -4403,10 +4374,6 @@ msgstr ""
 #~ msgid "Split in Two"
 #~ msgstr "Suskaidyti į dvi"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Ateities P/N"
-
 #~ 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 "
diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po
index 5d724b1bb77..ccefa9e0789 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: 2011-04-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2088,8 +2088,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2146,7 +2146,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2861,7 +2861,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3905,13 +3905,15 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "ir ieplānots"
 
-#~ msgid "stock.move.memory"
-#~ msgstr "stock.move.memory"
-
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "daudzums."
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 2ddb88c1e9b..efb2c61166f 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2102,8 +2102,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2160,7 +2160,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2875,7 +2875,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3931,6 +3931,11 @@ msgstr "Хэсэгчилсэн Хөдөлгөөн"
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Move History"
 #~ msgstr "Хөдөлгөөний түүх"
 
@@ -4009,9 +4014,6 @@ msgstr ""
 #~ msgid "New Reception Packing"
 #~ msgstr "Шинэ савлагаа хүлээн авах"
 
-#~ msgid "weight"
-#~ msgstr "Жин"
-
 #~ msgid "Non Assigned Products:"
 #~ msgstr "Эрсдэлгүй бүтээгдэхүүнүүд"
 
@@ -4147,9 +4149,6 @@ msgstr ""
 #~ msgid "Stock by Lots"
 #~ msgstr "Барааны цувралын жагсаалт"
 
-#~ msgid "Canceled"
-#~ msgstr "Цуцлагдсан"
-
 #~ msgid "STOCK_DIRECTORY"
 #~ msgstr "Бараа_Удирдлага"
 
@@ -4213,37 +4212,9 @@ msgstr ""
 #~ msgid "Packing List:"
 #~ msgstr "Савлагааны жагсаалт"
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "OpenERP бүртгэлийн менежментийн модуль нь олон тооны агуулах, олон тооны мөн "
-#~ "тодорхой бүтэцтэй агуулахын байршилыг зохион байгуулж чаддагДавхар нэвтрэх "
-#~ "боломжтой менежментийн ачаар, бүртгэлийн хяналт чадалтай мөн уян хатан "
-#~ "чанартай болсон:төлөвлөгөө болон түүхийг шилжүүлдэг, янз бүрийн бүртгэлийн "
-#~ "аргууд, агуулахын барагцаалал (үнийн стандарт эсвэл дундаж), бүртгэлийн "
-#~ "өөрчлөлттэй зэрэгцсэн тогтвортой байдал, дүрмийг автоматаар дахин шинэчлэх "
-#~ "(агуулахын төвшин), дэмжигдсэн коддавхар нэвтрэлтийн системийн алдааг "
-#~ "илрүүлэх, мөрдөгдөх чанар (өссөн/багассан, барааны цуврал, серийн дугаар)\n"
-#~ "    "
-
 #~ msgid "Force to use a Production Lot during deliveries"
 #~ msgstr "Тарааж байх үед барааны цувралыг хурдасгах"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "гаралтын цувралын замыг тодорхойлох"
-
 #~ 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 "
@@ -4301,10 +4272,6 @@ msgstr ""
 #~ msgid "terp-purchase"
 #~ msgstr "terp-purchase"
 
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Хүчингүй сери олгосон байна!"
-
 #~ msgid "Track line"
 #~ msgstr "Тээвэрлэлтийн мөр"
 
@@ -4323,9 +4290,6 @@ msgstr ""
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Хүргэлтийн календар"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Ирэх тээвэрлэлтийн сери"
-
 #~ msgid "Latest Date of Inventory"
 #~ msgstr "Бүртгэлийн сүүлийн огноо"
 
@@ -4707,65 +4671,3 @@ msgstr ""
 
 #~ msgid "Set Stocks to Zero"
 #~ msgstr "Барааг тэглэх"
-
-#, python-format
-#~ msgid ""
-#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-#~ msgstr ""
-#~ "Агуулахын Хөдөлгөөний Мөрийн зарим өгөгдөл олдсонгүй :%s' %(move.id))\n"
-#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
-#~ "            move_product_qty[move.id] = product_qty\n"
-#~ "            product_uom = partial_data.get('product_uom',False)\n"
-#~ "            product_price = partial_data.get('product_price',0.0)\n"
-#~ "            product_currency = partial_data.get('product_currency',False)\n"
-#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Бүтээгдэхүүний категори: \"%s\" (id: %d) '\\n                                "
-#~ "' журнал тодорхойлогдоогүй байна."
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "Барааны хөдөлгөөнийг үүсгэсэн дараа 'Ноорог' төлөвтэй байна.\n"
-#~ " Дараа нь 'Батлагдсан' төлөвт оруулна.\n"
-#~ " Бараа байвал 'Байгаа' төлөвтэй байна.\n"
-#~ " Цуглуулах ажил хийгдсэн дараа 'Хийгдсэн' төлөвт шилжинэ.                    "
-#~ "              \n"
-#~ "Харин өөр хөдөлгөөнийг хүлээж байгаа бол 'Хүлээж байгаа' төлөвтэй байна."
-
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Гарч байгаа Хүргэлт"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po
index b7e37a23008..49de8775c60 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2091,8 +2091,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2867,7 +2867,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3911,6 +3911,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Produkt "
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index c45d7d778a0..8abcaba9620 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-10-30 14:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-10-26 15:25+0000\n"
+"Last-Translator: Thomas <Unknown>\n"
 "Language-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-29 04:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -42,7 +42,7 @@ msgstr "Vastgelegde locatie"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
-msgstr ""
+msgstr "In nieuwe verpakking plaatsen"
 
 #. module: stock
 #: field:stock.move.split.lines,action:0
@@ -58,7 +58,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr ""
+msgstr "Laatste product inventarisatie"
 
 #. module: stock
 #: view:stock.move:0
@@ -81,7 +81,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr ""
+msgstr "Mutatie analyse"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -189,7 +189,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
-msgstr ""
+msgstr "Geleverde/ontvangen producten"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
@@ -215,7 +215,7 @@ msgstr ""
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr ""
+msgstr "Afwijkende referentie of serie nummer"
 
 #. module: stock
 #: field:stock.move,origin:0
@@ -405,7 +405,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 msgid "Outgoing Product"
-msgstr ""
+msgstr "Uitgaande producten"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
@@ -416,7 +416,7 @@ msgstr ""
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr ""
+msgstr "Per aantal"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:115
@@ -433,12 +433,12 @@ msgstr "Locatie Uitgang"
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr ""
+msgstr "Splitsen in"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr ""
+msgstr "Valuta voor gemiddelde prijs"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -473,7 +473,7 @@ msgstr ""
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "Productie lot filter"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -520,6 +520,7 @@ msgstr ""
 #, python-format
 msgid "You can not process picking without stock moves"
 msgstr ""
+"Het is niet mogelijk om een 'Picking' te verwerken zonder voorraad-mutatie"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
@@ -550,7 +551,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr ""
+msgstr "Voorraad beheer"
 
 #. module: stock
 #: view:stock.location:0
@@ -573,7 +574,7 @@ msgstr ""
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr ""
+msgstr "Extra referenties"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
@@ -680,7 +681,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr ""
+msgstr "Voorraad regel"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -737,7 +738,7 @@ msgstr "Locatie binnenkomst"
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr ""
+msgstr "Besteldatum"
 
 #. module: stock
 #: selection:product.product,valuation:0
@@ -770,7 +771,7 @@ msgstr ""
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "Hoeveelheid aanpassen"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -810,7 +811,7 @@ msgstr ""
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr ""
+msgstr "Voorraadlocaties"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -837,7 +838,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Urgent"
-msgstr "Urgent"
+msgstr "Dringend"
 
 #. module: stock
 #: view:stock.picking:0
@@ -849,7 +850,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1315
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "is gepland %s"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -891,6 +892,8 @@ msgstr ""
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
+"Door het uivinken van dit actief veld, kunt u een locatie verbergen zonder "
+"deze te verwijderen."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -917,13 +920,13 @@ msgstr "Bovenliggende"
 #: code:addons/stock/wizard/stock_partial_move.py:132
 #, python-format
 msgid "Delivery Information"
-msgstr ""
+msgstr "Levering informatie"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:48
 #, python-format
 msgid "Stock Inventory is done"
-msgstr ""
+msgstr "Stock inventaris is voltooid"
 
 #. module: stock
 #: constraint:product.product:0
@@ -945,7 +948,7 @@ msgstr "Productielocatie"
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr ""
+msgstr "Contactadres"
 
 #. module: stock
 #: model:res.company,overdue_msg:stock.res_company_shop0
@@ -1074,7 +1077,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr ""
+msgstr "Lot nummer"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
@@ -2088,8 +2091,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2146,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2742,7 +2745,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Voorraad analyse"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -2861,7 +2864,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3268,7 +3271,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "Rapportering"
+msgstr "Rapportages"
 
 #. module: stock
 #: code:addons/stock/stock.py:1316
@@ -3907,13 +3910,14 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Packing List"
 #~ msgstr "Pakbon"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Toekomstige voorraad"
-
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -3953,10 +3957,6 @@ msgstr ""
 #~ msgid "Products Received"
 #~ msgstr "Ontvangen producten"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Toekomstige productie"
-
 #~ msgid "Incoming Products"
 #~ msgstr "Binnenkomende leveringen"
 
@@ -4126,10 +4126,6 @@ msgstr ""
 #~ msgid "STOCK_PASTE"
 #~ msgstr "STOCK_PASTE"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Toekomstige leveringen"
-
 #~ msgid "Tracking Number"
 #~ msgstr "Volgnummer"
 
@@ -4241,9 +4237,6 @@ msgstr ""
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
-#~ msgid "Qty"
-#~ msgstr "Hvhd"
-
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Concept periodieke voorraadcontroles"
 
@@ -4274,10 +4267,6 @@ msgstr ""
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Toekomstige aantal"
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Credit inkoopfactuur"
 
@@ -4571,9 +4560,6 @@ msgstr ""
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Geannuleerd"
-
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
@@ -4693,19 +4679,9 @@ msgstr ""
 #~ msgid "Please select one and only one inventory !"
 #~ msgstr "Selecteer één voorraad locatie"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "Toekomstige Winst&Verlies"
-
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Traceer binnenkomende batches"
-
 #~ msgid "Stock by Lots"
 #~ msgstr "Voorraad per batch"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Traceer uitgaande batches"
-
 #~ msgid "Track Production Lots"
 #~ msgstr "Traceer productiebatches"
 
@@ -4713,9 +4689,6 @@ msgstr ""
 #~ msgid "Invoice cannot be created from Packing."
 #~ msgstr "Factuur kan niet worden gegenereerd vanuit Pick-order"
 
-#~ msgid "weight"
-#~ msgstr "gewicht"
-
 #~ msgid "Total :"
 #~ msgstr "Totaal :"
 
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index 97a68d15bf9..931aab77bb4 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2087,8 +2087,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2145,7 +2145,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2860,7 +2860,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3904,6 +3904,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 660fa3c19c7..c775b418ffb 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-22 16:16+0000\n"
+"PO-Revision-Date: 2011-11-07 13:05+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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2243,9 +2243,9 @@ msgid "Future Qty"
 msgstr "Ilość planowana"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Konto wyceny zapasów"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2301,7 +2301,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Strefa, w której system umieści gotowe produkty."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -3057,7 +3057,7 @@ msgstr "Produkty wg kategorii"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Kategorie produktów"
 
 #. module: stock
@@ -4158,6 +4158,11 @@ msgstr "Przesunięcie częściowe"
 msgid "Optional localization details, for information purpose only"
 msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
@@ -4192,9 +4197,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #~ msgid "Invoice is not created"
 #~ msgstr "Faktura nie została utworzona"
 
-#~ msgid "Qty"
-#~ msgstr "Il."
-
 #~ msgid "Available Moves"
 #~ msgstr "Dostępne przesunięcia"
 
@@ -4217,9 +4219,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #~ msgid "Planned Date"
 #~ msgstr "Planowana data"
 
-#~ msgid "Canceled"
-#~ msgstr "Anulowano"
-
 #~ msgid "Created Date"
 #~ msgstr "Data utworzenia"
 
@@ -4391,12 +4390,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #~ msgid "Outgoing Products"
 #~ msgstr "Wydawanie produktów"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Wymuś nr partii przy przyjmowaniu"
-
-#~ msgid "Track Outging Lots"
-#~ msgstr "Wymuś nr partii przy wydawaniu"
-
 #~ msgid ""
 #~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
 #~ "structured stock locations.\n"
@@ -4469,14 +4462,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #~ msgid "Sub Products"
 #~ msgstr "Produkty uboczne"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Przyszły zapas"
-
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Przyszła ilość"
-
 #~ msgid "Make Picking"
 #~ msgstr "Wykonaj pobranie"
 
@@ -4500,17 +4485,9 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #~ "będzie zrobić ręcznie. 'Automatycznie i bezpośrednio' zamieni strefę "
 #~ "docelową w przesunięciu przychodzącym."
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Przyszłe produkcje"
-
 #~ msgid "Make Parcel"
 #~ msgstr "Wykonaj paczkę (przesunięcie)"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Przyszłe przyjęcia"
-
 #~ msgid "Customer Refund"
 #~ msgstr "Korekta dla klienta"
 
@@ -4529,10 +4506,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #~ msgid "Non Assigned Products:"
 #~ msgstr "Nie przypisane produkty:"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Przyszłe dostawy"
-
 #~ msgid ""
 #~ "Tracking lot is the code that will be put on the logistical unit/pallet"
 #~ msgstr ""
@@ -4690,205 +4663,32 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #~ msgid "Invoice Status"
 #~ msgstr "Fakturowanie"
 
-#~ msgid "weight"
-#~ msgstr "waga"
-
 #, python-format
 #~ msgid "Invoice cannot be created from Packing."
 #~ msgstr "Nie można utworzyć faktury z pobrania"
 
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr ""
-#~ "To jest lista wydań do przygotowania według zamówień sprzedaży i "
-#~ "logistycznych reguł."
-
-#~ msgid ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-#~ msgstr ""
-#~ "Okresowa inwentaryzacja jest stosowana, kiedy przeliczasz ilości produktów "
-#~ "dostępnych w poszczególnych strefach. Możesz ją stosować raz na rok lub w "
-#~ "miarę potrzeby częściej do urealnienia stanu zapasów."
-
-#~ msgid ""
-#~ "Define your locations in order to reflect to your warehouse structure and "
-#~ "organization. OpenERP is able to manage physical locations (warehouses, "
-#~ "shelves, bin, etc), partners location (customers, suppliers) and virtual "
-#~ "locations which are the counter-part of the stock operations like the "
-#~ "manufacturing orders consummations, the inventories, etc. Every stock "
-#~ "operation in OpenERP moves the products from one location to another one. "
-#~ "For instance, if you receive products from a supplier, OpenERP will move "
-#~ "products from the Supplier location into the Stock location. Each report can "
-#~ "be performed on physicals, partners or virtual locations."
-#~ msgstr ""
-#~ "Strefy magazynowe powinny odzwierciedlać twoją strukturę magazynową. OpenERP "
-#~ "może operować na strefach fizycznych (magazyny, półki, zasobniki), strefy "
-#~ "partnerów (klientów, dostawców), i wirtualne strefy, które będą stanowiły "
-#~ "strefy przeciwstawne w operacjach na zasobach. Każda operacja na zasobach w "
-#~ "OpenERP przenosi produkty z jednej strefy do drugiej. Na przykład, jeśli "
-#~ "otrzymujesz produkty od dostawcy, to OpenERP dokona przesunięcia zapasów ze "
-#~ "strefy Dostawcy do strefy wewnętrznej (fizycznej). Wszystkie raporty o "
-#~ "stanie zapasów mogą dotyczyć stref fizycznych, partnerów lub stref "
-#~ "wirtualnych."
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "Kiedy przesunięcie jest tworzone, to jest w stanie 'Projekt'.\n"
-#~ " Później zmienia się na 'Potwierdzone'.\n"
-#~ " Jeśli dana ilość jest dostępna, to stan zmienia się na 'Dostępne'.\n"
-#~ " Jeśli pobranie zostanie wykonane, to stan zmienia się na 'Wykonano'.        "
-#~ "                          \n"
-#~ "Jeśli przesunięcie czeka na inne przesunięcie, to stan jest 'Oczekiwanie'."
-
 #, python-format
 #~ msgid "is consumed with"
 #~ msgstr "Jest używany z"
 
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Złe przypisanie partii !"
-
-#, python-format
-#~ msgid "No invoice were created"
-#~ msgstr "Nie utworzono faktury"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Not from Picking"
-#~ msgstr "Nie z pobrania"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID certyfikatu modułu musi być unikalne !"
-
-#~ msgid "The name of the journal must be unique per company !"
-#~ msgstr "Nazwa dziennika musi być unikalna w ramach firmy !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie są obsługiwane dla obiektów osv_memory !"
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Produkt "
 
-#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-#~ msgstr ""
-#~ "Unikalny numer seryjny będzie wyświetlany jako: PREFIKS/SERIAL [INT_REF]"
-
-#, python-format
-#~ msgid "Currency in which Unit Cost is expressed"
-#~ msgstr "Waluta, w której jest wyrażony koszt jednostkowy"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Serial Number"
-#~ msgstr "Numer seryjny"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
-
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr ""
-#~ "Chcesz przesunąć %.2f produktu ale tylko %.2f jest dostępne w tej partii."
-
-#~ msgid "The code of the journal must be unique per company !"
-#~ msgstr "Kod dziennika musi być unikalny w ramach firmy !"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
-
-#, python-format
-#~ msgid "Invoices"
-#~ msgstr "Faktury"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Nazwa grupy musi być unikalna !"
-
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "jest zaplanowane"
 
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Rozmiar pola nie może być mniejszy od 1 !"
-
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "ilość."
 
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Wydania zewnętrzne"
-
-#~ msgid ""
-#~ "The stock journals system allows you assign each stock operation into a "
-#~ "specific journal according to the type of operation to perform or the "
-#~ "worker/team that should perform the operation. Examples of stock journals "
-#~ "may be: quality control, pick lists, packing, etc."
-#~ msgstr ""
-#~ "Dzienniki magazynowe pozwalają powiązać każda operację magazynową do "
-#~ "konkretnego dziennika w zależności od typu operacji lub osób wykonujących "
-#~ "operację. Przykłady dzienników magazynowych, to kontrola jakości, listy "
-#~ "pobrań, pakowanie itp."
-
-#~ msgid ""
-#~ "The Internal Moves lists all inventory operations you have to perform in "
-#~ "your warehouse. All operations can be categorized into stock journals, so "
-#~ "that each worker has it's own list of operations to perform in his own "
-#~ "journal. Most operations are prepared automatically by OpenERP according to "
-#~ "your pre-configured logistics rules but you can also record manual stock "
-#~ "operations."
-#~ msgstr ""
-#~ "Przesunięcia wewnętrzne są listą operacji magazynowych do wykonania wewnątrz "
-#~ "magazynu. Operacje mogą być grupowane w dzienniki magazynowe, aby każdy "
-#~ "magazynier miał własną listę operacji do wykonania. Większość operacji jest "
-#~ "generowana automatycznie według skonfigurowanych reguł, ale można też "
-#~ "dodawać operacje ręcznie."
-
-#~ msgid ""
-#~ "This menu gives you the full traceability of inventory operations made on a "
-#~ "specific product. You can filter on the product to see all the past or "
-#~ "future movements made on the product."
-#~ msgstr ""
-#~ "To menu pomaga ci obserwować operacje magazynowe wykonywane na konkretnym "
-#~ "produkcie. Możesz filtrować wg produktu, aby zobaczyć wykonane lub przyszłe "
-#~ "przesunięcia."
-
-#~ msgid ""
-#~ "This is the list of all your packs. After having selected a Pack, you can "
-#~ "get the up-stream or down-stream traceability of the products contained in "
-#~ "the pack."
-#~ msgstr ""
-#~ "To jest lista paczek. Wybierając paczkę możesz sprawdzić przepływ produktów "
-#~ "z paczki wstecz i wprzód."
-
-#~ msgid ""
-#~ "The 'Deliver Products' menu lists all products you have to deliver to your "
-#~ "customers. You can process the deliveries directly from this list, line by "
-#~ "or line or through the Delivery Orders menu."
-#~ msgstr ""
-#~ "Menu 'Wydania zewnętrzne' zawiera wszystkie produkty, które trzeba "
-#~ "dostarczyć klientom. Możesz przetwarzać wydania z listy lub przez menu "
-#~ "Wydania zewnętrzne."
-
-#~ msgid ""
-#~ "This is the list of all the production lots (serial numbers) you recorded. "
-#~ "After having selected a lot, you can get the up-stream or down-stream "
-#~ "traceability of the products contained in lot."
-#~ msgstr ""
-#~ "To jest lista partii produkcyjnych, które utworzyłeś. Po wybraniu partii "
-#~ "możesz prześledzić przesunięcia wprzód i wstecz dla danej partii."
+#~ msgid "Stock Variation Account"
+#~ msgstr "Konto wyceny zapasów"
 
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "FAK: "
+
+#~ msgid "Products Categories"
+#~ msgstr "Kategorie produktów"
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 2fbd8f6c10e..14080abf4e7 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.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:16+0000\n"
-"PO-Revision-Date: 2011-05-05 13:33+0000\n"
-"Last-Translator: João Mouro <Unknown>\n"
+"PO-Revision-Date: 2011-11-09 17:23+0000\n"
+"Last-Translator: DReis <Unknown>\n"
 "Language-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-05-06 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -59,7 +59,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr ""
+msgstr "Últimos inventários"
 
 #. module: stock
 #: view:stock.move:0
@@ -75,7 +75,7 @@ msgstr "Número da Revisão"
 #: view:stock.move.memory.in:0
 #: view:stock.move.memory.out:0
 msgid "Product Moves"
-msgstr ""
+msgstr "Movimentações de produto"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
@@ -90,6 +90,8 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
+"Número de referência interno, caso seja diferente do número de série do "
+"fabricante"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -102,7 +104,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr ""
+msgstr "Lista de recolha"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -157,7 +159,7 @@ msgstr "UoM"
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 #, python-format
 msgid "Physical Inventories"
-msgstr ""
+msgstr "Inventário físico"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
@@ -169,7 +171,7 @@ msgstr "Diário de Stock"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "Entrada"
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
@@ -190,7 +192,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
-msgstr ""
+msgstr "Entregar/Receber Produtos"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
@@ -216,7 +218,7 @@ msgstr "Não aplicável"
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr ""
+msgstr "Outra referência ou número de série"
 
 #. module: stock
 #: field:stock.move,origin:0
@@ -320,7 +322,7 @@ msgstr "Lote de produção"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Categorias de unidades de medida"
 
 #. module: stock
 #: help:stock.incoterms,code:0
@@ -2090,8 +2092,8 @@ msgid "Future Qty"
 msgstr "Quantidade Futura"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2148,7 +2150,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2865,7 +2867,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3911,6 +3913,11 @@ msgstr "Movimento parcial"
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Sub Products"
 #~ msgstr "Sub Produtos"
 
@@ -3944,9 +3951,6 @@ msgstr ""
 #~ msgid "This account will be used to value the output stock"
 #~ msgstr "Esta conta será usada para validar o stock de saída"
 
-#~ msgid "Qty"
-#~ msgstr "Quantidade"
-
 #~ msgid "Validate"
 #~ msgstr "Validar"
 
@@ -4052,9 +4056,6 @@ msgstr ""
 #~ msgid "Customer Invoice"
 #~ msgstr "Factura a Clientes"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Rastrear lotes à entrada"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
@@ -4100,9 +4101,6 @@ msgstr ""
 #~ msgid "STOCK_FILE"
 #~ msgstr "STOCK_FILE"
 
-#~ msgid "weight"
-#~ msgstr "peso"
-
 #~ msgid "terp-report"
 #~ msgstr "terp-report"
 
@@ -4265,9 +4263,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Rastrear lotes de saída"
-
 #~ msgid "STOCK_FIND"
 #~ msgstr "STOCK_FIND"
 
@@ -4307,9 +4302,6 @@ msgstr ""
 #~ msgid "STOCK_REVERT_TO_SAVED"
 #~ msgstr "STOCK_REVERT_TO_SAVED"
 
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
 #~ msgid "Close"
 #~ msgstr "Fechar"
 
@@ -4753,9 +4745,6 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Artigo "
 
-#~ msgid "stock.move.memory"
-#~ msgstr "stock.move.memory"
-
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "quantidade."
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 9b5db56c62b..8fc6f64629d 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-09 00:58+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -581,7 +581,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr "Controlo de inventário"
+msgstr "Controle de Estoque"
 
 #. module: stock
 #: view:stock.location:0
@@ -2233,9 +2233,9 @@ msgid "Future Qty"
 msgstr "Qtde Futura"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Conta para Variação de Estoque"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2255,7 +2255,7 @@ msgstr "Valor"
 #: field:stock.location,chained_picking_type:0
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr "Tipo de Frete"
+msgstr "Tipo de Movimentação"
 
 #. module: stock
 #: code:addons/stock/stock.py:2175
@@ -2291,7 +2291,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Local onde o sistema estocará os produtos acabados"
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -3029,7 +3029,7 @@ msgstr "Produtos por Categoria"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorias de Produtos"
 
 #. module: stock
@@ -4105,6 +4105,11 @@ msgstr "Movimento Parcial"
 msgid "Optional localization details, for information purpose only"
 msgstr "Detalhes opcionais do local, apenas em caráter informativo"
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Sub Products"
 #~ msgstr "Sub Produtos"
 
@@ -4224,28 +4229,9 @@ msgstr "Detalhes opcionais do local, apenas em caráter informativo"
 #~ msgid "Periodical Inventory"
 #~ msgstr "Inventário Periódico"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Estoque futuro"
-
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Produções Futuras"
-
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Recebimentos futuros"
-
 #~ msgid "Track line"
 #~ msgstr "Rastreamento"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Rastrear lotes de entrada"
-
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Entregas futuras"
-
 #~ msgid "terp-account"
 #~ msgstr "terp-account"
 
@@ -4480,9 +4466,6 @@ msgstr "Detalhes opcionais do local, apenas em caráter informativo"
 #~ msgid "The packing has been successfully made !"
 #~ msgstr "A embalagem foi realizada com sucesso !"
 
-#~ msgid "Qty"
-#~ msgstr "Qtd"
-
 #~ msgid "STOCK_MEDIA_FORWARD"
 #~ msgstr "STOCK_MEDIA_FORWARD"
 
@@ -4504,12 +4487,6 @@ msgstr "Detalhes opcionais do local, apenas em caráter informativo"
 #~ msgid "Include all childs for the location"
 #~ msgstr "Incluir todas as dependências para o local"
 
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr ""
-#~ "Você está movimentando %.2f produtos mas há somente %.2f disponíveis neste "
-#~ "lote."
-
 #~ msgid "Draft Moves"
 #~ msgstr "Movimentações Provisórias"
 
@@ -4523,6 +4500,12 @@ msgstr "Detalhes opcionais do local, apenas em caráter informativo"
 #~ msgid "Product "
 #~ msgstr "Produto "
 
+#~ msgid "Stock Variation Account"
+#~ msgstr "Conta para Variação de Estoque"
+
+#~ msgid "Products Categories"
+#~ msgstr "Categorias de Produtos"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index e9916a92e7b..2180abf6baa 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-24 20:19+0000\n"
+"PO-Revision-Date: 2011-11-07 12:45+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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2111,9 +2111,9 @@ msgid "Future Qty"
 msgstr "Cant. viitoare"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cont variații de stoc"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2169,7 +2169,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Locația în care sistemul va stoca produsele finite."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2888,7 +2888,7 @@ msgstr "Produse după categorie"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Categorii Produse"
 
 #. module: stock
@@ -3941,6 +3941,11 @@ msgstr "Mișcare parțială"
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Dest. Address"
 #~ msgstr "Adresa de destinatie"
 
@@ -3958,6 +3963,12 @@ msgstr ""
 #~ msgid "is consumed with"
 #~ msgstr "este consumat cu"
 
+#~ msgid "Stock Variation Account"
+#~ msgstr "Cont variații de stoc"
+
+#~ msgid "Products Categories"
+#~ msgstr "Categorii Produse"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 4200547d121..4b6157b6ce3 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-20 08:06+0000\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -567,11 +567,11 @@ 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 ""
-"Вы найдете в этом списке все продукты, которые Вы должны доставить своим "
-"клиентам. Вы можете обработать доставки непосредственно из этого списка с "
+"Вы найдете в этом списке все ТМЦ, которые Вы должны отгрузить своим "
+"клиентам. Вы можете обработать отгрузки непосредственно из этого списка с "
 "помощью кнопки справа в каждой строке. Вы можете фильтровать ТМЦ для "
-"доставки по клиентам, по ТМЦ или заказам на продажу (с использованием поля "
-"происхождение)."
+"отгрузки по клиентам, по ТМЦ или заказам на продажу (используя поле "
+"Источник)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -824,7 +824,7 @@ msgstr ""
 #: 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
@@ -1051,6 +1051,29 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
+"* Место хранения поставщика: виртуальное место хранения являющееся "
+"источником для ТМЦ поступающих от ваших поставщиков.\n"
+"                       \n"
+"* Вид: виртуальное место хранения используемое для организации иерархической "
+"структуры склада, включает в себя подчиненные места хранения; не может "
+"хранить ТМЦ.\n"
+"                       \n"
+"* Внутреннее место хранения: физическое место хранения внутри вашего "
+"склада.\n"
+"                       \n"
+"* Место хранения заказчика: виртуальное место хранения являющееся местом "
+"назначения для отгружаемых заказчику ТМЦ.\n"
+"                       \n"
+"* Инвентаризация: виртуальное место хранения корреспондирующее с операциями "
+"инвентаризации корректирующими остатки ТМЦ (физическими инвентаризациями).\n"
+"                       \n"
+"* Снабжение: виртуальное место хранения временно корреспондирующее для "
+"операций снабжения, когда источник (поставщик или производство) не известен. "
+"Это место хранения должно быть пустым по окончанию работы планировщика.\n"
+"                       \n"
+"* Производство: виртуальное место хранения для производственных операций: "
+"это место хранения потребляет сырьё и производит готовую продукцию.\n"
+"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
@@ -1404,7 +1427,7 @@ msgstr "Замена запасов"
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
-msgstr "Обзая информация"
+msgstr "Общая информация"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -1438,6 +1461,7 @@ msgstr "Приход"
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
+"Сняв пометку с поля \"Активно\", вы можете скрыть ИНКОТЕРМС без его удаления."
 
 #. module: stock
 #: view:stock.move:0
@@ -1512,7 +1536,7 @@ msgstr ""
 " После этого состояние становится \"Не доступно\", если планировщик на нашел "
 "ТМЦ.\n"
 " Когда ТМЦ зарезервированы состояние \"Доступно\".\n"
-" Когда комплектование выполнено, то состояние \"Готово\".\n"
+" Когда комплектование выполнено, то состояние \"Сделано\".\n"
 "Состояние \"В ожидании\", если перемещение ожидает другого перемещения."
 
 #. module: stock
@@ -1570,6 +1594,8 @@ msgstr "Отслеживать производимые партии"
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
 msgstr ""
+"Пожалуйста, выберите несколько физических инвентаризаций для объединения в "
+"виде списка."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1911,7 +1937,7 @@ msgstr ""
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr ""
+msgstr "Импорт инвентаризации"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -2186,9 +2212,9 @@ msgid "Future Qty"
 msgstr "Будущее Кол-во"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Счет изменения стоимости ТМЦ"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2244,7 +2270,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Место хранения, где система будет хранить готовую продукцию."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2261,6 +2287,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 ""
+"Здесь вы можете принимать отдельные ТМЦ, независимо от того откуда они "
+"взялись, из заказа на закупку или на комплектование. Вы найдете список всех "
+"ТМЦ, которые вы ждете. При получении заказа, вы можете фильтровать по "
+"названию поставщика или по описанию заказа на закупку. Затем, вы можете "
+"подтвердить получение всех ТМЦ с помощью кнопок справа в каждой строке."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2461,6 +2492,10 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
+"Вывод последних инвентаризаций ТМЦ и их сортировка по различным критериям. "
+"Если вы делаете частые и частичные инвентаризации, вам нужен этот отчет для "
+"того, что бы быть уверенным, что каждый товар прошел инвентаризацию хотя бы "
+"раз в год."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2565,7 +2600,7 @@ msgstr "Да"
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr ""
+msgstr "Инвентаризации"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2606,6 +2641,7 @@ msgstr "Не определен счет входящих ТМЦ для: \"%s\"
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
+"Нельзя использовать перемещение с отрицательным или нулевым количеством !"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2641,7 +2677,7 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr ""
+msgstr "Дата ревизии"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2753,7 +2789,7 @@ msgstr "Префикс учета"
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "Описание инвентаризации"
 
 #. module: stock
 #: code:addons/stock/stock.py:1307
@@ -3000,7 +3036,7 @@ msgstr "ТМЦ по категориям"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Категории ТМЦ"
 
 #. module: stock
@@ -3126,7 +3162,7 @@ msgstr "В счет"
 #: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Return lines"
-msgstr ""
+msgstr "Позиции для возврата"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
@@ -3251,7 +3287,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories ?"
-msgstr ""
+msgstr "Вы действительно хотите объединить эти инвентаризации ?"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3353,7 +3389,7 @@ msgstr "Значок, выводимый в древовидном обзоре"
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
-msgstr ""
+msgstr "Объединить инвентаризации"
 
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
@@ -3659,7 +3695,7 @@ msgstr ""
 "Когда перемещение ТМЦ создано, оно находится в состоянии \"Черновик\".\n"
 " После этого состояние становится \"Подтверждено\".\n"
 " Если ТМЦ доступны состояние становится \"Доступно\".\n"
-" Когда комплектование выполнено, то состояние \"Готово\".              \n"
+" Когда комплектование выполнено, то состояние \"Сделано\".              \n"
 "Состояние \"В ожидании\", если перемещение ожидает другого перемещения."
 
 #. module: stock
@@ -3692,7 +3728,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
-msgstr "готово к обработке."
+msgstr "готов к обработке."
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -4086,6 +4122,11 @@ msgstr "Частичное перемещение"
 msgid "Optional localization details, for information purpose only"
 msgstr "Дополнительные подробности локализации, только в информативных целях"
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4134,9 +4175,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "Dest. Address"
 #~ msgstr "Адрес назначения"
 
-#~ msgid "Qty"
-#~ msgstr "Кол-во"
-
 #~ msgid "Input Packing List"
 #~ msgstr "Lista de embalagens entradas"
 
@@ -4224,9 +4262,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "Packing List:"
 #~ msgstr "Упаковочный перечень"
 
-#~ msgid "weight"
-#~ msgstr "Вес"
-
 #~ msgid ""
 #~ "Tracking lot is the code that will be put on the logistical unit/pallet"
 #~ msgstr "Логистическая единица - это код, присваиваемый упаковке."
@@ -4249,9 +4284,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "Force to use a Production Lot during deliveries"
 #~ msgstr "Принудительно назначать серийный номер партии при перевозке"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Отслеживать исходящие партии"
-
 #~ msgid "Components"
 #~ msgstr "Компоненты"
 
@@ -4261,9 +4293,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "Set Stock to 0"
 #~ msgstr "Установить запасы в 0"
 
-#~ msgid "Canceled"
-#~ msgstr "Отменено"
-
 #~ msgid "Date Order"
 #~ msgstr "Дата заказа"
 
@@ -4350,18 +4379,9 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "is scheduled"
 #~ msgstr "запланировано"
 
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr "Журнал не определен '\\n 'для категории продукции: \"%s\" (id: %d)"
-
 #~ msgid "Packing Done"
 #~ msgstr "Упаковка произведена"
 
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
 #~ msgid "STOCK_MEDIA_FORWARD"
 #~ msgstr "STOCK_MEDIA_FORWARD"
 
@@ -4374,24 +4394,15 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "terp-account"
 #~ msgstr "terp-account"
 
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Задержка исходящей продукции"
-
 #~ msgid "STOCK_ZOOM_100"
 #~ msgstr "STOCK_ZOOM_100"
 
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
 #~ msgid "STOCK_QUIT"
 #~ msgstr "STOCK_QUIT"
 
 #~ msgid "STOCK_DELETE"
 #~ msgstr "STOCK_DELETE"
 
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
 #~ msgid "terp-hr"
 #~ msgstr "terp-hr"
 
@@ -4407,9 +4418,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_FLOPPY"
 #~ msgstr "STOCK_FLOPPY"
 
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
 #~ msgid "STOCK_FIND_AND_REPLACE"
 #~ msgstr "STOCK_FIND_AND_REPLACE"
 
@@ -4422,15 +4430,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "terp-graph"
 #~ msgstr "terp-graph"
 
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
 #~ msgid "STOCK_MEDIA_REWIND"
 #~ msgstr "STOCK_MEDIA_REWIND"
 
@@ -4440,29 +4439,9 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_NEW"
 #~ msgstr "STOCK_NEW"
 
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#, python-format
-#~ msgid ""
-#~ "Total quantity after split exceeds the quantity to split ' \\n               "
-#~ "                     'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Общее количество после разделения превышает разделяемое количество ' \\n "
-#~ "'для этой продукции: \"%s\" (id: %d)"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
 #~ msgid "STOCK_SAVE_AS"
 #~ msgstr "STOCK_SAVE_AS"
 
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
 #~ msgid "STOCK_INDEX"
 #~ msgstr "STOCK_INDEX"
 
@@ -4484,13 +4463,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_GO_FORWARD"
 #~ msgstr "STOCK_GO_FORWARD"
 
-#, python-format
-#~ msgid "No invoice were created"
-#~ msgstr "Счет не был создан"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
 #~ msgid "STOCK_PASTE"
 #~ msgstr "STOCK_PASTE"
 
@@ -4506,14 +4478,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_MEDIA_RECORD"
 #~ msgstr "STOCK_MEDIA_RECORD"
 
-#, python-format
-#~ msgid ""
-#~ "There is no stock output account defined ' \\n                               "
-#~ "             'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Не определен счет для исходящих запасов' \\n 'для этой продукции: \"%s\" "
-#~ "(id: %d)"
-
 #~ msgid "STOCK_FILE"
 #~ msgstr "STOCK_FILE"
 
@@ -4523,12 +4487,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "terp-report"
 #~ msgstr "terp-report"
 
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
 #~ msgid "STOCK_GO_DOWN"
 #~ msgstr "STOCK_GO_DOWN"
 
@@ -4550,43 +4508,18 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_HELP"
 #~ msgstr "STOCK_HELP"
 
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
 #~ msgid "STOCK_UNDO"
 #~ msgstr "STOCK_UNDO"
 
 #~ msgid "STOCK_GO_BACK"
 #~ msgstr "STOCK_GO_BACK"
 
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
 #~ msgid "STOCK_PRINT"
 #~ msgstr "STOCK_PRINT"
 
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
 #~ msgid "STOCK_JUSTIFY_FILL"
 #~ msgstr "STOCK_JUSTIFY_FILL"
 
-#, python-format
-#~ msgid ""
-#~ "There is no stock input account defined ' \\n                                "
-#~ "            'for this product: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Не определен счет входящих запасов ' \\n 'для этой продукции: \"%s\" (id: %d)"
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
 #~ msgid "terp-administration"
 #~ msgstr "terp-administration"
 
@@ -4599,9 +4532,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "terp-crm"
 #~ msgstr "terp-crm"
 
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
 #~ msgid "STOCK_STRIKETHROUGH"
 #~ msgstr "STOCK_STRIKETHROUGH"
 
@@ -4614,135 +4544,47 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_REMOVE"
 #~ msgstr "STOCK_REMOVE"
 
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start module: stock"
-
 #~ msgid "STOCK_JUSTIFY_LEFT"
 #~ msgstr "STOCK_JUSTIFY_LEFT"
 
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
 #~ msgid "STOCK_HARDDISK"
 #~ msgstr "STOCK_HARDDISK"
 
-#~ msgid "Not from Picking"
-#~ msgstr "Не из комплектования"
-
 #~ msgid "Make Picking"
 #~ msgstr "Скомплектовать"
 
-#~ msgid "Inventory (with child locations)"
-#~ msgstr "Инвентаризация (с подчиненными местами хранения)"
-
 #~ msgid "Location Overview"
 #~ msgstr "Обзор мест хранения"
 
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "При создании перемещения ТМЦ его состояние - \"Черновик\".\n"
-#~ " После этого состояние устанавливается в \"Подтверждено\".\n"
-#~ " Если товар доступен, то состояние \"Доступно\".\n"
-#~ " Когда комплектование выполнено, состояние \"Выполнено\"."
-
 #, python-format
 #~ msgid "is consumed with"
 #~ msgstr "потребляется с"
 
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Правила не поддерживаются для объектов osv_memory !"
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "ТМЦ "
 
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
 #~ msgid "terp-stock"
 #~ msgstr "terp-stock"
 
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
 #~ msgid "terp-purchase"
 #~ msgstr "terp-purchase"
 
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#~ msgid "Serial Number"
-#~ msgstr "Серийный номер"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
 #~ msgid "terp-tools"
 #~ msgstr "terp-tools"
 
 #~ msgid "terp-sale"
 #~ msgstr "terp-sale"
 
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
 #~ msgid "STOCK_DIRECTORY"
 #~ msgstr "STOCK_DIRECTORY"
 
 #~ msgid "STOCK_GOTO_LAST"
 #~ msgstr "STOCK_GOTO_LAST"
 
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
 #~ msgid "STOCK_JUSTIFY_CENTER"
 #~ msgstr "STOCK_JUSTIFY_CENTER"
 
@@ -4752,16 +4594,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_MEDIA_PREVIOUS"
 #~ msgstr "STOCK_MEDIA_PREVIOUS"
 
-#, python-format
-#~ msgid "Not Available. Moves are not confirmed."
-#~ msgstr "Недоступно. Перемещения не подтверждены."
-
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
-
-#~ msgid "Extended options..."
-#~ msgstr "Расширенные опции..."
-
 #~ msgid "terp-product"
 #~ msgstr "terp-product"
 
@@ -4772,9 +4604,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "quantity."
 #~ msgstr "количество."
 
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
 #~ msgid "STOCK_DIALOG_AUTHENTICATION"
 #~ msgstr "STOCK_DIALOG_AUTHENTICATION"
 
@@ -4808,15 +4637,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_ZOOM_IN"
 #~ msgstr "STOCK_ZOOM_IN"
 
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные компании."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #~ msgid "STOCK_OPEN"
 #~ msgstr "STOCK_OPEN"
 
@@ -4826,9 +4646,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_NETWORK"
 #~ msgstr "STOCK_NETWORK"
 
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
 #~ msgid "STOCK_REDO"
 #~ msgstr "STOCK_REDO"
 
@@ -4838,9 +4655,6 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_REFRESH"
 #~ msgstr "STOCK_REFRESH"
 
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
-
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
@@ -4901,35 +4715,12 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_HOME"
 #~ msgstr "STOCK_HOME"
 
+#~ msgid "Products Categories"
+#~ msgstr "Категории ТМЦ"
+
+#~ msgid "Stock Variation Account"
+#~ msgstr "Счет изменения стоимости ТМЦ"
+
 #, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr "Вы перемещаете %.2f ТМЦ, но только %.2f доступно в этой партии."
-
-#~ msgid ""
-#~ "The Periodical Inventories are used when you count your number of products "
-#~ "available per location. You can use it, once a year, when you do the general "
-#~ "inventory or, once you need it, to correct the current stock level of a "
-#~ "product."
-#~ msgstr ""
-#~ "Периодические инвентаризации используются для подсчета количеств ТМЦ в месте "
-#~ "хранения. Инвентаризации производятся раз в год, когда производится общая "
-#~ "инвентаризация, или когда вам надо, для корректировки количеств ТМЦ на "
-#~ "складе."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Ошибка: Единицы продажи и единицы измерения должны принадлежать к разным "
-#~ "категориям."
-
-#~ msgid "stock.move.memory"
-#~ msgstr "stock.move.memory"
-
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr ""
-#~ "Это список всех заказов на доставку, которые должны быть подготовлены в "
-#~ "соответствии с вашими заказами на продажу и логистическими правилами."
-
-#~ msgid "Outgoing Deliveries"
-#~ msgstr "Исходящие доставки"
+#~ msgid "INV: "
+#~ msgstr "ИНВ: "
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 402a2489201..5c6a2d6897c 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2087,8 +2087,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2145,7 +2145,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2860,7 +2860,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3904,6 +3904,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -3931,9 +3936,6 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
 
-#~ msgid "Qty"
-#~ msgstr "Kol."
-
 #~ msgid "Input Packing List"
 #~ msgstr "Vhodni pakirni list"
 
@@ -4300,9 +4302,6 @@ msgstr ""
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Preklicano"
-
 #~ msgid "Set Stock to 0"
 #~ msgstr "Postavi zalogo na 0"
 
@@ -4370,9 +4369,6 @@ msgstr ""
 #~ msgid "Move Lines"
 #~ msgstr "Postavke knjižb"
 
-#~ msgid "weight"
-#~ msgstr "masa"
-
 #~ msgid "Supplier Refund"
 #~ msgstr "Dobropis dobavitelja"
 
diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po
index 6095c57ecff..4578cf591c8 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: 2011-04-29 04:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:49+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2088,8 +2088,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2146,7 +2146,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2861,7 +2861,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3904,3 +3904,8 @@ msgstr ""
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
 msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 25c122c4f2a..11aa6fa3c22 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2103,8 +2103,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2161,7 +2161,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2876,7 +2876,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3922,6 +3922,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "STOCK_MEDIA_FORWARD"
 #~ msgstr "STOCK_MEDIA_FORWARD"
 
@@ -3943,20 +3948,12 @@ msgstr ""
 #~ msgid "Sub Products"
 #~ msgstr "Pod proizvod"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Buduće zalihe"
-
 #~ msgid "Amount"
 #~ msgstr "Iznos"
 
 #~ msgid "Fill Inventory for specific location"
 #~ msgstr "Popunite popis za određenu lokaciju"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Buduća proizvodnja"
-
 #~ msgid "Products Received"
 #~ msgstr "Primljeni proizvodi"
 
@@ -3972,10 +3969,6 @@ msgstr ""
 #~ msgid "STOCK_NEW"
 #~ msgstr "STOCK_NEW"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Budući prijemi"
-
 #~ msgid "Incoming Products"
 #~ msgstr "Dolazni proizvodi"
 
@@ -4078,9 +4071,6 @@ msgstr ""
 #~ msgid "STOCK_ZOOM_FIT"
 #~ msgstr "STOCK_ZOOM_FIT"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Praćenje dolaznih partija"
-
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Kalendar isporuka"
 
@@ -4129,10 +4119,6 @@ msgstr ""
 #~ msgid "Tracking Number"
 #~ msgstr "Broj za praćenje"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Buduće isporuke"
-
 #~ msgid "Packing List:"
 #~ msgstr "Otpremnica:"
 
@@ -4232,9 +4218,6 @@ msgstr ""
 #~ msgid "STOCK_STRIKETHROUGH"
 #~ msgstr "STOCK_STRIKETHROUGH"
 
-#~ msgid "Qty"
-#~ msgstr "Kol."
-
 #~ msgid "STOCK_SPELL_CHECK"
 #~ msgstr "STOCK_SPELL_CHECK"
 
@@ -4268,10 +4251,6 @@ msgstr ""
 #~ msgid "Input Packing List"
 #~ msgstr "Ulazna otpremnica"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Buduća kol."
-
 #~ msgid "Not from Packing"
 #~ msgstr "Nije iz pakovanja"
 
@@ -4490,9 +4469,6 @@ msgstr ""
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Praćenje izlaznih partija"
-
 #~ msgid "STOCK_FIND"
 #~ msgstr "STOCK_FIND"
 
@@ -4554,9 +4530,6 @@ msgstr ""
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "Otkazan"
-
 #~ 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 "
@@ -4660,15 +4633,5 @@ msgstr ""
 #~ msgid "Others info"
 #~ msgstr "Ostale informacije"
 
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Ni jedan dnevnik nije defnisan '\\n' za kategoriju projekata: \"%s\" (id: %d)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji akcije."
-
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Kasnjenje izlaza Proizvoda"
diff --git a/addons/stock/i18n/sr@latin.po b/addons/stock/i18n/sr@latin.po
index 61c141fd909..304232c90c9 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2103,8 +2103,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2161,7 +2161,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2876,7 +2876,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3922,16 +3922,14 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "STOCK_SAVE"
 #~ msgstr "STOCK_SAVE"
 
-#, python-format
-#~ msgid ""
-#~ "There is no journal defined '\\n                                'on the "
-#~ "product category: \"%s\" (id: %d)"
-#~ msgstr ""
-#~ "Ni jedan dnevnik nije defnisan '\\n' za kategoriju projekata: \"%s\" (id: %d)"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji akcije."
 
@@ -3944,9 +3942,6 @@ msgstr ""
 #~ msgid "STOCK_ZOOM_100"
 #~ msgstr "STOCK_ZOOM_100"
 
-#~ msgid "Outgoing Products delay"
-#~ msgstr "Kasnjenje izlaza Proizvoda"
-
 #~ msgid "STOCK_QUIT"
 #~ msgstr "STOCK_QUIT"
 
@@ -4234,30 +4229,18 @@ msgstr ""
 #~ msgid "Sub Products"
 #~ msgstr "Pod proizvod"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Buduće zalihe"
-
 #~ msgid "Amount"
 #~ msgstr "Iznos"
 
 #~ msgid "Fill Inventory for specific location"
 #~ msgstr "Popunite popis za određenu lokaciju"
 
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "Buduća proizvodnja"
-
 #~ msgid "Products Received"
 #~ msgstr "Primljeni proizvodi"
 
 #~ msgid "Return packing"
 #~ msgstr "Povratno pakovanje"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "Budući prijemi"
-
 #~ msgid "Incoming Products"
 #~ msgstr "Dolazni proizvodi"
 
@@ -4324,9 +4307,6 @@ msgstr ""
 #~ msgid "Force to use a Production Lot during production order"
 #~ msgstr "Mora da se koristi proizvodna partija u toku prijema"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Praćenje dolaznih partija"
-
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Kalendar isporuka"
 
@@ -4345,10 +4325,6 @@ msgstr ""
 #~ msgid "Tracking Number"
 #~ msgstr "Broj za praćenje"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "Buduće isporuke"
-
 #~ msgid "Non Assigned Products:"
 #~ msgstr "Nedodeljeni proizvodi"
 
@@ -4406,9 +4382,6 @@ msgstr ""
 #~ msgid "Periodical Inventory"
 #~ msgstr "Periodični popis"
 
-#~ msgid "Qty"
-#~ msgstr "Kol."
-
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Nacrt periodičnog popisa"
 
@@ -4430,10 +4403,6 @@ msgstr ""
 #~ msgid "Input Packing List"
 #~ msgstr "Ulazna otpremnica"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "Buduća kol."
-
 #~ msgid "Not from Packing"
 #~ msgstr "Nije iz pakovanja"
 
@@ -4551,9 +4520,6 @@ msgstr ""
 #~ msgid "Chained Delay (days)"
 #~ msgstr "Povezano kašnjenje (dani)"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Praćenje izlaznih partija"
-
 #~ msgid ""
 #~ "This account will be used, instead of the default one, to value input stock"
 #~ msgstr ""
@@ -4591,9 +4557,6 @@ msgstr ""
 #~ msgid "Please select one and only one inventory !"
 #~ msgstr "Izaberite samo jedan popis"
 
-#~ msgid "Canceled"
-#~ msgstr "Otkazan"
-
 #~ 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 "
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index b09b739c04e..e926d7d863b 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -1978,8 +1978,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2036,7 +2036,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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 ""
 
@@ -2703,7 +2703,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3693,3 +3693,8 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 1b9da55f719..48175389c27 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2089,8 +2089,8 @@ msgid "Future Qty"
 msgstr "Future Qty"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2147,7 +2147,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2194,7 +2194,7 @@ msgstr "P&L Qty"
 #: view:stock.production.lot:0
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr "Revisions"
+msgstr "Revideringar"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2863,7 +2863,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3909,6 +3909,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -4080,10 +4085,6 @@ msgstr ""
 #~ msgid "This account will be used to value the output stock"
 #~ msgstr "This account will be used to value the output stock"
 
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Fel platstilldelning !"
-
 #~ msgid "STOCK_ZOOM_FIT"
 #~ msgstr "STOCK_ZOOM_FIT"
 
@@ -4461,11 +4462,6 @@ msgstr ""
 #~ msgid "STOCK_DND_MULTIPLE"
 #~ msgstr "STOCK_DND_MULTIPLE"
 
-#~ msgid "You cannot return a packing with a product quantity zero or less!"
-#~ msgstr ""
-#~ "Du kan inte returnera en förpackning med en produktkvantitet som är noll "
-#~ "eller mindre!"
-
 #~ msgid "STOCK_REMOVE"
 #~ msgstr "STOCK_REMOVE"
 
@@ -4508,11 +4504,6 @@ msgstr ""
 #~ msgid "Auto-Packing"
 #~ msgstr "Auto-Packing"
 
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr ""
-#~ "Du flyttar %.2f produkter men endast %.2f är tillgägliga på denna plats."
-
 #~ msgid "STOCK_JUMP_TO"
 #~ msgstr "STOCK_JUMP_TO"
 
@@ -4701,9 +4692,6 @@ msgstr ""
 #~ msgid "Set Stocks to Zero"
 #~ msgstr "Set Stocks to Zero"
 
-#~ msgid "Aspirix AB"
-#~ msgstr "Aspirix AB"
-
 #~ msgid "STOCK_INDENT"
 #~ msgstr "STOCK_INDENT"
 
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index 57c2cb2b584..07fec36da46 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2088,8 +2088,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2146,7 +2146,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2861,7 +2861,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3905,6 +3905,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Stock Management"
 #~ msgstr "การจัดการคลังสินค้า"
 
@@ -3926,10 +3931,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "ชื่อรุ่นไม่ถูกต้องในการกำหนดการกระทำ"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "คลังสินค้า ในอนาคต"
-
 #~ msgid "Amount"
 #~ msgstr "จำนวน"
 
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index 64cd20dbc7e..64ff4690650 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: 2011-04-29 04:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2087,8 +2087,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2145,7 +2145,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2860,7 +2860,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3903,3 +3903,8 @@ msgstr ""
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
 msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 4b22fdc565d..b26cdf51fc6 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.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:16+0000\n"
-"PO-Revision-Date: 2011-06-25 18:52+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12: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: 2011-06-26 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -158,7 +158,7 @@ msgid "UoM"
 msgstr "Ölçü Birimi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:104
+#: code:addons/stock/wizard/stock_change_product_qty.py:90
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 #, python-format
@@ -191,14 +191,14 @@ msgstr ""
 "ayarlanabilir."
 
 #. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2415
+#: code:addons/stock/stock.py:1176
+#: code:addons/stock/stock.py:2378
 #, python-format
 msgid "Missing partial picking data for move #%s"
 msgstr "#%s hareketi için kısmi alım verileri eksik"
 
 #. module: stock
-#: model:ir.actions.server,name:stock.action_partial_move_server
+#: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
 msgstr "Ürün Alma/Teslim Etme"
 
@@ -257,8 +257,7 @@ msgid "Reference"
 msgstr "Kaynak"
 
 #. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
+#: code:addons/stock/stock.py:661
 #, python-format
 msgid "Products to Process"
 msgstr "İşlenecek Ürünler"
@@ -283,16 +282,15 @@ msgid "Split lines"
 msgstr "Ayırma çizgileri"
 
 #. module: stock
-#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1127
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr "Stok hareketi yapıldı durumunda olduğundan alımı iptal edemezsiniz!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
-#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/stock.py:2198
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
@@ -322,7 +320,7 @@ msgid "Currency in which Unit cost is expressed"
 msgstr "Birim maliyetin ifade edildiği para birimi"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "No invoicing"
 msgstr "Faturalama yok"
@@ -438,7 +436,7 @@ msgid "In Qty"
 msgstr "Gelen Miktar"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "No product in this location."
 msgstr "Bu lokasyonda ürün yok."
@@ -518,7 +516,7 @@ msgid "Move History (child moves)"
 msgstr "Hareket Geçmişi (alt hareketler)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:1984
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
@@ -540,7 +538,7 @@ msgid "Destination Location"
 msgstr "Hedef Lokasyon"
 
 #. module: stock
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
 msgstr "Stok hareketleri olmadan alımı gerçekleştiremezsiniz"
@@ -593,7 +591,7 @@ msgid "Location / Product"
 msgstr "Lokasyon / Ürün"
 
 #. module: stock
-#: code:addons/stock/stock.py:1303
+#: code:addons/stock/stock.py:1306
 #, python-format
 msgid "Reception"
 msgstr "Kabul"
@@ -732,7 +730,7 @@ msgid "Process Picking"
 msgstr "İşlem Alma"
 
 #. module: stock
-#: code:addons/stock/product.py:358
+#: code:addons/stock/product.py:355
 #, python-format
 msgid "Future Receptions"
 msgstr "Gelecek Kabuller"
@@ -817,7 +815,7 @@ msgid "Merge Inventory"
 msgstr "Stok Birleştir"
 
 #. module: stock
-#: code:addons/stock/product.py:374
+#: code:addons/stock/product.py:371
 #, python-format
 msgid "Future P&L"
 msgstr "Gelecek Kâr ve Zarar"
@@ -1083,7 +1081,7 @@ msgid "Author"
 msgstr "Yazar"
 
 #. module: stock
-#: code:addons/stock/stock.py:1302
+#: code:addons/stock/stock.py:1305
 #, python-format
 msgid "Delivery Order"
 msgstr "Teslim Emri"
@@ -1233,7 +1231,7 @@ msgstr ""
 "için kaynak konum olarak, varsayılan yerine bu stok lokasyonu kullanılacaktır"
 
 #. module: stock
-#: code:addons/stock/stock.py:2006
+#: code:addons/stock/stock.py:1975
 #, python-format
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
@@ -1243,7 +1241,7 @@ msgstr ""
 "kategorisinde Varyant hesabı aynıdır."
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: code:addons/stock/stock.py:1322
 #, python-format
 msgid "is in draft state."
 msgstr "taslak durumunda."
@@ -1268,7 +1266,7 @@ msgid "Chaining Type"
 msgstr "Zincirleme Türü"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "To be refunded/invoiced"
 msgstr "İade edilecek/faturalandırılacak"
@@ -1308,7 +1306,7 @@ msgid "Additional Info"
 msgstr "Ek Bilgi"
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1602
 #, python-format
 msgid "Operation forbidden"
 msgstr "Operasyon yasaklandı"
@@ -1319,7 +1317,7 @@ msgid "From"
 msgstr "Başlangıç"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:77
+#: code:addons/stock/wizard/stock_return_picking.py:79
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1449,13 +1447,12 @@ msgid "None"
 msgstr "Yok"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action3
 #: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr "Çıkış izlenebilirliği"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "No Invoices were created"
 msgstr "Hiçbir Fatura oluşturulmadı"
@@ -1517,7 +1514,7 @@ msgstr ""
 "Bu lokasyon tüm firmalar arasında paylaşılıyorsa, bu alanı boş bırakın"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2198
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
 msgstr "Lütfen ıskarta için pozitif bir değer girin!"
@@ -1564,7 +1561,7 @@ msgid "Supplier Location"
 msgstr "Tedarikçi Lokasyonu"
 
 #. module: stock
-#: code:addons/stock/stock.py:2254
+#: code:addons/stock/stock.py:2217
 #, python-format
 msgid "were scrapped"
 msgstr "ıskartaya atıldı"
@@ -1680,7 +1677,7 @@ msgid "Stock report by tracking lots"
 msgstr "Lot izleyerek stok raporu"
 
 #. module: stock
-#: code:addons/stock/product.py:370
+#: code:addons/stock/product.py:367
 #, python-format
 msgid "Delivered Qty"
 msgstr "Teslim Edilen Miktar"
@@ -1757,7 +1754,7 @@ msgid "Warehouse Dashboard"
 msgstr "Depo Performans Değerlendirme Panosu"
 
 #. module: stock
-#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:510
 #, python-format
 msgid "You can not remove a lot line !"
 msgstr "Bir lot satırını silemezsiniz!"
@@ -1771,7 +1768,7 @@ msgid "Scrap Products"
 msgstr "Iskarta Ürünler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1128
+#: code:addons/stock/stock.py:1135
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
 msgstr "%s durumunda olan bir alımı silemezsiniz!"
@@ -1828,13 +1825,13 @@ msgid "Shipping Address :"
 msgstr "Teslimat Adresi:"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Provide the quantities of the returned products."
 msgstr "İade edilen ürünlerin miktarını girin."
 
 #. module: stock
-#: code:addons/stock/stock.py:2009
+#: code:addons/stock/stock.py:1978
 #, python-format
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
@@ -1921,7 +1918,7 @@ msgid "Quantity per lot"
 msgstr "Lot başına Miktar"
 
 #. module: stock
-#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:1981
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
@@ -1931,7 +1928,7 @@ msgstr ""
 "mevcut değil: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:360
+#: code:addons/stock/product.py:357
 #, python-format
 msgid "Received Qty"
 msgstr "Alınan Miktar"
@@ -2094,7 +2091,6 @@ msgstr "Maliyet"
 #: 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 "Stok Giriş Hes."
 
@@ -2154,7 +2150,7 @@ msgid "Inventory loss"
 msgstr "Envanter kaybı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1311
+#: code:addons/stock/stock.py:1314
 #, python-format
 msgid "Document"
 msgstr "Belge"
@@ -2247,15 +2243,15 @@ msgid "Warehouse board"
 msgstr "Depo değerlendirme panosu"
 
 #. module: stock
-#: code:addons/stock/product.py:380
+#: code:addons/stock/product.py:377
 #, python-format
 msgid "Future Qty"
 msgstr "Gelecek Miktar"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Stok Varyasyon Hesabı"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2278,13 +2274,13 @@ msgid "Shipping Type"
 msgstr "Sevkiyat Tipi"
 
 #. module: stock
-#: code:addons/stock/stock.py:2210
+#: code:addons/stock/stock.py:2175
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "Sadece taslak hareketlerini silebilirsiniz."
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #: 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
@@ -2311,7 +2307,7 @@ msgid "Location where the system will stock the finished products."
 msgstr "Sistemin tamamlanan ürünleri stoklayacağı lokasyon."
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2356,7 +2352,7 @@ msgid "Expected date for the picking to be processed"
 msgstr "İşlenecek alım için beklenen tarih"
 
 #. module: stock
-#: code:addons/stock/product.py:376
+#: code:addons/stock/product.py:373
 #, python-format
 msgid "P&L Qty"
 msgstr "Kâr ve Zarar Miktarı"
@@ -2452,7 +2448,7 @@ msgid "Source"
 msgstr "Kaynak"
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:2557
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
 #: field:stock.inventory.line,inventory_id:0
@@ -2492,7 +2488,7 @@ msgstr "Seri izleme"
 #. 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/stock.py:751
 #, python-format
 msgid "Error !"
 msgstr "Hata!"
@@ -2562,7 +2558,7 @@ msgid "Maxtor Suppliers"
 msgstr "Maxtor Tedarikçileri"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
+#: code:addons/stock/wizard/stock_change_product_qty.py:66
 #: code:addons/stock/wizard/stock_change_standard_price.py:106
 #, python-format
 msgid "Active ID is not set in Context"
@@ -2676,7 +2672,7 @@ msgstr ""
 "%d)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2302
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr "Negatif veya miktarı sıfır olan bir hareketi kullanamazsınız!"
@@ -2736,7 +2732,7 @@ msgid "Quantity (UOS)"
 msgstr "Miktar (2.Br.)"
 
 #. module: stock
-#: code:addons/stock/stock.py:1664
+#: code:addons/stock/stock.py:1647
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
@@ -2776,7 +2772,7 @@ msgid "Properties"
 msgstr "Özellikler"
 
 #. module: stock
-#: code:addons/stock/stock.py:974
+#: code:addons/stock/stock.py:982
 #, python-format
 msgid "Error, no partner !"
 msgstr "Hata, hiç ortak yok!"
@@ -2784,7 +2780,6 @@ msgstr "Hata, hiç ortak yok!"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
 msgstr "Teslim Sekilleri"
@@ -2827,7 +2822,7 @@ msgid "Inventory Reference"
 msgstr "Envanter Referansı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1304
+#: code:addons/stock/stock.py:1307
 #, python-format
 msgid "Internal picking"
 msgstr "Dahili alım"
@@ -2916,7 +2911,7 @@ msgid "Date done"
 msgstr "Tamamlanan Tarih"
 
 #. module: stock
-#: code:addons/stock/stock.py:975
+#: code:addons/stock/stock.py:983
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
@@ -2995,14 +2990,14 @@ msgid "Product"
 msgstr "Ürün"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "Invoicing"
 msgstr "Faturalandırma"
 
 #. module: stock
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Please provide Proper Quantity !"
 msgstr "Lütfen Uygun Bir Miktar girin!"
@@ -3029,7 +3024,7 @@ msgid "Consume Products"
 msgstr "Ürünleri Kullan"
 
 #. module: stock
-#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1646
 #, python-format
 msgid "Insufficient Stock in Lot !"
 msgstr "Lotta Yetersiz Stok!"
@@ -3073,7 +3068,7 @@ msgstr "Kategoriye Göre Ürün"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "Ürün Kategorileri"
 
 #. module: stock
@@ -3181,7 +3176,7 @@ msgid "All at once"
 msgstr "Tümünü birden"
 
 #. module: stock
-#: code:addons/stock/stock.py:1620
+#: code:addons/stock/stock.py:1603
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
@@ -3191,7 +3186,7 @@ msgstr ""
 "hareketlerinde değiştirilemez (Yönetici hariç)"
 
 #. module: stock
-#: code:addons/stock/product.py:386
+#: code:addons/stock/product.py:383
 #, python-format
 msgid "Future Productions"
 msgstr "Sonraki Üretimler"
@@ -3202,7 +3197,7 @@ msgid "To Invoice"
 msgstr "Faturalandırılacak"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Return lines"
 msgstr "İade kalemleri"
@@ -3283,8 +3278,7 @@ msgid "Icon"
 msgstr "ikon"
 
 #. module: stock
-#: code:addons/stock/stock.py:2209
-#: code:addons/stock/stock.py:2617
+#: code:addons/stock/stock.py:2174
 #, python-format
 msgid "UserError"
 msgstr "Kullanıcı Hatası"
@@ -3311,14 +3305,14 @@ msgstr "Avrupalı Olmayan Müşteriler"
 #: 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/wizard/stock_fill_inventory.py:47
+#: code:addons/stock/stock.py:1975
+#: code:addons/stock/stock.py:1978
+#: code:addons/stock/stock.py:1981
+#: code:addons/stock/stock.py:1984
+#: code:addons/stock/stock.py:1987
+#: code:addons/stock/stock.py:1990
+#: code:addons/stock/stock.py:2302
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
@@ -3326,7 +3320,7 @@ msgid "Error!"
 msgstr "Hata!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2021
+#: code:addons/stock/stock.py:1990
 #, python-format
 msgid ""
 "There is no inventory variation account defined on the product category: "
@@ -3361,7 +3355,7 @@ msgstr ""
 "Bir seferde ya da doğrudan teslimatla teslim edilecek malları belirtir"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #, python-format
 msgid "This picking list does not require invoicing."
 msgstr "Bu alım listesi faturalandırma gerektirmez."
@@ -3405,8 +3399,8 @@ msgid "Warning"
 msgstr "Uyarı"
 
 #. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:1321
+#: code:addons/stock/stock.py:2557
 #, python-format
 msgid "is done."
 msgstr "yapıldı."
@@ -3512,7 +3506,7 @@ msgid "Reporting"
 msgstr "Raporlama"
 
 #. module: stock
-#: code:addons/stock/stock.py:1313
+#: code:addons/stock/stock.py:1316
 #, python-format
 msgid " for the "
 msgstr " için "
@@ -3565,7 +3559,7 @@ msgid "Chaining Journal"
 msgstr "Zincirleme Defteri"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr "Yeterli stok yok, ürünler rezerve edilemiyor."
@@ -3576,7 +3570,7 @@ msgid "Customers"
 msgstr "Müşteriler"
 
 #. module: stock
-#: code:addons/stock/stock.py:1317
+#: code:addons/stock/stock.py:1320
 #, python-format
 msgid "is cancelled."
 msgstr "iptal edildi."
@@ -3587,13 +3581,13 @@ msgid "Stock Inventory Lines"
 msgstr "Stok Envanter Kalemleri"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #, python-format
 msgid "Process Document"
 msgstr "İşlem Belgesi"
 
 #. module: stock
-#: code:addons/stock/product.py:368
+#: code:addons/stock/product.py:365
 #, python-format
 msgid "Future Deliveries"
 msgstr "Sonraki Teslimatlar"
@@ -3769,7 +3763,7 @@ msgid "Existing Lot"
 msgstr "Mevcut Lot"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
 msgstr "En az bir tane sıfır olmayan miktar belirtin!"
@@ -3784,7 +3778,7 @@ msgstr ""
 "kaynak konum olarak, varsayılan yerine bu stok lokasyonu kullanılacaktır"
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
 msgstr "işleme hazır."
@@ -3800,7 +3794,7 @@ msgid "Set to zero"
 msgstr "Sıfırla"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
 #, python-format
 msgid "None of these picking lists require invoicing."
 msgstr "Bu alım listelerinin hiçbiri faturalandırma gerektirmiyor."
@@ -3812,14 +3806,14 @@ msgstr "Kasım"
 
 #. module: stock
 #: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
+#: code:addons/stock/stock.py:1987
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
 "Ürün kategorisinde tanımlanan hiçbir defter mevcut değil: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:382
+#: code:addons/stock/product.py:379
 #, python-format
 msgid "Unplanned Qty"
 msgstr "Planlanmayan Miktar"
@@ -3859,16 +3853,16 @@ msgid "Move History (parent moves)"
 msgstr "Hareket Geçmşi (üst hareketler)"
 
 #. module: stock
-#: code:addons/stock/product.py:364
+#: code:addons/stock/product.py:361
 #, python-format
 msgid "Future Stock"
 msgstr "Sonraki Stok"
 
 #. 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:510
+#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1135
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "Error"
 msgstr "Hata"
@@ -4006,7 +4000,7 @@ msgid "Split Move"
 msgstr "Hareketi Ayır"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:92
+#: code:addons/stock/wizard/stock_return_picking.py:97
 #, python-format
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
@@ -4055,7 +4049,6 @@ msgstr ""
 "ayarlanmazsa, ürün kategorisinde olan kullanılır."
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
 #: view:stock.tracking:0
 msgid "Upstream traceability"
 msgstr "Giriş izlenebilirliği"
@@ -4067,7 +4060,7 @@ msgid "Location Content"
 msgstr "Lokasyon İçeriği"
 
 #. module: stock
-#: code:addons/stock/product.py:388
+#: code:addons/stock/product.py:385
 #, python-format
 msgid "Produced Qty"
 msgstr "Üretilen Miktar"
@@ -4076,7 +4069,6 @@ msgstr "Üretilen Miktar"
 #: 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 "Stok Çıkış Hes."
 
@@ -4130,13 +4122,12 @@ msgid "Invoiced date"
 msgstr "Faturalandırma Tarihi"
 
 #. module: stock
-#: code:addons/stock/stock.py:732
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/stock.py:729
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #: 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/wizard/stock_return_picking.py:79
+#: code:addons/stock/wizard/stock_return_picking.py:97
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Warning !"
 msgstr "Uyarı!"
@@ -4184,6 +4175,11 @@ msgstr "Kısmi Hareket"
 msgid "Optional localization details, for information purpose only"
 msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı"
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
@@ -4253,9 +4249,6 @@ msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı"
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "Teslimat Takvimi"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "Giren Lotları İzle"
-
 #~ msgid "Latest Date of Inventory"
 #~ msgstr "Son Envanter Tarihi"
 
@@ -4424,9 +4417,6 @@ msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı"
 #~ msgid "Chained Delay (days)"
 #~ msgstr "Zincirlenmiş Gecikme (Gün)"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "Çıkan Lotları İzle"
-
 #~ msgid "Tracking"
 #~ msgstr "Takip"
 
@@ -4798,6 +4788,12 @@ msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı"
 #~ msgid "Product "
 #~ msgstr "Ürün "
 
+#~ msgid "Stock Variation Account"
+#~ msgstr "Stok Varyasyon Hesabı"
+
+#~ msgid "Products Categories"
+#~ msgstr "Ürün Kategorileri"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "FAT: "
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index a1370f03bf7..0a0d954763a 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -2091,8 +2091,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2864,7 +2864,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3910,6 +3910,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index ed4f0c43ff9..856da579eb3 100644
--- a/addons/stock/i18n/vi.po
+++ b/addons/stock/i18n/vi.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-05-02 02:30+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\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: 2011-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -719,7 +719,7 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Now"
-msgstr "Process Now"
+msgstr "Xử lý bây giờ"
 
 #. module: stock
 #: field:stock.location,address_id:0
@@ -1001,13 +1001,13 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr "Author"
+msgstr "Tác giả"
 
 #. module: stock
 #: code:addons/stock/stock.py:1305
 #, python-format
 msgid "Delivery Order"
-msgstr ""
+msgstr "Yêu cầu Giao hàng"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory_in
@@ -2091,8 +2091,8 @@ msgid "Future Qty"
 msgstr "Future Qty"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2641,7 +2641,7 @@ msgstr "Đến"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process"
-msgstr "Tiến trình"
+msgstr "Xử lý"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -2868,7 +2868,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
@@ -3533,7 +3533,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
-msgstr ""
+msgstr "sẵn sàng để xử lý."
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -3914,6 +3914,11 @@ msgstr ""
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
@@ -4074,10 +4079,6 @@ msgstr ""
 #~ msgid "This account will be used to value the output stock"
 #~ msgstr "This account will be used to value the output stock"
 
-#, python-format
-#~ msgid "Bad Lot Assignation !"
-#~ msgstr "Bad Lot Assignation !"
-
 #~ msgid "STOCK_ZOOM_FIT"
 #~ msgstr "STOCK_ZOOM_FIT"
 
@@ -4457,9 +4458,6 @@ msgstr ""
 #~ msgid "STOCK_DND_MULTIPLE"
 #~ msgstr "STOCK_DND_MULTIPLE"
 
-#~ msgid "You cannot return a packing with a product quantity zero or less!"
-#~ msgstr "You cannot return a packing with a product quantity zero or less!"
-
 #~ msgid "STOCK_REMOVE"
 #~ msgstr "STOCK_REMOVE"
 
@@ -4502,10 +4500,6 @@ msgstr ""
 #~ msgid "Auto-Packing"
 #~ msgstr "Auto-Packing"
 
-#, python-format
-#~ msgid "You are moving %.2f products but only %.2f available in this lot."
-#~ msgstr "You are moving %.2f products but only %.2f available in this lot."
-
 #~ msgid "STOCK_JUMP_TO"
 #~ msgstr "STOCK_JUMP_TO"
 
@@ -4632,9 +4626,6 @@ msgstr ""
 #~ msgid "Set Stock to 0"
 #~ msgstr "Set Stock to 0"
 
-#~ msgid "Công ty cổ phần y tế An Phú Hưng"
-#~ msgstr "Công ty cổ phần y tế An Phú Hưng"
-
 #~ msgid "Localisation"
 #~ msgstr "Localisation"
 
@@ -4724,179 +4715,16 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
 
-#~ msgid "terp-rating-rated"
-#~ msgstr "terp-rating-rated"
-
-#~ msgid "terp-emblem-important"
-#~ msgstr "terp-emblem-important"
-
-#~ msgid "terp-mail-forward"
-#~ msgstr "terp-mail-forward"
-
-#~ msgid "terp-stock_effects-object-colorize"
-#~ msgstr "terp-stock_effects-object-colorize"
-
-#~ msgid "terp-folder-blue"
-#~ msgstr "terp-folder-blue"
-
-#~ msgid "terp-personal+"
-#~ msgstr "terp-personal+"
-
-#~ msgid "terp-dialog-close"
-#~ msgstr "terp-dialog-close"
-
-#~ msgid "terp-personal-"
-#~ msgstr "terp-personal-"
-
-#~ msgid "terp-dolar"
-#~ msgstr "terp-dolar"
-
-#~ msgid "terp-gtk-jump-to-ltr"
-#~ msgstr "terp-gtk-jump-to-ltr"
-
-#~ msgid "terp-stock_symbol-selection"
-#~ msgstr "terp-stock_symbol-selection"
-
-#~ msgid "terp-stage"
-#~ msgstr "terp-stage"
-
-#~ msgid "terp-accessories-archiver-minus"
-#~ msgstr "terp-accessories-archiver-minus"
-
-#~ msgid "terp-gdu-smart-failing"
-#~ msgstr "terp-gdu-smart-failing"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
 
-#~ msgid "terp-face-plain"
-#~ msgstr "terp-face-plain"
-
-#~ msgid "terp-gnome-cpu-frequency-applet+"
-#~ msgstr "terp-gnome-cpu-frequency-applet+"
-
-#~ msgid "terp-gtk-media-pause"
-#~ msgstr "terp-gtk-media-pause"
-
-#~ msgid "terp-stock_format-scientific"
-#~ msgstr "terp-stock_format-scientific"
-
-#~ msgid "terp-go-today"
-#~ msgstr "terp-go-today"
-
-#~ msgid "terp-gtk-go-back-rtl"
-#~ msgstr "terp-gtk-go-back-rtl"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
-
-#~ msgid "terp-mail-"
-#~ msgstr "terp-mail-"
-
-#~ msgid "terp-call-start"
-#~ msgstr "terp-call-start"
-
-#~ msgid "terp-locked"
-#~ msgstr "terp-locked"
-
-#~ msgid "terp-personal"
-#~ msgstr "terp-personal"
-
-#~ msgid "terp-accessories-archiver"
-#~ msgstr "terp-accessories-archiver"
-
-#~ msgid "terp-gtk-go-back-ltr"
-#~ msgstr "terp-gtk-go-back-ltr"
-
-#~ msgid "terp-mail-replied"
-#~ msgstr "terp-mail-replied"
-
-#~ msgid "terp-folder-green"
-#~ msgstr "terp-folder-green"
-
-#~ msgid "terp-stock_align_left_24"
-#~ msgstr "terp-stock_align_left_24"
-
-#~ msgid "terp-folder-orange"
-#~ msgstr "terp-folder-orange"
-
-#~ msgid "terp-accessories-archiver+"
-#~ msgstr "terp-accessories-archiver+"
-
-#~ msgid "terp-folder-yellow"
-#~ msgstr "terp-folder-yellow"
-
-#~ msgid "terp-dolar_ok!"
-#~ msgstr "terp-dolar_ok!"
-
-#~ msgid "terp-go-year"
-#~ msgstr "terp-go-year"
-
-#~ msgid "terp-gtk-jump-to-rtl"
-#~ msgstr "terp-gtk-jump-to-rtl"
-
-#~ msgid "terp-idea"
-#~ msgstr "terp-idea"
-
-#~ msgid "terp-stock_format-default"
-#~ msgstr "terp-stock_format-default"
-
-#~ msgid "terp-check"
-#~ msgstr "terp-check"
-
-#~ msgid "terp-camera_test"
-#~ msgstr "terp-camera_test"
-
-#~ msgid "terp-gtk-stop"
-#~ msgstr "terp-gtk-stop"
-
-#~ msgid "terp-go-week"
-#~ msgstr "terp-go-week"
-
-#~ msgid "terp-go-home"
-#~ msgstr "terp-go-home"
-
-#~ msgid "terp-document-new"
-#~ msgstr "terp-document-new"
-
-#, python-format
-#~ msgid "Invoices"
-#~ msgstr "Các hóa đơn"
-
-#~ msgid "terp-mail_delete"
-#~ msgstr "terp-mail_delete"
-
-#~ msgid "terp-go-month"
-#~ msgstr "terp-go-month"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Tên nhóm phải duy nhất !"
-
-#~ msgid "weight"
-#~ msgstr "trọng lượng"
-
 #~ msgid "Direct Delivery"
 #~ msgstr "Giao hàng trực tiếp"
 
-#~ msgid "terp-gtk-select-all"
-#~ msgstr "terp-gtk-select-all"
-
-#~ msgid "terp-mail-message-new"
-#~ msgstr "terp-mail-message-new"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Độ dài trường dữ liệu không thể nhỏ hơn 1"
-
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "số lượng"
 
-#~ msgid "Serial Number"
-#~ msgstr "Số xê-ri"
-
-#~ msgid "Error! You can not create recursive companies."
-#~ msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Sản phẩm "
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 2d8e2e97fa4..6eeb8827879 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-05-04 10:26+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:51+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: 2011-05-05 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -24,18 +24,18 @@ msgstr "跟踪出库批次"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_upload
 msgid "Stock ups upload"
-msgstr ""
+msgstr "仓库备货上传"
 
 #. module: stock
 #: code:addons/stock/product.py:76
 #, python-format
 msgid "Variation Account is not specified for Product Category: %s"
-msgstr "产品类型“%s”没有指定科目"
+msgstr "产品分类“%s”没有指定科目"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "如果固定为连锁存货地点"
+msgstr "如果固定为连锁库位"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -88,7 +88,7 @@ msgstr "调拨分析"
 msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
-msgstr "内部的引用编号它不同与制造商序号"
+msgstr "内部相关单号它不同与制造商序列号"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -96,12 +96,12 @@ msgid ""
 "Periodical Inventories are used to count the number of products available "
 "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 "定期盘点表用于盘点每个存货地点的可用产品数量.你可以在每年一次的普通盘点时使用它,或者在纠正当前产品库存时需要用到它."
+msgstr "定期盘点表用于盘点每个库位的可用产品数量.你可以在每年一次的普通盘点时使用它,或者在纠正当前产品库存时需要用到它."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr "装箱单列表"
+msgstr "装箱单"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -132,7 +132,7 @@ msgstr "数量"
 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 "这列表是根据你的销售订单和你的建立的配送规则已准备好的所有送货单."
+msgstr "这列表是根据您的销售订单和您建立的配送规则已准备好的所有送货单."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -163,7 +163,7 @@ msgstr "实物盘点表"
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr "库存凭证簿"
+msgstr "库存账簿"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -177,7 +177,7 @@ msgid ""
 "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 "在进行实时库存估值时,所有出库调拨等价的凭证簿项将被登记在这科目.它是该类型所有产品的默认值,它可以直接设在每个产品上."
+msgstr "在进行实时盘点估值时,所有出库调拨的分录将登记在这科目.它是该产品分类的默认值,它可以直接设在每个产品上."
 
 #. module: stock
 #: code:addons/stock/stock.py:1176
@@ -205,7 +205,7 @@ msgid ""
 "The current move line is already assigned to a pack, please remove it first "
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
-msgstr "当前调拨明细已分配到托盘,如果你真想改变产品: \"%s\" (id: %d)请先删除它."
+msgstr "当前调拨明细已分配到托盘,如果你真想修改产品: \"%s\" (id: %d)请先删除它."
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -215,7 +215,7 @@ msgstr "无效"
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr "其它编号或序列号"
+msgstr "其它单号或序列号"
 
 #. module: stock
 #: field:stock.move,origin:0
@@ -258,7 +258,7 @@ msgstr "错误!你不能创建递归的分类"
 msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
-msgstr "如果选定此处，那么所有产品数量将设为零以确保实物盘点操作的完成。"
+msgstr "如果勾选，所有产品数量将设为零以确保实物盘点操作的完成。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -269,7 +269,7 @@ msgstr "拆分明细"
 #: code:addons/stock/stock.py:1127
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
-msgstr "库存调拨是完成的状态不能取消装箱单!"
+msgstr "库存调拨在完成状态，不能取消装箱单!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2198
@@ -301,7 +301,7 @@ msgstr "业务伙伴"
 #: help:stock.move.memory.in,currency:0
 #: help:stock.move.memory.out,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr "使用单位成本的金额形式表示"
+msgstr "单位成本金额的币别"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:135
@@ -319,7 +319,7 @@ msgstr "生产批次"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr "计量单位类别"
+msgstr "计量单位分类"
 
 #. module: stock
 #: help:stock.incoterms,code:0
@@ -329,13 +329,13 @@ msgstr "贸易术语代码"
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr "这托盘对应的库存调拨"
+msgstr "这托盘的库存调拨"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "内部存货地点"
+msgstr "内部库位"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -405,29 +405,29 @@ msgstr "预计日期"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 msgid "Outgoing Product"
-msgstr "出库货品"
+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 "创建与管理您的仓库并在此给它分配一个存货地点."
+msgstr "创建与管理您的仓库并在此给它分配一个库位."
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr "按数量"
+msgstr "入库数量"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "No product in this location."
-msgstr "这存货地点没有产品"
+msgstr "该库位没有产品。"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "出库的存货地点"
+msgstr "出库库位"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.split_into
@@ -438,7 +438,7 @@ msgstr "分拆到"
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr "平均价格使用的货币"
+msgstr "平均价格使用的币别"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -446,24 +446,24 @@ 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 "在进行实时库存估值时,所有入库调拨对应的凭证簿项将登记入这科目.如果不是设置在这产品上就是设置在这产品的类别上."
+msgstr "在进行实时盘点估值时,所有入库调拨的分录将记录在这科目.如果不是设置在这产品上就是设置在这产品分类上."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr "存货地点类型"
+msgstr "库位类型"
 
 #. 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 "指定送货或收货的货运类型"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
-msgstr "单项标签"
+msgstr "标签"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
@@ -488,7 +488,7 @@ msgstr "["
 msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
-msgstr "当前此产品批次在公司仓库内的产品存量"
+msgstr "生产批次在公司仓库内的可用产品数量"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -501,7 +501,7 @@ msgstr "调拨日志(下级调拨)"
 msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
-msgstr "此产品或产品种类“%s（标识：%d）”没有设置出库科目"
+msgstr "此产品或产品分类“%s(id:%d)”没有设置出库科目"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -513,13 +513,13 @@ msgstr "内部调拨"
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr "目标存货地点"
+msgstr "目标库位"
 
 #. module: stock
 #: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "您不能处理没有调拨信息的装箱单"
+msgstr "您不能处理没有调拨的装箱单"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
@@ -551,7 +551,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr "库存控制"
+msgstr "盘点控制"
 
 #. module: stock
 #: view:stock.location:0
@@ -563,7 +563,7 @@ msgstr "附加信息"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr "存货地点/产品"
+msgstr "库位/产品"
 
 #. module: stock
 #: code:addons/stock/stock.py:1306
@@ -586,7 +586,7 @@ msgstr "生产批次修订"
 msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
-msgstr "强制指定所有库存调拨产品的的生产批次和要去的客户存货地点."
+msgstr "强制指定所有库存调拨产品的的生产批次和要发往的客户库位."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -595,18 +595,18 @@ msgid ""
 "specific journal according to the type of operation to perform or the "
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
-msgstr "系统允许你根据执行操作的类型或员工/团队将执行的操作对每个库存操作指定一个具体的凭证簿.例如质量控制,领料单,装箱单等."
+msgstr "系统允许你根据执行操作的类型或员工/团队将执行的操作对每个库存操作指定一个具体的账簿.例如质量控制,领料单,装箱单等."
 
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr "存货地点名称"
+msgstr "库位名称"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr "已登入库存"
+msgstr "已记录的盘点"
 
 #. module: stock
 #: view:stock.move:0
@@ -617,7 +617,7 @@ msgstr "调拨信息"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr "出货"
+msgstr "出库"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -635,7 +635,7 @@ msgstr "托盘"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "您尝试为其它产品赋予批次"
+msgstr "您尝试为不同的产品分配批次"
 
 #. module: stock
 #: view:res.partner:0
@@ -650,7 +650,7 @@ msgstr "6月"
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "需求存货地点"
+msgstr "需求库位"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -665,13 +665,13 @@ msgstr "生产批次"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
-msgstr "接收者"
+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 "存货地点结构"
+msgstr "库位结构"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -688,7 +688,7 @@ msgstr "盘点表明细"
 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 "在做实时库存估值时,库存调拨处理将自动登入这凭证簿条目里."
+msgstr "在进行实时盘点估值时,库存调拨处理将自动登入这账簿的明细里."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
@@ -699,7 +699,7 @@ msgstr "处理装箱单"
 #: code:addons/stock/product.py:355
 #, python-format
 msgid "Future Receptions"
-msgstr "未来入库的货物"
+msgstr "未来的入库"
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -707,7 +707,7 @@ msgstr "未来入库的货物"
 msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
-msgstr "选择此选项在列表中选择下列现有的批号,否则您输入一个新的."
+msgstr "勾选此选项在列表中选择列表中现有的批次,否则您输入一个新的."
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -723,7 +723,7 @@ msgstr "立即处理"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "存货地点地址"
+msgstr "库位地址"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
@@ -733,12 +733,12 @@ msgstr "生产批次是生产的一个序列号"
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "输入存货地点"
+msgstr "入库库位"
 
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr "此单据上的日期"
+msgstr "订单的日期"
 
 #. module: stock
 #: selection:product.product,valuation:0
@@ -748,7 +748,7 @@ msgstr "定期（手动进行）"
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr "需求单"
+msgstr "需求"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
@@ -758,13 +758,13 @@ msgstr "IT供应商"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr "盘点表草稿"
+msgstr "实物盘点表草稿"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr "用于公司间转移的中途存货地点"
+msgstr "公司间转移的中途库位"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
@@ -776,20 +776,20 @@ msgstr "更改产品数量"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr "合并盘点表"
+msgstr "合并盘点"
 
 #. module: stock
 #: code:addons/stock/product.py:371
 #, python-format
 msgid "Future P&L"
-msgstr "未来产品&存货地点"
+msgstr "未来的产品和库位"
 
 #. module: stock
 #: 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
@@ -806,12 +806,12 @@ msgstr "包含"
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr "来料产品延迟"
+msgstr "入库产品延迟"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr "库存存货地点"
+msgstr "库存库位"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -828,7 +828,7 @@ msgstr "现有拆分明细"
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "预定日期"
+msgstr "日程表日期"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -844,7 +844,7 @@ msgstr "紧急"
 #: view:stock.picking:0
 #: report:stock.picking.list:0
 msgid "Journal"
-msgstr "凭证簿"
+msgstr "账簿"
 
 #. module: stock
 #: code:addons/stock/stock.py:1315
@@ -858,7 +858,7 @@ msgid ""
 "Keep empty if you produce at the location where the finished products are "
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
-msgstr "如果您在需要在成品存货地点生产请留空.如在固定地点生产请设置存货地点.如果您外包这生产,这也可以是业务伙伴的存货地点."
+msgstr "如果您需要在成品库位生产请留空.如在固定地点生产请设置库位.如果您外包这生产,这也可以是业务伙伴的库位."
 
 #. module: stock
 #: view:res.partner:0
@@ -873,7 +873,7 @@ msgstr "执行前置时间(天)"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "按存货地点的库存"
+msgstr "按库位的库存"
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -891,7 +891,7 @@ msgstr "上月"
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
-msgstr "如果取消选中“可用”字段那么您可以不删除但隐藏存货地点."
+msgstr "通过取消勾选有效字段您可以隐藏而不是删除库位."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -936,12 +936,12 @@ msgstr "错误：无效的(EAN)条码"
 #, python-format
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
-msgstr "这产品: \"%s\" (id: %d)没定义出仓科目"
+msgstr "这产品: \"%s\" (id: %d)没定义出库科目"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "生产存货地点"
+msgstr "生产库位"
 
 #. module: stock
 #: help:stock.picking,address_id:0
@@ -1009,19 +1009,19 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
-"* 供应商存货地点 : 虚拟的存货地点代表产品的来源位置从你的供应商.\n"
-"* 视图 : 虚拟存货地点用于为你仓库建立一个分等级的结构,下级存货地点的聚集点不能直接有产品.\n"
-"* 内部存货地点: 实际的存货地点,在你仓库内部.\n"
-"* 客户存货地点: 虚拟存货地点代表产品的最终目标位置在你客户那.\n"
-"* 盘点: 虚拟存货地点为对你盘点操作服务,用于确认库存量(实物盘点表)\n"
-"* 需求: 虚拟存货地点为一个临时需求作业服务其来源是(供应商或生产)还不得而知,当完成需求计划调度运算它是空的.\n"
-"* 生产: 虚拟生产作业的存货地点: 这存货地点消耗原材料和生成成品\n"
+"* 供应商库位 : 虚拟的库位代表产品从供应商来源位置.\n"
+"* 视图 : 虚拟库位用于在你仓库建立一个分层的结构,下级库位是合计不能直接有产品.\n"
+"* 内部库位 : 你仓库内部的实际的库位.\n"
+"* 客户库位 : 虚拟库位代表产品在你客户的目标位置.\n"
+"* 盘点: 虚拟库位为对你盘点操作服务,用于确认库存量(实物盘点表)\n"
+"* 需求 : 虚拟库位为一个临时需求作业服务其来源是(供应商或生产)还不得而知,当完成运行需求调度这应该为空.\n"
+"* 生产 : 虚拟生产作业的库位: 这库位可以有消耗品,原材料,成品\n"
 "                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr "作者"
+msgstr "建立者"
 
 #. module: stock
 #: code:addons/stock/stock.py:1305
@@ -1083,7 +1083,7 @@ msgstr "实物盘点"
 msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
-msgstr "公司的装箱单列表将适用于控制连锁调拨(如果为空使用默认规则)"
+msgstr "公司的装箱单将包含连锁调拨(如果为空使用默认公司规则)"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1091,12 +1091,12 @@ msgid ""
 "Shipping Type of the Picking List that will contain the chained move (leave "
 "empty to automatically detect the type based on the source and destination "
 "locations)."
-msgstr "装箱单列表的运送类型将控制连锁调拨(为空为自动检测来源和目标存货地点的类型)"
+msgstr "装箱单的运送类型将包含连锁调拨(为空根据源和目标库位自动检测)"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr "批次号"
+msgstr "批号"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
@@ -1108,7 +1108,7 @@ msgstr "产品计量单位"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "业务伙伴存货地点"
+msgstr "业务伙伴库位"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1120,7 +1120,7 @@ msgstr "总数量"
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr "消耗调拨"
+msgstr "消耗品调拨"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -1135,7 +1135,7 @@ msgstr "在来源调拨和连锁调拨间耽搁的天数"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr "在下面的存货地点导入当前产品的库存量"
+msgstr "在下面的库位导入当前产品盘点"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1146,10 +1146,10 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"只有当您选择一个连锁存货地点类型.\n"
+"选择一个连库位的类型.\n"
 "\"自动调拨\"值将在创建库存调拨后将自动使当前库存值生效.\n"
 "\"手动操作\"库存调拨要手动确认生效.\n"
-"\"自动,不增加步骤\"这存货地点是取代调拨的来源."
+"\"自动不增加步骤\"这库位取代调拨的源."
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -1162,7 +1162,7 @@ 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 production "
 "orders"
-msgstr "对当前产品,这存货地点将被使用,替代默认的作为按生产订单产生的库存调拨源存货地点."
+msgstr "对当前产品,这库位将作为默认的生产订单产生的库存调拨的源库位."
 
 #. module: stock
 #: code:addons/stock/stock.py:1975
@@ -1170,7 +1170,7 @@ msgstr "对当前产品,这存货地点将被使用,替代默认的作为按生
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Variant account on category of this product are same."
-msgstr "这产品定义这出库科目或用同类别的科目,无法创建凭证."
+msgstr "这产品定义的默认出库科目与用产品分类的变动科目相同,无法创建分录."
 
 #. module: stock
 #: code:addons/stock/stock.py:1322
@@ -1188,7 +1188,7 @@ msgstr "这列出了您所有托盘.当您选择一个托盘,您可以获取此
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_final
 msgid "Stock ups final"
-msgstr ""
+msgstr "最终仓库备货"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -1250,7 +1250,7 @@ msgstr "来自"
 #: code:addons/stock/wizard/stock_return_picking.py:79
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
-msgstr "您可能只返回确认,可用或者已完成的装箱单!"
+msgstr "您只希望返回已确认,可用或已完成的装箱单!"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1266,7 +1266,7 @@ msgstr "生产批次修订"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr "内部装箱单列表"
+msgstr "内部装箱单"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -1292,7 +1292,7 @@ msgstr "搜索装箱单"
 #: code:addons/stock/product.py:93
 #, python-format
 msgid "Company is not specified in Location"
-msgstr "公司没指定存货地点"
+msgstr "公司没指定库位"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1308,7 +1308,7 @@ msgstr "一般IT供应商"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr "装箱单列表:"
+msgstr "装箱单:"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -1339,13 +1339,13 @@ msgstr "装箱单"
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "客户存货地点"
+msgstr "客户库位"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:85
 #, python-format
 msgid "Invalid action !"
-msgstr "无效的动作！"
+msgstr "无效操作！"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:139
@@ -1357,7 +1357,7 @@ msgstr "收货信息"
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr "存货地点盘点总览"
+msgstr "库位盘点总览"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement
@@ -1400,19 +1400,19 @@ msgstr "收货"
 #: help:stock.incoterms,active:0
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
-msgstr "如果您不选中“可用”字段，那么将隐藏但不删除此记录。"
+msgstr "取消勾选有效字段，那么将隐藏但不删除此记录。"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 #: field:stock.picking,date:0
 msgid "Order Date"
-msgstr "单据日期"
+msgstr "订单日期"
 
 #. module: stock
 #: field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr "上级存货地点"
+msgstr "上级库位"
 
 #. module: stock
 #: help:stock.picking,state:0
@@ -1425,23 +1425,22 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
-"* 草稿：尚未确认但不会被计划安排直到确认\n"
-"* 已确认：等待产品可用库存足够\n"
-"* 可用：仓库已经保留货品，只待确认\n"
-"* 等待中：在自动变为可用状态之前等待其它调拨的进行（比如在“按订单生产”的流程中）\n"
-"* 完成：已经处理完毕，不能修改或取消\n"
-"* 已取消：已被取消，不能确认"
+"* 草稿：尚未确认也不会被日程安排直到确认\n"
+"* 确认：产品可用仍在等待\n"
+"* 可用：备用产品，只待确认\n"
+"* 等待中：在自动变为可用状态前等待其它调拨 （比如：在“按订单生产”的流程中）\n"
+"* 完成：已处理完，不能修改或取消* 已取消：已被取消，不能再确认"
 
 #. module: stock
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
-msgstr "如果此存货地点要在所有公司间共享，请保持此字段为空"
+msgstr "如果此库位要在所有公司间共享，请保持此字段为空"
 
 #. module: stock
 #: code:addons/stock/stock.py:2198
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr "“消耗”字段请填写一个正数"
+msgstr "“损耗”字段请填写一个正数"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1469,11 +1468,11 @@ 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"
-"    如果计划安排没找到产品,将设为\"不可用\"状态.\n"
-"    当产品被保留将设为\"可用\"状态.\n"
-"    当完成装箱单状态是\"完成\"\n"
-"    如果这调拨在等待另外的东西状态为\"等待\""
+"当创建的库存调拨状态为\"草稿\". \n"
+"如果在调度没找到产品,将设为\"不可用\"状态.\n"
+" 当产品被保留将设为\"可用\"状态.\n"
+"当完成装箱单状态是\"完成\". \n"
+"如果这调拨在等待其它东西状态为\"等待\"."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1486,7 +1485,7 @@ msgstr "供货商库位"
 #: code:addons/stock/stock.py:2217
 #, python-format
 msgid "were scrapped"
-msgstr "已消耗"
+msgstr "已损耗"
 
 #. module: stock
 #: view:stock.move:0
@@ -1515,7 +1514,7 @@ msgstr "库存统计"
 #: field:stock.move.memory.in,currency:0
 #: field:stock.move.memory.out,currency:0
 msgid "Currency"
-msgstr "币种"
+msgstr "币别"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1527,7 +1526,7 @@ msgstr "追踪生产批次"
 #, python-format
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
-msgstr "请在列表视图中选择多个待合并的盘点表"
+msgstr "请在列表视图中选择多个待合并的盘点"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1556,7 +1555,7 @@ msgstr "取消可用"
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr "此库存调拨处理的计划日期"
+msgstr "此库存调拨处理的日程表日期"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
@@ -1566,7 +1565,7 @@ msgstr "已创建库存调拨"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr "架子 2"
+msgstr "货架 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
@@ -1576,18 +1575,18 @@ msgstr "跟踪批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr "积压订单"
+msgstr "退货单"
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr "对应存货地点属性"
+msgstr "对应的库存属性"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr "本地化"
+msgstr "位置"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
@@ -1598,7 +1597,7 @@ msgstr "批次跟踪库存报表"
 #: code:addons/stock/product.py:367
 #, python-format
 msgid "Delivered Qty"
-msgstr "已交货数量"
+msgstr "已配送数量"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
@@ -1610,7 +1609,7 @@ msgstr "批次拆分"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr "生产批次号"
+msgstr "生产批号"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1632,12 +1631,12 @@ msgstr "日期"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Extended Filters..."
-msgstr "扩展过滤器..."
+msgstr "增加筛选条件"
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "存货地点库存"
+msgstr "库位库存"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -1663,7 +1662,7 @@ msgstr "代码"
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr "批次号"
+msgstr "批号"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
@@ -1730,7 +1729,7 @@ msgstr "拆分生产批次"
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
 msgid "Location"
-msgstr "存货地点"
+msgstr "库位"
 
 #. module: stock
 #: view:product.template:0
@@ -1740,7 +1739,7 @@ msgstr "信息"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr "运输地址:"
+msgstr "送货地址:"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:120
@@ -1754,7 +1753,7 @@ msgstr "输入退货的数量"
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Variant account on category of this product are same."
-msgstr "无法建立凭证,请为产品或产品分类定义科目"
+msgstr "无法建立分录,产品默认入库科目与产品分类的变动科目相同"
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -1765,7 +1764,7 @@ msgstr "成本价"
 #: view:product.product:0
 #: field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr "库存核算"
+msgstr "盘点估值"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1783,7 +1782,7 @@ msgstr "稍候处理"
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
-msgstr "默认作为您接收当前业务伙伴产品的来源存货地点"
+msgstr "默认作为您接收当前业务伙伴产品的源库位"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
@@ -1795,7 +1794,7 @@ msgstr "拥有者地址"
 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 "字段用于记录这产品的成本,在确认装箱单时设置(用于在平均价格里计算成本)"
+msgstr "字段用于记录这产品的成本,用户在确认装箱单时设置(用于在计算成本的平均价格)"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1803,7 +1802,7 @@ msgid ""
 "Moves Analysis allows you to easily check and analyse your company stock "
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
-msgstr "调拨分析让您轻松检查和分析您公司的库存调拨.在您分析公司不同路线的费用和库存管理的绩效时使用这报表."
+msgstr "调拨分析让您轻松检查和分析您公司的库存调拨.在您分析公司取得产品的不同路线和盘点管理的绩效时使用这报表."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -1818,7 +1817,7 @@ msgstr "价格"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr "查询库存"
+msgstr "查询盘点"
 
 #. module: stock
 #: field:stock.move.track,quantity:0
@@ -1831,7 +1830,7 @@ msgstr "每批次数量"
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
-msgstr "这产品或品它的类别 : \"%s\" (id: %d) 没定义入库科目"
+msgstr "这产品或它的分类 : \"%s\" (id: %d) 没定义入库科目"
 
 #. module: stock
 #: code:addons/stock/product.py:357
@@ -1849,14 +1848,14 @@ msgstr "内部单号"
 msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
-msgstr "显示这序号时的可选前缀: PREFIX/SERIAL [INT_REF]"
+msgstr "显示这序列号时的可选前缀: 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 "导入盘点"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1894,21 +1893,18 @@ msgid ""
 "day)\n"
 "    "
 msgstr ""
-"系统的库存管理模块可以管理多个仓库,多层次的库存存储地点结构.\n"
+"系统的库存管理模块可以管理多个仓库,多层次的库存库位结构.\n"
 "由于才用复式记账管理所以其库存控制是强大和灵活的.\n"
-"* 库存调拨日志和计划.\n"
-"* 不同的库存管理方式(先进先出,先进后出...)\n"
-"* 库存估价(标准价或平均价.....)\n"
-"* 对库存差异的鲁棒性.\n"
-"* 自动再订购规则(按库存设置,JIT...)\n"
-"* 支持条码.\n"
-"* 通过复式记账系统能快速发现错误.\n"
-"* 可追溯(先上,向下,生产批次,序号...)\n"
-"* 仓库控制台包括:\n"
-"    * 接收的产品(日期 <=今天)\n"
-"    * 异常需求.\n"
-"    * 图表: 实际产品接收数量和计划的对比(每个工作日的条状图)\n"
-"    * 图表: 实际产品发货数量和计划的对比(每个工作日的条状图)\n"
+"  * 库存调拨日志和计划.\n"
+"  * 不同的盘点管理方式(先进先出,先进后出...)\n"
+"  * 库存估价(标准价或平均价.....)\n"
+"  * 对盘点差异的鲁棒性.\n"
+"  * 自动再订购规则(按库存设置,JIT...)\n"
+"  * 支持条码. * 通过复式记账系统能快速发现错误.\n"
+"  * 可追溯(先上,向下,生产批次,序列号...)\n"
+"  * 仓库控制台包括: * 接收的产品(日期 <=今天)\n"
+"  * 异常需求. * 图表: 实际产品接收数量和计划的对比(每个工作日的条状图)\n"
+"  * 图表: 实际产品发货数量和计划的对比(每个工作日的条状图)\n"
 "    "
 
 #. module: stock
@@ -1917,7 +1913,7 @@ msgid ""
 "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"
-msgstr "在你盘点这产品时,这库存的存货地点将替代默认值作为库存调拨的来源存货地点.."
+msgstr "在你盘点这产品时,这库存的库位将替代默认值作为库存调拨的源库位"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -1951,7 +1947,7 @@ msgstr "]"
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "库存存货地点"
+msgstr "盘点库位"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1964,7 +1960,7 @@ msgstr "总计"
 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 "库存凭证簿在连锁调拨将被记录,如果连锁类型不清楚(如左为空,凭证簿不记录)"
+msgstr "盘点账簿在连锁调拨将被记录,如果连锁类型不清楚(如左为空,账簿不记录)"
 
 #. module: stock
 #: view:board.board:0
@@ -1975,7 +1971,7 @@ msgstr "来货"
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr "创建时间"
+msgstr "创建"
 
 #. module: stock
 #: field:stock.move.memory.in,cost:0
@@ -1999,7 +1995,7 @@ msgstr "仓库管理"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr "分批出货"
+msgstr "部分交付"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -2009,14 +2005,14 @@ msgstr "自动，不加入步骤"
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr "库存存货地点分析"
+msgstr "库存库位分析"
 
 #. module: stock
 #: help:stock.move,date:0
 msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
-msgstr "调拨日期: 计划直到调拨完成的日期,这日期是调拨实际处理完的日期."
+msgstr "调拨日期: 直到调拨完成的日程表日期,这日期是调拨实际处理完的日期."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -2036,7 +2032,7 @@ msgstr "分组..."
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr "连锁存货地点"
+msgstr "连锁库位"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
@@ -2072,7 +2068,7 @@ msgstr "产品： "
 msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
-msgstr "为这产品的所有调拨和产生的生产单强制指定一个生产批号."
+msgstr "为所有调拨包括这产品和生成的生产单强制指定一个生产批次."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
@@ -2083,18 +2079,18 @@ msgstr "跟踪调拨"
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr "更改"
+msgstr "更新"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr "设为报价单"
+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 "库存日志"
+msgstr "库存账簿"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2140,9 +2136,9 @@ msgid "Future Qty"
 msgstr "未来数量"
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "库存变动科目"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2195,14 +2191,14 @@ msgstr "送货方式"
 #: 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 "系统存储成品的库位"
 
 #. module: stock
-#: help:product.category,property_stock_variation: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 "一个产品当开启实时盘点估值时,此科目将记录产品的当前价格."
+msgstr "产品当开启实时盘点估值时,此科目将记录产品的当前价格."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2213,8 +2209,8 @@ 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 ""
-"这能接收单独的产品,不管它们是来自采购订单还是装箱单.你会发现这列表包含所有等待的产品.一旦你收到订单,你就能基于供应商名称或采购订单筛选,然后您能用每个"
-"明细最右边的按钮确认接收产品."
+"在这您能接收单独的产品,不管它们是来自采购订单还是装箱单.您将找到所有等待的产品.一旦您收到订单,您就能基于供应商名称或采购订单筛选然后您能用每个明细最右"
+"边的按钮确认接收产品."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2235,13 +2231,13 @@ msgstr "调拨"
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr "处理此装箱单的计划日期"
+msgstr "处理此装箱单的预定日期"
 
 #. module: stock
 #: code:addons/stock/product.py:373
 #, python-format
 msgid "P&L Qty"
-msgstr "益损数量"
+msgstr "损益数量"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -2263,8 +2259,9 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
-"如果一产品开启实时估价,系统将自动用凭证记录库存调拨.这库存变动科目设置在这产品类别上,它将表示这库存产品的价格.库存入库出库科目将记录调拨的入库产品和出"
-"库产品."
+"如果产品开启实时估值,系统将自动用分录记录对应的库存调拨.\r\n"
+"库存变动科目设置在这产品分类上,它表示当前库存产品的价值.\r\n"
+"库存入库科目和出库科目将记录调拨的入库产品和出库产品."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2272,7 +2269,7 @@ msgid ""
 "Inventory Analysis allows you to easily check and analyse your company stock "
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
-msgstr "库存分析方便您检查和分析公司的库存水平.对单据排序和设定分组标准以更好分析和管理你公司的运作."
+msgstr "盘点分析方便您检查和分析公司的库存水平.对单据排序和设定分组标准以更好分析和管理你公司的运作."
 
 #. module: stock
 #: help:report.stock.move,location_id:0
@@ -2280,7 +2277,7 @@ msgstr "库存分析方便您检查和分析公司的库存水平.对单据排
 msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
-msgstr "如果您的产品在一个固定的存货地点设置一个存货地点,如果您分包生产这可以是业务伙伴的存货地点."
+msgstr "如果您的产品在一个固定的库位设置一个库位,如果您转包生产这可以是业务伙伴的库位."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -2295,9 +2292,10 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
-"定义您的存货地点来反映您仓库的结构和组织.系统能管理物理的存货地点(仓库,货架,存储箱等),业务伙伴的存货地点(客户,供应商).和库存操作对应的实际存货地"
-"点如生产单损耗,盘点等.系统的库存操,调拨从一个存货地点到另一个存货地点.如您从业务伙伴接收产品,产品,调拨将从业务伙伴存货地点到库存存货地点.每份报表能"
-"阐述物理的,业务伙伴的或虚拟的存货地点."
+"定义您的库位反映您仓库的结构和组织.\r\n"
+"系统能管理物理库位(仓库,货架,存储箱等),业务伙伴的库位(客户,供应商).和库存操作对应的虚拟库位如生产单损耗,盘点等.\r\n"
+"系统的库存操,调拨从一个库位到另一个库位.例如：您从业务伙伴接收产品,产品,调拨将从业务伙伴库位到库存库位.\r\n"
+"每份报表能阐述物理的,业务伙伴的或虚拟的库位."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -2318,7 +2316,7 @@ msgstr "优先级"
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr "来源"
+msgstr "源"
 
 #. module: stock
 #: code:addons/stock/stock.py:2557
@@ -2340,12 +2338,12 @@ msgstr "装箱单"
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
-msgstr "序列号和内部单号的组合必须是唯一."
+msgstr "序列号和内部单号必须是唯一."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups
 msgid "Stock ups"
-msgstr ""
+msgstr "库存备货"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2369,7 +2367,7 @@ msgstr "错误！"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement_result
 msgid "Stock Replacement result"
-msgstr "库存替换结构"
+msgstr "库存替换结果"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
@@ -2380,7 +2378,7 @@ msgstr "计量单位"
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr "固定存货地点"
+msgstr "固定库位"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -2399,7 +2397,7 @@ msgid ""
 "specific filtering criteria. If you do frequent and partial inventories, you "
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
-msgstr "显示您产品的最后库存并用特定的过滤规则去排序.如果您经常部分盘点,您需要确保这报表至少每年一次包含库存的所有产品."
+msgstr "显示您产品的最后盘点并用特定的筛选规则去排序.如果您经常部分盘点,您需要确保这报表至少每年一次包含库存的所有产品."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2413,13 +2411,13 @@ msgstr "库存量预报"
 #: field:stock.journal,name:0
 #: field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
-msgstr "库存凭证簿"
+msgstr "库存账簿"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "产品需求"
+msgstr "需求"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
@@ -2431,7 +2429,7 @@ msgstr "Maxtor 供应商"
 #: code:addons/stock/wizard/stock_change_standard_price.py:106
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr "上下文里没有设置活动标识"
+msgstr "上下文里没有设置活动ID"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2480,18 +2478,18 @@ msgstr "月"
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr "结束日期"
+msgstr "完成日期"
 
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr "唯一的生产批次号，将显示为 前缀/序列号 [INT_REF]"
+msgstr "唯一的生产批次，将显示为 前缀/序列号 [INT_REF]"
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
-msgstr "如果您没有选中“可用”字段，那么将隐藏但不删除此记录。"
+msgstr "取消勾选有效字段，那么将隐藏但不删除此记录。"
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -2501,7 +2499,7 @@ msgstr "是"
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr "库存清单"
+msgstr "盘点"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2551,13 +2549,13 @@ msgstr "实际库存"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr "填写盘点表"
+msgstr "填写盘点"
 
 #. module: stock
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误:默认的计量单位和采购的计量单位必须是处于同一分类下。"
+msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -2566,7 +2564,7 @@ msgid ""
 "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."
-msgstr "当进行实时库存估值时,对应的所有入库调拨凭证项将记录到这科目上,它是产品分类的默认值,它能直接设定在每个产品上."
+msgstr "当进行实时盘点估值时,对应的所有入库调拨分录将记录到这科目上,它是产品分类的默认值,它能直接设定在每个产品上."
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -2586,7 +2584,7 @@ msgstr "批次"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr "生产批次号"
+msgstr "生产批号"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2613,7 +2611,7 @@ msgstr "联系地址："
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr "返回单"
+msgstr "退货单"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -2625,7 +2623,7 @@ msgstr "有效"
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 msgid "Inventory Management"
-msgstr "库存管理"
+msgstr "盘点管理"
 
 #. module: stock
 #: view:product.template:0
@@ -2665,7 +2663,7 @@ msgstr "贸易术语是一系列的销售术语,用来划分交易成本和买
 msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
-msgstr "如果选择,产品可选择的存货地点将包含子存货地点."
+msgstr "如果选择,产品可选择的库位将包含子库位."
 
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
@@ -2717,7 +2715,7 @@ 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 "(保持为空去打开当前状态.把所有资源的\"从\"日期调整为 HH:MM:SS为00:00:00,\"到\"日期为23:59:59)"
+msgstr "(保持为空去打开当前状态.调整所有\"从\"的筛选资源的日期为 HH:MM:SS为00:00:00和\"到\"的日期为23:59:59)"
 
 #. module: stock
 #: view:product.category:0
@@ -2751,7 +2749,7 @@ msgstr "更改标准价"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr "虚拟存货地点"
+msgstr "虚拟库位"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2806,7 +2804,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
@@ -2845,7 +2843,7 @@ msgstr "产品"
 #: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "Invoicing"
-msgstr "发票"
+msgstr "开发票"
 
 #. module: stock
 #: code:addons/stock/stock.py:2237
@@ -2862,7 +2860,7 @@ msgstr "产品销售单位"
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
-msgstr "高度（Z）"
+msgstr "层(Z)"
 
 #. module: stock
 #: field:stock.ups,weight:0
@@ -2873,7 +2871,7 @@ msgstr "批次重量"
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr "消耗的产品"
+msgstr "消耗品"
 
 #. module: stock
 #: code:addons/stock/stock.py:1646
@@ -2916,11 +2914,11 @@ msgstr "总价"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr "分类的产品"
+msgstr "产品分类"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "产品分类"
 
 #. module: stock
@@ -2933,12 +2931,12 @@ msgstr "向导"
 #: 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 "产品存货地点"
+msgstr "库位的产品"
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr "包括下级"
+msgstr "包括子项"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
@@ -2955,8 +2953,8 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
-"内部调拨显示您仓库里必须要执行的操作.所有操作都能被划分入库存凭证簿使每个员工都有自己的日志记录自己执行的操作,大多数操作系统根据您预先设置物流规则自动准"
-"备,但您也可以记录手动的库存操作."
+"内部调拨显示您仓库里必须要执行的盘点操作.\r\n"
+"所有操作都被归类入库存账簿这样每个员工都有自己的账簿记录自己执行的操作,大多数操作系统根据您预先设置物流规则自动准备,但您也可以记录手动的库存操作."
 
 #. module: stock
 #: view:stock.move:0
@@ -2973,7 +2971,7 @@ msgstr "托盘编号"
 #: field:report.stock.move,location_id:0
 #: field:stock.move,location_id:0
 msgid "Source Location"
-msgstr "来源存货地点"
+msgstr "源库位"
 
 #. module: stock
 #: view:product.template:0
@@ -3016,7 +3014,7 @@ msgstr "新托盘"
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr "目标存货地点"
+msgstr "目标"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -3029,7 +3027,7 @@ msgstr "全部一次性"
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
-msgstr "不能修改已经处理的库存调拨的数量,计量单位,产品和存货地点.(除非是管理员)"
+msgstr "不能修改已经处理的库存调拨的数量,计量单位,产品和库位.(除非是管理员)"
 
 #. module: stock
 #: code:addons/stock/product.py:383
@@ -3111,8 +3109,8 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
-"这列表是您所有生产批次的记录(序号),当你选择一个批次你可以向上或向下追溯在这批次的产品.在默认情况下,这列表在您的仓库筛选可用的序号,但您能不点击\"可"
-"用\"按钮去以获得您生产,收货,发货的所有批次."
+"这列表是您所有生产批次的记录(序号),当您选择一个批次您可以向上或向下追溯在这批次的产品.\r\n"
+"在默认情况下,这列表在您的仓库筛选可用的序号,但您能在不勾选\"可用\"按钮下去获得您所有生产,收货,发货的批次."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3167,12 +3165,12 @@ msgstr "错误！"
 msgid ""
 "There is no inventory variation account defined on the product category: "
 "\"%s\" (id: %d)"
-msgstr "产品分类“%s”（标识：%d）没有定义库存变动科目！"
+msgstr "产品分类“%s”(id:%d)没有定义盘点变动科目！"
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories ?"
-msgstr "你真的要合并库存?"
+msgstr "你真的要合并盘点?"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3220,10 +3218,11 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
-"决定这存货地点是不是连锁存货地点的头,比如这存货地点接收来货然后送到连锁存货地点的下一个位置.连锁存货地点的类型包括:\n"
-"* 不是: 不是连锁存货地点.\n"
-"* 客户: 这连锁存货地点将来自客户的存货地点,它在装箱单指定为来源.\n"
-"* 固定存货地点: 这连锁存货地点来自下一个地点."
+"决定这库位是不是连锁库位的头,比如这库位接收来货然后送到连锁库位的下一个位置.\n"
+"连锁库位的类型包括:\n"
+"  * 不是 : 不是连锁库位.\n"
+"  * 客户 : 这连锁库位将来自客户的库位,它在收货的装箱单指定为源.\n"
+"  * 固定库位 : 如果连锁库位为固定."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
@@ -3251,7 +3250,7 @@ msgstr "送货单"
 msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
-msgstr "这存货地点替代默认值作为您送货物到业务伙伴的目标存货地点."
+msgstr "这库存库位替代默认值作为您送货物到业务伙伴的目标库位."
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3260,23 +3259,23 @@ msgstr "这存货地点替代默认值作为您送货物到业务伙伴的目标
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr "确定"
+msgstr "已确定"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "确认"
+msgstr "确定"
 
 #. module: stock
 #: help:stock.location,icon:0
 msgid "Icon show in  hierarchical tree view"
-msgstr "树视图显示的图标"
+msgstr "层树视图显示的图标"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
-msgstr "合并盘存"
+msgstr "合并盘点"
 
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
@@ -3292,12 +3291,12 @@ msgstr "收货："
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
-msgstr "这选项确定这存货地点能不能放置废料"
+msgstr "这选项确定这库位能不能放置废料"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "关联的装箱单"
+msgstr "装箱单"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3333,7 +3332,7 @@ msgstr "发票: %s"
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "报表"
+msgstr "报告"
 
 #. module: stock
 #: code:addons/stock/stock.py:1316
@@ -3355,7 +3354,7 @@ msgstr "创建发票"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
-msgstr "配置"
+msgstr "设置"
 
 #. module: stock
 #: field:stock.inventory.line.split,use_exist:0
@@ -3367,7 +3366,7 @@ msgstr "已存在批次"
 #: field:product.product,location_id:0
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "库存存货地点"
+msgstr "库存库位"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -3378,19 +3377,19 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
-"如果成本价格上升,库存变动科目将记入借方并且出库科目将记入贷方,其值是(相差的金额 * 数量).\n"
-"如果成本价格下降,库存变动科目为贷方,入库科目为借方."
+"如果成本价格增加,库存变动科目为借方,出库科目为贷方,其值=(相差的金额 * 数量).\n"
+"如果成本价格减少,库存变动科目为贷方,入库科目为借方."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr "连锁存货地点凭证簿"
+msgstr "连锁库位账簿"
 
 #. module: stock
 #: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr "没足够的库存没法保存产品"
+msgstr "没足够的库存不能预订这产品"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -3412,7 +3411,7 @@ msgstr "库存盘点明细"
 #: code:addons/stock/wizard/stock_partial_picking.py:74
 #, python-format
 msgid "Process Document"
-msgstr "处理方式"
+msgstr "处理单据"
 
 #. module: stock
 #: code:addons/stock/product.py:365
@@ -3435,7 +3434,7 @@ msgstr "托盘"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Date Expected"
-msgstr "日期预计"
+msgstr "预计日期"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3444,12 +3443,12 @@ msgid ""
 "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 "这来料送货列表是您将从供应商那收货的所有产品,其来自与采购订单.您能使送货单全部或部分生效."
+msgstr "这入库送货列表是您将从供应商那收货的所有产品,其来自与采购订单.您能使送货单全部或部分生效."
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "自动确认"
+msgstr "自动审核"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3477,7 +3476,9 @@ msgid ""
 "This menu gives you the full traceability of inventory operations on a "
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
-msgstr "这菜单使您对指定产品追溯其全部的库存操作.您可以筛选这产品看到的过去或未来的运作."
+msgstr ""
+"这菜单使您对指定产品追溯其全部的盘点操作.\r\n"
+"您可以筛选这产品看到的过去或未来的调拨."
 
 #. module: stock
 #: view:stock.picking:0
@@ -3487,14 +3488,14 @@ msgstr "退货产品"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr "使盘点生效"
+msgstr "审核盘点"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
 msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
-msgstr "字段用于记录用户在确认装箱单时所用的货币(用在平均价格计算成本方法上)."
+msgstr "字段用于记录用户在确认装箱单时所用的币别(用于计算平均成本价格)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
@@ -3529,7 +3530,7 @@ msgstr "货架 2"
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+msgstr "错误！您不能创建递归的商会成员。"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -3579,7 +3580,7 @@ msgstr "耽搁出仓的产品"
 #. module: stock
 #: field:stock.move.split.lines,use_exist:0
 msgid "Existing Lot"
-msgstr "现有的批次"
+msgstr "已存在批次"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:204
@@ -3592,7 +3593,7 @@ msgstr "请指定一个不为0的数量!"
 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 "对现有产品这库存存货地点将用来替代默认作为库存调拨产生的需求的来源存货地点."
+msgstr "对现有产品这库存库位将用来替代默认作为库存调拨产生的需求的源库位."
 
 #. module: stock
 #: code:addons/stock/stock.py:1319
@@ -3603,7 +3604,7 @@ msgstr "准备过程"
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr "产生此装箱单的原始单据编号。"
+msgstr "产生此产品装箱单的单号"
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -3626,7 +3627,7 @@ msgstr "11月"
 #: code:addons/stock/stock.py:1987
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
-msgstr "这产品分类: \"%s\" (id: %d)没定义凭证簿."
+msgstr "这产品分类: \"%s\" (id: %d)没定义账簿."
 
 #. module: stock
 #: code:addons/stock/product.py:379
@@ -3654,7 +3655,7 @@ msgstr "1月"
 msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
-msgstr "强制为这产品的所有调拨和这供应商存货地点指定一个生产批次"
+msgstr "强制为这产品的所有调拨和来自这供应商库位指定一个生产批次"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -3697,7 +3698,9 @@ msgid ""
 "This is the structure of your company's warehouses and locations. You can "
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
-msgstr "您公司的仓库和存货地点结构.您可以点击一个存货地点来获得指定存货地点和它的所有子项的产品的列表和库存量."
+msgstr ""
+"这是您公司的仓库和库位结构.\r\n"
+"您可以点击一个库位来获得指定库位和它的所有子项的产品的列表和库存量."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -3732,7 +3735,7 @@ msgstr "开发票"
 #: model:ir.ui.menu,name:stock.menu_action_location_form
 #: view:stock.picking:0
 msgid "Locations"
-msgstr "存货地点"
+msgstr "库位"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3766,7 +3769,7 @@ msgstr "调拨"
 #: field:report.stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr "目标存货地点"
+msgstr "目标库位"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
@@ -3814,7 +3817,7 @@ msgstr "拆分调拨"
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
-msgstr "没有产品给退货(明细在完成状态但能退货)"
+msgstr "没有产品给退货(只有在完成状态和没完全退完才能退货)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -3850,7 +3853,7 @@ 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 "在进行实时库存估值时,对应的出库调拨分录项将被记录在这个科目;如果没设置在这产品上就是设置在这产品分类里."
+msgstr "在进行实时库存估值时,对应的出库调拨分录将被记录在这个科目;如果没设置在这产品上就是设置在这产品分类里."
 
 #. module: stock
 #: view:stock.tracking:0
@@ -3861,7 +3864,7 @@ msgstr "向上追溯"
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr "存货地点包含"
+msgstr "库位包括"
 
 #. module: stock
 #: code:addons/stock/product.py:385
@@ -3879,7 +3882,7 @@ msgstr "出库科目"
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr "连锁存货地点类型"
+msgstr "连锁库位类型"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
@@ -3907,7 +3910,7 @@ msgstr "生产批次标识"
 #: field:stock.location,scrap_location:0
 #: view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "报废存货地点"
+msgstr "废料库位"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -3939,7 +3942,7 @@ msgstr "警告！"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr "发出"
+msgstr "出库"
 
 #. module: stock
 #: selection:stock.move.split.lines,action:0
@@ -3965,7 +3968,7 @@ msgstr "年"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr "物理存货地点"
+msgstr "物理库位"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
@@ -3977,7 +3980,12 @@ msgstr "部分调拨"
 #: help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr "可选存货地点信息仅供参考"
+msgstr "可选库位，仅供参考"
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "状态"
@@ -4033,14 +4041,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "terp-account"
 #~ msgstr "terp-account"
 
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "预计库存"
-
-#, python-format
-#~ msgid "Futur Productions"
-#~ msgstr "计划生产"
-
 #~ msgid "STOCK_ZOOM_100"
 #~ msgstr "STOCK_ZOOM_100"
 
@@ -4050,10 +4050,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "STOCK_NEW"
 #~ msgstr "STOCK_NEW"
 
-#, python-format
-#~ msgid "Futur Receptions"
-#~ msgstr "预期接收"
-
 #~ msgid "STOCK_QUIT"
 #~ msgstr "STOCK_QUIT"
 
@@ -4159,10 +4155,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "terp-stock"
 #~ msgstr "terp-stock"
 
-#, python-format
-#~ msgid "Futur Deliveries"
-#~ msgstr "计划交货"
-
 #~ msgid "STOCK_MEDIA_RECORD"
 #~ msgstr "STOCK_MEDIA_RECORD"
 
@@ -4232,9 +4224,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "terp-partner"
 #~ msgstr "terp-partner"
 
-#~ msgid "Qty"
-#~ msgstr "数量"
-
 #~ msgid "STOCK_SPELL_CHECK"
 #~ msgstr "STOCK_SPELL_CHECK"
 
@@ -4253,10 +4242,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "STOCK_COPY"
 #~ msgstr "STOCK_COPY"
 
-#, python-format
-#~ msgid "Futur Qty"
-#~ msgstr "计划数量"
-
 #, python-format
 #~ msgid "Invoice is already created."
 #~ msgstr "发票已创建"
@@ -4403,9 +4388,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "STOCK_MEDIA_PAUSE"
 #~ msgstr "STOCK_MEDIA_PAUSE"
 
-#~ msgid "Track Outging Lots"
-#~ msgstr "跟踪出库批次"
-
 #~ msgid "STOCK_OPEN"
 #~ msgstr "STOCK_OPEN"
 
@@ -4434,9 +4416,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "STOCK_UNINDENT"
 #~ msgstr "STOCK_UNINDENT"
 
-#~ msgid "Canceled"
-#~ msgstr "已取消"
-
 #~ msgid "STOCK_JUSTIFY_CENTER"
 #~ msgstr "STOCK_JUSTIFY_CENTER"
 
@@ -4446,10 +4425,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "STOCK_DIRECTORY"
 #~ msgstr "STOCK_DIRECTORY"
 
-#, python-format
-#~ msgid "Futur P&L"
-#~ msgstr "计划益损"
-
 #~ msgid "Track Production Lots"
 #~ msgstr "跟踪生产批次"
 
@@ -4480,9 +4455,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "STOCK_MEDIA_NEXT"
 #~ msgstr "STOCK_MEDIA_NEXT"
 
-#~ msgid "weight"
-#~ msgstr "重量"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
@@ -4638,9 +4610,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "入库时指定批次"
 
-#~ msgid "Track Incomming Lots"
-#~ msgstr "跟踪入库批次"
-
 #~ msgid ""
 #~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
 #~ "structured stock locations.\n"
@@ -4702,33 +4671,6 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "This account will be used to value the input stock"
 #~ msgstr "这科目用于记录入库值"
 
-#~ 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"
-#~ "    "
-#~ msgstr ""
-#~ "\"库存管理模块可以管理多仓库, 多样化结构的仓储地点.\\n\"\n"
-#~ "\"感谢复式记帐管理, 存货管理很强大并且灵活:\\n\"\n"
-#~ "\"* 调拨历史和计划\\n\"\n"
-#~ "\"* 不同的库存管理法 (先进先出, 先进后出, ...)\\n\"\n"
-#~ "\"* 库存估价 (标准或平均价格, ...)\\n\"\n"
-#~ "\"* 稳健面临盘存差错\\n\"\n"
-#~ "\"* 自动重新订货规则 (库存水平, JIT, ...)\\n\"\n"
-#~ "\"* 支持条码\\n\"\n"
-#~ "\"* 通过复式记帐系统快速检测错误\\n\"\n"
-#~ "\"* 可追溯性(向上追溯/向下追溯,产品批次,序列号, ...)\\n\"\n"
-#~ "    "
-
 #~ msgid "Force to use a Production Lot during deliveries"
 #~ msgstr "送货时指定批次"
 
@@ -4841,24 +4783,28 @@ msgstr "可选存货地点信息仅供参考"
 #~ msgid "Not from Packing"
 #~ msgstr "按来自订单产生的发票"
 
-#~ msgid ""
-#~ "This is the list of all delivery orders that must be prepared, according to "
-#~ "your different sales orders and your logistics rules."
-#~ msgstr "这是根据不同的销售订单和物流规则所有准备好的发货单据"
-
-#~ msgid ""
-#~ "When the stock move is created it is in the 'Draft' state.\n"
-#~ " After that it is set to 'Confirmed' state.\n"
-#~ " If stock is available state is set to 'Available'.\n"
-#~ " When the picking is done the state is 'Done'.                               "
-#~ "   \n"
-#~ "The state is 'Waiting' if the move is waiting for another one."
-#~ msgstr ""
-#~ "新建的库存调拨状态是‘草稿’\n"
-#~ "然后将为‘确认’\n"
-#~ "如果库存可用状态将为‘可用’\n"
-#~ "当分拣完成状态将为‘完成’"
-
 #, python-format
 #~ msgid "Product "
 #~ msgstr "产品 "
+
+#~ msgid "Stock Variation Account"
+#~ msgstr "库存变动科目"
+
+#~ msgid "Products Categories"
+#~ msgstr "产品分类"
+
+#, python-format
+#~ msgid "is consumed with"
+#~ msgstr "是消耗品"
+
+#, python-format
+#~ msgid "INV: "
+#~ msgstr "库存： "
+
+#, python-format
+#~ msgid "quantity."
+#~ msgstr "数量"
+
+#, python-format
+#~ msgid "is scheduled"
+#~ msgstr "日程表"
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 25737beb76c..2663d8c7190 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-28 03:06+0000\n"
+"PO-Revision-Date: 2011-11-07 13:04+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-12 04:51+0000\n"
+"X-Generator: Launchpad (build 14277)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -163,7 +163,7 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr ""
+msgstr "庫存日誌"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -473,7 +473,7 @@ msgstr "調動統計"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "生產批次篩選"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -634,7 +634,7 @@ msgstr ""
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "指定了不同產品的批次"
 
 #. module: stock
 #: view:res.partner:0
@@ -1150,7 +1150,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1322
 #, python-format
 msgid "is in draft state."
-msgstr "尚在草案階段"
+msgstr "尚在草案階段。"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1399,6 +1399,12 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"* 草案(Draft): 未確認，不會安排處理直至確認\n"
+"* 確認(Confirmed): 仍等候產品有貨供應\n"
+"* 供貨(Available): 已預留產品，只等候確認\n"
+"* 等待(Waiting): 自動供貨前要再等候下一步 (如於「接單生產(Make-To-Order)」流程)\n"
+"* 完成(Done): 已處理，無法再修改或取消\n"
+"* 取消(Cancelled): 已取消，無法再確認"
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1437,6 +1443,11 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"建立調動時先處於「草案(Draft)」狀態。\n"
+"  然後，如安排者找不到貨，設為「無貨(Not Available)」狀態。\n"
+"  當已預留貨物，變成「供貨(Available)」。\n"
+"  完成提貨後狀態為「完成(Done)」。              \n"
+"如調動正等候其他工作完成，狀態為「等待(Waiting)」。"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1483,7 +1494,7 @@ msgstr "貨幣"
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "追蹤生產批次"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
@@ -1534,7 +1545,7 @@ msgstr "貨架 2"
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr ""
+msgstr "追蹤批次"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1555,7 +1566,7 @@ msgstr "本地化"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "按追蹤批次庫存報告"
 
 #. module: stock
 #: code:addons/stock/product.py:367
@@ -2087,8 +2098,8 @@ msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2115,7 +2126,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2175
 #, python-format
 msgid "You can only delete draft moves."
-msgstr "不能刪除調動草案"
+msgstr "只能刪除調動草案。"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:74
@@ -2145,7 +2156,7 @@ msgid "Location where the system will stock the finished products."
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation: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."
@@ -2538,7 +2549,7 @@ msgstr "數量（量度單位）"
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
-msgstr ""
+msgstr "您正移動%.2f件 %s 產品，但此批次只有%.2f件 %s。"
 
 #. module: stock
 #: view:stock.move:0
@@ -2860,7 +2871,7 @@ msgstr "各分類產品"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr "產品分類"
 
 #. module: stock
@@ -3027,7 +3038,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "批次存貨"
 
 #. module: stock
 #: view:stock.move:0
@@ -3495,6 +3506,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 ""
+"建立調動時先處於「草案(Draft)」狀態。\n"
+"  然後設為「確認(Confirmed)」狀態。\n"
+"  如庫存有貨，變成「供貨(Available)」。\n"
+"  完成提貨後狀態為「完成(Done)」。              \n"
+"如調動正等候其他工作完成，狀態為「等待(Waiting)」。"
 
 #. module: stock
 #: view:board.board:0
@@ -3714,7 +3730,7 @@ msgstr ""
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "須為此產品分配生產批次"
+msgstr "須為此產品指定生產批次"
 
 #. module: stock
 #: view:stock.move:0
@@ -3809,7 +3825,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr "生產批次回報之庫存"
+msgstr "按生產批次庫存報告"
 
 #. module: stock
 #: view:stock.location:0
@@ -3869,7 +3885,7 @@ msgstr "輸出"
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
-msgstr ""
+msgstr "保持為同一批次"
 
 #. module: stock
 #: view:product.product:0
@@ -3904,6 +3920,11 @@ msgstr "部份調動"
 msgid "Optional localization details, for information purpose only"
 msgstr ""
 
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
 #~ msgid "Dest. Address"
 #~ msgstr "目标地址"
 
@@ -3917,6 +3938,9 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "產品 "
 
+#~ msgid "Products Categories"
+#~ msgstr "產品分類"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "已安排"
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 70925a82d10..5216314fa3c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -44,13 +44,12 @@ class product_product(osv.osv):
             stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
 
         journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
-        account_variation = product_obj.categ_id.property_stock_variation and product_obj.categ_id.property_stock_variation.id or False
-
+        account_valuation = product_obj.categ_id.property_stock_valuation_account_id and product_obj.categ_id.property_stock_valuation_account_id.id or False
         return {
             'stock_account_input': stock_input_acc,
             'stock_account_output': stock_output_acc,
             'stock_journal': journal_id,
-            'property_stock_variation': account_variation
+            'property_stock_valuation_account_id': account_valuation
         }
 
     def do_change_standard_price(self, cr, uid, ids, datas, context=None):
@@ -71,9 +70,9 @@ class product_product(osv.osv):
         stock_input_acc = datas.get('stock_input_account', False)
         journal_id = datas.get('stock_journal', False)
         product_obj=self.browse(cr, uid, ids, context=context)[0]
-        account_variation = product_obj.categ_id.property_stock_variation
-        account_variation_id = account_variation and account_variation.id or False
-        if not account_variation_id: raise osv.except_osv(_('Error!'), _('Variation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
+        account_valuation = product_obj.categ_id.property_stock_valuation_account_id
+        account_valuation_id = account_valuation and account_valuation.id or False
+        if not account_valuation_id: raise osv.except_osv(_('Error!'), _('Valuation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
         move_ids = []
         loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
         for rec_id in ids:
@@ -132,7 +131,7 @@ class product_product(osv.osv):
                                     })
                         move_line_obj.create(cr, uid, {
                                     'name': product.categ_id.name,
-                                    'account_id': account_variation_id,
+                                    'account_id': account_valuation_id,
                                     'credit': amount_diff,
                                     'move_id': move_id
                                     })
@@ -158,7 +157,7 @@ class product_product(osv.osv):
                                     })
                         move_line_obj.create(cr, uid, {
                                         'name': product.categ_id.name,
-                                        'account_id': account_variation_id,
+                                        'account_id': account_valuation_id,
                                         'debit': amount_diff,
                                         'move_id': move_id
                                     })
@@ -224,10 +223,10 @@ class product_product(osv.osv):
         if context.get('compute_child',True):
             child_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', location_ids)])
             location_ids = child_location_ids or location_ids
-        else:
-            location_ids = location_ids
-
+        
+        # this will be a dictionary of the UoM resources we need for conversion purposes, by UoM id
         uoms_o = {}
+        # this will be a dictionary of the product UoM by product id
         product2uom = {}
         for product in self.browse(cr, uid, ids, context=context):
             product2uom[product.id] = product.uom_id.id
@@ -281,22 +280,26 @@ class product_product(osv.osv):
                 'and state in %s ' + (date_str and 'and '+date_str+' ' or '') + ' '\
                 'group by product_id,product_uom',tuple(where))
             results2 = cr.fetchall()
+            
+        # Get the missing UoM resources
         uom_obj = self.pool.get('product.uom')
         uoms = map(lambda x: x[2], results) + map(lambda x: x[2], results2)
         if context.get('uom', False):
             uoms += [context['uom']]
-
         uoms = filter(lambda x: x not in uoms_o.keys(), uoms)
         if uoms:
             uoms = uom_obj.browse(cr, uid, list(set(uoms)), context=context)
             for o in uoms:
                 uoms_o[o.id] = o
+                
         #TOCHECK: before change uom of product, stock move line are in old uom.
         context.update({'raise-exception': False})
+        # Count the incoming quantities
         for amount, prod_id, prod_uom in results:
             amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
                      uoms_o[context.get('uom', False) or product2uom[prod_id]], context=context)
             res[prod_id] += amount
+        # Count the outgoing quantities
         for amount, prod_id, prod_uom in results2:
             amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
                     uoms_o[context.get('uom', False) or product2uom[prod_id]], context=context)
@@ -330,11 +333,64 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'qty_available': fields.function(_product_available, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'virtual_available': fields.function(_product_available, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'incoming_qty': fields.function(_product_available, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'outgoing_qty': fields.function(_product_available, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'track_production': fields.boolean('Track Manufacturing Lots' , help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"),
+        'qty_available': fields.function(_product_available, multi='qty_available',
+            type='float',  digits_compute=dp.get_precision('Product UoM'),
+            string='Quantity On Hand',
+            help="Current quantity of products.\n"
+                 "In a context with a single Stock Location, this includes "
+                 "goods stored at 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"
+                 "In a context with a single Shop, this includes goods "
+                 "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'."),
+        'virtual_available': fields.function(_product_available, multi='qty_available',
+            type='float',  digits_compute=dp.get_precision('Product UoM'),
+            string='Quantity Available',
+            help="Forcasted 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"
+                 "In a context with a single Warehouse, this includes "
+                 "goods stored in the Stock Location of this Warehouse, or any "
+                 "of its children.\n"
+                 "In a context with a single Shop, this includes goods "
+                 "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'."),
+        'incoming_qty': fields.function(_product_available, multi='qty_available',
+            type='float',  digits_compute=dp.get_precision('Product UoM'),
+            string='Incoming',
+            help="Quantity of products that are planned to arrive.\n"
+                 "In a context with a single Stock Location, this includes "
+                 "goods arriving to this Location, or any of its children.\n"
+                 "In a context with a single Warehouse, this includes "
+                 "goods arriving to the Stock Location of this Warehouse, or "
+                 "any of its children.\n"
+                 "In a context with a single Shop, this includes goods "
+                 "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'."),
+        'outgoing_qty': fields.function(_product_available, multi='qty_available',
+            type='float',  digits_compute=dp.get_precision('Product UoM'),
+            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"
+                 "In a context with a single Warehouse, this includes "
+                 "goods leaving from 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 "
+                 "Shop, or any of its children.\n"
+                 "Otherwise, this includes goods leaving from any Stock "
+                 "Location typed as 'internal'."),
+        'track_production': fields.boolean('Track Manufacturing Lots', help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
         'location_id': fields.dummy(string='Location', relation='stock.location', type='many2one'),
@@ -451,10 +507,10 @@ class product_category(osv.osv):
             type='many2one', relation='account.account',
             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. This is the default value for all products in this category, it can also directly be set on each product.'),
-        'property_stock_variation': fields.property('account.account',
+        'property_stock_valuation_account_id': fields.property('account.account',
             type='many2one',
             relation='account.account',
-            string="Stock Variation Account",
+            string="Stock Valuation Account",
             view_load=True,
             help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
     }
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 226fa13b594..cf960bfb8aa 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -27,7 +27,7 @@
                         <separator string="Accounting 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_variation"/>
+                        <field name="property_stock_valuation_account_id"/>
                         <field name="property_stock_journal"/>
                     </group>
                 </form>
@@ -82,7 +82,7 @@
                     <group groups="base.group_extended">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
-                            <field name="valuation"/>
+                            <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
                         </group>
                         <group colspan="2" col="2">
                             <field name="property_stock_account_input" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
@@ -111,6 +111,11 @@
                         <newline/>
                         <field name="virtual_available"/>
                     </group>
+                    <group colspan="2" col="2" name="stock_variations" groups="base.group_extended">
+                        <separator string="Expected Stock Variations" colspan="2"/>
+                        <field name="incoming_qty"/>
+                        <field name="outgoing_qty"/>
+                    </group>
                     <group colspan="2" col="2" name="lot" groups="base.group_extended">
                         <separator string="Lots" colspan="4"/>
                         <field name="track_production" />
@@ -120,6 +125,61 @@
                 </group>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="product.product_kanban_view">
+            <field name="name">Product Kanban</field>
+            <field name="model">product.product</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="type">
+                    <field name="color"/>
+                    <field name="type"/>
+                    <field name="product_image"/>
+                    <field name="list_price"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type.raw_value)"/>
+                            <div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                <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_title1">
+                                        <field name="name"/>
+                                    </div>
+                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+                                        <table class="oe_kanban_table">
+                                            <tr>
+                                                <td valign="top" width="48">
+                                                    <img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" width="48"/>
+                                                </td>
+                                                <td>
+                                                    <div class="oe_kanban_title2">
+                                                        <t t-if="record.type.raw_value=='service'">No Stock</t>
+                                                        <t t-if="record.type.raw_value!='service'">
+                                                            <div><field name="qty_available"/> On Hand , <field name="virtual_available"/> Available</div>
+                                                            <div>
+                                                                <t t-if="record.list_price.raw_value!=0">Public Price : <field name="lst_price"/> ,</t>
+                                                                Cost : <field name="standard_price"/>
+                                                            </div>
+                                                        </t>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </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"/>
+                                            <a string="Update Stock" name="%(stock.action_view_change_product_quantity)d" icon="gtk-execute" type="action"/>
+                                         </div>
+                                        <br class="oe_kanban_clear"/>
+                                    </div>
+                                </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>
diff --git a/addons/stock/report/UPS.xml b/addons/stock/report/UPS.xml
deleted file mode 100644
index 0349fda556d..00000000000
--- a/addons/stock/report/UPS.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<OpenShipments>
-    
-    <OpenShipment ShipmentOption="" ProcessStatus="">
-        
-        <Receiver>
-            <CompanyName type="field" name="address_id.partner_id.name" />
-            <ContactPerson type="field" name="address_id.name" />
-            <AddressLine1 type="field" name="address_id.street" />
-            <AddressLine2 type="field" name="address_id.street2" />
-            <City type="field" name="address_id.city" />
-            <CountryCode type="field" name="address_id.country_id.code" />
-            <PostalCode type="field" name="address_id.zip" />
-            <StateOrProvince type="field" name="address_id.state_id.name" />
-            <Phone type="field" name="address_id.phone" />
-        </Receiver>
-        <Shipment>
-            <ServiceLevel>ES</ServiceLevel>
-            <PackageType/>
-            <NumberOfPackages>1</NumberOfPackages>
-            <ShipmentActualWeight type="data" name="weight"/>
-            <DescriptionOfGoods type="field" name="name" />
-            <BillingOption>PP</BillingOption>
-        </Shipment>
-        
-    </OpenShipment>
-    
-</OpenShipments>
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 18bfe2609c2..e1e083c2a8d 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import product_stock
-import ups
 import picking
 import lot_overview_all
 import report_stock
@@ -28,3 +27,5 @@ import report_stock_move
 import stock_inventory_move_report
 import lot_overview
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 3d66a1b825a..b1fab7360ef 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -189,7 +189,7 @@
     <blockTable colWidths="538.0" style="Table_Title_String">
       <tr>
         <td>
-          <para style="terp_header">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]] </para>
+          <para style="terp_header">Packing List: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]] </para>
           <para style="terp_header">Reception: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
           <para style="terp_header">Picking List: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
         </td>
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 07289a4379a..520efc229a0 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -86,19 +86,19 @@ class report_stock_move(osv.osv):
                         sum(al.in_value - al.out_value) as value
                     FROM (SELECT
                         CASE WHEN sp.type in ('out') THEN
-                            sum(sm.product_qty * pu.factor)
+                            sum(sm.product_qty * pu.factor / pu2.factor)
                             ELSE 0.0
                             END AS out_qty,
                         CASE WHEN sp.type in ('in') THEN
-                            sum(sm.product_qty * pu.factor)
+                            sum(sm.product_qty * pu.factor / pu2.factor)
                             ELSE 0.0
                             END AS in_qty,
                         CASE WHEN sp.type in ('out') THEN
-                            sum(sm.product_qty * pu.factor) * pt.standard_price
+                            sum(sm.product_qty * pu.factor / pu2.factor) * pt.standard_price
                             ELSE 0.0
                             END AS out_value,
                         CASE WHEN sp.type in ('in') THEN
-                            sum(sm.product_qty * pu.factor) * pt.standard_price
+                            sum(sm.product_qty * pu.factor / pu2.factor) * pt.standard_price
                             ELSE 0.0
                             END AS in_value,
                         min(sm.id) as sm_id,
@@ -126,6 +126,7 @@ class report_stock_move(osv.osv):
                         LEFT JOIN stock_picking sp ON (sm.picking_id=sp.id)
                         LEFT JOIN product_product pp ON (sm.product_id=pp.id)
                         LEFT JOIN product_uom pu ON (sm.product_uom=pu.id)
+                          LEFT JOIN product_uom pu2 ON (sm.product_uom=pu2.id)
                         LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
                         LEFT JOIN stock_location sl ON (sm.location_id = sl.id)
 
@@ -153,6 +154,9 @@ class report_stock_inventory(osv.osv):
     _auto = False
     _columns = {
         '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')]),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
@@ -176,17 +180,16 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
-        CASE when pt.uom_id = m.product_uom THEN
-            coalesce(sum(-m.product_qty)::decimal, 0.0) 
-        ELSE
-            coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+
+        coalesce(sum(-pt.standard_price * m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as value,
+        coalesce(sum(-m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
             LEFT JOIN product_product pp ON (m.product_id=pp.id)
                 LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
                 LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
@@ -199,17 +202,15 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
-        CASE when pt.uom_id = m.product_uom  THEN 
-            coalesce(sum(m.product_qty)::decimal, 0.0) 
-        ELSE
-            coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+        coalesce(sum(pt.standard_price * m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as value,
+        coalesce(sum(m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
             LEFT JOIN product_product pp ON (m.product_id=pp.id)
                 LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
                 LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
@@ -221,3 +222,5 @@ CREATE OR REPLACE view report_stock_inventory AS (
 report_stock_inventory()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 25abf4d7333..9d4498139bd 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -37,7 +37,6 @@
            </tree>
         </field>
     </record>
-
     <record id="view_stock_graph" model="ir.ui.view">
          <field name="name">report.stock.move.graph</field>
          <field name="model">report.stock.move</field>
@@ -60,7 +59,6 @@
              </graph>
          </field>
     </record>
-
     <record id="view_stock_search" model="ir.ui.view">
         <field name="name">report.stock.move.search</field>
         <field name="model">report.stock.move</field>
@@ -69,17 +67,19 @@
             <search string="Moves Analysis">
                 <group>
                 <filter icon="terp-go-year" string="Year"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                help="Current year"/>
-                <filter icon="terp-go-month"
-                 string="Month-1"
-                 name="month-1"
-                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                 help="Last month"/>
+                    name="year"
+                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                    help="Current year"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-go-month" string="Month"
-                name="month"
-                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                help="Current month"/>
+                    name="month"
+                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                    help="Current month"/>
+                <filter icon="terp-go-month"
+                    string="Month-1"
+                    name="month-1"
+                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                     help="Last month"/>
                 <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
@@ -90,7 +90,6 @@
                     icon="terp-gtk-go-back-rtl"
                     domain="[('state','in',('assigned','waiting','confirmed'))]"
                     help = "Future Stock-Moves"/>
-
                 <separator orientation="vertical"/>
                 <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
                 <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
@@ -142,7 +141,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
-        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1,'search_default_year':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
         <field name="help">Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance.</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
@@ -155,6 +154,8 @@
         <field name="arch" type="xml">
             <tree string="Inventory Analysis">
                 <field name="date" invisible="1"/>
+                <field name="year" invisible="1" />
+                <field name="month" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="location_type" invisible="1"/>
                 <field name="location_id" invisible="1"/>
@@ -187,7 +188,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
-                <group col="16">
+                <group>
+                    <filter icon="terp-go-year" string="Year"
+                        name="year"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                        help="Current year"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="Month"
+                        name="month"
+                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Current month"/>
+                    <filter icon="terp-go-month"
+                        string="Month-1"
+                        name="month-1"
+                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Last month"/>
+                    <separator orientation="vertical"/>
                     <filter string="Real"
                         name="real"
                         icon="terp-check"
@@ -240,7 +256,8 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  eval="False"/>
-        <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'contact_display': 'partner', 'search_default_real':1,
+'search_default_year':1,'search_default_month':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities.</field>
     </record>
     <menuitem action="action_stock_inventory_report"
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 829fae14b6b..fe49e8eae9f 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -38,7 +38,7 @@
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
-                        domain="[('product_id.type','=', 'consumable')]"/>
+                        domain="[('product_id.type','=', 'consu')]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 310b1067ff8..292cd052d5a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -167,7 +167,7 @@ class stock_location(osv.osv):
                        \n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
                       """, select = True),
          # temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
-        'complete_name': fields.function(_complete_name, type='char', size=100, string="Location Name"),
+        'complete_name': fields.function(_complete_name, type='char', size=100, string="Location Name", store=True),
 
         'stock_real': fields.function(_product_value, type='float', string='Real Stock', multi="stock"),
         'stock_virtual': fields.function(_product_value, type='float', string='Virtual Stock', multi="stock"),
@@ -309,7 +309,7 @@ class stock_location(osv.osv):
 
                     # Compute based on pricetype
                     # Choose the right filed standard_price to read
-                    amount_unit = product.price_get('standard_price', context)[product.id]
+                    amount_unit = product.price_get('standard_price', context=context)[product.id]
                     price = qty[product_id] * amount_unit
 
                     total_price += price
@@ -622,8 +622,8 @@ class stock_picking(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products.", select=True),
         'move_type': fields.selection([('direct', 'Partial Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
         'state': fields.selection([
-            ('draft', 'Draft'),
-            ('auto', 'Waiting'),
+            ('draft', 'New'),
+            ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
             ('done', 'Done'),
@@ -661,10 +661,14 @@ class stock_picking(osv.osv):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.picking', context=c)
     }
+    _sql_constraints = [
+        ('name_uniq', 'unique(name, company_id)', 'Reference must be unique per Company!'),
+    ]
+
     def action_process(self, cr, uid, ids, context=None):
         if context is None: context = {}
-        partial_id = self.pool.get("stock.partial.picking").create(
-            cr, uid, {}, context=dict(context, active_ids=ids))
+        context = dict(context, active_ids=ids, active_model=self._name)
+        partial_id = self.pool.get("stock.partial.picking").create(cr, uid, {}, context=context)
         return {
             'name':_("Products to Process"),
             'view_mode': 'form',
@@ -676,7 +680,7 @@ class stock_picking(osv.osv):
             'nodestroy': True,
             'target': 'new',
             'domain': '[]',
-            'context': dict(context, active_ids=ids)
+            'context': context,
         }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -847,7 +851,11 @@ class stock_picking(osv.osv):
         for pick in self.browse(cr, uid, ids, context=context):
             todo = []
             for move in pick.move_lines:
-                if move.state == 'assigned':
+                if move.state == 'draft':
+                    self.pool.get('stock.move').action_confirm(cr, uid, [move.id],
+                        context=context)
+                    todo.append(move.id)
+                elif move.state in ('assigned','confirmed'):
                     todo.append(move.id)
             if len(todo):
                 self.pool.get('stock.move').action_done(cr, uid, todo,
@@ -891,7 +899,7 @@ class stock_picking(osv.osv):
         if type in ('in_invoice', 'in_refund'):
             # Take the user company and pricetype
             context['currency_id'] = move_line.company_id.currency_id.id
-            amount_unit = move_line.product_id.price_get('standard_price', context)[move_line.product_id.id]
+            amount_unit = move_line.product_id.price_get('standard_price', context=context)[move_line.product_id.id]
             return amount_unit
         else:
             return move_line.product_id.list_price
@@ -1205,7 +1213,7 @@ class stock_picking(osv.osv):
                             new_std_price = new_price
                         else:
                             # Get the standard price
-                            amount_unit = product.price_get('standard_price', context)[product.id]
+                            amount_unit = product.price_get('standard_price', context=context)[product.id]
                             new_std_price = ((amount_unit * product_avail[product.id])\
                                 + (new_price * qty))/(product_avail[product.id] + qty)
                         # Write the field according to price type field
@@ -1469,6 +1477,8 @@ class stock_move(osv.osv):
 
     def action_partial_move(self, cr, uid, ids, context=None):
         if context is None: context = {}
+        if context.get('active_model') != self._name:
+            context.update(active_ids=ids, active_model=self._name)
         partial_id = self.pool.get("stock.partial.move").create(
             cr, uid, {}, context=context)
         return {
@@ -1518,22 +1528,22 @@ class stock_move(osv.osv):
         return True
 
     _columns = {
-        'name': fields.char('Name', size=64, required=True, select=True),
+        'name': fields.char('Name', size=250, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
-        'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", readonly=True),
+        'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", states={'done': [('readonly', True)]}),
         '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 UoM'), required=True,states={'done': [('readonly', True)]}),
         '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 UoM')),
-        'product_uos': fields.many2one('product.uom', 'Product UOS'),
+        'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM'), states={'done': [('readonly', True)]}),
+        'product_uos': fields.many2one('product.uom', 'Product UOS', states={'done': [('readonly', True)]}),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
 
         'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True,states={'done': [('readonly', True)]}, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True,states={'done': [('readonly', True)]}, select=True, help="Location where the system will stock the finished products."),
-        'address_id': fields.many2one('res.partner.address', 'Destination Address', help="Optional address where goods are to be delivered, specifically used for allotment"),
+        'address_id': fields.many2one('res.partner.address', 'Destination Address ', states={'done': [('readonly', True)]}, help="Optional address where goods are to be delivered, specifically used for allotment"),
 
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', states={'done': [('readonly', True)]}, help="Production lot is used to put a serial number on the production", select=True),
         'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, states={'done': [('readonly', True)]}, help="Logistical shipping unit: pallet, box, pack ..."),
@@ -1545,7 +1555,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Not Available'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
@@ -1558,10 +1568,18 @@ class stock_move(osv.osv):
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
     }
+    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
+        return True
+
     _constraints = [
         (_check_tracking,
             'You must assign a production lot for this product',
             ['prodlot_id']),
+        (_check_location, 'You can not move products from or to a location of the type view.',
+            ['location_id','location_dest_id']),
         (_check_product_lot,
             'You try to assign a lot which is not from the same product',
             ['prodlot_id'])]
@@ -1570,36 +1588,60 @@ class stock_move(osv.osv):
         """ Gets default address of partner for destination location
         @return: Address id or False
         """
+        mod_obj = self.pool.get('ir.model.data')
+        picking_type = context.get('picking_type')
+        location_id = False
+
         if context is None:
             context = {}
         if context.get('move_line', []):
             if context['move_line'][0]:
                 if isinstance(context['move_line'][0], (tuple, list)):
-                    return context['move_line'][0][2] and context['move_line'][0][2].get('location_dest_id',False)
+                    location_id = context['move_line'][0][2] and context['move_line'][0][2].get('location_dest_id',False)
                 else:
                     move_list = self.pool.get('stock.move').read(cr, uid, context['move_line'][0], ['location_dest_id'])
-                    return move_list and move_list['location_dest_id'][0] or False
-        if context.get('address_out_id', False):
+                    location_id = move_list and move_list['location_dest_id'][0] or False
+        elif context.get('address_out_id', False):
             property_out = self.pool.get('res.partner.address').browse(cr, uid, context['address_out_id'], context).partner_id.property_stock_customer
-            return property_out and property_out.id or False
-        return False
+            location_id = property_out and property_out.id or False
+        else:
+            location_xml_id = False
+            if picking_type == 'in':
+                location_xml_id = 'stock_location_stock'
+            elif picking_type == 'out':
+                location_xml_id = 'stock_location_customers'
+            if location_xml_id:
+                location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
+        return location_id
 
     def _default_location_source(self, cr, uid, context=None):
         """ Gets default address of partner for source location
         @return: Address id or False
         """
+        mod_obj = self.pool.get('ir.model.data')
+        picking_type = context.get('picking_type')
+        location_id = False
+
         if context is None:
             context = {}
         if context.get('move_line', []):
             try:
-                return context['move_line'][0][2]['location_id']
+                location_id = context['move_line'][0][2]['location_id']
             except:
                 pass
-        if context.get('address_in_id', False):
+        elif context.get('address_in_id', False):
             part_obj_add = self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context=context)
             if part_obj_add.partner_id:
-                return part_obj_add.partner_id.property_stock_supplier.id
-        return False
+                location_id = part_obj_add.partner_id.property_stock_supplier.id
+        else:
+            location_xml_id = False
+            if picking_type == 'in':
+                location_xml_id = 'stock_location_suppliers'
+            elif picking_type == 'out':
+                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)
+        return location_id
 
     _defaults = {
         'location_id': _default_location_source,
@@ -1728,7 +1770,7 @@ class stock_move(osv.osv):
         """ On change of product id, if finds UoM, UoS, quantity and UoS quantity.
         @param prod_id: Changed Product id
         @param loc_id: Source location id
-        @param loc_id: Destination location id
+        @param loc_dest_id: Destination location id
         @param address_id: Address id of partner
         @return: Dictionary of values
         """
@@ -1757,6 +1799,16 @@ class stock_move(osv.osv):
             result['location_dest_id'] = loc_dest_id
         return {'value': result}
 
+    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 
+        @param date: Move Date
+        @return: Move Date
+        """
+        if not date_expected:
+            date_expected = time.strftime('%Y-%m-%d %H:%M:%S')
+        return {'value':{'date': date_expected}}
+
     def _chain_compute(self, cr, uid, moves, context=None):
         """ Finds whether the location has chained location type or not.
         @param moves: Stock moves
@@ -2008,14 +2060,14 @@ class stock_move(osv.osv):
         else:
             acc_dest = accounts['stock_account_output']
 
-        acc_variation = accounts.get('property_stock_variation', False)
+        acc_valuation = accounts.get('property_stock_valuation_account_id', False)
         journal_id = accounts['stock_journal']
 
-        if acc_dest == acc_variation:
-            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same.'))
+        if acc_dest == acc_valuation:
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Output Account defined on this product and Valuation account on category of this product are same.'))
 
-        if acc_src == acc_variation:
-            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same.'))
+        if acc_src == acc_valuation:
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Input Account defined on this product and Valuation account on category of this product are same.'))
 
         if not acc_src:
             raise osv.except_osv(_('Error!'),  _('There is no stock input account defined for this product or its category: "%s" (id: %d)') % \
@@ -2026,10 +2078,10 @@ class stock_move(osv.osv):
         if not journal_id:
             raise osv.except_osv(_('Error!'), _('There is no journal defined on the product category: "%s" (id: %d)') % \
                                     (move.product_id.categ_id.name, move.product_id.categ_id.id,))
-        if not acc_variation:
-            raise osv.except_osv(_('Error!'), _('There is no inventory variation account defined on the product category: "%s" (id: %d)') % \
+        if not acc_valuation:
+            raise osv.except_osv(_('Error!'), _('There is no inventory Valuation account defined on the product category: "%s" (id: %d)') % \
                                     (move.product_id.categ_id.name, move.product_id.categ_id.id,))
-        return journal_id, acc_src, acc_dest, acc_variation
+        return journal_id, acc_src, acc_dest, acc_valuation
 
     def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
         """
@@ -2057,7 +2109,7 @@ class stock_move(osv.osv):
             if context is None:
                 context = {}
             currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
-            amount_unit = move.product_id.price_get('standard_price', currency_ctx)[move.product_id.id]
+            amount_unit = move.product_id.price_get('standard_price', context=currency_ctx)[move.product_id.id]
             reference_amount = amount_unit * qty or 1.0
 
         return reference_amount, reference_currency_id
@@ -2079,17 +2131,17 @@ class stock_move(osv.osv):
             if move.location_id.company_id \
                 and (move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal'\
                      or move.location_id.company_id != move.location_dest_id.company_id):
-                journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
+                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_variation, acc_dest, reference_amount, reference_currency_id, context))]
+                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 \
                 and (move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal'\
                      or move.location_id.company_id != move.location_dest_id.company_id):
-                journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
+                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_variation, reference_amount, reference_currency_id, context))]
+                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:
@@ -2104,14 +2156,9 @@ class stock_move(osv.osv):
         """ Makes the move done and if all moves are done, it will finish the picking.
         @return:
         """
-        partial_datas=''
         picking_ids = []
         move_ids = []
-        partial_obj=self.pool.get('stock.partial.picking')
         wf_service = netsvc.LocalService("workflow")
-        partial_id=partial_obj.search(cr,uid,[])
-        if partial_id:
-            partial_datas = partial_obj.read(cr, uid, partial_id, context=context)[0]
         if context is None:
             context = {}
 
@@ -2141,9 +2188,6 @@ class stock_move(osv.osv):
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
-            prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
-            if prodlot_id:
-                self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
             if move.state not in ('confirmed','done','assigned'):
                 todo.append(move.id)
 
@@ -2220,6 +2264,7 @@ class stock_move(osv.osv):
         return super(stock_move, self).unlink(
             cr, uid, ids, context=ctx)
 
+    # _create_lot function is not used anywhere 
     def _create_lot(self, cr, uid, ids, product_id, prefix=False):
         """ Creates production lot
         @return: Production lot id
@@ -2260,11 +2305,12 @@ class stock_move(osv.osv):
             res += [new_move]
             product_obj = self.pool.get('product.product')
             for (id, name) in product_obj.name_get(cr, uid, [move.product_id.id]):
-                self.log(cr, uid, move.id, "%s x %s %s" % (move.product_qty, name, _("were scrapped")))
+                self.log(cr, uid, move.id, "%s x %s %s" % (quantity, name, _("were scrapped")))
 
         self.action_done(cr, uid, res)
         return res
 
+    # action_split function is not used anywhere 
     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
@@ -2443,7 +2489,7 @@ class stock_move(osv.osv):
                         new_std_price = new_price
                     else:
                         # Get the standard price
-                        amount_unit = product.price_get('standard_price', context)[product.id]
+                        amount_unit = product.price_get('standard_price', context=context)[product.id]
                         new_std_price = ((amount_unit * product.qty_available)\
                             + (new_price * qty))/(product.qty_available + qty)
 
@@ -2617,7 +2663,7 @@ class stock_inventory(osv.osv):
                      for account_move in account_move_data_l:
                          if account_move['state'] == 'posted':
                              raise osv.except_osv(_('UserError'),
-                                                  _('You can not cancel inventory which has any account move with posted state.'))
+                                                  _('In order to cancel this inventory, you must first unpost related journal entries.'))
                          account_move_obj.unlink(cr, uid, [account_move['id']], context=context)
             self.write(cr, uid, [inv.id], {'state': 'cancel'}, context=context)
         return True
@@ -2667,7 +2713,7 @@ class stock_warehouse(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'),
         'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage','<>','view')]),
-        'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','<>','view')]),
+        'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','=','internal')]),
         'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]),
     }
     _defaults = {
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index bcde818c78a..c0c872e99f2 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -2,12 +2,17 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="stock_journal_sequence" model="ir.sequence">
+            <field name="name">Stock Journal Sequence</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">STJ/%(year)s/</field>
+        </record>
         <record forcecreate="1" id="stock_journal" model="account.journal">
             <field name="name">Stock Journal</field>
             <field name="code">STJ</field>
             <field name="type">general</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
+            <field name="sequence_id" ref="stock_journal_sequence"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
 
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 7bcda8a200e..ca897ced8ef 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -260,19 +260,11 @@
             <field name="lot_input_id" ref="stock_location_shop1"/>
         </record>
 
-        <record forcecreate="True" id="property_stock_variation" model="ir.property">
-            <field name="name">property_stock_variation</field>
-            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_variation')]"/>
-            <field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
+        <record forcecreate="True" id="property_stock_valuation_account_id" model="ir.property">
+            <field name="name">property_stock_valuation_account_id</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
+            <field eval="'account.account,'+str(ref('account.stk'))" model="account.account" name="value"/>
              <field name="company_id" ref="base.main_company"/>
         </record>
-        <record id="stock_picking_1" model="stock.picking">
-            <field name="name">PACKO1</field>
-            <field name="type">out</field>
-            <field name="move_type">direct</field>
-            <field name="invoice_state">2binvoiced</field>
-            <field name="address_id"  ref="res_partner_address_fabien0"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/stock/stock_demo_picking.yml b/addons/stock/stock_demo_picking.yml
new file mode 100644
index 00000000000..6301ab7a0cb
--- /dev/null
+++ b/addons/stock/stock_demo_picking.yml
@@ -0,0 +1,25 @@
+-
+  !record {model: stock.picking, id: stock_picking_1}:
+    type: out
+    company_id: base.main_company
+    address_id: res_partner_address_fabien0
+-
+  !record {model: stock.move, id: stock_move_1}:
+    product_id: product.product_product_cpu1
+    product_uom: product.product_uom_unit
+    product_uos_qty: 5.0
+    product_qty: 5.0
+    location_dest_id: stock.stock_location_customers
+    location_id: stock.stock_location_stock
+    name: CPU1, Processor AMD Athlon XP 1800
+    picking_id: stock_picking_1
+-
+  !record {model: stock.move, id: stock_move_2}:
+    product_id: product.product_product_cpu3
+    product_uom: product.product_uom_unit
+    product_uos_qty: 5.0
+    product_qty: 5.0
+    location_dest_id: stock.stock_location_customers
+    location_id: stock.stock_location_stock
+    name: CPU3, Processor AMD Athlon XP 1800
+    picking_id: stock_picking_1
diff --git a/addons/stock/stock_incoterms.xml b/addons/stock/stock_incoterms.xml
index fb9082161ba..b349fea42fa 100644
--- a/addons/stock/stock_incoterms.xml
+++ b/addons/stock/stock_incoterms.xml
@@ -57,6 +57,10 @@
             <field name="code">DAP</field>
             <field name="name">Delivered At Place</field>
         </record>
+	<record id="incoterm_DDP" model="stock.incoterms">
+            <field name="code">DDP</field>
+            <field name="name">Delivered Duty Paid</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index cabf24dda5b..a8515c2f0df 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -29,6 +29,7 @@
             <field name="code">stock.picking.in</field>
             <field name="prefix">IN/</field>
             <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
         </record>
         
         <record id="seq_picking_out" model="ir.sequence">
@@ -36,6 +37,7 @@
             <field name="code">stock.picking.out</field>
             <field name="prefix">OUT/</field>
             <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
         </record>
         
         <record id="seq_picking_internal" model="ir.sequence">
@@ -43,6 +45,7 @@
             <field name="code">stock.picking.internal</field>
             <field name="prefix">INT/</field>
             <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
         </record>
 
         <!--
@@ -59,6 +62,7 @@
             <field name="padding">7</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
+            <field name="company_id" eval="False"/>
         </record>
 
         <record id="sequence_type_tracking" model="ir.sequence.type">
@@ -73,6 +77,7 @@
             <field name="padding">7</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
+            <field name="company_id" eval="False"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5672422f9bd..6cd9d61f6c4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -6,9 +6,9 @@
                   groups="group_stock_manager,group_stock_user" sequence="5"
                   web_icon="images/warehouse.png"
                   web_icon_hover="images/warehouse-hover.png"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
-        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
-        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
+        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
+        <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
            parent="stock.menu_stock_product" sequence="0"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
@@ -16,7 +16,7 @@
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
         <menuitem
-            id="menu_product_in_config_stock" name="Product"
+            id="menu_product_in_config_stock" name="Products"
             parent="stock.menu_stock_configuration" sequence="2"/>
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_stock"
@@ -75,13 +75,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Inventory">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -95,7 +95,7 @@
             <field name="model">stock.inventory</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Lot Inventory" colors="grey:state in ('cancel')">
+                <tree string="Lot Inventory" colors="grey:state == 'cancel'">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="state"/>
@@ -275,7 +275,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Pack Search">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name" />
                         <field name="serial" />
                         <field name="date" />
@@ -383,7 +383,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
                         <field name="prefix"/>
@@ -393,7 +393,7 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
                 </search>
@@ -423,7 +423,7 @@
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel')" string="Moves">
+                <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="product_id" />
                     <field name="product_qty" />
                     <field name="product_uom"  string="UOM"/>
@@ -447,7 +447,7 @@
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel')" string="Moves">
+                <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="product_id" />
                     <field name="product_qty" />
                     <field name="product_uom"  string="UOM"/>
@@ -479,7 +479,6 @@
             <field name="model">stock.move</field>
             <field name="name">Downstream traceability</field>
             <field eval="'ir.actions.act_window,'+str(action3)" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <record id="action5" model="ir.actions.act_window">
@@ -496,7 +495,6 @@
             <field name="model">stock.move</field>
             <field name="name">Upstream traceability</field>
             <field eval="'ir.actions.act_window,'+str(action5)" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
         <record id="view_location_form" model="ir.ui.view">
@@ -558,6 +556,7 @@
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
                     <field name="name"/>
+                    <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
         </record>
@@ -673,8 +672,9 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
+                    <field name="partner_id" invisible="True"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -698,6 +698,7 @@
                             <field name="name" readonly="1"/>
                             <field name="origin"/>
                             <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" colspan="4"/>
+                            <field name="invoice_state" string="Invoice Control" groups="base.group_extended"/>
                             <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         </group>
                         <group colspan="2" col="2">
@@ -708,7 +709,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_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)"/>
@@ -737,7 +738,6 @@
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
-                                    <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
@@ -760,7 +760,7 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" />
+                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]" />
                                         <field name="location_dest_id" domain="[('usage','=','internal')]" />
                                     </group>
 
@@ -768,7 +768,7 @@
                                         <separator string="Dates" colspan="2" />
                                         <field name="create_date" invisible="1"/>
                                         <field name="date"/>
-                                        <field name="date_expected"/>
+                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
                                     <group colspan="2" col="4" groups="base.group_extended">
@@ -798,7 +798,7 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
@@ -810,7 +810,6 @@
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
                             <field name="auto_picking" groups="base.group_extended"/>
-                            <field name="invoice_state" groups="base.group_extended"/>
                             <field name="date_done" groups="base.group_extended"/>
                             <field name="move_type" groups="base.group_extended"/>
                             <field name="type" groups="base.group_extended"/>
@@ -830,7 +829,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Picking">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
@@ -844,7 +843,7 @@
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -867,7 +866,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Delivery Orders">
+                <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="origin"/>
@@ -903,7 +902,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id, 'picking_type': type}" >
                                 <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)"/>
@@ -960,7 +959,7 @@
                                         <separator string="Dates" colspan="2" />
                                         <field name="create_date" invisible="1"/>
                                         <field name="date"/>
-                                        <field name="date_expected"/>
+                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
                                     <group colspan="2" col="4" groups="base.group_extended">
@@ -990,7 +989,7 @@
                                 </form>
                             </field>
                             <group col="12" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
@@ -1022,7 +1021,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking list">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
@@ -1038,7 +1037,7 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -1059,7 +1058,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner_address', 'search_default_available': 1}</field>
+            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_available': 1}</field>
             <field name="search_view_id" ref="view_picking_out_search"/>
             <field name="help">This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules.</field>
         </record>
@@ -1087,7 +1086,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <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="backorder_id" groups="base.group_extended"/>
@@ -1112,7 +1111,7 @@
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
                             <field name="origin"/>
-                            <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" colspan="4"/>
+                            <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" domain="[('partner_id','&lt;&gt;',False)]" colspan="4"/>
                             <field name="invoice_state" string="Invoice Control"/>
                             <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         </group>
@@ -1124,7 +1123,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id, 'picking_type': type}" >
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id" />
                                     <field name="product_qty" />
@@ -1180,7 +1179,7 @@
                                         <separator string="Dates" colspan="2" />
                                         <field name="create_date" invisible="1"/>
                                         <field name="date"/>
-                                        <field name="date_expected"/>
+                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
                                     <group colspan="2" col="4" groups="base.group_extended">
@@ -1210,17 +1209,15 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                <group colspan="1" states="done">
-                                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                </group>
-                                    <button states="done" name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
+                                <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">
@@ -1241,7 +1238,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
                         <separator orientation="vertical" />
@@ -1256,7 +1253,7 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
@@ -1307,7 +1304,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
-                    <group col="8" colspan="4">
+                    <group>
                         <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
@@ -1317,7 +1314,7 @@
                         <field name="company_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
@@ -1338,7 +1335,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
+            <field name="context">{'default_type': 'internal', 'contact_display': 'partner_address', 'search_default_available': 1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
             <field name="help">Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations.</field>
         </record>
@@ -1358,7 +1355,7 @@
 
 
 
-        <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="base.group_extended"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
@@ -1366,7 +1363,7 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
+                <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"/>
@@ -1385,7 +1382,6 @@
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                         states="draft,waiting,confirmed,assigned,done"
-                        context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
@@ -1446,7 +1442,7 @@
                         <separator string="Dates" colspan="2" />
                         <field name="create_date" groups="base.group_extended"/>
                         <field name="date" groups="base.group_extended"/>
-                        <field name="date_expected"/>
+                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
                     <group colspan="2" col="4" groups="base.group_extended">
@@ -1467,7 +1463,7 @@
                     </group>
 
                     <separator colspan="4"/>
-                    <field name="state"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     <group col="4" colspan="2">
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
@@ -1485,12 +1481,12 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group col="14" colspan="4">
-                        <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"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
+                    <group>
                         <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-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
+                        <separator orientation="vertical"/>
+                        <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"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
@@ -1500,7 +1496,7 @@
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
                         <filter string="Lot" name="groupby_prodlot_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'prodlot_id'}"/>
@@ -1525,7 +1521,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_move_search"/>
-            <field name="context">{'search_default_Available':1}</field>
+            <field name="context">{'search_default_ready':1}</field>
             <field name="help">This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product.</field>
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
@@ -1543,7 +1539,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="6" />
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel')" string="Moves">
+                <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
                     <field name="partner_id" string="Partner"/>
@@ -1558,7 +1554,6 @@
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                        states="draft,waiting,confirmed,assigned,done"
-                        context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
@@ -1573,7 +1568,7 @@
                     <field name="date"/>
                     <field name="state"/>
                     <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
+                    <button name="action_done" string="Process" type="object" states="confirmed,assigned" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1635,7 +1630,7 @@
                         <separator string="Dates" colspan="2" />
                         <field name="create_date" groups="base.group_extended"/>
                         <field name="date" groups="base.group_extended"/>
-                        <field name="date_expected"/>
+                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
                     <group colspan="2" col="4" groups="base.group_extended">
@@ -1674,11 +1669,11 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group col="8" colspan="4">
-                        <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"/>
+                    <group>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
+                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <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"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
                         <field name="partner_id" string="Partner"/>
@@ -1686,7 +1681,7 @@
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -1706,20 +1701,20 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <group col="8" colspan="4">
-                        <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"/>
-                        <separator orientation="vertical"/>
+                    <group>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" 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 orientation="vertical"/>
+                        <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"/>
+                        <separator orientation="vertical"/>
                         <field name="origin"/>
                         <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
+                    <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -1830,7 +1825,6 @@
             <field name="model">stock.location</field>
             <field name="name">Products</field>
             <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
 
@@ -1839,7 +1833,6 @@
             <field name="model">stock.location</field>
             <field name="name">Open Products</field>
             <field eval="'ir.actions.act_window,%d'%action_view_stock_location_product" name="value"/>
-            <field eval="True" name="object"/>
         </record>
         <record id="action_picking_tree_out" model="ir.actions.act_window">
             <field name="name">Customers Packings</field>
@@ -1848,7 +1841,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+            <field name="context">{'default_type': 'out', 'contact_display': 'partner',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_out" model="ir.actions.act_window.view">
@@ -1895,8 +1888,8 @@
             <field name="act_window_id" ref="action_out_picking_move"/>
         </record>
 
-      <menuitem action="action_reception_picking_move" id="menu_action_pdct_in" parent="menu_stock_products_moves" sequence="1"/>
-      <menuitem action="action_out_picking_move" id="menu_action_pdct_out" parent="menu_stock_products_moves" sequence="2"/>
+      <menuitem action="action_reception_picking_move" id="menu_action_pdct_in" parent="menu_stock_products_moves" sequence="1" groups="base.group_extended"/>
+      <menuitem action="action_out_picking_move" id="menu_action_pdct_out" parent="menu_stock_products_moves" sequence="2" groups="base.group_extended"/>
 
 
          <record id="view_stock_journal_filter" model="ir.ui.view">
@@ -1945,5 +1938,9 @@
             groups="base.group_extended"
             parent="menu_warehouse_config" />
 
+        <record model="ir.actions.todo.category" id="category_stock_management_config">
+            <field name="name">Stock Management</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 7a1f786ebf8..d54c8b83d11 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -37,13 +37,6 @@
             <field name="action">action_done()</field>
             <field name="flow_stop">True</field>
         </record>
-        <record id="act_cancel_inv" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_picking"/>
-            <field name="name">cancel</field>
-            <field name="flow_stop">True</field>
-            <field name="kind">function</field>
-            <field name="action">action_cancel()</field>
-        </record>
 
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
@@ -121,11 +114,6 @@
             <field name="act_to" ref="act_cancel"/>
             <field name="condition">test_cancel()</field>
         </record>
-        <record id="trans_draft_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_cancel_inv"/>
-            <field name="signal">button_cancel</field>
-        </record>
 
         <record id="trans_assigned_cancel_auto" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
diff --git a/addons/stock/test/stock_demo_backorder.yml b/addons/stock/test/stock_demo_backorder.yml
new file mode 100644
index 00000000000..986a59c7349
--- /dev/null
+++ b/addons/stock/test/stock_demo_backorder.yml
@@ -0,0 +1,65 @@
+- 
+  In order to test partial delivery and back orders, I will use a delivery order with 5 CPU1 and 5 CPU3
+-
+  I confirm and force the availability of all products on the picking OUT001
+- 
+  !python {model: stock.picking}: |
+    self.draft_force_assign(cr, uid, [ref('stock.stock_picking_1')], {})
+    self.force_assign(cr, uid, [ref('stock.stock_picking_1')], {})
+-
+  After having confirmed the picking and its two lines, I add a new move line in draft state with 7 FAN2
+-
+  !record {model: stock.move, id: stock_move_3}:
+    product_id: product.product_product_fan2
+    product_uom: product.product_uom_unit
+    product_uos_qty: 7.0
+    product_qty: 7.0
+    location_dest_id: stock.stock_location_customers
+    location_id: stock.stock_location_stock
+    name: CPU3, Processor AMD Athlon XP 1800
+    picking_id: stock_picking_1
+- |
+  I click on 'Process Now' to process the delivery order and I change quantities to:
+  7 CPU1, 0 CPU3, 3 FAN2 and a new product of 4 PC1
+-
+  !python {model: stock.picking}: |
+    result = self.action_process(cr, uid, [ref('stock.stock_picking_1')], {})['res_id']
+    pick = self.pool.get('stock.partial.picking').browse(cr, uid, result, {})
+    lobj = self.pool.get('stock.partial.picking.line')
+    for line in pick.move_ids:
+        if line.product_id.id == ref('product.product_product_cpu3'):
+            lobj.write(cr, uid, [line.id], {
+                'quantity': 0.0
+            }, {})
+        elif line.product_id.id == ref('product.product_product_cpu1'):
+            lobj.write(cr, uid, [line.id], {
+                'quantity': 7.0
+            }, {})
+        elif line.product_id.id == ref('product.product_product_fan2'):
+            lobj.write(cr, uid, [line.id], {
+                'quantity': 3.0
+            }, {})
+    lobj.create(cr, uid, {
+        'product_id': ref('product.product_product_pc1'),
+        'quantity': 2.0,
+        'product_uom': ref('product.product_uom_unit'),
+        'location_id': ref('stock.stock_location_stock'),
+        'location_dest_id': ref('stock.stock_location_customers'),
+        'wizard_id': result
+    }, {})
+    self.pool.get('stock.partial.picking').do_partial(cr, uid, [result], {})
+-
+  I test that the back order contains 5 CPU3, 4 FAN2 and nothing else
+-
+  !python {model: stock.picking}: |
+    pick = self.browse(cr, uid, ref('stock.stock_picking_1'), {})
+    for line in pick.move_lines:
+        if line.product_id.id == ref('product.product_product_cpu3'):
+            assert line.product_qty == 5.0, "Wrong quantity %.2f for CPU3 back order" % (line.product_qty,)
+        elif line.product_id.id == ref('product.product_product_fan2'):
+            assert line.product_qty == 4.0, "Wrong quantity %.2f for FAN2 back order" % (line.product_qty,)
+        elif line.product_id.id == ref('product.product_product_pc1'):
+            assert line.product_qty == 0.0, "Wrong quantity for PC1 back order"
+        else:
+            assert line.product_qty == 0.0, "Wrong quantity for %s back order" % (line.product_id.code,)
+
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 48153ee732c..63650ffeb38 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -2,224 +2,103 @@
 -
   In order to test the stock module, I will create product,
   create physical inventory ,fill inventory lines from location,split inventory line into production lot
+-
+  I create Stock Production Lot for product PC3
+-
+  !record {model: stock.production.lot, id: stock_production_lot0}:
+    product_id: product.product_product_pc3
+    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
+    name: 0000001
+-
+  I trace the Stock Production Lot for product PC3.
+-
+  !python {model: stock.production.lot }: |
+    self.action_traceability(cr,uid,[ref('stock_production_lot0')], {'lang': 'en_US', 'tz': False, 'active_model': 'ir.ui.menu', 'field': '', 'type': ''})
 
 -
-  I create Asset Account Type.
+  I create change product quantity for product PC3.
 -
-  !record {model: account.account.type, id: account_account_type_asset0}:
-    close_method: balance
-    code: asset
-    name: Asset
-    sign: 1
+  !record {model: stock.change.product.qty, id: stock_change_product_qty0}:
+    product_id: product.product_product_pc3
+    new_quantity: 100
+    location_id: stock.stock_location_stock
+    prodlot_id: stock.stock_production_lot0
 
 -
-   I create Income Account Type.
+  I apply the new quantity on product PC3.
 -
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: income
-    name: Income
-    sign: 1
-
+  !python {model: stock.change.product.qty }: |
+    context = {"lang": 'en_US', "active_model":
+      "product.product", "active_ids": [ref("product.product_product_pc3")], "tz": False, "active_id":ref('product.product_product_pc3')}
+    self.default_get(cr, uid, ["prodlot_id", "location_id", "new_quantity", "product_id"], context)
+    self.fields_view_get(cr, uid, ref("stock.view_change_product_quantity"),"form", context)
+    self.change_product_qty(cr, uid, [ref("stock_change_product_qty0")], {"lang": 'en_US', "active_model":
+      "stock.change.product.qty", "active_ids": ref("product.product_product_pc3"), "tz": False, "active_id":ref('product.product_product_pc3')})
 
 -
-  I create Expense Account Type.
+  I check that the quantity on product PC3 is updated.
 -
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: expense
-    name: Expense
-    sign: 1
--
-  I create Cash Account Type.
--
-  !record {model: account.account.type, id: account_account_type_cash0}:
-    close_method: balance
-    code: cash
-    name: Cash
-    sign: 1
-
+  !python {model: product.product }: |
+    pro_obj = self.browse(cr, uid, ref("product.product_product_pc3"))
+    assert (pro_obj.qty_available >= 100) , "The quantity of PC3 is not updated!"
 
 -
-  I create Receivable Account Type.
--
-  !record {model: account.account.type, id: account_account_type_receivable0}:
-    close_method: balance
-    code: receivable
-    name: Receivable
-    sign: 1
+  I Read quantity on product PC3.
 -
+  !python {model: stock.location }: |
+    self.read(cr, uid, [ref("stock.stock_location_stock")],['stock_real_value','stock_virtual'], {'lang': 'en_GB', 'tz': False, 'active_model': 'product.product', 'bin_size': True, 'active_ids': [ref("product.product_product_pc3")], 'product_id':ref("product.product_product_pc3"), 'active_id': ref("product.product_product_pc3")})
 
-  I create Receivable Account .
--
-  !record {model: account.account, id: account_account_receivable0}:
-    code: '40000-stock-test'
-    company_id: base.main_company
-    currency_mode: current
-    name: Receivable
-    parent_left: 1
-    parent_right: 2
-    type: receivable
-    user_type: account_account_type_receivable0
--
-  I create Payable Account.
--
-  !record {model: account.account, id: account_account_payable0}:
-    code: '440000-stock-test'
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_left: 3
-    parent_right: 4
-    type: payable
-    user_type: account_account_type_expense0
--
-  I create Purchase Journal - (test).
--
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: pur
-    company_id: base.main_company
-    name: Purchase Journal - (test)
-    sequence_id:  account.sequence_purchase_journal
-    type: purchase
-    view_id: account.account_journal_bank_view
+- 
+  I Creating a chained stock.location record
+- 
+  !record {model: stock.location, id: stock_location_loc0}:
+    chained_auto_packing: auto
+    chained_delay: 0.0
+    chained_location_id: stock.stock_location_customers
+    chained_location_type: fixed
+    location_id: stock.stock_location_company
+    name: chain location
+    parent_left: 2
+    parent_right: 3
+    usage: internal
 
 -
-  I create Sale Journal.
+  I create Product By location chart for stock.location.product Object.
 -
-  !record {model: account.journal, id: account_journal_salejouran0}:
-    code: sal
-    company_id: base.main_company
-    name: Sale Journal
-    sequence_id: account.sequence_sale_journal
-    type: sale
-    view_id: account.account_journal_view
+  !record {model: stock.location.product, id: stock_location_product0}:
+    from_date: '2011-07-01 00:00:00'
+    to_date: '2011-07-31 23:59:00'
 
 -
-  I create Expense Account.
+  I open product chart.
 -
-  !record {model: account.account, id: account_account_expenseaccount0}:
-    code: Expe
-    company_id: base.main_company
-    currency_mode: current
-    name: Expense Account
-    parent_left: 5
-    parent_right: 6
-    type: consolidation
-    user_type: account_account_type_asset0
--
-  I create Product Sale Account.
--
-  !record {model: account.account, id: account_account_productsale0}:
-    code: '001-stock-test'
-    company_id: base.main_company
-    currency_mode: current
-    name: Product Sale
-    type: other
-    user_type: stock.account_account_type_income0
-
+  !python {model: stock.location.product }: |
+    self.action_open_window(cr, uid, [ref("stock_location_product0")], {'lang': 'en_US', 'full': 1, 'tz': False, 'active_model': 'stock.location', 'search_default_in_location': 1, 'active_ids': [ref("stock.stock_location_stock")], 'active_id': ref("stock.stock_location_stock")})
 
 -
-  I create Product Purchase Account.
+  I open product form from stock.location object .
 -
-  !record {model: account.account, id: account_account_productpurchase0}:
-    code: '0002-stock-test'
-    company_id: base.main_company
-    currency_mode: current
-    name: Product Purchase
-    type: other
-    user_type: account_account_type_expense0
+  !python {model: product.product }: |
+    self.fields_view_get(cr, uid, False, "tree", {'lang': 'en_US', 'full': 1, 'tz': False, 'active_model': 'stock.location', 'location': ref('stock.stock_location_stock'), 'search_default_in_location': 1, 'active_ids': [ref("stock.stock_location_stock")], 'active_id': ref("stock.stock_location_stock")})
 
 -
-  I create partner.
+  I create change product standard price for product PC3.
 -
-  !record {model: res.partner, id: res_partner_shawtrust0}:
-    address:
-      - country_id: base.in
-      - street: St James House, Vicar Lane, Sheffield
-    lang: en_US
-    name: 'Shaw Trust '
-    property_account_payable: account_account_payable0
-    property_account_receivable: account_account_receivable0
--
-  I create partner.
--
-  !record {model: res.partner, id: res_partner_diasorinltd0}:
-    address:
-      - country_id: base.in
-        street: Ash House, Ash Road
-    name: DiaSorin Ltd
-    supplier: true
-
+  !record {model: stock.change.standard.price, id: stock_change_standard_price0}:
+    new_price: 1515
+    stock_account_input: account.a_recv
+    stock_account_output: account.a_pay
+    stock_journal: account.expenses_journal
+    enable_stock_in_out_acc: True
 
 -
-  I create partner.
+  I apply the new product standard price on product PC3.
 -
-  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
-    address:
-      - street: Kailash Vaibhav, Parksite
-    name: Micro Link Technologies
-    property_account_payable: account_account_payable0
-    property_account_receivable: account_account_receivable0
-    supplier: true
-
--
-  I create partner address.
--
-  !record {model: res.partner.address, id: res_partner_address_0}:
-    country_id: base.in
-    partner_id: stock.res_partner_diasorinltd0
-    street: Ash House, Ash Road
-    title: base.res_partner_title_miss
-
-
--
-  I create  product.category .
--
-  !record {model: product.category, id: product_category_computer0}:
-    name: Computer
-
--
-   I create  product HP Pavilion Desktop PCs .
--
-  !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
-    categ_id: stock.product_category_computer0
-    cost_method: standard
-    mes_type: fixed
-    list_price: 1000.0
-    name: HP Pavilion Desktop PCs
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: stock.res_partner_shawtrust0
-        min_qty: 5.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    property_account_expense: account_account_productsale0
-    property_account_income: account_account_productsale0
-
--
-  I create  product HP CD writers.
--
-  !record {model: product.product, id: product_product_hpcdwriters0}:
-    categ_id: stock.product_category_computer0
-    cost_method: standard
-    list_price: 1000.0
-    mes_type: fixed
-    name: HP CD writers
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: res_partner_shawtrust0
-        min_qty: 5.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    property_account_expense: account_account_productpurchase0
-    property_account_income: account_account_productsale0
+  !python {model: stock.change.standard.price }: |
+    context = {"lang": 'en_US', "active_model":
+      "product.product", "active_ids": [ref("product.product_product_pc3")], "tz": False, "active_id":ref('product.product_product_pc3')}
+    self.default_get(cr, uid, ["new_price"], context)
+    self.change_price(cr, uid, [ref("stock_change_product_qty0")], context)
 
 -
   I create Physical Inventory for the products.
@@ -227,64 +106,123 @@
    !record {model: stock.inventory, id: stock_inventory_physicalinventoy0}:
     company_id: base.main_company
     date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    date_done: !eval time.strftime('%Y-%m-%d %H:%M:%S')
     inventory_line_id:
       - company_id: base.main_company
         location_id: stock.stock_location_stock
-        product_id: stock.product_product_hpcdwriters0
+        product_id: product.product_product_pc3
         product_qty: 10.0
         product_uom: product.product_uom_unit
       - company_id: base.main_company
         location_id: stock.stock_location_stock
-        product_id: stock.product_product_hppaviliondesktoppcs0
+        product_id: product.product_product_pc1
         product_qty: 10.0
         product_uom: product.product_uom_unit
     name: Physical inventory
     state: draft
 
+-
+  I create merge Inventory for the products.
+-
+   !record {model: stock.inventory, id: stock_inventory_mergeinventoy0}:
+    company_id: base.main_company
+    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
+    inventory_line_id:
+      - company_id: base.main_company
+        location_id: stock.stock_location_stock
+        product_id: product.product_product_pc3
+        product_qty: 20.0
+        product_uom: product.product_uom_unit
+      - company_id: base.main_company
+        location_id: stock.stock_location_stock
+        product_id: product.product_product_pc1
+        product_qty: 20.0
+        product_uom: product.product_uom_unit
+    name: Physical inventory
+    state: draft
 
 -
-  I confirm the Inventory for HP CD writers.
+  I merge inventory .
 -
-  !python {model: stock.inventory}: |
-   self.action_confirm(cr,uid,[ref('stock_inventory_physicalinventoy0')])
-   self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')])
+  !python {model: stock.inventory.merge}: |
+    context = {"lang": 'en_US',
+      "full": "1", "tz": False, "active_model": "stock.inventory", "active_ids":
+      [ref("stock_inventory_physicalinventoy0"), ref("stock_inventory_mergeinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0"), }
+    self.fields_view_get(cr, uid, False, "form", context)
+    self.do_merge(cr, uid, [ref("stock_inventory_mergeinventoy0")], context)
+
+-
+  I create stock.inventory.line record.
+-
+  !record {model: stock.inventory.line, id: stock_inventory_line}:
+    product_id: product.product_product_pc1
+    product_uom: product.product_uom_unit
+    product_qty: 10
+    inventory_id: stock_inventory_mergeinventoy0
+    location_id: stock.stock_location_stock
+
+-
+  I Change a Product oF stock.inventory.line record.
+-
+  !python {model: stock.inventory.line}: |
+    self.on_change_product_id(cr, uid, [ref("stock_inventory_line")], ref('stock.stock_location_stock'), ref('product.product_product_pc3'), False, False)
+
 -
   I create stock.fill.inventory .
 -
   !record {model: stock.fill.inventory, id: stock_fill_inventory_0}:
     location_id: stock.stock_location_stock
+    recursive: False
+    set_stock_zero: False
 
 -
-  I fill inventory for HP CD writers.
+  I fill inventory for PC3.
 -
   !python {model: stock.fill.inventory}: |
-    self.fill_inventory(cr, uid, [ref("stock_fill_inventory_0")], {"lang": 'en_US',
-      "full": "1", "tz": False, "active_model": "stock.inventory", "active_ids":
-      [ref("stock_inventory_physicalinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0"), })
+    context = {"lang": 'en_US',"full": "1", "tz": False, "active_model": "stock.inventory", "active_ids":
+      [ref("stock_inventory_physicalinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0")}
+    self.view_init(cr, uid, ["set_stock_zero", "location_id", "recursive"], context)
+    self.fill_inventory(cr, uid, [ref("stock_fill_inventory_0")], context)
 
 -
-  I create stock.move.split record.
+  I split the PC3 inventory line to create 5 PC3 with production lot 00002-stock-test
 -
-  !record {model: stock.move.split, id: stock_move_split_0}:
+  !record {model: stock.inventory.line.split, id: stock_inventory_line_0}:
     line_ids:
-      - name: '00001-stock-test'
+      - name: '00002-stock-test'
         quantity: 5
-    product_id: stock.product_product_hpcdwriters0
+    product_id: product.product_product_pc1
+    product_uom: product.product_uom_unit
+    use_exist: False
+    qty: 10
+-
+  I confirm the split operation
+-
+  !python {model: stock.inventory.line}: |
+    line_ids = self.search(cr, uid, [('inventory_id','=',ref('stock_inventory_physicalinventoy0')),
+                                     ('product_id','=',ref('product.product_product_pc1'))])
+    assert line_ids, 'Inventory lines are missing'
+    self.pool.get('stock.inventory.line.split').split_lot(cr, uid, [ref("stock_inventory_line_0")],
+                                                            {'active_model': 'stock.inventory.line',
+                                                             'active_ids': [line_ids[0]]})
+-
+  I confirm the Inventory for PC3.
+-
+  !python {model: stock.inventory}: |
+   self.action_confirm(cr,uid,[ref('stock_inventory_physicalinventoy0')])
+   self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')])
+-
+  I cancel the Inventory for PC3.
+-
+  !python {model: stock.inventory}: |
+   self.action_cancel_inventary(cr,uid,[ref('stock_inventory_physicalinventoy0')])
 
 -
-  I Split into production line.
--
-  !python {model: stock.move.split}: |
-    move_obj=self.pool.get('stock.move')
-    product_obj=self.pool.get('product.product')
-    product_id=product_obj.search(cr,uid,[('name','=','HP CD writers')])
-    move_ids=move_obj.search(cr,uid,[('product_id','in',product_id)])
-    self.split_lot(cr, uid, [ref("stock_move_split_0")], {"lang": 'en_US', "active_model":
-      "stock.move", "active_ids": move_ids, "tz": False, "active_id":move_ids[0]
-      })
+  I change inventory state to draft for PC3.
 -
+  !python {model: stock.inventory}: |
+   self.action_cancel_draft(cr,uid,[ref('stock_inventory_physicalinventoy0')])
 
+-
   In Order to test the picking I create picking with move lines.
 -
   !record {model: stock.picking, id: stock_picking_0}:
@@ -292,21 +230,36 @@
     address_id: base.res_partner_address_4
     company_id: base.main_company
     date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    invoice_state: none
+    invoice_state: 2binvoiced
     move_lines:
       - company_id: base.main_company
         date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        location_dest_id: stock.stock_location_customers
+        location_dest_id: stock.stock_location_loc0
         location_id: stock.stock_location_stock
-        name: HP CD writers
-        product_id: product.product_product_pc1
-        product_qty: 3.0
+        name: PC3
+        product_id: product.product_product_pc3
+        product_qty: 100.0
         product_uom: product.product_uom_unit
         date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        product_uos_qty: 3.0
+        product_uos_qty: 100.0
     move_type: direct
-    type: internal
+    type: out
 
+-
+  I split the picking with a first batch of 20 PCs
+-
+  !python {model: stock.picking }: |
+    pick=self.browse(cr,uid,ref('stock_picking_0'))
+    split_obj=self.pool.get('stock.split.into')
+    partial_datas={}
+    move=pick.move_lines[0]
+    partial_datas= {
+          'quantity': 20,
+      }
+    split_id = self.pool.get('stock.split.into').create(cr, uid, partial_datas)
+    split_obj.split(cr, uid, [split_id], {"lang": "en_US", "tz":
+    False, "active_model": "stock.move", "active_ids": [move.id],
+    "active_id": move.id, })
 
 -
   I click on draft_force_assign on picking.
@@ -317,31 +270,156 @@
       "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id":
       ref("stock.menu_action_picking_tree6"), })
 
-
 -
-  I click on force_assign on picking.
+  I click on action_assign on picking.
 -
   !python {model: stock.picking}: |
-    self.force_assign(cr, uid, [ref("stock_picking_0")], {"lang": "en_US", "active_model":
+    self.action_assign(cr, uid, [ref("stock_picking_0")], {"lang": "en_US", "active_model":
       "ir.ui.menu", "tz": False, "search_default_confirmed": 1, "contact_display":
       "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id":
       ref("stock.menu_action_picking_tree6"), })
 
 -
-  I confirm the picking.
+  I process the partial picking with 20 PCE
 -
   !python {model: stock.picking }: |
-   import time
-   pick=self.browse(cr,uid,ref('stock_picking_0'))
-   move =pick.move_lines[0]
-   partial_datas = {
-          'partner_id':pick.address_id.partner_id.id,
-           'address_id': pick.address_id.id,
-           'delivery_date' : time.strftime('%Y-%m-%d')
-            }
-   partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id,
-          'product_qty': move.product_qty,
+   pick = self.browse(cr,uid,ref('stock_picking_0'))
+   stock_partial_move = self.pool.get('stock.partial.move')
+   partial_id = stock_partial_move.create(cr, uid, {},
+           context={'active_model': 'stock.move',
+                    'active_ids': [x.id for x in pick.move_lines]})
+   stock_partial_move.do_partial(cr, uid, [partial_id])
+-
+  I Performing an osv_memory action split_lot on module stock.move.split
+-
+
+  !python {model: stock.picking }: |
+    split_obj=self.pool.get('stock.move.split')
+    split_move_lines=self.pool.get('stock.move.split.lines')
+    pick=self.browse(cr,uid,ref('stock_picking_0'))
+    partial_datas={}
+    move=pick.move_lines[0]
+    partial_datas= {
+          'product_id': move.product_id.id,
+          'qty': 80,
+          'product_uom': move.product_uom.id,
+          'use_exist': move.picking_id and move.picking_id.type=='out' and True or False
+      }
+    split_id = self.pool.get('stock.move.split').create(cr, uid, partial_datas, context={})
+    split_move_data= {
+          'lot_id': split_id,
+          'quantity': 10,
+          'name': 'lot',
+    }
+    split_move_id = split_move_lines.create(cr, uid, split_move_data, context={})
+    split_obj.default_get(cr, uid, ["product_id", "product_uom", "line_exist_ids", "qty",
+     "line_ids", "use_exist"], {'lang': 'en_US', 'default_location_dest_id': ref('stock.stock_location_stock'), 'tz': False, 'active_model': 'stock.move', 'search_default_receive': 1, 'product_receive': True, 'active_ids': [move.id], 'default_location_id': ref('stock.stock_location_locations'), 'active_id': move.id})
+    split_obj.split_lot(cr, uid, [split_id], context={"lang": "en_US", "tz":
+    False, "active_model": "stock.move", "scrap": True, "active_ids": [move.id],
+    "active_id": move.id, })
+
+-
+  I Performed an osv_memory action move_scrap on module stock.move.scrap
+-
+  !python {model: stock.picking }: |
+    location_obj = self.pool.get('stock.location')
+    scrpaed_location_ids = location_obj.search(cr, uid, [('scrap_location','=',True)])
+    pick=self.browse(cr,uid,ref('stock_picking_0'))
+    scrap_obj=self.pool.get('stock.move.scrap')
+    partial_datas={}
+    move=pick.move_lines[0]
+    partial_datas= {
+          'product_id': move.product_id.id,
+          'location_id': scrpaed_location_ids[0],
+          'product_qty': 1,
           'product_uom': move.product_uom.id,
       }
-   self.do_partial(cr, uid, [ref('stock_picking_0')],partial_datas)
+    scrap_id = scrap_obj.create(cr, uid, partial_datas)
+    context = {"lang": "en_US", "tz": False, "active_model": "stock.move", 
+    "scrap": True, "active_ids": [move.id], "active_id": move.id, }
+    scrap_obj.default_get(cr, uid, ["location_id", "product_id", "product_uom", "product_qty"], context)
+    scrap_obj.move_scrap(cr, uid, [scrap_id], context)
+
+-
+  I Performed an osv_memory do move consume  on module stock.move.consume
+-
+  !python {model: stock.picking }: |
+    location_obj = self.pool.get('stock.location')
+    scrpaed_location_ids = location_obj.search(cr, uid, [('scrap_location','=',True)])
+    pick=self.browse(cr,uid,ref('stock_picking_0'))
+    consume_obj=self.pool.get('stock.move.consume')
+    partial_datas={}
+    move=pick.move_lines[0]
+    partial_datas= {
+          'product_id': move.product_id.id,
+          'location_id': scrpaed_location_ids[0],
+          'product_qty': 1,
+          'product_uom': move.product_uom.id,
+      }
+    context = {"lang": "en_US", "tz": False, "active_model": "stock.move", 
+    "scrap": True, "active_ids": [move.id], "active_id": move.id, }
+    consume_id = consume_obj.create(cr, uid, partial_datas)
+    consume_obj.default_get(cr, uid, ["location_id", "product_id", "product_uom", "product_qty"], context)
+    consume_obj.do_move_consume(cr, uid, [consume_id], context)
+
+-
+  I process the picking with the 80 remaining PCs
+-
+  !python {model: stock.picking}: |
+     stock_partial_picking = self.pool.get('stock.partial.picking')
+     partial_id = stock_partial_picking.create(cr, uid, {},
+             context={'active_model': 'stock.picking',
+                      'active_ids': [ref('stock_picking_0')]})
+     stock_partial_picking.do_partial(cr, uid, [partial_id])
+-
+  I Performing an osv_memory action create_invoice on module stock.invoice.onshipping
+-
+  !python {model: stock.invoice.onshipping}: |
+    invoice_line_id = self.create(cr, uid,{}, {"lang": 'en_US', "active_model":
+      "stock.picking", "active_ids": [ref("stock_picking_0")], "tz": False, "active_id":ref("stock_picking_0")})
+    self.open_invoice(cr, uid, [invoice_line_id], {"lang": "en_US",
+      "search_default_available": 1, "inv_type": "in_invoice" , "tz": False, "active_model": "stock.picking",
+      "contact_display": "partner_address", "active_ids": [ref("stock_picking_0")],
+      "active_id": ref("stock_picking_0")})
+    self._get_journal_id(cr, uid, {"lang": "en_US", "search_default_available": 1, "tz": False, "active_model": "stock.picking",
+      "contact_display": "partner_address", "active_ids": [ref("stock_picking_0")],
+      "active_id": ref("stock_picking_0"), })
+
+-
+  I create a record of stock.picking and unlink a record
+-
+  !python {model: stock.picking}: |
+    copy_id = self.copy(cr, uid, (ref("stock_picking_0")))
+    ctx = {"lang": "en_US", "active_model":
+      "ir.ui.menu", "tz": False, "search_default_confirmed": 1, "contact_display":
+      "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id":
+      ref("stock.menu_action_picking_tree6"), }
+    self.draft_force_assign(cr, uid, [copy_id], ctx)
+    self.unlink(cr, uid, [copy_id], ctx)
+
+-
+  I create a record of stock.picking and cancel a record
+-
+  !python {model: stock.picking}: |
+    copy_id = self.copy(cr, uid, (ref("stock_picking_0")))
+    self.draft_validate(cr, uid, [copy_id], {"lang": "en_US", "search_default_available":
+      1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner_address",
+      "active_ids": [ref("stock.menu_action_picking_tree4")], "active_id": ref("stock.menu_action_picking_tree4"),
+      })
+    self.allow_cancel(cr, uid, [copy_id], context= None)
+
+-
+  I process a copy of the picking and I return it
+-
+  !python {model: stock.picking}: |
+    copy_id = self.copy(cr, uid, (ref("stock_picking_0")))
+    self.draft_force_assign(cr, uid, [copy_id])
+    self.force_assign(cr, uid, [copy_id])
+    stock_partial_picking = self.pool.get('stock.partial.picking')
+    context = {'active_model': 'stock.picking',
+               'active_ids': [copy_id],
+               'active_id': copy_id}
+    partial_id = stock_partial_picking.create(cr, uid, {}, context=context)
+    stock_partial_picking.do_partial(cr, uid, [partial_id], context)
+    return_pick_id = self.pool.get('stock.return.picking').create(cr, uid,{}, context)
+    self.pool.get('stock.return.picking').create_returns(cr, uid, [return_pick_id], context)
diff --git a/addons/stock/test/stock_test_wizard.yml b/addons/stock/test/stock_test_wizard.yml
new file mode 100644
index 00000000000..6c4d5ae12c2
--- /dev/null
+++ b/addons/stock/test/stock_test_wizard.yml
@@ -0,0 +1,78 @@
+
+-
+  I create stock.tracking record.
+-
+  !record {model: stock.tracking, id: stock_tracking_0}:
+    move_ids:
+      - product_id: product.product_product_pc1
+        product_qty: 5.0
+        product_uom: product.product_uom_unit
+        location_id : stock.stock_location_suppliers
+        location_dest_id: stock.stock_location_shop0
+        name : '[PC1] Basic PC'
+        date_expected : !eval time.strftime('%Y-%m-%d %H:%M:%S')
+    name: 0000007
+    active: True
+    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
+
+-
+  I trace the information of a product.
+-
+  !python {model: stock.tracking}: |
+     self.name_get(cr, uid, [ref('stock_tracking_0')],{'lang': 'en_US', 'tz': False, 'active_model': 'ir.ui.menu', 'field': '', 'type': ''})
+     self.action_traceability(cr,uid,[ref('stock_tracking_0')], {'lang': 'en_US', 'tz': False, 'active_model': 'ir.ui.menu', 'field': '', 'type': ''})
+
+-
+  I creat stock.move Record
+-
+  !record {model: stock.move, id: stock_move_test0}:
+    location_dest_id: stock.stock_location_shop0
+    product_id: product.product_product_pc1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    date_expected : !eval time.strftime('%Y-%m-%d %H:%M:%S')
+    location_id : stock.stock_location_suppliers
+    name : '[PC1] Basic PC'
+    company_id: base.main_company
+    product_uos_qty : 5.0
+    name: IN/00010
+    state: assigned
+
+-
+  I Check  onchange function of stock.move object
+-
+  !python {model: stock.move }: |
+    self.onchange_lot_id(cr, uid, [ref("stock_move_test0")], ref("stock.stock_production_lot0"), 5, ref("stock.stock_location_suppliers"), ref("product.product_product_pc1"), ref("product.product_uom_unit"), None)
+    self.onchange_quantity(cr, uid, [ref("stock_move_test0")], ref("product.product_product_pc1"), 10, ref("product.product_uom_unit"), ref("product.product_uom_unit"))
+    self.onchange_uos_quantity(cr, uid, [ref("stock_move_test0")], ref("product.product_product_pc1"), 10, ref("product.product_uom_unit"), ref("product.product_uom_unit"))
+    self.onchange_product_id(cr, uid, [ref("stock_move_test0")], ref("product.product_product_pc1"), ref("stock.stock_location_suppliers"), ref("stock.stock_location_shop0"), False)
+
+-
+  I Check _getSSCC  and action_partial_move function of stock.move object
+-
+  !python {model: stock.move }: |
+    context = {"lang": 'en_US', "default_location_dest_id": ref("stock.stock_location_shop0"), "active_model":
+      "stock.move", "search_default_receive": 1, 'product_receive': True, "default_location_id": ref("stock.stock_location_suppliers"),"active_ids":[ref("stock_move_test0")], "tz": False, "active_id":ref("stock_move_test0")}
+    self._getSSCC(cr, uid , context)
+    self.action_partial_move(cr, uid , [ref("stock_move_test0")], context)
+
+-
+  I check write function
+-
+  !python {model: stock.move }: |
+    vals = {"product_qty" : 2, "product_uos_qty": 2}
+    self.write(cr, uid, [ref("stock_move_test0")], vals, {"lang": 'en_US', "default_location_dest_id": ref("stock.stock_location_shop0"), "active_model":
+      "ir.ui.menu", "search_default_receive": 1, 'product_receive': True, "default_location_id": ref("stock.stock_location_suppliers"),"active_ids":[ref("stock_move_tree")], "tz": False, "active_id":ref("stock_move_tree")})
+
+-
+  I check default function
+-
+  !python {model: stock.move }: |
+    self.name_get(cr, uid, [ref("stock_move_test0")], {"lang": 'en_US', "default_location_dest_id": ref("stock.stock_location_shop0"), "active_model":
+      "stock.move", "search_default_receive": 1, 'product_receive': True, "default_location_id": ref("stock.stock_location_suppliers"),"active_ids":[ref("stock_move_test0")], "tz": False, "active_id":ref("stock_move_test0")})
+    ctx = {"lang": 'en_US', "default_location_dest_id": ref("stock.stock_location_shop0"), "active_model":
+      "ir.ui.menu", "search_default_receive": 1, 'product_receive': True, "default_location_id": ref("stock.stock_location_suppliers"),"active_ids":[ref("view_move_form_reception_picking")], "tz": False, "active_id":ref("view_move_form_reception_picking")}
+    self._default_location_destination(cr, uid, ctx)
+    self._default_location_source(cr, uid, ctx)
+
+
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index b903f020f82..e37483bfb37 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -24,8 +24,6 @@ import stock_move
 import stock_splitinto
 import stock_partial_picking
 import stock_partial_move
-import stock_replacement
-import stock_ups
 import stock_inventory_merge
 import stock_fill_inventory
 import stock_inventory_line_split
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index f12eabd39e8..a2b4b6ebae4 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+import decimal_precision as dp
 from tools.translate import _
 import tools
 
@@ -28,7 +29,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', required=True, help='This quantity is expressed in the Default UoM of the product.'),
+        'new_quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True, help='This quantity is expressed in the Default UoM of the product.'),
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index d6b7355bb7c..d4ca8d1138f 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -69,6 +69,7 @@ class change_standard_price(osv.osv_memory):
 
         return res
 
+    # onchange_price function is not used anywhere 
     def onchange_price(self, cr, uid, ids, new_price, context=None):
         """ Sets stock input and output account according to the difference
             of old price and new price.
@@ -116,3 +117,5 @@ class change_standard_price(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
 change_standard_price()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index ee23c58adb0..5c5e8964e9a 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -70,6 +70,7 @@ class stock_fill_inventory(osv.osv_memory):
         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):
             ids = ids[0]
         else:
@@ -91,12 +92,16 @@ class stock_fill_inventory(osv.osv_memory):
         for location in location_ids:
             datas = {}
             res[location] = {}
-            move_ids = move_obj.search(cr, uid, [('location_dest_id','=',location),('state','=','done')], context=context)
+            move_ids = move_obj.search(cr, uid, ['|',('location_dest_id','=',location),('location_id','=',location),('state','=','done')], context=context)
 
             for move in move_obj.browse(cr, uid, move_ids, context=context):
                 lot_id = move.prodlot_id.id
                 prod_id = move.product_id.id
-                qty = move.product_qty
+                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']
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 2e8b93ad52b..ae4ce54ab9b 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -21,24 +21,17 @@
 
 from osv import fields, osv
 
-from tools.translate import _
-import time
-
 class stock_inventory_line_split(osv.osv_memory):
     _inherit = "stock.move.split"
     _name = "stock.inventory.line.split"
     _description = "Split inventory lines"
 
+    _columns = {
+        'line_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_id', 'Production Lots'),
+        'line_exist_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_exist_id', 'Production Lots'),
+     }
 
     def default_get(self, cr, uid, fields, context=None):
-        """ To check the availability of production lot.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values
-        @param context: A standard dictionary
-        @return: A dictionary which of fields with values.
-        """
         if context is None:
             context = {}
         record_id = context and context.get('active_id',False)
@@ -54,14 +47,13 @@ class stock_inventory_line_split(osv.osv_memory):
 
     def split(self, cr, uid, ids, line_ids, context=None):
         """ To split stock inventory lines according to production lot.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one
-        @param line_ids: the ID or list of IDs of inventory lines we want to split
-        @param context: A standard dictionary
-        @return:
+
+        :param line_ids: the ID or list of IDs of inventory lines we want to split
         """
+        if context is None:
+            context = {}
+        assert context.get('active_model') == 'stock.inventory.line',\
+             'Incorrect use of the inventory line split wizard'
         prodlot_obj = self.pool.get('stock.production.lot')
         ir_sequence_obj = self.pool.get('ir.sequence')
         line_obj = self.pool.get('stock.inventory.line')
@@ -108,7 +100,14 @@ class stock_inventory_line_split(osv.osv_memory):
                         line_obj.write(cr, uid, [inv_line.id], update_val)
 
         return new_line
-stock_inventory_line_split()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class stock_inventory_split_lines(osv.osv_memory):
+    _inherit = "stock.move.split.lines"
+    _name = "stock.inventory.line.split.lines"
+    _description = "Inventory Split lines"
+    _columns = {
+        'wizard_id': fields.many2one('stock.inventory.line.split', 'Parent Wizard'),
+        'wizard_exist_id': fields.many2one('stock.inventory.line.split', 'Parent Wizard'),
+    }
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 42add8019c4..f4618249e37 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -25,6 +25,12 @@ from tools.translate import _
 
 class stock_invoice_onshipping(osv.osv_memory):
 
+    def _get_journal(self, cr, uid, context=None):
+        res = self._get_journal_id(cr, uid, context=context)
+        if res:
+            return res[0][0]
+        return False
+    
     def _get_journal_id(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -38,7 +44,7 @@ class stock_invoice_onshipping(osv.osv_memory):
         res_ids = context and context.get('active_ids', [])
         vals = []
         browse_picking = model_pool.browse(cr, uid, res_ids, context=context)
-        
+
         for pick in browse_picking:
             src_usage = pick.move_lines[0].location_id.usage
             dest_usage = pick.move_lines[0].location_dest_id.usage
@@ -53,7 +59,7 @@ class stock_invoice_onshipping(osv.osv_memory):
                 journal_type = 'sale_refund'
             else:
                 journal_type = 'sale'
-                
+
             value = journal_obj.search(cr, uid, [('type', '=',journal_type )])
             for jr_type in journal_obj.browse(cr, uid, value, context=context):
                 t1 = jr_type.id,jr_type.name
@@ -61,7 +67,6 @@ class stock_invoice_onshipping(osv.osv_memory):
                     vals.append(t1)
         return vals
 
-
     _name = "stock.invoice.onshipping"
     _description = "Stock Invoice Onshipping"
 
@@ -70,7 +75,11 @@ class stock_invoice_onshipping(osv.osv_memory):
         'group': fields.boolean("Group by partner"),
         'invoice_date': fields.date('Invoiced date'),
     }
-
+    
+    _defaults = {
+        'journal_id' : _get_journal,
+    }
+    
     def view_init(self, cr, uid, fields_list, context=None):
         if context is None:
             context = {}
@@ -126,10 +135,12 @@ class stock_invoice_onshipping(osv.osv_memory):
         active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
         inv_type = picking_pool._get_invoice_type(active_picking)
         context['inv_type'] = inv_type
+        if isinstance(onshipdata_obj[0]['journal_id'], tuple):
+            onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
         res = picking_pool.action_invoice_create(cr, uid, active_ids,
               journal_id = onshipdata_obj[0]['journal_id'],
               group = onshipdata_obj[0]['group'],
-              type = None,
+              type = inv_type,
               context=context)
         return res
 
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index ba1f74ee0a1..49dc048d0ab 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -34,22 +34,24 @@ class stock_location_product(osv.osv_memory):
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param ids: An ID or list of IDs if we want more than one 
+         @param ids: An ID or list of IDs (but only the first ID will be processed)
          @param context: A standard dictionary 
          @return: Invoice type
         """
-        mod_obj = self.pool.get('ir.model.data')
-        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date'], context=context):
+        if context is None:
+            context = {}
+        location_products = self.read(cr, uid, ids, ['from_date', 'to_date'], context=context)
+        if location_products:
             return {
-                'name': False, 
-                'view_type': 'form', 
-                'view_mode': 'tree,form', 
-                'res_model': 'product.product', 
-                'type': 'ir.actions.act_window', 
-                'context': {'location': context['active_id'], 
-                       'from_date': location_obj['from_date'], 
-                       'to_date': location_obj['to_date']}, 
-                'domain': [('type', '<>', 'service')], 
+                'name': False,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'product.product',
+                'type': 'ir.actions.act_window',
+                'context': {'location': context['active_id'],
+                       'from_date': location_products[0]['from_date'],
+                       'to_date': location_products[0]['to_date']},
+                'domain': [('type', '<>', 'service')],
             }
 
 stock_location_product()
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index b075af80c7d..f8ef095fb01 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -20,45 +20,16 @@
 ##############################################################################
 
 from osv import fields, osv
-
+from tools.translate import _
 import decimal_precision as dp
 
-class stock_move_track(osv.osv_memory):
-    _name = "stock.move.track"
-    _description = "Track moves"
-
-    _columns = {
-        'tracking_prefix': fields.char('Tracking prefix', size=64),
-        'quantity': fields.float("Quantity per lot")
-    }
-
-    _defaults = {
-        'quantity': lambda *x: 1
-    }
-
-    def track_lines(self, cr, uid, ids, context=None):
-        """ To track stock moves lines
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: An ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return:
-        """
-        datas = self.read(cr, uid, ids)[0]
-        move_obj = self.pool.get('stock.move')
-        move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-stock_move_track()
-
 class stock_move_consume(osv.osv_memory):
     _name = "stock.move.consume"
     _description = "Consume Products"
 
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
-        'product_qty': fields.float('Quantity', required=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True)
     }
@@ -175,17 +146,8 @@ class split_in_production_lot(osv.osv_memory):
     _description = "Split in Production lots"
 
     def default_get(self, cr, uid, fields, context=None):
-        """ Get default values
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for default value
-        @param context: A standard dictionary
-        @return: Default values of fields
-        """
         if context is None:
             context = {}
-
         res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
         if context.get('active_id'):
             move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
@@ -197,43 +159,36 @@ class split_in_production_lot(osv.osv_memory):
                 res.update({'qty': move.product_qty})
             if 'use_exist' in fields:
                 res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
+            if 'location_id' in fields:
+                res.update({'location_id': move.location_id.id})
         return res
 
     _columns = {
         'qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'product_uom': fields.many2one('product.uom', 'UoM'),
-        'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Production Lots'),
-        'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Production Lots'),
+        'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Production Lots'),
+        'line_exist_ids': fields.one2many('stock.move.split.lines', 'wizard_exist_id', 'Production Lots'),
         '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."),
+        'location_id': fields.many2one('stock.location', 'Source Location')
      }
 
     def split_lot(self, cr, uid, ids, context=None):
-        """ To split a lot
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: An ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return:
-        """
+        """ To split a lot"""
         if context is None:
             context = {}
-        self.split(cr, uid, ids, context.get('active_ids'), context=context)
+        res = self.split(cr, uid, ids, context.get('active_ids'), context=context)
         return {'type': 'ir.actions.act_window_close'}
 
     def split(self, cr, uid, ids, move_ids, context=None):
         """ To split stock moves into production lot
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one
-        @param move_ids: the ID or list of IDs of stock move we want to split
-        @param context: A standard dictionary
-        @return:
+
+        :param move_ids: the ID or list of IDs of stock move we want to split
         """
         if context is None:
             context = {}
+        assert context.get('active_model') == 'stock.move',\
+             'Incorrect use of the stock move split wizard'
         inventory_id = context.get('inventory_id', False)
         prodlot_obj = self.pool.get('stock.production.lot')
         inventory_obj = self.pool.get('stock.inventory')
@@ -258,7 +213,8 @@ class split_in_production_lot(osv.osv_memory):
                     uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
                     if quantity_rest < 0:
                         quantity_rest = quantity
-                        break
+                        self.pool.get('stock.move').log(cr, uid, move.id, _('Unable to assign all lots to this move!'))
+                        return False
                     default_val = {
                         'product_qty': quantity,
                         'product_uos_qty': uos_qty,
@@ -295,32 +251,22 @@ class split_in_production_lot(osv.osv_memory):
 split_in_production_lot()
 
 class stock_move_split_lines_exist(osv.osv_memory):
-    _name = "stock.move.split.lines.exist"
-    _description = "Exist Split lines"
+    _name = "stock.move.split.lines"
+    _description = "Stock move Split lines"
     _columns = {
         'name': fields.char('Tracking serial', size=64),
         'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
-        'lot_id': fields.many2one('stock.move.split', 'Lot'),
+        'wizard_id': fields.many2one('stock.move.split', 'Parent Wizard'),
+        'wizard_exist_id': fields.many2one('stock.move.split', 'Parent Wizard (for existing lines)'),
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot'),
     }
     _defaults = {
         'quantity': 1.0,
     }
 
-stock_move_split_lines_exist()
+    def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False,
+                        loc_id=False, product_id=False, uom_id=False):
+        return self.pool.get('stock.move').onchange_lot_id(cr, uid, [], prodlot_id, product_qty,
+                        loc_id, product_id, uom_id)
 
-class stock_move_split_lines(osv.osv_memory):
-    _name = "stock.move.split.lines"
-    _description = "Split lines"
-    _columns = {
-        'name': fields.char('Tracking serial', size=64),
-        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
-        'use_exist' : fields.boolean('Existing Lot'),
-        'lot_id': fields.many2one('stock.move.split', 'Lot'),
-        'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
-    }
-    _defaults = {
-        'quantity': 1.00,
-        'action' : 'split',
-    }
-stock_move_split_lines()
+# 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 baaa581b4f3..3895f93ddc7 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -1,35 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <record id="view_stock_move_track_wizard" model="ir.ui.view">
-                <field name="name">Tracking a move</field>
-                <field name="model">stock.move.track</field>
-                <field name="type">form</field>
-                <field name="arch" type="xml">
-                    <form string="Tracking a move">
-                        <field name="tracking_prefix" colspan="4"/>
-                        <field name="quantity" colspan="4"/>
-                        <newline/>
-                        <separator string="" colspan="4" />
-                        <button icon='gtk-cancel' special="cancel"
-                            string="_Cancel" />
-                        <button name="track_lines" string="Ok"
-                            type="object" icon="gtk-ok" />
-                    </form>
-                </field>
-            </record>
-
-            <record id="track_line_old" model="ir.actions.act_window">
-                <field name="name">Tracking a move</field>
-                <field name="type">ir.actions.act_window</field>
-                <field name="res_model">stock.move.track</field>
-                <field name="view_type">form</field>
-                <field name="view_mode">form</field>
-                <field name="target">new</field>
-            </record>
-
-
         <!--  Consume, scrap move -->
 
         <record id="view_stock_move_consume_wizard" model="ir.ui.view">
@@ -118,6 +89,7 @@
                           <field name="product_uom" readonly="1"/>
                       </group>
                   </group>
+                  <field name="location_id" invisible="1"/>
 
                   <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
                         <field name="line_ids" colspan="4" nolabel="1">
@@ -134,12 +106,12 @@
                   <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
                         <field name="line_exist_ids" colspan="4" nolabel="1">
                             <tree string="Production Lot Numbers" editable="bottom">
-                                <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]"/>
-                                <field name="quantity" />
+                                <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)" />
                             </tree>
                             <form string="Production Lot Number">
-                                <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]"/>
-                                <field name="quantity" />
+                                <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)" />
                             </form>
                         </field>
                     </group>
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 874b22844d1..ec348656ce0 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-TODAY 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
@@ -20,207 +20,65 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
+from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 import time
 
-
-class stock_partial_move_memory_out(osv.osv_memory):
-    _name = "stock.move.memory.out"
-    _rec_name = 'product_id'
+class stock_partial_move_line(osv.osv_memory):
+    _inherit = "stock.partial.picking.line"
+    _name = "stock.partial.move.line"
     _columns = {
-        'product_id' : fields.many2one('product.product', string="Product", required=True),
-        'quantity' : fields.float("Quantity", required=True),
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
-        'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot'),
-        'move_id' : fields.many2one('stock.move', "Move"),
-        'wizard_id' : fields.many2one('stock.partial.move', string="Wizard"),
-        'cost' : fields.float("Cost", help="Unit Cost for this product line"),
-        'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed"),
+        'wizard_id' : fields.many2one('stock.partial.move', string="Wizard", ondelete='CASCADE'),
     }
-    
-class stock_partial_move_memory_in(osv.osv_memory):
-    _inherit = "stock.move.memory.out"
-    _name = "stock.move.memory.in"
-    
+
 class stock_partial_move(osv.osv_memory):
     _name = "stock.partial.move"
-    _description = "Partial Move"
+    _inherit = 'stock.partial.picking'
+    _description = "Partial Move Processing Wizard"
     _columns = {
         'date': fields.datetime('Date', required=True),
-        'type': fields.char("Type", size=3),
-        'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
-        'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
-     }
-    
-    
-    def __is_in(self,cr, uid, move_ids):
-        """
-            @return: True if one of the moves has as picking type 'in'
-        """
-        if not move_ids:
-            return False
-       
-        move_obj = self.pool.get('stock.move')
-        move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
-       
-        for move in move_obj.browse(cr, uid, move_ids):
-            if move.picking_id.type == 'in' and move.product_id.cost_method == 'average':
-                return True
-        return False
-    
-    def __get_picking_type(self, cr, uid, move_ids):
-        if self.__is_in(cr, uid, move_ids):
-            return "product_moves_in"
-        else:
-            return "product_moves_out"
-    
-    def view_init(self, cr, uid, fields_list, context=None):
-        res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
-        move_obj = self.pool.get('stock.move')
-    
-        if context is None:
-            context = {}
-        for move in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            if move.state in ('done', 'cancel'):
-                raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
-            
-        return res
-    
-    
-    def __create_partial_move_memory(self, move):
-        move_memory = {
-            'product_id' : move.product_id.id,
-            'quantity' : move.product_qty,
-            'product_uom' : move.product_uom.id,
-            'prodlot_id' : move.prodlot_id.id,
-            'move_id' : move.id,
-        }
-    
-        if move.picking_id.type == 'in':
-            move_memory.update({
-                'cost' : move.product_id.standard_price,
-                'currency' : move.product_id.company_id and move.product_id.company_id.currency_id and move.product_id.company_id.currency_id.id or False,
-            })
-        return move_memory
+        'move_ids' : fields.one2many('stock.partial.move.line', 'wizard_id', 'Moves'),
 
-    def __get_active_stock_moves(self, cr, uid, context=None):
-        move_obj = self.pool.get('stock.move')
-        if context is None:
-            context = {}
-               
-        res = []
-        for move in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            if move.state in ('done', 'cancel'):
-                continue           
-            res.append(self.__create_partial_move_memory(move))
-            
+        # picking_id is not used for move processing, so we remove the required attribute
+        # from the inherited column, and ignore it
+        'picking_id': fields.many2one('stock.picking', 'Picking'),
+     }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None: context = {}
+        # no call to super!
+        res = {}
+        move_ids = context.get('active_ids', [])
+        if not move_ids or not context.get('active_model') == 'stock.move':
+            return res
+        if 'move_ids' in fields:
+            move_ids = self.pool.get('stock.move').browse(cr, uid, move_ids, context=context)
+            moves = [self._partial_move_for(cr, uid, m) for m in move_ids if m.state not in ('done','cancel')]
+            res.update(move_ids=moves)
+        if 'date' in fields:
+            res.update(date=time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))
         return res
-    
-    _defaults = {
-        'product_moves_in' : __get_active_stock_moves,
-        'product_moves_out' : __get_active_stock_moves,
-        'date' : lambda *a : time.strftime('%Y-%m-%d %H:%M:%S'),
-    }
-    
-    
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        if not context:
-            context = {}
-        
-        message = {
-                'title' : _('Deliver Products'),
-                'info' : _('Delivery Information'),
-                'button' : _('Deliver'),
-                }
-        if context:            
-            if context.get('product_receive', False):
-                message = {
-                    'title' : _('Receive Products'),
-                    'info' : _('Receive Information'),
-                    'button' : _('Receive'),
-                }   
-         
-        move_ids = context.get('active_ids', False)    
-        message['picking_type'] = self.__get_picking_type(cr, uid, move_ids)
-        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-        _moves_fields = result['fields']
-        _moves_fields.update({
-                            'product_moves_in' : {'relation': 'stock.move.memory.in', 'type' : 'one2many', 'string' : 'Product Moves'},
-                            'product_moves_out' : {'relation': 'stock.move.memory.out', 'type' : 'one2many', 'string' : 'Product Moves'}
-                            })
-        
-        _moves_arch_lst = """
-                <form string="%(title)s">
-                    <separator colspan="4" string="%(info)s"/>
-                    <field name="date" colspan="2"/>
-                    <separator colspan="4" string="Move Detail"/>
-                    <field name="%(picking_type)s" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" ></field>      
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                        <button name="do_partial" string="%(button)s"
-                            colspan="1" type="object" icon="gtk-apply" />
-                    </group>
-                </form> """ % message
-        
-        result['arch'] = _moves_arch_lst
-        result['fields'] = _moves_fields
-        return result
-   
+
     def do_partial(self, cr, uid, ids, context=None):
-        """ Makes partial moves and pickings done.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values
-        @param context: A standard dictionary
-        @return: A dictionary which of fields with values.
-        """
-    
-        if context is None:
-            context = {}
-        move_obj = self.pool.get('stock.move')
-        
-        move_ids = context.get('active_ids', False)
+        # no call to super!
+        assert len(ids) == 1, 'Partial move processing may only be done one form at a time'
         partial = self.browse(cr, uid, ids[0], context=context)
-        partial_datas = {
+        partial_data = {
             'delivery_date' : partial.date
         }
-        
-        p_moves = {}
-        picking_type = self.__get_picking_type(cr, uid, move_ids)
-        
-        moves_list = picking_type == 'product_moves_in' and partial.product_moves_in  or partial.product_moves_out
-        for product_move in moves_list:
-            p_moves[product_move.move_id.id] = product_move
-            
-        moves_ids_final = []
-        for move in move_obj.browse(cr, uid, move_ids, context=context):
-            if move.state in ('done', 'cancel'):
-                continue
-            if not p_moves.get(move.id):
-                continue
-            partial_datas['move%s' % (move.id)] = {
-                'product_id' : p_moves[move.id].id,
-                'product_qty' : p_moves[move.id].quantity,
-                'product_uom' :p_moves[move.id].product_uom.id,
-                'prodlot_id' : p_moves[move.id].prodlot_id.id,
+        moves_ids = []
+        for move in partial.move_ids:
+            move_id = move.move_id.id
+            partial_data['move%s' % (move_id)] = {
+                'product_id': move.product_id.id,
+                'product_qty': move.quantity,
+                'product_uom': move.product_uom.id,
+                'prodlot_id': move.prodlot_id.id,
             }
-            
-            moves_ids_final.append(move.id)
-            if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
-                partial_datas['move%s' % (move.id)].update({
-                    'product_price' : p_moves[move.id].cost,
-                    'product_currency': p_moves[move.id].currency.id,
-                })
-                
-            
-        move_obj.do_partial(cr, uid, moves_ids_final, partial_datas, context=context)
+            moves_ids.append(move_id)
+            if (move.move_id.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
+                partial_data['move%s' % (move_id)].update(product_price=move.cost,
+                                                          product_currency=move.currency.id)
+        self.pool.get('stock.move').do_partial(cr, uid, moves_ids, partial_data, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-stock_partial_move()
-stock_partial_move_memory_out()
-stock_partial_move_memory_in()
-# 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/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index ec33dff083b..b2b9ab69287 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -1,85 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-      
-        
         <record id="action_partial_move_server" model="ir.actions.server">
             <field name="name">Deliver/Receive Products</field>
             <field name="model_id" ref="model_stock_move"/>
             <field name="state">code</field>
             <field name="code">action = obj.action_partial_move(context=context)</field>
         </record>
-        
+
         <record id="ir_open_partial_move_wizard" model="ir.values">
             <field eval="'client_action_multi'" name="key2"/>
             <field eval="'stock.move'" name="model"/>
             <field name="name">Deliver/Receive Products</field>
             <field eval="'ir.actions.server,%d'%action_partial_move_server" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
-        
-            
-        <record id="stock_move_memory_tree_in" model="ir.ui.view">
-            <field name="name">stock.move.memory.tree</field>
-            <field name="model">stock.move.memory.in</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree editable="bottom" string="Product Moves">
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
-                    <field name="cost" />
-                    <field name="currency" />
-                </tree>
-            </field>
-        </record>
-        
-        <record id="stock_move_memory_form_in" model="ir.ui.view">
-            <field name="name">stock.move.memory.form</field>
-            <field name="model">stock.move.memory.in</field>
+        <record id="stock_partial_move_form" model="ir.ui.view">
+            <field name="name">stock.partial.move.form</field>
+            <field name="model">stock.partial.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
-                    <field name="cost" />
-                    <field name="currency" />
-                 </form>
-            </field>
-        </record>   
-        
-        <record id="stock_move_memory_tree_out" model="ir.ui.view">
-            <field name="name">stock.move.memory.tree</field>
-            <field name="model">stock.move.memory.out</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree editable="bottom" string="Product Moves">
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]"  groups="base.group_extended" />
-                </tree>
-            </field>
-        </record>
-        
-        <record id="stock_move_memory_form_out" model="ir.ui.view">
-            <field name="name">stock.move.memory.form</field>
-            <field name="model">stock.move.memory.out</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
+                    <separator colspan="4" string="Products"/>
+                    <field name="move_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+                    <group col="2" colspan="2">
+                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <button name="do_partial" string="_Validate" colspan="1" type="object" icon="gtk-go-forward" />
+                    </group>
                 </form>
             </field>
-        </record>  
-        
+        </record>
+
+        <record id="stock_partial_move_line_list" model="ir.ui.view">
+            <field name="name">stock.partial.move.line.list</field>
+            <field name="model">stock.partial.move.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Product Moves">
+                    <field name="product_id" />
+                    <field name="quantity" />
+                    <field name="product_uom" />
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
+                    <field name="update_cost" invisible="1"/>
+                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="stock_partial_move_line_form" model="ir.ui.view">
+            <field name="name">stock.partial.move.line.form</field>
+            <field name="model">stock.partial.move.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <field name="product_id" />
+                    <field name="quantity" />
+                    <field name="product_uom" />
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
+                    <field name="update_cost" invisible="1"/>
+                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                 </form>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 421bcae10ba..f6ecb6511eb 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -1,9 +1,8 @@
-
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-TODAY 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
@@ -20,154 +19,119 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-from tools.translate import _
 import time
+from osv import fields, osv
+from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+
+class stock_partial_picking_line(osv.TransientModel):
+    _name = "stock.partial.picking.line"
+    _rec_name = 'product_id'
+    _columns = {
+        'product_id' : fields.many2one('product.product', string="Product", required=True, ondelete='CASCADE'),
+        'quantity' : fields.float("Quantity", required=True),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, ondelete='CASCADE'),
+        'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot', ondelete='CASCADE'),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete='CASCADE'),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, ondelete='CASCADE'),
+        'move_id' : fields.many2one('stock.move', "Move", ondelete='CASCADE'),
+        'wizard_id' : fields.many2one('stock.partial.picking', string="Wizard", ondelete='CASCADE'),
+        'update_cost': fields.boolean('Need cost update'),
+        'cost' : fields.float("Cost", help="Unit Cost for this product line"),
+        'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed", ondelete='CASCADE'),
+    }
 
 class stock_partial_picking(osv.osv_memory):
     _name = "stock.partial.picking"
-    _description = "Partial Picking"
+    _description = "Partial Picking Processing Wizard"
     _columns = {
         'date': fields.datetime('Date', required=True),
-        'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
-        'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
+        'move_ids' : fields.one2many('stock.partial.picking.line', 'wizard_id', 'Product Moves'),
+        'picking_id': fields.many2one('stock.picking', 'Picking', required=True, ondelete='CASCADE'),
      }
-    
-    def get_picking_type(self, cr, uid, picking, context=None):
-        picking_type = picking.type
-        for move in picking.move_lines:
-            if picking.type == 'in' and move.product_id.cost_method == 'average':
-                picking_type = 'in'
-                break
-            else:
-                picking_type = 'out'
-        return picking_type
-    
+
     def default_get(self, cr, uid, fields, context=None):
-        """ To get default values for the object.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param fields: List of fields for which we want default values
-         @param context: A standard dictionary
-         @return: A dictionary which of fields with values.
-        """
-        if context is None:
-            context = {}
-            
-        pick_obj = self.pool.get('stock.picking')
+        if context is None: context = {}
         res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
         picking_ids = context.get('active_ids', [])
-        if not picking_ids:
+        if not picking_ids or (not context.get('active_model') == 'stock.picking') \
+            or len(picking_ids) != 1:
+            # Partial Picking Processing may only be done for one picking at a time
             return res
-
-        result = []
-        for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
-            pick_type = self.get_picking_type(cr, uid, pick, context=context)
-            for m in pick.move_lines:
-                if m.state in ('done', 'cancel'):
-                    continue
-                result.append(self.__create_partial_picking_memory(m, pick_type))
-                
-        if 'product_moves_in' in fields:
-            res.update({'product_moves_in': result})
-        if 'product_moves_out' in fields:
-            res.update({'product_moves_out': result})
+        picking_id, = picking_ids
+        if 'picking_id' in fields:
+            res.update(picking_id=picking_id)
+        if 'move_ids' in fields:
+            picking = self.pool.get('stock.picking').browse(cr, uid, picking_id, context=context)
+            moves = [self._partial_move_for(cr, uid, m) for m in picking.move_lines if m.state not in ('done','cancel')]
+            res.update(move_ids=moves)
         if 'date' in fields:
-            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+            res.update(date=time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))
         return res
-    
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-       
-        pick_obj = self.pool.get('stock.picking')
-        picking_ids = context.get('active_ids', False)
 
-        if not picking_ids:
-            # not called through an action (e.g. buildbot), return the default.
-            return result
-
-        for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
-            picking_type = self.get_picking_type(cr, uid, pick, context=context)
+    def _product_cost_for_average_update(self, cr, uid, move):
+        """Returns product cost and currency ID for the given move, suited for re-computing
+           the average product cost.
         
-        _moves_arch_lst = """<form string="%s">
-                        <field name="date" invisible="1"/>
-                        <separator colspan="4" string="%s"/>
-                        <field name="%s" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" ></field>
-                        """ % (_('Process Document'), _('Products'), "product_moves_" + picking_type)
-        _moves_fields = result['fields']
+           :return: map of the form::
 
-        # add field related to picking type only
-        _moves_fields.update({
-                            'product_moves_' + picking_type: {'relation': 'stock.move.memory.'+picking_type, 'type' : 'one2many', 'string' : 'Product Moves'}, 
-                            })
+                {'cost': 123.34,
+                 'currency': 42}
+        """
+        # Currently, the cost on the product form is supposed to be expressed in the currency
+        # of the company owning the product. If not set, we fall back to the picking's company,
+        # which should work in simple cases.
+        return {'cost': move.product_id.standard_price,
+                'currency': move.product_id.company_id.currency_id.id \
+                                or move.picking_id.company_id.currency_id.id \
+                                or False}
 
-        _moves_arch_lst += """
-                <separator string="" colspan="4" />
-                <label string="" colspan="2"/>
-                <group col="2" colspan="2">
-                <button icon='gtk-cancel' special="cancel"
-                    string="_Cancel" />
-                <button name="do_partial" string="_Validate"
-                    colspan="1" type="object" icon="gtk-go-forward" />
-            </group>
-        </form>"""
-        result['arch'] = _moves_arch_lst
-        result['fields'] = _moves_fields
-        return result
-
-    def __create_partial_picking_memory(self, picking, pick_type):
-        move_memory = {
-            'product_id' : picking.product_id.id, 
-            'quantity' : picking.product_qty, 
-            'product_uom' : picking.product_uom.id, 
-            'prodlot_id' : picking.prodlot_id.id, 
-            'move_id' : picking.id, 
+    def _partial_move_for(self, cr, uid, move):
+        partial_move = {
+            'product_id' : move.product_id.id,
+            'quantity' : move.state in ('assigned','new') and move.product_qty or 0,
+            'product_uom' : move.product_uom.id,
+            'prodlot_id' : move.prodlot_id.id,
+            'move_id' : move.id,
+            'location_id' : move.location_id.id,
+            'location_dest_id' : move.location_dest_id.id,
         }
-    
-        if pick_type == 'in':
-            move_memory.update({
-                'cost' : picking.product_id.standard_price, 
-                'currency' : picking.product_id.company_id and picking.product_id.company_id.currency_id and picking.product_id.company_id.currency_id.id or False, 
-            })
-        return move_memory
+        if move.picking_id.type == 'in' and move.product_id.cost_method == 'average':
+            partial_move.update(update_cost=True, **self._product_cost_for_average_update(cr, uid, move))
+        return partial_move
 
     def do_partial(self, cr, uid, ids, context=None):
-        """ Makes partial moves and pickings done.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values
-        @param context: A standard dictionary
-        @return: A dictionary which of fields with values.
-        """
-        pick_obj = self.pool.get('stock.picking')
-        
-        picking_ids = context.get('active_ids', False)
+        assert len(ids) == 1, 'Partial picking processing may only be done one at a time'
+        stock_picking = self.pool.get('stock.picking')
+        stock_move = self.pool.get('stock.move')
         partial = self.browse(cr, uid, ids[0], context=context)
-        partial_datas = {
+        partial_data = {
             'delivery_date' : partial.date
         }
-
-        for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
-            picking_type = self.get_picking_type(cr, uid, pick, context=context)
-            moves_list = picking_type == 'in' and partial.product_moves_in or partial.product_moves_out
-
-            for move in moves_list:
-                partial_datas['move%s' % (move.move_id.id)] = {
-                    'product_id': move.id, 
-                    'product_qty': move.quantity, 
-                    'product_uom': move.product_uom.id, 
-                    'prodlot_id': move.prodlot_id.id, 
-                }
-                if (picking_type == 'in') and (move.product_id.cost_method == 'average'):
-                    partial_datas['move%s' % (move.move_id.id)].update({
-                                                    'product_price' : move.cost, 
-                                                    'product_currency': move.currency.id, 
-                                                    })
-        pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+        picking_type = partial.picking_id.type
+        for move in partial.move_ids:
+            move_id = move.move_id.id
+            if not move_id:
+                seq_obj_name =  'stock.picking.' + picking_type
+                move_id = stock_move.create(cr,uid,{'name' : self.pool.get('ir.sequence').get(cr, uid, seq_obj_name),
+                                                    'product_id': move.product_id.id,
+                                                    'product_qty': move.quantity,
+                                                    'product_uom': move.product_uom.id,
+                                                    'prodlot_id': move.prodlot_id.id,
+                                                    'location_id' : move.location_id.id,
+                                                    'location_dest_id' : move.location_dest_id.id,
+                                                    'picking_id': partial.picking_id.id
+                                                    },context=context)
+                stock_move.action_confirm(cr, uid, [move_id], context)
+            partial_data['move%s' % (move_id)] = {
+                'product_id': move.product_id.id,
+                'product_qty': move.quantity,
+                'product_uom': move.product_uom.id,
+                'prodlot_id': move.prodlot_id.id,
+            }
+            if (picking_type == 'in') and (move.product_id.cost_method == 'average'):
+                partial_data['move%s' % (move.move_id.id)].update(product_price=move.cost,
+                                                                  product_currency=move.currency.id)
+        stock_picking.do_partial(cr, uid, [partial.picking_id.id], partial_data, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-stock_partial_picking()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 4887c1e16d8..be85d266673 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -9,5 +9,59 @@
             <field name="target">new</field>
         </record>
 
+        <record id="stock_partial_picking_form" model="ir.ui.view">
+            <field name="name">stock.partial.picking.form</field>
+            <field name="model">stock.partial.picking</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <separator colspan="4" string="Products"/>
+                    <field name="move_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+                    <group col="2" colspan="2">
+                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <button name="do_partial" string="_Validate" colspan="1" type="object" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="stock_partial_picking_line_list" model="ir.ui.view">
+            <field name="name">stock.partial.picking.line.list</field>
+            <field name="model">stock.partial.picking.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Product Moves">
+                    <field name="product_id" />
+                    <field name="quantity" />
+                    <field name="product_uom" />
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
+                    <field name="update_cost" invisible="1"/>
+                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                </tree>
+            </field>
+        </record>
+        <record id="stock_partial_picking_line_form" model="ir.ui.view">
+            <field name="name">stock.partial.picking.line.form</field>
+            <field name="model">stock.partial.picking.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <field name="product_id" />
+                    <field name="quantity" />
+                    <field name="product_uom" />
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
+                    <field name="update_cost" invisible="1"/>
+                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                 </form>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_replacement.py b/addons/stock/wizard/stock_replacement.py
deleted file mode 100644
index 17f4d5a62ab..00000000000
--- a/addons/stock/wizard/stock_replacement.py
+++ /dev/null
@@ -1,61 +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 time
-
-class stock_replacement(osv.osv_memory):
-    """
-        This class has been defined for replacement wizard
-    """
-    _name = "stock.replacement"
-    _description = "Stock Replacement"
-
-    def get_composant(self, cr, uid, ids, context=None):
-        return {}
-
-    def replace_composant(self, cr, uid, ids, context=None):
-        """ To open a new wizard that acknowledge, a replacement task
-        @return: It returns the replacement acknowledgement form
-        """
-        return {
-            'name': False,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'stock.replacement.result',
-            'type': 'ir.actions.act_window',
-            'target':'new',
-        }
-
-stock_replacement()
-
-class stock_replacement_result(osv.osv_memory):
-    """
-        This class has been defined for replacement result
-    """
-    _name = "stock.replacement.result"
-    _description = "Stock Replacement result"
-
-stock_replacement_result()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_replacement_view.xml b/addons/stock/wizard/stock_replacement_view.xml
deleted file mode 100644
index cea5bfedbe8..00000000000
--- a/addons/stock/wizard/stock_replacement_view.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-	<record id="view_stock_replacement" model="ir.ui.view">
-                <field name="name">Stock Replacement</field>
-                <field name="model">stock.replacement</field>
-                <field name="type">form</field>
-                <field name="arch" type="xml">
-	                <form string="Replace a component">
-	                	<label string="Component" colspan="4"/>
-						<separator string="" colspan="4" />
-	                	<button icon='gtk-cancel' special="cancel" string="_Cancel" />
-	                	<button name="replace_composant" string="Replace" type="object" />
-	                </form>
-	            </field>
-	        </record>	        
-     	
-			<act_window name="Stock Replacement"		    
-				res_model="stock.replacement"
-				src_model=""
-				view_mode="form"
-				target="new"        
-				key2="client_action_multi"    
-				id="action_view_stock_replacement"/>
-
-
-            <record id="view_stock_replacement_result" model="ir.ui.view">
-                <field name="name">Stock Replacement result</field>
-                <field name="model">stock.replacement.result</field>
-                <field name="type">form</field>
-                <field name="arch" type="xml">
-	                <form string="Replace result">
-	                	<label string="Replacing successful !" colspan="4"/>
-						<separator string="" colspan="4" />
-	                	<button special="cancel" string="Ok" />
-	                </form>
-	            </field>
-		</record>
-
-  	</data>
-</openerp>
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 1f48c8cfc19..78396656389 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -82,3 +82,5 @@ class stock_split_into(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 stock_split_into()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 2fab72bba3a..779843e8ccd 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -52,6 +52,7 @@ class action_traceability(osv.osv_memory):
             '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,
             'view_id': (view_id,'View'),
diff --git a/addons/stock/wizard/stock_ups.py b/addons/stock/wizard/stock_ups.py
deleted file mode 100644
index fb47587f254..00000000000
--- a/addons/stock/wizard/stock_ups.py
+++ /dev/null
@@ -1,95 +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 netsvc
-from osv import fields, osv
-from tools.translate import _
-
-class stock_ups(osv.osv_memory):
-    _name = "stock.ups"
-    _description = "Stock ups"
-
-    def ups_save(self, cr, uid, ids, context=None):
-        return {
-            'name': False,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'stock.ups.final',
-            'type': 'ir.actions.act_window',
-            'target':'new',
-        }
-
-    def ups_upload(self, cr, uid, ids, context=None):
-        return {
-            'name': False,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'stock.ups.upload',
-            'type': 'ir.actions.act_window',
-            'target':'new',
-        }
-
-    _columns = {
-        'weight': fields.float('Lot weight', required=True),
-    }
-
-    _defaults = {
-        'weight': lambda *a: 3.0,
-    }
-stock_ups()
-
-class stock_ups_final(osv.osv_memory):
-    _name = "stock.ups.final"
-    _description = "Stock ups final"
-
-    def create_xmlfile(self, cr, uid, ids, context=None):
-        """ Creates xml report file.
-        @return: xml file
-        """
-        data={}
-        report = netsvc._group['report']['report.stock.move.lot.ups_xml']
-        data['report_type'] = 'raw'
-        return {'xmlfile' : report.create(uid, context['active_id'], ids, {})}
-
-    _columns = {
-        'xmlfile': fields.binary('XML File'), 
-    }
-
-stock_ups_final()
-
-class stock_ups_upload(osv.osv_memory):
-    _name = "stock.ups.upload"
-    _description = "Stock ups upload"
-
-    def upload_xmlfile(self, cr, uid, ids, context=None):
-        """ Uploads xml report file.
-        @return: 
-        """
-        data={}
-        report = netsvc._group['report']['report.stock.move.lot.ups_xml']
-        data['report_type'] = 'raw'
-        fp = file('/tmp/test.xml', 'w').write(report.create(uid, context['active_id'], ids, {}))
-        return {'type': 'ir.actions.act_window_close'}
-
-stock_ups_upload()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_ups_view.xml b/addons/stock/wizard/stock_ups_view.xml
deleted file mode 100644
index cbce721e1b9..00000000000
--- a/addons/stock/wizard/stock_ups_view.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-
-		<record id="view_stock_ups" model="ir.ui.view">
-			<field name="name">Stock ups</field>
-			<field name="model">stock.ups</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="UPS XML generator">
-					<separator string="UPS generator" colspan="4"/>
-					<field name="weight" />
-					<separator string="" colspan="4" />
-					<button icon='gtk-cancel' special="cancel" string="_Cancel" />
-					<button name="ups_save" string="Get xml file" type="object" />
-					<button name="ups_upload" string="Upload xml file" type="object" />
-				</form>
-			</field>
-		</record>
-
-		<record id="view_stock_ups_final" model="ir.ui.view">
-			<field name="name">Stock ups</field>
-			<field name="model">stock.ups.final</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="UPS XML generator">
-        			<separator string="Save the attached file" colspan="4" />
-					<field name="xmlfile" />
-					<button  special="cancel" string="End" />
-					<button name="create_xmlfile" string="create xml file" type="object" />
-				</form>
-			</field>
-		</record>
-	        
-		<record id="view_stock_ups_upload" model="ir.ui.view">
-			<field name="name">Stock ups</field>
-			<field name="model">stock.ups.upload</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="UPS XML generator">
-					<separator string="File uploaded" colspan="4" />
-					<button  special="cancel" string="End" />
-					<button name="upload_xmlfile" string="Upload xml file" type="object" />
-				</form>
-			</field>
-		</record>		        
-     	
-		<act_window name="Stock ups"		    
-			res_model="stock.ups"
-			src_model=""
-			view_mode="form"
-			target="new"        
-			key2="client_action_multi"    
-			id="action_view_stock_ups"/>
-</data>
-</openerp>
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index 98c63dca506..69acadeb8bd 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',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Invoice Wizard for Delivery.
diff --git a/addons/stock_invoice_directly/i18n/ar.po b/addons/stock_invoice_directly/i18n/ar.po
index c24c4c6a942..478256c34aa 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 95854acd24a..9a277960b79 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 507d4f68654..d5475e92128 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4ee4cf2ca68..91e73da1fb8 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1c5568b3d05..1f3a451cc2d 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 352805a3837..a0879d0ff69 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-11-17 10:52+0000\n"
-"Last-Translator: SmartWi <kurt@smartwi.net>\n"
+"PO-Revision-Date: 2011-11-08 11:51+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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Delvis plukning"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,description:stock_invoice_directly.module_meta_information
@@ -34,4 +34,4 @@ msgstr ""
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr "Dirkte faktura træk"
+msgstr "Direkte faktura plukning"
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index f808e1d4687..fde0cc66eff 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -41,15 +41,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Rechnung direkt von Lieferung"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen \r\n"
-#~ "beinhalten"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/stock_invoice_directly/i18n/el.po b/addons/stock_invoice_directly/i18n/el.po
index f186e5885fc..7a4408d619d 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b74d56dbbc8..02e492116d3 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -40,15 +40,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Facturar albarán directamente"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/stock_invoice_directly/i18n/es_AR.po b/addons/stock_invoice_directly/i18n/es_AR.po
index 4e34319b0b1..7a381673dc6 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..d02a9eda8f2
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/es_CL.po
@@ -0,0 +1,43 @@
+# 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: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-10-18 19:16+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: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Gúia de despacho parcial"
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
+msgid ""
+"\n"
+"        When you send or deliver goods, this module automatically launch\n"
+"        the invoicing wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+"\n"
+"        Cuando envía o entrega mercancías, este módulo automáticamente "
+"lanza\n"
+"        el asistente de facturación si la guía de despacho debe ser "
+"facturada.\n"
+"    "
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
+msgid "Invoice Picking Directly"
+msgstr "Facturar guía de despacho directamente"
diff --git a/addons/stock_invoice_directly/i18n/es_MX.po b/addons/stock_invoice_directly/i18n/es_MX.po
new file mode 100644
index 00000000000..57307140647
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/es_MX.po
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_invoice_directly
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2010-12-28 07:53+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:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Albarán parcial"
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
+msgid ""
+"\n"
+"        When you send or deliver goods, this module automatically launch\n"
+"        the invoicing wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+"\n"
+"        Cuando envía o entrega mercancías, este módulo automáticamente "
+"lanza\n"
+"        el asistente de facturación si el albarán debe ser facturado.\n"
+"    "
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
+msgid "Invoice Picking Directly"
+msgstr "Facturar albarán directamente"
diff --git a/addons/stock_invoice_directly/i18n/es_VE.po b/addons/stock_invoice_directly/i18n/es_VE.po
new file mode 100644
index 00000000000..57307140647
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/es_VE.po
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_invoice_directly
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2010-12-28 07:53+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:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Albarán parcial"
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
+msgid ""
+"\n"
+"        When you send or deliver goods, this module automatically launch\n"
+"        the invoicing wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+"\n"
+"        Cuando envía o entrega mercancías, este módulo automáticamente "
+"lanza\n"
+"        el asistente de facturación si el albarán debe ser facturado.\n"
+"    "
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
+msgid "Invoice Picking Directly"
+msgstr "Facturar albarán directamente"
diff --git a/addons/stock_invoice_directly/i18n/et.po b/addons/stock_invoice_directly/i18n/et.po
index d196a4b21ea..89ab44feef0 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 549252e5b12..a2692616c8e 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -38,4 +38,4 @@ msgstr ""
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Laskuta keräily suoraan"
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index eaafa42498e..dc977938dbc 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b2a51095a6b..76d8ba2f8ef 100644
--- a/addons/stock_invoice_directly/i18n/gl.po
+++ b/addons/stock_invoice_directly/i18n/gl.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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Selección Parcial"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,description:stock_invoice_directly.module_meta_information
@@ -31,6 +31,10 @@ msgid ""
 "        the invoicing wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"        Cando envíe ou entregue bens, este módulo inicia automaticamente\n"
+"        o asistente de facturación se a entrega vai ser facturada.\n"
+"    "
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
diff --git a/addons/stock_invoice_directly/i18n/hr.po b/addons/stock_invoice_directly/i18n/hr.po
index b29c464012c..11f69134802 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4272a433a34..c275b8a7013 100644
--- a/addons/stock_invoice_directly/i18n/hu.po
+++ b/addons/stock_invoice_directly/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-01-24 16:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 80d19fa398c..52dff6b2458 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a9a5f1feea4..8275cf12670 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -39,15 +39,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Fattura Picking Direttamente"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
diff --git a/addons/stock_invoice_directly/i18n/ko.po b/addons/stock_invoice_directly/i18n/ko.po
index 8b85cd53f4a..19a8a60c1c4 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f48a813a931..889eb0ca324 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 470a5f1420b..1060d6ec8e8 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 3b018a05000..59ec7cb9c6a 100644
--- a/addons/stock_invoice_directly/i18n/nl.po
+++ b/addons/stock_invoice_directly/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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ae409a66810..aa0df314a88 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..e831eb21aee
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/oc.po
@@ -0,0 +1,37 @@
+# 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: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-11-20 09:30+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Tractament parcial"
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
+msgid ""
+"\n"
+"        When you send or deliver goods, this module automatically launch\n"
+"        the invoicing wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+
+#. module: stock_invoice_directly
+#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
+msgid "Invoice Picking Directly"
+msgstr "Facturar la liurason dirèctament"
diff --git a/addons/stock_invoice_directly/i18n/pl.po b/addons/stock_invoice_directly/i18n/pl.po
index 2a1ce45a64b..7f165a84dbe 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 50cd4aeff14..425d3eaf205 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -34,15 +34,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Escolher Directamente a Factura"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index 4744e7781a0..b9fc9ac3373 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -39,15 +39,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Composição direta da Fatura"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
diff --git a/addons/stock_invoice_directly/i18n/ro.po b/addons/stock_invoice_directly/i18n/ro.po
index 646fc73bf64..da63811bd75 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d5a885c703f..3ed484c67d7 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -39,15 +39,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Напрямую выставляемый счет"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/stock_invoice_directly/i18n/sl.po b/addons/stock_invoice_directly/i18n/sl.po
index 91cb47da19a..fab6fb36a64 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
@@ -29,19 +29,13 @@ msgid ""
 "        the invoicing wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"        Ta modul bo, ob pošiljanju ali dobavi izdelkov, če je potrebno "
+"izdati račun \n"
+"        samodejno zagnal čarovnika za izdajo računa.\n"
+"    "
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Neposredna izbira računa"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
diff --git a/addons/stock_invoice_directly/i18n/sq.po b/addons/stock_invoice_directly/i18n/sq.po
index 6fee78ea1c3..0633d323a6b 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f526376fb12..efa0ff01c6f 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 70bcfb53e1a..01ad5a0c621 100644
--- a/addons/stock_invoice_directly/i18n/sr@latin.po
+++ b/addons/stock_invoice_directly/i18n/sr@latin.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-23 11:03+0000\n"
-"Last-Translator: Sonja Anđelković <sardelic.sonja@gmail.com>\n"
+"PO-Revision-Date: 2011-10-17 13:55+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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Delimično biranje"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,description:stock_invoice_directly.module_meta_information
@@ -30,6 +30,10 @@ msgid ""
 "        the invoicing wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"        Kad pošaljete ili dostavite robu, ovaj modul automatski pokreće\n"
+"        wizarda za fakture, ako dostava treba da bude fakturisana.\n"
+"    "
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
diff --git a/addons/stock_invoice_directly/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index 0f60f592a87..a33733d9bda 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 4332b688dbc..895ce1e0edc 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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 63cef339df0..253ce183378 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a9f5e6dd473..499865f38ee 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e86b3cbaf2b..5026d9f6ebd 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-05-03 13:24+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-05-04 04:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f48a813a931..889eb0ca324 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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index 6d70540b4d5..795da509d04 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -38,33 +38,19 @@
       "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
       })
 -
-  I create a record for partial picking.
--
-  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
-  I make picking order Done.
+  I process the delivery
 -
   !python {model: stock.partial.picking}: |
-     pick_obj = self.pool.get('stock.picking')
-     partial = self.browse(cr, uid, ref('stock_partial_picking_0'), context)
-     partial_datas = {
-            'delivery_date' : partial.date
-     }
-     for pick in pick_obj.browse(cr, uid, [ref('stock_picking_out0')]):
-        for m in pick.move_lines:
-           partial_datas['move%s'%(m.id)] = {
-                    'product_id' : m.product_id.id,
-                    'product_qty' : m.product_qty,
-                    'product_uom' : m.product_uom.id
-           }
-     pick_obj.do_partial(cr, uid, [ref('stock_picking_out0')], partial_datas, context=context)
+    partial_id = self.create(cr, uid, {}, context={'active_model':'stock.picking',
+                                                   'active_ids':[ref('stock_picking_out0')]})
+    self.do_partial(cr, uid, [partial_id])
+
 -
   As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order.
 -
   !python {model: stock.invoice.onshipping}: |
-    wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.bank_journal')},
-      {'active_ids': [ref("stock_picking_out0")]})
+    wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.sales_journal')},
+      {'active_ids': [ref("stock_picking_out0")], "active_model": "stock.picking"})
     self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US",
       "search_default_available": 1, "tz": False, "active_model": "stock.picking",
       "contact_display": "partner", "active_ids": [ref("stock_picking_out0")], "active_id": ref("stock_picking_out0")})
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 11b31725a88..3725d9b6d7f 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -25,24 +25,15 @@ class invoice_directly(osv.osv_memory):
     _inherit = 'stock.partial.picking'
 
     def do_partial(self, cr, uid, ids, context=None):
-        """ Makes partial moves and pickings done and 
-            launches Create invoice wizard if invoice state is To be Invoiced.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param context: A standard dictionary
-        @return:
+        """Launch Create invoice wizard if invoice state is To be Invoiced,
+           after processing the partial picking.
         """
-        if context is None:
-            context = {}
+        if context is None: context = {}
         result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
-        pick_obj = self.pool.get('stock.picking')
-        context.update({'active_model':'stock.picking'})
-        picking_ids = context.get('active_ids', False)
-        if picking_ids:
-            context.update({'active_id':picking_ids[0]})
-        pick = pick_obj.browse(cr, uid, picking_ids, context=context)[0]
-        if pick.invoice_state == '2binvoiced':
+        partial = self.browse(cr, uid, ids[0], context)
+        context.update(active_model='stock.picking',
+                       active_ids=[partial.picking_id.id])
+        if partial.picking_id.invoice_state == '2binvoiced':
             return {
                 'name': 'Create Invoice',
                 'view_type': 'form',
@@ -55,5 +46,5 @@ class invoice_directly(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
 invoice_directly()
-# 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/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index bcf7f69ff15..63d145136c5 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Warehouse Locations Paths',
+    'name': 'Advanced Routes',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Manufacturing',
     'description': """
 This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows.
 ============================================================================================================
@@ -89,16 +89,18 @@ You can use the demo data as follow:
     'images': ['images/pulled_flow.jpeg','images/pushed_flow.jpeg'],
     'depends': ['procurement','stock','sale'],
     'init_xml': [],
-    'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'],
+    'update_xml': ['stock_location_view.xml', "security/stock_location_security.xml", 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'],
     'demo_xml': [
         '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/stock_location_pull_flow.yml',
+            'test/stock_location_push_flow.yml',
     ],
     'active': 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 d23519d0f0a..2ce4dd7abeb 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 69caefc9e82..7aa7eae4333 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 61e04332c48..984cb0a256b 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f4f3739c98d..4fa8b76dbd1 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -311,6 +311,88 @@ msgid ""
 "from Gate A\n"
 "    "
 msgstr ""
+"\n"
+"Aquest mòdul complementa l'aplicació Magatzem, afegint suport per a cada "
+"producte,\n"
+"ruta d'ubicació, aplicació efectiva de fluxos d'inventari d'entrada i "
+"sortida.\n"
+"\n"
+"Normalment, això es podrà utilitzar per:\n"
+"* Gestió de les cadenes de fabricació de productes\n"
+"* Gestionar ubicacions predeterminades per producte\n"
+"* Definir les rutes dins del seu magatzem d'acord a les necessitats "
+"empresarials, tals com:\n"
+"   - Control de Qualitat\n"
+"   - Després de Serveis de Vendes\n"
+"   - Proveïdor devolucions\n"
+"* Gestió d'Ajuda a la rendibilitat, mitjançant la generació de moviments "
+"automàtics per productes llogats\n"
+"\n"
+"Una vegada que aquest mòdul està instal·lat, apareixerà una data addicional "
+"en la pestanya del producte, on es pot afegir\n"
+"les especificacions del flux d'Entrada i de Sortida. Les dades de "
+"demostració del producte CPU1 per aquests fluxos d'entrada/sortida:\n"
+"\n"
+"Fluxos d'Entrada\n"
+"----------\n"
+"Els fluxos d'entrada són útils quan l'arribada de determinats productes a un "
+"lloc determinat sempre\n"
+"va seguida d'un moviment que correspon a una altra ubicació, opcionalment "
+"després d'un cert retard.\n"
+"L'aplicació Magatzem original ja suporta tals especificacions del flux "
+"d'entrada en les seves ubicacions, però aquestes no poden ser refinades per "
+"producte.\n"
+"\n"
+"Una especificació de flux d'entrada indica quina ubicació està encadenada "
+"amb quina ubicació, i amb\n"
+"quins paràmetres. Tan aviat com una quantitat determinada de productes es "
+"mou de la ubicació d'origen,\n"
+"un moviment encadenat de forma automàtica configurat d'acord amb els "
+"paràmetres establerts en la especificació del flux\n"
+"(lloc de destí, demora, tipus de moviment, diaris, etc) es dispara. El nou "
+"moviment pot ser automàticament\n"
+"processat, o requerir una confirmació manual, depenent dels paràmetres.\n"
+"\n"
+"Fluxos de Sortida\n"
+"----------\n"
+"Els fluxos de sortida són diferents dels fluxos d'entrada, en el sentit de "
+"que no estan relacionats amb\n"
+"la tramitació de moviments de productes, sinó més bé amb el tractament de "
+"les comandes de venda.\n"
+"El que es treu és una necessitat, no directament els productes.\n"
+"Un exemple clàssic de flux de sortida és quan vosaltres teniu una empresa "
+"d'Outlet, amb una empresa pare\n"
+"que és la responsable dels subministraments de l'Outlet.\n"
+"\n"
+"  [client] <- A - [Outlet] <- B - [Subministrador] <~ C ~ [Proveïdor]\n"
+"\n"
+"Quan una nova ordre de compra (A, procedent de la confirmació d'una ordre de "
+"venda per exemple) arriba a l'Outlet, es converteix en una altra compra (B, "
+"a través d'un flux d'entrada del tipus 'moure')\n"
+"sol·licitada des del soci. Quan l'ordre de compra per a B es processada per "
+"l'empresa sòcia, i\n"
+"si el producte està esgotat, pot convertir-se en una Ordre de Compra (C) del "
+"Proveïdor\n"
+"(flux d'Entrada de tipus Compra). El resultat és que l'ordre d'adquisició, "
+"la necessitat, es trasllada automàticament del Client al Proveïdor.\n"
+"\n"
+"Tècnicament, els fluxos de Sortida permeten processar les comandes "
+"d'adquisició d'altra manera, no només en funció del producte considerat, "
+"sinó també en funció de quina ubicació té la \"necessitat\" de quin\n"
+"producte (és dir, la ubicació de destí d'aquesta ordre de compra).\n"
+"\n"
+"Cas d'Ús\n"
+"---------------\n"
+"\n"
+"Podeu utilitzar les dades de demostració de la següent manera:\n"
+"  CPU1: Venda d'algunes CPU1 en la tenda 1 i executar el planificador\n"
+"     - Magatzem: ordre de lliurament, Tenda 1: Recepció\n"
+"  CPU3:\n"
+"     - Al rebre el producte, va al Control de Qualitat i s'emmagatzema a la "
+"plataforma 2.\n"
+"     - Quan es lliura al client: Llista de Selecció -> Embalatge -> Ordre de "
+"Lliurament des de la porta A\n"
+"    "
 
 #. module: stock_location
 #: field:product.pulled.flow,type_proc:0
diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po
index 491456dae4e..061e651e57f 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c759b0b1ab5..fb9d75a10cd 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -626,24 +626,3 @@ msgstr "Abgerechnet"
 
 #~ msgid "Procurement & Locations"
 #~ msgstr "Beschaffung & Lagerwirtschaft"
-
-#~ msgid "Logistic Flow"
-#~ msgstr "Warenfluss"
-
-#~ msgid "Not from Picking"
-#~ msgstr "Rechnung nicht durch Lieferung"
-
-#~ msgid "Location Source"
-#~ msgstr "Lagerort (Anfang)"
-
-#~ msgid "Qty Multiple must be greater than zero."
-#~ msgstr "Multiple Menge muss grösser 0 sein."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index 84ba6980831..d58837f7a7c 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a4fcb1a5f1c..d4b4a844a34 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -608,27 +608,3 @@ msgstr "Facturado"
 
 #~ msgid "Procurement & Locations"
 #~ msgstr "Abastecimiento & Ubicaciones"
-
-#~ msgid "Logistic Flow"
-#~ msgstr "Flujo logística"
-
-#~ msgid "Not from Picking"
-#~ msgstr "No desde albarán"
-
-#~ msgid "Location Source"
-#~ msgstr "Ubicación original"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Qty Multiple must be greater than zero."
-#~ msgstr "El múltiplo de la cantidad debe ser más grande que cero."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Logistics Flow"
-#~ msgstr "Flujo de logística"
diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po
index aed9612cd44..37627293ecb 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..fee5cb12975
--- /dev/null
+++ b/addons/stock_location/i18n/es_CL.po
@@ -0,0 +1,594 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-10-24 19:30+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: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr "Envío de mercancías"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr "Rutas arrastradas"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr "Flujos empujados"
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr "Movimiento automático, paso no añadido"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr "Parámetros"
+
+#. module: stock_location
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr "Ubicación de origen"
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+"Le permite cancelar movimientos relacionados con el flujo de arrastre de "
+"producto."
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr "Flujos arrastrados"
+
+#. module: stock_location
+#: 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: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr "Ubicación usada como destino al abastecer."
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr "Interno"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+"Abastecimiento arrastrado proveniente de la ubicación original %s, regla de "
+"arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr "Estado de facturación"
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+"Este campo rellenará el origen de la guiá de despacho y el nombre de sus "
+"movimientos."
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\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 para definir rutas que el producto debe seguir dentro del árbol "
+"de ubicaciones.\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 'Automático "
+"paso no añadido', la ubicación se reemplaza en el movimiento original."
+
+#. module: stock_location
+#: model:ir.module.module,shortdesc:stock_location.module_meta_information
+msgid "Warehouse Locations Paths"
+msgstr "Rutas en las ubicaciones de almacén"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr "Zona de empaquetado"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr "Puerta B"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr "Puerta A"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr "Comprar"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr "Flujos empujados"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr "Zona de despacho"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de stock"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr "Flujos arrastrados"
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Logistics Flows"
+msgstr "Flujos de logística"
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+"Si está marcado, cuando este movimiento se cancela, también cancela el "
+"movimiento relacionado."
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr "Obtener para stock"
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr "Dirección de empresa"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Para facturar"
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr "Número de días para realizar esta transición"
+
+#. module: stock_location
+#: model:ir.module.module,description:stock_location.module_meta_information
+msgid ""
+"\n"
+"This module supplements the Warehouse application by adding support for per-"
+"product\n"
+"location paths, effectively implementing Push and Pull inventory flows.\n"
+"\n"
+"Typically this could be used to:\n"
+"* Manage product manufacturing chains\n"
+"* Manage default locations per product\n"
+"* Define routes within your warehouse according to business needs, such as:\n"
+"   - Quality Control\n"
+"   - After Sales Services\n"
+"   - Supplier Returns\n"
+"* Help rental management, by generating automated return moves for rented "
+"products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product form, "
+"where you can add\n"
+"Push and Pull flow specifications. The demo data of  CPU1 product for that "
+"push/pull :\n"
+"\n"
+"Push flows\n"
+"----------\n"
+"Push flows are useful when the arrival of certain products in a given "
+"location should always\n"
+"be followed by a corresponding move to another location, optionally after a "
+"certain delay.\n"
+"The original Warehouse application already supports such Push flow "
+"specifications on the\n"
+"Locations themselves, but these cannot be refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which "
+"location, and with\n"
+"what parameters. As soon as a given quantity of products is moved in the "
+"source location,\n"
+"a chained move is automatically foreseen according to the parameters set on "
+"the flow specification\n"
+"(destination location, delay, type of move, journal, etc.) The new move can "
+"be automatically\n"
+"processed, or require a manual confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows\n"
+"----------\n"
+"Pull flows are a bit different from Pull flows, in the sense that they are "
+"not related to\n"
+"the processing of product moves, but rather to the processing of procurement "
+"orders.\n"
+"What is being pulled is a need, not directly products.\n"
+"A classical example of Push flow is when you have an Outlet company, with a "
+"parent Company\n"
+"that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale "
+"Order for example) arrives\n"
+"in the Outlet, it is converted into another procurement (B, via a Push flow "
+"of type 'move')\n"
+"requested from the Holding. When procurement order B is processed by the "
+"Holding company, and\n"
+"if the product is out of stock, it can be converted into a Purchase Order "
+"(C) from the Supplier\n"
+"(Push flow of type Purchase). The result is that the procurement order, the "
+"need, is pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, not "
+"only depending on\n"
+"the product being considered, but also depending on which location holds the "
+"\"need\" for that\n"
+"product (i.e. the destination location of that procurement order).\n"
+"\n"
+"Use-Case\n"
+"--------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"  CPU1: Sell some CPU1 from Shop 1 and run the scheduler\n"
+"     - Warehouse: delivery order, Shop 1: reception\n"
+"  CPU3:\n"
+"     - When receiving the product, it goes to Quality Control location then "
+"stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order "
+"from Gate A\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo complementa la aplicación Almacén, añadiendo soporte para cada "
+"producto,\n"
+"ruta de ubicación, aplicación efectiva de flujos de inventario de Entrada y "
+"Salida.\n"
+"\n"
+"Normalmente, esto se podría utilizar para:\n"
+"* Gestión de las cadenas de fabricación de productos\n"
+"* Gestionar ubicaciones predeterminadas por producto\n"
+"* Definir las rutas dentro de su almacén de acuerdo a las necesidades "
+"empresariales, tales como:\n"
+"   - Control de Calidad\n"
+"   - Después de Servicios de Ventas\n"
+"   - Proveedor Devoluciones\n"
+"* Gestión de Ayuda a la rentabilidad, mediante la generación de movimientos "
+"automáticos para productos alquilados\n"
+"\n"
+"Una vez que este módulo está instalado, aparecerá una ficha adicional en la "
+"pestaña del producto, donde se puede añadir\n"
+"las especificaciones del flujo de Entrada y de Salida. Los datos de "
+"demostración del producto CPU1 para esos flujos de entrada/salida:\n"
+"\n"
+"Flujos de Entrada\n"
+"----------\n"
+"Los flujos de entrada son útiles cuando la llegada de determinados productos "
+"a un lugar determinado siempre\n"
+"va seguida de un movimiento que corresponde a otra ubicación, opcionalmente "
+"después de un cierto retraso.\n"
+"La aplicación Almacén original ya soporta tales especificaciones del flujo "
+"de entrada en sus Ubicaciones, pero estas no pueden ser refinadas por "
+"producto.\n"
+"\n"
+"Una especificación de flujo de entrada indica qué ubicación está encadenada "
+"con qué ubicación, y con\n"
+"qué parámetros. Tan pronto como una cantidad determinada de productos se "
+"mueve de la ubicación de origen,\n"
+"un movimiento encadenado de forma automática configurado de acuerdo con los "
+"parámetros establecidos en la especificación del flujo\n"
+"(lugar de destino, demora, tipo de movimiento, diarios, etc) se dispara. El "
+"nuevo movimiento puede ser automáticamente\n"
+"procesado, o requerir una confirmación manual, dependiendo de los "
+"parámetros.\n"
+"\n"
+"Flujos de Salida\n"
+"----------\n"
+"Los flujos de salida son un poco diferentes de los flujos de entrada, en el "
+"sentido de que no están relacionados con\n"
+"la tramitación de movimientos de productos, sino más bien con el tratamiento "
+"de los pedidos de venta.\n"
+"Lo que se saca es una necesidad, no directamente los productos.\n"
+"Un ejemplo clásico de flujo de salida es cuando usted tiene una empresa de "
+"Outlet, con una empresa padre\n"
+"que es la responsable de los suministros del Outlet.\n"
+"\n"
+"  [cliente] <- A - [Outlet] <- B - [Suministrador] <~ C ~ [Proveedor]\n"
+"\n"
+"Cuando una nueva orden de compra (A, procedente de la confirmación de una "
+"orden de venta por ejemplo) llega al Outlet, se convierte en otra compra (B, "
+"a través de un flujo de entrada del tipo 'mover')\n"
+"solicitada desde el socio. Cuando el orden de compa para B es procesado por "
+"la empresa socia, y\n"
+"si el producto está agotado, puede convertirse en una Orden de Compra (C) "
+"del Proveedor\n"
+"(flujo de Entrada de tipo Compra). El resultado es que el orden de "
+"adquisición, la necesidad, se traslada automáticamente del Cliente al "
+"Proveedor.\n"
+"\n"
+"Técnicamente, los flujos de Salida permiten procesar los pedidos de "
+"adquisición de otra manera, no sólo en función del producto considerado, "
+"sino también en función de qué ubicación tiene la \"necesidad\" de qué\n"
+"producto (es decir, la ubicación de destino de esa orden de compra).\n"
+"\n"
+"Caso de Uso\n"
+"---------------\n"
+"\n"
+"Puede utilizar los datos de demostración de la siguiente manera:\n"
+"  CPU1: Venta de algunas CPU1 en la tienda 1 y ejecutar el planificador\n"
+"     - Almacén: órden de entrega, Tienda 1: Recepción\n"
+"  CPU3:\n"
+"     - Al recibir el producto, va al Control de Calidad y se almacena en la "
+"plataforma 2.\n"
+"     - Cuando se entrega al cliente: Lista de Selección -> Embalaje -> Orden "
+"de Entrega desde la puerta A\n"
+"    "
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Tipo de abastecimiento"
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+"Se usa para saber a que compañía pertenece las guias de despacho y "
+"movimientos."
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+"Estas reglas fijan la ruta correcta del producto en todo el árbol de "
+"ubicaciones."
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr "Operación manual"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr "Método abastecimiento"
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr "Tipo de envío"
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Obtener para stock': Cuando sea necesario, coger del stock o esperar hasta "
+"que sea reabastecido. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
+"producir para la petición de abastecimiento."
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr "Es la ubicación destino que necesita suministro."
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr "Arrastrado desde otra ubicación vía abastecimiento %d"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr "Control de calidad"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr "No Aplicable"
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr "Retraso (días)"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+"Guía de despacho para abastecimiento arrastrado proveniente de la ubicación "
+"original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr "Flujo empujado"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+"Movimiento para abastecimiento arrastrado proveniente de la ubicación "
+"original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: 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: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock_location
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr "Ubicación de destino"
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr "Recepción mercancías"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr "Tipo de acción"
+
+#. module: stock_location
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr "Según la compañía, seleccionar si desea recibir o enviar productos."
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr "Procesando pedido"
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: stock_location
+#: view:product.product:0
+#: field:product.product,path_ids:0
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr "Rutas de ubicaciones"
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr "Cancelar cascada"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr "Facturado"
diff --git a/addons/stock_location/i18n/es_MX.po b/addons/stock_location/i18n/es_MX.po
new file mode 100644
index 00000000000..6f70bfb59aa
--- /dev/null
+++ b/addons/stock_location/i18n/es_MX.po
@@ -0,0 +1,610 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_location
+#
+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: 2010-12-28 08:51+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:40+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr "Envío mercancías"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr "Rutas arrastradas"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr "Flujos empujados"
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr "Automático paso no añadido"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr "Parámetros"
+
+#. module: stock_location
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+"Le permite cancelar movimientos relacionados con el flujo de arrastre de "
+"producto."
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr "Flujos arrastrados"
+
+#. module: stock_location
+#: 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: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr "Ubicación usada como ubicación destino al abastecer."
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr "Interno"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+"Abastecimiento arrastrado proveniente de la ubicación original %s, regla de "
+"arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr "Estado factura"
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+"Este campo rellenará el origen del albarán y el nombre de sus movimientos."
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\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 para definir rutas que el producto debe seguir dentro del árbol "
+"de ubicaciones.\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 'Automático "
+"paso no añadido', la ubicación se reemplaza en el movimiento original."
+
+#. module: stock_location
+#: model:ir.module.module,shortdesc:stock_location.module_meta_information
+msgid "Warehouse Locations Paths"
+msgstr "Rutas en las ubicaciones de almacén"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr "Zona empaquetado"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr "Puerta B"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr "Puerta A"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr "Comprar"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr "Flujos empujados"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr "Zona de expedición"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr "Flujos arrastrados"
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Logistics Flows"
+msgstr "Flujos de logística"
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+"Si está marcado, cuando este movimiento se cancela, también cancela el "
+"movimiento relacionado."
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr "Obtener para stock"
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr "Dirección empresa"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Para facturar"
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr "Número de días para realizar esta transición"
+
+#. module: stock_location
+#: model:ir.module.module,description:stock_location.module_meta_information
+msgid ""
+"\n"
+"This module supplements the Warehouse application by adding support for per-"
+"product\n"
+"location paths, effectively implementing Push and Pull inventory flows.\n"
+"\n"
+"Typically this could be used to:\n"
+"* Manage product manufacturing chains\n"
+"* Manage default locations per product\n"
+"* Define routes within your warehouse according to business needs, such as:\n"
+"   - Quality Control\n"
+"   - After Sales Services\n"
+"   - Supplier Returns\n"
+"* Help rental management, by generating automated return moves for rented "
+"products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product form, "
+"where you can add\n"
+"Push and Pull flow specifications. The demo data of  CPU1 product for that "
+"push/pull :\n"
+"\n"
+"Push flows\n"
+"----------\n"
+"Push flows are useful when the arrival of certain products in a given "
+"location should always\n"
+"be followed by a corresponding move to another location, optionally after a "
+"certain delay.\n"
+"The original Warehouse application already supports such Push flow "
+"specifications on the\n"
+"Locations themselves, but these cannot be refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which "
+"location, and with\n"
+"what parameters. As soon as a given quantity of products is moved in the "
+"source location,\n"
+"a chained move is automatically foreseen according to the parameters set on "
+"the flow specification\n"
+"(destination location, delay, type of move, journal, etc.) The new move can "
+"be automatically\n"
+"processed, or require a manual confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows\n"
+"----------\n"
+"Pull flows are a bit different from Pull flows, in the sense that they are "
+"not related to\n"
+"the processing of product moves, but rather to the processing of procurement "
+"orders.\n"
+"What is being pulled is a need, not directly products.\n"
+"A classical example of Push flow is when you have an Outlet company, with a "
+"parent Company\n"
+"that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale "
+"Order for example) arrives\n"
+"in the Outlet, it is converted into another procurement (B, via a Push flow "
+"of type 'move')\n"
+"requested from the Holding. When procurement order B is processed by the "
+"Holding company, and\n"
+"if the product is out of stock, it can be converted into a Purchase Order "
+"(C) from the Supplier\n"
+"(Push flow of type Purchase). The result is that the procurement order, the "
+"need, is pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, not "
+"only depending on\n"
+"the product being considered, but also depending on which location holds the "
+"\"need\" for that\n"
+"product (i.e. the destination location of that procurement order).\n"
+"\n"
+"Use-Case\n"
+"--------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"  CPU1: Sell some CPU1 from Shop 1 and run the scheduler\n"
+"     - Warehouse: delivery order, Shop 1: reception\n"
+"  CPU3:\n"
+"     - When receiving the product, it goes to Quality Control location then "
+"stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order "
+"from Gate A\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo complementa la aplicación Almacén, añadiendo soporte para cada "
+"producto,\n"
+"ruta de ubicación, aplicación efectiva de flujos de inventario de Entrada y "
+"Salida.\n"
+"\n"
+"Normalmente, esto se podría utilizar para:\n"
+"* Gestión de las cadenas de fabricación de productos\n"
+"* Gestionar ubicaciones predeterminadas por producto\n"
+"* Definir las rutas dentro de su almacén de acuerdo a las necesidades "
+"empresariales, tales como:\n"
+"   - Control de Calidad\n"
+"   - Después de Servicios de Ventas\n"
+"   - Proveedor Devoluciones\n"
+"* Gestión de Ayuda a la rentabilidad, mediante la generación de movimientos "
+"automáticos para productos alquilados\n"
+"\n"
+"Una vez que este módulo está instalado, aparecerá una ficha adicional en la "
+"pestaña del producto, donde se puede añadir\n"
+"las especificaciones del flujo de Entrada y de Salida. Los datos de "
+"demostración del producto CPU1 para esos flujos de entrada/salida:\n"
+"\n"
+"Flujos de Entrada\n"
+"----------\n"
+"Los flujos de entrada son útiles cuando la llegada de determinados productos "
+"a un lugar determinado siempre\n"
+"va seguida de un movimiento que corresponde a otra ubicación, opcionalmente "
+"después de un cierto retraso.\n"
+"La aplicación Almacén original ya soporta tales especificaciones del flujo "
+"de entrada en sus Ubicaciones, pero estas no pueden ser refinadas por "
+"producto.\n"
+"\n"
+"Una especificación de flujo de entrada indica qué ubicación está encadenada "
+"con qué ubicación, y con\n"
+"qué parámetros. Tan pronto como una cantidad determinada de productos se "
+"mueve de la ubicación de origen,\n"
+"un movimiento encadenado de forma automática configurado de acuerdo con los "
+"parámetros establecidos en la especificación del flujo\n"
+"(lugar de destino, demora, tipo de movimiento, diarios, etc) se dispara. El "
+"nuevo movimiento puede ser automáticamente\n"
+"procesado, o requerir una confirmación manual, dependiendo de los "
+"parámetros.\n"
+"\n"
+"Flujos de Salida\n"
+"----------\n"
+"Los flujos de salida son un poco diferentes de los flujos de entrada, en el "
+"sentido de que no están relacionados con\n"
+"la tramitación de movimientos de productos, sino más bien con el tratamiento "
+"de los pedidos de venta.\n"
+"Lo que se saca es una necesidad, no directamente los productos.\n"
+"Un ejemplo clásico de flujo de salida es cuando usted tiene una empresa de "
+"Outlet, con una empresa padre\n"
+"que es la responsable de los suministros del Outlet.\n"
+"\n"
+"  [cliente] <- A - [Outlet] <- B - [Suministrador] <~ C ~ [Proveedor]\n"
+"\n"
+"Cuando una nueva orden de compra (A, procedente de la confirmación de una "
+"orden de venta por ejemplo) llega al Outlet, se convierte en otra compra (B, "
+"a través de un flujo de entrada del tipo 'mover')\n"
+"solicitada desde el socio. Cuando el orden de compa para B es procesado por "
+"la empresa socia, y\n"
+"si el producto está agotado, puede convertirse en una Orden de Compra (C) "
+"del Proveedor\n"
+"(flujo de Entrada de tipo Compra). El resultado es que el orden de "
+"adquisición, la necesidad, se traslada automáticamente del Cliente al "
+"Proveedor.\n"
+"\n"
+"Técnicamente, los flujos de Salida permiten procesar los pedidos de "
+"adquisición de otra manera, no sólo en función del producto considerado, "
+"sino también en función de qué ubicación tiene la \"necesidad\" de qué\n"
+"producto (es decir, la ubicación de destino de esa orden de compra).\n"
+"\n"
+"Caso de Uso\n"
+"---------------\n"
+"\n"
+"Puede utilizar los datos de demostración de la siguiente manera:\n"
+"  CPU1: Venta de algunas CPU1 en la tienda 1 y ejecutar el planificador\n"
+"     - Almacén: órden de entrega, Tienda 1: Recepción\n"
+"  CPU3:\n"
+"     - Al recibir el producto, va al Control de Calidad y se almacena en la "
+"plataforma 2.\n"
+"     - Cuando se entrega al cliente: Lista de Selección -> Embalaje -> Orden "
+"de Entrega desde la puerta A\n"
+"    "
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Tipo de abastecimiento"
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+"Se usa para saber a que compañía pertenece los albaranes y movimientos."
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+"Estas reglas fijan la ruta correcta del producto en todo el árbol de "
+"ubicaciones."
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr "Operación manual"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr "Método abastecimiento"
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr "Tipo envío"
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Obtener para stock': Cuando sea necesario, coger del stock o esperar hasta "
+"que se vuelva a suministrar. 'Obtener bajo pedido': Cuando sea necesario, "
+"comprar o producir para la solicitud de abastecimiento."
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr "Es la ubicación destino que necesita suministro."
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr "Arrastrado desde otra ubicación vía abastecimiento %d"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr "Control calidad"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr "No aplicable"
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr "Retraso (días)"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+"Albarán para abastecimiento arrastrado proveniente de la ubicación original "
+"%s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr "Flujo empujado"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+"Movimiento para abastecimiento arrastrado proveniente de la ubicación "
+"original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: 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: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock_location
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr "Ubicación destino"
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr "Recepción mercancías"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr "Tipo de acción"
+
+#. module: stock_location
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr "Según la compañía, seleccionar si desea recibir o enviar productos."
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr "Procesando pedido"
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: stock_location
+#: view:product.product:0
+#: field:product.product,path_ids:0
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr "Rutas de ubicaciones"
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr "Cancelar cascada"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Stock Location Paths"
+#~ msgstr "Rutas ubicación 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 "stock.location.path"
+#~ msgstr "stock.ubicacion.ruta"
+
+#~ msgid "Procurement & Locations"
+#~ msgstr "Abastecimiento & Ubicaciones"
diff --git a/addons/stock_location/i18n/es_VE.po b/addons/stock_location/i18n/es_VE.po
new file mode 100644
index 00000000000..6f70bfb59aa
--- /dev/null
+++ b/addons/stock_location/i18n/es_VE.po
@@ -0,0 +1,610 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_location
+#
+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: 2010-12-28 08:51+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:40+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr "Envío mercancías"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr "Rutas arrastradas"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Movimiento"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr "Flujos empujados"
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr "Automático paso no añadido"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr "Parámetros"
+
+#. module: stock_location
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr "Ubicación origen"
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+"Le permite cancelar movimientos relacionados con el flujo de arrastre de "
+"producto."
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr "Flujos arrastrados"
+
+#. module: stock_location
+#: 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: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr "Ubicación usada como ubicación destino al abastecer."
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr "Interno"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+"Abastecimiento arrastrado proveniente de la ubicación original %s, regla de "
+"arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr "Estado factura"
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+"Este campo rellenará el origen del albarán y el nombre de sus movimientos."
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\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 para definir rutas que el producto debe seguir dentro del árbol "
+"de ubicaciones.\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 'Automático "
+"paso no añadido', la ubicación se reemplaza en el movimiento original."
+
+#. module: stock_location
+#: model:ir.module.module,shortdesc:stock_location.module_meta_information
+msgid "Warehouse Locations Paths"
+msgstr "Rutas en las ubicaciones de almacén"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr "Zona empaquetado"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr "Puerta B"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr "Puerta A"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr "Comprar"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr "Flujos empujados"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr "Zona de expedición"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr "Flujos arrastrados"
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Logistics Flows"
+msgstr "Flujos de logística"
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+"Si está marcado, cuando este movimiento se cancela, también cancela el "
+"movimiento relacionado."
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr "Obtener para stock"
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr "Dirección empresa"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Para facturar"
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr "Número de días para realizar esta transición"
+
+#. module: stock_location
+#: model:ir.module.module,description:stock_location.module_meta_information
+msgid ""
+"\n"
+"This module supplements the Warehouse application by adding support for per-"
+"product\n"
+"location paths, effectively implementing Push and Pull inventory flows.\n"
+"\n"
+"Typically this could be used to:\n"
+"* Manage product manufacturing chains\n"
+"* Manage default locations per product\n"
+"* Define routes within your warehouse according to business needs, such as:\n"
+"   - Quality Control\n"
+"   - After Sales Services\n"
+"   - Supplier Returns\n"
+"* Help rental management, by generating automated return moves for rented "
+"products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product form, "
+"where you can add\n"
+"Push and Pull flow specifications. The demo data of  CPU1 product for that "
+"push/pull :\n"
+"\n"
+"Push flows\n"
+"----------\n"
+"Push flows are useful when the arrival of certain products in a given "
+"location should always\n"
+"be followed by a corresponding move to another location, optionally after a "
+"certain delay.\n"
+"The original Warehouse application already supports such Push flow "
+"specifications on the\n"
+"Locations themselves, but these cannot be refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which "
+"location, and with\n"
+"what parameters. As soon as a given quantity of products is moved in the "
+"source location,\n"
+"a chained move is automatically foreseen according to the parameters set on "
+"the flow specification\n"
+"(destination location, delay, type of move, journal, etc.) The new move can "
+"be automatically\n"
+"processed, or require a manual confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows\n"
+"----------\n"
+"Pull flows are a bit different from Pull flows, in the sense that they are "
+"not related to\n"
+"the processing of product moves, but rather to the processing of procurement "
+"orders.\n"
+"What is being pulled is a need, not directly products.\n"
+"A classical example of Push flow is when you have an Outlet company, with a "
+"parent Company\n"
+"that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale "
+"Order for example) arrives\n"
+"in the Outlet, it is converted into another procurement (B, via a Push flow "
+"of type 'move')\n"
+"requested from the Holding. When procurement order B is processed by the "
+"Holding company, and\n"
+"if the product is out of stock, it can be converted into a Purchase Order "
+"(C) from the Supplier\n"
+"(Push flow of type Purchase). The result is that the procurement order, the "
+"need, is pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, not "
+"only depending on\n"
+"the product being considered, but also depending on which location holds the "
+"\"need\" for that\n"
+"product (i.e. the destination location of that procurement order).\n"
+"\n"
+"Use-Case\n"
+"--------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"  CPU1: Sell some CPU1 from Shop 1 and run the scheduler\n"
+"     - Warehouse: delivery order, Shop 1: reception\n"
+"  CPU3:\n"
+"     - When receiving the product, it goes to Quality Control location then "
+"stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order "
+"from Gate A\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo complementa la aplicación Almacén, añadiendo soporte para cada "
+"producto,\n"
+"ruta de ubicación, aplicación efectiva de flujos de inventario de Entrada y "
+"Salida.\n"
+"\n"
+"Normalmente, esto se podría utilizar para:\n"
+"* Gestión de las cadenas de fabricación de productos\n"
+"* Gestionar ubicaciones predeterminadas por producto\n"
+"* Definir las rutas dentro de su almacén de acuerdo a las necesidades "
+"empresariales, tales como:\n"
+"   - Control de Calidad\n"
+"   - Después de Servicios de Ventas\n"
+"   - Proveedor Devoluciones\n"
+"* Gestión de Ayuda a la rentabilidad, mediante la generación de movimientos "
+"automáticos para productos alquilados\n"
+"\n"
+"Una vez que este módulo está instalado, aparecerá una ficha adicional en la "
+"pestaña del producto, donde se puede añadir\n"
+"las especificaciones del flujo de Entrada y de Salida. Los datos de "
+"demostración del producto CPU1 para esos flujos de entrada/salida:\n"
+"\n"
+"Flujos de Entrada\n"
+"----------\n"
+"Los flujos de entrada son útiles cuando la llegada de determinados productos "
+"a un lugar determinado siempre\n"
+"va seguida de un movimiento que corresponde a otra ubicación, opcionalmente "
+"después de un cierto retraso.\n"
+"La aplicación Almacén original ya soporta tales especificaciones del flujo "
+"de entrada en sus Ubicaciones, pero estas no pueden ser refinadas por "
+"producto.\n"
+"\n"
+"Una especificación de flujo de entrada indica qué ubicación está encadenada "
+"con qué ubicación, y con\n"
+"qué parámetros. Tan pronto como una cantidad determinada de productos se "
+"mueve de la ubicación de origen,\n"
+"un movimiento encadenado de forma automática configurado de acuerdo con los "
+"parámetros establecidos en la especificación del flujo\n"
+"(lugar de destino, demora, tipo de movimiento, diarios, etc) se dispara. El "
+"nuevo movimiento puede ser automáticamente\n"
+"procesado, o requerir una confirmación manual, dependiendo de los "
+"parámetros.\n"
+"\n"
+"Flujos de Salida\n"
+"----------\n"
+"Los flujos de salida son un poco diferentes de los flujos de entrada, en el "
+"sentido de que no están relacionados con\n"
+"la tramitación de movimientos de productos, sino más bien con el tratamiento "
+"de los pedidos de venta.\n"
+"Lo que se saca es una necesidad, no directamente los productos.\n"
+"Un ejemplo clásico de flujo de salida es cuando usted tiene una empresa de "
+"Outlet, con una empresa padre\n"
+"que es la responsable de los suministros del Outlet.\n"
+"\n"
+"  [cliente] <- A - [Outlet] <- B - [Suministrador] <~ C ~ [Proveedor]\n"
+"\n"
+"Cuando una nueva orden de compra (A, procedente de la confirmación de una "
+"orden de venta por ejemplo) llega al Outlet, se convierte en otra compra (B, "
+"a través de un flujo de entrada del tipo 'mover')\n"
+"solicitada desde el socio. Cuando el orden de compa para B es procesado por "
+"la empresa socia, y\n"
+"si el producto está agotado, puede convertirse en una Orden de Compra (C) "
+"del Proveedor\n"
+"(flujo de Entrada de tipo Compra). El resultado es que el orden de "
+"adquisición, la necesidad, se traslada automáticamente del Cliente al "
+"Proveedor.\n"
+"\n"
+"Técnicamente, los flujos de Salida permiten procesar los pedidos de "
+"adquisición de otra manera, no sólo en función del producto considerado, "
+"sino también en función de qué ubicación tiene la \"necesidad\" de qué\n"
+"producto (es decir, la ubicación de destino de esa orden de compra).\n"
+"\n"
+"Caso de Uso\n"
+"---------------\n"
+"\n"
+"Puede utilizar los datos de demostración de la siguiente manera:\n"
+"  CPU1: Venta de algunas CPU1 en la tienda 1 y ejecutar el planificador\n"
+"     - Almacén: órden de entrega, Tienda 1: Recepción\n"
+"  CPU3:\n"
+"     - Al recibir el producto, va al Control de Calidad y se almacena en la "
+"plataforma 2.\n"
+"     - Cuando se entrega al cliente: Lista de Selección -> Embalaje -> Orden "
+"de Entrega desde la puerta A\n"
+"    "
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Tipo de abastecimiento"
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+"Se usa para saber a que compañía pertenece los albaranes y movimientos."
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+"Estas reglas fijan la ruta correcta del producto en todo el árbol de "
+"ubicaciones."
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr "Operación manual"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr "Método abastecimiento"
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr "Tipo envío"
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Obtener para stock': Cuando sea necesario, coger del stock o esperar hasta "
+"que se vuelva a suministrar. 'Obtener bajo pedido': Cuando sea necesario, "
+"comprar o producir para la solicitud de abastecimiento."
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr "Es la ubicación destino que necesita suministro."
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr "Arrastrado desde otra ubicación vía abastecimiento %d"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr "Control calidad"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr "No aplicable"
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr "Retraso (días)"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+"Albarán para abastecimiento arrastrado proveniente de la ubicación original "
+"%s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr "Flujo empujado"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+"Movimiento para abastecimiento arrastrado proveniente de la ubicación "
+"original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
+
+#. module: stock_location
+#: 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: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: stock_location
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr "Ubicación destino"
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr "Movimiento automático"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr "Recepción mercancías"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr "Tipo de acción"
+
+#. module: stock_location
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr "Según la compañía, seleccionar si desea recibir o enviar productos."
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr "Procesando pedido"
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: stock_location
+#: view:product.product:0
+#: field:product.product,path_ids:0
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr "Rutas de ubicaciones"
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr "Cancelar cascada"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Stock Location Paths"
+#~ msgstr "Rutas ubicación 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 "stock.location.path"
+#~ msgstr "stock.ubicacion.ruta"
+
+#~ msgid "Procurement & Locations"
+#~ msgstr "Abastecimiento & Ubicaciones"
diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po
index 7a86249d6cc..ee62020797b 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b2529d44242..9b3c7c3ed21 100644
--- a/addons/stock_location/i18n/fi.po
+++ b/addons/stock_location/i18n/fi.po
@@ -14,55 +14,55 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "Lähetetään tavarat"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Pulled Paths"
-msgstr ""
+msgstr "Työntövirtauksen polut"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Move"
-msgstr ""
+msgstr "Siirrä"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
 msgid "Pushed Flows"
-msgstr ""
+msgstr "Työnnetyt virtaukset"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Automaattinen ei lisätä porrasta"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Parameters"
-msgstr ""
+msgstr "Parametrit"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Lähteen sijainti"
 
 #. module: stock_location
 #: help:product.pulled.flow,cancel_cascade:0
 msgid "Allow you to cancel moves related to the product pull flow"
-msgstr ""
+msgstr "Mahdollistaan työntövirtaukseen liittyvien siirtojen peruuttamisen"
 
 #. 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 "Työntövirtaukset"
 
 #. module: stock_location
 #: constraint:stock.move:0
@@ -72,7 +72,7 @@ msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
-msgstr ""
+msgstr "Paikka jotia käytetään kohdepaikkana toimituksille"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -91,18 +91,18 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr ""
+msgstr "Sijainti"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
 #: field:stock.location.path,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Laskun tila"
 
 #. module: stock_location
 #: help:product.pulled.flow,name:0
 msgid "This field will fill the packing Origin and the name of its moves"
-msgstr ""
+msgstr "Tämä kenttä täyttää keräilypaikan ja sen siirtojen nimet"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
@@ -118,42 +118,42 @@ msgstr ""
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Warehouse Locations Paths"
-msgstr ""
+msgstr "Varastopaikkojen polut"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Conditions"
-msgstr ""
+msgstr "Ehdot"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_pack_zone
 msgid "Pack Zone"
-msgstr ""
+msgstr "Pakkausalue"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
 msgid "Gate B"
-msgstr ""
+msgstr "Portti B"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_a
 msgid "Gate A"
-msgstr ""
+msgstr "Portti A"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Buy"
-msgstr ""
+msgstr "Osta"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Pushed flows"
-msgstr ""
+msgstr "Imuvirtaukset"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_dispatch_zone
 msgid "Dispatch Zone"
-msgstr ""
+msgstr "Lähetysalue"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_move
@@ -163,7 +163,7 @@ msgstr "Varastosiirto"
 #. module: stock_location
 #: view:product.product:0
 msgid "Pulled flows"
-msgstr ""
+msgstr "Työntövirtaukset"
 
 #. module: stock_location
 #: field:product.pulled.flow,company_id:0
@@ -174,17 +174,18 @@ msgstr "Yritys"
 #. module: stock_location
 #: view:product.product:0
 msgid "Logistics Flows"
-msgstr ""
+msgstr "Logistiika virtaukset"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
 msgid "If checked, when this move is cancelled, cancel the linked move too"
 msgstr ""
+"Jos valittu, siirron peruutuksen yhteydessä myös linkitetty siirto peruuntuu"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Produce"
-msgstr ""
+msgstr "Tuota"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
@@ -205,12 +206,12 @@ msgstr "Kumppanin osoite"
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Tullaan laskuttamaan"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
 msgid "Number of days to do this transition"
-msgstr ""
+msgstr "Siirtoon kuluva aika (päivää)"
 
 #. module: stock_location
 #: model:ir.module.module,description:stock_location.module_meta_information
@@ -309,17 +310,18 @@ msgstr "Hankintatyyppi"
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company belong packings and moves"
 msgstr ""
+"Käytetään tunnistamaan mille yritykselle pakkaukset ja siirrot kuuluvat"
 
 #. module: stock_location
 #: field:product.pulled.flow,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
-msgstr ""
+msgstr "Nämä säännöt asettavat oikean polut tuotteelle koko sijaintipuussa"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -341,7 +343,7 @@ msgstr "Hankintatapa"
 #: field:product.pulled.flow,picking_type:0
 #: field:stock.location.path,picking_type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Lähetyksen tyyppi"
 
 #. module: stock_location
 #: help:product.pulled.flow,procure_method:0
@@ -350,11 +352,14 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"\"Valmista varastoon\": Ota varastosta tarpeen vaatiessa tai odota kunnes "
+"saatavilla. \"Valmista tilaukseen\": Osta tai tuota tarpeen vaatiessa "
+"hankintapyynnöllä."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
 msgid "Is the destination location that needs supplying"
-msgstr ""
+msgstr "Tarvitseeko kohdepaikka toimituksia"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -365,7 +370,7 @@ msgstr "Tuotteet"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location via procurement %d"
-msgstr ""
+msgstr "Imuohjattu toisesta pisteesta hankinnan kautta %d"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
@@ -376,12 +381,12 @@ msgstr "Laatutarkastus"
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Sopimaton"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr ""
+msgstr "Viive (päivää)"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:67
@@ -394,7 +399,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.product,path_ids:0
 msgid "Pushed Flow"
-msgstr ""
+msgstr "Työntövirtaus"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:89
@@ -417,7 +422,7 @@ msgstr "Hankinta"
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Kohteen sijainti"
 
 #. module: stock_location
 #: field:stock.location.path,auto:0
@@ -429,12 +434,12 @@ msgstr "Automaattinen siirto"
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Tavaroita otetaan"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Action Type"
-msgstr ""
+msgstr "Toiminnon tyyppi"
 
 #. module: stock_location
 #: constraint:product.product:0
@@ -453,25 +458,25 @@ msgstr ""
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_order
 msgid "Order Processing"
-msgstr ""
+msgstr "Tilauksenkäsittely"
 
 #. module: stock_location
 #: field:stock.location.path,name:0
 msgid "Operation"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: stock_location
 #: view:product.product:0
 #: field:product.product,path_ids:0
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr ""
+msgstr "Kohteen polut"
 
 #. module: stock_location
 #: field:product.pulled.flow,journal_id:0
 #: field:stock.location.path,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Loki"
 
 #. module: stock_location
 #: field:product.pulled.flow,cancel_cascade:0
@@ -484,3 +489,17 @@ msgstr ""
 #: selection:stock.location.path,invoice_state:0
 msgid "Invoiced"
 msgstr "Laskutettu"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#~ msgid "Stock Location Paths"
+#~ msgstr "varastopaikkojen polut"
+
+#~ msgid "Procurement & Locations"
+#~ msgstr "Hankinta ja paikat"
+
+#~ 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ä!"
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index 958b19b499e..149ded3fab0 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-18 16:46+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -40,7 +40,7 @@ msgstr "Flux poussés"
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr "Automatique aucun pas ajouter"
+msgstr "Automatique, pas d'étape ajoutée"
 
 #. module: stock_location
 #: view:product.product:0
@@ -87,8 +87,8 @@ msgid ""
 "Pulled procurement coming from original location %s, pull rule %s, via "
 "original Procurement %s (#%d)"
 msgstr ""
-"Gestion des besoins en flux tiré provenant de l'emplacement d'origine %s, "
-"règle de flux tiré %s, via le besoin %s (#%d)"
+"Approvisionnement en flux tiré provenant de l'emplacement d'origine %s, "
+"règle de flux tiré %s, via l'approvisionnement original %s (#%d)"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
@@ -201,12 +201,12 @@ msgstr "Produire"
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Order"
-msgstr "Sur commande"
+msgstr "Production à la demande"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr "Sur stock"
+msgstr "Production sur stock"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
@@ -435,7 +435,7 @@ msgstr "Produit"
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr "Méthode de gestion des besoins"
+msgstr "Méthode d'approvisionnement"
 
 #. module: stock_location
 #: field:product.pulled.flow,picking_type:0
@@ -450,10 +450,9 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
-"'Sur stock': Quand c'est possible prendre du stock ou attendre le "
-"réapprovisionnement.\n"
-"'Sur commande': Quand c'est possible, acheter ou produire pour la demande de "
-"réappro."
+"'Production sur stock' : quand il y a une demande, on prend du stock ou on "
+"attend jusqu'au prochain réapprovisionnement. 'Production à la demande' : "
+"quand il y a une demande, on achète ou on fabrique selon cette demande."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
@@ -470,7 +469,8 @@ msgstr "Produits"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location via procurement %d"
-msgstr "Tiré depuis un autre emplacement pour satisfaire le besoin %d"
+msgstr ""
+"Tiré depuis un autre emplacement pour satisfaire l'approvisionnement %d"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
@@ -495,9 +495,9 @@ msgid ""
 "Picking for pulled procurement coming from original location %s, pull rule "
 "%s, via original Procurement %s (#%d)"
 msgstr ""
-"Opération de manutention pour un besoin tiré, en provenance de l'emplacement "
-"d'origine %s, règle de flux tiré %s, pour satisfaire le besoin original %s "
-"(#%d)"
+"Opération de manutention pour un approvisionnement tiré, en provenance de "
+"l'emplacement d'origine %s, règle de flux tiré %s, pour satisfaire "
+"l'approvisionnement original %s (#%d)"
 
 #. module: stock_location
 #: field:product.product,path_ids:0
@@ -511,8 +511,9 @@ msgid ""
 "Move for pulled procurement coming from original location %s, pull rule %s, "
 "via original Procurement %s (#%d)"
 msgstr ""
-"Mouvement pour un besoin tiré, en provenance de l'emplacement d'origine %s, "
-"règle de flux tiré %s, pour satisfaire le besoin original %s (#%d)"
+"Mouvement pour un approvisionnement tiré, en provenance de l'emplacement "
+"d'origine %s, règle de flux tiré %s, pour satisfaire l'approvisionnement "
+"original %s (#%d)"
 
 #. module: stock_location
 #: constraint:stock.move:0
diff --git a/addons/stock_location/i18n/gl.po b/addons/stock_location/i18n/gl.po
index 7a5de936cd7..468fc771339 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a2976175d20..e4c11dce945 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -45,7 +45,7 @@ msgstr "Automatski bez dodavanja koraka"
 #. module: stock_location
 #: view:product.product:0
 msgid "Parameters"
-msgstr ""
+msgstr "Parametri"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
@@ -77,7 +77,7 @@ msgstr ""
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr ""
+msgstr "Interno"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
@@ -90,13 +90,13 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr ""
+msgstr "Lokacija"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
 #: field:stock.location.path,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Status fakture"
 
 #. module: stock_location
 #: help:product.pulled.flow,name:0
@@ -128,7 +128,7 @@ msgstr ""
 #. module: stock_location
 #: view:product.product:0
 msgid "Conditions"
-msgstr ""
+msgstr "Uvjeti"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_pack_zone
@@ -148,7 +148,7 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Buy"
-msgstr ""
+msgstr "Kupi"
 
 #. module: stock_location
 #: view:product.product:0
@@ -204,13 +204,13 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
 msgid "Partner Address"
-msgstr ""
+msgstr "Adresa partnera"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Za fakturiranje"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
@@ -318,7 +318,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -337,7 +337,7 @@ msgstr "Manuelna Operacija"
 #: model:ir.model,name:stock_location.model_product_product
 #: field:product.pulled.flow,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Artikl"
 
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
@@ -446,7 +446,7 @@ msgstr ""
 #. module: stock_location
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Pogreška: Neispravna EAN šifra"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -477,7 +477,7 @@ msgstr "Putanje između lokacija"
 #: field:product.pulled.flow,journal_id:0
 #: field:stock.location.path,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: stock_location
 #: field:product.pulled.flow,cancel_cascade:0
@@ -489,7 +489,7 @@ msgstr ""
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturirano"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po
index 20d423cdae7..2124a097f9a 100644
--- a/addons/stock_location/i18n/hu.po
+++ b/addons/stock_location/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-26 15:24+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b4debfa5887..2515b94e260 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b92ea52d9cf..c295a44f925 100644
--- a/addons/stock_location/i18n/it.po
+++ b/addons/stock_location/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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Move"
-msgstr ""
+msgstr "Muovi"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po
index f6b849524a2..f6c84fddf08 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9c1238168b7..1503579b113 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 074ea86c018..e6f0d78b671 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c775a303bde..8f35b2c6b9e 100644
--- a/addons/stock_location/i18n/nl.po
+++ b/addons/stock_location/i18n/nl.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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "Goederen verzenden"
 
 #. module: stock_location
 #: view:product.product:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Move"
-msgstr ""
+msgstr "Mutatie"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
@@ -45,7 +45,7 @@ msgstr "Automatisch"
 #. module: stock_location
 #: view:product.product:0
 msgid "Parameters"
-msgstr ""
+msgstr "Parameters"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
@@ -66,7 +66,7 @@ msgstr ""
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Het is verplicht een productie batch toe te wijzen aan dit product"
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
@@ -77,7 +77,7 @@ msgstr ""
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr ""
+msgstr "Intern"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
@@ -90,13 +90,13 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr ""
+msgstr "Locatie"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
 #: field:stock.location.path,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Factuurstatus"
 
 #. module: stock_location
 #: help:product.pulled.flow,name:0
@@ -129,7 +129,7 @@ msgstr ""
 #. module: stock_location
 #: view:product.product:0
 msgid "Conditions"
-msgstr ""
+msgstr "Voorwaarden"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_pack_zone
@@ -149,7 +149,7 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Buy"
-msgstr ""
+msgstr "Kopen"
 
 #. module: stock_location
 #: view:product.product:0
@@ -175,7 +175,7 @@ msgstr ""
 #: field:product.pulled.flow,company_id:0
 #: field:stock.location.path,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: stock_location
 #: view:product.product:0
@@ -195,23 +195,23 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Op order maken"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Maak op voorraad"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
 msgid "Partner Address"
-msgstr ""
+msgstr "Relatie Adres"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Te factureren"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
@@ -309,7 +309,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,type_proc:0
 msgid "Type of Procurement"
-msgstr ""
+msgstr "Verwervingswijze"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -319,7 +319,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -337,18 +337,18 @@ msgstr "Handmatige verwerking"
 #: model:ir.model,name:stock_location.model_product_product
 #: field:product.pulled.flow,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Verwervingsmethode"
 
 #. module: stock_location
 #: field:product.pulled.flow,picking_type:0
 #: field:stock.location.path,picking_type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Verzendwijze"
 
 #. module: stock_location
 #: help:product.pulled.flow,procure_method:0
diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po
index e92c61d4098..7ef92b47ebd 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 67fbb189e2d..a232623402d 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -512,11 +512,5 @@ msgstr "Zafakturowano"
 #~ msgid "Stock Location Paths"
 #~ msgstr "Ścieżki stref"
 
-#~ msgid "Logistics Flow"
-#~ msgstr "Przepływ logistyczny"
-
-#~ msgid "Location Source"
-#~ msgstr "Strefa źródłowa"
-
 #~ msgid "Procurement & Locations"
 #~ msgstr "Zapotrzebowanie i strefy"
diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po
index 3454799c257..d40a246fcea 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Move"
-msgstr ""
+msgstr "Mover"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
@@ -50,7 +50,7 @@ msgstr "Parâmetros"
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr "Localização fonte"
+msgstr "Localização de Origem"
 
 #. module: stock_location
 #: help:product.pulled.flow,cancel_cascade:0
@@ -77,7 +77,7 @@ msgstr ""
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr ""
+msgstr "Interno"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
@@ -90,7 +90,7 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr ""
+msgstr "Localização"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
@@ -164,7 +164,7 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Mover stock"
 
 #. module: stock_location
 #: view:product.product:0
@@ -200,7 +200,7 @@ msgstr "Produzir por encomenda"
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Produzir para stock"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
@@ -343,13 +343,13 @@ msgstr "Produto"
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Método de aprovisionamento."
 
 #. module: stock_location
 #: field:product.pulled.flow,picking_type:0
 #: field:stock.location.path,picking_type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Tipo de envio"
 
 #. module: stock_location
 #: help:product.pulled.flow,procure_method:0
@@ -358,6 +358,9 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"'Produzir para Stock': Quando necessário, tirar do stock ou esperar até o re-"
+"abastecimento. 'Produzir para Ordem de venda ': Quando necessário, comprar "
+"ou produzir para o pedido de aquisição."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
@@ -389,7 +392,7 @@ msgstr "Não aplicável"
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr "Atrasos (dias)"
+msgstr "Atraso (dias)"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:67
@@ -420,7 +423,7 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Aprovisionamento"
 
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index 786f47d8679..01d8dc62aec 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index b497758eaaa..6bd5e7dbec2 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-04-06 08:02+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
 "Language-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-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c588962fd8e..7ddbc31b0a9 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -50,7 +50,7 @@ msgstr "Параметры"
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr "Источник места хранения"
+msgstr "Место хранения источника"
 
 #. module: stock_location
 #: help:product.pulled.flow,cancel_cascade:0
@@ -514,15 +514,3 @@ msgstr "Счет"
 
 #~ msgid "stock.location.path"
 #~ msgstr "расположение патча"
-
-#~ msgid "Not from Picking"
-#~ msgstr "Не из комплектования"
-
-#~ msgid "Logistic Flow"
-#~ msgstr "Товарно-транспортный поток"
-
-#~ msgid "Location Source"
-#~ msgstr "Место хранения источника"
-
-#~ msgid "Logistics Flow"
-#~ msgstr "Товарно-транспортный поток"
diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po
index aedecb9ae52..840ed0fbbcf 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 146968c361a..bd311c78c1a 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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 921090c33bc..a12948a8dd9 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7e334044359..d4f922ac6fa 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 96a3382bed3..5e1252f5ad4 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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -77,7 +77,7 @@ msgstr "Gönderilecek Hedef Konumu tarafından kullanılan konum"
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr "Dahili"
+msgstr "İç"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po
index d5a609ebd13..85588c8c8ae 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9ad94a03033..8b8b6adb306 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 9ff6f230169..e2e132cd003 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-05-04 10:22+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-05-05 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -50,18 +50,18 @@ msgstr "参数"
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr "来源存货地点"
+msgstr "源库位"
 
 #. module: stock_location
 #: help:product.pulled.flow,cancel_cascade:0
 msgid "Allow you to cancel moves related to the product pull flow"
-msgstr "允许您取消推式流程相关的调拨"
+msgstr "允许您取消拉式流程相关的调拨"
 
 #. 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 "拉式流程"
 
 #. module: stock_location
 #: constraint:stock.move:0
@@ -71,7 +71,7 @@ msgstr "您必须为此产品赋予一个生产批次"
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
-msgstr "存货地点用在目标存货地点"
+msgstr "库位用于提供目标的库位"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -85,12 +85,12 @@ msgstr "内部"
 msgid ""
 "Pulled procurement coming from original location %s, pull rule %s, via "
 "original Procurement %s (#%d)"
-msgstr "拉式需求开始与来源存货地点 %s,拉式的规则 %s,通过源需求 %s (#%d)"
+msgstr "拉式需求来自源库位%s ,拉式规则 %s,通过源需求 %s (#%d)"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr "存货地点"
+msgstr "库位"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
@@ -113,15 +113,15 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"这些规则确定了产品在存货地点树中的正确移动路径.\n"
+"这些规则确定了产品在库位树中的正确移动路径.\n"
 "‘自动调拨’ 将在创建仓库调拨后自动确认.\n"
-" ‘手动操作’ 库存调拨需要人工确认.\n"
-" ‘自动不加入步骤’ 存货地点取代调拨的来源存货地点."
+"‘手动操作’ 库存调拨需要人工确认. \n"
+"‘自动不加入步骤’ 这库位取代调拨的源库位."
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Warehouse Locations Paths"
-msgstr "仓库存货地点路径"
+msgstr "仓库库位路径"
 
 #. module: stock_location
 #: view:product.product:0
@@ -131,7 +131,7 @@ msgstr "条件"
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_pack_zone
 msgid "Pack Zone"
-msgstr "包装区"
+msgstr "装箱区"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
@@ -213,7 +213,7 @@ msgstr "待开票"
 #. module: stock_location
 #: help:stock.location.path,delay:0
 msgid "Number of days to do this transition"
-msgstr "转换要的天数"
+msgstr "过程要的天数"
 
 #. module: stock_location
 #: model:ir.module.module,description:stock_location.module_meta_information
@@ -303,36 +303,38 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"这模块对库存管理增加推拉流程的应用.\n"
+"这模块对库存管理增加对每种产品的逻辑路径，推式和拉式的库存流程应用.\n"
+"\n"
 "它主要用在:\n"
-"* 管理产品的连锁生产.\n"
-"* 管理每个产品的默认存货地点.\n"
-"* 根据商业需要定义您的仓库路线如:\n"
-"        -质量控制\n"
-"        -售后服务\n"
-"        -供应商退货\n"
-"* 帮助租贷管理,为租用的产品自动生成退还调拨.\n"
+"  * 管理产品的生产链.\n"
+"  * 管理每个产品的默认库位.\n"
+"  * 根据业务需要定义您的仓库路线如:\n"
+"      -质量控制\n"
+"      -售后服务\n"
+"      -供应商退货\n"
+"  * 帮助租贷管理,为租用的产品自动生成退还调拨.\n"
 "\n"
-"一旦安装这个模块,在产品那增加一个tab,您可以加入推拉流程的规范,以产品cpu1为例:\n"
+"一旦安装这个模块,在产品界面增加一个标签,您可以加入拉式或推式流程,以产品cpu1为例:\n"
+"  推式流程\n"
 "\n"
-"推式流程\n"
-"在某些产品到达某一规划存货地点它将调拨到另一个存货地点,当然这需要经过一段时间.\n"
-"原来的系统已支持这种推式的操作(它叫连锁存货地点)但它不能精确到对每一个产品.\n"
-"一个推式流程需要指定相对应的连锁存货地点和一些参数如: "
-"指定源存货地点的产品数量,连锁调拨是自动按流程规划的参数产生(目标存货地点,耽搁,调拨的类型,凭证簿等),这些调拨可以自动处理也可根据参数人手确认.\n"
+"  在某些产品到达某一规划库位它将调拨到另一个库位,当然这需要经过一段时间.\n"
+"    原来的系统已支持这种拉式的操作(它叫连锁库位)但它不能精确到对每一个产品. \n"
+"    一个推式流程需要指定相对应的连锁库位和一些参数如: \n"
+"      指定源库位的产品数量,连锁调拨是自动按流程规划的参数产生(目标库位,耽搁,调拨的类型,账簿等),\n"
+"      这些调拨可以自动处理也可根据参数人手确认.\n"
 "\n"
-"拉式流程\n"
-"它不同与推式流程,从某种意义上说它是不相关产品的调拨,但它是相关需求处理的一部分.\n"
-"一个典型的例子:\n"
-"[ 客户 ] <- A - [ 卖场 ] <- B - [ 库存 ] <~ C ~ [ 供应商 ]\n"
-"当有一个需求单(销售单确认要A),来到卖场转化为B(通过推式流程\"调拨\"),再转化为对供应商C的采购订单(推式流程为采购).\n"
-"技术上拉式流程允许您处理不同的需求单,它不仅取决您要什么产品,还要看是哪个存货地点需要这产品.\n"
+"  拉式流程\n"
 "\n"
-"案例:\n"
-"    CPU1: 在商店1您销售CPU1并运行计划表(scheduler).\n"
-"             - 仓库送货单,商店1:收货. \n"
-"    CPU3: 产品收货时放在货架2 做来料质量检测的临时存货地点.\n"
-"             当给客户送货时: 包装列表 -> 装箱单 -> 送货单.\n"
+"    它不同与推式流程,从某种意义上说它是不相关产品的调拨,但它是相关需求单处理的部分.\n"
+"      一个典型的例子: [客户] <- A - [直销店] <- B - [仓库] <~ C ~ [供应商]\n"
+"      当有一个需求单(销售单确认要A),来到直销店转到B(通过推式流程\"调拨\"),再转化为对供应商C的采购订单(推式流程为采购).\n"
+"      技术上拉式流程允许您处理不同的需求单,它不仅取决您要什么产品,还要看是哪个库位需要这产品.\n"
+"    案例:\n"
+"      CPU1: 在商店1您销售CPU1并运行日程表(scheduler). \n"
+"        - 仓库送货单,商店1:收货. \n"
+"      CPU3: \n"
+"        - 产品收货时放在货架2 做来料质量检测的临时库位.\n"
+"        - 当给客户送货时: 装箱单 -> 送货单.\n"
 "    "
 
 #. module: stock_location
@@ -354,7 +356,7 @@ msgstr "名称"
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
-msgstr "这些规则确定了产品在整个存货地点树的正确路径"
+msgstr "这些规则确定了产品在整个库位树的正确路径。"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -376,7 +378,7 @@ msgstr "获得方式"
 #: field:product.pulled.flow,picking_type:0
 #: field:stock.location.path,picking_type:0
 msgid "Shipping Type"
-msgstr "运送类型"
+msgstr "货运类型"
 
 #. module: stock_location
 #: help:product.pulled.flow,procure_method:0
@@ -384,12 +386,14 @@ msgid ""
 "'Make to Stock': When needed, take from the stock or wait until re-"
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
-msgstr "按库存生产:  在仓库或等待重新供应时得到需求。按订单生产:  在采购或产品获得请求时得到需求。"
+msgstr ""
+"按库存生产: 在仓库或等待重新供应时得到需求.\r\n"
+"按订单生产: 在采购或产品获得请求时得到需求."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
 msgid "Is the destination location that needs supplying"
-msgstr "需要提供目标存货地点"
+msgstr "需要提供目标库位"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -400,7 +404,7 @@ msgstr "产品"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location via procurement %d"
-msgstr "通过需求%d 拉到另一个存货地点"
+msgstr "通过需求%d 拉到另一个库位"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
@@ -424,7 +428,7 @@ msgstr "延期(天)"
 msgid ""
 "Picking for pulled procurement coming from original location %s, pull rule "
 "%s, via original Procurement %s (#%d)"
-msgstr "拉式装箱单来自来源存货地点 %s,拉式规则 %s,通过原来的需求 %s (#%d)"
+msgstr "拉式装箱单来自源库位%s, 拉式规则 %s,通过源需求 %s (#%d)"
 
 #. module: stock_location
 #: field:product.product,path_ids:0
@@ -437,7 +441,7 @@ msgstr "推式流程"
 msgid ""
 "Move for pulled procurement coming from original location %s, pull rule %s, "
 "via original Procurement %s (#%d)"
-msgstr "拉式调拨需求来自源存货地点 %s,拉式规则 %s,通过原来的需求 %s (#%d)"
+msgstr "拉式调拨需求来自源库位 %s,拉式规则 %s,通过源需求 %s (#%d)"
 
 #. module: stock_location
 #: constraint:stock.move:0
@@ -452,7 +456,7 @@ msgstr "需求单"
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
-msgstr "目标存货地点"
+msgstr "目标库位"
 
 #. module: stock_location
 #: field:stock.location.path,auto:0
@@ -499,13 +503,13 @@ msgstr "操作"
 #: field:product.product,path_ids:0
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr "存货地点路径"
+msgstr "库位路径"
 
 #. module: stock_location
 #: field:product.pulled.flow,journal_id:0
 #: field:stock.location.path,journal_id:0
 msgid "Journal"
-msgstr "凭证簿"
+msgstr "账簿"
 
 #. module: stock_location
 #: field:product.pulled.flow,cancel_cascade:0
@@ -522,32 +526,6 @@ msgstr "已开票"
 #~ msgid "Stock Location Paths"
 #~ msgstr "库存库位路径"
 
-#~ msgid ""
-#~ "\n"
-#~ "Manages product's path in locations.\n"
-#~ "\n"
-#~ "This module may be useful for different purposes:\n"
-#~ "* Manages the product in his whole manufacturing chain\n"
-#~ "* Manages different default locations by products\n"
-#~ "* Define paths within the warehouse to route products based on operations:\n"
-#~ "   - Quality Control\n"
-#~ "   - After Sales Services\n"
-#~ "   - Supplier Return\n"
-#~ "* Manage products to be rent.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "管理产品的库位路径\n"
-#~ "\n"
-#~ " 这模块可能有不同的目的:\n"
-#~ "\t*在整个工业链管理产品\n"
-#~ "\t*基于运营为产品定义仓库的路径\n"
-#~ "\t- 质量控制\n"
-#~ "\t- 售后服务\n"
-#~ "\t- 供应退货\n"
-#~ "\t*管理产品免租\n"
-#~ "    "
-
 #~ msgid "Procurement & Locations"
 #~ msgstr "产品需求&库位"
 
diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po
index fa3eaa5cab2..7a2aebb369c 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: 2011-04-29 05:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:37+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7122e5ccd12..0846fe067eb 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -121,4 +121,6 @@ class procurement_order(osv.osv):
             wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
         return False
 
-procurement_order()
\ No newline at end of file
+procurement_order()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/security/stock_location_security.xml b/addons/stock_location/security/stock_location_security.xml
new file mode 100644
index 00000000000..880f5de70da
--- /dev/null
+++ b/addons/stock_location/security/stock_location_security.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+<!-- multi -->
+     <record model="ir.rule" id="product_pulled_flow_comp_rule">
+        <field name="name">product_pulled_flow multi-company</field>
+        <field name="model_id" ref="model_product_pulled_flow"/>
+        <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_location_path_comp_rule">
+        <field name="name">stock_location_path multi-company</field>
+        <field name="model_id" ref="model_stock_location_path"/>
+        <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_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index 557162c725d..dec830b2d77 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -28,7 +28,7 @@
   I create a account type Receivable.
 -
   !record {model: account.account.type, id: account_account_type_receivable0}:
-    close_method: balance
+    close_method: unreconciled
     code: receivable_test
     name: Receivable For Tests
     sign: 1
@@ -126,7 +126,7 @@
   I create a product and define the pulled flow condition for stock move.
   I set shipping type Sending Goods. and set Procurement type to move.
 -
-  !record {model: product.product, id: product_product_hpcdwriters0}:
+  !record {model: product.product, id: product_product_hpcdwriters01}:
     categ_id: product_category_computer0
     cost_method: standard
     list_price: 1000.0
@@ -179,7 +179,7 @@
     name: Testing pulled flow
     priority: '1'
     procure_method: make_to_order
-    product_id: product_product_hpcdwriters0
+    product_id: product_product_hpcdwriters01
     product_qty: 5.0
     product_uom: product.product_uom_unit
     product_uos: product.product_uom_unit
@@ -194,15 +194,7 @@
   !python {model: procurement.order.compute.all}: |
     proc_obj = self.pool.get('procurement.order')
     proc_obj._procure_confirm(cr,uid)
--
-  I check the state of procurement order is cancel and stock move is cancel.
--
-  !python {model: procurement.order }: |
-   from tools.translate import _
-   procurement_ids=self.search(cr, uid, [('id', '=', ref('procurement_order_test0'))])
-   if procurement_ids:
-    order=self.browse(cr,uid,procurement_ids)[0]
-    assert(order.state=='cancel')
+
 -
   I check the new procurement order has been created .
 -
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index db2ae388317..b6a938e99e5 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -33,7 +33,7 @@
   I set the chain location Supplier to stock Input
   Stock Input to Quality test and Quality test -Stock  .
 -
-  !record {model: product.product, id: product_product_hpcdwriters0}:
+  !record {model: product.product, id: product_product_hpcdwriters01}:
     categ_id: product_category_computer0
     cost_method: standard
     list_price: 1000.0
@@ -72,7 +72,7 @@
         location_dest_id: stock.stock_location_stock
         location_id: stock.stock_location_suppliers
         name: 'HP CD writers'
-        product_id: product_product_hpcdwriters0
+        product_id: product_product_hpcdwriters01
         product_qty: 6.0
         product_uom: product.product_uom_unit
         product_uos_qty: 6.0
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 9b12ac49c34..bd5629579cc 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Stock No Auto-Picking',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Hidden',
     'description': """
 This module allows an intermediate picking process to provide raw materials to production orders.
 =================================================================================================
diff --git a/addons/stock_no_autopicking/i18n/ar.po b/addons/stock_no_autopicking/i18n/ar.po
index 02b351ccde8..8e2ae5020d9 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6a5d6f91316..eca383b6dbc 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b2fd5ca8c1f..c9281e2ba80 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 55b2e1a8bea..d7991ff57ea 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 e41464d4db7..2ad131f684c 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 353bde7dac2..bdd4c196c8f 100644
--- a/addons/stock_no_autopicking/i18n/da.po
+++ b/addons/stock_no_autopicking/i18n/da.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-11-17 10:53+0000\n"
-"Last-Translator: SmartWi <kurt@smartwi.net>\n"
+"PO-Revision-Date: 2011-11-08 11:54+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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,description:stock_no_autopicking.module_meta_information
@@ -42,32 +42,32 @@ msgstr ""
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Produktionsordre"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "Autmatisk træk"
+msgstr "Automatisk plukning"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr "Automatisk træk af råmartiale i produktions order."
+msgstr "Automatisk plukning af råmatriale i produktionsordre"
 
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fejl: Forkert EAN-kode"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr "Lager Ingen automatisk træk"
+msgstr "Ingen automatisk lagerplukning"
 
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Ordre antal kan ikke være negativ eller 0."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ugyldig XML for View Architecture!"
diff --git a/addons/stock_no_autopicking/i18n/de.po b/addons/stock_no_autopicking/i18n/de.po
index 135791a59f4..a9d5a351c5d 100644
--- a/addons/stock_no_autopicking/i18n/de.po
+++ b/addons/stock_no_autopicking/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -86,18 +86,3 @@ msgstr "Bestellmengen können nicht negativ oder '0' sein !"
 
 #~ 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 \r\n"
-#~ "beinhalten"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/stock_no_autopicking/i18n/el.po b/addons/stock_no_autopicking/i18n/el.po
index 525b030a6e1..472eab54a4e 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f2c7e05dc6e..a960e8ca0b3 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -83,18 +83,3 @@ msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
 
 #~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/stock_no_autopicking/i18n/es_AR.po b/addons/stock_no_autopicking/i18n/es_AR.po
index f939136ea14..f1240363f3f 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..e476986a462
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/es_CL.po
@@ -0,0 +1,83 @@
+# 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: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-10-24 19:35+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: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid ""
+"\n"
+"    This module allows an intermediate picking process to provide raw "
+"materials\n"
+"    to production orders.\n"
+"\n"
+"    One example of usage of this module is to manage production made by "
+"your\n"
+"    suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"    which is sub-contracted to \"No Auto-Picking\" and put the location of "
+"the\n"
+"    supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite un proceso de recogida intermedio para proveer "
+"materias\n"
+"    primas a las órdenes de fabricación.\n"
+"\n"
+"    Un ejemplo de uso de este módulo es gestionar la producción realizada "
+"por sus\n"
+"    proveedores (subcontratación). Para conseguir esto, establezca los "
+"productos ensamblados\n"
+"    que serán subcontratados a \"No Auto-Recogida\" y establezca la "
+"ubicación del nuevo\n"
+"    proveedor en el proceso de la operación de ensamblado.\n"
+"    "
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "Auto empaquetado"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr "Auto empaquetado para materiales a granel en órdenes de producción."
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
+msgid "Stock No Auto-Picking"
+msgstr "Stock no auto empaquetado"
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
diff --git a/addons/stock_no_autopicking/i18n/es_MX.po b/addons/stock_no_autopicking/i18n/es_MX.po
new file mode 100644
index 00000000000..7586ba33c8e
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/es_MX.po
@@ -0,0 +1,85 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_no_autopicking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2010-12-29 13: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: 2011-09-05 05:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid ""
+"\n"
+"    This module allows an intermediate picking process to provide raw "
+"materials\n"
+"    to production orders.\n"
+"\n"
+"    One example of usage of this module is to manage production made by "
+"your\n"
+"    suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"    which is sub-contracted to \"No Auto-Picking\" and put the location of "
+"the\n"
+"    supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite un proceso de recogida intermedio para proveer "
+"materias\n"
+"    primas a las órdenes de fabricación.\n"
+"\n"
+"    Un ejemplo de uso de este módulo es gestionar la producción realizada "
+"por sus\n"
+"    proveedores (subcontratación). Para conseguir esto, establezca los "
+"productos ensamblados\n"
+"    que serán subcontratados a \"No Auto-Recogida\" y establezca la "
+"ubicación del nuevo\n"
+"    proveedor en el proceso de la operación de ensamblado.\n"
+"    "
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "Auto empaquetado"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr "Auto empaquetado para materiales a granel en órdenes de producción."
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
+msgid "Stock No Auto-Picking"
+msgstr "Stock no auto empaquetado"
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/stock_no_autopicking/i18n/es_VE.po b/addons/stock_no_autopicking/i18n/es_VE.po
new file mode 100644
index 00000000000..7586ba33c8e
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/es_VE.po
@@ -0,0 +1,85 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_no_autopicking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2010-12-29 13: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: 2011-09-05 05:36+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid ""
+"\n"
+"    This module allows an intermediate picking process to provide raw "
+"materials\n"
+"    to production orders.\n"
+"\n"
+"    One example of usage of this module is to manage production made by "
+"your\n"
+"    suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"    which is sub-contracted to \"No Auto-Picking\" and put the location of "
+"the\n"
+"    supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo permite un proceso de recogida intermedio para proveer "
+"materias\n"
+"    primas a las órdenes de fabricación.\n"
+"\n"
+"    Un ejemplo de uso de este módulo es gestionar la producción realizada "
+"por sus\n"
+"    proveedores (subcontratación). Para conseguir esto, establezca los "
+"productos ensamblados\n"
+"    que serán subcontratados a \"No Auto-Recogida\" y establezca la "
+"ubicación del nuevo\n"
+"    proveedor en el proceso de la operación de ensamblado.\n"
+"    "
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden de fabricación"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "Auto empaquetado"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr "Auto empaquetado para materiales a granel en órdenes de producción."
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
+msgid "Stock No Auto-Picking"
+msgstr "Stock no auto empaquetado"
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/stock_no_autopicking/i18n/et.po b/addons/stock_no_autopicking/i18n/et.po
index 588fd293a53..b1b891a8dd5 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 36344c33350..474c0819dda 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5d06a25aa6d..84070502fe8 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-01-13 02:32+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 50bf7d70ab9..9b492fd3178 100644
--- a/addons/stock_no_autopicking/i18n/gl.po
+++ b/addons/stock_no_autopicking/i18n/gl.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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,description:stock_no_autopicking.module_meta_information
@@ -39,11 +39,22 @@ msgid ""
 "    supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo permite un proceso de selección intermedia para proporcionar "
+"materias primas\n"
+"    a ordes de produción.\n"
+"\n"
+"    Un exemplo de uso deste módulo é xestionar a produción feita polos seus\n"
+"    provedores (subcontratación). Para conseguir isto, establece o produto "
+"montado\n"
+"    que é sub-contratado a \"No Auto-Selección\" e poñer a localización do\n"
+"    provedor no enrutamento da operación de montaxe.\n"
+"    "
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Orde de fabricación"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
@@ -58,7 +69,7 @@ msgstr "Auto empaquetado para materiais a granel en órdes de produción."
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erro: Código EAN non válido"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -68,7 +79,7 @@ msgstr "Stock non auto empaquetado"
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "¡A cantidade do pedido non pode ser negativa ou cero!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML non válido para a definición da vista!"
diff --git a/addons/stock_no_autopicking/i18n/hr.po b/addons/stock_no_autopicking/i18n/hr.po
index 0b3b39cd723..d4669d1fc5a 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 dbd35328bd4..1c05856833b 100644
--- a/addons/stock_no_autopicking/i18n/hu.po
+++ b/addons/stock_no_autopicking/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-01-24 17:50+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ea8fc006e78..83fe5192617 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7d0584b06ca..179617a314c 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -46,7 +46,7 @@ msgstr "Ordine di Produzione"
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "Scelta Automatica"
+msgstr "Prelievo Automatico"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
@@ -70,18 +70,3 @@ msgstr "La quantità ordinata non può essere negativa o zero !"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere inferiore ad 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index 9c221919ac9..a61811fdf14 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a7e235ce3bb..2d067bff13a 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 07cf65f7586..a42da5cef9e 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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 1e52fffce62..83c7f8b38b5 100644
--- a/addons/stock_no_autopicking/i18n/nl.po
+++ b/addons/stock_no_autopicking/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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/nl_BE.po b/addons/stock_no_autopicking/i18n/nl_BE.po
index 4c911e9a59d..a8d9866df1c 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..2e8cda677ab
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/oc.po
@@ -0,0 +1,70 @@
+# 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: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-11-20 09:30+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Produch"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid ""
+"\n"
+"    This module allows an intermediate picking process to provide raw "
+"materials\n"
+"    to production orders.\n"
+"\n"
+"    One example of usage of this module is to manage production made by "
+"your\n"
+"    suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"    which is sub-contracted to \"No Auto-Picking\" and put the location of "
+"the\n"
+"    supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Òrdre de fabricacion"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "Prelevament automatic"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr ""
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error : Còde ean invalid"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
+msgid "Stock No Auto-Picking"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
diff --git a/addons/stock_no_autopicking/i18n/pl.po b/addons/stock_no_autopicking/i18n/pl.po
index 9ca6b6adab4..9e6f942f7bc 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f321a56a40a..693953f2367 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -70,18 +70,3 @@ msgstr "A quantidade numa encomenda não pode ser igual ou inferior a zero!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
diff --git a/addons/stock_no_autopicking/i18n/pt_BR.po b/addons/stock_no_autopicking/i18n/pt_BR.po
index 2f4d9283184..155674f26d3 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -81,18 +81,3 @@ msgstr "Quantidade do pedido não pode ser negativa ou zero !"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
diff --git a/addons/stock_no_autopicking/i18n/ro.po b/addons/stock_no_autopicking/i18n/ro.po
index 09bc4bdb7c8..71d36f912ac 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f4b5b5857d0..c2cc5811f78 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -38,7 +38,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    Этот модуль организует промежуточный процесс комплектования сырьем \n"
+"    Этот модуль организует промежуточный процесс комплектования сырьем\n"
 "    производственных заказов.\n"
 "\n"
 "    Примером использования этого модуля может быть управление производством\n"
@@ -72,7 +72,7 @@ msgstr "Ошибка: Неправильный штрих-код"
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr "Запасы без авто-комплектации"
+msgstr "ТМЦ без авто-комплектации"
 
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
@@ -81,18 +81,3 @@ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/stock_no_autopicking/i18n/sl.po b/addons/stock_no_autopicking/i18n/sl.po
index b6843ab8105..1d7f3b2e474 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -56,7 +56,7 @@ msgstr "Samodejna izbira za surove materiale nalogov za proizvodnjo"
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Napaka: neveljavna EAN črtna koda"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -66,21 +66,7 @@ msgstr "Samodejna izbira številke zaloge"
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Količina v naročilu ne more biti nič ali negativna."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Dolžina polja ne sme biti nikoli manj od 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
diff --git a/addons/stock_no_autopicking/i18n/sq.po b/addons/stock_no_autopicking/i18n/sq.po
index a35df938cc3..ace6f9e1e9b 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:32+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..fba04fbc86d
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/sr@latin.po
@@ -0,0 +1,70 @@
+# Serbian Latin 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-03 16:58+0000\n"
+"PO-Revision-Date: 2011-10-17 13:45+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: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid ""
+"\n"
+"    This module allows an intermediate picking process to provide raw "
+"materials\n"
+"    to production orders.\n"
+"\n"
+"    One example of usage of this module is to manage production made by "
+"your\n"
+"    suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"    which is sub-contracted to \"No Auto-Picking\" and put the location of "
+"the\n"
+"    supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Nalog proizvodnje"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "Automatsko biranje"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr "Automatsko biranje za sirove materijale u nalozima za proizvodnju"
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Greška: Nevažeći ean kod"
+
+#. module: stock_no_autopicking
+#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
+msgid "Stock No Auto-Picking"
+msgstr "Uskladišti automatsko biranje"
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Količina narudžbe ne može biti negativna ili nula !"
diff --git a/addons/stock_no_autopicking/i18n/sv.po b/addons/stock_no_autopicking/i18n/sv.po
index acce5473da4..5d4f855365b 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b9109fc1f23..3633d66521a 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 d8e5d470883..8e35a4a5bb7 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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 002c407812b..2ff973e55b7 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a04b72e3e7b..2db2f6a0608 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5caa686311f..e9f4feb7d52 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2011-05-03 15:11+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-05-04 04:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\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 09d4c316734..fbe7b69ab86 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: 2011-04-29 05:32+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:33+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/test/stock_no_autopicking.yml b/addons/stock_no_autopicking/test/stock_no_autopicking.yml
index 99c2db37177..f3620ce655e 100644
--- a/addons/stock_no_autopicking/test/stock_no_autopicking.yml
+++ b/addons/stock_no_autopicking/test/stock_no_autopicking.yml
@@ -142,11 +142,9 @@
     product_uos_qty: 0.0
     bom_id: mrp_bom_cupoftea0
     routing_id: mrp_routing_productionrouting0
-    company_id: base.main_company
     date_planned: !eval time.strftime('%Y-%m-%d %H:%M:%S')
     location_dest_id: stock.stock_location_stock
     location_src_id: stock.stock_location_stock
-    name: MO/00002
 -
   I compute the data of production order.
 -
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index bb726d1013b..e3043758b94 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -20,94 +20,129 @@
 ##############################################################################
 
 {
-    "name":"Master Procurement Schedule",
-    "version":"1.1",
-    "author":["OpenERP SA",  "Grzegorz Grzelak (Cirrus)"],
-    "category":"Warehouse",
-    "images":["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"],
-    "depends":["hr","stock","sale"],
+    "name": "Master Procurement Schedule",
+    "version": "1.2",
+    "author": "OpenERP SA and Grzegorz Grzelak (OpenGLOBE)",
+    "category": "Hidden",
+    "images": ["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"],
+    "depends": ["crm", "stock","sale"],
+    "complexity": "expert",
     "description": """
-Purpose of MPS is to allow create a manual procurement apart of MRP scheduler (which works automatically on minimum stock rules).
-=================================================================================================================================
+MPS allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules
+=========================================================================================================================================
 
-This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule.
-Terms used in the module:
-- 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.
-- Stock and Sales Forecast - is the quantity of products you plan to sell in the Period.
-- Stock Planning - is the quantity of products you plan to purchase or produce for the Period.
+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.
 
-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.
+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.
 
-Activity with this module is divided to three steps:
-- Creating Periods. Mandatory step.
-- Creating Sale Forecasts and entering quantities to them. Optional step but useful for further planning.
-- Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period.
+Where to begin
+--------------
+Using this module is done in three steps:
 
-Periods
--------
-You have two menu items for Periods in "Sales Management - Configuration". There are:
-- "Create Sales Periods" - Which automates creating daily, weekly or monthly periods.
-- "Stock and sales Periods" - Which allows to create any type of periods, change the dates and change the State of period.
+ * 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.
 
-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.
+Stock Period configuration
+--------------------------
+You have two menu items for Periods in "Warehouse > Configuration > Stock Periods". There are:
 
-Remarks:
-- These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system.
-- 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.
-- 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.
+ * "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.
 
-Sales Forecasts
----------------
-You have few menus for Sales forecast in "Sales Management - Sales Forecasts".
-- "Create Sales Forecasts for Sales Periods" - which automates creating forecasts lines according to some parameters.
-- "Sales Forecasts" - few menus for working with forecasts lists and forms.
-
-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.
-
-Remarks:
-- 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.
-- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse.
-- 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).
-
-
-Menus "Sales Forecasts"
-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 can enter amount of forecast sales in field "Product Amount". 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 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.
-
-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 your department (at the top) then (to the left): last period, period before last and period year ago.
+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.
 
-Procurement Planning
---------------------
-Menu for Planning you can find in "Warehouse - Stock Planning".
-- "Create Stock Planning Lines" - allows you to automate creating planning lines according to some parameters.
-- "Master Procurement Scheduler" - is the most important menu of the module which allows to create procurement.
+Sales Forecasts configuration
+-----------------------------
+You have few menus for Sales forecast in "Sales > Sales Forecasts":
 
-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".
+ - "Create Sales Forecasts" - can automatically create forecast lines according to your needs
+ - "Sales Forecasts" - for managing the Sales forecasts
 
-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.
+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.
 
-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.
-"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.
-"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".
+Remarks:
 
-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.
+ - 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.
 
-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".
+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.
 
-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".
+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 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.
+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.
 
-How Stock Simulation field is calculated:
-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.
+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 =
@@ -124,9 +159,12 @@ Stock Simulation =
 	- Planned Out of calculated Period
 	+ Planned In of calculated Period .
 
-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).
+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 calculate Period ahead:
+When you plan for future Periods:
 
 Stock Simulation =
 	Stock of beginning of current Period
@@ -135,15 +173,23 @@ Stock Simulation =
 	- Planned Out of calculated Period
 	+ Planned In of calculated Period.
 
-Periods before calculated means periods starting from current till period before calculated.
+Here "Periods before calculated" designates all periods starting with the current until the period before the one being calculated.
 
 Remarks:
-- Remember to make planning for all periods before calculated because omitting these quantities and procurements can cause wrong suggestions for procurements few periods ahead.
-- 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.
-- 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.
+
+ - 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.
 """,
-    "demo_xml":[],
-    "update_xml": [
+    "data": [
+        "security/stock_planning_security.xml",
         "security/ir.model.access.csv",
         "stock_planning_view.xml",
         "wizard/stock_planning_create_periods_view.xml",
diff --git a/addons/stock_planning/i18n/bg.po b/addons/stock_planning/i18n/bg.po
index 56aa20784fd..ad78eb0049a 100644
--- a/addons/stock_planning/i18n/bg.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -71,7 +71,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr ""
@@ -429,7 +429,7 @@ msgstr "Категория на продукта"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Грешка!"
diff --git a/addons/stock_planning/i18n/ca.po b/addons/stock_planning/i18n/ca.po
index d5e6a41a5bf..4a7f2935aaf 100644
--- a/addons/stock_planning/i18n/ca.po
+++ b/addons/stock_planning/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:16+0000\n"
-"PO-Revision-Date: 2011-03-06 00:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 22:47+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -23,6 +23,8 @@ msgstr ""
 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
@@ -31,22 +33,25 @@ msgid ""
 "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 ""
+msgstr "Regla màxim"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_company:0
 msgid "This Copmany Period1"
-msgstr ""
+msgstr "Aquesta empresa període1"
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_amt:0
@@ -54,13 +59,15 @@ 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:621
 #: code:addons/stock_planning/stock_planning.py:663
 #, python-format
 msgid "Incoming Left must be greater than 0 !"
-msgstr ""
+msgstr "Entrades restants ha de ser major que 0!"
 
 #. module: stock_planning
 #: help:stock.planning,outgoing_before:0
@@ -68,12 +75,15 @@ 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
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
-msgstr ""
+msgstr "No hi ha productes en la categoria seleccionada!"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,warehouse_id:0
@@ -81,41 +91,44 @@ 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 ""
+msgstr "Sortides previstes"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: stock_planning
 #: field:stock.planning,incoming_left:0
 msgid "Incoming Left"
-msgstr ""
+msgstr "Entrades restants"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Requisition history"
-msgstr ""
+msgstr "Historial comandes"
 
 #. module: stock_planning
 #: view:stock.sale.forecast.createlines:0
 msgid "Create Forecasts Lines"
-msgstr ""
+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 ""
+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 ""
+msgstr "Crea períodes diaris"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -125,7 +138,7 @@ msgstr ""
 #: field:stock.sale.forecast,company_id:0
 #: field:stock.sale.forecast.createlines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:640
@@ -135,6 +148,8 @@ msgid ""
 "\n"
 " Initial Stock: "
 msgstr ""
+"\n"
+" Estoc inicial: "
 
 #. module: stock_planning
 #: help:stock.planning,warehouse_forecast:0
@@ -142,32 +157,35 @@ 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
 #: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
 msgid "Create Stock and Sales Periods"
-msgstr ""
+msgstr "Crea períodes d'estoc i vendes"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Minimum Stock Rule Indicators"
-msgstr ""
+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 ""
+msgstr "Període al que concerneixen les previsions."
 
 #. module: stock_planning
 #: field:stock.planning,stock_only:0
 msgid "Stock Location Only"
-msgstr ""
+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
 #: help:stock.planning,procure_to_stock:0
@@ -175,16 +193,19 @@ 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."
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Current Period Situation"
-msgstr ""
+msgstr "Situació del període actual"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Monthly Periods"
-msgstr ""
+msgstr "Crea períodes mensuals"
 
 #. module: stock_planning
 #: help:stock.planning,supply_warehouse_id:0
@@ -192,69 +213,73 @@ 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'."
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period_createlines
 msgid "stock.period.createlines"
-msgstr ""
+msgstr "estoc.període.crealínies"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing_before:0
 msgid "Planned Out Before"
-msgstr ""
+msgstr "Sortides planificades abans"
 
 #. module: stock_planning
 #: field:stock.planning.createlines,forecasted_products:0
 msgid "All Products with Forecast"
-msgstr ""
+msgstr "Tots els productes amb previsió"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Periods :"
-msgstr ""
+msgstr "Períodes :"
 
 #. 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/stock_planning.py:644
 #: code:addons/stock_planning/stock_planning.py:686
 #, python-format
 msgid "    Confirmed In Before: "
-msgstr ""
+msgstr "    Entrades confirmades abans: "
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Stock and Sales Forecast"
-msgstr ""
+msgstr "Previsions d'estoc i vendes"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast
 msgid "stock.sale.forecast"
-msgstr ""
+msgstr "estoc.vendes.previsió"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_dept_id:0
 msgid "This Department"
-msgstr ""
+msgstr "Aquest departament"
 
 #. module: stock_planning
 #: field:stock.planning,to_procure:0
 msgid "Planned In"
-msgstr ""
+msgstr "Entrades planificades"
 
 #. module: stock_planning
 #: field:stock.planning,stock_simulation:0
 msgid "Stock Simulation"
-msgstr ""
+msgstr "Simulació d'estoc"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning_createlines
 msgid "stock.planning.createlines"
-msgstr ""
+msgstr "estoc.planificació.crealínies"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_before:0
@@ -263,21 +288,26 @@ msgid ""
 "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 ""
+msgstr "Cerca previsions de vendes"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_user:0
 msgid "This User Period5"
-msgstr ""
+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
@@ -285,51 +315,53 @@ 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 ""
+msgstr "Aquest usuari periode1"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_user:0
 msgid "This User Period3"
-msgstr ""
+msgstr "Aquest usuari periode3"
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
 #: view:stock.planning:0
 msgid "Stock Planning"
-msgstr ""
+msgstr "Planificació d'estoc"
 
 #. module: stock_planning
 #: field:stock.planning,minimum_op:0
 msgid "Minimum Rule"
-msgstr ""
+msgstr "Regla de mínims"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Procure Incoming Left"
-msgstr ""
+msgstr "Entrades proveïment restant"
 
 #. 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 ""
+msgstr "    Entrades restant: "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:719
 #, python-format
 msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
+msgstr "%s Llista de selecció %s (%s,  %s) %s %s \n"
 
 #. module: stock_planning
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Create"
-msgstr ""
+msgstr "Crea"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
@@ -337,14 +369,14 @@ msgstr ""
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning
 #: view:stock.planning:0
 msgid "Master Procurement Schedule"
-msgstr ""
+msgstr "Pla mestre de proveïment"
 
 #. 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 ""
+msgstr "  Data de creació: "
 
 #. module: stock_planning
 #: field:stock.planning,period_id:0
@@ -352,7 +384,7 @@ msgstr ""
 #: field:stock.sale.forecast,period_id:0
 #: field:stock.sale.forecast.createlines,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Període"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -360,22 +392,22 @@ msgstr ""
 #: field:stock.planning,state:0
 #: field:stock.sale.forecast,state:0
 msgid "State"
-msgstr ""
+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 ""
+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 ""
+msgstr "període estoc"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
 msgid "stock.sale.forecast.createlines"
-msgstr ""
+msgstr "estoc.venda.previsió.crealínies"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_id:0
@@ -383,7 +415,7 @@ msgstr ""
 #: field:stock.sale.forecast,warehouse_id:0
 #: field:stock.sale.forecast.createlines,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Magatzem"
 
 #. module: stock_planning
 #: help:stock.planning,stock_simulation:0
@@ -395,32 +427,40 @@ msgid ""
 "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
 #: field:stock.sale.forecast,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Search Stock Planning"
-msgstr ""
+msgstr "Cerca planificació d'estoc"
 
 #. module: stock_planning
 #: field:stock.planning,incoming_before:0
 msgid "Incoming Before"
-msgstr ""
+msgstr "Entrades abans"
 
 #. module: stock_planning
 #: field:stock.planning.createlines,product_categ_id:0
 #: field:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Categoria del producte"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:621
@@ -428,7 +468,7 @@ msgstr ""
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Error!"
@@ -437,12 +477,12 @@ msgstr "Error!"
 #: code:addons/stock_planning/stock_planning.py:626
 #, python-format
 msgid "Manual planning for %s"
-msgstr ""
+msgstr "Manual per a la planificació de %s"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_user_id:0
 msgid "This User"
-msgstr ""
+msgstr "Aquest usuari"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:643
@@ -452,21 +492,23 @@ msgid ""
 "\n"
 " Confirmed Out: "
 msgstr ""
+"\n"
+" Sortides confirmades: "
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecasts"
-msgstr ""
+msgstr "Previsions"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Supply from Another Warehouse"
-msgstr ""
+msgstr "Proveir des d'un altre magatzem"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculate Planning"
-msgstr ""
+msgstr "Calcula planificació"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:636
@@ -493,54 +535,56 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:140
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Acció no vàlida!"
 
 #. module: stock_planning
 #: help:stock.planning,stock_start:0
 msgid "Stock quantity one day before current period."
-msgstr ""
+msgstr "Quantitat d'estoc un dia abans del període actual."
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Weekly Periods"
-msgstr ""
+msgstr "Crea períodes setmanals"
 
 #. module: stock_planning
 #: help:stock.planning,maximum_op:0
 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."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:665
 #, python-format
 msgid "You must specify a Source Warehouse !"
-msgstr ""
+msgstr "Heu d'especificar un magatzem origen!"
 
 #. module: stock_planning
 #: view:stock.planning.createlines:0
 msgid "Creates planning lines for selected period and warehouse."
-msgstr ""
+msgstr "Crea línies de planificació per al període i almacen seleccionats."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
-msgstr ""
+msgstr "Aquest usuari període 4"
 
 #. 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 ""
+msgstr "Nota: No duplica les línies creades per vostè."
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Stock and Sales Period"
-msgstr ""
+msgstr "Període d'estoc i vendes"
 
 #. module: stock_planning
 #: field:stock.planning,company_forecast:0
 msgid "Company Forecast"
-msgstr ""
+msgstr "Previsió de la companyia"
 
 #. module: stock_planning
 #: help:stock.planning,product_uom:0
@@ -549,60 +593,63 @@ 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)."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per User :"
-msgstr ""
+msgstr "Per usuari :"
 
 #. 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 ""
+msgstr "Previsions de vendes"
 
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Nom del període"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,user_id:0
 msgid "Created/Validated by"
-msgstr ""
+msgstr "Creat/Validat per"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Internal Supply"
-msgstr ""
+msgstr "Subministrament intern"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_company:0
 msgid "This Company Period4"
-msgstr ""
+msgstr "El període d'aquesta companyia4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_company:0
 msgid "This Company Period5"
-msgstr ""
+msgstr "El període d'aquesta companyia5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
-msgstr ""
+msgstr "El període d'aquesta companyia2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_company:0
 msgid "This Company Period3"
-msgstr ""
+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 ""
+msgstr "Data d'inici"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:642
@@ -612,11 +659,13 @@ msgid ""
 "\n"
 " Already Out: "
 msgstr ""
+"\n"
+" Sortides realitzades: "
 
 #. module: stock_planning
 #: field:stock.planning,confirmed_forecasts_only:0
 msgid "Validated Forecasts"
-msgstr ""
+msgstr "Previsions validades"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,product_categ_id:0
@@ -624,39 +673,42 @@ 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 ""
+msgstr "Sortides planificades"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Department :"
-msgstr ""
+msgstr "Per departament:"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
-msgstr ""
+msgstr "Previsió"
 
 #. module: stock_planning
 #: selection:stock.period,state:0
 #: selection:stock.planning,state:0
 #: selection:stock.sale.forecast,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancat"
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Warehouse "
-msgstr ""
+msgstr "Magatzem "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:646
@@ -666,11 +718,13 @@ msgid ""
 "\n"
 " Expected Out: "
 msgstr ""
+"\n"
+" Sortides previstes: "
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create periods for Stock and Sales Planning"
-msgstr ""
+msgstr "Crea períodes per la planificació d'estoc i vendes"
 
 #. module: stock_planning
 #: help:stock.planning,planned_outgoing:0
@@ -679,6 +733,11 @@ msgid ""
 "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
 #: model:ir.module.module,description:stock_planning.module_meta_information
@@ -912,12 +971,264 @@ msgid ""
 "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"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:140
 #, python-format
 msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
+msgstr "No es poden esborrar previsions de vendes validades !"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:641
@@ -927,6 +1238,8 @@ msgid ""
 "\n"
 " Planned Out: "
 msgstr ""
+"\n"
+" Sortides planificades: "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:667
@@ -935,29 +1248,31 @@ 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
 #: 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 ""
+msgstr "Crea previsions de vendes"
 
 #. module: stock_planning
 #: view:stock.sale.forecast.createlines:0
 msgid "Creates forecast lines for selected warehouse and period."
-msgstr ""
+msgstr "Crea línies de previsió per al magatzem i període seleccionats."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:656
 #, python-format
 msgid "%s Requisition (%s,  %s) %s %s \n"
-msgstr ""
+msgstr "%s requisició (%s,  %s) %s %s \n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:655
 #, python-format
 msgid "Requisition ("
-msgstr ""
+msgstr "Sol·licitud ("
 
 #. module: stock_planning
 #: help:stock.planning,outgoing_left:0
@@ -966,120 +1281,123 @@ msgid ""
 "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."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_id:0
 msgid "Period4"
-msgstr ""
+msgstr "Període4"
 
 #. 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 ""
+msgstr "    Entrades realitzades: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_id:0
 msgid "Period2"
-msgstr ""
+msgstr "Període2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_id:0
 msgid "Period3"
-msgstr ""
+msgstr "Període3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_id:0
 msgid "Period1"
-msgstr ""
+msgstr "Període1"
 
 #. 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 ""
+msgstr "    Estoc mínim: "
 
 #. module: stock_planning
 #: field:stock.planning,active_uom:0
 #: field:stock.sale.forecast,active_uom:0
 msgid "Active UoM"
-msgstr ""
+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 ""
+msgstr "Crea línies de planificació d'estoc"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "General Info"
-msgstr ""
+msgstr "Informació general"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
 msgid "Sales Forecast"
-msgstr ""
+msgstr "Previsió de vendes"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Planning and Situation for Calculated Period"
-msgstr ""
+msgstr "Planificació i situació per al període calculat"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
 msgid "This Warehouse Period1"
-msgstr ""
+msgstr "Peridodo d'aquest magatzem1"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_forecast:0
 msgid "Warehouse Forecast"
-msgstr ""
+msgstr "Previsió magatzem"
 
 #. 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 ""
+msgstr "    Entrades confirmades: "
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Sales history"
-msgstr ""
+msgstr "Històric de vendes"
 
 #. module: stock_planning
 #: field:stock.planning,supply_warehouse_id:0
 msgid "Source Warehouse"
-msgstr ""
+msgstr "Magatzem d'origen"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_qty:0
 msgid "Forecasted quantity."
-msgstr ""
+msgstr "Quantitat prevista."
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Stock"
-msgstr ""
+msgstr "Estoc"
 
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
-msgstr ""
+msgstr "Ubicació proveïment d'estoc"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_stop:0
 msgid "Ending date for planning period."
-msgstr ""
+msgstr "Data de finalització per al període planificat."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_user:0
 msgid "This User Period2"
-msgstr ""
+msgstr "El període d'aquest usuari2"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,forecasted_products:0
@@ -1087,70 +1405,73 @@ 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
 #: field:stock.planning,already_in:0
 msgid "Already In"
-msgstr ""
+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 ""
+msgstr "Categoria UdM producte"
 
 #. module: stock_planning
 #: field:stock.planning,incoming:0
 msgid "Confirmed In"
-msgstr ""
+msgstr "Entrades confirmades"
 
 #. module: stock_planning
 #: field:stock.planning,line_time:0
 msgid "Past/Future"
-msgstr ""
+msgstr "Passat/Futur"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uos_categ:0
 msgid "Product UoS Category"
-msgstr ""
+msgstr "Categoria UdV producte"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_qty:0
 msgid "Product Quantity"
-msgstr ""
+msgstr "Quantitat de producte"
 
 #. module: stock_planning
 #: field:stock.sale.forecast.createlines,copy_forecast:0
 msgid "Copy Last Forecast"
-msgstr ""
+msgstr "Copia última previsió"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_id:0
 msgid "Shows which product this forecast concerns."
-msgstr ""
+msgstr "Mostra a quin producte es refereix aquesta previsió."
 
 #. module: stock_planning
 #: selection:stock.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: stock_planning
 #: field:stock.period.createlines,period_ids:0
 msgid "Periods"
-msgstr ""
+msgstr "Períodes"
 
 #. 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 ""
+msgstr " segons l'estat:"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -1158,94 +1479,94 @@ msgstr ""
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 #: selection:stock.sale.forecast,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Validat"
 
 #. module: stock_planning
 #: view:stock.period:0
 #: selection:stock.period,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,copy_forecast:0
 msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "El període d'aquest magatzem2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
 msgid "This Warehouse Period3"
-msgstr ""
+msgstr "El període d'aquest magatzem3"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing:0
 msgid "Confirmed Out"
-msgstr ""
+msgstr "Sortides confirmades"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Default UOM"
-msgstr ""
+msgstr "UdM per defecte"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
 msgid "This Warehouse Period4"
-msgstr ""
+msgstr "El període d'aquest magatzem4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
 msgid "This Warehouse Period5"
-msgstr ""
+msgstr "El període d'aquest magatzem5"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning
 msgid "stock.planning"
-msgstr ""
+msgstr "estoc.planificació"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,warehouse_id:0
@@ -1253,11 +1574,14 @@ 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
 #: help:stock.planning.createlines,warehouse_id:0
 msgid "Warehouse which planning will concern."
-msgstr ""
+msgstr "Magatzem que es referirà la planificació."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:647
@@ -1267,6 +1591,8 @@ msgid ""
 "\n"
 " Stock Simulation: "
 msgstr ""
+"\n"
+" Simulació d'estoc: "
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -1275,26 +1601,29 @@ msgid ""
 "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
 #: help:stock.planning.createlines,period_id:0
 msgid "Period which planning will concern."
-msgstr ""
+msgstr "Període al que es refereix la planificació."
 
 #. module: stock_planning
 #: field:stock.planning,already_out:0
 msgid "Already Out"
-msgstr ""
+msgstr "Sortides realitzades"
 
 #. module: stock_planning
 #: help:stock.planning,product_id:0
 msgid "Product which this planning is created for."
-msgstr ""
+msgstr "Producte pel qual ha estat creada aquesta planificació."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Warehouse :"
-msgstr ""
+msgstr "Per magatzem:"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:639
@@ -1304,28 +1633,30 @@ msgid ""
 "\n"
 " Warehouse Forecast: "
 msgstr ""
+"\n"
+" Previsió magatzem: "
 
 #. module: stock_planning
 #: field:stock.planning,history:0
 msgid "Procurement History"
-msgstr ""
+msgstr "Històric proveïments"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_start:0
 msgid "Starting date for planning period."
-msgstr ""
+msgstr "Data inicial per al període planificat."
 
 #. 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 ""
+msgstr "    Entrades planificades: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyze_company:0
 msgid "Per Company"
-msgstr ""
+msgstr "Per empresa"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_left:0
@@ -1334,17 +1665,21 @@ msgid ""
 "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,incoming:0
 msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
+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 ""
+msgstr "Data final"
 
 #. module: stock_planning
 #: help:stock.planning,stock_supply_location:0
@@ -1353,31 +1688,36 @@ msgid ""
 "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."
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "No Requisition"
-msgstr ""
+msgstr "Núm. sol·licitud"
 
 #. module: stock_planning
 #: help:stock.planning,minimum_op:0
 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."
 
 #. module: stock_planning
 #: help:stock.sale.forecast,period_id:0
 msgid "Shows which period this forecast concerns."
-msgstr ""
+msgstr "Mostra a quin període es refereix aquesta previsió."
 
 #. module: stock_planning
 #: field:stock.planning,product_uom:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculated Period Simulation"
-msgstr ""
+msgstr "Simulació calculada del període"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -1385,7 +1725,7 @@ msgstr ""
 #: view:stock.sale.forecast:0
 #: field:stock.sale.forecast,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producte"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:638
@@ -1395,11 +1735,13 @@ msgid ""
 "\n"
 "For period: "
 msgstr ""
+"\n"
+"Per període: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM de producte"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:627
@@ -1407,7 +1749,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:697
 #, python-format
 msgid "MPS(%s) %s"
-msgstr ""
+msgstr "MPS(%s) %s"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:627
@@ -1415,7 +1757,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:693
 #, python-format
 msgid "MPS("
-msgstr ""
+msgstr "MPS("
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:680
@@ -1438,12 +1780,12 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,procure_to_stock:0
 msgid "Procure To Stock Location"
-msgstr ""
+msgstr "Proveïment a ubicació estoc"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprova"
 
 #. module: stock_planning
 #: help:stock.planning,period_id:0
@@ -1451,16 +1793,18 @@ 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
 #: view:stock.sale.forecast:0
 msgid "Calculate Sales History"
-msgstr ""
+msgstr "Calcula històric de vendes"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_amt:0
 msgid "Product Amount"
-msgstr ""
+msgstr "Quantitat de producte"
 
 #. module: stock_planning
 #: help:stock.planning,confirmed_forecasts_only:0
@@ -1468,21 +1812,23 @@ 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 ""
+msgstr "Període5"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
 msgid "Stock and Sales Planning Periods"
-msgstr ""
+msgstr "Períodes de planificació d'estoc i vendes"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_warehouse_id:0
 msgid "This Warehouse"
-msgstr ""
+msgstr "Aquest magatzem"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
@@ -1491,12 +1837,12 @@ msgstr ""
 #: view:stock.period:0
 #: view:stock.period.createlines:0
 msgid "Stock and Sales Periods"
-msgstr ""
+msgstr "Períodes d'estoc i vendes"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,user_id:0
 msgid "Shows who created this forecast, or who validated."
-msgstr ""
+msgstr "Mostra qui va crear aquesta previsió, o qui la va validar."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:644
@@ -1506,8 +1852,26 @@ msgid ""
 "\n"
 " Planned Out Before: "
 msgstr ""
+"\n"
+" Sortides planificades abans: "
 
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
-msgstr ""
+msgstr "Estoc inicial"
+
+#, python-format
+#~ msgid "Pick List "
+#~ msgstr "Llista de recollida "
+
+#, python-format
+#~ msgid "Manual planning for "
+#~ msgstr "Planificació manual per a "
+
+#, python-format
+#~ msgid "Procurement created in MPS by user: "
+#~ msgstr "Proveïment creat en MPS per l'usuari: "
+
+#, python-format
+#~ msgid "Pick created from MPS by user: "
+#~ msgstr "Albarà creat des de MPS per l'usuari: "
diff --git a/addons/stock_planning/i18n/de.po b/addons/stock_planning/i18n/de.po
index 1df7dde7342..022df420410 100644
--- a/addons/stock_planning/i18n/de.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -79,7 +79,7 @@ msgstr ""
 "Beginn der aktuellen Planperiode bis einen Tag vor Start der Periode."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: 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!"
@@ -464,7 +464,7 @@ msgstr "Produkt Kategorie"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Fehler !"
@@ -1855,9 +1855,6 @@ msgstr "Anfangsbestand"
 #~ msgid "Procurement created in MPS by user: "
 #~ msgstr "Beschaffungsvorschlag im MPS durch Benutzer: "
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -1871,12 +1868,3 @@ msgstr "Anfangsbestand"
 #, python-format
 #~ msgid "Pick List "
 #~ msgstr "Lieferschein "
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/stock_planning/i18n/el.po b/addons/stock_planning/i18n/el.po
index 5a8c318970f..a906c9caeea 100644
--- a/addons/stock_planning/i18n/el.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -70,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "Κανένα προϊόν στην επιλεγμένη κατηγορία"
@@ -431,7 +431,7 @@ msgstr ""
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/stock_planning/i18n/es.po b/addons/stock_planning/i18n/es.po
index 407689e8870..490cdc0bdcc 100644
--- a/addons/stock_planning/i18n/es.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -79,7 +79,7 @@ msgstr ""
 "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:59
+#: 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!"
@@ -465,7 +465,7 @@ msgstr "Categoría de producto"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "¡ Error !"
@@ -1875,3 +1875,15 @@ msgstr "Stock inicial"
 #, 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_CL.po b/addons/stock_planning/i18n/es_CL.po
new file mode 100644
index 00000000000..189a7e9b893
--- /dev/null
+++ b/addons/stock_planning/i18n/es_CL.po
@@ -0,0 +1,1861 @@
+# 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: 2011-01-11 11:16+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: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 períodos 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 "%s Lista de selección %s (%s, %s) %s %s \n"
+
+#. 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 "Período"
+
+#. 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 del 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 "Manual para la planificación de %s"
+
+#. 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 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: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 de 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 almacén 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 de 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 "%s Solicitud (%s, %s) %s %s \n"
+
+#. 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 "Listo"
+
+#. 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 de término"
+
+#. 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 "No solicitar"
+
+#. 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 del 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 "Copy text \t MPS(%s) %s"
+
+#. 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"
diff --git a/addons/stock_planning/i18n/es_MX.po b/addons/stock_planning/i18n/es_MX.po
new file mode 100644
index 00000000000..5d8c612e2cd
--- /dev/null
+++ b/addons/stock_planning/i18n/es_MX.po
@@ -0,0 +1,1889 @@
+# 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
new file mode 100644
index 00000000000..5d8c612e2cd
--- /dev/null
+++ b/addons/stock_planning/i18n/es_VE.po
@@ -0,0 +1,1889 @@
+# 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
index db20057def9..797b915b181 100644
--- a/addons/stock_planning/i18n/fi.po
+++ b/addons/stock_planning/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: 2011-06-16 04:39+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -33,6 +33,8 @@ msgid ""
 "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
@@ -70,6 +72,8 @@ 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
 #: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
@@ -185,6 +189,8 @@ 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."
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -202,6 +208,8 @@ 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'."
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period_createlines
@@ -530,33 +538,33 @@ msgstr "Maksimimäärä asetettu minimivarasto säännöissä tälle varastolle"
 #: code:addons/stock_planning/stock_planning.py:665
 #, python-format
 msgid "You must specify a Source Warehouse !"
-msgstr ""
+msgstr "Sinun pitää määritellä lähdevarasto !"
 
 #. module: stock_planning
 #: view:stock.planning.createlines:0
 msgid "Creates planning lines for selected period and warehouse."
-msgstr ""
+msgstr "Luo suunnittelurivit valitulle kaudelle ja varastolle"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
-msgstr ""
+msgstr "Käyttäjän jakso 4"
 
 #. 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 ""
+msgstr "Huom! Ei kopioi itse luomiasi aikaisempia rivejä"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Stock and Sales Period"
-msgstr ""
+msgstr "Varasto ja myyntijakso"
 
 #. module: stock_planning
 #: field:stock.planning,company_forecast:0
 msgid "Company Forecast"
-msgstr ""
+msgstr "Yrityksen ennuste"
 
 #. module: stock_planning
 #: help:stock.planning,product_uom:0
@@ -565,60 +573,63 @@ 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)."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per User :"
-msgstr ""
+msgstr "Käyttäjää kohti :"
 
 #. 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 ""
+msgstr "Myyntiennusteet"
 
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Jakson nimi"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,user_id:0
 msgid "Created/Validated by"
-msgstr ""
+msgstr "Luonut/Tarkistanut"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Internal Supply"
-msgstr ""
+msgstr "Sisäinen toimitus"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_company:0
 msgid "This Company Period4"
-msgstr ""
+msgstr "Yrityksen jakso 4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_company:0
 msgid "This Company Period5"
-msgstr ""
+msgstr "Yrityksen jakso 5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
-msgstr ""
+msgstr "Yrityksen jakso 2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_company:0
 msgid "This Company Period3"
-msgstr ""
+msgstr "Yrityksen jakso 3"
 
 #. module: stock_planning
 #: field:stock.period,date_start:0
 #: field:stock.period.createlines,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Alkupäivä"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:642
@@ -628,11 +639,13 @@ msgid ""
 "\n"
 " Already Out: "
 msgstr ""
+"\n"
+" Jo Lähtenyt: "
 
 #. module: stock_planning
 #: field:stock.planning,confirmed_forecasts_only:0
 msgid "Validated Forecasts"
-msgstr ""
+msgstr "Tarkistetut ennusteet"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,product_categ_id:0
@@ -640,39 +653,41 @@ 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 ""
+msgstr "Suunniteltu lähtö"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Department :"
-msgstr ""
+msgstr "Osastoittain :"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
-msgstr ""
+msgstr "Ennuste"
 
 #. module: stock_planning
 #: selection:stock.period,state:0
 #: selection:stock.planning,state:0
 #: selection:stock.sale.forecast,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Warehouse "
-msgstr ""
+msgstr "Varasto "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:646
@@ -682,11 +697,13 @@ msgid ""
 "\n"
 " Expected Out: "
 msgstr ""
+"\n"
+" Odotettu lähtö: "
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create periods for Stock and Sales Planning"
-msgstr ""
+msgstr "Luo jaksot varasto ja myyntisuunnittelua vaten"
 
 #. module: stock_planning
 #: help:stock.planning,planned_outgoing:0
@@ -695,6 +712,9 @@ msgid ""
 "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
 #: model:ir.module.module,description:stock_planning.module_meta_information
@@ -933,7 +953,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:140
 #, python-format
 msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
+msgstr "Ei voi poistaa hyväksyttyjä myyntiennusteita !"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:641
@@ -943,6 +963,8 @@ msgid ""
 "\n"
 " Planned Out: "
 msgstr ""
+"\n"
+" Suunnitellut lähdöt: "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:667
@@ -951,17 +973,19 @@ 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
 #: 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 ""
+msgstr "Luo myyntiennusteet"
 
 #. module: stock_planning
 #: view:stock.sale.forecast.createlines:0
 msgid "Creates forecast lines for selected warehouse and period."
-msgstr ""
+msgstr "Luo ennusterivit valitulle varastolle ja jaksolle."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:656
@@ -973,7 +997,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:655
 #, python-format
 msgid "Requisition ("
-msgstr ""
+msgstr "Pyyntö ("
 
 #. module: stock_planning
 #: help:stock.planning,outgoing_left:0
@@ -982,120 +1006,123 @@ msgid ""
 "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"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_id:0
 msgid "Period4"
-msgstr ""
+msgstr "Jakso 4"
 
 #. 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 ""
+msgstr "    Jo saapuneet: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_id:0
 msgid "Period2"
-msgstr ""
+msgstr "Jakso 2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_id:0
 msgid "Period3"
-msgstr ""
+msgstr "Jakso 3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_id:0
 msgid "Period1"
-msgstr ""
+msgstr "Jakso 1"
 
 #. 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 ""
+msgstr "    Minimivarasto: "
 
 #. module: stock_planning
 #: field:stock.planning,active_uom:0
 #: field:stock.sale.forecast,active_uom:0
 msgid "Active UoM"
-msgstr ""
+msgstr "Aktiivinen mittayksikkö"
 
 #. 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 ""
+msgstr "Luo varastosuunnittelun rivit"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "General Info"
-msgstr ""
+msgstr "Yleiset tiedot"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
 msgid "Sales Forecast"
-msgstr ""
+msgstr "Myyntiennuste"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Planning and Situation for Calculated Period"
-msgstr ""
+msgstr "Suunnittelu ja tilanne lasketulle jaksolle"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
 msgid "This Warehouse Period1"
-msgstr ""
+msgstr "Tämän varaston jakso 1"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_forecast:0
 msgid "Warehouse Forecast"
-msgstr ""
+msgstr "Varaston ennuste"
 
 #. 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 ""
+msgstr "    Vahvistetut saapumiset: "
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Sales history"
-msgstr ""
+msgstr "Myyntihistoria"
 
 #. module: stock_planning
 #: field:stock.planning,supply_warehouse_id:0
 msgid "Source Warehouse"
-msgstr ""
+msgstr "Lähdevarasto"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_qty:0
 msgid "Forecasted quantity."
-msgstr ""
+msgstr "Ennustettumäärä"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Stock"
-msgstr ""
+msgstr "Varasto"
 
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
-msgstr ""
+msgstr "Varastotoimituksen paikka"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_stop:0
 msgid "Ending date for planning period."
-msgstr ""
+msgstr "Suunnittelujakson loppupäivä"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_user:0
 msgid "This User Period2"
-msgstr ""
+msgstr "Käyttäjän jakso 2"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,forecasted_products:0
@@ -1103,70 +1130,72 @@ 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
 #: field:stock.planning,already_in:0
 msgid "Already In"
-msgstr ""
+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 ""
+msgstr "Tuotteen mittayksikkökategoria"
 
 #. module: stock_planning
 #: field:stock.planning,incoming:0
 msgid "Confirmed In"
-msgstr ""
+msgstr "Vahvistetut saapumiset"
 
 #. module: stock_planning
 #: field:stock.planning,line_time:0
 msgid "Past/Future"
-msgstr ""
+msgstr "Mennyt/Tuleva"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uos_categ:0
 msgid "Product UoS Category"
-msgstr ""
+msgstr "Tuotteen Varastokategoria"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_qty:0
 msgid "Product Quantity"
-msgstr ""
+msgstr "Tuotteen kappalemäärä"
 
 #. module: stock_planning
 #: field:stock.sale.forecast.createlines,copy_forecast:0
 msgid "Copy Last Forecast"
-msgstr ""
+msgstr "Kopioi viimeinen ennuste"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_id:0
 msgid "Shows which product this forecast concerns."
-msgstr ""
+msgstr "Näyttää mitä tuotetta tämä ennuste koskee"
 
 #. module: stock_planning
 #: selection:stock.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: stock_planning
 #: field:stock.period.createlines,period_ids:0
 msgid "Periods"
-msgstr ""
+msgstr "Jaksot"
 
 #. 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 ""
+msgstr " tilan mukaan:"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -1174,89 +1203,89 @@ msgstr ""
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 #: selection:stock.sale.forecast,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: stock_planning
 #: view:stock.period:0
 #: selection:stock.period,state:0
 msgid "Open"
-msgstr ""
+msgstr "Avoin"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,copy_forecast:0
 msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
+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 ""
+msgstr "Osaston jakso 1"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_dept:0
 msgid "This Dept Period3"
-msgstr ""
+msgstr "Osaston jakso 3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_dept:0
 msgid "This Dept Period2"
-msgstr ""
+msgstr "Osaston jakso 2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_dept:0
 msgid "This Dept Period5"
-msgstr ""
+msgstr "Osaston jakso 5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_dept:0
 msgid "This Dept Period4"
-msgstr ""
+msgstr "Osaston jakso 4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
 msgid "This Warehouse Period2"
-msgstr ""
+msgstr "Varaston jakso 2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
 msgid "This Warehouse Period3"
-msgstr ""
+msgstr "Varaston jakso 3"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing:0
 msgid "Confirmed Out"
-msgstr ""
+msgstr "Vahvistettu lähtö"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Default UOM"
-msgstr ""
+msgstr "Oletusmittayksikkö"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
 msgid "This Warehouse Period4"
-msgstr ""
+msgstr "Varaston jakso 4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
 msgid "This Warehouse Period5"
-msgstr ""
+msgstr "Varaston jakso 5"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning
@@ -1269,11 +1298,14 @@ 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
 #: help:stock.planning.createlines,warehouse_id:0
 msgid "Warehouse which planning will concern."
-msgstr ""
+msgstr "Varasto jota suunnittelu koskee."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:647
@@ -1283,6 +1315,8 @@ msgid ""
 "\n"
 " Stock Simulation: "
 msgstr ""
+"\n"
+" Varastosimulaatio: "
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -1291,26 +1325,29 @@ msgid ""
 "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
 #: help:stock.planning.createlines,period_id:0
 msgid "Period which planning will concern."
-msgstr ""
+msgstr "Jakso jota suunnittelu koskee"
 
 #. module: stock_planning
 #: field:stock.planning,already_out:0
 msgid "Already Out"
-msgstr ""
+msgstr "Jo lähtenyt"
 
 #. module: stock_planning
 #: help:stock.planning,product_id:0
 msgid "Product which this planning is created for."
-msgstr ""
+msgstr "Tuote jolle suunnittelu on luotu."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Warehouse :"
-msgstr ""
+msgstr "Varastoittain :"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:639
@@ -1320,28 +1357,30 @@ msgid ""
 "\n"
 " Warehouse Forecast: "
 msgstr ""
+"\n"
+" Varastoennuste: "
 
 #. module: stock_planning
 #: field:stock.planning,history:0
 msgid "Procurement History"
-msgstr ""
+msgstr "Hankintahistoria"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_start:0
 msgid "Starting date for planning period."
-msgstr ""
+msgstr "Suunnittelujakson alkupäivä."
 
 #. 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 ""
+msgstr "    Suunnitellut saapumiset: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyze_company:0
 msgid "Per Company"
-msgstr ""
+msgstr "Yrityksittäin"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_left:0
@@ -1350,17 +1389,21 @@ msgid ""
 "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,incoming:0
 msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
+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 ""
+msgstr "Loppupvm"
 
 #. module: stock_planning
 #: help:stock.planning,stock_supply_location:0
@@ -1369,31 +1412,34 @@ msgid ""
 "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ä."
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "No Requisition"
-msgstr ""
+msgstr "Ei pyyntöä"
 
 #. module: stock_planning
 #: help:stock.planning,minimum_op:0
 msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr ""
+msgstr "Minimimäärä asetettu  minimivarastosäännössä tälle varastolle"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,period_id:0
 msgid "Shows which period this forecast concerns."
-msgstr ""
+msgstr "Näyttää mitä jaksoa tämä ennuste koskee."
 
 #. module: stock_planning
 #: field:stock.planning,product_uom:0
 msgid "UoM"
-msgstr ""
+msgstr "Mittayksikkö"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculated Period Simulation"
-msgstr ""
+msgstr "Laske jakson simulaatio"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -1401,7 +1447,7 @@ msgstr ""
 #: view:stock.sale.forecast:0
 #: field:stock.sale.forecast,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:638
@@ -1411,11 +1457,13 @@ msgid ""
 "\n"
 "For period: "
 msgstr ""
+"\n"
+"Jaksolle: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Tuotteen mittayksikkö"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:627
@@ -1454,29 +1502,29 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,procure_to_stock:0
 msgid "Procure To Stock Location"
-msgstr ""
+msgstr "Hanki varastopaikalle"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Approve"
-msgstr ""
+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 ""
+msgstr "Tämän suunnittelun jakso. Pyyntö luodaan tämän jakson alkuun."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Calculate Sales History"
-msgstr ""
+msgstr "Laske myyntihistoria"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_amt:0
 msgid "Product Amount"
-msgstr ""
+msgstr "Tuotteiden määrä"
 
 #. module: stock_planning
 #: help:stock.planning,confirmed_forecasts_only:0
@@ -1484,21 +1532,23 @@ 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 ""
+msgstr "Jakso 5"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
 msgid "Stock and Sales Planning Periods"
-msgstr ""
+msgstr "Varasto ja myyntiennuksteiden jaksot"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_warehouse_id:0
 msgid "This Warehouse"
-msgstr ""
+msgstr "Tämä varasto"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
@@ -1507,12 +1557,12 @@ msgstr ""
 #: view:stock.period:0
 #: view:stock.period.createlines:0
 msgid "Stock and Sales Periods"
-msgstr ""
+msgstr "Varasto ja myyntijaksot"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,user_id:0
 msgid "Shows who created this forecast, or who validated."
-msgstr ""
+msgstr "Näyttää kuka luo tämän ennusteen tai kuka vahvisti."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:644
@@ -1522,11 +1572,13 @@ msgid ""
 "\n"
 " Planned Out Before: "
 msgstr ""
+"\n"
+" Suunnitellut lähdöt ennen: "
 
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
-msgstr ""
+msgstr "Alkuvarasto"
 
 #, python-format
 #~ msgid "Pick List "
@@ -1539,3 +1591,18 @@ msgstr ""
 #, python-format
 #~ msgid "Procurement created in MPS by user: "
 #~ msgstr "Hankinta luotu MPS:ssä käyttäjän toimesta: "
+
+#, python-format
+#~ msgid "Pick created from MPS by user: "
+#~ msgstr "Keräilyn luonut MPS:ssä käyttäjä: "
+
+#~ 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
index fca11a0fd39..01f67dd20bc 100644
--- a/addons/stock_planning/i18n/fr.po
+++ b/addons/stock_planning/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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-13 22:58+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-09-26 12:15+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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -79,7 +79,7 @@ msgstr ""
 "calculée."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: 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 !"
@@ -464,7 +464,7 @@ msgstr "Catégorie de produits"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -473,7 +473,7 @@ msgstr "Erreur !"
 #: code:addons/stock_planning/stock_planning.py:626
 #, python-format
 msgid "Manual planning for %s"
-msgstr ""
+msgstr "Planification manuelle pour %s"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_user_id:0
@@ -1648,7 +1648,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,history:0
 msgid "Procurement History"
-msgstr "Historique du besoin"
+msgstr "Historique d'approvisionnement"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_start:0
diff --git a/addons/stock_planning/i18n/gl.po b/addons/stock_planning/i18n/gl.po
index e7bde8b441d..b9ce5c32c22 100644
--- a/addons/stock_planning/i18n/gl.po
+++ b/addons/stock_planning/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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
diff --git a/addons/stock_planning/i18n/hr.po b/addons/stock_planning/i18n/hr.po
index e5151b06888..87d68b22771 100644
--- a/addons/stock_planning/i18n/hr.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -79,7 +79,7 @@ msgstr ""
 "trenutnog perioda i dan prije početka perioda kalkulacije."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "Nema proizvoda u odabranoj kategoriji !"
@@ -458,7 +458,7 @@ msgstr "Kategorija proizvoda"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Pogreška !"
@@ -1846,9 +1846,6 @@ msgstr "Početna zaliha"
 #~ msgid "Procurement created in MPS by user: "
 #~ msgstr "Nabavu kreirao u RGN korisnik: "
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Pogreška ! Ne možete kreirati rekurzivni izbornik."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/stock_planning/i18n/hu.po b/addons/stock_planning/i18n/hu.po
index d12184b4263..ab0491dbedf 100644
--- a/addons/stock_planning/i18n/hu.po
+++ b/addons/stock_planning/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-01 11:50+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -71,7 +72,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: 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 !"
@@ -437,7 +438,7 @@ msgstr "Termék kategória"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Hiba !"
diff --git a/addons/stock_planning/i18n/it.po b/addons/stock_planning/i18n/it.po
index 517994d143c..0e1a07f8426 100644
--- a/addons/stock_planning/i18n/it.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -76,7 +76,7 @@ msgstr ""
 "corrente ed un giorno prima dell'inizio del periodo calcolato."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "Nessun prodotto nella categoria selezionata !"
@@ -451,7 +451,7 @@ msgstr "Categoria prodotto"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Errore !"
diff --git a/addons/stock_planning/i18n/mn.po b/addons/stock_planning/i18n/mn.po
index 58d3313640e..73af6d85a75 100644
--- a/addons/stock_planning/i18n/mn.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -76,7 +76,7 @@ msgstr ""
 "хэмжээ."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "Сонгосон ангилалд бараа алга !"
@@ -460,7 +460,7 @@ msgstr "Барааны ангилал"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Алдаа !"
diff --git a/addons/stock_planning/i18n/pl.po b/addons/stock_planning/i18n/pl.po
index 4f5e5536765..c444e07ee56 100644
--- a/addons/stock_planning/i18n/pl.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -77,7 +77,7 @@ msgstr ""
 "bieżącego okresu a jednym dniem przed okresem obliczanym."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "Brak produktu w wybranej kategorii !"
@@ -459,7 +459,7 @@ msgstr "Kategoria Produktu"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Błąd !"
@@ -1612,9 +1612,6 @@ msgstr "Zapas początkowy"
 #~ msgid "Pick List "
 #~ msgstr "Pobranie "
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/stock_planning/i18n/pt.po b/addons/stock_planning/i18n/pt.po
index 411d9749be3..0bbde9eba33 100644
--- a/addons/stock_planning/i18n/pt.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "Não há produtos na categoria selecionada!"
@@ -432,7 +432,7 @@ msgstr "Categoria de produto"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
diff --git a/addons/stock_planning/i18n/pt_BR.po b/addons/stock_planning/i18n/pt_BR.po
index a1e8a9e01c2..823fb9eefe4 100644
--- a/addons/stock_planning/i18n/pt_BR.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -79,7 +79,7 @@ msgstr ""
 "período atual e um dia antes de iniciar o período calculado."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: 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 !"
@@ -464,7 +464,7 @@ msgstr "Categoria de Produto"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
diff --git a/addons/stock_planning/i18n/ro.po b/addons/stock_planning/i18n/ro.po
index c027205150b..e389ff82117 100644
--- a/addons/stock_planning/i18n/ro.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -70,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr ""
@@ -428,7 +428,7 @@ msgstr ""
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/stock_planning/i18n/ru.po b/addons/stock_planning/i18n/ru.po
index 23601939059..2cbc4b80e50 100644
--- a/addons/stock_planning/i18n/ru.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -32,6 +32,8 @@ msgid ""
 "selected calculation is made for input, stock and output location of "
 "warehouse."
 msgstr ""
+"Отметьте для расчета мест хранения выбранного склада. Если не отмечено, "
+"расчет производится для входа, хранения и выхода склада."
 
 #. module: stock_planning
 #: field:stock.planning,maximum_op:0
@@ -41,7 +43,7 @@ msgstr "Правило максимума"
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_company:0
 msgid "This Copmany Period1"
-msgstr ""
+msgstr "Период1 этой компании"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -73,7 +75,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "В выбранной категории нет товаров !"
@@ -114,11 +116,12 @@ msgstr ""
 #: 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 ""
+msgstr "Создать ежедневные периоды"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -158,7 +161,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Minimum Stock Rule Indicators"
-msgstr ""
+msgstr "Индикаторы правил минимальных запасов"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,period_id:0
@@ -168,13 +171,13 @@ msgstr "Период, которого касаются прогнозы"
 #. module: stock_planning
 #: field:stock.planning,stock_only:0
 msgid "Stock Location Only"
-msgstr ""
+msgstr "Только место хранения"
 
 #. module: stock_planning
 #: help:stock.planning,already_out:0
 msgid ""
 "Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
+msgstr "Количество, которое уже отправлено с этого склада в текущем периоде."
 
 #. module: stock_planning
 #: help:stock.planning,procure_to_stock:0
@@ -236,7 +239,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Stock and Sales Forecast"
-msgstr ""
+msgstr "Прогноз запасов и продаж"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast
@@ -256,7 +259,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,stock_simulation:0
 msgid "Stock Simulation"
-msgstr ""
+msgstr "Моделирование запасов"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning_createlines
@@ -274,12 +277,12 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Search  Sales Forecast"
-msgstr ""
+msgstr "Поиск прогноза продаж"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_user:0
 msgid "This User Period5"
-msgstr ""
+msgstr "Приод5 этого пользователя"
 
 #. module: stock_planning
 #: help:stock.planning,history:0
@@ -296,23 +299,23 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_user:0
 msgid "This User Period1"
-msgstr ""
+msgstr "Приод1 этого пользователя"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_user:0
 msgid "This User Period3"
-msgstr ""
+msgstr "Приод3 этого пользователя"
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
 #: view:stock.planning:0
 msgid "Stock Planning"
-msgstr ""
+msgstr "Планирование запасов"
 
 #. module: stock_planning
 #: field:stock.planning,minimum_op:0
 msgid "Minimum Rule"
-msgstr ""
+msgstr "Правило минимума"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -336,7 +339,7 @@ msgstr ""
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Create"
-msgstr ""
+msgstr "Создать"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
@@ -351,7 +354,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:678
 #, python-format
 msgid "  Creation Date: "
-msgstr ""
+msgstr "  Дата создания: "
 
 #. module: stock_planning
 #: field:stock.planning,period_id:0
@@ -372,7 +375,7 @@ msgstr "Состояние"
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category of products which created forecasts will concern."
-msgstr ""
+msgstr "Категория ТМЦ, для ТМЦ которых коснется созданный прогноз."
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period
@@ -406,17 +409,17 @@ msgstr ""
 #. module: stock_planning
 #: help:stock.sale.forecast,analyze_company:0
 msgid "Check this box to see the sales for whole company."
-msgstr ""
+msgstr "Отметьте, чтобы увидеть продажи всей компании."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Search Stock Planning"
-msgstr ""
+msgstr "Поиск планирования запасов"
 
 #. module: stock_planning
 #: field:stock.planning,incoming_before:0
@@ -435,7 +438,7 @@ msgstr "Категория ТМЦ"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "Ошибка !"
@@ -463,12 +466,12 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecasts"
-msgstr ""
+msgstr "Прогнозы"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Supply from Another Warehouse"
-msgstr ""
+msgstr "Поставить с другого склада"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -505,23 +508,25 @@ msgstr "Неверное действие !"
 #. module: stock_planning
 #: help:stock.planning,stock_start:0
 msgid "Stock quantity one day before current period."
-msgstr ""
+msgstr "Складские остатки за день перед текущим периодом."
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Weekly Periods"
-msgstr ""
+msgstr "Создать еженедельные периоды"
 
 #. module: stock_planning
 #: help:stock.planning,maximum_op:0
 msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
 msgstr ""
+"Максимальное количество, установленное правилом минимальных запасов для "
+"этого склада"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:665
 #, python-format
 msgid "You must specify a Source Warehouse !"
-msgstr ""
+msgstr "Необходимо указать склад источник!"
 
 #. module: stock_planning
 #: view:stock.planning.createlines:0
@@ -531,13 +536,13 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
-msgstr ""
+msgstr "Период4 этого пользователя"
 
 #. 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 ""
+msgstr "Примечание: не дублировать существующие строки, созданные вами."
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -547,7 +552,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,company_forecast:0
 msgid "Company Forecast"
-msgstr ""
+msgstr "Прогноз по организации"
 
 #. module: stock_planning
 #: help:stock.planning,product_uom:0
@@ -567,7 +572,7 @@ msgstr "На пользователя:"
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
 #: view:stock.sale.forecast:0
 msgid "Sales Forecasts"
-msgstr ""
+msgstr "Прогнозы продаж"
 
 #. module: stock_planning
 #: field:stock.period,name:0
@@ -583,27 +588,27 @@ msgstr "Создано/Утверждено"
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Internal Supply"
-msgstr ""
+msgstr "Внутренний источник"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_company:0
 msgid "This Company Period4"
-msgstr ""
+msgstr "Период4 этой организации"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_company:0
 msgid "This Company Period5"
-msgstr ""
+msgstr "Период5 этой организации"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
-msgstr ""
+msgstr "Период2 этой организации"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_company:0
 msgid "This Company Period3"
-msgstr ""
+msgstr "Период3 этой организации"
 
 #. module: stock_planning
 #: field:stock.period,date_start:0
@@ -623,7 +628,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,confirmed_forecasts_only:0
 msgid "Validated Forecasts"
-msgstr ""
+msgstr "Утвержденные прогнозы"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,product_categ_id:0
@@ -645,7 +650,7 @@ msgstr "По отделу :"
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
-msgstr ""
+msgstr "Прогноз"
 
 #. module: stock_planning
 #: selection:stock.period,state:0
@@ -657,7 +662,7 @@ msgstr "Черновик"
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -677,7 +682,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create periods for Stock and Sales Planning"
-msgstr ""
+msgstr "Создать периоды для планирования запасов и продаж"
 
 #. module: stock_planning
 #: help:stock.planning,planned_outgoing:0
@@ -924,7 +929,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:140
 #, python-format
 msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
+msgstr "Нельзя удалить проверенный прогноз продаж !"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:641
@@ -1528,5 +1533,6 @@ msgstr "Начальный остаток"
 #~ msgid "Manual planning for "
 #~ msgstr "Планирование вручную для "
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+#, python-format
+#~ msgid "Pick List "
+#~ msgstr "Комплектовочный лист "
diff --git a/addons/stock_planning/i18n/sv.po b/addons/stock_planning/i18n/sv.po
index 28bb325e3fb..b17b646e100 100644
--- a/addons/stock_planning/i18n/sv.po
+++ b/addons/stock_planning/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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -70,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr "Inga produkter i vald kategori"
@@ -430,7 +430,7 @@ msgstr ""
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/stock_planning/i18n/tr.po b/addons/stock_planning/i18n/tr.po
index c89d134cf64..a1d3dedff16 100644
--- a/addons/stock_planning/i18n/tr.po
+++ b/addons/stock_planning/i18n/tr.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: 2011-04-29 05:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 ""
+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
@@ -35,18 +35,18 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,maximum_op:0
 msgid "Maximum Rule"
-msgstr ""
+msgstr "Ençok Kuralı"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_company:0
 msgid "This Copmany Period1"
-msgstr ""
+msgstr "Bu Firma Dönem1"
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Group By..."
-msgstr "Grupla..."
+msgstr "Gruplandır..."
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_amt:0
@@ -70,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
 msgstr ""
@@ -428,7 +428,7 @@ msgstr ""
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr ""
diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po
index eac076feec3..d4aa30037b3 100644
--- a/addons/stock_planning/i18n/zh_CN.po
+++ b/addons/stock_planning/i18n/zh_CN.po
@@ -9,20 +9,20 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-05-06 12:31+0000\n"
-"Last-Translator: openerp-china.Black Jack <Unknown>\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: 2011-05-07 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\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 "选定的周期没预计,选定的类别没产品!"
+msgstr "选定的周期没预计,选定的分类没产品!"
 
 #. module: stock_planning
 #: help:stock.planning,stock_only:0
@@ -30,7 +30,7 @@ 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 "对选定的仓库检测核算库存存货地点,如果没选定核算的方式是仓库的入库,出仓的存货地点."
+msgstr "如果没选定仓库的入仓,库存,出仓的计算方式,检查选定仓库的库位."
 
 #. module: stock_planning
 #: field:stock.planning,maximum_op:0
@@ -67,13 +67,13 @@ msgstr "即将入库必须大于0!"
 msgid ""
 "Planned Out in periods before calculated. Between start date of current "
 "period and one day before start of calculated period."
-msgstr "计划出库在计算周期前,在本期开始时间和计算周期前的某天."
+msgstr "在计算周期前的计划出库,在本周期开始时间和计算周期前的某天."
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "No products in selected category !"
-msgstr "在选定的类别没产品!"
+msgstr "在选定的分类没产品!"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,warehouse_id:0
@@ -115,7 +115,7 @@ msgstr "确认所有计算周期内的出仓调拨数量."
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Daily Periods"
-msgstr "创建每天周期"
+msgstr "创建周期"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -163,7 +163,7 @@ msgstr "关注这周期的预计"
 #. module: stock_planning
 #: field:stock.planning,stock_only:0
 msgid "Stock Location Only"
-msgstr "只有库存存货地点"
+msgstr "只有库存库位"
 
 #. module: stock_planning
 #: help:stock.planning,already_out:0
@@ -176,7 +176,7 @@ 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 "选择指定仓库需求的存货地点,如果不选择需求将用这仓库的入库存货地点."
+msgstr "选择指定仓库需求的库位,如果不选择需求将用这仓库的入库库位."
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -198,12 +198,12 @@ msgstr "仓库作为调拨的起点."
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period_createlines
 msgid "stock.period.createlines"
-msgstr ""
+msgstr "stock.period.createlines"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing_before:0
 msgid "Planned Out Before"
-msgstr "计划前"
+msgstr "之前的计划出库"
 
 #. module: stock_planning
 #: field:stock.planning.createlines,forecasted_products:0
@@ -219,14 +219,14 @@ msgstr "周期:"
 #: help:stock.planning,already_in:0
 msgid ""
 "Quantity which is already picked up to this warehouse in current period."
-msgstr "本期这仓库已打包的数量."
+msgstr "本期这仓库已装箱的数量."
 
 #. 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 "    确认前: "
+msgstr "    之前的确认入库: "
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
@@ -236,7 +236,7 @@ msgstr "库存和销售预计"
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast
 msgid "stock.sale.forecast"
-msgstr ""
+msgstr "stock.sale.forecast"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_dept_id:0
@@ -246,7 +246,7 @@ msgstr "这部门"
 #. module: stock_planning
 #: field:stock.planning,to_procure:0
 msgid "Planned In"
-msgstr "计划内"
+msgstr "计划入库"
 
 #. module: stock_planning
 #: field:stock.planning,stock_simulation:0
@@ -256,7 +256,7 @@ msgstr "库存模拟"
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning_createlines
 msgid "stock.planning.createlines"
-msgstr ""
+msgstr "stock.planning.createlines"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_before:0
@@ -264,7 +264,7 @@ 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 "确认的即将入库在计算周期前(已包括在).在本期开始日期和在计算周期开始前的某天."
+msgstr "确认计算周期前即将入库(已包括入库).在本期开始日期和在计算周期开始前的某天."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
@@ -279,7 +279,7 @@ msgstr "用户周期 5"
 #. module: stock_planning
 #: help:stock.planning,history:0
 msgid "History of procurement or internal supply of this planning line."
-msgstr "需求日志或计划明细里的供求"
+msgstr "需求日志或计划明细里的内部供求"
 
 #. module: stock_planning
 #: help:stock.planning,company_forecast:0
@@ -339,7 +339,7 @@ msgstr "创建"
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning
 #: view:stock.planning:0
 msgid "Master Procurement Schedule"
-msgstr "主需求计划表"
+msgstr "主需求日程表"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:636
@@ -367,7 +367,7 @@ msgstr "状态"
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category of products which created forecasts will concern."
-msgstr "关注对这产品类别建立的产品预计"
+msgstr "关注对这产品分类创建的产品预计"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period
@@ -377,7 +377,7 @@ msgstr "库存周期"
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
 msgid "stock.sale.forecast.createlines"
-msgstr ""
+msgstr "stock.sale.forecast.createlines"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_id:0
@@ -404,7 +404,7 @@ msgstr ""
 #. module: stock_planning
 #: help:stock.sale.forecast,analyze_company:0
 msgid "Check this box to see the sales for whole company."
-msgstr "选中,查看公司的销售"
+msgstr "勾选,查看公司的销售"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,name:0
@@ -414,18 +414,18 @@ msgstr "名称"
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Search Stock Planning"
-msgstr "搜索库存计划"
+msgstr "查询库存计划"
 
 #. module: stock_planning
 #: field:stock.planning,incoming_before:0
 msgid "Incoming Before"
-msgstr "即将入库前"
+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 "产品类别"
+msgstr "产品分类"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:621
@@ -433,7 +433,7 @@ msgstr "产品类别"
 #: 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:59
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -468,7 +468,7 @@ msgstr "预计"
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Supply from Another Warehouse"
-msgstr "另一个仓库提供"
+msgstr "从其它仓库提供"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -521,12 +521,12 @@ msgstr "在本期前一天的库存数量."
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Weekly Periods"
-msgstr "创建每周周期"
+msgstr "创建周周期"
 
 #. module: stock_planning
 #: help:stock.planning,maximum_op:0
 msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr "这仓库设置的最小库存规则大里的最大数量"
+msgstr "这仓库最小库存规则设置里的最大数量"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:665
@@ -537,7 +537,7 @@ msgstr "您必须要指定源仓库"
 #. module: stock_planning
 #: view:stock.planning.createlines:0
 msgid "Creates planning lines for selected period and warehouse."
-msgstr "选定周期和创建仓库计划明细."
+msgstr "选定周期和仓库创建计划明细."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
@@ -566,12 +566,12 @@ 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 "计量单位用于显示库存数量,单位您可以使用默认类别或者第二类别(销售单位类别)."
+msgstr "计量单位用于显示库存数量,单位您可以使用默认分类或者第二分类(销售单位分类)."
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per User :"
-msgstr "每用户:"
+msgstr "每个用户:"
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
@@ -589,7 +589,7 @@ msgstr "周期名称"
 #. module: stock_planning
 #: field:stock.sale.forecast,user_id:0
 msgid "Created/Validated by"
-msgstr "创建/验证"
+msgstr "创建/审核"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -636,14 +636,14 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,confirmed_forecasts_only:0
 msgid "Validated Forecasts"
-msgstr "核实预计"
+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 "计划将在选定的产品类别创建.如果您选择\"所有产品预计\"这字段将被忽略."
+msgstr "计划将在选定的产品分类里创建.当您勾选\"所有产品预计\"这字段将被忽略."
 
 #. module: stock_planning
 #: field:stock.planning,planned_outgoing:0
@@ -692,7 +692,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create periods for Stock and Sales Planning"
-msgstr "为库存和销售计划创建周期"
+msgstr "创建库存和销售计划周期"
 
 #. module: stock_planning
 #: help:stock.planning,planned_outgoing:0
@@ -934,12 +934,25 @@ msgid ""
 "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"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:140
 #, python-format
 msgid "Cannot delete Validated Sale Forecasts !"
-msgstr "不能删除已证实的销售预计!"
+msgstr "不能删除已审核的销售预计!"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:641
@@ -958,7 +971,7 @@ msgstr ""
 msgid ""
 "You must specify a Source Warehouse different than calculated (destination) "
 "Warehouse !"
-msgstr "您必须指定来源的仓库不同于计算(目标)仓库!"
+msgstr "您必须指定源仓库不同于计算的(目标)仓库!"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
@@ -989,7 +1002,7 @@ 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 "在选定周期的出库预计数量.作为计划出库和确认出库的差异,对本期已出库的已经计算进去."
+msgstr "在选定周期的出库预计数量.作为计划出库和确认出库的差,对本期已出库的已经计算进去."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_id:0
@@ -1041,7 +1054,7 @@ msgstr "创建库存计划明细"
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "General Info"
-msgstr "常规信息"
+msgstr "一般信息"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
@@ -1068,7 +1081,7 @@ msgstr "仓库预计"
 #: code:addons/stock_planning/stock_planning.py:685
 #, python-format
 msgid "    Confirmed In: "
-msgstr "    确认入库: "
+msgstr "    已确认的入库: "
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
@@ -1078,7 +1091,7 @@ msgstr "销售日志"
 #. module: stock_planning
 #: field:stock.planning,supply_warehouse_id:0
 msgid "Source Warehouse"
-msgstr "来源仓库"
+msgstr "源仓库"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_qty:0
@@ -1093,7 +1106,7 @@ msgstr "库存"
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
-msgstr "库存供应存货地点"
+msgstr "库存存货库位"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_stop:0
@@ -1110,7 +1123,7 @@ msgstr "用户周期 2"
 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 "如选择这选项将为选定的仓库和周期计划所有产品的预计.同时产品类别字段将被忽略."
+msgstr "勾选这选项将为选定的仓库和周期计划所有产品的预计.产品分类字段将被忽略."
 
 #. module: stock_planning
 #: field:stock.planning,already_in:0
@@ -1127,7 +1140,7 @@ msgstr "产品计量单位类别"
 #. module: stock_planning
 #: field:stock.planning,incoming:0
 msgid "Confirmed In"
-msgstr "确认入库"
+msgstr "已确认的入库"
 
 #. module: stock_planning
 #: field:stock.planning,line_time:0
@@ -1152,7 +1165,7 @@ msgstr "复制最近预计"
 #. module: stock_planning
 #: help:stock.sale.forecast,product_id:0
 msgid "Shows which product this forecast concerns."
-msgstr "显示关注哪个产品的预计"
+msgstr "显示关注的哪个产品的预计"
 
 #. module: stock_planning
 #: selection:stock.planning,state:0
@@ -1188,7 +1201,7 @@ msgstr "结束"
 #: view:stock.sale.forecast:0
 #: selection:stock.sale.forecast,state:0
 msgid "Validated"
-msgstr "核实"
+msgstr "已审核"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -1239,12 +1252,12 @@ msgstr "仓库周期 3"
 #. module: stock_planning
 #: field:stock.planning,outgoing:0
 msgid "Confirmed Out"
-msgstr "确认出库"
+msgstr "已确认的出库"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
 msgid "Responsible"
-msgstr "有责任"
+msgstr "负责人"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
@@ -1269,19 +1282,19 @@ msgstr "当前的"
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning
 msgid "stock.planning"
-msgstr "库存计划"
+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 "显示仓库的预计.如果在库存计划期间,您将需要在所有的仓库中选择一个做销售预计"
+msgstr "显示关注的仓库的预计.如果在库存计划期间,您将需要在所有的仓库中选择一个做销售预计"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,warehouse_id:0
 msgid "Warehouse which planning will concern."
-msgstr "关注仓库的计划."
+msgstr "关注的仓库计划."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:647
@@ -1300,12 +1313,12 @@ 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 "输入数量(您的计划).修改该值观察库存模拟.该值将大于等于确认的入库."
+msgstr "输入数量(您的计划)入库.修改该值和观察库存模拟.该值将大于等于确认的入库."
 
 #. module: stock_planning
 #: help:stock.planning.createlines,period_id:0
 msgid "Period which planning will concern."
-msgstr "关注计划的周期"
+msgstr "关注周期的计划"
 
 #. module: stock_planning
 #: field:stock.planning,already_out:0
@@ -1315,7 +1328,7 @@ msgstr "已出库"
 #. module: stock_planning
 #: help:stock.planning,product_id:0
 msgid "Product which this planning is created for."
-msgstr "计划创建的新产品"
+msgstr "创建产品的计划"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
@@ -1361,18 +1374,18 @@ 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 "即将入库的数量是在计划入库和确认入库间的差额.在本期一样算为已入库,该值用于创建需求缺少的数量."
+msgstr "即将入库的数量是在计划入库和确认入库间的差,该值用于创建需求缺少的数量."
 
 #. module: stock_planning
 #: help:stock.planning,incoming:0
 msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "在计算周期确认所有即将入库的数量."
+msgstr "在计算周期里已确认入库的数量."
 
 #. module: stock_planning
 #: field:stock.period,date_stop:0
 #: field:stock.period.createlines,date_stop:0
 msgid "End Date"
-msgstr "截止日期"
+msgstr "结束日期"
 
 #. module: stock_planning
 #: help:stock.planning,stock_supply_location:0
@@ -1380,7 +1393,7 @@ 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 "选择供货仓库的的库存存货地点.如果不选择将使用供应商出库存货地点作为供货地点.用在\"从另一个仓库供货\"的那个供应商仓库."
+msgstr "选择供货仓库的的库存库位.如果不选择将使用供应商仓库的出库库位作为供货地点.用在\"从其它仓库供货\"的那个供应商仓库."
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -1390,12 +1403,12 @@ msgstr "没请求"
 #. module: stock_planning
 #: help:stock.planning,minimum_op:0
 msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr "这仓库最低库存量规则的最少数量"
+msgstr "这仓库最低库存量规则的数量"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,period_id:0
 msgid "Shows which period this forecast concerns."
-msgstr "显示关注的预计周期"
+msgstr "显示关注周期的预计"
 
 #. module: stock_planning
 #: field:stock.planning,product_uom:0
@@ -1405,7 +1418,7 @@ msgstr "计量单位"
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculated Period Simulation"
-msgstr "计算周期的模拟"
+msgstr "计算出的周期模拟"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -1478,36 +1491,36 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,procure_to_stock:0
 msgid "Procure To Stock Location"
-msgstr "产品到库存存货地点"
+msgstr "库存库位的产品"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Approve"
-msgstr "批准"
+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 "这计划的周期.请求将在周期的开始就创建."
+msgstr "这计划的周期.在周期开始创建"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Calculate Sales History"
-msgstr "核算销售日志"
+msgstr "计算销售日志"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_amt:0
 msgid "Product Amount"
-msgstr "产品总额"
+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 "选择只要核实预计.如果不选定系要核实和对预计做草稿"
+msgstr "选择要去审核的预计.如果不选定系统去审核和对预计做草稿"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_id:0
@@ -1536,7 +1549,7 @@ msgstr "库存和销售周期"
 #. module: stock_planning
 #: help:stock.sale.forecast,user_id:0
 msgid "Shows who created this forecast, or who validated."
-msgstr "显示谁创建这预计或谁去核实"
+msgstr "显示谁创建这预计或谁去审核"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:644
@@ -1547,9 +1560,25 @@ msgid ""
 " Planned Out Before: "
 msgstr ""
 "\n"
-" 计划前出库 "
+" 之前的计划出库 "
 
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
 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(主生产计划)由用户创建的装箱单： "
+
+#, python-format
+#~ msgid "Pick List "
+#~ msgstr "装箱单 "
diff --git a/addons/stock_planning/security/stock_planning_security.xml b/addons/stock_planning/security/stock_planning_security.xml
new file mode 100644
index 00000000000..62f15e005bb
--- /dev/null
+++ b/addons/stock_planning/security/stock_planning_security.xml
@@ -0,0 +1,21 @@
+<?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
index 7e9342292b9..6ffb0140eb0 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -26,6 +26,11 @@ 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('mps') 
+
 
 def rounding(fl, round_value):
     if not round_value:
@@ -37,11 +42,12 @@ def rounding(fl, round_value):
 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')], 'State')
+        'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State'),
     }
     _defaults = {
         'state': 'draft'
@@ -75,16 +81,16 @@ class stock_sale_forecast(osv.osv):
                                         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('Product Quantity', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
-                                        help= 'Forecasted quantity.'),
+        'product_qty': fields.float('Forecast Quantity', digits_compute=dp.get_precision('Product UoM'), 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 UoM Category'),  # Invisible field for product_uom domain
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
-                        help = "Unit of Measure used to show the quanities of stock calculation." \
+                        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 acording to old uom (active_uom) and new uom.
+# 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 UoM"),
         'state': fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True),
         'analyzed_period1_id': fields.many2one('stock.period', 'Period1', readonly=True, states={'draft':[('readonly',False)]},),
@@ -93,7 +99,7 @@ class stock_sale_forecast(osv.osv):
         '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_dept_id': fields.many2one('hr.department', 'This Department', required=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)]}),
@@ -114,7 +120,7 @@ class stock_sale_forecast(osv.osv):
         '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 Copmany Period1', 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),
@@ -137,7 +143,7 @@ class stock_sale_forecast(osv.osv):
             if t['state'] in ('draft'):
                 unlink_ids.append(t['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Validated Sale Forecasts !'))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a validated sales forecast!'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
@@ -147,7 +153,7 @@ class stock_sale_forecast(osv.osv):
             return result
         result['warehouse_id'] = False
         result['analyzed_user_id'] = False
-        result['analyzed_dept_id'] = False
+        result['analyzed_team_id'] = False
         result['analyzed_warehouse_id'] = False
         return {'value': result}
 
@@ -196,7 +202,7 @@ class stock_sale_forecast(osv.osv):
         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
+            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):
@@ -206,7 +212,7 @@ class stock_sale_forecast(osv.osv):
         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
+            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):
@@ -237,35 +243,24 @@ class stock_sale_forecast(osv.osv):
             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:
-                so_line_product_set = ','.join(map(str,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)
-                    shops_set = ','.join(map(str,shops))
-                else:
-                    shops = False
-                if obj.analyzed_dept_id:
-                    dept_obj = self.pool.get('hr.department')
-                    dept_id =  obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or []
-                    dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)])
-                    cr.execute("SELECT user_id FROM resource_resource rsc, hr_employee emp WHERE (emp.resource_id = rsc.id and emp.department_id IN %s)" ,(tuple(dept_ids),))
-                    dept_users = [x for x, in cr.fetchall()]
-                    dept_users_set =  map(str,dept_users)
-                else:
-                    dept_users = False
-                factor, round_value = self._from_default_uom_factor(cr, uid, obj.product_id.id, obj.product_uom.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:
-                                user_set = str(obj.analyzed_user_id.id)
-                                sales[i][0] = self._sales_per_users(cr, uid, so_period_ids, so_line_product_ids, obj.company_id.id, user_set)
+                                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 dept_users:
-                                sales[i][1] = self._sales_per_users(cr, uid, so_period_ids,  so_line_product_ids, obj.company_id.id, dept_users_set)
+                            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_set)
+                                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, )
@@ -343,13 +338,20 @@ class stock_planning(osv.osv):
                     GROUP BY planning.product_uom", \
                         (date_start, date_stop, val.product_id.id, val.company_id.id,))
         planning_qtys = cr.fetchall()
-        res = self._to_planning_uom(cr, uid, val, planning_qtys, context)
+        res = self._to_default_uom(cr, uid, val, planning_qtys, context)
         return res
 
-    def _to_planning_uom(self, cr, uid, val, qtys, context=None):
+    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:
-            uom_obj = self.pool.get('product.uom')
             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)
@@ -369,7 +371,7 @@ class stock_planning(osv.osv):
                        '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_planning_uom(cr, uid, val, company_qtys, context)
+            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 \
@@ -377,8 +379,8 @@ class stock_planning(osv.osv):
                        '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_planning_uom(cr, uid, val, warehouse_qtys, context)
-            res[val.id]['warehouse_forecast'] = rounding(res[val.id]['warehouse_forecast'],  val.product_id.uom_id.rounding)
+            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):
@@ -419,7 +421,7 @@ class stock_planning(osv.osv):
                 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'] = ret[1]*coef
+            res[val.id]['maximum_op'] = rounding(ret[1]*coef, round_value)
         return res
 
     def onchange_company(self, cr, uid, ids, company_id=False):
@@ -451,11 +453,11 @@ class stock_planning(osv.osv):
         '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 UoM Category'), # Invisible field for product_uom domain
-        'product_uom': fields.many2one('product.uom', 'UoM', required=True, help = "Unit of Measure used to show the quanities of stock calculation." \
-                        "You can use units form default category or from second category (UoS category)."),
+        'product_uom': fields.many2one('product.uom', 'UoM', 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 UoM Category'), # Invisible field for product_uos domain
-# Field used in onchange_uom to check what uom was before change to recalculate quantities acording to old uom (active_uom) and new uom.
-        'active_uom': fields.many2one('product.uom',  string = "Active UoM"),
+# 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 UoM"), #  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.'),
@@ -475,16 +477,16 @@ class stock_planning(osv.osv):
                 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. As a difference between Planned Out and Confirmed Out. ' \
+                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'),
+        '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 Warhouse'),
+                            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 Warhouse'),
+                            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.'),
@@ -499,18 +501,18 @@ class stock_planning(osv.osv):
                             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 = "Chect to make procurement to stock location of selected 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 Warhouse'."),
+        '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 Warhouse' with 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': lambda *args: 'draft' ,
+        '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),
@@ -525,7 +527,7 @@ class stock_planning(osv.osv):
         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
+            coef = coef * product.uos_coeff
         return product.uom_id.factor / coef
 
 
@@ -536,19 +538,22 @@ class stock_planning(osv.osv):
         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
+            res = res * product.uos_coeff
         return res / product.uom_id.factor, uom.rounding
 
     def calculate_planning(self, cr, uid, ids, context, *args):
-        one_minute = relativedelta(minutes=1)
-        current_date_beginning_c = datetime.today()
-        current_date_end_c = current_date_beginning_c  + relativedelta(days=1, minutes=-1)  # to get hour 23:59:00
+        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_minute
+            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 \
@@ -558,10 +563,10 @@ class stock_planning(osv.osv):
             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_minute
+            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),
@@ -623,7 +628,7 @@ class stock_planning(osv.osv):
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'company_id' : obj.company_id.id,
-                        'name': _('Manual planning for %s') %(obj.period_id.name),
+                        '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,
@@ -633,7 +638,7 @@ class stock_planning(osv.osv):
                         '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 in MPS by user: %s   Creation Date: %s \
+                        'note' : _(' Procurement created by MPS for user: %s   Creation Date: %s \
                                         \n For period: %s \
                                         \n according to state: \
                                         \n Warehouse Forecast: %s \
@@ -653,7 +658,7 @@ class stock_planning(osv.osv):
             self.calculate_planning(cr, uid, ids, context)
             prev_text = obj.history or ""
             self.write(cr, uid, ids, {
-                    'history': _('%s Requisition (%s,  %s) %s %s \n') % (prev_text, user.login, time.strftime('%Y.%m.%d %H:%M'),
+                    '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)
                 })
 
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 9995752cb03..3cbee4d53d8 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
         <menuitem id="menu_stock_period_main"
-                  name="Stock and Sales Periods"
-                  parent="base.menu_base_config" sequence="20"/>
+                  name="Stock Periods"
+                  parent="stock.menu_stock_configuration" sequence="20"/>
 
         <!-- Periods tree and form section -->
 
@@ -12,7 +12,7 @@
             <field name="model">stock.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock and Sales Periods">
+                <form string="Stock Periods">
                     <field name="name" colspan="2"/>
                     <newline/>
                     <field name="date_start"/>
@@ -46,7 +46,7 @@
             <field name="model">stock.period</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Stock and Sales Period">
+                <search string="Stock Periods">
                     <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"/>
                     <separator orientation="vertical"/>
@@ -58,11 +58,13 @@
         </record>
 
         <record id="action_stock_period_form" model="ir.actions.act_window">
-            <field name="name">Stock and Sales Periods</field>
+            <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
@@ -112,7 +114,7 @@
                         <label string = ""/>
                         <label string = "Periods :"/>
                         <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
-                        <field name="analyzed_dept_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"/>
@@ -190,14 +192,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
-                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
+                    <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"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <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'}"/>
@@ -215,7 +217,7 @@
             <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="search_view_id" ref="view_stock_sale_forecast_filter"/>
+            <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"
@@ -225,7 +227,7 @@
 
         <!-- Planning section -->
 
-        <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root" sequence="2"/>
+        <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>
@@ -247,6 +249,7 @@
                             <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 colspan ="2" string = "Forecasts"/>
                             <field name="warehouse_forecast"/>
                             <field name="company_forecast"/>
@@ -283,7 +286,7 @@
                             <field name="stock_supply_location"/>
                         </group>
                     </group>
-                    <separator colspan ="4" string = "Requisition history"/>
+                    <separator colspan ="4" string = "Procurement history"/>
                     <field name = "history" colspan = "2" nolabel = "1"/>
                 </form>
             </field>
@@ -295,13 +298,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
-                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" separator="1"/>
+                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
                     <field name="product_id"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <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'}"/>
@@ -338,12 +341,14 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_stock_planning_filter"/>
+            <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_main"
+            parent="menu_stock_planning_manual"
             action="action_view_stock_planning_form"/>
 
 </data>
diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml
index eb0ccbd20ef..df2f53dbb6e 100644
--- a/addons/stock_planning/test/stock_planning.yml
+++ b/addons/stock_planning/test/stock_planning.yml
@@ -38,6 +38,18 @@
     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.
 -
@@ -54,6 +66,66 @@
       '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 PC1-Basic PC and PC3-Medium PC.
 -
@@ -96,15 +168,33 @@
   !python {model: stock.sale.forecast}: |
     forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1'))])
     write_dict = {'product_qty': 30.0,
-    'analyzed_dept_id': ref("hr.dep_sales"),
+    'analyzed_section_id': ref("crm.section_sales_department"),
     '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, {"lang": "en_US", "tz":
+    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 PC3
+-
+  !python {model: stock.sale.forecast}: |
+    forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc3'))])
+    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('stock.res_company_tinyshop0'))
+
 -
   I create Master procurement schedule for the third week of July.
 -
@@ -113,10 +203,22 @@
     period_id: stock_period_03
     product_categ_id: product.product_category_pc
     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('stock.res_company_tinyshop0'))
     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":
@@ -126,11 +228,17 @@
 -
   !python {model: stock.planning}: |
     planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1')),('period_id','=',ref('stock_period_03'))])
-    self.write(cr, uid, planning_ids, {'to_procure': 30.0,'planned_outgoing': 40.0})
-    self.calculate_planning(cr, uid, planning_ids, {"lang": "en_US", "tz": False,
-      "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_planning")],
+    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('stock.res_company_tinyshop0'))
+    self.onchange_uom(cr, uid, planning_ids, ref('product.product_uom_unit'), ref('product.product_product_pc1'),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.
 -
diff --git a/addons/stock_planning/wizard/__init__.py b/addons/stock_planning/wizard/__init__.py
index 1e9d74d0394..876b4afdf68 100644
--- a/addons/stock_planning/wizard/__init__.py
+++ b/addons/stock_planning/wizard/__init__.py
@@ -22,3 +22,5 @@
 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
index 7d4012453de..963ff416822 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods.py
+++ b/addons/stock_planning/wizard/stock_planning_create_periods.py
@@ -46,14 +46,13 @@ class stock_period_createlines(osv.osv_memory):
         '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):
-        if context is None:
-            context = {}
         interval = context.get('interval',0)
         name = context.get('name','Daily')
         period_obj = self.pool.get('stock.period')
@@ -106,7 +105,7 @@ class stock_period_createlines(osv.osv_memory):
         return {
             'domain': "[('id','in', ["+','.join(map(str, lines))+"])]",
             'view_type': 'form',
-            "view_mode": 'tree, form',
+            "view_mode": 'tree,form',
             'res_model': 'stock.period',
             'type': 'ir.actions.act_window',
         }
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index 35b55b8f4e7..42730dc8ace 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -8,8 +8,7 @@
             <field name="model">stock.period.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock and Sales Periods">
-                    <separator colspan="4" string="Create periods for Stock and Sales Planning"/>
+                <form string="Stock Periods">
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <separator colspan="4" string=""/>
@@ -24,16 +23,17 @@
         </record>
 
         <record id="action_stock_period_createlines_form" model="ir.actions.act_window">
-            <field name="name">Stock and Sales Planning Periods</field>
+            <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 and Sales Periods"
+                  name="Create Stock Periods"
                   parent="menu_stock_period_main"
                   action="action_stock_period_createlines_form"
                   sequence = "5"/>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py
index 7abb15b6e7d..a6e12ad4bc7 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines.py
+++ b/addons/stock_planning/wizard/stock_planning_createlines.py
@@ -127,16 +127,13 @@ class stock_planning_createlines(osv.osv_memory):
                         'stock_supply_location': stock_supply_location,
 
                     }))
-        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_planning_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
 
         return {
             'domain': "[('id','in', ["+','.join(map(str, planning_lines))+"])]",
             'view_type': 'form',
-            "view_mode": 'tree, form',
+            "view_mode": 'tree,form',
             'res_model': 'stock.planning',
             'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id'],
         }
 
 stock_planning_createlines()
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 7dc4504daef..b0da05b24ab 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-            
         <!-- Create Planning section -->
-        
         <record id="view_stock_planning_createlines_form" model="ir.ui.view">
             <field name="name">stock.planning.createlines.form</field>
             <field name="model">stock.planning.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines">
-                    <separator colspan ="4" string="Creates planning lines for selected period and warehouse."/>
                     <field name="period_id" widget="selection"/>
+                    <field name="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)]}" widget="selection"/>
-                    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                    <newline/>
-                    <label colspan ="4"  string="Note: Doesn't duplicate existing lines created by you."/>
-                    <separator colspan="4"/>
                     <group colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
                         <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
@@ -30,15 +24,17 @@
         <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_main"
+            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
index 60b3de62243..9f73cf257eb 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast.py
+++ b/addons/stock_planning/wizard/stock_planning_forecast.py
@@ -96,16 +96,13 @@ class stock_sale_forecast_createlines(osv.osv_memory):
                         'product_uom_categ': p.uom_id.category_id.id,
                         'product_uos_categ': prod_uos_categ,
                      }))
-        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_sale_forecast_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
 
         return {
             'domain': "[('id','in', ["+','.join(map(str, forecast_lines))+"])]",
             'view_type': 'form',
-            "view_mode": 'tree, form',
+            "view_mode": 'tree,form',
             'res_model': 'stock.sale.forecast',
             'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id'],
         }
 
 stock_sale_forecast_createlines()
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 9b87b5cdffd..4df396b73f2 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -3,22 +3,17 @@
     <data>
             
         <!--   Create Forecast section   -->
-
         <record id="view_stock_sale_forecast_createlines_form" model="ir.ui.view">
             <field name="name">stock.sale.forecast.createlines</field>
             <field name="model">stock.sale.forecast.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines">
-                    <separator colspan ="4" string="Creates forecast lines for selected warehouse and period."/>
                     <field name="period_id"/>
+                    <field name="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"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <label colspan ="4" string="Note: Doesn't duplicate existing lines created by you."/>
-                    <separator colspan ="4" />
                     <group colspan="4">
                         <button icon="gtk-cancel"  special="cancel" string="Close"/>
                         <button icon="gtk-execute" name="create_forecast" string="Create" type="object" />
@@ -34,12 +29,10 @@
             <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 d2010c47987..581d54c9c4b 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Subscription and recurring operations',
+    'name': 'Recurring Documents',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 Create recurring documents.
 ===========================
diff --git a/addons/subscription/i18n/ar.po b/addons/subscription/i18n/ar.po
index f2defc7eaa5..6c34ec2fc9c 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/bg.po b/addons/subscription/i18n/bg.po
index dcb67441d6f..fb33a02daad 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/bs.po b/addons/subscription/i18n/bs.po
index fa91ba265cb..e01fa0e56a4 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ca.po b/addons/subscription/i18n/ca.po
index 914deb45512..86b9ebbd900 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/cs.po b/addons/subscription/i18n/cs.po
index ae252b2f952..a6ae8d7a4eb 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index 265ef20f075..d9610e3e0b2 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -366,21 +366,3 @@ msgstr "Dokumente erstellt"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the "
-#~ "subscription without removing it."
-#~ msgstr ""
-#~ "Bei Aktivierung können Sie die Abonnements verbergen, ohne sie zu löschen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index 759554ab065..dc97c86cc35 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -373,29 +373,3 @@ msgstr "Documentos creados"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the "
-#~ "subscription without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar la suscripción sin "
-#~ "eliminarla."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "If the active field is set to true, it will allow you to hide the "
-#~ "subscription document without removing it."
-#~ msgstr ""
-#~ "Si el campo activo se desmarca, permite ocultar el documento de suscripción "
-#~ "sin eliminarlo."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/subscription/i18n/es_AR.po b/addons/subscription/i18n/es_AR.po
index 7107fdf0860..c4822d985cc 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es_MX.po b/addons/subscription/i18n/es_MX.po
new file mode 100644
index 00000000000..9a9bb9a6ead
--- /dev/null
+++ b/addons/subscription/i18n/es_MX.po
@@ -0,0 +1,375 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* subscription
+#
+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: 2010-12-09 10:23+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 04:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: subscription
+#: field:subscription.subscription,doc_source:0
+#: field:subscription.subscription.history,document_id:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: subscription
+#: field:subscription.document,model:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "This Week"
+msgstr "Esta semana"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Search Subscription"
+msgstr "Buscar suscripción"
+
+#. module: subscription
+#: field:subscription.subscription,date_init:0
+msgid "First Date"
+msgstr "Primera Fecha"
+
+#. module: subscription
+#: field:subscription.document.fields,field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription_history
+msgid "Subscription history"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: selection:subscription.subscription,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "Current Date"
+msgstr "Fecha actual"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_subscription_form
+#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
+#: view:subscription.subscription:0
+msgid "Subscriptions"
+msgstr "Documentos periódicos"
+
+#. module: subscription
+#: field:subscription.subscription,interval_number:0
+msgid "Interval Qty"
+msgstr "Período: Cantidad de tiempo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Stop"
+msgstr "Parar"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: subscription
+#: model:ir.module.module,description:subscription.module_meta_information
+msgid ""
+"Module allows to create new documents and add subscription on that document."
+msgstr ""
+"Este módulo permite crear nuevos documentos y añadir suscripciones a dicho "
+"documento."
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: subscription
+#: view:subscription.subscription.history:0
+msgid "Subscription History"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: subscription
+#: field:subscription.subscription,interval_type:0
+msgid "Interval Unit"
+msgstr "Unidad de intervalo"
+
+#. module: subscription
+#: field:subscription.subscription.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: subscription
+#: field:subscription.subscription,exec_init:0
+msgid "Number of documents"
+msgstr "Número de documentos"
+
+#. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el documento de suscripción "
+"sin eliminarlo."
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Sale Order"
+msgstr "Orden de venta"
+
+#. module: subscription
+#: field:subscription.document,name:0
+#: field:subscription.subscription,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+"¡No puede modificar el objeto vinculado al tipo de documento!\n"
+"¡Cree otro documento en su lugar!"
+
+#. module: subscription
+#: field:subscription.document,field_ids:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,note:0
+#: field:subscription.subscription,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Days"
+msgstr "Días"
+
+#. module: subscription
+#: field:subscription.document,active:0
+#: field:subscription.subscription,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: subscription
+#: field:subscription.subscription,cron_id:0
+msgid "Cron Job"
+msgstr "Tarea (planificador)"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription
+#: field:subscription.subscription.history,subscription_id:0
+msgid "Subscription"
+msgstr "Suscripción"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: subscription
+#: help:subscription.subscription,cron_id:0
+msgid "Scheduler which runs on subscription"
+msgstr "Planificador que ejecuta la suscripción."
+
+#. module: subscription
+#: model:ir.ui.menu,name:subscription.config_recuuring_event
+#: model:ir.ui.menu,name:subscription.next_id_45
+msgid "Recurring Events"
+msgstr "Eventos recurrentes"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Subsription Data"
+msgstr "Datos de la suscripción"
+
+#. module: subscription
+#: help:subscription.subscription,note:0
+msgid "Description or Summary of Subscription"
+msgstr "Descripción o resumen de la suscripción."
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document
+#: view:subscription.document:0
+#: field:subscription.document.fields,document_id:0
+msgid "Subscription Document"
+msgstr "Documento de suscripción"
+
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la suscripción sin "
+"eliminarla."
+
+#. module: subscription
+#: help:subscription.document.fields,value:0
+msgid "Default value is considered for field when new document is generated."
+msgstr ""
+"Se tiene en cuenta el valor por defecto del campo cuando se genera un nuevo "
+"documento."
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "False"
+msgstr "Falso"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Process"
+msgstr "Procesar"
+
+#. module: subscription
+#: model:ir.module.module,shortdesc:subscription.module_meta_information
+msgid "Subscription and recurring operations"
+msgstr "Suscripciones y operaciones recurrentes"
+
+#. module: subscription
+#: help:subscription.subscription,doc_source:0
+msgid ""
+"User can choose the source document on which he wants to create documents"
+msgstr ""
+"El usuario puede seleccionar el documento original sobre el cual quiere "
+"crear los documentos."
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_document_form
+#: model:ir.ui.menu,name:subscription.menu_action_document_form
+msgid "Document Types"
+msgstr "Tipos de documento"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid "Wrong Source Document !"
+msgstr "¡Documento origen erróneo!"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document_fields
+#: view:subscription.document.fields:0
+msgid "Subscription Document Fields"
+msgstr "Campos de documento de suscripción"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"Por favor proporcione otro documento origen.\n"
+"¡Éste no existe!"
+
+#. module: subscription
+#: field:subscription.document.fields,value:0
+msgid "Default Value"
+msgstr "Valor por defecto"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,doc_lines:0
+msgid "Documents created"
+msgstr "Documentos creados"
+
+#~ 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 "Status"
+#~ msgstr "Posición"
+
+#~ msgid "Subscription document fields"
+#~ msgstr "Campos del documento periódico"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Subscription document"
+#~ msgstr "Documento periódico"
+
+#~ msgid "All Subscriptions"
+#~ msgstr "Todos los documentos periódicos"
+
+#~ msgid "Tools"
+#~ msgstr "Herramientas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/subscription/i18n/es_VE.po b/addons/subscription/i18n/es_VE.po
new file mode 100644
index 00000000000..9a9bb9a6ead
--- /dev/null
+++ b/addons/subscription/i18n/es_VE.po
@@ -0,0 +1,375 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* subscription
+#
+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: 2010-12-09 10:23+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 04:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: subscription
+#: field:subscription.subscription,doc_source:0
+#: field:subscription.subscription.history,document_id:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: subscription
+#: field:subscription.document,model:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "This Week"
+msgstr "Esta semana"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Search Subscription"
+msgstr "Buscar suscripción"
+
+#. module: subscription
+#: field:subscription.subscription,date_init:0
+msgid "First Date"
+msgstr "Primera Fecha"
+
+#. module: subscription
+#: field:subscription.document.fields,field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription_history
+msgid "Subscription history"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: selection:subscription.subscription,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "Current Date"
+msgstr "Fecha actual"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_subscription_form
+#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
+#: view:subscription.subscription:0
+msgid "Subscriptions"
+msgstr "Documentos periódicos"
+
+#. module: subscription
+#: field:subscription.subscription,interval_number:0
+msgid "Interval Qty"
+msgstr "Período: Cantidad de tiempo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Stop"
+msgstr "Parar"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: subscription
+#: model:ir.module.module,description:subscription.module_meta_information
+msgid ""
+"Module allows to create new documents and add subscription on that document."
+msgstr ""
+"Este módulo permite crear nuevos documentos y añadir suscripciones a dicho "
+"documento."
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: subscription
+#: view:subscription.subscription.history:0
+msgid "Subscription History"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: subscription
+#: field:subscription.subscription,interval_type:0
+msgid "Interval Unit"
+msgstr "Unidad de intervalo"
+
+#. module: subscription
+#: field:subscription.subscription.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: subscription
+#: field:subscription.subscription,exec_init:0
+msgid "Number of documents"
+msgstr "Número de documentos"
+
+#. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el documento de suscripción "
+"sin eliminarlo."
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Sale Order"
+msgstr "Orden de venta"
+
+#. module: subscription
+#: field:subscription.document,name:0
+#: field:subscription.subscription,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+"¡No puede modificar el objeto vinculado al tipo de documento!\n"
+"¡Cree otro documento en su lugar!"
+
+#. module: subscription
+#: field:subscription.document,field_ids:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,note:0
+#: field:subscription.subscription,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Days"
+msgstr "Días"
+
+#. module: subscription
+#: field:subscription.document,active:0
+#: field:subscription.subscription,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: subscription
+#: field:subscription.subscription,cron_id:0
+msgid "Cron Job"
+msgstr "Tarea (planificador)"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription
+#: field:subscription.subscription.history,subscription_id:0
+msgid "Subscription"
+msgstr "Suscripción"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: subscription
+#: help:subscription.subscription,cron_id:0
+msgid "Scheduler which runs on subscription"
+msgstr "Planificador que ejecuta la suscripción."
+
+#. module: subscription
+#: model:ir.ui.menu,name:subscription.config_recuuring_event
+#: model:ir.ui.menu,name:subscription.next_id_45
+msgid "Recurring Events"
+msgstr "Eventos recurrentes"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Subsription Data"
+msgstr "Datos de la suscripción"
+
+#. module: subscription
+#: help:subscription.subscription,note:0
+msgid "Description or Summary of Subscription"
+msgstr "Descripción o resumen de la suscripción."
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document
+#: view:subscription.document:0
+#: field:subscription.document.fields,document_id:0
+msgid "Subscription Document"
+msgstr "Documento de suscripción"
+
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la suscripción sin "
+"eliminarla."
+
+#. module: subscription
+#: help:subscription.document.fields,value:0
+msgid "Default value is considered for field when new document is generated."
+msgstr ""
+"Se tiene en cuenta el valor por defecto del campo cuando se genera un nuevo "
+"documento."
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "False"
+msgstr "Falso"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Process"
+msgstr "Procesar"
+
+#. module: subscription
+#: model:ir.module.module,shortdesc:subscription.module_meta_information
+msgid "Subscription and recurring operations"
+msgstr "Suscripciones y operaciones recurrentes"
+
+#. module: subscription
+#: help:subscription.subscription,doc_source:0
+msgid ""
+"User can choose the source document on which he wants to create documents"
+msgstr ""
+"El usuario puede seleccionar el documento original sobre el cual quiere "
+"crear los documentos."
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_document_form
+#: model:ir.ui.menu,name:subscription.menu_action_document_form
+msgid "Document Types"
+msgstr "Tipos de documento"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid "Wrong Source Document !"
+msgstr "¡Documento origen erróneo!"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document_fields
+#: view:subscription.document.fields:0
+msgid "Subscription Document Fields"
+msgstr "Campos de documento de suscripción"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"Por favor proporcione otro documento origen.\n"
+"¡Éste no existe!"
+
+#. module: subscription
+#: field:subscription.document.fields,value:0
+msgid "Default Value"
+msgstr "Valor por defecto"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,doc_lines:0
+msgid "Documents created"
+msgstr "Documentos creados"
+
+#~ 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 "Status"
+#~ msgstr "Posición"
+
+#~ msgid "Subscription document fields"
+#~ msgstr "Campos del documento periódico"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Subscription document"
+#~ msgstr "Documento periódico"
+
+#~ msgid "All Subscriptions"
+#~ msgstr "Todos los documentos periódicos"
+
+#~ msgid "Tools"
+#~ msgstr "Herramientas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po
index 6473924a30c..c1f0335016b 100644
--- a/addons/subscription/i18n/et.po
+++ b/addons/subscription/i18n/et.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:16+0000\n"
-"PO-Revision-Date: 2010-10-30 14:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-10-11 18:14+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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -30,7 +30,7 @@ msgstr "Objekt"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "See nädal"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -76,13 +76,13 @@ msgstr "Nädalad"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "Täna"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:44
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Viga !"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -265,7 +265,7 @@ msgstr "Väär"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupeeri..."
 
 #. module: subscription
 #: view:subscription.subscription:0
diff --git a/addons/subscription/i18n/fi.po b/addons/subscription/i18n/fi.po
index c999354d734..3c3ddba9aa2 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: 2011-08-05 04:39+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index d3200e76477..a273b7b57d4 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -373,15 +373,3 @@ msgstr "Document crée"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom du Modèle non valide dans la définition de l'action"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat pour un module doit être unique !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/subscription/i18n/gl.po b/addons/subscription/i18n/gl.po
index 61197c17180..f52c7a595c8 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -100,7 +100,7 @@ msgstr "Período: Cantidade de tempo"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #. module: subscription
 #: view:subscription.subscription:0
diff --git a/addons/subscription/i18n/hr.po b/addons/subscription/i18n/hr.po
index f2defc7eaa5..6c34ec2fc9c 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/hu.po b/addons/subscription/i18n/hu.po
index e6c6b4611b1..3254218f256 100644
--- a/addons/subscription/i18n/hu.po
+++ b/addons/subscription/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-04 15:31+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/id.po b/addons/subscription/i18n/id.po
index d2e9a2240bd..1815707b8fa 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 7fb5ae1a8bc..6cae2c6adb6 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-12-16 17:19+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index e9831fd4833..c4292d7e281 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/lt.po b/addons/subscription/i18n/lt.po
index fefea41e662..d6bbfabca11 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/nl.po b/addons/subscription/i18n/nl.po
index 67854665a67..92d8355d887 100644
--- a/addons/subscription/i18n/nl.po
+++ b/addons/subscription/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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/nl_BE.po b/addons/subscription/i18n/nl_BE.po
index 957cb42511a..eb5a2671364 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 07586492750..e6f23ab6bde 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index e8caaf82316..8697d6251ec 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -366,15 +366,3 @@ msgstr "Documentos criado"
 
 #~ msgid "All Subscriptions"
 #~ msgstr "Todas as Subscrições"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index ecd1eea86d7..858a7f279ac 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ro.po b/addons/subscription/i18n/ro.po
index f2defc7eaa5..6c34ec2fc9c 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index 7bef10df4ce..4c261aff2a4 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sl.po b/addons/subscription/i18n/sl.po
index fab5986f08e..d79889013f1 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sq.po b/addons/subscription/i18n/sq.po
index fe644c6b0e2..7f37f4649de 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sv.po b/addons/subscription/i18n/sv.po
index b8027e8619d..f99e2ec77b2 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: 2011-04-29 04:48+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -25,27 +25,27 @@ msgstr ""
 #. module: subscription
 #: field:subscription.document,model:0
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "Denna vecka"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "Sök prenumeration"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
 msgid "First Date"
-msgstr ""
+msgstr "Första datum"
 
 #. module: subscription
 #: field:subscription.document.fields,field:0
 msgid "Field"
-msgstr ""
+msgstr "Fält"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -56,33 +56,33 @@ msgstr ""
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
 msgid "Subscription history"
-msgstr ""
+msgstr "Prenumerationshistorik"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Draft"
-msgstr "Utdrag"
+msgstr "Utkast"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "Current Date"
-msgstr ""
+msgstr "Aktuellt datum"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
-msgstr ""
+msgstr "Veckor"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "Idag"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:44
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fel!"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -104,13 +104,15 @@ msgstr "Stopp"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Sätt som utkast"
 
 #. module: subscription
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
 msgstr ""
+"Modulen tillåter skapandet av nya dokument samt att prenumerera på "
+"dokumentet."
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -121,7 +123,7 @@ msgstr ""
 #. module: subscription
 #: view:subscription.subscription.history:0
 msgid "Subscription History"
-msgstr ""
+msgstr "Prenumerationshistorik"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -142,7 +144,7 @@ msgstr "Datum"
 #. module: subscription
 #: field:subscription.subscription,exec_init:0
 msgid "Number of documents"
-msgstr ""
+msgstr "Antal dokument"
 
 #. module: subscription
 #: help:subscription.document,active:0
@@ -154,7 +156,7 @@ msgstr ""
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Försäljningsorder"
 
 #. module: subscription
 #: field:subscription.document,name:0
@@ -169,11 +171,13 @@ msgid ""
 "You cannot modify the Object linked to the Document Type!\n"
 "Create another Document instead !"
 msgstr ""
+"Du kan inte ändra objektet som är kopplat till Dokumenttypen!\n"
+" Skapa ett annat dokument istället!"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
 msgid "Fields"
-msgstr ""
+msgstr "Fält"
 
 #. module: subscription
 #: view:subscription.subscription:0
diff --git a/addons/subscription/i18n/tlh.po b/addons/subscription/i18n/tlh.po
index 179681c44c7..e05d9bb1241 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index b8aeae4c368..6111ffd977d 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/uk.po b/addons/subscription/i18n/uk.po
index 9318aad305c..e43c9adfb87 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/vi.po b/addons/subscription/i18n/vi.po
index 5c4f72e00f6..7670fd3680a 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\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 a0ec2542746..60b3facb62b 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-03-20 10:31+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -30,12 +30,12 @@ msgstr "对象"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "这周"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "搜索预约"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -51,12 +51,12 @@ msgstr "字段"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
 msgid "Subscription history"
-msgstr "预订历史"
+msgstr "订阅日志"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
@@ -76,20 +76,20 @@ msgstr "周"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "今天"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:44
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
 #: model:ir.ui.menu,name:subscription.menu_action_subscription_form
 #: view:subscription.subscription:0
 msgid "Subscriptions"
-msgstr "预订"
+msgstr "订阅"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
@@ -110,7 +110,7 @@ msgstr "设为草稿"
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
-msgstr "模块允许创建新的文档和在文档增加预订"
+msgstr "模块允许创建新的文档和对文档增加订阅"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -121,7 +121,7 @@ msgstr "运行"
 #. module: subscription
 #: view:subscription.subscription.history:0
 msgid "Subscription History"
-msgstr "预订历史"
+msgstr "订阅日志"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -149,7 +149,7 @@ msgstr "文档号码"
 msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
-msgstr ""
+msgstr "如果有效字段为false，它将允许你隐藏订阅这文档，并随后删除它。"
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -169,6 +169,8 @@ msgid ""
 "You cannot modify the Object linked to the Document Type!\n"
 "Create another Document instead !"
 msgstr ""
+"你不能修改这文档类型的对象！\n"
+"创建其它文档替代它！"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
@@ -207,7 +209,7 @@ msgstr "定时作业"
 #: model:ir.model,name:subscription.model_subscription_subscription
 #: field:subscription.subscription.history,subscription_id:0
 msgid "Subscription"
-msgstr "预订"
+msgstr "订阅"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -218,68 +220,68 @@ 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
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "订阅的说明或摘要"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr "预订文档"
+msgstr "订阅文档"
 
 #. module: subscription
 #: help:subscription.subscription,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription without removing it."
-msgstr ""
+msgstr "如果有效字段设为false，允许你隐藏这订阅并随后删除它。"
 
 #. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
-msgstr ""
+msgstr "默认值是生成新文档时参考的字段"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "False"
-msgstr "假"
+msgstr "False"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Process"
-msgstr "处理"
+msgstr "执行"
 
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr "预定和经常性操作"
+msgstr "订阅和经常性操作"
 
 #. module: subscription
 #: help:subscription.subscription,doc_source:0
 msgid ""
 "User can choose the source document on which he wants to create documents"
-msgstr ""
+msgstr "用户可以选择他希望创建文档的源文档"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
@@ -291,13 +293,13 @@ msgstr "文档类型"
 #: code:addons/subscription/subscription.py:115
 #, python-format
 msgid "Wrong Source Document !"
-msgstr ""
+msgstr "不正确的源文档！"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr "预订文档字段"
+msgstr "订阅文档字段"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -316,12 +318,12 @@ msgstr "发票"
 msgid ""
 "Please provide another source document.\n"
 "This one does not exist !"
-msgstr ""
+msgstr "该文档不存在，请提供另外的源文档！"
 
 #. module: subscription
 #: field:subscription.document.fields,value:0
 msgid "Default Value"
-msgstr "默认价值"
+msgstr "默认值"
 
 #. module: subscription
 #: view:subscription.subscription:0
diff --git a/addons/subscription/i18n/zh_TW.po b/addons/subscription/i18n/zh_TW.po
index b607322c4e5..8ad995a2277 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: 2011-04-29 04:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 4f40ea25c35..466defd1fa2 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -38,12 +38,6 @@ class subscription_document(osv.osv):
     _defaults = {
         'active' : lambda *a: True,
     }
-    
-    def write(self, cr, uid, ids, vals, context=None):
-        if 'model' in vals:
-            raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type!\nCreate another Document instead !'))
-        return super(subscription_document, self).write(cr, uid, ids, vals, context=context)
-    
 subscription_document()
 
 class subscription_document_fields(osv.osv):
@@ -136,6 +130,12 @@ class subscription_subscription(osv.osv):
             self.write(cr, uid, [row['id']], {'state':state})
         return True
 
+    def unlink(self, cr, uid, ids, context=None):
+        for record in self.browse(cr, uid, ids, context or {}):
+            if record.state=="running":
+                raise osv.except_osv(_('Error !'),_('You cannot delete an active subscription !'))
+        return super(subscription_subscription, self).unlink(cr, uid, ids, context)
+
     def set_done(self, cr, uid, ids, context=None):
         res = self.read(cr,uid, ids, ['cron_id'])
         ids2 = [x['cron_id'][0] for x in res if x['id']]
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b3c39962190..550240d522e 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -75,7 +75,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Subscription">
-                    <group col="10" colspan="4">
+                    <group>
                         <filter icon="terp-check"
                         string="Running"
                         domain="[('state','=','running')]"/>
@@ -85,11 +85,11 @@
                     domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="user_id" select="1"/>
+                        <field name="user_id"/>
                         <field name="partner_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="4">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
@@ -169,7 +169,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Subscription Document">
-                    <group col="10" colspan="4">
+                    <group>
                         <field name="name"/>
                         <field name="model"/>
                     </group>
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index e44efbe0bf9..e9bd92f5840 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Survey Module',
+    'name': 'Survey',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module is used for surveying.
 ==================================
@@ -33,7 +33,7 @@ Different users may give different answers of question and according to that sur
 Partners are also sent mails with user name and password for the invitation of the survey
     """,
     'author': 'OpenERP SA',
-    'depends': ['base_tools'],
+    'depends': ['base_tools', 'mail'],
     'update_xml': ['survey_report.xml',
                    'survey_data.xml',
                    'wizard/survey_selection.xml',
diff --git a/addons/survey/i18n/bg.po b/addons/survey/i18n/bg.po
index 33ecdf53ec9..4253482f5ed 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: 2011-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr "Тип на отговор"
 msgid "Validation"
 msgstr "Валидиране"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/ca.po b/addons/survey/i18n/ca.po
index c1ea9119a41..cd321c82ae1 100644
--- a/addons/survey/i18n/ca.po
+++ b/addons/survey/i18n/ca.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: 2011-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 msgid "Print Option"
-msgstr ""
+msgstr "Opcions d'impressió"
 
 #. module: survey
 #: code:addons/survey/survey.py:422
@@ -31,17 +31,19 @@ msgid ""
 "greater than the number of answer.                                      "
 "Please use a number that is smaller than %d."
 msgstr ""
+"El nombre de respostes necessàries mínim que heu introduït és major que el "
+"nombre de respostes. Utilitzeu un nombre menor que %d."
 
 #. module: survey
 #: view:survey.question.wiz:0
 msgid "Your Messages"
-msgstr ""
+msgstr "Els vostres missatges"
 
 #. module: survey
 #: field:survey.question,comment_valid_type:0
 #: field:survey.question,validation_type:0
 msgid "Text Validation"
-msgstr ""
+msgstr "Validació del text"
 
 #. module: survey
 #: code:addons/survey/survey.py:434
@@ -51,17 +53,19 @@ msgid ""
 "your maximum is greater than the number of answer.                           "
 "           Please use a number that is smaller than %d."
 msgstr ""
+"El nombre de respostes necessàries màxim que heu introduït per al màxim és "
+"major que el nombre de respostes. Utilitzeu un nombre menor que %d."
 
 #. module: survey
 #: view:survey:0
 #: field:survey,invited_user_ids:0
 msgid "Invited User"
-msgstr ""
+msgstr "Usuari invitat"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Character"
-msgstr ""
+msgstr "Caràcter"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form1
@@ -70,17 +74,17 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_form
 #: model:ir.ui.menu,name:survey.menu_surveys
 msgid "Surveys"
-msgstr ""
+msgstr "Enquestes"
 
 #. module: survey
 #: view:survey:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Canvia a esborrany"
 
 #. module: survey
 #: field:survey.question,in_visible_answer_type:0
 msgid "Is Answer Type Invisible?"
-msgstr ""
+msgstr "La resposta és de tipus invisible?"
 
 #. module: survey
 #: view:survey:0
@@ -88,37 +92,37 @@ msgstr ""
 #: view:survey.question:0
 #: view:survey.request:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "Results :"
-msgstr ""
+msgstr "Resultats :"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Survey Request"
-msgstr ""
+msgstr "Sol·licitud d'enquesta"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "A Range"
-msgstr ""
+msgstr "Un rang"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Table Answer"
-msgstr ""
+msgstr "Taula de respostes"
 
 #. module: survey
 #: field:survey.history,date:0
 msgid "Date started"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: survey
 #: field:survey,history:0
 msgid "History Lines"
-msgstr ""
+msgstr "Línies històric"
 
 #. module: survey
 #: code:addons/survey/survey.py:448
@@ -127,63 +131,65 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"Heu d'introduir una o més opcions de menú en la capçalera de columna (no es "
+"permeten espais en blanc)"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible??"
-msgstr ""
+msgstr "L'opció de menú és invisible?"
 
 #. module: survey
 #: field:survey.send.invitation,mail:0
 msgid "Body"
-msgstr ""
+msgstr "Missatge"
 
 #. module: survey
 #: field:survey.question,allow_comment:0
 msgid "Allow Comment Field"
-msgstr ""
+msgstr "Permetre camp comentari"
 
 #. 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 "Data màxima"
 
 #. module: survey
 #: field:survey.question,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible?"
-msgstr ""
+msgstr "L'opció de menú és invisible?"
 
 #. module: survey
 #: view:survey:0
 msgid "Completed"
-msgstr ""
+msgstr "Completada"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "Exactly"
-msgstr ""
+msgstr "Exactament"
 
 #. module: survey
 #: view:survey:0
 msgid "Open Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Canvia a esborrany"
 
 #. module: survey
 #: field:survey.question,is_comment_require:0
 msgid "Add Comment Field"
-msgstr ""
+msgstr "Camp per agregar comentari"
 
 #. module: survey
 #: code:addons/survey/survey.py:401
@@ -193,31 +199,33 @@ msgid ""
 "than the number of answer.                                     Please use a "
 "number that is smaller than %d."
 msgstr ""
+"El nombre de respostes necessàries que heu introduït és major que el nombre "
+"de respostes. Utilitzeu un número menor que %d."
 
 #. module: survey
 #: field:survey.question,tot_resp:0
 msgid "Total Answer"
-msgstr ""
+msgstr "Total respostes"
 
 #. module: survey
 #: field:survey.tbl.column.heading,name:0
 msgid "Row Number"
-msgstr ""
+msgstr "Número de fila"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_name_wiz
 msgid "survey.name.wiz"
-msgstr ""
+msgstr "enquesta.nom.assist"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_question_form
 msgid "Survey Questions"
-msgstr ""
+msgstr "Preguntes de l'enquesta"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Only One Answers Per Row)"
-msgstr ""
+msgstr "Matriu de selecció (solament una resposta per fila)"
 
 #. module: survey
 #: code:addons/survey/survey.py:475
@@ -226,6 +234,8 @@ msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
 "number of answer. Please use a number that is smaller than %d."
 msgstr ""
+"El número màxim de respostes obligatòries que heu introduït per al seu màxim "
+"és major que el número de respostes. Utilitzeu un número menor que %d."
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_question_message
@@ -234,106 +244,107 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Survey Question"
-msgstr ""
+msgstr "Pregunta de l'enquesta"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Use if question type is rating_scale"
-msgstr ""
+msgstr "Utilitzeu si la pregunta és de tipus qualificació_escala"
 
 #. module: survey
 #: field:survey.print,page_number:0
 #: field:survey.print.answer,page_number:0
 msgid "Include Page Number"
-msgstr ""
+msgstr "Inclou número de pàgina"
 
 #. module: survey
 #: view:survey.page:0
 #: view:survey.question:0
 #: view:survey.send.invitation.log:0
 msgid "Ok"
-msgstr ""
+msgstr "Accepta"
 
 #. module: survey
 #: field:survey.page,title:0
 msgid "Page Title"
-msgstr ""
+msgstr "Títol de la pàgina"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_define_survey
 msgid "Define Surveys"
-msgstr ""
+msgstr "Defineix enquestes"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_history
 msgid "Survey History"
-msgstr ""
+msgstr "Històric enquestes"
 
 #. module: survey
 #: field:survey.response.answer,comment:0
 #: field:survey.response.line,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 msgid "Search Survey"
-msgstr ""
+msgstr "Cerca enquesta"
 
 #. module: survey
 #: field:survey.response.answer,answer:0
 #: field:survey.tbl.column.heading,value:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 #. module: survey
 #: field:survey.question,column_heading_ids:0
 msgid " Column heading"
-msgstr ""
+msgstr " Capçalera columna"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_run_survey_form
 msgid "Answer a Survey"
-msgstr ""
+msgstr "Respon una enquesta"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:92
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: survey
 #: field:survey,tot_comp_survey:0
 msgid "Total Completed Survey"
-msgstr ""
+msgstr "Total d'enquestes completades"
 
 #. module: survey
 #: view:survey.response.answer:0
 msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
 msgstr ""
+"(utilitzeu només quan el tipus de pregunta sigui matrix_of_drop_down_menus)"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_analysis
 msgid "Survey Statistics"
-msgstr ""
+msgstr "Estadístiques enquestes"
 
 #. module: survey
 #: selection:survey,state:0
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Rating Scale"
-msgstr ""
+msgstr "Escala de qualificació"
 
 #. module: survey
 #: field:survey.question,comment_field_type:0
 msgid "Comment Field Type"
-msgstr ""
+msgstr "Camp tipus comentari"
 
 #. module: survey
 #: code:addons/survey/survey.py:375
@@ -381,114 +392,116 @@ msgstr ""
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avís!"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Single Line Of Text"
-msgstr ""
+msgstr "Única línia de text"
 
 #. module: survey
 #: view:survey.send.invitation:0
 #: field:survey.send.invitation,send_mail_existing:0
 msgid "Send reminder for existing user"
-msgstr ""
+msgstr "Envia recordatori per a usuari existent"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Multiple Answer)"
-msgstr ""
+msgstr "Selecció múltiple (múltiples respostes)"
 
 #. module: survey
 #: view:survey:0
 msgid "Edit Survey"
-msgstr ""
+msgstr "Edita enquesta"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Survey Answer Line"
-msgstr ""
+msgstr "Línia de resposta enquesta"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
 msgid "Menu Choice"
-msgstr ""
+msgstr "Menú Selecció"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Most"
-msgstr ""
+msgstr "Com a màxim"
 
 #. module: survey
 #: field:survey.question,is_validation_require:0
 msgid "Validate Text"
-msgstr ""
+msgstr "Valida text"
 
 #. module: survey
 #: field:survey.response.line,single_text:0
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #. module: survey
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La companyia seleccionada no està en les companyies permeses per aquest "
+"usuari"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Letter (8.5\" x 11\")"
-msgstr ""
+msgstr "Carta (216mm x 279mm)"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "sol·licitud.enquesta"
 
 #. module: survey
 #: field:survey.send.invitation,mail_subject:0
 #: field:survey.send.invitation,mail_subject_existing:0
 msgid "Subject"
-msgstr ""
+msgstr "Assumpte"
 
 #. module: survey
 #: field:survey.question,comment_maximum_float:0
 #: field:survey.question,validation_maximum_float:0
 msgid "Maximum decimal number"
-msgstr ""
+msgstr "Número màxim de decimals"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Late"
-msgstr ""
+msgstr "Retardat"
 
 #. module: survey
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "No podeu tenir dos usuaris amb el mateix identificador!"
 
 #. module: survey
 #: field:survey.send.invitation,mail_from:0
 msgid "From"
-msgstr ""
+msgstr "Des de"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Don't Validate Comment Text."
-msgstr ""
+msgstr "No valideu el text del comentari"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Whole Number"
-msgstr ""
+msgstr "Ha de ser un número enter"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -497,22 +510,22 @@ msgstr ""
 #: field:survey.question.column.heading,question_id:0
 #: field:survey.response.line,question_id:0
 msgid "Question"
-msgstr ""
+msgstr "Qüestió"
 
 #. module: survey
 #: view:survey.page:0
 msgid "Search Survey Page"
-msgstr ""
+msgstr "Cerca pàgina de l'enquesta"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Send"
-msgstr ""
+msgstr "Envia"
 
 #. module: survey
 #: field:survey.question.wiz,name:0
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 #. module: survey
 #: code:addons/survey/survey.py:444
@@ -521,6 +534,7 @@ msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading"
 msgstr ""
+"Heu d'introduir una o més opcions de menú, en l'encapçalat de la columna"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form1
@@ -531,84 +545,89 @@ msgid ""
 "etc. You can edit survey manually or click on the 'Edit Survey' for a "
 "WYSIWYG interface."
 msgstr ""
+"Podeu crear enquestes per a diferents propòsits: entrevistes de selecció de "
+"personal, avaluacions periòdiques dels treballadors, campanyes de "
+"màrqueting, etc. Una enquesta es compon de pàgines que contenen preguntes de "
+"diversos tipus: text, opcions múltiples, etc. Podeu editar l'enquesta "
+"manualment o fent clic en \"Edita enquesta” per a una interfície WYSIWYG."
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 #: field:survey.request,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Fase del pla d'avaluació"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Between"
-msgstr ""
+msgstr "Entre"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimeix"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
 msgid "Make Comment Field an Answer Choice"
-msgstr ""
+msgstr "Fes camp comentari com a opció de resposta"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_answer_surveys
 msgid "Answer Surveys"
-msgstr ""
+msgstr "Respon enquestes"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
-msgstr ""
+msgstr "No acabat"
 
 #. module: survey
 #: view:survey.print:0
 msgid "Survey Print"
-msgstr ""
+msgstr "Imprimeix enquesta"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Select Partner"
-msgstr ""
+msgstr "Selecciona empresa"
 
 #. module: survey
 #: field:survey.question,type:0
 msgid "Question Type"
-msgstr ""
+msgstr "Tipus de pregunta"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:131
 #, python-format
 msgid "You can not answer this survey more than %s times"
-msgstr ""
+msgstr "No podeu respondre l'enquesta més de '%s' vegades"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
 msgid "Answers"
-msgstr ""
+msgstr "Respostes"
 
 #. module: survey
 #: model:ir.module.module,description:survey.module_meta_information
@@ -624,29 +643,39 @@ msgid ""
 "invitation of the survey\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul s'utilitza per realitzar enquestes. Es basa en les "
+"respostes o comentaris dels usuaris a diverses preguntes.\n"
+"    Una enquesta pot tenir diverses pàgines. Cada pàgina pot tenir múltiples "
+"preguntes i cada pregunta pot tenir diverses respostes.\n"
+"    Diferents usuaris poden donar diferents respostes a la pregunta d'acord "
+"a com estigui confeccionada l'enquesta. \n"
+"    També es pot convidar a les empreses a respondre una enquesta, enviant "
+"correus electrònics amb el nom d'usuari i la contrasenya.\n"
+"    "
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You can not answer because the survey is not open"
-msgstr ""
+msgstr "No podeu respondre perquè l'enquesta no està oberta"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Link"
-msgstr ""
+msgstr "Enllaç"
 
 #. 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 "Tipus d'enquesta"
 
 #. module: survey
 #: field:survey.page,sequence:0
 msgid "Page Nr"
-msgstr ""
+msgstr "Pàgina núm"
 
 #. module: survey
 #: view:survey:0
@@ -655,12 +684,12 @@ msgstr ""
 #: field:survey.question,descriptive_text:0
 #: selection:survey.question,type:0
 msgid "Descriptive Text"
-msgstr ""
+msgstr "Text descriptiu"
 
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "Resposta mínima necessària"
 
 #. module: survey
 #: code:addons/survey/survey.py:484
@@ -669,74 +698,77 @@ msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
 "allowed)"
 msgstr ""
+"Heu d'introduir una o més opcions de menú en l'encapçalat de la columna "
+"(espais en blanc no estan permesos)"
 
 #. module: survey
 #: field:survey.question,req_error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Missatge d'error"
 
 #. module: survey
 #: code:addons/survey/survey.py:482
 #, python-format
 msgid "You must enter one or more menu choices in column heading"
 msgstr ""
+"Heu d'introduir una o més opcions de menú en l'encapçalat de la columna"
 
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
-msgstr ""
+msgstr "Data límit"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Date"
-msgstr ""
+msgstr "Ha de ser una data"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print
 msgid "survey.print"
-msgstr ""
+msgstr "enquesta.imprimeix"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 #: field:survey.question.column.heading,title:0
 msgid "Column Heading"
-msgstr ""
+msgstr "Capçalera de la columna"
 
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+msgstr "Resposta obligatòria per a la pregunta"
 
 #. 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 "Sol·licituds d'enquestes"
 
 #. module: survey
 #: code:addons/survey/survey.py:375
 #: code:addons/survey/survey.py:462
 #, python-format
 msgid "You must enter one or more column heading."
-msgstr ""
+msgstr "Heu d'introduir una o més capçaleres de columna."
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:758
 #: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
-msgstr ""
+msgstr "Introduïu un valor numèric enter"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
 msgid "survey.browse.answer"
-msgstr ""
+msgstr "enquesta.explora.respostes"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "Paràgraf de text"
 
 #. module: survey
 #: code:addons/survey/survey.py:428
@@ -746,11 +778,14 @@ msgid ""
 "your maximum is greater than the number of answer.                           "
 "          Please use a number that is smaller than %d."
 msgstr ""
+"El número màxim de respostes obligatòries que heu introduït per al seu màxim "
+"és major que el número de respostes. Utilitzeu un número menor que %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
-msgstr ""
+msgid "Waiting Answer"
+msgstr "Esperant resposta"
 
 #. module: survey
 #: view:survey:0
@@ -758,24 +793,25 @@ msgstr ""
 #: view:survey.question:0
 msgid "When the question is not answered, display this error message:"
 msgstr ""
+"Quan la resposta no sigui contestada, mostra aquest missatge d'error:"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Options"
-msgstr ""
+msgstr "Opcions"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_browse_survey_response
 msgid "Browse Answers"
-msgstr ""
+msgstr "Cerca respostes"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
 #: view:survey.response.line:0
 msgid "Comment"
-msgstr ""
+msgstr "Comentari"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_answer
@@ -785,51 +821,51 @@ msgstr ""
 #: view:survey.response.answer:0
 #: view:survey.response.line:0
 msgid "Survey Answer"
-msgstr ""
+msgstr "Resposta de l'enquesta"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Selection"
-msgstr ""
+msgstr "Selecció"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_browse_survey_response
 #: view:survey:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "Respon enquesta"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Comment Field"
-msgstr ""
+msgstr "Camp comentari"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Manually"
-msgstr ""
+msgstr "Manualment"
 
 #. module: survey
 #: help:survey,responsible_id:0
 msgid "User responsible for survey"
-msgstr ""
+msgstr "Usuari responsable de l'enquesta."
 
 #. module: survey
 #: field:survey.question,comment_column:0
 msgid "Add comment column in matrix"
-msgstr ""
+msgstr "Afegeix columna de comentaris en la matriu"
 
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "Resposta núm"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "Imprimeix sense salts de pàgina"
 
 #. module: survey
 #: view:survey:0
@@ -837,6 +873,8 @@ msgstr ""
 #: view:survey.question:0
 msgid "When the comment is an invalid format, display this error message"
 msgstr ""
+"Quan el comentari estigui en un format no vàlid, mostra aquest missatge "
+"d'error"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:138
@@ -845,67 +883,69 @@ msgid ""
 "You can not give more response. Please contact the author of this survey for "
 "further assistance."
 msgstr ""
+"No podeu donar més respostes. Poseu-vos en contacte amb l'autor d'aquesta "
+"enquesta per obtenir més ajuda."
 
 #. 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 "Preguntes"
 
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one Answer per user"
-msgstr ""
+msgstr "Estableix a un si només requereix una resposta per usuari."
 
 #. module: survey
 #: field:survey,users:0
 msgid "Users"
-msgstr ""
+msgstr "Usuaris/es"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 msgid "MY"
-msgstr ""
+msgstr "EL MEU"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
 msgid "Maximum Required Answer"
-msgstr ""
+msgstr "Màxim de respostes obligatories"
 
 #. module: survey
 #: field:survey.name.wiz,page_no:0
 msgid "Page Number"
-msgstr ""
+msgstr "Número de pàgina"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:92
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
-msgstr ""
+msgstr "No es pot localitzar l'enquesta per a l'assistent de preguntes!"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "and"
-msgstr ""
+msgstr "i"
 
 #. 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 "Imprimeix estadístiques de l'enquesta"
 
 #. module: survey
 #: field:survey.send.invitation.log,note:0
 msgid "Log"
-msgstr ""
+msgstr "Registre"
 
 #. module: survey
 #: view:survey:0
@@ -913,61 +953,64 @@ msgstr ""
 #: view:survey.question:0
 msgid "When the choices do not add up correctly, display this error message"
 msgstr ""
+"Mostra aquest missatge d'error quan les seleccions no totalitzin correctament"
 
 #. module: survey
 #: field:survey,date_close:0
 msgid "Survey Close Date"
-msgstr ""
+msgstr "Data de tancament de l'enquesta"
 
 #. module: survey
 #: field:survey,date_open:0
 msgid "Survey Open Date"
-msgstr ""
+msgstr "Data d'obertura de l'enquesta"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible ??"
-msgstr ""
+msgstr "L'escala de qualificació és invisible?"
 
 #. module: survey
 #: view:survey.browse.answer:0
 #: view:survey.name.wiz:0
 msgid "Start"
-msgstr ""
+msgstr "Inicia"
 
 #. module: survey
 #: code:addons/survey/survey.py:477
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer"
 msgstr ""
+"El número màxim de respostes obligatòries és major que el mínim de respostes "
+"obligatòries."
 
 #. module: survey
 #: field:survey.question,comment_maximum_no:0
 #: field:survey.question,validation_maximum_no:0
 msgid "Maximum number"
-msgstr ""
+msgstr "Número màxim"
 
 #. module: survey
 #: selection:survey,state:0
 #: selection:survey.request,state:0
 #: selection:survey.response.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_statistics
 msgid "survey.print.statistics"
-msgstr ""
+msgstr "enquesta.imprimeix.estadístiques"
 
 #. module: survey
 #: selection:survey,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Tancada"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Drop-down Menus"
-msgstr ""
+msgstr "Matriu de menús desplegables"
 
 #. module: survey
 #: view:survey:0
@@ -989,138 +1032,132 @@ msgstr ""
 #: field:survey.send.invitation,partner_ids:0
 #: field:survey.tbl.column.heading,response_table_id:0
 msgid "Answer"
-msgstr ""
+msgstr "Resposta"
 
 #. module: survey
 #: field:survey,max_response_limit:0
 msgid "Maximum Answer Limit"
-msgstr ""
+msgstr "Límit màxim de resposta"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
 msgid "Send Invitations"
-msgstr ""
+msgstr "Envia invitacions"
 
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "Desa resposta"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Date and Time"
-msgstr ""
+msgstr "Data i hora"
 
 #. module: survey
 #: field:survey,state:0
 #: field:survey.response,state:0
 #: field:survey.response.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estat"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print
 msgid "Print Survey"
-msgstr ""
+msgstr "Imprimeix enquesta"
 
 #. module: survey
 #: field:survey,send_response:0
 msgid "E-mail Notification on Answer"
-msgstr ""
+msgstr "Email de notificació sobre la resposta"
 
 #. module: survey
 #: field:survey.response.answer,value_choice:0
 msgid "Value Choice"
-msgstr ""
+msgstr "Valor de la selecció"
 
 #. module: survey
 #: view:survey:0
 msgid "Started"
-msgstr ""
+msgstr "Iniciada"
 
 #. 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 "Imprimeix resposta"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Diversos camps de text"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Landscape(Horizontal)"
-msgstr ""
+msgstr "Horitzontal"
 
 #. module: survey
 #: field:survey.question,no_of_rows:0
 msgid "No of Rows"
-msgstr ""
+msgstr "Nº de columnes"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.name.wiz:0
 msgid "Survey Details"
-msgstr ""
+msgstr "Detalls de l'enquesta"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "Camps de text múltiples amb tipus diferent"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Menu Choices (each choice on separate lines)"
-msgstr ""
+msgstr "Opcions de menú (cada opció en línies separades)"
 
 #. module: survey
 #: field:survey.response,response_type:0
 msgid "Answer Type"
-msgstr ""
+msgstr "Tipus de resposta"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Validation"
-msgstr ""
-
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
+msgstr "Validació"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Decimal Number"
-msgstr ""
+msgstr "Ha de ser un número decimal"
 
 #. module: survey
 #: field:res.users,survey_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Grups"
 
 #. module: survey
 #: selection:survey.answer,type:0
 #: selection:survey.question,type:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Integer"
-msgstr ""
+msgstr "Número enter"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_send_invitation
 msgid "survey.send.invitation"
-msgstr ""
+msgstr "enquesta.envia.invitació"
 
 #. module: survey
 #: field:survey.history,user_id:0
@@ -1128,45 +1165,45 @@ msgstr ""
 #: field:survey.request,user_id:0
 #: field:survey.response,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari/a"
 
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "Pàgina de transferència"
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Skiped"
-msgstr ""
+msgstr "Omès"
 
 #. module: survey
 #: field:survey.print,paper_size:0
 #: field:survey.print.answer,paper_size:0
 msgid "Paper Size"
-msgstr ""
+msgstr "Mida del paper"
 
 #. module: survey
 #: field:survey.response.answer,column_id:0
 #: field:survey.tbl.column.heading,column_id:0
 msgid "Column"
-msgstr ""
+msgstr "Columna"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_tbl_column_heading
 msgid "survey.tbl.column.heading"
-msgstr ""
+msgstr "enquesta.tbl.columna.capçalera"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_line
 msgid "Survey Response Line"
-msgstr ""
+msgstr "Línia de resposta d'enquesta"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:134
 #, python-format
 msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "No podeu respondre l'enquesta més de %s vegades"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1187,49 +1224,51 @@ msgstr ""
 #: field:survey.request,survey_id:0
 #: field:survey.response,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "Enquesta"
 
 #. module: survey
 #: field:survey.question,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible?"
-msgstr ""
+msgstr "L'escala de qualificació és invisible?"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "Camp de text numèric"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
 msgid "survey.question.wiz"
-msgstr ""
+msgstr "enquesta.pregunta.assist"
 
 #. module: survey
 #: view:survey:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. 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 ""
+"Si aquest camp està buit, s'imprimiran totes les respostes de l'enquesta "
+"seleccionada."
 
 #. module: survey
 #: field:survey.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "Codi"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_statistics
 msgid "Surveys Statistics"
-msgstr ""
+msgstr "Estadístiques de les enquestes"
 
 #. module: survey
 #: field:survey.print,orientation:0
 #: field:survey.print.answer,orientation:0
 msgid "Orientation"
-msgstr ""
+msgstr "Orientació"
 
 #. module: survey
 #: view:survey:0
@@ -1237,55 +1276,55 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Seq"
-msgstr ""
+msgstr "Seq"
 
 #. module: survey
 #: field:survey.request,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: survey
 #: field:survey.question,comment_minimum_no:0
 #: field:survey.question,validation_minimum_no:0
 msgid "Minimum number"
-msgstr ""
+msgstr "Número mínim"
 
 #. module: survey
 #: field:survey.question,req_ans:0
 msgid "#Required Answer"
-msgstr ""
+msgstr "Nº de respostes obligatòries"
 
 #. module: survey
 #: field:survey.answer,sequence:0
 #: field:survey.question,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: survey
 #: field:survey.question,comment_label:0
 msgid "Field Label"
-msgstr ""
+msgstr "Etiqueta del camp"
 
 #. module: survey
 #: view:survey:0
 msgid "Other"
-msgstr ""
+msgstr "Altre"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: survey
 #: view:survey:0
 msgid "Test Survey"
-msgstr ""
+msgstr "Prova enquesta"
 
 #. module: survey
 #: field:survey.question,rating_allow_one_column_require:0
 msgid "Allow Only One Answer per Column (Forced Ranking)"
-msgstr ""
+msgstr "Permetre una sola resposta per columna (classificació forçada)"
 
 #. module: survey
 #: view:survey:0
@@ -1296,29 +1335,29 @@ msgstr ""
 #: view:survey.print.statistics:0
 #: view:survey.send.invitation:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: survey
 #: view:survey:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: survey
 #: field:survey.question,comment_minimum_float:0
 #: field:survey.question,validation_minimum_float:0
 msgid "Minimum decimal number"
-msgstr ""
+msgstr "Número decimal mínim"
 
 #. module: survey
 #: view:survey:0
 #: selection:survey,state:0
 msgid "Open"
-msgstr ""
+msgstr "Obre"
 
 #. module: survey
 #: field:survey,tot_start_survey:0
 msgid "Total Started Survey"
-msgstr ""
+msgstr "Total d'enquestes començades"
 
 #. module: survey
 #: code:addons/survey/survey.py:467
@@ -1327,99 +1366,101 @@ msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
 "use a number that is smaller than %d."
 msgstr ""
+"El número de respostes obligatòries que heu escrit és major que el número de "
+"respostes. Introduïu un número menor de %d."
 
 #. module: survey
 #: help:survey,max_response_limit:0
 msgid "Set to one if survey is answerable only once"
-msgstr ""
+msgstr "Estableix a u si l'enquesta només es pot respondre una vegada."
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr ""
+msgstr "Finalitzat "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
 msgid "Survey Question Column Heading"
-msgstr ""
+msgstr "Capçalera de columna de pregunta d'enquesta"
 
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "# Punt"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "Matriu d'opcions (múltiples respostes per fila)"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 msgid "Give Survey Answer"
-msgstr ""
+msgstr "Respon enquesta"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuaris"
 
 #. module: survey
 #: view:survey:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Answered"
-msgstr ""
+msgstr "Respost"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
-msgstr ""
+msgstr "Enquesta completada"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Comment/Essay Box"
-msgstr ""
+msgstr "Camp comentari/redacció"
 
 #. module: survey
 #: field:survey.answer,type:0
 msgid "Type of Answer"
-msgstr ""
+msgstr "Tipus de resposta"
 
 #. module: survey
 #: field:survey.question,required_type:0
 msgid "Respondent must answer"
-msgstr ""
+msgstr "L'enquestat ha de respondre"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
 #: view:survey.send.invitation:0
 msgid "Send Invitation"
-msgstr ""
+msgstr "Envia invitació"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
-msgstr ""
+msgstr "No podeu seleccionar la mateixa resposta més d'una vegada"
 
 #. module: survey
 #: view:survey.question:0
 msgid "Search Question"
-msgstr ""
+msgstr "Cerca pregunta"
 
 #. module: survey
 #: field:survey,title:0
 msgid "Survey Title"
-msgstr ""
+msgstr "Títol de l'enquesta"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Single Textbox"
-msgstr ""
+msgstr "Camp de text únic"
 
 #. module: survey
 #: field:survey,note:0
@@ -1428,49 +1469,49 @@ msgstr ""
 #: field:survey.page,note:0
 #: view:survey.response.line:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Select Survey"
-msgstr ""
+msgstr "Selecciona enquesta"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Least"
-msgstr ""
+msgstr "Almenys"
 
 #. 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 "enquesta.envia.invitació.registre"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Portrait(Vertical)"
-msgstr ""
+msgstr "Retrat (Vertical)"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "Ha de ser de longitud específica"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
 msgid "Survey Page"
-msgstr ""
+msgstr "Pàgina de l'enquesta"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Required Answer"
-msgstr ""
+msgstr "Resposta obligatòria"
 
 #. module: survey
 #: code:addons/survey/survey.py:473
@@ -1479,33 +1520,35 @@ msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
 "Please use a number that is smaller than %d."
 msgstr ""
+"El mínim de respostes obligatòries que heu introduït és major que el número "
+"de respostes. Introduïu un número menor de %d."
 
 #. module: survey
 #: code:addons/survey/survey.py:458
 #, python-format
 msgid "You must enter one or more answer."
-msgstr ""
+msgstr "Heu de donar una o més respostes."
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
 #: field:survey.browse.answer,response_id:0
 msgid "Survey Answers"
-msgstr ""
+msgstr "Respostes de l'enquesta"
 
 #. module: survey
 #: view:survey.browse.answer:0
 msgid "Select Survey and related answer"
-msgstr ""
+msgstr "Seleccioneu enquesta i resposta relacionada"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_answer
 msgid "Surveys Answers"
-msgstr ""
+msgstr "Respostes de l'enquesta"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 msgid "Pages"
-msgstr ""
+msgstr "Pàgines"
 
 #. module: survey
 #: code:addons/survey/survey.py:406
@@ -1515,33 +1558,35 @@ msgid ""
 "than the number of answer.                                    Please use a "
 "number that is smaller than %d."
 msgstr ""
+"El número de respostes obligatòries que heu introduït és major que el número "
+"de respostes. Utilitzeu un número menor que %d."
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
-msgstr ""
+msgstr "No podeu seleccionar la mateixa resposta més d'una vegada"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Legal (216 x 356)"
 
 #. module: survey
 #: field:survey.type,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "Núm preguntes"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
 msgid "survey.response"
-msgstr ""
+msgstr "enquesta.resposta"
 
 #. module: survey
 #: field:survey.question,comment_valid_err_msg:0
@@ -1549,24 +1594,24 @@ msgstr ""
 #: field:survey.question,numeric_required_sum_err_msg:0
 #: field:survey.question,validation_valid_err_msg:0
 msgid "Error message"
-msgstr ""
+msgstr "Missatge d'error"
 
 #. module: survey
 #: model:ir.module.module,shortdesc:survey.module_meta_information
 msgid "Survey Module"
-msgstr ""
+msgstr "Mòdul d'enquestes"
 
 #. module: survey
 #: view:survey.send.invitation:0
 #: field:survey.send.invitation,send_mail:0
 msgid "Send mail for new user"
-msgstr ""
+msgstr "Envia mail per a nou usuari"
 
 #. module: survey
 #: code:addons/survey/survey.py:387
 #, python-format
 msgid "You must enter one or more Answer."
-msgstr ""
+msgstr "Heu d'introduir una o més respostes"
 
 #. module: survey
 #: code:addons/survey/survey.py:416
@@ -1576,18 +1621,20 @@ msgid ""
 "greater than the number of answer.                                    Please "
 "use a number that is smaller than %d."
 msgstr ""
+"El mínim de respostes obligatòries que heu introduït és major que el número "
+"de respostes. Utilitzeu un número menor que %d."
 
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "Opcions de menú"
 
 #. module: survey
 #: field:survey,page_ids:0
 #: view:survey.question:0
 #: field:survey.response.line,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Pàgina"
 
 #. module: survey
 #: code:addons/survey/survey.py:438
@@ -1596,79 +1643,81 @@ msgid ""
 "Maximum Required Answer is greater                                     than "
 "Minimum Required Answer"
 msgstr ""
+"El màxim de respostes requerides és menor que el mínim de respostes "
+"requerides"
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "User creation"
-msgstr ""
+msgstr "Crea usuari"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "All"
-msgstr ""
+msgstr "Total"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be An Email Address"
-msgstr ""
+msgstr "Ha de ser una adreça d'email"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Only One Answer)"
-msgstr ""
+msgstr "Selecció múltiple (només una resposta)"
 
 #. module: survey
 #: field:survey.answer,in_visible_answer_type:0
 msgid "Is Answer Type Invisible??"
-msgstr ""
+msgstr "És el tipus de resposta invisible?"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_answer
 msgid "survey.print.answer"
-msgstr ""
+msgstr "enquesta.imprimeix.resposta"
 
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "Opcions de menú (cada opció en una línia separada)"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Float"
-msgstr ""
+msgstr "Float"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Single Textboxes"
-msgstr ""
+msgstr "Camp de text únic"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "%sSurvey is not in open state"
-msgstr ""
+msgstr "enquesta %s no està en estat obert"
 
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Pes"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Date & Time"
-msgstr ""
+msgstr "Data i hora"
 
 #. module: survey
 #: field:survey.response,date_create:0
 #: field:survey.response.line,date_create:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: survey
 #: field:survey.question,column_name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Nom de columna"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
@@ -1676,37 +1725,40 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_page_form1
 #: view:survey.page:0
 msgid "Survey Pages"
-msgstr ""
+msgstr "Pàgines de l'enquesta"
 
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "Suma de totes les eleccions"
 
 #. module: survey
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "Taula"
 
 #. module: survey
 #: code:addons/survey/survey.py:642
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "No podeu duplicar el recurs!"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
 #: field:survey.question,validation_minimum_date:0
 msgid "Minimum date"
-msgstr ""
+msgstr "Data mínima"
 
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "Respostes màximes per usuari"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "Posició de la pàgina"
+
+#~ msgid "Watting Answer"
+#~ msgstr "Esperant resposta"
diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po
index 77c0308ad06..6b594cf9eda 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: 2011-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Poslat pozvání"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index ffc59628db1..a68b78dd82b 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: 2011-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -778,8 +778,9 @@ msgstr ""
 "Antworten. Bitte geben Sie eine Zahl kleiner als %d ein."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Erwarte Antwort"
 
 #. module: survey
@@ -1127,12 +1128,6 @@ msgstr "Antworttyp"
 msgid "Validation"
 msgstr "Validierung"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Erwarte Antwort"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1379,7 +1374,7 @@ msgstr "Erfassen Sie '1' wenn Umfrage nur einmal beantwortet werden darf"
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr "Fertig "
+msgstr "Abgeschlossen "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
@@ -1917,102 +1912,8 @@ msgstr "Seitenposition"
 #~ msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
 #~ msgstr "'\" + que_rec[0]['question'] + \"' Diese Frage bedarf einer Antwort"
 
-#, python-format
-#~ msgid ""
-#~ "You must enter one or more menu choices\\n                                 "
-#~ "in column heading"
-#~ msgstr ""
-#~ "Sie müssen eine oder mehrere Menübeschriftungen  \\n                         "
-#~ "        in der Spaltenüberschrift erfassen"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
-#, python-format
-#~ msgid ""
-#~ "Maximum Required Answer you\\n                                     entered "
-#~ "for your maximum is greater than the number of answer.\\n                    "
-#~ "                  Please use a number that is smaller than %d."
-#~ msgstr ""
-#~ "Maximal erforderliche Antwortzahl die\\n                                     "
-#~ "    erfasst wurde ist größer oder gleich als die vorhandene Fragenzahl.\\n   "
-#~ "                                       Bitte benutzen Sie eine kleinere "
-#~ "Anzahl als %d."
-
-#~ msgid "Wating Answer"
+#~ msgid "Watting Answer"
 #~ msgstr "Erwarte Antwort"
-
-#, python-format
-#~ msgid "You can not give answer because of survey is not open for answer"
-#~ msgstr ""
-#~ "Sie können keine Antwort vornehmen, da Ihre Umfrage nicht für die "
-#~ "Beantwortung eröffnet wurde"
-
-#, python-format
-#~ msgid ""
-#~ "Maximum Required Answer you \\n                                    entered "
-#~ "for your maximum is greater than the number of answer.\\n                    "
-#~ "                 Please use a number that is smaller than %d."
-#~ msgstr ""
-#~ "Maximal erforderliche Antworten\\n                                    die "
-#~ "einzugeben sind, sind größer als die Anzahl an vorhandenen Antworten.        "
-#~ "                            Bitte benutzen Sie einen Wert, der kleiner ist "
-#~ "als %d."
-
-#, python-format
-#~ msgid ""
-#~ "#Required Answer you entered \\n                                    is "
-#~ "greater than the number of answer. \\n                                    "
-#~ "Please use a number that is smaller than %d."
-#~ msgstr ""
-#~ "#Erforderliche Antwort, die eingegeben wurde, \\n                            "
-#~ "        ist größer als die verfügbaren Antworten. \\n                        "
-#~ "            Bitte benutzen Sie eine Anzahl, die kleiner ist als dieser "
-#~ "Betrag %d."
-
-#, python-format
-#~ msgid "You can not give answer for this survey more than %s times"
-#~ msgstr "Sie können nicht häufiger als %s Mal diesen Fragebogen beantworten."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#, python-format
-#~ msgid ""
-#~ "Maximum Required Answer is greater \\n                                    "
-#~ "than Minimum Required Answer"
-#~ msgstr ""
-#~ "Maximale Antwortzeit ist größer als\\n                                als "
-#~ "die minimal erforderliche Antwortzahl"
-
-#, python-format
-#~ msgid ""
-#~ "Minimum Required Answer\\n                                     you entered "
-#~ "is greater than the number of answer.\\n                                    "
-#~ "Please use a number that is smaller than %d."
-#~ msgstr ""
-#~ "Minimal erforderliche Antworten\\n                                sind mehr "
-#~ "als die vorhandenen Antwort(en).\\n                              Bitte "
-#~ "benutzen Sie einen Wert der kleiner ist als %d."
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"\n"
-#~ " you cannot select same answer more than one times'"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"\n"
-#~ "Du kannst dieselbe Antwort nicht mehr als einmal geben'"
-
-#, python-format
-#~ msgid ""
-#~ "You must enter one or more menu \\n                                choices "
-#~ "in column heading (white spaces not allowed)"
-#~ msgstr ""
-#~ "Sie müssen ein oder mehrere Menüs eingeben\\                               "
-#~ "als Auswahl für die Spaltenüberschrift (Leerschritte nicht erlaubt)"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index c0677643d1d..324800dd7da 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -781,8 +781,9 @@ msgstr ""
 "es mayor que el número de respuestas. Por favor, use un número menor que %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Esperando respuesta"
 
 #. module: survey
@@ -1131,12 +1132,6 @@ msgstr "Tipo respuesta"
 msgid "Validation"
 msgstr "Validación"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Esperando respuesta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1798,26 +1793,11 @@ msgstr "Posición página"
 #~ msgid "Maximum Response Limit"
 #~ msgstr "Límite respuesta máxima"
 
-#~ msgid "Wating Answer"
-#~ msgstr "Esperando respuesta"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML no válido para la estructura de la vista!"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error! No puede crear un menú recursivo."
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "¡El nombre del grupo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "Watting Answer"
+#~ msgstr "Esperando respuesta"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/survey/i18n/es_MX.po b/addons/survey/i18n/es_MX.po
new file mode 100644
index 00000000000..5ce1b7a86b2
--- /dev/null
+++ b/addons/survey/i18n/es_MX.po
@@ -0,0 +1,1914 @@
+# 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 18:43+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr "Opción imprimir"
+
+#. module: survey
+#: code:addons/survey/survey.py:422
+#, python-format
+msgid ""
+"Minimum Required Answer you                                     entered is "
+"greater than the number of answer.                                      "
+"Please use a number that is smaller than %d."
+msgstr ""
+"El número mínimo de respuestas requeridas que ha introducido es mayor que el "
+"número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "Sus mensajes"
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr "Validación del texto"
+
+#. module: survey
+#: code:addons/survey/survey.py:434
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"           Please use a number that is smaller than %d."
+msgstr ""
+"El número máximo de respuestas requeridas que ha introducido para su máximo "
+"es mayor que el número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr "Usuario invitado"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr "Carácter"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr "Encuestas"
+
+#. module: survey
+#: view:survey:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr "¿La respuesta es de tipo invisible?"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr "Resultados :"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr "Solicitud de encuesta"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr "Un rango"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr "Tabla de respuesta"
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "Fecha de inicio"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "Líneas histórico"
+
+#. module: survey
+#: code:addons/survey/survey.py:448
+#, python-format
+msgid ""
+"You must enter one or more menu                                 choices in "
+"column heading (white spaces not allowed)"
+msgstr ""
+"Debe introducir una o más opciones de menú en la cabecera de columna (no se "
+"permiten espacios en blanco)"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr "¿La opción de menú es invisible?"
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr "Cuerpo"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "Permitir campo comentario"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+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 "Fecha Máxima"
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr "¿La opción de menú es invisible?"
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr "Completada"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr "Exactamente"
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr "Fecha de Inicio"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr "Campo para agregar comentario"
+
+#. module: survey
+#: code:addons/survey/survey.py:401
+#, python-format
+msgid ""
+"#Required Answer you entered                                     is greater "
+"than the number of answer.                                     Please use a "
+"number that is smaller than %d."
+msgstr ""
+"Número de respuestas requeridas que ha escrito es mayor que el número de "
+"respuestas. Introduzca un número menor que %d."
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr "Total respuesta"
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr "Número de Fila"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr "encuesta.nombre.asist"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr "Preguntas de las encuestas"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr "Matriz de selección (solamente una respuesta por fila)"
+
+#. module: survey
+#: code:addons/survey/survey.py:475
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr ""
+"El número máximo de respuestas requeridas que ha introducido para su máximo "
+"es mayor que el número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "Pregunta de la encuesta"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr "Utilizar si la pregunta es de tipo calificación_escala"
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr "Incluir número de página"
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.send.invitation.log:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "Título de la página"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr "Definir encuestas"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "Histórico encuestas"
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr "Buscar encuesta"
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr " Cabecera columna"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr "Responder una encuesta"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr "Total encuestas completadas"
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr "(usar sólo cuando el tipo de pregunta sea matrix_of_drop_down_menus)"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr "Estadísticas encuestas"
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr "Escala de calificación"
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr "Campo tipo comentario"
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:387
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:406
+#: code:addons/survey/survey.py:416
+#: code:addons/survey/survey.py:422
+#: code:addons/survey/survey.py:428
+#: code:addons/survey/survey.py:434
+#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:444
+#: code:addons/survey/survey.py:448
+#: code:addons/survey/survey.py:458
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:475
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:482
+#: code:addons/survey/survey.py:484
+#: code:addons/survey/survey.py:642
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:131
+#: code:addons/survey/wizard/survey_answer.py:700
+#: code:addons/survey/wizard/survey_answer.py:739
+#: code:addons/survey/wizard/survey_answer.py:759
+#: code:addons/survey/wizard/survey_answer.py:788
+#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:812
+#: code:addons/survey/wizard/survey_answer.py:821
+#: code:addons/survey/wizard/survey_answer.py:826
+#: code:addons/survey/wizard/survey_answer.py:900
+#: code:addons/survey/wizard/survey_answer.py:936
+#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:982
+#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:988
+#: code:addons/survey/wizard/survey_answer.py:1000
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_selection.py:134
+#: code:addons/survey/wizard/survey_selection.py:138
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "Warning !"
+msgstr "¡ Advertencia !"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr "Única línea de texto"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr "Enviar recordatorio para usuario existente"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr "Selección múltiple (mútiples respuestas)"
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr "Editar encuesta"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr "Líne de respuesta encuesta"
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr "Selección Menú"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr "Como máximo"
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr "Validar texto"
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr "Texto"
+
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr "Carta (8.5\" x 11\")"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr "solicitud.encuesta"
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr "Máximo número de decimales"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: survey
+#: 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 de usuario!"
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr "De"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr "No validar texto de comentario"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr "Debe ser un número entero"
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr "Pregunta"
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr "Buscar página de la encuesta"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Send"
+msgstr "Enviar"
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "Número"
+
+#. module: survey
+#: code:addons/survey/survey.py:444
+#, python-format
+msgid ""
+"You must enter one or more menu choices                                 in "
+"column heading"
+msgstr ""
+"Debe introducir una o más opciones de menú en el encabezado de la columna"
+
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid ""
+"You can create survey for different purposes: recruitment interviews, "
+"employee's periodical evaluations, marketing campaigns, etc. A survey is "
+"made of pages containing questions of several types: text, multiple choices, "
+"etc. You can edit survey manually or click on the 'Edit Survey' for a "
+"WYSIWYG interface."
+msgstr ""
+"Puede crear encuestas para diferentes propósitos: entrevistas de selección "
+"de personal, evaluaciones periódicas de los empleados, campañas de "
+"marketing, etc. Una encuesta se compone de páginas que contienen preguntas "
+"de varios tipos: texto, opciones múltiples, etc. Puede editar la encuesta "
+"manualmente o hacer clic en \"Editar encuesta” para una interfaz WYSIWYG."
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr "Fase del plan de evaluación"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr "Entre"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr "Hacer campo comentario como opción de respuesta"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr "Email"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr "Reponder encuestas"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr "No teminado"
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr "Imprimir encuesta"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr "Seleccionar empresa"
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr "Tipo pregunta"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:131
+#, python-format
+msgid "You can not answer this survey more than %s times"
+msgstr "No puede responder a esta encuesta más de '%s' veces"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr "Respuestas"
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveying. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo se usa para realizar encuestas. Se basa en las respuestas o "
+"comentarios de los usuarios a varias preguntas.\n"
+"    Una encuesta puede tener varias páginas. Cada página puede contener "
+"múltiples preguntas y cada pregunta puede tener varias respuestas.\n"
+"    Diferentes usuarios pueden dar diferentes respuestas a la pregunta de "
+"acuerdo a como esté confeccionada la encuesta.\n"
+"    También se puede invitar a las empresas a responder una encuesta, "
+"enviándoles correos electrónicos con nombre de usuario y contraseña.\n"
+"    "
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:124
+#, python-format
+msgid "You can not answer because the survey is not open"
+msgstr "No puede responder porque la encuesta no está abierta"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "Vínculo"
+
+#. 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 "Tipo de encuesta"
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr "Nº página"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr "Texto descriptivo"
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr "Respuesta mínima requerida"
+
+#. module: survey
+#: code:addons/survey/survey.py:484
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr ""
+"Debe introducir una o más opciones de menú en el encabezado de la columna "
+"(espacios en blanco no está permitidos)"
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr "Mensaje de error"
+
+#. module: survey
+#: code:addons/survey/survey.py:482
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr "Debe introducir una o más opciones de menú en la cabecera de columna"
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr "Fecha límite"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr "Debe ser una fecha"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr "encuesta.imprimir"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr "Cabecera columna"
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr "Respuesta obligatoria a la pregunta"
+
+#. 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 "Solicitudes de encuestas"
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:462
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr "Debe introducir una o más cabeceras de columna."
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:759
+#: code:addons/survey/wizard/survey_answer.py:954
+#, python-format
+msgid "Please enter an integer value"
+msgstr "Por favor introduzca un valor numérico entero"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr "encuesta.explorar.respuestas"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr "Párrafo de texto"
+
+#. module: survey
+#: code:addons/survey/survey.py:428
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"          Please use a number that is smaller than %d."
+msgstr ""
+"El número máximo de respuestas requeridas que ha introducido para su máximo "
+"es mayor que el número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: view:survey.request:0
+msgid "Watting Answer"
+msgstr "Esperando respuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr ""
+"Cuando la respuesta no sea contestada, mostrar este mensaje de error:"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr "Buscar respuestas"
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr "Comentario"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr "Respuesta encuesta"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr "Selección"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr "Responder encuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr "Campo comentario"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "Manualmente"
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr "Usuario responsable de la encuesta."
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr "Añadir columna de comentarios en la matriz"
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr "#Respuesta"
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr "Imprimir sin saltos de página"
+
+#. 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 ""
+"Mostrar este mensaje de error cuando el comentario esté en un formato no "
+"válido"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:138
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr ""
+"No puede dar más respuestas. Póngase en contacto con el autor de esta "
+"encuesta para obtener más ayuda."
+
+#. 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 "Preguntas"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr "Establecer a uno si sólo requiere una respuesta por usuario."
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr "MI"
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr "Máximas respuestas requeridas"
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr "Número de página"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Cannot locate survey for the question wizard!"
+msgstr "¡No se pudo localizar la encuesta para el asistente de preguntas!"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr "y"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr "Imprimir estadísticas de encuestas"
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr "Registro (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 ""
+"Mostrar este mensaje de error cuando las selecciones no totalicen "
+"correctamente"
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr "Fecha de cierre encuestas"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "Fecha apertura de encuesta"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr "¿La escala de calificación es invisible?"
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr "Inicio"
+
+#. module: survey
+#: code:addons/survey/survey.py:477
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr ""
+"El número máximo de respuestas requeridas es mayor que el mínimo de "
+"respuestas requeridas."
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr "Número máximo"
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr "encuesta.imprimir.estadisticas"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "Cerrada"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr "Matriz de menús desplegables"
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr "Respuesta"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr "Límite máximo de respuesta"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr "Enviar invitaciones"
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr "Guardar respuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr "Fecha y hora"
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr "Imprimir encuesta"
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr "Email de notificación sobre la respuesta"
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr "Valor selección"
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr "Iniciada"
+
+#. 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 "Imprimir respuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr "Campos de texto múltiples"
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr "Horizontal"
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr "Nº de columnas"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr "Detalles encuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr "Campos de texto múltiples con tipo diferente"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr "Opciones de menú (cada opción en líneas separadas)"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr "Tipo respuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Waiting Answer"
+msgstr "Esperando respuesta"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr "Debe ser un número decimal"
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr "Entero"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr "encuesta.enviar.invitacion"
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr "Página de transferencia"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr "Omitido"
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr "Tamaño del papel"
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr "Columna"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr "encuesta.tbl.columna.cabecera"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr "Línea de respuesta de encuesta"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:134
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr "No puede responder esta encuesta más de %s veces"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr "Encuesta"
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr "¿La escala de calificación es invisible?"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr "Campos de texto numéricos"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr "enquesta.pregunta.asist"
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "Historial"
+
+#. 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 ""
+"Si este campo está vacío, se imprimirán todas las respuestas de la encuesta "
+"seleccionada."
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr "Estadísticas de encuestas"
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr "Orientación"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "Secuencia"
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr "Email"
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr "Número mínimo"
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr "Nº de respuestas requeridas"
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr "Etiqueta del campo"
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "Otros"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr "Probar encuesta"
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr "Permitir una sóla respuesta por columna (clasificación forzada)"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+#: view:survey.send.invitation:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr "Número decimal mínimo"
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr "Total encuestas empezadas"
+
+#. module: survey
+#: code:addons/survey/survey.py:467
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr ""
+"El número de respuestas requeridas que ha escrito es mayor que el número de "
+"respuestas. Introduzca un número menor que %d."
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr "Establecer a uno si la encuesta sólo puede responderse una vez."
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr "Terminado "
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr "Cabecera de columna de pregunta de encuesta"
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr "#Prom."
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr "Matriz de opciones (múltiples respuestas por fila)"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr "Responder encuesta"
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: survey
+#: view:survey:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr "Contestadas"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:433
+#, python-format
+msgid "Complete Survey Answer"
+msgstr "Respuesta completa de la encuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr "Campo de comentarios/redacción"
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr "Tipo de respuesta"
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr "El encuestado debe responder"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr "Enviar invitación"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:793
+#, python-format
+msgid "You cannot select the same answer more than one time"
+msgstr "No se puede seleccionar la misma respuesta más de una vez"
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr "Buscar pregunta"
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr "Título de la encuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr "Campo de texto único"
+
+#. module: survey
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr "Seleccionar encuesta"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr "Al menos"
+
+#. 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 "encuesta.enviar.invitacion.registro"
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr "Retrato (Vertical)"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr "Debe ser de longitud específica"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr "Página de la encuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr "Respuesta requerida"
+
+#. module: survey
+#: code:addons/survey/survey.py:473
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr ""
+"El mínimo de respuestas requeridas que ha introducido es mayor que el número "
+"de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: code:addons/survey/survey.py:458
+#, python-format
+msgid "You must enter one or more answer."
+msgstr "Debe dar una o más respuestas."
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr "Respuestas encuesta"
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and related answer"
+msgstr "Seleccione encuesta y respuesta relacionada"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr "Respuestas encuestas"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr "Páginas"
+
+#. module: survey
+#: code:addons/survey/survey.py:406
+#, python-format
+msgid ""
+"#Required Answer you entered is                                     greater "
+"than the number of answer.                                    Please use a "
+"number that is smaller than %d."
+msgstr ""
+"El número de respuestas requeridas que ha introducido es mayor que el número "
+"de respuestas. Utilice un número menor que %d."
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:985
+#, python-format
+msgid "You cannot select same answer more than one time'"
+msgstr "No puede seleccionar la misma respuesta más de una vez"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr "Legal (8.5\" x 14\")"
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr "#Preguntas"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr "encuesta.respuesta"
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr "Mensaje de error"
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr "Módulo encuestas"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send mail for new user"
+msgstr "Enviar email para nuevo usuario"
+
+#. module: survey
+#: code:addons/survey/survey.py:387
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr "Debe introducir una o más respuestas"
+
+#. module: survey
+#: code:addons/survey/survey.py:416
+#, python-format
+msgid ""
+"Minimum Required Answer                                     you entered is "
+"greater than the number of answer.                                    Please "
+"use a number that is smaller than %d."
+msgstr ""
+"El mínimo de respuestas requeridas que ha introducido es mayor que el número "
+"de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr "Opciones de menú"
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr "Página"
+
+#. module: survey
+#: code:addons/survey/survey.py:438
+#, python-format
+msgid ""
+"Maximum Required Answer is greater                                     than "
+"Minimum Required Answer"
+msgstr ""
+"El máximo de respuestas requeridas es menor que el mínimo de respuestas "
+"requeridas"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr "Creación usuario"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr "Todos"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr "Debe ser una dirección de email"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr "Selección múltiple (sólo una respuesta)"
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr "¿El tipo de respuesta es invisible?"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr "encuesta.imprimir.respuesta"
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr "Opciones de menú (cada opción en líneas separadas)"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr "Número flotante"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr "Campos de texto únicos"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr "%s encuesta no está en estado abierto"
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr "Fecha y hora"
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr "Nombre de columna"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr "Páginas encuesta"
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr "Suma de todas las elecciones"
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr "Tabla"
+
+#. module: survey
+#: code:addons/survey/survey.py:642
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr "¡No puede duplicar el recurso!"
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr "Fecha mínima"
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr "Máximas respuestas por usuario"
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr "Posición página"
+
+#~ msgid "All Questions"
+#~ msgstr "Todas las preguntas"
+
+#~ msgid "Give Survey Response"
+#~ msgstr "Responder la encuesta"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de acción."
+
+#~ msgid "Survey Analysis Report"
+#~ msgstr "Informe de análisis de encuestas"
+
+#~ msgid "Total Response"
+#~ msgstr "Respuesta total"
+
+#~ msgid "Set to one if  you require only one response per user"
+#~ msgstr "Establecer a uno si sólo necesita una respuesta por usuario"
+
+#~ msgid "Users Details"
+#~ msgstr "Detalles usuarios"
+
+#~ msgid "Partner"
+#~ msgstr "Empresa"
+
+#~ msgid "Skip"
+#~ msgstr "Saltar"
+
+#~ msgid "New Survey Question"
+#~ msgstr "Nueva pregunta de encuesta"
+
+#~ msgid "Maximum Response Limit"
+#~ msgstr "Límite respuesta máxima"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura 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 "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "_Ok"
+#~ msgstr "_Aceptar"
+
+#~ msgid "Page :-"
+#~ msgstr "Página :-"
+
+#~ msgid "#Response"
+#~ msgstr "#Respuesta"
+
+#~ msgid "Response Summary"
+#~ msgstr "Resumen respuesta"
+
+#~ msgid "Response Type"
+#~ msgstr "Tipo respuesta"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#~ msgid "New Survey"
+#~ msgstr "Nueva encuesta"
+
+#~ msgid "Response"
+#~ msgstr "Respuesta"
+
+#~ msgid "Modify Date"
+#~ msgstr "Fecha modificada"
+
+#~ msgid "Answered Question"
+#~ msgstr "Pregunta respondida"
+
+#~ msgid "All Surveys"
+#~ msgstr "Todas las encuentas"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module is used for surveing. It depends on the answers or reviews "
+#~ "of some questions by different users.\n"
+#~ "    A survey may have multiple pages. Each page may contain multiple "
+#~ "questions and each question may have multiple answers.\n"
+#~ "    Different users may give different answers of question and according to "
+#~ "that survey is done. \n"
+#~ "    Partners are also sent mails with user name and password for the "
+#~ "invitation of the survey\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Este módulo es utilizado para realizar encuestas. Depende de las "
+#~ "respuestas o revisión de alguna preguntas por distintos usuarios\n"
+#~ "    Una encuesta puede tener múltiples páginas. Cada página puede contener "
+#~ "distintas preguntas y cada pregunta puede tener múltiples respuestas.\n"
+#~ "    Distintos usuarios pueden dar distintas respuestas a las preguntas en "
+#~ "función de la encuesta realizada \n"
+#~ "    También se pueden enviar correos a las empresas con nombre de usuario y "
+#~ "password con una invitación a realizar la encuesta.\n"
+#~ "    "
+
+#~ msgid "All Survey Questions"
+#~ msgstr "Todas las preguntas de encuestas"
+
+#~ msgid "All Survey Pages"
+#~ msgstr "Todas páginas de encuesta"
+
+#~ msgid "Total Started Survey :-"
+#~ msgstr "Total encuestas iniciadas :-"
+
+#~ msgid "Survey Management"
+#~ msgstr "Gestión de encuestas"
+
+#~ msgid "Survey Response"
+#~ msgstr "Respuesta encuesta"
+
+#, python-format
+#~ msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+#~ msgstr ""
+#~ "Copy text \t\r\n"
+#~ "'\" + que_rec[0]['question'] + \"' Esta pregunta requiere una respuesta"
+
+#~ msgid "New Survey Page"
+#~ msgstr "Nueva página de encuesta"
+
+#~ msgid "Survey Title :-"
+#~ msgstr "Título encuesta :-"
+
+#~ msgid "Response Percentage"
+#~ msgstr "Porcentaje respuesta"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Total Completed Survey :-"
+#~ msgstr "Total encuesta completada :-"
+
+#, python-format
+#~ msgid "Attention!"
+#~ msgstr "¡Atención!"
+
+#~ msgid "Response Count"
+#~ msgstr "Cuenta respuestas"
+
+#~ msgid "Maximum Response per User"
+#~ msgstr "Máximas respuestas por usuario"
diff --git a/addons/survey/i18n/es_VE.po b/addons/survey/i18n/es_VE.po
new file mode 100644
index 00000000000..5ce1b7a86b2
--- /dev/null
+++ b/addons/survey/i18n/es_VE.po
@@ -0,0 +1,1914 @@
+# 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 18:43+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:45+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr "Opción imprimir"
+
+#. module: survey
+#: code:addons/survey/survey.py:422
+#, python-format
+msgid ""
+"Minimum Required Answer you                                     entered is "
+"greater than the number of answer.                                      "
+"Please use a number that is smaller than %d."
+msgstr ""
+"El número mínimo de respuestas requeridas que ha introducido es mayor que el "
+"número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "Sus mensajes"
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr "Validación del texto"
+
+#. module: survey
+#: code:addons/survey/survey.py:434
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"           Please use a number that is smaller than %d."
+msgstr ""
+"El número máximo de respuestas requeridas que ha introducido para su máximo "
+"es mayor que el número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr "Usuario invitado"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr "Carácter"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr "Encuestas"
+
+#. module: survey
+#: view:survey:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr "¿La respuesta es de tipo invisible?"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr "Resultados :"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr "Solicitud de encuesta"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr "Un rango"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr "Tabla de respuesta"
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "Fecha de inicio"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "Líneas histórico"
+
+#. module: survey
+#: code:addons/survey/survey.py:448
+#, python-format
+msgid ""
+"You must enter one or more menu                                 choices in "
+"column heading (white spaces not allowed)"
+msgstr ""
+"Debe introducir una o más opciones de menú en la cabecera de columna (no se "
+"permiten espacios en blanco)"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr "¿La opción de menú es invisible?"
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr "Cuerpo"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "Permitir campo comentario"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+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 "Fecha Máxima"
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr "¿La opción de menú es invisible?"
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr "Completada"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr "Exactamente"
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr "Fecha de Inicio"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr "Campo para agregar comentario"
+
+#. module: survey
+#: code:addons/survey/survey.py:401
+#, python-format
+msgid ""
+"#Required Answer you entered                                     is greater "
+"than the number of answer.                                     Please use a "
+"number that is smaller than %d."
+msgstr ""
+"Número de respuestas requeridas que ha escrito es mayor que el número de "
+"respuestas. Introduzca un número menor que %d."
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr "Total respuesta"
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr "Número de Fila"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr "encuesta.nombre.asist"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr "Preguntas de las encuestas"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr "Matriz de selección (solamente una respuesta por fila)"
+
+#. module: survey
+#: code:addons/survey/survey.py:475
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr ""
+"El número máximo de respuestas requeridas que ha introducido para su máximo "
+"es mayor que el número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "Pregunta de la encuesta"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr "Utilizar si la pregunta es de tipo calificación_escala"
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr "Incluir número de página"
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.send.invitation.log:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "Título de la página"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr "Definir encuestas"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "Histórico encuestas"
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr "Buscar encuesta"
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr " Cabecera columna"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr "Responder una encuesta"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr "Total encuestas completadas"
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr "(usar sólo cuando el tipo de pregunta sea matrix_of_drop_down_menus)"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr "Estadísticas encuestas"
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr "Escala de calificación"
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr "Campo tipo comentario"
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:387
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:406
+#: code:addons/survey/survey.py:416
+#: code:addons/survey/survey.py:422
+#: code:addons/survey/survey.py:428
+#: code:addons/survey/survey.py:434
+#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:444
+#: code:addons/survey/survey.py:448
+#: code:addons/survey/survey.py:458
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:475
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:482
+#: code:addons/survey/survey.py:484
+#: code:addons/survey/survey.py:642
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:131
+#: code:addons/survey/wizard/survey_answer.py:700
+#: code:addons/survey/wizard/survey_answer.py:739
+#: code:addons/survey/wizard/survey_answer.py:759
+#: code:addons/survey/wizard/survey_answer.py:788
+#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:812
+#: code:addons/survey/wizard/survey_answer.py:821
+#: code:addons/survey/wizard/survey_answer.py:826
+#: code:addons/survey/wizard/survey_answer.py:900
+#: code:addons/survey/wizard/survey_answer.py:936
+#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:982
+#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:988
+#: code:addons/survey/wizard/survey_answer.py:1000
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_selection.py:134
+#: code:addons/survey/wizard/survey_selection.py:138
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "Warning !"
+msgstr "¡ Advertencia !"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr "Única línea de texto"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr "Enviar recordatorio para usuario existente"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr "Selección múltiple (mútiples respuestas)"
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr "Editar encuesta"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr "Líne de respuesta encuesta"
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr "Selección Menú"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr "Como máximo"
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr "Validar texto"
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr "Texto"
+
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr "Carta (8.5\" x 11\")"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr "solicitud.encuesta"
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr "Máximo número de decimales"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr "Retrasado"
+
+#. module: survey
+#: 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 de usuario!"
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr "De"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr "No validar texto de comentario"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr "Debe ser un número entero"
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr "Pregunta"
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr "Buscar página de la encuesta"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Send"
+msgstr "Enviar"
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "Número"
+
+#. module: survey
+#: code:addons/survey/survey.py:444
+#, python-format
+msgid ""
+"You must enter one or more menu choices                                 in "
+"column heading"
+msgstr ""
+"Debe introducir una o más opciones de menú en el encabezado de la columna"
+
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid ""
+"You can create survey for different purposes: recruitment interviews, "
+"employee's periodical evaluations, marketing campaigns, etc. A survey is "
+"made of pages containing questions of several types: text, multiple choices, "
+"etc. You can edit survey manually or click on the 'Edit Survey' for a "
+"WYSIWYG interface."
+msgstr ""
+"Puede crear encuestas para diferentes propósitos: entrevistas de selección "
+"de personal, evaluaciones periódicas de los empleados, campañas de "
+"marketing, etc. Una encuesta se compone de páginas que contienen preguntas "
+"de varios tipos: texto, opciones múltiples, etc. Puede editar la encuesta "
+"manualmente o hacer clic en \"Editar encuesta” para una interfaz WYSIWYG."
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr "Fase del plan de evaluación"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr "Entre"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr "Hacer campo comentario como opción de respuesta"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr "Email"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr "Reponder encuestas"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr "No teminado"
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr "Imprimir encuesta"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr "Seleccionar empresa"
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr "Tipo pregunta"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:131
+#, python-format
+msgid "You can not answer this survey more than %s times"
+msgstr "No puede responder a esta encuesta más de '%s' veces"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr "Respuestas"
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveying. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+"\n"
+"    Este módulo se usa para realizar encuestas. Se basa en las respuestas o "
+"comentarios de los usuarios a varias preguntas.\n"
+"    Una encuesta puede tener varias páginas. Cada página puede contener "
+"múltiples preguntas y cada pregunta puede tener varias respuestas.\n"
+"    Diferentes usuarios pueden dar diferentes respuestas a la pregunta de "
+"acuerdo a como esté confeccionada la encuesta.\n"
+"    También se puede invitar a las empresas a responder una encuesta, "
+"enviándoles correos electrónicos con nombre de usuario y contraseña.\n"
+"    "
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:124
+#, python-format
+msgid "You can not answer because the survey is not open"
+msgstr "No puede responder porque la encuesta no está abierta"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "Vínculo"
+
+#. 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 "Tipo de encuesta"
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr "Nº página"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr "Texto descriptivo"
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr "Respuesta mínima requerida"
+
+#. module: survey
+#: code:addons/survey/survey.py:484
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr ""
+"Debe introducir una o más opciones de menú en el encabezado de la columna "
+"(espacios en blanco no está permitidos)"
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr "Mensaje de error"
+
+#. module: survey
+#: code:addons/survey/survey.py:482
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr "Debe introducir una o más opciones de menú en la cabecera de columna"
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr "Fecha límite"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr "Debe ser una fecha"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr "encuesta.imprimir"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr "Cabecera columna"
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr "Respuesta obligatoria a la pregunta"
+
+#. 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 "Solicitudes de encuestas"
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:462
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr "Debe introducir una o más cabeceras de columna."
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:759
+#: code:addons/survey/wizard/survey_answer.py:954
+#, python-format
+msgid "Please enter an integer value"
+msgstr "Por favor introduzca un valor numérico entero"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr "encuesta.explorar.respuestas"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr "Párrafo de texto"
+
+#. module: survey
+#: code:addons/survey/survey.py:428
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"          Please use a number that is smaller than %d."
+msgstr ""
+"El número máximo de respuestas requeridas que ha introducido para su máximo "
+"es mayor que el número de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: view:survey.request:0
+msgid "Watting Answer"
+msgstr "Esperando respuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr ""
+"Cuando la respuesta no sea contestada, mostrar este mensaje de error:"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr "Buscar respuestas"
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr "Comentario"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr "Respuesta encuesta"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr "Selección"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr "Responder encuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr "Campo comentario"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "Manualmente"
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr "Usuario responsable de la encuesta."
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr "Añadir columna de comentarios en la matriz"
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr "#Respuesta"
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr "Imprimir sin saltos de página"
+
+#. 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 ""
+"Mostrar este mensaje de error cuando el comentario esté en un formato no "
+"válido"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:138
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr ""
+"No puede dar más respuestas. Póngase en contacto con el autor de esta "
+"encuesta para obtener más ayuda."
+
+#. 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 "Preguntas"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr "Establecer a uno si sólo requiere una respuesta por usuario."
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr "MI"
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr "Máximas respuestas requeridas"
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr "Número de página"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Cannot locate survey for the question wizard!"
+msgstr "¡No se pudo localizar la encuesta para el asistente de preguntas!"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr "y"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr "Imprimir estadísticas de encuestas"
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr "Registro (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 ""
+"Mostrar este mensaje de error cuando las selecciones no totalicen "
+"correctamente"
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr "Fecha de cierre encuestas"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "Fecha apertura de encuesta"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr "¿La escala de calificación es invisible?"
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr "Inicio"
+
+#. module: survey
+#: code:addons/survey/survey.py:477
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr ""
+"El número máximo de respuestas requeridas es mayor que el mínimo de "
+"respuestas requeridas."
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr "Número máximo"
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr "encuesta.imprimir.estadisticas"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "Cerrada"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr "Matriz de menús desplegables"
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr "Respuesta"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr "Límite máximo de respuesta"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr "Enviar invitaciones"
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr "Guardar respuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr "Fecha y hora"
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr "Imprimir encuesta"
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr "Email de notificación sobre la respuesta"
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr "Valor selección"
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr "Iniciada"
+
+#. 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 "Imprimir respuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr "Campos de texto múltiples"
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr "Horizontal"
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr "Nº de columnas"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr "Detalles encuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr "Campos de texto múltiples con tipo diferente"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr "Opciones de menú (cada opción en líneas separadas)"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr "Tipo respuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Waiting Answer"
+msgstr "Esperando respuesta"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr "Debe ser un número decimal"
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr "Entero"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr "encuesta.enviar.invitacion"
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr "Página de transferencia"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr "Omitido"
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr "Tamaño del papel"
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr "Columna"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr "encuesta.tbl.columna.cabecera"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr "Línea de respuesta de encuesta"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:134
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr "No puede responder esta encuesta más de %s veces"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr "Encuesta"
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr "¿La escala de calificación es invisible?"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr "Campos de texto numéricos"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr "enquesta.pregunta.asist"
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "Historial"
+
+#. 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 ""
+"Si este campo está vacío, se imprimirán todas las respuestas de la encuesta "
+"seleccionada."
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr "Estadísticas de encuestas"
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr "Orientación"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "Secuencia"
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr "Email"
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr "Número mínimo"
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr "Nº de respuestas requeridas"
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr "Etiqueta del campo"
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "Otros"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr "Probar encuesta"
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr "Permitir una sóla respuesta por columna (clasificación forzada)"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+#: view:survey.send.invitation:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr "Número decimal mínimo"
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr "Total encuestas empezadas"
+
+#. module: survey
+#: code:addons/survey/survey.py:467
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr ""
+"El número de respuestas requeridas que ha escrito es mayor que el número de "
+"respuestas. Introduzca un número menor que %d."
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr "Establecer a uno si la encuesta sólo puede responderse una vez."
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr "Terminado "
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr "Cabecera de columna de pregunta de encuesta"
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr "#Prom."
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr "Matriz de opciones (múltiples respuestas por fila)"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr "Responder encuesta"
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: survey
+#: view:survey:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr "Contestadas"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:433
+#, python-format
+msgid "Complete Survey Answer"
+msgstr "Respuesta completa de la encuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr "Campo de comentarios/redacción"
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr "Tipo de respuesta"
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr "El encuestado debe responder"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr "Enviar invitación"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:793
+#, python-format
+msgid "You cannot select the same answer more than one time"
+msgstr "No se puede seleccionar la misma respuesta más de una vez"
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr "Buscar pregunta"
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr "Título de la encuesta"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr "Campo de texto único"
+
+#. module: survey
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr "Seleccionar encuesta"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr "Al menos"
+
+#. 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 "encuesta.enviar.invitacion.registro"
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr "Retrato (Vertical)"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr "Debe ser de longitud específica"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr "Página de la encuesta"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr "Respuesta requerida"
+
+#. module: survey
+#: code:addons/survey/survey.py:473
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr ""
+"El mínimo de respuestas requeridas que ha introducido es mayor que el número "
+"de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: code:addons/survey/survey.py:458
+#, python-format
+msgid "You must enter one or more answer."
+msgstr "Debe dar una o más respuestas."
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr "Respuestas encuesta"
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and related answer"
+msgstr "Seleccione encuesta y respuesta relacionada"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr "Respuestas encuestas"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr "Páginas"
+
+#. module: survey
+#: code:addons/survey/survey.py:406
+#, python-format
+msgid ""
+"#Required Answer you entered is                                     greater "
+"than the number of answer.                                    Please use a "
+"number that is smaller than %d."
+msgstr ""
+"El número de respuestas requeridas que ha introducido es mayor que el número "
+"de respuestas. Utilice un número menor que %d."
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:985
+#, python-format
+msgid "You cannot select same answer more than one time'"
+msgstr "No puede seleccionar la misma respuesta más de una vez"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr "Legal (8.5\" x 14\")"
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr "#Preguntas"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr "encuesta.respuesta"
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr "Mensaje de error"
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr "Módulo encuestas"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send mail for new user"
+msgstr "Enviar email para nuevo usuario"
+
+#. module: survey
+#: code:addons/survey/survey.py:387
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr "Debe introducir una o más respuestas"
+
+#. module: survey
+#: code:addons/survey/survey.py:416
+#, python-format
+msgid ""
+"Minimum Required Answer                                     you entered is "
+"greater than the number of answer.                                    Please "
+"use a number that is smaller than %d."
+msgstr ""
+"El mínimo de respuestas requeridas que ha introducido es mayor que el número "
+"de respuestas. Por favor, use un número menor que %d."
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr "Opciones de menú"
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr "Página"
+
+#. module: survey
+#: code:addons/survey/survey.py:438
+#, python-format
+msgid ""
+"Maximum Required Answer is greater                                     than "
+"Minimum Required Answer"
+msgstr ""
+"El máximo de respuestas requeridas es menor que el mínimo de respuestas "
+"requeridas"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr "Creación usuario"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr "Todos"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr "Debe ser una dirección de email"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr "Selección múltiple (sólo una respuesta)"
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr "¿El tipo de respuesta es invisible?"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr "encuesta.imprimir.respuesta"
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr "Opciones de menú (cada opción en líneas separadas)"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr "Número flotante"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr "Campos de texto únicos"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr "%s encuesta no está en estado abierto"
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr "Fecha y hora"
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr "Nombre de columna"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr "Páginas encuesta"
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr "Suma de todas las elecciones"
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr "Tabla"
+
+#. module: survey
+#: code:addons/survey/survey.py:642
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr "¡No puede duplicar el recurso!"
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr "Fecha mínima"
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr "Máximas respuestas por usuario"
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr "Posición página"
+
+#~ msgid "All Questions"
+#~ msgstr "Todas las preguntas"
+
+#~ msgid "Give Survey Response"
+#~ msgstr "Responder la encuesta"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de acción."
+
+#~ msgid "Survey Analysis Report"
+#~ msgstr "Informe de análisis de encuestas"
+
+#~ msgid "Total Response"
+#~ msgstr "Respuesta total"
+
+#~ msgid "Set to one if  you require only one response per user"
+#~ msgstr "Establecer a uno si sólo necesita una respuesta por usuario"
+
+#~ msgid "Users Details"
+#~ msgstr "Detalles usuarios"
+
+#~ msgid "Partner"
+#~ msgstr "Empresa"
+
+#~ msgid "Skip"
+#~ msgstr "Saltar"
+
+#~ msgid "New Survey Question"
+#~ msgstr "Nueva pregunta de encuesta"
+
+#~ msgid "Maximum Response Limit"
+#~ msgstr "Límite respuesta máxima"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura 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 "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "_Ok"
+#~ msgstr "_Aceptar"
+
+#~ msgid "Page :-"
+#~ msgstr "Página :-"
+
+#~ msgid "#Response"
+#~ msgstr "#Respuesta"
+
+#~ msgid "Response Summary"
+#~ msgstr "Resumen respuesta"
+
+#~ msgid "Response Type"
+#~ msgstr "Tipo respuesta"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#~ msgid "New Survey"
+#~ msgstr "Nueva encuesta"
+
+#~ msgid "Response"
+#~ msgstr "Respuesta"
+
+#~ msgid "Modify Date"
+#~ msgstr "Fecha modificada"
+
+#~ msgid "Answered Question"
+#~ msgstr "Pregunta respondida"
+
+#~ msgid "All Surveys"
+#~ msgstr "Todas las encuentas"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module is used for surveing. It depends on the answers or reviews "
+#~ "of some questions by different users.\n"
+#~ "    A survey may have multiple pages. Each page may contain multiple "
+#~ "questions and each question may have multiple answers.\n"
+#~ "    Different users may give different answers of question and according to "
+#~ "that survey is done. \n"
+#~ "    Partners are also sent mails with user name and password for the "
+#~ "invitation of the survey\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Este módulo es utilizado para realizar encuestas. Depende de las "
+#~ "respuestas o revisión de alguna preguntas por distintos usuarios\n"
+#~ "    Una encuesta puede tener múltiples páginas. Cada página puede contener "
+#~ "distintas preguntas y cada pregunta puede tener múltiples respuestas.\n"
+#~ "    Distintos usuarios pueden dar distintas respuestas a las preguntas en "
+#~ "función de la encuesta realizada \n"
+#~ "    También se pueden enviar correos a las empresas con nombre de usuario y "
+#~ "password con una invitación a realizar la encuesta.\n"
+#~ "    "
+
+#~ msgid "All Survey Questions"
+#~ msgstr "Todas las preguntas de encuestas"
+
+#~ msgid "All Survey Pages"
+#~ msgstr "Todas páginas de encuesta"
+
+#~ msgid "Total Started Survey :-"
+#~ msgstr "Total encuestas iniciadas :-"
+
+#~ msgid "Survey Management"
+#~ msgstr "Gestión de encuestas"
+
+#~ msgid "Survey Response"
+#~ msgstr "Respuesta encuesta"
+
+#, python-format
+#~ msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+#~ msgstr ""
+#~ "Copy text \t\r\n"
+#~ "'\" + que_rec[0]['question'] + \"' Esta pregunta requiere una respuesta"
+
+#~ msgid "New Survey Page"
+#~ msgstr "Nueva página de encuesta"
+
+#~ msgid "Survey Title :-"
+#~ msgstr "Título encuesta :-"
+
+#~ msgid "Response Percentage"
+#~ msgstr "Porcentaje respuesta"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "Total Completed Survey :-"
+#~ msgstr "Total encuesta completada :-"
+
+#, python-format
+#~ msgid "Attention!"
+#~ msgstr "¡Atención!"
+
+#~ msgid "Response Count"
+#~ msgstr "Cuenta respuestas"
+
+#~ msgid "Maximum Response per User"
+#~ msgstr "Máximas respuestas por usuario"
diff --git a/addons/survey/i18n/et.po b/addons/survey/i18n/et.po
index bad56626893..1bd7ea6bed6 100644
--- a/addons/survey/i18n/et.po
+++ b/addons/survey/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:16+0000\n"
-"PO-Revision-Date: 2010-05-13 09:26+0000\n"
-"Last-Translator: lyyser <Unknown>\n"
+"PO-Revision-Date: 2011-10-11 18:13+0000\n"
+"Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -88,7 +88,7 @@ msgstr ""
 #: view:survey.question:0
 #: view:survey.request:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupeeri..."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
@@ -163,12 +163,12 @@ msgstr ""
 #. module: survey
 #: view:survey:0
 msgid "Completed"
-msgstr ""
+msgstr "Valmis"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "Exactly"
-msgstr ""
+msgstr "Täpselt"
 
 #. module: survey
 #: view:survey:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index c1a62afb0b6..e60303b5694 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "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 16:47+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2011-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -781,8 +781,9 @@ msgstr ""
 "que le nombre de réponses. Veuillez saisir un nombre plus petit que %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "En attente de réponse"
 
 #. module: survey
@@ -1131,12 +1132,6 @@ msgstr "Type de réponse"
 msgid "Validation"
 msgstr "Validation"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "En attente de réponse"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1765,5 +1760,5 @@ msgstr "Nb de réponses maximum par utilisateur"
 msgid "Page Position"
 msgstr "Position de la page"
 
-#~ msgid "Wating Answer"
-#~ msgstr "En attente de réponses"
+#~ msgid "Watting Answer"
+#~ msgstr "En attente de réponse"
diff --git a/addons/survey/i18n/gl.po b/addons/survey/i18n/gl.po
index 3a447ad5cd2..e6e862c47fc 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index df215e8a940..77968003a18 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: survey
@@ -749,8 +749,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1090,12 +1091,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/hu.po b/addons/survey/i18n/hu.po
index 7941d0b973d..d94c32a828f 100644
--- a/addons/survey/i18n/hu.po
+++ b/addons/survey/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-02 14:55+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +749,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Válaszra várva"
 
 #. module: survey
@@ -1089,12 +1091,6 @@ msgstr "Válasz típusa"
 msgid "Validation"
 msgstr "Érvényesítés"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Válaszra várva"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1711,5 +1707,5 @@ msgstr "Maximum válasz felhasználónként"
 msgid "Page Position"
 msgstr "Oldal pozíció"
 
-#~ msgid "Wating Answer"
+#~ msgid "Watting Answer"
 #~ msgstr "Válaszra várva"
diff --git a/addons/survey/i18n/it.po b/addons/survey/i18n/it.po
index 0cd52acdac0..aabeffff0e4 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,9 +748,10 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
-msgstr ""
+msgid "Waiting Answer"
+msgstr "In attesa di risposta"
 
 #. module: survey
 #: view:survey:0
@@ -1091,12 +1092,6 @@ msgstr "Tipo risposta"
 msgid "Validation"
 msgstr "Convalida"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "In attesa di risposta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1713,5 +1708,30 @@ msgstr ""
 msgid "Page Position"
 msgstr ""
 
-#~ msgid "Wating Answer"
-#~ msgstr "In attesa di risposta"
+#~ msgid "Users Details"
+#~ msgstr "Dettagli Utente"
+
+#~ msgid "All Questions"
+#~ msgstr "Tutte Le Domande"
+
+#~ msgid "Skip"
+#~ msgstr "Salta"
+
+#~ msgid "_Ok"
+#~ msgstr "_Ok"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Errore !"
+
+#~ msgid "Modify Date"
+#~ msgstr "Modifica Data"
+
+#~ msgid "Configuration"
+#~ msgstr "Configurazione"
+
+#~ msgid "Page :-"
+#~ msgstr "Pagina :-"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per la struttura della Vista!"
diff --git a/addons/survey/i18n/mn.po b/addons/survey/i18n/mn.po
index a77750043ff..38f9e131fa1 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,9 +748,10 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
-msgstr ""
+msgid "Waiting Answer"
+msgstr "Хариулт хүлээх"
 
 #. module: survey
 #: view:survey:0
@@ -1089,12 +1090,6 @@ msgstr "Хариултын төрөл"
 msgid "Validation"
 msgstr "Батлагдсан"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Хариулт хүлээх"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1821,13 +1816,6 @@ msgstr "Хуудасны байрлал"
 #~ msgid "Response Count"
 #~ msgstr "Хариултыг тоолох"
 
-#, python-format
-#~ msgid ""
-#~ "You must enter one or more menu choices\\n                                 "
-#~ "in column heading"
-#~ msgstr ""
-#~ "Баганын толгойд 1 буюу түүнээс олон цэсийн сонголтыг \\n  та оруулах ёстой"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
@@ -1846,431 +1834,3 @@ msgstr "Хуудасны байрлал"
 #~ msgstr ""
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
-#~ "                            if key.split('_"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
-#~ "                            if key.split('_"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
-#~ "\n"
-#~ "                                resp_obj.write(cr, uid, resp_id, "
-#~ "{'comment':val1})\n"
-#~ "                                "
-#~ "sur_name_read['store_ans'][resp_id].update({key1:val1})\n"
-#~ "\n"
-#~ "                        elif val1 and key1.split('_"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
-#~ "\n"
-#~ "                                resp_obj.write(cr, uid, resp_id, "
-#~ "{'comment':val1})\n"
-#~ "                                "
-#~ "sur_name_read['store_ans'][resp_id].update({key1:val1})\n"
-#~ "\n"
-#~ "                        elif val1 and key1.split('_"
-
-#~ msgid "Wating Answer"
-#~ msgstr "Хариулт хүлээж байна"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                        elif (que_rec['required_type'] == 'all' and "
-#~ "select_count < len(que_rec['answer_choice_ids'])) or \\n                     "
-#~ "       (que_rec['required_type'] == 'at least' and select_count < "
-#~ "que_rec['req_ans']) or \\n                            "
-#~ "(que_rec['required_type'] == 'at most' and select_count > "
-#~ "que_rec['req_ans']) or \\n                            "
-#~ "(que_rec['required_type'] == 'exactly' and select_count != "
-#~ "que_rec['req_ans']) or \\n                            "
-#~ "(que_rec['required_type'] == 'a range' and (select_count < "
-#~ "que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):\n"
-#~ "                            for res in resp_id_list:\n"
-#~ "                                sur_name_read['store_ans'].pop(res)\n"
-#~ "                            raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                        elif (que_rec['required_type'] == 'all' and "
-#~ "select_count < len(que_rec['answer_choice_ids'])) or \\n                     "
-#~ "       (que_rec['required_type'] == 'at least' and select_count < "
-#~ "que_rec['req_ans']) or \\n                            "
-#~ "(que_rec['required_type'] == 'at most' and select_count > "
-#~ "que_rec['req_ans']) or \\n                            "
-#~ "(que_rec['required_type'] == 'exactly' and select_count != "
-#~ "que_rec['req_ans']) or \\n                            "
-#~ "(que_rec['required_type'] == 'a range' and (select_count < "
-#~ "que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):\n"
-#~ "                            for res in resp_id_list:\n"
-#~ "                                sur_name_read['store_ans'].pop(res)\n"
-#~ "                            raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
-#~ "                                resp_obj.write(cr, uid, update, "
-#~ "{'comment':val,'state': 'done'})\n"
-#~ "                                "
-#~ "sur_name_read['store_ans'][update].update({key:val})\n"
-#~ "\n"
-#~ "                        elif val and key.split('_"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
-#~ "                                resp_obj.write(cr, uid, update, "
-#~ "{'comment':val,'state': 'done'})\n"
-#~ "                                "
-#~ "sur_name_read['store_ans'][update].update({key:val})\n"
-#~ "\n"
-#~ "                        elif val and key.split('_"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
-#~ "\n"
-#~ "                            if key1.split('_"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
-#~ "\n"
-#~ "                            if key1.split('_"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def action_new_question(self,cr, uid, ids, context):\n"
-#~ "        \"\"\"\n"
-#~ "        New survey.Question form.\n"
-#~ "\n"
-#~ "        @param self: The object pointer\n"
-#~ "        @param cr: the current row, from the database cursor,\n"
-#~ "        @param uid: the current user’s ID for security checks,\n"
-#~ "        @param ids: List of survey.question.wiz IDs\n"
-#~ "        @param context: A standard dictionary for contextual values\n"
-#~ "        @return : Dictionary value for Open new survey.Qestion form.\n"
-#~ "        \"\"\"\n"
-#~ "        for key,val in context.items():\n"
-#~ "            if type(key) == type(True):\n"
-#~ "                context.pop(key)\n"
-#~ "        view_id = self.pool.get('ir.ui.view"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "        return True\n"
-#~ "\n"
-#~ "    def action_new_question(self,cr, uid, ids, context):\n"
-#~ "        \"\"\"\n"
-#~ "        New survey.Question form.\n"
-#~ "\n"
-#~ "        @param self: The object pointer\n"
-#~ "        @param cr: the current row, from the database cursor,\n"
-#~ "        @param uid: the current user’s ID for security checks,\n"
-#~ "        @param ids: List of survey.question.wiz IDs\n"
-#~ "        @param context: A standard dictionary for contextual values\n"
-#~ "        @return : Dictionary value for Open new survey.Qestion form.\n"
-#~ "        \"\"\"\n"
-#~ "        for key,val in context.items():\n"
-#~ "            if type(key) == type(True):\n"
-#~ "                context.pop(key)\n"
-#~ "        view_id = self.pool.get('ir.ui.view"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй."
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                    if que_rec['type'] in "
-#~ "['multiple_choice_only_one_ans','single_textbox','comment'] and  "
-#~ "que_rec['is_require_answer'] and select_count <= 0:\n"
-#~ "                        for res in resp_id_list:\n"
-#~ "                            sur_name_read['store_ans'].pop(res)\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                    if que_rec['type'] in "
-#~ "['multiple_choice_only_one_ans','single_textbox','comment'] and  "
-#~ "que_rec['is_require_answer'] and select_count <= 0:\n"
-#~ "                        for res in resp_id_list:\n"
-#~ "                            sur_name_read['store_ans'].pop(res)\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \n"
-#~ " Please enter an integer value "
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \n"
-#~ " Бүхэл тоон утга оруулна уу "
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question']  + \"' \" + "
-#~ "tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
-#~ "\n"
-#~ "                    if que_rec['type'] == \"rating_scale\" and "
-#~ "que_rec['rating_allow_one_column_require'] and len(selected_value) > "
-#~ "len(list(set(selected_value))):\n"
-#~ "                        for res in resp_id_list:\n"
-#~ "                            sur_name_read['store_ans'].pop(res)\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question']  + \"' \" + "
-#~ "tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
-#~ "\n"
-#~ "                    if que_rec['type'] == \"rating_scale\" and "
-#~ "que_rec['rating_allow_one_column_require'] and len(selected_value) > "
-#~ "len(list(set(selected_value))):\n"
-#~ "                        for res in resp_id_list:\n"
-#~ "                            sur_name_read['store_ans'].pop(res)\n"
-#~ "                        raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question']  + \"' \" + "
-#~ "tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
-#~ "\n"
-#~ "                if que_rec['type'] == \"rating_scale\" and "
-#~ "que_rec['rating_allow_one_column_require'] and len(selected_value) > "
-#~ "len(list(set(selected_value))):\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question']  + \"' \" + "
-#~ "tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
-#~ "\n"
-#~ "                if que_rec['type'] == \"rating_scale\" and "
-#~ "que_rec['rating_allow_one_column_require'] and len(selected_value) > "
-#~ "len(list(set(selected_value))):\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                    elif (que_rec['required_type'] == 'all' and select_count "
-#~ "< len(que_rec['answer_choice_ids'])) or \\n                        "
-#~ "(que_rec['required_type'] == 'at least' and select_count < "
-#~ "que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
-#~ "== 'at most' and select_count > que_rec['req_ans']) or \\n                   "
-#~ "     (que_rec['required_type'] == 'exactly' and select_count != "
-#~ "que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
-#~ "== 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count "
-#~ "> que_rec['maximum_req_ans'])):\n"
-#~ "                            raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                    elif (que_rec['required_type'] == 'all' and select_count "
-#~ "< len(que_rec['answer_choice_ids'])) or \\n                        "
-#~ "(que_rec['required_type'] == 'at least' and select_count < "
-#~ "que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
-#~ "== 'at most' and select_count > que_rec['req_ans']) or \\n                   "
-#~ "     (que_rec['required_type'] == 'exactly' and select_count != "
-#~ "que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
-#~ "== 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count "
-#~ "> que_rec['maximum_req_ans'])):\n"
-#~ "                            raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + "
-#~ "tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
-#~ "\n"
-#~ "                    if que_rec['type'] in ['multiple_textboxes_diff_type', "
-#~ "'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_ch"
-#~ "oices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_te"
-#~ "xtboxes','numerical_textboxes','date','date_and_time'] and "
-#~ "que_rec['is_require_answer']:\n"
-#~ "                        if matrix_list:\n"
-#~ "                            if (que_rec['required_type'] == 'all' and "
-#~ "len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
-#~ "                      (que_rec['required_type'] == 'at least' and "
-#~ "len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
-#~ "       (que_rec['required_type'] == 'at most' and "
-#~ "len(list(set(matrix_list))) > que_rec['req_ans']) or \\n                     "
-#~ "       (que_rec['required_type'] == 'exactly' and "
-#~ "len(list(set(matrix_list))) != que_rec['req_ans']) or \\n                    "
-#~ "        (que_rec['required_type'] == 'a range' and "
-#~ "(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
-#~ "len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
-#~ "                                for res in resp_id_list:\n"
-#~ "                                    sur_name_read['store_ans'].pop(res)\n"
-#~ "                                raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + "
-#~ "tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
-#~ "\n"
-#~ "                    if que_rec['type'] in ['multiple_textboxes_diff_type', "
-#~ "'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_ch"
-#~ "oices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_te"
-#~ "xtboxes','numerical_textboxes','date','date_and_time'] and "
-#~ "que_rec['is_require_answer']:\n"
-#~ "                        if matrix_list:\n"
-#~ "                            if (que_rec['required_type'] == 'all' and "
-#~ "len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
-#~ "                      (que_rec['required_type'] == 'at least' and "
-#~ "len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
-#~ "       (que_rec['required_type'] == 'at most' and "
-#~ "len(list(set(matrix_list))) > que_rec['req_ans']) or \\n                     "
-#~ "       (que_rec['required_type'] == 'exactly' and "
-#~ "len(list(set(matrix_list))) != que_rec['req_ans']) or \\n                    "
-#~ "        (que_rec['required_type'] == 'a range' and "
-#~ "(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
-#~ "len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
-#~ "                                for res in resp_id_list:\n"
-#~ "                                    sur_name_read['store_ans'].pop(res)\n"
-#~ "                                raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "        else:\n"
-#~ "            resp_id_list = []\n"
-#~ "            for update in click_update:\n"
-#~ "                que_rec = que_obj.read(cr, uid , "
-#~ "[int(sur_name_read['store_ans'][update]['question_id'])], [])[0]\n"
-#~ "                res_ans_obj.unlink(cr, uid,res_ans_obj.search(cr, uid, "
-#~ "[('response_id', '=', update)]))\n"
-#~ "                surv_tbl_column_obj.unlink(cr, "
-#~ "uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', "
-#~ "update)]))\n"
-#~ "                resp_id_list.append(update)\n"
-#~ "                "
-#~ "sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store"
-#~ "_ans'][update]['question_id']}})\n"
-#~ "                surv_name_wiz.write(cr, uid, "
-#~ "[context.get('sur_name_id',False)], "
-#~ "{'store_ans':sur_name_read['store_ans']})\n"
-#~ "                select_count = 0\n"
-#~ "                numeric_sum = 0\n"
-#~ "                selected_value = []\n"
-#~ "                matrix_list = []\n"
-#~ "                comment_field = False\n"
-#~ "                comment_value = False\n"
-#~ "                response_list = []\n"
-#~ "\n"
-#~ "                for key, val in vals.items():\n"
-#~ "                    ans_id_len = key.split('_"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "        else:\n"
-#~ "            resp_id_list = []\n"
-#~ "            for update in click_update:\n"
-#~ "                que_rec = que_obj.read(cr, uid , "
-#~ "[int(sur_name_read['store_ans'][update]['question_id'])], [])[0]\n"
-#~ "                res_ans_obj.unlink(cr, uid,res_ans_obj.search(cr, uid, "
-#~ "[('response_id', '=', update)]))\n"
-#~ "                surv_tbl_column_obj.unlink(cr, "
-#~ "uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', "
-#~ "update)]))\n"
-#~ "                resp_id_list.append(update)\n"
-#~ "                "
-#~ "sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store"
-#~ "_ans'][update]['question_id']}})\n"
-#~ "                surv_name_wiz.write(cr, uid, "
-#~ "[context.get('sur_name_id',False)], "
-#~ "{'store_ans':sur_name_read['store_ans']})\n"
-#~ "                select_count = 0\n"
-#~ "                numeric_sum = 0\n"
-#~ "                selected_value = []\n"
-#~ "                matrix_list = []\n"
-#~ "                comment_field = False\n"
-#~ "                comment_value = False\n"
-#~ "                response_list = []\n"
-#~ "\n"
-#~ "                for key, val in vals.items():\n"
-#~ "                    ans_id_len = key.split('_"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \n"
-#~ "Please enter an integer value "
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \n"
-#~ "Бүхэл тоон утга оруулна уу "
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + "
-#~ "tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
-#~ "\n"
-#~ "                if not select_count:\n"
-#~ "                    resp_obj.write(cr, uid, update, {'state': 'skip'})\n"
-#~ "\n"
-#~ "                if que_rec['type'] in "
-#~ "['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_cho"
-#~ "ices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_me"
-#~ "nus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_a"
-#~ "nd_time'] and que_rec['is_require_answer']:\n"
-#~ "                    if matrix_list:\n"
-#~ "                        if (que_rec['required_type'] == 'all' and "
-#~ "len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
-#~ "                  (que_rec['required_type'] == 'at least' and "
-#~ "len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
-#~ "   (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > "
-#~ "que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
-#~ "== 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \\n   "
-#~ "                     (que_rec['required_type'] == 'a range' and "
-#~ "(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
-#~ "len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
-#~ "                            raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + "
-#~ "tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
-#~ "\n"
-#~ "                if not select_count:\n"
-#~ "                    resp_obj.write(cr, uid, update, {'state': 'skip'})\n"
-#~ "\n"
-#~ "                if que_rec['type'] in "
-#~ "['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_cho"
-#~ "ices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_me"
-#~ "nus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_a"
-#~ "nd_time'] and que_rec['is_require_answer']:\n"
-#~ "                    if matrix_list:\n"
-#~ "                        if (que_rec['required_type'] == 'all' and "
-#~ "len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
-#~ "                  (que_rec['required_type'] == 'at least' and "
-#~ "len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
-#~ "   (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > "
-#~ "que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
-#~ "== 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \\n   "
-#~ "                     (que_rec['required_type'] == 'a range' and "
-#~ "(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
-#~ "len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
-#~ "                            raise osv.except_osv(_('Warning !"
-
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                if que_rec['type'] in "
-#~ "['multiple_choice_only_one_ans','single_textbox','comment'] and  "
-#~ "que_rec['is_require_answer'] and select_count <= 0:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
-#~ "\n"
-#~ "                if que_rec['type'] in "
-#~ "['multiple_choice_only_one_ans','single_textbox','comment'] and  "
-#~ "que_rec['is_require_answer'] and select_count <= 0:\n"
-#~ "                    raise osv.except_osv(_('Warning !"
diff --git a/addons/survey/i18n/nl.po b/addons/survey/i18n/nl.po
index 8b497f87b97..218b40fe282 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: 2011-05-03 04:39+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -776,8 +776,9 @@ msgstr ""
 "Gebruik aub een aantal dat kleiner is dan %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Wacht op antwoord"
 
 #. module: survey
@@ -1121,12 +1122,6 @@ msgstr "Antwoordsoort"
 msgid "Validation"
 msgstr "Validatie"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Wacht op antwoord"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1754,33 +1749,8 @@ msgstr "Maximum antwoorden per gebruiker"
 msgid "Page Position"
 msgstr "Pagina positie"
 
-#, python-format
-#~ msgid ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
-#~ "                            if key.split('_"
-#~ msgstr ""
-#~ "'\" + que_rec['question'] + \"'  \n"
-#~ "\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
-#~ "                            if key.split('_"
-
-#, python-format
-#~ msgid ""
-#~ "You must enter one or more menu choices\\n                                 "
-#~ "in column heading"
-#~ msgstr "U moet één of meer menukeuzes invullen\\n in de kolomkop"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de actie definitie."
 
-#, python-format
-#~ msgid ""
-#~ "Maximum Required Answer you\\n                                     entered "
-#~ "for your maximum is greater than the number of answer.\\n                    "
-#~ "                  Please use a number that is smaller than %d."
-#~ msgstr ""
-#~ "Maximaal vereiste antwoorden dat\\nis ingevuld is groter dan het aantal "
-#~ "antwoorden.\\nGebruik een aantal dat kleiner is dan %d."
-
-#~ msgid "Wating Answer"
+#~ msgid "Watting Answer"
 #~ msgstr "Wacht op antwoord"
diff --git a/addons/survey/i18n/pl.po b/addons/survey/i18n/pl.po
index 3e12d76b210..46895647084 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/pt.po b/addons/survey/i18n/pt.po
index 8004ce0961e..9a55658d2bc 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: 2011-07-31 04:38+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -364,24 +364,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -730,8 +730,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Por favor, indique um número inteiro"
@@ -756,8 +756,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Aguardando resposta"
 
 #. module: survey
@@ -1099,12 +1100,6 @@ msgstr "Tipo de resposta"
 msgid "Validation"
 msgstr "Validação"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Aguardando resposta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1385,7 +1380,7 @@ msgid "Answered"
 msgstr "Respondido"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1412,7 +1407,7 @@ msgid "Send Invitation"
 msgstr "Enviar Convite"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1528,7 +1523,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""
@@ -1881,17 +1876,5 @@ msgstr "Posição da Página"
 #~ msgid "Response Count"
 #~ msgstr "Contagem da Resposta"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "O nome do grupo deve ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "Wating Answer"
-#~ msgstr "Aguarda resposta"
+#~ msgid "Watting Answer"
+#~ msgstr "Aguardando resposta"
diff --git a/addons/survey/i18n/pt_BR.po b/addons/survey/i18n/pt_BR.po
index 036499c6125..e1c6b4879f5 100644
--- a/addons/survey/i18n/pt_BR.po
+++ b/addons/survey/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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -752,8 +752,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Aguardando Resposta"
 
 #. module: survey
@@ -1093,12 +1094,6 @@ msgstr "Tipo de Resposta"
 msgid "Validation"
 msgstr "Validação"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Aguardando Resposta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1717,5 +1712,5 @@ msgstr ""
 msgid "Page Position"
 msgstr ""
 
-#~ msgid "Wating Answer"
+#~ msgid "Watting Answer"
 #~ msgstr "Aguardando Resposta"
diff --git a/addons/survey/i18n/ru.po b/addons/survey/i18n/ru.po
index 6ffa3ff9cac..e5439db91b3 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1663,7 +1658,7 @@ msgstr ""
 #: field:survey.response,date_create:0
 #: field:survey.response.line,date_create:0
 msgid "Create Date"
-msgstr "Дата Создания"
+msgstr "Дата создания"
 
 #. module: survey
 #: field:survey.question,column_name:0
diff --git a/addons/survey/i18n/sl.po b/addons/survey/i18n/sl.po
index c67eff5cf6b..4cee99512f6 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/sr.po b/addons/survey/i18n/sr.po
index 87edeccd437..c83c2a024e0 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/sr@latin.po b/addons/survey/i18n/sr@latin.po
index 0f85d5c49d1..a4ba8cf5ed5 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index ef48f25ad0d..47404f5ae20 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -716,8 +716,9 @@ msgid "Maximum Required Answer you                                     entered f
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1055,12 +1056,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/sv.po b/addons/survey/i18n/sv.po
index a2707d256f0..1c53afedd13 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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index e5ba62dda53..ffc6b9cd8ff 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.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: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:42+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 msgid "Print Option"
-msgstr ""
+msgstr "打印选项"
 
 #. module: survey
 #: code:addons/survey/survey.py:422
@@ -30,7 +30,7 @@ msgid ""
 "Minimum Required Answer you                                     entered is "
 "greater than the number of answer.                                      "
 "Please use a number that is smaller than %d."
-msgstr ""
+msgstr "你输入最小需要的答案数大于答案的总数。请用小于%d的数量。"
 
 #. module: survey
 #: view:survey.question.wiz:0
@@ -41,7 +41,7 @@ msgstr "你的消息"
 #: field:survey.question,comment_valid_type:0
 #: field:survey.question,validation_type:0
 msgid "Text Validation"
-msgstr ""
+msgstr "文本验证"
 
 #. module: survey
 #: code:addons/survey/survey.py:434
@@ -50,18 +50,18 @@ msgid ""
 "Maximum Required Answer you                                     entered for "
 "your maximum is greater than the number of answer.                           "
 "           Please use a number that is smaller than %d."
-msgstr ""
+msgstr "你输入用于最多答案数的最多需要的答案数大于答案的总数。请用小于%d的数量。"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,invited_user_ids:0
 msgid "Invited User"
-msgstr ""
+msgstr "受邀用户"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Character"
-msgstr ""
+msgstr "属性"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form1
@@ -80,7 +80,7 @@ msgstr "设为草稿"
 #. module: survey
 #: field:survey.question,in_visible_answer_type:0
 msgid "Is Answer Type Invisible?"
-msgstr ""
+msgstr "答案类型是隐藏的吗？"
 
 #. module: survey
 #: view:survey:0
@@ -88,27 +88,27 @@ msgstr ""
 #: view:survey.question:0
 #: view:survey.request:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "Results :"
-msgstr ""
+msgstr "结果："
 
 #. module: survey
 #: view:survey.request:0
 msgid "Survey Request"
-msgstr ""
+msgstr "调查请求"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "A Range"
-msgstr ""
+msgstr "范围"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Table Answer"
-msgstr ""
+msgstr "答案列表"
 
 #. module: survey
 #: field:survey.history,date:0
@@ -126,12 +126,12 @@ msgstr "日志明细"
 msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
-msgstr ""
+msgstr "你必须在列头选择一个或多个菜单选项（不允许空格）"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible??"
-msgstr ""
+msgstr "菜单选项是隐藏的吗？"
 
 #. module: survey
 #: field:survey.send.invitation,mail:0
@@ -147,43 +147,43 @@ msgstr "允许注释字段"
 #: 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
 msgid "Completed"
-msgstr ""
+msgstr "已完成"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "Exactly"
-msgstr ""
+msgstr "固定值"
 
 #. module: survey
 #: view:survey:0
 msgid "Open Date"
-msgstr ""
+msgstr "启用日期"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: survey
 #: field:survey.question,is_comment_require:0
 msgid "Add Comment Field"
-msgstr ""
+msgstr "增加注释字段"
 
 #. module: survey
 #: code:addons/survey/survey.py:401
@@ -192,22 +192,22 @@ msgid ""
 "#Required Answer you entered                                     is greater "
 "than the number of answer.                                     Please use a "
 "number that is smaller than %d."
-msgstr ""
+msgstr "你输入的需要的答案数大于答案的总数。请用小于%d的数量。"
 
 #. module: survey
 #: field:survey.question,tot_resp:0
 msgid "Total Answer"
-msgstr ""
+msgstr "总答案数"
 
 #. module: survey
 #: field:survey.tbl.column.heading,name:0
 msgid "Row Number"
-msgstr ""
+msgstr "行号"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_name_wiz
 msgid "survey.name.wiz"
-msgstr ""
+msgstr "survey.name.wiz"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_question_form
@@ -217,7 +217,7 @@ msgstr "调查问题"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Only One Answers Per Row)"
-msgstr ""
+msgstr "选项矩阵（每行只有一个答案）"
 
 #. module: survey
 #: code:addons/survey/survey.py:475
@@ -225,7 +225,7 @@ msgstr ""
 msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
 "number of answer. Please use a number that is smaller than %d."
-msgstr ""
+msgstr "你输入用于最多答案数的最多需要的答案数大于答案的总数。请用小于%d的数量。"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_question_message
@@ -239,20 +239,20 @@ msgstr "调查问题"
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Use if question type is rating_scale"
-msgstr ""
+msgstr "用于问题类型rating_scale"
 
 #. module: survey
 #: field:survey.print,page_number:0
 #: field:survey.print.answer,page_number:0
 msgid "Include Page Number"
-msgstr ""
+msgstr "包含页码"
 
 #. module: survey
 #: view:survey.page:0
 #: view:survey.question:0
 #: view:survey.send.invitation.log:0
 msgid "Ok"
-msgstr ""
+msgstr "确认"
 
 #. module: survey
 #: field:survey.page,title:0
@@ -262,7 +262,7 @@ msgstr "页面标题"
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_define_survey
 msgid "Define Surveys"
-msgstr ""
+msgstr "定义调查"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_history
@@ -279,44 +279,44 @@ msgstr "备注"
 #: view:survey:0
 #: view:survey.request:0
 msgid "Search Survey"
-msgstr ""
+msgstr "查询调查"
 
 #. module: survey
 #: field:survey.response.answer,answer:0
 #: field:survey.tbl.column.heading,value:0
 msgid "Value"
-msgstr ""
+msgstr "值"
 
 #. module: survey
 #: field:survey.question,column_heading_ids:0
 msgid " Column heading"
-msgstr ""
+msgstr " 列头"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_run_survey_form
 msgid "Answer a Survey"
-msgstr ""
+msgstr "答复调查"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:92
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: survey
 #: field:survey,tot_comp_survey:0
 msgid "Total Completed Survey"
-msgstr ""
+msgstr "完成的调查总数"
 
 #. module: survey
 #: view:survey.response.answer:0
 msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
-msgstr ""
+msgstr "（仅用于问题类型matrix_of_drop_down_menus）"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_analysis
 msgid "Survey Statistics"
-msgstr ""
+msgstr "调查统计"
 
 #. module: survey
 #: selection:survey,state:0
@@ -328,12 +328,12 @@ msgstr "已取消"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Rating Scale"
-msgstr ""
+msgstr "rating scale"
 
 #. module: survey
 #: field:survey.question,comment_field_type:0
 msgid "Comment Field Type"
-msgstr ""
+msgstr "备注自动类型"
 
 #. module: survey
 #: code:addons/survey/survey.py:375
@@ -386,7 +386,7 @@ msgstr "警告！"
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Single Line Of Text"
-msgstr ""
+msgstr "单行文本"
 
 #. module: survey
 #: view:survey.send.invitation:0
@@ -397,59 +397,59 @@ msgstr "为现有用户发送提醒"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Multiple Answer)"
-msgstr ""
+msgstr "多选（多个答案）"
 
 #. module: survey
 #: view:survey:0
 msgid "Edit Survey"
-msgstr ""
+msgstr "编辑问卷"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Survey Answer Line"
-msgstr ""
+msgstr "问卷答案明细"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
 msgid "Menu Choice"
-msgstr ""
+msgstr "菜单选项"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Most"
-msgstr ""
+msgstr "最多"
 
 #. module: survey
 #: field:survey.question,is_validation_require:0
 msgid "Validate Text"
-msgstr ""
+msgstr "验证文本"
 
 #. module: survey
 #: field:survey.response.line,single_text:0
 msgid "Text"
-msgstr ""
+msgstr "文本"
 
 #. module: survey
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "选择的公司不属于此用户允许访问的公司。"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Letter (8.5\" x 11\")"
-msgstr ""
+msgstr "信纸(8.5\" x 11\")"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "survey.request"
 
 #. module: survey
 #: field:survey.send.invitation,mail_subject:0
@@ -461,17 +461,17 @@ msgstr "主题"
 #: field:survey.question,comment_maximum_float:0
 #: field:survey.question,validation_maximum_float:0
 msgid "Maximum decimal number"
-msgstr ""
+msgstr "最大十进制数"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Late"
-msgstr ""
+msgstr "最近"
 
 #. module: survey
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "不能有用户名相同的两个用户"
 
 #. module: survey
 #: field:survey.send.invitation,mail_from:0
@@ -482,13 +482,13 @@ msgstr "发件人"
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Don't Validate Comment Text."
-msgstr ""
+msgstr "未验证注释内容"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Whole Number"
-msgstr ""
+msgstr "必须是一个整数"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -497,22 +497,22 @@ msgstr ""
 #: field:survey.question.column.heading,question_id:0
 #: field:survey.response.line,question_id:0
 msgid "Question"
-msgstr ""
+msgstr "疑问"
 
 #. module: survey
 #: view:survey.page:0
 msgid "Search Survey Page"
-msgstr ""
+msgstr "查询问卷页"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Send"
-msgstr ""
+msgstr "发送"
 
 #. module: survey
 #: field:survey.question.wiz,name:0
 msgid "Number"
-msgstr ""
+msgstr "数字"
 
 #. module: survey
 #: code:addons/survey/survey.py:444
@@ -520,7 +520,7 @@ msgstr ""
 msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading"
-msgstr ""
+msgstr "你必须在列头输入一个或多个菜单选项"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form1
@@ -531,84 +531,86 @@ msgid ""
 "etc. You can edit survey manually or click on the 'Edit Survey' for a "
 "WYSIWYG interface."
 msgstr ""
+"你可以为不同的目的创建文件调查：招聘与面试，员工定期评估，市场营销活动等。文件由包含多种问题类型的页面组成：文本，多选等。你你可以手工编辑问卷或者通过点击"
+"“编辑文件”进行所见即所得界面编辑。"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 #: field:survey.request,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "评估计划阶段"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Between"
-msgstr ""
+msgstr "介于"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
 msgid "Make Comment Field an Answer Choice"
-msgstr ""
+msgstr "使注释字段作为答案选择"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Email"
-msgstr ""
+msgstr "电子邮箱"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_answer_surveys
 msgid "Answer Surveys"
-msgstr ""
+msgstr "填写问卷"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
-msgstr ""
+msgstr "未完成"
 
 #. module: survey
 #: view:survey.print:0
 msgid "Survey Print"
-msgstr ""
+msgstr "打印问卷"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Select Partner"
-msgstr ""
+msgstr "选择业务伙伴"
 
 #. module: survey
 #: field:survey.question,type:0
 msgid "Question Type"
-msgstr ""
+msgstr "问题类型"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:131
 #, python-format
 msgid "You can not answer this survey more than %s times"
-msgstr ""
+msgstr "你填写此文件不能超过%s次"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
 msgid "Answers"
-msgstr ""
+msgstr "答案"
 
 #. module: survey
 #: model:ir.module.module,description:survey.module_meta_information
@@ -624,29 +626,35 @@ msgid ""
 "invitation of the survey\n"
 "    "
 msgstr ""
+"\n"
+"    此模块用于问卷调查。它依赖不同用户问题的答复或者回顾。\n"
+"    一个问卷可以有多个页面。每个页面可以有多个问题，每个问题会有多个答案。\n"
+"    针对完成的问卷，不同的用户可能给出不同的问题答案。\n"
+"    对于问卷邀请，会发送带有用户名和密码的邮件给业务合作伙伴。\n"
+"    "
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You can not answer because the survey is not open"
-msgstr ""
+msgstr "你不能填写此问卷，因为它还没启用"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Link"
-msgstr ""
+msgstr "链接"
 
 #. 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 "问卷类型"
 
 #. module: survey
 #: field:survey.page,sequence:0
 msgid "Page Nr"
-msgstr ""
+msgstr "页码"
 
 #. module: survey
 #: view:survey:0
@@ -655,12 +663,12 @@ msgstr ""
 #: field:survey.question,descriptive_text:0
 #: selection:survey.question,type:0
 msgid "Descriptive Text"
-msgstr ""
+msgstr "描述性文字"
 
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "最小需要的答案数"
 
 #. module: survey
 #: code:addons/survey/survey.py:484
@@ -668,75 +676,75 @@ msgstr ""
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
 "allowed)"
-msgstr ""
+msgstr "你必须在列头输入一个或多个菜单选项（不能为空格）"
 
 #. module: survey
 #: field:survey.question,req_error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "错误消息"
 
 #. module: survey
 #: code:addons/survey/survey.py:482
 #, python-format
 msgid "You must enter one or more menu choices in column heading"
-msgstr ""
+msgstr "你必须在列头输入一个或多个菜单选项"
 
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
-msgstr ""
+msgstr "截至日期"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Date"
-msgstr ""
+msgstr "必须为日期类型"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print
 msgid "survey.print"
-msgstr ""
+msgstr "survey.print"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 #: field:survey.question.column.heading,title:0
 msgid "Column Heading"
-msgstr ""
+msgstr "列头"
 
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+msgstr "需要答案"
 
 #. 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 "问卷请求"
 
 #. module: survey
 #: code:addons/survey/survey.py:375
 #: code:addons/survey/survey.py:462
 #, python-format
 msgid "You must enter one or more column heading."
-msgstr ""
+msgstr "你必须输入一条或多条列头"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:758
 #: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
-msgstr ""
+msgstr "请输入一个整数"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
 msgid "survey.browse.answer"
-msgstr ""
+msgstr "survey.browse.answer"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "文本段落"
 
 #. module: survey
 #: code:addons/survey/survey.py:428
@@ -745,37 +753,38 @@ msgid ""
 "Maximum Required Answer you                                     entered for "
 "your maximum is greater than the number of answer.                           "
 "          Please use a number that is smaller than %d."
-msgstr ""
+msgstr "你输入的最多需要的答案数大于答案数。请用小于%d的数字。"
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
-msgstr ""
+msgid "Waiting Answer"
+msgstr "等待回复"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the question is not answered, display this error message:"
-msgstr ""
+msgstr "当问题没有回答的时候，显示此错误消息："
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_browse_survey_response
 msgid "Browse Answers"
-msgstr ""
+msgstr "浏览答案"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
 #: view:survey.response.line:0
 msgid "Comment"
-msgstr ""
+msgstr "注释"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_answer
@@ -785,58 +794,58 @@ msgstr ""
 #: view:survey.response.answer:0
 #: view:survey.response.line:0
 msgid "Survey Answer"
-msgstr ""
+msgstr "问卷答案"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Selection"
-msgstr ""
+msgstr "选择"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_browse_survey_response
 #: view:survey:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "填写问卷"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Comment Field"
-msgstr ""
+msgstr "备注字段"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Manually"
-msgstr ""
+msgstr "手工"
 
 #. module: survey
 #: help:survey,responsible_id:0
 msgid "User responsible for survey"
-msgstr ""
+msgstr "问卷的用户职责"
 
 #. module: survey
 #: field:survey.question,comment_column:0
 msgid "Add comment column in matrix"
-msgstr ""
+msgstr "在矩阵列表中添加备注字段"
 
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "答案#"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "不分页符打印"
 
 #. 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 "当备注的格式无效的时候，显示此错误消息"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:138
@@ -844,80 +853,80 @@ msgstr ""
 msgid ""
 "You can not give more response. Please contact the author of this survey for "
 "further assistance."
-msgstr ""
+msgstr "你不能再次回复。请联系此问卷的作者获取更多的帮助。"
 
 #. 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 "问题"
 
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one Answer per user"
-msgstr ""
+msgstr "如果你需要每个用户只提供一份答案，把它设为1"
 
 #. module: survey
 #: field:survey,users:0
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Message"
-msgstr ""
+msgstr "消息"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 msgid "MY"
-msgstr ""
+msgstr "MY"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
 msgid "Maximum Required Answer"
-msgstr ""
+msgstr "需要的最大答案数"
 
 #. module: survey
 #: field:survey.name.wiz,page_no:0
 msgid "Page Number"
-msgstr ""
+msgstr "页码"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:92
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
-msgstr ""
+msgstr "无法为问题向导定位问卷！"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "and"
-msgstr ""
+msgstr "和"
 
 #. 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 "问卷打印统计"
 
 #. module: survey
 #: field:survey.send.invitation.log,note:0
 msgid "Log"
-msgstr ""
+msgstr "日志"
 
 #. 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 "当选项合计不正确时，显示此错误消息"
 
 #. module: survey
 #: field:survey,date_close:0
 msgid "Survey Close Date"
-msgstr ""
+msgstr "问卷截止日期"
 
 #. module: survey
 #: field:survey,date_open:0
@@ -927,47 +936,47 @@ msgstr "调查开展日期"
 #. module: survey
 #: field:survey.question.column.heading,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible ??"
-msgstr ""
+msgstr "评定量表是否隐藏？"
 
 #. module: survey
 #: view:survey.browse.answer:0
 #: view:survey.name.wiz:0
 msgid "Start"
-msgstr ""
+msgstr "开始"
 
 #. module: survey
 #: code:addons/survey/survey.py:477
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer"
-msgstr ""
+msgstr "需要的最多答案数大于需要的最小的答案数"
 
 #. module: survey
 #: field:survey.question,comment_maximum_no:0
 #: field:survey.question,validation_maximum_no:0
 msgid "Maximum number"
-msgstr ""
+msgstr "最大数"
 
 #. module: survey
 #: selection:survey,state:0
 #: selection:survey.request,state:0
 #: selection:survey.response.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_statistics
 msgid "survey.print.statistics"
-msgstr ""
+msgstr "survey.print.statistics"
 
 #. module: survey
 #: selection:survey,state:0
 msgid "Closed"
-msgstr ""
+msgstr "已结束"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Drop-down Menus"
-msgstr ""
+msgstr "下拉菜单矩阵"
 
 #. module: survey
 #: view:survey:0
@@ -989,138 +998,132 @@ msgstr ""
 #: field:survey.send.invitation,partner_ids:0
 #: field:survey.tbl.column.heading,response_table_id:0
 msgid "Answer"
-msgstr ""
+msgstr "回复"
 
 #. module: survey
 #: field:survey,max_response_limit:0
 msgid "Maximum Answer Limit"
-msgstr ""
+msgstr "最大回复限制"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
 msgid "Send Invitations"
-msgstr ""
+msgstr "发送邀请"
 
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "保存回复"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Date and Time"
-msgstr ""
+msgstr "日期和时间"
 
 #. module: survey
 #: field:survey,state:0
 #: field:survey.response,state:0
 #: field:survey.response.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print
 msgid "Print Survey"
-msgstr ""
+msgstr "打印问卷"
 
 #. module: survey
 #: field:survey,send_response:0
 msgid "E-mail Notification on Answer"
-msgstr ""
+msgstr "回复的邮件通知"
 
 #. module: survey
 #: field:survey.response.answer,value_choice:0
 msgid "Value Choice"
-msgstr ""
+msgstr "选项值"
 
 #. module: survey
 #: view:survey:0
 msgid "Started"
-msgstr ""
+msgstr "已开始"
 
 #. 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 "打印回复"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "多个文本框"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Landscape(Horizontal)"
-msgstr ""
+msgstr "横向打印格式（横向的）"
 
 #. module: survey
 #: field:survey.question,no_of_rows:0
 msgid "No of Rows"
-msgstr ""
+msgstr "行号"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.name.wiz:0
 msgid "Survey Details"
-msgstr ""
+msgstr "问卷详情"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "不同类型的多个文本框"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Menu Choices (each choice on separate lines)"
-msgstr ""
+msgstr "菜单选项（每个选项用单独的一行）"
 
 #. module: survey
 #: field:survey.response,response_type:0
 msgid "Answer Type"
-msgstr ""
+msgstr "回复类型"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Validation"
-msgstr ""
-
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
+msgstr "验证"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Decimal Number"
-msgstr ""
+msgstr "必须为十进制小数"
 
 #. module: survey
 #: field:res.users,survey_id:0
 msgid "Groups"
-msgstr ""
+msgstr "组"
 
 #. module: survey
 #: selection:survey.answer,type:0
 #: selection:survey.question,type:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Integer"
-msgstr ""
+msgstr "整数"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_send_invitation
 msgid "survey.send.invitation"
-msgstr ""
+msgstr "survey.send.invitation"
 
 #. module: survey
 #: field:survey.history,user_id:0
@@ -1128,45 +1131,45 @@ msgstr ""
 #: field:survey.request,user_id:0
 #: field:survey.response,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "转页"
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Skiped"
-msgstr ""
+msgstr "忽略"
 
 #. module: survey
 #: field:survey.print,paper_size:0
 #: field:survey.print.answer,paper_size:0
 msgid "Paper Size"
-msgstr ""
+msgstr "纸张尺寸"
 
 #. module: survey
 #: field:survey.response.answer,column_id:0
 #: field:survey.tbl.column.heading,column_id:0
 msgid "Column"
-msgstr ""
+msgstr "栏位"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_tbl_column_heading
 msgid "survey.tbl.column.heading"
-msgstr ""
+msgstr "survey.tbl.column.heading"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_line
 msgid "Survey Response Line"
-msgstr ""
+msgstr "问卷回复明细"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:134
 #, python-format
 msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "不能回复此问卷超过%s次"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1187,49 +1190,49 @@ msgstr ""
 #: field:survey.request,survey_id:0
 #: field:survey.response,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "问卷"
 
 #. module: survey
 #: field:survey.question,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible?"
-msgstr ""
+msgstr "评定量表是否隐藏？"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "数字文本框"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
 msgid "survey.question.wiz"
-msgstr ""
+msgstr "survey.question.wiz"
 
 #. module: survey
 #: view:survey:0
 msgid "History"
-msgstr ""
+msgstr "历史记录"
 
 #. 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 "如果此字段为空，将打印选中问卷的所有答复。"
 
 #. module: survey
 #: field:survey.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "代码"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_statistics
 msgid "Surveys Statistics"
-msgstr ""
+msgstr "问卷统计"
 
 #. module: survey
 #: field:survey.print,orientation:0
 #: field:survey.print.answer,orientation:0
 msgid "Orientation"
-msgstr ""
+msgstr "定位"
 
 #. module: survey
 #: view:survey:0
@@ -1237,55 +1240,55 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Seq"
-msgstr ""
+msgstr "序号"
 
 #. module: survey
 #: field:survey.request,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: survey
 #: field:survey.question,comment_minimum_no:0
 #: field:survey.question,validation_minimum_no:0
 msgid "Minimum number"
-msgstr ""
+msgstr "最小数"
 
 #. module: survey
 #: field:survey.question,req_ans:0
 msgid "#Required Answer"
-msgstr ""
+msgstr "回复#"
 
 #. module: survey
 #: field:survey.answer,sequence:0
 #: field:survey.question,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序号"
 
 #. module: survey
 #: field:survey.question,comment_label:0
 msgid "Field Label"
-msgstr ""
+msgstr "字段标签"
 
 #. module: survey
 #: view:survey:0
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Done"
-msgstr ""
+msgstr "已完成"
 
 #. module: survey
 #: view:survey:0
 msgid "Test Survey"
-msgstr ""
+msgstr "测试问卷"
 
 #. module: survey
 #: field:survey.question,rating_allow_one_column_require:0
 msgid "Allow Only One Answer per Column (Forced Ranking)"
-msgstr ""
+msgstr "每个栏位只允许一个答复（强制性排名）"
 
 #. module: survey
 #: view:survey:0
@@ -1296,29 +1299,29 @@ msgstr ""
 #: view:survey.print.statistics:0
 #: view:survey.send.invitation:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: survey
 #: view:survey:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: survey
 #: field:survey.question,comment_minimum_float:0
 #: field:survey.question,validation_minimum_float:0
 msgid "Minimum decimal number"
-msgstr ""
+msgstr "最小的十进制数"
 
 #. module: survey
 #: view:survey:0
 #: selection:survey,state:0
 msgid "Open"
-msgstr ""
+msgstr "开始"
 
 #. module: survey
 #: field:survey,tot_start_survey:0
 msgid "Total Started Survey"
-msgstr ""
+msgstr "已开始的文件总数"
 
 #. module: survey
 #: code:addons/survey/survey.py:467
@@ -1326,100 +1329,100 @@ msgstr ""
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
 "use a number that is smaller than %d."
-msgstr ""
+msgstr "你输入的回复#大于回复的总数。请使用小于%d的数。"
 
 #. module: survey
 #: help:survey,max_response_limit:0
 msgid "Set to one if survey is answerable only once"
-msgstr ""
+msgstr "设为1，如果问卷只可以回复一次"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr ""
+msgstr "已结束 "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
 msgid "Survey Question Column Heading"
-msgstr ""
+msgstr "问卷问题标题栏"
 
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "平均#"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "选项矩阵（每行含有多个答案）"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 msgid "Give Survey Answer"
-msgstr ""
+msgstr "回复问卷"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: survey
 #: view:survey:0
 msgid "Current"
-msgstr ""
+msgstr "当前"
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Answered"
-msgstr ""
+msgstr "已答复"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
-msgstr ""
+msgstr "完成问卷回复"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Comment/Essay Box"
-msgstr ""
+msgstr "备注/随笔框"
 
 #. module: survey
 #: field:survey.answer,type:0
 msgid "Type of Answer"
-msgstr ""
+msgstr "回复类型"
 
 #. module: survey
 #: field:survey.question,required_type:0
 msgid "Respondent must answer"
-msgstr ""
+msgstr "调查人必须答复"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
 #: view:survey.send.invitation:0
 msgid "Send Invitation"
-msgstr ""
+msgstr "发送邀请"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
-msgstr ""
+msgstr "不能选择多次选择同样的答案"
 
 #. module: survey
 #: view:survey.question:0
 msgid "Search Question"
-msgstr ""
+msgstr "查询问题"
 
 #. module: survey
 #: field:survey,title:0
 msgid "Survey Title"
-msgstr ""
+msgstr "问卷标题"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Single Textbox"
-msgstr ""
+msgstr "单行文本框"
 
 #. module: survey
 #: field:survey,note:0
@@ -1428,49 +1431,49 @@ msgstr ""
 #: field:survey.page,note:0
 #: view:survey.response.line:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Select Survey"
-msgstr ""
+msgstr "选择问卷"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Least"
-msgstr ""
+msgstr "至少"
 
 #. 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 "纵向打印（纵向）"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "必须为指定的长度"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
 msgid "Survey Page"
-msgstr ""
+msgstr "问卷页面"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Required Answer"
-msgstr ""
+msgstr "需要的答复"
 
 #. module: survey
 #: code:addons/survey/survey.py:473
@@ -1478,34 +1481,34 @@ msgstr ""
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
 "Please use a number that is smaller than %d."
-msgstr ""
+msgstr "你输入的最少需要的答复大于答复总数。请用小于%d的数。"
 
 #. module: survey
 #: code:addons/survey/survey.py:458
 #, python-format
 msgid "You must enter one or more answer."
-msgstr ""
+msgstr "必须输入一个或多个答复。"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
 #: field:survey.browse.answer,response_id:0
 msgid "Survey Answers"
-msgstr ""
+msgstr "问卷答复"
 
 #. module: survey
 #: view:survey.browse.answer:0
 msgid "Select Survey and related answer"
-msgstr ""
+msgstr "选择问卷和对应的答复"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_answer
 msgid "Surveys Answers"
-msgstr ""
+msgstr "问卷答复"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 msgid "Pages"
-msgstr ""
+msgstr "页面"
 
 #. module: survey
 #: code:addons/survey/survey.py:406
@@ -1514,34 +1517,34 @@ msgid ""
 "#Required Answer you entered is                                     greater "
 "than the number of answer.                                    Please use a "
 "number that is smaller than %d."
-msgstr ""
+msgstr "你输入的需要的答复#大于答复数量。请用小于%d的数。"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
-msgstr ""
+msgstr "不能多次选择同样的答复"
 
 #. 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 "名称"
 
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "问题#"
 
 #. 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
@@ -1549,24 +1552,24 @@ msgstr ""
 #: field:survey.question,numeric_required_sum_err_msg:0
 #: field:survey.question,validation_valid_err_msg:0
 msgid "Error message"
-msgstr ""
+msgstr "错误消息"
 
 #. module: survey
 #: model:ir.module.module,shortdesc:survey.module_meta_information
 msgid "Survey Module"
-msgstr ""
+msgstr "问卷模块"
 
 #. module: survey
 #: view:survey.send.invitation:0
 #: field:survey.send.invitation,send_mail:0
 msgid "Send mail for new user"
-msgstr ""
+msgstr "发送邮件给新用户"
 
 #. module: survey
 #: code:addons/survey/survey.py:387
 #, python-format
 msgid "You must enter one or more Answer."
-msgstr ""
+msgstr "你必须输入一个或多个答复。"
 
 #. module: survey
 #: code:addons/survey/survey.py:416
@@ -1575,19 +1578,19 @@ msgid ""
 "Minimum Required Answer                                     you entered is "
 "greater than the number of answer.                                    Please "
 "use a number that is smaller than %d."
-msgstr ""
+msgstr "你输入的最少需要的答复数大于答复总数。请用小于%d的数。"
 
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "菜单选项"
 
 #. module: survey
 #: field:survey,page_ids:0
 #: view:survey.question:0
 #: field:survey.response.line,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "页面"
 
 #. module: survey
 #: code:addons/survey/survey.py:438
@@ -1595,80 +1598,80 @@ msgstr ""
 msgid ""
 "Maximum Required Answer is greater                                     than "
 "Minimum Required Answer"
-msgstr ""
+msgstr "最多需要的答复数大于最少需要的答复数"
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "User creation"
-msgstr ""
+msgstr "创建用户"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "All"
-msgstr ""
+msgstr "全选"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be An Email Address"
-msgstr ""
+msgstr "必须为邮件地址"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Only One Answer)"
-msgstr ""
+msgstr "多选（只有一个答复）"
 
 #. module: survey
 #: field:survey.answer,in_visible_answer_type:0
 msgid "Is Answer Type Invisible??"
-msgstr ""
+msgstr "是否隐藏答复类型？"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_answer
 msgid "survey.print.answer"
-msgstr ""
+msgstr "survey.print.answer"
 
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "菜单选项（每个选项放在单行）"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Float"
-msgstr ""
+msgstr "浮点数"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Single Textboxes"
-msgstr ""
+msgstr "单行文本框"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "%sSurvey is not in open state"
-msgstr ""
+msgstr "%s问卷不是启用状态"
 
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "重要性"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Date & Time"
-msgstr ""
+msgstr "日期和时间"
 
 #. module: survey
 #: field:survey.response,date_create:0
 #: field:survey.response.line,date_create:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: survey
 #: field:survey.question,column_name:0
 msgid "Column Name"
-msgstr ""
+msgstr "列名"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
@@ -1676,40 +1679,40 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_page_form1
 #: view:survey.page:0
 msgid "Survey Pages"
-msgstr ""
+msgstr "问卷页面"
 
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "所有选择总数"
 
 #. module: survey
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "表格(Table)"
 
 #. module: survey
 #: code:addons/survey/survey.py:642
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "无法复制资源！"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
 #: field:survey.question,validation_minimum_date:0
 msgid "Minimum date"
-msgstr ""
+msgstr "最小日期"
 
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "没用户最多答复数"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "页面位置"
 
 #~ msgid "All Questions"
 #~ msgstr "所有问题"
@@ -1740,3 +1743,6 @@ msgstr ""
 
 #~ msgid "New Survey Question"
 #~ msgstr "新的调查问题"
+
+#~ msgid "Watting Answer"
+#~ msgstr "等待回答"
diff --git a/addons/survey/specification/final spec b/addons/survey/specification/specification.txt
similarity index 100%
rename from addons/survey/specification/final spec
rename to addons/survey/specification/specification.txt
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index bd27f313d82..bf5ec4edeef 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -50,6 +50,7 @@ class survey(osv.osv):
         return data
 
     _columns = {
+        'id': fields.integer('ID'),
         'title': fields.char('Survey Title', size=128, required=1),
         'page_ids': fields.one2many('survey.page', 'survey_id', 'Page'),
         'date_open': fields.datetime('Survey Open Date', readonly=1),
@@ -58,7 +59,7 @@ class survey(osv.osv):
                      help="Set to one if survey is answerable only once"),
         'response_user': fields.integer('Maximum Answer per User',
                      help="Set to one if  you require only one Answer per user"),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
+        'state': fields.selection([('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
         'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
         'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
         'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
@@ -70,17 +71,13 @@ class survey(osv.osv):
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
-        'state': lambda * a: "draft",
+        'state': lambda * a: "open",
         'tot_start_survey': lambda * a: 0,
         'tot_comp_survey': lambda * a: 0,
         'send_response': lambda * a: 1,
         'response_user': lambda * a:1,
     }
 
-    def survey_draft(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, {'state': 'draft'})
-        return True
-
     def survey_open(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, {'state': 'open', 'date_open': strftime("%Y-%m-%d %H:%M:%S")})
         return True
@@ -92,7 +89,7 @@ class survey(osv.osv):
     def survey_cancel(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, {'state': 'cancel' })
         return True
-        
+
     def copy(self, cr, uid, ids, default=None, context=None):
         vals = {}
         current_rec = self.read(cr, uid, ids, context=context)
@@ -181,9 +178,7 @@ class survey_page(osv.osv):
         if context is None:
             context = {}
         data = super(survey_page, self).default_get(cr, uid, fields, context)
-        if context.get('line_order',False):
-            if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
-                data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
+        self.pool.get('survey.question').data_get(cr,uid,data,context)
         if context.has_key('survey_id'):
             data['survey_id'] = context.get('survey_id', False)
         return data
@@ -504,14 +499,21 @@ class survey_question(osv.osv):
             'context': context
         }
 
+    def data_get(self, cr, uid, data, context):
+        if data and context:
+            if context.get('line_order', False):
+                lines =  context.get('line_order')
+                seq = data.get('sequence', 0)
+                for line in  lines:
+                    seq = seq + 1
+                data.update({'sequence': seq})
+        return data
+
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
         data = super(survey_question, self).default_get(cr, uid, fields, context)
-        if context.get('line_order',False):
-            if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
-                data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
-
+        self.data_get(cr,uid,data,context)
         if context.has_key('page_id'):
             data['page_id']= context.get('page_id', False)
         return data
@@ -604,9 +606,7 @@ class survey_answer(osv.osv):
         if context is None:
             context = {}
         data = super(survey_answer, self).default_get(cr, uid, fields, context)
-        if context.get('line_order', False):
-            if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
-                data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
+        self.pool.get('survey.question').data_get(cr,uid,data,context)
         return data
 
 survey_answer()
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 97e8daeb5b4..2b96d3c17d2 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -100,7 +100,7 @@
         </record>
         <record id="survey_question_company_size_Europ" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
-            <field name="answer">Europ</field>
+            <field name="answer">Europe</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="1"/>
         </record>
@@ -1281,6 +1281,7 @@
             <field name="responsible_id" ref="base.user_demo"/>
             <field name="max_response_limit">20</field>
             <field name="type" ref="survey_type2"/>
+            <field name="state">open</field>
             <field name="response_user">5</field>
         </record>
     </data>
@@ -2140,7 +2141,7 @@
             <field name="title">Community Survey</field>
             <field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
             <field eval="6" name="response_user"/>
-            <field name="state">draft</field>
+            <field name="state">open</field>
             <field name="responsible_id" ref="base.user_root"/>
             <field eval="1" name="send_response"/>
             <field eval="[(6,0,[])]" name="users"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index d14082f69e8..d5d0100534e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -180,14 +180,12 @@
                                 </form>
                             </field>
                             <group col="9" colspan="4">
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                                 <button name="survey_cancel"
                                     string="Cancel" states="open" type="object" icon="gtk-cancel"/>
-                                <button name="survey_draft"
-                                    string="Set to draft" states="cancel,close" type="object"
-                                    icon="gtk-new"/>
-                                <button name="survey_open" string="Open"
-                                    states="draft" type="object" icon="gtk-go-forward"/>
+                                <button name="survey_open"
+                                    string="Open" states="cancel,close" type="object"
+                                    icon="gtk-go-forward"/>
                                 <button name="survey_close"
                                     string="Close" states="open" type="object" icon="gtk-close"/>
                             </group>
@@ -233,7 +231,7 @@
             <field name="model">survey</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="gray:state in ('close')" string="Survey">
+                <tree colors="gray:state == 'close'" string="Survey">
                     <field name="title" select="1"/>
                     <field name="type" select="1"/>
                     <field name="responsible_id"/>
@@ -260,17 +258,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
-                   <group col='10' colspan='4'>
-                        <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]"/>
+                   <group>
+                        <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
                         <separator orientation="vertical"/>
-                        <field name="title" select="1"/>
-                        <field name="type" select="1" widget="selection"/>
-                        <field name="responsible_id" select="1">
+                        <field name="title"/>
+                        <field name="type" widget="selection"/>
+                        <field name="responsible_id">
                             <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         </field>
                    </group>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By...">
                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
@@ -476,7 +475,7 @@
                     <field name="title"/>
                     <field name="survey_id"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                     </group>
                 </search>
@@ -683,7 +682,7 @@
                     <field name="survey" widget="selection"/>
                     <field name="type"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="Page" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'page_id'}"/>
                     </group>
                </search>
@@ -1067,7 +1066,7 @@
                      <field name="state"/>
                         <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
                         <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                        <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
+                        <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                     </group>
                 </form>
@@ -1095,18 +1094,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
-                   <group col='10' colspan='4'>
+                   <group>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
-                        <field name="survey_id" widget="selection" select="1"/>
-                        <field name="email" select="1"/>
-                        <field name="user_id" select="1">
+                        <field name="survey_id" widget="selection"/>
+                        <field name="email"/>
+                        <field name="user_id">
                         <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
diff --git a/addons/survey/test/survey00.yml b/addons/survey/test/survey00.yml
index 7bfe8a5320d..ab34f62f65e 100644
--- a/addons/survey/test/survey00.yml
+++ b/addons/survey/test/survey00.yml
@@ -144,10 +144,10 @@
     Give answer of the survey, Run "Answer a Survey" wizard and select the survey and press on start button then run the selected survey.
 -
     !python {model: survey.name.wiz}: |
-      ids = self.create(cr, uid, {'survey_id': ref("survey_partner_0")}) 
-      self.action_next(cr, uid, [ids], context)
+      id = self.create(cr, uid, {'survey_id': ref("survey_partner_0")}) 
+      self.action_next(cr, uid, [id], context)
 -
-    Give answer of the first and second page in "Partner Feedback" suvey.
+    Give answer of the first and second page in "Partner Feedback" survey.
 -
     !python {model: survey.question.wiz}: |
       ids = self.create(cr, uid, {str(ref("survey_p_question_0")) +"_single" :'Tiny' , str(ref("survey_p_question_1")) + "_selection" :int(ref("survey_p_1_1"))}, context)
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 896bde70d3c..f913f922c55 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -30,6 +30,7 @@ from osv import fields
 from tools import to_xml
 from tools.translate import _
 import addons
+from tools.safe_eval import safe_eval
 
 class survey_question_wiz(osv.osv_memory):
     _name = 'survey.question.wiz'
@@ -40,16 +41,9 @@ class survey_question_wiz(osv.osv_memory):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
         Fields View Get method :- generate the new view and display the survey pages of selected survey.
-
-        @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 view_id : view id of the current object.
-        @param view_type : which type of view is create. like :- form, tree ,search etc...
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for created view of particular survey pages.
         """
-        
+        if context is None:
+            context = {}
         result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, \
                                         view_type, context, toolbar,submenu)
 
@@ -61,8 +55,8 @@ class survey_question_wiz(osv.osv_memory):
         sur_response_obj = self.pool.get('survey.response')
         que_col_head = self.pool.get('survey.question.column.heading')
         user_obj = self.pool.get('res.users')
-        if context is None:
-            context = {}
+        mail_message = self.pool.get('mail.message')
+        
         if view_type in ['form']:
             wiz_id = 0
             sur_name_rec = None
@@ -79,7 +73,7 @@ class survey_question_wiz(osv.osv_memory):
                 wiz_id = surv_name_wiz.create(cr, uid, res_data)
                 sur_name_rec = surv_name_wiz.browse(cr, uid, wiz_id, context=context)
                 context.update({'sur_name_id' :wiz_id})
-  
+
             if context.has_key('active_id'):
                 context.pop('active_id')
 
@@ -87,7 +81,7 @@ class survey_question_wiz(osv.osv_memory):
             if not survey_id:
                 # Try one more time to find it
                 if sur_name_rec and sur_name_rec.survey_id:
-                    survey_id = sur_name_rec.survey_id[0]
+                    survey_id = sur_name_rec.survey_id.id
                 else:
                     # raise osv.except_osv(_('Error!'), _("Cannot locate survey for the question wizard!"))
                     # If this function is called without a survey_id in
@@ -397,11 +391,11 @@ class survey_question_wiz(osv.osv_memory):
                     sur_response_obj.write(cr, uid, [sur_name_read.response], {'state' : 'done'})
 
                     if sur_rec.send_response:
-                        survey_data = survey_obj.browse(cr, uid, int(survey_id))
+                        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, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
-                        attachments = []
+                        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:
@@ -410,25 +404,17 @@ class survey_question_wiz(osv.osv_memory):
                             if not line:
                                 break
 
-                        attachments.append((survey_data.title + ".pdf",file_data))
+                        attachments[survey_data.title + ".pdf"] = file_data
                         file.close()
                         os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
-                        user_email = False
-                        resp_email = False
+                        
+                        user_email = user_obj.browse(cr, uid, uid, context).user_email
+                        resp_email = survey_data.responsible_id and survey_data.responsible_id.user_email or False
 
-                        address_id = user_obj.browse(cr, uid, uid).address_id.id
-                        if address_id:
-                            cr.execute("select email from res_partner_address where id =%s", (address_id,))
-                            user_email = cr.fetchone()[0]
-                        resp_id = survey_data.responsible_id.address_id
-
-                        if resp_id:
-                            cr.execute("select email from res_partner_address where id =%s", (resp_id.id,))
-                            resp_email = cr.fetchone()[0]
                         if user_email and resp_email:
                             user_name = user_obj.browse(cr, uid, uid, context=context).name
-                            mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
-                            tools.email_send(user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attach = attachments)
+                            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)
 
                     xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
                     etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
@@ -444,15 +430,6 @@ 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 '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.
-
-        @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 res_ids: List of survey answer IDs,
-        @param report_name: name of the report,
-        @param file_name: To give file name of the report,
-        @param context: A standard dictionary for contextual values,
-        @return : Dictionary value for created report with file nameself.
         """
         if not report_name or not res_ids:
             return (False, Exception('Report name and Resources ids are required !!!'))
@@ -473,13 +450,6 @@ class survey_question_wiz(osv.osv_memory):
     def default_get(self, cr, uid, fields_list, context=None):
         """
         Assign Default value in particular field. If Browse Answers wizard run then read the value into database and Assigne to a particular 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 fields_list: List of fields of current view,
-        @param context: A standard dictionary for contextual values,
-        @return : Dictionary value for fields list with value.
         """
         value = {}
         if context is None:
@@ -542,10 +512,11 @@ class survey_question_wiz(osv.osv_memory):
                 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 = []
-            for key,val in sur_name_read['store_ans'].items():
+
+            for key,val in safe_eval(sur_name_read.get('store_ans',"{}")).items():
                 for field in fields_list:
                     if field in list(val):
                         value[field] = val[field]
@@ -555,17 +526,12 @@ class survey_question_wiz(osv.osv_memory):
     def create(self, cr, uid, vals, context=None):
         """
         Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
-
-        @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: Values,
-        @param context: A standard dictionary for contextual values
-        @return : True.
         """
         if context is None: context = {}
+        
+        survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, vals, context=context)
         if context.has_key('active') and context.get('active',False):
-            return True
+            return survey_question_wiz_id
 
         for key,val in vals.items():
             if key.split('_')[0] == "progress":
@@ -599,9 +565,10 @@ class survey_question_wiz(osv.osv_memory):
         #click first time on next button then increemnet on total start suvey
         if not sur_name_read['store_ans']:
             his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
-                                              'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
-            sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
-            survey_obj.write(cr, uid, sur_name_read['survey_id'],  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
+                                              'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id'][0]})
+            survey_id = sur_name_read['survey_id'][0]
+            sur_rec = survey_obj.read(cr, uid, survey_id)
+            survey_obj.write(cr, uid, survey_id,  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
             if context.has_key('cur_id'):
                 if context.has_key('request') and context.get('request',False):
                     self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
@@ -1010,18 +977,11 @@ class survey_question_wiz(osv.osv_memory):
                 if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
                     raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg']))
 
-        return True
+        return survey_question_wiz_id
 
     def action_new_question(self,cr, uid, ids, context=None):
         """
         New survey.Question form.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open new survey.Qestion form.
         """
         if context is None:
             context = {}
@@ -1043,13 +1003,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_new_page(self, cr, uid, ids, context=None):
         """
         New survey.Page form.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open new survey.page form.
         """
         if context is None:
             context = {}
@@ -1071,13 +1024,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_edit_page(self,cr, uid, ids, context=None):
         """
         Edit survey.page.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open Edit survey.page form.
         """
         if context is None:
             context = {}
@@ -1100,13 +1046,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_delete_page(self,cr, uid, ids, context=None):
         """
         Delete survey.page.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open next survey.page form, but delete the selected page.
         """
         if context is None:
             context = {}
@@ -1133,13 +1072,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_edit_question(self,cr, uid, ids, context=None):
         """
         Edit survey.question.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open Edit survey.question form.
         """
         if context is None:
             context = {}
@@ -1162,13 +1094,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_delete_question(self,cr, uid, ids, context=None):
         """
         Delete survey.question.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open same survey.page form, but delete the selected survey.question in current survey.page.
         """
         if context is None:
             context = {}
@@ -1196,13 +1121,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_forward_previous(self, cr, uid, ids, context=None):
         """
         Goes to previous Survey Answer.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open Previous Answer form.
         """
         if context is None:
             context = {}
@@ -1228,13 +1146,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_forward_next(self, cr, uid, ids, context=None):
         """
         Goes to Next Survey Answer.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open Next Answer form.
         """
         if context is None:
             context = {}
@@ -1260,13 +1171,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_next(self, cr, uid, ids, context=None):
         """
         Goes to Next page.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open Next survey.page form.
         """
         if context is None:
             context = {}
@@ -1287,13 +1191,6 @@ class survey_question_wiz(osv.osv_memory):
     def action_previous(self, cr, uid, ids, context=None):
         """
         Goes to previous page.
-
-        @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 survey.question.wiz IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for Open Previous survey.page form.
         """
         if context is None:
             context = {}
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index db2eb1073d9..b5485bf6370 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -23,7 +23,7 @@
 			<field name="type">search</field>
 			<field name="arch" type="xml">
 				<search string="Your Messages">
-					<field name="name" nolabel="1" colspan="4" />
+					<field name="name"/>
 				</search>
 			</field>
 		</record>
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 1798a7c418c..5af913993b2 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -24,26 +24,9 @@ from osv import fields
 
 class survey_browse_answer(osv.osv_memory):
     _name = 'survey.browse.answer'
-    
-    def _get_survey(self, cr, uid, context=None):
-        """
-        Set the value in survey_id field,
-       
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param context: A standard dictionary for contextual values,
-        @return : Tuple in list with values.
-        """        
-        surv_obj = self.pool.get("survey")
-        surv_resp_obj = self.pool.get("survey.response")
-        result = []
-        for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
-            if surv_resp_obj.search(cr, uid, [('survey_id', '=', sur.id)]):
-                result.append((sur.id, sur.title))
-        return result
 
     _columns = {
-        'survey_id': fields.selection(_get_survey, "Survey", required="1"),
+        'survey_id': fields.many2one('survey', "Survey", required="1"),
         'response_id': fields.many2one("survey.response", "Survey Answers", help="If this field is empty, all answers of the selected survey will be print."),
     }
 
@@ -51,13 +34,6 @@ class survey_browse_answer(osv.osv_memory):
         """
         Open Browse Response wizard. if you select only survey_id then this wizard open with all response_ids and 
         if you select survey_id and response_id then open the particular response of the survey.
-       
-        @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 survey.browse.answer IDs,
-        @param context: A standard dictionary for contextual values,
-        @return : Dictionary value for Open the browse answer wizard.
         """
         if context is None: context = {}
         record = self.read(cr, uid, ids, [])
@@ -66,8 +42,8 @@ class survey_browse_answer(osv.osv_memory):
             res_id = [(record.get('response_id') and record['response_id'][0])]
         else:
             sur_response_obj = self.pool.get('survey.response')
-            res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
-        context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0})
+            res_id = sur_response_obj.search(cr, uid, [('survey_id', '=', record['survey_id'][0])])
+        context.update({'active' : True,'survey_id' : record['survey_id'][0], 'response_id' : res_id, 'response_no' : 0})
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         return {
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index 87767f34a68..6ae84ed37cc 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -27,8 +27,7 @@ from tools.translate import _
 class survey_print(osv.osv_memory):
     _name = 'survey.print'
     _columns = {
-        'survey_ids': fields.many2many('survey','survey_print',\
-                            'survey_id','print_id', "Survey", required="1"),
+        'survey_ids': fields.many2many('survey', string="Survey", required="1"),
         'orientation' : fields.selection([('vertical','Portrait(Vertical)'),\
                             ('horizontal','Landscape(Horizontal)')], 'Orientation'),
         'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),\
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 10b321fcf45..bd8b9f2ad14 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -26,20 +26,12 @@ from tools.translate import _
 class survey_print_statistics(osv.osv_memory):
     _name = 'survey.print.statistics'
     _columns = {
-        'survey_ids': fields.many2many('survey','survey_print_statistics','survey_id',\
-                                'print_id', "Survey", required="1"),
+        'survey_ids': fields.many2many('survey', string="Survey", required="1"),
     }
 
     def action_next(self, cr, uid, ids, context=None):
         """
         Print Survey Statistics in pdf format.
-
-        @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 Survey statistics IDs
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary value for created survey statistics report
         """
         if context is None:
             context = {}
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 8d613c74bd0..82c9fd385ed 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -26,71 +26,8 @@ from tools.translate import _
 class survey_name_wiz(osv.osv_memory):
     _name = 'survey.name.wiz'
 
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        Set the default value in survey_id field. if open this wizard in survey form then set the default value in survey_id = active survey id.
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of Survey statistics IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for created survey statistics report
-        """
-        if context is None:
-            context = {}
-        data = super(survey_name_wiz, self).default_get(cr, uid, fields, context)
-        if context.has_key('survey_id'):
-            data['survey_id'] = context.get('survey_id',False)
-        return data
-
-    def _get_survey(self, cr, uid, context=None):
-        """
-        Set the value In survey_id field.
-
-        @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 Survey statistics IDs
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary value for created survey statistics report
-        """
-        surv_obj = self.pool.get("survey")
-        result = []
-        if context.has_key('survey_id'):
-            for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
-                result.append((sur.id, sur.title))
-            return result
-        survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
-        group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
-        user_obj = self.pool.get('res.users')
-        user_rec = user_obj.read(cr, uid, uid)
-        if survey_user_group_id:
-            if survey_user_group_id == user_rec['groups_id']:
-                for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
-                    if sur.state == 'open':
-                        u_list = []
-                        for use in sur.invited_user_ids:
-                            u_list.append(use.id)
-                        if uid in u_list:
-                            result.append((sur.id, sur.title))
-                return result
-        for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
-            if sur.state == 'open':
-                res = False
-                for i in group_id:
-                    if i in user_rec['groups_id']:
-                        res = True
-                        break
-                    elif sur.id in user_rec['survey_id']:
-                        res = True
-                        break
-                if res:
-                    result.append((sur.id, sur.title))
-        return result
-
     _columns = {
-        'survey_id': fields.selection(_get_survey, "Survey", required="1"),
+        'survey_id': fields.many2one('survey', 'Survey', required=True, ondelete='cascade'),
         'page_no': fields.integer('Page Number'),
         'note': fields.text("Description"),
         'page': fields.char('Page Position',size = 12),
@@ -99,10 +36,12 @@ class survey_name_wiz(osv.osv_memory):
         'response': fields.char('Answer',size=16)
     }
     _defaults = {
-        'page_no': lambda * a: - 1,
-        'page': lambda * a: 'next',
-        'transfer': lambda * a: 1,
-        'response': lambda * a: 0,
+        'page_no': -1,
+        'page': 'next',
+        'transfer': 1,
+        'response': 0,
+        'survey_id': lambda self,cr,uid,context:context.get('survey_id',False),
+        'store_ans': '{}' #Setting the default pattern as '{}' as the field is of type text. The field always gets the value in dict format
     }
 
     def action_next(self, cr, uid, ids, context=None):
@@ -110,35 +49,26 @@ class survey_name_wiz(osv.osv_memory):
         Start the survey, Increment in started survey field but if set the max_response_limit of
         survey then check the current user how many times start this survey. if current user max_response_limit
         is reach then this user can not start this survey(Raise Exception).
-
-        @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 Survey IDs
-        @param context: A standard dictionary for contextual values
-        @return : Dictionary value for open survey question wizard.
         """
         survey_obj = self.pool.get('survey')
         search_obj = self.pool.get('ir.ui.view')
         if context is None: context = {}
 
         this = self.browse(cr, uid, ids, context=context)[0]
-        survey_id = this.survey_id
+        survey_id = this.survey_id.id
         context.update({'survey_id': survey_id, 'sur_name_id': this.id})
         cr.execute('select count(id) from survey_history where user_id=%s\
                     and survey_id=%s' % (uid,survey_id))
 
         res = cr.fetchone()[0]
-        user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
-        if user_limit and res >= user_limit:
+        sur_rec = survey_obj.browse(cr,uid,survey_id,context=context)
+        if sur_rec.response_user and res >= sur_rec.response_user:
             raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
 
-        sur_rec = survey_obj.browse(cr,uid,ids,context=context)[0]
         if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey:
             raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
 
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -152,16 +82,10 @@ class survey_name_wiz(osv.osv_memory):
     def on_change_survey(self, cr, uid, ids, survey_id, context=None):
         """
             on change event of survey_id field, if note is available in selected survey then display this note in note fields.
-            @param ids: List of Survey IDs
-            @param survey_id: Id of Survey
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary values of notes fields.
         """
         if not survey_id:
             return {}
         notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
         return {'value': {'note': notes}}
 
-survey_name_wiz()
-
-# 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/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index a72566f7888..144525979dd 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -15,7 +15,8 @@
 					<separator colspan="4" string="Select Survey" />
 					<newline />
 					<field name="survey_id" colspan="4"
-						on_change="on_change_survey(survey_id)" width="250"/>
+						on_change="on_change_survey(survey_id)" width="250"
+                        domain="[('state','=','open')]"/>
 					<group col="1" colspan="4"
 						attrs="{'readonly': [('survey_id','=',False)]}">
 						<separator colspan="4" string="Survey Details" />
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 49cbac82b46..d4334ecfa9e 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -102,6 +102,7 @@ class survey_send_invitation(osv.osv_memory):
         partner_ids = record['partner_ids']
         user_ref= self.pool.get('res.users')
         survey_ref= self.pool.get('survey')
+        mail_message = self.pool.get('mail.message')
 
         model_data_obj = self.pool.get('ir.model.data')
         group_id = model_data_obj._get_id(cr, uid, 'base', 'group_survey_user')
@@ -115,10 +116,9 @@ class survey_send_invitation(osv.osv_memory):
         existing = ""
         created = ""
         error = ""
-        res_user = ""
         user_exists = False
         new_user = []
-        attachments = []
+        attachments = {}
         current_sur = survey_ref.browse(cr, uid, context.get('active_id'), context=context)
         exist_user = current_sur.invited_user_ids
         if exist_user:
@@ -133,8 +133,8 @@ class survey_send_invitation(osv.osv_memory):
                 file_data += line
                 if not line:
                     break
-            attachments.append((id.title +".pdf",file_data))
             file.close()
+            attachments[id.title +".pdf"] = file_data
             os.remove(addons.get_module_resource('survey', 'report') + id.title +".pdf")
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
@@ -151,33 +151,18 @@ class survey_send_invitation(osv.osv_memory):
                     mail = record['mail']%{'login':addr.email, 'passwd':user.password, \
                                                 'name' : addr.name}
                     if record['send_mail_existing']:
-                        tools.email_send(record['mail_from'], [addr.email] , \
-                                         record['mail_subject_existing'] , mail)
+                        mail_message.schedule_with_attach(cr, uid, record['mail_from'], [addr.email] , \
+                                         record['mail_subject_existing'] , mail, context=context)
                         existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, addr.email, \
                                                                           user.password)
                     continue
-                user_id = user_ref.search(cr, uid, [('address_id', '=', addr.id)])
-                if user_id:
-                    for user_email in user_ref.browse(cr, uid, user_id):
-                        mail = record['mail']%{'login': user_email.login, \
-                                                        'passwd': user_email.password, 'name': addr.name}
-                        if record['send_mail_existing']:
-                            tools.email_send(record['mail_from'], [addr.email],\
-                                                  record['mail_subject_existing'], mail)
-                            res_user+= "- %s (Login: %s,  Password: %s)\n" % \
-                                 (user_email.name, user_email.login, user_email.password)
-                    continue
-                else:
-                    error += "- No User found linked to email address '%s'.\n Impossible to send a reminder to a partner never invited before \n"%(addr.email)
-                    continue
 
                 passwd= self.genpasswd()
                 out+= addr.email + ',' + passwd + '\n'
                 mail= record['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
                 if record['send_mail']:
-                    ans = tools.email_send(record['mail_from'], [addr.email], \
-                                           record['mail_subject'], mail,attach = attachments)
-
+                    ans = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [addr.email], \
+                                           record['mail_subject'], mail, attachments=attachments, context=context)
                     if ans:
                         res_data = {'name': addr.name or 'Unknown',
                                     'login': addr.email,
@@ -208,8 +193,6 @@ class survey_send_invitation(osv.osv_memory):
             note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
         if error:
             note += 'E-Mail not send successfully:\n====================\n%s\n' % (error)
-        if res_user:
-            note += 'E-mail ID used the following user:\n====================\n%s\n' % (res_user)
         context.update({'note' : note})
         return {
             'view_type': 'form',
diff --git a/addons/thunderbird/__init__.py b/addons/thunderbird/__init__.py
index 68afc0cccf9..33d232b3f50 100644
--- a/addons/thunderbird/__init__.py
+++ b/addons/thunderbird/__init__.py
@@ -21,3 +21,5 @@
 
 import partner
 import installer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 1729cc430cf..53a704d2f1b 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -20,12 +20,12 @@
 #
 ##############################################################################
 {
-    "name" : "Thunderbird Interface",
+    "name" : "Thunderbird Plug-In",
     "version" : "1.0",
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
-    "depends" : ["base","mail_gateway"],
-    "category" : "Tools",
+    "depends" : ["base","mail"],
+    "category" : "Customer Relationship Management",
     "description": """
 This module is required for the Thuderbird Plug-in to work properly.
 ====================================================================
@@ -35,7 +35,6 @@ OpenERP objects. You can select a partner, a task, a project, an analytical
 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" : [],
@@ -46,3 +45,5 @@ HR Applicant and Project Issue from selected mails.
     "certificate" : "00899858104035139949",
     'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/thunderbird/i18n/bg.po b/addons/thunderbird/i18n/bg.po
index 9d0d662a61b..2e5bee581c3 100644
--- a/addons/thunderbird/i18n/bg.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/ca.po b/addons/thunderbird/i18n/ca.po
index 731e9f6f2f1..76e63de2206 100644
--- a/addons/thunderbird/i18n/ca.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/cs.po b/addons/thunderbird/i18n/cs.po
index d724490fbd7..6a50984e323 100644
--- a/addons/thunderbird/i18n/cs.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/da.po b/addons/thunderbird/i18n/da.po
new file mode 100644
index 00000000000..f098ae333f9
--- /dev/null
+++ b/addons/thunderbird/i18n/da.po
@@ -0,0 +1,151 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-09 21:50+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: thunderbird
+#: field:thunderbird.installer,plugin_file:0
+#: field:thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr ""
+
+#. module: thunderbird
+#: help:thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+
+#. module: thunderbird
+#: help:thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+
+#. module: thunderbird
+#: help:thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "_Close"
+msgstr "_Luk"
+
+#. module: thunderbird
+#: field:thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Installations manual"
+
+#. module: thunderbird
+#: field:thunderbird.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: thunderbird
+#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_installer
+msgid "thunderbird.installer"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,name:0
+#: field:thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Filnavn"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurationsfremgang"
+
+#. module: thunderbird
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In Configuration"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_partner
+msgid "Thunderbid Plugin Tools"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Skip"
+msgstr "Spring over"
+
+#. module: thunderbird
+#: field:thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Billede"
+
+#. module: thunderbird
+#: model:ir.module.module,description:thunderbird.module_meta_information
+msgid ""
+"\n"
+"      This module is required for the thuderbird plug-in to work\n"
+"      properly.\n"
+"      The Plugin allows you archive email and its attachments to the "
+"selected \n"
+"      OpenERP objects. You can select a partner, a task, a project, an "
+"analytical\n"
+"      account,or any other object and attach selected mail as eml file in \n"
+"      attachment of selected record. You can create Documents for crm Lead,\n"
+"      HR Applicant and project issue from selected mails.\n"
+"\n"
+"      "
+msgstr ""
diff --git a/addons/thunderbird/i18n/de.po b/addons/thunderbird/i18n/de.po
index c6220db5e37..326ecd99ed9 100644
--- a/addons/thunderbird/i18n/de.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -210,58 +210,3 @@ msgstr ""
 
 #~ msgid "Thunderbid mails"
 #~ msgstr "Thunderbid Mails"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr "Sie können ein Objekt zu Ihr EMail oder zu dem Anhang hizufügen"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "\n"
-#~ "      This module is required for the thuderbird plug-in to work\n"
-#~ "      properly.\n"
-#~ "      The Plugin allows you archive email and its attachments to the "
-#~ "selected \n"
-#~ "      OpenERP objects. You can select a partner, a task, a project, an "
-#~ "analytical\n"
-#~ "      account,or any other object and attach selected mail as .eml file in \n"
-#~ "      attachment of selected record. You can create Documents for crm Lead,\n"
-#~ "      HR Applicant and project issue from selected mails.\n"
-#~ "\n"
-#~ "      "
-#~ msgstr ""
-#~ "\n"
-#~ "      Dieses Modul ist erforderlich, um das Thunderbird EMail Plug-in zu "
-#~ "nutzen.\n"
-#~ "\n"
-#~ "       Mit Hilfe des Plugins können Sie eingehende EMails mitsamt Anhängen "
-#~ "zu ausgewählten\n"
-#~ "       OpenERP Objekten archivieren. Sie können dabei einen Partner, eine "
-#~ "Aufgabe, ein Projekt, \n"
-#~ "       ein analytisches Konto oder ein anderes Objekt auswählen und "
-#~ "speichern die ausgewählte\n"
-#~ "       EMail als. eml-Datei zum ausgewählten Objekt in OpenERP ab. "
-#~ "Desweiteren können Sie \n"
-#~ "       ausgehend von einer Email direkt aus Thunderbird Verkaufskontakte, "
-#~ "Stellenbewerbungen \n"
-#~ "       oder projektbezogene Problemstellungen definieren.\n"
-#~ "\n"
-#~ "      "
diff --git a/addons/thunderbird/i18n/en_GB.po b/addons/thunderbird/i18n/en_GB.po
index 74d51861792..40de5b1811e 100644
--- a/addons/thunderbird/i18n/en_GB.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/en_US.po b/addons/thunderbird/i18n/en_US.po
index 67207739dea..7003f5964ed 100644
--- a/addons/thunderbird/i18n/en_US.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index c5bd5a478db..fa76586a52c 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -204,59 +204,3 @@ msgstr ""
 #, python-format
 #~ msgid "Archive"
 #~ msgstr "Archivar"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Le permite seleccionar un objeto al que quiera añadir su correo y sus "
-#~ "adjuntos."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid ""
-#~ "\n"
-#~ "      This module is required for the thuderbird plug-in to work\n"
-#~ "      properly.\n"
-#~ "      The Plugin allows you archive email and its attachments to the "
-#~ "selected \n"
-#~ "      OpenERP objects. You can select a partner, a task, a project, an "
-#~ "analytical\n"
-#~ "      account,or any other object and attach selected mail as .eml file in \n"
-#~ "      attachment of selected record. You can create Documents for crm Lead,\n"
-#~ "      HR Applicant and project issue from selected mails.\n"
-#~ "\n"
-#~ "      "
-#~ msgstr ""
-#~ "\n"
-#~ "      Este módulo es necesario para que el conector (plug-in) de "
-#~ "Thunderbird\n"
-#~ "      funcione correctamente.\n"
-#~ "      El conector permite guardar un correo y sus adjuntos en los objetos "
-#~ "OpenERP\n"
-#~ "      seleccionados. Puede seleccionar una empresa, una tarea, un proyecto, "
-#~ "una cuenta\n"
-#~ "      analítica, o cualquier otro objeto, y adjuntar el correo seleccionado "
-#~ "como un fichero .eml\n"
-#~ "      en los adjuntos del registro seleccionado. Puede crear documentos "
-#~ "desde iniciativas CRM,\n"
-#~ "      aplicación RRHH y incidencias de proyectos desde los correos "
-#~ "seleccionados.\n"
-#~ "\n"
-#~ "      "
diff --git a/addons/thunderbird/i18n/es_MX.po b/addons/thunderbird/i18n/es_MX.po
new file mode 100644
index 00000000000..e1e97accb69
--- /dev/null
+++ b/addons/thunderbird/i18n/es_MX.po
@@ -0,0 +1,206 @@
+# 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-13 11:13+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:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: thunderbird
+#: field:thunderbird.installer,plugin_file:0
+#: field:thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Conector Thunderbird"
+
+#. module: thunderbird
+#: help:thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Fichero del conector Thunderbird. Guarde este fichero e instale este "
+"conector en la aplicación Thunderbird."
+
+#. module: thunderbird
+#: help:thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Le permite seleccionar un objeto donde añadir su correo electrónico y sus "
+"archivos adjuntos."
+
+#. module: thunderbird
+#: help:thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "El fichero de documentación: Como instalar el conector Thunderbird."
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Herramientas servidor correo"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: thunderbird
+#: field:thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Manual de instalación"
+
+#. module: thunderbird
+#: field:thunderbird.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: thunderbird
+#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In"
+msgstr "Conector Thunderbird"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Este conector permite vincular su correo electrónico con documentos OpenERP. "
+"Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Interfaz Thunderbird"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_installer
+msgid "thunderbird.installer"
+msgstr "thunderbird.instalador"
+
+#. module: thunderbird
+#: field:thunderbird.installer,name:0
+#: field:thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: thunderbird
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: thunderbird
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In Configuration"
+msgstr "Configuración conector Thunderbird"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_partner
+msgid "Thunderbid Plugin Tools"
+msgstr "Herramientas conector de Thunderbird"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Skip"
+msgstr "Omitir"
+
+#. module: thunderbird
+#: field:thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: thunderbird
+#: model:ir.module.module,description:thunderbird.module_meta_information
+msgid ""
+"\n"
+"      This module is required for the thuderbird plug-in to work\n"
+"      properly.\n"
+"      The Plugin allows you archive email and its attachments to the "
+"selected \n"
+"      OpenERP objects. You can select a partner, a task, a project, an "
+"analytical\n"
+"      account,or any other object and attach selected mail as eml file in \n"
+"      attachment of selected record. You can create Documents for crm Lead,\n"
+"      HR Applicant and project issue from selected mails.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Este módulo es necesario para que funcione correctamente el "
+"complemento de Thunderbird.\n"
+"      El complemento le permite archivar correos electrónicos y sus datos "
+"adjuntos a los objetos OpenERP seleccionados.\n"
+"      Puede seleccionar una empresa, una tarea, un proyecto, una cuenta "
+"analítica, o cualquier otro objeto\n"
+"      y adjuntar el correo electrónico seleccionado como fichero .eml en el "
+"dato adjunto del registro seleccionado.\n"
+"      Puede crear documentos para iniciativas CRM, candidato de RRHH y "
+"proyectos a partir de los correos electrónicos seleccionados.\n"
+"\n"
+"      "
+
+#~ msgid "Copy To"
+#~ msgstr "Copiar a"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "Subject"
+#~ msgstr "Asunto"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Receiver"
+#~ msgstr "Destinatario"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Attached Files"
+#~ msgstr "Archivos Adjuntos"
+
+#~ msgid "Sender"
+#~ msgstr "Remitente"
+
+#~ msgid "Thunderbid mails"
+#~ msgstr "Correo Thunderbid"
+
+#, python-format
+#~ msgid "Archive"
+#~ msgstr "Archivar"
diff --git a/addons/thunderbird/i18n/es_VE.po b/addons/thunderbird/i18n/es_VE.po
new file mode 100644
index 00000000000..e1e97accb69
--- /dev/null
+++ b/addons/thunderbird/i18n/es_VE.po
@@ -0,0 +1,206 @@
+# 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-13 11:13+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:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: thunderbird
+#: field:thunderbird.installer,plugin_file:0
+#: field:thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Conector Thunderbird"
+
+#. module: thunderbird
+#: help:thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Fichero del conector Thunderbird. Guarde este fichero e instale este "
+"conector en la aplicación Thunderbird."
+
+#. module: thunderbird
+#: help:thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Le permite seleccionar un objeto donde añadir su correo electrónico y sus "
+"archivos adjuntos."
+
+#. module: thunderbird
+#: help:thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "El fichero de documentación: Como instalar el conector Thunderbird."
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Herramientas servidor correo"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: thunderbird
+#: field:thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Manual de instalación"
+
+#. module: thunderbird
+#: field:thunderbird.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: thunderbird
+#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In"
+msgstr "Conector Thunderbird"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Este conector permite vincular su correo electrónico con documentos OpenERP. "
+"Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Interfaz Thunderbird"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_installer
+msgid "thunderbird.installer"
+msgstr "thunderbird.instalador"
+
+#. module: thunderbird
+#: field:thunderbird.installer,name:0
+#: field:thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: thunderbird
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: thunderbird
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In Configuration"
+msgstr "Configuración conector Thunderbird"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_partner
+msgid "Thunderbid Plugin Tools"
+msgstr "Herramientas conector de Thunderbird"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Skip"
+msgstr "Omitir"
+
+#. module: thunderbird
+#: field:thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: thunderbird
+#: model:ir.module.module,description:thunderbird.module_meta_information
+msgid ""
+"\n"
+"      This module is required for the thuderbird plug-in to work\n"
+"      properly.\n"
+"      The Plugin allows you archive email and its attachments to the "
+"selected \n"
+"      OpenERP objects. You can select a partner, a task, a project, an "
+"analytical\n"
+"      account,or any other object and attach selected mail as eml file in \n"
+"      attachment of selected record. You can create Documents for crm Lead,\n"
+"      HR Applicant and project issue from selected mails.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Este módulo es necesario para que funcione correctamente el "
+"complemento de Thunderbird.\n"
+"      El complemento le permite archivar correos electrónicos y sus datos "
+"adjuntos a los objetos OpenERP seleccionados.\n"
+"      Puede seleccionar una empresa, una tarea, un proyecto, una cuenta "
+"analítica, o cualquier otro objeto\n"
+"      y adjuntar el correo electrónico seleccionado como fichero .eml en el "
+"dato adjunto del registro seleccionado.\n"
+"      Puede crear documentos para iniciativas CRM, candidato de RRHH y "
+"proyectos a partir de los correos electrónicos seleccionados.\n"
+"\n"
+"      "
+
+#~ msgid "Copy To"
+#~ msgstr "Copiar a"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "Subject"
+#~ msgstr "Asunto"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Receiver"
+#~ msgstr "Destinatario"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Attached Files"
+#~ msgstr "Archivos Adjuntos"
+
+#~ msgid "Sender"
+#~ msgstr "Remitente"
+
+#~ msgid "Thunderbid mails"
+#~ msgstr "Correo Thunderbid"
+
+#, python-format
+#~ msgid "Archive"
+#~ msgstr "Archivar"
diff --git a/addons/thunderbird/i18n/et.po b/addons/thunderbird/i18n/et.po
index 6b0fceef266..617068a881c 100644
--- a/addons/thunderbird/i18n/et.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/eu.po b/addons/thunderbird/i18n/eu.po
index bb05e2c5a68..f01c7072658 100644
--- a/addons/thunderbird/i18n/eu.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/fi.po b/addons/thunderbird/i18n/fi.po
index 52ce84f89a6..b13569bd55e 100644
--- a/addons/thunderbird/i18n/fi.po
+++ b/addons/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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/fr.po b/addons/thunderbird/i18n/fr.po
index 8e44b50c7da..486f76bf701 100644
--- a/addons/thunderbird/i18n/fr.po
+++ b/addons/thunderbird/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -206,15 +206,5 @@ msgstr ""
 #~ msgid "Archive"
 #~ msgstr "Archive"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer un menu récursif."
-
 #~ msgid "Thunderbid mails"
 #~ msgstr "Courriels Thunderbird"
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Vous permet de sélectionner un objet que vous souhaitez ajouter à votre "
-#~ "courriel et ses pièces jointes."
diff --git a/addons/thunderbird/i18n/gl.po b/addons/thunderbird/i18n/gl.po
index 2ef6fb6ff2d..43d435a87a3 100644
--- a/addons/thunderbird/i18n/gl.po
+++ b/addons/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: 2011-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/hr.po b/addons/thunderbird/i18n/hr.po
index 7ce944e173f..cdbe896d5b7 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/hu.po b/addons/thunderbird/i18n/hu.po
index 18e7e65611b..d137b7f8b4c 100644
--- a/addons/thunderbird/i18n/hu.po
+++ b/addons/thunderbird/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-25 14:44+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/it.po b/addons/thunderbird/i18n/it.po
index 8fe4d00c9c1..f489884ec13 100644
--- a/addons/thunderbird/i18n/it.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -208,28 +208,3 @@ msgstr ""
 
 #~ msgid "Thunderbid mails"
 #~ msgstr "Posta Thunderbid"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Permettedi selezionare un oggetto che vorrete aggiungere alla email e il "
-#~ "suoi allegati."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere inferiore ad 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
diff --git a/addons/thunderbird/i18n/mn.po b/addons/thunderbird/i18n/mn.po
index aa52054ff85..ba7887d4cac 100644
--- a/addons/thunderbird/i18n/mn.po
+++ b/addons/thunderbird/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/nl.po b/addons/thunderbird/i18n/nl.po
index 54efc8ba86d..a2ab89d2e28 100644
--- a/addons/thunderbird/i18n/nl.po
+++ b/addons/thunderbird/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/pl.po b/addons/thunderbird/i18n/pl.po
index b4dfbfe73f7..cf94e75c423 100644
--- a/addons/thunderbird/i18n/pl.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/pt.po b/addons/thunderbird/i18n/pt.po
index 3f70014eda2..3342a655c99 100644
--- a/addons/thunderbird/i18n/pt.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -173,30 +173,5 @@ msgstr ""
 #~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
 #~ "especial !"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Permite-lhe selecionar um objeto que gostasse de adicionar à mensagem e aos "
-#~ "seus anexos"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura de vista"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
 #~ msgid "Thunderbid mails"
 #~ msgstr "Correio do Thunderbird"
diff --git a/addons/thunderbird/i18n/pt_BR.po b/addons/thunderbird/i18n/pt_BR.po
index 664567a659a..4146cf0eab6 100644
--- a/addons/thunderbird/i18n/pt_BR.po
+++ b/addons/thunderbird/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -174,30 +174,5 @@ msgstr ""
 #~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
 #~ "especial!"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
 #~ msgid "Thunderbid mails"
 #~ msgstr "Emails do Thunderbird"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#~ msgid ""
-#~ "Allows you to select an object that you’d like to add to your email and its "
-#~ "attachments."
-#~ msgstr ""
-#~ "Permite selecionar um objeto que você gostaria de adicionar ao seu email e "
-#~ "seus anexos."
diff --git a/addons/thunderbird/i18n/ru.po b/addons/thunderbird/i18n/ru.po
index d49140a0445..bf88629e044 100644
--- a/addons/thunderbird/i18n/ru.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/sk.po b/addons/thunderbird/i18n/sk.po
index a94b66dc77a..1a191b27f4f 100644
--- a/addons/thunderbird/i18n/sk.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/sl.po b/addons/thunderbird/i18n/sl.po
index cb3e9854e81..7860d6910f9 100644
--- a/addons/thunderbird/i18n/sl.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/sr.po b/addons/thunderbird/i18n/sr.po
index 914396fb0ec..c093c2d81f4 100644
--- a/addons/thunderbird/i18n/sr.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/sr@latin.po b/addons/thunderbird/i18n/sr@latin.po
index 0e5c7e572dc..979f82196b9 100644
--- a/addons/thunderbird/i18n/sr@latin.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/tr.po b/addons/thunderbird/i18n/tr.po
index 63ec509d4fd..2d23a286499 100644
--- a/addons/thunderbird/i18n/tr.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
diff --git a/addons/thunderbird/i18n/zh_CN.po b/addons/thunderbird/i18n/zh_CN.po
index 958839ea27f..0534c25ec61 100644
--- a/addons/thunderbird/i18n/zh_CN.po
+++ b/addons/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: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -35,7 +35,7 @@ msgstr "Thunderbird 插件。存为文件并在 Thunderbird 里安装这个插
 msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
-msgstr ""
+msgstr "允许你选择一个你想链接到你电子邮件和它的附件的对象"
 
 #. module: thunderbird
 #: help:thunderbird.installer,pdf_file:0
@@ -78,7 +78,7 @@ 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 ""
+msgstr "这插件允许你把你的电子邮件链接到系统的文档到中，你能附属在系统中任何现有的文档或创建一个新的文档。"
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
@@ -126,12 +126,12 @@ msgstr "设置"
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
-msgstr "略过"
+msgstr "忽略"
 
 #. module: thunderbird
 #: field:thunderbird.installer,config_logo:0
 msgid "Image"
-msgstr "图片"
+msgstr "图像"
 
 #. module: thunderbird
 #: model:ir.module.module,description:thunderbird.module_meta_information
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 5bf11218842..4cbcec9fff0 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -41,7 +41,7 @@ class thunderbird_installer(osv.osv_memory):
         'pdf_name':fields.char('File name', size=64),
         '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_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
-        'pdf_file':fields.char('Installation Manual', size="264", help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
+        'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
     }
 
@@ -68,3 +68,5 @@ Configure OpenERP in Thunderbird:
     }
 
 thunderbird_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/thunderbird/partner/__init__.py b/addons/thunderbird/partner/__init__.py
index 8eee7a82e06..5583bc0e78a 100644
--- a/addons/thunderbird/partner/__init__.py
+++ b/addons/thunderbird/partner/__init__.py
@@ -21,3 +21,5 @@
 
 import partner
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index c506cf58b4f..3ce48281de7 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -23,113 +23,7 @@ from osv import osv
 import base64
 import email
 import tools
-import binascii
-import dateutil.parser
-class email_server_tools(osv.osv_memory):
-    _inherit = "email.server.tools"
-    def history_message(self, cr, uid, model, res_id, message, context=None):
-        #@param message: string of mail which is read from EML File
-        attachment_pool = self.pool.get('ir.attachment')
-        msg = self.parse_message(message)
-        attachments = msg.get('attachments', [])
-        att_ids = []
-        for attachment in attachments:
-            data_attach = {
-                'name': attachment,
-                'datas': binascii.b2a_base64(str(attachments.get(attachment))),
-                'datas_fname': attachment,
-                'description': 'Mail attachment From Thunderbird msg_id: %s' %(msg.get('message_id', '')),
-                'res_model': model,
-                'res_id': res_id,
-            }
-            att_ids.append(attachment_pool.create(cr, uid, data_attach))
-        return self.history(cr, uid, model, res_id, msg, att_ids)
-
-    def parse_message(self, message):
-        #TOCHECK: put this function in mailgateway module
-        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 = {}
-        fields = msg_txt.keys()
-        msg['id'] = message_id
-        msg['message-id'] = message_id
-        if 'Subject' in fields:
-            msg['subject'] = self._decode_header(msg_txt.get('Subject'))
-
-        if 'Content-Type' in fields:
-            msg['content-type'] = msg_txt.get('Content-Type')
-
-        if 'From' in fields:
-            msg['from'] = self._decode_header(msg_txt.get('From'))
-
-        if 'Delivered-To' in fields:
-            msg['to'] = self._decode_header(msg_txt.get('Delivered-To'))
-
-        if 'CC' in fields:
-            msg['cc'] = self._decode_header(msg_txt.get('CC'))
-
-        if 'Reply-to' in fields:
-            msg['reply'] = self._decode_header(msg_txt.get('Reply-To'))
-
-        if 'Date' in fields:
-            date = self._decode_header(msg_txt.get('Date'))
-            msg['date'] = dateutil.parser.parse(date).strftime("%Y-%m-%d %H:%M:%S")
-
-        if 'Content-Transfer-Encoding' in fields:
-            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-
-        if 'References' in fields:
-            msg['references'] = msg_txt.get('References')
-
-        if 'In-Reply-To' in fields:
-            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
-
-        if 'X-Priority' in fields:
-            msg['priority'] = msg_txt.get('X-Priority', '3 (Normal)').split(' ')[0]
-
-        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)
-            msg['body'] = tools.ustr(body, encoding)
-
-        attachments = {}
-        has_plain_text = False
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
-            body = ""
-            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[filename] = content
-                    elif not has_plain_text:
-                        # main content parts should have 'text' maintype
-                        # and no filename. we ignore the html part if
-                        # there is already a plaintext part without filename,
-                        # because presumably these are alternatives.
-                        content = tools.ustr(content, encoding)
-                        if part.get_content_subtype() == 'html':
-                            body = tools.ustr(tools.html2plaintext(content))
-                        elif part.get_content_subtype() == 'plain':
-                            body = content
-                            has_plain_text = True
-                elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
-                        attachments[filename] = part.get_payload(decode=True)
-                    else:
-                        res = part.get_payload(decode=True)
-                        body += tools.ustr(res, encoding)
-
-            msg['body'] = body
-            msg['attachments'] = attachments
-        return msg
-email_server_tools()
+from tools.translate import _
 
 class thunderbird_partner(osv.osv_memory):
     _name = "thunderbird.partner"
@@ -151,21 +45,21 @@ class thunderbird_partner(osv.osv_memory):
         ref_ids = str(dictcreate.get('ref_ids')).split(';')
         msg = dictcreate.get('message')
         mail = msg
-        msg = self.pool.get('email.server.tools').parse_message(msg)
-        server_tools_pool = self.pool.get('email.server.tools')
+        mail_message = self.pool.get('mail.message')
+        msg = mail_message.parse_message(msg)
+        subject = msg.get('Subject', False)
+        thread_pool = self.pool.get('mail.thread')
         message_id = msg.get('message-id', False)
-        msg_pool = self.pool.get('mailgate.message')
         msg_ids = []
         res = {}
         res_ids = []
         obj_list= ['crm.lead','project.issue','hr.applicant','res.partner']
         for ref_id in ref_ids:
-            msg_new = dictcreate.get('message')
             ref = ref_id.split(',')
             model = ref[0]
             res_id = int(ref[1])
             if message_id:
-                msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
+                msg_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
                 if msg_ids and len(msg_ids):
                     continue
             if model not in obj_list:
@@ -193,7 +87,23 @@ class thunderbird_partner(osv.osv_memory):
                 res['datas'] = base64.b64encode(mail)
                 res['res_id'] = res_id
                 obj_attch.create(cr, uid, res)
-            server_tools_pool.history_message(cr, uid, model, res_id, msg_new)
+            threads = self.pool.get(model).browse(cr, uid, res_id)
+
+            thread_pool.message_append(cr, uid,
+                            [threads],
+                            subject = msg.get('subject'),
+                            details = msg.get('body_text'),
+                            email_to = msg.get('to'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attachments = msg.get('attachments', {}),
+                            email_date = msg.get('date'),
+                            body_html= msg.get('body_html'),
+                            subtype = msg.get('subtype'),
+                            headers = msg.get('headers'),
+                            reply_to = msg.get('reply'))
             res_ids.append(res_id)
         return len(res_ids)
 
@@ -201,7 +111,7 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate = dict(vals)
         model = str(dictcreate.get('model'))
         message = dictcreate.get('message')
-        return self.pool.get('email.server.tools').process_email(cr, uid, model, message, attach=True, context=None)
+        return self.pool.get('mail.thread').message_process(cr, uid, model, message)
 
     def search_message(self, cr, uid, message, context=None):
         #@param message: string of mail which is read from EML File
@@ -209,26 +119,26 @@ class thunderbird_partner(osv.osv_memory):
         references = []
         dictcreate = dict(message)
         msg = dictcreate.get('message')
-        msg = self.pool.get('email.server.tools').parse_message(msg)
+        msg = self.pool.get('mail.message').parse_message(msg)
         message_id = msg.get('message-id')
         refs =  msg.get('references',False)
         references = False
         if refs:
             references = refs.split()
-        msg_pool = self.pool.get('mailgate.message')
+        mail_message = self.pool.get('mail.message')
         model = ''
         res_id = 0
         if message_id:
-            msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id)])
+            msg_ids = mail_message.search(cr, uid, [('message_id','=',message_id)])
             if msg_ids and len(msg_ids):
-                msg = msg_pool.browse(cr, uid, msg_ids[0])
+                msg = mail_message.browse(cr, uid, msg_ids[0])
                 model = msg.model
                 res_id = msg.res_id
             else:
                 if references :
-                    msg_ids = msg_pool.search(cr, uid, [('message_id','in',references)])
+                    msg_ids = mail_message.search(cr, uid, [('message_id','in',references)])
                     if msg_ids and len(msg_ids):
-                        msg = msg_pool.browse(cr, uid, msg_ids[0])
+                        msg = mail_message.browse(cr, uid, msg_ids[0])
                         model = msg.model
                         res_id = msg.res_id
         return (model,res_id)
@@ -371,3 +281,5 @@ class thunderbird_partner(osv.osv_memory):
         return object
 
 thunderbird_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 2ab1d97fe46..2fb5d3177c3 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -9,26 +9,24 @@
       <field name="arch" type="xml">
           <data>
               <form position="attributes">
-                  <attribute name="string">Load Thunderbird Plug-In</attribute>
+                  <attribute name="string">Install Thunderbird Plug-In</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Load Thunderbird Plug-In</attribute>
+                   <attribute name="string">Install Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">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.</attribute>
               </xpath>
-	          <xpath expr="//button[@string='Install Modules']" position="replace">
-                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+              <xpath expr="//button[@string='Install Modules']" position="replace">
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
               </xpath>
-              <xpath expr="//button[@string='Skip']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              <xpath expr="//button[@string='Cancel']" position="replace">
               </xpath>
               <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-		  		<attribute name="string"/>
-		  		<attribute name="rowspan">15</attribute>
-		  	  </xpath>
-		  	  <group colspan="8" position="replace">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">15</attribute>
+              </xpath>
+              <group colspan="8" position="replace">
               <group colspan="8" height="450" width="750">
                   <field name="thunderbird" invisible="1"/>
                   <field name="name" invisible="1"/>
@@ -48,7 +46,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Load Thunderbird Plug-In</field>
+      <field name="name">Install Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -61,11 +59,12 @@
         <field name="action_id" ref="action_thunderbird_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
         <field name="sequence">3</field>
+        <field name="type">automatic</field>
     </record>
 
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Load Thunderbird Plug-In</field>
+      <field name="name">Install Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -75,8 +74,8 @@
       <field name="context">{'menu':True}</field>
     </record>
 
-	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
-	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10"/>
+    <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
+    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
 
   </data>
 </openerp>
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index 6d1fe9a720e..adab3ff892c 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -50,6 +50,13 @@ anonymous authentication for users, it is only for the master
 LDAP account that is used to verify if a user exists before
 attempting to authenticate it.
 
+Securing the connection with STARTTLS is available for LDAP
+servers supporting it, by enabling the TLS option in the LDAP
+configuration.
+
+For further options configuring the LDAP settings, refer to the
+ldap.conf manpage :manpage:`ldap.conf(5)`.
+
 Security Considerations
 +++++++++++++++++++++++
 Users' LDAP passwords are never stored in the OpenERP database,
@@ -78,6 +85,9 @@ OpenERP database (which means no access), the first step
 always fails and the LDAP server is queried to do the
 authentication.
 
+Enabling STARTTLS ensures that the authentication query to the
+LDAP server is encrypted.
+
 User Template
 +++++++++++++
 In the LDAP configuration on the Company form, it is possible to
@@ -106,7 +116,7 @@ will disable LDAP authentication if installed at the same time.
 
 
     "website" : "http://www.openerp.com",
-    "category" : "Tools",
+    "category" : "Hidden",
     "data" : [
         "users_ldap_view.xml",
         "user_ldap_installer.xml",
diff --git a/addons/users_ldap/i18n/bg.po b/addons/users_ldap/i18n/bg.po
index bde8f6df8fd..07761d05fb3 100644
--- a/addons/users_ldap/i18n/bg.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/ca.po b/addons/users_ldap/i18n/ca.po
index 4d028ca6d76..9f4e8d20d1f 100644
--- a/addons/users_ldap/i18n/ca.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/de.po b/addons/users_ldap/i18n/de.po
index b380df35b48..0d8964e2c06 100644
--- a/addons/users_ldap/i18n/de.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -128,21 +128,3 @@ msgstr "LDAP Filter"
 #: field:res.company.ldap,create_user:0
 msgid "Create user"
 msgstr "Erzeuge Benutzer"
-
-#~ 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 beinhalten !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
index 2110c1363f4..2a19ab58c4e 100644
--- a/addons/users_ldap/i18n/es.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -128,21 +128,3 @@ msgstr "Filtro LDAP"
 #: field:res.company.ldap,create_user:0
 msgid "Create user"
 msgstr "Crear usuario"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura 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 "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/users_ldap/i18n/es_MX.po b/addons/users_ldap/i18n/es_MX.po
new file mode 100644
index 00000000000..c2f1c761ee2
--- /dev/null
+++ b/addons/users_ldap/i18n/es_MX.po
@@ -0,0 +1,130 @@
+# 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-28 08: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:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parámetros LDAP"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "Configuración LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "binddn LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea el usuario si no está en la base de datos."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo utilizado para la creación de usuarios."
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Dirección servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Puerto servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contraseña LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.compañía.ldap"
+
+#. module: users_ldap
+#: model:ir.module.module,description:users_ldap.module_meta_information
+msgid "Adds support for authentication by ldap server"
+msgstr "Añade soporte para autenticación contra un servidor ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: users_ldap
+#: 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 de usuario!"
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr "Autentifica los usuarios con un servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modelo usuario"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crear usuario"
diff --git a/addons/users_ldap/i18n/es_VE.po b/addons/users_ldap/i18n/es_VE.po
new file mode 100644
index 00000000000..c2f1c761ee2
--- /dev/null
+++ b/addons/users_ldap/i18n/es_VE.po
@@ -0,0 +1,130 @@
+# 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-28 08: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:57+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parámetros LDAP"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "Configuración LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "binddn LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea el usuario si no está en la base de datos."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo utilizado para la creación de usuarios."
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Dirección servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Puerto servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contraseña LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.compañía.ldap"
+
+#. module: users_ldap
+#: model:ir.module.module,description:users_ldap.module_meta_information
+msgid "Adds support for authentication by ldap server"
+msgstr "Añade soporte para autenticación contra un servidor ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: users_ldap
+#: 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 de usuario!"
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr "Autentifica los usuarios con un servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modelo usuario"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crear usuario"
diff --git a/addons/users_ldap/i18n/fi.po b/addons/users_ldap/i18n/fi.po
index 16845d10533..6ec1968f09a 100644
--- a/addons/users_ldap/i18n/fi.po
+++ b/addons/users_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: 2011-06-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/fr.po b/addons/users_ldap/i18n/fr.po
index 165520a0ec8..7dccd3a6c66 100644
--- a/addons/users_ldap/i18n/fr.po
+++ b/addons/users_ldap/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-13 12:55+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -25,7 +25,9 @@ msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
 #. module: users_ldap
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "La société choisie n'est pas autorisée pour cet utilisateur."
+msgstr ""
+"La société choisie ne fait pas partie des sociétés autorisées pour cet "
+"utilisateur"
 
 #. module: users_ldap
 #: field:res.company,ldaps:0
@@ -50,7 +52,7 @@ msgstr "Créer l'utilisateur s'il n'est pas dans la base de données"
 #. module: users_ldap
 #: help:res.company.ldap,user:0
 msgid "Model used for user creation"
-msgstr "Modèle utilisé pour la création d'utilisateur"
+msgstr "Modèle utilisé pour créer les utilisateurs"
 
 #. module: users_ldap
 #: field:res.company.ldap,company:0
@@ -110,7 +112,7 @@ msgstr "Authentifier les utilisateurs avec le serveur LDAP"
 #. module: users_ldap
 #: field:res.company.ldap,user:0
 msgid "Model User"
-msgstr "Utilisateur modèle"
+msgstr "Modèle utilisateur"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_users
diff --git a/addons/users_ldap/i18n/gl.po b/addons/users_ldap/i18n/gl.po
index 490220c4a43..06883e9aeff 100644
--- a/addons/users_ldap/i18n/gl.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/hu.po b/addons/users_ldap/i18n/hu.po
index 7b3b269c8b5..fc265e200e9 100644
--- a/addons/users_ldap/i18n/hu.po
+++ b/addons/users_ldap/i18n/hu.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-27 12:31+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/it.po b/addons/users_ldap/i18n/it.po
index 11ebf16c3f6..4dcc3c1d8d2 100644
--- a/addons/users_ldap/i18n/it.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -126,21 +126,3 @@ msgstr "Filtro LDAP"
 #: field:res.company.ldap,create_user:0
 msgid "Create user"
 msgstr "Crea utente"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ 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 "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere inferiore ad 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
diff --git a/addons/users_ldap/i18n/mn.po b/addons/users_ldap/i18n/mn.po
index 5fe7548a174..94a9d289845 100644
--- a/addons/users_ldap/i18n/mn.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/nl.po b/addons/users_ldap/i18n/nl.po
index 23044004036..34d2cdfc7ce 100644
--- a/addons/users_ldap/i18n/nl.po
+++ b/addons/users_ldap/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/pl.po b/addons/users_ldap/i18n/pl.po
index 02be870e3c0..f0f780083d8 100644
--- a/addons/users_ldap/i18n/pl.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/pt.po b/addons/users_ldap/i18n/pt.po
index bd8f3c3a6bf..0eb18e764bb 100644
--- a/addons/users_ldap/i18n/pt.po
+++ b/addons/users_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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/pt_BR.po b/addons/users_ldap/i18n/pt_BR.po
index 2abc8afabc2..b78bbf94aa6 100644
--- a/addons/users_ldap/i18n/pt_BR.po
+++ b/addons/users_ldap/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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -127,21 +127,3 @@ msgstr "Filtro LDAP"
 #: field:res.company.ldap,create_user:0
 msgid "Create user"
 msgstr "Criar usuário"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/users_ldap/i18n/ru.po b/addons/users_ldap/i18n/ru.po
index ec7a098a7d2..70a25a1a988 100644
--- a/addons/users_ldap/i18n/ru.po
+++ b/addons/users_ldap/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: 2011-05-13 04:35+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Ошибка ! Нельзя создать рекурсивные компании."
+msgstr "Ошибка ! Нельзя создать организации рекурсивно."
 
 #. module: users_ldap
 #: constraint:res.users:0
diff --git a/addons/users_ldap/i18n/tr.po b/addons/users_ldap/i18n/tr.po
index bf58104b311..da85ba72b7d 100644
--- a/addons/users_ldap/i18n/tr.po
+++ b/addons/users_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: 2011-05-15 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/zh_CN.po b/addons/users_ldap/i18n/zh_CN.po
index 736c2b4a6e0..1d3a36293b3 100644
--- a/addons/users_ldap/i18n/zh_CN.po
+++ b/addons/users_ldap/i18n/zh_CN.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: 2011-04-29 05:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "错误！您不能创建递归公司."
 
 #. module: users_ldap
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "选择的用户组不在这用允许的用户组"
 
 #. module: users_ldap
 #: field:res.company,ldaps:0
 msgid "LDAP Parameters"
-msgstr ""
+msgstr "LDAP(轻量目录访问协议)参数"
 
 #. module: users_ldap
 #: view:res.company:0
 msgid "LDAP Configuration"
-msgstr ""
+msgstr "LDAP(轻量目录访问协议)设置"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_binddn:0
 msgid "LDAP binddn"
-msgstr ""
+msgstr "绑定到LDAP服务器的可分辨名称"
 
 #. module: users_ldap
 #: help:res.company.ldap,create_user:0
 msgid "Create the user if not in database"
-msgstr ""
+msgstr "如果数据库中没有用户就创建新的用户"
 
 #. module: users_ldap
 #: help:res.company.ldap,user:0
 msgid "Model used for user creation"
-msgstr ""
+msgstr "创建用户使用的模型"
 
 #. module: users_ldap
 #: field:res.company.ldap,company:0
@@ -60,12 +60,12 @@ msgstr "公司"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server:0
 msgid "LDAP Server address"
-msgstr ""
+msgstr "LDAP服务器地址"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server_port:0
 msgid "LDAP Server port"
-msgstr ""
+msgstr "LDAP服务器端口"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -80,12 +80,12 @@ msgstr "公司"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
 msgid "LDAP password"
-msgstr ""
+msgstr "LDAP密码"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
 msgid "res.company.ldap"
-msgstr ""
+msgstr "res.company.ldap"
 
 #. module: users_ldap
 #: model:ir.module.module,description:users_ldap.module_meta_information
@@ -100,7 +100,7 @@ msgstr "序号"
 #. module: users_ldap
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "你不能同时登录两个用户！"
 
 #. module: users_ldap
 #: model:ir.module.module,shortdesc:users_ldap.module_meta_information
@@ -110,29 +110,19 @@ msgstr "通过LDAP服务器认证用户"
 #. module: users_ldap
 #: field:res.company.ldap,user:0
 msgid "Model User"
-msgstr ""
+msgstr "用户模型"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_filter:0
 msgid "LDAP filter"
-msgstr ""
+msgstr "LDAP过滤器"
 
 #. module: users_ldap
 #: field:res.company.ldap,create_user:0
 msgid "Create user"
 msgstr "创建用户"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "模块的认证ID必须唯一"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "字段的长度不小于1"
diff --git a/addons/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py
index bddaaeed6ae..1ad1b2df104 100644
--- a/addons/users_ldap/users_ldap.py
+++ b/addons/users_ldap/users_ldap.py
@@ -18,19 +18,188 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-import pooler
-import tools
-import logging
-from service import security
 import ldap
+import logging
 from ldap.filter import filter_format
 
+import openerp.exceptions
+import pooler
+import tools
+from osv import fields, osv
+from openerp import SUPERUSER_ID
 
 class CompanyLDAP(osv.osv):
     _name = 'res.company.ldap'
     _order = 'sequence'
     _rec_name = 'ldap_server'
+
+    def get_ldap_dicts(self, cr, ids=None):
+        """ 
+        Retrieve res_company_ldap resources from the database in dictionary
+        format.
+
+        :param list ids: Valid ids of model res_company_ldap. If not \
+        specified, process all resources (unlike other ORM methods).
+        :return: ldap configurations
+        :rtype: list of dictionaries
+        """
+
+        if ids:
+            id_clause = 'AND id IN (%s)'
+            args = [tuple(ids)]
+        else:
+            id_clause = ''
+            args = []
+        cr.execute("""
+            SELECT id, company, ldap_server, ldap_server_port, ldap_binddn,
+                   ldap_password, ldap_filter, ldap_base, "user", create_user,
+                   ldap_tls
+            FROM res_company_ldap
+            WHERE ldap_server != '' """ + id_clause + """ ORDER BY sequence
+        """, args)
+        return cr.dictfetchall()
+
+    def connect(self, conf):
+        """ 
+        Connect to an LDAP server specified by an ldap
+        configuration dictionary.
+
+        :param dict conf: LDAP configuration
+        :return: an LDAP object
+        """
+
+        uri = 'ldap://%s:%d' % (conf['ldap_server'],
+                                conf['ldap_server_port'])
+
+        connection = ldap.initialize(uri)
+        if conf['ldap_tls']:
+            connection.start_tls_s()
+        return connection
+
+    def authenticate(self, conf, login, password):
+        """
+        Authenticate a user against the specified LDAP server.
+
+        In order to prevent an unintended 'unauthenticated authentication',
+        which is an anonymous bind with a valid dn and a blank password,
+        check for empty passwords explicitely (:rfc:`4513#section-6.3.1`)
+        
+        :param dict conf: LDAP configuration
+        :param login: username
+        :param password: Password for the LDAP user
+        :return: LDAP entry of authenticated user or False
+        :rtype: dictionary of attributes
+        """
+
+        if not password:
+            return False
+
+        entry = False
+        filter = filter_format(conf['ldap_filter'], (login,))
+        try:
+            results = self.query(conf, filter)
+            if results and len(results) == 1:
+                dn = results[0][0]
+                conn = self.connect(conf)
+                conn.simple_bind_s(dn, password)
+                conn.unbind()
+                entry = results[0]
+        except ldap.INVALID_CREDENTIALS:
+            return False
+        except ldap.LDAPError, e:
+            logger = logging.getLogger('orm.ldap')
+            logger.error('An LDAP exception occurred: %s', e)
+        return entry
+        
+    def query(self, conf, filter, retrieve_attributes=None):
+        """ 
+        Query an LDAP server with the filter argument and scope subtree.
+
+        Allow for all authentication methods of the simple authentication
+        method:
+
+        - authenticated bind (non-empty binddn + valid password)
+        - anonymous bind (empty binddn + empty password)
+        - unauthenticated authentication (non-empty binddn + empty password)
+
+        .. seealso::
+           :rfc:`4513#section-5.1` - LDAP: Simple Authentication Method.
+
+        :param dict conf: LDAP configuration
+        :param filter: valid LDAP filter
+        :param list retrieve_attributes: LDAP attributes to be retrieved. \
+        If not specified, return all attributes.
+        :return: ldap entries
+        :rtype: list of tuples (dn, attrs)
+
+        """
+
+        results = []
+        logger = logging.getLogger('orm.ldap')
+        try:
+            conn = self.connect(conf)
+            conn.simple_bind_s(conf['ldap_binddn'] or '',
+                               conf['ldap_password'] or '')
+            results = conn.search_st(conf['ldap_base'], ldap.SCOPE_SUBTREE,
+                                     filter, retrieve_attributes, timeout=60)
+            conn.unbind()
+        except ldap.INVALID_CREDENTIALS:
+            logger.error('LDAP bind failed.')
+        except ldap.LDAPError, e:
+            logger.error('An LDAP exception occurred: %s', e)
+        return results
+
+    def map_ldap_attributes(self, cr, uid, conf, login, ldap_entry):
+        """
+        Compose values for a new resource of model res_users,
+        based upon the retrieved ldap entry and the LDAP settings.
+        
+        :param dict conf: LDAP configuration
+        :param login: the new user's login
+        :param tuple ldap_entry: single LDAP result (dn, attrs)
+        :return: parameters for a new resource of model res_users
+        :rtype: dict
+        """
+
+        values = { 'name': ldap_entry[1]['cn'][0],
+                   'login': login,
+                   'company_id': conf['company']
+                   }
+        return values
+    
+    def get_or_create_user(self, cr, uid, conf, login, ldap_entry,
+                           context=None):
+        """
+        Retrieve an active resource of model res_users with the specified
+        login. Create the user if it is not initially found.
+
+        :param dict conf: LDAP configuration
+        :param login: the user's login
+        :param tuple ldap_entry: single LDAP result (dn, attrs)
+        :return: res_users id
+        :rtype: int
+        """
+        
+        user_id = False
+        login = tools.ustr(login)
+        cr.execute("SELECT id, active FROM res_users WHERE login=%s", (login,))
+        res = cr.fetchone()
+        if res:
+            if res[1]:
+                user_id = res[0]
+        elif conf['create_user']:
+            logger = logging.getLogger('orm.ldap')
+            logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
+            user_obj = self.pool.get('res.users')
+            values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
+            if conf['user']:
+                user_id = user_obj.copy(cr, SUPERUSER_ID, conf['user'],
+                                        default={'active': True})
+                user_obj.write(cr, SUPERUSER_ID, user_id, values)
+            else:
+                user_id = user_obj.create(cr, SUPERUSER_ID, values)
+        return user_id
+
     _columns = {
         'sequence': fields.integer('Sequence'),
         'company': fields.many2one('res.company', 'Company', required=True,
@@ -43,18 +212,22 @@ class CompanyLDAP(osv.osv):
         'ldap_password': fields.char('LDAP password', size=64,
             help=("The password of the user account on the LDAP server that is "
                   "used to query the directory.")),
-        'ldap_filter': fields.char('LDAP filter', size=64, required=True),
+        'ldap_filter': fields.char('LDAP filter', size=256, required=True),
         'ldap_base': fields.char('LDAP base', size=64, required=True),
         'user': fields.many2one('res.users', 'Model User',
             help="Model used for user creation"),
         'create_user': fields.boolean('Create user',
             help="Create the user if not in database"),
+        'ldap_tls': fields.boolean('Use TLS',
+            help="Request secure TLS/SSL encryption when connecting to the LDAP server. "
+                 "This option requires a server with STARTTLS enabled, "
+                 "otherwise all authentication attempts will fail."),
     }
     _defaults = {
-        'ldap_server': lambda *a: '127.0.0.1',
-        'ldap_server_port': lambda *a: 389,
-        'sequence': lambda *a: 10,
-        'create_user': lambda *a: True,
+        'ldap_server': '127.0.0.1',
+        'ldap_server_port': 389,
+        'sequence': 10,
+        'create_user': True,
     }
 
 CompanyLDAP()
@@ -63,132 +236,52 @@ CompanyLDAP()
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
-        'ldaps': fields.one2many('res.company.ldap', 'company', 'LDAP Parameters'),
+        'ldaps': fields.one2many(
+            'res.company.ldap', 'company', 'LDAP Parameters'),
     }
 res_company()
 
+
 class users(osv.osv):
     _inherit = "res.users"
     def login(self, db, login, password):
-
-        if not password:
-            # empty passwords are disallowed for obvious security reasons
-            return False
-
-        ret = super(users,self).login(db, login, password)
-        if ret:
-            return ret
-        logger = logging.getLogger('orm.ldap')
-        pool = pooler.get_pool(db)
+        user_id = super(users, self).login(db, login, password)
+        if user_id:
+            return user_id
         cr = pooler.get_db(db).cursor()
-        action_obj = pool.get('ir.actions.actions')
-        cr.execute("""
-            SELECT id, company, ldap_server, ldap_server_port, ldap_binddn, ldap_password,
-                   ldap_filter, ldap_base, "user", create_user
-            FROM res_company_ldap
-            WHERE ldap_server != '' ORDER BY sequence""")
-        for res_company_ldap in cr.dictfetchall():
-            logger.debug(res_company_ldap)
-            try:
-                l = ldap.open(res_company_ldap['ldap_server'], res_company_ldap['ldap_server_port'])
-                # An empty binddn means anonymous auth, so it should be replaced w/ an empty string
-                # See LDAP RFC 4513, Section 5.1.1
-                if l.simple_bind_s(res_company_ldap['ldap_binddn'] or '',
-                                   res_company_ldap['ldap_password'] or ''):
-                    base = res_company_ldap['ldap_base']
-                    scope = ldap.SCOPE_SUBTREE
-                    filter = filter_format(res_company_ldap['ldap_filter'], (login,))
-                    retrieve_attributes = None
-                    result_id = l.search(base, scope, filter, retrieve_attributes)
-                    timeout = 60
-                    result_type, result_data = l.result(result_id, timeout)
-                    if not result_data:
-                        continue
-                    if result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1:
-                        dn = result_data[0][0]
-                        logger.debug(dn)
-                        name = result_data[0][1]['cn'][0]
-                        if l.bind_s(dn, password):
-                            l.unbind()
-                            cr.execute("SELECT id FROM res_users WHERE login=%s",(tools.ustr(login),))
-                            res = cr.fetchone()
-                            logger.debug(res)
-                            if res:
-                                cr.close()
-                                return res[0]
-                            if not res_company_ldap['create_user']:
-                                continue
-                            action_id = action_obj.search(cr, 1, [('usage', '=', 'menu')])[0]
-                            if res_company_ldap['user']:
-                                res = self.copy(cr, 1, res_company_ldap['user'],
-                                        default={'active': True})
-                                self.write(cr, 1, res, {
-                                    'name': name,
-                                    'login': login.encode('utf-8'),
-                                    'company_id': res_company_ldap['company'],
-                                    })
-                            else:
-                                res = self.create(cr, 1, {
-                                    'name': name,
-                                    'login': login.encode('utf-8'),
-                                    'company_id': res_company_ldap['company'],
-                                    'action_id': action_id,
-                                    'menu_id': action_id,
-                                    })
-                            cr.commit()
-                            cr.close()
-                            return res
-                    l.unbind()
-            except Exception:
-                logger.warning("Cannot auth", exc_info=True)
-                continue
+        ldap_obj = pooler.get_pool(db).get('res.company.ldap')
+        for conf in ldap_obj.get_ldap_dicts(cr):
+            entry = ldap_obj.authenticate(conf, login, password)
+            if entry:
+                user_id = ldap_obj.get_or_create_user(
+                    cr, SUPERUSER_ID, conf, login, entry)
+                if user_id:
+                    cr.execute('UPDATE res_users SET date=now() WHERE '
+                               'login=%s', (tools.ustr(login),))
+                    cr.commit()
+                    break
         cr.close()
-        return False
+        return user_id
 
     def check(self, db, uid, passwd):
         try:
             return super(users,self).check(db, uid, passwd)
-        except security.ExceptionNoTb: # AccessDenied
+        except openerp.exceptions.AccessDenied:
             pass
 
-        if not passwd:
-            # empty passwords disallowed for obvious security reasons
-            raise security.ExceptionNoTb('AccessDenied')
-
         cr = pooler.get_db(db).cursor()
-        user = self.browse(cr, 1, uid)
-        logger = logging.getLogger('orm.ldap')
-        if user and user.company_id.ldaps:
-            for res_company_ldap in user.company_id.ldaps:
-                try:
-                    l = ldap.open(res_company_ldap.ldap_server, res_company_ldap.ldap_server_port)
-                    # An empty binddn means anonymous auth, so it should be replaced w/ an empty string
-                    # See LDAP RFC 4513, Section 5.1.1
-                    if l.simple_bind_s(res_company_ldap.ldap_binddn or '',
-                                       res_company_ldap.ldap_password or ''):
-                        base = res_company_ldap.ldap_base
-                        scope = ldap.SCOPE_SUBTREE
-                        filter = filter_format(res_company_ldap.ldap_filter, (user.login,))
-                        retrieve_attributes = None
-                        result_id = l.search(base, scope, filter, retrieve_attributes)
-                        timeout = 60
-                        result_type, result_data = l.result(result_id, timeout)
-                        if result_data and result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1:
-                            dn = result_data[0][0]
-                            # some LDAP servers allow anonymous binding with blank passwords,
-                            # but these have been rejected above, so we're safe to use bind()
-                            if l.bind_s(dn, passwd):
-                                l.unbind()
-                                self._uid_cache.setdefault(db, {})[uid] = passwd
-                                cr.close()
-                                return True
-                        l.unbind()
-                except Exception:
-                    logger.warning('cannot check', exc_info=True)
-                    pass
+        cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE',
+                   (int(uid),))
+        res = cr.fetchone()
+        if res:
+            ldap_obj = pooler.get_pool(db).get('res.company.ldap')
+            for conf in ldap_obj.get_ldap_dicts(cr):
+                if ldap_obj.authenticate(conf, res[0], passwd):
+                    self._uid_cache.setdefault(db, {})[uid] = passwd
+                    cr.close()
+                    return True
         cr.close()
-        raise security.ExceptionNoTb('AccessDenied')
+        raise openerp.exceptions.AccessDenied()
         
 users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index b055ef2938d..caece7efe8f 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -20,6 +20,7 @@
                             <field name="user"/>
                             <newline/>
                             <field name="sequence"/>
+                            <field name="ldap_tls"/>
                         </form>
                         <tree string="LDAP Configuration">
                             <field name="sequence"/>
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index 66915423af8..c299d830ed9 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Display Warning Messages',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Module to trigger warnings in OpenERP objects.
diff --git a/addons/warning/i18n/ar.po b/addons/warning/i18n/ar.po
index 4d7306ad6e1..9c6d234f442 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/bg.po b/addons/warning/i18n/bg.po
index 72a8d58d4e6..5d2cb660de1 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/bs.po b/addons/warning/i18n/bs.po
index 86e72683237..5cd490ef2a2 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/ca.po b/addons/warning/i18n/ca.po
index 589753cddb4..0bae11bd629 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -240,7 +240,3 @@ msgstr "Línia comanda de venda"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invàlid per a la definició de la vista!"
-
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "Alerta per ' + product_info.name +' !"
diff --git a/addons/warning/i18n/cs.po b/addons/warning/i18n/cs.po
index bba7f1ae041..3ae3789e6fb 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index b2acc7284ea..ccac3716d40 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -240,22 +240,3 @@ msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "Warnnng für ' + product_info.name +' !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objektname muss mit \"x_\" Beginnen und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/warning/i18n/el.po b/addons/warning/i18n/el.po
index b6001bce4f0..ab85f51ee94 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index f0c98a8e036..b51addec7ef 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -241,28 +241,3 @@ msgstr "Línea pedido de venta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
-
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "¡Alerta para ' + product_info.name +' !"
-
-#~ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Error: La referencia BVR es necesaria."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Error: Número BVR no válido (checksum erróneo)."
diff --git a/addons/warning/i18n/es_AR.po b/addons/warning/i18n/es_AR.po
index b411c17d54a..69e262a9472 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -236,9 +236,5 @@ msgstr ""
 msgid "Sales Order Line"
 msgstr ""
 
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "Alerta por ' + product_info.name +' !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para la definición de la vista!"
diff --git a/addons/warning/i18n/es_MX.po b/addons/warning/i18n/es_MX.po
new file mode 100644
index 00000000000..0fe67e78083
--- /dev/null
+++ b/addons/warning/i18n/es_MX.po
@@ -0,0 +1,243 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* warning
+#
+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-13 18:02+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:41+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr "Línea pedido de compra"
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sale Order Line"
+msgstr "Mensaje para la línea del pedido de venta"
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr "Mensaje para la línea del pedido de compra"
+
+#. module: warning
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: warning
+#: field:product.product,sale_line_warn:0
+msgid "Sale Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr "Aviso cuando compra este producto"
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr "Avisos"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr "Mensaje de bloqueo"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr "Aviso en la factura"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr "Sin mensaje"
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: warning
+#: model:ir.module.module,shortdesc:warning.module_meta_information
+msgid "Module for Warnings form onchange Event"
+msgstr ""
+"Módulo para la configuración de avisos en eventos (cambios en los "
+"formularios)"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr "Aviso cuando vende este producto"
+
+#. module: warning
+#: field:res.partner,sale_warn:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr "Albarán de stock"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sale Order"
+msgstr "Mensaje para el pedido de venta"
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr "Mensaje para el pedido de compra"
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"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 ""
+"Si selecciona la opción \"Aviso\" se notificará a los usuarios con el "
+"mensaje, si selecciona \"Mensaje de bloqueo\" se lanzará una excepción con "
+"el mensaje y se bloqueará el flujo. El mensaje debe escribirse en el "
+"siguiente campo."
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
+#, python-format
+msgid "Alert for %s !"
+msgstr "¡Alerta para %s!"
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "Mensaje para factura"
+
+#. module: warning
+#: model:ir.module.module,description:warning.module_meta_information
+msgid "Module for Warnings form onchange Event."
+msgstr "Módulo para configuración de avisos en eventos."
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr "Aviso en los albaranes"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr "Aviso en el pedido de compra"
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
+#, python-format
+msgid "Warning for %s"
+msgstr "Aviso para %s"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sale Order"
+msgstr "Aviso en el pedido de venta"
+
+#. module: warning
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr "Mensaje para albarán de stock"
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/warning/i18n/es_VE.po b/addons/warning/i18n/es_VE.po
new file mode 100644
index 00000000000..0fe67e78083
--- /dev/null
+++ b/addons/warning/i18n/es_VE.po
@@ -0,0 +1,243 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* warning
+#
+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-13 18:02+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:41+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr "Línea pedido de compra"
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sale Order Line"
+msgstr "Mensaje para la línea del pedido de venta"
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr "Mensaje para la línea del pedido de compra"
+
+#. module: warning
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: warning
+#: field:product.product,sale_line_warn:0
+msgid "Sale Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr "Aviso cuando compra este producto"
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr "Avisos"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr "Mensaje de bloqueo"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr "Aviso en la factura"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr "Sin mensaje"
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: warning
+#: model:ir.module.module,shortdesc:warning.module_meta_information
+msgid "Module for Warnings form onchange Event"
+msgstr ""
+"Módulo para la configuración de avisos en eventos (cambios en los "
+"formularios)"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr "Aviso cuando vende este producto"
+
+#. module: warning
+#: field:res.partner,sale_warn:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr "Albarán de stock"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sale Order"
+msgstr "Mensaje para el pedido de venta"
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr "Mensaje para el pedido de compra"
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"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 ""
+"Si selecciona la opción \"Aviso\" se notificará a los usuarios con el "
+"mensaje, si selecciona \"Mensaje de bloqueo\" se lanzará una excepción con "
+"el mensaje y se bloqueará el flujo. El mensaje debe escribirse en el "
+"siguiente campo."
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
+#, python-format
+msgid "Alert for %s !"
+msgstr "¡Alerta para %s!"
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "Mensaje para factura"
+
+#. module: warning
+#: model:ir.module.module,description:warning.module_meta_information
+msgid "Module for Warnings form onchange Event."
+msgstr "Módulo para configuración de avisos en eventos."
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr "Aviso en los albaranes"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr "Aviso en el pedido de compra"
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
+#, python-format
+msgid "Warning for %s"
+msgstr "Aviso para %s"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sale Order"
+msgstr "Aviso en el pedido de venta"
+
+#. module: warning
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr "Mensaje para albarán de stock"
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/warning/i18n/et.po b/addons/warning/i18n/et.po
index 23754a5070b..bb3619742ec 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/fi.po b/addons/warning/i18n/fi.po
index 7743bb21985..3532d2b8663 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index ed0106803ba..cdff10ee4a6 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -244,12 +244,3 @@ msgstr "Ligne de commande de vente"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom du module doit être unique !"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Erreur: la référence BVR est requise."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
diff --git a/addons/warning/i18n/gl.po b/addons/warning/i18n/gl.po
index f01b3eba77f..41332d72391 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index 7797624629a..aa89ee62028 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/hu.po b/addons/warning/i18n/hu.po
index 56d29e5efe2..83428c87c96 100644
--- a/addons/warning/i18n/hu.po
+++ b/addons/warning/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-04 15:42+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/id.po b/addons/warning/i18n/id.po
index fa8e5e48e9e..d342360bc95 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/it.po b/addons/warning/i18n/it.po
index 0510ccead5f..38e7048e1ad 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -238,22 +238,3 @@ msgstr "Linea ordine di vendita"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "Avviso per' + product_info.name +' !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere inferiore ad 1!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere univoco!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
diff --git a/addons/warning/i18n/ko.po b/addons/warning/i18n/ko.po
index 4756c22c306..991e194b0b5 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/lt.po b/addons/warning/i18n/lt.po
index ac6328d3025..1168dd158fa 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/mn.po b/addons/warning/i18n/mn.po
index 7d284e87abf..040fbce6e85 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -236,6 +236,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Агуулахын түүвэр"
-#~ msgstr "Агуулахын түүвэр"
diff --git a/addons/warning/i18n/nb.po b/addons/warning/i18n/nb.po
index bcee172a558..b7729488779 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index 5f6ac8782aa..bed64357a37 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/nl_BE.po b/addons/warning/i18n/nl_BE.po
index a1dc1c0364d..ac9783e5b28 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/pl.po b/addons/warning/i18n/pl.po
index 82377bef943..2ee2d3ed4bd 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index afd58585426..1a0a2eb761c 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -238,24 +238,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Erro: É necessária a referência BVR."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Erro! Número Bvr inválido (soma de controlo errada)"
diff --git a/addons/warning/i18n/pt_BR.po b/addons/warning/i18n/pt_BR.po
index d4e075b1ef6..18aff2ea0de 100644
--- a/addons/warning/i18n/pt_BR.po
+++ b/addons/warning/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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/ro.po b/addons/warning/i18n/ro.po
index 9931c0a6576..953effabfa4 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index a155db929fa..d72c667a568 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -238,18 +238,3 @@ 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 "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля никогда не может быть меньше 1 !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/warning/i18n/sl.po b/addons/warning/i18n/sl.po
index 692a7802efd..eb0220ed8e5 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -35,7 +35,7 @@ msgstr "Sporočilo za vrstico nakupnega naročila"
 #. module: warning
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Napaka! Ni mogoče rekurzivno kreirati pridruženih članov"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
@@ -61,7 +61,7 @@ msgstr "Izdelek"
 #: sql_constraint:purchase.order:0
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr "Referenca naročila more biti unikatna!"
+msgstr "Sklic naročila mora biti enoličen!"
 
 #. module: warning
 #: view:product.product:0
@@ -229,16 +229,12 @@ msgstr "Partner"
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajno naročilo"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Postavka prodajnega naročila"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "Opozorilo za ' + product_info.name +' !"
diff --git a/addons/warning/i18n/sq.po b/addons/warning/i18n/sq.po
index 05b09165749..2bbdd51c9cf 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index ab059be26d7..c3c4b7009ca 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -237,9 +237,5 @@ msgstr ""
 msgid "Sales Order Line"
 msgstr ""
 
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "Opuzorenje za ' + product_info.name +' !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
diff --git a/addons/warning/i18n/sr@latin.po b/addons/warning/i18n/sr@latin.po
index b868778d0b3..95979ee5b12 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -239,7 +239,3 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#, python-format
-#~ msgid "Alert for ' + product_info.name +' !"
-#~ msgstr "Opuzorenje za ' + product_info.name +' !"
diff --git a/addons/warning/i18n/sv.po b/addons/warning/i18n/sv.po
index 758f0b41ccd..4544c0291f3 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/tlh.po b/addons/warning/i18n/tlh.po
index 224c1300a7e..f8d804046e2 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 542fbc7657d..56052ecab92 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -35,12 +35,12 @@ msgstr "Alış Siparişi için Mesaj"
 #. module: warning
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Hata! Kendini Çağıran üyeler oluşturamazsınız."
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Paket Listesi"
 
 #. module: warning
 #: field:product.product,sale_line_warn:0
@@ -55,13 +55,13 @@ msgstr "Bu Ürün Alınırken yapılacak Uyarı"
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Ürün"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Sipariş Referansı özgün olmalıdır!"
 
 #. module: warning
 #: view:product.product:0
@@ -113,7 +113,7 @@ msgstr "Fatura"
 #. module: warning
 #: model:ir.module.module,shortdesc:warning.module_meta_information
 msgid "Module for Warnings form onchange Event"
-msgstr ""
+msgstr "Onchange olaylarından genen uyarılar için modül"
 
 #. module: warning
 #: view:product.product:0
@@ -160,6 +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 ""
+"\"Uyarı\" seçeneğini seçmek kullanıcıyı uyaracaktır. \"Engelleme Mesajını\" "
+"seçmek kuraldışı durum oluşturacak ve akışı durduracaktır. Mesajlar bir "
+"sonraki alana yazılmalıdır."
 
 #. module: warning
 #: code:addons/warning/warning.py:67
@@ -170,7 +173,7 @@ msgstr ""
 #: code:addons/warning/warning.py:246
 #, python-format
 msgid "Alert for %s !"
-msgstr ""
+msgstr "%s için uyarı !"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -180,7 +183,7 @@ msgstr "Fatura Mesajı"
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
 msgid "Module for Warnings form onchange Event."
-msgstr ""
+msgstr "Onchange olaylarından genen uyarılar için modül"
 
 #. module: warning
 #: view:res.partner:0
@@ -201,7 +204,7 @@ msgstr "Alış Siparişi Uyarısı"
 #: code:addons/warning/warning.py:247
 #, python-format
 msgid "Warning for %s"
-msgstr ""
+msgstr "%s için uyarı"
 
 #. module: warning
 #: view:res.partner:0
@@ -211,7 +214,7 @@ msgstr "Satış Siparişi Uyarısı"
 #. module: warning
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN kodu"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
@@ -221,17 +224,17 @@ msgstr "Stok Hazırlığı için Mesaj"
 #. module: warning
 #: model:ir.model,name:warning.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Ortak"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Satış Siparişi"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Satış Siparişi Kalemi"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/warning/i18n/uk.po b/addons/warning/i18n/uk.po
index 507fb95575a..13a3daa85db 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/vi.po b/addons/warning/i18n/vi.po
index ddf961fcce0..3f84fc07481 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index 00e6446f02d..2d80b7aa8b9 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-03-20 10:31+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -25,22 +25,22 @@ 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
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的协会会员。"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "装箱单"
 
 #. module: warning
 #: field:product.product,sale_line_warn:0
@@ -50,18 +50,18 @@ 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
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "单号必须唯一！"
 
 #. module: warning
 #: view:product.product:0
@@ -87,7 +87,7 @@ msgstr "警告"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr "消息"
+msgstr "受阻消息"
 
 #. module: warning
 #: view:res.partner: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,12 +113,12 @@ msgstr "发票"
 #. module: warning
 #: model:ir.module.module,shortdesc:warning.module_meta_information
 msgid "Module for Warnings form onchange Event"
-msgstr "变更事件警告模块"
+msgstr "模块提供事件变更警告"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr "销售这产品时警告"
+msgstr "销售这产品时的警告"
 
 #. module: warning
 #: field:res.partner,sale_warn:0
@@ -128,7 +128,7 @@ msgstr "销售订单"
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
-msgstr "仓库领料/提货"
+msgstr "库存装箱"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order
@@ -139,12 +139,12 @@ 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
 msgid "Message for Purchase Order"
-msgstr "采购订单信息"
+msgstr "采购订单消息"
 
 #. module: warning
 #: code:addons/warning/warning.py:32
@@ -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 ""
-"选择\r\n"
-"“警告“选项将通知用户该信息,\r\n"
-"“信息“选项将抛出一个有该信息的异常并终止流程.该信息必须在下一个字段填写."
+"选择此“警告“选项，将通知用户此消息。\r\n"
+"选择“受阻消息“选项，将在流程受阻时将抛出一个消息。\r\n"
+"消息写入下一个字段。"
 
 #. module: warning
 #: code:addons/warning/warning.py:67
@@ -173,22 +173,22 @@ msgstr ""
 #: code:addons/warning/warning.py:246
 #, python-format
 msgid "Alert for %s !"
-msgstr ""
+msgstr "警报%s ！"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
-msgstr "发票信息"
+msgstr "发票消息"
 
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
 msgid "Module for Warnings form onchange Event."
-msgstr "变更事件警告模块"
+msgstr "模块提供事件变更警告。"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "领料/提货警告"
+msgstr "装箱警告"
 
 #. module: warning
 #: view:res.partner:0
@@ -204,7 +204,7 @@ msgstr "采购订单警告"
 #: code:addons/warning/warning.py:247
 #, python-format
 msgid "Warning for %s"
-msgstr ""
+msgstr "警告 %s"
 
 #. module: warning
 #: view:res.partner:0
@@ -214,27 +214,27 @@ msgstr "销售订单警告"
 #. module: warning
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
 msgid "Message for Stock Picking"
-msgstr "仓库领料/提货信息"
+msgstr "库存装箱消息"
 
 #. module: warning
 #: model:ir.model,name:warning.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "销售订单明细"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
diff --git a/addons/warning/i18n/zh_TW.po b/addons/warning/i18n/zh_TW.po
index 4102bdd2c3b..6d54d8216a1 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: 2011-04-29 05:38+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index ab7a5926653..eb8482ee1cb 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -197,7 +197,7 @@ class sale_order_line(osv.osv):
     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):
+            fiscal_position=False, flag=False, context=None):
         warning = {}
         if not product:
             return {'value': {'th_weight' : 0, 'product_packaging': False,
@@ -218,7 +218,7 @@ class sale_order_line(osv.osv):
 
         result =  super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
-            lang, update_tax, date_order, packaging, fiscal_position, flag)
+            lang, update_tax, date_order, packaging, fiscal_position, flag, context=context)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
@@ -232,7 +232,7 @@ 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,
-            name=False, price_unit=False, notes=False):
+            name=False, price_unit=False, notes=False, context=None):
         warning = {}
         if not product:
             return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}
diff --git a/addons/web_livechat/LICENSE b/addons/web_livechat/LICENSE
index 27a1a4cf453..ff64be448e9 100644
--- a/addons/web_livechat/LICENSE
+++ b/addons/web_livechat/LICENSE
@@ -1,5 +1,5 @@
 OpenERP, Open Source Management Solution
-Copyright © 2010 OpenERP SA (<http://openerp.com>).
+Copyright © 2010-2011 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
diff --git a/addons/web_livechat/__init__.py b/addons/web_livechat/__init__.py
index 9af39b2f58c..761db42923c 100644
--- a/addons/web_livechat/__init__.py
+++ b/addons/web_livechat/__init__.py
@@ -18,3 +18,5 @@
 #
 ##############################################################################
 import publisher_warranty
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py
index cea342ef05e..66d365b5636 100644
--- a/addons/web_livechat/__openerp__.py
+++ b/addons/web_livechat/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2011 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
@@ -20,8 +20,8 @@
 ##############################################################################
 {
     'name': 'Live Chat Support',
-    'version': '1.1',
-    'category': 'Tools',
+    'version': '2.0',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Enable live chat support for those who have a maintenance contract.
@@ -33,9 +33,19 @@ Add "Support" button in header from where you can access OpenERP Support.
     'website': 'http://openerp.com',
     'depends': ['base'],
     'update_xml': [],
+    'js' : [
+        'static/src/js/web_livechat.js',
+    ],
+    'css' : [
+        'static/src/css/lc.css',
+    ],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     'installable': True,
-    'active': True,
-    'web': True,
+    'active': False,
     'certificate': '0013762192410413',
-    'images': ['images/web_livechat_support.jpeg'],
+    'images': ['static/src/img/web_livechat_support.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_livechat/i18n/bg.po b/addons/web_livechat/i18n/bg.po
index e4f6547c68a..e3316708c4e 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 cef8ece03e8..37e5dc081a4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 2541ca7aba6..f7c35a2abce 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 0a0c3942ad5..cc41fbb04e3 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/es_MX.po b/addons/web_livechat/i18n/es_MX.po
new file mode 100644
index 00000000000..1ae99905314
--- /dev/null
+++ b/addons/web_livechat/i18n/es_MX.po
@@ -0,0 +1,41 @@
+# Spanish 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:16+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Chat de asistencia"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "editor_garantía.contrato"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
+"Permite soporte por chat para aquellos que ya tienen contrato de "
+"mantenimiento"
diff --git a/addons/web_livechat/i18n/es_VE.po b/addons/web_livechat/i18n/es_VE.po
new file mode 100644
index 00000000000..1ae99905314
--- /dev/null
+++ b/addons/web_livechat/i18n/es_VE.po
@@ -0,0 +1,41 @@
+# Spanish 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:16+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Chat de asistencia"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "editor_garantía.contrato"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
+"Permite soporte por chat para aquellos que ya tienen contrato de "
+"mantenimiento"
diff --git a/addons/web_livechat/i18n/fi.po b/addons/web_livechat/i18n/fi.po
index a50eb1041fd..b7b1369c3d0 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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 7f66db95d67..2ec5ac66aef 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
@@ -27,7 +27,7 @@ msgstr ""
 #. module: web_livechat
 #: model:ir.module.module,shortdesc:web_livechat.module_meta_information
 msgid "Live Chat Support"
-msgstr ""
+msgstr "Support par messagerie instantanée"
 
 #. module: web_livechat
 #: model:ir.model,name:web_livechat.model_publisher_warranty_contract
@@ -38,3 +38,5 @@ msgstr "publisher_warranty.contract"
 #: model:ir.module.module,description:web_livechat.module_meta_information
 msgid "Enable live chat support for whom have a maintenance contract"
 msgstr ""
+"Valider le support par messagerie instantanée pour les détenteurs d'un "
+"contrat de maintenance"
diff --git a/addons/web_livechat/i18n/gl.po b/addons/web_livechat/i18n/gl.po
index 4ad42b21dc6..7c4d6439ae9 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 f9ef85cfb35..d8031c90918 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 6989e177646..c4dea561451 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..5b19d5b8c77
--- /dev/null
+++ b/addons/web_livechat/i18n/oc.po
@@ -0,0 +1,41 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-20 09:29+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Supòrt per messatjariá instantanèa"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
+"Validar lo supòrt per messatjariá instantanèa pels detentors d'un contracte "
+"de mantenença"
diff --git a/addons/web_livechat/i18n/pt.po b/addons/web_livechat/i18n/pt.po
index 3e4e5c9dd00..78d319a4c82 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: 2011-08-01 04:39+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 36832089fa8..2e74287bae7 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 c97fc6c9963..148c7720081 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 b320d861b31..90dc438c991 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 76f1762fd97..99969e5546e 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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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
new file mode 100644
index 00000000000..441ba5e8c51
--- /dev/null
+++ b/addons/web_livechat/i18n/sr@latin.po
@@ -0,0 +1,39 @@
+# Serbian Latin 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:16+0000\n"
+"PO-Revision-Date: 2011-10-17 13:43+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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr "Vaš garantni izdavački ugovor već je upisan u sistem !"
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Podrška ćaskanja uživo"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr "Omogući podršku ćaskanja uživo za one koji imaju ugovor o održavanju"
diff --git a/addons/web_livechat/i18n/tr.po b/addons/web_livechat/i18n/tr.po
index 6f137881088..3dc83fdd3d4 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\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 5bc0ea73ae7..a57c2f706b9 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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
@@ -26,14 +26,14 @@ msgstr ""
 #. module: web_livechat
 #: model:ir.module.module,shortdesc:web_livechat.module_meta_information
 msgid "Live Chat Support"
-msgstr ""
+msgstr "支持在线交流"
 
 #. module: web_livechat
 #: model:ir.model,name:web_livechat.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: web_livechat
 #: model:ir.module.module,description:web_livechat.module_meta_information
 msgid "Enable live chat support for whom have a maintenance contract"
-msgstr ""
+msgstr "其中一个维护合同支持在线交流"
diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
index ab83bc58c32..b0a7e793ecf 100644
--- a/addons/web_livechat/publisher_warranty.py
+++ b/addons/web_livechat/publisher_warranty.py
@@ -44,7 +44,9 @@ class publisher_warranty_contract(osv.osv):
 
     @cache(skiparg=3)
     def get_default_livechat_text(self, cr, uid):
-        return '<a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank"><img src="/web_livechat/static/images/busy.png"/>Support</a>'
+        return '<a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank"><img src="/web_livechat/static/src/img/busy.png"/>Support</a>'
 
 publisher_warranty_contract()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_livechat/web/static/css/lc.css b/addons/web_livechat/static/src/css/lc.css
similarity index 74%
rename from addons/web_livechat/web/static/css/lc.css
rename to addons/web_livechat/static/src/css/lc.css
index e6892857ddd..7f1876a2793 100644
--- a/addons/web_livechat/web/static/css/lc.css
+++ b/addons/web_livechat/static/src/css/lc.css
@@ -1,7 +1,7 @@
-#livechat_status a.online {
+.livechat span.online {
     text-shadow: 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404;
 }
-#livechat_status img {
+.livechat img {
     vertical-align: middle;
     margin-right: 0.5em;
 }
diff --git a/addons/web_livechat/static/src/img/available.png b/addons/web_livechat/static/src/img/available.png
new file mode 100644
index 00000000000..e9eea88ae5f
Binary files /dev/null and b/addons/web_livechat/static/src/img/available.png differ
diff --git a/addons/web_livechat/static/src/img/away.png b/addons/web_livechat/static/src/img/away.png
new file mode 100644
index 00000000000..f0a0847059f
Binary files /dev/null and b/addons/web_livechat/static/src/img/away.png differ
diff --git a/addons/web_livechat/static/src/img/busy.png b/addons/web_livechat/static/src/img/busy.png
new file mode 100644
index 00000000000..ddb24377f0f
Binary files /dev/null and b/addons/web_livechat/static/src/img/busy.png differ
diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js
new file mode 100644
index 00000000000..13c4bbe28d4
--- /dev/null
+++ b/addons/web_livechat/static/src/js/web_livechat.js
@@ -0,0 +1,97 @@
+/*############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 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 License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################*/
+
+var __lc_buttons = [];
+
+openerp.web_livechat = function (openerp) {
+
+openerp.web_livechat.Livechat = openerp.web.Widget.extend({
+    template: 'Header-LiveChat',
+
+    start: function() {
+        this._super();
+        if (!this.session)
+            return;
+        var self = this;
+        var pwc = new openerp.web.Model(self.session, "publisher_warranty.contract");
+        pwc.get_func('get_default_livechat_text')().then(function(text) {
+            self.$element.html(text);
+            self.do_update();
+        });
+
+        openerp.webclient.header.do_update.add_last(this.do_update);
+    },
+
+    do_update: function() {
+        var self = this;
+        if (!this.session) {
+            self.$element.remove();
+            return;
+        }
+        
+        var lc_id = _.uniqueId('livechat_');
+        this.$element.attr('id', lc_id);
+
+        var pwc = new openerp.web.Model(self.session, "publisher_warranty.contract");
+        
+        pwc.get_func('is_livechat_enable')().then(function(res) {
+            console.log('res', res);
+            if(!res) {
+                //return;
+            }
+
+            __lc_buttons.push({
+                elementId: lc_id, //'livechat_status',
+                language: 'en',
+                skill: '0',
+                type: 'text',
+                labels: {
+                    online: '<img src="/web_livechat/static/src/img/available.png"/>Support',
+                    offline: '<img src="/web_livechat/static/src/img/away.png"/>Support',
+                }
+            });
+        });
+    }
+});
+
+if (openerp.webclient) {
+    // tracking code from LiveChat
+    var license = '1035052',
+        params = '',
+        lang = 'en',
+        skill = '0';
+    __lc_load = function (p) { if (typeof __lc_loaded != 'function')
+      if (p) { var d = document, l = d.createElement('script'), s =
+        d.getElementsByTagName('script')[0], a = unescape('%26'),
+        h = ('https:' == d.location.protocol ? 'https://' : 'http://'); l.type = 'text/javascript'; l.async = true;
+        l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
+        if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
+          l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
+          l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params)); s.parentNode.insertBefore(l, s);
+        } else setTimeout(__lc_load, 1000); if(typeof __lc_serv != 'string'){ s.parentNode.insertBefore(l, s);}
+      } else __lc_load(Math.ceil(Math.random()*5)); }
+    __lc_load();
+
+    // and add widget to webclient
+    openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient);
+    openerp.webclient.livechat.prependTo('div.header_corner');
+}
+
+};
diff --git a/addons/web_livechat/static/src/xml/web_livechat.xml b/addons/web_livechat/static/src/xml/web_livechat.xml
new file mode 100644
index 00000000000..b5e2db515b0
--- /dev/null
+++ b/addons/web_livechat/static/src/xml/web_livechat.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+    <t t-name="Header-LiveChat">
+        <div class="livechat block logout"></div>
+    </t> 
+</templates>
diff --git a/addons/web_livechat/web/__init__.py b/addons/web_livechat/web/__init__.py
deleted file mode 100644
index ec026b194f1..00000000000
--- a/addons/web_livechat/web/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-##############################################################################
-# This file is part of the "web-livechatinc-odoo" OpenERP module.
-# See LICENCE file at the root of the module folder.
-##############################################################################
-import editors
diff --git a/addons/web_livechat/web/editors.py b/addons/web_livechat/web/editors.py
deleted file mode 100644
index bb3dd3da354..00000000000
--- a/addons/web_livechat/web/editors.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import openobject.templating
-
-class BaseTemplateEditor(openobject.templating.TemplateEditor):
-    templates = ['/openobject/controllers/templates/base.mako']
-
-    def edit(self, template, template_text):
-        output = super(BaseTemplateEditor, self).edit(template, template_text)
-
-        end_head = output.index('</head>')
-
-        output = output[:end_head] + """
-    <link rel="stylesheet" type="text/css" href="/web_livechat/static/css/lc.css"/>
-    <%
-        cp.session['livechat'] = rpc.RPCProxy('publisher_warranty.contract').is_livechat_enable()
-    %>
-    % if cp.session['livechat']:
-<script type="text/javascript">
-
-  (function() {
-    var lc_params = '';
-    var lc_lang = 'en';
-    var lc_skill = '0';
-
-    var lc = document.createElement('script'); lc.type = 'text/javascript'; lc.async = true;
-    var lc_src = ('https:' == document.location.protocol ? 'https://' : 'http://');
-        lc_src += 'chat.livechatinc.net/licence/1035052/script.cgi?lang='+lc_lang+unescape('%26')+'groups='+lc_skill;
-        lc_src += ((lc_params == '') ? '' : unescape('%26')+'params='+encodeURIComponent(encodeURIComponent(lc_params))); lc.src = lc_src;
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(lc, s);
-  })();
-
-</script>
-    % endif
-        """ + output[end_head:]
-
-        return output
-
-
-class HeaderTemplateEditor(openobject.templating.TemplateEditor):
-    templates = ['/openerp/controllers/templates/header.mako']
-
-
-    def edit(self, template, template_text):
-        output = super(HeaderTemplateEditor, self).edit(template, template_text)
-
-        PATTERN = '<div id="corner">'
-        corner = output.index(PATTERN) + len(PATTERN)
-
-
-        output = output[:corner] + """
-            <p id="livechat_status" class="logout">
-                ${ rpc.RPCProxy('publisher_warranty.contract').get_default_livechat_text() | n}
-            </p>
-            % if cp.session['livechat']:
-
-                <script type="text/javascript">
-                  var __lc_buttons = __lc_buttons || [];
-                  __lc_buttons.push({
-                    elementId: 'livechat_status',
-                    language: 'en',
-                    skill: '0',
-                    type: 'text',
-                    labels: {
-                      online: '<img src="/web_livechat/static/images/available.png"/>Support',
-                      offline: '<img src="/web_livechat/static/images/away.png"/>Support'
-                    }
-                  });
-                </script>
-
-            % endif
-        """ + output[corner:]
-        return output
-
diff --git a/addons/web_uservoice/LICENSE b/addons/web_uservoice/LICENSE
index 27a1a4cf453..ff64be448e9 100644
--- a/addons/web_uservoice/LICENSE
+++ b/addons/web_uservoice/LICENSE
@@ -1,5 +1,5 @@
 OpenERP, Open Source Management Solution
-Copyright © 2010 OpenERP SA (<http://openerp.com>).
+Copyright © 2010-2011 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
diff --git a/addons/web_uservoice/__init__.py b/addons/web_uservoice/__init__.py
index 723a87ab410..ac2fe14a5c1 100644
--- a/addons/web_uservoice/__init__.py
+++ b/addons/web_uservoice/__init__.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2011 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
@@ -17,3 +17,6 @@
 #    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/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py
index cc248e90da7..41f80d4f7d1 100644
--- a/addons/web_uservoice/__openerp__.py
+++ b/addons/web_uservoice/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2011 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
@@ -20,8 +20,8 @@
 ##############################################################################
 {
     'name': 'Receive User Feedback',
-    'version': '1.0',
-    'category': 'Tools',
+    'version': '2.0',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Add Feedback button in header.
@@ -35,7 +35,14 @@ Invite OpenERP user feedback, powered by uservoice.
     'data': [],
     'installable': True,
     'active': False,
-    'web': True,
     'certificate': '0040452504963885',
-    'images': ['images/submit_an_idea.jpeg','images/web_uservoice_feedback.jpeg'],
+
+    'js': ['static/src/js/web_uservoice.js'],
+    'css': ['static/src/css/uservoice.css'],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
+    'images': ['static/src/img/submit_an_idea.jpeg', 'static/src/img/web_uservoice_feedback.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_uservoice/i18n/ar.po b/addons/web_uservoice/i18n/ar.po
new file mode 100644
index 00000000000..da380392c1b
--- /dev/null
+++ b/addons/web_uservoice/i18n/ar.po
@@ -0,0 +1,29 @@
+# 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: 2011-01-12 16:15+0000\n"
+"PO-Revision-Date: 2011-09-04 17:32+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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "أضف زر خدمة uservoice في الأعلي"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "إقتراحات"
diff --git a/addons/web_uservoice/i18n/bg.po b/addons/web_uservoice/i18n/bg.po
index 9fbd2d343d6..d36e99b18f8 100644
--- a/addons/web_uservoice/i18n/bg.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/ca.po b/addons/web_uservoice/i18n/ca.po
index 019e409474f..201fbddba33 100644
--- a/addons/web_uservoice/i18n/ca.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/de.po b/addons/web_uservoice/i18n/de.po
index 24f90832c03..c5272746cdd 100644
--- a/addons/web_uservoice/i18n/de.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/es.po b/addons/web_uservoice/i18n/es.po
index 7649ea5924a..bb2086b4126 100644
--- a/addons/web_uservoice/i18n/es.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/es_MX.po b/addons/web_uservoice/i18n/es_MX.po
new file mode 100644
index 00000000000..b0220ed468d
--- /dev/null
+++ b/addons/web_uservoice/i18n/es_MX.po
@@ -0,0 +1,29 @@
+# Spanish 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-12 16:15+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "Añadir botón vozusuario en la cabecera"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "comentarios"
diff --git a/addons/web_uservoice/i18n/es_VE.po b/addons/web_uservoice/i18n/es_VE.po
new file mode 100644
index 00000000000..b0220ed468d
--- /dev/null
+++ b/addons/web_uservoice/i18n/es_VE.po
@@ -0,0 +1,29 @@
+# Spanish 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-12 16:15+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+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: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "Añadir botón vozusuario en la cabecera"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "comentarios"
diff --git a/addons/web_uservoice/i18n/fi.po b/addons/web_uservoice/i18n/fi.po
index 5aef806a5b1..56389806e87 100644
--- a/addons/web_uservoice/i18n/fi.po
+++ b/addons/web_uservoice/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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/fr.po b/addons/web_uservoice/i18n/fr.po
index dc19e6a5061..2c14886a493 100644
--- a/addons/web_uservoice/i18n/fr.po
+++ b/addons/web_uservoice/i18n/fr.po
@@ -14,16 +14,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
 msgid "Add uservoice button in header"
-msgstr ""
+msgstr "Ajouter un bouton \"vécu utilisateur\" dans l'entête"
 
 #. module: web_uservoice
 #: code:addons/web_uservoice/web/editors.py:72
 #, python-format
 msgid "feedback"
-msgstr ""
+msgstr "retour d'expérience"
diff --git a/addons/web_uservoice/i18n/gl.po b/addons/web_uservoice/i18n/gl.po
index 29f8a4e1ac3..21c32a114a8 100644
--- a/addons/web_uservoice/i18n/gl.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/it.po b/addons/web_uservoice/i18n/it.po
index a0a71794ce5..994e0342efe 100644
--- a/addons/web_uservoice/i18n/it.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/nl.po b/addons/web_uservoice/i18n/nl.po
index 64614afd0f1..f190987120b 100644
--- a/addons/web_uservoice/i18n/nl.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/oc.po b/addons/web_uservoice/i18n/oc.po
new file mode 100644
index 00000000000..3867b8c4947
--- /dev/null
+++ b/addons/web_uservoice/i18n/oc.po
@@ -0,0 +1,29 @@
+# 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: 2011-01-12 16:15+0000\n"
+"PO-Revision-Date: 2011-11-20 09:28+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "Apondre un boton \"viscut utilizaire\" dins l'entèsta"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "retorn d'experiéncia"
diff --git a/addons/web_uservoice/i18n/pt_BR.po b/addons/web_uservoice/i18n/pt_BR.po
index f21ca54d2d2..290fc86f734 100644
--- a/addons/web_uservoice/i18n/pt_BR.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/ru.po b/addons/web_uservoice/i18n/ru.po
index 8a8e58ca4eb..ef5015e228c 100644
--- a/addons/web_uservoice/i18n/ru.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/sk.po b/addons/web_uservoice/i18n/sk.po
index bb0d4f1c2bc..fa0ba3f6237 100644
--- a/addons/web_uservoice/i18n/sk.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/sl.po b/addons/web_uservoice/i18n/sl.po
index 8596d1ea0d3..e0653d7b1ed 100644
--- a/addons/web_uservoice/i18n/sl.po
+++ b/addons/web_uservoice/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: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/sr@latin.po b/addons/web_uservoice/i18n/sr@latin.po
new file mode 100644
index 00000000000..94baa7399d6
--- /dev/null
+++ b/addons/web_uservoice/i18n/sr@latin.po
@@ -0,0 +1,29 @@
+# Serbian Latin 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-12 16:15+0000\n"
+"PO-Revision-Date: 2011-10-17 13:41+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: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "Dodaj dugme ''mišljenje korisnika'' na zaglavlju"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "povratne informacije"
diff --git a/addons/web_uservoice/i18n/tr.po b/addons/web_uservoice/i18n/tr.po
index c7544c46879..225c8dadc07 100644
--- a/addons/web_uservoice/i18n/tr.po
+++ b/addons/web_uservoice/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: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
diff --git a/addons/web_uservoice/i18n/zh_CN.po b/addons/web_uservoice/i18n/zh_CN.po
index 8e1bdfc03a1..65276d117fd 100644
--- a/addons/web_uservoice/i18n/zh_CN.po
+++ b/addons/web_uservoice/i18n/zh_CN.po
@@ -14,16 +14,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: web_uservoice
 #: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
 msgid "Add uservoice button in header"
-msgstr ""
+msgstr "添加语音按钮"
 
 #. module: web_uservoice
 #: code:addons/web_uservoice/web/editors.py:72
 #, python-format
 msgid "feedback"
-msgstr ""
+msgstr "反馈"
diff --git a/addons/web_uservoice/web/static/css/uservoice.css b/addons/web_uservoice/static/src/css/uservoice.css
similarity index 52%
rename from addons/web_uservoice/web/static/css/uservoice.css
rename to addons/web_uservoice/static/src/css/uservoice.css
index 9ca2af55678..665ccee7f6e 100644
--- a/addons/web_uservoice/web/static/css/uservoice.css
+++ b/addons/web_uservoice/static/src/css/uservoice.css
@@ -1,7 +1,7 @@
-#corner p.feedback a {
+div.header_corner div.feedback a {
     /*color: #9a0404;*/
 }
-#corner p.feedback img {
+div.header_corner div.feedback img {
     vertical-align: middle;
     margin-right: 0.5em;
 }
diff --git a/addons/web_uservoice/static/src/js/web_uservoice.js b/addons/web_uservoice/static/src/js/web_uservoice.js
new file mode 100644
index 00000000000..4110f149300
--- /dev/null
+++ b/addons/web_uservoice/static/src/js/web_uservoice.js
@@ -0,0 +1,78 @@
+
+openerp.web_uservoice = function(instance) {
+
+instance.web_uservoice.UserVoice = instance.web.Widget.extend({
+    template: 'Header-UserVoice',
+    default_forum: '77459',
+
+    init: function() {
+        this._super.apply(this, arguments);
+        this.uservoiceForums = {};
+        this.uservoiceOptions = {
+            key: 'openerpsa',
+            host: 'feedback.openerp.com',
+            forum: this.default_forum,
+            lang: 'en',
+            showTab: false
+        };
+
+        instance.webclient.menu.do_menu_click.add_first(this.do_menu_click);
+    },
+
+    start: function() {
+        this._super();
+
+        var self = this;
+        var forum_mapping = {
+            'accounting': '87921',
+            'administration': '87935',
+            'human resources': '87923',
+            'knowledge': '87927',
+            'manufacturing': '87915',
+            'marketing': '87925',
+            'point of sale': '87929',
+            'project': '87919',
+            'purchases': '87911',
+            'sales': '87907',
+            'tools': '87933',
+            'warehouse': '87913',
+        };
+
+        var ds = new instance.web.DataSetSearch(this, 'ir.ui.menu', {lang: 'NO_LANG'}, [['parent_id', '=', false]]);
+
+        ds.read_slice(['name'], null, function(result) {
+            _.each(result, function(menu) {
+                self.uservoiceForums[menu.id] = forum_mapping[menu.name.toLowerCase()] || self.default_forum;
+            });
+        });
+        
+        this.$element.find('a').click(function(e) {
+            e.preventDefault();
+            UserVoice.Popin.show(self.uservoiceOptions);
+            return false;
+        });
+    },
+
+
+    do_menu_click: function($clicked_menu, manual) {
+        var id = $clicked_menu.attr('data-menu');
+        if (id) {
+            this.uservoiceOptions.forum = this.uservoiceForums[id] || this.default_forum;
+        }
+    },
+
+});
+
+
+if (instance.webclient) {
+    $(function() {
+        var src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js";
+        $.getScript(src);
+    });
+
+    instance.webclient.uservoice = new instance.web_uservoice.UserVoice(instance.webclient);
+    instance.webclient.uservoice.prependTo('div.header_corner');
+}
+
+};
+
diff --git a/addons/web_uservoice/static/src/xml/web_uservoice.xml b/addons/web_uservoice/static/src/xml/web_uservoice.xml
new file mode 100644
index 00000000000..e37ed2c17d3
--- /dev/null
+++ b/addons/web_uservoice/static/src/xml/web_uservoice.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+    <t t-name="Header-UserVoice">
+        <div class="block logout feedback"><a href="#"><img src="/web_uservoice/static/src/img/uv_favicon.png" />feedback</a></div>
+    </t> 
+</templates>
diff --git a/addons/web_uservoice/web/__init__.py b/addons/web_uservoice/web/__init__.py
deleted file mode 100644
index c651b91f353..00000000000
--- a/addons/web_uservoice/web/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-import editors
-import controllers
-
diff --git a/addons/web_uservoice/web/controllers.py b/addons/web_uservoice/web/controllers.py
deleted file mode 100644
index 07376ee8fed..00000000000
--- a/addons/web_uservoice/web/controllers.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from openerp.controllers import SecuredController
-from openobject import rpc
-from openobject.tools import expose
-import cherrypy
-
-class Root(SecuredController):
-
-    _cp_path = "/openerp"
-
-    @expose(mark_only=True)
-    def menu(self, active=None, next=None):
-        try:
-            menu_id = int(active)
-        except (TypeError, ValueError):
-            menu_id = False
-
-        menus = rpc.RPCProxy("ir.ui.menu")
-        ids = menus.search([('parent_id', '=', False)])
-        if next or active:
-            if not menu_id and ids:
-                menu_id = ids[0]
-
-        menu = ''
-        if menu_id:
-            ctx = dict(lang='NO_LANG')  # force loading original string even if the english have been translated...
-            menu = menus.read([menu_id], ['name'], ctx)[0]['name'] or ''
-
-        general_forum = 77459
-        forum = {
-            'accounting': 87921,
-            'administration': 87935,
-            'human resources': 87923,
-            'knowledge': 87927,
-            'manufacturing': 87915,
-            'marketing': 87925,
-            'point of sale': 87929,
-            'project': 87919,
-            'purchases': 87911,
-            'sales': 87907,
-            'tools': 87933,
-            'warehouse': 87913,
-        }.get(menu.lower().strip(), general_forum)
-
-        cherrypy.request.uservoice_forum = forum
-        return super(Root, self).menu(active, next)
-
-
diff --git a/addons/web_uservoice/web/editors.py b/addons/web_uservoice/web/editors.py
deleted file mode 100644
index 585bc3428f3..00000000000
--- a/addons/web_uservoice/web/editors.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-import openobject.templating
-
-class BaseTemplateEditor(openobject.templating.TemplateEditor):
-    templates = ['/openobject/controllers/templates/base.mako']
-
-    def edit(self, template, template_text):
-        output = super(BaseTemplateEditor, self).edit(template, template_text)
-
-        end_head = output.index('</head>')
-
-        output = output[:end_head] + """
-<link rel="stylesheet" type="text/css" href="/web_uservoice/static/css/uservoice.css"/>
-        """ + output[end_head:]
-
-
-        end_body = output.index('</body>')
-
-        # testing forum: 84397
-        output = output[:end_body] + """
-<script type="text/javascript">
-  var uservoiceOptions = {
-    key: 'openerpsa',
-    host: 'feedback.openerp.com',
-    forum: '${getattr(cp.request, 'uservoice_forum', 77459)}',
-    lang: 'en',
-    showTab: false
-  };
-  function _loadUserVoice() {
-    var s = document.createElement('script');
-    s.src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js";
-    document.getElementsByTagName('head')[0].appendChild(s);
-  }
-  _loadSuper = window.onload;
-  window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
-</script>
-        """ + output[end_body:]
-
-        return output
-
-
-class HeaderTemplateEditor(openobject.templating.TemplateEditor):
-    templates = ['/openerp/controllers/templates/header.mako']
-
-    def edit(self, template, template_text):
-        output = super(HeaderTemplateEditor, self).edit(template, template_text)
-
-        PAT = '<ul class="tools">'
-
-        ul = output.index(PAT)
-        output = output[:ul] + ("""
-            <p class="logout feedback"><a href="#" onclick="UserVoice.Popin.show(uservoiceOptions); return false;"><img src="/web_uservoice/static/images/uv_favicon.png" />%s</a></p>
-        """ % _('feedback')) + output[ul:]
-
-
-        return output
-
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index cf2234b4386..1c6aae0baaf 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki',
+    'name': 'Collaborative Content (Wiki)',
     'version': '1.0.1',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 The base module to manage documents(wiki).
diff --git a/addons/wiki/i18n/ar.po b/addons/wiki/i18n/ar.po
index 3ddb52bfd4d..38448d6d962 100644
--- a/addons/wiki/i18n/ar.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/bg.po b/addons/wiki/i18n/bg.po
index 7e3135c0719..3a35fcad60e 100644
--- a/addons/wiki/i18n/bg.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/bs.po b/addons/wiki/i18n/bs.po
index 789fe24b6b1..9aa83f85987 100644
--- a/addons/wiki/i18n/bs.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/ca.po b/addons/wiki/i18n/ca.po
index 8243663b8b5..ce86b6c729a 100644
--- a/addons/wiki/i18n/ca.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/cs.po b/addons/wiki/i18n/cs.po
index ae2758384fe..d32be1a5b10 100644
--- a/addons/wiki/i18n/cs.po
+++ b/addons/wiki/i18n/cs.po
@@ -4,17 +4,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-10-30 13:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2011-09-05 06:39+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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -30,13 +31,13 @@ msgstr "Wiki stránky"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Metoda zobrazení"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,create_uid:0
 msgid "Author"
-msgstr "Tvůrce"
+msgstr "Autor"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
@@ -57,7 +58,7 @@ msgstr "Sekce"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Udává, zda tato stránka má nebo nemá obsah"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -68,7 +69,7 @@ msgstr "Wiki historie"
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr "Malá editace"
+msgstr "Malá úprava"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -79,18 +80,18 @@ msgstr "Obsah"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Podřízené stránky"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Nadřazená stránka"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Poslední přispěvatel"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +101,7 @@ msgstr "Rodičovská nabídka"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Téma, také nazývané Wiki skupina"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -117,29 +118,29 @@ msgstr "Název"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Průvodce vytvořením nabídky"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr "Linky historie"
+msgstr "Řádky historie"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr ""
+msgstr "Obsah stránky"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varování !"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "V revizích nejsou žádné změny"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
@@ -149,7 +150,7 @@ msgstr "Správa dokumentů - Wiki"
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
 msgid "Menu Name"
-msgstr "Jméno v menu"
+msgstr "Jméno nabídky"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
@@ -159,7 +160,7 @@ msgstr "Popis"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "Potřebuje kontrolu"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,6 +168,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Udává, že tato stránka potřebuje zkontrolovat, zvyšuje pozornost ostatních "
+"přispěvatelů"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -177,12 +180,12 @@ msgstr "Informace nabídky"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "Historie stránky"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "Strom"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -192,7 +195,7 @@ msgstr "Šablona stránky"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "Klíčová slova"
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -202,6 +205,11 @@ 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 ""
+"S Wiki stránkami můžete sdílet vaše nápady a otázky s vašimi "
+"spolupracovníky. Můžete vytvořit nový dokument, který může odkazovat na "
+"jednu nebo několik aplikací (CRM, Prodeje, aj.). Můžete použít klíčová slova "
+"pro přístup k vašim wiki stránkám. Pro formátování textu jsou základní wiki "
+"úpravy."
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
@@ -229,7 +237,7 @@ msgstr "Chcete vytvořit index na vybraných stránkách ? "
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "Rozdíly"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -239,17 +247,17 @@ msgstr "Stránky"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr ""
+msgstr "Popis skupiny"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr ""
+msgstr "Používá kód sekce stránky jako 1.2.1"
 
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Chcete otevřít wiki stránku? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -264,7 +272,7 @@ msgstr "Textová plocha"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr ""
+msgstr "Meta informace"
 
 #. module: wiki
 #: model:ir.module.module,description:wiki.module_meta_information
@@ -275,6 +283,11 @@ msgid ""
 "keep track for the wiki groups, pages, and history\n"
 "    "
 msgstr ""
+"\n"
+"Základní modul pro správu dokumentů(wiki)\n"
+"\n"
+"udržuje přehled o wiki skupinách, stránkách a historii\n"
+"    "
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -286,11 +299,12 @@ msgstr "Poznámky"
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
 msgstr ""
+"Pokud je metoda zobrazení Domovská stránka, vyžaduje výběr domovské stránky."
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr ""
+msgstr "Seznam"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -301,7 +315,7 @@ msgstr "Shrnutí"
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr "Vytvořené datum"
+msgstr "Datum vytvoření"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
@@ -316,12 +330,12 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "Určuje výchozí chování nabídky vytvořené pro tuto skupinu"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "Zavřít"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -337,17 +351,17 @@ msgstr "Wiki Id"
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "Domovská stránka"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Umožňuje vám propojit s jinými stránkami v aktuálním téma"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Informace o úpravách"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -377,12 +391,12 @@ msgstr "Vytvořit index"
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
+msgstr "Musíte vybrat nejméně 1 nebo nejvíce 2 revize historie!"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr ""
+msgstr "Seskupit podle..."
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -390,12 +404,12 @@ msgstr ""
 #: view:wiki.groups:0
 #: view:wiki.make.index:0
 msgid "Create Menu"
-msgstr "Vytvořit menu"
+msgstr "Vytvořit nabídku"
 
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr "Toto je velká editace ?"
+msgstr "Toto je velká úprava ?"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -409,7 +423,7 @@ msgstr "Wiki skupiny"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr ""
+msgstr "Téma"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -427,12 +441,12 @@ msgstr "Obsah"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Otevřít Wiki stránku"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "průvodce otevřením stránky"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -454,12 +468,12 @@ msgstr "Potřebuje kontrolu"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Stránky čekající na kontrolu"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "Hledat stránku"
 
 #~ msgid "Child Groups"
 #~ msgstr "Dětské skupiny"
diff --git a/addons/wiki/i18n/de.po b/addons/wiki/i18n/de.po
index 2c45c34dda4..e48d27577fd 100644
--- a/addons/wiki/i18n/de.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -532,28 +532,3 @@ msgstr "Suche Seite"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "Wiki Pages  allows you to share ideas and questions with your coworkers. You "
-#~ "can create a new document that can be link to one or several applications "
-#~ "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
-#~ "There is a basic wiki editing for text format."
-#~ msgstr ""
-#~ "Wikis ermöglichen Ihnen und ihren Mitarbeitern einen effizienten Austausch "
-#~ "von Wissen aber auch Fragen und Antworten als Plattform des Unternehmens "
-#~ "Know How. Sie können einfach ein neues Dokument erstellen und dieses dann "
-#~ "mit Ihren Anwendungen (z.B. CRM, Verkauf) verknüpfen. Sie können "
-#~ "Schlüsselwörter definieren, die eine einfache Suche nach Dokumenten "
-#~ "erleichtern. Die Texte werden in einem Standard Wiki Format editiert."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/wiki/i18n/el.po b/addons/wiki/i18n/el.po
index 55d7e6ffab3..899ce13a8cb 100644
--- a/addons/wiki/i18n/el.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index 868670e587d..21b7cefa743 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -533,27 +533,3 @@ msgstr "Buscar página"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid ""
-#~ "Wiki Pages  allows you to share ideas and questions with your coworkers. You "
-#~ "can create a new document that can be link to one or several applications "
-#~ "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
-#~ "There is a basic wiki editing for text format."
-#~ msgstr ""
-#~ "Las páginas wiki le permite compartir ideas y preguntas con sus compañeros "
-#~ "de trabajo. Puede crear un documento nuevo que se puede vincular a una o "
-#~ "varias aplicaciones (CRM, Ventas, ...). Puede utilizar palabras clave para "
-#~ "facilitar el acceso a las páginas wiki. Se dispone de una edición básica "
-#~ "wiki para dar formato al texto."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/wiki/i18n/es_AR.po b/addons/wiki/i18n/es_AR.po
index e1a7702edb5..89e1f313a97 100644
--- a/addons/wiki/i18n/es_AR.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/es_MX.po b/addons/wiki/i18n/es_MX.po
new file mode 100644
index 00000000000..13ac328d21e
--- /dev/null
+++ b/addons/wiki/i18n/es_MX.po
@@ -0,0 +1,535 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* wiki
+#
+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-13 02:46+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:38+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki
+#: field:wiki.groups,template:0
+msgid "Wiki Template"
+msgstr "Plantilla Wiki"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
+msgid "Wiki Pages"
+msgstr "Páginas Wiki"
+
+#. module: wiki
+#: field:wiki.groups,method:0
+msgid "Display Method"
+msgstr "Método de visualización"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,create_uid:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
+#: view:wiki.wiki.page.open:0
+msgid "Open Page"
+msgstr "Abrir página"
+
+#. module: wiki
+#: field:wiki.groups,menu_id:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: wiki
+#: field:wiki.wiki,section:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: wiki
+#: help:wiki.wiki,toc:0
+msgid "Indicates that this pages have a table of contents or not"
+msgstr "Indica si estas páginas tienen una tabla de contenidos o no."
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_history
+#: view:wiki.wiki.history:0
+msgid "Wiki History"
+msgstr "Historial Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,minor_edit:0
+msgid "Minor edit"
+msgstr "Edición menor"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,text_area:0
+msgid "Content"
+msgstr "Contenido"
+
+#. module: wiki
+#: field:wiki.wiki,child_ids:0
+msgid "Child Pages"
+msgstr "Páginas hijas"
+
+#. module: wiki
+#: field:wiki.wiki,parent_id:0
+msgid "Parent Page"
+msgstr "Página padre"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,write_uid:0
+msgid "Last Contributor"
+msgstr "Último colaborador"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: wiki
+#: help:wiki.wiki,group_id:0
+msgid "Topic, also called Wiki Group"
+msgstr "Tema, también denominado Grupo wiki."
+
+#. module: wiki
+#: field:wiki.groups,name:0
+#: view:wiki.wiki:0
+#: field:wiki.wiki,group_id:0
+msgid "Wiki Group"
+msgstr "Grupo Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_create_menu
+msgid "Wizard Create Menu"
+msgstr "Asistente crear menú"
+
+#. module: wiki
+#: field:wiki.wiki,history_id:0
+msgid "History Lines"
+msgstr "Líneas historial"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Page Content"
+msgstr "Contenido página"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:236
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:236
+#, python-format
+msgid "There are no changes in revisions"
+msgstr "No hay cambios en revisiones"
+
+#. module: wiki
+#: model:ir.module.module,shortdesc:wiki.module_meta_information
+msgid "Document Management - Wiki"
+msgstr "Gestión de documentos - Wiki"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: wiki
+#: field:wiki.groups,notes:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: wiki
+#: field:wiki.wiki,review:0
+msgid "Needs Review"
+msgstr "Necesita revisión"
+
+#. module: wiki
+#: help:wiki.wiki,review:0
+msgid ""
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
+msgstr ""
+"Indica que esta página debería ser revisada, captando la atención de otros "
+"colaboradores."
+
+#. module: wiki
+#: view:wiki.create.menu:0
+#: view:wiki.make.index:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
+msgid "Page History"
+msgstr "Historial página"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "Tree"
+msgstr "Árbol"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Page Template"
+msgstr "Plantilla de página"
+
+#. module: wiki
+#: field:wiki.wiki,tags:0
+msgid "Keywords"
+msgstr "Palabras clave"
+
+#. module: wiki
+#: model:ir.actions.act_window,help:wiki.action_wiki
+msgid ""
+"With Wiki Pages you can share ideas and questions with your coworkers. You "
+"can create a new document that can be linked to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
+msgstr ""
+"Con páginas wiki puede compartir ideas y preguntas con sus compañeros de "
+"trabajo. Puede crear un nuevo documento que puede ser relacionado con una o "
+"varias aplicaciones (CRM, Ventas, etc.). Puede utilizar palabras clave para "
+"facilitar el acceso a sus páginas wiki. Existe un editor básico para el "
+"formato texto del wiki."
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: wiki
+#: field:wiki.wiki,create_date:0
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: wiki
+#: field:wiki.wiki.history,create_date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: wiki
+#: view:wiki.make.index:0
+msgid "Want to create a Index on Selected Pages ? "
+msgstr "¿Desea crear un índice sobre las páginas seleccionadas? "
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
+#: view:wizard.wiki.history.show_diff:0
+msgid "Difference"
+msgstr "Diferencia"
+
+#. module: wiki
+#: field:wiki.groups,page_ids:0
+msgid "Pages"
+msgstr "Páginas"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Group Description"
+msgstr "Descripción grupo"
+
+#. module: wiki
+#: help:wiki.wiki,section:0
+msgid "Use page section code like 1.2.1"
+msgstr "Utilice código de sección de la página, por ejemplo 1.2.1"
+
+#. module: wiki
+#: view:wiki.wiki.page.open:0
+msgid "Want to open a wiki page? "
+msgstr "¿Desea abrir una página wiki? "
+
+#. module: wiki
+#: field:wiki.groups,section:0
+msgid "Make Section ?"
+msgstr "¿Crear sección?"
+
+#. module: wiki
+#: field:wiki.wiki.history,text_area:0
+msgid "Text area"
+msgstr "Área de texto"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Meta Information"
+msgstr "Meta información"
+
+#. module: wiki
+#: model:ir.module.module,description:wiki.module_meta_information
+msgid ""
+"\n"
+"The base module to manage documents(wiki)\n"
+"\n"
+"keep track for the wiki groups, pages, and history\n"
+"    "
+msgstr ""
+"\n"
+"El módulo base para gestionar documentos (wiki)\n"
+"\n"
+"gestione los grupos, páginas e historial del wiki\n"
+"    "
+
+#. module: wiki
+#: view:wiki.groups:0
+#: view:wizard.wiki.history.show_diff:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: wiki
+#: help:wiki.groups,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr ""
+"Es obligado seleccionar la página de inicio si el método de visualización es "
+"Página inicial."
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "List"
+msgstr "Lista"
+
+#. module: wiki
+#: field:wiki.wiki,summary:0
+#: field:wiki.wiki.history,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: wiki
+#: field:wiki.groups,create_date:0
+msgid "Created Date"
+msgstr "Fecha de creación"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_history
+msgid "All Page Histories"
+msgstr "Todos los historiales de páginas"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki
+msgid "wiki.wiki"
+msgstr "wiki.wiki"
+
+#. module: wiki
+#: help:wiki.groups,method:0
+msgid "Define the default behaviour of the menu created on this group"
+msgstr "Define el comportamiento por defecto del menú creado en este grupo."
+
+#. module: wiki
+#: view:wizard.wiki.history.show_diff:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
+msgid "wizard.wiki.history.show_diff"
+msgstr "asistente.wiki.historial.mostrar_dif"
+
+#. module: wiki
+#: field:wiki.wiki.history,wiki_id:0
+msgid "Wiki Id"
+msgstr "ID Wiki"
+
+#. module: wiki
+#: field:wiki.groups,home:0
+#: selection:wiki.groups,method:0
+msgid "Home Page"
+msgstr "Página inicial"
+
+#. module: wiki
+#: help:wiki.wiki,parent_id:0
+msgid "Allows you to link with the other page with in the current topic"
+msgstr "Le permite enlazar con la otra página dentro del tema actual."
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Modification Information"
+msgstr "Información modificación"
+
+#. module: wiki
+#: model:ir.ui.menu,name:wiki.menu_wiki_configuration
+#: view:wiki.wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,write_date:0
+msgid "Modification Date"
+msgstr "Fecha de modificación"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
+#: model:ir.model,name:wiki.model_wiki_make_index
+#: view:wiki.make.index:0
+msgid "Create Index"
+msgstr "Crear índice"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgstr ""
+"¡Debe seleccionar como mínimo 1 o como máximo 2 revisiones históricas!"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
+#: view:wiki.create.menu:0
+#: view:wiki.groups:0
+#: view:wiki.make.index:0
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: wiki
+#: field:wiki.wiki.history,minor_edit:0
+msgid "This is a major edit ?"
+msgstr "¿Es ésta una edición mayor?"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
+#: model:ir.model,name:wiki.model_wiki_groups
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups
+#: view:wiki.groups:0
+msgid "Wiki Groups"
+msgstr "Grupos Wiki"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Topic"
+msgstr "Tema"
+
+#. module: wiki
+#: field:wiki.wiki.history,write_uid:0
+msgid "Modify By"
+msgstr "Modificado por"
+
+#. module: wiki
+#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
+#: field:wiki.wiki,toc:0
+#, python-format
+msgid "Table of Contents"
+msgstr "Tabla de contenido"
+
+#. module: wiki
+#: view:wiki.groups:0
+#: view:wiki.wiki.page.open:0
+msgid "Open Wiki Page"
+msgstr "Abrir página wiki"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_page_open
+msgid "wiz open page"
+msgstr "asistente abrir página"
+
+#. module: wiki
+#: view:wiki.create.menu:0
+#: view:wiki.make.index:0
+#: view:wiki.wiki.page.open:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: wiki
+#: field:wizard.wiki.history.show_diff,file_path:0
+msgid "Diff"
+msgstr "Dif."
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Need Review"
+msgstr "Necesita revisión"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_review
+msgid "Pages Waiting Review"
+msgstr "Páginas esperando revisión"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
+msgid "Search Page"
+msgstr "Buscar página"
+
+#~ 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 "Wiki Groups Links"
+#~ msgstr "Enlaces grupos wiki"
+
+#~ msgid "Child Groups"
+#~ msgstr "Grupos hijos"
+
+#~ msgid "Wiki Configuration"
+#~ msgstr "Configuración Wiki"
+
+#~ msgid "Create a Menu"
+#~ msgstr "Crear un menú"
+
+#~ msgid "History Differance"
+#~ msgstr "Diferencia historial"
+
+#~ msgid "Group Home Page"
+#~ msgstr "Página de inicio del grupo"
+
+#~ msgid "Last Author"
+#~ msgstr "Último autor"
+
+#~ msgid "Differences"
+#~ msgstr "Diferencias"
+
+#~ msgid "Document Management"
+#~ msgstr "Gestión de documentos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Parent Group"
+#~ msgstr "Grupo padre"
+
+#~ msgid "Wiki Differance"
+#~ msgstr "Diferencia Wiki"
+
+#, python-format
+#~ msgid "No action found"
+#~ msgstr "No se ha encontrado la acción"
+
+#~ msgid "Modifications"
+#~ msgstr "Modificaciones"
+
+#~ msgid "History"
+#~ msgstr "Historial"
+
+#~ msgid "Tags"
+#~ msgstr "Etiquetas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/wiki/i18n/es_VE.po b/addons/wiki/i18n/es_VE.po
new file mode 100644
index 00000000000..13ac328d21e
--- /dev/null
+++ b/addons/wiki/i18n/es_VE.po
@@ -0,0 +1,535 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* wiki
+#
+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-13 02:46+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:38+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki
+#: field:wiki.groups,template:0
+msgid "Wiki Template"
+msgstr "Plantilla Wiki"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
+msgid "Wiki Pages"
+msgstr "Páginas Wiki"
+
+#. module: wiki
+#: field:wiki.groups,method:0
+msgid "Display Method"
+msgstr "Método de visualización"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,create_uid:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
+#: view:wiki.wiki.page.open:0
+msgid "Open Page"
+msgstr "Abrir página"
+
+#. module: wiki
+#: field:wiki.groups,menu_id:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: wiki
+#: field:wiki.wiki,section:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: wiki
+#: help:wiki.wiki,toc:0
+msgid "Indicates that this pages have a table of contents or not"
+msgstr "Indica si estas páginas tienen una tabla de contenidos o no."
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_history
+#: view:wiki.wiki.history:0
+msgid "Wiki History"
+msgstr "Historial Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,minor_edit:0
+msgid "Minor edit"
+msgstr "Edición menor"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,text_area:0
+msgid "Content"
+msgstr "Contenido"
+
+#. module: wiki
+#: field:wiki.wiki,child_ids:0
+msgid "Child Pages"
+msgstr "Páginas hijas"
+
+#. module: wiki
+#: field:wiki.wiki,parent_id:0
+msgid "Parent Page"
+msgstr "Página padre"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,write_uid:0
+msgid "Last Contributor"
+msgstr "Último colaborador"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: wiki
+#: help:wiki.wiki,group_id:0
+msgid "Topic, also called Wiki Group"
+msgstr "Tema, también denominado Grupo wiki."
+
+#. module: wiki
+#: field:wiki.groups,name:0
+#: view:wiki.wiki:0
+#: field:wiki.wiki,group_id:0
+msgid "Wiki Group"
+msgstr "Grupo Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_create_menu
+msgid "Wizard Create Menu"
+msgstr "Asistente crear menú"
+
+#. module: wiki
+#: field:wiki.wiki,history_id:0
+msgid "History Lines"
+msgstr "Líneas historial"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Page Content"
+msgstr "Contenido página"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:236
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:236
+#, python-format
+msgid "There are no changes in revisions"
+msgstr "No hay cambios en revisiones"
+
+#. module: wiki
+#: model:ir.module.module,shortdesc:wiki.module_meta_information
+msgid "Document Management - Wiki"
+msgstr "Gestión de documentos - Wiki"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: wiki
+#: field:wiki.groups,notes:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: wiki
+#: field:wiki.wiki,review:0
+msgid "Needs Review"
+msgstr "Necesita revisión"
+
+#. module: wiki
+#: help:wiki.wiki,review:0
+msgid ""
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
+msgstr ""
+"Indica que esta página debería ser revisada, captando la atención de otros "
+"colaboradores."
+
+#. module: wiki
+#: view:wiki.create.menu:0
+#: view:wiki.make.index:0
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
+msgid "Page History"
+msgstr "Historial página"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "Tree"
+msgstr "Árbol"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Page Template"
+msgstr "Plantilla de página"
+
+#. module: wiki
+#: field:wiki.wiki,tags:0
+msgid "Keywords"
+msgstr "Palabras clave"
+
+#. module: wiki
+#: model:ir.actions.act_window,help:wiki.action_wiki
+msgid ""
+"With Wiki Pages you can share ideas and questions with your coworkers. You "
+"can create a new document that can be linked to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
+msgstr ""
+"Con páginas wiki puede compartir ideas y preguntas con sus compañeros de "
+"trabajo. Puede crear un nuevo documento que puede ser relacionado con una o "
+"varias aplicaciones (CRM, Ventas, etc.). Puede utilizar palabras clave para "
+"facilitar el acceso a sus páginas wiki. Existe un editor básico para el "
+"formato texto del wiki."
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: wiki
+#: field:wiki.wiki,create_date:0
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: wiki
+#: field:wiki.wiki.history,create_date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: wiki
+#: view:wiki.make.index:0
+msgid "Want to create a Index on Selected Pages ? "
+msgstr "¿Desea crear un índice sobre las páginas seleccionadas? "
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
+#: view:wizard.wiki.history.show_diff:0
+msgid "Difference"
+msgstr "Diferencia"
+
+#. module: wiki
+#: field:wiki.groups,page_ids:0
+msgid "Pages"
+msgstr "Páginas"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Group Description"
+msgstr "Descripción grupo"
+
+#. module: wiki
+#: help:wiki.wiki,section:0
+msgid "Use page section code like 1.2.1"
+msgstr "Utilice código de sección de la página, por ejemplo 1.2.1"
+
+#. module: wiki
+#: view:wiki.wiki.page.open:0
+msgid "Want to open a wiki page? "
+msgstr "¿Desea abrir una página wiki? "
+
+#. module: wiki
+#: field:wiki.groups,section:0
+msgid "Make Section ?"
+msgstr "¿Crear sección?"
+
+#. module: wiki
+#: field:wiki.wiki.history,text_area:0
+msgid "Text area"
+msgstr "Área de texto"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Meta Information"
+msgstr "Meta información"
+
+#. module: wiki
+#: model:ir.module.module,description:wiki.module_meta_information
+msgid ""
+"\n"
+"The base module to manage documents(wiki)\n"
+"\n"
+"keep track for the wiki groups, pages, and history\n"
+"    "
+msgstr ""
+"\n"
+"El módulo base para gestionar documentos (wiki)\n"
+"\n"
+"gestione los grupos, páginas e historial del wiki\n"
+"    "
+
+#. module: wiki
+#: view:wiki.groups:0
+#: view:wizard.wiki.history.show_diff:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: wiki
+#: help:wiki.groups,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr ""
+"Es obligado seleccionar la página de inicio si el método de visualización es "
+"Página inicial."
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "List"
+msgstr "Lista"
+
+#. module: wiki
+#: field:wiki.wiki,summary:0
+#: field:wiki.wiki.history,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: wiki
+#: field:wiki.groups,create_date:0
+msgid "Created Date"
+msgstr "Fecha de creación"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_history
+msgid "All Page Histories"
+msgstr "Todos los historiales de páginas"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki
+msgid "wiki.wiki"
+msgstr "wiki.wiki"
+
+#. module: wiki
+#: help:wiki.groups,method:0
+msgid "Define the default behaviour of the menu created on this group"
+msgstr "Define el comportamiento por defecto del menú creado en este grupo."
+
+#. module: wiki
+#: view:wizard.wiki.history.show_diff:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
+msgid "wizard.wiki.history.show_diff"
+msgstr "asistente.wiki.historial.mostrar_dif"
+
+#. module: wiki
+#: field:wiki.wiki.history,wiki_id:0
+msgid "Wiki Id"
+msgstr "ID Wiki"
+
+#. module: wiki
+#: field:wiki.groups,home:0
+#: selection:wiki.groups,method:0
+msgid "Home Page"
+msgstr "Página inicial"
+
+#. module: wiki
+#: help:wiki.wiki,parent_id:0
+msgid "Allows you to link with the other page with in the current topic"
+msgstr "Le permite enlazar con la otra página dentro del tema actual."
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Modification Information"
+msgstr "Información modificación"
+
+#. module: wiki
+#: model:ir.ui.menu,name:wiki.menu_wiki_configuration
+#: view:wiki.wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,write_date:0
+msgid "Modification Date"
+msgstr "Fecha de modificación"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
+#: model:ir.model,name:wiki.model_wiki_make_index
+#: view:wiki.make.index:0
+msgid "Create Index"
+msgstr "Crear índice"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgstr ""
+"¡Debe seleccionar como mínimo 1 o como máximo 2 revisiones históricas!"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
+#: view:wiki.create.menu:0
+#: view:wiki.groups:0
+#: view:wiki.make.index:0
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: wiki
+#: field:wiki.wiki.history,minor_edit:0
+msgid "This is a major edit ?"
+msgstr "¿Es ésta una edición mayor?"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
+#: model:ir.model,name:wiki.model_wiki_groups
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups
+#: view:wiki.groups:0
+msgid "Wiki Groups"
+msgstr "Grupos Wiki"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Topic"
+msgstr "Tema"
+
+#. module: wiki
+#: field:wiki.wiki.history,write_uid:0
+msgid "Modify By"
+msgstr "Modificado por"
+
+#. module: wiki
+#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
+#: field:wiki.wiki,toc:0
+#, python-format
+msgid "Table of Contents"
+msgstr "Tabla de contenido"
+
+#. module: wiki
+#: view:wiki.groups:0
+#: view:wiki.wiki.page.open:0
+msgid "Open Wiki Page"
+msgstr "Abrir página wiki"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_page_open
+msgid "wiz open page"
+msgstr "asistente abrir página"
+
+#. module: wiki
+#: view:wiki.create.menu:0
+#: view:wiki.make.index:0
+#: view:wiki.wiki.page.open:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: wiki
+#: field:wizard.wiki.history.show_diff,file_path:0
+msgid "Diff"
+msgstr "Dif."
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Need Review"
+msgstr "Necesita revisión"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_review
+msgid "Pages Waiting Review"
+msgstr "Páginas esperando revisión"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
+msgid "Search Page"
+msgstr "Buscar página"
+
+#~ 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 "Wiki Groups Links"
+#~ msgstr "Enlaces grupos wiki"
+
+#~ msgid "Child Groups"
+#~ msgstr "Grupos hijos"
+
+#~ msgid "Wiki Configuration"
+#~ msgstr "Configuración Wiki"
+
+#~ msgid "Create a Menu"
+#~ msgstr "Crear un menú"
+
+#~ msgid "History Differance"
+#~ msgstr "Diferencia historial"
+
+#~ msgid "Group Home Page"
+#~ msgstr "Página de inicio del grupo"
+
+#~ msgid "Last Author"
+#~ msgstr "Último autor"
+
+#~ msgid "Differences"
+#~ msgstr "Diferencias"
+
+#~ msgid "Document Management"
+#~ msgstr "Gestión de documentos"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Parent Group"
+#~ msgstr "Grupo padre"
+
+#~ msgid "Wiki Differance"
+#~ msgstr "Diferencia Wiki"
+
+#, python-format
+#~ msgid "No action found"
+#~ msgstr "No se ha encontrado la acción"
+
+#~ msgid "Modifications"
+#~ msgstr "Modificaciones"
+
+#~ msgid "History"
+#~ msgstr "Historial"
+
+#~ msgid "Tags"
+#~ msgstr "Etiquetas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/wiki/i18n/et.po b/addons/wiki/i18n/et.po
index fd5239466e8..1b2ab18b0df 100644
--- a/addons/wiki/i18n/et.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/fi.po b/addons/wiki/i18n/fi.po
index d4b48c70e1f..b9b3018579e 100644
--- a/addons/wiki/i18n/fi.po
+++ b/addons/wiki/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: 2011-07-22 04:42+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/fr.po b/addons/wiki/i18n/fr.po
index 6f460948d41..1344fd4cabc 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/wiki/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-13 05:21+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-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-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -534,15 +534,3 @@ msgstr "Page de recherche"
 
 #~ msgid "Child Groups"
 #~ msgstr "Groupes fils"
-
-#~ msgid ""
-#~ "Wiki Pages  allows you to share ideas and questions with your coworkers. You "
-#~ "can create a new document that can be link to one or several applications "
-#~ "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
-#~ "There is a basic wiki editing for text format."
-#~ msgstr ""
-#~ "Les pages de wiki vous permettent de partager des idées et des questions "
-#~ "avec vos collaborateurs. Vous pouvez créer un nouveau document qui peut être "
-#~ "lié à une ou plusieurs applications (CRM, Ventes, etc.). Vous pouvez "
-#~ "utiliser des mots-clés pour faciliter l'accès à vos page de wiki. Il y a une "
-#~ "édition wiki classique pour le formatage des textes."
diff --git a/addons/wiki/i18n/gl.po b/addons/wiki/i18n/gl.po
index e4fde9bf38c..ceca60d4293 100644
--- a/addons/wiki/i18n/gl.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/hr.po b/addons/wiki/i18n/hr.po
index 523cc3fb2b9..fe6a66b2a23 100644
--- a/addons/wiki/i18n/hr.po
+++ b/addons/wiki/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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-10-30 12:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-09-20 02:17+0000\n"
+"Last-Translator: wooer <Unknown>\n"
 "Language-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-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -30,7 +30,7 @@ msgstr "Wiki stranice"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Način prikaza"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -57,7 +57,7 @@ msgstr "Odlomak"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Ukazuje da li ove stranice imaju tablicu sadržaja ili ne"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -90,7 +90,7 @@ msgstr ""
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Zadnji suradnik"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -117,7 +117,7 @@ msgstr "Naslov"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Čarobnjak za stvaranje izbornika"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
@@ -127,13 +127,13 @@ msgstr "Redovi povijesti"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr ""
+msgstr "Sadržaj stranice"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Upozorenje !"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:236
@@ -159,7 +159,7 @@ msgstr "Opis"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "Potrebno pregledati"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,6 +167,7 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Ukazuje da ovu stranicu treba pregledati, skrećući pozornost drugih suradnika"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -177,7 +178,7 @@ msgstr "Informacije o izborniku"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "Povijest stranice"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
diff --git a/addons/wiki/i18n/hu.po b/addons/wiki/i18n/hu.po
index 8ba6a4b4efd..920efbd2676 100644
--- a/addons/wiki/i18n/hu.po
+++ b/addons/wiki/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-02-02 15:02+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/id.po b/addons/wiki/i18n/id.po
index b1da8b06f46..90a696cd36a 100644
--- a/addons/wiki/i18n/id.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/it.po b/addons/wiki/i18n/it.po
index 8c5aa2e2795..f5a00afe1e2 100644
--- a/addons/wiki/i18n/it.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -362,7 +362,7 @@ msgstr ""
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Modifica informazioni"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
diff --git a/addons/wiki/i18n/ko.po b/addons/wiki/i18n/ko.po
index 90cb64ec031..c744bc7d16b 100644
--- a/addons/wiki/i18n/ko.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/lt.po b/addons/wiki/i18n/lt.po
index cea4f01e6b6..0dd24380753 100644
--- a/addons/wiki/i18n/lt.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 "Language: lt\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/lv.po b/addons/wiki/i18n/lv.po
index 4b6809c8ebd..97a374c3b05 100644
--- a/addons/wiki/i18n/lv.po
+++ b/addons/wiki/i18n/lv.po
@@ -14,24 +14,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
 msgid "Wiki Template"
-msgstr "Wiki sagatave"
+msgstr "Wiki Veidne"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
 msgid "Wiki Pages"
-msgstr "Wiki lapas"
+msgstr "Wiki Lapas"
 
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr "Attēlošanas metode"
+msgstr "Attēlošanas Metode"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -43,7 +43,7 @@ msgstr "Autors"
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
 #: view:wiki.wiki.page.open:0
 msgid "Open Page"
-msgstr "Atvērt lapu"
+msgstr "Atvērt Lapu"
 
 #. module: wiki
 #: field:wiki.groups,menu_id:0
@@ -64,7 +64,7 @@ msgstr "Norāda vai šai lapai ir satura rādītājs vai nē"
 #: model:ir.model,name:wiki.model_wiki_wiki_history
 #: view:wiki.wiki.history:0
 msgid "Wiki History"
-msgstr "Wiki vēsture"
+msgstr "Wiki Vēsture"
 
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
@@ -91,7 +91,7 @@ msgstr "Virslapa"
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr "Pēdējais papildināja"
+msgstr "Pēdējais Papildinājs"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -101,14 +101,14 @@ msgstr "VirsIzvēlne"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr "Tēma, arī saukta Wiki grupa"
+msgstr "Tēma, arī saukta Wiki Grupa"
 
 #. module: wiki
 #: field:wiki.groups,name:0
 #: view:wiki.wiki:0
 #: field:wiki.wiki,group_id:0
 msgid "Wiki Group"
-msgstr "Wiki grupa"
+msgstr "Wiki Grupa"
 
 #. module: wiki
 #: field:wiki.wiki,name:0
@@ -118,17 +118,17 @@ msgstr "Virsraksts"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr "Vednis Veidot izvēlni"
+msgstr "Izvēlnes Veidošanas Veidnis"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr "Vēstures rindas"
+msgstr "Rindu Vēsture"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr "Lapas saturs"
+msgstr "Lapas Saturs"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:236
@@ -140,12 +140,12 @@ msgstr "Uzmanību!"
 #: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "There are no changes in revisions"
-msgstr "Revīzijās nav izmaiņu"
+msgstr "Versijās izmaiņu nav"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
 msgid "Document Management - Wiki"
-msgstr "Dokumentu pārvaldība - Wiki"
+msgstr "Dokumentu Pārvaldība - Wiki"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
@@ -160,35 +160,35 @@ msgstr "Apraksts"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr "Nepieciešams izskatīt"
+msgstr "Nepieciešams Pārskatīt"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
 msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
-msgstr ""
+msgstr "Norāda, ka šī lapa ir jāpārskata, piesaistot citu autoru uzmanību"
 
 #. module: wiki
 #: view:wiki.create.menu:0
 #: view:wiki.make.index:0
 msgid "Menu Information"
-msgstr "Izvēlnes informācija"
+msgstr "Izvēlnes Informācija"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr "Lapas vēsture"
+msgstr "Lapas Vēsture"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "Koks"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Page Template"
-msgstr "Lapas sagatave"
+msgstr "Lapas Veidnis"
 
 #. module: wiki
 #: field:wiki.wiki,tags:0
@@ -203,6 +203,11 @@ 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 ""
+"Ar Wiki lapām jūs varat dalīties idejās un jautājumos ar saviem darba "
+"biedriem. Jūs variet izveidot jaunu dokumentu, ko var sasaistīt ar kādu no "
+"vairākām aplikācijām (CRM, Pārdošana utt.). Jūs varat izmantot atslēgvārdus, "
+"lai atvieglotu piekļuvi savām wiki lapām. To veidošanai ir vienkāršots "
+"teksta redaktors."
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
@@ -223,14 +228,14 @@ msgstr "Datums"
 #. module: wiki
 #: view:wiki.make.index:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
+msgstr "Vēlies izveidot Saturu izvēlētajām lapām? "
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr "Atšķirība"
+msgstr "Atšķirības"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -240,7 +245,7 @@ msgstr "Lapas"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr "Grupas apraksts"
+msgstr "Grupas Apraksts"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -250,12 +255,12 @@ msgstr "Izmantojiet lapas sadaļas kodu, piem. 1.2.1."
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Vēlies izveidot wiki lapu? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
 msgid "Make Section ?"
-msgstr "Izveidot sadaļu?"
+msgstr "Izveidot Sadaļu?"
 
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
@@ -276,6 +281,11 @@ msgid ""
 "keep track for the wiki groups, pages, and history\n"
 "    "
 msgstr ""
+"\n"
+"Pamata modulis dokumentu pārvaldībai (wiki)\n"
+"\n"
+"sekot wiki grupām, lapām un vēsturei\n"
+"    "
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -286,7 +296,7 @@ msgstr "Piezīmes"
 #. module: wiki
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "Ja atēlošanas metode ir Mājas Lapa, tad ir jāizvēlas mājas lapa"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -338,17 +348,17 @@ msgstr "Wiki Id"
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr "Sākuma lapa"
+msgstr "Mājas Lapa"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Atļauj jums izveidot sasaisti ar citu lapu šīs tēmas ietvaros"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr "Izmaiņu informācija"
+msgstr "Izmaiņu Informācija"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -359,12 +369,12 @@ msgstr "Wiki"
 #. module: wiki
 #: field:wiki.wiki,write_date:0
 msgid "Modification Date"
-msgstr "Izmaiņu datums"
+msgstr "Izmaiņu Datums"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Configuration"
-msgstr "Konfigurācija"
+msgstr "Iestatījumi"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
@@ -372,13 +382,14 @@ msgstr "Konfigurācija"
 #: model:ir.model,name:wiki.model_wiki_make_index
 #: view:wiki.make.index:0
 msgid "Create Index"
-msgstr "Izveidot satura rādītāju"
+msgstr "Izveidot Saturu"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
 msgstr ""
+"Jums ir jāizvēlas vismaz viena vai maksimums divas labojumu vēstures!"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -396,7 +407,7 @@ msgstr "Izveidot Izvēlni"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr "Vai šis bija nozīmīgas izmaiņas?"
+msgstr "Vai šīs bija nozīmīgas izmaiņas?"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -405,7 +416,7 @@ msgstr "Vai šis bija nozīmīgas izmaiņas?"
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr "Wiki grupas"
+msgstr "Wiki Grupas"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -422,18 +433,18 @@ msgstr "Laboja"
 #: field:wiki.wiki,toc:0
 #, python-format
 msgid "Table of Contents"
-msgstr "Satura rādītājs"
+msgstr "Satura Rādītājs"
 
 #. module: wiki
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr "Atvērt Wiki lapu"
+msgstr "Atvērt Wiki Lapu"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "lapas izveides veidnis"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -445,19 +456,19 @@ msgstr "Atcelt"
 #. module: wiki
 #: field:wizard.wiki.history.show_diff,file_path:0
 msgid "Diff"
-msgstr "Atšķirība"
+msgstr "Atšķirības"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Need Review"
-msgstr "Nepieciešams izskatīt"
+msgstr "Nepieciešams pārskatīt"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr "Lapas, kas gaida izskatīšanu"
+msgstr "Lapas, kas gaida pārskatīšanu"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr "Meklēt lapu"
+msgstr "Meklēšana"
diff --git a/addons/wiki/i18n/mn.po b/addons/wiki/i18n/mn.po
index 05f21e17984..3078af08666 100644
--- a/addons/wiki/i18n/mn.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/nb.po b/addons/wiki/i18n/nb.po
index 70321db48ac..db86d6cc55b 100644
--- a/addons/wiki/i18n/nb.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/nl.po b/addons/wiki/i18n/nl.po
index c36bf8ca3c4..9f03e3b2895 100644
--- a/addons/wiki/i18n/nl.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/nl_BE.po b/addons/wiki/i18n/nl_BE.po
index d358e39104e..948124569d9 100644
--- a/addons/wiki/i18n/nl_BE.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/pl.po b/addons/wiki/i18n/pl.po
index 2222a33d7c4..f185cc663bf 100644
--- a/addons/wiki/i18n/pl.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/pt.po b/addons/wiki/i18n/pt.po
index 12df807b478..771c0345774 100644
--- a/addons/wiki/i18n/pt.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -520,6 +520,3 @@ msgstr "Página de procura"
 #, python-format
 #~ msgid "No action found"
 #~ msgstr "Nenhuma acção encontrada"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
diff --git a/addons/wiki/i18n/pt_BR.po b/addons/wiki/i18n/pt_BR.po
index 9cdd2412bac..88ad1f51053 100644
--- a/addons/wiki/i18n/pt_BR.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -524,15 +524,3 @@ msgstr "Página de Pesquisa"
 
 #~ msgid "Tags"
 #~ msgstr "Marcadores"
-
-#~ msgid ""
-#~ "Wiki Pages  allows you to share ideas and questions with your coworkers. You "
-#~ "can create a new document that can be link to one or several applications "
-#~ "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
-#~ "There is a basic wiki editing for text format."
-#~ msgstr ""
-#~ "Páginas Wiki permitem que você compartilhe suas idéias e dúvidas com seus "
-#~ "colegas de trabalho. Você pode criar um novo documento que pode ser link "
-#~ "para uma ou várias aplicações (CRM, Vendas, etc.) Você pode usar palavras-"
-#~ "chave para facilitar o acesso às suas páginas wiki. Há uma edição wiki "
-#~ "básica para o formato texto."
diff --git a/addons/wiki/i18n/ro.po b/addons/wiki/i18n/ro.po
index 7dd43a24337..08573e23cbf 100644
--- a/addons/wiki/i18n/ro.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index 05b6c1cb295..133c5cd5368 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -516,17 +516,5 @@ msgstr "Страница поиска"
 #~ msgid "Group Home Page"
 #~ msgstr "Домашняя Страница Группы"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Размер поля не может быть меньше 1 !"
-
 #~ msgid "Child Groups"
 #~ msgstr "Подчиненные группы"
diff --git a/addons/wiki/i18n/sk.po b/addons/wiki/i18n/sk.po
index aaa26351868..3748011ba71 100644
--- a/addons/wiki/i18n/sk.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sl.po b/addons/wiki/i18n/sl.po
index 5184398de3e..2d03f56a899 100644
--- a/addons/wiki/i18n/sl.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sq.po b/addons/wiki/i18n/sq.po
index e9141766ea3..be4011deaba 100644
--- a/addons/wiki/i18n/sq.po
+++ b/addons/wiki/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: 2011-04-29 05:34+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:34+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sr.po b/addons/wiki/i18n/sr.po
index 18411a1c668..dff22d2b917 100644
--- a/addons/wiki/i18n/sr.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sr@latin.po b/addons/wiki/i18n/sr@latin.po
index e987e88fb96..b9cba38e23b 100644
--- a/addons/wiki/i18n/sr@latin.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po
index 61e3a380fd8..f0e8d147621 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -363,7 +363,7 @@ msgstr "Ändringsdatum"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Configuration"
-msgstr "Konfiguration"
+msgstr "Konfigurering"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
@@ -505,9 +505,6 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
-#~ msgid "There are no chnages in revisions"
-#~ msgstr "There are no chnages in revisions"
-
 #~ msgid "Group Home Page"
 #~ msgstr "Group Home Page"
 
diff --git a/addons/wiki/i18n/tlh.po b/addons/wiki/i18n/tlh.po
index 154048c844e..c1703937692 100644
--- a/addons/wiki/i18n/tlh.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index 2f7a1596092..2569e53e064 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/uk.po b/addons/wiki/i18n/uk.po
index 78496d9590b..7a54ce64caa 100644
--- a/addons/wiki/i18n/uk.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/vi.po b/addons/wiki/i18n/vi.po
index ab3d836963a..ad925bf5d6e 100644
--- a/addons/wiki/i18n/vi.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -26,34 +26,34 @@ msgstr ""
 #: model:ir.actions.act_window,name:wiki.action_wiki
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
 msgid "Wiki Pages"
-msgstr ""
+msgstr "Các trang Wiki"
 
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Phương pháp Hiển thị"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "Tác giả"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
 #: view:wiki.wiki.page.open:0
 msgid "Open Page"
-msgstr ""
+msgstr "Mở Trang"
 
 #. module: wiki
 #: field:wiki.groups,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "Trình đơn"
 
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr ""
+msgstr "Phần"
 
 #. module: wiki
 #: help:wiki.wiki,toc:0
@@ -64,18 +64,18 @@ msgstr ""
 #: model:ir.model,name:wiki.model_wiki_wiki_history
 #: view:wiki.wiki.history:0
 msgid "Wiki History"
-msgstr ""
+msgstr "Lịch sử Wiki"
 
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "Chỉnh sửa nhỏ"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,text_area:0
 msgid "Content"
-msgstr ""
+msgstr "Nội dung"
 
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
@@ -91,12 +91,12 @@ msgstr ""
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Người đóng góp cuối"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Trình đơn cha"
 
 #. module: wiki
 #: help:wiki.wiki,group_id:0
@@ -113,7 +113,7 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,name:0
 msgid "Title"
-msgstr ""
+msgstr "Tiêu đề"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
@@ -128,13 +128,13 @@ msgstr ""
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr ""
+msgstr "Nội dung Trang"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Cảnh báo !"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:236
@@ -150,12 +150,12 @@ msgstr ""
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Tên Trình đơn"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
 msgid "Description"
-msgstr ""
+msgstr "Mô tả"
 
 #. module: wiki
 #: field:wiki.wiki,review:0
@@ -173,17 +173,17 @@ msgstr ""
 #: view:wiki.create.menu:0
 #: view:wiki.make.index:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Thông tin Trình đơn"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "Lịch sử Trang"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "Cấu trúc cây"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -193,7 +193,7 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "Các từ khoá"
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -208,17 +208,17 @@ msgstr ""
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Cảnh báo"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "Tạo trên"
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
 msgid "Date"
-msgstr ""
+msgstr "Ngày"
 
 #. module: wiki
 #: view:wiki.make.index:0
@@ -230,12 +230,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "Khác biệt"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
 msgid "Pages"
-msgstr ""
+msgstr "Các trang"
 
 #. module: wiki
 #: view:wiki.groups:0
diff --git a/addons/wiki/i18n/zh_CN.po b/addons/wiki/i18n/zh_CN.po
index e79fe3745ae..72b1f6713bf 100644
--- a/addons/wiki/i18n/zh_CN.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -52,7 +52,7 @@ msgstr "菜单"
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr "分段"
+msgstr "章节"
 
 #. module: wiki
 #: help:wiki.wiki,toc:0
@@ -100,7 +100,7 @@ msgstr "上级菜单"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr "主题，也叫做维基组"
+msgstr "主题，也叫wiki组"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -139,7 +139,7 @@ msgstr "警告 !"
 #: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "这修订没改变什么"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
@@ -166,7 +166,7 @@ msgstr "需要复审"
 msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
-msgstr ""
+msgstr "表示这页面需要复审，增加对其他贡献者的关注"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -177,7 +177,7 @@ msgstr "菜单信息"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr "页面编辑历史"
+msgstr "页面编辑日志"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -202,6 +202,8 @@ 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页面你可以与同事共享构思和问题，你可以创建一新文档它能链接一个服务的应用如：客户关系管理，销售等。\r\n"
+"基于wiki编辑的文件格式，你可以用关键字去轻松访问你的wiki页面。"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
@@ -234,7 +236,7 @@ msgstr "差异"
 #. module: wiki
 #: field:wiki.groups,page_ids:0
 msgid "Pages"
-msgstr "页"
+msgstr "页面"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -249,12 +251,12 @@ msgstr "用户页段代码如1.2.1"
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr "想打开一个维基页面？ "
+msgstr "想打开一个wiki页面？ "
 
 #. module: wiki
 #: field:wiki.groups,section:0
 msgid "Make Section ?"
-msgstr "生成分段?"
+msgstr "生成章节?"
 
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
@@ -275,6 +277,10 @@ msgid ""
 "keep track for the wiki groups, pages, and history\n"
 "    "
 msgstr ""
+"\n"
+"这基础模块用于管理文档（wiki）\n"
+"跟踪wiki组，页面和日志\n"
+"    "
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -285,7 +291,7 @@ msgstr "备注"
 #. module: wiki
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "如果显示的方式是首页，需要选择首页"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -331,18 +337,18 @@ msgstr "wizard.wiki.history.show_diff"
 #. module: wiki
 #: field:wiki.wiki.history,wiki_id:0
 msgid "Wiki Id"
-msgstr "维基页标识符"
+msgstr "wiki ID"
 
 #. module: wiki
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr "主页"
+msgstr "首页"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr "允许您链接其他页面到本主题"
+msgstr "允许您在本主题链接其他页面"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -353,7 +359,7 @@ msgstr "修改信息"
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
 #: view:wiki.wiki:0
 msgid "Wiki"
-msgstr "维基"
+msgstr "Wiki"
 
 #. module: wiki
 #: field:wiki.wiki,write_date:0
@@ -377,12 +383,12 @@ msgstr "创建索引"
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr "您因该选定最少一个或最多两个历史差异！"
+msgstr "您需要选定最少一个，最多两个修订的日志！"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -414,7 +420,7 @@ msgstr "主题"
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
 msgid "Modify By"
-msgstr "修改之"
+msgstr "修改于"
 
 #. module: wiki
 #: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
@@ -427,12 +433,12 @@ msgstr "目录"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr "打开维基页面"
+msgstr "打开wiki页面"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "打开页面"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -449,7 +455,7 @@ msgstr "差异"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Need Review"
-msgstr "需要预览"
+msgstr "需要复审"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
diff --git a/addons/wiki/i18n/zh_TW.po b/addons/wiki/i18n/zh_TW.po
index beb64c01ba4..f6333678203 100644
--- a/addons/wiki/i18n/zh_TW.po
+++ b/addons/wiki/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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/web/__init__.py b/addons/wiki/web/__init__.py
index 5b55f6cf43b..6fb28f7f2ad 100644
--- a/addons/wiki/web/__init__.py
+++ b/addons/wiki/web/__init__.py
@@ -1,2 +1,4 @@
 import widgets
 import controllers
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/web/controllers/__init__.py b/addons/wiki/web/controllers/__init__.py
index 8c163ddd260..e1edf0f0f96 100644
--- a/addons/wiki/web/controllers/__init__.py
+++ b/addons/wiki/web/controllers/__init__.py
@@ -1 +1,3 @@
 import wiki
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/web/controllers/wiki.py b/addons/wiki/web/controllers/wiki.py
index f4b0527e1e2..2f147827f24 100644
--- a/addons/wiki/web/controllers/wiki.py
+++ b/addons/wiki/web/controllers/wiki.py
@@ -61,3 +61,5 @@ class WikiView(SecuredController):
         res, file_name = self.get_attachment(**kws)
         cherrypy.response.headers['Content-Disposition'] = 'filename="%s"' % (file_name,)
         return base64.decodestring(res)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/web/widgets/__init__.py b/addons/wiki/web/widgets/__init__.py
index a3caa17e700..4b2c273d02a 100644
--- a/addons/wiki/web/widgets/__init__.py
+++ b/addons/wiki/web/widgets/__init__.py
@@ -1 +1,3 @@
 from wiki import WikiWidget
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/web/widgets/rss/__init__.py b/addons/wiki/web/widgets/rss/__init__.py
index 464c4364414..ff95e8bd52a 100644
--- a/addons/wiki/web/widgets/rss/__init__.py
+++ b/addons/wiki/web/widgets/rss/__init__.py
@@ -1 +1,3 @@
-import feedparser
\ No newline at end of file
+import feedparser
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/web/widgets/rss/feedparser.py b/addons/wiki/web/widgets/rss/feedparser.py
index 6f30574d300..885050d49f8 100755
--- a/addons/wiki/web/widgets/rss/feedparser.py
+++ b/addons/wiki/web/widgets/rss/feedparser.py
@@ -2856,3 +2856,5 @@ if __name__ == '__main__':
 #  terminology; parse RFC 822-style dates with no time; lots of other
 #  bug fixes
 #4.1 - MAP - removed socket timeout; added support for chardet library
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/web/widgets/wiki.py b/addons/wiki/web/widgets/wiki.py
index 0f7240f6fcc..ccf2a75899c 100644
--- a/addons/wiki/web/widgets/wiki.py
+++ b/addons/wiki/web/widgets/wiki.py
@@ -220,3 +220,5 @@ class WikiWidget(Text):
             self.data = html
 
 register_widget(WikiWidget, ["text_wiki"])
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/web/widgets/wikimarkup/__init__.py b/addons/wiki/web/widgets/wikimarkup/__init__.py
index 5eceea0e86d..f5fe67fada1 100644
--- a/addons/wiki/web/widgets/wikimarkup/__init__.py
+++ b/addons/wiki/web/widgets/wikimarkup/__init__.py
@@ -2142,3 +2142,5 @@ def str2url(str):
 	for i in zip(mfrom, to):
 		str = str.replace(*i)
 	return str
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 940d7116099..fa1dca8e95a 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -125,9 +125,9 @@ class wiki_wiki2(osv.osv):
         'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
     _defaults = {
-        'toc': lambda *a: True,
-        'review': lambda *a: True,
-        'minor_edit': lambda *a: True,
+        'toc': True,
+        'review': True,
+        'minor_edit': True,
     }
 
     def onchange_group_id(self, cr, uid, ids, group_id, content, context=None):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index ef801704037..32880ac2309 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -163,14 +163,14 @@
                 <search string="Wiki">
                     <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <field name="tags" select="1"/>
-                    <field name="section" select="1" groups="base.group_extended"/>
-                    <field name="write_uid" select="1"/>
-                    <field name="write_date" select="1"/>
+                    <field name="name"/>
+                    <field name="group_id"/>
+                    <field name="tags"/>
+                    <field name="section" groups="base.group_extended"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="8" col="6">
+                    <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
                         <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
@@ -264,7 +264,6 @@
             <field name="model">wiki.groups</field>
             <field name="name">Search a Page</field>
              <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
-            <field eval="True" name="object"/>
         </record>
 
     </data>
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 873b4fea9d0..96b8c2cdc11 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki - FAQ',
+    'name': 'Template: Internal FAQ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 This module provides a Wiki FAQ Template.
diff --git a/addons/wiki_faq/i18n/bg.po b/addons/wiki_faq/i18n/bg.po
index bee6ad5149d..522e600c089 100644
--- a/addons/wiki_faq/i18n/bg.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/ca.po b/addons/wiki_faq/i18n/ca.po
index 719787cde01..fb3fa30f400 100644
--- a/addons/wiki_faq/i18n/ca.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/da.po b/addons/wiki_faq/i18n/da.po
index fe28a94836d..95012e52394 100644
--- a/addons/wiki_faq/i18n/da.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -29,4 +29,4 @@ msgstr ""
 #. module: wiki_faq
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
-msgstr ""
+msgstr "Dokument administration - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
index 22ff4b45733..c008b22c6be 100644
--- a/addons/wiki_faq/i18n/de.po
+++ b/addons/wiki_faq/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: 2011-05-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
 msgstr "Dokumenten Management - Wiki - FAQ"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/wiki_faq/i18n/el.po b/addons/wiki_faq/i18n/el.po
index 4ee09fdc9b2..4dd210cec31 100644
--- a/addons/wiki_faq/i18n/el.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/es.po b/addons/wiki_faq/i18n/es.po
index 71c97b6a583..de2d0d021d3 100644
--- a/addons/wiki_faq/i18n/es.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
 msgstr "Gestion documental - Wiki - Preguntas frecuentes"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/wiki_faq/i18n/es_MX.po b/addons/wiki_faq/i18n/es_MX.po
new file mode 100644
index 00000000000..39cb8f8bb5c
--- /dev/null
+++ b/addons/wiki_faq/i18n/es_MX.po
@@ -0,0 +1,32 @@
+# 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-28 07:46+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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Gestion documental - Wiki - Preguntas frecuentes"
diff --git a/addons/wiki_faq/i18n/es_VE.po b/addons/wiki_faq/i18n/es_VE.po
new file mode 100644
index 00000000000..39cb8f8bb5c
--- /dev/null
+++ b/addons/wiki_faq/i18n/es_VE.po
@@ -0,0 +1,32 @@
+# 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-28 07:46+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:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Gestion documental - Wiki - Preguntas frecuentes"
diff --git a/addons/wiki_faq/i18n/fi.po b/addons/wiki_faq/i18n/fi.po
index 17a86af7cd7..69675eeb4e8 100644
--- a/addons/wiki_faq/i18n/fi.po
+++ b/addons/wiki_faq/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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/fr.po b/addons/wiki_faq/i18n/fr.po
index 99622bea65a..82c8ad1f815 100644
--- a/addons/wiki_faq/i18n/fr.po
+++ b/addons/wiki_faq/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2010-12-24 16:38+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -29,9 +29,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
 msgstr "Gestion documentaire - Wiki - FAQ"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
diff --git a/addons/wiki_faq/i18n/gl.po b/addons/wiki_faq/i18n/gl.po
index 2960dd2446e..c275e338132 100644
--- a/addons/wiki_faq/i18n/gl.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/hu.po b/addons/wiki_faq/i18n/hu.po
index bf2081d3d83..94962b737fb 100644
--- a/addons/wiki_faq/i18n/hu.po
+++ b/addons/wiki_faq/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-21 15:27+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/it.po b/addons/wiki_faq/i18n/it.po
index 4dfef35c265..0626927521e 100644
--- a/addons/wiki_faq/i18n/it.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/lv.po b/addons/wiki_faq/i18n/lv.po
new file mode 100644
index 00000000000..5769fceb59e
--- /dev/null
+++ b/addons/wiki_faq/i18n/lv.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-09-01 14:25+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: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Šis modulis nodrošina wiki BUJ Veidni\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Dokumentu Pārvaldība - Wiki - BUJ"
diff --git a/addons/wiki_faq/i18n/mn.po b/addons/wiki_faq/i18n/mn.po
index 148aa8059c9..fd6b79c29bd 100644
--- a/addons/wiki_faq/i18n/mn.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/nl.po b/addons/wiki_faq/i18n/nl.po
index 348077c8b79..23d51c5da07 100644
--- a/addons/wiki_faq/i18n/nl.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/oc.po b/addons/wiki_faq/i18n/oc.po
new file mode 100644
index 00000000000..c9408fe9635
--- /dev/null
+++ b/addons/wiki_faq/i18n/oc.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-20 09:27+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Aqueste modul provesís un modèl de FAQ Wiki\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Gestion documentària - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/pt.po b/addons/wiki_faq/i18n/pt.po
index 6a903d30ebd..06027dc70a7 100644
--- a/addons/wiki_faq/i18n/pt.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -31,9 +31,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
 msgstr ""
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/wiki_faq/i18n/pt_BR.po b/addons/wiki_faq/i18n/pt_BR.po
index c26d07cf8b5..bfa85587eb1 100644
--- a/addons/wiki_faq/i18n/pt_BR.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
 msgstr "Gestão de Documento - Wiki - FAQ"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/wiki_faq/i18n/ru.po b/addons/wiki_faq/i18n/ru.po
index 7b098676388..a21e1fcf310 100644
--- a/addons/wiki_faq/i18n/ru.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/sk.po b/addons/wiki_faq/i18n/sk.po
index ec842193902..a56e0bee250 100644
--- a/addons/wiki_faq/i18n/sk.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/sl.po b/addons/wiki_faq/i18n/sl.po
index faa1a527ba3..5dd21586b90 100644
--- a/addons/wiki_faq/i18n/sl.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
 msgstr "Upravljanje dokumentov - Wiki - Pogosto zastavljena vprašanja (FAQ)"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
diff --git a/addons/wiki_faq/i18n/sr@latin.po b/addons/wiki_faq/i18n/sr@latin.po
new file mode 100644
index 00000000000..8dcac837d6e
--- /dev/null
+++ b/addons/wiki_faq/i18n/sr@latin.po
@@ -0,0 +1,32 @@
+# Serbian Latin 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:16+0000\n"
+"PO-Revision-Date: 2011-10-17 13:50+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: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Ovaj modul obezbeđuje wiki za FAQ-model\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Uređivanje dokumenata - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/sv.po b/addons/wiki_faq/i18n/sv.po
index 92905ce1f9b..739b1cfcb6b 100644
--- a/addons/wiki_faq/i18n/sv.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/tr.po b/addons/wiki_faq/i18n/tr.po
index e62aa126257..a57921e8fd5 100644
--- a/addons/wiki_faq/i18n/tr.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
diff --git a/addons/wiki_faq/i18n/zh_CN.po b/addons/wiki_faq/i18n/zh_CN.po
index d2bfd879dca..692a958c9fc 100644
--- a/addons/wiki_faq/i18n/zh_CN.po
+++ b/addons/wiki_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:46+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_faq
 #: model:ir.module.module,description:wiki_faq.module_meta_information
@@ -23,10 +23,10 @@ msgid ""
 "This module provides a wiki FAQ Template\n"
 "    "
 msgstr ""
-"此模块提供维基系统一个常见问题解答模板\n"
+"此模块提供一个wiki的问答模板\n"
 "    "
 
 #. module: wiki_faq
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
-msgstr "文档管理——维基——常见问题解答"
+msgstr "文档管理 — wiki 问答"
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index e962265cea8..c03b466af0b 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki - Quality Manual',
+    'name': 'Template: Quality Manual',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 Quality Manual Template.
diff --git a/addons/wiki_quality_manual/i18n/bg.po b/addons/wiki_quality_manual/i18n/bg.po
index d4a9a135a60..6b61db2ada2 100644
--- a/addons/wiki_quality_manual/i18n/bg.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/ca.po b/addons/wiki_quality_manual/i18n/ca.po
index 2c13e314d4d..bc28c16c65e 100644
--- a/addons/wiki_quality_manual/i18n/ca.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/da.po b/addons/wiki_quality_manual/i18n/da.po
index d84222ef96f..353c98159ac 100644
--- a/addons/wiki_quality_manual/i18n/da.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -29,4 +29,4 @@ msgstr ""
 #. module: wiki_quality_manual
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
-msgstr ""
+msgstr "Dokument administration - Wiki - Kvalitetsmanual"
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
index 0bfdfc66d95..b5ae71821aa 100644
--- a/addons/wiki_quality_manual/i18n/de.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
 msgstr "Dokument Management - Wiki - Qualitätssicherungs Handbuch"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/wiki_quality_manual/i18n/es.po b/addons/wiki_quality_manual/i18n/es.po
index 978c14b2b17..59c4f2e4e8c 100644
--- a/addons/wiki_quality_manual/i18n/es.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
 msgstr "Gestió documental - Wiki - Manual de calidad"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/wiki_quality_manual/i18n/es_MX.po b/addons/wiki_quality_manual/i18n/es_MX.po
new file mode 100644
index 00000000000..36296a9c886
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/es_MX.po
@@ -0,0 +1,32 @@
+# 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-28 09:12+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Plantilla manual de calidad\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Gestió documental - Wiki - Manual de calidad"
diff --git a/addons/wiki_quality_manual/i18n/es_VE.po b/addons/wiki_quality_manual/i18n/es_VE.po
new file mode 100644
index 00000000000..36296a9c886
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/es_VE.po
@@ -0,0 +1,32 @@
+# 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-28 09:12+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:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Plantilla manual de calidad\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Gestió documental - Wiki - Manual de calidad"
diff --git a/addons/wiki_quality_manual/i18n/fi.po b/addons/wiki_quality_manual/i18n/fi.po
index 7ec2d238703..4db95b8a77d 100644
--- a/addons/wiki_quality_manual/i18n/fi.po
+++ b/addons/wiki_quality_manual/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: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/fr.po b/addons/wiki_quality_manual/i18n/fr.po
index 2562a86c6f0..8cffc4f9b97 100644
--- a/addons/wiki_quality_manual/i18n/fr.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -29,9 +29,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
 msgstr "Gestion documentaire - Wiki - Manuel Qualité"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
diff --git a/addons/wiki_quality_manual/i18n/gl.po b/addons/wiki_quality_manual/i18n/gl.po
index cf185fc23a9..53f983313a1 100644
--- a/addons/wiki_quality_manual/i18n/gl.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/hu.po b/addons/wiki_quality_manual/i18n/hu.po
index 69880824fd0..ec7074ed3b8 100644
--- a/addons/wiki_quality_manual/i18n/hu.po
+++ b/addons/wiki_quality_manual/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-21 15:36+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/it.po b/addons/wiki_quality_manual/i18n/it.po
index df37a8d2531..cce7d9d7538 100644
--- a/addons/wiki_quality_manual/i18n/it.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/lv.po b/addons/wiki_quality_manual/i18n/lv.po
new file mode 100644
index 00000000000..89e6552844f
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/lv.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-09-01 14:26+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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Kvalitātes Rokasgrāmatas Veidne\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Dokumentu Pārvaldība - Wiki - Kvalitātes Rokasgrāmata"
diff --git a/addons/wiki_quality_manual/i18n/mn.po b/addons/wiki_quality_manual/i18n/mn.po
index 566bb3ebb20..719c2c43d28 100644
--- a/addons/wiki_quality_manual/i18n/mn.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/nl.po b/addons/wiki_quality_manual/i18n/nl.po
index 14367bccd4d..e6dd9915a83 100644
--- a/addons/wiki_quality_manual/i18n/nl.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/oc.po b/addons/wiki_quality_manual/i18n/oc.po
new file mode 100644
index 00000000000..28a4d42ec98
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/oc.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-20 09:27+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Modèl de manual qualitat\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Gestion documentària - Wiki - Manual Qualitat"
diff --git a/addons/wiki_quality_manual/i18n/pt.po b/addons/wiki_quality_manual/i18n/pt.po
index c93e1a483e7..3481bc92302 100644
--- a/addons/wiki_quality_manual/i18n/pt.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
 msgstr ""
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/wiki_quality_manual/i18n/pt_BR.po b/addons/wiki_quality_manual/i18n/pt_BR.po
index be9d3a24f07..511a7cd9a51 100644
--- a/addons/wiki_quality_manual/i18n/pt_BR.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
 msgstr "Gestão de Documento - Wiki - Manual da Qualidade"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
diff --git a/addons/wiki_quality_manual/i18n/ru.po b/addons/wiki_quality_manual/i18n/ru.po
index da2f40dd963..8076e6cfedd 100644
--- a/addons/wiki_quality_manual/i18n/ru.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/sk.po b/addons/wiki_quality_manual/i18n/sk.po
index f2f34a5d498..81cff65d678 100644
--- a/addons/wiki_quality_manual/i18n/sk.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/sl.po b/addons/wiki_quality_manual/i18n/sl.po
index 9b77f77a25e..356297a4e45 100644
--- a/addons/wiki_quality_manual/i18n/sl.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -30,9 +30,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
 msgstr "Upravljanje dokumentov - Wiki - Priročnik zagotavljanja kakovosti"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
diff --git a/addons/wiki_quality_manual/i18n/sr@latin.po b/addons/wiki_quality_manual/i18n/sr@latin.po
new file mode 100644
index 00000000000..e61c7f059ec
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/sr@latin.po
@@ -0,0 +1,32 @@
+# Serbian Latin 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:16+0000\n"
+"PO-Revision-Date: 2011-10-17 13:36+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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Model kvalitetnog priručnika\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Uređivanje dokumenata - Wiki - Kvalitetni priručnik"
diff --git a/addons/wiki_quality_manual/i18n/sv.po b/addons/wiki_quality_manual/i18n/sv.po
index 4a69d608c88..f1b476529fe 100644
--- a/addons/wiki_quality_manual/i18n/sv.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/tr.po b/addons/wiki_quality_manual/i18n/tr.po
index c4b013939fe..818dfd410b9 100644
--- a/addons/wiki_quality_manual/i18n/tr.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
diff --git a/addons/wiki_quality_manual/i18n/zh_CN.po b/addons/wiki_quality_manual/i18n/zh_CN.po
index 5bc350445ff..fb015fec4b0 100644
--- a/addons/wiki_quality_manual/i18n/zh_CN.po
+++ b/addons/wiki_quality_manual/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: 2011-04-29 05:47+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,description:wiki_quality_manual.module_meta_information
@@ -23,8 +23,10 @@ msgid ""
 "Quality Manual Template\n"
 "    "
 msgstr ""
+"质量手册模板\n"
+"    "
 
 #. module: wiki_quality_manual
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
-msgstr ""
+msgstr "文档管理 - wiki 质量手册"
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 7d06dc73712..1e56baf58cc 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Wiki - Sale-FAQ',
+    'name': 'Sale FAQ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This module provides a Wiki Sales FAQ Template.
diff --git a/addons/wiki_sale_faq/i18n/bg.po b/addons/wiki_sale_faq/i18n/bg.po
index 63a02b6db7f..8fb53e9cbf4 100644
--- a/addons/wiki_sale_faq/i18n/bg.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/ca.po b/addons/wiki_sale_faq/i18n/ca.po
index e1eff308f41..1f35ccbdb0e 100644
--- a/addons/wiki_sale_faq/i18n/ca.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/da.po b/addons/wiki_sale_faq/i18n/da.po
new file mode 100644
index 00000000000..6a60c08ca2c
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/da.po
@@ -0,0 +1,70 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-09 20:09+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: 2011-11-10 04:58+0000\n"
+"X-Generator: Launchpad (build 14263)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Dokumenter"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Dette modul leverer en wiki FAQ skabelon\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index 5f11c6de8c1..d8db71c9cad 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -77,45 +77,3 @@ msgstr ""
 "durchsuchen. OpenERP erzeugt automatisch Meta-Daten wie zB dem zugehörigen "
 "Partner und indiziert den Inhalt von DOC, .ODT, .TXT, .SXW und .PDF "
 "Dokumenten"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "This module provides a wiki FAQ Template\n"
-#~ msgstr "Das Modul bietet in Wiki Form ein FAQ Template\n"
-
-#~ msgid ""
-#~ "Documents gives you an access to all attached files to any record. It is a "
-#~ "repository of all documents such as emails, project related attachments or "
-#~ "any other documents. From this view, you can search on the content of the "
-#~ "documents. OpenERP automatically assign meta-data based on the record like "
-#~ "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
-#~ ".PDF documents."
-#~ msgstr ""
-#~ "Dokumente ermöglichen Ihnen einen Zugriff auf alle Dateianhänge zu "
-#~ "Datenobjekten in OpenERP. Es handelt sich dabei um ein Verzeichniss aller "
-#~ "Dokumente, wie Emails, Projektdokumente oder diverse andere Dokumente. Über "
-#~ "diese Ansicht können Sie dabei nach Inhalten dieser Dokumente suchen, "
-#~ "OpenERP ermittelt automatisch Meta Daten zum Dokument, z.B. den verknüpften "
-#~ "Partner und indiziert hierzu ausserdem Inhalte für die Dokument Formate "
-#~ ".DOC, .ODT, .TXT, .SXW and .PDF."
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr ""
-#~ "Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
-#~ "haben"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Das Verzeichnis muss eindeutig sein"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/wiki_sale_faq/i18n/es.po b/addons/wiki_sale_faq/i18n/es.po
index 9afddb708f6..c0d68fe0e6c 100644
--- a/addons/wiki_sale_faq/i18n/es.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -81,53 +81,3 @@ msgstr ""
 "automáticamente meta datos basados en el registro como la empresa "
 "relacionada e indexa el contenido de documentos .DOC, .ODT, .TXT, .SXW y "
 ".PDF."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "¡Error! No puede crear directorios recursivos."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "¡El nombre de directorio debe ser único!"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid ""
-#~ "Documents gives you an access to all attached files to any record. It is a "
-#~ "repository of all documents such as emails, project related attachments or "
-#~ "any other documents. From this view, you can search on the content of the "
-#~ "documents. OpenERP automatically assign meta-data based on the record like "
-#~ "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
-#~ ".PDF documents."
-#~ msgstr ""
-#~ "Documentos le da acceso a todos los archivos adjuntos a cualquier registro. "
-#~ "Es un repositorio de todos los documentos como correos, adjuntos "
-#~ "relacionados con proyectos o cualquier otro documento. Desde esta vista, "
-#~ "puede buscar los contenidos de los documentos. OpenERP automáticamente "
-#~ "asigna meta-datos según el registro, como el tercero asociado o los índices "
-#~ "del contenido de archivos .DOC, .ODT, .TXT, .SXW y .PDF."
-
-#~ msgid ""
-#~ "Wiki pages allow you to share ideas and questions with co-workers. You can "
-#~ "create a new document that can be linked to one or several applications "
-#~ "(specifications of a project, a FAQ for sales teams, etc.). Keywords can be "
-#~ "used to easily tag wiki pages. You should use this application with the "
-#~ "OpenERP web client interface."
-#~ msgstr ""
-#~ "Las páginas wiki le permiten compartir ideas y cuestiones con sus compañeros "
-#~ "de trabajo. Puede crear un nuevo documento que puede ser enlazado a una o "
-#~ "varias aplicaciones (especificaciones de un proyecto, una página de "
-#~ "preguntas frecuentes para el equipo de ventas, etc.). Pueden usarse palabras "
-#~ "claves fácilmente para etiquetar páginas wiki. Debería utilizar esta "
-#~ "aplicación con la interfaz del cliente web de OpenERP."
diff --git a/addons/wiki_sale_faq/i18n/es_MX.po b/addons/wiki_sale_faq/i18n/es_MX.po
new file mode 100644
index 00000000000..b2c0decf5af
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/es_MX.po
@@ -0,0 +1,83 @@
+# 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-13 02:44+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Documentos"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Páginas Wiki"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+"Las páginas del wiki le permiten intercambiar ideas y preguntas con sus "
+"compañeros de trabajo. Puede crear un nuevo documento que puede ser "
+"relacionado con una o varias aplicaciones (especificaciones de un proyecto, "
+"FAQ para equipo de ventas, etc). Las palabras clave pueden ser utilizadas "
+"para etiquetar fácilmente páginas del wiki. Debe utilizar esta aplicación "
+"con el cliente web de OpenERP."
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "Wiki - Venta - FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
+"Documentos le da acceso a todos los ficheros adjuntos de cualquier registro. "
+"Es un repositorio de todos los documentos como emails, ficheros adjuntos de "
+"proyectos o cualquier otro documento. Desde esta vista, puede realizar "
+"búsquedas sobre el contenido de los documentos. OpenERP asigna "
+"automáticamente meta datos basados en el registro como la empresa "
+"relacionada e indexa el contenido de documentos .DOC, .ODT, .TXT, .SXW y "
+".PDF."
diff --git a/addons/wiki_sale_faq/i18n/es_VE.po b/addons/wiki_sale_faq/i18n/es_VE.po
new file mode 100644
index 00000000000..b2c0decf5af
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/es_VE.po
@@ -0,0 +1,83 @@
+# 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-13 02:44+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:49+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Documentos"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Páginas Wiki"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+"Las páginas del wiki le permiten intercambiar ideas y preguntas con sus "
+"compañeros de trabajo. Puede crear un nuevo documento que puede ser "
+"relacionado con una o varias aplicaciones (especificaciones de un proyecto, "
+"FAQ para equipo de ventas, etc). Las palabras clave pueden ser utilizadas "
+"para etiquetar fácilmente páginas del wiki. Debe utilizar esta aplicación "
+"con el cliente web de OpenERP."
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "Wiki - Venta - FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
+"Documentos le da acceso a todos los ficheros adjuntos de cualquier registro. "
+"Es un repositorio de todos los documentos como emails, ficheros adjuntos de "
+"proyectos o cualquier otro documento. Desde esta vista, puede realizar "
+"búsquedas sobre el contenido de los documentos. OpenERP asigna "
+"automáticamente meta datos basados en el registro como la empresa "
+"relacionada e indexa el contenido de documentos .DOC, .ODT, .TXT, .SXW y "
+".PDF."
diff --git a/addons/wiki_sale_faq/i18n/fi.po b/addons/wiki_sale_faq/i18n/fi.po
index 1e035715d29..257ee2c9992 100644
--- a/addons/wiki_sale_faq/i18n/fi.po
+++ b/addons/wiki_sale_faq/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: 2011-06-09 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/fr.po b/addons/wiki_sale_faq/i18n/fr.po
index f53b3aad169..3503229311f 100644
--- a/addons/wiki_sale_faq/i18n/fr.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -80,44 +80,3 @@ msgstr ""
 "OpenERP assigne automatiquement des meta-données basées sur un "
 "enregistrement comme un partenaire lié et indexe le contenu des fichiers "
 ".doc, .odt, .txt, .sxw et .pdf."
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de répertoires récursifs."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Le répertoire doit avoir un parent ou un stockage"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Le nom de répertoire doit être unique !"
-
-#~ msgid ""
-#~ "Wiki pages allow you to share ideas and questions with co-workers. You can "
-#~ "create a new document that can be linked to one or several applications "
-#~ "(specifications of a project, a FAQ for sales teams, etc.). Keywords can be "
-#~ "used to easily tag wiki pages. You should use this application with the "
-#~ "OpenERP web client interface."
-#~ msgstr ""
-#~ "Les pages de wiki permettent de partager des idées et des questions entre "
-#~ "collègues. Vous pouvez créer un nouveau document qui peut être lié à une ou "
-#~ "plusieurs applications (spécifications de projet, FAQ pour les équipes de "
-#~ "vente, etc.). Les mots-clés peuvent être utilisés pour marquer facilement "
-#~ "les pages de Wiki. De préférence, utiliser cette application via l'interface "
-#~ "web d'OpenERP."
-
-#~ msgid ""
-#~ "Documents gives you an access to all attached files to any record. It is a "
-#~ "repository of all documents such as emails, project related attachments or "
-#~ "any other documents. From this view, you can search on the content of the "
-#~ "documents. OpenERP automatically assign meta-data based on the record like "
-#~ "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
-#~ ".PDF documents."
-#~ msgstr ""
-#~ "\"Documents\" vous permet d'accéder à tous les fichiers d'un dossier. Il "
-#~ "s'agit d'un dépôt rassemblant les e-mails, les pièces jointes liées à un "
-#~ "projet ou tout autre document. D'ici, vous pouvez lancer une recherche dans "
-#~ "le contenu des documents. OpenERP attribue automatiquement des méta-données "
-#~ "sur ce dossier comme le Partenaire et indexe le contenu des fichiers.DOC, "
-#~ ".ODT, .TXT, .SXW et .PDF."
diff --git a/addons/wiki_sale_faq/i18n/gl.po b/addons/wiki_sale_faq/i18n/gl.po
index e502fc301cd..e751c4bb4d9 100644
--- a/addons/wiki_sale_faq/i18n/gl.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/hu.po b/addons/wiki_sale_faq/i18n/hu.po
index e18a7fcc1f1..a0693265272 100644
--- a/addons/wiki_sale_faq/i18n/hu.po
+++ b/addons/wiki_sale_faq/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
 "PO-Revision-Date: 2011-01-21 15:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/it.po b/addons/wiki_sale_faq/i18n/it.po
index 80153cd101d..f6667f6399d 100644
--- a/addons/wiki_sale_faq/i18n/it.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -80,12 +80,3 @@ msgstr ""
 "dentro il contenuto dei documenti. OpenERP assegna automaticamente meta-data "
 "basandosi sul record, come il partner relativo, e indicizza il contenuto di "
 "documenti formato: DOC, ODT, TXT, SXW e PDF"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare Menu ricorsivi."
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Errore! Non è possibile creare Cartelle ricorsive."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
diff --git a/addons/wiki_sale_faq/i18n/lv.po b/addons/wiki_sale_faq/i18n/lv.po
new file mode 100644
index 00000000000..4423f57b5be
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/lv.po
@@ -0,0 +1,81 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-09-01 14: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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Dokumenti"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wiki Lapas"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "BUJ"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Šis modulis nodrošina wiki BUJ veidni\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+"Wiki lapas ļauj koplietot idejas un jautājumus ar kolēģiem. Jūs varat "
+"izveidot jaunu dokumentu, ko var saistīt ar vienu vai vairākiem projektiem "
+"(specifikācijas, bieži uzdotie jautājumi pārdošanas speciālistiem utt.). Var "
+"izmantot atslēgvārdus, lai viegli meklētu Wiki lapās. Izmantojiet šo "
+"programmu caur OpenERP web klienta interfeisu."
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "Wiki - Pārdošana - BUJ"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
+"Dokumenti ļauj piekļūt visiem failiem kas pievienoti ierakstiem. Tas ir visu "
+"dokumentu apkopojums, piemēram, e-pasta ziņojumu, pielikumus vai jebkurus "
+"citus dokumentus, kas attiecas uz projektu. Tāpēc no šejienes jūs variet "
+"meklēt dokumentu saturā. OpenERP automātiski piešķirt meta datus, "
+"pamatojoties uz ierakstu saturu par saistīto partneri un indeksē DOC, ODT, "
+"TXT, PDF  un SXW dokumentus."
diff --git a/addons/wiki_sale_faq/i18n/mn.po b/addons/wiki_sale_faq/i18n/mn.po
index 39fca7acd87..0ec166472c8 100644
--- a/addons/wiki_sale_faq/i18n/mn.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -68,26 +68,3 @@ msgid ""
 "like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
 "and .PDF documents."
 msgstr ""
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж болохгүй."
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Алдаа! Рекурсив хавтас үүсгэж болохгүй."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid ""
-#~ "Wiki pages allow you to share ideas and questions with co-workers. You can "
-#~ "create a new document that can be linked to one or several applications "
-#~ "(specifications of a project, a FAQ for sales teams, etc.). Keywords can be "
-#~ "used to easily tag wiki pages. You should use this application with the "
-#~ "OpenERP web client interface."
-#~ msgstr ""
-#~ "Вики хуудсууд нь танд хамтран ажиллагчидтайгаа санал бодлоо болон "
-#~ "асуултуудаа хуваалцах боломж олгоно. Нэг болон хэд хэдэн аппликэшнтэй "
-#~ "(төслийн тодорхойлолт, борлуулалтын багийн FAQ г.м. ) холбогдох бичиг "
-#~ "баримтыг үүсгэх боломжтой. Түлхүүр үгс нь вики хуудсуудыг хялбар таг хийхэд "
-#~ "ашиглагдана. Энэ аппликэшнийг OpenERP веб клиент интэрфэйстэй хамтад нь "
-#~ "ашиглах хэрэгтэй."
diff --git a/addons/wiki_sale_faq/i18n/nl.po b/addons/wiki_sale_faq/i18n/nl.po
index 5a3fcc4562e..33753922376 100644
--- a/addons/wiki_sale_faq/i18n/nl.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/oc.po b/addons/wiki_sale_faq/i18n/oc.po
new file mode 100644
index 00000000000..dfe98f46645
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/oc.po
@@ -0,0 +1,68 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-11-20 09:26+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: 2011-11-21 05:22+0000\n"
+"X-Generator: Launchpad (build 14299)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Documents"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Paginas del wiki"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "Questions frequentas (FAQ)"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "FAQ Wiki Vendas"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
diff --git a/addons/wiki_sale_faq/i18n/pl.po b/addons/wiki_sale_faq/i18n/pl.po
index b5b39499755..be88ff7d814 100644
--- a/addons/wiki_sale_faq/i18n/pl.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/pt.po b/addons/wiki_sale_faq/i18n/pt.po
index d6fe6204ed4..ea0d3fd6504 100644
--- a/addons/wiki_sale_faq/i18n/pt.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -68,53 +68,3 @@ msgid ""
 "like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
 "and .PDF documents."
 msgstr ""
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erro! Não é possível criar pastas recursivamente."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "A pasta tem de ter um ascendente ou um armazenamento"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "O nome da pasta tem de ser único !"
-
-#~ msgid ""
-#~ "Wiki pages allow you to share ideas and questions with co-workers. You can "
-#~ "create a new document that can be linked to one or several applications "
-#~ "(specifications of a project, a FAQ for sales teams, etc.). Keywords can be "
-#~ "used to easily tag wiki pages. You should use this application with the "
-#~ "OpenERP web client interface."
-#~ msgstr ""
-#~ "As páginas Wiki permitem-lhe partilhar ideias e perguntas com os seus "
-#~ "colegas de trabalho. Pode criar um novo documento e associá-lo a uma ou "
-#~ "várias aplicações (especificações de projeto, perguntas e respostas para uma "
-#~ "equipa de vendas, etc.). Palavras chave (\"keywords\") podem ser usadas para "
-#~ "catalogar facilmente as páginas Wiki. Deverá usar esta aplicação "
-#~ "conjuntamente com o interface web do OpenERP."
-
-#~ msgid ""
-#~ "Documents gives you an access to all attached files to any record. It is a "
-#~ "repository of all documents such as emails, project related attachments or "
-#~ "any other documents. From this view, you can search on the content of the "
-#~ "documents. OpenERP automatically assign meta-data based on the record like "
-#~ "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
-#~ ".PDF documents."
-#~ msgstr ""
-#~ "Os documentos dão-lhe acesso a todos os ficheiros associados a um qualquer "
-#~ "registo. Trata-se de um repositório de documentos como, por exemplo, emails, "
-#~ "PDF's, etc. A partir deste ecrã, pode-se fazer pesquisas no conteúdo dos "
-#~ "próprios documentos. O OpenERP gera automaticamente meta-dados com base na "
-#~ "informação do registo ao qual se pretende associar um documento e ainda "
-#~ "indexa ficheiros dos seguintes tipos: DOC, TXT, SXW e PDF."
diff --git a/addons/wiki_sale_faq/i18n/pt_BR.po b/addons/wiki_sale_faq/i18n/pt_BR.po
index 650ae5b581c..803ffc2eb58 100644
--- a/addons/wiki_sale_faq/i18n/pt_BR.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -79,53 +79,3 @@ msgstr ""
 "visualização, você  pode procurar nos conteúdos dos documentos. O OpenERP "
 "automaticamente atribui meta dados baseados no registro, como o parceiro "
 "relacionado, e indexa o conteúdo de documentos .DOC, .ODT, .TXT, .SXW e .PDF."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erro! Você não pode criar diretórios recursivos."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid ""
-#~ "Documents gives you an access to all attached files to any record. It is a "
-#~ "repository of all documents such as emails, project related attachments or "
-#~ "any other documents. From this view, you can search on the content of the "
-#~ "documents. OpenERP automatically assign meta-data based on the record like "
-#~ "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
-#~ ".PDF documents."
-#~ msgstr ""
-#~ "Documentos dão acesso para todos os arquivos anexados para qualquer "
-#~ "registro. É um repositório de todos os documentos como emails, anexos "
-#~ "relacionados a projetos ou qualquer outro documento. Desta visão você pode "
-#~ "pesquisar o conteúdo dos documentos. OpenERP automaticamente associa "
-#~ "metadados com base no registro como o parceiro relacionado e índexa o "
-#~ "conteúdo de documentos .DOC, .ODT, .TXT, .SXW e .PDF."
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "O diretório precisa ter um pai ou dispositivo de armazenamento"
-
-#~ msgid ""
-#~ "Wiki pages allow you to share ideas and questions with co-workers. You can "
-#~ "create a new document that can be linked to one or several applications "
-#~ "(specifications of a project, a FAQ for sales teams, etc.). Keywords can be "
-#~ "used to easily tag wiki pages. You should use this application with the "
-#~ "OpenERP web client interface."
-#~ msgstr ""
-#~ "Páginas Wiki permitem a você compartilhar idéias e questões com "
-#~ "colaboradores. Você pode criar um novo documento que pode ser ligado a uma "
-#~ "ou inúmeras aplicações (especificações de um projeto, um FAQ para o time de "
-#~ "vendas, etc.). Palavras-chave (tags) podem ser utilizadas para facilmente "
-#~ "marcar páginas Wiki. Você deve usar esta aplicação em conjunto com o OpenERP "
-#~ "Web."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "O nome do diretório precisa ser única !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/wiki_sale_faq/i18n/ru.po b/addons/wiki_sale_faq/i18n/ru.po
index 80e2fbe3862..7608d470d0d 100644
--- a/addons/wiki_sale_faq/i18n/ru.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -79,12 +79,3 @@ msgstr ""
 "документов. OpenERP автоматически присваивает мета-информацию, основываясь "
 "на записи (такую, как связанный партнер) и индексирует .DOC, .ODT, .TXT, "
 ".SXW и .PDF-файлы."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Ошибка! Вы не можете созадавать вложенные друг в друга директории."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
diff --git a/addons/wiki_sale_faq/i18n/sk.po b/addons/wiki_sale_faq/i18n/sk.po
index 5e6c4aaa0ad..bc50eecfc43 100644
--- a/addons/wiki_sale_faq/i18n/sk.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/sl.po b/addons/wiki_sale_faq/i18n/sl.po
index 15472b18514..a647d45ae0a 100644
--- a/addons/wiki_sale_faq/i18n/sl.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -52,6 +52,11 @@ msgid ""
 "used to easily tag wiki pages. You should use this application with the "
 "OpenERP web client interface."
 msgstr ""
+"Wiki strani vam omogočajo, da delite ideje in vprašanja s sodelavci. "
+"Ustvarite lahko nov dokument, ki ga je mogoče povezati z eno ali več "
+"aplikacij (specifikacije projekta, FAQ za prodajne ekipe, itd). Ključne "
+"besede se lahko uporabljajo za enostavno povezavo na   wiki strani . Morate "
+"uporabiti to aplikacijo z web OpenERP vmesnikom odjemalca."
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
@@ -68,15 +73,9 @@ msgid ""
 "like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
 "and .PDF documents."
 msgstr ""
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Ime modula mora biti enolično!"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Napaka! Ne morete izdelati rekurzivnih imenikov."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Oznaka certifikata modula mora biti enolična!"
+"Dokumenti vam omogočajo dostop do vseh datotek, ki so povezani na bilo "
+"kateri zapis. To je skladišče vseh dokumentov, kot so e-pošta, povezane s "
+"projektom priponk ali kateri koli drugi dokumenti. V tem pogledu lahko "
+"iščete po vsebini dokumentov. OpenERP samodejno dodeli meta podatke, ki "
+"temeljijo na zapisih, kot so povezani z končnicami . DOC,. ODT,. TXT,. Sxw "
+"in. Dokument PDF."
diff --git a/addons/wiki_sale_faq/i18n/sr@latin.po b/addons/wiki_sale_faq/i18n/sr@latin.po
new file mode 100644
index 00000000000..15dbe8f715a
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/sr@latin.po
@@ -0,0 +1,81 @@
+# Serbian Latin 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:16+0000\n"
+"PO-Revision-Date: 2011-10-17 14:04+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: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Dokumenta"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wiki stranice"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Ovaj modul obezbeđuje wiki za FAQ-model\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+"Wiki stranice omogućavaju Vam podelu ideja i pitanja sa saradnicima. Možete "
+"napraviti novi dokument koji može biti povezan s jednom ili nekoliko "
+"aplikacija (specifikacije projekta, FAQ za timove prodaje). Ključne reči se "
+"mogu upotrebiti za lako obeležavanje wiki stranica. Ovu bi aplikaciju "
+"trebalo koristiti zajedno s OpenERP-ovim korisničkim interfejsom."
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "Wiki - Prodaja - FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
+"Dokumenta Vam daju pristup svim datotekama povezanim s bilo kojim zapisom. "
+"To je skladište svih dokumenata, poput e-pošte, dodatke povezane s "
+"projektima ili bilo koja druga dokumenta. S ovog pregleda možete "
+"pretraživati sadržaj dokumenata. OpenERP automatski  dodeljuje meta podatke "
+"vezane za zapis, kao što su povezani partneri i indeksi sadržaja tipa .DOC, "
+".ODT, .TXT, .SXW i .PDF dokumenata."
diff --git a/addons/wiki_sale_faq/i18n/sv.po b/addons/wiki_sale_faq/i18n/sv.po
index 9735880dc42..d23b9a9d8d1 100644
--- a/addons/wiki_sale_faq/i18n/sv.po
+++ b/addons/wiki_sale_faq/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: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/tr.po b/addons/wiki_sale_faq/i18n/tr.po
index 3e36156a8b2..3c7e2f3dfad 100644
--- a/addons/wiki_sale_faq/i18n/tr.po
+++ b/addons/wiki_sale_faq/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: 2011-06-08 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
diff --git a/addons/wiki_sale_faq/i18n/zh_CN.po b/addons/wiki_sale_faq/i18n/zh_CN.po
index 60546586205..8bae95c26db 100644
--- a/addons/wiki_sale_faq/i18n/zh_CN.po
+++ b/addons/wiki_sale_faq/i18n/zh_CN.po
@@ -14,25 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:46+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:47+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
 msgid "Documents"
-msgstr ""
+msgstr "文档"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
 msgid "Wiki Pages"
-msgstr ""
+msgstr "wiki页面"
 
 #. module: wiki_sale_faq
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
 msgid "FAQ"
-msgstr ""
+msgstr "问答（FAQ）"
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,description:wiki_sale_faq.module_meta_information
@@ -40,6 +40,8 @@ msgid ""
 "This module provides a wiki FAQ Template\n"
 "    "
 msgstr ""
+"此模块提供一个wiki的问答（FAQ）模板\n"
+"    "
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
@@ -50,11 +52,13 @@ msgid ""
 "used to easily tag wiki pages. You should use this application with the "
 "OpenERP web client interface."
 msgstr ""
+"wiki页面让你与同事去共享构思和问题，你可以创建一个新的文档那么你可以链接到一个或多个服务器的应用（项目的说明书或销售团队的问题与解答（FAQ）等）关键"
+"字可以轻松标记出wiki页面。在系统的web客户端你应该使用这应用。"
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
 msgid "Wiki -Sale - FAQ"
-msgstr ""
+msgstr "wiki - 销售问答（FAQ）"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
@@ -66,3 +70,6 @@ msgid ""
 "like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
 "and .PDF documents."
 msgstr ""
+"文档使你可以访问到任何记录到的所有文件。这是一个所有文档的仓库如电子邮件，项目相关的附件或其它任何文档。\r\n"
+"在这个视图，你能搜索这文档的内容。\r\n"
+"系统根据记录的业务伙伴相关的和内容索引的各种文档如.DOC, .ODT, .TXT, .SXW 和 .PDF自动分配元数据。"